gentoo resync : 04.12.2017

14 files changed, 19 insertions, 269 deletions

diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 0e92b360abe0..91fbab11cc76 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest
index 571df4159615..768f9ef0c80c 100644
--- a/dev-lang/perl/Manifest
+++ b/dev-lang/perl/Manifest
@@ -17,9 +17,9 @@ DIST perl-cross-1.1.7.tar.gz 97622 BLAKE2B c58dd51492cfbda6fc58b43d9de45c35dd5ed
 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.26.0.ebuild 17985 BLAKE2B e898f97092b112a2c36996744e75ddb22dcae12512179dda24fd582c5d5c7d9a6fa1e2037ff6eb7244433cf510fff9c9602934bbcd3ad5d8672c4d38a5be4cfe SHA512 f45357a04344573edcbe589d5da44b5a915a5db8262c7bdc34c73c163a184050d4f0223106696504b8f9f1fa2297b4534313a8513d45aa12240027eef833f6a4
-EBUILD perl-5.26.1-r1.ebuild 19361 BLAKE2B e54858729035448863f6469d214a4445242df6c87054ff55760a1849e26caff9df0015d512cfcc9277a9599f19a1b9c0aad4ba36d31fa23c549d7e00364eeda4 SHA512 faf300e65fea48059af5c9e4e7e96519a5c61766524ac8d8f096896aaeda9293bab36e09e0ab4cb3063292677f29315ed142e09f2b4a37092a7235dd8fa4e3a8
-EBUILD perl-5.26.1.ebuild 19090 BLAKE2B 0553dbd71b3154c9448c9c1c46a932826b8fd52b413bca70e72d4b01907c29edc8a032f7cc8d3ca5c3a421692941aa80297fad1705f111a6144fdf58845df10a SHA512 dcbca9dfd36210eef3d1b57419e711b592479079c10aa212971b9778b82a777f87bead09c907c713cdde7af6292bc29bc57e472f4969830e04d6f09ae10ea453
-EBUILD perl-5.26.9999.ebuild 19354 BLAKE2B 8ab0f5a020e1ee1e15962c60c71e7acf473bd9fde0eb7332289faa9816e35485db9a3b704aba685cd54b57169773aabfe7c43167a116ce1098159c0425f29a69 SHA512 9d0c68ab7be7dcc91581fddb70906ab44f4461f750689785ac185bd71bba41b4495248c7d770b7bbc79e624592cebf832899d40e15cf7ec9e6903ed325011457
-EBUILD perl-5.28.9999.ebuild 19340 BLAKE2B 03482553c53712fa60f03a2b8414477b7993c76fe17dcdf3303ce91f08da4ec09472d0361a5eb75fd106e0f31ef082083f3845948fa037498e202df0bf6ac657 SHA512 aa3fdfa3535b11e620f95b18f9c2e8a175492844abb52aecbd2ee5c70a2bd83aeb628313d16ecd4f7a4f5efe49a3589b196950338f7550244bdc2137299b7088
+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.ebuild 18983 BLAKE2B ef92b27b06f0866a1e7e7a3d35f87d8378e1d6df1a42ab68e03682c978f35429f83f23beef2921a214382ecd84e706bddb4a49d1a218d5dc133b71f15faa327c SHA512 903eee39e82711ff898fc7b3628bd06baf7d5ce6ca0b685b7852991755cf7779cc869e076a14a13293eab549d60453026411d3dc2b277873184975ff9ff491c4
+EBUILD perl-5.26.9999.ebuild 19247 BLAKE2B e8b3991aea3b19d75e2db0ca6d4ace191175ab2c8e289014324e8d0a9457aeb20a184b22d27db28d4c4da2033c9878c3dd0d11eeed787a4b37458636ee19db9f SHA512 cd0795a3f6894a936f52e6c563aac208d160ea24a88b50a13c00b85ebb8515d0aea6c6c7f78183d89567f4a6d05926f4f9a3768014bf59818c5ea49f1d356a36
+EBUILD perl-5.28.9999.ebuild 19233 BLAKE2B 50a9b4a9a6078d20b2fbff1ad6eb73474ec4444eced2ea4368525bc68717612cd9b21f6a1bbc47f733c69c1cb4b281982a7091dd4ca1791a952d67ee6f78ce9c SHA512 9add4dd31298f3519cc029fb84abce15db0917fa221fcbd4b69f0b41bb9512ac4ec1daeaa2721a32e6e1477e77ba681bdad53b1772fa494450bebfb4757ff9c8
 MISC metadata.xml 430 BLAKE2B 8625fd07f63a7943a85c3919d6ae6db622b752caa2803c56c72a22b270244261331fbab8b760e6d00acb8480770c9ef1d1beaaa22cc6044660821687c0cd8c33 SHA512 ca4c43e2016b7df707894713465700a90d2b8551b57fc4d660cff75edb1e8cc2456f9ae10431839ad6738f290d4f5911fae360eaa1d4670859d855de3d568583
diff --git a/dev-lang/perl/perl-5.26.0.ebuild b/dev-lang/perl/perl-5.26.0.ebuild
index 6a1ce9639e77..cbf0ad1a94d2 100644
--- a/dev-lang/perl/perl-5.26.0.ebuild
+++ b/dev-lang/perl/perl-5.26.0.ebuild
@@ -285,10 +285,6 @@ src_prepare_perlcross() {
 	cp -a ../perl-cross-${CROSS_VER}/* . || die
 
 	sed -i \
-		-e 's/(15 + $CLEANUP)/(13 + $CLEANUP)/' \
-		cnf/diffs/perl5-${PV}/makemaker-test.patch || die
-
-	sed -i \
 		-e 's/MakeMaker\.pm .*/MakeMaker.pm bf9174c70a0e50ff2fee4552c7df89b37d292da1/' \
 		-e 's/MM_Unix\.pm .*/MM_Unix.pm b0ec308fe2d7dcfcef5732880db0fae1f4ea80fa/' \
 		cnf/diffs/perl5-${PV}/customized.patch || die
diff --git a/dev-lang/perl/perl-5.26.1-r1.ebuild b/dev-lang/perl/perl-5.26.1-r1.ebuild
index f4f6054d3728..3a6ded81ff59 100644
--- a/dev-lang/perl/perl-5.26.1-r1.ebuild
+++ b/dev-lang/perl/perl-5.26.1-r1.ebuild
@@ -286,10 +286,6 @@ src_prepare_perlcross() {
 	cp -a ../perl-cross-${CROSS_VER}/* . || die
 
 	sed -i \
-		-e 's/(15 + $CLEANUP)/(13 + $CLEANUP)/' \
-		cnf/diffs/perl5-${PV}/makemaker-test.patch || die
-
-	sed -i \
 		-e 's/MakeMaker\.pm .*/MakeMaker.pm bf9174c70a0e50ff2fee4552c7df89b37d292da1/' \
 		-e 's/MM_Unix\.pm .*/MM_Unix.pm b0ec308fe2d7dcfcef5732880db0fae1f4ea80fa/' \
 		cnf/diffs/perl5-${PV}/customized.patch || die
diff --git a/dev-lang/perl/perl-5.26.1.ebuild b/dev-lang/perl/perl-5.26.1.ebuild
index a7e2522f1e1d..d201810751b7 100644
--- a/dev-lang/perl/perl-5.26.1.ebuild
+++ b/dev-lang/perl/perl-5.26.1.ebuild
@@ -286,10 +286,6 @@ src_prepare_perlcross() {
 	cp -a ../perl-cross-${CROSS_VER}/* . || die
 
 	sed -i \
-		-e 's/(15 + $CLEANUP)/(13 + $CLEANUP)/' \
-		cnf/diffs/perl5-${PV}/makemaker-test.patch || die
-
-	sed -i \
 		-e 's/MakeMaker\.pm .*/MakeMaker.pm bf9174c70a0e50ff2fee4552c7df89b37d292da1/' \
 		-e 's/MM_Unix\.pm .*/MM_Unix.pm b0ec308fe2d7dcfcef5732880db0fae1f4ea80fa/' \
 		cnf/diffs/perl5-${PV}/customized.patch || die
diff --git a/dev-lang/perl/perl-5.26.9999.ebuild b/dev-lang/perl/perl-5.26.9999.ebuild
index 3dc88edc18b6..79b8c3037c1f 100644
--- a/dev-lang/perl/perl-5.26.9999.ebuild
+++ b/dev-lang/perl/perl-5.26.9999.ebuild
@@ -286,10 +286,6 @@ src_prepare_perlcross() {
 	cp -a ../perl-cross-${CROSS_VER}/* . || die
 
 	sed -i \
-		-e 's/(15 + $CLEANUP)/(13 + $CLEANUP)/' \
-		cnf/diffs/perl5-${PV}/makemaker-test.patch || die
-
-	sed -i \
 		-e 's/MakeMaker\.pm .*/MakeMaker.pm bf9174c70a0e50ff2fee4552c7df89b37d292da1/' \
 		-e 's/MM_Unix\.pm .*/MM_Unix.pm b0ec308fe2d7dcfcef5732880db0fae1f4ea80fa/' \
 		cnf/diffs/perl5-${PV}/customized.patch || die
diff --git a/dev-lang/perl/perl-5.28.9999.ebuild b/dev-lang/perl/perl-5.28.9999.ebuild
index 267767fa38dc..ea454ceccebf 100644
--- a/dev-lang/perl/perl-5.28.9999.ebuild
+++ b/dev-lang/perl/perl-5.28.9999.ebuild
@@ -286,10 +286,6 @@ src_prepare_perlcross() {
 	cp -a ../perl-cross-${CROSS_VER}/* . || die
 
 	sed -i \
-		-e 's/(15 + $CLEANUP)/(13 + $CLEANUP)/' \
-		cnf/diffs/perl5-${PV}/makemaker-test.patch || die
-
-	sed -i \
 		-e 's/MakeMaker\.pm .*/MakeMaker.pm bf9174c70a0e50ff2fee4552c7df89b37d292da1/' \
 		-e 's/MM_Unix\.pm .*/MM_Unix.pm b0ec308fe2d7dcfcef5732880db0fae1f4ea80fa/' \
 		cnf/diffs/perl5-${PV}/customized.patch || die
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index a267d71cb50f..5fdfa4663fcc 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -2,7 +2,6 @@ AUX 2.7-disable-nis.patch 823 BLAKE2B eccd1ceb7e7e66848e1c7520ae9c5f2f57a27203a5
 AUX 3.4-getentropy-linux.patch 1766 BLAKE2B b0999a96833f2b6db936f0c97f8405c8b6eb2fcf926f4c4c41590d903435c1435be21795ea1d44355f5c2e3a745b1528bf04cfda362372a12f796fd1bb51629a SHA512 52e888819b3c265e0920efa00911311a2029a6a80162ca56e69892ffc49c28487852882b27e560b9f8ff1c16ee41d074423b6c565596b37c6efca2dd8eb45675
 AUX 3.6-blake2.patch 1335 BLAKE2B af3acdee3c789199fab8a2eb0140ff7a470f2873db506163d2e81117e1efed2c245d629f13a49d313a63af98200d5dad5f3d5bcc3e43e66af5bb0e39778faa55 SHA512 f8f9b4424df36f58354c24b7eb571c63a7bb49a1d2fd5399562ab28371eb3a80ed829c7e4fc19f5b3d9955a83a46d09a63819e4da0dafdef0a5a3f6b1e679d71
 AUX 3.6-disable-nis.patch 864 BLAKE2B a960b2f44ff1358677ebb0cf82bcff1ddc7812ed511d0f492fdac07c848f0de8dbd0e8a9200b276709532b5524eed9e779b33d6c4ee34c1f9d23e4eb1f862d99 SHA512 a86a17c90743e8a3712ceaf14ea1a88b96bd5504a4feaadc0168f3211c2afbc130fad8147a40d7ac65268ff1d6293b0c3f98ad36845efebeacfc628149ef13f3
-AUX 3.6.1-test_socket-AEAD.patch 3501 BLAKE2B c35283bf715dcab4c7b368645850f35b0c8e2f479dc9e2595d9ad8e5ec1c1e11372f01ff5fa612f9068862ef3ab5c335b273f13bb698e120a826df69ae41220e SHA512 7c813ea3c9eb45f50164b58fd4908e6ccf48eba7d027f252a2c13dab09662a52c4d950c4c7583d50a8752848f52e0854e6974d8c2ebbb38a38fedaa97878bc28
 AUX pydoc.conf 169 BLAKE2B ce40bb3d5f858bd7a8d9ef5bf215a8ab592568a724f0e08aea219da014dac12fdfcbcf5fb168bb9aa57be110f74d656aed46179ffe11e3c992d84a647e442b7b SHA512 30d0776a4004cd641e6f283658c3c24915a21ea15fe40e506ff2c3a5f95936aa00c9490b04ab25f29e9b7ac65cd88fd54ca0b08e000e73820b13c7c57c0bf5b2
 AUX pydoc.init 600 BLAKE2B fb8775a6663483e5112ec283627610b746020d88494e772b92bb718a9493a52606e565c6c2fa4917a5cb963f166283d09883bd26903f2f3ced6c240d4e292a7f SHA512 9e71ad53486b6882a8441b24225c602195ee33d29dd1b60df27febbc6b752e79929be356152a489f893dcfb11f9c066b999787bc27a8ac61062c86e67a69e87a
 AUX python-2.7.10-cross-compile-warn-test.patch 775 BLAKE2B 617938353c7e19a9b931544ff1fdcd60cf46e3a68f3ff63bc6ac16432220aad13df4d2b405a968505fb64d31da51a478c46499944ab58e9bbfa5a5b44d392f00 SHA512 652941239541f6139ee3580ec0ea5240baf07ae1afb786f76a69b1d748de1f4dda2740a95c28866e9b0b59023410f8a1e86507642595991c0d90d187519cb758
diff --git a/dev-lang/python/files/3.6.1-test_socket-AEAD.patch b/dev-lang/python/files/3.6.1-test_socket-AEAD.patch
deleted file mode 100644
index 426e3371441c..000000000000
--- a/dev-lang/python/files/3.6.1-test_socket-AEAD.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 4ac01f0ff3e3c9c02f5cc8c55f2fbe4639808f5e Mon Sep 17 00:00:00 2001
-From: Mariatta <Mariatta@users.noreply.github.com>
-Date: Thu, 16 Mar 2017 20:58:42 -0700
-Subject: [PATCH] update test_socket AEAD test for kernel 4.9 and up (GH-133)
- (GH-548)
-
-(cherry picked from commit 9764c151c51480a7ca6042b1ccd69be2620ff360)
----
- Lib/test/test_socket.py | 15 +++++++--------
- 1 file changed, 7 insertions(+), 8 deletions(-)
-
-diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
-index 5315d475df..1508f20c9f 100644
---- a/Lib/test/test_socket.py
-+++ b/Lib/test/test_socket.py
-@@ -5479,7 +5479,7 @@ class LinuxKernelCryptoAPI(unittest.TestCase):
-             self.assertEqual(len(dec), msglen * multiplier)
-             self.assertEqual(dec, msg * multiplier)
- 
--    @support.requires_linux_version(4, 3)  # see test_aes_cbc
-+    @support.requires_linux_version(4, 9)  # see issue29324
-     def test_aead_aes_gcm(self):
-         key = bytes.fromhex('c939cc13397c1d37de6ae0e1cb7c423c')
-         iv = bytes.fromhex('b3d8cc017cbb89b39e0f67e2')
-@@ -5502,8 +5502,7 @@ class LinuxKernelCryptoAPI(unittest.TestCase):
-                 op.sendmsg_afalg(op=socket.ALG_OP_ENCRYPT, iv=iv,
-                                  assoclen=assoclen, flags=socket.MSG_MORE)
-                 op.sendall(assoc, socket.MSG_MORE)
--                op.sendall(plain, socket.MSG_MORE)
--                op.sendall(b'\x00' * taglen)
-+                op.sendall(plain)
-                 res = op.recv(assoclen + len(plain) + taglen)
-                 self.assertEqual(expected_ct, res[assoclen:-taglen])
-                 self.assertEqual(expected_tag, res[-taglen:])
-@@ -5511,7 +5510,7 @@ class LinuxKernelCryptoAPI(unittest.TestCase):
-             # now with msg
-             op, _ = algo.accept()
-             with op:
--                msg = assoc + plain + b'\x00' * taglen
-+                msg = assoc + plain
-                 op.sendmsg_afalg([msg], op=socket.ALG_OP_ENCRYPT, iv=iv,
-                                  assoclen=assoclen)
-                 res = op.recv(assoclen + len(plain) + taglen)
-@@ -5522,7 +5521,7 @@ class LinuxKernelCryptoAPI(unittest.TestCase):
-             pack_uint32 = struct.Struct('I').pack
-             op, _ = algo.accept()
-             with op:
--                msg = assoc + plain + b'\x00' * taglen
-+                msg = assoc + plain
-                 op.sendmsg(
-                     [msg],
-                     ([socket.SOL_ALG, socket.ALG_SET_OP, pack_uint32(socket.ALG_OP_ENCRYPT)],
-@@ -5530,7 +5529,7 @@ class LinuxKernelCryptoAPI(unittest.TestCase):
-                      [socket.SOL_ALG, socket.ALG_SET_AEAD_ASSOCLEN, pack_uint32(assoclen)],
-                     )
-                 )
--                res = op.recv(len(msg))
-+                res = op.recv(len(msg) + taglen)
-                 self.assertEqual(expected_ct, res[assoclen:-taglen])
-                 self.assertEqual(expected_tag, res[-taglen:])
- 
-@@ -5540,8 +5539,8 @@ class LinuxKernelCryptoAPI(unittest.TestCase):
-                 msg = assoc + expected_ct + expected_tag
-                 op.sendmsg_afalg([msg], op=socket.ALG_OP_DECRYPT, iv=iv,
-                                  assoclen=assoclen)
--                res = op.recv(len(msg))
--                self.assertEqual(plain, res[assoclen:-taglen])
-+                res = op.recv(len(msg) - taglen)
-+                self.assertEqual(plain, res[assoclen:])
- 
-     @support.requires_linux_version(4, 3)  # see test_aes_cbc
-     def test_drbg_pr_sha256(self):
--- 
-2.12.2
-
diff --git a/dev-lang/swi-prolog/Manifest b/dev-lang/swi-prolog/Manifest
index 5a0d8d681497..c1fdfe67234a 100644
--- a/dev-lang/swi-prolog/Manifest
+++ b/dev-lang/swi-prolog/Manifest
@@ -1,20 +1,18 @@
 DIST pl-6.6.6.tar.gz 14838653 SHA256 9f80bb274e2f31fd68b0acbe35982c012d5f8311dbe44ec1d8d04351a776996d SHA512 a850b0f6b283d34aa77d5e9d8a0053161fa534fa6d8935c7472362ff7b59ea6035de0658d9e38c317e2d92ed810370f2adc3e92b6346fc0ff392d18f1c8012a6 WHIRLPOOL 448d844fe45aee97ad2e37bea3f81dd5eb388e1dcb9f1c4dc54c18991aa91d481bff5b70174fb06edb06c1361759621a570a083fe36d62bffdf6028c49244b2a
 DIST swi-prolog-6.6.6-gentoo-patchset-0.tar.gz 1590 SHA256 2b240d15562603120e0314bb69bde50089326c11876b7a62106c05f9d48ace71 SHA512 807c7e897dd5b9eef14e063ea53c03047f3acb23174a70a613258adf7f85dc1f7637158fde70aab2e0f40de4bc6ac5e3548dd09dbe3745d916a388f43eb832eb WHIRLPOOL 0a0dbc361cfbe343c8b3562a2c0535905eb1443eea0783b14f96bda43c04e8db6264f476c07da766c6936dc6088e34059f799a3244717390644bf0f5ae83018e
 DIST swi-prolog-7.2.3-gentoo-patchset-1.tar.gz 1875 SHA256 c11e48122dc468f21e08da4a65f5a2daa9e0ddbc2e186bbd952626c95b29db04 SHA512 3506f4168d52f7d3539cd753c5153750df8c3239b78ffac1784c634b585d5fb0c825700e77abc9c1f467af71473ae1861eef629ebdf76b7c783d276c393f40fc WHIRLPOOL 8b70ab91592280d0634c6c897771696c0c63d30680044994cedf69f18cd4f386adf833998e64d4ad892cff97300b5bbfaa8dec8448ea04ebaba7e31f7e9c30d0
-DIST swi-prolog-7.4.2-gentoo-patchset-3.tar.gz 3256 SHA256 6d6a98be7e0c8f69b0c2fac213a0b690112d985fdc87752eb9010f442b35c792 SHA512 bc1b408e311d10ab59fa221bf5ef3d3cb1003a3edcdd13fd000cbc647117458e1f130e960cc37968481ccc2047529ca128159fac8e0ee75114022ed439905cce WHIRLPOOL b91b8d2a588acee744d104618aed27125988a6998e7bbb517744394b0348afe6b189285cee8c37b43372b25e7bf69efb96d304e7c8d4e3a86b8e3612430f1ada
-DIST swi-prolog-7.5.15-gentoo-patchset-2.tar.gz 2789 SHA256 55a853a8ed12b5df7b2bff921aa49f79d1192d177176fffffe4ec62c3ccede18 SHA512 8c0bdfcf2be99aacef221c4a66d9323fa64e207496b04bd454dd25e2b33c5dc629302e7a0c99baca8545923a302f9b38d24a26e356a247f82745b64d05785c63 WHIRLPOOL 9b54d62cffe2d80a82039617f1619bf8d96579d5a352bcae5a4e435e1c615bc63a372d4613f2acacf14b94a207292a025a7e56d9669e091835eede502d5b528f
-DIST swi-prolog-7.7.1-gentoo-patchset-0.tar.gz 1126 SHA256 1b9d5606c09815068ab3f1acef81dce1a42db382755932a5cef19ccd78b98d33 SHA512 e25d8e380a1f5c47958bea5756da9686b8325ace79ef5bfcd4b82cbeb04061b484ef284b10a3190e389df9c6e2f3c5dc61a01e2319cbd46b590823e9ed1de175 WHIRLPOOL 4504c40aa6dd085c40a5b5958186c2028a2fbe568886190e6763395071eff5675d041d91212f0eb6a3e62a6680fb69bc67f97ededbbd34b1864acecee8ef2223
+DIST swi-prolog-7.4.2-gentoo-patchset-3.tar.gz 3256 BLAKE2B d7997d7307db738f0948a89f5e1cee195be4424737e50df915a293c7cb1b3bc1ce09ebd372e8c5f24c95df7335676f12cdc04749de25396eac71471704cfc579 SHA512 bc1b408e311d10ab59fa221bf5ef3d3cb1003a3edcdd13fd000cbc647117458e1f130e960cc37968481ccc2047529ca128159fac8e0ee75114022ed439905cce
+DIST swi-prolog-7.5.15-gentoo-patchset-2.tar.gz 2789 BLAKE2B 3ffdd7cd4c6c9e99548a6205c57a6fae8a9a9285efb1f24cf3327300eb09bba047ee93a8b76d5f9185aeb6efa7bdd5ec333d140df03080a8dad1bf43fa84d8b9 SHA512 8c0bdfcf2be99aacef221c4a66d9323fa64e207496b04bd454dd25e2b33c5dc629302e7a0c99baca8545923a302f9b38d24a26e356a247f82745b64d05785c63
 DIST swipl-7.2.3.tar.gz 16192142 SHA256 43657d51b7c5887bc2d2bced50a9822b86a08a6841399b8e76ee877f51d646b5 SHA512 da27a6b171d3b471401f1a91e86a4dbe98973d8a1db8c72aa27e452311d08b893b01a1de8f9f4dafcdac460774b4ea980050256d37284546941e1bdf84f8cd7b WHIRLPOOL de695c8e0317921dcc13898f7a3c88d1012e3f87f633cd25766ca5cb6637b29ca81b9245d015614089291a7d9abd0d8c7109ccae1df9297d78301d241cb258b3
 DIST swipl-7.4.1.tar.gz 16498678 SHA256 891e314e8f5d856ef71d8bbce5d255a18b0c8f227628748bb0e1e19473273cc1 SHA512 a3e49cc43aed05808901860fe302711d2850b23740a987d1071822d7b4888aca30a8b5f7c94e1e7191057a031f45adeedb0fbff9139d0294e6ec07032da6798d WHIRLPOOL 5605043173e6bbebed316504b3eb20a0ccc4891d25ae7a7eafc7de6eadef1688367a524e1d81fd0c1ff427e1ece39295555bbf7114deb6056b12b3c3ce2196ed
-DIST swipl-7.4.2.tar.gz 16496738 SHA256 7f17257da334bc1e7a35e9cf5cb8fca01d82f1ea406c7ace76e9062af8f0df8b SHA512 5b526d4f079e7a36184f871bb7341330bcadaeee2a69af981fbcad71ae76c77331b1f157174ac2b31d96e069dc530afa86c024de6709edd9dc8baee3b4ebffb3 WHIRLPOOL 2dad1a5e7ae3670b3a3965010d60420a27cb9623b35cdee83360f6f3a4fadc3dbf2a91fd3e7178b59c9b81723dfe6036fb968953218e7611179b52117a16cb19
+DIST swipl-7.4.2.tar.gz 16496738 BLAKE2B a8f45c4277e48c0aa38f8b278b466dcb9e0a776325a9ed9e08c252660671d3ee0ee441978394682276b3fb9b0eca73ad10e02aba4671630bef0a1e8f813dd3c5 SHA512 5b526d4f079e7a36184f871bb7341330bcadaeee2a69af981fbcad71ae76c77331b1f157174ac2b31d96e069dc530afa86c024de6709edd9dc8baee3b4ebffb3
 DIST swipl-7.5.13.tar.gz 16748371 SHA256 3680231e22ac1622c507652649e17ad07bc41ff08484f4e4f767ec04802c435c SHA512 a19037a6a9ffa06d3775d3669e51431b8f83ec37c2515955b0721bfa7dc4ab4661b740689f2aa74ee0bf0b0fff40b0d0a85453d3cfce3b0936082d719878ea23 WHIRLPOOL b81b30db11677992d0ef55c4619615a47c3576aab1e115c5fe78731d7675ba1d0c0223d540b693804720cbd4bfe9d2177069ce111f1981af5668001c6225c5ce
 DIST swipl-7.5.14.tar.gz 16743212 SHA256 2e83e96a0eace037da3f75fc44e9c8f4e3b2cf8fd3c27f8f05ff489276aec572 SHA512 f655b9adff90909398772f5612dfbf3a4e6c7ecb17b4c959a58547f30c67c861ad574cf044267280fd22a05503ead10c807d33f54f2cbf8af6ea19753c9b1d34 WHIRLPOOL 93451c566c39901a7c480bb8bc5eb1f53c3ae7adc5ee2e0281c8746b804dd4522a2cfb2e825122753ca212306798ab0659992f588ad8230b6262eeb84a0dd479
-DIST swipl-7.5.15.tar.gz 16757246 SHA256 aca07ce9c564e608586e7ae7b9a56c82ca5dd919cde1a1edf1121efa16bda568 SHA512 07344914726a5a1d3e9d6542c06be7c0937cbe3ac59b64025e068e513c99c66be991af9da0d4200364edec24c143295740c232621173039bffda2fbf379fbf33 WHIRLPOOL 5b0cc1b9cfb1f362d4145759a6f575c9bd606a717e33bd02c741321ce7303855bb472ea12ce058b02de0b96a3300807774c8697033403cf183dc9d67c6f95c88
-DIST swipl-7.6.0-rc1.tar.gz 16750608 SHA256 83f1e0038fc8c19bc90974a404bc4d696fa61976a1ce8b34a7aec672d21b88df SHA512 1cf61e4c8d92ed734e006a69f1ea025932cdd5b9d4efc3e9e1336347440dddc4ec9e4cabdf53892576f74c81ffdbc94dcfec605b7f7e42d6b2fd815e6f63a398 WHIRLPOOL 432812cfe1a921729c97e25ddf9e4112177df80bd77eda3aff81f47df7eddbeae658c221bcfa5c979f3d603e110b9928feecb6d16748e9703e3c2a4b4f5d7e4c
-DIST swipl-7.6.0-rc2.tar.gz 16752769 SHA256 df3677b24866fffad103cd252b5dbd00cf63a9daec7862a21f204aa048641644 SHA512 149f9a7106e19d848e53514fac5f553afc540b7eca7d4936ff9ebd79c616327d561081b10b8b7cb2075b9bedf691d0bd4ad843b209548715b1e928d14a73cc78 WHIRLPOOL 10ce442b72b6d20e7e6644d227f2343ae15c853fa213dbb99a1b7ab3378375eed8a7a4f7ccdaf412e02f8b2e291e475214ec7c601c255f19389a2aa0cbbeb2e8
-DIST swipl-7.6.0.tar.gz 16763479 SHA256 591c76bdeff29ded4d1dbb009fcba1c51067a5f6f3a69fada7e4327fcef4b0ff SHA512 4c9a857bcb612361e8248a39616e07fe36d8b68e1099e00917320a0177b454bc13f89f32fee1d961a1facd46bef3814f717dbaf12ab4f00ca8ea313242feb8bf WHIRLPOOL 512e64aba8f22027720762f0751b8de13f701a95abef0df66f2ce5279d769a08317b00524b6a7de60a1225edcfdd80c6d78a6ee55716d8615e4396fc115a5e12
-DIST swipl-7.7.0.tar.gz 16761831 SHA256 a1f603302fee12bfc390272ca76381401f5483c3a5521d391265404af58fdfcb SHA512 196e0c17cfaa9368a0032372cfc64e4b96f55048a4457c9ca28b1180b9277fba7811c2a72f410502f12544ca21751013b73002bf7c84cfb79ed0f909a871a24e WHIRLPOOL d2665b75a2bcb147b207bfc3b6c66be1344a7411420d8e016ae1e6e89f27f70325ef6b4804107a76f6d1714a961d5b689655037b0cb596efb8028fd85cc86a3e
-DIST swipl-7.7.1.tar.gz 16762129 SHA256 fda2c8b6b606ff199ea8a6f019008aa8272b7c349cb9312ccd5944153509503a SHA512 d95cc460c5eecf3d122c5e558266fd9203a0e8fe389ea1c83f08783e819bae04fe5e55f727ac6fffe89242dae7dc059fdabe09f1093915ba0e5675ee0e278de5 WHIRLPOOL 812eb2c5098f737b99cd063f156b11fed0151e59b949403620b498e2aa477dc08aa2fdd4da7669f2c7998cfbaabbfb0edb85f43aaeee32ae0b347880d577c4d2
+DIST swipl-7.5.15.tar.gz 16757246 BLAKE2B 5dcff6bb764cd73b24fc40122bbb1f22c57186086c419d9b2422a09d0c26c939a3903ac6a819ca8b71fe9c6711281091e15ab2f5e56480d80bbf44d78f689c48 SHA512 07344914726a5a1d3e9d6542c06be7c0937cbe3ac59b64025e068e513c99c66be991af9da0d4200364edec24c143295740c232621173039bffda2fbf379fbf33
+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.7.2.tar.gz 16775518 BLAKE2B e29ffedfe0ca8c7f4e467fb506d8c17deadaecf867f3ab01dbce777d6b79186ab03ab81e416f0000d0ae423be6d29a3f8dc2492f82e59e9d2f8ad94617a152a8 SHA512 4db5fa3d44061e21fa6811d9b84b42cdc99d9fca4000c6d66fd37017be3bb138f2278a4685feb6698c8ecab643b865b5a015699889eb04aeabf233c5dfa106d7
+DIST swipl-7.7.3.tar.gz 16779027 BLAKE2B f533eec9d75dd46b5cbe68b185d503d49aff96effa397648e61cf813bf0caa7bf50549d72301ec20b14fc42d25abd2cb566fe1b2b8b51a7e1c8e957db15fa084 SHA512 231bbbd12c7df4c0fd130ccda370cb8144b2e605895787aa83ff127f3ffa0c9bf016cca0c146ff8c3a42d9f0b32e4d7619f2f0eebbe37ec9e980c45c8ccffdc4
 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
@@ -23,8 +21,7 @@ EBUILD swi-prolog-7.5.13.ebuild 3336 BLAKE2B 57d7fa818cfb39c9e5a7300947195f3779b
 EBUILD swi-prolog-7.5.14.ebuild 3391 BLAKE2B 1fce7c6943761b7c50d9bc5e58cdadb3c5b4e3b0f1bab9aac56918e4559e3fc598a1b53650852eaf01434809c78be9632d8e07e858d2b5d5df5c6ad080e1252a SHA512 0ff31376662be4aa72867e0f419ff3b9953eecc80912171fd0f5b415d467dadb996e1d12e8aa27224c1cf1eace75e18592c1ba57f1077400b4e1323f1f8e4b43
 EBUILD swi-prolog-7.5.15.ebuild 3452 BLAKE2B 5496dbba5d067db9369099788c8faa8f5f17ccb6a15b105331d9fa7a233114f2b101ed9cfa107158bd4f7282a751d15b1182789a66de84885112c44909c5eb41 SHA512 da0c9dee16a6bddd98bb8850086fa1562988398be3ca6698d249bdb85e6cebd1d491a1270f9cd1b16212ec36d0811e2cf0cbbb49ebbcc62840eb0cf2bbaf3bf6
 EBUILD swi-prolog-7.6.0.ebuild 3392 BLAKE2B 77fca0aec35200f39f2dd60fccd13c9d6fbe78f14c03c0f57a5d42e9b280285b497e612d364352eb763850b38bc7af626172e76752211f195f2fa54f5d8157e9 SHA512 486bc74f0e77862452cf7bc63687cb1ba1395b9d10a2bb50dcb6334ad986d09153595a325703dc9413a2b22675aa838c66c94b5fe4ca582e1418701a31da002a
-EBUILD swi-prolog-7.6.0_rc1.ebuild 3415 BLAKE2B 68001cd0b08347701e2bf2f112cf24af700264825eacda69fff79551fab02f023dab686c7ea19e980f9618448bcccaf4bed6fb3f905528c841051e8d008ca1f4 SHA512 f2a8da35ab1a7b502b302b32a28be06f5ba13df635bf4e0198588bf3f567ef6d3c46ee8a0946f25718a0a4fe7e29ca219e984024be051ae5f3524e05d36cd4dd
-EBUILD swi-prolog-7.6.0_rc2.ebuild 3415 BLAKE2B 68001cd0b08347701e2bf2f112cf24af700264825eacda69fff79551fab02f023dab686c7ea19e980f9618448bcccaf4bed6fb3f905528c841051e8d008ca1f4 SHA512 f2a8da35ab1a7b502b302b32a28be06f5ba13df635bf4e0198588bf3f567ef6d3c46ee8a0946f25718a0a4fe7e29ca219e984024be051ae5f3524e05d36cd4dd
-EBUILD swi-prolog-7.7.0.ebuild 3391 BLAKE2B 835abf471153da13183829a571d1e89b7aeedb4124c6442e5501a40ff0cce77d7efec22d9b272532172268c792378bf74696677da31d864fd33da4a58d24fc5f SHA512 43ae2aa636d09515efb8e25455b4ece4f3b5657a9d4deb651579843791014c04785c5279293f7fa04df39ba87d1e7b4eda786f4e455389cfed111c984a13dbc9
-EBUILD swi-prolog-7.7.1.ebuild 3452 BLAKE2B 4dc9c4ebe495300dbc642cbe79f8c9d18f2606ec51e0c0fe0cc0aac2f9b2b537df4452b72ea1547f9c1b330f600e395069a04a278a9888bf8ef706419cd8d3d4 SHA512 1de74904c23296fcd42a40d783bfb22df400dbb2437d028cd02a554054ecbb68d3639e3ab217f72279fa16ee2f335b7fdc54ac01c1bb559b062fd803c3e4dcaf
+EBUILD swi-prolog-7.6.1.ebuild 3392 BLAKE2B 77fca0aec35200f39f2dd60fccd13c9d6fbe78f14c03c0f57a5d42e9b280285b497e612d364352eb763850b38bc7af626172e76752211f195f2fa54f5d8157e9 SHA512 486bc74f0e77862452cf7bc63687cb1ba1395b9d10a2bb50dcb6334ad986d09153595a325703dc9413a2b22675aa838c66c94b5fe4ca582e1418701a31da002a
+EBUILD swi-prolog-7.7.2.ebuild 3391 BLAKE2B 835abf471153da13183829a571d1e89b7aeedb4124c6442e5501a40ff0cce77d7efec22d9b272532172268c792378bf74696677da31d864fd33da4a58d24fc5f SHA512 43ae2aa636d09515efb8e25455b4ece4f3b5657a9d4deb651579843791014c04785c5279293f7fa04df39ba87d1e7b4eda786f4e455389cfed111c984a13dbc9
+EBUILD swi-prolog-7.7.3.ebuild 3391 BLAKE2B 835abf471153da13183829a571d1e89b7aeedb4124c6442e5501a40ff0cce77d7efec22d9b272532172268c792378bf74696677da31d864fd33da4a58d24fc5f SHA512 43ae2aa636d09515efb8e25455b4ece4f3b5657a9d4deb651579843791014c04785c5279293f7fa04df39ba87d1e7b4eda786f4e455389cfed111c984a13dbc9
 MISC metadata.xml 367 BLAKE2B 07c7ff161f07b547325566650cd882c90dbe98ac5afc0015d68bc0338cebd678ac82c3a45edd3e4f7e613d5d493324899dc8e3b4ca448f447744f439e60458fd SHA512 bacbb17fc3518d3bf845d097d17dba772a745fd7343ab6e8c751a417a540c8c003f29b86c66374bee538d7a5d96ab95e67b1c619d47f80d0e332482daabee74a
diff --git a/dev-lang/swi-prolog/swi-prolog-7.6.0_rc2.ebuild b/dev-lang/swi-prolog/swi-prolog-7.6.0_rc2.ebuild
deleted file mode 100644
index 3e75dfdeeb3b..000000000000
--- a/dev-lang/swi-prolog/swi-prolog-7.6.0_rc2.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_PV=${PV/_/-}
-
-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-${MY_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-${MY_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.0_rc1.ebuild b/dev-lang/swi-prolog/swi-prolog-7.6.1.ebuild
index 3e75dfdeeb3b..ac17db45d196 100644
--- a/dev-lang/swi-prolog/swi-prolog-7.6.0_rc1.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-7.6.1.ebuild
@@ -3,15 +3,13 @@
 
 EAPI=5
 
-MY_PV=${PV/_/-}
-
 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-${MY_PV}.tar.gz"
+SRC_URI="http://www.swi-prolog.org/download/stable/src/swipl-${PV}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
@@ -46,7 +44,7 @@ DEPEND="${RDEPEND}
 	X? ( x11-proto/xproto )
 	java? ( test? ( =dev-java/junit-3.8* ) )"
 
-S="${WORKDIR}/swipl-${MY_PV}"
+S="${WORKDIR}/swipl-${PV}"
 
 src_prepare() {
 	EPATCH_FORCE=yes
diff --git a/dev-lang/swi-prolog/swi-prolog-7.7.0.ebuild b/dev-lang/swi-prolog/swi-prolog-7.7.2.ebuild
index 7aba5bdec8ae..7aba5bdec8ae 100644
--- a/dev-lang/swi-prolog/swi-prolog-7.7.0.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-7.7.2.ebuild
diff --git a/dev-lang/swi-prolog/swi-prolog-7.7.1.ebuild b/dev-lang/swi-prolog/swi-prolog-7.7.3.ebuild
index f035badb09bb..7aba5bdec8ae 100644
--- a/dev-lang/swi-prolog/swi-prolog-7.7.1.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-7.7.3.ebuild
@@ -9,8 +9,7 @@ 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
-	mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
+SRC_URI="http://www.swi-prolog.org/download/devel/src/swipl-${PV}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"