Migrate to EAPI 2.

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

3 files changed, 20 insertions, 22 deletions

diff --git a/net-p2p/amule/ChangeLog b/net-p2p/amule/ChangeLog
index e30d0d15e17b..138c7d353fd0 100644
--- a/net-p2p/amule/ChangeLog
+++ b/net-p2p/amule/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-p2p/amule
 # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/ChangeLog,v 1.130 2009/03/07 03:13:27 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/ChangeLog,v 1.131 2009/03/07 15:37:22 betelgeuse Exp $
+
+  07 Mar 2009; Petteri Räty <betelgeuse@gentoo.org> amule-2.2.2.ebuild,
+  amule-2.2.3.ebuild:
+  Migrate to EAPI 2.
 
   07 Mar 2009; Jeremy Olexa <darkside@gentoo.org> ChangeLog:
   amd64 stable, bug 258470
diff --git a/net-p2p/amule/amule-2.2.2.ebuild b/net-p2p/amule/amule-2.2.2.ebuild
index 8e3047111c2e..84fcc18919c3 100644
--- a/net-p2p/amule/amule-2.2.2.ebuild
+++ b/net-p2p/amule/amule-2.2.2.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/amule/amule-2.2.2.ebuild,v 1.8 2009/01/24 18:36:48 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-2.2.2.ebuild,v 1.9 2009/03/07 15:37:22 betelgeuse Exp $
+
+EAPI="2"
 
 inherit eutils flag-o-matic wxwidgets
 
@@ -19,7 +21,7 @@ IUSE="daemon debug geoip gtk nls remote stats unicode upnp"
 DEPEND="=x11-libs/wxGTK-2.8*
 		>=dev-libs/crypto++-5.5.2
 		>=sys-libs/zlib-1.2.1
-		stats? ( >=media-libs/gd-2.0.26 )
+		stats? ( >=media-libs/gd-2.0.26[jpeg] )
 		geoip? ( dev-libs/geoip )
 		upnp? ( >=net-libs/libupnp-1.6.6 )
 		remote? ( >=media-libs/libpng-1.2.0
@@ -39,10 +41,6 @@ pkg_setup() {
 				einfo "to compile aMule Statistics GUI."
 				einfo "I will now compile console versions only."
 		fi
-
-		if use stats && ! built_with_use media-libs/gd jpeg; then
-				die "media-libs/gd should be compiled with the jpeg use flag when you have the stats use flag set"
-		fi
 }
 
 pkg_preinst() {
@@ -52,7 +50,7 @@ pkg_preinst() {
 	fi
 }
 
-src_unpack () {
+src_prepare() {
 	unpack ${A}
 	cd "${S}"
 
@@ -60,7 +58,7 @@ src_unpack () {
 	epatch "${FILESDIR}"/gcc-4.4.patch
 }
 
-src_compile() {
+src_configure() {
 		local myconf
 
 		WX_GTK_VER="2.8"
@@ -104,6 +102,9 @@ src_compile() {
 		# we filter ssp until bug #74457 is closed to build on hardened
 		filter-flags -fstack-protector -fstack-protector-all
 
+}
+
+src_compile() {
 		emake -j1 || die
 }
 
diff --git a/net-p2p/amule/amule-2.2.3.ebuild b/net-p2p/amule/amule-2.2.3.ebuild
index 2f04cd75e053..6a7c06051000 100644
--- a/net-p2p/amule/amule-2.2.3.ebuild
+++ b/net-p2p/amule/amule-2.2.3.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/amule/amule-2.2.3.ebuild,v 1.3 2009/02/10 17:08:04 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-2.2.3.ebuild,v 1.4 2009/03/07 15:37:22 betelgeuse Exp $
+
+EAPI="2"
 
 inherit eutils flag-o-matic wxwidgets
 
@@ -19,7 +21,7 @@ IUSE="daemon debug geoip gtk nls remote stats unicode upnp"
 DEPEND="=x11-libs/wxGTK-2.8*
 		>=dev-libs/crypto++-5.5.2
 		>=sys-libs/zlib-1.2.1
-		stats? ( >=media-libs/gd-2.0.26 )
+		stats? ( >=media-libs/gd-2.0.26[jpeg] )
 		geoip? ( dev-libs/geoip )
 		upnp? ( >=net-libs/libupnp-1.6.6 )
 		remote? ( >=media-libs/libpng-1.2.0
@@ -39,10 +41,6 @@ pkg_setup() {
 				einfo "to compile aMule Statistics GUI."
 				einfo "I will now compile console versions only."
 		fi
-
-		if use stats && ! built_with_use media-libs/gd jpeg; then
-				die "media-libs/gd should be compiled with the jpeg use flag when you have the stats use flag set"
-		fi
 }
 
 pkg_preinst() {
@@ -52,15 +50,12 @@ pkg_preinst() {
 	fi
 }
 
-src_unpack () {
-	unpack ${A}
-	cd "${S}"
-
+src_prepare() {
 	epatch "${FILESDIR}"/gcc-4.3.patch
 	epatch "${FILESDIR}"/gcc-4.4.patch
 }
 
-src_compile() {
+src_configure() {
 		local myconf
 
 		WX_GTK_VER="2.8"
@@ -100,8 +95,6 @@ src_compile() {
 				$(use_enable stats cas) \
 				$(use_enable stats alcc) \
 				${myconf} || die
-
-		emake || die
 }
 
 src_install() {