USE flag qt->qt3/qt4 change. Bug #137785.

(Portage version: 2.1.1_pre1-r2)

4 files changed, 27 insertions, 28 deletions

diff --git a/dev-lang/qu-prolog/ChangeLog b/dev-lang/qu-prolog/ChangeLog
index 74ecac715d47..7a4a28258f21 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-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/qu-prolog/ChangeLog,v 1.8 2006/05/27 08:05:28 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/qu-prolog/ChangeLog,v 1.9 2006/06/25 10:34:25 keri Exp $
+
+  25 Jun 2006; Keri Harris <keri@gentoo.org> qu-prolog-7.1.ebuild,
+  qu-prolog-7.2.ebuild, qu-prolog-7.2-r1.ebuild:
+  USE flag qt->qt3/qt4 change. Bug #137785.
 
   27 May 2006; Keri Harris <keri@gentoo.org>
   +files/qu-prolog-7.2-configure.patch, +files/qu-prolog-7.2-qt4.patch,
diff --git a/dev-lang/qu-prolog/qu-prolog-7.1.ebuild b/dev-lang/qu-prolog/qu-prolog-7.1.ebuild
index 1e06ba31462f..20875516b4d8 100644
--- a/dev-lang/qu-prolog/qu-prolog-7.1.ebuild
+++ b/dev-lang/qu-prolog/qu-prolog-7.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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.1.ebuild,v 1.5 2006/05/26 09:49:36 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/qu-prolog/qu-prolog-7.1.ebuild,v 1.6 2006/06/25 10:34:25 keri Exp $
 
 inherit eutils flag-o-matic
 
@@ -13,9 +13,9 @@ SRC_URI="http://www.itee.uq.edu.au/~pjr/HomePages/QPFiles/${MY_P}.tar.gz"
 LICENSE="as-is"
 SLOT="0"
 KEYWORDS="~ppc ~x86"
-IUSE="doc qt threads"
+IUSE="doc qt3 threads"
 
-DEPEND="qt? ( =x11-libs/qt-3* )"
+DEPEND="qt3? ( =x11-libs/qt-3* )"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -37,7 +37,7 @@ src_compile() {
 		|| die "econf failed"
 	emake || die "emake failed"
 
-	if use qt ; then
+	if use qt3 ; then
 		cd "${S}"/src/xqp
 		"${QTDIR}"/bin/qmake || die "qmake xqp failed"
 		emake || die "emake xqp failed"
@@ -49,7 +49,7 @@ src_install() {
 	doexe src/qa src/qdeal src/qem src/ql
 	doexe bin/qc bin/qecat bin/qp bin/qppp
 
-	use qt && doexe src/xqp/xqp
+	use qt3 && doexe src/xqp/xqp
 
 	insinto /usr/lib/${PN}/bin
 	doins prolog/qc1/qc1.qx \
diff --git a/dev-lang/qu-prolog/qu-prolog-7.2-r1.ebuild b/dev-lang/qu-prolog/qu-prolog-7.2-r1.ebuild
index 18b91e5d9c6e..1ca4b01700c6 100644
--- a/dev-lang/qu-prolog/qu-prolog-7.2-r1.ebuild
+++ b/dev-lang/qu-prolog/qu-prolog-7.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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.2-r1.ebuild,v 1.2 2006/05/27 08:05:28 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/qu-prolog/qu-prolog-7.2-r1.ebuild,v 1.3 2006/06/25 10:34:25 keri Exp $
 
 inherit autotools eutils versionator
 
@@ -13,19 +13,13 @@ SRC_URI="http://www.itee.uq.edu.au/~pjr/HomePages/QPFiles/${MY_P}.tar.gz"
 LICENSE="as-is"
 SLOT="0"
 KEYWORDS="~ppc ~x86"
-IUSE="debug doc qt threads"
+IUSE="debug doc qt3 qt4 threads"
 
-DEPEND="qt? ( x11-libs/qt )"
+DEPEND="qt3? ( =x11-libs/qt-3* )
+	qt4? ( >=x11-libs/qt-4* )"
 
 S="${WORKDIR}"/${MY_P}
 
-get_qt_ver() {
-	qt_ver="$(best_version x11-libs/qt)"
-	qt_ver=${qt_ver//*qt-}
-	qt_ver=${qt_ver//-*}
-	qt_ver=$(get_major_version ${qt_ver})
-}
-
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
@@ -34,8 +28,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-gcc4.patch
 	epatch "${FILESDIR}"/${P}-debug.patch
 
-	get_qt_ver
-	[[ ${qt_ver} -eq 4 ]] && epatch "${FILESDIR}"/${P}-qt4.patch
+	use qt4 && epatch "${FILESDIR}"/${P}-qt4.patch
 }
 
 src_compile() {
@@ -48,12 +41,12 @@ src_compile() {
 		|| die "econf failed"
 	emake || die "emake failed"
 
-	if use qt ; then
+	if use qt3 || use qt4; then
 		cd "${S}"/src/xqp
-		if [ ${qt_ver} -eq 4 ] ; then \
-			qmake || die "qmake xqp failed"
-		else
+		if use qt3; then
 			"${QTDIR}"/bin/qmake || die "qmake xqp failed"
+		else
+			qmake || die "qmake xqp failed"
 		fi
 		emake || die "emake xqp failed"
 	fi
@@ -64,7 +57,9 @@ src_install() {
 	doexe src/qa src/qdeal src/qem src/ql
 	doexe bin/qc bin/qecat bin/qp bin/qppp
 
-	use qt && doexe src/xqp/xqp
+	if use qt3 || use qt4; then
+		doexe src/xqp/xqp
+	fi
 
 	insinto /usr/lib/${PN}/bin
 	doins prolog/qc1/qc1.qx \
diff --git a/dev-lang/qu-prolog/qu-prolog-7.2.ebuild b/dev-lang/qu-prolog/qu-prolog-7.2.ebuild
index accb8a540f16..c664a701e26e 100644
--- a/dev-lang/qu-prolog/qu-prolog-7.2.ebuild
+++ b/dev-lang/qu-prolog/qu-prolog-7.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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.2.ebuild,v 1.2 2006/05/26 09:49:36 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/qu-prolog/qu-prolog-7.2.ebuild,v 1.3 2006/06/25 10:34:25 keri Exp $
 
 inherit eutils flag-o-matic
 
@@ -13,9 +13,9 @@ SRC_URI="http://www.itee.uq.edu.au/~pjr/HomePages/QPFiles/${MY_P}.tar.gz"
 LICENSE="as-is"
 SLOT="0"
 KEYWORDS="~ppc ~x86"
-IUSE="doc qt threads"
+IUSE="doc qt3 threads"
 
-DEPEND="qt? ( =x11-libs/qt-3* )"
+DEPEND="qt3? ( =x11-libs/qt-3* )"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -37,7 +37,7 @@ src_compile() {
 		|| die "econf failed"
 	emake || die "emake failed"
 
-	if use qt ; then
+	if use qt3 ; then
 		cd "${S}"/src/xqp
 		"${QTDIR}"/bin/qmake || die "qmake xqp failed"
 		emake || die "emake xqp failed"
@@ -49,7 +49,7 @@ src_install() {
 	doexe src/qa src/qdeal src/qem src/ql
 	doexe bin/qc bin/qecat bin/qp bin/qppp
 
-	use qt && doexe src/xqp/xqp
+	use qt3 && doexe src/xqp/xqp
 
 	insinto /usr/lib/${PN}/bin
 	doins prolog/qc1/qc1.qx \