Migrate to EAPI 2.

Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.29-rc6 i686

6 files changed, 44 insertions, 51 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() {
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"
 
diff --git a/net-p2p/qbittorrent/Manifest b/net-p2p/qbittorrent/Manifest
index ba3e050c28f7..3d762f0e561c 100644
--- a/net-p2p/qbittorrent/Manifest
+++ b/net-p2p/qbittorrent/Manifest
@@ -1,10 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST qbittorrent-1.0.0.tar.gz 1384049 RMD160 86266a164b0b36276ca766fe9aae8759e6a2e28b SHA1 d498f0f537a49b8f7421284127e05af02f62ba1a SHA256 a247223dd2d3e2490d5c3cce4764d40aaf486548bf77835729d42e82e12aad25
-DIST qbittorrent-1.1.4.tar.gz 1568960 RMD160 3e8ff7f58587ccc99c75b53c622942abdc1c8290 SHA1 bced4d929a56d8c3936fc1d832ea1e047143e2fd SHA256 a794b71e1dd9ceab4f06de82aac202eb8845022dd3c8e39e4ac4eaaaa95f719a
 DIST qbittorrent-1.2.1.tar.gz 1641921 RMD160 a09c6f96c356774c1c5cd9f615277029a8b1f744 SHA1 a38e79cf665a044e26fbec508d1407f65a4250a9 SHA256 8f702d337be25a6dba055bc87c557333950803ccff13715d92139e7cfbd9797c
 DIST qbittorrent-1.3.1.tar.gz 1658002 RMD160 955d9c3da95eb00095e02d8c22292974df9f1b24 SHA1 57ccfa6febc1d7b8e00d79e9a26b7a88ca5c482c SHA256 f324dffb3c590d338ba8f2ea73d7315acced8b0cb03686b694ecbce87e4d1071
 EBUILD qbittorrent-1.0.0.ebuild 1293 RMD160 eb7224f7fad624f9938410a39c0f1f1c45ddf553 SHA1 448d83d53a2ab70b8831186f32a6c5418ac5e4ce SHA256 2e5d011c043f79e41650db88c055b30f7b837e439cb529a3d5cb345f6bfef862
-EBUILD qbittorrent-1.1.4.ebuild 1414 RMD160 7c0760d6221314362b4094f4b7c94155cd76e6b6 SHA1 db054700b216ee8f0aaf18c297b7054763413624 SHA256 03c22ba23b1464baefb05949da756774d525fe96a2a62536ae14f4e09018066c
 EBUILD qbittorrent-1.2.1.ebuild 1414 RMD160 0b0321d1a5252a79963c8e4302bea4680b760bb4 SHA1 3f322d023dcdeb4fd950c066a98cdca9e9c60bd5 SHA256 e1598891757ce7e00d625004585c9659aa29a7a30985840d888319c616159daf
 EBUILD qbittorrent-1.3.1.ebuild 1412 RMD160 89a92bf84fd3a5ecabd677eef241b5214ce28ae3 SHA1 0b5d420363d54a387c395e50870f657b3ae8ac56 SHA256 9237fee5523881495a26e6f2b1a88ff31e3c03c7539b89e20581656c5d90d005
-MISC ChangeLog 8743 RMD160 abe857c696a1a8e4bfac3f90f8a3fe071daf3034 SHA1 5d2da813159e3fb1da31dabef0ec76128e9e93a0 SHA256 5c0c3fbd8d579399f68a8d1082dcb88efe9f6a710cd1d78a45b4b70cb5920ea5
+MISC ChangeLog 8851 RMD160 b79fa5c98919bd68724e99bce6ef9563eefcf4c1 SHA1 137381e1d898e5f2cefa41ba3c8656a841329d50 SHA256 52896f9e417b68ea25ad90e619e845aa5004da57769d3696d82d26f2531db41f
 MISC metadata.xml 222 RMD160 0dc4b04f31dcc89402f87c352327fe327b3cf31f SHA1 540337d5841f15b43186e5858f9e24032567de08 SHA256 713b9d1548682d5c1c3686a7b0711acf065a8fa4f386883ace90359d3dceb966
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.10 (GNU/Linux)
+
+iEYEARECAAYFAkmyldcACgkQcxLzpIGCsLTJGQCfQswWHra9kGlQ8ofdV20zNx5s
+DigAniAsJYd1Pdo9MlreRA6E/ll8IKY7
+=6imN
+-----END PGP SIGNATURE-----