commit: eecf7651a7824fa3ddc88914ddf40b0a8cde330d Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> AuthorDate: Thu Dec 18 07:39:17 2025 +0000 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> CommitDate: Thu Dec 18 07:40:21 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eecf7651
app-arch/xar: fix virtual/acl dep for multilib Thanks Sam for pointing out in bug 933353#c11. Closes: https://bugs.gentoo.org/933353 Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> app-arch/xar/metadata.xml | 33 ++++++++++++++++++--------------- app-arch/xar/xar-1.8.0.0.498-r1.ebuild | 7 +++---- 2 files changed, 21 insertions(+), 19 deletions(-) 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>[email protected]</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>[email protected]</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.498-r1.ebuild b/app-arch/xar/xar-1.8.0.0.498-r1.ebuild index 5135156592e4..4d058583dadf 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,13 +1,14 @@ # 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" @@ -15,7 +16,7 @@ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86 ~amd6 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
