dev-libs/libusb-compat: remove emul-linux-x86 references

Also removed eutils, bumped EAPI to 6, and replaced prune_libtool_files
with find -delete. Replaced epatch with PATCHES=() array.

Package-Manager: Portage-2.3.24, Repoman-2.3.6
Closes: https://github.com/gentoo/gentoo/pull/7678

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 ba3436f6d7b4fecdaa933b10c43122d903e21693..c04f7172f3ed785c9eb6760e14a084ddc9ad252c 100644 (file)
--- 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 cdb691d5acf25882b8cda6f079ebb4cb0d7e0745..a6572e20ab755175d26a02a45974af5ab51aaffe 100644 (file)
--- 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 0fb988759d936e882ce73b0d70064be8a1b12062..4e620b5b8fb409dc28d146780fde8db1a723bd6f 100644 (file)
--- 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