| 1 |
commit: 92b62ddf118da45c8bb7c745c03563f8f163862c |
| 2 |
Author: Marty E. Plummer <hanetzer <AT> startmail <DOT> com> |
| 3 |
AuthorDate: Wed Mar 28 06:15:34 2018 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Apr 6 11:15:57 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92b62ddf |
| 7 |
|
| 8 |
dev-libs/libusb-compat: remove emul-linux-x86 references |
| 9 |
|
| 10 |
Also removed eutils, bumped EAPI to 6, and replaced prune_libtool_files |
| 11 |
with find -delete. Replaced epatch with PATCHES=() array. |
| 12 |
|
| 13 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
| 14 |
Closes: https://github.com/gentoo/gentoo/pull/7678 |
| 15 |
|
| 16 |
dev-libs/libusb-compat/files/libusb-0.1-ansi.patch | 2 -- |
| 17 |
.../libusb-compat/libusb-compat-0.1.5-r2.ebuild | 21 +++++++++------------ |
| 18 |
.../libusb-compat/libusb-compat-0.1.5-r3.ebuild | 21 +++++++++------------ |
| 19 |
3 files changed, 18 insertions(+), 26 deletions(-) |
| 20 |
|
| 21 |
diff --git a/dev-libs/libusb-compat/files/libusb-0.1-ansi.patch b/dev-libs/libusb-compat/files/libusb-0.1-ansi.patch |
| 22 |
index ba3436f6d7b..c04f7172f3e 100644 |
| 23 |
--- a/dev-libs/libusb-compat/files/libusb-0.1-ansi.patch |
| 24 |
+++ b/dev-libs/libusb-compat/files/libusb-0.1-ansi.patch |
| 25 |
@@ -1,5 +1,3 @@ |
| 26 |
-diff --git a/libusb/usb.h b/libusb/usb.h |
| 27 |
-index b7af749..c9726ed 100644 |
| 28 |
--- a/libusb/usb.h |
| 29 |
+++ b/libusb/usb.h |
| 30 |
@@ -27,8 +27,10 @@ |
| 31 |
|
| 32 |
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 |
| 33 |
index cdb691d5acf..a6572e20ab7 100644 |
| 34 |
--- a/dev-libs/libusb-compat/libusb-compat-0.1.5-r2.ebuild |
| 35 |
+++ b/dev-libs/libusb-compat/libusb-compat-0.1.5-r2.ebuild |
| 36 |
@@ -1,8 +1,9 @@ |
| 37 |
-# Copyright 1999-2014 Gentoo Foundation |
| 38 |
+# Copyright 1999-2018 Gentoo Foundation |
| 39 |
# Distributed under the terms of the GNU General Public License v2 |
| 40 |
|
| 41 |
-EAPI=5 |
| 42 |
-inherit eutils toolchain-funcs multilib-minimal |
| 43 |
+EAPI=6 |
| 44 |
+ |
| 45 |
+inherit toolchain-funcs multilib-minimal |
| 46 |
|
| 47 |
DESCRIPTION="Userspace access to USB devices (libusb-0.1 compat wrapper)" |
| 48 |
HOMEPAGE="http://libusb.sourceforge.net/" |
| 49 |
@@ -14,19 +15,15 @@ KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 |
| 50 |
IUSE="debug examples static-libs" |
| 51 |
|
| 52 |
RDEPEND=">=virtual/libusb-1-r1:1[${MULTILIB_USEDEP}] |
| 53 |
- !dev-libs/libusb:0 |
| 54 |
- abi_x86_32? ( |
| 55 |
- !<=app-emulation/emul-linux-x86-baselibs-20130224-r7 |
| 56 |
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] |
| 57 |
- )" |
| 58 |
+ !dev-libs/libusb:0" |
| 59 |
DEPEND="${RDEPEND} |
| 60 |
virtual/pkgconfig" |
| 61 |
|
| 62 |
DOCS="AUTHORS ChangeLog NEWS README" |
| 63 |
|
| 64 |
-src_prepare() { |
| 65 |
- epatch "${FILESDIR}"/${PN/-compat}-0.1-ansi.patch |
| 66 |
-} |
| 67 |
+PATCHES=( |
| 68 |
+ "${FILESDIR}"/${PN/-compat}-0.1-ansi.patch |
| 69 |
+) |
| 70 |
|
| 71 |
multilib_src_configure() { |
| 72 |
ECONF_SOURCE=${S} \ |
| 73 |
@@ -42,7 +39,7 @@ multilib_src_install() { |
| 74 |
} |
| 75 |
|
| 76 |
multilib_src_install_all() { |
| 77 |
- prune_libtool_files |
| 78 |
+ find "${ED}" -name '*.la' -delete || die |
| 79 |
einstalldocs |
| 80 |
|
| 81 |
if use examples; then |
| 82 |
|
| 83 |
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 |
| 84 |
index 0fb988759d9..4e620b5b8fb 100644 |
| 85 |
--- a/dev-libs/libusb-compat/libusb-compat-0.1.5-r3.ebuild |
| 86 |
+++ b/dev-libs/libusb-compat/libusb-compat-0.1.5-r3.ebuild |
| 87 |
@@ -1,8 +1,9 @@ |
| 88 |
-# Copyright 1999-2014 Gentoo Foundation |
| 89 |
+# Copyright 1999-2018 Gentoo Foundation |
| 90 |
# Distributed under the terms of the GNU General Public License v2 |
| 91 |
|
| 92 |
-EAPI=5 |
| 93 |
-inherit eutils toolchain-funcs multilib-minimal |
| 94 |
+EAPI=6 |
| 95 |
+ |
| 96 |
+inherit toolchain-funcs multilib-minimal |
| 97 |
|
| 98 |
DESCRIPTION="Userspace access to USB devices (libusb-0.1 compat wrapper)" |
| 99 |
HOMEPAGE="http://libusb.sourceforge.net/" |
| 100 |
@@ -14,19 +15,15 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~s |
| 101 |
IUSE="debug examples static-libs" |
| 102 |
|
| 103 |
RDEPEND=">=virtual/libusb-1-r1:1[${MULTILIB_USEDEP}] |
| 104 |
- !dev-libs/libusb:0 |
| 105 |
- abi_x86_32? ( |
| 106 |
- !<=app-emulation/emul-linux-x86-baselibs-20130224-r7 |
| 107 |
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] |
| 108 |
- )" |
| 109 |
+ !dev-libs/libusb:0" |
| 110 |
DEPEND="${RDEPEND} |
| 111 |
virtual/pkgconfig" |
| 112 |
|
| 113 |
DOCS="AUTHORS ChangeLog NEWS README" |
| 114 |
|
| 115 |
-src_prepare() { |
| 116 |
- epatch "${FILESDIR}"/${PN/-compat}-0.1-ansi.patch |
| 117 |
-} |
| 118 |
+PATCHES=( |
| 119 |
+ "${FILESDIR}"/${PN/-compat}-0.1-ansi.patch |
| 120 |
+) |
| 121 |
|
| 122 |
MULTILIB_CHOST_TOOLS=( |
| 123 |
/usr/bin/libusb-config |
| 124 |
@@ -46,7 +43,7 @@ multilib_src_install() { |
| 125 |
} |
| 126 |
|
| 127 |
multilib_src_install_all() { |
| 128 |
- prune_libtool_files |
| 129 |
+ find "${ED}" -name '*.la' -delete || die |
| 130 |
einstalldocs |
| 131 |
|
| 132 |
if use examples; then |
Archives