Version bump, fixes bug 11154

4 files changed, 96 insertions, 8 deletions

diff --git a/sys-apps/apmd/Manifest b/sys-apps/apmd/Manifest
index 49572ff79315..ad9c3f0949a7 100644
--- a/sys-apps/apmd/Manifest
+++ b/sys-apps/apmd/Manifest
@@ -1,14 +1,16 @@
-MD5 77429c8b0f0da62c07ce8cab66f4b2ec ChangeLog 2096
-MD5 d02f7a9cc759fc9f70027a7d8f984dd3 apmd-3.0.2-r1.ebuild 1366
+MD5 dc8b813777e25c9774d298e46d0e66e1 apmd-3.0.2-r3.ebuild 1815
 MD5 b34c869514e68d3c5083e76865a03bf0 apmd-3.0.2-r2.ebuild 1486
-MD5 97756f24b66606b01de1a72a909ec7b9 apmd-3.0.2-r3.ebuild 1809
+MD5 d62593f9b0062d4b529a1594e73e3a7f apmd-3.2.0.ebuild 1830
+MD5 77429c8b0f0da62c07ce8cab66f4b2ec ChangeLog 2096
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 1cb28b2ee147ffb8a402956d9b429c12 files/apmd.confd 72
-MD5 02fc246d5b2fde52708927cb672239f1 files/apmd.kernel26x.patch 644
-MD5 c2edd6e21cae8a8167c1f717165b6d21 files/apmd.rc6 689
-MD5 ad21c10734c08e19968e2c8c9560957c files/apmsleep.c.diff 367
+MD5 d02f7a9cc759fc9f70027a7d8f984dd3 apmd-3.0.2-r1.ebuild 1366
+MD5 41d93c73cf8e247bd38b863d1aa4e196 files/run 246
 MD5 7bb0220959a949bad3d9726cf05ebcf9 files/digest-apmd-3.0.2-r1 61
 MD5 7bb0220959a949bad3d9726cf05ebcf9 files/digest-apmd-3.0.2-r2 61
 MD5 7bb0220959a949bad3d9726cf05ebcf9 files/digest-apmd-3.0.2-r3 61
-MD5 41d93c73cf8e247bd38b863d1aa4e196 files/run 246
+MD5 ad21c10734c08e19968e2c8c9560957c files/apmsleep.c.diff 367
+MD5 c2edd6e21cae8a8167c1f717165b6d21 files/apmd.rc6 689
+MD5 02fc246d5b2fde52708927cb672239f1 files/apmd.kernel26x.patch 644
+MD5 a2b499e3ffda161e88b518f5b830a434 files/digest-apmd-3.2.0 66
+MD5 1cb28b2ee147ffb8a402956d9b429c12 files/apmd.confd 72
 MD5 bae01c156ae6240672f7ee5ebfcadf61 files/svc-apmd 861
diff --git a/sys-apps/apmd/apmd-3.2.0.ebuild b/sys-apps/apmd/apmd-3.2.0.ebuild
new file mode 100644
index 000000000000..b1c5c7842069
--- /dev/null
+++ b/sys-apps/apmd/apmd-3.2.0.ebuild
@@ -0,0 +1,74 @@
+# 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.2.0.ebuild,v 1.1 2003/12/30 23:12:19 warpzero Exp $
+
+inherit eutils
+
+IUSE="X"
+
+S=${WORKDIR}/${PN}
+DESCRIPTION="Advanced Power Management Daemon"
+HOMEPAGE="http://www.worldvisions.ca/~apenwarr/apmd/"
+SRC_URI="ftp://ftp.debian.org/debian/pool/main/a/apmd/${PN}_${PV}.orig.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~amd64 ~ppc ~ppc64"
+
+
+DEPEND=">=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
+		echo -e "xinstall:\n\tinstall\txapm\t\${PREFIX}/bin" >> Makefile
+	else
+		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
+	epatch ${FILESDIR}/apmsleep.c.diff.3.2.0
+
+	# This closes bug #29636: needs 2.6 patching [plasmaroo@gentoo.org]
+	#epatch ${FILESDIR}/apmd.kernel26x.patch
+	#this doesn't seem to be needed anymore [warpzero@gentoo.org]
+}
+
+src_compile() {
+	#make CFLAGS="${CFLAGS}" || die "compile problem"
+	emake || die
+}
+
+S="${WORKDIR}/${PN}-${PV}.orig"
+
+src_install() {
+	make DESTDIR=${D} install || die "install failed"
+
+	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
+
+	if [ `use X` ] ; then
+		make DESTDIR=${D} xinstall || die "xinstall failed"
+	fi
+
+	if [ ! `use nls` ]
+	then
+		rm -rf ${D}/usr/share/man/fr
+	fi
+}
diff --git a/sys-apps/apmd/files/apmsleep.c.diff.3.2.0 b/sys-apps/apmd/files/apmsleep.c.diff.3.2.0
new file mode 100644
index 000000000000..2cd057b7748e
--- /dev/null
+++ b/sys-apps/apmd/files/apmsleep.c.diff.3.2.0
@@ -0,0 +1,11 @@
+--- apmsleep.c.orig	2003-12-30 15:45:36.362221880 -0700
++++ apmsleep.c	2003-12-30 15:42:48.399756056 -0700
+@@ -46,7 +46,7 @@
+ #include <linux/version.h>
+ 
+ #if LINUX_VERSION_CODE > KERNEL_VERSION(2,2,0)
+-#include <asm/spinlock.h>
++#include <linux/spinlock.h>
+ #endif
+ 
+ #include <linux/mc146818rtc.h>
diff --git a/sys-apps/apmd/files/digest-apmd-3.2.0 b/sys-apps/apmd/files/digest-apmd-3.2.0
new file mode 100644
index 000000000000..bba9e8238e4f
--- /dev/null
+++ b/sys-apps/apmd/files/digest-apmd-3.2.0
@@ -0,0 +1 @@
+MD5 647711b4826605ab6da0b8c2d7d17428 apmd_3.2.0.orig.tar.gz 71686