ebuild cleanups irt #54530

4 files changed, 18 insertions, 15 deletions

diff --git a/net-p2p/mldonkey/ChangeLog b/net-p2p/mldonkey/ChangeLog
index ce9d7358f2e3..dc6a1866768b 100644
--- a/net-p2p/mldonkey/ChangeLog
+++ b/net-p2p/mldonkey/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-p2p/mldonkey
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/ChangeLog,v 1.48 2004/06/28 23:55:44 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/ChangeLog,v 1.49 2004/06/29 02:45:25 squinky86 Exp $
+
+  28 Jun 2004; Jon Hood <squinky86@gentoo.org> mldonkey-2.5.16-r6.ebuild,
+  mldonkey-2.5.21-r2.ebuild:
+  ebuild cleanups thanks to spiralvoice in #54530
 
 *mldonkey-2.5.16-r6 (28 Jun 2004)
 
diff --git a/net-p2p/mldonkey/Manifest b/net-p2p/mldonkey/Manifest
index 7560cd721904..d7d5b147090b 100644
--- a/net-p2p/mldonkey/Manifest
+++ b/net-p2p/mldonkey/Manifest
@@ -1,9 +1,9 @@
 MD5 6aa26af5afd43b94a372a3a8ac8e8323 mldonkey-2.5.16-r4.ebuild 2598
-MD5 a6ba2111ce0c447f14ef6c20d85e2c79 mldonkey-2.5.16-r6.ebuild 2600
-MD5 a0347faaf02672c7dd311aa930d13933 mldonkey-2.5.21-r2.ebuild 2724
+MD5 5f3ac2528577fe5662d7e8f3c80da21c mldonkey-2.5.16-r6.ebuild 2627
+MD5 7eb75fbe2c7f32ca6047df1cc8607e8e mldonkey-2.5.21-r2.ebuild 2685
 MD5 364f3639d6fba66b341173060961cfa5 mldonkey-2.5.16-r5.ebuild 2599
 MD5 4f572fa7b2d38aaac82bab1d96fbcc24 mldonkey-2.5.21-r1.ebuild 2692
-MD5 e9335c3db30464edb4eefcd237202432 ChangeLog 8756
+MD5 b22cb32ba27bb0b62fd8e7c7ff3716e1 ChangeLog 8910
 MD5 17f1cf3d075725dd7af9d1eb275347e3 metadata.xml 403
 MD5 476ec69e79e7c93a7bdaa6cb049c0857 files/mldonkey.confd 836
 MD5 d9e7f6261a7e566c4e24f870678a8e8b files/mldonkey.initd 1910
diff --git a/net-p2p/mldonkey/mldonkey-2.5.16-r6.ebuild b/net-p2p/mldonkey/mldonkey-2.5.16-r6.ebuild
index 97ab65bcf64d..e787ace633c2 100644
--- a/net-p2p/mldonkey/mldonkey-2.5.16-r6.ebuild
+++ b/net-p2p/mldonkey/mldonkey-2.5.16-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-2.5.16-r6.ebuild,v 1.1 2004/06/28 23:55:44 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-2.5.16-r6.ebuild,v 1.2 2004/06/29 02:45:25 squinky86 Exp $
 
 inherit eutils
 
@@ -15,12 +15,13 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~alpha ~ia64"
 
-DEPEND="gtk? ( =dev-ml/lablgtk-1* )
+RDEPEND="gtk? ( =dev-ml/lablgtk-1* )
 	>=dev-lang/ocaml-3.06
-	dev-lang/perl"
+	dev-lang/perl
+	net-misc/wget"
 
-RDEPEND="${DEPEND}
-	 net-misc/wget"
+DEPEND="${RDEPEND}
+	>=sys-devel/autoconf-2.58"
 
 MLUSER="p2p"
 
@@ -28,16 +29,16 @@ src_unpack() {
 	unpack ${P}.tar.gz
 
 	cd ${S}
-	epatch ${FILESDIR}/${P}-configure.patch
 	#Don't change this, unless you know what you are doing
 	patch -p0 < ${DISTDIR}/patch_pack16q || die
+	export WANT_AUTOCONF=2.5
+	cd config; autoconf; cd ..
 }
 
 
 src_compile() {
 	use gtk || export GTK_CONFIG="no"
 
-	make depend
 	# the dirs are not (yet) used, but it doesn't hurt to specify them anyway
 	econf \
 		--sysconfdir=/etc/mldonkey \
diff --git a/net-p2p/mldonkey/mldonkey-2.5.21-r2.ebuild b/net-p2p/mldonkey/mldonkey-2.5.21-r2.ebuild
index 0682ebab2a4e..7c4fb39cf00c 100644
--- a/net-p2p/mldonkey/mldonkey-2.5.21-r2.ebuild
+++ b/net-p2p/mldonkey/mldonkey-2.5.21-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-2.5.21-r2.ebuild,v 1.4 2004/06/29 00:30:31 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-2.5.21-r2.ebuild,v 1.5 2004/06/29 02:45:25 squinky86 Exp $
 
 inherit eutils
 
@@ -15,7 +15,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~alpha ~ia64 ~hppa"
 
-RDEPEND="gtk? ( =dev-ml/lablgtk-1* )
+RDEPEND="gtk? ( >=dev-ml/lablgtk-1.2.6 <dev-ml/lablgtk-2 )
 	>=dev-lang/ocaml-3.07
 	dev-lang/perl
 	net-misc/wget"
@@ -29,7 +29,6 @@ src_unpack() {
 	unpack ${P}.tar.gz
 
 	cd ${S}
-	epatch ${FILESDIR}/${P}-configure.patch
 	#Don't change this, unless you know what you are doing
 	patch -p0 < ${DISTDIR}/patch_pack21g || die
 	export WANT_AUTOCONF=2.5
@@ -49,7 +48,6 @@ src_compile() {
 		--enable-checks \
 		--enable-pthread || die
 	export OCAMLRUNPARAM="l=256M"
-	make depend || die
 	emake || die
 }