Version bump.

Package-Manager: portage-2.1.5.5

5 files changed, 345 insertions, 2 deletions

diff --git a/dev-lang/qu-prolog/ChangeLog b/dev-lang/qu-prolog/ChangeLog
index 963ffb68c4f4..cfd7a36b7b6c 100644
--- a/dev-lang/qu-prolog/ChangeLog
+++ b/dev-lang/qu-prolog/ChangeLog
@@ -1,6 +1,12 @@
 # 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.44 2008/04/14 07:48:15 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/qu-prolog/ChangeLog,v 1.45 2008/07/02 07:24:25 keri Exp $
+
+*qu-prolog-8.5 (02 Jul 2008)
+
+  02 Jul 2008; keri <keri@gentoo.org> +files/qu-prolog-8.5-gcc4.3.patch,
+  +files/qu-prolog-8.5-portage.patch, +qu-prolog-8.5.ebuild:
+  Version bump.
 
   14 Apr 2008; keri <keri@gentoo.org> qu-prolog-8.3.ebuild:
   Update Qt 4 dependencies.
diff --git a/dev-lang/qu-prolog/Manifest b/dev-lang/qu-prolog/Manifest
index 3bc92dd9c6d8..3ce0237670d2 100644
--- a/dev-lang/qu-prolog/Manifest
+++ b/dev-lang/qu-prolog/Manifest
@@ -2,8 +2,13 @@ AUX qu-prolog-8.3-configure.patch 400 RMD160 2e0505fe533ab3cbddb6b450ae41c01f293
 AUX qu-prolog-8.3-debug.patch 1568 RMD160 43524e0f59f9fa70146da923d5a13c91d0fcac26 SHA1 8091c3793b61871c99378916752ac0297eee8564 SHA256 8f3c7843ccb67d76c3224514653fd84155874a2a59145ae735a4cb0f7a37b64e
 AUX qu-prolog-8.3-gcc4.patch 1107 RMD160 ace3d451a1cc4d068eba33574472aebaac3c9a64 SHA1 33cc1bddedb22510bb83fb349ea6b79bad5f1abb SHA256 6e1428355bb4d5db15a8f56e0d01a33521785e030ea7844e9b05ab26d806b19f
 AUX qu-prolog-8.3-portage.patch 7194 RMD160 a2502c547aa25fa3c3bbadb8f937087c0075f68b SHA1 a03ac0fdf6ce5241c4d2ff7e559fc7fecf678e9c SHA256 ff23bb1fc9ab16e065e0a98d2c8577373f7d3be4090f50760f6a164f96bbd841
+AUX qu-prolog-8.5-gcc4.3.patch 622 RMD160 9b9ad50cc4fe440def059c09686e498c20328f1c SHA1 9c822792c5930b87a8441c193b43337673b2938a SHA256 1910dff03a47e85cf9573cc37091e7cf63fffea04e863c09f28a92d680bd85ca
+AUX qu-prolog-8.5-portage.patch 6805 RMD160 76ede6a6347c36813d244ba91968d789a2ef39e9 SHA1 434c920f526b2aefedad1419f614aa4c2ed93efc SHA256 284503e2dcee99f8e968c8c6d257df39bf2a65d0b8884bf7e9d6c37159ebd451
 DIST qp8.3.tar.gz 1222502 RMD160 71530d2cd3387f9c66508493d646be9c5c86c64c SHA1 7dbfe46c7830ebe40887fc3cfd22e7c1d6a1d2c5 SHA256 d7ed814af801f89b17e9c604da241dc0a9ffa1ccdd6a0f89ea22f29ebabd8d95
+DIST qp8.5.tar.gz 1223890 RMD160 c09ca89108038f01167d029822bfe94b86b0f1cd SHA1 011aa9f634ad114716196bd62c56a89dcb5829d1 SHA256 f33b2adf59cf7c03aca6fef402e4ad5aa1a373453a289101c91598504a1dd9f8
 DIST qu-prolog-8.3-xqp-qt4.tar.gz 8502 RMD160 97d04dc0581f8266253d0b4f4038418d36a4b757 SHA1 87eccb7f29f2f57423063c534c9d3d1dfb0f726c SHA256 d07342c1a8df408f1b71ee9af4bbe2dea2478ca3596e0ef44c6dc3cfd4e507ce
+DIST qu-prolog-8.5-xqp-qt4.tar.gz 8502 RMD160 f4f5ca88df511de747d30906bde7e4a3c77e7ede SHA1 2bd18c775a1402338efadba59f8bea6506d4152c SHA256 253c08a14313dac3315845448bc2c78ff2570325074369d0f4427a900f58a8f6
 EBUILD qu-prolog-8.3.ebuild 1949 RMD160 1442969eaea581f869df8d7e062966586ad30c72 SHA1 32a8a5ae0e4a5fd21155b034f980add4abb226b8 SHA256 b101f0814b1255e4641df65cf90c6c02e4959a0d05af056beada4903c63b2068
-MISC ChangeLog 7467 RMD160 825138cbe312652953799643c3f11a3d9335f66f SHA1 2874dbde7342219475563a7d761b35133c75fbbf SHA256 fa92e1ae7e29a2ac70eac14b21fd946ec6b0b85a056f7e53524e556b167252c7
+EBUILD qu-prolog-8.5.ebuild 1901 RMD160 0aec5d080ebbaea9915cf395eed048310f139422 SHA1 57a59450a778d491da5475419556cd82ec4b1d0e SHA256 b518f505644a274ee45affad2467ad299262454710532c86b40641c578fdc536
+MISC ChangeLog 7648 RMD160 de309edcfa953259badc55ee9e4446d4c31d2bad SHA1 f70059afd0ec07a27785e3983a8952c539ad4339 SHA256 520179fc98bafc15e6cea6a3826ae6481b5f6aa554555008de4af9675a5bffa9
 MISC metadata.xml 159 RMD160 38d27fd1c5faabedefa5507dfd83cb4c952fbc8c SHA1 52b92682cf41e53e71bf432537a16215bd9546b1 SHA256 851bf218a4283a1d8ea6ef98af0119a40eaa78bfaaec49c2f3440437f52889ba
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
new file mode 100644
index 000000000000..f081fa9e236c
--- /dev/null
+++ b/dev-lang/qu-prolog/files/qu-prolog-8.5-gcc4.3.patch
@@ -0,0 +1,20 @@
+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
new file mode 100644
index 000000000000..68bbab5d07f8
--- /dev/null
+++ b/dev-lang/qu-prolog/files/qu-prolog-8.5-portage.patch
@@ -0,0 +1,226 @@
+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.5.ebuild b/dev-lang/qu-prolog/qu-prolog-8.5.ebuild
new file mode 100644
index 000000000000..cafa483459fc
--- /dev/null
+++ b/dev-lang/qu-prolog/qu-prolog-8.5.ebuild
@@ -0,0 +1,86 @@
+# 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.1 2008/07/02 07:24:25 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="~ppc ~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
+}