gentoo auto-resync : 14:10:2024 - 04:04:03

5 files changed, 187 insertions, 15 deletions

diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index f48b21b0ebf1..f551545e6040 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/libarchive/Manifest b/app-arch/libarchive/Manifest
index dfe438adfc6a..065aee50c311 100644
--- a/app-arch/libarchive/Manifest
+++ b/app-arch/libarchive/Manifest
@@ -8,7 +8,10 @@ DIST libarchive-3.7.5.tar.xz 5437940 BLAKE2B e1cf8490b2db64e912bd181391310653b4e
 DIST libarchive-3.7.5.tar.xz.asc 659 BLAKE2B 7310b8d7e3f07b8c75910ff3355ffda653402ca2d6db9cdf7d669b9a4ac5f3fb4c4c4482e85184fd68a23c96bce587a95b56efb88ae971399e130e533bd0969a SHA512 7494518b61a58a9aa1e991a2cf6b16340e34d7aa2c25a3c531799785e165541781d1a915437260bc536fe8267140cc69abb2670e8c0576e975a5a2b7ecf8e20d
 DIST libarchive-3.7.6.tar.xz 5458552 BLAKE2B 3251dc4d59867d1c9b43e78ac7735c27670e819a1aba4f4a76372b8509e2427ff24e379f6102a4cc3c92b965d182c8939bb6df4c82d4d1141cdd1db13bf039a2 SHA512 3ca90d665772418b9ac444044511989e81e785a13db3c101851390ba7c2ba0793c799cedb9df990e900ab78c98207f70ecee7e21829578555dde99424950ae2a
 DIST libarchive-3.7.6.tar.xz.asc 659 BLAKE2B 9f6a621dd4aa20f06dff71225723e60a6cee1f2a54ff07d2d19670153105f2f75d6439320f49eb46c28a4416828af7dc4f0d827e46ec9aeb5b703f06eb329d77 SHA512 2840b13f910f47d34daeed9680beb4b3cdde2d7de26ab8453756261c51fb7a39b727454f370b0ee60f8e1646c65544331a22558cbe8faf79a201b1d1346b37c1
+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
 EBUILD libarchive-3.7.4.ebuild 4800 BLAKE2B 45f23a859e54c94ba18842c75e6190172b9ee3063707096a2112e8976306152002fcebeac89f68a5dbdc4725411955f141afec4b2d573e7c82850846c41c8b9c SHA512 87b80d7f9c15a8a6eaefa9c7a18db92550d480df75a5439607a9ad94db7abf21af15ce0d82d2b3d9669fc75c32c756fbe51d2efe2aff42b0d55537ff3645cdb1
 EBUILD libarchive-3.7.5.ebuild 4801 BLAKE2B 18b84cba9b71880cb12713c9662d8df4b0bd233fef15f812f97797f01a89b9e016e737efea7240840f3962fdf2c61d7c3af0d5ba5ae52f2446466dc180b13596 SHA512 d7b896b6b0981ac557c12d83e93dfebd58bd0c3a5955d9b9a2844e1caf711aaf03c7b57b5728c22aa57e58d62da170b3e207f0d9012bb32ae3e184662b284edd
 EBUILD libarchive-3.7.6.ebuild 4618 BLAKE2B d6b2f05c42fbdc044ad5521335524f17fb085e173ea2cdf5afcd0c4951da886bc40c731779a927594f3ffa062ca560ef204085d9859faa7ce807196ab76ff456 SHA512 20b69f3a59f0732addf7277de5d9031205ed83df86fdaf022103cee8f5ef7fba30d92b2d7398b58916fe2e4fe125fd899092014b1eed67fb34682f5182b61704
+EBUILD libarchive-3.7.7.ebuild 4625 BLAKE2B 281eba4e99ef70fd7ba4d51eb51fb3c3b235e34b39e9217a4512aecea85127279150f4a3fbe855e444ef502ec5fe29d4f1b6024c87c5139e81f039df521f7623 SHA512 a41e7b95d9e526e9d1f9191cc6ef0f310200c7c2a726f0fc48834e4d4c56cb91c22a3c93b8ab9abc1c95df0db8b81c1ddb833be23474f0812c389b9b6de4f2af
 MISC metadata.xml 1224 BLAKE2B 538433528de5543ad8e912ce0d072340be3f6eeefe16320ef48b3c30a35ebdff4a32055edf89f36e4479ab1468c620871fcb5ba91bd66e81798093b4d0345949 SHA512 9f53d623a02334f675c06edea2829ce52e78d85e3894e684ae920a678eb47046393b7a93808c7e1761d30a69faa5986cd4922ae7ef8f1e2ef221de39869bd12b
diff --git a/app-arch/libarchive/libarchive-3.7.7.ebuild b/app-arch/libarchive/libarchive-3.7.7.ebuild
new file mode 100644
index 000000000000..1d2552f15f40
--- /dev/null
+++ b/app-arch/libarchive/libarchive-3.7.7.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2024 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
+}
diff --git a/app-arch/p7zip/Manifest b/app-arch/p7zip/Manifest
index 7cf903c006c8..b033d4087446 100644
--- a/app-arch/p7zip/Manifest
+++ b/app-arch/p7zip/Manifest
@@ -9,5 +9,5 @@ AUX p7zip-17.05-unit64.patch 470 BLAKE2B 63969d319e3fcc624dc0b0b4b5580887d23259d
 DIST p7zip-17.05.tar.gz 6722154 BLAKE2B 0bcba638d3acaf2aa270e02693ad4295dfcc6b388037bdb446e25f3f4e1cb34f1b05bbc9a845364ca770625c32b2d7f55f63f504ad8e0863fff4bf940ae1fddd SHA512 97a7cfd15287998eb049c320548477be496c4ddf6b45c833c42adca4ab88719b07a442ae2e71cf2dc3b30a0777a3acab0a1a30f01fd85bacffa3fa9bd22c3f7d
 DIST p7zip_16.02_src_all.tar.bz2 4239909 BLAKE2B 075356fba5284cbb124e30c36364a910ae5a7ac6bee8a8fb682c5a7ce2f1870ef83d3160c84f8dabad1d616c13d642cba1f19fb9384160d21590cf678dd8f1a6 SHA512 d2c4d53817f96bb4c7683f42045198d4cd509cfc9c3e2cb85c8d9dc4ab6dfa7496449edeac4e300ecf986a9cbbc90bd8f8feef8156895d94617c04e507add55f
 EBUILD p7zip-16.02-r8.ebuild 4084 BLAKE2B 751bd46aafa907e01442c53a81e599c1877be619ad7b99ba3bc30a6af8a184e6d346f7d466b0b5c42bfbb25345263ef9057e13b0785b361498a0ff86ab2f906a SHA512 6984a246c1f55b36a5345f37945bb8930d3b6c7f6fe717d26d4bc81ecaa0ecaedd667ad277651ee01f941d9e512df94f8d89161ea7a29805667fcb357b716e2d
-EBUILD p7zip-17.05-r1.ebuild 3249 BLAKE2B 56400800496ba7a6fd4fc3d4adf399e5e49502a136fa06aeac2e899645a5c89514c0615cafecdfd08ad1ac4d8e843361c264f01806ccc5067dcd260160badd18 SHA512 e28afadd07b5ba011d5d94cd744ddf798f7ea98a1d5441bcf9ebe9fb54c1878778a88d5b00b4da3b4e3ab3cd5401f90a5b8aee23925928fe23a466058d1daea5
+EBUILD p7zip-17.05-r1.ebuild 3173 BLAKE2B 4f9e0f89bad44688c219bebfa70fc792c5ad81b355944b5d73e9fe79bd60b4733d81f26093f4a771130852be328511b7bff8587c0e1a49139fcf07d2b6af6d54 SHA512 17fc1729299c54fc8a7a3ab59beb9cd4bdb28d02e2bf0eb4b5d26e8fa21844e03880c69e5d67ba7197ca2eef8e5a094b4dd42b315886a56ac874ece7aab428b3
 MISC metadata.xml 532 BLAKE2B 9ffdc29d8d8f6a82e7a55f4448870a4dd019468a440ade6df10ad1336617d14c1d975a7db032fce3397358132cee15bb317c9bed554de57e8f3ecbb284931a32 SHA512 807a53919ad3b19c280be0033ae264d89ad438b9d51763c7a27be3576ca496af9966d2f62594a707a1242c0b813298b01da6c2a55469af777e47944a80b00f25
diff --git a/app-arch/p7zip/p7zip-17.05-r1.ebuild b/app-arch/p7zip/p7zip-17.05-r1.ebuild
index eb2947239d72..991d216d8027 100644
--- a/app-arch/p7zip/p7zip-17.05-r1.ebuild
+++ b/app-arch/p7zip/p7zip-17.05-r1.ebuild
@@ -1,19 +1,21 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit multilib toolchain-funcs wrapper xdg
 
 DESCRIPTION="Port of 7-Zip archiver for Unix"
 HOMEPAGE="https://github.com/p7zip-project/p7zip"
 SRC_URI="https://github.com/p7zip-project/p7zip/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-#S="${WORKDIR}/${PN}-${PV}"
 
 LICENSE="LGPL-2.1 rar? ( unRAR )"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos"
-IUSE="abi_x86_x32 natspec +pch rar static"
+IUSE="abi_x86_x32 natspec +pch rar test"
+
+REQUIRED_USE="test? ( rar )" # bug 907221
+RESTRICT="!test? ( test )"
 
 RDEPEND="natspec? ( dev-libs/libnatspec )"
 DEPEND="${RDEPEND}"
@@ -22,9 +24,7 @@ BDEPEND="
 	amd64? ( dev-lang/yasm )
 	x86? ( dev-lang/nasm )"
 
-PATCHES=(
-	"${FILESDIR}/p7zip-17.05-unit64.patch"
-)
+PATCHES=( "${FILESDIR}/p7zip-17.05-unit64.patch" )
 
 src_prepare() {
 	default
@@ -58,16 +58,16 @@ src_prepare() {
 
 	if use abi_x86_x32; then
 		sed -i -e "/^ASM=/s:amd64:x32:" makefile* || die
-		cp -f makefile.linux_amd64_asm makefile.machine || die
+		cp makefile.linux_amd64_asm makefile.machine || die
 	elif use amd64; then
-		cp -f makefile.linux_amd64_asm makefile.machine || die
+		cp makefile.linux_amd64_asm makefile.machine || die
 	elif use x86; then
-		cp -f makefile.linux_x86_asm_gcc_4.X makefile.machine || die
+		cp makefile.linux_x86_asm_gcc_4.X makefile.machine || die
 	elif [[ ${CHOST} == *-darwin* ]] ; then
 		# Mac OS X needs this special makefile, because it has a non-GNU
 		# linker, it doesn't matter so much for bitwidth, for it doesn't
 		# do anything with it
-		cp -f makefile.macosx_llvm_64bits makefile.machine || die
+		cp makefile.macosx_llvm_64bits makefile.machine || die
 		# bundles have extension .bundle but don't die because USE=-rar
 		# removes the Rar directory
 		sed -i -e '/strcpy(name/s/\.so/.bundle/' \
@@ -76,10 +76,6 @@ src_prepare() {
 			CPP/7zip/Bundles/Format7zFree/makefile.list \
 			$(use rar && echo CPP/7zip/Compress/Rar/makefile.list) || die
 	fi
-
-	if use static; then
-		sed -i -e '/^LOCAL_LIBS=/s/LOCAL_LIBS=/&-static /' makefile.machine || die
-	fi
 }
 
 src_compile() {