Version bump

Package-Manager: portage-2.1.2.4

4 files changed, 190 insertions, 5 deletions

diff --git a/net-p2p/mldonkey/ChangeLog b/net-p2p/mldonkey/ChangeLog
index 9b9553790d62..bddb11266db8 100644
--- a/net-p2p/mldonkey/ChangeLog
+++ b/net-p2p/mldonkey/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-p2p/mldonkey
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/ChangeLog,v 1.151 2007/04/22 11:44:42 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/ChangeLog,v 1.152 2007/04/23 11:21:03 armin76 Exp $
+
+*mldonkey-2.8.5 (23 Apr 2007)
+
+  23 Apr 2007; Raúl Porcel <armin76@gentoo.org> +mldonkey-2.8.5.ebuild:
+  Version bump
 
   22 Apr 2007; Raúl Porcel <armin76@gentoo.org> mldonkey-2.8.3.ebuild,
   mldonkey-2.8.4.ebuild:
diff --git a/net-p2p/mldonkey/Manifest b/net-p2p/mldonkey/Manifest
index 98da789ea8ad..a09a420fd126 100644
--- a/net-p2p/mldonkey/Manifest
+++ b/net-p2p/mldonkey/Manifest
@@ -20,6 +20,7 @@ RMD160 2ef0cbc5be4de95893b43da0281bd52f5aabb314 files/mldonkey.png 6835
 SHA256 c16ecc040b5ea82ed06b04a76c5d7304d7aca2f0854176aa8d78aa90831d8798 files/mldonkey.png 6835
 DIST mldonkey-2.8.3.tar.bz2 2659818 RMD160 4dc9547584c2bcf4de93a2eee420528e6d7b7814 SHA1 6b824a657b08a2fcc030cf2b4f81af8cb181e500 SHA256 454860f3dddd7e72eb97bcb57a7d2aef9b509cf0d989e0dc0c2f5f38b335663f
 DIST mldonkey-2.8.4.tar.bz2 2665209 RMD160 729e8018bbf09c8707e37132f6827b469f59faac SHA1 1934efbf900a8a15f47108a27a985e2363b76ffc SHA256 71d069dff71649e98978391158140a54c4e72ad2545e40298d12de4440a98720
+DIST mldonkey-2.8.5.tar.bz2 2663103 RMD160 fb9860603f69fb9845856405ea71eea3d047a193 SHA1 1606999a76a4dad4ccb549b455df44b6f5a779ef SHA256 fd597d3256cc8bb0e82b1028a71e381c5e7ea4a15d63d7d5d75d158aed96944c
 EBUILD mldonkey-2.8.3.ebuild 4510 RMD160 817bd841abad15d1626c84555087d6d8cab7ff9d SHA1 34d4df47b22ad63f0cb39f3b0f119ecac3cb7bc0 SHA256 8c47b477b832d388e8d7177e9f294431ab38a977963ab9e42538eba21b451277
 MD5 8f680977b92b91b387910e19b6e46a6e mldonkey-2.8.3.ebuild 4510
 RMD160 817bd841abad15d1626c84555087d6d8cab7ff9d mldonkey-2.8.3.ebuild 4510
@@ -28,10 +29,14 @@ EBUILD mldonkey-2.8.4.ebuild 4515 RMD160 c27e58a04384f196fbe3b53b42b224f5ea6edf5
 MD5 ee42eacca15d1801580f6a03fe8e966d mldonkey-2.8.4.ebuild 4515
 RMD160 c27e58a04384f196fbe3b53b42b224f5ea6edf55 mldonkey-2.8.4.ebuild 4515
 SHA256 802216ad176167e1994128e244ab74120a46d84fd1ab3888bf861559556e96c7 mldonkey-2.8.4.ebuild 4515
-MISC ChangeLog 24609 RMD160 3a0c88126bc1a951be91d97ff1aa0d88efc6ed46 SHA1 df4b1edbae5342da444e7c53cff113ab49fa08d5 SHA256 2cd78b3da1cd4b1a4e982db753ef69c2b526c0cf814a2e92505f61950f560572
-MD5 4f370abd1bc2237c88455dc3181b18db ChangeLog 24609
-RMD160 3a0c88126bc1a951be91d97ff1aa0d88efc6ed46 ChangeLog 24609
-SHA256 2cd78b3da1cd4b1a4e982db753ef69c2b526c0cf814a2e92505f61950f560572 ChangeLog 24609
+EBUILD mldonkey-2.8.5.ebuild 4515 RMD160 cd77dbba74ae8ab6244596777d7ca2951f3a819f SHA1 d021b24a1c159a9d5695caffbc094b795f1a6403 SHA256 29be9c2c8a3f233a9d38926a8904c67664484ebfabd188af8c8bd47eede903cb
+MD5 0009656e3ff4603e9e2e5a9d1f832538 mldonkey-2.8.5.ebuild 4515
+RMD160 cd77dbba74ae8ab6244596777d7ca2951f3a819f mldonkey-2.8.5.ebuild 4515
+SHA256 29be9c2c8a3f233a9d38926a8904c67664484ebfabd188af8c8bd47eede903cb mldonkey-2.8.5.ebuild 4515
+MISC ChangeLog 24729 RMD160 60bcfba386b659e0897fc714fc20fea1c7840f57 SHA1 f28299fad29b706b4cc5749073e80ffe588d6b91 SHA256 6f1a97c49099c06c5b588b6911841c68750617c0c08cddbdb5363187e80e632e
+MD5 c7d8f53d75befb029294dd314db526af ChangeLog 24729
+RMD160 60bcfba386b659e0897fc714fc20fea1c7840f57 ChangeLog 24729
+SHA256 6f1a97c49099c06c5b588b6911841c68750617c0c08cddbdb5363187e80e632e ChangeLog 24729
 MISC metadata.xml 242 RMD160 d0edc89382298dee00d3571b62a5f457ef268751 SHA1 25511186cac54f1353a3347f72da7f5d05b9da57 SHA256 b354d71d5efbed0ff97e27564894438b42a8bd8b577007cadc6972dd37d6b5f8
 MD5 ee159929f3e247f937fe88bb1919d8bd metadata.xml 242
 RMD160 d0edc89382298dee00d3571b62a5f457ef268751 metadata.xml 242
@@ -42,3 +47,6 @@ SHA256 458be0c5dae9781c1236e54ac527e18977c81d6a3254545e6dab9f2568c5b50a files/di
 MD5 fae11296270e9fc58d9561f019e20b45 files/digest-mldonkey-2.8.4 250
 RMD160 94dec0ce8aa6e3a821bbed0878108dc890c7cb17 files/digest-mldonkey-2.8.4 250
 SHA256 3d2752b72030f40ed7d080071886bc00d448373a99e259fc8a7e9ffb935df0cd files/digest-mldonkey-2.8.4 250
+MD5 344e29bc554fdb5ff5b10ac2b4c2008e files/digest-mldonkey-2.8.5 250
+RMD160 b5a9af964b3df8049ec86c7c894080e60525f3f4 files/digest-mldonkey-2.8.5 250
+SHA256 9bb81c9130e7d1f570061d0a3e9c21126e72c07c4957c83d1afaf638fb87bd18 files/digest-mldonkey-2.8.5 250
diff --git a/net-p2p/mldonkey/files/digest-mldonkey-2.8.5 b/net-p2p/mldonkey/files/digest-mldonkey-2.8.5
new file mode 100644
index 000000000000..31393aea2281
--- /dev/null
+++ b/net-p2p/mldonkey/files/digest-mldonkey-2.8.5
@@ -0,0 +1,3 @@
+MD5 d72ade5d5d14aeb2d43bb1e452bc3c56 mldonkey-2.8.5.tar.bz2 2663103
+RMD160 fb9860603f69fb9845856405ea71eea3d047a193 mldonkey-2.8.5.tar.bz2 2663103
+SHA256 fd597d3256cc8bb0e82b1028a71e381c5e7ea4a15d63d7d5d75d158aed96944c mldonkey-2.8.5.tar.bz2 2663103
diff --git a/net-p2p/mldonkey/mldonkey-2.8.5.ebuild b/net-p2p/mldonkey/mldonkey-2.8.5.ebuild
new file mode 100644
index 000000000000..a61d7cba4880
--- /dev/null
+++ b/net-p2p/mldonkey/mldonkey-2.8.5.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-2.8.5.ebuild,v 1.1 2007/04/23 11:21:03 armin76 Exp $
+
+inherit flag-o-matic
+
+IUSE="doc fasttrack gd gnutella gtk guionly magic"
+
+DESCRIPTION="MLDonkey is a multi-network P2P application written in Ocaml, coming with its own Gtk GUI, web and telnet interface."
+HOMEPAGE="http://mldonkey.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
+RESTRICT="nomirror"
+
+RDEPEND="dev-lang/perl
+	guionly? ( >=gnome-base/librsvg-2.4.0
+			>=dev-ml/lablgtk-2.6 )
+	gtk? ( >=gnome-base/librsvg-2.4.0
+			>=dev-ml/lablgtk-2.6 )
+	gd? ( >=media-libs/gd-2.0.28 )
+	magic? ( sys-apps/file )"
+
+DEPEND="${RDEPEND}
+	>=sys-devel/autoconf-2.58
+	>=dev-lang/ocaml-3.08.3"
+
+MLUSER="p2p"
+
+pkg_setup() {
+	if use gtk; then
+		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 ""
+	fi
+
+	if use gtk && !(built_with_use dev-ml/lablgtk svg); then
+		eerror "dev-ml/lablgtk must be built with the 'svg' USE flag to use the gtk gui"
+		die "Recompile dev-ml/lablgtk with enabled svg USE flag"
+	fi
+
+	if use gd && !(built_with_use media-libs/gd truetype); then
+		eerror "media-libs/gd must be built with 'truetype' to compile"
+		eerror "MLDonkey with gd support"
+		die "Recompile media-libs/gd with enabled truetype USE flag"
+	fi
+}
+
+src_unpack() {
+	unpack ${A} && cd "${S}"
+
+	export WANT_AUTOCONF=2.5
+	cd "${S}"/config
+	autoconf
+	cd "${S}"
+}
+
+src_compile() {
+	append-ldflags -Wl,-z,noexecstack
+
+	# the dirs are not (yet) used, but it doesn't hurt to specify them anyway
+
+	# onlygui	Disable all nets support, build only chosen GUI
+
+	if use gtk || use guionly; then
+		myconf="--enable-gui=newgui2"
+	else
+		myconf="--disable-gui"
+	fi
+
+	if use guionly; then
+		myconf="${myconf} --disable-multinet --disable-donkey"
+	fi
+
+	cd ${S}
+	econf \
+		--sysconfdir=/etc/mldonkey \
+		--sharedstatedir=/var/mldonkey \
+		--localstatedir=/var/mldonkey \
+		--enable-checks \
+		--disable-batch \
+		$(use_enable fasttrack) \
+		$(use_enable gnutella) \
+		$(use_enable gnutella gnutella2) \
+		$(use_enable gd) \
+		$(use_enable magic) \
+		${myconf} || die "econf failed"
+
+	export OCAMLRUNPARAM="l=256M"
+	emake || die "emake failed"
+
+	if ! use guionly; then
+		emake utils || die "emake utils failed"
+	fi;
+}
+
+src_install() {
+	if ! use guionly; then
+		dobin mlnet mld_hash get_range copysources make_torrent subconv \
+			${FILESDIR}/mldonkey || die "dobin failed"
+
+		newconfd "${FILESDIR}/mldonkey.confd-2.8" mldonkey
+		fperms 600 /etc/conf.d/mldonkey
+		newinitd "${FILESDIR}/mldonkey.initd-2.8-r1" mldonkey
+	fi
+
+	if use gtk; then
+		dobin mlgui mlguistarter || die "dobin failed"
+		domenu ${FILESDIR}/${PN}-gui.desktop
+		doicon ${FILESDIR}/${PN}.png
+	fi
+
+	if use doc ; then
+		cd ${S}/distrib
+		dodoc ChangeLog *.txt
+		dohtml *.html
+
+		insinto /usr/share/doc/${PF}/scripts
+		doins kill_mldonkey mldonkey_command mldonkey_previewer make_buginfo
+
+		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 *
+	fi
+}
+
+pkg_preinst() {
+	if ! use guionly; then
+		enewuser ${MLUSER} -1 /bin/bash /home/p2p users
+	fi
+}
+
+pkg_postinst() {
+	if ! use guionly; then
+		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
+	else
+		echo
+		einfo "Simply run mlgui to start the chosen MLDonkey gui."
+		einfo "It puts its config files into ~/.mldonkey"
+	fi
+}