diff options
author | Keri Harris <keri@gentoo.org> | 2008-10-17 22:37:26 +0000 |
---|---|---|
committer | Keri Harris <keri@gentoo.org> | 2008-10-17 22:37:26 +0000 |
commit | 45f9737d13539b485915db610b3c9adc749bcfd3 (patch) | |
tree | 92091c0cf4222501792773b0edbbb057be73b9ea /dev-lang/qu-prolog | |
parent | Version bump with several changes and improvements. Visit http://java.sun.com... (diff) | |
download | historical-45f9737d13539b485915db610b3c9adc749bcfd3.tar.gz historical-45f9737d13539b485915db610b3c9adc749bcfd3.tar.bz2 historical-45f9737d13539b485915db610b3c9adc749bcfd3.zip |
Remove old versions.
Package-Manager: portage-2.1.4.5
Diffstat (limited to 'dev-lang/qu-prolog')
-rw-r--r-- | dev-lang/qu-prolog/ChangeLog | 9 | ||||
-rw-r--r-- | dev-lang/qu-prolog/Manifest | 24 | ||||
-rw-r--r-- | dev-lang/qu-prolog/files/qu-prolog-8.3-configure.patch | 19 | ||||
-rw-r--r-- | dev-lang/qu-prolog/files/qu-prolog-8.3-debug.patch | 45 | ||||
-rw-r--r-- | dev-lang/qu-prolog/files/qu-prolog-8.3-gcc4.patch | 38 | ||||
-rw-r--r-- | dev-lang/qu-prolog/files/qu-prolog-8.3-portage.patch | 239 | ||||
-rw-r--r-- | dev-lang/qu-prolog/files/qu-prolog-8.5-gcc4.3.patch | 20 | ||||
-rw-r--r-- | dev-lang/qu-prolog/files/qu-prolog-8.5-portage.patch | 226 | ||||
-rw-r--r-- | dev-lang/qu-prolog/qu-prolog-8.3.ebuild | 86 | ||||
-rw-r--r-- | dev-lang/qu-prolog/qu-prolog-8.5.ebuild | 86 |
10 files changed, 9 insertions, 783 deletions
diff --git a/dev-lang/qu-prolog/ChangeLog b/dev-lang/qu-prolog/ChangeLog index c8462f5f26db..7410ba4511e2 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-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/qu-prolog/ChangeLog,v 1.50 2008/09/28 12:42:06 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/qu-prolog/ChangeLog,v 1.51 2008/10/17 22:37:26 keri Exp $ + + 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, + -files/qu-prolog-8.3-portage.patch, -files/qu-prolog-8.5-gcc4.3.patch, + -files/qu-prolog-8.5-portage.patch, -qu-prolog-8.3.ebuild, + -qu-prolog-8.5.ebuild: + Remove old versions. 28 Sep 2008; Markus Meier <maekke@gentoo.org> qu-prolog-8.6.ebuild: x86 stable, bug #238330 diff --git a/dev-lang/qu-prolog/Manifest b/dev-lang/qu-prolog/Manifest index 9e676da2af0e..1ae23c2d42ed 100644 --- a/dev-lang/qu-prolog/Manifest +++ b/dev-lang/qu-prolog/Manifest @@ -1,27 +1,5 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -AUX qu-prolog-8.3-configure.patch 400 RMD160 2e0505fe533ab3cbddb6b450ae41c01f293987fe SHA1 a154e548c74323e7fc33ac8a14194cb6ca1c923a SHA256 372c91f734d03370a76d6d296658ec1331f587b695bf80bf9acc219088a3205b -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 AUX qu-prolog-8.6-portage.patch 6991 RMD160 9becc4bb995b003581ac66bdcb36a7451ffecc40 SHA1 c119ec664831dbe9fa39e070b6e0b0fe8e4ebe20 SHA256 97f2d80cc2e937339c53eb97eb6d8eafb7301bc10baed24ecad849cc9ffec860 -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 qp8.6.tar.gz 1224269 RMD160 0e3d7ca6aa8f0eb0a87506f0ebd958a61bae31b9 SHA1 56eb2eacb62cc90ea533cdfa24271f8c0b026370 SHA256 d4c50c07f24ff0e6729749013deda8f9634062da4b62a77e82284fb8f84a0dd4 -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 1963 RMD160 016e0acbc348a8b8519911e1be2ba1230e03c552 SHA1 3daf69c7ea31c8d978dd15e16115b2d38d0be5c8 SHA256 ac21912fddd15f9f75ca18fceb34c92b364b51da33a5ef4e5af94fecd67fa0e5 -EBUILD qu-prolog-8.5.ebuild 1915 RMD160 81991634117172dfec080fa901c6b3a1995c6db1 SHA1 95bb63e9b62dcae8f46a04177d2d1c83ed77e3ee SHA256 f3f07472efbf350562ce826dbbb9394791286f4f52215aac1f96f8fd836b8717 EBUILD qu-prolog-8.6.ebuild 1820 RMD160 10ebd4d484f9f5af8c9cfb20b8a0ee21bcd44c51 SHA1 cce2de2fa8808f311d7ca8edc25484b5b3320c5d SHA256 658a4c0cd415757f8c16cbac9e55a82fc209f0d8ab14bf8ed9466a412c970bee -MISC ChangeLog 8310 RMD160 832f86adf30c71e458f25f45a049ff447f8bcef2 SHA1 ac17aff2a12bfff822ca9daebf668e644e2c6d89 SHA256 d55cec55ec0f236d02ca3fa58aba388ade7ef86ce9d19921e3fbc49b18749a52 +MISC ChangeLog 8631 RMD160 5246d01376c43f26949de270b846cea2a9e15cdf SHA1 75a147b955060480efc5c5bff14f5a3bc611100b SHA256 cd69d0cce906d65c433e70b24f7c5dcee81aaf33ffd4fc918bee30d83498a558 MISC metadata.xml 159 RMD160 38d27fd1c5faabedefa5507dfd83cb4c952fbc8c SHA1 52b92682cf41e53e71bf432537a16215bd9546b1 SHA256 851bf218a4283a1d8ea6ef98af0119a40eaa78bfaaec49c2f3440437f52889ba ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.9 (GNU/Linux) - -iEYEARECAAYFAkjfe/IACgkQkKaRLQcq0GJDyQCgpvtftMUm//4wt20/h1kR4z/Y -i3cAn18td1p+OjlDSYYlQCzdGcwEAEcy -=v7gO ------END PGP SIGNATURE----- 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 deleted file mode 100644 index 0c0ee19d3d49..000000000000 --- a/dev-lang/qu-prolog/files/qu-prolog-8.3-configure.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- 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 deleted file mode 100644 index a9b29115b127..000000000000 --- a/dev-lang/qu-prolog/files/qu-prolog-8.3-debug.patch +++ /dev/null @@ -1,45 +0,0 @@ -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 deleted file mode 100644 index 6376e84dd1a3..000000000000 --- a/dev-lang/qu-prolog/files/qu-prolog-8.3-gcc4.patch +++ /dev/null @@ -1,38 +0,0 @@ -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 deleted file mode 100644 index dccb77db7b18..000000000000 --- a/dev-lang/qu-prolog/files/qu-prolog-8.3-portage.patch +++ /dev/null @@ -1,239 +0,0 @@ -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/files/qu-prolog-8.5-gcc4.3.patch b/dev-lang/qu-prolog/files/qu-prolog-8.5-gcc4.3.patch deleted file mode 100644 index f081fa9e236c..000000000000 --- a/dev-lang/qu-prolog/files/qu-prolog-8.5-gcc4.3.patch +++ /dev/null @@ -1,20 +0,0 @@ -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 deleted file mode 100644 index 68bbab5d07f8..000000000000 --- a/dev-lang/qu-prolog/files/qu-prolog-8.5-portage.patch +++ /dev/null @@ -1,226 +0,0 @@ -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.3.ebuild b/dev-lang/qu-prolog/qu-prolog-8.3.ebuild deleted file mode 100644 index 7d0977ae62a3..000000000000 --- a/dev-lang/qu-prolog/qu-prolog-8.3.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# 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.3.ebuild,v 1.6 2008/08/02 19:40:18 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="-amd64 ppc -ppc64 sparc x86" -IUSE="debug doc examples qt4 threads" - -DEPEND="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}-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 -} diff --git a/dev-lang/qu-prolog/qu-prolog-8.5.ebuild b/dev-lang/qu-prolog/qu-prolog-8.5.ebuild deleted file mode 100644 index 4940f7f8e61c..000000000000 --- a/dev-lang/qu-prolog/qu-prolog-8.5.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# 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.2 2008/08/02 19:40:18 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="-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 - 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 -} |