Updated version to 3.0.2.

Also tidy up the initscript to use --make-pidfile and drop in
an /etc/conf.d/apmd file.

8 files changed, 19 insertions, 102 deletions

diff --git a/sys-apps/apmd/apmd-3.0.1-r1.ebuild b/sys-apps/apmd/apmd-3.0.1-r1.ebuild
deleted file mode 100644
index cc44994ee30f..000000000000
--- a/sys-apps/apmd/apmd-3.0.1-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Craig Joly <joly@ee.ualberta.ca>, Ben Lutgens <lamer@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/apmd/apmd-3.0.1-r1.ebuild,v 1.1 2001/10/14 09:11:36 woodchip Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Advanced Power Management Daemon"
-SRC_URI="ftp://ftp.debian.org/debian/pool/main/a/apmd/apmd_3.0.1-1.tar.gz"
-HOMEPAGE="http://www.worldvisions.ca/~apenwarr/apmd/"
-
-DEPEND="virtual/glibc X? ( virtual/x11 )"
-
-src_unpack() {
-
-	unpack ${A} ; cd ${S}
-
-	cp Makefile Makefile.orig
-	sed -e "s:PREFIX=\/usr:PREFIX=\$\{DESTDIR\}\/usr:" \
-	    -e "s:APMD_PROXY_DIR\=\/etc:APMD_PROXY_DIR\=\$\{DESTDIR\}\/etc\/apm:" \
-	    -e "97d" \
-	    -e "s:MANDIR\=\${PREFIX}\/man:MANDIR\=\${PREFIX}\/share\/man:" \
-	    Makefile.orig > Makefile
-
-	use X || sed -e "/^EXES=/s/xapm//" -e "/install.*xapm/d" Makefile | cat > Makefile
-}
-
-src_compile() {
-
-	make CFLAGS="${CFLAGS}" || die "compile problem"
-}
-
-src_install () {
-
-	make DESTDIR=${D} install || die
-	dodir /etc/apm/{event.d,suspend.d,resume.d}
-	exeinto /etc/apm ; doexe debian/apmd_proxy
-	dodoc ANNOUNCE BUGS.apmsleep COPYING* README* ChangeLog LSM
-
-	exeinto /etc/rc.d/init.d ; newexe ${FILESDIR}/apmd.rc5 apmd
-}
diff --git a/sys-apps/apmd/apmd-3.0.1-r6.ebuild b/sys-apps/apmd/apmd-3.0.2.ebuild
index 9fa53eaa1a35..b9ebbad7e0e1 100644
--- a/sys-apps/apmd/apmd-3.0.1-r6.ebuild
+++ b/sys-apps/apmd/apmd-3.0.2.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Maintainer: Donny Davies <woodchip@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/apmd/apmd-3.0.1-r6.ebuild,v 1.2 2001/12/31 23:47:55 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/apmd/apmd-3.0.2.ebuild,v 1.1 2002/02/01 01:09:41 woodchip Exp $
 
-MY_P=${P/-/_}
-S=${WORKDIR}/${P}
 DESCRIPTION="Advanced Power Management Daemon"
-SRC_URI="ftp://ftp.debian.org/debian/pool/main/a/apmd/${MY_P}-1.tar.gz"
 HOMEPAGE="http://www.worldvisions.ca/~apenwarr/apmd/"
 
+SRC_URI="http://www.worldvisions.ca/~apenwarr/apmd/${P}.tar.gz"
+S=${WORKDIR}/${PN}
+
 DEPEND="virtual/glibc X? ( virtual/x11 )"
 
 src_unpack() {
@@ -17,15 +17,15 @@ src_unpack() {
 
 	cp Makefile Makefile.orig
 	sed -e "s:PREFIX=\/usr:PREFIX=\$\{DESTDIR\}\/usr:" \
-	    -e "s:APMD_PROXY_DIR\=\/etc:APMD_PROXY_DIR\=\$\{DESTDIR\}\/etc\/apm:" \
-	    -e "97d" \
-	    -e "s:MANDIR\=\${PREFIX}\/man:MANDIR\=\${PREFIX}\/share\/man:" \
-	    Makefile.orig > Makefile
+		-e "s:APMD_PROXY_DIR\=\/etc:APMD_PROXY_DIR\=\$\{DESTDIR\}\/etc\/apm:" \
+		-e "97d" \
+		-e "s:MANDIR\=\${PREFIX}\/man:MANDIR\=\${PREFIX}\/share\/man:" \
+		Makefile.orig > Makefile
 
 	cp Makefile Makefile.orig2
 	use X || sed -e "/^EXES=/s/xapm//" \
-			-e "/install.*xapm/d" \
-			Makefile.orig2 > Makefile
+		-e "/install.*xapm/d" \
+		Makefile.orig2 > Makefile
 }
 
 src_compile() {
@@ -36,9 +36,11 @@ src_compile() {
 src_install () {
 
 	make DESTDIR=${D} install || die
+
 	dodir /etc/apm/{event.d,suspend.d,resume.d}
 	exeinto /etc/apm ; doexe debian/apmd_proxy
 	dodoc ANNOUNCE BUGS.apmsleep COPYING* README* ChangeLog LSM
 
+	insinto /etc/conf.d ; newins ${FILESDIR}/apmd.confd apmd
 	exeinto /etc/init.d ; newexe ${FILESDIR}/apmd.rc6 apmd
 }
diff --git a/sys-apps/apmd/files/apmd.confd b/sys-apps/apmd/files/apmd.confd
new file mode 100644
index 000000000000..47b287757ef6
--- /dev/null
+++ b/sys-apps/apmd/files/apmd.confd
@@ -0,0 +1,3 @@
+# Config file for /etc/init.d/apmd
+
+#APMD_OPTS="-P /etc/apm/apmd_proxy"
diff --git a/sys-apps/apmd/files/apmd.rc5 b/sys-apps/apmd/files/apmd.rc5
deleted file mode 100644
index 2f9722a8cc0e..000000000000
--- a/sys-apps/apmd/files/apmd.rc5
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/sh
-#RCUPDATE:2 3 4:60:This line is required for script management
-
-# Based on apmd.init by Dirk Eddelbuettel <edd@debian.org> and
-# Avery Pennarun <apenwarr@debian.org>
-# Rewritten for gentoo by Craig Joly <joly@ee.ualberta.ca>
-
-. /etc/rc.d/config/functions
-
-SERVICE="apmd"
-opts="start stop restart"
-
-PIDFILE=/var/run/apmd.pid
-EXEC=/usr/sbin/apmd
-
-# apmd arguments variable.  See the manual page apmd(8) for details.
-APMD=""
-
-check_kernel() {
-	if [ ! -e /proc/apm ]
-	then
-		eerror "APM support has not been compiled into the kernel."
-		exit 1
-	fi
-}
-
-start() {
-	check_kernel
-
-	ebegin "Starting $SERVICE"
-	start-stop-daemon --start --quiet --pidfile $PIDFILE --exec \
-		$EXEC -- -P /etc/apm/apmd_proxy $APMD
-	eend $? "Started $SERVICE." "Error starting $SERVICE."
-}
-
-stop() {
-	ebegin "Stopping $SERVICE"
-	start-stop-daemon --stop --quiet --pidfile $PIDFILE --exec $EXEC
-	eend $? "Stopped $SERVICE." "Error stopping $SERVICE."
-}
-
-restart() {
-	stop
-	start
-}
-
-doservice ${@}
-
diff --git a/sys-apps/apmd/files/apmd.rc6 b/sys-apps/apmd/files/apmd.rc6
index df52e33b5942..8fdd56fdd043 100644
--- a/sys-apps/apmd/files/apmd.rc6
+++ b/sys-apps/apmd/files/apmd.rc6
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/apmd/files/apmd.rc6,v 1.2 2001/12/06 20:17:02 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/apmd/files/apmd.rc6,v 1.3 2002/02/01 01:09:41 woodchip Exp $
 
 depend() {
 	need localmount
@@ -17,7 +17,8 @@ checkconfig() {
 start() {
 	checkconfig || return 1
 	ebegin "Starting apmd"
-	start-stop-daemon --start --quiet --exec /usr/sbin/apmd -- -P /etc/apm/apmd_proxy
+	start-stop-daemon --start --quiet --exec /usr/sbin/apmd \
+		--make-pidfile --pidfile /var/run/apmd.pid -- ${APMD_OPTS}
 	eend $?
 }
 
diff --git a/sys-apps/apmd/files/digest-apmd-3.0.1-r1 b/sys-apps/apmd/files/digest-apmd-3.0.1-r1
deleted file mode 100644
index 17c6cab1af0b..000000000000
--- a/sys-apps/apmd/files/digest-apmd-3.0.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cf3fb2c7165bfa5c963b38fa150527d3 apmd_3.0.1-1.tar.gz 163287
diff --git a/sys-apps/apmd/files/digest-apmd-3.0.1-r6 b/sys-apps/apmd/files/digest-apmd-3.0.1-r6
deleted file mode 100644
index 17c6cab1af0b..000000000000
--- a/sys-apps/apmd/files/digest-apmd-3.0.1-r6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cf3fb2c7165bfa5c963b38fa150527d3 apmd_3.0.1-1.tar.gz 163287
diff --git a/sys-apps/apmd/files/digest-apmd-3.0.2 b/sys-apps/apmd/files/digest-apmd-3.0.2
new file mode 100644
index 000000000000..9a9bc483e68a
--- /dev/null
+++ b/sys-apps/apmd/files/digest-apmd-3.0.2
@@ -0,0 +1 @@
+MD5 23ce275766441c59b6b47c002f9098eb apmd-3.0.2.tar.gz 80489