Use /sys instead of /proc so that this works with later kernels wrt #433096

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

4 files changed, 70 insertions, 2 deletions

diff --git a/app-admin/usbview/ChangeLog b/app-admin/usbview/ChangeLog
index 53e7c6ec7f4c..65250b97c746 100644
--- a/app-admin/usbview/ChangeLog
+++ b/app-admin/usbview/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/usbview
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/usbview/ChangeLog,v 1.34 2012/05/03 18:02:23 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/usbview/ChangeLog,v 1.35 2012/10/21 08:52:57 ssuominen Exp $
+
+*usbview-1.1-r1 (21 Oct 2012)
+
+  21 Oct 2012; Samuli Suominen <ssuominen@gentoo.org> +usbview-1.1-r1.ebuild,
+  +files/usbview-1.1-missing-usbfs.patch:
+  Use /sys instead of /proc to avoid missing usbfs wrt #433096 by
+  Gary E. Miller
 
   03 May 2012; Jeff Horelick <jdhore@gentoo.org> usbview-1.1.ebuild:
   dev-util/pkgconfig -> virtual/pkgconfig
diff --git a/app-admin/usbview/Manifest b/app-admin/usbview/Manifest
index 0fdef0372dc7..30735b0887aa 100644
--- a/app-admin/usbview/Manifest
+++ b/app-admin/usbview/Manifest
@@ -1,4 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX usbview-1.1-missing-usbfs.patch 426 SHA256 800734f7f9671b0019b0fffd4580a89a416ed793877a765d05cba9a4c320f728 SHA512 5d023b542c030fc5575cd62aa6dc1d6c3c2619e5e2a1a351087c312226ad7077501d71db6cca8b921cbb6ee0d04af0ce11c902419a68d908dcb8fbf0d9d04dd1 WHIRLPOOL c7ea6e30ce138179ff226f8b5756fb7b6c41d8d6963e19adfab315d98672acf8d5ebb5484db5f60314885246088459728c166da604b6f7d4208aa42f3f763f7b
 DIST usbview-1.1.tar.gz 353012 SHA256 df3fc23cc48590ad54b9ab5457b8cef41bd59205a41f016fa2155d7c7ab1c879 SHA512 5d6a3d1d8054a9a5cc9e28d97e52d843aaeda3251da3cf33d00e938695b6296106456192dddc48fb02f1e6490e89ebb2a096f68faa64ac10144a80106d986a39 WHIRLPOOL b9942b1b26c7ffb046d68d13669c00d81c328baa40f79a64de59386e8998108e5f3ffba3b2751a7cee2d4128508219a70cb42b740fa2a80f3131528af55b1be1
+EBUILD usbview-1.1-r1.ebuild 781 SHA256 5c0621b77e53c62bea62d8322c28c7318e4a32fbc593fa576b2cb5f7f5db293e SHA512 8edba728910e833817fc2c633626ab4a274f9a8f6ed33c62ee7ec1ee789b6c8f4f8c17c7b9d544c9ff49026a6f1ecaa088a19fdd31875fdc3e9a11468ab9ddfa WHIRLPOOL 20a8d6508de60c39d3163cad190a8c1b28c2d731898fdc9f27d9e7a63675933388191b18f53905e7416bd5e8a8595803f2059799aeca81ae631c2dfd763a979a
 EBUILD usbview-1.1.ebuild 756 SHA256 3e80b8fcc519ebc1e1b086e6f3b4bbe8a3f16c950780cfaace31f9c44b4807cf SHA512 36a7706e39a278057f42bf8b0fde1326449430d9bf2bf140809b0d20f8fac8eee705aa21fb2d0f4f3f3a9268ed039123e68ea82ee66225488fd5f07e2a958c7f WHIRLPOOL 5353456f2711e3b3060b2069daea66445d685b8602bfc45dbea9b4454d05cf4b4c2557ebfc501b8dc0a54ebd3b455d2ba9d33455ba383dd234bc6afc114383b2
-MISC ChangeLog 3694 SHA256 e886d43be091b742fb934426c5d9d0b4302d57cd581036b9740c614ea1b54fae SHA512 f91aa540a1a1a85682392be8395a1c56401409eae5d8d36e1e93873fa30225c423c9d80369d57308e748f4794d81f797bf892c0cc21e0049ff4acbe4dca7e0b5 WHIRLPOOL a361f4fc94bd335e05d057d5bdf56778ba918143bc61304772079a34ec4b1196fe13e3b855e3716c0bbd450e53742f806f229bc9f0d769325df0d6e73d344aa5
+MISC ChangeLog 3932 SHA256 b680cde677740f9d0106c2cc62997a1bb3b14b750066e2f064e47dc59c058477 SHA512 aec839afdd53cc0edb5ca44f36585ae4409db9a2c6d0e795de423c23a051e7bc0bc873091806480a8439f3a892c42805ab913ae299948e292d0ff78b348dd389 WHIRLPOOL 1bffc603a4ad41879187a405cfcdda69da94d6fb68312d64b2145c7c4b7eafb52beca299e2c240c062801e1f5ab05c2e4aef871d7a6a464fe6eb6daf59c766c8
 MISC metadata.xml 166 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826 SHA512 23980b683f9a89f988407b1dcc27a4465a18912f6e6cf8e1fed46182f00c4023d4802434f36b9482121ba9ffe9bc5d6e91b5d3a4ba9067fcfd8e57799c128fe3 WHIRLPOOL 96d79ff499e108ad89b80507c2e94a09af1e8031e5e2a7f9cecb2dddbf517872361436bdb983dc580660064a62663ad63aa1fad8f49dd3758253f4e378bfd297
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQg7cCAAoJEEdUh39IaPFNL1gH/iqafWXaqrzBpVJ/IxD09I68
+oCvlP512KTyMW/1WYkNkFPCW6EhVeLvFt0tOEpIT6Vx+mUdxcJFCqPkp5sCfe1l/
+ketADJmKimB42EfAHm9OXoQ9dbUoDs9GQOsZO7hJyY78fzCNZi+u2AKUMry6FXG2
+mqnQRwGvIBHd68DsyqcfXsR1rFXMvC75vgR3d01qEwI3n3T+yCnHCx9pkt+YmpZJ
+r7IMVuEUPvhuqIxEXL8ofBltVVQa6YTaFa0qKMDtaxlY3sI03C1+yeXdX7u9RZlh
++rPJtIi9RxOtxJxKQ+R2eRit6D4qqmuH0n2tYTyvBYd5REglsk9RNfiU/BV2Ko4=
+=tZva
+-----END PGP SIGNATURE-----
diff --git a/app-admin/usbview/files/usbview-1.1-missing-usbfs.patch b/app-admin/usbview/files/usbview-1.1-missing-usbfs.patch
new file mode 100644
index 000000000000..7f7b8f98fcbc
--- /dev/null
+++ b/app-admin/usbview/files/usbview-1.1-missing-usbfs.patch
@@ -0,0 +1,13 @@
+http://bugs.gentoo.org/433096
+https://projects.archlinux.org/svntogit/packages.git/plain/trunk/usbview-1.1-missing-usbfs.patch?h=packages/usbview
+
+--- usbtree.c
++++ usbtree.c
+@@ -397,7 +397,7 @@
+
+ void initialize_stuff (void)
+ {
+-	strcpy (devicesFile, "/proc/bus/usb/devices");
++	strcpy (devicesFile, "/sys/kernel/debug/usb/devices");
+	memset (&previousDevicesFile[0], 0x00, sizeof(previousDevicesFile));
+	previousChange = 0;
diff --git a/app-admin/usbview/usbview-1.1-r1.ebuild b/app-admin/usbview/usbview-1.1-r1.ebuild
new file mode 100644
index 000000000000..666f49ccfdad
--- /dev/null
+++ b/app-admin/usbview/usbview-1.1-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/usbview/usbview-1.1-r1.ebuild,v 1.1 2012/10/21 08:52:57 ssuominen Exp $
+
+EAPI=4
+inherit eutils
+
+DESCRIPTION="Display the topology of devices on the USB bus"
+HOMEPAGE="http://www.kroah.com/linux-usb/"
+SRC_URI="http://www.kroah.com/linux-usb/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/gtk+:2"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-missing-usbfs.patch
+}
+
+src_install() {
+	default
+	doman ${PN}.8
+	doicon usb_icon.xpm
+	make_desktop_entry ${PN} 'USB Viewer' usb_icon
+}