fix my udev patch with updates from Piotr Chmura

Package-Manager: portage-2.2.18/cvs/Linux x86_64

3 files changed, 10 insertions, 6 deletions

diff --git a/games-util/joystick/ChangeLog b/games-util/joystick/ChangeLog
index 10945caecae0..1d019a732538 100644
--- a/games-util/joystick/ChangeLog
+++ b/games-util/joystick/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-util/joystick
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-util/joystick/ChangeLog,v 1.32 2015/05/16 06:04:45 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/joystick/ChangeLog,v 1.33 2015/05/17 19:00:33 mr_bones_ Exp $
+
+  17 May 2015; Michael Sterrett <mr_bones_@gentoo.org>
+  files/joystick-1.4.8-udev.patch:
+  fix my udev patch with updates from Piotr Chmura
 
 *joystick-1.4.8-r1 (16 May 2015)
 
diff --git a/games-util/joystick/Manifest b/games-util/joystick/Manifest
index 78b33d5a505c..b748d7fb2286 100644
--- a/games-util/joystick/Manifest
+++ b/games-util/joystick/Manifest
@@ -1,7 +1,7 @@
 AUX joystick-1.4.8-build.patch 998 SHA256 6674638a044d87f47d0f677658c0bf6d4818888e3d1848bde205cdb080732a95 SHA512 0ce8ad1cb863dc1a69283b48e7795beec98919ca4bfa063896531a3a5eda5b9a670ff960b993cf90478e6abadbacb6c1cda8b28b2584fad8b8f1c192ae4e9d33 WHIRLPOOL a447f8063763889e0b3d315a17fa81cbbeca9ce479120735d36f9216ee872032d4ae231528ecdfcc25e8271970708724bf8e87f999be09356f27ba2fc6bbf9cf
-AUX joystick-1.4.8-udev.patch 1713 SHA256 172facf344b3f7243c6d2e0a98c18faf5c5c52abfbbe8f43de08ddf0cdb4b43e SHA512 9ef9a73dbe3457487cc17d7e11e1ddfce8852abf066177c4c490b352d5e7afe068f1be315e24a9486b865497ec8c1495e5c7b8d7866c55269da66dcb9098a710 WHIRLPOOL ca25f672b0cb8402a8dbd08b4aa95337c687bc2d04f59c409bbfc558f020693931e7e46285720fc240f3c5ab8a1a7f494e7e27ebce31f498d8a77504e136e35f
+AUX joystick-1.4.8-udev.patch 1724 SHA256 985c13000897b18e977cf20dffad3f09d42e12949ba1885b9b9a3b67159c1c80 SHA512 8a00825c9fb293e174eace79b1ce08af9eb2c6e18450daa62ae67b7c6a49ebe6b2490de4ccc7c1177edb300ed361a0920773b14d90c1aae4a34062ca16ad76de WHIRLPOOL 42db48e8e9209266148ad18937aad9d9053e53a6820d2db095d48f6f35e387dfb3ce4856ef56bded2116b3dcf4613c6b3ef7d7f7480f6fd36e478571106ba5c9
 DIST linuxconsoletools-1.4.8.tar.bz2 43964 SHA256 23c4ac595f608e25f472d947c4193233f763f37ae0cf6b48141d33443a4cee6a SHA512 ea3a0baa3f163e10a4c76f58977a96d91d91bddb1a75cea5195b0a631c11ca55e40730aaa0d1965404837595c4a7fd8b75c3dd7785fe0e47ee2c90021341f262 WHIRLPOOL c02960d5e171efef3739f440a903ae9b14bec8b6ab4de2181ea691aa78c870f81b291ac98e313d234778fb59c4be8e53242cb46db019f3dffdbd8f26ddcbb113
 EBUILD joystick-1.4.8-r1.ebuild 993 SHA256 d68ab68d6b1818e66a0faefc7366327920e23f6bcf8229563b12652f18d907b4 SHA512 37520f1fac8ea0577a0b435755bb1905575a726780dda55d4ccf44e411c47b0e9dcaaae84c6f91c2f1765738ec094544afd71b029cc9af6713535753619bd9ea WHIRLPOOL 9512503c1688f26c343ed6c9d00c81a04a29c2388cb23bcfd8ca639bc327e7ccc44ca9c820a3d76db54275e68f257592e30844c700e27915a863dfa3a6d7010e
 EBUILD joystick-1.4.8.ebuild 817 SHA256 467d251431eef5dbd9daac5fe1296fe5e9c9c4212bbba6262ba5addd069ab1f2 SHA512 8397273970e8c738299c16018a6df3a8ec88fa64006246622d273700d300d2be9ab67e8157352a017bdb6b5903fe380d88e58c71c4b52674cf099ae008a00a54 WHIRLPOOL c859e6c0b8b362653927ea24d7c901af80134982e1db58e7e219d79fc6ee2f96e4f556a0bd01c13047f34cbae91123bf356744f3ce4230381431dbb9d46f3265
-MISC ChangeLog 4795 SHA256 2cd7eef5a28241615e56f85e69a2fd18db23c496920e4de66fb09032b653f419 SHA512 2341474d52663959772d61c8aefc760949720995d8412b11cc9cf69f64e33993e4ba4e4e6bef0d1b00368dd30089acdc5fbb959db02c7434eb2d13021b19206a WHIRLPOOL 81f413959355ff8f27048b2caa9ce8a01fa883a9604bf5edf15ae83e3a971c33212c3300bf9a98972279f812f17ebd244d62b14662f1e8e521657f8ca0c9c1bb
+MISC ChangeLog 4937 SHA256 5eb9a66bbd5aa5b1cfd5fa5b371a87c7a95728e09f8ff591056916ba347d31d7 SHA512 80704fad189dc067673e85b42cac0d34a561fecf6c26b96c192ff66a9b4f10e1b934a69d28d8baad74ca8e1f051121d67cd90969f0a535379002bd6c044bca2f WHIRLPOOL ea472d5da72dd9b687fb099418d14902655c90d701876d22272fab5f4b6c33da08a9a3747318b5cd66cb6c654b73a4c2c766e5afbabcd0c4bfa3eb049d6f2c70
 MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
diff --git a/games-util/joystick/files/joystick-1.4.8-udev.patch b/games-util/joystick/files/joystick-1.4.8-udev.patch
index c8d78adaded0..c0032493ebf7 100644
--- a/games-util/joystick/files/joystick-1.4.8-udev.patch
+++ b/games-util/joystick/files/joystick-1.4.8-udev.patch
@@ -9,7 +9,7 @@ diff -ru linuxconsoletools-1.4.8.orig/utils/jscal-restore.in linuxconsoletools-1
 -    echo Restoring joystick configuration requires udev! >&2
 +for f in /sbin/udevadm /bin/udevadm ;
 +do
-+    [ -x $f ] && UDEV=$f
++    [ -x $f ] && UDEVADM=$f
 +done
 +
 +if [ -z "$UDEVADM" ] ; then
@@ -22,7 +22,7 @@ diff -ru linuxconsoletools-1.4.8.orig/utils/jscal-restore.in linuxconsoletools-1
  IFS=$'\x0A'
  
 -for ATTRIBUTE in $( /sbin/udevadm info -a -n $1 | @@PREFIX@@/share/joystick/ident ); do
-+for ATTRIBUTE in $( ${UDEVADM} -a -n $1 | @@PREFIX@@/share/joystick/ident ); do
++for ATTRIBUTE in $( ${UDEVADM} info -a -n $1 | @@PREFIX@@/share/joystick/ident ); do
      ID=$( echo "$ATTRIBUTE" | cut -f 1 -d = )
      VALUE=$( echo "$ATTRIBUTE" | cut -f 2 -d \" )
      case $ID in
@@ -35,7 +35,7 @@ diff -ru linuxconsoletools-1.4.8.orig/utils/jscal-store.in linuxconsoletools-1.4
  fi
 +for f in /sbin/udevadm /bin/udevadm ;
 +do
-+    [ -x $f ] && UDEV=$f
++    [ -x $f ] && UDEVADM=$f
 +done
  
 -if [ ! -x /sbin/udevadm ]; then