Migrate to EAPI 2. Call econf in src_compile until the eclasses are updated.

(Portage version: 2.2_rc20/cvs/Linux 2.6.29-rc6 i686)

2 files changed, 11 insertions, 16 deletions

diff --git a/net-p2p/ktorrent/ChangeLog b/net-p2p/ktorrent/ChangeLog
index 76c76b4a28ab..b776ac832dc1 100644
--- a/net-p2p/ktorrent/ChangeLog
+++ b/net-p2p/ktorrent/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-p2p/ktorrent
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/ktorrent/ChangeLog,v 1.107 2009/02/17 09:40:26 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/ktorrent/ChangeLog,v 1.108 2009/03/07 18:56:50 betelgeuse Exp $
+
+  07 Mar 2009; Petteri Räty <betelgeuse@gentoo.org> ktorrent-2.2.8.ebuild:
+  Migrate to EAPI 2. Call econf in src_compile until the eclasses are
+  updated.
 
   17 Feb 2009; Theo Chatzimichos <tampakrap@gentoo.org> ktorrent-3.2.ebuild:
   fix wrong SRC_URI
diff --git a/net-p2p/ktorrent/ktorrent-2.2.8.ebuild b/net-p2p/ktorrent/ktorrent-2.2.8.ebuild
index 4325e1cb220a..8271462bc7da 100644
--- a/net-p2p/ktorrent/ktorrent-2.2.8.ebuild
+++ b/net-p2p/ktorrent/ktorrent-2.2.8.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/net-p2p/ktorrent/ktorrent-2.2.8.ebuild,v 1.6 2009/02/16 20:47:00 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/ktorrent/ktorrent-2.2.8.ebuild,v 1.7 2009/03/07 18:56:50 betelgeuse Exp $
+
+EAPI="2"
 
 inherit kde
 
@@ -17,7 +19,7 @@ IUSE="avahi kdeenablefinal"
 
 DEPEND="dev-libs/gmp
 	>=dev-libs/geoip-1.4.0-r1
-	avahi? ( >=net-dns/avahi-0.6.16-r1 )"
+	avahi? ( >=net-dns/avahi-0.6.16-r1[qt3] )"
 RDEPEND="${DEPEND}
 	|| ( =kde-base/kdebase-kioslaves-3.5* =kde-base/kdebase-3.5* )"
 
@@ -32,19 +34,6 @@ for X in ${LANGS} ; do
 	IUSE="${IUSE} linguas_${X}"
 done
 
-pkg_setup() {
-	if use avahi && ! built_with_use net-dns/avahi qt3 ; then
-		echo
-		eerror "In order to use ktorrents zeroconf plugin you need to have"
-		eerror "net-dns/avahi emerged with \"qt3\" in your USE flag. Please add"
-		eerror "that flag, re-emerge avahi, and then emerge ktorrent again."
-		echo
-		die "net-dns/avahi not built with \"qt3\" support."
-	fi
-
-	kde_pkg_setup
-}
-
 src_unpack() {
 	kde_src_unpack
 
@@ -63,6 +52,8 @@ src_unpack() {
 	rm -f "${S}/configure"
 }
 
+src_configure() { :; }
+
 src_compile(){
 	local myconf="${myconf}
 		$(use_with avahi)