Version bump, closes #58891

5 files changed, 30 insertions, 26 deletions

diff --git a/net-p2p/mldonkey/ChangeLog b/net-p2p/mldonkey/ChangeLog
index 2f50bc4ecd14..0fd236212ae3 100644
--- a/net-p2p/mldonkey/ChangeLog
+++ b/net-p2p/mldonkey/ChangeLog
@@ -1,6 +1,13 @@
 # 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.64 2004/08/08 18:24:45 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/ChangeLog,v 1.65 2004/08/13 22:42:23 squinky86 Exp $
+
+*mldonkey-2.5.27 (13 Aug 2004)
+
+  13 Aug 2004; Jon Hood <squinky86@gentoo.org> -mldonkey-2.5.22-r1.ebuild,
+  +mldonkey-2.5.27.ebuild:
+  Version bump, closes #58891. Thanks Benjamin Schleinzer <thor@4players.de> and
+  spiralvoice <spiralvoice@hotmail.com>. Remove non-working ebuild.
 
 *mldonkey-2.5.16-r8 (08 Aug 2004)
 
diff --git a/net-p2p/mldonkey/Manifest b/net-p2p/mldonkey/Manifest
index cea5a0186b32..228e9069482e 100644
--- a/net-p2p/mldonkey/Manifest
+++ b/net-p2p/mldonkey/Manifest
@@ -1,17 +1,17 @@
 MD5 ec3b1156c3f6fd50ec8d16cea3dfa180 mldonkey-2.5.16-r7.ebuild 2651
+MD5 30a0357b9c01c154fa57f0a5d09f87b1 mldonkey-2.5.27.ebuild 2752
 MD5 56e7da52446479881edfc5eecde9b926 mldonkey-2.5.21-r2.ebuild 2692
-MD5 13cf76d7211d92c7441e89e695d89bbf mldonkey-2.5.22-r1.ebuild 2945
 MD5 561ae57caf62b73501e274d48072a120 mldonkey-2.5.16-r8.ebuild 2655
 MD5 7b8d6fbe738992a18ae16ae0b465b41c mldonkey-2.5.21-r1.ebuild 2718
-MD5 bc40b60dcca71675431d73fabb4bbd65 ChangeLog 10723
+MD5 849b1479544fcd1c87e0cf9fdfbe8cf2 ChangeLog 11007
 MD5 74e4ceef69a9fc3a7a76299e5f4d2ed8 metadata.xml 307
 MD5 476ec69e79e7c93a7bdaa6cb049c0857 files/mldonkey.confd 836
 MD5 dd6c047ee9ad00cddbc438e8ea30641a files/mldonkey.initd 2858
+MD5 ffa7e731d7939a363a30b40bec21a3c0 files/digest-mldonkey-2.5.27 129
 MD5 920f9e5989329dba967bff5a111911a7 files/digest-mldonkey-2.5.16-r7 126
 MD5 8a6a83aef1530834a8fa4e64a1b0191b files/digest-mldonkey-2.5.16-r8 129
 MD5 97c421f85a3a6aaaeb849d97400f89ca files/digest-mldonkey-2.5.21-r1 125
 MD5 f145ba120c09f53b0032ea8b3f930128 files/digest-mldonkey-2.5.21-r2 126
-MD5 fa59bfbc4040c3c978758eb7ff95bc27 files/digest-mldonkey-2.5.22-r1 127
 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.22-r1 b/net-p2p/mldonkey/files/digest-mldonkey-2.5.22-r1
deleted file mode 100644
index b382f45e7d61..000000000000
--- a/net-p2p/mldonkey/files/digest-mldonkey-2.5.22-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 958ffb63dbcfcb0f6e48788774dfbb42 mldonkey-2.5.22.tar.gz 3474104
-MD5 9962054a7790768b4a0eacf5f05bd028 patch_pack22a.gz 7916
diff --git a/net-p2p/mldonkey/files/digest-mldonkey-2.5.27 b/net-p2p/mldonkey/files/digest-mldonkey-2.5.27
new file mode 100644
index 000000000000..91668429767e
--- /dev/null
+++ b/net-p2p/mldonkey/files/digest-mldonkey-2.5.27
@@ -0,0 +1,2 @@
+MD5 8ae5ba9f31d04a2a2692091ba9c26776 mldonkey-2.5-27.tar.bz2 2763750
+MD5 9b79cd8cba292e06012f1df506b5fc2f patch_pack27b.gz 17925
diff --git a/net-p2p/mldonkey/mldonkey-2.5.22-r1.ebuild b/net-p2p/mldonkey/mldonkey-2.5.27.ebuild
index 4c3bab634d5a..74bdd6c1c0fa 100644
--- a/net-p2p/mldonkey/mldonkey-2.5.22-r1.ebuild
+++ b/net-p2p/mldonkey/mldonkey-2.5.27.ebuild
@@ -1,26 +1,29 @@
 # 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.22-r1.ebuild,v 1.3 2004/08/10 02:26:39 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-2.5.27.ebuild,v 1.1 2004/08/13 22:42:23 squinky86 Exp $
 
 inherit eutils
 
-IUSE="gtk"
+IUSE="gtk gtk2"
+
+PATCHPACK="patch_pack27b.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://savannah.nongnu.org/download/${PN}/${P}.tar.gz
-	http://ftp.berlios.de/pub/mldonkey/spiralvoice/patchpacks/patch_pack22a.gz"
+SRC_URI="http://ftp.berlios.de/pub/mldonkey/spiralvoice/cvs/${P/.5./.5-}.tar.bz2
+	http://ftp.berlios.de/pub/mldonkey/spiralvoice/patchpacks/${PATCHPACK}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~alpha ~ia64 ~hppa"
+KEYWORDS="~x86 ~ppc ~alpha ~ia64"
+
+S=${WORKDIR}
 
-RDEPEND="gtk? ( =dev-ml/lablgtk-1.2.6* )
-	>=dev-lang/ocaml-3.07
+RDEPEND=">=dev-lang/ocaml-3.07
 	dev-lang/perl
-	net-misc/wget"
-#	gtk? ( !gtk2? ( =dev-ml/lablgtk-1.2.6* ) )
-#	gtk2? ( =dev-ml/lablgtk-2* )
+	net-misc/wget
+	gtk? ( !gtk2? ( =dev-ml/lablgtk-1.2.6* ) )
+	gtk2? ( >=dev-ml/lablgtk-2.4 )"
 
 DEPEND="${RDEPEND}
 	>=sys-devel/autoconf-2.58"
@@ -28,16 +31,13 @@ DEPEND="${RDEPEND}
 MLUSER="p2p"
 
 src_unpack() {
-	unpack ${P}.tar.gz
-
+	unpack ${P/.5./.5-}.tar.bz2
 	cd ${S}
-	#Don't change this, unless you know what you are doing
-	epatch ${DISTDIR}/patch_pack22a.gz || die
+	epatch ${DISTDIR}/${PATCHPACK}
 	export WANT_AUTOCONF=2.5
 	cd config; autoconf; cd ..
 }
 
-
 src_compile() {
 	use gtk || export GTK_CONFIG="no"
 
@@ -48,17 +48,14 @@ src_compile() {
 		--localstatedir=/var/mldonkey \
 		--enable-batch \
 		--enable-checks \
-		--enable-pthread || die
-#		`use_enable gtk2`
-#	use gtk || use gtk2 || export GTK_CONFIG=no
-	use gtk || export GTK_CONFIG=no
+		--enable-pthread \
+		`use_enable gtk2` || die
 	export OCAMLRUNPARAM="l=256M"
 	emake || die
 }
 
 src_install() {
 	dobin mlnet
-#	( use gtk || use gtk2 ) && dobin mlchat mlgui mlguistarter mlim mlnet+gui
 	use gtk && dobin mlchat mlgui mlguistarter mlim mlnet+gui
 	dobin ${FILESDIR}/mldonkey