9 files changed, 4 insertions, 483 deletions
diff --git a/dev-lang/qu-prolog/Manifest b/dev-lang/qu-prolog/Manifest
index bc4c290d7d9a..2fcedf7cf62f 100644
--- a/dev-lang/qu-prolog/Manifest
+++ b/dev-lang/qu-prolog/Manifest
@@ -1,19 +1,3 @@
-AUX qu-prolog-7.1-CXXFLAGS.patch 572 RMD160 ccd8ac7d2cbfa98a83649ad8c837192b95711a48 SHA1 95b80111c4b5c3f48b2eea42a66683486fa60b54 SHA256 1a45b93b41f40ac8225aec3251941afe3730b76f37c91ffc4766cd9f15436548
-MD5 be56d881282df2bd90fc7468e1478996 files/qu-prolog-7.1-CXXFLAGS.patch 572
-RMD160 ccd8ac7d2cbfa98a83649ad8c837192b95711a48 files/qu-prolog-7.1-CXXFLAGS.patch 572
-SHA256 1a45b93b41f40ac8225aec3251941afe3730b76f37c91ffc4766cd9f15436548 files/qu-prolog-7.1-CXXFLAGS.patch 572
-AUX qu-prolog-7.1-gcc4.patch 1638 RMD160 a28513acb12a846a99905c4e54b9009e43fefda1 SHA1 95589a3d05b802e0a0ee2f4020575f262b5c5a43 SHA256 da7c3b17f389fde4bdf92ea67102214c5f2d13b4cacbea33f55976c0bf5d19e1
-MD5 f3acfd20468c42f314695b424dcede27 files/qu-prolog-7.1-gcc4.patch 1638
-RMD160 a28513acb12a846a99905c4e54b9009e43fefda1 files/qu-prolog-7.1-gcc4.patch 1638
-SHA256 da7c3b17f389fde4bdf92ea67102214c5f2d13b4cacbea33f55976c0bf5d19e1 files/qu-prolog-7.1-gcc4.patch 1638
-AUX qu-prolog-7.1-portage.patch 5627 RMD160 4e2ecc7b39e9961c8a35f53d9e34886f837f4972 SHA1 d9cd3c07e13764c7fbf76e57bd4438a302254659 SHA256 60e05453e77db7427e8745bbe201ad6b725bc486e825fcbdfdb90b3fcb3052c8
-MD5 513758ac5d92f151b90a9de3c1850d7a files/qu-prolog-7.1-portage.patch 5627
-RMD160 4e2ecc7b39e9961c8a35f53d9e34886f837f4972 files/qu-prolog-7.1-portage.patch 5627
-SHA256 60e05453e77db7427e8745bbe201ad6b725bc486e825fcbdfdb90b3fcb3052c8 files/qu-prolog-7.1-portage.patch 5627
-AUX qu-prolog-7.2-CXXFLAGS.patch 699 RMD160 a21cfa84337e98e33e324d3b2dc0dfa3fb6a0629 SHA1 b0febd637ecf6bd38e6d0918ca87b9b798ef741f SHA256 3255939159796dac97a5cc080c94b3eb19afd85a797ca9680fea4a151dff2d79
-MD5 151e06fea606335d5579458e988a3282 files/qu-prolog-7.2-CXXFLAGS.patch 699
-RMD160 a21cfa84337e98e33e324d3b2dc0dfa3fb6a0629 files/qu-prolog-7.2-CXXFLAGS.patch 699
-SHA256 3255939159796dac97a5cc080c94b3eb19afd85a797ca9680fea4a151dff2d79 files/qu-prolog-7.2-CXXFLAGS.patch 699
 AUX qu-prolog-7.2-configure.patch 4820 RMD160 7c319da71d26727793e18e4dbb9163edcdc5681f SHA1 baebaa06284d447cbef3a6dc9592af566cf0408f SHA256 bfbe1b23f4b9ef2b3fffbc8787f1e2d5cb08e1cb771d4182a43c7d857e4b5e9a
 MD5 891125798599cac6c7256a8b16f4d0a5 files/qu-prolog-7.2-configure.patch 4820
 RMD160 7c319da71d26727793e18e4dbb9163edcdc5681f files/qu-prolog-7.2-configure.patch 4820
@@ -54,39 +38,24 @@ AUX qu-prolog-7.4-qt4.patch 10548 RMD160 68741725964290fd00b77d4647847b1309c062b
 MD5 05aa28061bd66f1d7c65504f78fe3043 files/qu-prolog-7.4-qt4.patch 10548
 RMD160 68741725964290fd00b77d4647847b1309c062bc files/qu-prolog-7.4-qt4.patch 10548
 SHA256 0c276d09c0e35b99f6ae9a365baf187ba0f05b7863f4fd6f0472d31e9d43af17 files/qu-prolog-7.4-qt4.patch 10548
-DIST qp7.1.tar.gz 1275135 RMD160 7fe112ea31f9d7675dcffd67219a4fad7a2bf82a SHA1 974b58ea446a4a5aeaf39dac722a39f6ab74f1e2 SHA256 9fee14ca3284f466c502437f4050f3def1390304644a020c1fe12bf809c523cb
 DIST qp7.2.tar.gz 1278184 RMD160 aa4c902b2804d727b1886e9d3da405e0fffbe819 SHA1 3578ecb2ab98cd2ad8a1c1921cb430e2058f6678 SHA256 49fdd81fb6aa31c29038671a347cfae9de0371ba8663e2d978cb7c8d1fc21aa9
 DIST qp7.4.tar.gz 1262813 RMD160 8be3c953d6f74878366183b99f84dbcb089c6e08 SHA1 a1a938088dd214e12585abc290ffedd49d7bcd56 SHA256 301b8a3344f4286c2800a13753f2a2d9e73bd3ce58c8a1211bcede365dc96de1
-EBUILD qu-prolog-7.1.ebuild 1745 RMD160 bb605a8ba2517b46c2ee094d4b254685a04ccf23 SHA1 94bc8c0b19841306f57d1532ad4ac1575b161069 SHA256 f8ee194b27b848341e981c81227db66781bd78c1d74979a5f043a828f9d4d752
-MD5 f868fbec2f43fcfe6aa150b849b17a3c qu-prolog-7.1.ebuild 1745
-RMD160 bb605a8ba2517b46c2ee094d4b254685a04ccf23 qu-prolog-7.1.ebuild 1745
-SHA256 f8ee194b27b848341e981c81227db66781bd78c1d74979a5f043a828f9d4d752 qu-prolog-7.1.ebuild 1745
 EBUILD qu-prolog-7.2-r1.ebuild 1997 RMD160 962f36fbeb29f648625361565b918be589877660 SHA1 2bf89be93384ad2542f537c66025a16840a55588 SHA256 356d2cc23a6666ba4adba8de6790f283af6cb4d1fb714dda6dede51e0ad49526
 MD5 8a4620adac2805ad121b417dc92eb210 qu-prolog-7.2-r1.ebuild 1997
 RMD160 962f36fbeb29f648625361565b918be589877660 qu-prolog-7.2-r1.ebuild 1997
 SHA256 356d2cc23a6666ba4adba8de6790f283af6cb4d1fb714dda6dede51e0ad49526 qu-prolog-7.2-r1.ebuild 1997
-EBUILD qu-prolog-7.2.ebuild 1745 RMD160 6ebf4318d70f0e0b9df829903846754727709332 SHA1 2cbfc64b4d76a975f0c0c2438a450b6438eb3d1c SHA256 9bfcd2d7baa88108cba273fa50e9a8a34eda5636221aff547c458aa485420133
-MD5 e35a726fb7f1bbb9557e03bb7445de8a qu-prolog-7.2.ebuild 1745
-RMD160 6ebf4318d70f0e0b9df829903846754727709332 qu-prolog-7.2.ebuild 1745
-SHA256 9bfcd2d7baa88108cba273fa50e9a8a34eda5636221aff547c458aa485420133 qu-prolog-7.2.ebuild 1745
 EBUILD qu-prolog-7.4.ebuild 1945 RMD160 4d658f901880f4f260230de4c87f805e46f6dcf8 SHA1 0355e1aeffa0c495dad31493aef3a87e15f400fa SHA256 8ce767f5e01725b59d95a24f2de8c7bdbfb88d86f9651140a91690e0c8a48ffd
 MD5 a44132f75d0facab4dfbfb9eb5332106 qu-prolog-7.4.ebuild 1945
 RMD160 4d658f901880f4f260230de4c87f805e46f6dcf8 qu-prolog-7.4.ebuild 1945
 SHA256 8ce767f5e01725b59d95a24f2de8c7bdbfb88d86f9651140a91690e0c8a48ffd qu-prolog-7.4.ebuild 1945
-MISC ChangeLog 2521 RMD160 4a2cc6b242133d8fe3324aac5adf947d3e4ec0a4 SHA1 d4920a0d6e9fd841f23e7557886606f3a2c89eb1 SHA256 6e65a1a83853b96ae8410aa7ff4d7e2dbe38ce59f14a73def4995c1d8968c7c0
-MD5 e80b0b4d55ccc2517fd42e8c4cfad911 ChangeLog 2521
-RMD160 4a2cc6b242133d8fe3324aac5adf947d3e4ec0a4 ChangeLog 2521
-SHA256 6e65a1a83853b96ae8410aa7ff4d7e2dbe38ce59f14a73def4995c1d8968c7c0 ChangeLog 2521
+MISC ChangeLog 2785 RMD160 5072563483bfc653267ca4b198c3f9b9e438cfdb SHA1 628dba9fdd96378bcf0fd1e07b9f197629f8e70f SHA256 24fcf1eed41c7474fe6fdcf38d5b3bfa5583442aeba7c829d181e776b1b3d29e
+MD5 2f2c0ac5ce557213e4ce2d18a7f418b8 ChangeLog 2785
+RMD160 5072563483bfc653267ca4b198c3f9b9e438cfdb ChangeLog 2785
+SHA256 24fcf1eed41c7474fe6fdcf38d5b3bfa5583442aeba7c829d181e776b1b3d29e ChangeLog 2785
 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 05a4225ab8e0f8aa21af3fe4cdb0c96a files/digest-qu-prolog-7.1 220
-RMD160 39dcab7028e8943388af721d0af5817c81f86389 files/digest-qu-prolog-7.1 220
-SHA256 de55cf44cf2fb373bfb2820ec506998c4f596d3b82841abf5f2fef90456e69c9 files/digest-qu-prolog-7.1 220
-MD5 e31aa744ae84c71d73817369c173db21 files/digest-qu-prolog-7.2 220
-RMD160 8339fea44e54a0f86d02d71244d527069b776f8f files/digest-qu-prolog-7.2 220
-SHA256 4bb5e3a2a13062e2baac92791d74495507361b6dcde31f344932cf6c538c5446 files/digest-qu-prolog-7.2 220
 MD5 e31aa744ae84c71d73817369c173db21 files/digest-qu-prolog-7.2-r1 220
 RMD160 8339fea44e54a0f86d02d71244d527069b776f8f files/digest-qu-prolog-7.2-r1 220
 SHA256 4bb5e3a2a13062e2baac92791d74495507361b6dcde31f344932cf6c538c5446 files/digest-qu-prolog-7.2-r1 220
diff --git a/dev-lang/qu-prolog/files/digest-qu-prolog-7.1 b/dev-lang/qu-prolog/files/digest-qu-prolog-7.1
deleted file mode 100644
index a0aafce8dadd..000000000000
--- a/dev-lang/qu-prolog/files/digest-qu-prolog-7.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 aa2309432d08385af6a39a457c30bc63 qp7.1.tar.gz 1275135
-RMD160 7fe112ea31f9d7675dcffd67219a4fad7a2bf82a qp7.1.tar.gz 1275135
-SHA256 9fee14ca3284f466c502437f4050f3def1390304644a020c1fe12bf809c523cb qp7.1.tar.gz 1275135
diff --git a/dev-lang/qu-prolog/files/digest-qu-prolog-7.2 b/dev-lang/qu-prolog/files/digest-qu-prolog-7.2
deleted file mode 100644
index 7b4a6420b286..000000000000
--- a/dev-lang/qu-prolog/files/digest-qu-prolog-7.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 09f3480df9e2c955c188a7d9ff759b51 qp7.2.tar.gz 1278184
-RMD160 aa4c902b2804d727b1886e9d3da405e0fffbe819 qp7.2.tar.gz 1278184
-SHA256 49fdd81fb6aa31c29038671a347cfae9de0371ba8663e2d978cb7c8d1fc21aa9 qp7.2.tar.gz 1278184
diff --git a/dev-lang/qu-prolog/files/qu-prolog-7.1-CXXFLAGS.patch b/dev-lang/qu-prolog/files/qu-prolog-7.1-CXXFLAGS.patch
deleted file mode 100644
index fe7bf29dab63..000000000000
--- a/dev-lang/qu-prolog/files/qu-prolog-7.1-CXXFLAGS.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- qp7.0.orig/src/Makefile.in	2005-11-27 12:44:23.000000000 +1300
-+++ qp7.0/src/Makefile.in	2006-01-30 22:10:21.000000000 +1300
-@@ -40,7 +40,7 @@
- 
- export DEBUGGING=
- 
--export CXXFLAGS = @GCC_ALIAS_FLAG@ -Wall -D_GNU_SOURCE=1 $(OPTIMISATION) $(DEBUGGING) -I@ICMHOME@/include @GCCINCLUDES@ -Wno-uninitialized
-+export QPCXXFLAGS = @GCC_ALIAS_FLAG@ -Wall -D_GNU_SOURCE=1 $(CXXFLAGS) $(DEBUGGING) -I@ICMHOME@/include @GCCINCLUDES@ -Wno-uninitialized
- export QACXXFLAGS = -Wall -D_GNU_SOURCE=1 $(DEBUGGING) -I@ICMHOME@/include @GCCINCLUDES@ -Wno-uninitialized
- 
- .PHONY: all
diff --git a/dev-lang/qu-prolog/files/qu-prolog-7.1-gcc4.patch b/dev-lang/qu-prolog/files/qu-prolog-7.1-gcc4.patch
deleted file mode 100644
index 32eff67664a5..000000000000
--- a/dev-lang/qu-prolog/files/qu-prolog-7.1-gcc4.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- qp7.1.orig/src/bind.h	2005-11-27 12:43:57.000000000 +1300
-+++ qp7.1/src/bind.h	2006-02-04 13:34:58.000000000 +1300
-@@ -113,7 +113,7 @@
- //
- // Update and trail an implicit parameter entry
- //
--inline void Thread::updateAndTrailIP(heapobject* ptr, Object* value,
-+inline void updateAndTrailIP(heapobject* ptr, Object* value,
-                                      u_int offset = 0)
- {
-   assert(ptr != NULL);
---- qp7.1.orig/src/unify.h	2005-11-27 12:43:58.000000000 +1300
-+++ qp7.1/src/unify.h	2006-02-04 13:35:22.000000000 +1300
-@@ -180,7 +180,7 @@
- //
- // Unify object variables.
- //
--bool Thread::unifyObjectVariables(PrologValue& objectVariable1,
-+bool unifyObjectVariables(PrologValue& objectVariable1,
- 				  PrologValue& objectVariable2);
- 
- //
---- qp7.1.orig/src/xqp/interact.h	2004-05-16 16:27:54.000000000 +1200
-+++ qp7.1/src/xqp/interact.h	2006-02-04 19:33:22.000000000 +1300
-@@ -23,7 +23,7 @@
- #include <qwidget.h>
- #include <qtextedit.h>
- #include <qstring.h>
--#include <fstream.h>
-+#include <fstream>
- #include <qaccel.h>
- #include <qregexp.h>
- #include <qsocketnotifier.h>
---- qp7.1.orig/src/xqp/main.cc	2004-05-25 14:14:30.000000000 +1200
-+++ qp7.1/src/xqp/main.cc	2006-02-04 19:45:03.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>
-@@ -31,6 +31,8 @@
- #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-7.1-portage.patch b/dev-lang/qu-prolog/files/qu-prolog-7.1-portage.patch
deleted file mode 100644
index c52fa9a7c047..000000000000
--- a/dev-lang/qu-prolog/files/qu-prolog-7.1-portage.patch
+++ /dev/null
@@ -1,206 +0,0 @@
---- qp7.1.orig/Makefile.in	2006-02-20 16:22:53.000000000 +1300
-+++ qp7.1/Makefile.in	2006-03-24 23:22:43.000000000 +1200
-@@ -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
- 
- 
---- qp7.1.orig/bin/qc.in	2003-02-07 10:21:21.000000000 +1300
-+++ qp7.1/bin/qc.in	2006-03-25 13:56:42.000000000 +1200
-@@ -52,24 +52,25 @@
- #
- # location of Qu-Prolog project
- #
--PATH=@QPHOME@/bin:$PATH
-+QPHOME=@prefix@/lib/qu-prolog
-+PATH=$QPHOME/bin:$PATH
- 
- #
- # names of Qu-Prolog binaries
- #
--preprocess=@QPHOME@/bin/qppp
-+preprocess=qppp
- expand=qg
- compile=qc1
- compversion=qup
- assemble=qa
- link=ql
--execute=@QPHOME@/bin/qem
-+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=""
-@@ -332,18 +333,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
-@@ -359,5 +349,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" >>$execfile
-+echo "export QPPATH QPLIBPATH" >>$execfile
-+echo "exec $execute $Eoptions $lflag -Q '$savefile' \$* $*" >>$execfile
- chmod a+x $execfile
---- qp7.1.orig/prolog/compiler/Makefile.in	2006-02-20 16:22:58.000000000 +1300
-+++ qp7.1/prolog/compiler/Makefile.in	2006-03-24 22:54:57.000000000 +1200
-@@ -29,5 +29,5 @@
- 
- 
- %.qo: %.qs
--	$(COMPILE.qc) -c -o $@ $<
-+	@QPHOME@/src/qa -i $< -o $@
- 
---- qp7.1.orig/prolog/library/Makefile.in	2006-02-20 16:22:58.000000000 +1300
-+++ qp7.1/prolog/library/Makefile.in	2006-03-24 23:00:08.000000000 +1200
-@@ -100,4 +100,4 @@
- 
- 
- %.qo: %.qs
--	$(COMPILE.qc) -c -o $@ $<
-+	@QPHOME@/src/qa -i $< -o $@
---- qp7.1.orig/prolog/qc1/Makefile.in	2006-02-20 16:22:58.000000000 +1300
-+++ qp7.1/prolog/qc1/Makefile.in	2006-03-24 23:28:45.000000000 +1200
-@@ -1,8 +1,8 @@
- #
- # Makefile for "qc1.qup"
- #
--PROGRAM		= @QPHOME@/bin/qc1.qup
--
-+PROGRAM		= @QPHOME@/bin/qc1
-+SAVEFILE	= qc1.qx
- SOURCES		= qc1.ql
- 
- BASES		= $(basename $(SOURCES))
-@@ -13,8 +13,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 $@
- 
---- qp7.1.orig/prolog/qecat/Makefile.in	2006-02-20 16:22:58.000000000 +1300
-+++ qp7.1/prolog/qecat/Makefile.in	2006-03-25 10:49:45.000000000 +1200
-@@ -3,7 +3,7 @@
- #
- 
- PROGRAM		= $(QPBIN)/qecat
--
-+SAVEFILE	= qecat.qx
- SOURCES		= qecat.ql
- 
- BASES		= $(basename $(SOURCES))
-@@ -14,9 +14,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 $@
- 
---- qp7.1.orig/prolog/qg/Makefile.in	2006-02-20 16:22:58.000000000 +1300
-+++ qp7.1/prolog/qg/Makefile.in	2006-03-25 10:43:32.000000000 +1200
-@@ -3,7 +3,7 @@
- #
- 
- PROGRAM		= @QPHOME@/bin/qg
--
-+SAVEFILE	= qg.qx
- SOURCES		= qg.ql
- 
- BASES		= $(basename $(SOURCES))
-@@ -14,9 +14,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 $@
- 
---- qp7.1.orig/prolog/qp/Makefile.in	2006-02-20 16:22:58.000000000 +1300
-+++ qp7.1/prolog/qp/Makefile.in	2006-03-25 10:47:17.000000000 +1200
-@@ -2,7 +2,7 @@
- # Makefile for "qp"
- #
- PROGRAM		= @QPHOME@/bin/qp
--
-+SAVEFILE	= qp.qx
- SOURCES		= qp.ql
- 
- BASES		= $(basename $(SOURCES))
-@@ -13,9 +13,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 --git a/dev-lang/qu-prolog/files/qu-prolog-7.2-CXXFLAGS.patch b/dev-lang/qu-prolog/files/qu-prolog-7.2-CXXFLAGS.patch
deleted file mode 100644
index 39fae828d656..000000000000
--- a/dev-lang/qu-prolog/files/qu-prolog-7.2-CXXFLAGS.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- qp7.2.orig/src/Makefile.in	2006-04-06 14:14:37.000000000 +1200
-+++ qp7.2/src/Makefile.in	2006-04-08 08:00:50.000000000 +1200
-@@ -40,8 +40,8 @@
- 
- #export DEBUGGING=
- 
--export CXXFLAGS = @GCC_ALIAS_FLAG@ -Wall -D_GNU_SOURCE=1 $(OPTIMISATION) @DEBUGGING@ -I@ICMHOME@/include @GCCINCLUDES@ -Wno-uninitialized
--export QACXXFLAGS = -Wall -D_GNU_SOURCE=1 @DEBUGGING@ -I@ICMHOME@/include @GCCINCLUDES@ -Wno-uninitialized
-+export QPCXXFLAGS = @GCC_ALIAS_FLAG@ -Wall -D_GNU_SOURCE=1 $(OPTIMISATION) $(DEBUGGING) -I@ICMHOME@/include @GCCINCLUDES@ -Wno-uninitialized
-+export QACXXFLAGS = -Wall -D_GNU_SOURCE=1 $(DEBUGGING) -I@ICMHOME@/include @GCCINCLUDES@ -Wno-uninitialized
- 
- .PHONY: all
- all: commands
diff --git a/dev-lang/qu-prolog/qu-prolog-7.1.ebuild b/dev-lang/qu-prolog/qu-prolog-7.1.ebuild
deleted file mode 100644
index 20875516b4d8..000000000000
--- a/dev-lang/qu-prolog/qu-prolog-7.1.ebuild
+++ /dev/null
@@ -1,78 +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/qu-prolog/qu-prolog-7.1.ebuild,v 1.6 2006/06/25 10:34:25 keri Exp $
-
-inherit eutils flag-o-matic
-
-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"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~ppc ~x86"
-IUSE="doc qt3 threads"
-
-DEPEND="qt3? ( =x11-libs/qt-3* )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-portage.patch
-	epatch "${FILESDIR}"/${P}-CXXFLAGS.patch
-	epatch "${FILESDIR}"/${P}-gcc4.patch
-
-	sed -i -e "s:head -1:head -n 1:" configure
-}
-
-src_compile() {
-	append-flags -fno-strict-aliasing
-
-	econf \
-		$(use_enable threads multiple-threads) \
-		|| die "econf failed"
-	emake || die "emake failed"
-
-	if use qt3 ; then
-		cd "${S}"/src/xqp
-		"${QTDIR}"/bin/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/qecat bin/qp bin/qppp
-
-	use qt3 && doexe src/xqp/xqp
-
-	insinto /usr/lib/${PN}/bin
-	doins prolog/qc1/qc1.qx \
-		prolog/qecat/qecat.qx \
-		prolog/qg/qg.qx \
-		prolog/qp/qp.qx
-
-	insinto /usr/lib/${PN}/library
-	doins prolog/library/*.qo
-
-	insinto /usr/lib/${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
-		docinto examples
-		dodoc examples/*.ql examples/README
-	fi
-}
diff --git a/dev-lang/qu-prolog/qu-prolog-7.2.ebuild b/dev-lang/qu-prolog/qu-prolog-7.2.ebuild
deleted file mode 100644
index c664a701e26e..000000000000
--- a/dev-lang/qu-prolog/qu-prolog-7.2.ebuild
+++ /dev/null
@@ -1,78 +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/qu-prolog/qu-prolog-7.2.ebuild,v 1.3 2006/06/25 10:34:25 keri Exp $
-
-inherit eutils flag-o-matic
-
-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"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~ppc ~x86"
-IUSE="doc qt3 threads"
-
-DEPEND="qt3? ( =x11-libs/qt-3* )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-portage.patch
-	epatch "${FILESDIR}"/${P}-CXXFLAGS.patch
-	epatch "${FILESDIR}"/${P}-gcc4.patch
-
-	sed -i -e "s:head -1:head -n 1:" configure
-}
-
-src_compile() {
-	append-flags -fno-strict-aliasing
-
-	econf \
-		$(use_enable threads multiple-threads) \
-		|| die "econf failed"
-	emake || die "emake failed"
-
-	if use qt3 ; then
-		cd "${S}"/src/xqp
-		"${QTDIR}"/bin/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/qecat bin/qp bin/qppp
-
-	use qt3 && doexe src/xqp/xqp
-
-	insinto /usr/lib/${PN}/bin
-	doins prolog/qc1/qc1.qx \
-		prolog/qecat/qecat.qx \
-		prolog/qg/qg.qx \
-		prolog/qp/qp.qx
-
-	insinto /usr/lib/${PN}/library
-	doins prolog/library/*.qo
-
-	insinto /usr/lib/${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
-		docinto examples
-		dodoc examples/*.ql examples/README
-	fi
-}