diff options
| -rw-r--r-- | dev-lang/qu-prolog/ChangeLog | 9 | ||||
| -rw-r--r-- | dev-lang/qu-prolog/files/qu-prolog-8.12-cerr-ptr.patch | 38 | ||||
| -rw-r--r-- | dev-lang/qu-prolog/files/qu-prolog-8.12-cflags.patch | 21 | ||||
| -rw-r--r-- | dev-lang/qu-prolog/files/qu-prolog-8.12-portage.patch | 30 | ||||
| -rw-r--r-- | dev-lang/qu-prolog/files/qu-prolog-9.0-cerr-ptr.patch | 41 | ||||
| -rw-r--r-- | dev-lang/qu-prolog/files/qu-prolog-9.0-cflags.patch | 22 | ||||
| -rw-r--r-- | dev-lang/qu-prolog/files/qu-prolog-9.0-portage.patch | 32 | ||||
| -rw-r--r-- | dev-lang/qu-prolog/qu-prolog-8.12.ebuild | 101 | ||||
| -rw-r--r-- | dev-lang/qu-prolog/qu-prolog-9.0.ebuild | 101 |
9 files changed, 8 insertions, 387 deletions
diff --git a/dev-lang/qu-prolog/ChangeLog b/dev-lang/qu-prolog/ChangeLog index 1ab0cf8fda88..ad9f4ecee95b 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-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/qu-prolog/ChangeLog,v 1.87 2012/02/01 17:42:34 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/qu-prolog/ChangeLog,v 1.88 2012/03/01 11:30:25 keri Exp $ + + 01 Mar 2012; <keri@gentoo.org> -qu-prolog-8.12.ebuild, + -files/qu-prolog-8.12-cerr-ptr.patch, -files/qu-prolog-8.12-cflags.patch, + -files/qu-prolog-8.12-portage.patch, -qu-prolog-9.0.ebuild, + -files/qu-prolog-9.0-cerr-ptr.patch, -files/qu-prolog-9.0-cflags.patch, + -files/qu-prolog-9.0-portage.patch: + Remove old versions 01 Feb 2012; Brent Baude <ranger@gentoo.org> qu-prolog-9.1.ebuild: Marking qu-prolog-9.1 ppc for bug 398815 diff --git a/dev-lang/qu-prolog/files/qu-prolog-8.12-cerr-ptr.patch b/dev-lang/qu-prolog/files/qu-prolog-8.12-cerr-ptr.patch deleted file mode 100644 index c4ae00a073cd..000000000000 --- a/dev-lang/qu-prolog/files/qu-prolog-8.12-cerr-ptr.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- qp8.12.orig/src/gc.cc 2010-11-23 15:33:30.000000000 +1300 -+++ qp8.12/src/gc.cc 2010-12-04 12:37:04.000000000 +1300 -@@ -152,7 +152,7 @@ - { - cerr << size << endl; - heapobject* ptr = reinterpret_cast<heapobject*>(term); -- cerr << hex << (u_int)(ptr) << " : " << *ptr << " " << *(ptr+1) << dec << endl; -+ cerr << hex << (wordptr)(ptr) << " : " << *ptr << " " << *(ptr+1) << dec << endl; - return false; - } - return true; ---- qp8.12.orig/src/objects.h 2010-11-23 15:33:30.000000000 +1300 -+++ qp8.12/src/objects.h 2010-12-02 20:40:53.000000000 +1300 -@@ -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/files/qu-prolog-8.12-cflags.patch b/dev-lang/qu-prolog/files/qu-prolog-8.12-cflags.patch deleted file mode 100644 index 3cd2ce5536e4..000000000000 --- a/dev-lang/qu-prolog/files/qu-prolog-8.12-cflags.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- qp8.12.orig/src/Makefile.in 2010-11-23 15:33:42.000000000 +1300 -+++ qp8.12/src/Makefile.in 2010-12-04 07:15:27.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.12-portage.patch b/dev-lang/qu-prolog/files/qu-prolog-8.12-portage.patch deleted file mode 100644 index bb9d48f8c1b8..000000000000 --- a/dev-lang/qu-prolog/files/qu-prolog-8.12-portage.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- qp8.12.orig/bin/qc.in 2010-11-23 15:33:14.000000000 +1300 -+++ qp8.12/bin/qc.in 2010-12-04 11:16:44.000000000 +1300 -@@ -27,13 +27,13 @@ - - ############################## - --preprocess='@QPHOME@/bin/qppp' --expand='@QPHOME@/bin/qg' --qpcompile='@QPHOME@/bin/qc1' -+preprocess='qppp' -+expand='qg' -+qpcompile='qc1' - compversion='qup' --assemble='@QPHOME@/bin/qa' --link='@QPHOME@/bin/ql' --execute='@QPHOME@/bin/qem' -+assemble='qa' -+link='ql' -+execute='qem' - libqofiles="@QPHOME@/prolog/compiler/*.qo @QPHOME@/prolog/library/*.qo" - - ############################## ---- qp8.12.orig/prolog/Makefile.in 2006-04-06 16:01:45.000000000 +1200 -+++ qp8.12/prolog/Makefile.in 2010-12-04 10:57:09.000000000 +1300 -@@ -1,3 +1,5 @@ -+PATH:=$(PATH):@QPHOME@/bin -+ - .DEFAULT: - @$(MAKE) -C compiler $@ - @$(MAKE) -C library $@ diff --git a/dev-lang/qu-prolog/files/qu-prolog-9.0-cerr-ptr.patch b/dev-lang/qu-prolog/files/qu-prolog-9.0-cerr-ptr.patch deleted file mode 100644 index 9f552841686e..000000000000 --- a/dev-lang/qu-prolog/files/qu-prolog-9.0-cerr-ptr.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff -ur qp9.0.orig/src/gc.cc qp9.0/src/gc.cc ---- qp9.0.orig/src/gc.cc 2011-07-14 14:48:03.000000000 +1200 -+++ qp9.0/src/gc.cc 2011-11-19 09:55:20.000000000 +1300 -@@ -152,7 +152,7 @@ - { - cerr << size << endl; - heapobject* ptr = reinterpret_cast<heapobject*>(term); -- cerr << hex << (u_int)(ptr) << " : " << *ptr << " " << *(ptr+1) << dec << endl; -+ cerr << hex << (wordptr)(ptr) << " : " << *ptr << " " << *(ptr+1) << dec << endl; - return false; - } - return true; -diff -ur qp9.0.orig/src/objects.h qp9.0/src/objects.h ---- qp9.0.orig/src/objects.h 2011-07-14 14:48:03.000000000 +1200 -+++ qp9.0/src/objects.h 2011-11-19 09:55:20.000000000 +1300 -@@ -1242,18 +1242,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 -Only in qp9.0/src: objects.h.orig diff --git a/dev-lang/qu-prolog/files/qu-prolog-9.0-cflags.patch b/dev-lang/qu-prolog/files/qu-prolog-9.0-cflags.patch deleted file mode 100644 index 2f71d0da9f48..000000000000 --- a/dev-lang/qu-prolog/files/qu-prolog-9.0-cflags.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -ur qp9.0.orig/src/Makefile.in qp9.0/src/Makefile.in ---- qp9.0.orig/src/Makefile.in 2011-07-14 14:48:14.000000000 +1200 -+++ qp9.0/src/Makefile.in 2011-11-19 09:51:48.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-9.0-portage.patch b/dev-lang/qu-prolog/files/qu-prolog-9.0-portage.patch deleted file mode 100644 index b32ad2400cf8..000000000000 --- a/dev-lang/qu-prolog/files/qu-prolog-9.0-portage.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -ur qp9.0.orig/bin/qc.in qp9.0/bin/qc.in ---- qp9.0.orig/bin/qc.in 2011-07-14 14:47:48.000000000 +1200 -+++ qp9.0/bin/qc.in 2011-11-19 09:50:05.000000000 +1300 -@@ -27,13 +27,13 @@ - - ############################## - --preprocess='@QPHOME@/bin/qppp' --expand='@QPHOME@/bin/qg' --qpcompile='@QPHOME@/bin/qc1' -+preprocess='qppp' -+expand='qg' -+qpcompile='qc1' - compversion='qup' --assemble='@QPHOME@/bin/qa' --link='@QPHOME@/bin/ql' --execute='@QPHOME@/bin/qem' -+assemble='qa' -+link='ql' -+execute='qem' - libqofiles="@QPHOME@/prolog/compiler/*.qo @QPHOME@/prolog/library/*.qo" - - ############################## -diff -ur qp9.0.orig/prolog/Makefile.in qp9.0/prolog/Makefile.in ---- qp9.0.orig/prolog/Makefile.in 2006-04-06 16:01:45.000000000 +1200 -+++ qp9.0/prolog/Makefile.in 2011-11-19 09:50:05.000000000 +1300 -@@ -1,3 +1,5 @@ -+PATH:=$(PATH):@QPHOME@/bin -+ - .DEFAULT: - @$(MAKE) -C compiler $@ - @$(MAKE) -C library $@ diff --git a/dev-lang/qu-prolog/qu-prolog-8.12.ebuild b/dev-lang/qu-prolog/qu-prolog-8.12.ebuild deleted file mode 100644 index e3474b1fbd89..000000000000 --- a/dev-lang/qu-prolog/qu-prolog-8.12.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 1999-2011 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.12.ebuild,v 1.5 2011/06/23 20:02:13 ranger Exp $ - -EAPI=2 - -inherit eutils qt4-r2 - -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 x86" -IUSE="debug doc examples pedro qt4 readline threads" - -RDEPEND="!dev-util/mpatch - !dev-util/rej - qt4? ( x11-libs/qt-gui:4 ) - pedro? ( net-misc/pedro ) - readline? ( app-misc/rlwrap )" - -DEPEND="${RDEPEND} - dev-lang/perl" - -S="${WORKDIR}"/${MY_P} - -src_prepare() { - epatch "${FILESDIR}"/${P}-portage.patch - epatch "${FILESDIR}"/${P}-cflags.patch - epatch "${FILESDIR}"/${P}-cerr-ptr.patch -} - -src_configure() { - econf \ - --libdir=/usr/$(get_libdir) \ - $(use_enable debug) \ - $(use_enable threads multiple-threads) - - if use qt4; then - cd "${S}"/src/xqp - eqmake4 xqp.pro - fi -} - -src_compile() { - emake || die "emake failed" - - if use qt4; then - cd "${S}"/src/xqp - emake || die "emake xqp failed" - fi -} - -src_install() { - sed -i -e "s|${S}|/usr/$(get_libdir)/qu-prolog|g" \ - bin/qc bin/qc1.qup bin/qecat bin/qg bin/qp || die - - exeinto /usr/bin - doexe bin/qa bin/qdeal bin/qem bin/ql || die - doexe bin/qc bin/qc1.qup bin/qecat bin/qg bin/qp bin/qppp || die - doexe bin/kq || die - - if use qt4; then - doexe src/xqp/xqp || die - fi - - insinto /usr/$(get_libdir)/${PN}/bin - doins bin/rl_commands - doins bin/qc1.qup.qx \ - bin/qecat.qx \ - bin/qg.qx \ - bin/qp.qx || die - - insinto /usr/$(get_libdir)/${PN}/library - doins prolog/library/*.qo || die - - insinto /usr/$(get_libdir)/${PN}/compiler - doins prolog/compiler/*.qo || die - - doman doc/man/man1/*.1 || die - - dodoc README || die - - if use doc ; then - docinto reference-manual - dodoc doc/manual/*.html || die - docinto user-guide - dodoc doc/user/main.pdf || die - fi - - if use examples ; then - insinto /usr/share/doc/${PF}/examples - doins examples/*.ql || die - docinto examples - dodoc examples/README || die - fi -} diff --git a/dev-lang/qu-prolog/qu-prolog-9.0.ebuild b/dev-lang/qu-prolog/qu-prolog-9.0.ebuild deleted file mode 100644 index 0f8eca94359d..000000000000 --- a/dev-lang/qu-prolog/qu-prolog-9.0.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/qu-prolog/qu-prolog-9.0.ebuild,v 1.1 2011/11/18 21:00:02 keri Exp $ - -EAPI=2 - -inherit eutils qt4-r2 - -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 ~x86" -IUSE="debug doc examples pedro qt4 readline threads" - -RDEPEND="!dev-util/mpatch - !dev-util/rej - qt4? ( x11-libs/qt-gui:4 ) - pedro? ( net-misc/pedro ) - readline? ( app-misc/rlwrap )" - -DEPEND="${RDEPEND} - dev-lang/perl" - -S="${WORKDIR}"/${MY_P} - -src_prepare() { - epatch "${FILESDIR}"/${P}-portage.patch - epatch "${FILESDIR}"/${P}-cflags.patch - epatch "${FILESDIR}"/${P}-cerr-ptr.patch -} - -src_configure() { - econf \ - --libdir=/usr/$(get_libdir) \ - $(use_enable debug) \ - $(use_enable threads multiple-threads) - - if use qt4; then - cd "${S}"/src/xqp - eqmake4 xqp.pro - fi -} - -src_compile() { - emake || die "emake failed" - - if use qt4; then - cd "${S}"/src/xqp - emake || die "emake xqp failed" - fi -} - -src_install() { - sed -i -e "s|${S}|/usr/$(get_libdir)/qu-prolog|g" \ - bin/qc bin/qc1.qup bin/qecat bin/qg bin/qp || die - - exeinto /usr/bin - doexe bin/qa bin/qdeal bin/qem bin/ql || die - doexe bin/qc bin/qc1.qup bin/qecat bin/qg bin/qp bin/qppp || die - doexe bin/kq || die - - if use qt4; then - doexe src/xqp/xqp || die - fi - - insinto /usr/$(get_libdir)/${PN}/bin - doins bin/rl_commands - doins bin/qc1.qup.qx \ - bin/qecat.qx \ - bin/qg.qx \ - bin/qp.qx || die - - insinto /usr/$(get_libdir)/${PN}/library - doins prolog/library/*.qo || die - - insinto /usr/$(get_libdir)/${PN}/compiler - doins prolog/compiler/*.qo || die - - doman doc/man/man1/*.1 || die - - dodoc README || die - - if use doc ; then - docinto reference-manual - dodoc doc/manual/*.html || die - docinto user-guide - dodoc doc/user/main.pdf || die - fi - - if use examples ; then - insinto /usr/share/doc/${PF}/examples - doins examples/*.ql || die - docinto examples - dodoc examples/README || die - fi -} |