Revision bump with fix for bug#253764

(Portage version: 2.1.11.43/cvs/Linux x86_64, signed Manifest commit with key D39CB7C5)

3 files changed, 68 insertions, 2 deletions

diff --git a/sys-power/acpid/ChangeLog b/sys-power/acpid/ChangeLog
index 84745822444b..a4aff6f3a998 100644
--- a/sys-power/acpid/ChangeLog
+++ b/sys-power/acpid/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-power/acpid
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/acpid/ChangeLog,v 1.99 2013/01/03 12:59:15 miska Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/acpid/ChangeLog,v 1.100 2013/01/18 16:21:17 miska Exp $
+
+*acpid-2.0.17-r1 (18 Jan 2013)
+
+  18 Jan 2013; Michal Hrusecky <miska@gentoo.org> +acpid-2.0.17-r1.ebuild,
+  files/acpid-1.0.6-default.sh:
+  Revision bump with fix for bug#253764
 
   03 Jan 2013; Michal Hrusecky <miska@gentoo.org> -acpid-2.0.16-r1.ebuild,
   acpid-2.0.17.ebuild, metadata.xml:
diff --git a/sys-power/acpid/acpid-2.0.17-r1.ebuild b/sys-power/acpid/acpid-2.0.17-r1.ebuild
new file mode 100644
index 000000000000..6063ced56a64
--- /dev/null
+++ b/sys-power/acpid/acpid-2.0.17-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/acpid/acpid-2.0.17-r1.ebuild,v 1.1 2013/01/18 16:21:17 miska Exp $
+
+EAPI=4
+inherit systemd
+
+DESCRIPTION="Daemon for Advanced Configuration and Power Interface"
+HOMEPAGE="http://tedfelix.com/linux/acpid-netlink.html"
+SRC_URI="http://tedfelix.com/linux/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 -ppc ~x86"
+IUSE="selinux"
+
+RDEPEND="selinux? ( sec-policy/selinux-apm )"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	econf --docdir=/usr/share/doc/${PF}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	newdoc kacpimon/README README.kacpimon
+	dodoc -r samples
+	rm -f "${D}"/usr/share/doc/${PF}/COPYING
+
+	exeinto /etc/acpi
+	newexe "${FILESDIR}"/${PN}-1.0.6-default.sh default.sh
+	exeinto /etc/acpi/actions
+	newexe samples/powerbtn/powerbtn.sh powerbtn.sh
+	insinto /etc/acpi/events
+	newins "${FILESDIR}"/${PN}-1.0.4-default default
+
+	newinitd "${FILESDIR}"/${PN}-2.0.16-init.d ${PN}
+	newconfd "${FILESDIR}"/${PN}-2.0.16-conf.d ${PN}
+
+	systemd_dounit "${FILESDIR}"/systemd/${PN}.{service,socket}
+}
+
+pkg_postinst() {
+	if [[ -z "$REPLACING_VERSIONS" ]]; then
+		elog
+		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"
+		elog
+	fi
+
+	# files/systemd/acpid.socket -> ListenStream=/run/acpid.socket
+	mkdir -p "${ROOT}"/run
+
+	if ! grep -qs "^tmpfs.*/run " "${ROOT}"/proc/mounts ; then
+		echo
+		ewarn "You should reboot the system now to get /run mounted with tmpfs!"
+	fi
+}
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 9fe26a168cca..8be6f3e1a9f4 100755
--- a/sys-power/acpid/files/acpid-1.0.6-default.sh
+++ b/sys-power/acpid/files/acpid-1.0.6-default.sh
@@ -18,7 +18,7 @@ case "$group" in
 	button)
 		case "$action" in
 			power)
-				/sbin/init 0
+				/etc/acpi/actions/powerbtn.sh
 				;;
 
 			# if your laptop doesnt turn on/off the display via hardware