Adding metadata

25 files changed, 97 insertions, 301 deletions

diff --git a/dev-ruby/async_sinatra/async_sinatra-1.3.0.ebuild b/dev-ruby/async_sinatra/async_sinatra-1.3.0.ebuild
deleted file mode 100644
index ba6570972e51..000000000000
--- a/dev-ruby/async_sinatra/async_sinatra-1.3.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=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc README.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Asynchronous response API for Sinatra and Thin"
-HOMEPAGE="https://github.com/raggi/async_sinatra"
-SRC_URI="https://github.com/raggi/async_sinatra/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-ruby_add_bdepend "test? (
-	>=dev-ruby/hoe-3.13
-	>=dev-ruby/minitest-5.6:5
-	>=dev-ruby/eventmachine-0.12.11
-	dev-ruby/rake
-	dev-ruby/rack-test
-	)"
-
-ruby_add_rdepend ">=dev-ruby/sinatra-1.3.2
-	>=dev-ruby/rack-1.4.1:*"
-
-each_ruby_test() {
-	MT_NO_PLUGINS=true ${RUBY} -S rake test || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	insinto /usr/share/doc/${PF}/
-	doins -r examples
-}
diff --git a/dev-ruby/crack/Manifest b/dev-ruby/crack/Manifest
index 3bcf68e1f3a1..18047808bdc6 100644
--- a/dev-ruby/crack/Manifest
+++ b/dev-ruby/crack/Manifest
@@ -1,2 +1 @@
-DIST crack-0.4.3.gem 574976 BLAKE2B 4b6f23277ec17a516d06e6e6785889996172b3ec077f022d1a52ab4b8e938b2735abbaecc71288b55654ff09a428c33eb944b627cfdc827ea1f4ddc6289461d9 SHA512 c6577bd86fe2e36b2a37693729da9fc35c5d4deb860ac1873265ccb6fb38056fd76d8c17bb4f779b39f4bc13b9db37c1768433f518c17090ccbb0872a103b386
 DIST crack-0.4.4.tar.gz 586633 BLAKE2B 26e2cda6e9447fb3c9fe02092a6e9d6a8097c7bca6a483a3af42aa8ba491b737bc0dc3ae1936ef8ffb5c5d5cbbed3fde69c9641f05b9e3eb3beab87c375f68fd SHA512 3f86c76718a3c2a65ee11b15434035396c2355a8562bdb642432a659b52c3e811e930318e0dc2df3ff06bd53ac14d0694471e425420ae3b7971f5d4f818bba87
diff --git a/dev-ruby/crack/crack-0.4.3-r2.ebuild b/dev-ruby/crack/crack-0.4.3-r2.ebuild
deleted file mode 100644
index 23441eda7a0a..000000000000
--- a/dev-ruby/crack/crack-0.4.3-r2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md History"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Really simple JSON and XML parsing, ripped from Merb and Rails"
-HOMEPAGE="https://github.com/jnunemaker/crack"
-
-LICENSE="MIT"
-SLOT="0"
-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"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/minitest )"
-ruby_add_rdepend ">=dev-ruby/safe_yaml-1.0.4-r4"
-
-each_ruby_prepare() {
-	# Remove tests which fail when run by portage but pass when run by hand
-	sed -i -e '/{"regex": \/foo.*\/}/d' test/json_test.rb || die
-	sed -i -e '/{"regex": \/foo.*\/i}/d' test/json_test.rb || die
-	sed -i -e '/{"regex": \/foo.*\/mix}/d' test/json_test.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -Itest -Ilib -e 'Dir["test/*_test.rb"].each { |f| load f }' || die
-}
diff --git a/dev-ruby/faraday_middleware-multi_json/faraday_middleware-multi_json-0.0.6-r1.ebuild b/dev-ruby/faraday_middleware-multi_json/faraday_middleware-multi_json-0.0.6-r1.ebuild
deleted file mode 100644
index 8a361475fdc2..000000000000
--- a/dev-ruby/faraday_middleware-multi_json/faraday_middleware-multi_json-0.0.6-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Response JSON parser using MultiJson and FaradayMiddleware"
-HOMEPAGE="https://github.com/denro/faraday_middleware-multi_json"
-SRC_URI="https://github.com/denro/faraday_middleware-multi_json/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "
-	dev-ruby/faraday_middleware:*
-	dev-ruby/multi_json"
-
-all_ruby_prepare() {
-	# Remove bundler support.
-	rm -f Gemfile || die
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-
-	# Avoid unneeded dependency on git.
-	sed -i -e '/files/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/hiredis/hiredis-0.6.3-r1.ebuild b/dev-ruby/hiredis/hiredis-0.6.3-r1.ebuild
new file mode 100644
index 000000000000..ec852faec264
--- /dev/null
+++ b/dev-ruby/hiredis/hiredis-0.6.3-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby26 ruby27 ruby30"
+
+MY_P="hiredis-rb-${PV}"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/hiredis_ext/extconf.rb)
+RUBY_FAKEGEM_EXTENSION_LIBDIR="lib/hiredis/ext"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Wrapper for hiredis (protocol serialization/deserialization and blocking I/O)"
+HOMEPAGE="https://github.com/redis/hiredis-rb"
+SRC_URI="https://github.com/redis/hiredis-rb/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND+=" =dev-libs/hiredis-0.14*:="
+DEPEND+=" dev-libs/hiredis:= test? ( dev-ruby/test-unit:2 )"
+DEPEND+=" virtual/pkgconfig"
+
+RUBY_S="${MY_P}"
+
+PATCHES=( "${FILESDIR}/${PN}-0.6.1-unvendor-hiredis.patch" )
+
+all_ruby_prepare() {
+	sed -i -e 's:/tmp/:'${T}'/:' test/connection_test.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:. -e 'Dir["test/*_test.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/launchy/Manifest b/dev-ruby/launchy/Manifest
index b85aeb88b089..13c172ce9c99 100644
--- a/dev-ruby/launchy/Manifest
+++ b/dev-ruby/launchy/Manifest
@@ -1,2 +1 @@
-DIST launchy-2.4.3.gem 29184 BLAKE2B d6e8e26f37a811fc994ee762791ea9ddb424dc99d23790905f80416734677535aa8b2087eab233dc1535556c240f260c5995185e10642cd682bbe508e3e30654 SHA512 7c3e0377c9a310b2e7a4d1544b4790f6f959d24b6aba91660e979eb943f4bee641e0b5a44687b693ffe99304ceb96a9a6cf9fed142e231af01135bd2b73321d6
 DIST launchy-2.5.0.gem 30208 BLAKE2B 30719f97fdf1bca8a66eb113992c8714103a7fe87262c3677a0fa64b58070593bcbdba7357b81e5bada9e8a143e6601e28ef2d2730f0028fdaecefad23156fd8 SHA512 d80811009155d9cea6a2e69b5f7482aaec7d0bf23ecca4cbe72e440fb4eae1c38bc5904e863998f1966c7a99b98bad1f4456cec1cb076f96f5a99b835448b39f
diff --git a/dev-ruby/launchy/launchy-2.4.3-r2.ebuild b/dev-ruby/launchy/launchy-2.4.3-r2.ebuild
deleted file mode 100644
index 061b8cfc357f..000000000000
--- a/dev-ruby/launchy/launchy-2.4.3-r2.ebuild
+++ /dev/null
@@ -1,36 +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_EXTRADOC="README.md HISTORY.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Helper class for launching cross-platform applications"
-HOMEPAGE="https://github.com/copiousfreetime/launchy"
-
-LICENSE="ISC"
-
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-# File collision conflict with x11-misc/launchy, bug 545170
-ruby_add_rdepend ">=dev-ruby/addressable-2.3 !!x11-misc/launchy"
-
-ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.0:5 )"
-
-# This test is expected to fail on linux, drop it
-RUBY_PATCHES=( "${FILESDIR}"/${PN}-2.4.2-drop-failing-test.patch )
-
-all_ruby_prepare() {
-	sed -i -e "/[Ss]implecov/d" spec/spec_helper.rb || die
-
-	# Avoid tests depending on the current user's desktop environment.
-	sed -e '/returns NotFound if it cannot determine/askip "gentoo"' \
-		-i spec/detect/nix_desktop_environment_spec.rb || die
-	sed -e '/asssumes we open a local file if we have an exception/askip "gentoo"' \
-		-i spec/launchy_spec.rb || die
-}
diff --git a/dev-ruby/launchy/launchy-2.5.0.ebuild b/dev-ruby/launchy/launchy-2.5.0.ebuild
index 4ec867d948c5..ab526694d306 100644
--- a/dev-ruby/launchy/launchy-2.5.0.ebuild
+++ b/dev-ruby/launchy/launchy-2.5.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_EXTRADOC="README.md HISTORY.md"
 
diff --git a/dev-ruby/mime-types-data/mime-types-data-3.2021.0901.ebuild b/dev-ruby/mime-types-data/mime-types-data-3.2021.0901.ebuild
index 177ccbaec43f..0e3f539b679d 100644
--- a/dev-ruby/mime-types-data/mime-types-data-3.2021.0901.ebuild
+++ b/dev-ruby/mime-types-data/mime-types-data-3.2021.0901.ebuild
@@ -18,5 +18,5 @@ HOMEPAGE="https://github.com/mime-types/mime-types-data"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~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 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
diff --git a/dev-ruby/mime-types/mime-types-3.3.1.ebuild b/dev-ruby/mime-types/mime-types-3.3.1.ebuild
index 84d2493d89f6..1667d3883c70 100644
--- a/dev-ruby/mime-types/mime-types-3.3.1.ebuild
+++ b/dev-ruby/mime-types/mime-types-3.3.1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/mime-types/ruby-mime-types"
 
 LICENSE="MIT"
 SLOT="3"
-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 "test? ( dev-ruby/minitest:5 dev-ruby/minitest-bonus-assertions:2 dev-ruby/minitest-hooks:1 )"
diff --git a/dev-ruby/minitest-bonus-assertions/minitest-bonus-assertions-3.0-r1.ebuild b/dev-ruby/minitest-bonus-assertions/minitest-bonus-assertions-3.0-r1.ebuild
index 704a67c3b0b0..0f487e76c3ec 100644
--- a/dev-ruby/minitest-bonus-assertions/minitest-bonus-assertions-3.0-r1.ebuild
+++ b/dev-ruby/minitest-bonus-assertions/minitest-bonus-assertions-3.0-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/halostatue/minitest-bonus-assertions"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~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 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/minitest dev-ruby/minitest-pretty_diff )"
diff --git a/dev-ruby/minitest-hooks/minitest-hooks-1.5.0.ebuild b/dev-ruby/minitest-hooks/minitest-hooks-1.5.0.ebuild
index 4ed2bfe1bc3f..2da0cf79558b 100644
--- a/dev-ruby/minitest-hooks/minitest-hooks-1.5.0.ebuild
+++ b/dev-ruby/minitest-hooks/minitest-hooks-1.5.0.ebuild
@@ -15,5 +15,5 @@ HOMEPAGE="https://github.com/jeremyevans/minitest-hooks"
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv sparc ~x86"
 IUSE=""
diff --git a/dev-ruby/minitest-pretty_diff/minitest-pretty_diff-0.1-r1.ebuild b/dev-ruby/minitest-pretty_diff/minitest-pretty_diff-0.1-r1.ebuild
index ade5492f1ed1..1b66be79afcb 100644
--- a/dev-ruby/minitest-pretty_diff/minitest-pretty_diff-0.1-r1.ebuild
+++ b/dev-ruby/minitest-pretty_diff/minitest-pretty_diff-0.1-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/adammck/minitest-pretty_diff"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~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 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 each_ruby_test() {
diff --git a/dev-ruby/net-http-persistent/Manifest b/dev-ruby/net-http-persistent/Manifest
index 649bef0cf9a5..6cef2d4de01a 100644
--- a/dev-ruby/net-http-persistent/Manifest
+++ b/dev-ruby/net-http-persistent/Manifest
@@ -1,4 +1,2 @@
-DIST net-http-persistent-3.0.0.gem 30208 BLAKE2B 2bbd87d66e65081c76bc9cddaeb38f3ffd8a92b5b64f7717f77c7a927e2032fa732c2e82e220a75a63ddc10dfaa6a0f24e4fa7e0964e2ebd3d0729127f1fb452 SHA512 a601d3abde43b196406e3cdd6b704796ed70db67dfb67c9b510e0164ce7355cc925cac37fbf4c5889f41b069890ba2e2c15440fb40294ed21891fd08d9f87894
 DIST net-http-persistent-3.1.0.gem 31744 BLAKE2B fdd9c36ab5216c1cd1fe358207a689276e109845ac374ea16011469b6cb2b165115e78e701cce98c280e7f878c23d8016e75cac4508c7e579209012671b64101 SHA512 65b5afc4ad0729ec14b642e0e36363cecfff3dc25b26308d632866e93fed3eccfb83ce85da78f631553c6a1fe3ee834fcbc9d3681c85db6387463abbc30e60fa
-DIST net-http-persistent-4.0.0.gem 30720 BLAKE2B 5955cd60c86ae74c1f9d3415bf0257542718fc83d2b82cbc6ce31b5013edd1c0c3202757ccaf23a33c70d90fcb04e6bdfd2cdddfb82a45733ae3d15a5c526301 SHA512 eccc6cacfdd1dfb99bd0dcb7fe1c13cb1c21eae0104357156888bd0a5b2ee0b0d8ed5687860670c2dc54ccc1cfc7a090592bee160458427f44c255c1b99938d2
 DIST net-http-persistent-4.0.1.gem 27136 BLAKE2B b88151498c401cc20983c86859d7ef7ae3688ee12a5fcc69544d9716c3aeed55f4339d35ec08e9c0a6a16b4b4ab807d7155425c3056b9634185c255472ad93c5 SHA512 d3c86c9c58affac8cde1513dd899527406c0baafd3a620b80011e3babf51a4bfd6fb2bd8998fd9c4696d49aad2d014bdf666b9626e06fe4413cb4010f94e5e91
diff --git a/dev-ruby/net-http-persistent/net-http-persistent-3.0.0.ebuild b/dev-ruby/net-http-persistent/net-http-persistent-3.0.0.ebuild
deleted file mode 100644
index 1a3b0067b692..000000000000
--- a/dev-ruby/net-http-persistent/net-http-persistent-3.0.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-RUBY_FAKEGEM_EXTRADOC="History.txt README.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Manages persistent connections using Net::HTTP plus a speed fix for Ruby 1.8"
-HOMEPAGE="https://github.com/drbrain/net-http-persistent"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE="doc test"
-
-ruby_add_rdepend ">=dev-ruby/connection_pool-2.2:0"
-
-ruby_add_bdepend "
-	test? ( dev-ruby/hoe dev-ruby/minitest )"
-
-all_ruby_prepare() {
-	# avoid test with implicit dependency on net-http-pipeline which
-	# fails and is not tested upstream
-	sed -i -e '/net-http-pipeline not installed/ s/unless.*$//' test/test_net_http_persistent.rb || die
-}
diff --git a/dev-ruby/net-http-persistent/net-http-persistent-4.0.0.ebuild b/dev-ruby/net-http-persistent/net-http-persistent-4.0.0.ebuild
deleted file mode 100644
index 7fd3e977522e..000000000000
--- a/dev-ruby/net-http-persistent/net-http-persistent-4.0.0.ebuild
+++ /dev/null
@@ -1,29 +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 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="History.txt README.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Manages persistent connections using Net::HTTP plus a speed fix for Ruby 1.8"
-HOMEPAGE="https://github.com/drbrain/net-http-persistent"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE="doc test"
-
-ruby_add_rdepend ">=dev-ruby/connection_pool-2.2:0"
-
-ruby_add_bdepend "
-	test? ( dev-ruby/hoe dev-ruby/minitest )"
-
-all_ruby_prepare() {
-	# avoid test with implicit dependency on net-http-pipeline which
-	# fails and is not tested upstream
-	sed -i -e '/net-http-pipeline not installed/ s/unless.*$//' test/test_net_http_persistent.rb || die
-}
diff --git a/dev-ruby/patron/patron-0.13.3-r1.ebuild b/dev-ruby/patron/patron-0.13.3-r1.ebuild
index 08c165ff73fb..508eb953b942 100644
--- a/dev-ruby/patron/patron-0.13.3-r1.ebuild
+++ b/dev-ruby/patron/patron-0.13.3-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby26 ruby27"
+USE_RUBY="ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_EXTRADOC="README.md"
diff --git a/dev-ruby/pg_array_parser/pg_array_parser-0.0.9-r3.ebuild b/dev-ruby/pg_array_parser/pg_array_parser-0.0.9-r3.ebuild
new file mode 100644
index 000000000000..eaf4ea21c240
--- /dev/null
+++ b/dev-ruby/pg_array_parser/pg_array_parser-0.0.9-r3.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"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/pg_array_parser/extconf.rb)
+
+inherit ruby-fakegem
+
+DESCRIPTION="Simple library to parse PostgreSQL arrays into a array of strings"
+HOMEPAGE="https://github.com/dockyard/pg_array_parser"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-3)"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+ruby_add_bdepend "dev-ruby/bundler"
+
+all_ruby_prepare() {
+	[ -f Gemfile.lock ] && rm Gemfile.lock
+	#if ! use development; then
+		sed -i -e "/^group :development do/,/^end$/d" Gemfile || die
+		sed -i -e "/s.add_development_dependency/d" "${PN}".gemspec || die
+		sed -i -e "/gem.add_development_dependency/d" "${PN}".gemspec || die
+	#fi
+	#if ! use test; then
+		sed -i -e "/^group :test do/,/^end$/d" Gemfile || die
+	#fi
+	#if ! use test && ! use development; then
+		sed -i -e "/^group :development, :test do/,/^end$/d" Gemfile || die
+	#fi
+}
diff --git a/dev-ruby/puppetdb-termini/puppetdb-termini-7.6.0.ebuild b/dev-ruby/puppetdb-termini/puppetdb-termini-7.6.0.ebuild
index a7cef96b4b13..759e7aabae62 100644
--- a/dev-ruby/puppetdb-termini/puppetdb-termini-7.6.0.ebuild
+++ b/dev-ruby/puppetdb-termini/puppetdb-termini-7.6.0.ebuild
@@ -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/rbnacl/rbnacl-7.1.1.ebuild b/dev-ruby/rbnacl/rbnacl-7.1.1.ebuild
index 2d6b8d9ae9d6..57c4a97019ba 100644
--- a/dev-ruby/rbnacl/rbnacl-7.1.1.ebuild
+++ b/dev-ruby/rbnacl/rbnacl-7.1.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/cryptosphere/rbnacl"
 
 LICENSE="MIT"
 SLOT="6"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ppc64 ~x86"
 IUSE=""
 
 RDEPEND+=" dev-libs/libsodium"
diff --git a/dev-ruby/rr/Manifest b/dev-ruby/rr/Manifest
index 0af4da4ed141..fdf2b64eb2da 100644
--- a/dev-ruby/rr/Manifest
+++ b/dev-ruby/rr/Manifest
@@ -1,6 +1,4 @@
 DIST rr-1.2.1.tar.gz 137497 BLAKE2B 3db6751d15e54da6ee6777fb7d383c1bfea2e68482dda03ceda9a70f66382cf9aa7c39f27fca9f0ce92b19858b5324bdbb5811809b3ae146e213bb03ddca0772 SHA512 df2d05ff732908da55878cb89cb7d1c4442a18c19f71940244f5bd7dc55632467a1824f55d7fade4b5122486a61277090d7ad05df9f99098030c21aa45b36dd2
-DIST rr-3.0.0.tar.gz 137978 BLAKE2B 707678362370173c3cb088db9003a5acb54f42b579955239317738027ede63d19217c9e76dd693d09226bac85b41cf9422ac7a580f502c1cbc338b0d4ccb34c9 SHA512 4d162a88868dde9a300a0783869d7c7edae840960c26697e20db3858cc3cc9db942a52c22e79584d3e7371da59156ff4f026ca9052d9d4b203159223f78b1030
-DIST rr-3.0.2.tar.gz 138641 BLAKE2B 5b28722a4fab8fa83fac349e1f57fa968adfef3f007b55ccf0fe673a538a3992334c373b52c0e219b0a8bb43eae2105957c3e7569909b6f85bdc5933e97f7358 SHA512 d421d652b388c9ae533dc6d26f59c6327c9438a9318e17473133e4acbdd378bb38c676e08fefb221227e3aeb6f3a469d03ece5ae5102d3f04f800922b533d5f0
-DIST rr-3.0.5.tar.gz 139168 BLAKE2B bab1274fde8362e591702d94b9faeb136360e707b41e2c3d95a1bd12da451540a5f9cb8d9f808b80fa5b842f0d407f9f47ff15448fc3b0d0cdd9bef72131183f SHA512 6bfa6426a0675c9dba88c10cd50a70cc480bf88d3b485164baf5db53ffbd312a32fe9e1ea73ac209c4cae61689ae3f5f1959f23320625d37d457c3f53c320ed0
 DIST rr-3.0.6.tar.gz 139275 BLAKE2B 5388312320958a03cdd48363470e32911d46080d38e02e29891a9a0bcd2ebe18e0c6dcfb5188631cb607452ad66d708e6fc36b9ed1571031eb433949e4546cf6 SHA512 f80baee790efa5b43c280cb70ed4d1d9202e1d1c3ce653680e4b433d595278b4180dd681c30df75a78466ac687851f3e15d0a08110def1868ce724d07e025abb
 DIST rr-3.0.7.tar.gz 139473 BLAKE2B cf12f792cc851aea2a0281ac0a46a1fef5d8df616fc47b630f509336208b2b443e3cfddaf9329b105b2a121b6aca002c407d7123c9b0e9606bc0d5f1f08b01be SHA512 54b5393d5618310dedf68946a3d3387d738f0f78e03fdd2ec1491f5e7d8f0d4288599930bc3b7dc01b57399afd9cb094d9f11f5371cb5128aad74fe761445731
+DIST rr-3.0.8.tar.gz 140003 BLAKE2B 7bb039803556f30f487a129b92e737e9d70cf73c423cfecfc653ee3793e3fb1f576c11dcdade9ad4f15853ae1ad8c2a60535de47ade9617e37c0ca849ff06c26 SHA512 c1d156b7f663a09d39b064f80d9c59a3256fff3236ca48667ebee7eb3d846b8fda7fc042dfd7da01d9bed8dcc677ea5fea315d6be45f219a8f3719972ef01f5d
diff --git a/dev-ruby/rr/rr-3.0.0.ebuild b/dev-ruby/rr/rr-3.0.0.ebuild
deleted file mode 100644
index 85b47d8658f8..000000000000
--- a/dev-ruby/rr/rr-3.0.0.ebuild
+++ /dev/null
@@ -1,40 +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="none"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC=rr.gemspec
-
-inherit ruby-fakegem
-
-DESCRIPTION="A double framework featuring a selection of double techniques and a terse syntax"
-HOMEPAGE="https://rr.github.io/rr"
-SRC_URI="https://github.com/rr/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-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/rspec:2
-		dev-ruby/minitest
-		dev-ruby/diff-lcs )"
-
-all_ruby_prepare() {
-	rm Gemfile || die
-	sed -i -e '1,2 s:^:#:' spec/suites/rspec_2/spec_helper.rb || die
-}
-
-each_ruby_test() {
-	# Only run the rspec 2 case since we don't have appraisals. Setting
-	# up everything correctly without it seems very complicated.
-	ruby-ng_rspec --format progress spec/suites/rspec_2/unit || die
-}
diff --git a/dev-ruby/rr/rr-3.0.2.ebuild b/dev-ruby/rr/rr-3.0.2.ebuild
deleted file mode 100644
index 5cec9bb3a296..000000000000
--- a/dev-ruby/rr/rr-3.0.2.ebuild
+++ /dev/null
@@ -1,31 +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_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC=rr.gemspec
-
-inherit ruby-fakegem
-
-DESCRIPTION="A double framework featuring a selection of double techniques and a terse syntax"
-HOMEPAGE="https://rr.github.io/rr"
-SRC_URI="https://github.com/rr/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-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/minitest
-		dev-ruby/diff-lcs
-		dev-ruby/test-unit-rr )"
-
-all_ruby_prepare() {
-	rm Gemfile || die
-}
diff --git a/dev-ruby/rr/rr-3.0.5.ebuild b/dev-ruby/rr/rr-3.0.8.ebuild
index 5cec9bb3a296..0ebc522df87e 100644
--- a/dev-ruby/rr/rr-3.0.5.ebuild
+++ b/dev-ruby/rr/rr-3.0.8.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/rr/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "test? (
diff --git a/dev-ruby/windows_error/windows_error-0.1.2.ebuild b/dev-ruby/windows_error/windows_error-0.1.2-r1.ebuild
index c910f5d16f0f..4f9c1ea42e17 100644
--- a/dev-ruby/windows_error/windows_error-0.1.2.ebuild
+++ b/dev-ruby/windows_error/windows_error-0.1.2-r1.ebuild
@@ -1,21 +1,20 @@
-# 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"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
-inherit ruby-fakegem versionator
+inherit ruby-fakegem
 
 DESCRIPTION="reference for standard Windows API Error Codes"
 HOMEPAGE="https://github.com/rapid7/windows_error"
 
 LICENSE="BSD"
-SLOT="$(get_version_component_range 1-2)"
+SLOT="$(ver_cut 1-2)"
 KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""