gentoo resync : 04.12.2017

5 files changed, 14 insertions, 168 deletions

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"