Rewrite usbutils to use libusb-1 #342553 by Chris Coleman. Move lsusb to /usr/bin #342529 by Samuli Suominen.

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

3 files changed, 59 insertions, 6 deletions

diff --git a/sys-apps/usbutils/ChangeLog b/sys-apps/usbutils/ChangeLog
index f0187befddce..b532e5a9f3d1 100644
--- a/sys-apps/usbutils/ChangeLog
+++ b/sys-apps/usbutils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/usbutils
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/usbutils/ChangeLog,v 1.107 2010/10/26 14:47:41 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/usbutils/ChangeLog,v 1.108 2010/11/19 09:58:45 vapier Exp $
+
+*usbutils-0.91-r1 (19 Nov 2010)
+
+  19 Nov 2010; Mike Frysinger <vapier@gentoo.org> +usbutils-0.91-r1.ebuild:
+  Rewrite usbutils to use libusb-1 #342553 by Chris Coleman. Move lsusb to
+  /usr/bin #342529 by Samuli Suominen.
 
   26 Oct 2010; Christian Faulhammer <fauli@gentoo.org> usbutils-0.90.ebuild:
   stable x86, bug 342525
diff --git a/sys-apps/usbutils/Manifest b/sys-apps/usbutils/Manifest
index 3a81500c0bd0..dad9052a6ffb 100644
--- a/sys-apps/usbutils/Manifest
+++ b/sys-apps/usbutils/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX usbmodules.sh 989 RMD160 6d5930b97b1ae2f87fe14c10ea72ab01625ab908 SHA1 19e08e37270a92650e2e7abf780239ae9a7b6908 SHA256 096271d45255f27836274ce92e89456644b6fc68e3a784b9dd251d28a407c630
 AUX usbutils-0.82-fbsd.patch 254 RMD160 bc82734b6630170a746fb06c3482fa2d9b0bcc66 SHA1 8163571295867b995db44bc69d36d0725fd7d0c2 SHA256 7654349d6150841a141211a74b5252c615225805ff466364ac67d76fbeef3316
@@ -8,17 +8,19 @@ AUX usbutils.cron 42 RMD160 463be9cd3993b1abfc05be0d3f8f8deed30e83bd SHA1 d7c11c
 DIST usbutils-0.86.tar.gz 246623 RMD160 5f1152260190fac63960e0d4e9aa91b4fb67f38b SHA1 8789fe562a0c791cc1cdffd30af5908876efb6da SHA256 b3b2bea6d2cd87660c8201a47071bf2a9889d8ed90c7203cc768b597799c12f4
 DIST usbutils-0.87.tar.gz 251859 RMD160 00ab599269814ea4404f9174be7af468f5124a27 SHA1 d5efe8101118932f8cfdd8922b0bb75de03cf154 SHA256 76d62db57e36e0c2d8e2c5cfdcdf5bc615b7b9e95f42d0560a19729fe7b3c550
 DIST usbutils-0.90.tar.gz 259357 RMD160 fd2efb2a51704df0365aaae2233d1d2a6e666b9a SHA1 7d34c6beb313bce16f665e589588a7dcadde48ee SHA256 2ec3ba953c386c1eeeba0744170d9851dcef588416e826aaa8ebabff7dc17415
+DIST usbutils-0.91-libusb1.tar.bz2 10327 RMD160 69d4ab82fca5a9d16c57056df835dbd4bc85565a SHA1 7444434233c262756039a7bd3fb746d55ad47cdf SHA256 e37262783a84e08b1fa06404f01c94cef2400119529478882dd5daf88dfa5860
 DIST usbutils-0.91.tar.gz 551505 RMD160 44d8837c6fde27b81a575b0a1d1b3bb239bb54bd SHA1 626494f2b28ad649671e0997405f5e558d733f52 SHA256 c122346b0225121bcf159abf804116f826a4a3462c94ce7b8871f7559e6b3a46
 EBUILD usbutils-0.86-r1.ebuild 1194 RMD160 c80c5dfd768d2fa4368ef6c21157f53085cb1c50 SHA1 78d6828d5820ad8b831ab600c85168f4c840572f SHA256 d0ab3e672aef4dccd41cc5dc20e3115ef6dde8bd543c1403197a8a2038b7e2db
 EBUILD usbutils-0.87.ebuild 1244 RMD160 3b5b90e8fb02dcfba0b079c93ab449eb76229147 SHA1 12ff33c0f3cabfabcb500d42069d58e4c257fa1e SHA256 4988ecd8357dbb409304a42ab39534cb4a4bdff2dea55aa758012767c9cb4dfb
 EBUILD usbutils-0.90.ebuild 1235 RMD160 758ed16b13e1f67185ad652397830494b7d85867 SHA1 5db57ab46d68b72e35725e2a40289dd7efc1245b SHA256 1a3b979e9cedd9a4a7f9472b336430b1758396e2adaa7a57f9aa65e085102a5f
+EBUILD usbutils-0.91-r1.ebuild 1167 RMD160 002d5aac067412c59c0a51dd9397882d0d8375d9 SHA1 6cd4f4dd3ec9940edacc0a4b5bb8e01b98c14a36 SHA256 2f89e45877dccd2883d4b1fa53a8d30211f587ba004ea9edbed0d14ee3e60b99
 EBUILD usbutils-0.91.ebuild 1076 RMD160 207521e2765f663520c8b555ffdcc2000c8df61f SHA1 658d6e3db8a4ecdbe066bbe16fdec237be14ee5a SHA256 3a30e0d1ac3990a7be46cde3780a48392a35e70506796f17e8960b5bbe9e39ac
-MISC ChangeLog 13956 RMD160 1595ef43f3eb37c193f2b1cd6b3fb92da3a03006 SHA1 230b2c225dfb620284d95e9432babc6069eaf0f6 SHA256 bdd0fe9fb28cd778409cb48e269dd5229757bf789107006b8a0ca373f0272913
+MISC ChangeLog 14181 RMD160 07ae8fad5e537c12eb4e87bdee55167011b64516 SHA1 6b059e85f3a2ebac01fa35d5886a7a47278f7f4a SHA256 44579ba43ddc91bc4fc1b2a1f963348be6aa7352e89293c505cee42b8db2bdd4
 MISC metadata.xml 252 RMD160 cf5c2f72c68d4127a9eaa80c8c8a670dc5c141e6 SHA1 7289fac4ca3f1c6928224df39540dff5c8f0ddf4 SHA256 73bd60d4faf2d4cf923e02b80d531ced8e01c581fc8ae3d7271ae5abd6b14b91
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkzG6rAACgkQNQqtfCuFneNxIACfYIPlELNdjCRlMgKvMRLdOThS
-Un4AnA3KmJITL5wofo+6uVn0GAqpNsbH
-=du0K
+iF4EAREIAAYFAkzmSfMACgkQTwhj9JtAlp5tFgD+KIMr/NMWGVJt6XQW742nlWBj
+RB0oDqwGRw5kLZRiGJEBAJqFfNi3hRODgeRnEOipK9qFOyEGU4y8lD3P80MUvgbu
+=Xme9
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/usbutils/usbutils-0.91-r1.ebuild b/sys-apps/usbutils/usbutils-0.91-r1.ebuild
new file mode 100644
index 000000000000..56b1e1b080a4
--- /dev/null
+++ b/sys-apps/usbutils/usbutils-0.91-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/usbutils/usbutils-0.91-r1.ebuild,v 1.1 2010/11/19 09:58:45 vapier Exp $
+
+EAPI="2"
+
+inherit eutils autotools
+
+DESCRIPTION="USB enumeration utilities"
+HOMEPAGE="http://linux-usb.sourceforge.net/"
+SRC_URI="mirror://kernel/linux/utils/usb/usbutils/${P}.tar.gz
+	mirror://gentoo/${P}-libusb1.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="network-cron zlib"
+
+RDEPEND="virtual/libusb:1
+	zlib? ( sys-libs/zlib )"
+DEPEND="${DEPEND}
+	dev-util/pkgconfig"
+
+src_prepare() {
+	epatch "${WORKDIR}"/*.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--datarootdir=/usr/share \
+		--datadir=/usr/share/misc \
+		$(use_enable zlib)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	mv "${D}"/usr/sbin/update-usbids{.sh,} || die
+	newbin "${FILESDIR}"/usbmodules.sh usbmodules || die
+	dodoc AUTHORS ChangeLog NEWS README
+
+	use network-cron || return 0
+	exeinto /etc/cron.monthly
+	newexe "${FILESDIR}"/usbutils.cron update-usbids || die
+}