17 files changed, 16 insertions, 222 deletions
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index da2612512cc3..26502f867d47 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/rest-client/Manifest b/dev-ruby/rest-client/Manifest
index c05fdf9d9224..968c76a69114 100644
--- a/dev-ruby/rest-client/Manifest
+++ b/dev-ruby/rest-client/Manifest
@@ -1,4 +1,4 @@
 DIST rest-client-2.1.0.gem 147456 BLAKE2B 602e3cea1bdb117ad8b783d30741f699b18085fd6dd4f0d26a8a8f3b658bc6f807357a7412eaae312566f1b4d5ee7e311f51d5fd4a8eb9063e8552335b019a2e SHA512 fe5d44409dfe607566b4c0324441d9a3981776699027bfbc92283b1cd425f204211fc872593cb0784e0ca7a5e061e98793540eedfeb1891d9a8afd53a5ce01de
-EBUILD rest-client-2.1.0-r1.ebuild 1051 BLAKE2B 7e0e7f8570c43fdd4a184cf9fc6337d66f6143af02c1209700e336d9e30373de08f6e28ceed27c7a8b1142ef611993cf6dd36e63bf8ad79c8bba927d1ab27c5b SHA512 6bdd709f017918907b4f12d2cb8593bd3884f40ef4293308f3b9c672af09d2d1dc20851fa0e61733704e59c455a4a241bb6c74e1d8f6d88bffaaa489b620fb49
+EBUILD rest-client-2.1.0-r1.ebuild 1050 BLAKE2B bac93429e1867d1265ed8e57b840e0af159b20343a2b40d9d634f2e72efc0440a097bece35a40d6fe8028a1627a2fe64d6ae0bc5fdcb30e5972ad7f5f5619413 SHA512 e98efb43f36c498e5da57751096478ade893057f0c3f17210395ac7965371ebac2526f7bfb12fbb47b700a722b00a74eb3cb2799ab51edbddd50126f9410f426
 EBUILD rest-client-2.1.0.ebuild 870 BLAKE2B 37ac664708d1a85f6bfc12b890fa6c0e3bb902ece733f09182c4110ced924490e2cf86798a8c6422f5d6c938bdeeb30879083594b8a7ecdff11551ed2595999f SHA512 4c74e8c2869d496d1d3bf5e9ecb64d624985636bde8b1c92faea6b2770b17dee253c3de95ab2c406b6cfce886f3d0bdb82f64636d3f4d0c3bcef8d239d2644b9
 MISC metadata.xml 350 BLAKE2B 0f9bc9df0eb60fb95afbfbe988a68f7f13c2bf30e12a2c0a50e752a55b60e4453782ffe56570c8bd413502a376f03b1d18652514a4048389e66f6e383e21ecdc SHA512 1088d5d495489ccc952b2a3edc4db6b5a96b237be2b06ba31775744c4d088fe16c17bea4fd933bfabd1a84cf6b68a1d7419389cb0cc94f86d3f493108a6ac3c8
diff --git a/dev-ruby/rest-client/rest-client-2.1.0-r1.ebuild b/dev-ruby/rest-client/rest-client-2.1.0-r1.ebuild
index 15a40705be54..2dbf738f2748 100644
--- a/dev-ruby/rest-client/rest-client-2.1.0-r1.ebuild
+++ b/dev-ruby/rest-client/rest-client-2.1.0-r1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/rest-client/rest-client"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE=""
 
 ruby_add_bdepend "test? ( dev-ruby/webmock:3 )"
diff --git a/dev-ruby/rjb/Manifest b/dev-ruby/rjb/Manifest
index 2e0abb3f3676..3d6011788644 100644
--- a/dev-ruby/rjb/Manifest
+++ b/dev-ruby/rjb/Manifest
@@ -1,5 +1,3 @@
-DIST rjb-1.6.4.gem 75264 BLAKE2B a678eb0b57e930bfcc7ea059da8ee6a9319b7e0e5bc632a5b97ec617e77d844491469ebc2366ba4290ee7648b4201f1d34be560e325c6099237d413c9ed8aa46 SHA512 49a0aaeb1a0e945ce373af74e01f33f531e27b205c33a382975125357ee1ceae0bea12d6fc32acb2dd66ce56c6034691520f355688cdaca5d01abff295d1a6c8
 DIST rjb-1.6.5.gem 75264 BLAKE2B 0608e3d2a70fbf909c2be454e71960ae900fadeda936677c290de1b1bfebacd43e9582dea847b3b6ca6c7294c11ff6fce409c1f59c72aea22c3fbc337ca0c590 SHA512 328a2b58eaf4673d5218ae7c87708c115b817f082844893c548a1fab5b544f729d6874cdba4f4fff6443e2fde2370daa8937f729b949c842461a4988033685ac
-EBUILD rjb-1.6.4-r1.ebuild 1914 BLAKE2B a77cec9382c95bdeb570292d487a28737e24b9f3a2053794ab7ce226cfa10f8c5e1445e3e52a8be57254fa7908468b02cced941998a7b4e7e0cdca81bf8d191f SHA512 e0f825ece719016ec9704eec7a95b35f3b0085b3cb94cbe60bc25201262c77eb25bf132af01885d5c911c15a9f56bccfee65dc194d14f737538edb74a29f6eac
 EBUILD rjb-1.6.5.ebuild 1921 BLAKE2B 3e86c9762ff67a7f490979c9be8b9572d79bac53b55865dabde00f497b8368051fce594dd6d614ec1f6f20cc32f56ca2c1ac7d86cf28a34cb3e63a24576d61be SHA512 ca6af6b635b9acfb089cf79361709f3aac9156a1cee32a4a438731519efe3c70a33f1dbf27007846612dfd694c9dcdf66239d6f90a8b68698130de6e02c4cc63
 MISC metadata.xml 434 BLAKE2B 1e94200b4a129af238d6fd0d80c250a951a3ffe2090b352b6251cb1b2976a0311fa8e0d35dd8e5ace9d87aebca05792c11511d99a7997ba547e40722566e37da SHA512 8bd89556de265f47cbf04a4679ef4970964a5b50e113464ee441d5fa4655d13fb0f9403728efd9d11a4fce7cf3a93058918104cfe2475473b0a5bd2f24ae9aca
diff --git a/dev-ruby/rjb/rjb-1.6.4-r1.ebuild b/dev-ruby/rjb/rjb-1.6.4-r1.ebuild
deleted file mode 100644
index 3f2663da48e6..000000000000
--- a/dev-ruby/rjb/rjb-1.6.4-r1.ebuild
+++ /dev/null
@@ -1,73 +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_EXTRADOC="readme.txt ChangeLog"
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_EXTRAINSTALL="data"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/extconf.rb)
-
-inherit java-pkg-2 ruby-fakegem
-
-DESCRIPTION="Rjb is a Ruby-Java software bridge"
-HOMEPAGE="https://github.com/arton/rjb"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples hardened"
-
-DEPEND=">=virtual/jdk-1.8
-	hardened? ( sys-apps/paxctl )"
-RDEPEND=">=virtual/jre-1.8:*"
-
-pkg_setup() {
-	ruby-ng_pkg_setup
-	java-pkg-2_pkg_setup
-}
-
-all_ruby_prepare() {
-	# The console is not available for testing.
-	sed -i -e '/test_noarg_sinvoke/,/end/ s:^:#:' test/test.rb || die
-
-	# Avoid encoding tests since not all locales may be available.
-	sed -i -e '/test_kjconv/,/^  end/ s:^:#:' test/test.rb || die
-
-	# Fix build on openjdk-11
-	sed -i -e 's#javah -classpath ../data/rjb jp.co.infoseek.hp.arton.rjb.RBridge#javac -h . -classpath ../data/rjb RBridge.java#g' ext/extconf.rb || die
-}
-
-each_ruby_prepare() {
-	#dev-lang/ruby might need the "hardened" flag to enforce the following:
-	if use hardened; then
-		paxctl -v /usr/bin/ruby 2>/dev/null | grep MPROTECT | grep disabled || ewarn '!!! rjb will only work if ruby is MPROTECT disabled\n  please disable it if required using paxctl -m /usr/bin/ruby'
-	fi
-	# force compilation of class file for our JVM
-	rm -rf data
-}
-
-each_ruby_install() {
-	each_fakegem_install
-
-	if use examples; then
-		dodoc -r samples
-	fi
-}
-
-each_ruby_test() {
-	if use hardened; then
-		paxctl -v ${RUBY} 2>/dev/null | grep MPROTECT | grep -q disabled
-		if [ $? = 0 ]; then
-			${RUBY} -C test -I../lib:.:../ext test.rb || die
-		else
-			ewarn "${RUBY} has MPROTECT enabled, rjb will not work until it is disabled, skipping tests."
-		fi
-	else
-		${RUBY} -C test -I../lib:.:../ext test.rb || die
-	fi
-}
diff --git a/dev-ruby/rspec-rails/Manifest b/dev-ruby/rspec-rails/Manifest
index c8f5b452fd5b..63b4d3117dd3 100644
--- a/dev-ruby/rspec-rails/Manifest
+++ b/dev-ruby/rspec-rails/Manifest
@@ -1,10 +1,8 @@
 DIST rspec-rails-4.1.2.tar.gz 156296 BLAKE2B ca454065c8fb318148e745162514b9f21aaf6050ae72981d12a23b838bc7d985350c8abd60a36c07cb5c8c8bd80dd7b97b0dcb9ab6f5fb30ec4a6d99aaf189d4 SHA512 c0555d3b0d1ea91c9460981216cb0e4d1999e712daf18e5270aa20daee9667e3e669c918204e863bea0b6a97a63a79cdb1cd261d396743fdfbcc41109211ce89
-DIST rspec-rails-5.1.1.tar.gz 157454 BLAKE2B 580a3443cfe088d4056815e3fc344f9b91e5df9ff52099942f8e74c062e6ffb8ff528e5bcb17b33684be0e6b4ce7791a1df38a7fbead0ca348567cbbf3f6a863 SHA512 68ba2af02619bcf304237e744f728772e9de889d7aba5ab5fef236d40e1c047b03bf0c199bb28074f2d4cf47e1811f241e67b56d8c362dbc8ad69e066bd3d7f0
 DIST rspec-rails-5.1.2.tar.gz 157523 BLAKE2B b500aa53f8bd965f7b95e90403d46096073780fa4e318295bffba44211cfb9d5eab36549e6fc3afc144700a8224ebe808489959a172f1d9e76c43320b7022979 SHA512 f9ef3a3812590a7cd50bd34e9e6cd9669fab24736ac7693b3fffe3f8be9b8313e31b0c7b7571a735f20bc5d9194a94c2f447e69f6491190536b6534211e1b070
 DIST rspec-rails-6.0.0.tar.gz 161222 BLAKE2B feaff94148d8b33e17ae3de5b9636ba238381d46836bbeba8c6ddf03c1d7b84c0c9e78e13c6b5198342959433ca165c438007e45923a70cb23190d974b340506 SHA512 7b15a5f9313bb76e71a69f9158d64c662a4cef2f8aae7a20748281224a720d9f2555ec9eed3ebd3aa30ba21608d6492caf14fefdd14a84ea765a4e60439830f2
 DIST rspec-rails-6.0.1.tar.gz 161289 BLAKE2B 80d91fe4c11848fa3625c1469dc14064dfdd93c54281c9dcaf71a845dc2b07ba8b290f045a59839d301278103d9e241c99781058886f1d792db3a7d8de80dd26 SHA512 a797dea121d902bb43add4d35e9a6d324cf52f28acea83ae4dd7a69e33e8fd531857f175a35869391c82900f55182ec4c2519667b04234fec54dc99b510a85e8
 EBUILD rspec-rails-4.1.2.ebuild 1555 BLAKE2B d97b1683244bf2bf54c19148dd5aae18eb673a79f5b3e95d33adf0636758c92200a2034b6ff070785d129ff7b5537d190321308577713c0521d4475bbd95ba01 SHA512 d7e405df0f5949eecfbd5f3c67bc440b7cbe446c11ddc2db0b93d7c7c29d0e8baf49de69052c134e47bebc2b4affaf6a9c6a6c4668491397f9f1b4177810cd5d
-EBUILD rspec-rails-5.1.1.ebuild 1623 BLAKE2B 52ef145ad123a4ab263d8a1509261a8b856e572ca4413bff111628acb2c9eefdd022d274d2b0b00ff35aaaa5cd19de2e9cbf944bde8547676fa05c51ed83c7ae SHA512 75ca634e6209b7480ca9343920b1340e02e95d8ad9a5fed06172d6bef5321f5b6af4cfdfac569e6ccce1e981c931dde9fea5aeefa6aa2a91865958cb087174ee
 EBUILD rspec-rails-5.1.2.ebuild 1630 BLAKE2B 4085ca18959ec2c8ead80b2fef8bb46c114808ac68582973d080be8880c0e587ea1c7e89802fbc2ad311c5c9391b5ccfcf8bbb59584f788ed870569a246bb675 SHA512 d0858f55d48055077fe89ccb518a461bb70f73c9416471ddbdd3ceb338d4bbf5cca59d9f20bdc2d7249cd7131ad03ca48632a8b34e61942a09441bc5ef33bdd9
 EBUILD rspec-rails-6.0.0.ebuild 1551 BLAKE2B 63b67ed2a3de16c932d5648d6f85299dca7f9a15a043867a5233fec999efefb06e2879e3e0dd40e00868ef9cb4afeefb60e72c7d2b15cbc4185f2038b670cb61 SHA512 a0f27fafecb2e63c103ca4e7416de6671c7f8fe4890289bb0140526cd55a71a6b952dca0324720e124c30ed7654db46dfa0b58b6a0526246f8958d9f6800a280
 EBUILD rspec-rails-6.0.1.ebuild 1551 BLAKE2B 63b67ed2a3de16c932d5648d6f85299dca7f9a15a043867a5233fec999efefb06e2879e3e0dd40e00868ef9cb4afeefb60e72c7d2b15cbc4185f2038b670cb61 SHA512 a0f27fafecb2e63c103ca4e7416de6671c7f8fe4890289bb0140526cd55a71a6b952dca0324720e124c30ed7654db46dfa0b58b6a0526246f8958d9f6800a280
diff --git a/dev-ruby/rspec-rails/rspec-rails-5.1.1.ebuild b/dev-ruby/rspec-rails/rspec-rails-5.1.1.ebuild
deleted file mode 100644
index 93617fc028c1..000000000000
--- a/dev-ruby/rspec-rails/rspec-rails-5.1.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-#RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="rspec-rails.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="RSpec's official Ruby on Rails plugin"
-HOMEPAGE="https://rspec.info/"
-SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "
-	|| ( dev-ruby/activesupport:6.1 dev-ruby/activesupport:6.0 dev-ruby/activesupport:5.2 )
-	|| ( dev-ruby/actionpack:6.1 dev-ruby/actionpack:6.0 dev-ruby/actionpack:5.2 )
-	|| ( dev-ruby/railties:6.1 dev-ruby/railties:6.0 dev-ruby/railties:5.2 )
-	>=dev-ruby/rspec-3.10:3"
-
-# Depend on the package being already installed for tests, because
-# requiring ammeter will load it, and we need a consistent set of rspec
-# and rspec-rails for that to work.
-ruby_add_bdepend "test? (
-	>=dev-ruby/capybara-2.2.0
-	>=dev-ruby/ammeter-1.1.5
-	~dev-ruby/rspec-rails-${PV}
-)"
-
-all_ruby_prepare() {
-	# Remove .rspec options to avoid dependency on newer rspec when
-	# bootstrapping.
-	echo "--require spec_helper" > .rspec || die
-
-	# Avoid bundler-specific specs.
-	rm -f spec/sanity_check_spec.rb || die
-
-	# Avoid broken controller generator specs for now.
-	rm -fr spec/generators/rspec || die
-
-	# Test with a compatible rails version
-	sed -i -e '1igem "rails", "<7.0"' spec/spec_helper.rb || die
-
-	# Fix gemspec.
-	sed -e 's/git ls-files --/find */' \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/ruby-feedparser/Manifest b/dev-ruby/ruby-feedparser/Manifest
index 8e50265b3a7c..20d3d2fe1718 100644
--- a/dev-ruby/ruby-feedparser/Manifest
+++ b/dev-ruby/ruby-feedparser/Manifest
@@ -1,5 +1,3 @@
 DIST ruby-feedparser-0.10.0.tar.gz 2697849 BLAKE2B 679e8442b5b11eb56b30d346edc54d76d8f94f43ab26299ec0dd831faf6acb7fde304b4d6f8147d67ab013c9d7e50c163fcb75e8aa10ddc9091529e29eeb0d79 SHA512 0cbf8543a73385f1bd7fd2bcd647828e4e03ec648a62cd898cfd58ed574ede68760184037a5c7ba58acc42d1d51c54158ad1247216ede415791d0bbaf99a5ce8
-DIST ruby-feedparser-0.9.7.tar.gz 2705854 BLAKE2B d64d35696dd66890013643339817cf470e714fef4ecb5ad8c12a221fd949af53b6fa3668ec2ec16ac0a5fa76eb8dedf037530881ce2545356a4bf20dc7153b01 SHA512 6283e21448cebbfc0d07c01d24be48acadb852110c9e940983a22ce3c95592aea12a99dc4763aa267ba7386c935e2f58e52427b57171aa8fcaa332c6bb440fed
 EBUILD ruby-feedparser-0.10.0.ebuild 965 BLAKE2B bf954f2a0f1958419764c49fa3db93f9715154552adb31cc1ab3550d0efb760f5f46ce2db7300c3a1b69b41fe23e1d7df1714c3233dab8b8304f5ff4c14525a5 SHA512 8becac2787af27d712f42cdef1a377090f3ef966478d220dc61adfbbc2bf5df3b92399d6f35ae3a55e731568e99c5df3dab1c7a33a6428cbe04f58f96d5ec8a5
-EBUILD ruby-feedparser-0.9.7.ebuild 971 BLAKE2B 22e922f929c2bc715244131edd11d6be154b0a662cd8483c46502c89d174da86064a5949a877a051c8e2a67460b2662c4f7093cb1aa52651729c75414947fa86 SHA512 a448d0196fc7bd95722ec772bf90e481e74c5cb4abf5e71d1faec4f482936d0808811ffef52b49ae1180c2d7b7694e32f50f6007c34564e6d36ae5b33845d41f
 MISC metadata.xml 352 BLAKE2B 4f2ef2ec78d4bd600e9207801e1f44c904df6fdd2baf42f361477c2ac015ce1cdcb20073d9806d579ce4df0f7e142a7b348f779888fbb07c6271c9ffbc3c22ea SHA512 3829503d9c799ae275340892ad81708393ccaea1fc0c65d678ce3c856fcae01546c02dabb340dc12582a774203e8a8b017c918adc66e1178c79a80ac35a79f2a
diff --git a/dev-ruby/ruby-feedparser/ruby-feedparser-0.9.7.ebuild b/dev-ruby/ruby-feedparser/ruby-feedparser-0.9.7.ebuild
deleted file mode 100644
index bcaa2442bb43..000000000000
--- a/dev-ruby/ruby-feedparser/ruby-feedparser-0.9.7.ebuild
+++ /dev/null
@@ -1,39 +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_EXTRADOC="ChangeLog.md README"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-GITHUB_USER="feed2imap"
-
-DESCRIPTION="Ruby library to parse ATOM/RSS feeds"
-HOMEPAGE="https://github.com/feed2imap/ruby-feedparser"
-SRC_URI="https://github.com/${GITHUB_USER}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64"
-SLOT="0"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/magic"
-
-ruby_add_bdepend "dev-ruby/magic
-	test? ( dev-ruby/mocha )"
-
-all_ruby_prepare() {
-	# Extract gemspec source from Rakefile
-	sed -n -e '/Gem::Specification/,/end$/p' Rakefile > ${RUBY_FAKEGEM_GEMSPEC} || die
-	sed -i -e 's/PKG_NAME/"'${PN}'"/' \
-		-e 's/PKG_VERSION/"'${PV}'"/' \
-		-e '/s.files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_prepare() {
-	sed -i -e '/PKG_VERSION/ s:ruby:'${RUBY}':' Rakefile || die
-}
diff --git a/dev-ruby/ruby-gettext/Manifest b/dev-ruby/ruby-gettext/Manifest
index de33715d995f..7e6c187f12c9 100644
--- a/dev-ruby/ruby-gettext/Manifest
+++ b/dev-ruby/ruby-gettext/Manifest
@@ -3,7 +3,7 @@ DIST gettext-3.3.7.gem 292352 BLAKE2B 76232148ec89720553e7f260c7222b8c5f9eccf0dd
 DIST gettext-3.4.1.gem 231936 BLAKE2B c225a3b0239f01fade9406d4e7704905971369bb37cfc29a5aa3c1bdd60e3b71057b2f7f736cfc3dde60709efcd935a609917384a324178badd760f8e40dfa01 SHA512 c4c88aa9b1d81772dce533bcb6a24c2bcde81f15e2f3947e491c7e391099f23c1ac27b6a25fa012f9f7b01c16711446adaf0c014f46d55acc73bc4a7a3317af9
 DIST gettext-3.4.3.gem 233472 BLAKE2B d1edc1e4a004412b21ca4aa9e0e1df2000626ffde42e81f092f3a19c3ce080ee4660e5cbcce6d3f9a77e30cccf5f942ef1fa7d12e8680f0a50d67f69ad3ac41a SHA512 144c7d0964660ef671494272138a29abc3b51de1a7d6f8ee920a73cefe05657eda77024c59009179f4880003bd45eeaae7a82ac57b387fb0b924bc0f6eb553ea
 EBUILD ruby-gettext-3.3.5.ebuild 1739 BLAKE2B 0c92ce389c7e92e2e511291621591efb2a4c73f5865afac5d2a825c4d6468524151feb155c5aab0da99bcf995d110d96976a9330338a819d05f6e89ffe4e1398 SHA512 3ca25dcc84f13f67d6b8aee6018ff310aa6f3595f8fe906a3cb6f2d17fb88a858fb6bd8226577cb413bdb3467f9caf3b0854a71f94c83d2ba3c82397b242188f
-EBUILD ruby-gettext-3.3.7.ebuild 1753 BLAKE2B e8d54da199408c371a499674e9f1d30b8f064ac0747c646ca983ba0be08b54d3b96664b86040b11db3fba0e4839fdf6b05df44cd90f36cd29dd29fcdb17b7b08 SHA512 c32c66a674acd292fab2190a44fbfaa4deec09c00d33f357b81633939891c6e16db44ed840bdcec591a4d44e2219cd47ac354f3c31a85cdee67fbba0db8336c8
+EBUILD ruby-gettext-3.3.7.ebuild 1746 BLAKE2B ba441c48df397ec19c7f970efa8cff9f795d097517e48bfdf2fca39dcac3c62963c5a9d7d496df16b54f1a78ee30bf4eac0c8f07d9f36e61d036864fced49f01 SHA512 67754cb1a03e93c169d1b71aaca59d7c9d80ba7cafbe826327c03d8cb12ee70c5ab091f371b31ea52822cb82ef6ccaeccde8d58323e7f9585f142defb74dd23d
 EBUILD ruby-gettext-3.4.1.ebuild 1517 BLAKE2B 7a5356b377183db44db83a64d56e6980c8caa4cd71a589223ecbc8c4a23c2c49a53537eb7116a2cca7ef03892fdca9bcdefa1cae48a85d7d3128f8d6d4a8dfd9 SHA512 2dce800023a55559037be9877ce3a8cb5acc25d1925df5b9be96e8944c0abbe0107f7f21ba2522112287f7a2c4ac4a3ad368e50f3475a0a32531fbe0f8045431
 EBUILD ruby-gettext-3.4.3.ebuild 1560 BLAKE2B bdcf6f80ffe79a0df3b0df8e9ba52f6e1982a97ba4b9a90a7b0984f7bb3bf75a7ccd6ebc63bf945a6794852ab59c6c7984d34f2a81ad736a9b35616560ef9a7d SHA512 db36539d2be69ac5a6e79a17a25bb529f871dfc421be7b46effa6848467d32c012a695bdbe7ac3aa6c0916966979190d0f3d9b0d9bb812c8a4e97f6a3c7b9f3d
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
diff --git a/dev-ruby/ruby-gettext/ruby-gettext-3.3.7.ebuild b/dev-ruby/ruby-gettext/ruby-gettext-3.3.7.ebuild
index ef298d22463f..17b03ef6a040 100644
--- a/dev-ruby/ruby-gettext/ruby-gettext-3.3.7.ebuild
+++ b/dev-ruby/ruby-gettext/ruby-gettext-3.3.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-USE_RUBY="ruby25 ruby26 ruby27"
+USE_RUBY="ruby27 ruby30"
 
 RUBY_FAKEGEM_NAME="${PN/ruby-/}"
 RUBY_FAKEGEM_VERSION="${PV%_*}"
diff --git a/dev-ruby/ruby-net-ldap/Manifest b/dev-ruby/ruby-net-ldap/Manifest
index 185b561779ba..46fab9c7f71a 100644
--- a/dev-ruby/ruby-net-ldap/Manifest
+++ b/dev-ruby/ruby-net-ldap/Manifest
@@ -1,5 +1,3 @@
-DIST ruby-net-ldap-0.17.0.tar.gz 92548 BLAKE2B 45dd1f6205af25735c8ed55a28ec91084e0b95403fa4c4a06310a19f1a9c247cb4cd1e8be7bbb26b2423c0d05afb4cfd4e8b2eed4e552aa78c9b4b44102f34d8 SHA512 417e946f044db2fda8ceb8ebfee2376310308ac6a1949e165beff0a9c2a8b410f88ffcb607d27ab060d1d55364cb75fd41753d101a404874be6dbbec3875f192
 DIST ruby-net-ldap-0.17.1.tar.gz 92746 BLAKE2B 785791c1e96002c92d6e4a78867870d36011faad5fd9bac4af4c34eea0c4bbd5526291023684c30ddf4c7bdee46ad2c9b98211d103d88d6fda6b2195f0d6e6c4 SHA512 af36095c57b9d142faf5435430a9de63a5c5bcca8fa58e5a431e49097328d882121523864936ef1388254e9ffc9b40718ed5b5b9c335d1f79bac9da955e9ec4d
-EBUILD ruby-net-ldap-0.17.0.ebuild 841 BLAKE2B 58aa88e708d9c5130ef714467edc32a3918578b6f796e3a21b2cfedd1a7e7c63426bd316c73c8b815d8901d3867d2c56074b1f06ee88cbe7ea228ee56cf871f5 SHA512 a3130d2f6f427a5bab4d6d3129557936abd1e7903af2de99a7f648bb0e28e7d316fdf416427c8cfc853ca7771aa29de33f29d1ff0dc55365be94cbc056ecf66a
 EBUILD ruby-net-ldap-0.17.1.ebuild 834 BLAKE2B 8054828e227b919f117d4eea4af563398827b734216ea06222bc1d12da89480c98c2fbd99833c542111b3dff48999f04ffb7aaf73fdb14e71f0df9be16992a92 SHA512 0166dc3a6235c821093335dd160da17956c35f3a79febb44fed29e007817760f1d9dc8eb45d731e42a28fe7b9d5f612d26986e42638d2804c702d3921cf31027
 MISC metadata.xml 350 BLAKE2B 970f02950a37e39aee562a8e0c18f87598d8122b572c9938f6162343de385e8a33445a267a8ac87ccd70cfa31233e30d9e3c7b79d76c9c4f20569c278b91c4cd SHA512 e30f9f048302cafe6fa3ce2c4a5c3e9cd0adf8d2dc65b7fadb5ef3d961ef4b2ce3077a0ffaec1dd3a96aad3eba8b1df74a17328fd30f0aa5b65de7139394544d
diff --git a/dev-ruby/ruby-net-ldap/ruby-net-ldap-0.17.0.ebuild b/dev-ruby/ruby-net-ldap/ruby-net-ldap-0.17.0.ebuild
deleted file mode 100644
index fd0a3e09c8b6..000000000000
--- a/dev-ruby/ruby-net-ldap/ruby-net-ldap-0.17.0.ebuild
+++ /dev/null
@@ -1,34 +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="test spec"
-RUBY_FAKEGEM_EXTRADOC="Contributors.rdoc History.rdoc README.rdoc"
-
-RUBY_FAKEGEM_NAME="net-ldap"
-
-RUBY_FAKEGEM_GEMSPEC="net-ldap.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Pure ruby LDAP client implementation"
-HOMEPAGE="https://github.com/ruby-ldap/ruby-net-ldap"
-SRC_URI="https://github.com/ruby-ldap/ruby-net-ldap/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="test"
-
-ruby_add_bdepend "test? ( >=dev-ruby/flexmock-1.3.0 )"
-
-all_ruby_prepare() {
-	sed -i -e "s:_relative ': './:" ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -e 'Dir["test/**/test_*.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/ruby-termios/Manifest b/dev-ruby/ruby-termios/Manifest
index f811b72aa0ac..137dc8960d9f 100644
--- a/dev-ruby/ruby-termios/Manifest
+++ b/dev-ruby/ruby-termios/Manifest
@@ -1,4 +1,4 @@
 DIST ruby-termios-1.1.0.gem 17408 BLAKE2B df85f46693c17ca05736fecb2dcbddafc3831ae04cdb56e13782242e4161d04e6c095d04927eebe1959843d6f6da95f0433309018a7cee2bd42407560c2c99f9 SHA512 dc98e6d7e304fa76b4139dd88f8c6955e6f4e09ca48d5611813fac941564c93165945c24dc0d7f7f84d7cd959512d006d73f042b57fcb1dde2743ffbb3cc9b41
-EBUILD ruby-termios-1.1.0-r1.ebuild 587 BLAKE2B dcad9799698397ca4e002dbd8a3093f37dd66dd1aee258e3f7e6ade6ad290e6c2369924f7d2ab956b5a6f39c82a6404d0cbafb2db8198f09905f1278ca2b192d SHA512 d3924298a6197c48c580eb4ec5969c8fd5bac5087215f2dd358b109e7238b4823597879a9d890a9ce5c2f6e3df7f55c129fd423191fd840b49b4e4b210109721
+EBUILD ruby-termios-1.1.0-r1.ebuild 585 BLAKE2B 8c5d5145580652d0384c9809ecc9996711108f094738a39821fd2b497c5c1676cf29801b302211525504dc866a67a0eddd5c006d654b46c5cc2ee68af202971e SHA512 9037a2c828afda40b2e7654143553644411523d2bd8aae41fd60f769095f3b96ce60f43cff9fdd0f063884e227b1618c519f761599cb0669805633a10fc48443
 EBUILD ruby-termios-1.1.0.ebuild 680 BLAKE2B d0eb56322c09e4fdabf73c39bac62363f93000886e7980e779e65b29dcf00184a13e6e63c35330021affce6042d976f657becdb94066bcacc74343f716b54495 SHA512 e484dfff2f5c9b2e62fa7a85d9f9ce44a6016a0a45df0f9435545cfc7eb6559c669535950ccdd0d556fce9294fd40402a5c02eb86b7846d62b718c904caa74fa
 MISC metadata.xml 345 BLAKE2B 7548870113aba058a32107f58f042d6a1616855032a5e32a95b684c5142375037c6d5ed79fd7f3788cd0ebbe8db48b47a6578b7707d34d158faca579449bddc8 SHA512 a71981c265c8ef7f6845370efd733510a1f0a120794d6cf4b9af226287a5b72843602dd0c5e7925ede219a503669e76f300e4a199acb57a909f2662480f15787
diff --git a/dev-ruby/ruby-termios/ruby-termios-1.1.0-r1.ebuild b/dev-ruby/ruby-termios/ruby-termios-1.1.0-r1.ebuild
index c5d21f5666c9..5f4e4d1aceb4 100644
--- a/dev-ruby/ruby-termios/ruby-termios-1.1.0-r1.ebuild
+++ b/dev-ruby/ruby-termios/ruby-termios-1.1.0-r1.ebuild
@@ -20,5 +20,5 @@ DESCRIPTION="A Ruby interface to termios"
 HOMEPAGE="http://arika.org/ruby/termios"
 LICENSE="Ruby-BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~mips ~ppc ~x86"
+KEYWORDS="amd64 ~hppa ~mips ~ppc x86"
 IUSE=""
diff --git a/dev-ruby/rubytter/Manifest b/dev-ruby/rubytter/Manifest
index 3b8ab22aa565..366d9a7d16ef 100644
--- a/dev-ruby/rubytter/Manifest
+++ b/dev-ruby/rubytter/Manifest
@@ -1,3 +1,3 @@
 DIST rubytter-1.5.1.gem 15872 BLAKE2B fd4f3be2570f12a900fa031a74fa6b4e053bc966e8c086d099fb0716c80515ccf1df63d0634af676a95541329029b932911262db5f377a1bc32a41bfbed5fdeb SHA512 79be7b7803a53db654a14ff83da657e3e5016d5bda61e8c127dbf6d85231a8c115d38041aba99fdabd50825135b801cc444cca84c13d174004cda8cc4760bd2e
-EBUILD rubytter-1.5.1-r2.ebuild 576 BLAKE2B be94918dfe8d1f12ee42580a5beb72a043f4f29a956cbf3bf1195f20f907356fed36d1183e68b9d02ef0dbeee9c0b2ab1556722298cbf4fee609091bc7a4ef34 SHA512 5ae10cd157db730c61c0da985a8de557b87e19183b0dc64d29a2914246020076aca2797e1103af4e1d9e165ce3f06a4a6ecff713da55272772b05d57150f7335
+EBUILD rubytter-1.5.1-r2.ebuild 776 BLAKE2B efe8a925554ffdf9c4a54c272b5f7ae7a246befa1ed92d5b773a4836350cc80128ed3c9dbf438083459e72f1c274346a1ca9ebe65ac67d484de826204b0f8b04 SHA512 75d82ff5b7d0d2ac815dae0a6a6ac72143202ca191af7bd0ccd61b6250ba5ac500f22bf52870c9a1ad33215a30e118c81a4d2361ed395007c940b3aafebd9e24
 MISC metadata.xml 357 BLAKE2B 4277a53278bc07865b7789c2851beaaf3891654307363490c88090d3d922ec080679fe02d942c8aeb713cc73e9b593aaf5df2b45390990208bb4219ef70cad1d SHA512 7cd74b056ce331c00b92abf682d5aee603f9639170682858f72ba61bd4404239f693e352cc775936c239674f9ea9e4e9f84c09f39844914e20ce888b469b377b
diff --git a/dev-ruby/rubytter/rubytter-1.5.1-r2.ebuild b/dev-ruby/rubytter/rubytter-1.5.1-r2.ebuild
index 7f8529cad3d6..ceca69b7b4e4 100644
--- a/dev-ruby/rubytter/rubytter-1.5.1-r2.ebuild
+++ b/dev-ruby/rubytter/rubytter-1.5.1-r2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
+USE_RUBY="ruby27 ruby30"
 
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
 RUBY_FAKEGEM_EXTRADOC="History.txt README.rdoc examples/*"
 
@@ -22,4 +22,10 @@ ruby_add_rdepend ">=dev-ruby/json-1.1.3:* >=dev-ruby/oauth-0.3.6"
 
 all_ruby_prepare() {
 	sed -i -e '/bundler/d' -e '/check_dependencies/ s:^:#:' Rakefile || die
+
+	# Make specs work with rspec 3
+	sed -i -e 's/stub!/stub/ ; 250 s/pending/skip/' spec/rubytter_spec.rb || die
+
+	# Make specs work with ruby30
+	sed -i -e '27i{' -e '30i}' spec/rubytter/oauth_spec.rb || die
 }