diff options
Diffstat (limited to 'dev-lang/qu-prolog')
| -rw-r--r-- | dev-lang/qu-prolog/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-lang/qu-prolog/Manifest | 10 | ||||
| -rw-r--r-- | dev-lang/qu-prolog/files/qu-prolog-8.11-portage.patch | 243 | ||||
| -rw-r--r-- | dev-lang/qu-prolog/files/qu-prolog-8.11-print-atom.patch | 27 |
4 files changed, 9 insertions, 277 deletions
diff --git a/dev-lang/qu-prolog/ChangeLog b/dev-lang/qu-prolog/ChangeLog index 9f57abd7497f..65786509d802 100644 --- a/dev-lang/qu-prolog/ChangeLog +++ b/dev-lang/qu-prolog/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-lang/qu-prolog # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/qu-prolog/ChangeLog,v 1.80 2011/06/24 07:55:04 keri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/qu-prolog/ChangeLog,v 1.81 2011/06/24 07:58:25 keri Exp $ + + 24 Jun 2011; <keri@gentoo.org> -files/qu-prolog-8.11-portage.patch, + -files/qu-prolog-8.11-print-atom.patch: + Remove old patch files 24 Jun 2011; <keri@gentoo.org> -qu-prolog-8.11.ebuild: Remove old version diff --git a/dev-lang/qu-prolog/Manifest b/dev-lang/qu-prolog/Manifest index a32cdc308c7f..7211815e6c2f 100644 --- a/dev-lang/qu-prolog/Manifest +++ b/dev-lang/qu-prolog/Manifest @@ -1,19 +1,17 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX qu-prolog-8.11-portage.patch 7058 RMD160 01e4daef0266c4a4735d6a7659b3b5832419edbd SHA1 876baa5c1421fd1be093efbf0abfaa8330f4c1cf SHA256 ab03486520df65b9cd899d2b5c5abc2f5df4a4b149a2d6ed21f7a2d552aad81d -AUX qu-prolog-8.11-print-atom.patch 826 RMD160 bc90bd996b6e3352f18dfa7ba21521432fff1ba4 SHA1 94370c11530334ea6371806ce888289997dab869 SHA256 8a8e05fdb8eac81e1a3e21498bd001eec85772b2a9ee8eed79b8f0a03ce3d059 AUX qu-prolog-8.12-cerr-ptr.patch 1283 RMD160 47ce6931c4a51354a0da6c20045f2887cd5b16ae SHA1 c5d21b75d1077b2024bc4c3cd129585d646627a7 SHA256 580bd61fc025d3f9bcb4864af9cfda8a849b943556806c4257702125964eb0c1 AUX qu-prolog-8.12-cflags.patch 766 RMD160 e93412beb3dd518ca892e8e5082f6bbb3b46d93a SHA1 033f6aabc2cb43204dbe0625c6360dba03022555 SHA256 0e46e749aa9d0f309acd0304fcacf0fd29a3106695ce083f578870f9dd851008 AUX qu-prolog-8.12-portage.patch 804 RMD160 ba9a070fa7aac8daba8538baa6a3bd9924fa7e91 SHA1 634d715bbac3ebc5057aa0770ae23277e4c27d1f SHA256 5a5d88183b76be8d5440c17a07e39a9f33355c51d0b205be19eb30546cd9ff88 DIST qp8.12.tar.gz 1459424 RMD160 d67b99a79e449bea7aefd43b841996373fb88717 SHA1 08e16e10b6ba4053c49a7c733ef955e18d6f941b SHA256 a184a9bf7feae32340c923fb74de84b0154abe665b1708d6fb9ee644cc0ad706 EBUILD qu-prolog-8.12.ebuild 2223 RMD160 73f751753af88c8ce4ce670612d4c75168cdd7e8 SHA1 25327417c977992ac2d36327e91e7fc68c140c5d SHA256 9401e710d12c44d51a09524c9676d67f82e683d1940b2093b7aa5052126c6e4c -MISC ChangeLog 12473 RMD160 9c7ed320aa93a6334a97b33e5f5c70882551b2c3 SHA1 10605927ef4a4778d36be4c2b09074c79fc1c94f SHA256 025c920c35e4bffa22776cab5b1aedb06dc530b20d9b71ba0a6d5b479c67c892 +MISC ChangeLog 12611 RMD160 c616e53c93835aa3e7891e1435c2ca25f7590c99 SHA1 3d81b9cad1db2e21a7b08ecf09206b0544712510 SHA256 e12b62be8c0b0dffa1d7a4028e46e9487b19c09abb40edfe8ec3306b51a373b3 MISC metadata.xml 253 RMD160 ea7e80996ca5a6be3e86029423c98a3d1e73d308 SHA1 8fb0ee89e6a096f996ce4d0f086bfffbd24de7a5 SHA256 6d9eecc1943fb38e5b6a96bb4d1242df633c2f1b890f7f1e701f824e720435d9 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk4EQuMACgkQrwS/tqE49e3GSgCfT9wF9vKpnMuSXInAevfAMcjJ -Q3UAoIas5uLkycf3OHsRjNJKts6lVDFc -=AhIh +iEYEARECAAYFAk4EQ6YACgkQrwS/tqE49e3F3gCeN6H5hz6iN6K+ivad2mZ9qLdG +EtEAniwDl7ivdwG4wRAczMephMFDcAuF +=LGiN -----END PGP SIGNATURE----- diff --git a/dev-lang/qu-prolog/files/qu-prolog-8.11-portage.patch b/dev-lang/qu-prolog/files/qu-prolog-8.11-portage.patch deleted file mode 100644 index af35a0373954..000000000000 --- a/dev-lang/qu-prolog/files/qu-prolog-8.11-portage.patch +++ /dev/null @@ -1,243 +0,0 @@ -diff -ur qp8.11.orig/Makefile.in qp8.11/Makefile.in ---- qp8.11.orig/Makefile.in 2010-06-18 11:51:17.000000000 +1200 -+++ qp8.11/Makefile.in 2010-06-29 19:02:53.000000000 +1200 -@@ -14,6 +14,7 @@ - # objects. - # - -+export QPHOME = @prefix@/lib/qu-prolog - export QPBIN = @QPHOME@/bin - - -diff -ur qp8.11.orig/bin/qc.in qp8.11/bin/qc.in ---- qp8.11.orig/bin/qc.in 2010-06-18 11:50:43.000000000 +1200 -+++ qp8.11/bin/qc.in 2010-06-29 19:02:53.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="" -@@ -330,18 +331,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 -@@ -357,5 +347,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.11/bin: qc.in.orig -diff -ur qp8.11.orig/prolog/compiler/Makefile.in qp8.11/prolog/compiler/Makefile.in ---- qp8.11.orig/prolog/compiler/Makefile.in 2010-06-18 11:51:17.000000000 +1200 -+++ qp8.11/prolog/compiler/Makefile.in 2010-06-29 19:02:53.000000000 +1200 -@@ -33,5 +33,5 @@ - - - %.qo: %.qs -- $(COMPILE.qc) -c -o $@ $< -+ @QPHOME@/src/qa -i $< -o $@ - -diff -ur qp8.11.orig/prolog/library/Makefile.in qp8.11/prolog/library/Makefile.in ---- qp8.11.orig/prolog/library/Makefile.in 2010-06-18 11:51:17.000000000 +1200 -+++ qp8.11/prolog/library/Makefile.in 2010-06-29 19:02:53.000000000 +1200 -@@ -104,4 +104,4 @@ - - - %.qo: %.qs -- $(COMPILE.qc) -c -o $@ $< -+ @QPHOME@/src/qa -i $< -o $@ -diff -ur qp8.11.orig/prolog/qc1/Makefile.in qp8.11/prolog/qc1/Makefile.in ---- qp8.11.orig/prolog/qc1/Makefile.in 2010-06-18 11:51:17.000000000 +1200 -+++ qp8.11/prolog/qc1/Makefile.in 2010-06-29 19:02:53.000000000 +1200 -@@ -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.11.orig/prolog/qecat/Makefile.in qp8.11/prolog/qecat/Makefile.in ---- qp8.11.orig/prolog/qecat/Makefile.in 2010-06-18 11:51:17.000000000 +1200 -+++ qp8.11/prolog/qecat/Makefile.in 2010-06-29 19:02:53.000000000 +1200 -@@ -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.11.orig/prolog/qg/Makefile.in qp8.11/prolog/qg/Makefile.in ---- qp8.11.orig/prolog/qg/Makefile.in 2010-06-18 11:51:17.000000000 +1200 -+++ qp8.11/prolog/qg/Makefile.in 2010-06-29 19:02:53.000000000 +1200 -@@ -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.11.orig/prolog/qp/Makefile.in qp8.11/prolog/qp/Makefile.in ---- qp8.11.orig/prolog/qp/Makefile.in 2010-06-18 11:51:17.000000000 +1200 -+++ qp8.11/prolog/qp/Makefile.in 2010-06-29 19:02:53.000000000 +1200 -@@ -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.11.orig/src/Makefile.in qp8.11/src/Makefile.in ---- qp8.11.orig/src/Makefile.in 2010-06-18 11:51:17.000000000 +1200 -+++ qp8.11/src/Makefile.in 2010-06-29 19:02:53.000000000 +1200 -@@ -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/files/qu-prolog-8.11-print-atom.patch b/dev-lang/qu-prolog/files/qu-prolog-8.11-print-atom.patch deleted file mode 100644 index c3765b00f852..000000000000 --- a/dev-lang/qu-prolog/files/qu-prolog-8.11-print-atom.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- qp8.11.orig/src/objects.h 2010-06-18 11:51:05.000000000 +1200 -+++ qp8.11/src/objects.h 2010-06-29 19:04:14.000000000 +1200 -@@ -1234,18 +1234,12 @@ - << this->getName() << "\" "; - - #ifndef WIN32 -- switch (hasAssociatedItem()) -- { -- case AssociatedNone: -- std::cerr << "(no info)"; -- break; -- case AssociatedInteger: -- std::cerr << "int: " << getAssociatedInteger(); -- break; -- case AssociatedAtom: -- std::cerr << "atom: [" << std::hex << (wordptr) getAssociatedAtom() << std::dec << "]"; -- break; -- } -+ if (hasAssociatedInteger()) -+ std::cerr << "int: " << getAssociatedInteger(); -+ else if (hasAssociatedAtom()) -+ std::cerr << "atom: [" << std::hex << (wordptr) getAssociatedAtom() << std::dec << "]"; -+ else -+ std::cerr << "(no info)"; - #endif - } - #endif |