gentoo auto-resync : 04:09:2022 - 16:22:09

16 files changed, 46 insertions, 156 deletions

diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index bfef97580dc6..3361dd896b3c 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/jbuilder/Manifest b/dev-ruby/jbuilder/Manifest
index b4e75bd4b2ed..0a13aa223ec4 100644
--- a/dev-ruby/jbuilder/Manifest
+++ b/dev-ruby/jbuilder/Manifest
@@ -1,7 +1,3 @@
-DIST jbuilder-2.10.1.gem 28160 BLAKE2B 07bde14ee6a75b5e1cec8ee1fead688c613e76713d32d419433b0f7163a9622bcc48e4b36333eb06960a9a566784d7f31843d71259226539fe569cd178315d55 SHA512 340e9d9cff969294e22a3eea57001e69402cd47b791660a1468702e046edfe4a3cc4f8fe18b87ba63e13352d020cd8fd78fcc070a287bb8da108c531f4dc22a5
-DIST jbuilder-2.11.2.gem 30208 BLAKE2B 48378a403b1949fd4dd66f468927ae9ca76ddcb88d2929ffb2c9c87b9c4d4daa4bfc147f22fc2d3578eae61e3391ecaf7dc49c324aff09c2884adcdb0aef5113 SHA512 1608649fa7f67dd09b5ac05f2e93aa78a8c25a8f29df1bacff7add554a2cb104aadaefef4b98a279a8d01fdc70372729ca05e716c81bfa55adaac7f7cfe78386
 DIST jbuilder-2.11.5.gem 27648 BLAKE2B 0a40c82ad1f68df5748be4425605eafd03bcd0262957915bc491037c45c21f5542ffae3d3f4e7dc8a20874f96dc1a7c3c3dd348a4c09b08f15117ca45103d260 SHA512 65caea9426cfe146fd4aaf0c9313e04f8f9d23d72faf959da4042d090f4e31be6a7040418fa9e6dc3f02e8acb3a0e2b5d3216af4f2fed8761b70a35101f4eb96
-EBUILD jbuilder-2.10.1.ebuild 644 BLAKE2B 89850b0a764f25a24d1680206aeb4b6bd1ac7a531fb6d46245790ca5c640185802f05d6f2076dd957523ca22a1ae39d8729191e6f8df88a2c338836b5be6aefb SHA512 db7d0a374a0af947ff8a57873e177e883cdf279eb6c114dc5298316417d52d05b69b16a0f42254887d45ee0ac58ec4aa3560fd6885a60adc117084981e6a5c55
-EBUILD jbuilder-2.11.2.ebuild 644 BLAKE2B ff34c4bfebc0a3a8e80c940bb4ee13a7ad1813c6a9940cba2e797ac528df8479db6b1d4caacef1fc6190930de8a2a34e0fe00d6f33b92a85251ad37fd0406351 SHA512 d8a390abd926c804ea13a4f78b2caf1880b64d771791b02fb88b0ba563c86044ce107b7e6ce8abdde08663278ae4c87c08a48f232a1245ec9742f35151f969b9
 EBUILD jbuilder-2.11.5.ebuild 627 BLAKE2B 92875efeb875a810287ce714e7b001e46ee2258cc54d422b7cefd0868f8ee963c08a5c002442532033086863e79496f2291e3a460c240d78a8a30b2c34f002e9 SHA512 0f88756378314f939dec106fbbc22359beaca6131dedf46d02d9d7194f45c0a612eb66a1ca69f34f0eb9ab308486e769b1fe3a0408930733343c607846dbc3b9
 MISC metadata.xml 327 BLAKE2B 32dc77dd578d2e654c1aa3fddfd6c9a7c2b735fd9a7ac5ff62836bc015b72c209f64ef672ce8bd49107d883ef2655fde7ab8dc3c5bf9ae0904d18d8d28acf5be SHA512 fed45cd3a48b9909cfd7447fe71323c9d28e4660115c5c758ab171823ea9942afe8eca0d8a8a6f4d947a921f1974d901b9f97ed43b33282f927e138dc4831740
diff --git a/dev-ruby/jbuilder/jbuilder-2.10.1.ebuild b/dev-ruby/jbuilder/jbuilder-2.10.1.ebuild
deleted file mode 100644
index b37ef8d2e4b1..000000000000
--- a/dev-ruby/jbuilder/jbuilder-2.10.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 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/jbuilder/jbuilder-2.11.2.ebuild b/dev-ruby/jbuilder/jbuilder-2.11.2.ebuild
deleted file mode 100644
index 8010602aa4a9..000000000000
--- a/dev-ruby/jbuilder/jbuilder-2.11.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# 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/rails-html-sanitizer/Manifest b/dev-ruby/rails-html-sanitizer/Manifest
index 5d4d79accfdb..96ac2b69d3cf 100644
--- a/dev-ruby/rails-html-sanitizer/Manifest
+++ b/dev-ruby/rails-html-sanitizer/Manifest
@@ -1,5 +1,3 @@
-DIST rails-html-sanitizer-1.4.2.gem 16896 BLAKE2B 97f09d43ad99c13c07c34c0f5c47e3b34983b94773923cf7d131d1115d818ede619fc0ef268c5523524c53178afde2c9ee2652617add6b4efc282d190591be80 SHA512 9f0872f1000c758918f66a889322d3393ec678604eb3b01fc21bbb861189ec04fcf05f5c9487bd5eeb63ce6d99a80064718c82bfce2daf25c07754979a2ed747
 DIST rails-html-sanitizer-1.4.3.gem 17920 BLAKE2B 2745ce137612337d4d85593b0af9a3e5102e399957b71dea366cc864a1acc66bb2bd099bd53701c71925ba64ae0287896bbd33eb64bb5ec22cbcbfb3173953dc SHA512 ead339d8ed5aefa737298d886a0db3c353254cfa57bdee7d2011f596ed2871dcad3bd16561728da2447e239fcaa908256bb6436493462bca6310a17a3812ffd9
-EBUILD rails-html-sanitizer-1.4.2.ebuild 846 BLAKE2B 5d9e73cda1113fde701b7f468b2769e6dfde28e499246df3cb6edfe3a11246145c3b875c83871cc91e6ab79d8d0acb851c3c49c643ee8cb07343cc0a937b64f7 SHA512 98af080e21fcc33608e96c93a33a18a91c0432f3cf276c8d3fac60294237e2ce7f37e3081c7a0ef050c24a8185375bc9c777fe04cb9f06dda8591fa662e7a54f
 EBUILD rails-html-sanitizer-1.4.3.ebuild 853 BLAKE2B 06d92b2f67342493ed538217eb0b4905de31e4afd3fb89bdc2799ee0353332736a1a5c3ee214aab4b9d301f2893a58f58f742de470aebaab6265278f506ba109 SHA512 a15208cc132e3e5fcc1d21a40431a57e336825c8f7c26d204ed9ce6da1aa29f70d7b12cced942acb05692cabc97e6421d9b09b63b16aa53ee8b9429593f7953b
 MISC metadata.xml 360 BLAKE2B e7d08120d5b72f9cf58b105b3ee904c54d8c45917ad7ca640c309e133b9fcc19476e60e247a66ddf317e7fd83dfaecad4dd17206f40fed73c5d01b7556f4e07b SHA512 31bcb326d30a4b9af02e12dcbf06d44c6e8ea7cd358aa2eb2443b640dff6fd9067e9d80c9e9f08320bac2195bae9bda2afb8ac6d8752940b8a2104ec4515daa2
diff --git a/dev-ruby/rails-html-sanitizer/rails-html-sanitizer-1.4.2.ebuild b/dev-ruby/rails-html-sanitizer/rails-html-sanitizer-1.4.2.ebuild
deleted file mode 100644
index 060f48c8bf9a..000000000000
--- a/dev-ruby/rails-html-sanitizer/rails-html-sanitizer-1.4.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Sanitize HTML fragments in Rails applications"
-HOMEPAGE="https://github.com/rafaelfranca/rails-html-sanitizer"
-
-LICENSE="MIT"
-SLOT="1"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/loofah-2.3:0"
-
-ruby_add_bdepend "test? ( dev-ruby/rails-dom-testing )"
-
-all_ruby_prepare() {
-	# Avoid tests that depend on nokogiri patches to libxml2.
-	sed -i -e '/\(name_action\|attr\)_in_a_tag_in_safe_list_sanitizer/askip "libxml2"' test/sanitizer_test.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -e 'Dir["test/*_test.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/rbst/Manifest b/dev-ruby/rbst/Manifest
index 6e73456daa55..1dc0897af7e2 100644
--- a/dev-ruby/rbst/Manifest
+++ b/dev-ruby/rbst/Manifest
@@ -1,4 +1,3 @@
 DIST rbst-0.6.5.tar.gz 15760 BLAKE2B 3bace4401c8c92eba286f242c1e074aa833094c21e4b00bfa2eee982ad8cbb94024dda2210eb1c72ab88293b1a63a62a5bdeafde2615b0430bd0a7cc21ced14c SHA512 2d4a28c70a4925e1ffe0cd2ff10c275f67cae4a918c1064bd73cb8e7e490be251acff09670d78fef1edeb1a7dab8995aa0b4737563a0797ff66c0fee3f89bba2
 EBUILD rbst-0.6.5-r1.ebuild 1223 BLAKE2B 2aa02b7a443da34f7737cf8d3a969fca22ac7891b7732099a0af66dd2cd99670ed0caad198ddbb43a738b683fddce41dd8585648ecb7394f147e6bd3ebc6ac3d SHA512 9a77fb0a811524ff293e9cd69cd2fe456a5ad396cf94c1f6d55c8021e7de0b93f988830149c9e23cad7595f4a4985f8dc9eabd9ac9a152a5ed7b21b86d82b608
-EBUILD rbst-0.6.5.ebuild 1132 BLAKE2B 14b2ad516618aafcb59c630b66274a80f8bbaef53edbd3dd783c1935541db02dc09022466fc27619ab6db6a53c94deec077d19fa1586a34400ca4a443c71929d SHA512 1ffc64c5ac70f6cec50769fd4ee09d3fd83e8628df4edc36d1bcb2c53ed92235e9dfc52cb1855e5730db2ec414e52cb6df90a18102fb5d3aaef3b83473afc144
 MISC metadata.xml 248 BLAKE2B f308d2aa052d11e427850af58bbebf95e7773f5562ed221f39043474b4c3827d724d49667edf1874272a5586a13201159f40e8f5eafb7e400e79c6566e1a6ac2 SHA512 b875c838394523483ae7d93585207eb3c642a345bbb08e1dcef3ceb737c813fa779e2f5479d48cdcc30732b8a0a9e6ecc648df940def6731e4dff43b23786e6d
diff --git a/dev-ruby/rbst/rbst-0.6.5.ebuild b/dev-ruby/rbst/rbst-0.6.5.ebuild
deleted file mode 100644
index 7390ccd1e168..000000000000
--- a/dev-ruby/rbst/rbst-0.6.5.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_NAME="RbST"
-RUBY_FAKEGEM_GEMSPEC="RbST.gemspec"
-
-inherit python-single-r1 ruby-fakegem
-
-DESCRIPTION="A simple Ruby wrapper for processing rST via docutils"
-HOMEPAGE="https://github.com/alphabetum/rbst"
-SRC_URI="https://github.com/alphabetum/rbst/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	dev-python/docutils
-	${PYTHON_DEPS}"
-DEPEND="
-	test? ( ${RDEPEND} )"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/minitest-5.14.0:5
-		>=dev-ruby/mocha-1.1.0:1.0
-	)"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	ruby-ng_pkg_setup
-}
-
-all_ruby_prepare() {
-	# do not use bundler
-	sed -i -e '/bundler/,/end/d' \
-		Rakefile test/helper.rb || die
-	# do not use python2
-	sed -i -e '/python2/,/end/d' \
-		test/test_rbst.rb || die
-
-	# force our python version
-	sed -i -e "s:\(python_path=\"\)python:\1${EPYTHON}:" lib/rbst.rb || die
-	python_fix_shebang lib/rst2parts
-}
diff --git a/dev-ruby/roadie-rails/Manifest b/dev-ruby/roadie-rails/Manifest
index c690557f6357..e1323ebaf779 100644
--- a/dev-ruby/roadie-rails/Manifest
+++ b/dev-ruby/roadie-rails/Manifest
@@ -1,5 +1,5 @@
 DIST roadie-rails-2.3.0.tar.gz 61709 BLAKE2B 7616f27199f3ad6733becc62e0cb4946ad2d01ff78ed5ecb79f49b2ab91ff29f173450c90364ab62af68b62a1e2e64060f32e41032f8d0b7596934be9f34733b SHA512 454d1eda70cf055c7343d5ba80124e9663084464cbbe0811f770bf6ae4a39c0ac40332983cd86b6b92e3bf50bf1da722f5ba5e631f69a355f5b5be73d9502458
 DIST roadie-rails-3.0.0.tar.gz 62724 BLAKE2B d9e960f97a491724b80d3064304e4875b1a12e7570e6c6ed8c373bf0dc73cf0828d1c5f3cb2ea57c485bbca832ce9cd9ba5c7ca798c4695a36b0c7925826eb91 SHA512 061635e9d5d6c4f752f8f105c0fef0b0ac9cd46cec7669b43295fecb80fd2232e211f033af9f9fe457a3c2c6ea04921ffcc9abe6f8b375f2df8b8bc8bfa64512
-EBUILD roadie-rails-2.3.0.ebuild 1852 BLAKE2B 56a283a43b360fd22637163e93104cd2c99850fa3ac5fe9e527388302bbdd1ef97e1ac00a01e0f1364b35a8399d07acc4f3eec7558fb12bd9f7b0f87b44b0263 SHA512 73bee5b74f594e6030ddfbbedea6f4a7f0fbc06c972592795c1d1622c6ee0ac77216188066c6ba74a1c5a8dab01a7e906add158bca85e31e7d881cb7b9ac65e2
+EBUILD roadie-rails-2.3.0.ebuild 1826 BLAKE2B ab1d34728d25e081fb5903da9392095c99eac2340750fd3a911d2307c33d1fdc1a0af6dbabff5a676b31e5a8aa4f9d8949e839d62f36aecebe1cd8a14a918a4e SHA512 b13cb817cab17d552002784fbfafb88d6213df8a767b81ecf300c2a00146e7e11f9fe05b0c16b5721219b69a67d47e65dbefc4b4a55ccf6fb56df92cffdf302d
 EBUILD roadie-rails-3.0.0-r1.ebuild 1997 BLAKE2B 9346930a94fe4e3befafa1275fdb38dc602c1e357b6b3a9535e6919c0378fda7e3a5b7dfd89f888d2e910c94fd3e7fd81dbb353b3b149a3e69efa8a13fff1f57 SHA512 48b1db73249a581d47f0a2b06e4365ebe517a68c2ba118dec5430132a63716c2b20d4e373ea30eb14695df9c77cd0a88ff4a689fd2014e7280c697cefe0f63bc
 MISC metadata.xml 335 BLAKE2B 6ca09a61dab3b094b39d25ed398ddf94202e32c9173a7df990d8929cad1d19f12619c72f2cb69a735b2428c16c3e27183d3cc0efd213e419f6c4474264eb8a11 SHA512 f2b96e715dd1be8143e1562aeaf866198c9756af2137708a20b602831184e32e57056f9f9cc0e26001f2831c2764ce34510145879451ada4f37735796593bf4b
diff --git a/dev-ruby/roadie-rails/roadie-rails-2.3.0.ebuild b/dev-ruby/roadie-rails/roadie-rails-2.3.0.ebuild
index 91f4b1b6d504..fb1e1b8a48cc 100644
--- a/dev-ruby/roadie-rails/roadie-rails-2.3.0.ebuild
+++ b/dev-ruby/roadie-rails/roadie-rails-2.3.0.ebuild
@@ -25,7 +25,7 @@ ruby_add_rdepend ">=dev-ruby/roadie-3.1:4
 ruby_add_bdepend "
 	test? (
 		dev-ruby/bundler
-		|| ( dev-ruby/rails:7.0 dev-ruby/rails:6.1 dev-ruby/rails:6.0 dev-ruby/rails:5.2 )
+		dev-ruby/rails:7.0 dev-ruby/rails:6.0 dev-ruby/rails:5.2
 		dev-ruby/rspec-rails
 		dev-ruby/rspec-collection_matchers )"
 
diff --git a/dev-ruby/sdoc/Manifest b/dev-ruby/sdoc/Manifest
index a9b5608f6875..6801a7121117 100644
--- a/dev-ruby/sdoc/Manifest
+++ b/dev-ruby/sdoc/Manifest
@@ -1,3 +1,4 @@
 DIST sdoc-1.1.0.gem 269312 BLAKE2B d830a0477bb2a46f8f4c08b0249293ca56d5a398eab36dd1a91f4fdb134611065053f1d445697f249be3fb2d672f2ed95a462f045c953b48e9bdfd30b147a675 SHA512 7bd6bc4725b020adb504ec5c2cbc7387f46e8cddc8c3be5643c1808f203d0663326958c2d039fbb3c384369be1ff1363c162c8868b8906605de76a1e60a3c0a1
+EBUILD sdoc-1.1.0-r1.ebuild 832 BLAKE2B 2e972913c96b9b9c416e2c2c8e7573bf23c821f10d07741502c84d49df1a82d9204510d3e76bd995ac43dda19905b0ddfd905c0a68f79e91c3249939e5636d8b SHA512 81c8ad3e94907e8ed9789f7fdf49265c34d5c45d87621247cd58ec7c509aa62f50cbf145ac9bb6cba9f806cd9e68c199c4d796e2b2469de2d73f378cbfa7d0d8
 EBUILD sdoc-1.1.0.ebuild 729 BLAKE2B 67b87c231192b7abccae12a3de8eded58471c6f4c288d76e7fe638755ec61855e5068facedd5346186074ce0efd4b47b310a44c1dab53e36bcf680e42120b4f1 SHA512 7af7dd7ba374feaeb1e68977623e18a84988e15b2c6d3dace8d49dc37475e3f62783472583b7feee36079442919eb332012b222f655ee443281945eb79904108
 MISC metadata.xml 431 BLAKE2B 34e1442227382ee401e2e2de286173d3b28c66a01e9f89eb418a72dd908c7f15c22aeb9d52ef2fee83d088c9b77887b2645d47a58984d24c4fd50a71897982c1 SHA512 f2fd8c3f1d78b2ad742586e41486141c55bfb2369d116f00b8613cb9e020fe071349855fa0ea8e77a0688a84d0c83814ae58d2b392f8e74b8d0e6885bf0691e4
diff --git a/dev-ruby/sdoc/sdoc-1.1.0-r1.ebuild b/dev-ruby/sdoc/sdoc-1.1.0-r1.ebuild
new file mode 100644
index 000000000000..5458093ea0e9
--- /dev/null
+++ b/dev-ruby/sdoc/sdoc-1.1.0-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby27 ruby30 ruby31"
+
+inherit ruby-fakegem
+
+DESCRIPTION="rdoc generator html with javascript search index"
+HOMEPAGE="https://rubygems.org/gems/sdoc"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~riscv ~x86"
+IUSE="test"
+
+ruby_add_rdepend ">=dev-ruby/rdoc-5.0"
+
+ruby_add_bdepend "test? ( dev-ruby/minitest )"
+
+all_ruby_prepare() {
+	sed -i -e '/git ls-files/ s:^:#:' sdoc.gemspec || die
+
+	sed -i -e '/bundler/I s:^:#:' Rakefile spec/spec_helper.rb || die
+
+	# Avoid spec that appears to be broken with newer rdoc versions.
+	sed -i -e '/should display SDoc version/askip' spec/rdoc_generator_spec.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} -I lib:spec:. -e 'Dir["spec/*_spec.rb"].each { require _1 }' || die
+}
diff --git a/dev-ruby/sprockets-rails/Manifest b/dev-ruby/sprockets-rails/Manifest
index d555407e90a7..ff0df261d76b 100644
--- a/dev-ruby/sprockets-rails/Manifest
+++ b/dev-ruby/sprockets-rails/Manifest
@@ -1,3 +1,3 @@
 DIST sprockets-rails-3.4.2.tar.gz 111038 BLAKE2B 36495540d8756bd44ba55ed0bf055c35ed963e1d5a8214766f61ff86515285babd409f44816bd9dae8321dd5473f7f5515d2c1c5ffa6b6042788ee50b4bfd247 SHA512 a01a23b189bc0fcde8fa3a0734c239dc9ee9119ca7a0828f04974cc28344e6c5743a6f60f1ab8ae8ed28c0e111103948209593ccd88dc974e2d12b55a1a2b49a
-EBUILD sprockets-rails-3.4.2-r1.ebuild 833 BLAKE2B 7470cac150ed8c14104e83a78edac4a45b95195c927c1c3307bc41c5f87c135093cd07051bacd7a9cb8c57b53874e8021767bb6f9d06d6935d7e2bc472e15373 SHA512 d24e3ff3e779ea62d2e30f3bccf79b5113a37dc1d1b5ebf6e93f39bb338f36084574761e1c6ebe1edbfa8840d3c4be5f9e135e49d55e1638ca6cb80c8a9c9498
+EBUILD sprockets-rails-3.4.2-r1.ebuild 948 BLAKE2B 36ea94964fdf436439d8e4df39a3421c8fb3ceef230d8c913705be31c12fd9e2d9a5efd331a1930c4cb8f588920935c514474bf2286b0fcf952f5817f85dbba0 SHA512 0c2ed1050d0be34c72c27ce88fbcc070596bfee5052568215fb5bbf8640ec1dcfd8265cd4e3b5cfe4b1922431ed712ba4b5c1878154df7710fd06331f9711023
 MISC metadata.xml 348 BLAKE2B 0682ae79b86466b0908cd13f3eed20718fa6d3ab12a65579666242049ff37e58d57ec2f40bb3fc67a6ea441cea091542d2afdc35b5f3819b7925cd95420e5536 SHA512 1789cac2bf0b961b771f12135bf77769aa20cd019178c782105a1798107bb944e5aa8f8f54c13feecdf89f0461b307be09ad5b7a87c53b9b93fb5dbd3f0381ed
diff --git a/dev-ruby/sprockets-rails/sprockets-rails-3.4.2-r1.ebuild b/dev-ruby/sprockets-rails/sprockets-rails-3.4.2-r1.ebuild
index cbec5f9a1a2a..a3e90d048c61 100644
--- a/dev-ruby/sprockets-rails/sprockets-rails-3.4.2-r1.ebuild
+++ b/dev-ruby/sprockets-rails/sprockets-rails-3.4.2-r1.ebuild
@@ -33,4 +33,7 @@ ruby_add_bdepend "
 
 all_ruby_prepare() {
 	sed -i -e '/bundler/ s:^:#:' Rakefile || die
+
+	# It looks like tests are order dependent
+	sed -i -e '/test_order/ s/:alpha/:random/' test/test_helper.rb || die
 }
diff --git a/dev-ruby/sshkit/Manifest b/dev-ruby/sshkit/Manifest
index 79e03c815a53..c69a240f032c 100644
--- a/dev-ruby/sshkit/Manifest
+++ b/dev-ruby/sshkit/Manifest
@@ -1,3 +1,3 @@
 DIST sshkit-1.21.2.gem 144896 BLAKE2B ea72b1d0df7252f9c4ffe010721a957b5a86cc43697acf4dfd065a74cca5317deeb15692449d573a2e5590ef3a23ee666196b7b661d6986a2f270d16e2dc8d89 SHA512 37515726b67ae0e2ac9dff42cf7b71a32832ebe144aa192332780e4d9aead1a9e4c3cf7f6f0b994804175a5befd896b32908a82ba2e4f4a1d4e4b0f5bf01c3b3
-EBUILD sshkit-1.21.2.ebuild 1160 BLAKE2B 89456a82c657258224ed48d0ae8e0e19f287df2d0a6b6fcdcaae39e136fe5ae99f981bcaf3729e80bdfb9a2994d05f3ba379cd08185e1ff3e55af8a1320f6187 SHA512 353667bcdf99837b356de993fdfec35e21299143049b25c25d96a0915f4870bd7ee8cb484adb077ac1f43ca37eeffa608054578453e310c316c1b8b13ac518c9
+EBUILD sshkit-1.21.2.ebuild 1208 BLAKE2B 4240618ec12cc2cadde00046284f25373fa2e2947665825ad4b43a14ec6e4e2096058bb056c771caed7c49077761cad75e608144b06b0ac33f105ec20b63874e SHA512 1fa0618cb58837051de4649ab3bd893e196389348fcb4e2707b6c7d06efe0aaed79eb56c113386a33071da3f521af8fa584027bfc843b1820b3015def9bab4f6
 MISC metadata.xml 344 BLAKE2B 16679900db0e4f70c9afc7fee058f72fd4df86453f5870666a329d1af1380894b7e592b89e02a4b23a07307765778f302cbd3166e45da66bcabe66b97b450d08 SHA512 afe79f300e02bfbcff4e984092bde60d4a8c6c528a0fd2816456bb5bb12c03aff61512e94e4ecbd6e76a947c2e5e22a433bb32fd052e7e0ac6e78814803f20a1
diff --git a/dev-ruby/sshkit/sshkit-1.21.2.ebuild b/dev-ruby/sshkit/sshkit-1.21.2.ebuild
index 339616db4166..ab2109f97a2d 100644
--- a/dev-ruby/sshkit/sshkit-1.21.2.ebuild
+++ b/dev-ruby/sshkit/sshkit-1.21.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby27 ruby30"
 
 # There are functional tests that require vagrant boxes to be set up.
 RUBY_FAKEGEM_TASK_TEST="test:units"
@@ -24,12 +24,14 @@ ruby_add_rdepend "
 	>=dev-ruby/net-scp-1.1.2
 "
 
-ruby_add_bdepend "test? ( dev-ruby/minitest dev-ruby/mocha )"
+ruby_add_bdepend "test? ( dev-ruby/minitest dev-ruby/mocha <dev-ruby/net-ssh-7 )"
 
 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
+	sed -e '/\(turn\|unindent\|reporters\)/I s:^:#:' \
+		-e '1irequire "set"; require "pathname"' \
+		-e '1igem "net-ssh", "<7"' \
+		-i 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