Bugfixes in the initscript (bug #29374)

4 files changed, 112 insertions, 10 deletions

diff --git a/net-p2p/mldonkey/Manifest b/net-p2p/mldonkey/Manifest
index 9ee274e8ef98..d05306d983f7 100644
--- a/net-p2p/mldonkey/Manifest
+++ b/net-p2p/mldonkey/Manifest
@@ -2,7 +2,7 @@ MD5 a075ca3d192d8bda50ab01cd32c45bc5 mldonkey-2.5-r1.ebuild 1865
 MD5 bfeaa134544aa2e4db686d3027d8425a mldonkey-2.5.3-r2.ebuild 2514
 MD5 cb323c6d5864e01b2e42613214648605 mldonkey-2.02-r1.ebuild 2213
 MD5 9090d40b22fff604790ee1f0f945ed8f mldonkey-2.5.3-r1.ebuild 2513
-MD5 2e3f322d55592f4a39a531a0f804e055 ChangeLog 3125
+MD5 59c0ef7ed709aa40a4ebe94072a4ab33 ChangeLog 3304
 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
diff --git a/net-p2p/mldonkey/files/digest-mldonkey-2.5.3-r2 b/net-p2p/mldonkey/files/digest-mldonkey-2.5.3-r2
new file mode 100644
index 000000000000..a3f450f18754
--- /dev/null
+++ b/net-p2p/mldonkey/files/digest-mldonkey-2.5.3-r2
@@ -0,0 +1 @@
+MD5 d11504a6dd1e8b5f955951d1f73236ed mldonkey-2.5-3.sources.tar.gz 2373194
diff --git a/net-p2p/mldonkey/files/mldonkey.initd b/net-p2p/mldonkey/files/mldonkey.initd
index 280e23a04583..ede74a8c52a9 100644
--- a/net-p2p/mldonkey/files/mldonkey.initd
+++ b/net-p2p/mldonkey/files/mldonkey.initd
@@ -11,7 +11,7 @@ start() {
 	if [ ! -d ${BASEDIR}/${SUBDIR} ]
 	then
 		einfo "Directory ${BASEDIR}/${SUBDIR} not existing, trying to create..."
-		su ${MLUSER} -c "mkdir ${BASEDIR}/${SUBDIR}"
+		su ${USER} -c "mkdir ${BASEDIR}/${SUBDIR}" 
 		if [ ! -d ${BASEDIR}/${DIR} ]
 		then
 			eerror "Directory ${BASEDIR}/${SUBDIR} could not be created!"
@@ -23,6 +23,10 @@ start() {
 	start-stop-daemon --quiet --start -c ${USER}  \
 	-x /usr/bin/mlnet &>${LOG} &
 	sleep 5
+	if ! pgrep -u ${USER} mlnet >/dev/null
+	then
+		eerror "MLDonkey could not be started! Check logfile: ${LOG}"
+	fi
 	renice ${NICE} -u ${USER} >/dev/null
 	eend $?
 }
@@ -35,11 +39,11 @@ stop() {
 	fi
 	BASE=${BASE}${SERVER}:${PORT}
 	ebegin "Stopping mldonkey - please wait"
-	wget --spider ${BASE}/submit?q=close_fds -q
-	wget --spider ${BASE}/submit?q=save -q
-	wget --spider ${BASE}/submit?q=kill -q
+	wget --spider ${BASE}/submit?q=close_fds -q 
+	wget --spider ${BASE}/submit?q=save -q 
+	wget --spider ${BASE}/submit?q=kill -q 
 	sleep 10
-	start-stop-daemon --oknodo --stop -x /usr/bin/mlnet
+	start-stop-daemon --oknodo --stop -x /usr/bin/mlnet &>/dev/null
 	eend $?
 }
 
@@ -59,9 +63,9 @@ slow() {
 	fi
 	BASE=${BASE}${SERVER}:${PORT}
 
-	wget --spider ${BASE}/submit?q=set+max_hard_download_rate+${LOW_DOWN} -q
+	wget --spider ${BASE}/submit?q=set+max_hard_download_rate+${LOW_DOWN} -q 
 
-	wget --spider ${BASE}/submit?q=set+max_hard_upload_rate+${LOW_UP} -q
+	wget --spider ${BASE}/submit?q=set+max_hard_upload_rate+${LOW_UP} -q 
 
 	eend $?
 }
@@ -76,9 +80,9 @@ fast() {
 	fi
 	BASE=${BASE}${SERVER}:${PORT}
 
-	wget --spider ${BASE}/submit?q=set+max_hard_download_rate+${HIGH_DOWN} -q
+	wget --spider ${BASE}/submit?q=set+max_hard_download_rate+${HIGH_DOWN} -q 
 
-	wget --spider ${BASE}/submit?q=set+max_hard_upload_rate+${HIGH_UP} -q
+	wget --spider ${BASE}/submit?q=set+max_hard_upload_rate+${HIGH_UP} -q 
 
 	eend $?
 }
diff --git a/net-p2p/mldonkey/mldonkey-2.5.3-r2.ebuild b/net-p2p/mldonkey/mldonkey-2.5.3-r2.ebuild
new file mode 100644
index 000000000000..ffc77f6822b6
--- /dev/null
+++ b/net-p2p/mldonkey/mldonkey-2.5.3-r2.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+
+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}.sources.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+
+
+DEPEND="gtk? ( >=lablgtk-1.2.4 )
+	>=dev-lang/ocaml-3.06
+	dev-lang/perl"
+RDEPEND="net-misc/wget"
+
+MLUSER="p2p"
+
+pkg_setup() {
+	# add user
+	if [ ! `getent passwd ${MLUSER} | cut -d: -f1` ]
+	then
+		useradd -s /bin/bash ${MLUSER} &>/dev/null
+		einfo Creating user ${MLUSER}...
+	fi
+	if [ ! -d `getent passwd ${MLUSER} | cut -d: -f6` ]
+	then
+		einfo Creating directory...
+		mkdir `getent passwd ${MLUSER} | cut -d: -f6`
+		chown ${MLUSER} `getent passwd ${MLUSER} | cut -d: -f6`
+	else
+		einfo User already configured.
+	fi
+	return 0
+}
+
+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.06
+
+	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
+	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
+}
+
+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 either."
+	echo
+}