| 1 |
commit: aeb12092e4e5651165cb2d33611f83dc61b8f386 |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Mar 12 08:54:41 2020 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Mar 12 08:54:41 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aeb12092 |
| 7 |
|
| 8 |
app-arch/xz-utils: Bumped live ebuild to EAPI-7 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.93, Repoman-2.3.20 |
| 11 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
| 12 |
|
| 13 |
app-arch/xz-utils/xz-utils-9999.ebuild | 14 ++++++-------- |
| 14 |
1 file changed, 6 insertions(+), 8 deletions(-) |
| 15 |
|
| 16 |
diff --git a/app-arch/xz-utils/xz-utils-9999.ebuild b/app-arch/xz-utils/xz-utils-9999.ebuild |
| 17 |
index 4086a001c98..2aded48ce67 100644 |
| 18 |
--- a/app-arch/xz-utils/xz-utils-9999.ebuild |
| 19 |
+++ b/app-arch/xz-utils/xz-utils-9999.ebuild |
| 20 |
@@ -1,10 +1,10 @@ |
| 21 |
-# Copyright 1999-2019 Gentoo Authors |
| 22 |
+# Copyright 1999-2020 Gentoo Authors |
| 23 |
# Distributed under the terms of the GNU General Public License v2 |
| 24 |
|
| 25 |
# Remember: we cannot leverage autotools in this ebuild in order |
| 26 |
# to avoid circular deps with autotools |
| 27 |
|
| 28 |
-EAPI=6 |
| 29 |
+EAPI=7 |
| 30 |
|
| 31 |
inherit multilib toolchain-funcs libtool multilib-minimal preserve-libs usr-ldscript |
| 32 |
|
| 33 |
@@ -12,14 +12,13 @@ if [[ ${PV} == "9999" ]] ; then |
| 34 |
EGIT_REPO_URI="https://git.tukaani.org/xz.git" |
| 35 |
inherit git-r3 autotools |
| 36 |
SRC_URI="" |
| 37 |
- EXTRA_DEPEND="sys-devel/gettext dev-vcs/cvs >=sys-devel/libtool-2" #272880 286068 |
| 38 |
+ BDEPEND="sys-devel/gettext dev-vcs/cvs >=sys-devel/libtool-2" #272880 286068 |
| 39 |
else |
| 40 |
MY_P="${PN/-utils}-${PV/_}" |
| 41 |
SRC_URI="https://tukaani.org/xz/${MY_P}.tar.gz" |
| 42 |
[[ "${PV}" == *_alpha* ]] || [[ "${PV}" == *_beta* ]] || \ |
| 43 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
| 44 |
S="${WORKDIR}/${MY_P}" |
| 45 |
- EXTRA_DEPEND= |
| 46 |
fi |
| 47 |
|
| 48 |
DESCRIPTION="utils for managing LZMA compressed files" |
| 49 |
@@ -32,8 +31,7 @@ IUSE="elibc_FreeBSD +extra-filters nls static-libs +threads" |
| 50 |
|
| 51 |
RDEPEND="!<app-arch/lzma-4.63 |
| 52 |
!<app-arch/p7zip-4.57" |
| 53 |
-DEPEND="${RDEPEND} |
| 54 |
- ${EXTRA_DEPEND}" |
| 55 |
+DEPEND="${RDEPEND}" |
| 56 |
|
| 57 |
# Tests currently do not account for smaller feature set |
| 58 |
RESTRICT="!extra-filters? ( test )" |
| 59 |
@@ -78,8 +76,8 @@ multilib_src_install() { |
| 60 |
} |
| 61 |
|
| 62 |
multilib_src_install_all() { |
| 63 |
- find "${ED}" -name '*.la' -delete || die |
| 64 |
- rm "${ED%/}"/usr/share/doc/${PF}/COPYING* || die |
| 65 |
+ find "${ED}" -type f -name '*.la' -delete || die |
| 66 |
+ rm "${ED}"/usr/share/doc/${PF}/COPYING* || die |
| 67 |
} |
| 68 |
|
| 69 |
pkg_preinst() { |
Archives