From 082a0454491211951f5f89f325f0abbc51472979 Mon Sep 17 00:00:00 2001
From: Bob <Vidrep@telus.net>
Date: Sat, 28 Jan 2017 12:08:56 -0700
Subject: [PATCH] libusb: bump to 1.0.21. (#1119)

---
 ...usb-1.0.20.recipe => libusb-1.0.21.recipe} | 28 +++++++++++--------
 1 file changed, 17 insertions(+), 11 deletions(-)
 rename dev-libs/libusb/{libusb-1.0.20.recipe => libusb-1.0.21.recipe} (74%)

diff --git a/dev-libs/libusb/libusb-1.0.20.recipe b/dev-libs/libusb/libusb-1.0.21.recipe
similarity index 74%
rename from dev-libs/libusb/libusb-1.0.20.recipe
rename to dev-libs/libusb/libusb-1.0.21.recipe
index daf268cb5..fc08ad8eb 100644
--- a/dev-libs/libusb/libusb-1.0.20.recipe
+++ b/dev-libs/libusb/libusb-1.0.21.recipe
@@ -11,20 +11,21 @@ HOMEPAGE="http://libusb.info/"
 COPYRIGHT="2001 Johannes Erdfelt
 	2007-2009 Daniel Drake
 	2010-2012 Peter Stuge
-	2008-2013 Nathan Hjelm
+	2008-2016 Nathan Hjelm
 	2009-2013 Pete Batard
 	2009-2013 Ludovic Rousseau
 	2010-2012 Michael Plante
 	2011-2013 Hans de Goede
 	2012-2013 Martin Pieuchot
-	2012-2013 Toby Gray"
+	2012-2013 Toby Gray
+	2013-2015 Chris Dickens"
 LICENSE="GNU LGPL v2.1"
-REVISION="2"
-SOURCE_URI="https://github.com/libusb/libusb/archive/v1.0.20.tar.gz"
+REVISION="1"
+SOURCE_URI="https://github.com/libusb/libusb/archive/v$portVersion.tar.gz"
 SOURCE_FILENAME="libusb-$portVersion.tar.gz"
-CHECKSUM_SHA256="03c1116c965e9953551779c9aac1522d7bd8163bff8d666b117b7fad09eec859"
+CHECKSUM_SHA256="1a5b08c05bc5e38c81c2d59c29954d5916646f4ff46f51381b3f624384e4ac01"
 ARCHITECTURES="x86 x86_64 x86_gcc2"
-SECONDARY_ARCHITECTURES="x86"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
 	libusb$secondaryArchSuffix = $portVersion
@@ -36,10 +37,10 @@ REQUIRES="
 
 PROVIDES_devel="
 	libusb${secondaryArchSuffix}_devel = $portVersion
-	devel:libusb_1.0${secondaryArchSuffix} = 0.1.0 compat >= 0
+	devel:libusb_1.0$secondaryArchSuffix = 0.1.0 compat >= 0
 	"
 REQUIRES_devel="
-	libusb${secondaryArchSuffix} == $portVersion base
+	libusb$secondaryArchSuffix == $portVersion base
 	"
 
 BUILD_REQUIRES="
@@ -51,7 +52,7 @@ BUILD_PREREQUIRES="
 	cmd:find
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
-	cmd:libtool
+	cmd:libtoolize$secondaryArchSuffix
 	cmd:make
 	cmd:sed
 	"
@@ -67,13 +68,18 @@ BUILD()
 INSTALL()
 {
 	make install
-	rm $libDir/*.la
+	rm $libDir/libusb-1.0.la
 
 	# set up the develop directory correctly
-	prepareInstalledDevelLibs libusb-1.0
+	prepareInstalledDevelLib libusb-1.0
 	fixPkgconfig
 
 	# devel package
 	packageEntries devel \
 		$developDir
 }
+
+TEST()
+{
+	make check
+}