Remove old versions.

(Portage version: 2.1.2.9)

22 files changed, 13 insertions, 1756 deletions

diff --git a/dev-lang/swi-prolog/ChangeLog b/dev-lang/swi-prolog/ChangeLog
index aab16419e431..4b06a6b2b709 100644
--- a/dev-lang/swi-prolog/ChangeLog
+++ b/dev-lang/swi-prolog/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for dev-lang/swi-prolog
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/ChangeLog,v 1.90 2007/06/10 06:51:14 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/ChangeLog,v 1.91 2007/06/10 07:18:02 keri Exp $
+
+  10 Jun 2007; keri <keri@gentoo.org> -files/swi-prolog-CFLAGS-r5.patch,
+  -files/swi-prolog-CFLAGS-r2.patch,
+  -files/swi-prolog-PL_EV_THREADFINISHED.patch,
+  -files/swi-prolog-jpl-LDPATH.patch, -files/swi-prolog-jpl-LDPATH-r1.patch,
+  -files/swi-prolog-packages-jpl-install.patch,
+  -files/swi-prolog-packages-sparc-alignment.patch,
+  -swi-prolog-5.6.18.ebuild, -swi-prolog-5.6.19.ebuild,
+  -swi-prolog-5.6.20.ebuild, -swi-prolog-5.6.21.ebuild,
+  -swi-prolog-5.6.22.ebuild, -swi-prolog-5.6.23.ebuild,
+  -swi-prolog-5.6.24.ebuild:
+  Remove old versions.
 
   10 Jun 2007; keri <keri@gentoo.org> swi-prolog-5.6.32.ebuild,
   swi-prolog-5.6.33.ebuild, swi-prolog-5.6.34.ebuild:
diff --git a/dev-lang/swi-prolog/files/digest-swi-prolog-5.6.18 b/dev-lang/swi-prolog/files/digest-swi-prolog-5.6.18
deleted file mode 100644
index 549f8a36c5a8..000000000000
--- a/dev-lang/swi-prolog/files/digest-swi-prolog-5.6.18
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 32fc7336c9eed667e04d6cd2b7efb3bd pl-5.6.18.tar.gz 11517892
-RMD160 238554526c0e0367c770d6aabb9a55900ca358b7 pl-5.6.18.tar.gz 11517892
-SHA256 85d33e30bf45c159cab90dc709fb7568621cf4e20769cf1dcc7e1238248231fb pl-5.6.18.tar.gz 11517892
diff --git a/dev-lang/swi-prolog/files/digest-swi-prolog-5.6.19 b/dev-lang/swi-prolog/files/digest-swi-prolog-5.6.19
deleted file mode 100644
index 15ca5339f863..000000000000
--- a/dev-lang/swi-prolog/files/digest-swi-prolog-5.6.19
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b9ac4e8549246aea2fc3c79d4914ca97 pl-5.6.19.tar.gz 11532046
-RMD160 63dc2fccb2fd93a042e5cd5b55438e093c45af04 pl-5.6.19.tar.gz 11532046
-SHA256 9897a7a08cd920ee6ad48f3da38d9add92f2992cf9e4339c9b17d055118702d8 pl-5.6.19.tar.gz 11532046
diff --git a/dev-lang/swi-prolog/files/digest-swi-prolog-5.6.20 b/dev-lang/swi-prolog/files/digest-swi-prolog-5.6.20
deleted file mode 100644
index 641fafde5724..000000000000
--- a/dev-lang/swi-prolog/files/digest-swi-prolog-5.6.20
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 0f13bc81a83e29ef90dee6058f84d8ae pl-5.6.20.tar.gz 11528418
-RMD160 3f8b25d8370485c7fc8f15d0c55d5a873869a93a pl-5.6.20.tar.gz 11528418
-SHA256 10e09ce3fdd35c12fceb3e463a617a40f119b67dc23436068dd47a9388355981 pl-5.6.20.tar.gz 11528418
diff --git a/dev-lang/swi-prolog/files/digest-swi-prolog-5.6.21 b/dev-lang/swi-prolog/files/digest-swi-prolog-5.6.21
deleted file mode 100644
index f90733b99001..000000000000
--- a/dev-lang/swi-prolog/files/digest-swi-prolog-5.6.21
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 49fafcc6cea3beec6f0124995f32e00e pl-5.6.21.tar.gz 11543471
-RMD160 f3d164199a727abf4603cb809f5b67aeb511709a pl-5.6.21.tar.gz 11543471
-SHA256 e83326fee55b3026fd389a89c10a09110f318c430fd88056ca5dff2e7ab11ac1 pl-5.6.21.tar.gz 11543471
diff --git a/dev-lang/swi-prolog/files/digest-swi-prolog-5.6.22 b/dev-lang/swi-prolog/files/digest-swi-prolog-5.6.22
deleted file mode 100644
index 82ad544fea5e..000000000000
--- a/dev-lang/swi-prolog/files/digest-swi-prolog-5.6.22
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d001c059cd76938c7399ddbf8542e944 pl-5.6.22.tar.gz 11553934
-RMD160 bd45af82adc55b66eacaf41c3a256a0db5baa609 pl-5.6.22.tar.gz 11553934
-SHA256 0efb8fb7aa349d3626fa244557d121b9db18ff0a8d139a56b018c51e98b25523 pl-5.6.22.tar.gz 11553934
diff --git a/dev-lang/swi-prolog/files/digest-swi-prolog-5.6.23 b/dev-lang/swi-prolog/files/digest-swi-prolog-5.6.23
deleted file mode 100644
index c806ae64abb8..000000000000
--- a/dev-lang/swi-prolog/files/digest-swi-prolog-5.6.23
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 54f5c8cb6f22eda28cb720cd150fe3fd pl-5.6.23.tar.gz 11547357
-RMD160 51b52d8d6c8a2ddd7e245f4b7c3a1104bba999ce pl-5.6.23.tar.gz 11547357
-SHA256 45a16a49290401e69a47584e154eb2b0588f65a141de53b15c762cdf7afe7c9a pl-5.6.23.tar.gz 11547357
diff --git a/dev-lang/swi-prolog/files/digest-swi-prolog-5.6.24 b/dev-lang/swi-prolog/files/digest-swi-prolog-5.6.24
deleted file mode 100644
index cdf2204cc610..000000000000
--- a/dev-lang/swi-prolog/files/digest-swi-prolog-5.6.24
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 cd084fc65886b09bd5eae30c3506cd73 pl-5.6.24.tar.gz 11561664
-RMD160 d26af2674bff916747bcc84a2f7df6119036c113 pl-5.6.24.tar.gz 11561664
-SHA256 7fb4548d86595825b67cebb9a02e5009cc4e1f6851df8aba433bff4707fff85f pl-5.6.24.tar.gz 11561664
diff --git a/dev-lang/swi-prolog/files/swi-prolog-CFLAGS-r2.patch b/dev-lang/swi-prolog/files/swi-prolog-CFLAGS-r2.patch
deleted file mode 100644
index 65cc25ba1daf..000000000000
--- a/dev-lang/swi-prolog/files/swi-prolog-CFLAGS-r2.patch
+++ /dev/null
@@ -1,336 +0,0 @@
-diff -ur pl-5.6.18.orig/packages/clib/configure pl-5.6.18/packages/clib/configure
---- pl-5.6.18.orig/packages/clib/configure	2006-01-11 09:41:55.000000000 +1300
-+++ pl-5.6.18/packages/clib/configure	2006-09-01 19:39:18.000000000 +1200
-@@ -3117,7 +3117,7 @@
- 
- fi
- 
--CFLAGS="$CMFLAGS"
-+
- # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
- # for constant arguments.  Useless!
- echo "$as_me:$LINENO: checking for working alloca.h" >&5
-@@ -3709,7 +3709,7 @@
- 
- 
- if test ! -z "$GCC"; then
--    COFLAGS="-O2 -fno-strict-aliasing"
-+    COFLAGS="$CFLAGS -fno-strict-aliasing"
-     CWFLAGS=-Wall
- else
-     COFLAGS=-O
-diff -ur pl-5.6.18.orig/packages/clib/maildrop/rfc2045/configure pl-5.6.18/packages/clib/maildrop/rfc2045/configure
---- pl-5.6.18.orig/packages/clib/maildrop/rfc2045/configure	2005-07-25 02:37:57.000000000 +1200
-+++ pl-5.6.18/packages/clib/maildrop/rfc2045/configure	2006-09-01 19:40:33.000000000 +1200
-@@ -3155,7 +3155,7 @@
- 
- if test "$GCC" = yes ; then
-         CXXFLAGS="$CXXFLAGS -Wall"
--        CFLAGS="$CFLAGS -Wall"
-+        CFLAGS="$CFLAGS -fpic -Wall"
- fi
- 
- 
-diff -ur pl-5.6.18.orig/packages/clib/maildrop/rfc822/configure pl-5.6.18/packages/clib/maildrop/rfc822/configure
---- pl-5.6.18.orig/packages/clib/maildrop/rfc822/configure	2005-07-25 02:37:57.000000000 +1200
-+++ pl-5.6.18/packages/clib/maildrop/rfc822/configure	2006-09-01 19:41:37.000000000 +1200
-@@ -3144,7 +3144,7 @@
- 
- if test "$GCC" = yes ; then
-         CXXFLAGS="$CXXFLAGS -Wall"
--        CFLAGS="$CFLAGS -Wall"
-+        CFLAGS="$CFLAGS -fpic -Wall"
- fi
- 
- 
-diff -ur pl-5.6.18.orig/packages/cppproxy/configure pl-5.6.18/packages/cppproxy/configure
---- pl-5.6.18.orig/packages/cppproxy/configure	2006-01-23 22:29:29.000000000 +1300
-+++ pl-5.6.18/packages/cppproxy/configure	2006-09-01 19:42:51.000000000 +1200
-@@ -3111,7 +3111,7 @@
- 
- fi
- 
--CFLAGS="$CMFLAGS"
-+
- # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
- # for constant arguments.  Useless!
- echo "$as_me:$LINENO: checking for working alloca.h" >&5
-@@ -3703,7 +3703,7 @@
- 
- 
- if test ! -z "$GCC"; then
--    COFLAGS="-O2 -fno-strict-aliasing"
-+    COFLAGS="$CFLAGS -fno-strict-aliasing"
-     CWFLAGS=-Wall
- else
-     COFLAGS=-O
-diff -ur pl-5.6.18.orig/packages/db/configure pl-5.6.18/packages/db/configure
---- pl-5.6.18.orig/packages/db/configure	2006-07-31 19:54:07.000000000 +1200
-+++ pl-5.6.18/packages/db/configure	2006-09-01 19:44:12.000000000 +1200
-@@ -3139,13 +3139,13 @@
- fi
- 
- if test ! -z "$GCC"; then
--    COFLAGS="-O2 -fno-strict-aliasing"
-+    COFLAGS="$CFLAGS -fno-strict-aliasing"
-     CWFLAGS=-Wall
- else
-     COFLAGS=-O
-     CWFLAGS=
- fi
--CFLAGS="$CMFLAGS $CIFLAGS"
-+
- # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
- # for constant arguments.  Useless!
- echo "$as_me:$LINENO: checking for working alloca.h" >&5
-diff -ur pl-5.6.18.orig/packages/jpl/configure pl-5.6.18/packages/jpl/configure
---- pl-5.6.18.orig/packages/jpl/configure	2006-08-09 19:58:24.000000000 +1200
-+++ pl-5.6.18/packages/jpl/configure	2006-09-01 19:45:49.000000000 +1200
-@@ -3077,10 +3077,10 @@
- 
- fi
- 
--CFLAGS="$CMFLAGS"
-+
- 
- if test ! -z "$GCC"; then
--    COFLAGS="-O2 -fno-strict-aliasing"
-+    COFLAGS="$CFLAGS -fno-strict-aliasing"
-     CWFLAGS="-Wall"
- else
-     COFLAGS=-O
-diff -ur pl-5.6.18.orig/packages/ltx2htm/configure pl-5.6.18/packages/ltx2htm/configure
---- pl-5.6.18.orig/packages/ltx2htm/configure	2004-09-22 02:28:17.000000000 +1200
-+++ pl-5.6.18/packages/ltx2htm/configure	2006-09-01 19:49:17.000000000 +1200
-@@ -1351,7 +1351,7 @@
- CC=$PLLD
- LD=$PLLD
- LDSOFLAGS=-shared
--
-+CMFLAGS=-fpic
- SO="$PLSOEXT"
- 
- TARGETS="unix.$SO socket.$SO cgi.$SO memfile.$SO"
-@@ -2925,7 +2925,7 @@
- 
- fi
- 
--CFLAGS="$CMFLAGS"
-+
- # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
- # for constant arguments.  Useless!
- echo "$as_me:$LINENO: checking for working alloca.h" >&5
-@@ -3455,7 +3455,7 @@
- 
- 
- if test ! -z "$GCC"; then
--    COFLAGS=-O2
-+    COFLAGS="$CFLAGS"
-     CWFLAGS=-Wall
- else
-     COFLAGS=-O
-diff -ur pl-5.6.18.orig/packages/nlp/configure pl-5.6.18/packages/nlp/configure
---- pl-5.6.18.orig/packages/nlp/configure	2005-11-26 23:54:48.000000000 +1300
-+++ pl-5.6.18/packages/nlp/configure	2006-09-01 19:50:31.000000000 +1200
-@@ -3111,7 +3111,7 @@
- 
- fi
- 
--CFLAGS="$CMFLAGS"
-+
- # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
- # for constant arguments.  Useless!
- echo "$as_me:$LINENO: checking for working alloca.h" >&5
-@@ -3703,7 +3703,7 @@
- 
- 
- if test ! -z "$GCC"; then
--    COFLAGS="-O2 -fno-strict-aliasing"
-+    COFLAGS="$CFLAGS -fno-strict-aliasing"
-     CWFLAGS=-Wall
- else
-     COFLAGS=-O
-diff -ur pl-5.6.18.orig/packages/odbc/configure pl-5.6.18/packages/odbc/configure
---- pl-5.6.18.orig/packages/odbc/configure	2006-02-16 09:48:34.000000000 +1300
-+++ pl-5.6.18/packages/odbc/configure	2006-09-01 19:52:33.000000000 +1200
-@@ -3147,7 +3147,7 @@
- 
- fi
- 
--CFLAGS="$CMFLAGS"
-+
- # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
- # for constant arguments.  Useless!
- echo "$as_me:$LINENO: checking for working alloca.h" >&5
-@@ -3739,7 +3739,7 @@
- 
- 
- if test ! -z "$GCC"; then
--    COFLAGS="-O2 -fno-strict-aliasing"
-+    COFLAGS="$CFLAGS -fno-strict-aliasing"
-     CWFLAGS=-Wall
- else
-     COFLAGS=-O
-diff -ur pl-5.6.18.orig/packages/semweb/configure pl-5.6.18/packages/semweb/configure
---- pl-5.6.18.orig/packages/semweb/configure	2006-03-08 03:43:04.000000000 +1300
-+++ pl-5.6.18/packages/semweb/configure	2006-09-01 19:53:47.000000000 +1200
-@@ -3145,7 +3145,7 @@
- 
- fi
- 
--CFLAGS="$CMFLAGS"
-+
- # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
- # for constant arguments.  Useless!
- echo "$as_me:$LINENO: checking for working alloca.h" >&5
-@@ -4294,7 +4294,7 @@
- 
- 
- if test ! -z "$GCC"; then
--    COFLAGS="-O3 -fno-strict-aliasing"
-+    COFLAGS="$CFLAGS -fno-strict-aliasing"
-     CWFLAGS=-Wall
- else
-     COFLAGS=-O
-diff -ur pl-5.6.18.orig/packages/sgml/configure pl-5.6.18/packages/sgml/configure
---- pl-5.6.18.orig/packages/sgml/configure	2006-02-04 04:38:50.000000000 +1300
-+++ pl-5.6.18/packages/sgml/configure	2006-09-01 19:55:24.000000000 +1200
-@@ -3184,16 +3184,12 @@
- fi
- 
- 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 -fno-strict-aliasing"
-     CWFLAGS="$CWFLAGS -Wall"
- else
-     COFLAGS=-O
- fi
--CFLAGS="$CMFLAGS"
-+
- echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
- echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6
- if test "${ac_cv_c_bigendian+set}" = set; then
-diff -ur pl-5.6.18.orig/packages/ssl/configure pl-5.6.18/packages/ssl/configure
---- pl-5.6.18.orig/packages/ssl/configure	2006-02-04 04:38:50.000000000 +1300
-+++ pl-5.6.18/packages/ssl/configure	2006-09-01 19:56:34.000000000 +1200
-@@ -3147,7 +3147,7 @@
- 
- fi
- 
--CFLAGS="$CMFLAGS"
-+
- # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
- # for constant arguments.  Useless!
- echo "$as_me:$LINENO: checking for working alloca.h" >&5
-@@ -3739,7 +3739,7 @@
- 
- 
- if test ! -z "$GCC"; then
--    COFLAGS="-O2 -fno-strict-aliasing"
-+    COFLAGS="$CFLAGS -fno-strict-aliasing"
-     CWFLAGS=-Wall
- else
-     COFLAGS=-O
-diff -ur pl-5.6.18.orig/packages/table/configure pl-5.6.18/packages/table/configure
---- pl-5.6.18.orig/packages/table/configure	2005-01-31 23:47:37.000000000 +1300
-+++ pl-5.6.18/packages/table/configure	2006-09-01 19:58:05.000000000 +1200
-@@ -3112,7 +3112,7 @@
- 
- fi
- 
--CFLAGS="$CMFLAGS"
-+
- # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
- # for constant arguments.  Useless!
- echo "$as_me:$LINENO: checking for working alloca.h" >&5
-@@ -3704,7 +3704,7 @@
- 
- 
- if test ! -z "$GCC"; then
--    COFLAGS="-O2 -fno-strict-aliasing"
-+    COFLAGS="$CFLAGS -fno-strict-aliasing"
-     CWFLAGS=-Wall
- else
-     COFLAGS=-O
-diff -ur pl-5.6.18.orig/packages/xpce/src/configure pl-5.6.18/packages/xpce/src/configure
---- pl-5.6.18.orig/packages/xpce/src/configure	2006-04-05 19:29:14.000000000 +1200
-+++ pl-5.6.18/packages/xpce/src/configure	2006-09-01 19:59:11.000000000 +1200
-@@ -4391,7 +4391,7 @@
- fi
- 
- if test ! -z "$GCC"; then
--    COFLAGS="-O2 -fno-strict-aliasing"
-+    COFLAGS="$CFLAGS -fno-strict-aliasing"
-     if test "$ac_cv_header_stdc" = "yes" || test "$syslibh" = "yes"; then
-         CWFLAGS=-Wall
-     else
-@@ -4401,7 +4401,7 @@
-     COFLAGS=-O
-     CWFLAGS=
- fi
--CFLAGS="$CMFLAGS"
-+
- echo "$as_me:$LINENO: checking for inline" >&5
- echo $ECHO_N "checking for inline... $ECHO_C" >&6
- if test "${ac_cv_c_inline+set}" = set; then
-diff -ur pl-5.6.18.orig/src/Makefile.in pl-5.6.18/src/Makefile.in
---- pl-5.6.18.orig/src/Makefile.in	2006-08-25 20:33:32.000000000 +1200
-+++ pl-5.6.18/src/Makefile.in	2006-09-01 19:36:22.000000000 +1200
-@@ -69,7 +69,7 @@
- CWFLAGS=@CWFLAGS@
- CIFLAGS=@CIFLAGS@
- CMFLAGS=@CMFLAGS@
--CFLAGS=	$(CWFLAGS) $(COFLAGS) $(CIFLAGS) $(CMFLAGS)
-+CFLAGS=	$(CWFLAGS) $(COFLAGS) $(CMFLAGS)
- LDFLAGS=@LDFLAGS@
- 
- PLFOREIGN=@PLFOREIGN@
-diff -ur pl-5.6.18.orig/src/configure pl-5.6.18/src/configure
---- pl-5.6.18.orig/src/configure	2006-08-07 20:21:19.000000000 +1200
-+++ pl-5.6.18/src/configure	2006-09-01 19:35:33.000000000 +1200
-@@ -3807,7 +3807,7 @@
- 		esac
- 	fi
- else
--	COFLAGS=$CFLAGS
-+	COFLAGS="$CFLAGS -fno-strict-aliasing"
- fi
- 
- 
-@@ -14816,7 +14816,7 @@
-   LNLIBS="$LIBS"
- fi
- 
--echo "	CFLAGS=$CWFLAGS $COFLAGS $CIFLAGS $CMFLAGS"
-+echo "	CFLAGS=$CWFLAGS $COFLAGS $CMFLAGS"
- echo "	LDFLAGS=$LDFLAGS"
- echo "	LIBS=$LIBS"
- 
-diff -ur pl-5.6.18.orig/src/libtai/Makefile.in pl-5.6.18/src/libtai/Makefile.in
---- pl-5.6.18.orig/src/libtai/Makefile.in	2006-07-11 20:41:05.000000000 +1200
-+++ pl-5.6.18/src/libtai/Makefile.in	2006-09-01 19:37:28.000000000 +1200
-@@ -29,7 +29,7 @@
- CIFLAGS=@CIFLAGS@
- CMFLAGS=@CMFLAGS@
- LDFLAGS=@LDFLAGS@
--CFLAGS=	$(CWFLAGS) $(COFLAGS) $(CIFLAGS) $(CMFLAGS)
-+CFLAGS=	$(CWFLAGS) $(COFLAGS) $(CMFLAGS)
- 
- INSTALL=@INSTALL@
- INSTALL_PROGRAM=@INSTALL_PROGRAM@
-diff -ur pl-5.6.18.orig/src/rc/Makefile.in pl-5.6.18/src/rc/Makefile.in
---- pl-5.6.18.orig/src/rc/Makefile.in	2006-07-11 20:22:28.000000000 +1200
-+++ pl-5.6.18/src/rc/Makefile.in	2006-09-01 19:36:56.000000000 +1200
-@@ -30,7 +30,7 @@
- CIFLAGS=@CIFLAGS@
- CMFLAGS=@CMFLAGS@
- LDFLAGS=@LDFLAGS@
--CFLAGS=	$(CWFLAGS) $(COFLAGS) $(CIFLAGS) $(CMFLAGS)
-+CFLAGS=	$(CWFLAGS) $(COFLAGS) $(CMFLAGS)
- 
- INSTALL=@INSTALL@
- INSTALL_PROGRAM=@INSTALL_PROGRAM@
diff --git a/dev-lang/swi-prolog/files/swi-prolog-CFLAGS-r5.patch b/dev-lang/swi-prolog/files/swi-prolog-CFLAGS-r5.patch
deleted file mode 100644
index 0135434f7d48..000000000000
--- a/dev-lang/swi-prolog/files/swi-prolog-CFLAGS-r5.patch
+++ /dev/null
@@ -1,356 +0,0 @@
-diff -ur pl-5.6.30.orig/packages/clib/configure pl-5.6.30/packages/clib/configure
---- pl-5.6.30.orig/packages/clib/configure	2007-03-09 22:17:04.000000000 +1300
-+++ pl-5.6.30/packages/clib/configure	2007-03-10 19:56:36.000000000 +1300
-@@ -3117,7 +3117,7 @@
- 
- fi
- 
--CFLAGS="$CMFLAGS"
-+#CFLAGS="$CMFLAGS"
- # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
- # for constant arguments.  Useless!
- echo "$as_me:$LINENO: checking for working alloca.h" >&5
-@@ -3709,7 +3709,7 @@
- 
- 
- if test ! -z "$GCC"; then
--    COFLAGS="${COFLAGS--O2 -fno-strict-aliasing}"
-+    COFLAGS="${COFLAGS-$CFLAGS -fno-strict-aliasing}"
-     CWFLAGS=${CWFLAGS--Wall}
- else
-     COFLAGS="${COFLAGS--O}"
-diff -ur pl-5.6.30.orig/packages/clib/maildrop/rfc2045/configure pl-5.6.30/packages/clib/maildrop/rfc2045/configure
---- pl-5.6.30.orig/packages/clib/maildrop/rfc2045/configure	2005-07-25 02:37:57.000000000 +1200
-+++ pl-5.6.30/packages/clib/maildrop/rfc2045/configure	2007-03-10 19:53:20.000000000 +1300
-@@ -3155,7 +3155,7 @@
- 
- if test "$GCC" = yes ; then
-         CXXFLAGS="$CXXFLAGS -Wall"
--        CFLAGS="$CFLAGS -Wall"
-+        CFLAGS="$CFLAGS -fpic -Wall"
- fi
- 
- 
-diff -ur pl-5.6.30.orig/packages/clib/maildrop/rfc822/configure pl-5.6.30/packages/clib/maildrop/rfc822/configure
---- pl-5.6.30.orig/packages/clib/maildrop/rfc822/configure	2005-07-25 02:37:57.000000000 +1200
-+++ pl-5.6.30/packages/clib/maildrop/rfc822/configure	2007-03-10 19:53:20.000000000 +1300
-@@ -3144,7 +3144,7 @@
- 
- if test "$GCC" = yes ; then
-         CXXFLAGS="$CXXFLAGS -Wall"
--        CFLAGS="$CFLAGS -Wall"
-+        CFLAGS="$CFLAGS -fpic -Wall"
- fi
- 
- 
-diff -ur pl-5.6.30.orig/packages/cppproxy/configure pl-5.6.30/packages/cppproxy/configure
---- pl-5.6.30.orig/packages/cppproxy/configure	2007-01-24 08:25:14.000000000 +1300
-+++ pl-5.6.30/packages/cppproxy/configure	2007-03-10 19:53:20.000000000 +1300
-@@ -3111,7 +3111,7 @@
- 
- fi
- 
--CFLAGS="$CMFLAGS"
-+#CFLAGS="$CMFLAGS"
- # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
- # for constant arguments.  Useless!
- echo "$as_me:$LINENO: checking for working alloca.h" >&5
-@@ -3703,7 +3703,7 @@
- 
- 
- if test ! -z "$GCC"; then
--    COFLAGS="-O2 -fno-strict-aliasing"
-+    COFLAGS="$CFLAGS -fno-strict-aliasing"
-     CWFLAGS=${CWFLAGS--Wall}
- else
-     COFLAGS=-O
-diff -ur pl-5.6.30.orig/packages/db/configure pl-5.6.30/packages/db/configure
---- pl-5.6.30.orig/packages/db/configure	2007-01-24 08:25:14.000000000 +1300
-+++ pl-5.6.30/packages/db/configure	2007-03-10 19:53:20.000000000 +1300
-@@ -3140,13 +3140,13 @@
- 
- 
- if test ! -z "$GCC"; then
--    COFLAGS="-O2 -fno-strict-aliasing"
-+    COFLAGS="$CFLAGS -fno-strict-aliasing"
-     CWFLAGS=${CWFLAGS--Wall}
- else
-     COFLAGS=-O
- fi
- 
--CFLAGS="$CMFLAGS $CIFLAGS"
-+#CFLAGS="$CMFLAGS $CIFLAGS"
- # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
- # for constant arguments.  Useless!
- echo "$as_me:$LINENO: checking for working alloca.h" >&5
-diff -ur pl-5.6.30.orig/packages/jpl/configure pl-5.6.30/packages/jpl/configure
---- pl-5.6.30.orig/packages/jpl/configure	2006-12-22 02:41:37.000000000 +1300
-+++ pl-5.6.30/packages/jpl/configure	2007-03-10 19:53:20.000000000 +1300
-@@ -3115,12 +3115,12 @@
- 
- fi
- 
--CFLAGS="$CMFLAGS"
-+#CFLAGS="$CMFLAGS"
- 
- 
- if test ! -z "$GCC"; then
--    COFLAGS="-O2 -cc-options,-fno-strict-aliasing"
--    CWFLAGS="-Wall"
-+    COFLAGS="$CFLAGS -cc-options,-fno-strict-aliasing"
-+    CWFLAGS="-Wall -Wno-strict-aliasing"
- else
-     COFLAGS=-O
-     CWFLAGS=
-diff -ur pl-5.6.30.orig/packages/ltx2htm/configure pl-5.6.30/packages/ltx2htm/configure
---- pl-5.6.30.orig/packages/ltx2htm/configure	2007-01-24 08:25:14.000000000 +1300
-+++ pl-5.6.30/packages/ltx2htm/configure	2007-03-10 19:53:20.000000000 +1300
-@@ -1384,6 +1384,7 @@
- CC=$PLLD
- LD=$PLLD
- LDSOFLAGS=-shared
-+CMFLAGS=-fpic
- 
- SO="$PLSOEXT"
- 
-@@ -3048,7 +3049,7 @@
- 
- fi
- 
--CFLAGS="$CMFLAGS"
-+#CFLAGS="$CMFLAGS"
- # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
- # for constant arguments.  Useless!
- echo "$as_me:$LINENO: checking for working alloca.h" >&5
-@@ -3640,7 +3641,7 @@
- 
- 
- if test ! -z "$GCC"; then
--    COFLAGS="-O2 -fno-strict-aliasing"
-+    COFLAGS="$CFLAGS -fno-strict-aliasing"
-     CWFLAGS=${CWFLAGS--Wall}
- else
-     COFLAGS=-O
-diff -ur pl-5.6.30.orig/packages/nlp/configure pl-5.6.30/packages/nlp/configure
---- pl-5.6.30.orig/packages/nlp/configure	2007-01-24 08:25:14.000000000 +1300
-+++ pl-5.6.30/packages/nlp/configure	2007-03-10 19:53:20.000000000 +1300
-@@ -3111,7 +3111,7 @@
- 
- fi
- 
--CFLAGS="$CMFLAGS"
-+#CFLAGS="$CMFLAGS"
- # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
- # for constant arguments.  Useless!
- echo "$as_me:$LINENO: checking for working alloca.h" >&5
-@@ -3703,7 +3703,7 @@
- 
- 
- if test ! -z "$GCC"; then
--    COFLAGS="-O2 -fno-strict-aliasing"
-+    COFLAGS="$CFLAGS -fno-strict-aliasing"
-     CWFLAGS=${CWFLAGS--Wall}
- else
-     COFLAGS=-O
-diff -ur pl-5.6.30.orig/packages/odbc/configure pl-5.6.30/packages/odbc/configure
---- pl-5.6.30.orig/packages/odbc/configure	2007-01-24 08:25:14.000000000 +1300
-+++ pl-5.6.30/packages/odbc/configure	2007-03-10 19:53:20.000000000 +1300
-@@ -3147,7 +3147,7 @@
- 
- fi
- 
--CFLAGS="$CMFLAGS"
-+#CFLAGS="$CMFLAGS"
- # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
- # for constant arguments.  Useless!
- echo "$as_me:$LINENO: checking for working alloca.h" >&5
-@@ -3739,7 +3739,7 @@
- 
- 
- if test ! -z "$GCC"; then
--    COFLAGS="-O2 -fno-strict-aliasing"
-+    COFLAGS="$CFLAGS -fno-strict-aliasing"
-     CWFLAGS=${CWFLAGS--Wall}
- else
-     COFLAGS=-O
-diff -ur pl-5.6.30.orig/packages/semweb/configure pl-5.6.30/packages/semweb/configure
---- pl-5.6.30.orig/packages/semweb/configure	2007-03-09 22:17:10.000000000 +1300
-+++ pl-5.6.30/packages/semweb/configure	2007-03-10 19:59:10.000000000 +1300
-@@ -3145,7 +3145,7 @@
- 
- fi
- 
--CFLAGS="$CMFLAGS"
-+#CFLAGS="$CMFLAGS"
- # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
- # for constant arguments.  Useless!
- echo "$as_me:$LINENO: checking for working alloca.h" >&5
-@@ -4294,7 +4294,7 @@
- 
- 
- if test ! -z "$GCC"; then
--    COFLAGS="${COFLAGS--O3 -fno-strict-aliasing}"
-+    COFLAGS="${COFLAGS-$CFLAGS -fno-strict-aliasing}"
-     CWFLAGS=${CWFLAGS--Wall}
- else
-     COFLAGS=-O
-diff -ur pl-5.6.30.orig/packages/sgml/configure pl-5.6.30/packages/sgml/configure
---- pl-5.6.30.orig/packages/sgml/configure	2007-01-25 03:17:48.000000000 +1300
-+++ pl-5.6.30/packages/sgml/configure	2007-03-10 19:53:20.000000000 +1300
-@@ -2394,7 +2394,7 @@
- SO="$PLSOEXT"
- 
- if test ! -z "$GCC"; then
--    COFLAGS="-O2 -fno-strict-aliasing"
-+    COFLAGS="$CFLAGS -fno-strict-aliasing"
-     CWFLAGS=${CWFLAGS--Wall}
- else
-     COFLAGS=-O
-@@ -3190,7 +3190,7 @@
- 
- fi
- 
--CFLAGS="$CMFLAGS"
-+#CFLAGS="$CMFLAGS"
- echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
- echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6
- if test "${ac_cv_c_bigendian+set}" = set; then
-diff -ur pl-5.6.30.orig/packages/ssl/configure pl-5.6.30/packages/ssl/configure
---- pl-5.6.30.orig/packages/ssl/configure	2007-01-24 08:25:14.000000000 +1300
-+++ pl-5.6.30/packages/ssl/configure	2007-03-10 19:53:20.000000000 +1300
-@@ -3110,7 +3110,7 @@
- 
- fi
- 
--CFLAGS="$CMFLAGS"
-+#CFLAGS="$CMFLAGS"
- # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
- # for constant arguments.  Useless!
- echo "$as_me:$LINENO: checking for working alloca.h" >&5
-@@ -3702,7 +3702,7 @@
- 
- 
- if test ! -z "$GCC"; then
--    COFLAGS="-O2 -fno-strict-aliasing"
-+    COFLAGS="$CFLAGS -fno-strict-aliasing"
-     CWFLAGS=${CWFLAGS--Wall}
- else
-     COFLAGS=-O
-diff -ur pl-5.6.30.orig/packages/table/configure pl-5.6.30/packages/table/configure
---- pl-5.6.30.orig/packages/table/configure	2007-01-24 08:25:14.000000000 +1300
-+++ pl-5.6.30/packages/table/configure	2007-03-10 19:53:20.000000000 +1300
-@@ -3112,7 +3112,7 @@
- 
- fi
- 
--CFLAGS="$CMFLAGS"
-+#CFLAGS="$CMFLAGS"
- # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
- # for constant arguments.  Useless!
- echo "$as_me:$LINENO: checking for working alloca.h" >&5
-@@ -3704,7 +3704,7 @@
- 
- 
- if test ! -z "$GCC"; then
--    COFLAGS="-O2 -fno-strict-aliasing"
-+    COFLAGS="$CFLAGS -fno-strict-aliasing"
-     CWFLAGS=${CWFLAGS--Wall}
- else
-     COFLAGS=-O
-diff -ur pl-5.6.30.orig/packages/xpce/src/configure pl-5.6.30/packages/xpce/src/configure
---- pl-5.6.30.orig/packages/xpce/src/configure	2007-03-10 02:41:39.000000000 +1300
-+++ pl-5.6.30/packages/xpce/src/configure	2007-03-10 20:09:50.000000000 +1300
-@@ -6522,13 +6522,13 @@
- 
- 
- if test ! -z "$GCC"; then
--    COFLAGS="${COFLAGS--O2 -fno-strict-aliasing}"
-+    COFLAGS="${COFLAGS-$CFLAGS -fno-strict-aliasing}"
-     CWFLAGS="${CWFLAGS--Wall}"
- else
-     COFLAGS="${COFLAGS--O}"
- fi
- 
--CFLAGS="$CMFLAGS"
-+#CFLAGS="$CMFLAGS"
- echo "$as_me:$LINENO: checking for inline" >&5
- echo $ECHO_N "checking for inline... $ECHO_C" >&6
- if test "${ac_cv_c_inline+set}" = set; then
-diff -ur pl-5.6.30.orig/packages/zlib/configure pl-5.6.30/packages/zlib/configure
---- pl-5.6.30.orig/packages/zlib/configure	2007-01-24 08:25:14.000000000 +1300
-+++ pl-5.6.30/packages/zlib/configure	2007-03-10 19:53:20.000000000 +1300
-@@ -3109,7 +3109,7 @@
- 
- fi
- 
--CFLAGS="$CMFLAGS"
-+#CFLAGS="$CMFLAGS"
- # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
- # for constant arguments.  Useless!
- echo "$as_me:$LINENO: checking for working alloca.h" >&5
-@@ -3701,7 +3701,7 @@
- 
- 
- if test ! -z "$GCC"; then
--    COFLAGS="-O2 -fno-strict-aliasing"
-+    COFLAGS="$CFLAGS -fno-strict-aliasing"
-     CWFLAGS=${CWFLAGS--Wall}
- else
-     COFLAGS=-O
-diff -ur pl-5.6.30.orig/src/Makefile.in pl-5.6.30/src/Makefile.in
---- pl-5.6.30.orig/src/Makefile.in	2007-03-07 23:58:49.000000000 +1300
-+++ pl-5.6.30/src/Makefile.in	2007-03-10 19:53:20.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@
-diff -ur pl-5.6.30.orig/src/configure pl-5.6.30/src/configure
---- pl-5.6.30.orig/src/configure	2007-03-09 22:16:37.000000000 +1300
-+++ pl-5.6.30/src/configure	2007-03-10 19:53:20.000000000 +1300
-@@ -3809,7 +3809,7 @@
- 		esac
- 	fi
- else
--	COFLAGS=$CFLAGS
-+	COFLAGS="$CFLAGS -fno-strict-aliasing"
- fi
- 
- 
-@@ -15704,7 +15704,7 @@
-   LNLIBS="$LIBS"
- fi
- 
--echo "	CFLAGS=$CWFLAGS $COFLAGS $CIFLAGS $CMFLAGS"
-+echo "	CFLAGS=$CWFLAGS $COFLAGS $CMFLAGS"
- echo "	LDFLAGS=$LDFLAGS"
- echo "	LIBS=$LIBS"
- 
-diff -ur pl-5.6.30.orig/src/libtai/Makefile.in pl-5.6.30/src/libtai/Makefile.in
---- pl-5.6.30.orig/src/libtai/Makefile.in	2006-07-11 20:41:05.000000000 +1200
-+++ pl-5.6.30/src/libtai/Makefile.in	2007-03-10 19:53:20.000000000 +1300
-@@ -29,7 +29,7 @@
- CIFLAGS=@CIFLAGS@
- CMFLAGS=@CMFLAGS@
- LDFLAGS=@LDFLAGS@
--CFLAGS=	$(CWFLAGS) $(COFLAGS) $(CIFLAGS) $(CMFLAGS)
-+CFLAGS=	$(CWFLAGS) $(COFLAGS) $(CMFLAGS)
- 
- INSTALL=@INSTALL@
- INSTALL_PROGRAM=@INSTALL_PROGRAM@
-diff -ur pl-5.6.30.orig/src/rc/Makefile.in pl-5.6.30/src/rc/Makefile.in
---- pl-5.6.30.orig/src/rc/Makefile.in	2006-07-11 20:22:28.000000000 +1200
-+++ pl-5.6.30/src/rc/Makefile.in	2007-03-10 19:53:20.000000000 +1300
-@@ -30,7 +30,7 @@
- CIFLAGS=@CIFLAGS@
- CMFLAGS=@CMFLAGS@
- LDFLAGS=@LDFLAGS@
--CFLAGS=	$(CWFLAGS) $(COFLAGS) $(CIFLAGS) $(CMFLAGS)
-+CFLAGS=	$(CWFLAGS) $(COFLAGS) $(CMFLAGS)
- 
- INSTALL=@INSTALL@
- INSTALL_PROGRAM=@INSTALL_PROGRAM@
diff --git a/dev-lang/swi-prolog/files/swi-prolog-PL_EV_THREADFINISHED.patch b/dev-lang/swi-prolog/files/swi-prolog-PL_EV_THREADFINISHED.patch
deleted file mode 100644
index 8c0ca90940b2..000000000000
--- a/dev-lang/swi-prolog/files/swi-prolog-PL_EV_THREADFINISHED.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- pl-5.6.23.orig/src/pl-funcs.h	2006-11-02 03:27:21.000000000 +1300
-+++ pl-5.6.23/src/pl-funcs.h	2006-11-16 07:14:02.000000000 +1300
-@@ -919,7 +919,9 @@
- /* pl-thread.c */
- COMMON(foreign_t) 	pl_with_mutex(term_t mutex, term_t goal);
- COMMON(foreign_t) 	pl_thread_self(term_t self);
-+#ifdef O_PLMT
- COMMON(int)		unify_thread_id(term_t id, PL_thread_info_t *info);
-+#endif
- COMMON(int) 		enableThreads(int enable);
- 
- 
---- pl-5.6.23.orig/src/pl-trace.c	2006-11-03 02:41:12.000000000 +1300
-+++ pl-5.6.23/src/pl-trace.c	2006-11-16 07:15:50.000000000 +1300
-@@ -1817,6 +1817,7 @@
- 		           PL_TERM, ref);
- 	break;
-       }
-+#ifdef O_PLMT
-       case PL_EV_THREADFINISHED:
-       { PL_thread_info_t *info = va_arg(args, PL_thread_info_t*);
- 	term_t id = PL_new_term_ref();
-@@ -1826,6 +1827,7 @@
- 		             PL_TERM, id);
- 	break;
-       }
-+#endif
-       default:
- 	warning("callEventHook(): unknown event: %d", ev);
-         goto out;
diff --git a/dev-lang/swi-prolog/files/swi-prolog-jpl-LDPATH-r1.patch b/dev-lang/swi-prolog/files/swi-prolog-jpl-LDPATH-r1.patch
deleted file mode 100644
index cc0c15621be5..000000000000
--- a/dev-lang/swi-prolog/files/swi-prolog-jpl-LDPATH-r1.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -ur pl-5.6.24.orig/packages/jpl/Makefile.in pl-5.6.24/packages/jpl/Makefile.in
---- pl-5.6.24.orig/packages/jpl/Makefile.in	2006-11-28 22:16:43.000000000 +1300
-+++ pl-5.6.24/packages/jpl/Makefile.in	2006-11-29 20:51:24.000000000 +1300
-@@ -36,6 +36,7 @@
- JAVA=@JAVA@
- JUNIT=@JUNIT@
- JAVALIBS=@JAVALIBS@
-+JAVALDPATH=@JAVALDPATH@
- 
- DOCTOTEX=$(PCEHOME)/bin/doc2tex
- PLTOTEX=$(PCEHOME)/bin/pl2tex
-@@ -75,7 +76,7 @@
- check:		check_pl check_java
- 
- check_pl::		
--		$(PL) -q -f test_jpl.pl -g run_tests,halt -t 'halt(1)'
-+		LD_LIBRARY_PATH=$(JAVALDPATH) $(PL) -q -f test_jpl.pl -g run_tests,halt -t 'halt(1)'
- check_java::
- 		CLASSPATH=$(JUNIT):jpl.jar:jpltest.jar $(JAVA) junit.textui.TestRunner jpl.test.TestJUnit
- 
-diff -ur pl-5.6.24.orig/packages/jpl/configure pl-5.6.24/packages/jpl/configure
---- pl-5.6.24.orig/packages/jpl/configure	2006-11-28 22:16:44.000000000 +1300
-+++ pl-5.6.24/packages/jpl/configure	2006-11-29 20:50:13.000000000 +1300
-@@ -3979,6 +3979,7 @@
- 
- for d in $JNI_CLIENT_DIRS; do
-   LDSOFLAGS="$LDSOFLAGS -L$d"
-+  JAVALDPATH="$JAVALDPATH:$d"
- done
- 
- if test "$java_abs_paths" = yes; then
-@@ -5254,6 +5255,7 @@
- s,@LDSOFLAGS@,$LDSOFLAGS,;t t
- s,@JAVA_HOME@,$JAVA_HOME,;t t
- s,@JAVALIBS@,$JAVALIBS,;t t
-+s,@JAVALDPATH@,$JAVALDPATH,;t t
- s,@JUNIT@,$JUNIT,;t t
- s,@PLLD@,$PLLD,;t t
- s,@MAKE@,$MAKE,;t t
diff --git a/dev-lang/swi-prolog/files/swi-prolog-jpl-LDPATH.patch b/dev-lang/swi-prolog/files/swi-prolog-jpl-LDPATH.patch
deleted file mode 100644
index d6abf1010cf6..000000000000
--- a/dev-lang/swi-prolog/files/swi-prolog-jpl-LDPATH.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- pl-5.6.18.orig/packages/jpl/configure	2006-08-09 19:58:24.000000000 +1200
-+++ pl-5.6.18/packages/jpl/configure	2006-09-01 19:45:49.000000000 +1200
-@@ -3591,6 +3591,7 @@
- 
- for d in $JNI_CLIENT_DIRS; do
-   LDSOFLAGS="$LDSOFLAGS -L$d"
-+  JAVALDPATH="$JAVALDPATH:$d"
- done
- 
- if test "$java_abs_paths" = yes; then
-@@ -4225,6 +4226,7 @@
- s,@LDSOFLAGS@,$LDSOFLAGS,;t t
- s,@JAVA_HOME@,$JAVA_HOME,;t t
- s,@JAVALIBS@,$JAVALIBS,;t t
-+s,@JAVALDPATH@,$JAVALDPATH,;t t
- s,@PLLD@,$PLLD,;t t
- s,@MAKE@,$MAKE,;t t
- s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
---- pl-5.6.18.orig/packages/jpl/Makefile.in	2006-08-11 19:14:07.000000000 +1200
-+++ pl-5.6.18/packages/jpl/Makefile.in	2006-09-01 22:06:13.000000000 +1200
-@@ -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-jpl-install.patch b/dev-lang/swi-prolog/files/swi-prolog-packages-jpl-install.patch
deleted file mode 100644
index 61e794e2d972..000000000000
--- a/dev-lang/swi-prolog/files/swi-prolog-packages-jpl-install.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- pl-5.6.16.orig/packages/jpl/Makefile.in	2006-02-04 04:38:49.000000000 +1300
-+++ pl-5.6.16/packages/jpl/Makefile.in	2006-07-08 16:26:06.000000000 +1200
-@@ -157,7 +157,7 @@
- 		    if [ -f examples/java/$$d/$$plfile ]; then \
- 			$(INSTALL_DATA) examples/java/$$d/$$plfile $(DESTDIR)$(EXJAVA)/$$d ;\
- 		    fi; \
--		    $(INSTALL_DATA) examples/java/$$d/$$d.class $(DESTDIR)$(EXJAVA)/$$d ;\
-+		    $(INSTALL_DATA) examples/java/$$d/$$d*.class $(DESTDIR)$(EXJAVA)/$$d ;\
- 		done
- 		$(INSTALL_DATA) examples/java/SemWeb/test.rdf $(DESTDIR)$(EXJAVA)/SemWeb
- 
diff --git a/dev-lang/swi-prolog/files/swi-prolog-packages-sparc-alignment.patch b/dev-lang/swi-prolog/files/swi-prolog-packages-sparc-alignment.patch
deleted file mode 100644
index b73480777523..000000000000
--- a/dev-lang/swi-prolog/files/swi-prolog-packages-sparc-alignment.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- pl-5.6.17.orig/packages/semweb/avl.h	2006-03-07 04:23:47.000000000 +1300
-+++ pl-5.6.17/packages/semweb/avl.h	2006-08-15 21:59:09.000000000 +1200
-@@ -58,7 +58,11 @@
-   /* structure for a node in an AVL tree */
- typedef struct avl_node
- { struct avl_node  *subtree[2];		/* LEFT and RIGHT subtrees */
-+#ifndef __sparc__
-   short       bal;			/* balance factor */
-+#else
-+  long        bal;			/* balance factor */
-+#endif
-   char	      data[1];			/* data on my back */
- } AVLnode, *AVLtree;
- 
diff --git a/dev-lang/swi-prolog/swi-prolog-5.6.18.ebuild b/dev-lang/swi-prolog/swi-prolog-5.6.18.ebuild
deleted file mode 100644
index 9aa822f84bee..000000000000
--- a/dev-lang/swi-prolog/swi-prolog-5.6.18.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2007 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.18.ebuild,v 1.7 2007/02/03 03:28:41 keri Exp $
-
-inherit eutils java-pkg-opt-2
-
-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 ~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-1.4 )
-	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}"/${P}-portage.patch
-	epatch "${FILESDIR}"/${P}-CFLAGS.patch
-	epatch "${FILESDIR}"/${P}-PLBASE.patch
-	epatch "${FILESDIR}"/${P}-parallel-build.patch
-	epatch "${FILESDIR}"/${P}-gmp-sparc-alignment.patch
-	epatch "${FILESDIR}"/${PN}-cppproxy-r1.patch
-	epatch "${FILESDIR}"/${PN}-jpl-LDPATH.patch
-	epatch "${FILESDIR}"/${PN}-ltx2htm.patch
-	epatch "${FILESDIR}"/${PN}-SGML_CATALOG_FILES.patch
-	epatch "${FILESDIR}"/${PN}-thread-tests.patch
-	epatch "${FILESDIR}"/${PN}-xpce-test.patch
-}
-
-src_compile() {
-	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 || die "emake failed"
-
-	if ! use minimal ; then
-		einfo "Building SWI-Prolog additional packages"
-
-		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 || 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.19.ebuild b/dev-lang/swi-prolog/swi-prolog-5.6.19.ebuild
deleted file mode 100644
index 48ce3cee4d63..000000000000
--- a/dev-lang/swi-prolog/swi-prolog-5.6.19.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2007 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.19.ebuild,v 1.7 2007/02/03 03:28:41 keri Exp $
-
-inherit eutils java-pkg-opt-2
-
-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 ~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-1.4 )
-	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}-portage-r1.patch
-	epatch "${FILESDIR}"/${PN}-CFLAGS-r2.patch
-	epatch "${FILESDIR}"/${PN}-PLBASE-r2.patch
-	epatch "${FILESDIR}"/${PN}-parallel-build.patch
-	epatch "${FILESDIR}"/${PN}-gmp-sparc-alignment.patch
-	epatch "${FILESDIR}"/${PN}-cppproxy-r1.patch
-	epatch "${FILESDIR}"/${PN}-jpl-LDPATH.patch
-	epatch "${FILESDIR}"/${PN}-ltx2htm.patch
-	epatch "${FILESDIR}"/${PN}-SGML_CATALOG_FILES.patch
-	epatch "${FILESDIR}"/${PN}-thread-tests.patch
-	epatch "${FILESDIR}"/${PN}-xpce-test.patch
-}
-
-src_compile() {
-	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 || die "emake failed"
-
-	if ! use minimal ; then
-		einfo "Building SWI-Prolog additional packages"
-
-		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 || 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.20.ebuild b/dev-lang/swi-prolog/swi-prolog-5.6.20.ebuild
deleted file mode 100644
index 107f58f02aed..000000000000
--- a/dev-lang/swi-prolog/swi-prolog-5.6.20.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2007 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.20.ebuild,v 1.7 2007/02/03 03:28:41 keri Exp $
-
-inherit eutils java-pkg-opt-2
-
-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 ~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-1.4 )
-	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}-portage-r1.patch
-	epatch "${FILESDIR}"/${PN}-CFLAGS-r2.patch
-	epatch "${FILESDIR}"/${PN}-PLBASE-r2.patch
-	epatch "${FILESDIR}"/${PN}-parallel-build.patch
-	epatch "${FILESDIR}"/${PN}-gmp-sparc-alignment.patch
-	epatch "${FILESDIR}"/${PN}-cppproxy-r1.patch
-	epatch "${FILESDIR}"/${PN}-jpl-LDPATH.patch
-	epatch "${FILESDIR}"/${PN}-ltx2htm.patch
-	epatch "${FILESDIR}"/${PN}-SGML_CATALOG_FILES.patch
-	epatch "${FILESDIR}"/${PN}-thread-tests.patch
-	epatch "${FILESDIR}"/${PN}-xpce-test.patch
-}
-
-src_compile() {
-	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 || die "emake failed"
-
-	if ! use minimal ; then
-		einfo "Building SWI-Prolog additional packages"
-
-		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 || 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.21.ebuild b/dev-lang/swi-prolog/swi-prolog-5.6.21.ebuild
deleted file mode 100644
index 4c0261d7e68a..000000000000
--- a/dev-lang/swi-prolog/swi-prolog-5.6.21.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2007 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.21.ebuild,v 1.4 2007/02/03 03:28:41 keri Exp $
-
-inherit eutils java-pkg-opt-2
-
-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 ~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-1.4 )
-	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}-portage-r1.patch
-	epatch "${FILESDIR}"/${PN}-CFLAGS-r2.patch
-	epatch "${FILESDIR}"/${PN}-PLBASE-r2.patch
-	epatch "${FILESDIR}"/${PN}-cppproxy-r1.patch
-	epatch "${FILESDIR}"/${PN}-jpl-LDPATH.patch
-	epatch "${FILESDIR}"/${PN}-ltx2htm.patch
-	epatch "${FILESDIR}"/${PN}-SGML_CATALOG_FILES.patch
-	epatch "${FILESDIR}"/${PN}-thread-tests.patch
-	epatch "${FILESDIR}"/${PN}-xpce-parallel-build.patch
-	epatch "${FILESDIR}"/${PN}-xpce-test.patch
-}
-
-src_compile() {
-	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 || die "emake failed"
-
-	if ! use minimal ; then
-		einfo "Building SWI-Prolog additional packages"
-
-		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 || 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.22.ebuild b/dev-lang/swi-prolog/swi-prolog-5.6.22.ebuild
deleted file mode 100644
index 21f617c5330d..000000000000
--- a/dev-lang/swi-prolog/swi-prolog-5.6.22.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2007 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.22.ebuild,v 1.3 2007/02/03 03:28:41 keri Exp $
-
-inherit eutils java-pkg-opt-2
-
-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 ~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-1.4 )
-	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}-portage-r1.patch
-	epatch "${FILESDIR}"/${PN}-CFLAGS-r2.patch
-	epatch "${FILESDIR}"/${PN}-PLBASE-r2.patch
-	epatch "${FILESDIR}"/${PN}-cppproxy-r1.patch
-	epatch "${FILESDIR}"/${PN}-jpl-LDPATH.patch
-	epatch "${FILESDIR}"/${PN}-ltx2htm.patch
-	epatch "${FILESDIR}"/${PN}-SGML_CATALOG_FILES.patch
-	epatch "${FILESDIR}"/${PN}-thread-tests.patch
-	epatch "${FILESDIR}"/${PN}-xpce-parallel-build.patch
-	epatch "${FILESDIR}"/${PN}-xpce-test.patch
-}
-
-src_compile() {
-	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 || die "emake failed"
-
-	if ! use minimal ; then
-		einfo "Building SWI-Prolog additional packages"
-
-		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 || 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.23.ebuild b/dev-lang/swi-prolog/swi-prolog-5.6.23.ebuild
deleted file mode 100644
index 627852a8acc5..000000000000
--- a/dev-lang/swi-prolog/swi-prolog-5.6.23.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2007 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.23.ebuild,v 1.3 2007/02/03 03:28:41 keri Exp $
-
-inherit eutils java-pkg-opt-2
-
-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 ~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-1.4 )
-	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}-portage-r1.patch
-	epatch "${FILESDIR}"/${PN}-CFLAGS-r3.patch
-	epatch "${FILESDIR}"/${PN}-PLBASE-r2.patch
-	epatch "${FILESDIR}"/${PN}-PL_EV_THREADFINISHED.patch
-	epatch "${FILESDIR}"/${PN}-cppproxy-r1.patch
-	epatch "${FILESDIR}"/${PN}-jpl-PLARCH.patch
-	epatch "${FILESDIR}"/${PN}-jpl-LDPATH.patch
-	epatch "${FILESDIR}"/${PN}-ltx2htm.patch
-	epatch "${FILESDIR}"/${PN}-SGML_CATALOG_FILES.patch
-	epatch "${FILESDIR}"/${PN}-thread-tests.patch
-	epatch "${FILESDIR}"/${PN}-xpce-parallel-build.patch
-	epatch "${FILESDIR}"/${PN}-xpce-test.patch
-}
-
-src_compile() {
-	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 || die "emake failed"
-
-	if ! use minimal ; then
-		einfo "Building SWI-Prolog additional packages"
-
-		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 || 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.24.ebuild b/dev-lang/swi-prolog/swi-prolog-5.6.24.ebuild
deleted file mode 100644
index 80af57abb0eb..000000000000
--- a/dev-lang/swi-prolog/swi-prolog-5.6.24.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2007 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.24.ebuild,v 1.2 2007/02/03 03:28:41 keri Exp $
-
-inherit eutils java-pkg-opt-2
-
-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 ~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-1.4
-		dev-java/junit )
-	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}-portage-r1.patch
-	epatch "${FILESDIR}"/${PN}-CFLAGS-r3.patch
-	epatch "${FILESDIR}"/${PN}-PLBASE-r2.patch
-	epatch "${FILESDIR}"/${PN}-cppproxy-r1.patch
-	epatch "${FILESDIR}"/${PN}-jpl-PLARCH.patch
-	epatch "${FILESDIR}"/${PN}-jpl-LDPATH-r1.patch
-	epatch "${FILESDIR}"/${PN}-jpl-junit.patch
-	epatch "${FILESDIR}"/${PN}-ltx2htm.patch
-	epatch "${FILESDIR}"/${PN}-SGML_CATALOG_FILES.patch
-	epatch "${FILESDIR}"/${PN}-thread-tests.patch
-	epatch "${FILESDIR}"/${PN}-xpce-parallel-build.patch
-	epatch "${FILESDIR}"/${PN}-xpce-test-r1.patch
-}
-
-src_compile() {
-	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 || die "emake failed"
-
-	if ! use minimal ; then
-		einfo "Building SWI-Prolog additional packages"
-
-		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 || 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
-}