diff options
Diffstat (limited to 'dev-lang/qu-prolog')
| -rw-r--r-- | dev-lang/qu-prolog/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-lang/qu-prolog/files/qu-prolog-8.8-portage.patch | 242 | ||||
| -rw-r--r-- | dev-lang/qu-prolog/files/qu-prolog-8.9-glibc2.10.patch | 20 | ||||
| -rw-r--r-- | dev-lang/qu-prolog/files/qu-prolog-8.9-portage.patch | 243 | ||||
| -rw-r--r-- | dev-lang/qu-prolog/files/qu-prolog-8.9-print-atom.patch | 27 | ||||
| -rw-r--r-- | dev-lang/qu-prolog/qu-prolog-8.8.ebuild | 88 | ||||
| -rw-r--r-- | dev-lang/qu-prolog/qu-prolog-8.9.ebuild | 90 |
7 files changed, 7 insertions, 711 deletions
diff --git a/dev-lang/qu-prolog/ChangeLog b/dev-lang/qu-prolog/ChangeLog index cfd615bcb7a3..51aa5026a349 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-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/qu-prolog/ChangeLog,v 1.66 2010/04/18 14:35:16 nixnut Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/qu-prolog/ChangeLog,v 1.67 2010/04/21 06:46:47 keri Exp $ + + 21 Apr 2010; <keri@gentoo.org> -qu-prolog-8.8.ebuild, + -files/qu-prolog-8.8-portage.patch, -qu-prolog-8.9.ebuild, + -files/qu-prolog-8.9-glibc2.10.patch, -files/qu-prolog-8.9-portage.patch, + -files/qu-prolog-8.9-print-atom.patch: + Remove old versions 18 Apr 2010; <nixnut@gentoo.org> qu-prolog-8.10.ebuild: ppc stable #304999 diff --git a/dev-lang/qu-prolog/files/qu-prolog-8.8-portage.patch b/dev-lang/qu-prolog/files/qu-prolog-8.8-portage.patch deleted file mode 100644 index ba25e0c7d3fb..000000000000 --- a/dev-lang/qu-prolog/files/qu-prolog-8.8-portage.patch +++ /dev/null @@ -1,242 +0,0 @@ -diff -ur qp8.8.orig/Makefile.in qp8.8/Makefile.in ---- qp8.8.orig/Makefile.in 2008-12-08 11:10:40.000000000 +1300 -+++ qp8.8/Makefile.in 2008-12-13 10:01:54.000000000 +1300 -@@ -14,6 +14,7 @@ - # objects. - # - -+export QPHOME = @prefix@/lib/qu-prolog - export QPBIN = @QPHOME@/bin - - -diff -ur qp8.8.orig/bin/qc.in qp8.8/bin/qc.in ---- qp8.8.orig/bin/qc.in 2007-08-01 12:23:42.000000000 +1200 -+++ qp8.8/bin/qc.in 2008-12-13 10:01:54.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.8.orig/prolog/compiler/Makefile.in qp8.8/prolog/compiler/Makefile.in ---- qp8.8.orig/prolog/compiler/Makefile.in 2008-12-08 11:10:41.000000000 +1300 -+++ qp8.8/prolog/compiler/Makefile.in 2008-12-13 10:01:54.000000000 +1300 -@@ -33,5 +33,5 @@ - - - %.qo: %.qs -- $(COMPILE.qc) -c -o $@ $< -+ @QPHOME@/src/qa -i $< -o $@ - -diff -ur qp8.8.orig/prolog/library/Makefile.in qp8.8/prolog/library/Makefile.in ---- qp8.8.orig/prolog/library/Makefile.in 2008-12-08 11:10:41.000000000 +1300 -+++ qp8.8/prolog/library/Makefile.in 2008-12-13 10:01:54.000000000 +1300 -@@ -103,4 +103,4 @@ - - - %.qo: %.qs -- $(COMPILE.qc) -c -o $@ $< -+ @QPHOME@/src/qa -i $< -o $@ -diff -ur qp8.8.orig/prolog/qc1/Makefile.in qp8.8/prolog/qc1/Makefile.in ---- qp8.8.orig/prolog/qc1/Makefile.in 2008-12-08 11:10:41.000000000 +1300 -+++ qp8.8/prolog/qc1/Makefile.in 2008-12-13 10:01:54.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.8.orig/prolog/qecat/Makefile.in qp8.8/prolog/qecat/Makefile.in ---- qp8.8.orig/prolog/qecat/Makefile.in 2008-12-08 11:10:41.000000000 +1300 -+++ qp8.8/prolog/qecat/Makefile.in 2008-12-13 10:01:54.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.8.orig/prolog/qg/Makefile.in qp8.8/prolog/qg/Makefile.in ---- qp8.8.orig/prolog/qg/Makefile.in 2008-12-08 11:10:41.000000000 +1300 -+++ qp8.8/prolog/qg/Makefile.in 2008-12-13 10:01:54.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.8.orig/prolog/qp/Makefile.in qp8.8/prolog/qp/Makefile.in ---- qp8.8.orig/prolog/qp/Makefile.in 2008-12-08 11:10:41.000000000 +1300 -+++ qp8.8/prolog/qp/Makefile.in 2008-12-13 10:01:54.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.8.orig/src/Makefile.in qp8.8/src/Makefile.in ---- qp8.8.orig/src/Makefile.in 2008-12-08 11:10:41.000000000 +1300 -+++ qp8.8/src/Makefile.in 2008-12-13 10:01:54.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/files/qu-prolog-8.9-glibc2.10.patch b/dev-lang/qu-prolog/files/qu-prolog-8.9-glibc2.10.patch deleted file mode 100644 index 9a859088f260..000000000000 --- a/dev-lang/qu-prolog/files/qu-prolog-8.9-glibc2.10.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- qp8.9.orig/src/io.cc 2009-03-25 16:46:20.000000000 +1300 -+++ qp8.9/src/io.cc 2009-08-07 10:09:53.000000000 +1200 -@@ -526,7 +526,7 @@ - } - else - { -- char* ptr = strrchr(s, '\n'); -+ const char* ptr = strrchr(s, '\n'); - if (ptr == NULL) - { - stream << s; -@@ -655,7 +655,7 @@ - } - else - { -- char* ptr = strrchr(s, '\n'); -+ const char* ptr = strrchr(s, '\n'); - if (ptr == NULL) - { - stream << s; diff --git a/dev-lang/qu-prolog/files/qu-prolog-8.9-portage.patch b/dev-lang/qu-prolog/files/qu-prolog-8.9-portage.patch deleted file mode 100644 index 0d9108d361c9..000000000000 --- a/dev-lang/qu-prolog/files/qu-prolog-8.9-portage.patch +++ /dev/null @@ -1,243 +0,0 @@ -diff -ur qp8.9.orig/Makefile.in qp8.9/Makefile.in ---- qp8.9.orig/Makefile.in 2009-03-25 16:46:33.000000000 +1300 -+++ qp8.9/Makefile.in 2009-04-05 09:18:34.000000000 +1200 -@@ -14,6 +14,7 @@ - # objects. - # - -+export QPHOME = @prefix@/lib/qu-prolog - export QPBIN = @QPHOME@/bin - - -diff -ur qp8.9.orig/bin/qc.in qp8.9/bin/qc.in ---- qp8.9.orig/bin/qc.in 2007-08-01 12:23:42.000000000 +1200 -+++ qp8.9/bin/qc.in 2009-04-05 09:18:34.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.9.orig/prolog/compiler/Makefile.in qp8.9/prolog/compiler/Makefile.in ---- qp8.9.orig/prolog/compiler/Makefile.in 2009-03-25 16:46:34.000000000 +1300 -+++ qp8.9/prolog/compiler/Makefile.in 2009-04-05 09:18:34.000000000 +1200 -@@ -33,5 +33,5 @@ - - - %.qo: %.qs -- $(COMPILE.qc) -c -o $@ $< -+ @QPHOME@/src/qa -i $< -o $@ - -diff -ur qp8.9.orig/prolog/library/Makefile.in qp8.9/prolog/library/Makefile.in ---- qp8.9.orig/prolog/library/Makefile.in 2009-03-25 16:46:34.000000000 +1300 -+++ qp8.9/prolog/library/Makefile.in 2009-04-05 09:18:34.000000000 +1200 -@@ -104,4 +104,4 @@ - - - %.qo: %.qs -- $(COMPILE.qc) -c -o $@ $< -+ @QPHOME@/src/qa -i $< -o $@ -Only in qp8.9/prolog/library: Makefile.in.orig -diff -ur qp8.9.orig/prolog/qc1/Makefile.in qp8.9/prolog/qc1/Makefile.in ---- qp8.9.orig/prolog/qc1/Makefile.in 2009-03-25 16:46:34.000000000 +1300 -+++ qp8.9/prolog/qc1/Makefile.in 2009-04-05 09:18:34.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.9.orig/prolog/qecat/Makefile.in qp8.9/prolog/qecat/Makefile.in ---- qp8.9.orig/prolog/qecat/Makefile.in 2009-03-25 16:46:34.000000000 +1300 -+++ qp8.9/prolog/qecat/Makefile.in 2009-04-05 09:18:34.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.9.orig/prolog/qg/Makefile.in qp8.9/prolog/qg/Makefile.in ---- qp8.9.orig/prolog/qg/Makefile.in 2009-03-25 16:46:34.000000000 +1300 -+++ qp8.9/prolog/qg/Makefile.in 2009-04-05 09:18:34.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.9.orig/prolog/qp/Makefile.in qp8.9/prolog/qp/Makefile.in ---- qp8.9.orig/prolog/qp/Makefile.in 2009-03-25 16:46:34.000000000 +1300 -+++ qp8.9/prolog/qp/Makefile.in 2009-04-05 09:18:34.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.9.orig/src/Makefile.in qp8.9/src/Makefile.in ---- qp8.9.orig/src/Makefile.in 2009-03-25 16:46:34.000000000 +1300 -+++ qp8.9/src/Makefile.in 2009-04-05 09:18:34.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.9-print-atom.patch b/dev-lang/qu-prolog/files/qu-prolog-8.9-print-atom.patch deleted file mode 100644 index 55ddcd1dd34b..000000000000 --- a/dev-lang/qu-prolog/files/qu-prolog-8.9-print-atom.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- qp8.9.orig/src/objects.h 2009-03-25 16:46:20.000000000 +1300 -+++ qp8.9/src/objects.h 2009-08-07 10:07:20.000000000 +1200 -@@ -1233,18 +1233,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 << (word32) getAssociatedAtom() << std::dec << "]"; -- break; -- } -+ if (!hasAssociatedItem()) -+ std::cerr << "(no info)"; -+ else if (hasAssociatedInteger()) -+ std::cerr << "int: " << getAssociatedInteger(); -+ else if (hasAssociatedAtom()) -+ std::cerr << "atom: [" << std::hex << (word32) getAssociatedAtom() << std::dec << "]"; - #endif - } - #endif diff --git a/dev-lang/qu-prolog/qu-prolog-8.8.ebuild b/dev-lang/qu-prolog/qu-prolog-8.8.ebuild deleted file mode 100644 index 842fb6fb63f6..000000000000 --- a/dev-lang/qu-prolog/qu-prolog-8.8.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2009 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.8.ebuild,v 1.6 2009/09/30 15:54:40 ayoy 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" - -RDEPEND="!dev-util/mpatch - !dev-util/rej - qt4? ( x11-libs/qt-gui:4 )" - -DEPEND="${RDEPEND} - dev-lang/perl" - -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 -} diff --git a/dev-lang/qu-prolog/qu-prolog-8.9.ebuild b/dev-lang/qu-prolog/qu-prolog-8.9.ebuild deleted file mode 100644 index 0977edac15c1..000000000000 --- a/dev-lang/qu-prolog/qu-prolog-8.9.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 1999-2009 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.9.ebuild,v 1.3 2009/09/30 15:54:40 ayoy 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" - -RDEPEND="!dev-util/mpatch - !dev-util/rej - qt4? ( x11-libs/qt-gui:4 )" - -DEPEND="${RDEPEND} - dev-lang/perl" - -S="${WORKDIR}"/${MY_P} - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${P}-portage.patch - epatch "${FILESDIR}"/${P}-print-atom.patch - epatch "${FILESDIR}"/${P}-glibc2.10.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 -} |