gentoo resync : 07.01.2018

23 files changed, 52 insertions, 774 deletions

diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index e51f3cbc089f..cffa1776b18b 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest
index 3ccb1343d7f0..c9c5b6ba6373 100644
--- a/dev-lang/perl/Manifest
+++ b/dev-lang/perl/Manifest
@@ -2,13 +2,14 @@ DIST perl-5.24.1-patches-3.tar.xz 24012 BLAKE2B b215bb7800c157d6ef1461bd898be3b5
 DIST perl-5.24.1.tar.xz 11569284 BLAKE2B 0db211fcfda401d6fc6818aa45b024cebc413360dae14948c2c22c3d546e23d160f84382afdd38619e8766281be81e381d296bae9f34e8582db1a41847f2a1bf SHA512 9429608eb4d7f6a01b5a7df8601e0757acdf3e6d5af960d5cf710f8e4fd20ffe082bb42eedc2cd079d5173e48cf5574d55477e1c51f7f53b32fb5d1b89f6db8c
 DIST perl-5.24.2-patches-1.tar.xz 24012 BLAKE2B ad1890707e40e2f7b3ad420473ed85a5ab4eaba1820df1fc222c669b73d9052db54834db749a515a80d2a9eca8fb8ae441bd567e8dc23c0489c70283f98a50a2 SHA512 3576dbce373a17de2de436b6bd33378c9bca899dab71b7448e3c2d1df5ed3d63ea19ad0e0406526b9a75b416585e0da0c32e653e6f76474fbcd66672094d7aaf
 DIST perl-5.24.2.tar.xz 11570420 BLAKE2B 8a81d16c029976d0e251f9a7c1b475bfc2c4dbb7017086f620dc88781549a29a268f35685d1084260f317ea324a9d4acf536ca2c0540597879977a479a7af10f SHA512 d7bb66e23064aba426fe3f7264d065f0926957675b0bba51fe2ddb623561ffcdb7657d9f27d78920a583a21bdee01a7ace37aae6d42c02d32403bd1347ad8df8
-DIST perl-5.24.3-patches-1.tar.xz 24016 BLAKE2B 5eec6c5ddea5fb61b4edad3449e7efdfe546a06bde7421da8d54a64dc8f401cb48b416237c2a01b63736ad3ae83cb4e4ce0b55e7ce3f5eb4e92347f71c370b2c SHA512 5feddaa14b66c6c5f926a3bee96e2849d829141ee7a6d74cfec68128785fcb8de38e13cfd229c420a9fe6c3a1db4a4bdd52a91aa72726233570f61c73d31f9fd
+DIST perl-5.24.3-patches-2.tar.xz 23980 BLAKE2B 5de7ac2cc5238d0b8460a294ae2e8da1455f89a63691a4fc022d49756ed4c0e577672149de7bd475d10f4860b4a98dc1db0c6f32abaf80f8c04658f6ca706e11 SHA512 f13c5fac65e11d691b77231cc98b0a57b6ccabd66535835bc387410dc88c298d31fa471bcd9f4e86d4d51b0402483283c23dcd53d69e0dbabc77b9db6fea4936
 DIST perl-5.24.3.tar.xz 11574740 BLAKE2B 79e719d1d0fcea3eea71653f276d0d093d8d1f6b1f981b053f25e6891c57af9ee1982f65ce4a31e4c5844eb11a7966f25c6b459cc7de51cf62b9127be96f6f25 SHA512 139c92c0ea0ee7bd5912ad52cc275e0732ceb0865d8b67c301e1fc5a96ae126a26432b4450a2bbc7fe65b8e1dd8adde92ea2cc91ee39cb13ec3c5096e8f787ec
 DIST perl-5.25.11-patches-1.tar.xz 16776 BLAKE2B 424cfe4ecf5c0b5d857a694fb166dc78f45e0cad9a1f7605fc57c7bf7d16ee7261ba960cf5175525242a378a95ae7b5705ee1717813bc5327962e48b096e4a6b SHA512 ee340824746d3b626b41c76bfa901543869fb9560ef75ff6d338df017e5528e33c344a91ce7cbe9f2fa9e813bf61bbe9eb290433baceb05b832110e746ce9036
 DIST perl-5.26.0.tar.xz 11961692 BLAKE2B a0bf9cb04a6f1f8459351d6b0398c3ef7b8eb16d34981ec22002e0cdfc96baf6ff45679f97472e85b06403ec2f1d05c43d6b0293fb37bc674848b9a7c33fafab SHA512 cd5af6495fe4c46c0d5d0f51d4015b54daa221f08a5fb48899c247cb57c2ba85cffb97e6d258d0f931504828bb23e175d899f311c73805d924d1042058ac42e4
 DIST perl-5.26.1-RC1.tar.xz 11923212 BLAKE2B 0f07040bfa8e2ef8fff434d02f874e71b03013620ab79f5d2d04d254881d33753999c5cd1f7d64cc9887122328ae4fd6dcc904f6ff76e47a6d775e4d655faddc SHA512 036151303704e8d91db8cc22a9c8972499babca112d46f570e4f921fdad1b73919f6d038973896ff3d55b079080c4682609b3f73b962999bc5f5425b7b877084
+DIST perl-5.26.1-patches-1.tar.xz 16764 BLAKE2B 95fb086d214bf27dedfdc96f927e11ca6e2a237aabc268b3e26ca9868eeede3916fe6adc9ab890bc6bbc9977fa4a3c200188f91d506652c1f45f7ebdda9857e2 SHA512 24d7f5e1344a768bbf170376b131498fa234881d10edc259ff7a31572467e2fe1084ce6a2a9ef4d4ec5924ca95488064235d6e02b83acba727a856cd1e4c9ebc
 DIST perl-5.26.1.tar.xz 11922848 BLAKE2B 8ba5ac50bc6bc3cea1ede7dbd9b41566bd3f62e432d9a1f5ee45837cc3051c1edc037a13d73d4c867edc7833f9dfa8a9d22216e14a19df179ba030a03d3acc07 SHA512 13faa7bcd7ed8c490c37e9032c115af06c9b8152b75f8062409dd72d263d1314480e8a9a883490de1b448b2e6d53b6a87d108e2eceb17de2524d5857c6a7d300
-DIST perl-5.27.6-patches-1.tar.xz 16280 BLAKE2B e80e84bc233a0a73464e59610f56a2857bda91599aad0e166e07c01b5a7167a586ad9bb198b44e01e26dbedcb0be8ecfaa246e3b32ec1c7a03895197fe490976 SHA512 4dbac74a1463bfc54158052bffc8bc25ee5cd9dcf28049bff8d0595f5679a44dcb69030fe8fc4713a9d45cc38be03d0621b606f159f46ce689e0c1ebe55fd627
+DIST perl-5.27.7-patches-1.tar.xz 16276 BLAKE2B 81d6d4eb2459abd80d9dbf9a0300af3dac0e45f745ea844bd2d306b7fb816159470552179253d13ae13e20fe588e84b92bfae3a0189a76009b8cbb423b444209 SHA512 ef1084e307b57545de319248b8f9df6d7eae605604da9721e41b3f0f03e4c63b825e1cfee47eb0d52dc51f65ca2712d7c87f89a3e329d4bf7a6662f1fb08ce41
 DIST perl-5.27.7.tar.xz 12217704 BLAKE2B b443b6a0e23b522661e518bb302f9610806e722cd0c28d8d035b49ae78c39a9bb261cd2e3e03c5b65f549f53515ad27764a691b5fbe9464f4c57a5ff1100651f SHA512 e4a70a73a27dc102e59b8edf2dad73adb153fef7a4e52b6c1fe6d83a7db0deaecafc2db4fbac18b6ddcc8e8bf3e59ab4d4660714fbf0b0dbaf00da2bfa9f568f
 DIST perl-cross-1.1.4.tar.gz 94623 BLAKE2B 11ede9ad74e8f73e8bd8effea962933cba50e65e169fdcf4449a1a4f6df6f840a510033eab1e04c5d60f0aa14a660e0bf9e82569a553d2859c065c1c68056078 SHA512 3bfc108245f0c05b7d45c317eb28c2eb70aba528dfe8a39bc99d6e49b4751f5dca4f4ac661484bfc7528c3e28fcdbd8994c36daa49c25516618fec1f58116d79
 DIST perl-cross-1.1.5.tar.gz 95122 BLAKE2B 2b2596d156f3a7bb296855600ea37771412b0ba4e10be55fccd46c37aa7d1fe25e01ead283ecb8fa3becfbd6e3e9695c4eba4836c0d95ed0b8b827fc8017a8bb SHA512 344ae0ff3ab8a2ce3fdb0de10972164c8cc14abd9c5c9bf55029bc8a6c2e62b3f9dda88892b1d8d0e30b76f94d42feea1dd5e5c55631f9eb53d1443285e2e3d1
@@ -17,10 +18,10 @@ DIST perl-cross-1.1.7.tar.gz 97622 BLAKE2B c58dd51492cfbda6fc58b43d9de45c35dd5ed
 DIST perl-cross-1.1.8.tar.gz 98686 BLAKE2B e4fa78e99cb0b93025468d6035dfa352e78867003847637e3730df7f3df252cd13370b71b8c724e4dcc9c0851a8e224402ba6880a1ac666521a64b9053a7e4c2 SHA512 00de89c4b4dbef4aede397c541ef5b9c5b1c2b8fecc7ea4b8d5d133dcceb65da6e834ff28609e7865d24e563f050de25c72ce3a88a162d8c88e87524aac5217f
 EBUILD perl-5.24.1-r2.ebuild 17081 BLAKE2B 3f2b034a7d0f6d8ecffd137e878f70fd2ea799b2808668a7b1d4b2087f91a7df272083a954cc849717d30bd0a52a0261916969bc31f8493bbbd54151445a13f3 SHA512 7c46c1b392371db63a03d2174613cc008f50045f3a50693034853a2c809b59c8dbef7b36a00f2be20d5f09aae62760365c32d9268d770d49a20a9b191af0ecac
 EBUILD perl-5.24.2.ebuild 17076 BLAKE2B e9f0500f185c2e281aadb4a7025a478895946e8f4adcdd32bf27709e60387c523d07c00f4456e213a52304f3ec027d1432d13a823b52251ef4457dacbc4c08d3 SHA512 c6bafe77fe764ed6a318a731ee4240e31b1555afb45a416bf2e9eb650d680ea618f37b5dafdccdfd34e2676e5f1e3f1fbc8d4757d6694149a733b6f81f4251ea
-EBUILD perl-5.24.3.ebuild 17074 BLAKE2B adc941ce1cd25915a14d6f2b57c5f9d996dd2cd9145d14775b76dc1cd674f2031073ca6858d9a1fb49635ea580f89b7bfd6bb4dc34d6510ed2cfc8bf92144a16 SHA512 729ece15a14c7ab5c01d950d370bbf2a299c7782e39fbac9a90e911f7cff4696049284670a679b18fd0f430ecefbcfc966dbc1ad8d79628321efb8ae4ed901aa
+EBUILD perl-5.24.3.ebuild 17074 BLAKE2B d257e40d013889ebd6068960c23ac916e40340a363a165fbdcee6130078e565e3ea84cf86427add1a39fc17c99ce1fc3f38992daa60fb642ba2ca20162a01541 SHA512 bdc76815509e6d099fc3b8e5a56ce2b9eb6a621f8e6c7bd6a6afc1b31008d7b0adc4a6c126013eb6fcfa3959e421f44ece6d800e48d39acea49c5e374415de60
 EBUILD perl-5.26.0.ebuild 17878 BLAKE2B e49c729dcdf208399fdefeddc97e4e2ac57d289bb433b3ef0c2176f850dbb44477ac5b1e9c2b66fdbc0466c9a5c335c5f001f565e0fe3fe4f43a2790669e2105 SHA512 574fce3abb6a2ca762a4db9b9deb36906980d5d3c8a1c99cbd3761871e423a1bcd678c513e8d728359acfbccef67253743d48c14e544b4498f724e24ad965609
-EBUILD perl-5.26.1-r1.ebuild 19254 BLAKE2B 73e46934f072a5469f531b699d22e550d526ead8eb55f37675708f65655f7728241021d92362278f685250739c29dc8d30d4784e06cc3c04c239c0d449977fdb SHA512 320cd2b0eb69881e5893d06c304dbeedc64bc7878ff4ad2ec8864cd15274129fdff0b32710212569edcd8b94b542cf0bb617ca0aa73d3f579f182d46f71a0443
+EBUILD perl-5.26.1-r1.ebuild 19253 BLAKE2B 3d192d2a79bb036593ba46bc02fa901ddfbf4b4e53692f6635fe4f94b530888aab7d5e82b3cd47a74c24828052e53647373d71749b0fce61d0756972500ca8b0 SHA512 650d1573aaf99c30f5df0cb1ca8830cdf23e43b2a20acc0b3d75a52777f5b69df874894e929802c728bdfa6c6a7017f379ee56745b1dcf43862c66564345c5a1
 EBUILD perl-5.26.1.ebuild 18983 BLAKE2B ef92b27b06f0866a1e7e7a3d35f87d8378e1d6df1a42ab68e03682c978f35429f83f23beef2921a214382ecd84e706bddb4a49d1a218d5dc133b71f15faa327c SHA512 903eee39e82711ff898fc7b3628bd06baf7d5ce6ca0b685b7852991755cf7779cc869e076a14a13293eab549d60453026411d3dc2b277873184975ff9ff491c4
-EBUILD perl-5.26.9999.ebuild 19247 BLAKE2B e8b3991aea3b19d75e2db0ca6d4ace191175ab2c8e289014324e8d0a9457aeb20a184b22d27db28d4c4da2033c9878c3dd0d11eeed787a4b37458636ee19db9f SHA512 cd0795a3f6894a936f52e6c563aac208d160ea24a88b50a13c00b85ebb8515d0aea6c6c7f78183d89567f4a6d05926f4f9a3768014bf59818c5ea49f1d356a36
-EBUILD perl-5.28.9999.ebuild 19235 BLAKE2B cfcd732d653e123f1730da3a15c68699abe1c5fafb142f92ccc0afff79d860adf570243d89b0bd35fd119815fb93f2f25074e25a1cb1f995099ca52c6784a07b SHA512 18e4ac435bfc6588eac31bd33cea893c8fa24c2f5532716b5fb2803b121ed03ab56f8dc095c8c79437f1f913d4003998a39dc1dd26ce69caf063b298d94276cf
+EBUILD perl-5.26.9999.ebuild 19246 BLAKE2B 46e5b5a335ce98d2af68572a58453ba962c3aad3596cad0e88766f3d15c86a0fbebd00469ad90dc3f9c2cdacdc61a87392cc48ffab03cc6b86e42954ee9deff4 SHA512 2ac4f404c2080207756f74468a32c86ebceefff8c9b7b4f1b7ace2591c40f8aefe90b524d96b170f94c82f395c5fbe172a8e5f80ee83f1a1fc569ec65fa59f75
+EBUILD perl-5.28.9999.ebuild 19235 BLAKE2B a18915ba780736d3d62a51050fd22f711f1fe9fc95908d917c3299fa5f081f143a8c47de5c7d32454ecffd329701e80c886750fa25bf6497ab4c65ca963a7392 SHA512 9aea2dff0722f3174b6d12e25e7a438a6cc082bb32046ea42e27f9f15b771ef66a148578a69e85121f28fe49c54846828e6b1b72757b1f5d22026795058f88ea
 MISC metadata.xml 430 BLAKE2B 8625fd07f63a7943a85c3919d6ae6db622b752caa2803c56c72a22b270244261331fbab8b760e6d00acb8480770c9ef1d1beaaa22cc6044660821687c0cd8c33 SHA512 ca4c43e2016b7df707894713465700a90d2b8551b57fc4d660cff75edb1e8cc2456f9ae10431839ad6738f290d4f5911fae360eaa1d4670859d855de3d568583
diff --git a/dev-lang/perl/perl-5.24.3.ebuild b/dev-lang/perl/perl-5.24.3.ebuild
index cc82a2885505..9dd1429c6169 100644
--- a/dev-lang/perl/perl-5.24.3.ebuild
+++ b/dev-lang/perl/perl-5.24.3.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 inherit eutils alternatives flag-o-matic toolchain-funcs multilib multiprocessing
 
-PATCH_VER=1
+PATCH_VER=2
 CROSS_VER=1.1.7
 PATCH_BASE="perl-5.24.3-patches-${PATCH_VER}"
 
diff --git a/dev-lang/perl/perl-5.26.1-r1.ebuild b/dev-lang/perl/perl-5.26.1-r1.ebuild
index 3a6ded81ff59..b615761c70a9 100644
--- a/dev-lang/perl/perl-5.26.1-r1.ebuild
+++ b/dev-lang/perl/perl-5.26.1-r1.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
@@ -7,7 +7,7 @@ inherit eutils alternatives flag-o-matic toolchain-funcs multilib multiprocessin
 
 PATCH_VER=1
 CROSS_VER=1.1.7
-PATCH_BASE="perl-5.25.11-patches-${PATCH_VER}"
+PATCH_BASE="perl-5.26.1-patches-${PATCH_VER}"
 
 DIST_AUTHOR=SHAY
 
diff --git a/dev-lang/perl/perl-5.26.9999.ebuild b/dev-lang/perl/perl-5.26.9999.ebuild
index 79b8c3037c1f..f1cb393c0f39 100644
--- a/dev-lang/perl/perl-5.26.9999.ebuild
+++ b/dev-lang/perl/perl-5.26.9999.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
@@ -7,7 +7,7 @@ inherit eutils alternatives flag-o-matic toolchain-funcs multilib multiprocessin
 
 PATCH_VER=1
 CROSS_VER=1.1.7
-PATCH_BASE="perl-5.25.11-patches-${PATCH_VER}"
+PATCH_BASE="perl-5.26.1-patches-${PATCH_VER}"
 
 DIST_AUTHOR=SHAY
 
diff --git a/dev-lang/perl/perl-5.28.9999.ebuild b/dev-lang/perl/perl-5.28.9999.ebuild
index 5a408f1f40b6..dbf9b7c7ffeb 100644
--- a/dev-lang/perl/perl-5.28.9999.ebuild
+++ b/dev-lang/perl/perl-5.28.9999.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
@@ -7,7 +7,7 @@ inherit eutils alternatives flag-o-matic toolchain-funcs multilib multiprocessin
 
 PATCH_VER=1
 CROSS_VER=1.1.8
-PATCH_BASE="perl-5.27.6-patches-${PATCH_VER}"
+PATCH_BASE="perl-5.27.7-patches-${PATCH_VER}"
 
 DIST_AUTHOR=BINGOS
 
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 8e199dc644d8..9f2eb75b8d3b 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -13,13 +13,13 @@ DIST php-7.1.13.tar.xz 12194780 BLAKE2B 0bac1cb3ec46cd4206d71b0d8ec3058fff455bc7
 DIST php-7.2.0.tar.xz 12014940 BLAKE2B e34c5bfb076e62afc54c8e35e0e35491b803ec753a1e62a0d8e78dd5bb6c28b95a9434228e211b76913f721bd0d8009527c95d2ab7990780819f5d3b8d822c6f SHA512 828d38727edde0dbc6483add6cdc21d33527b887bffaedad2d7f53e25d58a6f661ac341a23db02741bc37248d161aaffd72026dd8ef85ac851594c127d6c0133
 DIST php-7.2.1.tar.xz 12094840 BLAKE2B fde1dc143598a74be552eef53d4e7a8cc5a09db67b8d98a4d527e6a7e6a0ad2b9e78429a8981074630c84bb6a95ee2bd8f1a78020062c770abb6fdbdba738cec SHA512 2445f2cff20214b521c48592e5ab42b770c291702178d7cb2a84912c81b7e5d2cc45948a3a4a7830194fa444708d544c73efbaa8e90c95ab77937f7feffb2ffc
 EBUILD php-5.6.32.ebuild 22500 BLAKE2B f1e8c507532244ed46c8d995cf847034ebb61abd52a52502c4897d2880e24d62ccf7e6fd843b3ddd1fb225ded90a4edb7f9e728a9313f28ad6b3072ab0eb6950 SHA512 b93ca82892cf15eac9c7d890b96974ea1d00cc224290cd4fe38e85c324231c77033c04667473fc787c173c83fee81d435339a70c155c63f253f28a2dbb7c4bdc
-EBUILD php-5.6.33.ebuild 22537 BLAKE2B 52e528c790fef79498084ade31d15e586dfc33d3e8fc048ebb9c132830877929f2b61db80372d8b18ee6c28c49250c07d4eb527ea0e58c5137b5697e644c10cc SHA512 1154c2fe968d68170058c615fc8ba985348a9a5b06b9875ec8e12e4dbf15fc898723be2b433cff130e4450f3031f1858c28c1ac10798d1004735b391f945d9ed
+EBUILD php-5.6.33.ebuild 22536 BLAKE2B 1757754fb7136cee47ef2940b5228738355e57a7af81998a26bd8869281e9c39bed80846aaeab0adbd6420830c2fe4ce8cef74c9ce6de62bf2dd69de534308c9 SHA512 b6a8ca4c8bfa937aef96f0ece0b4a6b2f79c92d05d35b96b94e746c8703b5889c87a56929815e68faeff3d408e703b457481a426a9735eb871a361f7216d9420
 EBUILD php-7.0.25.ebuild 21560 BLAKE2B 4898540287e3dd350526f9f13c6e066795dc3ab18ebc5e3278998d897919745efc76a1ee43ee8bddadbb3f570bc1b6779dec6ac055240379ef45c8f70ec61ec3 SHA512 38d1f2d063044db2f4500e99a323f54d992413db26b99926f4d0338190fd481964e1a1573e9ebf06ea315b66d3d1207cd620fcd487745e81739e03c34afe6230
 EBUILD php-7.0.26-r1.ebuild 21604 BLAKE2B cc4aa1057b2ba3964684e6cb4844af3619b65f1e59fc4edbe7a3e6994f888e5291b1efcf644bbccf9faa31484eeae3c14b4d3367f53def4b02cffdfe6879c270 SHA512 0ac3f8be4110647b47ba5546a0fb9b0ba1186ac7df664d93ef0687ff695e7dcb6d9a470433f0a3984dc3b019f48017757adf28bd83852387694e8f92ae359fbb
-EBUILD php-7.0.27.ebuild 21599 BLAKE2B b855401ba63749243ad418edd17701b59ebc70c7713529c2cbff138a5429ac2a7e84039db46a2fa3d0bcaf44791a6f96a4d30482cfe36f23d2f658b592d51c2b SHA512 8ad3f8ac2d63dad59e2a5ccdffa85772075dd8a7ebf0cbd7bfae633df9d8b17bebb1b68034b9ff5571ad34f593f24d98fb2acc9ea4d54a73881b950e50dcfb1c
+EBUILD php-7.0.27.ebuild 21598 BLAKE2B 4c74e446a7c8f556ed80cdbee1a44729cea2b5d35414480cd3c04f0b231980e39f75866c5a46f382a993cd0c926e84bd7d00faacae7894512fc71b0e677d27cc SHA512 1a29f78cf3b28dcf74d5dba8a28bb4cb380962361162788b05c333b899eeb7ff29fbca217fde2f7435d83e40e3ef271eafb163a1e3de959c1dd27ce868c0bb4d
 EBUILD php-7.1.11.ebuild 21443 BLAKE2B a6da3a5efbcae6b3d33d6c40e430137536ecee35d7ad2a2eb47da71041092037edf92f69ab1d642dd5b759619eb37fb1a44425d49284f3230f66cb59e85d968e SHA512 f62a2592c57d0c6641df2ed3388aa3a4fe1097e8f635066b7c3b6070b2e57e10e23f4ded9e3b79cee7876324efd0ca1feab13365eef9848457ca03cc6d7411c2
 EBUILD php-7.1.12-r1.ebuild 21470 BLAKE2B bede96eae794b62386e4ae4337e2d25187a716d91c494bf18e0769b3a4d58414729aeaf29955fb25aa0f56dff724f5be3d143901fd9ab02bec8166bba8b4adbe SHA512 ae7a59ce564a5fe30ba63289769842dc8ac58691b4f8ecb6379bd02fac9196d2ba0282cae8527a68b4406de1a0d35de8c2809f84aca502a0e3f925cc26ff2835
-EBUILD php-7.1.13.ebuild 21465 BLAKE2B e782e9c971db9b4e02ebac6c9cff0ba12ed5ea8549568cbdc23ea57af9178667e45e6f3f0a6f4617468a59e131cb0db94cecd682aee08b85ebab376b181f295a SHA512 3dc0f1d85ca723f9a63deb7a4598cb443aa608a13e77174aa82a0645d90483751d1786877aceb9d83199491a99b04107bbb622d78cc8ddfd0503e5629cf70a0a
+EBUILD php-7.1.13.ebuild 21464 BLAKE2B f272acdedc13e97d700a5799d340fa8c40e5aed08a9d360d4c1b505dbc9c28af2bc1aeb42de5beb1435a441ff95120a1752ee55ff0b07221e5c3164b9dcc6b8d SHA512 756e7f8fa503a9f97b88ce6c7d7af4fa6d9d9488300487be738ae2b9391aeabfde351f4994fd3c8c1ae8ae3c314e71f862b5223daf823be1eb022d3971723196
 EBUILD php-7.2.0-r1.ebuild 22001 BLAKE2B dec314b3eda1e8f8ddf4ced4ffcc2367ad8c08789408875099a4ed813a155fc1b7ae8a7f1bacde74fa663b108a480440e43e4efc3bf178e278f9238515e3454a SHA512 b3790484ad3141635284db9d01c3290af78a44d93455dcca529d19abeeb111daddc286af10cdf57b79bc0e33a70c27854ae7726bcaa82049ebb69b547798b54b
 EBUILD php-7.2.1.ebuild 22001 BLAKE2B dec314b3eda1e8f8ddf4ced4ffcc2367ad8c08789408875099a4ed813a155fc1b7ae8a7f1bacde74fa663b108a480440e43e4efc3bf178e278f9238515e3454a SHA512 b3790484ad3141635284db9d01c3290af78a44d93455dcca529d19abeeb111daddc286af10cdf57b79bc0e33a70c27854ae7726bcaa82049ebb69b547798b54b
 MISC metadata.xml 2439 BLAKE2B 7f3cb5f5eab3664c48b951bbf2cdb03b2ce5d119008bbb41dd2c59a34fffbac8c8911738b4988e7e58bf36a520f6c35f46e9383e6845747380109a2f2f3011a6 SHA512 5d0221b77317e021231a2c1ae1dc407dca0e7ad144f5648d9d1abf98434689d375b04c9c45795e38517ca3c3d6077acbe4ff79f3551b20adaeb06325e363ebee
diff --git a/dev-lang/php/php-5.6.33.ebuild b/dev-lang/php/php-5.6.33.ebuild
index e92e6e42d3d1..836d3f83ec94 100644
--- a/dev-lang/php/php-5.6.33.ebuild
+++ b/dev-lang/php/php-5.6.33.ebuild
@@ -18,7 +18,7 @@ LICENSE="PHP-3.01
 	unicode? ( BSD-2 LGPL-2.1 )"
 
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 # We can build the following SAPIs in the given order
 SAPIS="embed cli cgi fpm apache2"
diff --git a/dev-lang/php/php-7.0.27.ebuild b/dev-lang/php/php-7.0.27.ebuild
index 03d64e1c1b85..4fe27674f649 100644
--- a/dev-lang/php/php-7.0.27.ebuild
+++ b/dev-lang/php/php-7.0.27.ebuild
@@ -18,7 +18,7 @@ LICENSE="PHP-3.01
 	unicode? ( BSD-2 LGPL-2.1 )"
 
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 # We can build the following SAPIs in the given order
 SAPIS="embed cli cgi fpm apache2 phpdbg"
diff --git a/dev-lang/php/php-7.1.13.ebuild b/dev-lang/php/php-7.1.13.ebuild
index 7aa65736a04c..f3bf64e1e161 100644
--- a/dev-lang/php/php-7.1.13.ebuild
+++ b/dev-lang/php/php-7.1.13.ebuild
@@ -18,7 +18,7 @@ LICENSE="PHP-3.01
 	unicode? ( BSD-2 LGPL-2.1 )"
 
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 # We can build the following SAPIs in the given order
 SAPIS="embed cli cgi fpm apache2 phpdbg"
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 6768d6bfb6f1..af4077310767 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -24,9 +24,9 @@ DIST python-gentoo-patches-3.5.4-0.tar.xz 11704 BLAKE2B 4a7d71feff18c7c8c109bed1
 DIST python-gentoo-patches-3.6.2-0.tar.xz 10744 BLAKE2B 3075754627617ac2ceee879eaf1a0e6564505655cdbdff380233a09df701a6188d64fe1f6a8c642b1fb05ef3c460a07042b6a362d655cd02717d6d9ba47983a1 SHA512 2aac1700c541202aa4f43bff4cb521b996d52ab350133318abaddb43f4b6e20548f37de472ace8024ef325ebf63fdfff0d43f8aa1f717d3c56f974b7aa1764e3
 DIST python-gentoo-patches-3.6.4.tar.xz 12888 BLAKE2B 7cf49ae22df53e855f2e99df51686b5d4bd0da82ef4c22836e24726ea9ed561808352c0305a5659b052d38b843f1ff61b6466a7bc3673b7e5cfb4d81d22fa4bc SHA512 90a1b685f2539872ffd67f96581f70145b7afaf18af19f4a7f4a61214103d2a10bf0069c1769dac229ae011fceaf8538f041082b33c1671905246d018d184dd7
 EBUILD python-2.7.14-r1.ebuild 10796 BLAKE2B 705db175a906c0087f462d4b7ed94ebfbf87acc5624d573860594ede1eea486ed65ff74967a64f24794e8f9efa85b27f9d74356bb069b82aaac47d906aa45b84 SHA512 d2dabd2997c85b26d82bebe4c9f3a24cf677cb3e0fd63c0a6896a3c29e73fec66f34eecdecddeb37264e51c3c379ddead561b4aef82f66b91289b8dc45c1402f
-EBUILD python-3.4.5-r1.ebuild 10591 BLAKE2B 72555298d0241e84f95d2fd2aa169f59b8fba25c5118bcbb2b8183c44cdb27e2dbbc98d8371cebe3ed30c6b5eb5706e4acb6c184d66efddcea1e71ff1187be81 SHA512 75bb75e86b32418c6587a327faa5ad1be7eb7cb35346a9af203ad5d2e4aa602bb7e09b3daac1efd94d573a18d80c90681f0a6628c731921288739664fcf86485
+EBUILD python-3.4.5-r1.ebuild 10670 BLAKE2B 2db50ef10323f864a5831813c65b180ffa5d4844ad680c21ad930ca517120941ad87d1f43e2734a8f6d8fd1c22fc1e6d84c397dfcf960df4eddf6bf22ce384de SHA512 efd34ae63f759f234b250e23c1ca6fa996dece9fe8da70cf496787dd52b20fd358f0d268985dd768a696769c3b61a184d98c460c96973b9e775dd5c4c9a677c1
 EBUILD python-3.4.6-r1.ebuild 10604 BLAKE2B cea6146a6b8643d1ba8def78647a83ee25bb055b9605c0f3d214220500034c7a412955fa8047a058e383dbcb832ddd1300ee2ff7a05b37d7dc7fa831d6631c5b SHA512 4aea9eed7fa7806d5eb8f51253c9665b6b887ed187db39959a42a99da2e4ef259109c1442886156019790b8f83c4a63dfb9e5ff33df318a9ec75521d02336359
-EBUILD python-3.5.4-r1.ebuild 10656 BLAKE2B 1c1c05f3c185f7390630e1eaaf2a44625c020875d6ae6da50e1741f3fcd2e387ec200bd4025bb7f44477e2f5fb2157b40a367f8f06ae2e2a92c3b17324dd8ab6 SHA512 1e4daf79ec691dac6b0ee57bfdf8f8e693f73d268b81068aeabf2b601a7cd22b315b8305f8aa35fda008903846c1bbd8894149d6b837571945248fe7013bb4eb
-EBUILD python-3.6.3-r1.ebuild 10089 BLAKE2B 110ebced7001de998877ddc0b6e2fbd65b720d77ed36ae11904011a77dd06c8e02cc40e15c70814fbad86102d2a97434f6f4d38809c1f476b8fb0e9fdcbbb460 SHA512 52fd7f2859179c6134674969fb485b4c020a87a2764b9b0ebd290ca007d85c13b169e71d2272660b532b8cd28b849ba7c647bc16d1e6814a4856e796959c32ae
-EBUILD python-3.6.4.ebuild 10016 BLAKE2B 5c8881506820cda98c9fd8428f94523007cea53502107d1664fb3f500571c4ce54084f477951948c5e8000d72467265f6f27190801707613790106bac71c7390 SHA512 9ff794f871015bb03dc5db8a5d1ee5d25c3d425d396a7470e6ea32d69a52914852aa3a8ca6d15135dad049d7cca7cee157ca1de152d44274e7fc45f3f9ae140e
+EBUILD python-3.5.4-r1.ebuild 10735 BLAKE2B df2555e4c3e63987f6df12111986b2bf856a953577db879fb3f637901de76e43a06a0ad9cfc1e3127a21f0f0a308e6a2500531b614ad4c11ae6ac9152155b94f SHA512 c9a1ba8db4a055d549d90bc41974adfe75272e9c38a6ad3ec218a13b28cf6c625a114dada4c40b950ab6c89121d411ce015147c22759d9a161cfdb1bdfcb9c54
+EBUILD python-3.6.3-r1.ebuild 10168 BLAKE2B 5c6da641f831b9ca0961db60b59132cea2d660f6c7030cbe92cdc1bbdcc0ed102d702d1e47f9a633737ae8928d28b51efb9a22bb5d2ca7599f53691f8c863a32 SHA512 2e5a90a7a36a6de21d5cde8c606aac0106b3e0a0503a78fe00177d2cdda8802737f9db5683c552170decf8520f1f2f9d3bab2940c20336368d62d8a36f9bf5df
+EBUILD python-3.6.4.ebuild 10095 BLAKE2B 1ffeae9ed685b550c0828905ff313e159b6eb0c3ce90e4de2fdc8d3d069723d2cf3ca8433cfb5505c50ca718c5bd6c2723cf01bf433655fda4b64dc54570c412 SHA512 b70f8be85568c444c42f0e6e9827c47a5712add30749e4aa2d8417e2f6a12d1d7f9571a26cc0e011e5ed30418711dc024b8555cb2d87147fdf60fa94f547854f
 MISC metadata.xml 738 BLAKE2B 464af9b051fa52c8d7f632163a0ea51e356f79d5f0a2ba82c8ac70ef2ebf5ea489bb0d5371ebd954ee0d5b07fc86b8497be3aa2f660929eb09c4a0222a6cf704 SHA512 f938683740658db5d8eb363bf0eb88a81aab75b7a9e4c5e33bca73722c3b1a8b879151bda58099d67c5596a7dd5d487f15b0f7327918e35ac997e15feaf89847
diff --git a/dev-lang/python/python-3.4.5-r1.ebuild b/dev-lang/python/python-3.4.5-r1.ebuild
index bb01c7623e5b..02cb5d3f2cbf 100644
--- a/dev-lang/python/python-3.4.5-r1.ebuild
+++ b/dev-lang/python/python-3.4.5-r1.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"
@@ -17,7 +17,8 @@ SRC_URI="https://www.python.org/ftp/python/${PV%_rc*}/${MY_P}.tar.xz
 LICENSE="PSF-2"
 SLOT="3.4/3.4m"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="build elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl +threads tk wininst +xml"
+IUSE="build elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test +threads tk wininst +xml"
+RESTRICT="!test? ( test )"
 
 # Do not add a dependency on dev-lang/python to this ebuild.
 # If you need to apply a patch which requires python for bootstrapping, please
@@ -48,6 +49,7 @@ RDEPEND="app-arch/bzip2:0=
 	xml? ( >=dev-libs/expat-2.1:0= )
 	!!<sys-apps/sandbox-2.6-r1"
 DEPEND="${RDEPEND}
+	test? ( app-arch/xz-utils[extra-filters(+)] )
 	virtual/pkgconfig
 	>=sys-devel/autoconf-2.65
 	!sys-devel/gcc[libffi(-)]"
diff --git a/dev-lang/python/python-3.5.4-r1.ebuild b/dev-lang/python/python-3.5.4-r1.ebuild
index 680ae491e0a4..35190a8535ca 100644
--- a/dev-lang/python/python-3.5.4-r1.ebuild
+++ b/dev-lang/python/python-3.5.4-r1.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"
@@ -17,7 +17,8 @@ SRC_URI="https://www.python.org/ftp/python/${PV%_rc*}/${MY_P}.tar.xz
 LICENSE="PSF-2"
 SLOT="3.5/3.5m"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="build elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl +threads tk wininst +xml"
+IUSE="build elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test +threads tk wininst +xml"
+RESTRICT="!test? ( test )"
 
 # Do not add a dependency on dev-lang/python to this ebuild.
 # If you need to apply a patch which requires python for bootstrapping, please
@@ -48,6 +49,7 @@ RDEPEND="app-arch/bzip2:0=
 	xml? ( >=dev-libs/expat-2.1:0= )
 	!!<sys-apps/sandbox-2.6-r1"
 DEPEND="${RDEPEND}
+	test? ( app-arch/xz-utils[extra-filters(+)] )
 	virtual/pkgconfig
 	!sys-devel/gcc[libffi(-)]"
 RDEPEND+=" !build? ( app-misc/mime-types )"
diff --git a/dev-lang/python/python-3.6.3-r1.ebuild b/dev-lang/python/python-3.6.3-r1.ebuild
index 3d9849571a91..d904618dc9af 100644
--- a/dev-lang/python/python-3.6.3-r1.ebuild
+++ b/dev-lang/python/python-3.6.3-r1.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"
@@ -17,7 +17,8 @@ SRC_URI="https://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz
 LICENSE="PSF-2"
 SLOT="3.6/3.6m"
 KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl +threads tk wininst +xml"
+IUSE="build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test +threads tk wininst +xml"
+RESTRICT="!test? ( test )"
 
 # Do not add a dependency on dev-lang/python to this ebuild.
 # If you need to apply a patch which requires python for bootstrapping, please
@@ -48,6 +49,7 @@ RDEPEND="app-arch/bzip2:0=
 	xml? ( >=dev-libs/expat-2.1:0= )
 	!!<sys-apps/sandbox-2.6-r1"
 DEPEND="${RDEPEND}
+	test? ( app-arch/xz-utils[extra-filters(+)] )
 	virtual/pkgconfig
 	!sys-devel/gcc[libffi(-)]"
 RDEPEND+=" !build? ( app-misc/mime-types )"
diff --git a/dev-lang/python/python-3.6.4.ebuild b/dev-lang/python/python-3.6.4.ebuild
index bf6b9a5fb09e..f0adb4196ea4 100644
--- a/dev-lang/python/python-3.6.4.ebuild
+++ b/dev-lang/python/python-3.6.4.ebuild
@@ -17,7 +17,8 @@ SRC_URI="https://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz
 LICENSE="PSF-2"
 SLOT="3.6/3.6m"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl +threads tk wininst +xml"
+IUSE="build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test +threads tk wininst +xml"
+RESTRICT="!test? ( test )"
 
 # Do not add a dependency on dev-lang/python to this ebuild.
 # If you need to apply a patch which requires python for bootstrapping, please
@@ -48,6 +49,7 @@ RDEPEND="app-arch/bzip2:0=
 	xml? ( >=dev-libs/expat-2.1:0= )
 	!!<sys-apps/sandbox-2.6-r1"
 DEPEND="${RDEPEND}
+	test? ( app-arch/xz-utils[extra-filters(+)] )
 	virtual/pkgconfig
 	!sys-devel/gcc[libffi(-)]"
 RDEPEND+=" !build? ( app-misc/mime-types )"
diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index dd1786a67c77..3ce60c4cd6c9 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -1,24 +1,16 @@
 DIST ruby-2.2.8.tar.xz 10520648 BLAKE2B 96c483786b1a7e0b1483c337a13fe7e07e740bb21b507b518e142dc9ac8cf19ba00c094b4357db4305c645d370d776269145b699ad11429aa56a0de78abfbf83 SHA512 e21004bee537f0c706f4ac9526507b414ddb6a8d721e8fad8d7fe88992a4f048eb5eb79f8d8b8af2a8b331dcfa74b560490218a1acb3532c2cdb4fb4909da3c9
 DIST ruby-2.2.9.tar.xz 10511456 BLAKE2B aeb631c47def96e8dd19e4f7281ef95833d9d0cde0912ffccd341032d2be22d6eebf259b0926f248298a5a290fd4d99b7ec38e29b805c9d77d4f3f4481fc0edb SHA512 c4ef84cd00f72f60d6c168f0726d9d7e9573549c2bbae83893e1a9d5e64fc7938f4c9d50a47147b28b37cbf36263f95e10a810c0797bad941775a48d75a8c933
-DIST ruby-2.3.5.tar.xz 11437868 BLAKE2B db50d7b36b6a8fa5b0b030f56d5d7bfc3c43e21d7255e9db73fed4d42cda1f161457c0f478e865766e2b7ef703335aa5b6bdf0bbc23c26a1cdb0163b75528de0 SHA512 c55e3b71241f505b6bbad78b3bd40235064faae3443ca14b77b6356556caed6a0d055dc2e2cd7ebdb5290ab908e06d2b7d68f72469af5017eda4b29664b0d889
 DIST ruby-2.3.6.tar.xz 11445628 BLAKE2B 052f09fef806581824b14196abecde7def7c4ebc922c8af75281fe26ec2a7a2a325d1702a382b29e91b302064ab55972b63430248813b24b591fe74b7bc18e30 SHA512 a09c8715097d16190ee17ee39e7a74438cefc9013add350217b7e3fb4d60aa9dcb30595adf832b0d67a5c45b1fe9d4effb767c995af2759420859f8d763c693a
-DIST ruby-2.4.2.tar.xz 10046412 BLAKE2B 33af07ee102367fe811dd3248edc72238bddfc3332f64280b6b36497c7de70bce939127c1efcc965072451ddd60ede98c855fc1fd24be9b12eedc58a21faad5a SHA512 c1d42272fb0d94b693452e703b0ea4942bf59cbd4b08ba83bf039f54be97ebc88511632413da0164970b4cf97bc302bccb88aab48edfa8fa147498e7ee741595
 DIST ruby-2.4.3.tar.xz 10040072 BLAKE2B 87ad9700312a104a60b079f4ef95804d2a9e01109e9fef6e83e593464f1d2c5077af54cbbaff6e0d25a925d05f513cade6c76f05960d9bcc1817bdee51ad4a0f SHA512 8bcf60c994a96787da5d743c66f5609a5a6d834d6d61243cdea7fd059197c3b10da43c99e5649be85e2f2329eedcbb1dd76e89ce3ac586be9056348f7449ed09
 DIST ruby-2.5.0.tar.xz 11292472 BLAKE2B 852ce003a79d9d77e72928353382962440e99ed1d03558c89a928e8f4a582b27357ef63e3ef45f3b30009f7a95f356100941bd84151571ade3a88b2d0595f8ad SHA512 55714a33d7661fe8b432f73c34fd67b49699f8b79df1cbd680a74899124d31111ab0f444677672aac1ba725820182940d485efb2db0bf2bc96737c5d40c54578
 DIST ruby-patches-2.2.8.tar.bz2 5764 BLAKE2B f50729480a4231db51de7981acb04dafa09d5fde592cf4a824a6fefe8ae3189ab9e82857e7ca41f1bb32dff1c4057ac37badf971c1b8f2981189e13d42dd38d2 SHA512 296387ec7f2ff82ad55f147d8f9568de544403d286ad24bb60aca916215d7ff6e1d6aca5a31c00a1999504989cda2bbd3260cae96c18ba73f9ffdcfd6b2695bd
 DIST ruby-patches-2.2.9.tar.bz2 5764 BLAKE2B f50729480a4231db51de7981acb04dafa09d5fde592cf4a824a6fefe8ae3189ab9e82857e7ca41f1bb32dff1c4057ac37badf971c1b8f2981189e13d42dd38d2 SHA512 296387ec7f2ff82ad55f147d8f9568de544403d286ad24bb60aca916215d7ff6e1d6aca5a31c00a1999504989cda2bbd3260cae96c18ba73f9ffdcfd6b2695bd
-DIST ruby-patches-2.3.5.tar.bz2 3593 BLAKE2B 48aba5d68ad7b648065a3580cb7160470ad308659fa11249afab1efe6482edf3805087f4054762717a89b61da4fd7a50c84ab8e76ba00052fd95d937655dcdba SHA512 eacb7f6787b36c7d848453b29152190a164ebc6882ab509eeb6584e49af4b66a665c4baff4ecf75e5831ae54d47dbc651d6f048918f3327500c429f1f419ed94
 DIST ruby-patches-2.3.6.tar.bz2 3030 BLAKE2B 7c1e80ff0569a03672f53820c665933056b46bcf791c9132cb9f358f72df693749f02da65ca7469c3dd0f652d7dc7bfaa03dccd4eb900562361876023fb65b42 SHA512 54cc3f2bfd1967b8558736e5a5240b886a56b22defca5813f45b1f4dca9af169b4d59d60b327ec8411e824970ac6da1cec53cfc31833403742e9d6941e5a78f1
-DIST ruby-patches-2.4.2.tar.bz2 3443 BLAKE2B d90cfb496ad8701fccb061fd314a7f2394b251c921f270f17c8335f617e71dacc8e4a2df4e76842b67eb34627e5f5291d8a2723f6dfed53a36ace3abad95a179 SHA512 fb8349c67c72caf10ec12c4b5410194b4df24345446c2e3b6c6176d00727bfe803f4a905ef094a2d52315b6f4c3ce74fb8fbaa2fdf5efe46e6ccb24bf8418b17
 DIST ruby-patches-2.4.3.tar.bz2 2898 BLAKE2B e46502dbb0aa25c3d71693a6c04b433bd4de60f194cdd283517c4b08da190356885d9bca4a6765402088185fa8ec681156e8e8eecf0703a2c1ea7bb81adc0bf9 SHA512 d767d43c7df737469247e42e1c4205b8c6850c8f335a2869c884f145c037e9bab10492cc7cd2903f5c33e232cdc5bbdabb3e8da837c7bf420b9d58d1d33149ed
 DIST ruby-patches-2.5.0-r1.tar.bz2 1888 BLAKE2B 38358c4d10a5c825ad1d50aa9e538fbfb0875deffaecf2064be3c52d593539f37b83bf726437922b1f13bd3d5c63e30ae071cd75c891e7083d3a363c4b49c905 SHA512 39068008cd7050a6787cfe35ef0a21ebeb5128226153b80f8d34e89bc77d6159f32e6980dfd8f3e38fc748cf3d648d102b3dcfcb79a484a517a5008bfd8161b9
-DIST ruby-patches-2.5.0.tar.bz2 1888 BLAKE2B 38358c4d10a5c825ad1d50aa9e538fbfb0875deffaecf2064be3c52d593539f37b83bf726437922b1f13bd3d5c63e30ae071cd75c891e7083d3a363c4b49c905 SHA512 39068008cd7050a6787cfe35ef0a21ebeb5128226153b80f8d34e89bc77d6159f32e6980dfd8f3e38fc748cf3d648d102b3dcfcb79a484a517a5008bfd8161b9
 EBUILD ruby-2.2.8.ebuild 6914 BLAKE2B 7c2786f023183c10e863890e9fac82228985d67bdde66546df59079c8a5c7b053b02e909ea5f6c0efc86df37c1d5ba000caa0a1c49cb260ed41291764f556aaa SHA512 2b5ab88539f49a91f4876598a910bfd80eb1789e738aa5c25489e12d9f7acefece189681c4600dd378da79049ae3712b0e90e2ec414163ef99333e54a0b5da68
-EBUILD ruby-2.2.9.ebuild 6916 BLAKE2B 5134933905d8d9c46a9347ec8d19772399b2287c6a4455a32f7fe65903cd675034b131186f49c0523d505281527ae72f3079dcd6b1b072a54f8c57729186d7b2 SHA512 736f941e251f7569b1415cae2279dcd9fe0630ade1484c8da8a77747366d471687a96a99424f758945ac7af781907a36805b80d2bd994b0b4536f06360025036
-EBUILD ruby-2.3.5.ebuild 6877 BLAKE2B 5d55fe0c3bd56afed1c040fba22f7ead461ef5c55edb43bf1d7a435db24921434f1a2a7d48f473d2bdc3d56f714ffbc3c0c3de24855f1b8aee10b0e3266b89f0 SHA512 059ec424075082c9809a0951dec55e38b9861124632b10167ed696081ed2402c14a7575dfb9a62152529957f768f69f6bf6424d70a85e5b6d3374884ea86d1fc
-EBUILD ruby-2.3.6.ebuild 6877 BLAKE2B 5d55fe0c3bd56afed1c040fba22f7ead461ef5c55edb43bf1d7a435db24921434f1a2a7d48f473d2bdc3d56f714ffbc3c0c3de24855f1b8aee10b0e3266b89f0 SHA512 059ec424075082c9809a0951dec55e38b9861124632b10167ed696081ed2402c14a7575dfb9a62152529957f768f69f6bf6424d70a85e5b6d3374884ea86d1fc
-EBUILD ruby-2.4.2.ebuild 6978 BLAKE2B 0262a40a78def3c9a83931573282cd2da8aa3ebeff7cdd8d36c3064a75cac1ef2d4196c0e7dc814d3f33473af17bc343ed77ecb7e807aa1848d826dcc0a1b6d1 SHA512 c6f48c8357e5248046ec8e811d6e96c57c073d5494cefded64baf1b5c177bc9e7a4a5e545b3ca5e977bd648066b568b1f5c9df59387540f2a145159e75f09795
-EBUILD ruby-2.4.3.ebuild 6978 BLAKE2B 0262a40a78def3c9a83931573282cd2da8aa3ebeff7cdd8d36c3064a75cac1ef2d4196c0e7dc814d3f33473af17bc343ed77ecb7e807aa1848d826dcc0a1b6d1 SHA512 c6f48c8357e5248046ec8e811d6e96c57c073d5494cefded64baf1b5c177bc9e7a4a5e545b3ca5e977bd648066b568b1f5c9df59387540f2a145159e75f09795
-EBUILD ruby-2.5.0-r1.ebuild 6770 BLAKE2B f534d42b8f9029fc982a32bc92472ed53b905b3b6e6f81124ba95a74e42025298702c7bb019f30993aae2fc1e8169c16f6b91fee9f233a24b541da854ff31a86 SHA512 395cc8b422f05e3f54454c9a385eb1141fc0433cb78e35182a92bce4481c1f34bea25d4d8d6fd7e58d88227d0d8baa169f1f96e4bf25fd7d732c2d6887911444
-EBUILD ruby-2.5.0.ebuild 6770 BLAKE2B a4dd6ef37a11404c45fee2118f9baa3933833ae14e5a116c4bb3c3a325406f45cc51c4272609ef911a29420580ea47af7005e139e2fb339e816c68ec8ad60dec SHA512 9051627249d026f2954ad16f97eea9fde9b172a81c2f82737df6fb70ea41be3a5e3fbe97458edf62e001e7f568a54d2e70245002d6d4e381e87ead0385d10c9e
+EBUILD ruby-2.2.9.ebuild 6918 BLAKE2B d256a2a67d771d60f91f812e197de51dc4ecb5d0b4375b6169202b125c33c67799b13cc0a05699a9de83f5e61ed54b444b7bdb5546bceb2c5ea3772177983916 SHA512 f82ed10a92e10b5630c0a6490fbc3b06e19a1478d4c156423407fb2de29e3e410fa2ae74024ea1132e0010f8e5110e35e3a72ab80c1b685e9a2da7e7fce00063
+EBUILD ruby-2.3.6.ebuild 6879 BLAKE2B 8bbcca439d930636acfde2fe08b8c14db10ca082450db0a4151201299d348da03e6f0b4950c9130a8790a812a5cb4e8788255220390ed7114be03f18952b0e28 SHA512 dc5c06c61c3ba08b902f655cde5435a3512653e559f694c71b5f669f177c0321abcebaa7deb06f2370d7c78940ecd776d7f111a6a39c2a1954aaaf7ded1ef384
+EBUILD ruby-2.4.3.ebuild 6980 BLAKE2B 2a08be5225e43fd5e5d7c90ff63ed43b6eab9b6e69ac1df7aead9657d651267e8bc0e741e16a276bee7fe5ecca5565d17d1428d96e5713305d278f251cdd99f4 SHA512 f43e497753a3fcfc0ff3e4ff840ae8cf3003671da0fe55e62651c17592f885cdbb99ed76ff6b99581ffd0903d23bc03b5425839f884f9e0e7ed925fb748edd4d
+EBUILD ruby-2.5.0-r1.ebuild 6772 BLAKE2B f9ac0a58ebcd718715fb67cbbe90cc853a14d8ba717bd91e93645115c5b37dc4def3827dbd01ba7b91138468b124c3581f90a133e88884a7f2b9a902f3b4ad82 SHA512 ed302d0d2a27d002a1b89aaea3b25ce6c88660f1fd30469cc2d292cfe3679bc477b6f8ac986964db45541db091be3040ee8dc8a76f5c10995d307dcb4246042b
 MISC metadata.xml 911 BLAKE2B 7596a3d7a53742635e3262a0deac45eb6c37e51b473dde2b5da78742baba1ecab42a4a3e2f992cfa8f3765472df896ccff2e2936ba5dedba1aad05c2ab47d9dc SHA512 c5d9f15742132625061303ed71206e937933b402e183edbe0f37ee73ac7ba47b3f7ad54cbf12d1db3900a1f833ea2432790a10a02ba7e1e0c4bf128a716b9d72
diff --git a/dev-lang/ruby/ruby-2.2.9.ebuild b/dev-lang/ruby/ruby-2.2.9.ebuild
index 05de5df039dd..38ba9ac801b2 100644
--- a/dev-lang/ruby/ruby-2.2.9.ebuild
+++ b/dev-lang/ruby/ruby-2.2.9.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
@@ -35,7 +35,7 @@ IUSE="berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests sock
 
 RDEPEND="
 	berkdb? ( sys-libs/db:= )
-	gdbm? ( sys-libs/gdbm )
+	gdbm? ( sys-libs/gdbm:= )
 	jemalloc? ( dev-libs/jemalloc )
 	ssl? (
 		!libressl? ( dev-libs/openssl:0= )
diff --git a/dev-lang/ruby/ruby-2.3.5.ebuild b/dev-lang/ruby/ruby-2.3.5.ebuild
deleted file mode 100644
index d41fd224c419..000000000000
--- a/dev-lang/ruby/ruby-2.3.5.ebuild
+++ /dev/null
@@ -1,242 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-#PATCHSET=1
-
-inherit autotools eutils flag-o-matic multilib versionator
-
-MY_P="${PN}-$(get_version_component_range 1-3)"
-S=${WORKDIR}/${MY_P}
-
-SLOT=$(get_version_component_range 1-2)
-MY_SUFFIX=$(delete_version_separator 1 ${SLOT})
-RUBYVERSION=2.3.0
-
-if [[ -n ${PATCHSET} ]]; then
-	if [[ ${PVR} == ${PV} ]]; then
-		PATCHSET="${PV}-r0.${PATCHSET}"
-	else
-		PATCHSET="${PVR}.${PATCHSET}"
-	fi
-else
-	PATCHSET="${PVR}"
-fi
-
-DESCRIPTION="An object-oriented scripting language"
-HOMEPAGE="https://www.ruby-lang.org/"
-SRC_URI="mirror://ruby/${SLOT}/${MY_P}.tar.xz
-		 https://dev.gentoo.org/~flameeyes/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2"
-
-LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks5 ssl tk xemacs ncurses +readline"
-
-RDEPEND="
-	berkdb? ( sys-libs/db:= )
-	gdbm? ( sys-libs/gdbm )
-	jemalloc? ( dev-libs/jemalloc )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl )
-	)
-	socks5? ( >=net-proxy/dante-1.1.13 )
-	tk? (
-		dev-lang/tcl:0=[threads]
-		dev-lang/tk:0=[threads]
-	)
-	ncurses? ( sys-libs/ncurses:0= )
-	readline?  ( sys-libs/readline:0= )
-	dev-libs/libyaml
-	virtual/libffi
-	sys-libs/zlib
-	>=app-eselect/eselect-ruby-20151229
-	!<dev-ruby/rdoc-3.9.4
-	!<dev-ruby/rubygems-1.8.10-r1"
-
-DEPEND="${RDEPEND}"
-
-BUNDLED_GEMS="
-	>=dev-ruby/did_you_mean-1.0.0:1[ruby_targets_ruby23]
-	>=dev-ruby/minitest-5.8.3[ruby_targets_ruby23]
-	>=dev-ruby/net-telnet-0.1.1[ruby_targets_ruby23]
-	>=dev-ruby/power_assert-0.2.6[ruby_targets_ruby23]
-	>=dev-ruby/rake-10.4.2[ruby_targets_ruby23]
-	>=dev-ruby/test-unit-3.1.5[ruby_targets_ruby23]
-"
-
-PDEPEND="
-	${BUNDLED_GEMS}
-	virtual/rubygems[ruby_targets_ruby23]
-	>=dev-ruby/json-1.8.3[ruby_targets_ruby23]
-	rdoc? ( >=dev-ruby/rdoc-4.2.1[ruby_targets_ruby23] )
-	xemacs? ( app-xemacs/ruby-modes )"
-
-src_prepare() {
-	EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \
-		epatch "${WORKDIR}/patches"
-
-	einfo "Unbundling gems..."
-	cd "$S"
-	# Remove bundled gems that we will install via PDEPEND, bug
-	# 539700. Use explicit version numbers to ensure rm fails when they
-	# change so we can update dependencies accordingly.
-	rm -f gems/{did_you_mean-1.0.0,minitest-5.8.3,net-telnet-0.1.1,power_assert-0.2.6,rake-10.4.2,test-unit-3.1.5}.gem || die
-
-	# Fix a hardcoded lib path in configure script
-	sed -i -e "s:\(RUBY_LIB_PREFIX=\"\${prefix}/\)lib:\1$(get_libdir):" \
-		configure.in || die "sed failed"
-
-	eautoreconf
-}
-
-src_configure() {
-	local modules= myconf=
-
-	# -fomit-frame-pointer makes ruby segfault, see bug #150413.
-	filter-flags -fomit-frame-pointer
-	# In many places aliasing rules are broken; play it safe
-	# as it's risky with newer compilers to leave it as it is.
-	append-flags -fno-strict-aliasing
-	# SuperH needs this
-	use sh && append-flags -mieee
-
-	# Socks support via dante
-	if use socks5 ; then
-		# Socks support can't be disabled as long as SOCKS_SERVER is
-		# set and socks library is present, so need to unset
-		# SOCKS_SERVER in that case.
-		unset SOCKS_SERVER
-	fi
-
-	# Increase GC_MALLOC_LIMIT if set (default is 8000000)
-	if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
-		append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
-	fi
-
-	# ipv6 hack, bug 168939. Needs --enable-ipv6.
-	use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
-
-	# Determine which modules *not* to build depending in the USE flags.
-	if ! use readline ; then
-		modules="${modules},readline"
-	fi
-	if ! use berkdb ; then
-		modules="${modules},dbm"
-	fi
-	if ! use gdbm ; then
-		modules="${modules},gdbm"
-	fi
-	if ! use ssl ; then
-		modules="${modules},openssl"
-	fi
-	if ! use ncurses ; then
-		modules="${modules},curses"
-	fi
-	if ! use tk ; then
-		modules="${modules},tk"
-	fi
-
-	# Provide an empty LIBPATHENV because we disable rpath but we do not
-	# need LD_LIBRARY_PATH by default since that breaks USE=multitarget
-	# #564272
-	INSTALL="${EPREFIX}/usr/bin/install -c" LIBPATHENV="" econf \
-		--program-suffix=${MY_SUFFIX} \
-		--with-soname=ruby${MY_SUFFIX} \
-		--docdir=${EPREFIX}/usr/share/doc/${P} \
-		--enable-shared \
-		--enable-pthread \
-		--disable-rpath \
-		--with-out-ext="${modules}" \
-		$(use_with jemalloc jemalloc) \
-		$(use_enable socks5 socks) \
-		$(use_enable doc install-doc) \
-		--enable-ipv6 \
-		$(use_enable debug) \
-		${myconf} \
-		--enable-option-checking=no \
-		|| die "econf failed"
-}
-
-src_compile() {
-	emake V=1 EXTLDFLAGS="${LDFLAGS}" || die "emake failed"
-}
-
-src_test() {
-	emake -j1 V=1 test || die "make test failed"
-
-	elog "Ruby's make test has been run. Ruby also ships with a make check"
-	elog "that cannot be run until after ruby has been installed."
-	elog
-	if use rubytests; then
-		elog "You have enabled rubytests, so they will be installed to"
-		elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a user other"
-		elog "than root, and you must place them into a writeable directory."
-		elog "Then call: "
-		elog
-		elog "ruby${MY_SUFFIX} -C /location/of/tests runner.rb"
-	else
-		elog "Enable the rubytests USE flag to install the make check tests"
-	fi
-}
-
-src_install() {
-	# Remove the remaining bundled gems. We do this late in the process
-	# since they are used during the build to e.g. create the
-	# documentation.
-	rm -rf ext/json || die
-
-	# Ruby is involved in the install process, we don't want interference here.
-	unset RUBYOPT
-
-	local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
-
-	LD_LIBRARY_PATH="${S}:${D}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
-	RUBYLIB="${S}:${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
-	for d in $(find "${S}/ext" -type d) ; do
-		RUBYLIB="${RUBYLIB}:$d"
-	done
-	export LD_LIBRARY_PATH RUBYLIB
-
-	emake V=1 DESTDIR="${D}" install || die "make install failed"
-
-	# Remove installed rubygems and rdoc copy
-	rm -rf "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed"
-	rm -rf "${D}/usr/bin/"gem"${MY_SUFFIX}" || die "rm rdoc bins failed"
-	rm -rf "${D}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed"
-	rm -rf "${D}/usr/bin/"{ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed"
-
-	if use doc; then
-		make DESTDIR="${D}" install-doc || die "make install-doc failed"
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r sample
-	fi
-
-	dodoc ChangeLog NEWS doc/NEWS* README* || die
-
-	if use rubytests; then
-		pushd test
-		insinto /usr/share/${PN}-${SLOT}/test
-		doins -r .
-		popd
-	fi
-}
-
-pkg_postinst() {
-	if [[ ! -n $(readlink "${ROOT}"usr/bin/ruby) ]] ; then
-		eselect ruby set ruby${MY_SUFFIX}
-	fi
-
-	elog
-	elog "To switch between available Ruby profiles, execute as root:"
-	elog "\teselect ruby set ruby(22|23|...)"
-	elog
-}
-
-pkg_postrm() {
-	eselect ruby cleanup
-}
diff --git a/dev-lang/ruby/ruby-2.3.6.ebuild b/dev-lang/ruby/ruby-2.3.6.ebuild
index d41fd224c419..e1b0efffb5fe 100644
--- a/dev-lang/ruby/ruby-2.3.6.ebuild
+++ b/dev-lang/ruby/ruby-2.3.6.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
@@ -35,7 +35,7 @@ IUSE="berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests sock
 
 RDEPEND="
 	berkdb? ( sys-libs/db:= )
-	gdbm? ( sys-libs/gdbm )
+	gdbm? ( sys-libs/gdbm:= )
 	jemalloc? ( dev-libs/jemalloc )
 	ssl? (
 		!libressl? ( dev-libs/openssl:0= )
diff --git a/dev-lang/ruby/ruby-2.4.2.ebuild b/dev-lang/ruby/ruby-2.4.2.ebuild
deleted file mode 100644
index 46a0abb33724..000000000000
--- a/dev-lang/ruby/ruby-2.4.2.ebuild
+++ /dev/null
@@ -1,243 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-#PATCHSET=1
-
-inherit autotools eutils flag-o-matic multilib versionator
-
-MY_P="${PN}-$(get_version_component_range 1-3)"
-S=${WORKDIR}/${MY_P}
-
-SLOT=$(get_version_component_range 1-2)
-MY_SUFFIX=$(delete_version_separator 1 ${SLOT})
-RUBYVERSION=${SLOT}.0
-
-if [[ -n ${PATCHSET} ]]; then
-	if [[ ${PVR} == ${PV} ]]; then
-		PATCHSET="${PV}-r0.${PATCHSET}"
-	else
-		PATCHSET="${PVR}.${PATCHSET}"
-	fi
-else
-	PATCHSET="${PVR}"
-fi
-
-DESCRIPTION="An object-oriented scripting language"
-HOMEPAGE="http://www.ruby-lang.org/"
-SRC_URI="mirror://ruby/${SLOT}/${MY_P}.tar.xz
-		 https://dev.gentoo.org/~graaff/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2"
-
-LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks5 ssl static-libs tk xemacs"
-
-RDEPEND="
-	berkdb? ( sys-libs/db:= )
-	gdbm? ( sys-libs/gdbm )
-	jemalloc? ( dev-libs/jemalloc )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl )
-	)
-	socks5? ( >=net-proxy/dante-1.1.13 )
-	tk? (
-		dev-lang/tcl:0=[threads]
-		dev-lang/tk:0=[threads]
-	)
-	dev-libs/libyaml
-	virtual/libffi
-	sys-libs/zlib
-	>=app-eselect/eselect-ruby-20161226
-	!<dev-ruby/rdoc-3.9.4
-	!<dev-ruby/rubygems-1.8.10-r1"
-
-DEPEND="${RDEPEND}"
-
-BUNDLED_GEMS="
-	>=dev-ruby/did_you_mean-1.1.0:2.4[ruby_targets_ruby24]
-	>=dev-ruby/minitest-5.10.1[ruby_targets_ruby24]
-	>=dev-ruby/net-telnet-0.1.1[ruby_targets_ruby24]
-	>=dev-ruby/power_assert-0.4.1[ruby_targets_ruby24]
-	>=dev-ruby/rake-12.0.0[ruby_targets_ruby24]
-	>=dev-ruby/test-unit-3.2.3[ruby_targets_ruby24]
-	>=dev-ruby/xmlrpc-0.2.1[ruby_targets_ruby24]
-"
-
-PDEPEND="
-	${BUNDLED_GEMS}
-	virtual/rubygems[ruby_targets_ruby24]
-	>=dev-ruby/json-2.0.2[ruby_targets_ruby24]
-	rdoc? ( >=dev-ruby/rdoc-5.1.0[ruby_targets_ruby24] )
-	xemacs? ( app-xemacs/ruby-modes )"
-
-src_prepare() {
-	EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \
-		epatch "${WORKDIR}/patches"
-
-	einfo "Unbundling gems..."
-	cd "$S"
-	# Remove bundled gems that we will install via PDEPEND, bug
-	# 539700. Use explicit version numbers to ensure rm fails when they
-	# change so we can update dependencies accordingly.
-	rm -f gems/{did_you_mean-1.1.0,minitest-5.10.1,net-telnet-0.1.1,power_assert-0.4.1,rake-12.0.0,test-unit-3.2.3,xmlrpc-0.2.1}.gem || die
-
-	einfo "Removing bundled libraries..."
-	rm -fr ext/fiddle/libffi-3.2.1 || die
-
-	# Fix a hardcoded lib path in configure script
-	sed -i -e "s:\(RUBY_LIB_PREFIX=\"\${prefix}/\)lib:\1$(get_libdir):" \
-		configure.in || die "sed failed"
-
-	eapply_user
-
-	eautoreconf
-}
-
-src_configure() {
-	local modules= myconf=
-
-	# -fomit-frame-pointer makes ruby segfault, see bug #150413.
-	filter-flags -fomit-frame-pointer
-	# In many places aliasing rules are broken; play it safe
-	# as it's risky with newer compilers to leave it as it is.
-	append-flags -fno-strict-aliasing
-	# SuperH needs this
-	use sh && append-flags -mieee
-
-	# Socks support via dante
-	if use socks5 ; then
-		# Socks support can't be disabled as long as SOCKS_SERVER is
-		# set and socks library is present, so need to unset
-		# SOCKS_SERVER in that case.
-		unset SOCKS_SERVER
-	fi
-
-	# Increase GC_MALLOC_LIMIT if set (default is 8000000)
-	if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
-		append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
-	fi
-
-	# ipv6 hack, bug 168939. Needs --enable-ipv6.
-	use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
-
-	# Determine which modules *not* to build depending in the USE flags.
-	if ! use berkdb ; then
-		modules="${modules},dbm"
-	fi
-	if ! use gdbm ; then
-		modules="${modules},gdbm"
-	fi
-	if ! use ssl ; then
-		modules="${modules},openssl"
-	fi
-	if ! use tk ; then
-		modules="${modules},tk"
-	fi
-
-	# Provide an empty LIBPATHENV because we disable rpath but we do not
-	# need LD_LIBRARY_PATH by default since that breaks USE=multitarget
-	# #564272
-	INSTALL="${EPREFIX}/usr/bin/install -c" LIBPATHENV="" econf \
-		--program-suffix=${MY_SUFFIX} \
-		--with-soname=ruby${MY_SUFFIX} \
-		--docdir=${EPREFIX}/usr/share/doc/${P} \
-		--enable-shared \
-		--enable-pthread \
-		--disable-rpath \
-		--with-out-ext="${modules}" \
-		$(use_with jemalloc jemalloc) \
-		$(use_enable socks5 socks) \
-		$(use_enable doc install-doc) \
-		--enable-ipv6 \
-		$(use_enable static-libs static) \
-		$(use_enable static-libs install-static-library) \
-		$(use_with static-libs static-linked-ext) \
-		$(use_enable debug) \
-		${myconf} \
-		--enable-option-checking=no \
-		|| die "econf failed"
-}
-
-src_compile() {
-	emake V=1 EXTLDFLAGS="${LDFLAGS}" || die "emake failed"
-}
-
-src_test() {
-	emake -j1 V=1 test || die "make test failed"
-
-	elog "Ruby's make test has been run. Ruby also ships with a make check"
-	elog "that cannot be run until after ruby has been installed."
-	elog
-	if use rubytests; then
-		elog "You have enabled rubytests, so they will be installed to"
-		elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a user other"
-		elog "than root, and you must place them into a writeable directory."
-		elog "Then call: "
-		elog
-		elog "ruby${MY_SUFFIX} -C /location/of/tests runner.rb"
-	else
-		elog "Enable the rubytests USE flag to install the make check tests"
-	fi
-}
-
-src_install() {
-	# Remove the remaining bundled gems. We do this late in the process
-	# since they are used during the build to e.g. create the
-	# documentation.
-	rm -rf ext/json || die
-
-	# Ruby is involved in the install process, we don't want interference here.
-	unset RUBYOPT
-
-	local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
-
-	LD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
-	RUBYLIB="${S}:${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
-	for d in $(find "${S}/ext" -type d) ; do
-		RUBYLIB="${RUBYLIB}:$d"
-	done
-	export LD_LIBRARY_PATH RUBYLIB
-
-	emake V=1 DESTDIR="${D}" install || die "make install failed"
-
-	# Remove installed rubygems and rdoc copy
-	rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed"
-	rm -rf "${ED}/usr/bin/"gem"${MY_SUFFIX}" || die "rm rdoc bins failed"
-	rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed"
-	rm -rf "${ED}/usr/bin/"{ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed"
-
-	if use doc; then
-		make DESTDIR="${D}" install-doc || die "make install-doc failed"
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r sample
-	fi
-
-	dodoc ChangeLog NEWS doc/NEWS* README* || die
-
-	if use rubytests; then
-		pushd test
-		insinto /usr/share/${PN}-${SLOT}/test
-		doins -r .
-		popd
-	fi
-}
-
-pkg_postinst() {
-	if [[ ! -n $(readlink "${EROOT}"usr/bin/ruby) ]] ; then
-		eselect ruby set ruby${MY_SUFFIX}
-	fi
-
-	elog
-	elog "To switch between available Ruby profiles, execute as root:"
-	elog "\teselect ruby set ruby(23|24|...)"
-	elog
-}
-
-pkg_postrm() {
-	eselect ruby cleanup
-}
diff --git a/dev-lang/ruby/ruby-2.4.3.ebuild b/dev-lang/ruby/ruby-2.4.3.ebuild
index 46a0abb33724..76b123a6e62f 100644
--- a/dev-lang/ruby/ruby-2.4.3.ebuild
+++ b/dev-lang/ruby/ruby-2.4.3.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
@@ -35,7 +35,7 @@ IUSE="berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests sock
 
 RDEPEND="
 	berkdb? ( sys-libs/db:= )
-	gdbm? ( sys-libs/gdbm )
+	gdbm? ( sys-libs/gdbm:= )
 	jemalloc? ( dev-libs/jemalloc )
 	ssl? (
 		!libressl? ( dev-libs/openssl:0= )
diff --git a/dev-lang/ruby/ruby-2.5.0-r1.ebuild b/dev-lang/ruby/ruby-2.5.0-r1.ebuild
index 22de96c87ec1..a6c97c1a7362 100644
--- a/dev-lang/ruby/ruby-2.5.0-r1.ebuild
+++ b/dev-lang/ruby/ruby-2.5.0-r1.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
@@ -35,7 +35,7 @@ IUSE="berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests sock
 
 RDEPEND="
 	berkdb? ( sys-libs/db:= )
-	gdbm? ( sys-libs/gdbm )
+	gdbm? ( sys-libs/gdbm:= )
 	jemalloc? ( dev-libs/jemalloc )
 	ssl? (
 		!libressl? ( dev-libs/openssl:0= )
diff --git a/dev-lang/ruby/ruby-2.5.0.ebuild b/dev-lang/ruby/ruby-2.5.0.ebuild
deleted file mode 100644
index 0149280e2408..000000000000
--- a/dev-lang/ruby/ruby-2.5.0.ebuild
+++ /dev/null
@@ -1,238 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-#PATCHSET=1
-
-inherit autotools eutils flag-o-matic multilib versionator
-
-MY_P="${PN}-$(get_version_component_range 1-3)"
-S=${WORKDIR}/${MY_P}
-
-SLOT=$(get_version_component_range 1-2)
-MY_SUFFIX=$(delete_version_separator 1 ${SLOT})
-RUBYVERSION=${SLOT}.0
-
-if [[ -n ${PATCHSET} ]]; then
-	if [[ ${PVR} == ${PV} ]]; then
-		PATCHSET="${PV}-r0.${PATCHSET}"
-	else
-		PATCHSET="${PVR}.${PATCHSET}"
-	fi
-else
-	PATCHSET="${PVR}"
-fi
-
-DESCRIPTION="An object-oriented scripting language"
-HOMEPAGE="http://www.ruby-lang.org/"
-SRC_URI="mirror://ruby/${SLOT}/${MY_P}.tar.xz
-		 https://dev.gentoo.org/~graaff/ruby-team/${PN}-patches-${PATCHSET}.tar.bz2"
-
-LICENSE="|| ( Ruby-BSD BSD-2 )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="berkdb debug doc examples gdbm ipv6 jemalloc libressl +rdoc rubytests socks5 ssl static-libs tk xemacs"
-
-RDEPEND="
-	berkdb? ( sys-libs/db:= )
-	gdbm? ( sys-libs/gdbm )
-	jemalloc? ( dev-libs/jemalloc )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl )
-	)
-	socks5? ( >=net-proxy/dante-1.1.13 )
-	tk? (
-		dev-lang/tcl:0=[threads]
-		dev-lang/tk:0=[threads]
-	)
-	dev-libs/libyaml
-	virtual/libffi
-	sys-libs/zlib
-	>=app-eselect/eselect-ruby-20171225
-"
-
-DEPEND="${RDEPEND}"
-
-BUNDLED_GEMS="
-	>=dev-ruby/did_you_mean-1.2.0:2.5[ruby_targets_ruby25]
-	>=dev-ruby/minitest-5.10.3[ruby_targets_ruby25]
-	>=dev-ruby/net-telnet-0.1.1[ruby_targets_ruby25]
-	>=dev-ruby/power_assert-1.1.1[ruby_targets_ruby25]
-	>=dev-ruby/rake-12.3.0[ruby_targets_ruby25]
-	>=dev-ruby/test-unit-3.2.7[ruby_targets_ruby25]
-	>=dev-ruby/xmlrpc-0.3.0[ruby_targets_ruby25]
-"
-
-PDEPEND="
-	${BUNDLED_GEMS}
-	virtual/rubygems[ruby_targets_ruby24]
-	>=dev-ruby/json-2.0.2[ruby_targets_ruby24]
-	rdoc? ( >=dev-ruby/rdoc-5.1.0[ruby_targets_ruby24] )
-	xemacs? ( app-xemacs/ruby-modes )"
-
-src_prepare() {
-	EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \
-		epatch "${WORKDIR}/patches"
-
-	einfo "Unbundling gems..."
-	cd "$S"
-	# Remove bundled gems that we will install via PDEPEND, bug
-	# 539700. Use explicit version numbers to ensure rm fails when they
-	# change so we can update dependencies accordingly.
-	rm -f gems/{did_you_mean-1.2.0,minitest-5.10.3,net-telnet-0.1.1,power_assert-1.1.1,rake-12.3.0,test-unit-3.2.7,xmlrpc-0.3.0}.gem || die
-
-	einfo "Removing bundled libraries..."
-	rm -fr ext/fiddle/libffi-3.2.1 || die
-
-	eapply_user
-
-	eautoreconf
-}
-
-src_configure() {
-	local modules= myconf=
-
-	# -fomit-frame-pointer makes ruby segfault, see bug #150413.
-	filter-flags -fomit-frame-pointer
-	# In many places aliasing rules are broken; play it safe
-	# as it's risky with newer compilers to leave it as it is.
-	append-flags -fno-strict-aliasing
-	# SuperH needs this
-	use sh && append-flags -mieee
-
-	# Socks support via dante
-	if use socks5 ; then
-		# Socks support can't be disabled as long as SOCKS_SERVER is
-		# set and socks library is present, so need to unset
-		# SOCKS_SERVER in that case.
-		unset SOCKS_SERVER
-	fi
-
-	# Increase GC_MALLOC_LIMIT if set (default is 8000000)
-	if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
-		append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
-	fi
-
-	# ipv6 hack, bug 168939. Needs --enable-ipv6.
-	use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
-
-	# Determine which modules *not* to build depending in the USE flags.
-	if ! use berkdb ; then
-		modules="${modules},dbm"
-	fi
-	if ! use gdbm ; then
-		modules="${modules},gdbm"
-	fi
-	if ! use ssl ; then
-		modules="${modules},openssl"
-	fi
-	if ! use tk ; then
-		modules="${modules},tk"
-	fi
-
-	# Provide an empty LIBPATHENV because we disable rpath but we do not
-	# need LD_LIBRARY_PATH by default since that breaks USE=multitarget
-	# #564272
-	INSTALL="${EPREFIX}/usr/bin/install -c" LIBPATHENV="" econf \
-		--program-suffix=${MY_SUFFIX} \
-		--with-soname=ruby${MY_SUFFIX} \
-		--docdir=${EPREFIX}/usr/share/doc/${P} \
-		--enable-shared \
-		--enable-pthread \
-		--disable-rpath \
-		--with-out-ext="${modules}" \
-		$(use_with jemalloc jemalloc) \
-		$(use_enable socks5 socks) \
-		$(use_enable doc install-doc) \
-		--enable-ipv6 \
-		$(use_enable static-libs static) \
-		$(use_enable static-libs install-static-library) \
-		$(use_with static-libs static-linked-ext) \
-		$(use_enable debug) \
-		${myconf} \
-		--enable-option-checking=no \
-		|| die "econf failed"
-}
-
-src_compile() {
-	emake V=1 EXTLDFLAGS="${LDFLAGS}" || die "emake failed"
-}
-
-src_test() {
-	emake -j1 V=1 test || die "make test failed"
-
-	elog "Ruby's make test has been run. Ruby also ships with a make check"
-	elog "that cannot be run until after ruby has been installed."
-	elog
-	if use rubytests; then
-		elog "You have enabled rubytests, so they will be installed to"
-		elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a user other"
-		elog "than root, and you must place them into a writeable directory."
-		elog "Then call: "
-		elog
-		elog "ruby${MY_SUFFIX} -C /location/of/tests runner.rb"
-	else
-		elog "Enable the rubytests USE flag to install the make check tests"
-	fi
-}
-
-src_install() {
-	# Remove the remaining bundled gems. We do this late in the process
-	# since they are used during the build to e.g. create the
-	# documentation.
-	rm -rf ext/json || die
-
-	# Ruby is involved in the install process, we don't want interference here.
-	unset RUBYOPT
-
-	local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
-
-	LD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
-	RUBYLIB="${S}:${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
-	for d in $(find "${S}/ext" -type d) ; do
-		RUBYLIB="${RUBYLIB}:$d"
-	done
-	export LD_LIBRARY_PATH RUBYLIB
-
-	emake V=1 DESTDIR="${D}" install || die "make install failed"
-
-	# Remove installed rubygems and rdoc copy
-	rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed"
-	rm -rf "${ED}/usr/bin/"gem"${MY_SUFFIX}" || die "rm rdoc bins failed"
-	rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed"
-	rm -rf "${ED}/usr/bin/"{ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed"
-
-	if use doc; then
-		make DESTDIR="${D}" install-doc || die "make install-doc failed"
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r sample
-	fi
-
-	dodoc ChangeLog NEWS doc/NEWS* README* || die
-
-	if use rubytests; then
-		pushd test
-		insinto /usr/share/${PN}-${SLOT}/test
-		doins -r .
-		popd
-	fi
-}
-
-pkg_postinst() {
-	if [[ ! -n $(readlink "${EROOT}"usr/bin/ruby) ]] ; then
-		eselect ruby set ruby${MY_SUFFIX}
-	fi
-
-	elog
-	elog "To switch between available Ruby profiles, execute as root:"
-	elog "\teselect ruby set ruby(23|24|...)"
-	elog
-}
-
-pkg_postrm() {
-	eselect ruby cleanup
-}