gentoo resync : 30.09.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-09-30 11:19:18 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-09-30 11:19:18 +0100
commit: 62f67115b5c46134c34f88f4b1cbdacc19384c0a (patch)
tree: 0a76b14de203a4c23040e5665e39df8de9867745 /dev-ruby
parent: 265dbe5dbc14c199299496c6db8fce3f76647015 (diff)
55 files changed, 438 insertions, 636 deletions
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 3ef5b49b19df..aa88bda46d54 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/asciimath/Manifest b/dev-ruby/asciimath/Manifest
index 47422403a645..49c73a18fdc3 100644
--- a/dev-ruby/asciimath/Manifest
+++ b/dev-ruby/asciimath/Manifest
@@ -1,6 +1,8 @@
 AUX asciimath-1.0.4-backslashes.patch 1246 BLAKE2B b34cfc0ac9fc57780ce24e6aec242c19bb667b254c95eb306093d94dd0b1d8554e23911e74ba1f595622dc2533af0d9002108a2fcb502acb38ebc0a1d71c41b0 SHA512 3c5ea019fc0d1c71b156dc9a6263211cb1bd3c69c4b9c390f1c3d10a4504e281e7cacaca68efa7daeae6af1327931ff99124c8c498eab9a8a04d6313ea1260d7
 DIST asciimath-1.0.4.gem 14336 BLAKE2B 84aac2d2b987f72a17288cee6d00197c429e04c216fad62ecd23b5f3eebe9590ead519df86cdaf99246dcfee4c18bab67176a0d47a1b864de6e44bdb4b90b70c SHA512 e99e6f869dda3e0236392039e6dccf5912b095e32ee7acbfb4684a5d723d05f4d3c9961554d5beab2a3d703b1ef50c45ed15c0dbda2179ab35d3b1b6b8759b49
 DIST asciimath-1.0.5.gem 17920 BLAKE2B 119a4c8639a3fa1d67ba745a988fa2c3e5bb1290c2fa5237e9ee4f4945e1ac57cd3789a7131ef1d95ef1f30c3155820187a358d842e3e27788854f70bed89c42 SHA512 7353d052b80825ea5944de7fed67acc02eedbc78c112e1252d49993eb454f59180076b75d92f259c0c1c51bd63436c4aa9b6eefa2e8e6cf70b1de4ab941b43dc
+DIST asciimath-1.0.6.gem 17920 BLAKE2B ccd35f77f7ff9312baf1de81d9c1c15009e9efea7be000ed2afad86b06697bb967980baab1f04a73503cd374c062d68ba99d6e42528ffe3d1c16a8f768813f7f SHA512 cecfdeb063e0dd2da9c92ec4ac51d30334d19f10ca2cde9380c740e61a1be435793bd5e6ae7795d1c4147056faaef0d44ea422b6ff8207cb11c8125422872f24
 EBUILD asciimath-1.0.4.ebuild 532 BLAKE2B bfbcb5e1e5913beb328aebbd24cfbff7878e8020c284c9486adc39c0ac26a23a61baec00ad40de4308a3d4f48ff7e7ffdef52d3a19a7ae9095759e9dbdbe04b3 SHA512 ad5633bc2670e4f824c309f316df11f6b6c1b5a63a9ed81f444789e86d69f5adbe28754d032ea3442a113284cd4b5905ad79089f30c174a14a26f64002a494d6
 EBUILD asciimath-1.0.5.ebuild 538 BLAKE2B d10fab4ecbe6dc13e07d5e170f40feb3bf19ef5d70abff187a38ce662b0575e8f1058e29f242f9c576adebec0bf23b9839d6bb2d8d3b65234c8ed8436043c2c5 SHA512 a7846d336be425006dab8be82ae5f1d3aae62b5cead1abfe98ff0e6ce9337b73d3d5b9b63e6b9e3734cdb48236ce8710780dfb32bf298910856642f7f494a576
+EBUILD asciimath-1.0.6.ebuild 496 BLAKE2B 77a342935dff525e8309bfda153d3835483dea93d0f35fde5f67f231e052073727e62aaf99dfd14edda490e5560d3b5c374653eeef98fb6db13a826d697b8eca SHA512 cb236c68178e7c672576a1f622d1df9b7dc7dd4b43a7fd4758299aca6478afbaf7a41ea4ea650507b3fd2f3b7439ed8de2336932fd90852cae5e3a629c676e5d
 MISC metadata.xml 344 BLAKE2B 7979667ff10553d0f1c80a34a03bca56057a4dcf856440b9f9bc4ea64aa018da426601b76dff578625481cb51f7384c7716a3aa98670f178c4209ad39a9af9d9 SHA512 606dd415c7a141188cc94a7d56c67d42be1c2420f8ba9ee7a44707b99a6035df1cd8d358de575e12008f0560aa2b87b57b5892c67f3d931aa28c5938373a8075
diff --git a/dev-ruby/asciimath/asciimath-1.0.6.ebuild b/dev-ruby/asciimath/asciimath-1.0.6.ebuild
new file mode 100644
index 000000000000..106e42369786
--- /dev/null
+++ b/dev-ruby/asciimath/asciimath-1.0.6.ebuild
@@ -0,0 +1,20 @@
+# 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_RECIPE_DOC="rdoc"
+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/bunny/Manifest b/dev-ruby/bunny/Manifest
index e3ac5c56bee5..65c673c1ed9b 100644
--- a/dev-ruby/bunny/Manifest
+++ b/dev-ruby/bunny/Manifest
@@ -1,7 +1,9 @@
 DIST bunny-2.10.0.gem 202240 BLAKE2B 7651c904b851930d044c240d83942aa1afd20c5a1e4c97e50dd1c3e40991de916c0435bf28769c6bd4a49202c2d58bb9b7be92a19413f0188472bc1e1ff7ef5b SHA512 af8f5d8b78efffa32824007c3aa472a2492b563767e7d00616feb86b5d350a4bcda0258ecbace02a3e81b5f552476d3b71ef742117c13e6d14a6b352cc4dcd89
 DIST bunny-2.11.0.gem 202240 BLAKE2B 29cfa68c4aeb04e3b826f02afb083dc479f851ae24c285963f56aa81e64b532577d20f10649fdc339d4b3ede6fc2619a03f35a3cc8a8bb75e3d57a1a6ebcbeb4 SHA512 540636337b5af36cee691e61677fc381be26d57b1e5dd175fa0dcb7f1fe8f531412ad1b1c5812d5ca9af1b2f83b09f37c2cfb1456643fb7872d4e6cf9de6b011
+DIST bunny-2.12.0.gem 204288 BLAKE2B d944e8d32ad5f61b891e62062f3e164b4eeb4edb969eccb429f4aaad80d6b4ad1b1f1b618f6e2a3675e218f514933de8a1776bf6f8a5d68b12abfdc40e7a0fea SHA512 1cb848b7e141b2299716e01dbb64bb4072a6eee1f51a0e14b1073318dc3864579f052b938fb766be29b92cc65b4a508c80d75d20c06dfbdb2adac8dfa1f5d406
 DIST bunny-2.9.2.gem 201216 BLAKE2B c885364558c7833f77f3154765468f1c4d2f3f75c34a14f9c3dc64aacb1f8f048ff1f688914de5831f0f924975facd259e2f55667d58e468aae410f3db9da61c SHA512 24e329fe2cb84a0789ac53d5cd406a999f0b415439dfbce75dc36646e53c5a138d20980489fc1dcc6741026082fc268f9adb00370478d99accf0f42a4e05ad12
 EBUILD bunny-2.10.0.ebuild 642 BLAKE2B 104dda9e0df4fc062f98d57a84eed602fe658247100b0bcfa4b9641d99dc44797e78268e696f6c82c2a170db8ac63802837c0dd99da8ed1641dfe2668de4df24 SHA512 dcc5261152dba7a7e110556a1d3c01b0c7937f81295e152b8290f2a026cc241684e92daf751d44b9692475f9516f58bbd113b0015f63f0773a2439f6e8eff282
 EBUILD bunny-2.11.0.ebuild 642 BLAKE2B 104dda9e0df4fc062f98d57a84eed602fe658247100b0bcfa4b9641d99dc44797e78268e696f6c82c2a170db8ac63802837c0dd99da8ed1641dfe2668de4df24 SHA512 dcc5261152dba7a7e110556a1d3c01b0c7937f81295e152b8290f2a026cc241684e92daf751d44b9692475f9516f58bbd113b0015f63f0773a2439f6e8eff282
+EBUILD bunny-2.12.0.ebuild 642 BLAKE2B 104dda9e0df4fc062f98d57a84eed602fe658247100b0bcfa4b9641d99dc44797e78268e696f6c82c2a170db8ac63802837c0dd99da8ed1641dfe2668de4df24 SHA512 dcc5261152dba7a7e110556a1d3c01b0c7937f81295e152b8290f2a026cc241684e92daf751d44b9692475f9516f58bbd113b0015f63f0773a2439f6e8eff282
 EBUILD bunny-2.9.2.ebuild 642 BLAKE2B 104dda9e0df4fc062f98d57a84eed602fe658247100b0bcfa4b9641d99dc44797e78268e696f6c82c2a170db8ac63802837c0dd99da8ed1641dfe2668de4df24 SHA512 dcc5261152dba7a7e110556a1d3c01b0c7937f81295e152b8290f2a026cc241684e92daf751d44b9692475f9516f58bbd113b0015f63f0773a2439f6e8eff282
 MISC metadata.xml 339 BLAKE2B 4a125163d9a518d1b7da4bacf6af27231a0015ac40cec6278b0d144dc43734bf5b4957d0ecce757f4029634768da9460c44e6be884b8f1649cec204f5ec79e7f SHA512 2d782782ba704b3ea7db62f8b7fbdb71e09bbe7429de43461be76c6319d4e81d502a75008b12a580a9ad8a0d34ceba6bbc749ec061a7fb288043e7d9e2c2670f
diff --git a/dev-ruby/bunny/bunny-2.12.0.ebuild b/dev-ruby/bunny/bunny-2.12.0.ebuild
new file mode 100644
index 000000000000..973c02b1ffe4
--- /dev/null
+++ b/dev-ruby/bunny/bunny-2.12.0.ebuild
@@ -0,0 +1,33 @@
+# 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"
+
+# Tests require a live AMQP server.
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_EXTRADOC="ChangeLog.md README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Another synchronous Ruby AMQP client"
+HOMEPAGE="https://github.com/celldee/bunny"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/amq-protocol-2.3.0:2"
+
+all_ruby_install() {
+	all_fakegem_install
+
+	insinto /usr/share/doc/${PF}
+	doins -r examples || die
+}
diff --git a/dev-ruby/capybara/Manifest b/dev-ruby/capybara/Manifest
index c7240dfaa901..4afbf8d64ca6 100644
--- a/dev-ruby/capybara/Manifest
+++ b/dev-ruby/capybara/Manifest
@@ -1,13 +1,13 @@
 DIST capybara-2.18.0.gem 274432 BLAKE2B 992799362025b81a0d074fb06fdafef4c4385ca18ea85a7095d9e58625df6a59a349b60b462c5c4f403a6af955466bc46d82be6cd91724fc2b12cbe15ed74a4c SHA512 3bb994e022593d485a07296193a16cae7b45e96e87dd10b2bd4807ad2bc990801044c0493360598d1626c3e367e8de87e407f65c2c6f42674d5f1b9c0b5c1933
 DIST capybara-3.2.1.gem 284672 BLAKE2B 9da8f588049fab74c4e734626e42758cdd4baf555cfc64e7456bfab2cb4d5c90ed6bfc8ada7cc0d6323ef1113169aec70fd4254aa50c003408376ea4afe00a06 SHA512 50af1d4c49c200a4c08901d19b16826499abb8d19de8e059160c509afd555edbe620b6fd5d78f8c286feeb15a72e5a4b241cb1f14151b349fd94cdd3648b64b2
 DIST capybara-3.6.0.gem 296448 BLAKE2B 4054aaac6b6e0d5f1f0c1adee1951dcac7fcb3b2061dfe9de261e6c8bb749d6c88eb2c5a635b683e9a02719870435d52546701f4f21f722068836d4acd78f3eb SHA512 d99e9aab306955e01c08f26e7e8e042019b30d97c106ce6e33c96d7277670b81a143312c06e89c2f6c5f959af461d219c213c3660e895bec1e8cfcae030728b4
-DIST capybara-3.7.0.gem 299008 BLAKE2B 79f08d71085e6fd42986da5cc69e9f2df21ad65eaad7bbc2d450815c5cd3f6ad38889739ddab7e2fa92548bbe4c23940f46e99a5633b3a6fe80988bd417d55ff SHA512 0c40bdaad6423fa86d1e41bc5c2e8ec8bdb90326631f464dd4ed759a28b9c6e03fd4f5292e11f05cf478c0a5ce19b2df628a259861fb80f94fde367d4f4dacde
-DIST capybara-3.7.1.gem 299008 BLAKE2B 0f90ee7266a360c0430e55a60f354f2cc079ce3ffa318a12eef1c8faf9637a1d0678f049fc1a921657ca557d99a30bad54ff51b00645eedbc4ecf9567f9d6a20 SHA512 6d5546607652439f7c487e60859803980e90a511acf43a3bb1b197d2f27a9edf50f95a77d4de2fd40570373c03a25b4a0450bc84d509abd264b926acdc1132f1
 DIST capybara-3.7.2.gem 299520 BLAKE2B eea9d0bc35483174ccedd9366c04484a5b819e40aa6f0d01ceefad1700b04ded446d2b14de826981296666fd5f7a5440f08dc2ee437ee3db8e7bcd70d6cde636 SHA512 980346ea0fd1c3cb6de2423707d8c8e637f64bde2c1ef48622a08d1fe2177e29eb5d7125a048ebafaf4ca1591c483d34a8b17ed7288985dad783023ed35305e0
+DIST capybara-3.8.0.gem 300544 BLAKE2B 12e6d0f316fdc050380b494dd9d1b35feb14dfcf2e2fca7b439e76538f79e17020774fb02667fe2b576b5fb54fb432fd7a06fbf7147baf71baccfa5d307a337a SHA512 6b8069e1f39d42695bb8f96ddd6f221e1ddcf09ceeeec65588721c89d232497a53fd8e3b8018e65a306eec0a187a15ed26c481a7574a6af7260f86466449c864
+DIST capybara-3.8.1.gem 300544 BLAKE2B 05c22b603bb67d3217fa9c4c87bbd79b2249219d9a62d00c511fb7c8272092d381b7598e82cc03c5080b9c5ec20a9d64602ba37d235eea9717e741232c05c24f SHA512 ee4d2b3226e5233a092d163b4323f02ba84ad682682dc9e17a4343380e4480774eac1bba28e12a83000438c7bc1d2698fe1aabe6162ff729a243fb863f06fffb
 EBUILD capybara-2.18.0.ebuild 1525 BLAKE2B 17327933169f1c330a0f0580b8dfd00be4ae39e0fa94d62e172d6621a8a91189925acfca3730685ed80573e6eb456f731d8072fb1adb2653b6b646714a89bc5b SHA512 a6347a7b9014e3ca1bdeee9eed2a9e22d866dd831041e700086b00c4245d254ea3107c82b019f7550faa273777430898c571c837ac4202cdb2cfdf15068edd47
 EBUILD capybara-3.2.1.ebuild 1518 BLAKE2B af598a905b37db7eb77511372ace937bff702c2aa116afcdf4bb2d32bd99489e95a61ca442c8cf5c8174fe7f0021fb7aadb6fda65b2dd7ab41a1d8829bd3099f SHA512 9bcf03fa1561b95257a319825c5ae165914fac5ad4993e028f51d9b3d70bebc7e51203f30cf70d2a9b66a61a4b30dfe85d79037a5f19c3e61997f0e3f41f5372
 EBUILD capybara-3.6.0.ebuild 1534 BLAKE2B 5c0175bc808c5cf563d7985466a3c2650ba7fbd6e48f9c569015e6b41ee05359b5475e377a6d90ba146acdae95bd864836c4431236da0a0518fbe07ea490009d SHA512 7b0b3182c1145efcd2267f37d0ed5f0b5d1d6be51ca6549980df143d9964abca673581b0fe6b68c2d00d8163a252603006ee0a68b42d7f0d8cd3f1d7db9ceeae
-EBUILD capybara-3.7.0.ebuild 1534 BLAKE2B 5c0175bc808c5cf563d7985466a3c2650ba7fbd6e48f9c569015e6b41ee05359b5475e377a6d90ba146acdae95bd864836c4431236da0a0518fbe07ea490009d SHA512 7b0b3182c1145efcd2267f37d0ed5f0b5d1d6be51ca6549980df143d9964abca673581b0fe6b68c2d00d8163a252603006ee0a68b42d7f0d8cd3f1d7db9ceeae
-EBUILD capybara-3.7.1.ebuild 1534 BLAKE2B 5c0175bc808c5cf563d7985466a3c2650ba7fbd6e48f9c569015e6b41ee05359b5475e377a6d90ba146acdae95bd864836c4431236da0a0518fbe07ea490009d SHA512 7b0b3182c1145efcd2267f37d0ed5f0b5d1d6be51ca6549980df143d9964abca673581b0fe6b68c2d00d8163a252603006ee0a68b42d7f0d8cd3f1d7db9ceeae
 EBUILD capybara-3.7.2.ebuild 1534 BLAKE2B 5c0175bc808c5cf563d7985466a3c2650ba7fbd6e48f9c569015e6b41ee05359b5475e377a6d90ba146acdae95bd864836c4431236da0a0518fbe07ea490009d SHA512 7b0b3182c1145efcd2267f37d0ed5f0b5d1d6be51ca6549980df143d9964abca673581b0fe6b68c2d00d8163a252603006ee0a68b42d7f0d8cd3f1d7db9ceeae
+EBUILD capybara-3.8.0.ebuild 1534 BLAKE2B 5c0175bc808c5cf563d7985466a3c2650ba7fbd6e48f9c569015e6b41ee05359b5475e377a6d90ba146acdae95bd864836c4431236da0a0518fbe07ea490009d SHA512 7b0b3182c1145efcd2267f37d0ed5f0b5d1d6be51ca6549980df143d9964abca673581b0fe6b68c2d00d8163a252603006ee0a68b42d7f0d8cd3f1d7db9ceeae
+EBUILD capybara-3.8.1.ebuild 1534 BLAKE2B 5c0175bc808c5cf563d7985466a3c2650ba7fbd6e48f9c569015e6b41ee05359b5475e377a6d90ba146acdae95bd864836c4431236da0a0518fbe07ea490009d SHA512 7b0b3182c1145efcd2267f37d0ed5f0b5d1d6be51ca6549980df143d9964abca673581b0fe6b68c2d00d8163a252603006ee0a68b42d7f0d8cd3f1d7db9ceeae
 MISC metadata.xml 343 BLAKE2B 93caed6f938d8f2c10a7106e7377812064351018521cbb63477340af9531c5c67940097580c5f7610cea03b0dde6853c9fcbe9ab8cf5daa2a49018b8888e20fc SHA512 1e526463690f3ff61390ed77cb528352bdd1c089b368c3f6ab587766d81167afe99f752b861233f755e10bf2aa6f09dde98a9dc359d51392f15b55462ba66e77
diff --git a/dev-ruby/capybara/capybara-3.7.0.ebuild b/dev-ruby/capybara/capybara-3.8.0.ebuild
index da6c2de9e770..da6c2de9e770 100644
--- a/dev-ruby/capybara/capybara-3.7.0.ebuild
+++ b/dev-ruby/capybara/capybara-3.8.0.ebuild
diff --git a/dev-ruby/capybara/capybara-3.7.1.ebuild b/dev-ruby/capybara/capybara-3.8.1.ebuild
index da6c2de9e770..da6c2de9e770 100644
--- a/dev-ruby/capybara/capybara-3.7.1.ebuild
+++ b/dev-ruby/capybara/capybara-3.8.1.ebuild
diff --git a/dev-ruby/cri/Manifest b/dev-ruby/cri/Manifest
index 429152f66a72..de42a1ec27e1 100644
--- a/dev-ruby/cri/Manifest
+++ b/dev-ruby/cri/Manifest
@@ -1,15 +1,11 @@
-DIST cri-2.10.1.gem 28672 BLAKE2B fe6f78ec193298605995e00242a4f615159192b66900c111fa58252aea63c3a5515a0e7a9d7c5a1a0878a2e9c70a77023ee60be4d7b6c780d5f2d1300641e109 SHA512 f71cdd00613b226f916c9f45f9e8ce3a7c0c68bdb547de6df8b9457c018627c18ce978a13c971e0ef2cd24ec985f815df0389d0ddabd463eef93d5e2147e6101
-DIST cri-2.11.0.gem 29184 BLAKE2B cd6df24e9c50be519e8d8cba06c7f747dab98c758a70de1f3ff7c3570a3f62b1b7d7769347d0922cc39d9588dd1d061a71b02c0de47a4182184eec8072720ae8 SHA512 ceb87803fc90a394effd3ba445ccb44a2bfc3700e44910766144074ef82b019cd5ddaffad93ce7e7b3446f94735736a4e53f5916924a33460b96afd7aea427b7
-DIST cri-2.12.0.gem 31232 BLAKE2B 742a86204e16280eb7fcb41dcecfdb4779e1676e4d2dde4d79055dc2f3db6e0dfd58b7e78e29e728e7d31fa59669f327e2c5a328b13ccd758012f1268b891d48 SHA512 a248815e5ecd3235a23ece390179ee8763fd99c47e559139c769442b68b4be61e8fee6a90adf64196722c22ff321db9bad84162c28dc149acddff9edfa5b4ab1
 DIST cri-2.13.0.gem 31744 BLAKE2B fb1ba32f4413b5b0f63d105c0770e26c20252744c0db0405dd7528f1a3a3a588b20d2f34611d06f74c21374228954b9acd5991bd6e5574f84ede55ff8682c17c SHA512 a583129316c58fa90336f867f7a723478f64f0a755d0e6d4a34c829a0867e7b917203dddb5594f6fbed63993fd56e6a0da4bcae33013920b5b5aa85936047a27
 DIST cri-2.14.0.gem 32768 BLAKE2B 08c0a2bcbde8d01187e310020e95eb3fb0f41596f1b305ba64c11174493a1dfb61a5bc35ed3121052694eae5dc9d17d333909892ab9ea17b8e065b353d8ab01a SHA512 dc79d69a01978c88aebb15d03317f46fd49930025af6a300cfc3440a4928cf27fcd025c3f25b79c108ee12638d9409c81da566bb458b5ded031546925ddd5e1b
 DIST cri-2.15.0.gem 32256 BLAKE2B 995cc9e457724c540c8ae5817d6b62d7064dd19a7734fda70fc5e644dc64077ca124572cca0d2caa6858d58f28c0fab2fafc939946b06f2d31982adb169ff9dc SHA512 7325781d9fe54ba3269d0b64f8e7eb8228171aad553f9ab10fafdae4f927f6deb7061ced798e010d50e849198744c8377de3bf5a29b7c25dc45c2fee9049dfad
+DIST cri-2.15.1.gem 32768 BLAKE2B d1f829443a724a6d72f13effb279d8578ebdc4ca0b354f3285d68693eae1e6514cb0bcf831ed0068df72469f3be4b21af61a68056dc8c5fb105991cb677e906e SHA512 6ce36b74391d9635094614f5fc33738d65e40b8796caae3e39d4bc170d6f9f4bc5b2b944d36d79b453f9ba7715e2858b27f1c7433b53ce0bcf2fe748153d75a6
 DIST cri-2.7.1.gem 25088 BLAKE2B 20317d886401d6d5f034c27396cad2fdaf322246c319ef3cadc3e38169dbc00c83771fdb2d564efd0ca386b916a0bc2d8cf283742ccd18ca390e491a84f5e31f SHA512 37d641390dc83550c254b3c48018f7f2c53f73161807c299cb78ef84b8625e5f00cd8c877ac464ece5c6623d7118872c45648ed56c2bd5f53ae62cd66b8e24d1
-EBUILD cri-2.10.1.ebuild 772 BLAKE2B ce43c4c23ea400229c826bd18c7baa6a68f0749eb3507e927ccf79d89da6f9e9cc491e45e694c930d1fa78d64cb7560d282edf86424994c5adfbd6f7909e942a SHA512 1974af8955cb30a496a14066fab05a7ee499045e17fa6642d9e97904b6bd2700c5b06e7b81b882039a03cd03bc13bf5da9f61510beb40638f686d65e045254a4
-EBUILD cri-2.11.0.ebuild 770 BLAKE2B a281b6c5524b3dac245dc5a892d4fa278d275ea12af194332800627832484016b5090e3b0cc6da82bc0a27e3fa85211d6704dbba0f9d2a2a055b2bf28745ee25 SHA512 a33ab9b67b71b48e61196ea591909fc9de4ab537dbb05f8e2740db4c7905f7ec5074dce2d8698d0b390fa8374f88a4c9a83ef0e96371d46ad9ac38de202bbf1e
-EBUILD cri-2.12.0.ebuild 770 BLAKE2B a281b6c5524b3dac245dc5a892d4fa278d275ea12af194332800627832484016b5090e3b0cc6da82bc0a27e3fa85211d6704dbba0f9d2a2a055b2bf28745ee25 SHA512 a33ab9b67b71b48e61196ea591909fc9de4ab537dbb05f8e2740db4c7905f7ec5074dce2d8698d0b390fa8374f88a4c9a83ef0e96371d46ad9ac38de202bbf1e
 EBUILD cri-2.13.0.ebuild 770 BLAKE2B a281b6c5524b3dac245dc5a892d4fa278d275ea12af194332800627832484016b5090e3b0cc6da82bc0a27e3fa85211d6704dbba0f9d2a2a055b2bf28745ee25 SHA512 a33ab9b67b71b48e61196ea591909fc9de4ab537dbb05f8e2740db4c7905f7ec5074dce2d8698d0b390fa8374f88a4c9a83ef0e96371d46ad9ac38de202bbf1e
 EBUILD cri-2.14.0.ebuild 770 BLAKE2B a281b6c5524b3dac245dc5a892d4fa278d275ea12af194332800627832484016b5090e3b0cc6da82bc0a27e3fa85211d6704dbba0f9d2a2a055b2bf28745ee25 SHA512 a33ab9b67b71b48e61196ea591909fc9de4ab537dbb05f8e2740db4c7905f7ec5074dce2d8698d0b390fa8374f88a4c9a83ef0e96371d46ad9ac38de202bbf1e
 EBUILD cri-2.15.0.ebuild 770 BLAKE2B a281b6c5524b3dac245dc5a892d4fa278d275ea12af194332800627832484016b5090e3b0cc6da82bc0a27e3fa85211d6704dbba0f9d2a2a055b2bf28745ee25 SHA512 a33ab9b67b71b48e61196ea591909fc9de4ab537dbb05f8e2740db4c7905f7ec5074dce2d8698d0b390fa8374f88a4c9a83ef0e96371d46ad9ac38de202bbf1e
+EBUILD cri-2.15.1.ebuild 770 BLAKE2B a281b6c5524b3dac245dc5a892d4fa278d275ea12af194332800627832484016b5090e3b0cc6da82bc0a27e3fa85211d6704dbba0f9d2a2a055b2bf28745ee25 SHA512 a33ab9b67b71b48e61196ea591909fc9de4ab537dbb05f8e2740db4c7905f7ec5074dce2d8698d0b390fa8374f88a4c9a83ef0e96371d46ad9ac38de202bbf1e
 EBUILD cri-2.7.1.ebuild 772 BLAKE2B 3e09c46b3ec082da544c48c2a4c6a024ec45c83547bb3558a5b26c0399818a1fd9ee602155aeaea5e7a408fe4d3abc1294f03bd1d3d14af437a77ba125651e48 SHA512 29b1e00f40376ec04affde1d366437fb65bddab170bc6f4b66c3a4f42c560bd2970b923a2cfa17e62620170695c1929e6958b1f0da966e87280ada6c08b80ee8
 MISC metadata.xml 321 BLAKE2B 2bbd02b4b0f33bb2e3942b93c9af104fcafe960a59b2f109935f5121c2476635f1a3efb9ac092f4f5e6138df0398ea0ca874ee62390d20f3620d442d3502d42d SHA512 8e90f3ffd2b30ff9557e4c11bb31655cbd65498191288c68191f2e5f6d7bbdab6f1c22935f8d45fa95673582d1d0bf776055c0242cee2da27c9d3e71e2851f72
diff --git a/dev-ruby/cri/cri-2.10.1.ebuild b/dev-ruby/cri/cri-2.10.1.ebuild
deleted file mode 100644
index 92fbb3fd7839..000000000000
--- a/dev-ruby/cri/cri-2.10.1.ebuild
+++ /dev/null
@@ -1,34 +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="NEWS.md README.adoc"
-
-RUBY_FAKEGEM_TASK_DOC="doc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Cri is a library for building easy-to-use commandline tools"
-HOMEPAGE="https://rubygems.org/gems/cri"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-SLOT="0"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/colored-1.2"
-
-ruby_add_bdepend "doc? ( dev-ruby/yard )
-	test? ( dev-ruby/yard dev-ruby/minitest )"
-
-all_ruby_prepare() {
-	sed -e '/coveralls/I s:^:#:' -i test/helper.rb || die
-	sed -i -e '/rubocop/ s:^:#:' \
-		-e '/RuboCop/,/end/ s:^:#:' Rakefile || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib -S rake test_unit || die
-}
diff --git a/dev-ruby/cri/cri-2.12.0.ebuild b/dev-ruby/cri/cri-2.12.0.ebuild
deleted file mode 100644
index 30952c0fb573..000000000000
--- a/dev-ruby/cri/cri-2.12.0.ebuild
+++ /dev/null
@@ -1,34 +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="NEWS.md README.md"
-
-RUBY_FAKEGEM_TASK_DOC="doc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Cri is a library for building easy-to-use commandline tools"
-HOMEPAGE="https://rubygems.org/gems/cri"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-SLOT="0"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/colored-1.2"
-
-ruby_add_bdepend "doc? ( dev-ruby/yard )
-	test? ( dev-ruby/yard dev-ruby/minitest )"
-
-all_ruby_prepare() {
-	sed -e '/coveralls/I s:^:#:' -i test/helper.rb || die
-	sed -i -e '/rubocop/ s:^:#:' \
-		-e '/RuboCop/,/end/ s:^:#:' Rakefile || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib -S rake test_unit || die
-}
diff --git a/dev-ruby/cri/cri-2.11.0.ebuild b/dev-ruby/cri/cri-2.15.1.ebuild
index 30952c0fb573..30952c0fb573 100644
--- a/dev-ruby/cri/cri-2.11.0.ebuild
+++ b/dev-ruby/cri/cri-2.15.1.ebuild
diff --git a/dev-ruby/facter/Manifest b/dev-ruby/facter/Manifest
index d77fdcd27679..e37c126b18fb 100644
--- a/dev-ruby/facter/Manifest
+++ b/dev-ruby/facter/Manifest
@@ -1,16 +1,12 @@
 AUX 00facterdir 15 BLAKE2B 88b3bebceec0d9b8943b36a373a5475d2600c8cee5770c2f9391615958b27b842ede98d7a476cb488e249b1dc14258574bf2f77912599fef98fc325914c8f014 SHA512 381973ca23aec0853714495f74b77155f0079e504312dc55e6e22c8a099aeafd2b7bc4a762c95543c3cd9c5fa5f88a6821f4104b7522536aee7b6f5426d9ec2f
 DIST facter-2.4.6.gem 246272 BLAKE2B 105a43b2697cde0a48d4fcf87e221cfcb348695f81722b8cfe2819a8f3fe19e575d22642a708c798648d05c71f54e7bf0281345320612a8fdb3b68fce993ec20 SHA512 a0a2bef37451ab96ed331c79171f77d89b6db430b083e6888a306fa5b57a72986b7f600cad3e09b5f4706e54736d1d32ea25525fe18a6108cc95f315da16664a
-DIST facter-3.11.1.tar.gz 384201 BLAKE2B 349493f0046239ed900cb22df6cac2f5c1f748503e057a68e9be34c2f24f134a280ab9292d7f4e754a5974818a1fd01bc55634905d84706b47686a9e7a1ccc39 SHA512 295c91817912fb43fe259ede4b51ecf4ae5efd500d64b2682c700583bfdf694a8849a4bd4cb3a16a8046d563f487225957a49b760cc03d8bf86ac8487e37a756
-DIST facter-3.11.2.tar.gz 384784 BLAKE2B f280772231a9105e5924cdb777411861a76a67c15b4d7f3cc73fb9c089752a4e5fa43c4d84b8525917fae71ae34c770925161cc94882e74a704d6609b1c1778a SHA512 aaeee7449813590ac8bc8d3b1b2a654e75bcdaabbb19f91f8b282f747e0f8af05ef71bc872b99c226f0db4d06b67549551f62c365853f5829c6b26c931c0b582
 DIST facter-3.11.3.tar.gz 384882 BLAKE2B ad6103df38efb6abd68d9f831e53dba2767401e129d55bb94adee4dc3f8bc48c7a969050cc52d395a196883d561317ccb72bfaba2775e003171fd6941935feb8 SHA512 6b2dbc5a0bc1c70739a4c0987311ef0891a27f64ed1b45a46cc20a37e6d1d24fda0481976fbf743f83f10d2014f6e0df0e2b5cc9eba19924e831652e1a8417ef
 DIST facter-3.11.4.tar.gz 388074 BLAKE2B c3105376ba8d74df08e7e19ca7b5291d241d57aebb43a77d0dabe96668a07a62bf70fb18aa3bc3d85011e22f935a711daade17cf60ad867a7503e1b731647c88 SHA512 af58d0592a4b220d8f1d9a6d065da71136b58b7a474587c140021fd2915d920d328bad52178566f26292bd932ca1ac1371a631f88a567876265c7494bb01c518
 DIST facter-3.12.0.tar.gz 390445 BLAKE2B 8c7f2fccd16df3b13df451c18eaeb0cb837d1408b247bbf35f264e3adc2daeb5efaf3008ecf95428433d19067310b2d273a6001e1e151c260d7777dd5185f54b SHA512 2ef78903f62784f86f8d155f9f10ba793c10742f87d80c894c6bd505ae9186b5e875366d9c05899fe5e25f2994cf66b7d73d6c6570a38a7bc6e45ff0d5108c36
 DIST facter-3.9.2.tar.gz 380883 BLAKE2B d2804664e0499715230e5696c5a9ebae933f5b43dfb37154251d47763c2c7f78cfa8d1413dd836e5a0c76ed67300d066fa5bb390f17f85cd4cb7a444eaf0d133 SHA512 bc040826311bbff40f5a151ade315d9d47ef1e0f3faa570805e48ca55405265e66308230118b9cd59f701ecd76a7b0fd4d9200dd4ace838521223a162b105374
 EBUILD facter-2.4.6.ebuild 1899 BLAKE2B a8e0d7c7a83c42150219a300d4a1a512913deee5d66e3a28a4f285a27d731cfa1937bb4d0d9bd8c80e133f2956ecf17690f5a94d66b385507a4f3740a425872f SHA512 0f4a589cb04567a42181bf366e51f6224d792c63bc2b38d2db3653688844e2cb611223fe148a6ff015d8dd734695214afc33ec0812e1707ac629344a691a396e
-EBUILD facter-3.11.1.ebuild 2851 BLAKE2B f7195a19a256dca9b6c1ca5aede6001421411869b4b4c1e9dd02ca91a9e73a6a4efeacbc2809bda46977f5ba2ea4b8efc6d52ecbd5a09b2fb44addfc2ff369b5 SHA512 fb1d8480fe94d452b49560093151be5ee068ab6b8a7f2fe7d90a1d07aaea0b0becd35d435189a7dbe9b9eff60ab2d82d703d700668951c562774f55dc12d375e
-EBUILD facter-3.11.2.ebuild 2752 BLAKE2B 6759e761e7152705a9fae260d626b78c32119553b63e37d19186b20d2afd8efa3a1b92286117f0c10486ecb818086e01352bdfedddd33b37e576cc9c90f731b2 SHA512 d9558badde687ae24b9150e36ccf7ee557463ba996c9654b87ccca5fa8ce44dbb38925282aa3af41aaa366b126a805d8cad42c2dd7d771ccb03d4b85ead17b63
 EBUILD facter-3.11.3-r1.ebuild 2418 BLAKE2B 9836f2e1a648b64509f8b20d20e8f3a274186440d4187b13b28355dcf57932a418cd18640b3b544d2b2fbe75e82b6fd07a0ff7d35d9b1e791a8b871df169dd3c SHA512 5d22eadc6b126276f08a5a9a3a44d0ed74634a5f5064081290f7daffb5930995ad15e71e6654efdc340febb6f5ae0053d469fa58c68b9bfe203ce5a78d0041ac
-EBUILD facter-3.11.4.ebuild 2420 BLAKE2B 08c571937a6069cdbad57b9a70236c6dbb8c58c85f6d820e7c310e005452b468bf5932c65fbb13ed4d3eb957814820bfee13727eb6e8d6fe119da2711463157e SHA512 13865deccd523a37cbc49950da7a9b614841dee503ff099733f4562216617ed1754850635156e05dbc20fd6add9fe37b60167a5315f5c4be2c30211cecdb5257
+EBUILD facter-3.11.4.ebuild 2414 BLAKE2B 5cd4badf41ecd15ae4ef397f74e12c426ba25928a94f3fb49415846b2caa204ec180cb88fe1858659fa01ae1fd0112d63cdc39f7c98baac9610025c88079a44f SHA512 ef33f862b72d3397275e3de9a23da38bdcd8eac3e59a7c244beee723162feb4c11dfd1fd1fe387ee0e79795493b27ff999c8f3487a2760181f6bb6db28d2b8d4
 EBUILD facter-3.12.0.ebuild 2420 BLAKE2B 08c571937a6069cdbad57b9a70236c6dbb8c58c85f6d820e7c310e005452b468bf5932c65fbb13ed4d3eb957814820bfee13727eb6e8d6fe119da2711463157e SHA512 13865deccd523a37cbc49950da7a9b614841dee503ff099733f4562216617ed1754850635156e05dbc20fd6add9fe37b60167a5315f5c4be2c30211cecdb5257
 EBUILD facter-3.9.2.ebuild 2106 BLAKE2B efcbbd0cfe6a71b1b1a08bbc1f7abe4b94845c9e13192deae811466211ab2ba533ae10732a4d72635609b9cb419051b7c4a39f248e9b06f7ec751cd893d28852 SHA512 5cfb67a3db8d288302f21bf0092c05ce19b40c8a2f00b4b9b63e3e02cd7d1af3dd20670b744520cb42db2b2ccd52e9153d86c0e1db7a36c4c7854c70d79149dc
 EBUILD facter-9999.ebuild 2420 BLAKE2B 08c571937a6069cdbad57b9a70236c6dbb8c58c85f6d820e7c310e005452b468bf5932c65fbb13ed4d3eb957814820bfee13727eb6e8d6fe119da2711463157e SHA512 13865deccd523a37cbc49950da7a9b614841dee503ff099733f4562216617ed1754850635156e05dbc20fd6add9fe37b60167a5315f5c4be2c30211cecdb5257
diff --git a/dev-ruby/facter/facter-3.11.1.ebuild b/dev-ruby/facter/facter-3.11.1.ebuild
deleted file mode 100644
index f1584484e8b1..000000000000
--- a/dev-ruby/facter/facter-3.11.1.ebuild
+++ /dev/null
@@ -1,108 +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"
-
-# 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"
-	S="${S}/${P}"
-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"
-	S="${S}/all/${P}"
-fi
-
-BDEPEND="
-	>=sys-devel/gcc-4.8:*
-	dev-cpp/cpp-hocon"
-CDEPEND="
-	>=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="${CDEPEND}"
-DEPEND="${BDEPEND}
-	${CDEPEND}"
-
-src_prepare() {
-	# Remove the code that installs facter.rb to the wrong directory.
-	sed -i '/install(.*facter\.rb/d' lib/CMakeLists.txt || die
-	sed -i '/install(.*facter\.jar/d' lib/CMakeLists.txt || die
-	# make it support multilib
-	sed -i "s/\ lib)/\ $(get_libdir))/g" lib/CMakeLists.txt || die
-	sed -i "s/lib\")/$(get_libdir)\")/g" CMakeLists.txt || die
-	# make the require work
-	sed -i 's/\${LIBFACTER_INSTALL_DESTINATION}\///g' lib/facter.rb.in || die
-	# be explicit about the version of rspec we test with and use the
-	# correct lib directory for tests
-	sed -i -e '/libfacter.*specs/ s/rspec/rspec-2/' \
-		-e '/libfacter.*specs/ s/lib64/lib/' 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
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_VERBOSE_MAKEFILE=ON
-		-DCMAKE_BUILD_TYPE=None
-		-DCMAKE_INSTALL_PREFIX=/usr
-		-DCMAKE_INSTALL_SYSCONFDIR=/etc
-		-DCMAKE_INSTALL_LOCALSTATEDIR=/var
-		-DUSE_JRUBY_SUPPORT=FALSE
-		-DBLKID_LIBRARY=/$(get_libdir)/libblkid.so.1
-	)
-	if use debug; then
-		mycmakeargs+=(
-		  -DCMAKE_BUILD_TYPE=Debug
-		)
-	fi
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-each_ruby_install() {
-	doruby "${BUILD_DIR}"/lib/facter.rb
-}
-
-src_test() {
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-	ruby-ng_src_install
-
-	# need a variable file in env.d :(
-	diropts -m0755
-	dodir /etc/env.d
-	echo -n "FACTERDIR=/usr/$(get_libdir)" > "${D}/etc/env.d/00facterdir"
-	fperms 0644 /etc/env.d/00facterdir
-}
diff --git a/dev-ruby/facter/facter-3.11.2.ebuild b/dev-ruby/facter/facter-3.11.2.ebuild
deleted file mode 100644
index 1d8bed514221..000000000000
--- a/dev-ruby/facter/facter-3.11.2.ebuild
+++ /dev/null
@@ -1,105 +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"
-
-# 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"
-	S="${S}/${P}"
-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"
-	S="${S}/all/${P}"
-fi
-
-BDEPEND="
-	>=sys-devel/gcc-4.8:*
-	dev-cpp/cpp-hocon"
-CDEPEND="
-	>=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="${CDEPEND}"
-DEPEND="${BDEPEND}
-	${CDEPEND}"
-
-src_prepare() {
-	# Remove the code that installs facter.rb to the wrong directory.
-	sed -i '/install(.*facter\.rb/d' lib/CMakeLists.txt || die
-	sed -i '/install(.*facter\.jar/d' lib/CMakeLists.txt || die
-	# make it support multilib
-	sed -i "s/\ lib)/\ $(get_libdir))/g" lib/CMakeLists.txt || die
-	sed -i "s/lib\")/$(get_libdir)\")/g" CMakeLists.txt || die
-	# make the require work
-	sed -i 's/\${LIBFACTER_INSTALL_DESTINATION}\///g' lib/facter.rb.in || die
-	# be explicit about the version of rspec we test with and use the
-	# correct lib directory for tests
-	sed -i -e '/libfacter.*specs/ s/rspec/rspec-2/' \
-		-e '/libfacter.*specs/ s/lib64/lib/' 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
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_VERBOSE_MAKEFILE=ON
-		-DCMAKE_BUILD_TYPE=None
-		-DCMAKE_INSTALL_PREFIX=/usr
-		-DBLKID_LIBRARY=/$(get_libdir)/libblkid.so.1
-	)
-	if use debug; then
-		mycmakeargs+=(
-		  -DCMAKE_BUILD_TYPE=Debug
-		)
-	fi
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-each_ruby_install() {
-	doruby "${BUILD_DIR}"/lib/facter.rb
-}
-
-src_test() {
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-	ruby-ng_src_install
-
-	# need a variable file in env.d :(
-	diropts -m0755
-	dodir /etc/env.d
-	echo -n "FACTERDIR=/usr/$(get_libdir)" > "${D}/etc/env.d/00facterdir"
-	fperms 0644 /etc/env.d/00facterdir
-}
diff --git a/dev-ruby/facter/facter-3.11.4.ebuild b/dev-ruby/facter/facter-3.11.4.ebuild
index 683775e7668d..28bfa5860ac9 100644
--- a/dev-ruby/facter/facter-3.11.4.ebuild
+++ b/dev-ruby/facter/facter-3.11.4.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/faraday/Manifest b/dev-ruby/faraday/Manifest
index 49efda6bb715..d744ea49ff53 100644
--- a/dev-ruby/faraday/Manifest
+++ b/dev-ruby/faraday/Manifest
@@ -3,9 +3,11 @@ DIST faraday-0.14.0.tar.gz 65105 BLAKE2B bf5101083bd828e2ea98dcd487c7c082f8b2d2e
 DIST faraday-0.15.0.tar.gz 66086 BLAKE2B 5018d8e92b2988b08f4e7a5b0876ca6cd4049c74199ee0356adc48867611fd6d30d884bd3cf3e7703a02c7a6e967f9c47cdc44deb75045b8cee46992977fb834 SHA512 46602d89b1bbf5a41143a9a71fab193642e7c41db39dc1edc0efb99f4a7a924c5a698460a0a4f921f7ce1f73ee8eb12e6d79a08dea02c7142856d0aa1b95b521
 DIST faraday-0.15.1.tar.gz 66461 BLAKE2B 476fa62bf9cf138fd52d0d455d7bdd970d77f0337ec1cf42f7833def9ba77a3e94f0bdbbda4136ac03c5a98465081e3093c6a7a6e193cbd7494a284444516679 SHA512 cb4a14b29b88c356063e2d504e0a93b84b33b6488060a313b2eb6ecbf17eaf09c6fb0e0fabd0bb057623438de2a8538034551d62d719a1c90b6158a768f38a1b
 DIST faraday-0.15.2.tar.gz 66765 BLAKE2B 8cfe4c6c4f2bb1f0a5fd6a196d339118b09d67b8cdac0c258180ea03c39688af17790c7a15fb4dea4dfd4980c039f987464b2ba7e64c04931e9c31ac670c3618 SHA512 5911df09e770c4ee97f2c6c359a4136c268c598cc2f370a3aa112b5710c6c6b7f2704d3094677cd98c44532e3f0d6157df88e1c882d727eec511f4b62a04527c
+DIST faraday-0.15.3.tar.gz 67065 BLAKE2B 7425fb885cb26394ee91098264b5e4e3038a68855b9a55b03a39faca18d4e0cd516fe447b2312538692229bb15df091317ee36aad762937b46c72e16bb19cc8a SHA512 cfc59c44481e4be27504d02bfcbdc3a3783d15940487e72aaba136f5c456d74be6cad5a686e74eed1ad216fbb58db197d04015c2d168abbbaf899c4f855acdbd
 EBUILD faraday-0.12.2.ebuild 1901 BLAKE2B f686b6d0f5faa8b778b2e80e802c3126dacfea7b06849a7d95b9de0157db54846eac853b31b3ab18efb4e6f09749dbf0676eaca5b952725ae7e5d3417cdead5a SHA512 5a811d93fd62ee14ccf0425a2e59aed6ec676e81b85d994ad437e7f11a29848c4c978a3f235d5a0a76b2435d0aa1952cde1e2eefe9724f8a55c04493376bcefb
 EBUILD faraday-0.14.0.ebuild 1913 BLAKE2B 90c822920672463392a693df515f858879274a4478696dfe44c9065654e2da8fe30fb54f9c65d35f749a88a9f35216995f9f17d295b61c40bcf5384051ef42b7 SHA512 d4b2cf609bfac846889ac1c07ca816ddfa38236c90ab1e5a024cb06eacaf56ac074679e6b83d98f0a949a15c09f997294737cb4aa24f6e4b432562eae154c5de
 EBUILD faraday-0.15.0.ebuild 1913 BLAKE2B 90c822920672463392a693df515f858879274a4478696dfe44c9065654e2da8fe30fb54f9c65d35f749a88a9f35216995f9f17d295b61c40bcf5384051ef42b7 SHA512 d4b2cf609bfac846889ac1c07ca816ddfa38236c90ab1e5a024cb06eacaf56ac074679e6b83d98f0a949a15c09f997294737cb4aa24f6e4b432562eae154c5de
 EBUILD faraday-0.15.1.ebuild 1913 BLAKE2B cfd15b1bdc9ce8a71f4828cf9306ef20b92d246ef3e23dba227d081b2479dbb1448f46445c948d49e420ae07de3ac9175f0bf8993484375c7215c523c5b95089 SHA512 a712106ffba7548c7d5ab0039794c3779107496371a45b8e230241603f800bb95aa3f353ecc916fc1698c7a5240493f03a9378c8eb91b4afbb087de68e536f59
 EBUILD faraday-0.15.2.ebuild 1913 BLAKE2B cfd15b1bdc9ce8a71f4828cf9306ef20b92d246ef3e23dba227d081b2479dbb1448f46445c948d49e420ae07de3ac9175f0bf8993484375c7215c523c5b95089 SHA512 a712106ffba7548c7d5ab0039794c3779107496371a45b8e230241603f800bb95aa3f353ecc916fc1698c7a5240493f03a9378c8eb91b4afbb087de68e536f59
+EBUILD faraday-0.15.3.ebuild 1885 BLAKE2B 9e4817596b2f93e7f41f972ed65c44719687b35d92d37a42798a4083f4d38460376d7a7a05c5c9cc3c492f8b2725a595d3e48d27acdaaeb893c6754c983b5781 SHA512 0bd2ac281734b897be79794cf4bfa2a880f36eae4f6b91c7c003d719d167071991aae6ebd9e8abbcf2893d89326844041a5c4464dba6e401ffadb17cd2c549a0
 MISC metadata.xml 344 BLAKE2B 818dc9570594eef636f7b37ef9322ea083998a0905c0f9f55e758df3ebfa9e36efe5a42d95a666fc5c613a38b9c3a28d55ef0b3f48573dedf786883957d1adb2 SHA512 10e3c69f600e5be2306aef49c4466e399a52e2db52c8b53b7430bf72d6cb8696a71fdaa3a212eb37d2dad86480ea949447aee3f3e224f020e0629e56b35582e0
diff --git a/dev-ruby/faraday/faraday-0.15.3.ebuild b/dev-ruby/faraday/faraday-0.15.3.ebuild
new file mode 100644
index 000000000000..c12dbcec7c0d
--- /dev/null
+++ b/dev-ruby/faraday/faraday-0.15.3.ebuild
@@ -0,0 +1,68 @@
+# 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_TEST="test"
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem eutils
+
+DESCRIPTION="HTTP/REST API client library with pluggable components"
+HOMEPAGE="https://github.com/lostisland/faraday"
+SRC_URI="https://github.com/lostisland/faraday/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND+=" test? ( sys-process/lsof )"
+
+ruby_add_rdepend ">=dev-ruby/multipart-post-1.2.0 <dev-ruby/multipart-post-3"
+ruby_add_bdepend "test? (
+		>=dev-ruby/test-unit-2.4
+		dev-ruby/httpclient
+		dev-ruby/rack-test
+		dev-ruby/sinatra
+		dev-ruby/net-http-persistent
+		dev-ruby/patron
+	)"
+
+all_ruby_prepare() {
+	# Remove bundler support.
+	rm Gemfile || die
+	sed -i -e '/[Bb]undler/d ; 1irequire "yaml"' Rakefile test/helper.rb || die
+	sed -i -e '/bundler/,/^fi/ s:^:#:' script/test || die
+
+	# Remove simplecov and coveralls support, not needed to run tests.
+	sed -i -e '/simplecov/,/^end/ s:^:#:' \
+		test/helper.rb || die
+
+	# Remove tests for adapters that are not packaged for Gentoo.
+	rm test/adapters/em_http_test.rb test/adapters/em_synchrony_test.rb test/adapters/excon_test.rb test/adapters/typhoeus_test.rb || die
+
+	# The proxy server is already killed, may be OS X vs Linux issue.
+	sed -i -e '138 s/^/#/' script/test || die
+
+	sed -i -e '/git ls-files/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_prepare() {
+	# Make sure the test scripts use the right ruby interpreter
+	sed -i -e 's:ruby:'${RUBY}':' script/* || die
+}
+
+each_ruby_test() {
+	MT_NO_PLUGINS=true each_fakegem_test
+
+	# Sleep some time to allow the sinatra test server to die
+	einfo "Waiting for test server to stop"
+	sleep 10
+}
diff --git a/dev-ruby/mini_magick/Manifest b/dev-ruby/mini_magick/Manifest
index 19e0d5e4652b..e5655f2e748b 100644
--- a/dev-ruby/mini_magick/Manifest
+++ b/dev-ruby/mini_magick/Manifest
@@ -1,3 +1,5 @@
 DIST mini_magick-4.8.0.tar.gz 1184374 BLAKE2B 9949cb8b668d5b31c8a9b19ac1b68147e4865cebb2d51b75c01dad11bf98a64609acb90a08f08867f173424bfa720f83e475ab08853c11fff29e86e7af5bcba2 SHA512 7c582c967480f51114c42eec2f8c260713755fa3e6078eaf5a296b0cb4502f2edd1dd65d5ef46409226943913b81e8818fc3066a09879e9da7dcb0f9f732f6d4
+DIST mini_magick-4.9.2.tar.gz 1187916 BLAKE2B f619bc6fd559f76ecd45b91bce4ef8e75ec67e65f0e1a8c00d785e49491b9de81e320a3496f3ab5729f0ffe33e18afbaab762767b0835dc0af8bee0ec55cbd28 SHA512 c0747ddfdd304f9f9a820dd45e27d09ce723689dd989f036194c9177c7f9fe746dc85c2fc97a858c679a1cdf31d0fbacd50f6f927fd0d1905f5edbe3df2972ff
 EBUILD mini_magick-4.8.0.ebuild 2289 BLAKE2B f57f049bf7d9ae968cd7d2200dcc7cb22ee67af9a777ee66c1135bd2e1529ec695edec4b18ff7c11dafdc18be95ea58beb0008ec7bb36b1c56f59a6a92532e9e SHA512 9cd11f65288c59b3ffacb48d1955f1ac094c3591030dc3d139b697f011762062f5c3470f424e3284a2f7183d34d8218b0f23e3d0299ce5c04b60e84836365873
+EBUILD mini_magick-4.9.2.ebuild 2304 BLAKE2B ce52a173da14dc959a48df7344dc66f94e7ec7155045e0d2617e72cce11ea376c65c7cc3905e080931c6be3fa2ba503f117d2096c3cc6ff608255a4a00a19a83 SHA512 834e37dd02ea24fa979364e6f6e30390cc69eb153ff26b0b2be0b0623eb5f6dfe39c6464479a719c63b4b4712d05215b6b2ff2348a0970aac49f85041aaf54c2
 MISC metadata.xml 347 BLAKE2B 679c10bbe1e22a6374f3a45b14364514d2cb3c23e0b965e9418d1c8f10b1b036bbf019539d95fbf19630d6f315a930142575da49d237c782f7a11b100fa7fd2a SHA512 9b98a4a0ec7b4c2945df5300ad26d8ffe1394294d0c6e142dc7e55e2cd270327df70fed857ff7d6f12f6b0212d6c25b8043be7800fdcca20bd58d14ac75fe6d5
diff --git a/dev-ruby/mini_magick/mini_magick-4.9.2.ebuild b/dev-ruby/mini_magick/mini_magick-4.9.2.ebuild
new file mode 100644
index 000000000000..c08a0f9de12f
--- /dev/null
+++ b/dev-ruby/mini_magick/mini_magick-4.9.2.ebuild
@@ -0,0 +1,70 @@
+# 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_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem eutils
+
+DESCRIPTION="Manipulate images with minimal use of memory"
+HOMEPAGE="https://github.com/minimagick/minimagick"
+SRC_URI="https://github.com/minimagick/minimagick/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="minimagick-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE=""
+
+# It's only used at runtime in this case because this extension only
+# _calls_ the commands. But when we run tests we're going to need tiff
+# and jpeg support at a minimum.
+RDEPEND+=" media-gfx/imagemagick"
+DEPEND+=" test? ( virtual/imagemagick-tools[jpeg,png,tiff] )"
+
+USE_RUBY="ruby23 ruby24 ruby25" ruby_add_bdepend "test? ( dev-ruby/mocha dev-ruby/posix-spawn dev-ruby/webmock )"
+
+all_ruby_prepare() {
+	# remove executable bit from all files
+	find "${S}" -type f -exec chmod -x {} +
+
+	sed -i -e '/\([Bb]undler\|pry\)/ s:^:#:' spec/spec_helper.rb || die
+
+	# Don't force a specific formatter but use overall Gentoo defaults.
+	sed -i -e '/config.formatter/d' spec/spec_helper.rb || die
+
+	# Avoid broken spec that does not assume . in path name
+	sed -i -e '/reformats a layer/,/end/ s:^:#:' spec/lib/mini_magick/image_spec.rb || die
+
+	# Avoid failing spec that also fails in upstream Travis
+	sed -i -e '/returns a hash of verbose information/,/^        end/ s:^:#:' spec/lib/mini_magick/image_spec.rb || die
+
+	# Make spec more lenient to imagemagick quoting
+	sed -i -e "/unable to open image/ s/'foo'/.foo./" spec/lib/mini_magick/shell_spec.rb || die
+
+	# Avoid graphicsmagick tests because installing both in parallel for
+	# tests is hard.
+	sed -i -e 's/:graphicsmagick//' spec/spec_helper.rb || die
+	sed -i -e '/identifies when gm exists/,/^    end/ s:^:#:' spec/lib/mini_magick/utilities_spec.rb || die
+	sed -i -e '/returns GraphicsMagick/,/^    end/ s:^:#:' spec/lib/mini_magick_spec.rb || die
+}
+
+each_ruby_test() {
+	case ${RUBY} in
+		*ruby23|*ruby24|*ruby25)
+			each_fakegem_test
+			;;
+		*)
+			einfo "Skipping tests due to circular dependencies with Rails"
+			;;
+	esac
+}
diff --git a/dev-ruby/net-ssh/Manifest b/dev-ruby/net-ssh/Manifest
index e45998fd8f0a..38b770d8f952 100644
--- a/dev-ruby/net-ssh/Manifest
+++ b/dev-ruby/net-ssh/Manifest
@@ -1,5 +1,7 @@
 DIST net-ssh-git-2.10.0.tgz 172885 BLAKE2B 6b5c9928191fe40afe289fc2639d12e56160522c85553cba13393347c8ef02bbe6206dbefc23b65c04980cf9761b2b40a364d8e3e13e4073950736cf53fbf480 SHA512 f66db6465667baf0c253868cc15aab3261675a8c15ca4b244c3cd587ae5e8b7a273959b97d5fc498ff1b19e1f06f51ea571573d243366a59ef56faf41c2ae347
 DIST net-ssh-git-4.2.0.tgz 197417 BLAKE2B 5714185d9b83d3010e6b9baa07ac541e9227379cbfecc3a506d870d8d9fa528f59b605df4ff02ae6bfc16893bfb22734395096a77fcbe19fb939ecc1a343a9b5 SHA512 0a3609590d797a8cb4732e8cf743606a4919f57475b6eb2447a3db0c28f1bd405804fdc47a4062e503acdd4b785a1de9794a6db433cabb884105166eff6a8c5b
+DIST net-ssh-git-5.0.2.tgz 206757 BLAKE2B ac9a317dc238f7e3e794e4d8fcccc063d5d34dbe2e50a142e701957ad5c754985523624e97ca0b7d5773d2fefc3f10f3d61b2976997abd29511cd3934ea0e0bd SHA512 6e96d4b3cb2f4f14aa046af72b70a5e3b218153db40dc64996ad0061ea89cc9ac0dc0510a4231734c7385c03436d4116dfe4c9ac4b313c9fc5b029fc8a6c04d6
 EBUILD net-ssh-2.10.0.ebuild 858 BLAKE2B c2780b2cdb45c313638ef427dbdfd588e121449df679d5f1b7423dc489964681cb440dd7e1b54bd5cc131eb9f40e8dae05095b82a3a73edb1dda884bec2dad3a SHA512 7b5630727ba7547c4a6f86e89547270064b77ec874eff574bb724ec8347994e3e4f38e01d1f981da67b187942e7cf648c09681d6a046b0a4a27fa623f2381087
 EBUILD net-ssh-4.2.0.ebuild 1102 BLAKE2B 323e79278e37c7ebb2c8620b9edbb5cca0c6a8dd6211d8c7bd6de0533f5d137b59fdaddd525ff431f6cf11d424c3e820212983af2ce330319a7694fdf29bfc05 SHA512 509757362c9077df31219435c98036ed0f731268d5a351d0c46bc1b5142587c0dde339777e0534005bf41cc0cbf62666a6f3d833b4711e07af8aa2cdd6497d04
-MISC metadata.xml 460 BLAKE2B fcbb901a6f9f2c80489e28346a21ea7cf5dcf7eed49c72dcf8cad079fdb2f52969d03b619d4535206c078c9d2d3a6c0492b035919eef89b3eec8207ea7e3ecb6 SHA512 9e66fd4626a890ca908b35e1cba4b5712ceef882fd6dd1f72ef20e6b07ca0b32cd3fd92d84cd0816c38cbc1d3d76152fccdd1e90d901b3d0f8b096b3274b8cf4
+EBUILD net-ssh-5.0.2.ebuild 1010 BLAKE2B 2c65a9b9fc1152c60067cb1d50ace523d5e8d19b2f7d43185c7340d0d1748ca9a49be56f307a57390aaf4839085187b08608d254b67ff1057ece4ca17eb49904 SHA512 00052f0adfb567231a99b9bf4e3d09332eb4b73fdeb39302948d4edae6b39b87711cfab349fbfc1fa1837ede2b1f8fbbffe6f1d6fa43022ca6cf6e6643a30a6f
+MISC metadata.xml 542 BLAKE2B 0afb600fb7668a66e39bfe556157fa6a91eaf67299ba7560a550d041fced876a66ffc83700983fa4f3249a35785e93a7d980ff0940365df1fac626f22189a863 SHA512 f350079143da9f4e43f9da43556d343c01b88782a3d4fe8bdc08a7c901308f352fc9cfd0f998bd4471bed923ccbee0fd1d6112cfe91fa7b71ce9f39a665bcd60
diff --git a/dev-ruby/net-ssh/metadata.xml b/dev-ruby/net-ssh/metadata.xml
index dd5cfa357115..b6f4d7853048 100644
--- a/dev-ruby/net-ssh/metadata.xml
+++ b/dev-ruby/net-ssh/metadata.xml
@@ -9,6 +9,7 @@
 		<remote-id type="github">net-ssh/net-ssh</remote-id>
 	</upstream>
 	<use>
+		<flag name="ed25519">Use <pkg>dev-ruby/ed25519</pkg> for Ed25519 support</flag>
 		<flag name="sodium">Use <pkg>dev-libs/libsodium</pkg> via <pkg>dev-ruby/rbnacl</pkg> for Ed25519 support</flag>
 	</use>
 </pkgmetadata>
diff --git a/dev-ruby/net-ssh/net-ssh-5.0.2.ebuild b/dev-ruby/net-ssh/net-ssh-5.0.2.ebuild
new file mode 100644
index 000000000000..b2f05b3d0190
--- /dev/null
+++ b/dev-ruby/net-ssh/net-ssh-5.0.2.ebuild
@@ -0,0 +1,38 @@
+# 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_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGES.txt README.rdoc THANKS.txt"
+RUBY_FAKEGEM_EXTRAINSTALL="support"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Non-interactive SSH processing in pure Ruby"
+HOMEPAGE="https://github.com/net-ssh/net-ssh"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> net-ssh-git-${PV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="5"
+KEYWORDS="~amd64"
+IUSE="ed25519 test"
+
+ruby_add_rdepend "virtual/ruby-ssl ed25519? ( dev-ruby/ed25519 dev-ruby/bcrypt_pbkdf )"
+ruby_add_bdepend "test? ( dev-ruby/test-unit:2 >=dev-ruby/mocha-0.13 )"
+
+all_ruby_prepare() {
+	# Avoid bundler dependency
+	sed -i -e '/\(bundler\|:release\)/ s:^:#:' Rakefile || die
+}
+
+src_test() {
+	# prevent tests from trying to connect to ssh-agent socket and failing
+	unset SSH_AUTH_SOCK
+	if ! use ed25519; then
+		export NET_SSH_NO_ED25519=true
+	fi
+	ruby-ng_src_test
+}
diff --git a/dev-ruby/rack-protection/Manifest b/dev-ruby/rack-protection/Manifest
index 06e934453ffd..65efd62701b0 100644
--- a/dev-ruby/rack-protection/Manifest
+++ b/dev-ruby/rack-protection/Manifest
@@ -1,7 +1,9 @@
 DIST rack-protection-1.5.5.gem 18432 BLAKE2B abda1313e7e0d04299a689c55241cd92d0f5ed2048395ab79f09ba271100a8dc99fbf5f924e3b3cbe28f318090144539eb0174cc1813d371d9f37df31ab04315 SHA512 c4066a50771247fc89d4ddee44ff87e40a24bad95e914ed2f72cbf9c45152e67e51d2ccc7d1725ade637296a080b06f304157a1a024613a97595b144e03e2e70
 DIST rack-protection-2.0.2.gem 16896 BLAKE2B b3ed6a399f93c359a305cef0893bb5056ac26e8d5f345761f497b5eb77aecc201cd388bc0fc021ed039f230bc2ca2348f7eec19aaaac3f2662500bd4c6496a93 SHA512 e74be8b079a1c436d80df2e6bf58dcaea089aceb58b8ec6c08d6ac78b5390bdb1b494d9155350dc7e2639e858209aac10757be54085a565b910e5e74ee882235
 DIST rack-protection-2.0.3.gem 16896 BLAKE2B e33cfc8290cf108f986bd625623411f63812aa79bc5354041e3d541a244bdc6f2ba30ebfab77cb2fe15c8a53e21e11adc6a54ab90a687147759d1b14b5e0be73 SHA512 396d1b45783e0b6782b479b6ba77c2eb23c2a6a2b695a631b7a4b9ace661471325d4d321a40ba7c8090964e68b5dd8f9c92c4843464e6d6ff178aecf9996f338
+DIST rack-protection-2.0.4.gem 16896 BLAKE2B d20bd67bfcbb8ba34689cdc909c1f89305bc6a08c44b9cdde8a7d1615c86400572a24a060a9100c699791cd910e5bbf17106b8c921e1e6a21f814457a93dc2c1 SHA512 e934873e7e8e45c1fa0450b568f33e28db29b9c4bacb0a747218ca929e73706518c09ce131f749e89dc7af894dcfbd6fcabdf12324edbfbcfa532eb227f977a4
 EBUILD rack-protection-1.5.5.ebuild 690 BLAKE2B 00837887ebd9fd360b9be647ecb2850dcf9d39f9843eb0f20290d075db288fddfc7070c24a324f8bed9c74b98daf153ced7a1c6dae45bdeafd4a46dd4de2d77f SHA512 dafb498a3d11002ce365d26ffec3b2dade3c4e3ab26536035fe2954d32a926128b23ca3a16116ca84821c89e218144cab416f85679401ac28502ab486997e650
 EBUILD rack-protection-2.0.2.ebuild 767 BLAKE2B 9482e5025dbec9e86e2ee96c849fc51cfe5c498beef71275ac4c9bb59b53be29b318ffc787becb285cf262b667bd1f49c5b666138e02a1ac0fad1f4d34174e24 SHA512 a68ee524fdf9f060449cef4184b62b9439a56829eae1704a44f6754c6f15efee860fc9f60287f3a7d00a3d60b364aab0d14efd5580f57031d98ac5430abffcde
 EBUILD rack-protection-2.0.3.ebuild 767 BLAKE2B 9482e5025dbec9e86e2ee96c849fc51cfe5c498beef71275ac4c9bb59b53be29b318ffc787becb285cf262b667bd1f49c5b666138e02a1ac0fad1f4d34174e24 SHA512 a68ee524fdf9f060449cef4184b62b9439a56829eae1704a44f6754c6f15efee860fc9f60287f3a7d00a3d60b364aab0d14efd5580f57031d98ac5430abffcde
+EBUILD rack-protection-2.0.4.ebuild 767 BLAKE2B 9482e5025dbec9e86e2ee96c849fc51cfe5c498beef71275ac4c9bb59b53be29b318ffc787becb285cf262b667bd1f49c5b666138e02a1ac0fad1f4d34174e24 SHA512 a68ee524fdf9f060449cef4184b62b9439a56829eae1704a44f6754c6f15efee860fc9f60287f3a7d00a3d60b364aab0d14efd5580f57031d98ac5430abffcde
 MISC metadata.xml 488 BLAKE2B 1db94e175d1248a334fa9ff0b5936d0281a1ee2ef69974cc33ba65e19de9ae043e98599a52f5cc55d3e1ca3e5bef3e223cab7f3be0ad9b561b05d81da8c09687 SHA512 ad0122f6e0dde2c02a1af8b8e81a5aebb1a13e0f56dd8f222d6f051da55015a89db0430efa6c1e6b5e193a94ba69d0244498d7cc14f0212f8032393a7f5988b8
diff --git a/dev-ruby/rack-protection/rack-protection-2.0.4.ebuild b/dev-ruby/rack-protection/rack-protection-2.0.4.ebuild
new file mode 100644
index 000000000000..688357c23602
--- /dev/null
+++ b/dev-ruby/rack-protection/rack-protection-2.0.4.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+# There are no specs in the gem and the source cannot be downloaded separately.
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem eapi7-ver
+
+DESCRIPTION="This gem protects against typical web attacks"
+HOMEPAGE="https://github.com/rkh/rack-protection"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 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/rack:*"
+
+# ruby_add_bdepend "test? ( dev-ruby/rack-test )"
diff --git a/dev-ruby/rspec-core/Manifest b/dev-ruby/rspec-core/Manifest
index 12bb6d69c815..94591fa9ee53 100644
--- a/dev-ruby/rspec-core/Manifest
+++ b/dev-ruby/rspec-core/Manifest
@@ -1,11 +1,9 @@
 DIST rspec-core-2.99.2-git.tgz 212935 BLAKE2B 37195012f79aca3a1959f9143e2f5cbab63230ab07ea97928d6f66face8d07ab54d87f19535f5f235c441b2da6dec17ef2a889e9ccd7e83d987086e24afd1b82 SHA512 e13bc3384fd85c367481a8651c14be4a412cba5f58e12a8f4ab14b5d2768a7b92191b81e000e7dbf6a28275b41044d8b3eb70a04e4b30b5bf88db98cbec4cc44
-DIST rspec-core-3.5.4-git.tgz 369170 BLAKE2B c95fa7740bcc1b586b4e26be1db4cb52bb470cb23c9ef74dc644d0ea7c4ca769ab62e587ecff2a16cd6f656e9f3bbdc81b199765f9397dddbe28a8cdce6a1945 SHA512 c672381e9233b6f8c6e92ed70d084ff7a558edd6ca7d5a09a28fff1554975b952b6fab94483324b5bd6a62ff7aac576e7a216dbb3972749ef0210fe1cd05411d
 DIST rspec-core-3.6.0-git.tgz 375590 BLAKE2B e8b4987ea3d5cc3a403eaec98243e4c4be6c9eace798bc97599020543401ecd036c6121a6736995fb716aabd1a2016393506bee1e3076c61b0c49173d991d990 SHA512 cecd3885652e18ba1ffed45e40d12c932ba0d880e96b2f1d264709f55dbda8d6b0c78c3bf4bb940d246b84261d1b80038618735f65302ff62646165b2e932be1
 DIST rspec-core-3.7.1-git.tgz 376819 BLAKE2B 6747ffd8f2d426718376b51356d8838a7db0d0246ee619e8edef30bd9f7aeeb80bd0488e4fc73b0a00d119074c35055f6b9d0cbbe6160ae78d0727ce9848a710 SHA512 1561d044281c1b8b97cc89033ad991548fa74abbc5f20d3951d3f3de754c581a027f9ccb2bd0107c05e744d3b2804555cf4cf207e72adf365b28fc7ce052dab8
 DIST rspec-core-3.8.0-git.tgz 386022 BLAKE2B e827f006fe9f05f93b741d021bbb108ae3e98cd23f3388c1fdf2a87d8be349c04e91c810cbb7c47cc99ce99a00f62e13eb01a927b8b89d54dfa437ed46b1d24f SHA512 6d3f431a1f9485009f5029bea967f36cb789be8cf33722b36c40df44e12a2284674c6c8af333bfe8ba8825e032576569fd42c92f798988faad732ac3a720c5e6
 EBUILD rspec-core-2.99.2-r2.ebuild 3518 BLAKE2B 017a60ccb0ac017b08c4d97903a5bd59921fd0c0bc3b4322059d856bfee6eba2c026242bfda1e2083b043c190ad9160c6122ad62350b07aa0a486afbbb3089b6 SHA512 7b22027fa5ae71e80f071c4fc7cf3fa0e291ec42e06e0c07bcd0e94ab2782aa2dd79d4cba709751077b7c19cb0c5bc7a346c2c424cf9ffbbb62ed486776b6888
-EBUILD rspec-core-3.5.4.ebuild 3096 BLAKE2B 0dd38520f3c03ff53f1d4de2ad6add6df77e8f55719eea1e7282fe4411e254afe0b51b06a2b7a7263b7a77c5caa7ec0cfd773444c6edf9846d06c98ba68a959b SHA512 2b5c663071b496f4925624d74ab18a870bb1ac64089164f8fae9216a00999465073de08741db7aec0fed85a2beb3e94808abb423dfcd9e44ff094f402317aacc
 EBUILD rspec-core-3.6.0.ebuild 3405 BLAKE2B 9bae8f3c31fb7c77ff882337c2285ed3b2966d0472d256101b7ff01f38c54ce8263189c5b8841164ff4d6e4bed8f12ba86956054597a6143482b5474a3b2dc6c SHA512 31b31d1341539a5a7fe30ba7fb81f756f5b59195984cf0afac96ac60c233646f98edfd0e9d59f53bfb321d845d8a339ba3711add3ac49e755bfbfbc9b8d7c001
-EBUILD rspec-core-3.7.1.ebuild 3414 BLAKE2B 2fea004e794166c2c7cbca481c0d25c1865018fea73edb99ad3ea4c775e46b12d9d33794e14c651ff3ef96a69265c25f6dc6d281819627b591351f453cf378e0 SHA512 5f1a8d0f5e517c2ccc3e0269e34519e614afdad64d3a2491f9335dd4989c317f95b32f503d8fd0e298308e352845592154e9ae8fd0f4fe9f5c0177fad6b2dc63
+EBUILD rspec-core-3.7.1.ebuild 3411 BLAKE2B 6bd6675bcf39d06a9964858a34b141bb47e6f829f36933aaa0447c9139a2cf1ddcc6c349a001dd17bbd47ed829bf39abcd8d9b1c07f132e02a4664f64229dca2 SHA512 4180de54b38bcd3f9e758d1fafa2f400ab99a54755254f574c8e2fd7c5a6ac64c9ef29f5b354281c2d27daea2772c911b74c8fe0a9175a6a19fbad96a49828b3
 EBUILD rspec-core-3.8.0.ebuild 2965 BLAKE2B cb76ba83dce43eda2f511949f085697c832142a34c611d6ec845d7da73801aba37136d392fceacbb3241a69e63f1148631eb2bd584db2d611eb38e52fe5c4004 SHA512 175a24dd2d96a60a39d185aa855b6a1c771d1cf996e5b3898878e86e65fefcb81b399b24f9339c27815268e083bd5f9ce47e1828178818d0fa7e33134a3be837
 MISC metadata.xml 465 BLAKE2B 7aa4aea8fcc4616588f8842e4d3625219eabe0c17f7a621f9d01ba3ba403ce178ba5960a15c9a163eea32a9956cdc27ce1a607bdae1c32a1a6fa1207c7358388 SHA512 987f6c0ce5814c23f3d76a32f0b59ebd89ddc71bcb23d109106a2ee11a5ab050cafd1ec7f87c84f07b4b4d71244d71885c6d727d2b583484c0e5f6466066a57b
diff --git a/dev-ruby/rspec-core/rspec-core-3.5.4.ebuild b/dev-ruby/rspec-core/rspec-core-3.5.4.ebuild
deleted file mode 100644
index 8c95a2ed7487..000000000000
--- a/dev-ruby/rspec-core/rspec-core-3.5.4.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby23"
-
-RUBY_FAKEGEM_TASK_TEST="none"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-# Also install this custom path since internal paths depend on it.
-RUBY_FAKEGEM_EXTRAINSTALL="exe"
-
-RUBY_FAKEGEM_GEMSPEC="rspec-core.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
-HOMEPAGE="https://github.com/rspec/rspec-core"
-SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-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="highlight"
-
-SUBVERSION="$(get_version_component_range 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 )
-"
-
-ruby_add_bdepend "test? (
-		>=dev-ruby/nokogiri-1.5.2
-		>=dev-ruby/coderay-1.0.9
-		dev-ruby/syntax
-		>=dev-ruby/thread_order-1.1.0
-		>=dev-ruby/rspec-expectations-3.3.0:3
-		>=dev-ruby/rspec-mocks-2.99.0:3
-	)"
-
-all_ruby_prepare() {
-	# Don't set up bundler: it doesn't understand our setup.
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-
-	# Avoid dependency on cucumber since we can't run the features anyway.
-	sed -i -e '/[Cc]ucumber/ s:^:#:' Rakefile || die
-
-	# Duplicate exe also in bin. We can't change it since internal stuff
-	# also depends on this and fixing that is going to be fragile. This
-	# way we can at least install proper bin scripts.
-	cp -R exe bin || die
-
-	# Avoid unneeded dependency on git.
-	sed -i -e 's/git ls-files --/find/' rspec-core.gemspec || die
-
-	# 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 spec/integration/{failed_line_detection,filtering,order,persistence_failures,suite_hooks_errors}_spec.rb spec/support/aruba_support.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
-
-	# Avoid specs for older coderay version which is no longer packaged
-	sed -i -e '/highlights the syntax of the provided lines/ s/do/,skip: true do/' \
-		-e '/dynamically adjusts to changing color config/ s/do/,skip: true do/' \
-		spec/rspec/core/source/syntax_highlighter_spec.rb
-}
-
-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() {
-	PATH="${S}/bin:${PATH}" RUBYLIB="${S}/lib" ${RUBY} -Ilib bin/rspec spec || die "Tests failed."
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	ruby_fakegem_binwrapper rspec /usr/bin/rspec-3 'gem "rspec", "~>3.0"'
-}
diff --git a/dev-ruby/rspec-core/rspec-core-3.7.1.ebuild b/dev-ruby/rspec-core/rspec-core-3.7.1.ebuild
index 78b1560ac9ae..742e5d4e0e28 100644
--- a/dev-ruby/rspec-core/rspec-core-3.7.1.ebuild
+++ b/dev-ruby/rspec-core/rspec-core-3.7.1.ebuild
@@ -22,7 +22,7 @@ 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 ~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 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)"
diff --git a/dev-ruby/rspec-expectations/Manifest b/dev-ruby/rspec-expectations/Manifest
index 15916a3e2a03..9180b9bcf425 100644
--- a/dev-ruby/rspec-expectations/Manifest
+++ b/dev-ruby/rspec-expectations/Manifest
@@ -1,14 +1,12 @@
 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.5.0-git.tgz 187600 BLAKE2B 607dabc38e077ed82e18cdc690900f7fef86e6bb30a8004534992804717f8430a132b8f7d882226557e8c83832a1a8f43a32e9791b19869919c9b0aa8cfead8f SHA512 e6077549a028de0e34cdd50d93552ca3ee0f30bb550e9df20d391f287beb57070dcb3a5104627e7adb55689e7b102c91b7d3a3b944b8c4ff1235761140f2dce0
 DIST rspec-expectations-3.6.0-git.tgz 193897 BLAKE2B f3fc2b06a317e77838e2d483416ab0e05aefed8a129058ceaf1a80d3068b41e81abc9fd85576433fd1577e6114ccc65130734b850997f89310b80b549f80d679 SHA512 5c784eff2c076623f471bcfff6e014420782c8d52ff54a68adc9b4d6b60a91726da36e3989535f4ab7f1fcc6b1e2a3c3a63ee330f8ea55f475711741762c0f07
 DIST rspec-expectations-3.7.0-git.tgz 194071 BLAKE2B 67c8db15c43cc1141b19c6eb99390eaaf2535ec03f0fdc7b05576daa463d252f56ff251d40f5771726ee6451d57eef206c893f2593b01d413b5d96cdf21f0daf SHA512 bdd3222089299e9bfdd6f17a2b8af81d5e695290a3ce976630d586d51ff2df5baf76a3887b8adb31294bd6623ba85f8c2a4a31ac520046515aeeb81fa3a1bd5a
 DIST rspec-expectations-3.8.0-git.tgz 198184 BLAKE2B 4bd191885a7944ca4909a1275618726cd0fff95352ef7e88f05d94e5f7088632d2c9ac7a9f47ea94c79e3665198482098daf7f6fc286c59563c8efbdee585241 SHA512 7157dcf09c18d2b56156ba4c1b0bc1a11cb98ab05e43ab9cbd65eea3f796cadf3319711d4e9837905cbba8d70cf297aea47f1f8631fd7a97be763dd33ce08002
 DIST rspec-expectations-3.8.1-git.tgz 198732 BLAKE2B 243dccbf1771bda4a445abdadfbb79e67ad2e3a2a92013bcefdf746bcb6a3c99c1c999c15cf3a0ed324d587463ce57676785670ee5b2fa85ee216359b694bb64 SHA512 91d637210ccc4322073ce3e258b923de0e69f0a6eb0f07dd31bfe41da0a0ff18685c289e02c3ccabdea0f332ad55dbcb197fc16c7d6b144958e11cc90bfc8496
 EBUILD rspec-expectations-2.99.2.ebuild 1696 BLAKE2B c613aa21e9d76decaf26954bf8be2357a12dc92960ab966ac587883a91d023a79d5c9fd4e8e00ffdec9a647cf2483e2aeda03c3a851e2a43dcf5bb340caa7ec2 SHA512 54646cef1a0b856616797a8c11ae5bc684b3c3d9db2999f2a3e6e78b2254ae7efcbc22a924fa069d4b560c407a4cf010d4db3bfeb10851febb90d23d7f032ef4
-EBUILD rspec-expectations-3.5.0.ebuild 1322 BLAKE2B 79d4a73c87e4e93e1c165255ee391915c7b2252fcc7ed308994c170ce4f8e3a163a7df0ca59ef24952b53130dc5d0884dcfab319739d0cb1c026a7d26dfe86f1 SHA512 5a56eadd7f68b0b57eb153e5e14bdb2f2d653bad26d84a266dd3d2d34ffa8a2e9a97df5292fcb35cbadab5cec5e86fb6cbbe18c7810c7f1d976019c0dbcaf1b7
 EBUILD rspec-expectations-3.6.0.ebuild 1329 BLAKE2B 4c1367ffe0dac6fe8ef5235cc6a3bc4c36bbae2939f79d4a9febe273a9cf9db60d7867588e6bf4212167720153addcb6577c2a41a8e6982f5481072bbda689af SHA512 4772ad69bad84bad114a1e4f303c7ece91c7b964d097b50d5a02dee5ca855365051b3662071274d64afe7357d1c03d9fa70d52563571bf73c02ee8fe7ecffdec
-EBUILD rspec-expectations-3.7.0.ebuild 1376 BLAKE2B 1c49478e03eb5037247f7e624787302ba6827527f403b7edaa02497e315a367492a6bc3c4a8ac267cd6932c7b8477f7d8ab9d347c685c233df8a6042ed825551 SHA512 3a534370174f697e10bd4bc593564154539ac4e562c4fc9188c3ba032e4b17022d997e27f9b2e4f8258a4eb3f90b6d4df9c1ea31bf8ea5196da9e2757049132d
-EBUILD rspec-expectations-3.8.0.ebuild 1314 BLAKE2B 87b3d58a0bac222a68e6c240f510890b875c31847e21935748ed79f4a8d5618d299023df9c133e868f81ea010e2338e6ff3ce8dbb2721c67c6345bc5ed1a72c4 SHA512 08796e9a1fc9fdf1bc13d3806ac91f9b841158107bcfe4a862e379a0d7da1dd8681d81b99afcaee3034bc97b6843120723a42afc9510a14c7893e73ab8429fdf
-EBUILD rspec-expectations-3.8.1.ebuild 1314 BLAKE2B 87b3d58a0bac222a68e6c240f510890b875c31847e21935748ed79f4a8d5618d299023df9c133e868f81ea010e2338e6ff3ce8dbb2721c67c6345bc5ed1a72c4 SHA512 08796e9a1fc9fdf1bc13d3806ac91f9b841158107bcfe4a862e379a0d7da1dd8681d81b99afcaee3034bc97b6843120723a42afc9510a14c7893e73ab8429fdf
+EBUILD rspec-expectations-3.7.0.ebuild 1380 BLAKE2B 4a3e988779aa951a26d08b79c8f506e15ce38f3ec104a19879942724139096cf004888c6ef4b6603122f075b4dd9d67877d6dad64dcbef91219488a049b0dcff SHA512 98563d0afa7940edad9977d3ca22aa430320eefec84d22ea439dbec47b1247c41b198ba0b05501f841299a024d635a7a98f9323b75c4c244eced9784c96b8963
+EBUILD rspec-expectations-3.8.0.ebuild 1321 BLAKE2B de7686b018317122fd6b575d036f7f0b65ad316a4d81dc2b9723159fbbc248417c1e7a5a5982b6e83acf80d79e2eb0cd94c20f9fe8d2c1e54423e287cc9bcece SHA512 74518415bcc778e35ec50f414b6dd737703c7b5ba5955de91e60cb12a7c962a589976d4ed69cb35bd6ef37a4e835cab2fce1813508fae88a0a4a2ed01c8434b6
+EBUILD rspec-expectations-3.8.1.ebuild 1321 BLAKE2B de7686b018317122fd6b575d036f7f0b65ad316a4d81dc2b9723159fbbc248417c1e7a5a5982b6e83acf80d79e2eb0cd94c20f9fe8d2c1e54423e287cc9bcece SHA512 74518415bcc778e35ec50f414b6dd737703c7b5ba5955de91e60cb12a7c962a589976d4ed69cb35bd6ef37a4e835cab2fce1813508fae88a0a4a2ed01c8434b6
 MISC metadata.xml 350 BLAKE2B bd2aeaa98f6f5cdbdce70c0dd6eed61eee36323502021664e10356e0e558eb9fbf09f9b056944aaf13859c0f4f29603c5523584e4b823a9218fefb2824edcff6 SHA512 c0cbdb181bc5981daa6dea5ecb445cedbda6d6430218aad98a39b2db67074169305f3cba419fb1e24d79900be311619337a5421b75e0da6d2838a0ccb7de45b1
diff --git a/dev-ruby/rspec-expectations/rspec-expectations-3.5.0.ebuild b/dev-ruby/rspec-expectations/rspec-expectations-3.5.0.ebuild
deleted file mode 100644
index 8d7056ae2520..000000000000
--- a/dev-ruby/rspec-expectations/rspec-expectations-3.5.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC=""
-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-expectations"
-SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-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=""
-
-SUBVERSION="$(get_version_component_range 1-2)"
-
-ruby_add_rdepend ">=dev-ruby/diff-lcs-1.2.0 <dev-ruby/diff-lcs-2
-	=dev-ruby/rspec-support-${SUBVERSION}*"
-
-ruby_add_bdepend "test? (
-		>=dev-ruby/rspec-mocks-3.2.0:3
-		>=dev-ruby/rspec-support-3.5.0:3
-	)"
-
-all_ruby_prepare() {
-	# Don't set up bundler: it doesn't understand our setup.
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-
-	# Remove the Gemfile to avoid running through 'bundle exec'
-	rm -f Gemfile || die
-
-	# fix up the gemspecs
-	sed -i \
-		-e '/git ls/d' \
-		-e '/add_development_dependency/d' \
-		"${RUBY_FAKEGEM_GEMSPEC}" || die
-}
diff --git a/dev-ruby/rspec-expectations/rspec-expectations-3.7.0.ebuild b/dev-ruby/rspec-expectations/rspec-expectations-3.7.0.ebuild
index a9e1c41d484a..563a8f718fe5 100644
--- a/dev-ruby/rspec-expectations/rspec-expectations-3.7.0.ebuild
+++ b/dev-ruby/rspec-expectations/rspec-expectations-3.7.0.ebuild
@@ -19,7 +19,7 @@ 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 ~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 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)"
diff --git a/dev-ruby/rspec-expectations/rspec-expectations-3.8.0.ebuild b/dev-ruby/rspec-expectations/rspec-expectations-3.8.0.ebuild
index f478350c65ef..4f2f517824f0 100644
--- a/dev-ruby/rspec-expectations/rspec-expectations-3.8.0.ebuild
+++ b/dev-ruby/rspec-expectations/rspec-expectations-3.8.0.ebuild
@@ -19,7 +19,7 @@ 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 ~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 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 SUBVERSION="$(ver_cut 1-2)"
diff --git a/dev-ruby/rspec-expectations/rspec-expectations-3.8.1.ebuild b/dev-ruby/rspec-expectations/rspec-expectations-3.8.1.ebuild
index f478350c65ef..4f2f517824f0 100644
--- a/dev-ruby/rspec-expectations/rspec-expectations-3.8.1.ebuild
+++ b/dev-ruby/rspec-expectations/rspec-expectations-3.8.1.ebuild
@@ -19,7 +19,7 @@ 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 ~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 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 SUBVERSION="$(ver_cut 1-2)"
diff --git a/dev-ruby/rspec-mocks/Manifest b/dev-ruby/rspec-mocks/Manifest
index d057f0ff07a3..a3c36d7d9fd1 100644
--- a/dev-ruby/rspec-mocks/Manifest
+++ b/dev-ruby/rspec-mocks/Manifest
@@ -1,13 +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.5.0-git.tgz 186806 BLAKE2B e412feafba03cfe8c0efb68dc778885f0603c3b5fa415568c11e7b31168c57ea11245048fb78c34688b65d5cca95bc0a90aeb18afa19fef0a575219441fbaccd SHA512 b7dcb4ce0eac894d6652be45fea981cb7ade47a739ad926a87aa41d8a34fa9deffc45f5718d1634f03fbedaba82a77005466fa83155dc433fed6a19f8a897c4d
 DIST rspec-mocks-3.6.0-git.tgz 189000 BLAKE2B d8fcc25983eeeafdba69bce80bccac2ff9b1e269b739bbd41a87f4839468fe5e4bd3298d2a63aa315d87422a9f30aaf1a776cb9b90ee1fd58ca05b5a08ea032e SHA512 42cc4870fde8eba0a6da7df4ab07e4d59c6447bb8f52e0172e7f231d47304c20c6e2edfceee698d5d344bb78384acbe3df4bb67de784cc24a63fae02ed1d4a7b
 DIST rspec-mocks-3.7.0-git.tgz 189170 BLAKE2B a0a622ac593660c673cd80b3f3caddd2ac389000f42a7ed1745e1fcfd28d1986e61e83c265d736f3ad0649531973719bc9c5f6ab07e289cb2da89c4482e64184 SHA512 8673726571ccf8a901281e44faeb25ffcb59579dc380138f0557cd9310192cd340081e5e8ad65ae281777727b502cca2f6877134b0fb48f2e0ea40b133002aff
 DIST rspec-mocks-3.8.0-git.tgz 191102 BLAKE2B a8dc3794245e4508fb57874ba11a753db5622abda2d34a022c6f01b2e95bf43dd2df8612abcb84c32cff632f70083ea9d76171de73720d00dd929d562fa5993d SHA512 0649c3722479013aa1a20f750b3a83a9b426e5f79cb0edff995b09d1e2fa674fb8e91c0c94e7f9513f338c3c2e9c5b824a9473e91955cf928542324b8b1463ba
 EBUILD rspec-mocks-2.99.2.ebuild 1532 BLAKE2B b8cf9d6afcc3f38d304daf6abd0610f4fad1e21f1985a01c906e476a35f50f129175fbe7e457509a7eb65f6a09cbca301deb84c9c70abfec23b48016e52d0356 SHA512 98dadc99f3a3bd894ccca1d2763526acb9754646e5b13fc471672d86a96efc10921742f626ef1090d6285faaf6e7f047abdeaee3217d681e7f4583b19ca774f5
-EBUILD rspec-mocks-3.5.0.ebuild 1346 BLAKE2B 1799d6cba41bcc4cc28e1e1778020c52fafc6a16b7515f72cf31e7bb347007ab3a96c88aa71f121e31e3785fb63518324df72b90e6a0ac464727db2d3338e0b8 SHA512 40cae4ee52db2cfc0274c6961f32f654e9f09291c3a9410756f3dca4a1d42b32e0bf54cd8a83164b7f06cc57ba410aaef478390019e0d1d0b7a0630884cb2a48
 EBUILD rspec-mocks-3.6.0.ebuild 1353 BLAKE2B 3bab6513a6cfbf127c706826e4f946c6ab76bf3dd3cef0bd21065b197b10a950b840d59bbc58fbd9b7c00335b83548f61f98360fc22ee47f8bc1050830975245 SHA512 b1320a3f762bc5e3aa63d9e3c3aecd93f254b217905eb5e752068c25c43d6679095b2664f833119a42b5b6a5ae1f85770d8386fa5e12dda79b8085f9a07ab6fd
-EBUILD rspec-mocks-3.7.0.ebuild 1436 BLAKE2B f25095d08605676528048e7f28c3e5f91872d1f49f3075b147cf01edad4d212c0e09da4eeab6e1554220a015d4e1bd67596d44e93240971372fdff84ac16e639 SHA512 99818678324074efd4a4f2f8132dc4cad1de97dc19fc05d4e967362b47111b98375601835e03deec41bd024b626aaafaf7b42aca7966117c11b9a1ccf3f50ad5
-EBUILD rspec-mocks-3.8.0.ebuild 1338 BLAKE2B 0fce9a9428a6c5b74bca18e7656c1afa984b02b01861e723e56a5731d2d6db10835b9bad5b0421adf4c7945b262f40daee9c49c4531411fcd85d2f10e2254edc SHA512 bb9988586bc908dab6aceef3f930c453d0bdfeff8708165d5cdea81ca4a75cdbaa0ec301963b629df42f457a032102de361898df02370076467d439a1d6acaea
+EBUILD rspec-mocks-3.7.0.ebuild 1440 BLAKE2B 2457623e792d031ffe585f29ae828bcfbadb5c36301991d3a4e033075fe789178394f97545c444c07e99289e17d6fa737b7d15a62d0f35ec98cec47ef5a8d1e6 SHA512 bb9a7c4e226321b115beb39d6eb4581bbb51f0bfca47e380c09ac09615272474cd0fa241ef9f22a6b2219fd15ce480f33da59092c3c0b9466d5c3dc25251a525
+EBUILD rspec-mocks-3.8.0.ebuild 1345 BLAKE2B 3ac475af432a4af5e352ca2be716ee4ce46618ca921728c138f5ac935dacff07f072430adef1c8e84de6425b71b881f89f96446b3d15e0a5745fb84a2a2d5cd7 SHA512 5f4b3415624b24f2ba4ccc969056f2d4d5c7893a40b9cd6abc72be0dc9dc4a2f462932f45ebfeecc9241305c93fcda6ddda0b25aae8a60a7765d1dfac7440f56
 MISC metadata.xml 343 BLAKE2B 87ebb52b322f698e5242c517ca646e64b3a9a33c6b76d968847b2224b4dd683a9eaae5d03470efe775d350c65e3bfbe16547d4b4b99e2744379fbb7c76cc5680 SHA512 c7956e0175d9fdbfd423140f3c757d4c9e1deb6089577f60d11111a93fde6a7c056dcbac8620c30c8c02693297402aa2f0710e43f60abc0878a51bcb8c624667
diff --git a/dev-ruby/rspec-mocks/rspec-mocks-3.5.0.ebuild b/dev-ruby/rspec-mocks/rspec-mocks-3.5.0.ebuild
deleted file mode 100644
index a97a1bd3cac8..000000000000
--- a/dev-ruby/rspec-mocks/rspec-mocks-3.5.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
-HOMEPAGE="https://github.com/rspec/rspec-mocks"
-SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-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=""
-
-SUBVERSION="$(get_version_component_range 1-2)"
-
-ruby_add_rdepend "=dev-ruby/rspec-support-${SUBVERSION}*
-	>=dev-ruby/diff-lcs-1.2.0 =dev-ruby/diff-lcs-1*"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/rspec-core-3.3.0:3
-		>=dev-ruby/rspec-expectations-2.99.0:3
-	)"
-
-all_ruby_prepare() {
-	# Don't set up bundler: it doesn't understand our setup.
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-
-	# Remove the Gemfile to avoid running through 'bundle exec'
-	rm Gemfile || die
-
-	# Remove .rspec options to avoid dependency on newer rspec when
-	# bootstrapping.
-	rm .rspec || die
-
-	sed -i -e '1irequire "spec_helper"' spec/rspec/mocks/any_instance_spec.rb || die
-}
diff --git a/dev-ruby/rspec-mocks/rspec-mocks-3.7.0.ebuild b/dev-ruby/rspec-mocks/rspec-mocks-3.7.0.ebuild
index 31797ab2b003..9d6db9e54ca0 100644
--- a/dev-ruby/rspec-mocks/rspec-mocks-3.7.0.ebuild
+++ b/dev-ruby/rspec-mocks/rspec-mocks-3.7.0.ebuild
@@ -17,7 +17,7 @@ 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 ~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 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)"
diff --git a/dev-ruby/rspec-mocks/rspec-mocks-3.8.0.ebuild b/dev-ruby/rspec-mocks/rspec-mocks-3.8.0.ebuild
index ea1c46353888..624868e81bb6 100644
--- a/dev-ruby/rspec-mocks/rspec-mocks-3.8.0.ebuild
+++ b/dev-ruby/rspec-mocks/rspec-mocks-3.8.0.ebuild
@@ -17,7 +17,7 @@ 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 ~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 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 SUBVERSION="$(ver_cut 1-2)"
diff --git a/dev-ruby/rspec-rails/Manifest b/dev-ruby/rspec-rails/Manifest
index ddf1f5a5354a..ad913c0f0641 100644
--- a/dev-ruby/rspec-rails/Manifest
+++ b/dev-ruby/rspec-rails/Manifest
@@ -1,8 +1,6 @@
-DIST rspec-rails-3.5.2.tar.gz 123642 BLAKE2B 7580846be34bfdf542f2c15f83e4dcdea98929b5d2feb04c645b905497522f5ee050ada800ceab975204c9671e8833b9c3fb978e4b55d6cc75b2291a96a1fd60 SHA512 4f7f03c740d7215591f9ac4fc9fb77f8d747b6446a831580518db2974b07806eab8ed29ade78afbdd981236f3c64b0d933f04be7cccf72c5e57fb85795dc7df4
 DIST rspec-rails-3.6.1.tar.gz 127123 BLAKE2B 9dd03d8483c1ef94ca7c7e561ca2a6aad82fb8400cfd5a48f40e3feff7597aaaf2a877d72d356ffca2455e6f3069a2d60c23ebf2ff3bdb8e95d954ff88832a3d SHA512 4d83f04ab640fdee6da5d6eab2c2a3bf8e04ad2f55e1a31f1dffc3a85ea3e731f1a0ffa586825e12972120568226d52fd6c26ce261412ad69dcc73ed879e763f
 DIST rspec-rails-3.7.2.tar.gz 129851 BLAKE2B b37619b4a953fa44ef402a0dea1531837932dc7bc147c08b29bf85dcad61c7ca72b30f28edc391ae05d5040dcc902d6571342bb51559de84ed0c93244deffbec SHA512 a1dbbde3539b09c33d85c9307126df09c508fcf39abc25a6438fb0582ec19049ee1888d7d17d256d33bba08c29792a0ec30dabc37d870a369580a58cb7ef03df
 DIST rspec-rails-3.8.0.tar.gz 134290 BLAKE2B 2d148a62fb92bf73728da5a18d5d8263bbd38e2036d1c47a2bdc2823ff72cc2c4a1fafee1c66d89665b21ce9b9a907a9bdaf726cafa7345b84ab49d0d3053426 SHA512 810dd372d6889847fd5d47a29d359a72fcbc4fdca5d1b35bfbe75fefc293b208ff062d88e2159783eda152a5ab1657d3a55619a9a11dd8bde5993cd807ca37da
-EBUILD rspec-rails-3.5.2-r1.ebuild 1448 BLAKE2B 3b208f678509b6812b5bc2bfd7dcc6cb9480848d71ba4a0d01646e4e09a7fca274926d1dbfc5ba207301d444a2c0ccd54c070649b94da7eb6675b5b2b5bf434d SHA512 92ce74b24b1a330b83132f2c9c79829c1a172709a96b8735279688a015178e98c3979385b86ebf4ca6c1841dd744be23947e5b5951964559ea512df0fcf18e18
 EBUILD rspec-rails-3.6.1.ebuild 1448 BLAKE2B ab0ecb95e96eedddf57dbc1e254df43b97cd3d9a0930942b3bdc3554b7b277e8823dd8dc77eb32b58f339736b0b71f0b307202996edbc9970233c44cb3fbc3e1 SHA512 4f28e6dbf5fb2f4e188eced4b308d470c8e4275154a20ac869e2c4b4539b83f4a56c80338376d4dc00f8d8c150011d9c2ede6ad3f849389bc528b63fe5a69694
 EBUILD rspec-rails-3.7.2.ebuild 1448 BLAKE2B edb9e628276bc97d90ee7f9272145da0f03fc50d3736362e45851b113dace36b93544fef8c8a4cefe68d93d265d2bd7bc4e4ab9c6f523147a19c265f20e60c40 SHA512 b8a8b28c585ea62e3d29c07b01e0758503647561b3f0b798354ff3097433890245baf3b4b83491620b1575d77f5941867adfc4c5bd27e0957cf224def09ab466
 EBUILD rspec-rails-3.8.0.ebuild 1426 BLAKE2B 15d65f277c53fe44b4086cd3f193ef8051903ceba8794778fe6ed225023ec69ffb1ba983975cb504403827d5e3244400d634a336bdec210dbe94480da420cbd0 SHA512 47530a113d3250174a4a4741c951189d4051894e07cdcd856ac01a7a4104faf44f80a472ba502eea3003377b9a6d70cefef9cfcad99d2a59a1fe060759383933
diff --git a/dev-ruby/rspec-rails/rspec-rails-3.5.2-r1.ebuild b/dev-ruby/rspec-rails/rspec-rails-3.5.2-r1.ebuild
deleted file mode 100644
index b97430243196..000000000000
--- a/dev-ruby/rspec-rails/rspec-rails-3.5.2-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="RSpec's official Ruby on Rails plugin"
-HOMEPAGE="http://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="$(get_version_component_range 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 e43f18d9dced..98d3f6567cc1 100644
--- a/dev-ruby/rspec-support/Manifest
+++ b/dev-ruby/rspec-support/Manifest
@@ -1,9 +1,7 @@
-DIST rspec-support-3.5.0-git.tgz 59824 BLAKE2B 8e970af2f060344f842664e3afad7ba18d6884ef4a0e5b47ca3f2544f27a80df7227b98e853fea5a1091a6727d075d6a033e23dae930bbad854a181f8aa1662a SHA512 246d86c131dae12d6ca9040dba800ea5e378cfce083b1840492cc2c968e4d17fe67617332aa77d46817356113f81d8d9584698e4fe9e4873291d18ebe04eacbc
 DIST rspec-support-3.6.0-git.tgz 64987 BLAKE2B 9337da63047a1b33e8534a74a6dd4004287f0f057278b78160465ad66d43d5b543b9039d68e3488752e963308764b74a1343868f692b0ff26559b0c90cd3b674 SHA512 550e23ad2da53b445fa5e496eab243ad8c00db69949e50fe9e6c391b77166bbdc94261aae3a2b49c7f2f598abefe40ea4e93940cb493017fcdcc501675c8476e
 DIST rspec-support-3.7.1-git.tgz 65831 BLAKE2B 8595c496bc8d13e36fdfd4a8be8e055db4ac1e85af63f99158d191c9ef9e0a6ba0a2972ad7661a63eeda959e2969139a99ded71219777fd493544b711b6fea53 SHA512 a5760d696048897d76c665a756474bbb1a1995891e577c989cf68a205644c8608c538bf3d87c558428e2c412e02d3552d47567a0679cd4f8793c06f43eccf459
 DIST rspec-support-3.8.0-git.tgz 68415 BLAKE2B c1b13d639213e03c4e334de5520f19136da0e25e96a93b685776a691a84dc1daa66e4dacf3feb83b01032cb1364ba16cdfccf19e738264bbc3bef20882a89d8a SHA512 e16cc7bcc3de797e78c4f6ed475b0e60d492d0442dc048b4b2769a4819b80d1fb4a12aefaee3cc6a35f08d35f5fea82e00cc0fcf04363e57e74a6f5ed73d0693
-EBUILD rspec-support-3.5.0.ebuild 1327 BLAKE2B 0573e7a4db15827ecb994b4f3cb1597b781e8e5faa9b6cbc1ab65ea6940b943f3cfa495d378e72b939472ec0481e014d69a222464aa8e7cb117877e620acf4ca SHA512 4d9e61775a435d1cd2af88e98257b13f21584368903cf3c941b29adcd265f49e5d840268d378fda884c30d7532e16975c7bdb009870abe96181e02a216978db5
 EBUILD rspec-support-3.6.0.ebuild 1341 BLAKE2B 2e2368bf2b251859d938df965175f19c08efc9ffc11d3f801352597ad1cd537aad772c2c57b61d1bd627b5a241a413bb8087f041d866cbc29e9f94b453a17f5f SHA512 5a8a476f085a4ed63c67806fd04793b4ab9c6bffc40d09043d533105ed06f3e1a62edd1225b753c68eab39b071e4b02760dae4b35bf5f2d82b1eddd85c12a900
-EBUILD rspec-support-3.7.1.ebuild 1343 BLAKE2B 951484a84844e5042cda10591933a2857b756ed93e45fa54adbd11f31bb8aec6c60748050f8a95034de08c83815a01be065b25a28d6c723c0a0b7436a88fa95f SHA512 d1afec7a788a72076737aea3cce0a4ca0ad0ee1f22d28936343c2ada2185db20ddc65f792e0bad5623fee5118c24455a074bae9ed8b35b84a137d7ce11cab48d
-EBUILD rspec-support-3.8.0.ebuild 1344 BLAKE2B ae82168cda3923ceb6413c3732d25ff912d434e199db6282f793963626b4d7924975c8bdb969f95de8b13804cb0078c3f31210febeef4d7287778879e279c7c8 SHA512 9ccf1d142e570c78e9c1d92a867b6c0aa705434bdbb07d8cb244be76a7ef9721a7f2d3c1460371160283f9b2533b8630580b951d2a3192bba906d9020bd33788
+EBUILD rspec-support-3.7.1.ebuild 1347 BLAKE2B c0b4f180f799c33daa54d33b0139bcab20d6844ecc2dfad616ccdda522c15043dce7e2eb07c2e736713eb032a79aa3901d3692582cdcca038174181a38eff05c SHA512 d2101542fc7a926b8b6c722dcca8cbed1d847654c3ff16f45c3a6a62dd8c0e19f1217ff49adb8a165a8b58b3b16c1630d17d11be2f582e40378f7711cd6c2eef
+EBUILD rspec-support-3.8.0.ebuild 1351 BLAKE2B 36e3b765c3ffc5a12d2bb2c76754255e19cff7595ac8624ea755fdc13f4a4df1a0c6ef66c4b7ad56feaed83181f4112c14d1b2f8a1dac34cbb8f1bc827a20351 SHA512 5020cfcfd026a57fbfb79bf1856bd9ddaa905381f24701788e3c12a33d66d42f6ad32350189180bcee6ba7da39ee3edd9ceaa342b367d2f39d1e55de27520893
 MISC metadata.xml 345 BLAKE2B 832a39e1b38a33b4b5238aaf4a79f08aaff0a7751d466ebe3dd6eeaca493cd10d7ed51766d12c17f589be48d450d3f7a36690ee171a5c650c1cdad334003446f SHA512 71b6ed77045b94efb05b0275574fdcf328678c7d0aef385703a40f5ff3300653638dc32911ff8f91c66881201c735df930c000c0283afa9f189dbba41e97628c
diff --git a/dev-ruby/rspec-support/rspec-support-3.5.0.ebuild b/dev-ruby/rspec-support/rspec-support-3.5.0.ebuild
deleted file mode 100644
index 708708ce5dd8..000000000000
--- a/dev-ruby/rspec-support/rspec-support-3.5.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-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 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_bdepend "test? ( >=dev-ruby/rspec-3.5.0:3 dev-ruby/thread_order )"
-
-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
-}
diff --git a/dev-ruby/rspec-support/rspec-support-3.7.1.ebuild b/dev-ruby/rspec-support/rspec-support-3.7.1.ebuild
index 9f01e14af119..b08db986266c 100644
--- a/dev-ruby/rspec-support/rspec-support-3.7.1.ebuild
+++ b/dev-ruby/rspec-support/rspec-support-3.7.1.ebuild
@@ -19,7 +19,7 @@ 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 ~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 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 )"
diff --git a/dev-ruby/rspec-support/rspec-support-3.8.0.ebuild b/dev-ruby/rspec-support/rspec-support-3.8.0.ebuild
index d41d78ed12d4..e84bff1cedb7 100644
--- a/dev-ruby/rspec-support/rspec-support-3.8.0.ebuild
+++ b/dev-ruby/rspec-support/rspec-support-3.8.0.ebuild
@@ -19,7 +19,7 @@ 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 ~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 ~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 )"
diff --git a/dev-ruby/rspec/Manifest b/dev-ruby/rspec/Manifest
index 5b00b2c4f579..f7b954757ecb 100644
--- a/dev-ruby/rspec/Manifest
+++ b/dev-ruby/rspec/Manifest
@@ -1,11 +1,9 @@
 DIST rspec-2.99.0.gem 5632 BLAKE2B eba837aeebcb0d65dc18a644fd935f241a6703998885418460b2c0bb59574ef144c416518099a77905ca7676852903804169d1bafc2cf8b3f79654b669c43762 SHA512 bcdf5e86938b102200144c49370e0a0691e39a8720048df2eab1a55f95a5bc5e4ced84c7da86d0ddc83ee4ce0f40602c2ae7ee10e55dccf8bb8b769ab048ebb8
-DIST rspec-3.5.0.gem 10752 BLAKE2B 8c28574420f7beea0a8ff2a2c0237ea84c83dadee14edba229e8215e8620d801be941d5474cfd53357552f4210907cb15ba853bb88e3ad9b72d35b86c617c3f4 SHA512 0500f09e46244746967f5efebcfbc96d4cef14c5f68e6ad3d510e151ed83c865a3478ae6e42dec0f0793db7db52ae2394768b6b331ea5ca8d30bc19523cad5b0
 DIST rspec-3.6.0.gem 10240 BLAKE2B 334fb89dcc8926b264999dcdae231916dcf9c45515192b9a053a22a240a2da3830b46cb87430bc3f4a7368bbd0788e987f992e0f4dac3872233ad7d0e7f3fc6b SHA512 ff0208209fffe205038e75ea410d0a0c140d35f9dcf46b699d9359bb17b8d6e92c4c3643b8f99d741921dd4a4b9bc62e639f5d48f46e4e9c656dcab0f62fdbb2
 DIST rspec-3.7.0.gem 10752 BLAKE2B a0e15d557b0d9089a886d04c917feda80c7a8e5eb70a50f4635947689215c0c560d313a6728ccea751697ead97c01fa1e3b7217f202ad18d4ddecf62c4dfa4ab SHA512 5c10a878e9697030783c987ee9a6244b36cf85a2a3fb8c28bf9771900a3259da4f19c7f159180b5ff9140ab715b38b5d90cd5e0014ac1862f478c32a95e7edfd
 DIST rspec-3.8.0.gem 10752 BLAKE2B 14b1710fb64fb2ab46d59ac692ceb95dbe7f5e2f5c54e4f97170bd99c2b0d32e1977250f69160ab191367c8016663ecf5cd4e0c89941ff12c727ed52e6118551 SHA512 aa3ecee499240a26866797c00461c7e63915bb84a9a29afce75bd4e7864027588bafde05b108aa7b6d988c1a123265587db807567a8e0f3d03527b0f2d8329ba
 EBUILD rspec-2.99.0.ebuild 796 BLAKE2B 1f7e76cf83dabe36056c164d335150f56d9a666b389d02e5878ff15464fb50084053f8a4feb545bb314aecafcdaf54d417d94bece5154854e539768e063889cc SHA512 85040ba6e2d27ef48d167ce1365e8301812dcfd1917d5bc84d2509a5fe51fcb2d44c007834fd0fb6e77843f5263122c6f1f045649a9e18b091e3300b63545163
-EBUILD rspec-3.5.0.ebuild 667 BLAKE2B 3df4ec8bc0263ff263cc1d938f614d62d1a27c45f3e1a8eb3fcc5dd1c3455dc8dfd026d9a3104813157c9f8fc29964962fbdf9a7b46d6c5acfaa6ad288dafdf2 SHA512 e10338a61d1af33eae298f1a663c93199b2d871cc2de1a2fc93299657d813b2137dc34f81027314f68de5f80fda2670cee851978f437ddeba1c9156cbeec9de1
 EBUILD rspec-3.6.0.ebuild 674 BLAKE2B 18851dc284da064fe9225e7cd1ab5bf7cc2cc2c707b78cffa9a11eb1a1eeecc5d4f82220a4d1ffc45876a1f40b4a250d96510e3b96bd807d9c7039624e68b322 SHA512 fb3ee553c56bca5f8b26f7ada3d65d9fdb1c649e6cf269c3c59ab33350e26039f5c61310b1381ede6574e34bb4cd57127dff16a7b610f1136562320f9b72e0ab
-EBUILD rspec-3.7.0.ebuild 676 BLAKE2B d7297f23018396e07c9480fb1c70b939a2205a78f4644ee8ad88d272df9307d6efe20d9ba836262cc6c7c2c531af272e4fbffc3e57d2c3de6ea080eb781672ad SHA512 1dfd1ffd741ea3d48104f64e12dd9ff262e98818152cc2a68dec46f8234247e57b2cd7b812553e5c0529d8cd4b8943650e911ef9a7d3685750cbbc615997cdc3
-EBUILD rspec-3.8.0.ebuild 647 BLAKE2B 9f8105a18f3a68e80fbe8a506fc5c29427834cd5efbb38a235bde485d88c9278099ec54e54d989ad8d99535a280095208bd0d28bf77c8498945262c4c477fc8d SHA512 fa6975b9a59f2afdc201c97ca4f811561e3f93d00cb4373fd47f136f11269676247b39f71f32172895316252df976ce486d2aa2d5de25e0001fc23f1bdf68106
+EBUILD rspec-3.7.0.ebuild 680 BLAKE2B 17a6f88b945592f2d479d389a4202cdc68f675d6ffd1c991839af9818c7c93a8eafcd83528a27bada3781377d513b8600d4192d603262c5d824538368a6ba141 SHA512 7ed7d2cd2bcab6acb031daafd5e70e8a6bd76c1ec35f6eda4f4cfa9724e7af37e8d01ef57f182dd8ff16413507622a35a88451200360af62ed43147a9262e137
+EBUILD rspec-3.8.0.ebuild 654 BLAKE2B 6f47fa6866e3093488c36d7755a1a32be9ef1fdd2b8b0ac05163b2cd19561d604a5b3ecee868029b3dae4f17e261223fe2fc019401d214f07659e70749ba4054 SHA512 3675490d5c2b0cb218d0edf63c5a104a2baed1b11ff31ad7e0a03aa0b2529ec77dc5db1846b36b44d4a307fa0cd8170c2957325e2e01cb710c4cbbdd12081e23
 MISC metadata.xml 337 BLAKE2B fd99a128031819f061bb4b2fea336d7b14b26b7a986d782d8a4e2b9b9b7ce4c703242ef724cc9bdd98cf0219973dfcfca2a2eb7979b446f879d2f337b566985f SHA512 0a9165edcea2906fb370afa35ef77b74a4b833539959e8f28194e4d02ab7685f23dd16f04ea7e18873d10bf607236972610c49cf61ed97e5df7b4796ec9a66be
diff --git a/dev-ruby/rspec/rspec-3.5.0.ebuild b/dev-ruby/rspec/rspec-3.5.0.ebuild
deleted file mode 100644
index 8b2f12f3c9a7..000000000000
--- a/dev-ruby/rspec/rspec-3.5.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
-HOMEPAGE="https://github.com/rspec/rspec"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-SUBVERSION="$(get_version_component_range 1-2)"
-
-ruby_add_rdepend "
-	=dev-ruby/rspec-core-${SUBVERSION}*
-	=dev-ruby/rspec-expectations-${SUBVERSION}*
-	=dev-ruby/rspec-mocks-${SUBVERSION}*"
diff --git a/dev-ruby/rspec/rspec-3.7.0.ebuild b/dev-ruby/rspec/rspec-3.7.0.ebuild
index ca1aa6f215ff..526489db1bd5 100644
--- a/dev-ruby/rspec/rspec-3.7.0.ebuild
+++ b/dev-ruby/rspec/rspec-3.7.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/rspec/rspec"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
 IUSE=""
 
 SUBVERSION="$(get_version_component_range 1-2)"
diff --git a/dev-ruby/rspec/rspec-3.8.0.ebuild b/dev-ruby/rspec/rspec-3.8.0.ebuild
index 17f8f7cf8ca8..963b933d86bd 100644
--- a/dev-ruby/rspec/rspec-3.8.0.ebuild
+++ b/dev-ruby/rspec/rspec-3.8.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/rspec/rspec"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 SUBVERSION="$(ver_cut 1-2)"
diff --git a/dev-ruby/ruby-cairo-gobject/Manifest b/dev-ruby/ruby-cairo-gobject/Manifest
index fef4f9ebe23a..3f1a8b495372 100644
--- a/dev-ruby/ruby-cairo-gobject/Manifest
+++ b/dev-ruby/ruby-cairo-gobject/Manifest
@@ -1,3 +1,5 @@
 DIST ruby-gnome2-all-3.1.1.tar.gz 2233259 BLAKE2B 2758a2b34bbb96a9b2aba73f576d6213c9add2bd37ac85ed083a2bfb050d5327d7332ee1b9a8445e69aab0c4721ba446b4cb66c26273818ba930cce389eda152 SHA512 be264505d254248e0e6190b28c5311d10384c2ade19ac56f249bd17284b153368e6007862c4e19e6d1015ba3e441f9bc502a5dbcc45b7dc8036611ef554a6de9
+DIST ruby-gnome2-all-3.2.9.tar.gz 2305753 BLAKE2B a7db155431ba45cc35d5aeba1c2cd1d9b9da8dad4fbb914812a5eaa36f25a8f0e947f90c8e71f6d087852621fa139a22be0422af81934dd7b82844cf7fc02183 SHA512 e3f960852d97f2693f1ad6c26655232c74c99d9d98529dfed0ca922c57de1bf3444a7b3595e1a59ebd6b8064b7f5449f1eb774c09c085b74e5ce81b9354fd868
 EBUILD ruby-cairo-gobject-3.1.1.ebuild 806 BLAKE2B d8e04f70965a9ebc9a2268941e51211aec01a695a37735fdcaa27f294e0cbc7545e66f97191912a54e1ba7248e7eb09a76960bc43113005be3c11b89a61fffb8 SHA512 981fc92b00d315891574a38e462e313901bca327d789f34d09447823f38a23176779598ec6ef27bd54747877933591482ffc2cd150d5a13da06a90561d355318
+EBUILD ruby-cairo-gobject-3.2.9.ebuild 946 BLAKE2B e0df0ca8f4f7fa25a1a78b3273a7f7c20a9c53e88535706c21f2a179e21e05437a4a714a1d4ee3be80ecf9193c36262704690bd7d57aa6a84f7c78e1693f4eaa SHA512 440583b717b3b9c93b95f92eb4f96a12f6cbc8354b1d3ee30e51db34853af5115a671adcc5dfffcce9bfaa7ec5929adc984df896f4d38d3382ff498167617ad3
 MISC metadata.xml 391 BLAKE2B b68c9928d0cae2572bb8737d6a9b5aa90acd0fea2ef7c1de4fa0e2079685cb69b508107f6c651e21fe747d86a4caf0a7171086b2bd6c35af0721cde99f7ec8f3 SHA512 84903daa0e4584dd1e631df4a25becbd4e1a599c998d0384978fa82d971a6fd119e920fd0e4830771a98efd3075f1529a6bfbd64739bdecaa22ec70f31be1ab2
diff --git a/dev-ruby/ruby-cairo-gobject/ruby-cairo-gobject-3.2.9.ebuild b/dev-ruby/ruby-cairo-gobject/ruby-cairo-gobject-3.2.9.ebuild
new file mode 100644
index 000000000000..64c5c78cf850
--- /dev/null
+++ b/dev-ruby/ruby-cairo-gobject/ruby-cairo-gobject-3.2.9.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+inherit ruby-ng-gnome2
+
+RUBY_S="ruby-gnome2-all-${PV}/cairo-gobject"
+
+DESCRIPTION="Ruby cairo-gobject bindings"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND+=" x11-libs/cairo"
+RDEPEND+=" x11-libs/cairo"
+
+ruby_add_rdepend "dev-ruby/rcairo
+	>=dev-ruby/ruby-glib2-${PV}"
+
+all_ruby_prepare() {
+	# Avoid unneeded dependency on test-unit-notify.
+	sed -i -e '/notify/ s:^:#:' \
+		../gobject-introspection/test/gobject-introspection-test-utils.rb \
+		test/cairo-gobject-test-utils.rb || die
+
+	# Avoid native installer
+	sed -i -e '/native-package-installer/ s:^:#: ; /^\s*setup_homebrew_libffi/ s:^:#:' ../glib2/lib/mkmf-gnome2.rb || die
+
+	# Avoid compilation of dependencies during test.
+	sed -i -e '/system/,/^  end/ s:^:#:' test/run-test.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} test/run-test.rb || die
+}
diff --git a/dev-ruby/ruby-glib2/Manifest b/dev-ruby/ruby-glib2/Manifest
index f3dd216d78e7..4064fb6c9da3 100644
--- a/dev-ruby/ruby-glib2/Manifest
+++ b/dev-ruby/ruby-glib2/Manifest
@@ -1,5 +1,7 @@
 DIST ruby-gnome2-all-3.1.1.tar.gz 2233259 BLAKE2B 2758a2b34bbb96a9b2aba73f576d6213c9add2bd37ac85ed083a2bfb050d5327d7332ee1b9a8445e69aab0c4721ba446b4cb66c26273818ba930cce389eda152 SHA512 be264505d254248e0e6190b28c5311d10384c2ade19ac56f249bd17284b153368e6007862c4e19e6d1015ba3e441f9bc502a5dbcc45b7dc8036611ef554a6de9
 DIST ruby-gnome2-all-3.2.7.tar.gz 2290033 BLAKE2B 48abafe9c108f3a42b5da05edb6aa7ea6b508e313f65954481d3ce1f1c4497adfce52d83d491314f352fd057ac31fad63d2c1ec4b13fb0f6de1f6f9ab12d35c6 SHA512 94c273941918e49f140cd5dcc413421406e4b15ad244f6a4c29255030162aaae13dacb701c3df20a64ac6945b7cc4a5de0fa8bed21b4f119183641d298bc2030
+DIST ruby-gnome2-all-3.2.9.tar.gz 2305753 BLAKE2B a7db155431ba45cc35d5aeba1c2cd1d9b9da8dad4fbb914812a5eaa36f25a8f0e947f90c8e71f6d087852621fa139a22be0422af81934dd7b82844cf7fc02183 SHA512 e3f960852d97f2693f1ad6c26655232c74c99d9d98529dfed0ca922c57de1bf3444a7b3595e1a59ebd6b8064b7f5449f1eb774c09c085b74e5ce81b9354fd868
 EBUILD ruby-glib2-3.1.1.ebuild 747 BLAKE2B 8df6857b2456e644faeeb3102e8529996d554cebbdd1506fab4f901674ba137fbdfbabc3658e04a8cd9dea0bfe56ecb0ac7a1ad7d74666530a40053e4dd1242c SHA512 1c14758f6325bb04ad8841a5b6eb583ffb92e793559c9d95e02ba191965e1f3c31f8426a2bed7652cb467efa90d8f8d9382d997cffe87f23e55ea3faf459db19
 EBUILD ruby-glib2-3.2.7.ebuild 842 BLAKE2B 4b200ad28816308c555cbdc409306db49a3446129cd0ecd58b491cb626bbbff764d3c69f1b6ca56991013c809c4198e97fd4f40273126c6305dffa0ac814347d SHA512 afd37c36a827bc41855a7958c7c679887db2e679700261d7aa82155fb69067828f4d6eb57784fae4a308e5919b07cf820da149fd5b82044901c65f84d9db73b3
+EBUILD ruby-glib2-3.2.9.ebuild 842 BLAKE2B 1333c8a5b4b4c6fffd5901875a7b29b91d3984881141f4fdb1fc37c59b7a35e1dc0b7db3a827c8a3d8b34c7a909e6796c458284eda401b9a98db86fc1be08367 SHA512 9fbd8b515e3425e0257745fdaa99ad32f65eedc6b95471651c0ebd79140e0d7d1bfe33966fd9cdcefe8a2556013255086dab8766f95f630739cbd5d0b7c5c0c1
 MISC metadata.xml 391 BLAKE2B b68c9928d0cae2572bb8737d6a9b5aa90acd0fea2ef7c1de4fa0e2079685cb69b508107f6c651e21fe747d86a4caf0a7171086b2bd6c35af0721cde99f7ec8f3 SHA512 84903daa0e4584dd1e631df4a25becbd4e1a599c998d0384978fa82d971a6fd119e920fd0e4830771a98efd3075f1529a6bfbd64739bdecaa22ec70f31be1ab2
diff --git a/dev-ruby/ruby-glib2/ruby-glib2-3.2.9.ebuild b/dev-ruby/ruby-glib2/ruby-glib2-3.2.9.ebuild
new file mode 100644
index 000000000000..223481132501
--- /dev/null
+++ b/dev-ruby/ruby-glib2/ruby-glib2-3.2.9.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+inherit ruby-ng-gnome2
+
+DESCRIPTION="Ruby Glib2 bindings"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+RDEPEND+=" >=dev-libs/glib-2"
+DEPEND+=" >=dev-libs/glib-2"
+
+ruby_add_bdepend "dev-ruby/pkg-config
+	test? ( >=dev-ruby/test-unit-2 )"
+
+all_ruby_prepare() {
+	# Skip spawn tests since our sandbox also provides items in the environment and this makes the test fragile.
+	rm -f test/test-spawn.rb || die
+
+	# Remove pregenerated Makefile since it will otherwise be shared by all targets.
+	rm -f Makefile Makefile.lib ext/glib2/Makefile || die
+
+	# Avoid native installer
+	sed -i -e '/native-package-installer/ s:^:#:' lib/mkmf-gnome2.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} test/run-test.rb || die
+}
diff --git a/dev-ruby/ruby-gobject-introspection/Manifest b/dev-ruby/ruby-gobject-introspection/Manifest
index 203014766dbd..9e1d8b1255f2 100644
--- a/dev-ruby/ruby-gobject-introspection/Manifest
+++ b/dev-ruby/ruby-gobject-introspection/Manifest
@@ -1,5 +1,7 @@
 DIST ruby-gnome2-all-3.1.1.tar.gz 2233259 BLAKE2B 2758a2b34bbb96a9b2aba73f576d6213c9add2bd37ac85ed083a2bfb050d5327d7332ee1b9a8445e69aab0c4721ba446b4cb66c26273818ba930cce389eda152 SHA512 be264505d254248e0e6190b28c5311d10384c2ade19ac56f249bd17284b153368e6007862c4e19e6d1015ba3e441f9bc502a5dbcc45b7dc8036611ef554a6de9
 DIST ruby-gnome2-all-3.2.7.tar.gz 2290033 BLAKE2B 48abafe9c108f3a42b5da05edb6aa7ea6b508e313f65954481d3ce1f1c4497adfce52d83d491314f352fd057ac31fad63d2c1ec4b13fb0f6de1f6f9ab12d35c6 SHA512 94c273941918e49f140cd5dcc413421406e4b15ad244f6a4c29255030162aaae13dacb701c3df20a64ac6945b7cc4a5de0fa8bed21b4f119183641d298bc2030
+DIST ruby-gnome2-all-3.2.9.tar.gz 2305753 BLAKE2B a7db155431ba45cc35d5aeba1c2cd1d9b9da8dad4fbb914812a5eaa36f25a8f0e947f90c8e71f6d087852621fa139a22be0422af81934dd7b82844cf7fc02183 SHA512 e3f960852d97f2693f1ad6c26655232c74c99d9d98529dfed0ca922c57de1bf3444a7b3595e1a59ebd6b8064b7f5449f1eb774c09c085b74e5ce81b9354fd868
 EBUILD ruby-gobject-introspection-3.1.1.ebuild 921 BLAKE2B d33a569536b7172022a14c3190bdc7ea86cf9677be94d47d67e67b5c1802b28c624059e9c2c199795defecab13e9d40dbca6f7ef85772f0c77892ea3a43b8847 SHA512 987d2a96753ee5cb3ffa9de7b8d702e9f5f954a6678a4292f043d9bb23245f64cd99b61d5592b2784bef7dfaddb96900ac2fb5d67663e80a3195940703b191d6
 EBUILD ruby-gobject-introspection-3.2.7.ebuild 1061 BLAKE2B ae34d010adb89f605f1cc6ed9dbbfa41f573f560163e5de525e8dd9dcddee0d819ab3b7b0fac3dc6c1f7f17d3d5ead97ad548703141eb42210bccd284bdb44e9 SHA512 741f385dc08b234c45ff9c40a92d8c1dc4d1e978aa1f0e3ac632fe810d2d2a7522e4b88bbefe6f46df300406a81aefa5b11622490b9146f93478bbc6966b55b1
+EBUILD ruby-gobject-introspection-3.2.9.ebuild 1061 BLAKE2B ae34d010adb89f605f1cc6ed9dbbfa41f573f560163e5de525e8dd9dcddee0d819ab3b7b0fac3dc6c1f7f17d3d5ead97ad548703141eb42210bccd284bdb44e9 SHA512 741f385dc08b234c45ff9c40a92d8c1dc4d1e978aa1f0e3ac632fe810d2d2a7522e4b88bbefe6f46df300406a81aefa5b11622490b9146f93478bbc6966b55b1
 MISC metadata.xml 391 BLAKE2B b68c9928d0cae2572bb8737d6a9b5aa90acd0fea2ef7c1de4fa0e2079685cb69b508107f6c651e21fe747d86a4caf0a7171086b2bd6c35af0721cde99f7ec8f3 SHA512 84903daa0e4584dd1e631df4a25becbd4e1a599c998d0384978fa82d971a6fd119e920fd0e4830771a98efd3075f1529a6bfbd64739bdecaa22ec70f31be1ab2
diff --git a/dev-ruby/ruby-gobject-introspection/ruby-gobject-introspection-3.2.9.ebuild b/dev-ruby/ruby-gobject-introspection/ruby-gobject-introspection-3.2.9.ebuild
new file mode 100644
index 000000000000..9ab41783c3a9
--- /dev/null
+++ b/dev-ruby/ruby-gobject-introspection/ruby-gobject-introspection-3.2.9.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+inherit ruby-ng-gnome2
+
+RUBY_S=ruby-gnome2-all-${PV}/gobject-introspection
+
+DESCRIPTION="Ruby GObjectIntrospection bindings"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND+=" dev-libs/gobject-introspection"
+RDEPEND+=" dev-libs/gobject-introspection"
+
+ruby_add_rdepend "~dev-ruby/ruby-glib2-${PV}"
+
+all_ruby_prepare() {
+	# Remove pregenerated Makefile since it will otherwise be shared by all targets.
+	rm -f Makefile Makefile.lib ext/gobject-introspection/Makefile || die
+
+	# Avoid native installer
+	sed -i -e '/native-package-installer/ s:^:#: ; /^\s*setup_homebrew_libffi/ s:^:#:' ../glib2/lib/mkmf-gnome2.rb || die
+
+	# Avoid unneeded dependency on test-unit-notify.
+	sed -i -e '/notify/ s:^:#:' test/gobject-introspection-test-utils.rb || die
+
+	# Avoid compilation of dependencies during test.
+	sed -i -e '/system/,/^  end/ s:^:#:' test/run-test.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} test/run-test.rb || die
+}
diff --git a/dev-ruby/sinatra/Manifest b/dev-ruby/sinatra/Manifest
index a445dbbeb61d..db0fe22f3f24 100644
--- a/dev-ruby/sinatra/Manifest
+++ b/dev-ruby/sinatra/Manifest
@@ -1,5 +1,7 @@
 DIST sinatra-1.4.8.gem 369152 BLAKE2B 8a344f85c34dc8736180551690bc55ee615118a243c48421711339f2ef366e6c6facfecf914594f0440a825244e13f98648d11903fd9053054767a58a34aa285 SHA512 e56a5a6d7ceb0be4bc537feb6ada2956f1fd64b452dee347b259837aa02041dfa53d9808531cdd0a02a91093ba92f7c505c39f0dd990dfbc6e872681f40bc5e9
 DIST sinatra-2.0.3.tar.gz 463315 BLAKE2B 83113189f69714596ca3364ea61b6b8de844002acd32536fec69f7bf05937f1559396242170b0abe2d3028f5145c29adf46805d42969e683d60103013d72b389 SHA512 6188c6e372659522186649ae823f4fd3aa8a5b959cbb856f4cd42dc301e7430b3fad890a572d6f38d72aa99cf37a81e234e0c6ba9d03778a9c5a84b77a1dca76
+DIST sinatra-2.0.4.tar.gz 465074 BLAKE2B 1201ec3f56a7bbeb5c3dab01db8c3d521138587dfe60f36d19d18328ead6b664fdb9de71e9244aa7d37febc6d932f8c2a3a89aed01f23d2fd4e528827aa3804a SHA512 281ae9f6461cc2b2cfaacf05335134dc5b67b6dfa2936a38a7880c7b318ef4190f45f2f24c95a223ce1025a79f95cc6085445c308933244e568cf24cc2d94482
 EBUILD sinatra-1.4.8.ebuild 1326 BLAKE2B 4ad5b768c4cb9b61ce4f04bfb315ae65991d126e6a4ba42da2ed30c2cc77876cf0fc98c3e89f01550fe3ac60c36570c1a52af90ec44ae2acbcf71d90fb627f18 SHA512 7b91176276d8b5db61475df18ea2ede3b0fa197d2c7341e15ad8c71adf1f1d21c36161ab4523f8918f0ee6a71f5628a3e3b8021a1a4761db91fa0de39193f417
 EBUILD sinatra-2.0.3.ebuild 844 BLAKE2B ca1d0aaec1091844d677e93c61ed05045487889f1265dba45c5e81f9f16b8f6228c027c0dce6575dcf3c1dec5a5c4f0448a55dd0ed7d8bfc3c9713654ddee49a SHA512 e87c269a107e402adb3b2bb2c993c570ad73f2439f7cf9326645cfec44cc5decdf0c71a7fbb12524caaedbb5145590dca6f080bfa9171b6eb95fbadabab07302
+EBUILD sinatra-2.0.4.ebuild 844 BLAKE2B f2cd04a67f5b6602d0fcfd468d9537b6410740fc9eac28a02f17c1b553335d7753f07b5bd3c7570c98a7c605b663321db894da5bdd46d1af4d1c5af44fdea90c SHA512 e83cfb72028c4a1258f381ea3c23a5749b51319ee96935832118db1e14265f35bc4c720f1a777bdcf9d2487f322dd5cdb56d3dd93f4fb6e11d8de18acec9e13b
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/sinatra/sinatra-2.0.4.ebuild b/dev-ruby/sinatra/sinatra-2.0.4.ebuild
new file mode 100644
index 000000000000..b73d22ceaa40
--- /dev/null
+++ b/dev-ruby/sinatra/sinatra-2.0.4.ebuild
@@ -0,0 +1,31 @@
+# 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_TEST="test:core"
+
+RUBY_FAKEGEM_TASK_DOC="doc"
+RUBY_FAKEGEM_EXTRADOC="README.md AUTHORS.md CHANGELOG.md"
+
+RUBY_FAKEGEM_GEMSPEC="sinatra.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A DSL for quickly creating web applications in Ruby with minimal effort"
+HOMEPAGE="http://www.sinatrarb.com/"
+SRC_URI="https://github.com/sinatra/sinatra/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE=""
+
+ruby_add_rdepend "
+	dev-ruby/mustermann:1
+	dev-ruby/rack:2.0
+	~dev-ruby/rack-protection-${PV}
+	dev-ruby/tilt:2"
+ruby_add_bdepend "test? ( >=dev-ruby/rack-test-0.5.6 dev-ruby/erubis dev-ruby/builder )"
+ruby_add_bdepend "doc? ( dev-ruby/yard )"
author	V3n3RiX <venerix@redcorelinux.org>	2018-09-30 11:19:18 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-09-30 11:19:18 +0100
commit	62f67115b5c46134c34f88f4b1cbdacc19384c0a (patch)
tree	0a76b14de203a4c23040e5665e39df8de9867745 /dev-ruby
parent	265dbe5dbc14c199299496c6db8fce3f76647015 (diff)