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 | d6530f19e872fc3cd3a1dc919276be95c3ddcdb6 (patch) | |
| tree | cd298275071241d738cd6801d047f8451bfe466e /dev-lang | |
| parent | Added missing dependency jar that was brought in by /usr/bin/ant, in order to... (diff) | |
| download | historical-d6530f19e872fc3cd3a1dc919276be95c3ddcdb6.tar.gz historical-d6530f19e872fc3cd3a1dc919276be95c3ddcdb6.tar.bz2 historical-d6530f19e872fc3cd3a1dc919276be95c3ddcdb6.zip | |
Prefer qt4 over qt3 if both USE flags are set.
Package-Manager: portage-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/Manifest | 16 | ||||
| -rw-r--r-- | dev-lang/qu-prolog/qu-prolog-7.2-r1.ebuild | 8 |
3 files changed, 16 insertions, 13 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/Manifest b/dev-lang/qu-prolog/Manifest index ead3f57e6858..52c71df23be5 100644 --- a/dev-lang/qu-prolog/Manifest +++ b/dev-lang/qu-prolog/Manifest @@ -40,18 +40,18 @@ EBUILD qu-prolog-7.1.ebuild 1745 RMD160 bb605a8ba2517b46c2ee094d4b254685a04ccf23 MD5 f868fbec2f43fcfe6aa150b849b17a3c qu-prolog-7.1.ebuild 1745 RMD160 bb605a8ba2517b46c2ee094d4b254685a04ccf23 qu-prolog-7.1.ebuild 1745 SHA256 f8ee194b27b848341e981c81227db66781bd78c1d74979a5f043a828f9d4d752 qu-prolog-7.1.ebuild 1745 -EBUILD qu-prolog-7.2-r1.ebuild 1978 RMD160 b80a232a8b5d7da71e183f1783f8bb83f3987817 SHA1 7edfe246e97d7253775ff6c2c526169bf538f79a SHA256 7efff5e9901f2d43ba7b23da3b89a2874fb8880a3d146e7dc363db5d8ea7530b -MD5 efbc061ef95adce71b069499d62850c5 qu-prolog-7.2-r1.ebuild 1978 -RMD160 b80a232a8b5d7da71e183f1783f8bb83f3987817 qu-prolog-7.2-r1.ebuild 1978 -SHA256 7efff5e9901f2d43ba7b23da3b89a2874fb8880a3d146e7dc363db5d8ea7530b qu-prolog-7.2-r1.ebuild 1978 +EBUILD qu-prolog-7.2-r1.ebuild 1978 RMD160 1eebd5eab1caa888a46af226449eec30a1a21482 SHA1 143fb7bb130ac790186648003e4fc56397e0ccf5 SHA256 8d0e6207003d4ec07a2d3aabf2fb5001a67e152a1be4b7b70dd7e5e2fb42e669 +MD5 160eea31628974a52e3bb9822dfcfc7b qu-prolog-7.2-r1.ebuild 1978 +RMD160 1eebd5eab1caa888a46af226449eec30a1a21482 qu-prolog-7.2-r1.ebuild 1978 +SHA256 8d0e6207003d4ec07a2d3aabf2fb5001a67e152a1be4b7b70dd7e5e2fb42e669 qu-prolog-7.2-r1.ebuild 1978 EBUILD qu-prolog-7.2.ebuild 1745 RMD160 6ebf4318d70f0e0b9df829903846754727709332 SHA1 2cbfc64b4d76a975f0c0c2438a450b6438eb3d1c SHA256 9bfcd2d7baa88108cba273fa50e9a8a34eda5636221aff547c458aa485420133 MD5 e35a726fb7f1bbb9557e03bb7445de8a qu-prolog-7.2.ebuild 1745 RMD160 6ebf4318d70f0e0b9df829903846754727709332 qu-prolog-7.2.ebuild 1745 SHA256 9bfcd2d7baa88108cba273fa50e9a8a34eda5636221aff547c458aa485420133 qu-prolog-7.2.ebuild 1745 -MISC ChangeLog 1717 RMD160 4f35e06b52cdf2ddd992d22c7bd07ba2120fd485 SHA1 9b4b6da2302046a9eabad1ab1a96f70638c2d0ef SHA256 250bec64eb5ac3b82d04ce58b31cde7a887be5be36adc1becd9c96b3d86cef9d -MD5 10d2bc179eb389ee2c4c75b775e5286b ChangeLog 1717 -RMD160 4f35e06b52cdf2ddd992d22c7bd07ba2120fd485 ChangeLog 1717 -SHA256 250bec64eb5ac3b82d04ce58b31cde7a887be5be36adc1becd9c96b3d86cef9d ChangeLog 1717 +MISC ChangeLog 1837 RMD160 1d7324ce4411082e650944cf7258b8231e2048f0 SHA1 a37bab81069ddd14811576fa998019498b3d2488 SHA256 f8a4a7032032f803b814901165b0558404259d9197b1b8bf2c5918a29685f927 +MD5 3ac2e4737836d2d6b4cb2c8518fd372c ChangeLog 1837 +RMD160 1d7324ce4411082e650944cf7258b8231e2048f0 ChangeLog 1837 +SHA256 f8a4a7032032f803b814901165b0558404259d9197b1b8bf2c5918a29685f927 ChangeLog 1837 MISC metadata.xml 159 RMD160 38d27fd1c5faabedefa5507dfd83cb4c952fbc8c SHA1 52b92682cf41e53e71bf432537a16215bd9546b1 SHA256 851bf218a4283a1d8ea6ef98af0119a40eaa78bfaaec49c2f3440437f52889ba MD5 9187f53634e60ab7eb2ac7e98b0b19f7 metadata.xml 159 RMD160 38d27fd1c5faabedefa5507dfd83cb4c952fbc8c metadata.xml 159 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 |