libusb-compat: refresh upstream version
This gets us newer EAPI=7.
BUG=b:187789240
TEST=CQ passes
Change-Id: I17a6d1a5eca2e6dd25c02d6bd903619d47905548
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/overlays/portage-stable/+/3183042
Tested-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Sloan Johnson <sloanjohnson@google.com>
Reviewed-by: Sergey Frolov <sfrolov@google.com>
Commit-Queue: Sergey Frolov <sfrolov@google.com>
Auto-Submit: Mike Frysinger <vapier@chromium.org>
diff --git a/dev-libs/libusb-compat/Manifest b/dev-libs/libusb-compat/Manifest
index 6c727ae..ab3d9e6 100644
--- a/dev-libs/libusb-compat/Manifest
+++ b/dev-libs/libusb-compat/Manifest
@@ -1 +1 @@
-DIST libusb-compat-0.1.5.tar.bz2 276769 SHA256 404ef4b6b324be79ac1bfb3d839eac860fbc929e6acb1ef88793a6ea328bc55a SHA512 fe63bd1c65e67588a83ebfdd329025ecf75f33f877fb80dd83eb528df057efb591e010416027f9054294504562299166e8e2811a7681fa1967a03baae9b88857 WHIRLPOOL 2f84934c28980bee9e8ca69d284303cdbaf4cb72cee02108825bd7366bfff7f6365db5ffee8de024eb85dee571eccc47acea6a25d6835f0fefb0ad8a77d05045
+DIST libusb-compat-0.1.5.tar.bz2 276769 BLAKE2B 66fa89c507d0454a587fa84d2ee2c34428963fa1770b44038fa45063466611ae263a3c790a167e5049393ef4d87073d1b16135d63cd0666256c3430bf36dae49 SHA512 fe63bd1c65e67588a83ebfdd329025ecf75f33f877fb80dd83eb528df057efb591e010416027f9054294504562299166e8e2811a7681fa1967a03baae9b88857
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 ba3436f..c04f717 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-r3.ebuild b/dev-libs/libusb-compat/libusb-compat-0.1.5-r3.ebuild
index 917c04a..daaf602 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-2014 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libusb-compat/libusb-compat-0.1.5-r3.ebuild,v 1.1 2014/05/21 12:25:53 mgorny Exp $
-EAPI=5
-inherit eutils toolchain-funcs multilib-minimal
+EAPI=7
+
+inherit usr-ldscript multilib-minimal
DESCRIPTION="Userspace access to USB devices (libusb-0.1 compat wrapper)"
HOMEPAGE="http://libusb.sourceforge.net/"
@@ -12,46 +12,39 @@
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="*"
-IUSE="debug examples static-libs"
+IUSE="debug examples"
-RDEPEND="virtual/libusb: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(-)]
- )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
+RDEPEND="
+ >=virtual/libusb-1-r1:1[${MULTILIB_USEDEP}]
+ !dev-libs/libusb:0"
+DEPEND="${RDEPEND}"
+BDEPEND="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
)
multilib_src_configure() {
- ECONF_SOURCE=${S} \
- econf \
- $(use_enable static-libs static) \
+ ECONF_SOURCE="${S}" econf \
+ --disable-static \
$(use_enable debug debug-log)
}
multilib_src_install() {
emake DESTDIR="${D}" install
- multilib_is_native_abi && gen_usr_ldscript -a usb
+ gen_usr_ldscript -a usb
}
multilib_src_install_all() {
- prune_libtool_files
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
}
diff --git a/dev-libs/libusb-compat/metadata.xml b/dev-libs/libusb-compat/metadata.xml
index bff000f..559342c 100644
--- a/dev-libs/libusb-compat/metadata.xml
+++ b/dev-libs/libusb-compat/metadata.xml
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>base-system</herd>
- <herd>proxy-maintainers</herd>
- <maintainer>
- <email>peter@stuge.se</email>
- <name>Peter Stuge</name>
+ <maintainer type="project">
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
</maintainer>
+ <upstream>
+ <remote-id type="sourceforge">libusb</remote-id>
+ </upstream>
</pkgmetadata>
