Migrate to EAPI 2.

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

2 files changed, 13 insertions, 26 deletions

diff --git a/net-p2p/mldonkey/ChangeLog b/net-p2p/mldonkey/ChangeLog
index 4fd15b3327bc..8684e440d550 100644
--- a/net-p2p/mldonkey/ChangeLog
+++ b/net-p2p/mldonkey/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-p2p/mldonkey
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/ChangeLog,v 1.228 2009/03/07 15:14:56 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/ChangeLog,v 1.229 2009/03/07 15:35:14 betelgeuse Exp $
+
+  07 Mar 2009; Petteri Räty <betelgeuse@gentoo.org> mldonkey-3.0.0.ebuild:
+  Migrate to EAPI 2.
 
   07 Mar 2009; Petteri Räty <betelgeuse@gentoo.org> -mldonkey-2.9.7.ebuild:
   Remove old ebuild.
diff --git a/net-p2p/mldonkey/mldonkey-3.0.0.ebuild b/net-p2p/mldonkey/mldonkey-3.0.0.ebuild
index 06ebaba800ee..dc0e2dca37cc 100644
--- a/net-p2p/mldonkey/mldonkey-3.0.0.ebuild
+++ b/net-p2p/mldonkey/mldonkey-3.0.0.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-3.0.0.ebuild,v 1.4 2009/03/07 14:28:20 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-3.0.0.ebuild,v 1.5 2009/03/07 15:35:14 betelgeuse Exp $
 
+EAPI="2"
 WANT_AUTOCONF=2.5
 
 inherit flag-o-matic eutils autotools toolchain-funcs
 
-EAPI="1"
 
 IUSE="doc fasttrack gd gnutella gtk guionly magic +ocamlopt"
 
@@ -22,12 +22,12 @@ RDEPEND="dev-lang/perl
 	guionly? ( >=gnome-base/librsvg-2.4.0
 			>=dev-ml/lablgtk-2.6 )
 	gtk? ( >=gnome-base/librsvg-2.4.0
-			>=dev-ml/lablgtk-2.6 )
-	gd? ( >=media-libs/gd-2.0.28 )
+			>=dev-ml/lablgtk-2.6[svg] )
+	gd? ( >=media-libs/gd-2.0.28[truetype] )
 	magic? ( sys-apps/file )"
 
 DEPEND="${RDEPEND}
-	>=dev-lang/ocaml-3.08.3
+	>=dev-lang/ocaml-3.10.2[ocamlopt?]
 	sys-apps/sed"
 
 MLUSER="p2p"
@@ -44,22 +44,6 @@ pkg_setup() {
 		echo ""
 	fi
 
-	if use gtk && ! built_with_use dev-ml/lablgtk svg; then
-		eerror "dev-ml/lablgtk must be built with the 'svg' USE flag to use the gtk gui"
-		die "Recompile dev-ml/lablgtk with enabled svg USE flag"
-	fi
-
-	if use gd && ! built_with_use media-libs/gd truetype; then
-		eerror "media-libs/gd must be built with 'truetype' to compile"
-		eerror "MLDonkey with gd support"
-		die "Recompile media-libs/gd with enabled truetype USE flag"
-	fi
-	if use ocamlopt && ! built_with_use --missing true dev-lang/ocaml ocamlopt; then
-		eerror "In order to build ${PN} with native code support from ocaml"
-		eerror "You first need to have a native code ocaml compiler."
-		eerror "You need to install dev-lang/ocaml with ocamlopt useflag on."
-		die "Please install ocaml with ocamlopt useflag"
-	fi
 	# dev-lang/ocaml creates its own objects but calls gcc for linking, which will
 	# results in relocations if gcc wants to create a PIE executable
 	if gcc-specs-pie ; then
@@ -70,16 +54,14 @@ pkg_setup() {
 	fi
 }
 
-src_unpack() {
-	unpack ${A} && cd "${S}"
-
+src_prepare() {
 	cd "${S}"/config
 	eautoconf
 	cd "${S}"
 	use ocamlopt || sed -i -e "s/ocamlopt/idontwantocamlopt/g" "${S}/config/configure" || die "failed to disable ocamlopt"
 }
 
-src_compile() {
+src_configure() {
 	# the dirs are not (yet) used, but it doesn't hurt to specify them anyway
 
 	# onlygui	Disable all nets support, build only chosen GUI
@@ -108,7 +90,9 @@ src_compile() {
 		$(use_enable magic) \
 		--enable-ocamlver=3.10 \
 		${myconf} || die "econf failed"
+}
 
+src_compile() {
 	export OCAMLRUNPARAM="l=256M"
 	emake || die "emake failed"