4 files changed, 22 insertions, 109 deletions
diff --git a/app-arch/xar/Manifest b/app-arch/xar/Manifest
index 5fb4e06ff4ff..e38f30ccef40 100644
--- a/app-arch/xar/Manifest
+++ b/app-arch/xar/Manifest
@@ -1,2 +1 @@
-DIST xar-487.100.1.tar.gz 224108 BLAKE2B 2fa5c44b46a9e37e49be03d05d6d06ab706b5205d857e6d6f24954160dbf5fc91fbec848053cb2d0a11505e5f7c37f8331ac126d65eb91b08e302a28db12acc0 SHA512 a45d1327ac5c6dc6f1cdb359e7e487fd91cea82a446157b65da34f0481cd58bbe03b0e005643087c802962e89316a1c816e2c6b625f1259b10a52bbf902f79e6
 DIST xar-498.tar.gz 224373 BLAKE2B 56dfae475f23384b57492d6a5e141a4c93f7b0238de04be8bbcde63fe7ca0a9beb137b5b9052b165717cd2afae4ddfe5005e65ba16d1821c42e036a9ef9d0e04 SHA512 ecd6186e42ff3005296d94ce01d7fbea04814f26afe1df0449ffa522009ec85beafc71e25931b215910c159a2440565e7dd31a6a7c50389a50a1368bd5ff5f75
diff --git a/app-arch/xar/metadata.xml b/app-arch/xar/metadata.xml
index e2338ba5726b..ff832177ed14 100644
--- a/app-arch/xar/metadata.xml
+++ b/app-arch/xar/metadata.xml
@@ -1,19 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>prefix@gentoo.org</email>
-		<name>Gentoo Prefix</name>
-	</maintainer>
-	<longdescription lang="en">
-		The XAR project aims to provide an easily extensible archive format.
-		Important design decisions include an easily extensible XML table of
-		contents for random access to archived files, storing the toc at the
-		beginning of the archive to allow for efficient handling of streamed
-		archives, the ability to handle files of arbitrarily large sizes, the
-		ability to choose independent encodings for individual files in the
-		archive, the ability to store checksums for individual files in both
-		compressed and uncompressed form, and the ability to query the table of
-		content's rich meta-data.
-	</longdescription>
+  <maintainer type="project">
+    <email>prefix@gentoo.org</email>
+    <name>Gentoo Prefix</name>
+  </maintainer>
+  <longdescription lang="en">
+    The XAR project aims to provide an easily extensible archive format.
+    Important design decisions include an easily extensible XML table of
+    contents for random access to archived files, storing the toc at the
+    beginning of the archive to allow for efficient handling of streamed
+    archives, the ability to handle files of arbitrarily large sizes, the
+    ability to choose independent encodings for individual files in the
+    archive, the ability to store checksums for individual files in both
+    compressed and uncompressed form, and the ability to query the table of
+    content's rich meta-data.
+  </longdescription>
+  <upstream>
+    <remote-id type="github">apple-oss-distributions/xar</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-arch/xar/xar-1.8.0.0.487.100.1-r1.ebuild b/app-arch/xar/xar-1.8.0.0.487.100.1-r1.ebuild
deleted file mode 100644
index 7bc8655d3604..000000000000
--- a/app-arch/xar/xar-1.8.0.0.487.100.1-r1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2025 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-)  # 487: macOS 12.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 ~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}]
-	virtual/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
-}
diff --git a/app-arch/xar/xar-1.8.0.0.498-r1.ebuild b/app-arch/xar/xar-1.8.0.0.498-r1.ebuild
index 84c5ab3e5689..4822c37eece8 100644
--- a/app-arch/xar/xar-1.8.0.0.498-r1.ebuild
+++ b/app-arch/xar/xar-1.8.0.0.498-r1.ebuild
@@ -1,21 +1,22 @@
 # Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 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"
+S=${WORKDIR}/${PN}-${PN}-${APPLE_PV}/${PN}
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris"
 
 DEPEND="
 	elibc_musl? ( sys-libs/fts-standalone )
-	kernel_linux? ( virtual/acl )
+	kernel_linux? ( virtual/acl[${MULTILIB_USEDEP}] )
 	dev-libs/openssl:0=[${MULTILIB_USEDEP}]
 	app-arch/bzip2[${MULTILIB_USEDEP}]
 	virtual/zlib:=[${MULTILIB_USEDEP}]
@@ -35,8 +36,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.8.0.0.498-impl-decls.patch
 )
 
-S=${WORKDIR}/${PN}-${PN}-${APPLE_PV}/${PN}
-
 src_prepare() {
 	default