Drop old; fix correct installation and dependencies

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

4 files changed, 124 insertions, 22 deletions

diff --git a/dev-lang/qu-prolog/ChangeLog b/dev-lang/qu-prolog/ChangeLog
index 7a0440ec6111..02cbc65d6e88 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-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 <jlec@gentoo.org> +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 <ulm@gentoo.org> qu-prolog-9.1.ebuild:
   Fix LICENSE, bug 463876.
diff --git a/dev-lang/qu-prolog/metadata.xml b/dev-lang/qu-prolog/metadata.xml
index 4bf0fe6a66d3..9708914df07f 100644
--- a/dev-lang/qu-prolog/metadata.xml
+++ b/dev-lang/qu-prolog/metadata.xml
@@ -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>
diff --git a/dev-lang/qu-prolog/qu-prolog-9.1-r1.ebuild b/dev-lang/qu-prolog/qu-prolog-9.1-r1.ebuild
new file mode 100644
index 000000000000..42ad8638692b
--- /dev/null
+++ b/dev-lang/qu-prolog/qu-prolog-9.1-r1.ebuild
@@ -0,0 +1,95 @@
+# 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
+}
diff --git a/dev-lang/qu-prolog/qu-prolog-9.1.ebuild b/dev-lang/qu-prolog/qu-prolog-9.1.ebuild
index 7198e6fe0946..6faf4c691b10 100644
--- a/dev-lang/qu-prolog/qu-prolog-9.1.ebuild
+++ b/dev-lang/qu-prolog/qu-prolog-9.1.ebuild
@@ -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 @@ SLOT="0"
 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 @@ DEPEND="${RDEPEND}
 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 @@ src_configure() {
 		$(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 @@ src_compile() {
 	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 @@ 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
+	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