16 files changed, 8 insertions, 208 deletions
diff --git a/dev-ruby/backports/Manifest b/dev-ruby/backports/Manifest
index 2c090ac85fb3..e6a8a1862920 100644
--- a/dev-ruby/backports/Manifest
+++ b/dev-ruby/backports/Manifest
@@ -1,3 +1,2 @@
-DIST backports-3.15.0.gem 152064 BLAKE2B a2c2a1f35ab6f682be23a5189bafec563a2d028ed5f0e0a4880ad85e09ac7af1085a601323ec3459c5be87a5271c6c3e47b6e80005c50e3084d4ac1dc9f2fd35 SHA512 4eb1f928c37596971fa274d838ab991bce462a7f571cb68501fc81e579693528e93536c25e4b64d93f4f0edfd313c8aacd8af014bb5c586cc182867e78f614d5
 DIST backports-3.20.2.tar.gz 178633 BLAKE2B 2e2f2f31099763bb218f3ada9f9d040d4b41fc842bbc8b91d703e91b89bab9d6e7bbf3aae1ecfe34abe6099d6cb34929ae72ba66d4ee473841563257fa85cf3c SHA512 a91a2c9186315fca8e0b33554ef26986abe8565e08a79b9f150f8115f998b2a7a440bbc64b92f89c4e95e1c5e852bfeea6ab337804cf017517e77229f10820e5
 DIST backports-3.21.0.tar.gz 178706 BLAKE2B b895655fbbd15e99021f3d9d4f5efe84957c43cffc4e6442a286494624af3d9afa50933cb9f46d86a752c2aa1f52e867d4063e5f8357c969c7ade75b38566f52 SHA512 9d3a5315d412f16c28172121f7b64b424d3728e76c2b9b4466937572bc922f595f5b56caa265e9b03ed44ca64643c36086d60ddc1ff8799e11d953dc75aaee65
diff --git a/dev-ruby/backports/backports-3.15.0.ebuild b/dev-ruby/backports/backports-3.15.0.ebuild
deleted file mode 100644
index 990c15260f9a..000000000000
--- a/dev-ruby/backports/backports-3.15.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ruby27 -> not compatible
-USE_RUBY="ruby24 ruby25 ruby26"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_TASK_TEST="test"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Backports of Ruby features for older Ruby"
-HOMEPAGE="https://github.com/marcandre/backports"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86"
-IUSE=""
-
-all_ruby_prepare() {
-	# Avoid activesupport test that no longer works in Rails 5. This also avoids
-	# a dependency on activesupport
-	sed -i -e '/test_rails/,/^  end/ s:^:#:' test/_backport_guards_test.rb || die
-}
diff --git a/dev-ruby/backports/backports-3.20.2-r1.ebuild b/dev-ruby/backports/backports-3.20.2-r1.ebuild
index 3567ce56c984..fb0a95d6b202 100644
--- a/dev-ruby/backports/backports-3.20.2-r1.ebuild
+++ b/dev-ruby/backports/backports-3.20.2-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/marcandre/backports/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ppc ppc64 ~s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/bcrypt_pbkdf/Manifest b/dev-ruby/bcrypt_pbkdf/Manifest
index 878cebba36a2..1c3c6e4df953 100644
--- a/dev-ruby/bcrypt_pbkdf/Manifest
+++ b/dev-ruby/bcrypt_pbkdf/Manifest
@@ -1,2 +1 @@
-DIST bcrypt_pbkdf-1.0.0.gem 24576 BLAKE2B 0d5b1d90d57dbae986fcbb92cabb0ea598d6b928dc97026e8d2078f41898e0c143544a004a561c0a392504baa4b845a27f9c1e19c369f6342f7ace9de7f04d3f SHA512 b582407617633f5277cde9251ed1fd2ca408ae8bd19cc73f107d7932bed38061dc0099d3033ff5def1b586507392c33d8c50815fb156322f0dd08fbbe4a8e967
 DIST bcrypt_pbkdf-1.1.0.gem 24576 BLAKE2B 4fb9449c23c1a1caefbe7acae630eff9c6ee22b77d1eaed6475400ab2b37186d3f15b867cdad364daaaf27d6b817d6a2a49cfbf567a889264fdd64903f06cf89 SHA512 a7b9f123274a2f93e183be7339149b1df3b185331fdc63af58e342ae4bb734fdcf709214a50922218b837481349948e10ec879f9b8e1a6928b1b7b5617f83be5
diff --git a/dev-ruby/bcrypt_pbkdf/bcrypt_pbkdf-1.0.0.ebuild b/dev-ruby/bcrypt_pbkdf/bcrypt_pbkdf-1.0.0.ebuild
deleted file mode 100644
index 9969222909a0..000000000000
--- a/dev-ruby/bcrypt_pbkdf/bcrypt_pbkdf-1.0.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Implements bcrypt_pdkfd (a variant of PBKDF2 with bcrypt-based PRF)"
-HOMEPAGE="https://github.com/net-ssh/bcrypt_pbkdf-ruby"
-
-LICENSE="MIT"
-SLOT="1"
-KEYWORDS="amd64 ~arm ppc ppc64 x86"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/rbnacl )"
-
-all_ruby_prepare() {
-	# Don't use a ruby-bundled version of libsodium
-	sed -i -e '/rbnacl\/libsodium/ s:^:#:' test/bcrypt_pnkdf/engine_test.rb || die
-
-	# Avoid unneeded rake-compiler dependency
-	sed -i -e '/extensiontask/ s:^:#:' -e '/ExtensionTask/,/^end/ s:^:#:' Rakefile || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/mri extconf.rb || die
-
-	# Some methods may not be inlined on x86 but they are not defined either, bug 629164
-	sed -i -e 's:-Wl,--no-undefined::' ext/mri/Makefile || die
-}
-
-each_ruby_compile() {
-	emake V=1 -Cext/mri
-	cp ext/mri/bcrypt_pbkdf_ext.so lib/ || die
-}
diff --git a/dev-ruby/bcrypt_pbkdf/bcrypt_pbkdf-1.1.0-r1.ebuild b/dev-ruby/bcrypt_pbkdf/bcrypt_pbkdf-1.1.0-r1.ebuild
index d0cc5e9fd08e..37813069391f 100644
--- a/dev-ruby/bcrypt_pbkdf/bcrypt_pbkdf-1.1.0-r1.ebuild
+++ b/dev-ruby/bcrypt_pbkdf/bcrypt_pbkdf-1.1.0-r1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/net-ssh/bcrypt_pbkdf-ruby"
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="amd64 ~arm ~ppc ppc64 x86"
+KEYWORDS="amd64 ~arm ppc ppc64 x86"
 IUSE=""
 
 ruby_add_bdepend "test? ( virtual/ruby-ssl )"
diff --git a/dev-ruby/mocha/mocha-1.13.0.ebuild b/dev-ruby/mocha/mocha-1.13.0.ebuild
index ae4009107403..e4e579a7e5d8 100644
--- a/dev-ruby/mocha/mocha-1.13.0.ebuild
+++ b/dev-ruby/mocha/mocha-1.13.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/freerange/mocha/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="1.0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv sparc x86"
 IUSE=""
 
 ruby_add_bdepend "
diff --git a/dev-ruby/net-scp/Manifest b/dev-ruby/net-scp/Manifest
index 91c0388ff827..1d9f8827588e 100644
--- a/dev-ruby/net-scp/Manifest
+++ b/dev-ruby/net-scp/Manifest
@@ -1,2 +1 @@
-DIST net-scp-1.2.1.gem 32768 BLAKE2B 67abf0b66aa6e8f28bdfa314a20f594eedafc5aeaf5d0ae8884cb7e27203699a791623968da98aaebda1630d47bf5859cc3e38875fe17dc8c7ce7926b50848a5 SHA512 64645a4517d6e408e3acfdb24576c8ded3b6ff981035ca10a2e081f9e3ab093f97b4848da4acca03ade364483766677e31296d09a31db4c81eb40123fc966829
 DIST net-scp-3.0.0.tar.gz 27947 BLAKE2B 78a1100b7602b9c09c8f06228b6e564fce15133c6cf8c9816613cb56b1d3805d9393700eb66c3710e482771e4116beae393c12ad12963b85428e21e7cf105218 SHA512 6d68b75124ccd2d387983f6d66a8b0e040132ba17d942631c806e899dff757ffae7a031a27ea0988166bf56e803c1a6175199845a848b92c7064388564e0ac79
diff --git a/dev-ruby/net-scp/net-scp-1.2.1-r1.ebuild b/dev-ruby/net-scp/net-scp-1.2.1-r1.ebuild
deleted file mode 100644
index 41f8579205bc..000000000000
--- a/dev-ruby/net-scp/net-scp-1.2.1-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGES.txt README.rdoc"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="A pure Ruby implementation of the SCP client protocol"
-HOMEPAGE="https://github.com/net-ssh/net-scp"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RUBY_PATCHES=(
-	${P}-raise-correct-errors.patch
-	${P}-fix-common.path
-	${P}-fix-download_test.patch
-	${P}-fix-download_test_2.patch
-	${P}-fix-download_test_3.patch
-	${P}-fix-upload_tests.patch
-	${P}-raise-correct-errors-net-ssh-4.0-compat.patch
-	)
-
-ruby_add_bdepend "
-	doc? ( dev-ruby/net-ssh:5 )
-	test? (
-		dev-ruby/net-ssh:5
-		dev-ruby/mocha
-	)"
-
-ruby_add_rdepend "dev-ruby/net-ssh:5"
-
-all_ruby_prepare() {
-	sed -i -e 's/>= 2.0.0/~> 2.0/' test/common.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:test test/test_all.rb || die
-}
diff --git a/dev-ruby/net-scp/net-scp-3.0.0.ebuild b/dev-ruby/net-scp/net-scp-3.0.0.ebuild
index cec34b88e3b1..a544e4500fd7 100644
--- a/dev-ruby/net-scp/net-scp-3.0.0.ebuild
+++ b/dev-ruby/net-scp/net-scp-3.0.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/net-ssh/net-scp/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="amd64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "
diff --git a/dev-ruby/rb-inotify/rb-inotify-0.10.1.ebuild b/dev-ruby/rb-inotify/rb-inotify-0.10.1.ebuild
index 431716fff624..c5a0ae251b0c 100644
--- a/dev-ruby/rb-inotify/rb-inotify-0.10.1.ebuild
+++ b/dev-ruby/rb-inotify/rb-inotify-0.10.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/nex3/rb-inotify"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~riscv sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend "dev-ruby/ffi"
diff --git a/dev-ruby/sqlite3/Manifest b/dev-ruby/sqlite3/Manifest
index 204ef9693a6a..6413ccf1c0c7 100644
--- a/dev-ruby/sqlite3/Manifest
+++ b/dev-ruby/sqlite3/Manifest
@@ -1,2 +1 @@
-DIST sqlite3-1.3.13.gem 64512 BLAKE2B a36e3161e44004a0510297d16bf491df3dc29434432208ad231f5e46ddecb4607add417e105f5ae8472a768f80efef3f74b703b2a441396b4c9b6c9ff90bf31e SHA512 5d3eab7c788cc62c497de179919054324e53595294ec3a9df2a10d23151a406ee9a88f1c3ac945777f138e78cec61018c388b023456b873131d678a6788a505f
 DIST sqlite3-1.4.2.gem 70656 BLAKE2B ef7fa7667fd080a6f175bcfbd1fe8dfba00d3fdf1214cc3d776f0576dc29386b627db8d6c0dd06f07ab65fff877a6803a6dcacefd4fbc5bb0f7d2149e355c88d SHA512 c4630dd2fa13914e2fcc70092c35568103f61f976958b439fe205abdfcff61702ca176d10bea40ff0cfea3169644cdb9146b7be94dff883cad3b753e84629545
diff --git a/dev-ruby/sqlite3/sqlite3-1.3.13.ebuild b/dev-ruby/sqlite3/sqlite3-1.3.13.ebuild
deleted file mode 100644
index b5340d0a65dc..000000000000
--- a/dev-ruby/sqlite3/sqlite3-1.3.13.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_DOC="faq"
-RUBY_FAKEGEM_DOCDIR="doc faq"
-RUBY_FAKEGEM_EXTRADOC="API_CHANGES.rdoc README.rdoc ChangeLog.cvs CHANGELOG.rdoc"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="An extension library to access a SQLite database from Ruby"
-HOMEPAGE="https://github.com/sparklemotion/sqlite3-ruby"
-LICENSE="BSD"
-
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE=""
-
-RDEPEND+=" >=dev-db/sqlite-3.6.16:3"
-DEPEND+=" >=dev-db/sqlite-3.6.16:3"
-
-ruby_add_bdepend "
-	dev-ruby/rake-compiler
-	dev-ruby/hoe
-	doc? ( dev-ruby/redcloth )
-	test? ( dev-ruby/minitest:5 )"
-
-all_ruby_prepare() {
-	# We remove the vendor_sqlite3 rake task because it's used to
-	# bundle SQlite3 which we definitely don't want.
-	rm tasks/vendor_sqlite3.rake || die
-
-	# Remove license line from hoe to avoid depending on a newer
-	# version.
-	sed -i -e '/license/d' tasks/gem.rake || die
-
-	sed -i -e 's:, HOE.spec::' -e '/task :test/d' tasks/native.rake || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/sqlite3 extconf.rb || die
-}
-
-all_ruby_compile() {
-	all_fakegem_compile
-
-	if use doc; then
-		rdoc --title "${P} Dcoumentation" -o doc --main README.rdoc lib *.rdoc ext/*/*.c || die
-	fi
-}
-
-each_ruby_compile() {
-	# TODO: not sure what happens with jruby
-
-	emake -Cext/sqlite3 V=1
-	mv ext/sqlite3/sqlite3_native$(get_modname) lib/sqlite3/ || die
-}
-
-each_ruby_install() {
-	each_fakegem_install
-
-	# sqlite3 was called sqlite3-ruby before, so add a spec file that
-	# simply loads sqlite3 to make sure that old projects load correctly
-	# we don't even need to create a file to load this: the `require
-	# sqlite3` was already part of sqlite3-ruby requirements.
-	cat - <<EOF > "${T}/sqlite3-ruby.gemspec"
-# generated by ebuild
-# ${CATEGORY}/${PF}
-Gem::Specification.new do |s|
-	s.name = "sqlite3-ruby"
-	s.version = "${RUBY_FAKEGEM_VERSION}"
-	s.summary = "Fake gem to load sqlite3"
-	s.homepage = "${HOMEPAGE}"
-	s.specification_version = 3
-	s.add_runtime_dependency("${RUBY_FAKEGEM_NAME}", ["= ${RUBY_FAKEGEM_VERSION}"])
-end
-EOF
-	RUBY_FAKEGEM_NAME=sqlite3-ruby \
-		RUBY_FAKEGEM_GEMSPEC="${T}/sqlite3-ruby.gemspec" \
-		ruby_fakegem_install_gemspec
-}
diff --git a/dev-ruby/sqlite3/sqlite3-1.4.2-r1.ebuild b/dev-ruby/sqlite3/sqlite3-1.4.2-r1.ebuild
index 4959b7b1ce62..3ddc3675b832 100644
--- a/dev-ruby/sqlite3/sqlite3-1.4.2-r1.ebuild
+++ b/dev-ruby/sqlite3/sqlite3-1.4.2-r1.ebuild
@@ -17,7 +17,7 @@ DESCRIPTION="An extension library to access a SQLite database from Ruby"
 HOMEPAGE="https://github.com/sparklemotion/sqlite3-ruby"
 LICENSE="BSD"
 
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/sync/sync-0.5.0.ebuild b/dev-ruby/sync/sync-0.5.0.ebuild
index 0c4620005627..2b1f245135e6 100644
--- a/dev-ruby/sync/sync-0.5.0.ebuild
+++ b/dev-ruby/sync/sync-0.5.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/ruby/sync/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/tins/tins-1.29.1.ebuild b/dev-ruby/tins/tins-1.29.1.ebuild
index 8d9df3d95c34..c33a9bb74a7f 100644
--- a/dev-ruby/tins/tins-1.29.1.ebuild
+++ b/dev-ruby/tins/tins-1.29.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/flori/tins"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86"
 IUSE=""
 
 # Earlier versions of ruby bundled this dependency