diff options
| author |   Dominik Kapusta <ayoy@gentoo.org> | 2009-10-05 19:08:48 +0000 |
|---|---|---|
| committer | Dominik Kapusta <ayoy@gentoo.org> | 2009-10-05 19:08:48 +0000 |
| commit | c366e8c03471fd3afe32156596eb63d8139cad0f (patch) | |
| tree | 4936dc0cc48b9160a6fd47a862bc0974e55c2f6c /app-crypt/qca | |
| parent | Do not error out on warnings. (diff) | |
| download | gentoo-2-c366e8c03471fd3afe32156596eb63d8139cad0f.tar.gz gentoo-2-c366e8c03471fd3afe32156596eb63d8139cad0f.tar.bz2 gentoo-2-c366e8c03471fd3afe32156596eb63d8139cad0f.zip | |
Removed alternative dependency and references to Qt metapackage, converted to EAPI=2
(Portage version: 2.2_rc43/cvs/Linux x86_64)
Diffstat (limited to 'app-crypt/qca')
| -rw-r--r-- | app-crypt/qca/ChangeLog | 6 | ||||
| -rw-r--r-- | app-crypt/qca/qca-2.0.0-r2.ebuild | 30 |
2 files changed, 10 insertions, 26 deletions
diff --git a/app-crypt/qca/ChangeLog b/app-crypt/qca/ChangeLog index 6e6be09e7553..268aa54deda7 100644 --- a/app-crypt/qca/ChangeLog +++ b/app-crypt/qca/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-crypt/qca # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca/ChangeLog,v 1.75 2009/08/29 17:55:30 nixnut Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca/ChangeLog,v 1.76 2009/10/05 19:08:48 ayoy Exp $ + + 05 Oct 2009; Dominik Kapusta <ayoy@gentoo.org> qca-2.0.0-r2.ebuild: + Removed alternative dependency and references to Qt metapackage, converted + to EAPI=2 29 Aug 2009; nixnut <nixnut@gentoo.org> qca-2.0.2-r2.ebuild: ppc stable #272865 diff --git a/app-crypt/qca/qca-2.0.0-r2.ebuild b/app-crypt/qca/qca-2.0.0-r2.ebuild index 7055befe552c..808de7ea665c 100644 --- a/app-crypt/qca/qca-2.0.0-r2.ebuild +++ b/app-crypt/qca/qca-2.0.0-r2.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2009 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.18 2009/04/26 15:32:25 yngwin Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca/qca-2.0.0-r2.ebuild,v 1.19 2009/10/05 19:08:48 ayoy Exp $ -EAPI="1" +EAPI="2" inherit eutils multilib qt4 @@ -17,31 +17,12 @@ IUSE="debug doc examples" RESTRICT="test" DEPEND="!<app-crypt/qca-1.0-r3 - x11-libs/qt-core:4" + x11-libs/qt-core:4[debug?]" RDEPEND="${DEPEND}" -pkg_setup() { - 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 -} - -src_unpack() { - unpack ${A} - cd "${S}" - - epatch "${FILESDIR}/${P}-debug-same-pkgconfig-file.patch" -} +PATCHES=( "${FILESDIR}/${P}-debug-same-pkgconfig-file.patch" ) -src_compile() { +src_configure() { _libdir=$(get_libdir) local myconf if use debug; then @@ -65,7 +46,6 @@ src_compile() { || die "configure failed" eqmake4 ${PN}.pro - emake || die "emake failed" } src_install() { |