gentoo auto-resync : 17:07:2022 - 02:30:06

4 files changed, 122 insertions, 0 deletions

diff --git a/app-arch/xar/Manifest b/app-arch/xar/Manifest
index db7578340af2..1b58242f9923 100644
--- a/app-arch/xar/Manifest
+++ b/app-arch/xar/Manifest
@@ -3,10 +3,14 @@ AUX xar-1.8-arm-ppc.patch 589 BLAKE2B 0ff44d40149dd5ef974e38d1720793ddea30ff1047
 AUX xar-1.8-openssl-1.1.patch 1358 BLAKE2B 4e448107ce6aabb821e95e65863aa538cf8b2b63bf1f4d7b841a7ffc78712f307ddb2f8c78ecd573e5e7b3169d70ccae209acca9513d8446b2f785af368b6955 SHA512 2fb90f5f6e412ed31b8cf9aa23aa9b844baf683d357e647d33c2c6318656dd6e6f3027a1715ed916815e3fd75d51d2f178845c2c6b247797d37cc4f539116f85
 AUX xar-1.8-safe_dirname.patch 392 BLAKE2B 8bf3e2104fb4249ca9ba313f7ae1d6fc03a6d29ec1bccaf78b48696f44c7d88d3186c7c2078eb7b18b3fe1756949d527ce9a39b6dccd34e9e26fa11f72dcb4c5 SHA512 129412c27717bbb7ae3620c9ba221c7beae78e611e88ec6da1c572cdbc7905d60062710bbd37270fb78735248f6debf9a6b00ff0f9cc14470ac53717f00e463c
 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
 DIST xar-400.tar.gz 213319 BLAKE2B 55b8695313a1a5ae778b62791f716af00edba7e7b01500eac4b951e04cf7b18e84e0d508ac5471996796e5ab59e4628a4f85a63a5929b372555e28b222c77ab1 SHA512 c54850d5443c776f18d788bf7d026b3b08274ee71321d1615238c9fa2d20cc0b21f3f298364b0d0eecd98ce2a6efc8d5039cabd5a21c2419c430d90db004d159
 DIST xar-417.1.tar.gz 219350 BLAKE2B 2ca073e52b8d7a12c3d33fb65ccaf0984b912f42e4e9dc52bcaec7af41bafcc530cd055da16646113fb24ee046122425a66351f88279ef79a0f0b2b04ae51f9a SHA512 4c3c61f5289d0b2e380cbde772b383da369ca8ad046f5d779e02f59300288c90c5e31d105a2c01ac17dc719b8b46b55d8d36a8b3b20360f315766fce92dec762
 DIST xar-452.tar.gz 220690 BLAKE2B 9728c73734a4bcb31e6e72d3d1a6735d5c78e384e15415641c4f40068f2da9498e9808cc36df6eaf7d3addf8be6d9eb90bdfa2900321e4dbe482156075bcdcd7 SHA512 d6ae9e5687020d20ec12579178f84c852fd485c52cff0ad23b7b31d2eabbde8c7fc85ab33e82eb81a5ddb59df4c26b756894be85061195cd191ab32be1f56b10
+DIST xar-487.100.1.tar.gz 224108 BLAKE2B 2fa5c44b46a9e37e49be03d05d6d06ab706b5205d857e6d6f24954160dbf5fc91fbec848053cb2d0a11505e5f7c37f8331ac126d65eb91b08e302a28db12acc0 SHA512 a45d1327ac5c6dc6f1cdb359e7e487fd91cea82a446157b65da34f0481cd58bbe03b0e005643087c802962e89316a1c816e2c6b625f1259b10a52bbf902f79e6
 EBUILD xar-1.8-r2.ebuild 1511 BLAKE2B f3985ed17c6fae99e56094532f4b80b08cf366e1b2d1f757341ad7ad1a4a5f77b1fee9e760c6a652814140f4292d523584642e5dddbab657cdd4bd18267e52e2 SHA512 ff409a3d7448b7a0c374d811fa90ea937c9e9356d0a10299a2f5c6ef219154555a8040ade702c93c792607a39ed332ef2bdbd612908bb3fb51b8c0aec47a0ef2
 EBUILD xar-1.8-r4.ebuild 2419 BLAKE2B 79f316c9983b4d02e7c344f3604e3c9d74b26179482998e1fd9e9ca797aa90d50a5a7791ff0075d163260a99565ba61e3eb11b33ef6ebd6ca3e5afb8bf724abc SHA512 d3849273275eba79b7888f7774853f96b53bac5291cafe1617f714ed29b0fd0ae78d8333ecefa10fa0d4de796f0280b55eb1f8fb526556e7b08f7bebbad9583f
 EBUILD xar-1.8.0.0.452.ebuild 2583 BLAKE2B c3f7136cffff772d5d4405b8a7f8606d13498f4a06f34ad6a39b81e163a138cf663768280928a555a32b0fb880ed141c29cfb3d4bc12961cf883addaecf37460 SHA512 667cb5b095802ae52fac391d97d32903f30612b9ea5a788668fb53f9992ecc5b8d658aa7d8f10e33a978bd6a319de1787a70147130ea88e77d9e02bef2121878
+EBUILD xar-1.8.0.0.487.100.1.ebuild 2799 BLAKE2B 7bdb805bb4564e5aeafe204314f9d226f990fa82407480f905662ea037d7f29307beed728977c81a0832292c486ff3b0228e3ac36d37e251e3ded29a63802050 SHA512 9fb78682583e965e7a15a42b517d9fd1236ca291bdb9d5a8cde7a8454dfed49b0db7ce4c5d703f0f563eaf5543bc0a65d097d00ab636d1f18d1bf2d44254ed45
 MISC metadata.xml 896 BLAKE2B 6276428173e9e59e3bd792a6df84b865eb695bf2591a8586b9903d1eb275af3a10d2295c9e37f452e911aa771f30a902c7b1361c83a1c5280f442a6652437c59 SHA512 7088753baae558cf466eb6a3af584d406ea09c5065f235d1e44d891731055fb88acd8957e764554b41d86d8fbf7cea21deaacdd2b38d9f8b05744202252ec271
diff --git a/app-arch/xar/files/xar-1.8.0.0.487-non-darwin.patch b/app-arch/xar/files/xar-1.8.0.0.487-non-darwin.patch
new file mode 100644
index 000000000000..c350f69f4ca0
--- /dev/null
+++ b/app-arch/xar/files/xar-1.8.0.0.487-non-darwin.patch
@@ -0,0 +1,12 @@
+don't do availability stuff on non-Darwin
+
+--- a/include/xar.h.in
++++ b/include/xar.h.in
+@@ -52,6 +52,7 @@
+ #import <os/availability.h>
+ #else
+ #define API_DEPRECATED(...)
++#define API_AVAILABLE(...)
+ #endif
+ 
+ #pragma pack(4)
diff --git a/app-arch/xar/files/xar-1.8.0.0.487-variable-sized-object.patch b/app-arch/xar/files/xar-1.8.0.0.487-variable-sized-object.patch
new file mode 100644
index 000000000000..8779c1129cd7
--- /dev/null
+++ b/app-arch/xar/files/xar-1.8.0.0.487-variable-sized-object.patch
@@ -0,0 +1,18 @@
+GCC doesn't like this:
+
+filetree.c:744:9: error: variable-sized object may not be initialized
+
+Since there's nothing changing at runtime at all, just make the compiler
+see it's always going to be 1.
+
+--- a/lib/filetree.c
++++ b/lib/filetree.c
+@@ -740,7 +740,7 @@
+ 	size_t fspath1_size = 0, fspath2_size = 0;
+ 	size_t ns1_size = 0, ns2_size = 0;
+ 	const struct __xar_file_t * child1 = NULL, * child2 = NULL;
+-	const uint keys_to_ignore_count = 1;
++#define keys_to_ignore_count 1
+ 	char * keys_to_ignore[keys_to_ignore_count] = { "id" }; // ID is allowed ot mismatch
+ 	
+ 	// If the two pointers match, call it the same.
diff --git a/app-arch/xar/xar-1.8.0.0.487.100.1.ebuild b/app-arch/xar/xar-1.8.0.0.487.100.1.ebuild
new file mode 100644
index 000000000000..7e4e0547d540
--- /dev/null
+++ b/app-arch/xar/xar-1.8.0.0.487.100.1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools flag-o-matic toolchain-funcs multilib-minimal multilib
+
+APPLE_PV=$(ver_cut 5-)  # 487: macOS 12.3 and up
+DESCRIPTION="An easily extensible archive format"
+HOMEPAGE="https://github.com/apple-oss-distributions/xar/tree/xar-${APPLE_PV}"
+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 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-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
+)
+
+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
+}