Migrated to EAPI 2 in order to get rid of built_with_use.

Package-Manager: portage-2.2_rc38/cvs/Linux i686

2 files changed, 16 insertions, 19 deletions

diff --git a/app-crypt/qca-cyrus-sasl/ChangeLog b/app-crypt/qca-cyrus-sasl/ChangeLog
index 48fcf700b8cc..9dfe66d0d665 100644
--- a/app-crypt/qca-cyrus-sasl/ChangeLog
+++ b/app-crypt/qca-cyrus-sasl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-crypt/qca-cyrus-sasl
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca-cyrus-sasl/ChangeLog,v 1.8 2009/07/21 16:48:28 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca-cyrus-sasl/ChangeLog,v 1.9 2009/08/19 14:01:51 betelgeuse Exp $
+
+  19 Aug 2009; Petteri Räty <betelgeuse@gentoo.org>
+  qca-cyrus-sasl-2.0.0_beta3.ebuild:
+  Migrated to EAPI 2 in order to get rid of built_with_use.
 
   21 Jul 2009; Raúl Porcel <armin76@gentoo.org>
   qca-cyrus-sasl-2.0.0_beta3.ebuild:
@@ -40,6 +44,8 @@
   -qca-cyrus-sasl-2.0.0_beta1.ebuild, +qca-cyrus-sasl-2.0.0_beta3.ebuild:
   Added qca-cyrus-sasl-2.0.0_beta3.ebuild.
 
+*qca-cyrus-sasl-2.0.0_beta1 (06 Nov 2007)
+
   06 Nov 2007; Ingmar Vanhassel <ingmar.vanhassel@gmail.com>
   -qca-cyrus-sasl-0.1_p20070829-r1.ebuild,
   +qca-cyrus-sasl-2.0.0_beta1.ebuild:
@@ -52,11 +58,15 @@
   Minor changes to the -r1 ebuild, thanks to Davide Pesavento. See bug #129536.
   Removed qca-cyrus-sasl-0.1_p20070829 ebuild.
 
+*qca-cyrus-sasl-0.1_p20070829-r1 (10 Sep 2007)
+
   10 Sep 2007; Emanuele A. Bagnaschi <zephyrus@mirach.it>
   +qca-cyrus-sasl-0.1_p20070829-r1.ebuild:
   Updated to reflect change about the behaviour of debug builds.
   Thanks to Davide Pesavento.
 
+*qca-cyrus-sasl-0.1_p20070829 (07 Sep 2007)
+
   07 Sep 2007; Emanuele A. Bagnaschi <zephyrus@mirach.it>
   +qca-cyrus-sasl-0.1_p20070829.ebuild:
   Added qca-cyrus-sasl-0.1_p20070829. Moving to a more sane qca2 framework.
diff --git a/app-crypt/qca-cyrus-sasl/qca-cyrus-sasl-2.0.0_beta3.ebuild b/app-crypt/qca-cyrus-sasl/qca-cyrus-sasl-2.0.0_beta3.ebuild
index 1dbc984246df..adf0031fc7c4 100644
--- a/app-crypt/qca-cyrus-sasl/qca-cyrus-sasl-2.0.0_beta3.ebuild
+++ b/app-crypt/qca-cyrus-sasl/qca-cyrus-sasl-2.0.0_beta3.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-cyrus-sasl/qca-cyrus-sasl-2.0.0_beta3.ebuild,v 1.8 2009/07/21 16:48:28 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca-cyrus-sasl/qca-cyrus-sasl-2.0.0_beta3.ebuild,v 1.9 2009/08/19 14:01:51 betelgeuse Exp $
+
+EAPI="2"
 
 inherit eutils qt4
 
@@ -16,27 +18,13 @@ SLOT="2"
 KEYWORDS="alpha amd64 ia64 ~ppc64 sparc x86 ~x86-fbsd"
 IUSE="debug"
 
-DEPEND=">=app-crypt/qca-${QCA_VER}
+DEPEND=">=app-crypt/qca-${QCA_VER}[debug?]
 	dev-libs/cyrus-sasl"
 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_compile() {
+src_configure() {
 	# cannot use econf because of non-standard configure script
 	./configure \
 		--qtdir=/usr \
@@ -45,7 +33,6 @@ src_compile() {
 		|| die "configure failed"
 
 	eqmake4 ${PN}.pro
-	emake || die "make failed"
 }
 
 src_install() {