From: Keri Harris <keri@gentoo.org>
Date: Tue, 13 Mar 2007 07:31:20 +0000 (+0000)
Subject: Add xqp qt4 port than does not depend upon qt3support libraries. Closes #170402
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b842d6d803c3759aea77e7571fd561c0da22e1be;p=gentoo.git

Add xqp qt4 port than does not depend upon qt3support libraries. Closes #170402
Package-Manager: portage-2.1.2-r12
---

diff --git a/dev-lang/qu-prolog/ChangeLog b/dev-lang/qu-prolog/ChangeLog
index 80f62df49baa..30ad44e3c522 100644
--- a/dev-lang/qu-prolog/ChangeLog
+++ b/dev-lang/qu-prolog/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/qu-prolog
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/qu-prolog/ChangeLog,v 1.26 2007/03/06 06:52:17 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/qu-prolog/ChangeLog,v 1.27 2007/03/13 07:31:20 keri Exp $
+
+  13 Mar 2007; keri <keri@gentoo.org> qu-prolog-7.4-r1.ebuild:
+  Add xqp qt4 port than does not depend upon qt3support libraries. Closes
+  #170402 reported by Alejandro Dubrovsky.
 
 *qu-prolog-7.4-r1 (06 Mar 2007)
 
diff --git a/dev-lang/qu-prolog/Manifest b/dev-lang/qu-prolog/Manifest
index 6dc6fc056f06..12647783631b 100644
--- a/dev-lang/qu-prolog/Manifest
+++ b/dev-lang/qu-prolog/Manifest
@@ -19,18 +19,19 @@ MD5 05aa28061bd66f1d7c65504f78fe3043 files/qu-prolog-7.4-qt4.patch 10548
 RMD160 68741725964290fd00b77d4647847b1309c062bc files/qu-prolog-7.4-qt4.patch 10548
 SHA256 0c276d09c0e35b99f6ae9a365baf187ba0f05b7863f4fd6f0472d31e9d43af17 files/qu-prolog-7.4-qt4.patch 10548
 DIST qp7.4.tar.gz 1262813 RMD160 8be3c953d6f74878366183b99f84dbcb089c6e08 SHA1 a1a938088dd214e12585abc290ffedd49d7bcd56 SHA256 301b8a3344f4286c2800a13753f2a2d9e73bd3ce58c8a1211bcede365dc96de1
-EBUILD qu-prolog-7.4-r1.ebuild 2019 RMD160 3fd33ae3ca7919aba7bcf538bd65f2d7aba983db SHA1 0f98e75757534a6a64ee44287612dc79d22e3500 SHA256 71dc455a480afef1a265a15da52fe77727efca370f3a7316e68a6e089fd3f58a
-MD5 0941ec92c36a4f7414b290ba4d78c500 qu-prolog-7.4-r1.ebuild 2019
-RMD160 3fd33ae3ca7919aba7bcf538bd65f2d7aba983db qu-prolog-7.4-r1.ebuild 2019
-SHA256 71dc455a480afef1a265a15da52fe77727efca370f3a7316e68a6e089fd3f58a qu-prolog-7.4-r1.ebuild 2019
+DIST qu-prolog-7.4-xqp-qt4.tar.gz 8501 RMD160 ad444fd47e17af10c104129f217b8a30ff568739 SHA1 738ee651fc703563e871a21c9ae5ecc327dc0738 SHA256 be3d9d8b113032eed16bf136b82df20a7d3024a5125918758fd8bfe5fe76669a
+EBUILD qu-prolog-7.4-r1.ebuild 2051 RMD160 157b1606c2630e40690f7315c6aced022f329ef0 SHA1 7a2c9f2d62533b0116d95100573185db3434ebbf SHA256 50a5146a0f4a43c63465a1b73a0a6b348ede836a0e214fb10e66bd747c57d2b8
+MD5 f4dc07e0c2a07dc53fa71cf25dff5af7 qu-prolog-7.4-r1.ebuild 2051
+RMD160 157b1606c2630e40690f7315c6aced022f329ef0 qu-prolog-7.4-r1.ebuild 2051
+SHA256 50a5146a0f4a43c63465a1b73a0a6b348ede836a0e214fb10e66bd747c57d2b8 qu-prolog-7.4-r1.ebuild 2051
 EBUILD qu-prolog-7.4.ebuild 1927 RMD160 7d291813c5caa58cb30af89d80871bbd1128cc09 SHA1 4d2d3bdae2b60aa081c51b0986b77e960322e282 SHA256 69f57f03e987245079eb9c3b0dd1adc3f27c990cc6469a66953255c7c9aa33f6
 MD5 93221fc7ab92e7c8bb45ca052186f456 qu-prolog-7.4.ebuild 1927
 RMD160 7d291813c5caa58cb30af89d80871bbd1128cc09 qu-prolog-7.4.ebuild 1927
 SHA256 69f57f03e987245079eb9c3b0dd1adc3f27c990cc6469a66953255c7c9aa33f6 qu-prolog-7.4.ebuild 1927
-MISC ChangeLog 4197 RMD160 ad10a90c5fd92d9f186edd47fba40fcab2a06d5e SHA1 6531b12eb667a777d1a094e2f7c88fa4fb576d28 SHA256 efa8cfd4e1d7b485f9003e0bde2e953193f980a1be1d05b6715b3442560f71f5
-MD5 97d8c1e9cae8f911f18149f0dff79a2f ChangeLog 4197
-RMD160 ad10a90c5fd92d9f186edd47fba40fcab2a06d5e ChangeLog 4197
-SHA256 efa8cfd4e1d7b485f9003e0bde2e953193f980a1be1d05b6715b3442560f71f5 ChangeLog 4197
+MISC ChangeLog 4378 RMD160 4c0fad2695222ba1f6e637095f7bbe7275766241 SHA1 b299d5bbcc3149826bd3d3b2d95390ebadada593 SHA256 e87c1b48852f06745da72403d994a259447bfdff307b230457621cbd5addc2e9
+MD5 412ae2300197d9069862aa889b5a3020 ChangeLog 4378
+RMD160 4c0fad2695222ba1f6e637095f7bbe7275766241 ChangeLog 4378
+SHA256 e87c1b48852f06745da72403d994a259447bfdff307b230457621cbd5addc2e9 ChangeLog 4378
 MISC metadata.xml 159 RMD160 38d27fd1c5faabedefa5507dfd83cb4c952fbc8c SHA1 52b92682cf41e53e71bf432537a16215bd9546b1 SHA256 851bf218a4283a1d8ea6ef98af0119a40eaa78bfaaec49c2f3440437f52889ba
 MD5 9187f53634e60ab7eb2ac7e98b0b19f7 metadata.xml 159
 RMD160 38d27fd1c5faabedefa5507dfd83cb4c952fbc8c metadata.xml 159
@@ -38,6 +39,6 @@ SHA256 851bf218a4283a1d8ea6ef98af0119a40eaa78bfaaec49c2f3440437f52889ba metadata
 MD5 5d252b31b22ced55e2a09a6ff7148c56 files/digest-qu-prolog-7.4 220
 RMD160 ebeea75dc182124bf7ce9cdc62011ef4ed11e933 files/digest-qu-prolog-7.4 220
 SHA256 c923bbcb6bc537844857b9e88104561b8250c222b44173a611720266e050533f files/digest-qu-prolog-7.4 220
-MD5 5d252b31b22ced55e2a09a6ff7148c56 files/digest-qu-prolog-7.4-r1 220
-RMD160 ebeea75dc182124bf7ce9cdc62011ef4ed11e933 files/digest-qu-prolog-7.4-r1 220
-SHA256 c923bbcb6bc537844857b9e88104561b8250c222b44173a611720266e050533f files/digest-qu-prolog-7.4-r1 220
+MD5 2782eeb54ed9ddcfae92ac2d54144cf1 files/digest-qu-prolog-7.4-r1 479
+RMD160 deaa12cf73458f5a960d522464b1476e2af47121 files/digest-qu-prolog-7.4-r1 479
+SHA256 0ea23315ff26e7c422089daf3dfad61de39a8a3fb7ce07562074e76b1f79ddc2 files/digest-qu-prolog-7.4-r1 479
diff --git a/dev-lang/qu-prolog/files/digest-qu-prolog-7.4-r1 b/dev-lang/qu-prolog/files/digest-qu-prolog-7.4-r1
index 359750c8742b..5cf56e289f77 100644
--- a/dev-lang/qu-prolog/files/digest-qu-prolog-7.4-r1
+++ b/dev-lang/qu-prolog/files/digest-qu-prolog-7.4-r1
@@ -1,3 +1,6 @@
 MD5 379990ae86485a3b8b4a5233bc1fd0c1 qp7.4.tar.gz 1262813
 RMD160 8be3c953d6f74878366183b99f84dbcb089c6e08 qp7.4.tar.gz 1262813
 SHA256 301b8a3344f4286c2800a13753f2a2d9e73bd3ce58c8a1211bcede365dc96de1 qp7.4.tar.gz 1262813
+MD5 05d2c2b22c7c1490e53279a4e3f5fee7 qu-prolog-7.4-xqp-qt4.tar.gz 8501
+RMD160 ad444fd47e17af10c104129f217b8a30ff568739 qu-prolog-7.4-xqp-qt4.tar.gz 8501
+SHA256 be3d9d8b113032eed16bf136b82df20a7d3024a5125918758fd8bfe5fe76669a qu-prolog-7.4-xqp-qt4.tar.gz 8501
diff --git a/dev-lang/qu-prolog/qu-prolog-7.4-r1.ebuild b/dev-lang/qu-prolog/qu-prolog-7.4-r1.ebuild
index 3d923c640ce6..43bee746bdfd 100644
--- a/dev-lang/qu-prolog/qu-prolog-7.4-r1.ebuild
+++ b/dev-lang/qu-prolog/qu-prolog-7.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/qu-prolog/qu-prolog-7.4-r1.ebuild,v 1.1 2007/03/06 06:52:17 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/qu-prolog/qu-prolog-7.4-r1.ebuild,v 1.2 2007/03/13 07:31:20 keri Exp $
 
 inherit eutils
 
@@ -8,7 +8,8 @@ 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"
+SRC_URI="http://www.itee.uq.edu.au/~pjr/HomePages/QPFiles/${MY_P}.tar.gz
+	qt4? ( mirror://gentoo/qu-prolog-7.4-xqp-qt4.tar.gz )"
 
 LICENSE="as-is"
 SLOT="0"
@@ -27,8 +28,6 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-configure.patch
 	epatch "${FILESDIR}"/${P}-gcc4.patch
 	epatch "${FILESDIR}"/${P}-debug.patch
-
-	use qt4 && epatch "${FILESDIR}"/${P}-qt4.patch
 }
 
 src_compile() {
@@ -39,10 +38,11 @@ src_compile() {
 	emake || die "emake failed"
 
 	if use qt3 || use qt4; then
-		cd "${S}"/src/xqp
 		if use qt4; then
+			cd "${S}"/src/xqp/qt4
 			qmake || die "qmake xqp failed"
 		else
+			cd "${S}"/src/xqp
 			"${QTDIR}"/bin/qmake || die "qmake xqp failed"
 		fi
 		emake || die "emake xqp failed"