Revert "gentoo resync : 24.03.2019"

This reverts commit aa3411e241a201d53a2689766fe419f2756819f3.

33 files changed, 99 insertions, 380 deletions

diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index cd6ac5073e9f..b24219555808 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/bcat/Manifest b/dev-ruby/bcat/Manifest
index bd0eb68f414a..b24e42f14309 100644
--- a/dev-ruby/bcat/Manifest
+++ b/dev-ruby/bcat/Manifest
@@ -1,3 +1,3 @@
 DIST bcat-0.6.2.gem 22016 BLAKE2B abfaec6d9db25990838019d0e9f4dde918f260c01340e34ab272f8a2e02155674ca38bf91843925df31102982cba02ada69abbf7e9ec4b91d4f2cb87b27be339 SHA512 142f853ca0931e5ba300276b1db0977fa275b9b13602940fbaca2c5d32ff881fe753dee25632526a348d71cf71eb6e390aed821b4ba1f48e380d6369ad87ead7
-EBUILD bcat-0.6.2-r3.ebuild 1157 BLAKE2B 90fea9be460d8857b928ea2ef4b6ea8f7e4f00090a77cbddfe5a6352eccf83111f3c7a92f1d3fd1ae21c18cd2836e92c57721edff48a37b68807aa3e71aba2a2 SHA512 093b05ca1d59af94593d315f03f8018ecec113743709d3139f4a477b47ab259183862554800220b33ebc75042f3dbdcc5adc4cfe0c969075e5608922aef9a4b9
+EBUILD bcat-0.6.2-r3.ebuild 1152 BLAKE2B d88ca98345e6f5c4ff9c4468be8b73fcf6379478639972335b6d783df3281da60fcd19d2b9985eb57ecefa6e5668191d45f20a4702ac4249d4bb48e4fe148efe SHA512 544a32fb0d121c5285d92360f7b4a35cc31eadaa0772155d623c6392e0a71d5b6f445708d3ff6f3ccd4e2e82d07975437603ab8faeb2fb857c8696623ecc0dfa
 MISC metadata.xml 339 BLAKE2B 747035022afc3a66f3a64ab7614290ebff948570e77f0a184eee2cdf20f838e92a6608569714b0c3672660019b1e6002ee65afa3d88e5fc497e147c59cdd2f37 SHA512 e128341196b2b542a7d3a7cdbe576e667ec176b3e231a627cedafbaadac4ede41fd6710722ca880551cf9635e9a8768cf273a6784b276647cf4db250404521dc
diff --git a/dev-ruby/bcat/bcat-0.6.2-r3.ebuild b/dev-ruby/bcat/bcat-0.6.2-r3.ebuild
index a32c487eb612..625c6c8e32d9 100644
--- a/dev-ruby/bcat/bcat-0.6.2-r3.ebuild
+++ b/dev-ruby/bcat/bcat-0.6.2-r3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/rtomayko/bcat"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 s390 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE=""
 
 # Collides on /usr/bin/bcat, bug 418301
diff --git a/dev-ruby/c21e/Manifest b/dev-ruby/c21e/Manifest
index ca1979b88df5..a7bdc5ee907a 100644
--- a/dev-ruby/c21e/Manifest
+++ b/dev-ruby/c21e/Manifest
@@ -1,5 +1,3 @@
 DIST c21e-1.1.8.gem 6656 BLAKE2B 2a2f237e975b4150b891e957d9b209c7d587f8e2994ac4e28162ca7d6a94b83d0841b753ef43870a2808a00f37c227910dda8dd2ae48379e9b63bfdafb266ccb SHA512 4903c8fb5aebf2c7d4771e5f0227ff30d873579439ebcef6235be6716f285d6c40d75b0e07634dd161b493690713121e18c12daff40e113cd8d525d6a7af2273
-DIST c21e-1.1.9.gem 6656 BLAKE2B dc1ee96fddbb0f201f53ad58d22665e5e35f62098daf6ffafc7f12eb75d48703c0e02cb91ceb8a4b84d3357f0fa81d2bbc0207917ccb9c7638e449c72a059411 SHA512 47b578b7e916c2bb6ed4462bf766a5506e622db96f8e7f14833ede6255d695e75d03d38d0ebf02350c92eebd90ad3993eacc7c0ecc9205a56b9c01f690ceacea
 EBUILD c21e-1.1.8.ebuild 440 BLAKE2B a32102bba94aba5e8babc93680b6926a7a7eceb9c4f90a272aadaa335de2f861dd9721eabfaf275e04fe319142fc8d62ed8378ee770411edd3cbe9e477ca9b49 SHA512 43369efa3707ca2f6fc56a8a292399600e88d19994d1a231a39450b91c1326abf5ff7b1fa01bc06e5fc49b1602778869fdc0fef7520d82c4c00bd6e45f75735b
-EBUILD c21e-1.1.9.ebuild 440 BLAKE2B a32102bba94aba5e8babc93680b6926a7a7eceb9c4f90a272aadaa335de2f861dd9721eabfaf275e04fe319142fc8d62ed8378ee770411edd3cbe9e477ca9b49 SHA512 43369efa3707ca2f6fc56a8a292399600e88d19994d1a231a39450b91c1326abf5ff7b1fa01bc06e5fc49b1602778869fdc0fef7520d82c4c00bd6e45f75735b
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/c21e/c21e-1.1.9.ebuild b/dev-ruby/c21e/c21e-1.1.9.ebuild
deleted file mode 100644
index ef0001aa5c6e..000000000000
--- a/dev-ruby/c21e/c21e-1.1.9.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="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Run cross-platform executables"
-HOMEPAGE="https://github.com/cucumber/cucumber/blob/master/c21e/ruby"
-
-LICENSE="MIT"
-SLOT="1"
-KEYWORDS="~amd64"
-IUSE=""
diff --git a/dev-ruby/capybara/Manifest b/dev-ruby/capybara/Manifest
index fabd5ccd5b8d..144ab2f295ca 100644
--- a/dev-ruby/capybara/Manifest
+++ b/dev-ruby/capybara/Manifest
@@ -3,13 +3,11 @@ DIST capybara-3.11.1.gem 310784 BLAKE2B ed2c26d0340b0c0ea0fd008436ce29a38d650bf1
 DIST capybara-3.12.0.gem 313344 BLAKE2B 7efac262e6bfee18a44b0a399bee0671e98c9d08e999e9c9cba5a325ed2e9da25e873d789a01d9e066a04aeab0ea3a6a35207e7d0ab05f63eca8331d93acbee8 SHA512 a0bc868fb69343c9b037fc7bfbc998662720a212821cb78a02d6dee29d841d1fc4781c6e5e6fe1d4a356ae495ea56dc356ec734b26005215a55ca1eb8a7e2789
 DIST capybara-3.13.2.gem 320512 BLAKE2B f6586c9e38ace599b8214b71e6516c2d7b236777d1cf2beba01d276e624cb1a49b2dc3c7fb74ef13d5bf666aeed2110fc4e7991ef960c7dd9af1430d9b6333db SHA512 e3d2f81934d75b6a54a80b913be411b617074412ccf15897454568dc9c35557a4825b6c7ac67b6f808dd199123c164c83af8bcc9edd61c2a02bc65723668774f
 DIST capybara-3.14.0.gem 323072 BLAKE2B cfcc97d2e8275ec2ce4bd991038e47ee65dc8397932fea695c9806d6641f7c9fed1e9c346da3e6cf612a6c0e2476e54a330fcf6fbff475850f2d0e81a428b51c SHA512 8a01738530263155e671a7646731c666a4287ca8d143cf474d0f248aa862affb03f9a4bba31c3ffd6092d9f9edb21147105a1a53fbd45751cd49f133cdfd91c2
-DIST capybara-3.15.0.gem 328192 BLAKE2B a70e77447c7fc2a52ec2f49377dffed167e6da21dfe3815122dcd2467c5d7022c40a320207de5d6e5bcde466d6605a0ddcf8596219519c77ff4c7e3042303476 SHA512 7d4aacfccead777f41e3acdabd642628e7e617e6c3df5078ba672c3cca5aa635b954cfc48601a5675afeeb3d4d161d70f5e0f24b413ab83c0dbde08cd2dda30b
 DIST capybara-3.2.1.gem 284672 BLAKE2B 9da8f588049fab74c4e734626e42758cdd4baf555cfc64e7456bfab2cb4d5c90ed6bfc8ada7cc0d6323ef1113169aec70fd4254aa50c003408376ea4afe00a06 SHA512 50af1d4c49c200a4c08901d19b16826499abb8d19de8e059160c509afd555edbe620b6fd5d78f8c286feeb15a72e5a4b241cb1f14151b349fd94cdd3648b64b2
 EBUILD capybara-2.18.0.ebuild 1552 BLAKE2B 7029dd19a177f4aebc1e78d83f9561ef4f3abdd41b0b8d77426e11bbaffc7865d746d4f3d3e6ed696c4414008648acc707f42e4a716681a2e331acae512ce8a6 SHA512 87dafa1f76c10eb0853eb7c8e3da36ff7c0b522b887c037ab9c3fdf12b29ec20d39a3638c4119225ab097dee44b878ed1ef0aa753d0d83f886c6d4c089a6c931
 EBUILD capybara-3.11.1.ebuild 1593 BLAKE2B 52140986b4655ba78e1cb318f8eb5f46da85d72d94144f6261df1346de9be4ed3cb5824a65c47d4e4164c06a7575de2170c1003966972b68790e56d160122cb9 SHA512 39982cb2b2724e815772f2ad266353c6e75c22e99ef50b7f2c5585082db97e2c8bd113ece5ff037eae817b57cf818cc5554030cd297fccc3a3749ac1dd47abde
 EBUILD capybara-3.12.0.ebuild 1593 BLAKE2B 52140986b4655ba78e1cb318f8eb5f46da85d72d94144f6261df1346de9be4ed3cb5824a65c47d4e4164c06a7575de2170c1003966972b68790e56d160122cb9 SHA512 39982cb2b2724e815772f2ad266353c6e75c22e99ef50b7f2c5585082db97e2c8bd113ece5ff037eae817b57cf818cc5554030cd297fccc3a3749ac1dd47abde
 EBUILD capybara-3.13.2.ebuild 1613 BLAKE2B 6f94bb6b1461694a970cd91339d286e95eab853bc5f09fde68b4219dc5aa1960582ed27c7e005eef5a8ec41aacbfb0554ac7063edb585369b48b2d3d75fe1f69 SHA512 b41da0c42d6576d5ad2650d13c1de22049e9219d37efdff3cdd5913fa6cc94eb5c80ac53389690854e2adb502a24f11187cca13059ab9551d3c8ec2c0a090850
 EBUILD capybara-3.14.0.ebuild 1613 BLAKE2B 6f94bb6b1461694a970cd91339d286e95eab853bc5f09fde68b4219dc5aa1960582ed27c7e005eef5a8ec41aacbfb0554ac7063edb585369b48b2d3d75fe1f69 SHA512 b41da0c42d6576d5ad2650d13c1de22049e9219d37efdff3cdd5913fa6cc94eb5c80ac53389690854e2adb502a24f11187cca13059ab9551d3c8ec2c0a090850
-EBUILD capybara-3.15.0.ebuild 1613 BLAKE2B 6f94bb6b1461694a970cd91339d286e95eab853bc5f09fde68b4219dc5aa1960582ed27c7e005eef5a8ec41aacbfb0554ac7063edb585369b48b2d3d75fe1f69 SHA512 b41da0c42d6576d5ad2650d13c1de22049e9219d37efdff3cdd5913fa6cc94eb5c80ac53389690854e2adb502a24f11187cca13059ab9551d3c8ec2c0a090850
 EBUILD capybara-3.2.1.ebuild 1545 BLAKE2B 51d0f8fbc35d0f628e5224460a91fff7708e8ea100c03af063eefba6c31434af10a852f85993d7648dcf76b8c3524d5fa310b755da16ad792cad4e4d20d7cdb5 SHA512 00b38a2823b5261140e0dbff705f4dba76c8ffdb8a65a162232e22e23e3683b67a0c7568bfb642c9ff47b4d81d82b19d73c0d7a5840b0a61e07c305f51c1b862
 MISC metadata.xml 343 BLAKE2B 93caed6f938d8f2c10a7106e7377812064351018521cbb63477340af9531c5c67940097580c5f7610cea03b0dde6853c9fcbe9ab8cf5daa2a49018b8888e20fc SHA512 1e526463690f3ff61390ed77cb528352bdd1c089b368c3f6ab587766d81167afe99f752b861233f755e10bf2aa6f09dde98a9dc359d51392f15b55462ba66e77
diff --git a/dev-ruby/capybara/capybara-3.15.0.ebuild b/dev-ruby/capybara/capybara-3.15.0.ebuild
deleted file mode 100644
index ac78bf082bf7..000000000000
--- a/dev-ruby/capybara/capybara-3.15.0.ebuild
+++ /dev/null
@@ -1,57 +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"
-
-RUBY_FAKEGEM_EXTRADOC="History.md README.md"
-
-# Rake tasks are not distributed in the gem.
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST=""
-
-inherit virtualx ruby-fakegem
-
-DESCRIPTION="Capybara aims to simplify the process of integration testing Rack applications"
-HOMEPAGE="https://github.com/jnicklas/capybara"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="3"
-IUSE="test"
-
-DEPEND="${DEPEND} test? ( || ( www-client/firefox www-client/firefox-bin ) )"
-
-ruby_add_bdepend "test? (
-	dev-ruby/rspec:3
-	>=dev-ruby/launchy-2.4.0
-	>=dev-ruby/selenium-webdriver-3.5:3
-	dev-ruby/sinatra:2
-	www-servers/puma
-)"
-
-ruby_add_rdepend "
-	dev-ruby/addressable
-	>=dev-ruby/mini_mime-0.1.3
-	>=dev-ruby/nokogiri-1.8:0
-	>=dev-ruby/rack-1.6.0:*
-	>=dev-ruby/rack-test-0.6.3:*
-	>=dev-ruby/regexp_parser-1.2:1
-	>=dev-ruby/xpath-3.2:3"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/d' -e '/pry/d' -e '1igem "sinatra"' -e '/statistics/Id' spec/spec_helper.rb || die
-
-	# Avoid window-manager specific tests (sizes are specific for fluxbox)
-	sed -i -e '/#maximize/,/^  end/ s:^:#:' lib/capybara/spec/session/window/window_spec.rb || die
-
-	# Avoid spec that requires unpackaged geckodriver
-	sed -i -e '/describe.*register_server/,/^  end/ s:^:#:' spec/capybara_spec.rb || die
-
-	# Avoid test dependency on puma server for now
-	sed -i -e '/should have :puma registered/,/^    end/ s:^:#:' spec/capybara_spec.rb || die
-}
-
-each_ruby_test() {
-	virtx ${RUBY} -Ilib -S rspec-3 spec || die "Tests failed."
-}
diff --git a/dev-ruby/contracts/Manifest b/dev-ruby/contracts/Manifest
index e02d72a51331..77559437ec1b 100644
--- a/dev-ruby/contracts/Manifest
+++ b/dev-ruby/contracts/Manifest
@@ -1,3 +1,3 @@
 DIST contracts-0.16.0.gem 55296 BLAKE2B 71b058fd2bcbdf5dfc2ff60631ecfc56cb405dea08fb5b2a67fb23c859a3941ed0aa3963ef639e9cb6670d871a6301a0c8b360fff3912413c10ad44ee8dcde2f SHA512 27d757c3a6d25920ada1b24842a5ed8521bc8902b1840b6060c94dc17e5eecb91501439eb764fa2fec97dedc6591d2c2978630f56d4b38e7b607e9fccfb60ad7
-EBUILD contracts-0.16.0.ebuild 530 BLAKE2B 0ec60a65b12fe48e9147024a3610101573718632df0650c5871fa645a4b7a1ca576062d6b80d7b8dad2fa3787ffc63d265d8d0d5560c4ca960abfc5345e28902 SHA512 de4565008241393e49b8268457251b7b7c09934ed0f8d57f55125f9ce744aff797a89941cc44ebcf3850ca090d2a0b95ae6a83a3a907a0c94e6fb6225af0a5a9
+EBUILD contracts-0.16.0.ebuild 524 BLAKE2B e83694f7f4af45f53c006547ee09b3d49c55aca42f88bde932eb82294dee15365ede0b460f0199c77ea1ded6b3763ea653c6bbe20f4406111da87f09445a4ddf SHA512 a7a37c9ab058201369cce5541ef326f5422292538c982996a24986311d9cfff4c4a084c7de1f28e1d3ca1a6007883804eff6167c601c381ff34f66823bfc3cd7
 MISC metadata.xml 352 BLAKE2B ceb4318c56fde3712e3855e711f5caab0cec265180dc1505e5a398f38648f35e4fc7af7f9bdd1bdd315b85f4ef81aa0245bcbecb803d4bd82071c43db6b7267c SHA512 34d461bdbbe0e0498653c8036193dcc8e7bcfbdad11db2ef9c5b159b7218eab8fbbe5d91abe3b4242b297625160cd232261f658a5f637d5748dfbc33bb48ff6a
diff --git a/dev-ruby/contracts/contracts-0.16.0.ebuild b/dev-ruby/contracts/contracts-0.16.0.ebuild
index 7182654c0aea..b813886a3a4b 100644
--- a/dev-ruby/contracts/contracts-0.16.0.ebuild
+++ b/dev-ruby/contracts/contracts-0.16.0.ebuild
@@ -16,5 +16,5 @@ HOMEPAGE="https://github.com/egonSchiele/contracts.ruby"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
diff --git a/dev-ruby/dalli/Manifest b/dev-ruby/dalli/Manifest
index facc5b143d5f..1e0b024b2edf 100644
--- a/dev-ruby/dalli/Manifest
+++ b/dev-ruby/dalli/Manifest
@@ -1,7 +1,5 @@
-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 1572 BLAKE2B 813f98d5d50708bafff983b3bfc24dd708ba26e06848077413f19b9f4a44f66393eb0967d6de8c92b1c37cd9120ef5d5abf86e1098b58950945af5f4b70eddb9 SHA512 7847ec294463e08a07cb2ad442b76774a2005e8e6f2f64ae59a48f8248dd13bd3c07a8273ccf19eb7fe651264237481edb16b9e0472182771ee3430b1fcea3d0
 EBUILD dalli-2.7.8-r1.ebuild 1390 BLAKE2B fef340fbf6d16192c9173d096f2763ab0e12097b457e0a4249a3c88b5e14f04390a314bee0391c856c14933aa484347f1bc4b32d418e772adf9873e6d0888f01 SHA512 be632a4d5cbb0fa2c5d36a48b67da95ae528e159c48f33bc2f7604e32d513767c939c4ae4d3dac0ea788e7b2665b9d3fa2fce7467802d9006396ee94c0127cc9
 EBUILD dalli-2.7.9.ebuild 1572 BLAKE2B 2a0dd07b2372178d3e19c574fed05ca873b5a3999cfb980a016a3c896fcd2c059dd7c1e541798550ea3553734e2d782680cef7901103affe736e896528a552a2 SHA512 4dc4c553810b8a6646a9eb39b09fcdd17640a9ee188d637d889717f6b17b4099ae036a54357b766b1f16348af33059901b6426ba9699e4d4a9c273a66ea89e34
 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
deleted file mode 100644
index 15499ecb5ce3..000000000000
--- a/dev-ruby/dalli/dalli-2.7.10.ebuild
+++ /dev/null
@@ -1,50 +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"
-
-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/facter/Manifest b/dev-ruby/facter/Manifest
index 0ddc7c1d5dd1..caf76e4959b1 100644
--- a/dev-ruby/facter/Manifest
+++ b/dev-ruby/facter/Manifest
@@ -1,12 +1,10 @@
 AUX 00facterdir 15 BLAKE2B 88b3bebceec0d9b8943b36a373a5475d2600c8cee5770c2f9391615958b27b842ede98d7a476cb488e249b1dc14258574bf2f77912599fef98fc325914c8f014 SHA512 381973ca23aec0853714495f74b77155f0079e504312dc55e6e22c8a099aeafd2b7bc4a762c95543c3cd9c5fa5f88a6821f4104b7522536aee7b6f5426d9ec2f
 DIST facter-3.12.2.tar.gz 391789 BLAKE2B a4476dd37629aa770d66c2597d29a2bf46ae67df2484bffc8c66fb18a0a93eea58bb11fbfb117c8f4778e10649315b1b53b4a609bc51327e29e87dcb00e96d07 SHA512 82901e973c187faf2b70863fe34e46d4f8f4a706364587fa293a8b91818c75bd3ec3cc6e5784bcb600f3dacb2c43c918708ae0996ea0e0e68cbcfaec458f9c27
 DIST facter-3.12.3.tar.gz 391836 BLAKE2B 60ec23ab9df0d6ca069608c897949be8aaf719b2ab1b71455871a9364b7d0111ec78753cdb45d082041d2b028bac8e468a415a2bd9a15fe51dc69ec9738dc723 SHA512 d1568ca606b07c67f2e293b020dc5c2d399d5080857e47d3c748a7d104f75231d59dc95d54e5504b24f951ce540d1223102ee1b882e4495633ed89324ccc1c7b
-DIST facter-3.12.4.tar.gz 392011 BLAKE2B 5e3d7ce65eb6c35cddba70b2b397cdc9c591a6c420a58a04ecddabdc537f0f799c510d14bba436aadbdce9c9932a28b6b36b893526a7727c8017c79827a97b9a SHA512 952bf1ac4c67bfb5170d31bca471c317211523804a14bd39f34b4fd0730586b3764499200b5c816d4b6bd0338482ea8bd83cedc5fe670db38ea6ec144b6e2e94
 DIST facter-3.13.0.tar.gz 391833 BLAKE2B 8fabb2ebb438975564a770657866c6ac8ac77394c4e3cdb635eae78a744a097ef5eabb4307092cd2b9cf12b4db70623b18b3ca1e2c9e1a248825a2bf53b76565 SHA512 f3c39239d7b0708bd98a3e5de5d5623406edf5e60b6321de1d4ec7c8cf903f3ec777640b9301979f2316e90e97e2aa0a80dc71975239dc715aaba61ec7cc37de
 DIST facter-3.9.2.tar.gz 380883 BLAKE2B d2804664e0499715230e5696c5a9ebae933f5b43dfb37154251d47763c2c7f78cfa8d1413dd836e5a0c76ed67300d066fa5bb390f17f85cd4cb7a444eaf0d133 SHA512 bc040826311bbff40f5a151ade315d9d47ef1e0f3faa570805e48ca55405265e66308230118b9cd59f701ecd76a7b0fd4d9200dd4ace838521223a162b105374
 EBUILD facter-3.12.2.ebuild 2415 BLAKE2B 1dded0b152090abc05db0a008088ef00e208add94f75cff29527c15bb1465e6252bdc613cf658e5e5126d3fd69966c8f47f637801336b9a3d24f351871f5179c SHA512 8a89678c3623b723594b70884a634214e34430aee18a28cd98d93746d559a4843841b5194ba968c76979e97ca6d2fd8a9c45948ac8c10382e97b33af2f69be82
 EBUILD facter-3.12.3.ebuild 2452 BLAKE2B be5a19e9f1662fe58b53bccbac68f02678b70437473a359a50d60eea2f4c3b641ec547b461c92990105ce809950aec808375fadfb490656b5bf654caebb48c11 SHA512 94e313ec5a6d24214968476fe9b52f09ff55ae143f68a6d537fcf2d295fb4daa19dd8c1918333013ebc90f4d0370ea68b07e55eb978820c5dbc53f1e7da0da03
-EBUILD facter-3.12.4.ebuild 2454 BLAKE2B 1a9ffcf7665c5b4ab655d4714b2196c1e5e54668bd69e48ef54b1197031c14cc2e8f40d3ba58c272c8e474b3ac45a8b2d30965a73b89ccb2f10bd3b3c739253b SHA512 ad4a9f8924d15b0fd7cd9a712fe740411fbeb81dbf60f10a3aca4d12b6e66097d09973370fdfba2fcf06fee1baff31ffec5b5b0fb0fad1f3185f675e352a49e3
 EBUILD facter-3.13.0.ebuild 2452 BLAKE2B be5a19e9f1662fe58b53bccbac68f02678b70437473a359a50d60eea2f4c3b641ec547b461c92990105ce809950aec808375fadfb490656b5bf654caebb48c11 SHA512 94e313ec5a6d24214968476fe9b52f09ff55ae143f68a6d537fcf2d295fb4daa19dd8c1918333013ebc90f4d0370ea68b07e55eb978820c5dbc53f1e7da0da03
 EBUILD facter-3.9.2.ebuild 2104 BLAKE2B 657616098817dc41ff43f1034dc697789e0e971ba0393ebe819e52a171cbb2d2a757aaeac60d4797b98df6a043b6afd28720cf79e6ae8ad33eee1ace71bca9de SHA512 49aedb61355c7b9a5f48b8be4c7fe76c8e48526470e094ea4491d8c36df5e97ae21b585bdd2d8afb932ed8bbcc806e3ef4d779d514fd8eaebc3b99c05cf68e9a
 EBUILD facter-9999.ebuild 2420 BLAKE2B 08c571937a6069cdbad57b9a70236c6dbb8c58c85f6d820e7c310e005452b468bf5932c65fbb13ed4d3eb957814820bfee13727eb6e8d6fe119da2711463157e SHA512 13865deccd523a37cbc49950da7a9b614841dee503ff099733f4562216617ed1754850635156e05dbc20fd6add9fe37b60167a5315f5c4be2c30211cecdb5257
diff --git a/dev-ruby/facter/facter-3.12.4.ebuild b/dev-ruby/facter/facter-3.12.4.ebuild
deleted file mode 100644
index c6ee584a2aff..000000000000
--- a/dev-ruby/facter/facter-3.12.4.ebuild
+++ /dev/null
@@ -1,111 +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"
-
-# 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:*
-	sys-apps/util-linux
-	app-emulation/virt-what
-	net-misc/curl
-	>=dev-libs/boost-1.54:=[nls]
-	>=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/itextomml/Manifest b/dev-ruby/itextomml/Manifest
index 35589466a2e3..58aad36ff02c 100644
--- a/dev-ruby/itextomml/Manifest
+++ b/dev-ruby/itextomml/Manifest
@@ -1,5 +1,7 @@
+DIST itextomml-1.5.6.gem 125440 BLAKE2B b0894d26d20e85454c310589509cb0eef371f3c9139450ce8dcd25fac6b83e831557e05ba54b449557422b23d59868ee75f022fe4ba1c205d32926f923986864 SHA512 b74f5a9ca4eb669fee547bdf729e456dfe07b8be4e9ac0d1b7c3ad5d4e99371ae7b5bde565e6472ab07bbcec2754d4ee628ba07a6a7e938ea8a55a6023c2f1fd
+DIST itextomml-1.5.7.gem 125440 BLAKE2B babdfdb7e81415a06875ba72a84da31f910bb0f634e2fd2ea724785b56d84b6d6ca7e544ddfe617a53c91a89314f0e0e8c2ac0f20f0cf8e26c11327f865e423b SHA512 65fbf03096695330e32ac9093e923ca50bb92a3b32a7657bea65e6abf51c7824fc8b650f564352c41d28e846cba62a60ffbd57ca14ad2587e3164e48d7d1043f
 DIST itextomml-1.5.8.gem 125952 BLAKE2B 1fd68b00bed86e8f799d5cffd4de40d50151d18a11dbfbc91dbbc857295959d44c118bf39fcf4e7089e466d07f2ed03ad0d04c16c696fd6b7c4c8d101fd0c0ac SHA512 5fb1776ba7de3f0d09eed64bff8fc04c4a508cb7360d82853d65dc481bd0a43253c0a4edd4c9eaa0df835f9a21d6ed2c2d318f621c5d071b6566709d769c1312
-DIST itextomml-1.6.0.gem 125952 BLAKE2B 9422d7a7f0a872dc60fce6f5d217c8c085785787d40b1f976a0f3df04f49d8de37a6fb658d8960b27f27dec03401a013b51a9ebe2446f5deecd70cfab00a7756 SHA512 cabff2d8d36cea6b280c4c928675e368e02ce346870c2d933ebb5554722e729ef7a05132776d29e4a62f0fa89ef1ad2fdd729ac97a35d7aed6da24f90de75839
+EBUILD itextomml-1.5.6.ebuild 742 BLAKE2B a3b0c797eb53d82160e9fec01e2c2af41be577d5265cc69f2cdc0d3c25f3a61f3b5764213434f9f88d9b41cca9ef281435de017bbf01a7280a30d3e2efac8ffc SHA512 981eefe3909d3bb29cebc9751026f2d057372a802437ebea804d2a92a184913a1eef279a1a5f78ac1f447dd464ae2117efb08c774ddb3b141e3feb1dfa7e40ef
+EBUILD itextomml-1.5.7.ebuild 742 BLAKE2B a3b0c797eb53d82160e9fec01e2c2af41be577d5265cc69f2cdc0d3c25f3a61f3b5764213434f9f88d9b41cca9ef281435de017bbf01a7280a30d3e2efac8ffc SHA512 981eefe3909d3bb29cebc9751026f2d057372a802437ebea804d2a92a184913a1eef279a1a5f78ac1f447dd464ae2117efb08c774ddb3b141e3feb1dfa7e40ef
 EBUILD itextomml-1.5.8.ebuild 746 BLAKE2B 7c506598daf2b35789bee4a26de4ff79894394846b45ca45db233b23c3511dd136d1c43b30072317dd07e58a1f2d3f48bba145788741f3f9afc1f99c2802e114 SHA512 f943900ff53bf0ce12e162f4cc981cb004cd8466e00e4dfc640d1df936bb0d94ae78030720484293407e1221b10f2f80372692f1cf646f955dc52dbd41b6e6a3
-EBUILD itextomml-1.6.0.ebuild 746 BLAKE2B 7c506598daf2b35789bee4a26de4ff79894394846b45ca45db233b23c3511dd136d1c43b30072317dd07e58a1f2d3f48bba145788741f3f9afc1f99c2802e114 SHA512 f943900ff53bf0ce12e162f4cc981cb004cd8466e00e4dfc640d1df936bb0d94ae78030720484293407e1221b10f2f80372692f1cf646f955dc52dbd41b6e6a3
 MISC metadata.xml 257 BLAKE2B 6339b8ae3ef779011f34940b5af7faca341317790ee6752ad73cb83db463ddad10b25cacf16f73ce6d0fde976d916e2838e6209bdedfbe5ef6da285be302203d SHA512 d86ea11e509e5d031f82c4bb476a5974b85d812abe415e95799bdf34a308ade95e2f1cf35f6af84ae5acd0f67996b150c02712b75ab4f5a1ff4eef0ffb046d7e
diff --git a/dev-ruby/itextomml/itextomml-1.6.0.ebuild b/dev-ruby/itextomml/itextomml-1.5.6.ebuild
index 22fcbeb33d94..8f5692eb0c80 100644
--- a/dev-ruby/itextomml/itextomml-1.6.0.ebuild
+++ b/dev-ruby/itextomml/itextomml-1.5.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+USE_RUBY="ruby23 ruby24 ruby25"
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="README"
 
diff --git a/dev-ruby/itextomml/itextomml-1.5.7.ebuild b/dev-ruby/itextomml/itextomml-1.5.7.ebuild
new file mode 100644
index 000000000000..8f5692eb0c80
--- /dev/null
+++ b/dev-ruby/itextomml/itextomml-1.5.7.ebuild
@@ -0,0 +1,34 @@
+# 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_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="Native Ruby bindings to itex2MML, which converts itex equations to MathML"
+HOMEPAGE="https://golem.ph.utexas.edu/~distler/blog/itex2MML.html"
+
+LICENSE="|| ( GPL-2+ MPL-1.1 LGPL-2+ )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+#Tests don't fail here
+RESTRICT="test"
+
+each_ruby_configure() {
+	${RUBY} -Cext extconf.rb || die
+}
+
+each_ruby_compile() {
+	emake V=1 -Cext
+	cp ext/itex2MML$(get_modname) lib/ || die
+}
+
+each_ruby_test() {
+	${RUBY} test/test_itextomml.rb || die
+}
diff --git a/dev-ruby/multi_json/Manifest b/dev-ruby/multi_json/Manifest
index 138fa15f8683..226f02d330c9 100644
--- a/dev-ruby/multi_json/Manifest
+++ b/dev-ruby/multi_json/Manifest
@@ -2,8 +2,8 @@ DIST multi_json-1.12.1.tar.gz 25579 BLAKE2B 50fa37b907289b8247ffff1e22ebde1b07ee
 DIST multi_json-1.12.2.tar.gz 25630 BLAKE2B 61209dc4be50b44302cfe40e45b840ae8d81e827d8b9df82ca6b852a72d360fbe09c0f5b0ef8eecfbd08b6bd08343ab7bb307d91d9abf28c9b9adb35f18bea51 SHA512 bbbdd05a6dd12052aa3e09389f47212f15799310d5c265057f7ca801622d32295d1f0844b37e51f8f1fd2d48e4430234f99bc6de4b9ed149e81d9a33a831e6d9
 DIST multi_json-1.13.0.tar.gz 25954 BLAKE2B 22a2f2ff2f1291a45613f456661a1735fc41ad80f28ee7d2c9b97109f0637da4e60439686cfc29b7ced501c32d2fe9236c9acc25acc0f55e57ec0bfe53331f37 SHA512 b168b2a093865f48f1a4d1941e8cfead8b3efba73bcd59660dae581a77ab7149f0f452f1280e69061187f35c84b6eeff70144f815f9f669db03dba49100143aa
 DIST multi_json-1.13.1.tar.gz 26098 BLAKE2B e82a08a747a092a9094cd7b35b4f933b5ac922a01f45a51b215ca9c4cdb9a083a4808d4bbe67a147ecb57e0b7b7e313c3d896f8cd80c79338c24abc3b90a09f9 SHA512 7c98392bd1c909fcc05249a02a010b561bf6c2d812ae42413d6e8dafa62926d8cb76226ded4c61558a00e5fa531ba33b6f4ef562648c52ba9b552ff7b7e27682
-EBUILD multi_json-1.12.1.ebuild 1928 BLAKE2B e145efe7580001ff4e92dd2d524e08328de8b1fc6bdf8e958f7a4a3928baf9c01a1bd26a6e5db16c8d5aedebcede110872ae60db7e066df62b51d6e872e75236 SHA512 dd0e27bebc519457ef67e425889e515aa77fe8adce279bd265477ccc2b8fe19c93f884fd8dc1b8f65b9602246370ac46a8e8a6edba22c549b3c5285d66af462e
-EBUILD multi_json-1.12.2.ebuild 1925 BLAKE2B 341208e00259c755da24e012827dc503ad98bc043d83eacb9f8e23afffaff63dd269713579c3d958513a252e4976a5329afafbb80aae796ccdfc449a9c8029c2 SHA512 141fc97664656e3a112a109883a0fb37cb2f71793c6db1bdf144e9485f2f9ee321393e74f55f336e46b6e206b0f2997c70296b4ca4c0e1cce734894371446175
-EBUILD multi_json-1.13.0.ebuild 1925 BLAKE2B 341208e00259c755da24e012827dc503ad98bc043d83eacb9f8e23afffaff63dd269713579c3d958513a252e4976a5329afafbb80aae796ccdfc449a9c8029c2 SHA512 141fc97664656e3a112a109883a0fb37cb2f71793c6db1bdf144e9485f2f9ee321393e74f55f336e46b6e206b0f2997c70296b4ca4c0e1cce734894371446175
-EBUILD multi_json-1.13.1.ebuild 1939 BLAKE2B 648fd92d37bf3391b13f4bdff6b923c081660f80ba25368826eb29bc2f67ba8f181dd50b554ea1d081bc99f5275a0e152634ed9dceb8a02b704beb2af5fb3c34 SHA512 6a87d57f0ad87df360b9b8ff8d3b4b3dfffd08878954189de795216228f7f961583d443a8360759f32bea1eca1ac25aac8b4508bd45adad425486ae0e0f12244
+EBUILD multi_json-1.12.1.ebuild 1926 BLAKE2B f392a89f6f23033080a4ec1fa22b638f41a44f00638a0ccf1fbe34dc70150082b0e3eaa5b926df620efd7676bab3f31fd197ea0f99496cddc918d93ef4abada3 SHA512 9cc52c4e92ef2c398bc05ae8dd53ba440dd3713b3713972bb44ae6aa5881e13b7b79a382b16abf64e75da531f35871b0a98ae8470fab1e9b6b4cdc7c6c3442d3
+EBUILD multi_json-1.12.2.ebuild 1922 BLAKE2B 338cbc039830d46a7cebb61b82ee7fcce1b6722a7de17a9cff0ff1372c12c7157d01bf0c8b1fe05cf81d2f5a4b51aaecaf807ee6563b84ce31e843963e78c992 SHA512 429d8f7036473500cc478d690e28ab4baab02cce66a474f0c73e03b2362e3b9124248520bca8ce1c2c89ab46f6ca41dab196b654919f8bd43e66e76c6e04e9cc
+EBUILD multi_json-1.13.0.ebuild 1922 BLAKE2B c909ef211d008b8f12d400319e89674f79cc556d4f3aeea0d5b76c7c43ec671f2a4e6e48fd3f1861f7c157668778a86cbdf151f77bdf64392f0be4a859aa0695 SHA512 170aa5bb583feeef39ca4600bdfba839e7b640a4ac376de56e42641eec72650b536ccc16a1fc8065c843ffaddf2b1655bac68608804abc669f5b67be7146c39c
+EBUILD multi_json-1.13.1.ebuild 1933 BLAKE2B ec401b0e2aa4aefa5acda49461aa31600a5376372c9cd1b20d68f8ec4c156a531f83e90bb2d0a969b0626006f6499158a6875cbf9e3c62f5b045714b213434c6 SHA512 1f92d8e2715a9ad2f0e7faf83b8b6f8817a31946815a8998fe7c40e6f96ef95067c8cc7b98556ca3c801d56ef78badaa176164fcda2b5d036f10128082953005
 MISC metadata.xml 345 BLAKE2B 7d7684a1546dcc97e934f1a7df4484b568c5e8043dcfd0493e03124fa9f96959de5dccb78d22b1ff51ebc39b5fbec8b9a1dfd24531d676b8982b1f1dbd5097d0 SHA512 5fe7f117806d67e0d295bfcbdd07d4bbe8d3c3875e07cc3d276f2aee81b89f2e90174cbf4264d647384817fe0e8c81c2f2c9d9d67e3f78b46c3c194001bcace9
diff --git a/dev-ruby/multi_json/multi_json-1.12.1.ebuild b/dev-ruby/multi_json/multi_json-1.12.1.ebuild
index 7f357ab7ec0b..0bdf709fb24c 100644
--- a/dev-ruby/multi_json/multi_json-1.12.1.ebuild
+++ b/dev-ruby/multi_json/multi_json-1.12.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -20,7 +20,7 @@ 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 ~x86-fbsd ~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 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/multi_json/multi_json-1.12.2.ebuild b/dev-ruby/multi_json/multi_json-1.12.2.ebuild
index f75a77f3d895..27c74c2cdc54 100644
--- a/dev-ruby/multi_json/multi_json-1.12.2.ebuild
+++ b/dev-ruby/multi_json/multi_json-1.12.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,7 +20,7 @@ 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 ~x86 ~x86-fbsd ~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 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/multi_json/multi_json-1.13.0.ebuild b/dev-ruby/multi_json/multi_json-1.13.0.ebuild
index f75a77f3d895..819f95007369 100644
--- a/dev-ruby/multi_json/multi_json-1.13.0.ebuild
+++ b/dev-ruby/multi_json/multi_json-1.13.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,7 +20,7 @@ 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 ~x86 ~x86-fbsd ~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 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/multi_json/multi_json-1.13.1.ebuild b/dev-ruby/multi_json/multi_json-1.13.1.ebuild
index 66903d98fe1d..83836e6e7948 100644
--- a/dev-ruby/multi_json/multi_json-1.13.1.ebuild
+++ b/dev-ruby/multi_json/multi_json-1.13.1.ebuild
@@ -20,7 +20,7 @@ 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 ~x86-fbsd ~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 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/parser/Manifest b/dev-ruby/parser/Manifest
index 52a8d5f7a577..476c2ac1854a 100644
--- a/dev-ruby/parser/Manifest
+++ b/dev-ruby/parser/Manifest
@@ -1,9 +1,7 @@
 DIST parser-2.5.1.2.gem 654336 BLAKE2B bc6960730337d39d60fc63d6da15023c31986230260358bb64b172d06978ec7fd7cd031e1c9db3cf8a04c96c87b034d8043351c3ee4875402ff8fbac7bcc217c SHA512 d7c06cdf77c2efcedd656dc541ca5f4cd80e3c7c16977a87ce29d51515f4d724ec6bdc3367527d14d93b8339e64103b3cb757dbc2f8731b8941aa6ee4ff838d8
 DIST parser-2.5.3.0.gem 654336 BLAKE2B dff1b0e0b593a5603f1b0fd9c39f59b6126ad9575d8c077d5a7e2feb16e6f9ef72321a3c7d3a0c21e2f7c26446132c8c30120785390f2b450a0f42a1b2d11128 SHA512 3721b5064ebd9a7de4e50f299001f1640ecdb27b99d932f0a509b89c0b5bf2b337b0298466e6267c61d2b5fcf2e556e0d1a10f6c29dc6f64bd042667f9d79d5b
 DIST parser-2.6.0.0.gem 655360 BLAKE2B 83b6814ad2b812fa89b1885d1362dbfc900df31998603672d6ade0e67cce6d82ddb18face2ed6b498c901cd4b27d002a34ef90187d8a1ccbfef48c7fa154f489 SHA512 34a5a0ff8d400644bf907d0959dd63ad6ce7cccdbd4842c8009d1b8a520ea87d5a8a61886d386d0490a2d266ca7897aceb725335e7ab88d757c6795b193c8ef2
-DIST parser-2.6.2.0.gem 701952 BLAKE2B 5c9fd1479c7bf95e43877a39c07697b766452bd9d712b140a313384adc50356949479f6a24e6d0dcba5238d8281cba952aed97ed002142c084fc73a64e96c3ec SHA512 c729767d8d2e7ddf293e6945226e219e297862a39bb22c52be0ae02e288cdf1a468cf372caef48cb858cd130b407e531efe9b1462a169c1f8ad3f3e56085e4ca
 EBUILD parser-2.5.1.2.ebuild 726 BLAKE2B df9d16e835249008165c115a6c994e81a1f3b718718bfdfa091c8a585892f95c1f963cce4a76a350f5ce15d6c26fa29f906086dad663e63551d820bb743f66ae SHA512 8de9474b3ea328a8ec6082776bbeb4ef4a37d6ecf182107116cac2bf48071e31e55b72a884dc436b1e8168c56457275708e00346b538dce2e5ca14ae5d3eded3
 EBUILD parser-2.5.3.0.ebuild 723 BLAKE2B 8789c34bf456237f0c19782f6d46b6605265e71a576e4f6524c49eb762a46fb0d499306f8cd4f9d6b3297587ffd16c6674e12d4e7145d5de218f08603b93213b SHA512 aa5d0c9e12db9f8c35b1cb34ac34d045cc0fe6a6f69f3cad530468d2dd63dc8fc4ae90c99bc8cf70232f565210c37bbbc6fe45965dea8bd44ead58e137c10bc9
 EBUILD parser-2.6.0.0.ebuild 730 BLAKE2B 06c31bf98bb33344ef835077d7e87ad62a6d24faf803ca957668641b69ef5175bddc7594c571dc8567d3a68c883eb4adec798cebc9d62eb9e3a2879fa763bbb5 SHA512 b1fbad99e56eb7f6fa467dd3564bf3356aecfc108dbd6b28566e4463f6e413ae7758269e6c1901a1a3c84c3246577952011d47a8f6b5ce27a4efa2cbd18d59c9
-EBUILD parser-2.6.2.0.ebuild 730 BLAKE2B 06c31bf98bb33344ef835077d7e87ad62a6d24faf803ca957668641b69ef5175bddc7594c571dc8567d3a68c883eb4adec798cebc9d62eb9e3a2879fa763bbb5 SHA512 b1fbad99e56eb7f6fa467dd3564bf3356aecfc108dbd6b28566e4463f6e413ae7758269e6c1901a1a3c84c3246577952011d47a8f6b5ce27a4efa2cbd18d59c9
 MISC metadata.xml 343 BLAKE2B 7da9e267560e7a67c7a8afd5c283389dea1d4db2cb0ca65e4fda61a576036bb8068005b5e31ba9cc8fe7b68b8f8af5f93bd104e6d63412842dd7d0030b83fbd5 SHA512 f8dccc996237113d4add61dcc46e1407ea6edf156b001994e31d920f688dfcf9efe8d3d991ef31dc0084b7695b57b5d51471c57e9e945308279dec7909c69517
diff --git a/dev-ruby/parser/parser-2.6.2.0.ebuild b/dev-ruby/parser/parser-2.6.2.0.ebuild
deleted file mode 100644
index eea51db58bc4..000000000000
--- a/dev-ruby/parser/parser-2.6.2.0.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="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="yard"
-RUBY_FAKEGEM_TASK_TEST="test"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_VERSION="${PV/_pre/.pre.}"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A production-ready Ruby parser written in pure Ruby"
-HOMEPAGE="https://github.com/whitequark/parser"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_bdepend "test? (
-	dev-ruby/minitest:5
-	dev-ruby/racc
-	dev-ruby/cliver )"
-ruby_add_rdepend "=dev-ruby/ast-2.4*"
-
-all_ruby_prepare() {
-	sed -i -e "/[Bb]undler/d" Rakefile || die
-	sed -i -e '/simplecov/ s:^:#:' test/helper.rb || die
-}
diff --git a/dev-ruby/power_assert/Manifest b/dev-ruby/power_assert/Manifest
index 91da2c23186a..938b5a65051b 100644
--- a/dev-ruby/power_assert/Manifest
+++ b/dev-ruby/power_assert/Manifest
@@ -1,9 +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
 EBUILD power_assert-1.1.1.ebuild 1325 BLAKE2B 92468a576f9c00deeb732382e0ae8a05eb2ca0017d24be90ff77b2ecb66dd65b9c5e11a32594315348ff0e878eb72468ef91dc663fccec0c4a1a1cc2e81859d8 SHA512 6d4378d2b7adc4df773c71c4ffa94b03921e789f51464ac57dc61b90d86711544fa235ef0715d7050d3d34cd7b9e29b68b908ad37d90deaeb1233d311078d717
 EBUILD power_assert-1.1.2.ebuild 1331 BLAKE2B 5710cf33430a517b532cb28ca1a0917f619901dc498190325dc83c6a6dafabd89542915099cb66a208b123a5150e8df678e379ad174492c2837328f9aef41713 SHA512 4e871fddff5c73cf57f9a0d40b59915ece509a0482c05d8f298cbdc10abe89ab066090d1cd555fb8b641edae504413af2d27b5f6a0690a84c2a04b3f749fba11
 EBUILD power_assert-1.1.3.ebuild 1335 BLAKE2B f96fc620e6eadec4a4b16796ffce73036b926897c7e8cdda603831e05c5a8b2b61ca5e3365f5e541433ba82fa70498301d6c87190cc2260965b9314c01340e72 SHA512 b269121ae9097cf0a3d4fcb1dc546b3789d9f138d36725c89b42605d777ec200f935cc4c9048b3ec315a0a55c5fbeae0fd4964b5b4eb3e7de013867a01b9b975
-EBUILD power_assert-1.1.4.ebuild 1335 BLAKE2B 32ecb362b0dfa88c2ba947b861a6e63ff695cdaad2395774718f391804a524284f68a0f40a201c887e558521b846d79aae67a9f8364dcebd17e3358be4b6f1ad SHA512 c8ce7fb67d22e5951e5f9cfdeb9003fd52b5911baedf64785f907c10147c39d366e8b6525a3a96fa5c3c7213a3ec3e9a391ad6305507bdeeefa5acc4a5eb8242
 MISC metadata.xml 344 BLAKE2B d878cc041f73fcacc13fc94374eeb102440977f57c47880e9a597af3b4d3b20cd81e8bd0d367cd2abd7799a27b5aaac46611291ffaffb3298bb253d726e23726 SHA512 87e232c55b49880144aa509aaa79413864b3f575df07a559a9f1aa60909d4d8e01d1ce2e86542c847533eda2f233542deb36b1103b56d7c512f2385a6c8eb2fc
diff --git a/dev-ruby/power_assert/power_assert-1.1.4.ebuild b/dev-ruby/power_assert/power_assert-1.1.4.ebuild
deleted file mode 100644
index 488bee9eed52..000000000000
--- a/dev-ruby/power_assert/power_assert-1.1.4.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.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-fbsd ~x86-fbsd ~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/rrdtool-bindings/Manifest b/dev-ruby/rrdtool-bindings/Manifest
index 333fa68a5f60..3a020eec4f6d 100644
--- a/dev-ruby/rrdtool-bindings/Manifest
+++ b/dev-ruby/rrdtool-bindings/Manifest
@@ -4,5 +4,5 @@ DIST rrdtool-1.7.0.tar.gz 2849994 BLAKE2B f7a91fa661728850af55356a69b61ea1d4343c
 DIST rrdtool-1.7.1.tar.gz 2881346 BLAKE2B e538c6ba3fb6726f0515ed655aa8d5e184f6d3066bb32e981b3254e41c53e29529698da5ef73f8365391180c76d15808d1d727a0834b8025893b01c3b9af8f46 SHA512 ee5c9ff234493442ccd9bfc7031700483011de3e05c01e026509b699cb0d7d3e286e2046357c5fff5807f3e709043c8f218b48b43f8b126a23e228a3927d7b14
 EBUILD rrdtool-bindings-1.6.0.ebuild 1320 BLAKE2B c850713576b7b5ef4311543b32857d12b1b2bc9df1173c9512373db1d3f6205d96b0438da118c2b39c0eca32fd744a20d34e1ef1537771d4e0ffa2408a848aa1 SHA512 ecd415bd7584f652857cd5c2a9f18ffc89c6169e5eda6d24e5693c2d145f8c2c61a06295a243458399efcc696d81b4227e2f2eeae9aad34f1fc934133db47e58
 EBUILD rrdtool-bindings-1.7.0.ebuild 1325 BLAKE2B 41e6e77c11af149d19b55509b7ef463e870630fa954049c2fb51ec96d9bc55e87700b6fba482710ae126104b4c97d3a3e3cc8bae582094d0cdf0ed174b91e6c1 SHA512 d0239ecc8605910547302ca4ee2d4f0d1fe59851b2655444a1b8494ff34be5b7029816d622d7938962d167e10e1b62b4890e956117bdb5ca060a2ce911655842
-EBUILD rrdtool-bindings-1.7.1.ebuild 1324 BLAKE2B 8dfce81e14b2ad4ecd1d6b8ddc85a0db7e7a37e936d29c6cc06fc63fe1944db74cfef608711fa064789342417e0a76d8809d785139437748ac4adae0d30aeaa4 SHA512 c33ebb9189be50834b10d59673ba62e03c7f3e70fa2f489bca6f4d78387d0833daf5372a8645da978af518d4f804dbe7234ab69e126cc6701d5b644e1b2d7d00
+EBUILD rrdtool-bindings-1.7.1.ebuild 1325 BLAKE2B 430f90d4ee82a5f756f6d4b0e53a2395ce5559bc0bb5c669992414657bfda4ff32735b9a1c080e9b3ba9085664c1943852c288f0c839b2ff16205cc2f4ede593 SHA512 480353317b82519eca6b8d7495e4158f2f30d9b038fe2a4bf0b51389931e508d6c823f6a119cb843f54f59ebff2e2674e008ed2d76848592cd08ae7de8f5d0f2
 MISC metadata.xml 463 BLAKE2B edb3b1f3703163a7f6c28ea7d16a79158d108721a2a775e30967885fb6b7b31d6074585951cc5b1c7b640c88b0694b95f0aaf62b71df43a8d6d6a0d6f78e07c9 SHA512 60732861cde4604b50875b6bbba205f232a52c4d91e6e21bce49a46bcef824bc542140e73b07ce4c18518a366ff8c9bd34569895741b0ac292124f43b0f02aa1
diff --git a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.1.ebuild b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.1.ebuild
index c39422814456..4159c5580ae0 100644
--- a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.1.ebuild
+++ b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 RUBY_FAKEGEM_TASK_DOC=""
 inherit ruby-ng
@@ -28,6 +28,7 @@ RDEPEND="
 DEPEND="
 	test? ( ~net-analyzer/rrdtool-${PV}[graph] )
 "
+
 RUBY_PATCHES=(
 	"${FILESDIR}"/${PN}-1.4.8-graph-ruby.patch
 )
diff --git a/dev-ruby/ruby-ole/Manifest b/dev-ruby/ruby-ole/Manifest
index b0bf7197cb7e..67109430e80f 100644
--- a/dev-ruby/ruby-ole/Manifest
+++ b/dev-ruby/ruby-ole/Manifest
@@ -1,5 +1,3 @@
 DIST ruby-ole-1.2.12.1.gem 56320 BLAKE2B e7107af4ca2fedeb3c4d3b2802f17fd922a5f70909ce0cd32b8627986af03f607417c801e525f553265f6f56246257618ef03484daaa3f7fff483aa89521ba68 SHA512 1c8c6669d37008aa9b837df33d6f12acb0c672e14828d8ab3e7cc2cdfb67f407b6af83972c9022cd9661232ff4c85a3ea2fdca82878ba48f713d6391f088392b
-DIST ruby-ole-1.2.12.2.gem 56832 BLAKE2B 489dbaff30d5d293f5c04672c2e8dd2a6144f6b32fb22319c4691a351318f0aee8fd5d01106f3ef6abaab40e81cd86c8ba9d93ddb1e004240eb052ab6ce5675e SHA512 2c28336a827e42faed4183d79ae61d4dd2b888f3d13eb26fb2b7e967057127a01e184fb509c6e4718e7beebb7490ea2f7aa230f2c5e29efae49994fa92d604b7
 EBUILD ruby-ole-1.2.12.1.ebuild 711 BLAKE2B a994e3727234ae1280fa679b9b3025d35c2bfd4c35c261190e6302b97a321389ec402ca49e7e89d2bac222fd71b765674322a6fd41be1f0f1c86554f44a2ffd4 SHA512 121d061befe0cac2a9f8b0720be7ac6537d61051c47f6fd65ae19931a98c1d3576f02050bc3b5370604dc166db7c582c79a55c3969246f6801c64b8572166cd5
-EBUILD ruby-ole-1.2.12.2.ebuild 711 BLAKE2B 48c7af6c7a985a817b68eaa08b4f2aac8bf368b2a3af22ae81b79effc418859ad20efd67859bd337eddc1b2f1c1527dadaa658a4432d3c94d6700c6dcbf348e7 SHA512 d7bc7d315a74ea61994899afe3175331013e2e81a6912f65b9160708a74f6356b7abf2aa4d0d0d0f58a261797e377a8dd38b07952b74ebac4bd0c1c5f3f90b09
 MISC metadata.xml 456 BLAKE2B de4933df478ee7e4d75a1b6652a768a51cdae34e5f25c0f8df576624810b85dae2feebc9b4aaed3e2ba75c7c0c67f4c80e059d670e4fac13885dc6128aecb65d SHA512 113ec0860aa5c75896ae97762319c13b6b01f204427e566a2418f3a96fee0dee238565f530fc2c794dd4adad6e98dc9724a478dbd60fd9e08085131bd013b622
diff --git a/dev-ruby/spreadsheet/Manifest b/dev-ruby/spreadsheet/Manifest
index 1c88fc644b8d..13887f8e8610 100644
--- a/dev-ruby/spreadsheet/Manifest
+++ b/dev-ruby/spreadsheet/Manifest
@@ -1,5 +1,9 @@
+DIST spreadsheet-1.1.8.tar.gz 4656238 BLAKE2B 583e3b45da505f398fb243387c375f97f13482ed39c8857caf96a865eb1f7babff188e459818e4609316ebdbd18f9050d60492fc27e0557aeebb0846dd3679cd SHA512 be90f9b3b21db98daced4bdaaf57fb1f0dd45e9f8fb330e451b51d68a78ffb0dbb2e7b08c1ee41836935ed263acd9639b074df45b7e429f5781d188bd7170e75
 DIST spreadsheet-1.1.9.tar.gz 4656240 BLAKE2B cb2b663bc4721d916f0485fe51a5e46239f2e48dca2410d3b5e6f50ad4a4fb92982e3a9ba7605c4f202d538f3f69931837c2c0d323b8b30e9c25210fadca8796 SHA512 1a4d8f3e2f6772ff6fdfdc818893d8d808b03f68428125d6f3deab38830dc47ab203fbface21b01c66ab451e2175db38f4b6d3b0cc2423ac37578d3bd135305c
+DIST spreadsheet-1.2.0.tar.gz 4655737 BLAKE2B d0f909ee7d465acb83ac99f74e273b3d82c195ce0747a73a791807100397f89d61db5c771017c525942c68f6a11f38dbae8a6e1b5d25509388a9c4b5b0769793 SHA512 3767e4f7d027b9162f4ca2f10d7d9ed211ddce680bec9d414dd2b2afde327b61be6c821122357710ab5ee69f5cc5f7ba8f00e46e42ca240ef65263d820cbd166
 DIST spreadsheet-1.2.2.tar.gz 4656143 BLAKE2B d68e128fc902dce7508e64f2ea530f222cea6be43a2841aa9fe28a4155919c11279bb43f525de8b62f1a08a4eb35e0d7bf0af2b808bd22e649a798fa3a77bbb0 SHA512 8a7a7b385b15967b3cabf4fcc40a69788ef4470e81789256208be6b6afed4fcc078e85e4cfab0e647a03ec3c312d07f4c24160bf57814d4990f7c6dba3abccef
+EBUILD spreadsheet-1.1.8.ebuild 855 BLAKE2B ebf9b73e1ffb80be01af994b2d924f5e3e2e851084c8b2993a2d7d189b572eb0300f41c8e340c5ff9f70aa23ff14b8a8597393841ff98ff6a1f1caf3496ea8bd SHA512 231e04c918bf894e7d6b7131865f9ec9a8cccb4789cfef955cc644df7ca84656a5e54241d871497c3090bfd31a70a13f779eebbbdbcdb7336d00ba40a3f22d38
 EBUILD spreadsheet-1.1.9.ebuild 855 BLAKE2B ebf9b73e1ffb80be01af994b2d924f5e3e2e851084c8b2993a2d7d189b572eb0300f41c8e340c5ff9f70aa23ff14b8a8597393841ff98ff6a1f1caf3496ea8bd SHA512 231e04c918bf894e7d6b7131865f9ec9a8cccb4789cfef955cc644df7ca84656a5e54241d871497c3090bfd31a70a13f779eebbbdbcdb7336d00ba40a3f22d38
+EBUILD spreadsheet-1.2.0.ebuild 855 BLAKE2B ebf9b73e1ffb80be01af994b2d924f5e3e2e851084c8b2993a2d7d189b572eb0300f41c8e340c5ff9f70aa23ff14b8a8597393841ff98ff6a1f1caf3496ea8bd SHA512 231e04c918bf894e7d6b7131865f9ec9a8cccb4789cfef955cc644df7ca84656a5e54241d871497c3090bfd31a70a13f779eebbbdbcdb7336d00ba40a3f22d38
 EBUILD spreadsheet-1.2.2.ebuild 855 BLAKE2B ebf9b73e1ffb80be01af994b2d924f5e3e2e851084c8b2993a2d7d189b572eb0300f41c8e340c5ff9f70aa23ff14b8a8597393841ff98ff6a1f1caf3496ea8bd SHA512 231e04c918bf894e7d6b7131865f9ec9a8cccb4789cfef955cc644df7ca84656a5e54241d871497c3090bfd31a70a13f779eebbbdbcdb7336d00ba40a3f22d38
 MISC metadata.xml 452 BLAKE2B acebaf37b6e910c08eda195fab8eb473c2516d5a22d30b64cbb564d25e9c162d3f2a5918fe5ed208533fd847de10ba374c5647f18d33f2045ced2c0fc6158af8 SHA512 a0677ee7cb739f0108436f4021f487e59ad4d24af2d3e08c463b0042cc3016f02a025cbb558a68c04cb13fac2b099530fa3c17b29b473c9371b2243810664416
diff --git a/dev-ruby/ruby-ole/ruby-ole-1.2.12.2.ebuild b/dev-ruby/spreadsheet/spreadsheet-1.1.8.ebuild
index ef0d993916a9..9f95a8c8f22c 100644
--- a/dev-ruby/ruby-ole/ruby-ole-1.2.12.2.ebuild
+++ b/dev-ruby/spreadsheet/spreadsheet-1.1.8.ebuild
@@ -9,20 +9,22 @@ RUBY_FAKEGEM_RECIPE_TEST=none
 
 # Same thing for the docs whose rake target just calls rdoc.
 RUBY_FAKEGEM_RECIPE_DOC=rdoc
-RUBY_FAKEGEM_EXTRADOC="ChangeLog README.rdoc"
+RUBY_FAKEGEM_EXTRADOC="GUIDE.md History.md README.md"
 
 inherit ruby-fakegem
 
-DESCRIPTION="Ruby library for easy read/write access to OLE compound documents"
-HOMEPAGE="https://github.com/aquasync/ruby-ole"
+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="MIT"
+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='test.*\.rb' test/
+	ruby-ng_testrb-2 --pattern='.+.rb' --exclude='suite\.rb' test/
 }
diff --git a/dev-ruby/spreadsheet/spreadsheet-1.2.0.ebuild b/dev-ruby/spreadsheet/spreadsheet-1.2.0.ebuild
new file mode 100644
index 000000000000..9f95a8c8f22c
--- /dev/null
+++ b/dev-ruby/spreadsheet/spreadsheet-1.2.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+
+# Avoid the complexity of the "rake" recipe and run testrb-2 manually.
+RUBY_FAKEGEM_RECIPE_TEST=none
+
+# Same thing for the docs whose rake target just calls rdoc.
+RUBY_FAKEGEM_RECIPE_DOC=rdoc
+RUBY_FAKEGEM_EXTRADOC="GUIDE.md History.md README.md"
+
+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/will_paginate/Manifest b/dev-ruby/will_paginate/Manifest
index ab644caca11b..c6dd63c902c5 100644
--- a/dev-ruby/will_paginate/Manifest
+++ b/dev-ruby/will_paginate/Manifest
@@ -1,5 +1,3 @@
 DIST will_paginate-3.1.6.gem 36864 BLAKE2B c6babf7125c20d7ed646930b7df39db864d0d46fd89d743daab73ba35254650ec0b4c7e203c5d5a2b00439d928b95508c1a82107db142f8cd77d27a14be00e7f SHA512 50e0fed5a3ea6a62f8620db3d30046a7a4cc602d9d7936a265d0c20a50eb267ecebb2c7d3bb07f3a514f70e556dad78085971bb80f94e1f4baf7048d6fd34c11
-DIST will_paginate-3.1.7.gem 36864 BLAKE2B d003952c78f3447a21c332c2dd6e878cd5c24486e7697e0abe6d70db5e0c56858a0d03fa76a4c18dcf10e121b706cd80812d9f438360eb931430244a0e31ee11 SHA512 2741fb24482a6b55322e6ae83fc1d269074be39014e1b0e719025c86d20edf82b6b551cfb1264381b28dec240a0b5b10e9f41e3b081dd5aca94767cd98ce7376
 EBUILD will_paginate-3.1.6.ebuild 617 BLAKE2B e2a2e320967a85f4897a173278089ac573ab644b25fbe200e5950eaf7bdef0f8aec4d0fa29f27cd2fc9dfec2f6f07bbf0084dafd1b50ce1b5373297b279749dd SHA512 4f503381427a42251b7739e9a18ffb05b1952140b6b7818ece0bd3a93f1ed2db8d1a464c5816a22ebc62ee63dcc0f980c4717fc516cb20197c1c3ce2cf196f91
-EBUILD will_paginate-3.1.7.ebuild 614 BLAKE2B 1332ac67ce16b3424dafa622ebd279ca6309c88b5d418636e82340016876d7f8c07908929a0f62510025f00e61dc6ed9f126233de675bb860282f11d59926e56 SHA512 3332a9c64d7a17f050be6dcc53e750b5134e9b35f7a4a1b0d4772d93b5f6037c4c4750f6db07f00ad911331d2388d165502b59873380196b108ad9346ea010ae
 MISC metadata.xml 346 BLAKE2B 859514393fc9d9ac988a812dbb5fc126a269616351c6d8fc32c6ec0f25d685c835f4c1d27ce818807bb330fdc50839b81e6f63d0eb4d77d8f6a95f2da3d849af SHA512 2e061bf277b39327fb84988df2dd9cf548c87dc0bdc51e63b47aeb816c099a4a7fa5b95fc1f3ba35e15c7499d897770397c6f6f2f4d3c1b03733f16f1d0556d3
diff --git a/dev-ruby/will_paginate/will_paginate-3.1.7.ebuild b/dev-ruby/will_paginate/will_paginate-3.1.7.ebuild
deleted file mode 100644
index 459c8b5f9558..000000000000
--- a/dev-ruby/will_paginate/will_paginate-3.1.7.ebuild
+++ /dev/null
@@ -1,31 +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"
-
-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
-	)"