Adding metadata

27 files changed, 232 insertions, 264 deletions

diff --git a/dev-ruby/annoy/annoy-0.5.6-r1.ebuild b/dev-ruby/annoy/annoy-0.5.6-r1.ebuild
deleted file mode 100644
index 544e77d4f6ed..000000000000
--- a/dev-ruby/annoy/annoy-0.5.6-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGES.txt README.rdoc"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Like your annoying friend that asks you questions all the time"
-HOMEPAGE="http://solutious.com/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-ruby_add_rdepend '>=dev-ruby/highline-1.5.0i:*'
diff --git a/dev-ruby/blankslate/blankslate-3.1.3.ebuild b/dev-ruby/blankslate/blankslate-3.1.3.ebuild
deleted file mode 100644
index 3cebf513ccfe..000000000000
--- a/dev-ruby/blankslate/blankslate-3.1.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-RUBY_FAKEGEM_EXTRADOC="README"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Base class with almost all of the methods from Object and Kernel being removed"
-HOMEPAGE="https://rubygems.org/gems/blankslate"
-
-IUSE=""
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86"
-
-all_ruby_prepare() {
-	# Avoid test failing with rspec 2.x.
-	sed -i -e '/cleanliness/,/^  end/ s:^:#:' spec/blankslate_spec.rb || die
-}
diff --git a/dev-ruby/colorator/colorator-1.1.0.ebuild b/dev-ruby/colorator/colorator-1.1.0.ebuild
deleted file mode 100644
index 15d95b9817fa..000000000000
--- a/dev-ruby/colorator/colorator-1.1.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="README.markdown"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Colorize your text in the terminal"
-HOMEPAGE="https://github.com/octopress/colorator"
-SRC_URI="https://github.com/octopress/colorator/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e "/bundler/d" Rakefile || die
-	sed -i -e "/luna/d" spec/spec/helper.rb || die
-}
diff --git a/dev-ruby/diff-lcs/diff-lcs-1.4.4.ebuild b/dev-ruby/diff-lcs/diff-lcs-1.4.4.ebuild
index 343bcd7494b0..3758d5b3322f 100644
--- a/dev-ruby/diff-lcs/diff-lcs-1.4.4.ebuild
+++ b/dev-ruby/diff-lcs/diff-lcs-1.4.4.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/halostatue/diff-lcs"
 
 LICENSE="|| ( MIT Ruby GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/evented-spec/evented-spec-0.9.0-r1.ebuild b/dev-ruby/evented-spec/evented-spec-0.9.0-r1.ebuild
new file mode 100644
index 000000000000..01f4fa2260e8
--- /dev/null
+++ b/dev-ruby/evented-spec/evented-spec-0.9.0-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.textile"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A set of helpers to help you test your asynchronous code"
+HOMEPAGE="https://github.com/ruby-amqp/evented-spec"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+# Tests require a running AMQP server and AMQP installed. Since
+# currently AMQP is the only package using evented-spec we just skip the
+# tests here altogether to avoid circular dependencies.
+RESTRICT="test"
+
+all_ruby_prepare() {
+	sed -i -e '/[Bb]undler/ s:^:#:' -e '/effin_utf8/ s:^:#:' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/html2haml/html2haml-2.2.0-r1.ebuild b/dev-ruby/html2haml/html2haml-2.2.0-r1.ebuild
new file mode 100644
index 000000000000..c66f4f8eaa9c
--- /dev/null
+++ b/dev-ruby/html2haml/html2haml-2.2.0-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby26 ruby27"
+
+RUBY_FAKEGEM_EXTRADOC="README.md Changelog.markdown"
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Convert HTML and HTML+Erb to Haml"
+HOMEPAGE="https://github.com/haml/html2haml"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/nokogiri-1.6.0
+	>=dev-ruby/erubis-2.7.0
+	>=dev-ruby/ruby_parser-3.5
+	dev-ruby/haml:5"
+
+ruby_add_bdepend "test? ( dev-ruby/minitest )"
+
+all_ruby_prepare() {
+	sed -i -e "/bundler/d" test/test_helper.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:test test/html2haml_test.rb || die
+	${RUBY} -Ilib:test test/erb_test.rb || die
+}
diff --git a/dev-ruby/httpauth/httpauth-0.2.1.ebuild b/dev-ruby/httpauth/httpauth-0.2.1.ebuild
deleted file mode 100644
index d45e1f3da142..000000000000
--- a/dev-ruby/httpauth/httpauth-0.2.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md TODO"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Library implementing the full HTTP Authentication protocol (RFC 2617)"
-HOMEPAGE="https://github.com/Manfred/HTTPauth"
-SRC_URI="https://github.com/Manfred/HTTPauth/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-RUBY_S=HTTPauth-${PV}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e "/[Bb]undler/d" Rakefile || die
-}
diff --git a/dev-ruby/lemon/lemon-0.9.1.ebuild b/dev-ruby/lemon/lemon-0.9.1.ebuild
deleted file mode 100644
index 5196ee5358fe..000000000000
--- a/dev-ruby/lemon/lemon-0.9.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_TEST=""
-RUBY_FAKEGEM_RECIPE_DOC="yard"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Lemon is a unit testing framework"
-HOMEPAGE="https://rubyworks.github.io/lemon/"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/qed )"
-ruby_add_rdepend "
-	dev-ruby/ae
-	>=dev-ruby/ansi-1.3
-	dev-ruby/rubytest"
-
-each_ruby_test() {
-	${RUBY} -S qed || die 'tests failed'
-}
diff --git a/dev-ruby/mab/mab-0.0.3-r2.ebuild b/dev-ruby/mab/mab-0.0.3-r2.ebuild
new file mode 100644
index 000000000000..fa6bfd2c2424
--- /dev/null
+++ b/dev-ruby/mab/mab-0.0.3-r2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_TASK_TEST="test"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Markup as Ruby"
+HOMEPAGE="https://github.com/camping/mab"
+LICENSE="MIT"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+IUSE="test"
+
+ruby_add_bdepend "test? ( dev-ruby/minitest )"
diff --git a/dev-ruby/multi_test/multi_test-0.1.2-r1.ebuild b/dev-ruby/multi_test/multi_test-0.1.2-r1.ebuild
index 0057dfec65f2..9e445324333c 100644
--- a/dev-ruby/multi_test/multi_test-0.1.2-r1.ebuild
+++ b/dev-ruby/multi_test/multi_test-0.1.2-r1.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="A uniform interface for Ruby testing libraries"
 HOMEPAGE="https://cucumber.io/"
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/nanotest/nanotest-0.9.4.1-r1.ebuild b/dev-ruby/nanotest/nanotest-0.9.4.1-r1.ebuild
index 0382216dc642..4939d4a6b339 100644
--- a/dev-ruby/nanotest/nanotest-0.9.4.1-r1.ebuild
+++ b/dev-ruby/nanotest/nanotest-0.9.4.1-r1.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Extremely mynymal test framework"
 HOMEPAGE="https://github.com/mynyml/nanotest"
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/net-ssh-gateway/net-ssh-gateway-2.0.0-r1.ebuild b/dev-ruby/net-ssh-gateway/net-ssh-gateway-2.0.0-r1.ebuild
index 4f40429b7399..5074ad99bf59 100644
--- a/dev-ruby/net-ssh-gateway/net-ssh-gateway-2.0.0-r1.ebuild
+++ b/dev-ruby/net-ssh-gateway/net-ssh-gateway-2.0.0-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/net-ssh/net-ssh-gateway/archive/${PV}.tar.gz -> ${P}
 
 LICENSE="GPL-2"
 SLOT="2.0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE=""
 
 ruby_add_bdepend "dev-ruby/minitest:5
diff --git a/dev-ruby/org-ruby/org-ruby-0.9.12-r1.ebuild b/dev-ruby/org-ruby/org-ruby-0.9.12-r1.ebuild
new file mode 100644
index 000000000000..d8552473aab2
--- /dev/null
+++ b/dev-ruby/org-ruby/org-ruby-0.9.12-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="README.org History.org"
+RUBY_FAKEGEM_GEMSPEC="org-ruby.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby routines for parsing org-mode files"
+HOMEPAGE="https://github.com/wallyqs/org-ruby"
+SRC_URI="https://github.com/wallyqs/${PN}/archive/version-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RUBY_S="${PN}-version-${PV}"
+
+ruby_add_rdepend ">=dev-ruby/rubypants-0.2:0"
+ruby_add_bdepend "test? ( dev-ruby/tilt )"
+
+all_ruby_prepare() {
+	#Fix tests until rspec:3 is available in the tree
+	sed -i -e "s/truthy/true/" -e "s/falsy/false/" spec/headline_spec.rb spec/parser_spec.rb spec/line_spec.rb || die
+}
diff --git a/dev-ruby/rack-openid/rack-openid-1.4.2-r1.ebuild b/dev-ruby/rack-openid/rack-openid-1.4.2-r1.ebuild
new file mode 100644
index 000000000000..3903b0a78330
--- /dev/null
+++ b/dev-ruby/rack-openid/rack-openid-1.4.2-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="Readme.md"
+RUBY_FAKEGEM_GEMSPEC="rack-openid.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Provides a more HTTPish API around the ruby-openid library"
+SRC_URI="https://github.com/grosser/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/grosser/rack-openid"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/ruby-openid-2.1.8 >=dev-ruby/rack-1.1.0:*"
+
+all_ruby_prepare() {
+	sed -i -e '/[Bb]undler/d' -e '/minitest\/rg/d' -e '/[Ll]og/d' test/helper.rb || die
+
+	sed -i -e 's/git ls-files/find/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib test/test_rack_openid.rb || die
+	# Needs unpackaged rots dependency https://github.com/roman/rots
+	# No release available right now
+	#${RUBY} -Ilib test/test_integration.rb || die
+}
diff --git a/dev-ruby/ruby-dict/ruby-dict-0.9.4-r5.ebuild b/dev-ruby/ruby-dict/ruby-dict-0.9.4-r5.ebuild
new file mode 100644
index 000000000000..b9f23145d653
--- /dev/null
+++ b/dev-ruby/ruby-dict/ruby-dict-0.9.4-r5.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby26 ruby27 ruby30"
+
+inherit ruby-ng
+
+DESCRIPTION="RFC 2229 client in Ruby"
+HOMEPAGE="http://www.caliban.org/ruby/ruby-dict.shtml"
+SRC_URI="http://www.caliban.org/files/ruby/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+all_ruby_prepare() {
+	eapply -p0 "${FILESDIR}/${PN}-ruby19.patch"
+
+	default
+}
+
+each_ruby_install() {
+	doruby lib/dict.rb || die "doruby failed"
+}
+
+all_ruby_install() {
+	dobin rdict
+
+	dodoc README Changelog TODO doc/rfc2229.txt
+	dodoc doc/dict.html doc/rdict.html
+
+	# This would probably need a 3rb section..
+	# doman doc/dict.3
+	doman doc/rdict.1
+}
diff --git a/dev-ruby/ruby-mp3info/ruby-mp3info-0.8.10.ebuild b/dev-ruby/ruby-mp3info/ruby-mp3info-0.8.10.ebuild
deleted file mode 100644
index 9f8d902cc08d..000000000000
--- a/dev-ruby/ruby-mp3info/ruby-mp3info-0.8.10.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="History.txt README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A pure Ruby library for access to mp3 files (internal infos and tags)"
-HOMEPAGE="http://rubyforge.org/projects/ruby-mp3info/"
-SRC_URI="https://github.com/moumar/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-
-DEPEND+=" test? ( media-sound/id3v2 )"
-
-ruby_add_bdepend "test? ( dev-ruby/hoe dev-ruby/test-unit:2 )"
diff --git a/dev-ruby/ruby_gntp/ruby_gntp-0.3.4-r1.ebuild b/dev-ruby/ruby_gntp/ruby_gntp-0.3.4-r1.ebuild
new file mode 100644
index 000000000000..5fe27dde44c9
--- /dev/null
+++ b/dev-ruby/ruby_gntp/ruby_gntp-0.3.4-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
+RUBY_FAKEGEM_EXTRADOC="README ChangeLog"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby library for GNTP(Growl Notification Transport Protocol)"
+HOMEPAGE="https://github.com/snaka/ruby_gntp"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+ruby_add_bdepend "test? ( dev-ruby/rr )"
+
+all_ruby_prepare() {
+	mv test spec || die
+	sed -i -e "s/Spec::Runner/RSpec/" \
+		-e "s#\.\./lib/##"\
+		spec/ruby_gntp_spec.rb || die
+
+}
diff --git a/dev-ruby/spy/Manifest b/dev-ruby/spy/Manifest
index 9ffc4706fe6e..bf9f036e2da7 100644
--- a/dev-ruby/spy/Manifest
+++ b/dev-ruby/spy/Manifest
@@ -1,2 +1 @@
-DIST spy-1.0.0.gem 33280 BLAKE2B e85c6de9ad9eedd61f95d0a22a87d402949fffe925af3c525a9ed7842ec4582a5063caa6767ece7c2c6f470d10abd44015c0e02a4f31f21c85d6db6b6a28c2a3 SHA512 adea03cd0c2e60f964887c3a80a29deabe7bf1d98f2b5490e8ed833e64c53144437fca636ec1cfa9413f93dbcf154b2cd27afc9363b33c37d99db7cb4790b358
 DIST spy-1.0.1.gem 33280 BLAKE2B cd5f0b6f74da5f693b2718ba7021359fe9292455ffc2c79510efce1fd40f84ffc49b92ea78d449e9722ee00c1d804e82ba88b3481c0297e58c0d7a8c177dbc85 SHA512 c9d7060b92f748897b2a5421df13024047c7418c1e0ba8e83b84d1a27372dcb2ed70fe2021ef23dee86f45dc5c326adb55a5ffbdc4f78895b2c6cf31838cc335
diff --git a/dev-ruby/spy/spy-1.0.0.ebuild b/dev-ruby/spy/spy-1.0.1-r1.ebuild
index 8d630b71d374..87603d6939fa 100644
--- a/dev-ruby/spy/spy-1.0.0.ebuild
+++ b/dev-ruby/spy/spy-1.0.1-r1.ebuild
@@ -1,13 +1,12 @@
-# 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"
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30"
 
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
 
-inherit multilib ruby-fakegem
+inherit ruby-fakegem
 
 DESCRIPTION="A simple opinionated mocking framework"
 HOMEPAGE="https://github.com/ryanong/spy"
@@ -17,7 +16,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm64"
 IUSE=""
 
-ruby_add_bdepend "test? ( dev-ruby/minitest:0 )"
+ruby_add_bdepend "test? ( dev-ruby/minitest )"
 
 all_ruby_prepare() {
 	sed -i -e "/bundler/d" -e "/pry/d" -e "/[Cc]overalls/d" -e '/[Rr]eporters/d' Rakefile test/test_helper.rb || die
diff --git a/dev-ruby/text-hyphen/text-hyphen-1.4.1-r3.ebuild b/dev-ruby/text-hyphen/text-hyphen-1.4.1-r3.ebuild
index a4f065842ad0..0f7b5da49138 100644
--- a/dev-ruby/text-hyphen/text-hyphen-1.4.1-r3.ebuild
+++ b/dev-ruby/text-hyphen/text-hyphen-1.4.1-r3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://rubyforge.org/projects/text-format"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "
diff --git a/dev-ruby/webrick/webrick-1.7.0.ebuild b/dev-ruby/webrick/webrick-1.7.0.ebuild
index 142c4339db93..69d286efdc23 100644
--- a/dev-ruby/webrick/webrick-1.7.0.ebuild
+++ b/dev-ruby/webrick/webrick-1.7.0.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/ruby/webrick"
 SRC_URI="https://github.com/ruby/webrick/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE="test"
 
diff --git a/dev-ruby/wirble/wirble-0.1.3-r4.ebuild b/dev-ruby/wirble/wirble-0.1.3-r4.ebuild
deleted file mode 100644
index bd908b0b2b55..000000000000
--- a/dev-ruby/wirble/wirble-0.1.3-r4.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README ChangeLog"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Wirble is a set of enhancements for Irb"
-HOMEPAGE="http://pablotron.org/software/wirble/"
-
-LICENSE="Ruby"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-pkg_postinst() {
-	elog "The quick way to use wirble is to make your ~/.irbrc look like this:"
-	elog "  # load libraries"
-	elog "  require 'rubygems'"
-	elog "  require 'wirble'"
-	elog "  "
-	elog "  # start wirble (with color)"
-	elog "  Wirble.init"
-	elog "  Wirble.colorize"
-}
diff --git a/dev-ruby/wirble/wirble-0.1.3-r5.ebuild b/dev-ruby/wirble/wirble-0.1.3-r5.ebuild
index 43536f9ebca6..b598390ca73c 100644
--- a/dev-ruby/wirble/wirble-0.1.3-r5.ebuild
+++ b/dev-ruby/wirble/wirble-0.1.3-r5.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="http://pablotron.org/software/wirble/"
 
 LICENSE="Ruby"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 pkg_postinst() {
diff --git a/dev-ruby/xmlrpc/Manifest b/dev-ruby/xmlrpc/Manifest
index 4aa86e4c4eb4..20e1cd867fc9 100644
--- a/dev-ruby/xmlrpc/Manifest
+++ b/dev-ruby/xmlrpc/Manifest
@@ -1,3 +1,2 @@
 DIST xmlrpc-0.3.0.tar.gz 34157 BLAKE2B 862bff09fdd7febfd85ef4fde77a913b77f20024692b1475994b93b394d587f1b2139c82ed7159cc756bd1757ee2fee55f103866c52d4297d8a38be70c066c22 SHA512 370b2fe2ed9ca37fbbc2e85d08328450671019a2dc0c2a31ecf8fc8af95105ccf1b8f728307a5d9cf5f4dbcd93ccfb2f66244b441c0aea1cd1aaca2e820dfe31
-DIST xmlrpc-0.3.1.tar.gz 34720 BLAKE2B 452640d82bd93568a3d36235a1f86f4d2be85b47022d269131daac4e12e759bf1129fc46293f3f4408cefeacad87214d1e34da1b3e3421638e5609659afb7586 SHA512 df47968288592aba4093b8c4d19ea86d6171c1f2cb10ab7b9a03fccc8ed65a9aec35908d831a281970e75becc7feff7242f9fc3ca5b64a54ffb56a717bccbdf3
 DIST xmlrpc-0.3.2.tar.gz 34780 BLAKE2B 9aeabd5c2549bd36a28bb56162471e5f822f873e3f976fa101a8fe26af9b0ab72bcceaf7b9bfac5488f315f79708db18bc7c507360aa567d95f136fe807084b5 SHA512 9d594971211d556f19db86e2bd5f948610342dbcee031e58cc83bc28c44bb02c54a8c00c44eb15bd96daafe02859a894193d5e507973a0a1df36251138d4999c
diff --git a/dev-ruby/xmlrpc/xmlrpc-0.3.1.ebuild b/dev-ruby/xmlrpc/xmlrpc-0.3.1.ebuild
deleted file mode 100644
index 3b5aca22d381..000000000000
--- a/dev-ruby/xmlrpc/xmlrpc-0.3.1.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_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="XMLRPC is a lightweight protocol that enables remote procedure calls over HTTP"
-HOMEPAGE="https://github.com/ruby/xmlrpc"
-SRC_URI="https://github.com/ruby/xmlrpc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Ruby"
-SLOT="0"
-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"
-IUSE="test"
-
-ruby_add_bdepend "test? ( dev-ruby/test-unit )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/ s:^:#:' Rakefile || die
-
-	# Avoid dependency on git
-	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/xmlrpc/xmlrpc-0.3.2-r1.ebuild b/dev-ruby/xmlrpc/xmlrpc-0.3.2-r1.ebuild
index 17a59ef15fab..f6aefa08c5c4 100644
--- a/dev-ruby/xmlrpc/xmlrpc-0.3.2-r1.ebuild
+++ b/dev-ruby/xmlrpc/xmlrpc-0.3.2-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/ruby/xmlrpc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Ruby"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 ruby_add_rdepend "dev-ruby/webrick"
diff --git a/dev-ruby/xmlrpc/xmlrpc-0.3.2.ebuild b/dev-ruby/xmlrpc/xmlrpc-0.3.2.ebuild
deleted file mode 100644
index 0451f271de91..000000000000
--- a/dev-ruby/xmlrpc/xmlrpc-0.3.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 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="XMLRPC is a lightweight protocol that enables remote procedure calls over HTTP"
-HOMEPAGE="https://github.com/ruby/xmlrpc"
-SRC_URI="https://github.com/ruby/xmlrpc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Ruby"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-
-ruby_add_bdepend "test? ( dev-ruby/test-unit )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/ s:^:#:' Rakefile || die
-
-	# Avoid dependency on git
-	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}