Found a few more references to /var/run/apcupsd that needed to be changed to /run/apcupsd

Package-Manager: portage-2.1.12.2/cvs/Linux x86_64
Manifest-Sign-Key: 0x786037A7

4 files changed, 22 insertions, 15 deletions

diff --git a/sys-power/apcupsd/ChangeLog b/sys-power/apcupsd/ChangeLog
index 819c0450119b..504059a17770 100644
--- a/sys-power/apcupsd/ChangeLog
+++ b/sys-power/apcupsd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-power/apcupsd
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/ChangeLog,v 1.94 2013/12/03 22:18:44 mattm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/ChangeLog,v 1.95 2013/12/06 01:24:10 mattm Exp $
+
+*apcupsd-3.14.10-r6 (06 Dec 2013)
+
+  06 Dec 2013; Matthew Marlowe <mattm@gentoo.org> +apcupsd-3.14.10-r6.ebuild,
+  -apcupsd-3.14.10-r5.ebuild, files/apcupsd.conf:
+  Found a few more references to /var/run/apcupsd that needed to be changed to
+  /run/apcupsd
 
   03 Dec 2013; Matthew Marlowe <mattm@gentoo.org> apcupsd-3.14.10-r5.ebuild,
   files/apcupsd.init.4:
diff --git a/sys-power/apcupsd/Manifest b/sys-power/apcupsd/Manifest
index a1fbd32e1d29..4311eed22aa6 100644
--- a/sys-power/apcupsd/Manifest
+++ b/sys-power/apcupsd/Manifest
@@ -5,7 +5,7 @@ AUX apcupsd-3.14.9-aliasing.patch 2108 SHA256 21343f4798121a828a89eee49ca9fe7574
 AUX apcupsd-snmp-5.7.2.patch 3967 SHA256 e0eae470fd6f2d5cfc5f9faa3028ba5c13b24dc9c69c4c3a8555e61558378c70 SHA512 080fd6f6bd1aa571458c09b7587dee3fe5937175a6e111976537445e805b1a2a6bbddc28224bdc23cee58a2bedcc2c458ff24f1946fd9cbfbf50500b18124680 WHIRLPOOL b50d1b1deeb51f42230e56d4dfd1927af4858c5f42621acab94c46dc8b46ee9d281f296050f9f5b3e8ba434352eae43a90fd7a3c29d46915a40b257a3570702c
 AUX apcupsd-tmpfiles.conf 39 SHA256 b00cd1a31de70a172698d486583aa79113b99c1bb4b882ab906d0e37504d7f55 SHA512 1030992a19558e79a9dddef88b508f9d9aa352223b1031f80751b2ee04821d53a185fe89cd20a7e6677709ac29179accd220a5489488b808b1280dcb2682b578 WHIRLPOOL e34d8064df32f7666e4860b49430b2434b0afb5ee7260d200329373e80a4e81416cee5616aec7ebae7005faac59060d9050fb419f4c75c2bf13024a72b445b32
 AUX apcupsd-udev.rules 328 SHA256 0865097a99b321301ec5b0bb51d0560a01df0a21cca0ee0df61f8d33f888b86a SHA512 ba2ebb9f28011548c845a81f17a328b98ec8d79c1e6be33aeab863d77b9d3aa61b4dfbd1bb89a0cae00465387dffe8cc223634a6e9a2f59170846d4bed9e7135 WHIRLPOOL ec304d772bcbcd5ba3cec1437a097d6159ad1f8b8e2bde49125d6cb1970bbc6f1de6264ba35a719431aed83f88210a583bb20fab0b771c115aaa93bf1db8c867
-AUX apcupsd.conf 12481 SHA256 2caf66f43439a48d57c4ca0efe3bb1a1f14d8ce0f395bb7f90c65b74313cada9 SHA512 19f9838de025022170ac965aab1532c17aa3eb89a88f83c330ffa33ca34c2fa0eaae007dc3d55c308717af7920e7665df9571bf43ee028d557eebf5a6d393837 WHIRLPOOL 4d1df5b9f8d47d93539240f9f8231b9fbd862014faaea3ae5cd726e61744d9786e5c42bc518df1342b24d8e129c4abc68e731baedc740ccc58e6852560399c93
+AUX apcupsd.conf 12477 SHA256 5f9044c329e7f5cb8d59afbcc4fecb102a5aac1b98f68df2c3fab00a3cfd9622 SHA512 6e38848d3f8618c1d8114d5c8a3cbcaf2ee4df2f7bbb4c6f946d41cd5e50f713493cdb63a58b261959488fc4e981782ee3108808965d2e20d8d30ede15a22b52 WHIRLPOOL 1414f7be4c85afdb422a5081342f78042fca70751ae472170c941c4e7e64d1d8ace0233ef237c755c21ea1fbf1976299b3254aa81e2c3cf3ee96f463fd2b485e
 AUX apcupsd.init.2a 844 SHA256 86be1bafb0cf72db61def444361c659e5c36d0e44b1a007772b3f49aa0e95bcb SHA512 e86dfc3b7b8a0dbca59225795a5e996176b9a064720f4c2f6c1efc27cdf2eb0ecbdb59180b24abde1af730b834303fdf31564ec3b86a46d29ebe19abfdd48494 WHIRLPOOL e7d1e8dcb61862061d1889436c9157d95ed6a86a60aca54a0dda2120f3f5410fb700c0d889841b2013808faa349f90033a34e53eecd407df4089c58fea551f56
 AUX apcupsd.init.3 659 SHA256 c3186646f06666ebd1ef265f5f6d56aeff27587face610d5f73c625b5c6053cc SHA512 fdaf68b4191dd04616c81035f8cfeafccb400a55273675b4125e67d28c3d23dc08446805e6553c868abf474773ce3a1fb36acbfbad9b85e4b6a57b7a170e01b2 WHIRLPOOL 0ea76a163c008f01d0bf8aa09219cce3a4ba6ada9f88d70b660dc06815227df37fdc82eb1b6987ec76a2cafc4f9cafa842d4ad9d81d017ef1c6d450efb077bc8
 AUX apcupsd.init.4 1037 SHA256 65a29b842a99fe9751a3391bb705d881f989bbcf0da6e363e6d40e1f69fc777d SHA512 c6d8291dd0edd4c6d68ad881e69172a7771238de3662d38a432eb9d3e2a781b9eed88a0d03c5e0f93d2cb3fcc4f0bf242c275ea16f8054ec5b098640f819d7cf WHIRLPOOL fc58bcb7c22c91f0999eee124624aeeef767dde42f2f7a1b0035edc80c06d172f384f035829de3cd922c6459ee506829741890ca83d09f4b4234380ea0e4ea3f
@@ -13,19 +13,19 @@ AUX apcupsd.powerfail.init 520 SHA256 eee773aa07175674085cb0ab7ed2c071fcc04fc053
 AUX apcupsd.service 111 SHA256 fef0b088daa7d652b8c30e6105318cff547ad2504627efabd014083eabc7182d SHA512 011e3e52e7909f36fb73b6064277a69e5db41263cfc72bda07e326172396d5318cd2b050f1fb84c4cc6da7a247c0035c36c55322ffb234a1cfa7bf13ba492889 WHIRLPOOL 940b6eb812c010f32b4bf54fd3e1b8d0a47890fd88acd8451bccbf6d17ab894915b179c110dda561c120e346ed20ca481f47761b9a5bac1e3b323457fbbc6f5a
 DIST apcupsd-3.14.10.tar.gz 1336852 SHA256 0707b5ec9916fbde9e44eb8d18037c8d8f75dfd6aeef51aba5487e189eef2032 SHA512 f95918bff783cb60fa40b03a532ee7447293b0542f44f2f9ecf36ee028df3aa414f01e2b834a28fc319d88ec2e84c81314cd546b5628554176f2ca47fdc66bbc WHIRLPOOL 1fb40a5199eb8dfcd287bab08c2bbf51f02a3657ba615e16395d5f377bc9a5b6144db24b83ef5e9172ff970a715f87f685118a035c00372c34702984fac02d38
 DIST apcupsd-3.14.8.tar.gz 1317601 SHA256 8e7f2574d3abaf6637da3e790860c3f9ba64fab1ec7e50bb080de4439441c5a7 SHA512 07e6a15538bf1824b5063a1a93f33231639cf962e658c0dada1b244f2554af81824825d807ea81fd0388e25ed8fac0957621bfded96e3faeb7b594548fc4d418 WHIRLPOOL e5a580afc4955a373f020cb6e4ccbf07f9f020d4c15eaae59b416499c25a00b9d4bbc6af012bd2529024e8a3668a1d7c47f19f1bcb99f5ba60dc0108fa13c4f2
-EBUILD apcupsd-3.14.10-r5.ebuild 4221 SHA256 728d90034ded87599a5e7ae6a6184d588900267845706a4df1fd604ed8225302 SHA512 c9a8017321f69d025ad789d467ef7b13b921d51677dcde0ee53c672ef665757a1515739ef98a572bf6f53b4db96964dd36ee9786f882a8e064c6294dec107e22 WHIRLPOOL 30c67b8de537068a78c46c42636019bb3d365fb52255428b67018ff8f1e7003979a0365f71beeb1b7c77ffa7feeb515003a50237e1dbf7285ef6a8d2b95b1fbc
+EBUILD apcupsd-3.14.10-r6.ebuild 4212 SHA256 cd39e432002f22f29917201a3e90ca2e158dfe427c6d86183860c8a47b7793f5 SHA512 5d7886110c603fae736dc248453322535ba6925b8f3f706ed514ea59f0d2e9917eb24bf5a1f523657dba38bd2b49808591156b5db19237cf4c2f69dea74a8cdb WHIRLPOOL 97e4afb6646949cb03eb56972970e908789f99c0492c5492098213bbdf82baf2182f48a4b9849aa1b98b7bd0493637778d04b9727d82b2bfe05e4085a6068e21
 EBUILD apcupsd-3.14.8-r1.ebuild 3863 SHA256 f5d984daecd4a0af67bdd5c44abeea7a4f47ed6ee94623e64e89116ff77e83b5 SHA512 5abc26eb6a258f39d7b4a617e87ee00a51c23aaeff76edd9fbc5a7b898552c5e1a270acd941d7e4d5818184d807e986da0593c239f6945c8d652867966197220 WHIRLPOOL 6ef00f538fdd0da2ac2639ece9e3209ba87190032c650cb003e7358e9f8e66f5255f58bacd0a59a7a16f17f2c393af4fb23eba14af403289444fc18d5b0140d4
 EBUILD apcupsd-3.14.8-r2.ebuild 3968 SHA256 614a245238ef58b1ad81d012128c83aa28a248f6d1c699662bafbe00c5840ec6 SHA512 7afd08080ab9f4cefb99a0f8b8b4d260fdf7f4be6d5b749b2be384e36482e901d5ee1e3ba2cbf7b003841de4988d0064c0d54a9c1386c4d413ef93ca3e6399ff WHIRLPOOL 1a76936bb6e6b8e7f5c817df41735e855bef153613067ff3f073d289e36857747992f9ee103a3b9e8f1136a10f505bb38732b6f0c71107f1d6b4f14fea0cb371
-MISC ChangeLog 28651 SHA256 32390b6d7e496ebdf7287a8d81a69b98a3e7fb0427307cda5fe7ff2a07ecc3ad SHA512 fb4b6addcfccda2c28fb72596b3260ac3d4ba5be9650d60ccfee04b343b8784004b4d2467fadf860c3932991baec4d391b316a4fedd76b180c27285f0d629459 WHIRLPOOL 738525c77e2c61e583a65d9c08f6cf0aad821c6b953c9a26a5ce887bf1f8e81eaf299e34b719d0fb586b11b79a709ddb118eb6a3c2e7c00eae711ebd7554c677
+MISC ChangeLog 28909 SHA256 db39cf43dc4b4d62ebe51b95bdd1282cc081d6f2a037ca655e406233ae3a68de SHA512 314e91e398cbbbb23af3f24c284cc8b8c6e1621691298c9c11c9ad97af43afe373f6b41b72dc8a7f500263b2aeceeeb2bebe15308f764f10d7edcf3e8454a09f WHIRLPOOL c369be1244f2627cb82b40f53e6c208932d3c45381eb285cdb84b731acd87bc95b3823acf2b88d4a7d8ef55a80c1002326bab0b5ab42d52673f825b32958936a
 MISC metadata.xml 854 SHA256 ed821e0f70dad05d8ec1475d40654bb39a4d4ce0e9afb3901282dd05a3662cc5 SHA512 b3d9dbbb217711502dc36e1aca3c6efb18eb31a1f375241ed12a5e1312e19fd74e3659bb9bab3afd9eeff41de7f643a367a406bab09a1bce9d7f41b5e28da988 WHIRLPOOL 7ed63a7e8f4560fccc24d664e6d43c0a9b726b7c41cb1504753869633611968d3d4d29403b07dd0c17e40c8e368b01450d36cf44215906843ff70d505bd0fb7c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSnljLAAoJEC1LWXx4YDenq2UH/jCMQb7ySnlJ//3/SrW8xYKm
-+Cc/znS4A0H1Aii2hCH90oSr21cV+UZpBZAhUNHBAGcee91714A0bUQS5NG3o54V
-7UuN6mVGL+H+upk0xqdQPBWPoaz5Dq9AC8PilL4qj2dV6CNLQN9UY6bDoIVF494/
-Ci3t7tqwONx/lVSN+bIk5js1vG6Byk45wPCgp/MFbsQ+StLq0fUjzH4HGn9Ls6G+
-1LH1Q9BHlanRQGf2xuAxP5v92EukpbH9GwNzcGA+Wq5WNsr3EKnyI74rCaW1lL8K
-k10205Nt09PNIuTlp1+ik8iAPhNLjutFO7EnqVeetzENUGhotGIqQOQ34vQMOnY=
-=7BQQ
+iQEcBAEBCAAGBQJSoSdFAAoJEC1LWXx4YDenbSAH/i3VkvhpkoXIrCvUnPsr7UIT
+G48sTJeGMx09gNTrerPaBi6W/kor5kkVL38HTdPyrwUWkz8Ph4vS/qR2Jd5BCqoo
+qFq0jhu84Txy/pUDgxgGW6JNzlY7m5RGvrKfaJTDhhP58fmO1DtWhGu8YuLkbk4v
+65nVTGKEEolIqU0hQZVL7iNIu196HTAIECblDS1ActT3r7nxh+oapR67PkRan8Jo
+DsQ3M4OOUD1INuClUdxLE3+A/yxc3z2oaZM3x+4jVeYcGC/xpBJcDl1GctNXCEfY
+ArW4yLt9kPOwzrD1vxgyUpz03hA5r4MBuxtnEwQp8pFOJ32UPC9X2vQDutmwNYY=
+=k/vS
 -----END PGP SIGNATURE-----
diff --git a/sys-power/apcupsd/apcupsd-3.14.10-r5.ebuild b/sys-power/apcupsd/apcupsd-3.14.10-r6.ebuild
index f5c3cd3bb4d5..b4489b43989b 100644
--- a/sys-power/apcupsd/apcupsd-3.14.10-r5.ebuild
+++ b/sys-power/apcupsd/apcupsd-3.14.10-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/apcupsd-3.14.10-r5.ebuild,v 1.4 2013/11/28 20:35:04 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/apcupsd-3.14.10-r6.ebuild,v 1.1 2013/12/06 01:24:10 mattm Exp $
 
 EAPI=4
 
@@ -61,8 +61,8 @@ src_configure() {
 		--sbindir=/sbin \
 		--sysconfdir=/etc/apcupsd \
 		--with-pwrfail-dir=/etc/apcupsd \
-		--with-lock-dir=/var/run/apcupsd \
-		--with-pid-dir=/var/run/apcupsd \
+		--with-lock-dir=/run/apcupsd \
+		--with-pid-dir=/run/apcupsd \
 		--with-log-dir=/var/log \
 		--with-nis-port=3551 \
 		--enable-net --enable-pcnet \
diff --git a/sys-power/apcupsd/files/apcupsd.conf b/sys-power/apcupsd/files/apcupsd.conf
index 27e311cab70e..f8af1154c948 100644
--- a/sys-power/apcupsd/files/apcupsd.conf
+++ b/sys-power/apcupsd/files/apcupsd.conf
@@ -90,7 +90,7 @@ POLLTIME 30
 
 # LOCKFILE <path to lockfile>
 #   Path for device lock file. Not used on Win32.
-LOCKFILE /var/run/apcupsd
+LOCKFILE /run/apcupsd
 
 # SCRIPTDIR <path to script directory>
 #   Directory in which apccontrol and event scripts are located.