new init.d script

4 files changed, 37 insertions, 20 deletions

diff --git a/sys-apps/pbbuttonsd/ChangeLog b/sys-apps/pbbuttonsd/ChangeLog
index 70892cf38e06..597a5a07416c 100644
--- a/sys-apps/pbbuttonsd/ChangeLog
+++ b/sys-apps/pbbuttonsd/ChangeLog
@@ -1,9 +1,13 @@
 # ChangeLog for sys-apps/pbbuttonsd
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pbbuttonsd/ChangeLog,v 1.17 2004/02/07 01:15:54 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pbbuttonsd/ChangeLog,v 1.18 2004/02/10 05:20:27 vapier Exp $
 
 *pbbuttonsd-0.5.8 (07 Feb 2004)
 
+  10 Feb 2004; Mike Frysinger <vapier@gentoo.org> pbbuttonsd.rc6 :
+  Clean up init.d script.  Using start-stop-daemon is a kludge when
+  the app itself supports daemonizing.
+
   07 Feb 2004; Lars Weiler <pylon@gentoo.org> pbbuttonsd-0.5.8.ebuild:
   Version bump.
 
diff --git a/sys-apps/pbbuttonsd/files/pbbuttonsd.rc6 b/sys-apps/pbbuttonsd/files/pbbuttonsd.rc6
new file mode 100644
index 000000000000..4beb24fbcedb
--- /dev/null
+++ b/sys-apps/pbbuttonsd/files/pbbuttonsd.rc6
@@ -0,0 +1,16 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pbbuttonsd/files/pbbuttonsd.rc6,v 1.1 2004/02/10 05:20:27 vapier Exp $
+
+start() {
+	ebegin "Starting pbbuttonsd"
+	/usr/bin/pbbuttonsd -d > /dev/null
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping pbbuttonsd"
+	start-stop-daemon --stop --quiet --exec /usr/bin/pbbuttonsd
+	eend $?
+}
diff --git a/sys-apps/pbbuttonsd/pbbuttonsd-0.5.2-r1.ebuild b/sys-apps/pbbuttonsd/pbbuttonsd-0.5.2-r1.ebuild
index cac5aa4a0a79..bcf8eda42adf 100644
--- a/sys-apps/pbbuttonsd/pbbuttonsd-0.5.2-r1.ebuild
+++ b/sys-apps/pbbuttonsd/pbbuttonsd-0.5.2-r1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pbbuttonsd/pbbuttonsd-0.5.2-r1.ebuild,v 1.7 2003/06/23 00:25:27 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pbbuttonsd/pbbuttonsd-0.5.2-r1.ebuild,v 1.8 2004/02/10 05:20:27 vapier Exp $
+
+inherit eutils
 
 S=${WORKDIR}/${P}
 DESCRIPTION="PBButtons is a program to map special Powerbook/iBook keys in Linux"
@@ -17,7 +19,7 @@ src_unpack() {
 	cd ${S}
 
 	einfo "Patching in fix to enable replace_pmud support"
-	patch -p0 < ${FILESDIR}/pbbuttons-0.5.2-replace_pmud.patch || die "Can't apply patch"
+	epatch ${FILESDIR}/pbbuttons-0.5.2-replace_pmud.patch
 
 }
 
diff --git a/sys-apps/pbbuttonsd/pbbuttonsd-0.5.8.ebuild b/sys-apps/pbbuttonsd/pbbuttonsd-0.5.8.ebuild
index f4369ddcffc0..7d81304c201c 100644
--- a/sys-apps/pbbuttonsd/pbbuttonsd-0.5.8.ebuild
+++ b/sys-apps/pbbuttonsd/pbbuttonsd-0.5.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pbbuttonsd/pbbuttonsd-0.5.8.ebuild,v 1.1 2004/02/07 01:15:54 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pbbuttonsd/pbbuttonsd-0.5.8.ebuild,v 1.2 2004/02/10 05:20:27 vapier Exp $
 
 DESCRIPTION="program to map special Powerbook/iBook keys in Linux"
 HOMEPAGE="http://www.cymes.de/members/joker/projects/pbbuttons/pbbuttons.html"
@@ -8,18 +8,12 @@ SRC_URI="http://www.cymes.de/members/joker/projects/pbbuttons/tar/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~ppc"
+KEYWORDS="-* ~ppc"
 
 DEPEND="virtual/glibc
-		>=sys-apps/baselayout-1.8.6.12-r1"
-
+	>=sys-apps/baselayout-1.8.6.12-r1"
 RDEPEND=""
 
-#src_unpack() {
-#	unpack ${A}
-#	cd ${S}
-#}
-
 src_compile() {
 	econf || die
 	make || die "compile failed"
@@ -27,13 +21,15 @@ src_compile() {
 
 src_install() {
 	local mydir=/var/lib
-	export	CONFIG_PROTECT="${CONFIG_PROTECT}:${mydir}/pbbuttonsd"
 	dodir /etc/power
-	make sysconfdir=${D}/etc				\
-		localstatedir=${D}/${mydir}			\
-		DESTDIR=${D} install || die "failed to install"
+	make \
+		sysconfdir=${D}/etc \
+		localstatedir=${D}/${mydir} \
+		DESTDIR=${D} \
+		install \
+		|| die "failed to install"
 	exeinto /etc/init.d
-	newexe ${FILESDIR}/pbbuttonsd.rc5 pbbuttonsd
+	newexe ${FILESDIR}/pbbuttonsd.rc6 pbbuttonsd
 	dodoc README COPYING
 	#fix the symlink
 	rm ${D}/etc/pbbuttonsd.conf
@@ -41,8 +37,7 @@ src_install() {
 #	dosym /etc/pbbuttonsd.conf /var/lib/pbbuttons/pbbuttonsd.conf
 	dosym ${mydir}/pbbuttons/pbbuttonsd.conf /etc/pbbuttonsd.conf
 	dodir /etc/env.d
-	echo "CONFIG_PROTECT=${mydir}/pbbuttonsd" \
-		>${D}/etc/env.d/10pbbuttonsd
+	echo "CONFIG_PROTECT=${mydir}/pbbuttonsd" > ${D}/etc/env.d/10pbbuttonsd
 }
 
 pkg_postinst(){