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.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.5.ebuild | 86 |
4 files changed, 339 insertions, 1 deletions
diff --git a/dev-lang/qu-prolog/ChangeLog b/dev-lang/qu-prolog/ChangeLog index 963ffb68c4f4..cfd7a36b7b6c 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.44 2008/04/14 07:48:15 keri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/qu-prolog/ChangeLog,v 1.45 2008/07/02 07:24:25 keri Exp $ + +*qu-prolog-8.5 (02 Jul 2008) + + 02 Jul 2008; keri <keri@gentoo.org> +files/qu-prolog-8.5-gcc4.3.patch, + +files/qu-prolog-8.5-portage.patch, +qu-prolog-8.5.ebuild: + Version bump. 14 Apr 2008; keri <keri@gentoo.org> qu-prolog-8.3.ebuild: Update Qt 4 dependencies. 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 new file mode 100644 index 000000000000..f081fa9e236c --- /dev/null +++ b/dev-lang/qu-prolog/files/qu-prolog-8.5-gcc4.3.patch @@ -0,0 +1,20 @@ +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 new file mode 100644 index 000000000000..68bbab5d07f8 --- /dev/null +++ b/dev-lang/qu-prolog/files/qu-prolog-8.5-portage.patch @@ -0,0 +1,226 @@ +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.5.ebuild b/dev-lang/qu-prolog/qu-prolog-8.5.ebuild new file mode 100644 index 000000000000..cafa483459fc --- /dev/null +++ b/dev-lang/qu-prolog/qu-prolog-8.5.ebuild @@ -0,0 +1,86 @@ +# 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.1 2008/07/02 07:24:25 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="~ppc ~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 +} |