summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2018-04-30 04:54:32 +0200
committerLars Wendler <polynomial-c@gentoo.org>2018-04-30 04:54:32 +0200
commit386007da3c3f8b904dfeab74ab2b3bb825b1bad6 (patch)
treed69a711167704b79a33884fa135597139e827cd7
parentapp-emulation/wine-vanilla: Drop old (diff)
downloadgentoo-386007da.tar.gz
gentoo-386007da.tar.bz2
gentoo-386007da.zip
app-arch/xz-utils: Bumped live ebuild to EAPI-6.
Package-Manager: Portage-2.3.31, Repoman-2.3.9
-rw-r--r--app-arch/xz-utils/xz-utils-9999.ebuild13
1 files changed, 7 insertions, 6 deletions
diff --git a/app-arch/xz-utils/xz-utils-9999.ebuild b/app-arch/xz-utils/xz-utils-9999.ebuild
index e770562d7a4c..a58675ea9d08 100644
--- a/app-arch/xz-utils/xz-utils-9999.ebuild
+++ b/app-arch/xz-utils/xz-utils-9999.ebuild
@@ -4,9 +4,9 @@
# Remember: we cannot leverage autotools in this ebuild in order
# to avoid circular deps with autotools
-EAPI=5
+EAPI=6
-inherit eutils multilib toolchain-funcs libtool multilib-minimal
+inherit multilib toolchain-funcs libtool multilib-minimal
if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="https://git.tukaani.org/xz.git"
@@ -16,8 +16,9 @@ if [[ ${PV} == "9999" ]] ; then
else
MY_P="${PN/-utils}-${PV/_}"
SRC_URI="https://tukaani.org/xz/${MY_P}.tar.gz"
+ [[ "${PV}" == *_alpha* ]] || [[ "${PV}" == *_beta* ]] || \
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"
- S=${WORKDIR}/${MY_P}
+ S="${WORKDIR}/${MY_P}"
EXTRA_DEPEND=
fi
@@ -39,6 +40,7 @@ DEPEND="${RDEPEND}
RESTRICT="!extra-filters? ( test )"
src_prepare() {
+ default
if [[ ${PV} == "9999" ]] ; then
eautopoint
eautoreconf
@@ -77,9 +79,8 @@ multilib_src_install() {
}
multilib_src_install_all() {
- prune_libtool_files --all
- rm "${ED}"/usr/share/doc/xz/COPYING* || die
- mv "${ED}"/usr/share/doc/{xz,${PF}} || die
+ find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
+ rm "${ED%/}"/usr/share/doc/${PF}/COPYING* || die
}
pkg_preinst() {