gentoo resync : 03.02.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-02-03 08:30:30 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2018-02-03 08:30:30 +0000
commit: eaab68ba6a05bc57d98ca12032440835ef905326 (patch)
tree: 722637b4f6d0087c5b321ceb515a98913bee7559 /dev-ruby
parent: 4650985dd0e898b82e0d2ec225931297d4fadccf (diff)
73 files changed, 115 insertions, 823 deletions
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 7991b03a54d4..7a49e7e77975 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/base32/Manifest b/dev-ruby/base32/Manifest
index d4d81f4e840d..9bb0423a836a 100644
--- a/dev-ruby/base32/Manifest
+++ b/dev-ruby/base32/Manifest
@@ -1,3 +1,3 @@
 DIST base32-0.3.2.gem 8192 BLAKE2B de7d3484f54a83b497da2ea79a51237df9e058b0d9317613b1cefa5e3d93225248e8406a4564137080870c076fbe6340cfc7cc11cad48a397c1740d47de6963b SHA512 9d66961774b9d5923d099229f80ceacec95d40d5d6d3842fda33ff6bf4070f9dc17d758a6cbc93a6200f4e0105bc60175f70d057469e684f01910ea07fd85a2f
-EBUILD base32-0.3.2.ebuild 522 BLAKE2B 1eb6d12fca60a479e0e832226bb726ff289d4caeb9b63bc2d015b7ed4357775f8acb8af53cacc06983d4220e72e26e878b6f06dd5e2b98fffdfab9585344a683 SHA512 aafc93c5bad5832b34ed065e528db5ffbd5110a5783413bfb20fad8c254ad47222850d6a4b1fc136b4fb928b00739a98ba85ba08763b5dc340f040ce0be2f2cd
+EBUILD base32-0.3.2.ebuild 522 BLAKE2B 01c378f75c5eaa857b23245b5c9fbe00e5a14cc39314777ccc679ec151327e4b4c06821cffab42312caefa3f7b555f2e346d3bf129feeddb55dbb3afb8cf1d2a SHA512 f8197f158827a0b5f9081b2d78651542e55c89dd93876eeaf696ed9a428a9507498fe25bfe2b0bdfcbe59cc61ec8c28c0f25447e05d4a9a4329429e8255eace6
 MISC metadata.xml 377 BLAKE2B 96f1048aa5b11f93d3cfc10229d3481900c39d0a521aa9fd7bcc3a450dabcc0818d7efa51e42bc1a7ac9ea3a9893eb52ca6fc76c71f08f6f413e8858d83bc01e SHA512 7fcd9cabc07727f1d5820edce2b421bee0e7de1f3d89c2664fd39e71bad11616f4f2af615d6624ee861bcb35f5540664cecf48e709b1b80b34556174f50197f5
diff --git a/dev-ruby/base32/base32-0.3.2.ebuild b/dev-ruby/base32/base32-0.3.2.ebuild
index 84d096e8a1d7..6c0b72b06d41 100644
--- a/dev-ruby/base32/base32-0.3.2.ebuild
+++ b/dev-ruby/base32/base32-0.3.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_TASK_DOC=""
 
diff --git a/dev-ruby/binding_of_caller/Manifest b/dev-ruby/binding_of_caller/Manifest
index bfe2bb067b0d..a44ceb447c2e 100644
--- a/dev-ruby/binding_of_caller/Manifest
+++ b/dev-ruby/binding_of_caller/Manifest
@@ -1,7 +1,5 @@
-DIST binding_of_caller-0.7.2.gem 85504 BLAKE2B 5bee625852c4c32bb41b2eec57925479bf6315b73fd7486c2f0a2df88e42e2134bcca3d5b2c5accc4410fd6f0ec7b4be2aa26f1059325a96b136b5d7898c1a67 SHA512 6eb114070c3f15801c4f2454433630c207c2fb93afcf5906fa1288985303ff87c54ca07273b623bc2d3f76dc5bf363feb1561e109f599776a785aab65dfd7132
 DIST binding_of_caller-0.7.3.gem 87552 BLAKE2B 5cceef6f8be2d8360d55ffd6b82148411bd65aa56f811719840465e4e5fb77f88ebb1917eac1a5b65e24abf9ed0ad860afc2aff1e8309e4b6832bc3a0ee915df SHA512 e16bfc1fffe7e7d87013506a28f2894c3737a9dfd149ab4c7deee7332e6a3b8eecde5d837a58defcb0ad45a6a8d01ffd7b1e32a9395fa895d2dc84d8e534e547
 DIST binding_of_caller-0.8.0.gem 87552 BLAKE2B 9097fe2dbf1e5ea2361bee94cb83ce8152f7e1357caecf1217b1643be225e21e5aa793e7fccbef5c983d5c204b95e633ded490158dfdd1d4e99fca81c51cb910 SHA512 d6ea4e893415eaf3614b109f8f36c3fa2378da9997d013fccbd0fc1e598886d11f7843023ceed2468184d5b8df01e2329ef16c7af57bc60bbd47304a53b43974
-EBUILD binding_of_caller-0.7.2.ebuild 586 BLAKE2B 62129cde86f595f8af4d35c0a487d610071cc24a3f6120a23f5ff51aef27414287178c9797ef01245407e0f96d5db76a832ba179cb2fe5b386510bfcb34616ba SHA512 0da2d88227e4b19ca9493a2592d84a6c282624596c5ecfe48292f26eac9ae47f05de80710c341e00ef2956e22c1620c9dc5c695df48b64788637c9e398554c4a
 EBUILD binding_of_caller-0.7.3.ebuild 579 BLAKE2B 894a5bae0de92fb26304ddd094f6c72546024d91a0e1b5b2281e1cc2df825658f1a7369afdba943d7514fbd0f7862e46d98d891950f8dcfa50cd634466c88bbf SHA512 93d772c8e0403adfa39f2f1ccb7558568a0e930dba42a37986a4e9b9af12572f6f3d6dad08082bc831d60ceec835a44abb10725f32e29c83ae530b258064262b
-EBUILD binding_of_caller-0.8.0.ebuild 579 BLAKE2B 4ed32c755714c389f13473619505b98f8c801025df73135c5fef97b79966d81c3b013f4829d59a349d5e1be10c0ff4994024a63fbab2af810b67eb79c5be246c SHA512 366b641b81fb039ca067a8a273f11eb32aa88ab229076128c815df151f041b3ad5938e2b026210813dbfeebd990fab5571012b826a0ffbad1cd0befadf33a265
+EBUILD binding_of_caller-0.8.0.ebuild 586 BLAKE2B e3507095a6001c604a64ab828b0b7601b17a4f5b6541d5cdbeb7aae37879dda50a37eaae54b5f4b6fa8e4cc4e8ead0ae40b004279663fba96ded64abe55ab573 SHA512 918315cff07ff29f9c974a4a41d1887b29bee0dde9d089ef8f108a2dc1553ad09ac9b945a0867f124fc35945b3eee17f199942d9683aa0b7aa647253fa8e830c
 MISC metadata.xml 352 BLAKE2B 1ff945eb6a72367cd1901603d59de20bc43ac45a07bcb525d7cb8641dc9cbab8493a19919a3600356d49082bc5563471926fe632cd0ccf5c0ba34d2445e31cdb SHA512 3774a75d46642d38c562d1a2cfe3c432cf3857801fb44b3da21ba2bbe9bd046b60d1bf4b5712efe66b9d875d407717a53f0a00a3516b631d05335f045f87fa23
diff --git a/dev-ruby/binding_of_caller/binding_of_caller-0.7.2.ebuild b/dev-ruby/binding_of_caller/binding_of_caller-0.7.2.ebuild
deleted file mode 100644
index cabb6b095196..000000000000
--- a/dev-ruby/binding_of_caller/binding_of_caller-0.7.2.ebuild
+++ /dev/null
@@ -1,26 +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 ruby24"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="HISTORY README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Retrieve the binding of a method's caller"
-HOMEPAGE="https://github.com/banister/binding_of_caller"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-ruby_add_rdepend ">=dev-ruby/debug_inspector-0.0.1"
-
-ruby_add_bdepend "test? ( dev-ruby/bacon )"
-
-each_ruby_test() {
-	${RUBY} -S bacon -Itest -rubygems -a -q || die
-}
diff --git a/dev-ruby/binding_of_caller/binding_of_caller-0.8.0.ebuild b/dev-ruby/binding_of_caller/binding_of_caller-0.8.0.ebuild
index 1235b94b1690..3cb0f7f5dbed 100644
--- a/dev-ruby/binding_of_caller/binding_of_caller-0.8.0.ebuild
+++ b/dev-ruby/binding_of_caller/binding_of_caller-0.8.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="HISTORY README.md"
diff --git a/dev-ruby/bit-struct/Manifest b/dev-ruby/bit-struct/Manifest
index 71a67c26ec00..60a1bc9a230c 100644
--- a/dev-ruby/bit-struct/Manifest
+++ b/dev-ruby/bit-struct/Manifest
@@ -1,5 +1,3 @@
-DIST bit-struct-0.15.0.gem 30720 BLAKE2B cdbc1789e5500db775ea2cf36a46bb51536d5544ebabb7e27d3a775912b13d08552a64ee46c8142c2f3ffb5fd181524bcaf937de7b3ebb771966c1cd5c416925 SHA512 f2bb466908c056d552c323ba0543ff698d94e5f49e35246d2497021a11151d2ab5355844eab338c87b021e8198729d0767d9d87b59ab012e9b296b15b838cfd3
 DIST bit-struct-0.16.gem 31232 BLAKE2B ed08c7054cab88ba0614863d706681601615b03e2dd3f19a4a1b8284dace17bf30e92ca9f1b0948c8c5e50424ab41b97f65cb65c804f771a207672b497c9df33 SHA512 8c31592d53daea5f283f8309a52c22c96c519d51c4e3c1657b36e83b802899aafe95eab9b88d9ec692e84207fc6bc952a1f1ff1354fc2b99fc327d58934bec8d
-EBUILD bit-struct-0.15.0.ebuild 409 BLAKE2B 4429621573bd23b9f11ea97fd61412848ceda8295aee4c39de93f761c3a0de643dafaf96afa251d65f78a4f615785f8cc634a8ece21b9f4fd0138b4667fd25de SHA512 bc20b8a871776a17a69f7698ab097bb7120f266690dc0cc933d2dfe2335c0f9554323d867590b6c7aaa96d1df5b4f66341f722b722b0769bea0c11697041fd60
-EBUILD bit-struct-0.16.ebuild 391 BLAKE2B bf1496249f5fedc0ce9e0c2b3bca8ed86c69755b1a80f1ce87eb9460c0e2418a602585dc94aec8f64cfc319aa8706545d9b2912ec4107c67958f354a15a53e9d SHA512 30d75f9c582a3c4a20349e675c68cbddf8cc0829a7128a12b58e6da5599ae6de2d532da6b620b9104997142d5391a5bb05c2fdcf8b949a6d8431ef54e9bab644
-MISC metadata.xml 388 BLAKE2B 776303b28b1d317b88de8643eb86564166672a877ed53a6e72348c045176678586077e189bcf35710bc8e97da8f7b616686368e0b9785e0204b5e3e60a715f59 SHA512 3178d83ae945d07980aaa2d37acacb02a0dea9c486bd0fea8f2d1fd51e4f52b6419057c25bfebd410ab16b190b900a0c8947fc89e3a4cb3128b57737ba1129ac
+EBUILD bit-struct-0.16.ebuild 391 BLAKE2B 5d35de4b074af09f5bb65d33fa3e5da7cff3a26a078deb2e68a70c750c234acf58f6c8ac360d3e5054a971d7734f973726ca5fa4a58b48cf6fb42e495384b044 SHA512 e2b1ae79470a2978b0350f0ec521dafdb141c73f36cc266fd730e4378550f08c0bd4eecf0fac3792c371e7a0cf1ccbd54ea076d754d846e897790da9a06e0995
+MISC metadata.xml 392 BLAKE2B 58d918f32c45633462903ee20eddd6380fad76176fe1cb0e5ec4942130e49324618b3114e13acde56a8e337c9678ec00cc31b9172c2ff452707be2dbe05668d1 SHA512 65256477f8b63ed2ee5509d923f47c5fe1235af342e38422f058571eb01a80bbb0f3d34a801d691135a956113b5b16c4c7e348bb7012bd840bc3ef4588b1e6f1
diff --git a/dev-ruby/bit-struct/bit-struct-0.15.0.ebuild b/dev-ruby/bit-struct/bit-struct-0.15.0.ebuild
deleted file mode 100644
index 0a0d7aa7ae2c..000000000000
--- a/dev-ruby/bit-struct/bit-struct-0.15.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Library for packed binary data stored in ruby Strings"
-HOMEPAGE="https://rubygems.org/gems/sshkey"
-
-LICENSE="Ruby-BSD"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-#no tests
-RESTRICT="test"
diff --git a/dev-ruby/bit-struct/bit-struct-0.16.ebuild b/dev-ruby/bit-struct/bit-struct-0.16.ebuild
index 3be70de23075..53397820c2c7 100644
--- a/dev-ruby/bit-struct/bit-struct-0.16.ebuild
+++ b/dev-ruby/bit-struct/bit-struct-0.16.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 
diff --git a/dev-ruby/bit-struct/metadata.xml b/dev-ruby/bit-struct/metadata.xml
index e89ff7601bdf..4090b8488014 100644
--- a/dev-ruby/bit-struct/metadata.xml
+++ b/dev-ruby/bit-struct/metadata.xml
@@ -7,6 +7,6 @@
   </maintainer>
   <upstream>
     <remote-id type="github">vjoel/bit-struct</remote-id>
-    <remote-id type="rubygems">sshkey</remote-id>
+    <remote-id type="rubygems">bit-struct</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-ruby/bsearch/Manifest b/dev-ruby/bsearch/Manifest
index e79dc18adec3..6a9761dfe6ab 100644
--- a/dev-ruby/bsearch/Manifest
+++ b/dev-ruby/bsearch/Manifest
@@ -1,3 +1,3 @@
 DIST bsearch-1.5.0.gem 27648 BLAKE2B 6b57cfbdfbb56df9c1c8374fccc59746241a7571aa7328519ef2f5c85e13e0cf8f54c90cb55deef2b08a902c9123c63d0b299ca7026ccde9b02aad02d4411181 SHA512 6246921be42e15ac35cf862833e156a01a0de9e0d2bff53af8eaadb3e7a512b7ab1e9dbef5b05282b82b26e589e45ecb6e31567b382dfc6eb62757e658cdc660
-EBUILD bsearch-1.5.0-r2.ebuild 599 BLAKE2B 6ae524ebcc46699f3c4f88e55c6219a84680bfbe0c0defd6ae022fb06fbc20453179c24b99c40cfea336acf2e78ac4b480f5f43c5029b29260b9b5b5959f7ef9 SHA512 69b3072d640de6b4bcbe61f954272a2c996e67fd59ea5d004f803b1a109d5c1ccaa2ea020b93862cc58b8c7df58973a2b04e9bfe4c8c7ead3f44aa8b0c2753e4
+EBUILD bsearch-1.5.0-r2.ebuild 599 BLAKE2B 997313b29191ae03b84241c16ddf0711d3178ce8c410bd0c9ad9cc02a30e4bc9887972e1c7508cdee15abeeabd115b9a7f4d6b9cf6ead47a938a005b967161ff SHA512 70d2376e67959c24547b1bfdc07aeca3e3a4599e78f90123700978f28df41b3bdd9bc871fb623b2c85f94f4b6ccba2ccf16f1c45d0657f35efb20ad4000a76e0
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/bsearch/bsearch-1.5.0-r2.ebuild b/dev-ruby/bsearch/bsearch-1.5.0-r2.ebuild
index 6a13d9da56a9..ce97ba76f65e 100644
--- a/dev-ruby/bsearch/bsearch-1.5.0-r2.ebuild
+++ b/dev-ruby/bsearch/bsearch-1.5.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,7 +6,7 @@ EAPI=5
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="doc/*"
 
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 inherit ruby-fakegem
 DESCRIPTION="A binary search library for Ruby"
diff --git a/dev-ruby/buftok/Manifest b/dev-ruby/buftok/Manifest
index a421146d4aff..01e05601460c 100644
--- a/dev-ruby/buftok/Manifest
+++ b/dev-ruby/buftok/Manifest
@@ -1,3 +1,3 @@
 DIST buftok-0.2.0.gem 8192 BLAKE2B 673a14423e6a5b3fedf078f320116c9470b49e26aa7c4ef1bda47856a4befb7653d6b62bbf621ef8614885f64fcf078d9b2e24037c663a22b350ad44dac68070 SHA512 2be11c56b49254f16cadfd8abc7c414a16a54b32ec416402a4c87be72c2ce9c524aaa17ede9bb3535555191f2a7b1d7d863199db5b4af8874880bcd16d3c3b45
-EBUILD buftok-0.2.0-r1.ebuild 479 BLAKE2B e429b90f16d86ef7231833d42c59ce730d763df68e02f1874aa8c2ba5ff30ca672aa8c26ac85296810eeebeb5cbeee923157ba163a86c09d4442af662995a74b SHA512 ac3192ac51fcc1bd3068b583a6133275e089e551afcb5a657d3acc6c610a6608755f9b51f697280a3bfa065cea6e97a55d5348fc930fd08e9dc7435ed43d0f49
+EBUILD buftok-0.2.0-r1.ebuild 479 BLAKE2B 4e9c662e3e36e7a125ba3c960269b9e244ae6be5f0c06919915dd905f9d6da09796b3977bd82aebb6f24ffc79f0ba08fcc3a13630babffb1b659b06eed3c1d1f SHA512 7899bf7fa4e7a9a1905452a001fb39a92deac89abe1e9febe8b31f421f835f230e4dd7a1cf44444058641d963358f8c358d88557dceb5ea590f6d414688cf5ad
 MISC metadata.xml 339 BLAKE2B a756fb0a347a566d191297c1bd78f6851e9e9431b3aa7a198be5979aabe54d81ed50427662fbc931a5a645620afa80247e637c0b60e9f0d335ab1f31f28d168a SHA512 8901a4d1934605e2927f1f3e7a51e1e05c638b3ec6c9a027ce21f06570630af8a642973890adfe7bdfdd1624be28798424d66c5d4696121a89a257d2ce5bb52d
diff --git a/dev-ruby/buftok/buftok-0.2.0-r1.ebuild b/dev-ruby/buftok/buftok-0.2.0-r1.ebuild
index b4dfba193a58..9f3b01c78cc3 100644
--- a/dev-ruby/buftok/buftok-0.2.0-r1.ebuild
+++ b/dev-ruby/buftok/buftok-0.2.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_EXTRADOC="CONTRIBUTING.md README.md"
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/builder/Manifest b/dev-ruby/builder/Manifest
index 98b9365cf5f6..2e767ac90a05 100644
--- a/dev-ruby/builder/Manifest
+++ b/dev-ruby/builder/Manifest
@@ -1,5 +1,5 @@
 DIST builder-3.2.2.gem 31744 BLAKE2B 12d01b4f214cd0f3133c0af309435229f60f4d81876e48860c52b9032241b13ad2a1a02ea584ac6294406b3bbe937b9101d57b77ff60faa1b7ea24c7754f10d8 SHA512 785c0b5ea6682b590d3b92544910cac2d26d1b4906f0b0b502913c6c95365e173178ac1ec74d1dd0afe9b9fe6aac4d7f2ed712bf444682a029b86cdcd1787afa
 DIST builder-3.2.3.gem 31744 BLAKE2B be970ffd29f146faea5e7a9d76fedb513ce9bde3ed21ed7a44fe7d4a81e3836cecbf62f3f4c19f0b1e333f607b8978d9c707f4af76613592e966cda7e537bd1c SHA512 7869f44bcf40d547846d50ab82234694420b2f38e08037ae671c90a7c3b547f11023f864e70adf82970fdddf7ee811730c17e30ec298bb6d1999f4c0c050fbb8
 EBUILD builder-3.2.2-r1.ebuild 852 BLAKE2B 32711f818961c26de6ee381bf6104716d5b37ccd2c4cb63d98e48e44c8a0730be6cee9659a6538c9fb6d17471d2b5a8fa6326a6be5ec208bca81a95c20e4c3e9 SHA512 9ed6779402a4a34e97deea0dea4c4dbb2b9870c395629a80bcfdf8c299c9e05334a4b835ef44a8a40d3f05f9b26e7e5110c0c5263770ae1fec26cf472a4c3e82
-EBUILD builder-3.2.3.ebuild 903 BLAKE2B 502ae7f778ee878a8ae791ba481e58fad9b6f7e2b29f543a17bff402d8aa283abb3736e893513dd241d31386e8d1a2d6e20caccfdb196991ed330d3022ea7a96 SHA512 e8c822c056de0e9e4f5d2a4a26615d993a501364645613c47c5e6d6ee91aeb9e22002da91a3ac67b5326725052892f4d90bac66279b33508cdd39b25125d04ee
+EBUILD builder-3.2.3.ebuild 903 BLAKE2B dbcaaac6164d7c1898d1b31f401cd35c905440c00ab3cf3cc23536d80e1e614ea328540fb6da288f43facddbf8d689461b37dce1107b74b5efc19ed7f65fceaf SHA512 89a826380518e4cc3f80d084f4740e3f62738991b02cdea25cc410619d4216fda5a2eb412b74e7c9c2e0c6b29243915dd48259fb20e12940feedbbcebead7a52
 MISC metadata.xml 251 BLAKE2B e8bf2b70161d425791d65052583fd8be03b19ef3bb2a2cde34605bc93224fea9d8c6a91f0f2d630a00094ef54c0871e210da0e0134f52401bc80cb6b2358c13d SHA512 17d4dbd64468a524311a24ca065537a5b21560388efd282f3fa873e6722f70db6f83e3e5615556450905c29d5df2cf0a0855f9c0b38bf23f0f8112501456d4ea
diff --git a/dev-ruby/builder/builder-3.2.3.ebuild b/dev-ruby/builder/builder-3.2.3.ebuild
index 75291cdef1c4..dcad35e945af 100644
--- a/dev-ruby/builder/builder-3.2.3.ebuild
+++ b/dev-ruby/builder/builder-3.2.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_DOCDIR="doc"
 RUBY_FAKEGEM_EXTRADOC="README.md CHANGES"
diff --git a/dev-ruby/bundler-audit/Manifest b/dev-ruby/bundler-audit/Manifest
index a4f59fae6b6d..3dc7b6f9dd65 100644
--- a/dev-ruby/bundler-audit/Manifest
+++ b/dev-ruby/bundler-audit/Manifest
@@ -1,5 +1,3 @@
-DIST bundler-audit-0.5.0.gem 99328 BLAKE2B 729c94090b4fb84db936efdc648b29a4fda9955f481e73b69f9a489ee9b3c0dc565a0889f93c003cf43124ba46bf470a0db7ac32a5802caf5662d1fb6e62b8f2 SHA512 c618912f7d22b1a60dfeeaf8a278abccc3c0ec8d8dd2ea5988a0b04d6992015decf852dd507e7acd3abd19c8a62ac21f099a49aecfe04e3499a76879afb63fb7
 DIST bundler-audit-0.6.0.gem 108544 BLAKE2B 2014f3f2cad0a4305a0b1ef3a7ed0c76e2bb6a6c609568f2823e499c19d844bf41eccac3c6f8efeb51ebc938ea888164256fe41eb0d770e5eef5f3b00a837ecd SHA512 28213df41bba20b41b7398a2ac8f2086c5d2b80a7b31340a29b6e7c3818337f11e486284b14f000c590aaea6bb541222c4c5b71421e36a0e0a7c02e0feec9d7a
-EBUILD bundler-audit-0.5.0.ebuild 1325 BLAKE2B 6fba8ba6aa2c890fb5198234d1173f8ee060cae9d50a5835d36c99862c7710f467b7e0e52b432d60d25d6a13346b0fa5aab7c3c41e7c2fe64fd7883c2ec750b3 SHA512 5d40e68055ac55975222539d3a4854d212464d0945fa4a6890dd89cf5c9c09df6a30ba503b7393219e7d6e07248c002bd211f401d3b8fa73f22518db4bd803ab
 EBUILD bundler-audit-0.6.0.ebuild 1318 BLAKE2B d5756e7ab7f9c2c21d12b26f41a83f69cbdc3708c5e00425e878aa74aff2a62ea64954f3361f7f066dcb6ce1f39822b81bc289c21b361bfdd9548c66699946a3 SHA512 680ad72240fa8b452e37e2d6d6e8bae760b435684ad5dd3a0643e689ed550512a4bbb5580a28b9cb99e9a388163bb7f4ee0ea7d33163a091f18e53b7fe8a6159
 MISC metadata.xml 337 BLAKE2B 349e729ee8aa87d72509ae0358c0d7e3ecfa8ec4d792b0140a95a13ea175203d0b0efe879c375ed5c908e06dd6e1ce846c8a60cdd79096cc6397db606da3c92a SHA512 17b5dd74e3bf812111d8c824d10f537c3e1258b6f5a1065c2d850158945883ba158811979f4ea45e21312a2b1bdeb0ac701f0b54a62ffa27699330ea36103eeb
diff --git a/dev-ruby/bundler-audit/bundler-audit-0.5.0.ebuild b/dev-ruby/bundler-audit/bundler-audit-0.5.0.ebuild
deleted file mode 100644
index 9d79d27dedf1..000000000000
--- a/dev-ruby/bundler-audit/bundler-audit-0.5.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRAINSTALL="data"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Provides patch-level verification for Bundled apps"
-HOMEPAGE="https://github.com/rubysec/bundler-audit"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-
-#tests are trying to download AND have some odd failures
-#rspec ./spec/database_spec.rb:113 # Bundler::Audit::Database#size should eq 323
-#rspec ./spec/database_spec.rb:117 # Bundler::Audit::Database#advisories should return a list of all advisories.
-RESTRICT=test
-
-ruby_add_rdepend "
-	>=dev-ruby/thor-0.18:0
-	>=dev-ruby/bundler-1.2:0
-"
-
-all_ruby_prepare() {
-	sed -i -e '/simplecov/I s:^:#:' spec/spec_helper.rb || die
-
-	# Avoid specs that require network access via 'bundle install'
-	rm spec/{integration,scanner}_spec.rb || die
-
-	# Avoid specs that only work when the source is a git repository
-	sed -i -e '/describe "path"/,/^  end/ s:^:#:' \
-		-e '/describe "update!"/,/^  end/ s:^:#:' \
-		spec/database_spec.rb || die
-}
diff --git a/dev-ruby/charlock_holmes/Manifest b/dev-ruby/charlock_holmes/Manifest
index db1d2652d913..e00cb3dbc456 100644
--- a/dev-ruby/charlock_holmes/Manifest
+++ b/dev-ruby/charlock_holmes/Manifest
@@ -1,7 +1,3 @@
-DIST charlock_holmes-0.7.3.gem 1196544 BLAKE2B c9152bb9c54c0b507f18b0dac969131091ef236495f5759c353ace8b7edc990581e28c8c97b39c63c71b1194f3a023bb8df382afadd922a98c8572d6f0610114 SHA512 29e173f5ce870c16fd1af2e38b9aa2cada4b8ddae534933f18c82b719ae65b8fac82434ed87696b435b7236e180c06c9ccaa16c742dff5f8b1fd87da48894027
-DIST charlock_holmes-0.7.4.tar.gz 1192569 BLAKE2B 4f723a75f08ef87084ea78693f4f3fc0026246be0e2b3d35354f9416ac7c9a2f998d33072c0e23f56996618ad5e611d789363aa299fc49f9f3f0ee655ab94dce SHA512 2c9569cceacd4f80896ef852f581b5260790f6fb4cf02372b032dc2b692afdf99e04b4ac5230d42d48ee40d0433342c84f4974ffa77662db33287e80bb5fc72e
 DIST charlock_holmes-0.7.5.tar.gz 1192676 BLAKE2B d1e5bb3089d32ef7efa46fe54d37c71caa75b5d3a059c45d1d0275014822690031a8df894295e72be11be5ca685e90f35832dd6a06a4c482afe938da2a25ea28 SHA512 a5ee9d47d8c8386e7be9ad10e93e7bd7663713df285b33e5d8afd865570e463a9f785e568675363f9b949a8207bbcc144a7378dfb206645824e9f0abc33ec668
-EBUILD charlock_holmes-0.7.3.ebuild 942 BLAKE2B f8e262716f34e5021868258630852f6f7afc059f7602ae4b4f14b8d542ff077640b8c2b9af5cecb18089c25893276608864531ad2819632f34ad3c56887b838c SHA512 9e3d78c69c1386e539ae909a98193d63097ba5b71e8fe91c6cc620404012f10430e9239bb3383f2954268dbe1a208f261c79c982041f4a31e6a67c1eabc8dc99
-EBUILD charlock_holmes-0.7.4.ebuild 1034 BLAKE2B f3a3839918344986c986cf3088f70fc9de6384f7a9986637a4322d5698db59b6601a133b438db0a5296ec2eaabe2f52bdb22e9eee7b63390ff100ff374fdbe78 SHA512 b1c765f99e5e12304ecdf32c8a512aee57ee5677cd002f6af44e59eea48b567619301029d4d48908bd7068e56602977abcee17bb6c5740c3d532eec1dc5b3b4d
-EBUILD charlock_holmes-0.7.5.ebuild 1027 BLAKE2B 083b3e0f567a3ba36c993930c6de224b02d65ec5cbe66ab35dc2444c603fac0865516e36229add2f200a45ec5293349226dcdef625b0bac49ad1cb170ef98653 SHA512 31297f2361c671d8538996ebd986bd6429915048c3e403f3bef463602a6e013a3e9678994021451d4d40599795cb7b6e5bc8d65d5cc09fe4cd3d311cabd4abab
+EBUILD charlock_holmes-0.7.5.ebuild 1034 BLAKE2B d4557d7ecac10ad750886599b4b8034060a5146a8928548339a81f6c223f5407f16217d1e7c99b7aed864043fb9682bb4adf9f4df415b85c5a71e7754573708a SHA512 56d3632678c3888fb5369f75ef1424954e3b7895ed3967f9621491f28c237595f314a9e4f32f03f54037cce6b48744af00070c6d860a61fa799fc24a2c328570
 MISC metadata.xml 352 BLAKE2B f0b9f88008f0d309ce4da3cbbe13bd43ff9d5090a4d27c3111187b98fea1bb43b3e9a421a164c4417df103c10d81a5d71bdf3fb370264b4c7783600ebff63ac4 SHA512 3e7b758723dc804702a6cd4b75a8cc866ae466bec06ce3192ddfeace2a7adf8ca44ce597fbb1f36671dada42751ccb2248a45e45036c4be94421cb97575dc765
diff --git a/dev-ruby/charlock_holmes/charlock_holmes-0.7.3.ebuild b/dev-ruby/charlock_holmes/charlock_holmes-0.7.3.ebuild
deleted file mode 100644
index 8ac72af952a7..000000000000
--- a/dev-ruby/charlock_holmes/charlock_holmes-0.7.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Character encoding detecting library for Ruby using ICU"
-HOMEPAGE="https://github.com/brianmario/charlock_holmes"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-ruby_add_bdepend "test? (
-	dev-ruby/minitest )"
-
-CDEPEND="dev-libs/icu:=
-		sys-libs/zlib"
-DEPEND+=" ${CDEPEND}"
-RDEPEND+=" ${CDEPEND}"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/d' test/helper.rb || die
-
-	# Avoid dependency on rake-compiler
-	sed -i -e '/rake-compiler/,$ s:^:#:' Rakefile || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/${PN} extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake V=1 -Cext/${PN}
-	cp ext/${PN}/${PN}$(get_modname) lib/${PN}/ || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib test/*.rb || die
-}
diff --git a/dev-ruby/charlock_holmes/charlock_holmes-0.7.4.ebuild b/dev-ruby/charlock_holmes/charlock_holmes-0.7.4.ebuild
deleted file mode 100644
index 34c4a819f3ab..000000000000
--- a/dev-ruby/charlock_holmes/charlock_holmes-0.7.4.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Character encoding detecting library for Ruby using ICU"
-HOMEPAGE="https://github.com/brianmario/charlock_holmes"
-SRC_URI="https://github.com/brianmario/charlock_holmes/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-ruby_add_bdepend "test? (
-	dev-ruby/minitest )"
-
-CDEPEND="dev-libs/icu:=
-		sys-libs/zlib"
-DEPEND+=" ${CDEPEND}"
-RDEPEND+=" ${CDEPEND}"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/d' test/helper.rb || die
-
-	# Avoid dependency on rake-compiler
-	sed -i -e '/rake-compiler/,$ s:^:#:' Rakefile || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/${PN} extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake V=1 -Cext/${PN}
-	cp ext/${PN}/${PN}$(get_modname) lib/${PN}/ || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib test/*.rb || die
-}
diff --git a/dev-ruby/charlock_holmes/charlock_holmes-0.7.5.ebuild b/dev-ruby/charlock_holmes/charlock_holmes-0.7.5.ebuild
index 1e6a842207db..b9bbacc1a91b 100644
--- a/dev-ruby/charlock_holmes/charlock_holmes-0.7.5.ebuild
+++ b/dev-ruby/charlock_holmes/charlock_holmes-0.7.5.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="README.md"
diff --git a/dev-ruby/childprocess/Manifest b/dev-ruby/childprocess/Manifest
index 87809cf1e96e..01e81e8f9545 100644
--- a/dev-ruby/childprocess/Manifest
+++ b/dev-ruby/childprocess/Manifest
@@ -5,5 +5,5 @@ DIST childprocess-0.8.0.gem 32768 BLAKE2B c473da69bd38bda1e28e6adbac7b11597b05ea
 EBUILD childprocess-0.6.3.ebuild 859 BLAKE2B 035d58cbcaccde7a7031adf1cce7874aff5de2e7c5ed3cd9eee1299bd9adefdc656cc5bcb711ed80931492906bf6a45606e3fea77b7eb1d616b3d56ced534156 SHA512 6477a2f5c1def70a61bdb6217a66e7c01d539c87432e4e201fd3676b609724307dfdd95ecdfc255b79bce53d93737e0397669da5909f00b73c26f89028a9a52e
 EBUILD childprocess-0.7.0.ebuild 827 BLAKE2B 459b53e470695788f860f6b6c4b3c51569cf65ef6ad6e5d9926af68296b9b52dd2a1805e1612046b7ff7de04e3e4e2fd12b19c590677ca77f9225a7249af3f18 SHA512 a701f8fdbb09fee21b6657873c6afaf8b6128c7183484eafe03477faa0751ad0d46fb338f2378782a4feb16d82c1104d8f6301ed8ecb54d11484845e897d2f41
 EBUILD childprocess-0.7.1.ebuild 982 BLAKE2B e308b59240cb57815e2138d9fb6e91a4c0a7d2212029cb5bc597e4041022b41124417f0a990485f56193fb937fe9655ea65976f049fe621ee85d4b889bcf28d4 SHA512 262d468770afc3288c6923090e8b0620c9d51e569e3eb823cc7d145dfd956756b678489f9976c4492f49f0ace0fe9137b5957440ce14fe52d184e398c64af37b
-EBUILD childprocess-0.8.0.ebuild 968 BLAKE2B 008a1f6691b4ad5daea2415dc158412a0a756e1a9eaf475ded85e47cade0b97e06a472edaca5f3284936f20319632ba8d637ec48f35b0fbb84fa1148298c49cb SHA512 4f65da1957b413c208425c03507d871a0a99bd62d75b3e77bcb54c0f4959deedcc4f740e1934fda96089fcf579aa725b1af1def2531f475bae7fe57487ef28d7
+EBUILD childprocess-0.8.0.ebuild 975 BLAKE2B ea1902170503fa521ec6fb176c56d8a1054076eba8cb5378d47b3d917ac7022e6889c22337606985f19212b15e6bc0dc0e8f2414a6dd00fcaea206838bec119f SHA512 e3200509ca42c07c6869ba859cf66aecb77433e37ea1631f2a87d9d5ec5fe4dd4b8d28d4629fce0d1b924fc790d08df32e3a80823b789263e972fede3e9e8505
 MISC metadata.xml 344 BLAKE2B 3cbaf9e4992ca3e9fa2283451433e35247418e190a6447453848988e305a4f04583a3ee563149774c347dbd6bac2ebb0451c19fba1d5447162707783c02ff6b9 SHA512 2995953d3ac4c6cc924859dcc2910bd303262f86d5771368956cb0a3d26db031302547154bd98cdcf189aad39e132020c0c22510c65c7830f528cbf2265d871a
diff --git a/dev-ruby/childprocess/childprocess-0.8.0.ebuild b/dev-ruby/childprocess/childprocess-0.8.0.ebuild
index 571ee9e6de47..d497ab979068 100644
--- a/dev-ruby/childprocess/childprocess-0.8.0.ebuild
+++ b/dev-ruby/childprocess/childprocess-0.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,7 +19,7 @@ HOMEPAGE="https://github.com/jarib/childprocess"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/ffi-1.0.11"
diff --git a/dev-ruby/chronic/Manifest b/dev-ruby/chronic/Manifest
index a03764cef61a..d79d7a56e831 100644
--- a/dev-ruby/chronic/Manifest
+++ b/dev-ruby/chronic/Manifest
@@ -1,3 +1,3 @@
 DIST chronic-0.10.2.gem 43008 BLAKE2B 669361fb9aa9da9ea71f6b131dbd4d0101f63bdace26b3f1355f2f3bb793e52ec59ef2cd51e71953cbbfc6c1cf7bbcec215a7d9f65dc40099ec717eeac9b527f SHA512 4efaa6453a38e62f15e7286b9b62891fdf2b4363cf8bc0b1078d22ab18863bb65db46ad523801801c76c5b751e52809a769d49743ca9369ddee2be1c526c67be
-EBUILD chronic-0.10.2.ebuild 731 BLAKE2B ee45c5c2f3fe1914d0ee6b7336590b5f6e1f90f36743cf34862224a69e88f2d3a753f87be91f651420b7ccef81bae07e794609e3f1cf13d865a19dc2b012db2f SHA512 cdc6c414e63d09755f2ca1d4f3dec3161b75959a00b77174d3e0d858f342f964f68722c21b410aca79b5814332d5224280f4d0a348bcd62b71881436a9979f83
+EBUILD chronic-0.10.2.ebuild 731 BLAKE2B 94399ac27887c6b47c10c9d22f54eb180b2e931c6adde2eca7890d030a7a465c02216fe4491efe99e61eb7a27562afadd1eaab8bfd180653ff23c0fa0eafd0bd SHA512 2241acd90ebb264115731a2b2679ce15f81ba6515a47d12f8aacaad1ef3b0fa2a9b9ce9236c0dd3e118ec3218bb475674c88a7cf37b323fde4ddda732212101f
 MISC metadata.xml 341 BLAKE2B f6fe65162a4fa020399f3df2b49e47d2180007bc6dbacb02630ca624e8178333e499fcd8f174ee87b1fd0afecc4a542bb42d7ad970141bfd3195b8845ca57505 SHA512 08308a85242b516b576944c0a5fe04f9c808f7fdf8e4b534cd446ac17f1915861fab39b2ab92f1cf1693f07197c7fd665586f6b02d61a04bf51bee1fd92b2169
diff --git a/dev-ruby/chronic/chronic-0.10.2.ebuild b/dev-ruby/chronic/chronic-0.10.2.ebuild
index 956c90784432..3bd6cc202988 100644
--- a/dev-ruby/chronic/chronic-0.10.2.ebuild
+++ b/dev-ruby/chronic/chronic-0.10.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="HISTORY.md README.md"
diff --git a/dev-ruby/classifier-reborn/Manifest b/dev-ruby/classifier-reborn/Manifest
index 49d51f36b02a..065a2d02fae1 100644
--- a/dev-ruby/classifier-reborn/Manifest
+++ b/dev-ruby/classifier-reborn/Manifest
@@ -1,7 +1,3 @@
-DIST classifier-reborn-2.0.4.tar.gz 40653 BLAKE2B afbf45ac146e67873f5b90a8cc4383afd4ff4fd3f3956f9d3d0ad3096b66e80380b9670aae34f919331c5111e1195259fba98ba2c80b8c27332149c92612db8a SHA512 f89a075b61c1f36894cc57cba3943174c4414512e6f89dd2fa854126e38132239312f2b3464ffbd9b531d8f2987658fafa9cd8fe29d5f7ad8146984436deddd5
-DIST classifier-reborn-2.1.0.tar.gz 42088 BLAKE2B 8a7ecf4d91f4dbe0ceff82c9b7d2839cfa9ea695cbdeca0c0752a1017a870bef178ccd65c43351ff85c4ff4e59e918627e9e18a840463ab7b3f5ef6fdb27fc23 SHA512 0c28128d1eaef8eeb168b372228a52c1bf9683aec3a670eb568fe709eba0b2b5f34ff48f89dd51283b3b560fba3f1908a62407ca8746ad5d74cfa57a03bc38f3
 DIST classifier-reborn-2.2.0.tar.gz 319010 BLAKE2B f4bd3259b9d6e324f3f0feb06dfd1c8736eaa8ae0f687e488b6e11b9cda8e6bf9e56a175c01dfb9352184da1a030d1330e22917c7bfdcb4242fa0102f6291940 SHA512 d299ce8f3b96de5c6194e816d880ebb895faaacdc2a19985166bdc3d9760242ec41d85f22167ea66e9afd743f5d91d63881da02882d1a412fc95a0c5db63d04c
-EBUILD classifier-reborn-2.0.4.ebuild 901 BLAKE2B 2b2e938c0aab964e2320519072a53a87d05a4b0827eed35fa6145052366badef65356bbc86001315b696c370b5ee47ad8aa2ca3c1ac0dc48722dbd09b868cace SHA512 443cc6bbb7790ee03dd88ca2ef3e0ab8ffc7c9a6fa04ca6e4fe9ab10c0e2739f3831de528a233108c50710ea070b47cfa6ed4265623de77bb4f8aede7616f1e5
-EBUILD classifier-reborn-2.1.0.ebuild 974 BLAKE2B 97638b85c250c73983f0a360a796ca2b349a2029c857f5f32f7e45ce4acfef75b3cc731dc2139694baad30d758fa51e9321ae958d33389f2a48e6abee0c32639 SHA512 6311fda87ae920d4a51ee61e25c95251c3af53fc6b81e18925b7245b121210e540348f945a09e87f5486709c9333740f85962529e557bb3b5ce7db16c54fcc5c
-EBUILD classifier-reborn-2.2.0.ebuild 975 BLAKE2B 289fb979e54eb7071dc8eb5ec809bd2319389f25460b67c75c2569d9bb8c94494b6406b3a884e9cc9e43b6343ccecfafae4aaaa8eb2459c57ead2a1784a7c97a SHA512 6af29d1b25fea57705f2fd8e9e1ac646c707b7fd7824566da32fbdcbefb14070ab2a8f9682c1612f845cf075aaf9581d977d6ee5e0496c58693ea57236b72cd4
+EBUILD classifier-reborn-2.2.0.ebuild 982 BLAKE2B fc706219132fe740a1bf0f0fdb2a5a2fccfc5628fa74c29efad202740e997f98a899f851934c12a00993ff404b9a10d06a9534958c11e216a9728233fe8be72e SHA512 fa8274279dd46e5566671003adc2bd5decbb7e9d2c349d9c5d8278a8b85556dd4983c44491dc094e21e19b5319f8c9013be8c830b482e7e893961277c51a1036
 MISC metadata.xml 350 BLAKE2B 91cfcda17c5879371a12e7faea70e149ffb7478408043f887f028ee862b7170269320f193746be9466cb7b4538898669e98a182b92731ece55ba97ac21d82465 SHA512 defb2af66dc0a90b83cc127144db7932659ce36beda28f59ea1fe693843fa3c41dd584f53b9ec6136ae2470aeab4ef191621e84862f97c33a736eae54d6c5a71
diff --git a/dev-ruby/classifier-reborn/classifier-reborn-2.0.4.ebuild b/dev-ruby/classifier-reborn/classifier-reborn-2.0.4.ebuild
deleted file mode 100644
index 8e616cb9dace..000000000000
--- a/dev-ruby/classifier-reborn/classifier-reborn-2.0.4.ebuild
+++ /dev/null
@@ -1,34 +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_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.markdown"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Module to allow Bayesian and other types of classifications"
-HOMEPAGE="https://github.com/jekyll/classifier-reborn"
-SRC_URI="https://github.com/jekyll/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="gsl test"
-
-ruby_add_rdepend ">=dev-ruby/fast-stemmer-1.0.0
-	!!dev-ruby/classifier
-	gsl? ( dev-ruby/rb-gsl )"
-
-all_ruby_prepare() {
-	sed -i -e "/[Bb]undler/d" Rakefile || die
-	if use !gsl; then
-		sed -e 's/$GSL = true/$GSL = false/'\
-			-e 's/vector_serialize/vector/'\
-			-i lib/${PN}/lsi.rb || die
-	fi
-	# Comment out broken test
-	sed -i -e "/assert 'Normal',/s/^/#/" test/bayes/bayesian_test.rb || die
-}
diff --git a/dev-ruby/classifier-reborn/classifier-reborn-2.1.0.ebuild b/dev-ruby/classifier-reborn/classifier-reborn-2.1.0.ebuild
deleted file mode 100644
index e4c7a0414207..000000000000
--- a/dev-ruby/classifier-reborn/classifier-reborn-2.1.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby22 ruby23"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.markdown"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Module to allow Bayesian and other types of classifications"
-HOMEPAGE="https://github.com/jekyll/classifier-reborn"
-SRC_URI="https://github.com/jekyll/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="gsl test"
-
-ruby_add_rdepend ">=dev-ruby/fast-stemmer-1.0.0
-	!!dev-ruby/classifier
-	gsl? ( dev-ruby/rb-gsl )"
-
-all_ruby_prepare() {
-	sed -i -e "/[Bb]undler/d" Rakefile || die
-	if use !gsl; then
-		sed -e 's/$GSL = true/$GSL = false/'\
-			-e 's/vector_serialize/vector/'\
-			-i lib/${PN}/lsi.rb || die
-	fi
-	# Comment out broken test
-	sed -i -e "/assert 'Normal',/s/^/#/" test/bayes/bayesian_test.rb || die
-
-	sed -i -e '/reporters/I s:^:#:' -e '/pry/ s:^:#:' test/test_helper.rb || die
-}
diff --git a/dev-ruby/classifier-reborn/classifier-reborn-2.2.0.ebuild b/dev-ruby/classifier-reborn/classifier-reborn-2.2.0.ebuild
index 81569b8aacd0..fbe7ad40220d 100644
--- a/dev-ruby/classifier-reborn/classifier-reborn-2.2.0.ebuild
+++ b/dev-ruby/classifier-reborn/classifier-reborn-2.2.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby22 ruby23"
+USE_RUBY="ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="README.markdown"
diff --git a/dev-ruby/classifier/Manifest b/dev-ruby/classifier/Manifest
index a249f4675ed1..c6a8cd4ffc35 100644
--- a/dev-ruby/classifier/Manifest
+++ b/dev-ruby/classifier/Manifest
@@ -1,3 +1,3 @@
 DIST classifier-1.3.4.gem 26112 BLAKE2B 61f7ac90dd4432f171abbf20ed822e5f553863e3bf487b4e97ab307df3e1c2212c129cc759a4d1647efa31fad00af7abb81fabf99c48da6df5c2e77778e40462 SHA512 b59fe17f7fe508d5f26584e14d5cd89eed8f77756b75a65adf2512116d0a67b716d14c2f742270fd14765567079a88264f5e1afe49d3865403814c4bdaf8f2f1
-EBUILD classifier-1.3.4.ebuild 990 BLAKE2B 04453d7cbf04a50f49e404cc0c6e3d4ff3001da18d4619c3ce94976e15ef4f603ac67011e8f06526d0169a980daa0d2563f874f5600cda0f225faf86b51fab6a SHA512 da598cc7730fdf6529a30b0f2671ec83a39c8bf8f56ed7eacd71ef2f4d15c0e9c52b10b2c535248bff775ca51f15ece0e6a22ca4dbd8c0da6543e75741a04897
+EBUILD classifier-1.3.4.ebuild 990 BLAKE2B 28836fac04f1a0df9a03e8dde2b7cab6c0a95a1e2776a7ae70c833ce466342a02540d8a3bc21a9a202289662ab2619092a803a8ca990bdd9668338855dec90ea SHA512 acab34ab2bf50af1a9a65f683e4b9141d839609e45f29149fd34288430c1a1a12d83c689663dfa393feb64fcfd8807ecd54529b6867ace911fe67c6043f4e5e4
 MISC metadata.xml 346 BLAKE2B b0a975c5fa5219c578a2eb542744792cd5db4cc158e636ceafb0f4e04c460d8338499b3622f7cae014a1fc11259697adb3ac7a30d72449e28abeac1f55a5bf14 SHA512 01d4931bce6d5e0fe7fd5e6c84773420a3eeca9e98f9457872d1dd4ca24bddbdbc7bc96077d41858f155538e60c6bc2a997730612386caa6dea3c12434d77b10
diff --git a/dev-ruby/classifier/classifier-1.3.4.ebuild b/dev-ruby/classifier/classifier-1.3.4.ebuild
index 0a5faa7ecf89..3aecb200988c 100644
--- a/dev-ruby/classifier/classifier-1.3.4.ebuild
+++ b/dev-ruby/classifier/classifier-1.3.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23"
+USE_RUBY="ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="README.markdown"
diff --git a/dev-ruby/climate_control/Manifest b/dev-ruby/climate_control/Manifest
index 9426026bb912..a57b00f07d80 100644
--- a/dev-ruby/climate_control/Manifest
+++ b/dev-ruby/climate_control/Manifest
@@ -1,7 +1,3 @@
-DIST climate_control-0.0.3.gem 7168 BLAKE2B 5daeccc36b159894f4f733e41b031ff8dc14f914c8b4bbb9221b3181abdcf281c01d58d78382dab25744b0cac757738ecd23cb4d1b3ef8cffd367e74816a0205 SHA512 9e3b5fbf494e0757fdf52b2b6015d11b2b3aaece95e7226b98ca817a9af731a393ddf9a2278877e7f2ed75c68ff05a06769df03b08cc62757b5af123f7d95f30
-DIST climate_control-0.1.0.gem 9216 BLAKE2B 68d6c2630ebad3a7e3955efd9535f258b8ed1d57f894845291703efff19ad8422c2c8c34578627837b300f99b5c519a3ead058d597b0ca5435b53899530aaff1 SHA512 59e96a8b8b833b7370ed4a11e854ae6088c9f637ed7a1a6dda1666ccbe072f48ea2467508c4b1aa675e88f595aee6d9cc9f3617d75594c388ef6a8d3af44831f
 DIST climate_control-0.2.0.gem 9728 BLAKE2B 9868eef8836189d7567d8fd8f5dade874ed4baef883f38b2d6148bde4f1e24544f31fae75ff7bcec4dc685c1fdd23d5164817460eeaf151d8eb105e023bbd741 SHA512 c264d731fb02c7a15932d2724bcd54dff91d2370a0b5336444e167e0d39596974c3826db502be7dc1b6d99cdbbc022135822222a5a6cb6b822aa32a0913c1ec9
-EBUILD climate_control-0.0.3.ebuild 729 BLAKE2B ced2bf144f4328ef750b240e1e77f8e9f5b6e4e474795eccdf14046710c1725115b8b2fabb8b08a561da45a85ac93fd679b286176b16a859eae50c9d383e50cb SHA512 a8da91f05395eb5adaa107f733d79646ff1b78762a6b98103fe45e099da531bb8d8ac0c797d4ba6773cd22bfefdb809a12efbd38482e0a4ee1fc70a7136ca722
-EBUILD climate_control-0.1.0.ebuild 657 BLAKE2B a30944b8acd7687b0dbccf3033a8807344c32580180250f865ade91dc52c9ed7020a0fb8b4a3304fdcc1af02b456723889d806f9def1c65fccdb70afeab65790 SHA512 4b01068911591e84cba596d38313e0977453932f7f0f842761cd8301b47e830c9d7be3cb64426fa8d4b67b7c6b44110680a022f6874b2e4c522fd8e25d967b0a
 EBUILD climate_control-0.2.0.ebuild 664 BLAKE2B f4dc42e94ecd440312021d943880baee94e37c08339d5e113d5062549907805374364ad6a50defc36cf19b37de76220f18e921a9b9ce8ac4c0540b9840da892c SHA512 37acdf58331f602381977885f91b2b5134cdd4c6aac92c0d121ef93ffb9bd8e784082fb31767ab3966699ae3abf969f4af4a4bca648b3e44e26aace0e46c0bd4
 MISC metadata.xml 352 BLAKE2B a7a827d3c582adc7be3ce1b6e979b5325fdc2c6402d404f7072f59c679b2c599f532b530f26777ab9b40bc5ec9f87babda71ec39f685b8b7ce897e3e3cb7078c SHA512 033eff127f4aba2219417b177dbce740027acc4f9e0723e86faca2368ada2cee92e336575cea9d48a255075525c2fc78677f0c48b585f3bdf851372d66517e3d
diff --git a/dev-ruby/climate_control/climate_control-0.0.3.ebuild b/dev-ruby/climate_control/climate_control-0.0.3.ebuild
deleted file mode 100644
index b953489029a0..000000000000
--- a/dev-ruby/climate_control/climate_control-0.0.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-# uses 1.9 syntax
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="NEWS README.md"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Easily manage your environment"
-HOMEPAGE="https://github.com/thoughtbot/climate_control"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/activesupport-3.0"
-
-all_ruby_prepare() {
-	# Avoid dependencies on simplecov and git.
-	sed -i -e '/simplecov/I s:^:#:' spec/spec_helper.rb || die
-	sed -i -e 's/git ls-files/echo ""/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/climate_control/climate_control-0.1.0.ebuild b/dev-ruby/climate_control/climate_control-0.1.0.ebuild
deleted file mode 100644
index 06d8d47a5190..000000000000
--- a/dev-ruby/climate_control/climate_control-0.1.0.ebuild
+++ /dev/null
@@ -1,29 +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_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="NEWS README.md"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Easily manage your environment"
-HOMEPAGE="https://github.com/thoughtbot/climate_control"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-all_ruby_prepare() {
-	# Avoid dependencies on simplecov and git.
-	sed -i -e '/simplecov/I s:^:#:' spec/spec_helper.rb || die
-	sed -i -e 's/git ls-files/echo ""/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/cmdparse/Manifest b/dev-ruby/cmdparse/Manifest
index b3a55d9f71ff..ddb09ef01ecc 100644
--- a/dev-ruby/cmdparse/Manifest
+++ b/dev-ruby/cmdparse/Manifest
@@ -1,9 +1,5 @@
 DIST cmdparse-2.0.6.gem 53760 BLAKE2B eda157aa8f8d4fce31df8944524dbf7f8c9d8f8764bf5fc85de044d50e20be0ba408e45815916389e77b6a42787d4ae00577ceeee66ff0fb46e4526f8209ba56 SHA512 c4120b049e7d42d65be80649cdd097d17f8a732f090382759351617225f6235438f4338466e5e8c7b5c35675ca43d4930dc39b357263062ba7ae9c61c85f472e
-DIST cmdparse-3.0.1.gem 53760 BLAKE2B 6c3e6ea7ae827935b77b8618a2d7da1788632c82b99c439dba01ef8a3948f9a557567408c5e4e40ab7da1f8343394b1822b3adf0226aee92b86e448f3a27ce3c SHA512 8724ef46d543ee4677f9245b68b41c776cebfe7464dc63e3d785557883a10f4471810e90831873e3774c2597f55c32fcf48ac7efe6e494a63269ac713a3ce2ee
-DIST cmdparse-3.0.2.gem 53760 BLAKE2B e19e4d3fb772326823d167b68b4285a4550674dc631cc803968a65bb6a0c24d2d4e5d8cef29a09e3d98dfc299ee130030478381cb9a54a4a3d47f7f721125ada SHA512 217f6d7459342c9c274d5b5b4ccb279e66d7adfe1ef4f7b8eb9c7fe418b0bd4d66c790601d0ea4dc120b78977b6586e7993e9242818244c0eb1affb68fd8fc0c
 DIST cmdparse-3.0.3.gem 53760 BLAKE2B d801f17745d253294a1fbac720a138f267af171ff04734d3de1e51427bd96174e3afe99f0a8e97479604f64bebf078806b26b5825db9febb29adf31d9bd32a82 SHA512 decea4449653ed459dab25eae2681cb1bcfdd15c3f5c32ee19506d2ab33e7ab89a0ee46dbcc72c16a72eaf3833c847b5b86a0a74a528f520256cf9a8e54af81d
-EBUILD cmdparse-2.0.6-r1.ebuild 516 BLAKE2B 9ac55b4949632d8e9116ed62d1479fe8f6c84b7c37a35ceb69ba2bd5f943ca0d3b9cb9f555f342c311e0a69a7196cbe7cb06dc014d0e4b89f55ff288c3d6c320 SHA512 e594140b9c276f85b5e8c33936bffbf50e35c9eac844c80ed08fae4be9a711174acdbfe0584fb2b5a20e898b2a5a0382ec063b10762ec2ca58880a17a0f0bbed
-EBUILD cmdparse-3.0.1.ebuild 429 BLAKE2B 1f7761034c8d03fb217b813132b4783f7d3578fdcb21912d968d98958c628a4fe5f2bc3b875312760f44425d9c8f30cc7df2ff6b5e8106ae5f7fa0b6043c97b4 SHA512 0199730669b7d3071084a230ce07b2a81722b9f5cc5a6aec4fd51cdd43ccfea2394db87ab584afb4753e9ab39d5ddbb58f082d0a9d34c60901f269d24402c076
-EBUILD cmdparse-3.0.2.ebuild 437 BLAKE2B 3758ba318867c3f22f81553242c19c5fae563949a7153bc8f9902d6fbd27634a17640e9fbdb560c1c87036e1b1ef3e9169b92475c53f8daf3cd156cb7197d17d SHA512 fe21777adf6cc06082f5a4ac774bc189d9574e248996562effb8f5d472f52c4d5c7b42388099ae60023aa499eeb15e5a75ca89c734fe402cce64469f493f95a1
-EBUILD cmdparse-3.0.3.ebuild 437 BLAKE2B 877d9b9d501378ca14e7fbcb75dcd96ccbaf06ea1bff9a2d6b76ba27dcef40c22d4329f23289a61157a356c74e53f5551b734ed6ea53e1b8640dd213600bcbf7 SHA512 9217ae5dd6f28230858ce9392a451d4b8d075846f2cae979ae87c993a298dba6d81be875b39df9856fee4066dc4a0065acaf1dbf7bae6baaf98f447b7f95c87e
+EBUILD cmdparse-2.0.6-r1.ebuild 516 BLAKE2B eaca4c898fd5085c35577f6bd4ca6de71d916a50e83f6ab74bb951a8da82eae817a5057e5010244150d80491be1a8c2feea97225236168ffcd5e763ff96d8157 SHA512 95c9c91bdb6f6b62f930c3ce5ff7c47116f781f625402ee918f6b52bfd852a36c2acb964ac40d4fba94a9b68a1cbf00046f1185280e490ce64a8c931aa94d355
+EBUILD cmdparse-3.0.3.ebuild 437 BLAKE2B bdcd5e53b690cdcbad8407d8879a398ff59c526676b873ec82b4bc8cac883a7abcce743b3daffdd0293ae5bf795cf90bb1519ce68b1c58a61ff3d6cf84f28bcf SHA512 b7e38b2721d2ed3ba39814b83aa50c73d1d62e527a4de9ddbf8d1766cbb5251e98a535055ad52bae7787fb446c15c8394304f0679b8561bd02c5c8d30f4bb08a
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/cmdparse/cmdparse-2.0.6-r1.ebuild b/dev-ruby/cmdparse/cmdparse-2.0.6-r1.ebuild
index 113f0a71f6ce..e6099563cd70 100644
--- a/dev-ruby/cmdparse/cmdparse-2.0.6-r1.ebuild
+++ b/dev-ruby/cmdparse/cmdparse-2.0.6-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_TASK_TEST=""
 
diff --git a/dev-ruby/cmdparse/cmdparse-3.0.1.ebuild b/dev-ruby/cmdparse/cmdparse-3.0.1.ebuild
deleted file mode 100644
index 18611e9bba28..000000000000
--- a/dev-ruby/cmdparse/cmdparse-3.0.1.ebuild
+++ /dev/null
@@ -1,22 +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_TASK_TEST=""
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-IUSE=""
-
-DESCRIPTION="Advanced command line parser supporting commands"
-HOMEPAGE="http://cmdparse.gettalong.org/"
-
-KEYWORDS="~amd64 ~ppc64 ~x86"
-LICENSE="LGPL-3"
-SLOT="3"
diff --git a/dev-ruby/cmdparse/cmdparse-3.0.2.ebuild b/dev-ruby/cmdparse/cmdparse-3.0.2.ebuild
deleted file mode 100644
index 542b5d9c3473..000000000000
--- a/dev-ruby/cmdparse/cmdparse-3.0.2.ebuild
+++ /dev/null
@@ -1,22 +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 ruby24"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-IUSE=""
-
-DESCRIPTION="Advanced command line parser supporting commands"
-HOMEPAGE="https://cmdparse.gettalong.org/"
-
-KEYWORDS="~amd64 ~ppc64 ~x86"
-LICENSE="LGPL-3"
-SLOT="3"
diff --git a/dev-ruby/cmdparse/cmdparse-3.0.3.ebuild b/dev-ruby/cmdparse/cmdparse-3.0.3.ebuild
index 36334bfe81a9..3ebb4e55ffc6 100644
--- a/dev-ruby/cmdparse/cmdparse-3.0.3.ebuild
+++ b/dev-ruby/cmdparse/cmdparse-3.0.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_TASK_TEST=""
 
diff --git a/dev-ruby/coffee-script-source/Manifest b/dev-ruby/coffee-script-source/Manifest
index faedf8b62cd9..f0fd402cabb0 100644
--- a/dev-ruby/coffee-script-source/Manifest
+++ b/dev-ruby/coffee-script-source/Manifest
@@ -1,3 +1,3 @@
 DIST coffee-script-source-1.12.2.gem 65024 BLAKE2B 7796ea3b031fe04ff286c023d5de62a1bccff6bef7aa6b0eb01e92bdae59f2e46134c0efae36d647a07cb0dcea61d7da5bf47d1197bdd02a4a2daf0edcbae743 SHA512 f20dfc576202e5100f297e28481ac4e61776fd6684600ce5949b5deb26bfbacd74ae183462fc3cdaa81f95eb95729cd520b72841f70b6b4b133b1eea08ed6fcb
-EBUILD coffee-script-source-1.12.2.ebuild 459 BLAKE2B 179619e4211a71bd3a935af4ed20b4c412214bf13901f50eaad43413301790ef7d75df97ce70a6c775e5ab3b17aedb8c0cf5abf959e9500a7b90f6b77b637eeb SHA512 bcf4d62d4bcf14e524c0c8d047d1eeaa0880461495c000bf40ded9def795a8fdc7c4bf0e89a75d47c2d12f900d93584f88744aebdec6af5134313cdf072261db
+EBUILD coffee-script-source-1.12.2.ebuild 459 BLAKE2B d8000e2b1535fceccdad40775c73109a8645282a8258189505e8402f807543065c5ae17f53011c639fe6edb2df2063b41524b05c725c1eadf037a7e7fb0f86f0 SHA512 49a8ec3cc2d953545fa404f361aa7ca3cdce897a765e2012390e7bb2df15365eca6e55b004b52af293b5d5bb7a475c88d3e645a7775d2452413e32313447703c
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/coffee-script-source/coffee-script-source-1.12.2.ebuild b/dev-ruby/coffee-script-source/coffee-script-source-1.12.2.ebuild
index d2b4bcbfdeb8..52de0176ef89 100644
--- a/dev-ruby/coffee-script-source/coffee-script-source-1.12.2.ebuild
+++ b/dev-ruby/coffee-script-source/coffee-script-source-1.12.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_TASK_TEST=""
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/color/Manifest b/dev-ruby/color/Manifest
index 3616fd743df2..5a70ea20c218 100644
--- a/dev-ruby/color/Manifest
+++ b/dev-ruby/color/Manifest
@@ -1,3 +1,3 @@
 DIST color-1.8.tar.gz 42530 BLAKE2B 4a0f0ff4d4f82530fab5bad345350ea0cd983bc7d1bd8898c8a4da16de788efc908cff919d622ce0a9c445257e1dfef0adda4b29641d3eda55d0a8c917db932f SHA512 be48a8895b5dd33326a9debe250c87df37025eb2dca05a0eb61b82b31dbc1ee27c175fc1e37262bce88729e882dfb66f449a3a29c76b9ef0ac2064ffa2b4266c
-EBUILD color-1.8.ebuild 652 BLAKE2B 981aa39b876b718d79b54254c4c71a452f528dd1cf37e792eca6ecb1e69d2896a2d4df70215d0fe0d7b2731933cd162811b3d8816707f4bd16b51be440f8d9d5 SHA512 485421abbeb7a15e66502322a5bc55ed27f105f819434d651a392429c91eb6b332da279375ad891dcdbf3cd9ed40e9091e7b156f80b7c2371ab92fc512993619
+EBUILD color-1.8.ebuild 652 BLAKE2B e39e62397ebc5eb3bc3bf3fd4c691db819fdf4ad114018d52578c58546bdf56b4921f5b6894b6cd59b09e0037ad01ebf0fd7a76db7edc2b6c398df424d95fd88 SHA512 cfc2c48710a7574c35b40f9a70a29b321539ccb4af12e8761efe44c9f7e1f803110b851e52e7cb7144263d1ff15cbb7baa93d7437fa1ecdb857ded0554e6d9cb
 MISC metadata.xml 342 BLAKE2B d6dd3d97d5d8e17debd8cc9936419a763c876643613f77ba26d8192a07830b5378acfb6dc2ec91e3b04de85096047505f6c7513950afc33dcb8867f49f13627d SHA512 fdf898845d12fcdf5e859e218955efbd245d98f6be064af977cb651723f1f1575ab5019cc77c0afd3d45fc13620672d16921fd5e9d09e88295f0b42d8a8835aa
diff --git a/dev-ruby/color/color-1.8.ebuild b/dev-ruby/color/color-1.8.ebuild
index f6c1eb39397c..fe96bea38762 100644
--- a/dev-ruby/color/color-1.8.ebuild
+++ b/dev-ruby/color/color-1.8.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc"
diff --git a/dev-ruby/colorator/Manifest b/dev-ruby/colorator/Manifest
index 1a2d0aa3eee4..6ef15e759b66 100644
--- a/dev-ruby/colorator/Manifest
+++ b/dev-ruby/colorator/Manifest
@@ -1,5 +1,3 @@
-DIST colorator-0.1.gem 7680 BLAKE2B 6967c4e3e00bd5272a3204bfcfe630340c306c036acb95019ce739abf64e5256c921331cb0e36cddd5375f0a5f4bbbf1e460112d4affaf8584f402aafa432cac SHA512 572a15f4d3011579302ae5448c9752511baec962d65265e923f561b002a3a80384610ab877233f15c1c6953a765fbf32b2d2838a658d207900cf53b6525caee2
 DIST colorator-1.1.0.tar.gz 5112 BLAKE2B 89c297ad2de64b4befd0e0f5b8b4fed07c9456fc1e013d70f3084e15e8392b8e319737eaf9eb9172e4b5a32a36039b096f754de2351ae4f5b68f0f1884230f55 SHA512 7bc2e85f8c4db8ca6db5140c9ebb471d3b1733c1c408595eb0bec531ec5f08fc86f4ee793a451bf51f359c8d4f07beac9e5ae9f418e2752be1c4fb0442b802de
-EBUILD colorator-0.1-r1.ebuild 432 BLAKE2B 4d873117c1c06bffddd5cf06c6d25a1c219c76c3f063e85913ba0ef5feb4fa4057178ce66b6a28aa8c63dc08ecf55826868c63ab057a489b9b7563b012f26a60 SHA512 c9e52118d346959263b54d38bf49e0fe484cd989a7c4eb17e1bb48d2efa136e39e09439a9ed743e8a8d7885a136505c7140d6910443656b0b03f64c137dcabaa
 EBUILD colorator-1.1.0.ebuild 631 BLAKE2B 81212106d1717aef0fc0dc5a4a12a58e4b020aa09e9ceb805b839af616682abe135934e96d079304a78e39341e27cc5eed535ac698293fa518e745aa8f34f608 SHA512 d05a90de99ac7cd06b31d0a83e91155df808dfd81f16789d72b343ca5d4d85a34ec7566aabe9898a086d1ac2a87ff761ecffa4b1f755a2a266e6542005af2d89
 MISC metadata.xml 345 BLAKE2B 5815b6a126adbb21dc2358f24af8ed9b709e801789c23db9ae57aa8c7b1202fa52af5db19937ca8b7747ab56317934eeb2cdf70798669e34f060caf68313d57a SHA512 8d6ee4684e563c007ca7964185567ad26e2876bb9011e4e74e86db653d3ca96f72e2fbce67abc5f1997b9f37bb19efe3426689abb4039d2575189f4dae216876
diff --git a/dev-ruby/colorator/colorator-0.1-r1.ebuild b/dev-ruby/colorator/colorator-0.1-r1.ebuild
deleted file mode 100644
index c82f0c40a7ce..000000000000
--- a/dev-ruby/colorator/colorator-0.1-r1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_EXTRADOC="README.markdown"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Colorize your text in the terminal"
-HOMEPAGE="https://github.com/octopress/colorator"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
diff --git a/dev-ruby/colored/Manifest b/dev-ruby/colored/Manifest
index 7dfd22cfdc49..f364043b6a02 100644
--- a/dev-ruby/colored/Manifest
+++ b/dev-ruby/colored/Manifest
@@ -1,3 +1,3 @@
 DIST colored-1.2.gem 5632 BLAKE2B cb384fe13692d453f86e403a8684604d07543e3ea3270ad15b6d6d8be2c0d3610911a23b82f23c40e0472f40174a290948804eeb8cf5c496f36ab49d56ee4413 SHA512 92a50ba1c434b6a0b409e546812ae6f4331be00a68725cd207504bdd65c9512f4fc3bf83057dd4fad09b8a3e5869595a6bb572c4303f0bef1f241ce63d4fc90b
-EBUILD colored-1.2.ebuild 407 BLAKE2B f0dae476b4beb88947efa3c9e41e2c2323b97981b286d16330ad2773b4eedc4322028fcf82ac1ec051710872a87afc9d998dcacff11ba92ff9091965206d7b47 SHA512 c7c6ef5e4c4de3dc7b0c3d9e99bd3ea950fbb34472928ad0422ad47ff7fba7df4943481840252ca5a28b8c94b70a6efb05fd919b88c406ecc967af6f6c5531c1
+EBUILD colored-1.2.ebuild 407 BLAKE2B f4598d8442317a8743357d4e50bd559b31c01cfbd1a9c9d2e402fac789a7a7304cdde162e05636e40023433fae34e2c2efa22e0e4592145c88a577b4aef9d8e5 SHA512 a6e5ac4cd1b3b47eee08471b6e2fea6de99c75d604caed4b48105612dde19c8baaa08146fdf502443d0124ae96489abba5e74126bbace02c4ff1474f9694fdcc
 MISC metadata.xml 341 BLAKE2B 7b1268ea443452b288b3ae7ab5fb0375d9617ed871b096fb13a3cbff2316b9c512eb02d94e6e78c7581f5785363e7732f6123f02d48ad6f8cd0fb1f68141c4af SHA512 44886af1c3a8092ef96b5cd1be402c478dc7129f79d1245c43015f35b5a8acce2aca76c514d37c1b78267cc9ef50bdc01772a7313b6cb3fb2e95c9b3e5b8013e
diff --git a/dev-ruby/colored/colored-1.2.ebuild b/dev-ruby/colored/colored-1.2.ebuild
index 781fc172b59a..629c7ecc9a3f 100644
--- a/dev-ruby/colored/colored-1.2.ebuild
+++ b/dev-ruby/colored/colored-1.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 
diff --git a/dev-ruby/colorize/Manifest b/dev-ruby/colorize/Manifest
index 91f1e164de3a..5bf101ef42f2 100644
--- a/dev-ruby/colorize/Manifest
+++ b/dev-ruby/colorize/Manifest
@@ -1,3 +1,3 @@
 DIST colorize-0.8.1.gem 15872 BLAKE2B fe8e3a3e010d55954fb9e3e26626202e1d3eba5478e27009fc86bd4029c98fe5a2ed2f2b0d5d1615e892435554272a70c1cbfcdadadea8bcaab894cb290e7992 SHA512 0819dfaa94150c85cbe633c77006f2f4bdd6c4f9bf9dfa954b8c4038b8a680c99a2b4b160da05bf426402d287a0db4c4eb1cc66a949405188b632f39da381c72
-EBUILD colorize-0.8.1.ebuild 654 BLAKE2B 6e6b838d375be62aec6dfc6c4677b7bf9c8b3d27f8f6c7e44df1bb5f94975647da4e84a3e195ae221ea3d1872e828699530108928e206e0a89a1d411227da40f SHA512 6af37ba246edec4ea38cb6370e8de9c26d19db8d9976bbf0e7550bbb2732c24e71c600851fe932df79860eb0be8716e8164043249114cb46363902a20284cdcf
+EBUILD colorize-0.8.1.ebuild 654 BLAKE2B 49105da17d3a3dbbf349e6ba042b8bb77d1da5c70d4a12976de09326a901c6ecfdd95eafbad26b5f0c619366b5ca72c6c1abae200eac8d5d050867bb9ec7d0c9 SHA512 d32962770c11cc3d7687037231c3299ce5b3cfdcec1cfc708f4bbeecad4b8409700968eb6cd29785ba08741abc0c3c6abce3b5cba1956d2f771727d1deb46555
 MISC metadata.xml 343 BLAKE2B 7b31d7efac937af32901ebecaab49e5ac6583720e8411120c77ff3fa154a2a3ec90ea4e13049d1cd2919f13338b51860d77f5d1c3502d71443431d96d8712d59 SHA512 b3a5fe75e52041f21ac82b6b1c78e52952754501e641a328fe7a6da9f2805e09693c96b0c25dcc2f74c2aa07f9122973aa9155f394ceef66386ed9b9cb52e879
diff --git a/dev-ruby/colorize/colorize-0.8.1.ebuild b/dev-ruby/colorize/colorize-0.8.1.ebuild
index 31f2ac329f8e..1914014ad6cb 100644
--- a/dev-ruby/colorize/colorize-0.8.1.ebuild
+++ b/dev-ruby/colorize/colorize-0.8.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
diff --git a/dev-ruby/columnize/Manifest b/dev-ruby/columnize/Manifest
index 8b049565c84b..2a790aa8ca7d 100644
--- a/dev-ruby/columnize/Manifest
+++ b/dev-ruby/columnize/Manifest
@@ -1,3 +1,3 @@
 DIST columnize-0.9.0.gem 16896 BLAKE2B 46821b72e3c0b70b5788002904fe6079dbab28f9f5d085ac269de8b2765c00f22294bbb36a288ea5688baf3a0bfeed9a4edfbe78eb41be67321433032ec99811 SHA512 b85f478db0e70740ff2d09e0c0a0e6eef378cbd0f025f8583726619412c0dd93ce85705978550ed13713f35e90db846ff087110c210742dfc3223bac3da7176c
-EBUILD columnize-0.9.0.ebuild 474 BLAKE2B 2ea37224cbc7513bb0289c9dd7eb01a4a54b41eb79f36e276a4a3d6e6d27313e6472a7688ff3370506317b6fb4868603953ac1e39362ee6daa6b1fd7b108d3a8 SHA512 dbb86e82b51a271861ad5c2190247a01e8daed4cd3c76d9c8a02c43e00afa3be9e2d244e88b5326fee62bf904c6ff8941fb0b9ed0b72e5e99e78cb4a5aef6b90
+EBUILD columnize-0.9.0.ebuild 474 BLAKE2B b9963cf0a573ecf22636fa47701b203b5134732124f6e50d4d2e9f56b4379056dec0ef0d854b8e412c994d74c0a269496d63699ad721d4303bdc36e02a011dc1 SHA512 96eac844c80d5d102ff5bfe6b18d5e56545f9f1a691b33e66cf5b94b88754cfa85cb181678e5f73ffa1f9b3d5262688c33f05a0f6a238eea09ba159f0411385a
 MISC metadata.xml 341 BLAKE2B 45b716657f22cbc7a5c47f5e07e197985aa2aa8deeccc86af0b07a857b65792b5f39dc7d065da35760616ac7687bd8d0d22a3335d07784cefb440b250d0cb1fa SHA512 19ae7edab72e2555852fa43f403a7e2b83970b02122dcf829631cae1b558a66bcdd78425a7f62d6aea6d67b79c2b00324afc1ed608bcb217f130cc74ccbee74b
diff --git a/dev-ruby/columnize/columnize-0.9.0.ebuild b/dev-ruby/columnize/columnize-0.9.0.ebuild
index 28594bcc232d..20dbd8b8ae9a 100644
--- a/dev-ruby/columnize/columnize-0.9.0.ebuild
+++ b/dev-ruby/columnize/columnize-0.9.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_DOCDIR="doc"
 RUBY_FAKEGEM_EXTRADOC="AUTHORS ChangeLog NEWS README.md"
diff --git a/dev-ruby/combustion/Manifest b/dev-ruby/combustion/Manifest
index b941bab9c6a0..9fa63d2dcb7b 100644
--- a/dev-ruby/combustion/Manifest
+++ b/dev-ruby/combustion/Manifest
@@ -1,7 +1,5 @@
-DIST combustion-0.5.5.gem 14848 BLAKE2B 206611759ffbbde96bd29d4bd8ba464702b443a27f67d1abbba5733b9af640fe16fa33b00e68e0d5c0c5d2da1279c0ffd84b8a721836ac1a608b994b7a50451d SHA512 a27b228c9a9796c9bda61176421e9d03500361316606830b28dc101af9c9c4b94354455acbca0c009a64aedd39aff24d8ad7147a9dd4409b513a0858395c0ab8
-DIST combustion-0.6.0.gem 16384 BLAKE2B 2ce7d7cc81a7a2adf445d3de3e23bbd93e0b2e41c869a347f364740bf5a7d55357a06d31879c252ded891341d4e6518e7a93b3848cce67defd74e74ac4ab8ddd SHA512 0b2817a6f4a021a7e0975d6861c4fe1223c9303dd42ab312621bf4fb7de16d36e3ac9868053f45e11daa4bf1b0fa38c48e610ac7f89100868ea5ec8c350eca7d
 DIST combustion-0.7.0.gem 16896 BLAKE2B 241a05ca36cb231deb8e4f0fe6f0e6dae06f8a01e30a4bc078e9e9b4263d614a924a487a5b81c27142de99c69f60590208242b29930819c516ad72b3a3823567 SHA512 77e2f7da100bffce5b3d8271ba4fd685839295d79a0738c02b5a47fb6cde3cebd1a5d6b9b8668f5b3eca5dd5397476d71c393d3e19429d47a77ddd731875f3dc
-EBUILD combustion-0.5.5.ebuild 510 BLAKE2B da282b45b9b0a790b81d85e6cb03855bab4ba69a1aea5c8ffb505c6e10fa07df6e8a6d4da3f1148b2394983e735eaf54f507226ae8d934b211ca519635ae80e7 SHA512 db32e6227b9f512817d119cec75c6d857589365903663e163d115860a2b9de549f6436388d1f48654e4b73b0102aedbe6129546393f467bbd892e0e7fc3bb427
-EBUILD combustion-0.6.0.ebuild 503 BLAKE2B b94e75f83ccc921605cd1392ed474dd2b0a50c88be950dd846cb8a71bcf648672e8bc3678cae195c8502314bd92a16a2d4ad520fc68f6fc3d936114d958aacf1 SHA512 d5110b28768a942110bb08dd6da149d05636c9a31c93fd6cac3ed4008c6aad496bad0fc763645488a07f2f2bd60758712f4130449940853aa43a47b0128f50f5
+DIST combustion-0.8.0.gem 17920 BLAKE2B f318b2a2a6f1ee2103d396f9da52f5aeecdcd76008a91613118732b7253625ef40994680400ce3b8a3f781b08366c8bc15d9288ff9e8d8bd8af8afceb9af9a28 SHA512 145aa927dbedf0f5e8207538f0c741ce7c9a03ae696ad6a525bfcb0d4a3c89ae6f9f1b4ffc384d6aa82e2fa3ad802902a29db2fee9803e7a05dd69ea59c24419
 EBUILD combustion-0.7.0.ebuild 510 BLAKE2B af63b006c0c8710f495b1ee3e12bc1e43b710bd30de16e72fe80c4eb01137ce92f195568cdfb8b2d13573a6f279a3432049858e783182b71a773335889d556c4 SHA512 8b3236888ad7ecbf118a8229314dd0232f3e0ba0e86b1cc97f1cf261465acec1b1a508b8d426bf1ddfd891e88bd1720311a3396b54c816959109bf8a93114a1d
+EBUILD combustion-0.8.0.ebuild 503 BLAKE2B fd2f8df943e511330b6948903260d7ac5b0ebc7cb90d739e1f6fc3efd2c4cfa18b224b9f6580e420d009e8941027bd42a9c80863b9becd958a138aebdff1451d SHA512 39e410894963f8c9fafbc0ff472de26de768e7cad4ef011b6c669ef3eee233640b65aad938d246584d1aed42f059a6d79357f5f25a12dbe77f15e07b837000f6
 MISC metadata.xml 340 BLAKE2B 92307b9df9e0e099c9e38095e3fe14be95374db3313eff5357c57ea1c86cae77276f0a7fe828189402f69e1c29feefa17975d03c94694c59257be999c103a488 SHA512 85ab18259671a4c6f57a305fe992c5a0b078f6bc9f10d88662123def6b378340f5b2f62350a007dd1f62bb66766f1e7b6f3c2546042ff9e52f53332f66ff11bd
diff --git a/dev-ruby/combustion/combustion-0.5.5.ebuild b/dev-ruby/combustion/combustion-0.5.5.ebuild
deleted file mode 100644
index 22d7cbd5ffe9..000000000000
--- a/dev-ruby/combustion/combustion-0.5.5.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Elegant Rails Engine Testing"
-HOMEPAGE="https://github.com/pat/combustion"
-LICENSE="MIT"
-
-KEYWORDS="~amd64"
-SLOT="0"
-IUSE=""
-
-ruby_add_rdepend "
-	>=dev-ruby/activesupport-3.0.0:*
-	>=dev-ruby/railties-3.0.0:*
-	>=dev-ruby/thor-0.14.6
-"
diff --git a/dev-ruby/combustion/combustion-0.6.0.ebuild b/dev-ruby/combustion/combustion-0.8.0.ebuild
index 4084818a9703..8ef121db7a55 100644
--- a/dev-ruby/combustion/combustion-0.6.0.ebuild
+++ b/dev-ruby/combustion/combustion-0.8.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23"
+EAPI=6
+USE_RUBY="ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_TASK_TEST=""
diff --git a/dev-ruby/coolio/Manifest b/dev-ruby/coolio/Manifest
index ec2d5b8450db..317a6509af9a 100644
--- a/dev-ruby/coolio/Manifest
+++ b/dev-ruby/coolio/Manifest
@@ -1,7 +1,3 @@
-DIST cool.io-1.5.0.gem 112128 BLAKE2B e29644b4e2a592f4352141cb3450c90e9b89a2ce490d598695d3318e5722055d56df7ca4d462e0e6facceb5a846c0a654069dc63a2398edc7500d5921426c2ec SHA512 e3089282352eb1f5c08d9cf2c8a8397904eaa3835b1146439c04f104210630b5ae49696716a971a9ba5a33e8cf85f28dc706d211ef47fbe6dfcbbb81a3a87bc1
-DIST cool.io-1.5.1.gem 112128 BLAKE2B 2aba94865094611cc8fa746d4e1e3cec0bea8a762f102e63a5a52cd46d6867e173b406685ca7027f1d9871bf8a0aa6b12c261b95545a288cd2bd61673d807223 SHA512 faf85ca190f7090d288202daf7a74068940402098bcd8ff954e4dc603be9934b332aeb8b43869f56c59a413954e98cbe8a48a554ae65690988a5d9d64169627e
 DIST cool.io-1.5.3.gem 112128 BLAKE2B f343ee73e3796744ec21d3af13e92a0a462e10b262543c2d77ab0dd6c5250bbd6cf0d6579646d146983df1c2b288717f3d4e9f1d5d0cded58a9b1422e497dee5 SHA512 6ef61713acdccf951ebd64018a3d9ec83e2655895994fe23842e18cd2556f4d35ec42144577a83b30ef369a9047a58d1bba2224145653db0b7c203dfdca6c3c3
-EBUILD coolio-1.5.0.ebuild 1612 BLAKE2B 64f12933ae5e4feb375a3da2c3f473f03fb802313341bdd71bcd77d87f304aaf6478378f4febd11b912f35fd097662b41c12cabf0811a03bcabc0db5f6c25c5d SHA512 d2e58b5637334c38c702f3f62e32dafb25b742154b54d8f3a6528f218341b1fa3ddd1e0752102aa0893dba7690b60bfc1d2b26faa1598c1b4615739a5bd8bf8f
-EBUILD coolio-1.5.1.ebuild 1449 BLAKE2B da66c0fad63c376ccb419c2ca67b4e886f5a2bc0d2dfb62c8944251033e3a6818a9e41bc027175efb3c3650ecf80ea2dc9ca92c0f60f242765f9299562fe8a43 SHA512 31a64fb532f880a9681b0d4811e985af01934de4afc7ac336580bde79be1275526699401511778521f843d1767e3ebd9dc29b57776b735bd852e825748e5b68d
 EBUILD coolio-1.5.3.ebuild 1442 BLAKE2B 7580cb65ae5eebe67e830a37f8b2d3b956cffafdd086e36727f927161af3d086a7d40ca8ba0469f80a94be11565e53cb8101d96b49ae67bfd2e4956613a71e68 SHA512 e12364826839d88823e1c140a978b06e6806b14738359b60e2730bc64d92a726e01b120afa1aafb7349da2d7a733782952c33eafaa1da32acbe871a2cf473da1
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/coolio/coolio-1.5.0.ebuild b/dev-ruby/coolio/coolio-1.5.0.ebuild
deleted file mode 100644
index f1590fcf5afd..000000000000
--- a/dev-ruby/coolio/coolio-1.5.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
-RUBY_FAKEGEM_NAME="cool.io"
-
-RUBY_FAKEGEM_GEMSPEC="cool.io.gemspec"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="A high performance event framework for Ruby which uses the libev C library"
-HOMEPAGE="https://coolio.github.io/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# cool.io includes a bundled version of libev that is patched to work correctly with ruby.
-
-ruby_add_rdepend ">=dev-ruby/iobuffer-1"
-
-all_ruby_prepare() {
-	rm -r Gemfile* lib/.gitignore || die
-
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-	sed -i -e '28i  s.add_dependency "iobuffer"' ${RUBY_FAKEGEM_GEMSPEC} || die
-	sed -i -e '/git ls-files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Avoid dependency on rake-compiler
-	sed -i -e '/extensiontask/ s:^:#:' \
-		-e '/ExtensionTask/,/^end/ s:^:#:' Rakefile || die
-
-	# Remove specs that require network connectivity
-	rm -f spec/dns_spec.rb || die
-
-	# Use one address consistently
-	sed -i -e 's/localhost/127.0.0.1/' spec/{udp_socket,tcp_server,iobuffer}_spec.rb || die
-
-	# Remove specs that fail, possibly due to libev
-	# incompatibility. Should be investigated but cool.io is no longer
-	# maintained.
-	rm -f spec/udp_socket_spec.rb || die
-}
-
-each_ruby_configure() {
-	pushd ext/cool.io || die
-	${RUBY} extconf.rb || die
-	popd || die
-}
-
-each_ruby_compile() {
-	pushd ext/cool.io || die
-	emake V=1
-	popd || die
-	cp ext/cool.io/cool.io_ext$(get_modname) lib/ || die
-}
diff --git a/dev-ruby/coolio/coolio-1.5.1.ebuild b/dev-ruby/coolio/coolio-1.5.1.ebuild
deleted file mode 100644
index f5e6db466c6e..000000000000
--- a/dev-ruby/coolio/coolio-1.5.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
-RUBY_FAKEGEM_NAME="cool.io"
-
-RUBY_FAKEGEM_GEMSPEC="cool.io.gemspec"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="A high performance event framework for Ruby which uses the libev C library"
-HOMEPAGE="https://coolio.github.com/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# cool.io includes a bundled version of libev that is patched to work correctly with ruby.
-
-ruby_add_rdepend ">=dev-ruby/iobuffer-1"
-
-all_ruby_prepare() {
-	rm -r Gemfile* lib/.gitignore || die
-
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-	sed -i -e '28i  s.add_dependency "iobuffer"' ${RUBY_FAKEGEM_GEMSPEC} || die
-	sed -i -e '/git ls-files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Avoid dependency on rake-compiler
-	sed -i -e '/extensiontask/ s:^:#:' \
-		-e '/ExtensionTask/,/^end/ s:^:#:' Rakefile || die
-
-	# Remove specs that require network connectivity
-	rm -f spec/dns_spec.rb || die
-
-	# Use one address consistently
-	sed -i -e 's/localhost/127.0.0.1/' spec/{udp_socket,tcp_server,iobuffer}_spec.rb || die
-}
-
-each_ruby_configure() {
-	pushd ext/cool.io || die
-	${RUBY} extconf.rb || die
-	popd || die
-}
-
-each_ruby_compile() {
-	pushd ext/cool.io || die
-	emake V=1
-	popd || die
-	cp ext/cool.io/cool.io_ext$(get_modname) lib/ || die
-}
diff --git a/dev-ruby/countdownlatch/Manifest b/dev-ruby/countdownlatch/Manifest
index fabf6a056b1d..78d9c421a39b 100644
--- a/dev-ruby/countdownlatch/Manifest
+++ b/dev-ruby/countdownlatch/Manifest
@@ -1,3 +1,3 @@
 DIST countdownlatch-1.0.0.gem 7168 BLAKE2B 5261ccfec2c743fb2bdd785bf48c1695ded01be94e0d216d96f2322d5422000450dd6205a0b7ad3597de665b0629f09369937c2ea7cc377dd700a5e233662327 SHA512 3e8e23212b253d6d29ae7834131e7dd5ccb40d6ecb43fe31fa84b8314e932b5ef1cc8ce61f59ba8256bfc80c6f7c131b149748e99ce9b4667f2da7ac8b8279a5
-EBUILD countdownlatch-1.0.0-r1.ebuild 584 BLAKE2B e2425c896fcb8b3cc41732c95bfa37eb8fbc8f5175dd6665df4aaebb4adc0560d59f5714c5c5b783f46452706932392d36697fb3a7256648c0d195be0c44e408 SHA512 0b1334479df06e4875605b4d83ce8d9c79043b1f2d0db980cf71edcd2288c16333a6c78cb18158e17aa0b9f412c6108d86a6471fc226b2a344a7051048c26573
+EBUILD countdownlatch-1.0.0-r1.ebuild 584 BLAKE2B 69117502e2712464fb5fa5047d35ee19c6fb191c5a5920016cae6456440845855d09d0356beea2432b4e61a37c788f666dc4049b9c5d9a560d10df7da193c8b1 SHA512 a281bfe23f6e6313083d8c4b24d09f4f739f31f120285fcb95df3e27f9c428ca2c25fcd6a2ac5adea9a46ce7c1df9999f03afc79c792ba7674d99932a16eed1f
 MISC metadata.xml 352 BLAKE2B 0cc9d71d3f0d0dcc5d20283d7a360b1df257e238340479b8bb7dcfed43c9a1661cb08f7b0fa28648af743f3c5364492a88bebd70259c34481b5f95ecf416fc52 SHA512 bbeaa386c573ae0d90d63dbca6c7975c741d234cf8e96d5fb7512ef907b7e73d730bc4cd50902869cfbb6d7cd6dbb034a0fe1da4dfa3cc7cd298c31f6c615618
diff --git a/dev-ruby/countdownlatch/countdownlatch-1.0.0-r1.ebuild b/dev-ruby/countdownlatch/countdownlatch-1.0.0-r1.ebuild
index 14b1a2616103..191aa5532528 100644
--- a/dev-ruby/countdownlatch/countdownlatch-1.0.0-r1.ebuild
+++ b/dev-ruby/countdownlatch/countdownlatch-1.0.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_TASK_TEST="test"
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/creole/Manifest b/dev-ruby/creole/Manifest
index a7afa74c1c94..f71dbbd0be9c 100644
--- a/dev-ruby/creole/Manifest
+++ b/dev-ruby/creole/Manifest
@@ -1,3 +1,3 @@
 DIST creole-0.5.0.tar.gz 10664 BLAKE2B cf284a80fc43d24dd9e232055b78b9f76e5ee7c44dc86fb3311cc191503d38cd31e6e8f7f6290c451860da3e2dc5646c5baaefa79fa5df9165d2eb867c5dc8ef SHA512 80f82018637f2c33c71cc57e65b6bf372fb508c890269c3a04cf171b549115f3cb09daf7fa29935824780b886c1077db20a6e7dd38af35d715529683d965bc07
-EBUILD creole-0.5.0.ebuild 587 BLAKE2B 6c27fbf150b4c84633dbf0d353dabff3db7dbde44297f77b09b2b70b731b53b867ed34e6d28ea177bcaf680efbc75fbf4bf79cf688e6ab29051bfcaa0c872f93 SHA512 51e907c5654453cb322047f6f9ab5e44165ee4b62e00788455ed6ca43f43bf3f8d1317017f45482b4651a7905f592b69ab0b44874a907304bcd1790af79aa095
+EBUILD creole-0.5.0.ebuild 587 BLAKE2B da07b63d1d6edba68da76227bfdf96fc63e8700d57fb21a0b36b69c6dea561d27b1f201c2542470c795f9d9b9572a6e24424483ac572263adeae06e439d207a6 SHA512 e358bee9b3205aac2a1f9ec1ec95883a60ba3976e4d84c3639bc4e71dac5f698a1aff8ce0a6a58df5c511b7bffcfd7127ca5e8236b747c4aff1fec1ae9357ac6
 MISC metadata.xml 338 BLAKE2B b27bf155a557e48a837a45dc8c85c2ace64f36c9651e47f68753e09997fbb4dca4c3228216ebce8a892aa8cb5fec8a1efa8c2a580f9ad161bb260d56a2197eb6 SHA512 b7f1e902044861ba85037e2e970797fcc9c71cec97521dab3ff08fa246203f11cb0f0e237e570d7309881332f4bf6fe966f3ecd9a1f8bc4af5dcc998864640c7
diff --git a/dev-ruby/creole/creole-0.5.0.ebuild b/dev-ruby/creole/creole-0.5.0.ebuild
index 0cb5c2e51004..2917354f52ed 100644
--- a/dev-ruby/creole/creole-0.5.0.ebuild
+++ b/dev-ruby/creole/creole-0.5.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_TEST="rake"
 RUBY_FAKEGEM_RECIPE_DOC="none"
diff --git a/dev-ruby/cri/Manifest b/dev-ruby/cri/Manifest
index c8bff10817a7..f1b3f1653c94 100644
--- a/dev-ruby/cri/Manifest
+++ b/dev-ruby/cri/Manifest
@@ -1,11 +1,5 @@
-DIST cri-2.10.0.gem 28672 BLAKE2B b155cb453344c3e1c20bbaf352958e2102c3424f8ce73fba9a7b40424a3ef0aa4fb0ac938e366fa142c6f312ecdb16640d203ad7dd3bc427c848695d504a429d SHA512 90c33031c5819823aca54b6ea8be18aeae9a0e707f25a62dfb4091724f46782ed9f44200950ae6d5f654d58c2b925dfcbb3d404acc6ac38b86dba922aed18efb
 DIST cri-2.10.1.gem 28672 BLAKE2B fe6f78ec193298605995e00242a4f615159192b66900c111fa58252aea63c3a5515a0e7a9d7c5a1a0878a2e9c70a77023ee60be4d7b6c780d5f2d1300641e109 SHA512 f71cdd00613b226f916c9f45f9e8ce3a7c0c68bdb547de6df8b9457c018627c18ce978a13c971e0ef2cd24ec985f815df0389d0ddabd463eef93d5e2147e6101
 DIST cri-2.7.1.gem 25088 BLAKE2B 20317d886401d6d5f034c27396cad2fdaf322246c319ef3cadc3e38169dbc00c83771fdb2d564efd0ca386b916a0bc2d8cf283742ccd18ca390e491a84f5e31f SHA512 37d641390dc83550c254b3c48018f7f2c53f73161807c299cb78ef84b8625e5f00cd8c877ac464ece5c6623d7118872c45648ed56c2bd5f53ae62cd66b8e24d1
-DIST cri-2.8.0.gem 25600 BLAKE2B 75c8ab35152eb9bfd4f9d0dda8be67491ef6099b3751b6f4dfc6e24fdf35d037c5a2cd8e963cc20c9ee2f0fca311c680ebadf878d5a32def3c2d1e2fd85d7ede SHA512 ea8543debfda3a9e6ed1ea304b93dcf12114cdade532981b6c1e854ce37fa0c939455b7501f7b36a6efbdd1fd6b77696b97f9baacdb7029f55a9e707c19225a6
-DIST cri-2.9.1.gem 26624 BLAKE2B 882ed884f35eb54a213572deba38cfdba2e50fdff09b63093c2fb769f2b8b4c654b1d446982f82e72238fe237b1dda822d4f0c637402a398c57f99572c38335e SHA512 5abf0ba9315563c4b12ccc11ccb74811fea4de16f25ea2b81fb0854bdeef418bfdc45ab84320f5d71d89bfdcefe5e2a6eb66900aec9231ac1ca999c84b944805
-EBUILD cri-2.10.0.ebuild 772 BLAKE2B 1c35ec63ef811714ac8a1859d5642f281d16c56a6e7b712f418b63b9db7b9c931170fa12d7a2afa4743ec56391ce7a3f3abf9dabeefe309e3034e7e96f3a9ef3 SHA512 ef696f8a982b80b764b370fb41a39e620810a728a5593017daa97fddcacddec8c625d2fcd1ceefd4aafd80886ef2d3a276f6c6f7d8fb98063949bb4e2866f888
 EBUILD cri-2.10.1.ebuild 772 BLAKE2B 1c35ec63ef811714ac8a1859d5642f281d16c56a6e7b712f418b63b9db7b9c931170fa12d7a2afa4743ec56391ce7a3f3abf9dabeefe309e3034e7e96f3a9ef3 SHA512 ef696f8a982b80b764b370fb41a39e620810a728a5593017daa97fddcacddec8c625d2fcd1ceefd4aafd80886ef2d3a276f6c6f7d8fb98063949bb4e2866f888
 EBUILD cri-2.7.1.ebuild 778 BLAKE2B 59c7a6d23e561041891d002cdb68cf42e2d64b978f07e7dfd3ca2aab76fc62a3b510df9efb9b727ad17d3eafb78fc1e02bc2853dce698c165cf82fd89f84fcf3 SHA512 2055a481409e4a4a5260eda361cb9ebc500d0dd8018bc2c721c9dd6d467d684ad2a222ba936c14e67bd122131ec1238b025d11952c85c7fa52528130e271fc2b
-EBUILD cri-2.8.0.ebuild 771 BLAKE2B 16073fa65081c11191d4f43322667070a232beaa17e32e0266870146ff18e1eb1fe5a7ccd7fa31cb6264e1a2cf7ca144a8ed855af0ba9a3af7aea0fa26edcfae SHA512 226796398fd65959e58e39f62c2f80eb41eb0ebe7eba1356580c8aa9eba10dc76b5c509ba4f3f067496ce27fd060d5d5b638fd95de31b492eec3d247e37d0ea2
-EBUILD cri-2.9.1.ebuild 778 BLAKE2B cebce275aa71d824e7781fa7ffdd3be98cef1cca350916af5efb31c6044700b3d3cac74f4cf37a5e2873d5d720034f58bea8bb4bc2796505e50ff5c35fdb93cf SHA512 c69eb88bcd2af2d90e940453566e30140262697b63c015ff0a7dbb389e00413da5bb562dd0cc7c54e12683bd75046d959b9b39e361ed077a37ba5d1d66ede84a
 MISC metadata.xml 321 BLAKE2B 2bbd02b4b0f33bb2e3942b93c9af104fcafe960a59b2f109935f5121c2476635f1a3efb9ac092f4f5e6138df0398ea0ca874ee62390d20f3620d442d3502d42d SHA512 8e90f3ffd2b30ff9557e4c11bb31655cbd65498191288c68191f2e5f6d7bbdab6f1c22935f8d45fa95673582d1d0bf776055c0242cee2da27c9d3e71e2851f72
diff --git a/dev-ruby/cri/cri-2.10.0.ebuild b/dev-ruby/cri/cri-2.10.0.ebuild
deleted file mode 100644
index 01337421830f..000000000000
--- a/dev-ruby/cri/cri-2.10.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24"
-
-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.8.0.ebuild b/dev-ruby/cri/cri-2.8.0.ebuild
deleted file mode 100644
index 055a4d156bda..000000000000
--- a/dev-ruby/cri/cri-2.8.0.ebuild
+++ /dev/null
@@ -1,34 +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_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="http://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.9.1.ebuild b/dev-ruby/cri/cri-2.9.1.ebuild
deleted file mode 100644
index 6a06398e3e0d..000000000000
--- a/dev-ruby/cri/cri-2.9.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-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="http://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/css_parser/Manifest b/dev-ruby/css_parser/Manifest
index 75aa8cf94b37..787eadb57078 100644
--- a/dev-ruby/css_parser/Manifest
+++ b/dev-ruby/css_parser/Manifest
@@ -1,7 +1,5 @@
 DIST css_parser-1.4.10.tar.gz 26718 BLAKE2B fe83cba6f013548e924823f93a727e09d99063e3bc118b62e96e8cbccdc9347ba004ca19627a6c6f5963f24ce8bed0a7af6c3b5bfe3b0c3f73f9f8dbb55398a7 SHA512 ad48200cd9f6fd36d1b13e8699098380c7d74e5349ed1a6aa294615800689a2959f7a91acff9679a630f525d0141f40aaade498570de4f296333c9525b0f1c22
-DIST css_parser-1.5.0.tar.gz 32835 BLAKE2B 85ca5b5fa137b5072ec8183acbdfc2677d959013d01494a99768e9b4975b3cdadd3e5a4defa047255b1693ab82a622d6130922287464e03f7ef3a0768e281d31 SHA512 4d33494abac5aed71cc73345853f7df7cc21bfe1a03d6d443968c357736311104eba4e816fa4b7dae7f42cd5f38dc7a3d8752c13a58387049cfc7a7d11c4f8f6
 DIST css_parser-1.6.0.tar.gz 33251 BLAKE2B 1e28e6999675fadc1bc6a98417cc698fb2e5f16e8d8b27e186037112ac9c3cee82161c7530b962209d76d91359d68016210a371c9e8a7f7d631c7aec73bc5c81 SHA512 838baf3cc4249e890f7cf006370f148261b392549e6cc25b11246e15c8347a8877b4cc3bfe70dee18a822a9a8fc496705787262d79e177d62587f41ba6f4c4d6
 EBUILD css_parser-1.4.10.ebuild 1162 BLAKE2B b2a4b34a156ca92f9ce8ae605cdbf41e34f45c1f5bc19565ead0fafa025eb279ac0a907837e083cd3e26de4ed0004bce4519c5616f199a437c1a7ec0e0ffb315 SHA512 d3a2deba2c9ffc1af9947ab6a500aab97ce21bc0511c8a6bb90a50902e3319d495acc258c092ff88714cd74d9a25ec16ccbdb3919e41fb80ba3bb30aa0bbcb86
-EBUILD css_parser-1.5.0.ebuild 1169 BLAKE2B ef3c31ebf2263f65575b6a5614df028a5a94637ef7817550e00c60ba27c496d2623e1ecc95bc2a6ab35fa0c0f365480aa423cb5afb5471f49bbde99dc34b5cb2 SHA512 9a46301f4cedca0eb300ab161fc0477a1d4a349a03a3a14631642066b9b82d7fb02a918db7cbabb15e56a3d51c19b7400833ed8e5cd3853ea9469863b1829d2b
 EBUILD css_parser-1.6.0.ebuild 1162 BLAKE2B 8f31b39db9a680f5871768a856af520f386c46e5eef5cc5bd8dd5a861629b8444dfefbab4c9d6f01e2e8ee81e64a0b9048340a3599e23f6344de23583c2f1ceb SHA512 fa7064abb2b60c7d6117f914cc362deb89e7b8973aa0f6e777f0865e28ca41f381b15fc1a2c8fc65edb92e8e6bbf5995840d24b7b297dd1fc303be1ff82139b7
 MISC metadata.xml 346 BLAKE2B 982f54d9e88f4c45c010fa2ba5ed692af66ecb29b8384cf99075c8d919188a1635c9c50c5fd732ff20f204c0277ec85f2a000c4367d9ebd868c6f0e2ff48a694 SHA512 117b856fc53e92ff3c62ba01bc1e54f33e5f02c688aae98cb2754485094bb9f01dc3255ef05864bb944b01c9e8d37b7b622de42a38e4b9d8de893c16fec78d45
diff --git a/dev-ruby/css_parser/css_parser-1.5.0.ebuild b/dev-ruby/css_parser/css_parser-1.5.0.ebuild
deleted file mode 100644
index 6fca6ba41cdd..000000000000
--- a/dev-ruby/css_parser/css_parser-1.5.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_DOC_DIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md "
-RUBY_FAKEGEM_TASK_TEST=""
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-GITHUB_USER="premailer"
-GITHUB_PROJECT="${PN}"
-inherit ruby-fakegem
-
-DESCRIPTION="Sass-based Stylesheet Framework"
-HOMEPAGE="http://compass-style.org/ https://github.com/premailer/css_parser/"
-LICENSE="MIT"
-
-SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/archive/v${PV}.tar.gz -> ${GITHUB_PROJECT}-${PV}.tar.gz"
-
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc test"
-
-ruby_add_rdepend "dev-ruby/addressable
-	virtual/ruby-ssl"
-
-ruby_add_bdepend "test? ( dev-ruby/maxitest )"
-
-all_ruby_prepare() {
-	# get rid of bundler usage
-	rm Gemfile || die
-	sed -i -e '/bundler/d' -e '/bump/d' Rakefile || die
-	sed -i -e '/bundler/d' test/test_helper.rb || die
-	# Avoid tests using the network.
-	sed -i -e '/test_loading_a_remote_file_over_ssl/,/end/ s:^:#:' test/test_css_parser_loading.rb || die
-
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib test/*.rb || die
-}
diff --git a/dev-ruby/curb/Manifest b/dev-ruby/curb/Manifest
index 61ad5f6b1b55..949c6cf8ce4a 100644
--- a/dev-ruby/curb/Manifest
+++ b/dev-ruby/curb/Manifest
@@ -1,5 +1,3 @@
-DIST curb-0.9.3.gem 81920 BLAKE2B c7be8fb197d09b75a048384a59c2ea4b71363016848786764a1de267472136474d5a733abf18827c3e5bf5b459aeaad543b946dafcd30bc216503cf34b244a28 SHA512 b484505fbdd038f6827aec9fa936f0a00d0ada5af4c655320976b5efef2b0d503a1aae4f72246467ba7caaede1440c59f511f45f10c53b90fc2a94630bc620f9
 DIST curb-0.9.4.gem 82432 BLAKE2B 2bf2bf0d887369c484d246771afc9cb34c6eb72a3809f13c9047f82030d79b1be47141db03659c1e4f42792c94094e40f05d4b1b0d984aed73a47c24ef96379a SHA512 7b81ba587ac9beb203e040234d9f5032d87352a3e045d3705f474d2eaf1f620245240a59894c7147f54d55f0293f60488e8f883367f96945d49ffcdcef42bfc1
-EBUILD curb-0.9.3.ebuild 1187 BLAKE2B c1c55d9a2fc2bdcf04fb3573035b72f147193d7c9bdd8c5f65cca365e8db5479765a77e27b8a37a489d055fde0cae9ecda7d900ff658af89c24ac8b0fd69c65b SHA512 85a738ddf8e08102da81dbff887df167b650f1917b9d9d296d56c13379f449be268207c6627022903cf12858eb8a772f2778a00e95ebc6a777fcb29298d7cdfb
-EBUILD curb-0.9.4.ebuild 1180 BLAKE2B 63dc6edd97583e6f412159e98d2ed3c11df1c2809ecd3104c224a418257bc8ade0c6cf914871a1c2c47046ab0ab1f98a84f45d8f7ca7dd00c5ff0a307f429ff6 SHA512 c5ce06e92295927624dc3fbcc11c3c6ebf6830509eb0becfb64e9cc5fd627cf1dd5210bec77610a2f5f4dcac207ca7e58c1a8c03d37e477791d1a1667c1b4721
+EBUILD curb-0.9.4.ebuild 1187 BLAKE2B f30a0a452c2fe3145b85df5168f1bed5740126e2ce227c922ced063c07ab88a382cd096e36b362a32b068639cde3f353925510b920ba3b672d65054e5ab63a3f SHA512 51b9ff8225e7cd169e41259220fbd0d12ba76f224833e20ecb5480be3575ec470bc942ad1af1f74eff186b519437296062340b2c659aa1c3283f2c0c1d4a9626
 MISC metadata.xml 335 BLAKE2B e68d36e70f8859cbc9d47397720949fdb7d048601e46c7380575f6c5ce43b04dccc2eb3bb0396a72beea0840f197ceeb5325e935431ef45022bdb2749e1cb57f SHA512 993073ca664dcfc0698a820063013ae20e431f0d2d1b5fa27e0871ba33ebcd09ac70de516ad943934a3a4783d3df4dc93e533082b3b47f245908a5eab4e94658
diff --git a/dev-ruby/curb/curb-0.9.3.ebuild b/dev-ruby/curb/curb-0.9.3.ebuild
deleted file mode 100644
index bb74e101cdb2..000000000000
--- a/dev-ruby/curb/curb-0.9.3.ebuild
+++ /dev/null
@@ -1,45 +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 ruby24"
-
-RUBY_FAKEGEM_RECIPE_TEST="rake"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby-language bindings for libcurl"
-HOMEPAGE="https://github.com/taf2/curb"
-
-LICENSE="Ruby"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND+=" net-misc/curl[ssl]"
-RDEPEND+=" net-misc/curl[ssl]"
-
-all_ruby_prepare() {
-	# fix tests when localhost is also ::1
-	sed -i -e 's|localhost:|127.0.0.1:|g' tests/*.rb || die
-
-	# avoid tests making outside network connections
-	rm tests/bug_postfields_crash.rb || die
-	sed -e '/test_easy_http_verbs_must_respond_to_str/,/^  end/ s:^:#:' \
-		-i tests/tc_curl_easy.rb || die
-
-	# avoid failing tests where failure condition seems weird, no 
-	# upstream travis so not clear if the test is indeed broken.
-	sed -i -e '/test_multi_easy_http/,/^  end/ s:^:#:' tests/tc_curl_multi.rb || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext extconf.rb || die "extconf.rb failed"
-}
-
-each_ruby_compile() {
-	emake -Cext CFLAGS="${CFLAGS} -fPIC" archflags="${LDFLAGS}" V=1
-	cp -l ext/curb_core$(get_modname) lib || die
-}
diff --git a/dev-ruby/curb/curb-0.9.4.ebuild b/dev-ruby/curb/curb-0.9.4.ebuild
index 286c044ffd77..43b3caf607d7 100644
--- a/dev-ruby/curb/curb-0.9.4.ebuild
+++ b/dev-ruby/curb/curb-0.9.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_TEST="rake"
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
diff --git a/dev-ruby/rack/Manifest b/dev-ruby/rack/Manifest
index d00b244668ca..b762816af505 100644
--- a/dev-ruby/rack/Manifest
+++ b/dev-ruby/rack/Manifest
@@ -5,8 +5,10 @@ DIST rack-1.4.7.gem 204800 BLAKE2B 4572e736215025900c254781e98de91ea4d533b039215
 DIST rack-1.5.5.gem 216576 BLAKE2B 4fd13cb14630f6f3afbaac76bb554f46520c125b50d4bdb12fbd939c83af1e189e6f2fb55565a4d3790258e28bc830dbcaa0465622eb9f78b8b9220ae0c9e11d SHA512 7b8ea669c55fa94801aae20612076db702837194bc602c64bec1085836712806a081504b37e4c545bcccf0337e7afc0ad9dca3c1258260fde5f3ec505247056a
 DIST rack-1.6.7.gem 229888 BLAKE2B b4ea51d9a0606c92c6cc199bcaf3f7068e6360dd972417af7fe8784a5b23a8de1288347431f08d9af1d19f1409f18035d668d6e80f0b2080d761a3e703259d0c SHA512 e1cc22d78a61998c034bbf9217cad5cc0e614697e787f58aed9cfb1c3a12f69b557c9e95a4b09fcc1509cb607332a8655a66159b2492ea6fdc2bda21f588a59e
 DIST rack-2.0.3.gem 254464 BLAKE2B c7052ae0210d2c8d9aeaa6e3b5b10b272ea48d6c2601aecd524eeab141d3987b7905d9511814d0ac7a62413ef5eb01e847168a278bafb5a0e8f882c526cdfcc9 SHA512 c48e6681544c2f37797ee697f5c4f0d4de6008a3df2506665b52c248fca1ef7321a892dd28475e4d7b461a0b2d12112903a67e1bed7c7397742833fce85167e1
+DIST rack-2.0.4.gem 254976 BLAKE2B e816bda9969117525d061b2de2e9172d831a1fd0654ee5f4ff0293a95c01b8451204cab034816f7b2382b77cae3c9a735184f3f1c8f5b9e8cb43963001f815da SHA512 d6624d52c456654ab4c98554d544c6cb0bd15fad5a494575ad329bd1892dca2ac612b5730f4e3f6eddf2c0496afc393f215fb7d60795c264d2251896c27f450a
 EBUILD rack-1.4.7.ebuild 1557 BLAKE2B cbc32e320f170ee5347549eac30dc2dfd47ff5d7de2277ed2ad2d0f09fef14f41b98194369afacf21179ffc00fe1d28a09c5ce2710918cee500720f6ee96a68f SHA512 b239eb29871e63a8833c59f38d32703ca11463040f2606dadacf43b382b52cb706b0e1e9e223ed1c956d28470c51b8b038492304c657214e7fb8c7b45b61bf74
 EBUILD rack-1.5.5.ebuild 1390 BLAKE2B d02e9894ac29f189ef11dc64c3388dc9e1bc1f160c27f0c0800f6a2fbfc6fe97f91d4d34aff5cd5e61fb237a15dd91fb0bf06377de81609707a32a8d1c8db2ab SHA512 e71a13d85c2bd8513a14fc805ed3ae4795be5de773e9cf9982e7ba3309695f97b221de9a84856ee9e2465c28de88509a1a48e0af5d33b209a0341ad5fcc62ca1
 EBUILD rack-1.6.7.ebuild 1650 BLAKE2B 33d989d656b6b63de13a30e8ba021596107bb19457e3a04142d478a11bc1d45414e5adfcb7b1ce6164049cd3bac6736e59ee9d6d515be92cf4f119b44bc04f09 SHA512 19bf31a91818bb58322c68978825af255fc32a75aa81906de61f436f477b6ab75a96949079de2c68753fed5743b937d2190330fe19f1eaf16fa9d157709a0053
 EBUILD rack-2.0.3.ebuild 1508 BLAKE2B f5f9bafb1ca637b1303cbf44a32b77b1969e8b773408141de007781524f40643fa59e9b37bb8feb92e950fecb7fa4b96f0d1fe4e8db2c9ab9e7cbf15f9dfd1b3 SHA512 e62cc26861382a150c813a39a5aef7d9e41858ba415f03f789333e4e9f64187b506df4bee860abfca3a2c120b2251b416c3058179be47ca58a4138437145895a
+EBUILD rack-2.0.4.ebuild 1502 BLAKE2B 347d8a48482ba6eff1ef94b9042ba32165977f2c182895f0f9843e916fef267387529a0696ed4329f1d6242f1c27f3489d4402b518e7805ed767fbb40e538d41 SHA512 c62fee19f221abab58b7e9a5d319b29a7cd65b1b08cd057aee3a7cc2a5323f0089809da8de0c1f8995c8849fecc8e77f1673d90b642de31343d3e0bb61beb09f
 MISC metadata.xml 391 BLAKE2B 5ed2f863a5fd68cf57f25afc2c2efa63df1eb25c4e01087130f70edbbd1b79c655ff7455b73ecdd31e083cd35381331fceef52856f946d24fc3d313705fbaef3 SHA512 7ffff4c4cc64855b0c95e2364fa9cfd1e3b06946155cc8244444f5f4e450abda8d8387aabddc224b94a55ff3d5e42391970e5541923e5aae24f408113a65a5c7
diff --git a/dev-ruby/rack/rack-2.0.4.ebuild b/dev-ruby/rack/rack-2.0.4.ebuild
new file mode 100644
index 000000000000..d165855cb026
--- /dev/null
+++ b/dev-ruby/rack/rack-2.0.4.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby22 ruby23 ruby24"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="HISTORY.md README.rdoc SPEC"
+
+inherit ruby-fakegem eutils versionator
+
+DESCRIPTION="A modular Ruby webserver interface"
+HOMEPAGE="https://rack.github.com/"
+
+LICENSE="MIT"
+SLOT="$(get_version_component_range 1-2)"
+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_PATCHES=( ${PN}-1.2.1-gentoo.patch )
+
+ruby_add_rdepend "virtual/ruby-ssl"
+
+ruby_add_bdepend "test? ( dev-ruby/minitest:5 dev-ruby/concurrent-ruby )"
+
+# The gem has automagic dependencies over mongrel, ruby-openid,
+# memcache-client, thin, mongrel and camping; not sure if we should
+# make them dependencies at all.
+
+# Block against versions in older slots that also try to install a binary.
+RDEPEND="${RDEPEND} !<dev-ruby/rack-1.4.5-r1:1.4 !<dev-ruby/rack-1.5.2-r4:1.5 !<dev-ruby/rack-1.6.4-r2:1.6"
+
+all_ruby_prepare() {
+	# The build system tries to generate the ChangeLog from git. Create
+	# an empty file to avoid a needless dependency on git.
+	touch ChangeLog || die
+
+	# Avoid development dependency
+	sed -i -e '/minitest-sprint/ s:^:#:' rack.gemspec || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:test:. -e "require 'test/gemloader.rb'; Dir['test/spec_*.rb'].each{|f| require f}" || die
+}
author	V3n3RiX <venerix@redcorelinux.org>	2018-02-03 08:30:30 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2018-02-03 08:30:30 +0000
commit	eaab68ba6a05bc57d98ca12032440835ef905326 (patch)
tree	722637b4f6d0087c5b321ceb515a98913bee7559 /dev-ruby
parent	4650985dd0e898b82e0d2ec225931297d4fadccf (diff)