From: Wolfram Schlich <wschlich@gentoo.org>
Date: Sat, 17 Feb 2007 23:44:33 +0000 (+0000)
Subject: add hack for >=dev-libs/libusb-0.1.12 to udev script
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e1c7f255c6c77faee0c519f42fec1bf4ddcd811f;p=gentoo.git

add hack for >=dev-libs/libusb-0.1.12 to udev script
Package-Manager: portage-2.1.2-r9
---

diff --git a/dev-libs/cyberjack/ChangeLog b/dev-libs/cyberjack/ChangeLog
index ba718234dd45..5b0d07514279 100644
--- a/dev-libs/cyberjack/ChangeLog
+++ b/dev-libs/cyberjack/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-libs/cyberjack
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyberjack/ChangeLog,v 1.2 2007/02/17 23:34:10 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyberjack/ChangeLog,v 1.3 2007/02/17 23:44:33 wschlich Exp $
+
+  17 Feb 2007; Wolfram Schlich <wschlich@gentoo.org> files/cyberjack.sh:
+  add hack for >=dev-libs/libusb-0.1.12 to udev script
 
   17 Feb 2007; Wolfram Schlich <wschlich@gentoo.org>
   cyberjack-2.0.13.ebuild:
diff --git a/dev-libs/cyberjack/Manifest b/dev-libs/cyberjack/Manifest
index c32b408aba13..af19d06af619 100644
--- a/dev-libs/cyberjack/Manifest
+++ b/dev-libs/cyberjack/Manifest
@@ -14,19 +14,19 @@ AUX cyberjack-2.0.13-udev.patch 557 RMD160 3447ad56ea96c49e4d22dea9db0c04885b4c3
 MD5 7d7d0197fbf41ea766c57e7b9eee63a0 files/cyberjack-2.0.13-udev.patch 557
 RMD160 3447ad56ea96c49e4d22dea9db0c04885b4c3c6b files/cyberjack-2.0.13-udev.patch 557
 SHA256 ef956dfc0208500b9221a9131177ad0e5bdf4998981e6430990a0f581c15d33f files/cyberjack-2.0.13-udev.patch 557
-AUX cyberjack.sh 323 RMD160 3307808817a92a68a01f59d4fec7470304c98ad8 SHA1 f023ae03d05bf3594eaf02d38e1e9d2c9c8e5b17 SHA256 9c64dce859b4a4b1e30f921199f73a4a0d4c3b3207cd9eb1df011b388e7b9315
-MD5 b44feb28bc24a9f16eac1c7c536abff0 files/cyberjack.sh 323
-RMD160 3307808817a92a68a01f59d4fec7470304c98ad8 files/cyberjack.sh 323
-SHA256 9c64dce859b4a4b1e30f921199f73a4a0d4c3b3207cd9eb1df011b388e7b9315 files/cyberjack.sh 323
+AUX cyberjack.sh 533 RMD160 91b567c025ec250720352aaeb1b736ea9fd4ab85 SHA1 94f79d78d2a964f5045f8558d478a8b458a3c056 SHA256 ca2b881a02a2fc5f20a1e770b0a7eb07539c98cb709243ad09eb858c5f16c81e
+MD5 ad29f0f714a8703f42a38d42b41bc27a files/cyberjack.sh 533
+RMD160 91b567c025ec250720352aaeb1b736ea9fd4ab85 files/cyberjack.sh 533
+SHA256 ca2b881a02a2fc5f20a1e770b0a7eb07539c98cb709243ad09eb858c5f16c81e files/cyberjack.sh 533
 DIST ctapi-cyberjack-2.0.13.tar.gz 662043 RMD160 15e6cba26296115133dbfc1379e858468b581110 SHA1 b18664717b53d3852741f8b1d2c78b6481ccbebc SHA256 818bd4124c2edb398359b88e80831724dda81cf15a5ee97c312170b5b204891f
 EBUILD cyberjack-2.0.13.ebuild 3065 RMD160 cb88a62e392b0e9e62e607e3df13b8adc4be3253 SHA1 341eb2f81ff044f56666ce7aac92df463b6dee82 SHA256 e501ded048a51fb76ca8149411dae9fb38f1b983fc21dc77727a86aeffc8a95a
 MD5 c4a16f557e67db2b8e7167093b53a4d7 cyberjack-2.0.13.ebuild 3065
 RMD160 cb88a62e392b0e9e62e607e3df13b8adc4be3253 cyberjack-2.0.13.ebuild 3065
 SHA256 e501ded048a51fb76ca8149411dae9fb38f1b983fc21dc77727a86aeffc8a95a cyberjack-2.0.13.ebuild 3065
-MISC ChangeLog 631 RMD160 00bc4872198121217eadd322dc38ca6ab144fd89 SHA1 abfc40ef973113fc5a4839dce8f611b8fe511a45 SHA256 bbe432d889daef2891267b9c0ee41e49b9064466567db473dbb3969952486167
-MD5 d242cbf5a4d5418a595edbaaf49b8ee5 ChangeLog 631
-RMD160 00bc4872198121217eadd322dc38ca6ab144fd89 ChangeLog 631
-SHA256 bbe432d889daef2891267b9c0ee41e49b9064466567db473dbb3969952486167 ChangeLog 631
+MISC ChangeLog 760 RMD160 2653ee1555d1f6a3605325635e921f344cccfdf3 SHA1 2919290e8b705793c82fc3c6a20e6cb956c70469 SHA256 ed9f16ce718e6fa82108fa9aa71fa396ba2bcb211fb151e56b9bead44fe760ef
+MD5 6a1be3285519149a4e49b156d0e37460 ChangeLog 760
+RMD160 2653ee1555d1f6a3605325635e921f344cccfdf3 ChangeLog 760
+SHA256 ed9f16ce718e6fa82108fa9aa71fa396ba2bcb211fb151e56b9bead44fe760ef ChangeLog 760
 MISC metadata.xml 300 RMD160 3b9c1cd628f9d7ac94b68543ec737d5c2381a47e SHA1 33c5efd31a8aa789118535b921e211ffb5023ac3 SHA256 bc07a9aecce5770d1ace9af0a6c6af8ff6c7b16eb5e7947a1b178d1970855e43
 MD5 3a0673ad138a1626da8160385475f88e metadata.xml 300
 RMD160 3b9c1cd628f9d7ac94b68543ec737d5c2381a47e metadata.xml 300
diff --git a/dev-libs/cyberjack/files/cyberjack.sh b/dev-libs/cyberjack/files/cyberjack.sh
index 9993dffb1fee..121e77d7197e 100755
--- a/dev-libs/cyberjack/files/cyberjack.sh
+++ b/dev-libs/cyberjack/files/cyberjack.sh
@@ -4,14 +4,24 @@ dev_mode=0664
 
 # using the cyberJack libusb driver
 if [ -n "${DEVICE}" ]; then
-  dev="${DEVICE}"
+	dev="${DEVICE}"
+	# hack for >=dev-libs/libusb-0.1.12
+	# which uses /dev/bus/usb/NNN/MMM
+	# instead of /proc/bus/usb/NNN/MMM
+	case "${dev}" in
+		/proc/bus/usb/*)
+			dev="${dev} ${dev/proc/dev}"
+			;;
+	esac
 fi
 
 # using the cyberJack kernel module
 if [ -n "${DEVNAME}" ]; then
-  dev="${DEVNAME}"
+	dev="${DEVNAME}"
 fi
 
 # set device group and permissions
-/bin/chgrp "${dev_group}" "${dev}"
-/bin/chmod "${dev_mode}" "${dev}"
+for d in ${dev}; do
+	/bin/chgrp "${dev_group}" "${d}"
+	/bin/chmod "${dev_mode}" "${d}"
+done