stable x86 version bump; remove non-working versions; new init script, #65245

11 files changed, 17 insertions, 411 deletions

diff --git a/net-p2p/mldonkey/ChangeLog b/net-p2p/mldonkey/ChangeLog
index b0822b4ef601..aec69d5075c2 100644
--- a/net-p2p/mldonkey/ChangeLog
+++ b/net-p2p/mldonkey/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-p2p/mldonkey
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/ChangeLog,v 1.76 2004/11/23 20:11:00 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/ChangeLog,v 1.77 2004/11/29 18:45:40 squinky86 Exp $
+
+  29 Nov 2004; Jon Hood <squinky86@gentoo.org> files/mldonkey.initd,
+  -mldonkey-2.5.16-r7.ebuild, -mldonkey-2.5.16-r8.ebuild,
+  mldonkey-2.5.16-r9.ebuild, -mldonkey-2.5.28-r3.ebuild,
+  -mldonkey-2.5.28.ebuild:
+  2.5.16-r9 stable on x86 due to older versions getting banned, new init
+  script from Martin Bays <gentoo_bugz@zugzwang.port5.com>, #65245,
+  cleanup old ebuilds.
 
 *mldonkey-2.5.16-r9 (23 Nov 2004)
 
diff --git a/net-p2p/mldonkey/files/digest-mldonkey-2.5.16-r7 b/net-p2p/mldonkey/files/digest-mldonkey-2.5.16-r7
deleted file mode 100644
index 27addf10ec68..000000000000
--- a/net-p2p/mldonkey/files/digest-mldonkey-2.5.16-r7
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 a64121509d6a7bb196fe0b5ce403c60b mldonkey-2.5.16.tar.gz 3214587
-MD5 50fbd2dfebfeb446f44a008607cdbd29 patch_pack16r 194331
diff --git a/net-p2p/mldonkey/files/digest-mldonkey-2.5.16-r8 b/net-p2p/mldonkey/files/digest-mldonkey-2.5.16-r8
deleted file mode 100644
index 1532a82913f7..000000000000
--- a/net-p2p/mldonkey/files/digest-mldonkey-2.5.16-r8
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 a64121509d6a7bb196fe0b5ce403c60b mldonkey-2.5.16.tar.gz 3214587
-MD5 6461994ed244d900e845039bf087b29c patch_pack16t.bz2 45645
diff --git a/net-p2p/mldonkey/files/digest-mldonkey-2.5.28 b/net-p2p/mldonkey/files/digest-mldonkey-2.5.28
deleted file mode 100644
index 2dd8e242d828..000000000000
--- a/net-p2p/mldonkey/files/digest-mldonkey-2.5.28
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5b5128ec570ec065992db25d9a434285 mldonkey-2.5.28.tar.bz2 2760339
diff --git a/net-p2p/mldonkey/files/digest-mldonkey-2.5.28-r3 b/net-p2p/mldonkey/files/digest-mldonkey-2.5.28-r3
deleted file mode 100644
index f8b15d321724..000000000000
--- a/net-p2p/mldonkey/files/digest-mldonkey-2.5.28-r3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 5b5128ec570ec065992db25d9a434285 mldonkey-2.5.28.tar.bz2 2760339
-MD5 711ae6d0517a9c37876ff7858035dcf9 patch_pack28g.gz 49820
diff --git a/net-p2p/mldonkey/files/mldonkey.initd b/net-p2p/mldonkey/files/mldonkey.initd
index 696d5f0cbe02..5179a7b795df 100644
--- a/net-p2p/mldonkey/files/mldonkey.initd
+++ b/net-p2p/mldonkey/files/mldonkey.initd
@@ -55,7 +55,12 @@ stop() {
 	wget --spider ${BASE}/submit?q=close_fds -q 
 	wget --spider ${BASE}/submit?q=save -q 
 	wget --spider ${BASE}/submit?q=kill -q 
-	sleep 10
+	# give it a chance to die:
+	local timeout=10
+	while [ $timeout -gt 0 ] && pgrep -u ${USER} mlnet &>/dev/null; do
+		sleep 1
+		let 'timeout--'
+	done
 	start-stop-daemon --oknodo --stop -x /usr/bin/mlnet &>/dev/null
 	eend $?
 }
diff --git a/net-p2p/mldonkey/mldonkey-2.5.16-r7.ebuild b/net-p2p/mldonkey/mldonkey-2.5.16-r7.ebuild
deleted file mode 100644
index 1b020776a31e..000000000000
--- a/net-p2p/mldonkey/mldonkey-2.5.16-r7.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-2.5.16-r7.ebuild,v 1.4 2004/08/10 02:26:39 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
-	http://ftp.berlios.de/pub/mldonkey/spiralvoice/patchpacks/patch_pack16r"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~ppc ~alpha ~ia64"
-
-RDEPEND="gtk? ( =dev-ml/lablgtk-1* )
-	>=dev-lang/ocaml-3.07
-	dev-lang/perl
-	net-misc/wget"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/autoconf-2.58"
-
-MLUSER="p2p"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-
-	cd ${S}
-	#Don't change this, unless you know what you are doing
-	patch -p0 < ${DISTDIR}/patch_pack16r || die
-	export WANT_AUTOCONF=2.5
-	cd config; autoconf; cd ..
-}
-
-
-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 \
-		--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
-}
-
-pkg_preinst() {
-	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-r8.ebuild b/net-p2p/mldonkey/mldonkey-2.5.16-r8.ebuild
deleted file mode 100644
index a0c1a1aecf98..000000000000
--- a/net-p2p/mldonkey/mldonkey-2.5.16-r8.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-2.5.16-r8.ebuild,v 1.3 2004/08/16 23:38:18 gmsoft 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
-	http://ftp.berlios.de/pub/mldonkey/spiralvoice/patchpacks/patch_pack16t.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~alpha ~ia64 hppa"
-
-RDEPEND="gtk? ( =dev-ml/lablgtk-1* )
-	>=dev-lang/ocaml-3.08
-	dev-lang/perl
-	net-misc/wget"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/autoconf-2.58"
-
-MLUSER="p2p"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-
-	cd ${S}
-	#Don't change this, unless you know what you are doing
-	epatch ${DISTDIR}/patch_pack16t.bz2 || die
-	export WANT_AUTOCONF=2.5
-	cd config; autoconf; cd ..
-}
-
-
-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 \
-		--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
-}
-
-pkg_preinst() {
-	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-r9.ebuild b/net-p2p/mldonkey/mldonkey-2.5.16-r9.ebuild
index 9c5251dcf3b5..786a8c7ff5fd 100644
--- a/net-p2p/mldonkey/mldonkey-2.5.16-r9.ebuild
+++ b/net-p2p/mldonkey/mldonkey-2.5.16-r9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-2.5.16-r9.ebuild,v 1.1 2004/11/23 20:11:00 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-2.5.16-r9.ebuild,v 1.2 2004/11/29 18:45:40 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 hppa"
+KEYWORDS="x86 ~ppc ~alpha ~ia64 hppa"
 
 RDEPEND="gtk? ( =dev-ml/lablgtk-1* )
 	>=dev-lang/ocaml-3.08
diff --git a/net-p2p/mldonkey/mldonkey-2.5.28-r3.ebuild b/net-p2p/mldonkey/mldonkey-2.5.28-r3.ebuild
deleted file mode 100644
index 733803561b19..000000000000
--- a/net-p2p/mldonkey/mldonkey-2.5.28-r3.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-2.5.28-r3.ebuild,v 1.1 2004/10/18 19:20:39 squinky86 Exp $
-
-inherit eutils
-
-IUSE="gtk gtk2"
-
-PATCHPACK="patch_pack28g.gz"
-
-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://download.berlios.de/pub/mldonkey/spiralvoice/cvs/${P}.tar.bz2
-	http://download.berlios.de/pub/mldonkey/spiralvoice/patchpacks/${PATCHPACK}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~alpha ~ia64 ~amd64"
-
-RDEPEND=">=dev-lang/ocaml-3.08
-	dev-lang/perl
-	net-misc/wget
-	gtk? ( !gtk2? ( =dev-ml/lablgtk-1.2.7* ) )
-	gtk? ( gtk2? ( >=dev-ml/lablgtk-2.4 ) )"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/autoconf-2.58"
-
-MLUSER="p2p"
-
-src_unpack() {
-	unpack ${P}.tar.bz2
-	cd ${S}
-	epatch ${DISTDIR}/${PATCHPACK}
-	use gtk || epatch ${FILESDIR}/${PV}-config.patch
-	export WANT_AUTOCONF=2.5
-	cd config; autoconf; cd ..
-}
-
-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 \
-		--enable-checks \
-		--enable-pthread \
-		`use_enable gtk2` || die
-	export OCAMLRUNPARAM="l=256M"
-	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
-}
-
-pkg_preinst() {
-	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.28.ebuild b/net-p2p/mldonkey/mldonkey-2.5.28.ebuild
deleted file mode 100644
index 78fceb11ee5e..000000000000
--- a/net-p2p/mldonkey/mldonkey-2.5.28.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-2.5.28.ebuild,v 1.5 2004/09/24 23:56:14 squinky86 Exp $
-
-inherit eutils
-
-IUSE="gtk gtk2"
-
-#PATCHPACK="patch_pack28a.gz"
-
-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="mirror://gentoo/${P}.tar.bz2"
-#	http://ftp.berlios.de/pub/mldonkey/spiralvoice/patchpacks/${PATCHPACK}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~alpha ~ia64 ~amd64"
-
-RDEPEND=">=dev-lang/ocaml-3.08
-	dev-lang/perl
-	net-misc/wget
-	gtk? ( !gtk2? ( =dev-ml/lablgtk-1.2.7* ) )
-	gtk? ( gtk2? ( >=dev-ml/lablgtk-2.4 ) )"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/autoconf-2.58"
-
-MLUSER="p2p"
-
-src_unpack() {
-	unpack ${P}.tar.bz2
-	cd ${S}
-#	epatch ${DISTDIR}/${PATCHPACK}
-	use gtk || epatch ${FILESDIR}/${PV}-config.patch
-	export WANT_AUTOCONF=2.5
-	cd config; autoconf; cd ..
-}
-
-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 \
-		--enable-checks \
-		--enable-pthread \
-		`use_enable gtk2` || die
-	export OCAMLRUNPARAM="l=256M"
-	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
-}
-
-pkg_preinst() {
-	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
-}