Remove old versions.

(Portage version: 2.1.2_pre3-r5)
 (Unsigned Manifest commit)

14 files changed, 4 insertions, 1339 deletions

diff --git a/dev-lang/swi-prolog/Manifest b/dev-lang/swi-prolog/Manifest
index d0441b154a97..fc398ed54b48 100644
--- a/dev-lang/swi-prolog/Manifest
+++ b/dev-lang/swi-prolog/Manifest
@@ -18,10 +18,6 @@ AUX swi-prolog-CFLAGS-r2.patch 10475 RMD160 ee1ee90d4542de168787a1a98b1bcca6451f
 MD5 433655357c83157d2fb532efd135d7f5 files/swi-prolog-CFLAGS-r2.patch 10475
 RMD160 ee1ee90d4542de168787a1a98b1bcca6451f5760 files/swi-prolog-CFLAGS-r2.patch 10475
 SHA256 85051afdbe983622900b9b3692acfb08da338da8ade1be296992ab78f8391986 files/swi-prolog-CFLAGS-r2.patch 10475
-AUX swi-prolog-CFLAGS.patch 8657 RMD160 da997f0fb6a068744a81bcd91b15e7f35e025267 SHA1 c19e04ce5cdeb66bb799fbcccc9e0dad7563759c SHA256 2626faefcfcac1a41ef4d1aaccf7ad80f5fe0ae9fbb3cb3dc692182712d40b71
-MD5 bc91650feaf27f01c834bffd69a0b279 files/swi-prolog-CFLAGS.patch 8657
-RMD160 da997f0fb6a068744a81bcd91b15e7f35e025267 files/swi-prolog-CFLAGS.patch 8657
-SHA256 2626faefcfcac1a41ef4d1aaccf7ad80f5fe0ae9fbb3cb3dc692182712d40b71 files/swi-prolog-CFLAGS.patch 8657
 AUX swi-prolog-PLBASE-r1.patch 2612 RMD160 98a2aec985aa0bc38e5a76d460dd724ab199b442 SHA1 9fa1e995a30d93be737a5883779dba3f3128c006 SHA256 91b090d1c5ddd14f24671d43d0f021e47d1fd6652f1dd518f1889052c0e601d8
 MD5 5735709fce96aead1b7ba6c23bd83ba6 files/swi-prolog-PLBASE-r1.patch 2612
 RMD160 98a2aec985aa0bc38e5a76d460dd724ab199b442 files/swi-prolog-PLBASE-r1.patch 2612
@@ -30,10 +26,6 @@ AUX swi-prolog-PLBASE-r2.patch 2920 RMD160 40ea3c1e611a75c3821c7f23736197fa2451b
 MD5 fe9375dc9822272821a01e00d7d6a562 files/swi-prolog-PLBASE-r2.patch 2920
 RMD160 40ea3c1e611a75c3821c7f23736197fa2451b2ed files/swi-prolog-PLBASE-r2.patch 2920
 SHA256 4c106febae1e98d2a7cffd13839dee3890f8c2b9c6d78ecd7468a5c4ee37a693 files/swi-prolog-PLBASE-r2.patch 2920
-AUX swi-prolog-PLBASE.patch 3884 RMD160 b7b08ca7150503b9ee40f33e392147612dc3c2b9 SHA1 a93f82133892df4478291d8d8cf791e3672e3d62 SHA256 c49a3fa0c40a16dc9cd11a3cbc4e7d05c527a6361b22a9660b069c99bd09ee91
-MD5 9709fe20e8ef457682eb0a5bff5d9940 files/swi-prolog-PLBASE.patch 3884
-RMD160 b7b08ca7150503b9ee40f33e392147612dc3c2b9 files/swi-prolog-PLBASE.patch 3884
-SHA256 c49a3fa0c40a16dc9cd11a3cbc4e7d05c527a6361b22a9660b069c99bd09ee91 files/swi-prolog-PLBASE.patch 3884
 AUX swi-prolog-SGML_CATALOG_FILES.patch 2737 RMD160 c6d21be37fce59e96f53df75d545ffe76259f4e3 SHA1 e802aa9dd2b44d81dd8cc87c6e77ffa8d855c938 SHA256 f2a5060301dc70fb1ba49498a047e99e4beebe9cdc7d67a9ce8f1dbd9f505aba
 MD5 0aeafc6b2fe48baa70fd66135472894b files/swi-prolog-SGML_CATALOG_FILES.patch 2737
 RMD160 c6d21be37fce59e96f53df75d545ffe76259f4e3 files/swi-prolog-SGML_CATALOG_FILES.patch 2737
@@ -78,38 +70,14 @@ AUX swi-prolog-ltx2htm.patch 2337 RMD160 fee31e36070d7e244793d03607348212ce37c8f
 MD5 dad8ba83737bbb4abaa96c95e9ad5ad7 files/swi-prolog-ltx2htm.patch 2337
 RMD160 fee31e36070d7e244793d03607348212ce37c8ff files/swi-prolog-ltx2htm.patch 2337
 SHA256 741a67cf6afb96b12fcb14d68bfc9aa467b21de7579b34d2e97116862fc5afc1 files/swi-prolog-ltx2htm.patch 2337
-AUX swi-prolog-packages-cppproxy.patch 390 RMD160 81a1c19958c21b428b3c61abc6a055a7bfe9436e SHA1 57ccb1471993c9ce1dade846292820409a932da2 SHA256 b8016032b89531e2c43d1203e310887ad3d2f40a4942d9ec86f8009a7761e508
-MD5 acd8694967fddd7a24fd3bdaca01f115 files/swi-prolog-packages-cppproxy.patch 390
-RMD160 81a1c19958c21b428b3c61abc6a055a7bfe9436e files/swi-prolog-packages-cppproxy.patch 390
-SHA256 b8016032b89531e2c43d1203e310887ad3d2f40a4942d9ec86f8009a7761e508 files/swi-prolog-packages-cppproxy.patch 390
-AUX swi-prolog-packages-db-db4.patch 903 RMD160 8a810ea508550d3b2dc464d0747c068fc3c2a654 SHA1 ea78428a02e1ff8c44a5e2d2d2dec1f0af8d97e5 SHA256 b8e56a14dd6acb68484e27ce062422a743312d534058ba3a00fcef66863fdf29
-MD5 8e8619ab26411c8a196de89c85bc6f13 files/swi-prolog-packages-db-db4.patch 903
-RMD160 8a810ea508550d3b2dc464d0747c068fc3c2a654 files/swi-prolog-packages-db-db4.patch 903
-SHA256 b8e56a14dd6acb68484e27ce062422a743312d534058ba3a00fcef66863fdf29 files/swi-prolog-packages-db-db4.patch 903
-AUX swi-prolog-packages-jpl-arch.patch 2697 RMD160 35231dcfe7748e11bc13fc2a8eb957b910d5a297 SHA1 f23300c6a3539a3b43ad5eac20134987f971cafe SHA256 9f10bb835a95a77b2e069b6cce9b498b0ef2f07c423bf780843a7d39370689d9
-MD5 0e27ee98f25487dd174c0629ed64a898 files/swi-prolog-packages-jpl-arch.patch 2697
-RMD160 35231dcfe7748e11bc13fc2a8eb957b910d5a297 files/swi-prolog-packages-jpl-arch.patch 2697
-SHA256 9f10bb835a95a77b2e069b6cce9b498b0ef2f07c423bf780843a7d39370689d9 files/swi-prolog-packages-jpl-arch.patch 2697
 AUX swi-prolog-packages-jpl-install.patch 557 RMD160 db14237ac6951b5bb26276759114ef575776415b SHA1 cf661d9f9d502e30febb85de8d1e920e498dad67 SHA256 497b5c80dd316f55a21c5c954208449543bd6988d40e71719a067278daeeab78
 MD5 689af0808e7024052c262d6be879076c files/swi-prolog-packages-jpl-install.patch 557
 RMD160 db14237ac6951b5bb26276759114ef575776415b files/swi-prolog-packages-jpl-install.patch 557
 SHA256 497b5c80dd316f55a21c5c954208449543bd6988d40e71719a067278daeeab78 files/swi-prolog-packages-jpl-install.patch 557
-AUX swi-prolog-packages-ltx2htm.patch 2588 RMD160 4a9b9c96ff2f15883e47d294c21c82e21ac4068d SHA1 14656a83859f730e7331a02434361b9ccaece0f3 SHA256 987a95a420a0c48e4381e906c095e3d3003e7274fae41c50d08306dc7532e627
-MD5 cd586c24ced128f86333588013efa0c5 files/swi-prolog-packages-ltx2htm.patch 2588
-RMD160 4a9b9c96ff2f15883e47d294c21c82e21ac4068d files/swi-prolog-packages-ltx2htm.patch 2588
-SHA256 987a95a420a0c48e4381e906c095e3d3003e7274fae41c50d08306dc7532e627 files/swi-prolog-packages-ltx2htm.patch 2588
-AUX swi-prolog-packages-portage.patch 2558 RMD160 22889e8e0084f83e75d13818691497e04a73ae02 SHA1 14872823e89353d1c0f9922ef09964839d1a9bcc SHA256 3eac38e20b39cdb2199f49917f6dbd16eb6b710b0f7c1a9b0f9b84e710f8b96d
-MD5 e1fb54abeccc8098525def87107b90fc files/swi-prolog-packages-portage.patch 2558
-RMD160 22889e8e0084f83e75d13818691497e04a73ae02 files/swi-prolog-packages-portage.patch 2558
-SHA256 3eac38e20b39cdb2199f49917f6dbd16eb6b710b0f7c1a9b0f9b84e710f8b96d files/swi-prolog-packages-portage.patch 2558
 AUX swi-prolog-packages-sparc-alignment.patch 493 RMD160 01dbb170b0ba4f808fcedfa4e4baa93177a40ff1 SHA1 40fe01368d8988d88a49508953bf276f4f08663f SHA256 3cff34e6f3dedf5b549c93826593109669a486a188a11ae8d878286b52282e2a
 MD5 6e51d8bc5b62b73596a976e4e9ce4dc5 files/swi-prolog-packages-sparc-alignment.patch 493
 RMD160 01dbb170b0ba4f808fcedfa4e4baa93177a40ff1 files/swi-prolog-packages-sparc-alignment.patch 493
 SHA256 3cff34e6f3dedf5b549c93826593109669a486a188a11ae8d878286b52282e2a files/swi-prolog-packages-sparc-alignment.patch 493
-AUX swi-prolog-packages-test.patch 8017 RMD160 35756ef63a311e9b75b5b33faca71eda02e1d3b9 SHA1 13d2c347fa08a513a404209c191f7327a60bdcb2 SHA256 7109f8cf753ba0397e875b4bc5868f2eca4d41f6b1925a75bd139f0ef454929c
-MD5 42541efa6c6cf06c3786eee8669ade82 files/swi-prolog-packages-test.patch 8017
-RMD160 35756ef63a311e9b75b5b33faca71eda02e1d3b9 files/swi-prolog-packages-test.patch 8017
-SHA256 7109f8cf753ba0397e875b4bc5868f2eca4d41f6b1925a75bd139f0ef454929c files/swi-prolog-packages-test.patch 8017
 AUX swi-prolog-parallel-build.patch 1230 RMD160 2c1a55d8f5a72c8c1bee8c413c5da18d60173a52 SHA1 2d734c2c4cfbf14563c989940f4d716df7837eaa SHA256 61793bd6abd27aabdb3b0d0f9598def475dc4d02a21b52b8edaa0be9324c31f0
 MD5 127d2cf802911ae5b0d376e9e2623c39 files/swi-prolog-parallel-build.patch 1230
 RMD160 2c1a55d8f5a72c8c1bee8c413c5da18d60173a52 files/swi-prolog-parallel-build.patch 1230
@@ -126,10 +94,6 @@ AUX swi-prolog-semweb-sparc-alignment.patch 493 RMD160 01dbb170b0ba4f808fcedfa4e
 MD5 6e51d8bc5b62b73596a976e4e9ce4dc5 files/swi-prolog-semweb-sparc-alignment.patch 493
 RMD160 01dbb170b0ba4f808fcedfa4e4baa93177a40ff1 files/swi-prolog-semweb-sparc-alignment.patch 493
 SHA256 3cff34e6f3dedf5b549c93826593109669a486a188a11ae8d878286b52282e2a files/swi-prolog-semweb-sparc-alignment.patch 493
-AUX swi-prolog-test.patch 549 RMD160 c9e997ed980a1821a5113b8f42ee21444da91096 SHA1 2cac0dba39db04eff6b607ce3c91ac2b92443eac SHA256 81fc9a77480226ad519a7020d3c97fb59be6e9bba8e3d8b3b22553c5c6fc7e30
-MD5 7ab7ba6c84ff9a85c66105fdcb3434b9 files/swi-prolog-test.patch 549
-RMD160 c9e997ed980a1821a5113b8f42ee21444da91096 files/swi-prolog-test.patch 549
-SHA256 81fc9a77480226ad519a7020d3c97fb59be6e9bba8e3d8b3b22553c5c6fc7e30 files/swi-prolog-test.patch 549
 AUX swi-prolog-test_date.patch 4324 RMD160 998a7451af5f0de4a73f7f6497ffa57c012f3ee6 SHA1 a3cc522020773ce48aabf27f512d279aa1795548 SHA256 0998d9f89e0b84e53efb16a70fdc8c4a7f2ac0f700e9f8502fb53c1d8dd89388
 MD5 aaac0d487788ab74f26c127a713923a0 files/swi-prolog-test_date.patch 4324
 RMD160 998a7451af5f0de4a73f7f6497ffa57c012f3ee6 files/swi-prolog-test_date.patch 4324
@@ -152,15 +116,10 @@ DIST pl-5.6.19.tar.gz 11532046 RMD160 63dc2fccb2fd93a042e5cd5b55438e093c45af04 S
 DIST pl-5.6.20.tar.gz 11528418 RMD160 3f8b25d8370485c7fc8f15d0c55d5a873869a93a SHA1 3decae180a5870684eba38492e45e479c7881e2f SHA256 10e09ce3fdd35c12fceb3e463a617a40f119b67dc23436068dd47a9388355981
 DIST pl-5.6.21.tar.gz 11543471 RMD160 f3d164199a727abf4603cb809f5b67aeb511709a SHA1 7a93a82ac9ba78fff3497e64486bfd8fae538f14 SHA256 e83326fee55b3026fd389a89c10a09110f318c430fd88056ca5dff2e7ab11ac1
 DIST pl-5.6.22.tar.gz 11553934 RMD160 bd45af82adc55b66eacaf41c3a256a0db5baa609 SHA1 be5e2a21cb56577ad958b912d064613b1ba450bb SHA256 0efb8fb7aa349d3626fa244557d121b9db18ff0a8d139a56b018c51e98b25523
-DIST pl-5.6.8.tar.gz 9157044 RMD160 449a866a9fadf13c068393f8a4f76862ecbd2207 SHA1 56de45066ba1680ebf6a74d3b7be6ab8cd23293a SHA256 4ccfd6ed684f56750c089a8103e2d640c6591873e3f36b47a2e2d39958cccdf3
 EBUILD swi-prolog-5.6.17-r1.ebuild 3754 RMD160 fdcb7a2735295fa243eeb5260c60dafe119eb96a SHA1 08cb1f46c82bad4c2a1b3356e9efa28c56b869b9 SHA256 74b3660a42d4224fedcc0afdc9508e3f8e5bcc57d001b7fbd866fc4a92f61e2f
 MD5 ee632fe515b0aa7161085059cc3c2627 swi-prolog-5.6.17-r1.ebuild 3754
 RMD160 fdcb7a2735295fa243eeb5260c60dafe119eb96a swi-prolog-5.6.17-r1.ebuild 3754
 SHA256 74b3660a42d4224fedcc0afdc9508e3f8e5bcc57d001b7fbd866fc4a92f61e2f swi-prolog-5.6.17-r1.ebuild 3754
-EBUILD swi-prolog-5.6.17.ebuild 3640 RMD160 9636aef9d4827e1dbe92f69fe1753618ac0f8051 SHA1 f070a1c99bec57684e022353dbdf6c6b2630d0f0 SHA256 239d8a99786cd8603df47a99a1c0992b8893773ff9e1e44fbf8a1adf22c55f4a
-MD5 998a2c2b1b5ebda95e28f5dae96e8f80 swi-prolog-5.6.17.ebuild 3640
-RMD160 9636aef9d4827e1dbe92f69fe1753618ac0f8051 swi-prolog-5.6.17.ebuild 3640
-SHA256 239d8a99786cd8603df47a99a1c0992b8893773ff9e1e44fbf8a1adf22c55f4a swi-prolog-5.6.17.ebuild 3640
 EBUILD swi-prolog-5.6.18.ebuild 3361 RMD160 ac69208c78234bdcdfed3fe8f34922087b60abe4 SHA1 c345a2db4fcf34854f7fd395c0c87ef51875147a SHA256 daa5ea73d61f360c9ee9d355a768fc20895fb10a74a34b960bbe3cf895fcb208
 MD5 2b85cff3ccb1919a17e8d77cbd1a4593 swi-prolog-5.6.18.ebuild 3361
 RMD160 ac69208c78234bdcdfed3fe8f34922087b60abe4 swi-prolog-5.6.18.ebuild 3361
@@ -181,21 +140,14 @@ EBUILD swi-prolog-5.6.22.ebuild 3326 RMD160 f359cdc9a9370ccef318bc462392430407ec
 MD5 9800617ce9e5a57cff27b0f6b893ac59 swi-prolog-5.6.22.ebuild 3326
 RMD160 f359cdc9a9370ccef318bc462392430407ec9180 swi-prolog-5.6.22.ebuild 3326
 SHA256 7fdee3d57d0fc312187a6fad95bfbe90ecfdeb190af8b46c389e68ea709c79a8 swi-prolog-5.6.22.ebuild 3326
-EBUILD swi-prolog-5.6.8.ebuild 3503 RMD160 db4322b8c734af20011e4845a93427a8328ae113 SHA1 5fd4712a46f68f40565e2150be372a1831057de0 SHA256 ce9ccb7461889a948428ca50b473cc77f5a0c3d8fdfa95cd98d4530df2cd5e7a
-MD5 6bc8df3140ced306811de8495f5e625d swi-prolog-5.6.8.ebuild 3503
-RMD160 db4322b8c734af20011e4845a93427a8328ae113 swi-prolog-5.6.8.ebuild 3503
-SHA256 ce9ccb7461889a948428ca50b473cc77f5a0c3d8fdfa95cd98d4530df2cd5e7a swi-prolog-5.6.8.ebuild 3503
-MISC ChangeLog 8708 RMD160 2b491bc75d802f6af89e63cc5bddf025f89a6d3c SHA1 2ae9e6e364644727fce469f31cba8deea623ba9b SHA256 dae097305a6dc2feb185eabaa5e6bae252bf5d12e668f0b052b948b2ac1d7166
-MD5 cb377b55c4de1f001471b97e8b2f3c63 ChangeLog 8708
-RMD160 2b491bc75d802f6af89e63cc5bddf025f89a6d3c ChangeLog 8708
-SHA256 dae097305a6dc2feb185eabaa5e6bae252bf5d12e668f0b052b948b2ac1d7166 ChangeLog 8708
+MISC ChangeLog 9179 RMD160 0ec372dd6d2e17b9dd6027f7758d16ae8a2363fa SHA1 8627a4132ff47c1a04906121ca67d474e26d7992 SHA256 c2440f7394cb09060adfc61966a1554ca54518ff4799f00265667de627d115cc
+MD5 e9ab02d606c16940dd4ce9e23fbf2dd0 ChangeLog 9179
+RMD160 0ec372dd6d2e17b9dd6027f7758d16ae8a2363fa ChangeLog 9179
+SHA256 c2440f7394cb09060adfc61966a1554ca54518ff4799f00265667de627d115cc ChangeLog 9179
 MISC metadata.xml 159 RMD160 38d27fd1c5faabedefa5507dfd83cb4c952fbc8c SHA1 52b92682cf41e53e71bf432537a16215bd9546b1 SHA256 851bf218a4283a1d8ea6ef98af0119a40eaa78bfaaec49c2f3440437f52889ba
 MD5 9187f53634e60ab7eb2ac7e98b0b19f7 metadata.xml 159
 RMD160 38d27fd1c5faabedefa5507dfd83cb4c952fbc8c metadata.xml 159
 SHA256 851bf218a4283a1d8ea6ef98af0119a40eaa78bfaaec49c2f3440437f52889ba metadata.xml 159
-MD5 b4d993594a190404c1182c9bdb35bf9f files/digest-swi-prolog-5.6.17 235
-RMD160 034d25c7f8734034d1e3656c79ae4920a50dd70d files/digest-swi-prolog-5.6.17 235
-SHA256 56784b2db722fb8073bd5d963a45ba523b837ae255022761ed84c18b875f74fd files/digest-swi-prolog-5.6.17 235
 MD5 b4d993594a190404c1182c9bdb35bf9f files/digest-swi-prolog-5.6.17-r1 235
 RMD160 034d25c7f8734034d1e3656c79ae4920a50dd70d files/digest-swi-prolog-5.6.17-r1 235
 SHA256 56784b2db722fb8073bd5d963a45ba523b837ae255022761ed84c18b875f74fd files/digest-swi-prolog-5.6.17-r1 235
@@ -214,6 +166,3 @@ SHA256 235ad468bd9bf33b3b4a8bbd93ffe683acf3be890fa519ea65749e025c9c2465 files/di
 MD5 ef05af9c50253e2b1809e69f9408245d files/digest-swi-prolog-5.6.22 235
 RMD160 b9adfbd625fda310c65eb046ee3c1e6b3d130b41 files/digest-swi-prolog-5.6.22 235
 SHA256 8a3021a9a941de70bf1f19197347e45617a9a8bf18ba7684e4b29b790345dbfb files/digest-swi-prolog-5.6.22 235
-MD5 69c20c79c5aeb698888e72036cb021c6 files/digest-swi-prolog-5.6.8 229
-RMD160 221664df6018bc92d6323e5c138dbb23e68f8d20 files/digest-swi-prolog-5.6.8 229
-SHA256 c74fedc27886eb5e2b6fb24da242d983b5f0f34c0502f0b46386dbd7355ce76a files/digest-swi-prolog-5.6.8 229
diff --git a/dev-lang/swi-prolog/files/digest-swi-prolog-5.6.17 b/dev-lang/swi-prolog/files/digest-swi-prolog-5.6.17
deleted file mode 100644
index 56aaea0e1546..000000000000
--- a/dev-lang/swi-prolog/files/digest-swi-prolog-5.6.17
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 3858e1f3073deac18ca1f76986f8b69c pl-5.6.17.tar.gz 10652203
-RMD160 7f6786013b43c2e00b8e4a3799cbad1f7cac2fab pl-5.6.17.tar.gz 10652203
-SHA256 4768761ec4ad4c7160373950bc21d6124c3641dfff9dbe5db4dd7c48433e0072 pl-5.6.17.tar.gz 10652203
diff --git a/dev-lang/swi-prolog/files/digest-swi-prolog-5.6.8 b/dev-lang/swi-prolog/files/digest-swi-prolog-5.6.8
deleted file mode 100644
index 660bad49da26..000000000000
--- a/dev-lang/swi-prolog/files/digest-swi-prolog-5.6.8
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 165efe46da387ce3352d490e06e0b4bb pl-5.6.8.tar.gz 9157044
-RMD160 449a866a9fadf13c068393f8a4f76862ecbd2207 pl-5.6.8.tar.gz 9157044
-SHA256 4ccfd6ed684f56750c089a8103e2d640c6591873e3f36b47a2e2d39958cccdf3 pl-5.6.8.tar.gz 9157044
diff --git a/dev-lang/swi-prolog/files/swi-prolog-CFLAGS.patch b/dev-lang/swi-prolog/files/swi-prolog-CFLAGS.patch
deleted file mode 100644
index cce4f32ae9ad..000000000000
--- a/dev-lang/swi-prolog/files/swi-prolog-CFLAGS.patch
+++ /dev/null
@@ -1,305 +0,0 @@
---- pl-5.6.4.orig/src/configure	2006-02-04 04:38:51.000000000 +1300
-+++ pl-5.6.4/src/configure	2006-02-15 21:02:38.000000000 +1300
-@@ -14094,7 +14095,7 @@
-   LNLIBS="$LIBS"
- fi
- 
--echo "	CFLAGS=$CWFLAGS $COFLAGS $CIFLAGS $CMFLAGS"
-+echo "	CFLAGS=$CWFLAGS $COFLAGS $CMFLAGS"
- echo "	LDFLAGS=$LDFLAGS"
- echo "	LIBS=$LIBS"
- 
---- pl-5.6.4.orig/src/Makefile.in	2006-02-04 04:38:51.000000000 +1300
-+++ pl-5.6.4/src/Makefile.in	2006-02-15 20:08:21.000000000 +1300
-@@ -69,7 +69,7 @@
- CWFLAGS=@CWFLAGS@
- CIFLAGS=@CIFLAGS@
- CMFLAGS=@CMFLAGS@
--CFLAGS=	$(CWFLAGS) $(COFLAGS) $(CIFLAGS) $(CMFLAGS)
-+CFLAGS=	$(CWFLAGS) $(COFLAGS) $(CMFLAGS)
- LDFLAGS=@LDFLAGS@
- 
- PLFOREIGN=@PLFOREIGN@
---- pl-5.6.4.orig/src/rc/Makefile.in	2005-09-24 00:02:05.000000000 +1200
-+++ pl-5.6.4/src/rc/Makefile.in	2006-02-15 20:16:46.000000000 +1300
-@@ -34,7 +34,7 @@
- CIFLAGS=@CIFLAGS@
- CMFLAGS=@CMFLAGS@
- LDFLAGS=@LDFLAGS@
--CFLAGS=	$(CWFLAGS) $(COFLAGS) $(CIFLAGS) $(CMFLAGS)
-+CFLAGS=	$(CWFLAGS) $(COFLAGS) $(CMFLAGS)
- 
- INSTALL=@INSTALL@
- INSTALL_PROGRAM=@INSTALL_PROGRAM@
---- pl-5.6.4.orig/packages/clib/configure.in	2006-01-11 09:41:55.000000000 +1300
-+++ pl-5.6.4/packages/clib/configure.in	2006-02-13 22:35:58.000000000 +1300
-@@ -72,12 +72,11 @@
- AC_PROG_INSTALL
- AC_ISC_POSIX
- AC_HEADER_STDC
--CFLAGS="$CMFLAGS"
- AC_FUNC_ALLOCA
- AC_C_BIGENDIAN
- 
- if test ! -z "$GCC"; then
--    COFLAGS="-O2 -fno-strict-aliasing"
-+    COFLAGS="$CFLAGS"
-     CWFLAGS=-Wall
- else
-     COFLAGS=-O
---- pl-5.6.4.orig/packages/clib/maildrop/rfc2045/Makefile.in	2005-07-25 02:37:57.000000000 +1200
-+++ pl-5.6.4/packages/clib/maildrop/rfc2045/Makefile.in	2006-02-13 22:38:05.000000000 +1300
-@@ -5,7 +5,7 @@
- ################################################################
- 
- CC=@CC@
--CFLAGS=@CFLAGS@ @DEFS@
-+CFLAGS=@CFLAGS@ -fPIC @DEFS@
- LIBS=@LIBS@
- AR=@AR@
- RANLIB=@RANLIB@
---- pl-5.6.4.orig/packages/clib/maildrop/rfc822/Makefile.in	2006-02-04 04:38:49.000000000 +1300
-+++ pl-5.6.4/packages/clib/maildrop/rfc822/Makefile.in	2006-02-13 22:39:03.000000000 +1300
-@@ -5,7 +5,7 @@
- ################################################################
- 
- CC=@CC@
--CFLAGS=@CFLAGS@ @DEFS@
-+CFLAGS=@CFLAGS@ -fPIC @DEFS@
- LIBS=@LIBS@
- AR=@AR@
- RANLIB=@RANLIB@
---- pl-5.6.4.orig/packages/cppproxy/configure.in	2006-01-23 02:56:38.000000000 +1300
-+++ pl-5.6.4/packages/cppproxy/configure.in	2006-02-15 21:28:45.000000000 +1300
-@@ -71,12 +71,11 @@
- AC_PROG_INSTALL
- AC_ISC_POSIX
- AC_HEADER_STDC
--CFLAGS="$CMFLAGS"
- AC_FUNC_ALLOCA
- AC_C_BIGENDIAN
- 
- if test ! -z "$GCC"; then
--    COFLAGS="-O2 -fno-strict-aliasing"
-+    COFLAGS="$CFLAGS"
-     CWFLAGS=-Wall
- else
-     COFLAGS=-O
---- pl-5.6.4.orig/packages/db/configure.in	2005-12-15 05:12:24.000000000 +1300
-+++ pl-5.6.4/packages/db/configure.in	2006-02-13 22:39:53.000000000 +1300
-@@ -92,13 +92,12 @@
- AC_ISC_POSIX
- AC_HEADER_STDC
- if test ! -z "$GCC"; then
--    COFLAGS="-O2 -fno-strict-aliasing"
-+    COFLAGS="$CFLAGS"
-     CWFLAGS=-Wall
- else
-     COFLAGS=-O
-     CWFLAGS=
- fi
--CFLAGS="$CMFLAGS $CIFLAGS"
- AC_FUNC_ALLOCA
- AC_C_BIGENDIAN
- 
---- pl-5.6.4.orig/packages/db/Makefile.in	2005-12-15 04:54:38.000000000 +1300
-+++ pl-5.6.4/packages/db/Makefile.in	2006-02-13 22:40:29.000000000 +1300
-@@ -16,7 +16,7 @@
- COFLAGS=@COFLAGS@
- CWFLAGS=@CWFLAGS@
- CMFLAGS=@CMFLAGS@
--CIFLAGS=-I. -I$(PLBASE)/include @CIFLAGS@
-+CIFLAGS=-I. -I../../include @CIFLAGS@
- CFLAGS=$(COFLAGS) $(CWFLAGS) $(CMFLAGS) $(CIFLAGS) @DEFS@
- LD_RUN_PATH=@LD_RUN_PATH@
- SO=@SO@
---- pl-5.6.4.orig/packages/jpl/configure.in	2005-01-31 23:47:37.000000000 +1300
-+++ pl-5.6.4/packages/jpl/configure.in	2006-02-13 22:41:09.000000000 +1300
-@@ -70,10 +70,9 @@
- AC_PROG_INSTALL
- AC_ISC_POSIX
- AC_HEADER_STDC
--CFLAGS="$CMFLAGS"
- 
- if test ! -z "$GCC"; then
--    COFLAGS="-O2 -fno-strict-aliasing"
-+    COFLAGS="$CFLAGS"
-     CWFLAGS="-Wall -Wno-strict-aliasing"
- else
-     COFLAGS=-O
---- pl-5.6.0.orig/packages/ltx2htm/Makefile.in	2005-12-02 21:53:05.000000000 +1300
-+++ pl-5.6.0/packages/ltx2htm/Makefile.in	2006-01-07 09:55:01.000000000 +1300
-@@ -27,7 +29,7 @@
- LDFLAGS=@LDSOFLAGS@
- 
- CDFLAGS=-D__SWI_PROLOG__
--CFLAGS=$(COFLAGS) $(CWFLAGS) $(CMFLAGS) $(CIFLAGS) @DEFS@ $(CDFLAGS)
-+CFLAGS=$(COFLAGS) $(CWFLAGS) $(CMFLAGS) -fPIC $(CIFLAGS) @DEFS@ $(CDFLAGS)
- INSTALL=@INSTALL@
- INSTALL_PROGRAM=@INSTALL_PROGRAM@
- INSTALL_DATA=@INSTALL_DATA@
---- pl-5.6.4.orig/packages/ltx2htm/configure.in	2004-09-22 02:28:17.000000000 +1200
-+++ pl-5.6.4/packages/ltx2htm/configure.in	2006-02-13 22:41:48.000000000 +1300
-@@ -56,12 +56,11 @@
- AC_PROG_INSTALL
- AC_ISC_POSIX
- AC_HEADER_STDC
--CFLAGS="$CMFLAGS"
- AC_FUNC_ALLOCA
- AC_C_BIGENDIAN
- 
- if test ! -z "$GCC"; then
--    COFLAGS=-O2
-+    COFLAGS="$CFLAGS"
-     CWFLAGS=-Wall
- else
-     COFLAGS=-O
---- pl-5.6.4.orig/packages/mp/configure.in	2004-09-22 02:28:17.000000000 +1200
-+++ pl-5.6.4/packages/mp/configure.in	2006-02-13 22:42:32.000000000 +1300
-@@ -85,13 +85,12 @@
- AC_ISC_POSIX
- AC_HEADER_STDC
- if test ! -z "$GCC"; then
--    COFLAGS="-O2 -fno-strict-aliasing"
-+    COFLAGS="$CFLAGS"
-     CWFLAGS=-Wall
- else
-     COFLAGS=-O
-     CWFLAGS=
- fi
--CFLAGS="$CIFLAGS $CMFLAGS"
- AC_FUNC_ALLOCA
- AC_C_BIGENDIAN
- 
---- pl-5.6.4.orig/packages/mp/Makefile.in	2006-02-04 04:38:50.000000000 +1300
-+++ pl-5.6.4/packages/mp/Makefile.in	2006-02-13 22:42:56.000000000 +1300
-@@ -12,7 +12,7 @@
- COFLAGS=@COFLAGS@
- CWFLAGS=@CWFLAGS@
- CMFLAGS=@CMFLAGS@
--CIFLAGS=@CIFLAGS@ -I. -I$(PLBASE)/include
-+CIFLAGS=@CIFLAGS@ -I. -I../../include
- CFLAGS=$(COFLAGS) $(CWFLAGS) $(CMFLAGS) $(CIFLAGS) @DEFS@
- LOCALLIB=@LOCALLIB@
- LIBS=@LIBS@
---- pl-5.6.4.orig/packages/nlp/configure.in	2005-11-26 23:54:48.000000000 +1300
-+++ pl-5.6.4/packages/nlp/configure.in	2006-02-13 22:43:37.000000000 +1300
-@@ -71,12 +71,11 @@
- AC_PROG_INSTALL
- AC_ISC_POSIX
- AC_HEADER_STDC
--CFLAGS="$CMFLAGS"
- AC_FUNC_ALLOCA
- AC_C_BIGENDIAN
- 
- if test ! -z "$GCC"; then
--    COFLAGS="-O2 -fno-strict-aliasing"
-+    COFLAGS="$CFLAGS"
-     CWFLAGS=-Wall
- else
-     COFLAGS=-O
---- pl-5.6.4.orig/packages/odbc/configure.in	2006-02-04 04:38:50.000000000 +1300
-+++ pl-5.6.4/packages/odbc/configure.in	2006-02-13 22:44:24.000000000 +1300
-@@ -67,12 +67,11 @@
- AC_PROG_INSTALL
- AC_ISC_POSIX
- AC_HEADER_STDC
--CFLAGS="$CMFLAGS"
- AC_FUNC_ALLOCA
- AC_C_BIGENDIAN
- 
- if test ! -z "$GCC"; then
--    COFLAGS="-O2 -fno-strict-aliasing"
-+    COFLAGS="$CFLAGS"
-     CWFLAGS=-Wall
- else
-     COFLAGS=-O
---- pl-5.6.4.orig/packages/semweb/configure.in	2006-02-07 04:59:54.000000000 +1300
-+++ pl-5.6.4/packages/semweb/configure.in	2006-02-13 22:44:55.000000000 +1300
-@@ -65,14 +65,13 @@
- AC_PROG_INSTALL
- AC_ISC_POSIX
- AC_HEADER_STDC
--CFLAGS="$CMFLAGS"
- AC_FUNC_ALLOCA
- AC_C_BIGENDIAN
- AC_C_INLINE
- AC_CHECK_SIZEOF(long)
- 
- if test ! -z "$GCC"; then
--    COFLAGS="-O3 -fno-strict-aliasing"
-+    COFLAGS="$CFLAGS"
-     CWFLAGS=-Wall
- else
-     COFLAGS=-O
---- pl-5.6.4.orig/packages/sgml/configure.in	2006-02-04 04:38:50.000000000 +1300
-+++ pl-5.6.4/packages/sgml/configure.in	2006-02-13 22:46:04.000000000 +1300
-@@ -96,16 +96,11 @@
- AC_ISC_POSIX
- AC_HEADER_STDC
- if test ! -z "$GCC"; then
--    if test $gmake = yes; then
--        COFLAGS='$(shell if test -r .coflags; then cat .coflags; else echo "-O2"; fi)'
--    else
--	COFLAGS="-O2 -fno-strict-aliasing"
--    fi
-+    COFLAGS="$CFLAGS"
-     CWFLAGS="$CWFLAGS -Wall"
- else
-     COFLAGS=-O
- fi
--CFLAGS="$CMFLAGS"
- AC_C_BIGENDIAN
- AC_C_INLINE
- AC_CHECK_SIZEOF(long, 4)
---- pl-5.6.4.orig/packages/ssl/configure.in	2006-02-04 04:38:50.000000000 +1300
-+++ pl-5.6.4/packages/ssl/configure.in	2006-02-13 22:46:41.000000000 +1300
-@@ -67,12 +67,11 @@
- AC_PROG_INSTALL
- AC_ISC_POSIX
- AC_HEADER_STDC
--CFLAGS="$CMFLAGS"
- AC_FUNC_ALLOCA
- AC_C_BIGENDIAN
- 
- if test ! -z "$GCC"; then
--    COFLAGS="-O2 -fno-strict-aliasing"
-+    COFLAGS="$CFLAGS"
-     CWFLAGS=-Wall
- else
-     COFLAGS=-O
---- pl-5.6.4.orig/packages/table/configure.in	2005-01-31 23:47:37.000000000 +1300
-+++ pl-5.6.4/packages/table/configure.in	2006-02-13 22:47:06.000000000 +1300
-@@ -69,12 +69,11 @@
- AC_PROG_INSTALL
- AC_ISC_POSIX
- AC_HEADER_STDC
--CFLAGS="$CMFLAGS"
- AC_FUNC_ALLOCA
- AC_C_BIGENDIAN
- 
- if test ! -z "$GCC"; then
--    COFLAGS="-O2 -fno-strict-aliasing"
-+    COFLAGS="$CFLAGS"
-     CWFLAGS=-Wall
- else
-     COFLAGS=-O
---- pl-5.6.4.orig/packages/xpce/src/configure.in	2006-02-04 04:38:51.000000000 +1300
-+++ pl-5.6.4/packages/xpce/src/configure.in	2006-02-13 22:47:59.000000000 +1300
-@@ -539,7 +539,7 @@
- AC_ISC_POSIX
- AC_HEADER_STDC
- if test ! -z "$GCC"; then
--    COFLAGS="-O2 -fno-strict-aliasing"
-+    COFLAGS="$CFLAGS"
-     if test "$ac_cv_header_stdc" = "yes" || test "$syslibh" = "yes"; then
-         CWFLAGS=-Wall
-     else
-@@ -549,7 +549,6 @@
-     COFLAGS=-O
-     CWFLAGS=
- fi
--CFLAGS="$CMFLAGS"
- AC_C_INLINE
- AC_FUNC_ALLOCA
- AC_C_BIGENDIAN
diff --git a/dev-lang/swi-prolog/files/swi-prolog-PLBASE.patch b/dev-lang/swi-prolog/files/swi-prolog-PLBASE.patch
deleted file mode 100644
index 25a3987e0d1e..000000000000
--- a/dev-lang/swi-prolog/files/swi-prolog-PLBASE.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-diff -ur pl-5.6.8.orig/packages/C-sicstus/Makefile.in pl-5.6.8/packages/C-sicstus/Makefile.in
---- pl-5.6.8.orig/packages/C-sicstus/Makefile.in	2001-01-22 06:55:23.000000000 +1300
-+++ pl-5.6.8/packages/C-sicstus/Makefile.in	2006-06-04 13:23:31.000000000 +1200
-@@ -9,7 +9,7 @@
- SP_PATH=@SP_PATH@
- RANLIB=@RANLIB@
- AR=@AR@
--LIBDIR=$(prefix)/lib
-+LIBDIR=@libdir@
- INCLDIR=$(prefix)/include
- 
- CC=@CC@
-diff -ur pl-5.6.8.orig/packages/ltx2htm/Makefile.in pl-5.6.8/packages/ltx2htm/Makefile.in
---- pl-5.6.8.orig/packages/ltx2htm/Makefile.in	2005-12-02 21:53:05.000000000 +1300
-+++ pl-5.6.8/packages/ltx2htm/Makefile.in	2006-06-04 13:35:36.000000000 +1200
-@@ -17,6 +17,7 @@
- prefix=@prefix@
- exec_prefix=@exec_prefix@
- bindir=@bindir@
-+libdir=@libdir@
- 
- CC=@CC@
- COFLAGS=@COFLAGS@
-@@ -33,7 +34,7 @@
- INSTALL_DATA=@INSTALL_DATA@
- 
- # Don't change, this is also in latex2html.in!
--LIBDIR=$(prefix)/lib/latex2html
-+LIBDIR=$(libdir)/latex2html
- 
- OBJ=	tex.o psfile.o
- LIB=	latex2html.pl latex.cmd pl.pl pl.cmd xpce.pl xpce.cmd
-diff -ur pl-5.6.8.orig/packages/Makefile.in pl-5.6.8/packages/Makefile.in
---- pl-5.6.8.orig/packages/Makefile.in	2005-11-13 03:15:23.000000000 +1300
-+++ pl-5.6.8/packages/Makefile.in	2006-06-04 13:25:56.000000000 +1200
-@@ -28,9 +28,10 @@
- prefix=@prefix@
- exec_prefix=@exec_prefix@
- bindir=@bindir@
-+libdir=@libdir@
- PL=@PL@@RT@
- PLVERSION=@PLVERSION@
--PLBASE=$(prefix)/lib/@PL@-$(PLVERSION)
-+PLBASE=$(libdir)/@PL@-$(PLVERSION)
- PKGDOC=$(PLBASE)/doc/packages
- PLLIBS=@LIBS@
- PLARCH=@ARCH@
-diff -ur pl-5.6.8.orig/src/configure.in pl-5.6.8/src/configure.in
---- pl-5.6.8.orig/src/configure.in	2006-03-13 23:06:55.000000000 +1300
-+++ pl-5.6.8/src/configure.in	2006-06-04 13:34:13.000000000 +1200
-@@ -136,11 +136,10 @@
- 
- 
- dnl ****************************************************************
--dnl Setup PLBASE.  Need to expand prefix first as this isn't yet set. Yek
-+dnl Setup PLBASE.  No need to expand libdir as this is already set.
- dnl ****************************************************************
- 
--test "x$prefix" = xNONE && prefix=$ac_default_prefix
--PLBASE=$prefix/lib/$PL-$PLVERSION
-+PLBASE=$libdir/$PL-$PLVERSION
- 
- dnl ****************************************************************
- dnl Checking for GNU make vpath construct
-diff -ur pl-5.6.8.orig/src/Makefile.in pl-5.6.8/src/Makefile.in
---- pl-5.6.8.orig/src/Makefile.in	2006-02-04 04:38:51.000000000 +1300
-+++ pl-5.6.8/src/Makefile.in	2006-06-04 13:18:45.000000000 +1200
-@@ -36,6 +36,7 @@
- srcdir=@srcdir@
- @VPATH@ @srcdir@
- bindir=@bindir@
-+libdir=@libdir@
- mandir=@mandir@
- mansec=1
- lmansec=3
-@@ -46,7 +47,7 @@
- PLVERSION=@PLVERSION@
- PL=@PL@@RT@
- PLV=@PL@@RT@-@PLVERSION@
--PLBASE=$(prefix)/lib/@PL@@RT@-@PLVERSION@
-+PLBASE=$(libdir)/@PL@@RT@-@PLVERSION@
- BOOTFILE=@BOOTFILE@
- 
- CC=@CC@
-@@ -349,7 +350,7 @@
- 		$(INSTALL_DATA) libplimp.a $(DESTDIR)$(PLBASE)/lib/$(ARCH)
- 
- idirs::
--		if [ ! -d $(DESTDIR)$(prefix)/lib  ]; then $(MKDIR) $(DESTDIR)$(prefix)/lib; fi
-+		if [ ! -d $(DESTDIR)$(libdir) ]; then $(MKDIR) $(DESTDIR)$(libdir); fi
- 		if [ ! -d $(DESTDIR)$(PLBASE) ]; then $(MKDIR) $(DESTDIR)$(PLBASE); fi
- 		for d in $(installdirs); do \
- 			if [ ! -d $(DESTDIR)$(PLBASE)/$$d ]; then \
-@@ -412,7 +413,7 @@
- # runtime-only environment installation
- #
- 
--RTHOME=		$(DESTDIR)$(prefix)/lib/$(PLV)
-+RTHOME=		$(DESTDIR)$(libdir)/$(PLV)
- RTDIRS=		$(RTHOME) $(RTHOME)/bin $(RTHOME)/lib $(RTHOME)/lib/$(ARCH) \
- 		$(RTHOME)/man $(RTHOME)/bin/$(ARCH) $(RTHOME)/include
- 
-diff -ur pl-5.6.8.orig/src/rc/Makefile.in pl-5.6.8/src/rc/Makefile.in
---- pl-5.6.8.orig/src/rc/Makefile.in	2005-09-24 00:02:05.000000000 +1200
-+++ pl-5.6.8/src/rc/Makefile.in	2006-06-04 13:21:38.000000000 +1200
-@@ -18,7 +18,8 @@
- srcdir=@srcdir@
- @VPATH@ @srcdir@
- bindir=$(exec_prefix)/bin
--PLBASE=$(prefix)/lib/@PL@-$(PLVERSION)
-+libdir=@libdir@
-+PLBASE=$(libdir)/@PL@-$(PLVERSION)
- man_prefix=$(prefix)/man
- mansec=1
- lmansec=3
diff --git a/dev-lang/swi-prolog/files/swi-prolog-packages-cppproxy.patch b/dev-lang/swi-prolog/files/swi-prolog-packages-cppproxy.patch
deleted file mode 100644
index ba18dbbdd7b3..000000000000
--- a/dev-lang/swi-prolog/files/swi-prolog-packages-cppproxy.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- pl-5.6.7.orig/packages/configure.in	2005-11-30 05:26:17.000000000 +1300
-+++ pl-5.6.7/packages/configure.in	2006-02-15 21:16:23.000000000 +1300
-@@ -54,7 +54,7 @@
- 
- 
- if [ -z "$PKG" ]; then
--  PKG="clib cpp odbc table xpce sgml sgml/RDF semweb http chr clpqr nlp ssl jpl"
-+  PKG="clib cpp cppproxy odbc table xpce sgml sgml/RDF semweb http chr clpqr nlp ssl jpl"
- fi
- 
- configoptions=""
diff --git a/dev-lang/swi-prolog/files/swi-prolog-packages-db-db4.patch b/dev-lang/swi-prolog/files/swi-prolog-packages-db-db4.patch
deleted file mode 100644
index 2e4370d9abd3..000000000000
--- a/dev-lang/swi-prolog/files/swi-prolog-packages-db-db4.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- pl-5.6.4.orig/packages/db/configure.in	2005-12-15 05:12:24.000000000 +1300
-+++ pl-5.6.4/packages/db/configure.in	2006-02-13 23:11:02.000000000 +1300
-@@ -108,9 +107,14 @@
- AC_CHECK_LIB(nsl, t_bind,
- 	     [NETLIBS="$NETLIBS -lnsl"]
- 	     AC_DEFINE(HAVE_LIBNSL))
--AC_CHECK_LIB($LIBDB, db_create,
--	     LIBS="-l$LIBDB $LIBS"; HAVEDB=yes,
--	     HAVEDB=no)
-+HAVEDB=no
-+for dbname in db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db
-+do
-+   AC_CHECK_LIB($dbname, db_create_4002, [LIBDB=-l$dbname; LIBS="-l$dbname $LIBS"; HAVEDB=yes; break],
-+   AC_CHECK_LIB($dbname, db_create_4001, [LIBDB=-l$dbname; LIBS="-l$dbname $LIBS"; HAVEDB=yes; break],
-+   AC_CHECK_LIB($dbname, db_create_4000, [LIBDB=-l$dbname; LIBS="-l$dbname $LIBS"; HAVEDB=yes; break],
-+   AC_CHECK_LIB($dbname, db_create, [LIBDB=-l$dbname; LIBS="-l$dbname $LIBS"; HAVEDB=yes; break]))))
-+done
- 
- AC_CHECK_HEADERS(db.h)
- 
diff --git a/dev-lang/swi-prolog/files/swi-prolog-packages-jpl-arch.patch b/dev-lang/swi-prolog/files/swi-prolog-packages-jpl-arch.patch
deleted file mode 100644
index 430e5088a8ee..000000000000
--- a/dev-lang/swi-prolog/files/swi-prolog-packages-jpl-arch.patch
+++ /dev/null
@@ -1,91 +0,0 @@
---- pl-5.6.5.orig/packages/jpl/ac/ac_jni_include_dirs.m4	2006-02-04 04:38:49.000000000 +1300
-+++ pl-5.6.5/packages/jpl/ac/ac_jni_include_dirs.m4	2006-02-19 15:01:33.000000000 +1300
-@@ -54,19 +54,23 @@
- done
- 
- case "$host_cpu" in
--	i?86)	_JNI_LIBDIRS="i386"
--		_JNI_LIBSUBDIR="client"
--		;;
--	x86_64)	_JNI_LIBDIRS="amd64"
--		_JNI_LIBSUBDIR="server"
-+	i?86)		_JNI_LIBDIRS="lib/i386"
-+			_JNI_LIBSUBDIR="client"
-+			;;
-+	x86_64)		_JNI_LIBDIRS="lib/amd64"
-+			_JNI_LIBSUBDIR="server"
-+			;;
-+	powerpc)	_JNI_LIBDIRS="bin lib/ppc"
-+			_JNI_LIBSUBDIR="classic"
- 		;;
- 	*)	_JNI_LIBDIRS=""
- esac
- 
- for d in $_JNI_LIBDIRS; do
--	echo "Trying $_JTOPDIR/jre/lib/$d/$_JNI_LIBSUBDIR"
--	if test -d $_JTOPDIR/jre/lib/$d/$_JNI_LIBSUBDIR; then
--		JNI_CLIENT_DIRS="$JNI_CLIENT_DIRS $_JTOPDIR/jre/lib/$d/$_JNI_LIBSUBDIR $_JTOPDIR/jre/lib/$d"
-+	echo "Trying $_JTOPDIR/jre/$d/$_JNI_LIBSUBDIR"
-+	if test -d $_JTOPDIR/jre/$d/$_JNI_LIBSUBDIR; then
-+		JNI_CLIENT_DIRS="$JNI_CLIENT_DIRS $_JTOPDIR/jre/$d/$_JNI_LIBSUBDIR $_JTOPDIR/jre/$d"
-+		JNI_LD_PATH="$_JTOPDIR/jre/$d"
-  	fi
- done
- 
---- pl-5.6.4.orig/packages/jpl/configure.in	2005-01-31 23:47:37.000000000 +1300
-+++ pl-5.6.4/packages/jpl/configure.in	2006-02-13 23:18:33.000000000 +1300
-@@ -18,6 +18,7 @@
- AC_SUBST(LDSOFLAGS)
- AC_SUBST(JAVA_HOME)
- AC_SUBST(JAVALIBS)
-+AC_SUBST(JAVALDPATH)
- 
- AC_ARG_ENABLE(mt, [  --enable-mt		  Enable Multi-threading],
- 	      [case "$enableval" in
-@@ -89,13 +89,16 @@
- 	;;
- esac
- 
-+AC_CANONICAL_HOST			dnl needed to get $host_os
-+
-+if test "$host_cpu" = powerpc; then
-+	JAVALIBS=`echo $JAVALIBS | sed 's/-lverify//'`
-+fi
- 
- dnl ================================================================
- dnl Java stuff
- dnl ================================================================
- 
--AC_CANONICAL_HOST			dnl needed to get $host_os
--
- m4_include([ac/ac_prog_javac.m4])
- m4_include([ac/ac_prog_javac_works.m4])
- m4_include([ac/ac_jni_include_dirs.m4])
-@@ -126,6 +129,8 @@
-   CIFLAGS="$CIFLAGS -I$d"
- done
- 
-+JAVALDPATH=$JNI_LD_PATH
-+
- for d in $JNI_CLIENT_DIRS; do
-   LDSOFLAGS="$LDSOFLAGS -L$d"
- done
---- pl-5.6.4.orig/packages/jpl/Makefile.in	2006-02-04 04:38:49.000000000 +1300
-+++ pl-5.6.4/packages/jpl/Makefile.in	2006-02-13 23:20:13.000000000 +1300
-@@ -34,6 +34,7 @@
- JAVA_HOME=@JAVA_HOME@
- JAVAC=@JAVAC@
- JAVALIBS=@JAVALIBS@
-+JAVALDPATH=@JAVALDPATH@
- 
- DOCTOTEX=$(PCEHOME)/bin/doc2tex
- PLTOTEX=$(PCEHOME)/bin/pl2tex
-@@ -68,7 +69,7 @@
- ################################################################
- 
- check::		TestJPL.class
--		$(PL) -q -f check.pl -g test,halt -t 'halt(1)'
-+		LD_LIBRARY_PATH=$(JAVALDPATH) $(PL) -q -f check.pl -g test,halt -t 'halt(1)'
- 
- TestJPL.class:	TestJPL.java
- 		$(JAVAC) -classpath jpl.jar TestJPL.java
diff --git a/dev-lang/swi-prolog/files/swi-prolog-packages-ltx2htm.patch b/dev-lang/swi-prolog/files/swi-prolog-packages-ltx2htm.patch
deleted file mode 100644
index a516d33bd983..000000000000
--- a/dev-lang/swi-prolog/files/swi-prolog-packages-ltx2htm.patch
+++ /dev/null
@@ -1,76 +0,0 @@
---- pl-5.6.4.orig/packages/ltx2htm/configure.in	2004-09-22 02:28:17.000000000 +1200
-+++ pl-5.6.4/packages/ltx2htm/configure.in	2006-02-13 23:28:33.000000000 +1300
-@@ -41,6 +41,7 @@
- AC_MSG_RESULT("		PLSOEXT=$PLSOEXT")
- else
- PLLD=../plld.sh
-+PL=../pl.sh
- fi
- 
- CC=$PLLD
---- pl-5.6.4.orig/packages/ltx2htm/doc2tex	1997-01-21 06:39:40.000000000 +1300
-+++ pl-5.6.4/packages/ltx2htm/doc2tex	2006-02-13 23:29:54.000000000 +1300
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- 
- sub printTeX
- { s/`([@\w]+)\s*<->(\w+)/\\index{\l\1,\\both{\2}}`\1 \\both{\2}/g;
---- pl-5.6.4.orig/packages/ltx2htm/Makefile.in	2005-12-02 21:53:05.000000000 +1300
-+++ pl-5.6.4/packages/ltx2htm/Makefile.in	2006-02-13 23:36:08.000000000 +1300
-@@ -12,8 +12,10 @@
- MAKE=@MAKE@
- 
- PL=@PL@
-+PLBASE=@PLBASE@
- PLARCH=@PLARCH@
- PLHOME=@PLHOME@
-+PKGDOC=$(PLBASE)/doc/packages
- prefix=@prefix@
- exec_prefix=@exec_prefix@
- bindir=@bindir@
-@@ -38,32 +40,29 @@
- OBJ=	tex.o psfile.o
- LIB=	latex2html.pl latex.cmd pl.pl pl.cmd xpce.pl xpce.cmd
- 
--all:
--	@echo "==============================================================="
--	@echo "Usage:"
--	@echo ""
--	@echo "$(MAKE) install        Install the package"
--	@echo "$(MAKE) html           Translate the documentation into HTML"
--	@echo "$(MAKE) dvi            Translate the documentation into DVI"
--	@echo "==============================================================="
-+all:		tex.@SO@
- 
- install:	tex.@SO@
--	mkdir -p $(DESTDIR)$(LIBDIR)/lib/$(PLARCH)
--	$(INSTALL_DATA) tex.@SO@ $(DESTDIR)$(LIBDIR)/lib/$(PLARCH)
--	$(INSTALL_PROGRAM) latex2html $(DESTDIR)$(bindir)
--	for f in $(LIB); do $(INSTALL_DATA) $$f $(DESTDIR)$(LIBDIR); done
--	mkdir -p $(DESTDIR)$(LIBDIR)/icons
--	for f in icons/*.gif; do $(INSTALL_DATA) $$f $(DESTDIR)$(LIBDIR)/icons; done
-+	mkdir -p $(DESTDIR)$(PLBASE)/lib/$(PLARCH)
-+	$(INSTALL_DATA) -m 755 tex.@SO@ $(DESTDIR)$(PLBASE)/lib/$(PLARCH)
-+	mkdir -p $(DESTDIR)$(PLBASE)/library
-+	for f in $(LIB); do $(INSTALL_DATA) $$f $(DESTDIR)$(PLBASE)/library; done
- 
- tex.@SO@:		$(OBJ)
- 	$(LD) $(LDFLAGS) -o $@ $(OBJ)
- 
-+html-install:	html
-+	mkdir -p $(DESTDIR)$(PKGDOC)/latex2html
-+	for f in manual/*; do $(INSTALL_DATA) $$f $(DESTDIR)$(PKGDOC)/latex2html; done
-+
-+check::
-+
- ################################################################
- # Documentation
- ################################################################
- 
- html:	manual.tex
--	latex2html manual
-+	$(PL) -p library=. -f none -g "assert(user:file_search_path(foreign, '.')),load_files(library(latex2html),[silent(true)]),latex2html('manual.tex')" -t halt
- 
- dvi:	manual.tex
- 	latex manual
diff --git a/dev-lang/swi-prolog/files/swi-prolog-packages-portage.patch b/dev-lang/swi-prolog/files/swi-prolog-packages-portage.patch
deleted file mode 100644
index 335adc876f0d..000000000000
--- a/dev-lang/swi-prolog/files/swi-prolog-packages-portage.patch
+++ /dev/null
@@ -1,98 +0,0 @@
---- pl-5.6.4.orig/packages/Makefile.in	2005-11-13 03:15:23.000000000 +1300
-+++ pl-5.6.4/packages/Makefile.in	2006-02-13 23:09:00.000000000 +1300
-@@ -76,7 +76,7 @@
- 
- install::
- 	for p in $(PKG); do \
--	    if [ -r $$p/Makefile ]; then ( cd $$p && $(MAKE) $@ ); fi; \
-+	    if [ -r $$p/Makefile ]; then $(MAKE) -C $$p $@ || exit 1; fi; \
-         done
- 	@echo "*** Forcing update of library index ***"
- 	rm -f $(DESTDIR)$(PLLIB)/INDEX.pl
-@@ -110,7 +110,7 @@
- 	        echo "**********************"; \
- 		echo "* Package $$p"; \
- 		echo "**********************"; \
--	        ( cd $$p && $(CONFIG) ); \
-+	        ( cd $$p && $(CONFIG) ) || exit 1; \
- 	    fi; \
-         done
- 
-@@ -127,7 +127,7 @@
- 
- check::
- 	for p in $(PKG); do \
--	    if [ -r $$p/Makefile ]; then ( cd $$p && $(MAKE) $@ ); fi; \
-+	    if [ -r $$p/Makefile ]; then $(MAKE) -C $$p $@ || exit 1; fi; \
-         done
- 
- # test environment
---- pl-5.6.4.orig/packages/db/Makefile.in	2005-12-15 04:54:38.000000000 +1300
-+++ pl-5.6.4/packages/db/Makefile.in	2006-02-13 23:05:28.000000000 +1300
-@@ -9,6 +9,7 @@
- PL=@PL@
- PLBASE=@PLBASE@
- PLARCH=@PLARCH@
-+PKGDOC=$(PLBASE)/doc/packages
- PCEHOME=/staff/jan/src/xpce
- DESTDIR=
- 
-@@ -57,10 +58,16 @@
- 		$(INSTALL) -m 644 $(LIBPL) $(DESTDIR)$(PLBASE)/library
- 		$(PL) -f none -g make -t halt
- 
-+html-install::
-+		mkdir -p $(DESTDIR)$(PKGDOC)
-+		$(INSTALL_DATA) $(DOC).html $(DESTDIR)$(PKGDOC)
-+
- uninstall:
- 		(cd $(PLBASE)/library && rm -f $(LIBPL))
- 		$(PL) -f none -g make -t halt
- 
-+check::
-+
- ################################################################
- # Documentation
- ################################################################
---- pl-5.6.4.orig/packages/mp/Makefile.in	2006-02-04 04:38:50.000000000 +1300
-+++ pl-5.6.4/packages/mp/Makefile.in	2006-02-13 22:53:53.000000000 +1300
-@@ -7,6 +7,7 @@
- PL=@PL@
- PLBASE=@PLBASE@
- PLARCH=@PLARCH@
-+PKGDOC=$(PLBASE)/doc/packages
- 
- CC=@CC@
- COFLAGS=@COFLAGS@
-@@ -17,6 +18,8 @@
- LOCALLIB=@LOCALLIB@
- LIBS=@LIBS@
- 
-+DOC=mp
-+
- LD=@LD@
- LDFLAGS=@LDSOFLAGS@
- 
-@@ -50,6 +53,12 @@
- 		done
- 		$(PL) -f none -g make -t halt
- 
-+html-install:
-+		mkdir -p $(DESTDIR)$(PKGDOC)
-+		$(INSTALL_DATA) $(DOC).html $(DESTDIR)$(PKGDOC)
-+
-+check::
-+
- uninstall:
- 		(cd $(PLBASE)/lib/$(PLARCH) && rm -f $(TARGETS))
- 		(cd $(PLBASE)/library && rm -f $(LIBPL))
---- pl-5.6.4.orig/packages/mp/configure.in	2004-09-22 02:28:17.000000000 +1200
-+++ pl-5.6.4/packages/mp/configure.in	2006-02-13 23:02:37.000000000 +1300
-@@ -68,6 +68,7 @@
- AC_MSG_RESULT("		PLSOEXT=$PLSOEXT")
- else
- PLLD=../plld.sh
-+PL=../pl.sh
- fi
- 
- CC=$PLLD
diff --git a/dev-lang/swi-prolog/files/swi-prolog-packages-test.patch b/dev-lang/swi-prolog/files/swi-prolog-packages-test.patch
deleted file mode 100644
index 4ede28bc3309..000000000000
--- a/dev-lang/swi-prolog/files/swi-prolog-packages-test.patch
+++ /dev/null
@@ -1,271 +0,0 @@
---- pl-5.6.4.orig/packages/clib/configure.in	2006-01-11 09:41:55.000000000 +1300
-+++ pl-5.6.4/packages/clib/configure.in	2006-02-13 23:41:14.000000000 +1300
-@@ -19,6 +19,7 @@
- AC_SUBST(TARGETS)
- AC_SUBST(PLTARGETS)
- AC_SUBST(CRYPTLIBS)
-+AC_SUBST(MT)
- 
- AC_ARG_ENABLE(mt, [  --enable-mt		  Enable Multi-threading],
- 	      [ case "$enableval" in
---- pl-5.6.4.orig/packages/clib/Makefile.in	2006-02-04 04:38:49.000000000 +1300
-+++ pl-5.6.4/packages/clib/Makefile.in	2006-02-13 23:43:17.000000000 +1300
-@@ -41,6 +41,8 @@
- LD=@LD@
- LDFLAGS=@LDSOFLAGS@
- 
-+CHECK_THREADS=@MT@
-+
- INSTALL=@INSTALL@
- INSTALL_PROGRAM=@INSTALL_PROGRAM@
- INSTALL_DATA=@INSTALL_DATA@
-@@ -123,7 +125,9 @@
- torture:	torture-socket
- 
- check-socket::
--		$(PL) -q -f testsocket.pl -F none -g tcp_test,halt -t 'halt(1)'
-+		@if test "$(CHECK_THREADS)" = "yes" ; then \
-+		    $(PL) -q -f testsocket.pl -F none -g tcp_test,halt -t 'halt(1)' ; \
-+		fi
- 
- torture-socket::
- 		$(PL) -q -f stresssocket.pl -F none -g test,halt -t 'halt(1)'
---- pl-5.6.4.orig/packages/semweb/configure.in	2006-02-07 04:59:54.000000000 +1300
-+++ pl-5.6.4/packages/semweb/configure.in	2006-02-13 23:46:30.000000000 +1300
-@@ -17,13 +17,16 @@
- AC_SUBST(SO)
- AC_SUBST(LDSOFLAGS)
- AC_SUBST(RUNTEX)
-+AC_SUBST(ENABLE_CHECKS)
- 
- AC_ARG_ENABLE(mt, [  --enable-mt		  Enable Multi-threading],
- 	      [case "$enableval" in
- 		   yes) AC_DEFINE([_REENTRANT], 1,
- 				  [Define to prepare for multi-threading])
-+			ENABLE_CHECKS="yes"
-+			;;
-+		   *)   ENABLE_CHECKS="no"
- 			;;
--		   *)  ;;
- 	       esac])
- 
- if test -z "$PLINCL"; then
---- pl-5.6.4.orig/packages/semweb/Makefile.in	2006-02-08 09:07:47.000000000 +1300
-+++ pl-5.6.4/packages/semweb/Makefile.in	2006-02-13 23:48:32.000000000 +1300
-@@ -44,6 +44,8 @@
- LD=@LD@
- LDFLAGS=@LDSOFLAGS@
- 
-+ENABLE_CHECKS=@ENABLE_CHECKS@
-+
- INSTALL=@INSTALL@
- INSTALL_PROGRAM=@INSTALL_PROGRAM@
- INSTALL_DATA=@INSTALL_DATA@
-@@ -127,7 +129,9 @@
- ################################################################
- 
- check::
--		$(PL) -q -f rdf_db_test.pl -g test,halt -t 'halt(1)'
--		$(PL) -q -f litmap_test.pl -g test,halt -t 'halt(1)'
-+		@if test "$(ENABLE_CHECKS)" = "yes" ; then \
-+		    $(PL) -q -f rdf_db_test.pl -g test,halt -t 'halt(1)' ; \
-+		    $(PL) -q -f litmap_test.pl -g test,halt -t 'halt(1)' ; \
-+		fi
- 
- 
---- pl-5.6.8.orig/packages/ssl/configure.in	2006-02-04 04:38:50.000000000 +1300
-+++ pl-5.6.8/packages/ssl/configure.in	2006-02-13 23:55:12.000000000 +1300
-@@ -19,13 +19,16 @@
- AC_SUBST(TARGETS)
- AC_SUBST(PLTARGETS)
- AC_SUBST(RUNTEX)
-+AC_SUBST(ENABLE_CHECKS)
- 
- AC_ARG_ENABLE(mt, [  --enable-mt		  Enable Multi-threading],
- 	      [case "$enableval" in
- 		   yes) AC_DEFINE([_REENTRANT], 1,
- 				  [Define to support threads])
-+			ENABLE_CHECKS="yes"
-+			;;
-+		   *)	ENABLE_CHECKS="no"
- 			;;
--		   *)  ;;
- 	       esac])
- 
- if test -z "$PLINCL"; then
---- pl-5.6.8.orig/packages/ssl/Makefile.in	2005-05-11 20:45:37.000000000 +1200
-+++ pl-5.6.8/packages/ssl/Makefile.in	2006-01-03 16:11:28.000000000 +1300
-@@ -42,6 +42,8 @@
- LD=@LD@
- LDFLAGS=@LDSOFLAGS@
- 
-+ENABLE_CHECKS=@ENABLE_CHECKS@
-+
- INSTALL=@INSTALL@
- INSTALL_PROGRAM=@INSTALL_PROGRAM@
- INSTALL_DATA=@INSTALL_DATA@
-@@ -128,7 +130,9 @@
- ################################################################
- 
- check::
--		$(PL) -q -f ssl_test.pl -F none -g test,halt -t 'halt(1)'
-+		@if test $(ENABLE_CHECKS) == "yes" ; then \
-+		    $(PL) -q -f ssl_test.pl -F none -g test,halt -t 'halt(1)' ; \
-+		fi
- 
- ################################################################
- # Clean
---- pl-5.6.4.orig/packages/xpce/src/Makefile.in	2006-02-13 05:44:13.000000000 +1300
-+++ pl-5.6.4/packages/xpce/src/Makefile.in	2006-02-13 23:59:59.000000000 +1300
-@@ -55,6 +55,7 @@
- DESTDIR=
- 
- PCEHOME=@PCEHOME@
-+PCEBUILD=$(PCEHOME)/src/xpce.sh
- XINCLUDES=@XINCLUDES@
- XLIB=@XLIB@
- 
-@@ -896,7 +897,8 @@
- ################################################################
- 
- check::
--		$(PLBUILD) -q -g "['../src/test.pl'],test,halt" -t 'halt(1)'
-+		$(PCEBUILD) -q -g "['./find_display.pl'],find_display,halt" -t 'halt(0)'
-+		$(PCEBUILD) -q -g "['../src/test.pl'],test,halt" -t 'halt(1)'
- 
- 
- ################################################################
---- pl-5.6.17.orig/packages/xpce/src/find_display.pl	1970-01-01 12:00:00.000000000 +1200
-+++ pl-5.6.17/packages/xpce/src/find_display.pl	2006-08-28 21:47:54.000000000 +1200
-@@ -0,0 +1,13 @@
-+:- asserta(library_directory('../prolog/lib')).
-+:- use_module(library(pce)).
-+
-+find_display :-
-+  current_input(InputStream),
-+  open_null_stream(NullStream),
-+  set_prolog_IO(InputStream, NullStream, NullStream),
-+  (   exists_file('display_exists')
-+  ->  delete_file('display_exists')
-+  ;   true),
-+  get(@display, visual_type, _),
-+  open('display_exists', update, Fd),
-+  close(Fd).
---- pl-5.6.17.orig/packages/xpce/src/test.pl	2006-03-30 01:42:18.000000000 +1200
-+++ pl-5.6.17/packages/xpce/src/test.pl	2006-08-28 21:47:10.000000000 +1200
-@@ -35,11 +35,23 @@
- 	?- test.
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
- 
-+:- asserta(library_directory('../prolog/lib')).
-+:- use_module(library(pce)).
-+:- use_module(library(pce_util)).
-+
- :- get(@pce, version, V),
-    format('XPCE/SWI-Prolog test suite. (XPCE version ~w)~n\
-           To run all tests run ?- test.~n~n', [V]).
- 
-+:- dynamic
-+	display_enabled/0.
- 
-+:- format('Checking for usable X server~n', []),
-+   (   exists_file('display_exists')
-+   ->  format('X server found.~n~n', []),
-+       assert(display_enabled)
-+   ;   format('No usable X server found. Some tests are disabled.~n~n', [])
-+   ).
- 
- 		 /*******************************
- 		 *	      NAMES		*
-@@ -163,12 +175,12 @@
- 		 *******************************/
- 
- srcsink(contents-1) :-
--	numlist(32, 1000, L),
-+	numlist(32, 255, L),
- 	tmp_file(test, Tmp),
--	open(Tmp, write, Out, [encoding(utf8)]),
-+	open(Tmp, write, Out, [encoding(iso_latin_1)]),
- 	maplist(put_code(Out), L),
- 	close(Out),
--	new(File, file(Tmp, utf8)),
-+	new(File, file(Tmp, iso_latin_1)),
- 	get(File, contents, String),
- 	delete_file(Tmp),
- 	get(String, value, Atom),
-@@ -193,7 +205,7 @@
- 		 *******************************/
- 
- foreign(Name) :-
--	atom_codes(Name, [1087, 1083, 1072, 1090, 1085, 1072, 1103]).
-+	atom_codes(Name, [102, 105, 108, 101, 110, 97, 109, 101]).
- 
- file(env-1) :-
- 	new(F, file('$PCEHOME/Defaults')),
-@@ -202,11 +214,6 @@
- 	get(F, name, PceName),
- 	same_file(PceName, PlName),
- 	send(F, same, PlName).
--file(home-1) :-
--	new(F, file('~/foobar')),
--	get(F, name, PceName),
--	expand_file_name('~/foobar', [PlName]),
--	same_file(PceName, PlName).
- file(abs-1) :-
- 	new(F, file(foobar)),
- 	get(F, absolute_path, Abs),
-@@ -221,13 +228,15 @@
- 	       ->  send(file(F), exists)
- 	       ;   \+ send(file(F), exists)
- 	       )).
--file(utf8-1) :-
-+file(ascii-1) :-
- 	foreign(Name),
- 	new(F, file(Name)),
-+	send(F, encoding, iso_latin_1),
- 	send(F, open, write),
- 	send(F, append, 'Hello world\n'),
- 	send(F, close),
- 	new(F2, file(Name)),
-+	send(F2, encoding, iso_latin_1),
- 	exists_file(Name),
- 	send(F2, exists),
- 	get(F2, contents, string('Hello world\n')),
-@@ -312,12 +321,12 @@
- 	atom_concat(hello, Wide, New).
- textbuffer(file-1) :-
- 	new(TB, text_buffer),
--	numlist(32, 1000, L),
-+	numlist(32, 255, L),
- 	atom_codes(WAtom, L),
- 	send(TB, append, WAtom),
- 	tmp_file(test, Tmp),
--	send(TB, save, file(Tmp, utf8)),
--	get(file(Tmp, utf8), contents, string(Copy)),
-+	send(TB, save, file(Tmp, iso_latin_1)),
-+	get(file(Tmp, iso_latin_1), contents, string(Copy)),
- 	delete_file(Tmp),
- 	Copy == WAtom.
- textbuffer(store-1) :-
-@@ -635,6 +644,10 @@
- testset(regex).				% Regular expression matches
- testset(type).				% Check type logic
- 
-+display_required(bom).
-+display_required(selection).
-+display_required(image).
-+
- %	testdir(Dir)
- %	
- %	Enumerate directories holding tests.
-@@ -683,6 +696,10 @@
- 	).
- 
- runtest(Name) :-
-+	display_required(Name),
-+	\+display_enabled,
-+	format('Disabling test set "~w"~n', [Name]).
-+runtest(Name) :-
- 	format('Running test set "~w" ', [Name]),
- 	flush,
- 	functor(Head, Name, 1),
diff --git a/dev-lang/swi-prolog/files/swi-prolog-test.patch b/dev-lang/swi-prolog/files/swi-prolog-test.patch
deleted file mode 100644
index 96402cf60b38..000000000000
--- a/dev-lang/swi-prolog/files/swi-prolog-test.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- pl-5.6.4.orig/src/Makefile.in	2006-02-04 04:38:51.000000000 +1300
-+++ pl-5.6.4/src/Makefile.in	2006-02-13 22:32:03.000000000 +1300
-@@ -288,7 +288,7 @@
- 		(cd $(srcdir) && $(ETAGS) $(SRC) $(HDR))
- 
- check:
--		$(DEVPL) -f $(srcdir)/test.pl -F none -g test,halt -t 'halt(1)'
-+		$(DEVPL) -f $(srcdir)/test.pl -F none -g "asserta(user:file_search_path(clpr,'../packages/clpqr')),asserta(user:file_search_path(library, '../packages/clpqr')),test,halt" -t 'halt(1)'
- 
- install:	@INSTALLTARGET@
- install-version: install-arch install-libs install-vbins
diff --git a/dev-lang/swi-prolog/swi-prolog-5.6.17.ebuild b/dev-lang/swi-prolog/swi-prolog-5.6.17.ebuild
deleted file mode 100644
index 5afd346db558..000000000000
--- a/dev-lang/swi-prolog/swi-prolog-5.6.17.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-5.6.17.ebuild,v 1.4 2006/09/17 02:53:22 keri Exp $
-
-inherit autotools eutils flag-o-matic
-
-DESCRIPTION="free, small, and standard compliant Prolog compiler"
-HOMEPAGE="http://www.swi-prolog.org/"
-SRC_URI="http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/pl-${PV}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc-macos ~sparc ~x86"
-IUSE="berkdb doc gmp java minimal odbc readline ssl static tetex threads X"
-
-DEPEND="!dev-lang/swi-prolog-lite
-	sys-libs/ncurses
-	odbc? ( dev-db/unixODBC )
-	berkdb? ( sys-libs/db )
-	readline? ( sys-libs/readline )
-	gmp? ( dev-libs/gmp )
-	ssl? ( dev-libs/openssl )
-	java? ( virtual/jdk )
-	X? (
-		media-libs/jpeg
-		x11-libs/libX11
-		x11-libs/libXft
-		x11-libs/libXpm
-		x11-libs/libXt
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-proto/xproto )"
-
-S="${WORKDIR}/pl-${PV}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	sed -i -e "s/man boot library/boot library/" src/Makefile.in
-	epatch "${FILESDIR}"/${PN}-CFLAGS.patch
-	epatch "${FILESDIR}"/${PN}-PLBASE.patch
-	epatch "${FILESDIR}"/${PN}-test.patch
-	epatch "${FILESDIR}"/${PN}-test_date.patch
-
-	if ! use minimal ; then
-		epatch "${FILESDIR}"/${PN}-packages-portage.patch
-		epatch "${FILESDIR}"/${PN}-packages-cppproxy.patch
-		epatch "${FILESDIR}"/${PN}-packages-jpl-arch.patch
-		epatch "${FILESDIR}"/${PN}-packages-jpl-install.patch
-		epatch "${FILESDIR}"/${PN}-packages-ltx2htm.patch
-		epatch "${FILESDIR}"/${PN}-packages-sparc-alignment.patch
-		epatch "${FILESDIR}"/${PN}-packages-test.patch
-	fi
-}
-
-src_compile() {
-	append-flags -fno-strict-aliasing
-
-	einfo "Building SWI-Prolog compiler"
-
-	local threadconf
-	if use java && ! use minimal || use threads ; then
-		threadconf="--enable-mt"
-	else
-		threadconf="--disable-mt"
-	fi
-
-	cd "${S}"/src
-	econf \
-		--libdir=/usr/$(get_libdir) \
-		${threadconf} \
-		$(use_enable gmp) \
-		$(use_enable readline) \
-		$(use_enable !static shared) \
-		--disable-custom-flags \
-		|| die "econf failed"
-	emake -j1 || die "emake failed"
-
-	if ! use minimal ; then
-		einfo "Building SWI-Prolog additional packages"
-
-		for package in clib cppproxy db jpl ltx2htm nlp odbc semweb sgml ssl table xpce/src
-		do
-			cd "${S}/packages/${package}"
-			eautoreconf
-		done
-
-		cd "${S}/packages"
-		econf \
-			--libdir=/usr/$(get_libdir) \
-			${threadconf} \
-			$(use_enable !static shared) \
-			--without-C-sicstus \
-			--with-chr \
-			--with-clib \
-			--with-clpqr \
-			--with-cpp \
-			--with-cppproxy \
-			$(use_with berkdb db) \
-			--with-http \
-			--without-jasmine \
-			$(use_with java jpl) \
-			$(use_with tetex ltx2htm) \
-			--with-nlp \
-			$(use_with odbc) \
-			--with-semweb \
-			--with-sgml \
-			--with-sgml/RDF \
-			$(use_with ssl) \
-			--with-table \
-			$(use_with X xpce) \
-			|| die "packages econf failed"
-
-		emake -j1 || die "packages emake failed"
-	fi
-}
-
-src_install() {
-	make -C src DESTDIR="${D}" install || die "install src failed"
-
-	if ! use minimal ; then
-		make -C packages DESTDIR="${D}" install || die "install packages failed"
-		if use doc ; then
-			make -C packages DESTDIR="${D}" html-install || die "html-install failed"
-			make -C packages/cppproxy DESTDIR="${D}" install-examples || die "install-examples failed"
-		fi
-	fi
-
-	dodoc ANNOUNCE ChangeLog INSTALL INSTALL.notes PORTING README README.GUI VERSION
-}
-
-src_test() {
-	cd "${S}/src"
-	make check || die "make check failed. See above for details."
-
-	if ! use minimal ; then
-		cd "${S}/packages"
-		make check || die "make check failed. See above for details."
-	fi
-}
diff --git a/dev-lang/swi-prolog/swi-prolog-5.6.8.ebuild b/dev-lang/swi-prolog/swi-prolog-5.6.8.ebuild
deleted file mode 100644
index be3dc4ed6f5d..000000000000
--- a/dev-lang/swi-prolog/swi-prolog-5.6.8.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-5.6.8.ebuild,v 1.8 2006/09/17 02:53:22 keri Exp $
-
-inherit autotools eutils flag-o-matic
-
-DESCRIPTION="free, small, and standard compliant Prolog compiler"
-HOMEPAGE="http://www.swi-prolog.org/"
-SRC_URI="http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/pl-${PV}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ppc x86"
-IUSE="berkdb doc gmp java minimal odbc readline ssl static tetex threads X"
-
-DEPEND="!dev-lang/swi-prolog-lite
-	sys-libs/ncurses
-	odbc? ( dev-db/unixODBC )
-	berkdb? ( sys-libs/db )
-	readline? ( sys-libs/readline )
-	gmp? ( dev-libs/gmp )
-	ssl? ( dev-libs/openssl )
-	java? ( virtual/jdk )
-	X? (
-		media-libs/jpeg
-		x11-libs/libX11
-		x11-libs/libXft
-		x11-libs/libXpm
-		x11-libs/libXt
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-proto/xproto )"
-
-S="${WORKDIR}/pl-${PV}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	sed -i -e "s/man boot library/boot library/" src/Makefile.in
-	epatch "${FILESDIR}"/${PN}-CFLAGS.patch
-	epatch "${FILESDIR}"/${PN}-PLBASE.patch
-	epatch "${FILESDIR}"/${PN}-test.patch
-
-	if ! use minimal ; then
-		epatch "${FILESDIR}"/${PN}-packages-portage.patch
-		epatch "${FILESDIR}"/${PN}-packages-cppproxy.patch
-		epatch "${FILESDIR}"/${PN}-packages-db-db4.patch
-		epatch "${FILESDIR}"/${PN}-packages-jpl-arch.patch
-		epatch "${FILESDIR}"/${PN}-packages-ltx2htm.patch
-		epatch "${FILESDIR}"/${PN}-packages-test.patch
-	fi
-}
-
-src_compile() {
-	append-flags -fno-strict-aliasing
-
-	einfo "Building SWI-Prolog compiler"
-
-	local threadconf
-	if use java && ! use minimal || use threads ; then
-		threadconf="--enable-mt"
-	else
-		threadconf="--disable-mt"
-	fi
-
-	cd "${S}"/src
-	econf \
-		--libdir=/usr/$(get_libdir) \
-		${threadconf} \
-		$(use_enable gmp) \
-		$(use_enable readline) \
-		$(use_enable !static shared) \
-		--disable-custom-flags \
-		|| die "econf failed"
-	emake -j1 || die "emake failed"
-
-	if ! use minimal ; then
-		einfo "Building SWI-Prolog additional packages"
-
-		for package in clib cppproxy db jpl ltx2htm nlp odbc semweb sgml ssl table xpce/src
-		do
-			cd "${S}/packages/${package}"
-			eautoreconf
-		done
-
-		cd "${S}/packages"
-		econf \
-			--libdir=/usr/$(get_libdir) \
-			${threadconf} \
-			$(use_enable !static shared) \
-			--without-C-sicstus \
-			--with-chr \
-			--with-clib \
-			--with-clpqr \
-			--with-cpp \
-			--with-cppproxy \
-			$(use_with berkdb db) \
-			--with-http \
-			--without-jasmine \
-			$(use_with java jpl) \
-			$(use_with tetex ltx2htm) \
-			--with-nlp \
-			$(use_with odbc) \
-			--with-semweb \
-			--with-sgml \
-			--with-sgml/RDF \
-			$(use_with ssl) \
-			--with-table \
-			$(use_with X xpce) \
-			|| die "packages econf failed"
-
-		emake -j1 || die "packages emake failed"
-	fi
-}
-
-src_install() {
-	make -C src DESTDIR="${D}" install || die "install src failed"
-
-	if ! use minimal ; then
-		make -C packages DESTDIR="${D}" install || die "install packages failed"
-		if use doc ; then
-			make -C packages DESTDIR="${D}" html-install || die "html-install failed"
-			make -C packages/cppproxy DESTDIR="${D}" install-examples || die "install-examples failed"
-		fi
-	fi
-
-	dodoc ANNOUNCE ChangeLog INSTALL INSTALL.notes PORTING README README.GUI VERSION
-}
-
-src_test() {
-	cd "${S}/src"
-	make check || die "make check failed. See above for details."
-
-	if ! use minimal ; then
-		cd "${S}/packages"
-		make check || die "make check failed. See above for details."
-	fi
-}