sync the systemd files with original author, which just happens to be archlinux in this case. this means /etc/conf.d/acpid is now ignored. read ChangeLog for details

Package-Manager: portage-2.2.0_alpha170/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

4 files changed, 27 insertions, 12 deletions

diff --git a/sys-power/acpid/ChangeLog b/sys-power/acpid/ChangeLog
index e9d5181adcc9..120391a61f50 100644
--- a/sys-power/acpid/ChangeLog
+++ b/sys-power/acpid/ChangeLog
@@ -1,6 +1,14 @@
 # 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.104 2013/03/15 20:50:03 miska Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/acpid/ChangeLog,v 1.105 2013/04/04 10:58:23 ssuominen Exp $
+
+  04 Apr 2013; Samuli Suominen <ssuominen@gentoo.org>
+  files/systemd/acpid.service, files/systemd/acpid.socket:
+  Synchronize with original author of these files, which happens to be
+  ArchLinux in this case. See,
+  http://projects.archlinux.org/svntogit/community.git/tree/trunk?h=packages/acpid
+  This means /etc/conf.d/acpid is now ignored in favour of copying the .service
+  file over to /etc/systemd/system for modifying.
 
 *acpid-2.0.18 (15 Mar 2013)
 
diff --git a/sys-power/acpid/Manifest b/sys-power/acpid/Manifest
index 5227de63c1a5..d9e0f61f863e 100644
--- a/sys-power/acpid/Manifest
+++ b/sys-power/acpid/Manifest
@@ -5,18 +5,22 @@ AUX acpid-1.0.4-default 663 SHA256 2b18111978043d68848983a54dfc946dd9b9b15592d0f
 AUX acpid-1.0.6-default.sh 1231 SHA256 37079c125004cc7b66debc8021eb53b4b1dbcebd03f5dc213b4bbab34a1c1b01 SHA512 25629153eb97d7dc60d9a2b3a40fb7c22d4dd8ff84bbe5431230b70660d6ad8efb43976be062ac581b796f7e515722c67f8875a3aaa5f460a1172580dcac3d14 WHIRLPOOL 9e70f931c85c726f9ad8c7ae7498d40659d23f9d6d154893b7a2694e9ed68ea25c6e983662e5e92aada5a1ee373dfb5c78675746e53f4eb78f69010a8b743c3f
 AUX acpid-2.0.16-conf.d 153 SHA256 3755d4eb8bb64a1304e5defedb949305ac550565da36fe4f94d5f31beee821ba SHA512 518cb397b2aa63b893ead1be08f32fe436d19b72663dee66834cfbc112b003333f0df8b9e4f1ffe64b813783f657d3fe8b9a0c5e992d5665583357e68b266705 WHIRLPOOL bc6e88e3558869e493725d3381633b2943f5fb0047f4157b847d02d54560df25e52b95d1e2899e3ac6f20bb405456e12866236265f77769184b9825cafa6f659
 AUX acpid-2.0.16-init.d 587 SHA256 980468e6bf96c7677898330cadbcff165b4d15f1197cd544548bd0f8c376983d SHA512 9fefabe21a8b194835d1e55126fdb524ad5abb85d7eec0c3cc5a9bcb98dda6b74859ea6271a03bbe61e9e46e097b50036d6f33892d54fe1e6e4ecd15526ec175 WHIRLPOOL 1d802ba20ea3b2ae41c1c960e8c93d3a73f565d737b606e0f40a2fa2e5c04f598ad3f9bcb89fc67c81fc920e34289aa2763f9e6af8c2138aef5d795cb229c11b
-AUX systemd/acpid.service 146 SHA256 41348a7d944d72eabb82a21ee55026b4d63fc3008cd0e44dd2c9dcde769ce689 SHA512 a6ed3fe13613cd5662fb3354efebec2b4626383cc8f21984250dcf958ef2819b190640816242baf2af6ba1b0efa23c540f223feb4c171b57e5665f5dfb0803a6 WHIRLPOOL 3b43ca131021cb1f685949657c955377644fd22f0aae03405c6f32b3d0c0503c1aad037964c0c0388595032bdd1bf3cc46b7f2d140d91c233edb9c988a10a237
-AUX systemd/acpid.socket 127 SHA256 24c9d33b3ca4e5532a8dee84365d35b0aadbd6750bb4022f160c9def9f00104c SHA512 4516525f26ddbf15c33ac06b83863d8875611ec2f4c52db01a7f156759601df31e6cd39932a483928ac60ce2058982b39fce087521dadb0c9c4cd8a712b2a004 WHIRLPOOL e1dfdaec6247167aa5bf3b14b33653d01c3aeadc7dc8ac827c922e93c70d94e2afa2be2fac52681da7f1b360748d7257b45c319ca8af3d5767170d8b9dadd500
+AUX systemd/acpid.service 155 SHA256 93edfc49425ed60a4355d85b2c23ad5b0968e90fdf977edb06a20d49f9bd9028 SHA512 51c1e2a10968bd6555debf237c064dec7a347a5adfe0e8612e9ad49168e727d0779744ae8c2842b2e943dd46ab310343aeebb9eb6c9e85cb77123d966e8561b1 WHIRLPOOL 0cbbd618f6e3ac0e4b63d634095d84722caaa84e946b4f1e7036bff9ac05f45e23a8aa9f6101968c2c5af5ed29f1a9c420b7dd2271da3e59d9ecc9d04614f64e
+AUX systemd/acpid.socket 119 SHA256 a6ea89749651e38ba79598d286fd252dc814461a2cb3ceba14c25a4d6aa10bc4 SHA512 9a8293166b3818255d39d972dd354e675d23e4d59fb4ce3a8b5dedbf33e809f808ae3020f308426ba8d9d1317396727edc5be5bf51a7a30bc40c809442c96c0a WHIRLPOOL 81dcdb288bc86b97035da911a102b2627b4573302e9dd98076cb4eb41ada564f6ef6751f4b863a54e97f2266010d29afa79ab3ada094a68bdd57b0e96921c507
 DIST acpid-2.0.17.tar.xz 149440 SHA256 36b7d2c7deb6a44ae87b28026ff368f96e66b3ee8dd6b6cef4de2c3dbea17a3e SHA512 b7f3a16782db801c32b1b6195b95e5b960afd9c5acdf029445aebf98c7aea3d6677a8e75232f4702a81578faf7adb3e42844b724f4c92a09708b4cc2d74a2a84 WHIRLPOOL 6e488d5e5bd0479f811d95e69c5970ab44b8a01c64c27c9544c95dbe4f1fbc5f57188e082ed42f125720798723a78f38f9b99bf2250bec6cd6c25f332dea795e
 DIST acpid-2.0.18.tar.xz 150476 SHA256 1bc565250c6d8003267ab9c4cef18ea660b87b8df6296fe693b57001ffaf0a79 SHA512 b139f1d9b9c61f0366a46d47d8fb28fc5e19a34c4d69114b851563781c457042ed3776e93f4b654035c96d55f95b2b65eab93d422af579bb1de151b3245c928b WHIRLPOOL 27c532dcb95ca24d6c4e05bde271043aac47bfbc13072ccc2f34d978148138d8cc9f42f4910dc69a1b6b5ed612749aa805d20b5e96ffc7dbbcd239420c02dafb
 EBUILD acpid-2.0.17-r1.ebuild 1642 SHA256 d1a40bd7f0f7e9516939e90c2b6d9283c70db0e9a2ca04db2ddcb09287108ab9 SHA512 30b94ed90a6e7bc19c96e496503c0cb3e1fbe8d82aea85759d9c6d636b16bbfcd27e6d8f5ae990fb01b374de57e7602915dfcd15b5f7002db67aab4ba53949bd WHIRLPOOL 2946c77ae84305ca4b790b347f6f56697328049900e77306cf5f963717b26a78e07600d4c7a4769362a09f480d2cb724339b71d62fdf602b7d8f0ccdcec8504c
 EBUILD acpid-2.0.18.ebuild 1640 SHA256 f5114d8fe4874c676a111e95a96a86e81e4358cfe4fccae136222eae589630cd SHA512 bb6cc4c51148bfee42a2b4c711ec203ac03f1a01c886951d0cd7547abf30266042c9abbde15cd559b72ebbe6418e83267118c03c64273bfbf5ff27673b3508c8 WHIRLPOOL 7938dfa9a96ea9a0b0dad0c2db2538473418e39b56249be6cf90a45f8f9e3b69a973a7dda06a5ab71acccae1b1732a261ccb151ebbc49aa10ddccdd359409187
-MISC ChangeLog 18126 SHA256 605e546035fcc08d26f5637ed94a8e0a67003093ad582aa66fc618a1a501b86d SHA512 188647e651b1a520cc731cbf16355267aaf4b3c6ad5e58d5fd10d7aac3d4956d6891646d8dd7fc804e9aedc5d915ea8e25c154229ca76ea7b8053d41889d8b67 WHIRLPOOL ba72788df64f86cd00c35d53be7ea76c203b73bca8d9a8d4079599d6360f6d89ff9ef23b3c4f20d4dc247a63c6881043e76dc11a9831034a13c139a1abe3a10b
+MISC ChangeLog 18559 SHA256 1544e1ebda866d40077f0aa90689a4af35af20c011b7a277e69013bf1ebe1c80 SHA512 ebc74d13866d7ac68235d23e50b35790825fa5bfa1da87c6f275f27f0ebdaf99c5b9d23cad3b94167bc9f082073e86949fab4ebf2fdde0a4ee5a5fd22e67f28e WHIRLPOOL 35d5249e3ef7c5d254043fe82d7065b7713a8ea953ba7e3df761debae346de39ed5684ba507664c74086382eb1c63c45518d35028dcd03490037dfb567730651
 MISC metadata.xml 229 SHA256 ccb1e65b60e77935a00570826b01889bcf78c35ad665ca6929dc6d0b23781701 SHA512 e0a06addeba32d0a5f0dd409309915e44f88aaf099d28545106ea86a7af2cb64a1bcfc082feb941266ad8ca05fcc568c5dd2ff20f881dac3c77a3b180834cb97 WHIRLPOOL d611cf1ad296b9f45c19027752846c4dd0deae8dfae59e22f0918b303c6ff04bd4fed5d285973f70aac73a52093836b20c8dc565b2535f0482ed93c67f5d2517
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlFDiXwACgkQpFCI79Oct8XbbQEA1UOkTE7mH2gXQcLd2Zf7bWOz
-2JYtlxEYCBHxa+jJL6sBALis8mNPL2Vmgd3mif+H5zrJ+kJTj0yirfw5z+VAiTHg
-=IXIy
+iQEcBAEBCAAGBQJRXVzDAAoJEEdUh39IaPFND0IH/1jIBhQEU4hWbieA/tUVNxof
+dRgJShVodMskkT0nQG+ndnMsAt5gyev9jQE84CoUVGgXOlBDc4JtFNYBkgAqF7gS
+oUy+0+fXF0hFKO4+ldzrFnXa7yM8LchWnfZQT2q2wBjoiyG9vVDfDmNGn0q7zEBb
+QvLdQ+cAN2V6Fo1yDy0bSxInnxOhRuT7tZBAyvTx9/AdxQ3man7yayDkdPbbo51B
+70TQZ3OX9tzm2KfTRz0LXGB3TpxbeDqvuUSXZQkUobaDwL1c8Y189SAoO2EGnVSL
+Lh9e4oKSsDa2NOwrvsiEdYt9rw1RmRwPOsopFJJlllb+QgMB7FY0I0pjdXOiRpU=
+=JKQO
 -----END PGP SIGNATURE-----
diff --git a/sys-power/acpid/files/systemd/acpid.service b/sys-power/acpid/files/systemd/acpid.service
index a29400948681..e4ddacdbead7 100644
--- a/sys-power/acpid/files/systemd/acpid.service
+++ b/sys-power/acpid/files/systemd/acpid.service
@@ -1,7 +1,10 @@
 [Unit]
-Description=ACPI Event Daemon
+Description=ACPI event daemon
 Requires=acpid.socket
 
 [Service]
-EnvironmentFile=-/etc/conf.d/acpid
-ExecStart=/usr/sbin/acpid -f $ACPID_ARGS
+ExecStart=/usr/sbin/acpid -f
+
+[Install]
+WantedBy=multi-user.target
+Also=acpid.socket
diff --git a/sys-power/acpid/files/systemd/acpid.socket b/sys-power/acpid/files/systemd/acpid.socket
index 5fa2e027de8a..1b23f8735d48 100644
--- a/sys-power/acpid/files/systemd/acpid.socket
+++ b/sys-power/acpid/files/systemd/acpid.socket
@@ -1,8 +1,8 @@
 [Unit]
-Description=ACPI Event Daemon Listen Socket
+Description=ACPID Listen Socket
 
 [Socket]
-ListenStream=/run/acpid.socket
+ListenStream=/var/run/acpid.socket
 
 [Install]
 WantedBy=sockets.target