version bump, thanks go to Matej Laitl <strohel@gmail.com> in bug 185553, also thanks for his excellent changelog: * dropped debian patch from SRC_URI, we'll provide light version of that patch * changed KEYWORDS to testing * patch with our own patch, which is an extract from the big debian patch for 1.0.4 (all source code changes are ignored, not needed for 1.0.6) * dodir /usr/bin is not needed as acpid Makefile has been fixed * we install sample conf.d file. (this file was already in portage tree but not used in any recent ebuild) * add elog comment about changed logging system * kill doc useflag was not used in ebuild anyway. (this also applies to in-tree 1.0.4-r5 ebuild AFAIK) * kill logrotate useflag and modify patch not to ship logrotate file. It had no sense when acpid logs to syslog.

Package-Manager: portage-2.1.3_rc6

7 files changed, 274 insertions, 15 deletions

diff --git a/sys-power/acpid/ChangeLog b/sys-power/acpid/ChangeLog
index 675a75ac0063..fcb05aad973d 100644
--- a/sys-power/acpid/ChangeLog
+++ b/sys-power/acpid/ChangeLog
@@ -1,6 +1,26 @@
 # ChangeLog for sys-power/acpid
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/acpid/ChangeLog,v 1.28 2007/05/12 01:40:05 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/acpid/ChangeLog,v 1.29 2007/07/17 19:42:55 genstef Exp $
+
+*acpid-1.0.6 (17 Jul 2007)
+
+  17 Jul 2007; Stefan Schweizer <genstef@gentoo.org>
+  +files/acpid-1.0.6-conf.d, +files/acpid-1.0.6-examples.diff,
+  +files/acpid-1.0.6-init.d, +acpid-1.0.6.ebuild:
+  version bump, thanks go to Matej Laitl <strohel@gmail.com> in bug 185553,
+  also thanks for his excellent changelog:
+  * dropped debian patch from SRC_URI, we'll provide light version of that patch
+  * changed KEYWORDS to testing
+  * patch with our own patch, which is an extract from the big debian patch for
+  1.0.4 (all source code changes are ignored, not needed for 1.0.6)
+  * dodir /usr/bin is not needed as acpid Makefile has been fixed
+  * we install sample conf.d file. (this file was already in portage tree but not
+  used in any recent ebuild)
+  * add elog comment about changed logging system
+  * kill doc useflag was not used in ebuild anyway. (this also applies to in-tree
+  1.0.4-r5 ebuild AFAIK)
+  * kill logrotate useflag and modify patch not to ship logrotate file. It had no
+  sense when acpid logs to syslog.
 
   12 May 2007; Daniel Gryniewicz <dang@gentoo.org> acpid-1.0.4-r5.ebuild:
   Marked stable on amd64 for bug #126131
diff --git a/sys-power/acpid/Manifest b/sys-power/acpid/Manifest
index 51cd75c92e55..ad3f73dc857f 100644
--- a/sys-power/acpid/Manifest
+++ b/sys-power/acpid/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX acpid-1.0.4-default 663 RMD160 5e40661ec9112c3cc675a0d283e96311d2d159f1 SHA1 e74b2f7388c303fc3d3e33c0500d4b8185474dce SHA256 2b18111978043d68848983a54dfc946dd9b9b15592d0f4dc33491599dbe24b23
 MD5 414d143f4c5e83c422f706f671820e6d files/acpid-1.0.4-default 663
 RMD160 5e40661ec9112c3cc675a0d283e96311d2d159f1 files/acpid-1.0.4-default 663
@@ -21,11 +18,24 @@ AUX acpid-1.0.4-logrotate 145 RMD160 a9a4d7572a53148d9063c91b381a22ff5822195c SH
 MD5 79d7ccb97f4ab85e7071481fa10e3629 files/acpid-1.0.4-logrotate 145
 RMD160 a9a4d7572a53148d9063c91b381a22ff5822195c files/acpid-1.0.4-logrotate 145
 SHA256 37a785e09fa4b140840a3bcd3991f050309a7b19c1cb4f9dbb1f5d7ed12556f1 files/acpid-1.0.4-logrotate 145
+AUX acpid-1.0.6-conf.d 156 RMD160 a7c8822a88b51f185c8740b075c968d0c045791d SHA1 497f35e98f1f499d2223c52f4491218b3def489a SHA256 5dfc6dbf687a47e853b0a9f9ed491cb1778b0d99195df5e7a5de849d269ca28c
+MD5 316fd290809d94eb02c27b46de06ba9f files/acpid-1.0.6-conf.d 156
+RMD160 a7c8822a88b51f185c8740b075c968d0c045791d files/acpid-1.0.6-conf.d 156
+SHA256 5dfc6dbf687a47e853b0a9f9ed491cb1778b0d99195df5e7a5de849d269ca28c files/acpid-1.0.6-conf.d 156
+AUX acpid-1.0.6-examples.diff 3726 RMD160 d20796ed7dd7eff5360fd63c4ee0fc7bf4893548 SHA1 1d2f8bb630240c7a5315f23e6fdc9ca80c98abeb SHA256 6caddc6f26b42e1489023d0d38ef7b7607b82880acb5142b59d7e8fa6b711bc0
+MD5 be8daccc1eb202d79f12c9914b213f6e files/acpid-1.0.6-examples.diff 3726
+RMD160 d20796ed7dd7eff5360fd63c4ee0fc7bf4893548 files/acpid-1.0.6-examples.diff 3726
+SHA256 6caddc6f26b42e1489023d0d38ef7b7607b82880acb5142b59d7e8fa6b711bc0 files/acpid-1.0.6-examples.diff 3726
+AUX acpid-1.0.6-init.d 798 RMD160 4a690d548d1214acaa37c264bc57b32b23c43333 SHA1 fea4f991bfb4a52c0e0fb1c7a54650f7217a27f4 SHA256 9fa634c6aa257db725eb4bcd33ea3eff0f38fc04b41a2215fc6d57afaeb9ad1c
+MD5 897b8da9770ec6c5a286d45fd86f484a files/acpid-1.0.6-init.d 798
+RMD160 4a690d548d1214acaa37c264bc57b32b23c43333 files/acpid-1.0.6-init.d 798
+SHA256 9fa634c6aa257db725eb4bcd33ea3eff0f38fc04b41a2215fc6d57afaeb9ad1c files/acpid-1.0.6-init.d 798
 AUX acpid.conf.d 121 RMD160 ee78388bf9c2c7651903ee6cef4a50e222b5c339 SHA1 5b8f697ab86d874d9145d37f7702ce4bb76e314d SHA256 f1dd8a60d192cddf412edbdb21e5ca5140cabe78e51864a2b537b9872a0f1e8c
 MD5 93bffbf08d9e95d058022bc0acda46e3 files/acpid.conf.d 121
 RMD160 ee78388bf9c2c7651903ee6cef4a50e222b5c339 files/acpid.conf.d 121
 SHA256 f1dd8a60d192cddf412edbdb21e5ca5140cabe78e51864a2b537b9872a0f1e8c files/acpid.conf.d 121
 DIST acpid-1.0.4.tar.gz 23416 RMD160 ddf3cb4e2df7126c71130f89086473b1aa8656b1 SHA1 229376815a861d798755c789727151dc0b2bc8a0 SHA256 032a95967f8dd8a227ee1771de4a2646becc4d0f1123568faeca931006ec8f5f
+DIST acpid-1.0.6.tar.gz 24226 RMD160 6abb7bae419d30b1f9f772d42fab9991771d5b13 SHA1 67a582cddcd82256e376f4b0749121d8e4ffcaf5 SHA256 aa3c42224ec702b6cdb69ca6501284cb6dacb87473a076d7337ee9635c96f160
 DIST acpid_1.0.4-7.1.diff.gz 10356 RMD160 92ec19825915a354b167a33a093c2d7231d5b848 SHA1 4f5b2abb8304a3edcbf32506bf8b31c91ccefe8d SHA256 a268a9c3adbe79cee3d0a1ed4eb2fa849039d1d7e9d0aba0e81f55078d42e7f4
 EBUILD acpid-1.0.4-r2.ebuild 1849 RMD160 59986a9125158722fd44e120c239f897a13b37bb SHA1 2fe19c87b9bc5dfc487ab784a24bb7272ca411b4 SHA256 f03bb1b6c4dde5c83a4a8ece004b63e0f86f8ecc049c3c4065a03f7d164e56a5
 MD5 5f94609ff1bd14adc579c926eb0bce3c acpid-1.0.4-r2.ebuild 1849
@@ -43,10 +53,14 @@ EBUILD acpid-1.0.4-r5.ebuild 1758 RMD160 c52a8c3f72f5e013e8dc97f650b119edfa97494
 MD5 1466fc402b1999f282944109ae5306ec acpid-1.0.4-r5.ebuild 1758
 RMD160 c52a8c3f72f5e013e8dc97f650b119edfa974946 acpid-1.0.4-r5.ebuild 1758
 SHA256 9b80728d6cfc31a86a80dd5523d0c0f3a17ed841f9435e763bca373bbf1b8be9 acpid-1.0.4-r5.ebuild 1758
-MISC ChangeLog 6315 RMD160 028babf74b981fcbc9571847fa0623fd9272b785 SHA1 0a5c5309177432ec739cfe6624ec0800eb31d7b5 SHA256 05bf2eca8dd19ed337306a69e71b4328ed802f65ae9da02a4825aa8a82c0eedc
-MD5 54b604dc6faaf40e8314de4271cbab50 ChangeLog 6315
-RMD160 028babf74b981fcbc9571847fa0623fd9272b785 ChangeLog 6315
-SHA256 05bf2eca8dd19ed337306a69e71b4328ed802f65ae9da02a4825aa8a82c0eedc ChangeLog 6315
+EBUILD acpid-1.0.6.ebuild 1784 RMD160 fb62dfa55ff1cffa0dd7e328071a4793adc2590a SHA1 ef1caffb000c2f133348521067960a1661d4302d SHA256 7ea64b0764d293584ad6fb27cdbe9956448825232bcbd9d5a21a2b2fea1e2c82
+MD5 0ab12485ac7e089769e2ba4edd9735ca acpid-1.0.6.ebuild 1784
+RMD160 fb62dfa55ff1cffa0dd7e328071a4793adc2590a acpid-1.0.6.ebuild 1784
+SHA256 7ea64b0764d293584ad6fb27cdbe9956448825232bcbd9d5a21a2b2fea1e2c82 acpid-1.0.6.ebuild 1784
+MISC ChangeLog 7344 RMD160 15dca1a4cf0175ae4ff22d3335d3719be65ed443 SHA1 76729ea30a87de15546814c80b465608e3f30dda SHA256 820abc34fd6e16d887bd637aa507129682faa4bdb9cdd50ce95c15f502113abd
+MD5 e2fa7003ad12e6acd9838a8b8ece9b70 ChangeLog 7344
+RMD160 15dca1a4cf0175ae4ff22d3335d3719be65ed443 ChangeLog 7344
+SHA256 820abc34fd6e16d887bd637aa507129682faa4bdb9cdd50ce95c15f502113abd ChangeLog 7344
 MISC metadata.xml 159 RMD160 54af1e9a61e5ed1b49b2bbbf3ef2278999c66b13 SHA1 bce3da4745192397c9a08bdbcf7e4914eac9b77b SHA256 ed3a0d440cfa5672284f4172ebde0ea6506c1a38e9a3ed9f14f3d2c093aac42f
 MD5 19fd766bac8e110b4620363a1ace26dd metadata.xml 159
 RMD160 54af1e9a61e5ed1b49b2bbbf3ef2278999c66b13 metadata.xml 159
@@ -63,10 +77,6 @@ SHA256 61dade4778db94978731c78df8c379a1ccb344b5d8727267e5f05fa71ef85538 files/di
 MD5 349700818182a91dfcd8a26ff1c61681 files/digest-acpid-1.0.4-r5 479
 RMD160 206971462108f1adb2b196764de26a1ba130dfb1 files/digest-acpid-1.0.4-r5 479
 SHA256 cf4ac1c52d7ba61781915be0bca9c2c4d3df8bd32910ab9b54846c3984a369f5 files/digest-acpid-1.0.4-r5 479
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
-
-iD8DBQFGRRr8omPajV0RnrERArfRAJ0fFSyklbQjbGB4Cf0wFCwMJQQzUwCePOcA
-SOX4C1JfI+YHyDiVgmR1gmw=
-=CLQ5
------END PGP SIGNATURE-----
+MD5 39dd40af3d51b1a2d9eef856a4ca4e79 files/digest-acpid-1.0.6 232
+RMD160 df6ce3ff0bea4d58c2da9a1003df093f5274d343 files/digest-acpid-1.0.6 232
+SHA256 f4930c7fa21bff984082ade6bd69b7c3ee65ac99417c0a98655ed3ad2414e701 files/digest-acpid-1.0.6 232
diff --git a/sys-power/acpid/acpid-1.0.6.ebuild b/sys-power/acpid/acpid-1.0.6.ebuild
new file mode 100644
index 000000000000..2fefc12290b6
--- /dev/null
+++ b/sys-power/acpid/acpid-1.0.6.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/acpid/acpid-1.0.6.ebuild,v 1.1 2007/07/17 19:42:55 genstef 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=""
+
+DEPEND="sys-apps/sed"
+RDEPEND=""
+
+src_unpack() {
+	unpack ${A}
+
+	epatch ${FILESDIR}/${P}-examples.diff
+}
+
+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.
+	emake CC="$(tc-getCC)" INSTPREFIX="${D}" || die "emake failed"
+}
+
+src_install() {
+	emake INSTPREFIX="${D}" install || die "emake install failed"
+
+	exeinto /etc/acpi
+	doexe examples/default.sh
+	insinto /etc/acpi/events
+	doins examples/default
+
+	dodoc README Changelog TODO
+
+	newinitd ${FILESDIR}/${P}-init.d acpid
+	newconfd ${FILESDIR}/${P}-conf.d acpid
+
+	docinto examples
+	dodoc samples/{acpi_handler.sh,sample.conf}
+	dodoc examples/ac{,.sh}
+
+	docinto examples/battery
+	dodoc samples/battery/*
+
+	docinto examples/panasonic
+	dodoc samples/panasonic/*
+}
+
+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
+	elog "As of version 1.0.6, acpid uses system log facility instead of custom log"
+	elog "file. This means acpid messages will be usually located in "
+	elog "/var/log/messages (and not in /var/log/acpid) for common setups."
+	echo
+}
diff --git a/sys-power/acpid/files/acpid-1.0.6-conf.d b/sys-power/acpid/files/acpid-1.0.6-conf.d
new file mode 100644
index 000000000000..30329760fc14
--- /dev/null
+++ b/sys-power/acpid/files/acpid-1.0.6-conf.d
@@ -0,0 +1,6 @@
+# /etc/conf.d/acpid: config file for /etc/init.d/acpid
+
+# Options to pass to the acpid daemon.
+# See the acpid(8) man page for more info.
+
+ACPID_OPTIONS=""
diff --git a/sys-power/acpid/files/acpid-1.0.6-examples.diff b/sys-power/acpid/files/acpid-1.0.6-examples.diff
new file mode 100644
index 000000000000..5a8e21ff3603
--- /dev/null
+++ b/sys-power/acpid/files/acpid-1.0.6-examples.diff
@@ -0,0 +1,116 @@
+diff -Nur acpid-1.0.6.orig/examples/ac acpid-1.0.6/examples/ac
+--- acpid-1.0.6.orig/examples/ac	1970-01-01 01:00:00.000000000 +0100
++++ acpid-1.0.6/examples/ac	2007-07-16 19:37:35.000000000 +0200
+@@ -0,0 +1,11 @@
++# /etc/acpid/events/ac
++# This detects changes to AC power status, and passes them to
++# /etc/acpi/ac.sh for further processing.
++
++# Optionally you can specify the placeholder %e. It will pass
++# through the whole kernel event message to the program you've
++# specified.
++
++event=ac_adapter
++action=/etc/acpi/ac.sh
++
+diff -Nur acpid-1.0.6.orig/examples/ac.sh acpid-1.0.6/examples/ac.sh
+--- acpid-1.0.6.orig/examples/ac.sh	1970-01-01 01:00:00.000000000 +0100
++++ acpid-1.0.6/examples/ac.sh	2007-07-16 19:37:35.000000000 +0200
+@@ -0,0 +1,39 @@
++#!/bin/sh
++# /etc/acpid/ac.sh
++# Detect loss of AC power and regaining of AC power, and take action
++# appropriatly.
++
++# On my laptop anyway, this script doesn't not get different parameters for
++# loss of power and regained power. So, I have to use a separate program to
++# tell what the adapter status is.
++
++# This uses the spicctrl program for probing the sonypi device.
++BACKLIGHT=$(spicctrl -B)
++
++if on_ac_power; then
++        # Now on AC power.
++
++        # Tell longrun to go crazy.
++        longrun -f performance
++        longrun -s 0 100
++
++        # Turn up the backlight unless it's up far enough.
++        if [ "$BACKLIGHT" -lt 108 ]; then
++                spicctrl -b 108
++        fi
++else
++        # Now off AC power.
++
++        # Tell longrun to be a miser.
++        longrun -f economy
++        longrun -s 0 50 # adjust to suite..
++
++        # Don't allow the screen to be too bright, but don't turn the
++        # backlight _up_ on removal, and don't turn it all the way down, as
++        # that is unusable on my laptop in most conditions. Adjust to
++        # taste.
++        if [ "$BACKLIGHT" -gt 68 ]; then
++                spicctrl -b 68
++        fi
++fi
++
+diff -Nur acpid-1.0.6.orig/examples/default acpid-1.0.6/examples/default
+--- acpid-1.0.6.orig/examples/default	1970-01-01 01:00:00.000000000 +0100
++++ acpid-1.0.6/examples/default	2007-07-16 19:37:35.000000000 +0200
+@@ -0,0 +1,18 @@
++# 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.*"
++# 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.*
++#action=/sbin/init 0
++
++# Optionally you can specify the placeholder %e. It will pass
++# through the whole kernel event message to the program you've
++# specified.
++
++event=.*
++action=/etc/acpi/default.sh %e
+diff -Nur acpid-1.0.6.orig/examples/default.sh acpid-1.0.6/examples/default.sh
+--- acpid-1.0.6.orig/examples/default.sh	1970-01-01 01:00:00.000000000 +0100
++++ acpid-1.0.6/examples/default.sh	2007-07-16 19:37:35.000000000 +0200
+@@ -0,0 +1,32 @@
++#!/bin/sh
++# Default acpi script that takes an entry for all actions
++
++set $*
++
++# Take care about the way events are reported
++ev_type=`echo "$1" | cut -d/ -f1`
++if [ "$ev_type" = "$1" ]; then
++	event="$2";
++else
++	event=`echo "$1" | cut -d/ -f2`
++fi
++
++
++case "$ev_type" in
++    button)
++        case "$event" in
++            power)
++                logger "acpid: received a shutdown request"
++                /sbin/init 0
++		break
++                ;;
++             *)
++                logger "acpid: action $2 is not defined"
++                ;;
++        esac
++    ;;
++
++    *)
++        logger "ACPI group $1 / action $2 is not defined"
++        ;;
++esac
diff --git a/sys-power/acpid/files/acpid-1.0.6-init.d b/sys-power/acpid/files/acpid-1.0.6-init.d
new file mode 100644
index 000000000000..41819ebd86e3
--- /dev/null
+++ b/sys-power/acpid/files/acpid-1.0.6-init.d
@@ -0,0 +1,38 @@
+#!/sbin/runscript
+# Copyright 1999-2007 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.6-init.d,v 1.1 2007/07/17 19:42:55 genstef Exp $
+
+opts="reload"
+
+depend() {
+	need localmount
+	use logger
+}
+
+checkconfig() {
+	if [ ! -e /proc/acpi ] ; then
+		eerror "ACPI support has not been compiled into the kernel"
+		return 1
+	fi
+}
+
+start() {
+	checkconfig || return 1
+
+	ebegin "Starting acpid"
+	start-stop-daemon --start --exec /usr/sbin/acpid -- ${ACPID_OPTIONS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping acpid"
+	start-stop-daemon --stop --exec /usr/sbin/acpid
+	eend $?
+}
+
+reload() {
+	ebegin "Reloading acpid configuration"
+	start-stop-daemon --stop --oknodo --exec /usr/sbin/acpid --signal HUP
+	eend $?
+}
diff --git a/sys-power/acpid/files/digest-acpid-1.0.6 b/sys-power/acpid/files/digest-acpid-1.0.6
new file mode 100644
index 000000000000..1c7351ba6139
--- /dev/null
+++ b/sys-power/acpid/files/digest-acpid-1.0.6
@@ -0,0 +1,3 @@
+MD5 5c9b705700df51d232be223b6ab6414d acpid-1.0.6.tar.gz 24226
+RMD160 6abb7bae419d30b1f9f772d42fab9991771d5b13 acpid-1.0.6.tar.gz 24226
+SHA256 aa3c42224ec702b6cdb69ca6501284cb6dacb87473a076d7337ee9635c96f160 acpid-1.0.6.tar.gz 24226