Version bump wrt #345871

Package-Manager: portage-2.1.8.3/cvs/Linux ia64

4 files changed, 178 insertions, 3 deletions

diff --git a/net-p2p/mldonkey/ChangeLog b/net-p2p/mldonkey/ChangeLog
index 5c35a9332fd9..0bfb9035217a 100644
--- a/net-p2p/mldonkey/ChangeLog
+++ b/net-p2p/mldonkey/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-p2p/mldonkey
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/ChangeLog,v 1.232 2010/09/29 13:35:02 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/ChangeLog,v 1.233 2010/11/20 16:06:51 armin76 Exp $
+
+*mldonkey-3.0.6 (20 Nov 2010)
+
+  20 Nov 2010; Raúl Porcel <armin76@gentoo.org> +mldonkey-3.0.6.ebuild,
+  metadata.xml:
+  Version bump wrt #345871
 
 *mldonkey-3.0.5 (29 Sep 2010)
 
diff --git a/net-p2p/mldonkey/Manifest b/net-p2p/mldonkey/Manifest
index ddf078373b4d..9c6c855bfa06 100644
--- a/net-p2p/mldonkey/Manifest
+++ b/net-p2p/mldonkey/Manifest
@@ -3,7 +3,9 @@ AUX mldonkey.confd-2.8 887 RMD160 0575b16320fc74fbe417150315d2247a536259d1 SHA1
 AUX mldonkey.initd 3516 RMD160 87962db06a64a64f052f1c9d00f93990136f70f7 SHA1 70368d67b319aff533f649af11b3f62b7a389dd6 SHA256 1df5a055e83af8003a01b7de5deacf8ab248483e8663799deca2dd4750de6e9e
 DIST mldonkey-3.0.0.tar.bz2 2723830 RMD160 c53efda6b513bbfd2dcd71804600b0906252e463 SHA1 8d3f1808578bb145655050c0224f512afe0266b5 SHA256 27235f1e3aeae7ddb392b2d9b0963d464f21539bcb15c85c576876b8ac63fb7f
 DIST mldonkey-3.0.5.tar.bz2 2780580 RMD160 242e5ff14e592f06f89a4066bb821ad3229ec6b3 SHA1 1cd1b1ad9f7b49d7171ab300a38c9539a53901a5 SHA256 de578283350e084e14db8b45871413c491c1cdff1095ae47929f79f093bf0ded
+DIST mldonkey-3.0.6.tar.bz2 2797869 RMD160 03946aea01fba9c50bf18bbe4ebabb151e7b15f7 SHA1 bcd9ff725ff4dcd42410bd88797d7ce73e8a3c8a SHA256 6de10af253cd5d742959152a908a0199e4a1e9ee762dc5f1a3adc9c17dd65e04
 EBUILD mldonkey-3.0.0.ebuild 4675 RMD160 ccef98522e658eddfa5eb4e60e1252d5c10d76ac SHA1 62a3e581e12df95bac0ccb2e5237528c9bbb367f SHA256 67e13240f74f496e4fc46f5c3d8065a2bc91fc3998d1390b81a26f70495a4c0c
 EBUILD mldonkey-3.0.5.ebuild 4378 RMD160 47b2353705b5ce5ed363d98c154729e084c4138e SHA1 f6df168bc409a3b8fe963d2c27c7ed7d041d2f1f SHA256 c1eab014603c8346cbba935891514dd1aa5b2931edca83c8fd0bb76198e80dff
-MISC ChangeLog 34061 RMD160 b9759ff6714e64a3323cd02e5091da910597285e SHA1 6772f4ec6ba99d08aa08f532399e4e23578759da SHA256 b3bb3749a98bbcd6d534173e9b2097ce68a9f383607ce49330195a9ac2a8ccb2
-MISC metadata.xml 503 RMD160 044c4aaffa74dbb41eda58eb511c84e7a83c9925 SHA1 bedbf550e3835d0c723ee3ea03db560fe6b45508 SHA256 666afce1ad16b273e77fe5f7c2dcba916b7876dc5c99337b832738ab60f1ce9e
+EBUILD mldonkey-3.0.6.ebuild 4464 RMD160 92c45c9d72f646f2ae6a4b9b19907ff38198a071 SHA1 74e75055a0eec305ef1a3024e1f14f3e01dceb15 SHA256 902761fc01f8a97b2b28057fb807928528e83e869cc453954609685b4127d2f4
+MISC ChangeLog 34209 RMD160 9eff9698d8a2f91e9e14291728e80d34046a4393 SHA1 157a4222ac86af04705e0da3e303715c1aba1eef SHA256 44340686c4db3d52016cbd4bcf0e472677f527d0494522e20be56fdd2341c81a
+MISC metadata.xml 564 RMD160 3824893627f0886df31af808d0e3787aef125ebc SHA1 c9d05ddf0fe5e5b32e24ab6d6178bd19137fa3cc SHA256 06a76f0d96cc3e02c4b139a71b27860ce5b7dfff39e4aadcb2fb1d633028d2c8
diff --git a/net-p2p/mldonkey/metadata.xml b/net-p2p/mldonkey/metadata.xml
index ad6ba14e38ca..e8dccd40e8af 100644
--- a/net-p2p/mldonkey/metadata.xml
+++ b/net-p2p/mldonkey/metadata.xml
@@ -4,6 +4,7 @@
   <herd>net-p2p</herd>
   <longdescription>An ocaml client to access the eDonkey network.</longdescription>
   <use>
+    <flag name="bittorrent">enable bittorrent support</flag>
     <flag name="fasttrack">enable fasttrack support</flag>
     <flag name="gnutella">enable gnutella and gnutella2 support</flag>
     <flag name="guionly">enable client build only</flag>
diff --git a/net-p2p/mldonkey/mldonkey-3.0.6.ebuild b/net-p2p/mldonkey/mldonkey-3.0.6.ebuild
new file mode 100644
index 000000000000..e6fbc82897d1
--- /dev/null
+++ b/net-p2p/mldonkey/mldonkey-3.0.6.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-3.0.6.ebuild,v 1.1 2010/11/20 16:06:51 armin76 Exp $
+
+EAPI="2"
+WANT_AUTOCONF=2.5
+
+inherit flag-o-matic eutils autotools toolchain-funcs
+
+IUSE="bittorrent 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[svg] )
+	gd? ( >=media-libs/gd-2.0.28[truetype] )
+	magic? ( sys-apps/file )"
+
+DEPEND="${RDEPEND}
+	>=dev-lang/ocaml-3.10.2[ocamlopt?]
+	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
+
+	# 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_prepare() {
+	cd "${S}"/config
+	eautoconf
+	cd "${S}"
+	use ocamlopt || sed -i -e "s/ocamlopt/idontwantocamlopt/g" "${S}/config/configure" || die "failed to disable ocamlopt"
+}
+
+src_configure() {
+	# 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 bittorrent) \
+		$(use_enable fasttrack) \
+		$(use_enable gnutella) \
+		$(use_enable gnutella gnutella2) \
+		$(use_enable gd) \
+		$(use_enable magic) \
+		${myconf} || die "econf failed"
+}
+
+src_compile() {
+	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 subconv; do
+			newbin $i$myext $i || die "failed to install $i"
+		done
+		use bittorrent && newbin make_torrent$myext make_torrent
+
+		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
+	else
+		echo
+		einfo "Simply run mlgui to start the chosen MLDonkey gui."
+		einfo "It puts its config files into ~/.mldonkey"
+	fi
+}