4 files changed, 21 insertions, 29 deletions
diff --git a/dev-libs/libusb-compat/Manifest b/dev-libs/libusb-compat/Manifest
index d2c317632687..c3f9859ef6b0 100644
--- a/dev-libs/libusb-compat/Manifest
+++ b/dev-libs/libusb-compat/Manifest
@@ -1,5 +1,5 @@
-AUX libusb-0.1-ansi.patch 4461 BLAKE2B 025a91854a30dbee880eb27cc23756bc42af773ca25a82f5255d2917ca9948642410b14d11ef4f65ba52bd1c26e71b6ca14bc5327b7e941a1793f76deeee9032 SHA512 0256487ce4916e74154b18c9f57d88dc31344d0d047e70e7a0231c066747779e1455a422483f4d4ba182b57bd2be5038c9f091a8e0cef326128fee51efc04eb1
+AUX libusb-0.1-ansi.patch 4390 BLAKE2B c64a22623907ee5432d7f636642214221840df3721f226fedbe97da998e3503f9b6eb808e99a58f115f4bc1ac04a75b55928abd30786b9a6b5e3baa4b0f1edd9 SHA512 a3745567934bb8551b1fb0c7e43d5f749334ac763b05a23e15fb77af85034ca76fa6c65121c83cbfc44d82d6a879a43249148b1b894425956deb8eed3cf39e95
 DIST libusb-compat-0.1.5.tar.bz2 276769 BLAKE2B 66fa89c507d0454a587fa84d2ee2c34428963fa1770b44038fa45063466611ae263a3c790a167e5049393ef4d87073d1b16135d63cd0666256c3430bf36dae49 SHA512 fe63bd1c65e67588a83ebfdd329025ecf75f33f877fb80dd83eb528df057efb591e010416027f9054294504562299166e8e2811a7681fa1967a03baae9b88857
-EBUILD libusb-compat-0.1.5-r2.ebuild 1271 BLAKE2B ce9a6378324f2de24587c130ba87475551c207ef0e462cd74ff4cf93670a02e9dc78bff4681e2fc05bcbdd00a796600fbb0569296d32455b522bcb02b39b80a9 SHA512 6d0ab2dcc8a5b06f8bb78e83b7f46be1edd56b20acfdc19919686587c311e9cc65e7efa084407d1e38db0510fa8d43a5f1e1246cddc44ec134629612cf541e75
-EBUILD libusb-compat-0.1.5-r3.ebuild 1334 BLAKE2B cefc444f98e4ae5e1c51af4ee18f96f4db5fa9d93ed819b05a5a055b472b9d8675df8c6477c97076b6ca103990bae41100ddeb072dadc7611a9aa740afcdf8b4 SHA512 b008b9cc74a1a70cd34ba2ef93a2f50b0c27161f84c4c655d94e6c26991bf6e3a1ef051e8a6619b71982367f4b22a9f7ca7af887460ae5412cb1a3360ea16b99
+EBUILD libusb-compat-0.1.5-r2.ebuild 1143 BLAKE2B 3dbf21d533128c603b5dd5963e0201b62c7507d59c38687d16b3c14c93b309f8fdb28dd5feb392fb7a1fd6cc5cc000cf43d4ca595ccd2b16a6e002899a1e8186 SHA512 f5bd9084c0f64ac9852506a98ba38b612b8697743b031980edaeef7c2deac8f997ba3dd6f22ed372ac73b8488b1fa17eb6c6918e98ce3fcb5f53b4c41f498659
+EBUILD libusb-compat-0.1.5-r3.ebuild 1206 BLAKE2B 686518c59e3a51105e166e59f6d688f5fd8598fc5a1aa5cde02507c29f362b8a9aa32d190d2ef8f4e12dc7d25b06069e32a5b370d02072f175cfacfea205d60d SHA512 7307eedecc091e0fc2fdc721d853d79534d88c236ea9c47abaf5de4c2c4464a3aa7031458ca9f38327e5bab3228cdb301602387c4cb57a4369752478ffd8ba4f
 MISC metadata.xml 552 BLAKE2B b177713b8523c97bb9cbe9044b69207060489656f4369ebfd44051530f45eaac3500df7c3ba085a015ae8de96cc95777fa9ad1b900cdb3b1fc87395cd865feca SHA512 546ff60c99c3e575534cd660384429b4b4ea8c19fac29ab4ea8e432831f4c69452e08f50b70a038b233c2bd7ccd547e65ad25716d9521c0b5573f1b7d80fc052
diff --git a/dev-libs/libusb-compat/files/libusb-0.1-ansi.patch b/dev-libs/libusb-compat/files/libusb-0.1-ansi.patch
index ba3436f6d7b4..c04f7172f3ed 100644
--- a/dev-libs/libusb-compat/files/libusb-0.1-ansi.patch
+++ b/dev-libs/libusb-compat/files/libusb-0.1-ansi.patch
@@ -1,5 +1,3 @@
-diff --git a/libusb/usb.h b/libusb/usb.h
-index b7af749..c9726ed 100644
 --- a/libusb/usb.h
 +++ b/libusb/usb.h
 @@ -27,8 +27,10 @@
diff --git a/dev-libs/libusb-compat/libusb-compat-0.1.5-r2.ebuild b/dev-libs/libusb-compat/libusb-compat-0.1.5-r2.ebuild
index cdb691d5acf2..a6572e20ab75 100644
--- a/dev-libs/libusb-compat/libusb-compat-0.1.5-r2.ebuild
+++ b/dev-libs/libusb-compat/libusb-compat-0.1.5-r2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils toolchain-funcs multilib-minimal
+EAPI=6
+
+inherit toolchain-funcs multilib-minimal
 
 DESCRIPTION="Userspace access to USB devices (libusb-0.1 compat wrapper)"
 HOMEPAGE="http://libusb.sourceforge.net/"
@@ -14,19 +15,15 @@ KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
 IUSE="debug examples static-libs"
 
 RDEPEND=">=virtual/libusb-1-r1:1[${MULTILIB_USEDEP}]
-	!dev-libs/libusb:0
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20130224-r7
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)"
+	!dev-libs/libusb:0"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 DOCS="AUTHORS ChangeLog NEWS README"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PN/-compat}-0.1-ansi.patch
-}
+PATCHES=(
+	"${FILESDIR}"/${PN/-compat}-0.1-ansi.patch
+)
 
 multilib_src_configure() {
 	ECONF_SOURCE=${S} \
@@ -42,7 +39,7 @@ multilib_src_install() {
 }
 
 multilib_src_install_all() {
-	prune_libtool_files
+	find "${ED}" -name '*.la' -delete || die
 	einstalldocs
 
 	if use examples; then
diff --git a/dev-libs/libusb-compat/libusb-compat-0.1.5-r3.ebuild b/dev-libs/libusb-compat/libusb-compat-0.1.5-r3.ebuild
index 0fb988759d93..4e620b5b8fb4 100644
--- a/dev-libs/libusb-compat/libusb-compat-0.1.5-r3.ebuild
+++ b/dev-libs/libusb-compat/libusb-compat-0.1.5-r3.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils toolchain-funcs multilib-minimal
+EAPI=6
+
+inherit toolchain-funcs multilib-minimal
 
 DESCRIPTION="Userspace access to USB devices (libusb-0.1 compat wrapper)"
 HOMEPAGE="http://libusb.sourceforge.net/"
@@ -14,19 +15,15 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~s
 IUSE="debug examples static-libs"
 
 RDEPEND=">=virtual/libusb-1-r1:1[${MULTILIB_USEDEP}]
-	!dev-libs/libusb:0
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20130224-r7
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)"
+	!dev-libs/libusb:0"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 DOCS="AUTHORS ChangeLog NEWS README"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PN/-compat}-0.1-ansi.patch
-}
+PATCHES=(
+	"${FILESDIR}"/${PN/-compat}-0.1-ansi.patch
+)
 
 MULTILIB_CHOST_TOOLS=(
 	/usr/bin/libusb-config
@@ -46,7 +43,7 @@ multilib_src_install() {
 }
 
 multilib_src_install_all() {
-	prune_libtool_files
+	find "${ED}" -name '*.la' -delete || die
 	einstalldocs
 
 	if use examples; then