Init script fix, and bump twistd requirement to 2.0.0

Package-Manager: portage-1.589-cvs

5 files changed, 29 insertions, 10 deletions

diff --git a/app-misc/klive/ChangeLog b/app-misc/klive/ChangeLog
index 3aa6f893e5b2..880c786730df 100644
--- a/app-misc/klive/ChangeLog
+++ b/app-misc/klive/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-misc/klive
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/klive/ChangeLog,v 1.4 2005/09/12 10:46:35 r3pek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/klive/ChangeLog,v 1.5 2005/09/12 15:49:44 dsd Exp $
+
+*klive-0.7-r2 (12 Sep 2005)
+
+  12 Sep 2005; Daniel Drake <dsd@gentoo.org> files/klive.init.d,
+  -klive-0.7-r1.ebuild, +klive-0.7-r2.ebuild:
+  Init script fix, and bump twistd requirement to 2.0.0
 
 *klive-0.7-r1 (12 Sep 2005)
 
diff --git a/app-misc/klive/Manifest b/app-misc/klive/Manifest
index 059fc8bd3832..679ebd707924 100644
--- a/app-misc/klive/Manifest
+++ b/app-misc/klive/Manifest
@@ -1,5 +1,15 @@
-MD5 ce74200fb1b07c3e474314ecfc8fed1c klive-0.7-r1.ebuild 1602
-MD5 b003c3090901ee8d0d3fee3ec26e1b4d ChangeLog 616
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 e870e404fcc386a406e8e1c6141cd295 klive-0.7-r2.ebuild 1602
+MD5 203740ca54d1c2501214dd76e7cfca56 ChangeLog 811
 MD5 a76f13cb946fc2720c04b189616da2de metadata.xml 159
-MD5 e28f1e4fa29e8525827d9754ed6e1c96 files/klive.init.d 542
-MD5 4bfa2893765deb359dcfde086ca36fb7 files/digest-klive-0.7-r1 61
+MD5 aac140656a00574e6a4b0cbd6319507e files/klive.init.d 645
+MD5 4bfa2893765deb359dcfde086ca36fb7 files/digest-klive-0.7-r2 61
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDJaO1TOXg++0VvJQRAv11AJ0Tp7FUnrujCcQs+FZ3N/Eq8uvGfgCfX2zY
+ZNG7aGv4uDgPmiKc5grHfdw=
+=5SdP
+-----END PGP SIGNATURE-----
diff --git a/app-misc/klive/files/digest-klive-0.7-r1 b/app-misc/klive/files/digest-klive-0.7-r2
index 8bd903e17e2d..8bd903e17e2d 100644
--- a/app-misc/klive/files/digest-klive-0.7-r1
+++ b/app-misc/klive/files/digest-klive-0.7-r2
diff --git a/app-misc/klive/files/klive.init.d b/app-misc/klive/files/klive.init.d
index 0b38a64957a9..e70771c5ccd8 100644
--- a/app-misc/klive/files/klive.init.d
+++ b/app-misc/klive/files/klive.init.d
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/app-misc/klive/files/klive.init.d,v 1.2 2005/09/12 10:42:38 r3pek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/klive/files/klive.init.d,v 1.3 2005/09/12 15:49:44 dsd Exp $
 
 depend() {
 	need net
@@ -9,12 +9,15 @@ depend() {
 
 start() {
 	ebegin "Starting KLive"
-	start-stop-daemon --chuid klive --start --exec /usr/bin/twistd -- --pidfile /tmp/klive.pid --syslog -oy /usr/share/klive/klive.tac
+	start-stop-daemon --start --exec /usr/bin/twistd -- --uid klive --pidfile /var/run/klive.pid --syslog -oy /usr/share/klive/klive.tac
 	eend $?
 }
 
 stop() {
+	# FIXME remove at later date
+	start-stop-daemon --stop --pidfile /tmp/klive.pid > /dev/null 2>&1
+
 	ebegin "Stopping KLive"
-	start-stop-daemon --stop --pidfile /tmp/klive.pid
+	start-stop-daemon --stop --pidfile /var/run/klive.pid
 	eend $?
 }
diff --git a/app-misc/klive/klive-0.7-r1.ebuild b/app-misc/klive/klive-0.7-r2.ebuild
index 0dacb01f47a3..575bf8da00e8 100644
--- a/app-misc/klive/klive-0.7-r1.ebuild
+++ b/app-misc/klive/klive-0.7-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/klive/klive-0.7-r1.ebuild,v 1.1 2005/09/12 10:42:38 r3pek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/klive/klive-0.7-r2.ebuild,v 1.1 2005/09/12 15:49:44 dsd Exp $
 
 inherit eutils
 
@@ -14,7 +14,7 @@ KEYWORDS="~x86"
 IUSE=""
 
 DEPEND="dev-lang/python
-		>=dev-python/twisted-1.3"
+		>=dev-python/twisted-2.0.0"
 
 S=${WORKDIR}/${PN}