diff options
| author |   Ingmar Vanhassel <ingmar@gentoo.org> | 2008-03-05 23:50:47 +0000 |
|---|---|---|
| committer | Ingmar Vanhassel <ingmar@gentoo.org> | 2008-03-05 23:50:47 +0000 |
| commit | c62bc9f7734771595840514279f10edc247ab5c7 (patch) | |
| tree | f525868a151ebd5d935f86e3a715989e7ff60132 /app-crypt | |
| parent | Old. (diff) | |
| download | gentoo-2-c62bc9f7734771595840514279f10edc247ab5c7.tar.gz gentoo-2-c62bc9f7734771595840514279f10edc247ab5c7.tar.bz2 gentoo-2-c62bc9f7734771595840514279f10edc247ab5c7.zip | |
Make dependencies compatible with split Qt-4.4.0*.
(Portage version: 2.1.4.4, RepoMan options: --force)
Diffstat (limited to 'app-crypt')
| -rw-r--r-- | app-crypt/qca/ChangeLog | 5 | ||||
| -rw-r--r-- | app-crypt/qca/qca-2.0.0-r2.ebuild | 25 |
2 files changed, 17 insertions, 13 deletions
diff --git a/app-crypt/qca/ChangeLog b/app-crypt/qca/ChangeLog index ec0ec6854314..c8d448ee956c 100644 --- a/app-crypt/qca/ChangeLog +++ b/app-crypt/qca/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-crypt/qca # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca/ChangeLog,v 1.35 2008/03/01 04:58:37 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca/ChangeLog,v 1.36 2008/03/05 23:50:47 ingmar Exp $ + + 05 Mar 2008; Ingmar Vanhassel <ingmar@gentoo.org> qca-2.0.0-r2.ebuild: + Make dependencies compatible with split Qt-4.4.0*. 01 Mar 2008; Jeroen Roovers <jer@gentoo.org> qca-2.0.0-r2.ebuild: Marked ~hppa. diff --git a/app-crypt/qca/qca-2.0.0-r2.ebuild b/app-crypt/qca/qca-2.0.0-r2.ebuild index 95f9d6390e72..e2c659fdc40c 100644 --- a/app-crypt/qca/qca-2.0.0-r2.ebuild +++ b/app-crypt/qca/qca-2.0.0-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca/qca-2.0.0-r2.ebuild,v 1.6 2008/03/01 04:58:37 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca/qca-2.0.0-r2.ebuild,v 1.7 2008/03/05 23:50:47 ingmar Exp $ EAPI="1" @@ -18,20 +18,21 @@ RESTRICT="test" DEPEND=" !<app-crypt/qca-1.0-r3 - >=x11-libs/qt-4.2.0:4" + || ( x11-libs/qt-core:4 + >=x11-libs/qt-4.2.0:4 )" RDEPEND="${DEPEND}" pkg_setup() { - if use debug && ! built_with_use x11-libs/qt:4 debug; then - echo - eerror "You are trying to compile ${PN} package with USE=\"debug\"" - eerror "while qt4 is built without this particular flag." - echo - eerror "Possible solutions to this problem are:" - eerror "a) install package ${PN} without debug USE flag" - eerror "b) re-emerge qt4 with debug USE flag" - echo - die "can't emerge ${PN} with debug USE flag" + if use debug; then + if has_version "<x11-libs/qt-4.4.0_alpha1:4" && ! built_with_use x11-libs/qt:4 debug; then + eerror "You are trying to compile ${PN} with USE=\"debug\"" + eerror "while x11-libs/qt:4 is built without this particular flag." + die "Rebuild x11-libs/qt:4 with USE=\"debug\"." + elif has_version "x11-libs/qt-core:4" && ! built_with_use x11-libs/qt-core:4 debug; then + eerror "You are trying to compile ${PN} with USE=\"debug\"" + eerror "while x11-libs/qt-core:4 is built without this particular flag." + die "Rebuild x11-libs/qt-core:4 with USE=\"debug\"." + fi fi } |