cleanup ebuilds; version bump; apply changes from #51496

17 files changed, 44 insertions, 470 deletions

diff --git a/net-p2p/mldonkey/ChangeLog b/net-p2p/mldonkey/ChangeLog
index 199aea288d6e..45465b4cc579 100644
--- a/net-p2p/mldonkey/ChangeLog
+++ b/net-p2p/mldonkey/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-p2p/mldonkey
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/ChangeLog,v 1.41 2004/05/11 17:54:52 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/ChangeLog,v 1.42 2004/05/21 18:00:30 squinky86 Exp $
+
+*mldonkey-2.5.21-r1 (21 May 2004)
+
+  21 May 2004; Jon Hood <squinky86@gentoo.org> -mldonkey-2.5.11.ebuild,
+  -mldonkey-2.5.12.ebuild, -mldonkey-2.5.16-r1.ebuild,
+  -mldonkey-2.5.16-r2.ebuild, mldonkey-2.5.16-r3.ebuild,
+  -mldonkey-2.5.16.ebuild, +mldonkey-2.5.21-r1.ebuild, mldonkey-2.5.21.ebuild,
+  -mldonkey-2.5.4.ebuild:
+  cleanup ebuilds; version bump; apply changes from #51496
 
   11 May 2004; Guy Martin <gmsoft@gentoo.org> :
   Marked stable on hppa.
diff --git a/net-p2p/mldonkey/Manifest b/net-p2p/mldonkey/Manifest
index a48940ecc816..d94b94d0d314 100644
--- a/net-p2p/mldonkey/Manifest
+++ b/net-p2p/mldonkey/Manifest
@@ -1,35 +1,25 @@
-MD5 f0c56268d73ee573560915aa266bc9a8 ChangeLog 7396
-MD5 17f1cf3d075725dd7af9d1eb275347e3 metadata.xml 403
-MD5 79bc98629df066eacfcb7fcb07b05308 mldonkey-2.5.11.ebuild 2240
-MD5 488066efb2d1c61b1c76c6a1ea57a801 mldonkey-2.5.12.ebuild 2328
-MD5 5c8f10ea99695a6a0f754a59962056bb mldonkey-2.5.4.ebuild 2406
-MD5 5cf2edb4317eacec888422566b22d8ce mldonkey-2.5.16.ebuild 2309
-MD5 1f76e509dcb6ff5e307c1bf07b86c763 mldonkey-2.5.16-r1.ebuild 2390
-MD5 3ecdc7809893ad45331c04c65dcd3dfb mldonkey-2.5.16-r2.ebuild 2564
-MD5 74124d9344477b6b85d76012a777d0d5 mldonkey-2.5.16-r3.ebuild 2607
 MD5 4376fc3e0c917c0f323d3135963b538b mldonkey-2.5.18.ebuild 2442
+MD5 74fb09adcfb1168302d111f8262aa4a8 mldonkey-2.5.21.ebuild 2456
+MD5 b52152baff7da4ba7c24c4cbb30e27d3 mldonkey-2.5.16-r3.ebuild 2608
 MD5 3fb8ca132b8e57bf5e145128989a6d99 mldonkey-2.5.19.ebuild 2442
+MD5 108f20733418f68cd3d95cf72c45f38d mldonkey-2.5.21-r1.ebuild 2695
+MD5 dff7fb5e4f09f7129561d3aa2694ef96 ChangeLog 7783
+MD5 17f1cf3d075725dd7af9d1eb275347e3 metadata.xml 403
 MD5 df6a2e439d7bcf9bb25720ba4f541731 mldonkey-2.5.20.ebuild 2444
-MD5 d8e3a32e35b3d6fd3d204b3dfed7a32b mldonkey-2.5.21.ebuild 2446
-MD5 3127e746056c13574b2509e71bc074b5 files/97mldonkey 42
-MD5 dae23fdba15565dd81c5bd2b0fef7278 files/digest-mldonkey-2.5.11 68
-MD5 86743f63e50d672062cad31e52ac357b files/digest-mldonkey-2.5.12 68
-MD5 f0db2bfa3b5474e26617c313f071b44d files/digest-mldonkey-2.5.4 67
-MD5 ac93ed074d62909b2a496045f0740127 files/mldonkey 336
 MD5 476ec69e79e7c93a7bdaa6cb049c0857 files/mldonkey.confd 836
 MD5 d9e7f6261a7e566c4e24f870678a8e8b files/mldonkey.initd 1910
-MD5 f1e6da2254407fd960e161ca102e9f48 files/digest-mldonkey-2.5.16 68
-MD5 f1e6da2254407fd960e161ca102e9f48 files/digest-mldonkey-2.5.16-r1 68
-MD5 f1e6da2254407fd960e161ca102e9f48 files/digest-mldonkey-2.5.16-r2 68
-MD5 d68e3759e1f0f2f9a295bbf0a1c30f6b files/mldonkey-2.5.16-16g.patch 92755
-MD5 be0c71929c461b50601e8715706a4a16 files/mldonkey-2.5.16-configure.patch 540
-MD5 9d462b1fffabccafe674b6138f151ed6 files/mldonkey-2.5.16-oldbt.patch 5713
-MD5 4c161b4d814db157141bf036b6119c49 files/digest-mldonkey-2.5.16-r3 126
 MD5 8d679a46ba72fde8ca0344975a3c4718 files/digest-mldonkey-2.5.18 68
-MD5 be0c71929c461b50601e8715706a4a16 files/mldonkey-2.5.18-configure.patch 540
 MD5 c601f988edc908a30f69566facaa2259 files/digest-mldonkey-2.5.19 68
 MD5 bb0ca8de039ec7bb8c8613a826f89ebe files/digest-mldonkey-2.5.20 68
 MD5 93e4de06e216c29a0ac82f9c1eb79313 files/digest-mldonkey-2.5.21 68
-MD5 be0c71929c461b50601e8715706a4a16 files/mldonkey-2.5.19-configure.patch 540
 MD5 be0c71929c461b50601e8715706a4a16 files/mldonkey-2.5.20-configure.patch 540
+MD5 9d462b1fffabccafe674b6138f151ed6 files/mldonkey-2.5.16-oldbt.patch 5713
+MD5 be0c71929c461b50601e8715706a4a16 files/mldonkey-2.5.18-configure.patch 540
+MD5 4c161b4d814db157141bf036b6119c49 files/digest-mldonkey-2.5.16-r3 126
+MD5 97c421f85a3a6aaaeb849d97400f89ca files/digest-mldonkey-2.5.21-r1 125
+MD5 d68e3759e1f0f2f9a295bbf0a1c30f6b files/mldonkey-2.5.16-16g.patch 92755
 MD5 be0c71929c461b50601e8715706a4a16 files/mldonkey-2.5.21-configure.patch 540
+MD5 3127e746056c13574b2509e71bc074b5 files/97mldonkey 42
+MD5 be0c71929c461b50601e8715706a4a16 files/mldonkey-2.5.19-configure.patch 540
+MD5 ac93ed074d62909b2a496045f0740127 files/mldonkey 336
+MD5 be0c71929c461b50601e8715706a4a16 files/mldonkey-2.5.16-configure.patch 540
diff --git a/net-p2p/mldonkey/files/digest-mldonkey-2.5.11 b/net-p2p/mldonkey/files/digest-mldonkey-2.5.11
deleted file mode 100644
index 703cbf87f6f1..000000000000
--- a/net-p2p/mldonkey/files/digest-mldonkey-2.5.11
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7d88005f7a14354f02fb0bbee0ad4f51 mldonkey-2.5.11.tar.gz 3201826
diff --git a/net-p2p/mldonkey/files/digest-mldonkey-2.5.12 b/net-p2p/mldonkey/files/digest-mldonkey-2.5.12
deleted file mode 100644
index 764ab19a58d9..000000000000
--- a/net-p2p/mldonkey/files/digest-mldonkey-2.5.12
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a0a1d59e509a75355065fbb01694a9eb mldonkey-2-5-12.tar.gz 3206140
diff --git a/net-p2p/mldonkey/files/digest-mldonkey-2.5.16 b/net-p2p/mldonkey/files/digest-mldonkey-2.5.16
deleted file mode 100644
index ea9ac0f65d5b..000000000000
--- a/net-p2p/mldonkey/files/digest-mldonkey-2.5.16
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a64121509d6a7bb196fe0b5ce403c60b mldonkey-2.5.16.tar.gz 3214587
diff --git a/net-p2p/mldonkey/files/digest-mldonkey-2.5.16-r1 b/net-p2p/mldonkey/files/digest-mldonkey-2.5.16-r1
deleted file mode 100644
index ea9ac0f65d5b..000000000000
--- a/net-p2p/mldonkey/files/digest-mldonkey-2.5.16-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a64121509d6a7bb196fe0b5ce403c60b mldonkey-2.5.16.tar.gz 3214587
diff --git a/net-p2p/mldonkey/files/digest-mldonkey-2.5.16-r2 b/net-p2p/mldonkey/files/digest-mldonkey-2.5.16-r2
deleted file mode 100644
index ea9ac0f65d5b..000000000000
--- a/net-p2p/mldonkey/files/digest-mldonkey-2.5.16-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a64121509d6a7bb196fe0b5ce403c60b mldonkey-2.5.16.tar.gz 3214587
diff --git a/net-p2p/mldonkey/files/digest-mldonkey-2.5.21-r1 b/net-p2p/mldonkey/files/digest-mldonkey-2.5.21-r1
new file mode 100644
index 000000000000..ef3848e8833e
--- /dev/null
+++ b/net-p2p/mldonkey/files/digest-mldonkey-2.5.21-r1
@@ -0,0 +1,2 @@
+MD5 8a96738990f8ffc36eeb2c1f2f655826 mldonkey-2.5.21.tar.gz 3234137
+MD5 8fa6f16c3e2b25d0972dd40e73da4b98 patch_pack21c 36445
diff --git a/net-p2p/mldonkey/files/digest-mldonkey-2.5.4 b/net-p2p/mldonkey/files/digest-mldonkey-2.5.4
deleted file mode 100644
index 4592614b0619..000000000000
--- a/net-p2p/mldonkey/files/digest-mldonkey-2.5.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ef72a0c8e1337bfcce9f80f4a94dd927 mldonkey-2.5-4.tar.gz 2534578
diff --git a/net-p2p/mldonkey/mldonkey-2.5.11.ebuild b/net-p2p/mldonkey/mldonkey-2.5.11.ebuild
deleted file mode 100644
index bbb8fabe7126..000000000000
--- a/net-p2p/mldonkey/mldonkey-2.5.11.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-2.5.11.ebuild,v 1.4 2004/04/26 12:50:23 agriffis Exp $
-
-inherit eutils
-
-IUSE="gtk"
-
-DESCRIPTION="mldonkey is a new client to access the eDonkey network. It is written in Objective-Caml, and comes with its own GTK GUI, an HTTP interface and a telnet interface."
-HOMEPAGE="http://www.nongnu.org/mldonkey/"
-SRC_URI="http://savannah.nongnu.org/download/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc"
-
-
-DEPEND="gtk? ( =dev-ml/lablgtk-1* )
-	>=dev-lang/ocaml-3.06
-	dev-lang/perl"
-RDEPEND="net-misc/wget"
-
-MLUSER="p2p"
-
-src_compile() {
-	use gtk || export GTK_CONFIG="no"
-
-	# the dirs are not (yet) used, but it doesn't hurt to specify them anyway
-	econf \
-		--sysconfdir=/etc/mldonkey \
-		--sharedstatedir=/var/mldonkey \
-		--localstatedir=/var/mldonkey \
-		--enable-batch || die "econf failed"
-
-	emake || die
-}
-
-src_install() {
-	dobin mlnet
-	use gtk && dobin mlchat mlgui mlguistarter mlim mlnet+gui
-	dobin ${FILESDIR}/mldonkey
-
-	cd ${S}/distrib
-	dodoc ChangeLog Authors.txt Bugs.txt Copying.txt Developers.txt Install.txt Readme.txt Todo.txt ed2k_links.txt
-	dohtml FAQ.html
-
-	insinto /usr/share/doc/${PF}/scripts
-	doins kill_mldonkey mldonkey_command mldonkey_previewer
-
-	insinto /usr/share/doc/${PF}/distrib
-	doins directconnect.ini
-
-	cd ${S}/docs
-	dodoc *.txt *.tex *.pdf
-	dohtml *.html
-
-	cd ${S}/docs/developers
-	dodoc *.txt *.tex
-
-	cd ${S}/docs/images
-	insinto /usr/share/doc/${PF}/html/images
-	doins *
-
-	insinto /etc/conf.d; newins ${FILESDIR}/mldonkey.confd mldonkey
-	exeinto /etc/init.d; newexe ${FILESDIR}/mldonkey.initd mldonkey
-
-	# add user
-	enewuser ${MLUSER} -1 /bin/bash /home/p2p users
-}
-
-pkg_postinst() {
-	echo
-	einfo "Running \`mldonkey' will start the server inside ~/.mldonkey/"
-	einfo "If you want to start mldonkey in a particular working directory,"
-	einfo "use the \`mlnet' command."
-	einfo "If you want to start mldonkey as a system service, use"
-	einfo "the /etc/init.d/mldonkey script. To control bandwidth, use"
-	einfo "the 'slow' and 'fast' arguments. Be sure to have a look at"
-	einfo "/etc/conf.d/mldonkey also."
-	echo
-}
diff --git a/net-p2p/mldonkey/mldonkey-2.5.12.ebuild b/net-p2p/mldonkey/mldonkey-2.5.12.ebuild
deleted file mode 100644
index c81459073503..000000000000
--- a/net-p2p/mldonkey/mldonkey-2.5.12.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-2.5.12.ebuild,v 1.5 2004/04/26 12:50:23 agriffis Exp $
-
-inherit eutils
-
-IUSE="gtk"
-
-MY_P=${P//./-}
-
-DESCRIPTION="mldonkey is a new client to access the eDonkey network. It is written in Objective-Caml, and comes with its own GTK GUI, an HTTP interface and a telnet interface."
-HOMEPAGE="http://www.nongnu.org/mldonkey/"
-SRC_URI="http://savannah.nongnu.org/download/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~alpha ~ia64"
-
-
-DEPEND="gtk? ( =dev-ml/lablgtk-1* )
-	>=dev-lang/ocaml-3.06
-	dev-lang/perl"
-RDEPEND="net-misc/wget"
-
-MLUSER="p2p"
-
-src_compile() {
-	use gtk || export GTK_CONFIG="no"
-
-	# the dirs are not (yet) used, but it doesn't hurt to specify them anyway
-	econf \
-		--sysconfdir=/etc/mldonkey \
-		--sharedstatedir=/var/mldonkey \
-		--localstatedir=/var/mldonkey \
-		--enable-batch || die "econf failed"
-
-	emake || die
-}
-
-src_install() {
-	dobin mlnet
-	use gtk && dobin mlchat mlgui mlguistarter mlim mlnet+gui
-	dobin ${FILESDIR}/mldonkey
-
-	dodoc ChangeLog Copying.txt Developers.txt Install.txt
-	cd ${S}/distrib
-	dodoc ChangeLog Authors.txt Bugs.txt Copying.txt Developers.txt Install.txt Readme.txt Todo.txt ed2k_links.txt
-	dohtml FAQ.html
-
-	insinto /usr/share/doc/${PF}/scripts
-	doins kill_mldonkey mldonkey_command mldonkey_previewer
-
-	insinto /usr/share/doc/${PF}/distrib
-	doins directconnect.ini
-
-	cd ${S}/docs
-	dodoc *.txt *.tex *.pdf
-	dohtml *.html
-
-	cd ${S}/docs/developers
-	dodoc *.txt *.tex
-
-	cd ${S}/docs/images
-	insinto /usr/share/doc/${PF}/html/images
-	doins *
-
-	insinto /etc/conf.d; newins ${FILESDIR}/mldonkey.confd mldonkey
-	exeinto /etc/init.d; newexe ${FILESDIR}/mldonkey.initd mldonkey
-
-	# add user
-	enewuser ${MLUSER} -1 /bin/bash /home/p2p users
-}
-
-pkg_postinst() {
-	echo
-	einfo "Running \`mldonkey' will start the server inside ~/.mldonkey/"
-	einfo "If you want to start mldonkey in a particular working directory,"
-	einfo "use the \`mlnet' command."
-	einfo "If you want to start mldonkey as a system service, use"
-	einfo "the /etc/init.d/mldonkey script. To control bandwidth, use"
-	einfo "the 'slow' and 'fast' arguments. Be sure to have a look at"
-	einfo "/etc/conf.d/mldonkey also."
-	echo
-}
diff --git a/net-p2p/mldonkey/mldonkey-2.5.16-r1.ebuild b/net-p2p/mldonkey/mldonkey-2.5.16-r1.ebuild
deleted file mode 100644
index 89e31946f01b..000000000000
--- a/net-p2p/mldonkey/mldonkey-2.5.16-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-2.5.16-r1.ebuild,v 1.2 2004/04/26 12:50:23 agriffis Exp $
-
-inherit eutils
-
-IUSE="gtk"
-
-DESCRIPTION="mldonkey is a new client to access the eDonkey network. It is written in Objective-Caml, and comes with its own GTK GUI, an HTTP interface and a telnet interface."
-HOMEPAGE="http://www.nongnu.org/mldonkey/"
-SRC_URI="http://savannah.nongnu.org/download/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~alpha ~ia64"
-
-
-DEPEND="gtk? ( =dev-ml/lablgtk-1* )
-	>=dev-lang/ocaml-3.06
-	dev-lang/perl"
-RDEPEND="net-misc/wget"
-
-MLUSER="p2p"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${P}-oldbt.patch
-}
-
-src_compile() {
-	use gtk || export GTK_CONFIG="no"
-
-	# the dirs are not (yet) used, but it doesn't hurt to specify them anyway
-	econf \
-		--sysconfdir=/etc/mldonkey \
-		--sharedstatedir=/var/mldonkey \
-		--localstatedir=/var/mldonkey \
-		--enable-batch || die "econf failed"
-
-	emake || die
-}
-
-src_install() {
-	dobin mlnet
-	use gtk && dobin mlchat mlgui mlguistarter mlim mlnet+gui
-	dobin ${FILESDIR}/mldonkey
-
-	dodoc ChangeLog Copying.txt Developers.txt Install.txt
-	cd ${S}/distrib
-	dodoc ChangeLog Authors.txt Bugs.txt Copying.txt Developers.txt Install.txt Readme.txt Todo.txt ed2k_links.txt
-	dohtml FAQ.html
-
-	insinto /usr/share/doc/${PF}/scripts
-	doins kill_mldonkey mldonkey_command mldonkey_previewer
-
-	insinto /usr/share/doc/${PF}/distrib
-	doins directconnect.ini
-
-	cd ${S}/docs
-	dodoc *.txt *.tex *.pdf
-	dohtml *.html
-
-	cd ${S}/docs/developers
-	dodoc *.txt *.tex
-
-	cd ${S}/docs/images
-	insinto /usr/share/doc/${PF}/html/images
-	doins *
-
-	insinto /etc/conf.d; newins ${FILESDIR}/mldonkey.confd mldonkey
-	exeinto /etc/init.d; newexe ${FILESDIR}/mldonkey.initd mldonkey
-
-	# add user
-	enewuser ${MLUSER} -1 /bin/bash /home/p2p users
-}
-
-pkg_postinst() {
-	echo
-	einfo "Running \`mldonkey' will start the server inside ~/.mldonkey/"
-	einfo "If you want to start mldonkey in a particular working directory,"
-	einfo "use the \`mlnet' command."
-	einfo "If you want to start mldonkey as a system service, use"
-	einfo "the /etc/init.d/mldonkey script. To control bandwidth, use"
-	einfo "the 'slow' and 'fast' arguments. Be sure to have a look at"
-	einfo "/etc/conf.d/mldonkey also."
-	echo
-}
diff --git a/net-p2p/mldonkey/mldonkey-2.5.16-r3.ebuild b/net-p2p/mldonkey/mldonkey-2.5.16-r3.ebuild
index ea9a4dbce45e..dc3ffcbf7563 100644
--- a/net-p2p/mldonkey/mldonkey-2.5.16-r3.ebuild
+++ b/net-p2p/mldonkey/mldonkey-2.5.16-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-2.5.16-r3.ebuild,v 1.2 2004/04/17 10:21:19 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-2.5.16-r3.ebuild,v 1.3 2004/05/21 18:00:30 squinky86 Exp $
 
 inherit eutils
 
@@ -13,7 +13,7 @@ SRC_URI="http://savannah.nongnu.org/download/${PN}/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~alpha ~ia64"
+KEYWORDS="x86 ~ppc ~alpha ~ia64"
 
 DEPEND="gtk? ( =dev-ml/lablgtk-1* )
 	>=dev-lang/ocaml-3.06
diff --git a/net-p2p/mldonkey/mldonkey-2.5.16.ebuild b/net-p2p/mldonkey/mldonkey-2.5.16.ebuild
deleted file mode 100644
index 32a2ac023eaa..000000000000
--- a/net-p2p/mldonkey/mldonkey-2.5.16.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-2.5.16.ebuild,v 1.3 2004/04/26 12:50:23 agriffis Exp $
-
-inherit eutils
-
-IUSE="gtk"
-
-DESCRIPTION="mldonkey is a new client to access the eDonkey network. It is written in Objective-Caml, and comes with its own GTK GUI, an HTTP interface and a telnet interface."
-HOMEPAGE="http://www.nongnu.org/mldonkey/"
-SRC_URI="http://savannah.nongnu.org/download/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~alpha ~ia64"
-
-
-DEPEND="gtk? ( =dev-ml/lablgtk-1* )
-	>=dev-lang/ocaml-3.06
-	dev-lang/perl"
-RDEPEND="net-misc/wget"
-
-MLUSER="p2p"
-
-src_compile() {
-	use gtk || export GTK_CONFIG="no"
-
-	# the dirs are not (yet) used, but it doesn't hurt to specify them anyway
-	econf \
-		--sysconfdir=/etc/mldonkey \
-		--sharedstatedir=/var/mldonkey \
-		--localstatedir=/var/mldonkey \
-		--enable-batch || die "econf failed"
-
-	emake || die
-}
-
-src_install() {
-	dobin mlnet
-	use gtk && dobin mlchat mlgui mlguistarter mlim mlnet+gui
-	dobin ${FILESDIR}/mldonkey
-
-	dodoc ChangeLog Copying.txt Developers.txt Install.txt
-	cd ${S}/distrib
-	dodoc ChangeLog Authors.txt Bugs.txt Copying.txt Developers.txt Install.txt Readme.txt Todo.txt ed2k_links.txt
-	dohtml FAQ.html
-
-	insinto /usr/share/doc/${PF}/scripts
-	doins kill_mldonkey mldonkey_command mldonkey_previewer
-
-	insinto /usr/share/doc/${PF}/distrib
-	doins directconnect.ini
-
-	cd ${S}/docs
-	dodoc *.txt *.tex *.pdf
-	dohtml *.html
-
-	cd ${S}/docs/developers
-	dodoc *.txt *.tex
-
-	cd ${S}/docs/images
-	insinto /usr/share/doc/${PF}/html/images
-	doins *
-
-	insinto /etc/conf.d; newins ${FILESDIR}/mldonkey.confd mldonkey
-	exeinto /etc/init.d; newexe ${FILESDIR}/mldonkey.initd mldonkey
-
-	# add user
-	enewuser ${MLUSER} -1 /bin/bash /home/p2p users
-}
-
-pkg_postinst() {
-	echo
-	einfo "Running \`mldonkey' will start the server inside ~/.mldonkey/"
-	einfo "If you want to start mldonkey in a particular working directory,"
-	einfo "use the \`mlnet' command."
-	einfo "If you want to start mldonkey as a system service, use"
-	einfo "the /etc/init.d/mldonkey script. To control bandwidth, use"
-	einfo "the 'slow' and 'fast' arguments. Be sure to have a look at"
-	einfo "/etc/conf.d/mldonkey also."
-	echo
-}
diff --git a/net-p2p/mldonkey/mldonkey-2.5.16-r2.ebuild b/net-p2p/mldonkey/mldonkey-2.5.21-r1.ebuild
index 8151fdc442e3..69d4ea20118b 100644
--- a/net-p2p/mldonkey/mldonkey-2.5.16-r2.ebuild
+++ b/net-p2p/mldonkey/mldonkey-2.5.21-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-2.5.16-r2.ebuild,v 1.5 2004/04/26 12:50:23 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-2.5.21-r1.ebuild,v 1.1 2004/05/21 18:00:30 squinky86 Exp $
 
 inherit eutils
 
@@ -8,18 +8,20 @@ IUSE="gtk"
 
 DESCRIPTION="mldonkey is a new client to access the eDonkey network. It is written in Objective-Caml, and comes with its own GTK GUI, an HTTP interface and a telnet interface."
 HOMEPAGE="http://www.nongnu.org/mldonkey/"
-SRC_URI="http://savannah.nongnu.org/download/${PN}/${P}.tar.gz"
+SRC_URI="http://savannah.nongnu.org/download/${PN}/${P}.tar.gz
+	http://www.8ung.at/spiralvoice/patches/patch_pack21c"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~alpha ~ia64"
+KEYWORDS="~x86 ~ppc ~alpha ~ia64 hppa"
 
-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"
 
@@ -29,14 +31,15 @@ src_unpack() {
 	cd ${S}
 	epatch ${FILESDIR}/${P}-configure.patch
 	#Don't change this, unless you know what you are doing
-	patch -p0 < ${FILESDIR}/${P}-16g.patch || die
+	patch -p0 < ${DISTDIR}/patch_pack21c || 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 \
@@ -44,8 +47,9 @@ src_compile() {
 		--localstatedir=/var/mldonkey \
 		--enable-batch \
 		--enable-checks \
-		--enable-pthread || die "econf failed"
+		--enable-pthread || die
 
+	make depend || die
 	emake || die
 }
 
diff --git a/net-p2p/mldonkey/mldonkey-2.5.21.ebuild b/net-p2p/mldonkey/mldonkey-2.5.21.ebuild
index 55a36b8d20dc..73049c65adb9 100644
--- a/net-p2p/mldonkey/mldonkey-2.5.21.ebuild
+++ b/net-p2p/mldonkey/mldonkey-2.5.21.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-2.5.21.ebuild,v 1.2 2004/05/11 17:54:52 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-2.5.21.ebuild,v 1.3 2004/05/21 18:00:30 squinky86 Exp $
 
 inherit eutils
 
@@ -34,7 +34,6 @@ src_unpack() {
 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 \
@@ -43,6 +42,7 @@ src_compile() {
 		--enable-batch \
 		--enable-checks \
 		--enable-pthread || die
+	make depend || die
 
 	emake || die
 }
diff --git a/net-p2p/mldonkey/mldonkey-2.5.4.ebuild b/net-p2p/mldonkey/mldonkey-2.5.4.ebuild
deleted file mode 100644
index 965effe45c1d..000000000000
--- a/net-p2p/mldonkey/mldonkey-2.5.4.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-2.5.4.ebuild,v 1.8 2004/04/26 12:50:23 agriffis Exp $
-
-inherit eutils
-
-IUSE="gtk"
-
-MY_PV=${PV%.*}-${PV#*.*.}
-MY_P=${PN}-${MY_PV}
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="mldonkey is a new client to access the eDonkey network. It is written in Objective-Caml, and comes with its own GTK GUI, an HTTP interface and a telnet interface."
-HOMEPAGE="http://www.nongnu.org/mldonkey/"
-SRC_URI="http://savannah.nongnu.org/download/${PN}/release-${MY_PV}/official/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~ppc"
-
-
-DEPEND="gtk? ( =dev-ml/lablgtk-1.2.5 )
-	>=dev-lang/ocaml-3.06
-	dev-lang/perl"
-RDEPEND="net-misc/wget"
-
-MLUSER="p2p"
-
-src_compile() {
-	use gtk || export GTK_CONFIG="no"
-
-	# the dirs are not (yet) used, but it doesn't hurt to specify them anyway
-	econf \
-		--sysconfdir=/etc/mldonkey \
-		--sharedstatedir=/var/mldonkey \
-		--localstatedir=/var/mldonkey \
-		--enable-ocamlver=3 \
-		--enable-batch || die "econf failed"
-
-	# ocalm 3.07 fix
-	sed -i -e"s:format:format4:g" src/utils/lib/autoconf.ml
-
-	emake || die
-}
-
-src_install() {
-	dobin mlnet
-	use gtk && dobin mlchat mlgui mlguistarter mlim mlnet+gui
-	dobin ${FILESDIR}/mldonkey
-
-	cd ${S}/distrib
-	dodoc AUTHORS BUGS COPYING ChangeLog ed2k_links.txt INSTALL TODO
-	dohtml FAQ.html
-
-	insinto /usr/share/doc/${PF}/scripts
-	doins kill_mldonkey mldonkey_command mldonkey_previewer
-
-	insinto /usr/share/doc/${PF}/distrib
-	doins directconnect.ini servers.ini
-
-	cd ${S}/docs
-	dodoc *.txt *.tex *.pdf
-	dohtml *.html
-
-	cd ${S}/docs/developers
-	dodoc *.txt *.tex
-
-	cd ${S}/docs/images
-	insinto /usr/share/doc/${PF}/html/images
-	doins *
-
-	insinto /etc/conf.d; newins ${FILESDIR}/mldonkey.confd mldonkey
-	exeinto /etc/init.d; newexe ${FILESDIR}/mldonkey.initd mldonkey
-
-	# add user
-	enewuser ${MLUSER} -1 /bin/bash /home/p2p users
-}
-
-pkg_postinst() {
-	echo
-	einfo "Running \`mldonkey' will start the server inside ~/.mldonkey/"
-	einfo "If you want to start mldonkey in a particular working directory,"
-	einfo "use the \`mlnet' command."
-	einfo "If you want to start mldonkey as a system service, use"
-	einfo "the /etc/init.d/mldonkey script. To control bandwidth, use"
-	einfo "the 'slow' and 'fast' arguments. Be sure to have a look at"
-	einfo "/etc/conf.d/mldonkey also."
-	echo
-}