stable on x86

5 files changed, 9 insertions, 106 deletions

diff --git a/net-p2p/mldonkey/ChangeLog b/net-p2p/mldonkey/ChangeLog
index a0262a56bfbe..33546cd35e43 100644
--- a/net-p2p/mldonkey/ChangeLog
+++ b/net-p2p/mldonkey/ChangeLog
@@ -1,6 +1,10 @@
 # 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.45 2004/06/18 14:21:43 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/ChangeLog,v 1.46 2004/06/20 19:43:02 squinky86 Exp $
+
+  20 Jun 2004; Jon Hood <squinky86@gentoo.org> -mldonkey-2.5.16-r3.ebuild,
+  mldonkey-2.5.16-r4.ebuild:
+  stable on x86
 
 *mldonkey-2.5.16-r5 (18 Jun 2004)
 
diff --git a/net-p2p/mldonkey/Manifest b/net-p2p/mldonkey/Manifest
index 2d9b057bacba..486658d519fd 100644
--- a/net-p2p/mldonkey/Manifest
+++ b/net-p2p/mldonkey/Manifest
@@ -1,14 +1,12 @@
-MD5 922ffb3f226514bba8c332208429f751 mldonkey-2.5.16-r4.ebuild 2608
+MD5 9a77055c8effd0eb27525db8d1dfecaa mldonkey-2.5.16-r4.ebuild 2607
 MD5 a7760506ac5218857ad6b30d7e946c1e mldonkey-2.5.21-r2.ebuild 2732
-MD5 8729d30e6333e26a9de29c47990eab9a mldonkey-2.5.16-r3.ebuild 2607
 MD5 529dc15a5103a257630bd10cc8857e82 mldonkey-2.5.16-r5.ebuild 2608
 MD5 d9d291e4558164d50712280e0d06b0a5 mldonkey-2.5.21-r1.ebuild 2701
-MD5 13424050f5661b30ce6778feb5813748 ChangeLog 8517
+MD5 70930024d86c62ec6926a251931db757 ChangeLog 8638
 MD5 17f1cf3d075725dd7af9d1eb275347e3 metadata.xml 403
 MD5 476ec69e79e7c93a7bdaa6cb049c0857 files/mldonkey.confd 836
 MD5 d9e7f6261a7e566c4e24f870678a8e8b files/mldonkey.initd 1910
 MD5 9d462b1fffabccafe674b6138f151ed6 files/mldonkey-2.5.16-oldbt.patch 5713
-MD5 4c161b4d814db157141bf036b6119c49 files/digest-mldonkey-2.5.16-r3 126
 MD5 a5e46e41c4a0b1a00f6da0e70561427a files/digest-mldonkey-2.5.16-r4 126
 MD5 413e60164538b85e9ba290d64e24e63f files/digest-mldonkey-2.5.16-r5 126
 MD5 97c421f85a3a6aaaeb849d97400f89ca files/digest-mldonkey-2.5.21-r1 125
diff --git a/net-p2p/mldonkey/files/digest-mldonkey-2.5.16-r3 b/net-p2p/mldonkey/files/digest-mldonkey-2.5.16-r3
deleted file mode 100644
index bc3cc2177291..000000000000
--- a/net-p2p/mldonkey/files/digest-mldonkey-2.5.16-r3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 a64121509d6a7bb196fe0b5ce403c60b mldonkey-2.5.16.tar.gz 3214587
-MD5 d5bc3bb41ef451cd668f84aad75e8b80 patch_pack16k 110330
diff --git a/net-p2p/mldonkey/mldonkey-2.5.16-r3.ebuild b/net-p2p/mldonkey/mldonkey-2.5.16-r3.ebuild
deleted file mode 100644
index dc3ffcbf7563..000000000000
--- a/net-p2p/mldonkey/mldonkey-2.5.16-r3.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# 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.3 2004/05/21 18:00:30 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_pack16k"
-
-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 ${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_pack16k || 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
-
-	# 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
-}
diff --git a/net-p2p/mldonkey/mldonkey-2.5.16-r4.ebuild b/net-p2p/mldonkey/mldonkey-2.5.16-r4.ebuild
index d345c5c4d62e..170167b5d253 100644
--- a/net-p2p/mldonkey/mldonkey-2.5.16-r4.ebuild
+++ b/net-p2p/mldonkey/mldonkey-2.5.16-r4.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-r4.ebuild,v 1.1 2004/06/15 17:27:32 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-2.5.16-r4.ebuild,v 1.2 2004/06/20 19:43:02 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"
 
 DEPEND="gtk? ( =dev-ml/lablgtk-1* )
 	>=dev-lang/ocaml-3.06