Version bump.

Package-Manager: portage-2.1.3.12

8 files changed, 466 insertions, 5 deletions

diff --git a/dev-lang/qu-prolog/ChangeLog b/dev-lang/qu-prolog/ChangeLog
index 865ca422639c..8fef71e4b45d 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.32 2007/08/25 22:07:35 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/qu-prolog/ChangeLog,v 1.33 2007/10/13 19:53:40 keri Exp $
+
+*qu-prolog-8.2 (13 Oct 2007)
+
+  13 Oct 2007; keri <keri@gentoo.org> +files/qu-prolog-8.2-configure.patch,
+  +files/qu-prolog-8.2-debug.patch, +files/qu-prolog-8.2-gcc4.patch,
+  +files/qu-prolog-8.2-portage.patch, +qu-prolog-8.2.ebuild:
+  Version bump.
 
 *qu-prolog-8.1 (25 Aug 2007)
 
diff --git a/dev-lang/qu-prolog/Manifest b/dev-lang/qu-prolog/Manifest
index aeebb90b0ce2..5f675179f1c9 100644
--- a/dev-lang/qu-prolog/Manifest
+++ b/dev-lang/qu-prolog/Manifest
@@ -50,12 +50,30 @@ AUX qu-prolog-8.1-portage.patch 7047 RMD160 f148f62f940426b80ac0b0d3bd4107af9b5c
 MD5 3db3f3bfd2ab49feb45b457519f866fc files/qu-prolog-8.1-portage.patch 7047
 RMD160 f148f62f940426b80ac0b0d3bd4107af9b5c3797 files/qu-prolog-8.1-portage.patch 7047
 SHA256 58ddce340b000aa561804f7cb8cbbb357a80f5461ccc3c7cddf9a01959bd526d files/qu-prolog-8.1-portage.patch 7047
+AUX qu-prolog-8.2-configure.patch 400 RMD160 e23791cca606c7f16507b9888da55185d16d2a54 SHA1 0e968f8863688538075c3e7376afcaeb845d05b6 SHA256 a4290657e8211707f45054e4238d3e1b6b070fc42f2727b0f93b4b5c1d66b590
+MD5 e1c766938c8e684142610e38d7556e8a files/qu-prolog-8.2-configure.patch 400
+RMD160 e23791cca606c7f16507b9888da55185d16d2a54 files/qu-prolog-8.2-configure.patch 400
+SHA256 a4290657e8211707f45054e4238d3e1b6b070fc42f2727b0f93b4b5c1d66b590 files/qu-prolog-8.2-configure.patch 400
+AUX qu-prolog-8.2-debug.patch 1538 RMD160 f5a1995d26065cb4ca6fec16bdd4d4aabb242437 SHA1 63d276826e9ea4f9f50ee2de4f741d0e3f28e1aa SHA256 819e30ab8d0984af366a5cea0084932ccd29c658475fa1ee78d2abc0cf4c6e8b
+MD5 e7806bca3b29786f4873f806785da94d files/qu-prolog-8.2-debug.patch 1538
+RMD160 f5a1995d26065cb4ca6fec16bdd4d4aabb242437 files/qu-prolog-8.2-debug.patch 1538
+SHA256 819e30ab8d0984af366a5cea0084932ccd29c658475fa1ee78d2abc0cf4c6e8b files/qu-prolog-8.2-debug.patch 1538
+AUX qu-prolog-8.2-gcc4.patch 1005 RMD160 d1155f9b548dfd44ecdd6bc60d970cba8fc8a2a6 SHA1 906afd77d7e7a7c0964f51cbfeefc15fa63e1479 SHA256 a29932814185aabceeea9eabcd4aa1db52aaa58b8c1f7a1f3841cf388d3f8374
+MD5 50f3001acf5f2af6dc9257810443d249 files/qu-prolog-8.2-gcc4.patch 1005
+RMD160 d1155f9b548dfd44ecdd6bc60d970cba8fc8a2a6 files/qu-prolog-8.2-gcc4.patch 1005
+SHA256 a29932814185aabceeea9eabcd4aa1db52aaa58b8c1f7a1f3841cf388d3f8374 files/qu-prolog-8.2-gcc4.patch 1005
+AUX qu-prolog-8.2-portage.patch 7017 RMD160 118a61b09e0eb1882f0cd95c86c627d092620626 SHA1 076f31128169dcdec80992c78cd00063ed80868c SHA256 bd2b5060b06b20158660c54c1a13661e1c74dcaf3a2d6929fb48cc2f8f7f90d7
+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
 DIST qp7.4.tar.gz 1262813 RMD160 8be3c953d6f74878366183b99f84dbcb089c6e08 SHA1 a1a938088dd214e12585abc290ffedd49d7bcd56 SHA256 301b8a3344f4286c2800a13753f2a2d9e73bd3ce58c8a1211bcede365dc96de1
 DIST qp8.0.tar.gz 1220094 RMD160 e9125f69d1fe2e4d8bc3e976b757dcca1d904cdd SHA1 d27b99c8c94200e15321d9680c1f4b6f8e336315 SHA256 fe440bffae19a9226ab1cd0c197806e5f5c703502da3f01899e5a6dd06656604
 DIST qp8.1.tar.gz 1220321 RMD160 e795b7f5b04e27ebc4970b31f6a35d3f608d5222 SHA1 ba7d5f7e298d15a5b5c4b9e0e1973efee9038a07 SHA256 505ae1ad8890cdb6946a651f76391a150da8b76b02b60ce7a76b24de8a9950a5
+DIST qp8.2.tar.gz 1220921 RMD160 24d5beb743d855840f24456068758c91238c4c14 SHA1 4c0580313c9538e31a0dfa7b64dd7195b3aaf8f3 SHA256 3f2b171862625cb7a9700a649b6d689d0f7488698cccc490a2ab0d0dc485492f
 DIST qu-prolog-7.4-xqp-qt4.tar.gz 8501 RMD160 ad444fd47e17af10c104129f217b8a30ff568739 SHA1 738ee651fc703563e871a21c9ae5ecc327dc0738 SHA256 be3d9d8b113032eed16bf136b82df20a7d3024a5125918758fd8bfe5fe76669a
 DIST qu-prolog-8.0-xqp-qt4.tar.gz 8500 RMD160 3bafc1e07fa894c463d5e67f984360b583eab15b SHA1 91000981c9d02287a2007791ce7dbb431f6b9554 SHA256 c6f2d6e2c1a5856ae2d17c51d5c529fdfd26070ee19c06190ce87a2a0b83b082
 DIST qu-prolog-8.1-xqp-qt4.tar.gz 8500 RMD160 156af427f89a82702e19730e4bb12b7e646c8e14 SHA1 d99c961549d87b63ae71191458f2e2941c121918 SHA256 176a9a82b9a7f44e2664863afd28e47bcb9af23d165ccae3797a617302f251d0
+DIST qu-prolog-8.2-xqp-qt4.tar.gz 8500 RMD160 17a968750ccd1c5d4f67d9e67647abd22186274a SHA1 d67269325cef7bbba6d2916400e7f788365cf737 SHA256 3960651d3fe480a5d0a0437af015fd92a0eabee8e5fd6c1868d2592ddbcefcb6
 EBUILD qu-prolog-7.4-r1.ebuild 2084 RMD160 556c1f364461dd5893e2c48e536e95cdf5e274cd SHA1 d5d9ac462db0007ff8e76111aefa5c9e5afa93f8 SHA256 944d7dc2e36b5646aa40b5eef51b1cf70cb1071ee4fdc2b4b4e6d72ad57a53ca
 MD5 65c814439685727adf3d0b07ff384730 qu-prolog-7.4-r1.ebuild 2084
 RMD160 556c1f364461dd5893e2c48e536e95cdf5e274cd qu-prolog-7.4-r1.ebuild 2084
@@ -72,10 +90,14 @@ EBUILD qu-prolog-8.1.ebuild 2087 RMD160 9526dac9a7b87ed88607f8f4a184702c59d436e0
 MD5 d613fe428752b4808dcc469b3067a603 qu-prolog-8.1.ebuild 2087
 RMD160 9526dac9a7b87ed88607f8f4a184702c59d436e0 qu-prolog-8.1.ebuild 2087
 SHA256 1e52ec917d926e057c80f0a58221e18bfc5969073842f8d1ead70716bd1259cc qu-prolog-8.1.ebuild 2087
-MISC ChangeLog 5212 RMD160 309d4d5400bbf7af65703e04441ef612c2893661 SHA1 9b967049b81e8687471f4b0ea78b18f247d58919 SHA256 f5a7b7ea9dc5a1792e42f55323fe11540b45b98cfb7a92fe47cbb7a525a87fb2
-MD5 b55cba3866cf57f5cebe3da67b8c893e ChangeLog 5212
-RMD160 309d4d5400bbf7af65703e04441ef612c2893661 ChangeLog 5212
-SHA256 f5a7b7ea9dc5a1792e42f55323fe11540b45b98cfb7a92fe47cbb7a525a87fb2 ChangeLog 5212
+EBUILD qu-prolog-8.2.ebuild 2110 RMD160 b2d139a4f606234ffa2177276a2106e783e5f2f1 SHA1 e48c900a48fcb525c4bf4f274002c72c32960997 SHA256 444bd8fa0ba01783ab6239ebaa236ed961b16b47a428c2b2230c162b70e4a72d
+MD5 49df41da7b2d09b128fdd419dcd08ccf qu-prolog-8.2.ebuild 2110
+RMD160 b2d139a4f606234ffa2177276a2106e783e5f2f1 qu-prolog-8.2.ebuild 2110
+SHA256 444bd8fa0ba01783ab6239ebaa236ed961b16b47a428c2b2230c162b70e4a72d qu-prolog-8.2.ebuild 2110
+MISC ChangeLog 5465 RMD160 437ca0aadc40f2fa9ac8ed9a147ea6de51630144 SHA1 c629b78fdb45c471dc8dc1da88aca1a94c9e7924 SHA256 87012c833e4bf8eab327e5c7c634eb0b3c7e810e3c338edfe806b4ad04ca863d
+MD5 7c1cfe1fda55e9370e5d15cff2bb9e32 ChangeLog 5465
+RMD160 437ca0aadc40f2fa9ac8ed9a147ea6de51630144 ChangeLog 5465
+SHA256 87012c833e4bf8eab327e5c7c634eb0b3c7e810e3c338edfe806b4ad04ca863d ChangeLog 5465
 MISC metadata.xml 159 RMD160 38d27fd1c5faabedefa5507dfd83cb4c952fbc8c SHA1 52b92682cf41e53e71bf432537a16215bd9546b1 SHA256 851bf218a4283a1d8ea6ef98af0119a40eaa78bfaaec49c2f3440437f52889ba
 MD5 9187f53634e60ab7eb2ac7e98b0b19f7 metadata.xml 159
 RMD160 38d27fd1c5faabedefa5507dfd83cb4c952fbc8c metadata.xml 159
@@ -92,3 +114,6 @@ SHA256 5e398c26089b3e691882e80cc20b8c38472813642e0dde9c5af52f1d57ad29ec files/di
 MD5 1aa426a49f74321b0ac7b45bd75b6d70 files/digest-qu-prolog-8.1 479
 RMD160 2c5b34ed1efbdbda3404f73057e1f3b095f1606d files/digest-qu-prolog-8.1 479
 SHA256 0262ea16fbc19e1a49ea80667ce3b658c20a944c864ec0f669c1618e4ebb00fc files/digest-qu-prolog-8.1 479
+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
diff --git a/dev-lang/qu-prolog/files/digest-qu-prolog-8.2 b/dev-lang/qu-prolog/files/digest-qu-prolog-8.2
new file mode 100644
index 000000000000..e6b6a9eebad9
--- /dev/null
+++ b/dev-lang/qu-prolog/files/digest-qu-prolog-8.2
@@ -0,0 +1,6 @@
+MD5 0835fe541b84ce2580f9d9dc257c1a97 qp8.2.tar.gz 1220921
+RMD160 24d5beb743d855840f24456068758c91238c4c14 qp8.2.tar.gz 1220921
+SHA256 3f2b171862625cb7a9700a649b6d689d0f7488698cccc490a2ab0d0dc485492f qp8.2.tar.gz 1220921
+MD5 7dda8d08ad43199a0ba698e53e97fb5f qu-prolog-8.2-xqp-qt4.tar.gz 8500
+RMD160 17a968750ccd1c5d4f67d9e67647abd22186274a qu-prolog-8.2-xqp-qt4.tar.gz 8500
+SHA256 3960651d3fe480a5d0a0437af015fd92a0eabee8e5fd6c1868d2592ddbcefcb6 qu-prolog-8.2-xqp-qt4.tar.gz 8500
diff --git a/dev-lang/qu-prolog/files/qu-prolog-8.2-configure.patch b/dev-lang/qu-prolog/files/qu-prolog-8.2-configure.patch
new file mode 100644
index 000000000000..7233ec28f239
--- /dev/null
+++ b/dev-lang/qu-prolog/files/qu-prolog-8.2-configure.patch
@@ -0,0 +1,19 @@
+--- qp8.2.orig/configure	2007-10-08 16:13:48.000000000 +1300
++++ qp8.2/configure	2007-10-14 08:10:20.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.2-debug.patch b/dev-lang/qu-prolog/files/qu-prolog-8.2-debug.patch
new file mode 100644
index 000000000000..9dfb8032d2cd
--- /dev/null
+++ b/dev-lang/qu-prolog/files/qu-prolog-8.2-debug.patch
@@ -0,0 +1,44 @@
+diff -ur qp8.2.orig/src/io.cc qp8.2/src/io.cc
+--- qp8.2.orig/src/io.cc	2007-10-08 16:13:27.000000000 +1300
++++ qp8.2/src/io.cc	2007-10-14 08:11:19.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.2.orig/src/thread_escapes.cc qp8.2/src/thread_escapes.cc
+--- qp8.2.orig/src/thread_escapes.cc	2007-10-08 16:13:28.000000000 +1300
++++ qp8.2/src/thread_escapes.cc	2007-10-14 08:11:19.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.2-gcc4.patch b/dev-lang/qu-prolog/files/qu-prolog-8.2-gcc4.patch
new file mode 100644
index 000000000000..b22dbade25a2
--- /dev/null
+++ b/dev-lang/qu-prolog/files/qu-prolog-8.2-gcc4.patch
@@ -0,0 +1,35 @@
+diff -ur qp8.2.orig/src/xqp/interact.h qp8.2/src/xqp/interact.h
+--- qp8.2.orig/src/xqp/interact.h	2007-03-02 13:25:06.000000000 +1300
++++ qp8.2/src/xqp/interact.h	2007-10-14 08:12:05.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.2.orig/src/xqp/main.cc qp8.2/src/xqp/main.cc
+--- qp8.2.orig/src/xqp/main.cc	2006-04-06 16:01:45.000000000 +1200
++++ qp8.2/src/xqp/main.cc	2007-10-14 08:12:05.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.2-portage.patch b/dev-lang/qu-prolog/files/qu-prolog-8.2-portage.patch
new file mode 100644
index 000000000000..fb7010ea9c3c
--- /dev/null
+++ b/dev-lang/qu-prolog/files/qu-prolog-8.2-portage.patch
@@ -0,0 +1,234 @@
+diff -ur qp8.2.orig/Makefile.in qp8.2/Makefile.in
+--- qp8.2.orig/Makefile.in	2007-10-08 16:13:47.000000000 +1300
++++ qp8.2/Makefile.in	2007-10-14 08:12:34.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.2.orig/bin/qc.in qp8.2/bin/qc.in
+--- qp8.2.orig/bin/qc.in	2007-08-01 12:23:42.000000000 +1200
++++ qp8.2/bin/qc.in	2007-10-14 08:12:34.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
+diff -ur qp8.2.orig/prolog/compiler/Makefile.in qp8.2/prolog/compiler/Makefile.in
+--- qp8.2.orig/prolog/compiler/Makefile.in	2007-10-08 16:13:48.000000000 +1300
++++ qp8.2/prolog/compiler/Makefile.in	2007-10-14 08:12:34.000000000 +1300
+@@ -29,5 +29,5 @@
+ 
+ 
+ %.qo: %.qs
+-	$(COMPILE.qc) -c -o $@ $<
++	@QPHOME@/src/qa -i $< -o $@
+ 
+diff -ur qp8.2.orig/prolog/library/Makefile.in qp8.2/prolog/library/Makefile.in
+--- qp8.2.orig/prolog/library/Makefile.in	2007-10-08 16:13:48.000000000 +1300
++++ qp8.2/prolog/library/Makefile.in	2007-10-14 08:12:34.000000000 +1300
+@@ -99,4 +99,4 @@
+ 
+ 
+ %.qo: %.qs
+-	$(COMPILE.qc) -c -o $@ $<
++	@QPHOME@/src/qa -i $< -o $@
+diff -ur qp8.2.orig/prolog/qc1/Makefile.in qp8.2/prolog/qc1/Makefile.in
+--- qp8.2.orig/prolog/qc1/Makefile.in	2007-10-08 16:13:48.000000000 +1300
++++ qp8.2/prolog/qc1/Makefile.in	2007-10-14 08:12:34.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.2.orig/prolog/qecat/Makefile.in qp8.2/prolog/qecat/Makefile.in
+--- qp8.2.orig/prolog/qecat/Makefile.in	2007-10-08 16:13:48.000000000 +1300
++++ qp8.2/prolog/qecat/Makefile.in	2007-10-14 08:12:34.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.2.orig/prolog/qg/Makefile.in qp8.2/prolog/qg/Makefile.in
+--- qp8.2.orig/prolog/qg/Makefile.in	2007-10-08 16:13:48.000000000 +1300
++++ qp8.2/prolog/qg/Makefile.in	2007-10-14 08:12:34.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.2.orig/prolog/qp/Makefile.in qp8.2/prolog/qp/Makefile.in
+--- qp8.2.orig/prolog/qp/Makefile.in	2007-10-08 16:13:48.000000000 +1300
++++ qp8.2/prolog/qp/Makefile.in	2007-10-14 08:12:34.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.2.orig/src/Makefile.in qp8.2/src/Makefile.in
+--- qp8.2.orig/src/Makefile.in	2007-10-08 16:13:48.000000000 +1300
++++ qp8.2/src/Makefile.in	2007-10-14 08:12:34.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)
diff --git a/dev-lang/qu-prolog/qu-prolog-8.2.ebuild b/dev-lang/qu-prolog/qu-prolog-8.2.ebuild
new file mode 100644
index 000000000000..95552b5a11b4
--- /dev/null
+++ b/dev-lang/qu-prolog/qu-prolog-8.2.ebuild
@@ -0,0 +1,91 @@
+# 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.2.ebuild,v 1.1 2007/10/13 19:53:40 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 qt3 qt4 threads"
+
+DEPEND="qt3? ( =x11-libs/qt-3* )
+	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"
+	elif 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/qc1.qup bin/qecat bin/qg bin/qp bin/qppp
+
+	if use qt4; then
+		doexe src/xqp/qt4/xqp
+	elif use qt3; then
+		doexe src/xqp/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
+}