version bump. using debian's apmd as development seems to have moved there (#36952), adapted new ebuild based on changes suggested by narendra sankar <nsankar@broadcom.com>. added man pages and docs. bonus cleanups from 2001 :)

13 files changed, 88 insertions, 186 deletions

diff --git a/sys-apps/apmd/ChangeLog b/sys-apps/apmd/ChangeLog
index f9adc887559c..86df17f57c0f 100644
--- a/sys-apps/apmd/ChangeLog
+++ b/sys-apps/apmd/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-apps/apmd
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/apmd/ChangeLog,v 1.10 2003/10/13 19:32:25 plasmaroo Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/apmd/ChangeLog,v 1.11 2004/02/29 17:51:13 liquidx Exp $
+
+*apmd-3.2.1_p4 (29 Feb 2004)
+
+  29 Feb 2004; Alastair Tse <liquidx@gentoo.org> apmd-3.2.0.ebuild,
+  apmd-3.2.1_p4.ebuild, files/apmd.confd:
+  version bump. using debian's apmd as development seems to have moved there
+  (#36952), adapted new ebuild based on changes suggested by narendra sankar
+  <nsankar@broadcom.com>. added man pages and docs.
 
   13 Oct 2003; <plasmaroo@gentoo.org> apmd-3.0.2-r3.ebuild,
   files/apmd.kernel26x.patch: Added a patch to get apmd to compile on 
diff --git a/sys-apps/apmd/Manifest b/sys-apps/apmd/Manifest
index b1048601eedc..6881a7e161ab 100644
--- a/sys-apps/apmd/Manifest
+++ b/sys-apps/apmd/Manifest
@@ -1,18 +1,14 @@
-MD5 77429c8b0f0da62c07ce8cab66f4b2ec ChangeLog 2096
-MD5 b34c869514e68d3c5083e76865a03bf0 apmd-3.0.2-r2.ebuild 1486
+MD5 ab21f0953584c86f038b567111fb4e02 ChangeLog 2441
 MD5 dc8b813777e25c9774d298e46d0e66e1 apmd-3.0.2-r3.ebuild 1815
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 3b4b8a9b5ba1d88d898899c726f9e871 apmd-3.2.0.ebuild 1947
-MD5 d02f7a9cc759fc9f70027a7d8f984dd3 apmd-3.0.2-r1.ebuild 1366
+MD5 3d4ba3153facfd8bc4aafb44d5d077b9 apmd-3.2.0.ebuild 1957
+MD5 316c8cd871b2d7d0976012d28ad81a3e apmd-3.2.1_p4.ebuild 1585
+MD5 c699d919f1c3463ae0e91f2c28c8b687 metadata.xml 184
 MD5 bed1c6668552bbf528df267c302a75eb files/apmd-3.2.0.kernel26x.patch 627
-MD5 ad21c10734c08e19968e2c8c9560957c files/apmsleep.c.diff 367
-MD5 a2b499e3ffda161e88b518f5b830a434 files/digest-apmd-3.2.0 66
-MD5 41d93c73cf8e247bd38b863d1aa4e196 files/run 246
-MD5 bae01c156ae6240672f7ee5ebfcadf61 files/svc-apmd 861
-MD5 7bb0220959a949bad3d9726cf05ebcf9 files/digest-apmd-3.0.2-r2 61
-MD5 7bb0220959a949bad3d9726cf05ebcf9 files/digest-apmd-3.0.2-r3 61
-MD5 c2edd6e21cae8a8167c1f717165b6d21 files/apmd.rc6 689
-MD5 7bb0220959a949bad3d9726cf05ebcf9 files/digest-apmd-3.0.2-r1 61
+MD5 1a2007554d23f0bd5af71b8021915fc0 files/apmd.confd 90
 MD5 02fc246d5b2fde52708927cb672239f1 files/apmd.kernel26x.patch 644
+MD5 c2edd6e21cae8a8167c1f717165b6d21 files/apmd.rc6 689
+MD5 ad21c10734c08e19968e2c8c9560957c files/apmsleep.c.diff 367
 MD5 253b79375ab72606e4fdf89109ed2c03 files/apmsleep.c.diff.3.2.0 301
-MD5 1cb28b2ee147ffb8a402956d9b429c12 files/apmd.confd 72
+MD5 7bb0220959a949bad3d9726cf05ebcf9 files/digest-apmd-3.0.2-r3 61
+MD5 a2b499e3ffda161e88b518f5b830a434 files/digest-apmd-3.2.0 66
+MD5 648c4b025de00c2bf42aafaebed2f4ef files/digest-apmd-3.2.1_p4 130
diff --git a/sys-apps/apmd/apmd-3.0.2-r1.ebuild b/sys-apps/apmd/apmd-3.0.2-r1.ebuild
deleted file mode 100644
index 50b8878e31a8..000000000000
--- a/sys-apps/apmd/apmd-3.0.2-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/apmd/apmd-3.0.2-r1.ebuild,v 1.11 2003/09/07 02:55:19 msterret Exp $
-
-IUSE="X"
-
-DESCRIPTION="Advanced Power Management Daemon"
-HOMEPAGE="http://www.worldvisions.ca/~apenwarr/apmd/"
-KEYWORDS="x86 amd64 ppc"
-SLOT="0"
-SRC_URI="http://www.worldvisions.ca/~apenwarr/apmd/${P}.tar.gz"
-S=${WORKDIR}/${PN}
-LICENSE="GPL-2 LGPL-2"
-
-DEPEND="virtual/glibc
-	>=sys-apps/debianutils-1.16
-	X? ( virtual/x11 )"
-
-src_unpack() {
-
-	unpack ${A} ; cd ${S}
-
-	cp Makefile Makefile.orig
-	sed -e "s:\(PREFIX=\)\(/usr\):\1\$\{DESTDIR\}\2:" \
-		-e "s:\(APMD_PROXY_DIR\=\)\(/etc\):\1\$\{DESTDIR\}\2/apm:" \
-		-e "97d" \
-		-e "s:\(MANDIR\=\${PREFIX}\)\(/man\):\1/share\2:" \
-		Makefile.orig > Makefile
-
-	if [ "`use X`" ]
-	then
-		cp Makefile Makefile.orig
-		sed -e "/^EXES=/s/xapm//" \
-			-e "/install.*xapm/d" \
-			Makefile.orig > Makefile
-	fi
-}
-
-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
-
-	insinto /etc/conf.d ; newins ${FILESDIR}/apmd.confd apmd
-	exeinto /etc/init.d ; newexe ${FILESDIR}/apmd.rc6 apmd
-}
diff --git a/sys-apps/apmd/apmd-3.0.2-r2.ebuild b/sys-apps/apmd/apmd-3.0.2-r2.ebuild
deleted file mode 100644
index 936983bc6b82..000000000000
--- a/sys-apps/apmd/apmd-3.0.2-r2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/apmd/apmd-3.0.2-r2.ebuild,v 1.9 2003/09/07 02:55:19 msterret Exp $
-
-IUSE="X"
-
-DESCRIPTION="Advanced Power Management Daemon"
-HOMEPAGE="http://www.worldvisions.ca/~apenwarr/apmd/"
-KEYWORDS="x86 amd64 ppc"
-SLOT="0"
-SRC_URI="http://www.worldvisions.ca/~apenwarr/apmd/${P}.tar.gz"
-S=${WORKDIR}/${PN}
-LICENSE="GPL-2 LGPL-2"
-
-DEPEND="virtual/glibc >=sys-apps/debianutils-1.16 X? ( virtual/x11 )"
-
-src_unpack() {
-
-	unpack ${A} ; cd ${S}
-
-	cp Makefile Makefile.orig
-	sed -e "s:\(PREFIX=\)\(/usr\):\1\$\{DESTDIR\}\2:" \
-		-e "s:\(APMD_PROXY_DIR\=\)\(/etc\):\1\$\{DESTDIR\}\2/apm:" \
-		-e "97d" \
-		-e "s:\(MANDIR\=\${PREFIX}\)\(/man\):\1/share\2:" \
-		Makefile.orig > Makefile
-
-	if [ "`use X`" ]
-	then
-		cp Makefile Makefile.orig
-		sed -e "/^EXES=/s/xapm//" \
-			-e "/install.*xapm/d" \
-			Makefile.orig > Makefile
-	fi
-
-	#This closes bug #1472: fixes compilation with recent 2.4 kernels
-	cat ${FILESDIR}/apmsleep.c.diff | patch -p0 -l || die
-}
-
-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
-
-	insinto /etc/conf.d ; newins ${FILESDIR}/apmd.confd apmd
-	exeinto /etc/init.d ; newexe ${FILESDIR}/apmd.rc6 apmd
-}
diff --git a/sys-apps/apmd/apmd-3.2.0.ebuild b/sys-apps/apmd/apmd-3.2.0.ebuild
index 1ffddaae8a41..a924936ee50f 100644
--- a/sys-apps/apmd/apmd-3.2.0.ebuild
+++ b/sys-apps/apmd/apmd-3.2.0.ebuild
@@ -1,6 +1,6 @@
-# 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/apmd/apmd-3.2.0.ebuild,v 1.2 2003/12/31 13:53:36 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/apmd/apmd-3.2.0.ebuild,v 1.3 2004/02/29 17:51:13 liquidx Exp $
 
 inherit eutils
 
@@ -54,10 +54,12 @@ src_compile() {
 S="${WORKDIR}/${PN}-${PV}.orig"
 
 src_install() {
+	dodir /usr/sbin
+	
 	make DESTDIR=${D} PREFIX=/usr install || die "install failed"
 
 	dodir /etc/apm/{event.d,suspend.d,resume.d}
-	exeinto /etc/apm ; doexe debian/apmd_proxy
+	exeinto /etc/apm ; doexe apmd_proxy
 	dodoc ANNOUNCE BUGS.apmsleep COPYING* README* ChangeLog LSM
 
 	insinto /etc/conf.d ; newins ${FILESDIR}/apmd.confd apmd
diff --git a/sys-apps/apmd/apmd-3.2.1_p4.ebuild b/sys-apps/apmd/apmd-3.2.1_p4.ebuild
new file mode 100644
index 000000000000..1699683a2477
--- /dev/null
+++ b/sys-apps/apmd/apmd-3.2.1_p4.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/apmd/apmd-3.2.1_p4.ebuild,v 1.1 2004/02/29 17:51:13 liquidx Exp $
+
+IUSE="X nls"
+
+MY_PV="${PV%_p*}"
+MY_P="${PN}_${MY_PV}"
+PATCHV="${PV#*_p}"
+
+S="${WORKDIR}/${PN}-${MY_PV}.orig"
+DESCRIPTION="Advanced Power Management Daemon"
+HOMEPAGE="http://www.worldvisions.ca/~apenwarr/apmd/"
+SRC_URI="mirror://debian/pool/main/a/apmd/${MY_P}.orig.tar.gz
+	mirror://debian/pool/main/a/apmd/${MY_P}-${PATCHV}.diff.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~amd64 ~ppc ~ppc64"
+DEPEND="sys-kernel/linux-headers
+	>=sys-apps/debianutils-1.16
+	>=sys-apps/sed-4
+	X? ( virtual/x11 )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}; epatch ${WORKDIR}/${MY_P}-${PATCHV}.diff
+	
+	if [ -z "`use X`" ]; then
+		sed -e 's:\(EXES=.*\)xapm:\1:' \
+			-e 's:\(.*\)\$(LT_INSTALL).*xapm.*$:\1echo:' \
+			-i ${S}/Makefile	
+	fi
+}
+
+src_compile() {
+	emake || die
+}
+
+src_install() {
+	dodir /usr/sbin
+
+	make DESTDIR=${D} PREFIX=/usr install || die "install failed"
+
+	dodir /etc/apm/{event.d,suspend.d,resume.d,other.d,scripts.d}
+	exeinto /etc/apm ; doexe debian/apmd_proxy
+	dodoc AUTHORS apmsleep.README README debian/README.debian 
+	dodoc debian/changelog* debian/copyright*
+
+	doman *.1 *.8
+
+	# note: apmd_proxy.conf is currently disabled and not used, thus
+	#       not installed - liquidx (01 Mar 2004)
+
+	insinto /etc/conf.d ; newins ${FILESDIR}/apmd.confd apmd
+	exeinto /etc/init.d ; newexe ${FILESDIR}/apmd.rc6 apmd
+
+	[ -z "`use nls`" ] && rm -rf ${D}/usr/share/man/fr
+}
diff --git a/sys-apps/apmd/files/apmd.confd b/sys-apps/apmd/files/apmd.confd
index 47b287757ef6..383f5993f8e2 100644
--- a/sys-apps/apmd/files/apmd.confd
+++ b/sys-apps/apmd/files/apmd.confd
@@ -1,3 +1,3 @@
 # Config file for /etc/init.d/apmd
 
-#APMD_OPTS="-P /etc/apm/apmd_proxy"
+APMD_OPTS="-P /etc/apm/apmd_proxy --proxy-timeout 30"
diff --git a/sys-apps/apmd/files/digest-apmd-3.0.2-r1 b/sys-apps/apmd/files/digest-apmd-3.0.2-r1
deleted file mode 100644
index 9a9bc483e68a..000000000000
--- a/sys-apps/apmd/files/digest-apmd-3.0.2-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 23ce275766441c59b6b47c002f9098eb apmd-3.0.2.tar.gz 80489
diff --git a/sys-apps/apmd/files/digest-apmd-3.0.2-r2 b/sys-apps/apmd/files/digest-apmd-3.0.2-r2
deleted file mode 100644
index 9a9bc483e68a..000000000000
--- a/sys-apps/apmd/files/digest-apmd-3.0.2-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 23ce275766441c59b6b47c002f9098eb apmd-3.0.2.tar.gz 80489
diff --git a/sys-apps/apmd/files/digest-apmd-3.2.1_p4 b/sys-apps/apmd/files/digest-apmd-3.2.1_p4
new file mode 100644
index 000000000000..cb2b0a74303e
--- /dev/null
+++ b/sys-apps/apmd/files/digest-apmd-3.2.1_p4
@@ -0,0 +1,2 @@
+MD5 99523e709f5033d3d64ad38d3954f7fc apmd_3.2.1.orig.tar.gz 72610
+MD5 3bec6042cc90c730209046fdc0b99ec1 apmd_3.2.1-4.diff.gz 22350
diff --git a/sys-apps/apmd/files/run b/sys-apps/apmd/files/run
deleted file mode 100644
index 8503392dbbb6..000000000000
--- a/sys-apps/apmd/files/run
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-# apmd arguments variable.  See the manual page apmd(8) for detals.
-APMD=""
-
-if [ ! -e /var/run/apmd.pid ]
-then
-	/usr/sbin/apmd -- P /etc/apm/apmd_proxy $APMD
-	sleep 2
-fi
-exec envuidgid daemon /usr/bin/watchpid `cat /var/run/apmd.pid`
diff --git a/sys-apps/apmd/files/svc-apmd b/sys-apps/apmd/files/svc-apmd
deleted file mode 100644
index 85b57f70ec77..000000000000
--- a/sys-apps/apmd/files/svc-apmd
+++ /dev/null
@@ -1,44 +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"
-
-# apmd arguments go in /var/lib/supervise/services/apmd/run.
-# 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"
-	ln -sf ../services/${SERVICE} ${SVCDIR}/control/${SERVICE}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping $SERVICE"
-	if [ -e ${SVCDIR}/control/${SERVICE} ]
-	then
-		/usr/bin/svc -dx ${SVCDIR}/control/${SERVICE}
-		rm ${SVCDIR}/control/${SERVICE}
-	fi
-	eend $?
-}
-
-doservice ${@}
-
diff --git a/sys-apps/apmd/metadata.xml b/sys-apps/apmd/metadata.xml
index 96a2d586367d..ce3e5e1a7eb2 100644
--- a/sys-apps/apmd/metadata.xml
+++ b/sys-apps/apmd/metadata.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+<herd>mobile</herd>
 <herd>base-system</herd>
 </pkgmetadata>