Drop old; fix correct installation and dependencies

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

5 files changed, 145 insertions, 37 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/Manifest b/dev-lang/qu-prolog/Manifest
index 5881f8f7cbb5..ce808755bdda 100644
--- a/dev-lang/qu-prolog/Manifest
+++ b/dev-lang/qu-prolog/Manifest
@@ -1,25 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX qu-prolog-9.1-cerr-ptr.patch 1379 SHA256 dd9ac54f97e84d256f044d7e2f8d5c7470d8e39ab472fd7f55c6007f996234c9 SHA512 b46bdef26c3bbdddb0ed3d463f7a75cbef644c80c78ecfe45ac1cc23771f9a70fa1217480f12f57ee2fcf28afdef1e7a6c9b23e0521c12d3cf151d0ff648f396 WHIRLPOOL 6ca724634ad4244eeba07c489640b245adef2640a919ad304d8501c9f51a2ee67aeca89de049a59b026f77e340cbbbe839d433e8d31d24cd5ba77cc9cf0b5f30
 AUX qu-prolog-9.1-cflags.patch 1089 SHA256 67b6cc6c4009b4bfd8578d5006d5d0fc1b6f7a50368ce078a4a97610a559521b SHA512 5502c6923d8f32e10fbc4dfb49ad3d34cde3e3f7fc68165b121a27c51934edd8cd963066d8cd15323a67854861f51508a5450a1a47867d857989b881a29d8ed9 WHIRLPOOL f51043fe57cc2ef83ece4cdda8dfc80ab14fef1a9a1b222c4b482d7c7a7502719d517164f87f561bd5962b58599ef0cfad60e6b6ed2d222b60b5fd3e300cc46c
 AUX qu-prolog-9.1-gcc.patch 1020 SHA256 b312300d23742dbfacbda0d09c5f8d8bdcd89a510c363db23d707e63bc5a5261 SHA512 6f7e56f060330df6863df22c409be6b8ad7deab5dd9ebd9173d33170d8eedf6367b9a624dd270d46dc45c1699c6c37c218093494cdba9559dab795d8da6f15d5 WHIRLPOOL ca2cbd6ce428731da1e74875337386c66a4238251e9da3f204c3c00e339354fea0c97d728541118da19c3534908ee73051236b52b90902556a7d04c1b4c06584
 AUX qu-prolog-9.1-portage.patch 910 SHA256 d1565bd511cec886a6858db156957388029854c28338bb3d76e494e0ef9c5a95 SHA512 90ab22c9a75254b4370905cf64cebdcb64f7130c2edc07cf3c79562352a9d07e839b24ebbca623587b22ab1cb19b97ae62bc2f5f068ef6380ac2cfc45ec29b8e WHIRLPOOL 4f59b3b3d6394b7645d13f8e9582a6f07ab85e71f2afa2b8bcdd50a0cafc9895c026a7803e6ded82fc31b7fd17aaeefd846b987b718c5e71a51f633f69b8fb84
 DIST qp9.1.tar.gz 1460679 SHA256 1f3052f2700d537b33207943a3ade48b2b3aa5cd01cafc0475bcf26c645bc9af SHA512 44590be9d1ecec97fa6c82b657e9ecc3778f833644055ee87c9a6a36996663d139ffd7b583d72f8ac317648e0f22ccbc2a1da9c3a5eabd23381c668e5d073cbb WHIRLPOOL 37ec4e25c2284b267f72c016b4ea1e542d735c9da5f6532d1f6b439af2b91422ddc251d31e1a17b6366ee6af0e754acdbf8a0c44ef03f46a2515f14b1259b732
-EBUILD qu-prolog-9.1.ebuild 2264 SHA256 1ff10050ed643d335d2beb5cec94df7c84146d55b2ed8fa7fcc8ce2667625ddf SHA512 41c812e118015b215ff6611cd317ac0009b524d3d8159b6ddbd97c5fe7a0126679301fe231d01b57ff1065a4356125aa92482f7f7273d3dc89addd9c472ba133 WHIRLPOOL 944589c16549d382e8a4b40802c0b039b6ad7a981fe4883dbccdfbcc0e29cb25369a05529021aa028ba4144aeec603c0cc0d07f1d27b7726658456f5b5f60af9
-MISC ChangeLog 14185 SHA256 2d1a14da6abdbba4bf0c3028aa5622656e6b14148926fcef92d75c445de619b3 SHA512 5f52d28ee5f3c4e3fd4aa5146af1417c78f09bf44ffcc654dc0324c837f034e2810abafa14db22982ae0e0f3188360151ffa71f5b3ef0f4636c05040ecb3009d WHIRLPOOL 495a1014846684f104755124668732e01c9cd9501a814e3e3613caa2098f7528c375d801ead05339132dc98208f467e07c714f53bf94f70548307c8ccbd0f5da
-MISC metadata.xml 253 SHA256 6d9eecc1943fb38e5b6a96bb4d1242df633c2f1b890f7f1e701f824e720435d9 SHA512 d7fd9d12a368afdd039561e4e43edf3078f34dec69144ee3b719491d8663552a30bb741ed9cd8f61e9eb972b2a1fd6e83bb8f121ace3e8c879033e9dace511ba WHIRLPOOL 74fea777976137aaecfc7973806280e54af03e81d3bc6fa188109dbf1894da116fd95568c9ea97bbf8a4a9b958295da9e8931d18335283b0cb02bbc5ac6ed6e0
+EBUILD qu-prolog-9.1-r1.ebuild 2034 SHA256 28aa645b459a006d124b0da0288543f23c3739311db7eccbfccb5b3ead2e23f2 SHA512 3b46e8018c8b591a4d6c4ebb1efe36bacd833ea62bfd3e51fa30209ee0b931b7abde367ce52ab47cfbd1c3eef524fa30e7baa0a0a1870b3863c4fb231bdaade9 WHIRLPOOL adcfe114b058054909e0833cdcae34cc782d333b513f60b4e8167cc7fe44627c30b973305e6e40b727fb8c4baf5745cc78f35cd0f233823e6829543ed9d9ecc4
+EBUILD qu-prolog-9.1.ebuild 2253 SHA256 d88f0fa5eaae88db2699693b5514077ef39c0521f1a61e2cdade1033ed8442d9 SHA512 a2c283b6c8758d910c9f69de8c0dcda43e6189d7f954d15128820553ed57d007b15bccbf1f5e70431d03477264ba0afe41127b3bab759ab63dd4014767085993 WHIRLPOOL b75a026bb57e5c035795da16dd59f050c71523d283dd2dd3bc2ee26a17db6568113de3d9c7a823278aef52868ebb33b944f5a33a8c17ad07588c9a8d2d496390
+MISC ChangeLog 14385 SHA256 a8fda08ae9df06ea5d20b2c4702d24f75c0fa2dbaa3aab49073aa39dfafde6e9 SHA512 3b97afab957d894bdf279084a991d6bc2ff0df20c8fd06639abbf7186d41238ff3849e1b789275ab268b663b4fdd909972454631c8a2f1fdf07aa6244c0c4df0 WHIRLPOOL 2f1ef5f031bcf4a299ce0b758654a3110dbe42fe472b1d2489f91827f67a1c9727142e88f9b1887ad794f81afb41538d5b26a3b421d656c488e6ae0ced897c45
+MISC metadata.xml 262 SHA256 292db744c616fc2047b29d45bab0a09dfb6d39f280a9b7ea429c54b26e92e730 SHA512 8913873ab1c84c8b43706ed79799d4a085cfc880ccd01f43ae860d710df8a43c2333f8c387ee01bb04c00b1600c967c2b5076ba5c8f791cf0c264307db513f2f WHIRLPOOL 6fd16a153fe303c098065ad231e4b502b5f9b8ee878dd1c6e12c47c53a0b5bf6b42dd4ec3f6353cba733bf4a6a1626906b39f8ba74a15b5040fb64b3c224ba1e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0
 
-iQGcBAEBCAAGBQJRaI6kAAoJEJQzkH1pP7W4h+gL/A5LzBU0ky9PrbR1rNQQxgC8
-2xgJp/wVPDsoK4FAaS0maETUPjvfA+WtwGholTN9C1pv7sR27K0LgKY2y1SJthLe
-S23R34xuc0svuihW9iuQ6fQqPYI3/PeZ6pTSXo/MAzbUnorXQdnSlbyK14KaXeZ/
-/ZsPYv8vACIRC1Hx/2JwEpp+O/yp2hi0ni9A45RpVlkOb+CMvmxCVnXGJMKRW0Ie
-uL72/aEsk33DfOyrYDjgF82aXPyCQyAHETYYX8JuRl5LD5NmhDDcsDlnvMlss9Nr
-ZFtWXn5txdMysEaux8xPMtF4voE/nXWSoo8Vj5F9jI4NCm3h/bRlVy46Sb7Fkl5Z
-EhD5pS28cI5WvX2kTN/MEqS9EmwB9MoiQA0AjVkbBdTsb/K2+kHh4q4iBoCFFEvf
-cnJjmjDnC4XrYA9XO74VN9oubK+YFBN933IMjJLECZG7KCZFf1m77hcqTaTbO84s
-cjGw8HLpGgmvSIeBZThhWenllpk3Mj8dXYtD5LJBrA==
-=hUbe
+iQJ8BAEBCgBmBQJVDY5zXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirtWwP/1eg44A4GX7NucldGZcWuCN1
+5brZG2TZsqL8ckgoUo9jWmHN96huKRjKp6wdLrlgEIh6EkXtTMFozOi34mfUijPd
+Zt/LTV6xEANYjAn53Gt9U5f/AasbQTRL8tkOczmHMuLVmyYoVG4bNFr44kIj/qZa
+tivtJeICEIeIoHxqoJhyLxNEHb3Bo0J/sDUB03FE7D+SGD8fL68U0UGwlMYgsRnd
+Hh/90CBKJZue441jH3iLEqlcrWLfIXR7lcBTjwCIA02MYEr8b3hxXpHwAwFwQFpE
+S0PDY6x5IlLOO1FKe7sMeoOnkJZlSfpvJYE4a7vbJqv8/L9l9++czbsnuI7eB7Mh
+HUIYubpaity/2kCdOlf8akoh9CWq0TDHg7wB2wISZUmjiUSDtYYHhRrLJIkI1Dju
+lhS+1Yg2vcwuAwfzPNTA12YHnCS9k8Q3TnoTZPzvwdLu78oSEpBoy3eMvMKce9cJ
+R35/WLuVpv5nbsxeKnIxnysslrV2/WmuPuirwoncCmEukxSxElfEg6N+uRtevP9b
+BfKckSrkImfJ2GsboaFJwnZwYYhyoqFc6j8NhAekNEjBGCIOMA6raqKgL/iM4L52
+bgWKpxmduMLH3o7VXXkPNxAOGI+4+aBcReviRwq8YaBmsHJFkadOiagIisCfghEQ
+0ImfjUELd2+UbRZIJEqS
+=mfL1
 -----END PGP SIGNATURE-----
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