Use --chuid instead of --user, #189212 thanks to Jörg Eitemüller

Package-Manager: portage-2.1.3.6

5 files changed, 192 insertions, 10 deletions

diff --git a/net-p2p/mldonkey/ChangeLog b/net-p2p/mldonkey/ChangeLog
index c6e51e714aba..8582128c80c4 100644
--- a/net-p2p/mldonkey/ChangeLog
+++ b/net-p2p/mldonkey/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-p2p/mldonkey
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/ChangeLog,v 1.176 2007/08/07 13:39:50 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/ChangeLog,v 1.177 2007/08/17 10:45:57 uberlord Exp $
+
+*mldonkey-2.9.0-r2 (17 Aug 2007)
+
+  17 Aug 2007; Roy Marples <uberlord@gentoo.org> files/mldonkey.initd,
+  +mldonkey-2.9.0-r2.ebuild:
+  Use --chuid instead of --user, #189212 thanks to Jörg Eitemüller
 
 *mldonkey-2.9.0-r1 (07 Aug 2007)
 
diff --git a/net-p2p/mldonkey/Manifest b/net-p2p/mldonkey/Manifest
index a334e4683f14..2f3181726efa 100644
--- a/net-p2p/mldonkey/Manifest
+++ b/net-p2p/mldonkey/Manifest
@@ -10,10 +10,10 @@ AUX mldonkey.confd-2.8 887 RMD160 0575b16320fc74fbe417150315d2247a536259d1 SHA1
 MD5 936ea40c208c5c3f294bd39080f966f1 files/mldonkey.confd-2.8 887
 RMD160 0575b16320fc74fbe417150315d2247a536259d1 files/mldonkey.confd-2.8 887
 SHA256 d395ecece23a23dcb41addf63b70220996011ceb29d8738afb3c048b666cd96e files/mldonkey.confd-2.8 887
-AUX mldonkey.initd 3515 RMD160 212c5d9311cb21467ccbc105a399aff0186a064b SHA1 1d5403a3ce204c4030d1a9ab8592596543d6f8c8 SHA256 1d57558067a84122b45bfec6539bae5abdaf36cf5e9fda38ade80495b8b1349f
-MD5 e4337dd0e2c39c16e7c9306fbefef710 files/mldonkey.initd 3515
-RMD160 212c5d9311cb21467ccbc105a399aff0186a064b files/mldonkey.initd 3515
-SHA256 1d57558067a84122b45bfec6539bae5abdaf36cf5e9fda38ade80495b8b1349f files/mldonkey.initd 3515
+AUX mldonkey.initd 3516 RMD160 87962db06a64a64f052f1c9d00f93990136f70f7 SHA1 70368d67b319aff533f649af11b3f62b7a389dd6 SHA256 1df5a055e83af8003a01b7de5deacf8ab248483e8663799deca2dd4750de6e9e
+MD5 bb91c59adde810af5dc2b40fb7ac1707 files/mldonkey.initd 3516
+RMD160 87962db06a64a64f052f1c9d00f93990136f70f7 files/mldonkey.initd 3516
+SHA256 1df5a055e83af8003a01b7de5deacf8ab248483e8663799deca2dd4750de6e9e files/mldonkey.initd 3516
 AUX mldonkey.initd-2.8-r1 3401 RMD160 b5f452a952cd60afc4bc785ffb0a7b354f02b8e5 SHA1 13e46d6e33b586f0651679db993575e07ba80a7b SHA256 ea609ef662e4993547149b3719e3d5cc6b42b3a4184d46734f31552f57d5a1e1
 MD5 128a7d0782b6129a825542d0d0c39941 files/mldonkey.initd-2.8-r1 3401
 RMD160 b5f452a952cd60afc4bc785ffb0a7b354f02b8e5 files/mldonkey.initd-2.8-r1 3401
@@ -27,14 +27,18 @@ EBUILD mldonkey-2.9.0-r1.ebuild 4316 RMD160 f674851fd167ab0dc4c938a7a04dc60b8e43
 MD5 bed6626320ea64ebb83f180fc0974991 mldonkey-2.9.0-r1.ebuild 4316
 RMD160 f674851fd167ab0dc4c938a7a04dc60b8e4329da mldonkey-2.9.0-r1.ebuild 4316
 SHA256 d3ec1aa619134a34b2b6f9d16748d42129a9bb670f2db3efd747471939e5adb5 mldonkey-2.9.0-r1.ebuild 4316
+EBUILD mldonkey-2.9.0-r2.ebuild 4316 RMD160 98a4493c0c20d889a4da9ae0cd42512ddf734e0e SHA1 72274a29f13eeb07ae0ca1e5eb63a34565084035 SHA256 249776f98af8955a0887ee4afa30c0ba3c2d3f1507894eb83a398095e3d1ba16
+MD5 c892e2e134d4e9f422ee736571059df5 mldonkey-2.9.0-r2.ebuild 4316
+RMD160 98a4493c0c20d889a4da9ae0cd42512ddf734e0e mldonkey-2.9.0-r2.ebuild 4316
+SHA256 249776f98af8955a0887ee4afa30c0ba3c2d3f1507894eb83a398095e3d1ba16 mldonkey-2.9.0-r2.ebuild 4316
 EBUILD mldonkey-2.9.0.ebuild 4306 RMD160 b57c750e59a737c808f6971f185b29361b3821aa SHA1 6b5782d16ab4cc56b346bd81179ea59fc224c140 SHA256 5a6bc5f3ea29c0977448a67bf9b36afb4e116784f44517c2ff2e27ee1292fdaa
 MD5 b9b06de8c84101a5d68c1d23117ebbf2 mldonkey-2.9.0.ebuild 4306
 RMD160 b57c750e59a737c808f6971f185b29361b3821aa mldonkey-2.9.0.ebuild 4306
 SHA256 5a6bc5f3ea29c0977448a67bf9b36afb4e116784f44517c2ff2e27ee1292fdaa mldonkey-2.9.0.ebuild 4306
-MISC ChangeLog 27407 RMD160 3c034fd722117eb8c3e83bc90b98ae519be71561 SHA1 d070aba54294abbb624a92f803a3bf7ad0b20fe2 SHA256 c44dddcb62ff9a968e0a8985c4f73b9bd787bed9c41339eaed508c8ad5837b96
-MD5 ce0dffd3b91fe7380b0fdc4e2141ff3e ChangeLog 27407
-RMD160 3c034fd722117eb8c3e83bc90b98ae519be71561 ChangeLog 27407
-SHA256 c44dddcb62ff9a968e0a8985c4f73b9bd787bed9c41339eaed508c8ad5837b96 ChangeLog 27407
+MISC ChangeLog 27611 RMD160 121cf008cd05b38f6a52d4eeb568732a7faa7be8 SHA1 d7b306096a9ace6366197b3101f04850b5a3cba4 SHA256 f18d6f44fc356fb573b75d54262cd1f137d33a5dc7030e7e35f219475e5dc465
+MD5 4f690d9d5733349341dedc18511dd589 ChangeLog 27611
+RMD160 121cf008cd05b38f6a52d4eeb568732a7faa7be8 ChangeLog 27611
+SHA256 f18d6f44fc356fb573b75d54262cd1f137d33a5dc7030e7e35f219475e5dc465 ChangeLog 27611
 MISC metadata.xml 242 RMD160 d0edc89382298dee00d3571b62a5f457ef268751 SHA1 25511186cac54f1353a3347f72da7f5d05b9da57 SHA256 b354d71d5efbed0ff97e27564894438b42a8bd8b577007cadc6972dd37d6b5f8
 MD5 ee159929f3e247f937fe88bb1919d8bd metadata.xml 242
 RMD160 d0edc89382298dee00d3571b62a5f457ef268751 metadata.xml 242
@@ -45,3 +49,6 @@ SHA256 0c137fff0df6d06decc82d43742c7d755bbd802bcf4d4bbae1fc0ba225e2ede4 files/di
 MD5 c302cbed8980ad468de43f32af76e48c files/digest-mldonkey-2.9.0-r1 250
 RMD160 86c9d269d0f258d638e2a6819c4c293afa437696 files/digest-mldonkey-2.9.0-r1 250
 SHA256 0c137fff0df6d06decc82d43742c7d755bbd802bcf4d4bbae1fc0ba225e2ede4 files/digest-mldonkey-2.9.0-r1 250
+MD5 c302cbed8980ad468de43f32af76e48c files/digest-mldonkey-2.9.0-r2 250
+RMD160 86c9d269d0f258d638e2a6819c4c293afa437696 files/digest-mldonkey-2.9.0-r2 250
+SHA256 0c137fff0df6d06decc82d43742c7d755bbd802bcf4d4bbae1fc0ba225e2ede4 files/digest-mldonkey-2.9.0-r2 250
diff --git a/net-p2p/mldonkey/files/digest-mldonkey-2.9.0-r2 b/net-p2p/mldonkey/files/digest-mldonkey-2.9.0-r2
new file mode 100644
index 000000000000..bc9d7ba3d4f0
--- /dev/null
+++ b/net-p2p/mldonkey/files/digest-mldonkey-2.9.0-r2
@@ -0,0 +1,3 @@
+MD5 d8c32704e4e621239d0f4a5b92484402 mldonkey-2.9.0.tar.bz2 2713410
+RMD160 467ece38f57e27adab008d81e8f5c98774ca3f71 mldonkey-2.9.0.tar.bz2 2713410
+SHA256 1d3ac5114be7e592093dd6e2031b1fea642fa641263395e8b0f38c388c232a24 mldonkey-2.9.0.tar.bz2 2713410
diff --git a/net-p2p/mldonkey/files/mldonkey.initd b/net-p2p/mldonkey/files/mldonkey.initd
index 79ba3eeb499e..a757bf36e907 100644
--- a/net-p2p/mldonkey/files/mldonkey.initd
+++ b/net-p2p/mldonkey/files/mldonkey.initd
@@ -29,7 +29,7 @@ start() {
 	ebegin "Starting ${SVCNAME}"
 	cd "${MLDONKEY_DIR}"
 	export MLDONKEY_DIR
-	start-stop-daemon --start --user "${USER}" --nice "${NICE}" \
+	start-stop-daemon --start --chuid "${USER}" --nice "${NICE}" \
 		--exec "${MLDONKEY_BINARY}" --pidfile /var/run/"${SVCNAME}".pid \
 		--background --make-pidfile
 	eend $?
diff --git a/net-p2p/mldonkey/mldonkey-2.9.0-r2.ebuild b/net-p2p/mldonkey/mldonkey-2.9.0-r2.ebuild
new file mode 100644
index 000000000000..f3a50859fd1a
--- /dev/null
+++ b/net-p2p/mldonkey/mldonkey-2.9.0-r2.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-2.9.0-r2.ebuild,v 1.1 2007/08/17 10:45:57 uberlord Exp $
+
+inherit flag-o-matic
+
+IUSE="doc fasttrack gd gnutella gtk guionly magic"
+
+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"
+RESTRICT="mirror"
+
+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}
+	>=sys-devel/autoconf-2.58
+	>=dev-lang/ocaml-3.08.3"
+
+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
+}
+
+src_unpack() {
+	unpack ${A} && cd "${S}"
+
+	export WANT_AUTOCONF=2.5
+	cd "${S}"/config
+	autoconf
+	cd "${S}"
+}
+
+src_compile() {
+	append-ldflags -Wl,-z,noexecstack
+
+	# 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() {
+	if ! use guionly; then
+		dobin mlnet mld_hash get_range copysources make_torrent subconv \
+			|| die "dobin failed"
+
+		newconfd "${FILESDIR}/mldonkey.confd-2.8" mldonkey
+		fperms 600 /etc/conf.d/mldonkey
+		newinitd "${FILESDIR}/mldonkey.initd" mldonkey
+	fi
+
+	if use gtk; then
+		dobin mlgui mlguistarter || die "dobin failed"
+		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 /bin/bash /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
+}