3 files changed, 15 insertions, 68 deletions
diff --git a/dev-libs/libusb-compat/Manifest b/dev-libs/libusb-compat/Manifest
index 9c6845599a6b..b3524a13510c 100644
--- a/dev-libs/libusb-compat/Manifest
+++ b/dev-libs/libusb-compat/Manifest
@@ -1,5 +1,4 @@
 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 1119 BLAKE2B cac1767551107388bcaec8f195c2f27004b4f3595b6f3a5c26cca94408d0277e49135376b6fd47d299b0a527cccd635aa365c6fb9752895f0188e1cae5d33e2d SHA512 1a289d196dcbaa89e071c853d46d2835211bc9d998112b6a1c4a6cc7a84451b84f5d61109c0ff0826e6621e84bc2e3913306799396dbe0f1522793a23b9abd76
-EBUILD libusb-compat-0.1.5-r3.ebuild 1169 BLAKE2B 9091b1e63697a377fc9034d42c206f8a5d9f3959cbd5b5cdec3ada74c5be3c4141f1b68aa7f35d2bfaea84dbeb688b4ac2b7461618a77f1bc30e28267277a3a3 SHA512 73ec3df96ecb5192c276dab63b1a76cf13d8dfd0355b1a2c3eca3e45a49de4900ccaf5202cb7c4c4f23487f2d3bb579f8624f0dc746bae69b1b820b71c641653
+EBUILD libusb-compat-0.1.5-r3.ebuild 1090 BLAKE2B 7caddb67a8b91c8e58d81e4ef3a098780a0e792ca72614a91c510ffbc98b742054d83ec1636e1420bfb0e64548150c68c67fbc1947fda059f5f88d85ad47d2c1 SHA512 490e1ebc486137b56573a2db4b8f0cb07b7f2661f4f2438ba7bbf7102367e6e040152b0a1768a1a087cc52f604599a7941003f25ba743e0bfe6b062f160ebac9
 MISC metadata.xml 333 BLAKE2B ee2452df6eb77285ba7e918f882c543d413656aaf0a199ac369ef60d25b8790fa37e320101f9645d5042ed04826e00922d5d38752b31492deda2cc78e7c41b49 SHA512 10f5333485c01d415c73f195e22785a9584d9dcf9662317605d9c6f14507863be5769457d2080137d31ad79fd0e825b9f02ec4160c40a5347591726843148705
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
deleted file mode 100644
index bb832fd04764..000000000000
--- a/dev-libs/libusb-compat/libusb-compat-0.1.5-r2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib-minimal usr-ldscript
-
-DESCRIPTION="Userspace access to USB devices (libusb-0.1 compat wrapper)"
-HOMEPAGE="http://libusb.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN/-compat}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="debug examples static-libs"
-
-RDEPEND=">=virtual/libusb-1-r1:1[${MULTILIB_USEDEP}]
-	!dev-libs/libusb:0"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-PATCHES=(
-	"${FILESDIR}"/${PN/-compat}-0.1-ansi.patch
-)
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" \
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable debug debug-log)
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-
-	gen_usr_ldscript -a usb
-}
-
-multilib_src_install_all() {
-	find "${ED}" -name '*.la' -delete || die
-	einstalldocs
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins examples/*.c
-	fi
-}
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 d2650c1bb749..caafc1eefa13 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,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit multilib-minimal usr-ldscript
+inherit usr-ldscript multilib-minimal
 
 DESCRIPTION="Userspace access to USB devices (libusb-0.1 compat wrapper)"
 HOMEPAGE="http://libusb.sourceforge.net/"
@@ -12,27 +12,23 @@ SRC_URI="mirror://sourceforge/${PN/-compat}/${P}.tar.bz2"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="debug examples static-libs"
+IUSE="debug examples"
 
-RDEPEND=">=virtual/libusb-1-r1:1[${MULTILIB_USEDEP}]
+RDEPEND="
+	>=virtual/libusb-1-r1:1[${MULTILIB_USEDEP}]
 	!dev-libs/libusb:0"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
-DOCS="AUTHORS ChangeLog NEWS README"
-
-PATCHES=(
-	"${FILESDIR}"/${PN/-compat}-0.1-ansi.patch
-)
+PATCHES=( "${FILESDIR}"/${PN/-compat}-0.1-ansi.patch )
 
 MULTILIB_CHOST_TOOLS=(
 	/usr/bin/libusb-config
 )
 
 multilib_src_configure() {
-	ECONF_SOURCE="${S}" \
-	econf \
-		$(use_enable static-libs static) \
+	ECONF_SOURCE="${S}" econf \
+		--disable-static \
 		$(use_enable debug debug-log)
 }
 
@@ -43,11 +39,12 @@ multilib_src_install() {
 }
 
 multilib_src_install_all() {
-	find "${ED}" -name '*.la' -delete || die
 	einstalldocs
 
 	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins examples/*.c
+		docinto examples
+		dodoc examples/*.c
 	fi
+
+	find "${ED}" -name '*.la' -delete || die
 }