gentoo auto-resync : 21:09:2024 - 12:11:53

3 files changed, 32 insertions, 3 deletions

diff --git a/app-arch/libarchive/Manifest b/app-arch/libarchive/Manifest
index 8451a908dd05..2897496b08f6 100644
--- a/app-arch/libarchive/Manifest
+++ b/app-arch/libarchive/Manifest
@@ -1,10 +1,11 @@
 AUX libarchive-3.7.2-lrzip.patch 1095 BLAKE2B 011c61282f5ad91436e8155458695c5f0b9144e21ae856ba319927e6431d9730257d6e7f7ebcc916ad784e24b2f4ff2af75955aa0493ea3705fa8826f632f163 SHA512 71e3aefe7d3e5faa6cd47e350e52135d594184d957cf3e2d592e3770971ff3fed8886b7fe6c897c94efa15b3b9e9d15be05686178d201b422d4503e3878b704d
 AUX libarchive-3.7.4-INT_MAX.patch 649 BLAKE2B 2b64a02ba2f0697bf33f5d92a9128d041a3109debce7baefc48ca94dbbf2ae4d57ad2a15592e4ebb86aaf06043c8ae7cd6bad7b4ca4335c77c6ce2601c00245e SHA512 9b505466296c61ad94c45abf3e76bc239ee1674ce2e89978d956d88ce04f4c0e91e881c049c143e7f6dbbe856112626c443a5960f7febbd7af20237d3077a452
+AUX libarchive-3.7.5-attr-dep.patch 850 BLAKE2B c07a80114f394638332fddc7a9af713c6bc64032c0480cfa5c30a4da0d2d895553c6a57f2fcdb7bf23421ac783c6bbe7807128c27d85a7559a16fb644a37cf53 SHA512 8c940fb4f3fa8896cb4f3e751183ca8c79ee8210ff8df57fbfa3d4abe41cdfd148b38b360f8bd476d90c5d5ce02e61e1ff1363431837642bb2fc8d9813b9e1b8
 AUX libarchive-3.7.5-iso9660-times.patch 10924 BLAKE2B 301543625d1da4df1fde704fad743023c15a3dc0d3cc45e0e18be80248a217b7d4ee8bf9109066c97b7bdd11a730474559a77219442a3b89dfdcc55986bb9ed0 SHA512 2cab04c0718f556db7335512b2f8aa97781550e9aafc54f5c302afbae21f4189472f23716e19248f80162df8eb784995a65968b79bc414aa338463b4655b1a0c
 DIST libarchive-3.7.4.tar.xz 5417660 BLAKE2B 128f72235da61e112201046c0cfe62a8c580cf73b426c4cfe270ae913356f6ad430ba33a663dcd617b082c7baf45ada8d1c9928c45fea16fd57e8020693a60bc SHA512 84bc346ba15861ab10aa54a3d687de955178e4efbe12bf3a49a467181e7f819673949f131f4c8338de8ed6e319a8565af376e5a540380bda08e60dffbc7c8686
 DIST libarchive-3.7.4.tar.xz.asc 659 BLAKE2B 77e705194f6e9a9f97da0ac43c9b3157e1a8a490d26da34079e4ef3f2bcf98d6f6e95567e110287fab0ec26d3fc27e5bbeff7569c9ca138de2caf47af737c6d0 SHA512 82caa18a78661ea717ce93cdcb0806eed48450c20fb4d45cb4c33001f2d4d0fb5a791552acbb24ad8c41772e1d0b66c76c9cb86946bc862109721a0c986f5331
 DIST libarchive-3.7.5.tar.xz 5437940 BLAKE2B e1cf8490b2db64e912bd181391310653b4e3524e74f35557e1ddb8c5eb53dcde307da945d393921acf7549ef0d4a6bf228d8f42ab4d795d06dd2248196a11c85 SHA512 b9cfb0a147bf0f77cca9e2bdea173f47a78dcba5df1d97a8e0e7b14a15039ac6d5467e325423b2a05741848f73ca7ab4fece922153f24f934f9370cb521d20df
 DIST libarchive-3.7.5.tar.xz.asc 659 BLAKE2B 7310b8d7e3f07b8c75910ff3355ffda653402ca2d6db9cdf7d669b9a4ac5f3fb4c4c4482e85184fd68a23c96bce587a95b56efb88ae971399e130e533bd0969a SHA512 7494518b61a58a9aa1e991a2cf6b16340e34d7aa2c25a3c531799785e165541781d1a915437260bc536fe8267140cc69abb2670e8c0576e975a5a2b7ecf8e20d
 EBUILD libarchive-3.7.4.ebuild 4800 BLAKE2B 45f23a859e54c94ba18842c75e6190172b9ee3063707096a2112e8976306152002fcebeac89f68a5dbdc4725411955f141afec4b2d573e7c82850846c41c8b9c SHA512 87b80d7f9c15a8a6eaefa9c7a18db92550d480df75a5439607a9ad94db7abf21af15ce0d82d2b3d9669fc75c32c756fbe51d2efe2aff42b0d55537ff3645cdb1
-EBUILD libarchive-3.7.5.ebuild 4823 BLAKE2B ab11c8b2eec52ceb1ea9c391be3f87421bf8f420349ac5d83c8d9f4fd1a6aaf1708ada4c9d3a857ca40795627d23b2a1c9327b1e80c36fc76244d9f30e704205 SHA512 421dbf959618f980d4d1e468b2c8fd1baf3021614f6c86af64a46d5b0e9eabc9cf05ddf5832f216e0adf89e42f41fa72cca0ec2c1657a93c70658281d5309967
+EBUILD libarchive-3.7.5.ebuild 4802 BLAKE2B 072e89d6966a254e2efc4dfdb2fa25bfafa70238064ae9dfbbfc6b508f1b4606fd6e512ffa92676e13f3489cb9213f2034a304c90a7a19f476511a6420d6d6f6 SHA512 5461b1bd9261563eae10e4232f0c1fb30bbfad24891618b97a8306a74ed9f3015b00354a6f019e696f8648731cfd7b47b55ed2f1805074081ed622099bb9d30e
 MISC metadata.xml 1224 BLAKE2B 538433528de5543ad8e912ce0d072340be3f6eeefe16320ef48b3c30a35ebdff4a32055edf89f36e4479ab1468c620871fcb5ba91bd66e81798093b4d0345949 SHA512 9f53d623a02334f675c06edea2829ce52e78d85e3894e684ae920a678eb47046393b7a93808c7e1761d30a69faa5986cd4922ae7ef8f1e2ef221de39869bd12b
diff --git a/app-arch/libarchive/files/libarchive-3.7.5-attr-dep.patch b/app-arch/libarchive/files/libarchive-3.7.5-attr-dep.patch
new file mode 100644
index 000000000000..3b26c51ea9d9
--- /dev/null
+++ b/app-arch/libarchive/files/libarchive-3.7.5-attr-dep.patch
@@ -0,0 +1,28 @@
+From 44b8e3b676746352cb3e08f76e58510c78209091 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Wed, 18 Sep 2024 14:10:58 +0200
+Subject: [PATCH] tar/write.c: Support `sys/xattr.h`
+
+Synchronize the last use of `attr/xattr.h` to support using
+`sys/xattr.h` instead.  The former header is deprecated on GNU/Linux,
+and this replacement makes it possible to build libarchive without
+the `attr` package.
+---
+ tar/write.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/tar/write.c b/tar/write.c
+index 1d1139f4c..43cd70233 100644
+--- a/tar/write.c
++++ b/tar/write.c
+@@ -32,7 +32,9 @@
+ #ifdef HAVE_SYS_STAT_H
+ #include <sys/stat.h>
+ #endif
+-#ifdef HAVE_ATTR_XATTR_H
++#if HAVE_SYS_XATTR_H
++#include <sys/xattr.h>
++#elif HAVE_ATTR_XATTR_H
+ #include <attr/xattr.h>
+ #endif
+ #ifdef HAVE_ERRNO_H
diff --git a/app-arch/libarchive/libarchive-3.7.5.ebuild b/app-arch/libarchive/libarchive-3.7.5.ebuild
index dbe3b684bfbd..4a367180b758 100644
--- a/app-arch/libarchive/libarchive-3.7.5.ebuild
+++ b/app-arch/libarchive/libarchive-3.7.5.ebuild
@@ -38,12 +38,10 @@ RDEPEND="
 	nettle? ( dev-libs/nettle:=[${MULTILIB_USEDEP}] )
 	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
 "
-# TODO: fix attr/xattr.h includes and remove sys-apps/attr dep
 DEPEND="${RDEPEND}
 	kernel_linux? (
 		virtual/os-headers
 		e2fsprogs? ( sys-fs/e2fsprogs[${MULTILIB_USEDEP}] )
-		xattr? ( sys-apps/attr[${MULTILIB_USEDEP}] )
 	)
 	test? (
 		app-arch/lrzip
@@ -75,6 +73,8 @@ PATCHES=(
 	"${FILESDIR}/${PN}-3.7.2-lrzip.patch"
 	# https://github.com/libarchive/libarchive/pull/2330
 	"${FILESDIR}/${P}-iso9660-times.patch"
+	# https://github.com/libarchive/libarchive/pull/2335
+	"${FILESDIR}/${P}-attr-dep.patch"
 )
 
 src_prepare() {