gentoo resync : 03.11.2021

author: V3n3RiX <venerix@koprulu.sector> 2021-11-03 06:47:15 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2021-11-03 06:47:15 +0000
commit: fc2f1018fc323ef2c6572734a9b130427cba76a6 (patch)
tree: f834bdc9a67923ce75297c09d00d1e7b90791d26 /dev-ruby
parent: 162945d2a91899b637bbb9e163b406350de12906 (diff)
81 files changed, 622 insertions, 920 deletions
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 1acd97c3795f..46c82f498cc2 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/amatch/Manifest b/dev-ruby/amatch/Manifest
index ae8878604197..4c81e210bc42 100644
--- a/dev-ruby/amatch/Manifest
+++ b/dev-ruby/amatch/Manifest
@@ -1,4 +1,3 @@
 DIST amatch-0.4.0.gem 38912 BLAKE2B 065b4c537a2727cbb7f7d52aff545a3f7f8434b37553e59b261d9760ed304c24a20e4778c375e7b7fa11f40655cac786ca15cdb11360ac7296f03186439be480 SHA512 c5a1d17b46f51796d3f082ab9d18845625a28e08339756ebc0689ad6c50b1406611fd5a316e628e4dab6d9b654c969a4fc6e8c2b2079f04c64e3d990e95a64a0
 EBUILD amatch-0.4.0-r1.ebuild 836 BLAKE2B ee9bc7ea8d7fd3dc2aeba3a51f3c59c06186dd6e7a01b4f8716374985478554d68b5cb4093216e8723de2b3cf4ebfafaeb141c182a45cda85df09f82bf59f82a SHA512 1766cb652e1d07c1ae3a7960f7ff4b1410298d9c1beebc5a77ceb3f8de3a34c20fbf9640bade6a44d744d6b2b8c3c8606892370899758ac53bf9d79baab102c5
-EBUILD amatch-0.4.0.ebuild 950 BLAKE2B 1148f013ffae99d34e12df0d1805941b11b7e60f1c31968b778e82804907849a1cbaf6d97458be0d17b2162e05ee9602c930a7ad16bffa4ed15f8f08a0a2047d SHA512 00a261ae5d37e0896bf57e9e5f609318ce85ad6689834c53498333a1f78986eaf4ff2d77efbc313226eb7da03b0da1e708894c35b3bf376e7e79f2fd6914b087
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
diff --git a/dev-ruby/amatch/amatch-0.4.0.ebuild b/dev-ruby/amatch/amatch-0.4.0.ebuild
deleted file mode 100644
index a3419a008e08..000000000000
--- a/dev-ruby/amatch/amatch-0.4.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGES README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="Approximate Matching Extension for Ruby"
-HOMEPAGE="https://flori.github.com/amatch/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE=""
-
-ruby_add_rdepend "=dev-ruby/tins-1*"
-
-# These packages also provide agrep, bug 626480
-RDEPEND+=" !app-misc/glimpse !app-text/agrep !dev-libs/tre"
-
-all_ruby_prepare() {
-	# mize is listed as a dependency but not actually used
-	sed -i -e '/mize/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake -Cext V=1
-	cp ext/amatch_ext$(get_modname) lib/ || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib -S testrb-2 tests/* || die
-}
diff --git a/dev-ruby/bcrypt-ruby/Manifest b/dev-ruby/bcrypt-ruby/Manifest
index 9ef306619c91..92c3b3e2dd8e 100644
--- a/dev-ruby/bcrypt-ruby/Manifest
+++ b/dev-ruby/bcrypt-ruby/Manifest
@@ -1,8 +1,4 @@
-DIST bcrypt-3.1.13.gem 54272 BLAKE2B b2a349955a066e39cc50540ff116e70e2bac359c03ddd9dfa35d6a946d15235921cd82feec8b1d76f5f82a3ff9dea288f115dc8e1fae3f24e559a1462e173ccd SHA512 d996f381643a0322d66a1a5dc7d26887baaf48d90ac8f87283bf2aa35f2a0048049e1df10d95283d37f25e3331ca3cb19a9a7c12b95fa1b1a1bdec0e5d8133bf
-DIST bcrypt-3.1.15.gem 54272 BLAKE2B d830131971ffb8a26efd4d7afa8cf6f4a93026fbff3b7132037af0acccbc3a94fab9027a2c26f29e4af0a14038effd935b56aae29df4c1c8aa65bc58453d94ad SHA512 f736b0762116c8c4cc26486ae2d0eb1d25c20577874973b7fab2dc8b5171d6c685a96a8c9d39f8dad1fd1c03f6c6c1b80a6471d2c6fa7ca5f3d1837715052cbc
 DIST bcrypt-3.1.16.gem 54272 BLAKE2B df8e1169df3a67f3eedd90b4fe04224266cd41d1a0dd2866b06372805b5b00aa028c3bb077078ffde3c89a9052497016dc3fe812075d8b6f57d6dd951a6aa806 SHA512 655483d73347c20f3b04a24d625cde05fd8e1da6f022363fbb2df828aea0623cb5b4981d97791301dcd83edc2719a2238d8d377af1558ca2ce4b3c8ade9bd343
-EBUILD bcrypt-ruby-3.1.13.ebuild 1622 BLAKE2B 2d8bea12834b90c7c72305e7a8be86bf017678cfd54ca0d361f9b4199317b5fa98b1122048a6b0551a4ed9f752c754465006f1f5178309adccaefd6745c1acfc SHA512 9fe9ba2bd7cb56cb9665b43987779dd3e715f0c0ac1e29416bc9556cc7f10aa1559372640680bdb9c2779feb99866632d7cb44632d4df616040014fa67f5bd64
-EBUILD bcrypt-ruby-3.1.15.ebuild 1616 BLAKE2B ffe6304ed15fdf20c5d89d3144f9f585c0288337f0e3c114b32daaecfc981a8c0c453add8056213c604831f60f8b21b5bc32e73891cfa36d65e0957984c7a34a SHA512 317d139330ebe8be64d0c28f1137e581446fb862b7684abd71134e70fadcf27be91f15b985d0837c28591eee2d0010f92b8e1c4246a152ccb4a5bc06a08a3ed2
 EBUILD bcrypt-ruby-3.1.16-r1.ebuild 1512 BLAKE2B da39d357f52fe6e3bbed0964c0e78c9f44798358902d62eb613fac45a0009f2483b59d04013fdff054ef35139af59019c2656fa4848a5919b3baa43d5b89eaf9 SHA512 84f16968513746a85c1da9e8d890d5445260ffc285a715c59e879b3b36d28b2401eaccf3246b5ef88e716c7cb686d3e5fb3d950d8ed42f38a30decfd6cdcb9e2
 EBUILD bcrypt-ruby-3.1.16.ebuild 1615 BLAKE2B 4534b33b84d784b5afb0a86da52bd8c3cac4c8e9c03620b2091644eb88e308d0a7e70d3b9fe5d8f6845861af79b5fceaf022b9136d68fe9bedd066f509b6d436 SHA512 870b244082f21c1241b2dedfc8ef904e35260683c0ea2e164043e69078d0f28f800082cf8ce1a59c53dfcbf080b1f20e788ea582bc956929f1bf9bb8ee752026
 MISC metadata.xml 347 BLAKE2B 5430c9a624d1e922507758954755b4b7e29ffc5c9bec8a78bb9a726b17fb50e492fbf7476964cba269b80d1c6d34ab4ad9d482115825b6c18a25d61fa6dead89 SHA512 901e5c0b9da6c30ae04a0976010dff1faef88fb07d190ecea9eee06abaa1204280176b94dca90e0b5bc5af6423bb72a0657d8460eacd22b8aaf48fbf30b9f2c8
diff --git a/dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.13.ebuild b/dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.13.ebuild
deleted file mode 100644
index 27b77ed11a48..000000000000
--- a/dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.13.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"
-
-RUBY_FAKEGEM_NAME="bcrypt"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="An easy way to keep your users' passwords secure"
-HOMEPAGE="https://github.com/codahale/bcrypt-ruby"
-LICENSE="MIT"
-
-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=""
-
-all_ruby_prepare() {
-	rm Gemfile || die
-	sed -i -e '/git ls-files/d' bcrypt.gemspec || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/mri extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake -Cext/mri V=1
-	cp ext/mri/*$(get_modname) lib/ || die
-}
-
-each_ruby_install() {
-		each_fakegem_install
-
-		# bcrypt was called bcrypt-ruby before, so add a spec file that
-		# simply loads bcrypt to make sure that old projects load correctly
-		# we don't even need to create a file to load this: the `require
-		# bcrypt` was already part of bcrypt-ruby requirements.
-		cat - <<EOF > "${T}/bcrypt-ruby.gemspec"
-Gem::Specification.new do |s|
-	s.name = "bcrypt-ruby"
-	s.version = "${RUBY_FAKEGEM_VERSION}"
-	s.summary = "Fake gem to load bcrypt"
-	s.homepage = "${HOMEPAGE}"
-	s.specification_version = 3
-	s.add_runtime_dependency("${RUBY_FAKEGEM_NAME}", ["= ${RUBY_FAKEGEM_VERSION}"])
-end
-EOF
-		RUBY_FAKEGEM_NAME=bcrypt-ruby \
-				RUBY_FAKEGEM_GEMSPEC="${T}/bcrypt-ruby.gemspec" \
-				ruby_fakegem_install_gemspec
-}
diff --git a/dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.15.ebuild b/dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.15.ebuild
deleted file mode 100644
index ef3162f1c053..000000000000
--- a/dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.15.ebuild
+++ /dev/null
@@ -1,59 +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_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"
-
-RUBY_FAKEGEM_NAME="bcrypt"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="An easy way to keep your users' passwords secure"
-HOMEPAGE="https://github.com/codahale/bcrypt-ruby"
-LICENSE="MIT"
-
-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=""
-
-all_ruby_prepare() {
-	rm Gemfile || die
-	sed -i -e '/git ls-files/d' bcrypt.gemspec || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/mri extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake -Cext/mri V=1
-	cp ext/mri/*$(get_modname) lib/ || die
-}
-
-each_ruby_install() {
-		each_fakegem_install
-
-		# bcrypt was called bcrypt-ruby before, so add a spec file that
-		# simply loads bcrypt to make sure that old projects load correctly
-		# we don't even need to create a file to load this: the `require
-		# bcrypt` was already part of bcrypt-ruby requirements.
-		cat - <<EOF > "${T}/bcrypt-ruby.gemspec"
-Gem::Specification.new do |s|
-	s.name = "bcrypt-ruby"
-	s.version = "${RUBY_FAKEGEM_VERSION}"
-	s.summary = "Fake gem to load bcrypt"
-	s.homepage = "${HOMEPAGE}"
-	s.specification_version = 3
-	s.add_runtime_dependency("${RUBY_FAKEGEM_NAME}", ["= ${RUBY_FAKEGEM_VERSION}"])
-end
-EOF
-		RUBY_FAKEGEM_NAME=bcrypt-ruby \
-				RUBY_FAKEGEM_GEMSPEC="${T}/bcrypt-ruby.gemspec" \
-				ruby_fakegem_install_gemspec
-}
diff --git a/dev-ruby/cri/Manifest b/dev-ruby/cri/Manifest
index c958a3615d8b..eb1b5683a6ca 100644
--- a/dev-ruby/cri/Manifest
+++ b/dev-ruby/cri/Manifest
@@ -1,5 +1,4 @@
-DIST cri-2.15.10.gem 35328 BLAKE2B fe5618f86300381232f071e552020da6186e1908ded3703e645fc6067080a215cfff8d4f468f522ff801d6608cc7560379db2b18eaefb5509ed0db1eacb9342d SHA512 577ee6ba07f08d46e67420fb2e579647857207a2d88f1782545b28e6f26cd6b93d554c904e00af38d7f87eb0fd476c66552ec6b1469fa268faad1ff5d1ab8f15
 DIST cri-2.15.11.gem 35328 BLAKE2B 774ebbd74ccd8f328d15a65515ed6c350d6bd00c9b757912c37a01aa71b745a3443755b8b59e7a8e6ac07c67f21d69dc4f96f972850e011d7b72d639c471d636 SHA512 a16d35a5e83401dda4e50bbb8a52b8a192e2876a708c516445559599f1e7c007d2f943efc662f43226bfd177356272dc7802fc01c8fdca543d4146bc537cae82
-EBUILD cri-2.15.10.ebuild 714 BLAKE2B 20e3ef38ecd9e55d315a14e2b172865aa4bed0416643fbccff969903960e47f7753041183406bf1433cb020ba1f0dbda875d28aae49902a48b1fab200cb5f3ab SHA512 afdf3dde73d1daac144e75c6c7caf46646c91373bdc72e618e64bff1fd0e1408b580722b86b0b3b769af45e9f29fdade4dce43119cad42eee44797ca945d1dde
+EBUILD cri-2.15.11-r1.ebuild 714 BLAKE2B 5fd9f80748cf653470c184ba2bbee1b0b79effc5fc93e5ce390ef3fda1d0bb511fd0e5520bcc442371f9cc4599ffb5f877f658c779012c4d9f908fe0a77693a6 SHA512 2bec8ddb38ecb2d131545852e2c6fdd6de8396ce3c8d37be8248d749b2160322930e02d628542ce85845cbaf0357831bc9ad8624d957811974f2b63160aaa3d2
 EBUILD cri-2.15.11.ebuild 714 BLAKE2B cc18a0a0440238968c8ea414e71b0d6e06d7a734f392a7ab0d299d2b90c0b04bacfc927ca32099708994b8c410de9c71d4920b13d95fe35d738b6f55f87229ca SHA512 f75af6fac2b947f8f17e5850877121a8c709fe7c784545c33129a54eaee5dc3df36250d11d802f3f809b911850e9fdb22b0f862bbc8bd6eeadfc78b9d20e32cb
 MISC metadata.xml 322 BLAKE2B 0d6279e8f60e12f7ffc1e1b87523423fb175e7104e41ad4911f4513f530f9275670d2988401b2040d0e0ba4abe9dc9f3721d77d1f57865cdaf40efcaee1ee0e1 SHA512 d108f8a03dea998704eda69a3e06bc5e062774b2cb2f0c01c53e88085b144ce05724b922abe829b9cec921d056aa90483d3ab052688a3ced13f17ebb3a9d689b
diff --git a/dev-ruby/cri/cri-2.15.10.ebuild b/dev-ruby/cri/cri-2.15.11-r1.ebuild
index 8790711293b1..b1a8c99b4b68 100644
--- a/dev-ruby/cri/cri-2.15.10.ebuild
+++ b/dev-ruby/cri/cri-2.15.11-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
 
diff --git a/dev-ruby/curb/Manifest b/dev-ruby/curb/Manifest
index 0468362babc4..7a419f01d1e3 100644
--- a/dev-ruby/curb/Manifest
+++ b/dev-ruby/curb/Manifest
@@ -1,4 +1,3 @@
 DIST curb-0.9.11.gem 88576 BLAKE2B 1656a17070151ddd1bd63c3e23885d36d8e2b133b19e00347892363a9a20c88baa10932ceb5273733b18847d8d19dc403aa4b7f36fbd80c8dde126ae46743796 SHA512 000ee2054a5866de09042dfc5894330900e401aa94a0fe8bb133fe9c661f7899992adff0585e5ed3725d3564cd9819d76653655f3539faaa61ca6acabe3a8602
 EBUILD curb-0.9.11-r1.ebuild 1391 BLAKE2B 462de9fb6407457864bd56b2a0de59bb4723da435455b1371b2df8acd349e4a6424909897521e0a0dd7fd75520af11346bfc3193cd572247d64beca032a7ed2b SHA512 59706c93edaada27f54a15cc8ec7735b28d05a7d2736dbf0b00bf15b5502850466fb45b0278c735655493b5128e0813bc80b0cea2253541434b8611733deb222
-EBUILD curb-0.9.11.ebuild 1351 BLAKE2B 482f6136e62728fd90f1b312fbd4fa59c2c005aa0380480700b77574020a6c92197843f56ad915d557a1666aadababd4723c620d5909b80d285fc0eb7533d4bf SHA512 065dcc8ceaab26c8227a47cf63cd0a4d630c2e69fe2e1f0eaa7a6f708fb38bb30a68c265b130225b3a8511d30c22d00db85747cff4901794c1ee633ec2778063
 MISC metadata.xml 336 BLAKE2B fd9820c5561af2381bf081eb2f3370727020edc79f306bd94b90699e8a817d218edb11ccc60ae9aa43f1713218a91c9b53cff0a6c23fc3d189e06bc5a1265b71 SHA512 f948d0e7f36c4b9912c58d6a7bf1b2ac5934075780fc7de3d6f759276e4ee297850f725259c06245affca40745bdc2bab0ab78bbd60b308a5d11fc97edeb4ac1
diff --git a/dev-ruby/curb/curb-0.9.11.ebuild b/dev-ruby/curb/curb-0.9.11.ebuild
deleted file mode 100644
index 07ac269e3ecf..000000000000
--- a/dev-ruby/curb/curb-0.9.11.ebuild
+++ /dev/null
@@ -1,49 +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_RECIPE_TEST="rake"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby-language bindings for libcurl"
-HOMEPAGE="https://github.com/taf2/curb"
-
-LICENSE="Ruby"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE=""
-
-DEPEND+=" net-misc/curl[ssl]"
-RDEPEND+=" net-misc/curl[ssl]"
-
-all_ruby_prepare() {
-	# fix tests when localhost is also ::1
-	sed -i -e 's|localhost:|127.0.0.1:|g' tests/*.rb || die
-
-	# avoid tests making outside network connections
-	rm tests/bug_postfields_crash.rb || die
-	sed -e '/test_easy_http_verbs_must_respond_to_str/,/^  end/ s:^:#:' \
-		-i tests/tc_curl_easy.rb || die
-	sed -e '/test_connection_keepalive/aomit "network connection needed"' \
-		-i tests/tc_curl_multi.rb || die
-
-	# Fix test that expects wrong output
-	sed -i -e 's/200 OK /200 OK/' tests/tc_curl_easy.rb || die
-
-	# avoid failing tests where failure condition seems weird, no
-	# upstream travis so not clear if the test is indeed broken.
-	sed -i -e '/test_multi_easy_http/,/^  end/ s:^:#:' tests/tc_curl_multi.rb || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext extconf.rb || die "extconf.rb failed"
-}
-
-each_ruby_compile() {
-	emake -Cext CFLAGS="${CFLAGS} -fPIC" archflags="${LDFLAGS}" V=1
-	cp -l ext/curb_core$(get_modname) lib || die
-}
diff --git a/dev-ruby/debug_inspector/Manifest b/dev-ruby/debug_inspector/Manifest
index 09c3de1f9860..5c12efdc08a4 100644
--- a/dev-ruby/debug_inspector/Manifest
+++ b/dev-ruby/debug_inspector/Manifest
@@ -1,5 +1,3 @@
-DIST debug_inspector-0.0.3.gem 8192 BLAKE2B c7605f246519b245d0b997e10cfc1271c6cd5a31dc44097546d51265eb6ce1d88686b1dc922addce0a58b6bccae4fa5a40611942b6babbf8dfc6b4c528949422 SHA512 38cbe0ddf2eb4285f4f7d6f12428747495230425352e1850a4395a5c27ad4c2f706eeeac1f684baea488f6e3bd4b65c8c9e0d5807d5af93d3350fa7b9d45da43
 DIST debug_inspector-1.1.0.tar.gz 5837 BLAKE2B 49f2c4b8b872ad2be0e6c41d02f7cb64e3f2928e8f02e06ed99f2f2befffe1da4c25024a2069b8d2f19dc71ab182459f6cf75c5b717662e5cfab16a5b66cf41f SHA512 c66d5bf412d9b6a61f456e943a901dbe9018cf92c171e1a7d9a19807c7894ffdb6acaeaed2c8f688927130a14909d0e0714e5b728ad7ccbff0e5f1c0ad20c600
-EBUILD debug_inspector-0.0.3.ebuild 579 BLAKE2B 9ecee12113838eaf79c27a747b5d22eefb91f849b3c85424e193d1bd52f893501e56150aec7382845214973384d5cede9d0dceda5ec0d8e9918f819502a77f86 SHA512 27d2b822f33a5463c7a67f5beff97ed9a5648a361d7d6018efa10e8577c83d62ab41476a8e591130b137b22e1792e017db717de0f3720a2b2c753bf44de77714
 EBUILD debug_inspector-1.1.0.ebuild 679 BLAKE2B 479d3c2065ddae3eef6489d3cbbc5309edaddc52d736efd04498850097969c32b3bd1e12be4a4b611f21c1b1fe73ed590ee84b1cba5b30cf58b85f0d2c3718e0 SHA512 38ea7d6a4117c18fe2f1d5b30aa4068ba35b58d08220f54ffe85029a5e6b46c00cfd037784e215eb56272c75102e4a9728ccc9596cbaf11b818349f60d8ac4b9
 MISC metadata.xml 351 BLAKE2B f257a2ee28e3b834d9bde72e9f4024f9f93a3fe043a95a376ca15199fa7edb38cdedf1856438243a05337d3ff8513a88dcf886896c776b3807d1cf4437ac8668 SHA512 c9d8cacc1c0df621f009d74dcc9bdc34df08becfe8675b9931a12e492c91d758409c7803adb3f33bad81bd1c496b54f3b1c3d10ad2e8509c68b62f08dca85730
diff --git a/dev-ruby/debug_inspector/debug_inspector-0.0.3.ebuild b/dev-ruby/debug_inspector/debug_inspector-0.0.3.ebuild
deleted file mode 100644
index e1896bc0b451..000000000000
--- a/dev-ruby/debug_inspector/debug_inspector-0.0.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Ruby wrapper for the MRI 2.0 debug_inspector API"
-HOMEPAGE="https://github.com/banister/debug_inspector"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-each_ruby_configure() {
-	${RUBY} -Cext/${PN} extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake V=1 -Cext/${PN}
-	cp ext/${PN}/${PN}.so lib/ || die
-}
diff --git a/dev-ruby/duktape-rb/Manifest b/dev-ruby/duktape-rb/Manifest
index 0fe4232d9d2a..6f86f28cb586 100644
--- a/dev-ruby/duktape-rb/Manifest
+++ b/dev-ruby/duktape-rb/Manifest
@@ -2,4 +2,5 @@ AUX duktape-rb-2.3.0.0_duktape-2.5.0-tests.patch 677 BLAKE2B 74224d6c929cafc5d61
 AUX duktape-rb-2.3.0.0_use-system-duktape.patch 1860 BLAKE2B 479457cc1782a43ea217ac65dc20f41bfd8ca75dcdf7b77403b144514b590989a98eba01b3f0687e49b81cbb9a096bebb7e0034a0c09dcae36def12d10ea8e13 SHA512 567b9d3b41a413703e64e9167c683a5fb60af13a97426aa03ffe4a38ca6f810fad54ee29269157698c70c762329b3e889b7bed72420700764a478c9047abd4ef
 DIST duktape-rb-2.3.0.0.tar.gz 1356464 BLAKE2B be7362ddbe6860bcb12c8f8909f66ae525585e628f7be2317b07eb07960f8f25e503dbc89e713e57144cc8108751ac856aa73a16cbd58502e928acf9e116247c SHA512 af4fd45387c3f40cd24bf3c879ef4e0d7efd43ca24f0cb866bf869db7fa9f4add9b60122c0dcfbce5491cdd7479b1414637fa1054078216b9f57fa426feb0154
 EBUILD duktape-rb-2.3.0.0-r2.ebuild 1095 BLAKE2B 5b1f3e0ac10999e185e97508eea4b9220eccf995e99cb050c95755ebb55e0eb6aad69c17994b60a49baaf44328a4d1a606ab2887bd59c29d28800182a9262362 SHA512 1f106bcb064e45b335e6427b41ef48567f51dfe4864710a8071db283d010aef57d71b4ab8d1083340e8b6c335c9f645c7dd189f9ad1026124fd2fb55969f75ca
+EBUILD duktape-rb-2.3.0.0-r3.ebuild 1059 BLAKE2B fb35bcf0915c6cbea459e3da65ec430292ba1d7c8cb466b729a536eadf727d850b0fda9a66a086f70f0c988a1aa50fdd7ba2195a8cae9aae2411902ba3e26d20 SHA512 0611fb116f25658843db60c1b0ec614c4436cceb59671b82729bade29150254cdf791f6e59b51879604e727ce95e60a86d57ea31e9f35db653b530ed7ac7218a
 MISC metadata.xml 457 BLAKE2B cf319046702b756e4954de3daf9a13a63b4adc579946b62aa629c1b428c4c395709fe9115e4d35a86b063bfe7f4554ef64604f6759bc9d502450441ba2b6e941 SHA512 f26251141d978bc7d369e18d69382c4a15f9985738c85c9c524e7a84a719f6a6e9e2e6113ddadc4fd580573fb2c380b31920ac44d08003458756015295f57a05
diff --git a/dev-ruby/duktape-rb/duktape-rb-2.3.0.0-r3.ebuild b/dev-ruby/duktape-rb/duktape-rb-2.3.0.0-r3.ebuild
new file mode 100644
index 000000000000..e3a343028a31
--- /dev/null
+++ b/dev-ruby/duktape-rb/duktape-rb-2.3.0.0-r3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby26 ruby27"
+
+RUBY_FAKEGEM_GEMSPEC="duktape.gemspec"
+RUBY_FAKEGEM_NAME="duktape"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/duktape/extconf.rb)
+
+inherit ruby-fakegem
+
+MY_PN=${PN/-/\.}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Ruby bindings to the Duktape JavaScript interpeter"
+HOMEPAGE="https://github.com/judofyr/duktape.rb"
+SRC_URI="https://github.com/judofyr/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~riscv"
+
+COMMON_DEPEND="dev-lang/duktape:="
+DEPEND+="${COMMON_DEPEND}"
+RDEPEND+="${COMMON_DEPEND}"
+
+ruby_add_bdepend "
+	dev-ruby/pkg-config
+	dev-ruby/rake-compiler
+	dev-ruby/sdoc
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.3.0.0_duktape-2.5.0-tests.patch
+	"${FILESDIR}"/${PN}-2.3.0.0_use-system-duktape.patch
+)
+
+RUBY_S=${MY_P}
+
+all_ruby_prepare() {
+	rm ext/duktape/duktape.{c,h} ext/duktape/duk_config.h || die "Failed to remove bundled duktape"
+}
+
+each_ruby_test() {
+	${RUBY} test/test_duktape.rb || die
+}
diff --git a/dev-ruby/facter/Manifest b/dev-ruby/facter/Manifest
index a37012d704c6..5a4cde1f46bd 100644
--- a/dev-ruby/facter/Manifest
+++ b/dev-ruby/facter/Manifest
@@ -2,6 +2,8 @@ AUX facter-3.14.6-fix-static-libcpp-hocon.patch 488 BLAKE2B 73f28cf30f5dca16f2ea
 AUX facter-3.14.8-explicit-rspec-2.patch 578 BLAKE2B 7bd6134235c61e03b2706388ad0c2c21e67582b00c5588b1d0596e3f783eb1df448a92c031862b03c0dffeefa10e0b69fdda4b44d88ac6e09a66f325900cf96f SHA512 a4c219b78b25c2a12e8578c092284fb4bd6d07b8b0d819d5625b1043d2b395413609e21266d3a7bceaf0461ad059e0edfea14a5e48bab85995eadf2d77bff17d
 DIST facter-3.14.19.tar.gz 409345 BLAKE2B f977bb36ec8042ac950babd19ed398b8bd4fece854304a8a7a5f6b7608c3ad6ba4999b9038e401d599883da5bad63304b502fef164d1988d68a8477f1ff302a1 SHA512 65efc0237edc8198165e8229ca5d64e165a36e58718a863e14df9de9b64d4c9fb911d084e23daa982473f0703077b2cb0a5de8c544161591a894d537312c30f0
 DIST facter-3.14.20.tar.gz 410552 BLAKE2B 8ff8422e9066ab6fabe00e22dedb4c2970e126eb06e307df52ab2b4f989f18a8f6b405fff405702720b6d25503b663791f5d0ec94b07d32759387bebbdc302e6 SHA512 14073dbd628e0c211fc95b5dab2a65bd549429a933c9f745cfa62c6bec7a810f444626c165117efc05ad67b3aef2dae5398112911059826f1b5d2bee9b27eedd
+DIST facter-3.14.21.tar.gz 410594 BLAKE2B 30b502debaec476d7ba03a73ad3a251aeabf3347c2c552204e825dea8d85807d50cd6d06de03be32a5977e5e8cefe4869e2cc453b1ea79b9045c80369df6a0d7 SHA512 69618e54d2c46ae1230fa99ead88413ca8d5be6a01c149fcc00a7485767b9e624283fdf6064679e825a1ecb426be59a86e7ef903cd0ffca58383006ba5e9cf7f
 EBUILD facter-3.14.19.ebuild 2102 BLAKE2B afba1a731812d9927d40d1ef098217ded54abcdefe0bac9488344d0786609ba4aefa28212dc299348995496a9fe09cffcbe2b2cb35985c1a186b2acf04965768 SHA512 a08dd0c33f5b89adb6f6b55b455e0297a69baffbb3cf5e54c8b758abc6bbc2765fad1f46a4cee1937f12ff25b6099eb0c61e2f5521bdbbd8c5df3bcb8cf1b680
 EBUILD facter-3.14.20.ebuild 2104 BLAKE2B 4b154757d004888f958fbb7d6d916fb44c540b2b46322134b8b5d4e2a1aa14939e85f76d7c7ebc8c594a16f6842de998b9135c1c69ecdd51a702ff097a09cac9 SHA512 1f345cf8e7fadcd7f95266084c0a5cf8e8d3b1e2b895127a6de610b6c63fc1d7ebda5f3093948851e7dd0718ac52e5ddd71f1fa9911cf3a269b43341ce3656b7
+EBUILD facter-3.14.21.ebuild 2104 BLAKE2B 4b154757d004888f958fbb7d6d916fb44c540b2b46322134b8b5d4e2a1aa14939e85f76d7c7ebc8c594a16f6842de998b9135c1c69ecdd51a702ff097a09cac9 SHA512 1f345cf8e7fadcd7f95266084c0a5cf8e8d3b1e2b895127a6de610b6c63fc1d7ebda5f3093948851e7dd0718ac52e5ddd71f1fa9911cf3a269b43341ce3656b7
 MISC metadata.xml 540 BLAKE2B 584d6db1a27bfa9383048929df3d6da07040cf507acc2aa58de7a4e9ba665079cac60b48b398bbb0510914acc03be1fd3468e5678e690f8d6fd03060e659dd4a SHA512 c1311ca348655bf9566889ec9edcd012a2d003f0b1122749caa9066cea2005d3fed7b7a0d1bca75281396e8e43cb6a2f611550572523dc011113424d642c2a2f
diff --git a/dev-ruby/facter/facter-3.14.21.ebuild b/dev-ruby/facter/facter-3.14.21.ebuild
new file mode 100644
index 000000000000..249ddd7569a6
--- /dev/null
+++ b/dev-ruby/facter/facter-3.14.21.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+
+# git-r3 goes after ruby-ng so that it overrides src_unpack properly
+inherit cmake eutils ruby-ng
+
+DESCRIPTION="A cross-platform ruby library for retrieving facts from operating systems"
+HOMEPAGE="http://www.puppetlabs.com/puppet/related-projects/facter/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/puppetlabs/facter.git"
+	EGIT_BRANCH="master"
+else
+	[[ "${PV}" = *_rc* ]] || \
+	KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+RESTRICT="!test? ( test )"
+
+ruby_add_bdepend "test? ( dev-ruby/rake dev-ruby/rspec:2 dev-ruby/mocha:0.14 )"
+
+RDEPEND="
+	>=dev-cpp/cpp-hocon-0.2.1:=
+	>=dev-libs/leatherman-1.0.0:=
+	dev-libs/openssl:0=
+	sys-apps/util-linux
+	app-emulation/virt-what
+	net-misc/curl
+	dev-libs/boost:=[nls]
+	>=dev-cpp/yaml-cpp-0.5.1
+	!<app-admin/puppet-4.0.0"
+DEPEND="${RDEPEND}"
+
+# restore ${S} and override all phases exported by ruby-ng.eclass
+S="${WORKDIR}/${P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.14.6-fix-static-libcpp-hocon.patch
+	# be explicit about the version of rspec we test with
+	"${FILESDIR}"/${PN}-3.14.8-explicit-rspec-2.patch
+)
+
+pkg_setup() {
+	ruby-ng_pkg_setup
+}
+
+src_unpack() {
+	default
+
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+	fi
+}
+
+src_prepare() {
+	cmake_src_prepare
+}
+
+each_ruby_configure() {
+	# hack for correct calculation of relative path from facter.rb to
+	# libfacter.so
+	my_ruby_sitelibdir=$(ruby_rbconfig_value 'sitelibdir')
+}
+
+src_configure() {
+	ruby-ng_src_configure
+
+	local mycmakeargs=(
+		-DRUBY_LIB_INSTALL=${my_ruby_sitelibdir}
+		-DBLKID_LIBRARYDIR="${EPREFIX}/$(get_libdir)"
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	addpredict /proc/self/oom_score_adj
+	cmake_src_compile
+}
+
+src_test() {
+	cmake_src_test
+}
+
+each_ruby_install() {
+	doruby "${BUILD_DIR}"/lib/facter.rb
+}
+
+src_install() {
+	cmake_src_install
+	ruby-ng_src_install
+}
diff --git a/dev-ruby/fast_xs/Manifest b/dev-ruby/fast_xs/Manifest
index 93a22307ebe0..ea07ad0d29ac 100644
--- a/dev-ruby/fast_xs/Manifest
+++ b/dev-ruby/fast_xs/Manifest
@@ -1,5 +1,4 @@
 AUX fast_xs-0.8.0+ruby-1.9.patch 1090 BLAKE2B b5b0b2db3e19adc57e85141b893cdfbed8844def9ad39cd7ba5ade46a5ae73201498782c0093e25e075bd6c2577a895715ba82a87cc14327492410558442d194 SHA512 0c4f4b03db6ed70381b9aa7e671038206648a2c88211bb7d015f552e2114015a7cb749678670ee876aa568505ac3df42535f839367cfd1fc52ba6674429940a5
 DIST fast_xs-0.8.0.gem 22016 BLAKE2B b24e65c31623e86ac8ab8b5a442565083bd047e5740aeae74d74e82c09770a8149853ad021ea6c6c036d411e8f299f4a531d78b0b3314ed5bf32d7f8b9fcf697 SHA512 55fc2704fab020f03b1ce138d1631dd5ad73a8601dcd95989a59c7cccb490c70b4e1af59fb8b009bfa0899f2c23feb42cc3068e243cd539ba1cb01a9f7bc573b
-EBUILD fast_xs-0.8.0-r2.ebuild 1310 BLAKE2B d0721f5167efc4dae52de306286e0995c0d7bf91c4bfe5ec208519f780a8a5e769e3e52594a7240e94c3a5b0d46fff7095b2f6f11cd817dc59a719d87e0bc24f SHA512 af29ea28cef2a70fa3dc6f57e0fa71b01d9d207b53be25af6b2507bb12df772f52a3f8635d605da5b37b0e6dc93f4a8febed67a106fdd3bfcb0fcf81f0961287
-EBUILD fast_xs-0.8.0-r3.ebuild 929 BLAKE2B 47e5aceb99870b6b8815f64825760d1c5834058a6662c4c297d09a85480c057551f17a9830ab4a0d59fb0419129a76df608270909aa28f4bc817b27d6d88dbf9 SHA512 be4202e6e8a9333eba9449c690b5d88c03eb9273d3dc4846ca4a18c6fdd02b1cb268f9c0a334a02227a4c4048a18930b86da258a656483e35fff3a35f12a42cb
+EBUILD fast_xs-0.8.0-r3.ebuild 923 BLAKE2B 1fde58f0414d238d08e035177ad181f655e53c3347252a86cbb38bff4384496e6112d6332685730d2049602984a5a5a4eb9b1a68b92e696ab33a67aa72fa467b SHA512 013566c9748777cc9ec7c7079019454b9643100d69c8b54630c6680612757a6e9d21dc0a82ac40bab267ec16db99c168a81362124ebb7f7b33fb6e147de274d6
 MISC metadata.xml 345 BLAKE2B 5772ec610b6ea7386ea3477b76ae02012ec9aec20e3e1852dc722c0c50b4a742608e7f66124946062d81dee52215296ca5db5db0be4424e1ce73c1c484a6b164 SHA512 0c86c791ef516fa584933b3ab575f5877907ddbec59cfa96b07bcf73e7e3bfd538f6fac31dd482fca16ca29438d0c15c4e04336dc5440710115a9a94b6aa955d
diff --git a/dev-ruby/fast_xs/fast_xs-0.8.0-r2.ebuild b/dev-ruby/fast_xs/fast_xs-0.8.0-r2.ebuild
deleted file mode 100644
index 420d4b66e12f..000000000000
--- a/dev-ruby/fast_xs/fast_xs-0.8.0-r2.ebuild
+++ /dev/null
@@ -1,46 +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_DOCDIR="doc"
-
-RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="fast_xs text escaping library ruby bindings"
-HOMEPAGE="https://github.com/brianmario/fast_xs"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/rack )"
-
-RUBY_PATCHES=( "${P}+ruby-1.9.patch" )
-
-each_ruby_configure() {
-	${RUBY} -Cext/fast_xs extconf.rb || die "extconf.rb failed"
-	${RUBY} -Cext/fast_xs_extra extconf.rb || die "extconf.rb failed"
-}
-
-each_ruby_compile() {
-	emake -Cext/fast_xs CFLAGS="${CFLAGS} -fPIC" archflag="${LDFLAGS}" V=1
-	cp ext/fast_xs/fast_xs$(get_modname) lib/ || die
-	emake -Cext/fast_xs_extra CFLAGS="${CFLAGS} -fPIC" archflag="${LDFLAGS}" V=1
-	cp ext/fast_xs_extra/fast_xs_extra$(get_modname) lib/ || die
-}
-
-each_ruby_test() {
-	# the Rakefile tries to run all the tests in a single process, but
-	# this breaks the monkey-patchers, we're forced to run them one by
-	# one.
-	for tu in test/test_*.rb; do
-		${RUBY} -Ilib $tu || die "test $tu failed"
-	done
-}
diff --git a/dev-ruby/fast_xs/fast_xs-0.8.0-r3.ebuild b/dev-ruby/fast_xs/fast_xs-0.8.0-r3.ebuild
index 1d561300495a..0d575286aec5 100644
--- a/dev-ruby/fast_xs/fast_xs-0.8.0-r3.ebuild
+++ b/dev-ruby/fast_xs/fast_xs-0.8.0-r3.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/brianmario/fast_xs"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "test? ( dev-ruby/rack )"
diff --git a/dev-ruby/ferret/Manifest b/dev-ruby/ferret/Manifest
index 8f69f8fcb9a4..993b860aae69 100644
--- a/dev-ruby/ferret/Manifest
+++ b/dev-ruby/ferret/Manifest
@@ -1,3 +1,4 @@
 DIST ferret-0.11.8.7.gem 608768 BLAKE2B cc5e6769dcad4c465ae00aed972712e03ccbea304608eef5008941d5bf1eca17461f611aea7f0033d4047b7bc2474c0a93ffece40b4a6aca753a496ee34f36fa SHA512 ac7cafa25ade9741e0eb95d7372f6dd7ce4ea82368c69ace536b852fd5cc435d05764041ba1bddcc6098665c6e1aa7a12ac9739e45362007f726f3e7a8124df1
+EBUILD ferret-0.11.8.7-r1.ebuild 1054 BLAKE2B 4cdb4e148007cd2e79054da539a1c83a1d09cdaeac0e1be054cceb82447ec6bd35979d530ae61ba4e7a800f690acdba405cd06beece3816e455a1250d95754b2 SHA512 14518698b53c1ef2f20f0b60aa15cd3c139dfc3511a74dffe0a395ca90e45bfa5a8286e07c6dc52fb78212aafef703b343b17f9df2bc05f3d0e4498ff33b01f5
 EBUILD ferret-0.11.8.7.ebuild 1229 BLAKE2B e75b785b0209f3525799b8f523bcfbe52aef8850e6b8ef377dc25653996eeb17e61e90fc04f2beb696fa8c4f3ee4597a7f6a1b5316f77234a9a999839b19de7c SHA512 962d2c3a2ed601a3c2976e7b17b2eca5a4963d5ba29c8be28bc64995a41c62d74b19536cb872f70e77bea5845a1a518126d6015e74983b0f887d98b3cbb688e2
 MISC metadata.xml 342 BLAKE2B 19a0f25a5d447988ef8a20d40ba2040090f128d0c1a822b18ce672f53ee348432edcd47993ada1c049f880527ce36e17b024eb0a9cc93dda900666403eadbcd3 SHA512 21f0178397f49eb2e305852d024191084b835a849783ec42ab4fc8fdce31d5bd8216b761ad0350a726d1f8313d2c530c909be0ae90ab91826ee71f9fd8843fb3
diff --git a/dev-ruby/ferret/ferret-0.11.8.7-r1.ebuild b/dev-ruby/ferret/ferret-0.11.8.7-r1.ebuild
new file mode 100644
index 000000000000..45a3f16cd148
--- /dev/null
+++ b/dev-ruby/ferret/ferret-0.11.8.7-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ruby30 does not compile
+USE_RUBY="ruby26 ruby27"
+
+RUBY_FAKEGEM_NAME="ferret"
+
+RUBY_FAKEGEM_TASK_DOC="doc"
+RUBY_FAKEGEM_DOCDIR="doc/api"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG RELEASE_CHANGES RELEASE_NOTES README.md TODO TUTORIAL.md"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/extconf.rb)
+
+inherit ruby-fakegem
+
+MY_P="${P/ruby-/}"
+DESCRIPTION="A ruby indexing/searching library"
+HOMEPAGE="https://github.com/jkraemer/ferret"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND+=" app-arch/bzip2"
+DEPEND+=" app-arch/bzip2"
+
+all_ruby_prepare() {
+	# Remove bundled bzlib code and use system version instead.
+	rm ext/BZLIB* ext/bzlib* || die
+	sed -i -e '14i  $LDFLAGS += " -lbz2 "' ext/extconf.rb || die
+
+	# Avoid test known to fail upstream:
+	# https://github.com/jkraemer/ferret/issues/2
+	sed -i -e '/test_adding_long_url/,/^  end/ s:^:#:' \
+		test/unit/index/tc_index_writer.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib test/test_all.rb || die
+}
diff --git a/dev-ruby/google-protobuf/Manifest b/dev-ruby/google-protobuf/Manifest
index 9d62d9df3870..66e613f2daac 100644
--- a/dev-ruby/google-protobuf/Manifest
+++ b/dev-ruby/google-protobuf/Manifest
@@ -1,7 +1,3 @@
-DIST google-protobuf-3.12.4-ruby.tar.gz 5310348 BLAKE2B 2630941672963165467221843c10079a0ed966f2fdfcbc970b0b41e1ed3c7f78734496c1fbd3ec509c68999a14f637fff267b309cf82a8acf2bb5a948484f79b SHA512 c5d24502b9a6be0a606a19213186fe462e0de6830547003636f0897781f36d0bd7e4e7d9689d96390a0399ce04b6438cda3a0fe6f97f0feb700a110e90beef0c
-DIST google-protobuf-3.13.0-ruby.tar.gz 5277913 BLAKE2B 168aaa5beef83be675cd2543ca8efeaf5174f5e7fd861a056b04b01c8c781dc7b1fcbd05068ae89f051dfacfdc47c34b19cc33c8d09dd3212d3827746e3408f2 SHA512 514efa65fc8a36bc0791e6d39bdfb07b2689e9c2a4b82536c657859b800e7bc1e1a0ae86a7ee33f30c43a473a49b5c346ce830ac0057b6da104ed37f90b8b0fd
 DIST google-protobuf-3.14.0-ruby.tar.gz 5319779 BLAKE2B cea083eea4d7fec441536effdfe2bf1811913154b0cc0da2f14f4edeb0efb200236da102c36700e24fab73fd9883aa90576ad64603a7f175ebf5cef0dc29aae5 SHA512 9dabba81119cb6196ef5de382a1032c57f6e69038f4dce0156f8671b98e51bb5095915fb6d05bb5a8ad8b17b559e652e1e9a392dd30c7ed8dcf1d986c137be11
-EBUILD google-protobuf-3.12.4.ebuild 957 BLAKE2B a23e4806a8ac69f5ae65143214e23632b215b80de65d24ab6c52cb8f54b66aefb0b80acc2274047caccdc14429dd89fe98a17a7bf236fa616448ebaadf33bd49 SHA512 02dcee02c57e781f673e02706e3dfb269ad75a04619082b7759002c18ca10ff54b24282c5ada699eee09706aedb82d0676b825069cb996ecbe155e5d417b36d7
-EBUILD google-protobuf-3.13.0.ebuild 964 BLAKE2B 00217e4f50fe1246dc87d4256d283a00d5ae2c2c261cd82dd4b6a8e7d4eb6eb0b20693f12253139fac62d14bb91dd1af93a74bdd4a692ef7c8f96c12ebcbc44e SHA512 f883eaba02e0cbee13958c3f43d5f780058cadfc2142e9fc2ab93a5cd494ba854d233fd7cd94eddb229c4517aad44dab646ab4120a7ef19e5fe78eeaccf0dfc3
 EBUILD google-protobuf-3.14.0.ebuild 875 BLAKE2B 0ba58cf1ef620cc261b81418d8106f1bd7474940fec7c7b453ca28e7f094d7a3ab8240fc78565fa349de9c284f1729a55ad924385a01451ffd7f59d07aea168a SHA512 3aff790656a45462744057116394d1a189fa3ef48ac4a207888999264655aa3ad71602e5bf91e1777c8e755154a77077294e9e5e7ad537bdb2c7bd561fcc7b0d
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
diff --git a/dev-ruby/google-protobuf/google-protobuf-3.12.4.ebuild b/dev-ruby/google-protobuf/google-protobuf-3.12.4.ebuild
deleted file mode 100644
index 3787f73873a7..000000000000
--- a/dev-ruby/google-protobuf/google-protobuf-3.12.4.ebuild
+++ /dev/null
@@ -1,40 +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_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Protocol Buffers are Google's data interchange format"
-HOMEPAGE="https://developers.google.com/protocol-buffers"
-SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> ${P}-ruby.tar.gz"
-RUBY_S="protobuf-${PV}/ruby"
-
-LICENSE="BSD"
-SLOT="3"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND+=" test? ( >=dev-libs/protobuf-3.12.0 )"
-
-all_ruby_prepare() {
-	sed -e '/extensiontask/ s:^:#:' \
-		-e '/ExtensionTask/,/^  end/ s:^:#:' \
-		-e 's:../src/protoc:protoc:' \
-		-e 's/:compile,//' \
-		-i Rakefile || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/google/protobuf_c extconf.rb
-}
-
-each_ruby_compile() {
-	emake -Cext/google/protobuf_c V=1
-	cp ext/google/protobuf_c/protobuf_c.so lib/google/ || die
-}
diff --git a/dev-ruby/google-protobuf/google-protobuf-3.13.0.ebuild b/dev-ruby/google-protobuf/google-protobuf-3.13.0.ebuild
deleted file mode 100644
index c61f42fc155a..000000000000
--- a/dev-ruby/google-protobuf/google-protobuf-3.13.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 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Protocol Buffers are Google's data interchange format"
-HOMEPAGE="https://developers.google.com/protocol-buffers"
-SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> ${P}-ruby.tar.gz"
-RUBY_S="protobuf-${PV}/ruby"
-
-LICENSE="BSD"
-SLOT="3"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND+=" test? ( >=dev-libs/protobuf-3.12.0 )"
-
-all_ruby_prepare() {
-	sed -e '/extensiontask/ s:^:#:' \
-		-e '/ExtensionTask/,/^  end/ s:^:#:' \
-		-e 's:../src/protoc:protoc:' \
-		-e 's/:compile,//' \
-		-i Rakefile || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/google/protobuf_c extconf.rb
-}
-
-each_ruby_compile() {
-	emake -Cext/google/protobuf_c V=1
-	cp ext/google/protobuf_c/protobuf_c.so lib/google/ || die
-}
diff --git a/dev-ruby/gpgme/Manifest b/dev-ruby/gpgme/Manifest
index d0f65cbacbe4..b64ebe7829ff 100644
--- a/dev-ruby/gpgme/Manifest
+++ b/dev-ruby/gpgme/Manifest
@@ -1,3 +1,4 @@
 DIST ruby-gpgme-2.0.20.tar.gz 2801991 BLAKE2B f5d4c58fd9ef38e0e843e3c59e9653166666ce3635cf479fcd007581b6c6c42ce7852bd36542b378e4152bd471af0131685c8a9f1024953f41832a54c477e1ac SHA512 3267cc77b57c22de3e505c34dfb0a8a4a76cda1fe6dbe547dfdb9ca1a75cf949ca75b3718fe6b6190c06dfdddf21d76b0d0a71631e53e4f439284ce7cf95f6df
+EBUILD gpgme-2.0.20-r1.ebuild 1355 BLAKE2B f077e9fa29c20c89e779cbbe17d8949f7fb4d3dd938bf40c67743904388ae7ef4d988d870bcefabefbbfec542e8fe9546a9820301adfc387e8d9bf9cb90eb890 SHA512 50f273c34464675e4c6b6cc07bb5019a4299026c8c73cd56aa062fc4037177d0b862c20121d06d982bdd1293a80d1f5b775c8eed3e8eb68db211cd959e16345b
 EBUILD gpgme-2.0.20.ebuild 1481 BLAKE2B 968914935c6fa29820910a8d54c6532bad7e96f992bd770f48f445270451c97fa818869350782c1af07b9e85286c1dcce9ec7b06bfda4e83e026980ef9ecd4ed SHA512 8e0d4a823586417e702424ac809230aaeb15784b9742f117f146955d1d1a83650edceb9ea3ed2227928966aeafc57cb8b716ab6aca1751e15950af6890516ca4
 MISC metadata.xml 468 BLAKE2B 0ede8ab453101f97cdff99ad2f3d7412e21e4799622f242ff8771ea0761591aa26aa66f5788a8a8e00fbd42f8c42618c0d49a92a78eb0e1dc77dcb1a8a9f7c8e SHA512 9ffed8f871ca6952d5a73f4c11c79293db6a9b66dfd38431d377356c340cf1245a1176cf0531e5e3aebaedb6f75249a38015cdfac7dbd65ebf560661b659edcf
diff --git a/dev-ruby/gpgme/gpgme-2.0.20-r1.ebuild b/dev-ruby/gpgme/gpgme-2.0.20-r1.ebuild
new file mode 100644
index 000000000000..a5f8cb60ba63
--- /dev/null
+++ b/dev-ruby/gpgme/gpgme-2.0.20-r1.ebuild
@@ -0,0 +1,51 @@
+# 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_EXTRADOC="NEWS README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/gpgme/extconf.rb)
+
+inherit ruby-fakegem flag-o-matic
+
+DESCRIPTION="Ruby language binding for GnuPG Made Easy"
+HOMEPAGE="https://github.com/ueno/ruby-gpgme"
+SRC_URI="https://github.com/ueno/ruby-gpgme/archive/v${PV}.tar.gz -> ruby-${P}.tar.gz"
+RUBY_S="ruby-${P}"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND+=">=app-crypt/gpgme-1.1.3 test? ( >=app-crypt/gpgme-1.13.0 )"
+RDEPEND+=">=app-crypt/gpgme-1.1.3"
+
+ruby_add_bdepend "test? ( dev-ruby/mocha:0.14 )"
+
+all_ruby_prepare() {
+	sed -i -e '/\(coverall\|bundler\|ruby-debug\|byebug\)/I s:^:#:' \
+		-e '3igem "mocha", "~> 0.14"' \
+		test/test_helper.rb || die
+
+	# Remove failing tests for now. This package was added without
+	# running any tests :-(
+	rm -f test/{ctx,crypto}_test.rb || die
+
+	sed -i -e '/portile/d ; /rubyforge/d' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_configure() {
+	append-flags -fPIC
+	export RUBY_GPGME_USE_SYSTEM_LIBRARIES=1
+	each_fakegem_configure
+}
+
+each_ruby_test() {
+	unset DISPLAY GPG_AGENT_INFO GPG_TTY
+	MT_NO_PLUGINS=true ${RUBY} -Ilib:test:. -e 'Dir["test/*_test.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/hiredis/Manifest b/dev-ruby/hiredis/Manifest
index a127351c48ab..84502e34489e 100644
--- a/dev-ruby/hiredis/Manifest
+++ b/dev-ruby/hiredis/Manifest
@@ -1,5 +1,4 @@
 AUX hiredis-0.6.1-unvendor-hiredis.patch 599 BLAKE2B 941d7f370c1dc85de07334b77e89180285fc57e604ffb904eb03fbb9c810d28c2c2e229f1589b98f58c80f68f3a21fa881ea78805361b67032a3006605428c1f SHA512 34d527c1182bd5bbc17e0a4e08b29bfeb15a55c02d1cfde75e5bb2b1589ee3dec622d87ed00cc3d7db390f4cb0ddc9c60e2344ef28c48b725eb37262cb349c55
 DIST hiredis-rb-0.6.3.tar.gz 19106 BLAKE2B 2892fd28bf7e7edfc3563a0c321fd781baeca9eb31a64dd559a6c828bb9c4fe37c995748782c5222db46b5b35a4d17f5b8b4d8e5306209a0e374ec7096d3cd4b SHA512 3e081d46aeb128789fa41fe9422186dd30e88c5a7a3c16dfcf1a92fe7faf99cced352ea39a885785fc12f0a974625be329d9ff2a5936a786febe8a2c81f5e139
 EBUILD hiredis-0.6.3-r1.ebuild 1036 BLAKE2B 8fb65afb45e448ecb5c5bd5ae6278f359f309ad0ff5d13656fbb4e920623071335c9573c32b6eb62290aac594fd67a68054760b7af012ec0b6ddfd5d787e6a76 SHA512 2de02a6eef243c5c638a362bab63e17b019a1307020a6672d9d60caf374f0121828a2f111774ad65f0258a31e7e199f3a02fb5c2a50c152df5d274c94b4721e0
-EBUILD hiredis-0.6.3.ebuild 1177 BLAKE2B 3fa66c7317abd22be66df5ffd3aa7169f9ac62e2f0688a56af77473d247d71787497aa150cffbd580ef89e6675e2e1174594a2f9f1dca25ab653eddf5d3ca010 SHA512 fb0d3dd060e9700696a3eb6e50a23de134134c0bfd3398c65dca871ed2dd73f1e15c4f15e7593bbc8b1ebb04c4cabe6a7a2c7697750e8679d5451becb2a9ef88
 MISC metadata.xml 343 BLAKE2B 816ce03a7c4a846888ea2410f1def09d8c56b2f11e6637e0c74fd58eec1117c6ad363411bc4bca45a462320ebbae34785db0b56b9a7bb66de65d4bb316ea70bb SHA512 7cc1565a72c805d327fc2df68c813c5191e6e50dab1901dcc04a4c7f19145ede350dbad584a0bb37387d3a28d9ee0aa93b0918b20adc0d612c751c7730f3b813
diff --git a/dev-ruby/hiredis/hiredis-0.6.3.ebuild b/dev-ruby/hiredis/hiredis-0.6.3.ebuild
deleted file mode 100644
index 7f495d631948..000000000000
--- a/dev-ruby/hiredis/hiredis-0.6.3.ebuild
+++ /dev/null
@@ -1,48 +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"
-
-MY_P="hiredis-rb-${PV}"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-inherit ruby-fakegem toolchain-funcs
-
-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_configure() {
-	tc-export PKG_CONFIG
-	CC=$(tc-getCC) ${RUBY} -Cext/hiredis_ext extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake V=1 -Cext/hiredis_ext
-	cp ext/hiredis_ext/hiredis_ext.so lib/hiredis/ext/ || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:. -e 'Dir["test/*_test.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/hpricot/Manifest b/dev-ruby/hpricot/Manifest
index c9f07bcb38c1..3bb689be041e 100644
--- a/dev-ruby/hpricot/Manifest
+++ b/dev-ruby/hpricot/Manifest
@@ -1,5 +1,4 @@
 AUX hpricot-0.8.6-fast_xs.patch 650 BLAKE2B 5ad93195325fa1e26c2d207fefec83c8e01bbcbfdf933e6925a10bcf74a56c94b8517c7000a3c1aecff091b4d5d1cb3c29c9c899af7a5a5f5f0a17b1967118da SHA512 cbb1aa6138ec98e2eac9bcad8d06ed7c435a8ca503e062776576cfdddb944b294b270dd30e2c2924441ea527445df149e7ce34d085652ca6f184c4e66d209b8d
 DIST hpricot-0.8.6.gem 293888 BLAKE2B 5c054c6fcd5c3365dbf44f3c502bc4c1c3885f4aa43fd1fd15365aea19600ef0ef48157c39ef1709386bda0bc3fb6bba6d98862e8e28bdb5c173429969ef5ab9 SHA512 f0ea9168ae79d099cdb751dd5a205e0896dfb229759e499fff833e94209d1497aa97becb285176dcbcc1fee19bc11913ca3ac0d7a467067e5d837c1eb6e310ad
-EBUILD hpricot-0.8.6-r5.ebuild 1657 BLAKE2B cc952f3491113ec1bb392cca66fc3c42dec0d6cb83ddd52fc9101b1ece2e8c4a68b7c57d13487400c68ed466f3dea663d210be40d03e28781819891827c7c37b SHA512 7ce07fa04e050fb247833c2dfd3cb25298475c1bddf93ae86cf4fdd0087cd7c090e22f1d6d3dddfdd5f34a58be99577a2451ccafbe869312f1ca9491fdce6a69
 EBUILD hpricot-0.8.6-r6.ebuild 1458 BLAKE2B 954d15e521a35ad20a9d278d3ba8c6cf2669aaf0a4567de055409d06cba4ebda4525add2825e793423e86696dad92d454ac468bb8ed5e39816ca34cf27972d70 SHA512 93b18f9b78c895e20512268020ad0f63575045fa2c1cf8514ea32318dac894214f3d883791d2f99a8968b78f86db9791b68893de4293410597faa8d349340056
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
diff --git a/dev-ruby/hpricot/hpricot-0.8.6-r5.ebuild b/dev-ruby/hpricot/hpricot-0.8.6-r5.ebuild
deleted file mode 100644
index 4fe2280623e9..000000000000
--- a/dev-ruby/hpricot/hpricot-0.8.6-r5.ebuild
+++ /dev/null
@@ -1,61 +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 ruby27"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"
-
-inherit ruby-fakegem epatch
-
-DESCRIPTION="A fast and liberal HTML parser for Ruby"
-HOMEPAGE="https://wiki.github.com/hpricot/hpricot"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "dev-ruby/rake
-	dev-ruby/rdoc
-	dev-ruby/rake-compiler"
-
-ruby_add_rdepend "dev-ruby/fast_xs"
-
-# Probably needs the same jdk as JRuby but I'm not sure how to express
-# that just yet.
-DEPEND+=" dev-util/ragel"
-
-all_ruby_prepare() {
-	sed -i -e '/[Bb]undler/ s:^:#:' Rakefile || die
-
-	# Fix encoding assumption of environment for Ruby 1.9.
-	# https://github.com/hpricot/hpricot/issues/52
-	# sed -i -e '1 iEncoding.default_external=Encoding::UTF_8 if RUBY_VERSION =~ /1.9/' test/load_files.rb || die
-
-	# Avoid unneeded dependency on git.
-	sed -i -e '/^REV/ s/.*/REV = "6"/' Rakefile || die
-
-	# Fix int size warning
-	sed -i -e 's/te - ts/(int)(te - ts)/' ext/hpricot_scan/hpricot_css.rl || die
-}
-
-each_ruby_prepare() {
-	pushd .. &>/dev/null
-	epatch "${FILESDIR}"/${P}-fast_xs.patch
-	popd .. &>/dev/null
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/hpricot_scan extconf.rb || die "hpricot_scan/extconf.rb failed"
-}
-
-each_ruby_compile() {
-	local modname=$(get_modname)
-
-	${RUBY} -S rake ragel || die
-	emake V=1 -Cext/hpricot_scan CFLAGS="${CFLAGS} -fPIC" archflag="${LDFLAGS}"
-	cp ext/hpricot_scan/hpricot_scan${modname} lib/ || die
-}
diff --git a/dev-ruby/http-cookie/Manifest b/dev-ruby/http-cookie/Manifest
index f81df499f8a9..7879abbaf188 100644
--- a/dev-ruby/http-cookie/Manifest
+++ b/dev-ruby/http-cookie/Manifest
@@ -1,5 +1,3 @@
-DIST http-cookie-1.0.3.gem 38400 BLAKE2B 6b7292b2a5d7c37b6769cdd38f01d8cf78aa9557b4a204d736dffeae5d31768c57ac58f00577df78252f9a8bdb12a7faecf5e1be64c8ee29aaf67cc9307d0a35 SHA512 43ac1218e98dd47ee22e33e72e20bc5b55f65e60aadd417641f8a4221eba88995d418c7738a4c35dfba132e05c0c4b0df2b2bedd56c22e82c062d1f03de0052f
 DIST http-cookie-1.0.4.gem 39424 BLAKE2B 06ac0e667340ac17827a8eb4ed320efe77ad97509fcd444f7e77d887a77643a6b34e84486db78eba52245891d1719e750d9a446c40a4ab7804f2304b600029bd SHA512 788fdaa642e6b596e7a91c57a7942a832c09a84fed88b30fdd8e5a8ad66d72780afc1246e6c83c4dfd5af8018c278750866dd05d804aef793aa067b09519af8d
-EBUILD http-cookie-1.0.3.ebuild 692 BLAKE2B 3ec06e785b3a87a4d0a46abddfa876bd48ca3bdbd496396beaf17b0633d3d1488e990e57ea923dad6dd60717bc510d38d48e8cbc38d733da9b7dc054fc4b6983 SHA512 54a88bf86a64dd16444442d97872692cc25964fcc4febdab2a2efe4fdc86b2b9ff49ad6a5779087d274a3bf90b7a3af1e76d9a1a6a7368c9d3b6b79421f3c05e
-EBUILD http-cookie-1.0.4.ebuild 669 BLAKE2B 882aa9405d9fd807bf49985a3d6de3a8cd14b8217bed8aa74426883035c453d5251ecab843d1522991fd0d2fa51104eb78f100bebd790374ddac9420ca098bb6 SHA512 cd1dbd3e9b68587566f394d777f82ab3c368161e15c6cc36bfe8ab711a75153410ad4678d9d54c576fb3e8ed26c5695c1caede78d44d17cd0b05a6d4cc88978e
+EBUILD http-cookie-1.0.4.ebuild 668 BLAKE2B ec6c861c1b8fe22eebbdf950d014f4b7e2a97f04a382d01f97519b8e95d02f54ec33ff08efdea59a2bdef1ef6969db8f47eee0232299b55deee7177ece477c7d SHA512 deb730e041fd93efcbdb77b0d5fa77753f621d80b6b2373df547afabfe1f7f0cf133aab5f56e96e03ed62c1dc38836eccc5d614ebc9af6047c2c86d7528d6ff8
 MISC metadata.xml 352 BLAKE2B 0e1cc1e4cc97d4d773c64a068d2f7246c863fae1c17504f83275d1ab15e59a9bc6535c22fdf0c02d89d778079d100b74e29170b0fbe6fc1ad5464e221751a56d SHA512 821e08b75914f51a4a341149db588c8e3b17fc401a14de9abd44918b9f6bf88bc1d9c76b460a10c1b312669db478759aab90d0bb08bc04129bc8c964e7b3a314
diff --git a/dev-ruby/http-cookie/http-cookie-1.0.3.ebuild b/dev-ruby/http-cookie/http-cookie-1.0.3.ebuild
deleted file mode 100644
index ea36755f8f14..000000000000
--- a/dev-ruby/http-cookie/http-cookie-1.0.3.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="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A ruby library to handle HTTP cookies"
-HOMEPAGE="https://github.com/sparklemotion/http-cookie"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/domain_name-0.5:0"
-
-all_ruby_prepare() {
-	sed -i -e "/simplecov/d" -e "/bundler/d" Rakefile || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib test/test_http_cookie.rb || die
-	${RUBY} -Ilib test/test_http_cookie_jar.rb || die
-}
diff --git a/dev-ruby/http-cookie/http-cookie-1.0.4.ebuild b/dev-ruby/http-cookie/http-cookie-1.0.4.ebuild
index b698a1ef2162..59e73b3c8893 100644
--- a/dev-ruby/http-cookie/http-cookie-1.0.4.ebuild
+++ b/dev-ruby/http-cookie/http-cookie-1.0.4.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/sparklemotion/http-cookie"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ~ppc64 ~riscv sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv sparc x86"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/domain_name-0.5:0"
diff --git a/dev-ruby/idn-ruby/Manifest b/dev-ruby/idn-ruby/Manifest
index 450824abd974..d630c206975c 100644
--- a/dev-ruby/idn-ruby/Manifest
+++ b/dev-ruby/idn-ruby/Manifest
@@ -1,3 +1,5 @@
 DIST idn-ruby-0.1.2.gem 18432 BLAKE2B 9bd1a280c76195a84bc996cfb68550c759a466fca4f5c88167c1e395652088b746831f3cd92a197af25d649ec18ce19ddf78402714432976c612ae38c6c64289 SHA512 404025918ca8fb49580d726b9972dbbde987bebc7fa1e42b0e7f091cd8fba38871258c18c933e49a6ee3c11a21cdd388342beb72c6ce46d8c034156eb9064ac5
+DIST idn-ruby-0.1.4.gem 18432 BLAKE2B 7c530e0d24ce515337a1810fbbc33c7598d91c9b82ed19de196aedd47a71edb50c3d6481e62d11e893418b579c58d167a24e1cdd5d9eaa99757b48a88f1943aa SHA512 b06ed738a488493aa843acd1122e40e039ebaeeb5873fc9f935edc5ee52a1f86eb0b2cb5460d211bee9d42d05491b0ee6e4a707b0840a07bc3f3174648435124
 EBUILD idn-ruby-0.1.2.ebuild 721 BLAKE2B 1f7d021f6d3ec3ff3cb1d4a72138a473c01ad68929f300e9e394784c162b56ee52820241e8950b3bd2375565ec7a8665f1228e8a29d8e62408c9658c0b046f82 SHA512 766b115f3276ecce59d1612382156c94ede34670fc6726ad2c6ae1b3e3d002b0bcf9f8d631142991ea4f8b109633307997e41dcbe281f2150aab323975e067ad
+EBUILD idn-ruby-0.1.4.ebuild 714 BLAKE2B 2fcb141d3da1d398777d28a7d0c51af6bd9c7c1cc566e3787464e3ae1d9fede6083a5d7d888e2dea13977d793237049076fdab5adf89fc3653368515cded7ed0 SHA512 688aec4d275dbd511100d49b81570645f369c9bd518f556cf7dbd93d93fa5f75ab89d74606d919c22932947790481f32ea66032546b4b05e4ea8a63b6ed3d08f
 MISC metadata.xml 345 BLAKE2B 7dd31322b5046ae951e97c109fb38c88c29552a2d1a9fb91c7b26ecf7c1b3a0ad5e340dbfc292e2a0a01c5782c62900fcbcfffccbcaf76e676d067ac86b7a2c6 SHA512 ddc5273ab86823ae3c91b96d3982ea80ea94ff140ab04eb15febe786d7f39222589a6f27c5a963fb3c20c908d19c0db588711f9e51e48db6b189d56d6f0b79af
diff --git a/dev-ruby/idn-ruby/idn-ruby-0.1.4.ebuild b/dev-ruby/idn-ruby/idn-ruby-0.1.4.ebuild
new file mode 100644
index 000000000000..ffafe14cab84
--- /dev/null
+++ b/dev-ruby/idn-ruby/idn-ruby-0.1.4.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 ruby30"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGES README.md"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/extconf.rb)
+
+inherit ruby-fakegem
+
+DESCRIPTION="LibIDN Ruby Bindings"
+HOMEPAGE="https://github.com/deepfryed/idn-ruby"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND+=" net-dns/libidn:0"
+DEPEND+=" net-dns/libidn:0"
+
+all_ruby_prepare() {
+	# Avoid UTF-8 tests since we cannot guarantee a UTF-8 environment
+	rm -f test/tc_Stringprep.rb || die
+}
+
+each_ruby_prepare() {
+	mkdir lib || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:test:. -e 'Dir["test/*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/iobuffer/Manifest b/dev-ruby/iobuffer/Manifest
index 920614b719ae..c3dcfcbf4497 100644
--- a/dev-ruby/iobuffer/Manifest
+++ b/dev-ruby/iobuffer/Manifest
@@ -1,4 +1,3 @@
 DIST iobuffer-git-1.1.2.tgz 9286 BLAKE2B 8e5a1fc5b33bfd40ba561c27259079c5511b7cba8b0a55bf120b1c6dcf5552cc0adcf6e08aa8f8cda083aba1013a7f690c20268908760e50ca6bc63a02ae020e SHA512 cec67ac42b3966c144fc61c8fa1a36f166d0a892ec4ebb2f6e0fc218eac5fd7bfb803973b05ae52ff05b04eb86caae0cfee4cc1430e876e58157b5bdc41723c7
-EBUILD iobuffer-1.1.2-r3.ebuild 924 BLAKE2B 292f32e12e3cb126448ee8d598227775909141bcb2e9d782805ca320ac938d07e878f49846ca6f2437f126e227107435200153cf38ee3c1c509b0f1d08836ff0 SHA512 9dcfdc697e98803c26c06a653fcd314fba2e6efeeea6c3739f4f2a7ca408f00e2140337096326c23f9a5411c3dde823592cb74b0d2e8cbe3ba9da13b46c1c779
 EBUILD iobuffer-1.1.2-r4.ebuild 874 BLAKE2B 974816debd943bd9f16cf287f3ac6f9e6e801074076caf00ff5a34deaac1b2a16c3d534bec314ab6171976ba66d9965c951eb5854b275dbd9f278e71755ee53b SHA512 fdeb6ea33f2af3802d6c5304dd12437e1dfd893430fb981faac5d3cde638219a0c51208680c75489c2fad2e64c90e4a869ce52e44f147c4bd7c6b76e1a368c1e
 MISC metadata.xml 344 BLAKE2B 67d22609d5753ab791fb42a4fbf2b7373828ef88ab713e2da13e6eb87b2f1dcee0b6c2a997193c2eb3246e8f8a5d467269cdd0c6ec12431a08769ddb12f1ef47 SHA512 09432c357ce0754991dc0d95b303255851362bd743a915029eae0828f23cc8c1fd06ed4dc889b2cfa9c635d0289c25826990a8b60f6f32023d2561dc6d269c6d
diff --git a/dev-ruby/iobuffer/iobuffer-1.1.2-r3.ebuild b/dev-ruby/iobuffer/iobuffer-1.1.2-r3.ebuild
deleted file mode 100644
index bffbee494074..000000000000
--- a/dev-ruby/iobuffer/iobuffer-1.1.2-r3.ebuild
+++ /dev/null
@@ -1,40 +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 ruby27"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit multilib ruby-fakegem
-
-GITHUB_USER="tarcieri"
-
-DESCRIPTION="IO::Buffer is a byte queue which is intended for non-blocking I/O applications"
-HOMEPAGE="https://github.com/tarcieri/iobuffer"
-SRC_URI="https://github.com/${GITHUB_USER}/iobuffer/tarball/v${PV} -> ${PN}-git-${PV}.tgz"
-
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE=""
-
-RUBY_S="${GITHUB_USER}-${PN}-*"
-
-all_ruby_prepare() {
-	rm .rspec lib/.gitignore Gemfile* || die
-}
-
-each_ruby_configure() {
-	${RUBY} -C ext extconf.rb || die
-	sed -i -e "s/^ldflags  = /ldflags = $\(LDFLAGS\) /" ext/Makefile || die
-}
-
-each_ruby_compile() {
-	emake -C ext V=1
-	cp ext/iobuffer_ext$(get_modname) lib/ || die
-}
diff --git a/dev-ruby/itextomml/Manifest b/dev-ruby/itextomml/Manifest
index a36ad7e8104c..f9f412de803f 100644
--- a/dev-ruby/itextomml/Manifest
+++ b/dev-ruby/itextomml/Manifest
@@ -1,3 +1,5 @@
 DIST itextomml-1.6.0.gem 125952 BLAKE2B 9422d7a7f0a872dc60fce6f5d217c8c085785787d40b1f976a0f3df04f49d8de37a6fb658d8960b27f27dec03401a013b51a9ebe2446f5deecd70cfab00a7756 SHA512 cabff2d8d36cea6b280c4c928675e368e02ce346870c2d933ebb5554722e729ef7a05132776d29e4a62f0fa89ef1ad2fdd729ac97a35d7aed6da24f90de75839
+DIST itextomml-1.6.1.gem 126976 BLAKE2B f66395ebc75f57b845897c9ec3cdabd93a67fd93561ad6fa2284c449518d4da08b3d4cb20529149b006228f0200ed73d3edca23fdc6cc943e0cdb4d09a14b47c SHA512 c122562e54618a2eda090c061d4b65c3d55cbd5325eb7f9d13249959219eeed75be5e172a1d2b8bdcc30eafc7700150eff3b7b09aaa2e5b9dd143f9e5752cd8e
 EBUILD itextomml-1.6.0.ebuild 746 BLAKE2B 11cd9370b41e463ffb1cc61d02093de607c87ee081551b1c7e185ca54e792cd6d36d1d036b8cc89f817dcde19ebd7789051d2a8a30a66120bcf4b9e1c1071095 SHA512 39c429d089ca3ae5fd598a1a21661b5a4ac043d64b1b7771766e747b14a3cc8d144fdcae6f40ed9fe5c94f4006d24daaf0d0fa730e4a1d5d7eab5c333a76e86e
+EBUILD itextomml-1.6.1.ebuild 602 BLAKE2B 44474553416b9f86de8486bf4e14204e1150cb6d176c51cd53e637601e828acbb273ce1496772bd4be89c39789010ff439bbc6aa8ba8097752e4031b017581ff SHA512 2c495c2e21f1d3f2800b9eee1739ad208754f06fd980d864661b8af428913d76ae731ae555d6dbc5a088cc05e856f632275d750ca91437573d5346b76ed76e40
 MISC metadata.xml 258 BLAKE2B 3c49249352f2cb11df010da6ecd8312a27047557ca5f2686837ad66933be9ea2627c40f91daedf8dcd9099c6cdc0dc2d2ba32aaf9d888c41fb60ee098e1c0c1e SHA512 ce517e35f3c0a2a9807ee68b0a8c84ca28db8dfabb41758cac71f9da22847fe20d259295f0681e38a52a24618450a0ca097939dc1022e3987bb0088762e48326
diff --git a/dev-ruby/itextomml/itextomml-1.6.1.ebuild b/dev-ruby/itextomml/itextomml-1.6.1.ebuild
new file mode 100644
index 000000000000..a6eb145fd8c5
--- /dev/null
+++ b/dev-ruby/itextomml/itextomml-1.6.1.ebuild
@@ -0,0 +1,26 @@
+# 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_EXTRADOC="README"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/extconf.rb)
+
+inherit ruby-fakegem
+
+DESCRIPTION="Native Ruby bindings to itex2MML, which converts itex equations to MathML"
+HOMEPAGE="https://golem.ph.utexas.edu/~distler/blog/itex2MML.html"
+
+LICENSE="|| ( GPL-2+ MPL-1.1 LGPL-2+ )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+#Tests don't fail here
+RESTRICT="test"
+
+each_ruby_test() {
+	${RUBY} test/test_itextomml.rb || die
+}
diff --git a/dev-ruby/kissfft/Manifest b/dev-ruby/kissfft/Manifest
index 7cf1f1b75a4b..acbfd1dec9b2 100644
--- a/dev-ruby/kissfft/Manifest
+++ b/dev-ruby/kissfft/Manifest
@@ -1,4 +1,3 @@
 DIST kissfft-0.0.2.gem 13824 BLAKE2B 89c08365e23dce06f1c9acea7ddc7d463d3b8df1a5c238656fe9a43fd411077b9dfdf90288437ec9a30bba16d8eeb5a6a2b1a9d725cbff7ef07c632be6877f88 SHA512 3513008db848c92948e35c01bb568dcb8d52656ffe3510b81fb57b71b5abab121b3f1e6f3c20f2c94d0cbf1870d612b48f983a6639588ecd8a54f8b736fe81cc
 EBUILD kissfft-0.0.2-r1.ebuild 455 BLAKE2B c9355768e77c615e34f893aedf9af81b18996deb9c9b9f38354557057c9520d1fbb4053eafdd3d87e985a4e26e90ff549da47d15ff749e8224c0ffe0a708ac1c SHA512 a4dc8196dac1804cf07c370a5f2a0acf41e0832707463c5b2be52315ecae3de999a93b806ecc807cebe26dbf867a4b703f296e1253c0946892a68a940fea6f29
-EBUILD kissfft-0.0.2.ebuild 565 BLAKE2B 315e58de027f2cbabf0d467ff324e4d7474e33231c2d6118456abf9e61979a20f70c7f0ae4198b2f6b533ca192aa690b7b4def9b5da02ea2a41cc070ddca138d SHA512 6924403ccb4860cef1ed1b141ce0f9cb0ae1ce5ba438baab1728c2aad4da081c0831eb05c9d04a875a67af2a6101e4a5bd1870d4cc95d21c6450d7704b18f1fc
 MISC metadata.xml 434 BLAKE2B 66625935bade5ebf6470c4c5d7fb78b11418280d7752ada11a22df2af133ef082fb14c215b26589bc83bf3298aaf2b2174be54ed6c74c5b4c0d9dbb5ba9cc64e SHA512 9164b6d5a2a69ff556b03a827aa4ff55c7c9a639161170903e02169f3534a79bc513fa5829e21506c7ae40050ab4456c291a4b805aff5fc8b1d8dc39f7c167ce
diff --git a/dev-ruby/kissfft/kissfft-0.0.2.ebuild b/dev-ruby/kissfft/kissfft-0.0.2.ebuild
deleted file mode 100644
index 5deb9cd3b057..000000000000
--- a/dev-ruby/kissfft/kissfft-0.0.2.ebuild
+++ /dev/null
@@ -1,32 +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_TASK_TEST=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="ruby interface to kissfft"
-HOMEPAGE="https://rubygems.org/gems/kissfft"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-each_ruby_configure() {
-	${RUBY} -Cext/${PN} extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake -Cext/${PN} V=1
-	mkdir lib || die
-	cp ext/${PN}/${PN}$(get_modname) lib/ || die
-}
diff --git a/dev-ruby/kpeg/Manifest b/dev-ruby/kpeg/Manifest
index ee2debb942c3..8124d3e07235 100644
--- a/dev-ruby/kpeg/Manifest
+++ b/dev-ruby/kpeg/Manifest
@@ -1,6 +1,8 @@
 AUX kpeg-1.1.0-utf8.patch 450 BLAKE2B 00472188e53b34f8395c33c9510232ad826ce71235b3110807d1a3fc9068684cf367f6a312e6adccbf93fbdbc783d69eb8e14a536365f8c72e1ac6841a364171 SHA512 eb0c3b6d3ba32e3496f7f115804dfbef949dfb34e842886cbcc3c8b49a0bfbb21d1ef3510590e335a2836eca09cd031d9e75a8d601176465c84e5424fceba663
 DIST kpeg-1.1.0.gem 57856 BLAKE2B 6aab84aec59c4962ef39f31a7de89a7bb84f0ae2b64327206fefa8bc243e0dd405db121bfe2f50c72b18933c2f4ce7a47a842c741cbd53db1ad73415d41b95dc SHA512 4ca7007bea74485ceb7c3f53eef1cd2e162fed45872f8f078d5b5d2ffd1ecaa0e8fc65ed6f1b220bf6f4642d455a582cb754cdc6350edf856b33d9908510cb66
 DIST kpeg-1.2.0.gem 57856 BLAKE2B 6397792524e00594c7f64acc79b920781b6dca28d0954fa73de0c9644afc4788969fa2e807cf196807808d93e5520db0e1b1cdd412391a592334c8811f687132 SHA512 97a1e573dcff89f4a8a6832876e4ce737a85fae63ffe6ac8dad001db8ff8237f32d437813252f3487e68a0708c161ee5731b468e5f1b039e59d714b461722e7a
+DIST kpeg-1.3.0.gem 57856 BLAKE2B 783c0f6fad341139dcf8b69adb9bee829a302997917e07cc2beb7dfbabff759e26c31bf1c9b272193919a7a78d9b793db7db85ecde1b5c6ad7c5eeefd95e103e SHA512 a84aa2afd0bb9148dae3cd3c8e1f3104bf4b4997e7c89524ef8b3be1c6fa9dfe7364c931eb9c0e641277590b634b164ab78b8e8e499937fbea65ebb7aa556fd6
 EBUILD kpeg-1.1.0-r1.ebuild 727 BLAKE2B 0ffba3628bb74b9477789e47d091d96095903826b35351ef2e27d3c8d203938de758794947a266aab4ed486c48f2dcedb3f3ea4d9bb94d9d1de6ae40f3b083d5 SHA512 fb1f23a55bbbf40438e103b2977a1649bcd24ead55837ce739c758b93873b556ffd17a5c0343a470c72aa192bc6b8c4c11587fca24c5840985caf8d56cf95dcd
 EBUILD kpeg-1.2.0.ebuild 734 BLAKE2B 606bac56a3ff201aa84d9a8e9ff5b734cc0d0272b916dbe7deeb083fb019998d799bdba133e8d9043ad3a3389fd54479c1f1fedf7d4d6ef2fffa96a59c0cd644 SHA512 d8d7dfe826d3cd13e4c0a1650b5fcee73ba6f535ef1b708b2282bd4e1947c97afee1a6a0054d13715077ada17cd1b755d6f10dccbb9232ac13e9185e085b4af9
+EBUILD kpeg-1.3.0.ebuild 734 BLAKE2B 606bac56a3ff201aa84d9a8e9ff5b734cc0d0272b916dbe7deeb083fb019998d799bdba133e8d9043ad3a3389fd54479c1f1fedf7d4d6ef2fffa96a59c0cd644 SHA512 d8d7dfe826d3cd13e4c0a1650b5fcee73ba6f535ef1b708b2282bd4e1947c97afee1a6a0054d13715077ada17cd1b755d6f10dccbb9232ac13e9185e085b4af9
 MISC metadata.xml 339 BLAKE2B 84a27b2b24e20e2ec895782c175d959092397b5936b4c98daabab1ff20a24b7c3b3b951cb14622f8c824629131ba9d84404cf908c31003d17e049ea91868264d SHA512 ba4fc3f1c9f36619d257f5a9fc7fb2c0e47833e81ee5e092dd2649185d7e00ced6f865fce299e97d5e866b78184bd5b7350de1b874079d41b7337b2f4ef5a124
diff --git a/dev-ruby/kpeg/kpeg-1.3.0.ebuild b/dev-ruby/kpeg/kpeg-1.3.0.ebuild
new file mode 100644
index 000000000000..7178cd2d934c
--- /dev/null
+++ b/dev-ruby/kpeg/kpeg-1.3.0.ebuild
@@ -0,0 +1,25 @@
+# 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_DOC="rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A simple PEG library for Ruby"
+HOMEPAGE="https://github.com/evanphx/kpeg"
+
+LICENSE="MIT"
+SLOT="1"
+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"
+
+PATCHES=( "${FILESDIR}/kpeg-1.1.0-utf8.patch" )
+
+ruby_add_bdepend "test? ( dev-ruby/minitest:5 )"
+
+each_ruby_test() {
+	${RUBY} -Ilib:test:. -e 'gem "minitest", "~>5.0"; Dir["test/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/levenshtein/Manifest b/dev-ruby/levenshtein/Manifest
index ab45f14bdf94..e4a4a66bd7d2 100644
--- a/dev-ruby/levenshtein/Manifest
+++ b/dev-ruby/levenshtein/Manifest
@@ -1,4 +1,3 @@
 DIST levenshtein-0.2.2.gem 7680 BLAKE2B f10a6b4079c74bfd5ade5113fc96e3551d7b78192aeb8ad68ef40e5813b3c00707614bab362d4cd9a7331be04f74611e016c2d95f7a82964cb2d4ef7ce813e8d SHA512 a84300b6590ab8c5fe2cc4e6f243ccec397cb97f7a241f635d2344433365b846701f9f4cccd7e574a1e50cf389ed03e3fe9992b6c2f21e12806a0c3ab08f03d0
-EBUILD levenshtein-0.2.2-r2.ebuild 706 BLAKE2B e66bd8d829585f807bd7503a9f413cffef4f3354f24b9d3deb489733109013d067672a25965766011e917175834377a53c66bc131cc716eac7b2671a4b6f0e30 SHA512 05dd7d4499052f69029cfbc989576e5b1cc0d8e4ef45833163640b4e11442706e0abb51390ee1424e759675eca40fd9cc70f00dae7e77d9ba434a402ff5bbeeb
 EBUILD levenshtein-0.2.2-r3.ebuild 562 BLAKE2B eb0da3a72b27e539f0a57c62c6d2e10860dbf498dcea1a8c6de830e3bb130e504ee9c4651c9ca20615f93e410f0dab35ef6587dfd2cbc7347237bea20beb0948 SHA512 82517e6fea46d07701ca25dd41573fa5eab1eb620b268e6f78217ef2d1e8692842d1dcc948e552150e2c116e650e013a4fb41620b291b9c78d6511f9d9649d75
 MISC metadata.xml 339 BLAKE2B da547365ceac6c54015f5937754ac9471f12f93db24f5b194cfaaced699945d5806716fb3cfe983313353cbf1c9a310ce8cbb08296e2e187c0e1f08585ddeae7 SHA512 b335e66ac92048d7fa9fa3e2e4bce4657855bd6409e081fabde744be58dacd79a677c0d66edf39a03ab66743e0880f93c4a9ad2aa121936645824d7bdcc6377c
diff --git a/dev-ruby/levenshtein/levenshtein-0.2.2-r2.ebuild b/dev-ruby/levenshtein/levenshtein-0.2.2-r2.ebuild
deleted file mode 100644
index 399d297c16a3..000000000000
--- a/dev-ruby/levenshtein/levenshtein-0.2.2-r2.ebuild
+++ /dev/null
@@ -1,33 +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_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="Levenshtein distance algorithm"
-HOMEPAGE="https://github.com/mbleigh/mash"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-each_ruby_configure() {
-	${RUBY} -Cext/levenshtein extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake -Cext/levenshtein V=1
-	cp ext/levenshtein/levenshtein_fast$(get_modname) lib/ || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib test/test.rb || die
-}
diff --git a/dev-ruby/minitest-around/Manifest b/dev-ruby/minitest-around/Manifest
index 59d6c16f0ab6..965bb5cf5442 100644
--- a/dev-ruby/minitest-around/Manifest
+++ b/dev-ruby/minitest-around/Manifest
@@ -1,3 +1,3 @@
 DIST minitest-around-0.5.0.gem 11776 BLAKE2B 1b1bacc229252e41412380d95e50ad05f918c13d37e7939f96fa19e4254c7f5222482d0f080355e5a900ff8ef89f768cc527c9b1c2644817e4d46842cbf83140 SHA512 8e57d436d39a41c5a08df6006a5cd46f92550844f01f9b6662918b9ba9536b74f6c83fcaea64180c7e025a1a14d4e037e1b17b84ae395a2b745e58f21ba5c752
-EBUILD minitest-around-0.5.0.ebuild 782 BLAKE2B 6e1de6ee17a6c4957897475decd79c8a44254ca131c880abcee65587d4de7cc231edd54c9613a75170ab539415ae278bdc204f7dfa269693936ca4a99d5d4f2b SHA512 cbf7a969ac283fb9d85117f3f413285a36f8727733f96fc6dac25862cf08b905005100f0bd013481a523746670d7fa7faf225b966f4ac2d816475de7f375260e
+EBUILD minitest-around-0.5.0.ebuild 788 BLAKE2B 25cff3f65cc4531f297aa5626cb9eef57dde861916551637572b38fd80801b985a78d87a2d9f9bcab8a9d9cc940bac4f8e37e36abe13de1d890840bcbd7dff4c SHA512 d0209abe4376fda4d125ac9525ff0a19cbf78e31303ff13d3855b296a5b58d7cb264a3cca0a7f8faf10402f83b6de02a2cf72867c9a5a6806f23f75d28eba196
 MISC metadata.xml 352 BLAKE2B 299495959553f3851c1ad79b58f388357c9ad37d442d77e1ccf8cb857750ba81ccf1d0e87e7387b3fc70d8bdf63027a4356ac0827aac5d8ef47bf7e944e107fb SHA512 85dbb782b3bfddb799c94a0e03f5dd6c75282b25bce995791cf2a383d6324ffa9f36f1a6e99c1807a0cc5f7c14de93924c0534ca40f0fe003a8742aaee0f04d8
diff --git a/dev-ruby/minitest-around/minitest-around-0.5.0.ebuild b/dev-ruby/minitest-around/minitest-around-0.5.0.ebuild
index 6bcd63803835..487cabee9de4 100644
--- a/dev-ruby/minitest-around/minitest-around-0.5.0.ebuild
+++ b/dev-ruby/minitest-around/minitest-around-0.5.0.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/splattael/minitest-around"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
 IUSE=""
 
 ruby_add_rdepend "dev-ruby/minitest:5"
diff --git a/dev-ruby/net-telnet/Manifest b/dev-ruby/net-telnet/Manifest
index feb9f5b56a7d..f5f8b80160c1 100644
--- a/dev-ruby/net-telnet/Manifest
+++ b/dev-ruby/net-telnet/Manifest
@@ -1,3 +1,4 @@
 DIST net-telnet-0.2.0.tar.gz 13299 BLAKE2B 6b87974281b4e1857a1e05efdfc751a5149f9057598c89b8b288219b95268955ee3f80e21cc787ac767ef3126c9ee23d9b62e29ebcb8c317def703f0e0dc1fe6 SHA512 a4473c42d33c10594c4445c29db73f4d611555710228cce263f7fc273e71140423dcbc2e89eec2a26f35f98de48aa72eca9f44cf0cd4626d702709963ce7b02d
+EBUILD net-telnet-0.2.0-r1.ebuild 1047 BLAKE2B 41034253598686c7a3d8f5410c10589b857959fb5f5a9dd65803d54aafdd3a14137290e52bfb66c467405daaed96676fc9a1f9df7540627a05558af8023d97a4 SHA512 f794ce667bafd51efbd7deefc98e67c227c18e12476631e13ab0c585364526af8d68f925d6853ada0a3eab2ee03bf105ce828eed39e887d3535e729e29b3c757
 EBUILD net-telnet-0.2.0.ebuild 956 BLAKE2B 60aa4eb2b4278c9dcb83217f1bd47c7c0924ce21b45092f27579e9bb4b7258fd3c3c683f199a3627e7fb159a132eb350e7274416c7d6a5e23b203df9cec4fc9b SHA512 f27adc1c97108669ed91cc14c3e4249548f86a18bf4aa40d77bba69495305f4cfc245179efcd8d46d023f4b2adb4598fb38fcdbbafc9b7652b88118fba292ef9
 MISC metadata.xml 342 BLAKE2B 9a659f3d0c58ea00e32e060c2188f6b38821ffc8225788b707d21a1071024c87bdc17b394ac654c70c8830c7f88b9ccd08aeb26d8bc859a53d29bebb2c3868ff SHA512 adffb5054de27a4371669b6e373548c941e7f7398fd964e8150ce13604adbdf806c463950c5f50d3b7dad17f30c06c5342bf950ca5c8433ae3c830cc8dc3ab02
diff --git a/dev-ruby/net-telnet/net-telnet-0.2.0-r1.ebuild b/dev-ruby/net-telnet/net-telnet-0.2.0-r1.ebuild
new file mode 100644
index 000000000000..24bfd3876fc3
--- /dev/null
+++ b/dev-ruby/net-telnet/net-telnet-0.2.0-r1.ebuild
@@ -0,0 +1,32 @@
+# 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_EXTRADOC="README.md"
+RUBY_FAKEGEM_GEMSPEC="net-telnet.gemspec"
+
+# Don't install the binaries since they don't seem to be intended for
+# general use and they have very generic names leading to collisions,
+# e.g. bug 571186
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Provides telnet client functionality"
+HOMEPAGE="https://github.com/ruby/net-telnet"
+SRC_URI="https://github.com/ruby/net-telnet/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( Ruby-BSD BSD-2 )"
+SLOT="1"
+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/minitest )"
+
+all_ruby_prepare() {
+	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	sed -i -e '/bundler/ s:^:#:' Rakefile || die
+}
diff --git a/dev-ruby/network_interface/Manifest b/dev-ruby/network_interface/Manifest
index 71b47e332ad0..ab82f045c289 100644
--- a/dev-ruby/network_interface/Manifest
+++ b/dev-ruby/network_interface/Manifest
@@ -1,3 +1,4 @@
 DIST network_interface-0.0.2.gem 16896 BLAKE2B a0e7898aa5989ea38c8a9214f3aaf5f9d0dbdf39e86f7e9a4d62ec6c94f29f9612a08c1465513b62351a4c62ed776e427800eabe562062ce7c9b4b75ec757a3b SHA512 8850325e7e0c5ab51b060270220099c2c00cf7031083a511ae9f8dd6d1b9219b37169fa7620e9648eb071784a840e14ce965f8d1cf5d475ff82691bfba25a202
+EBUILD network_interface-0.0.2-r1.ebuild 640 BLAKE2B 0feb4e8868af4380a16f0e84a7bb23cffb42f047f7dd1dd6373af68f15130f29b2021e080d88ddc9c593deb1146950d4b0c6d5b5d6ffc54eea048dcde551d049 SHA512 d1eac4950d30bdcd888dd2272799407e20eb403debe3aba0fdfbb322c86f1aaf1c469a3024453530ba9156a75b2dea91b8aebb59d9686c89777bf0f50d8ca45f
 EBUILD network_interface-0.0.2.ebuild 823 BLAKE2B bb65f6f170cbfdd7739d44c5c61f000405a2eac1d014f7eac0822059f0fea957c82a2b354e6e47572aef0dd3e87617659338148172852a7d4c8fc65958d9e384 SHA512 f9bac94b08c17f3a15d22637ea5cb5034c9f1b8181f9a37a956d5c18e649178c98a6ae14b520e0555ea38cfd6f0d85d8cfb5b64132edb8bc51293777a70466f2
 MISC metadata.xml 347 BLAKE2B 145ba4bea55a624f1bcd5bc1792e13affd91c283ad59e9c3934048ad2298c9724fa156df4325a751b4a60376197e4eeb1f2ca6a13b04e6675697704df7fcd1e3 SHA512 0f338ef12f1d7196fe43d2be855281ee4f947298bbc6622d4280d827e671643f9e8f4f4d54fe9dd56f60ca4e8a14b51d7ba94592205fd241261f1f09a03eab4e
diff --git a/dev-ruby/network_interface/network_interface-0.0.2-r1.ebuild b/dev-ruby/network_interface/network_interface-0.0.2-r1.ebuild
new file mode 100644
index 000000000000..2e4c2572c5a2
--- /dev/null
+++ b/dev-ruby/network_interface/network_interface-0.0.2-r1.ebuild
@@ -0,0 +1,27 @@
+# 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_EXTENSIONS=(ext/network_interface_ext/extconf.rb)
+
+inherit ruby-fakegem
+
+DESCRIPTION="network_interface layer from metasploit pcaprub"
+HOMEPAGE="https://github.com/rapid7/network_interface"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+# Tests are brittle as they cannot deal with all network interface configurations.
+RESTRICT="test"
+
+all_ruby_prepare() {
+	sed -i -e 's:/sbin/ifconfig:/bin/ifconfig:' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/ox/Manifest b/dev-ruby/ox/Manifest
index 05f0188694e4..9e1a62bbdfd7 100644
--- a/dev-ruby/ox/Manifest
+++ b/dev-ruby/ox/Manifest
@@ -1,7 +1,5 @@
-DIST ox-2.14.1.tar.gz 208294 BLAKE2B 588d9171de5db1cec6e24ea64a604ab85074ebb59be0d53afc040c9a47c64e2168abdd86271da8d1dad05803c98a64f8d12ea19297638a2f2a54a52c1c3f4342 SHA512 c82e9ec18a4003ab1e76f03b024b345b77a83a72f9f01d0dea1d9fdbf7c948638269e8331c19715b6b8bd999c2a104cf3660ff1f95cb445f13956ca0f95b723c
 DIST ox-2.14.4.tar.gz 209459 BLAKE2B e5e029ac5050cd44d0b80c313afb7415495203562bd08b34d4028310e853654b287920531f59f11c149715145e5aa44d3a9b1b2c8eb1c13a1095dc78a5fab95a SHA512 885aee65ae4a833dc9fc1847201f1d922e0d615831674abaa2d8169a22913202e49d677ce792bfe2d71cc9990d5a7652684f0d55606daf5f4a538d24078b4496
 DIST ox-2.14.5.tar.gz 209521 BLAKE2B 36695eceb2965f34b22c8809f493a5b8f8dee5f189cb68fbd06a9143c6970cb357b03e977f2bff3cd3867873e935a9475543ea79a1cb6a476469d667c74b6de8 SHA512 e91436f75e0868128f818d4f93c33e663c2ae6683f834c61ad7c14b2ebf680d622e81d71392bc24907313713be8463ab42c8badfcf4d0327ccca4abbcd1fbb0c
-EBUILD ox-2.14.1.ebuild 714 BLAKE2B bced0d68b0e355f590b3b972287b31af82d0e810b1864079d2e7444d9199cf7fc3dcc5c78bc18e8d396390dd0b290089a3ce876b98f787e12f79ecddb07a9c2a SHA512 42764a17622d54d7cbf74553ec7253712a857ea4788dce7e6735349db03896eca324ada0dafa4f29edd62a515fbcdf7bb867729ea75087d36838569b3593e080
 EBUILD ox-2.14.4.ebuild 645 BLAKE2B cc22181a2e74f99ee712c57450b52f2f381da9ce6f0fed272d0c4fac9fcd188831502a4e43d73520076ec4a2dbf616d7a2093306550a5da7a1bc62698308e70d SHA512 3e8567de6d9af0319a70847b6bfb810e1bf68de5f34fb0d1c0c8a049087911cf9a1bb45713ab62cf4199870772450bcf3c02dc4080dc9a55d128ebe693375a76
 EBUILD ox-2.14.5.ebuild 646 BLAKE2B 0c6710ec158d41c628e382838fcdd5a43f4fa2e2c91ce5a274bf217951a1c6e5bbf64be9661932c38812c08758cd6d11891d0e219e4fec97f461c24ca5b8c3f4 SHA512 4fd7e1fd1fe3a53c49b18247e373f1bba7c484be9e7bba1b253fc43632c06f33d29255fd445eec45e3ef43d3215076bbd0f377b99edb035bad0c709a5ed7542e
 MISC metadata.xml 337 BLAKE2B 3ce89c2f08a3b10465352f1880ee482ce339e9fc2f488f93fb598c414e5575b219cd31c2ccf29abac487dc9c6b065165d5e6173f55d86fbe77060aa4a458f7a4 SHA512 365803987840415bcf4f114be78e6c4a20e46832998f7d98e281273c797b6d06d886e9a9e4ffaf208f5ad83562d91554c0280573d5643d1a0964a2ace67bfe61
diff --git a/dev-ruby/ox/ox-2.14.1.ebuild b/dev-ruby/ox/ox-2.14.1.ebuild
deleted file mode 100644
index 3def3e738dd1..000000000000
--- a/dev-ruby/ox/ox-2.14.1.ebuild
+++ /dev/null
@@ -1,33 +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_GEMSPEC="ox.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A fast XML parser and Object marshaller"
-HOMEPAGE="https://www.ohler.com/ox/ https://github.com/ohler55/ox"
-SRC_URI="https://github.com/ohler55/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="BSD"
-
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
-SLOT="0"
-IUSE=""
-
-each_ruby_configure() {
-	${RUBY} -Cext/ox extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake V=1 -Cext/ox
-	cp ext/ox/ox$(get_modname) lib/ox/ || die
-}
-
-each_ruby_test() {
-	${RUBY} test/tests.rb || die
-}
diff --git a/dev-ruby/pg/Manifest b/dev-ruby/pg/Manifest
index 71c577c51476..8268379b9b2e 100644
--- a/dev-ruby/pg/Manifest
+++ b/dev-ruby/pg/Manifest
@@ -1,3 +1,5 @@
 DIST pg-1.2.2.gem 196608 BLAKE2B 068be98d190cb4074cc89bdb5b376322f323950909f7a6fddc8669a3ff0f85eef9f512bd2ec7121707e9ea077b2b428f698e84f2118c76e34f5def75ca303fca SHA512 5c7cc90afb75a66e80cfc34c4875cf22b005aa0a27e78db6f71d1829f870c6409b73326a9925f79c0d642e93ea51d1f84c7383323fea44b7488e83deb7754951
+DIST pg-1.2.3.gem 196608 BLAKE2B b3e9119d068c833f7352b61802d5fb03616ed2d13f957c8d4b51966444523ef9d884a860309209dfbda5931aa1f8199b7a63a51a89c194758de309f00bdbfbd6 SHA512 dd8fa7b256102aea7588fd7e1d4e28199be2bf9910149d266b5379e78a7a57aa2a22763d04a559f4763842cad4ba8d0fbc33e8b43b7497dc77039edfd1029585
 EBUILD pg-1.2.2.ebuild 1595 BLAKE2B f3dcdc64b69e3e8da9a9981ff97c72ebf9f58044e43be2283cceb70e45a70f349970f003d12ec469827170192c441044e92547e9ae0bd8959fc9cd34fc6d1aa1 SHA512 b90c98ddd7ee4de299f7bfad52955e76a54cd615218c8e86ed1cb20e98731cdbee20e0f8cc3b8faa125969233f3b974803f38085feece6c0cd125cf04261835d
+EBUILD pg-1.2.3.ebuild 1419 BLAKE2B b6348a645717b40911b2164f8f49c281600e44f460734196993c58bc5f78654140e3ee58dd660d9649451073387d799c2e4683514be96a47cb220f2021b62514 SHA512 b8b8bf71cddd6813ba635c944889ff5c7546131fbd574f980b71438d2b026455d5320405913bd02b12af776a3f48d6b331ba15fcc844141cedae706ab4de8f3d
 MISC metadata.xml 338 BLAKE2B b827b967fa6a0795016f741de3ad7738103580b06bb6d1f56957fbbcde06a63eeacc6b9aa2bbd726bad77c91b28659a3318e6ec43d141cd1cd05982b209c2f1d SHA512 8f1ea2d36aaa43547b48d39df2f403bbbf63b5bd57570bddf8515f84bea573793f1ecacc807d02f05d96a919c8778465f4c87822bd1807ebeca115f6dec81e99
diff --git a/dev-ruby/pg/pg-1.2.3.ebuild b/dev-ruby/pg/pg-1.2.3.ebuild
new file mode 100644
index 000000000000..a3608ddcd972
--- /dev/null
+++ b/dev-ruby/pg/pg-1.2.3.ebuild
@@ -0,0 +1,47 @@
+# 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 Contributors.rdoc README.rdoc History.rdoc"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/extconf.rb)
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby extension library providing an API to PostgreSQL"
+HOMEPAGE="https://github.com/ged/ruby-pg"
+
+LICENSE="|| ( GPL-2 Ruby )"
+SLOT="1"
+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=""
+
+RDEPEND+=" dev-db/postgresql:*"
+DEPEND+=" dev-db/postgresql
+	test? ( >=dev-db/postgresql-9.4[server(+),threads] )"
+
+all_ruby_prepare() {
+	# hack the Rakefile to make it sure that it doesn't load
+	# rake-compiler (so that we don't have to depend on it and it
+	# actually works when building with USE=doc).
+	sed -i \
+		-e '/Rakefile.cross/s:^:#:' \
+		-e '/ExtensionTask/,/^end$/ s:^:#:' \
+		Rakefile || die
+}
+
+each_ruby_test() {
+	if [[ "${EUID}" -ne "0" ]]; then
+		# Make the rspec call explicit, this way we don't have to depend
+		# on rake-compiler (nor rubygems) _and_ we don't have to rebuild
+		# the whole extension from scratch.
+		RSPEC_VERSION=3 ruby-ng_rspec
+	else
+		ewarn "The userpriv feature must be enabled to run tests."
+		eerror "Testsuite will not be run."
+	fi
+}
diff --git a/dev-ruby/pg_array_parser/Manifest b/dev-ruby/pg_array_parser/Manifest
index 6a06e6077ddb..c7d63ab18fe4 100644
--- a/dev-ruby/pg_array_parser/Manifest
+++ b/dev-ruby/pg_array_parser/Manifest
@@ -1,4 +1,3 @@
 DIST pg_array_parser-0.0.9.gem 8192 BLAKE2B 5b647cb3bca2b965348cfb5c442f4bf9c58d03f66c422768b22836d8a9cf73d9b2b242a055df0bea708b617d0a3ca84abe8100007ca259eeea4dd089385db860 SHA512 a1503d9598e1658eb63b6294ce1cf6f8d2e7e5c59382407946ec10d25a46b029b4bb8a8c634b190b42bef4954c4aeea60b6ffa16c596e0c3bea2df4c882896ae
-EBUILD pg_array_parser-0.0.9-r2.ebuild 1425 BLAKE2B c587054af8f820e1093fe371a7ac4b84bb4044c6447c745fe95a623c3465d1cec12d214ae0b3a7c7e892f31d16c3b615500431c8d335333e4f035366fce4dab8 SHA512 99fc8a1fe4f68c299d7a30b01132e0954ce12d910224dd8ca3df1677aa8d223decb0e6e1b1e47c6fd382dcc8fcfe824d5f3577ca6c0bc3f62e8e1bcbcf1b987d
 EBUILD pg_array_parser-0.0.9-r3.ebuild 1055 BLAKE2B 28ec529dd6a0402b115d801c70152885aaf523d4f7ebf2ef1bd9bf27af72ad1fa1a6f76e6796f07151a9989fecf4edfb5f630decd9b193182d49c630d8d70dc6 SHA512 745bd0044900965bef7f561bba8b259ba754ace556c6c36764019271a0589695858b81a1dbe6f88b68d4e1db9d8be7392abc15bb37812c4faefefd47b815523d
 MISC metadata.xml 347 BLAKE2B 7e1e8010f3be064e5bd3c8373a073292668fa7dad5fdb2ab5d413b0401e80dd108832cef4ec73ce0bbf22c739f1fb9e16ed80be41270f51c5db32766f994b842 SHA512 247ecfc8a886a812a527e6e8546af7a92e925303e9b6d5befc91cdb8e3aa51830703360fa4ef70a6b14ed4da98b1f08dde582261621b5658457a1e8cef9aeee0
diff --git a/dev-ruby/pg_array_parser/pg_array_parser-0.0.9-r2.ebuild b/dev-ruby/pg_array_parser/pg_array_parser-0.0.9-r2.ebuild
deleted file mode 100644
index 760466076b4e..000000000000
--- a/dev-ruby/pg_array_parser/pg_array_parser-0.0.9-r2.ebuild
+++ /dev/null
@@ -1,53 +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_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="Simple library to parse PostgreSQL arrays into a array of strings"
-HOMEPAGE="https://github.com/dockyard/pg_array_parser"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 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
-}
-
-each_ruby_prepare() {
-	if [ -f Gemfile ]; then
-		BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle install --local || die
-		BUNDLE_GEMFILE=Gemfile ${RUBY} -S bundle check || die
-	fi
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/pg_array_parser extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake -Cext/pg_array_parser V=1
-	cp ext/pg_array_parser/pg_array_parser.so lib/
-}
diff --git a/dev-ruby/posix-spawn/Manifest b/dev-ruby/posix-spawn/Manifest
index 73f89e4d71f8..9f840b06d8c5 100644
--- a/dev-ruby/posix-spawn/Manifest
+++ b/dev-ruby/posix-spawn/Manifest
@@ -1,3 +1,4 @@
 DIST posix-spawn-0.3.15.gem 29696 BLAKE2B 224cca09cbac983cb35dd2c25fe4ea485f6c5ec20fe46dfafcfb4f3586da9eb77ba8328dcdc3fde6f389dc0953ae4b7e5a600af67db421837a6610b0770c8146 SHA512 bdfecdbb0d470d23643de1c5b40c4f4b8b7f8970c14a2d3bd7c15e59d388b24857fb740c5c87573cbb6ac83483a29bf87f856a949a1fc014be8ad09e5cb2a9e7
+EBUILD posix-spawn-0.3.15-r1.ebuild 681 BLAKE2B 318e4fcb0cb01a288cce24ead89f1ebb375e90dc5701af4b0b41a1679212d54da275ce7f4fa03ba67b5eb96eb3bceff8f00496f0a27934452f452320c07946cd SHA512 395a722136446e57e4f9015897828ecc7dc6dd44dbc7d92c28f97ba35975fb5b11eb6f843630e53bd8b48ded1206a72ba59726b5a990b85110b21dcb442f288b
 EBUILD posix-spawn-0.3.15.ebuild 655 BLAKE2B 332bcebc14e15719c217a59e4dfef54b03e41eab5fd9b1affc1dae65345e7e18b2791ccf51bb4eb49206de95842b6ea4a05debfbee88a3bb9d8e80fc7f6bb3e4 SHA512 964604f862618099512ed398cd164d5b4125bbb9945d568945e18640605955f56658ab9e83f369106189c25149ba43670df36d3a8490fa454d1fac284532f7bb
 MISC metadata.xml 347 BLAKE2B 22354d85541f16d8332fca9fa3ec3143b1ecee30bc1dd3d1316cfbffb52307d6ad883b33fe8da2e2761ddb48d66738e69b753cf560fb4433ceaaccb59e220af0 SHA512 81975fe0a1768f4fe7116b314d9a08ca45f08494ed7cab1d967c65e72988ebabe6ca80064eeee15292f20efa9e679015b4d74c8662b344dfb87afd2b0c879b5d
diff --git a/dev-ruby/posix-spawn/posix-spawn-0.3.15-r1.ebuild b/dev-ruby/posix-spawn/posix-spawn-0.3.15-r1.ebuild
new file mode 100644
index 000000000000..61f75a2bf234
--- /dev/null
+++ b/dev-ruby/posix-spawn/posix-spawn-0.3.15-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_EXTRADOC="README.md TODO HACKING"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/extconf.rb)
+
+inherit ruby-fakegem
+
+DESCRIPTION="Library that implements a subset of the Ruby 1.9 Process::spawn"
+HOMEPAGE="https://github.com/rtomayko/posix-spawn/"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="test"
+
+all_ruby_prepare() {
+	sed -i -e '/test_backtick_redirect/askip "Output depends on bash version"' test/test_backtick.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:.:test -e 'Dir["test/test_*.rb"].each {|f| require f}' || die
+}
diff --git a/dev-ruby/rb-gsl/Manifest b/dev-ruby/rb-gsl/Manifest
index 2b9cf1e267af..713713b7c699 100644
--- a/dev-ruby/rb-gsl/Manifest
+++ b/dev-ruby/rb-gsl/Manifest
@@ -1,4 +1,3 @@
 DIST gsl-2.1.0.2.gem 735232 BLAKE2B bb8aa488b5d3bf7c2f3facf34093c985c63bfe692933b21eb8273af38e6788691593bdcc6fd52b9e22635d1b8195f81d1302edab7c2915a19ce9574cab184d84 SHA512 c07adfb44980ca813e114db2b0917f6b2dcb7d3bbe0ccfd9561519b4e574991f3c72f3e7115218f473154690f9284bf89c968d3c6d52d29fa0a232a1160d2704
 EBUILD rb-gsl-2.1.0.2-r1.ebuild 1070 BLAKE2B c26302bca5509587645e56382e7f0a8c9eda32bd918cce1bbc6722fa9863baccca4585639689d3889c6ac89ddb56737462fa78f51619f62917e5354e8fdac720 SHA512 f27eb688c60210bf9b1253c621702a5aa38aa4827fd575067462812f342fb6624c0412fa847e44c0f407bcd35f128e77cb03edfe3cd7bc6cb6f844436710375b
-EBUILD rb-gsl-2.1.0.2.ebuild 1171 BLAKE2B a2b08e7b596f43fef39149ee3e7c9e52579c295d68a3cf5b60a38e4892699d05911d3493557a863ab616e3954da4d932752c33f65fdb6ea8bba1e792f851fbd8 SHA512 fe3c833b7b8cb0b5f34eea7f15e6872029e28112428376c0521bf46496665f6952be8ae8095a092e4f887342bdb14714c2ec8a7fc3aa40ff7f3a786c7795626f
 MISC metadata.xml 341 BLAKE2B 6cd430a7df6c2d8cfa038acc52539eb08dca80008ffcb854e297702e6559ed713f1e1b9d56a8951daf953363904f418efcb24cbbeb12e6c21688eacb1017f735 SHA512 305927b5105b248c5697315fdc36b20f2de5c5c0ed98acffd162aac781602282bc0263e41b70bce6dfc4a83adb9c1e97de93d192b173b14c5db88013638a5c5b
diff --git a/dev-ruby/rb-gsl/rb-gsl-2.1.0.2.ebuild b/dev-ruby/rb-gsl/rb-gsl-2.1.0.2.ebuild
deleted file mode 100644
index 32eee106ee39..000000000000
--- a/dev-ruby/rb-gsl/rb-gsl-2.1.0.2.ebuild
+++ /dev/null
@@ -1,47 +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_NAME="gsl"
-inherit ruby-fakegem multilib
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="ChangeLog README.md"
-
-DESCRIPTION="Ruby interface to GNU Scientific Library"
-HOMEPAGE="https://github.com/SciRuby/rb-gsl"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64"
-IUSE="doc"
-
-DEPEND+=" >=sci-libs/gsl-2.3[deprecated]"
-RDEPEND+=" >=sci-libs/gsl-2.3[deprecated]"
-
-RUBY_S="${PN}-${P}"
-
-ruby_add_bdepend "dev-ruby/narray"
-ruby_add_rdepend "dev-ruby/narray"
-
-all_ruby_prepare() {
-	sed -i -e '/LOCAL_LIBS/ s: -l: -L#{path.gsub("ext", "lib")} -l:' ext/gsl_native/extconf.rb || die
-	# nmatrix only tests
-	rm -r test/gsl/nmatrix_tests || die
-}
-
-each_ruby_configure() {
-	NARRAY=1 ${RUBY} -Cext/gsl_native extconf.rb || die
-	sed -i -e 's:-Wl,--no-undefined::' ext/gsl_native/Makefile || die
-}
-
-each_ruby_compile() {
-	NARRAY=1 emake -Cext/gsl_native V=1
-	cp ext/gsl_native/*$(get_modname) lib/ || die
-}
-
-each_ruby_test() {
-	NARRAY=1 ${RUBY} -Ilib:test:. -e 'Dir["test/**/*_test.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/rinku/Manifest b/dev-ruby/rinku/Manifest
index a5b2b7d0ed0b..cdb70af3f242 100644
--- a/dev-ruby/rinku/Manifest
+++ b/dev-ruby/rinku/Manifest
@@ -1,4 +1,3 @@
 DIST rinku-2.0.6.gem 22016 BLAKE2B 9ba678996110a219e4a5121879597f5024c5bfe475af187d9557092ac871f16528e473b41d20742847127b9c7ae665b91e5db7b9aab42dddd32e2a51f20815bb SHA512 5acb6de775e050a92c7b1040af52c5399b3fea654f7569d58aa1b5db10e4f17a2e1ae7ecc05f3753be4e18bbdf63ccd8e62d4060c0c6693981c8bab7115b2ff7
 EBUILD rinku-2.0.6-r1.ebuild 574 BLAKE2B b2e7a3aa89e0d9c64c70b14958d177a5432b6664ad507bf46080015c666c35d4110f8781023bc0ab960615a2467ffd8e2a3931c6c9d00f5e7881e0907383307b SHA512 2efc97c8eef4ec3a1457ff8466abfd48d47d349fe6b3639fa95096cf1e3d617c3ecbe66eedf07c4c3c448b29ff2d82b4a117f12a1b987fb5dc69726b813db682
-EBUILD rinku-2.0.6.ebuild 724 BLAKE2B f6e83ecd30f36718df510b266aeec779dabecab4be7c0c64b04af271bb11d31464dd2d1c8edabf41f5f42aa5fc5ee929a51be5b2db111580b822efd8ca52a3cd SHA512 41e6e1df598af779ae4fd95707988427d8d1263eb6c72790bd5e72b14ec9fc340d28370d051aabf9db6410167680704b40b0f697601476f381f0d3d99138b153
 MISC metadata.xml 336 BLAKE2B fbd4d7ea287bc4204c2c8d679890d271ef296f9aef5b503bc20a7dc233230f66223b95a8f0fe456de2d3bc0ea4859ef52522b4cddc18a08d1d9b200b223a69a7 SHA512 0315782f357c588c64d305d9979608425d91737d3054aed0bbb889eddb7bbe161d88084634e437550beb09649df3f2609dfac767596456a64edbceb35c1b892e
diff --git a/dev-ruby/rinku/rinku-2.0.6.ebuild b/dev-ruby/rinku/rinku-2.0.6.ebuild
deleted file mode 100644
index 311aafaed121..000000000000
--- a/dev-ruby/rinku/rinku-2.0.6.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.markdown"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="A Ruby library that does autolinking"
-HOMEPAGE="https://github.com/vmg/rinku"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/ s:^:#:' test/autolink_test.rb || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/${PN} extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake V=1 -Cext/${PN}
-	cp ext/${PN}/${PN}$(get_modname) lib/ || die
-}
-
-each_ruby_test() {
-	MT_NO_PLUGINS=true ${RUBY} -Ilib test/autolink_test.rb || die
-}
diff --git a/dev-ruby/ruby-filemagic/Manifest b/dev-ruby/ruby-filemagic/Manifest
index 24e4c7967e7a..6a8b2b133294 100644
--- a/dev-ruby/ruby-filemagic/Manifest
+++ b/dev-ruby/ruby-filemagic/Manifest
@@ -1,4 +1,3 @@
 DIST ruby-filemagic-0.7.2.gem 19456 BLAKE2B 5008fb27a5b6bbd93522c72381b1c74788e544e6120f3c44f4a594b360ee783d4e92e73ef584a8e56c1776a5e5e824d6fa603df135b6e1779fa460c19c3bb4a7 SHA512 b68324dfb0cd2e55cd200696fabe87c0aa68a11922789ae40abc999db7d200810cffa2c414c07bc96e2fee54aab775f01752f951b3a3273289594201ca547494
 EBUILD ruby-filemagic-0.7.2-r1.ebuild 1102 BLAKE2B 995ce43953a029b7a1fff8e567944f274d273cd80db17ff59a7e79341434295e720d395361d84d33e5cb54f114d1903b7acb3b6f67558e7fa348e5b99cdf4c13 SHA512 39f21f1ecee6988a3e20491b7e77b70b579a5dfc5921f357d77d5bfe62630e18b4ed48daccb34151efa9287bb9a3680e921727cd38ef311d516ab62a88e24061
-EBUILD ruby-filemagic-0.7.2.ebuild 1202 BLAKE2B bc0672c9dae1c52eba22bc26a703a8b1e0e3502b6d2b7a1eaf1a372123e5c905541e72838d8f08c8a8727ed67ea3ca4c6bf6032092ffcb0d593a8b71bab841ff SHA512 2c9282f328ac077e1a89f7f4ba4ca97fae213e4514deab75338baa9789b46a0a92c55d669c9c0ddc0c8dce67a9e10442464403fc0c57722a15b2d0b55ebac019
 MISC metadata.xml 343 BLAKE2B b0c693e2808144016e602ed141a51c838015d2640e2f4426fa8e35bdd412c4473f9dc8b2a866e028aa5686256563251d65b4ea07ed15b8f30795681642739fbd SHA512 0cd112a7405012ca3605c5d2e11fdea123fe1c16a34bd1fcf97a063e88e1663280d744a4cd93c2b75c1d73e3d6c4a144fa7ee915ac705615cc08838e2afe0db3
diff --git a/dev-ruby/ruby-filemagic/ruby-filemagic-0.7.2.ebuild b/dev-ruby/ruby-filemagic/ruby-filemagic-0.7.2.ebuild
deleted file mode 100644
index e2a30f471bfb..000000000000
--- a/dev-ruby/ruby-filemagic/ruby-filemagic-0.7.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="ChangeLog README TODO"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="Ruby binding to libmagic"
-HOMEPAGE="https://github.com/blackwinter/ruby-filemagic"
-
-LICENSE="Ruby"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE=""
-
-DEPEND="${DEPEND} sys-apps/file test? ( >=sys-apps/file-5.30 )"
-RDEPEND="${RDEPEND} sys-apps/file"
-
-all_ruby_prepare() {
-	# Fix up tests for newer sys-apps/file definitions
-	sed -i -e '/test_abbrev_mime_type/,/^  end/ s/ms-office/ms-excel/' test/filemagic_test.rb || die
-
-	# Fix up broken test symlink and regenerate compiled magic file
-	pushd test || die
-	rm -f pylink && ln -s pyfile pylink || die
-	file -C -m perl || die
-	popd || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/filemagic extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake V=1 -Cext/filemagic
-	mv ext/filemagic/ruby_filemagic$(get_modname) lib/filemagic/ || die
-}
-
-each_ruby_test() {
-	find test
-	${RUBY} -Ctest -I../lib filemagic_test.rb || die
-}
diff --git a/dev-ruby/ruby-odbc/Manifest b/dev-ruby/ruby-odbc/Manifest
index 1c67c1bb9dbc..9971a13d93cb 100644
--- a/dev-ruby/ruby-odbc/Manifest
+++ b/dev-ruby/ruby-odbc/Manifest
@@ -1,5 +1,6 @@
 DIST ruby-odbc-0.99999.tar.gz 76934 BLAKE2B 59de5a544b7eefe8e181f2c6a9a61915361743ef5f7554f778667b50ca0dc57fd0c4f71e406ad6f1d00fb2c6a6509030e61ad34dddecff61896f7bfe383d0a9b SHA512 05e3e67a895406e1a57fbea6f8ecd1c087d836794ea3245bd9eec888eb3c46fa2bf2607cc1b8fdc416d7bc531d783d621c03c9fde004db8c2e431fe838c531af
 DIST ruby-odbc-0.999991.tar.gz 77110 BLAKE2B dd32698811f14e05f1190ffd73b390fa02924a1dd936db0b2b3c6ac9d8d8663f5d400ff89e03591081b45d558378a76701cf6b8be8502297a141c271dde3c24b SHA512 3f1e2e75e31f10f47392cda1cd28aa54451a499c3bd6e9224466a7b338406835a5d453600e79a3bac040197397c31d9f744567969058969685d6f4e06e72addb
 EBUILD ruby-odbc-0.99999.ebuild 1442 BLAKE2B 53b660e6b9f1af6b1fffd893527f541839f9d16c63e69bb5be7f001dea79f63e2f3a46145ec45336a64b6625bb48fe79704320f63d31071a1166cd92e2982449 SHA512 b0d087a0302422c8615faf5debdf97e847a76e1ae776353262e161a88db9dece320194fe400fcc03fccf58604ddc39c4047efb2440189ab319ed81b9c8f286c5
+EBUILD ruby-odbc-0.999991-r1.ebuild 1166 BLAKE2B aa7542d28ffc5f853f99a5e2d9b28ab602a8e9d0685de90edd27cd931d199a1992ca7fa4bc35cafe297c266b3798eea90195ecf52213695a8342f5a588b158fc SHA512 d36008a031a5a6f1063b6af81ce6003a0cc4e06acb852badac88ce136d02aa1dad3fdea8de3e8be06538db8ae443a304f8131c554543918693e409863125098f
 EBUILD ruby-odbc-0.999991.ebuild 1487 BLAKE2B 91f09f5a6ad22e7693755696d7358dbe6caefcc21e873306381949a4e2a7b035070566cac95f0771e51f3ded49e276a7ea1dc322692b1eac980c875217916f41 SHA512 2f11586108acbcc94d48ada8613ce93585f16ee7e10fdd89a587f5d0b5aa5fc2ff8e485d22be8443a342f44c6147a108c1c80cb6e8569569fd74ff2d7ecb7c46
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
diff --git a/dev-ruby/ruby-odbc/ruby-odbc-0.999991-r1.ebuild b/dev-ruby/ruby-odbc/ruby-odbc-0.999991-r1.ebuild
new file mode 100644
index 000000000000..2b0b870af052
--- /dev/null
+++ b/dev-ruby/ruby-odbc/ruby-odbc-0.999991-r1.ebuild
@@ -0,0 +1,46 @@
+# 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=""
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README ChangeLog"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/extconf.rb ext/utf8/extconf.rb)
+
+RUBY_FAKEGEM_GEMSPEC="ruby-odbc.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="RubyODBC - For accessing ODBC data sources from the Ruby language"
+HOMEPAGE="http://www.ch-werner.de/rubyodbc/"
+SRC_URI="http://www.ch-werner.de/rubyodbc/${P}.tar.gz"
+
+LICENSE="|| ( GPL-2 Ruby )"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="${DEPEND} >=dev-db/unixODBC-2.0.6"
+RDEPEND="${RDEPEND} >=dev-db/unixODBC-2.0.6"
+
+# tests require to have an ODBC service enabled, so we can't run them
+# for now :(
+RESTRICT=test
+
+all_ruby_prepare() {
+	# Make sure that it doesn't try to use the absolute-local path for
+	# the extension as we'd be unable to run it properly otherwise.
+	sed -i -e 's:\./odbc:odbc:' test/{,utf8/}test.rb || die
+
+	# Since lib should not get installed avoid it entirely…
+	mv lib contrib || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+	dodoc doc/*.html
+}
diff --git a/dev-ruby/ruby-prof/Manifest b/dev-ruby/ruby-prof/Manifest
index a549cb325575..cab91b02e61d 100644
--- a/dev-ruby/ruby-prof/Manifest
+++ b/dev-ruby/ruby-prof/Manifest
@@ -1,5 +1,3 @@
-DIST ruby-prof-1.4.2.tgz 90386 BLAKE2B 55263f6cd24b18112a917c2b03a57ca91619419244f79b2b06f6d6794f76d9411d4e1b39dbb2e4b7e2ca6cc03b244f529f4b56fec54ef5fda18853ec2ef05fb4 SHA512 e75a8898533dd2ce9098fcf940883e3cbeaeaecdaebe3592ee67321feb4e294e25bdf14ce6cac50fb6d582cd55d33f175929a1d5446a21b74eb86c468e779fc3
 DIST ruby-prof-1.4.3.tgz 232032 BLAKE2B 68df149718869afac89b2240263cd3dd48c28b592f32cd7bc8a918b67de7a10abc3a1af04cb00eeaec9e6f7292e5258d22ba8bec0243361289add943535ffe39 SHA512 fd19d97b88b52c07331bf885c69215267eccb3a0519eb3bb6cd6e5907af55ebbace32f3bdef5b1f340bc3c4779666d7f4100878e647fdfde4da3a4df2a946ebe
-EBUILD ruby-prof-1.4.2.ebuild 1336 BLAKE2B 244a6ec8cf01fd2726f6c7b5d6f0bbf379b63aae51b576bee68d7bfaf753bbb2070425c5640550f4be27041207305be0a544efbedb90b7bb7b194dae21daa77c SHA512 4367d812a86f884fb2822d1f140746b8773f67cc7ba8f4863edd605a9ec90d454e1849074f36fd09fc8484d90beff228785c9a04670d2784e15dc41abb9114b5
 EBUILD ruby-prof-1.4.3.ebuild 1143 BLAKE2B 9237d1ef512057ab6f3bdc569de1f414644bf13d379c26cab84cea50a22f6d4a17ae84e6ae19bf4ddd15268a40a92c88a6b77271cbaeeb775c22be5982e6e43c SHA512 1fb62f262b0f07043a8364e7adf851f7309dbd04b855d62d4bbb7a6742d9e116fd4851e635e1f7abd63fa6a1a902ec7738ac61dfef33405a5b2a1b28dac343a2
 MISC metadata.xml 346 BLAKE2B 245dc508fb9933ff6a69b4e7c8a516ac9bb237798680ae70a8fbaeb57481520760f5a17a62cb045f82a955e0fc882fd84fb60d17b68bec1180b386355ca6b6fd SHA512 2cb1d6e31ac399f7faceccfd9dcc5e1a1e29bc10596ba3e0b3960ecc2bc215b21d351611e3ab6bfe7451fcee3bd4880a229b8266b7c8f6321bc79bdd5109b5d9
diff --git a/dev-ruby/ruby-prof/ruby-prof-1.4.2.ebuild b/dev-ruby/ruby-prof/ruby-prof-1.4.2.ebuild
deleted file mode 100644
index 716e4bf8ce7a..000000000000
--- a/dev-ruby/ruby-prof/ruby-prof-1.4.2.ebuild
+++ /dev/null
@@ -1,51 +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.rdoc CHANGES"
-RUBY_FAKEGEM_DOCDIR="doc"
-
-RUBY_FAKEGEM_GEMSPEC="ruby-prof.gemspec"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="A module for profiling Ruby code"
-HOMEPAGE="https://github.com/ruby-prof/ruby-prof"
-SRC_URI="https://github.com/ruby-prof/${PN}/archive/${PV}.tar.gz -> ${P}.tgz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/test-unit:2 dev-ruby/minitest )"
-
-all_ruby_prepare() {
-	# Avoid bundler
-	sed -i -e '/bundler/I s:^:#:' -e '/:build/ s:^:#:' Rakefile || die
-
-	sed -i -e '2igem "test-unit"' -e '/bundler/ s:^:#:' test/test_helper.rb || die
-
-	# We install the shared object in lib, not ext.
-	sed -i -e 's#../ext/ruby_prof#../lib/ruby_prof#' lib/ruby-prof.rb || die
-
-	# Avoid unneeded dependency on rake-compiler
-	sed -i -e '/extensiontask/ s:^:#:' \
-		-e '/ExtensionTask/,/end/ s:^:#:' Rakefile || die
-
-	# Create directory required for the test suite to pass
-	mkdir tmp || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/ruby_prof extconf.rb || die "extconf.rb failed"
-}
-
-each_ruby_compile() {
-	emake V=1 -Cext/ruby_prof
-
-	cp ext/ruby_prof/*$(get_modname) lib/ || die "copy of extension failed"
-}
diff --git a/dev-ruby/ruby-shadow/Manifest b/dev-ruby/ruby-shadow/Manifest
index f355ae67f07f..ee1a5b097ec9 100644
--- a/dev-ruby/ruby-shadow/Manifest
+++ b/dev-ruby/ruby-shadow/Manifest
@@ -1,3 +1,4 @@
 DIST ruby-shadow-2.5.0.gem 11264 BLAKE2B 22012d4672528e76a860e534fecb2a40d27c15f7440a0be6880c4ffd06be26e58d2f5279c385c49aca611864c8959ed0ea3afdd78bcdb28ac0912123f18a35e0 SHA512 1abd54df1bd4f29e135093df9b22886a726824f8b72b742017fd31bdc3fa39e3d79410a747cf2ebe4117f75e665fb89c904375b5c44a674bec91a4cc37646520
+EBUILD ruby-shadow-2.5.0-r1.ebuild 496 BLAKE2B ed3182f8b32bd679427d4be230049df01b5deba79e6732092a20b9f6bd7eed90d03376421301dfd0adc95328316c14a70d8b2beafb766492045de2f064eb116d SHA512 990efe6f5f83b46d6054a6d42e20bfbd234e10d4d9ce13722444adeec15437129cbcb2d01525362c3c0d460760f343a2d66b1f6ff7ada1d975be7da6f1b84058
 EBUILD ruby-shadow-2.5.0.ebuild 698 BLAKE2B 238398a76564347c07b42ea1f6f94333b9bd9381f347d7b4704bad77ebc339110496f298342888f41b0c83e6c4bc235978070a1cbd26e9af8d172ffe3929d2b0 SHA512 b6f7a84ef175841725f28804bcf9ce8943565a72d2c0f932865a636934100f5b1d68feadf495e2bbdfe5ae956fffda4ef884ba13822e472d8215be934ce185b6
 MISC metadata.xml 348 BLAKE2B ea93f8284e10399b71c36f731411b2dd8dc21062add09b74199b8a0007270591e98f7a57c388cd54296cf2d34f450674336ee112c204ea476c401cc094b14ae2 SHA512 753e086ad25985267e80210e6bea514257e8b8c339b67aaafd1f6b444e4218aa72d7c176b2faf41cda705f1c6ce8ff162ed40c497092e65882c0790d690e9956
diff --git a/dev-ruby/ruby-shadow/ruby-shadow-2.5.0-r1.ebuild b/dev-ruby/ruby-shadow/ruby-shadow-2.5.0-r1.ebuild
new file mode 100644
index 000000000000..179836a41b19
--- /dev/null
+++ b/dev-ruby/ruby-shadow/ruby-shadow-2.5.0-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ruby30: does not compile
+USE_RUBY="ruby26 ruby27"
+
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_EXTRADOC="HISTORY README README.euc"
+
+RUBY_FAKEGEM_EXTENSIONS=(./extconf.rb)
+
+inherit ruby-fakegem
+
+DESCRIPTION="ruby shadow bindings"
+HOMEPAGE="https://github.com/apalmblad/ruby-shadow http://ttsky.net"
+
+LICENSE="Ruby"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
diff --git a/dev-ruby/sassc/Manifest b/dev-ruby/sassc/Manifest
index 2d3d74fca354..1ac8650f5f93 100644
--- a/dev-ruby/sassc/Manifest
+++ b/dev-ruby/sassc/Manifest
@@ -1,3 +1,3 @@
 DIST sassc-2.4.0.gem 304640 BLAKE2B a4cd96859855cfd26e78a35becba30af8b7ee52d8ba67f7dcbc6354786f26e60a312be4e773f515f6edda6623142249a4a470f418d9fae3db734f8ae11498dc8 SHA512 835ba03d0fc5a791b2d620367f63202973f778bd8ebaa87c27f6a1de75b5895270205e8746fbb242d2739c9830a27d72453a75c1b536090840de581c52caade6
-EBUILD sassc-2.4.0.ebuild 1070 BLAKE2B 13be0bc5b8c721ed3960643e3d43449a85d893eaaed3e417c75ee7b6ef2d39659b485714a990f57826dd2598dfc091c286a8f4277a64a3c817504415afc906ce SHA512 18c7a919303b1ca02d50d1b7cb54314a6e7e3a52f95f48dbd9184e95ff2a0f5408a83b3668b8a18326512688993e1e9fa159361ee85d4d179d6dd71728097d69
+EBUILD sassc-2.4.0.ebuild 1076 BLAKE2B e1ce2b19ec073dba68e92b031ecef41a5708eb242a083ac1a508c29c7c6f99e3d01a3524cce4a8c5125d717d62307324a84f1fb6c3f96665ba83c23bf9005a1f SHA512 0c92f32f225c9812b06d09781948851df5616c4bd6f8ea01abb70f31071f94395e57b20128981ca8b9cf32336e2f67dfb3f2004f3de5fda8ad33bcdd46bb0331
 MISC metadata.xml 342 BLAKE2B e142db9aa3fbeca45133f091bff39a3452a51917779f21f78928295cd69bed7e12fb68de1e1d432d5765fe1560b5841a6c12be62487375b206170052c8aacd2e SHA512 39e8f3ff146ac9ee2b06246a6277b9abf3b5466dde0820ffe309f0303923310610dced252f33ed5ac342bea64f8bc3941d71d5d57b7c36bd8d302f415b32e10d
diff --git a/dev-ruby/sassc/sassc-2.4.0.ebuild b/dev-ruby/sassc/sassc-2.4.0.ebuild
index 0ab3fe4130e3..b105bc7e71b1 100644
--- a/dev-ruby/sassc/sassc-2.4.0.ebuild
+++ b/dev-ruby/sassc/sassc-2.4.0.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Use libsass with Ruby"
 HOMEPAGE="https://github.com/sass/sassc-ruby"
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
 SLOT="2"
 IUSE=""
 
diff --git a/dev-ruby/serialport/Manifest b/dev-ruby/serialport/Manifest
index 2b392169ef6f..af008b850441 100644
--- a/dev-ruby/serialport/Manifest
+++ b/dev-ruby/serialport/Manifest
@@ -1,5 +1,5 @@
 DIST serialport-1.3.1.gem 25088 BLAKE2B 391188ff8a78f3998c82b17668a1aebad737643739c8087c4f32ce719dbf7bbf5f29cdc0717ab16f196020a227afc4fcfc29409331b2aabf5c6bf3382ef3496b SHA512 cdce9e13065cecf6d090d716626abb399bcc2a079be7bf1fe7755a20360218550f2f31980d62d8aae1fcc62fc62d6f7549685f865e30d2a5f40a617f5f197ed9
 DIST serialport-1.3.2.gem 25088 BLAKE2B 035e7bdb8ef321fb67ec63283c0e4c8fbf8f909ea3495994716b95cc55f212561a09a87352aed67290d96b54bb26b7802e5ed37c27e67291d768d7eb6d30850e SHA512 ff78fa04183108c2e9c5eb4f0caa9f8072a693a2a120ca084476b4125ca32ec67a6fb268bedda3ca142a9a397dbc585dffaab88f339fccc12e5ad03a09d4c28c
 EBUILD serialport-1.3.1.ebuild 992 BLAKE2B 15d5890577655e93615c40d4552c8a4b66b28ec4a9cf48e02629d43e6baf0d5ad85da3108bb82989796dba27b741a373b5957526ad1504e97afac499cbd3cc47 SHA512 7f8f3868b2be64d531a596acfc0ef4f6e22bf2449d03d74680eec2ef906bb4bbf146907a1592c21065658e7738e11e74ff4dd25bd752630ec44ed30294ae3031
-EBUILD serialport-1.3.2.ebuild 756 BLAKE2B 57e11b0448a65b61a4e6a447cf7bae674a510e9f7d452b3678224db5654ba0025464545da102e09deb4fd195b2a739e291d030a0b6363da0b08acee82f1d1b63 SHA512 a715755e77fbd02e74bac416c9ed008eb3e8684b4a5b9a0cc7be62f96c58806575778a9c77e8d9d9295f8bb9763d830b33bab999991bba2602060619f9e90eef
+EBUILD serialport-1.3.2.ebuild 754 BLAKE2B 3c8697c1f66a100173f63ecfed33caa2771b2211cf3fdf79487be0dc5849ee7016830e39478d65f14d60ea40831a1561b6e523adfaa5b45670fbeb65151ee61a SHA512 02e0dc07ed2039e61eab0c89b26ab5e9e955d67d216e0756dfee47e1214ee33f0c95457d5a63c65e0db62d809ed0977af87c901104049a2be3ccf2933d173907
 MISC metadata.xml 252 BLAKE2B 77e9556ac1d210367a95f4c47816618b685c707cf01d1543d988338e14794fb9ccfb9976ebd11f389db618616d91ee024d8e46dc3a1a356ba7a017a7796b44d1 SHA512 0a970a16d73747993198dd301a3127cef7e65a9f46816b40ca149669ba617826c1d81bac1e5ecf93d16079922964923d37301cd8160f22c823c1ec3b79ee56f1
diff --git a/dev-ruby/serialport/serialport-1.3.2.ebuild b/dev-ruby/serialport/serialport-1.3.2.ebuild
index 49a58625d129..994ac57e0394 100644
--- a/dev-ruby/serialport/serialport-1.3.2.ebuild
+++ b/dev-ruby/serialport/serialport-1.3.2.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/hparra/ruby-serialport/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/sigar/Manifest b/dev-ruby/sigar/Manifest
index cc0fcaebd0a9..017226b4097c 100644
--- a/dev-ruby/sigar/Manifest
+++ b/dev-ruby/sigar/Manifest
@@ -1,3 +1,4 @@
 DIST sigar-0.7.3.gem 205312 BLAKE2B 1a1d526e2f60a4a91ef405bbb7bf6aede2d4707631108f2779dfd1533d345b9e2c1fb586aa748d13ff1f7cb0b228e34618a0e8d549a3b4b4dc44a37684f2e970 SHA512 cdab3ec8b9662bfa3a432f0206c34c99c6e6e0ac5c85a93cb472367a9f325a27d5232bf2166f5c2955817e3ab8bd1035db06aad709ce20cc261f1b15d89dea2a
+EBUILD sigar-0.7.3-r1.ebuild 822 BLAKE2B 702274ba625c0913a9e5ae815f1d56bd2438c65587950503a28cef8218160875c0a93ef57494c3c74a25f5a2ffe5d9d535f6a58d9b198437037d5a45c016ebac SHA512 003b5efded664a31e4e1835413eb030baad72f45d187cad9d5c83d62728d8866c383acd11a40e18d8deba1225591ae0530a5357639d3b96eb17bf0ca06f24d29
 EBUILD sigar-0.7.3.ebuild 993 BLAKE2B c135dfc391c90939323887208e71ae9e3029021fa67e73753168adec220b8a347083eeb420a7280bd6182b5992932e722c1a1a0d0db7ec201d724360cc3cd8db SHA512 eaa67bd40ae3e2e409a05ad2e9cea770d20cc3252f02d958ec1ee801be6fadcfc00f2ef0dbd92c84ffe4631687d54fbaac4b725281961884acc9374239d1491a
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
diff --git a/dev-ruby/sigar/sigar-0.7.3-r1.ebuild b/dev-ruby/sigar/sigar-0.7.3-r1.ebuild
new file mode 100644
index 000000000000..887ece679573
--- /dev/null
+++ b/dev-ruby/sigar/sigar-0.7.3-r1.ebuild
@@ -0,0 +1,30 @@
+# 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=""
+RUBY_FAKEGEM_EXTRADOC="README"
+RUBY_FAKEGEM_EXTENSIONS=(bindings/ruby/extconf.rb)
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="System Information Gatherer And Reporter"
+HOMEPAGE="http://sigar.hyperic.com/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND+=" || ( <sys-libs/glibc-2.26 net-libs/libtirpc )"
+
+all_ruby_prepare() {
+	sed -i -e '25i$CFLAGS += " -std=gnu89 -I/usr/include/tirpc"' \
+		-e '25i$LDFLAGS += " -ltirpc"' bindings/ruby/extconf.rb || die
+
+	# Fix compatibility with glibc 2.25
+	sed -i -e '26i#include <sys/sysmacros.h>' \
+		-e '27i#include <ctype.h>' bindings/ruby/rbsigar.c src/os/linux/linux_sigar.c || die
+}
diff --git a/dev-ruby/test_construct/Manifest b/dev-ruby/test_construct/Manifest
index b1dc3861a042..9a9c63b26f1c 100644
--- a/dev-ruby/test_construct/Manifest
+++ b/dev-ruby/test_construct/Manifest
@@ -1,3 +1,3 @@
 DIST test_construct-2.0.2.gem 13312 BLAKE2B e1a5068e8133f739dfc407e943b0486c0c2bb2a8f18943a23b366205b206a56b792630daad7a92a021ea367d490b117aec1313faa0e5360bf6b984df3b82c16c SHA512 d73e2daf5c5974c79aedfcd7e1cd6681a3f1f6fe3f2c68bcde26690a18be920ea53b648407e4ee33444364b2a02f1517362c876e703abad02fc528a47de092ff
-EBUILD test_construct-2.0.2.ebuild 617 BLAKE2B c40506223f60e3520f0fe6591a48bc17f7eb0a115961602b3dd391096ef1ea5db55ad576adb3677dfff5dce4fb1f03bdb1d98f191444b334088cf836fce03afc SHA512 9fb95a514dda8229decf92ca74577a191a6579d87e94b0e709295fd504ec76a5b5ac80a4836871fa1eaa5045d7fb76cef099f6dc42283195bf79756495df8c2f
+EBUILD test_construct-2.0.2.ebuild 623 BLAKE2B c2819dc9bfd590533df56e0d9b2b92754e003cbbb79c71c934eaf89c52f92848ab872ffe6d3b708d065f484a92da8b3cde9db7f82a9b4fe1334e4d23bbe44fe9 SHA512 c3b2dca7ecbecd3fd12aa5a4838892e8685c5012e0dc4e8f225998f4c59dff6c4504f34f47c0b8897c5a3d592448f950f4157ee955c177555892854aeebe1bcb
 MISC metadata.xml 345 BLAKE2B 3a2ff96a2f7474b98c3ccf65f06c38925248cf2ac769468e1d861a5c13379d35cb562cb5f55e1018bf11aff8bc2dfae94cb4c19461384f9e7cbcab06f7a37589 SHA512 d10509328b3445fc3eb9713c4f527365cc5491f8ec8415662a8fdf06a93049bccd63ab9da13512e7573fb25e3e9497f13969faaf0734cc01cd4ce1fc574c73b3
diff --git a/dev-ruby/test_construct/test_construct-2.0.2.ebuild b/dev-ruby/test_construct/test_construct-2.0.2.ebuild
index ab64f8376d38..95eb2e7918b8 100644
--- a/dev-ruby/test_construct/test_construct-2.0.2.ebuild
+++ b/dev-ruby/test_construct/test_construct-2.0.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/bhb/test_construct"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
 IUSE=""
 
 ruby_add_bdepend "test? (
diff --git a/dev-ruby/tokyocabinet/Manifest b/dev-ruby/tokyocabinet/Manifest
index 0e823847a104..db012d02dfbe 100644
--- a/dev-ruby/tokyocabinet/Manifest
+++ b/dev-ruby/tokyocabinet/Manifest
@@ -1,3 +1,4 @@
 DIST tokyocabinet-1.32.0.gem 18944 BLAKE2B d55ebba43bfb904dfe2b18bc0c22e92b30ced4cdbda8025f7e4d9088da03a2c8486f210473bd05be13fa8d8448830a8f11fc9dc9c34b9803514fd8fc5cce984c SHA512 274a72e166bfb776b66379f587a141c8d0407dec7aa17bcd2e1ce2a401784f52433e72bc356140f69dcca651351edb22d5c9da6fec09b1b1fcfd53cb5af666f3
+EBUILD tokyocabinet-1.32.0-r1.ebuild 445 BLAKE2B 0dde7443c2f5e3e6267e011aeb087110d817a4105a573fc8a8520ddc10a6ade1eac19c9bdb9ee82b4a534f0d4b9db84277c07b9758b9e2e594e069a54ef2a462 SHA512 604dcdb05cdbf76efc34b062164b3da70b115e83f5934614eac38ffc71884cee6e8814f8cd8e58649165fed52d0ac3adc035898be1cf9ccf9772a6165e2a3ad6
 EBUILD tokyocabinet-1.32.0.ebuild 580 BLAKE2B c43caab9fa42cab9ed885d237221747deee82aa13c59aaee8d28d2e338d2e833b1daf0d5c81818f8530aabd272e718bcc068321614fc8de6294b3b6ff8f4078d SHA512 36a1ed6f99439c68dd35b754ae6d1c46320db0ceb62a8ab01a537aa0de78416bd7e4c9cb2cc8c138f36b8e0871145ee7ea22c2d94235c03b7a136b1dd83377fd
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
diff --git a/dev-ruby/tokyocabinet/tokyocabinet-1.32.0-r1.ebuild b/dev-ruby/tokyocabinet/tokyocabinet-1.32.0-r1.ebuild
new file mode 100644
index 000000000000..f005a20e2b57
--- /dev/null
+++ b/dev-ruby/tokyocabinet/tokyocabinet-1.32.0-r1.ebuild
@@ -0,0 +1,23 @@
+# 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_TASK_TEST=""
+
+RUBY_FAKEGEM_EXTENSIONS=(./extconf.rb)
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby bindings for Tokyo Cabinet"
+HOMEPAGE="https://fallabs.com/tokyocabinet/"
+LICENSE="GPL-2"
+
+KEYWORDS="~amd64 ~ppc ~x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND+="dev-db/tokyocabinet"
author	V3n3RiX <venerix@koprulu.sector>	2021-11-03 06:47:15 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2021-11-03 06:47:15 +0000
commit	fc2f1018fc323ef2c6572734a9b130427cba76a6 (patch)
tree	f834bdc9a67923ce75297c09d00d1e7b90791d26 /dev-ruby
parent	162945d2a91899b637bbb9e163b406350de12906 (diff)