Version bump.

Package-Manager: portage-2.1.4.5

4 files changed, 337 insertions, 2 deletions

diff --git a/dev-lang/qu-prolog/ChangeLog b/dev-lang/qu-prolog/ChangeLog
index 7410ba4511e2..bedd134f7f27 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.51 2008/10/17 22:37:26 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/qu-prolog/ChangeLog,v 1.52 2008/11/16 00:40:48 keri Exp $
+
+*qu-prolog-8.7 (16 Nov 2008)
+
+  16 Nov 2008; <keri@gentoo.org> +files/qu-prolog-8.7-portage.patch,
+  +qu-prolog-8.7.ebuild:
+  Version bump.
 
   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,
diff --git a/dev-lang/qu-prolog/Manifest b/dev-lang/qu-prolog/Manifest
index 1ae23c2d42ed..8b3cafc8788b 100644
--- a/dev-lang/qu-prolog/Manifest
+++ b/dev-lang/qu-prolog/Manifest
@@ -1,5 +1,8 @@
 AUX qu-prolog-8.6-portage.patch 6991 RMD160 9becc4bb995b003581ac66bdcb36a7451ffecc40 SHA1 c119ec664831dbe9fa39e070b6e0b0fe8e4ebe20 SHA256 97f2d80cc2e937339c53eb97eb6d8eafb7301bc10baed24ecad849cc9ffec860
+AUX qu-prolog-8.7-portage.patch 6991 RMD160 68d4fee568fbd346d1fae8af505fe0db2797c81b SHA1 ba69d10b200079f403d3275e4279bbeb8db1c5db SHA256 9460fbe881e3f401006e5e99790340dd513bcc2e2a0b85be8084248c43a5b251
 DIST qp8.6.tar.gz 1224269 RMD160 0e3d7ca6aa8f0eb0a87506f0ebd958a61bae31b9 SHA1 56eb2eacb62cc90ea533cdfa24271f8c0b026370 SHA256 d4c50c07f24ff0e6729749013deda8f9634062da4b62a77e82284fb8f84a0dd4
+DIST qp8.7.tar.gz 1224288 RMD160 f1ee739e4c5114e716d889e9e3097b06e30f4443 SHA1 260ee956e4eaa894e7c070c68775ae3af9155fd5 SHA256 790dbf5b68be24a7f53ac6e3bc90afa5ded93f6c80997879b4d72da2a12a791a
 EBUILD qu-prolog-8.6.ebuild 1820 RMD160 10ebd4d484f9f5af8c9cfb20b8a0ee21bcd44c51 SHA1 cce2de2fa8808f311d7ca8edc25484b5b3320c5d SHA256 658a4c0cd415757f8c16cbac9e55a82fc209f0d8ab14bf8ed9466a412c970bee
-MISC ChangeLog 8631 RMD160 5246d01376c43f26949de270b846cea2a9e15cdf SHA1 75a147b955060480efc5c5bff14f5a3bc611100b SHA256 cd69d0cce906d65c433e70b24f7c5dcee81aaf33ffd4fc918bee30d83498a558
+EBUILD qu-prolog-8.7.ebuild 1821 RMD160 39c8c7521fc4b4e0ad62527f7d0d64f4419f22ba SHA1 d96be80e98162cec47659e1f9f0a1b56efe1ec91 SHA256 a34eda6e1cbee6906b8e46327c2a7d2fcbf62fcd59e33c202a2721367cfe00f4
+MISC ChangeLog 8772 RMD160 ec7b1d9c24c12e617a3dbfd776d1474d7ff921b9 SHA1 837572cfff9b770119d425548b0d75e24ea8abd8 SHA256 04d406b0f8aacfce0d5ab1044d86737a547e37ffb3f1b7e121b03e18c7a37eee
 MISC metadata.xml 159 RMD160 38d27fd1c5faabedefa5507dfd83cb4c952fbc8c SHA1 52b92682cf41e53e71bf432537a16215bd9546b1 SHA256 851bf218a4283a1d8ea6ef98af0119a40eaa78bfaaec49c2f3440437f52889ba
diff --git a/dev-lang/qu-prolog/files/qu-prolog-8.7-portage.patch b/dev-lang/qu-prolog/files/qu-prolog-8.7-portage.patch
new file mode 100644
index 000000000000..971a2ff8d6ab
--- /dev/null
+++ b/dev-lang/qu-prolog/files/qu-prolog-8.7-portage.patch
@@ -0,0 +1,242 @@
+diff -ur qp8.7.orig/Makefile.in qp8.7/Makefile.in
+--- qp8.7.orig/Makefile.in	2008-11-03 11:48:28.000000000 +1300
++++ qp8.7/Makefile.in	2008-11-16 13:35:33.000000000 +1300
+@@ -14,6 +14,7 @@
+ # objects.
+ #
+ 
++export QPHOME	= @prefix@/lib/qu-prolog
+ export QPBIN	= @QPHOME@/bin
+ 
+ 
+diff -ur qp8.7.orig/bin/qc.in qp8.7/bin/qc.in
+--- qp8.7.orig/bin/qc.in	2007-08-01 12:23:42.000000000 +1200
++++ qp8.7/bin/qc.in	2008-11-16 13:35:33.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.7.orig/prolog/compiler/Makefile.in qp8.7/prolog/compiler/Makefile.in
+--- qp8.7.orig/prolog/compiler/Makefile.in	2008-11-03 11:48:28.000000000 +1300
++++ qp8.7/prolog/compiler/Makefile.in	2008-11-16 13:35:33.000000000 +1300
+@@ -33,5 +33,5 @@
+ 
+ 
+ %.qo: %.qs
+-	$(COMPILE.qc) -c -o $@ $<
++	@QPHOME@/src/qa -i $< -o $@
+ 
+diff -ur qp8.7.orig/prolog/library/Makefile.in qp8.7/prolog/library/Makefile.in
+--- qp8.7.orig/prolog/library/Makefile.in	2008-11-03 11:48:28.000000000 +1300
++++ qp8.7/prolog/library/Makefile.in	2008-11-16 13:35:33.000000000 +1300
+@@ -103,4 +103,4 @@
+ 
+ 
+ %.qo: %.qs
+-	$(COMPILE.qc) -c -o $@ $<
++	@QPHOME@/src/qa -i $< -o $@
+diff -ur qp8.7.orig/prolog/qc1/Makefile.in qp8.7/prolog/qc1/Makefile.in
+--- qp8.7.orig/prolog/qc1/Makefile.in	2008-11-03 11:48:28.000000000 +1300
++++ qp8.7/prolog/qc1/Makefile.in	2008-11-16 13:35:33.000000000 +1300
+@@ -3,6 +3,7 @@
+ #
+ PROGRAM		= @QPHOME@/bin/qc1.qup
+ 
++SAVEFILE	= qc1.qx
+ SOURCES		= qc1.ql
+ 
+ BASES		= $(basename $(SOURCES))
+@@ -13,12 +14,16 @@
+ 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)
+ 
+ .PHONY:	clean
+ clean:
+ 	$(RM) Makefile $(OBJECTS) 
+ 
+ %.qo: %.qs
+-	$(COMPILE.qc) -c -o $@ $<
++	@QPHOME@/src/qa -i $< -o $@
+ 
+diff -ur qp8.7.orig/prolog/qecat/Makefile.in qp8.7/prolog/qecat/Makefile.in
+--- qp8.7.orig/prolog/qecat/Makefile.in	2008-11-03 11:48:28.000000000 +1300
++++ qp8.7/prolog/qecat/Makefile.in	2008-11-16 13:35:33.000000000 +1300
+@@ -4,6 +4,7 @@
+ 
+ PROGRAM		= $(QPBIN)/qecat
+ 
++SAVEFILE	= qecat.qx
+ SOURCES		= qecat.ql
+ 
+ BASES		= $(basename $(SOURCES))
+@@ -14,7 +15,11 @@
+ 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)
+ 
+ .PHONY:	clean
+ clean:
+@@ -22,5 +27,5 @@
+ 
+ 
+ %.qo: %.qs
+-	$(COMPILE.qc) -c -o $@ $<
++	@QPHOME@/src/qa -i $< -o $@
+ 
+diff -ur qp8.7.orig/prolog/qg/Makefile.in qp8.7/prolog/qg/Makefile.in
+--- qp8.7.orig/prolog/qg/Makefile.in	2008-11-03 11:48:28.000000000 +1300
++++ qp8.7/prolog/qg/Makefile.in	2008-11-16 13:35:33.000000000 +1300
+@@ -4,6 +4,7 @@
+ 
+ PROGRAM		= @QPHOME@/bin/qg
+ 
++SAVEFILE	= qg.qx
+ SOURCES		= qg.ql
+ 
+ BASES		= $(basename $(SOURCES))
+@@ -14,7 +15,11 @@
+ 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)
+ 
+ .PHONY:	clean
+ clean:
+@@ -22,5 +27,5 @@
+ 
+ 
+ %.qo: %.qs
+-	$(COMPILE.qc) -c -o $@ $<
++	@QPHOME@/src/qa -i $< -o $@
+ 
+diff -ur qp8.7.orig/prolog/qp/Makefile.in qp8.7/prolog/qp/Makefile.in
+--- qp8.7.orig/prolog/qp/Makefile.in	2008-11-03 11:48:28.000000000 +1300
++++ qp8.7/prolog/qp/Makefile.in	2008-11-16 13:35:33.000000000 +1300
+@@ -3,6 +3,7 @@
+ #
+ PROGRAM		= @QPHOME@/bin/qp
+ 
++SAVEFILE	= qp.qx
+ SOURCES		= qp.ql
+ 
+ BASES		= $(basename $(SOURCES))
+@@ -13,7 +14,11 @@
+ 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)
+ 
+ .PHONY:	clean
+ clean:
+@@ -21,5 +26,5 @@
+ 
+ 
+ %.qo: %.qs
+-	$(COMPILE.qc) -c -o $@ $<
++	@QPHOME@/src/qa -i $< -o $@
+ 
+diff -ur qp8.7.orig/src/Makefile.in qp8.7/src/Makefile.in
+--- qp8.7.orig/src/Makefile.in	2008-11-03 11:48:28.000000000 +1300
++++ qp8.7/src/Makefile.in	2008-11-16 13:35:33.000000000 +1300
+@@ -40,7 +40,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
+@@ -79,6 +79,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.7.ebuild b/dev-lang/qu-prolog/qu-prolog-8.7.ebuild
new file mode 100644
index 000000000000..bb7dea5d8631
--- /dev/null
+++ b/dev-lang/qu-prolog/qu-prolog-8.7.ebuild
@@ -0,0 +1,84 @@
+# 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.7.ebuild,v 1.1 2008/11/16 00:40:48 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"
+
+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
+}
+
+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
+		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/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
+}