Revision bump with a fix from Alexis Ballier to build without ocamlopt

Package-Manager: portage-2.1.3.19

4 files changed, 199 insertions, 5 deletions

diff --git a/net-p2p/mldonkey/ChangeLog b/net-p2p/mldonkey/ChangeLog
index 496e3475a58a..7e6e38e194a2 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.197 2008/01/06 16:04:14 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/ChangeLog,v 1.198 2008/01/06 16:40:29 armin76 Exp $
+
+*mldonkey-2.9.2-r1 (06 Jan 2008)
+
+  06 Jan 2008; Raúl Porcel <armin76@gentoo.org> +mldonkey-2.9.2-r1.ebuild:
+  Revision bump with a fix from Alexis Ballier to build without ocamlopt
 
   06 Jan 2008; Raúl Porcel <armin76@gentoo.org> mldonkey-2.9.2.ebuild:
   Remove RESTRICT=mirror as discussed with upstream
diff --git a/net-p2p/mldonkey/Manifest b/net-p2p/mldonkey/Manifest
index 70f3f948f14e..0292af1a4942 100644
--- a/net-p2p/mldonkey/Manifest
+++ b/net-p2p/mldonkey/Manifest
@@ -23,14 +23,18 @@ MD5 855aedd7fba1ffe74d7f6c0bce98f45f files/mldonkey.png 6835
 RMD160 2ef0cbc5be4de95893b43da0281bd52f5aabb314 files/mldonkey.png 6835
 SHA256 c16ecc040b5ea82ed06b04a76c5d7304d7aca2f0854176aa8d78aa90831d8798 files/mldonkey.png 6835
 DIST mldonkey-2.9.2.tar.bz2 2721072 RMD160 6a02d02149884d9d0a24892bd76dba48862a32ac SHA1 59c4216a67876a3af7015f7826c960306650ae34 SHA256 8c9abbfcf070de0e998def133ea25a6d5aba248a8c710e1f7c2317e798d17ed7
+EBUILD mldonkey-2.9.2-r1.ebuild 4925 RMD160 1c23110d0408d9d924553d0b9b0034d497b37267 SHA1 37116a607643585d8a3089ecf502af47b0562082 SHA256 c7ed26764b0c92752a94dba907801a654cf5b2d0f636a91ba21765992e95d8db
+MD5 2b409212acd5edfcaa209670dc3f3fc3 mldonkey-2.9.2-r1.ebuild 4925
+RMD160 1c23110d0408d9d924553d0b9b0034d497b37267 mldonkey-2.9.2-r1.ebuild 4925
+SHA256 c7ed26764b0c92752a94dba907801a654cf5b2d0f636a91ba21765992e95d8db mldonkey-2.9.2-r1.ebuild 4925
 EBUILD mldonkey-2.9.2.ebuild 4296 RMD160 ab37d64c51cf2347d4ed4fd1f4ebe59c1e824af7 SHA1 d127f41d8c5dc8196b686b9ef88d6fa736be47ef SHA256 01648c6fcd8f15695d6219607d9dec6de0a13e66af0d0b85f30d45cc9506c258
 MD5 265c9b6c6327bdb1c26588e0959f9ed0 mldonkey-2.9.2.ebuild 4296
 RMD160 ab37d64c51cf2347d4ed4fd1f4ebe59c1e824af7 mldonkey-2.9.2.ebuild 4296
 SHA256 01648c6fcd8f15695d6219607d9dec6de0a13e66af0d0b85f30d45cc9506c258 mldonkey-2.9.2.ebuild 4296
-MISC ChangeLog 29795 RMD160 db031cbf498b3048a34f71cc02b1c9e83bf0ca1c SHA1 35020117915425876629290a632391b57967af25 SHA256 ee97283e7a7fb7d1fc8b775e41357f411c8988a76610fa782a2b0df569d32617
-MD5 3967d2a1170446a53000ca0c79018a37 ChangeLog 29795
-RMD160 db031cbf498b3048a34f71cc02b1c9e83bf0ca1c ChangeLog 29795
-SHA256 ee97283e7a7fb7d1fc8b775e41357f411c8988a76610fa782a2b0df569d32617 ChangeLog 29795
+MISC ChangeLog 29979 RMD160 f0fd6240985aaec01c792298c999c7aac0796ab1 SHA1 5c630707d8bf3b2390c3b63a0d9219f6a339d340 SHA256 eaf65fc192f496f6653d121a80641f94e046531aaec5f6b8184a34a8a76b433f
+MD5 9a7ea94cf2fb06a4251e9701128bd9ff ChangeLog 29979
+RMD160 f0fd6240985aaec01c792298c999c7aac0796ab1 ChangeLog 29979
+SHA256 eaf65fc192f496f6653d121a80641f94e046531aaec5f6b8184a34a8a76b433f ChangeLog 29979
 MISC metadata.xml 242 RMD160 d0edc89382298dee00d3571b62a5f457ef268751 SHA1 25511186cac54f1353a3347f72da7f5d05b9da57 SHA256 b354d71d5efbed0ff97e27564894438b42a8bd8b577007cadc6972dd37d6b5f8
 MD5 ee159929f3e247f937fe88bb1919d8bd metadata.xml 242
 RMD160 d0edc89382298dee00d3571b62a5f457ef268751 metadata.xml 242
@@ -38,3 +42,6 @@ SHA256 b354d71d5efbed0ff97e27564894438b42a8bd8b577007cadc6972dd37d6b5f8 metadata
 MD5 0ee223596a0b109c4ac9de1e6aba60ff files/digest-mldonkey-2.9.2 250
 RMD160 8fa2b2f193f841c19cb74b4aa51d6eb323e0e74b files/digest-mldonkey-2.9.2 250
 SHA256 fbef55ac9efed9b05f3ad387a6a91dbe864cc1619617e30a2250da8f3242b76f files/digest-mldonkey-2.9.2 250
+MD5 0ee223596a0b109c4ac9de1e6aba60ff files/digest-mldonkey-2.9.2-r1 250
+RMD160 8fa2b2f193f841c19cb74b4aa51d6eb323e0e74b files/digest-mldonkey-2.9.2-r1 250
+SHA256 fbef55ac9efed9b05f3ad387a6a91dbe864cc1619617e30a2250da8f3242b76f files/digest-mldonkey-2.9.2-r1 250
diff --git a/net-p2p/mldonkey/files/digest-mldonkey-2.9.2-r1 b/net-p2p/mldonkey/files/digest-mldonkey-2.9.2-r1
new file mode 100644
index 000000000000..e290e1654c8d
--- /dev/null
+++ b/net-p2p/mldonkey/files/digest-mldonkey-2.9.2-r1
@@ -0,0 +1,3 @@
+MD5 457564a0baedabe262254de660420c1c mldonkey-2.9.2.tar.bz2 2721072
+RMD160 6a02d02149884d9d0a24892bd76dba48862a32ac mldonkey-2.9.2.tar.bz2 2721072
+SHA256 8c9abbfcf070de0e998def133ea25a6d5aba248a8c710e1f7c2317e798d17ed7 mldonkey-2.9.2.tar.bz2 2721072
diff --git a/net-p2p/mldonkey/mldonkey-2.9.2-r1.ebuild b/net-p2p/mldonkey/mldonkey-2.9.2-r1.ebuild
new file mode 100644
index 000000000000..1b306a2a977c
--- /dev/null
+++ b/net-p2p/mldonkey/mldonkey-2.9.2-r1.ebuild
@@ -0,0 +1,179 @@
+# 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.2-r1.ebuild,v 1.1 2008/01/06 16:40:29 armin76 Exp $
+
+WANT_AUTOCONF=2.5
+
+inherit flag-o-matic eutils autotools
+
+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
+}
+
+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) \
+		${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
+		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 -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
+}