gentoo resync : 03.11.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-11-03 16:06:58 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-11-03 16:06:58 +0000
commit: bd4aeefe33e63f613512604e47bfca7b2187697d (patch)
tree: adb35b5a9a00ee7ea591ab0c987f70167c23b597 /dev-ruby
parent: 48ece6662cbd443015f5a57ae6d8cbdbd69ef37c (diff)
182 files changed, 1252 insertions, 1892 deletions
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 63b7a8a765b9..b57d60e2ae4a 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/acme-client/Manifest b/dev-ruby/acme-client/Manifest
index 4e667864907c..b39d304c035a 100644
--- a/dev-ruby/acme-client/Manifest
+++ b/dev-ruby/acme-client/Manifest
@@ -1,7 +1,9 @@
 DIST acme-client-2.0.2.gem 19968 BLAKE2B 7a877d86ac4828fec08edd606b2f4f31788454ebe8109b1e94d28f33d00b0a3e49aa7ad8d3b46fa2440bcd1d7cda1c53ab91d6be6280dfeb0e5ccddcac02ed25 SHA512 e02fe9f919f8d5356bc60d0b6f2d05db42e5d6671762bfac45aafb118647e2d0b50cd7336dfa1f0983432e2bddb0344d1b240bd674e31ad14385adc15d58e1e1
 DIST acme-client-2.0.3.tar.gz 203320 BLAKE2B f5bc600c58b29429b8615b0d8cdadade9a4c7018068c356cfd481eee8b7718c19e736c620a752ef1a68ae70e8f641f3fb2ef7bcd44b70ac63cc97bad19ab3579 SHA512 c2b2bcba1cfe9184922cdfaafd02bdb51abf11cb39457e89f0670098bf9d240332129144fd4a7fcbc214a1496dbde576236ea15634b70f8f3fe22304d769f0c2
 DIST acme-client-2.0.4.tar.gz 206295 BLAKE2B 5758a940e91036de04183ace9d076649cce220e18c92abbbf683026fd4fc1d05b3d2c735553648daac0f57f5e4c5c865679607d38f663af7623bd60fac99eff1 SHA512 3e8998ddedc69c6d2a15927be278ef055d1be0fe906c499504ecba811189e5ebbd9c1f54df8692bc0135766dfc8cfbd80f27ee345eab8bcd0126fac62be33742
+DIST acme-client-2.0.5.tar.gz 162456 BLAKE2B e01ffd790f404e0ac7a5fe42ef6d4819387dc810bb5c6856e51810b125f5020c3790003eb99e9560ab1618d7d3a420b63e4c1de9cc98e97a4a742ade6bfde54f SHA512 f2f59f2536a5de918147c3b26285c9498eaf082f67d8e3c96036b61a05e3c265a37d7e23f91c03ef7a02ca99bcfec755bc0a9e2bf766ee7b6ffaae1ad1b7c4ab
 EBUILD acme-client-2.0.2.ebuild 481 BLAKE2B 0c020887aa03ed71174f1cdf8ebc8d3867984cb40e6dfef6962d92f9345babbb0718ed0c8566aca7f423df8af4a3c963ec894f550817bee73f33516ee4466a1a SHA512 5688074abb247833350b8d966fd05956ce8a4e1337047dc08806d4ccafe5c90ba26fc9da107c04ca82e5984e8842fe669150aa3436956db09bfc4b8de0306543
 EBUILD acme-client-2.0.3.ebuild 842 BLAKE2B 3442fb202735a83a8b04d9486b08ff806f7a8af5aaa2a99a8a81bc942df04bf8c1819f2f42922a69c74b460008c608e53d2641588b1780495a84f6c9af00680e SHA512 1a6bde736be125430aa621474023fd01497d18a4adfe6c1cecfb6175f06121eac34acd1528c208f88cfcd6d076293717cdf3f8ed412f76ebededc24f6d3113f7
 EBUILD acme-client-2.0.4.ebuild 961 BLAKE2B 28f1105c3dac42d7685b06b1f2be9f3df32e6d1c1f870e42127ed05424b5ba21c5d3733c59096c80d70a8be272900dbad72439afc842ec3587b670a2a35bbfd2 SHA512 4f22950365f0af89a798eaacef9abf4861390f149c93597979e1ec3ca5fd103ab2a36d0c958dc86815fb2d350c3a5f557590d6f9adebe553c4d373364503e6a9
+EBUILD acme-client-2.0.5.ebuild 961 BLAKE2B 28f1105c3dac42d7685b06b1f2be9f3df32e6d1c1f870e42127ed05424b5ba21c5d3733c59096c80d70a8be272900dbad72439afc842ec3587b670a2a35bbfd2 SHA512 4f22950365f0af89a798eaacef9abf4861390f149c93597979e1ec3ca5fd103ab2a36d0c958dc86815fb2d350c3a5f557590d6f9adebe553c4d373364503e6a9
 MISC metadata.xml 542 BLAKE2B 2902d90ca553bacbcbe63ab667666b71bf156426583e91296742628aab47628205c2af8e9310795d573e894ac01ea9d178f70c45a962a8448031b1dc69c7860d SHA512 b8da5f9492916504fde0846a7eb3c2480b101f2ab419120c840a831b5180f88e2745350a729d0388acb5767b94e586ec5475674bae6805dc48811d92287eea0b
diff --git a/dev-ruby/acme-client/acme-client-2.0.5.ebuild b/dev-ruby/acme-client/acme-client-2.0.5.ebuild
new file mode 100644
index 000000000000..24a1c78f83c9
--- /dev/null
+++ b/dev-ruby/acme-client/acme-client-2.0.5.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_GEMSPEC="acme-client.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Ruby client for the letsencrypt's ACME protocol."
+HOMEPAGE="https://github.com/unixcharles/acme-client"
+SRC_URI="https://github.com/unixcharles/acme-client/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/faraday-0.9.1:0"
+
+ruby_add_bdepend "test? (
+	>=dev-ruby/vcr-2.9.3
+	dev-ruby/webmock
+)"
+
+all_ruby_prepare() {
+	# Skip failing test where incorrect der value is retrieved, may be openssl 1.1.x related.
+	sed -i -e '/assigns the public key/apending' spec/certificate_request_spec.rb || die
+
+	# Avoid dependency on git
+	sed -i -e 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/airbrussh/Manifest b/dev-ruby/airbrussh/Manifest
index a4e087b0505a..099280edec39 100644
--- a/dev-ruby/airbrussh/Manifest
+++ b/dev-ruby/airbrussh/Manifest
@@ -1,7 +1,7 @@
-DIST airbrussh-1.3.2.tar.gz 1451710 BLAKE2B d2b3f8cc07a13e82e7d8e74c9e3a9ed9837b042350f85da21f8c51b2b766c629f9129bed18d4664e5833d70b2f0d9e0d1703be30350c265377df7ff4b25bc7b4 SHA512 e5ee119d8994f7c23ac0ef553e247c5d5041e2e5fd2c552385c5b4fe42e4aa671460a364fe926225fa447822010380ae6af90b3bd17f73e7f5cf9c7576711331
 DIST airbrussh-1.3.3.tar.gz 1449872 BLAKE2B b5c19a61bb16d3b4c7379929894c3f58e0e0758ec79b590cae1eab1d8478195ce4959f9e2e026cdfd6a307ba006de54cd5982593f5041cdf0d03d47911619cda SHA512 e4f8a02f000ef26be4a121b16d8ab421c8f0de198e5407980116d1b5f0caa83a214112ec8b3bda00b09d72872f8b5d95a3207a3a157d7eda8fbc456a224a4796
 DIST airbrussh-1.3.4.tar.gz 1449949 BLAKE2B 26b7a408e5453554ff422d4da2f53a3fddc6f68ab652673445db24fa53ef52f0b8293d1701406a63d6b6323e5219c9cbc9880879e58e394b2a912b9a1dc22cce SHA512 8fbca27a115b5bc5e87ffaf3a0e91aabdf3e64b22b7192b5e6a38efe862a7ad6720447241eb85dc20a459f07054c298e8f71fcd80a1d461375a4136fab4db409
-EBUILD airbrussh-1.3.2.ebuild 777 BLAKE2B 5dd734a5cce7cf8383b107b92052cffbbada6c482f559113f50b290c0116f17811baccf95b7d00c4e1ceadf761c79a90b7ba9f9e6c6e804b23dcf9035a9505a8 SHA512 103addf008e005cf4c413f87a80261275bbdd2a8719651318efbf21fcf7525f6f8f6e852c8e5b36b23efa115c49958e0815611c14cef3484a43a9e5ced979154
+DIST airbrussh-1.4.0.tar.gz 1450070 BLAKE2B 94f128cd25c5af48f17fa771c366d3cdf744dc4e7ccef23de583b1ed60ffe1640dd7d02d76fb78573936beb3412c277151b36a870ac3e11222c3135f34b0e140 SHA512 e3a5cb80365a963875e89d15fa2b4dc86985d6b5f13ecfa9baf9ad599b5780ef8ea2c2e4040bb35498a5ecd1c6becb081b3e917cfe082d2db63fd74ba54755b7
 EBUILD airbrussh-1.3.3.ebuild 865 BLAKE2B b482c6bec1ddaea50248784bd3da92831816233e84543e3c631a56b6417a5bf44d0fb3c1b71ec2d0615cc1ac43123bf8655d292068b003e088638ebb04d350ed SHA512 06df970320d26526272c06fdddb482eac2639bdc21c15c1922054f8e5580f5fbe955ff7dc03f2c913af66a5b3be26a4bdbd0e7cc53e47e0d8caee6a160e4c61b
 EBUILD airbrussh-1.3.4.ebuild 866 BLAKE2B 93549bd8ed892df49a1c1226810d06fcdd33598a2bbc1588c709873a68e22fb7cea951a034d4a47cfe8420058e2edefcb50a1e94ad4539a8f7c89e68a3dc0b60 SHA512 38a711f2db641d52727cdf888191c74fe11d6ba11004ce7470b607e7fa9bfcd4928fc107fbd30fb5229456aeabe61423e5e9e265c2f6ede72e39a471357a3c6d
+EBUILD airbrussh-1.4.0.ebuild 866 BLAKE2B 93549bd8ed892df49a1c1226810d06fcdd33598a2bbc1588c709873a68e22fb7cea951a034d4a47cfe8420058e2edefcb50a1e94ad4539a8f7c89e68a3dc0b60 SHA512 38a711f2db641d52727cdf888191c74fe11d6ba11004ce7470b607e7fa9bfcd4928fc107fbd30fb5229456aeabe61423e5e9e265c2f6ede72e39a471357a3c6d
 MISC metadata.xml 395 BLAKE2B de7df6f620f49f99e10fb18c145f58369dc5cbb85b70a2c10fa05c8bb12fd8700ee5fc57fe1c695fe8be2625f82d7b96e1b9bfb24af23eb7776231c763ac64c3 SHA512 c969db304610c45088a5efac1e694bc7ccfcf0360631fa43fe10f48ea045f6c400ec6cf3faa97e153b95133a1d1e1ebc9fca48c1d3ea1b63f73bb33d5546bc28
diff --git a/dev-ruby/airbrussh/airbrussh-1.3.2.ebuild b/dev-ruby/airbrussh/airbrussh-1.4.0.ebuild
index eeef4698639d..70f59a12905a 100644
--- a/dev-ruby/airbrussh/airbrussh-1.3.2.ebuild
+++ b/dev-ruby/airbrussh/airbrussh-1.4.0.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 USE_RUBY="ruby24 ruby25 ruby26"
 
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
 RUBY_FAKEGEM_BINWRAP=""
 
+RUBY_FAKEGEM_GEMSPEC="airbrussh.gemspec"
+
 inherit ruby-fakegem
 
 DESCRIPTION="A replacement log formatter for SSHKit"
@@ -24,6 +24,8 @@ ruby_add_rdepend ">dev-ruby/sshkit-1.7.0"
 ruby_add_bdepend "test? ( dev-ruby/mocha )"
 
 all_ruby_prepare() {
+	sed -i -e 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
 	rm -f test/support/minitest_reporters.rb || die
 
 	# Avoid a test poluting the environment
diff --git a/dev-ruby/asciimath/Manifest b/dev-ruby/asciimath/Manifest
index f5e8e4848017..fd0a2ba49cf9 100644
--- a/dev-ruby/asciimath/Manifest
+++ b/dev-ruby/asciimath/Manifest
@@ -3,8 +3,10 @@ DIST asciimath-1.0.4.gem 14336 BLAKE2B 84aac2d2b987f72a17288cee6d00197c429e04c21
 DIST asciimath-1.0.6.gem 17920 BLAKE2B ccd35f77f7ff9312baf1de81d9c1c15009e9efea7be000ed2afad86b06697bb967980baab1f04a73503cd374c062d68ba99d6e42528ffe3d1c16a8f768813f7f SHA512 cecfdeb063e0dd2da9c92ec4ac51d30334d19f10ca2cde9380c740e61a1be435793bd5e6ae7795d1c4147056faaef0d44ea422b6ff8207cb11c8125422872f24
 DIST asciimath-1.0.7.gem 18432 BLAKE2B 9f1b959d594987f049f3e17394a305e037cbf4aa86c7c21324cb5f1f7a2a06c361fbf56cee5488ab0c8bbbac8f3a581f11a5e5a2407b36d28c4b4a106051df3c SHA512 3b2e5894fed09919e2576054dceecd70fc255bf414dbd826ccdda71cd69875c204c4d4d2ed85777612a4919a975b1a2427ff83cacb2720dee1d6f53c1f8fd079
 DIST asciimath-1.0.8.gem 18432 BLAKE2B 2877b387ca3da2d657d78e134296ec621b839688843f94428f7bb64d74625bd6a0a3f533bb5a832510ec64c789b43338f48fb13b0ac561c308b15172e5fb4e6d SHA512 02717069498bb8f6757c3411be1c16473363f4d69f82fdd6075cdee740ecbd742e6a6e97b22355adc8657e5df166834106c9cd8482336ffeff76debc2b0d45a5
+DIST asciimath-1.0.9.gem 18944 BLAKE2B 3ccc3f594d7a0d8b6996349d85356179ef3a9052a84f923ad1d0976e42f58670a350473b41d1c4a0c4f70a3cc4687e6adaa7987bd811ef32bd3da41f100f4246 SHA512 32c4f2cb7e9d330c371e9b9abcdf9e31bf44014c5c0b0044589302116b55840a2e1a41ab006d61a2258e4a5c2d4a772dad77f579150fc9bf099a7a4d19c6cd44
 EBUILD asciimath-1.0.4.ebuild 528 BLAKE2B 8f70ad1757f87729558831e9028f1d0534e0826aec3c87075338ece924dfdf13703057a8af6e98d38fecd29331673ea73eb4991dac6e9f85cf762c81b6730671 SHA512 04b3ef6e9a4c04c26e706c42ca8f9b25936f14f5dc682e4ac160f88035ab4e624b49eb8fcaf926fcb14bb7ecefb52fc634e782b2a2aeac6e097bca84a2e80d28
 EBUILD asciimath-1.0.6.ebuild 496 BLAKE2B 77a342935dff525e8309bfda153d3835483dea93d0f35fde5f67f231e052073727e62aaf99dfd14edda490e5560d3b5c374653eeef98fb6db13a826d697b8eca SHA512 cb236c68178e7c672576a1f622d1df9b7dc7dd4b43a7fd4758299aca6478afbaf7a41ea4ea650507b3fd2f3b7439ed8de2336932fd90852cae5e3a629c676e5d
 EBUILD asciimath-1.0.7.ebuild 500 BLAKE2B 6c7b042d2d6177fb19b906556b31a3d2ed3c819668419beeb4c946ef3acda2ece233806ed48e3a6bbec0160d093cf7b07406b6ab1aa869a204bc932b765132e9 SHA512 2d88022e1eda61ef0f846d4015e506487cce101a54b51809e7e20b8fd831df48f9c46ec154c981bb84639506b6683afbaace52c5af40bda7f3777610fac53a23
 EBUILD asciimath-1.0.8.ebuild 500 BLAKE2B 6c7b042d2d6177fb19b906556b31a3d2ed3c819668419beeb4c946ef3acda2ece233806ed48e3a6bbec0160d093cf7b07406b6ab1aa869a204bc932b765132e9 SHA512 2d88022e1eda61ef0f846d4015e506487cce101a54b51809e7e20b8fd831df48f9c46ec154c981bb84639506b6683afbaace52c5af40bda7f3777610fac53a23
+EBUILD asciimath-1.0.9.ebuild 462 BLAKE2B c5bd76b91bd08d14d798a5f513e1ccdbd047808f801649046a6f9fc634025105d4160d6b31f245f9cad80f134353cc79683415908443ed9e60aa0b30037844fb SHA512 b1a140452da22586bedaa66c85c4a3349953af18fe78e7833e1655b90a1789c8b24ee4ffb57e10d57e917a5a1ed3fee43dede08ec9c84c5dd9cac5e30d22f187
 MISC metadata.xml 344 BLAKE2B 7979667ff10553d0f1c80a34a03bca56057a4dcf856440b9f9bc4ea64aa018da426601b76dff578625481cb51f7384c7716a3aa98670f178c4209ad39a9af9d9 SHA512 606dd415c7a141188cc94a7d56c67d42be1c2420f8ba9ee7a44707b99a6035df1cd8d358de575e12008f0560aa2b87b57b5892c67f3d931aa28c5938373a8075
diff --git a/dev-ruby/asciimath/asciimath-1.0.9.ebuild b/dev-ruby/asciimath/asciimath-1.0.9.ebuild
new file mode 100644
index 000000000000..40ba5af17a61
--- /dev/null
+++ b/dev-ruby/asciimath/asciimath-1.0.9.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.adoc README.adoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A pure Ruby AsciiMath parsing and conversion library"
+HOMEPAGE="https://github.com/pepijnve/asciimath"
+
+LICENSE="MIT"
+SLOT="1"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
diff --git a/dev-ruby/autoprefixer-rails/Manifest b/dev-ruby/autoprefixer-rails/Manifest
index 20fc6e489246..d0fde6b1e578 100644
--- a/dev-ruby/autoprefixer-rails/Manifest
+++ b/dev-ruby/autoprefixer-rails/Manifest
@@ -4,10 +4,12 @@ DIST autoprefixer-rails-9.5.1.1.gem 217600 BLAKE2B 188f5a23296d107e068339c029991
 DIST autoprefixer-rails-9.6.1.1.gem 221184 BLAKE2B 62ab4a4666f7996ed5434b472f8bd6ab9273a3de58482be2cdb7ea33e3aa0285e2ae143a01112ccccf9f9b3fc9fa5c0e8f2739643ab0a7737eba206280262045 SHA512 c488e5f932d300cd3b2e029bf2a91390753b8bfb6f8162ec10d63ca899d2152cc5b83eecf60f527016294f10923813232627dcd6da78ad7840d2d425af2a6d67
 DIST autoprefixer-rails-9.6.1.gem 220672 BLAKE2B ac9d3ef36fd438f28029c708e8a3c9df4c4cdb75de39cd73ee5e9e527f099c99691b3f76eac95c821a36d4c86aaf43f6becfa8ede893b6a8b2d8da6acc10737f SHA512 c553ed602d780aff62904f73c99bc56b9d7052de1daa3ee7e28cae59ced1e9111786e63bf2a829409f4be77ac8c4639ab38c73df84f3cd0a047535d9134419fd
 DIST autoprefixer-rails-9.6.4.gem 221184 BLAKE2B d9b004cd643484e86ebf7b925e6eb3d0d825c885edd494f29f190f03ef3535374dd677f4401b673e4e6b8f2654518dd8656ed594d823aefc536cebb0fd0763d6 SHA512 24aa6934d0f6ff2f9f34bdfa4a8a31bc5e52a2ce2653ac5c1e8d78ac633c3647bd6d95a5ed83dd1c38889e4c094abce900d65ebf6ea791b12594f0f5a26c2091
+DIST autoprefixer-rails-9.6.5.gem 221184 BLAKE2B 0a8d3dcd87cf4ad54252110bd60e86ab19563e614158575cb596aeaeab1d87946412625ce4bab4d8fc71d27abef1646822867aae19759b74445733f57ea076d5 SHA512 489e37e411fc86632d612b0d102955fd29b2654ba5bed3b648d89676e9d90aafb38139ea0d3f027fd9b23aff683c3f15979434d25c71d46560c3e1a1f1b4bc20
 EBUILD autoprefixer-rails-7.2.6.ebuild 827 BLAKE2B fd6aef469bd1e07f5100e88ebe523da96383c721dfc2bee9b7babb7d11f3d710bbb6debf4cf9cd57702f81150c8b7c7ef9a0f3de4efc1e6325240fd1bf2e4bf0 SHA512 f17f3e58a7cf0a8d960d683d3cdc6ddae7065ce7d28d3284b45b169210a068a9ec0dafcee100fcbda098aab73c809f455908df069ba72e5536b95aa1ddac7ace
 EBUILD autoprefixer-rails-8.6.5.ebuild 827 BLAKE2B 4bce491c80db4a8eb1d77467167c3c290c0af5311f4395424f5f0c4e2b30e1474fed1746c3dc5127413d48b9e7031f8e782f7b5d1a1987550747c3900d8954cd SHA512 8bd8a32ceb04e688ec4d149a67b98905b2ec975684f3fb2fe3dddcc4ff0d8a04e7556b41a3a804a6b1dd2d4c46d4b5ab45c6ed45f300c7171bf2335f73d42768
 EBUILD autoprefixer-rails-9.5.1.1.ebuild 930 BLAKE2B 9bc0d96eb27f70fc0e07f85293e2525f3821a5261dcb8501206ac3ca67157df396a51bdedb00f519ae1338c2e97db09eda8581c11406e2000d225a42767d943d SHA512 39032027fda288057b29ee37ffcbfba613ab8533517f3f2c164f35eeedb06ea67477d9ab2f28fa2c855e71c082d1e5cc072764df568e2137102f6f08116119b5
 EBUILD autoprefixer-rails-9.6.1.1.ebuild 889 BLAKE2B 85643bd01e0a4db78f304d55c7b75181e51258b83219073e17142c86ef025d746d9e34b6781adeb5a869fd4ab4643c1a039769ddbdf2ec45c8015a8ffc5d1bdf SHA512 dba75647eac0f7e41a6a20bb359fb137b982bd28a680c85c4240356005b4508613e4364d56b31e1db9a3f373809e9e84065184656086569b02f49815e118cee1
 EBUILD autoprefixer-rails-9.6.1.ebuild 930 BLAKE2B 9bc0d96eb27f70fc0e07f85293e2525f3821a5261dcb8501206ac3ca67157df396a51bdedb00f519ae1338c2e97db09eda8581c11406e2000d225a42767d943d SHA512 39032027fda288057b29ee37ffcbfba613ab8533517f3f2c164f35eeedb06ea67477d9ab2f28fa2c855e71c082d1e5cc072764df568e2137102f6f08116119b5
 EBUILD autoprefixer-rails-9.6.4.ebuild 889 BLAKE2B 85643bd01e0a4db78f304d55c7b75181e51258b83219073e17142c86ef025d746d9e34b6781adeb5a869fd4ab4643c1a039769ddbdf2ec45c8015a8ffc5d1bdf SHA512 dba75647eac0f7e41a6a20bb359fb137b982bd28a680c85c4240356005b4508613e4364d56b31e1db9a3f373809e9e84065184656086569b02f49815e118cee1
+EBUILD autoprefixer-rails-9.6.5.ebuild 889 BLAKE2B 85643bd01e0a4db78f304d55c7b75181e51258b83219073e17142c86ef025d746d9e34b6781adeb5a869fd4ab4643c1a039769ddbdf2ec45c8015a8ffc5d1bdf SHA512 dba75647eac0f7e41a6a20bb359fb137b982bd28a680c85c4240356005b4508613e4364d56b31e1db9a3f373809e9e84065184656086569b02f49815e118cee1
 MISC metadata.xml 347 BLAKE2B 71b067345809944df1e70cdcaa44e44ae416d0c4ff80975aa796b8217170825e6be32a15d2549f464d9a65e8aa9ff1b2e9496989e66bce29d3dad672742495ec SHA512 b0985f41e9463a6c5bdbda0d5a84cc76cb6090614fa07395705b3207e0cd4fadbe9b1bb18fb7382f3c8bd00663db1232fd7107f6757bd20cfca0a0df99928426
diff --git a/dev-ruby/autoprefixer-rails/autoprefixer-rails-9.6.5.ebuild b/dev-ruby/autoprefixer-rails/autoprefixer-rails-9.6.5.ebuild
new file mode 100644
index 000000000000..8c312ceb78ee
--- /dev/null
+++ b/dev-ruby/autoprefixer-rails/autoprefixer-rails-9.6.5.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_EXTRAINSTALL="vendor"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Add vendor prefixes to CSS rules using values from the Can I Use website"
+HOMEPAGE="https://github.com/ai/autoprefixer-rails"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="$(ver_cut 1)"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/execjs:*"
+
+ruby_add_bdepend "test? (
+	>=dev-ruby/rails-5.0.0
+	dev-ruby/rake
+	dev-ruby/rspec-rails
+)"
+
+all_ruby_prepare() {
+	sed -i -e "/bundler/d" -e "/BUNDLE/d" spec/app/config/boot.rb || die
+	sed -i -e "/Bundler/,+3d" \
+		-e '/config.sass/ s:^:#:' spec/app/config/application.rb || die
+	sed -i -e '/standard/ s:^:#:' autoprefixer-rails.gemspec || die
+	rm -f spec/rails_spec.rb || die
+}
diff --git a/dev-ruby/bson/Manifest b/dev-ruby/bson/Manifest
index ed355ac0113e..92ce9c93b5e0 100644
--- a/dev-ruby/bson/Manifest
+++ b/dev-ruby/bson/Manifest
@@ -1,5 +1,7 @@
 DIST bson-4.4.2.tar.gz 107429 BLAKE2B 94b3f694d79a3219a6e7b13f4dfa5935a1fec5ac99883918d61052786b2e033d8cd335013155b4b9069a730a3a87a0c0ec00b8b5ee5b89bb8c357909e8f67fe4 SHA512 a27a82fab17f596df986a3c81f1e73146a8d283bb16e8a7dba1921215e8f0e863b6996dbc107ede44546e750e4b19cc2dd934d290e25712472efd6cc075b9984
 DIST bson-4.5.0.tar.gz 107547 BLAKE2B fddbb84ee74c3b6bb50a79141e583b300deeaa85b7b39b4e26985fa1cd0c741813eb4b3192fffe97d8bb238430087e4726004e8d3c50d39f17f8b270b8635dc4 SHA512 093a4906961d765bdd49febbe9c3123a34d3f80adc5e1309abb2b5fc1380bff37c9d8df475bfb29fc9359cf440813e716ff359e461f5e7f6d5e1e02009bc24bd
+DIST bson-4.6.0.tar.gz 115899 BLAKE2B cae63b799cba6a464988937b26bc47533e8ca5089c3a1f5e4bc8cf01e11eaa1f5bd82b79f144b2bafd7cae8478743c3ccedfe8c839ff45db907c77b5e1c6d1a4 SHA512 9661b394d6d45caef7d10df439ca5a65869fa4dcde49158f818e7c2764a31976c615bacf09a09a8bcf2bab2e2d78a64be1a7fdad68e796facd071f972b1f5635
 EBUILD bson-4.4.2.ebuild 1076 BLAKE2B 167cc4c37fea736e2e02b341cca067ba49a9c3851cc84512b3c080b5bd1d5a2fbd269369a5638dcb0dbc8c09f33b4ae803f13710323bef0b349a460b5c9fd5bb SHA512 c5eaa66135fdc0487115f0047c4ea2f7f2a6dbf1acd1b276ce606cf47fb06d910b3f4145f1f8f595b8a69057ffc2d9a83a2e9029d6a262f9c0d7d8d8685c0494
 EBUILD bson-4.5.0.ebuild 1069 BLAKE2B 6b1d760e74c0eefcc12ce3513bdbfd219bfc5f79abbfd42fa981de5d93089b4f2f3d5611925e32174b897ada0d09a74ba88d8e103c4d18801a03ae2ea8eefc39 SHA512 e8533682d3e2e00647d1c488e05982622323a6fe586ad0c94dbf590fa97da609e47d19d4ea782d6884498e5b8a31ecea5c68d7fb887c88f13a621776d9f0e418
+EBUILD bson-4.6.0.ebuild 1038 BLAKE2B 3f73276097aa0e8aad2a835d23601286bb14791c508f18ef22bde57bc70379cb7146340eabddc674c4e1351018335ecb1780507bf8445fcdf9be0d8110aaae8c SHA512 bf6bf12ac879f28a46b0582eda3b4225b6f122baa089ea4112d4920ccfacf4fd339feec25d7cf1656b6ae20a371157230a4a87a1fad1afd19a3f05fb844847d0
 MISC metadata.xml 343 BLAKE2B 45b4f3d9d5e86b9fee94d0b51c420d48c51b914adb49585c12519a81de40c555bc5ed48b03b751c7ab524464e46836a25d51f824c56cb03837f61ae071e1517b SHA512 a5fdde2808fc5c77be1a62a593215b8b619f53ffd8606e76db34a2eb2006deea409c64e85d6ba8a5b4089133265b6911188a9026c3698b44270ef8ce1f12967f
diff --git a/dev-ruby/bson/bson-4.6.0.ebuild b/dev-ruby/bson/bson-4.6.0.ebuild
new file mode 100644
index 000000000000..1a5d0fd00b15
--- /dev/null
+++ b/dev-ruby/bson/bson-4.6.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+GITHUB_USER="mongodb"
+GITHUB_PROJECT="bson-ruby"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="A Ruby BSON implementation for MongoDB. (Includes binary C-based extension.)"
+HOMEPAGE="https://www.mongodb.org/"
+SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="bson-ruby-${PV}"
+
+LICENSE="APSL-2"
+SLOT="4"
+KEYWORDS="~amd64"
+IUSE="test doc"
+
+all_ruby_prepare() {
+	# Remove bundler support
+	sed -i -e '/bundler/I s:^:#:' Rakefile || die
+
+	# Remove project-specific rspec options
+	rm .rspec || die
+}
+
+each_ruby_configure() {
+	${RUBY} -C ext/bson extconf.rb || die "extconf.rb failed"
+}
+
+each_ruby_compile() {
+	emake -C ext/bson V=1 CFLAGS="${CFLAGS} -fPIC" archflag="${LDFLAGS}"
+	cp ext/bson/*$(get_modname) lib/ || die
+}
diff --git a/dev-ruby/bundler/Manifest b/dev-ruby/bundler/Manifest
index 20ff5906ca8b..75beab5d8032 100644
--- a/dev-ruby/bundler/Manifest
+++ b/dev-ruby/bundler/Manifest
@@ -1,7 +1,5 @@
 DIST bundler-1.16.1.gem 349696 BLAKE2B 6057aed2e3bffdfa7f3ea8489c4ae79d9241b7b300fd35c4a2c14899ff306183165d1554be793a1856d9fd1c696161161049519fc8915800c68c60a9a5b116d8 SHA512 2cca87aa17b61df98ef98a648a7d7cfe0529015f1278e8cb2298bb12544157933d723bd666d945bcdbaceacbf97a092a3848e2a587bd01cffa73c662d37d4834
-DIST bundler-1.16.6.gem 356352 BLAKE2B da6d1d5e7edb5a2a4066cecd7caf33c06d15df2e719aaaa66d9ec9e7ce712eb28612224139f86df016bee28f5f00b767ed683de61dd820c7b40e211e3015a3d2 SHA512 4492786ffd22b86e056dc66c605a943140a1513dbada2334fd3340877f72a3f2138d1bca8f36be3d671f2f9497a69f3a95505db42e938bc30719d15f3896e155
 DIST bundler-1.17.3.gem 364032 BLAKE2B 81e097156a593e4ec85a2353aa6c62143d9aad120c22c5f76423c6c5f4e4d33206c8ef41c64e54ea53eb610a0d865beba19d3c033e8f65913564963319bb523f SHA512 658de4228bc12fa5ca6ce335f76fff773f64da9f3d12f5097b4fd28d4c4f4d2a5bf12dce761b3d95432c5ea6a5aafae895df87c26660a4567db8b682aff48c02
 EBUILD bundler-1.16.1.ebuild 927 BLAKE2B a7ac70701a5f583386142d2ea5609ddd7118b6a1e073c41b68289aceed6e03d9af3cab1267946372230c7503b0b5998a96cb96219fc808ac13da988ec50201c4 SHA512 5bacc9353656e5db83c95a6718a2c159f99a67b90e1d2d2bced778ace0934a5b31514e67cac4a5ee5c80d6fc9595bf5350cac1cefbd77657084d70422399fbd2
-EBUILD bundler-1.16.6.ebuild 931 BLAKE2B 64ed6414c9490b4c16d72a4c68d6479c5d09860d808548b9642790f0c5985321dc621af7108efdeaf170b129a2d74facb71e2561a606570231ca7cfc61f30d8b SHA512 42dcb7db23b97c775732f36c81489b337ae5bef0a0e5ecc18f3c49fb2d68aa4a0116157171d63696432860fa22d168cc34aa22b7b06b92ba8eda11f12ff25a66
 EBUILD bundler-1.17.3.ebuild 938 BLAKE2B 47cbf77c0bfd52934963437e2eb4fbd63411f53f759b5949089d071a6ff045ca80d54f8d02cfb0a81a58bb437af2cfc79a9f8fcfde9d8fa0a3143500aa612b96 SHA512 734be250b24c7ffea9983197c4aad9e10821abf77df751ba05f1cb632d38082719bce447a7f00b47c0f5f5dc2f98cd181b8b954a8c185efa48501e4b7c3e6ee2
 MISC metadata.xml 342 BLAKE2B 9247517894a366c8b67564e015ff966b22eb3df924ec8438d9886ee854d922e376a274e1dcb455e23451febbb1bf4d8f60023e6b7763cd42772749de1bab372c SHA512 2eb67c3eb94b1d7dfe3e3c818588e6a8b15b375e2e4497afbed91dd0ac28b261cc53e2c04a7f713db710c90566ffea60a0d27acc56893010f9f1b31a6f34cb3e
diff --git a/dev-ruby/bundler/bundler-1.16.6.ebuild b/dev-ruby/bundler/bundler-1.16.6.ebuild
deleted file mode 100644
index ffe47f941a71..000000000000
--- a/dev-ruby/bundler/bundler-1.16.6.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24 ruby25"
-
-# The specs require a number of gems to be installed in a temporary
-# directory, but this requires network access. They also don't work
-# when run with a path that contains "-".
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-# No documentation task
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
-
-RUBY_FAKEGEM_BINDIR="exe"
-
-RUBY_FAKEGEM_EXTRAINSTALL="man"
-
-inherit ruby-fakegem
-
-DESCRIPTION="An easy way to vendor gem dependencies"
-HOMEPAGE="https://github.com/carlhuda/bundler"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+doc test"
-
-ruby_add_rdepend virtual/rubygems
-
-RDEPEND+=" dev-vcs/git"
diff --git a/dev-ruby/crass/Manifest b/dev-ruby/crass/Manifest
index 75a56902e69b..2eb842379517 100644
--- a/dev-ruby/crass/Manifest
+++ b/dev-ruby/crass/Manifest
@@ -1,3 +1,5 @@
 DIST crass-1.0.4.gem 92160 BLAKE2B f0ee65e3fd6bde1b87bb47347c8afbc1c4b5e98331a82e64d0b96ef4ef7db91a0903d6961074713cf68ad68363d1c9c678e62f4b3d8e7f9b4491ad2bb70a1596 SHA512 44ef5393530b38c35035833ecc140bc324d39309e18d4bb81847f415c0092230483172fd92fe2acacab238bbb771cedd44d6031f7c985a59d0ab4d2373119967
+DIST crass-1.0.5.tar.gz 88665 BLAKE2B cf7cb01516a9d7ef21839b8b0cb2d7ce8a8f6fbcac32e6572eea2483546dbe5dd7afc3c9164590c565429b2390ffe823948e6da6fb4f09b53bacb63fdb190e68 SHA512 d56244d33d5c43a09268a81f57328757f505531633cfd56fff7a44d68a9f29c6ad49f5ae7a0e6c9ee93543fae9083f0d3ed290e32cb3565c37d7b31a01abaaea
 EBUILD crass-1.0.4.ebuild 685 BLAKE2B 0242b88e91323d4818946f49d0ab039d557e6e6c9d05f7984ea89773f6ae97e1d9e1a5165474f6f54f23717e5a8ac76d9ccda6c1ec700ce8ff1c6e0e91a4d725 SHA512 f6496930844e7155f79dad7c7e61780b339a84665a3d4a2092a71747ac2a333dd8aef4ed0936a509a43b2f8f41e92a93d8dc30a1e8fae4b090dd410685b5c1d8
+EBUILD crass-1.0.5.ebuild 841 BLAKE2B 128b272c342f606e2f85dd8fce3f4fe3024321cac130b1219dbc6e8d0f70832ab8f0dc062e9d5e45963a132aadfcb4ef2db29f68c4ede36d2a60f522a4e4fbff SHA512 734fd5eb53b45b2ba8fef0dea2175fc0542c432ce8e3a1a28fae68b10c41315cf8ef79a497e9a57ea541f54db45900a402d69bec4792b8d0577be8cfc7c3f07c
 MISC metadata.xml 338 BLAKE2B 7c67c73b8424d0f83d98cbc7b2c8608ae80829f5f59029a143132b0669a44eefda849bc941a34b143e0dcb3625be05eebe02a4176c219525ee3fa151676766fa SHA512 fd48781e866b789fb7b938ccc47d70a6d84af2afd104aad532d12b81c9235c3fe00c44546d8724d2c98a3e7808b62adbcd50b065e795cc634ae4fcd0eb711247
diff --git a/dev-ruby/crass/crass-1.0.5.ebuild b/dev-ruby/crass/crass-1.0.5.ebuild
new file mode 100644
index 000000000000..d627baa0b25a
--- /dev/null
+++ b/dev-ruby/crass/crass-1.0.5.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_EXTRADOC="HISTORY.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="crass.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby CSS parser that's fully compliant with the CSS Syntax Level 3 specification"
+HOMEPAGE="https://github.com/rgrove/crass/"
+SRC_URI="https://github.com/rgrove/crass/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_bdepend ">=dev-ruby/minitest-5.0.8:5"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/I s:^:#:' Rakefile || die
+	sed -i -e 's/git ls-files -z/find -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/dalli/Manifest b/dev-ruby/dalli/Manifest
index 93ca56f0ad94..f32adb369e42 100644
--- a/dev-ruby/dalli/Manifest
+++ b/dev-ruby/dalli/Manifest
@@ -1,7 +1,3 @@
 DIST dalli-2.7.10.tar.gz 52106 BLAKE2B 0531247c1d615acd7d1124b8aceb5635088b55e5a85753f10b8fbd786ec3573f13df096e1537d9a31f3801632406f28d918de5971cb28ec31d6eb8387d0c74f1 SHA512 1b6308ef37d729d85741306c10bf87c9b9733f83f0b4bf089f3eced36c48cddd9a77d2fb44a77778844d1cafaa3cec5110a9c90f6a67dee08a96e163e6ccaf65
-DIST dalli-2.7.8.tar.gz 51599 BLAKE2B 935fc1b0ffb2c93c0ef8ab6a82e63b4e272c51ae6c2cbd0c670953c0943942c25b4c795ca7953ad4e53284f6b6e35b44be386ec4dba0c96345256e3b3173152d SHA512 5fa48a01db15fdafa179663b71867dd6a9c2ab7b4b94434f650c1ce37bd71caa2bb22efe032a4eed777538cdc341f22a251d14772aaba62f4a6d9d8c33b6a346
-DIST dalli-2.7.9.tar.gz 51971 BLAKE2B ddf0286cd4edd1298d0cc759b5e5de1e60bb1ea1f8fbfdab559a09e716a0384c2bf5c70c6922d1b0d15df1af4de83eee16965a6d6f0543fbd5a0850464fb9f11 SHA512 38d4bb0a9c15175cdb77e40a0131c4e2caecc5b39b6fa15604aff8f1808429d2bf021f8817e9c2448007d5fb1dc50ea61c679a5a47ca54869d71391ec522f419
-EBUILD dalli-2.7.10.ebuild 1579 BLAKE2B c6d6edfc2be0a960f8227dfc7d49911acfd9bbc6db931e0a866341c2e8f1bdfee95d289fadeae2bf736faede334d1dc0c614ef83b08770729a5f30af1bcef1b4 SHA512 434237e4f6789e195443ecfac20743fccb7c79f87b658b8c0acaa69406f9118e6d7d434a60c114de3065f9efbab090bbaec418b9552693fcdaae1a686c2ae4a4
-EBUILD dalli-2.7.8-r1.ebuild 1390 BLAKE2B fef340fbf6d16192c9173d096f2763ab0e12097b457e0a4249a3c88b5e14f04390a314bee0391c856c14933aa484347f1bc4b32d418e772adf9873e6d0888f01 SHA512 be632a4d5cbb0fa2c5d36a48b67da95ae528e159c48f33bc2f7604e32d513767c939c4ae4d3dac0ea788e7b2665b9d3fa2fce7467802d9006396ee94c0127cc9
-EBUILD dalli-2.7.9.ebuild 1572 BLAKE2B 2a0dd07b2372178d3e19c574fed05ca873b5a3999cfb980a016a3c896fcd2c059dd7c1e541798550ea3553734e2d782680cef7901103affe736e896528a552a2 SHA512 4dc4c553810b8a6646a9eb39b09fcdd17640a9ee188d637d889717f6b17b4099ae036a54357b766b1f16348af33059901b6426ba9699e4d4a9c273a66ea89e34
+EBUILD dalli-2.7.10.ebuild 1578 BLAKE2B aa257dd54dfd71304c5bf60d8373252466770d027a72bbb1c42af5e2c2593bc018c124208b8d78219ad3d6cd9ab6506117282bfc04e6922ff05dfede2a82ebe3 SHA512 0ce0ba0d10409a0531257e5f314c84b18839a0823941c0b5e36020cfdf55243002f98eb4cd4de64806e182c3f7a4559c5462e84727e6346c63f81476911a3162
 MISC metadata.xml 346 BLAKE2B e34b47009de19ff810f3c3893517533730fa09cc4713b5fb8ebc05011004e17466ca0a6e6df307e5748003a7b4c83691d28ca0d80b423f6f870c4f7fc9be88eb SHA512 22b3ca0c5024974556840a2cf47ffa0dac63b6a4573d2ca6244c3ec9231b1c8321c7f544bc979882a6bb6ca37545b8ccf4612ce9ffd1ab34521b24e896f57e41
diff --git a/dev-ruby/dalli/dalli-2.7.10.ebuild b/dev-ruby/dalli/dalli-2.7.10.ebuild
index 8b3be58fb6ba..1a7d5a359029 100644
--- a/dev-ruby/dalli/dalli-2.7.10.ebuild
+++ b/dev-ruby/dalli/dalli-2.7.10.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/petergoldstein/dalli"
 SRC_URI="https://github.com/petergoldstein/dalli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
 IUSE=""
 
 DEPEND+="${DEPEND} test? ( >=net-misc/memcached-1.5.4 )"
diff --git a/dev-ruby/dalli/dalli-2.7.8-r1.ebuild b/dev-ruby/dalli/dalli-2.7.8-r1.ebuild
deleted file mode 100644
index ad86c5b8fe76..000000000000
--- a/dev-ruby/dalli/dalli-2.7.8-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_TASK_TEST="test"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="History.md Performance.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A high performance pure Ruby client for accessing memcached servers"
-HOMEPAGE="https://github.com/petergoldstein/dalli"
-SRC_URI="https://github.com/petergoldstein/dalli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND+="${DEPEND} test? ( >=net-misc/memcached-1.4.0 )"
-
-ruby_add_bdepend "test? (
-		dev-ruby/minitest:5
-		>=dev-ruby/mocha-0.13
-		dev-ruby/rack
-		>=dev-ruby/activesupport-4.2 <dev-ruby/activesupport-5.2
-		dev-ruby/connection_pool )"
-
-all_ruby_prepare() {
-	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
-
-	sed -i -e '/\(appraisal\|bundler\)/ s:^:#:' Rakefile || die
-
-	sed -i -e '3igem "minitest", "~> 5.0"; gem "activesupport", "< 5.2"' \
-		-e '/bundler/ s:^:#:' test/helper.rb || die
-
-	# Drop rails dependency which is only used to display the version
-	# number, so we only need to depend on activesupport and avoid
-	# complicated circular dependencies.
-	sed -i -e '/rails/I s:^:#:' \
-		-e '14irequire "active_support"' test/helper.rb || die
-}
diff --git a/dev-ruby/dalli/dalli-2.7.9.ebuild b/dev-ruby/dalli/dalli-2.7.9.ebuild
deleted file mode 100644
index dcd9944f6e06..000000000000
--- a/dev-ruby/dalli/dalli-2.7.9.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_TASK_TEST="test"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="History.md Performance.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A high performance pure Ruby client for accessing memcached servers"
-HOMEPAGE="https://github.com/petergoldstein/dalli"
-SRC_URI="https://github.com/petergoldstein/dalli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND+="${DEPEND} test? ( >=net-misc/memcached-1.5.4 )"
-
-ruby_add_bdepend "test? (
-		dev-ruby/minitest:5
-		>=dev-ruby/mocha-0.13
-		dev-ruby/rack
-		dev-ruby/activesupport:5.2
-		dev-ruby/connection_pool )"
-
-all_ruby_prepare() {
-	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
-
-	sed -i -e '/\(appraisal\|bundler\)/ s:^:#:' Rakefile || die
-
-	sed -i -e '3igem "minitest", "~> 5.0"; gem "activesupport", "~>5.2.0"' \
-		-e '/bundler/ s:^:#:' test/helper.rb || die
-
-	# Drop rails dependency which is only used to display the version
-	# number, so we only need to depend on activesupport and avoid
-	# complicated circular dependencies.
-	sed -i -e '/rails/I s:^:#:' \
-		-e '14irequire "active_support"' test/helper.rb || die
-
-	# Fix test compatability with memcached 1.5.4 and higher
-	# https://github.com/petergoldstein/dalli/pull/672
-	sed -i -e '/memcached_low_mem_persistent/,/^end/ s/-M/-M -I 512k/' test/memcached_mock.rb || die
-}
diff --git a/dev-ruby/ddplugin/Manifest b/dev-ruby/ddplugin/Manifest
index ae684a13cfe4..137519c2a274 100644
--- a/dev-ruby/ddplugin/Manifest
+++ b/dev-ruby/ddplugin/Manifest
@@ -1,5 +1,3 @@
-DIST ddplugin-1.0.1.gem 9216 BLAKE2B ec1035b66b5167f26a9f89bc02dd1e4429bbb8d22e0bcd98b4e37a20443afc61ee32b65e00a6d46265303ec8cca6090edaa646615e0d00785222c1450c62f8ba SHA512 6332fb5292f7796e99a78131fd0e4c38cabed66e0d05220960e1cf08b717505e3790b99949d1a6098b80999d973ade442d07a5d19975328174810ef8f44ac276
 DIST ddplugin-1.0.2.gem 9728 BLAKE2B eded641a734d4c7182184b9b9cf4a6007b33b25ffde97e1c9efea71d425ee034693e05b8f569d8e9be29f4a315d5306d8a3180b19e835157d49d9d1c82f0d436 SHA512 bc36cd7e5490e3748e65994dc1e2b1cff9aeefcd0b44ad547368491c83509baf2934cc38f9db4035069394b8c2fa9bbea6b35cf96b80ac4126df348e49a93420
-EBUILD ddplugin-1.0.1.ebuild 589 BLAKE2B dde97ac493236470bd004b48207688653810aa083848e69425a174a8f3efb920145cf4c8d34e2eecfbc6a5ee9aa08e819ee7920fc11e4d43458c6950c56dc7a0 SHA512 36e48ce74683c107009418ae7ae26d9462af40bc35f9714bc15141b86cf58c971c7e607fb7d824f87fc27263de29ab304d61e694931c1c1888f71f72b04e1aa6
 EBUILD ddplugin-1.0.2.ebuild 586 BLAKE2B 4935355b2e068ba0efe79d3e44694d67adc9e28a7e14d09571c5a4d47c7956a864b93bdbc2e06e36ae50858f78e0f140dff4915d872e8a02c4bcdbe6ecbd134d SHA512 6736a345d6ff71db7f70f5b397640ad850c0ead875f3f21d5d63344820a6e4d4c215b94345d053e8856730b085f734df1ffd8afdc9ff07aadf879d964a2f7788
 MISC metadata.xml 343 BLAKE2B 746f50a23d4f0d6bb51139641b0170f42f0317ced63c8aafbcd0792a7e2bb52c16980087602df8ba56921465e045b42681f15e80193c6abfe3f2ab4f6a6367d2 SHA512 14ce3a5ff346c7da07c1d5c4eb91b7a02ad8b77c97921c40ec29cf7ef48e365c6c1c6265164658498ec07ab5a4ab84eb06930d4db0d4af0a40a50f258993f1b3
diff --git a/dev-ruby/ddplugin/ddplugin-1.0.1.ebuild b/dev-ruby/ddplugin/ddplugin-1.0.1.ebuild
deleted file mode 100644
index 935cab84925e..000000000000
--- a/dev-ruby/ddplugin/ddplugin-1.0.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Provides plugin management for Ruby projects"
-HOMEPAGE="https://github.com/ddfreyne/ddplugin/"
-
-LICENSE="MIT"
-SLOT="1"
-KEYWORDS="~amd64"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e '/coverall/I s:^:#:' test/helper.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -e 'Dir["test/**/test_*.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/diva/Manifest b/dev-ruby/diva/Manifest
index 93952efae7ef..6cdc2eac11a9 100644
--- a/dev-ruby/diva/Manifest
+++ b/dev-ruby/diva/Manifest
@@ -1,5 +1,7 @@
 DIST diva-0.3.2.gem 13824 BLAKE2B da6236bf24dfca3d2ebc241172ee104c5ce66001446fcef397108695ffa70e37d65de9a2db29a706f6f81c5d6a70934cc59155d94e890f7499ed572df3adecdd SHA512 3506aead4314d8d43c838ca0bc596a8f63e6d0b86da68810999e9101bfad611b8fd4902078ec7495e66704e756d928ec28e916105f22c4260b2681ab97eb08aa
 DIST diva-1.0.0.tar.gz 13654 BLAKE2B 3743a2a0cacf6390a2bb2149e1213c9057c7c348fdb514d622b1edeeaad52a8a255defa0ea556a6bc5f89889d36f9f096b63d48eb03d868797f37ba2a5ba6a03 SHA512 d29375840893f61f022e3afb041855486ff13266a9635c8d944177df0642f1e53c0038b5bd6fecfa2d02296558f6f0f0e4f86089434f6c5f04a440044c9b75ca
+DIST diva-1.0.1.tar.gz 13643 BLAKE2B a5fb279003c05a795e40125fd99023f458efe8d22a6ef6236275da2a276e481ef40547cb99ae6dbbaae50685627848c0bc0f1af010c75ed5ccb9d896e7fab7d7 SHA512 cac830f78ba02c41289f44b6ef4bc9853d94a742f9c720190ab8944df14630b0882110d683a4a52971281f1f94c5a857927939236577da1790b577a8cb1a6f3e
 EBUILD diva-0.3.2.ebuild 499 BLAKE2B 80bbc5b0b9c4db65c6e7f7716ed092ff26eaf57ca79748c3595b732e39eac8855610f7cfda4c06c915ebaf51cb98ba42291f534780be3d8663604935da791807 SHA512 8323059734455e2724f3768d9472640282a2ee6f88741c9b2bd1229a9d155f9b3753d3c0fe7b59051d2dad80d052f7ffd99f7f81e21ac46931e3ccbfc32de01e
 EBUILD diva-1.0.0.ebuild 544 BLAKE2B e2a7c239813917ddd0d04593ef365a02483719fec363b3fb60c890d690f5ae71b6cbdec7237c50ecddd57d4a918937234a349c23ef684aaf31f0af3b04989853 SHA512 71ef8ccc0697bc519d5e654fa9a93a13601af2ecd829cd11881596812d76bf11884755bf2591606a4291df5a34bea5cca10f2d61e8319c294cd56e031db71c2b
+EBUILD diva-1.0.1.ebuild 681 BLAKE2B 9d25cbc7b519b31772ef4aa8341d821c02526fe33ce39197ec6dee350053891f836a702440b778f771e31d531f11f233d8cb3ccfc51130c91cb6f9cc7d511440 SHA512 8dbc561d248d70bf869f92bb269f7178058d99b9d1d4041e58b27a4e436a95dad95320455889454bbcd688c6c8382d27003c987ec4ecca10bf2aef3aa83d8e9b
 MISC metadata.xml 399 BLAKE2B 26a2baccac7448af4f7e749c1e8a69821a25864ca8f3672f137e73ae7a257ec87398239cd94479a06691ee3ddcfc0e4ead1b71f58ba2fe5541577099592466f2 SHA512 a95f31401006f69283159dbc1524b53e79454609c6bda896af06f472c84ff828162fea80594028fd8c02110cd190beacdfdee47dc27d69d5b01b10e29a4ce0b2
diff --git a/dev-ruby/diva/diva-1.0.1.ebuild b/dev-ruby/diva/diva-1.0.1.ebuild
new file mode 100644
index 000000000000..08ec4d43682c
--- /dev/null
+++ b/dev-ruby/diva/diva-1.0.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_GEMSPEC="diva.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Implementation of expression for handling things."
+HOMEPAGE="https://github.com/toshia/diva"
+SRC_URI="https://github.com/toshia/diva/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+ruby_add_rdepend "<dev-ruby/addressable-2.8"
+
+all_ruby_prepare() {
+	sed -i -e 's/git ls-files -z/find -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/erubi/Manifest b/dev-ruby/erubi/Manifest
index 1f98d074d165..32999544e725 100644
--- a/dev-ruby/erubi/Manifest
+++ b/dev-ruby/erubi/Manifest
@@ -1,9 +1,5 @@
-DIST erubi-1.7.0.gem 12800 BLAKE2B af4584e640f0ae177c6e4d98850d94b148bb1b2df406c16fe582bdecf54895e47942ab94df472f628d185c71f89895250a5a9765fb41ce9365eb2ffa273f1d78 SHA512 1494c28aebab08a82dffac7b340ff6e16edc8a3731f69ec568bec6cb0bda4a334f94033f43416812cd00b0c99dc98458867d963bef34796ebbdb11ea65dd8c1b
-DIST erubi-1.7.1.gem 12800 BLAKE2B 3a676ca860365eb758dbad548d1570b7830a531f0e6b0d1c6b99bc1b92e401d30d8318f6155d6143cb16ce46a4d42d1c2f1dfa1359f3e046fa70a9fa1d82983f SHA512 c7b611f1690886c0eadf68d418674760912d13ad1febbc4161c6b72d1f51373084d0fdb03f98e05c87bf5e7e3cbb57df35471b84b2d73359e30395d26bb90486
 DIST erubi-1.8.0.gem 13824 BLAKE2B 026a70c05f7000baeb14c79f8505f0a0ad54df4384749ac0ced895ec5e2d5fcd3b2cc4f0891f11f983de6b121661c391ed0c839b29dfacacbe6f55a9607fcf64 SHA512 ca227cc10a3a77750a4e5184395709a032da6f15cb0fb5f9b8cc162e382b2ce49cd94023941439b05ee5b0c5d1b39114d68a0e7549910bceb1fdead6b9fd62e4
 DIST erubi-1.9.0.gem 13824 BLAKE2B 00cb428e3433090370e9f61d2445f98553a45e2a92181076114db2601fa7261d8ffc44c3f4a0ecb73d616fb5e93dcc52ca6a2efab3945b11bd17d4a53c68fed1 SHA512 34770c01215b323797739af54c5c821d28e982309a76f0a212657868629625ae6dfca3e9e2f5ae16893813fc81b5afbb172c397ddad1e2f93108c5112c540bd6
-EBUILD erubi-1.7.0.ebuild 541 BLAKE2B eea9a21920d93be6db4c5f40a7f946e0806873d4673569bb94e35e9539b02fcd3475bb75d27672e144f2a8dc023ca383d50afc49540a2b57372ef85575deaee4 SHA512 35313e50b53d6820443055dd8bc974bdfd9a7153c2a4198284aa719c2e796dee33b95d52df27a52695f933a3415affb6e43663bfde438292551c1015b5729eb2
-EBUILD erubi-1.7.1.ebuild 542 BLAKE2B 1bd5b3eea3226055581c3fb9fefe6045a791c54b55ad735810a4615edb734becc676f5ff3045f60716a10158dda86be8e87b3adf88c9d382d146395adb888e56 SHA512 e27dbb162f866be01163f5540bbe44bb4a522bb7b1785dfdebee0914abf6dbbc27328a5d33c306cabf5cac839c23373d55e615972a57f2a52337f8e910f7fd41
 EBUILD erubi-1.8.0.ebuild 538 BLAKE2B b15f25efdee46aaf19db824dc97286bc7923352421f4b149ccd8a7cbfd83cc81726bd1f261e4c8c00b28aed099058ee2ddda0a744556deb0a9da2fc75ba3d5ff SHA512 6a271ab88b85643bde33146c0ee3448dcf823e962f8112ea4a2d5353f199cab8162ae02b9652ee17d349f3a18ac0603838efe957917745c231d664f6d5520b37
 EBUILD erubi-1.9.0.ebuild 501 BLAKE2B f1e0ed97379132de8dc5598f9deb138a06842056576b043c9aaebeb0d0e06d84dd749e84cf894c7f964eafe36abad3f02adfc80f560436eeeebff7ae5dc147fe SHA512 04320a1c80386ceb00514a525ed92387bd91930205d58fbfbc01b0822719e3450f025217823e8a12487423e0696b8b3f958a256241798d67edad889d858a2248
 MISC metadata.xml 392 BLAKE2B 69b13996a3f20cfea19c9633ae778b8fe408fb0ce3655ff27b10dd5b128ac1c0f63128f77076586584a95389b6f6d2890153b653a5ddc71e053cd50224a8f15a SHA512 011c951701fd525c150ba9ca737c502cb78937c173e5286b06f3ed3f007860eee68265f419975ea131eb18682789435a328f5d8345078781c733e7148eb381b0
diff --git a/dev-ruby/erubi/erubi-1.7.0.ebuild b/dev-ruby/erubi/erubi-1.7.0.ebuild
deleted file mode 100644
index eb7228252488..000000000000
--- a/dev-ruby/erubi/erubi-1.7.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.rdoc"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-RUBY_FAKEGEM_TASK_TEST="spec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="a ERB template engine for ruby; a simplified fork of Erubis"
-HOMEPAGE="https://github.com/jeremyevans/erubi"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/minitest )"
diff --git a/dev-ruby/erubi/erubi-1.7.1.ebuild b/dev-ruby/erubi/erubi-1.7.1.ebuild
deleted file mode 100644
index 53423db5255f..000000000000
--- a/dev-ruby/erubi/erubi-1.7.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.rdoc"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-RUBY_FAKEGEM_TASK_TEST="spec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="a ERB template engine for ruby; a simplified fork of Erubis"
-HOMEPAGE="https://github.com/jeremyevans/erubi"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/minitest )"
diff --git a/dev-ruby/facter/Manifest b/dev-ruby/facter/Manifest
index e0fb446a50cd..f60926b7edc2 100644
--- a/dev-ruby/facter/Manifest
+++ b/dev-ruby/facter/Manifest
@@ -1,11 +1,9 @@
 AUX 00facterdir 15 BLAKE2B 88b3bebceec0d9b8943b36a373a5475d2600c8cee5770c2f9391615958b27b842ede98d7a476cb488e249b1dc14258574bf2f77912599fef98fc325914c8f014 SHA512 381973ca23aec0853714495f74b77155f0079e504312dc55e6e22c8a099aeafd2b7bc4a762c95543c3cd9c5fa5f88a6821f4104b7522536aee7b6f5426d9ec2f
 DIST facter-3.14.3.tar.gz 395278 BLAKE2B bda071fb92d337e2d6e58faaa33a6b135b6dfd3b6f4077af3b872bd44191629810fe99a7a1f8d9e3b16c4ff45ba587730bccb0652dcd85f4562120def42c7f38 SHA512 abd7cb3e102bff7635d6b2c17e5650e0a7b7be5ed6b81003df17053f0c9c4887f7db948714daaa313c7569bcc788ab18b0361a57395cd5118a6be38d571794df
-DIST facter-3.14.4.tar.gz 395849 BLAKE2B e3a08f5c6e1f8d441ea50b41432f0fff3120923e7cb81e47586622e239d691c89c1e4bbf17fdbc744ae20cc44b5bf0adf4178ab7d8572dc44edef4f3b789e92b SHA512 631eb10efdd51e2aab2f9d139c18bb659dffd0341141f2c094f46f27e54166527355be52e768e1f5e4f61ff3eb3bf099ec8626947d66cea71d36395d6551c7b9
 DIST facter-3.14.5.tar.gz 395892 BLAKE2B c8f98716f4abca8d5f32c1cbfa79437b4021b1994476a31f7c00fc092f02aa08ed01eff4357368e140763bd3d39a38915c99606914e697ff8c769c9f0dd26638 SHA512 387f3d4c654ce3231129dbf6c22ccb04023d73006e4709b330b11ac01ef55831c618d80171ffb8de455be2a12e339a2b52ab782b0ed97e2dbfeaca2692ed951d
 DIST facter-3.9.2.tar.gz 380883 BLAKE2B d2804664e0499715230e5696c5a9ebae933f5b43dfb37154251d47763c2c7f78cfa8d1413dd836e5a0c76ed67300d066fa5bb390f17f85cd4cb7a444eaf0d133 SHA512 bc040826311bbff40f5a151ade315d9d47ef1e0f3faa570805e48ca55405265e66308230118b9cd59f701ecd76a7b0fd4d9200dd4ace838521223a162b105374
 EBUILD facter-3.14.3.ebuild 2484 BLAKE2B 6d17be9d833f372fcc9621af84a0159ef8aa339e2065a24d6922622777532c6380d7b56c6b37ea8816bf41bd445f8a68b4a2937ff570f372862ec301a5fc11fb SHA512 f83756fa4e53069ed531611d227ae9aeb324d9e43dca3508103a32f1458d715cc88694abd303794418b52bd6f5a6bb9d0725b1c2223645177f22d8c3dfcf682a
-EBUILD facter-3.14.4.ebuild 2486 BLAKE2B 70edcf1f460e85536973e3e54822f8034d7119e9f53d7ae4c9c9a0788d6462a97f530c4078a46e219c2ecf88246e3787f20b7ed2b0c2a16f11c05c3f859c195c SHA512 732c677383c4dc5b693ad55c594b682d7e19239144f53b1c2cb6ae148fd6f62141d8d0f8b7dca5f858ac0225ea85da257a1bc607051bd5ec7adb4eb202cebd17
-EBUILD facter-3.14.5.ebuild 2486 BLAKE2B 70edcf1f460e85536973e3e54822f8034d7119e9f53d7ae4c9c9a0788d6462a97f530c4078a46e219c2ecf88246e3787f20b7ed2b0c2a16f11c05c3f859c195c SHA512 732c677383c4dc5b693ad55c594b682d7e19239144f53b1c2cb6ae148fd6f62141d8d0f8b7dca5f858ac0225ea85da257a1bc607051bd5ec7adb4eb202cebd17
+EBUILD facter-3.14.5.ebuild 2484 BLAKE2B 6d17be9d833f372fcc9621af84a0159ef8aa339e2065a24d6922622777532c6380d7b56c6b37ea8816bf41bd445f8a68b4a2937ff570f372862ec301a5fc11fb SHA512 f83756fa4e53069ed531611d227ae9aeb324d9e43dca3508103a32f1458d715cc88694abd303794418b52bd6f5a6bb9d0725b1c2223645177f22d8c3dfcf682a
 EBUILD facter-3.9.2-r1.ebuild 2129 BLAKE2B ace1032be069c17e69c0fed40327848241f31d50b8e165bd01bec7edc08a4d8aeed614bf449e1d878a74b686c2fb18df4c9873338641a6f8ad33248c9c746714 SHA512 c3cd67ac050a0ee35bacf2c7907022c2b46c6b208a3d20e684916dd2361fbe5e5040a2ce7d94779e5283b1af4b1fa60ce4eef48cb28816ffe404c47f98d7f422
 EBUILD facter-9999.ebuild 2418 BLAKE2B 4bf8b77b1b66039da3d4bfa50e8bdf829f5443c7f578043b044f21c716d4103e10f22ccf1c83014f3c4bc7674232ae1df14a7de4eba5e99f5eb9b5da96a39041 SHA512 2709eeaa36352957bc4c958ee4441e6b6004a6d849653f2765b2989a7cb6d4f4e8a8ac904d76d6746954d3ab2b4e8b98e93fcab3fa14600c0e2f7bf26bf093b0
 MISC metadata.xml 539 BLAKE2B 989d6bb49686504b47720be6119802f06f998514c53261bb71cb0082cccbd22361195122c101e319ef985f6d5d39d84bb7a6409d77b4735c26e6b87856770a79 SHA512 92486b6b382d065c39999f271b07a915ac6f80fba225b0c1deee86f73a0143d47e8fd986e2ad6a82ae20a9cdd59ece63b623c6a2ec9d10e178c1fbc54f5381a5
diff --git a/dev-ruby/facter/facter-3.14.4.ebuild b/dev-ruby/facter/facter-3.14.4.ebuild
deleted file mode 100644
index 4c7110c0cf6d..000000000000
--- a/dev-ruby/facter/facter-3.14.4.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-# git-r3 goes after ruby-ng so that it overrides src_unpack properly
-inherit cmake-utils eutils multilib 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="debug 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
-
-BDEPEND="
-	>=sys-devel/gcc-4.8:*
-	dev-cpp/cpp-hocon"
-COMMON_DEPEND="
-	>=dev-libs/leatherman-1.0.0:=
-	dev-libs/openssl:0=
-	sys-apps/util-linux
-	app-emulation/virt-what
-	net-misc/curl
-	>=dev-libs/boost-1.54:=[nls]
-	<dev-libs/boost-1.70.0
-	>=dev-cpp/yaml-cpp-0.5.1
-	!<app-admin/puppet-4.0.0"
-
-ruby_add_bdepend "test? ( dev-ruby/rake dev-ruby/rspec:2 dev-ruby/mocha:0.14 )"
-
-RDEPEND="${COMMON_DEPEND}"
-DEPEND="${BDEPEND}
-	${COMMON_DEPEND}"
-
-# restore ${S} and override all phases exported by ruby-ng.eclass
-S="${WORKDIR}/${P}"
-
-pkg_setup() {
-	ruby-ng_pkg_setup
-}
-
-src_unpack() {
-	default
-
-	if [[ ${PV} == 9999 ]] ; then
-		git-r3_src_unpack
-	fi
-}
-
-src_prepare() {
-	# be explicit about the version of rspec we test with
-	sed -i -e '/libfacter.*specs/ s/rspec/rspec-2/' \
-		CMakeLists.txt || die
-	# be more lenient for software versions for tests
-	sed -i -e '/rake/ s/~> 10.1.0/>= 10/' \
-		-e '/rspec/ s/2.11.0/2.11/' \
-		-e '/mocha/ s/0.10.5/0.14.0/' lib/Gemfile || die
-	# patches
-	default
-	cmake-utils_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=(
-		-DCMAKE_VERBOSE_MAKEFILE=ON
-		-DRUBY_LIB_INSTALL=${my_ruby_sitelibdir}
-		-DBLKID_LIBRARYDIR="${EPREFIX}/$(get_libdir)"
-	)
-	if use debug; then
-		mycmakeargs+=(
-		  -DCMAKE_BUILD_TYPE=Debug
-		)
-	fi
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	addpredict /proc/self/oom_score_adj
-	cmake-utils_src_compile
-}
-
-src_test() {
-	cmake-utils_src_test
-}
-
-each_ruby_install() {
-	doruby "${BUILD_DIR}"/lib/facter.rb
-}
-
-src_install() {
-	cmake-utils_src_install
-	ruby-ng_src_install
-}
diff --git a/dev-ruby/facter/facter-3.14.5.ebuild b/dev-ruby/facter/facter-3.14.5.ebuild
index 4c7110c0cf6d..b9491751f31b 100644
--- a/dev-ruby/facter/facter-3.14.5.ebuild
+++ b/dev-ruby/facter/facter-3.14.5.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_BRANCH="master"
 else
 	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86"
 	SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
diff --git a/dev-ruby/faker/Manifest b/dev-ruby/faker/Manifest
index 70d6f92af261..1afa87a21624 100644
--- a/dev-ruby/faker/Manifest
+++ b/dev-ruby/faker/Manifest
@@ -1,7 +1,5 @@
-DIST faker-1.9.3.tar.gz 974178 BLAKE2B 456cff1c57de07f6f0a5d068e45bcc76db6205bd3ab91aae12584bd5342d6ab0ce7e35f7d681915eab371f4211cc1d24443d5496dd31c8a406d73119aed56828 SHA512 b521372e152ce035363e31b140085210bd78763aa45d9e37867b727accd868fcaea7c5b5c07a5795e859dcdbf48ca49233083de231f771e6b7ae7705487c9e32
-DIST faker-1.9.5.tar.gz 991845 BLAKE2B 0f0824d320cf2449c2b8d9c55f30d6d8f6519bd71951b6f4a7a725bf295e62b18a44bcac8749d6ad445a441ecc53432b3864ab70d794220b3d21f6baa8c229d2 SHA512 ef5d31407d6209e37e8fbc5691904c6b242b97069c96d5a3d4d744c91894038255286b50dceadcd512742634f76bfe8d6088b53b46e7a20720fb98dbb2e7042f
 DIST faker-1.9.6.tar.gz 1833392 BLAKE2B 826ee480515873d1e250147e5c3749e222b1273a00fd4ae0a2a28dca91c5981290c8540602d89d406e91d98a0f5dbc6fc4a54ab6d7d2b716a4d4957ab32254dc SHA512 1ea0c4194603b5eaec0f4abc2460fb39cb9de97179d7699c3cb37673731ebf8bf03d20fb422911d4725d4308691d4c92a82f5a661e034381cc04066ddcc955bc
-EBUILD faker-1.9.3.ebuild 703 BLAKE2B 1a423f89090bee78adb64973dac27581553ba2a51d26b6954efbd3ff3b95313e9964f094acc387d5b0e7c82e8843a753a090ead054c162cd0b6b6b0a71879399 SHA512 694496d2516ed58d4c26d94b0afa528a58545a12c172c09f719b8fc9e7806591d23b04239a0e19feb67cac7a698f2aea2e8303b43a07d8ef169789274537df62
-EBUILD faker-1.9.5-r1.ebuild 775 BLAKE2B da0092060aeacd2fc08b82a55307d932ea377221697ce4f6b4c5d1408625937dec85f70ac63779d3a729b67b734b635300dba62e97cfe13fe45319896abdd698 SHA512 509ed0642f2c82a85af8facbb98dfb4c9c0bd8035e065f80268dd6d8ccc5e2f7ba74bc42d047d95d3a2bcb8518c68aaca6f2e13408e5b9423027b0429140676f
-EBUILD faker-1.9.6.ebuild 695 BLAKE2B 5925d1dfd434a8e9993f0171b4c050c8f7f3416c872e435bc875d36a20ec4867fa7bde41558d1ebdd803fb9fe847c8c5cf16584e07cb545b8613750d678f9e3a SHA512 e62efd5ad30b2b51b483ed23fbf3e107c8d1816ef6f3b6b5e2a6e1a6e44b18db5191cd75825d26f29d781100d6f2f1622cd8b0595391ea726e31fb5591ab3a27
+DIST faker-2.6.0.tar.gz 983084 BLAKE2B 663075668d17b25eef1528379ce0f8079d34672bac658d7cc96d8b3bb07d63d7aec0249409bcee7d60eb033753be8a37ad04c43b22dcfaa5c4dfb735c1663a64 SHA512 ddec1d70e1becab987da2e9c261e7b3e8903fae77e0e7151f8230aac4d6cfc919a3d9497728d262b28bb3e727e9409a360eb76b410f7b701a108c35380059a4b
+EBUILD faker-1.9.6-r1.ebuild 720 BLAKE2B 19d8387ce2fe15cf1fff88f00219e630526321f37645f5011920c68056646c55c5f983f9f3bb8c291a4a90ee6503e118d4c6758a93f39cc78c881c46f4e0ae67 SHA512 50c6bffef40a9ff278234abc58cf4ab71e187dbbc9b48631f547ad6d40637150ca2dc040f5d3208126e1aba09fff97cc8a499437777b7113ba5be934510fcb10
+EBUILD faker-2.6.0.ebuild 732 BLAKE2B a6930679c5c508eb6756824b39a5b2849d9a20699398c1511b8082205dad51c0a2874f4c72131641667a0c877805f75c4503216feca41cfd698a801ba4622a6d SHA512 b1ae2d50004d3b73d5192412db034ef8151cab8505bff95be5e3900236bb96e2dce24d6a53c71c626ed920d1734bf875cb1ca96e57b49f67bf1509554900046e
 MISC metadata.xml 452 BLAKE2B 70c3af75cc74dd28d3af9df670a4f2f0d898c702a5d5421d46e598ad14c380e288cec076d2a3aaa08e85a198b12daa2d69249feccffe24f07d6d73fea1010fcc SHA512 1c525fb78b733e6301acad7092799dcbba462c471cf3719f5634069a83c67bbb27a705c2ec6a27b8d431842efebef3209d7ca4167f8dda7e6439b1c0cda09eea
diff --git a/dev-ruby/faker/faker-1.9.5-r1.ebuild b/dev-ruby/faker/faker-1.9.5-r1.ebuild
deleted file mode 100644
index 42e9d39ff723..000000000000
--- a/dev-ruby/faker/faker-1.9.5-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-
-RUBY_FAKEGEM_GEMSPEC="faker.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A library for generating fake data such as names, addresses, and phone numbers"
-HOMEPAGE="https://github.com/stympy/faker"
-SRC_URI="https://github.com/stympy/faker/archive/v.${PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="faker-v.${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="test"
-
-ruby_add_rdepend ">=dev-ruby/i18n-0.7:*"
-
-ruby_add_bdepend "test? ( dev-ruby/timecop )"
-
-all_ruby_prepare() {
-	sed -i -e '/simplecov/,/^end/ s:^:#:' test/test_helper.rb || die
-
-	sed -i -e s/1.9.4/${PV}/ lib/faker/version.rb || die
-}
diff --git a/dev-ruby/faker/faker-1.9.6.ebuild b/dev-ruby/faker/faker-1.9.6-r1.ebuild
index 7bc73ab69710..95dfce7b21fd 100644
--- a/dev-ruby/faker/faker-1.9.6.ebuild
+++ b/dev-ruby/faker/faker-1.9.6-r1.ebuild
@@ -9,6 +9,8 @@ RUBY_FAKEGEM_RECIPE_DOC="none"
 
 RUBY_FAKEGEM_GEMSPEC="faker.gemspec"
 
+RUBY_FAKEGEM_BINWRAP=""
+
 inherit ruby-fakegem
 
 DESCRIPTION="A library for generating fake data such as names, addresses, and phone numbers"
diff --git a/dev-ruby/faker/faker-1.9.3.ebuild b/dev-ruby/faker/faker-2.6.0.ebuild
index 20d9ef8c420a..4128467758c3 100644
--- a/dev-ruby/faker/faker-1.9.3.ebuild
+++ b/dev-ruby/faker/faker-2.6.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+USE_RUBY="ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_RECIPE_DOC="none"
 
@@ -16,11 +16,11 @@ HOMEPAGE="https://github.com/stympy/faker"
 SRC_URI="https://github.com/stympy/faker/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
-SLOT="0"
+SLOT="$(ver_cut 1)"
 KEYWORDS="~amd64 ~arm ~x86"
 IUSE="test"
 
-ruby_add_rdepend ">=dev-ruby/i18n-0.7:*"
+ruby_add_rdepend ">=dev-ruby/i18n-1.6 !!<dev-ruby/faker-1.9.6-r1"
 
 ruby_add_bdepend "test? ( dev-ruby/timecop )"
 
diff --git a/dev-ruby/fattr/Manifest b/dev-ruby/fattr/Manifest
index 100c20bcf676..396f70cc267c 100644
--- a/dev-ruby/fattr/Manifest
+++ b/dev-ruby/fattr/Manifest
@@ -1,5 +1,3 @@
-DIST fattr-2.3.0.gem 12800 BLAKE2B a9ef3e7d69c52193c65139e647f22e99bb8e0f65b2970b26f34c453127af7a4d4c9cbba17627462241b163fbdf654cbb46d2dded2a62a76e0b1abcf04b24f185 SHA512 620825a4659e30402e44d077fd60b4b2260fe3eb7f28c87ca26f61a6be3a2d4e96920ca1d89070dbd90e1d5d760632f6e103766dddb38a8eb1fb104c6b261baf
 DIST fattr-2.4.0.gem 14336 BLAKE2B 1be45d17eac08dbadec9e0a4177f7b1ad7d39c060ce1162961aa8fe3b1c9b0107f10c17a2a9a5d27e652067df7f33aca0afb57b6a268b52999ae7a7b540ad131 SHA512 df3aa4fe187f7922fceaad3b30d4ed9c869ac194f819bc6c57dd574a27e69a74cf9fb10042163d941b0edc7129dc5ede5f92c60a75c6744bb9e8f358f5cf24bc
-EBUILD fattr-2.3.0.ebuild 585 BLAKE2B ad1eae595201a0f46e74a4ebd5e03ad6308bee586f087e14d6c1ff8471181601ab85c272e902c26c50ef6c94a423d33036c8f57e82f82f5aa0aaca2c532a71f5 SHA512 86a30efb50244aec7c41aa8e78a171e5c873d649335a2be6d50805d1af8feaf9c32b05ae12332950c9b872d1cd0ab6112268a8d64a85a0a23c500a5a303ff1d4
 EBUILD fattr-2.4.0.ebuild 582 BLAKE2B 9606d6e7c971ee5042fde6c4841fe32e50d9cfef89b9dc6aa8c7ee9bc2bd8b660c0cc3d1cb9268a433da014dc235bdc5aa622680ad8b52b2764163b86474924e SHA512 cf23c8619bc15bef61376a3168d753023cc8af20020761055723217e3f2069256e8b3340adcd3862639a46e74fd06a9178ef906e51ab7ca392da0a5d490f80a0
 MISC metadata.xml 329 BLAKE2B 5c6fe8fef48e0020f35b06c9c43b662d71af522c4173cedc90ddcf99b43d8d9be89586728c7ddd149c9fea559b801e5a1ae63d96afba45f31518ed7289462a6b SHA512 5c5fd73903762213cf979cfe7e4483f565237ad38be42c6478a23ac48f944a2ce66629d81d29e4e51b9fbecbaa374ed8c23c0b352c56d1b2390d14615f4393e4
diff --git a/dev-ruby/fattr/fattr-2.3.0.ebuild b/dev-ruby/fattr/fattr-2.3.0.ebuild
deleted file mode 100644
index 3b786a689bd7..000000000000
--- a/dev-ruby/fattr/fattr-2.3.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="fattr.rb is a \"fatter attr\" for ruby"
-HOMEPAGE="https://github.com/ahoward/fattr"
-
-LICENSE="Ruby"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-each_ruby_test() {
-	${RUBY} test/fattr_test.rb || die "Tests failed."
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	insinto /usr/share/doc/${PF}
-	doins -r samples
-}
diff --git a/dev-ruby/ffaker/Manifest b/dev-ruby/ffaker/Manifest
index 060be1ede00d..d3b294756627 100644
--- a/dev-ruby/ffaker/Manifest
+++ b/dev-ruby/ffaker/Manifest
@@ -1,9 +1,7 @@
-DIST ffaker-2.10.0.gem 421376 BLAKE2B 30976c0bee8862623c923b3797bd6de31b803643191d55ee2a6ef101a92f43acf6e300991de43641f2564ac82d046fcb7e53ca8b9cecae4c6b339e43f020cc1a SHA512 cb54d995f39877eea0844395e52158ea898f1d3fb17af0b01261f8b359d50ffd5d7b94fba0400e7103543a96670a00b3e5a9c072bc46f7221d390ab81e6ac507
 DIST ffaker-2.11.0.gem 429568 BLAKE2B ed5a9d794caba5ad93c1ac8457ebf89412177fe48c05a66f162f8d2b7a7a3b395e59312ddc444965ec4d9500573a97c97b95a1381d07caca6bb3b3ca97fa3dc2 SHA512 b185adfe34c5d78fe47cedc9d685eb98ed0de7f9a4818fa5ab0f6fe9cad21d04e025b6d2e38e34f463874a5d9007fe0d01e604b316af4850a7a63f50140bbd78
 DIST ffaker-2.12.0.gem 431616 BLAKE2B dc060472749b1081500609e4b6a58310ca00c3bfe2dc8a40dba49bde50a98add33a83cc00136fbe542b1d14ce74ddbab8f737dba4866023bb44d8ad7126151ce SHA512 1763bd2b9ec45903f09d46504ebf333e9879423607dd8d31d6ceb659bab05ac9fd14b99ea2dd3f08c0d61e987d7bab647945f0a7e81f1fe8a2b085b7b571e282
-DIST ffaker-2.9.0.gem 413184 BLAKE2B a48977b2749b60db18d046a0df0b65c1790a4fba5920faaaf6ef93be31cc7defd375379e2e46bbe2b4d2bae8b29f7cace4ecf09fba7d80a6cfacd724edd60564 SHA512 dff411a4d8864817dacb0498ce73a9b350d4e03aa771edb5b69c5e749ba4565dbd24d09215a7397e4567a9cd3ce2baae9b8e4e21cd8db127257364395e481364
-EBUILD ffaker-2.10.0.ebuild 469 BLAKE2B 6cfe531564b3a20b804bbc052b31a438af417c2418f0ec02b9661ea5cc9522748054c3bedbe891574bdcb36d6e1da2de1927dafd9cf52b70c622f884b1ae7387 SHA512 37de5883d978dbf4ecfee805b2e4b8802e809df2c4df5b2939b6c63615962439627d17bf5b588b18928d38b202ecb4ee31dd3555a652547bd52e0c8c8f02ac36
+DIST ffaker-2.13.0.gem 434688 BLAKE2B 7b0b0af41482c85a6502a081a6d78f69a4968aa6bb844cc1eb11e7761e75331b4043319a1221b402d703405275a032a433e28249d2bbd9980ac82ca0e6e74649 SHA512 d5102c8fd754a102257a0223fdcda39d3791e08149ee396098c3e0c8fba50f5cf63249d14cc26305adcfb90319db785819e74fdb4366adfb0fa5701afd4edfc8
 EBUILD ffaker-2.11.0.ebuild 469 BLAKE2B 6cfe531564b3a20b804bbc052b31a438af417c2418f0ec02b9661ea5cc9522748054c3bedbe891574bdcb36d6e1da2de1927dafd9cf52b70c622f884b1ae7387 SHA512 37de5883d978dbf4ecfee805b2e4b8802e809df2c4df5b2939b6c63615962439627d17bf5b588b18928d38b202ecb4ee31dd3555a652547bd52e0c8c8f02ac36
 EBUILD ffaker-2.12.0.ebuild 527 BLAKE2B 353537f33fd96dde1efc5c0ec56f02358dfe952924fc3cec7f869b9c510344d15f2930c3f62a7055c260c768afee09ac54a00a8064991b1b688287bbbc2bd8ad SHA512 f5f1160da7f927b57bcb0a1a9b4054f811064003c3a4fa645810c51254a4fbc14885b73b3b79398db9d76f4ec2153e46392b44e4c615d97df00a4f672881222d
-EBUILD ffaker-2.9.0.ebuild 472 BLAKE2B 65064f58d2b8111b153e74f1a8f7b95567d9fafb4f5521b7de196582751e29da939b08e288800ffd4cc441c48d8f7ef5c3e82d9f65af18c7e02715bee4b2c803 SHA512 0680564ca5a656128df8a9dee0d5e23a085157b605598f6ccf154c6f4592649d030573da563da7402746b1be82f2d402d3705b554b35f5b43f3d743f85a9f341
+EBUILD ffaker-2.13.0.ebuild 527 BLAKE2B 353537f33fd96dde1efc5c0ec56f02358dfe952924fc3cec7f869b9c510344d15f2930c3f62a7055c260c768afee09ac54a00a8064991b1b688287bbbc2bd8ad SHA512 f5f1160da7f927b57bcb0a1a9b4054f811064003c3a4fa645810c51254a4fbc14885b73b3b79398db9d76f4ec2153e46392b44e4c615d97df00a4f672881222d
 MISC metadata.xml 344 BLAKE2B 35517e20c0036d8a175e81240ba0ea29799e0a00ddcc7dbb3b71822c4bd1d2ab64795a967dda9b2c9d207c18ffa090aab11dcfc6fe910e74b60f20413f65c001 SHA512 24ac57014a8aecdcc405060fc2e5f7ad3017cf07d022c55988bf7386bb50a79158dcf88f64e27141a4c44542f60c6d0e3b82d94f99dea71213cf6b914e717ada
diff --git a/dev-ruby/ffaker/ffaker-2.10.0.ebuild b/dev-ruby/ffaker/ffaker-2.13.0.ebuild
index 597e226722af..51f707d245ed 100644
--- a/dev-ruby/ffaker/ffaker-2.10.0.ebuild
+++ b/dev-ruby/ffaker/ffaker-2.13.0.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md REFERENCE.md"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 
 inherit ruby-fakegem
 
@@ -18,3 +17,7 @@ KEYWORDS="~amd64"
 IUSE="test"
 
 ruby_add_bdepend "test? ( dev-ruby/test-unit:2 )"
+
+all_ruby_prepare() {
+	sed -i -e '/test_image_file/aomit "network"' test/test_image.rb || die
+}
diff --git a/dev-ruby/ffaker/ffaker-2.9.0.ebuild b/dev-ruby/ffaker/ffaker-2.9.0.ebuild
deleted file mode 100644
index df9f13df83a4..000000000000
--- a/dev-ruby/ffaker/ffaker-2.9.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md REFERENCE.md"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Faster Faker, generates dummy data"
-HOMEPAGE="https://github.com/emmanueloga/ffaker"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-ruby_add_bdepend "test? ( dev-ruby/test-unit:2 )"
diff --git a/dev-ruby/google-protobuf/Manifest b/dev-ruby/google-protobuf/Manifest
index 4821a14edf7a..6552a84d8f98 100644
--- a/dev-ruby/google-protobuf/Manifest
+++ b/dev-ruby/google-protobuf/Manifest
@@ -1,8 +1,10 @@
 DIST google-protobuf-3.10.0-ruby.tar.gz 4908907 BLAKE2B 53a702a2cbfe7e642989eec010541fda434b7b8bbd267e3b65fc569a0ab33b08438c1a81d478426ebfbec6e330b90428e3da4fd345b8b64f890a6b3f4e360883 SHA512 0dcba6d21486fdc162f57119754b47b4a2fb605af878d5b96a32df55895321535cffb5b804566fd90ee7c36e20106d0cd4f5d9f3c652dc9c4dfca96be41a1977
+DIST google-protobuf-3.10.1-ruby.tar.gz 4905995 BLAKE2B 1dde3b6260918da8430c2ce69210462f339c492b2a4e53d5d9c1bea3747aead905370507fc4bd703560f6885c0f3f8393a998b875c19744ad94827109ecbb49f SHA512 aba0c4034c0d3b1759904adb6270eee94dd5dc568f433b219e3f1f70c0033993cdfa3bf476ad3f5767c7629edb9fd029c686405abf93731dde808286b336330d
 DIST google-protobuf-3.6.1-ruby.tar.gz 4485582 BLAKE2B 546c49759df784018459809b9db692c5c94aef5d717183af5cd9edd96b4c658e759f23950cdcd5dddceaaad06ea1de2a2357b9fa8c496ed5d538fc5920174da0 SHA512 1bc175d24b49de1b1e41eaf39598194e583afffb924c86c8d2e569d935af21874be76b2cbd4d9655a1d38bac3d4cd811de88bc2c72d81bad79115e69e5b0d839
 DIST google-protobuf-3.8.0-ruby.tar.gz 4934577 BLAKE2B 4b86ab216e8a8b2c99c3620da9417c0562498e9d4dbf4957db186f51c62b0ed73b1322635a076b2d4054e015bdf6c8c50cc7fd0cb78d24a93b29d2a5b48f66fe SHA512 ba27c64e5193cd4a144bf0c9dc0d195fbbe6e580aaca01960362f0f185074588ca40046d3bcea76e1deae7508b722f6c5be484ea957122ae8e98229c7c3a4ad2
 DIST google-protobuf-3.9.2-ruby.tar.gz 4947582 BLAKE2B ff0150970286d1eb452bd2f252fa8200617ddf491dcb3b9b60cebb36268c5a3072df3d24142ca9863306df6690f53ad4d4761c7846c677c4610716ec22e0838c SHA512 510349ddc59b4e53087b5247ca8784e9f852d66d755e1b014c6214e14c003f31dd336a724e9eb87a5b85a70e22793eb3211744c85a514b24b687346563717bec
 EBUILD google-protobuf-3.10.0.ebuild 888 BLAKE2B ffc528047578e425ab92acb742c77b185e108911ba809faa9882831ca5c1c62d902e06ce4fe84c3389abbb73a272053c06114f02f5116260bf84c8f212e25cd1 SHA512 591ff0ad95313bf23dcef49d6b7fc9a5d55a1f3f89aa8edb66c5095555275a5f5e7c8135b93f5b68acb9cdbdd0afe4fe6cf1139f9a445f7c27aad35efb5fd2bd
+EBUILD google-protobuf-3.10.1.ebuild 888 BLAKE2B ffc528047578e425ab92acb742c77b185e108911ba809faa9882831ca5c1c62d902e06ce4fe84c3389abbb73a272053c06114f02f5116260bf84c8f212e25cd1 SHA512 591ff0ad95313bf23dcef49d6b7fc9a5d55a1f3f89aa8edb66c5095555275a5f5e7c8135b93f5b68acb9cdbdd0afe4fe6cf1139f9a445f7c27aad35efb5fd2bd
 EBUILD google-protobuf-3.6.1.ebuild 905 BLAKE2B b9af584f19a244535574ef187d5b5effd8cd823d96c4706c00cb7ef0c29ef81c258c62e89c5c23975a35ce26ad79abff2bd6ff34444479568525941a134ca830 SHA512 b18c47f7915fe1607568d9dbf0c159afecad4e84b7197cf1748e4ca6ef05e71ad85f001b29e172d8a4ccb4cd3be4103b7f4b2acdc458b02e94b74dff9a497a72
 EBUILD google-protobuf-3.8.0.ebuild 913 BLAKE2B 8e1ea1aad0db1207f3c82e7065f28ee19cfe5cdffff91fb75113bb5963830d67c71c8be1b45e85fed77036d579a203775eabc207ff5ea5dbd9fd28eb638048b4 SHA512 cb217fcb8495f773778fc2e53e56a48828d3390907420c37cb0a711b545a07533ba6145d34ad322a8eb2a2586c94d9f34b32f8bc8624c4b7dca9b5f0b46aad9b
 EBUILD google-protobuf-3.9.2.ebuild 888 BLAKE2B ffc528047578e425ab92acb742c77b185e108911ba809faa9882831ca5c1c62d902e06ce4fe84c3389abbb73a272053c06114f02f5116260bf84c8f212e25cd1 SHA512 591ff0ad95313bf23dcef49d6b7fc9a5d55a1f3f89aa8edb66c5095555275a5f5e7c8135b93f5b68acb9cdbdd0afe4fe6cf1139f9a445f7c27aad35efb5fd2bd
diff --git a/dev-ruby/google-protobuf/google-protobuf-3.10.1.ebuild b/dev-ruby/google-protobuf/google-protobuf-3.10.1.ebuild
new file mode 100644
index 000000000000..749ced3b808c
--- /dev/null
+++ b/dev-ruby/google-protobuf/google-protobuf-3.10.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26"
+
+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.7.0 )"
+
+each_ruby_prepare() {
+	sed -i -e 's:../src/protoc:protoc: ; /^task :build/ s/:compile,//' 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/hashie/Manifest b/dev-ruby/hashie/Manifest
index 00bacac9f4d5..3b1b37c82b76 100644
--- a/dev-ruby/hashie/Manifest
+++ b/dev-ruby/hashie/Manifest
@@ -1,7 +1,9 @@
 DIST hashie-2.1.2.gem 34816 BLAKE2B 7406fece6c731f62ab8b73095b6c61d4d79cc3811ba20db68d2d6c54a780e8b37ce92ffa97ddc6c9ae2b802fbdbb04cc0d9c752761c9032739f3548f05696757 SHA512 6f72998710da58a2584939b4e74a114ae54168902020dc16ec5ea0422a91316b84aa6835fffb36a2985634f24ff5b0d01bcdb50134a414a269a4881ebcd728ac
 DIST hashie-3.5.7.gem 71680 BLAKE2B 8f03e190cf299f3597e0fe1b991fd07e00af0ecff757ef56648f97e8a3091a1445441d4e00f59c9b93d5db0d21636d9e5352175e49692f7b28a5612c87da9163 SHA512 c7ae610de5fe9b19a724068c26c184b44f951b29b56e3c5240074a372ad24d0ea70e39541812cbd82d5516d9e00e86a33d935b90e086b7db305b9b34b8f44f23
 DIST hashie-3.6.0.gem 74752 BLAKE2B b689843d30001dd7eaa09d62ab908d60e76128df66055283ccf0770830e5901b4e792c4bebd2cad8bb6d5e97a23016aee0d0114f2fb0f7ace8ebd722b8941020 SHA512 7b5355a2b93267d6b7c63608aeac4bb7d21f32a982e2c59771d5a791f9a0c921d11e1b4a185067447917315ce98f8cc5f2b48a31efec3068fb1f1ec0e4386e15
+DIST hashie-4.0.0.tar.gz 82096 BLAKE2B d2fa4f208e4bb08a15c7c14208fef368ea5653e556045378ead94b7002250a798637fede4f8438238111946a4393794828f88d19b7f8c733500d745a361049cf SHA512 b26b80a0b981fa534d17b20a7a2dfad82487950f94bf38d62129aa7af4de7875e1fd9519fae30c13d16a92e041033fe6f80978fd30014a571503650ee73ca549
 EBUILD hashie-2.1.2-r1.ebuild 729 BLAKE2B 4cf5d841a5e50b8fd76b8b42b935675043c734facae79601df3b3aeb402fe350ab5599f691af07956b04efa6f2f9651b41552a28d651d81f4c6ecee482b8faa7 SHA512 93775f9f9d9b01b88a05df1795e8dee87bd713537b7c9daffff8628eb35d6d7686aac6da48a1210d02bd7be5a10bbcb8cc0a4488f1a31ef4675cbbefd5415880
 EBUILD hashie-3.5.7.ebuild 1261 BLAKE2B 19a0a2aa6fefe3d0ffc48563a13689ac73c53630d7d5066c0a8fcd6a011259b6bbf8ecacc499d1a8a035f04a8876868ecd867fa2796ada428d2092330f0add22 SHA512 ad85c51d5d97e2d46e87958763e8c50bf4c3f032447e790725d41f73dd67106ca09f0781bc1a72c54d9ef3824b9f62f03a2a3487f419d843318c97ea0b674339
 EBUILD hashie-3.6.0.ebuild 1279 BLAKE2B 58cba017628e9eadb2ac95cfe5451554cd5e7f678698197425bb86d7b27ae1419d7c476189e02e522d3c0106027963f70bf150f4b535c434a108ca712178c4ea SHA512 689cd0ed442047a11e1fedf4a39bd7ed0975fbff7287976f65611d08cc9111ab2b7307792504a07dbbb435ac61aced16bf61dd3ef935e7c53d85a0d5a722c57b
+EBUILD hashie-4.0.0.ebuild 1404 BLAKE2B 579909a7958207f9b420899c3a72ab14bcae5a9f41f01f834ed34fb00ffc103c5a375c22af050302c2222b9952f37e1bf9d979165105b8fc837ace9fbf16b6fa SHA512 abe543e6c751734645da8a9ab520be94d11ee59030958c9933519281175120f26c799003ca7db01329b6939085a49113d631900ae365c98d18e760b285290355
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/hashie/hashie-4.0.0.ebuild b/dev-ruby/hashie/hashie-4.0.0.ebuild
new file mode 100644
index 000000000000..d39bc3582f23
--- /dev/null
+++ b/dev-ruby/hashie/hashie-4.0.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_GEMSPEC="hashie.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Hashie is a small collection of tools that make hashes more powerful"
+HOMEPAGE="https://www.mobomo.com/2009/11/hashie-the-hash-toolkit/"
+SRC_URI="https://github.com/intridea/hashie/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/activesupport )"
+
+all_ruby_prepare() {
+	# Remove bundler and fix one spec that depends on its requires
+	#rm Gemfile || die
+	sed -i -e '/[Bb]undler/d' Rakefile || die
+	sed -e '/pry/ s:^:#:' \
+		-e '1irequire "pathname"; require "tempfile"' -i spec/spec_helper.rb || die
+
+	# Avoid dependency on rspec-pending_for and its dependencies
+	sed -i -e '/pending_for/ s:^:#:' \
+		spec/spec_helper.rb \
+		spec/hashie/mash_spec.rb \
+		spec/hashie/extensions/strict_key_access_spec.rb || die
+
+	# Avoid integration specs to avoid complicated dependencies
+	rm spec/integration/{elasticsearch,omniauth*,rails}/integration_spec.rb || die
+}
diff --git a/dev-ruby/hiera-eyaml-gpg/Manifest b/dev-ruby/hiera-eyaml-gpg/Manifest
index a6d4e02a7819..5d09001bb39c 100644
--- a/dev-ruby/hiera-eyaml-gpg/Manifest
+++ b/dev-ruby/hiera-eyaml-gpg/Manifest
@@ -1,5 +1,7 @@
 DIST hiera-eyaml-gpg-0.7.2.gem 14336 BLAKE2B e8a2e5666a930a0955302b0d3cb505c00c936e01db095f56c746de2945830a3adff70b86bb68a74637f87d80ade8aade697b22ec3b263310edc3673f8a8c22e2 SHA512 4d27db9d1ab9d5e7368e92ea003aef776a6da5e078b0b7dc22a494680521b69168e2220d7311fc27c6896828ce4fc5182b6b66dd92a9a9ae42b0086e31e2634c
 DIST hiera-eyaml-gpg-0.7.3.gem 14336 BLAKE2B 2a08dc3251f6e28be3a027778dd7a30f7d186ec06965cb5ceb93c4f9ff361b49a4d220323e3a8576cedf6d8b487bed6c14e2203314370faf26417207ef011e58 SHA512 4cd1005b1775af2a433b9d91c7cb16bb854bee3a818f566134549663bd620f1a4e2a14dca6be5b319c5a95c26b464d8f438d51b876f21e6190b4210283f838af
+DIST hiera-eyaml-gpg-0.7.4.gem 14848 BLAKE2B 68d6fb4047dcc80ceca5350459a60c42f7d3db753491b94c4710920ddd484eaf0bee76f3381a2fa663795baec58e6d26614782f7f1a88933152cce8cc284457c SHA512 5cee22e435f7bcc1e4a9d4775ecdf0eb9cd70cf3e26870107920993df480082f7bebd7d488b060880407a7debd11c7b9a202f8f3a99da811ae8f49f17a7495e6
 EBUILD hiera-eyaml-gpg-0.7.2.ebuild 476 BLAKE2B 2d2f02b28435121378169c33fe1f7b8f40ea32dcaf020a87b17f333e4e2efaede01053c2e94fd2d7023ff199d10d1f31e91664de135d37df6dec7f2eb41bd425 SHA512 8e103c9b1af6fd13ae69b3d836f6e89bf5838f5f0e62cd312eb28e665ace14f4cc0bffcff91eeb582fcc6c91c89715d8ae8651b0d627653155373b43a5549caa
 EBUILD hiera-eyaml-gpg-0.7.3.ebuild 476 BLAKE2B 2d2f02b28435121378169c33fe1f7b8f40ea32dcaf020a87b17f333e4e2efaede01053c2e94fd2d7023ff199d10d1f31e91664de135d37df6dec7f2eb41bd425 SHA512 8e103c9b1af6fd13ae69b3d836f6e89bf5838f5f0e62cd312eb28e665ace14f4cc0bffcff91eeb582fcc6c91c89715d8ae8651b0d627653155373b43a5549caa
+EBUILD hiera-eyaml-gpg-0.7.4.ebuild 483 BLAKE2B ce8f86d4aa424c4719fb327e1809c0ea06f4b64a345825f6909c8264379292fce084692a9c6e7ff0fd9415e234a5440eb01730bf6b927f2988095bd2bd216e37 SHA512 7be902b7d8015b90ea62a96c6ade8928031f120bbd0a6d5456e204b49603ce4331ce6b3f6aab44861016c5c4584e4b3a6bd4e4d6d02ae86c7f1d990ffd01ca48
 MISC metadata.xml 473 BLAKE2B 076b7ca0bd642db56643c593070270ec77bccfed2f6ca545571e291c5faa7ddbf437c7216c3d115e8c646e41ff2914db4e7e9c6af0fae792cac38136caf04fc9 SHA512 5c9d09cc98b71839551598112cedf87d6adbd9311f126400527c61a8827c708d69a62bf84d4e269373729426740aca87060f7ef3467a0d3b5fef60920e811a21
diff --git a/dev-ruby/hiera-eyaml-gpg/hiera-eyaml-gpg-0.7.4.ebuild b/dev-ruby/hiera-eyaml-gpg/hiera-eyaml-gpg-0.7.4.ebuild
new file mode 100644
index 000000000000..2564ba5530ea
--- /dev/null
+++ b/dev-ruby/hiera-eyaml-gpg/hiera-eyaml-gpg-0.7.4.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A GPG backend for hiera-eyaml"
+HOMEPAGE="https://github.com/sihil/hiera-eyaml-gpg"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+ruby_add_rdepend "
+	>=dev-ruby/hiera-eyaml-1.3.8:*
+	>=dev-ruby/gpgme-2.0.0
+"
diff --git a/dev-ruby/hiera-eyaml/Manifest b/dev-ruby/hiera-eyaml/Manifest
index 520a71bb79d8..4e3647d53ffb 100644
--- a/dev-ruby/hiera-eyaml/Manifest
+++ b/dev-ruby/hiera-eyaml/Manifest
@@ -1,3 +1,3 @@
 DIST hiera-eyaml-3.0.0.tar.gz 54416 BLAKE2B 75587799b228562ae89ab4e46fdd5d4a256f66403df0a2c0761aadec17fb3fa95c1207aee5a4663bcbd843c7d6e0594ce2c0edf6973184b64522a987d628b549 SHA512 805496478d0fe142ea1661345d92e5ad2ad4c18c98bb83c8f799031b784a997e1aee2a11b46600a8ddbe0b147072ea0f83fbfa100df5b5fc534d7489850d9827
-EBUILD hiera-eyaml-3.0.0.ebuild 1465 BLAKE2B fceb438e7a8dc44ba79a6b6cde7f764367f01f1299b9ba68cba5f0f6019368507af6e8dc03cca429753d9f0c3e562a38c4028b294a54d278aafbb9990cdc1c37 SHA512 f794604dad174d04335853f12913daf6f642b1db244a1cd645d712c44dd0d1d04adcdf82162d87cec118452423e30dc1bcb5a8f1f6a6a65bf122bf222777d8d6
+EBUILD hiera-eyaml-3.0.0.ebuild 1472 BLAKE2B feb37e3e260d1a098364ea4596a825623c4e49dbfdbe31cf6b36a6c687091b90ee99c1120cdf44f7a4be1f56837f0e35a890952a81f82524e2ee0751474a05c1 SHA512 da48467b2f7f62d9f02078bba34f980547202ed15928b3dcbb2d068375b90c7b4082474fe60326cc6967a071441d068e2960b08663c74cf50699ca2dc56bfda8
 MISC metadata.xml 474 BLAKE2B d527c2a402f1ccb95a35c7a75baa9f71710dee53d9f37e424f28827182fe5500cdddb7af8297be14fab4805ac430d92efcc564419940065bcb0bedd3b7252b84 SHA512 af80beefd80dfb83c5c95f9d1707cda077ef7323004785e420ba56f6a4ccf42181247adaec2d023857d410ed003b82919a72af2a5e024c9d76a0ee696009361e
diff --git a/dev-ruby/hiera-eyaml/hiera-eyaml-3.0.0.ebuild b/dev-ruby/hiera-eyaml/hiera-eyaml-3.0.0.ebuild
index 0ac125d70878..744e6a1d5e21 100644
--- a/dev-ruby/hiera-eyaml/hiera-eyaml-3.0.0.ebuild
+++ b/dev-ruby/hiera-eyaml/hiera-eyaml-3.0.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md PLUGINS.md"
diff --git a/dev-ruby/hiera/Manifest b/dev-ruby/hiera/Manifest
index 4a43b7c90f3a..763deaba55c8 100644
--- a/dev-ruby/hiera/Manifest
+++ b/dev-ruby/hiera/Manifest
@@ -1,9 +1,7 @@
 DIST hiera-3.4.3.gem 40960 BLAKE2B a4747c6096065c1272bd3099893d27c53b5e869be16643fbd59fa0eead692e3bd082fcbf82463614336d00c3068244bd632fd6c3a87ba520566a8643f674bfc4 SHA512 126e626b9c9020f2b8565aaff35f30b35c73785120425d186c97186c5bdfafc4831216250f78fd33ffd5e1dde49646b262887747c0d73442a252c391329959e2
-DIST hiera-3.4.4.gem 41472 BLAKE2B 12c098d4cbf3bbf5980a4638d7dd7a67a56b9874c96e5be483335be2e0c9ac2417b7e187737c40c9cfa4f1d822f7d3bd9ac74f96e2df040c7aa029b82f295304 SHA512 bfac2d76cca90708a52f907a31c35f8e3944d50d473e3f17ad13f3673ab2efed0ee9edcbb4c40242f398ab2e3bd08b249b191a6b9d534c185ed540802684beca
-DIST hiera-3.4.5.gem 41472 BLAKE2B 4dc65c997bd7e2b068af2b5f5e1d59504de302ff4934b50c0b023f277f892ae4b12f65c727ceb0629e43a07e8e13840add07c7546be776e16b269d9a90555a53 SHA512 0bf739cbbba49534b3147623e2aaf3513e0bff65a74441668a44cbad0e436abdb6033e25dfd13b2d5bdbf560127f891997c270f314e9f08efde4c1e95bd9dc6d
 DIST hiera-3.5.0.gem 40960 BLAKE2B c41d6a5cb95278e212234d6c144c5b97535c319c78874e13921e25f2f58cd9ea19884ed627bf4a715810589f9b70023b0c4bb2f6f1f8d51924ad9dac065bdaf7 SHA512 b9cdff688829fd8f124011abb4a43640a7531567a678c116e40259e1d110fd20dc7d2ac1711264f4ea61f2728f93027d65df25d5d4d8c339e465010ba2a269bf
+DIST hiera-3.6.0.gem 40960 BLAKE2B 1e49499ac5841d5fae884ffaf7ba7c72c55e3c04ee3023b2bee3e68e29d4827825e23ed4bb4a929d6337a1ff1d19dd1fbcad329495604c3171c3ab900e21b607 SHA512 6d76845e23732875c461d5b2df8599953f067ec84ea6648044e91822fea762118a108136e43ea9b7112511939978052f846d94e895b2b8f669df607fc90afbd0
 EBUILD hiera-3.4.3.ebuild 543 BLAKE2B 121f9fd758d74c0dfea47e5154778da04e759237fc8574e91429a16212f098a5f56d0798ab385f47d5c1ce96548fc28d5fb59610ff0043ec314700759e49fb3f SHA512 96805f69a7bfcc72e4b05e01d3a3eb835349dbe3fcdef6cdd06e1f9c1b2ae0c08b3c9119c93af8691b736b44e6e13a6d5c064d6099e7b3b5ec6afc886f07351d
-EBUILD hiera-3.4.4.ebuild 540 BLAKE2B 1dd281b299350bac945b5fe274857321f0adc0e0d592c98614659982219df504e16d01a577a482e79adf2426f7d2ccacaeea26cef69ba3557d9c14cb666be224 SHA512 e9f9211dfd1a460d6dc8ca5898c302b960dd2363fb313e28f4819369a1af423c5edfdc58d86091e042a662ea998597219649b8813d3bf532bfb93f383f96b8c3
-EBUILD hiera-3.4.5.ebuild 540 BLAKE2B 1dd281b299350bac945b5fe274857321f0adc0e0d592c98614659982219df504e16d01a577a482e79adf2426f7d2ccacaeea26cef69ba3557d9c14cb666be224 SHA512 e9f9211dfd1a460d6dc8ca5898c302b960dd2363fb313e28f4819369a1af423c5edfdc58d86091e042a662ea998597219649b8813d3bf532bfb93f383f96b8c3
 EBUILD hiera-3.5.0.ebuild 544 BLAKE2B 868b1b8736fac85b9465f8e9349be390765e82e9ccf37b7b787f55a2cf0b0e936c8792afe769edb23eb84ad5b4d50ef5721c76d7633e1d3e247005167ad3366f SHA512 3f3a755f864165ccd62dd98ccef9f9abbe285578c320f22b4d9b0dc41618ce5ae51d9d08b4f58c6b101960ae1850f11db5971c0f46b9fcb23a728defce350cbc
+EBUILD hiera-3.6.0.ebuild 512 BLAKE2B 7e4cdaac9853a9ef5cea85540d5823a56c0ac2c85219b91d6038ecf1cc9f123232f18756692a2a293f8b62183457bc0b1611a4c8bc391728b7a8d5f33507e8f4 SHA512 82fec6313ff47f74d52ae11628e6a89b855cb5e3b09ac858cad2c335c9d0c20ee845637201505921c02b10b329334233796d0e967bd0d52e63bf272f0653f898
 MISC metadata.xml 441 BLAKE2B 45d0b18035001279a7fc0b362aa00ab9bea5282f35a2237bb72e84893d8a9ff4b575e43928d48aa9906def18e3fe1bdfb121e5411c46af7117b529f136224796 SHA512 795fc49e90529600ad3a950440f33c9dc60aee0f6ad134b682d8c8e80452f015fd2de5af77ed6ad58830e61b1ab7944dcb81629d75d4b09927e218f33aa948ae
diff --git a/dev-ruby/hiera/hiera-3.4.4.ebuild b/dev-ruby/hiera/hiera-3.4.4.ebuild
deleted file mode 100644
index f653c3e47f1f..000000000000
--- a/dev-ruby/hiera/hiera-3.4.4.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A simple pluggable Hierarchical Database"
-HOMEPAGE="https://docs.puppet.com/hiera/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
-
-ruby_add_bdepend "test? ( dev-ruby/mocha )"
-
-ruby_add_rdepend "dev-ruby/deep_merge"
diff --git a/dev-ruby/hiera/hiera-3.4.5.ebuild b/dev-ruby/hiera/hiera-3.6.0.ebuild
index f653c3e47f1f..11b8f6cd7930 100644
--- a/dev-ruby/hiera/hiera-3.4.5.ebuild
+++ b/dev-ruby/hiera/hiera-3.6.0.ebuild
@@ -1,13 +1,12 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-USE_RUBY="ruby23 ruby24 ruby25"
+USE_RUBY="ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
-RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="README.md"
 
 inherit ruby-fakegem
diff --git a/dev-ruby/hiredis/Manifest b/dev-ruby/hiredis/Manifest
index 3ac3edf7d5fe..9113052ed869 100644
--- a/dev-ruby/hiredis/Manifest
+++ b/dev-ruby/hiredis/Manifest
@@ -1,6 +1,4 @@
 AUX hiredis-0.6.1-unvendor-hiredis.patch 668 BLAKE2B 028700bf24f26e0090fefde677c32c44de57558ce9e334c7d2396e8fd98112ad96fa9502a1aa363ff4843d3b7e9d80a07870a011482d0716b84d22414014d3eb SHA512 c58191682152d26c823c01c689a4cb9becc6dd870034e8ddb7f1aa64a345025f771beb1f72b3dcfebb6948412e1548c9f28fb65c11d60243acad232ecd5e5787
-DIST hiredis-rb-0.6.1.tar.gz 18843 BLAKE2B 56edb460d39018730f43aeb443b6a9d81e2573ebbb6c3149a18db836c8ef5fc8ceceaa768b1a7157280f3e2fd1ed117a76cc6d06c13e326fd45b8bd4efccb24a SHA512 23107d68501c244ec2669448aa919a612be182b559f28a715a4e3a91a894332105ae3a5c96652a691f01e49c88772a482f0da11b80bbb443fa0146bbf77cc722
 DIST hiredis-rb-0.6.3.tar.gz 19106 BLAKE2B 2892fd28bf7e7edfc3563a0c321fd781baeca9eb31a64dd559a6c828bb9c4fe37c995748782c5222db46b5b35a4d17f5b8b4d8e5306209a0e374ec7096d3cd4b SHA512 3e081d46aeb128789fa41fe9422186dd30e88c5a7a3c16dfcf1a92fe7faf99cced352ea39a885785fc12f0a974625be329d9ff2a5936a786febe8a2c81f5e139
-EBUILD hiredis-0.6.1.ebuild 1103 BLAKE2B b254b716a2999f3f2153e539c551144f010f65b24e00ca7fd7c7837e6b8aef8c41be601c4496af54c428ee7bea96977e55389bedb6fe55524cd96c445df5cec4 SHA512 ed008ee2aa2f173667db2394ba0ecfb3cfe0a5ee3157e6f609ec23ea5bb273a5697dbb98b18c3d2343f4adbdfe62731121729798c25fd8dd0c4f844c82e7ff0a
 EBUILD hiredis-0.6.3.ebuild 1110 BLAKE2B 0dbd2e342501a13abca63e2ab3551527184697b9177848382008483550ebc24b58937b82bc88af4f30694166a12861789dfe803c170958044a81132ad7f16a65 SHA512 4f662ba049310821fb2eb486f217b68f7ac523323916e62f4b2564f7ea47c0e139a5a506498a00c4fb75ea5dda4cfb6a30e6cff528bab86174b617ef753354f3
 MISC metadata.xml 342 BLAKE2B fd0bfbbf389a657ac98a4bd4da04180258197b8947e4fcff2d0495f99d74795e97c17d90e4f8cd3c37896fe438fb51f61b7c8bf524a546da12f1e1db949275cb SHA512 82e2c1eba3739857ef533105899b3fa50865136d9aa54709b97d46beb8791c3025b78fbd5173db3c5e0981c0d0873f88ceef9b4a1abdeee7d47c860ae6b25c92
diff --git a/dev-ruby/hiredis/hiredis-0.6.1.ebuild b/dev-ruby/hiredis/hiredis-0.6.1.ebuild
deleted file mode 100644
index 0ff6a725e116..000000000000
--- a/dev-ruby/hiredis/hiredis-0.6.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
-
-MY_P="hiredis-rb-${PV}"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Wrapper for hiredis (protocol serialization/deserialization and blocking I/O)"
-HOMEPAGE="https://github.com/redis/hiredis-rb"
-SRC_URI="https://github.com/redis/hiredis-rb/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND+=" =dev-libs/hiredis-0.13*:="
-DEPEND+=" dev-libs/hiredis test? ( dev-ruby/test-unit:2 )"
-
-RUBY_S="${MY_P}"
-
-PATCHES=( "${FILESDIR}/${P}-unvendor-hiredis.patch" )
-
-all_ruby_prepare() {
-	sed -i -e 's:/tmp/:'${T}'/:' test/connection_test.rb || die
-}
-
-each_ruby_configure() {
-	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/hitimes/Manifest b/dev-ruby/hitimes/Manifest
index 6ce814201253..be38cbb9c589 100644
--- a/dev-ruby/hitimes/Manifest
+++ b/dev-ruby/hitimes/Manifest
@@ -1,9 +1,5 @@
-DIST hitimes-1.2.6.gem 32256 BLAKE2B 8e8b2338e43776256d3c4c208dc178f9594461b53d03e2101e199bc588f5aed85826f25e5133082a861ac45118a041680e27e53d74a3eb86545ca6e724b5ef95 SHA512 41954000f38f4671b8ac7b5e408aa4a8d36756cee7807a5fc8b1584ecd463c38c36e9ac06966e2302730042193faea1a1a35dbb06f7c53bc594af8420f687257
-DIST hitimes-1.3.0.gem 32768 BLAKE2B 2b9158c661b2f885ba043990a0d8df51bedf35cbaff24f9a420a5a4572270eb30b16cd7d115ab73387c1f0b31bf7ca24659c1dea61e935e6245994ec10a03b71 SHA512 09c7d15be681d85c5ab89235909ad5680b171315e0883b636eb26459d2ad7a876fe1bd79b261a8bd80c22e01b42e04b5992e311655b6179c8dce559b48750c03
 DIST hitimes-1.3.1.gem 32768 BLAKE2B 8eb1d45896b52e51fe01fadbc3373be8a0a6262d872ee584ec94cd240a42770381fe0e355c2898df245885b4009f3684ea152d124ebb30faf8eccb7ced1bfc8d SHA512 47a276d9ca26e6ea5612b73638f9a46965123a0040fe8d4ec5559edaccbdb72d3ec7f9e9bf6aebb3f0595107f941fa88501578fd3b8a3bd79b937538aeadd5d4
 DIST hitimes-2.0.0.gem 27136 BLAKE2B e2bab57b70d63f3b2bbe29584b7051f6c829f7957da483fd83b38ffee4d5f6a8c1af16c2ee8aa71d56ee71160e7df87a46e420d70d0430e514ead6576453fc7e SHA512 06f1c17d9914054bc17244f1a22761c98f7409cb401136e582deec18bbee07358b339ddd49ddfbc01cf9eb46bf84fbf5e2dccd6c77eb36e98c357e99687e8201
-EBUILD hitimes-1.2.6.ebuild 906 BLAKE2B a932a550810cdff59fc17a88485f8c444ca5dbd77355eaad726a86e7e516be1017678920658cfba958b6ba87a17e834ff2108fc788c7e7ac46710cd628ee2150 SHA512 90839ee00255b226522c5e3847ae196de581776320493b863e06043fd3c6c5ab6aa4ea950ba1498344aaf9b876a3d618b5b682db9fba1b772149a920ced12bae
-EBUILD hitimes-1.3.0.ebuild 955 BLAKE2B 5660a5b079323c09763d2f96133f6d220c7ca015e292794611034b8637b84cc414a050d187cc25645995be1cdf6ad9da84800b97301401ad893bf28ffd615172 SHA512 7d67d96bc8cece5e48c67ce646f2292a8e9e4b48e85cab61dee1391413d51917914ef7480d8980c751101bd8dbf0b4ea77d8006b7fe601b9f91d8be26859cc73
 EBUILD hitimes-1.3.1.ebuild 955 BLAKE2B 5660a5b079323c09763d2f96133f6d220c7ca015e292794611034b8637b84cc414a050d187cc25645995be1cdf6ad9da84800b97301401ad893bf28ffd615172 SHA512 7d67d96bc8cece5e48c67ce646f2292a8e9e4b48e85cab61dee1391413d51917914ef7480d8980c751101bd8dbf0b4ea77d8006b7fe601b9f91d8be26859cc73
 EBUILD hitimes-2.0.0.ebuild 736 BLAKE2B cac88d3d9990c24e9fd42f18279b16d91f0c9530a64a3fcf3bc554094bac44b3bc5b86d6f9ed5ba469218d6e03617ed97f712ba3f5e6a4cf87233fa41857dd88 SHA512 08567e7c5cdb4ab0d219bd8846eba9f5578dda8f9a21da52cbacd02f687cbf8e63ae64921d85a1082672a0ef486bb41be470385dae25f3f83814a34e483d966c
 MISC metadata.xml 349 BLAKE2B 270455dbd5303a2527a2d62a00ed7d1a935fe84e0a556492315b109ad8270572c98d126e4ca17022f3cdc712c20fd5e22fed1f0cb1a21d489f9eb77a1835ac7d SHA512 7fecd87e7396d57d383d2e3055676ab89f9328121a625dc27ecb4a8faff1fb4d7b8d90547f0caf9f7767dff9d48c99185419e1d26dba906e448040b943a3742a
diff --git a/dev-ruby/hitimes/hitimes-1.2.6.ebuild b/dev-ruby/hitimes/hitimes-1.2.6.ebuild
deleted file mode 100644
index bc26bf15c8dd..000000000000
--- a/dev-ruby/hitimes/hitimes-1.2.6.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md HISTORY.md"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="A fast, high resolution timer library"
-HOMEPAGE="https://github.com/copiousfreetime/hitimes"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e "/RUBY_VERSION >= '1.9.2'/,+4d"  spec/spec_helper.rb || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/hitimes/c extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake -Cext/hitimes/c V=1
-	cp ext/hitimes/c/hitimes$(get_modname) lib/hitimes || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:spec:. -e 'Dir["spec/*_spec.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/hitimes/hitimes-1.3.0.ebuild b/dev-ruby/hitimes/hitimes-1.3.0.ebuild
deleted file mode 100644
index f605ee1bea63..000000000000
--- a/dev-ruby/hitimes/hitimes-1.3.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md HISTORY.md"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="A fast, high resolution timer library"
-HOMEPAGE="https://github.com/copiousfreetime/hitimes"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-
-ruby_add_bdepend "test? ( dev-ruby/minitest )"
-
-all_ruby_prepare() {
-	sed -i -e "/RUBY_VERSION >= '1.9.2'/,+4d"  spec/spec_helper.rb || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/hitimes/c extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake -Cext/hitimes/c V=1
-	cp ext/hitimes/c/hitimes$(get_modname) lib/hitimes || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:spec:. -e 'Dir["spec/*_spec.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/hocon/Manifest b/dev-ruby/hocon/Manifest
index 22b87119b655..728de34311cf 100644
--- a/dev-ruby/hocon/Manifest
+++ b/dev-ruby/hocon/Manifest
@@ -1,3 +1,7 @@
 DIST hocon-1.2.5.gem 147968 BLAKE2B 9fe004d59cc3e66d770c7c8069ff2934a17befa120ccfb2e382f36f632a186095c3a94eb25e77ba3fff422394444ae85cf3adde2ed045d50f0ac99871c6dd909 SHA512 7d2d86c28edd6ed6dd99358558093cd224b9922bcbcdd2e95e23134ef0e9a2bae6129e7273435032850b672094e77f8f5b6d8cfeec03762b39ed6b63fc5fb5dd
+DIST hocon-1.2.6.tar.gz 145888 BLAKE2B 743b58d156e046e8226aec7d616bc4a8f6a044687270d50c7e618dde890927293bf750e6d4cbc0f394d1bd9b089c751f30aa08685026dab658efad1313b54d1c SHA512 dbc48fc1c895ee3278431e4dd6bb6b8a84f50bb630a768cc1fa295440d7d057c0eb72ab54d9ed35d397bbeb0febf110586a7d641d91b6898100ab7bf7b2a9001
+DIST hocon-1.3.0.tar.gz 146291 BLAKE2B c7104cd7fa2621ef5e39148de6e67c1b272153ae1b39dc5558b38202b5315f600f2933c19b6e075a5344bb215ba7ddaf95a73e0980cd3ff006dc67437b10823d SHA512 67a69b516197b4a0e64c275fe4b930a3b1128ef1949c47263ba9a20bd8397152a2a5dce0c64ce54dbcf7bd3c81d77aa2fb450e12f5aa7bacb0c85e61083904f6
 EBUILD hocon-1.2.5.ebuild 539 BLAKE2B 242287c7614b6897ac0115d10f9ec29c4337e76f0b92cb539ba201ef8cb76daa978c62586477f3a4badfed659bbe106bb06aa83eede80980764c3015c00ae4ba SHA512 698340fa9cedb40faf187c1fd89b46e14f889024ea8dd2c0c1447f312a46e60d4d804ba8ca92bddc92eaae982a6ad8b5883b6c3c70b7c709c2db0e374e0fdf97
+EBUILD hocon-1.2.6.ebuild 630 BLAKE2B 0c89d6137187dbb05fba73e35cbefc660ccc99cb43af8400db13dc008487eefa8f19136757de9929025b950a69347bed653a59c85052ea22f70acb1cb64f59d9 SHA512 0719c2149983e006e9daeb061d27a7e9ef77358eb1f1ec554cd124e333b5d80875d3df2429cdb543da4ae348f89c8e93569c571868113e9bbd850561428253fc
+EBUILD hocon-1.3.0.ebuild 630 BLAKE2B 0c89d6137187dbb05fba73e35cbefc660ccc99cb43af8400db13dc008487eefa8f19136757de9929025b950a69347bed653a59c85052ea22f70acb1cb64f59d9 SHA512 0719c2149983e006e9daeb061d27a7e9ef77358eb1f1ec554cd124e333b5d80875d3df2429cdb543da4ae348f89c8e93569c571868113e9bbd850561428253fc
 MISC metadata.xml 514 BLAKE2B 41c8fb2854ca091452e2530a98518581287253088bc3709b9945a47ca1ad06ffeb4ef40a1da8e2843322fde51e805e381a768a8cf3fd14b5d62d660fe975a59e SHA512 cfd1c8e9f9eaf4f3cf797e9fb40bdeee6004a38e1d3dac66469dc43944204722720c63798671d3032034dd826f44075257db43021910d31af3333df423064ba3
diff --git a/dev-ruby/hocon/hocon-1.2.6.ebuild b/dev-ruby/hocon/hocon-1.2.6.ebuild
new file mode 100644
index 000000000000..c9a3580f249f
--- /dev/null
+++ b/dev-ruby/hocon/hocon-1.2.6.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_BINWRAP="hocon"
+
+RUBY_FAKEGEM_GEMSPEC="hocon.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="This is a port of the Typesafe Config library to Ruby."
+HOMEPAGE="https://github.com/puppetlabs/ruby-hocon"
+SRC_URI="https://github.com/puppetlabs/ruby-hocon/archive/${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="ruby-hocon-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
diff --git a/dev-ruby/hocon/hocon-1.3.0.ebuild b/dev-ruby/hocon/hocon-1.3.0.ebuild
new file mode 100644
index 000000000000..c9a3580f249f
--- /dev/null
+++ b/dev-ruby/hocon/hocon-1.3.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_BINWRAP="hocon"
+
+RUBY_FAKEGEM_GEMSPEC="hocon.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="This is a port of the Typesafe Config library to Ruby."
+HOMEPAGE="https://github.com/puppetlabs/ruby-hocon"
+SRC_URI="https://github.com/puppetlabs/ruby-hocon/archive/${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="ruby-hocon-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
diff --git a/dev-ruby/hoe/Manifest b/dev-ruby/hoe/Manifest
index 6b28ad6874f9..36305d886b1c 100644
--- a/dev-ruby/hoe/Manifest
+++ b/dev-ruby/hoe/Manifest
@@ -1,11 +1,7 @@
 DIST hoe-3.16.0.gem 188416 BLAKE2B 48383c46512a359a269ca3475ec701b1443e0ef71b31d1ca1604de391ed4df6b0ad27dd1c5f6ed04751047d211f2c6299245361cf131e2418f224324ac9934c3 SHA512 66cefb5a24906e19bbf0c82c8539d6d101b84d0dc1d3ce1910e4117357639489968271e76e86bd3c432b9ef7e3b24a78294c06210cbef280860f7dac18100606
-DIST hoe-3.17.1.gem 188416 BLAKE2B 0fef6dd9ae4bda93f527d7451d0d591cdc4ba1361aaec531f82e0d7ff03575845c3d5ff85189d76f9ecec17797774fd0ca82f7332a4588d086a494095af99a9d SHA512 5e4b83309ed88da098a5ae8698f9686cea1657f4554fff72446bac46bc567125232a3c5a5b941bd6d5ea18dc53f3cbf5b329f2f0623ef74e81d81586edc63ca3
-DIST hoe-3.17.2.gem 188416 BLAKE2B a6f4f93cc2d724b1c1e855c4e6976b5dbb469c4e10fc9c181b6cafaeb7088f9c19bd4bb5b858a25f011dead1b6e8392d349fe9e86d704a6a4d627cddab8de46a SHA512 d6703cd8913ac7055c33dbfead5610bd197be90ac3aeeaf2e4498ab088447d7e08dbe1ad3fdc602afd26fc7cfda12d73dd43a605b9bf59ecd83b1cfd8845f55b
-DIST hoe-3.18.0.gem 190976 BLAKE2B 227dab02241ffa1992fd80d357fcc8ec12a703413a25f38e7c22d97a187b968d334db7fe6b5d49ebe6027b05df660530dab9dd470bbd5816e7e766d86c4de94d SHA512 87b24dd77200a6013eca50b57c001c437035ab5e74809a941a28616d9a722b130a624f1137d7c55eacccc497c5c57f2ccfe872d160915b1a00a71cdf2e76695b
 DIST hoe-3.18.1.gem 190976 BLAKE2B 1b99125fddc42253918d2b9412401c0ed54a12006347b400050ecda17a1ce4491bf0419bc6ea28b68d5e1d77990973171c822862d93ee2cdc00a078f4e137587 SHA512 c281cdb2e89272ea84e54cd36d0cdec77cf6dd51f745c0aa99593586781e5182129f967086f008c33b38d25d7a3aacd2fa1899752e63f725d5ecf5fd5c04682c
+DIST hoe-3.19.0.gem 191488 BLAKE2B 186b2ad78f4f7181fa1120a2e1736ee630e16c73c2c748333ce5aab745bec433b1b11019e0a96fbef65c1d5f7039925e9fa161fd54a83ebbaee8e25299be3565 SHA512 1bdc77f78f0b1a7e0832107d40679928d8f0edc0a1deeb0e63c7f8e2f7601b5cbe0bc6c19e6f8b2f26459710a31538f8efc433ef5e930058d852e945c0b280b0
 EBUILD hoe-3.16.0.ebuild 1497 BLAKE2B 70ce01f4aa0912af1ef61ce64d28887dcb879947ed344ada0ec8f4e429f9fe0fae1b8483dd1cd14ddfecd5926029ab490ea48da6e117b09589462f3213552c23 SHA512 31c2fb219794ef584abb3e39b77dcb7a8c127e38286e8e6f094825b9765fd417421b71f13c3a21669a04249346506ce5163a590c5794aae52736aa73e58f00b1
-EBUILD hoe-3.17.1.ebuild 1504 BLAKE2B a5ed52ccd94f91c99a6193b813a9479d76ac3248d19fccb5b6315a6f53534a6e89f047ee8b02feb01cb22267ab4600003342159d5c2a8a419f3075b3e65b64f9 SHA512 115dcff0ccd103103392027a3c985dbafd7364c611c86693add83b5b7ff498fd8f53cf8b2ebedaf479f5d5c73a5679e002bbb6fd8f2ce6a3739aed1685cd4fbc
-EBUILD hoe-3.17.2.ebuild 1511 BLAKE2B da58d18bd9fe96c6d382f20bfb99e06f5570ceb19d3388f573ad5fb16385677f276a3e14f8c4d30040fb825e7c2808e9a49511f984780e2e282bd54b2def9b26 SHA512 3672439e08055d454012b3cc83d03df247723acec0d8ded832e88171d1c98976ad3f207ad95ba954213263083ec99942c39de510f7fc914fca41bc4e72c499d1
-EBUILD hoe-3.18.0.ebuild 1504 BLAKE2B 3653667a4a5d72fe5250d7b9d41700bd07642bb39d619254a68b60d22934d70f51ca2e8376d504df337404b3e49395bca74e73c07a2a7f1b3ba3914a916d8c57 SHA512 105a4a53e763614c7baa49caa26b3d15af9324484ad231f5286b435cbae9038497209db4ba63f3913fb4d5b35620fb8389c4687d0bf65e8683fcb0cafb15f2bd
 EBUILD hoe-3.18.1.ebuild 1325 BLAKE2B e7f84d5623d869e88b4c2f7bcb0a366dc3150625dca3f2c6e5e07d07e4a501d2d0368c193ba8ff5ec78ce0c17fc2c5c80868d813670b9b26e1735655720d2720 SHA512 a8f305c3567be6dcba2275cd0a2caecc671c64e1e8c025ddb08a783dbba674160d3474d6de72a77d51ff132c1497c56adab1bf7216a6afd501a8cbbf23e7c1d0
+EBUILD hoe-3.19.0.ebuild 1325 BLAKE2B e7f84d5623d869e88b4c2f7bcb0a366dc3150625dca3f2c6e5e07d07e4a501d2d0368c193ba8ff5ec78ce0c17fc2c5c80868d813670b9b26e1735655720d2720 SHA512 a8f305c3567be6dcba2275cd0a2caecc671c64e1e8c025ddb08a783dbba674160d3474d6de72a77d51ff132c1497c56adab1bf7216a6afd501a8cbbf23e7c1d0
 MISC metadata.xml 251 BLAKE2B e8bf2b70161d425791d65052583fd8be03b19ef3bb2a2cde34605bc93224fea9d8c6a91f0f2d630a00094ef54c0871e210da0e0134f52401bc80cb6b2358c13d SHA512 17d4dbd64468a524311a24ca065537a5b21560388efd282f3fa873e6722f70db6f83e3e5615556450905c29d5df2cf0a0855f9c0b38bf23f0f8112501456d4ea
diff --git a/dev-ruby/hoe/hoe-3.17.1.ebuild b/dev-ruby/hoe/hoe-3.17.1.ebuild
deleted file mode 100644
index b83e7ee54736..000000000000
--- a/dev-ruby/hoe/hoe-3.17.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="History.rdoc Manifest.txt README.rdoc"
-
-RUBY_FAKEGEM_EXTRAINSTALL="template"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Hoe extends rake to provide full project automation"
-HOMEPAGE="https://www.zenspider.com/projects/hoe.html"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc"
-
-ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.9:5 )"
-
-ruby_add_rdepend ">=dev-ruby/rake-0.8.7 <dev-ruby/rake-13.0"
-
-all_ruby_prepare() {
-	# Skip isolation
-	sed -i -e '/isolate/ s:^:#:' Rakefile || die
-
-	# Skip test depending on specifics of gem command name
-	sed -i -e '/test_nosudo/,/^  end/ s:^:#:' test/test_hoe.rb || die
-
-	# Gem.bin_wrapper does not work as expected on Gentoo.
-	sed -i -e 's/#{Gem.bin_wrapper "rdoc"}/-S rdoc/' lib/hoe/rcov.rb lib/hoe/publish.rb test/test_hoe_publish.rb || die
-
-	# Avoid test with random sort order
-	sed -i -e '/test_possibly_better/askip "ordering issues"' test/test_hoe.rb || die
-}
-
-all_ruby_compile() {
-	all_fakegem_compile
-
-	if use doc; then
-		rdoc --title "seattlerb's hoe-3.5.1 Documentation" -o doc --main README.txt lib History.txt Manifest.txt README.txt || die
-	fi
-}
diff --git a/dev-ruby/hoe/hoe-3.17.2.ebuild b/dev-ruby/hoe/hoe-3.17.2.ebuild
deleted file mode 100644
index 2267b1b7e3dc..000000000000
--- a/dev-ruby/hoe/hoe-3.17.2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="History.rdoc Manifest.txt README.rdoc"
-
-RUBY_FAKEGEM_EXTRAINSTALL="template"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Hoe extends rake to provide full project automation"
-HOMEPAGE="https://www.zenspider.com/projects/hoe.html"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc"
-
-ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.9:5 )"
-
-ruby_add_rdepend ">=dev-ruby/rake-0.8.7 <dev-ruby/rake-13.0"
-
-all_ruby_prepare() {
-	# Skip isolation
-	sed -i -e '/isolate/ s:^:#:' Rakefile || die
-
-	# Skip test depending on specifics of gem command name
-	sed -i -e '/test_nosudo/,/^  end/ s:^:#:' test/test_hoe.rb || die
-
-	# Gem.bin_wrapper does not work as expected on Gentoo.
-	sed -i -e 's/#{Gem.bin_wrapper "rdoc"}/-S rdoc/' lib/hoe/rcov.rb lib/hoe/publish.rb test/test_hoe_publish.rb || die
-
-	# Avoid test with random sort order
-	sed -i -e '/test_possibly_better/askip "ordering issues"' test/test_hoe.rb || die
-}
-
-all_ruby_compile() {
-	all_fakegem_compile
-
-	if use doc; then
-		rdoc --title "seattlerb's hoe-3.5.1 Documentation" -o doc --main README.txt lib History.txt Manifest.txt README.txt || die
-	fi
-}
diff --git a/dev-ruby/hoe/hoe-3.18.0.ebuild b/dev-ruby/hoe/hoe-3.19.0.ebuild
index 09811c75d60a..877de98a25eb 100644
--- a/dev-ruby/hoe/hoe-3.18.0.ebuild
+++ b/dev-ruby/hoe/hoe-3.19.0.ebuild
@@ -1,11 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 USE_RUBY="ruby24 ruby25 ruby26"
 
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
 RUBY_FAKEGEM_DOCDIR="doc"
 RUBY_FAKEGEM_EXTRADOC="History.rdoc Manifest.txt README.rdoc"
 
@@ -32,9 +30,6 @@ all_ruby_prepare() {
 	# Skip test depending on specifics of gem command name
 	sed -i -e '/test_nosudo/,/^  end/ s:^:#:' test/test_hoe.rb || die
 
-	# Gem.bin_wrapper does not work as expected on Gentoo.
-	sed -i -e 's/#{Gem.bin_wrapper "rdoc"}/-S rdoc/' lib/hoe/rcov.rb lib/hoe/publish.rb test/test_hoe_publish.rb || die
-
 	# Avoid test with random sort order
 	sed -i -e '/test_possibly_better/askip "ordering issues"' test/test_hoe.rb || die
 }
@@ -43,6 +38,7 @@ all_ruby_compile() {
 	all_fakegem_compile
 
 	if use doc; then
-		rdoc --title "seattlerb's hoe-3.5.1 Documentation" -o doc --main README.txt lib History.txt Manifest.txt README.txt || die
+		rdoc --title "seattlerb's hoe-${PV} Documentation" -o doc --main README.txt lib History.txt Manifest.txt README.txt || die
+		rm -f doc/js/*.gz || die
 	fi
 }
diff --git a/dev-ruby/json/Manifest b/dev-ruby/json/Manifest
index bd3e362dcad0..31898e7d0870 100644
--- a/dev-ruby/json/Manifest
+++ b/dev-ruby/json/Manifest
@@ -6,7 +6,6 @@ DIST json-1.8.6.gem 144384 BLAKE2B db9e407be4ac7e0cb2e09369637b88f70cdac7a659c60
 DIST json-2.1.0.gem 140800 BLAKE2B 28bb5334358369351ec9f13f5fb609ce34eb429cfeffb8dfde70864541516a0c2abd00a640b4647f76dcef198f967456bae0a858a2f213e5a30272c1be1878c7 SHA512 bffbe462e952bca321d4325ecb9c5e9f61e51cad13758581ecfaa6a038bac4e30dc7db50bd897086a5592f6fc437d0e0909f91e279aaf4dd71cf127100c3550b
 DIST json-2.2.0.gem 112640 BLAKE2B 973fe22979f4e2fa64a1090e44e5e149029881f20ec2749ce040b79a94610003941f6f3471bbc71e581491df74201bc4201419081c04a03790caaed888dfed1c SHA512 855d5cbeb6e62a7deb009ad454944430c0370cc98c53a1126d8ca3cac4b11a191bfb2ded84a957d4caa0f59cc9b6308e320a58569bddba8d6984078ea34703f2
 EBUILD json-1.8.6-r1.ebuild 2095 BLAKE2B 7b8628800c3c6d6a601efd0ed6e991ca1e47f19edc52f636a8d1de48911fbf2b5a49f2671f996b6a06f4f2d6e24552081296b437fd04264a8d03c0a8fa44f49a SHA512 95db4c2c9fd82752f0c2c11a2271379d2d0e80f981a1b0bd7b553abbcab648281a1ed7e67b254842981cf75bb6eb88d59cd10a4b6c17c81ffcfa5723bef52ee0
-EBUILD json-2.1.0-r1.ebuild 2156 BLAKE2B d1c9614441ba5c3a648e1a0043e7d232f321b0e365f9f53571327c8e521c509947883871a1e705a5a93c4ef56681f3be37f061eeda6f2489d25e955c7f8e3430 SHA512 3150d1eda31eb219f0c40f59c52087c3361a50853797e8ae96a5fb2dcec62c05d0507e7511b381edc3d39b9cead9c841f49fe6fb12a46e8a27c5a52029fea2d4
 EBUILD json-2.1.0.ebuild 2027 BLAKE2B 228e9bb057775ddc64785f12bdfac0ed48c0813d693e09c70bac5d60c1e8b2072424b2bf2ce18438718d33d6c558be711acacf39482ea58cd1fe3870e2868f12 SHA512 15a9e83874d4fb33346f58b232406bc4f5cd5a745d913cb1d04b6b06eb56c0db9133b5634c8798cbbd8141489cc9a1237620d1dcece789cad95ba14f6055bc1e
 EBUILD json-2.2.0.ebuild 2070 BLAKE2B b752db23a11a8b332190535333e1e7695d3be45efe9fbed3c54c59d3f21caef5635261e0a4f2b2e84fc792fb7f442d50bf909faf82df75e9ff56668987e65355 SHA512 62cfb4369e0a9d5458a4f39ed99102ea1b70127fe9f0b6dc29a218618946e73142ca2a5af7b132d2045853c77595ff9cd5682966862d65cbdaf3785a03c89c85
 MISC metadata.xml 336 BLAKE2B e1094160e19b252f7b3233dbd2006c889c0a02aa4b04063caeb7ded80bb2f08a2c4bc31cfb7bdc17398b8d1b8c3fc9f3600eafad9920fe0355c807d3899f794f SHA512 8b4fa7ef9b753bbf1206b1f8a796d3f3b8e3f9ca07906a2e01dbcc8c69d4cb5e5cb26c395d0676b4dedd70fb910cf0abd3be83d3c94f0b90aee87ea6fda12877
diff --git a/dev-ruby/json/json-2.1.0-r1.ebuild b/dev-ruby/json/json-2.1.0-r1.ebuild
deleted file mode 100644
index cfac1024c4d7..000000000000
--- a/dev-ruby/json/json-2.1.0-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
-RUBY_FAKEGEM_DOCDIR="doc"
-
-RUBY_FAKEGEM_GEMSPEC="json.gemspec"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="A JSON implementation as a Ruby extension"
-HOMEPAGE="https://github.com/flori/json"
-LICENSE="Ruby"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="2"
-IUSE=""
-
-RDEPEND="${RDEPEND}"
-DEPEND="${DEPEND}
-	dev-util/ragel"
-
-PATCHES=(
-	"${FILESDIR}/${P}-ruby26-1.patch"
-	"${FILESDIR}/${P}-ruby26-2.patch"
-	"${FILESDIR}/${P}-ruby26-3.patch"
-)
-
-ruby_add_bdepend "dev-ruby/rake
-	doc? ( dev-ruby/rdoc )"
-
-all_ruby_prepare() {
-	# Avoid building the extension twice!
-	# And use rdoc instead of sdoc which we don't have packaged
-	# And don't call git to list files. We're using the pregenerated spec anyway.
-	sed -i \
-		-e '/task :test/ s|:compile,||' \
-		-e 's| => :clean||' \
-		-e 's|sdoc|rdoc|' \
-		-e 's|`git ls-files`|""|' \
-		Rakefile || die "rakefile fix failed"
-
-	# Remove hardcoded and broken -O setting.
-	sed -i -e '/^  \(if\|unless\)/,/^  end/ s:^:#:' \
-		-e '/^unless/,/^end/ s:^:#:' ext/json/ext/*/extconf.rb || die
-
-	# Avoid setting gem since it will not be available yet when installing
-	sed -i -e '/gem/ s:^:#:' tests/test_helper.rb || die
-}
-
-each_ruby_configure() {
-	for ext in parser generator ; do
-		${RUBY} -Cext/json/ext/${ext} extconf.rb || die
-	done
-}
-
-each_ruby_compile() {
-	for ext in parser generator ; do
-		emake V=1 -Cext/json/ext/${ext}
-		cp ext/json/ext/${ext}/${ext}$(get_modname) ext/json/ext/ || die
-	done
-}
-
-each_ruby_test() {
-	for t in pure ext ; do
-		JSON=${T} ${RUBY} -S rake do_test_${t} || die
-	done
-}
-
-each_ruby_install() {
-	each_fakegem_install
-
-	ruby_fakegem_newins ext/json/ext/generator$(get_modname) lib/json/ext/generator$(get_modname)
-	ruby_fakegem_newins ext/json/ext/parser$(get_modname) lib/json/ext/parser$(get_modname)
-}
diff --git a/dev-ruby/loofah/Manifest b/dev-ruby/loofah/Manifest
index 3b51cc585442..f841b9bf66d6 100644
--- a/dev-ruby/loofah/Manifest
+++ b/dev-ruby/loofah/Manifest
@@ -1,5 +1,5 @@
 DIST loofah-2.2.3.gem 65536 BLAKE2B ce1dd5255b0089862d26926624ef6007416318b77f4eb818ff462d8f680f8ef901ecb6ae751e33e1881e303fd005a4bd776c0e6a575562ffb7fb0b62e376b753 SHA512 8e63e1d4e3719c2ffcc8cf3208dbdfa3eb6e328bb91fc8dc6de88c472aac47f1a22771928b08f3c6816c159c6a9672299823f5d48177ae543358e73444b8ac56
-DIST loofah-2.3.0.gem 68096 BLAKE2B a9c8a85aba97a7c3a72cb9fb09666ffd991f43c946725842c197fd787d7d27dfeeb153ae6c3ebf94b283cb06c25983a42221767419d2982145c87f22e7874d69 SHA512 fc933bb3c15f52ec1d0e3b2beaadd7b9d293d1cac2d5c639ff5e53ecc6e9de974aa5390e8caf499217abbb67853e0bee4e904f60b3e0be38dea4bdee5f3a65ad
+DIST loofah-2.3.1.gem 68096 BLAKE2B 367cf64fe458cdfb0af3dc57012d892f830a7aa0df2d30f66cde7c2f5c31c1f29be4d1b83b85f3167bca1bc02fb750a420bce655b803ca4992ded3061c8fc82c SHA512 188e84818abc3a3eed39afd66a75e7fa3c0a29f8ec957441f43f4cbfd962c8c3ea848e83f435a3d61ffc667273b5ff006df39d718b7631a11b62ae2d3f78b6ba
 EBUILD loofah-2.2.3.ebuild 999 BLAKE2B afcaba1dcf676a9ffcd459edf68af952c9a398a91496979f78492e506ca4061cc22d72499f5ecedd73a44d3b2fbc3c387f84d9865893d2415bee1a408a110497 SHA512 29c9aa4c6c61bf11ca246456c20cb1db22ca98c4323f1c3e96dde27659f0fb65cc2e4204d16f2f7b7cf90206a4862963663a2c738d6134eabce109086b5dafc1
-EBUILD loofah-2.3.0.ebuild 970 BLAKE2B 316979ad44a8d1450c01cb3de793a89c8f3019e141519ca099419508946147c3716b1b664ebcf1f53cb59c1088f65f12cf885607df873fbe3d49a26b464f25b5 SHA512 d19c521a3ef85a31175a325246d916fde1d96e517e525e4d91c39864f24a750e172202a71b1d3153311e6e13be4e7724b908c22d7f8f7901ba5a148a85ca7835
+EBUILD loofah-2.3.1.ebuild 969 BLAKE2B 56f22b23e3151f26c6243768bcf792dc501eebd73302f78d5affe089cdcedb6d9b92c98f5ff9514409d23c7ee406f80e2a0a051c87402454f52484c2a201dd66 SHA512 389516ff9320c05b862ef4d6eebaea8de9cbb8b36c5c36b766a18a3286d6466579b483cd963b148ddbfe56f03eff5a2e73ab404e585bb9654d43c63d1ec7186d
 MISC metadata.xml 344 BLAKE2B a3f2ff5b2aab094581e9f6a3874fbc35fde908d210ea6fbe3643bf8ffcae21de206d0d6afa5055ef3f9dc520778aebfe182dc6018bebc19b075e717278b7babc SHA512 dbcf17023520a30b8d578f04db73d0a67851199b31589473c9bddf1d82f6096d78369ce1b943f05cca904f1bdb2a09adc605a3dc5d8d4e64db5df152b89dd843
diff --git a/dev-ruby/loofah/loofah-2.3.0.ebuild b/dev-ruby/loofah/loofah-2.3.1.ebuild
index 7ea90a4b875b..14cf459e3264 100644
--- a/dev-ruby/loofah/loofah-2.3.0.ebuild
+++ b/dev-ruby/loofah/loofah-2.3.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/flavorjones/loofah"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
 IUSE=""
 
 ruby_add_rdepend "=dev-ruby/crass-1.0* >=dev-ruby/crass-1.0.2 >=dev-ruby/nokogiri-1.5.9"
diff --git a/dev-ruby/maxitest/Manifest b/dev-ruby/maxitest/Manifest
index 59dddb351784..3cf20f730c98 100644
--- a/dev-ruby/maxitest/Manifest
+++ b/dev-ruby/maxitest/Manifest
@@ -1,9 +1,7 @@
-DIST maxitest-3.1.0.tar.gz 60956 BLAKE2B 5819137a548dfe1ae1c641ea3ddb4fbdf522e08b35eddbeb5dd4f3cfe2f320d16779d48166be820215e3dedecbe1f77d2db475403d476e53d5019631a0972d09 SHA512 37fdba5658cd640de311efaaa50ca32b9415c0819b9adc919d6471ae9317f9a60eb5004afa29d67386b6b9524bda06791054b1d34e31ccbe160a56c315f44b76
 DIST maxitest-3.2.0.tar.gz 61272 BLAKE2B e67404333329cd32604a7bc064a7aaaa876b41dd47d0488c7ced107bcec16b127a8e29bd6129d2897efd49d446011d3c70a8b9c5f1c0d4e91f677f4a0bfa24f2 SHA512 9cf787067bed8db16148eca20494ca718a2bc6b034fb5d9c824022af4a8dbfd69cf4b605fddcd3a9ca09d18a699753738a50921befdf6134ec6c41ccc5170f91
-DIST maxitest-3.3.0.tar.gz 61303 BLAKE2B a44cf342f4b221d4f9d93313c81b73cd0bbc95e727b4f6fcd532fb23278a3d2a120ea46d4b811ce930f8583563b068e0d9ddca8f552bfdacb506e78966f8e17a SHA512 0c6dc8418b98166da3bd8c530669bab1e1fa3d2af9444b448327913fa637bf8b6a0c9d059c3854501c6633daa48efa980c1742e11468f354019d2f3ce2ea44db
 DIST maxitest-3.4.0.tar.gz 62036 BLAKE2B dc84890161d856ef660f5eca7394834ef24a7bde1c7deea6f38e24fc981cbcc99d791df0b00c223adc821cf3078e7075d1e4a588d46c31b60276c52619caad76 SHA512 8c75cd9c8768b3a59d79e395715338c264ee190f01a0658fbc29443e50090c056f74c293ff0a4c072db2e37e18f0cf333baf7e2ce1aa51d0c78acd262b944d19
-EBUILD maxitest-3.1.0.ebuild 1317 BLAKE2B 31f2c30ac027d4b8a2966b40af4a061aca7185cde8d3a47ef45c67d608d580ace8c436cbd31930719bb9691756b1b61774542f037e38099d35f2769a4ee3b228 SHA512 a90f668aa6699358133c128548a8a1dccd8d738f88d4ed1c3a64bbfe0dce07b977fb4ed907565061d64f62997eb81975ff62b41c08aebbe1342502ad1358b8a2
+DIST maxitest-3.5.0.tar.gz 61982 BLAKE2B 2098e0b1c2f77ea535d78e5165ba9289a8470ce5c883a0994b03b822cdcba2a6d90077940a3d483505579fc7c89f347f0d492196b28fe8292406e5d6975c6241 SHA512 1a2557cea0ac70d3fd9b487157e5b6943dfd5cdf8b953731041d495049a9c58be84110e831cc57171ded3d5540ce5a3cd3c68e97f7767e30b04e933849202f40
 EBUILD maxitest-3.2.0.ebuild 1298 BLAKE2B 512e4121a9237d0f68c4f824fad26447c6d839c011040b6106cbecdee2f1241a3977d02aa61ad8a9bfd65364dcf1823a23e551a0a63ddfb93e35fc3a328e662d SHA512 5c2969bac7c1530ab1b7ea030f0e14e8314dcc71be333e6279d2e315f2a4801e655546185b516f705f06a1949807f2ad9018b99bd045f972a69388b046e59c14
-EBUILD maxitest-3.3.0.ebuild 1268 BLAKE2B 40d09a07fe1aaf0774ebea90abe306b2e683bb4ee6af7a568a904caef0696617b087f0a12ed742850b8638821129e7a5c1ef8dccb4f021288b30e344a7a01ac9 SHA512 ea822abd3bcbd12611ebbb43be5359ca7754deb9b5285d4baecd143c23eb89bd16bb88e7d9728f1c09fec307813f8d1c76883fd7a2773a4e6482c211fed28854
 EBUILD maxitest-3.4.0.ebuild 1268 BLAKE2B 3a6c2a358ede46c5604112f1d95931c9faa92ae02a2bea49af2dbdc0003531cce29cc58c32ea783d69ff49f6397bd04d530242f7d86583979a9b69afe428657a SHA512 7474d29ab68de64d2b21b62f7a053d1b34635e486210654d78b0cbf06c16fe9218a208541689c767f262c0bde19c4340fadb25b11375e4edc6a9c98541d31a08
+EBUILD maxitest-3.5.0.ebuild 1268 BLAKE2B 08697a2ec7089e778a4ed46b3bf91102f7de9cdfd3a672b5b68ef071bd5d9ac98193e5ba74b90e34cf2a2e980951351097ed9ebaf6aea16c8f4e6b26d10c78c6 SHA512 731e1cdda5280ce88f0c6d74591f5af2feca18580faa9c053a18a94c710237b493dde0e1f43f93d8f3e7f0ef686df9baaf7c305eb7da005804a21d4969776e86
 MISC metadata.xml 332 BLAKE2B cdef4488ce14b1d8addc2b3f23fa74aa64022d4ed2dfea7a84c85122e357806dd3a466ec2f4fb0fd486373055a78ae579c0f68c90a22b8940499e1ae29c29ded SHA512 ad86da72b8bc8895b0e09bc9e435eefec9ca1738e8b34aceaa959b2431b35c2732c704bd68a02d02c3c88912c20395f8601e2d42ec26f5d15c064893c0ceff0e
diff --git a/dev-ruby/maxitest/maxitest-3.1.0.ebuild b/dev-ruby/maxitest/maxitest-3.1.0.ebuild
deleted file mode 100644
index 0275150a1023..000000000000
--- a/dev-ruby/maxitest/maxitest-3.1.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="Readme.md"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit versionator ruby-fakegem
-
-DESCRIPTION="Minitest + all the features you always wanted"
-HOMEPAGE="https://github.com/grosser/maxitest"
-SRC_URI="https://github.com/grosser/maxitest/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="1"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend "<dev-ruby/minitest-5.12:5"
-
-ruby_add_bdepend "test? ( dev-ruby/bundler )"
-
-all_ruby_prepare() {
-	rm -f Gemfile.lock || die
-	# Remove developer-only gems from the gemspec and avoid git issues
-	sed -i -e '/\(bump\|wwtd\)/ s:^:#:' \
-		-e 's/git ls-files/find/' \
-		${RUBY_FAKEGEM_GEMSPEC} || die
-	sed -i -e '/byebug/ s:^:#:' Gemfile || die
-
-}
-
-each_ruby_prepare() {
-	# Use the correct target
-	sed -i -e '/sh/ s:ruby:'${RUBY}':' \
-		-e '/sh/ s:mtest:'${RUBY}' -S mtest:' \
-		spec/maxitest_spec.rb || die
-}
-
-each_ruby_test() {
-	PATH="${S}/bin:${PATH}" RSPEC_VERSION=3 ruby-ng_rspec spec
-}
diff --git a/dev-ruby/maxitest/maxitest-3.3.0.ebuild b/dev-ruby/maxitest/maxitest-3.5.0.ebuild
index 55dcc6eb545a..c9c506088aac 100644
--- a/dev-ruby/maxitest/maxitest-3.3.0.ebuild
+++ b/dev-ruby/maxitest/maxitest-3.5.0.ebuild
@@ -21,7 +21,7 @@ SLOT="1"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
-ruby_add_rdepend "<dev-ruby/minitest-5.12:5"
+ruby_add_rdepend "<dev-ruby/minitest-5.14:5"
 
 ruby_add_bdepend "test? ( dev-ruby/bundler )"
 
diff --git a/dev-ruby/memoist/Manifest b/dev-ruby/memoist/Manifest
index 8efee3d6284c..a58504c3ed26 100644
--- a/dev-ruby/memoist/Manifest
+++ b/dev-ruby/memoist/Manifest
@@ -1,5 +1,3 @@
-DIST memoist-0.15.0.gem 11776 BLAKE2B e25e4a203e9cda8028809b2b381ce0682909a3eca88034b6243c9f9fdb0dadcefc21eb62bd6b4723310956671238f25355edbf0cd796e8a4c694aebb3005970b SHA512 ee8ef99f78bc37c745be6ff156a9533eb1f288f8fd9b81a88520c1e2ace465379f3ac7c666d7cac2a3cf286bf3d0a85e2e2d10ab4fa17eced676b7072e3f592f
 DIST memoist-0.16.0.gem 12288 BLAKE2B 268d0ad8b197101b7a1af0e9c67fae7cabe7d4d91bbf7bbd4435f4390176faad46d2a2f0699830bed86eb39acceb698870cd7b0a79cb1038390478d37596c700 SHA512 55a560793cfb911ef15085de6fac2816e8340b9939394a4c2c01264e0da3ca4008081916a0431e6f76e6b90c0294305cbd0803643f159f946973ff4dc7c94df5
-EBUILD memoist-0.15.0.ebuild 530 BLAKE2B 52ab2337e7419041c7705d629c6a32321f5f83316e0658c2e0d7c7fd5d520081a17c52441650fbeac82b4ab279af1a9203a0a891a9de65b691bb59fa23cf2eb5 SHA512 6b9c25eafbb2971b0f96eda9d083f538e0269fa8073f1ab4d102630a4b1435f9b490e970819a5508a6e2a0e5b82223b46b925979e9369b52b27159974835e7e0
 EBUILD memoist-0.16.0.ebuild 527 BLAKE2B 4c806d184cce9399f42579a56f286668fc776c7a6c07b2c7b8e10649842a1cc6a1bc0e4622ea3b138eb6a376354a25e95671be4e1a280b1af11ca734a5b0d39b SHA512 c420d7733eff290e0af238340f08876636153f8ecd76987a522ea1d34a76d107b8ce1581ea45b6ec4fe21467468322c15c77e3f2b35ebd5673116a092c525faf
 MISC metadata.xml 477 BLAKE2B 7054dd9012ce8821d8b86fb26a7a81fd6d48e8a98e5498920b4c95b275f70919e70dde1591364f5e8ac24201c37d8e871d2af14cd4f7505966416f459e5d8dea SHA512 019d2ccf64907ccc3d5be96240e30409602fa2831b5a0b498f06f1e7bf1cd8d433f6e3b1da26c768fe6f2c96c46347b07e9691b0660521ee0103ad1a0b3137cf
diff --git a/dev-ruby/memoist/memoist-0.15.0.ebuild b/dev-ruby/memoist/memoist-0.15.0.ebuild
deleted file mode 100644
index 771e46372abe..000000000000
--- a/dev-ruby/memoist/memoist-0.15.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-DESCRIPTION="ActiveSupport::Memoizable with a few enhancements"
-HOMEPAGE="https://github.com/matthewrudy/memoist"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/minitest )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/ s:^:#:' Rakefile || die
-}
diff --git a/dev-ruby/method_source/Manifest b/dev-ruby/method_source/Manifest
index d2cdc235a4c5..87510f18c344 100644
--- a/dev-ruby/method_source/Manifest
+++ b/dev-ruby/method_source/Manifest
@@ -1,7 +1,5 @@
 DIST method_source-0.9.0.gem 13312 BLAKE2B c3d3cd541b782a3e4e2aa2b1576d9206338988330a17e9770e82ff9fc3156f6feff9be970f5f5f0cef90ee160a3dfbbd20c1bac34593906a47daa7404895b08c SHA512 4ef6cdf3f4427a7910f9da8e569d9cc2711de449498fe88ea8782379330a5725a4800168b06fcc593c18faa52294836881852768306303ebc658f97c1bec8830
-DIST method_source-0.9.1.gem 13824 BLAKE2B cf56840a311f628e43888e7907f497ecca726a9211960d097d8a82f4220b2b825cd521a0da16ce9fb2aacdba04f129576fa1e9f77c15828c8d3fa60d8882b332 SHA512 950fe3ca8f4f2087133e23ab13d7a82ebacfcf873cde32d30f7601d48b37527570572012ed3bd06a04cdaa4e603444eab91f9b6287025460bead64105b913313
 DIST method_source-0.9.2.gem 13824 BLAKE2B 842277a0a38331430c3c6a9f45c01d965de1997d8e9aa291d1948103c9812a23c5e67f3e7b7a2e6ec982de2a5eb841a78f6b8d1633ed17c5b7fa916698737ffb SHA512 87bac1d9ef2f1b09a26358d6d2e7e1035703d1bee9b6689567e8967baa544a456b63b2a1271305979ba077ebae32062708666588500e5810dd9f8e282d444b8c
 EBUILD method_source-0.9.0.ebuild 478 BLAKE2B 01630b9db733e9573586f94ca393b2ff53303cd19bdffa4490fac69dd872e6242711c517d26fb391aad175869877c83b63aaea06bc750573534b213f3c581bed SHA512 3ec28bf46d6dbd89cb56076eddfd32024f71e3ddaf4a13159066e9da7f7514a1d500b0c6d99070b69a4f7846b233b51512f91fea5520e0acd006de6fa29b54f1
-EBUILD method_source-0.9.1.ebuild 476 BLAKE2B 3f859cc18fbe18f534aa5e0d825a66a776c70a5911f9ebe731057c320095edaf09dd95e38aabb7d63ae458a15b9146220a414a4685233dd602a83d5e662ddb73 SHA512 9b9c27d708f536c8f61fa6763c1b4760ca6874a9acf2c1778650270d23b3bb928b8b9ecde2a322a50ddac38f2bd8ac71ba7447ff297a6f2473c289a8e401a492
-EBUILD method_source-0.9.2.ebuild 476 BLAKE2B b05880d1c60935d4770fd2a2ab8ca461cebeae36ccdc38ad7f6c5f1dd94159fef62b0fba004bcf2d8641b3592d99c5719536e6c40c1d61132417976460983f34 SHA512 34774db4531bae21684998f99fb976f19ac3208a00f4bf11b3c574bd8d482903f082259d827a2fa8f2d8a51e3410adc37ea1ae47b9f00626ff75ec39920ac406
+EBUILD method_source-0.9.2.ebuild 475 BLAKE2B e2562cb249acdc1771bc5bffd8bd1039690064a1ff42f620031edfcc12a5acfa9f86c94341507f8a1aeca5b186e9813996f48b83c9f3c94e1f84ce4d6df4bff1 SHA512 3163053fd37fd52dca233fa13091f60864df048c384918c083fcfb35d48af0d5398ae35141c9bc8b9240095ddeec9ba9894750e953a3503e52764a1d70205d33
 MISC metadata.xml 348 BLAKE2B 055674d709a654248c63bf20a1867646170cd6b9e2d74cf54b6640ed14b5b0255b2e23986ed068a96412b0c288262fd207d0e267b70f356ee048635732f8a965 SHA512 425721c75e37753f9df91fdc628d1cdad2ab61fb9c49af31405df4070bcf429a703b8696ba5f0a596416f7d7f14ccb4285e39afd15302da6ec753a630d098e88
diff --git a/dev-ruby/method_source/method_source-0.9.1.ebuild b/dev-ruby/method_source/method_source-0.9.1.ebuild
deleted file mode 100644
index e3fc79ebe073..000000000000
--- a/dev-ruby/method_source/method_source-0.9.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.markdown"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Retrieve the source code for a method"
-HOMEPAGE="https://github.com/banister/method_source"
-IUSE=""
-SLOT="0"
-
-LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
diff --git a/dev-ruby/method_source/method_source-0.9.2.ebuild b/dev-ruby/method_source/method_source-0.9.2.ebuild
index 892eed4a6816..13c9344f8abb 100644
--- a/dev-ruby/method_source/method_source-0.9.2.ebuild
+++ b/dev-ruby/method_source/method_source-0.9.2.ebuild
@@ -16,4 +16,4 @@ IUSE=""
 SLOT="0"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
diff --git a/dev-ruby/mimemagic/Manifest b/dev-ruby/mimemagic/Manifest
index 1bf0b5f1295d..60c9bdddb484 100644
--- a/dev-ruby/mimemagic/Manifest
+++ b/dev-ruby/mimemagic/Manifest
@@ -1,5 +1,3 @@
-DIST mimemagic-0.3.2.gem 366080 BLAKE2B a99db4fee3a41da872a95dcd31126a497ab47cf990d3c390ca1552f632d1dba5abf86378f2500b285f1cf9f78a56040ee6ee501f641de788e11fd693a655d839 SHA512 0d919ecf7f787c1b72ea337945089070db3647976192adeb510985542962a9efc9a2dc62c51024a9a32afbebf804c21745cc06d6d4738f570f1d2eee0b1ae181
 DIST mimemagic-0.3.3.gem 402944 BLAKE2B 422dd8bcadb2f04fcad2956339cf66a9b5c256462775be9c222b1be968ebde185e15c1fc0107d495dcad6dde59b7a35910d0139740d96a474ec037ccf181f2cc SHA512 ea62cf519af76324ed62863142422a4b5546927b243a9ac45c37ae0b8bfc97813b2276a1fd898bce470b091b1818190a0dc1637d167233a2e187d78e27bb8b77
-EBUILD mimemagic-0.3.2.ebuild 526 BLAKE2B 0c8c32a616b98e0e2917dc488c38809bdaf9134f193d745ec6fe2e93daad6d4a4dc1e991d07a18c0e17ae82991d9baa5f3485a5297eed12eaf61c1725863e3c2 SHA512 be261d80dbd1245d94ea003c8bb771de037115d2b28ff0e2e960717fcddc9eaff2a80995f543e54eea2a0092b5d79a4758c2c041cb054f1627566507583bf29e
 EBUILD mimemagic-0.3.3.ebuild 459 BLAKE2B 119792f97e79442a6febcbcab3e10c0442286337b61232ed21686c49d86835fed521929ee0ec9401ba5e911c5b05e80dc79f82f7455f73d53653cae6a8970c46 SHA512 f398a65ada4489b4150d0bcc8b75761c1de1c79fe17d8ef4f1acce58e530164547c67c437d9c914ae243feefc4e85951c696037aa053dbdae0a588e80e057ba1
 MISC metadata.xml 341 BLAKE2B 6d21edf9da7e6ae6913d3101cb96b5e82376e080baed3c07b9d4a9259eb0c097522b35807a89e4b9b32fbc6a6288dba17be7912bef5654dbdf32c9b34da567db SHA512 601856326d3da975f418b59996f89c68b33d089d662b684b9db13ea79481f34706fd4726a531f7f2fee55f25e2c7b3d1ecc69cedab1ff627109c80effa7bc406
diff --git a/dev-ruby/mimemagic/mimemagic-0.3.2.ebuild b/dev-ruby/mimemagic/mimemagic-0.3.2.ebuild
deleted file mode 100644
index 0509dd0afdc0..000000000000
--- a/dev-ruby/mimemagic/mimemagic-0.3.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Fast mime detection by extension or content"
-HOMEPAGE="https://github.com/minad/mimemagic"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/bacon )"
-
-each_ruby_test() {
-	${RUBY} -S bacon -q -Ilib:test test/*_test.rb || die
-}
diff --git a/dev-ruby/mini_mime/Manifest b/dev-ruby/mini_mime/Manifest
index 58d4a26ec3f1..89084095aac8 100644
--- a/dev-ruby/mini_mime/Manifest
+++ b/dev-ruby/mini_mime/Manifest
@@ -1,7 +1,5 @@
-DIST mini_mime-1.0.0.tar.gz 31205 BLAKE2B c82b806dec4b726d997ebd916e41d8873919a2c53ef1a6b8b02a94ef174837079552058084999e870944885118ee37127c29aa46c602bdd58fdc85bf473fd0cf SHA512 dbb976fa23679a42a2e28b06eb33f61ec991e7115e9bbadca7d09cb4b247a2345b14a2cb4fd4897aab5ffb40c710e931302d07ea3dff4ee64e935a70c9e88fff
 DIST mini_mime-1.0.1.tar.gz 31329 BLAKE2B 970927c8bb2d00f2e0b71cbca9aa954f732eb9d46d2e9b35a6b042ade88aaea993b40023a189b4ce1515b2b476d123945b4ec2d3fef05d4444f3e1a0f492df65 SHA512 2002ed95fe49bf71a95987f35e25e9086a5365e6eff9f7cf8a33a742cbbbd31e5020fbcd0d35b31e7dc61c0e82390a03e5241f4e5a88e9f7d7a2d3020c0ea9ee
 DIST mini_mime-1.0.2.tar.gz 31971 BLAKE2B b2783f9376d5299ba77d1cab0326f706cc671a96aac58e8c65879f9180cf3f1f359eba1b8ed4028c775728d4d633d6e8cce06acee90cfe9b60cde2e53f9a2360 SHA512 644eefdc9277642b8b94ce8071826ec993f7da1a5bc8903bd17ece05a374f286014d05b5765ec5a5f7f0fa9252b56d3bdd03109a3702075f6e8ccb68a4cef98d
-EBUILD mini_mime-1.0.0.ebuild 810 BLAKE2B c1ce197a54e0e9a9d7ff5482fbef00b37005bbdd6d642ee81189365d0bfe332037da4c04e582fe9e3ea25b905248e513f56630b373d1707fcf9d7110279cdf31 SHA512 642a145206d57cd0e8f73f13451ce10af585e75a747a26d738e6a8e8611296aa2df6ceb3c093a63e3e917adecdc9503766bf365b4a55ab43061a6bca17114379
 EBUILD mini_mime-1.0.1.ebuild 1035 BLAKE2B 90d8df4f8acef65e610d7ee4da6d27f1d924be9e6aa4a23835d9890a955522d8cca591b03053a5ebdf9a7fcd2987f78f9640cbc3408f97202346c1a7a09b2fbb SHA512 83d83efb38af17983dbf8592e7d75c6069321fba5e7a9e717590fe501d3e5a5e35b9ae656d23470604a70b4448c86de9bd3e7a3599452997b4a09108d3d57018
 EBUILD mini_mime-1.0.2.ebuild 1029 BLAKE2B 5333b85ee878887a77593d983c7bd1c1a1d223ed979976ab51673f19e1942c81ec93bc66badffd03fdba694428316a5f70b15a93080ecdcfb8aef7daa2effcd8 SHA512 318e5c9521065eb859d0998fc8605235a1a5bd32918351b6e976b27d9edca90637743a1876b283e341289d579cc6893a0fe2c83ad7eaa56d0031fff89f0ce92d
 MISC metadata.xml 345 BLAKE2B fc6de1be1e40f5e450d784f3e2e2be6f0339687cf728fd6b63bf6f4fd1927200f3a5262a2fca9bfa5a33310cfffdab9fbb817ea40072dfcecffc963b5193107e SHA512 bbffbfd689e60f39f73d5117f6327b250a917446edc6d0dc14cb43a5fbb00dbeaf6ebd92c090f3e7b2168dfc0c409c58be287acad9243a420bd5bbde64f80c43
diff --git a/dev-ruby/mini_mime/mini_mime-1.0.0.ebuild b/dev-ruby/mini_mime/mini_mime-1.0.0.ebuild
deleted file mode 100644
index 3403376f8144..000000000000
--- a/dev-ruby/mini_mime/mini_mime-1.0.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="mini_mime.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A lightweight mime type lookup toy"
-HOMEPAGE="https://github.com/discourse/mini_mime"
-SRC_URI="https://github.com/discourse/mini_mime/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-
-all_ruby_prepare() {
-	sed -i -e 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/minitest/Manifest b/dev-ruby/minitest/Manifest
index 19d2a1fef193..f02f184389af 100644
--- a/dev-ruby/minitest/Manifest
+++ b/dev-ruby/minitest/Manifest
@@ -1,11 +1,11 @@
 DIST minitest-4.7.5.gem 57856 BLAKE2B d0ecb0a0693c35ebbda52e9c755b72f07e38d6ccc266312a3426f9de3c40165d68bf07d5ed162ce51e31b1bb8502dc844fe61d9e93733108501f156c3096af23 SHA512 7ea0a52d37f4631fb8b11d4389da2123e4207093f7b34c497fced8729c9086faaa35e997debdb53b694e05eb52b16e843960f0b54515c32207f87161a76c3851
 DIST minitest-5.10.3.gem 76288 BLAKE2B 2c4fa5bca17e8a6270923225cd91fa9b6374d2a00b278906faf4e3ead0baf5fb1572a3c75322befc35ad0016d86f49c905e7de0283b07c60585c4c0348d69701 SHA512 6a3b1c86471fd7bb6ca078de9f253aeb9533f8da027998c34cd7fb8165a1d3bb565c1f8df958bb0eef6b7e22658894175c5f54f475585f2c05bb667e812b7aa3
 DIST minitest-5.11.3.gem 79360 BLAKE2B c348957e094bd91e88c6dace522b8e88c37ec435d58b4f6f8c8b458cfd26b789cb00cd43fa9d515112a8f3c9a736756d59c46f4117d1c1948d08cab0a5eed6aa SHA512 387537aff51f8e8f9cc2feddadf6813d11f0ba623ae3d5929d7b7a88e180b60c961dfa1d2ba0f3a4ad7d2c1af250245376fa62b23f68c8b57812c7e86efba0c7
-DIST minitest-5.12.0.gem 82432 BLAKE2B 6bc28aeb28646716a246e69c2ead3acbd1cbc8d719654509228422ceff4cd224e3c2e718b2300c7b181b1685db22416cb1943042132e5093a396cf733eb3fb90 SHA512 54a4385120f37472c68baaf97aca01630cad4ecf48256f923921ae827e60541328dfca445a7175786aa4819492d9dfba6c3054e8c8a95f5bd09e1ceb73534f8e
 DIST minitest-5.12.2.gem 82432 BLAKE2B fb8df3d5407a96b7be9611c19763a4480c20ac29aababc147f14f0684926806a76e2b38a75009a11cb2cb1e3ded371ef5b9275ddb87251496315f0ce023e4382 SHA512 7a14769e7eb1c4c950380da86a1e7ff8836f05bfb5b08216f4c0fe9e1709982e3f189fb579b1d74b307f6a17e3136d4ec3d7811562415942154a905364e1428e
+DIST minitest-5.13.0.gem 83968 BLAKE2B 90f2bc20328a5522a51bcfee94d69e6fd03189190a04ee77499d574531e95b8f8b6652cc51a5917e51920f58c0f95465c27c5d69bab7aba01e02502ccf72ae38 SHA512 bdd0d665cfd6f6e36dcb1f2f069f5154a468f68eb4c41f5c39e3a3397644141d5e05024023b20fafbceb983b019b00a0ec6da98432f505cc8fd1cebc11cc1fca
 EBUILD minitest-4.7.5-r2.ebuild 932 BLAKE2B a91961d75ef1e27fbe9835ebdef56f13da1b651ba9b329e179e544ef2be1e7968502e051591b480fd602f5787b5e55169c13c7398a4b8f34ea0a6b514cdece22 SHA512 ee0ebf357896e9f4b7c2d1faa47777b4a034b30189cadf8293e8366e280f194fd8024d97a37c151c2d327d0552c17ef4aafa802e091225413496e2fbac567c56
 EBUILD minitest-5.10.3.ebuild 771 BLAKE2B 357abc8fa6378337c586153754407467ee625a05e7246ef27c6161d412c076c5557a6fe21a2a67390a1230938333174a44424cf340697cc9d94b3b19a1584177 SHA512 e34a7fbe11e0e31eead8cf5de7b62adb792b5629870620b51530399e27512e5b93a39091a35f0e5e78702cd1c3d8623a3d79552de58f7fc5b1b5a6ef92b38fb9
 EBUILD minitest-5.11.3.ebuild 780 BLAKE2B b7d005f083303544ea106a8da65186045aebea32fb587b2a0b7fed55e593488d3253fc3ed11fb94eb8b3a5a088a364ae8f202579ca54616b658309b3f6d542d2 SHA512 f6ef7bae395e2f594b7af5b9fcfed679f8d1b387cc34e4d9fbac591bb486ec84d9b853a09ed80359b9ddf9ff446a57fa3c161eb6cc993b3c557e9668f969feec
-EBUILD minitest-5.12.0.ebuild 742 BLAKE2B fe4e93b7a345f1e939813eeb890afec126b5c40c78fb5de0f653ea3ca40ffc1ddc22d1b88a655911b19d502dbcf858c7dfe0738fd4f59f10fbf6f5e895a49bbf SHA512 1f2d931965e8325b8ce43cefa7fb5260a4b2b0424de99280fb7d6697a098e5fa07d25d3061ddb21c4a52315a8acdbec7751958ea701edffcfb814d2ef04fd680
 EBUILD minitest-5.12.2.ebuild 742 BLAKE2B fe4e93b7a345f1e939813eeb890afec126b5c40c78fb5de0f653ea3ca40ffc1ddc22d1b88a655911b19d502dbcf858c7dfe0738fd4f59f10fbf6f5e895a49bbf SHA512 1f2d931965e8325b8ce43cefa7fb5260a4b2b0424de99280fb7d6697a098e5fa07d25d3061ddb21c4a52315a8acdbec7751958ea701edffcfb814d2ef04fd680
+EBUILD minitest-5.13.0.ebuild 742 BLAKE2B fe4e93b7a345f1e939813eeb890afec126b5c40c78fb5de0f653ea3ca40ffc1ddc22d1b88a655911b19d502dbcf858c7dfe0738fd4f59f10fbf6f5e895a49bbf SHA512 1f2d931965e8325b8ce43cefa7fb5260a4b2b0424de99280fb7d6697a098e5fa07d25d3061ddb21c4a52315a8acdbec7751958ea701edffcfb814d2ef04fd680
 MISC metadata.xml 344 BLAKE2B a719762acb7e752051fc25d212f40e610a1a00644f8a09a4122bd874ec15af826d9360697b8d63d68fafd6596a8ea34439540894d8b8b9606baf5ddd4573d152 SHA512 48a43ffed154ec65035a6e84ec7e7e9ec222698b4dd56a81b6ca84844d9835c087fd7972d38ecc40fdba7f74acfeb2004bd1084d2cd123ffd09906e644c59e00
diff --git a/dev-ruby/minitest/minitest-5.12.0.ebuild b/dev-ruby/minitest/minitest-5.13.0.ebuild
index a3e50f68ee5e..a3e50f68ee5e 100644
--- a/dev-ruby/minitest/minitest-5.12.0.ebuild
+++ b/dev-ruby/minitest/minitest-5.13.0.ebuild
diff --git a/dev-ruby/multi_json/Manifest b/dev-ruby/multi_json/Manifest
index b494763af978..ab5e599f8744 100644
--- a/dev-ruby/multi_json/Manifest
+++ b/dev-ruby/multi_json/Manifest
@@ -1,3 +1,7 @@
 DIST multi_json-1.13.1.tar.gz 26098 BLAKE2B e82a08a747a092a9094cd7b35b4f933b5ac922a01f45a51b215ca9c4cdb9a083a4808d4bbe67a147ecb57e0b7b7e313c3d896f8cd80c79338c24abc3b90a09f9 SHA512 7c98392bd1c909fcc05249a02a010b561bf6c2d812ae42413d6e8dafa62926d8cb76226ded4c61558a00e5fa531ba33b6f4ef562648c52ba9b552ff7b7e27682
+DIST multi_json-1.14.0.tar.gz 24558 BLAKE2B 78138ab956f71d5875d3ca0d0a7b10fc93fa303648de8515d705ac5e24ed5cf84b425ef4aeebb1ef80862cad373698c2f57eddf17e6558d810edd1a3da2ec342 SHA512 dc2adaa9b5092c653b0a6365ad254a8b920f391123c2625c6ea8168c675346da69f1f003face872e66f493e078f511872d3715e4eef242627b0862cdf4aa3735
+DIST multi_json-1.14.1.tar.gz 24713 BLAKE2B 188d0fa3bf7a46a6cf4a5aa1d613523b4da3dee5061a5288146d1a367835b255f103dec265da9a218dd6dd21ecb38a7ce35d16a758ac7754b440f52c25f0b703 SHA512 19e2b6704a8ed39b8714da449c8961e740198772718ddba3d3b651f71f2b7d8c2c198d9cc16fe290f1df7b1e54d029c01147fdc431a8d2763944a4de802b89d9
 EBUILD multi_json-1.13.1.ebuild 1919 BLAKE2B 5b595fec88c3ffcabb3042888639fbc86a21e65c62f4bca4b4edbd3d39f7b339c619012f51e335cc52bebdb9bec8df3d2e952a6da7b47b66107844ed600dd46b SHA512 00993ecb67fbd6f43c4f9127685b10a2acc183aab9868c6900f8e647eccff5a7a4d02ca95aea07b06ba78b041738185cc531ef1b974a727f2077e2a02588654e
+EBUILD multi_json-1.14.0.ebuild 1981 BLAKE2B 978456342229b4eec46a289d764cd60f04f91bbcf2cdc4fb2bc79a7730d4393e64dc2fdcbf7cea7c9c7edccb316607fd0c1f552c63f0306591554828c4ad9984 SHA512 efd7c208f37f90536b7067892a88ebbe6dbf7009a9016c44fdb2690301455a369ecbfaccdc298827eac50770a172fe0bd6059866b44af6cef5c4de2d6f289a99
+EBUILD multi_json-1.14.1.ebuild 1981 BLAKE2B 978456342229b4eec46a289d764cd60f04f91bbcf2cdc4fb2bc79a7730d4393e64dc2fdcbf7cea7c9c7edccb316607fd0c1f552c63f0306591554828c4ad9984 SHA512 efd7c208f37f90536b7067892a88ebbe6dbf7009a9016c44fdb2690301455a369ecbfaccdc298827eac50770a172fe0bd6059866b44af6cef5c4de2d6f289a99
 MISC metadata.xml 345 BLAKE2B 7d7684a1546dcc97e934f1a7df4484b568c5e8043dcfd0493e03124fa9f96959de5dccb78d22b1ff51ebc39b5fbec8b9a1dfd24531d676b8982b1f1dbd5097d0 SHA512 5fe7f117806d67e0d295bfcbdd07d4bbe8d3c3875e07cc3d276f2aee81b89f2e90174cbf4264d647384817fe0e8c81c2f2c9d9d67e3f78b46c3c194001bcace9
diff --git a/dev-ruby/multi_json/multi_json-1.14.0.ebuild b/dev-ruby/multi_json/multi_json-1.14.0.ebuild
new file mode 100644
index 000000000000..776ba06afcb5
--- /dev/null
+++ b/dev-ruby/multi_json/multi_json-1.14.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_TASK_DOC="yard"
+
+RUBY_FAKEGEM_DOCDIR="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="multi_json.gemspec"
+
+inherit ruby-fakegem
+
+SRC_URI="https://github.com/intridea/multi_json/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+DESCRIPTION="A gem to provide swappable JSON backends"
+HOMEPAGE="https://github.com/intridea/multi_json"
+LICENSE="MIT"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE=""
+
+ruby_add_rdepend "|| ( >=dev-ruby/json-1.4:* >=dev-ruby/yajl-ruby-1.0 )"
+
+ruby_add_bdepend "doc? ( dev-ruby/rspec:3 dev-ruby/yard )"
+
+ruby_add_bdepend "test? ( dev-ruby/json
+	dev-ruby/yajl-ruby )"
+
+all_ruby_prepare() {
+	sed -i -e '/[Bb]undler/d' Rakefile spec/spec_helper.rb || die "Unable to remove bundler."
+
+	# Remove unimportant rspec options not supported by rspec 2.6.
+	rm .rspec || die
+
+	# Remove specs specific to oj since we don't package oj yet.
+	sed -i -e '/defaults to the best available gem/,/^  end/ s:^:#:' \
+		-e '/Oj does not create symbols on parse/,/^    end/ s:^:#:' \
+		-e '/with Oj.default_settings/,/^    end/ s:^:#:' \
+		-e '/using one-shot parser/,/^  end/ s:^:#:' \
+		-e '/jrjackson/askip "unpackaged"' \
+		spec/multi_json_spec.rb
+
+	# Avoid simplecov which only works with ruby 1.9
+	sed -i -e '/simplecov/d' -e '/SimpleCov.formatter/,/SimpleCov.start/ d' spec/spec_helper.rb || die
+
+	# Remove unpackaged and for our purposes unneeded coveralls
+	sed -i -e '/coveralls/d' spec/spec_helper.rb || die
+
+	# Avoid testing unpackaged adapters
+	rm spec/{gson,nsjsonserialization,jr_jackson,oj}_adapter_spec.rb || die
+}
+
+each_ruby_test() {
+	for t in spec/*_spec.rb; do
+		${RUBY} -S rspec-3 ${t} || die
+	done
+}
diff --git a/dev-ruby/multi_json/multi_json-1.14.1.ebuild b/dev-ruby/multi_json/multi_json-1.14.1.ebuild
new file mode 100644
index 000000000000..776ba06afcb5
--- /dev/null
+++ b/dev-ruby/multi_json/multi_json-1.14.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_TASK_DOC="yard"
+
+RUBY_FAKEGEM_DOCDIR="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="multi_json.gemspec"
+
+inherit ruby-fakegem
+
+SRC_URI="https://github.com/intridea/multi_json/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+DESCRIPTION="A gem to provide swappable JSON backends"
+HOMEPAGE="https://github.com/intridea/multi_json"
+LICENSE="MIT"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE=""
+
+ruby_add_rdepend "|| ( >=dev-ruby/json-1.4:* >=dev-ruby/yajl-ruby-1.0 )"
+
+ruby_add_bdepend "doc? ( dev-ruby/rspec:3 dev-ruby/yard )"
+
+ruby_add_bdepend "test? ( dev-ruby/json
+	dev-ruby/yajl-ruby )"
+
+all_ruby_prepare() {
+	sed -i -e '/[Bb]undler/d' Rakefile spec/spec_helper.rb || die "Unable to remove bundler."
+
+	# Remove unimportant rspec options not supported by rspec 2.6.
+	rm .rspec || die
+
+	# Remove specs specific to oj since we don't package oj yet.
+	sed -i -e '/defaults to the best available gem/,/^  end/ s:^:#:' \
+		-e '/Oj does not create symbols on parse/,/^    end/ s:^:#:' \
+		-e '/with Oj.default_settings/,/^    end/ s:^:#:' \
+		-e '/using one-shot parser/,/^  end/ s:^:#:' \
+		-e '/jrjackson/askip "unpackaged"' \
+		spec/multi_json_spec.rb
+
+	# Avoid simplecov which only works with ruby 1.9
+	sed -i -e '/simplecov/d' -e '/SimpleCov.formatter/,/SimpleCov.start/ d' spec/spec_helper.rb || die
+
+	# Remove unpackaged and for our purposes unneeded coveralls
+	sed -i -e '/coveralls/d' spec/spec_helper.rb || die
+
+	# Avoid testing unpackaged adapters
+	rm spec/{gson,nsjsonserialization,jr_jackson,oj}_adapter_spec.rb || die
+}
+
+each_ruby_test() {
+	for t in spec/*_spec.rb; do
+		${RUBY} -S rspec-3 ${t} || die
+	done
+}
diff --git a/dev-ruby/neovim-ruby-client/Manifest b/dev-ruby/neovim-ruby-client/Manifest
index d4fee7aabcd2..c0253f1778bf 100644
--- a/dev-ruby/neovim-ruby-client/Manifest
+++ b/dev-ruby/neovim-ruby-client/Manifest
@@ -1,5 +1,4 @@
-DIST neovim-0.7.1.gem 40960 BLAKE2B 9f23c0f754c696b28679c839132c8fe4d9d7095249966187c1d378cd89b5468ae98349e7ef044a9ae3749443a0cb97206f1fed3617192afea31680a86b3124b7 SHA512 075de15135ab11f268211a2db90766d1de9e7581d945513c0fe2a1abb4f9dcba1f5814b62e91f2a615015eeb1dbd54ffa0f4edd0acd71ea635046963074ad32a
 DIST neovim-0.8.1.gem 43520 BLAKE2B 0b7401c1dfb1675725dbf50c45626d88b1a5932ccd4836e8a33974b8e71e44bafa10bf1a43e51b7f42e2702facec776cbcef3093c5cf86e500a5e94be9486b08 SHA512 2d56cd56c0817491622f9a4beee4cdc9244e9fd6a4a6b78d69b51f160b1a24395730f153800279b7fdebc99d61c55e3b8944d4b16c1028cfbf5d8c95308d0f53
-EBUILD neovim-ruby-client-0.7.1.ebuild 471 BLAKE2B 689f1d7e2aaf9552a70ea7aae8426a4d2bf4a5541c2fdeabc8802dfcfe10ce0cf935d4e498a937afa013c99474b252b32bc4a927cf3232ea600157befe8c3ba2 SHA512 43fa428c31e2653698bbd469498d6d7afe85ace2b3bc17b15637f69a36621b00fb18f20dbc044359cf88e62623d2b3359e17491a0a76631041f4da22bbf2a240
+EBUILD neovim-ruby-client-0.8.1-r1.ebuild 822 BLAKE2B c959a47964393f7a598389397e54996371a833b94116ea61ec72bc437f659fe1bd9fc16563aed4320a5677429693275e97d965ea04f99fca5538c3f08b5083d6 SHA512 5ae910f2e5fdb43f846aea69a81d830b9bf8cc6811c770d2160d96b4ff2120acaeb5ca7098c314f301fd19a8980469e40930cc692a4a301d6fd66891171bea3e
 EBUILD neovim-ruby-client-0.8.1.ebuild 795 BLAKE2B cd1a258e924d0829d234bd271e9ce4c129c683bda5ab934fc514d6e10aa5226dcb2610a24d68c1ec41da1301bcaa6388e3c795525d4d1448aff0230846944fbd SHA512 c861a99a738146a32808f077f109506b55e788f727e35fb73231d5df37e7f0b5756ee488c25bd872802bc249547452bd7f201b735eb89cd4f4e87b1234c33424
 MISC metadata.xml 469 BLAKE2B fd47786e5ede3d43dea030acb9327e101b34998eda45b0a88ee6073c8aaac316d9608bb650f382e75bb7150990733a39bc6d24171f2ba2c32e7a76838ee47004 SHA512 a1b032f8a56a7d849538c6517c516e2c6ec80b625f1404519bcede7726f6bd461f2e21e043a559beaf301e1e843f16de6ffd0efb792e449ac3921c72fdb828b2
diff --git a/dev-ruby/neovim-ruby-client/neovim-ruby-client-0.7.1.ebuild b/dev-ruby/neovim-ruby-client/neovim-ruby-client-0.7.1.ebuild
deleted file mode 100644
index 890ccc5b5580..000000000000
--- a/dev-ruby/neovim-ruby-client/neovim-ruby-client-0.7.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_NAME="neovim"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby bindings for Neovim"
-HOMEPAGE="https://github.com/alexgenco/neovim-ruby"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-
-ruby_add_rdepend ">=dev-ruby/msgpack-1.0.0"
-ruby_add_rdepend ">=dev-ruby/multi_json-1.0.0"
diff --git a/dev-ruby/neovim-ruby-client/neovim-ruby-client-0.8.1-r1.ebuild b/dev-ruby/neovim-ruby-client/neovim-ruby-client-0.8.1-r1.ebuild
new file mode 100644
index 000000000000..640c16bb6dd2
--- /dev/null
+++ b/dev-ruby/neovim-ruby-client/neovim-ruby-client-0.8.1-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_NAME="neovim"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_BINDIR="exe"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby bindings for Neovim"
+HOMEPAGE="https://github.com/alexgenco/neovim-ruby"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+ruby_add_rdepend "
+	>=dev-ruby/msgpack-1.1:0
+	=dev-ruby/multi_json-1*
+"
+
+all_ruby_prepare() {
+	sed -i -e '/\(bundler\|pry\)/ s:^:#:' spec/helper.rb || die
+
+	# Avoid tests that result in a unix socket path that is too long
+	sed -i -e '/\(establishes an RPC connection\|sets appropriate client info\)/askip "socket path length"' spec/neovim_spec.rb || die
+}
diff --git a/dev-ruby/pg/Manifest b/dev-ruby/pg/Manifest
index 855f7d837f53..a34fb2a6abec 100644
--- a/dev-ruby/pg/Manifest
+++ b/dev-ruby/pg/Manifest
@@ -1,8 +1,6 @@
 AUX postgresql10-tests.patch 1747 BLAKE2B e0a992461221f31cca1f39453e077a1d04d3f436e0eba3b683ed42092d266a8edb8a46e61933ac41e94ead483bac325833f1c21bfc57cf7ebb160f046d80e1f6 SHA512 89a7937b0791307366fbc97549d48cb7bdf92b66895b1de7dd554a040ad6a08b4af69709bf1318df95cdaf9824415d76b5f6be98be48995b75909fbfeefb6295
 DIST pg-0.21.0.gem 214016 BLAKE2B 9e27646cd85bc97dedfb980f4851b19a1ef2aad17f6a5c60726c1683642af5c4cf87d518b300fb4c894e1580f808f8af6158b57f1ac25971c1fc55818abee6f4 SHA512 590a8c34487d2cf030082cfff87b2cc83b636df06a931e394acfb098ecb5728e793d777f125b036ee9953bbd21ec5facf91c932930acccb507d3394f2fc4cc5b
-DIST pg-1.0.0.gem 213504 BLAKE2B eecaa632c7903f89c503ad92ccff058bbc6c2c80cbf83d656eeb9a5b919b84bb270671ad4e0fa08f55be1bcfc69eb8e13b815c37c601d300de503383f1ba5908 SHA512 1cac025ab8a95b4429534b98377eedeb1e3f8b2c4a859363c4174d477577caf39557b002cde4e745189fa9a29e9181ff9d564d822f15ff5c4f03f7389b0d0398
 DIST pg-1.1.4.gem 233984 BLAKE2B 5a92ca49f8e471905286c07dc468f2932461f73fba13d2786c50883b271e2528b4476a81737023c252e75784c49113aacc50e1722fa100d5e97494fe60965a41 SHA512 442eadb4e9fe51aaef71cb5bbe8786c61dc4cfaa1241491270cb251f062abae88b6b2ef88dec7ab6ba2baa6390e954a2fcf4862cc95be4bc516e029c788fa1d9
 EBUILD pg-0.21.0.ebuild 1690 BLAKE2B 7bf7c030a7242d81075dca8aba7252bdb78e75d773d5d908312b5c817abcc4b845cfb5ba7c42a332a9b8142fec4a8d03bda4384773d6976659fbfb19925fd1c9 SHA512 69ada4e6bafafa62b6d41400489d06d41e036832ff22ab9bfebdfcb4f4a6edb761d7bd24ac94f589ace352fa77c7d24dfa5dc5d29347f3f99c931ac671af5aa5
-EBUILD pg-1.0.0.ebuild 1645 BLAKE2B 4dcf2841268da272787c5047eb02dae204a086a0633e0b765245af5fee94ed24d21d460378db7e7edf7b48ec11382713beca4c7711c9fd840b27f6b1e134f17a SHA512 11c2367cd98fbc7a2eb0c8a8e9ae644fea13cf4258b5bb4281b4954139cc0c6091d98b150aa488b00a4260afb5b601bc0937a38886f1ca279ca4b752d2c58d46
 EBUILD pg-1.1.4.ebuild 1642 BLAKE2B d945da6c533864b59b81a5953f31a02052d73ba504d96c53ed3d4ef5ae509723dbde0d46246ef419cd5dfd7fa0fb0ce31e017b96861f55027196f67247e3dba6 SHA512 6afc3cf20a81a4ea6b83f32018f0111f0d06ad22291b318bd2b18656c8776e0228a1af14875a2e6f02dd3d953215693f9b23fbb9773e1c8c95983b52b60add03
 MISC metadata.xml 340 BLAKE2B 8ef2673e4dafd5495e2385e4216ae715d3334c170e81f45f823f8ef6942533ad088115e6f8e3c75b35e2af28cbbf1e3446cfb8b2eb084df7b9a3adc6c869c183 SHA512 76be8c407457ed3f1a8e2caaf5a10949a830d4033d8d18e88830f37d2b62d4ff9675367f123364041ca88f5af972d4d7152c1f2832a5c891b516a83f989e1598
diff --git a/dev-ruby/pg/pg-1.0.0.ebuild b/dev-ruby/pg/pg-1.0.0.ebuild
deleted file mode 100644
index 199ef0824212..000000000000
--- a/dev-ruby/pg/pg-1.0.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="ChangeLog Contributors.rdoc README.rdoc History.rdoc"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="Ruby extension library providing an API to PostgreSQL"
-HOMEPAGE="https://bitbucket.org/ged/ruby-pg/"
-
-LICENSE="|| ( GPL-2 Ruby )"
-SLOT="1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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_configure() {
-	${RUBY} -C ext extconf.rb || die "extconf.rb failed"
-}
-
-each_ruby_compile() {
-	emake V=1 -C ext CFLAGS="${CFLAGS} -fPIC" archflag="${LDFLAGS}"
-	cp ext/*$(get_libname) lib || 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/pkg-config/Manifest b/dev-ruby/pkg-config/Manifest
index 89a400678e8e..6c33713f353c 100644
--- a/dev-ruby/pkg-config/Manifest
+++ b/dev-ruby/pkg-config/Manifest
@@ -1,9 +1,7 @@
 DIST pkg-config-1.2.8.gem 20480 BLAKE2B cc11b5eff30f0f5e1a91e64902931ed540da108fd326fe731b71527c9c4310f55e9002617e1baae4f71a4b705b20cf10f6fa112f8ef56971e82868145d372a47 SHA512 d83a599a48c7d404946054c6846b6cfd9fce2a264c288519a6eccd9787f05d45397dd46300bf97c80700921456318154ea6d44ba32cd159803471073c2a2b065
-DIST pkg-config-1.3.7.gem 20992 BLAKE2B 4927cbe744b88e11ece71e554b07092d671a1b0775aa0c647abab6718c1903b888d98aa97ce5eae89033c13a542e45880b28fc886225c226d6e525c0004ec05f SHA512 cceef2b8f0b92582256660f50be21b446e6ef8ca9edd3c7736d2dbcbf2bf8ab60a1ef8f2fed21448d01ab155fd92fe9a3e8cf1f8bda4f80a8e0a8896f1eedd60
-DIST pkg-config-1.3.8.gem 21504 BLAKE2B 6959487c26b562978e00c4f6b7362c84f78f83e3ad2821b27a23feb76d1bc948832d898b81cd1347a3dec0d04bce0abf427df96420280ec721ded45619339361 SHA512 893b8804abbc295bb678e539a22c23f4bac571b5d29cdeb825f0ed2b6be1efa7f50403b97718b38034bc3d1e5bc709d9fa6e26894fb90fe0d6789b8bcc4f19ee
 DIST pkg-config-1.3.9.gem 22016 BLAKE2B bb22881e07a251722e5e2344a8ebfea105456c4994da01b6cad53b93c5fab515537c04166be9985bac224944e89506040a2f89886f03c9f5d9c2227551e6e840 SHA512 ffec47956f59daea7eefe749474389cc43b500251b7d35cf268caed975d4b8483990c6c5cc0eb1cb918a7e09edd483fe88d6e7141c13496edeb4d4aac5ab3019
+DIST pkg-config-1.4.0.gem 22016 BLAKE2B a9f56e68580b290bc0b09b07dc059b5ac7141a97a2a4653529fd59aa348bee7ce90a2e752172d2d0f376b67fbb7253f0d3bb38107eb68e3d6bb3f7d57637423c SHA512 d60539519e86e210def73d2536a694e2fc7a6a424c7cdd49b6046420b113520465e1863ef4d90d9491d081b78e16cfff27121d3b7f78a78330c4a242c652ebd7
 EBUILD pkg-config-1.2.8.ebuild 815 BLAKE2B 14e9131af5184dfcd43ab15edd031aed81b11c385930f2a178fa745a47391a6cd6e4f55c3053714eec8e0226717099cbc647e040f0205fe8ec6520c91d83869b SHA512 d6cb2e50e5c9902852306d99739a4be821d132982a41f6d3d449263fbcd58e944fc4394633786ef25bad14f50eb8f215910db531fa13ec2d85bca00f36e2587f
-EBUILD pkg-config-1.3.7.ebuild 821 BLAKE2B 56bd07a4bc0a33f679ef126de67633f52253833ab7f234e77b1c18322434e2f88cbe9f1188982977a02ddca63fe89f6e18850e753150a1808c3f268559677b2b SHA512 0ef302952b10221e4f793dede49977e13961454dec46cb858cffa6ce93b1c5a69adff0baccb23b6bcc4e758350df60b1f296c9ac24a8dc0c9294ce79cb845bd1
-EBUILD pkg-config-1.3.8.ebuild 788 BLAKE2B 49582d44e2867db96945d2440f9798f1899b139ec319829a09fb031875942e912e72c8a968ff0cc70a164a0fd75469d4e1400922b5a4633ffd0304a0a0de2fe2 SHA512 0f15c9ed29a8fd5585b3eb53605eebffc54f794539875d176486ec370c3ce316758e539df11dd4dab6b61aedd6a3bba45fedbbb3399345b5ecf398f2b6783136
 EBUILD pkg-config-1.3.9.ebuild 788 BLAKE2B 49582d44e2867db96945d2440f9798f1899b139ec319829a09fb031875942e912e72c8a968ff0cc70a164a0fd75469d4e1400922b5a4633ffd0304a0a0de2fe2 SHA512 0f15c9ed29a8fd5585b3eb53605eebffc54f794539875d176486ec370c3ce316758e539df11dd4dab6b61aedd6a3bba45fedbbb3399345b5ecf398f2b6783136
+EBUILD pkg-config-1.4.0.ebuild 788 BLAKE2B 49582d44e2867db96945d2440f9798f1899b139ec319829a09fb031875942e912e72c8a968ff0cc70a164a0fd75469d4e1400922b5a4633ffd0304a0a0de2fe2 SHA512 0f15c9ed29a8fd5585b3eb53605eebffc54f794539875d176486ec370c3ce316758e539df11dd4dab6b61aedd6a3bba45fedbbb3399345b5ecf398f2b6783136
 MISC metadata.xml 424 BLAKE2B f3283c73952daca20d85a5421afb67150aae553faa03d653686718ca5216c1a65ab5983fb669cc34003902b0a969275bd22e4d1765f3896c7e25bee301323f42 SHA512 40e700a309e3678157d9da4ef18e8f0178e23aa192949ac06acd6f8026d0d53d4f79c199aaf59e0e27dba17925f44a97ad901e0774c6b70583b24b09254eb8d5
diff --git a/dev-ruby/pkg-config/pkg-config-1.3.7.ebuild b/dev-ruby/pkg-config/pkg-config-1.3.7.ebuild
deleted file mode 100644
index 600fa391e78f..000000000000
--- a/dev-ruby/pkg-config/pkg-config-1.3.7.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_EXTRADOC="README.rdoc NEWS"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="A pkg-config implementation by Ruby"
-HOMEPAGE="https://github.com/rcairo/pkg-config"
-LICENSE="|| ( LGPL-2 LGPL-2.1 LGPL-3 )"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-SLOT="0"
-IUSE="test"
-
-ruby_add_bdepend "test? ( >=dev-ruby/test-unit-2.5.1-r1 )"
-# this is used for testing
-DEPEND+=" test? ( x11-libs/cairo )"
-
-all_ruby_prepare() {
-	# drop failing tests
-	sed -i -e "/test_cflags/,/end/d"\
-		-e "/test_cflags_only_I/,/end/d" test/test_pkg_config.rb || die
-}
-
-each_ruby_test() {
-	ruby-ng_testrb-2 -Ilib test/test_${PN/-/_}.rb || die
-}
diff --git a/dev-ruby/pkg-config/pkg-config-1.3.8.ebuild b/dev-ruby/pkg-config/pkg-config-1.4.0.ebuild
index a8f0cfce739b..a8f0cfce739b 100644
--- a/dev-ruby/pkg-config/pkg-config-1.3.8.ebuild
+++ b/dev-ruby/pkg-config/pkg-config-1.4.0.ebuild
diff --git a/dev-ruby/posix-spawn/Manifest b/dev-ruby/posix-spawn/Manifest
index 8a37802cd94e..dee477fc8d34 100644
--- a/dev-ruby/posix-spawn/Manifest
+++ b/dev-ruby/posix-spawn/Manifest
@@ -1,5 +1,4 @@
 AUX posix-spawn-0.3.13-x86.patch 713 BLAKE2B 0c10ac73b938fe985d6c3f3f084c4f96d19293610254029267cd5b16111acbb5792de7cc5dd5195f79d5f957206140bcc7a7c47b171bd565f9eee5350352bcb6 SHA512 33f5ee510fdeb7b8b150aa61e9d3044a1571470e1187d4dd0483e700c09bfb4bfba9a52c2cde723ed568ac3d2d1cb27855a4ef09826b902946138055d4b04774
 DIST posix-spawn-0.3.13.gem 28160 BLAKE2B 68b1c241310c7b35bf8bea055e63a60320ae3fc877f9bc9f4e2dc0d30c1484eb5081be8c7d60309ed04900c410d52624dae6e37a0f134993f334526f2d9de98d SHA512 a9cd878571440cc0aaee541cbb97b6f4dcb03e48a8ef8588693f4c68990eb530e3b1685d615546763c9bba5d3109134442285023938eb2f116e9749f0da12bb9
 EBUILD posix-spawn-0.3.13-r1.ebuild 757 BLAKE2B 0ac5fff7f8066b38d8b5cb159a0155513507043db4a6ccc401feacbd7444d8a14dc82102b26fd2485a0d31e24a2ed440d24a5e25542ebf725364d7fcd885374d SHA512 1eb99911823490208687dcc57be900bb922abe5f2fe212f4c9690937946be8d9160813301c5efc321bd13bf51dd353f41bada776057585cd54d85b9e72fab34e
-EBUILD posix-spawn-0.3.13.ebuild 681 BLAKE2B e8c61d27ff00d42aca97ce70ff3e30a23fb073596bd02b4b3831ed84ec9003e80f3704908eeb563d551cc6575e92c348d40b801b710d49fbebde3ff36efc5f5d SHA512 489ecafe543fef55d3b819468e92e0b9dbd931461551ce686339187487d9ca325c1eb5ee584755b96f27f340b7c9f5f04ae018444b5254502eddfa2b577de906
 MISC metadata.xml 346 BLAKE2B cb818c5b61108ddb5acfcf890d8ba737a8cc949fe607d02a5cc7dd1d264ecc7d73a096d8d40b65872fddb0791d63aefbdd774906da4b65122cd1087e040c4cd3 SHA512 208a7646bd550d2ecd50aecda3f1891b46cc586f74479eb6a72be27c985bf2ef1f411b609e54e73f418c1653a205e1ecedcfe3f2c2ebdb719e56c60f7b1b48a7
diff --git a/dev-ruby/posix-spawn/posix-spawn-0.3.13.ebuild b/dev-ruby/posix-spawn/posix-spawn-0.3.13.ebuild
deleted file mode 100644
index 4f7272325470..000000000000
--- a/dev-ruby/posix-spawn/posix-spawn-0.3.13.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
-KEYWORDS="~amd64"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md TODO HACKING"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Library that implements a subset of the Ruby 1.9 Process::spawn"
-HOMEPAGE="https://github.com/rtomayko/posix-spawn/"
-
-LICENSE="MIT LGPL-2.1"
-SLOT="0"
-IUSE="test"
-
-each_ruby_configure() {
-	${RUBY} -Cext extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake V=1 -Cext
-	cp ext/*$(get_modname) lib/ || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:.:test -e 'Dir["test/test_*.rb"].each {|f| require f}' || die
-}
diff --git a/dev-ruby/power_assert/Manifest b/dev-ruby/power_assert/Manifest
index 69c9401a5250..9c8d4b66b681 100644
--- a/dev-ruby/power_assert/Manifest
+++ b/dev-ruby/power_assert/Manifest
@@ -1,11 +1,7 @@
 DIST power_assert-1.1.1.tar.gz 16799 BLAKE2B df5f688d4242373f1a5de95fcbcdd63d23a14314a890a32839ba88494d04a09ad6b9c1dedea23f43d53cb708b3e5eee8d0a2307be16a1c11cf3cbf22ea254344 SHA512 a33429bf918c71a5b75e56940d46dfd05ed3c87f909d6f09ebf2d8b2cd43a3c5c37b5ac13c334383f1b3f52817ecd4ccf68cd649c53bebdfbc464a18c88b702c
-DIST power_assert-1.1.2.tar.gz 17140 BLAKE2B a690365b60ff1dbcb9eb70807b4c9c772e7f809190f1fa7dfef449ff01656bc31bd59f0d291ff158bdac1e2accaf376a45fc1dd480fd864fe84ba1ab4baf3743 SHA512 716edf1e2885e2e4d760f9b09aa97be1eee353f4f50297d0009ebc9fa3e16599ae094b78911915f20d295a6232d6c14844f43bf843b25e90f7c76bfa1d7776fc
-DIST power_assert-1.1.3.tar.gz 17169 BLAKE2B 05e916cafafc6c90abd9fec30d4439bc4b02cb83267c37528c018eb367a402cd42aefdd050b388d3bc1735f0320109b0c1a078db3718c0d3b2a033c32536c441 SHA512 8612e08c3e30ddfccc6be30f2df101ddcee0d2338b9438fb44e922115c683b31f41b699ca998e088488da94eb5d80da360429fb2ba374c31a9b57a60ebc8c732
 DIST power_assert-1.1.4.tar.gz 17330 BLAKE2B 5d5e22c436c8e25612326e8d33a6ca10e8ddacf6d2b5266bdcd61c04abdcde231872ee7589985926153c58872714dd9ac4d66cf1bc0b02ce863968e0215a050c SHA512 1c7b98623710ad037aad4a399b80f28130b76ad38ee4bf0613fe6cfc9080bdcc9c6765358830bcd713201d6e14e33761a34e4434f41f3e8995d8d91d3809a61a
 DIST power_assert-1.1.5.tar.gz 17326 BLAKE2B bd5e0627b681ccebc546a8b95170a3fe20ba919ff19405552e47c8e8f7faebe0c638a71e303e63e04a88b7d48a6ccd3e1117fea863275abbd5182d66e9634db1 SHA512 bc1f98b9b8c3ac327a744a28c54c747177eef187cd998778244f3dce59d2909e94960a50179552a9a687b973bcef49f26fffa67d75e9b3b92ea9959d40b93298
 EBUILD power_assert-1.1.1.ebuild 1303 BLAKE2B 28f00df472c18a5846f15adc8926c6c32371cbd74a436b38af2c718187831428477322433bfbe5c0b79875ae6afcea553d7dfefdeea9587da05f4273a4da2643 SHA512 e61553964a55ce3068a3d80f389f963a1d56c0796fe0063e0faa999097a2b8be7ccf24c3ef8c1c9d98c6648bd011deb2c4ac57d9cc975ac07c7b423d51cb593c
-EBUILD power_assert-1.1.2.ebuild 1309 BLAKE2B 1bc548e8ca42571f05ff69daf316414f1656e1f9ce5088377caae4793f96d0d2503612de4434b9d297a36b2e428e9340b2621a46da7935502f1257468b880e95 SHA512 ee0936ec518983c822e22fc72ec540c528453961f0afde23172abc5f7b55fac1488c9bc2642e9a5e85aa9a7b59839082de1a5cdb007b0696bc63e110bd00318b
-EBUILD power_assert-1.1.3.ebuild 1313 BLAKE2B 7803b73af54df4036b2263798f989aea98beb61fe6a7ba04159048d335416efe88eb7a7132ef2182b1fee4d84ef6a825be39ae0caa7f00fc583a2825e20c929c SHA512 50b1bfe03523a729ba365a4db65ebda3031c1afd973e23e31f4f57b5b895575b590355972fa45975bbb09f00544a6c4512ce7370b36671181f5adacf95fbc185
 EBUILD power_assert-1.1.4.ebuild 1323 BLAKE2B e49007f4265dff99b9876626436e17cafdad23751123312975a9cc5a72c7c0168bdfe96d415c9539cda1145f5dc198c3b17a96070f35bf6e5bff2b489ceb0293 SHA512 c2a94db2d681c710a9901a88ad3dd1f3a5a6a9b3df1861f53bf1e4f0b7037e4becc56d91197dbf222d2a7961a0215b12f3fe7b35bd808ab9f30237c6ea1e36b6
 EBUILD power_assert-1.1.5.ebuild 1434 BLAKE2B 62edbc57b0d1dc60d822aed6584eea9665d00e542b4bb3f4714273491969aa13f42845788b7095fad5916ab2c93ef0cf3b061ca3054a6d35d9087bdebfa0b39c SHA512 da0ec1c737613f01e9494049e8a9c9181e03efc6aa884dd6613c265f96b4bfa96bcf4d33ee49ce7dacd4272e2a9a17addd5a8804e6508185adc03d9c21044376
 MISC metadata.xml 344 BLAKE2B d878cc041f73fcacc13fc94374eeb102440977f57c47880e9a597af3b4d3b20cd81e8bd0d367cd2abd7799a27b5aaac46611291ffaffb3298bb253d726e23726 SHA512 87e232c55b49880144aa509aaa79413864b3f575df07a559a9f1aa60909d4d8e01d1ce2e86542c847533eda2f233542deb36b1103b56d7c512f2385a6c8eb2fc
diff --git a/dev-ruby/power_assert/power_assert-1.1.2.ebuild b/dev-ruby/power_assert/power_assert-1.1.2.ebuild
deleted file mode 100644
index f0298fc6e908..000000000000
--- a/dev-ruby/power_assert/power_assert-1.1.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.rdoc"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Shows each value of variables and method calls in the expression"
-HOMEPAGE="https://github.com/k-tsj/power_assert"
-SRC_URI="https://github.com/k-tsj/power_assert/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="|| ( Ruby BSD-2 )"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-SLOT="0"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/test-unit )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/I s:^:#:' Rakefile test/test_helper.rb || die
-	sed -i -e '1igem "test-unit"' \
-		-e '/byebug/ s:^:#:' test/test_helper.rb || die
-
-	# Avoid circular dependency on byebug when bootstrapping ruby
-	sed -i -e '/byebug/ s:^:#:' -e '/test_core_ext_helper/ s:^:#:' test/test_helper.rb || die
-	rm test/test_core_ext_helper.rb test/trace_test.rb || die
-
-	# Avoid circular dependency on pry when bootstrapping ruby
-	sed -i -e '/pry/ s:^:#:' -e '/test_colorized_pp/,/^    end/ s:^:#:' test/block_test.rb || die
-}
diff --git a/dev-ruby/power_assert/power_assert-1.1.3.ebuild b/dev-ruby/power_assert/power_assert-1.1.3.ebuild
deleted file mode 100644
index 32d2a049c96b..000000000000
--- a/dev-ruby/power_assert/power_assert-1.1.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.rdoc"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Shows each value of variables and method calls in the expression"
-HOMEPAGE="https://github.com/k-tsj/power_assert"
-SRC_URI="https://github.com/k-tsj/power_assert/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="|| ( Ruby BSD-2 )"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-SLOT="0"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/test-unit )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/I s:^:#:' Rakefile test/test_helper.rb || die
-	sed -i -e '1igem "test-unit"' \
-		-e '/byebug/ s:^:#:' test/test_helper.rb || die
-
-	# Avoid circular dependency on byebug when bootstrapping ruby
-	sed -i -e '/byebug/ s:^:#:' -e '/test_core_ext_helper/ s:^:#:' test/test_helper.rb || die
-	rm test/test_core_ext_helper.rb test/trace_test.rb || die
-
-	# Avoid circular dependency on pry when bootstrapping ruby
-	sed -i -e '/pry/ s:^:#:' -e '/test_colorized_pp/,/^    end/ s:^:#:' test/block_test.rb || die
-}
diff --git a/dev-ruby/public_suffix/Manifest b/dev-ruby/public_suffix/Manifest
index 95f8c6bc6a06..427dda55e5bf 100644
--- a/dev-ruby/public_suffix/Manifest
+++ b/dev-ruby/public_suffix/Manifest
@@ -1,9 +1,5 @@
-DIST public_suffix-3.0.2.gem 95744 BLAKE2B 5c06af572214760f7d2a176e1b6603ea9bf0f45c91633cdead841ef8289b7c9ae7ae5b0400d5248d3df4c3bc81d9bb357de622fb85a9c3a67f4973872bdee94a SHA512 eafab08d0114212798390b4b5e9472fab98c91b38ea836c76254673e48bd068afeeb5ec4a2685bdb030ea78e4e5ea0be10dc3b742ed30352e11ec7a7cc1e7bc2
 DIST public_suffix-3.1.1.gem 99840 BLAKE2B ef86b7ecb834a855dbb44b8a0f934de3715edb6d67faefd20f99054898b35bfedffd490b60fbe80236905826868611aa96e13766577bb98ab997321cf9c49b39 SHA512 1e266ed7fa224fa94a49a51dae2868bdadb80ca2de660d2cda9a1e146ccad5aaba2cf68d75272e333a4b1a80e47863d388d85d3a86bddf8f649a320e5e700078
-DIST public_suffix-4.0.0.gem 99840 BLAKE2B 198ba6107c9577e20438c9f5eeba33b740d194e491374ea336043e5f731b6cc956323c746ece0665943269d336cdaf1d94d9ca64022c8ada1d28ca00a12fa209 SHA512 ed4eae1e2ca1e7af08317bc82b4dbb7b1f1e4de9889f4e510a9f347b2212010da956ebc53cdc45f08b7f1f805d814a96f7da305f0b85434a0417fb740ab5e410
 DIST public_suffix-4.0.1.gem 100352 BLAKE2B 00e71f881b30316f42d9a16c22c71e1a7f7f183ae3bf6662a49a0bb2d2caab7345ca1c5c7a9034cb479d95836db83e1d389551333187d9949addd70fdf6ff39c SHA512 03255a82e084758b78308606c028d86cef6231af0a769af97e8207d777370ba5951fcc2914d19708db996e92e53e5689ac7d628ca3c4f604250e46a274bbaf3a
-EBUILD public_suffix-3.0.2.ebuild 834 BLAKE2B 35f65e5abe8032946dbae78be95f3a11f91380f74e8b7736f025c05fb3b68181e7b8712081a3908ae4460ea2a539428acc92b330de1c65573f2956cbbae72402 SHA512 e574ad1b94f28ccf7d19daf05abaf1ad76760499e262c17249d6de12f6f17917ccc9bb7739c33561d48b73de11fd3f253cea1e228c7a22d5c57b8cb197aa961a
 EBUILD public_suffix-3.1.1.ebuild 824 BLAKE2B 8f0807fe124fa6f7d2c53995b22a4ebeba4a9294f4b065117e278694665a9019a26c1dca9f7066c936b574d44f2a40b2026a03715853d4d12843c2133bcb7517 SHA512 6bd0730e80046ea293c72f3757b27aa2301200cab7e9d76efa21d2b68c4b33ac689c597a9e87ec16bc072929eab9b91f9202e696abed29b3f2ee6231c8670fe0
-EBUILD public_suffix-4.0.0.ebuild 826 BLAKE2B 875269a7b44fe924ce940a1e3a35a35efafb87010ab25f0e9d6b86306d65a7ba7ffb09c4fc2f0853c7d1acca9aeec269800d6fbca3ea0e17992bc1d7425c0dd6 SHA512 01079bbec89746c7d64cf9ef0c28ddde5edbd2c3ef38eda0982a2da2020df9530b36fdf6f289e5cac159e74c4e8cfd2dc7229e2560b3e723e8b0f1ad6b9a00bc
 EBUILD public_suffix-4.0.1.ebuild 826 BLAKE2B 0adaa0e039f297a5190a84386ebc96ca11337589a8819126446823b40622c8ca8ef0c7df3eee9a17065d7a409956463afdc7a4e728e8e67c643d7a02feca0884 SHA512 4f3c30c0ebfbb39faf49dc547cd20a18161d9aaa78b7f3aeaef60dfa17e5890eeb4418cb55b20cf6a44fd6a4abe638cb3594213509c62d880f2e8e2cb47c0872
 MISC metadata.xml 340 BLAKE2B e5ff0b06a3e6205a270389a1aaec9cb8902fad8e9b815e650b9be53276545b401565d8f7b1167ac415766a809fa2358289811196001e840d9d8641bbe2ff281a SHA512 e5091bcfca152fb1301ce5969cb5ce1e65db3452926c5b75db5afb284e28f44655495663fcce3ba5718b9817d1e3f6db491fe8da96732181926ccd58b36d7f20
diff --git a/dev-ruby/public_suffix/public_suffix-3.0.2.ebuild b/dev-ruby/public_suffix/public_suffix-3.0.2.ebuild
deleted file mode 100644
index 16f21ff15835..000000000000
--- a/dev-ruby/public_suffix/public_suffix-3.0.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRAINSTALL="data"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Parse and decompose a domain name into top level domain, domain and subdomains"
-HOMEPAGE="https://simonecarletti.com/code/publicsuffix-ruby/"
-
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-LICENSE="MIT"
-SLOT="3"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/mocha )"
-
-all_ruby_prepare() {
-	sed -i -e '/rubocop/I s:^:#:' \
-		-e '/yardoc/,/CLOBBER.include/ s:^:#:' \
-		-e '/bundler/ s:^:#:' Rakefile || die
-	sed -i -e '/reporters/I s:^:#:' test/test_helper.rb || die
-}
diff --git a/dev-ruby/public_suffix/public_suffix-4.0.0.ebuild b/dev-ruby/public_suffix/public_suffix-4.0.0.ebuild
deleted file mode 100644
index a04ea04fcd7b..000000000000
--- a/dev-ruby/public_suffix/public_suffix-4.0.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRAINSTALL="data"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Parse and decompose a domain name into top level domain, domain and subdomains"
-HOMEPAGE="https://simonecarletti.com/code/publicsuffix-ruby/"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-LICENSE="MIT"
-SLOT="4"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/mocha )"
-
-all_ruby_prepare() {
-	sed -i -e '/rubocop/I s:^:#:' \
-		-e '/yardoc/,/CLOBBER.include/ s:^:#:' \
-		-e '/bundler/ s:^:#:' Rakefile || die
-	sed -i -e '/reporters/I s:^:#:' test/test_helper.rb || die
-}
diff --git a/dev-ruby/puppetdb-termini/Manifest b/dev-ruby/puppetdb-termini/Manifest
index 1743a210ce72..149d4bb0b926 100644
--- a/dev-ruby/puppetdb-termini/Manifest
+++ b/dev-ruby/puppetdb-termini/Manifest
@@ -1,9 +1,7 @@
-DIST puppetdb-termini_6.4.0-1stretch_all.deb 20680 BLAKE2B ccd129eb8510794c165b6fa88ed391006e583e58fb43fe1be72e1b976d75f30aee0775552f6460840b805e1e4ceb03a6c77dba70afeed75dc2ea3ebcfd4bee77 SHA512 948b5ccd1ddc1f0d52174a073cd13af9e1ba0f713c5326c4d3cbfae7daeeb16cb05efdfb7ac572f9d79e34842fca0a95e054ee49239d593bf4429223c18bb58c
 DIST puppetdb-termini_6.5.0-1stretch_all.deb 20870 BLAKE2B 41cf79f2b7ce218fdfbce2588d8e206a3751ffb07a133bc5ddef3f5662c51eb9d12cda3017921edd4aafc064ff35713daaea9542dac687b3f399f2706657131f SHA512 956952bbc81cbcabd8ef3e37b9ebc7c489c90da7b75ff2c9a3e36cd312ee3f7eb3350cbf21a8b44f1d6722ddd3168f5795ba7258147f340a111b9dc29796cd84
 DIST puppetdb-termini_6.6.0-1stretch_all.deb 21210 BLAKE2B 366c5d0d97e3e1f63e61bc6a8d7d05b621c226cff872c4f780b4b08aac8db9ebcbbe5e5c81f9a79f11e1fc9cedb8c42d86e69055fb5af2195f07c59347699eda SHA512 b410322239933539b685c65c1f85ecca28269adaf94d4521b4ee6d0780701889c6aaec4c01fdcdce1338277544d249c597ac9c697bdacdeb943c53fd6538d348
-DIST puppetdb-termini_6.7.0-1stretch_all.deb 21206 BLAKE2B 243f54ba393fb5982a8483b2d7ef2645055531ce79afdb5b00291cdb6560a43bcae3cfd101a398924e1fee1cc9a9d6063e3ceed5b8fab40684f9346c6072a06b SHA512 046c83f49d7ca4cfdb5185d1878584863f8562c7500148689250a6a081655263b327bc8bb27bbc0dad508a087fd3c509784413483ff52e743a1022ee36b67f39
-EBUILD puppetdb-termini-6.4.0.ebuild 663 BLAKE2B ee7bf569a71860c88a0553ba60a08a57df1650050470c9e42ec6138386d21069c45a828be62c16582a973c30c314a5439903bc682b28a62732486737c079bf7a SHA512 efaa2a0f75daa2a4b7791ecee01c17286f5dd11f606c01187b9081f4793d456abc24dd9d9317804784cfd34e578b5dd524c270831c9a9fcbb6a1df6d07639051
+DIST puppetdb-termini_6.7.1-1stretch_all.deb 21284 BLAKE2B f56f9bfa97f711be08250cc525714af55b9defe2f12b17b2a5f3ec931d9f2f461f009bd0c3534eee848b45d3454752392479ae179695d27f42bc7e4747903dba SHA512 b03a3ebcc068ab7274abd7096821231dcafc1ce7064b6692f5834f28f3046905c855336c5aff4db1b031a2d06c616a75fa48860f45800bfc167c9045364bbcd4
 EBUILD puppetdb-termini-6.5.0.ebuild 663 BLAKE2B ee7bf569a71860c88a0553ba60a08a57df1650050470c9e42ec6138386d21069c45a828be62c16582a973c30c314a5439903bc682b28a62732486737c079bf7a SHA512 efaa2a0f75daa2a4b7791ecee01c17286f5dd11f606c01187b9081f4793d456abc24dd9d9317804784cfd34e578b5dd524c270831c9a9fcbb6a1df6d07639051
-EBUILD puppetdb-termini-6.6.0.ebuild 665 BLAKE2B 92d4b605fef931841c189603f1db1c9dcf33c674922a1f0106f05310ec7c67ce6e8c06340e9be2c46e4ef2e3c84d96fe8cf5aa77b703bb0396f78000aacd33fa SHA512 c53977ba31eb42260b92d1cb567d50f026f5cc47d7d4a9b13645376232b6f878354ceeb6b71d73da5209bb61256222f94b98441954729d8c4a264fdf8a385004
-EBUILD puppetdb-termini-6.7.0.ebuild 665 BLAKE2B 92d4b605fef931841c189603f1db1c9dcf33c674922a1f0106f05310ec7c67ce6e8c06340e9be2c46e4ef2e3c84d96fe8cf5aa77b703bb0396f78000aacd33fa SHA512 c53977ba31eb42260b92d1cb567d50f026f5cc47d7d4a9b13645376232b6f878354ceeb6b71d73da5209bb61256222f94b98441954729d8c4a264fdf8a385004
+EBUILD puppetdb-termini-6.6.0.ebuild 663 BLAKE2B ee7bf569a71860c88a0553ba60a08a57df1650050470c9e42ec6138386d21069c45a828be62c16582a973c30c314a5439903bc682b28a62732486737c079bf7a SHA512 efaa2a0f75daa2a4b7791ecee01c17286f5dd11f606c01187b9081f4793d456abc24dd9d9317804784cfd34e578b5dd524c270831c9a9fcbb6a1df6d07639051
+EBUILD puppetdb-termini-6.7.1.ebuild 665 BLAKE2B 92d4b605fef931841c189603f1db1c9dcf33c674922a1f0106f05310ec7c67ce6e8c06340e9be2c46e4ef2e3c84d96fe8cf5aa77b703bb0396f78000aacd33fa SHA512 c53977ba31eb42260b92d1cb567d50f026f5cc47d7d4a9b13645376232b6f878354ceeb6b71d73da5209bb61256222f94b98441954729d8c4a264fdf8a385004
 MISC metadata.xml 459 BLAKE2B 90810b08bfad84e8e841bb1bbe1a2340f5f4a5b214642cef60a882dc8acf4f502d8e971dc04ab6a614e0437c8321c98c6a7566f0151475adaf8c0daa275c485f SHA512 122359cc00e8fa171933fb808692db59e25a4350a4efb72ca78dc5451e8b96f17fae32a8cd6e532f4c2fbaffc8b7d7bbb1ce141ce1e48d93c928cfb3ba3cfeb5
diff --git a/dev-ruby/puppetdb-termini/puppetdb-termini-6.4.0.ebuild b/dev-ruby/puppetdb-termini/puppetdb-termini-6.4.0.ebuild
deleted file mode 100644
index 5dea78fa68fc..000000000000
--- a/dev-ruby/puppetdb-termini/puppetdb-termini-6.4.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-inherit unpacker
-
-DESCRIPTION="Library needed to connect puppet to puppetdb"
-HOMEPAGE="http://docs.puppetlabs.com/puppetdb/"
-SRC_URI="http://apt.puppetlabs.com/pool/stretch/puppet/${PN:0:1}/${PN}/${PN}_${PV}-1stretch_all.deb"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-# will need the same keywords as puppet
-KEYWORDS="amd64 ~ppc x86"
-
-RDEPEND+=""
-DEPEND+=""
-
-S=${WORKDIR}
-
-src_install() {
-	insinto opt/puppetlabs/puppet/lib/ruby/vendor_ruby/puppet/
-	doins -r opt/puppetlabs/puppet/lib/ruby/vendor_ruby/puppet/*
-}
diff --git a/dev-ruby/puppetdb-termini/puppetdb-termini-6.6.0.ebuild b/dev-ruby/puppetdb-termini/puppetdb-termini-6.6.0.ebuild
index 6d51b944dfdb..5dea78fa68fc 100644
--- a/dev-ruby/puppetdb-termini/puppetdb-termini-6.6.0.ebuild
+++ b/dev-ruby/puppetdb-termini/puppetdb-termini-6.6.0.ebuild
@@ -15,7 +15,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
 # will need the same keywords as puppet
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 
 RDEPEND+=""
 DEPEND+=""
diff --git a/dev-ruby/puppetdb-termini/puppetdb-termini-6.7.0.ebuild b/dev-ruby/puppetdb-termini/puppetdb-termini-6.7.1.ebuild
index 6d51b944dfdb..6d51b944dfdb 100644
--- a/dev-ruby/puppetdb-termini/puppetdb-termini-6.7.0.ebuild
+++ b/dev-ruby/puppetdb-termini/puppetdb-termini-6.7.1.ebuild
diff --git a/dev-ruby/rack-attack/Manifest b/dev-ruby/rack-attack/Manifest
index fa4aa35f9160..43a235f8e2bd 100644
--- a/dev-ruby/rack-attack/Manifest
+++ b/dev-ruby/rack-attack/Manifest
@@ -2,8 +2,10 @@ DIST rack-attack-5.4.2.gem 23040 BLAKE2B 7af950339f03139e6a3ac9e8349e6d2af5182a2
 DIST rack-attack-6.0.0.gem 23552 BLAKE2B ffd558e6a8b4b03fb332ef84f74c77f3f6dbfbaa8ce819c9522c02791ae35acc177b07a5f52f1888ccf25feb068e1812d1d61ddb7ebc9ea34da7ae1fe6275c27 SHA512 dca8ab20a3c4e5ac1214b232674fbf164a4c05f7ebb219193608b235583cdea5367d402d32a60d6a92c534a04d328714c673a7c93c50423a038e653561023f87
 DIST rack-attack-6.1.0.gem 23552 BLAKE2B 91f1c83659ea906732c6ab39904a5b01710fba3bf82e6c9b5bf88d9c992bd1f5d69c71e6487e85874f9c4527ac0f053bb648d600e8ac17569f0b6331089f0fc0 SHA512 b03050f15f05a27ee9a4f997c9de0c34a548f9fbd8e46d52f071c138f31c4bfc65196873a0bebce3c8d3862809b75295ab0f30c97afb128051cfa9b161d3dbe2
 DIST rack-attack-6.2.0.gem 24576 BLAKE2B 7836dd0c8a56bfa6337cc0bfa8ec2a4224873108d73bf1cb225c07a7720fba239bc7eeb75467c098c890050338f60420874c27529568b93c3bec9ed04926300a SHA512 df5de90d976dbd357780a5ab4a012ea1e528e5b608bad57ab8c59ee39ad36a1cf4490b3ec663d7f8ca6b788118ae7b256feb1cc475f8644c29883080e9c8b9dd
+DIST rack-attack-6.2.1.gem 24576 BLAKE2B 4a40486a457b5568045b4311a8eb1f4c54f2e04f68c92a643f4e6523ad32aed6253ce4faa830f0fe36d21ae89137908aab90cb07fe1f1f7307d4ac486de00263 SHA512 aefc9f2b56f5345e45f90b2a90619922fbc4459e95db5b324a58ce05d15b749f5fe93033fb5b7a8e312c10cd076a3e47033ff34a71712ec2923158cecfbcd0c7
 EBUILD rack-attack-5.4.2.ebuild 924 BLAKE2B 9bea5a9f9f54b9a6f54b17c2d0dfb84546c54b95ae9c994152a5f56440e3d3a0725e43c5c28d8a08bb6075fe7ccabfd38c96146c885e9c53572a3364262dee37 SHA512 4462b6e58fe4beab95ea2fc9b4468180877e77dfd664a25140725de53397ed04d4252a6b71fe2c8b86f5a66d5eb43bf7c5958ae6bdc5e5e0443c430b96d2840b
 EBUILD rack-attack-6.0.0.ebuild 924 BLAKE2B 3241be83552def347c81a139384404c0e25e69500ebc60ac268e636d647bea1bad5e2f54c5a0e96f19e223ab726f113a1296d1f590ea2e6b4bb886608e45e289 SHA512 3d0cc2b9f14b58d2577c76953f3fcf4258ae9035e7ad09cde092fa4d32fd55c32efd481bb8adebc79cfd8343edfb9903daaa65ecbad26ab2d44f945c583076be
 EBUILD rack-attack-6.1.0.ebuild 924 BLAKE2B 3241be83552def347c81a139384404c0e25e69500ebc60ac268e636d647bea1bad5e2f54c5a0e96f19e223ab726f113a1296d1f590ea2e6b4bb886608e45e289 SHA512 3d0cc2b9f14b58d2577c76953f3fcf4258ae9035e7ad09cde092fa4d32fd55c32efd481bb8adebc79cfd8343edfb9903daaa65ecbad26ab2d44f945c583076be
 EBUILD rack-attack-6.2.0.ebuild 893 BLAKE2B cd8bef8cd84821901751f7c4f8d4fc9b8182091f76861822b4dbde0768cd0b358172d59ed4542325f403112dc9e6495810455f30775890f93a54b407afd94f47 SHA512 65dff2e0e494a4c07930b936bc2f8bdc9bedb13f37a07cc529f02d1507119c42847b977f5cbcc7d94bdd291ca997130cd82cf3dbd0a38e753f6c8119e718d355
+EBUILD rack-attack-6.2.1.ebuild 893 BLAKE2B cd8bef8cd84821901751f7c4f8d4fc9b8182091f76861822b4dbde0768cd0b358172d59ed4542325f403112dc9e6495810455f30775890f93a54b407afd94f47 SHA512 65dff2e0e494a4c07930b936bc2f8bdc9bedb13f37a07cc529f02d1507119c42847b977f5cbcc7d94bdd291ca997130cd82cf3dbd0a38e753f6c8119e718d355
 MISC metadata.xml 349 BLAKE2B 5e0852caf34767613f144f3a6680223198c6cad55b7ea30d0778d788ce2293a2586bf0edc698dc0a5edc11d4e1d408576ce9d7c1eb3602e7fe7f10e2be33c1ba SHA512 9584ab20de3f1604d81e9be1baa8b4e355e5a43fba3a0cfc43a3d4f5e67df0d089a906b479b99150f76e54d07310d650ae96171d6ddeb8e3f00a446e2a95a795
diff --git a/dev-ruby/rack-attack/rack-attack-6.2.1.ebuild b/dev-ruby/rack-attack/rack-attack-6.2.1.ebuild
new file mode 100644
index 000000000000..3c7630016e9d
--- /dev/null
+++ b/dev-ruby/rack-attack/rack-attack-6.2.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26"
+
+# Skip integration tests since they require additional unpackaged
+# dependencies and running daemons.
+RUBY_FAKEGEM_TASK_TEST="test:units"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="A DSL for blocking & throttling abusive clients"
+HOMEPAGE="https://github.com/kickstarter/rack-attack"
+
+LICENSE="MIT"
+SLOT="6"
+KEYWORDS="~amd64"
+IUSE="test"
+
+ruby_add_rdepend "dev-ruby/rack:*"
+ruby_add_bdepend "test? (
+	dev-ruby/actionpack
+	dev-ruby/activesupport
+	dev-ruby/rack-test
+	dev-ruby/minitest )"
+
+all_ruby_prepare() {
+	sed -i -e '/\(bundler\|byebug\)/ s:^:#:' Rakefile spec/spec_helper.rb || die
+	sed -i -e '3igem "actionpack"' spec/spec_helper.rb || die
+	sed -i -e '/rubocop/I s:^:#:' Rakefile || die
+}
diff --git a/dev-ruby/rake/Manifest b/dev-ruby/rake/Manifest
index 6e87df9508b9..2f7b78b9e401 100644
--- a/dev-ruby/rake/Manifest
+++ b/dev-ruby/rake/Manifest
@@ -1,10 +1,8 @@
 AUX rake.bash-completion 1335 BLAKE2B 5f4b81b850e3435246018d7bb420263647c11573657cb7362d95727800f4197a904003b5a967cf0df862edb36af02d640a052b5ad33218d3bd7a6945302ebf94 SHA512 bac238c0023e525570dcb93c2092059b8a952ed54bd97344db8011f89720af947b840564701b75e03f37a6994f27da95d8f44f1fc28839c8cb1d735cdedf07a4
 DIST rake-12.3.1.tar.gz 120170 BLAKE2B c0d087911f33ccd5256462501d175e1f92fa104a3c89b62a5bc434836d5abb277a61fb12269778d0a6e3b9b831e78c0a94d9d1cd885906980fdb55e0402e398b SHA512 49736059713d609b0786d4ea89866fd5d58076977aabeda3eeee0440f10edad708cc10ba91b5224f59a8ab87ee2ab8e2674e9115f90f035c16e1fa8cba3f7649
-DIST rake-12.3.2.tar.gz 121854 BLAKE2B 76d52fbb08f626232bb829da5d125236f99ade886e26a65c8faa7126cb0a902659160971520b1106064371b55f1bf3f27f77ad10c6879200bfbc8e724d57874f SHA512 ed96decf4414eeee0ea79726a5862c8850cbf4db56702a6a7326784249efe432b37f16d4d96ef2c2886fdd693966f5770838802f1bc3446b0724617b8d0869a4
 DIST rake-12.3.3.tar.gz 122233 BLAKE2B e6c913b833092ef5d4203265bb5daf725bfc34ff3abef5a4871845ba9ee322bb8ec668564ed7fe5a2d9ce219d5b7cb00fa22d0b76fb9721f2138d2d963f16c22 SHA512 de15ea4428e845de214d35ad2155bd55cab51354feb5c7ae4c2cde5365d7a3959ee96d913346bdafacdb0542ab2d0e4c2e905514a7f97cfb18e630794bba3a3b
 DIST rake-13.0.0.tar.gz 122378 BLAKE2B 996990f061a2604bf031926670043773b029d03e092513be3566763b04474d88b9bd05c085f25fc9d66b26a55e191b45fa34dc4aa215376703ad28750d71a6b1 SHA512 56038199fedd952994459967173d298afb13ae7fe9d7873dfe18cd4030b37f841ff74c944835843379cd66da96a6d1ee8c38294203f9d8e514c4331d65f5db79
 EBUILD rake-12.3.1.ebuild 1366 BLAKE2B a9c7f74cd56e1684ce7908ee945ae4abef97654f843da7e199a1655f1e96a824c223197bfe7598f1211189131fb86525bc64ee0e2082ce8655706ede77e7067c SHA512 174e001be98fd233d7c9de7a93f79d2a16d1d3c63c91864d6afc0a47561bedb9f7b52fe48918c9324491559bae98e6868d7ff04e8d7aeebc5934ef8ddd7a2945
-EBUILD rake-12.3.2.ebuild 1299 BLAKE2B cb8a0c164aaaa8467f64f3dbe6cd379a6a9f359b44d410a3107fda9f3efa02641cc4ff1d1ac94b04345a86e8aa38ded3358347ed343401a96d2cbb566b31ef0b SHA512 196e872142693ecbe15f3b6c511052bacbf417d64d68d0d34aa99ee9eaae7c40eb9f36eba8e2c2aade872abd812269e91a81930ed89809c3d742e7edaf345bea
 EBUILD rake-12.3.3.ebuild 1292 BLAKE2B 8b3ff51db66dd9826a749eb265237975eb85988f6843db7059ec0d08c98f7e11b3d40e2d0761abd1727f5d35c13984e8c022607b22346d51a9eb409ae0a64c7e SHA512 a9cd4c01f07a56b7a48b8c745f74faad841ce76b1588ddb2f42d47cfa7da10f20906bbb5a47d06a2c25f34e6d167c63a0e54bee7d5252cd19bddf26af8d09afc
 EBUILD rake-13.0.0.ebuild 1461 BLAKE2B 64a89d887bdde655980355c68fb13e4f3d48b5f588f9053361f6d5d94a2821d49755b90a12e4d2bf66516157cff7fb03775b0353a19ba778b3e08a66c66c5313 SHA512 73c7cbcda9a544bbdd7a64cba9dc51c2162648bb5142674cb89775ee4cb7605eeb0f48121039b3d51c8a8862347ccd6832f3ee77295d46196885d8a3ae900466
 MISC metadata.xml 341 BLAKE2B 4f6fce5484dd3adf4b7025f95d26ecd9f2f435d2b5e5774cb3f6ea2ea07727d4d76ef640eb039aafe67e5597b70d22258d0f8f939471af2057f0f933250098e6 SHA512 56fc95931062163036dde73847a796fd5802ff4bcb8a8e72686847537d0f38c9d15e0ec83bd06c2f86ce92952e9fbaa0e90eb4633d7afc460adbc0c9676e0040
diff --git a/dev-ruby/rake/rake-12.3.2.ebuild b/dev-ruby/rake/rake-12.3.2.ebuild
deleted file mode 100644
index 1db61dc6279d..000000000000
--- a/dev-ruby/rake/rake-12.3.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGES README.rdoc TODO"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_BINDIR="exe"
-
-inherit bash-completion-r1 ruby-fakegem
-
-DESCRIPTION="Make-like scripting in Ruby"
-HOMEPAGE="https://github.com/ruby/rake"
-SRC_URI="https://github.com/ruby/rake/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc"
-
-DEPEND+=" app-arch/gzip"
-
-ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.8 )
-	doc? ( dev-ruby/rdoc )"
-
-all_ruby_compile() {
-	if use doc; then
-		rdoc --title "Rake - Ruby Make" --main README.rdoc --out html lib *.rdoc doc/*/*.rdoc || die
-	fi
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -e 'gem "minitest", "~>5.8"; require "minitest/autorun"; Dir["test/test_*.rb"].each{|f| require f}' || die
-}
-
-all_ruby_install() {
-	ruby_fakegem_binwrapper rake
-
-	if use doc; then
-		pushd html
-		dodoc -r *
-		popd
-	fi
-
-	doman doc/rake.1
-
-	newbashcomp "${FILESDIR}"/rake.bash-completion ${PN}
-}
diff --git a/dev-ruby/recog/Manifest b/dev-ruby/recog/Manifest
index 2c4c84cf271d..2309a67ec7e2 100644
--- a/dev-ruby/recog/Manifest
+++ b/dev-ruby/recog/Manifest
@@ -1,9 +1,9 @@
-DIST recog-2.1.31.gem 236032 BLAKE2B 5e6b4ffe163985ff437c2fbaf203e1d07796ead0c20b233703fcb66bfed45930463dc1b7b2bc0c6c9ec1089730589cf996b59382ad4fd63d4913b118035fc852 SHA512 eeabae2684d4fb616d7ea272dd9c4fda0b1a2ea7776cd664fa237989b68e277943642267359a2671ee180e1a5f0cda8f0be24bfa2b4d7729b469664700955ada
 DIST recog-2.1.46.gem 246784 BLAKE2B 1b151fb6944371d186154ecc28eb74f6727b92394bf3686fb7230603e64a37438dc63293929b63025794ae053304ced7f74da4d530d24f77a6274ffe69cfff7d SHA512 aae48fc9a91e7f750944a97e562789efde14474b42d063dcb2dacd038e78fd20222719e0f17d66c8a13b7261e2e58567bad4db0a84893724a5c04504d35efbc0
 DIST recog-2.3.2.gem 259584 BLAKE2B 035cdcb23fa837798fd256d00eb3cfa11b6ebeefd218c3c00a0f68ad1311efc6ce62a3db537cdc7a692d77e10b45c63f7c391314b05ca93c9afc269e67e7ba24 SHA512 0deb0e2354bab3ae190b0b71d370755de802d679a37a2d907fcc6503a12120e27d607bd3f31db62f678e4488228977132f3816a4586e5e85ba37f7ff6cd27733
 DIST recog-2.3.4.gem 262656 BLAKE2B ca2ea05844f5fde74859b22a9f710e5a9f0d44d789d49fb2c8502f4f09f5e5a3772d4a4187e5f0c10ec250c84599defc9dc86dd5602a7bdc7586f07ed14df350 SHA512 4ebf2ce4d502eb103eb3d10b7c01f3e43a402b90d8883f76cedb93edea32f31d196c4141c11264739f73ee9afe8590c50a368897a1286ff408d4454e89622be6
-EBUILD recog-2.1.31.ebuild 779 BLAKE2B 9298c273ae50c521f7f69a7344c9fbb018ef55f66667debe964f6a7f2b0a41636b292c27d8ead601d6ca7438b023d4c698aebd42cb6d4f92986d11f81953b298 SHA512 e54bb98094439e2809e8d816e6f23d04bf80670abd106395f6bb4d955d16c6896b440181d7183481f067c9d3675e0b162ad14814500300c971324a7b53e5400b
+DIST recog-2.3.5.gem 263168 BLAKE2B da850cc08e7ffebd34e040eac15ecc62ab857c61d8a65cf5e9889f94c0173204ef8de5c712c89ddfc67c9d6bb8c01c09c702547de1bbdd7b12d121e4f4fefe7b SHA512 a45bc81c17edc9e431aa945678c77c573e2d1ad2352b4b4862492108cda0620145f6dc04a7d7ff2a6b456db32ed0348af4e61cd2be187f9d3de2b421f1f4e4ce
 EBUILD recog-2.1.46.ebuild 841 BLAKE2B 610ba24ff01b902c9cf7f35567a578b7425a25a79f1f05e376f67d39cec01b20c6ab602ad7734e0a9cf6dab10075ee5cc58280c2e8a8507a31b624a43453bd8c SHA512 081060546281be7a36215ea6d60d9a2236dc25d6cca2da29b0c9c5c0549efc1d1de97bb0117aa59952d4d6d1197e4afa7fc3eba6f4b9e3ef029991dad60276d4
 EBUILD recog-2.3.2.ebuild 820 BLAKE2B 6261682f3ad083ccbfcc217000da03ee7acdd04a726e17c32da3b5a1472dc7e45dbf4a2c5b4fbe4a9b59ad853c932288f066d24f9c6a282849291af19d6a3ed2 SHA512 41ccda56593ee7a63c62e86169fb45512a1936dd2b15272f3de8a8f5010f74035a28adc91b73a166f1dc854a0d87a28f771a8c2ba737085e9ba52174f7e10989
 EBUILD recog-2.3.4.ebuild 779 BLAKE2B dd2b02b306c18b6f15988de6782069b006ec90434adb8e20e304eebf63bf35d94edfa57d233c6dd58e653b2c9771953a1ed345185f9bd6456645fc7ce4b3d3a2 SHA512 2f173a35948cc68d497787501bfe60e8fe9ebf69e7ec558be13563dbc6b00cdf398d0c09ba408668e2c1f992c7a3fc6f258d8415fa764ed467228fbecee9d305
+EBUILD recog-2.3.5.ebuild 779 BLAKE2B dd2b02b306c18b6f15988de6782069b006ec90434adb8e20e304eebf63bf35d94edfa57d233c6dd58e653b2c9771953a1ed345185f9bd6456645fc7ce4b3d3a2 SHA512 2f173a35948cc68d497787501bfe60e8fe9ebf69e7ec558be13563dbc6b00cdf398d0c09ba408668e2c1f992c7a3fc6f258d8415fa764ed467228fbecee9d305
 MISC metadata.xml 334 BLAKE2B bccb589153c4961a76c8bbd83ace97d4295b5c6a3b66ede325156940c8d0a1119bfaa838caa5d1e7ffb1363e4a3cbe8d2899fc2430b051dab63b11709f16d190 SHA512 cb416ad148d55b439a260d17b6f014075031a7b60cbf686b75e2b34f4d7bf82a8f0001c84f0dcbd9506a855a64dd20902965a0744cdd9fa06f6391929d5245fa
diff --git a/dev-ruby/recog/recog-2.1.31.ebuild b/dev-ruby/recog/recog-2.3.5.ebuild
index 979c69af3ee8..c000a7c6eb5c 100644
--- a/dev-ruby/recog/recog-2.1.31.ebuild
+++ b/dev-ruby/recog/recog-2.3.5.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-USE_RUBY="ruby24"
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26"
 RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="README.md"
 
 RUBY_FAKEGEM_EXTRAINSTALL="xml"
@@ -15,22 +14,21 @@ DESCRIPTION="Pattern recognition for hosts, services, and content"
 HOMEPAGE="https://github.com/rapid7/recog"
 
 LICENSE="BSD-2"
-SLOT="${PV}"
+SLOT="$(ver_cut 1)"
 KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""
 
-ruby_add_rdepend "dev-ruby/nokogiri
-		!<dev-ruby/recog-2.0.6-r1"
+ruby_add_rdepend "dev-ruby/nokogiri"
 
 ruby_add_bdepend "test? (
-	dev-ruby/regexp_parser
+	dev-ruby/regexp_parser:0
 	dev-ruby/rspec:3
 	dev-util/aruba
 	dev-util/cucumber
 )"
 
 all_ruby_prepare() {
-	sed -i -e '/simplecov/I s:^:#:' spec/spec_helper.rb || die
+	sed -i -e '/simplecov/I s:^:#:' -e '1igem "regexp_parser", "~>0.2"' spec/spec_helper.rb || die
 }
 
 each_ruby_test() {
diff --git a/dev-ruby/rex-text/Manifest b/dev-ruby/rex-text/Manifest
index 9acdda4c8220..9d54444dbe50 100644
--- a/dev-ruby/rex-text/Manifest
+++ b/dev-ruby/rex-text/Manifest
@@ -2,8 +2,10 @@ DIST rex-text-0.2.20.gem 44544 BLAKE2B c446dfcbb54ed9cf57f019f2158fdfe37ae6815f3
 DIST rex-text-0.2.21.gem 44544 BLAKE2B d905973b190b84f048ab26774651e394d8902b81377cab92298800b462e009b7ed8b8ac8f8c10f3726475bfe2a696a40655cbbd6efbf820974c503df37f07d10 SHA512 9504b78f77f4c00cc42e43313f48b058ecb5fb8c183225e580b8750810c26eaf22949793b46d90e5e36276d25a419153b38ea387fd28bc9414de62843e3efcba
 DIST rex-text-0.2.22.gem 44544 BLAKE2B c83976b7ccb2d33a94e61735f0234bcb29b1fffdd464bd2f10e40f45eb6e270979a26bcb0299de9af76edb44198803b26f601eaab18b3c5a9d8e5c3a07324ff9 SHA512 02a94c791fcc3c745d0728d767e82cfd20024db461c407f608ae8198f50c27d3b211baa791d7ca42fd6b5542453fedc8e57f2b421e88f1099d1247249e660efc
 DIST rex-text-0.2.23.gem 44544 BLAKE2B 4871d7869e11b5d450704ee0e19da1fb468cb6870569c41141b4a51a4ce267304ff0404d76d96b54b1a403d59f7efa724f60e16ef032c539a4cec56c0596345e SHA512 9dfa878a5da627ee10497a5f6ba9b8f7c63f649cfbd5b4a140b79ec9a98c65732e01f9938dfad2ff009296c42108b37d0df794bf40cb1741f3881de7d954d16f
+DIST rex-text-0.2.24.gem 44544 BLAKE2B 7da2f0fa33adf9bdc409f91288f47dc481a732159473f0a901cdbe5f4a8b8669d6bf96bc77603c0179d113b755472e13bd19d92ed74c2f25a187479dedb978fd SHA512 06da127bff8c3addf4e6a914d8e358658bc785776efac036518547f69389aa9a1ce314fce5ab3148453b6a9e3593a2f291d26ad0fa2bb4687e31e6078c594f9a
 EBUILD rex-text-0.2.20.ebuild 499 BLAKE2B 6b33b438b6a2fc0697ffaacd68b65d0ad7e154a767b83446ceb8b04d8047db86c2d4bc4af037e72099894724805c2944a0becab778f5c9101f0c768bc92003a3 SHA512 285f14b9a7a681c659e09c44e29b9bf874c3ae86459cea5199470220ecda001553fd1d01660eabfc917c7c7f627d7ca929ccb84a976a25cac62bc525c7dc180b
 EBUILD rex-text-0.2.21.ebuild 503 BLAKE2B ac23160287da333f15a37358d9a0312cc6fe04c59c88be8c631ba1c9c46225f1833b10219fdb8027386602ad7b43161ea512ee8faf6e1a64266880c64df77b72 SHA512 0e17448ee6fded7a2985e87f05b72b91add3f455e86152e10996a67b00e45b02fd660aae2e4e66c50aa667b4d86e1dc3097c5ae71b04ede70fc1126d8314c6b9
 EBUILD rex-text-0.2.22.ebuild 496 BLAKE2B 33ccb9f935897d3f5350a544602f6136527205ccd18d30b2967b34563d0d196fd419b36a813d07104aef4a41d9eef76db7ccc0106bea774cc6f08e229bb2ed4e SHA512 748854960fcf9ae3f70a8f7e461ae1f1a5d9a853797bfe2d397533a7544152948904ebf87111866d48782cb54633769a3cdb2c6168c8f329a2674003dfb7ae11
 EBUILD rex-text-0.2.23.ebuild 465 BLAKE2B af54914b76f327fd6f052bb9cb136ded08d770063b94a0b02dd3332b61f7c438aa5a4404226e16386676a55340f619ec766ff3b8a47db7d3a3636cb8f1e708c9 SHA512 9ea6383b94ffd76e1b78da784e8d828f9a8e9beae885d8dcbcb47937c6843918f00ca5a28813d4f3b57c023a11d7872a808d01a6bb266a32d1b94b592c408ed1
+EBUILD rex-text-0.2.24.ebuild 465 BLAKE2B af54914b76f327fd6f052bb9cb136ded08d770063b94a0b02dd3332b61f7c438aa5a4404226e16386676a55340f619ec766ff3b8a47db7d3a3636cb8f1e708c9 SHA512 9ea6383b94ffd76e1b78da784e8d828f9a8e9beae885d8dcbcb47937c6843918f00ca5a28813d4f3b57c023a11d7872a808d01a6bb266a32d1b94b592c408ed1
 MISC metadata.xml 337 BLAKE2B 5309d74f65e9d31fb44761ea01a28cddc4a698ec2700bf2a18806871b42370d931405eaa6a2c8093d7405de11defe6aedaeeb72ea585d7cfefd970a323cb82e1 SHA512 24d194089e40848fc1ccce781e29de3bbf56c536a4f5fea036d2bd783483d2018b1105a4be88b8fcd57408651d3cac45ca649a111364dcdb834014bc6bda7bb8
diff --git a/dev-ruby/rex-text/rex-text-0.2.24.ebuild b/dev-ruby/rex-text/rex-text-0.2.24.ebuild
new file mode 100644
index 000000000000..26a1fd1912d7
--- /dev/null
+++ b/dev-ruby/rex-text/rex-text-0.2.24.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby24 ruby25 ruby26"
+
+# Specs are not bundled in the gem and upstream source is not tagged
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Rex library for text generation and manipulation"
+HOMEPAGE="https://github.com/rapid7/rex-text"
+
+LICENSE="BSD"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
diff --git a/dev-ruby/rexical/Manifest b/dev-ruby/rexical/Manifest
index c8182bf5bdc9..55d4a1f6f0d4 100644
--- a/dev-ruby/rexical/Manifest
+++ b/dev-ruby/rexical/Manifest
@@ -1,5 +1,5 @@
 DIST rexical-1.0.5.gem 20480 BLAKE2B 6ed81f9247410aa68cec1ad02a49774da839679fa3f535691f79da42144fbcda4b0f0dac74c7c02bb08d262b66bd543a8bde05ac5871454b96a7582c228e5fff SHA512 6cf5eac36953203a2de66eccbbc8679a4d695c3f0540ab8adf7a3db37eb4e94889c64c3ce4e4e88ea52738a6733680be2105e0604d01a2e07bae10939deb03c1
 DIST rexical-1.0.7.gem 22016 BLAKE2B aaadf4131fbc4958a6a17be02b970070e511dcb031fd6432fb62fb841eff36b4d5c41d8f8f295aed4ac376c49e736e5d795166f71957578c6cbe14fd6cea26be SHA512 f71c86bd9764e65ebe0c66acd5446b5da7a1b38aae9d33367d70bfa253eb53c178634ce90c883c5459622219670d4d32f375b216c3023a3109329d6930dec1fc
 EBUILD rexical-1.0.5-r3.ebuild 1058 BLAKE2B 62386147090c40c72f3fb7d65a7723b97fb12d92ad8e6d7a64fb7fac651d5f316afa206f3a286e991055a6981652ecee087425b8d928885feb0aadbf3c004ff1 SHA512 91214e07865f3bdda83c64dc937b12b8e17b6cbb9d0ba639e46b6d29a069dc99eded934fd9d14040d915d82de94bb1206560fb53cdb571a38085f8e61e23838b
-EBUILD rexical-1.0.7.ebuild 879 BLAKE2B 395aea412d93830954f64b199a5626c800a4277e13e97ba410e7468c1717e3237c0c4a2043665e32e01bd1d00f6b071dd2ecd2a3f4df6d47ae520feef29990e8 SHA512 1c4510c6a389af0145653972c6174c551ae35efe307379683c4ae9497e9af086acf9fbc02125b51c48b6d9a1bab6c3f6ec5538175b7c9b953718638da8f1cbb5
+EBUILD rexical-1.0.7.ebuild 1031 BLAKE2B baef1229f73b009e524c21731ebe8b5e7034d24b949f28c0f05f439cacf3bbf4dcae71138367d992348027d25eae3d796539333870bee96746f9cb1c9654c8b0 SHA512 d929c9adc88994148ec86b8ffb866c6bed30e20884231cb66a4c017370b14829042763a24dfb18506390222a0495b75ac0579deefc6a5ad8b7aa74ecdee8a498
 MISC metadata.xml 344 BLAKE2B 308f72345dd9f7ce808e53f6b3883102b7c5b51d41ff822d28888d684abb4efdce86e24fbbb2d6ba46342c85e23189fa619343c467689a13b62382a5ea024d2b SHA512 96c6b9e4f3ca4aad95e01087158bbcd9a159569d7ccfc90365732e4ee6b9772506521c7e4706043897ffceccc98236077abf570efac9f0ddb24ef56efa65176a
diff --git a/dev-ruby/rexical/rexical-1.0.7.ebuild b/dev-ruby/rexical/rexical-1.0.7.ebuild
index 3b435e81161c..214bec704398 100644
--- a/dev-ruby/rexical/rexical-1.0.7.ebuild
+++ b/dev-ruby/rexical/rexical-1.0.7.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Rexical is a lexical scanner generator"
 HOMEPAGE="https://github.com/tenderlove/rexical/tree/master"
 LICENSE="LGPL-2" # plus exception
 
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
 
@@ -27,6 +27,11 @@ ruby_add_bdepend "
 		dev-ruby/minitest
 	)"
 
+all_ruby_prepare() {
+	# Avoid dependency on unpackaged rubocop
+	sed -i -e '/test_rubocop_security/askip "not packaged"' test/test_generator.rb || die
+}
+
 all_ruby_install() {
 	all_fakegem_install
 
diff --git a/dev-ruby/rjb/Manifest b/dev-ruby/rjb/Manifest
index 22385018180b..8397c1324ada 100644
--- a/dev-ruby/rjb/Manifest
+++ b/dev-ruby/rjb/Manifest
@@ -1,5 +1,5 @@
-DIST rjb-1.5.5.gem 73216 BLAKE2B 3bee34d033e5d85150740df1e30d93d54a3078824c76535e1300d2be0a2ecfc6aac2b30762a6b85fd1449df45b49550c0627f6cd588af712d0dfdaab2ca4e68c SHA512 a1a8f6e6b75555ce228fe8d58b467f783e55ddb12371485d45ad32597ea7ec60d30e3870671455e4e22fd680b5aa21bd952b8abfa36531c030747573e5d43cea
 DIST rjb-1.5.7.gem 72704 BLAKE2B 9a4f2b304c05f65c0d78ca4909814da366de717f518017c73d23cfcf188d653141d6c4549200c4bd3e55421f59cf8442cf2d01c1c5c1be813964ee7fb4a7b501 SHA512 0ccdbb5bc6f9f5d914d5b117c96310d709965b81a4bd2d0d7c428aabf4e32672572d4187660bc1b509fa3c92ac4cbe97cbd98412253d4ec9a7e4981f3b7a3131
-EBUILD rjb-1.5.5.ebuild 2042 BLAKE2B e4c11d161808d85bbe0eb9cf4a451953f6c70f2e774c55a049ba6407f6f3b09974e69b44ec30367a6485fa7db432f0b8f1d682a51f39150ebd34d3079918c7bf SHA512 5548cb552fe7f8520a9a50949e36fa42f1d06ee58144d8aa2e052aff6968a5541954a968b9243f4386db00a64835d417e40b57755d3c052576a9ed2084fae5bb
+DIST rjb-1.6.1.gem 74240 BLAKE2B 103e3885634be9c7dd842c2737c420511fea04e4e2d18f77dba7689c47da996fa37af5d08827de21ec38effd3fd99407e99491c8b99d134dded219ccf3880b79 SHA512 5b78fc4eabceddeb901145af39b1fc76e9a44801596ea4bacf9ce601cc109107cf042b1aa4c27049abd766ffca3206364079866ce7b88d25657fa75e7593adc3
 EBUILD rjb-1.5.7.ebuild 2039 BLAKE2B 8983ec30b45a3566cc08438dbdd52f76aa910ab2a92c29325781776eedc98484c83939ddfc4fc4c385145b2b6cb35b68c02b9be0e39b6f2edd53c9efa0f3a77f SHA512 3e0c7a0f8342f6e191dfaa0f33c1a17c2f1d4aa7ef2b92abc9155f3bb8e52c856aa7b9c4b4de42564db821bc5929ca63f19556383119bdca18abf087fc7fde94
+EBUILD rjb-1.6.1.ebuild 2001 BLAKE2B 6e966155439b238cfa6fb0144bcb4a834841dd9ed86172ef7af5a951e745c9986bde095983a0c87c7f401df051a508409a26a537ad6c5be6a96d933750ac8ceb SHA512 d5c7c62e913404d1aae47a689433a9f7e5dd8eec6f2b2bbb3526efb0a7941ca6a3b268233c666cb0868fb2179865e6ab5212673c05b0ba50e604ed81f5280564
 MISC metadata.xml 433 BLAKE2B f23feff51bbe88032b365e2cd7989e91f0d09bc20a9d0f3a3084b593d5c94e220ab86f26cf8bb6ad37044130f17b4a2724d339f36805778a739fc3755b8b94b6 SHA512 9e71bf1595b1f96faf1a13f69c4a045ad498382a196a2ec6960c85909c699ae4d49c25b993130ad2328c565862186ce6343f64baba8c9c6fa83c1954960b7264
diff --git a/dev-ruby/rjb/rjb-1.5.5.ebuild b/dev-ruby/rjb/rjb-1.6.1.ebuild
index a74a3e9d5581..b8cfe20bb7cf 100644
--- a/dev-ruby/rjb/rjb-1.5.5.ebuild
+++ b/dev-ruby/rjb/rjb-1.6.1.ebuild
@@ -1,12 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
+USE_RUBY="ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_EXTRADOC="readme.txt ChangeLog"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_TASK_TEST=""
 
 RUBY_FAKEGEM_EXTRAINSTALL="data"
diff --git a/dev-ruby/roadie/Manifest b/dev-ruby/roadie/Manifest
index b69c0865fa36..c10602fb9db2 100644
--- a/dev-ruby/roadie/Manifest
+++ b/dev-ruby/roadie/Manifest
@@ -1,7 +1,9 @@
 DIST roadie-3.4.0.tar.gz 50719 BLAKE2B 7e3948e1c9c052ac72ef462a6a4452d6831d99d0134a9716adcf8cd67d261f2c330a6309e7c8a6e00c7489f62cd2b7253f4db48f7daadee4bf57fb1c40cd181c SHA512 cc25986dbe054b18189dad46f2dbde4f325c7391f5cb8ba598f504a465b99cb84339b2fdad3ef663d50275a186620dd60753df3fccfd5bcada52b74ee4c7c55e
 DIST roadie-3.5.0.tar.gz 50687 BLAKE2B 4d48c7989798977e74ebfb3959c5d1b52ff5aa91c1e81075b7b631a70893f344965ffc838f1debe0dbcc807c588e7e4da93937beb4fcef8f4bd9f3eaf7b81407 SHA512 d0602ccee1b642dcda0644afb762a56c97715472e7dfdd63115fc595e1ccbbf3192114e32e25b3c0e6c8c9db37bfc57b75f66bf9ac1e4656b27972f0d4fcd98b
 DIST roadie-3.5.1.tar.gz 50873 BLAKE2B 478dc7bba6424b953d4c32aeb793f0212fe0ecef5526ec4a28e3b05ff5f29fbbeaaf2022b7277cb20993b99fa7bfc5d03db57c12b589c727239e944e78da2d9f SHA512 b61cc8c1ddcc4819d496489578eb7157cdd7716e99ff675af37b9b650504315120238889d72dd617f37588e005cbba62e1912f4c02ba0e4ba0d111784219ed5c
+DIST roadie-4.0.0.tar.gz 50727 BLAKE2B 671c5260f4a181e4a50d136e4c6e96e96a3bb51adc7cd88d070b558af0d1d858e712a8f6d586aaea5c72b735db41a54ecb1833b74b3e76f7838a3323a69fb5f3 SHA512 ad42ff83c7983e8cce1506f6b72d66e47a860251749eebd3cd65c2114859d3d8a8103d309964aa53875cb07a83393b086fb6c58db88d95a84059abb514d12665
 EBUILD roadie-3.4.0.ebuild 931 BLAKE2B 22ad24dd939bf3eb19d9eb3c09d6d68af6adb988b589a8230de6ecadb13e115ba2872b91cda5cdfacff5ed1b98072c7b5c7111cfb648e19ebcddc2d767bde4f7 SHA512 70ad01a6cbae4a448f943e97dce4b6035820b9e7af3e1690ae69119688296c4e1b3dcf091c0e1aaf99d4ca5fe571299f7b39468a80471626cfb6deabf85b6abb
 EBUILD roadie-3.5.0.ebuild 929 BLAKE2B 6770ab325cb1fec5dc211abce61b083ab0d21dd3accb3e84cde73fde1de72ed7765daf8626bc3eb1cd97203d1d443ec7d027dd7c2ee7319a1c58e3b09c2a9c4e SHA512 e91ee97161116b4a53f610af2ab86e0d865e9173fa9fed54cf698c176087757b12eaf71a91dfbb8104c99ba92916dfc11c02cab9fbc39aa4b0a1f648205db51d
 EBUILD roadie-3.5.1.ebuild 929 BLAKE2B 61ef9dc6ceaf49317c1809ed5ee38ab84088411c39519298a1c237c232e6fddfed20813e6656f005e0f7f64473ab716bc3bcace738e9a896c1ca3695fbd1e1b0 SHA512 214c4cd343495c3a2f5df42e38a5206fd1de445b5665c6d0af953df37fc00257e0a2d8fa3953fbf25cf4d726ef825554f2fa3af3c232b721f99d6a08dcbfd422
+EBUILD roadie-4.0.0.ebuild 940 BLAKE2B 50b0bf2e700cbd1b3907b53cde851237158df1bf9c92c650ad2624039d81f2c95ec75b9da1a167941fec0f000f22f2fcfc4c5bd66bc54508eaea303108fb0d06 SHA512 dfd81ff22115c9db2297231c4d843937248bc0b7b1bfd0080542c2e46b292a0854a6460d91837859847f60a22949cb3d443d709efb4c4e186838895bf20e1d18
 MISC metadata.xml 328 BLAKE2B 1259d1fa19fc2a8d67f47d7ab4a409758d735839a384b75fb9807a1350e1dff6caa79e19063dd0955616b15a12f25040db50d2ffcfc4fdf038375032ba9b8a4e SHA512 56c3c637b8500939fa5b0c54fcb7382a666bd3d661baae8074dc1a11281aa149ed6911d19831ec62c311917bef30d10498c9c4323866cec6c0f9f267a5608ae2
diff --git a/dev-ruby/roadie/roadie-4.0.0.ebuild b/dev-ruby/roadie/roadie-4.0.0.ebuild
new file mode 100644
index 000000000000..cd17893e2508
--- /dev/null
+++ b/dev-ruby/roadie/roadie-4.0.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Making HTML emails comfortable for the Rails rockstars"
+HOMEPAGE="https://github.com/Mange/roadie"
+SRC_URI="https://github.com/Mange/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/nokogiri-1.8:0
+	>=dev-ruby/css_parser-1.4.5 =dev-ruby/css_parser-1*"
+ruby_add_bdepend "test? ( dev-ruby/rspec-collection_matchers dev-ruby/webmock )"
+
+all_ruby_prepare() {
+	sed -i -e "/[Bb]undler/d" Rakefile || die
+	sed -i -e 's/git ls-files/find . -type f -print/' \
+		-e '/test_files/d' \
+		-e '/css_parser/ s/~>/>=/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/rouge/Manifest b/dev-ruby/rouge/Manifest
index fb0dcd295c19..3eb95e8ce978 100644
--- a/dev-ruby/rouge/Manifest
+++ b/dev-ruby/rouge/Manifest
@@ -1,11 +1,13 @@
 DIST rouge-3.10.0.tar.gz 780864 BLAKE2B c5761806fa27e8bc83d51a3d85a62a63b33212bb2958bfd161c344285712692d8b1dfc6a3aa3328738b5f9de9a02508050e3fa5b9324220d9b54e3bbc17a22bf SHA512 4ec1ea86db8a3df98a2cc2152ec55f301799fdb40c9a4b8d178b9fedadee576ec7c15ebb21b397cae5c95ad4e126cd21a457f3cc8d14408bac860e3997cf34c1
 DIST rouge-3.11.0.tar.gz 788545 BLAKE2B f6f5782f620b76236f66b3b59248eda345d41383dfd8d4ed782e3c61c24226135abe70f906a337497242ade14b6cfb33f904de7c12ca2ff538daf37189568ff0 SHA512 4cdc85c543bc9303778940300c76e7863c67534cca91bd35135ef3abfc107c4ff0d7289aad2980f685b6bc716b74907fe029bf65f6cc2362a4ae048a0d8b6191
 DIST rouge-3.11.1.tar.gz 788635 BLAKE2B 4bd0767d30799fccf83df8422308aa30da1d3475c122a63f49723906b5950aabdbe778da0d852ac3b1b7977cf11f1e94c3b0a5d4c274c196950d10183e706882 SHA512 22707f443078de26ba1c94272ed9ccaf1c772271dcc2b844969f345645a5e22ff6dde1f9d6ea36fabd1f61f4cc24474d849883ced9219ae6ff8cc7113751fcfd
+DIST rouge-3.12.0.tar.gz 790763 BLAKE2B 8572c8d89f7f16bb6a5d5b3119abac7c13779fcefb4da3ef701bd00430bb01611cdea9de0e6ccf4d07dd8cd646525fa679d86e951a18fd4d76a1cb03d423431c SHA512 bd9616bc1a7c8d46f906b51c30eeec53f77712ad8b5c6c4403dfd128e1d710a9dfd2cc7c026c62589eeb1c87de95c1972933cd156d23721c2ea02846bac71f05
 DIST rouge-3.8.0.tar.gz 755720 BLAKE2B aca1ccbd601ee080958ccf09ab8932dc556065945f4cc2ee9b9bf5531ff41cec676005b0c7540aa058b3346c5eabac4351dd6a291ff148c9b5dfc682f7579336 SHA512 16a1cf9e9eae466c55f236f10d10bf0f5f4d523f6a680c1130b02115384691c1e2fbb14b59a6be1b9df77cc67fdb0ffe026cff6d0150230afe53f26b4c254dde
 DIST rouge-3.9.0.tar.gz 771945 BLAKE2B 855a9a7b7bc5af5c19265570d7cfbb699ac3c9e355ef1a0ccba2a8a5e93ccf3dac5bc1c6e8ab1e251c29eb4eada403862c31f905d6de86bd3b6ae1d1868231c0 SHA512 da132ed07889f6dfda9199cfd6eb8f1af8e0c68b666452f0bafc86417bc153d11967138de49f299f4ae9d2f868dd7349a4089b235fceea80e32b1af3e3200172
 EBUILD rouge-3.10.0.ebuild 918 BLAKE2B 4b982506dcc32d91dca8b6e9bf065b0dabec1975dd2aeb930a51edcab274ae7568360ce0d40200c1f800556b4115c3d120f3893b7b904a2efff53823fd1b37b2 SHA512 d05e02312d48bda6b790a995eb0b1c49eb23ee82bd27ce32c6c356106658c52e9d424d8acc1fb6f66d11f11738e25b9d1f2cc3aac0576d00e6ab105982442f73
 EBUILD rouge-3.11.0.ebuild 956 BLAKE2B b5b26fe5cfd21f8e1b9162e299099e10f123d527f84560244f5dcc4aab210a9344806fbce56cf4a8bb7438814902cac7cff029fa907323cfe8e558eea36dbe26 SHA512 7d2edf19660ac69ec7cf13b47266da9e8b7e91c059e2274c938a02b6c8bfef40fc9a913c3874072aaf05b0eece162e2e1c8b9a706342e6b59b6687276981059d
 EBUILD rouge-3.11.1.ebuild 956 BLAKE2B b5b26fe5cfd21f8e1b9162e299099e10f123d527f84560244f5dcc4aab210a9344806fbce56cf4a8bb7438814902cac7cff029fa907323cfe8e558eea36dbe26 SHA512 7d2edf19660ac69ec7cf13b47266da9e8b7e91c059e2274c938a02b6c8bfef40fc9a913c3874072aaf05b0eece162e2e1c8b9a706342e6b59b6687276981059d
+EBUILD rouge-3.12.0.ebuild 956 BLAKE2B b5b26fe5cfd21f8e1b9162e299099e10f123d527f84560244f5dcc4aab210a9344806fbce56cf4a8bb7438814902cac7cff029fa907323cfe8e558eea36dbe26 SHA512 7d2edf19660ac69ec7cf13b47266da9e8b7e91c059e2274c938a02b6c8bfef40fc9a913c3874072aaf05b0eece162e2e1c8b9a706342e6b59b6687276981059d
 EBUILD rouge-3.8.0.ebuild 917 BLAKE2B 7d5479ce54b4372c4d71cad96f2f012c9a013c5a5ada37d930a4b3299c69fe90c9ad78145da3103100a0b7806c69bdc3e2b6cf6c6d937734e0999bbaef67c2b4 SHA512 7880f210d33664bb78b41b3104b8ed2cb841e7bccb4e2531d21d6ba332f054ef8d37b80fcbaf0bcbda432980193646ed23d496687c357e1ef5be2a118d409b1b
 EBUILD rouge-3.9.0.ebuild 918 BLAKE2B 4b982506dcc32d91dca8b6e9bf065b0dabec1975dd2aeb930a51edcab274ae7568360ce0d40200c1f800556b4115c3d120f3893b7b904a2efff53823fd1b37b2 SHA512 d05e02312d48bda6b790a995eb0b1c49eb23ee82bd27ce32c6c356106658c52e9d424d8acc1fb6f66d11f11738e25b9d1f2cc3aac0576d00e6ab105982442f73
 MISC metadata.xml 337 BLAKE2B 0b11fe43cebeee93ba1543bf3784c624a91373b066b90485698e9f58ad95d2d4ae077fa5d18d097deb5d8678877b915a9df7154899169d35345fc8fc52bb1c44 SHA512 2517857c1be612b98601b4f92e3e20f3e404902faed1965f8e2e0573820ed6dfc12de25a292bc5f5971b498e310cdfe4a3a5aa13f46354f5139c53ae6a53b876
diff --git a/dev-ruby/rouge/rouge-3.12.0.ebuild b/dev-ruby/rouge/rouge-3.12.0.ebuild
new file mode 100644
index 000000000000..1ba7cbc90225
--- /dev/null
+++ b/dev-ruby/rouge/rouge-3.12.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_TASK_TEST="spec"
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+
+RUBY_FAKEGEM_GEMSPEC="rouge.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Yet-another-markdown-parser using a strict syntax definition in pure Ruby"
+HOMEPAGE="https://github.com/jneen/rouge"
+SRC_URI="https://github.com/jneen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+ruby_add_bdepend "doc? ( dev-ruby/redcarpet )
+	test? ( dev-ruby/minitest-power_assert )
+	dev-ruby/yard
+"
+
+ruby_add_rdepend "dev-ruby/redcarpet"
+
+all_ruby_prepare() {
+	rm -f tasks/{check/style,update/changelog}.rake || die
+
+	sed -i -e '/bundler/I s:^:#: ; 5irequire "minitest-power_assert"' spec/spec_helper.rb || die
+	sed -i -e '/\(changelog\|bundler\|rubocop\)/ s:^:#: ; 1irequire "pathname"' Rakefile || die
+}
diff --git a/dev-ruby/rspec-core/Manifest b/dev-ruby/rspec-core/Manifest
index b44c2cab938a..62e546b73164 100644
--- a/dev-ruby/rspec-core/Manifest
+++ b/dev-ruby/rspec-core/Manifest
@@ -1,8 +1,8 @@
 AUX rspec-core-3.8.0-ruby26.patch 894 BLAKE2B 7639c2836caa1602320288ff7662a40e3074aa82ffd9bc56639b1db9d618a81b6ad78bea5dbed09fe68455a446f06f2cc2276f3313650f9d8b58b2c5db01b4f3 SHA512 8aca41f68b16a8790c71e618e0ab18dc7e55651e4df91a92ba9089498c5995c36fefa09cd9532186882dd6a4194a21f7bb5f25e180151fde26c4616f60b5712f
 DIST rspec-core-2.99.2-git.tgz 212935 BLAKE2B 37195012f79aca3a1959f9143e2f5cbab63230ab07ea97928d6f66face8d07ab54d87f19535f5f235c441b2da6dec17ef2a889e9ccd7e83d987086e24afd1b82 SHA512 e13bc3384fd85c367481a8651c14be4a412cba5f58e12a8f4ab14b5d2768a7b92191b81e000e7dbf6a28275b41044d8b3eb70a04e4b30b5bf88db98cbec4cc44
-DIST rspec-core-3.7.1-git.tgz 376819 BLAKE2B 6747ffd8f2d426718376b51356d8838a7db0d0246ee619e8edef30bd9f7aeeb80bd0488e4fc73b0a00d119074c35055f6b9d0cbbe6160ae78d0727ce9848a710 SHA512 1561d044281c1b8b97cc89033ad991548fa74abbc5f20d3951d3f3de754c581a027f9ccb2bd0107c05e744d3b2804555cf4cf207e72adf365b28fc7ce052dab8
 DIST rspec-core-3.8.2-git.tgz 387788 BLAKE2B e6cf93f5cef70f53039b6c22fc875cff58eaff4c0c7d4e75d23dedfbe16081980c6fe575d3082dbe6ed9edc8e81f0cbb9e29618da78af40a94c517a859f9d793 SHA512 2fe88ee3d66ecf134562dfa7b1001f23a1a750640c4f65cdec64d85dd735e0fde9d91479286f8f9c38064746813f41632d12d21b3926724ccd7c9ded50d2a7c8
+DIST rspec-core-3.9.0-git.tgz 391483 BLAKE2B 0e25918f4df4123c9cc9b0b00e2df2d42e1bf9afb160840c2e1db5c5c9f8e1b46f147b66d7ba7d2b3d437d7e47bec8e321c9f9001c9e58d22173466762cd3215 SHA512 c4e1136ea671d51f00c6de3067a479b15785fcb0f580fbdc57a9d35f852f10ec4b86e842a534536cc520175510de559f4d03dbc3fbd34fb22df411e89d06d662
 EBUILD rspec-core-2.99.2-r2.ebuild 4264 BLAKE2B 80c057c80661ece49bcf32aa5a26cf7c35fc3c28faf7e88629ddc166775221db5be97a573ff1819d90c1ff685efc65dd9b27b635455c51ba9cb6d6dff3ad78b4 SHA512 fb90598eedaa211378ecf67a457266deb88ef4b86693247e825fa195daeedaef8456475c1a14bbea5f6f966eae7257bcd2b8f36bedd72aeb2a6e4a71d0e92004
-EBUILD rspec-core-3.7.1.ebuild 3419 BLAKE2B 65b5734208e5d1c6d26c934ab92a1f15522f5305551bec461aa738c87a3680de10d780c12991dc5ce31bf5ee5afe45814e5e20011a63ec6f79a58825be4eb195 SHA512 8579d22bcca77c546cdb11d33262384a6d3a5115195869d74a99b46a0d7419ec4f74c5aa1a2f59067efec60b87fb626d621e5f4defaf62bb7d7b5ea502db3653
 EBUILD rspec-core-3.8.2.ebuild 3169 BLAKE2B 66a803f6cde8a21b49a53fdd21d29a9dd03bd37d65301bd4f63677cad5af301b825584c068f8fa2cd30a9888268271241dbc092356c226e198175bfc731b85ab SHA512 810e3448980b61cbfd6273b216a8fe480335774de82d50066af20b26bef570f6b4525be83af13eb96188e47f638e0611992fbbaa800f0950ce11a4fa1dd4bb50
+EBUILD rspec-core-3.9.0.ebuild 3138 BLAKE2B 92284ab8be4daa3bdc685a3cac1bd3da00d8b1d1676f06ab77b01a8c3de3d3f520bef42fad6e03b25dbeafaffc211c180f1c570f10a0d24007d7ec716ecf6777 SHA512 2e7b80a24f82eaf799610a77b39ce27ec7513a48f463dcf396a6de1bbd8afd88aeb1c7b52e44000a53b046257a8719daafae4e6e35743cca51b58fa33b156139
 MISC metadata.xml 465 BLAKE2B 7aa4aea8fcc4616588f8842e4d3625219eabe0c17f7a621f9d01ba3ba403ce178ba5960a15c9a163eea32a9956cdc27ce1a607bdae1c32a1a6fa1207c7358388 SHA512 987f6c0ce5814c23f3d76a32f0b59ebd89ddc71bcb23d109106a2ee11a5ab050cafd1ec7f87c84f07b4b4d71244d71885c6d727d2b583484c0e5f6466066a57b
diff --git a/dev-ruby/rspec-core/rspec-core-3.7.1.ebuild b/dev-ruby/rspec-core/rspec-core-3.9.0.ebuild
index dcaf66c0833c..fdb4d17576ec 100644
--- a/dev-ruby/rspec-core/rspec-core-3.7.1.ebuild
+++ b/dev-ruby/rspec-core/rspec-core-3.9.0.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25"
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_TASK_TEST="none"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 
 RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
 
@@ -14,7 +13,7 @@ RUBY_FAKEGEM_EXTRAINSTALL="exe"
 
 RUBY_FAKEGEM_GEMSPEC="rspec-core.gemspec"
 
-inherit ruby-fakegem versionator
+inherit ruby-fakegem
 
 DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
 HOMEPAGE="https://github.com/rspec/rspec-core"
@@ -22,23 +21,23 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="highlight"
 
-SUBVERSION="$(get_version_component_range 1-2)"
+SUBVERSION="$(ver_cut 1-2)"
 
 ruby_add_rdepend "
 	=dev-ruby/rspec-support-${SUBVERSION}*
 	!!<dev-ruby/rspec-core-2.14.8-r4
-	highlight? ( >=dev-ruby/coderay-1.0.9 )
+	highlight? ( >=dev-ruby/coderay-1.1.1 )
 "
 
 ruby_add_bdepend "test? (
 		>=dev-ruby/nokogiri-1.5.2
-		>=dev-ruby/coderay-1.0.9
+		>=dev-ruby/coderay-1.1.1
 		dev-ruby/syntax
 		>=dev-ruby/thread_order-1.1.0
-		>=dev-ruby/rspec-expectations-3.3.0:3
+		>=dev-ruby/rspec-expectations-3.8.0:3
 		>=dev-ruby/rspec-mocks-2.99.0:3
 	)"
 
@@ -60,32 +59,25 @@ all_ruby_prepare() {
 	# Avoid aruba dependency so that we don't end up in dependency hell.
 	sed -i -e '/ArubaLoader/,/^end/ s:^:#:' -e '/Aruba/ s:^:#:' spec/spec_helper.rb || die
 	rm -f spec/support/aruba_support.rb || die
-	rm -f spec/integration/{failed_line_detection,filtering,order,persistence_failures,suite_hooks_errors}_spec.rb || die
+	rm -f spec/integration/{bisect_runners,failed_line_detection,filtering,order,persistence_failures,suite_hooks_errors}_spec.rb || die
 	rm -f spec/integration/{spec_file_load_errors,output_stream,fail_if_no_examples}_spec.rb || die
 
 	# Avoid a spec failing due to path issues
 	sed -i -e '/does not load files in the default path when run by ruby/,/end/ s:^:#:' \
 		spec/rspec/core/configuration_spec.rb || die
 
-	# Work around coderay incompatibilities
-	sed -i -e '/be_highlighted/,/end/ s/32/33/' \
-		-e '/highlights core RSpec keyword-like methods/,/^      end/ s:^:#:' \
-		spec/rspec/core/formatters/syntax_highlighter_spec.rb || die
-
-	# Avoid a spec that depens on dev-ruby/rspec to lessen circular
+	# Avoid a spec that depends on dev-ruby/rspec to lessen circular
 	# dependencies, bug 662328
 	sed -i -e '/loads mocks and expectations when the constants are referenced/askip "gentoo: bug 662328"' spec/rspec/core_spec.rb || die
+
+	# Avoid a spec depending on specifics on local networks
+	# This fails when localhost resolves to ::1 which may be a
+	# ruby regression in the drb/acl code.
+	rm -f spec/rspec/core/bisect/server_spec.rb || die
 }
 
 each_ruby_prepare() {
 	sed -i -e 's:ruby -e:'${RUBY}' -e:' spec/rspec/core_spec.rb || die
-
-	# case ${RUBY} in
-	# 	*ruby22)
-	# 		# The rubygems version bundled with ruby 2.2 causes warnings.
-	# 		sed -i -e '/a library that issues no warnings when loaded/,/^  end/ s:^:#:' spec/rspec/core_spec.rb || die
-	# 		;;
-	# esac
 }
 
 each_ruby_test() {
diff --git a/dev-ruby/rspec-expectations/Manifest b/dev-ruby/rspec-expectations/Manifest
index 3b35853e32d4..ad9051feb25b 100644
--- a/dev-ruby/rspec-expectations/Manifest
+++ b/dev-ruby/rspec-expectations/Manifest
@@ -1,10 +1,10 @@
 AUX rspec-expectations-3.7.0-ruby25.patch 1467 BLAKE2B 39968ab1201fcc0e69fc1cf023150bdc19b8df15324f8411c1094857541c54f935d95d74714a870e2eb3d7de6d9b94891838efe2ff765f83f2b5d38b0ccb9774 SHA512 87a92967764e4c9214e55133d8b792441449ca87140ff4c594ff0bc528078d05d5164958744d75d6a9e8309acec9905224c45d36d408a3cf705e3987aedc24f3
 DIST rspec-expectations-2.99.2-git.tgz 106884 BLAKE2B 5b31c8681306d5c688f62fc3fc6adf7be6cabad6df6fd16195c71787d73495924233d793633fa041a94d796f63c9ff97c58e6f4a75bdc09dfbe56e770bb6a5c9 SHA512 6042cafe225b2b16df458c7bf69e1694b637afcac6f6195e35a0be199432610457ccaa3e7e4bd114b27a7a6c3d530d94f4c0603c65f469cbadc55bd3f75b6f3a
-DIST rspec-expectations-3.7.0-git.tgz 194071 BLAKE2B 67c8db15c43cc1141b19c6eb99390eaaf2535ec03f0fdc7b05576daa463d252f56ff251d40f5771726ee6451d57eef206c893f2593b01d413b5d96cdf21f0daf SHA512 bdd3222089299e9bfdd6f17a2b8af81d5e695290a3ce976630d586d51ff2df5baf76a3887b8adb31294bd6623ba85f8c2a4a31ac520046515aeeb81fa3a1bd5a
 DIST rspec-expectations-3.8.4-git.tgz 200149 BLAKE2B 45fe4cdc4b032bb773ef0e7d3e9b75e6d14a6e8c1850ad6fd84991d85a61860730caa9f191aa9d1ce4e21c85dadd2c52bb69bd0a1454f5ab918dc1e563fc54f1 SHA512 0ecb16f11ccf19c02c40ce587f33846fb2241f1663dd87f012b9b782338c213362dac624c434dee6e00ad2cc7ec4a1cd0af7f2edf1a8e9ebb0a0dfb31cd244d8
 DIST rspec-expectations-3.8.6-git.tgz 200343 BLAKE2B 9d668216c18716344e8c249086bcbf2b70e7c1a5a0d1f3a5328fe03752ef4ace6f5029219314016a4bb00ef482f440702a2adb7d9fe49392b5b1c6ec15f6a2e5 SHA512 9ded8de53127f63f2117f5ef64b6608b643586be498d8df24909366ce159a8bb95c9d8771633b777897f3e4ad3c9a12e3dfe62b2310513320b3d9656d24a120a
+DIST rspec-expectations-3.9.0-git.tgz 203008 BLAKE2B aec60d36516ecfd599479b581815e952322e9072a8b807f9f2ac9e9b6b806ad74f4c0313b77a0dc5662b7698549d732578ab960265a4087e9b59ef9c54796d31 SHA512 663b9739681c19b5bb1301447017ce4e10bc377ea3f4e51745ccfaa12b014a47e893aeb262b6fa3792e823adb90ae7a15f5c146c48aa80c72eec5faaf84d516c
 EBUILD rspec-expectations-2.99.2.ebuild 1696 BLAKE2B 4ec47ae8dd1ffa203a2d9d43388445323837e646b11f59831881c7696f01960629c7a92b1b63b6b77edd1edbd81bad21a7398c9b2f7c5b39019b2890e046b9d8 SHA512 4f2ad1910157f8ec7b07de947b992d32c34fbf36656656a94fabfe82469fa5ec84b121d68da20ba246b5978e2d8a7aae08147bb4d7efcf9da11a01a090194757
-EBUILD rspec-expectations-3.7.0.ebuild 1388 BLAKE2B d10ea9cad1cd9b4cd021d1c5f48ddfd57e25d414257c22316f97d31e45742115ba54a1525507754a184c957a73cca6ce54edc1074b26c8f8add41fd37b830c6b SHA512 9e4c3e0d6bddc5b4d9b1c1fc9b628fc7dd4147f01a5c0d334d184b80db340fc72b60bca39a1c287e20228892f0b7d1cd8d92c0be27083601c3c90647a5e6889c
 EBUILD rspec-expectations-3.8.4.ebuild 1314 BLAKE2B d74076ba79ab45ca672e28b901ec9b6d9ca987a34312bd5128880732a6eb1ac84f4f2ebe6477f7b765309e356c9d515d9a278d1ca62c259e9ad616bb15760813 SHA512 19c3255f578e5b438da6992c2404259c947e4e60e533cacc9e9cf14a842cbe796a7dc2cc49be6a81dcb9c17915786bafd911813217b3fc9908eec40b054e211f
 EBUILD rspec-expectations-3.8.6.ebuild 1320 BLAKE2B 776866f9e2b07652d3d555288920c5c137f4d24985fd30a24ce6aa858767fe43842779b80fe7e83245fe967feb82a258c1e77e5a730d83aee255874b6067a0dc SHA512 b19db3b5ee0f11dc8bc3bf410a9fea5b9b660ca8a70a14dd01803e121d743d82a2308eeffc306ff4e1a46222a03b4d611739dcaf04404598d44e0785451d845b
+EBUILD rspec-expectations-3.9.0.ebuild 1320 BLAKE2B 776866f9e2b07652d3d555288920c5c137f4d24985fd30a24ce6aa858767fe43842779b80fe7e83245fe967feb82a258c1e77e5a730d83aee255874b6067a0dc SHA512 b19db3b5ee0f11dc8bc3bf410a9fea5b9b660ca8a70a14dd01803e121d743d82a2308eeffc306ff4e1a46222a03b4d611739dcaf04404598d44e0785451d845b
 MISC metadata.xml 350 BLAKE2B bd2aeaa98f6f5cdbdce70c0dd6eed61eee36323502021664e10356e0e558eb9fbf09f9b056944aaf13859c0f4f29603c5523584e4b823a9218fefb2824edcff6 SHA512 c0cbdb181bc5981daa6dea5ecb445cedbda6d6430218aad98a39b2db67074169305f3cba419fb1e24d79900be311619337a5421b75e0da6d2838a0ccb7de45b1
diff --git a/dev-ruby/rspec-expectations/rspec-expectations-3.7.0.ebuild b/dev-ruby/rspec-expectations/rspec-expectations-3.9.0.ebuild
index f7e06817c865..6f3961866744 100644
--- a/dev-ruby/rspec-expectations/rspec-expectations-3.7.0.ebuild
+++ b/dev-ruby/rspec-expectations/rspec-expectations-3.9.0.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
-RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_RECIPE_DOC="none"
 RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
 
 RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
 
-inherit ruby-fakegem versionator
+inherit ruby-fakegem
 
 DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
 HOMEPAGE="https://github.com/rspec/rspec-expectations"
@@ -19,12 +19,10 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
-SUBVERSION="$(get_version_component_range 1-2)"
-
-PATCHES=( "${FILESDIR}/${P}-ruby25.patch" )
+SUBVERSION="$(ver_cut 1-2)"
 
 ruby_add_rdepend ">=dev-ruby/diff-lcs-1.2.0 <dev-ruby/diff-lcs-2
 	=dev-ruby/rspec-support-${SUBVERSION}*"
diff --git a/dev-ruby/rspec-mocks/Manifest b/dev-ruby/rspec-mocks/Manifest
index 5e2e83dc010f..f79839e7531d 100644
--- a/dev-ruby/rspec-mocks/Manifest
+++ b/dev-ruby/rspec-mocks/Manifest
@@ -1,11 +1,11 @@
 AUX rspec-mocks-3.7.0-ruby25-1.patch 1164 BLAKE2B c7fe549bdbd85ab2868bc6cc02f6f6811d60b484acce08de8c7d5596ef36b6f63f63023fd2f708f0f0e855137e5d03ea283fcb2f713d755d8f067d86e8cdcf14 SHA512 ff92bd1a227a6c95c9fc04a10373f7924f09533fab56748554929a24fbd8147c82d1a3b15400f1b6ae003ebd2c0b0a4e719211fba2f43929f05cae2cc6ab894e
 AUX rspec-mocks-3.7.0-ruby25-2.patch 1496 BLAKE2B 1f03651f0f0ee76e055b3dc8f823f2b9e119d7d5f5583ddb44ed15152ec852eaacd1e78a56b401a606777ecc726f0820feb7975c2064fc22430ba28509b52016 SHA512 ed06d7c0c23ccde64393dfad26a70c698973817e077b2db592d908e55827b210bbbe4d95e1d5c92866336456ac21566a96c08d8dc7e84386c1ca8d3d25d5a445
 DIST rspec-mocks-2.99.2-git.tgz 101731 BLAKE2B 27ae180381d427b642c53c351e7b53602caba4252ddf5393949d940be8474110eb0697901afaaa878cd8d368f081c6644c0fcbce86d9d14b9f93f48c027ae808 SHA512 dd3b9394d56de8d3089db7777cda1e1a5bbdc46486876a99a8a83b602b84ba0320913d8e8dabe5e0367645eb01b943607b93e67d87cc26e380c8db6e048e4e0d
-DIST rspec-mocks-3.7.0-git.tgz 189170 BLAKE2B a0a622ac593660c673cd80b3f3caddd2ac389000f42a7ed1745e1fcfd28d1986e61e83c265d736f3ad0649531973719bc9c5f6ab07e289cb2da89c4482e64184 SHA512 8673726571ccf8a901281e44faeb25ffcb59579dc380138f0557cd9310192cd340081e5e8ad65ae281777727b502cca2f6877134b0fb48f2e0ea40b133002aff
 DIST rspec-mocks-3.8.1-git.tgz 191543 BLAKE2B dae8b22a011a3563eb65d1709006169bf5dcf310749cb858f4ff20c7b82e7675a616fc427136fe5e0edeef1db0b42a1d0af1c5623eed35807e84dc355131c8cc SHA512 ec71c4b815beef315f8db329bd2b0e60cdbb1fa37939c624799c1589d94dd28f74b3d1a4c0b9025bc98a809f80d625315458351fe7dec8291bad20e79beecca8
 DIST rspec-mocks-3.8.2-git.tgz 191807 BLAKE2B 9ec44fcaad9fe1e9d75cfb84253e52411b7083070de5dbb19bcdf7c518eb2439e6493e979daf814df7b31bab8bbe72821d42eb797ab88d95e051a700b63d93b5 SHA512 42b9b952386ce862a1cc19116991ae6b4633d551db057babe2e4aa6553acb6eafbb05b98df8a5c6cb362a00025ac3ce0f43f3c4e4ea63343c8bf0dad769a3aed
+DIST rspec-mocks-3.9.0-git.tgz 192426 BLAKE2B af19a0dcd5009db310c4417a8f9f75284cb81e02010ffe6f5caa75e3f157d8b5e72c7782b7150bf0ff273bc5a78771edf88659f769a1b0ed95dccdca0f3f248d SHA512 bb6bb5d5dc272e0e0726d23069e0087f780f57614840208816867c570173f1980a43c2cc955c68b2ceca58828951229361305551a4b6bf3530880db843a49bf9
 EBUILD rspec-mocks-2.99.2.ebuild 1524 BLAKE2B affcbe07b72bd36ca2d6290105097c57e03a62ad3b70835810dd2e416faf8b431377ffe8ad3425194bf055997b89e6376689382598db1f1768fedd6823500a5c SHA512 36c1e9a815cdcae4aae76d27a88ed5061d1afbe75f16074256323b4123d670ba2a94d6458fb10a242300ce713c95b378cad0b1bc065dccbdf748773605ab780a
-EBUILD rspec-mocks-3.7.0.ebuild 1448 BLAKE2B b25484262e7a8d743b2d75d83d29ed24cd5370c443a541a71a6b89899083181cac17b9d8d669cf6b6a6b336b917e528516045b0398978951c31316b9a0019454 SHA512 621a0fdc7ebf457a1b70dc2730d8bf636cdff795f8f04c57369e2bc53ddcf7da9fdf27706a0f92d8d7b0e1e31d2332852492ffef32fbeb51c8c234cfcfff9418
 EBUILD rspec-mocks-3.8.1.ebuild 1338 BLAKE2B 1a63b11d16a461fa17f5b2595293b31c2e96224345499ba4d1219042d412b6d4c58de134ed9238b1d11f0f082eeae316ef39bc247ae43b5a6d071a3ed20cf840 SHA512 91371174909c15943f92f4d2fea10122e68f0e2465ce8014465c1ac2fbb925a9e1c9ee2fbc7dcb08ba7371ebba11f3e90adde1ba9fed684ebef5963135e75c53
 EBUILD rspec-mocks-3.8.2.ebuild 1383 BLAKE2B d91f9731dcd656962344208d8a4ceba1968b9911df6d6156268eb9233fec83a9f20d36a98f31d4a967bd78f599e85ebebd6fede8d67e9621dc44826c858c4c8f SHA512 f475c30974df804d72c718708146582b87defea042c666e625acaae445a24381c451f29da6e9293cf6f5f32bae2324bd5b32ac067f635ea8a818ae8b0cebd912
+EBUILD rspec-mocks-3.9.0.ebuild 1383 BLAKE2B d91f9731dcd656962344208d8a4ceba1968b9911df6d6156268eb9233fec83a9f20d36a98f31d4a967bd78f599e85ebebd6fede8d67e9621dc44826c858c4c8f SHA512 f475c30974df804d72c718708146582b87defea042c666e625acaae445a24381c451f29da6e9293cf6f5f32bae2324bd5b32ac067f635ea8a818ae8b0cebd912
 MISC metadata.xml 343 BLAKE2B 87ebb52b322f698e5242c517ca646e64b3a9a33c6b76d968847b2224b4dd683a9eaae5d03470efe775d350c65e3bfbe16547d4b4b99e2744379fbb7c76cc5680 SHA512 c7956e0175d9fdbfd423140f3c757d4c9e1deb6089577f60d11111a93fde6a7c056dcbac8620c30c8c02693297402aa2f0710e43f60abc0878a51bcb8c624667
diff --git a/dev-ruby/rspec-mocks/rspec-mocks-3.7.0.ebuild b/dev-ruby/rspec-mocks/rspec-mocks-3.9.0.ebuild
index c348ca0f575e..73ff3bfd25fa 100644
--- a/dev-ruby/rspec-mocks/rspec-mocks-3.7.0.ebuild
+++ b/dev-ruby/rspec-mocks/rspec-mocks-3.9.0.ebuild
@@ -1,15 +1,17 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
-RUBY_FAKEGEM_RECIPE_DOC="none"
+#RUBY_FAKEGEM_RECIPE_DOC="none"
 RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
 
-inherit ruby-fakegem versionator
+RUBY_FAKEGEM_GEMSPEC="rspec-mocks.gemspec"
+
+inherit ruby-fakegem
 
 DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
 HOMEPAGE="https://github.com/rspec/rspec-mocks"
@@ -17,12 +19,10 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
-SUBVERSION="$(get_version_component_range 1-2)"
-
-PATCHES=( "${FILESDIR}/${P}-ruby25-1.patch" "${FILESDIR}/${P}-ruby25-2.patch" )
+SUBVERSION="$(ver_cut 1-2)"
 
 ruby_add_rdepend "=dev-ruby/rspec-support-${SUBVERSION}*
 	>=dev-ruby/diff-lcs-1.2.0 =dev-ruby/diff-lcs-1*"
diff --git a/dev-ruby/rspec-rails/Manifest b/dev-ruby/rspec-rails/Manifest
index a7a3e4153111..7952d52747ca 100644
--- a/dev-ruby/rspec-rails/Manifest
+++ b/dev-ruby/rspec-rails/Manifest
@@ -1,5 +1,7 @@
-DIST rspec-rails-3.7.2.tar.gz 129851 BLAKE2B b37619b4a953fa44ef402a0dea1531837932dc7bc147c08b29bf85dcad61c7ca72b30f28edc391ae05d5040dcc902d6571342bb51559de84ed0c93244deffbec SHA512 a1dbbde3539b09c33d85c9307126df09c508fcf39abc25a6438fb0582ec19049ee1888d7d17d256d33bba08c29792a0ec30dabc37d870a369580a58cb7ef03df
 DIST rspec-rails-3.8.2.tar.gz 135513 BLAKE2B deae49ce0ce97c78fafe910cb73a196a404711adadb896a13bb40c82ecd6f2fd28129c0267057ce739d648ffe19bdf61799512bac97e9da3be03e0f8dd43d130 SHA512 02d60a0135b4f4b52e2721f9a79363310b60acb8252d4bb44220d37dd346605a6cd3db6525d2d8d77b9471dd91888c9a3dd02e541012f39d0d47c33f38c98bbe
-EBUILD rspec-rails-3.7.2.ebuild 1448 BLAKE2B edb9e628276bc97d90ee7f9272145da0f03fc50d3736362e45851b113dace36b93544fef8c8a4cefe68d93d265d2bd7bc4e4ab9c6f523147a19c265f20e60c40 SHA512 b8a8b28c585ea62e3d29c07b01e0758503647561b3f0b798354ff3097433890245baf3b4b83491620b1575d77f5941867adfc4c5bd27e0957cf224def09ab466
+DIST rspec-rails-3.8.3.tar.gz 138053 BLAKE2B dab5764d65d484a8a808a2104a3ab093c2ef2e822cacd136996eddb767a972f89df9a459509e701e5541f6b9c42a3b700a4daa816c0391474e004b4558feb2a7 SHA512 210a278cf82c20c4f5ef7faa5e253b9e18609d34467e91cb8728e6116c7cfb15d17fe8941fc15b776bb169e0275df623535b86fc160afe3e49432948f246a165
+DIST rspec-rails-3.9.0.tar.gz 142966 BLAKE2B 2f75b1a2e666c8b790be4aeb3add3814558718049a818bdcbd8ff07b5f837727d34628fbba68fd9ff832b864261cac2e545991daa5ad3f3b72304b411801295c SHA512 f0130bbfcc8367a1ef6d8f259ab04a623720068f205c2454117f988c8405885fd19056692b46d0a04d7ba2d0d24692acf8283a77bb5292054f990002fae10af0
 EBUILD rspec-rails-3.8.2.ebuild 1431 BLAKE2B 7fc7098a39752a8243aa74197abbe1248c57764ef6a6d781eca82d10e1f6de42c83fc8da11d439f9525a6cb59ba63f0dc0ea5451ce46c9879eb76543ac5ec90d SHA512 45cb8ce308d0fa2d90e9b3b34d443bd60591f64e27a0f4f6a4a82c8489eb317fbc7774a0d39af318d10e8ca60949e1808b540c853c59307016359fc6110ce9a2
+EBUILD rspec-rails-3.8.3.ebuild 1459 BLAKE2B c31f9b9bba3e58b1a3e5cda4a7ca79ef70e4f3e22ae2b4058e1472cab069ab8f82c106959182e9d54dd1ad31b225ca3123fae7df87e0a7469dbcf995ddc2a068 SHA512 52ead09f8510a2cd7295df49c378d91d7171dfaec0a1f7335b1255128c8437c21e4815367f57dcebe0d47c43aa4bb88a6c0d37f1a7242c03472c6fabccf32a82
+EBUILD rspec-rails-3.9.0.ebuild 1459 BLAKE2B c31f9b9bba3e58b1a3e5cda4a7ca79ef70e4f3e22ae2b4058e1472cab069ab8f82c106959182e9d54dd1ad31b225ca3123fae7df87e0a7469dbcf995ddc2a068 SHA512 52ead09f8510a2cd7295df49c378d91d7171dfaec0a1f7335b1255128c8437c21e4815367f57dcebe0d47c43aa4bb88a6c0d37f1a7242c03472c6fabccf32a82
 MISC metadata.xml 343 BLAKE2B 3c1684a27906b05d1f72b32ec225db0fcd6e051bf9d6a3b4f83e3cc1ff63201410594a6b2a2664ca008b7756b6e98cbbcc3981136075dcc41a622f3ad3566b36 SHA512 bc9d8d9978e4bd845b10fabf5256e53a1a0c3835305f7e72502d1074e2692fdeaca15b2ecade251be8dbbae544167072a920db14a964644b70782f37b9d91369
diff --git a/dev-ruby/rspec-rails/rspec-rails-3.7.2.ebuild b/dev-ruby/rspec-rails/rspec-rails-3.8.3.ebuild
index bb19436f8e13..bc90364ea0a4 100644
--- a/dev-ruby/rspec-rails/rspec-rails-3.7.2.ebuild
+++ b/dev-ruby/rspec-rails/rspec-rails-3.8.3.ebuild
@@ -1,19 +1,21 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
-RUBY_FAKEGEM_TASK_DOC=""
+#RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
 
-inherit ruby-fakegem versionator
+RUBY_FAKEGEM_GEMSPEC="rspec-rails.gemspec"
+
+inherit ruby-fakegem
 
 DESCRIPTION="RSpec's official Ruby on Rails plugin"
-HOMEPAGE="http://rspec.info/"
+HOMEPAGE="https://rspec.info/"
 SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
@@ -21,7 +23,7 @@ SLOT="3"
 KEYWORDS="~amd64"
 IUSE=""
 
-SUBVERSION="$(get_version_component_range 1-2)"
+SUBVERSION="$(ver_cut 1-2)"
 
 ruby_add_rdepend ">=dev-ruby/activesupport-3.0:*
 	>=dev-ruby/actionpack-3.0:*
diff --git a/dev-ruby/rspec-rails/rspec-rails-3.9.0.ebuild b/dev-ruby/rspec-rails/rspec-rails-3.9.0.ebuild
new file mode 100644
index 000000000000..bc90364ea0a4
--- /dev/null
+++ b/dev-ruby/rspec-rails/rspec-rails-3.9.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+#RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="rspec-rails.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="RSpec's official Ruby on Rails plugin"
+HOMEPAGE="https://rspec.info/"
+SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~amd64"
+IUSE=""
+
+SUBVERSION="$(ver_cut 1-2)"
+
+ruby_add_rdepend ">=dev-ruby/activesupport-3.0:*
+	>=dev-ruby/actionpack-3.0:*
+	>=dev-ruby/railties-3.0:*
+	=dev-ruby/rspec-${SUBVERSION}*"
+
+# Depend on the package being already installed for tests, because
+# requiring ammeter will load it, and we need a consistent set of rspec
+# and rspec-rails for that to work.
+ruby_add_bdepend "test? (
+	>=dev-ruby/capybara-2.2.0
+	>=dev-ruby/ammeter-1.1.2
+	~dev-ruby/rspec-rails-${PV}
+)"
+
+all_ruby_prepare() {
+	# Remove .rspec options to avoid dependency on newer rspec when
+	# bootstrapping.
+	rm -f .rspec || die
+
+	# Avoid bundler-specific specs.
+	rm -f spec/sanity_check_spec.rb || die
+
+	# Avoid broken controller generator specs for now.
+	rm -fr spec/generators/rspec || die
+
+	# Avoid loading rspec/rails explicitly since ammeter/init will also
+	# do this and loading it twice causes an error
+	sed -i -e '/rspec\/rails/ s:^:#:' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/rspec-support/Manifest b/dev-ruby/rspec-support/Manifest
index ed4b619eadc2..f56e8c1a13f7 100644
--- a/dev-ruby/rspec-support/Manifest
+++ b/dev-ruby/rspec-support/Manifest
@@ -1,5 +1,7 @@
-DIST rspec-support-3.7.1-git.tgz 65831 BLAKE2B 8595c496bc8d13e36fdfd4a8be8e055db4ac1e85af63f99158d191c9ef9e0a6ba0a2972ad7661a63eeda959e2969139a99ded71219777fd493544b711b6fea53 SHA512 a5760d696048897d76c665a756474bbb1a1995891e577c989cf68a205644c8608c538bf3d87c558428e2c412e02d3552d47567a0679cd4f8793c06f43eccf459
 DIST rspec-support-3.8.2-git.tgz 69112 BLAKE2B 84600d3e2b4d847618f7f53efdf60be3836c7ba6c586de88cdf085e84749e616ad556683b1e7b588b9aec08adee10054e64ae1daf69c6ad58a00d1c2447171f7 SHA512 9fb9f8f2507edee5e7c414d32c1641803eed7a5e17fd300308449277ec6efb786f07207d8f28bcea0a669b8d76a2da53057488d149990ae973c0f7a0343180dc
-EBUILD rspec-support-3.7.1.ebuild 1343 BLAKE2B dd16cb1702e5105fb7d7cbecde7d766df4c07b2309213fc31723519e8954539259bbcd136c6bb1325bd1b173794aba08326cf359000adebcaf36406490b20955 SHA512 e740a41e74d7e8591adaf840116dfc1d8b2c073056a5e365da752ad11d0742bb378dccc5b97ea55a07d129c1c90ef3a298cad97c59b6e2d5348b0f434ce42738
+DIST rspec-support-3.8.3-git.tgz 69654 BLAKE2B 1ea3eed0602655fbf5f92cdc14217eb8377d980378c9835a342840bb7a00bb1cf095b6fe57a24f80c01ce1835b398ac3c1bd11ac1f95a90b501be6a000e8f6d2 SHA512 90d678e08ca93be30ace986a60aba4c4a81a58d7c56d34863aca70f91efe92480299970aa7eb158e3f8c4878b1ea3303aa0afabfc8c7782bc78f7f63b90b4f9a
+DIST rspec-support-3.9.0-git.tgz 69705 BLAKE2B 96d5cea9c63e6ec2acdbbfc4b7253acc26dbf5202c3bafc4a461123380db7d56958d2bbc787eaf3f1c480801441f6a134e1f29b1d3ce23b1bd3225fe4d8f37a5 SHA512 10e8fa4af59097891219f00e2ced5940e7a5bc67d946fbd348683d2246a4a491e62f7bac6bb757e14d82bb0ba970fe5633609ca4ab2c97c4900719b8004cf4b5
 EBUILD rspec-support-3.8.2.ebuild 1577 BLAKE2B 3af99963fd018a5eb9fe3faf50d629dc39dabf0898cc4055020b351b5df79a2d634c6640da1942167fa90dbe8a1f8b626927b93e7a332df55aff7e6edccadbf8 SHA512 6ec3da50cb3544d1b50b8b65c090f5842d5d46553a2d7a4016e7089cea95acf1eb1ffc1d1f8c69dd0ca1ed3549ebb83948d0a5c72b037098c04592f375d17c2c
+EBUILD rspec-support-3.8.3.ebuild 1557 BLAKE2B 753bdfc00b3b2a5432ebe2b46a02116aef5b9468c62897a73ec5dbf561610ab99a939da69081bd228a6d5444ad911708967e63db2e45b0a2e4f52dfbb707988f SHA512 356c886c1052b33ef271da09af964c759ce4dbd83be6e1c0e379f3609ea4db99188be27c56ece11d4cd9c651466ad63dacfeade1b6f210d6b0043f1663867e37
+EBUILD rspec-support-3.9.0.ebuild 1557 BLAKE2B 753bdfc00b3b2a5432ebe2b46a02116aef5b9468c62897a73ec5dbf561610ab99a939da69081bd228a6d5444ad911708967e63db2e45b0a2e4f52dfbb707988f SHA512 356c886c1052b33ef271da09af964c759ce4dbd83be6e1c0e379f3609ea4db99188be27c56ece11d4cd9c651466ad63dacfeade1b6f210d6b0043f1663867e37
 MISC metadata.xml 345 BLAKE2B 832a39e1b38a33b4b5238aaf4a79f08aaff0a7751d466ebe3dd6eeaca493cd10d7ed51766d12c17f589be48d450d3f7a36690ee171a5c650c1cdad334003446f SHA512 71b6ed77045b94efb05b0275574fdcf328678c7d0aef385703a40f5ff3300653638dc32911ff8f91c66881201c735df930c000c0283afa9f189dbba41e97628c
diff --git a/dev-ruby/rspec-support/rspec-support-3.7.1.ebuild b/dev-ruby/rspec-support/rspec-support-3.8.3.ebuild
index 7dbee141a22a..869b30309513 100644
--- a/dev-ruby/rspec-support/rspec-support-3.7.1.ebuild
+++ b/dev-ruby/rspec-support/rspec-support-3.8.3.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 
 RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
 
@@ -19,10 +18,10 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
-ruby_add_bdepend "test? ( >=dev-ruby/rspec-3.7.0:3 dev-ruby/thread_order )"
+ruby_add_bdepend "test? ( >=dev-ruby/rspec-3.8.0:3 >=dev-ruby/thread_order-1.1.0 )"
 
 all_ruby_prepare() {
 	sed -i -e '/git ls-files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
@@ -36,4 +35,8 @@ all_ruby_prepare() {
 
 	# Avoid a spec requiring a specific locale
 	sed -i -e '/copes with encoded strings/ s/RSpec::Support::OS.windows?/true/' spec/rspec/support/differ_spec.rb || die
+
+	# Avoid a brittle spec depending on ruby implementation details
+	# should be fixed upstream in next version
+	#sed -i -e '/returns a hash containing nodes for each line number/askip "ruby26"' spec/rspec/support/source_spec.rb || die
 }
diff --git a/dev-ruby/rspec-support/rspec-support-3.9.0.ebuild b/dev-ruby/rspec-support/rspec-support-3.9.0.ebuild
new file mode 100644
index 000000000000..869b30309513
--- /dev/null
+++ b/dev-ruby/rspec-support/rspec-support-3.9.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
+HOMEPAGE="https://github.com/rspec/rspec-support"
+SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_bdepend "test? ( >=dev-ruby/rspec-3.8.0:3 >=dev-ruby/thread_order-1.1.0 )"
+
+all_ruby_prepare() {
+	sed -i -e '/git ls-files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Remove spec that, by following symlinks, tries to scan pretty much
+	# the whole filesystem.
+	rm spec/rspec/support/caller_filter_spec.rb || die
+
+	# Avoid spec that requires a dependency on git
+	sed -i -e '/library wide checks/,/]/ s:^:#:' spec/rspec/support_spec.rb || die
+
+	# Avoid a spec requiring a specific locale
+	sed -i -e '/copes with encoded strings/ s/RSpec::Support::OS.windows?/true/' spec/rspec/support/differ_spec.rb || die
+
+	# Avoid a brittle spec depending on ruby implementation details
+	# should be fixed upstream in next version
+	#sed -i -e '/returns a hash containing nodes for each line number/askip "ruby26"' spec/rspec/support/source_spec.rb || die
+}
diff --git a/dev-ruby/rspec/Manifest b/dev-ruby/rspec/Manifest
index 10537db6f851..2f3a278beac8 100644
--- a/dev-ruby/rspec/Manifest
+++ b/dev-ruby/rspec/Manifest
@@ -1,7 +1,7 @@
 DIST rspec-2.99.0.gem 5632 BLAKE2B eba837aeebcb0d65dc18a644fd935f241a6703998885418460b2c0bb59574ef144c416518099a77905ca7676852903804169d1bafc2cf8b3f79654b669c43762 SHA512 bcdf5e86938b102200144c49370e0a0691e39a8720048df2eab1a55f95a5bc5e4ced84c7da86d0ddc83ee4ce0f40602c2ae7ee10e55dccf8bb8b769ab048ebb8
-DIST rspec-3.7.0.gem 10752 BLAKE2B a0e15d557b0d9089a886d04c917feda80c7a8e5eb70a50f4635947689215c0c560d313a6728ccea751697ead97c01fa1e3b7217f202ad18d4ddecf62c4dfa4ab SHA512 5c10a878e9697030783c987ee9a6244b36cf85a2a3fb8c28bf9771900a3259da4f19c7f159180b5ff9140ab715b38b5d90cd5e0014ac1862f478c32a95e7edfd
 DIST rspec-3.8.0.gem 10752 BLAKE2B 14b1710fb64fb2ab46d59ac692ceb95dbe7f5e2f5c54e4f97170bd99c2b0d32e1977250f69160ab191367c8016663ecf5cd4e0c89941ff12c727ed52e6118551 SHA512 aa3ecee499240a26866797c00461c7e63915bb84a9a29afce75bd4e7864027588bafde05b108aa7b6d988c1a123265587db807567a8e0f3d03527b0f2d8329ba
+DIST rspec-3.9.0.gem 10752 BLAKE2B 212cebbae9e71b8a090757ec4b9902f20043eaf95b079a409247990e1fca4236e13d0e9a3bd9b9eacfbc2d2aaab19583452dbe08b298ca69a85e20f0163741c2 SHA512 a7dbb22f01d842a41b54c375d32d94c77a7b964d1ea5b1971e7c228dfd5dbfcfe03c007d687781addb93f819dde8de664dda307c266137fdd0a07dab96f96fad
 EBUILD rspec-2.99.0.ebuild 788 BLAKE2B 8cdd7f714b8f1ae3e6284b190629916f4ad31ea46683b9d4854ce8b7560c7aa780ba20f444ce82db4ef41e75abcda5bf0807c7edc1c0a4793ac4026265653e50 SHA512 3513604a1f0e62b992737c72f36a0f0ae40f7bc9d0a0363ad285eb32ee67e77c30a8ab00aa59d7057edc5403f1963b76e4b82474815f7a6303da0f623ef44c8f
-EBUILD rspec-3.7.0.ebuild 676 BLAKE2B 88689e94ab419b92faf63c1676e9b42fece75813ea3a07e40aee4f95e49a44ea19d7f0e35db37b1604e2842c5586130e1d43aa28b5a79aefa33945f34707c52c SHA512 5d54f841288d1ea59d46794d2c218fd5b8c42b78b9182edf464415abd6f24bcc14b5d4a6982ba73ce942acdc94833d7f5a1f50137a1b28ef17b2773a6668f334
 EBUILD rspec-3.8.0.ebuild 654 BLAKE2B f4eb7b374c277b44991ea9bacc5f9c17a10e8cf0c2c81ac2645cfc3f4354f426ffdc271c95093f19f091019b4f2af1d3827a819f252df019ac9939792a3b3062 SHA512 9654be08260fdf349a2921d0433c2afdbef86394a60174dbf0f55e5e4823932f0c898c3f81a4e0f22cd970e834a1177cdf03e2cb91bbc629799777131fdb34cf
+EBUILD rspec-3.9.0.ebuild 622 BLAKE2B 183ecad8cfb8cea4e1a1bcd865672b7f1c35203e3c15427f41f679f2ee2e17f1dd625f4e393e910df7081e12488c58349c10504ff27f3da0b044fa26cdd53aa8 SHA512 9e63ad8dac5188168fba6198ef1e71a0cd8e2e01a194560bb6e2cccdf1849e4e0ad96dac3206a4422e1c1e507a018a7432fb31c8ea32caafdc7eeaeaf125d80c
 MISC metadata.xml 337 BLAKE2B fd99a128031819f061bb4b2fea336d7b14b26b7a986d782d8a4e2b9b9b7ce4c703242ef724cc9bdd98cf0219973dfcfca2a2eb7979b446f879d2f337b566985f SHA512 0a9165edcea2906fb370afa35ef77b74a4b833539959e8f28194e4d02ab7685f23dd16f04ea7e18873d10bf607236972610c49cf61ed97e5df7b4796ec9a66be
diff --git a/dev-ruby/rspec/rspec-3.7.0.ebuild b/dev-ruby/rspec/rspec-3.9.0.ebuild
index 8f6b3c17b5d9..bd1aef3eb6d2 100644
--- a/dev-ruby/rspec/rspec-3.7.0.ebuild
+++ b/dev-ruby/rspec/rspec-3.9.0.ebuild
@@ -1,25 +1,24 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_TASK_TEST=""
 
-RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="README.md"
 
-inherit ruby-fakegem versionator
+inherit ruby-fakegem
 
 DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
 HOMEPAGE="https://github.com/rspec/rspec"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE=""
 
-SUBVERSION="$(get_version_component_range 1-2)"
+SUBVERSION="$(ver_cut 1-2)"
 
 ruby_add_rdepend "
 	=dev-ruby/rspec-core-${SUBVERSION}*
diff --git a/dev-ruby/ruby-openid/Manifest b/dev-ruby/ruby-openid/Manifest
index 8cb0f2d5681d..bf3789aea1c4 100644
--- a/dev-ruby/ruby-openid/Manifest
+++ b/dev-ruby/ruby-openid/Manifest
@@ -1,5 +1,7 @@
 DIST ruby-openid-2.7.0.tar.gz 513958 BLAKE2B d09b1817768376ad35c3ea9ff11b371761c340902f006f2f4a89af050fea104a8f975a45e90035f501e981fcd412925e3d4a5cf4679e4526b595d06124ce2511 SHA512 e53104d4cf0198953172a2ed567877c3d1cc11664acbab8ca424823e2249d9fa13ad9b931a7318709f2865f3f16e0e38714428d12accf16080aa1818b673d8cd
 DIST ruby-openid-2.9.1.tar.gz 514851 BLAKE2B 08344127e971231bd8a6950cc15d680e07b5ae9668be0d5dfd378003686a6e0a9ec8a7b477dded735498814972a159744b2a0361b5b1688179876c721dfb3706 SHA512 7e6e21bb2686b6bb6c851699121254694f76e3766985884a4eb8488b2d52cd7c95a70bb53f48146a544f0abd01bd9259add7b5d6a511d791f16149358f35d3f8
+DIST ruby-openid-2.9.2.tar.gz 514882 BLAKE2B 496b257087617537fc413931820fc721f026d9e7826d1684c85250d29d295ef031f834af31449e3448386f714c45a7db802d46531ca207fec099e2e2e80b9780 SHA512 5f4b696952d457ecbb99c6e2bc4b5c04557e8ed8d7653259eaf89a151ef43e62edc1936a28ac9e0d5a2c253379010d6c6a820be4bf2caa90bfcbf4689695d075
 EBUILD ruby-openid-2.7.0.ebuild 705 BLAKE2B 84e9ecdf3039cc799217e51a6350c5bc4b0ba5f7c1ed9319b2330c77dd4c6d22e3f8c96cb7d5b99477584176e7a7979b2492624f68353c15169f66491860ae61 SHA512 fde02be22f3157ba262ed7472d82390ad50331e25c1ff715b4a6ac99febce71207b832be2fd4beed7385f2488ef85eb4d8b252d4447040c958158a929a84aed2
 EBUILD ruby-openid-2.9.1.ebuild 744 BLAKE2B d3302a8be8924acad914bf4fa6f3e852fd36305f6c88039611327ae4da428143a72b51e6e7309e9b845dbec6c5df88bfb48383ab00cb8bec8a09a86058a3e04c SHA512 2990b500deea7a8b20caca06cb78fec7ee6767cd74ae21b770fe32ca20d94ac0218746c2c04457d171c181e88495813dd5215d366b11490723bd058512d8b5eb
+EBUILD ruby-openid-2.9.2.ebuild 744 BLAKE2B d3302a8be8924acad914bf4fa6f3e852fd36305f6c88039611327ae4da428143a72b51e6e7309e9b845dbec6c5df88bfb48383ab00cb8bec8a09a86058a3e04c SHA512 2990b500deea7a8b20caca06cb78fec7ee6767cd74ae21b770fe32ca20d94ac0218746c2c04457d171c181e88495813dd5215d366b11490723bd058512d8b5eb
 MISC metadata.xml 344 BLAKE2B 37b1f5b85c7ce7bd3a4dc857b273bfdb420f051561c4908bd5ae894244a507c9931a38218ed0adf594cf3fc8e9015c27fcaa7454770fdc8ad46ba25ee399abf1 SHA512 e8d22b48aae2c08373d0dcd4320334c50ffecae7b2a2b04144e5ad3f52ded0cf44eb1921e30baf8576bfef533a8267b5e6606381d6c11d36b125b04d4a4a8a25
diff --git a/dev-ruby/ruby-openid/ruby-openid-2.9.2.ebuild b/dev-ruby/ruby-openid/ruby-openid-2.9.2.ebuild
new file mode 100644
index 000000000000..8664913d2592
--- /dev/null
+++ b/dev-ruby/ruby-openid/ruby-openid-2.9.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md NOTICE UPGRADE.md"
+
+RUBY_FAKEGEM_GEMSPEC="ruby-openid.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A robust library for verifying and serving OpenID identities"
+HOMEPAGE="https://github.com/openid/ruby-openid"
+SRC_URI="https://github.com/openid/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-macos"
+IUSE="test"
+
+all_ruby_prepare() {
+	sed -i -e "/[Bb]undler/d" Rakefile || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	insinto /usr/share/doc/${PF}
+	doins -r examples
+}
diff --git a/dev-ruby/ruby_parser/Manifest b/dev-ruby/ruby_parser/Manifest
index 07112fc83bc6..ab8a7604aff5 100644
--- a/dev-ruby/ruby_parser/Manifest
+++ b/dev-ruby/ruby_parser/Manifest
@@ -1,5 +1,7 @@
 DIST ruby_parser-3.13.1.gem 445952 BLAKE2B 7df7bbfe3f7f700747d32bd5c66d94fdd7c57974e622969958dda39f4dc8656a4211378ba51c4b8e8eefafebf82e550ab73a775530eab06ff6419a3dee7f8f7b SHA512 90c8b68245168c7df4ec8d0e6c62d9723d759945823768645614fe085f375c6811a15c35334c485cb59f32f6adb1aa0a06e7df043b09a48ef4e6102d93562b1b
 DIST ruby_parser-3.14.0.gem 467456 BLAKE2B 0eca83b919a87306e35e0a6481b6518d5b7ca04e437f6953de278bc757e8fd53e15dd26d7049a715314fd88c01cbd4fc5123fdc98e3cfa7d063e291f92a39a93 SHA512 077cc4610a768430982735e174ddff762ac677a6d437e0e82ee6615c467997434ec6f556d6144593e548c0e7bb8f7e208485e64085858757c4ba2dc9e606e9b2
+DIST ruby_parser-3.14.1.gem 467968 BLAKE2B bcd72ebdf855111358f12c08518d200b1fdcd6bf860614dc190fc59f8a242d843271ec426797b7a2afb3082ec6775777d83d324d66391e21d1df8a27971e1b10 SHA512 0bbbe8a85e1602fd26d2ea8d19d4e57933251ba94341cda79631f7f0e35ea8f3c5b0c2e6e8bc182340838737d508cc8142167917dbd35e0bdb005889f152d72c
 EBUILD ruby_parser-3.13.1.ebuild 1146 BLAKE2B 348f7a5ce7620820595fa2317453016608f09cab766708b2728f0f83ae41914369fca062c9c98fd997949246945f703134855701a7fb1cf2f746f93ef0385922 SHA512 81c9bd640407920057c3f021d2cfbea9591d43ad1537df110d636795dbe38a66f499c9e4d4bc9a7b171cb21a28f5a1d28b98cef4ff6d7c8dd9f0c09dbd788a49
 EBUILD ruby_parser-3.14.0.ebuild 1112 BLAKE2B bde3969fb6a0e97d9254a90550e712e38e554b153c705c79edab16f5241559591e553441ac2cd94a74c59db6d9a2c563f351c46f87a44b49cdee99ce60a030fd SHA512 a0661c03d6619fee7757763f2def0a9fb8da27d860cd40c0bc47f65c5212264b104d6b7ab6168fc3577a4b61f973eed6049cdc2b8f2e3d498176598a63744546
+EBUILD ruby_parser-3.14.1.ebuild 1112 BLAKE2B bde3969fb6a0e97d9254a90550e712e38e554b153c705c79edab16f5241559591e553441ac2cd94a74c59db6d9a2c563f351c46f87a44b49cdee99ce60a030fd SHA512 a0661c03d6619fee7757763f2def0a9fb8da27d860cd40c0bc47f65c5212264b104d6b7ab6168fc3577a4b61f973eed6049cdc2b8f2e3d498176598a63744546
 MISC metadata.xml 347 BLAKE2B 58585950079ff918b98a50b41060c516e4640d3d9e382bdd659ad6b17c1f0e138782cc7e94085cfae35faca53445beef7ce645113a49a47d42e912246ce8dd6b SHA512 ff141bbed5bdb7f610f87c5f8040889784f9a3a1f7a2f5802d0ee52a2a3d660d7ef2e8e3cc37af9c8b549433447f1d523b4864a6175efab755a3009c99c59632
diff --git a/dev-ruby/ruby_parser/ruby_parser-3.14.1.ebuild b/dev-ruby/ruby_parser/ruby_parser-3.14.1.ebuild
new file mode 100644
index 000000000000..36c19efb7fc0
--- /dev/null
+++ b/dev-ruby/ruby_parser/ruby_parser-3.14.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_EXTRADOC="README.rdoc History.rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A ruby parser written in pure ruby"
+HOMEPAGE="https://github.com/seattlerb/ruby_parser"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/sexp_processor-4.9.0:4
+	!<dev-ruby/ruby_parser-2.3.1-r1"
+
+ruby_add_bdepend "test? ( dev-ruby/racc >=dev-ruby/minitest-4.3 >=dev-ruby/sexp_processor-4.13.0:4 )"
+
+DEPEND+=" test? ( dev-util/unifdef )"
+
+all_ruby_prepare() {
+	# Remove reference to perforce method that is not in a released
+	# version of hoe-seattlerb.
+	#sed -i -e '/perforce/d' Rakefile || die
+	sed -i -e '/license/d' Rakefile || die
+	sed -i -e '/Hoe.plugin :isolate/ s:^:#:' Rakefile || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/serverengine/Manifest b/dev-ruby/serverengine/Manifest
index 2b04fe25e18a..f35d3eb302e2 100644
--- a/dev-ruby/serverengine/Manifest
+++ b/dev-ruby/serverengine/Manifest
@@ -1,9 +1,3 @@
-DIST serverengine-2.0.6.gem 38400 BLAKE2B 51722d222bfcb9c0063f64ceed666be147bcb4dce9947fd60b723507c5f3e2479b445902bd2a2e985d0a8216462b91b1545ccc458e36e7134fa11a4a746302a7 SHA512 ffb35eb51226793181a5266e3ddaf3255ce38e7fda90c2257fa16044829199dc5ee30cb9c38925f1820cb20fd36d01a47af0a8cbee96edc0ecb5206e2ab17da3
-DIST serverengine-2.0.7.gem 38400 BLAKE2B b457925fae394ede56e9d866ebc0ebe02262b1ec799cc03090eb8b037b5e617836dd96860bf1e23a7c62fd09139f007dbf561f378d839cd07d3da70e11b5983b SHA512 5e4dee38ab00641d5f47c29cf765220a327aee3fdd3dface4e1996f7b12abd65de8ac03278e528467d0a508921aa3e504d7a34a7ebf2ddae419618262faf6616
-DIST serverengine-2.1.0.gem 38912 BLAKE2B d89298a8f7a985a8daad8604c88e63c7f534fe1b9020141ba704e34b48ea0b78f6da855d6253bec29abb449c58b51d6c7d83a97add36abf962b7fb478b6c68a6 SHA512 57231afbf28d8e54c90c99adc4c9443d865592a6fdaed85c66dd8e123af06d8b72567f6d0f3b058af388293c25fb52ff954d37517c21ae518314b3f5c307c8da
 DIST serverengine-2.1.1.gem 38912 BLAKE2B 110adef1bfc4538dcbd9cddc5aabcda00f0e6276f3092cccd54bdd92d644bc6121300c1963276d3bbb810fc2be44c9c833d1d74b524b3d7faae8424b98e45e3f SHA512 627ba0ad0235536009ed22cca017d23d76ad7863b9ed83e90504d374bb3c1b887c73ed0b120378327485ba7c68a18bf354228529da84e134ac4d3b6dd96d14e1
-EBUILD serverengine-2.0.6.ebuild 821 BLAKE2B cf1e340e0c51b97f7576c2aaca1624b398ad07be06852659c0b8d232f1c23ff5d512905a28f2b5aa5a6efe3fc01263a42fbc430eadc00a55e08247fd4ee311b3 SHA512 3f7a465425ee87c3d1e3e52fd66fa3115f4fd38e6218e35e76f5b0a106896bf84a21ff16741086a5fac962c1f4c6d57d425ddc6a6fae612671a40aeacb95c807
-EBUILD serverengine-2.0.7.ebuild 814 BLAKE2B 8d721c9124100ddda5b87e16a3d32e5d27e5ce93468f7f646a2f7c41991ed4d09df5618138b71646231a571c9dff497d6887682a08fa766af95e175301868137 SHA512 864c06e6570d2e04b7e40d8f13c287f4f478ffc2c5a233cf0eab02af6d8914352ed720eb5f28154f9c216683301ad47da19b1c1897f85cfdb10d642d768aa9e9
-EBUILD serverengine-2.1.0.ebuild 818 BLAKE2B 7cb1d33b92fe22e131265ea787a0e9b1447f0cee40d88910a7a3e7a097445563964b451a4aa526621b64388705b758d3893c3a055a6a06f316c73c5c51146d31 SHA512 d6a22176c8ac39b8f51af2841065afe28a73fa6919907caa03c86a0eeaffc7e2abd84451cd6fda9ae48aa579006dee15fedf2fb183c1d4d4452e9111346613af
 EBUILD serverengine-2.1.1.ebuild 811 BLAKE2B 6d7b0555473b27affd23c0ae8605d324eec415dc9e41293cca298f90313e02c8067ce6805baf203448f7886414e11b122e228f10768d78d55fc84989f42528cd SHA512 b4b81417e7a0b15ee7aa99b009463aa9f578566f450da3a587090e81cccaf2cde497aa3062497ed20e87aee70fe9132e42130400181c5ac72d77629f337bf1ef
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/serverengine/serverengine-2.0.6.ebuild b/dev-ruby/serverengine/serverengine-2.0.6.ebuild
deleted file mode 100644
index c09a6a09cb02..000000000000
--- a/dev-ruby/serverengine/serverengine-2.0.6.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="Changelog README.md"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A framework to implement robust multiprocess servers"
-HOMEPAGE="https://github.com/fluent/serverengine"
-LICENSE="Apache-2.0"
-
-KEYWORDS="~amd64"
-SLOT="0"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/sigdump-0.2.2:0"
-
-ruby_add_bdepend "test? ( dev-ruby/bundler )"
-
-all_ruby_prepare() {
-	sed -i -e '/rake/ s/~>/>=/' \
-		-e '/rspec/ s/2.13.0/2.13/' \
-		-e '/rake-compiler/ s:^:#:' serverengine.gemspec || die
-}
-
-each_ruby_test() {
-	# The specs spawn ruby processes with bundler support
-	${RUBY} -S bundle exec rspec-2 spec || die
-}
diff --git a/dev-ruby/serverengine/serverengine-2.0.7.ebuild b/dev-ruby/serverengine/serverengine-2.0.7.ebuild
deleted file mode 100644
index 484ceb4b1d4b..000000000000
--- a/dev-ruby/serverengine/serverengine-2.0.7.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="Changelog README.md"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A framework to implement robust multiprocess servers"
-HOMEPAGE="https://github.com/fluent/serverengine"
-LICENSE="Apache-2.0"
-
-KEYWORDS="~amd64"
-SLOT="0"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/sigdump-0.2.2:0"
-
-ruby_add_bdepend "test? ( dev-ruby/bundler )"
-
-all_ruby_prepare() {
-	sed -i -e '/rake/ s/~>/>=/' \
-		-e '/rspec/ s/2.13.0/2.13/' \
-		-e '/rake-compiler/ s:^:#:' serverengine.gemspec || die
-}
-
-each_ruby_test() {
-	# The specs spawn ruby processes with bundler support
-	${RUBY} -S bundle exec rspec-2 spec || die
-}
diff --git a/dev-ruby/serverengine/serverengine-2.1.0.ebuild b/dev-ruby/serverengine/serverengine-2.1.0.ebuild
deleted file mode 100644
index e8f5ed8ba5a4..000000000000
--- a/dev-ruby/serverengine/serverengine-2.1.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="Changelog README.md"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A framework to implement robust multiprocess servers"
-HOMEPAGE="https://github.com/fluent/serverengine"
-LICENSE="Apache-2.0"
-
-KEYWORDS="~amd64"
-SLOT="0"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/sigdump-0.2.2:0"
-
-ruby_add_bdepend "test? ( dev-ruby/bundler )"
-
-all_ruby_prepare() {
-	sed -i -e '/rake/ s/~>/>=/' \
-		-e '/rspec/ s/2.13.0/2.13/' \
-		-e '/rake-compiler/ s:^:#:' serverengine.gemspec || die
-}
-
-each_ruby_test() {
-	# The specs spawn ruby processes with bundler support
-	${RUBY} -S bundle exec rspec-2 spec || die
-}
diff --git a/dev-ruby/spreadsheet/Manifest b/dev-ruby/spreadsheet/Manifest
index 5bd22d132492..3d5b31004f8b 100644
--- a/dev-ruby/spreadsheet/Manifest
+++ b/dev-ruby/spreadsheet/Manifest
@@ -1,7 +1,9 @@
 DIST spreadsheet-1.1.9.tar.gz 4656240 BLAKE2B cb2b663bc4721d916f0485fe51a5e46239f2e48dca2410d3b5e6f50ad4a4fb92982e3a9ba7605c4f202d538f3f69931837c2c0d323b8b30e9c25210fadca8796 SHA512 1a4d8f3e2f6772ff6fdfdc818893d8d808b03f68428125d6f3deab38830dc47ab203fbface21b01c66ab451e2175db38f4b6d3b0cc2423ac37578d3bd135305c
 DIST spreadsheet-1.2.2.tar.gz 4656143 BLAKE2B d68e128fc902dce7508e64f2ea530f222cea6be43a2841aa9fe28a4155919c11279bb43f525de8b62f1a08a4eb35e0d7bf0af2b808bd22e649a798fa3a77bbb0 SHA512 8a7a7b385b15967b3cabf4fcc40a69788ef4470e81789256208be6b6afed4fcc078e85e4cfab0e647a03ec3c312d07f4c24160bf57814d4990f7c6dba3abccef
 DIST spreadsheet-1.2.4.tar.gz 4656374 BLAKE2B f1879115c108e26e9a0593f3d7f8ed94527b404d7c6e6b1e94cb1bd1012ed83943a7d48e7abd99548fb9f702f7a97896763d34022716309e87aaaf5923806654 SHA512 273be3ca2cb11f705f6cc610590da96a69d5d6aa8ec8b74b8a30673bcebb20363593edc5bbed8b0d4cd4f57fb8c65a893ad8435e69f87b1d7825f80f8d0cdde3
+DIST spreadsheet-1.2.5.tar.gz 4656771 BLAKE2B ab2972e54e5c386ac3dcce46b6a3cb982a826d0d7485d0014ec774e58e335edbae9925eaa8786b60c38a5b434cf019fc9183fc31ab6333be95a0ec22b95a173e SHA512 933beff8d6587887f41e6c2a9fef4912c618136718595357a14ec6d8f86f858f5d81559aee33c65c582fae2f3ef0a929570d0d3646b4a6b507f64d8293f530ff
 EBUILD spreadsheet-1.1.9.ebuild 855 BLAKE2B ebf9b73e1ffb80be01af994b2d924f5e3e2e851084c8b2993a2d7d189b572eb0300f41c8e340c5ff9f70aa23ff14b8a8597393841ff98ff6a1f1caf3496ea8bd SHA512 231e04c918bf894e7d6b7131865f9ec9a8cccb4789cfef955cc644df7ca84656a5e54241d871497c3090bfd31a70a13f779eebbbdbcdb7336d00ba40a3f22d38
 EBUILD spreadsheet-1.2.2.ebuild 855 BLAKE2B ebf9b73e1ffb80be01af994b2d924f5e3e2e851084c8b2993a2d7d189b572eb0300f41c8e340c5ff9f70aa23ff14b8a8597393841ff98ff6a1f1caf3496ea8bd SHA512 231e04c918bf894e7d6b7131865f9ec9a8cccb4789cfef955cc644df7ca84656a5e54241d871497c3090bfd31a70a13f779eebbbdbcdb7336d00ba40a3f22d38
 EBUILD spreadsheet-1.2.4.ebuild 848 BLAKE2B 28d89fd28787cfd5a3c98032e72b87dfe85d640665a91edb0964342331058ee6976769e422ee387a881d434f2a95990f8886051fb3aa695c7d12869cd0058687 SHA512 4cb7dc5a12a88c25d6dcf1c17a30f817ac2b6aa7aea8e95b3f9ac788ea31b1204db34877955bae4aa352a048f596b49f57836df7df4978457a4d6bcf2100d4ae
+EBUILD spreadsheet-1.2.5.ebuild 802 BLAKE2B b229e404f096264eaf293c9b91954600e6d3f6607e7176f40c012e2aadca49bd0942c3c72abbe9d292b0cd9caa23309e8d0024d951e49af63a7305b47c2d7414 SHA512 9875c70a2a98e489ae1f43188395da2f363bcd14556e905b42a03d60f4afdb91614f41517968b60444ce30c8bd3b817af074a6bfdfaee18674718b3a6e175390
 MISC metadata.xml 452 BLAKE2B acebaf37b6e910c08eda195fab8eb473c2516d5a22d30b64cbb564d25e9c162d3f2a5918fe5ed208533fd847de10ba374c5647f18d33f2045ced2c0fc6158af8 SHA512 a0677ee7cb739f0108436f4021f487e59ad4d24af2d3e08c463b0042cc3016f02a025cbb558a68c04cb13fac2b099530fa3c17b29b473c9371b2243810664416
diff --git a/dev-ruby/spreadsheet/spreadsheet-1.2.5.ebuild b/dev-ruby/spreadsheet/spreadsheet-1.2.5.ebuild
new file mode 100644
index 000000000000..97cfbe3bd16e
--- /dev/null
+++ b/dev-ruby/spreadsheet/spreadsheet-1.2.5.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26"
+
+# Avoid the complexity of the "rake" recipe and run testrb-2 manually.
+RUBY_FAKEGEM_RECIPE_TEST=none
+
+RUBY_FAKEGEM_EXTRADOC="GUIDE.md History.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="spreadsheet.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby library to read and write spreadsheet documents"
+HOMEPAGE="https://github.com/zdavatz/spreadsheet"
+SRC_URI="https://github.com/zdavatz/spreadsheet/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/test-unit:2 )"
+ruby_add_rdepend ">=dev-ruby/ruby-ole-1.0"
+
+each_ruby_test() {
+	ruby-ng_testrb-2 --pattern='.+.rb' --exclude='suite\.rb' test/
+}
diff --git a/dev-ruby/stomp/Manifest b/dev-ruby/stomp/Manifest
index 4f86183c3197..af7fa792e3b8 100644
--- a/dev-ruby/stomp/Manifest
+++ b/dev-ruby/stomp/Manifest
@@ -1,3 +1,5 @@
 DIST stomp-1.4.4.gem 93696 BLAKE2B c1647ba119946ed41d58b1fe08baae5fa54317e3ba4b4b33eef50b7ff588daaf2ecf89a45b21b3eac7969609337fc8b09d73ea7f54f40af6c4b2613cab686df7 SHA512 77c5a53b56177869beb9ff236405479d1fe48ba6841f42eefbd104a5e1b8f82584283c909bb2f6ec5a34ae99c0dfa91079d0716d1bef65db24c5b1414c1ed673
+DIST stomp-1.4.8.gem 97792 BLAKE2B d3a3ff9795adfe9b53a60a3fa9f18e9e96693882325475fba6629b2c4bb4cf3fc3d9bbd68277d6dc3e093ceaefb680a5f0365e89cd87fae187880c8b35ee022e SHA512 6e5c0727d4b3853f90f8ec4450162b38f571dcd63b58a4d09c284f42f5b9ee884ee8a3b8d27c8d85f8a297337e0d6ed61538bafee840cfc26e15b15039e1e4c9
 EBUILD stomp-1.4.4.ebuild 446 BLAKE2B f0988cec062813e456a334ee0e0397fe578f7d46be7c8cb00dedade018bf8b6dc498d346a0b3ed6d187253d9fb09f4553a049ff6148a1b94cc5aa7ee1d7347f1 SHA512 182fe4d9b410a4c27a4fc14269ef257c915c43b949cd65c1090c3f0bc129967fd3079ced1affa2b85fbe746e08c0228be5184a5a5238f8d5d5167e71dfc43f9d
+EBUILD stomp-1.4.8.ebuild 622 BLAKE2B 5866baf72d790fcfcb8fe391a66f4301c647e2c93fc64c383dc371d4b2d7e65f36f502a07bfc0cafac24da45d6c442ced7ff761ff08ca5e54cfd2147fdc3e7ab SHA512 908e9091ef526bc08901135c87027dadfefe864ad13c1045fd3fe8c27feddf8c69ab512715425a43dfffe174ecd9d68acc7308f8176230ed05227aa2f00e73cd
 MISC metadata.xml 340 BLAKE2B a6651b0b90e84ece8ba5aca92bff77b66b97324fddd4b54aaf141ac0627bfb7ab5a9533c5610c3fbff944b354c938b12df8859cb5773f50b525072eef4a1d6eb SHA512 4abeb3f05f1cca14519cc2cb18d904bfb953ddf661b5ced2b5f790df590b863b41ab4b11ea9ca71bec60fa5bfcaddae84d216471c2b3cb2be6f01f2b965a592f
diff --git a/dev-ruby/stomp/stomp-1.4.8.ebuild b/dev-ruby/stomp/stomp-1.4.8.ebuild
new file mode 100644
index 000000000000..6564bcdb89c1
--- /dev/null
+++ b/dev-ruby/stomp/stomp-1.4.8.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby bindings for the stomp messaging protocol"
+HOMEPAGE="https://github.com/stompgem/stomp"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+all_ruby_prepare() {
+	# Skip specs that hang the test run indefinitely, most likely
+	# because of rspec-mocks deprecation output
+	rm -f spec/connection_spec.rb || die
+}
diff --git a/dev-ruby/temple/Manifest b/dev-ruby/temple/Manifest
index 9b154c1cbe0c..fbed30b217e1 100644
--- a/dev-ruby/temple/Manifest
+++ b/dev-ruby/temple/Manifest
@@ -1,7 +1,5 @@
 DIST temple-0.8.0.gem 39424 BLAKE2B 48df1f38a2df12871b13a8592afecf93fdd7c13497491d86c52eb2e06d47768403a1c8e7ca6201d73f319a9f27d65ae08f15c6c177b1b6e5d73b37483f01a4ca SHA512 ad57c484de78f029797fbf4331fa9c24247d6cec2e3dea447d394a104eb9496c91af45f505b720da1c4242845d94b34b626ca586c625cd126f72d1e4296ab2a6
-DIST temple-0.8.1.gem 39424 BLAKE2B 45bd26e0b05d51c96002e38044e3444c262df0b00aee4417c06ec0489a240c31557268b5fd8dcd58a70525eed11a5ef768913c1d45ecf299020c8f75e7ef5d42 SHA512 fbbdcedcce11dab18e0644702456729fe4f0b54f072c5773660614362d6033cadde06480fcce27743e80c73d26827c9947498d7ddb19fa73ec3b3dd6dc61fc27
 DIST temple-0.8.2.gem 39424 BLAKE2B a56db910d1d4d52495806e907c74052c04e6b4843d040adc33a7f6dc28a25a02231c4c9bd41723c8e1abe6624d4d55375c2a429514a87fa4f7a7a8dcb6377796 SHA512 51923b3bf9d4c05255131be62f567ca21305ba023ea5395a08d6970236b2a2833b058f7b3906046b8a57a224b368de12a6d5e426effca39324670fb632f33b67
 EBUILD temple-0.8.0.ebuild 654 BLAKE2B b7ce0b036d9068d1b79582cd6c53b56eb5ae5e5efee95546a8d2dfae3755b0f222854045108e1e23136f3db05c5843fdb96d18e9b96684d3c2e170fed5e5afc9 SHA512 85669b5b970a9c98f3ba48cd7e236ec161ef8151ddd7d5c908b35b39e32bb248d3b8e43d52f4f544780d7ec7d7af22b643b967e61817522cb84aad6566ffd892
-EBUILD temple-0.8.1.ebuild 663 BLAKE2B d69236524b8358ff0dda148ad589a2ff8bd878b56553394a634df66f3fd2b877020ba4da289cfab330a472bae4b5063230d46a3cb533d2b3cbc8132bbb5ec38f SHA512 2d4ba428ad2649160d8b2af27d06b343864e04f15e3b1d68214b176434b5d69976564d304684af47f8adf9247ffb9fef82b6b973c538227415411fd8dd713789
 EBUILD temple-0.8.2.ebuild 631 BLAKE2B 4775bd45ed57ce05d017a468291c5deb97f6c84e43f673355ef685e9ffb2f8c2b630d069d5aa5c52122648b38192f803d3e568c8faf02780ba92c77fe3873166 SHA512 f72c5fa473494772dc500efddb5ea1269e4d09c1578e41d7cfe900fc1c4c8a3067a762ef86f068d7a4f1c35e59b486e09be94368b118e1407963c57488ec6731
 MISC metadata.xml 340 BLAKE2B a58482ba0cb0351241c6826bb2014b49b554b28625c9f202dff5dd2c877454bee5a2f11c90cf05ca735def15bc9c7b05edab1ab77fa4dd1f2bf0970c1cc49e1a SHA512 ce7b6d2b6cd7c1d004cea2ffba1a8f74fd53afa3886f9fe248e30a066822cbfb0cf0782f8de1404ac11f492e496bf0ce1b4537aae9804108fbccf4e7382e41fa
diff --git a/dev-ruby/temple/temple-0.8.1.ebuild b/dev-ruby/temple/temple-0.8.1.ebuild
deleted file mode 100644
index 82f4a3ff0a52..000000000000
--- a/dev-ruby/temple/temple-0.8.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGES EXPRESSIONS.md README.md"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="An abstraction and a framework for compiling templates to pure Ruby"
-HOMEPAGE="https://github.com/judofyr/temple"
-
-LICENSE="MIT"
-SLOT="0.7"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/bacon
-	dev-ruby/erubis
-	>=dev-ruby/tilt-2.0.1 )"
-
-each_ruby_test() {
-	${RUBY} -S bacon -Ilib -Itest --automatic --quiet || die
-}
diff --git a/dev-ruby/test-unit/Manifest b/dev-ruby/test-unit/Manifest
index 204cb4a1b9c6..786740c633af 100644
--- a/dev-ruby/test-unit/Manifest
+++ b/dev-ruby/test-unit/Manifest
@@ -1,12 +1,10 @@
 AUX testrb 177 BLAKE2B 7f0192ddcadda449bc4766d5910c76ef21ff8cadce1372a46db4fc236374eaa3cb57e145b1b7b09896b3a866ddd9fa1f910f40b751a773bac1104d705902bc0f SHA512 9de97bde52a1e5770a8dae8da3adcbde3b1dfa7cabc6d131159c8a688a7ad5b59dbb528ce9eef3346da12264c0d30415addd907bc66c1d7d90b1dbc4c605730b
 AUX testrb-3 183 BLAKE2B 5bd4712b7a73cc480669facf537b5bbeaf16eeae2782e21d5fe88cf92c9945845803d3f1611d465a3fc16f76838b5aba964e9b96eae35d9cef1b0b269bb94e2d SHA512 cff9584c54bb682f03a0253df953ea930053642e249a3c4573e34cc78f4b77ef943ca5a2c7d1869d926b4a8d9e173ebece69169d845724b03c03f00608bdbdfb
 DIST test-unit-3.2.7.gem 129024 BLAKE2B 31565510d5a16cf75706810a551dca40129edb0fc1528b9f55c862b23db1986640f42a72432028f47d052bb1aab3600c90c4ed19388ba11f2221a5d1e0619aaf SHA512 a55a5abee0d602b23af34ee8a9a7e26effc95ce9dd8ce98da28c49caf883d47c86bd2d0979176b0d1e239861ea73a4c5a9a280a1ceda7fbfbbd98c888ca6b01e
-DIST test-unit-3.3.1.gem 132096 BLAKE2B ac1220ed2dd762c1bd37b1e10dc3cb7047b6dafbd24812126f22d6fd5ce8ce5353f93048d85a45e38de031380e6b506e2e626778c925e0dad54344b53b255afc SHA512 4275346f7e4c398b0999634636b3386f054f5c7018f06ddf53b488ebeb6eee8aed7d59e84993a32163d79463601a4b65d3e4115612e0a88c654da342a548d44a
 DIST test-unit-3.3.2.gem 133120 BLAKE2B a1945604327935b784b2286c4a714561a05f2db766723cdcad47a18b3be34ff803d4a257e808d48ef650ab2cdc97b7b1e24e035e356ddb0a4f658de289a327ab SHA512 523b0902133a67949a3e88697ee8d9919bc4a1da3844acd4289ccf202b8037cc255f299b6b66d8b3c90d23d5ac4d75453c029914ec45900bb041a3fd7fbbb8c7
 DIST test-unit-3.3.3.gem 133120 BLAKE2B 37fc200b121e84046d1ee483277fc1274dc3bbcdce95ecb5c88a71a77ca9c164faa8364f68d777896bceb3dd1857fc7146ca464f039c0f30ce5baa466f38ede5 SHA512 ddb40e2ec1f15405cc396a9008912fd41ecdf67a0c02bc7ad4bf7725ee68cdaeec6f171f1786469ed55c1154ce094c5f0dd75103c1989a694bff412c9cc86934
 DIST test-unit-3.3.4.gem 133120 BLAKE2B 1f0122ddfd6337a6dcf16c09f294b3632aff6b20491a6d6dd6ebead18570f4db42fcbc656aada7b11a46c0d04c4a1134356db3d101138739973687695221d819 SHA512 f8fb546ab764cc01f374fd387b26c0d49b5a572b4a428be9b7a583c449fcb73d4aa755f6666d16c7a62e24f263f91329e9e9f997646923b38a1e30af1bb3d168
 EBUILD test-unit-3.2.7.ebuild 912 BLAKE2B 5e63ef7b6b4fd547a7bd58f801d781b20206bb5225fa558fa92b6b6c6ad874b211737d8372ce1dbf119b859dba0b027cf8f97a66532ed5c3b4f5870dcc61384c SHA512 7bea513679136974f1a02d3aaf0b3ee1aaa9976ab879dbeaaa6e62063c5a092183bb3a388c302186fea34a1456ab1617ef812168bbff35a4322f220b465f5faf
-EBUILD test-unit-3.3.1.ebuild 922 BLAKE2B 5fd4c7ad9d9932938e0b939080068b3e81ec40a9d9e9624311d240b61e4ab94248ee234beb978b6bd0dde4ba9461d3af510c1b560a0059fe097c8be6112cccf9 SHA512 1224a11012d90319b40f8498ee51f22667cb9a0e6c1f98b6a3c02a675e9de8f5cc0ee983420fc0cd376c4061b16fb73da20d20c457713ad5b76fe6428232895a
 EBUILD test-unit-3.3.2.ebuild 921 BLAKE2B b96aafac4508011d837516ab928a56c319616bc319a2b2c77a89a93d0e4da24e619bd25730a75e7b3add19639e1414999d6f5620a95ad7acad25806b1f0e4ec6 SHA512 dbc1955d54fcceeac0fa76b7733af65c8d78e3c31fb35d09792b6bc69d96922fcd323c18fd8a5eb02acb99f8ef76cd4a43fa470d0351329c218d96b256387bf0
 EBUILD test-unit-3.3.3.ebuild 933 BLAKE2B 04715e18395b337bbda0ae431f5ee28d5839f0087af489271ed323fa421c25f280838ea1ba7628a597d47770be755d2c60752c383590fa70dedb4a609b11c0ff SHA512 4bd7154cce2a995efc648d010b75e685fab89340c1b09a5fcdabe60ffcc02c4abd1d69d226ef3dbffaa4818aa6a540e4a59309669cc3469c4127c80e7ccf7b26
 EBUILD test-unit-3.3.4.ebuild 895 BLAKE2B 1f5824c3bc5a1dd14bcb5a998a38b9e0817739999367785b5af5599854112a9f8b7752c6abdf6fe4d0dc5d3640d4b69d3e654edb62307dc8116d14109deb8e9f SHA512 d1a30132ee1ec88fe53aaa931235cf709a2cf333f479593de10324d8bff269f5c464e3cc0820e957c420d20e14b0023590bdc287604672fd9ceb94bbba5dfcd2
diff --git a/dev-ruby/test-unit/test-unit-3.3.1.ebuild b/dev-ruby/test-unit/test-unit-3.3.1.ebuild
deleted file mode 100644
index 5249d1cfb57b..000000000000
--- a/dev-ruby/test-unit/test-unit-3.3.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md doc-install/text/*.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="An xUnit family unit testing framework for Ruby"
-HOMEPAGE="https://rubygems.org/gems/test-unit"
-
-LICENSE="|| ( Ruby GPL-2 ) PSF-2"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-
-ruby_add_rdepend "dev-ruby/power_assert"
-
-all_ruby_prepare() {
-	mv doc doc-install || die "moving doc directory out of the way failed"
-}
-
-each_ruby_test() {
-	${RUBY} test/run-test.rb || die "testsuite failed"
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	newbin "${FILESDIR}"/testrb-3 testrb-2
-}
diff --git a/dev-ruby/timers/Manifest b/dev-ruby/timers/Manifest
index 2a692cccbedb..3f988a08f71d 100644
--- a/dev-ruby/timers/Manifest
+++ b/dev-ruby/timers/Manifest
@@ -1,7 +1,5 @@
-DIST timers-4.1.2.gem 15360 BLAKE2B 2480b6051825e26c9c30418e4acd7f9d8d0173d21038349ff16c086a2712eff7e9349720d270ed6505d8f90b14fc4dc99cf06d948922a222196d338b7933b5a8 SHA512 8c43f6ab09b918fc047056de20e85371929cd6841d7e26dedf54d565585eba040e23cef83c8747eb0ec43df8c9d9cf5915b5ea0ac6f6d551a0b086de3a9f3499
 DIST timers-4.2.0.gem 14848 BLAKE2B 0d3c1b70e6b4dade1664eac6951dfa1ff876098747d2f6eab21a2dff2f334cd614ac2c73e0651b93e92b3850c7933445a14bc4f43b50adbf1895b49c05d9507d SHA512 c5516c45e47bcd35bb5f16be0ddb31a2b1370bf06ee833c50b3121a7c36437fb418c58986b0d71979cd01af47bceb1ccd2ff50b1472592868175c4271c85e15c
 DIST timers-4.3.0.gem 14848 BLAKE2B b6dfa758b8b16fbc2a28da08df05ade4551d398cfcf1ce09cc080dac4ac6adda4e741a9c5dc89d71594fbc81e5b55303556b012b03bd836ab1f63f0565acafc4 SHA512 6783424cf79f7f36292198621f93e17540e93011146c3a33b1b14a118c31a508352e56e479e3df8d9692c6f95b366561f27b374611851e88ad3fb6bbd1606037
-EBUILD timers-4.1.2.ebuild 799 BLAKE2B 7987723613746413a08b27ab26bf1905df37aeac417cfc6fd138759adfffc8cd2f0826153bc982c17613e5b4cda947d8527ea8f7b19dfea7a3732cdefcfc07fc SHA512 9ad952a071e71579a131d97af99e2b3b55db6a640eb412d079aceb5695fecf324701e7dfed7776c5d7e29a8283f3cb74f1ec05fa2137c97ad5cb06fa92abcfad
 EBUILD timers-4.2.0.ebuild 936 BLAKE2B 19292bb61b25f09677521aec952888d64e256b985874ca4e104556af7444b28d2f7976c8b78b2e04b4a3dcd1b6584f4f74c8a2bf0ecc99e1f10806bdac1834dc SHA512 94a4263d9e6743be2ae3cde5155046a6ac97f784aa3ea36e001dc317908299da9bba0899db40bd80dec254380f57c055f6d09fa1ab203dda9bcedd410b2a67d2
 EBUILD timers-4.3.0.ebuild 930 BLAKE2B c6828e4f7aea7bd94ad41a536a9bf6357fefe6481f342cf524928f545ec6e609bc0ce5ce07e351c3b7c28cedf6c5b8f02078f68a4e8f467dd6a20e467a00da32 SHA512 a4343340b6ae719cc2de7a200a0eb405d957b8e3488666857bc0bc3ab54401be33aadcb38ce11bc6e000444a0e7e6bf17bd7932a71a778f2c70cfd536e7bcebc
 MISC metadata.xml 341 BLAKE2B dfe2c9228e7b666d6b7acb9d9f0cdaa70263a6d5960ecbb144699e62c94ded1b613a8d22f82e5125f6a2e954901a65da57bd432823d922d17164e273b809d8a9 SHA512 b863e101e06e7a8827cd6166688dbfdf77c5bc84203294d0ab63315fe5b5b03fe1898d02b9f219bbbb3f3cddd3d5185c34d9e4079bd993631cc849eae9ac9be1
diff --git a/dev-ruby/timers/timers-4.1.2.ebuild b/dev-ruby/timers/timers-4.1.2.ebuild
deleted file mode 100644
index 1b548c4cbbe8..000000000000
--- a/dev-ruby/timers/timers-4.1.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Pure Ruby one-shot and periodic timers"
-HOMEPAGE="https://github.com/tarcieri/timers"
-
-LICENSE="MIT"
-SLOT="4"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/hitimes"
-
-all_ruby_prepare() {
-	rm Gemfile || die
-	sed -i -e '/bundler/ s:^:#:' spec/spec_helper.rb || die
-	sed -i -e '/coveralls/ s:^:#:' spec/spec_helper.rb || die
-	sed -i -e '/Coveralls/ s:^:#:' spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/tins/Manifest b/dev-ruby/tins/Manifest
index c76145208daf..6242d049e205 100644
--- a/dev-ruby/tins/Manifest
+++ b/dev-ruby/tins/Manifest
@@ -2,8 +2,10 @@ DIST tins-1.20.2.gem 305664 BLAKE2B 37d206664077aa1ba8bac395e076b448797c9d73f469
 DIST tins-1.20.3.gem 305664 BLAKE2B 26c78cf94acba6651c631b274a98cc7e19d3e215a450d255886d201c5bf94c343141edeb03456a178943cf70efbc9b75ea12cc2ccaec5c929fe5b2c08e918d2c SHA512 f5f723402096e869a8e44e64db9dcd0be4620812f0b5cc291df79010fcb87774ad56298de328242c96ce9dca64f7313271b9fec8cff758a6b3b689bec17c965d
 DIST tins-1.21.0.gem 305664 BLAKE2B 843b19b1208c3db8b9c21be6d249ca334bb3e8eb172a54623a7f6c6c1d6c62c2891e08cce5ec9a86fbc55637d7d8e2012925efe57fa23e68976bbd83c7f8cbda SHA512 88de2c493ad4ded353d58fa9647844fc14043233e0baa33180218cc068ab34d6a86e8841f41106ffa67215af26ccf3207ac9ef58f7db80f14c59c96591bd4a85
 DIST tins-1.21.1.gem 305664 BLAKE2B 1a86b55f0334d4e28fe4d4e67c12103ab4ed53056fb00d9d375ffc9b8213419bf277c37d23970e99c6bd7d3a2035cdde661dd63524b81082739d01271370be9c SHA512 25288e3c8e633bc9cef11b988bf778e75a304a52146a4501cd3ebbeee4c845a6be795d4ce7d01b24ff4a9a122fc16afbc20d9d88f7b1559c9b433d8f9282e29d
+DIST tins-1.22.0.gem 306688 BLAKE2B d5a3549f8ce89b14df18e2affc70291af07323d63fc42feddc6d70fccf8ea1a032c851639e509c35dadf0cf5c6b9fdb28c6258e263142461b15f81959227a6d7 SHA512 4dc695a252cdc6d65514906de557ad21d5a4dfb0e8a7c6650d94a2a4e6da5f34f6c7ce6c48124bebb79268a4c2b840f63ef5421ef4ba3d847de42d17f459241b
 EBUILD tins-1.20.2.ebuild 628 BLAKE2B 8130fcde3c9ae7f8103b30cae9b164fe3245e243b053710c5cf59740e9144489cc50e05fbddf1a23a7a0dcba8fd9b6cd6d68b1790f2d63fd0c49bf58eb6c6697 SHA512 de10342ae03324eeb94eff836cc4761d87e533a1ab92642a5ee459e57048a0de3ab10f990ec8a400c4c1cd7b7ca382dc09279991254d89e785b4451cc1541e0f
 EBUILD tins-1.20.3.ebuild 629 BLAKE2B 39b3cb83747562c40402326766539b93349ae5dc6dbecb47e33a49f25fec4b2811351eb9c7d0b853df2bb7db091482ba5a5327c0ea0e9b2de9834e40566bd3fb SHA512 40ac327a065893791ccfa28e6d04e40d35a6e504fcafea7e0d2899ac46ce24b6c0b797bb184ee8f6390e427d6f76465d99b7b249c32933e66922699120347b80
 EBUILD tins-1.21.0.ebuild 629 BLAKE2B 39b3cb83747562c40402326766539b93349ae5dc6dbecb47e33a49f25fec4b2811351eb9c7d0b853df2bb7db091482ba5a5327c0ea0e9b2de9834e40566bd3fb SHA512 40ac327a065893791ccfa28e6d04e40d35a6e504fcafea7e0d2899ac46ce24b6c0b797bb184ee8f6390e427d6f76465d99b7b249c32933e66922699120347b80
 EBUILD tins-1.21.1.ebuild 629 BLAKE2B 39b3cb83747562c40402326766539b93349ae5dc6dbecb47e33a49f25fec4b2811351eb9c7d0b853df2bb7db091482ba5a5327c0ea0e9b2de9834e40566bd3fb SHA512 40ac327a065893791ccfa28e6d04e40d35a6e504fcafea7e0d2899ac46ce24b6c0b797bb184ee8f6390e427d6f76465d99b7b249c32933e66922699120347b80
+EBUILD tins-1.22.0.ebuild 604 BLAKE2B b773c516a7f609ed7df0df74a412558c7a55c7239e10a6371f553326fd76374fab7bffbaa700f40e9354251a61a7538e3fc065a82618b96ae7e511210c3fea10 SHA512 138df724b0c61abbda52246df9e8ae3d9c43696f57d76dee5c185050e6087ef80f6ded98da87e14a3dbdb922811fe810d0a69bed31c5c2163da6f71e1c0d7b27
 MISC metadata.xml 336 BLAKE2B 00b8e1ea737e7431865357c6f52ec454afa14e9e22e130b6ae286a4bbddc2813c2f34ddbe492897c19683ce329bb146be74b994955efab2799d23f81fbca4eca SHA512 fe0912b4e761404c8d0d5860e663270bb47610ce4bee99569588e2c2300b80bd8e5df2bbdbb91afcdec1df178d605acd61635695eff0e7696e04b673a3e14c46
diff --git a/dev-ruby/tins/tins-1.22.0.ebuild b/dev-ruby/tins/tins-1.22.0.ebuild
new file mode 100644
index 000000000000..074a4469878f
--- /dev/null
+++ b/dev-ruby/tins/tins-1.22.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="All the stuff that isn't good enough for a real library"
+HOMEPAGE="https://github.com/flori/tins"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+ruby_add_bdepend "test? ( >=dev-ruby/test-unit-2.5.1-r1 )"
+
+each_ruby_test() {
+	ruby-ng_testrb-2 -Ilib tests/*_test.rb
+}
diff --git a/dev-ruby/tomlrb/Manifest b/dev-ruby/tomlrb/Manifest
index 62ac3298d0ab..e1efe530257c 100644
--- a/dev-ruby/tomlrb/Manifest
+++ b/dev-ruby/tomlrb/Manifest
@@ -1,5 +1,3 @@
-DIST tomlrb-1.2.6.tar.gz 15642 BLAKE2B 4f9d19fd66a88a049360f6d3636fcaf6caa7164149a543db5a162ee48c8fb301a4a884dc77d183a9c9f190d6f9e9e92bca66179c250f240d7014791f11f7a600 SHA512 ada1d801ceda014d4ef9d3c973a14b970ad592323c259dfe0e851c00b554551d59010bb65ee64f8acbf5521132d2fdb4de14306c1a2dd6bf5307035bca100fcf
 DIST tomlrb-1.2.8.tar.gz 15897 BLAKE2B 536eaf3a2cb2b7e54e91aac28032b95900f53c0c9b10fb48129bd963e0efab1711848cefeb20c5df3bb5ea367dc375188db57b79990daf3e62f8b781477ea30e SHA512 a6f8a7ae5db02a8efca8ae75fc1a680d26016d221ec238e4f5ecd59bead4efff7cfe14f541a0be17ea6790699aeb7621d9a4d1b7e38a40828f8f66424fc9fb94
-EBUILD tomlrb-1.2.6.ebuild 581 BLAKE2B 61059027118b812396281212148a6afbc0fa38a2640d6a0497e9afe166e50d23b7bf6e579349f0c38ae289dcc127e74b8221c937238a86c22aca5a4e82fad79c SHA512 49d9b31b9fd777c564ba72470bc757b8c8223dfd75684b90e130d8e75fb248fae1ecf465ea08ff4e16d83f31bcaac6d866e22797bd2549809f2aab68544a18cb
 EBUILD tomlrb-1.2.8.ebuild 585 BLAKE2B 24422dac80cb5b003793735d85c73af8d2067c60685c9994f9205e8bee75513d44072247d650fc8e1575cd78c2ae5eb8a1396023c323c4c7d540c620d917952e SHA512 1c1aaecfbfc24302d7598afe84d81215f3b83fd28f665b980fa9d2713d79a2c35123934126834150740ee07cba76c855a3439fff855c4c68c95aeb27fd98b072
 MISC metadata.xml 341 BLAKE2B c6a4acddf424e345fc8c0b852b8be8ebf595948ff538a2b6367aed370499c9b4caa963c3f077189c7cc10946bc32e71cf3cb8e4fe9ea7a274f888cb47880cf7d SHA512 3316b67122f7447128fb5aabb66af7f0fd1d7d3d896d8e27708c345297d41aee16383c6012ca3c6b3eb8e2ec78a6343b68cd082ab2db4fb54a5b09d10a39a3b2
diff --git a/dev-ruby/tomlrb/tomlrb-1.2.6.ebuild b/dev-ruby/tomlrb/tomlrb-1.2.6.ebuild
deleted file mode 100644
index 62a611d08c6b..000000000000
--- a/dev-ruby/tomlrb/tomlrb-1.2.6.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="A racc based toml parser"
-HOMEPAGE="https://github.com/fbernier/tomlrb/"
-SRC_URI="https://github.com/fbernier/tomlrb/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="1"
-KEYWORDS="~amd64"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e '/reporters/I s:^:#:' test/minitest_helper.rb || die
-}
diff --git a/dev-ruby/totoridipjp/Manifest b/dev-ruby/totoridipjp/Manifest
index 870a47b75533..621915214d99 100644
--- a/dev-ruby/totoridipjp/Manifest
+++ b/dev-ruby/totoridipjp/Manifest
@@ -1,3 +1,3 @@
 DIST totoridipjp-0.1.0.gem 7168 BLAKE2B 9a78da0b8309c9886506a80b7206530f3398d1591eaa75a32a4085bbdc56492da7465e6183fe5979e5e3e9ff486a089d1495ae2105f694c407fce40c29809dfe SHA512 5298fe39b0705a0b913f7f6cad452be48480a6832e9451d86a7fe9a1248fe893a76af2f56c0bd6d3a65c756d4ed3fd29b4483ef82beeccfc78dcf9dbf43ed748
-EBUILD totoridipjp-0.1.0.ebuild 464 BLAKE2B 89bd7e90ea4acc8b36718ace31eadbbe89cb5740cb2d2f71405cf9b49faf813ef6a2ebde5908f4e804030da62f23b8fe82103a7a6225c14bac9a8bbb1cc0f480 SHA512 09409dbdb76bb5db75d2f0cf9f967907961cc595f4a9d833bb8d8f17d7a002fdf5d7f531b2e0563e950195e77b3705f222567bfece264369c95e70c1b26eed80
+EBUILD totoridipjp-0.1.0.ebuild 454 BLAKE2B ccd117e96b090a9137f2580d4dfadc6afc213ed559c42ca13bf8f5db85bb0239c25a2325612c57a51a5e85d3688045f829f6de6e69e2f1837ce6b12092f2aef7 SHA512 eeb57dcc09afbc3beecbd58fc329747a76552e506c5929ba0ce1419604df00445b89ff33a79801d62b62907f6fa8cd6eea23b45a9f9cb370b06b572870c266ed
 MISC metadata.xml 406 BLAKE2B 995f3e6b7697d832d590765c25c96a0f29e04dc75799b75a6541f41ce48b6b001793475c7dd1a501c06cee5bcf6871abf32188bec019e58dfc2fe03bf2120341 SHA512 11b57cef52e1a45bc8e9b3862faefe9c4a19fa0dd74abb812de2ef710a41dea0cb05ab0b6e4c14294783b4a2026b2f371eb86ea3f8046a3a6d50109b9fb4c5b5
diff --git a/dev-ruby/totoridipjp/totoridipjp-0.1.0.ebuild b/dev-ruby/totoridipjp/totoridipjp-0.1.0.ebuild
index fa62433f97dd..b088e625b2c4 100644
--- a/dev-ruby/totoridipjp/totoridipjp-0.1.0.ebuild
+++ b/dev-ruby/totoridipjp/totoridipjp-0.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
+USE_RUBY="ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_RECIPE_TEST="none"
 
diff --git a/dev-ruby/travis/Manifest b/dev-ruby/travis/Manifest
index 7395ccf76abd..15e29355bd87 100644
--- a/dev-ruby/travis/Manifest
+++ b/dev-ruby/travis/Manifest
@@ -1,5 +1,3 @@
 DIST travis-1.8.10.gem 194048 BLAKE2B fa3daaa50e4c7024f6eac7978cecba526378022451deca9148a10b6f28528dc4ee5a42cc794628860b2861aafce0dc62c207023fc1f61676b48e00022112c834 SHA512 ca8adfb2d1541e157d1fa19837ce6d7a75ce491e0a3402447642f9f3b1f0c19ec16344016ed494947e3fde4e838669e4e5ba48087baea3f097605bef700dde55
-DIST travis-1.8.9.gem 193536 BLAKE2B b889127e07b2126ef193d64361059d514db4df4e3dc70fd30b55dac3fe67624df20d156aa6d9842d6bb766788626358ab38d7e6a59455c91a80925628e30764b SHA512 fce5dfb8071629de172b8a91fad15b1d6fcc50af1ab1a41eaa1e5eb91042b90fd58e1be24779fb02972077af743ebd65183b2dff42ee47d48818f7ed2755980a
 EBUILD travis-1.8.10.ebuild 1191 BLAKE2B 25f520f5df5bfc134d4b4039e402e2227a69489580988eb25624aa60980364c3db05ff1062dfa4c606b155888d6fe39ed6a24d62fb2a1826484e49dd37650480 SHA512 0d21635f4a7a57b4bb07e6f05e2749ae9d9197509fff5a8ec9cd6852c5f7c473bd8b19cdfe395798e6475e1308410d3c790ae31d21d408aa9bf30232ae55990a
-EBUILD travis-1.8.9-r1.ebuild 1194 BLAKE2B 503977a9de3b0daf639d8c0598b2f9a269bb74bbf213cb46fcb7ccd3b99bd5f36088611e40b08126acdc990321978d40998eba95fa7f2ad7ca28d46773e54099 SHA512 0c2f6e31ea94480a613fdae29b6c48d5188e967cfc4f03cb909b447e1025c78915518542fcefdb69d93a6850bc1a31892a68cb696ddf5f92768575618fab59e3
 MISC metadata.xml 335 BLAKE2B 028a3eb98175d899ca2cb4412a35af5c9d9e1dbe43a1065346c7a529087790e3e3482fe7aa489ee4803f7ddff115bb654c62d865957fe80cce7952d316e7bb30 SHA512 2706c228bc0da2e813ab70918226cf82561b8f3f7c186ce5c97a7d74237e2448029bc0ee74b18295996a0c3d09107e7453cfff8257aff91def14ef30468919fa
diff --git a/dev-ruby/travis/travis-1.8.9-r1.ebuild b/dev-ruby/travis/travis-1.8.9-r1.ebuild
deleted file mode 100644
index 628e3462bf47..000000000000
--- a/dev-ruby/travis/travis-1.8.9-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-RUBY_FAKEGEM_EXTRAINSTALL="assets"
-
-inherit bash-completion-r1 ruby-fakegem
-
-DESCRIPTION="Travis CI Client (CLI and Ruby library)"
-HOMEPAGE="https://github.com/travis-ci/travis.rb"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-#RESTRICT="test"
-
-DEPEND+="test? ( dev-vcs/git )"
-RDEPEND+="dev-vcs/git"
-
-ruby_add_bdepend "
-	test? ( >dev-ruby/rack-test-0.6 )
-	>dev-ruby/sinatra-1.3
-"
-
-ruby_add_rdepend "
-	dev-ruby/backports
-	>dev-ruby/faraday-0.9
-	>=dev-ruby/faraday_middleware-0.9.1
-	>dev-ruby/gh-0.13
-	>=dev-ruby/highline-1.6:0
-	>dev-ruby/launchy-2.1
-	>dev-ruby/pusher-client-0.4
-	dev-ruby/typhoeus:0
-"
-
-all_ruby_prepare() {
-	if use test ; then
-		git init --quiet . || die
-		git remote add origin "${HOMEPAGE}" || die
-		touch .travis.yml || die
-	fi
-
-	# Remove failing spec where cause is not fully clear.
-	# May be related to highline compatibility issues.
-	rm spec/cli/login_spec.rb || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	newbashcomp "assets/travis.sh" "travis"
-}
diff --git a/dev-ruby/turbolinks-source/Manifest b/dev-ruby/turbolinks-source/Manifest
index c8b999847340..da04d5a246c9 100644
--- a/dev-ruby/turbolinks-source/Manifest
+++ b/dev-ruby/turbolinks-source/Manifest
@@ -1,3 +1,3 @@
 DIST turbolinks-source-5.2.0.gem 13824 BLAKE2B cdb7adb85e275d5e6edc4f0a03d75edac2f974ff0c1e2f7c003865edef018f0b0d24775d3db2cdabf1f7bf49869441d6af2362f236904fb9d6773b1a47173795 SHA512 19d1fc17f3af81bfc79a1e513aec88dfafa808a2f7954acb14f32909b308ce399f36bc18de313ea58812b13cdc9e65cbae5392cd4c88ea010f1efcef99356557
-EBUILD turbolinks-source-5.2.0.ebuild 458 BLAKE2B 55f0874ff68e98cdff4ba7ece5dca19fcb2cc2af1926c85273ad6a8fcc1f167d39f921db3035ec21146cb99596d10e7c17a4235a4122e508d98852bd3f58c35f SHA512 229fcc83e0958e7498258b0879d734b85d78058128af792198892018731d9fd52ca5748a2080de735cb4710b54df188655e960260e969edabc4ebd332574f591
+EBUILD turbolinks-source-5.2.0.ebuild 465 BLAKE2B 9dbfe45e80ce0fac5a7d313457293bcf010b7f207de605fc7b9ed384c583f01a9472bff5217d7d242e19ed65baffda68039587abe64b05f3912ccf6da57cd2ab SHA512 a62cda187ad0c33afd6e7f44378db2db72f479b363c6ca1e3b4eb8d75d8c817e9ee11dff3afbf7891af77f9f71872e49d0ecd18e67cb09846ec4c0e3d095a4cb
 MISC metadata.xml 353 BLAKE2B a1c102461b21048c35e3d49fb04470d38f88b73e93accfab7ca6db51e698e2150a32a16675cd166afc0e053eaae8d1e2a30e37bceeb37678e3a962cee6900c79 SHA512 54ca1788e4d8ebd8930bebd10ca0f506f3b1b22d5fb660b1863cccc9558f3848cf515e2c2678ce6f986a864d2ff0ddd754cd556d211c5cc443a2bdb4b23a8aa9
diff --git a/dev-ruby/turbolinks-source/turbolinks-source-5.2.0.ebuild b/dev-ruby/turbolinks-source/turbolinks-source-5.2.0.ebuild
index 608c955b8689..63abadb19b41 100644
--- a/dev-ruby/turbolinks-source/turbolinks-source-5.2.0.ebuild
+++ b/dev-ruby/turbolinks-source/turbolinks-source-5.2.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 
 # The gem does not contain runnable tests.
 RUBY_FAKEGEM_TASK_TEST=""
diff --git a/dev-ruby/turbolinks/Manifest b/dev-ruby/turbolinks/Manifest
index 0eaa3786ef77..b7e5bedb10da 100644
--- a/dev-ruby/turbolinks/Manifest
+++ b/dev-ruby/turbolinks/Manifest
@@ -1,5 +1,7 @@
 DIST turbolinks-2.5.4.gem 21504 BLAKE2B fdf34659e1db5d4ed8e7ed2894c46b4cba8aa30b5f9492797507e7e2c7a212dcc55b673874162fabf017594cbd1e36eac58d03f9d6951e7701293fabe135fb91 SHA512 052cff2ecfbad7a98371572c09c8c66f6c8babb3e997dfd12fcebc1dda6f9c0d8065be83c0f6b04ca1b1f2e0548abb73ada3fb32bc71f1eceb90b5f0ef61a195
 DIST turbolinks-5.2.0.gem 6656 BLAKE2B 7a50571a24175fc5e2c186b79fc40dd9f7a4fc3eb162b64a6b9656bb0263a25e2053bbf8685792186e5aeea8d9795e1a98e0c97e4a3155760a9b7160496b5c79 SHA512 dd69f6249463844da655ec57db34e55fe7e9fb43d2cf0eed87d20deb578ae9f84541b80df00b0f056da7cbea6b3fda3d55bff10c3e7709c50f98ef543710cc7d
+DIST turbolinks-5.2.1.gem 6656 BLAKE2B 55f624ee8dbb8d27ffe21fc4b57644ad3118dbf7d89dfe59dde1909ee553d37a47e127af92e710f5081787e682b76950aac4287b604ebd9b32df4d60ededadee SHA512 e306a38dcb727a9ca9f491074154d0e82a6a0efba89aa8aa6f5db97c0c78fb468589a54b28779b83b5548c92aa03976e27a98b4beef0ef376606a97ac9dcce59
 EBUILD turbolinks-2.5.4.ebuild 518 BLAKE2B 1ad5a20e047f15829587260e92418e552d558e558e32c9ca1396e1831f5bf01af160fcf210e3b5b935133e91a20e932204d448a9b6cf0570c5f0a540c1928729 SHA512 ce6a955df53d54da3a4a884f39c037fb62e58d91bca121ddec2a9dbccabd426e61c8aaeb729e0521e9a0c7489e25c33febce6baf370b93fde8a14c3001a596a8
 EBUILD turbolinks-5.2.0.ebuild 467 BLAKE2B d7c533815c45daad782fb2755365740646cf7e3f1003e999b73481ccfbadab1faa6f6ede124fb198f4e1515f461047bba823cadc12f25b92337b03da1569b932 SHA512 6364dd4e94480e4c3830954eb712451dd57cdca3191a237eec2eeb90d82a9196a8753778e9f8c15c1ac42d5b02b99deeb4435a3e3be71ed45187089d89f97d6e
+EBUILD turbolinks-5.2.1.ebuild 436 BLAKE2B 1f6acb76446c4d6c40e7f7ed86586263273c5b4dd6a74bf1b8843403405afa267ed6f1dd731c2b66521433e2a632bee32024fd2c239adcaf7bafd182305e0189 SHA512 c2514ef06c81076c46cf802973512425ac91b76ce1fc641186135a564478d05d510048400c49ef0464f4ad6161f6284229a62198481b3a299ea2ee326e158484
 MISC metadata.xml 342 BLAKE2B 6a78075d284b979777608d6701b92ffd1b4e72af314ce5c49a1f975615379fd976031455feaa2e6efb14289398d434642b6b2b6e8e037c4ff69226649247a9a0 SHA512 3ea14f0b2b2e0ac563e97ef9eb9ea84e6389dbd456655f344a9cfd4a7a9d24eeb3eaa4fbbe30683cb7f7adeae9c51d136a5a2174cca6ddc1e0d7b31d380a66ce
diff --git a/dev-ruby/turbolinks/turbolinks-5.2.1.ebuild b/dev-ruby/turbolinks/turbolinks-5.2.1.ebuild
new file mode 100644
index 000000000000..737899d51c54
--- /dev/null
+++ b/dev-ruby/turbolinks/turbolinks-5.2.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26"
+
+# The gem does not contain runnable tests.
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Makes following links in your web application faster"
+HOMEPAGE="https://github.com/rails/turbolinks"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
diff --git a/dev-ruby/uglifier/Manifest b/dev-ruby/uglifier/Manifest
index a6670b60313d..375ad8117fa4 100644
--- a/dev-ruby/uglifier/Manifest
+++ b/dev-ruby/uglifier/Manifest
@@ -1,7 +1,5 @@
-DIST uglifier-4.1.19.tar.gz 200607 BLAKE2B 8e8031c162bf5d12bcd85638dcdb3da2fa2877a8246a62ab9db7cc33dfc91926076c2c7231ee3f99729e9a34e6d18f6eb296f9d67e81db818a8fd7997210900f SHA512 dce40803daf0101f4d9934e2b100688ce08019ef5660f9851ea5d65743dad071d6af4bc7ee00b65ae4d245602d6a2678c3d90e838f9d7e1935fec46fe0f3c2da
 DIST uglifier-4.1.20.tar.gz 200470 BLAKE2B 64cd5a7dffc0becd66003658db3a0870de6c379755bc3025334c5374061240de1493d877c9c638f7be0438fdef4f58813fe89c77413c4e0a8d489e35b431259e SHA512 9846612e00568b359672f6bce78302839b8b1f9d2bf607338bd299ed7c3c3e948a223903077eea419aed3f0bf47df8024531ddd7ca645df90203ba2d50d99992
 DIST uglifier-4.2.0.tar.gz 201913 BLAKE2B 90390308f116dc82fbf889b603b1ecd118adf9a6f541def408fe3229db02d78f3f7ba790822cc5524870317131260ad7f8c7191a69a9e158a43d9c3822fcc95f SHA512 869194db8fffdb7d243fc5639e0286d73dfa3ca9485efda760a9eb00424e6797f0bf7aa9f6c8f410daac556e01b6a1a1701300bc373eb492ea21d864494f8246
-EBUILD uglifier-4.1.19.ebuild 805 BLAKE2B a114b6d5eb06d899384886a5cc47db85d3acf0156d31e49446126aa596dca1ccf335e32899163ff3bf5670dc9c9e5458d5bfecb69d8c79337930c45834db4ebb SHA512 32ac7dc1bcba18a57bd1c6d1ba84046c4736e8a4560a7850d83869170d759911b5e66caeb9a49ab69d387225680ef44554631abd75890ead6e2af5ddc8c1ceda
 EBUILD uglifier-4.1.20.ebuild 809 BLAKE2B 108c6811506bea95e2aa1bb86cd6eb230f24c890817d8ac08fb9540d05f887371db522236b248d89db97d9d2b04fee1642e26c7e1e25f0b4fcfe141bfc7406db SHA512 a325c8325b5bccb1d6c8af9c6531454c0ba2648bfe88293e0156b6fd08d83c2b0f2d3a9c1beafbcb3e813df449ca1b2b2977be16a897f4f67b1833d8f7c42072
 EBUILD uglifier-4.2.0.ebuild 770 BLAKE2B 1013bae1b5281590e8ded2f4f3911accc3ed47228d51827195ea238f62dde6eb36fd17de6e839e1cf025bcb0f7810dc4f260cc52a3844ac7b828db47c8048794 SHA512 f6337ad403e109ae51d78a9fd78da2e2d4d9d81cd7f995abfa2dd38e3e7fda35efb8804b17a3116527771c5643361525d6723323a6f711b9c21c338afaad864d
 MISC metadata.xml 341 BLAKE2B 07cb7ce323751f520c38158ef006374652e317e5809b4fbc729c264f3b44e99fc8e1d75916d858ba50361c2d3cff389b33cba7c7f863300ae8da8002de4a8d24 SHA512 0747fa6ff0d695b149915495d5242dec8541231e0e72a2157e3b4412301d8f0767c1eab17ea72a0d9f8c1afc9107c4f55b261018744e43823c8140de38ebb0b4
diff --git a/dev-ruby/uglifier/uglifier-4.1.19.ebuild b/dev-ruby/uglifier/uglifier-4.1.19.ebuild
deleted file mode 100644
index b822aa8c1b9d..000000000000
--- a/dev-ruby/uglifier/uglifier-4.1.19.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby wrapper for UglifyJS JavaScript compressor"
-HOMEPAGE="https://github.com/lautis/uglifier"
-SRC_URI="https://github.com/lautis/uglifier/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="4"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux"
-
-IUSE="test"
-
-ruby_add_rdepend ">=dev-ruby/execjs-0.3.0:*"
-
-ruby_add_bdepend "test? ( dev-ruby/sourcemap )"
-
-all_ruby_prepare() {
-	sed -i -e 's/git ls-files -z/find -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/websocket/Manifest b/dev-ruby/websocket/Manifest
index fc47c35c37df..3eb93e1c15b7 100644
--- a/dev-ruby/websocket/Manifest
+++ b/dev-ruby/websocket/Manifest
@@ -1,5 +1,3 @@
-DIST websocket-1.2.7.gem 28160 BLAKE2B 11890ed86379a1d19dca142794ff2161c02566d46a00c77d534c708cd689662801cd3ee9ebae39c6622783873bfe00985c7ed303e0ed886d837f4f322ee5c3c3 SHA512 3200ee562a59e9ce064189cafabea8c8fe8bfd87ded452f1fd9b2498cb1a2108ccd685107b8848efa21f7bc9934942e366dce2ccb3783e974570682374553dbf
 DIST websocket-1.2.8.gem 28160 BLAKE2B 25c7c055710f8d42d44417b3127de9a5ff8ef87dbf766cd468a88bfe116fcaa4f7d36b3caccb5780f2a1b4be05e5c4bcc74efffe6c2f4b65d0f1c8d12055b2a2 SHA512 42630e9d577a0fcbfa9f28ba487d12e4d96c59c615dddf91f810abc151a716aa9eaac3788999cb8eb2e729eff92fe8d262639b4b460029690994c710e78c138c
-EBUILD websocket-1.2.7.ebuild 454 BLAKE2B 3b0ac47d0c8e097f9036dcf130dbfd80a9ca4067f27e03a54ed4f159ee620ac034ee66f03c1366410c83a1cab271d09d8ce961591c29862a79c91620a03aeb02 SHA512 a7281d32b6c0d78e7feb1e841c143c72564b745f72b1bfb79404e7266cc83ffc3f270ef13a78161c56bbf045e41acc0926f9a530c3bfca34858b2b6ac1deb1c5
 EBUILD websocket-1.2.8.ebuild 458 BLAKE2B 53946f870b90c254be9cc713f64c0d58aa6a386c4f4e1d5e0d2a3d4d8315cdccef040026d8ab929ce221a2985860459861589a1296aa7d8d45288c9e61b71e88 SHA512 15927700006eaf5f78c77d4e8c55b2dea1702d7bb4f323315ec1a7489cb6367c51cd3e2fa4624eecd0b5c2d41ea6a1200277704387b60c838e9043e48d3da695
 MISC metadata.xml 347 BLAKE2B 8592ff0cdeffa4dbd1206e33f7d4ef8f79effbebd99936a8498f898da908254f10656505e61d6495cece6a91633ef10ca055ff4a6d118c1ce1ec8b8b258352f5 SHA512 2fa469898a71bb5a922605eee46ee6f9a1460492d7098c2ad4f656bd89ab9ab3d4fd9314c0b65f283a2eddd670b40adb54b3be0a2669b5e347a19283a678f1d3
diff --git a/dev-ruby/websocket/websocket-1.2.7.ebuild b/dev-ruby/websocket/websocket-1.2.7.ebuild
deleted file mode 100644
index e29d617a82e7..000000000000
--- a/dev-ruby/websocket/websocket-1.2.7.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Universal Ruby library to handle WebSocket protocol"
-HOMEPAGE="https://github.com/imanel/websocket-ruby"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/rspec-its )"
diff --git a/dev-ruby/whole_history_rating/Manifest b/dev-ruby/whole_history_rating/Manifest
new file mode 100644
index 000000000000..559eb17778da
--- /dev/null
+++ b/dev-ruby/whole_history_rating/Manifest
@@ -0,0 +1,4 @@
+DIST whole_history_rating-0.1.2.gem 9728 BLAKE2B 506354634ab0390b7805e31ee1982309a903000b69a20992cfa53196da8e685b4ea1c89df7ed96ddd4fc5c8a8974d23dc48625d3e93ebbc09121b32e0ab7216e SHA512 4ee9a3340a5bbe1a0250b469c1210663ff226a1884d13729e169d2c04ef57c615bef117a641d6ac3b29b5d72147009149c291e1f7ad8c4c8028ad3e6fb44c56c
+EBUILD whole_history_rating-0.1.2-r1.ebuild 485 BLAKE2B 78dfb6fa01b34625b51383a3554a2674f6955328ac37100968660b7971bc51da2783a12923916dbbf6ff15fc4dc646cebbb63eb00a2a34aa6b2454521330ae54 SHA512 9bf22c6960f631a5096240d3c8010e884d9e20a63dbde964c0f3f8e8f223c54b2da94af624830a88c6b5e8549cdb78c815ef1f370c2316385f4ad8744844d93f
+EBUILD whole_history_rating-0.1.2.ebuild 635 BLAKE2B ae6ce4c361672ca9534a3c502f60b429be2a221be9f9f61a4ca5646e7885b5c72cbe0044c52dbe421801d861f9a3736ef9f6d0d851f038445fd4347385019d89 SHA512 d1e37b9531e545038d28b6d1e929eb66de49da5d526347088e4ad74b5f70916da8292c335a9ab154c4a34ed718d37492b353df1c1ef0ebd9e2d6a76356f64a8a
+MISC metadata.xml 914 BLAKE2B 68d087fab3e07ad73034704c9c7907ce67a34fe7ed22beb9c4bf0138b22c799aa97becaacc6d331fcff7a8c0a7b496edbffbd8650051a9604fa5e845bedb492c SHA512 adc3664334965a599fbf0b0ee8b8dbadfce12d2c38d0f94acdd924e1feca5ed549458be20aaabef79436f92ae772d2b40e25f559319ba9a632c2a77fc740dfc5
diff --git a/dev-ruby/whole_history_rating/metadata.xml b/dev-ruby/whole_history_rating/metadata.xml
new file mode 100644
index 000000000000..b39a11c910de
--- /dev/null
+++ b/dev-ruby/whole_history_rating/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>lssndrbarbieri@gmail.com</email>
+    <name>Alessandro Barbieri</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Ruby project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">goshrine/whole_history_rating</remote-id>
+  </upstream>
+  <longdescription lang="en">This gem provides a library and executables that take as input as set of games and output a set of skill rankings for the players of those games. The algorithm is a version of Remi Coulom's Whole-History Rating modified to support handicaps, and implemented in Ruby.
+  </longdescription>
+</pkgmetadata>
diff --git a/dev-ruby/whole_history_rating/whole_history_rating-0.1.2-r1.ebuild b/dev-ruby/whole_history_rating/whole_history_rating-0.1.2-r1.ebuild
new file mode 100644
index 000000000000..76062cedbcc9
--- /dev/null
+++ b/dev-ruby/whole_history_rating/whole_history_rating-0.1.2-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_TASK_TEST="test_units"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A pure ruby implementation of Remi Coulom's Whole-History Rating algorithm"
+HOMEPAGE="https://github.com/goshrine/${PN}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/test-unit:2
+	)
+"
diff --git a/dev-ruby/whole_history_rating/whole_history_rating-0.1.2.ebuild b/dev-ruby/whole_history_rating/whole_history_rating-0.1.2.ebuild
new file mode 100644
index 000000000000..a9746bb09ab3
--- /dev/null
+++ b/dev-ruby/whole_history_rating/whole_history_rating-0.1.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby24 ruby25 ruby26"
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A pure ruby implementation of Remi Coulom's Whole-History Rating algorithm"
+HOMEPAGE="https://github.com/goshrine/${PN}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/test-unit:2
+	)
+"
+
+all_ruby_prepare (){
+	sed -i 's/git ls-files/ls -1/g' "${RUBY_FAKEGEM_GEMSPEC}" || die
+	default
+}
diff --git a/dev-ruby/will_paginate/Manifest b/dev-ruby/will_paginate/Manifest
index d6ed59998144..8720a414a6dc 100644
--- a/dev-ruby/will_paginate/Manifest
+++ b/dev-ruby/will_paginate/Manifest
@@ -1,9 +1,7 @@
-DIST will_paginate-3.1.6.gem 36864 BLAKE2B c6babf7125c20d7ed646930b7df39db864d0d46fd89d743daab73ba35254650ec0b4c7e203c5d5a2b00439d928b95508c1a82107db142f8cd77d27a14be00e7f SHA512 50e0fed5a3ea6a62f8620db3d30046a7a4cc602d9d7936a265d0c20a50eb267ecebb2c7d3bb07f3a514f70e556dad78085971bb80f94e1f4baf7048d6fd34c11
-DIST will_paginate-3.1.7.gem 36864 BLAKE2B d003952c78f3447a21c332c2dd6e878cd5c24486e7697e0abe6d70db5e0c56858a0d03fa76a4c18dcf10e121b706cd80812d9f438360eb931430244a0e31ee11 SHA512 2741fb24482a6b55322e6ae83fc1d269074be39014e1b0e719025c86d20edf82b6b551cfb1264381b28dec240a0b5b10e9f41e3b081dd5aca94767cd98ce7376
 DIST will_paginate-3.1.8.gem 36864 BLAKE2B e9089ea72fb12f7010d95c1f3233f66e3189dabf41a2c9bc3a624cf43a6423711c8150a423b8c6f85af390b107d945aa659d30df4e71e00cae8e7d973e423479 SHA512 51e5fe45b14451b7fd8014a5fddd3a9c049e2ec52d2f6e0ec25019b0680a32fe157f8ffa48449d07df880d0255b2aff59ba24a82398659ae4520c25aec6d99aa
 DIST will_paginate-3.2.0.gem 37888 BLAKE2B d53bba1576d1f8cffbbeb24138d1e776f35c717fa6354c059dc73d5c1accbf11a53d04137d56050239d7e4b86f490cc42cd9d2aebae7f618b31b5dcbaa6a8eba SHA512 461e8c186bae8a94295c04839e71d2a8449ce5bd8e28f5cf23964b22e64cbd10b15d7d88f379c26dbce4ff980e91ac35e1f839cd26f377ada152db254740c4d1
-EBUILD will_paginate-3.1.6.ebuild 617 BLAKE2B e2a2e320967a85f4897a173278089ac573ab644b25fbe200e5950eaf7bdef0f8aec4d0fa29f27cd2fc9dfec2f6f07bbf0084dafd1b50ce1b5373297b279749dd SHA512 4f503381427a42251b7739e9a18ffb05b1952140b6b7818ece0bd3a93f1ed2db8d1a464c5816a22ebc62ee63dcc0f980c4717fc516cb20197c1c3ce2cf196f91
-EBUILD will_paginate-3.1.7.ebuild 621 BLAKE2B e03af2f6f9f20beaf192cb3e4ac657dd16b3d1db6a020ee66623fbd2024183a9d4160e20914a0af4f5ea4729911871c817dfa676bed354f791e451581206afc5 SHA512 f0956b5093ae5ea621bbe7229af6966fd1985e1bf62188f6da0d8895ad889eff9a4bb2a1932fed368cb4336bbe96536dc08487d90799d98ca6f96be84001a6e4
+DIST will_paginate-3.2.1.gem 37888 BLAKE2B 94737d52b755d51ba52310a131409ebb4eb4d68cfafd45e931460bf0584158ac4774e7a9d1a93f41bc512b306687b45572ef90bf80302ad21ea2012486f94f5b SHA512 8b98a52d95f1f4eb253900103ef6664070e04c1f5144bd97ac66762b11a2098637a0233e1390ed80620dd16565154f6a43995c5e32028f88f2de6cb7af01c714
 EBUILD will_paginate-3.1.8.ebuild 589 BLAKE2B c9975f4c3b48365eeb06219e8e861dcb893767dbfdc1179c6af92f1583966bab12d94cf8d41c33afb74b8a969f9321065ede1344f8b1bccded29446d32908c2b SHA512 fe67fd007896a11245bed0167a26e5e4e516603b4360dbe81ebfce5d5e2678724951c1dcda2a99954f8cd86dce612948391d4e575400ec5ea672c10e78e85117
 EBUILD will_paginate-3.2.0.ebuild 589 BLAKE2B c9975f4c3b48365eeb06219e8e861dcb893767dbfdc1179c6af92f1583966bab12d94cf8d41c33afb74b8a969f9321065ede1344f8b1bccded29446d32908c2b SHA512 fe67fd007896a11245bed0167a26e5e4e516603b4360dbe81ebfce5d5e2678724951c1dcda2a99954f8cd86dce612948391d4e575400ec5ea672c10e78e85117
+EBUILD will_paginate-3.2.1.ebuild 589 BLAKE2B c9975f4c3b48365eeb06219e8e861dcb893767dbfdc1179c6af92f1583966bab12d94cf8d41c33afb74b8a969f9321065ede1344f8b1bccded29446d32908c2b SHA512 fe67fd007896a11245bed0167a26e5e4e516603b4360dbe81ebfce5d5e2678724951c1dcda2a99954f8cd86dce612948391d4e575400ec5ea672c10e78e85117
 MISC metadata.xml 346 BLAKE2B 859514393fc9d9ac988a812dbb5fc126a269616351c6d8fc32c6ec0f25d685c835f4c1d27ce818807bb330fdc50839b81e6f63d0eb4d77d8f6a95f2da3d849af SHA512 2e061bf277b39327fb84988df2dd9cf548c87dc0bdc51e63b47aeb816c099a4a7fa5b95fc1f3ba35e15c7499d897770397c6f6f2f4d3c1b03733f16f1d0556d3
diff --git a/dev-ruby/will_paginate/will_paginate-3.1.6.ebuild b/dev-ruby/will_paginate/will_paginate-3.1.6.ebuild
deleted file mode 100644
index 4d75f1b64d29..000000000000
--- a/dev-ruby/will_paginate/will_paginate-3.1.6.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Most awesome pagination solution for Ruby"
-HOMEPAGE="https://github.com/mislav/will_paginate/"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~amd64 ~x86-macos"
-IUSE=""
-
-all_ruby_prepare() {
-	# Remove tests for unpackaged ORMs
-	rm -f spec/finders/{sequel,mongoid,data_mapper}* || die
-}
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/rails
-		dev-ruby/mocha
-	)"
diff --git a/dev-ruby/will_paginate/will_paginate-3.1.7.ebuild b/dev-ruby/will_paginate/will_paginate-3.2.1.ebuild
index 474b9d8d398b..3c47cb11bdea 100644
--- a/dev-ruby/will_paginate/will_paginate-3.1.7.ebuild
+++ b/dev-ruby/will_paginate/will_paginate-3.2.1.ebuild
@@ -1,12 +1,11 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 
-RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="README.md"
 
 inherit ruby-fakegem
diff --git a/dev-ruby/wisper/Manifest b/dev-ruby/wisper/Manifest
index 1658f311a4b0..b52fb43b79b4 100644
--- a/dev-ruby/wisper/Manifest
+++ b/dev-ruby/wisper/Manifest
@@ -1,3 +1,5 @@
 DIST wisper-2.0.0.gem 21504 BLAKE2B 6a15adcc4424810ebaeab3bc77a1508df52fb96817edb4e04a620196eeef0e4ff773dcb384e11be93effc13773a642db96f83d93651bac97f137d70985514123 SHA512 0c932f799ea1bb4c9d11ebee72a36d5b2c6c3547ab50d44dcab3e666b00b6e2068bec76d3417d2e7f62cb33c7450aafabcfd2b823b4080946a2fc1731240b521
+DIST wisper-2.0.1.gem 26112 BLAKE2B 3dc78cecb80e052ec8bc308d02e5093ca55fc7d26a1dd98614907707d62d15e0cea1a20c7843ca7e6ee175800d320c3ef5854396505aaf0648161153b0e61368 SHA512 3518c218c0cb4ceb5d96260f7ac8845fb2f35d4a77c478cb56f1251fc29910a655ce070ebf3c17eaffd7d144ac54b436420bd2b2c4f72a8743f68dfdd72a514c
 EBUILD wisper-2.0.0.ebuild 532 BLAKE2B b3015442809f389eee3438af58e26ac2d909e3fa1b6e93ddbc339ec07713b9d96fe222b836cfa464eceda9b7b727bdde0faae7dc0a5cb6e1bcb25be3ce0e6cb7 SHA512 ac86363b09d63254d8169af00c7c131390761ee9ac318b849f0bd07070e7f4513825851b58417387532f23cef3555485eccd16d19aee93c77b579f05fb6f2a68
+EBUILD wisper-2.0.1.ebuild 526 BLAKE2B 841437ee2d159eeb30ab607bcbfe3d7c57d27906f231b150b15902de48d28be4c1c45d8cc167fb9de70e044642b8a83c1bea4270e064b4cfe9b3f08823261e77 SHA512 842d60c5a02e28945ea20ccece6130e44f7771a88e8ffd968737735576eee453a54d12365cf6df0f4b21f744a10e0229f6dda9ce75fd8bdaaa6638645b648c70
 MISC metadata.xml 332 BLAKE2B f42ad841724cfbd3fa650dbfa45831f50dab12619c2716d2cd6eabe43ccde962492628ea63a50697272b29c934973446557774bc49aaf51ff2b9f08fb99e6fef SHA512 9e7fc2a76a6981300d5a48e70ea9b563e221b022b27423088c2a1972a924c9361e47fb45c7dcd1203b456f9f09adce40dad17d9a9dbb5659e07f07b54b0d149d
diff --git a/dev-ruby/wisper/wisper-2.0.1.ebuild b/dev-ruby/wisper/wisper-2.0.1.ebuild
new file mode 100644
index 000000000000..5231ea77d3e4
--- /dev/null
+++ b/dev-ruby/wisper/wisper-2.0.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="A micro library providing objects with Publish-Subscribe capabilities"
+HOMEPAGE="https://github.com/krisleech/wisper"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e '/coverall/I s:^:#:' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/yajl-ruby/Manifest b/dev-ruby/yajl-ruby/Manifest
index c0462f9c320e..27f8645eb6c0 100644
--- a/dev-ruby/yajl-ruby/Manifest
+++ b/dev-ruby/yajl-ruby/Manifest
@@ -1,7 +1,5 @@
 DIST yajl-ruby-1.3.1.gem 550912 BLAKE2B 809608b5c767c560cf40a0a8d4160f17092762788af9c66e729762ade50fbb0cccd266f1bbd411076ef4b2dc7a4cdfcdeeb552b6d86a58a0d9a38ebf1bad638c SHA512 f18b47f1fd0b039bfec01db0ee298296199fbf91b22a00042e1220a1d8471f72424c082b696829e48ce7dee7514510dd731c2bc36fe29bd08ba7246c820621f4
-DIST yajl-ruby-1.4.0.gem 556544 BLAKE2B 8eea447ef98cdd9b48fe6c91f2a385740339e78e6395b2f63add8757fe437dfd4ae721b604ca5b381c59e36412e1807c930730bcc1a7c7f921c50ccd7f03857b SHA512 63407542a58231305d1cf326de09e8fdb0f4f5bbf28d3b83a3d8f4099db2a425b7a310fc23c62a37681cb24b50d2ce9d10a6641e07be16b52783ea7401ec7ca5
 DIST yajl-ruby-1.4.1.gem 557056 BLAKE2B ade1c18bff1d95a733a1981f7898f1ebaecaed6e9a0354af2a6b4d0190a37e613830f77d5e57178b622c32e2d8688aaa11a7edd543c17a30a16f9045d21ea4aa SHA512 24cd82380658d784bbf0a7a16d4048125cc5a856b0e0b4d3bdec29a550a9131d3959f9a75eba0d18d5db8d0a23158fb7ef6ea6f60d221a7bc3d8efc437d52df5
 EBUILD yajl-ruby-1.3.1.ebuild 1240 BLAKE2B 895860e667c57b0e086c48a4fdf74bc004c047f5a5209128fcadd396b5f7aa481e3d9e8d3a1c7c334774410e75b8444984af491bc58c351cdcc8570d929845fd SHA512 0f2bc6015d8d39814e79e5989dd4d0ec6e3bcaf90deee71a9ad0f94fa75b09044aefeb24defd602a165f54bb000711b34bc81643b3e9fc6edc18b9ef963244d9
-EBUILD yajl-ruby-1.4.0.ebuild 1245 BLAKE2B ac83fd8aca048d9e5332c6515f6b4fbf582d943e92b22301bc5fe923c3f5ef28b002ce2b53f96920c274306bdf9421f2603a3b0eac922cb0eb694aed0142fa3e SHA512 732f25fda113b9f03ced7bda85df9fa276328d312520c191a87f04fb8701ee2520996a581b31b561c1b97291d47df4b40c37a3441d5667359391f51c1156e977
 EBUILD yajl-ruby-1.4.1.ebuild 1249 BLAKE2B a955cef39c2015248bd8faac951b3ba3b08b9d83054b4666cd619bcc79560ae14e93e73dfc03d9ba85387b54e8dd7b318d12ffb8ff4f874c21cbb274dbc1245c SHA512 dcf41a0f0edf40be1abba630b53bd75ed2e297771a0cd66df86c7f76d83e459ed2744f17347784074df4ac21cac4bc9ed7fb1d711f95d767cfecf7a2a251d6ee
 MISC metadata.xml 346 BLAKE2B 2fff8cc633fbc47874a3e5a9e567ef430dcdd4de90343c35f599b15a85e0601a5d4b3c5b650e3971dab90cd90f382505000b40092e57d05fdaf86536a02106ff SHA512 54921a3e3df293d819d020aa6671e7e33f9031b83d375d6f8423fd844cf757c20c2e6cafc9d5a8f2670e10bd286b4e29067a8d7176e7acafd3474578134a2aae
diff --git a/dev-ruby/yajl-ruby/yajl-ruby-1.4.0.ebuild b/dev-ruby/yajl-ruby/yajl-ruby-1.4.0.ebuild
deleted file mode 100644
index a0212b69b6e2..000000000000
--- a/dev-ruby/yajl-ruby/yajl-ruby-1.4.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="Ruby C bindings to the Yajl JSON stream-based parser library"
-HOMEPAGE="https://github.com/brianmario/yajl-ruby"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="${RDEPEND} dev-libs/yajl"
-DEPEND="${DEPEND} dev-libs/yajl"
-
-each_ruby_prepare() {
-	# Make sure the right ruby interpreter is used
-	sed -e '/capture/ s:ruby:'${RUBY}':' -i spec/parsing/large_number_spec.rb || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/yajl extconf.rb || die "extconf.rb failed"
-}
-
-each_ruby_compile() {
-	emake -Cext/yajl CFLAGS="${CFLAGS} -fPIC" archflag="${LDFLAGS}" V=1
-	cp ext/yajl/yajl$(get_modname) lib/yajl/ || die
-}
-
-each_ruby_test() {
-	# Set RUBYLIB to pass search path on to additional interpreters that
-	# are started.
-	RUBYLIB=lib RSPEC_VERSION=3 ruby-ng_rspec || die
-}
diff --git a/dev-ruby/zeitwerk/Manifest b/dev-ruby/zeitwerk/Manifest
index e09ce3413a85..a1eff4a6bd91 100644
--- a/dev-ruby/zeitwerk/Manifest
+++ b/dev-ruby/zeitwerk/Manifest
@@ -3,9 +3,11 @@ DIST zeitwerk-2.1.10.tar.gz 92514 BLAKE2B 509cdaeecb8d7d369282a5fc9e8632a19eb203
 DIST zeitwerk-2.1.8.tar.gz 90774 BLAKE2B b42c56937b5f9709ce05125ab9358012f4132a49f23a3a56f464aed0c20ba7582e77e7d6cb65d2607d75eed089140827efcec14a2ffe8dd1adb3ead3c10fc882 SHA512 14db7e467b45536cb796f7dae4ca96e8167be023a562cc723843b1a63586ec6678ed23cb3307c3389ce5dba099c70dbdd257d23f5ce649af676aea795fa36243
 DIST zeitwerk-2.1.9.tar.gz 92046 BLAKE2B e4b48c9de3ee575d6b82427211e129478c9839d5716472896f2d6056ba42b7aaf861e644f92329af5034d92092bf02789f04cf6e5d6390151601eb138d7dfa58 SHA512 15de54c5e5b4042e99109707240627aaf5b76f4bf21a1a94d1230c1973404fdeecdc5f64ab16f75158608f64865ff8cc55f4841091c76e2731cc274b0109f677
 DIST zeitwerk-2.2.0.tar.gz 94494 BLAKE2B 7000628d230c6f65ced2202a924afdbed9092e4f9520cb49f41323c36ace441e1e4e37aa914fed9ff25498f246ef09dff835540624ce4eeacfe26e6c37106d1c SHA512 cebe2f3169cd7a3a3a477f24eaa81048fd5988d7e846bf95bfe6e06da54ade0cf22808319defa1b7a9603550f2a4c075cc5284cf7b53b1899555c3cb5d756e05
+DIST zeitwerk-2.2.1.tar.gz 94726 BLAKE2B 6fb5fe08cc6a3845598ee70bcce5a6546b7fea8de547dc821c337ef3bd02983061edffb0d2ce1e1ab446b38ff282dc042a26532cff7604a9cdb9922d333deee4 SHA512 984740b981448edc539db06b268e16256ef4302f0d8d56b31c69a8f0324ded8eb1d77c3720b9e2e49723e4e0b4b5e4db538ecf5f24690930d336d7b0f0d246bc
 EBUILD zeitwerk-1.4.3.ebuild 830 BLAKE2B 7b8d3fa7f20752b2e0caf92e9e63ed1f50ad4e759092d20da1e9d1f4cb8389fba1160b533e21d0b46773152224e2cf69e54488357918353c1fc4bfad6843ba74 SHA512 98529f550a67c791df72a0126a9aaf10d11f1ea427540b4551fa02ad0b4a4ff11c6de51fc25b3d95037cda90896528fcce2634960d931a22f48d0e0481be5004
 EBUILD zeitwerk-2.1.10.ebuild 816 BLAKE2B 66a91d074816711244f25522ab745616b7ce44b272dd8adc030e683f91662a7b17237ca762530175489c051bc2b07bb6fe0a4741f01a890170f3e781be143cf7 SHA512 5d5c23cbf1dd72c7cc83ff2f52cf9e391cf5e595ef31df22bf2675c69a26421ec2b41f753157eb13a8ec50bb5d3fbc040b6a44f9d1732a14fa924b09c16e4536
 EBUILD zeitwerk-2.1.8.ebuild 830 BLAKE2B ba7c5aace8be32a1d330a19c4e0b4458d0f3cdda769e89f8b290f76ed1f57bc2c962ab97012307572525a6ebe6b330dee772eef745264bef7e9a4ecb805e234b SHA512 9ab9e0f901b70ee27dc3a0af1cb70f0ac3160fae9bbbae76f82e928ba84c35c4901679ad685cbc753860152eed33207285f740bcf35a1483bd58e222aa185527
-EBUILD zeitwerk-2.1.9.ebuild 847 BLAKE2B 4e60b6737d2848bcb6f742b083ac1d8f3c3fa194dc99d03dd4274d12105936f5c1f2715966f9d4a44e163ab507ecf31856e0e8a741d2a0184d5cfa2031e40eea SHA512 af16080e377cbfc26b3de7422071ac3e41c9d680af4188a7391a2266cc95643a4ddaa7849103423d2c04861fc7c67e6c5c52d7a961d0b27365623ba437f8c156
+EBUILD zeitwerk-2.1.9.ebuild 853 BLAKE2B 52c5d2b4b058c367a345b40e67aef34fb1ec009ee42e6a00eb6bb59efdd7748d0a2abe881a63054b381ea010ae0a25eb25a3286cce49597c2b23d5bb025947de SHA512 2c494fe134d3ea26c8c7b31b2e6e2acde83dbc8b9e3ab341eed31b30721fde3e7f92aab7324b3b902f24c4403598d5d098aa96c1c1ec5e55834d528c5af87d7a
 EBUILD zeitwerk-2.2.0.ebuild 816 BLAKE2B 66a91d074816711244f25522ab745616b7ce44b272dd8adc030e683f91662a7b17237ca762530175489c051bc2b07bb6fe0a4741f01a890170f3e781be143cf7 SHA512 5d5c23cbf1dd72c7cc83ff2f52cf9e391cf5e595ef31df22bf2675c69a26421ec2b41f753157eb13a8ec50bb5d3fbc040b6a44f9d1732a14fa924b09c16e4536
+EBUILD zeitwerk-2.2.1.ebuild 822 BLAKE2B 4b3a91b8fb5f0771af9557695c313731a335a178596a97dd16e7896ddb10166c5b9ca2487a528c0129f3bbfe35ab207cd36e8c7dbe4e231696e1e65e0cbac534 SHA512 778203e1e05136e0f93d2d8c8145c25372ccdb366847fd92a9b6555dfb63051c9dba7ab90b3a52ceed796137d79552debafe4a4351431692c51dffa17d3dd885
 MISC metadata.xml 640 BLAKE2B cdf101dca54d96dc5ce6713aecadb42050e945341cb19ff14088a258384259e5dc4d1668e2a8b161d787d21f79cd8a7c8cbdb47c10997e6ecc3b2ce7ec41497c SHA512 50b6eacea9ea202e3ff44b18046b5db26c5d4ed381664af46f9fecfdedcd69cb470fcc35010a747a21dbaebe1a8360b2f37d43aa22fbba31666704cdd9f39a48
diff --git a/dev-ruby/zeitwerk/zeitwerk-2.1.9.ebuild b/dev-ruby/zeitwerk/zeitwerk-2.1.9.ebuild
index ecf037dcde6a..e497cb065b31 100644
--- a/dev-ruby/zeitwerk/zeitwerk-2.1.9.ebuild
+++ b/dev-ruby/zeitwerk/zeitwerk-2.1.9.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/fxn/zeitwerk/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/zeitwerk/zeitwerk-2.2.1.ebuild b/dev-ruby/zeitwerk/zeitwerk-2.2.1.ebuild
new file mode 100644
index 000000000000..8a64078e7f5e
--- /dev/null
+++ b/dev-ruby/zeitwerk/zeitwerk-2.2.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Efficient and thread-safe code loader for Ruby"
+HOMEPAGE="https://github.com/fxn/zeitwerk"
+SRC_URI="https://github.com/fxn/zeitwerk/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
+IUSE=""
+
+all_ruby_prepare() {
+	rm -f Gemfile.lock || die
+	sed -i -e '/\(focus\|reporters\|Reporters\)/ s:^:#:' Gemfile test/test_helper.rb || die
+
+	sed -i -e 's:require_relative "lib:require "./lib:' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	${RUBY} -S bundle exec rake test || die
+}
diff --git a/dev-ruby/zentest/Manifest b/dev-ruby/zentest/Manifest
index fc48b17e3809..b8a963f84e94 100644
--- a/dev-ruby/zentest/Manifest
+++ b/dev-ruby/zentest/Manifest
@@ -1,7 +1,5 @@
 DIST ZenTest-4.11.1.gem 71680 BLAKE2B 27bd94ca98a6739829526c06689ee5a890aa254bef3cb7b7b02d79d82a4fa96faa1853d36069aa801983b4927d44b2af2c852c111ece3b64459c99d63a7a072d SHA512 6f3b5dfb8cc8154856e94f20134e9a6bd2d54e052d05d3e7a250f831ee0a3d3196b497cf118322c51201fb8dd30a05b8a0a0462c58a8852354c4dee2a10d867b
-DIST ZenTest-4.11.2.gem 71680 BLAKE2B a5d608bb789d1f0932bf823166fe6ddef7565e7f6c68fdcec1be47dbffd2e026fdf20ba8be64bee46e932a6542e3d45cc6fe7cccfb0257020f9ace7d59767960 SHA512 6596d49fe3f3a05db69fe81ff0825b3158a30a54c63e2794e0c09a4abb51b60fc612765dd811a9ad99db0390904ca59f4afd4fe780dfaeddb3cb6623184228e8
 DIST ZenTest-4.12.0.gem 48128 BLAKE2B 32d2d5cdd95b8355b31ce81957cad823c1d5209f0c24cbdf920fe1276d952df4995484af7e576e498273c01fbfb70eb5ed99271405977820f68cd8feac08d388 SHA512 cbce7059ed48fba1a265c9a4360d032492cbc3a67131480e11bc06c1cc7fadcd82139231f16c5ff4fd2a9b771a574f834a71eae21392ee5fdbf335366748150c
 EBUILD zentest-4.11.1.ebuild 792 BLAKE2B 192c580b315cadc23411ccb064ee4e3d522f0bb5eb49a0294a355c04ada9c1d829917249f227dabcff32101cb296720fa225061c5cf8e3cb45d02d45f3144267 SHA512 a60adc30cd389db58f195f451878220bb4993d01eba57daabd9d93a26d8fbd9426a81bb555c69e97fc9ae5463e760084755a6cfd26cd0f7462093488c4836e50
-EBUILD zentest-4.11.2.ebuild 844 BLAKE2B 0da181b7207f514cfe1387d10d599e70a26136ca93e681bcbbb1e19047b617dae01453ced63d838855e77b83c75b9a42f3a401fa60e4fe6a08e7cf4832f05102 SHA512 2f06615602f865b1943e5bd45c27b33e85a42f48a3c2a086f26ada3fd15c3157d0538efdf4c578aeb58f133be4aca038fdacd92b577afa72376c2766bc184927
 EBUILD zentest-4.12.0.ebuild 813 BLAKE2B 95f594ee4b5dc67726a2ccea3b3b49a0f819047cbacdf0e1234cbe48f774c8601f1756323e0db4f053aadf8f768b58231c1537a852a94a598e1fea7b884d36f7 SHA512 e867abd7e01bceb6892b2eec89c5a173ea0fa6aecc7cc7ca5c197d086bc2197e055a8b08aa8d0604555d3d9c2da4bd8a2e1f0df52d360d4d9e6cf3e8298b2bb3
 MISC metadata.xml 333 BLAKE2B cf1ac3fbb6994dc96110bdb974b726f53fdfe34db473f272ba78ede47b65e26350b807bf291c65f8a8bcf9e12fc3366e431ca32a277d9ac38cf9d4ed7ea46e62 SHA512 d02fdcc6c8ef63d22d0df77a6c7c82ac1d629d29685e6fc653c70079d56fb1b28574bfc7c372a5298dd4a3e20061aecc705d6824c569ce0f99e3dea464f04fcb
diff --git a/dev-ruby/zentest/zentest-4.11.2.ebuild b/dev-ruby/zentest/zentest-4.11.2.ebuild
deleted file mode 100644
index 5691149a3ef3..000000000000
--- a/dev-ruby/zentest/zentest-4.11.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_NAME=ZenTest
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.txt History.txt example.txt example1.rb example2.rb example_dot_autotest.rb"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Testing tools: zentest, unit_diff, autotest, multiruby, and Test::Rails"
-HOMEPAGE="https://github.com/seattlerb/zentest"
-LICENSE="Ruby"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE=""
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/minitest:5
-	)"
-
-each_ruby_test() {
-	${RUBY} -Ilib:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
-}
author	V3n3RiX <venerix@redcorelinux.org>	2019-11-03 16:06:58 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-11-03 16:06:58 +0000
commit	bd4aeefe33e63f613512604e47bfca7b2187697d (patch)
tree	adb35b5a9a00ee7ea591ab0c987f70167c23b597 /dev-ruby
parent	48ece6662cbd443015f5a57ae6d8cbdbd69ef37c (diff)