gentoo auto-resync : 18:02:2024 - 23:39:27

8 files changed, 120 insertions, 4 deletions

diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index d8828c4898f9..101279ab0183 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/cpio/Manifest b/app-arch/cpio/Manifest
index 96c395f29d71..6df1e99a685b 100644
--- a/app-arch/cpio/Manifest
+++ b/app-arch/cpio/Manifest
@@ -9,5 +9,5 @@ DIST cpio-2.14.tar.bz2 1521004 BLAKE2B f2fa9f5bc39cd91f4755fdf27f43cff4d1c1f0986
 DIST cpio-2.15.tar.bz2 1651320 BLAKE2B ca2aae6a00239be7aff5558a2e62b4fb4b43c2ed7f4d7a23699c958ae10b348c4ebf39233f0dd0242cba895fdac4d0ff3b4e56fefa0b1afe3db41eb6916e0b23 SHA512 e3c3d0344d13d540887198ee5d6209a9254ed34b87c3b3cabe6dc3ce22ef94d3f380bb60d3395eee44e4b0ec8460b957032c6251f101b4a9fbc5951a701aadff
 EBUILD cpio-2.13-r5.ebuild 1470 BLAKE2B b386190f7ae374d4f85397ee78e2709238781b68b254aa41241bec7badf05e8e50a27f2991488289c6673ec4f1b252cbfdac725e99336121e2a55f31ea4cb17b SHA512 a1fd85b530866ab34a315fa76755acc65d5334eb1be32904e31e99ebec97ceac94737cdbc28d2df11f0c919d85f9c48ebe5d3b0d6980942cd4e262f2520883c3
 EBUILD cpio-2.14.ebuild 1144 BLAKE2B 950b9b3535c5aa8453a118a54163983856defac3ffe1ee21ec7fe58430cf86e6aa5eaae5b6ba2221a2bac660ff979bee0e5cab02a2b0aadf715ef295bd203d93 SHA512 5eb0e4509993eeedf8a8d156d63b641bd0004d9c4b695f89a2c25d78703202d812d48e6bf942c2ba8146abdb34ffc1dc457d0fd42fc2ac05daf7232febab84ac
-EBUILD cpio-2.15.ebuild 1212 BLAKE2B e4fd2f20389728026c22ef734ca80d80eaf35260c815f64cbf9680803e182bf538b9d4b739883a724baccc393189795d25550e9b20c57485aff0fdfb2000b5dc SHA512 2ea18f607d0ff794222be7637d5b530178fcf034a1b31b1702ee720f76adc5cf67f578026ae2822d883eea1e795cb52090acf49cbd82e58a00d42610c3395470
+EBUILD cpio-2.15.ebuild 1207 BLAKE2B 230eb04d6174eca92ae19550c44d5a58cf6a9cd7fa91261fcc7dedd997b77a2eaed28efc9f2acae30a10dceca5d780ace3b7ebf6c352a021dd3451deb8a79994 SHA512 a39f4fd8f6b50c1e6667012cce7671da38d56c69b7368cdac8a1a22c10ee227c4508eea40062930fdc6666f7f7b40efe018ebdc44f7427b4464d18515df90b7b
 MISC metadata.xml 328 BLAKE2B f8b8bff5b160351a92837553de20eda1da31a6c0594c1118e1f71b3cd19d9ea8d3420bdce943d83644f5ffc234950f95fb9229a213660767dc5281120085b26f SHA512 08e1c6a03b894946bf6332bf46c8a7534ed0998777b30cb9eecb9c746bb333b65fb41dfeeb6938cbc08d0ad0a303d752ea70a6a6a6ae2c5c2935b2b4e4d9928f
diff --git a/app-arch/cpio/cpio-2.15.ebuild b/app-arch/cpio/cpio-2.15.ebuild
index b9ed9cc412c2..06020d3f0c17 100644
--- a/app-arch/cpio/cpio-2.15.ebuild
+++ b/app-arch/cpio/cpio-2.15.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/cpio/${P}.tar.bz2"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="nls"
 
 PDEPEND="
diff --git a/app-arch/libdeflate/Manifest b/app-arch/libdeflate/Manifest
index c8f4c05b7f4e..8dd4e318089c 100644
--- a/app-arch/libdeflate/Manifest
+++ b/app-arch/libdeflate/Manifest
@@ -1,5 +1,5 @@
 AUX libdeflate-1.19-make-gzip-tests-conditional.patch 1376 BLAKE2B 9480aed1f1a316899e844f99af988560cd5f07ff98336dbaef63a350ab9a7a76c75c4bf6d8e3709c0e99719dfcd0d3216976a9daab89e2c1277b4a20f036d074 SHA512 469698465c70804b356e628290cc50def2f6281262521b53794f5682c738f9245ec47a36877ebb506e0d070f21fd781478039c32a764d35ffd860ec98b34a30b
 DIST libdeflate-1.19.tar.gz 187684 BLAKE2B 6d3c58b4095f91f64c25e09a062f1d7e68cd43b4dffc2de6484cd941ede4bffd8a82dd3af08eda6c94ad4120d40809c1d6a1814c28bad5387dfbaad418b93070 SHA512 fe57542a0d28ad61d70bef9b544bb6805f9f30930b16432712b3b1caab041f1f4e64315a4306a0635b96c2632239c5af0e45a3915581d0b89975729fc2e95613
-EBUILD libdeflate-1.19.ebuild 1273 BLAKE2B 4a82b568a26c03fa89ea725550df63782cb8dd22eb880a13e8ff0ded781c1d9e15be4185191d9c6116d29b008196bde790c47f1ec9a1dc3b809ff101b40b4928 SHA512 8c8bda36b893b8ddedabca0dbf7e5aaa9a3a39aa6163ccc61dcc9355e9110b514c5ea64df36ea5e94573f57e0977d4f1a8588444a6c3ca540dbf341d9ed7d5f0
+EBUILD libdeflate-1.19.ebuild 1297 BLAKE2B 25e1266a888f8b8154d212a9dcef9768867311a859df8d3991fdbf38017ceeb058af91f7864e4693aec6d20409b2af9b19c84683a87652a86d9bca4c4705e55e SHA512 d44429c6afe3bf41c360e20ce05f2f289c0ad89607ce4f0071997dd10aaf69708c138d54b4fc1b54a0b92bc2c0e9b802d1b172f2c459d3ff1d50d28fc5c47f33
 EBUILD libdeflate-9999.ebuild 1273 BLAKE2B 4a82b568a26c03fa89ea725550df63782cb8dd22eb880a13e8ff0ded781c1d9e15be4185191d9c6116d29b008196bde790c47f1ec9a1dc3b809ff101b40b4928 SHA512 8c8bda36b893b8ddedabca0dbf7e5aaa9a3a39aa6163ccc61dcc9355e9110b514c5ea64df36ea5e94573f57e0977d4f1a8588444a6c3ca540dbf341d9ed7d5f0
 MISC metadata.xml 778 BLAKE2B 91c91f6056ae4d819e47afbf0827a78d03e0d6c9508f7be719f04e1d2b26e62953ee5cf616cfb5f64ecb200a8c308df1bd0f19b020666f3516562311ea028bb6 SHA512 ed0195a5aa10b6ec10852e6b08b2740f513d333a1c458ec051dc30862844f659335c2d7cbe180fee31c24d68660ee4f2fcd182ff7a564f7bc06d48d4e4eb22f5
diff --git a/app-arch/libdeflate/libdeflate-1.19.ebuild b/app-arch/libdeflate/libdeflate-1.19.ebuild
index 2ed3a652def2..eed8afabcaad 100644
--- a/app-arch/libdeflate/libdeflate-1.19.ebuild
+++ b/app-arch/libdeflate/libdeflate-1.19.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/ebiggers/libdeflate.git"
 else
 	SRC_URI="https://github.com/ebiggers/libdeflate/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 fi
 
 LICENSE="MIT"
diff --git a/app-arch/xar/Manifest b/app-arch/xar/Manifest
index 4414d09d44b6..f14d53ad3436 100644
--- a/app-arch/xar/Manifest
+++ b/app-arch/xar/Manifest
@@ -5,6 +5,9 @@ AUX xar-1.8-safe_dirname.patch 392 BLAKE2B 8bf3e2104fb4249ca9ba313f7ae1d6fc03a6d
 AUX xar-1.8.0.0.452-linux.patch 2763 BLAKE2B 1d8d5739c16a7693771303bf4e5f04c1f2a676e38b95cdff7c4c338a776acdba7da9199a2a7021df783ef5cb1a746758aa2c7b10ee6f0f616526c9c15e3209d3 SHA512 1296805ba982d44f6654966ebb69a64e82e6085523c76244a94b025530456db22b9b163814b4202ff21e16aadd68a5817b52771133b41ab985a23e8872c25b4e
 AUX xar-1.8.0.0.487-non-darwin.patch 227 BLAKE2B fccac30a036a8bfcab111a39f002422e0092f41c3a385ae897ce7a939ff0b8ae0dfc18e274092a92a60d0d730ae075832106a4a108d9e8fe6c8479d747012c4b SHA512 440ffddf277c9e5a3227dee5b07f007a2a88d561b7a0fe0f40a8e2885fd75e8a762ad19be7943d6007691b62c7fe48d31d58a1370845ecd3affd338248c239db
 AUX xar-1.8.0.0.487-variable-sized-object.patch 617 BLAKE2B 4ec24b45a81d05635f3ec62faeb1919a50d7528bfaeb6766d133b56fca2cf97162e788fed34a2b5dc1d2699edbb6484b9dcee375772c396476f72bcd58e1523d SHA512 3cb5361a4a097c777107da7d69740749b4fa07f868dc87bff703520e116cf72dc2b0d661d6c3ed17856068362cc3900805242fb2db72e7eca1c2822debe4ce33
+AUX xar-1.8.0.0.498-impl-decls.patch 736 BLAKE2B fe419205fe171274a6531f2f5428828fb61b47bcb523660ec8c9811debb2ec6c14accda16f0b74766301b4e0978ca571fc6de202e2a4060a46ab1b477863793d SHA512 96a5cad424ca8f23c36dba34eb36015582b0d0f4ababebe06e6edf50c6c9d1ca59066dddd0f33f31a494b86d54650c02c13757e0881f75dee75890175dbefead
 DIST xar-487.100.1.tar.gz 224108 BLAKE2B 2fa5c44b46a9e37e49be03d05d6d06ab706b5205d857e6d6f24954160dbf5fc91fbec848053cb2d0a11505e5f7c37f8331ac126d65eb91b08e302a28db12acc0 SHA512 a45d1327ac5c6dc6f1cdb359e7e487fd91cea82a446157b65da34f0481cd58bbe03b0e005643087c802962e89316a1c816e2c6b625f1259b10a52bbf902f79e6
+DIST xar-498.tar.gz 224373 BLAKE2B 56dfae475f23384b57492d6a5e141a4c93f7b0238de04be8bbcde63fe7ca0a9beb137b5b9052b165717cd2afae4ddfe5005e65ba16d1821c42e036a9ef9d0e04 SHA512 ecd6186e42ff3005296d94ce01d7fbea04814f26afe1df0449ffa522009ec85beafc71e25931b215910c159a2440565e7dd31a6a7c50389a50a1368bd5ff5f75
 EBUILD xar-1.8.0.0.487.100.1.ebuild 2740 BLAKE2B b1fc4c2fa425f79abd0342a1469b05b815b227d31ced4d5d2efe2704651db99407e8000c663b1b9539371c826c75ff4b417bb5a3d2db2d93ec143125c6eece77 SHA512 943a870505e0c4833267e99918eba635d213ef9243b2bf31d61afb55e35cce5e542e6712230e459f51609071358a563ce61468a040b3d4014a5def5bf8522d82
+EBUILD xar-1.8.0.0.498.ebuild 2796 BLAKE2B bd86ee1dcc6eb645091e90ed4ec36bb408a8b5230148a0b4850745cf2676889e64dba275bc1fa83bef7f1f899b66dfba1ecb58bb7b598179bc8eed256832ca38 SHA512 f0aff9b54f19a661312f35c7d49216b5be0313a2994848af105aa2b2a397cb0cc6ffd906ed2b5a0a70b5875891541a39b10073e8c5d867b02ae60ea081d74d2b
 MISC metadata.xml 896 BLAKE2B 6276428173e9e59e3bd792a6df84b865eb695bf2591a8586b9903d1eb275af3a10d2295c9e37f452e911aa771f30a902c7b1361c83a1c5280f442a6652437c59 SHA512 7088753baae558cf466eb6a3af584d406ea09c5065f235d1e44d891731055fb88acd8957e764554b41d86d8fbf7cea21deaacdd2b38d9f8b05744202252ec271
diff --git a/app-arch/xar/files/xar-1.8.0.0.498-impl-decls.patch b/app-arch/xar/files/xar-1.8.0.0.498-impl-decls.patch
new file mode 100644
index 000000000000..8c37a6c9cfbc
--- /dev/null
+++ b/app-arch/xar/files/xar-1.8.0.0.498-impl-decls.patch
@@ -0,0 +1,24 @@
+include stdlib.h for free and strtol
+silence format warning
+
+--- a/lib/ext2.c
++++ b/lib/ext2.c
+@@ -41,6 +41,7 @@
+ #include "asprintf.h"
+ #endif
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <unistd.h>
+ #include "xar.h"
+ #include "arcmod.h"
+--- a/lib/ea.c
++++ a/lib/ea.c
+@@ -67,7 +67,7 @@
+ 	xar_prop_setvalue(XAR_EA(ret)->prop, NULL);
+ 	XAR_PROP(XAR_EA(ret)->prop)->attrs = xar_attr_new();
+ 	XAR_ATTR(XAR_PROP(XAR_EA(ret)->prop)->attrs)->key = strdup("id");
+-	asprintf((char **)&XAR_ATTR(XAR_PROP(XAR_EA(ret)->prop)->attrs)->value, "%lld", XAR_FILE(f)->nexteaid++);
++	asprintf((char **)&XAR_ATTR(XAR_PROP(XAR_EA(ret)->prop)->attrs)->value, PRId64, XAR_FILE(f)->nexteaid++);
+ 
+ 	xar_prop_pset(f, XAR_EA(ret)->prop, "name", name);
+ 	
diff --git a/app-arch/xar/xar-1.8.0.0.498.ebuild b/app-arch/xar/xar-1.8.0.0.498.ebuild
new file mode 100644
index 000000000000..80225ab0a44a
--- /dev/null
+++ b/app-arch/xar/xar-1.8.0.0.498.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools flag-o-matic toolchain-funcs multilib-minimal
+
+APPLE_PV=$(ver_cut 5-)  # 498: macOS 13.3 and up
+DESCRIPTION="An easily extensible archive format"
+HOMEPAGE="https://github.com/apple-oss-distributions/xar"
+SRC_URI="https://github.com/apple-oss-distributions/xar/archive/xar-${APPLE_PV}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+
+DEPEND="
+	elibc_musl? ( sys-libs/fts-standalone )
+	kernel_linux? ( virtual/acl )
+	dev-libs/openssl:0=[${MULTILIB_USEDEP}]
+	app-arch/bzip2[${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	dev-libs/libxml2[${MULTILIB_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.6.1-ext2.patch
+	"${FILESDIR}"/${PN}-1.8-safe_dirname.patch
+	"${FILESDIR}"/${PN}-1.8-arm-ppc.patch
+	"${FILESDIR}"/${PN}-1.8-openssl-1.1.patch
+	"${FILESDIR}"/${PN}-1.8.0.0.452-linux.patch
+	"${FILESDIR}"/${PN}-1.8.0.0.487-non-darwin.patch
+	"${FILESDIR}"/${PN}-1.8.0.0.487-variable-sized-object.patch
+	"${FILESDIR}"/${PN}-1.8.0.0.498-impl-decls.patch
+)
+
+S=${WORKDIR}/${PN}-${PN}-${APPLE_PV}/${PN}
+
+src_prepare() {
+	default
+
+	# make lib headers available (without installing first?)
+	cd "${S}"/include || die
+	mv ../lib/*.h . || die
+
+	# strip RPATH pointing to ED
+	cd "${S}"/src || die
+	sed -i -e 's/@RPATH@//' Makefile.inc.in || die
+
+	# avoid GNU make (bug?) behaviour of removing xar.o as intermediate
+	# file, this doesn't happen outside portage, but it does from the
+	# ebuild env, causing the install phase to re-compile xar.o and link
+	# the executable
+	echo ".PRECIOUS: @objroot@src/%.o" >> Makefile.inc.in || die
+
+	# drop Darwin specific reliance on CommonCrypto Framework, for it
+	# depends on what version of Darwin we're on, and it is much simpler
+	# to just use openessl instead, which we maintain and control
+	cd "${S}" || die
+	sed -i -e 's/__APPLE__/__NO_APPLE__/' \
+		include/archive.h \
+		lib/hash.c \
+		|| die
+
+	# fix branding somewhat
+	sed -i -e "/XAR_VERSION/s|%s|%s (Gentoo ${PVR})|" src/xar.c || die
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	append-libs $($(tc-getPKG_CONFIG) --libs openssl)
+	use elibc_musl && append-libs $($(tc-getPKG_CONFIG) --libs fts-standalone)
+	append-cflags -Wno-unused-result  # allow to see real problems
+	ECONF_SOURCE=${S} \
+	econf --disable-static
+	# botched check, fix it up
+	if use kernel_SunOS ; then
+		sed -i -e '/HAVE_SYS_ACL_H/s:^\(.*\)$:/* \1 */:' include/config.h || die
+	fi
+	# allow xar/xar.h to be found
+	( cd include && ln -s . xar )
+}
+
+multilib_src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}