bump

6 files changed, 45 insertions, 30 deletions

diff --git a/net-p2p/mldonkey/ChangeLog b/net-p2p/mldonkey/ChangeLog
index 78c94af3f982..40f07829bdc8 100644
--- a/net-p2p/mldonkey/ChangeLog
+++ b/net-p2p/mldonkey/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-p2p/mldonkey
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/ChangeLog,v 1.20 2003/10/06 06:46:50 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/ChangeLog,v 1.21 2003/10/17 17:12:50 lanius Exp $
+
+*mldonkey-2.5.4 (17 Oct 2003)
+
+  17 Oct 2003; Heinrich Wendel <lanius@gentoo.org> mldonkey-2.5-r1.ebuild,
+  mldonkey-2.5.4.ebuild, files/mldonkey:
+  version bump / --enable-batch mode / additionaly docs / bug #30983 / bug #31228
 
   07 Oct 2003; Martin Holzer <mholzer@gentoo.org> mldonkey-2.5.3-r1.ebuild,
   mldonkey-2.5.3-r2.ebuild:
diff --git a/net-p2p/mldonkey/Manifest b/net-p2p/mldonkey/Manifest
index 629dfd13d1cd..2ac7672cf782 100644
--- a/net-p2p/mldonkey/Manifest
+++ b/net-p2p/mldonkey/Manifest
@@ -1,13 +1,13 @@
 MD5 1c3aa74f82e0c813ccbce0e077ab16e1 mldonkey-2.5.3-r2.ebuild 2514
 MD5 a941817b911b7252c5b9878a54be940f mldonkey-2.02-r1.ebuild 2214
 MD5 6ea16e41cbedeea716c91fef47bf7a09 mldonkey-2.5.4.ebuild 2190
-MD5 ee9ae0792f08fa3dc0d8250b6a406216 ChangeLog 3446
+MD5 4a337b5e1bbabbbba83139e48912ebe7 mldonkey-2.5.3-r1.ebuild 2513
+MD5 2523d77a35e2c99ba567ad9a3f956650 ChangeLog 3675
 MD5 2aece486034a2d8ff26aa5ec7489bfc2 metadata.xml 398
 MD5 cc820f9d66d277f2cd46ef750e918807 files/digest-mldonkey-2.5.3-r1 75
 MD5 cc820f9d66d277f2cd46ef750e918807 files/digest-mldonkey-2.5.3-r2 75
 MD5 476ec69e79e7c93a7bdaa6cb049c0857 files/mldonkey.confd 836
 MD5 eee9f0f10ff5ca9bcea2bcaa86b96684 files/mldonkey.initd 1886
-MD5 d7470a0d99aae3be1ce3859c14e51b2b files/digest-mldonkey-2.5-r1 75
 MD5 f0db2bfa3b5474e26617c313f071b44d files/digest-mldonkey-2.5.4 67
 MD5 3127e746056c13574b2509e71bc074b5 files/97mldonkey 42
 MD5 932032bf437e5a18a40dc61e80393929 files/mldonkey 312
diff --git a/net-p2p/mldonkey/files/digest-mldonkey-2.5-r1 b/net-p2p/mldonkey/files/digest-mldonkey-2.5-r1
deleted file mode 100644
index 01f363a21ce7..000000000000
--- a/net-p2p/mldonkey/files/digest-mldonkey-2.5-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bd9866a1b42cff6022d2322b4d65158c mldonkey-2.5-0.sources.tar.gz 2544129
diff --git a/net-p2p/mldonkey/files/digest-mldonkey-2.5.4 b/net-p2p/mldonkey/files/digest-mldonkey-2.5.4
new file mode 100644
index 000000000000..4592614b0619
--- /dev/null
+++ b/net-p2p/mldonkey/files/digest-mldonkey-2.5.4
@@ -0,0 +1 @@
+MD5 ef72a0c8e1337bfcce9f80f4a94dd927 mldonkey-2.5-4.tar.gz 2534578
diff --git a/net-p2p/mldonkey/files/mldonkey b/net-p2p/mldonkey/files/mldonkey
index 65d61e9ee118..b613ca476727 100644
--- a/net-p2p/mldonkey/files/mldonkey
+++ b/net-p2p/mldonkey/files/mldonkey
@@ -10,4 +10,4 @@ if [ ! -d ${HOME}/.mldonkey ] ; then
 	fi
 fi
 
-cd ${HOME}/.mldonkey && /usr/bin/mlnet
+cd ${HOME}/.mldonkey && exec /usr/bin/mlnet
diff --git a/net-p2p/mldonkey/mldonkey-2.5-r1.ebuild b/net-p2p/mldonkey/mldonkey-2.5.4.ebuild
index ae543d6380f9..95e823434eda 100644
--- a/net-p2p/mldonkey/mldonkey-2.5-r1.ebuild
+++ b/net-p2p/mldonkey/mldonkey-2.5.4.ebuild
@@ -1,24 +1,32 @@
 # Copyright 1999-2003 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-r1.ebuild,v 1.2 2003/09/07 00:17:35 msterret Exp $
 
 IUSE="gtk"
 
-S="${WORKDIR}/${PN}"
-MY_PV="2.5"
-MY_PR="0"
+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/${PN}-${MY_PV}-${MY_PR}.sources.tar.gz"
+SRC_URI="http://savannah.nongnu.org/download/${PN}/release-${MY_PV}/official/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="~x86 ~ppc"
+
 
 DEPEND="gtk? ( >=lablgtk-1.2.4 )
-	>=dev-lang/ocaml-3.06
+	>=dev-lang/ocaml-3.0.6
 	dev-lang/perl"
+RDEPEND="net-misc/wget"
+
+MLUSER="p2p"
+
+pkg_setup() {
+	# add user
+	enewuser ${MLUSER} -1 /bin/bash /home/p2p users
+}
 
 src_compile() {
 	use gtk || export GTK_CONFIG="no"
@@ -28,7 +36,8 @@ src_compile() {
 		--sysconfdir=/etc/mldonkey \
 		--sharedstatedir=/var/mldonkey \
 		--localstatedir=/var/mldonkey \
-		--enable-ocamlver=3.06
+		--enable-ocamlver=3 \
+		--enable-batch
 
 	emake || die
 }
@@ -38,39 +47,39 @@ src_install() {
 	use gtk && dobin mlchat mlgui mlguistarter mlim mlnet+gui
 	dobin ${FILESDIR}/mldonkey
 
-	dodoc Developers.txt
-
 	cd ${S}/distrib
-	dodoc AUTHORS BUGS COPYING ChangeLog ed2k_links.txt TODO
+	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;
+	doins kill_mldonkey mldonkey_command mldonkey_previewer
 
 	insinto /usr/share/doc/${PF}/distrib
-	doins directconnect.ini;
+	doins directconnect.ini servers.ini
 
-	cd ${S}/docs/users
-	dodoc *
+	cd ${S}/docs
+	dodoc *.txt *.tex *.pdf
+	dohtml *.html
 
 	cd ${S}/docs/developers
 	dodoc *.txt *.tex
 
-	cd ${S}/docs/networks
-	dodoc *.txt *.pdf
-	dohtml *.html
-
-	docinto Gnutella
-	dodoc Gnutella/*
-
+	cd ${S}/docs/images
 	insinto /usr/share/doc/${PF}/html/images
-	doins images/*
+	doins *
+
+	insinto /etc/conf.d; newins ${FILESDIR}/mldonkey.confd mldonkey
+	exeinto /etc/init.d; newexe ${FILESDIR}/mldonkey.initd mldonkey
 }
 
 pkg_postinst() {
-	einfo ""
+	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 ""
+	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 either."
+	echo
 }