From 5968411e28d563bbe1301e60cf96a7defc587eff Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Sat, 15 Dec 2018 22:34:54 +0100
Subject: [PATCH] avrdude: depends on libusb_compat

avrdude needs both libusb1 and libusb0 to work with all USB adapters.

Alsmo move the binary to the main directory as we don't plan to get this
building with gcc2.
---
 dev-embedded/avrdude/avrdude-6.3.recipe | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/dev-embedded/avrdude/avrdude-6.3.recipe b/dev-embedded/avrdude/avrdude-6.3.recipe
index fed3c32be..6e06bc89f 100644
--- a/dev-embedded/avrdude/avrdude-6.3.recipe
+++ b/dev-embedded/avrdude/avrdude-6.3.recipe
@@ -5,7 +5,7 @@ technique (ISP)."
 HOMEPAGE="http://www.nongnu.org/avrdude/"
 COPYRIGHT="2003-2016 Brian S. Dean"
 LICENSE="GNU GPL v2"
-REVISION="3"
+REVISION="4"
 SOURCE_URI="http://download.savannah.gnu.org/releases/avrdude/avrdude-$portVersion.tar.gz"
 CHECKSUM_SHA256="0f9f731b6394ca7795b88359689a7fa1fba818c6e1d962513eb28da670e0a196"
 PATCHES="avrdude-$portVersion.patchset"
@@ -19,7 +19,7 @@ GLOBAL_WRITABLE_FILES="
 
 PROVIDES="
 	avrdude$secondaryArchSuffix = $portVersion
-	cmd:avrdude$secondaryArchSuffix = $portVersion
+	cmd:avrdude = $portVersion
 	lib:libavrdude$secondaryArchSuffix = $portVersion
 	"
 REQUIRES="
@@ -27,6 +27,7 @@ REQUIRES="
 	lib:libelf$secondaryArchSuffix
 	lib:libftdi1$secondaryArchSuffix
 	lib:libusb_1.0$secondaryArchSuffix
+	lib:libusb_0.1$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
@@ -34,6 +35,7 @@ BUILD_REQUIRES="
 	devel:libelf$secondaryArchSuffix
 	devel:libftdi1$secondaryArchSuffix
 	devel:libusb_1.0$secondaryArchSuffix
+	devel:libusb_0.1$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
 	cmd:autoconf
@@ -55,7 +57,7 @@ BUILD()
 		export PKG_CONFIG_LIBDIR=/system/$relativeDevelopLibDir/pkgconfig/
 	fi
 	automake --add-missing
-	runConfigure ./configure
+	runConfigure --omit-dirs bindir ./configure --bindir=$prefix/bin
 	make $jobArgs
 }