New socket activation based systemd files as per user request. Ensure /run is present in pkg_postinst() for acpid.socket file.

Package-Manager: portage-2.2.0_alpha107/cvs/Linux x86_64

7 files changed, 118 insertions, 6 deletions

diff --git a/sys-power/acpid/ChangeLog b/sys-power/acpid/ChangeLog
index 996550d6f427..afedf54fff35 100644
--- a/sys-power/acpid/ChangeLog
+++ b/sys-power/acpid/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-power/acpid
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/acpid/ChangeLog,v 1.84 2012/05/06 17:01:01 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/acpid/ChangeLog,v 1.85 2012/05/19 09:53:59 ssuominen Exp $
+
+*acpid-2.0.16-r1 (19 May 2012)
+
+  19 May 2012; Samuli Suominen <ssuominen@gentoo.org> +acpid-2.0.16-r1.ebuild,
+  +files/acpid-2.0.16-conf.d, +files/acpid-2.0.16-init.d,
+  +files/systemd/acpid.service, +files/systemd/acpid.socket:
+  New socket activation based systemd files as per user request. Ensure /run is
+  present in pkg_postinst() for acpid.socket file.
 
   06 May 2012; Raúl Porcel <armin76@gentoo.org> acpid-2.0.14.ebuild:
   ia64 stable wrt #406947
diff --git a/sys-power/acpid/Manifest b/sys-power/acpid/Manifest
index de75395aa88f..3498d272c58e 100644
--- a/sys-power/acpid/Manifest
+++ b/sys-power/acpid/Manifest
@@ -5,8 +5,12 @@ AUX acpid-1.0.4-default 663 RMD160 5e40661ec9112c3cc675a0d283e96311d2d159f1 SHA1
 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-2.0.11-init.d 712 RMD160 889e6a7b725f65fd7167248c4b2c8d023f1fc98c SHA1 bc1b48ed412025f11d64ef0a27797545ffd4f6b4 SHA256 7ef2a456847ec6458b7e92c00e500a17672919bb64ad9a97278bd498d91b928f
+AUX acpid-2.0.16-conf.d 153 RMD160 7fe99acb5ca6327bbd80369000bad2c9771fe7d2 SHA1 c12160dbcb231e8976f7c40d0a2ab60a6a984e26 SHA256 3755d4eb8bb64a1304e5defedb949305ac550565da36fe4f94d5f31beee821ba
+AUX acpid-2.0.16-init.d 587 RMD160 0b8da06e95f82c3d472fcc55c586af61ee717248 SHA1 a7d3149979703270570cbc74b3df3b46b5fcec02 SHA256 980468e6bf96c7677898330cadbcff165b4d15f1197cd544548bd0f8c376983d
 AUX acpid-2.0.3.patch 881 RMD160 81a32d23d72e3104d67c37863f14aa88fe8b5b39 SHA1 ea9c629cbfed5f2e3e34c4d242fcff2b69fda51d SHA256 d313d9645e705221ef9f4610a0b127ee38240125d5e2f39554537bde38a7a813
 AUX acpid.service 135 RMD160 dee559a0c4e8ae4372002851e518f1477ff1d1eb SHA1 47f40dee8d2e341b9c96f70a61439b6a1837dd52 SHA256 c01b8cc2532c4a130c020f042ab9e9be9a9ff075ad7c2e9c9f971a57b40b5cc6
+AUX systemd/acpid.service 145 RMD160 e0baaa8a1d78dab5b738cebc838d094293c572ec SHA1 6f8455090b18fe74fb2147b0b7070a4671947540 SHA256 598f907aeb8e7337cf78b25be2a942a010fe78155de98aa19068ad9cbee64a5c
+AUX systemd/acpid.socket 127 RMD160 946eb954ad076f1154171aaf209f66b70f9793d7 SHA1 9d9e5b68cb717ee238f571babb2b0cd787e3990e SHA256 24c9d33b3ca4e5532a8dee84365d35b0aadbd6750bb4022f160c9def9f00104c
 DIST acpid-2.0.12.tar.gz 76333 RMD160 f81377fee79a8150c262255a9f00eafe528eb1f7 SHA1 21a0fccb8ec13badb8a9a7d2907020309159c4ca SHA256 dc8c600f6a7f0ceb423099874e66c6e091ae73eb2227dc5f771dacac50a1b6eb
 DIST acpid-2.0.13.tar.gz 76066 RMD160 8f20f805a4a86a21a355892254d2aca481251863 SHA1 a4eaa6759295d0dbfdcd8f2b0015df9f1f8b63cf SHA256 00c789ec5078ddfc07b827c632d91e92a35db5c7130f4f2ee05e1952136d3d93
 DIST acpid-2.0.14.tar.gz 77395 RMD160 9ddd5018b92619b1d7434cbd219dc7a60bc56d82 SHA1 029d8c5045f417af1b2dd91462a263cfb1b3554a SHA256 88158b889280017072362b37a4b378826285756489857b93fc5888acf5b4db0b
@@ -14,13 +18,18 @@ DIST acpid-2.0.16.tar.xz 148196 RMD160 240729f721dae0f5f5aab03573f536b6bd29177f
 EBUILD acpid-2.0.12.ebuild 1314 RMD160 07dd83fb2e4891a4df899d55dd189e6b13fffff0 SHA1 ff5f434f7cf6f0b745ba0b5305fe4726ce301d55 SHA256 04da04dfc69e2f6f629e9fed5c853d8e48224546a781fc48fd777b9d4afc21ae
 EBUILD acpid-2.0.13.ebuild 1319 RMD160 f46b67b10c030cf424ed29f640269a947066da9f SHA1 6a451a9dce28ea1a5c7668e52f7ed63cb986e15c SHA256 f2ba38da36b18231aef52727c0355909c4adfc6c17ee3a940745d85ea444da27
 EBUILD acpid-2.0.14.ebuild 1291 RMD160 1aded922eaa77658d1e9e73e5e43efb6bc6afd6c SHA1 b5c0a9f52e716abb9e5f586e610ced712c6c8b59 SHA256 835fed5765a0fab0e35282616e79b315bdde5243cee9364d0cd031057e763f84
+EBUILD acpid-2.0.16-r1.ebuild 1451 RMD160 a2bc4aa31f444ea0a65482b19eba7d6e374a46ec SHA1 e76fb6230cd9555bf9ed482ee9f99c8953eebaa0 SHA256 c8fd77fd1e85166efb7d89f59a2e58c2c80e7b1494e0b02d7272b00ee2fa65c6
 EBUILD acpid-2.0.16.ebuild 1194 RMD160 c276fd8e4ac10c401fb07107b16f3ff78afad8db SHA1 653a73c40c95708b3f67c8f24965e03f0aaf9e9a SHA256 23c65bf41e6f4f6fd058e97d6ec226c76d4fea84316a003db05aa1218364c9bd
-MISC ChangeLog 15126 RMD160 1f14827b747dfc98190317fdf630e87181284592 SHA1 2fa2bcadc0493c3b3f68dbbff7772d86829d512b SHA256 16219f04083b0c18b64b15520d32022d2895c13e5f565ad633889102d49f75a8
+MISC ChangeLog 15490 RMD160 f8ecc47b68499b26e2bdc82c31d15677e81c2377 SHA1 9a4b2b2b2a805b6667079ae86280eddcda9d9071 SHA256 d60c7116040dbbe14010d1f77a4a093528572594fcb09ba6d18e439785b61334
 MISC metadata.xml 161 RMD160 a5e1f234c4886ff31d39f229a0cf30d0bfcea869 SHA1 3876fd42cd9e63a7edb04c5025d53d773aa80bc3 SHA256 838bd208a7f948ea9b4e2b8869464622bc64a2f02468de4c3d7f6c2530e28e89
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk+mrlQACgkQuQc30/atMkC1zQCdHZo6aDFdOdHwNzkgxonx0V76
-dzkAoJyp0MfRQ6CeA4DDBnmVhT5izNOR
-=+yQO
+iQEcBAEBAgAGBQJPt22tAAoJEEdUh39IaPFNrfIH/AqWW6KXTbj5/Je9neMd+k18
+/CDxXEPUmp3SQI3EtFBwbHNTcCzAoPmkn71JFNyQpHj3yKJ81WSjDcEmPeg3gJGO
+XhwvZW+x+oekSbUSSvloWm9Na6ihXOaDlDyt3RBM/lD5QjgVppO3TipV2Qmd6P6k
+Qmo8ExRekOxzRI5Z77O6I7AFOmLLXqBIqIHwEDO25vsCtvvZosC3ERzxLo1zMOs/
+XzEWuilu7hiheKAIczIRmctVI2/Am+MW7JwOtUJ16+8wFGc5mGkFvST7vkwnRSdW
+RXv7ZGN4BBMbEN58TiN1rqJoD2TKZ27swMYDlLsdWzUrOyrvebQOZhVOQF+QwxY=
+=vU4j
 -----END PGP SIGNATURE-----
diff --git a/sys-power/acpid/acpid-2.0.16-r1.ebuild b/sys-power/acpid/acpid-2.0.16-r1.ebuild
new file mode 100644
index 000000000000..1c3822e7b060
--- /dev/null
+++ b/sys-power/acpid/acpid-2.0.16-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/acpid/acpid-2.0.16-r1.ebuild,v 1.1 2012/05/19 09:53:59 ssuominen 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=""
+
+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
+	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() {
+	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
+
+	# 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-2.0.16-conf.d b/sys-power/acpid/files/acpid-2.0.16-conf.d
new file mode 100644
index 000000000000..9aadb4cd814a
--- /dev/null
+++ b/sys-power/acpid/files/acpid-2.0.16-conf.d
@@ -0,0 +1,6 @@
+# /etc/conf.d/acpid: config file for /etc/init.d/acpid
+
+# Options to pass to the acpid daemon.
+# See the acpid(8) man page for more info.
+
+ACPID_ARGS=""
diff --git a/sys-power/acpid/files/acpid-2.0.16-init.d b/sys-power/acpid/files/acpid-2.0.16-init.d
new file mode 100644
index 000000000000..412a265fc56b
--- /dev/null
+++ b/sys-power/acpid/files/acpid-2.0.16-init.d
@@ -0,0 +1,21 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-power/acpid/files/acpid-2.0.16-init.d,v 1.1 2012/05/19 09:53:59 ssuominen Exp $
+
+extra_started_commands="reload"
+command="/usr/sbin/acpid"
+command_args="${ACPID_ARGS}"
+start_stop_daemon_args="--quiet"
+description="Daemon for Advanced Configuration and Power Interface"
+
+depend() {
+	need localmount
+	use logger
+}
+
+reload() {
+	ebegin "Reloading acpid configuration"
+	start-stop-daemon --exec $command --signal HUP
+	eend $?
+}
diff --git a/sys-power/acpid/files/systemd/acpid.service b/sys-power/acpid/files/systemd/acpid.service
new file mode 100644
index 000000000000..8f8c7e4bede4
--- /dev/null
+++ b/sys-power/acpid/files/systemd/acpid.service
@@ -0,0 +1,7 @@
+[Unit]
+Description=ACPI Event Daemon
+Requires=acpid.socket
+
+[Service]
+EnvironmentFile=/etc/conf.d/acpid
+ExecStart=/usr/sbin/acpid -f $ACPID_ARGS
diff --git a/sys-power/acpid/files/systemd/acpid.socket b/sys-power/acpid/files/systemd/acpid.socket
new file mode 100644
index 000000000000..5fa2e027de8a
--- /dev/null
+++ b/sys-power/acpid/files/systemd/acpid.socket
@@ -0,0 +1,8 @@
+[Unit]
+Description=ACPI Event Daemon Listen Socket
+
+[Socket]
+ListenStream=/run/acpid.socket
+
+[Install]
+WantedBy=sockets.target