Dont install the banana script #82567 and fix the init.d script to work better #82566 by James Rowe.

Package-Manager: portage-2.0.51-r15

6 files changed, 29 insertions, 42 deletions

diff --git a/www-servers/monkeyd/ChangeLog b/www-servers/monkeyd/ChangeLog
index 98945186929c..ecb494e3078a 100644
--- a/www-servers/monkeyd/ChangeLog
+++ b/www-servers/monkeyd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-servers/monkeyd
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/ChangeLog,v 1.5 2004/12/09 02:05:56 vapier Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/ChangeLog,v 1.6 2005/02/20 22:47:11 vapier Exp $
+
+*monkeyd-0.9.0-r1 (20 Feb 2005)
+
+  20 Feb 2005; Mike Frysinger <vapier@gentoo.org> metadata.xml,
+  files/monkeyd.init.d, +monkeyd-0.9.0-r1.ebuild, -monkeyd-0.9.0.ebuild:
+  Dont install the banana script #82567 and fix the init.d script to work
+  better #82566 by James Rowe.
 
 *monkeyd-0.9.0 (08 Dec 2004)
 
diff --git a/www-servers/monkeyd/Manifest b/www-servers/monkeyd/Manifest
index f35e82de0a07..fbb782bbb6a8 100644
--- a/www-servers/monkeyd/Manifest
+++ b/www-servers/monkeyd/Manifest
@@ -1,24 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 e0cd83515d4b937d8b0c172aec3db999 monkeyd-0.8.3.ebuild 1682
-MD5 cf7e4997de66fc9044ba45733e21facd monkeyd-0.8.5.ebuild 1689
-MD5 778885f921dedb1d4776025ac3b9aeb6 monkeyd-0.8.2.ebuild 1621
-MD5 c29eca73b1524e31b0fd3df2d205971a monkeyd-0.9.0.ebuild 1799
-MD5 635bf002209db51beee750a21042b47c monkeyd-0.8.4.ebuild 1688
-MD5 b2996038301d11eed4506ff7c2896f50 ChangeLog 2245
-MD5 4a186842848d9c384e2d12785ba426bc metadata.xml 165
-MD5 0a2562fa39c3652c8b13d2b246266db5 files/digest-monkeyd-0.8.2 63
-MD5 0977e8355534adfc8fd3571879d42fd1 files/digest-monkeyd-0.8.3 63
-MD5 b74df5e863a308f9817e6978496d3753 files/digest-monkeyd-0.8.4 65
-MD5 2bf297b2406f152bf9903018f65195c2 files/digest-monkeyd-0.8.5 63
-MD5 b4069bcda46c5e3e1d3811511b4d9594 files/digest-monkeyd-0.9.0 63
+MD5 a8b912a4f7a44a5caf89f78b518aeeb7 ChangeLog 2521
+MD5 291658390dada237b2e8533a44409448 metadata.xml 164
+MD5 1b406a89dcd194302ffe13c0dafcb81e monkeyd-0.9.0-r1.ebuild 2047
+MD5 b4069bcda46c5e3e1d3811511b4d9594 files/digest-monkeyd-0.9.0-r1 63
 MD5 744c1e82caccabdc0a9a61e81dabef4c files/monkeyd.conf.d 278
-MD5 bf5040e38ca0a7164ae4a97f7e275bdc files/monkeyd.init.d 616
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCF3ycEZCkKN40op4RAt/dAKC34hRQTXhdEnG3TBnKDCloeFcvHgCfaTWu
-KyP1aLuHW2k6qNKCf0gmJ3g=
-=TqLC
------END PGP SIGNATURE-----
+MD5 69c4c944e7c908857c48df0e8b8a1eb4 files/monkeyd.init.d 484
diff --git a/www-servers/monkeyd/files/digest-monkeyd-0.9.0 b/www-servers/monkeyd/files/digest-monkeyd-0.9.0-r1
index 657420e08189..657420e08189 100644
--- a/www-servers/monkeyd/files/digest-monkeyd-0.9.0
+++ b/www-servers/monkeyd/files/digest-monkeyd-0.9.0-r1
diff --git a/www-servers/monkeyd/files/monkeyd.init.d b/www-servers/monkeyd/files/monkeyd.init.d
index e9d6eecca508..a71c9cb0d472 100644
--- a/www-servers/monkeyd/files/monkeyd.init.d
+++ b/www-servers/monkeyd/files/monkeyd.init.d
@@ -1,28 +1,22 @@
 #!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/files/monkeyd.init.d,v 1.2 2004/09/28 02:02:09 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/files/monkeyd.init.d,v 1.3 2005/02/20 22:47:11 vapier Exp $
 
 depend() {
-	need net
+	use net
 }
 
 start() {
 	ebegin "Starting monkeyd"
-	/usr/bin/monkey -D start &>/dev/null
+	/usr/bin/monkey -D &> /dev/null
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping monkeyd"
-	/usr/bin/monkey stop &>/dev/null
+	start-stop-daemon --stop --quiet --pidfile ${MONKEY_PID}
 	ret=$?
+	rm -f ${MONKEY_PID}
 	eend ${ret}
-
-	if [ ${ret} -ne 0 ] && [ -f ${MONKEY_PID} ] ; then
-		ebegin "  Killing monkeyd"
-		kill `cat ${MONKEY_PID}` &>/dev/null
-		eend $?
-		rm -f ${MONKEY_PID} &>/dev/null
-	fi
 }
diff --git a/www-servers/monkeyd/metadata.xml b/www-servers/monkeyd/metadata.xml
index 87c085844c38..bf4811e274e0 100644
--- a/www-servers/monkeyd/metadata.xml
+++ b/www-servers/monkeyd/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>www-servers</herd>
+<herd>www-servers</herd>
 </pkgmetadata>
diff --git a/www-servers/monkeyd/monkeyd-0.9.0.ebuild b/www-servers/monkeyd/monkeyd-0.9.0-r1.ebuild
index 5727f0e9d2c5..28e43f440494 100644
--- a/www-servers/monkeyd/monkeyd-0.9.0.ebuild
+++ b/www-servers/monkeyd/monkeyd-0.9.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/monkeyd-0.9.0.ebuild,v 1.1 2004/12/09 02:05:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/monkeyd-0.9.0-r1.ebuild,v 1.1 2005/02/20 22:47:11 vapier Exp $
 
 inherit toolchain-funcs
 
@@ -13,7 +13,7 @@ SRC_URI="http://monkeyd.sourceforge.net/versions/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc"
+KEYWORDS="~amd64 ppc sparc x86"
 IUSE="php"
 
 DEPEND="virtual/libc
@@ -26,11 +26,12 @@ S=${WORKDIR}/${MY_P}
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	sed -i -e '/strip /s:.*::' src/Makefile
+	sed -i -e '/install -m 755 bin\/banana/d' configure || die "sed banana"
 }
 
 src_compile() {
 	# monkey has it's own funky script ... cant use econf
+	env STRIP=true \
 	./configure \
 		--prefix=/usr \
 		--bindir=/usr/bin \
@@ -40,6 +41,9 @@ src_compile() {
 		--logdir=/var/log/${PN} \
 		--lang=en \
 		|| die
+	# Don't install the banana script, it is broken as is anyway and the 
+	# functionality is provided by the ${FILESDIR}/monkeyd.init.d script.
+	sed -i '/install -m 755 bin\/banana/d' Makefile
 	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die
 }