Version bump.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

6 files changed, 83 insertions, 104 deletions

diff --git a/sys-power/acpid/ChangeLog b/sys-power/acpid/ChangeLog
index f3b3c99e71eb..188ba358c494 100644
--- a/sys-power/acpid/ChangeLog
+++ b/sys-power/acpid/ChangeLog
@@ -1,6 +1,12 @@
 # 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.51 2010/05/19 20:36:00 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/acpid/ChangeLog,v 1.52 2010/06/16 17:23:38 ssuominen Exp $
+
+*acpid-2.0.5 (16 Jun 2010)
+
+  16 Jun 2010; Samuli Suominen <ssuominen@gentoo.org> +acpid-2.0.5.ebuild,
+  +files/acpid-2.0.5-fix-example.patch:
+  Version bump.
 
   19 May 2010; Raúl Porcel <armin76@gentoo.org> acpid-2.0.4-r2.ebuild:
   ia64 stable wrt #318211
diff --git a/sys-power/acpid/Manifest b/sys-power/acpid/Manifest
index c0de6ccb63d7..32d82d5e28aa 100644
--- a/sys-power/acpid/Manifest
+++ b/sys-power/acpid/Manifest
@@ -1,12 +1,12 @@
 AUX acpid-1.0.4-default 663 RMD160 5e40661ec9112c3cc675a0d283e96311d2d159f1 SHA1 e74b2f7388c303fc3d3e33c0500d4b8185474dce SHA256 2b18111978043d68848983a54dfc946dd9b9b15592d0f4dc33491599dbe24b23
 AUX acpid-1.0.6-conf.d 156 RMD160 a7c8822a88b51f185c8740b075c968d0c045791d SHA1 497f35e98f1f499d2223c52f4491218b3def489a SHA256 5dfc6dbf687a47e853b0a9f9ed491cb1778b0d99195df5e7a5de849d269ca28c
 AUX acpid-1.0.6-default.sh 1214 RMD160 1d656cee490664931062cb6a8f6ee968b48f28d1 SHA1 52b7a36da5915dfb72636cf554d5b0aa99779ecc SHA256 9d95f204b39129758de47bd0b003ff47501759db98a8641034e1203130ea1f52
-AUX acpid-1.0.6-init.d 818 RMD160 f840ae1b287d303076fcb1b553a53dd7c0664fc0 SHA1 aa1d2a8012c49add5c74c60a9a7cb4b9c7b81593 SHA256 d7daabbf924c2223dab085adae3b38d43c9969cdd49921b4e66cfd497a15fa66
 AUX acpid-2.0.3-init.d 668 RMD160 66d460850e02e8e817c3dbabef120a0d0e53758f SHA1 f4fc04c345215eb4c1ec971d284cb18a9405a0e8 SHA256 70d0ffc4cc11046e4445619784e187c009a97273b9826e7f62a0b7c92aa330d0
 AUX acpid-2.0.3.patch 881 RMD160 81a32d23d72e3104d67c37863f14aa88fe8b5b39 SHA1 ea9c629cbfed5f2e3e34c4d242fcff2b69fda51d SHA256 d313d9645e705221ef9f4610a0b127ee38240125d5e2f39554537bde38a7a813
-DIST acpid-1.0.10-netlink3.tar.bz2 84647 RMD160 e677ce9a4c1a3bb3412c72b4afbfbf8336f0442e SHA1 fd01f9cb7856ab40c8f5ce6467944982e3202e59 SHA256 883a95e08c32fd7864de83ec3f5b51082bb16e7b200a40aa518be6de7d84d66e
+AUX acpid-2.0.5-fix-example.patch 569 RMD160 9c1039880762f65436da3697718cc98eec805364 SHA1 d6c0cc7ab3ab4b04e4054c56cfa569fc8fab449b SHA256 5cd3018dd4ab3b0f35628a95664c201388205f589b7a310b85adf1c3ffad960b
 DIST acpid-2.0.4.tar.gz 73730 RMD160 59db3e5926beebfa6ff131c79cbbecf0a9e72027 SHA1 8d6bcaa9acd74e67acaa881a8f361ef1f91c93dd SHA256 e844807af6f55f6407d2b513fc4811b11237e964e007ac597ee30765a522d3b4
-EBUILD acpid-1.0.10_p3.ebuild 1544 RMD160 f95fda8c9bff2af92bb8086fd2357fc06ed7849b SHA1 b7d30edd0925ae487569c674aca4ed7a028a0242 SHA256 6ffc0b5f7c44ed749a3fc9af810d830516d12e05e5e64d536bb8e6de15865745
+DIST acpid-2.0.5.tar.gz 74405 RMD160 4f27c6de3cc08ab689b8a1626190afcf62d8fd63 SHA1 5c4248f63df1ae6ea6a75fe004c5413dc2411684 SHA256 fbc177399e8f9383a5aa88b2799f539a28b5cdb2ae6c8b18dbaf586d25d06b2b
 EBUILD acpid-2.0.4-r2.ebuild 1296 RMD160 32d186456d56cb0f98caa2b56dfa87139febbeaf SHA1 72c54f4ad2bd8a03b3626b4567a97b5733b62c17 SHA256 544673f9038b2b86f0e6ca218ba1b9e8093a8e56277e10c39ccbe9f85533093a
-MISC ChangeLog 11310 RMD160 0b1efb872475b12a2e50b6c2c7acebb0ac5a9a30 SHA1 9f981e267d0bc09b79935b5f309c641cffeb6c67 SHA256 5e03c285ad056bbfd47759fe013d711106f37fce8aff975433bf0ab8ea572534
+EBUILD acpid-2.0.5.ebuild 1339 RMD160 d8416cbebf6973cf530acfeeb66cdd0f17223f69 SHA1 30a8d6fae648485f448884925475f3598cad7d6c SHA256 b7eead1d919aea328a2f0fc268e14c688e1a5ed45a59110cb0fecf8c4c1c9b08
+MISC ChangeLog 11472 RMD160 d3520cbfce06d4526f217eca19d68b0e84dcd9fb SHA1 1b177f843c03fc0894015258d1e20dda6bc87802 SHA256 b2e635e4f9af86cd4e0cc022391a216bce9c38bc3c4decc99e64c128b26dad3d
 MISC metadata.xml 161 RMD160 a5e1f234c4886ff31d39f229a0cf30d0bfcea869 SHA1 3876fd42cd9e63a7edb04c5025d53d773aa80bc3 SHA256 838bd208a7f948ea9b4e2b8869464622bc64a2f02468de4c3d7f6c2530e28e89
diff --git a/sys-power/acpid/acpid-1.0.10_p3.ebuild b/sys-power/acpid/acpid-1.0.10_p3.ebuild
deleted file mode 100644
index ac2d00554c65..000000000000
--- a/sys-power/acpid/acpid-1.0.10_p3.ebuild
+++ /dev/null
@@ -1,60 +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_p3.ebuild,v 1.3 2009/05/07 16:20:16 armin76 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.bz2"
-
-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"
-}
-
-src_install() {
-	emake INSTPREFIX="${D}" install || die "emake install failed"
-
-	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}
-
-	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
-}
diff --git a/sys-power/acpid/acpid-2.0.5.ebuild b/sys-power/acpid/acpid-2.0.5.ebuild
new file mode 100644
index 000000000000..4bab2f02c553
--- /dev/null
+++ b/sys-power/acpid/acpid-2.0.5.ebuild
@@ -0,0 +1,51 @@
+# 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.5.ebuild,v 1.1 2010/06/16 17:23:38 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 \
+		"${FILESDIR}"/${P}-fix-example.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}-1.0.6-default.sh default.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-1.0.6-init.d b/sys-power/acpid/files/acpid-1.0.6-init.d
deleted file mode 100644
index aa169802c950..000000000000
--- a/sys-power/acpid/files/acpid-1.0.6-init.d
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/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.3 2009/01/19 04:48:49 vapier Exp $
-
-opts="reload"
-
-depend() {
-	need localmount
-	use logger
-	before hald
-}
-
-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 --quiet --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/acpid-2.0.5-fix-example.patch b/sys-power/acpid/files/acpid-2.0.5-fix-example.patch
new file mode 100644
index 000000000000..831053ae7aee
--- /dev/null
+++ b/sys-power/acpid/files/acpid-2.0.5-fix-example.patch
@@ -0,0 +1,21 @@
+Fix example power button script, thanks to Timo Gurr.
+http://bugs.gentoo.org/253764, Comment #11.
+
+--- samples/powerbtn/powerbtn.sh
++++ samples/powerbtn/powerbtn.sh
+@@ -24,6 +24,15 @@
+         export XUSER=$user
+ }
+ 
++getXconsole() {
++        console=`fgconsole`;
++        displaynum=`ps t tty$console | sed -n -re 's,.*/X .*:([0-9]+).*,\1,p'`
++        if [ x"$displaynum" != x"" ]; then
++                export DISPLAY=":$displaynum"
++                getXuser
++        fi
++}
++
+ # Skip if we are just in the middle of resuming.
+ test -f /var/lock/acpisleep && exit 0
+