Add a udev rules file that allows persistent naming of APC UPS devices.

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

diff --git a/sys-power/apcupsd/ChangeLog b/sys-power/apcupsd/ChangeLog
index 3933bb1d3e399bed3044da016004f51185104ee8..773751bdcddf5b1d3b3270d2a2b684e0d20db631 100644 (file)
--- a/sys-power/apcupsd/ChangeLog
+++ b/sys-power/apcupsd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-power/apcupsd
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/ChangeLog,v 1.72 2011/08/26 10:08:01 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/ChangeLog,v 1.73 2011/08/26 10:53:51 flameeyes Exp $
+
+*apcupsd-3.14.9-r1 (26 Aug 2011)
+
+  26 Aug 2011; Diego E. Pettenò <flameeyes@gentoo.org> -apcupsd-3.14.9.ebuild,
+  +apcupsd-3.14.9-r1.ebuild, +files/apcupsd-udev.rules:
+  Add a udev rules file that allows persistent naming of APC UPS devices.
 
   26 Aug 2011; Diego E. Pettenò <flameeyes@gentoo.org> apcupsd-3.14.7.ebuild,
   apcupsd-3.14.8-r1.ebuild:

diff --git a/sys-power/apcupsd/Manifest b/sys-power/apcupsd/Manifest
index 1ae2ece89b3de0546fe48164475fa1f0eb12ce02..e7c39da01e8af33241d18df51ebaf64b99c9ebdc 100644 (file)
--- a/sys-power/apcupsd/Manifest
+++ b/sys-power/apcupsd/Manifest
@@ -2,6 +2,7 @@
 Hash: SHA1
 
 AUX apcupsd-3.14.9-aliasing.patch 2108 RMD160 c906bdab1976ca3bda05ea55e0f3135dfbc8da9f SHA1 c03d48a0c3a7beb884143fda01d48e526fd634fb SHA256 21343f4798121a828a89eee49ca9fe7574b2fb45a5aad35fbfd5aabec7740761
+AUX apcupsd-udev.rules 328 RMD160 359a2b9e275cdf16b9177224599791c786f93c98 SHA1 c681daa68f6b84ba96522ef4ecff583d1acdc82a SHA256 0865097a99b321301ec5b0bb51d0560a01df0a21cca0ee0df61f8d33f888b86a
 AUX apcupsd.init.2 859 RMD160 81cd9edda39ec6f9cf048811df80d4f9dcd7055d SHA1 25c8134f09c362d6e82c5aa32e77a5f89c5eea1a SHA256 7007a2484547e46da2264d9f817a96387885e91a38407ec30e122ba4b637a030
 AUX apcupsd.powerfail.init 520 RMD160 24f766871652220523a18885f41f6608f29ab670 SHA1 0c5f97e556504904ffd6d72ff27ef792ac70e18c SHA256 eee773aa07175674085cb0ab7ed2c071fcc04fc05383d368f38d056e7327ff35
 DIST apcupsd-3.14.7.tar.gz 4272089 RMD160 cb3db3e6e123f39666eef3c5ccfdec65c57a1571 SHA1 9561eb5cf8e0c627215b987dbb97d026a2b2e9b8 SHA256 7e3df3b5552394206f4b8aaac2bd85ac69df540495557676a3df63f84972823c
@@ -9,13 +10,13 @@ DIST apcupsd-3.14.8.tar.gz 1317601 RMD160 f642582e01506ebb986c16df01429e6bb08c7e
 DIST apcupsd-3.14.9.tar.gz 1334762 RMD160 be1a33b85c790fc3bc62bab370a62d014dbf0a57 SHA1 1e9e8a054f17c554c047ec1d7b363d35553058bc SHA256 0041f00b2e628056e668db7298d0af0ad501fe127e0c5c344eec9873a0988a92
 EBUILD apcupsd-3.14.7.ebuild 4070 RMD160 074b343c8df890a20ea2e6cb513a1c2c5eb20c3a SHA1 3c9312ef721028415e2df32d38ecb743f53d1665 SHA256 4a16b9cc4e1948d3849362bdc817b4bf0668f9de1a792c2f5c1da6aa86f93939
 EBUILD apcupsd-3.14.8-r1.ebuild 3883 RMD160 b36a6599059712cbec48610c9876c22e596ee254 SHA1 f71f2c9c267b13a98cda9be75955cdbfcdffb72d SHA256 2b48d3475b1d4c454cfabd4afac69e9db69271a02df1bfa43102cd75dab1da9e
-EBUILD apcupsd-3.14.9.ebuild 3618 RMD160 c3bf565b6ab0151cf44ef0d51c97146fe67a639f SHA1 d4c826bda2986c8d1dee748356ec1b478c8c18aa SHA256 8c28da1971a8ef5bf899f7426fdd68e825042c6e84bfdd254817d3e7f9b7842f
-MISC ChangeLog 24981 RMD160 3f9392c72fc45ca3c0bebeebc1395ff8614e0cdc SHA1 844e9bf25ed0463846a2850ff41c43b2ff301e29 SHA256 f56d6358f51fe0df74460a56f705d0f3a7db4fbcc46e44075af211ba3443baa1
+EBUILD apcupsd-3.14.9-r1.ebuild 4064 RMD160 2a8a4819781c85ce821a0dce9a5a724ac0e21ceb SHA1 a9914ebae05b47899a56756e69b595ef58857ae1 SHA256 ac4d9701ea5eddf422f6771a8ece4f37966eb8db66fb60b14de01861a4bfb771
+MISC ChangeLog 25226 RMD160 4591088e3e8e27756b23e1228c91407390797d6f SHA1 98448a250e321f61ea54abc1b80487d2fb84c96f SHA256 a058c099a456cc0ce80187a449ed0605dc67b026468b020512c99755c529fb99
 MISC metadata.xml 237 RMD160 2a4fab832a64fbdafe2cd6f59b141b2aa80797ac SHA1 75878fb1a17b8617882c9e02331a6643d647882b SHA256 368acc29aa9214adaa137c17b114b16c6a021c4dfc9efa5f3440e968db04a9b3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk5XcIIACgkQAiZjviIA2Xj1vgCdG3GMOa9cRn9boJNLL3KMrXhs
-sHoAoKPoEBrdrapVCRuyo0V7A8g1LseY
-=gL1e
+iEYEARECAAYFAk5Xez8ACgkQAiZjviIA2XhyPACdGIUeiLGH5b5Yo+tJfckULYty
+EhwAnRD5oNF7EikZ+Ft8RlVoWTKHkjZu
+=G950
 -----END PGP SIGNATURE-----

diff --git a/sys-power/apcupsd/apcupsd-3.14.9.ebuild b/sys-power/apcupsd/apcupsd-3.14.9-r1.ebuild
similarity index 87%
rename from sys-power/apcupsd/apcupsd-3.14.9.ebuild
rename to sys-power/apcupsd/apcupsd-3.14.9-r1.ebuild
index ccc6d64184089f7b951c7239d2f5289bce098e73..90aca78e02494882461b8e300a76b1c036aeacb3 100644 (file)
--- a/sys-power/apcupsd/apcupsd-3.14.9.ebuild
+++ b/sys-power/apcupsd/apcupsd-3.14.9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/apcupsd-3.14.9.ebuild,v 1.1 2011/08/22 14:27:25 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/apcupsd/apcupsd-3.14.9-r1.ebuild,v 1.1 2011/08/26 10:53:51 flameeyes Exp $
 
 EAPI=4
 
@@ -94,6 +94,12 @@ src_install() {
        # remove hal settings, we don't really want to have it around still.
        rm -r "${D}"/usr/share/hal
 
+       # replace it with our udev rules if we're in Linux
+       if use kernel_linux; then
+               insinto /lib/udev/rules.d
+               newins "${FILESDIR}"/apcupsd-udev.rules 60-${PN}.rules
+       fi
+
        # Without this it'll crash at startup. When merging in ROOT= this
        # won't be created by default, so we want to make sure we got it!
        keepdir /var/lock
@@ -121,4 +127,11 @@ pkg_postinst() {
        elog ''
        elog ' \e[01m rc-update add apcupsd.powerfail shutdown \e[0m'
        elog ''
+
+       if use kernel_linux; then
+               elog "Starting from version 3.14.9-r1, ${PN} installs udev rules"
+               elog "for persistent device naming. If you have multiple UPS"
+               elog "connected to the machine, you can point them to the devices"
+               elog "in /dev/apcups/by-id directory."
+       fi
 }

diff --git a/sys-power/apcupsd/files/apcupsd-udev.rules b/sys-power/apcupsd/files/apcupsd-udev.rules
new file mode 100644 (file)
index 0000000..b2eeb27
--- /dev/null
+++ b/sys-power/apcupsd/files/apcupsd-udev.rules
@@ -0,0 +1,10 @@
+# do not edit this file, it will be overwritten on update
+
+ACTION!="add", GOTO="apcupsd_end"
+SUBSYSTEM!="usb", GOTO="apcupsd_end"
+ENV{ID_VENDOR}=="", IMPORT{program}="usb_id --export %p"
+ENV{ID_VENDOR_ID}!="051d", GOTO="apcupsd_end"
+
+KERNEL=="?*", SYMLINK+="apcups/by-id/$env{ID_BUS}-$env{ID_SERIAL_SHORT}"
+
+LABEL="apcupsd_end"