Clean the mess in USE flags (bug #103239)

(Portage version: 1.589-cvs)

4 files changed, 205 insertions, 17 deletions

diff --git a/net-p2p/mldonkey/ChangeLog b/net-p2p/mldonkey/ChangeLog
index 7a12afabedec..1955e4dd9968 100644
--- a/net-p2p/mldonkey/ChangeLog
+++ b/net-p2p/mldonkey/ChangeLog
@@ -1,6 +1,13 @@
 # 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.93 2005/09/06 04:18:05 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/ChangeLog,v 1.94 2005/09/14 21:22:31 mkay Exp $
+
+*mldonkey-2.6.4-r1 (14 Sep 2005)
+
+  14 Sep 2005; <mkay@gentoo.org> +mldonkey-2.6.4-r1.ebuild:
+  Clean a mess in USE flags  - closing bug #103239 (thanks everyone, who takes 
+  part in discussion). Also droping 'oldgtk' flag and support for old gui, 
+  since it's not maintaned anymore.
 
 *mldonkey-2.6.4 (06 Sep 2005)
 
diff --git a/net-p2p/mldonkey/Manifest b/net-p2p/mldonkey/Manifest
index a15381452042..7120a04ba2ef 100644
--- a/net-p2p/mldonkey/Manifest
+++ b/net-p2p/mldonkey/Manifest
@@ -1,29 +1,31 @@
+MD5 d9ef70bbc34eb7e427a69ec9009a75e0 ChangeLog 15460
+MD5 ee159929f3e247f937fe88bb1919d8bd metadata.xml 242
 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 e898f4bf79d82a45616f500872d06576 mldonkey-2.5.27-r1.ebuild 2756
-MD5 ee159929f3e247f937fe88bb1919d8bd metadata.xml 242
+MD5 5e2cc55c3eb55fe36b6edd16b591422d mldonkey-2.5.28-r4.ebuild 2801
 MD5 0eb263f37a1d27990436054b98ed0f99 mldonkey-2.6.0.ebuild 3563
-MD5 d9ef70bbc34eb7e427a69ec9009a75e0 ChangeLog 15460
 MD5 bce4aa2fc8121578b5f6db881bdf40d4 mldonkey-2.6.2.ebuild 5353
-MD5 e4d631474942d4a724d5be73a39df379 mldonkey-2.5.21-r2.ebuild 2692
 MD5 2b1f398a597b4bf15e6ca18c1b44c71e mldonkey-2.6.3.ebuild 5353
-MD5 5e2cc55c3eb55fe36b6edd16b591422d mldonkey-2.5.28-r4.ebuild 2801
-MD5 a92ec1a9e1c381c49b544c81221a8bd0 mldonkey-2.5.16-r9.ebuild 2660
 MD5 74a55747fa90506b29bd488c3c4c4cc0 mldonkey-2.6.4.ebuild 5263
-MD5 be0c71929c461b50601e8715706a4a16 files/mldonkey-2.5.16-configure.patch 540
+MD5 94b9f00f5ec5950010dc9a9f63cc8273 mldonkey-2.6.4-r1.ebuild 4892
+MD5 a929dcdb98bcc52d06066afb45960ea9 files/2.5.28-config.patch 586
 MD5 0df6a96e1107b6967473bbfdf5f4c9d6 files/digest-mldonkey-2.5.16-r10 128
+MD5 b1c7f6fe232921bb9516c1007f34efd4 files/digest-mldonkey-2.5.16-r9 128
+MD5 f145ba120c09f53b0032ea8b3f930128 files/digest-mldonkey-2.5.21-r2 126
 MD5 6df804eab9a1d919e43d09f42c700b40 files/digest-mldonkey-2.5.27-r1 129
-MD5 855aedd7fba1ffe74d7f6c0bce98f45f files/mldonkey.png 6835
-MD5 476ec69e79e7c93a7bdaa6cb049c0857 files/mldonkey.confd 836
+MD5 4083205e52db56c9d64c4a67db61cbf2 files/digest-mldonkey-2.5.28-r4 129
 MD5 2db375201ae817eaa7075507d9700eed files/digest-mldonkey-2.6.0 68
-MD5 8eb1c3cd8359a02e5bc736805a940e7f files/mldonkey.initd 2996
 MD5 67a885de61cad79c8770c9c6c136648b files/digest-mldonkey-2.6.2 204
+MD5 ba011b39cf2f1b424360ca9a38089064 files/digest-mldonkey-2.6.3 204
+MD5 9613def727af8826277e993290216c36 files/digest-mldonkey-2.6.4 144
+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 f145ba120c09f53b0032ea8b3f930128 files/digest-mldonkey-2.5.21-r2 126
-MD5 a929dcdb98bcc52d06066afb45960ea9 files/2.5.28-config.patch 586
 MD5 05622542c4f7a93553ab90d66f871b2d files/mldonkey-2.6.0-gtk2-gentoo.patch 497
-MD5 ac93ed074d62909b2a496045f0740127 files/mldonkey 336
-MD5 4083205e52db56c9d64c4a67db61cbf2 files/digest-mldonkey-2.5.28-r4 129
-MD5 b1c7f6fe232921bb9516c1007f34efd4 files/digest-mldonkey-2.5.16-r9 128
 MD5 93e16748ad44af182177978057266aa7 files/mldonkey-gui.desktop 263
-MD5 ba011b39cf2f1b424360ca9a38089064 files/digest-mldonkey-2.6.3 204
-MD5 9613def727af8826277e993290216c36 files/digest-mldonkey-2.6.4 144
+MD5 476ec69e79e7c93a7bdaa6cb049c0857 files/mldonkey.confd 836
+MD5 8eb1c3cd8359a02e5bc736805a940e7f files/mldonkey.initd 2996
+MD5 855aedd7fba1ffe74d7f6c0bce98f45f files/mldonkey.png 6835
+MD5 9613def727af8826277e993290216c36 files/digest-mldonkey-2.6.4-r1 144
diff --git a/net-p2p/mldonkey/files/digest-mldonkey-2.6.4-r1 b/net-p2p/mldonkey/files/digest-mldonkey-2.6.4-r1
new file mode 100644
index 000000000000..4b5cb4eb8287
--- /dev/null
+++ b/net-p2p/mldonkey/files/digest-mldonkey-2.6.4-r1
@@ -0,0 +1,2 @@
+MD5 d969f81b51e194fcaf46790686269e3e mldonkey-2.6.4.tar.bz2 2669228
+MD5 83476b56789ac2fa06f7334a889ae06c mldonkey_protocol_handler-1.7.xpi 5503
diff --git a/net-p2p/mldonkey/mldonkey-2.6.4-r1.ebuild b/net-p2p/mldonkey/mldonkey-2.6.4-r1.ebuild
new file mode 100644
index 000000000000..cabf6cb1fbea
--- /dev/null
+++ b/net-p2p/mldonkey/mldonkey-2.6.4-r1.ebuild
@@ -0,0 +1,177 @@
+# 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.4-r1.ebuild,v 1.1 2005/09/14 21:22:31 mkay Exp $
+
+inherit eutils
+
+IUSE="gtk gtk2 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
+	gtk? ( gtk2? ( >=gnome-base/librsvg-2.4.0
+			>=dev-ml/lablgtk-2.4 )
+		!gtk2? ( =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() {
+	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 guionly && ! use gtk ; then
+		echo
+		eerror "You have guionly enabled, but gtk flag is disabled"
+		die
+	fi
+
+	if use gtk && 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 "Recompile dev-ml/lablgtk with enabled svg USE flag"
+	fi
+}
+
+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 gtk && use gtk2; then
+		myconf="--enable-gui=newgui2"
+	elif use gtk; then
+		myconf="--enable-gui=newgui1"
+	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 mld_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 gtk; then
+		dobin mlgui mlguistarter mlchat mlim mlprogress
+		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
+
+	if use mozilla; then
+		insinto /usr/share/${PN}
+		doins ${DISTDIR}/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;
+}
+