5 files changed, 98 insertions, 13 deletions
diff --git a/sys-power/acpid/ChangeLog b/sys-power/acpid/ChangeLog
index 9f1255cec63c..cd9110413d58 100644
--- a/sys-power/acpid/ChangeLog
+++ b/sys-power/acpid/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-power/acpid
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/acpid/ChangeLog,v 1.15 2005/12/17 15:05:59 brix Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/acpid/ChangeLog,v 1.16 2006/01/09 13:05:58 brix Exp $
+
+*acpid-1.0.4-r3 (09 Jan 2006)
+
+  09 Jan 2006; Henrik Brix Andersen <brix@gentoo.org>
+  files/acpid-1.0.4-init.d, +acpid-1.0.4-r3.ebuild:
+  Fix init script to work with baselayout-1.12.0_rcX.
 
   17 Dec 2005; Henrik Brix Andersen <brix@gentoo.org>
   files/acpid-1.0.4-logrotate:
diff --git a/sys-power/acpid/Manifest b/sys-power/acpid/Manifest
index bfa28d90dbe0..2378c3a2cb8c 100644
--- a/sys-power/acpid/Manifest
+++ b/sys-power/acpid/Manifest
@@ -1,13 +1,15 @@
-MD5 aec8eaf580d6eb7a36c90211f3d6d63e acpid-1.0.4-r2.ebuild 1853
-MD5 db90ceff1e1eaa474495800377898114 ChangeLog 4614
-MD5 b280eebc74d70d85e664debf1adce2c3 metadata.xml 255
+MD5 310ee959ee375c27e88a1c97ddef6cd5 ChangeLog 4806
 MD5 8bde51e1c148564b53bd70b2a38fc9b2 acpid-1.0.2-r2.ebuild 1417
+MD5 aec8eaf580d6eb7a36c90211f3d6d63e acpid-1.0.4-r2.ebuild 1853
+MD5 0b7b5a0a11a16e3ac3514f6ef1b31c13 acpid-1.0.4-r3.ebuild 1755
+MD5 13412c1fef605768fd76a97fd7e92162 files/acpid-1.0.4-default 858
 MD5 747fc9ab0e7a041ea461b8f0ecab9132 files/acpid-1.0.4-default.sh 560
-MD5 3cc2de9822a0f65e061e31184ad2e91f files/default.sh-gentoo.patch 550
+MD5 faf93dd3ae4cc7973d7375beea0738a3 files/acpid-1.0.4-gcc4.patch 670
+MD5 3477663e5edcd45ad250527cf8ab8931 files/acpid-1.0.4-init.d 768
 MD5 79d7ccb97f4ab85e7071481fa10e3629 files/acpid-1.0.4-logrotate 145
-MD5 13412c1fef605768fd76a97fd7e92162 files/acpid-1.0.4-default 858
 MD5 93f4357c4993442069a86bd9b6a6f6a7 files/acpid.rc6 646
-MD5 faf93dd3ae4cc7973d7375beea0738a3 files/acpid-1.0.4-gcc4.patch 670
+MD5 3cc2de9822a0f65e061e31184ad2e91f files/default.sh-gentoo.patch 550
 MD5 4bf4b207e7f3c9f7a966c62236dd73be files/digest-acpid-1.0.2-r2 62
 MD5 e193d813bbbabf9aceb89ba3c612e58e files/digest-acpid-1.0.4-r2 62
-MD5 d8a1eba60a556bf4a65f3fea9795bc63 files/acpid-1.0.4-init.d 818
+MD5 e193d813bbbabf9aceb89ba3c612e58e files/digest-acpid-1.0.4-r3 62
+MD5 b280eebc74d70d85e664debf1adce2c3 metadata.xml 255
diff --git a/sys-power/acpid/acpid-1.0.4-r3.ebuild b/sys-power/acpid/acpid-1.0.4-r3.ebuild
new file mode 100644
index 000000000000..6c6e197d064c
--- /dev/null
+++ b/sys-power/acpid/acpid-1.0.4-r3.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/acpid/acpid-1.0.4-r3.ebuild,v 1.1 2006/01/09 13:05:58 brix Exp $
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Daemon for Advanced Configuration and Power Interface"
+HOMEPAGE="http://acpid.sourceforge.net"
+SRC_URI="mirror://sourceforge/acpid/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 -ppc ~x86"
+IUSE="doc logrotate"
+
+DEPEND="sys-apps/sed"
+RDEPEND=""
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	# Fix building with gcc4
+	epatch ${FILESDIR}/${P}-gcc4.patch
+
+	# do not treat warnings as errors, bug #90873
+	sed -i -e "s:-Werror::" ${S}/Makefile
+}
+
+src_compile() {
+	# DO NOT COMPILE WITH OPTIMISATIONS (bug #22365)
+	# That is a note to the devs.  IF you are a user, go ahead and optimise
+	# if you want, but we won't support bugs associated with that.
+	make CC="$(tc-getCC)" INSTPREFIX="${D}" || die
+}
+
+src_install() {
+	# needed since the Makefile doesn't do 'mkdir -p $(BINDIR)'
+	dodir /usr/bin
+
+	make INSTPREFIX="${D}" install || die
+
+	exeinto /etc/acpi
+	newexe ${FILESDIR}/${P}-default.sh default.sh || die
+
+	insinto /etc/acpi/events
+	newins ${FILESDIR}/${P}-default default || die
+
+	dodoc README Changelog TODO
+
+	newinitd ${FILESDIR}/${P}-init.d acpid || die
+
+	if use doc; then
+		docinto examples
+		dodoc samples/{acpi_handler.sh,sample.conf}
+
+		docinto examples/battery
+		dodoc samples/battery/*
+
+		docinto examples/panasonic
+		dodoc samples/panasonic/*
+	fi
+
+	if use logrotate; then
+		insinto /etc/logrotate.d
+		newins ${FILESDIR}/${P}-logrotate acpid || die
+	fi
+}
+
+pkg_postinst() {
+	echo
+	einfo "You may wish to read the Gentoo Linux Power Management Guide,"
+	einfo "which can be found online at:"
+	einfo "    http://www.gentoo.org/doc/en/power-management-guide.xml"
+	echo
+}
diff --git a/sys-power/acpid/files/acpid-1.0.4-init.d b/sys-power/acpid/files/acpid-1.0.4-init.d
index 33bb80a5a01e..fdf89987edcb 100644
--- a/sys-power/acpid/files/acpid-1.0.4-init.d
+++ b/sys-power/acpid/files/acpid-1.0.4-init.d
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/acpid/files/acpid-1.0.4-init.d,v 1.1 2005/07/02 18:27:49 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/acpid/files/acpid-1.0.4-init.d,v 1.2 2006/01/09 13:05:58 brix Exp $
 
 opts="${opts} reload"
 
@@ -20,19 +20,19 @@ start() {
 	checkconfig || return 1
 
 	ebegin "Starting acpid"
-	start-stop-daemon --start --quiet --exec /usr/sbin/acpid -- \
+	start-stop-daemon --start --exec /usr/sbin/acpid -- \
 		-c /etc/acpi/events
 	eend ${?}
 }
 
 stop() {
 	ebegin "Stopping acpid"
-	start-stop-daemon --stop --quiet --exec /usr/sbin/acpid
+	start-stop-daemon --stop --exec /usr/sbin/acpid
 	eend ${?}
 }
 
 reload() {
 	ebegin "Reloading acpid configuration"
-	start-stop-daemon --stop --quiet --exec /usr/sbin/acpid --signal HUP
+	kill -HUP $(pidof /usr/sbin/acpid)
 	eend ${?}
 }
diff --git a/sys-power/acpid/files/digest-acpid-1.0.4-r3 b/sys-power/acpid/files/digest-acpid-1.0.4-r3
new file mode 100644
index 000000000000..37c23c5f0323
--- /dev/null
+++ b/sys-power/acpid/files/digest-acpid-1.0.4-r3
@@ -0,0 +1 @@
+MD5 3aff94e92186e99ed5fd6dcee2db7c74 acpid-1.0.4.tar.gz 23416