Migrate to EAPI 2 in order to nuke built_with_use.

(Portage version: 2.2_rc38/cvs/Linux i686)

2 files changed, 18 insertions, 23 deletions

diff --git a/app-crypt/qca-pkcs11/ChangeLog b/app-crypt/qca-pkcs11/ChangeLog
index b1f80a4458fb..c15a00f75401 100644
--- a/app-crypt/qca-pkcs11/ChangeLog
+++ b/app-crypt/qca-pkcs11/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-crypt/qca-pkcs11
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca-pkcs11/ChangeLog,v 1.5 2009/07/24 17:38:20 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca-pkcs11/ChangeLog,v 1.6 2009/08/19 13:55:19 betelgeuse Exp $
+
+  19 Aug 2009; Petteri Räty <betelgeuse@gentoo.org>
+  qca-pkcs11-2.0.0_beta2.ebuild:
+  Migrate to EAPI 2 in order to nuke built_with_use.
 
   24 Jul 2009; Samuli Suominen <ssuominen@gentoo.org>
   qca-pkcs11-2.0.0_beta2.ebuild, +files/qca-pkcs11-2.0.0_beta2-gcc44.patch:
@@ -28,6 +32,8 @@
   -qca-pkcs11-2.0.0_beta1.ebuild, +qca-pkcs11-2.0.0_beta2.ebuild:
   Added qca-pkcs11-2.0.0_beta2.ebuild.
 
+*qca-pkcs11-2.0.0_beta1 (06 Nov 2007)
+
   06 Nov 2007; Ingmar Vanhassel <ingmar.vanhassel@gmail.com>
   -qca-pkcs11-0.1_p20070829-r1.ebuild, +qca-pkcs11-2.0.0_beta1.ebuild:
   Added qca-pkcs11-2.0.0_beta1.ebuild, thanks to Davide Pesavento in Bug 129536.
@@ -37,11 +43,15 @@
   Minor changes, thanks to Davide Pesavento. See bug #129536.
   Removed '-r0' ebuild.
 
+*qca-pkcs11-0.1_p20070829-r1 (10 Sep 2007):
+
   10 Sep 2007; Emanuele A. Bagnaschi <zephyrus@mirach.it>
   +qca-pkcs11-0.1_p20070829-r1.ebuild:
   Updated to reflect change about the behaviour of debug builds.
   Thanks to Davide Pesavento.
 
+*qca-pkcs11-0.1_p20070829 (07 Sep 2007):
+
   07 Sep 2007; Emanuele A. Bagnaschi <zephyrus@mirach.it>
   +qca-pkcs11-0.1_p20070829.ebuild:
   Added qca-pkcs11-0.1_p20070829. Moving to a more sane qca2 framework. Many
diff --git a/app-crypt/qca-pkcs11/qca-pkcs11-2.0.0_beta2.ebuild b/app-crypt/qca-pkcs11/qca-pkcs11-2.0.0_beta2.ebuild
index 2d9076fbaf0e..8a9f36b0cfd4 100644
--- a/app-crypt/qca-pkcs11/qca-pkcs11-2.0.0_beta2.ebuild
+++ b/app-crypt/qca-pkcs11/qca-pkcs11-2.0.0_beta2.ebuild
@@ -1,6 +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-pkcs11/qca-pkcs11-2.0.0_beta2.ebuild,v 1.5 2009/07/24 17:38:20 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca-pkcs11/qca-pkcs11-2.0.0_beta2.ebuild,v 1.6 2009/08/19 13:55:19 betelgeuse Exp $
+
+EAPI="2"
 
 inherit eutils qt4
 
@@ -16,33 +18,17 @@ SLOT="2"
 KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd"
 IUSE="debug"
 
-DEPEND=">=app-crypt/qca-${QCA_VER}
+DEPEND=">=app-crypt/qca-${QCA_VER}[debug?]
 	>=dev-libs/pkcs11-helper-1.02"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
-pkg_setup() {
-	if use debug && ! built_with_use ">=app-crypt/qca-${QCA_VER}" debug; then
-		echo
-		eerror "You are trying to compile ${PN} with USE=\"debug\""
-		eerror "while qca is built without this flag. It will not work."
-		echo
-		eerror "Possible solutions to this problem are:"
-		eerror "a) install ${PN} without debug USE flag"
-		eerror "b) re-emerge qca with debug USE flag"
-		echo
-		die "can't emerge ${PN} with debug USE flag"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	epatch "${FILESDIR}"/${P}-gcc44.patch
 }
 
-src_compile() {
+src_configure() {
 	# cannot use econf because of non-standard configure script
 	./configure \
 		--qtdir=/usr \
@@ -51,10 +37,9 @@ src_compile() {
 		|| die "configure failed"
 
 	eqmake4 ${PN}.pro
-	emake || die "make failed"
 }
 
 src_install() {
 	emake INSTALL_ROOT="${D}" install || die "make install failed"
-	dodoc README
+	dodoc README || die
 }