diff options
| author |   Keri Harris <keri@gentoo.org> | 2006-08-06 04:14:48 +0000 |
|---|---|---|
| committer | Keri Harris <keri@gentoo.org> | 2006-08-06 04:14:48 +0000 |
| commit | 50a7f2f774c19ee7b451128f07f25bd027193729 (patch) | |
| tree | f208f0c11d051fb1bd7d1ef31e6d056656a7ebdd /dev-lang | |
| parent | Fixed building with java-strict. (diff) | |
| download | gentoo-2-50a7f2f774c19ee7b451128f07f25bd027193729.tar.gz gentoo-2-50a7f2f774c19ee7b451128f07f25bd027193729.tar.bz2 gentoo-2-50a7f2f774c19ee7b451128f07f25bd027193729.zip | |
Prefer qt4 over qt3 if both USE flags are set.
(Portage version: 2.1.1_pre4-r3)
Diffstat (limited to 'dev-lang')
| -rw-r--r-- | dev-lang/qu-prolog/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-lang/qu-prolog/qu-prolog-7.2-r1.ebuild | 8 |
2 files changed, 8 insertions, 5 deletions
diff --git a/dev-lang/qu-prolog/ChangeLog b/dev-lang/qu-prolog/ChangeLog index 1055c623bd43..bdb57bea4820 100644 --- a/dev-lang/qu-prolog/ChangeLog +++ b/dev-lang/qu-prolog/ChangeLog @@ -1,6 +1,9 @@ # 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.10 2006/06/29 08:18:51 keri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/qu-prolog/ChangeLog,v 1.11 2006/08/06 04:14:48 keri Exp $ + + 06 Aug 2006; Keri Harris <keri@gentoo.org> qu-prolog-7.2-r1.ebuild: + Prefer qt4 over qt3 if both USE flags are set. 29 Jun 2006; Keri Harris <keri@gentoo.org> qu-prolog-7.2-r1.ebuild: Specify qt4 dependency against >=qt-4.1.0. Bug #138326. 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 6b38e0a5481b..d47316d4ec34 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.4 2006/06/29 08:18:51 keri Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/qu-prolog/qu-prolog-7.2-r1.ebuild,v 1.5 2006/08/06 04:14:48 keri Exp $ inherit autotools eutils versionator @@ -43,10 +43,10 @@ src_compile() { if use qt3 || use qt4; then cd "${S}"/src/xqp - if use qt3; then - "${QTDIR}"/bin/qmake || die "qmake xqp failed" - else + if use qt4; then qmake || die "qmake xqp failed" + else + "${QTDIR}"/bin/qmake || die "qmake xqp failed" fi emake || die "emake xqp failed" fi |