Version bumped.

7 files changed, 138 insertions, 17 deletions

diff --git a/net-p2p/mldonkey/ChangeLog b/net-p2p/mldonkey/ChangeLog
index 5bc415ef3cc7..a4ac8db9cf60 100644
--- a/net-p2p/mldonkey/ChangeLog
+++ b/net-p2p/mldonkey/ChangeLog
@@ -1,6 +1,16 @@
 # 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.35 2004/04/13 15:34:42 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/ChangeLog,v 1.36 2004/04/17 10:21:19 mholzer Exp $
+
+*mldonkey-2.5.18 (17 Apr 2004)
+
+  17 Apr 2004; Martin Holzer <mholzer@gentoo.org> mldonkey-2.5.18.ebuild,
+  files/mldonkey-2.5.18-configure.patch:
+  Version bumped.
+
+  17 Apr 2004; Martin Holzer <mholzer@gentoo.org> mldonkey-2.5.16-r2.ebuild,
+  mldonkey-2.5.16-r3.ebuild:
+  adding make depend. closes 47329
 
 *mldonkey-2.5.16-r3 (13 Apr 2004)
 
diff --git a/net-p2p/mldonkey/Manifest b/net-p2p/mldonkey/Manifest
index 701f66342587..3a201d929778 100644
--- a/net-p2p/mldonkey/Manifest
+++ b/net-p2p/mldonkey/Manifest
@@ -1,23 +1,25 @@
-MD5 a85eb343a55cd43708b5f87a6400a49b ChangeLog 6227
+MD5 00776cc28732247f34bd15159abf12c0 mldonkey-2.5.12.ebuild 2308
+MD5 3ac39d0ef92399fb2ebafba28e48386d mldonkey-2.5.16-r2.ebuild 2541
+MD5 07d78c01c690fd1a4a47e0ff28506c18 mldonkey-2.5.18.ebuild 2445
 MD5 17f1cf3d075725dd7af9d1eb275347e3 metadata.xml 403
-MD5 7292d5c54f9060d0f8f0749b0751f0d3 mldonkey-2.5.16.ebuild 2289
-MD5 3e6ecf1c11e3da65afb79450daa48f3e mldonkey-2.5.16-r1.ebuild 2370
 MD5 e342293e49968c21e3765deae18df7b1 mldonkey-2.5.4.ebuild 2382
-MD5 00776cc28732247f34bd15159abf12c0 mldonkey-2.5.12.ebuild 2308
+MD5 3e6ecf1c11e3da65afb79450daa48f3e mldonkey-2.5.16-r1.ebuild 2370
+MD5 a85eb343a55cd43708b5f87a6400a49b ChangeLog 6227
+MD5 7292d5c54f9060d0f8f0749b0751f0d3 mldonkey-2.5.16.ebuild 2289
+MD5 e8f5d6cbcf2a598ab781f88332d85fb8 mldonkey-2.5.16-r3.ebuild 2607
 MD5 ad71ed2ad86083cb59a5794371f0fe69 mldonkey-2.5.11.ebuild 2220
-MD5 a31504dd97fd9f7a0da24bbbe11bbc43 mldonkey-2.5.16-r2.ebuild 2528
-MD5 560a0a4575a8a29d4bbd123358079e5b mldonkey-2.5.16-r3.ebuild 2594
-MD5 3127e746056c13574b2509e71bc074b5 files/97mldonkey 42
-MD5 f1e6da2254407fd960e161ca102e9f48 files/digest-mldonkey-2.5.16 68
+MD5 be0c71929c461b50601e8715706a4a16 files/mldonkey-2.5.16-configure.patch 540
 MD5 f1e6da2254407fd960e161ca102e9f48 files/digest-mldonkey-2.5.16-r1 68
-MD5 f0db2bfa3b5474e26617c313f071b44d files/digest-mldonkey-2.5.4 67
-MD5 ac93ed074d62909b2a496045f0740127 files/mldonkey 336
+MD5 f1e6da2254407fd960e161ca102e9f48 files/digest-mldonkey-2.5.16 68
+MD5 d68e3759e1f0f2f9a295bbf0a1c30f6b files/mldonkey-2.5.16-16g.patch 92755
+MD5 8d679a46ba72fde8ca0344975a3c4718 files/digest-mldonkey-2.5.18 68
+MD5 3127e746056c13574b2509e71bc074b5 files/97mldonkey 42
 MD5 476ec69e79e7c93a7bdaa6cb049c0857 files/mldonkey.confd 836
-MD5 d9e7f6261a7e566c4e24f870678a8e8b files/mldonkey.initd 1910
 MD5 dae23fdba15565dd81c5bd2b0fef7278 files/digest-mldonkey-2.5.11 68
-MD5 86743f63e50d672062cad31e52ac357b files/digest-mldonkey-2.5.12 68
+MD5 d9e7f6261a7e566c4e24f870678a8e8b files/mldonkey.initd 1910
+MD5 f0db2bfa3b5474e26617c313f071b44d files/digest-mldonkey-2.5.4 67
 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 86743f63e50d672062cad31e52ac357b files/digest-mldonkey-2.5.12 68
 MD5 4c161b4d814db157141bf036b6119c49 files/digest-mldonkey-2.5.16-r3 126
+MD5 ac93ed074d62909b2a496045f0740127 files/mldonkey 336
diff --git a/net-p2p/mldonkey/files/digest-mldonkey-2.5.18 b/net-p2p/mldonkey/files/digest-mldonkey-2.5.18
new file mode 100644
index 000000000000..c5ec6e2cc2f5
--- /dev/null
+++ b/net-p2p/mldonkey/files/digest-mldonkey-2.5.18
@@ -0,0 +1 @@
+MD5 592b04d07cc4483f7146940986c94ff0 mldonkey-2.5.18.tar.gz 3215717
diff --git a/net-p2p/mldonkey/files/mldonkey-2.5.18-configure.patch b/net-p2p/mldonkey/files/mldonkey-2.5.18-configure.patch
new file mode 100644
index 000000000000..e1f63660142c
--- /dev/null
+++ b/net-p2p/mldonkey/files/mldonkey-2.5.18-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.16-r2.ebuild b/net-p2p/mldonkey/mldonkey-2.5.16-r2.ebuild
index 3bfb814a2b54..da35a4d93ef9 100644
--- a/net-p2p/mldonkey/mldonkey-2.5.16-r2.ebuild
+++ b/net-p2p/mldonkey/mldonkey-2.5.16-r2.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.3 2004/04/13 15:34:42 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-2.5.16-r2.ebuild,v 1.4 2004/04/17 10:21:19 mholzer Exp $
 
 inherit eutils
 
@@ -36,6 +36,7 @@ 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 \
diff --git a/net-p2p/mldonkey/mldonkey-2.5.16-r3.ebuild b/net-p2p/mldonkey/mldonkey-2.5.16-r3.ebuild
index 3bd1f485be3c..ea9a4dbce45e 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.1 2004/04/13 15:34:42 mholzer Exp $
+# $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 $
 
 inherit eutils
 
@@ -37,6 +37,7 @@ 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 \
diff --git a/net-p2p/mldonkey/mldonkey-2.5.18.ebuild b/net-p2p/mldonkey/mldonkey-2.5.18.ebuild
new file mode 100644
index 000000000000..f2f2a405599c
--- /dev/null
+++ b/net-p2p/mldonkey/mldonkey-2.5.18.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.18.ebuild,v 1.1 2004/04/17 10:21:19 mholzer 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
+}