Third version bump in one day! Recloses #49847.

5 files changed, 118 insertions, 2 deletions

diff --git a/net-p2p/mldonkey/ChangeLog b/net-p2p/mldonkey/ChangeLog
index 84ce7f3a50f1..9bf15adce5dc 100644
--- a/net-p2p/mldonkey/ChangeLog
+++ b/net-p2p/mldonkey/ChangeLog
@@ -1,6 +1,12 @@
 # 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.39 2004/05/05 17:17:30 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/ChangeLog,v 1.40 2004/05/06 01:49:32 squinky86 Exp $
+
+*mldonkey-2.5.21 (05 May 2004)
+
+  05 May 2004; Jon Hood <squinky86@gentoo.org>
+  +files/mldonkey-2.5.21-configure.patch, +mldonkey-2.5.21.ebuild:
+  Wow, three version bumps in a day! Recloses #49847.
 
 *mldonkey-2.5.20 (05 May 2004)
 
diff --git a/net-p2p/mldonkey/Manifest b/net-p2p/mldonkey/Manifest
index 374b8348cc66..c20483fdf9c5 100644
--- a/net-p2p/mldonkey/Manifest
+++ b/net-p2p/mldonkey/Manifest
@@ -2,10 +2,11 @@ MD5 3ecdc7809893ad45331c04c65dcd3dfb mldonkey-2.5.16-r2.ebuild 2564
 MD5 4376fc3e0c917c0f323d3135963b538b mldonkey-2.5.18.ebuild 2442
 MD5 5c8f10ea99695a6a0f754a59962056bb mldonkey-2.5.4.ebuild 2406
 MD5 1f76e509dcb6ff5e307c1bf07b86c763 mldonkey-2.5.16-r1.ebuild 2390
+MD5 119b5d2345df11512c6ac8d131f3071f mldonkey-2.5.21.ebuild 2444
 MD5 488066efb2d1c61b1c76c6a1ea57a801 mldonkey-2.5.12.ebuild 2328
 MD5 74124d9344477b6b85d76012a777d0d5 mldonkey-2.5.16-r3.ebuild 2607
 MD5 3fb8ca132b8e57bf5e145128989a6d99 mldonkey-2.5.19.ebuild 2442
-MD5 340ad73b2e708503d98cd5e6fa4dc756 ChangeLog 7124
+MD5 c0b5ecf68b8e8e599714882dafed3db8 ChangeLog 7325
 MD5 17f1cf3d075725dd7af9d1eb275347e3 metadata.xml 403
 MD5 df6a2e439d7bcf9bb25720ba4f541731 mldonkey-2.5.20.ebuild 2444
 MD5 5cf2edb4317eacec888422566b22d8ce mldonkey-2.5.16.ebuild 2309
@@ -18,6 +19,7 @@ MD5 f1e6da2254407fd960e161ca102e9f48 files/digest-mldonkey-2.5.16 68
 MD5 8d679a46ba72fde8ca0344975a3c4718 files/digest-mldonkey-2.5.18 68
 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.20-configure.patch 540
 MD5 9d462b1fffabccafe674b6138f151ed6 files/mldonkey-2.5.16-oldbt.patch 5713
 MD5 be0c71929c461b50601e8715706a4a16 files/mldonkey-2.5.18-configure.patch 540
@@ -26,6 +28,7 @@ MD5 f1e6da2254407fd960e161ca102e9f48 files/digest-mldonkey-2.5.16-r1 68
 MD5 f1e6da2254407fd960e161ca102e9f48 files/digest-mldonkey-2.5.16-r2 68
 MD5 4c161b4d814db157141bf036b6119c49 files/digest-mldonkey-2.5.16-r3 126
 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
diff --git a/net-p2p/mldonkey/files/digest-mldonkey-2.5.21 b/net-p2p/mldonkey/files/digest-mldonkey-2.5.21
new file mode 100644
index 000000000000..e631f78c3eac
--- /dev/null
+++ b/net-p2p/mldonkey/files/digest-mldonkey-2.5.21
@@ -0,0 +1 @@
+MD5 8a96738990f8ffc36eeb2c1f2f655826 mldonkey-2.5.21.tar.gz 3234137
diff --git a/net-p2p/mldonkey/files/mldonkey-2.5.21-configure.patch b/net-p2p/mldonkey/files/mldonkey-2.5.21-configure.patch
new file mode 100644
index 000000000000..e1f63660142c
--- /dev/null
+++ b/net-p2p/mldonkey/files/mldonkey-2.5.21-configure.patch
@@ -0,0 +1,12 @@
+diff -N -u -w -r --unidirectional-new-file config/configure config2/configure
+--- config/configure	2004-03-08 00:03:54.000000000 +0100
++++ config/configure	2004-04-02 22:38:04.000000000 +0200
+@@ -10509,7 +10509,7 @@
+ fi
+ 
+ echo "Building dependencies"
+-$GNU_MAKE depend 2> /dev/null > /dev/null || echo "Building dependencies fails: try: 'make depend' or 'gmake depend'"
++$GNU_MAKE depend || echo "Building dependencies fails: try: 'make depend' or 'gmake depend'"
+ 
+ 
+ echo "The following modules will not be compiled: {" $BAD_TARGETS "}"
diff --git a/net-p2p/mldonkey/mldonkey-2.5.21.ebuild b/net-p2p/mldonkey/mldonkey-2.5.21.ebuild
new file mode 100644
index 000000000000..19889fc58bbd
--- /dev/null
+++ b/net-p2p/mldonkey/mldonkey-2.5.21.ebuild
@@ -0,0 +1,94 @@
+# 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.1 2004/05/06 01:49:32 squinky86 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="${DEPEND}
+	 net-misc/wget"
+
+MLUSER="p2p"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-configure.patch
+}
+
+
+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 \
+		--sharedstatedir=/var/mldonkey \
+		--localstatedir=/var/mldonkey \
+		--enable-batch \
+		--enable-checks \
+		--enable-pthread || die
+
+	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
+}