Version bump & initscripts, closes bug #95104.

(Portage version: 2.0.51.22-r1)

8 files changed, 231 insertions, 16 deletions

diff --git a/net-p2p/amule/ChangeLog b/net-p2p/amule/ChangeLog
index 7ff17a5552f0..41268219f42e 100644
--- a/net-p2p/amule/ChangeLog
+++ b/net-p2p/amule/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-p2p/amule
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/ChangeLog,v 1.38 2005/06/02 18:30:30 sekretarz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/ChangeLog,v 1.39 2005/07/10 15:02:47 chainsaw Exp $
+
+*amule-2.0.3 (10 Jul 2005)
+
+  10 Jul 2005; Tony Vroon <chainsaw@gentoo.org> +files/amuled.confd,
+  +files/amuled.initd, +files/amuleweb.confd, +files/amuleweb.initd,
+  +amule-2.0.3.ebuild:
+  Version bump and addition of initscripts, thanks to Michael Weyershäuser <thedude0001@gmx.de>. Closes bug #95104.
 
   02 Jun 2005; Karol Wojtaszek <sekretarz@gentoo.org> amule-2.0.1.ebuild:
   Fixed typos. Using has_hardened instead of hardened USE flag
diff --git a/net-p2p/amule/Manifest b/net-p2p/amule/Manifest
index b54096bc8250..d9e11cdef9a7 100644
--- a/net-p2p/amule/Manifest
+++ b/net-p2p/amule/Manifest
@@ -1,23 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 893f8fdf4f04feaaa1fbbe293e8066f2 amule-2.0.1.ebuild 2112
-MD5 ad9ff075371157b4cf0398b40d95a409 amule-2.0.0_rc5.ebuild 2355
 MD5 74a1cf32ba352ff02ec0fb9703a564a5 amule-2.0.0_rc7.ebuild 2282
-MD5 d92eb76760ca58f0ebe6b7c4070e77d2 ChangeLog 5368
 MD5 85966639c4bc2dba5e2a625d7415a40b amule-1.2.8.ebuild 925
+MD5 ad5b78956de3de8dd5718d9702a25b51 amule-2.0.3.ebuild 2015
 MD5 8aefbc0e49db723ca1ad02d0c409cd49 metadata.xml 160
 MD5 1734754c9dc2919079e6c206c4a0f2dd amule-2.0.0_rc6.ebuild 2188
+MD5 d92eb76760ca58f0ebe6b7c4070e77d2 ChangeLog 5368
+MD5 893f8fdf4f04feaaa1fbbe293e8066f2 amule-2.0.1.ebuild 2112
+MD5 ad9ff075371157b4cf0398b40d95a409 amule-2.0.0_rc5.ebuild 2355
+MD5 556a1639bd14b1a3274a3a36a77408ca files/digest-amule-2.0.0_rc7 68
+MD5 393ff0bdafbbb32d292387e1ca196737 files/digest-amule-2.0.3 65
 MD5 25f3451bd4e421754b720ec5f10605b4 files/digest-amule-2.0.0_rc5 68
+MD5 e875c8bb7caccbc783bbd7238b520a04 files/digest-amule-2.0.1 65
 MD5 f2547d4da315bc18cab4eb08898633c9 files/digest-amule-2.0.0_rc6 68
-MD5 556a1639bd14b1a3274a3a36a77408ca files/digest-amule-2.0.0_rc7 68
 MD5 6222124296125a6909963944434e0291 files/digest-amule-1.2.8 65
-MD5 e875c8bb7caccbc783bbd7238b520a04 files/digest-amule-2.0.1 65
 MD5 8cde6982e4b5300f4521da90ab8733d6 files/amule-2.0.0_rc7-wxgtk.patch 1293
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCn1BtZ/iYVBmujdURAiXXAJ94DqoJ1yulpYEkteTqJyju/v7WaACfdeyn
-3LhSbifQXoX1oOxMLK98Or8=
-=OxTI
------END PGP SIGNATURE-----
diff --git a/net-p2p/amule/amule-2.0.3.ebuild b/net-p2p/amule/amule-2.0.3.ebuild
new file mode 100644
index 000000000000..7992cda018d3
--- /dev/null
+++ b/net-p2p/amule/amule-2.0.3.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-2.0.3.ebuild,v 1.1 2005/07/10 15:02:47 chainsaw Exp $
+
+inherit eutils flag-o-matic wxwidgets
+
+MY_P=${P/m/M}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="aMule, the all-platform eMule p2p client"
+HOMEPAGE="http://www.amule.org/"
+SRC_URI="http://download.berlios.de/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64 ~ppc ~ppc64 ~sparc ~alpha"
+IUSE="amuled debug gtk2 nls remote stats unicode"
+
+
+DEPEND=">=x11-libs/wxGTK-2.6.0
+	>=sys-libs/zlib-1.2.2
+	nls? ( sys-devel/gettext )
+	remote? ( >=media-libs/libpng-1.2.8 )
+	stats? ( >=media-libs/gd-2.0.32 )
+	!net-p2p/xmule"
+
+pkg_setup() {
+	export WX_GTK_VER="2.6"
+	if ! use gtk2; then
+		need-wxwidgets gtk
+	elif use unicode; then
+		need-wxwidgets unicode
+	else
+		need-wxwidgets gtk2
+	fi
+}
+
+src_compile() {
+	if use amuled; then
+		EXTRA_ECONF="--enable-amule-daemon --enable-amule-gui"
+	fi
+
+	econf \
+		--disable-optimize \
+		--with-wx-config=${WX_CONFIG} \
+		--with-wxbase-config=${WX_CONFIG} \
+		`use_enable debug` \
+		`use_enable nls` \
+		`use_enable remote amulecmd` \
+		`use_enable remote amulecmdgui` \
+		`use_enable remote webserver` \
+		`use_enable remote webservergui` \
+		`use_enable stats cas` \
+		`use_enable stats wxcas` \
+		`use_enable stats alc` \
+		`use_enable stats alcc` \
+		|| die
+	# we filter ssp until bug #74457 is closed to build on hardened
+	if has_hardened; then
+	filter-flags -fstack-protector -fstack-protector-all
+	fi
+	emake -j1 || die
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+
+	if use amuled || use remote; then
+		if ! id p2p >/dev/null; then
+		        enewgroup p2p
+			enewuser p2p -1 /bin/false /home/p2p p2p
+		fi
+	fi
+
+	if use amuled; then
+	        insinto /etc/conf.d; newins ${FILESDIR}/amuled.confd amuled
+	        exeinto /etc/init.d; newexe ${FILESDIR}/amuled.initd amuled
+	fi
+
+	if use remote; then
+	        insinto /etc/conf.d; newins ${FILESDIR}/amuleweb.confd amuleweb
+	        exeinto /etc/init.d; newexe ${FILESDIR}/amuleweb.initd amuleweb
+	fi
+}
diff --git a/net-p2p/amule/files/amuled.confd b/net-p2p/amule/files/amuled.confd
new file mode 100644
index 000000000000..2911297d16ce
--- /dev/null
+++ b/net-p2p/amule/files/amuled.confd
@@ -0,0 +1,13 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/files/amuled.confd,v 1.1 2005/07/10 15:02:47 chainsaw Exp $
+
+# owner of amuled process (must be existing)
+AMULEUSER="p2p"
+
+# home directory for amuled (must be existing)
+AMULEHOME="/home/p2p"
+
+# log file (/dev/null for nowhere)
+LOG=/var/log/amuled.log
+
diff --git a/net-p2p/amule/files/amuled.initd b/net-p2p/amule/files/amuled.initd
new file mode 100644
index 000000000000..236de692d691
--- /dev/null
+++ b/net-p2p/amule/files/amuled.initd
@@ -0,0 +1,47 @@
+#!/sbin/runscript
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/files/amuled.initd,v 1.1 2005/07/10 15:02:47 chainsaw Exp $
+
+depend() {
+	need net
+}
+
+start() {
+	if ! test -f "${AMULEHOME}/.eMule"; then
+		eerror "You must start and configure amuled before launch it. Sorry."
+		return 1
+	fi
+
+        if pgrep -u ${AMULEUSER} amuled >/dev/null; then
+                eerror "An instance of aMule webserver is already running"
+                return 1
+        fi
+
+        rm /var/run/amuled.pid
+
+	ebegin "Starting aMule Daemon"
+	env HOME="${AMULEHOME}" start-stop-daemon --start \
+		--quiet --background \
+		--make-pidfile --pidfile /var/run/amuled.pid \
+		-c ${AMULEUSER} \
+		-x /usr/bin/amuled >${LOG}
+	
+	sleep 2
+	if ! pgrep -u ${AMULEUSER} amuled > /dev/null; then
+		eerror "aMule daemon can't be started! Check logfile: ${LOG}"
+	fi
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping aMule daemon"
+	start-stop-daemon --oknodo --stop --pidfile /var/run/amuled.pid &>/dev/null
+	eend $?
+}
+
+restart() {
+	svc_stop
+	sleep 3
+	svc_start
+}
diff --git a/net-p2p/amule/files/amuleweb.confd b/net-p2p/amule/files/amuleweb.confd
new file mode 100644
index 000000000000..4bb37b3dd949
--- /dev/null
+++ b/net-p2p/amule/files/amuleweb.confd
@@ -0,0 +1,23 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/files/amuleweb.confd,v 1.1 2005/07/10 15:02:47 chainsaw Exp $
+
+# owner of amuleweb process (must be existing)
+AMULEUSER="p2p"
+
+# home directory for amuleweb (from where to read configuration) (must be existing)
+AMULEHOME="/home/p2p"
+
+# log file (/dev/null for nowhere)
+LOG=/var/log/amuleweb.log
+
+# aMule password (note: not your webserver password, but the external
+# connection one)
+AMULEPWD="secret"
+
+# aMule host (this could be a remote host or usually localhost)
+AMULEHOST="localhost"
+
+# aMule external connection port
+AMULEPORT="4712"
+
diff --git a/net-p2p/amule/files/amuleweb.initd b/net-p2p/amule/files/amuleweb.initd
new file mode 100644
index 000000000000..00036b4f0521
--- /dev/null
+++ b/net-p2p/amule/files/amuleweb.initd
@@ -0,0 +1,48 @@
+#!/sbin/runscript
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/files/amuleweb.initd,v 1.1 2005/07/10 15:02:47 chainsaw Exp $
+
+depend() {
+	need net
+	use amuled
+}
+
+start() {
+	if ! test -f "${AMULEHOME}/.eMule"; then
+		eerror "You must start and configure amuleweb before launch it. Sorry."
+		return 1
+	fi
+
+	if pgrep -u ${AMULEUSER} amuleweb >/dev/null; then
+		eerror "An instance of aMule webserver is already running"
+		return 1
+	fi
+
+	rm /var/run/amuleweb.pid
+
+	OPTIONS="-rh ${AMULEHOST} -p ${AMULEPORT} -pw ${AMULEPWD}"
+
+	einfo $OPTIONS
+	ebegin "Starting aMule WebServer"
+	env HOME="${AMULEHOME}" start-stop-daemon --start \
+		--quiet -b \
+		--make-pidfile --pidfile /var/run/amuleweb.pid \
+		-c ${AMULEUSER} \
+		-x /usr/bin/amuleweb -- ${OPTIONS} &>${LOG}
+	
+	sleep 1
+	if ! pgrep -u ${AMULEUSER} amuleweb > /dev/null; then
+		eerror "aMule daemon can't be started! Check logfile: ${LOG}"
+		eend 1
+		return 1
+	fi
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping aMule WebServer"
+	start-stop-daemon --oknodo --stop --pidfile /var/run/amuleweb.pid &>/dev/null
+	eend $?
+}
+
diff --git a/net-p2p/amule/files/digest-amule-2.0.3 b/net-p2p/amule/files/digest-amule-2.0.3
new file mode 100644
index 000000000000..a14f56f2afdf
--- /dev/null
+++ b/net-p2p/amule/files/digest-amule-2.0.3
@@ -0,0 +1 @@
+MD5 204ca3472a773d8fa484d0a0787bf0d7 aMule-2.0.3.tar.bz2 2154288