Fix improper expansion in default.sh, bug 186141, and start init script before hal, bug 194636, also remove old ebuilds

(Portage version: 2.1.3.12)

11 files changed, 15 insertions, 174 deletions

diff --git a/sys-power/acpid/ChangeLog b/sys-power/acpid/ChangeLog
index 821c03e1ba3c..d244b3533ddd 100644
--- a/sys-power/acpid/ChangeLog
+++ b/sys-power/acpid/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sys-power/acpid
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/acpid/ChangeLog,v 1.30 2007/07/17 19:53:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/acpid/ChangeLog,v 1.31 2007/10/14 12:04:32 genstef Exp $
+
+*acpid-1.0.6-r1 (14 Oct 2007)
+
+  14 Oct 2007; Stefan Schweizer <genstef@gentoo.org>
+  -files/acpid-1.0.4-default.sh, -files/acpid-1.0.4-gcc4.patch,
+  -files/acpid-1.0.4-logrotate, files/acpid-1.0.6-default.sh,
+  files/acpid-1.0.6-init.d, -files/acpid.conf.d, -acpid-1.0.4-r2.ebuild,
+  -acpid-1.0.6.ebuild, +acpid-1.0.6-r1.ebuild:
+  Fix improper expansion in default.sh, bug 186141, and start init script
+  before hal, bug 194636, also remove old ebuilds
 
   17 Jul 2007; Mike Frysinger <vapier@gentoo.org>
   +files/acpid-1.0.6-default.sh, -files/acpid-1.0.6-examples.diff,
diff --git a/sys-power/acpid/acpid-1.0.4-r2.ebuild b/sys-power/acpid/acpid-1.0.4-r2.ebuild
deleted file mode 100644
index 693dd56e1f3a..000000000000
--- a/sys-power/acpid/acpid-1.0.4-r2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# 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-r2.ebuild,v 1.6 2006/01/19 19:35:11 cryos 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/acpid-1.0.6.ebuild b/sys-power/acpid/acpid-1.0.6-r1.ebuild
index ef9c9fd1cab2..9247c9e3f185 100644
--- a/sys-power/acpid/acpid-1.0.6.ebuild
+++ b/sys-power/acpid/acpid-1.0.6-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.2 2007/07/17 19:53:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/acpid/acpid-1.0.6-r1.ebuild,v 1.1 2007/10/14 12:04:32 genstef Exp $
 
 inherit eutils toolchain-funcs
 
diff --git a/sys-power/acpid/files/acpid-1.0.4-default.sh b/sys-power/acpid/files/acpid-1.0.4-default.sh
deleted file mode 100755
index a71046638330..000000000000
--- a/sys-power/acpid/files/acpid-1.0.4-default.sh
+++ /dev/null
@@ -1,55 +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)
-				/sbin/init 0
-				;;
-
-			# 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)
-			#*0)
-			#	cpufreq-set -g powersave
-			#	;;
-
-			# Add code here to handle when the system is plugged in
-			# (maybe change cpu scaling to performance mode)
-			#*1)
-			#	cpufreq-set -g performance
-			#	;;
-
-			*)	log_unhandled $* ;;
-		esac
-		;;
-
-	*)	log_unhandled $* ;;
-esac
diff --git a/sys-power/acpid/files/acpid-1.0.4-gcc4.patch b/sys-power/acpid/files/acpid-1.0.4-gcc4.patch
deleted file mode 100644
index b56901d21b11..000000000000
--- a/sys-power/acpid/files/acpid-1.0.4-gcc4.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- acpid-1.0.4/ud_socket.c	2005-04-26 10:26:29.000000000 +0000
-+++ acpid-1.0.4.az/ud_socket.c	2005-04-26 10:27:09.000000000 +0000
-@@ -60,7 +60,7 @@
- 		struct sockaddr_un cliaddr;
- 		int len = sizeof(struct sockaddr_un);
- 
--		newsock = accept(listenfd, (struct sockaddr *)&cliaddr, &len);
-+		newsock = accept(listenfd, (struct sockaddr *)&cliaddr, (socklen_t *)&len);
- 		if (newsock < 0) {
- 			if (errno == EINTR) {
- 				continue; /* signal */
-@@ -71,7 +71,7 @@
- 
- 		if (cred) {
- 			len = sizeof(struct ucred);
--			getsockopt(newsock, SOL_SOCKET, SO_PEERCRED,cred,&len);
-+			getsockopt(newsock, SOL_SOCKET, SO_PEERCRED,cred,(socklen_t *)&len);
- 		}
- 
- 		return newsock;
diff --git a/sys-power/acpid/files/acpid-1.0.4-logrotate b/sys-power/acpid/files/acpid-1.0.4-logrotate
deleted file mode 100644
index 40cb90acd994..000000000000
--- a/sys-power/acpid/files/acpid-1.0.4-logrotate
+++ /dev/null
@@ -1,9 +0,0 @@
-/var/log/acpid {
-    missingok
-    rotate 5
-    size 100k
-    weekly
-    postrotate
-        /etc/init.d/acpid reload > /dev/null
-    endscript
-}
diff --git a/sys-power/acpid/files/acpid-1.0.6-default.sh b/sys-power/acpid/files/acpid-1.0.6-default.sh
index 6db71b05cd61..9fe26a168cca 100755
--- a/sys-power/acpid/files/acpid-1.0.6-default.sh
+++ b/sys-power/acpid/files/acpid-1.0.6-default.sh
@@ -4,7 +4,7 @@
 
 set $*
 
-group=${1/%%/*}
+group=${1%%/*}
 action=${1#*/}
 device=$2
 id=$3
diff --git a/sys-power/acpid/files/acpid-1.0.6-init.d b/sys-power/acpid/files/acpid-1.0.6-init.d
index 41819ebd86e3..345df18aa2c9 100644
--- a/sys-power/acpid/files/acpid-1.0.6-init.d
+++ b/sys-power/acpid/files/acpid-1.0.6-init.d
@@ -1,13 +1,14 @@
 #!/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 $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/acpid/files/acpid-1.0.6-init.d,v 1.2 2007/10/14 12:04:33 genstef Exp $
 
 opts="reload"
 
 depend() {
 	need localmount
 	use logger
+	before hald
 }
 
 checkconfig() {
diff --git a/sys-power/acpid/files/acpid.conf.d b/sys-power/acpid/files/acpid.conf.d
deleted file mode 100644
index 0e394e67f295..000000000000
--- a/sys-power/acpid/files/acpid.conf.d
+++ /dev/null
@@ -1,6 +0,0 @@
-# /etc/conf.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/digest-acpid-1.0.4-r2 b/sys-power/acpid/files/digest-acpid-1.0.4-r2
deleted file mode 100644
index 0d13820cfcea..000000000000
--- a/sys-power/acpid/files/digest-acpid-1.0.4-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 3aff94e92186e99ed5fd6dcee2db7c74 acpid-1.0.4.tar.gz 23416
-RMD160 ddf3cb4e2df7126c71130f89086473b1aa8656b1 acpid-1.0.4.tar.gz 23416
-SHA256 032a95967f8dd8a227ee1771de4a2646becc4d0f1123568faeca931006ec8f5f acpid-1.0.4.tar.gz 23416
diff --git a/sys-power/acpid/files/digest-acpid-1.0.6 b/sys-power/acpid/files/digest-acpid-1.0.6-r1
index 1c7351ba6139..1b698088087a 100644
--- a/sys-power/acpid/files/digest-acpid-1.0.6
+++ b/sys-power/acpid/files/digest-acpid-1.0.6-r1
@@ -1,3 +1,2 @@
-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