Version bump, added mozilla use flag and installing ed2k handler for mozilla/firefox, installing of desktop file. Thanks Przemyslaw Maciag <p_maciag@wp.pl> in bug #102097

Package-Manager: portage-2.0.51.22-r2

5 files changed, 237 insertions, 14 deletions

diff --git a/net-p2p/mldonkey/ChangeLog b/net-p2p/mldonkey/ChangeLog
index 86178ac608af..fde1e815c0e9 100644
--- a/net-p2p/mldonkey/ChangeLog
+++ b/net-p2p/mldonkey/ChangeLog
@@ -1,6 +1,14 @@
 # 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.86 2005/08/07 13:40:37 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/ChangeLog,v 1.87 2005/08/20 23:45:36 sekretarz Exp $
+
+*mldonkey-2.6.2 (21 Aug 2005)
+
+  21 Aug 2005; <sekretarz@gentoo.org> +files/mldonkey-gui.desktop,
+  +mldonkey-2.6.2.ebuild:
+  Version bump, added mozilla use flag and installing ed2k handler for
+  mozilla/firefox, installing of desktop file. Thanks Przemyslaw Maciag
+  <p_maciag@wp.pl> in bug #102097
 
   07 Aug 2005; Michael Hanselmann <hansmi@gentoo.org>
   mldonkey-2.5.16-r9.ebuild:
diff --git a/net-p2p/mldonkey/Manifest b/net-p2p/mldonkey/Manifest
index ad9386357cd5..562baab425e7 100644
--- a/net-p2p/mldonkey/Manifest
+++ b/net-p2p/mldonkey/Manifest
@@ -1,22 +1,35 @@
-MD5 29c93beb8a325548b6d81f1c5b311385 mldonkey-2.5.16-r10.ebuild 2691
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 025d675c80640fef94b37a459f1bb465 ChangeLog 14660
 MD5 74e4ceef69a9fc3a7a76299e5f4d2ed8 metadata.xml 307
-MD5 21af0ab6db3a70e8d04a2bd3506995a4 ChangeLog 14355
+MD5 29c93beb8a325548b6d81f1c5b311385 mldonkey-2.5.16-r10.ebuild 2691
+MD5 a92ec1a9e1c381c49b544c81221a8bd0 mldonkey-2.5.16-r9.ebuild 2660
 MD5 e4d631474942d4a724d5be73a39df379 mldonkey-2.5.21-r2.ebuild 2692
-MD5 0eb263f37a1d27990436054b98ed0f99 mldonkey-2.6.0.ebuild 3563
 MD5 e898f4bf79d82a45616f500872d06576 mldonkey-2.5.27-r1.ebuild 2756
-MD5 a92ec1a9e1c381c49b544c81221a8bd0 mldonkey-2.5.16-r9.ebuild 2660
 MD5 5e2cc55c3eb55fe36b6edd16b591422d mldonkey-2.5.28-r4.ebuild 2801
-MD5 855aedd7fba1ffe74d7f6c0bce98f45f files/mldonkey.png 6835
-MD5 476ec69e79e7c93a7bdaa6cb049c0857 files/mldonkey.confd 836
-MD5 6df804eab9a1d919e43d09f42c700b40 files/digest-mldonkey-2.5.27-r1 129
+MD5 0eb263f37a1d27990436054b98ed0f99 mldonkey-2.6.0.ebuild 3563
+MD5 22becfd3bff5607d5b441c1398eea660 mldonkey-2.6.2.ebuild 5162
 MD5 a929dcdb98bcc52d06066afb45960ea9 files/2.5.28-config.patch 586
-MD5 2db375201ae817eaa7075507d9700eed files/digest-mldonkey-2.6.0 68
-MD5 be0c71929c461b50601e8715706a4a16 files/mldonkey-2.5.16-configure.patch 540
-MD5 05622542c4f7a93553ab90d66f871b2d files/mldonkey-2.6.0-gtk2-gentoo.patch 497
-MD5 be0c71929c461b50601e8715706a4a16 files/mldonkey-2.5.21-configure.patch 540
+MD5 0df6a96e1107b6967473bbfdf5f4c9d6 files/digest-mldonkey-2.5.16-r10 128
 MD5 b1c7f6fe232921bb9516c1007f34efd4 files/digest-mldonkey-2.5.16-r9 128
-MD5 4083205e52db56c9d64c4a67db61cbf2 files/digest-mldonkey-2.5.28-r4 129
 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 be0c71929c461b50601e8715706a4a16 files/mldonkey-2.5.21-configure.patch 540
+MD5 476ec69e79e7c93a7bdaa6cb049c0857 files/mldonkey.confd 836
 MD5 8eb1c3cd8359a02e5bc736805a940e7f files/mldonkey.initd 2996
-MD5 0df6a96e1107b6967473bbfdf5f4c9d6 files/digest-mldonkey-2.5.16-r10 128
+MD5 855aedd7fba1ffe74d7f6c0bce98f45f files/mldonkey.png 6835
+MD5 2db375201ae817eaa7075507d9700eed files/digest-mldonkey-2.6.0 68
+MD5 05622542c4f7a93553ab90d66f871b2d files/mldonkey-2.6.0-gtk2-gentoo.patch 497
+MD5 1a2193572c54f97cc4006b6c79e704aa files/digest-mldonkey-2.6.2 144
+MD5 93e16748ad44af182177978057266aa7 files/mldonkey-gui.desktop 263
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDB93DZ/iYVBmujdURAtj1AKDyrtAbgBCyLie6QvhFo0kBi+SJnQCfbQmq
+TitzePzr/DyYO1j1ORWb/AU=
+=UP8U
+-----END PGP SIGNATURE-----
diff --git a/net-p2p/mldonkey/files/digest-mldonkey-2.6.2 b/net-p2p/mldonkey/files/digest-mldonkey-2.6.2
new file mode 100644
index 000000000000..fa46854f0775
--- /dev/null
+++ b/net-p2p/mldonkey/files/digest-mldonkey-2.6.2
@@ -0,0 +1,2 @@
+MD5 9d7c0bdf332c656086d2c0bcbe8cb28d mldonkey-2.6.2.tar.bz2 2655334
+MD5 83476b56789ac2fa06f7334a889ae06c mldonkey_protocol_handler-1.7.xpi 5503
diff --git a/net-p2p/mldonkey/files/mldonkey-gui.desktop b/net-p2p/mldonkey/files/mldonkey-gui.desktop
new file mode 100644
index 000000000000..fdda4628bd20
--- /dev/null
+++ b/net-p2p/mldonkey/files/mldonkey-gui.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Version=0.9.4
+Encoding=UTF-8
+Name=MLDonkey GUI
+Comment=MLDonkey graphical interface
+Comment[pl]=Graficzny interfejs do programu MLDonkey
+Exec=mlgui
+Icon=mldonkey.png
+Terminal=false
+Type=Application
+Categories=GTK;Network;P2P;
+# vi: encoding=utf-8
diff --git a/net-p2p/mldonkey/mldonkey-2.6.2.ebuild b/net-p2p/mldonkey/mldonkey-2.6.2.ebuild
new file mode 100644
index 000000000000..3bd775ca42e1
--- /dev/null
+++ b/net-p2p/mldonkey/mldonkey-2.6.2.ebuild
@@ -0,0 +1,188 @@
+# 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.2.ebuild,v 1.1 2005/08/20 23:45:36 sekretarz Exp $
+
+inherit eutils
+
+IUSE="gtk gtk2 oldgtk guionly batch threads gd doc mozilla"
+
+MOZVER="1.7"
+
+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
+	mozilla? ( http://www.informatik.uni-oldenburg.de/~dyna/${PN}/${MOZVER}/mldonkey_protocol_handler-${MOZVER}.xpi )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~alpha ~ia64 ~amd64"
+
+RDEPEND="dev-lang/perl
+	gtk2? >=gnome-base/librsvg-2.4.0
+	gtk2? >=dev-ml/lablgtk-2.4
+	gtk? =dev-ml/lablgtk-1.2.7*
+	oldgtk? =dev-ml/lablgtk-1.2.7*
+	gd? >=media-libs/gd-2.0.28"
+
+DEPEND="${RDEPEND}
+	>=sys-devel/autoconf-2.58
+	!batch? >=dev-lang/ocaml-3.08.3
+	batch? net-misc/wget"
+
+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 gtk && use gtk2) || (use gtk && use oldgtk) || (use gtk2 && use oldgtk); then
+		eerror "Only one GUI must be chosen! (gtk || gtk2 || oldgtk)"
+		die
+	fi
+
+	if use guionly && !(use gtk2 || use gtk || use oldgtk); then
+		eerror "You need to choose a GUI (gtk || gtk2 || oldgtk)"
+		die
+	fi
+
+	if use gtk2 && !(built_with_use dev-ml/lablgtk svg); then
+		eerror "dev-ml/lablgtk must be built with the 'svg' USE flag to use the gtk2 gui"
+		die
+	fi
+}
+
+src_unpack() {
+	unpack ${P}.tar.bz2
+}
+
+src_compile() {
+	export WANT_AUTOCONF=2.5
+	cd ${S}/config
+	autoconf
+
+	# the dirs are not (yet) used, but it doesn't hurt to specify them anyway
+
+	# batch 	Automatically download and build OCAML-3.08.3 for compiling itself
+	# threads 	Enables multiple threads (TURN IT ON YES WILL YA?)
+	# onlygui	Disable all nets support, build only chosen GUI
+
+	if use gtk2; then
+		myconf="--enable-gui=newgui2"
+	elif use gtk; then
+		myconf="--enable-gui=newgui1"
+	elif use oldgtk; then
+		myconf="--enable-gui=oldgui"
+	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 \
+		`use_enable threads pthread` \
+		`use_enable batch batch` \
+		`use_enable gd` \
+		${myconf} || die "Configure Failed!"
+
+	export OCAMLRUNPARAM="l=256M"
+	emake || die "Make Failed"
+
+	if !(use guionly); then
+		emake utils || die "make utils failed"
+	fi;
+}
+
+src_install() {
+	if !(use guionly); then
+		dobin mlnet ed2k_hash get_range copysources make_torrent subconv
+		dobin ${FILESDIR}/mldonkey
+
+		insinto /etc/conf.d; newins ${FILESDIR}/mldonkey.confd mldonkey
+		exeinto /etc/init.d; newexe ${FILESDIR}/mldonkey.initd mldonkey
+	fi
+
+	if (use gtk2 || use gtk || use oldgtk); then
+		dobin mlgui mlguistarter mlchat mlim mlprogress
+
+		insinto /usr/share/applications
+		doins ${FILESDIR}/${PN}-gui.desktop
+
+		insinto /usr/share/pixmaps
+		doins ${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
+
+	if use mozilla; then
+		insinto /usr/share/{PN}
+		doins ${DISTFILES}/mldonkey_protocol_handler-${MOZVER}.xpi
+	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 modonkey gui."
+		einfo "It puts its config files into ~/.mldonkey"
+	fi
+
+	if use mozilla; then
+		echo
+		einfo "xpi handler was placed in /usr/share/${PN} directory."
+		einfo "Run it as root user and you can use ed2k links in your"
+		einfo "favorite web browser (mozilla / firefox)."
+	fi;
+}
+