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

Package-Manager: portage-2.1.3.12

12 files changed, 34 insertions, 226 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/Manifest b/sys-power/acpid/Manifest
index cbf942e45bce..2b89b1e2725b 100644
--- a/sys-power/acpid/Manifest
+++ b/sys-power/acpid/Manifest
@@ -1,78 +1,45 @@
------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
 SHA256 2b18111978043d68848983a54dfc946dd9b9b15592d0f4dc33491599dbe24b23 files/acpid-1.0.4-default 663
-AUX acpid-1.0.4-default.sh 1049 RMD160 a7f716ded9c2ca1b7026159b6512c854f3b4633e SHA1 a2c0c454f2d2773c4da312ae06594f2b989d840c SHA256 adc622411bb57cdb251ccd138cb8accddcb9f1e8f777587049629e0456189d10
-MD5 ae5da4648673bed1d127cfb66a09fb4e files/acpid-1.0.4-default.sh 1049
-RMD160 a7f716ded9c2ca1b7026159b6512c854f3b4633e files/acpid-1.0.4-default.sh 1049
-SHA256 adc622411bb57cdb251ccd138cb8accddcb9f1e8f777587049629e0456189d10 files/acpid-1.0.4-default.sh 1049
-AUX acpid-1.0.4-gcc4.patch 670 RMD160 a220b9a7b3ce3170e51d9858f971c6ded9181def SHA1 4fef14572d0ae27d4ccf9d6dd29c7e3211904ddc SHA256 42a72a1a3f29b42c8dd3bcc659bca5aec59de5c0abb162f13f73b7e6818c34de
-MD5 faf93dd3ae4cc7973d7375beea0738a3 files/acpid-1.0.4-gcc4.patch 670
-RMD160 a220b9a7b3ce3170e51d9858f971c6ded9181def files/acpid-1.0.4-gcc4.patch 670
-SHA256 42a72a1a3f29b42c8dd3bcc659bca5aec59de5c0abb162f13f73b7e6818c34de files/acpid-1.0.4-gcc4.patch 670
 AUX acpid-1.0.4-init.d 787 RMD160 6a6473a2e87f5f13d09a30acd09f9188f9d54997 SHA1 1c629da7f53a7aa549a52f698dedb72fe1f58328 SHA256 2aaeb6548b4bc2bc5f863c85face9f2bc8b1107ddc23dd3c8fb274f948ef2da2
 MD5 78c4de0bc9f19f2e281eaa092ed5f058 files/acpid-1.0.4-init.d 787
 RMD160 6a6473a2e87f5f13d09a30acd09f9188f9d54997 files/acpid-1.0.4-init.d 787
 SHA256 2aaeb6548b4bc2bc5f863c85face9f2bc8b1107ddc23dd3c8fb274f948ef2da2 files/acpid-1.0.4-init.d 787
-AUX acpid-1.0.4-logrotate 145 RMD160 a9a4d7572a53148d9063c91b381a22ff5822195c SHA1 0cd1ac6b5e878a43cf44109f34177d6187c2397e SHA256 37a785e09fa4b140840a3bcd3991f050309a7b19c1cb4f9dbb1f5d7ed12556f1
-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-default.sh 1215 RMD160 188c766bc188b5e91b4d05875f7c6475eef22b70 SHA1 f09a5376351fe6c70d756b05b960cce7bf9b4944 SHA256 35080215d03ce9e21579bdeb17e3e37a27455605bdd0e9bc2ec695d006421ada
-MD5 ca060d240e28f94b442e5a665d27fdbc files/acpid-1.0.6-default.sh 1215
-RMD160 188c766bc188b5e91b4d05875f7c6475eef22b70 files/acpid-1.0.6-default.sh 1215
-SHA256 35080215d03ce9e21579bdeb17e3e37a27455605bdd0e9bc2ec695d006421ada files/acpid-1.0.6-default.sh 1215
-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
+AUX acpid-1.0.6-default.sh 1214 RMD160 1d656cee490664931062cb6a8f6ee968b48f28d1 SHA1 52b7a36da5915dfb72636cf554d5b0aa99779ecc SHA256 9d95f204b39129758de47bd0b003ff47501759db98a8641034e1203130ea1f52
+MD5 e9332866b311b718199d01394358fef8 files/acpid-1.0.6-default.sh 1214
+RMD160 1d656cee490664931062cb6a8f6ee968b48f28d1 files/acpid-1.0.6-default.sh 1214
+SHA256 9d95f204b39129758de47bd0b003ff47501759db98a8641034e1203130ea1f52 files/acpid-1.0.6-default.sh 1214
+AUX acpid-1.0.6-init.d 811 RMD160 8bb659de037284c371d0fce5372c240315c2384a SHA1 8d93c55fa82e7309d810a33f73969a9707ff8d3a SHA256 4dcb6fcdfa3d41817747f542f0f5e78760cfc9cb74e8b4e7c915464d174332e5
+MD5 2c2bd3855e0821f50baf2d6247a4af2d files/acpid-1.0.6-init.d 811
+RMD160 8bb659de037284c371d0fce5372c240315c2384a files/acpid-1.0.6-init.d 811
+SHA256 4dcb6fcdfa3d41817747f542f0f5e78760cfc9cb74e8b4e7c915464d174332e5 files/acpid-1.0.6-init.d 811
 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
-RMD160 59986a9125158722fd44e120c239f897a13b37bb acpid-1.0.4-r2.ebuild 1849
-SHA256 f03bb1b6c4dde5c83a4a8ece004b63e0f86f8ecc049c3c4065a03f7d164e56a5 acpid-1.0.4-r2.ebuild 1849
 EBUILD acpid-1.0.4-r5.ebuild 1758 RMD160 c52a8c3f72f5e013e8dc97f650b119edfa974946 SHA1 f9a3d39e5ae113e6d30ce1f534eea74e66966b4e SHA256 9b80728d6cfc31a86a80dd5523d0c0f3a17ed841f9435e763bca373bbf1b8be9
 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
-EBUILD acpid-1.0.6.ebuild 1860 RMD160 b707f6ed63e36c9bfe24f4dd4072e6aa35faa9b8 SHA1 31eba92a715fe4e980b2a4378542184a8a10f9d8 SHA256 1d6c31d1189eb787163e7f100d21c6fd10716f1ac9920abae8cf1a85ea043441
-MD5 209863de385e310ea5f11c2d373abd8f acpid-1.0.6.ebuild 1860
-RMD160 b707f6ed63e36c9bfe24f4dd4072e6aa35faa9b8 acpid-1.0.6.ebuild 1860
-SHA256 1d6c31d1189eb787163e7f100d21c6fd10716f1ac9920abae8cf1a85ea043441 acpid-1.0.6.ebuild 1860
-MISC ChangeLog 7650 RMD160 0032e0bd5e0c3b5dea5ba9aea8e15e6a7d363fc7 SHA1 5ebcfbed0641a2e9a4d9340af4757fefda192863 SHA256 2a2700da0a970cd2d14fb64f1c8abd9bebe73348a0b64ba456267a396d6761d4
-MD5 051a70349e5cba417ef4ee70ae204aa7 ChangeLog 7650
-RMD160 0032e0bd5e0c3b5dea5ba9aea8e15e6a7d363fc7 ChangeLog 7650
-SHA256 2a2700da0a970cd2d14fb64f1c8abd9bebe73348a0b64ba456267a396d6761d4 ChangeLog 7650
+EBUILD acpid-1.0.6-r1.ebuild 1864 RMD160 62630c03836ef76cd971072db86e3fbb8da6b2ef SHA1 63f7771dc442517a9c431ca6f58c67dbf4387574 SHA256 6b20b08b6e741675de79e7f4de59da6389c9257b94fe02347cf67841c09ad684
+MD5 51908f9699e86bf4ad1e785e164a40e9 acpid-1.0.6-r1.ebuild 1864
+RMD160 62630c03836ef76cd971072db86e3fbb8da6b2ef acpid-1.0.6-r1.ebuild 1864
+SHA256 6b20b08b6e741675de79e7f4de59da6389c9257b94fe02347cf67841c09ad684 acpid-1.0.6-r1.ebuild 1864
+MISC ChangeLog 8106 RMD160 6c872f196476382e6a7bf2927b4fa2cf9169ea9e SHA1 65f6e3dfa1aa8725c76a11015e8c7617711aa8ed SHA256 681e1a5a4cb1fcde50a2307997575b418f82997d2704f740820482ba5851ab0f
+MD5 ec387503dde10a1a6006fba8a17cf1f6 ChangeLog 8106
+RMD160 6c872f196476382e6a7bf2927b4fa2cf9169ea9e ChangeLog 8106
+SHA256 681e1a5a4cb1fcde50a2307997575b418f82997d2704f740820482ba5851ab0f ChangeLog 8106
 MISC metadata.xml 159 RMD160 54af1e9a61e5ed1b49b2bbbf3ef2278999c66b13 SHA1 bce3da4745192397c9a08bdbcf7e4914eac9b77b SHA256 ed3a0d440cfa5672284f4172ebde0ea6506c1a38e9a3ed9f14f3d2c093aac42f
 MD5 19fd766bac8e110b4620363a1ace26dd metadata.xml 159
 RMD160 54af1e9a61e5ed1b49b2bbbf3ef2278999c66b13 metadata.xml 159
 SHA256 ed3a0d440cfa5672284f4172ebde0ea6506c1a38e9a3ed9f14f3d2c093aac42f metadata.xml 159
-MD5 46612b0044e029d74a3cd52522aacd5a files/digest-acpid-1.0.4-r2 232
-RMD160 326422a4846448ae50d821c0c3e025be9f8cb3ef files/digest-acpid-1.0.4-r2 232
-SHA256 61dade4778db94978731c78df8c379a1ccb344b5d8727267e5f05fa71ef85538 files/digest-acpid-1.0.4-r2 232
 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
-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
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.5 (GNU/Linux)
-
-iD8DBQFGnR6Np/wUKkr7RBoRAqZvAKCeWEc+ehTiuP0+PWTYo0jvZ0KuBACffs22
-NVM9x+JlOboMo/pGCpG5ZMA=
-=IGOA
------END PGP SIGNATURE-----
+MD5 b41abb8695f935ca65af9a7104e9d98b files/digest-acpid-1.0.6-r1 170
+RMD160 30d12fb9a142170b07461844642e1611e90c88dd files/digest-acpid-1.0.6-r1 170
+SHA256 42871f41f0defa65ff08df93249cebccf42aa1fa0383d1ecb2ac2eca56500dc1 files/digest-acpid-1.0.6-r1 170
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