From 849115cb6a00b3cd2c29a11990728f39cc009633 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Fri, 31 Jul 2026 10:20:42 +0200 Subject: [PATCH] app-arch/libarchive: Remove old MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- app-arch/libarchive/Manifest | 4 - .../files/libarchive-3.7.2-lrzip.patch | 26 --- app-arch/libarchive/libarchive-3.8.7.ebuild | 173 ------------------ app-arch/libarchive/libarchive-3.8.8.ebuild | 173 ------------------ 4 files changed, 376 deletions(-) delete mode 100644 app-arch/libarchive/files/libarchive-3.7.2-lrzip.patch delete mode 100644 app-arch/libarchive/libarchive-3.8.7.ebuild delete mode 100644 app-arch/libarchive/libarchive-3.8.8.ebuild diff --git a/app-arch/libarchive/Manifest b/app-arch/libarchive/Manifest index 3520e12006bbf..16d1c3364de77 100644 --- a/app-arch/libarchive/Manifest +++ b/app-arch/libarchive/Manifest @@ -1,6 +1,2 @@ -DIST libarchive-3.8.7.tar.xz 6012112 BLAKE2B 6ed65a679b0c55e66410454de2865e8de67eb668845ac007c7d555d6023390cf95fb93ae3d006e9fef73314f8d7c3dcb8a4a44548e48e418c4d30e15b922e828 SHA512 0673accf9ac6ede2d1c7e68419d00898f35e43130c5ec6b5fcdea85d174d8b0cc56d1d609bd5533370c3cca5f6ddd5b59fc153f2dadea2b4b5c2421a574ea352 -DIST libarchive-3.8.7.tar.xz.asc 833 BLAKE2B 61053a2d870b8d42bf858c74f5fb2646d8999af2c893b8080dd019df4b933c0b63ff0a1337afbf5b756ad8021d2920355b82ac8ac8e170e072a8da4ff1c13d71 SHA512 9a83957e5b16f186125e51bbcf383d8b37ec7904ac13cd3d542b3e8b76544ba07e722895aa4074ce562fb10dc2e3117bc252da7a6c31fa49cc887ef7e7524b66 -DIST libarchive-3.8.8.tar.xz 6559080 BLAKE2B dc210097fbd6bf2db240699dc2ad9fc6030b4179ffc02fa1de96537eb59897d964470fb1a675c76bc0691aa2f138f5cb2479495ea904124c80297c7bd84effc6 SHA512 6952aaa3f7aa275b1a678c03b3ca3a50111a1305f0eb50362b8a85599f1c13a0c771530c7caea6ddcc3c8ceead4c206abca851d8b2c4b64968773d8fd6fc64de -DIST libarchive-3.8.8.tar.xz.asc 833 BLAKE2B 38464a3a6ea238c79142f8c3c3c2af4184967d37a7333eee80f85b7da514fc115e6414fec7de90d0fa1b6456c244191deaacce934ebf3802b29898e0fa8a9d84 SHA512 db7d497493b78ed0ee4f20035aefa7eaa7bd33adf00f95400edc591082f6858576705290dae53f6d38261a6b29a35d2b6f9a5e7ccccff29276fede41c9fdb58d DIST libarchive-3.8.9.tar.xz 6617696 BLAKE2B 4f3df81fa32231471b866a443d77069e74d25c5b806bccf9358b5e7df25e6626c882aafffbd22ff8fa6b78a009efd58827a75ce0169b0ed4a780f65968a799c7 SHA512 f37425417a9e3fdc194a2b892137452ddba6601c69e822598692d4d776c573a90e70aac4598d47c915615facc45d0c83fc46c24856ddf04afd7494b63bb9f137 DIST libarchive-3.8.9.tar.xz.asc 833 BLAKE2B 709f6a49d3da3dc542431b5f28d955bc5c79b82ff48d3a023aa2d6dd5f664bc84ba5a6a1e9f8e39334ef1b7cbb5cd41b0e2956fc20ef72818ec963ff3134bb21 SHA512 41adf352fdb987555e5d57b97c0c47e6833bb58633f9dff504b012038f8f83aa6e51fbefe891ecfe95b7b1c648c17c5e9331c29a140a83b90f7a06605ef1e963 diff --git a/app-arch/libarchive/files/libarchive-3.7.2-lrzip.patch b/app-arch/libarchive/files/libarchive-3.7.2-lrzip.patch deleted file mode 100644 index f05b46c1a340d..0000000000000 --- a/app-arch/libarchive/files/libarchive-3.7.2-lrzip.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/libarchive/archive_read_support_filter_lrzip.c b/libarchive/archive_read_support_filter_lrzip.c -index a562d538..f3ec40c4 100644 ---- a/libarchive/archive_read_support_filter_lrzip.c -+++ b/libarchive/archive_read_support_filter_lrzip.c -@@ -109,7 +109,7 @@ lrzip_bidder_init(struct archive_read_filter *self) - { - int r; - -- r = __archive_read_program(self, "lrzip -d -q"); -+ r = __archive_read_program(self, "lrzip -d -Q"); - /* Note: We set the format here even if __archive_read_program() - * above fails. We do, after all, know what the format is - * even if we weren't able to read it. */ -diff --git a/libarchive/archive_write_add_filter_lrzip.c b/libarchive/archive_write_add_filter_lrzip.c -index fe974c93..8fe498dd 100644 ---- a/libarchive/archive_write_add_filter_lrzip.c -+++ b/libarchive/archive_write_add_filter_lrzip.c -@@ -133,7 +133,7 @@ archive_write_lrzip_open(struct archive_write_filter *f) - int r; - - archive_string_init(&as); -- archive_strcpy(&as, "lrzip -q"); -+ archive_strcpy(&as, "lrzip -Q"); - - /* Specify compression type. */ - switch (data->compression) { diff --git a/app-arch/libarchive/libarchive-3.8.7.ebuild b/app-arch/libarchive/libarchive-3.8.7.ebuild deleted file mode 100644 index 99a126cd2e031..0000000000000 --- a/app-arch/libarchive/libarchive-3.8.7.ebuild +++ /dev/null @@ -1,173 +0,0 @@ -# Copyright 1999-2026 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 ~arm64-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=" - virtual/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} - virtual/os-headers - elibc_musl? ( sys-libs/queue-standalone ) - 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-20251118 ) -" - -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 -} diff --git a/app-arch/libarchive/libarchive-3.8.8.ebuild b/app-arch/libarchive/libarchive-3.8.8.ebuild deleted file mode 100644 index 99a126cd2e031..0000000000000 --- a/app-arch/libarchive/libarchive-3.8.8.ebuild +++ /dev/null @@ -1,173 +0,0 @@ -# Copyright 1999-2026 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 ~arm64-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=" - virtual/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} - virtual/os-headers - elibc_musl? ( sys-libs/queue-standalone ) - 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-20251118 ) -" - -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 -}