commit:     fbd0a933d8683e43c77cd202f7db62d94d1aa30e
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  2 03:23:31 2025 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Jun  2 04:06:50 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbd0a933

app-arch/libarchive: Bump to 3.8.1

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

 app-arch/libarchive/Manifest                |   2 +
 app-arch/libarchive/libarchive-3.8.1.ebuild | 174 ++++++++++++++++++++++++++++
 2 files changed, 176 insertions(+)

diff --git a/app-arch/libarchive/Manifest b/app-arch/libarchive/Manifest
index 7ded43eac7d0..2c9de7826efb 100644
--- a/app-arch/libarchive/Manifest
+++ b/app-arch/libarchive/Manifest
@@ -2,3 +2,5 @@ DIST libarchive-3.7.9.tar.xz 5494688 BLAKE2B 
7bcfb3fe8ffd9452f3d71cdc73814406959
 DIST libarchive-3.7.9.tar.xz.asc 659 BLAKE2B 
1de2d5af2422c8220983d7e5aa76fae1fcf12c008e7a99ec193b82145a03506fddabc7d5b89efce609e3b807511ebf719fce2f81f2150ccc0a57b4248ad3c5cb
 SHA512 
e60bf9b6c8c58a6fd8977df0ccdd375e42db03f99623412897711dfcbfa4fb4a5b8707e8643c30e25e8b2946df58d1367f67c6ef99223a2739dabbce387f83c5
 DIST libarchive-3.8.0.tar.xz 5950876 BLAKE2B 
7cdccd6b4cbb180dbd40fba3461fa98b53aaf05c0b4b71776d9bb26d1ed5329b8aff9cb534667334a4069bb6e1e629522b048ce859c408d48ba96cec9c41bddf
 SHA512 
b0dcee8cb586ce2061987589067bbc063e326471fe36de64cc9c3e8b5eaaaedb85ef2b320be1671e008a32f39bdfc07db4e8abbde58328ab2655c2af0f0984f9
 DIST libarchive-3.8.0.tar.xz.asc 659 BLAKE2B 
47893aa0770487b7f3902ae9950baec3cecf7d514ead57d83e2d0cd6feb2e96c55fe1a42020a70260d6958eee654633f01b1dd200b2ef718248d2c559905ad37
 SHA512 
62896d1995b9d05dc0d01829062fa954c1319764a7b7d1dc34cde456b303c115725921dbcfa3dd82384aa8f81df9c9b04abcf9fafa1457d31e581da7b7b2f642
+DIST libarchive-3.8.1.tar.xz 5950428 BLAKE2B 
92ce11758ea050c7f5b3b2440566b71d29d4fe3ee90ee3455117585ef629eb7cfbe6f3c67bfb309c38d02118ef8f71c1c30ffe14466bfef7929c6d6134b11fc8
 SHA512 
c794d1c6e6a6dcf4072438dc4e8ce5b1530bbe9ad40afad18f4e6a444aa5d85e48c58cfbd8af41d4d25e93844956de3ce262cb1d68097d2e5f95bd87b5a982b7
+DIST libarchive-3.8.1.tar.xz.asc 659 BLAKE2B 
0965437c5087b29c356280613fba546c0f08cbe3996c885957e1424304f3ea1cb4651168b34c3389ec6119bd5ab99160dc530dced31490cd2f6e8c3850e77223
 SHA512 
540ea8203920c1e8e6934f20c0f6b592a309c82f82561960d9adff3a3a09cf28c7a3d92070682b6b420ef82c6e30d6e9741d8c3e5473a78390da5137e61c05bd

diff --git a/app-arch/libarchive/libarchive-3.8.1.ebuild 
b/app-arch/libarchive/libarchive-3.8.1.ebuild
new file mode 100644
index 000000000000..b957cea4b436
--- /dev/null
+++ b/app-arch/libarchive/libarchive-3.8.1.ebuild
@@ -0,0 +1,174 @@
+# 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="
+       virtual/pkgconfig
+       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