Version bump, closes #58891

4 files changed, 117 insertions, 2 deletions

diff --git a/net-p2p/mldonkey/ChangeLog b/net-p2p/mldonkey/ChangeLog
index 12dc3884d2e8..673b8e1f95ed 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.59 2004/07/31 19:54:19 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/ChangeLog,v 1.60 2004/08/04 03:38:24 squinky86 Exp $
+
+*mldonkey-2.5.22-r1 (03 Aug 2004)
+
+  03 Aug 2004; Jon Hood <squinky86@gentoo.org> +mldonkey-2.5.22-r1.ebuild:
+  Version bump, masking until issues in #58891 are resolved. Thanks to Benjamin
+  Schleinzer <thor@4players.de> and spiralvoice <spiralvoice@hotmail.com>.
 
   30 Jul 2004; Jon Hood <squinky86@gentoo.org> files/mldonkey
   -mldonkey-2.5.16-r4.ebuild, mldonkey-2.5.16-r6.ebuild,
diff --git a/net-p2p/mldonkey/Manifest b/net-p2p/mldonkey/Manifest
index cce431992edf..c37aa4f676f1 100644
--- a/net-p2p/mldonkey/Manifest
+++ b/net-p2p/mldonkey/Manifest
@@ -1,9 +1,10 @@
 MD5 3f6b03df09ad572b3b04c40c55814222 mldonkey-2.5.16-r7.ebuild 2628
 MD5 b63e1b28d13a3da788cc6ff78ab1f9d9 mldonkey-2.5.16-r6.ebuild 2632
 MD5 f2c214aa5ae25b64b54aef4eee0f0759 mldonkey-2.5.21-r2.ebuild 2668
+MD5 bd8581f35ff065880e792dfd58671475 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 015872d93b7a0f0784977bfb4b72a8ef ChangeLog 9974
+MD5 ca303c14f49b1ba7b970c957a64e6f24 ChangeLog 10240
 MD5 74e4ceef69a9fc3a7a76299e5f4d2ed8 metadata.xml 307
 MD5 476ec69e79e7c93a7bdaa6cb049c0857 files/mldonkey.confd 836
 MD5 9d632d54e4484981f81a2a912272f57e files/mldonkey.initd 2543
@@ -12,6 +13,7 @@ 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
+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
new file mode 100644
index 000000000000..b382f45e7d61
--- /dev/null
+++ b/net-p2p/mldonkey/files/digest-mldonkey-2.5.22-r1
@@ -0,0 +1,2 @@
+MD5 958ffb63dbcfcb0f6e48788774dfbb42 mldonkey-2.5.22.tar.gz 3474104
+MD5 9962054a7790768b4a0eacf5f05bd028 patch_pack22a.gz 7916
diff --git a/net-p2p/mldonkey/mldonkey-2.5.22-r1.ebuild b/net-p2p/mldonkey/mldonkey-2.5.22-r1.ebuild
new file mode 100644
index 000000000000..13a0b1ecd486
--- /dev/null
+++ b/net-p2p/mldonkey/mldonkey-2.5.22-r1.ebuild
@@ -0,0 +1,105 @@
+# 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.1 2004/08/04 03:38:24 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_pack22a.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~alpha ~ia64 ~hppa"
+
+RDEPEND="gtk? ( =dev-ml/lablgtk-1.2.6* )
+	>=dev-lang/ocaml-3.07
+	dev-lang/perl
+	net-misc/wget"
+#	!gtk2? ( gtk? ( =dev-ml/lablgtk-1.2.6* ) )
+#	gtk2? ( =dev-ml/lablgtk-2* )
+
+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_pack22a.gz || 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
+#		`use_enable gtk2`
+#	use gtk || use gtk2 || export GTK_CONFIG=no
+	use gtk || export GTK_CONFIG=no
+	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
+
+	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
+}