Version bump, bug #84100

Package-Manager: portage-2.0.51.22-r2

4 files changed, 143 insertions, 15 deletions

diff --git a/net-p2p/mldonkey/ChangeLog b/net-p2p/mldonkey/ChangeLog
index a975c33cd219..817595797fb7 100644
--- a/net-p2p/mldonkey/ChangeLog
+++ b/net-p2p/mldonkey/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-p2p/mldonkey
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/ChangeLog,v 1.82 2005/05/06 21:35:02 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/ChangeLog,v 1.83 2005/07/23 20:07:48 sekretarz Exp $
+
+*mldonkey-2.6.0 (23 Jul 2005)
+
+  23 Jul 2005; <sekretarz@gentoo.org> +mldonkey-2.6.0.ebuild:
+  Version bump, bug #84100
 
   06 May 2005; Bryan Østergaard <kloeri@gentoo.org>
   mldonkey-2.5.16-r10.ebuild:
diff --git a/net-p2p/mldonkey/Manifest b/net-p2p/mldonkey/Manifest
index 030b1215fd7b..68850fd20f6d 100644
--- a/net-p2p/mldonkey/Manifest
+++ b/net-p2p/mldonkey/Manifest
@@ -1,29 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 e4d631474942d4a724d5be73a39df379 mldonkey-2.5.21-r2.ebuild 2692
-MD5 7f02f6c9e4345bea95713ad4229c8db3 ChangeLog 13815
-MD5 29c93beb8a325548b6d81f1c5b311385 mldonkey-2.5.16-r10.ebuild 2691
+MD5 b39fcd03ba11e7701ddd4f7695ee11b3 ChangeLog 13939
 MD5 74e4ceef69a9fc3a7a76299e5f4d2ed8 metadata.xml 307
-MD5 5e2cc55c3eb55fe36b6edd16b591422d mldonkey-2.5.28-r4.ebuild 2801
-MD5 e898f4bf79d82a45616f500872d06576 mldonkey-2.5.27-r1.ebuild 2756
+MD5 29c93beb8a325548b6d81f1c5b311385 mldonkey-2.5.16-r10.ebuild 2691
 MD5 d1e60ff9e68cbc110f42d986a6156744 mldonkey-2.5.16-r9.ebuild 2664
-MD5 6df804eab9a1d919e43d09f42c700b40 files/digest-mldonkey-2.5.27-r1 129
-MD5 855aedd7fba1ffe74d7f6c0bce98f45f files/mldonkey.png 6835
+MD5 e4d631474942d4a724d5be73a39df379 mldonkey-2.5.21-r2.ebuild 2692
+MD5 e898f4bf79d82a45616f500872d06576 mldonkey-2.5.27-r1.ebuild 2756
+MD5 5e2cc55c3eb55fe36b6edd16b591422d mldonkey-2.5.28-r4.ebuild 2801
+MD5 c1ce88dd0ec14e864596660415107bb8 mldonkey-2.6.0.ebuild 3418
 MD5 a929dcdb98bcc52d06066afb45960ea9 files/2.5.28-config.patch 586
+MD5 0df6a96e1107b6967473bbfdf5f4c9d6 files/digest-mldonkey-2.5.16-r10 128
+MD5 b1c7f6fe232921bb9516c1007f34efd4 files/digest-mldonkey-2.5.16-r9 128
 MD5 f145ba120c09f53b0032ea8b3f930128 files/digest-mldonkey-2.5.21-r2 126
+MD5 6df804eab9a1d919e43d09f42c700b40 files/digest-mldonkey-2.5.27-r1 129
+MD5 4083205e52db56c9d64c4a67db61cbf2 files/digest-mldonkey-2.5.28-r4 129
 MD5 ac93ed074d62909b2a496045f0740127 files/mldonkey 336
 MD5 be0c71929c461b50601e8715706a4a16 files/mldonkey-2.5.16-configure.patch 540
-MD5 0df6a96e1107b6967473bbfdf5f4c9d6 files/digest-mldonkey-2.5.16-r10 128
-MD5 4083205e52db56c9d64c4a67db61cbf2 files/digest-mldonkey-2.5.28-r4 129
-MD5 476ec69e79e7c93a7bdaa6cb049c0857 files/mldonkey.confd 836
-MD5 b1c7f6fe232921bb9516c1007f34efd4 files/digest-mldonkey-2.5.16-r9 128
 MD5 be0c71929c461b50601e8715706a4a16 files/mldonkey-2.5.21-configure.patch 540
+MD5 476ec69e79e7c93a7bdaa6cb049c0857 files/mldonkey.confd 836
 MD5 8eb1c3cd8359a02e5bc736805a940e7f files/mldonkey.initd 2996
+MD5 855aedd7fba1ffe74d7f6c0bce98f45f files/mldonkey.png 6835
+MD5 2db375201ae817eaa7075507d9700eed files/digest-mldonkey-2.6.0 68
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCe+MgKf2g/qXtneoRAlKTAKCNYB4T9zELtzwUL4rmcPC+LlpzfQCgjnY5
-glkT0rcVuNnjwbYtTJvaMIU=
-=lVFM
+iD8DBQFC4scYZ/iYVBmujdURAqWfAJ9wkDGaDiB26Vl9kWp2B4fWygO2ewCfTD01
+1csmwVkXTkwi3KKXpPx+bQQ=
+=oS4x
 -----END PGP SIGNATURE-----
diff --git a/net-p2p/mldonkey/files/digest-mldonkey-2.6.0 b/net-p2p/mldonkey/files/digest-mldonkey-2.6.0
new file mode 100644
index 000000000000..73a1ed2e83ae
--- /dev/null
+++ b/net-p2p/mldonkey/files/digest-mldonkey-2.6.0
@@ -0,0 +1 @@
+MD5 3d9aff8eb7d44240950475ea1499ae75 mldonkey-2.6.0.tar.bz2 2622242
diff --git a/net-p2p/mldonkey/mldonkey-2.6.0.ebuild b/net-p2p/mldonkey/mldonkey-2.6.0.ebuild
new file mode 100644
index 000000000000..6aaaf8e876c6
--- /dev/null
+++ b/net-p2p/mldonkey/mldonkey-2.6.0.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-2.6.0.ebuild,v 1.1 2005/07/23 20:07:48 sekretarz Exp $
+
+inherit eutils
+
+IUSE="X gtk2 gd"
+
+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/mldonkey/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~alpha ~ia64 ~amd64"
+
+RDEPEND="dev-lang/perl
+		net-misc/wget
+		>=dev-lang/ocaml-3.08.3
+		gtk2? ( >=gnome-base/librsvg-2.4.0
+				>=dev-ml/lablgtk-2.4 )
+		X? ( !gtk2? ( =dev-ml/lablgtk-1.2.7* ) )
+		gd? ( >=media-libs/gd-2.0.28 )"
+
+DEPEND="${RDEPEND}
+	>=sys-devel/autoconf-2.58"
+
+MLUSER="p2p"
+
+pkg_setup() {
+	echo ""
+	einfo "If the compile with gui fails, and you have updated ocaml"
+	einfo "recently, you may have forgotten that you need to run"
+	einfo "/usr/portage/dev-lang/ocaml/files/ocaml-rebuild.sh"
+	einfo "to learn which ebuilds you need to recompile"
+	einfo "each time you update ocaml to a different version"
+	einfo "see the ocaml ebuild for details"
+	echo ""
+	if use gtk2; then
+		built_with_use dev-ml/lablgtk svg || \
+	die "dev-ml/lablgtk must be built with the 'svg' USE flag to use the gtk2 gui"
+	fi
+}
+
+src_unpack() {
+	unpack ${P}.tar.bz2
+	cd ${S}
+	export WANT_AUTOCONF=2.5
+	cd config; autoconf; cd ..
+}
+
+src_compile() {
+
+	econf \
+		--sysconfdir=/etc/mldonkey \
+		--sharedstatedir=/var/mldonkey \
+		--localstatedir=/var/mldonkey \
+		--enable-checks \
+		--enable-batch \
+		--enable-pthread \
+		`use_enable gtk2` \
+		`use_enable X gui` \
+		`use_enable gd` || die "Configure Failed!"
+
+	export OCAMLRUNPARAM="l=256M"
+	emake || die "Make Failed"
+}
+
+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
+	einfo "Attention: 2.6 has changed the inifiles structure, so downgrading"
+	einfo "will be problematic."
+	einfo "User settings (admin) are transferred to users.ini from "
+	einfo "downloads.ini"
+	einfo "Old ini files are automatically converted to the new format"
+	echo
+}