jlec        15/03/21 15:29:49

  Modified:             metadata.xml qu-prolog-9.1.ebuild ChangeLog
  Added:                qu-prolog-9.1-r1.ebuild
  Log:
  Drop old; fix correct installation and dependencies
  
  (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 
B9D4F231BD1558AB!)

Revision  Changes    Path
1.3                  dev-lang/qu-prolog/metadata.xml

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/qu-prolog/metadata.xml?rev=1.3&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/qu-prolog/metadata.xml?rev=1.3&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/qu-prolog/metadata.xml?r1=1.2&r2=1.3

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/qu-prolog/metadata.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- metadata.xml        3 Jul 2010 00:13:55 -0000       1.2
+++ metadata.xml        21 Mar 2015 15:29:49 -0000      1.3
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-<herd>prolog</herd>
-<use>
-       <flag name='pedro'>Pedro subscription/notification communications 
system</flag>
-</use>
+  <herd>prolog</herd>
+  <use>
+    <flag name="pedro">Pedro subscription/notification communications 
system</flag>
+  </use>
 </pkgmetadata>



1.8                  dev-lang/qu-prolog/qu-prolog-9.1.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/qu-prolog/qu-prolog-9.1.ebuild?rev=1.8&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/qu-prolog/qu-prolog-9.1.ebuild?rev=1.8&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/qu-prolog/qu-prolog-9.1.ebuild?r1=1.7&r2=1.8

Index: qu-prolog-9.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/qu-prolog/qu-prolog-9.1.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- qu-prolog-9.1.ebuild        12 Apr 2013 22:44:57 -0000      1.7
+++ qu-prolog-9.1.ebuild        21 Mar 2015 15:29:49 -0000      1.8
@@ -1,14 +1,14 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 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.1.ebuild,v 
1.7 2013/04/12 22:44:57 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/qu-prolog/qu-prolog-9.1.ebuild,v 
1.8 2015/03/21 15:29:49 jlec Exp $
 
 EAPI=2
 
-inherit eutils qt4-r2
+inherit eutils multilib qmake-utils
 
 MY_P=qp${PV}
 
-DESCRIPTION="Qu-Prolog is an extended Prolog supporting quantifiers, 
object-variables and substitutions"
+DESCRIPTION="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";
 
@@ -17,7 +17,8 @@
 KEYWORDS="amd64 ppc x86"
 IUSE="debug doc examples pedro qt4 readline threads"
 
-RDEPEND="!dev-util/mpatch
+RDEPEND="
+       !dev-util/mpatch
        !dev-util/rej
        qt4? ( dev-qt/qtgui:4 )
        pedro? ( net-misc/pedro )
@@ -29,10 +30,11 @@
 S="${WORKDIR}"/${MY_P}
 
 src_prepare() {
-       epatch "${FILESDIR}"/${P}-portage.patch
-       epatch "${FILESDIR}"/${P}-cflags.patch
-       epatch "${FILESDIR}"/${P}-cerr-ptr.patch
-       epatch "${FILESDIR}"/${P}-gcc.patch
+       epatch \
+               "${FILESDIR}"/${P}-portage.patch \
+               "${FILESDIR}"/${P}-cflags.patch \
+               "${FILESDIR}"/${P}-cerr-ptr.patch \
+               "${FILESDIR}"/${P}-gcc.patch
 }
 
 src_configure() {
@@ -42,7 +44,7 @@
                $(use_enable threads multiple-threads)
 
        if use qt4; then
-               cd "${S}"/src/xqp
+               cd "${S}"/src/xqp || die
                eqmake4 xqp.pro
        fi
 }
@@ -51,7 +53,7 @@
        emake || die "emake failed"
 
        if use qt4; then
-               cd "${S}"/src/xqp
+               cd "${S}"/src/xqp || die
                emake || die "emake xqp failed"
        fi
 }
@@ -60,13 +62,12 @@
        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
+       dobin bin/qa bin/qdeal bin/qem bin/ql || die
+       dobin bin/qc bin/qc1.qup bin/qecat bin/qg bin/qp bin/qppp || die
+       dobin bin/kq || die
 
        if use qt4; then
-               doexe src/xqp/xqp || die
+               dobin src/xqp/xqp || die
        fi
 
        insinto /usr/$(get_libdir)/${PN}/bin



1.92                 dev-lang/qu-prolog/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/qu-prolog/ChangeLog?rev=1.92&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/qu-prolog/ChangeLog?rev=1.92&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/qu-prolog/ChangeLog?r1=1.91&r2=1.92

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/qu-prolog/ChangeLog,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- ChangeLog   12 Apr 2013 22:44:57 -0000      1.91
+++ ChangeLog   21 Mar 2015 15:29:49 -0000      1.92
@@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/qu-prolog
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/qu-prolog/ChangeLog,v 1.91 
2013/04/12 22:44:57 ulm Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/qu-prolog/ChangeLog,v 1.92 
2015/03/21 15:29:49 jlec Exp $
+
+*qu-prolog-9.1-r1 (21 Mar 2015)
+
+  21 Mar 2015; Justin Lecher <[email protected]> +qu-prolog-9.1-r1.ebuild,
+  metadata.xml, qu-prolog-9.1.ebuild:
+  Drop old; fix correct installation and dependencies
 
   12 Apr 2013; Ulrich Müller <[email protected]> qu-prolog-9.1.ebuild:
   Fix LICENSE, bug 463876.



1.1                  dev-lang/qu-prolog/qu-prolog-9.1-r1.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/qu-prolog/qu-prolog-9.1-r1.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/qu-prolog/qu-prolog-9.1-r1.ebuild?rev=1.1&content-type=text/plain

Index: qu-prolog-9.1-r1.ebuild
===================================================================
# Copyright 1999-2015 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.1-r1.ebuild,v 
1.1 2015/03/21 15:29:49 jlec Exp $

EAPI=5

inherit eutils multilib qmake-utils

MY_P=qp${PV}

DESCRIPTION="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="Qu-Prolog GPL-2+"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
IUSE="debug doc examples pedro qt4 readline threads"

RDEPEND="
        !dev-util/mpatch
        !dev-util/rej
        qt4? ( dev-qt/qtgui: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 \
                "${FILESDIR}"/${P}-cflags.patch \
                "${FILESDIR}"/${P}-cerr-ptr.patch \
                "${FILESDIR}"/${P}-gcc.patch
}

src_configure() {
        econf \
                --libdir=/usr/$(get_libdir) \
                $(use_enable debug) \
                $(use_enable threads multiple-threads)

        if use qt4; then
                cd "${S}"/src/xqp || die
                eqmake4 xqp.pro
        fi
}

src_compile() {
        emake

        if use qt4; then
                cd "${S}"/src/xqp || die
                emake
        fi
}

src_install() {
        sed \
                -e "s|${S}|/usr/$(get_libdir)/qu-prolog|g" \
                -i bin/qc bin/qc1.qup bin/qecat bin/qg bin/qp || die

        dobin bin/{qa,qdeal,qem,ql,qc,qc1.qup,qecat,qg,qp,qppp,kq}

        use qt4 && dobin src/xqp/xqp

        insinto /usr/$(get_libdir)/${PN}/bin
        doins bin/{rl_commands,qc1.qup,qecat,qg,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
                newdoc examples/README README.examples
        fi
}




Reply via email to