commit:     65f6685b82458f2aea81522ba23f51a3e6d78ecf
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 21 03:19:38 2025 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Mar 21 04:12:12 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65f6685b

app-arch/libarchive: Bump to 3.7.8

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 app-arch/libarchive/Manifest                |   2 +
 app-arch/libarchive/libarchive-3.7.8.ebuild | 173 ++++++++++++++++++++++++++++
 2 files changed, 175 insertions(+)

diff --git a/app-arch/libarchive/Manifest b/app-arch/libarchive/Manifest
index 85e83f72da36..bdb2cce2193c 100644
--- a/app-arch/libarchive/Manifest
+++ b/app-arch/libarchive/Manifest
@@ -1,2 +1,4 @@
 DIST libarchive-3.7.7.tar.xz 5480580 BLAKE2B 
e118c693f7a78e86ab868fc6c2c77beba539cf5c7d5999e270cdceb225e9f85c68c938ec6ce3a33f75b2a44a6f7debe2c280d2573c1bcf05806300e8dce1a4f0
 SHA512 
2524f71f4c2ebc254a1927279be3394e820d0a0c6dec7ef835a862aa08c35756edaa4208bcdc710dd092872b59c200b555b78670372e2830822e278ff1ec4e4a
 DIST libarchive-3.7.7.tar.xz.asc 659 BLAKE2B 
066d97312ded566e2c96ffc4603477fc829bcf17dcc057249dad51a0abea7aa5559691c0c25b581212168f8442db028a2dcc34148c648e973450fcb9dd5e35af
 SHA512 
9f532df76bc381b40d7454a7bbbab85e34a646167ee7ca197fae45c713002e32f40e2b2871bc4a0d7149df19e69e2079efd9ab2f22eccf959b203604293d6094
+DIST libarchive-3.7.8.tar.xz 5493312 BLAKE2B 
ba058b2fa2afbfe53127d6ffd0a7ab00d9e8faf62340ae2eb8871a0ca232c2de482dbff2c4eedf2c45d944eb555123d765c462818158046bb72951f6421d9ea0
 SHA512 
a2b6c8c337e75bcce73126c30a3b564dc586df973780d9c7d5a9eed693dbe3779bf762b64c49c47203c2768c92a4a7d2dc8c0445b1dc398eafd2d58b0ba5aae6
+DIST libarchive-3.7.8.tar.xz.asc 659 BLAKE2B 
2050214592b0add7cbd758b815c4289a8760bfb2e5b5db581afdbe741d348252b73f99919641cacd908b586cf4f8fc30a591d88b869bd607adc837251d8fbd4e
 SHA512 
3f1d70318f5e2369fa59e94f91bf8473630a448ded11e2ff3502657380221b9e11e849dc98ba0806c3110c7267cee251f7d681db27751e2a45a948f6ad558404

diff --git a/app-arch/libarchive/libarchive-3.7.8.ebuild 
b/app-arch/libarchive/libarchive-3.7.8.ebuild
new file mode 100644
index 000000000000..442c8017e3e7
--- /dev/null
+++ b/app-arch/libarchive/libarchive-3.7.8.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit libtool multilib-minimal toolchain-funcs verify-sig
+
+DESCRIPTION="Multi-format archive and compression library"
+HOMEPAGE="
+       https://www.libarchive.org/
+       https://github.com/libarchive/libarchive/
+"
+SRC_URI="
+       https://www.libarchive.de/downloads/${P}.tar.xz
+       verify-sig? ( https://www.libarchive.de/downloads/${P}.tar.xz.asc )
+"
+
+LICENSE="BSD BSD-2 BSD-4 public-domain"
+SLOT="0/13"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
+IUSE="
+       acl blake2 +bzip2 +e2fsprogs expat +iconv lz4 +lzma lzo nettle
+       static-libs test xattr +zstd
+"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+       sys-libs/zlib:=[${MULTILIB_USEDEP}]
+       acl? ( virtual/acl:=[${MULTILIB_USEDEP}] )
+       blake2? ( app-crypt/libb2:=[${MULTILIB_USEDEP}] )
+       bzip2? ( app-arch/bzip2:=[${MULTILIB_USEDEP}] )
+       expat? ( dev-libs/expat:=[${MULTILIB_USEDEP}] )
+       !expat? ( dev-libs/libxml2:=[${MULTILIB_USEDEP}] )
+       iconv? ( virtual/libiconv:=[${MULTILIB_USEDEP}] )
+       dev-libs/openssl:=[${MULTILIB_USEDEP}]
+       lz4? ( >=app-arch/lz4-0_p131:=[${MULTILIB_USEDEP}] )
+       lzma? ( >=app-arch/xz-utils-5.2.5-r1:=[${MULTILIB_USEDEP}] )
+       lzo? ( >=dev-libs/lzo-2:=[${MULTILIB_USEDEP}] )
+       nettle? ( dev-libs/nettle:=[${MULTILIB_USEDEP}] )
+       zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+       kernel_linux? (
+               virtual/os-headers
+               e2fsprogs? ( sys-fs/e2fsprogs[${MULTILIB_USEDEP}] )
+       )
+       test? (
+               app-arch/lrzip
+               app-arch/lz4
+               app-arch/lzip
+               app-arch/lzop
+               app-arch/xz-utils
+               app-arch/zstd
+               lzma? ( app-arch/xz-utils[extra-filters(+)] )
+       )
+"
+BDEPEND="
+       verify-sig? ( >=sec-keys/openpgp-keys-libarchive-20221209 )
+       elibc_musl? ( sys-libs/queue-standalone )
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libarchive.org.asc
+
+# false positives (checks for libc-defined hash functions)
+QA_CONFIG_IMPL_DECL_SKIP=(
+       SHA256_Init SHA256_Update SHA256_Final
+       SHA384_Init SHA384_Update SHA384_Final
+       SHA512_Init SHA512_Update SHA512_Final
+)
+
+PATCHES=(
+       # https://github.com/libarchive/libarchive/issues/2069
+       # (we can simply update the command since we don't support old lrzip)
+       "${FILESDIR}/${PN}-3.7.2-lrzip.patch"
+)
+
+src_prepare() {
+       default
+
+       # Needed for flags to be respected w/ LTO
+       elibtoolize
+}
+
+multilib_src_configure() {
+       export ac_cv_header_ext2fs_ext2_fs_h=$(usex e2fsprogs) #354923
+
+       local myconf=(
+               $(use_enable acl)
+               $(use_enable static-libs static)
+               $(use_enable xattr)
+               $(use_with blake2 libb2)
+               $(use_with bzip2 bz2lib)
+               $(use_with expat)
+               $(use_with !expat xml2)
+               $(use_with iconv)
+               $(use_with lz4)
+               $(use_with lzma)
+               $(use_with lzo lzo2)
+               $(use_with nettle)
+               --with-zlib
+               $(use_with zstd)
+
+               # Windows-specific
+               --without-cng
+       )
+       if multilib_is_native_abi ; then
+               myconf+=(
+                       --enable-bsdcat="$(tc-is-static-only && echo static || 
echo shared)"
+                       --enable-bsdcpio="$(tc-is-static-only && echo static || 
echo shared)"
+                       --enable-bsdtar="$(tc-is-static-only && echo static || 
echo shared)"
+                       --enable-bsdunzip="$(tc-is-static-only && echo static 
|| echo shared)"
+               )
+       else
+               myconf+=(
+                       --disable-bsdcat
+                       --disable-bsdcpio
+                       --disable-bsdtar
+                       --disable-bsdunzip
+               )
+       fi
+
+       ECONF_SOURCE="${S}" econf "${myconf[@]}"
+}
+
+multilib_src_compile() {
+       if multilib_is_native_abi ; then
+               emake
+       else
+               emake libarchive.la
+       fi
+}
+
+src_test() {
+       mkdir -p "${T}"/bin || die
+       # tests fail when lbzip2[symlink] is used in place of ref bunzip2
+       ln -s "${BROOT}/bin/bunzip2" "${T}"/bin || die
+       # workaround lrzip broken on 32-bit arches with >= 10 threads
+       # https://bugs.gentoo.org/927766
+       cat > "${T}"/bin/lrzip <<-EOF || die
+               #!/bin/sh
+               exec "$(type -P lrzip)" -p1 "\${@}"
+       EOF
+       chmod +x "${T}/bin/lrzip" || die
+       local -x PATH=${T}/bin:${PATH}
+       multilib-minimal_src_test
+}
+
+multilib_src_test() {
+       # sandbox is breaking long symlink behavior
+       local -x SANDBOX_ON=0
+       local -x LD_PRELOAD=
+       # some locales trigger different output that breaks tests
+       local -x LC_ALL=C.UTF-8
+       emake check
+}
+
+multilib_src_install() {
+       if multilib_is_native_abi ; then
+               emake DESTDIR="${D}" install
+       else
+               local install_targets=(
+                       install-includeHEADERS
+                       install-libLTLIBRARIES
+                       install-pkgconfigDATA
+               )
+               emake DESTDIR="${D}" "${install_targets[@]}"
+       fi
+
+       # Libs.private: should be used from libarchive.pc instead
+       find "${ED}" -type f -name "*.la" -delete || die
+       # https://github.com/libarchive/libarchive/issues/1766
+       sed -e '/Requires\.private/s:iconv::' \
+               -i "${ED}/usr/$(get_libdir)/pkgconfig/libarchive.pc" || die
+}

Reply via email to