mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-16 09:26:58 +02:00
app-arch/xz-utils: Sync with Gentoo upstream; updates to 5.2.5
Signed-off-by: Sayan Chowdhury <sayan@kinvolk.io>
This commit is contained in:
Sayan Chowdhury
parent
4edec94842
commit
b0968259d0
@ -1,2 +1 @@
|
||||
DIST xz-5.2.3.tar.gz 1490665 BLAKE2B 470791a67fe635165559b0364c9c0e968f3fc32ba7af53d0173d620ca65c68428e0d4d18ada341a063ea3eabb1b51a71cf873218ca0622fd41e01c20a6f04078 SHA512 a5eb4f707cf31579d166a6f95dbac45cf7ea181036d1632b4f123a4072f502f8d57cd6e7d0588f0bf831a07b8fc4065d26589a25c399b95ddcf5f73435163da6
|
||||
DIST xz-5.2.4.tar.gz 1572354 BLAKE2B 877242324afd3c7eb21d3a9414c53843f4d1bb089206e8e545e280b32ff5372f7fb4a1b0c27cb6fdf0d0a27a668e9772ecc3fffc181df95d081ca9c2e987b83b SHA512 e5bf6eb88365d2dbdc774db49261fb9fae0544ed297891fc20f1ed223f4072cb0357cbd98146ac35b6d29410a12b6739bbd111cd57d4a225bef255ed46988578
|
||||
DIST xz-5.2.5.tar.gz 1791345 BLAKE2B aded57324e129572c41646b3cc3b0b59a459452d9338d9245663b63dac2a463fb1f1b2b1d2d4ad3c09cb71fb8439df52cd94f24db99e782fc899b94a288a3043 SHA512 7443674247deda2935220fbc4dfc7665e5bb5a260be8ad858c8bd7d7b9f0f868f04ea45e62eb17c0a5e6a2de7c7500ad2d201e2d668c48ca29bd9eea5a73a3ce
|
||||
|
||||
@ -6,8 +6,11 @@
|
||||
<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>
|
||||
<upstream>
|
||||
<remote-id type="cpe">cpe:/a:tukaani:xz</remote-id>
|
||||
</upstream>
|
||||
</pkgmetadata>
|
||||
|
||||
@ -1,91 +0,0 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# 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=5
|
||||
|
||||
inherit multilib toolchain-funcs libtool multilib-minimal preserve-libs
|
||||
|
||||
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
|
||||
else
|
||||
MY_P="${PN/-utils}-${PV/_}"
|
||||
SRC_URI="https://tukaani.org/xz/${MY_P}.tar.gz"
|
||||
KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
S=${WORKDIR}/${MY_P}
|
||||
EXTRA_DEPEND=
|
||||
fi
|
||||
|
||||
DESCRIPTION="utils for managing LZMA compressed files"
|
||||
HOMEPAGE="https://tukaani.org/xz/"
|
||||
|
||||
# See top-level COPYING file as it outlines the various pieces and their licenses.
|
||||
LICENSE="public-domain LGPL-2.1+ GPL-2+"
|
||||
SLOT="0"
|
||||
IUSE="elibc_FreeBSD +extra-filters nls static-libs +threads"
|
||||
|
||||
RDEPEND="!<app-arch/lzma-4.63
|
||||
!app-arch/lzma-utils
|
||||
!<app-arch/p7zip-4.57"
|
||||
DEPEND="${RDEPEND}
|
||||
${EXTRA_DEPEND}"
|
||||
|
||||
# Tests currently do not account for smaller feature set
|
||||
RESTRICT="!extra-filters? ( test )"
|
||||
|
||||
src_prepare() {
|
||||
if [[ ${PV} == "9999" ]] ; then
|
||||
eautopoint
|
||||
eautoreconf
|
||||
else
|
||||
elibtoolize # to allow building shared libs on Solaris/x64
|
||||
fi
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
local myconf=(
|
||||
$(use_enable nls)
|
||||
$(use_enable threads)
|
||||
$(use_enable static-libs static)
|
||||
)
|
||||
multilib_is_native_abi ||
|
||||
myconf+=( --disable-{xz,xzdec,lzmadec,lzmainfo,lzma-links,scripts} )
|
||||
if ! use extra-filters; then
|
||||
myconf+=(
|
||||
# LZMA1 + LZMA2 for standard .lzma & .xz files
|
||||
--enable-encoders=lzma1,lzma2
|
||||
--enable-decoders=lzma1,lzma2
|
||||
# those are used by default, depending on preset
|
||||
--enable-match-finders=hc3,hc4,bt4
|
||||
# CRC64 is used by default, though some (old?) files use CRC32
|
||||
--enable-checks=crc32,crc64
|
||||
)
|
||||
fi
|
||||
|
||||
use elibc_FreeBSD && export ac_cv_header_sha256_h=no #545714
|
||||
ECONF_SOURCE="${S}" econf "${myconf[@]}"
|
||||
}
|
||||
|
||||
multilib_src_install() {
|
||||
default
|
||||
gen_usr_ldscript -a lzma
|
||||
}
|
||||
|
||||
multilib_src_install_all() {
|
||||
prune_libtool_files --all
|
||||
rm "${ED}"/usr/share/doc/xz/COPYING* || die
|
||||
mv "${ED}"/usr/share/doc/{xz,${PF}} || die
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
preserve_old_lib /usr/$(get_libdir)/liblzma$(get_libname 0)
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
preserve_old_lib_notify /usr/$(get_libdir)/liblzma$(get_libname 0)
|
||||
}
|
||||
@ -1,25 +1,24 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# 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
|
||||
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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
EXTRA_DEPEND=
|
||||
fi
|
||||
|
||||
DESCRIPTION="utils for managing LZMA compressed files"
|
||||
@ -28,13 +27,12 @@ HOMEPAGE="https://tukaani.org/xz/"
|
||||
# See top-level COPYING file as it outlines the various pieces and their licenses.
|
||||
LICENSE="public-domain LGPL-2.1+ GPL-2+"
|
||||
SLOT="0"
|
||||
IUSE="elibc_FreeBSD +extra-filters nls static-libs +threads"
|
||||
IUSE="elibc_FreeBSD +extra-filters nls static-libs"
|
||||
|
||||
RDEPEND="!<app-arch/lzma-4.63
|
||||
!app-arch/lzma-utils
|
||||
!<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 )"
|
||||
@ -51,8 +49,8 @@ src_prepare() {
|
||||
|
||||
multilib_src_configure() {
|
||||
local myconf=(
|
||||
--enable-threads
|
||||
$(use_enable nls)
|
||||
$(use_enable threads)
|
||||
$(use_enable static-libs static)
|
||||
)
|
||||
multilib_is_native_abi ||
|
||||
@ -69,6 +67,12 @@ multilib_src_configure() {
|
||||
)
|
||||
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[@]}"
|
||||
}
|
||||
@ -79,11 +83,8 @@ multilib_src_install() {
|
||||
}
|
||||
|
||||
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() {
|
||||
@ -1,25 +1,24 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# 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
|
||||
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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
EXTRA_DEPEND=
|
||||
fi
|
||||
|
||||
DESCRIPTION="utils for managing LZMA compressed files"
|
||||
@ -28,13 +27,12 @@ HOMEPAGE="https://tukaani.org/xz/"
|
||||
# See top-level COPYING file as it outlines the various pieces and their licenses.
|
||||
LICENSE="public-domain LGPL-2.1+ GPL-2+"
|
||||
SLOT="0"
|
||||
IUSE="elibc_FreeBSD +extra-filters nls static-libs +threads"
|
||||
IUSE="elibc_FreeBSD +extra-filters nls static-libs"
|
||||
|
||||
RDEPEND="!<app-arch/lzma-4.63
|
||||
!app-arch/lzma-utils
|
||||
!<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 )"
|
||||
@ -51,8 +49,8 @@ src_prepare() {
|
||||
|
||||
multilib_src_configure() {
|
||||
local myconf=(
|
||||
--enable-threads
|
||||
$(use_enable nls)
|
||||
$(use_enable threads)
|
||||
$(use_enable static-libs static)
|
||||
)
|
||||
multilib_is_native_abi ||
|
||||
@ -69,6 +67,12 @@ multilib_src_configure() {
|
||||
)
|
||||
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[@]}"
|
||||
}
|
||||
@ -79,8 +83,8 @@ multilib_src_install() {
|
||||
}
|
||||
|
||||
multilib_src_install_all() {
|
||||
find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
|
||||
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() {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user