stable on x86

7 files changed, 9 insertions, 210 deletions

diff --git a/net-p2p/mldonkey/ChangeLog b/net-p2p/mldonkey/ChangeLog
index 556567ed2984..35d1f0b437e0 100644
--- a/net-p2p/mldonkey/ChangeLog
+++ b/net-p2p/mldonkey/ChangeLog
@@ -1,6 +1,10 @@
 # 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.62 2004/08/04 20:59:39 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/ChangeLog,v 1.63 2004/08/06 03:02:43 squinky86 Exp $
+
+  05 Aug 2004; Jon Hood <squinky86@gentoo.org> -mldonkey-2.5.16-r5.ebuild,
+  -mldonkey-2.5.16-r6.ebuild, mldonkey-2.5.16-r7.ebuild:
+  Stable on x86.
 
   04 Aug 2004; Jon Hood <squinky86@gentoo.org> files/mldonkey.initd:
   Fix init script thanks to Antonio <netbix@tiscali.it> in #58331 and
diff --git a/net-p2p/mldonkey/Manifest b/net-p2p/mldonkey/Manifest
index d0df8ef1f291..422810c222ec 100644
--- a/net-p2p/mldonkey/Manifest
+++ b/net-p2p/mldonkey/Manifest
@@ -1,15 +1,11 @@
-MD5 3f6b03df09ad572b3b04c40c55814222 mldonkey-2.5.16-r7.ebuild 2628
-MD5 b63e1b28d13a3da788cc6ff78ab1f9d9 mldonkey-2.5.16-r6.ebuild 2632
+MD5 dc12566c33a64f0f3b0d5c7c7dc9aab8 mldonkey-2.5.16-r7.ebuild 2632
 MD5 f2c214aa5ae25b64b54aef4eee0f0759 mldonkey-2.5.21-r2.ebuild 2668
 MD5 d6583fee78f3d381adb044978421f2aa mldonkey-2.5.22-r1.ebuild 2926
-MD5 f442072b0c1b3d1ef2680031562b04fb mldonkey-2.5.16-r5.ebuild 2600
 MD5 e9cf2cdbc9b9ee541731d598963adac9 mldonkey-2.5.21-r1.ebuild 2694
-MD5 10e23229ae930d4f3fa15caec0f46fe2 ChangeLog 10431
+MD5 3330630c06bc34d561289409b9ab7101 ChangeLog 10581
 MD5 74e4ceef69a9fc3a7a76299e5f4d2ed8 metadata.xml 307
 MD5 476ec69e79e7c93a7bdaa6cb049c0857 files/mldonkey.confd 836
 MD5 dd6c047ee9ad00cddbc438e8ea30641a files/mldonkey.initd 2858
-MD5 413e60164538b85e9ba290d64e24e63f files/digest-mldonkey-2.5.16-r5 126
-MD5 8cb26fa21496d16cfdf0abf0a88fecf2 files/digest-mldonkey-2.5.16-r6 126
 MD5 920f9e5989329dba967bff5a111911a7 files/digest-mldonkey-2.5.16-r7 126
 MD5 97c421f85a3a6aaaeb849d97400f89ca files/digest-mldonkey-2.5.21-r1 125
 MD5 f145ba120c09f53b0032ea8b3f930128 files/digest-mldonkey-2.5.21-r2 126
diff --git a/net-p2p/mldonkey/files/digest-mldonkey-2.5.16-r5 b/net-p2p/mldonkey/files/digest-mldonkey-2.5.16-r5
deleted file mode 100644
index d8fe909fbbcb..000000000000
--- a/net-p2p/mldonkey/files/digest-mldonkey-2.5.16-r5
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 a64121509d6a7bb196fe0b5ce403c60b mldonkey-2.5.16.tar.gz 3214587
-MD5 a74ef1174af20b9bb6b1327e8a33e7cb patch_pack16o 170085
diff --git a/net-p2p/mldonkey/files/digest-mldonkey-2.5.16-r6 b/net-p2p/mldonkey/files/digest-mldonkey-2.5.16-r6
deleted file mode 100644
index 88ac349ce5a3..000000000000
--- a/net-p2p/mldonkey/files/digest-mldonkey-2.5.16-r6
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 a64121509d6a7bb196fe0b5ce403c60b mldonkey-2.5.16.tar.gz 3214587
-MD5 7c659f11449e8bde0d17aac5eb1ad412 patch_pack16q 182566
diff --git a/net-p2p/mldonkey/mldonkey-2.5.16-r5.ebuild b/net-p2p/mldonkey/mldonkey-2.5.16-r5.ebuild
deleted file mode 100644
index 0d0b9bc189d8..000000000000
--- a/net-p2p/mldonkey/mldonkey-2.5.16-r5.ebuild
+++ /dev/null
@@ -1,98 +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-r5.ebuild,v 1.5 2004/07/27 13:14:20 kang 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://www.8ung.at/spiralvoice/patches/patch_pack16o"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~ppc ~alpha ~ia64"
-
-DEPEND="gtk? ( =dev-ml/lablgtk-1* )
-	>=dev-lang/ocaml-3.07
-	dev-lang/perl"
-
-RDEPEND="${DEPEND}
-	 net-misc/wget"
-
-MLUSER="p2p"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-
-	cd ${S}
-	epatch ${FILESDIR}/${P}-configure.patch
-	#Don't change this, unless you know what you are doing
-	patch -p0 < ${DISTDIR}/patch_pack16o || die
-}
-
-
-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
-}
-
-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-r6.ebuild b/net-p2p/mldonkey/mldonkey-2.5.16-r6.ebuild
deleted file mode 100644
index a02c8f240002..000000000000
--- a/net-p2p/mldonkey/mldonkey-2.5.16-r6.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-r6.ebuild,v 1.5 2004/07/31 02:14:40 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://www.8ung.at/spiralvoice/patches/patch_pack16q"
-
-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_pack16q || 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-r7.ebuild b/net-p2p/mldonkey/mldonkey-2.5.16-r7.ebuild
index c28c33088c76..329854f2fe38 100644
--- a/net-p2p/mldonkey/mldonkey-2.5.16-r7.ebuild
+++ b/net-p2p/mldonkey/mldonkey-2.5.16-r7.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-r7.ebuild,v 1.2 2004/07/27 13:14:20 kang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-2.5.16-r7.ebuild,v 1.3 2004/08/06 03:02:43 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"
+KEYWORDS="x86 ~ppc ~alpha ~ia64"
 
 RDEPEND="gtk? ( =dev-ml/lablgtk-1* )
 	>=dev-lang/ocaml-3.07