Revert back to 2.0.3-r1 state (no powerbtn.sh) for now...

(Portage version: 2.2_rc67/cvs/Linux x86_64)

7 files changed, 10 insertions, 272 deletions

diff --git a/sys-power/acpid/ChangeLog b/sys-power/acpid/ChangeLog
index fe5e30074ab1..7ca0c0ffcf25 100644
--- a/sys-power/acpid/ChangeLog
+++ b/sys-power/acpid/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-power/acpid
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/acpid/ChangeLog,v 1.47 2010/04/28 15:21:07 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/acpid/ChangeLog,v 1.48 2010/05/03 19:44:42 ssuominen Exp $
+
+*acpid-2.0.4-r2 (03 May 2010)
+
+  03 May 2010; Samuli Suominen <ssuominen@gentoo.org>
+  +acpid-2.0.4-r2.ebuild:
+  Revert back to 2.0.3-r1 state (no powerbtn.sh) for now. It will require a
+  bit work.
 
 *acpid-2.0.4-r1 (28 Apr 2010)
 
diff --git a/sys-power/acpid/acpid-1.0.10_p4.ebuild b/sys-power/acpid/acpid-1.0.10_p4.ebuild
deleted file mode 100644
index d07ac94ce3de..000000000000
--- a/sys-power/acpid/acpid-1.0.10_p4.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/acpid/acpid-1.0.10_p4.ebuild,v 1.1 2009/08/31 22:29:13 loki_val Exp $
-
-inherit toolchain-funcs
-
-MY_P="${P%_p*}-netlink${PV#*_p}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Daemon for Advanced Configuration and Power Interface"
-HOMEPAGE="http://acpid.sourceforge.net"
-SRC_URI="http://tedfelix.com/linux/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 -ppc ~x86"
-IUSE=""
-
-DEPEND="sys-apps/sed"
-RDEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	sed -i -e '/^CFLAGS /{s:=:+=:;s:-Werror::;s:-O2 -g::}' "${S}"/Makefile || die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" INSTPREFIX="${D}" || die "emake failed"
-	emake -C kacpimon CFLAGS="${CFLAGS} -fno-strict-aliasing" CC="$(tc-getCC)" INSTPREFIX="${D}" || die "emake failed"
-}
-
-src_install() {
-	emake INSTPREFIX="${D}" install || die "emake install failed"
-
-	dobin kacpimon/kacpimon || die "kacpimon failed to install"
-	newdoc kacpimon/README README-KACPIMON
-
-	exeinto /etc/acpi
-	newexe "${FILESDIR}"/${PN}-1.0.6-default.sh default.sh || die
-	insinto /etc/acpi/events
-	newins "${FILESDIR}"/${PN}-1.0.4-default default || die
-
-	dodoc README Changelog TODO || die
-
-	newinitd "${FILESDIR}"/${PN}-1.0.6-init.d acpid || die
-	newconfd "${FILESDIR}"/${PN}-1.0.6-conf.d acpid || die
-
-	docinto examples
-	dodoc samples/{acpi_handler.sh,sample.conf} || die
-
-	docinto examples/battery
-	dodoc samples/battery/* || die
-
-	docinto examples/panasonic
-	dodoc samples/panasonic/* || die
-}
-
-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/acpid-2.0.4-r1.ebuild b/sys-power/acpid/acpid-2.0.4-r1.ebuild
deleted file mode 100644
index 9838b6bcf547..000000000000
--- a/sys-power/acpid/acpid-2.0.4-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/acpid/acpid-2.0.4-r1.ebuild,v 1.1 2010/04/28 15:21:07 ssuominen Exp $
-
-EAPI=2
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Daemon for Advanced Configuration and Power Interface"
-HOMEPAGE="http://tedfelix.com/linux/acpid-netlink.html"
-SRC_URI="http://tedfelix.com/linux/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 -ppc ~x86"
-IUSE="consolekit"
-
-RDEPEND="consolekit? ( sys-auth/consolekit )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.0.3.patch
-	cp "${FILESDIR}"/${PN}-2.0.4-default.sh "${T}" || die
-
-	if ! use consolekit; then
-		sed -i \
-			-e 's:/etc/acpi/powerbtn.sh:/sbin/init 0:' \
-			"${T}"/${PN}-2.0.4-default.sh || die
-	fi
-}
-
-src_compile() {
-	tc-export CC CPP
-	emake || die
-	emake -C kacpimon || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install || die
-
-	dobin kacpimon/kacpimon || die
-	newdoc kacpimon/README README.kacpimon
-
-	exeinto /etc/acpi
-	newexe "${T}"/${PN}-2.0.4-default.sh default.sh || die
-
-	if use consolekit; then
-		newexe "${FILESDIR}"/${PN}-2.0.4-powerbtn.sh powerbtn.sh || die
-	fi
-
-	insinto /etc/acpi/events
-	newins "${FILESDIR}"/${PN}-1.0.4-default default || die
-
-	newinitd "${FILESDIR}"/${PN}-2.0.3-init.d acpid || die
-	newconfd "${FILESDIR}"/${PN}-1.0.6-conf.d acpid || die
-
-	prepalldocs
-}
-
-pkg_postinst() {
-	echo
-	elog "You may wish to read the Gentoo Linux Power Management Guide,"
-	elog "which can be found online at:"
-	elog "http://www.gentoo.org/doc/en/power-management-guide.xml"
-	echo
-}
diff --git a/sys-power/acpid/acpid-2.0.3-r1.ebuild b/sys-power/acpid/acpid-2.0.4-r2.ebuild
index 53d2b497fcfb..8cc85ba134f4 100644
--- a/sys-power/acpid/acpid-2.0.3-r1.ebuild
+++ b/sys-power/acpid/acpid-2.0.4-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/acpid/acpid-2.0.3-r1.ebuild,v 1.1 2010/04/04 16:39:09 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/acpid/acpid-2.0.4-r2.ebuild,v 1.1 2010/05/03 19:44:42 ssuominen Exp $
 
 EAPI=2
 inherit eutils toolchain-funcs
@@ -15,7 +15,7 @@ KEYWORDS="~alpha ~amd64 ~ia64 -ppc ~x86"
 IUSE=""
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}.patch
+	epatch "${FILESDIR}"/${PN}-2.0.3.patch
 }
 
 src_compile() {
diff --git a/sys-power/acpid/acpid-2.0.4.ebuild b/sys-power/acpid/acpid-2.0.4.ebuild
deleted file mode 100644
index 6bd955302513..000000000000
--- a/sys-power/acpid/acpid-2.0.4.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/acpid/acpid-2.0.4.ebuild,v 1.1 2010/04/26 12:55:42 ssuominen Exp $
-
-EAPI=2
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Daemon for Advanced Configuration and Power Interface"
-HOMEPAGE="http://tedfelix.com/linux/acpid-netlink.html"
-SRC_URI="http://tedfelix.com/linux/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 -ppc ~x86"
-IUSE=""
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.0.3.patch
-}
-
-src_compile() {
-	tc-export CC CPP
-	emake || die
-	emake -C kacpimon || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install || die
-
-	dobin kacpimon/kacpimon || die
-	newdoc kacpimon/README README.kacpimon
-
-	exeinto /etc/acpi
-	newexe "${FILESDIR}"/${PN}-2.0.4-default.sh default.sh || die
-	doexe samples/powerbtn/powerbtn.sh || die
-
-	insinto /etc/acpi/events
-	newins "${FILESDIR}"/${PN}-1.0.4-default default || die
-
-	newinitd "${FILESDIR}"/${PN}-2.0.3-init.d acpid || die
-	newconfd "${FILESDIR}"/${PN}-1.0.6-conf.d acpid || die
-
-	prepalldocs
-}
-
-pkg_postinst() {
-	echo
-	elog "You may wish to read the Gentoo Linux Power Management Guide,"
-	elog "which can be found online at:"
-	elog "http://www.gentoo.org/doc/en/power-management-guide.xml"
-	echo
-}
diff --git a/sys-power/acpid/files/acpid-2.0.4-default.sh b/sys-power/acpid/files/acpid-2.0.4-default.sh
deleted file mode 100755
index 7f8f6c963e25..000000000000
--- a/sys-power/acpid/files/acpid-2.0.4-default.sh
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/bin/sh
-# /etc/acpi/default.sh
-# Default acpi script that takes an entry for all actions
-
-set $*
-
-group=${1%%/*}
-action=${1#*/}
-device=$2
-id=$3
-value=$4
-
-log_unhandled() {
-	logger "ACPI event unhandled: $*"
-}
-
-case "$group" in
-	button)
-		case "$action" in
-			power)
-				/etc/acpi/powerbtn.sh
-				;;
-
-			# if your laptop doesnt turn on/off the display via hardware
-			# switch and instead just generates an acpi event, you can force
-			# X to turn off the display via dpms.  note you will have to run
-			# 'xhost +local:0' so root can access the X DISPLAY.
-			#lid)
-			#	xset dpms force off
-			#	;;
-
-			*)	log_unhandled $* ;;
-		esac
-		;;
-
-	ac_adapter)
-		case "$value" in
-			# Add code here to handle when the system is unplugged
-			# (maybe change cpu scaling to powersave mode).  For
-			# multicore systems, make sure you set powersave mode
-			# for each core!
-			#*0)
-			#	cpufreq-set -g powersave
-			#	;;
-
-			# Add code here to handle when the system is plugged in
-			# (maybe change cpu scaling to performance mode).  For
-			# multicore systems, make sure you set performance mode
-			# for each core!
-			#*1)
-			#	cpufreq-set -g performance
-			#	;;
-
-			*)	log_unhandled $* ;;
-		esac
-		;;
-
-	*)	log_unhandled $* ;;
-esac
diff --git a/sys-power/acpid/files/acpid-2.0.4-powerbtn.sh b/sys-power/acpid/files/acpid-2.0.4-powerbtn.sh
deleted file mode 100644
index 5d248db73cb3..000000000000
--- a/sys-power/acpid/files/acpid-2.0.4-powerbtn.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-
-PATH=/sbin:/bin:/usr/bin
-
-# Get the ID of the first active X11 session:
-uid_session=$(
-ck-list-sessions | \
-awk '
-/^Session[0-9]+:$/ { uid = active = x11 = "" ; next }
-{ gsub(/'\''/, "", $3) }
-$1 == "unix-user" { uid = $3 }
-$1 == "active" { active = $3 }
-$1 == "x11-display" { x11 = $3 }
-active == "TRUE" && x11 != "" {
-	print uid
-	exit
-}')
-
-# Check that there is a power manager, otherwise shut down.
-[ "$uid_session" ] &&
-ps axo uid,cmd | \
-awk '
-    $1 == '$uid_session' &&
-	($2 ~ /gnome-power-manager/ || $2 ~ /kded4/ ||
-	 $3 ~ /kded4/ || $3 ~ /guidance-power-manager/) \
-		{ found = 1; exit }
-    END { exit !found }
-' ||
-  shutdown -h now
-