gentoo auto-resync : 21:02:2025 - 00:15:53

5 files changed, 10 insertions, 164 deletions

diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 70bbc80b6ec0..761f1c5b2c58 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest
index 52a20f87ab57..af814765ba2b 100644
--- a/sys-fs/xfsprogs/Manifest
+++ b/sys-fs/xfsprogs/Manifest
@@ -1,15 +1,12 @@
 AUX xfsprogs-5.3.0-libdir.patch 1137 BLAKE2B 7e455b8b82c553a819155fb4c1fee3d5c31bef0fa4c7ab0bf4ad4558a9a5b0b2f408138558c3601deb3ba85d465ab2dae5248bc20a4ba83f08cf733b27a796a1 SHA512 eaec31b6dab500c2e9c4fe7d5d82e60a40f3073cff99af0ae2aa817f6e4541f6a3de0a48f9151a274c6dd97e99ca26192b95b920aea1c5227d75232b808c98fa
-AUX xfsprogs-6.10.0-c++-void.patch 1651 BLAKE2B dafb054348f0b2362976d74c55821a2440ac98a80197af532facb4b65bb8947fa77ec52795b90a58196b77778078b2bf887b7b9d05d420c26193c8e63b98fe4d SHA512 09df6b846621c0bea65628e38c286935eb1fc2d7d1a3a08877c3121cc012df9345a53dc12e4ec43785500d890767d02e5e9ba144c2bfb67d2bf5812ba2987bcf
-DIST xfsprogs-6.10.0.tar.xz 1449872 BLAKE2B dc02fb14cd07e20d618070358700003a0990125ce3d8b15fa0248c6d494a89bbfb51c267583fc863edeee0d84069c7016f7992e750faa357618cd0d7f5748d2e SHA512 ec80eedfd3471c836e99eb8507c0de2895f261d36316145b02f2effbcc1bb5a52eae3ad2148d45bc49f1a30e0267aa4e3f3176a5e01ec84b2da24b3fb430ffce
 DIST xfsprogs-6.10.1.tar.xz 1449932 BLAKE2B e9ed15b2d4a9026e0079adfb38578721e13498290a5d9590edae1fd41c9ee0338f9b823568677394952709d82bdc8ade36905a2266ffe64803901adbadfa5643 SHA512 b9fd7b7eaf038772ee4a9602bf38f714db7077731ec8904e0959d28b0103d443be8ae67720869012b90737c1ff440fbce44b3b23b662939c9a90c6d3be3fab08
 DIST xfsprogs-6.11.0.tar.xz 1457084 BLAKE2B 846b25ad36477d71f8f2091ad16699356416f09befbb4250335081d2a8fd78011e9100fbabfb727acdb65520a38c912d9bb9e33b17c222c97de88fd00ab004a9 SHA512 209b479e510e5d5c558430b523bebd90f34b2effeac46f783aad4ec45a9f39998ca1efc67155c54c22e778859968f4b275b0ca6f225603f17ae4cc5c7596a4ca
 DIST xfsprogs-6.12.0.tar.xz 1471672 BLAKE2B 471832b07bc2cca5bde6e1ac253d151b0889f7b7be75ae322727299a83329899d4c3aac8217b069fee3f7abc6bc964127c35a206b04cb796999497f5ad701f44 SHA512 020810b4a261f4ab4eb94aae813f22b26bb9f17705967198189509e684422361dd80af938e4a77cf326353d5d61d5aeaaee9a34e8a7b8ed1dddd63b7ad1b0510
+DIST xfsprogs-6.13.0.tar.xz 1506676 BLAKE2B 98a8b51ba7fb7f58ea292e9c4624ca3c2337d962f832d92549763a85036b8ba0579de0d172465227eb51cc5c51e3b5d4f54144690001ea8b6795b3a43bc41b9b SHA512 9fd73c8585cd295b79b227cd5855407da4b3ea2d40a1ca82e0a93887644b497cced182960bcd8f3c45805dda4a244d1555fd49da5d7e82fe4525d345c766a63a
 DIST xfsprogs-6.8.0.tar.xz 1367196 BLAKE2B 8c296698da1170bb7ff369c2bf5f156e812ddf43ee817369029ad951d6c1e18c20d093db385b9a523f6cb7ba3e01f8924eb3540b71efa4bec8bf3defe2418562 SHA512 f5b5c6d8da70cc0f3361b3420982aabfabb0bc54b9eb60b93a9aaeedb33a9ecede4061d5c1300b96d7aba7d44a4207672c4a33e115bf0f5c711a151f3fc65e0d
-DIST xfsprogs-6.9.0.tar.xz 1383116 BLAKE2B d952603716cc4022a935c426630b0b7838573476a730c6832f36ef0274a640e64667d3e3a2dd9fd2c5f2c12cdb348fd93abfef5c49e5c5fe2d5a83945dfc7894 SHA512 c597453759c400690810971f0b2daf0e4e22c74270b0f9800e2235da5e5c1383b59bc1176c5bba0023f74b623020fb51c62f0e98a74885cf3a8336e0b81c9023
-EBUILD xfsprogs-6.10.0-r2.ebuild 2859 BLAKE2B 527366c51df7a215fce8b0e7d2d366e6d587dc37b86b379488aaa31e668eb495af757af8baf6d436a2ef760affd6fe7b2d47afe8a6088f5b6d130c9cbc098cd0 SHA512 9b8d76a07e4d5ffb26453b58f18f8739d95d4e9c3f6ff89d9e7222fbd7aa261570c63b7f1af49a5e001bc337c7e90ec2fca019ef429eae0bd617f82d25d8040c
 EBUILD xfsprogs-6.10.1.ebuild 2795 BLAKE2B 03fad313fe94ab824066c2d7c3a9d0f02d8cf1833b21fc3f71bb38a0802c145f2ce11e7ac2745ea298a88cf487d0b5d86eeb4cd0a010bf4e4e05029e1f45157a SHA512 ec1698750ee990598979bfb3fd6e662590c546560317043772d564fbb048ec6d11ea8e29b92d1c744b02bf2833c08ce4c59bc445e6d04d03a0b43ad21c407291
 EBUILD xfsprogs-6.11.0.ebuild 2913 BLAKE2B cd505b5b3d6bc37b94ea4fae6b875363621a10b94a9c7c0ad949e27db3515370c9413657406fafe0366907c80ea8f3b6af28e2b42ebb61939bbfd11a3ec4f2f3 SHA512 05789d6fad97041eb1723d1fd615b3f41975413297e62b04559462a6db3dfffb88d515dfd16de398bd927a9c85fd954d8b131f971af18d7ed1170c1d1d65221b
 EBUILD xfsprogs-6.12.0.ebuild 2957 BLAKE2B b2af9e5824482026d38459b86c383b4659958532b71d3450acc2052de625085efdd7862fa662dff89eae910e6850677469912e6588494ac19c9eefc1112c0404 SHA512 c8c7898ec4b02eb9e5b9a0a1ddf3c0d30928a879e9320125113c38aaf27cdd5235c0081bf1b406fed2b610384abf178be372c5441f9d97c864525259f0328713
+EBUILD xfsprogs-6.13.0.ebuild 2957 BLAKE2B b2af9e5824482026d38459b86c383b4659958532b71d3450acc2052de625085efdd7862fa662dff89eae910e6850677469912e6588494ac19c9eefc1112c0404 SHA512 c8c7898ec4b02eb9e5b9a0a1ddf3c0d30928a879e9320125113c38aaf27cdd5235c0081bf1b406fed2b610384abf178be372c5441f9d97c864525259f0328713
 EBUILD xfsprogs-6.8.0.ebuild 2589 BLAKE2B 724a51c203639b6ef3a1e60e04705ca46084acf58c59bed0ae8615fdfe60b8ba473092eb33b72b1276ca86b81a9dcdfcbda613a4c0643b061e1877ea139600d8 SHA512 9c2a1aadc1a5122e48768cbe60d6179c1e172960a92218767fcdf03adcf5a64b694798591c620e5045d131da61058a8651333607abe6ae237b607bddf8d1a5e7
-EBUILD xfsprogs-6.9.0.ebuild 2597 BLAKE2B 38ba299dc0db1edac052fa0336a4723f395e0c7a1372c66269f0c012a2ccc17e11c929f050d1dab935bb976ff5702cfc4f9399893aa322a347ad73fa2651911f SHA512 29071b95a57a12e68fdcfb0641d5fb0a357aff1b77aebe607f777e6ded28d1472764f6bcb01987dcd3296cef20c50bce820cc1f166255650adfae6ebe834e9a2
 MISC metadata.xml 339 BLAKE2B b7d67fc8bcf854e7a2453c23e5d5d8c193525ccd16a643e80415a103d2d22c892458ea6ada32653d04b3d471c780f07b2b0537a317d9e64468130e065c6f5ab1 SHA512 445b4f6d853a272cc6bf8fde42745adf226512fa310f9af4bbabad4cfa5a6888b2c2215dfc0896c07b800820b69417c6d408bb21ed17a5224b5c9e3412c5f62d
diff --git a/sys-fs/xfsprogs/files/xfsprogs-6.10.0-c++-void.patch b/sys-fs/xfsprogs/files/xfsprogs-6.10.0-c++-void.patch
deleted file mode 100644
index 04b71ff89fc0..000000000000
--- a/sys-fs/xfsprogs/files/xfsprogs-6.10.0-c++-void.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-https://bugs.gentoo.org/938569
-https://lore.kernel.org/linux-xfs/172480131521.2291268.17945339760767205637.stgit@frogsfrogsfrogs/
-
-From fd885ea4d54be6e98df7342bd99b77bc8cbd64d5 Mon Sep 17 00:00:00 2001
-Message-ID: <fd885ea4d54be6e98df7342bd99b77bc8cbd64d5.1724802060.git.sam@gentoo.org>
-From: "Darrick J. Wong" <djwong@kernel.org>
-Date: Tue, 27 Aug 2024 16:33:58 -0700
-Subject: [PATCH] xfs: fix C++ compilation errors in xfs_fs.h
-
-Several people reported C++ compilation errors due to things that C
-compilers allow but C++ compilers do not.  Fix both of these problems,
-and hope there aren't more of these brown paper bags in 2 months when we
-finally get these fixes through the process into a released xfsprogs.
-
-Reported-by: kernel@mattwhitlock.name
-Reported-by: sam@gentoo.org
-Closes: https://bugzilla.kernel.org/show_bug.cgi?id=219203
-Fixes: 233f4e12bbb2c ("xfs: add parent pointer ioctls")
-Signed-off-by: Darrick J. Wong <djwong@kernel.org>
----
- libxfs/xfs_fs.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/libxfs/xfs_fs.h b/libxfs/xfs_fs.h
-index 454b63ef..2b8e1f4f 100644
---- a/libxfs/xfs_fs.h
-+++ b/libxfs/xfs_fs.h
-@@ -906,13 +906,13 @@ static inline struct xfs_getparents_rec *
- xfs_getparents_next_rec(struct xfs_getparents *gp,
- 			struct xfs_getparents_rec *gpr)
- {
--	void *next = ((void *)gpr + gpr->gpr_reclen);
-+	void *next = ((char *)gpr + gpr->gpr_reclen);
- 	void *end = (void *)(uintptr_t)(gp->gp_buffer + gp->gp_bufsize);
- 
- 	if (next >= end)
- 		return NULL;
- 
--	return next;
-+	return (struct xfs_getparents_rec *)next;
- }
- 
- /* Iterate through this file handle's directory parent pointers. */
--- 
-2.46.0
-
diff --git a/sys-fs/xfsprogs/xfsprogs-6.10.0-r2.ebuild b/sys-fs/xfsprogs/xfsprogs-6.13.0.ebuild
index 7e71209b2ef8..d7ac475a1d1f 100644
--- a/sys-fs/xfsprogs/xfsprogs-6.10.0-r2.ebuild
+++ b/sys-fs/xfsprogs/xfsprogs-6.13.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -21,14 +21,13 @@ RDEPEND="
 	icu? ( dev-libs/icu:= )
 	libedit? ( dev-libs/libedit )
 "
-DEPEND="${RDEPEND}"
+DEPEND="
+	${RDEPEND}
+	>=sys-kernel/linux-headers-6.11
+"
 BDEPEND="nls? ( sys-devel/gettext )"
 RDEPEND+=" selinux? ( sec-policy/selinux-xfs )"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.10.0-c++-void.patch
-)
-
 src_prepare() {
 	default
 
@@ -86,7 +85,9 @@ src_configure() {
 }
 
 src_compile() {
-	emake V=1
+	# -j1 for:
+	# gmake[2]: *** No rule to make target '../libhandle/libhandle.la', needed by 'xfs_spaceman'.  Stop.
+	emake V=1 -j1
 }
 
 src_install() {
diff --git a/sys-fs/xfsprogs/xfsprogs-6.9.0.ebuild b/sys-fs/xfsprogs/xfsprogs-6.9.0.ebuild
deleted file mode 100644
index 48fe18a4a712..000000000000
--- a/sys-fs/xfsprogs/xfsprogs-6.9.0.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic systemd udev
-
-DESCRIPTION="XFS filesystem utilities"
-HOMEPAGE="https://xfs.wiki.kernel.org/ https://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git/"
-SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="icu libedit nls selinux static-libs"
-
-RDEPEND="
-	dev-libs/inih
-	dev-libs/userspace-rcu:=
-	>=sys-apps/util-linux-2.17.2
-	icu? ( dev-libs/icu:= )
-	libedit? ( dev-libs/libedit )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="nls? ( sys-devel/gettext )"
-RDEPEND+=" selinux? ( sec-policy/selinux-xfs )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.3.0-libdir.patch
-)
-
-src_prepare() {
-	default
-
-	# Fix doc dir
-	sed -i \
-		-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
-		include/builddefs.in || die
-
-	# Don't install compressed docs
-	sed 's@\(CHANGES\)\.gz[[:space:]]@\1 @' -i doc/Makefile || die
-}
-
-src_configure() {
-	# include/builddefs.in will add FCFLAGS to CFLAGS which will
-	# unnecessarily clutter CFLAGS (and fortran isn't used)
-	unset FCFLAGS
-
-	# If set in user env, this breaks configure
-	unset PLATFORM
-
-	export DEBUG=-DNDEBUG
-
-	# Package is honoring CFLAGS; No need to use OPTIMIZER anymore.
-	# However, we have to provide an empty value to avoid default
-	# flags.
-	export OPTIMIZER=" "
-
-	# Avoid automagic on libdevmapper (bug #709694)
-	export ac_cv_search_dm_task_create=no
-
-	# bug 903611
-	use elibc_musl && append-flags -D_LARGEFILE64_SOURCE
-
-	# Build fails with -O3 (bug #712698)
-	replace-flags -O3 -O2
-
-	# Upstream does NOT support --disable-static anymore,
-	# https://www.spinics.net/lists/linux-xfs/msg30185.html
-	# https://www.spinics.net/lists/linux-xfs/msg30272.html
-	local myconf=(
-		--enable-static
-		# Doesn't do anything beyond adding -flto (bug #930947).
-		--disable-lto
-		--with-crond-dir="${EPREFIX}/etc/cron.d"
-		--with-systemd-unit-dir="$(systemd_get_systemunitdir)"
-		--with-udev-rule-dir="$(get_udevdir)/rules.d"
-		$(use_enable icu libicu)
-		$(use_enable nls gettext)
-		$(use_enable libedit editline)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	emake V=1
-}
-
-src_install() {
-	# XXX: There's a missing dep in the install-dev target, so split it
-	emake DIST_ROOT="${ED}" HAVE_ZIPPED_MANPAGES=false install
-	emake DIST_ROOT="${ED}" HAVE_ZIPPED_MANPAGES=false install-dev
-
-	if ! use static-libs; then
-		rm "${ED}/usr/$(get_libdir)/libhandle.a" || die
-	fi
-}
-
-pkg_postrm() {
-	udev_reload
-}
-
-pkg_postinst() {
-	udev_reload
-}