Fixed example regular expression, bug #89716.

(Portage version: 2.0.51.20-r4)

5 files changed, 78 insertions, 9 deletions

diff --git a/sys-power/acpid/ChangeLog b/sys-power/acpid/ChangeLog
index c441f85b9ce3..97b855f4637d 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.2 2005/03/16 19:14:59 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/acpid/ChangeLog,v 1.3 2005/04/24 16:21:45 brix Exp $
+
+*acpid-1.0.4-r1 (24 Apr 2005)
+
+  24 Apr 2005; <brix@gentoo.org> files/acpid-1.0.4-default,
+  +acpid-1.0.4-r1.ebuild:
+  Fixed example regular expression, bug #89716.
 
 *acpid-1.0.4 (15 Mar 2005)
 *acpid-1.0.2-r2 (15 Mar 2005)
diff --git a/sys-power/acpid/Manifest b/sys-power/acpid/Manifest
index 4ecd60eedb5a..08aae2af7cf3 100644
--- a/sys-power/acpid/Manifest
+++ b/sys-power/acpid/Manifest
@@ -1,14 +1,16 @@
-MD5 543e73cb479d3702f7bd510024089589 ChangeLog 2956
 MD5 654e4d9f11e2426ef5c34104b48e18f0 acpid-1.0.1.ebuild 1192
 MD5 915127f5fb100f20a8aae1c6c7c0188e acpid-1.0.2-r1.ebuild 1305
-MD5 a15ebede7a8bd47be9c5cd838cc9a47f acpid-1.0.2-r2.ebuild 1443
+MD5 9014fbf933ea02c9562a8bf2b1c864b0 acpid-1.0.4-r1.ebuild 1450
+MD5 543e73cb479d3702f7bd510024089589 ChangeLog 2956
 MD5 3578a40c7c46ffaf7ab9449dff570641 acpid-1.0.4.ebuild 1524
 MD5 19fd766bac8e110b4620363a1ace26dd metadata.xml 159
-MD5 89eeae622d33ea9f9f6965550e747cb9 files/acpid-1.0.4-default 855
+MD5 a15ebede7a8bd47be9c5cd838cc9a47f acpid-1.0.2-r2.ebuild 1443
 MD5 747fc9ab0e7a041ea461b8f0ecab9132 files/acpid-1.0.4-default.sh 560
-MD5 93f4357c4993442069a86bd9b6a6f6a7 files/acpid.rc6 646
 MD5 3cc2de9822a0f65e061e31184ad2e91f files/default.sh-gentoo.patch 550
+MD5 b704293fc42de7b05c70e9a7f3854849 files/acpid-1.0.4-default 861
+MD5 93f4357c4993442069a86bd9b6a6f6a7 files/acpid.rc6 646
 MD5 1ad4b7deead64fc207ea20bd1c340973 files/digest-acpid-1.0.1 62
+MD5 e193d813bbbabf9aceb89ba3c612e58e files/digest-acpid-1.0.4 62
 MD5 4bf4b207e7f3c9f7a966c62236dd73be files/digest-acpid-1.0.2-r1 62
 MD5 4bf4b207e7f3c9f7a966c62236dd73be files/digest-acpid-1.0.2-r2 62
-MD5 e193d813bbbabf9aceb89ba3c612e58e files/digest-acpid-1.0.4 62
+MD5 e193d813bbbabf9aceb89ba3c612e58e files/digest-acpid-1.0.4-r1 62
diff --git a/sys-power/acpid/acpid-1.0.4-r1.ebuild b/sys-power/acpid/acpid-1.0.4-r1.ebuild
new file mode 100644
index 000000000000..b6c213063377
--- /dev/null
+++ b/sys-power/acpid/acpid-1.0.4-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2005 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-r1.ebuild,v 1.1 2005/04/24 16:21:45 brix Exp $
+
+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="~x86 -ppc ~alpha ~amd64 ~ia64"
+IUSE="doc"
+
+DEPEND="virtual/libc
+		virtual/linux-sources"
+RDEPEND="virtual/libc"
+
+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 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
+
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/acpid.rc6 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
+}
+
+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-default b/sys-power/acpid/files/acpid-1.0.4-default
index ae001fdbe3b8..19d20ba4813a 100644
--- a/sys-power/acpid/files/acpid-1.0.4-default
+++ b/sys-power/acpid/files/acpid-1.0.4-default
@@ -1,17 +1,17 @@
 # Copyright 1999-2004 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-default,v 1.1 2005/03/15 19:15:53 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/acpid/files/acpid-1.0.4-default,v 1.2 2005/04/24 16:21:45 brix Exp $
 
 # This is the ACPID default configuration, it takes all
 # events and passes them to /etc/acpi/default.sh for further
 # processing.
 
 # event keeps a regular expression matching the event. To get
-# power events only, just use something like "event=button power.*"
+# power events only, just use something like "event=button[ /]power.*"
 # to catch it.
 # action keeps the command to be executed after an event occurs
 # In case of the power event above, your entry may look this way:
-#event=button power.*
+#event=button[ /]power.*
 #action=/sbin/init 0
 
 # Optionally you can specify the placeholder %e. It will pass
diff --git a/sys-power/acpid/files/digest-acpid-1.0.4-r1 b/sys-power/acpid/files/digest-acpid-1.0.4-r1
new file mode 100644
index 000000000000..37c23c5f0323
--- /dev/null
+++ b/sys-power/acpid/files/digest-acpid-1.0.4-r1
@@ -0,0 +1 @@
+MD5 3aff94e92186e99ed5fd6dcee2db7c74 acpid-1.0.4.tar.gz 23416