Version bump

Package-Manager: portage-2.1.4.4

4 files changed, 199 insertions, 4 deletions

diff --git a/net-p2p/frostwire/Manifest b/net-p2p/frostwire/Manifest
index c3f5a36dd702..529a2781630b 100644
--- a/net-p2p/frostwire/Manifest
+++ b/net-p2p/frostwire/Manifest
@@ -1,4 +1,4 @@
 DIST frostwire-4.13.5.src.tar.gz 11039597 RMD160 79f3dc3b62c15744a8994ec1b3c0ebbac62612e6 SHA1 b614cf50956c2cfa8e5d3da140d43d5d7ef06bdb SHA256 5c064e1beac7ecbd497d2da5a512b2513d4345857af48189801c1835799c47ab
-EBUILD frostwire-4.13.5-r1.ebuild 3697 RMD160 168035a6add599b24768a1fd8cd35e27f7844102 SHA1 34ad0423def00752395e8eb66bef2bcdd3b151ff SHA256 af720abb1b908d57b1e019f5a1a9d4f42db7ef26bc595ed4ea741993a1bd9ee0
-MISC ChangeLog 1321 RMD160 9fbde352d3ede12c94b25733dd002886157d8c9e SHA1 36118238770e75699c849180c6e19e9b6e66863b SHA256 c101d424bcfa22b68df4cf82eb19efb2e4c85740600d6f86376df56f33bb5b9c
+EBUILD frostwire-4.13.5-r1.ebuild 3699 RMD160 926694c2e2faf5d7421ee9cbd89b79602ed162f2 SHA1 3243f64047a9a951398cc595bd622b76866de1db SHA256 f60f60174942305d1394d0343732723a3b2f79bbb9bbf8a90048df9ca1a2cda0
+MISC ChangeLog 1505 RMD160 199a6484afdf1d860dffe4fdccb67942bfea9edd SHA1 437f433111ec8bc6c58d4377f055db338def7309 SHA256 dad506d42db91d358be9d039f1846ada97ec7fe32dd3a7e2714e24b81c668b0c
 MISC metadata.xml 735 RMD160 6f3b1be952084a34db1c2b3c9c8d9abdca90d200 SHA1 13dd1257beb56d7adc090f257ba9bb5b19aee40e SHA256 5a80fd0f2165cab6c840db76bf0a7790115abf3870e1d5a729f481e6fa6fbe75
diff --git a/net-p2p/mldonkey/ChangeLog b/net-p2p/mldonkey/ChangeLog
index 632348e865b6..e1c784d39ba4 100644
--- a/net-p2p/mldonkey/ChangeLog
+++ b/net-p2p/mldonkey/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-p2p/mldonkey
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/ChangeLog,v 1.217 2008/07/03 19:15:56 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/ChangeLog,v 1.218 2008/08/05 18:09:54 armin76 Exp $
+
+*mldonkey-2.9.6 (05 Aug 2008)
+
+  05 Aug 2008; Raúl Porcel <armin76@gentoo.org> +mldonkey-2.9.6.ebuild:
+  Version bump
 
   03 Jul 2008; Raúl Porcel <armin76@gentoo.org> -mldonkey-2.9.4.ebuild:
   old
diff --git a/net-p2p/mldonkey/Manifest b/net-p2p/mldonkey/Manifest
index 8a11e3efc2c5..e7219889d3aa 100644
--- a/net-p2p/mldonkey/Manifest
+++ b/net-p2p/mldonkey/Manifest
@@ -2,6 +2,8 @@ AUX 2.9.5-execstacks.patch 1542 RMD160 cfada9b8a9f88f813e2946448a8199617f4dbe61
 AUX mldonkey.confd-2.8 887 RMD160 0575b16320fc74fbe417150315d2247a536259d1 SHA1 28000a260fe9b7c216112ba877f55835a09aabd7 SHA256 d395ecece23a23dcb41addf63b70220996011ceb29d8738afb3c048b666cd96e
 AUX mldonkey.initd 3516 RMD160 87962db06a64a64f052f1c9d00f93990136f70f7 SHA1 70368d67b319aff533f649af11b3f62b7a389dd6 SHA256 1df5a055e83af8003a01b7de5deacf8ab248483e8663799deca2dd4750de6e9e
 DIST mldonkey-2.9.5.tar.bz2 2717212 RMD160 d7f8672c1f83e8f7ec4973cdffc2adb1a0a2526b SHA1 ed7ab26049f70606bdd924e039cc36b4d9660417 SHA256 b0974e47e8efe57455d04adc6126a780ed7020e79da6421f5da344bf84a712bb
+DIST mldonkey-2.9.6.tar.bz2 2718844 RMD160 f88ca0224e484be67d836038683bcf5c2bb5bac6 SHA1 3c52b11e906aa08d1c4132e3bb23756d447f20f9 SHA256 27cc8ae95aa7a2934b6cc9b077d10ca6a776496c051d8f35d60f1e73d38fd505
 EBUILD mldonkey-2.9.5.ebuild 5476 RMD160 232eb124a4fe4b7e5f9c3334a4c42aff42da67a5 SHA1 d2f54a9ab25f8e811313589d57fe1856122f2fd0 SHA256 16d1ded5fd4b9d8386ee57b5cab86d350a93ef76b0b09882cc8c2d082501a43e
-MISC ChangeLog 32426 RMD160 04deada2da2ee03cdc6d85193fb15f82805988a7 SHA1 709fee0d445c93260e4243b7931af760d3916914 SHA256 e42214edb1e4b5377e70990db0c673ba0357dc602cdd00ca0f04128571be434d
+EBUILD mldonkey-2.9.6.ebuild 5438 RMD160 2fba3b9a13a20129b890563a678213f6ab376143 SHA1 1a7445b64a404ce215e2e4d8cdb85b841a7aa2c7 SHA256 cd9ab3229047b292c18368a146a16691bf72d728c4e8be08ed2e1ef5dfdfa1b1
+MISC ChangeLog 32546 RMD160 3e71e6ac6b8644baa1d51353acfd5f3fac9e59f6 SHA1 6b32207c5e3bde033f1cf57e25750794c70570ad SHA256 f771bc2e2ff6df5a0f71afe5ffccb8ccb84e9106e16e804616e69578feaafb6c
 MISC metadata.xml 242 RMD160 d0edc89382298dee00d3571b62a5f457ef268751 SHA1 25511186cac54f1353a3347f72da7f5d05b9da57 SHA256 b354d71d5efbed0ff97e27564894438b42a8bd8b577007cadc6972dd37d6b5f8
diff --git a/net-p2p/mldonkey/mldonkey-2.9.6.ebuild b/net-p2p/mldonkey/mldonkey-2.9.6.ebuild
new file mode 100644
index 000000000000..33e6b409d8a8
--- /dev/null
+++ b/net-p2p/mldonkey/mldonkey-2.9.6.ebuild
@@ -0,0 +1,188 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-2.9.6.ebuild,v 1.1 2008/08/05 18:09:54 armin76 Exp $
+
+WANT_AUTOCONF=2.5
+
+inherit flag-o-matic eutils autotools toolchain-funcs
+
+EAPI="1"
+
+IUSE="doc fasttrack gd gnutella gtk guionly magic +ocamlopt"
+
+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 ~x86-fbsd"
+
+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}
+	>=dev-lang/ocaml-3.08.3
+	sys-apps/sed"
+
+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
+	if use ocamlopt && ! built_with_use --missing true dev-lang/ocaml ocamlopt; then
+		eerror "In order to build ${PN} with native code support from ocaml"
+		eerror "You first need to have a native code ocaml compiler."
+		eerror "You need to install dev-lang/ocaml with ocamlopt useflag on."
+		die "Please install ocaml with ocamlopt useflag"
+	fi
+	# dev-lang/ocaml creates its own objects but calls gcc for linking, which will
+	# results in relocations if gcc wants to create a PIE executable
+	if gcc-specs-pie ; then
+		append-ldflags -nopie
+		ewarn "Ocaml generates its own native asm, you're using a PIE compiler"
+		ewarn "We have appended -nopie to ocaml build options"
+		ewarn "because linking an executable with pie while the objects are not pic will not work"
+	fi
+}
+
+src_unpack() {
+	unpack ${A} && cd "${S}"
+
+	cd "${S}"/config
+	eautoconf
+	cd "${S}"
+	use ocamlopt || sed -i -e "s/ocamlopt/idontwantocamlopt/g" "${S}/config/configure" || die "failed to disable ocamlopt"
+}
+
+src_compile() {
+	# 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) \
+		--enable-ocamlver=3.10 \
+		${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() {
+	local myext=""
+	use ocamlopt || myext=".byte"
+	use ocamlopt || export STRIP_MASK="*/bin/*"
+	if ! use guionly; then
+		for i in mlnet mld_hash get_range copysources make_torrent subconv; do
+			newbin $i$myext $i || die "failed to install $i"
+		done
+
+		newconfd "${FILESDIR}/mldonkey.confd-2.8" mldonkey
+		fperms 600 /etc/conf.d/mldonkey
+		newinitd "${FILESDIR}/mldonkey.initd" mldonkey
+	fi
+
+	if use gtk; then
+		for i in mlgui mlguistarter; do
+			newbin $i$myext $i || die "failed to install $i"
+		done
+		make_desktop_entry mlgui "MLDonkey GUI" mldonkey "Network;P2P"
+		newicon "${S}"/packages/rpm/mldonkey-icon-48.png ${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 -1 /home/p2p users
+	fi
+}
+
+pkg_postinst() {
+	if ! use guionly; then
+		echo
+		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
+}