gentoo resync : 10.04.2018

45 files changed, 94 insertions, 1040 deletions

diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 84c8eab62c7d..e76a878caa01 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest
index 4cfc419f9131..a2dd52ad2c2e 100644
--- a/dev-lang/perl/Manifest
+++ b/dev-lang/perl/Manifest
@@ -9,7 +9,7 @@ DIST perl-5.27.7-patches-1.tar.xz 16276 BLAKE2B 81d6d4eb2459abd80d9dbf9a0300af3d
 DIST perl-5.27.8.tar.xz 12103968 BLAKE2B d2145ddfb3be35bc23788616bc2a9133f6875db112d307f326e31a67345dc1abb0b11992d28974682f5a7831e2366b391ef1c84de76222d2a1780ec37fc965f6 SHA512 f710e89d36cbf24cfb78e6ae3a48f7dc0262504688d94fd6fbf6826444531f4843084b6b874759537968b926fa991e46462cd5c4d5199f6ebbbfc78f661cd1e9
 DIST perl-cross-1.1.7.tar.gz 97622 BLAKE2B c58dd51492cfbda6fc58b43d9de45c35dd5ed5768ca8db61b5ac092ad6c0067386597875d6613c75671f026387ba474ce8c28789d6d77b9dcfc4cf4bf7227126 SHA512 b64d487129b295ec6d996606b8b8559de681e1cf7c3e3167d6d646d5d7a848d7929b1ab698d1f950e265213749772fc74d209cea5020b61e133c8f8851b7cfa0
 DIST perl-cross-1.1.8.tar.gz 98686 BLAKE2B e4fa78e99cb0b93025468d6035dfa352e78867003847637e3730df7f3df252cd13370b71b8c724e4dcc9c0851a8e224402ba6880a1ac666521a64b9053a7e4c2 SHA512 00de89c4b4dbef4aede397c541ef5b9c5b1c2b8fecc7ea4b8d5d133dcceb65da6e834ff28609e7865d24e563f050de25c72ce3a88a162d8c88e87524aac5217f
-EBUILD perl-5.24.3-r1.ebuild 17397 BLAKE2B 40de5cbbb7e487eb16dab354b94b3260be5b0defa04961a140dd173bff2917096e74aef836bbce168df5dcfedb8e1394c1c71816425a24659f19401d3f26c637 SHA512 260e00a18bdc6f0c93600effabfa634c5e1b7ac93dee0faaa58f7bbc1512e845e0831ae66b8cceaa0940436a6837b27d35cbd7d4e4bd980259fb50192adafd8c
+EBUILD perl-5.24.3-r1.ebuild 17396 BLAKE2B 927d1968ecc8729f83c3968cc869720a5acb38989594e16c90dcf593eeed28179ed5465ff535fcec64c4c93e7b0b6db4f5c420199a7c2c75d3a684d3e7e01e83 SHA512 76a4fe4aed9119e5de26f70e3efa502e1f0619e6b4459e256efcd09442c50da86936c61fe1fc764c69384f2254da12b52459ad2c4763cfd48001f482eccc9d5b
 EBUILD perl-5.24.3.ebuild 17070 BLAKE2B 9e99b0f9064e85d7dbd935cc3ad72b91be4ea248cd1d74fcd2f4ec93ebcffeef3ad1c94a03c0b9a36ac9956496283891bd95421aa003eef0e1b22173deaa736a SHA512 150e72fbb0c05884b2c63e62cc76f42aa1f9f6e684f0d7bcb1169e80f970bef8aab5b3f9f82c6f81a54ad9232f72e2b3bff09927de57b60f1d6b835c012551e4
 EBUILD perl-5.26.1-r1.ebuild 19253 BLAKE2B 3d192d2a79bb036593ba46bc02fa901ddfbf4b4e53692f6635fe4f94b530888aab7d5e82b3cd47a74c24828052e53647373d71749b0fce61d0756972500ca8b0 SHA512 650d1573aaf99c30f5df0cb1ca8830cdf23e43b2a20acc0b3d75a52777f5b69df874894e929802c728bdfa6c6a7017f379ee56745b1dcf43862c66564345c5a1
 EBUILD perl-5.26.1-r2.ebuild 19666 BLAKE2B d89c12581fdd3c3ba285118745335e61dc26077aaf4ade12b0f875363c217f0029ccf432616c7ec2be337d0bf09c2be26c13f75171682d3d1d84de597f2238b0 SHA512 43877a272bfd106111a81eb89a4de94dadcd76571208ce198854f9822dbd0575ed4262d0e90e31fe65b27a3579ec25d3c7ba06ab8481d0fd49c9238b5a83c3be
diff --git a/dev-lang/perl/perl-5.24.3-r1.ebuild b/dev-lang/perl/perl-5.24.3-r1.ebuild
index d92030e77ab4..75d558b8107f 100644
--- a/dev-lang/perl/perl-5.24.3-r1.ebuild
+++ b/dev-lang/perl/perl-5.24.3-r1.ebuild
@@ -30,7 +30,7 @@ HOMEPAGE="https://www.perl.org/"
 
 LICENSE="|| ( Artistic GPL-1+ )"
 SLOT="0/${SHORT_PV}"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="berkdb debug doc gdbm ithreads"
 
 RDEPEND="
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index c7b5d44544e7..81b71796d1b1 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -15,14 +15,14 @@ DIST php-7.1.15.tar.xz 12201380 BLAKE2B 4387382daf3883962eb0e47d86c983a65c293e89
 DIST php-7.1.16.tar.xz 12211512 BLAKE2B bf242e2438b2dc363368a9ef4478349a291f483477ccedf988abd0fbb78a6f1b31e3b86dcb39ed9a9a8151674a8373ae77d8420e77efd6a2e05d5cfc778ed40f SHA512 98e96f06a4912cfa6926be2f292ce7120ca893c9b779b2efef4120c1df3580fa427cd58f5e4977edb01a0ae3b85660d6ca79b2bd79b6cd830cd77f6c6588b5ea
 DIST php-7.2.4.tar.xz 12031892 BLAKE2B f76b3ccbfed4d309639ac5e35a12aa70a194f8cecde98634d7bff9123eb45ff3a4f0b3297149a44357bbc3287a9a3c1393d86b12bd53f38ff844db9498ee3452 SHA512 d1d0720f0d4bb28f7ce0ec7c859b14c1e74e9d0e7c73de6988d5ce737d7ccb7308c0a7a2651ee012c630be2cd53e6531505df0a03f0efbb6359176b446982244
 EBUILD php-5.6.33.ebuild 22554 BLAKE2B 0ab011b206772d7d83ee135cadcf0a9d304f29d6ce78fa0bbe7779d13cc1205287033878870810240996de89c519b805da989babcab926a2285e16e33d0352a7 SHA512 27eef42a39637986fe63823cb387e5d6ec481776baaa15ee51009f265d0fdc4ea0d8120349858f290f9c743091e679f309a190318bd02baf0b87931d0567dc24
-EBUILD php-5.6.34.ebuild 22657 BLAKE2B bdb8c324350730b55b2c9f77b9dd0b9dda01868ff30381d81a8b94562606cd8d9fa3c3eebce9b737ed2a8e02924ce44664f6d0da764ef20caeb9dae1a9321120 SHA512 eef581ed22de47aeaf02662e27422e8fe9bdf971eb99492de82b51906242704b8a119f950a1b468798bee1940b7824caa1ff37dd29752860d529d8742304539c
-EBUILD php-5.6.35-r1.ebuild 22666 BLAKE2B 2a9b3ef938a3ac8c77c612e6fff9369c6a5eeba0101a8c2f4ad56cdbaa13c0bc8d41242f889ada677ed4c6234f5a0aace1f8e5683304d4a58309737e30424157 SHA512 01e18631eb77cc7a9b9100bbaa04f12d7e2698929c8df6d6c7f62a83854e679121335f3f8a6288120f27a7dd8721fda7ab0ea8ec25a6337e32552c4534220b6e
+EBUILD php-5.6.34.ebuild 22656 BLAKE2B a63c4fa80152985d8d931a7476f86061bd6c127c9c7ca31f6162066383234b5fdeabde7a3bb7cf43cf87d2eaf23b78d7456e803a17a1fce9070bc70e322922fa SHA512 31727757aff2777cc10ce5d9cf11030e77fa9982cf22536086aad8ed24ddcccb2a186b7383d9b3305ee8f645a83999673c6f5fa079c506f0656b141faac67feb
+EBUILD php-5.6.35-r1.ebuild 22665 BLAKE2B 8db8cd0775bff4227a804bd07bf630d194626c3b9c7ab2a7c1db770b4ef51e9fb064b52f96acc0b2cf4600643aa6a94d52c04617f549f38179e0c0fd450588ec SHA512 826910cb3e34f56e40d946461572633b0fa91e43d6ea04d6872c48801bbc74bc58bb9b8310e0b5918be2e42b2a383ef97318df0585b1b1639509002dbcfdd6a4
 EBUILD php-7.0.27.ebuild 21672 BLAKE2B d7f777112996d44d36b912639eddac4e5d2e415033793e5cb0e6e596f54f6a6922efc6e9b8152a56e5c35220c7bfdcfa0fbb21e98b34ed23dee31ad9499f93ee SHA512 7e9cc8ba4cf70338636b7048199fed99b967a26e540ddf605a28b3fd2053daff701202f822819bb60d528c260d137f4089de60e36460834fc6b716e212c982be
-EBUILD php-7.0.28.ebuild 21775 BLAKE2B 8e893ded094af9a8cbe9955b643765d0581ca6a08ea93667e74eed282e75749cee3a24be33dcd0054a34d3b453e6c79bc7d2f97cc40064e9e58ab39cfb112667 SHA512 ea564f176980bdbe19f9856ebca999c8583a1e88b2f90fa66a0ccdc8b126e7b74656356a18785d754527f9f8041d5c14c1c1588c2ea686e64aa811f7b812690f
-EBUILD php-7.0.29.ebuild 21777 BLAKE2B fcfedcd276ede79174e238ae81cf3fb1d764b26c102832999f82a1dc92e412a09aae3a18d8c6f547bef53b56fc7b7833dca3a1363ff93d18508116ae52c95fe2 SHA512 4af5b62457d3b74c3ffa5fac40acfdaf87b7283b96c3a7729e8a03a5d319bf71e258441ef4a9b18a845c60fbbbf69273f2aee4e886fb0f5219559db34c7ae3fb
+EBUILD php-7.0.28.ebuild 21774 BLAKE2B 866a588a4afef0a7e84d9ff87a318826c119b4d50c9f964e4fea0f768c7c4a1b9f8bf647ad9ac07312f810848332c1449caac6286baa3c89501d698a506aae0b SHA512 5b4c87510f915fc5668b6df7d9c3bf56790203d1eb03e2244e10e926c9b76b7c86c4f9ae182c9f2ba9df9a3f6266fa65b4571203cc1ccd23bb70148b898a6c76
+EBUILD php-7.0.29.ebuild 21776 BLAKE2B 86daf355cc778593d66c8be1004d563b5c46db51a04cfa8727ba5c7b7d3318432509d60622fd861138a0a33be6ac4f2703080006f6e3ecf8acff8519e93055e7 SHA512 b1ec9b1e405d9e33c3f2de38d4bb2d631432d0ae637db1f4f20bd47da05cc7a2fed6f006a4936fe28aa375b00d60201f578246fa8739bae47675d20b20ce0902
 EBUILD php-7.1.13.ebuild 21538 BLAKE2B 69b0b2778758211dfdf3af43178034d0586547406a5e471b88097efe338278d799a1f1fd48c346dc0a10bcc815e3994e90cb901649325933fda1575b46e27037 SHA512 9f41de25f42053c059181833e1ce3a51eb63a0f8bfca48fc1a4bc8216b421832e3afe287e36857c568c5032622db7ff5650b6548cb5dfd91eaf7bb87277597b4
 EBUILD php-7.1.14.ebuild 21569 BLAKE2B 3f3d8d096bdf8de1333ca452751b9d2f5b9c5c5f2642f7e64f269f41e45bf27d1c5aff5f62eb7c5c88c549761855f307f31df7b901944869f6110f7f7ff07bb5 SHA512 36441126cb9b718b8b7ac8387ede6638a5f4068c554f335932613b7386b16871363115a4f9b6ae537be921edff4fa5038cc32514efe33fb33c1da2c457e24f87
-EBUILD php-7.1.15.ebuild 21663 BLAKE2B 5d83402936957d63aa95fce9340d368e162cab764b0aa1a50199fd2ee958ea566888504b9c5f7a2350c160b7cbff844dacc2813f41ea8c1ac518bb6a2af9bb9f SHA512 61ea9cc270fd65deb074e37b62911c3e22b0e66cb0cb00957244846d84373ade491ca2c926d9b58ae5eab68d8f7628aab6f3bec00952e4a58273b005ea582b3d
-EBUILD php-7.1.16.ebuild 21665 BLAKE2B 86a4184bc426e0259e67470659a1235e8c03a4e5bd166187507478bff3e349f5603813d870f90ce51ec2302ac903c92af2f36c01f5dc8b9f562ad46bebac463a SHA512 585862ad8b1d359ae7fb01eb15fa39a98cd05a297fc33c7dae73c7d983438074d49e9cec31e6aef4ddc96b76549f925ae875583c9c0e908360fd0726b3e27e6d
+EBUILD php-7.1.15.ebuild 21662 BLAKE2B 27de4a51f061bc318d457081d175a08df4233567299fdd2287369b597e5084c0782e5567d8d11ff467b5d65c80ab82c1d0930f906e61c1fc76e47cdeca3a93d0 SHA512 d35543b2e097b8fff290a4d6e57ed0884be55e4c9adc7727e6b63079cf54a3300ee2b60cd1678956652cb17d7bd8d5940084fc5ef89abdf82105a0bb90bc1ad5
+EBUILD php-7.1.16.ebuild 21664 BLAKE2B 679f34f88c8b46cd4e8d4508e0548ab8f0230ed216c536679b21adb78b202a938a6612f0870cd923f20c3532b19f947a3b87a13af0f8fcf71332951117cae386 SHA512 39301cd81eb3747646a0e5aeda08ede05d6ce96e4079c650d932c9ed47108136eb2baf44a965ba748827ca5b1247e485dd98540f07fa6c4c0742278066435e30
 EBUILD php-7.2.4.ebuild 22200 BLAKE2B a628bd7b910d20fd73693ac9ff9d815df42a119d164302e288af599ddddd0db3e1881be8963c48fa5ddc4bcf64a648b45708d75046de1a5a3881d21ed941ca36 SHA512 f1459160743bcb898836ef1fe7aff440bfc7f92d18e35cb3f71002caeab447f40bd3b8950d58fb58dadaea13f084556fbae136818dc65efe8bdde3dc9a039224
 MISC metadata.xml 2577 BLAKE2B 9b15d6073181a5f5ff7b00ef8b68d24c7ea8763171ae84895ebc4a6925f589d2a02e4e29116c2741b3502b35d32aa58e7ed909e144c0e694f8cce5b4d26ecd3b SHA512 14e6daa693325b8a27157cff22d0b0cae9d89e4dada775f39188f7f36546b78a8b19efedb2f7b6f64ee1375bf29d3af32a8f7d6e7bf0d04cf2a7241abd154afa
diff --git a/dev-lang/php/php-5.6.34.ebuild b/dev-lang/php/php-5.6.34.ebuild
index d2c65b31f7af..dfd04fb8e1d8 100644
--- a/dev-lang/php/php-5.6.34.ebuild
+++ b/dev-lang/php/php-5.6.34.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-5.6.35-r1.ebuild b/dev-lang/php/php-5.6.35-r1.ebuild
index e42da1d7bd41..c45443f5578a 100644
--- a/dev-lang/php/php-5.6.35-r1.ebuild
+++ b/dev-lang/php/php-5.6.35-r1.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.28.ebuild b/dev-lang/php/php-7.0.28.ebuild
index 7964fdcd189c..56df1d36905b 100644
--- a/dev-lang/php/php-7.0.28.ebuild
+++ b/dev-lang/php/php-7.0.28.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.0.29.ebuild b/dev-lang/php/php-7.0.29.ebuild
index d06a323f46bf..7b699fafeca3 100644
--- a/dev-lang/php/php-7.0.29.ebuild
+++ b/dev-lang/php/php-7.0.29.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.15.ebuild b/dev-lang/php/php-7.1.15.ebuild
index 7624b2d8a8a7..d5b4ffdd691e 100644
--- a/dev-lang/php/php-7.1.15.ebuild
+++ b/dev-lang/php/php-7.1.15.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.16.ebuild b/dev-lang/php/php-7.1.16.ebuild
index e40cced279d8..d37477a823c8 100644
--- a/dev-lang/php/php-7.1.16.ebuild
+++ b/dev-lang/php/php-7.1.16.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/ruby/Manifest b/dev-lang/ruby/Manifest
index 5f63c73955d5..a51fe5f80c5a 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -15,10 +15,10 @@ DIST ruby-patches-2.4.4.tar.bz2 2898 BLAKE2B e46502dbb0aa25c3d71693a6c04b433bd4d
 DIST ruby-patches-2.5.0-r1.tar.bz2 1888 BLAKE2B 38358c4d10a5c825ad1d50aa9e538fbfb0875deffaecf2064be3c52d593539f37b83bf726437922b1f13bd3d5c63e30ae071cd75c891e7083d3a363c4b49c905 SHA512 39068008cd7050a6787cfe35ef0a21ebeb5128226153b80f8d34e89bc77d6159f32e6980dfd8f3e38fc748cf3d648d102b3dcfcb79a484a517a5008bfd8161b9
 DIST ruby-patches-2.5.0-r2.tar.bz2 2986 BLAKE2B 64d64eda19bff94f205a6314c2af59896064fb64c118e0f3859d82aeb7e58478170b9160804ab8faf569054b65228abeecc5900e568e17133c21e9aed9bdf589 SHA512 c2bca3f98c7bb1de267b9f07eb1b0903c499c79e9c9d0166a6924e88e837434f27ddedd7aead7ebbe32f0530f751601ac5486a0db46ee28b94d7cea13e0e7924
 DIST ruby-patches-2.5.1.tar.bz2 2986 BLAKE2B 64d64eda19bff94f205a6314c2af59896064fb64c118e0f3859d82aeb7e58478170b9160804ab8faf569054b65228abeecc5900e568e17133c21e9aed9bdf589 SHA512 c2bca3f98c7bb1de267b9f07eb1b0903c499c79e9c9d0166a6924e88e837434f27ddedd7aead7ebbe32f0530f751601ac5486a0db46ee28b94d7cea13e0e7924
-EBUILD ruby-2.2.10.ebuild 6921 BLAKE2B 2b9437e695af02477ac29dda7c6c9e97a4e6c55abd0a803eba3cbf4231f907be443f1b862f5bd92b308d00386a0695eef240184cdac2ad69e058dfcdaff36758 SHA512 2fac5e172f3a235f25d8b98f684423891a1914af6712fb1938518d2e2875cb83540412ce6548ac7f0f7f8795cf81e655b1fe9a2e9c883592d489d3293f20ab57
+EBUILD ruby-2.2.10.ebuild 6920 BLAKE2B 43a1e0fccbd277fec47a96ea57accfa4effa77c42fee4ace5c3255975b6374a231fc28e5a63b98c2276e1befd8fa29337045f6d883b39695f4807113ed7c366b SHA512 df558d2ec643a7fb5b47c372bedef400748d6ba13fc5f96f0e2ffc8cb43fae6d4be147635e4d19a8c17ddeb66661867f2ebeb14c821cc784342e5caa95b03317
 EBUILD ruby-2.2.9.ebuild 6916 BLAKE2B c194ff14baceedc1e76d9098aa346dfc83a8a4ceb11668f197b385ccbac5f3d9f40bc846e5a027c42f965d38ad448545f5311ef659beafd4cdc90f8cee84fa8c SHA512 ff1d71308241fe8859b5a7e23835742c209af547a0f61cf0d775b9c4d8df3acf9113e8fd4047743eae4fe86a6bf0ed5cf40bcc7de9e7c4792d8cd89b506f510e
 EBUILD ruby-2.3.6.ebuild 6875 BLAKE2B b26271e0f50c4a0d8877519053e3fb25b01d593bf1408b927c382869393e0c563cbe4d5f2e1805aa1e24bdac2aeead7120598b84f975ee73d36447b2cb5c4126 SHA512 7fa817084c0b82cf4b919c728e421a265ad495e92be317354c9c82a4188a22bb828d82f09f1d3a516d5d6c1b9700a395117a226435c3672e11f1912fe0be6520
-EBUILD ruby-2.3.7.ebuild 6879 BLAKE2B 77dcf677a97e088f8f45eae96c17f002cbda4468622ce11ac2e5bb22891c68d5a883c6adb48e0dac1bcd7013c02b501d5429a98fbde64bcbaa0b5b912e15a10d SHA512 6e563a6f707c6e49e9e8c0b92721ffca76640839c818181708251d3f5f693e02071c08fad24c4fd0d65a8195c9c63adeee20e2727f797b1c9c228c6bf5d85149
+EBUILD ruby-2.3.7.ebuild 6878 BLAKE2B 2bc9938217d5a8f556e73fd23fca23692cfb6e281367d6cd9331a4a854c614aabef4d2fcb8d8ad4f0103d5941d194a2ae5503b7f40ff32a50d6e146b8c4136cd SHA512 578244ba480180bfed457845449d84a05626fe7da6488ae59f6a7acd342afa87e6c2368beded4a58b7e07a5aab140e93f49daba658da90965820204675aa6eab
 EBUILD ruby-2.4.3.ebuild 6980 BLAKE2B 2a08be5225e43fd5e5d7c90ff63ed43b6eab9b6e69ac1df7aead9657d651267e8bc0e741e16a276bee7fe5ecca5565d17d1428d96e5713305d278f251cdd99f4 SHA512 f43e497753a3fcfc0ff3e4ff840ae8cf3003671da0fe55e62651c17592f885cdbb99ed76ff6b99581ffd0903d23bc03b5425839f884f9e0e7ed925fb748edd4d
 EBUILD ruby-2.4.4.ebuild 6980 BLAKE2B 2a08be5225e43fd5e5d7c90ff63ed43b6eab9b6e69ac1df7aead9657d651267e8bc0e741e16a276bee7fe5ecca5565d17d1428d96e5713305d278f251cdd99f4 SHA512 f43e497753a3fcfc0ff3e4ff840ae8cf3003671da0fe55e62651c17592f885cdbb99ed76ff6b99581ffd0903d23bc03b5425839f884f9e0e7ed925fb748edd4d
 EBUILD ruby-2.5.0-r1.ebuild 6772 BLAKE2B f9ac0a58ebcd718715fb67cbbe90cc853a14d8ba717bd91e93645115c5b37dc4def3827dbd01ba7b91138468b124c3581f90a133e88884a7f2b9a902f3b4ad82 SHA512 ed302d0d2a27d002a1b89aaea3b25ce6c88660f1fd30469cc2d292cfe3679bc477b6f8ac986964db45541db091be3040ee8dc8a76f5c10995d307dcb4246042b
diff --git a/dev-lang/ruby/ruby-2.2.10.ebuild b/dev-lang/ruby/ruby-2.2.10.ebuild
index 8703aec8414c..e4d51156ac4d 100644
--- a/dev-lang/ruby/ruby-2.2.10.ebuild
+++ b/dev-lang/ruby/ruby-2.2.10.ebuild
@@ -30,7 +30,7 @@ SRC_URI="mirror://ruby/2.2/${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"
+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="
diff --git a/dev-lang/ruby/ruby-2.3.7.ebuild b/dev-lang/ruby/ruby-2.3.7.ebuild
index 851c22e2ffad..28fb15d06a2f 100644
--- a/dev-lang/ruby/ruby-2.3.7.ebuild
+++ b/dev-lang/ruby/ruby-2.3.7.ebuild
@@ -30,7 +30,7 @@ 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"
+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="
diff --git a/dev-lang/scala/Manifest b/dev-lang/scala/Manifest
index 20e3a6f435bd..4434745be3f3 100644
--- a/dev-lang/scala/Manifest
+++ b/dev-lang/scala/Manifest
@@ -1,14 +1,13 @@
-AUX scala-2.11.1-no-git.patch 919 BLAKE2B d01a73feec01701f8c604aedfcaf2eb3a8820bea987dd1a8d1233b9c147871579a80978e6a334dfc1f961c1e70bb9503ea2cfa57485561ac1d3572c62a95ec9a SHA512 b2ef4da42d192c95a1974ed0caba52b6530c7f77de35cd817520ced906ec72d578ff68212add7cc0f7ded6b2486b03aa0e5f52c094f326cfc017ecc1d97116be
-AUX scala-2.11.11-no-git.patch 919 BLAKE2B ec153fdd07401008505b89a17c14bbbdeb5024108be17fde2205c3f65e12976cebbd68e075859c7bc14eaf8427e48f2b7348ee58925779b127c212c1881e2432 SHA512 e6ccbd8ce6ee719e52ed16ef0d344223e93476277f7a131abf8841e82e9660a4fde992cace80f2a0ad5897eaee2920f9b1fbe1a2798b4c25973095018110f4b7
-AUX scala-2.11.2-no-git.patch 919 BLAKE2B d09dbca5118edcd6eb334f1e61d2d5a19ad3dd424e9b20873879fd3bac7f514107a1dde942a1e5398d451ecc525589acd016b8450e95c6e10cdecca54e6da462 SHA512 26e590dedbedfc072b2613f1445835f5c3d215b5102fcbca8bebfff4908897a6f0e70f014b6597083586453cba6ff7d63e4d12abb25d5ca53002c551fe62c9e4
-AUX scala-2.11.4-no-git.patch 919 BLAKE2B a8ca4b0706028673ecbb05adf17bc90255b63ea5c4758b778ffd1f89f91636b26434b4d6c9fcff8d34b8b7dd6bb70c6705737d02c61626c95bdaa7025e2c2415 SHA512 91f3f506309066940a72bceef9e091f12231dbbe013ac19c368c97b8ade604552fe3f61d14658d6ace461afee453da1c71dd94dd0209c7627353323615478917
-AUX scala-2.11.6-no-git.patch 919 BLAKE2B b2edb2e78bbd1c41a0eb017f70373a26a4cbb361386f04665391f35f6d47733bd1d5e4494439535e520f8471db35774eace302af5d8b46763c49c624148f6e78 SHA512 876c7300d9a439517af4d5ee918d2034635668c851ea279b9a14a91e87bf2f8264617de6791fcdb33a55a37215960d9398f869e102f42e029cb49c78568a6d67
-AUX scala-2.11.7-no-git.patch 919 BLAKE2B f5ead8ec583b140285b7e713362bd6712a3f9c02a677dd291021e99afce100b4ce587bc88b0449ccdda8e895da528dc06103210038cebc82c50c989087b8be42 SHA512 a83d5eef2d48baefc9ec7f0f8f5ead99d52498b8d52f4f650f465bb57e87b1a2ee0eeeabd4f47f6e8405e927a7880124c5c7dbe309bff4375aea3c3d6875c844
-AUX scala-2.11.8-no-git.patch 919 BLAKE2B ec153fdd07401008505b89a17c14bbbdeb5024108be17fde2205c3f65e12976cebbd68e075859c7bc14eaf8427e48f2b7348ee58925779b127c212c1881e2432 SHA512 e6ccbd8ce6ee719e52ed16ef0d344223e93476277f7a131abf8841e82e9660a4fde992cace80f2a0ad5897eaee2920f9b1fbe1a2798b4c25973095018110f4b7
-AUX scala-2.12.1-no-git.patch 1226 BLAKE2B abacc4982b376b03385a98a7811f315628ad9a1557dd352782c7dff8f8767fe533c4a51f7bf3e3f9dcc1529aa8aa6af693e632eaef411f54ddcd73916aaae781 SHA512 e01c99f14e07feb2f7195d1126ba055951b629633f5de6acd9a99305917e5f159d805a68a37e003abb9c96197d7570da13cb88612a384cd5cd6b4302b0825d1a
-AUX scala-2.12.1-runner-script.patch 1367 BLAKE2B 86bd7baaacbf4ea725f08f2abfb4887573a0b8d058c8579dd54924078288169f03cfd916309ebac172b69012a0e2f495d611c0e22d72a8529fca3cd3093360c3 SHA512 3eb730457f6100b0117c0c7a70d95421fa0a911780d5da02af38abc4ae8747939f9827593695c302914ee6362a0d3d548e54400e807ca450f25158f484fcb3b6
-AUX scala-2.12.2-no-git.patch 1059 BLAKE2B 6b6ebbd422cb67943c35d37a654582d9c2efc1e37ce344e8ad962b401d9c639f76a5a024ad9ba205e2ef5bb5386ee785b1e3712e691fb532bf018b1ca10354fe SHA512 db6515c0f0282e236ad1600b33059e382e2a35617b2f116b86895c4c439430ee7227274ca34c843a1f6a1de932b4e3db7e03b6da060cbff1f0895dd7000f16b2
-AUX scala-2.12.4-no-git.patch 1552 BLAKE2B 05478f10a3a2c8db8812532cdfd899cc9563e93207931d3351e434fea09e691a5db48d31303a2533a2a806c840c3f4a4cc80fbc13b486d3b0e92ba8c611f48bf SHA512 a8c88056c7f96e38b1cdeb08c5faa948b145f701f5d3032e32b242ce074178dc853e4052dcdb4c80b3610c947a40587bdfb099bc7b46f60c41ff84ea88e112c4
+AUX scala-2.11.1-no-git.patch 721 BLAKE2B 9ed25bbd69c61b23c33fe0b3e9f5c3cff5c517b98c8026784dd4d0a56e74e7696a5d85b939f8fa6b56771173ea3ba0a9972ce48aff19a9861f089fecba054b62 SHA512 c2b7d5e9370c49fcd501e851c805e53bdb11eb14918070a8bfe47bc4d6b5335ad4a280ac2a7e752b645c740cd5a2e351471c94097c6d0761c019a2286c85239d
+AUX scala-2.11.2-no-git.patch 721 BLAKE2B 86cb56ed4662d3ac28d5e584c6d2143e2f36857d688d64bfc894f7a15fffcecbb02d03b0fa4573d0f335184af2ae6f8bc7a839497b2e73c387a8f387c93cb422 SHA512 9a8de823d17708b6b18dae554ed35f9e5d432c4a40287d7fb20d697dfea1ce740423e9f10e7e44fd9d2050b15ce6341e46ec91f14298c76bd0b9ccf754d7d5f1
+AUX scala-2.11.4-no-git.patch 721 BLAKE2B ffd5d5feb79f6af2348ec738ffdf0a2902d54de80c2c09a2c55f4f340a0957034e59027a9c219288a07185f89597483e7b66d43c5cd398832307eb91726187e3 SHA512 e1f3559248499b1a8568e459fbe29044e45f90e41bbd3ae94de1724f37a0c5de83728df02e7e2ed3fe1ddfe90683d5a74e67ede437a6c5c018da5b7a2d59df45
+AUX scala-2.11.6-no-git.patch 721 BLAKE2B b010dde23ac9bb2512eec5e0c12d974f5ec1897fcd59d1ec7bbb2e41cff8e74721122c58787146f9c8a839e42cda5bf81275e5fcc8c765a1bff92ac18332ca56 SHA512 eadb85fac3dfc43a70d12b07578a2911b1c50f9471aac0f04dce2b17ba7a4bbbb5d70af05e91a8b8dadb864db8dfe5e275ccf474060b73da49fbb54ca3e7e54d
+AUX scala-2.11.7-no-git.patch 721 BLAKE2B 39cef4d438c4a923a8cc8f2c5795b16ac63b4bb652f19f96287100e45398fb6bfcd5a3c143b990d2470372128aa114ec1d9f906b9b1c14a33bf2cdc304ac354f SHA512 e288f94757f4e3659d7de0c0363b45317ce652942798f7910c8971c01fc87dbb340b134c7660577e769d265c592cc87b1ec7ff113fc94b2167b5cdac8f9e7eaf
+AUX scala-2.11.8-no-git.patch 721 BLAKE2B 08659390afe4abd6b78fe2b43a7ec29f5867b7282ed72d6f89d6366c4b11d08a82b45c57eb1f3320c7036bf8bdaef4f3fdfd1dc1b92a9f591ac26cca4b783ef0 SHA512 956e141cc9f6691f091a06b0f75a644177f502d7e20a1c74bff5b0a5363b5505d14e308075aa9282b39cbec497f8b8783c8488c54162286e0a708ad62fe9ae8b
+AUX scala-2.12.1-no-git.patch 1028 BLAKE2B 6f6977691f0820a9b0a896511d215fa9dabaed7ea1e43d1bc40d0e8465bc18fe62bebc76f7e49500863be4684d603ee94341104eb45229d92f99057dc4b56935 SHA512 74c81c608b0c5635380424f8380e456027bc14b862a9f9578f837cc7ebc76e17713b669435fc5cf5441f3483469814d147c988ce4b65594c026adf598e99ca83
+AUX scala-2.12.1-runner-script.patch 1268 BLAKE2B 26c7f74fea756f8f9cea7082c72f131669b97d4448b6eae6877e6cd081aaa361d81be7c198587482e2ce18dbce7e1b0e90868ab750403e4033cbfe385d05c7a6 SHA512 7c8f8ce3d90051832a7bf6b58fc95c3f4a3df946187c98a083853c968fb07db8ff6ac2d60647a91db4895f6e5375c42dbdc9e14e71b316a2f1a7d8c61d8a1a5d
+AUX scala-2.12.2-no-git.patch 960 BLAKE2B d3c1456a561e215f075ad28d09273442cd60969494a3248fed275ad2098f0bcf9ea13b3fc3962e7b3f554b28febfbbc28a8e288d18ac51665015959668ebe542 SHA512 e92af8e687d7b924673b64a05c18fa955b612b4117f0b6cd379f22954e182e8e575018cd4b5cdea62971dba8aee4dc241e111dfade66c6544d07f057747f7047
+AUX scala-2.12.4-no-git.patch 1453 BLAKE2B 6d77493326398d00c103e6342ff4765f9a2f3b270a819d651ca4435ed473416b3882f6a98707c181131ea539d7a034a862bd1768cff1eab44d12a23899f5ef67 SHA512 48e12f3a6cc6ee65f9ea7afbd403d67e7bc642e242677d38f4a87f74f90b3feb5efe8fd6798bc36d0f209b27f323e854173cfa104dd149e24dd1809f64f61475
 DIST scala-2.11.1-annotations.jar 2242 BLAKE2B 0c731c25eaa407bdfb51d749f688062a33bd7f2815e8303ba5c56532027350f58d5ab364f2428547c2a99e2032ba0d0d20d4d50cc27dc5c42946e7842111547d SHA512 3ceee0b1361b9e0911c1ff060ad108a1d93f7ea3e82ef946401cd5f895cb06016ac0ecdfd095f99b11cfb28c4cef7705c1b564c7af644c5f19b45c14a413c4dd
 DIST scala-2.11.1-ant-contrib.jar 224277 BLAKE2B f43bfe3da05decbcf4ec9d2f48bface141907abfbe5b17532e970dbb660e0e1ffae9807c12da38cd6dc8e57c2605c6ec86ad11a99331e73edd3e4418656ab27e SHA512 5ec325a55bb213226c86faf8a99951839319e9579956ae58e2ccfe84f62d2742542998f98eed3f0dc8f8f94635d6dff1fe02e3c0f5289df1f09027ae2b9bee83
 DIST scala-2.11.1-ant-dotnet-1.0.jar 57795 BLAKE2B 1f04f20739a231816a6d9c81ac0ba23f155ebdb467f466640b18ba2b4f125a6171bcf420c42f71fcfa2c13293a5241e200d0d908bd460ca3ae0342b13747aaad SHA512 72afc387cf9dbeb99e627ca7f35f919f627bbf3f072eb46036120695fb70311490593c255c2a2e79b684adb8f213d8ab591d4ceda5d5f2e6b6906a6977b38867
@@ -203,15 +202,15 @@ DIST scala-2.12.4-nest.jar 2920 BLAKE2B 3c48a2ea7501be03ede0fd9c1f907508491299cd
 DIST scala-2.12.4-sbt-deps.tar.xz 34841672 BLAKE2B 0f1577bba65eb5863013014b16627c28934f13e84a6ed0a52748e2007417ae074bcb4b68650993d870f4ada872248d489f84ea02ee19521dd9ce8faae963e221 SHA512 74455451e77f0d935c8027e67b898e5eec9e984158292a37a4362072f4922eb53dfe9ddd5d52da8066fb8949c6469bff70405df8581633a49a37c8b900c6885e
 DIST scala-2.12.4-vizant.jar 15910 BLAKE2B 393ddd38ff2528b9c54fbb2b79111858a2dfeab66e4b10daf4e23d113963edb3002db8c9415fe47557736a63ecef4b198bd90b87a54240a9a43823fdab0f3082 SHA512 4464d7349016f4999199e227e8eaf7bb3ef6b7e38ad0e8e710faad55df2e1243d99b53b9a789a1ffd3c39aef0d979dffc543f4691feae68cfa743e51bcf61390
 DIST scala-2.12.4.tar.gz 5999529 BLAKE2B 5dfeadb9ac9562dd825f6a41f9cabdd353f669a58dc3aaec714d6155e9e598296c1e31dcc8956a24a97103e3449fb8f8c3a9ebe5e52dd405572d59ccae89c5e6 SHA512 cad6d54777a3ad4d26df5b4d5cecbbdb4a91ecb17cbf791fe259735221d33f9dd17a14e86f5e3520464078ad9ef68581e722e3c0d7494436bf356c79a9d31697
-EBUILD scala-2.11.1-r2.ebuild 7600 BLAKE2B 685f1612310b01f31762b6f2da7128ca90162a85c7ac207098b9337e897730da4aea9d745f32f70bbb1428830ffcef8ce6b690f211a30a060fbf5ba8574a7d34 SHA512 79ed5258001cddc3abadd0ccde67f4c3dcfb03aa1d129e528799de4cae528037b251c8c7023de62af6d71771ae8e7f92b30a008d1169d5d14aaa842f4ec42cf5
-EBUILD scala-2.11.11.ebuild 7828 BLAKE2B c1675e4c865bb05eac524859562af822a0b4b38f809e5dbe2eb7cc3b8477de8ce42371581a8dad59e9c956bf3aad1186632b7470e6309a066a076ac966f4a9b8 SHA512 45e40934245da2d635ade9340e38c0998de039e5fdb4102ff65b344320bad84d8e2c7f81b737cd5fd986c3d3b53ddc62a38948deff8857a51afb449f515bf2ee
-EBUILD scala-2.11.2-r2.ebuild 7685 BLAKE2B 41622ec4f5fecf0ef53265cf23a960f26b25b5920c616b8fe6074b68ba656e51dcd0ef65f7e3cf4b1d999b5415937d8704d4a80e2e2b37c37fbd5832e2335c50 SHA512 64d0ff156d537895167e431aff3d6a9a94f4f4ff6ce2eadbaa6bed3b3c3cd845c94f2b77af1b93be3535a7646748f649fba06fc1eca119a7a0c31c7a5669b601
-EBUILD scala-2.11.4-r1.ebuild 7665 BLAKE2B 43a631e8ea81c52b5483f70e7168a68f83e9d56d37c7404cf24bb24cc3e07ceebb24c590c01e892e0bec0e475eb2f380b4656c8c12c3e017a8a706d4c7f31933 SHA512 1257ed685a65cbe18e12547610b47408fef8992812b51656c5f15815dff99e4a7090672afbbd698a023301fe3f82ef3c1b542607171ba2da61f754c56d07e317
-EBUILD scala-2.11.4-r2.ebuild 7649 BLAKE2B 96cf98036f1c6f32123ff5ed8f20f0b0d9301d0269d3f3315a005140c87cd9c756ca6b10346f608d12aab4e4271db49f5b973028920ccc8cd4e63d58709546f2 SHA512 c5e997c5941f2f05af8aa1dd45997005923d538d968f9d8df9a360093aec33311bbe3b4caaa2652a7e4773bb5761f332aa74422956af44b0a50b2fc8461669fc
-EBUILD scala-2.11.6-r1.ebuild 7649 BLAKE2B 5d036210eab0eb8f0984214cd443f6f7fca222906107d801f0eef6b7ae99b17ba0147db60395b0e89071fbf5d7961ceadc7540e29d6deff38b2351d96581af52 SHA512 2344fda30695aec8267fb02c28c1196a3f60dffbfb5f6f8810b6cf63440bf49bb563c45a29a1ab02addf962c12e9b6d484b7a4b88c3593ee83940cf6e9b131de
-EBUILD scala-2.11.7-r1.ebuild 7839 BLAKE2B 1497d44270b6ed9c6bfcfcec7f908c2da6395800c901aa771b457c802813d769a9dfa9865bc3132fd987a3b1fff279680c5f80c0c46ed873fffca0e0de3ed2cf SHA512 8521b2a35ad3bed0756317fd5d75931899d13610267013e15bd4288cb007fe1e6c9cbb1d300924c497d4bee300a6a0cc7e384e8c718f3bf48b6eb079e7bf93cd
-EBUILD scala-2.11.8.ebuild 7839 BLAKE2B f338a1be64738f57a69cea206997327a9653b8e5b224526c0b6e1e720e2c9b9464892bc8f4e6e33997af6801066b06494f5cdd61f432a6b18f89380b2fea583e SHA512 3f934239ffb49faeb807fdc1a60a3e94997011879faa00a0f142494c6cf4d3352979f630c39956e9c7fecf6c6cbe9e5288e3d70460bc0b7ff039a063c3fed269
-EBUILD scala-2.12.1.ebuild 7348 BLAKE2B b86b5a29cb4181a782441e6db5b90ff171ec8a859610fcb6640ad5ea0f1c82d2b3b25c6a8e1fc38a67dae4815693211b167e7a779686ea8cdff74e66bb9537f3 SHA512 7791ef4c03afba70dc92eb5d145931056145238b698b6fd4aed1328d9e153f15b196410014144e8c46dd211666e777ab4a91794102d6d04782cbdac7c1780c05
-EBUILD scala-2.12.2.ebuild 7260 BLAKE2B c0a935937293864197e5738d5e07692bf942072fa9cda4b0249d72693c00cd601b0d5c729d68f876f8d5cd4891ec24eeb504a2ad8f72fa9e58ca37efc7fcf370 SHA512 014927e26a8f4d4a2b906fb1b920784ea0c627cfdedb72b528898c097498ccd65f6681f5314912c9feaee1ed56ff54ac6876938a56dfd076c8c48159b0d185f6
-EBUILD scala-2.12.4.ebuild 7269 BLAKE2B 03de936a9c07ba08086110c1cf48f01976e607010016cb73bded00224b47463dbd71f286a770d56a20359db31e864ba3b667ceed4681ba18da5dc9c5aa286caa SHA512 5fa601cade7477c38ecb5acf3b47c92c25e754fcdd1d0e4b114a6f59d4b446deda191b9077b4313252b54abc612ecfe1fe424e16af35eca557db1c2dbf19856d
+EBUILD scala-2.11.1-r2.ebuild 7608 BLAKE2B 8bf202a892071f2392a0a07854145317b7c768619287ca1e4be0b3fcf5aae4ca31f16944791b017e751ba5faa8ccfe2a42a9a84dd92dd25febfe81bb395a99c5 SHA512 bed490fb58b2d882c6c8905416fc5366b1626de013faeda455878064d57c4c7b283e94b7e7b3c92ac63de5cdbaafbd38c44afd9bda9dd22bc07e4bbf419cc521
+EBUILD scala-2.11.11.ebuild 7836 BLAKE2B 451ae5848c76ffe7fa330f3f7307ec3750a07ebaad50b6ee76798e28f6d58e10bdbe796979d9232cd3156103caa8b73a22f2b05190e0e9c4b0e5aa7aac1585b0 SHA512 a33a615bd6dc944453430ca0a0ba93d3711c11bf9475797c08735ddf986a7c8ddb6ceaac03f24f8ad023c3eb61de4ccad76e542a83ecf1aeffde69f4df052d74
+EBUILD scala-2.11.2-r2.ebuild 7693 BLAKE2B 067c5ecdc422b2971b54b12b87c7eee674e0e07a98252946d3e5461dfaf2544796fc931668a614c33804dd257bb1d1cfafb93b7bcd4499800c8c53994f0e5e77 SHA512 4410f23191285f1421297c27ce2a08dd10be00d6cc86f5110e6d3f1687c72f510bbde51b19df3473f0b0867635e3ac192914ee179306244bfe9d9268effc09f9
+EBUILD scala-2.11.4-r1.ebuild 7673 BLAKE2B 99b3ea92ff426f2d154438812af32b261f4ff0ef383e04ab055107fa1864cd154051349b47001445358b1291ff1b5100525323ac31803649151c5d3f03aa6848 SHA512 25b6ad67483d4fba45c7613220b1920c887bbd6865b1818290b4fb529cae69491be6aa85aef74b47e8880b805719c38aef94eb0ffa6e05157f588f0a0b6f81e2
+EBUILD scala-2.11.4-r2.ebuild 7657 BLAKE2B f0229634e3d987fba291f89297f52f5513654357de6f0f582b79be4ade4e56306579f1cec6feb72e63415567aadcf6759fbe9bc7c8fa1059061a371edc0c81ef SHA512 07b86645e7e3aad9dd81d9c1233166b23f3f3aa2094148f229fb3640dee416c451b4d50b2b17c9e788bb65214613cca6a2b76ff9d2a1c01d71dedff790e89230
+EBUILD scala-2.11.6-r1.ebuild 7657 BLAKE2B 30b50bd4afbab6120cd23072f762b0444c80955add077f82ab3ddc26449f1f4373f926677c6897a751fe962b8c114e63163d38ef12ae09e0e8c245aa7cf29755 SHA512 8b40128f3693dfc8489175e8ac79ce1d45880a404577d5416e415ce681087b114c552198ddd09530704fe4eb313ef2fe181151e06c54e65249cf2dc361066f38
+EBUILD scala-2.11.7-r1.ebuild 7847 BLAKE2B 90a0fe6f856c62a96965d9a46bdfff57cd73f0deea580a1bbae48112e22a6c390496358f39688705204fb065198f49c60f4bd9df8984d4ad0a7d5345576ce0ea SHA512 940568d739f42678d9181d108613429c5a5a6bfca5db4b4aeb34c5773505a7b8ecbab5db42d29261baae3973b2530b4886b4d1df883407b5b966ebc0bde42d10
+EBUILD scala-2.11.8.ebuild 7847 BLAKE2B 55f1ae01e1b4265ad52855de5350527512da10a1898f29da41304370b8c5e48741630efa91b2bdf1bad02f5ecf1dc51425010fee72a787d2acc284455aae6d08 SHA512 7ae265e05b3f0cf4300590247bcb92065a6c79a3c1c54f27e1e69481235fb2f57ff3b57b6fd8ad59ca18adcec453a48770f9c274b70cc92def9aee8e4fe9943c
+EBUILD scala-2.12.1.ebuild 7356 BLAKE2B 8b84cb6d082f86b2999e6af29dff5581d671cb9ebb73605c9dfdcfaf5e5feca93a1e7d9a6f26fa9a47bfdeba531af70b3df590dcc00489a7cf0661de79b89362 SHA512 e3ce17cc76e0726241187bff85275f45d1b7645b636ea97c61723f66921a5277410138865c8b8672a7ccf4e60d0bf3c88a3b65c3137d4afebf45edf86452282a
+EBUILD scala-2.12.2.ebuild 7268 BLAKE2B 45b1c9cde361d9a9ed8c8cc24e6471c5e3d6db140794f3fec3a1e45681df620e9d35b9ff40a1dc40af6c311683ebba462975473c0682ee73e8987aca29f703de SHA512 9e4be16fcdc8b774f7e3bf32b0559ff2c0490646fa6a73d64c2af75013fd66624a5560d0bffa298745cd51c763ff18ef6010b6ba2ccd89a75f0391c49d2922c0
+EBUILD scala-2.12.4.ebuild 7277 BLAKE2B 65b20d93fd5e6fe36834161041cb4492e5366ac2b817f8cf17b1e228db24876f1e17ed23ca71da8f1611d854cf21192208d66a4c779d8f0e6535a716c50e434f SHA512 20adffc5b5d159bbd74968a2886b3c4aee56508cdcc761952c0356ec0a67a8e056e5312b4755fe0b92704053d577413cd7a568526ad6996d4e6e9fad0a604f7f
 MISC metadata.xml 478 BLAKE2B d23bdb99144c333f9ae563a08a78c2ccabdefc22e88207f89c0492c444b574677eeec648a38f105fa8e114a8a8a373dc9487cc36e1eb825cdf814bc1d76d402a SHA512 cca0d7d9cb94bfaad3f93382456248626e83ed8358798ff4b11c600cadee3b88b28b89e914fe5d42c16e170969ded1b35efd1af61953476347f620b9a973d718
diff --git a/dev-lang/scala/files/scala-2.11.1-no-git.patch b/dev-lang/scala/files/scala-2.11.1-no-git.patch
index fbec47cd6c69..efef8376a9d1 100644
--- a/dev-lang/scala/files/scala-2.11.1-no-git.patch
+++ b/dev-lang/scala/files/scala-2.11.1-no-git.patch
@@ -1,5 +1,5 @@
---- scala-2.11.1-orig/tools/get-scala-commit-date	2014-05-19 21:01:18.000000000 +1000
-+++ scala-2.11.1/tools/get-scala-commit-date	2014-07-06 16:47:04.772397561 +1000
+--- a/tools/get-scala-commit-date
++++ b/tools/get-scala-commit-date
 @@ -10,8 +10,8 @@
  
  [[ $# -eq 0 ]] || cd "$1"
@@ -11,8 +11,8 @@
  
  # 20120324
  echo "${lastcommitdate//-/}-${lastcommithours//:/}"
---- scala-2.11.1-orig/tools/get-scala-commit-sha	2014-05-19 21:01:18.000000000 +1000
-+++ scala-2.11.1/tools/get-scala-commit-sha	2014-07-06 16:47:25.704741601 +1000
+--- a/tools/get-scala-commit-sha
++++ b/tools/get-scala-commit-sha
 @@ -12,7 +12,7 @@
  
  # printf %016s is not portable for 0-padding, has to be a digit.
diff --git a/dev-lang/scala/files/scala-2.11.11-no-git.patch b/dev-lang/scala/files/scala-2.11.11-no-git.patch
deleted file mode 100644
index b1012626c525..000000000000
--- a/dev-lang/scala/files/scala-2.11.11-no-git.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- scala-2.11.8-orig/tools/get-scala-commit-date	2016-03-04 21:57:12.000000000 +1100
-+++ scala-2.11.8/tools/get-scala-commit-date	2016-09-16 10:29:09.215240534 +1000
-@@ -10,8 +10,8 @@
- 
- [[ $# -eq 0 ]] || cd "$1"
- 
--lastcommitdate=$(git log --format="%ci" HEAD | head -n 1 | cut -d ' ' -f 1)
--lastcommithours=$(git log --format="%ci" HEAD | head -n 1 | cut -d ' ' -f 2)
-+lastcommitdate="2016-03-04"
-+lastcommithours="00:00:00"
- 
- # 20120324
- echo "${lastcommitdate//-/}-${lastcommithours//:/}"
---- scala-2.11.8-orig/tools/get-scala-commit-sha	2016-03-04 21:57:12.000000000 +1100
-+++ scala-2.11.8/tools/get-scala-commit-sha	2016-09-16 10:29:45.566119137 +1000
-@@ -12,7 +12,7 @@
- 
- # printf %016s is not portable for 0-padding, has to be a digit.
- # so we're stuck disassembling it.
--hash=$(git log -1 --format="%H" HEAD)
-+hash="1706a37eb84ec252aea77bccebad3e48448534ad"
- hash=${hash#g}
- hash=${hash:0:10}
- echo "$hash"
diff --git a/dev-lang/scala/files/scala-2.11.2-no-git.patch b/dev-lang/scala/files/scala-2.11.2-no-git.patch
index 87dbb8e4c8e3..56dd69a24b22 100644
--- a/dev-lang/scala/files/scala-2.11.2-no-git.patch
+++ b/dev-lang/scala/files/scala-2.11.2-no-git.patch
@@ -1,5 +1,5 @@
---- scala-2.11.2-orig/tools/get-scala-commit-date	2014-07-21 17:50:18.000000000 +1000
-+++ scala-2.11.2/tools/get-scala-commit-date	2014-10-04 18:33:48.729779264 +1000
+--- a/tools/get-scala-commit-date
++++ b/tools/get-scala-commit-date
 @@ -10,8 +10,8 @@
  
  [[ $# -eq 0 ]] || cd "$1"
@@ -11,8 +11,8 @@
  
  # 20120324
  echo "${lastcommitdate//-/}-${lastcommithours//:/}"
---- scala-2.11.2-orig/tools/get-scala-commit-sha	2014-07-21 17:50:18.000000000 +1000
-+++ scala-2.11.2/tools/get-scala-commit-sha	2014-10-04 18:34:32.541990564 +1000
+--- a/tools/get-scala-commit-sha
++++ b/tools/get-scala-commit-sha
 @@ -12,7 +12,7 @@
  
  # printf %016s is not portable for 0-padding, has to be a digit.
diff --git a/dev-lang/scala/files/scala-2.11.4-no-git.patch b/dev-lang/scala/files/scala-2.11.4-no-git.patch
index 275c140a2a10..f7a78d38c2cf 100644
--- a/dev-lang/scala/files/scala-2.11.4-no-git.patch
+++ b/dev-lang/scala/files/scala-2.11.4-no-git.patch
@@ -1,5 +1,5 @@
---- scala-2.11.4-orig/tools/get-scala-commit-date	2014-10-23 20:06:36.000000000 +1100
-+++ scala-2.11.4/tools/get-scala-commit-date	2014-11-26 21:54:26.064081533 +1100
+--- a/tools/get-scala-commit-date
++++ b/tools/get-scala-commit-date
 @@ -10,8 +10,8 @@
  
  [[ $# -eq 0 ]] || cd "$1"
@@ -11,8 +11,8 @@
  
  # 20120324
  echo "${lastcommitdate//-/}-${lastcommithours//:/}"
---- scala-2.11.4-orig/tools/get-scala-commit-sha	2014-10-23 20:06:36.000000000 +1100
-+++ scala-2.11.4/tools/get-scala-commit-sha	2014-11-26 21:55:12.248629566 +1100
+--- a/tools/get-scala-commit-sha
++++ b/tools/get-scala-commit-sha
 @@ -12,7 +12,7 @@
  
  # printf %016s is not portable for 0-padding, has to be a digit.
diff --git a/dev-lang/scala/files/scala-2.11.6-no-git.patch b/dev-lang/scala/files/scala-2.11.6-no-git.patch
index 231632a3b177..4bc7b7f9fae5 100644
--- a/dev-lang/scala/files/scala-2.11.6-no-git.patch
+++ b/dev-lang/scala/files/scala-2.11.6-no-git.patch
@@ -1,5 +1,5 @@
---- scala-2.11.6-orig/tools/get-scala-commit-date	2015-02-25 12:22:22.000000000 +1100
-+++ scala-2.11.6/tools/get-scala-commit-date	2015-04-17 20:32:27.899791213 +1000
+--- a/tools/get-scala-commit-date
++++ b/tools/get-scala-commit-date
 @@ -10,8 +10,8 @@
  
  [[ $# -eq 0 ]] || cd "$1"
@@ -11,8 +11,8 @@
  
  # 20120324
  echo "${lastcommitdate//-/}-${lastcommithours//:/}"
---- scala-2.11.6-orig/tools/get-scala-commit-sha	2015-02-25 12:22:22.000000000 +1100
-+++ scala-2.11.6/tools/get-scala-commit-sha	2015-04-17 20:32:03.655808474 +1000
+--- a/tools/get-scala-commit-sha
++++ b/tools/get-scala-commit-sha
 @@ -12,7 +12,7 @@
  
  # printf %016s is not portable for 0-padding, has to be a digit.
diff --git a/dev-lang/scala/files/scala-2.11.7-no-git.patch b/dev-lang/scala/files/scala-2.11.7-no-git.patch
index ea337b23849b..f8ca464002e0 100644
--- a/dev-lang/scala/files/scala-2.11.7-no-git.patch
+++ b/dev-lang/scala/files/scala-2.11.7-no-git.patch
@@ -1,5 +1,5 @@
---- scala-2.11.7-orig/tools/get-scala-commit-date	2015-06-23 04:27:36.000000000 +1000
-+++ scala-2.11.7/tools/get-scala-commit-date	2015-07-04 11:53:24.696520666 +1000
+--- a/tools/get-scala-commit-date
++++ b/tools/get-scala-commit-date
 @@ -10,8 +10,8 @@
  
  [[ $# -eq 0 ]] || cd "$1"
@@ -11,8 +11,8 @@
  
  # 20120324
  echo "${lastcommitdate//-/}-${lastcommithours//:/}"
---- scala-2.11.7-orig/tools/get-scala-commit-sha	2015-06-23 04:27:36.000000000 +1000
-+++ scala-2.11.7/tools/get-scala-commit-sha	2015-07-04 11:51:15.598526730 +1000
+--- a/tools/get-scala-commit-sha
++++ b/tools/get-scala-commit-sha
 @@ -12,7 +12,7 @@
  
  # printf %016s is not portable for 0-padding, has to be a digit.
diff --git a/dev-lang/scala/files/scala-2.11.8-no-git.patch b/dev-lang/scala/files/scala-2.11.8-no-git.patch
index b1012626c525..b577dcbc8df3 100644
--- a/dev-lang/scala/files/scala-2.11.8-no-git.patch
+++ b/dev-lang/scala/files/scala-2.11.8-no-git.patch
@@ -1,5 +1,5 @@
---- scala-2.11.8-orig/tools/get-scala-commit-date	2016-03-04 21:57:12.000000000 +1100
-+++ scala-2.11.8/tools/get-scala-commit-date	2016-09-16 10:29:09.215240534 +1000
+--- a/tools/get-scala-commit-date
++++ b/tools/get-scala-commit-date
 @@ -10,8 +10,8 @@
  
  [[ $# -eq 0 ]] || cd "$1"
@@ -11,8 +11,8 @@
  
  # 20120324
  echo "${lastcommitdate//-/}-${lastcommithours//:/}"
---- scala-2.11.8-orig/tools/get-scala-commit-sha	2016-03-04 21:57:12.000000000 +1100
-+++ scala-2.11.8/tools/get-scala-commit-sha	2016-09-16 10:29:45.566119137 +1000
+--- a/tools/get-scala-commit-sha
++++ b/tools/get-scala-commit-sha
 @@ -12,7 +12,7 @@
  
  # printf %016s is not portable for 0-padding, has to be a digit.
diff --git a/dev-lang/scala/files/scala-2.12.1-no-git.patch b/dev-lang/scala/files/scala-2.12.1-no-git.patch
index f5439e35aadc..94cf149da7b6 100644
--- a/dev-lang/scala/files/scala-2.12.1-no-git.patch
+++ b/dev-lang/scala/files/scala-2.12.1-no-git.patch
@@ -1,5 +1,5 @@
---- scala-2.12.1-orig/tools/get-scala-commit-date	2016-12-05 20:45:09.000000000 +1100
-+++ scala-2.12.1/tools/get-scala-commit-date	2016-12-27 16:41:41.695942033 +1100
+--- a/tools/get-scala-commit-date
++++ b/tools/get-scala-commit-date
 @@ -10,13 +10,8 @@
  
  [[ $# -eq 0 ]] || cd "$1"
@@ -16,8 +16,8 @@
  
  # 20120324
  echo "${lastcommitdate//-/}-${lastcommithours//:/}"
---- scala-2.12.1-orig/tools/get-scala-commit-sha	2016-12-05 20:45:09.000000000 +1100
-+++ scala-2.12.1/tools/get-scala-commit-sha	2016-12-27 16:44:07.393422207 +1100
+--- a/tools/get-scala-commit-sha
++++ b/tools/get-scala-commit-sha
 @@ -10,13 +10,7 @@
  
  [[ $# -eq 0 ]] || cd "$1"
diff --git a/dev-lang/scala/files/scala-2.12.1-runner-script.patch b/dev-lang/scala/files/scala-2.12.1-runner-script.patch
index 9115a9810f67..d622e651ef8f 100644
--- a/dev-lang/scala/files/scala-2.12.1-runner-script.patch
+++ b/dev-lang/scala/files/scala-2.12.1-runner-script.patch
@@ -1,5 +1,5 @@
---- scala-2.12.1-orig/src/compiler/scala/tools/ant/templates/tool-unix.tmpl	2016-12-05 20:45:09.000000000 +1100
-+++ scala-2.12.1/src/compiler/scala/tools/ant/templates/tool-unix.tmpl	2016-12-28 11:46:29.120052198 +1100
+--- a/src/compiler/scala/tools/ant/templates/tool-unix.tmpl
++++ b/src/compiler/scala/tools/ant/templates/tool-unix.tmpl
 @@ -197,14 +197,11 @@
  # to java to suppress "." from materializing.
  if [[ "$usebootcp" == "true" ]]; then
diff --git a/dev-lang/scala/files/scala-2.12.2-no-git.patch b/dev-lang/scala/files/scala-2.12.2-no-git.patch
index 1c09bf6ba866..5c921270bd50 100644
--- a/dev-lang/scala/files/scala-2.12.2-no-git.patch
+++ b/dev-lang/scala/files/scala-2.12.2-no-git.patch
@@ -1,5 +1,5 @@
---- scala-2.12.2-orig/project/VersionUtil.scala	2017-04-13 02:16:08.000000000 +1000
-+++ scala-2.12.2/project/VersionUtil.scala	2017-05-04 23:45:50.715285243 +1000
+--- a/project/VersionUtil.scala
++++ b/project/VersionUtil.scala
 @@ -80,18 +80,8 @@
  
      val (dateObj, sha) = {
diff --git a/dev-lang/scala/files/scala-2.12.4-no-git.patch b/dev-lang/scala/files/scala-2.12.4-no-git.patch
index 04e620bcee26..0114e1d42b9e 100644
--- a/dev-lang/scala/files/scala-2.12.4-no-git.patch
+++ b/dev-lang/scala/files/scala-2.12.4-no-git.patch
@@ -1,5 +1,5 @@
---- scala-2.12.4-orig/project/VersionUtil.scala	2017-10-11 09:05:11.000000000 +1100
-+++ scala-2.12.4/project/VersionUtil.scala	2018-01-29 15:58:57.205758665 +1100
+--- a/project/VersionUtil.scala
++++ b/project/VersionUtil.scala
 @@ -2,7 +2,7 @@
  
  import sbt.{stringToProcess => _, _}
diff --git a/dev-lang/scala/scala-2.11.1-r2.ebuild b/dev-lang/scala/scala-2.11.1-r2.ebuild
index 790709d5036d..e2bdb4138ba4 100644
--- a/dev-lang/scala/scala-2.11.1-r2.ebuild
+++ b/dev-lang/scala/scala-2.11.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -129,7 +129,7 @@ java_prepare() {
 			cp -p "${DISTDIR}/${g}" "${S}/${j#${BURI}/*/}" || die
 		done
 		# gentoo patch (by gienah) to stop it calling git log in the build
-		epatch "${FILESDIR}/${P}-no-git.patch"
+		epatch "${FILESDIR}/${PN}-2.11.1-no-git.patch"
 		# Note: to bump scala, some things to try are:
 		# 1. update all the sha1s in JURI
 		# 2. remove the https://dev.gentoo.org/~gienah/snapshots/${P}-maven-deps.tar.gz from SRC_URI
diff --git a/dev-lang/scala/scala-2.11.11.ebuild b/dev-lang/scala/scala-2.11.11.ebuild
index d0bce664a497..9809a7fcfcb2 100644
--- a/dev-lang/scala/scala-2.11.11.ebuild
+++ b/dev-lang/scala/scala-2.11.11.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"
@@ -131,7 +131,7 @@ java_prepare() {
 			cp -p "${DISTDIR}/${g}" "${S}/${j#${BURI}/*/}" || die
 		done
 		# gentoo patch (by gienah) to stop it calling git log in the build
-		epatch "${FILESDIR}/${P}-no-git.patch"
+		epatch "${FILESDIR}/${PN}-2.11.8-no-git.patch"
 		# Note: to bump scala, some things to try are:
 		# 1. update all the sha1s in JURI
 		# 2. remove the https://dev.gentoo.org/~gienah/snapshots/${P}-maven-deps.tar.gz from SRC_URI
diff --git a/dev-lang/scala/scala-2.11.2-r2.ebuild b/dev-lang/scala/scala-2.11.2-r2.ebuild
index ffdaa3e3ca82..200cda5accde 100644
--- a/dev-lang/scala/scala-2.11.2-r2.ebuild
+++ b/dev-lang/scala/scala-2.11.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -129,7 +129,7 @@ java_prepare() {
 			cp -p "${DISTDIR}/${g}" "${S}/${j#${BURI}/*/}" || die
 		done
 		# gentoo patch (by gienah) to stop it calling git log in the build
-		epatch "${FILESDIR}/${P}-no-git.patch"
+		epatch "${FILESDIR}/${PN}-2.11.2-no-git.patch"
 		# Note: to bump scala, some things to try are:
 		# 1. update all the sha1s in JURI
 		# 2. remove the https://dev.gentoo.org/~gienah/snapshots/${P}-maven-deps.tar.gz from SRC_URI
diff --git a/dev-lang/scala/scala-2.11.4-r1.ebuild b/dev-lang/scala/scala-2.11.4-r1.ebuild
index 067a60efc007..5ff29fa215e6 100644
--- a/dev-lang/scala/scala-2.11.4-r1.ebuild
+++ b/dev-lang/scala/scala-2.11.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -129,7 +129,7 @@ java_prepare() {
 			cp -p "${DISTDIR}/${g}" "${S}/${j#${BURI}/*/}" || die
 		done
 		# gentoo patch (by gienah) to stop it calling git log in the build
-		epatch "${FILESDIR}/${P}-no-git.patch"
+		epatch "${FILESDIR}/${PN}-2.11.4-no-git.patch"
 		# Note: to bump scala, some things to try are:
 		# 1. update all the sha1s in JURI
 		# 2. remove the https://dev.gentoo.org/~gienah/snapshots/${P}-maven-deps.tar.gz from SRC_URI
diff --git a/dev-lang/scala/scala-2.11.4-r2.ebuild b/dev-lang/scala/scala-2.11.4-r2.ebuild
index 2ce90ddd329c..6015a9c1b7c5 100644
--- a/dev-lang/scala/scala-2.11.4-r2.ebuild
+++ b/dev-lang/scala/scala-2.11.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -129,7 +129,7 @@ java_prepare() {
 			cp -p "${DISTDIR}/${g}" "${S}/${j#${BURI}/*/}" || die
 		done
 		# gentoo patch (by gienah) to stop it calling git log in the build
-		epatch "${FILESDIR}/${P}-no-git.patch"
+		epatch "${FILESDIR}/${PN}-2.11.4-no-git.patch"
 		# Note: to bump scala, some things to try are:
 		# 1. update all the sha1s in JURI
 		# 2. remove the https://dev.gentoo.org/~gienah/snapshots/${P}-maven-deps.tar.gz from SRC_URI
diff --git a/dev-lang/scala/scala-2.11.6-r1.ebuild b/dev-lang/scala/scala-2.11.6-r1.ebuild
index 16f6ccbb8cfe..b31e50091cd4 100644
--- a/dev-lang/scala/scala-2.11.6-r1.ebuild
+++ b/dev-lang/scala/scala-2.11.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -129,7 +129,7 @@ java_prepare() {
 			cp -p "${DISTDIR}/${g}" "${S}/${j#${BURI}/*/}" || die
 		done
 		# gentoo patch (by gienah) to stop it calling git log in the build
-		epatch "${FILESDIR}/${P}-no-git.patch"
+		epatch "${FILESDIR}/${PN}-2.11.6-no-git.patch"
 		# Note: to bump scala, some things to try are:
 		# 1. update all the sha1s in JURI
 		# 2. remove the https://dev.gentoo.org/~gienah/snapshots/${P}-maven-deps.tar.gz from SRC_URI
diff --git a/dev-lang/scala/scala-2.11.7-r1.ebuild b/dev-lang/scala/scala-2.11.7-r1.ebuild
index a0adcc1965c3..25ec70aafff7 100644
--- a/dev-lang/scala/scala-2.11.7-r1.ebuild
+++ b/dev-lang/scala/scala-2.11.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -129,7 +129,7 @@ java_prepare() {
 			cp -p "${DISTDIR}/${g}" "${S}/${j#${BURI}/*/}" || die
 		done
 		# gentoo patch (by gienah) to stop it calling git log in the build
-		epatch "${FILESDIR}/${P}-no-git.patch"
+		epatch "${FILESDIR}/${PN}-2.11.7-no-git.patch"
 		# Note: to bump scala, some things to try are:
 		# 1. update all the sha1s in JURI
 		# 2. remove the https://dev.gentoo.org/~gienah/snapshots/${P}-maven-deps.tar.gz from SRC_URI
diff --git a/dev-lang/scala/scala-2.11.8.ebuild b/dev-lang/scala/scala-2.11.8.ebuild
index 140be797d660..ae3518042cf2 100644
--- a/dev-lang/scala/scala-2.11.8.ebuild
+++ b/dev-lang/scala/scala-2.11.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -129,7 +129,7 @@ java_prepare() {
 			cp -p "${DISTDIR}/${g}" "${S}/${j#${BURI}/*/}" || die
 		done
 		# gentoo patch (by gienah) to stop it calling git log in the build
-		epatch "${FILESDIR}/${P}-no-git.patch"
+		epatch "${FILESDIR}/${PN}-2.11.8-no-git.patch"
 		# Note: to bump scala, some things to try are:
 		# 1. update all the sha1s in JURI
 		# 2. remove the https://dev.gentoo.org/~gienah/snapshots/${P}-maven-deps.tar.gz from SRC_URI
diff --git a/dev-lang/scala/scala-2.12.1.ebuild b/dev-lang/scala/scala-2.12.1.ebuild
index 38b815fd3f62..f38b2a17af21 100644
--- a/dev-lang/scala/scala-2.12.1.ebuild
+++ b/dev-lang/scala/scala-2.12.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -134,7 +134,7 @@ src_prepare() {
 			cp -p "${DISTDIR}/${g}" "${S}/${j#${BURI}/*/}" || die
 		done
 		# gentoo patch (by gienah) to stop it calling git log in the build
-		eapply "${FILESDIR}/${P}-no-git.patch"
+		eapply "${FILESDIR}/${PN}-2.12.1-no-git.patch"
 
 		# https://issues.scala-lang.org/browse/SI-10098
 		eapply "${FILESDIR}/${PN}-2.12.1-runner-script.patch"
diff --git a/dev-lang/scala/scala-2.12.2.ebuild b/dev-lang/scala/scala-2.12.2.ebuild
index 4670aac74258..838d1769cc1e 100644
--- a/dev-lang/scala/scala-2.12.2.ebuild
+++ b/dev-lang/scala/scala-2.12.2.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"
@@ -135,7 +135,7 @@ src_prepare() {
 		done
 
 		# gentoo patch (by gienah) to stop it calling git log in the build
-		eapply "${FILESDIR}/${P}-no-git.patch"
+		eapply "${FILESDIR}/${PN}-2.12.2-no-git.patch"
 
 		local SBT_PVR="$(java-config --query=PVR --package=sbt)"
 		sed -e "s@sbt.version=0.13.11@sbt.version=${SBT_PVR}@" \
diff --git a/dev-lang/scala/scala-2.12.4.ebuild b/dev-lang/scala/scala-2.12.4.ebuild
index 062f48a8746e..767fdd498239 100644
--- a/dev-lang/scala/scala-2.12.4.ebuild
+++ b/dev-lang/scala/scala-2.12.4.ebuild
@@ -134,7 +134,7 @@ src_prepare() {
 		done
 
 		# gentoo patch (by gienah) to stop it calling git log in the build
-		eapply "${FILESDIR}/${P}-no-git.patch"
+		eapply "${FILESDIR}/${PN}-2.12.4-no-git.patch"
 
 		local SBT_PVR="$(java-config --query=PVR --package=sbt)"
 		sed -e "s@sbt.version=0.13.11@sbt.version=${SBT_PVR}@" \
diff --git a/dev-lang/srf/Manifest b/dev-lang/srf/Manifest
index 286adc7ebb89..ff7fb220d557 100644
--- a/dev-lang/srf/Manifest
+++ b/dev-lang/srf/Manifest
@@ -1,4 +1,3 @@
 DIST srf-1.0.tar.gz 222493 BLAKE2B 09fb3e767e04ac735245e973d225616b0e527aa2ded49c9350c592284e2ecd840b439af61d27e67dfa3c932a320de787c371354503ed40a8af2a686dcf87b127 SHA512 420f691a937fa30220cd436faaf75299991452fd5f026dcc7aaa767e276eb245cb8eb88d875911826b66abad62fa10326b694301b4372b91e4ac20bf32c78388
-EBUILD srf-1.0-r1.ebuild 620 BLAKE2B 82d5d3a9cf7a4d28a71ae73a7462000d4c1625f3e370e401d7f7b54da61fd4e1ae6624c4999534500c3a0e04a2e37550b7032ac0db0bac2f10d3cf322926d003 SHA512 f2b2d08dae73966b6d2e09ba121cdd5e3e8e9ca1bdf932467b3f81da1e5b57499fe4033c6e12ee4df9d216afe835a7bb663141f159fec1e4eae77e92a585c791
 EBUILD srf-1.0-r2.ebuild 622 BLAKE2B 8778389f468e7539b6a86a6d5068fc57be5da7b42c57a0e236dc4d06a776a2c0902b76fe12177a9baae196c45dd089eeb3b591353ed4635cdcf376cbf92487f8 SHA512 55c1d574ea60d0bcb7a6b79d9e734c11b2ae0b3f62405266db98af196a43e82da2b77906736fe646ddc90466cab42df0385570e9b76fb53bb5c1ce782fa93261
 MISC metadata.xml 418 BLAKE2B 53a8d8a67492aa4c363751eae8327f45c17cd77e5ce1cc9dadc8e017397e4f569150a07e6e20ecc4c411b7fbb3fed8b4690bf6367067360e03d7a74aa2079df3 SHA512 16fea93364e4fbc9deadade67c2d2a69c45f53607315659b0c682497f8d01ce0f85a808e592cb3d67f521b5fa12f9b73b427d030923da4a735eb83baa80473b2
diff --git a/dev-lang/srf/srf-1.0-r1.ebuild b/dev-lang/srf/srf-1.0-r1.ebuild
deleted file mode 100644
index 62eaec12c790..000000000000
--- a/dev-lang/srf/srf-1.0-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="The Simple Recursive Functions programming language"
-HOMEPAGE="http://www.stratigery.com/srf.html"
-SRC_URI="http://www.stratigery.com/srf.html/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~x86-linux ~ppc-macos ~amd64"
-IUSE=""
-
-DEPEND="
-	sys-devel/flex
-	virtual/yacc"
-RDEPEND=""
-
-src_prepare() {
-	# Remove CVS directory Bug#371821
-	ecvs_clean
-}
-
-src_install() {
-	dobin srf rfunc/rfunc
-	doman srf.1
-	dohtml srf.html
-	dodoc README
-	docinto examples
-	dodoc examples/*
-}
diff --git a/dev-lang/swi-prolog/Manifest b/dev-lang/swi-prolog/Manifest
index 72a0eecac6bf..50fd7d9062a7 100644
--- a/dev-lang/swi-prolog/Manifest
+++ b/dev-lang/swi-prolog/Manifest
@@ -3,28 +3,16 @@ DIST swi-prolog-6.6.6-gentoo-patchset-0.tar.gz 1590 BLAKE2B 0d214015690f62c2b792
 DIST swi-prolog-7.2.3-gentoo-patchset-1.tar.gz 1875 BLAKE2B a3ff00f596cf5af67f9afb6d376dce70fbb56aa544acbf7b7c14639c11bd9cd77c5080617976245021844fba266c781f913dfc96b2f50b57703e498ca7941ad4 SHA512 3506f4168d52f7d3539cd753c5153750df8c3239b78ffac1784c634b585d5fb0c825700e77abc9c1f467af71473ae1861eef629ebdf76b7c783d276c393f40fc
 DIST swi-prolog-7.4.2-gentoo-patchset-3.tar.gz 3256 BLAKE2B d7997d7307db738f0948a89f5e1cee195be4424737e50df915a293c7cb1b3bc1ce09ebd372e8c5f24c95df7335676f12cdc04749de25396eac71471704cfc579 SHA512 bc1b408e311d10ab59fa221bf5ef3d3cb1003a3edcdd13fd000cbc647117458e1f130e960cc37968481ccc2047529ca128159fac8e0ee75114022ed439905cce
 DIST swipl-7.2.3.tar.gz 16192142 BLAKE2B 680047a4cbb7d113e7c232f58dcd45c8739dd82ca622de70c539930a2daf208faa07b49c67f19248e29ad1a7539abc815c50c64ca0b814a2b42284bf501956a6 SHA512 da27a6b171d3b471401f1a91e86a4dbe98973d8a1db8c72aa27e452311d08b893b01a1de8f9f4dafcdac460774b4ea980050256d37284546941e1bdf84f8cd7b
-DIST swipl-7.4.1.tar.gz 16498678 BLAKE2B 23889a9c9d25079f53f777ced13c293bb4ed5bcabf8bbe6f97cef674849368808d7d3321bbad1e3bf316c52eeabe5fb98aad3d49df9ff34b018685577958dcda SHA512 a3e49cc43aed05808901860fe302711d2850b23740a987d1071822d7b4888aca30a8b5f7c94e1e7191057a031f45adeedb0fbff9139d0294e6ec07032da6798d
 DIST swipl-7.4.2.tar.gz 16496738 BLAKE2B a8f45c4277e48c0aa38f8b278b466dcb9e0a776325a9ed9e08c252660671d3ee0ee441978394682276b3fb9b0eca73ad10e02aba4671630bef0a1e8f813dd3c5 SHA512 5b526d4f079e7a36184f871bb7341330bcadaeee2a69af981fbcad71ae76c77331b1f157174ac2b31d96e069dc530afa86c024de6709edd9dc8baee3b4ebffb3
-DIST swipl-7.6.0.tar.gz 16763479 BLAKE2B 6262f213a918bea1f2ea250df791db4b0675b084ed8b78b4164a31a4a028bb86dd64154dc77aa4f111f2fb43ba645044c232e7213c7d3d00cff4892d20cdfce1 SHA512 4c9a857bcb612361e8248a39616e07fe36d8b68e1099e00917320a0177b454bc13f89f32fee1d961a1facd46bef3814f717dbaf12ab4f00ca8ea313242feb8bf
-DIST swipl-7.6.1.tar.gz 16764536 BLAKE2B a493b103d9d6206db5a6c895ec1ff6237a122dd611a79803218a46e5611812fcdcf794b887018d4f7bea4d03315581234f99e8cb1a57d11ca502454666b418c4 SHA512 60b6f37b7449941b31ea1ca20372dadcd27585611c8040bb9155fd0c2e3802c554039135e3a084ed56ff9b20842ee607dcaa425afe55421bba00ee1c6cd169a4
-DIST swipl-7.6.2.tar.gz 16765119 BLAKE2B 242d093d7525aa9beeab28ca5cd10080490a93ecc18b62ff945b9d59266aa8bc31a66065b1742b76f336ee5af33994a3c41b0009665f2e29d83efa03fc5d3041 SHA512 9d93cdf44bbb9628cee42eae562ee945202ed0d454f9e433247a0b9b49eee070d3a76f7ceff002c4d13d15720e40e6860adc19581906b8b8ecaac3094192ab5a
 DIST swipl-7.6.3.tar.gz 16772590 BLAKE2B 644be801e290ec9d949a9b7462256a35e11cf9afd62d0b62c315e3620a3943809f58698a23f279454e00299f7b7f7b91e8d9694a139e8c424cb2f83a4efc7a52 SHA512 d84af1a565935af9934c6b75192bb2dd87388ee8fe793ade35d5549a95ec5eb83da6b10508766e795f88393fededea4ec7a3a0c2f0f685d96ab615e171d7d1f4
 DIST swipl-7.6.4.tar.gz 16777875 BLAKE2B 94409966362e649f4748b94b4ec25415bb827c7742aa39453d8e37db4ce992a65ad2d054ded4e651f2a9abe3a9438285bc9c9c895437c087ae6cf88f4afae9ca SHA512 f0ed16e4f1436115651c38a0bb37008d0dadad5a19b0f09894fcfc51dd3d429f86488e89cce00788c3c36cc2f0cd2957f92df47d5441133a6f8ea9d91ca5470f
 DIST swipl-7.7.10.tar.gz 16800970 BLAKE2B c9d8904734bb5a6d20adad8203cec6682e9bd97a343d887d1c03dfb735f32e5794ab0631a76e69fe5f0c7d2e76cd21be06471c7df6e4bc585882b7de1308ec70 SHA512 55e0b129424c2ba0f7a8151b85eaf3de6ce7e16ed01626fae245eb0ee754dcfa7bfbd3a30d00da7e2df72b8d2899e5354900e27b47ffe0401bc26a0b594f9d30
 DIST swipl-7.7.11.tar.gz 16935711 BLAKE2B 5ccac7b91ef35d132451b101a53b9977067e28d4239ecf25185e4140d728a711a8fd9dfe73bf51c47a2935c51637c0ad61780997e0b9fa13e6298d815c46071a SHA512 28bffdc7d7c431aa59a996faddac941024d3923c22793b890938475f041e2d40d9218b10779e5ad01c91093234dfd21ea3339756950dd8401adeb5783c3e3aa3
-DIST swipl-7.7.8.tar.gz 16791278 BLAKE2B 6a2f27c02c5f2a4247b44961eb438e579be901a8badac3cf238adb63fdd1b13bf2400993bac1af1e509476b40b158a0aa6d66e4e0440eb67f745a33580266b47 SHA512 007b683d56d1ee3d5f5637819879141bae9d5a8738a613ed93a3a62a7a43674de39d0e1a3c1f6112fd6f9ab998e5f4bfed8b1abba7d95ceec16eaba73a627dee
-DIST swipl-7.7.9.tar.gz 16794383 BLAKE2B edb99cd235529de319557d9126e459b5c7586517bcafd6e9a8125a4acf0fea1252a4506eae359604156c57af05c1924b9de2e2a3e79573f7e446e014ae55e1c6 SHA512 d93f0a97c4710ff396514f9bbf45dd09faddf3db528563f65cf0a93ae0a8400c603cb13d0707dbf70ffb62f0c981e6823c3c6487c1d5600620fd551c877f6b01
 EBUILD swi-prolog-6.6.6.ebuild 2799 BLAKE2B 47c0d56dae0ce19be9efd09122ef8e6e3655abd3459cd25a9a0cf4734fbb132b8725c79775942da8cb2c5eb40bc35f4c0b5a39064a5e41387d4480379fd71435 SHA512 1d30fcb84653a0cdf7cf4f5a78898d5fb29f939095d19a21324a9587ee6ca98543ae16d564ff8880cdf99c6d5a091c2f0e5dc79074ceadc5a7cd3fe340609d22
 EBUILD swi-prolog-7.2.3-r1.ebuild 3170 BLAKE2B ca7604653a23dbc9158e96e54684482fd1c82e6bea8f9753e73c91d46df95a105d70114c0aae8c86e8b9ef45debf97116755b4fc48ecdae95680045ae60035ba SHA512 fe35661ef51094ddf0aff61659f33de5be0252216b94f45e658215146dd53379881f7077c20ace1ef67b70ad9d7128ccd26e122392a1100ab8db195c9324867a
-EBUILD swi-prolog-7.4.1.ebuild 3337 BLAKE2B 6ec047c27c5f76f8cf1fe29e6c8f45d051f1b7d565217af160a022d0b3b45ecd4c18506348ec2d1d19d498953185b22941814a05559b7fa20b3666f48ede932c SHA512 d3b2fb20a92a39d5b4927cc4e2056a1ba3c66978467050817e84cfe46d795989d7d64721bb3b64a8b632dfa359e308d60db7b2c83efc2298c8318ef6314f08e9
 EBUILD swi-prolog-7.4.2.ebuild 3395 BLAKE2B 0ab38dbbfbea20db81e516a60163dae56a391bee23cd6a91df98241d684880ae398247a2fb7b42b33680690c74d438d3204e56f42a81935e461a6017bf013a75 SHA512 25ff3ede7c3524a670f9f6cb7e617813826c8ef691141b42f7f07857573a69401f4555e48c98eaff98f4c30bca1938fda4b1f9e9e119ae83d8a71f517a4d0ba2
-EBUILD swi-prolog-7.6.0.ebuild 3392 BLAKE2B 77fca0aec35200f39f2dd60fccd13c9d6fbe78f14c03c0f57a5d42e9b280285b497e612d364352eb763850b38bc7af626172e76752211f195f2fa54f5d8157e9 SHA512 486bc74f0e77862452cf7bc63687cb1ba1395b9d10a2bb50dcb6334ad986d09153595a325703dc9413a2b22675aa838c66c94b5fe4ca582e1418701a31da002a
-EBUILD swi-prolog-7.6.1.ebuild 3392 BLAKE2B 77fca0aec35200f39f2dd60fccd13c9d6fbe78f14c03c0f57a5d42e9b280285b497e612d364352eb763850b38bc7af626172e76752211f195f2fa54f5d8157e9 SHA512 486bc74f0e77862452cf7bc63687cb1ba1395b9d10a2bb50dcb6334ad986d09153595a325703dc9413a2b22675aa838c66c94b5fe4ca582e1418701a31da002a
-EBUILD swi-prolog-7.6.2.ebuild 3392 BLAKE2B 77fca0aec35200f39f2dd60fccd13c9d6fbe78f14c03c0f57a5d42e9b280285b497e612d364352eb763850b38bc7af626172e76752211f195f2fa54f5d8157e9 SHA512 486bc74f0e77862452cf7bc63687cb1ba1395b9d10a2bb50dcb6334ad986d09153595a325703dc9413a2b22675aa838c66c94b5fe4ca582e1418701a31da002a
 EBUILD swi-prolog-7.6.3.ebuild 3392 BLAKE2B 77fca0aec35200f39f2dd60fccd13c9d6fbe78f14c03c0f57a5d42e9b280285b497e612d364352eb763850b38bc7af626172e76752211f195f2fa54f5d8157e9 SHA512 486bc74f0e77862452cf7bc63687cb1ba1395b9d10a2bb50dcb6334ad986d09153595a325703dc9413a2b22675aa838c66c94b5fe4ca582e1418701a31da002a
 EBUILD swi-prolog-7.6.4.ebuild 3392 BLAKE2B 1754139d8ff2862994d2908e2ce845c3c197b74c14522e971ad91b3199ed84f42daf83280287ac51eb03bb53408f1cabfc955bfeb5146918ae51ea4efadca070 SHA512 038d4077bf8733bb57fe8cda0dac04a194f6aac809b30adc21d0b2010750faba4e1db368aff83a766cad6b76853e772b426b9bd76a71ef846964777e90a90c10
 EBUILD swi-prolog-7.7.10.ebuild 3391 BLAKE2B 0593fc8bdac10ee84400ed3e3504e28ac352134adff0344047c5244b11caab0cf04f53e091566c4ba107abb2095d4696966403e2b2427bde48f41e54ee4ea986 SHA512 00971bbad1e54e00f995bbf76839463dfb38e72ec9daa8c16701c47ceacda7a0760d31b8086a14f9c4e52c258f454ab1b1ce9af68bb3cf95f133f8a5cbdce997
 EBUILD swi-prolog-7.7.11.ebuild 3391 BLAKE2B 0593fc8bdac10ee84400ed3e3504e28ac352134adff0344047c5244b11caab0cf04f53e091566c4ba107abb2095d4696966403e2b2427bde48f41e54ee4ea986 SHA512 00971bbad1e54e00f995bbf76839463dfb38e72ec9daa8c16701c47ceacda7a0760d31b8086a14f9c4e52c258f454ab1b1ce9af68bb3cf95f133f8a5cbdce997
-EBUILD swi-prolog-7.7.8.ebuild 3391 BLAKE2B 0593fc8bdac10ee84400ed3e3504e28ac352134adff0344047c5244b11caab0cf04f53e091566c4ba107abb2095d4696966403e2b2427bde48f41e54ee4ea986 SHA512 00971bbad1e54e00f995bbf76839463dfb38e72ec9daa8c16701c47ceacda7a0760d31b8086a14f9c4e52c258f454ab1b1ce9af68bb3cf95f133f8a5cbdce997
-EBUILD swi-prolog-7.7.9.ebuild 3391 BLAKE2B 0593fc8bdac10ee84400ed3e3504e28ac352134adff0344047c5244b11caab0cf04f53e091566c4ba107abb2095d4696966403e2b2427bde48f41e54ee4ea986 SHA512 00971bbad1e54e00f995bbf76839463dfb38e72ec9daa8c16701c47ceacda7a0760d31b8086a14f9c4e52c258f454ab1b1ce9af68bb3cf95f133f8a5cbdce997
 MISC metadata.xml 367 BLAKE2B 07c7ff161f07b547325566650cd882c90dbe98ac5afc0015d68bc0338cebd678ac82c3a45edd3e4f7e613d5d493324899dc8e3b4ca448f447744f439e60458fd SHA512 bacbb17fc3518d3bf845d097d17dba772a745fd7343ab6e8c751a417a540c8c003f29b86c66374bee538d7a5d96ab95e67b1c619d47f80d0e332482daabee74a
diff --git a/dev-lang/swi-prolog/swi-prolog-7.4.1.ebuild b/dev-lang/swi-prolog/swi-prolog-7.4.1.ebuild
deleted file mode 100644
index 8c3294b16729..000000000000
--- a/dev-lang/swi-prolog/swi-prolog-7.4.1.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils flag-o-matic java-pkg-opt-2 multilib
-
-PATCHSET_VER="0"
-
-DESCRIPTION="free, small, and standard compliant Prolog compiler"
-HOMEPAGE="http://www.swi-prolog.org/"
-SRC_URI="http://www.swi-prolog.org/download/stable/src/swipl-${PV}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="archive berkdb debug doc +gmp hardened java +libedit libressl minimal odbc readline ssl static-libs test uuid zlib X"
-
-RDEPEND="sys-libs/ncurses:=
-	archive? ( app-arch/libarchive )
-	berkdb? ( >=sys-libs/db-4:= )
-	zlib? ( sys-libs/zlib )
-	odbc? ( dev-db/unixODBC )
-	readline? ( sys-libs/readline:= )
-	libedit? ( dev-libs/libedit )
-	gmp? ( dev-libs/gmp:0 )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0 )
-		libressl? ( dev-libs/libressl )
-	)
-	java? ( >=virtual/jdk-1.5:= )
-	uuid? ( dev-libs/ossp-uuid )
-	X? (
-		virtual/jpeg:0
-		x11-libs/libX11
-		x11-libs/libXft
-		x11-libs/libXpm
-		x11-libs/libXt
-		x11-libs/libICE
-		x11-libs/libSM )"
-
-DEPEND="${RDEPEND}
-	X? ( x11-proto/xproto )
-	java? ( test? ( =dev-java/junit-3.8* ) )"
-
-S="${WORKDIR}/swipl-${PV}"
-
-src_prepare() {
-	EPATCH_FORCE=yes
-	EPATCH_SUFFIX=patch
-	if [[ -d "${WORKDIR}"/${PV} ]] ; then
-		epatch "${WORKDIR}"/${PV}
-	fi
-
-	if ! use uuid; then
-		mv packages/clib/uuid.pl packages/clib/uuid.pl.unused || die
-	fi
-
-	# OSX/Intel ld doesn't like an archive without table of contents
-	sed -i -e 's/-cru/-scru/' packages/nlp/libstemmer_c/Makefile.pl || die
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-	use ppc && append-flags -mno-altivec
-	use hardened && append-flags -fno-unit-at-a-time
-	use debug && append-flags -DO_DEBUG
-
-	# ARCH is used in the configure script to figure out host and target
-	# specific stuff
-	export ARCH=${CHOST}
-
-	export CC_FOR_BUILD=$(tc-getBUILD_CC)
-
-	cd "${S}"/src || die
-	econf \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		$(use_enable gmp) \
-		$(use_enable static-libs static) \
-		--enable-shared \
-		--enable-custom-flags COFLAGS="${CFLAGS}"
-
-	if ! use minimal ; then
-		local jpltestconf
-		if use java && use test ; then
-			jpltestconf="--with-junit=$(java-config --classpath junit)"
-		fi
-
-		cd "${S}/packages" || die
-		econf \
-			--libdir="${EPREFIX}"/usr/$(get_libdir) \
-			$(use_with archive) \
-			$(use_with berkdb bdb ) \
-			$(use_with java jpl) \
-			${jpltestconf} \
-			$(use_with libedit) \
-			$(use_with odbc) \
-			$(use_with readline) \
-			$(use_with ssl) \
-			$(use_with X xpce) \
-			$(use_with zlib) \
-			COFLAGS='"${CFLAGS}"'
-	fi
-}
-
-src_compile() {
-	cd "${S}"/src || die
-	emake
-
-	if ! use minimal ; then
-		cd "${S}/packages" || die
-		emake
-		./report-failed || die "Cannot report failed packages"
-	fi
-}
-
-src_test() {
-	cd "${S}/src" || die
-	emake check
-
-	if ! use minimal ; then
-		unset DISPLAY
-		cd "${S}/packages" || die
-		emake \
-			USE_PUBLIC_NETWORK_TESTS=false \
-			USE_ODBC_TESTS=false \
-			check
-		./report-failed || die
-	fi
-}
-
-src_install() {
-	emake -C src DESTDIR="${D}" install
-
-	if ! use minimal ; then
-		emake -C packages DESTDIR="${D}" install
-		if use doc ; then
-			emake -C packages DESTDIR="${D}" html-install
-		fi
-		./packages/report-failed || die "Cannot report failed packages"
-	fi
-
-	dodoc ReleaseNotes/relnotes-5.10 INSTALL README.md VERSION
-}
diff --git a/dev-lang/swi-prolog/swi-prolog-7.6.0.ebuild b/dev-lang/swi-prolog/swi-prolog-7.6.0.ebuild
deleted file mode 100644
index ac17db45d196..000000000000
--- a/dev-lang/swi-prolog/swi-prolog-7.6.0.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils flag-o-matic java-pkg-opt-2 multilib
-
-PATCHSET_VER="0"
-
-DESCRIPTION="free, small, and standard compliant Prolog compiler"
-HOMEPAGE="http://www.swi-prolog.org/"
-SRC_URI="http://www.swi-prolog.org/download/stable/src/swipl-${PV}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="archive berkdb debug doc +gmp hardened java +libedit libressl minimal odbc pcre readline ssl static-libs test uuid zlib X"
-
-RDEPEND="sys-libs/ncurses:=
-	archive? ( app-arch/libarchive )
-	berkdb? ( >=sys-libs/db-4:= )
-	zlib? ( sys-libs/zlib )
-	odbc? ( dev-db/unixODBC )
-	pcre? ( dev-libs/libpcre )
-	readline? ( sys-libs/readline:= )
-	libedit? ( dev-libs/libedit )
-	gmp? ( dev-libs/gmp:0 )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0 )
-		libressl? ( dev-libs/libressl )
-	)
-	java? ( >=virtual/jdk-1.7:= )
-	uuid? ( dev-libs/ossp-uuid )
-	X? (
-		virtual/jpeg:0
-		x11-libs/libX11
-		x11-libs/libXft
-		x11-libs/libXpm
-		x11-libs/libXt
-		x11-libs/libICE
-		x11-libs/libSM )"
-
-DEPEND="${RDEPEND}
-	X? ( x11-proto/xproto )
-	java? ( test? ( =dev-java/junit-3.8* ) )"
-
-S="${WORKDIR}/swipl-${PV}"
-
-src_prepare() {
-	EPATCH_FORCE=yes
-	EPATCH_SUFFIX=patch
-	if [[ -d "${WORKDIR}"/${PV} ]] ; then
-		epatch "${WORKDIR}"/${PV}
-	fi
-
-	if ! use uuid; then
-		mv packages/clib/uuid.pl packages/clib/uuid.pl.unused || die
-	fi
-
-	# OSX/Intel ld doesn't like an archive without table of contents
-	sed -i -e 's/-cru/-scru/' packages/nlp/libstemmer_c/Makefile.pl || die
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-	use ppc && append-flags -mno-altivec
-	use hardened && append-flags -fno-unit-at-a-time
-	use debug && append-flags -DO_DEBUG
-
-	# ARCH is used in the configure script to figure out host and target
-	# specific stuff
-	export ARCH=${CHOST}
-
-	export CC_FOR_BUILD=$(tc-getBUILD_CC)
-
-	cd "${S}"/src || die
-	econf \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		$(use_enable gmp) \
-		$(use_enable static-libs static) \
-		--enable-shared \
-		--enable-custom-flags COFLAGS="${CFLAGS}"
-
-	if ! use minimal ; then
-		local jpltestconf
-		if use java && use test ; then
-			jpltestconf="--with-junit=$(java-config --classpath junit)"
-		fi
-
-		cd "${S}/packages" || die
-		econf \
-			--libdir="${EPREFIX}"/usr/$(get_libdir) \
-			$(use_with archive) \
-			$(use_with berkdb bdb ) \
-			$(use_with java jpl) \
-			${jpltestconf} \
-			$(use_with libedit) \
-			$(use_with pcre) \
-			$(use_with odbc) \
-			$(use_with readline) \
-			$(use_with ssl) \
-			$(use_with X xpce) \
-			$(use_with zlib) \
-			COFLAGS='"${CFLAGS}"'
-	fi
-}
-
-src_compile() {
-	cd "${S}"/src || die
-	emake
-
-	if ! use minimal ; then
-		cd "${S}/packages" || die
-		emake
-		./report-failed || die "Cannot report failed packages"
-	fi
-}
-
-src_test() {
-	cd "${S}/src" || die
-	emake check
-
-	if ! use minimal ; then
-		unset DISPLAY
-		cd "${S}/packages" || die
-		emake \
-			USE_PUBLIC_NETWORK_TESTS=false \
-			USE_ODBC_TESTS=false \
-			check
-		./report-failed || die
-	fi
-}
-
-src_install() {
-	emake -C src DESTDIR="${D}" install
-
-	if ! use minimal ; then
-		emake -C packages DESTDIR="${D}" install
-		if use doc ; then
-			emake -C packages DESTDIR="${D}" html-install
-		fi
-		./packages/report-failed || die "Cannot report failed packages"
-	fi
-
-	dodoc ReleaseNotes/relnotes-5.10 INSTALL README.md VERSION
-}
diff --git a/dev-lang/swi-prolog/swi-prolog-7.6.1.ebuild b/dev-lang/swi-prolog/swi-prolog-7.6.1.ebuild
deleted file mode 100644
index ac17db45d196..000000000000
--- a/dev-lang/swi-prolog/swi-prolog-7.6.1.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils flag-o-matic java-pkg-opt-2 multilib
-
-PATCHSET_VER="0"
-
-DESCRIPTION="free, small, and standard compliant Prolog compiler"
-HOMEPAGE="http://www.swi-prolog.org/"
-SRC_URI="http://www.swi-prolog.org/download/stable/src/swipl-${PV}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="archive berkdb debug doc +gmp hardened java +libedit libressl minimal odbc pcre readline ssl static-libs test uuid zlib X"
-
-RDEPEND="sys-libs/ncurses:=
-	archive? ( app-arch/libarchive )
-	berkdb? ( >=sys-libs/db-4:= )
-	zlib? ( sys-libs/zlib )
-	odbc? ( dev-db/unixODBC )
-	pcre? ( dev-libs/libpcre )
-	readline? ( sys-libs/readline:= )
-	libedit? ( dev-libs/libedit )
-	gmp? ( dev-libs/gmp:0 )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0 )
-		libressl? ( dev-libs/libressl )
-	)
-	java? ( >=virtual/jdk-1.7:= )
-	uuid? ( dev-libs/ossp-uuid )
-	X? (
-		virtual/jpeg:0
-		x11-libs/libX11
-		x11-libs/libXft
-		x11-libs/libXpm
-		x11-libs/libXt
-		x11-libs/libICE
-		x11-libs/libSM )"
-
-DEPEND="${RDEPEND}
-	X? ( x11-proto/xproto )
-	java? ( test? ( =dev-java/junit-3.8* ) )"
-
-S="${WORKDIR}/swipl-${PV}"
-
-src_prepare() {
-	EPATCH_FORCE=yes
-	EPATCH_SUFFIX=patch
-	if [[ -d "${WORKDIR}"/${PV} ]] ; then
-		epatch "${WORKDIR}"/${PV}
-	fi
-
-	if ! use uuid; then
-		mv packages/clib/uuid.pl packages/clib/uuid.pl.unused || die
-	fi
-
-	# OSX/Intel ld doesn't like an archive without table of contents
-	sed -i -e 's/-cru/-scru/' packages/nlp/libstemmer_c/Makefile.pl || die
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-	use ppc && append-flags -mno-altivec
-	use hardened && append-flags -fno-unit-at-a-time
-	use debug && append-flags -DO_DEBUG
-
-	# ARCH is used in the configure script to figure out host and target
-	# specific stuff
-	export ARCH=${CHOST}
-
-	export CC_FOR_BUILD=$(tc-getBUILD_CC)
-
-	cd "${S}"/src || die
-	econf \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		$(use_enable gmp) \
-		$(use_enable static-libs static) \
-		--enable-shared \
-		--enable-custom-flags COFLAGS="${CFLAGS}"
-
-	if ! use minimal ; then
-		local jpltestconf
-		if use java && use test ; then
-			jpltestconf="--with-junit=$(java-config --classpath junit)"
-		fi
-
-		cd "${S}/packages" || die
-		econf \
-			--libdir="${EPREFIX}"/usr/$(get_libdir) \
-			$(use_with archive) \
-			$(use_with berkdb bdb ) \
-			$(use_with java jpl) \
-			${jpltestconf} \
-			$(use_with libedit) \
-			$(use_with pcre) \
-			$(use_with odbc) \
-			$(use_with readline) \
-			$(use_with ssl) \
-			$(use_with X xpce) \
-			$(use_with zlib) \
-			COFLAGS='"${CFLAGS}"'
-	fi
-}
-
-src_compile() {
-	cd "${S}"/src || die
-	emake
-
-	if ! use minimal ; then
-		cd "${S}/packages" || die
-		emake
-		./report-failed || die "Cannot report failed packages"
-	fi
-}
-
-src_test() {
-	cd "${S}/src" || die
-	emake check
-
-	if ! use minimal ; then
-		unset DISPLAY
-		cd "${S}/packages" || die
-		emake \
-			USE_PUBLIC_NETWORK_TESTS=false \
-			USE_ODBC_TESTS=false \
-			check
-		./report-failed || die
-	fi
-}
-
-src_install() {
-	emake -C src DESTDIR="${D}" install
-
-	if ! use minimal ; then
-		emake -C packages DESTDIR="${D}" install
-		if use doc ; then
-			emake -C packages DESTDIR="${D}" html-install
-		fi
-		./packages/report-failed || die "Cannot report failed packages"
-	fi
-
-	dodoc ReleaseNotes/relnotes-5.10 INSTALL README.md VERSION
-}
diff --git a/dev-lang/swi-prolog/swi-prolog-7.6.2.ebuild b/dev-lang/swi-prolog/swi-prolog-7.6.2.ebuild
deleted file mode 100644
index ac17db45d196..000000000000
--- a/dev-lang/swi-prolog/swi-prolog-7.6.2.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils flag-o-matic java-pkg-opt-2 multilib
-
-PATCHSET_VER="0"
-
-DESCRIPTION="free, small, and standard compliant Prolog compiler"
-HOMEPAGE="http://www.swi-prolog.org/"
-SRC_URI="http://www.swi-prolog.org/download/stable/src/swipl-${PV}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="archive berkdb debug doc +gmp hardened java +libedit libressl minimal odbc pcre readline ssl static-libs test uuid zlib X"
-
-RDEPEND="sys-libs/ncurses:=
-	archive? ( app-arch/libarchive )
-	berkdb? ( >=sys-libs/db-4:= )
-	zlib? ( sys-libs/zlib )
-	odbc? ( dev-db/unixODBC )
-	pcre? ( dev-libs/libpcre )
-	readline? ( sys-libs/readline:= )
-	libedit? ( dev-libs/libedit )
-	gmp? ( dev-libs/gmp:0 )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0 )
-		libressl? ( dev-libs/libressl )
-	)
-	java? ( >=virtual/jdk-1.7:= )
-	uuid? ( dev-libs/ossp-uuid )
-	X? (
-		virtual/jpeg:0
-		x11-libs/libX11
-		x11-libs/libXft
-		x11-libs/libXpm
-		x11-libs/libXt
-		x11-libs/libICE
-		x11-libs/libSM )"
-
-DEPEND="${RDEPEND}
-	X? ( x11-proto/xproto )
-	java? ( test? ( =dev-java/junit-3.8* ) )"
-
-S="${WORKDIR}/swipl-${PV}"
-
-src_prepare() {
-	EPATCH_FORCE=yes
-	EPATCH_SUFFIX=patch
-	if [[ -d "${WORKDIR}"/${PV} ]] ; then
-		epatch "${WORKDIR}"/${PV}
-	fi
-
-	if ! use uuid; then
-		mv packages/clib/uuid.pl packages/clib/uuid.pl.unused || die
-	fi
-
-	# OSX/Intel ld doesn't like an archive without table of contents
-	sed -i -e 's/-cru/-scru/' packages/nlp/libstemmer_c/Makefile.pl || die
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-	use ppc && append-flags -mno-altivec
-	use hardened && append-flags -fno-unit-at-a-time
-	use debug && append-flags -DO_DEBUG
-
-	# ARCH is used in the configure script to figure out host and target
-	# specific stuff
-	export ARCH=${CHOST}
-
-	export CC_FOR_BUILD=$(tc-getBUILD_CC)
-
-	cd "${S}"/src || die
-	econf \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		$(use_enable gmp) \
-		$(use_enable static-libs static) \
-		--enable-shared \
-		--enable-custom-flags COFLAGS="${CFLAGS}"
-
-	if ! use minimal ; then
-		local jpltestconf
-		if use java && use test ; then
-			jpltestconf="--with-junit=$(java-config --classpath junit)"
-		fi
-
-		cd "${S}/packages" || die
-		econf \
-			--libdir="${EPREFIX}"/usr/$(get_libdir) \
-			$(use_with archive) \
-			$(use_with berkdb bdb ) \
-			$(use_with java jpl) \
-			${jpltestconf} \
-			$(use_with libedit) \
-			$(use_with pcre) \
-			$(use_with odbc) \
-			$(use_with readline) \
-			$(use_with ssl) \
-			$(use_with X xpce) \
-			$(use_with zlib) \
-			COFLAGS='"${CFLAGS}"'
-	fi
-}
-
-src_compile() {
-	cd "${S}"/src || die
-	emake
-
-	if ! use minimal ; then
-		cd "${S}/packages" || die
-		emake
-		./report-failed || die "Cannot report failed packages"
-	fi
-}
-
-src_test() {
-	cd "${S}/src" || die
-	emake check
-
-	if ! use minimal ; then
-		unset DISPLAY
-		cd "${S}/packages" || die
-		emake \
-			USE_PUBLIC_NETWORK_TESTS=false \
-			USE_ODBC_TESTS=false \
-			check
-		./report-failed || die
-	fi
-}
-
-src_install() {
-	emake -C src DESTDIR="${D}" install
-
-	if ! use minimal ; then
-		emake -C packages DESTDIR="${D}" install
-		if use doc ; then
-			emake -C packages DESTDIR="${D}" html-install
-		fi
-		./packages/report-failed || die "Cannot report failed packages"
-	fi
-
-	dodoc ReleaseNotes/relnotes-5.10 INSTALL README.md VERSION
-}
diff --git a/dev-lang/swi-prolog/swi-prolog-7.7.8.ebuild b/dev-lang/swi-prolog/swi-prolog-7.7.8.ebuild
deleted file mode 100644
index b3c8e67bc2e8..000000000000
--- a/dev-lang/swi-prolog/swi-prolog-7.7.8.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils flag-o-matic java-pkg-opt-2 multilib
-
-PATCHSET_VER="0"
-
-DESCRIPTION="free, small, and standard compliant Prolog compiler"
-HOMEPAGE="http://www.swi-prolog.org/"
-SRC_URI="http://www.swi-prolog.org/download/devel/src/swipl-${PV}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="archive berkdb debug doc +gmp hardened java +libedit libressl minimal odbc pcre readline ssl static-libs test uuid zlib X"
-
-RDEPEND="sys-libs/ncurses:=
-	archive? ( app-arch/libarchive )
-	berkdb? ( >=sys-libs/db-4:= )
-	zlib? ( sys-libs/zlib )
-	odbc? ( dev-db/unixODBC )
-	pcre? ( dev-libs/libpcre )
-	readline? ( sys-libs/readline:= )
-	libedit? ( dev-libs/libedit )
-	gmp? ( dev-libs/gmp:0 )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0 )
-		libressl? ( dev-libs/libressl )
-	)
-	java? ( >=virtual/jdk-1.7:= )
-	uuid? ( dev-libs/ossp-uuid )
-	X? (
-		virtual/jpeg:0
-		x11-libs/libX11
-		x11-libs/libXft
-		x11-libs/libXpm
-		x11-libs/libXt
-		x11-libs/libICE
-		x11-libs/libSM )"
-
-DEPEND="${RDEPEND}
-	X? ( x11-proto/xproto )
-	java? ( test? ( =dev-java/junit-3.8* ) )"
-
-S="${WORKDIR}/swipl-${PV}"
-
-src_prepare() {
-	EPATCH_FORCE=yes
-	EPATCH_SUFFIX=patch
-	if [[ -d "${WORKDIR}"/${PV} ]] ; then
-		epatch "${WORKDIR}"/${PV}
-	fi
-
-	if ! use uuid; then
-		mv packages/clib/uuid.pl packages/clib/uuid.pl.unused || die
-	fi
-
-	# OSX/Intel ld doesn't like an archive without table of contents
-	sed -i -e 's/-cru/-scru/' packages/nlp/libstemmer_c/Makefile.pl || die
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-	use ppc && append-flags -mno-altivec
-	use hardened && append-flags -fno-unit-at-a-time
-	use debug && append-flags -DO_DEBUG
-
-	# ARCH is used in the configure script to figure out host and target
-	# specific stuff
-	export ARCH=${CHOST}
-
-	export CC_FOR_BUILD=$(tc-getBUILD_CC)
-
-	cd "${S}"/src || die
-	econf \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		$(use_enable gmp) \
-		$(use_enable static-libs static) \
-		--enable-shared \
-		--enable-custom-flags COFLAGS="${CFLAGS}"
-
-	if ! use minimal ; then
-		local jpltestconf
-		if use java && use test ; then
-			jpltestconf="--with-junit=$(java-config --classpath junit)"
-		fi
-
-		cd "${S}/packages" || die
-		econf \
-			--libdir="${EPREFIX}"/usr/$(get_libdir) \
-			$(use_with archive) \
-			$(use_with berkdb bdb ) \
-			$(use_with java jpl) \
-			${jpltestconf} \
-			$(use_with libedit) \
-			$(use_with pcre) \
-			$(use_with odbc) \
-			$(use_with readline) \
-			$(use_with ssl) \
-			$(use_with X xpce) \
-			$(use_with zlib) \
-			COFLAGS='"${CFLAGS}"'
-	fi
-}
-
-src_compile() {
-	cd "${S}"/src || die
-	emake
-
-	if ! use minimal ; then
-		cd "${S}/packages" || die
-		emake
-		./report-failed || die "Cannot report failed packages"
-	fi
-}
-
-src_test() {
-	cd "${S}/src" || die
-	emake check
-
-	if ! use minimal ; then
-		unset DISPLAY
-		cd "${S}/packages" || die
-		emake \
-			USE_PUBLIC_NETWORK_TESTS=false \
-			USE_ODBC_TESTS=false \
-			check
-		./report-failed || die
-	fi
-}
-
-src_install() {
-	emake -C src DESTDIR="${D}" install
-
-	if ! use minimal ; then
-		emake -C packages DESTDIR="${D}" install
-		if use doc ; then
-			emake -C packages DESTDIR="${D}" html-install
-		fi
-		./packages/report-failed || die "Cannot report failed packages"
-	fi
-
-	dodoc ReleaseNotes/relnotes-5.10 INSTALL README.md VERSION
-}
diff --git a/dev-lang/swi-prolog/swi-prolog-7.7.9.ebuild b/dev-lang/swi-prolog/swi-prolog-7.7.9.ebuild
deleted file mode 100644
index b3c8e67bc2e8..000000000000
--- a/dev-lang/swi-prolog/swi-prolog-7.7.9.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils flag-o-matic java-pkg-opt-2 multilib
-
-PATCHSET_VER="0"
-
-DESCRIPTION="free, small, and standard compliant Prolog compiler"
-HOMEPAGE="http://www.swi-prolog.org/"
-SRC_URI="http://www.swi-prolog.org/download/devel/src/swipl-${PV}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="archive berkdb debug doc +gmp hardened java +libedit libressl minimal odbc pcre readline ssl static-libs test uuid zlib X"
-
-RDEPEND="sys-libs/ncurses:=
-	archive? ( app-arch/libarchive )
-	berkdb? ( >=sys-libs/db-4:= )
-	zlib? ( sys-libs/zlib )
-	odbc? ( dev-db/unixODBC )
-	pcre? ( dev-libs/libpcre )
-	readline? ( sys-libs/readline:= )
-	libedit? ( dev-libs/libedit )
-	gmp? ( dev-libs/gmp:0 )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0 )
-		libressl? ( dev-libs/libressl )
-	)
-	java? ( >=virtual/jdk-1.7:= )
-	uuid? ( dev-libs/ossp-uuid )
-	X? (
-		virtual/jpeg:0
-		x11-libs/libX11
-		x11-libs/libXft
-		x11-libs/libXpm
-		x11-libs/libXt
-		x11-libs/libICE
-		x11-libs/libSM )"
-
-DEPEND="${RDEPEND}
-	X? ( x11-proto/xproto )
-	java? ( test? ( =dev-java/junit-3.8* ) )"
-
-S="${WORKDIR}/swipl-${PV}"
-
-src_prepare() {
-	EPATCH_FORCE=yes
-	EPATCH_SUFFIX=patch
-	if [[ -d "${WORKDIR}"/${PV} ]] ; then
-		epatch "${WORKDIR}"/${PV}
-	fi
-
-	if ! use uuid; then
-		mv packages/clib/uuid.pl packages/clib/uuid.pl.unused || die
-	fi
-
-	# OSX/Intel ld doesn't like an archive without table of contents
-	sed -i -e 's/-cru/-scru/' packages/nlp/libstemmer_c/Makefile.pl || die
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-	use ppc && append-flags -mno-altivec
-	use hardened && append-flags -fno-unit-at-a-time
-	use debug && append-flags -DO_DEBUG
-
-	# ARCH is used in the configure script to figure out host and target
-	# specific stuff
-	export ARCH=${CHOST}
-
-	export CC_FOR_BUILD=$(tc-getBUILD_CC)
-
-	cd "${S}"/src || die
-	econf \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		$(use_enable gmp) \
-		$(use_enable static-libs static) \
-		--enable-shared \
-		--enable-custom-flags COFLAGS="${CFLAGS}"
-
-	if ! use minimal ; then
-		local jpltestconf
-		if use java && use test ; then
-			jpltestconf="--with-junit=$(java-config --classpath junit)"
-		fi
-
-		cd "${S}/packages" || die
-		econf \
-			--libdir="${EPREFIX}"/usr/$(get_libdir) \
-			$(use_with archive) \
-			$(use_with berkdb bdb ) \
-			$(use_with java jpl) \
-			${jpltestconf} \
-			$(use_with libedit) \
-			$(use_with pcre) \
-			$(use_with odbc) \
-			$(use_with readline) \
-			$(use_with ssl) \
-			$(use_with X xpce) \
-			$(use_with zlib) \
-			COFLAGS='"${CFLAGS}"'
-	fi
-}
-
-src_compile() {
-	cd "${S}"/src || die
-	emake
-
-	if ! use minimal ; then
-		cd "${S}/packages" || die
-		emake
-		./report-failed || die "Cannot report failed packages"
-	fi
-}
-
-src_test() {
-	cd "${S}/src" || die
-	emake check
-
-	if ! use minimal ; then
-		unset DISPLAY
-		cd "${S}/packages" || die
-		emake \
-			USE_PUBLIC_NETWORK_TESTS=false \
-			USE_ODBC_TESTS=false \
-			check
-		./report-failed || die
-	fi
-}
-
-src_install() {
-	emake -C src DESTDIR="${D}" install
-
-	if ! use minimal ; then
-		emake -C packages DESTDIR="${D}" install
-		if use doc ; then
-			emake -C packages DESTDIR="${D}" html-install
-		fi
-		./packages/report-failed || die "Cannot report failed packages"
-	fi
-
-	dodoc ReleaseNotes/relnotes-5.10 INSTALL README.md VERSION
-}