xz-utils: upgraded package to upstream
Upgraded app-arch/xz-utils to version 5.2.5.
BUG=None
TEST=CQ passes
Change-Id: I1da9c64aadde7009bb4096a6e0d18d4e9b6fe7c9
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/overlays/portage-stable/+/2923077
Tested-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Sergey Frolov <sfrolov@google.com>
Commit-Queue: Mike Frysinger <vapier@chromium.org>
diff --git a/app-arch/xz-utils/Manifest b/app-arch/xz-utils/Manifest
index 37aea0d..dc22299 100644
--- a/app-arch/xz-utils/Manifest
+++ b/app-arch/xz-utils/Manifest
@@ -1 +1 @@
-DIST xz-5.2.4.tar.gz 1572354 BLAKE2B 877242324afd3c7eb21d3a9414c53843f4d1bb089206e8e545e280b32ff5372f7fb4a1b0c27cb6fdf0d0a27a668e9772ecc3fffc181df95d081ca9c2e987b83b SHA512 e5bf6eb88365d2dbdc774db49261fb9fae0544ed297891fc20f1ed223f4072cb0357cbd98146ac35b6d29410a12b6739bbd111cd57d4a225bef255ed46988578
+DIST xz-5.2.5.tar.gz 1791345 BLAKE2B aded57324e129572c41646b3cc3b0b59a459452d9338d9245663b63dac2a463fb1f1b2b1d2d4ad3c09cb71fb8439df52cd94f24db99e782fc899b94a288a3043 SHA512 7443674247deda2935220fbc4dfc7665e5bb5a260be8ad858c8bd7d7b9f0f868f04ea45e62eb17c0a5e6a2de7c7500ad2d201e2d668c48ca29bd9eea5a73a3ce
diff --git a/app-arch/xz-utils/metadata.xml b/app-arch/xz-utils/metadata.xml
index 74270db..290b6fa 100644
--- a/app-arch/xz-utils/metadata.xml
+++ b/app-arch/xz-utils/metadata.xml
@@ -6,7 +6,7 @@
<name>Gentoo Base System</name>
</maintainer>
<use>
- <flag name='extra-filters'>Build additional filters that are not
+ <flag name="extra-filters">Build additional filters that are not
used in any of the default xz presets. This includes delta
and BCJ coders, additional match finders and SHA256 checks.</flag>
</use>
diff --git a/app-arch/xz-utils/xz-utils-5.2.4-r2.ebuild b/app-arch/xz-utils/xz-utils-5.2.5.ebuild
similarity index 78%
rename from app-arch/xz-utils/xz-utils-5.2.4-r2.ebuild
rename to app-arch/xz-utils/xz-utils-5.2.5.ebuild
index 8f26d57..4f769e1 100644
--- a/app-arch/xz-utils/xz-utils-5.2.4-r2.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.2.5.ebuild
@@ -1,25 +1,24 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Remember: we cannot leverage autotools in this ebuild in order
# to avoid circular deps with autotools
-EAPI=6
+EAPI=7
-inherit multilib toolchain-funcs libtool multilib-minimal preserve-libs usr-ldscript
+inherit libtool multilib multilib-minimal preserve-libs usr-ldscript
if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="https://git.tukaani.org/xz.git"
inherit git-r3 autotools
SRC_URI=""
- EXTRA_DEPEND="sys-devel/gettext dev-vcs/cvs >=sys-devel/libtool-2" #272880 286068
+ BDEPEND="sys-devel/gettext dev-vcs/cvs >=sys-devel/libtool-2" #272880 286068
else
MY_P="${PN/-utils}-${PV/_}"
SRC_URI="https://tukaani.org/xz/${MY_P}.tar.gz"
[[ "${PV}" == *_alpha* ]] || [[ "${PV}" == *_beta* ]] || \
KEYWORDS="*"
S="${WORKDIR}/${MY_P}"
- EXTRA_DEPEND=
fi
DESCRIPTION="utils for managing LZMA compressed files"
@@ -31,9 +30,9 @@
IUSE="elibc_FreeBSD +extra-filters nls static-libs +threads"
RDEPEND="!<app-arch/lzma-4.63
- !<app-arch/p7zip-4.57"
-DEPEND="${RDEPEND}
- ${EXTRA_DEPEND}"
+ !<app-arch/p7zip-4.57
+ !<app-i18n/man-pages-de-2.16"
+DEPEND="${RDEPEND}"
# Tests currently do not account for smaller feature set
RESTRICT="!extra-filters? ( test )"
@@ -68,6 +67,12 @@
)
fi
+ if [[ ${CHOST} == *-solaris* ]] ; then
+ # undo Solaris-based defaults pointing to /usr/xpg5/bin
+ myconf+=( --disable-path-for-script )
+ export gl_cv_posix_shell=${EPREFIX}/bin/sh
+ fi
+
use elibc_FreeBSD && export ac_cv_header_sha256_h=no #545714
ECONF_SOURCE="${S}" econf "${myconf[@]}"
}
@@ -78,11 +83,8 @@
}
multilib_src_install_all() {
- find "${ED}" -name '*.la' -delete || die
- if ! use static-libs ; then
- find "${ED}" -name "*.a" -delete || die
- fi
- rm "${ED%/}"/usr/share/doc/${PF}/COPYING* || die
+ find "${ED}" -type f -name '*.la' -delete || die
+ rm "${ED}"/usr/share/doc/${PF}/COPYING* || die
}
pkg_preinst() {
