summaryrefslogtreecommitdiff
path: root/dev-ruby
diff options
context:
space:
mode:
Diffstat (limited to 'dev-ruby')
-rw-r--r--dev-ruby/ast/Manifest1
-rw-r--r--dev-ruby/ast/ast-2.4.2.ebuild33
-rw-r--r--dev-ruby/bacon/bacon-1.2.0-r3.ebuild20
-rw-r--r--dev-ruby/bundler/Manifest1
-rw-r--r--dev-ruby/bundler/bundler-2.2.6.ebuild30
-rw-r--r--dev-ruby/capybara/Manifest2
-rw-r--r--dev-ruby/capybara/capybara-3.35.0.ebuild (renamed from dev-ruby/capybara/capybara-3.31.0.ebuild)6
-rw-r--r--dev-ruby/concurrent-ruby/Manifest1
-rw-r--r--dev-ruby/concurrent-ruby/concurrent-ruby-1.1.8.ebuild38
-rw-r--r--dev-ruby/creole/creole-0.5.0-r1.ebuild30
-rw-r--r--dev-ruby/ffi-compiler/ffi-compiler-1.0.1.ebuild2
-rw-r--r--dev-ruby/http-parser/http-parser-1.2.3.ebuild2
-rw-r--r--dev-ruby/http/http-4.4.1.ebuild4
-rw-r--r--dev-ruby/jbuilder/Manifest1
-rw-r--r--dev-ruby/jbuilder/jbuilder-2.11.0.ebuild30
-rw-r--r--dev-ruby/mini_mime/mini_mime-1.0.2.ebuild2
-rw-r--r--dev-ruby/oauth/Manifest1
-rw-r--r--dev-ruby/oauth/oauth-0.5.5.ebuild39
-rw-r--r--dev-ruby/puppetdb-termini/Manifest1
-rw-r--r--dev-ruby/puppetdb-termini/puppetdb-termini-6.12.0.ebuild28
-rw-r--r--dev-ruby/puppetdb-termini/puppetdb-termini-7.0.1.ebuild4
-rw-r--r--dev-ruby/rack-attack/Manifest1
-rw-r--r--dev-ruby/rack-attack/rack-attack-6.4.0.ebuild40
-rw-r--r--dev-ruby/redcarpet/redcarpet-3.5.1.ebuild2
-rw-r--r--dev-ruby/ruby-gettext/Manifest1
-rw-r--r--dev-ruby/ruby-gettext/ruby-gettext-3.3.7.ebuild67
-rw-r--r--dev-ruby/ruby-glib2/Manifest3
-rw-r--r--dev-ruby/ruby-glib2/files/support-glib-2.26.0.patch32
-rw-r--r--dev-ruby/ruby-glib2/metadata.xml5
-rw-r--r--dev-ruby/ruby-glib2/ruby-glib2-3.3.2.ebuild (renamed from dev-ruby/ruby-glib2/ruby-glib2-3.3.2-r1.ebuild)2
-rw-r--r--dev-ruby/ruby-glib2/ruby-glib2-3.3.6.ebuild31
-rw-r--r--dev-ruby/ruby-glib2/ruby-glib2-3.3.7.ebuild31
-rw-r--r--dev-ruby/ruby-glib2/ruby-glib2-3.4.3.ebuild21
-rw-r--r--dev-ruby/ruby-ole/ruby-ole-1.2.12.2.ebuild4
-rw-r--r--dev-ruby/ruby2_keywords/Manifest1
-rw-r--r--dev-ruby/ruby2_keywords/ruby2_keywords-0.0.4.ebuild20
-rw-r--r--dev-ruby/rubygems/Manifest2
-rw-r--r--dev-ruby/rubygems/rubygems-3.2.5.ebuild107
-rw-r--r--dev-ruby/rubygems/rubygems-3.2.6.ebuild107
-rw-r--r--dev-ruby/sshkit/Manifest1
-rw-r--r--dev-ruby/sshkit/sshkit-1.21.2.ebuild41
-rw-r--r--dev-ruby/webmock/Manifest2
-rw-r--r--dev-ruby/webmock/webmock-3.8.1.ebuild61
-rw-r--r--dev-ruby/webmock/webmock-3.8.2.ebuild61
44 files changed, 715 insertions, 204 deletions
diff --git a/dev-ruby/ast/Manifest b/dev-ruby/ast/Manifest
index a718527c899f..fee7dd721e86 100644
--- a/dev-ruby/ast/Manifest
+++ b/dev-ruby/ast/Manifest
@@ -1,2 +1,3 @@
DIST ast-2.4.0.gem 15360 BLAKE2B 1d68fa8137bf2a158e8b2e0f30d3d803791db7fcb397133681cd2ffb57badebe6f9afd792a7cf3907dc1fa3e3a617fbb0331c85c69e36a46ca49962f30be9979 SHA512 60a0b00103ed57c71907155ee7966127985021e51c1d829e2149c87066504e76fdb955f9717bb19b5627d5b8c44f0d6a165e208900ede2355a47970ee9664b72
DIST ast-2.4.1.tar.gz 11046 BLAKE2B ef2bf6e9ac6af90c2cc8844d372fd97ddef3d85f846711f1348534a58e0824b92bc7533a36eb737ff436fe79ccedf2169bd01bd740bf7cbbba89f1062bfc9f0d SHA512 270cd84c034fb017e9bb7637443b51e9ba453e467d39093e1212521372ea9ec1c27c1a71f3cc99ff58b8ce6a762b5363e1238fd98efd3bc794449641e53b0bc2
+DIST ast-2.4.2.tar.gz 11547 BLAKE2B 2745d0e7b3bea2a2a750aa36f634def78d354ea91a3b795adb84d955e95aa1302ed0a7a4e9df0961b02318b4a70ee7f3e7f509232977c4501cf4d54f8f91f8e9 SHA512 7499625d21b2edd67df4ee9248ccfaf46b77d1d161a8aa70e15f59d055abaf2b988de01c5a078bebcf0f1c0e40858cc51200327e6b6f0bea6cdbbb58c6e3f755
diff --git a/dev-ruby/ast/ast-2.4.2.ebuild b/dev-ruby/ast/ast-2.4.2.ebuild
new file mode 100644
index 000000000000..479d20450b76
--- /dev/null
+++ b/dev-ruby/ast/ast-2.4.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="ast.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A library for working with abstract syntax trees"
+HOMEPAGE="https://github.com/whitequark/ast"
+SRC_URI="https://github.com/whitequark/ast/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_bdepend "test? (
+ dev-ruby/bacon )"
+
+all_ruby_prepare() {
+ sed -i -e "/[Bb]undler/d" Rakefile || die
+ sed -i -e "/git ls/d" ${PN}.gemspec || die
+ sed -i -e "/simplecov/,+11d" -e "/colored_output/d" test/helper.rb || die
+}
+
+each_ruby_test() {
+ ${RUBY} -S bacon -Itest -a || die
+}
diff --git a/dev-ruby/bacon/bacon-1.2.0-r3.ebuild b/dev-ruby/bacon/bacon-1.2.0-r3.ebuild
new file mode 100644
index 000000000000..7db1475d3b09
--- /dev/null
+++ b/dev-ruby/bacon/bacon-1.2.0-r3.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="ChangeLog README.rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Small RSpec clone weighing less than 350 LoC"
+HOMEPAGE="https://chneukirchen.org/repos/bacon"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/rdoc )"
diff --git a/dev-ruby/bundler/Manifest b/dev-ruby/bundler/Manifest
index d75d611bc506..9f1fbc17c26f 100644
--- a/dev-ruby/bundler/Manifest
+++ b/dev-ruby/bundler/Manifest
@@ -3,3 +3,4 @@ DIST bundler-2.2.0.gem 400896 BLAKE2B a9d67d052bc6b7b8c09a6dbc249e348209a6a02bb3
DIST bundler-2.2.3.gem 401408 BLAKE2B 7162444956c65d6684a299c7ce15f64a178dab40867315241eaa3cfcb51b6973a004980abef359c911de06ce2051e5ca98e68e3df388963f40378a6f5fabda62 SHA512 da1f1dfae51cdf3dd6792fc66c33389c113579b8a723fb204ae3b315dcd1d45aed65524469336934d7276be53b026952c944457e326c97b20d4c423dd44321ef
DIST bundler-2.2.4.gem 386048 BLAKE2B 7a2cec046b75ff371df9b563a81f48c8a2a3782f75ec4868869b4b2fda5e117b6cd38daf6a566ec1201fe7a5f6b8b2c4dbe0cc552d2a63bcb4e5e9f53c710046 SHA512 f3c988278746896da276e5af5cf046c5910962c2022fc8d37ab00db1a81a69d77a1fd21fabd8a1d086891d18bfb4ac321dbb60f830b139aa7c3192ea879b4cf8
DIST bundler-2.2.5.gem 386560 BLAKE2B 070f52338e9424e571ae40c01ba559158fd9938910be4d5b1d4c8990cdaac4f6a2cb7d2a554a2e7bbb35b18a31e9d1dba5c4e711556294496ac6978ae63a94f0 SHA512 d985168531ad7415841535a496717faff2cbdcff04c8b701c0e29533f3fe5c87cb5815e6b219ab1d536c29c8c8d80b051f4f05aeb2b6fe279dc12404bf824742
+DIST bundler-2.2.6.gem 386560 BLAKE2B e1e3f50425839bbb13360fc986f98588aa09643b6fb5b8c13911b5680ef0ae2ca0b19f71ffa99234f6f6a39ca6467564f25ac26874c67b493e028f086e89c211 SHA512 58e80bb313c132125e2b601113e6e262d00f768ca75adbacbff2e98cdcd83e40aa68a8f92aa56e477c66cd396687ad6d9f54f4df9366fd6b51424b6ff5429504
diff --git a/dev-ruby/bundler/bundler-2.2.6.ebuild b/dev-ruby/bundler/bundler-2.2.6.ebuild
new file mode 100644
index 000000000000..8256c6960865
--- /dev/null
+++ b/dev-ruby/bundler/bundler-2.2.6.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+
+# The specs require a number of gems to be installed in a temporary
+# directory, but this requires network access. They also don't work
+# when run with a path that contains "-".
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+# No documentation task
+RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
+
+RUBY_FAKEGEM_BINDIR="exe"
+
+inherit ruby-fakegem
+
+DESCRIPTION="An easy way to vendor gem dependencies"
+HOMEPAGE="https://github.com/carlhuda/bundler"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+doc test"
+
+ruby_add_rdepend virtual/rubygems
+
+RDEPEND+=" dev-vcs/git !<dev-ruby/bundler-1.17.3-r1:0"
diff --git a/dev-ruby/capybara/Manifest b/dev-ruby/capybara/Manifest
index 9e8734762af1..204db0d5fe4b 100644
--- a/dev-ruby/capybara/Manifest
+++ b/dev-ruby/capybara/Manifest
@@ -1,4 +1,4 @@
-DIST capybara-3.31.0.gem 363520 BLAKE2B 246a199d89f5120bd1be7b36b5aee5bd4143ee5d1c8953cc2e65e805c234d902c5d898f873c562b8457c6e09af507cf81ddc178bcb617f2730b5db1f9ddd97c8 SHA512 920dbd331eff5300cfa575689f7c62f502cea5782ad58eff168ffc274f2622a95869a7ab90e53fc010bc7f5c0847caa5dcf69cb74eecc2a82f0f449c11be3edb
DIST capybara-3.32.2.gem 365056 BLAKE2B c193f188aec6089aabafb5d09cb540f914d8c257d3faafa0d59f674069a39c29a3750c80bb269bf2d010cc7608aec1699c7d75d96c7c85c201aaa0f99adddf83 SHA512 b1b21615b5f87012a71a7901a4f9bb9cda61f1a455299d4ad05b05e0281985a6c158a1549864e551c2ca4b97e921139b35843a1d23efc45557647328c0d1c2a3
DIST capybara-3.33.0.gem 366592 BLAKE2B fb64b301051011aa82194480bb79a33d06345cbe250fd7a32d54cb32038651f8598e860269c67efc58a87410a213f07e8f7107b725bd6286ebb93e7fd6ff125a SHA512 b169a12f330fdc016dbba6c7478cf52a51006499197bba67e6953f36929099212e209d2803511ca623b7e2b1fc0288fad1975fd426047c95680309145abb9977
DIST capybara-3.34.0.gem 369664 BLAKE2B 4f55388b809e5d808f4cc3a45690eedc86d2bacd30498af8c891757881c527b0142a8b6cf2d46302d400c77e75eee33b4206b8d01fa416211895bfcb6b5175d3 SHA512 ee722be02cc0b23b7b7c92b29c7eb702a035a95e21c10c237eb6922fbc285c43431deca8bc8e445948a767265f4e8b6ef451f46168f26f8ad6dc6e1c88966537
+DIST capybara-3.35.0.gem 371712 BLAKE2B 5c9cc5bdaa1f536d3cba104b041b937830447176b2748ceac7a729130596492fcd8242bf3eea5f062f920db7b4b1cbb12301c30feff0c51496ae128a7e123f00 SHA512 a52e20e1bbd43eb0169caef5254e3ca45082ee142b754e0e7a6d3a5796b6835afe57ca8230ec4dc1ef87305be3993b58092322c8b1de89bc564d6d51836e2245
diff --git a/dev-ruby/capybara/capybara-3.31.0.ebuild b/dev-ruby/capybara/capybara-3.35.0.ebuild
index fa400375c0b3..101193fb0c58 100644
--- a/dev-ruby/capybara/capybara-3.31.0.ebuild
+++ b/dev-ruby/capybara/capybara-3.35.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27"
RUBY_FAKEGEM_EXTRADOC="History.md README.md"
@@ -15,7 +15,7 @@ DESCRIPTION="Capybara aims to simplify the process of integration testing Rack a
HOMEPAGE="https://github.com/jnicklas/capybara"
LICENSE="MIT"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
SLOT="3"
IUSE="test"
diff --git a/dev-ruby/concurrent-ruby/Manifest b/dev-ruby/concurrent-ruby/Manifest
index 9312abeb84e9..f6efb1e0809a 100644
--- a/dev-ruby/concurrent-ruby/Manifest
+++ b/dev-ruby/concurrent-ruby/Manifest
@@ -1,2 +1,3 @@
DIST concurrent-ruby-1.0.5.tar.gz 1307802 BLAKE2B 2eee2afdd33e2609608e9389847de380eb895c2193746b1190ea96ca8bb67eaccd8d141bc2071006afbd971f078e5b6452d1e62624892c0fce2c12b8ac9fa28b SHA512 fdf7324b56bb37b4a79dc89882354e452ee838a097f522fb906c20a06856303cfbbae16f2500255cbfb4bba33ee1b3b3ee8facf3d0156e976add64209e349da6
DIST concurrent-ruby-1.1.7.tar.gz 4370284 BLAKE2B ea9120fa6c0c58d758c71d54a7a1371a2a94987141343be92e5d8150167d774b513003bc945b7a54dbae8ef1f15b371f6ec28e6e84828d653fdad5b6b58c63e1 SHA512 2af2f1236850666ef56f6024db3b094051de88bb0495b902f5be9471ded733e998b2845aacba2ff8b166d5097fccd597203502ce58766017cb67c529c2840d29
+DIST concurrent-ruby-1.1.8.tar.gz 4921836 BLAKE2B 1a58be0790af7708c58f6542b9bcf09b4f853bd180412f44cc6d18f2c058647384f2bc03f9828664c289eeabfd0721c866a143da4e4b4650d11058a2de7fdb16 SHA512 79b326721107abb972124d5e2cac32a348475d8408079747cca6a624df790c3662a8a460a9d1f0d6aceb4b4dc04fadcdc94777b58cec73d82350b3464f70b679
diff --git a/dev-ruby/concurrent-ruby/concurrent-ruby-1.1.8.ebuild b/dev-ruby/concurrent-ruby/concurrent-ruby-1.1.8.ebuild
new file mode 100644
index 000000000000..6b34f2682135
--- /dev/null
+++ b/dev-ruby/concurrent-ruby/concurrent-ruby-1.1.8.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC=""
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Modern concurrency tools including agents, futures, promises, thread pools, more"
+HOMEPAGE="https://github.com/ruby-concurrency/concurrent-ruby"
+SRC_URI="https://github.com/ruby-concurrency/concurrent-ruby/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_bdepend "test? ( >=dev-ruby/timecop-0.7.4 )"
+
+all_ruby_prepare() {
+ # Remove edge files as defined in support/file_map.rb
+ rm -rf spec/concurrent/{actor,cancellation,channel,edge,lazy_register,promises,throttle}* || die
+ rm -r spec/concurrent/executor/wrapping_executor_spec.rb || die
+ sed -i -e '/concurrent-edge/ s:^:#:' spec/spec_helper.rb || die
+ sed -i -e 's:lib-edge:lib/concurrent-ruby:' .rspec || die
+ sed -i -e 's:../../../::' spec/concurrent/executor/executor_quits.rb || die
+
+ # Remove specs for the ext gem
+ rm -rf spec/concurrent/atomic || die
+
+ sed -i 's/git ls-files/find . -print/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/creole/creole-0.5.0-r1.ebuild b/dev-ruby/creole/creole-0.5.0-r1.ebuild
new file mode 100644
index 000000000000..87c7dc48ceae
--- /dev/null
+++ b/dev-ruby/creole/creole-0.5.0-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_RECIPE_TEST="rake"
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGES README.creole"
+
+RUBY_FAKEGEM_GEMSPEC="creole.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Creole-to-HTML converter for Creole, the lightweight markup language"
+HOMEPAGE="https://github.com/minad/creole"
+SRC_URI="https://github.com/minad/creole/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/bacon )"
+
+all_ruby_prepare() {
+ sed -e 's/git ls-files --/echo/' \
+ -e 's/git ls-files/find -print/' \
+ -i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/ffi-compiler/ffi-compiler-1.0.1.ebuild b/dev-ruby/ffi-compiler/ffi-compiler-1.0.1.ebuild
index 6a0a25889c58..c927d37f8ee2 100644
--- a/dev-ruby/ffi-compiler/ffi-compiler-1.0.1.ebuild
+++ b/dev-ruby/ffi-compiler/ffi-compiler-1.0.1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/ffi/ffi/wiki"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~hppa ~sparc"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc"
IUSE=""
ruby_add_rdepend "dev-ruby/rake >=dev-ruby/ffi-1.0.0"
diff --git a/dev-ruby/http-parser/http-parser-1.2.3.ebuild b/dev-ruby/http-parser/http-parser-1.2.3.ebuild
index e3227ecbebf8..61c84cda710b 100644
--- a/dev-ruby/http-parser/http-parser-1.2.3.ebuild
+++ b/dev-ruby/http-parser/http-parser-1.2.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/cotag/http-parser"
LICENSE="MIT"
SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm ~arm64"
IUSE=""
DEPEND+=" >=net-libs/http-parser-2.8.1"
diff --git a/dev-ruby/http/http-4.4.1.ebuild b/dev-ruby/http/http-4.4.1.ebuild
index 1b3a4d077041..2383d9799f22 100644
--- a/dev-ruby/http/http-4.4.1.ebuild
+++ b/dev-ruby/http/http-4.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/tarcieri/http"
LICENSE="MIT"
SLOT="4"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm ~arm64"
IUSE=""
ruby_add_rdepend "
diff --git a/dev-ruby/jbuilder/Manifest b/dev-ruby/jbuilder/Manifest
index a13e3009ad6a..17054c761d1d 100644
--- a/dev-ruby/jbuilder/Manifest
+++ b/dev-ruby/jbuilder/Manifest
@@ -1,2 +1,3 @@
DIST jbuilder-2.10.0.gem 28160 BLAKE2B c277a59d53f30132ebe88d6afda5c221d74a399b01cedf6a4863f29e94d329137669942957a21ae9c5c192177dc9e78b6d66d9b5a29c7d4667a0432556c6b28c SHA512 a429422d65ed3eec55f46597f73a97b267fe7d6c7554ec6a6d60e1e1c0a9306b81f7283524602a30af11a141f7cd466a0f7b0a804172bd4008787462f0fa4ffc
DIST jbuilder-2.10.1.gem 28160 BLAKE2B 07bde14ee6a75b5e1cec8ee1fead688c613e76713d32d419433b0f7163a9622bcc48e4b36333eb06960a9a566784d7f31843d71259226539fe569cd178315d55 SHA512 340e9d9cff969294e22a3eea57001e69402cd47b791660a1468702e046edfe4a3cc4f8fe18b87ba63e13352d020cd8fd78fcc070a287bb8da108c531f4dc22a5
+DIST jbuilder-2.11.0.gem 29184 BLAKE2B a1a98df2d81e3d894f82a9862229b0c1f2885f3874084a9a7b1b2d8aecaf48db6777051789d3006448a22d7bbf9e7cd51b8fdf32f8f582551b4fd861d92acf32 SHA512 e76d83a39ae11f4aab5863f87630ff36fff8ef7dc0231da058b0033e80088816b33f0d061859f516ffbb1d965b26e384b233f2c0ebc6d75aa96acb411826c16c
diff --git a/dev-ruby/jbuilder/jbuilder-2.11.0.ebuild b/dev-ruby/jbuilder/jbuilder-2.11.0.ebuild
new file mode 100644
index 000000000000..8010602aa4a9
--- /dev/null
+++ b/dev-ruby/jbuilder/jbuilder-2.11.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_TASK_TEST="TRAVIS=true test"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Create JSON structures via a Builder-style DSL"
+HOMEPAGE="https://github.com/rails/jbuilder"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/activesupport-5.0.0:*"
+
+ruby_add_bdepend "test? (
+ >=dev-ruby/activemodel-5.0.0
+ >=dev-ruby/railties-5.0.0
+)"
+
+all_ruby_prepare() {
+ sed -i -e '/bundler/ s:^:#:' Rakefile test/test_helper.rb || die
+}
diff --git a/dev-ruby/mini_mime/mini_mime-1.0.2.ebuild b/dev-ruby/mini_mime/mini_mime-1.0.2.ebuild
index 6002d47e5e1b..4c8e30b4ec07 100644
--- a/dev-ruby/mini_mime/mini_mime-1.0.2.ebuild
+++ b/dev-ruby/mini_mime/mini_mime-1.0.2.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
RUBY_FAKEGEM_RECIPE_DOC="rdoc"
RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"
diff --git a/dev-ruby/oauth/Manifest b/dev-ruby/oauth/Manifest
index c8aed657606f..fcb141fdd3a4 100644
--- a/dev-ruby/oauth/Manifest
+++ b/dev-ruby/oauth/Manifest
@@ -1 +1,2 @@
DIST oauth-0.5.4.tar.gz 59141 BLAKE2B 1e588d411795b7c5b4ae5b7b3c9928b69aaa005bef858137759757e9f06d6de144408e4dba33d7fbf82a3f2586238a71b85b89c681f5d633453dfe0da954a2fb SHA512 f114f80255944934a276d0f9556ed37e4a0a72b221269cf7792f2c3a5a1504c5ec726fd5b7437b1102c648a6cf451a1c83de4689f53d30ea8c6a1d62662de535
+DIST oauth-0.5.5.tar.gz 60289 BLAKE2B 28a283bdb251b791ab6e0d50e6ed7db09445177bcaf5a99258c465e3783c5535f7d6acee356ec2f7559a942d1146ae8487260f8945f3138de670c20c60d7068c SHA512 9db8d68950b46b469777e320dea88e14506be846233f7c24e7dcdf9b57e761c43a7b715fa70f32a41b15ac7936a586e8b49a33af971fd0e9509d62827c69571f
diff --git a/dev-ruby/oauth/oauth-0.5.5.ebuild b/dev-ruby/oauth/oauth-0.5.5.ebuild
new file mode 100644
index 000000000000..016e9a7ac239
--- /dev/null
+++ b/dev-ruby/oauth/oauth-0.5.5.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26"
+
+RUBY_FAKEGEM_EXTRADOC="HISTORY README.rdoc TODO"
+
+RUBY_FAKEGEM_GEMSPEC="oauth.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A RubyGem for implementing both OAuth clients and servers"
+HOMEPAGE="https://github.com/oauth-xx/oauth-ruby"
+SRC_URI="https://github.com/oauth-xx/oauth-ruby/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="${PN}-ruby-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+ruby_add_bdepend "test? (
+ dev-ruby/bundler
+ dev-ruby/test-unit:2
+ dev-ruby/mocha:1.0
+ dev-ruby/webmock
+ dev-ruby/rack
+ dev-ruby/actionpack:6.0
+ dev-ruby/railties:6.0
+)"
+
+all_ruby_prepare() {
+ # Require a compatible version of mocha
+ sed -i -e '1igem "mocha", "~> 1.0"; gem "railties", "~>6.0.0" ; gem "actionpack", "~>6.0.0"' \
+ -e '2i gem "test-unit"; require "test/unit"' \
+ -e '/mocha/ s/mini_test/minitest/' \
+ -e '/\(byebug\|minitest_helpers\|simplecov\)/I s:^:#:' test/test_helper.rb || die
+}
diff --git a/dev-ruby/puppetdb-termini/Manifest b/dev-ruby/puppetdb-termini/Manifest
index 6938e72acf6c..3f2cfb24ffa5 100644
--- a/dev-ruby/puppetdb-termini/Manifest
+++ b/dev-ruby/puppetdb-termini/Manifest
@@ -1,3 +1,2 @@
-DIST puppetdb-termini_6.12.0-1stretch_all.deb 21290 BLAKE2B 11bc0a316517190162e7e4e5a2ce05bc880ef8412bfcf5fb66ec68545bd7779e217d5d5e75ab79f24fc6b2f68e1a962262704efb8833fdce84288d060245b898 SHA512 a742825e9f9bacf5726814474b7812393d1a51c50fd710d771c10a9e23c874a465c6859fc17485b66a2c4114ac170f2f25c5ce1be6684ff18f5da31dc9ef0744
DIST puppetdb-termini_6.13.0-1stretch_all.deb 21296 BLAKE2B 6ef6f82047f293b854e1b0d6db2933e18bc922225d1bb7fe4a3d03d2dbe5da00cdb68e7e3ac35097f466ee21de5a7ed584606684a52c088a9e31abe9fe11d7cf SHA512 bbcf8d2ed996925ead0add6899b266ca9308b01cc12d0dfa6f61956e801a092abf5a01ae4647bf96778f9fe0fa95e17bfae0a3b30576346093651141c1982ebf
DIST puppetdb-termini_7.0.1-1stretch_all.deb 21154 BLAKE2B 6b64de09d6b6c76395f79acda6322c4221cf58efb03442faee697736faa3fbfc0d3e4e0c0f318a3374a5b6b6844312a469656d3e31a5534f484c568d9d5e7fe1 SHA512 29b0e380d3e62bb714838c7e4dac0e296c69297bd4e4a4097ba006f846eb4166051d0c76195afb0a661e6e34726acbcc858e7897128f1bbe14b99a4ea44a9ff3
diff --git a/dev-ruby/puppetdb-termini/puppetdb-termini-6.12.0.ebuild b/dev-ruby/puppetdb-termini/puppetdb-termini-6.12.0.ebuild
deleted file mode 100644
index 1e0834e4f20e..000000000000
--- a/dev-ruby/puppetdb-termini/puppetdb-termini-6.12.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-inherit unpacker
-
-DESCRIPTION="Library needed to connect puppet to puppetdb"
-HOMEPAGE="https://docs.puppetlabs.com/puppetdb/"
-SRC_URI="http://apt.puppetlabs.com/pool/stretch/puppet/${PN:0:1}/${PN}/${PN}_${PV}-1stretch_all.deb"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-# will need the same keywords as puppet
-KEYWORDS="amd64 ~ppc x86"
-
-RDEPEND+=""
-DEPEND+=""
-
-S=${WORKDIR}
-
-src_install() {
- insinto opt/puppetlabs/puppet/lib/ruby/vendor_ruby/puppet/
- doins -r opt/puppetlabs/puppet/lib/ruby/vendor_ruby/puppet/*
-}
diff --git a/dev-ruby/puppetdb-termini/puppetdb-termini-7.0.1.ebuild b/dev-ruby/puppetdb-termini/puppetdb-termini-7.0.1.ebuild
index f21347cfa755..0c0c07660e9e 100644
--- a/dev-ruby/puppetdb-termini/puppetdb-termini-7.0.1.ebuild
+++ b/dev-ruby/puppetdb-termini/puppetdb-termini-7.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -15,7 +15,7 @@ LICENSE="Apache-2.0"
SLOT="0"
IUSE=""
# will need the same keywords as puppet
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
RDEPEND+=""
DEPEND+=""
diff --git a/dev-ruby/rack-attack/Manifest b/dev-ruby/rack-attack/Manifest
index 873e4e133102..00bc7af43bd3 100644
--- a/dev-ruby/rack-attack/Manifest
+++ b/dev-ruby/rack-attack/Manifest
@@ -1 +1,2 @@
DIST rack-attack-6.3.1.gem 25088 BLAKE2B 97a6f36ad3571508f68b33090644db8fb21f6eb43f8ae16b0107dd3e0e1b8b728b6eaa43959dfa8b9781672147673b750c215c9ed01366de90175ba063d5d2b5 SHA512 e6c3fbc5a09cc3d15d06b450baf911b84dd412de7b1a9d0f67661da2106d1474ea2f7c2ec6a7cf5bbd9756642be519e618134c5c7888c41f44270afc4f8aff4a
+DIST rack-attack-6.4.0.gem 25088 BLAKE2B 97f54f8d411d279731bf85ea5c43b875bdfe8f9eb32991b5c10b65cc6fd747b6b518b47da29bfccff9a037c9295f2c09b7b0c721bd24d42eaf0bda1012fc56b1 SHA512 f7d86521b65ecc92544c0f0d0af01e1de2e95d1087c732bd2e2c6aa944835bb5618bb35ca4bc60c42061627b5e8b5b030701238f42d61cd851d6b21ddb709e36
diff --git a/dev-ruby/rack-attack/rack-attack-6.4.0.ebuild b/dev-ruby/rack-attack/rack-attack-6.4.0.ebuild
new file mode 100644
index 000000000000..e716cede7381
--- /dev/null
+++ b/dev-ruby/rack-attack/rack-attack-6.4.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+# Skip integration tests since they require additional unpackaged
+# dependencies and running daemons.
+RUBY_FAKEGEM_TASK_TEST="test:units"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="A DSL for blocking & throttling abusive clients"
+HOMEPAGE="https://github.com/kickstarter/rack-attack"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+IUSE="test"
+
+ruby_add_rdepend "dev-ruby/rack:*"
+ruby_add_bdepend "test? (
+ dev-ruby/actionpack
+ dev-ruby/activesupport
+ dev-ruby/railties
+ dev-ruby/rack-test
+ dev-ruby/minitest )"
+
+all_ruby_prepare() {
+ sed -i -e '/\(bundler\|byebug\)/ s:^:#:' Rakefile spec/spec_helper.rb || die
+ sed -i -e '3igem "actionpack"' spec/spec_helper.rb || die
+ sed -i -e '/rubocop/I s:^:#:' Rakefile || die
+
+ # Avoid specs requiring a live redis service
+ sed -i -e '/should delete rack attack key/askip "requires redis service"' spec/rack_attack_spec.rb || die
+}
diff --git a/dev-ruby/redcarpet/redcarpet-3.5.1.ebuild b/dev-ruby/redcarpet/redcarpet-3.5.1.ebuild
index 6133615221b0..bfdf19b954b7 100644
--- a/dev-ruby/redcarpet/redcarpet-3.5.1.ebuild
+++ b/dev-ruby/redcarpet/redcarpet-3.5.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/vmg/redcarpet"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 x86"
IUSE=""
all_ruby_prepare() {
diff --git a/dev-ruby/ruby-gettext/Manifest b/dev-ruby/ruby-gettext/Manifest
index d93c23c99369..473048cb8c31 100644
--- a/dev-ruby/ruby-gettext/Manifest
+++ b/dev-ruby/ruby-gettext/Manifest
@@ -1,3 +1,4 @@
DIST gettext-3.2.9.gem 285696 BLAKE2B a7bc40b2102f5b937d5f0e407dbaa23ead1da59eb9284c10a249c59548d0e2ad5fcd56b8855439893d2d31b57e0109bb6a9d5cc2d24075f5e360dc16b9291137 SHA512 21496c38cfc16a2b280f30bb94ff4560007eaa7f02c2341cb26aca2969a663c0863cdb650b4eadfd262d8585111dfb572e2ebc66a7a879045de50bf9da80a501
DIST gettext-3.3.5.gem 290816 BLAKE2B 74434c3feaedc16a17ee530669dacbc4b32ae0be95eb903ce89131619e862e1c823351653ce3c5f95f0882c183e3b2fe87b423a245aa2d8803688ce7e6afb5f7 SHA512 6777b96dd73b3d454c0a14a40d2ac0eac52894fa58067ba9ec976627c96efc98b294b1498bed965d0426bcaa1b371dcde5745101e05e21e408397b4e8d31894b
DIST gettext-3.3.6.gem 291840 BLAKE2B 5ca1a48582cb46e96fd672d9dc9e65ef3d5171560cc82fae147669023dafef761b67a68f31eb32fe1e433d918efe2c4c6983c32d8985093a3f090ab718703fe4 SHA512 ed03d370c03fe7502360aeac33f924c7463d7cde6bcde85c66befe8560b221a00f995ba6208ee14d1ca9cbaad6bd37aa7d0085ed75557f5b07724468de4433a8
+DIST gettext-3.3.7.gem 292352 BLAKE2B 76232148ec89720553e7f260c7222b8c5f9eccf0dd0b0b3afa776d9fe6dc6205b21f7853fd1a1edb6e28208ebbd56e327d160af179a4b7c7aaab12965243b806 SHA512 6e7906d68b3e834e1a9d69cea26a61ffed07abd035c9a8ffc3456bc2fdcb9495700c2aaa4d099cf75f88dc6916899510208012e02d1d4f15de3d5148251b4233
diff --git a/dev-ruby/ruby-gettext/ruby-gettext-3.3.7.ebuild b/dev-ruby/ruby-gettext/ruby-gettext-3.3.7.ebuild
new file mode 100644
index 000000000000..fb6b697eafdf
--- /dev/null
+++ b/dev-ruby/ruby-gettext/ruby-gettext-3.3.7.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_NAME="${PN/ruby-/}"
+RUBY_FAKEGEM_VERSION="${PV%_*}"
+
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+RUBY_FAKEGEM_EXTRADOC="README.md doc/text/news.md"
+
+RUBY_FAKEGEM_TASK_TEST="none"
+
+RUBY_FAKEGEM_EXTRAINSTALL="locale po"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Native Language Support Library and Tools modeled after GNU gettext package"
+HOMEPAGE="https://ruby-gettext.github.io/"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc test"
+SLOT="0"
+LICENSE="|| ( Ruby LGPL-3+ )"
+
+ruby_add_rdepend ">=dev-ruby/locale-2.0.5 >=dev-ruby/text-1.3.0"
+
+ruby_add_bdepend "doc? ( dev-ruby/yard )
+ dev-ruby/racc"
+ruby_add_bdepend "test? (
+ dev-ruby/test-unit:2
+ dev-ruby/test-unit-rr )"
+
+RDEPEND+=" sys-devel/gettext"
+DEPEND+=" sys-devel/gettext"
+
+all_ruby_prepare() {
+ # Fix broken racc invocation
+ sed -i -e '/command_line/ s/#{racc}/-S racc/' Rakefile || die
+
+ # Avoid bundler dependency
+ sed -i -e '/bundler/,/helper.install/ s:^:#:' \
+ -e 's/helper.gemspec/Gem::Specification.new/' Rakefile || die
+
+ # Avoid dependency on developer-specific tools.
+ sed -i -e '/notify/ s:^:#:' test/run-test.rb || die
+
+ # Avoid tests failing due to a missing test file.
+ #sed -i -e '/test_invalid_charset/,/end/ s:^:#:' test/test_mo.rb || die
+
+ # Avoid SAFE mode test that fails on ruby 2.6
+ sed -i -e '/test_safe_mode/aomit' test/test_gettext.rb || die
+}
+
+each_ruby_test() {
+ # Upstream tries to daisy-chain rake calls but they fail badly
+ # with our setup, so run it manually.
+ ${RUBY} test/run-test.rb || die "tests failed"
+}
+
+all_ruby_install() {
+ all_fakegem_install
+
+ dodoc -r samples
+}
diff --git a/dev-ruby/ruby-glib2/Manifest b/dev-ruby/ruby-glib2/Manifest
index 1b65a51f45db..06bc2a232fec 100644
--- a/dev-ruby/ruby-glib2/Manifest
+++ b/dev-ruby/ruby-glib2/Manifest
@@ -1 +1,4 @@
+DIST ruby-gnome2-3.4.3.tar.gz 3136727 BLAKE2B 3b85136b90e7a9de14f38fbdb55d9c143719e697ff60fdd4c09921b5d0c6363cf27b7b2da55d93a95d302e62879c321df20e729d4a3d9d2e8d1f2a4afb8c6e49 SHA512 ac4614647c20080eb850d47938b00eb69730aef6672a35cf290619a5c3e01007ac59e75995e36398a0ddaed61db2f4ccdf9d26d2453fff9d5160073ee73081b8
DIST ruby-gnome2-all-3.3.2.tar.gz 2310841 BLAKE2B 8f50dc289cd097fa476a3419ffec623009395384bcfa965803f3e4e857e095866e0233e7546150c5e54d1e35f71c5e72a2880100a881ba037356208e5d3721ce SHA512 4581aad8c69db2b6be3b067ff60994fb3567d68299f634e085319ac81f51e1d681972ccba715f8e93df3adba155fa8cd3a49929cd77f6eb01856be30e551b21c
+DIST ruby-gnome2-all-3.3.6.tar.gz 2307419 BLAKE2B 80d981528a7d1ff41400e8555c7576ac299a5e3b7d3fc7f78843ae0bedfa6ad43c79d3ebef60b918236c9054b0e5de462b48a274d1fdd03f6f288ff53d6645a5 SHA512 8bcd439cee77efc70423eeec43380f080b348627384c675e3b3a810e602b5da4f04bc476eccabdf009a442d496442e7a45a23f126bde4b356af70ac9949c27f5
+DIST ruby-gnome2-all-3.3.7.tar.gz 2316976 BLAKE2B 51fa3da9941254d17332854ad1a7b1bcd016f70aba70cbad7fbdffc9e54ed6f7da8bac09b49ed152bea2cd188d5af64783ef1ad8b754abeebfad358fb261c866 SHA512 4af9a4c6f7bba2b596880ec83e4a43f2afd7f34bb0cdbb42157e65de2517d3b9504eafe08eb63f47f43035bf50351b8a0a4dd7cb1b738e67e8373191910d0bce
diff --git a/dev-ruby/ruby-glib2/files/support-glib-2.26.0.patch b/dev-ruby/ruby-glib2/files/support-glib-2.26.0.patch
deleted file mode 100644
index acb9ea657011..000000000000
--- a/dev-ruby/ruby-glib2/files/support-glib-2.26.0.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From f34f99f0c6a752084f90e52c382e329d02ad22fd Mon Sep 17 00:00:00 2001
-From: Mamoru TASAKA <mtasaka@fedoraproject.org>
-Date: Fri, 6 Sep 2019 12:19:21 +0900
-Subject: [PATCH] glib2: fix parser in MkEnums for resent GLib
-
-GLib 2.62.0 introduced some deprecation warnings for macros in gtestutils.h with the commit https://gitlab.gnome.org/GNOME/glib/commit/40ff4759774516b7dff3b07303a98fc1626b2d0e .
-This patch makes GLib::MkEnums correctly parse header files in GLib 2.62.0 again.
-From c6fba15e10d379127441902b6d80f923797eb98b Mon Sep 17 00:00:00 2001
-From: Kouhei Sutou <kou@clear-code.com>
-Date: Sun, 8 Sep 2019 11:11:40 +0900
-Subject: [PATCH] Don't capture enum typedef attribute
-
----
- glib2/lib/glib-mkenums.rb | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/glib2/lib/glib-mkenums.rb b/glib2/lib/glib-mkenums.rb
-index 37545ece8..fc9f2e93e 100644
---- a/lib/glib-mkenums.rb
-+++ b/lib/glib-mkenums.rb
-@@ -112,7 +112,10 @@ def self.parse(data, g_type_prefix, options={})
- data.force_encoding("utf-8") if data.respond_to?(:force_encoding)
- data.scan(/^\s*typedef\s+enum\s*(\/\*<\s*flags\s*>\*\/)?\s*
- \{?\s*(.*?)
-- \}\s*(\w+);/mx) do |force_flags, constants, name|
-+ \}\s*(\w+)
-+ # GLIB_DEPRECATED_TYPE_IN_2_38_FOR(GTestSubprocessFlags)
-+ (?:\s+[\w()\s]+)?
-+ ;/mx) do |force_flags, constants, name|
- enum_options = {}
- enum_options[:force_flags] = !force_flags.nil?
- force_flags_patterns = [(options[:force_flags] || [])].flatten
diff --git a/dev-ruby/ruby-glib2/metadata.xml b/dev-ruby/ruby-glib2/metadata.xml
index 79224fb562f5..9aa50bb871a8 100644
--- a/dev-ruby/ruby-glib2/metadata.xml
+++ b/dev-ruby/ruby-glib2/metadata.xml
@@ -6,8 +6,7 @@
<name>Gentoo Ruby Project</name>
</maintainer>
<upstream>
- <remote-id type="sourceforge-jp">ruby-gnome2</remote-id>
- <remote-id type="sourceforge">ruby-gnome2</remote-id>
+ <remote-id type="github">ruby-gnome/ruby-gnome</remote-id>
</upstream>
- <origin>calculatelinux-overlay</origin>
+ <origin>gentoo-staging</origin>
</pkgmetadata>
diff --git a/dev-ruby/ruby-glib2/ruby-glib2-3.3.2-r1.ebuild b/dev-ruby/ruby-glib2/ruby-glib2-3.3.2.ebuild
index ab3e829060e7..28812d439ef8 100644
--- a/dev-ruby/ruby-glib2/ruby-glib2-3.3.2-r1.ebuild
+++ b/dev-ruby/ruby-glib2/ruby-glib2-3.3.2.ebuild
@@ -12,8 +12,6 @@ IUSE=""
RDEPEND+=" >=dev-libs/glib-2"
DEPEND+=" >=dev-libs/glib-2"
-PATCHES=( ${FILESDIR}/support-glib-2.26.0.patch )
-
ruby_add_bdepend "dev-ruby/pkg-config
test? ( >=dev-ruby/test-unit-2 )"
diff --git a/dev-ruby/ruby-glib2/ruby-glib2-3.3.6.ebuild b/dev-ruby/ruby-glib2/ruby-glib2-3.3.6.ebuild
new file mode 100644
index 000000000000..b5ef2c1f6643
--- /dev/null
+++ b/dev-ruby/ruby-glib2/ruby-glib2-3.3.6.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+
+inherit ruby-ng-gnome2
+
+DESCRIPTION="Ruby Glib2 bindings"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+RDEPEND+=" >=dev-libs/glib-2"
+DEPEND+=" >=dev-libs/glib-2"
+
+ruby_add_bdepend ">=dev-ruby/pkg-config-1.3.5
+ test? ( >=dev-ruby/test-unit-2 )"
+
+all_ruby_prepare() {
+ # Skip spawn tests since our sandbox also provides items in the environment and this makes the test fragile.
+ rm -f test/test-spawn.rb || die
+
+ # Remove pregenerated Makefile since it will otherwise be shared by all targets.
+ rm -f Makefile Makefile.lib ext/glib2/Makefile || die
+
+ # Avoid native installer
+ sed -i -e '/native-package-installer/ s:^:#:' -e '/^setup_homebrew/ s:^:#:' lib/mkmf-gnome2.rb || die
+}
+
+each_ruby_test() {
+ ${RUBY} test/run-test.rb || die
+}
diff --git a/dev-ruby/ruby-glib2/ruby-glib2-3.3.7.ebuild b/dev-ruby/ruby-glib2/ruby-glib2-3.3.7.ebuild
new file mode 100644
index 000000000000..d8f7adf0af33
--- /dev/null
+++ b/dev-ruby/ruby-glib2/ruby-glib2-3.3.7.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+
+inherit ruby-ng-gnome2
+
+DESCRIPTION="Ruby Glib2 bindings"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+RDEPEND+=" >=dev-libs/glib-2"
+DEPEND+=" >=dev-libs/glib-2"
+
+ruby_add_bdepend ">=dev-ruby/pkg-config-1.3.5
+ test? ( >=dev-ruby/test-unit-2 )"
+
+all_ruby_prepare() {
+ # Skip spawn tests since our sandbox also provides items in the environment and this makes the test fragile.
+ rm -f test/test-spawn.rb || die
+
+ # Remove pregenerated Makefile since it will otherwise be shared by all targets.
+ rm -f Makefile Makefile.lib ext/glib2/Makefile || die
+
+ # Avoid native installer
+ sed -i -e '/native-package-installer/ s:^:#:' -e '/^setup_homebrew/ s:^:#:' lib/mkmf-gnome2.rb || die
+}
+
+each_ruby_test() {
+ ${RUBY} test/run-test.rb || die
+}
diff --git a/dev-ruby/ruby-glib2/ruby-glib2-3.4.3.ebuild b/dev-ruby/ruby-glib2/ruby-glib2-3.4.3.ebuild
new file mode 100644
index 000000000000..297c9e60b4da
--- /dev/null
+++ b/dev-ruby/ruby-glib2/ruby-glib2-3.4.3.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+
+inherit ruby-ng-gnome2
+
+DESCRIPTION="Ruby Glib2 bindings"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+RDEPEND+=" >=dev-libs/glib-2"
+DEPEND+=" >=dev-libs/glib-2"
+
+all_ruby_prepare() {
+ ruby-ng-gnome2_all_ruby_prepare
+
+ # Skip spawn tests since our sandbox also provides items in the
+ # environment and this makes the test fragile.
+ rm -v test/test-spawn.rb || die
+}
diff --git a/dev-ruby/ruby-ole/ruby-ole-1.2.12.2.ebuild b/dev-ruby/ruby-ole/ruby-ole-1.2.12.2.ebuild
index 322e931f685e..9e225ad03568 100644
--- a/dev-ruby/ruby-ole/ruby-ole-1.2.12.2.ebuild
+++ b/dev-ruby/ruby-ole/ruby-ole-1.2.12.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
# Avoid the complexity of the "rake" recipe and run testrb-2 manually.
RUBY_FAKEGEM_RECIPE_TEST=none
diff --git a/dev-ruby/ruby2_keywords/Manifest b/dev-ruby/ruby2_keywords/Manifest
index cac2ba9eaefe..8bb450dddf72 100644
--- a/dev-ruby/ruby2_keywords/Manifest
+++ b/dev-ruby/ruby2_keywords/Manifest
@@ -1 +1,2 @@
DIST ruby2_keywords-0.0.2.gem 4608 BLAKE2B a13fab6800dafe557ca05a14301ed37afdd0fef22b6c4a8458be758d96099dbad47c49d7b01bd3c7297aec51d971c944005f704fbdfc45d8f50249040c244250 SHA512 a7bc02980e073a899bf3de2e32711ca9820657d43cc44dede44ca31681d8586e7f808a93b6f6778aaaaf8b84da37a48c8062e69ca33477d9469e9634d616ed8d
+DIST ruby2_keywords-0.0.4.gem 5632 BLAKE2B 1d2d4a71823e61a14fdf15edc2ad8ed8df70e3f52f621940d3d3e00c18f58e76d7c18ca2ff409b1c2b5d77216f90e72e1d50bad00093fa1f7740ccf8375c11a2 SHA512 22cc0c9c08f84ee6485e02f1d1fa244219dc96846a638b428970e0876c83056b87939e8a3cddac833d6feb493e34420604e81a3973d7cfa4dc969a6639b13439
diff --git a/dev-ruby/ruby2_keywords/ruby2_keywords-0.0.4.ebuild b/dev-ruby/ruby2_keywords/ruby2_keywords-0.0.4.ebuild
new file mode 100644
index 000000000000..da9a11ff613a
--- /dev/null
+++ b/dev-ruby/ruby2_keywords/ruby2_keywords-0.0.4.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Shim library for Module#ruby2_keywords"
+HOMEPAGE="https://github.com/ruby/ruby2_keywords"
+
+LICENSE="Ruby"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
diff --git a/dev-ruby/rubygems/Manifest b/dev-ruby/rubygems/Manifest
index 763a3b631bd1..22fc80072c80 100644
--- a/dev-ruby/rubygems/Manifest
+++ b/dev-ruby/rubygems/Manifest
@@ -8,3 +8,5 @@ DIST rubygems-3.1.5.tgz 995812 BLAKE2B 43471515e4da8a6fe47a419f67f26efc9855334d4
DIST rubygems-3.2.0.tgz 982282 BLAKE2B 2895cee1d2bc4e59073cc1e3e96a7958d079da5d7a7d2eed392e6bd2fac457a738518f30365d5601511998997f578b3ce9ed65c5e41cdc80138d0ebb07df3548 SHA512 a3d0b9a577a88d8fa27d3bbdfd4bb78e419549c579dc1add4f80e4abd017cc64c441eb7ad260705cbae672937c07fdc0c76f8751bd942fea5a97953f01052f28
DIST rubygems-3.2.3.tgz 984126 BLAKE2B 3a1447738333cc27be3bbc30080b2e39be7557d9dbd9949fea21b0e6ca7c4ef3f062b5a2cd4c8004150f9dc548fe3c8e2cb174854c2d4ed7115f377662673398 SHA512 2910739e3bf3fbfdb98e71bfe97d5761ff6a6910e72004af4c3c3c050df80160c704318c62501b7283086ca3c2342cc9c8bb2ed406d5c582cb0f9d989c841c32
DIST rubygems-3.2.4.tgz 982062 BLAKE2B d74479b4798ccaf03a8940a6f76dc8f5fa28226ce29062b48e725ea47033a4f0a8d5e36df96aec97cff0b0a4eef8beb8ff14e6ac4df4596f170111e89c26841d SHA512 18f4cc79eb3ed5a48b760a6b7a1b4283d8ff7c929f712152eab6a7a389dcc9a969ec77891ee518c033546cef6584865beef4f8f33ea06172eea3ce4e172c1531
+DIST rubygems-3.2.5.tgz 982720 BLAKE2B 027343c37a9be7bc3ef1f12a2851ed1605ed5c0a55e9c23c5f42ebf92f101e2693da725ccc749ec7f48c507eb57e39d3ca91201e5f447779e373ff70d8a5273a SHA512 a12dcad3d1698fea790a4669a3183fb81958c97c702988e1ddda1f33ab953517950a38e382b366c6ecaaed3d7954190339a87c8dab77c5285ce74a858da55a39
+DIST rubygems-3.2.6.tgz 984320 BLAKE2B 846202460722a9212df0958fca9bc8df9e3b0fb9aec3fbd0887f166ee5d25226d5325918ada816b5b166544e654d501a8db80ca2d9d7f1de42decddfb39f13d6 SHA512 b9303994bc2ef8a4e66f14f745f8ae493ee2725737cea6caf557f8943ac165a4934c865542c7080bf2d7b0c0be441d4e818ee8d42fdd9ae4419540943ed695ec
diff --git a/dev-ruby/rubygems/rubygems-3.2.5.ebuild b/dev-ruby/rubygems/rubygems-3.2.5.ebuild
new file mode 100644
index 000000000000..7b3fb4d23fdc
--- /dev/null
+++ b/dev-ruby/rubygems/rubygems-3.2.5.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+
+inherit ruby-ng prefix
+
+DESCRIPTION="Centralized Ruby extension management system"
+HOMEPAGE="https://rubygems.org/"
+LICENSE="GPL-2 || ( Ruby MIT )"
+
+SRC_URI="https://rubygems.org/rubygems/${P}.tgz"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE="server test"
+RESTRICT="!test? ( test )"
+
+PDEPEND="server? ( =dev-ruby/builder-3* )"
+
+ruby_add_depend "virtual/ruby-ssl"
+
+ruby_add_bdepend "
+ test? (
+ dev-ruby/json
+ dev-ruby/minitest:5
+ dev-ruby/rake
+ dev-ruby/rdoc
+ dev-ruby/webrick
+ )"
+
+all_ruby_prepare() {
+
+ mkdir -p lib/rubygems/defaults || die
+ cp "${FILESDIR}/gentoo-defaults-4.rb" lib/rubygems/defaults/operating_system.rb || die
+
+ eprefixify lib/rubygems/defaults/operating_system.rb
+
+ # Disable broken tests when changing default values:
+ sed -i -e '/test_default_path/,/^ end/ s:^:#:' test/rubygems/test_gem.rb || die
+ # Avoid test that won't work as json is also installed as plain ruby code
+ sed -i -e '/test_realworld_\(\|upgraded_\)default_gem/askip "gentoo"' test/rubygems/test_require.rb || die
+
+ # Avoid test that requires additional utility scripts
+ rm -f test/test_changelog_generator.rb || die
+
+ # Update manifest after changing files to avoid a test failure
+ if use test; then
+ rake update_manifest || die
+ fi
+}
+
+each_ruby_compile() {
+ # Not really a build but...
+ sed -i -e 's:#!.*:#!'"${RUBY}"':' bin/gem
+}
+
+each_ruby_test() {
+ # Unset RUBYOPT to avoid interferences, bug #158455 et. al.
+ #unset RUBYOPT
+
+ if [[ "${EUID}" -ne "0" ]]; then
+ RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}" ${RUBY} --disable-gems -I.:lib:test:bundler/lib \
+ -e 'require "rubygems"; gem "minitest", "~>5.0"; Dir["test/**/test_*.rb"].each { |tu| require tu }' || die "tests failed"
+ else
+ ewarn "The userpriv feature must be enabled to run tests, bug 408951."
+ eerror "Testsuite will not be run."
+ fi
+}
+
+each_ruby_install() {
+ # Unset RUBYOPT to avoid interferences, bug #158455 et. al.
+ unset RUBYOPT
+ export RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}"
+
+ pushd lib &>/dev/null
+ doruby -r *
+ popd &>/dev/null
+
+ local sld=$(ruby_rbconfig_value 'sitelibdir')
+ insinto "${sld#${EPREFIX}}" # bug #320813
+ newins "${FILESDIR}/auto_gem.rb.ruby19" auto_gem.rb
+
+ newbin bin/gem $(basename ${RUBY} | sed -e 's:ruby:gem:')
+}
+
+all_ruby_install() {
+ dodoc CHANGELOG.md README.md
+
+ if use server; then
+ newinitd "${FILESDIR}/init.d-gem_server2" gem_server
+ newconfd "${FILESDIR}/conf.d-gem_server" gem_server
+ fi
+}
+
+pkg_postinst() {
+ if [[ ! -n $(readlink "${ROOT}"/usr/bin/gem) ]] ; then
+ eselect ruby set $(eselect --brief --colour=no ruby show | head -n1)
+ fi
+
+ ewarn
+ ewarn "To switch between available Ruby profiles, execute as root:"
+ ewarn "\teselect ruby set ruby(25|26|...)"
+ ewarn
+}
diff --git a/dev-ruby/rubygems/rubygems-3.2.6.ebuild b/dev-ruby/rubygems/rubygems-3.2.6.ebuild
new file mode 100644
index 000000000000..7b3fb4d23fdc
--- /dev/null
+++ b/dev-ruby/rubygems/rubygems-3.2.6.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+
+inherit ruby-ng prefix
+
+DESCRIPTION="Centralized Ruby extension management system"
+HOMEPAGE="https://rubygems.org/"
+LICENSE="GPL-2 || ( Ruby MIT )"
+
+SRC_URI="https://rubygems.org/rubygems/${P}.tgz"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE="server test"
+RESTRICT="!test? ( test )"
+
+PDEPEND="server? ( =dev-ruby/builder-3* )"
+
+ruby_add_depend "virtual/ruby-ssl"
+
+ruby_add_bdepend "
+ test? (
+ dev-ruby/json
+ dev-ruby/minitest:5
+ dev-ruby/rake
+ dev-ruby/rdoc
+ dev-ruby/webrick
+ )"
+
+all_ruby_prepare() {
+
+ mkdir -p lib/rubygems/defaults || die
+ cp "${FILESDIR}/gentoo-defaults-4.rb" lib/rubygems/defaults/operating_system.rb || die
+
+ eprefixify lib/rubygems/defaults/operating_system.rb
+
+ # Disable broken tests when changing default values:
+ sed -i -e '/test_default_path/,/^ end/ s:^:#:' test/rubygems/test_gem.rb || die
+ # Avoid test that won't work as json is also installed as plain ruby code
+ sed -i -e '/test_realworld_\(\|upgraded_\)default_gem/askip "gentoo"' test/rubygems/test_require.rb || die
+
+ # Avoid test that requires additional utility scripts
+ rm -f test/test_changelog_generator.rb || die
+
+ # Update manifest after changing files to avoid a test failure
+ if use test; then
+ rake update_manifest || die
+ fi
+}
+
+each_ruby_compile() {
+ # Not really a build but...
+ sed -i -e 's:#!.*:#!'"${RUBY}"':' bin/gem
+}
+
+each_ruby_test() {
+ # Unset RUBYOPT to avoid interferences, bug #158455 et. al.
+ #unset RUBYOPT
+
+ if [[ "${EUID}" -ne "0" ]]; then
+ RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}" ${RUBY} --disable-gems -I.:lib:test:bundler/lib \
+ -e 'require "rubygems"; gem "minitest", "~>5.0"; Dir["test/**/test_*.rb"].each { |tu| require tu }' || die "tests failed"
+ else
+ ewarn "The userpriv feature must be enabled to run tests, bug 408951."
+ eerror "Testsuite will not be run."
+ fi
+}
+
+each_ruby_install() {
+ # Unset RUBYOPT to avoid interferences, bug #158455 et. al.
+ unset RUBYOPT
+ export RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}"
+
+ pushd lib &>/dev/null
+ doruby -r *
+ popd &>/dev/null
+
+ local sld=$(ruby_rbconfig_value 'sitelibdir')
+ insinto "${sld#${EPREFIX}}" # bug #320813
+ newins "${FILESDIR}/auto_gem.rb.ruby19" auto_gem.rb
+
+ newbin bin/gem $(basename ${RUBY} | sed -e 's:ruby:gem:')
+}
+
+all_ruby_install() {
+ dodoc CHANGELOG.md README.md
+
+ if use server; then
+ newinitd "${FILESDIR}/init.d-gem_server2" gem_server
+ newconfd "${FILESDIR}/conf.d-gem_server" gem_server
+ fi
+}
+
+pkg_postinst() {
+ if [[ ! -n $(readlink "${ROOT}"/usr/bin/gem) ]] ; then
+ eselect ruby set $(eselect --brief --colour=no ruby show | head -n1)
+ fi
+
+ ewarn
+ ewarn "To switch between available Ruby profiles, execute as root:"
+ ewarn "\teselect ruby set ruby(25|26|...)"
+ ewarn
+}
diff --git a/dev-ruby/sshkit/Manifest b/dev-ruby/sshkit/Manifest
index df9fbf7eb227..0a0ae063367c 100644
--- a/dev-ruby/sshkit/Manifest
+++ b/dev-ruby/sshkit/Manifest
@@ -1,2 +1,3 @@
DIST sshkit-1.21.0.gem 144384 BLAKE2B f4f77d9cf00db4bc0ab6ac092dc859af31fd50976fc9425c0e5ba1b5c1607bd9b50fff44f65f0207b9d9d604c5ace153ba05ec062fb064c44673572769416a22 SHA512 981fdaa19d633e92d4e3ef5fc9255a89d992813c400af4a468e6cf12ca52cbe612b771a87afe6392c4098d07b42162d5981025b8b214aafa197a68222b5e234e
DIST sshkit-1.21.1.gem 144384 BLAKE2B 961a3646b4401b1e4548b484143f12a9bc21644f710e19539c5831bbdb2f8a70449992c23858d31ce965a2139343d6e33eaa09650a753813191d655d0e73f83b SHA512 794ff492b737190470acdf8238ae4203ce1e66916ee2caba110eee7c92026897f89ee25d30971f9244359c51cc449f954ecabfd2f6a90b068cedf5ed253f8ba2
+DIST sshkit-1.21.2.gem 144896 BLAKE2B ea72b1d0df7252f9c4ffe010721a957b5a86cc43697acf4dfd065a74cca5317deeb15692449d573a2e5590ef3a23ee666196b7b661d6986a2f270d16e2dc8d89 SHA512 37515726b67ae0e2ac9dff42cf7b71a32832ebe144aa192332780e4d9aead1a9e4c3cf7f6f0b994804175a5befd896b32908a82ba2e4f4a1d4e4b0f5bf01c3b3
diff --git a/dev-ruby/sshkit/sshkit-1.21.2.ebuild b/dev-ruby/sshkit/sshkit-1.21.2.ebuild
new file mode 100644
index 000000000000..37bf47f7d5d8
--- /dev/null
+++ b/dev-ruby/sshkit/sshkit-1.21.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+# There are functional tests that require vagrant boxes to be set up.
+RUBY_FAKEGEM_TASK_TEST="test:units"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md FAQ.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="SSHKit makes it easy to write structured, testable SSH commands in Ruby"
+HOMEPAGE="https://github.com/capistrano/sshkit"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "
+ >=dev-ruby/net-ssh-2.8.0:*
+ >=dev-ruby/net-scp-1.1.2
+"
+
+ruby_add_bdepend "test? ( dev-ruby/minitest dev-ruby/mocha )"
+
+all_ruby_prepare() {
+ sed -i -e '/bundler/I s:^:#:' Rakefile test/helper.rb || die
+ sed -i -e '/\(turn\|unindent\|reporters\)/I s:^:#:' \
+ -e '1irequire "set"; require "pathname"' test/helper.rb || die
+
+ # Fix assumption about parent directory name
+ sed -i -e '/assert_match/ s/sshkit/sshkit.*/' test/unit/test_deprecation_logger.rb || die
+}
+
+each_ruby_test() {
+ # Run tests directly to avoid dependencies in the Rakefile
+ ${RUBY} -Ilib:test:. -e "Dir['test/unit/**/test*.rb'].each{|f| require f}" || die
+}
diff --git a/dev-ruby/webmock/Manifest b/dev-ruby/webmock/Manifest
index a93538b330c4..820b5133358a 100644
--- a/dev-ruby/webmock/Manifest
+++ b/dev-ruby/webmock/Manifest
@@ -1,5 +1,3 @@
DIST webmock-3.11.0.gem 125440 BLAKE2B 8c57ca5b49922a61590595cdeeb5d3306edb3be616fd8e5c68617838831537f2106664201580f645de58322f11e684dfc8404d91139eaead5810c0cb40d5dc1f SHA512 dda7318d32dd88dcd4bc1fee9d1f4644f272348b532cbb59afde2e6a1fc42f359125b28d605ff1a18edac4ed71c00aceb1c67a364c15cfa56092e226588b449c
DIST webmock-3.7.6.gem 122368 BLAKE2B 9bc40971f1eec96d88217544acc67b7abfe6c0815a0696119e12fc5629b4f51e1164ecc982525d2c02fa50c7b1b09548c4831c1d597f06acde04a83227ba0dc9 SHA512 85455495476b22d94b23e34a92db3f0f8cf1aa5bb52ea6a8eb71f5f0bcbdad1edc13dff778c62806ec27850320e9f4e17f12525bbac552e5e105ee1ecd771efd
-DIST webmock-3.8.1.gem 122368 BLAKE2B ba956c72f20e2c21cea90b107ef445e42a6995fdb31f9af65c3b561e9e1fbb9fbd299db009a1d83ddfdb473ce030d40aadf6633e23afbd072ee3b4debf7e0be2 SHA512 b1137fabb000469ee88fdd5521756f368463ee49988d5d89b51fa8352362ff249a4849159504834933e5e1248ed9b6791d254528b3cdea461fc9e8e5d92a334c
-DIST webmock-3.8.2.gem 122880 BLAKE2B 0cd10f391377749c6420d08434c8e66230612c50bdff86b4dfd098690c006426e241c32bf716e2f8b9ee6c0ce6488d1975b54f3e4cd85cc14d6c7f0880f65701 SHA512 ae6bdda341bea804257d9f9b57d17a65a25d030ee2f5a9b7fff125a5f7881a34584c6b5d26a1e6dd5a49bba56ad5b6e731defecd109e19a5144df4caf90561d4
DIST webmock-3.8.3.gem 122880 BLAKE2B 66371028294f3b15172d718e0fa9402ad6ed1bf7beedb0c62621ad31758d25e401af9cd982a6f29cd1161a7e4d7954f6f9df22ab2e0c44c970a0edca3c0f1304 SHA512 6c845c4ed0c82ba4bb1f32d0d87a87eb945c54e159317aa14e2238b497d38282b7e81542e78c0d68d4b8d4a08e46137de84503829b7381e6d945e45474ebb507
diff --git a/dev-ruby/webmock/webmock-3.8.1.ebuild b/dev-ruby/webmock/webmock-3.8.1.ebuild
deleted file mode 100644
index 7b97e611140d..000000000000
--- a/dev-ruby/webmock/webmock-3.8.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_TEST="test spec NO_CONNECTION=true"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Allows stubbing HTTP requests and setting expectations on HTTP requests"
-HOMEPAGE="https://github.com/bblimke/webmock"
-
-LICENSE="GPL-2"
-SLOT="3"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/addressable-2.3.6 >=dev-ruby/crack-0.3.2 >=dev-ruby/hashdiff-0.4.0:0"
-
-ruby_add_bdepend "test? (
- dev-ruby/minitest:5
- dev-ruby/rspec:3
- >=dev-ruby/test-unit-3.0.0
- dev-ruby/rack
- >=dev-ruby/httpclient-2.8.0
- || ( dev-ruby/http:4 dev-ruby/http:3 ) )"
-
-all_ruby_prepare() {
- # Remove bundler support
- rm Gemfile || die
- sed -i -e '/[Bb]undler/d' Rakefile || die
- sed -i -e '/simplecov/I s:^:#:' spec/spec_helper.rb || die
- sed -i -e '1igem "test-unit"' test/test_helper.rb || die
-
- # There is now optional support for curb and typhoeus which we don't
- # have in Gentoo yet. em_http_request is available in Gentoo but its
- # version is too old. patron's latest version is not compatible.
- sed -i -e '/\(curb\|typhoeus\|em-http\|patron\)/d' spec/spec_helper.rb || die
- rm spec/acceptance/{typhoeus,curb,excon,em_http_request,patron,async_http_client}/* || die
-
- # Avoid httpclient specs that require network access, most likely
- # because mocking does not fully work.
- sed -i -e '/httpclient streams response/,/^ end/ s:^:#:' \
- -e '/are detected when manually specifying Authorization header/,/^ end/ s:^:#:' \
- spec/acceptance/httpclient/httpclient_spec.rb
-
- # Avoid specs that require network access
- sed -i -e '/when request is not stubbed/,/^ end/ s:^:#:' spec/acceptance/shared/callbacks.rb
-}
-
-each_ruby_test() {
- ${RUBY} -S rake test NO_CONNECTION=true || die
- ${RUBY} -S rspec-3 spec || die
-
- einfo "Delay to allow the test server to stop"
- sleep 10
-}
diff --git a/dev-ruby/webmock/webmock-3.8.2.ebuild b/dev-ruby/webmock/webmock-3.8.2.ebuild
deleted file mode 100644
index 7b97e611140d..000000000000
--- a/dev-ruby/webmock/webmock-3.8.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_TEST="test spec NO_CONNECTION=true"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Allows stubbing HTTP requests and setting expectations on HTTP requests"
-HOMEPAGE="https://github.com/bblimke/webmock"
-
-LICENSE="GPL-2"
-SLOT="3"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/addressable-2.3.6 >=dev-ruby/crack-0.3.2 >=dev-ruby/hashdiff-0.4.0:0"
-
-ruby_add_bdepend "test? (
- dev-ruby/minitest:5
- dev-ruby/rspec:3
- >=dev-ruby/test-unit-3.0.0
- dev-ruby/rack
- >=dev-ruby/httpclient-2.8.0
- || ( dev-ruby/http:4 dev-ruby/http:3 ) )"
-
-all_ruby_prepare() {
- # Remove bundler support
- rm Gemfile || die
- sed -i -e '/[Bb]undler/d' Rakefile || die
- sed -i -e '/simplecov/I s:^:#:' spec/spec_helper.rb || die
- sed -i -e '1igem "test-unit"' test/test_helper.rb || die
-
- # There is now optional support for curb and typhoeus which we don't
- # have in Gentoo yet. em_http_request is available in Gentoo but its
- # version is too old. patron's latest version is not compatible.
- sed -i -e '/\(curb\|typhoeus\|em-http\|patron\)/d' spec/spec_helper.rb || die
- rm spec/acceptance/{typhoeus,curb,excon,em_http_request,patron,async_http_client}/* || die
-
- # Avoid httpclient specs that require network access, most likely
- # because mocking does not fully work.
- sed -i -e '/httpclient streams response/,/^ end/ s:^:#:' \
- -e '/are detected when manually specifying Authorization header/,/^ end/ s:^:#:' \
- spec/acceptance/httpclient/httpclient_spec.rb
-
- # Avoid specs that require network access
- sed -i -e '/when request is not stubbed/,/^ end/ s:^:#:' spec/acceptance/shared/callbacks.rb
-}
-
-each_ruby_test() {
- ${RUBY} -S rake test NO_CONNECTION=true || die
- ${RUBY} -S rspec-3 spec || die
-
- einfo "Delay to allow the test server to stop"
- sleep 10
-}