From c504f52f90e39d08882d268a2b614c2c21c75236 Mon Sep 17 00:00:00 2001 From: Keri Harris Date: Sat, 3 Jul 2010 00:13:56 +0000 Subject: Version bump (Portage version: 2.1.8.3/cvs/Linux x86_64) --- dev-lang/qu-prolog/ChangeLog | 9 +- .../qu-prolog/files/qu-prolog-8.11-portage.patch | 243 +++++++++++++++++++++ .../files/qu-prolog-8.11-print-atom.patch | 27 +++ dev-lang/qu-prolog/metadata.xml | 3 + dev-lang/qu-prolog/qu-prolog-8.11.ebuild | 90 ++++++++ 5 files changed, 371 insertions(+), 1 deletion(-) create mode 100644 dev-lang/qu-prolog/files/qu-prolog-8.11-portage.patch create mode 100644 dev-lang/qu-prolog/files/qu-prolog-8.11-print-atom.patch create mode 100644 dev-lang/qu-prolog/qu-prolog-8.11.ebuild (limited to 'dev-lang/qu-prolog') diff --git a/dev-lang/qu-prolog/ChangeLog b/dev-lang/qu-prolog/ChangeLog index 51aa5026a349..8e2aa82a2c25 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-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/qu-prolog/ChangeLog,v 1.67 2010/04/21 06:46:47 keri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/qu-prolog/ChangeLog,v 1.68 2010/07/03 00:13:55 keri Exp $ + +*qu-prolog-8.11 (03 Jul 2010) + + 03 Jul 2010; +qu-prolog-8.11.ebuild, + +files/qu-prolog-8.11-portage.patch, + +files/qu-prolog-8.11-print-atom.patch, metadata.xml: + Version bump 21 Apr 2010; -qu-prolog-8.8.ebuild, -files/qu-prolog-8.8-portage.patch, -qu-prolog-8.9.ebuild, 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 new file mode 100644 index 000000000000..af35a0373954 --- /dev/null +++ b/dev-lang/qu-prolog/files/qu-prolog-8.11-portage.patch @@ -0,0 +1,243 @@ +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 new file mode 100644 index 000000000000..c3765b00f852 --- /dev/null +++ b/dev-lang/qu-prolog/files/qu-prolog-8.11-print-atom.patch @@ -0,0 +1,27 @@ +--- 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 diff --git a/dev-lang/qu-prolog/metadata.xml b/dev-lang/qu-prolog/metadata.xml index 1990bb86aace..4bf0fe6a66d3 100644 --- a/dev-lang/qu-prolog/metadata.xml +++ b/dev-lang/qu-prolog/metadata.xml @@ -2,4 +2,7 @@ prolog + + Pedro subscription/notification communications system + diff --git a/dev-lang/qu-prolog/qu-prolog-8.11.ebuild b/dev-lang/qu-prolog/qu-prolog-8.11.ebuild new file mode 100644 index 000000000000..e4744a80fdce --- /dev/null +++ b/dev-lang/qu-prolog/qu-prolog-8.11.ebuild @@ -0,0 +1,90 @@ +# Copyright 1999-2010 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.11.ebuild,v 1.1 2010/07/03 00:13:55 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 ~sparc ~x86" +IUSE="debug doc examples pedro qt4 threads" + +RDEPEND="!dev-util/mpatch + !dev-util/rej + qt4? ( x11-libs/qt-gui:4 ) + pedro? ( net-misc/pedro )" + +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 +} + +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.pdf + fi + + if use examples ; then + insinto /usr/share/doc/${PF}/examples + doins examples/*.ql + docinto examples + dodoc examples/README + fi +} -- cgit v1.2.3-65-gdbad