| 1 |
commit: 386007da3c3f8b904dfeab74ab2b3bb825b1bad6 |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Apr 30 02:54:32 2018 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Apr 30 02:54:32 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=386007da |
| 7 |
|
| 8 |
app-arch/xz-utils: Bumped live ebuild to EAPI-6. |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.31, Repoman-2.3.9 |
| 11 |
|
| 12 |
app-arch/xz-utils/xz-utils-9999.ebuild | 13 +++++++------ |
| 13 |
1 file changed, 7 insertions(+), 6 deletions(-) |
| 14 |
|
| 15 |
diff --git a/app-arch/xz-utils/xz-utils-9999.ebuild b/app-arch/xz-utils/xz-utils-9999.ebuild |
| 16 |
index e770562d7a4..a58675ea9d0 100644 |
| 17 |
--- a/app-arch/xz-utils/xz-utils-9999.ebuild |
| 18 |
+++ b/app-arch/xz-utils/xz-utils-9999.ebuild |
| 19 |
@@ -4,9 +4,9 @@ |
| 20 |
# Remember: we cannot leverage autotools in this ebuild in order |
| 21 |
# to avoid circular deps with autotools |
| 22 |
|
| 23 |
-EAPI=5 |
| 24 |
+EAPI=6 |
| 25 |
|
| 26 |
-inherit eutils multilib toolchain-funcs libtool multilib-minimal |
| 27 |
+inherit multilib toolchain-funcs libtool multilib-minimal |
| 28 |
|
| 29 |
if [[ ${PV} == "9999" ]] ; then |
| 30 |
EGIT_REPO_URI="https://git.tukaani.org/xz.git" |
| 31 |
@@ -16,8 +16,9 @@ if [[ ${PV} == "9999" ]] ; then |
| 32 |
else |
| 33 |
MY_P="${PN/-utils}-${PV/_}" |
| 34 |
SRC_URI="https://tukaani.org/xz/${MY_P}.tar.gz" |
| 35 |
+ [[ "${PV}" == *_alpha* ]] || [[ "${PV}" == *_beta* ]] || \ |
| 36 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
| 37 |
- S=${WORKDIR}/${MY_P} |
| 38 |
+ S="${WORKDIR}/${MY_P}" |
| 39 |
EXTRA_DEPEND= |
| 40 |
fi |
| 41 |
|
| 42 |
@@ -39,6 +40,7 @@ DEPEND="${RDEPEND} |
| 43 |
RESTRICT="!extra-filters? ( test )" |
| 44 |
|
| 45 |
src_prepare() { |
| 46 |
+ default |
| 47 |
if [[ ${PV} == "9999" ]] ; then |
| 48 |
eautopoint |
| 49 |
eautoreconf |
| 50 |
@@ -77,9 +79,8 @@ multilib_src_install() { |
| 51 |
} |
| 52 |
|
| 53 |
multilib_src_install_all() { |
| 54 |
- prune_libtool_files --all |
| 55 |
- rm "${ED}"/usr/share/doc/xz/COPYING* || die |
| 56 |
- mv "${ED}"/usr/share/doc/{xz,${PF}} || die |
| 57 |
+ find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die |
| 58 |
+ rm "${ED%/}"/usr/share/doc/${PF}/COPYING* || die |
| 59 |
} |
| 60 |
|
| 61 |
pkg_preinst() { |
Archives