Version bump.

Package-Manager: portage-2.1.4_rc10

8 files changed, 468 insertions, 5 deletions

diff --git a/dev-lang/qu-prolog/ChangeLog b/dev-lang/qu-prolog/ChangeLog
index 26c5dade202c..c0a629a6e069 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-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/qu-prolog/ChangeLog,v 1.38 2007/11/22 05:33:10 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/qu-prolog/ChangeLog,v 1.39 2007/12/22 06:28:28 keri Exp $
+
+*qu-prolog-8.3 (22 Dec 2007)
+
+  22 Dec 2007; keri <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, +qu-prolog-8.3.ebuild:
+  Version bump.
 
   22 Nov 2007; keri <keri@gentoo.org> -files/qu-prolog-7.4-configure.patch,
   -files/qu-prolog-7.4-debug.patch, -files/qu-prolog-7.4-gcc4.patch,
diff --git a/dev-lang/qu-prolog/Manifest b/dev-lang/qu-prolog/Manifest
index 6ad0a3f647d4..e674018ec501 100644
--- a/dev-lang/qu-prolog/Manifest
+++ b/dev-lang/qu-prolog/Manifest
@@ -14,16 +14,38 @@ AUX qu-prolog-8.2-portage.patch 7017 RMD160 118a61b09e0eb1882f0cd95c86c627d09262
 MD5 7c0ef15d03e7454267b079805dd2d874 files/qu-prolog-8.2-portage.patch 7017
 RMD160 118a61b09e0eb1882f0cd95c86c627d092620626 files/qu-prolog-8.2-portage.patch 7017
 SHA256 bd2b5060b06b20158660c54c1a13661e1c74dcaf3a2d6929fb48cc2f8f7f90d7 files/qu-prolog-8.2-portage.patch 7017
+AUX qu-prolog-8.3-configure.patch 400 RMD160 2e0505fe533ab3cbddb6b450ae41c01f293987fe SHA1 a154e548c74323e7fc33ac8a14194cb6ca1c923a SHA256 372c91f734d03370a76d6d296658ec1331f587b695bf80bf9acc219088a3205b
+MD5 15f61f87c71501b05a3cf6258214bcc1 files/qu-prolog-8.3-configure.patch 400
+RMD160 2e0505fe533ab3cbddb6b450ae41c01f293987fe files/qu-prolog-8.3-configure.patch 400
+SHA256 372c91f734d03370a76d6d296658ec1331f587b695bf80bf9acc219088a3205b files/qu-prolog-8.3-configure.patch 400
+AUX qu-prolog-8.3-debug.patch 1568 RMD160 43524e0f59f9fa70146da923d5a13c91d0fcac26 SHA1 8091c3793b61871c99378916752ac0297eee8564 SHA256 8f3c7843ccb67d76c3224514653fd84155874a2a59145ae735a4cb0f7a37b64e
+MD5 c99c96704028f7fefd5b317b7dce7aef files/qu-prolog-8.3-debug.patch 1568
+RMD160 43524e0f59f9fa70146da923d5a13c91d0fcac26 files/qu-prolog-8.3-debug.patch 1568
+SHA256 8f3c7843ccb67d76c3224514653fd84155874a2a59145ae735a4cb0f7a37b64e files/qu-prolog-8.3-debug.patch 1568
+AUX qu-prolog-8.3-gcc4.patch 1107 RMD160 ace3d451a1cc4d068eba33574472aebaac3c9a64 SHA1 33cc1bddedb22510bb83fb349ea6b79bad5f1abb SHA256 6e1428355bb4d5db15a8f56e0d01a33521785e030ea7844e9b05ab26d806b19f
+MD5 aa6128c71c8e5b858de096adaf48dc60 files/qu-prolog-8.3-gcc4.patch 1107
+RMD160 ace3d451a1cc4d068eba33574472aebaac3c9a64 files/qu-prolog-8.3-gcc4.patch 1107
+SHA256 6e1428355bb4d5db15a8f56e0d01a33521785e030ea7844e9b05ab26d806b19f files/qu-prolog-8.3-gcc4.patch 1107
+AUX qu-prolog-8.3-portage.patch 7194 RMD160 a2502c547aa25fa3c3bbadb8f937087c0075f68b SHA1 a03ac0fdf6ce5241c4d2ff7e559fc7fecf678e9c SHA256 ff23bb1fc9ab16e065e0a98d2c8577373f7d3be4090f50760f6a164f96bbd841
+MD5 9803f76ba89061de34d28a7bcc38784f files/qu-prolog-8.3-portage.patch 7194
+RMD160 a2502c547aa25fa3c3bbadb8f937087c0075f68b files/qu-prolog-8.3-portage.patch 7194
+SHA256 ff23bb1fc9ab16e065e0a98d2c8577373f7d3be4090f50760f6a164f96bbd841 files/qu-prolog-8.3-portage.patch 7194
 DIST qp8.2.tar.gz 1220921 RMD160 24d5beb743d855840f24456068758c91238c4c14 SHA1 4c0580313c9538e31a0dfa7b64dd7195b3aaf8f3 SHA256 3f2b171862625cb7a9700a649b6d689d0f7488698cccc490a2ab0d0dc485492f
+DIST qp8.3.tar.gz 1222502 RMD160 71530d2cd3387f9c66508493d646be9c5c86c64c SHA1 7dbfe46c7830ebe40887fc3cfd22e7c1d6a1d2c5 SHA256 d7ed814af801f89b17e9c604da241dc0a9ffa1ccdd6a0f89ea22f29ebabd8d95
 DIST qu-prolog-8.2-xqp-qt4.tar.gz 8500 RMD160 17a968750ccd1c5d4f67d9e67647abd22186274a SHA1 d67269325cef7bbba6d2916400e7f788365cf737 SHA256 3960651d3fe480a5d0a0437af015fd92a0eabee8e5fd6c1868d2592ddbcefcb6
+DIST qu-prolog-8.3-xqp-qt4.tar.gz 8502 RMD160 97d04dc0581f8266253d0b4f4038418d36a4b757 SHA1 87eccb7f29f2f57423063c534c9d3d1dfb0f726c SHA256 d07342c1a8df408f1b71ee9af4bbe2dea2478ca3596e0ef44c6dc3cfd4e507ce
 EBUILD qu-prolog-8.2.ebuild 1917 RMD160 dccb9cd634ee530812d6cf4cc11c4d6304993921 SHA1 352ad98b50d127aa962c1205d7f75049563ca7bc SHA256 7ad8c03a188e18dfc13769ddcaf48893cc91009a47431d2c8cc29f6a633825b1
 MD5 ac5f332a7f19a165bebd2573b3c6b282 qu-prolog-8.2.ebuild 1917
 RMD160 dccb9cd634ee530812d6cf4cc11c4d6304993921 qu-prolog-8.2.ebuild 1917
 SHA256 7ad8c03a188e18dfc13769ddcaf48893cc91009a47431d2c8cc29f6a633825b1 qu-prolog-8.2.ebuild 1917
-MISC ChangeLog 6598 RMD160 9f49e4dd99ae3c1b2b07233fa0f8cd55feeb6e3d SHA1 5de720a6b3511420c7a958e4fb9da046fcf90d54 SHA256 0f2a304becf68ba4f2e15ae6c1bfb8c2107c1642ee52ceff68e875f9eb9c9939
-MD5 cdc73c2aa9ede59ec987b37f7fe6b036 ChangeLog 6598
-RMD160 9f49e4dd99ae3c1b2b07233fa0f8cd55feeb6e3d ChangeLog 6598
-SHA256 0f2a304becf68ba4f2e15ae6c1bfb8c2107c1642ee52ceff68e875f9eb9c9939 ChangeLog 6598
+EBUILD qu-prolog-8.3.ebuild 1917 RMD160 94456f8181946238daf07518f50e86f1796f01ce SHA1 740723131495e718230037eb8ef3d2b8432488d3 SHA256 bce23637bd180aa31ef3950a128eeef0f61945a324c671a2821f53d23294234e
+MD5 fb56479938ab7e0a5deed9021aea8563 qu-prolog-8.3.ebuild 1917
+RMD160 94456f8181946238daf07518f50e86f1796f01ce qu-prolog-8.3.ebuild 1917
+SHA256 bce23637bd180aa31ef3950a128eeef0f61945a324c671a2821f53d23294234e qu-prolog-8.3.ebuild 1917
+MISC ChangeLog 6851 RMD160 d92b4d7b2ce81e29f222bdc66cbf1b3b4e534070 SHA1 4ebe8a344e154de9ae3a1efc537a630bc35c944a SHA256 d2d300354d077e3cb24066c41434f074077026f3bb7065f5505d287cb0e8f3de
+MD5 1941b8670acfe4e0ac44c132f9fe5132 ChangeLog 6851
+RMD160 d92b4d7b2ce81e29f222bdc66cbf1b3b4e534070 ChangeLog 6851
+SHA256 d2d300354d077e3cb24066c41434f074077026f3bb7065f5505d287cb0e8f3de ChangeLog 6851
 MISC metadata.xml 159 RMD160 38d27fd1c5faabedefa5507dfd83cb4c952fbc8c SHA1 52b92682cf41e53e71bf432537a16215bd9546b1 SHA256 851bf218a4283a1d8ea6ef98af0119a40eaa78bfaaec49c2f3440437f52889ba
 MD5 9187f53634e60ab7eb2ac7e98b0b19f7 metadata.xml 159
 RMD160 38d27fd1c5faabedefa5507dfd83cb4c952fbc8c metadata.xml 159
@@ -31,3 +53,6 @@ SHA256 851bf218a4283a1d8ea6ef98af0119a40eaa78bfaaec49c2f3440437f52889ba metadata
 MD5 b5dc0e0cf200ae462cde3d1ae92f84c5 files/digest-qu-prolog-8.2 479
 RMD160 63b080893f4e34bb42818df9b22b6b17201daba1 files/digest-qu-prolog-8.2 479
 SHA256 93d0c3e3dcf0bbafee23bd58a8723c681776841adf29fb580d9d3c61989998f1 files/digest-qu-prolog-8.2 479
+MD5 cc8a43fe254b48e7f74126f3759188af files/digest-qu-prolog-8.3 479
+RMD160 675c88c6688131ae532c3e6a37a40b0f9193f2a9 files/digest-qu-prolog-8.3 479
+SHA256 5308b7e10bd4b033eb2f8a46d3e1ca727a7a1b8870c3724c1f7975f80c1b126d files/digest-qu-prolog-8.3 479
diff --git a/dev-lang/qu-prolog/files/digest-qu-prolog-8.3 b/dev-lang/qu-prolog/files/digest-qu-prolog-8.3
new file mode 100644
index 000000000000..c3a376b3bd75
--- /dev/null
+++ b/dev-lang/qu-prolog/files/digest-qu-prolog-8.3
@@ -0,0 +1,6 @@
+MD5 6988142113ddc2883f4153bd935dda88 qp8.3.tar.gz 1222502
+RMD160 71530d2cd3387f9c66508493d646be9c5c86c64c qp8.3.tar.gz 1222502
+SHA256 d7ed814af801f89b17e9c604da241dc0a9ffa1ccdd6a0f89ea22f29ebabd8d95 qp8.3.tar.gz 1222502
+MD5 924e6409600dcda92ed193e3a0b6a95e qu-prolog-8.3-xqp-qt4.tar.gz 8502
+RMD160 97d04dc0581f8266253d0b4f4038418d36a4b757 qu-prolog-8.3-xqp-qt4.tar.gz 8502
+SHA256 d07342c1a8df408f1b71ee9af4bbe2dea2478ca3596e0ef44c6dc3cfd4e507ce qu-prolog-8.3-xqp-qt4.tar.gz 8502
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
new file mode 100644
index 000000000000..0c0ee19d3d49
--- /dev/null
+++ b/dev-lang/qu-prolog/files/qu-prolog-8.3-configure.patch
@@ -0,0 +1,19 @@
+--- 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
new file mode 100644
index 000000000000..a9b29115b127
--- /dev/null
+++ b/dev-lang/qu-prolog/files/qu-prolog-8.3-debug.patch
@@ -0,0 +1,45 @@
+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
new file mode 100644
index 000000000000..6376e84dd1a3
--- /dev/null
+++ b/dev-lang/qu-prolog/files/qu-prolog-8.3-gcc4.patch
@@ -0,0 +1,38 @@
+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
new file mode 100644
index 000000000000..dccb77db7b18
--- /dev/null
+++ b/dev-lang/qu-prolog/files/qu-prolog-8.3-portage.patch
@@ -0,0 +1,239 @@
+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/qu-prolog-8.3.ebuild b/dev-lang/qu-prolog/qu-prolog-8.3.ebuild
new file mode 100644
index 000000000000..761c4677c9e9
--- /dev/null
+++ b/dev-lang/qu-prolog/qu-prolog-8.3.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2007 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.1 2007/12/22 06:28:28 keri Exp $
+
+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="~ppc ~sparc ~x86"
+IUSE="debug doc examples qt4 threads"
+
+DEPEND="qt4? ( >=x11-libs/qt-4.1.0 )"
+
+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
+}