version bump, closes #60714

6 files changed, 20 insertions, 119 deletions

diff --git a/net-p2p/mldonkey/ChangeLog b/net-p2p/mldonkey/ChangeLog
index c9d48acb0b18..e3c6cb844ee1 100644
--- a/net-p2p/mldonkey/ChangeLog
+++ b/net-p2p/mldonkey/ChangeLog
@@ -1,6 +1,12 @@
 # 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.67 2004/08/16 23:38:18 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/ChangeLog,v 1.68 2004/08/17 22:37:04 squinky86 Exp $
+
+*mldonkey-2.5.27-r1 (17 Aug 2004)
+
+  17 Aug 2004; Jon Hood <squinky86@gentoo.org> -mldonkey-2.5.21-r1.ebuild,
+  +mldonkey-2.5.27-r1.ebuild, -mldonkey-2.5.27.ebuild:
+  Version bump, closes #60714.
 
   16 Aug 2004; Guy Martin <gmsoft@gentoo.org> mldonkey-2.5.16-r8.ebuild:
   Marked stable on hppa (#60390).
diff --git a/net-p2p/mldonkey/Manifest b/net-p2p/mldonkey/Manifest
index 38eee5e60b24..d7fac54698b7 100644
--- a/net-p2p/mldonkey/Manifest
+++ b/net-p2p/mldonkey/Manifest
@@ -1,17 +1,15 @@
-MD5 a97b7d41497be7adc9030046905f7686 ChangeLog 11265
-MD5 74e4ceef69a9fc3a7a76299e5f4d2ed8 metadata.xml 307
-MD5 7b8d6fbe738992a18ae16ae0b465b41c mldonkey-2.5.21-r1.ebuild 2718
-MD5 56e7da52446479881edfc5eecde9b926 mldonkey-2.5.21-r2.ebuild 2692
 MD5 ec3b1156c3f6fd50ec8d16cea3dfa180 mldonkey-2.5.16-r7.ebuild 2651
+MD5 8d3ae8cd5f6b471de19912845a21beea mldonkey-2.5.27-r1.ebuild 2756
+MD5 56e7da52446479881edfc5eecde9b926 mldonkey-2.5.21-r2.ebuild 2692
 MD5 2b98f66763bd8905a795eea801eb9027 mldonkey-2.5.16-r8.ebuild 2657
-MD5 ed5c4a6dc36ec1d56aafc5006e8c7711 mldonkey-2.5.27.ebuild 2753
-MD5 97c421f85a3a6aaaeb849d97400f89ca files/digest-mldonkey-2.5.21-r1 125
-MD5 ac93ed074d62909b2a496045f0740127 files/mldonkey 336
-MD5 be0c71929c461b50601e8715706a4a16 files/mldonkey-2.5.16-configure.patch 540
-MD5 be0c71929c461b50601e8715706a4a16 files/mldonkey-2.5.21-configure.patch 540
+MD5 3aac52f1483d4db1708fb3e1d24c8954 ChangeLog 11465
+MD5 74e4ceef69a9fc3a7a76299e5f4d2ed8 metadata.xml 307
 MD5 476ec69e79e7c93a7bdaa6cb049c0857 files/mldonkey.confd 836
 MD5 dd6c047ee9ad00cddbc438e8ea30641a files/mldonkey.initd 2858
-MD5 f145ba120c09f53b0032ea8b3f930128 files/digest-mldonkey-2.5.21-r2 126
 MD5 920f9e5989329dba967bff5a111911a7 files/digest-mldonkey-2.5.16-r7 126
 MD5 8a6a83aef1530834a8fa4e64a1b0191b files/digest-mldonkey-2.5.16-r8 129
-MD5 ae3c9e1220ea79b608e241f41e5b794e files/digest-mldonkey-2.5.27 129
+MD5 f145ba120c09f53b0032ea8b3f930128 files/digest-mldonkey-2.5.21-r2 126
+MD5 6df804eab9a1d919e43d09f42c700b40 files/digest-mldonkey-2.5.27-r1 129
+MD5 be0c71929c461b50601e8715706a4a16 files/mldonkey-2.5.21-configure.patch 540
+MD5 ac93ed074d62909b2a496045f0740127 files/mldonkey 336
+MD5 be0c71929c461b50601e8715706a4a16 files/mldonkey-2.5.16-configure.patch 540
diff --git a/net-p2p/mldonkey/files/digest-mldonkey-2.5.21-r1 b/net-p2p/mldonkey/files/digest-mldonkey-2.5.21-r1
deleted file mode 100644
index ef3848e8833e..000000000000
--- a/net-p2p/mldonkey/files/digest-mldonkey-2.5.21-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 8a96738990f8ffc36eeb2c1f2f655826 mldonkey-2.5.21.tar.gz 3234137
-MD5 8fa6f16c3e2b25d0972dd40e73da4b98 patch_pack21c 36445
diff --git a/net-p2p/mldonkey/files/digest-mldonkey-2.5.27 b/net-p2p/mldonkey/files/digest-mldonkey-2.5.27-r1
index 834e98b8c243..37f4cafb075a 100644
--- a/net-p2p/mldonkey/files/digest-mldonkey-2.5.27
+++ b/net-p2p/mldonkey/files/digest-mldonkey-2.5.27-r1
@@ -1,2 +1,2 @@
 MD5 a555065d37ce02f6414014d3ac69f7a3 mldonkey-2.5.27.tar.bz2 2728731
-MD5 5b65c7203f9ea258a20973fb52e27397 patch_pack27b.gz 18444
+MD5 e27c2a8860b04113e621cd366055ce93 patch_pack27c.gz 21664
diff --git a/net-p2p/mldonkey/mldonkey-2.5.21-r1.ebuild b/net-p2p/mldonkey/mldonkey-2.5.21-r1.ebuild
deleted file mode 100644
index b5583c680ca7..000000000000
--- a/net-p2p/mldonkey/mldonkey-2.5.21-r1.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.21-r1.ebuild,v 1.6 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_pack21c"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~alpha ~ia64 hppa"
-
-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}
-	epatch ${FILESDIR}/${P}-configure.patch
-	#Don't change this, unless you know what you are doing
-	patch -p0 < ${DISTDIR}/patch_pack21c || 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
-
-	make depend || 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.27.ebuild b/net-p2p/mldonkey/mldonkey-2.5.27-r1.ebuild
index cd75001061e9..99379f04101a 100644
--- a/net-p2p/mldonkey/mldonkey-2.5.27.ebuild
+++ b/net-p2p/mldonkey/mldonkey-2.5.27-r1.ebuild
@@ -1,12 +1,12 @@
 # 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.27.ebuild,v 1.5 2004/08/16 18:36:21 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-2.5.27-r1.ebuild,v 1.1 2004/08/17 22:37:04 squinky86 Exp $
 
 inherit eutils
 
 IUSE="gtk gtk2"
 
-PATCHPACK="patch_pack27b.gz"
+PATCHPACK="patch_pack27c.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/"
@@ -20,7 +20,7 @@ KEYWORDS="~x86 ~ppc ~alpha ~ia64"
 RDEPEND=">=dev-lang/ocaml-3.08
 	dev-lang/perl
 	net-misc/wget
-	gtk? ( !gtk2? ( =dev-ml/lablgtk-1.2.6* ) )
+	gtk? ( !gtk2? ( =dev-ml/lablgtk-1.2.7* ) )
 	gtk? ( gtk2? ( >=dev-ml/lablgtk-2.4 ) )"
 
 DEPEND="${RDEPEND}