Remove old versions.

(Portage version: 2.1.4.5)

9 files changed, 8 insertions, 760 deletions

diff --git a/dev-lang/qu-prolog/ChangeLog b/dev-lang/qu-prolog/ChangeLog
index c8462f5f26db..7410ba4511e2 100644
--- a/dev-lang/qu-prolog/ChangeLog
+++ b/dev-lang/qu-prolog/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-lang/qu-prolog
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/qu-prolog/ChangeLog,v 1.50 2008/09/28 12:42:06 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/qu-prolog/ChangeLog,v 1.51 2008/10/17 22:37:26 keri Exp $
+
+  17 Oct 2008; <keri@gentoo.org> -files/qu-prolog-8.3-configure.patch,
+  -files/qu-prolog-8.3-debug.patch, -files/qu-prolog-8.3-gcc4.patch,
+  -files/qu-prolog-8.3-portage.patch, -files/qu-prolog-8.5-gcc4.3.patch,
+  -files/qu-prolog-8.5-portage.patch, -qu-prolog-8.3.ebuild,
+  -qu-prolog-8.5.ebuild:
+  Remove old versions.
 
   28 Sep 2008; Markus Meier <maekke@gentoo.org> qu-prolog-8.6.ebuild:
   x86 stable, bug #238330
diff --git a/dev-lang/qu-prolog/files/qu-prolog-8.3-configure.patch b/dev-lang/qu-prolog/files/qu-prolog-8.3-configure.patch
deleted file mode 100644
index 0c0ee19d3d49..000000000000
--- a/dev-lang/qu-prolog/files/qu-prolog-8.3-configure.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- qp8.3.orig/configure	2007-12-13 15:46:22.000000000 +1300
-+++ qp8.3/configure	2007-12-22 19:10:16.000000000 +1300
-@@ -3786,6 +3786,8 @@
- 
- fi
- 
-+if false; then
-+
- # Extract the first word of "perl", so it can be a program name with args.
- set dummy perl; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
-@@ -3836,6 +3838,7 @@
-    { (exit 1); exit 1; }; }
- fi
- 
-+fi
- 
- GCCINCLUDES=
- 
diff --git a/dev-lang/qu-prolog/files/qu-prolog-8.3-debug.patch b/dev-lang/qu-prolog/files/qu-prolog-8.3-debug.patch
deleted file mode 100644
index a9b29115b127..000000000000
--- a/dev-lang/qu-prolog/files/qu-prolog-8.3-debug.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Only in qp8.3: configure.orig
-diff -ur qp8.3.orig/src/io.cc qp8.3/src/io.cc
---- qp8.3.orig/src/io.cc	2007-12-13 15:45:57.000000000 +1300
-+++ qp8.3/src/io.cc	2007-12-22 19:12:41.000000000 +1300
-@@ -914,8 +914,7 @@
-     }
- 
- #ifdef DEBUG_IO
--  cerr.form("%s result = %ld FD_ISSET(%ld, ...) = %ld\n",
--	    __FUNCTION__, result, fd, FD_ISSET(fd, &fds));
-+  cerr << __FUNCTION__ << " result = " << result << "FD_ISSET(" << fd << ", ...) = " << FD_ISSET(fd, &fds) << endl;
- #endif
- #ifdef WIN32
-   if (result == 0 || result == 128)
-diff -ur qp8.3.orig/src/thread_escapes.cc qp8.3/src/thread_escapes.cc
---- qp8.3.orig/src/thread_escapes.cc	2007-12-13 15:45:57.000000000 +1300
-+++ qp8.3/src/thread_escapes.cc	2007-12-22 19:12:41.000000000 +1300
-@@ -212,8 +212,7 @@
-   thread_table->IncLive();
- 
- #ifdef DEBUG_MT
--  printf("%s Thread %ld, %ld now live\n",
--	    __FUNCTION__, thread->TInfo().ID(), thread_table->Live());
-+  cout << __FUNCTION__ << " Thread " << thread->TInfo().ID() << ", " << thread_table->Live() << " now live" << endl;
-   //      heap.DisplayTerm(cerr, *atoms, argG);
- #endif
-   
-@@ -541,7 +540,7 @@
-   Condition(ThreadCondition::EXITED);
- 
- #ifdef DEBUG_MT
--  cerr.form("%s %ld\n", __FUNCTION__, TInfo().ID());
-+  cerr << __FUNCTION__ << " " << TInfo().ID() << endl;
- #endif
- 
-   if (TInfo().SymbolSet())
-@@ -948,7 +947,7 @@
-   thread->Condition(ThreadCondition::EXITED);
- 
- #ifdef DEBUG_MT
--  cerr.form("%s %ld\n", __FUNCTION__, thread->TInfo().ID());
-+  cerr << __FUNCTION__ << " " << thread->TInfo().ID();
- #endif
- 
-   if (thread->TInfo().SymbolSet())
diff --git a/dev-lang/qu-prolog/files/qu-prolog-8.3-gcc4.patch b/dev-lang/qu-prolog/files/qu-prolog-8.3-gcc4.patch
deleted file mode 100644
index 6376e84dd1a3..000000000000
--- a/dev-lang/qu-prolog/files/qu-prolog-8.3-gcc4.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Only in qp8.3: configure.orig
-Only in qp8.3/src: io.cc.orig
-Only in qp8.3/src: thread_escapes.cc.orig
-diff -ur qp8.3.orig/src/xqp/interact.h qp8.3/src/xqp/interact.h
---- qp8.3.orig/src/xqp/interact.h	2007-03-02 13:25:06.000000000 +1300
-+++ qp8.3/src/xqp/interact.h	2007-12-22 19:13:25.000000000 +1300
-@@ -27,7 +27,7 @@
- #include <QMouseEvent>
- #include <QKeyEvent>
- #include <Q3PtrList>
--#include <fstream.h>
-+#include <fstream>
- #include <q3accel.h>
- #include <qregexp.h>
- #include <qsocketnotifier.h>
-diff -ur qp8.3.orig/src/xqp/main.cc qp8.3/src/xqp/main.cc
---- qp8.3.orig/src/xqp/main.cc	2006-04-06 16:01:45.000000000 +1200
-+++ qp8.3/src/xqp/main.cc	2007-12-22 19:13:25.000000000 +1300
-@@ -19,9 +19,9 @@
- 
- #include <stdlib.h>
- #include <stdio.h>
--#include <iostream.h>
-+#include <iostream>
- #include <unistd.h>
--#include <fstream.h>
-+#include <fstream>
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <fcntl.h>
-@@ -30,6 +30,7 @@
- 
- #include "xqp.h"
- 
-+using namespace std;
- 
- // Create 2 sockets for unidirectional communication to and from qp
- int socket_main_to_qp[2], socket_qp_to_main[2];
diff --git a/dev-lang/qu-prolog/files/qu-prolog-8.3-portage.patch b/dev-lang/qu-prolog/files/qu-prolog-8.3-portage.patch
deleted file mode 100644
index dccb77db7b18..000000000000
--- a/dev-lang/qu-prolog/files/qu-prolog-8.3-portage.patch
+++ /dev/null
@@ -1,239 +0,0 @@
-diff -ur qp8.3.orig/Makefile.in qp8.3/Makefile.in
---- qp8.3.orig/Makefile.in	2007-12-13 15:46:20.000000000 +1300
-+++ qp8.3/Makefile.in	2007-12-22 19:14:09.000000000 +1300
-@@ -14,6 +14,7 @@
- # objects.
- #
- 
-+export QPHOME	= @prefix@/lib/qu-prolog
- export QPBIN	= @QPHOME@/bin
- 
- 
-@@ -34,7 +35,6 @@
- objects:
- 	@$(MAKE) -C @QPHOME@/bin	$(PARALLEL) all 
- 	@$(MAKE) -C @QPHOME@/src	$(PARALLEL) all
--	@$(MAKE) -C @QPHOME@/src	$(PARALLEL) install
- 	@$(MAKE) -C @QPHOME@/prolog	$(PARALLEL) all
- 
- 
-diff -ur qp8.3.orig/bin/qc.in qp8.3/bin/qc.in
---- qp8.3.orig/bin/qc.in	2007-08-01 12:23:42.000000000 +1200
-+++ qp8.3/bin/qc.in	2007-12-22 19:14:09.000000000 +1300
-@@ -47,24 +47,25 @@
- #
- # location of Qu-Prolog project
- #
--PATH=@QPHOME@/bin:$PATH
-+QPHOME=@libdir@/qu-prolog
-+PATH=$QPHOME/bin:$PATH
- 
- #
- # names of Qu-Prolog binaries
- #
--preprocess=@QPHOME@/bin/qppp
--expand=@QPHOME@/bin/qg
--compile=@QPHOME@/bin/qc1
-+preprocess=qppp
-+expand=qg
-+compile=qc1
- compversion=qup
--assemble=@QPHOME@/bin/qa
--link=@QPHOME@/bin/ql
--execute=@QPHOME@/bin/qem
-+assemble=qa
-+link=ql
-+execute=qem
- 
- #
- # Use the line below when dynamic search for libraries is implemented.
- #
- # libqofiles=""
--libqofiles="@QPHOME@/prolog/compiler/*.qo @QPHOME@/prolog/library/*.qo"
-+libqofiles="@QPHOME@/compiler/*.qo @QPHOME@/library/*.qo"
- 
- qlfiles=""
- qlefiles=""
-@@ -327,18 +328,7 @@
- 	absexecfile=$execfile
- 	;;
- *)
--	currdir=`pwd`
--	case $currdir in
--	/u*)
--		abspath=`echo $currdir | sed "s,/u./$HOSTNAME/,/homes/,"`
--		;;
--	/tmp_mnt/*)
--		abspath=`echo $currdir | sed 's,/tmp_mnt/homes/[^/]*/,/homes/,'`
--		;;
--	*)
--		abspath=$currdir
--		;;
--	esac
-+	abspath=`pwd`
- 	absexecfile=$abspath/$execfile
- 	;;
- esac
-@@ -354,5 +344,8 @@
- 
- # make executable file
- 
--echo "exec $execute $Eoptions $lflag -Q '$savefile' \$* $*" >$execfile
-+echo "QPPATH=@prefix@/bin:$QPHOME/bin" >$execfile
-+echo "QPLIBPATH=$QPHOME/compiler:$QPHOME/library:"'$QPLIBPATH' >>$execfile
-+echo "export QPPATH QPLIBPATH" >>$execfile
-+echo "exec $execute $Eoptions $lflag -Q '$savefile' \$* $*" >>$execfile
- chmod a+x $execfile
-Only in qp8.3: configure.orig
-diff -ur qp8.3.orig/prolog/compiler/Makefile.in qp8.3/prolog/compiler/Makefile.in
---- qp8.3.orig/prolog/compiler/Makefile.in	2007-12-13 15:46:22.000000000 +1300
-+++ qp8.3/prolog/compiler/Makefile.in	2007-12-22 19:14:09.000000000 +1300
-@@ -29,5 +29,5 @@
- 
- 
- %.qo: %.qs
--	$(COMPILE.qc) -c -o $@ $<
-+	@QPHOME@/src/qa -i $< -o $@
- 
-diff -ur qp8.3.orig/prolog/library/Makefile.in qp8.3/prolog/library/Makefile.in
---- qp8.3.orig/prolog/library/Makefile.in	2007-12-13 15:46:22.000000000 +1300
-+++ qp8.3/prolog/library/Makefile.in	2007-12-22 19:14:09.000000000 +1300
-@@ -99,4 +99,4 @@
- 
- 
- %.qo: %.qs
--	$(COMPILE.qc) -c -o $@ $<
-+	@QPHOME@/src/qa -i $< -o $@
-diff -ur qp8.3.orig/prolog/qc1/Makefile.in qp8.3/prolog/qc1/Makefile.in
---- qp8.3.orig/prolog/qc1/Makefile.in	2007-12-13 15:46:22.000000000 +1300
-+++ qp8.3/prolog/qc1/Makefile.in	2007-12-22 19:14:09.000000000 +1300
-@@ -3,6 +3,7 @@
- #
- PROGRAM		= @QPHOME@/bin/qc1.qup
- 
-+SAVEFILE	= qc1.qx
- SOURCES		= qc1.ql
- 
- BASES		= $(basename $(SOURCES))
-@@ -13,8 +14,12 @@
- all: $(PROGRAM)
- 
- $(PROGRAM): $(OBJECTS)
--	$(COMPILE.qc) -L -o $(PROGRAM) $(OBJECTS)
-+	@QPHOME@/src/ql -o $(SAVEFILE) @QPHOME@/prolog/compiler/*.qo @QPHOME@/prolog/library/*.qo $(OBJECTS)
-+	@echo "QPPATH=@prefix@/bin:$(QPHOME)/bin" >$(PROGRAM)
-+	@echo "QPLIBPATH=$(QPHOME)/compiler:$(QPHOME)/library" >>$(PROGRAM)
-+	@echo "export QPPATH QPLIBPATH" >>$(PROGRAM)
-+	@echo -e "exec qem -L -Q $(QPHOME)/bin/$(SAVEFILE) \044\052" >>$(PROGRAM)
- 
- %.qo: %.qs
--	$(COMPILE.qc) -c -o $@ $<
-+	@QPHOME@/src/qa -i $< -o $@
- 
-diff -ur qp8.3.orig/prolog/qecat/Makefile.in qp8.3/prolog/qecat/Makefile.in
---- qp8.3.orig/prolog/qecat/Makefile.in	2007-12-13 15:46:22.000000000 +1300
-+++ qp8.3/prolog/qecat/Makefile.in	2007-12-22 19:14:09.000000000 +1300
-@@ -4,6 +4,7 @@
- 
- PROGRAM		= $(QPBIN)/qecat
- 
-+SAVEFILE	= qecat.qx
- SOURCES		= qecat.ql
- 
- BASES		= $(basename $(SOURCES))
-@@ -14,9 +15,13 @@
- all: $(PROGRAM)
- 
- $(PROGRAM): $(OBJECTS)
--	$(COMPILE.qc) -L -o $(PROGRAM) $(OBJECTS)
-+	@QPHOME@/src/ql -o $(SAVEFILE) @QPHOME@/prolog/compiler/*.qo @QPHOME@/prolog/library/*.qo $(OBJECTS)
-+	@echo "QPPATH=@prefix@/bin:$(QPHOME)/bin" >$(PROGRAM)
-+	@echo "QPLIBPATH=$(QPHOME)/compiler:$(QPHOME)/library" >>$(PROGRAM)
-+	@echo "export QPPATH QPLIBPATH" >>$(PROGRAM)
-+	@echo -e "exec qem -L -Q $(QPHOME)/bin/$(SAVEFILE) \044\052" >>$(PROGRAM)
- 
- 
- %.qo: %.qs
--	$(COMPILE.qc) -c -o $@ $<
-+	@QPHOME@/src/qa -i $< -o $@
- 
-diff -ur qp8.3.orig/prolog/qg/Makefile.in qp8.3/prolog/qg/Makefile.in
---- qp8.3.orig/prolog/qg/Makefile.in	2007-12-13 15:46:22.000000000 +1300
-+++ qp8.3/prolog/qg/Makefile.in	2007-12-22 19:14:09.000000000 +1300
-@@ -4,6 +4,7 @@
- 
- PROGRAM		= @QPHOME@/bin/qg
- 
-+SAVEFILE	= qg.qx
- SOURCES		= qg.ql
- 
- BASES		= $(basename $(SOURCES))
-@@ -14,9 +15,13 @@
- all: $(PROGRAM)
- 
- $(PROGRAM): $(OBJECTS)
--	$(COMPILE.qc) -L -o $(PROGRAM) $(OBJECTS)
-+	@QPHOME@/src/ql -o $(SAVEFILE) @QPHOME@/prolog/compiler/*.qo @QPHOME@/prolog/library/*.qo $(OBJECTS)
-+	@echo "QPPATH=@prefix@/bin:$(QPHOME)/bin" >$(PROGRAM)
-+	@echo "QPLIBPATH=$(QPHOME)/compiler:$(QPHOME)/library" >>$(PROGRAM)
-+	@echo "export QPPATH QPLIBPATH" >>$(PROGRAM)
-+	@echo -e "exec qem -L -Q $(QPHOME)/bin/$(SAVEFILE) \044\052" >>$(PROGRAM)
- 
- 
- %.qo: %.qs
--	$(COMPILE.qc) -c -o $@ $<
-+	@QPHOME@/src/qa -i $< -o $@
- 
-diff -ur qp8.3.orig/prolog/qp/Makefile.in qp8.3/prolog/qp/Makefile.in
---- qp8.3.orig/prolog/qp/Makefile.in	2007-12-13 15:46:22.000000000 +1300
-+++ qp8.3/prolog/qp/Makefile.in	2007-12-22 19:14:09.000000000 +1300
-@@ -3,6 +3,7 @@
- #
- PROGRAM		= @QPHOME@/bin/qp
- 
-+SAVEFILE	= qp.qx
- SOURCES		= qp.ql
- 
- BASES		= $(basename $(SOURCES))
-@@ -13,9 +14,13 @@
- all: $(PROGRAM)
- 
- $(PROGRAM): $(OBJECTS)
--	$(COMPILE.qc) -o $(PROGRAM) $(OBJECTS)
-+	@QPHOME@/src/ql -o $(SAVEFILE) @QPHOME@/prolog/compiler/*.qo @QPHOME@/prolog/library/*.qo $(OBJECTS)
-+	@echo "QPPATH=@prefix@/bin:$(QPHOME)/bin" >$(PROGRAM)
-+	@echo "QPLIBPATH=$(QPHOME)/compiler:$(QPHOME)/library" >>$(PROGRAM)
-+	@echo "export QPPATH QPLIBPATH" >>$(PROGRAM)
-+	@echo -e "exec qem -Q $(QPHOME)/bin/$(SAVEFILE) \044\052" >>$(PROGRAM)
- 
- 
- %.qo: %.qs
--	$(COMPILE.qc) -c -o $@ $<
-+	@QPHOME@/src/qa -i $< -o $@
- 
-diff -ur qp8.3.orig/src/Makefile.in qp8.3/src/Makefile.in
---- qp8.3.orig/src/Makefile.in	2007-12-13 15:46:22.000000000 +1300
-+++ qp8.3/src/Makefile.in	2007-12-22 19:14:09.000000000 +1300
-@@ -39,7 +39,7 @@
- 
- #export DEBUGGING=
- 
--export CXXFLAGS = @GCC_ALIAS_FLAG@ -Wall -D_GNU_SOURCE=1 $(OPTIMISATION) @DEBUGGING@ @GCCINCLUDES@ -Wno-uninitialized
-+#export CXXFLAGS = @GCC_ALIAS_FLAG@ -Wall -D_GNU_SOURCE=1 $(OPTIMISATION) @DEBUGGING@ @GCCINCLUDES@ -Wno-uninitialized
- export QACXXFLAGS = -Wall -D_GNU_SOURCE=1 @DEBUGGING@ @GCCINCLUDES@ -Wno-uninitialized
- 
- .PHONY: all
-@@ -78,6 +78,9 @@
- 
- # Targets
- 
-+.cc.o:
-+	$(CXX) $(CXXFLAGS) @GCC_ALIAS_FLAG@ -Wall -D_GNU_SOURCE=1 @DEBUGGING@ @GCCINCLUDES@ -Wno-uninitialized -c $<
-+
- .PHONY: commands
- commands: $(GENERATED) $(LIBRARIES) $(BIG_LIBRARY)
- 	@$(MAKE) $(ALL_COMMANDS)
-Only in qp8.3/src: io.cc.orig
-Only in qp8.3/src: thread_escapes.cc.orig
-Only in qp8.3/src/xqp: interact.h.orig
-Only in qp8.3/src/xqp: main.cc.orig
diff --git a/dev-lang/qu-prolog/files/qu-prolog-8.5-gcc4.3.patch b/dev-lang/qu-prolog/files/qu-prolog-8.5-gcc4.3.patch
deleted file mode 100644
index f081fa9e236c..000000000000
--- a/dev-lang/qu-prolog/files/qu-prolog-8.5-gcc4.3.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -u qp8.5.orig/src/pedro_env.cc qp8.5/src/pedro_env.cc
---- qp8.5.orig/src/pedro_env.cc	2008-06-17 10:16:59.000000000 +1200
-+++ qp8.5/src/pedro_env.cc	2008-07-02 18:55:38.000000000 +1200
-@@ -1,4 +1,4 @@
--
-+#include <algorithm>
- #include <string>
- #include <sstream>
- #include <stdio.h>
-diff -u qp8.5.orig/src/system_support.cc qp8.5/src/system_support.cc
---- qp8.5.orig/src/system_support.cc	2008-06-17 10:16:59.000000000 +1200
-+++ qp8.5/src/system_support.cc	2008-07-02 18:56:42.000000000 +1200
-@@ -60,6 +60,7 @@
- 
- // PORT
- #include "system_support.h"
-+#include <cstdlib>
- #include <iostream>
- using namespace std;
- 
diff --git a/dev-lang/qu-prolog/files/qu-prolog-8.5-portage.patch b/dev-lang/qu-prolog/files/qu-prolog-8.5-portage.patch
deleted file mode 100644
index 68bbab5d07f8..000000000000
--- a/dev-lang/qu-prolog/files/qu-prolog-8.5-portage.patch
+++ /dev/null
@@ -1,226 +0,0 @@
-diff -ur qp8.5.orig/Makefile.in qp8.5/Makefile.in
---- qp8.5.orig/Makefile.in	2008-06-17 10:17:22.000000000 +1200
-+++ qp8.5/Makefile.in	2008-06-28 14:16:55.000000000 +1200
-@@ -14,6 +14,7 @@
- # objects.
- #
- 
-+export QPHOME	= @prefix@/lib/qu-prolog
- export QPBIN	= @QPHOME@/bin
- 
- 
-diff -ur qp8.5.orig/bin/qc.in qp8.5/bin/qc.in
---- qp8.5.orig/bin/qc.in	2007-08-01 12:23:42.000000000 +1200
-+++ qp8.5/bin/qc.in	2008-06-28 14:16:55.000000000 +1200
-@@ -47,24 +47,25 @@
- #
- # location of Qu-Prolog project
- #
--PATH=@QPHOME@/bin:$PATH
-+QPHOME=@libdir@/qu-prolog
-+PATH=$QPHOME/bin:$PATH
- 
- #
- # names of Qu-Prolog binaries
- #
--preprocess=@QPHOME@/bin/qppp
--expand=@QPHOME@/bin/qg
--compile=@QPHOME@/bin/qc1
-+preprocess=qppp
-+expand=qg
-+compile=qc1
- compversion=qup
--assemble=@QPHOME@/bin/qa
--link=@QPHOME@/bin/ql
--execute=@QPHOME@/bin/qem
-+assemble=qa
-+link=ql
-+execute=qem
- 
- #
- # Use the line below when dynamic search for libraries is implemented.
- #
- # libqofiles=""
--libqofiles="@QPHOME@/prolog/compiler/*.qo @QPHOME@/prolog/library/*.qo"
-+libqofiles="@QPHOME@/compiler/*.qo @QPHOME@/library/*.qo"
- 
- qlfiles=""
- qlefiles=""
-@@ -327,18 +328,7 @@
- 	absexecfile=$execfile
- 	;;
- *)
--	currdir=`pwd`
--	case $currdir in
--	/u*)
--		abspath=`echo $currdir | sed "s,/u./$HOSTNAME/,/homes/,"`
--		;;
--	/tmp_mnt/*)
--		abspath=`echo $currdir | sed 's,/tmp_mnt/homes/[^/]*/,/homes/,'`
--		;;
--	*)
--		abspath=$currdir
--		;;
--	esac
-+	abspath=`pwd`
- 	absexecfile=$abspath/$execfile
- 	;;
- esac
-@@ -354,5 +344,8 @@
- 
- # make executable file
- 
--echo "exec $execute $Eoptions $lflag -Q '$savefile' \$* $*" >$execfile
-+echo "QPPATH=@prefix@/bin:$QPHOME/bin" >$execfile
-+echo "QPLIBPATH=$QPHOME/compiler:$QPHOME/library:"'$QPLIBPATH' >>$execfile
-+echo "export QPPATH QPLIBPATH" >>$execfile
-+echo "exec $execute $Eoptions $lflag -Q '$savefile' \$* $*" >>$execfile
- chmod a+x $execfile
-diff -ur qp8.5.orig/prolog/compiler/Makefile.in qp8.5/prolog/compiler/Makefile.in
---- qp8.5.orig/prolog/compiler/Makefile.in	2008-06-17 10:17:26.000000000 +1200
-+++ qp8.5/prolog/compiler/Makefile.in	2008-06-28 14:16:55.000000000 +1200
-@@ -29,5 +29,5 @@
- 
- 
- %.qo: %.qs
--	$(COMPILE.qc) -c -o $@ $<
-+	@QPHOME@/src/qa -i $< -o $@
- 
-diff -ur qp8.5.orig/prolog/library/Makefile.in qp8.5/prolog/library/Makefile.in
---- qp8.5.orig/prolog/library/Makefile.in	2008-06-17 10:17:26.000000000 +1200
-+++ qp8.5/prolog/library/Makefile.in	2008-06-28 14:16:55.000000000 +1200
-@@ -99,4 +99,4 @@
- 
- 
- %.qo: %.qs
--	$(COMPILE.qc) -c -o $@ $<
-+	@QPHOME@/src/qa -i $< -o $@
-diff -ur qp8.5.orig/prolog/qc1/Makefile.in qp8.5/prolog/qc1/Makefile.in
---- qp8.5.orig/prolog/qc1/Makefile.in	2008-06-17 10:17:26.000000000 +1200
-+++ qp8.5/prolog/qc1/Makefile.in	2008-06-28 14:16:55.000000000 +1200
-@@ -3,6 +3,7 @@
- #
- PROGRAM		= @QPHOME@/bin/qc1.qup
- 
-+SAVEFILE	= qc1.qx
- SOURCES		= qc1.ql
- 
- BASES		= $(basename $(SOURCES))
-@@ -13,8 +14,12 @@
- all: $(PROGRAM)
- 
- $(PROGRAM): $(OBJECTS)
--	$(COMPILE.qc) -L -o $(PROGRAM) $(OBJECTS)
-+	@QPHOME@/src/ql -o $(SAVEFILE) @QPHOME@/prolog/compiler/*.qo @QPHOME@/prolog/library/*.qo $(OBJECTS)
-+	@echo "QPPATH=@prefix@/bin:$(QPHOME)/bin" >$(PROGRAM)
-+	@echo "QPLIBPATH=$(QPHOME)/compiler:$(QPHOME)/library" >>$(PROGRAM)
-+	@echo "export QPPATH QPLIBPATH" >>$(PROGRAM)
-+	@echo -e "exec qem -L -Q $(QPHOME)/bin/$(SAVEFILE) \044\052" >>$(PROGRAM)
- 
- %.qo: %.qs
--	$(COMPILE.qc) -c -o $@ $<
-+	@QPHOME@/src/qa -i $< -o $@
- 
-diff -ur qp8.5.orig/prolog/qecat/Makefile.in qp8.5/prolog/qecat/Makefile.in
---- qp8.5.orig/prolog/qecat/Makefile.in	2008-06-17 10:17:26.000000000 +1200
-+++ qp8.5/prolog/qecat/Makefile.in	2008-06-28 14:16:55.000000000 +1200
-@@ -4,6 +4,7 @@
- 
- PROGRAM		= $(QPBIN)/qecat
- 
-+SAVEFILE	= qecat.qx
- SOURCES		= qecat.ql
- 
- BASES		= $(basename $(SOURCES))
-@@ -14,9 +15,13 @@
- all: $(PROGRAM)
- 
- $(PROGRAM): $(OBJECTS)
--	$(COMPILE.qc) -L -o $(PROGRAM) $(OBJECTS)
-+	@QPHOME@/src/ql -o $(SAVEFILE) @QPHOME@/prolog/compiler/*.qo @QPHOME@/prolog/library/*.qo $(OBJECTS)
-+	@echo "QPPATH=@prefix@/bin:$(QPHOME)/bin" >$(PROGRAM)
-+	@echo "QPLIBPATH=$(QPHOME)/compiler:$(QPHOME)/library" >>$(PROGRAM)
-+	@echo "export QPPATH QPLIBPATH" >>$(PROGRAM)
-+	@echo -e "exec qem -L -Q $(QPHOME)/bin/$(SAVEFILE) \044\052" >>$(PROGRAM)
- 
- 
- %.qo: %.qs
--	$(COMPILE.qc) -c -o $@ $<
-+	@QPHOME@/src/qa -i $< -o $@
- 
-diff -ur qp8.5.orig/prolog/qg/Makefile.in qp8.5/prolog/qg/Makefile.in
---- qp8.5.orig/prolog/qg/Makefile.in	2008-06-17 10:17:26.000000000 +1200
-+++ qp8.5/prolog/qg/Makefile.in	2008-06-28 14:16:55.000000000 +1200
-@@ -4,6 +4,7 @@
- 
- PROGRAM		= @QPHOME@/bin/qg
- 
-+SAVEFILE	= qg.qx
- SOURCES		= qg.ql
- 
- BASES		= $(basename $(SOURCES))
-@@ -14,9 +15,13 @@
- all: $(PROGRAM)
- 
- $(PROGRAM): $(OBJECTS)
--	$(COMPILE.qc) -L -o $(PROGRAM) $(OBJECTS)
-+	@QPHOME@/src/ql -o $(SAVEFILE) @QPHOME@/prolog/compiler/*.qo @QPHOME@/prolog/library/*.qo $(OBJECTS)
-+	@echo "QPPATH=@prefix@/bin:$(QPHOME)/bin" >$(PROGRAM)
-+	@echo "QPLIBPATH=$(QPHOME)/compiler:$(QPHOME)/library" >>$(PROGRAM)
-+	@echo "export QPPATH QPLIBPATH" >>$(PROGRAM)
-+	@echo -e "exec qem -L -Q $(QPHOME)/bin/$(SAVEFILE) \044\052" >>$(PROGRAM)
- 
- 
- %.qo: %.qs
--	$(COMPILE.qc) -c -o $@ $<
-+	@QPHOME@/src/qa -i $< -o $@
- 
-diff -ur qp8.5.orig/prolog/qp/Makefile.in qp8.5/prolog/qp/Makefile.in
---- qp8.5.orig/prolog/qp/Makefile.in	2008-06-17 10:17:26.000000000 +1200
-+++ qp8.5/prolog/qp/Makefile.in	2008-06-28 14:16:55.000000000 +1200
-@@ -3,6 +3,7 @@
- #
- PROGRAM		= @QPHOME@/bin/qp
- 
-+SAVEFILE	= qp.qx
- SOURCES		= qp.ql
- 
- BASES		= $(basename $(SOURCES))
-@@ -13,9 +14,13 @@
- all: $(PROGRAM)
- 
- $(PROGRAM): $(OBJECTS)
--	$(COMPILE.qc) -o $(PROGRAM) $(OBJECTS)
-+	@QPHOME@/src/ql -o $(SAVEFILE) @QPHOME@/prolog/compiler/*.qo @QPHOME@/prolog/library/*.qo $(OBJECTS)
-+	@echo "QPPATH=@prefix@/bin:$(QPHOME)/bin" >$(PROGRAM)
-+	@echo "QPLIBPATH=$(QPHOME)/compiler:$(QPHOME)/library" >>$(PROGRAM)
-+	@echo "export QPPATH QPLIBPATH" >>$(PROGRAM)
-+	@echo -e "exec qem -Q $(QPHOME)/bin/$(SAVEFILE) \044\052" >>$(PROGRAM)
- 
- 
- %.qo: %.qs
--	$(COMPILE.qc) -c -o $@ $<
-+	@QPHOME@/src/qa -i $< -o $@
- 
-diff -ur qp8.5.orig/src/Makefile.in qp8.5/src/Makefile.in
---- qp8.5.orig/src/Makefile.in	2008-06-17 10:17:26.000000000 +1200
-+++ qp8.5/src/Makefile.in	2008-06-28 14:16:55.000000000 +1200
-@@ -39,7 +39,7 @@
- 
- #export DEBUGGING=
- 
--export CXXFLAGS = @GCC_ALIAS_FLAG@ -Wall -D_GNU_SOURCE=1 $(OPTIMISATION) @DEBUGGING@ @GCCINCLUDES@ -Wno-uninitialized
-+#export CXXFLAGS = @GCC_ALIAS_FLAG@ -Wall -D_GNU_SOURCE=1 $(OPTIMISATION) @DEBUGGING@ @GCCINCLUDES@ -Wno-uninitialized
- export QACXXFLAGS = -Wall -D_GNU_SOURCE=1 @DEBUGGING@ @GCCINCLUDES@ -Wno-uninitialized
- 
- .PHONY: all
-@@ -78,6 +78,9 @@
- 
- # Targets
- 
-+.cc.o:
-+	$(CXX) $(CXXFLAGS) @GCC_ALIAS_FLAG@ -Wall -D_GNU_SOURCE=1 @DEBUGGING@ @GCCINCLUDES@ -Wno-uninitialized -c $<
-+
- .PHONY: commands
- commands: $(GENERATED) $(LIBRARIES) $(BIG_LIBRARY)
- 	@$(MAKE) $(ALL_COMMANDS)
diff --git a/dev-lang/qu-prolog/qu-prolog-8.3.ebuild b/dev-lang/qu-prolog/qu-prolog-8.3.ebuild
deleted file mode 100644
index 7d0977ae62a3..000000000000
--- a/dev-lang/qu-prolog/qu-prolog-8.3.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/qu-prolog/qu-prolog-8.3.ebuild,v 1.6 2008/08/02 19:40:18 keri Exp $
-
-EAPI=1
-
-inherit eutils
-
-MY_P=qp${PV}
-
-DESCRIPTION="Qu-Prolog is an extended Prolog supporting quantifiers, object-variables and substitutions"
-HOMEPAGE="http://www.itee.uq.edu.au/~pjr/HomePages/QuPrologHome.html"
-SRC_URI="http://www.itee.uq.edu.au/~pjr/HomePages/QPFiles/${MY_P}.tar.gz
-	qt4? ( mirror://gentoo/${P}-xqp-qt4.tar.gz )"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="-amd64 ppc -ppc64 sparc x86"
-IUSE="debug doc examples qt4 threads"
-
-DEPEND="qt4? ( || ( x11-libs/qt-gui:4 >=x11-libs/qt-4.1.0:4 ) )"
-
-S="${WORKDIR}"/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-portage.patch
-	epatch "${FILESDIR}"/${P}-configure.patch
-	epatch "${FILESDIR}"/${P}-gcc4.patch
-	epatch "${FILESDIR}"/${P}-debug.patch
-}
-
-src_compile() {
-	econf \
-		$(use_enable debug) \
-		$(use_enable threads multiple-threads) \
-		|| die "econf failed"
-	emake || die "emake failed"
-
-	if use qt4; then
-		cd "${S}"/src/xqp/qt4
-		qmake || die "qmake xqp failed"
-		emake || die "emake xqp failed"
-	fi
-}
-
-src_install() {
-	exeinto /usr/bin
-	doexe src/qa src/qdeal src/qem src/ql
-	doexe bin/qc bin/qc1.qup bin/qecat bin/qg bin/qp bin/qppp
-
-	if use qt4; then
-		doexe src/xqp/qt4/xqp
-	fi
-
-	insinto /usr/$(get_libdir)/${PN}/bin
-	doins prolog/qc1/qc1.qx \
-		prolog/qecat/qecat.qx \
-		prolog/qg/qg.qx \
-		prolog/qp/qp.qx
-
-	insinto /usr/$(get_libdir)/${PN}/library
-	doins prolog/library/*.qo
-
-	insinto /usr/$(get_libdir)/${PN}/compiler
-	doins prolog/compiler/*.qo
-
-	doman doc/man/man1/*.1
-
-	dodoc README
-
-	if use doc ; then
-		docinto reference-manual
-		dodoc doc/manual/*.html
-		docinto user-guide
-		dodoc doc/user/main.ps
-	fi
-
-	if use examples ; then
-		insinto /usr/share/doc/${PF}/examples
-		doins examples/*.ql
-		docinto examples
-		dodoc examples/README
-	fi
-}
diff --git a/dev-lang/qu-prolog/qu-prolog-8.5.ebuild b/dev-lang/qu-prolog/qu-prolog-8.5.ebuild
deleted file mode 100644
index 4940f7f8e61c..000000000000
--- a/dev-lang/qu-prolog/qu-prolog-8.5.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/qu-prolog/qu-prolog-8.5.ebuild,v 1.2 2008/08/02 19:40:18 keri Exp $
-
-EAPI=1
-
-inherit eutils
-
-MY_P=qp${PV}
-
-DESCRIPTION="Qu-Prolog is an extended Prolog supporting quantifiers, object-variables and substitutions"
-HOMEPAGE="http://www.itee.uq.edu.au/~pjr/HomePages/QuPrologHome.html"
-SRC_URI="http://www.itee.uq.edu.au/~pjr/HomePages/QPFiles/${MY_P}.tar.gz
-	qt4? ( mirror://gentoo/${P}-xqp-qt4.tar.gz )"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="-amd64 ~ppc -ppc64 ~sparc ~x86"
-IUSE="debug doc examples qt4 threads"
-
-DEPEND="dev-lang/perl
-	qt4? ( || ( x11-libs/qt-gui:4 >=x11-libs/qt-4.1.0:4 ) )"
-
-S="${WORKDIR}"/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-portage.patch
-	epatch "${FILESDIR}"/${P}-gcc4.3.patch
-}
-
-src_compile() {
-	econf \
-		$(use_enable debug) \
-		$(use_enable threads multiple-threads) \
-		|| die "econf failed"
-	emake || die "emake failed"
-
-	if use qt4; then
-		cd "${S}"/src/xqp/qt4
-		qmake || die "qmake xqp failed"
-		emake || die "emake xqp failed"
-	fi
-}
-
-src_install() {
-	exeinto /usr/bin
-	doexe bin/qa bin/qdeal bin/qem bin/ql
-	doexe bin/qc bin/qc1.qup bin/qecat bin/qg bin/qp bin/qppp
-	doexe bin/kq
-
-	if use qt4; then
-		doexe src/xqp/qt4/xqp
-	fi
-
-	insinto /usr/$(get_libdir)/${PN}/bin
-	doins prolog/qc1/qc1.qx \
-		prolog/qecat/qecat.qx \
-		prolog/qg/qg.qx \
-		prolog/qp/qp.qx
-
-	insinto /usr/$(get_libdir)/${PN}/library
-	doins prolog/library/*.qo
-
-	insinto /usr/$(get_libdir)/${PN}/compiler
-	doins prolog/compiler/*.qo
-
-	doman doc/man/man1/*.1
-
-	dodoc README
-
-	if use doc ; then
-		docinto reference-manual
-		dodoc doc/manual/*.html
-		docinto user-guide
-		dodoc doc/user/main.ps
-	fi
-
-	if use examples ; then
-		insinto /usr/share/doc/${PF}/examples
-		doins examples/*.ql
-		docinto examples
-		dodoc examples/README
-	fi
-}