From f9f6fa91738181ebe9aca71b75d157d8b5df5335 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Mon, 18 Nov 2024 03:03:03 +0000
Subject: gentoo auto-resync : 18:11:2024 - 03:03:03

---
 sys-fs/Manifest.gz                                 | Bin 22261 -> 22261 bytes
 sys-fs/lvm2/Manifest                               |   3 +-
 .../lvm2/files/lvm2-2.03.22-thin-autodetect.patch  | 137 +++++++++
 sys-fs/lvm2/lvm2-2.03.22-r5.ebuild                 | 307 --------------------
 sys-fs/lvm2/lvm2-2.03.22-r6.ebuild                 | 316 +++++++++++++++++++++
 sys-fs/udisks/Manifest                             |   2 +-
 sys-fs/udisks/udisks-2.10.1-r1.ebuild              |   2 +-
 7 files changed, 457 insertions(+), 310 deletions(-)
 create mode 100644 sys-fs/lvm2/files/lvm2-2.03.22-thin-autodetect.patch
 delete mode 100644 sys-fs/lvm2/lvm2-2.03.22-r5.ebuild
 create mode 100644 sys-fs/lvm2/lvm2-2.03.22-r6.ebuild

(limited to 'sys-fs')

diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 292d61350048..ce37aae3f1fb 100644
Binary files a/sys-fs/Manifest.gz and b/sys-fs/Manifest.gz differ
diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest
index cf9fa721ca32..148e8dc22b05 100644
--- a/sys-fs/lvm2/Manifest
+++ b/sys-fs/lvm2/Manifest
@@ -10,6 +10,7 @@ AUX lvm2-2.03.20-dmeventd-no-idle-exit.patch 2174 BLAKE2B e5b53504feeac84e045839
 AUX lvm2-2.03.20-example.conf.in.patch 1317 BLAKE2B dee2843e512bb16e4d64c7e76141133222c46a7b6776418f19af56139ed0764401cc8b49be06d18358f3e32277fbcc34b644e8e4e104a8eca25eb6f90e2b362d SHA512 1d724b75e441bd7ff0836ab1ae685401817aeccfc5c312c7ce73b3ef70bf4413829f7e07f13399cae6d7085503eaf8566df936fc79185ef9d6f9ad773fcc9fef
 AUX lvm2-2.03.20-freopen-musl.patch 1595 BLAKE2B 4e019fbf8b89f79ca19eb821bc434d84d5c986a10d82b4a33a3cc4b8b6aa30c27e912e2ab0d067cab94feb28b53826725f43dd0973a60482c20e6417149b6a35 SHA512 40e49bb34a9c07493ab6a9948e3ac1a85e22f069b69ad2a1369cb7d30a6ea6d72a27f380ad8951f55d939834e2f29c9da589ae475322ea41b4dfce72060b9557
 AUX lvm2-2.03.22-autoconf-2.72-egrep.patch 841 BLAKE2B 89f2e2766fc915091292d4e19e9ba6cdda424ff1a6d160faaf0a62fa7156ddcfd47b36ce34df5981eb91db28f5ae2755a0a67c73bce86962f455ad73289885c7 SHA512 8e8218c628e617896456caafa3f83d4a95e54bd1edd9f0e003b3f922bab2935e16d19f18b6f2514c7f7b70d3ad54787669cd3e8b9770d2f1d0a8963c759b6520
+AUX lvm2-2.03.22-thin-autodetect.patch 6106 BLAKE2B 0707e8bcacf33a88eac8c77cad75d96b90988ccb39966f673a115b09fb025e89e62b472b5e5c8257e5d30938584c1df3bdd113cec890a05006e031240209b515 SHA512 ea2874a544ac104219e34e00f016b201f1dc27f632c9d83d6780c4a5d1461924929fde92469e7d40a23f727cc1b024a039f61d30a41b7b465e3f813d3620d643
 AUX lvm2-2.03.22-thin-version-checking.patch 2619 BLAKE2B ce32b0b0dd8d7036784b100d4b7daf7eeffb2aa94db22a1bb4a7f809c77eab3baa33d1ea114be0aed0071349fc8299ec1330213da9639e262ace536b8849e966 SHA512 f5a93f85b4be3d133c30163acab90000190c50b1070619d308eb31ace8136145053e9020964459f779d4dc1b3bf9f3bcc61f74d00c5ce176b9cd695bd048025c
 AUX lvmlockd.initd-r2 390 BLAKE2B aebfa2a654eca784da24fd4e4d46b3e6c97256a42b725e015a13c9673e79c0d1a10213d1eecb6c75d4ce1ebd99e6200010f19c36d758018bdef303ea08ee5549 SHA512 6359b3cbff1fa05944fb69582234220cac593b2c8f8317162a728bac72ced4f8b492ce11e6ced6d848a7654fa4a506c1e658f546cff302344a739646479a62dc
 AUX lvmpolld.initd-r1 348 BLAKE2B cba0419add6591320dc60ef7616b66706e042b566284a4ec42002fbb5331a7173fc8b4b39be7198426fe4bbdcd3ad94b69fc3d8950705b6331c5f3f4cda4ad66 SHA512 b9b8376cbc8b6703868afab18e5baa4ef5354569e57f0596d38a8005fa725299f6858ac86b39fcca10e5a0f1adbd3a4cfa6cc6b62405e78916cc1287d8b36d0d
@@ -17,5 +18,5 @@ DIST LVM2.2.03.21.tgz 2742294 BLAKE2B 529bc01b3d1ba6207c9ddc95309b39e6293fcd0286
 DIST LVM2.2.03.22.tgz 2755031 BLAKE2B 79bbea84bd82f111c1bb5de336e6a9f1368b2c9e43f075dccaa90c7746a364259ad278adf650379eca75f2803ed74e74dd372be2cca8518462182657f96a0033 SHA512 17cd24ceee8026481566824b688dafd03ec816201d5cb3549cb7fc8a36f4cdaa982faaef4dcd26debfe775dea5ffa2744798164314ea6dc99a84f8ccccfc33ff
 EBUILD lvm2-2.03.21-r1.ebuild 8612 BLAKE2B a5adec8263b994e58610e51c17ecef378d0da54c5f9ee83de959c7d53e67850afc8b74297f342915d4ccc6138f35630e7b4c832e0d7d198f0a040c052b4f9157 SHA512 b589a726b5dfe66bf2861e48ece483d774a86d373ee58859b393114c719a9511c418d5fd24204ab1674e4ae88f393bf342ee6e83f282f1356f35a192693d8ed7
 EBUILD lvm2-2.03.22-r1.ebuild 8572 BLAKE2B b03926843eb2baaed25fcf7b4f607163b18a2a8bfac59a2707b09d80ac49704ea737e40c9d083905b7fb02bad2de35aee853eee9c3423fb5d0fa7a6f6c052ba5 SHA512 993ad760ff582b8776c92f910c0eab3f015460240ec5ee77af743a4c9741c572ec2540af286287fc252b52c0f2950e5433af51d3e1ae616c3445c0a10464f7d4
-EBUILD lvm2-2.03.22-r5.ebuild 8655 BLAKE2B 0fcaa6d47dfb7eac0ba23f4b9afff97f1326c250697ba77077d9c9968be09da81684690ff26ffd8edb0f58a7f50c709c4d1898533b0e00d0fbe5235f34c9dd9d SHA512 acb9e341826506b3331bc06aa39eee05792baf0ffc2c5ba917f3ed65cd2162f42b1ddba44e95cf1e8af5df21635849f90aaeee1864b7ed29540e7227240403e5
+EBUILD lvm2-2.03.22-r6.ebuild 8811 BLAKE2B 6a05d6b0dbb51df6e7315334faf79bf996a46daad58da2c129ea53ce011b4cc692dc19628ffec2eda24467dc8048ff61591b36b6db84ba653777427cfb892bbf SHA512 9be4e8ea36e3147547e8b50638baca2d66ada91bb739ce7e4cd99338c0c0b6e918d8d8548d090d1133a95a4da6b70ff9c19186c48ddc700fa51cb4fd6bfbfe97
 MISC metadata.xml 831 BLAKE2B c34345ee897004b3776da0cb65cb1165156ecaf1802926f1b8d77eb25c836cebbb1833fadb0af3580b127c7852ac561ac20c877bcfd0cc80ea3b6283ed1ce975 SHA512 0be91bba800fc1db6dbad68e36b7d882a6bd41124a10e759322ccc661d123a689a2c0ea5f3fa2dfa40ae197c36b3171cb99d6630967805d57aa220543f0a1623
diff --git a/sys-fs/lvm2/files/lvm2-2.03.22-thin-autodetect.patch b/sys-fs/lvm2/files/lvm2-2.03.22-thin-autodetect.patch
new file mode 100644
index 000000000000..968601af5b38
--- /dev/null
+++ b/sys-fs/lvm2/files/lvm2-2.03.22-thin-autodetect.patch
@@ -0,0 +1,137 @@
+https://gitlab.com/lvmteam/lvm2/-/merge_requests/18
+
+From 25f0398b1c9d108160a39de43af6f2fa3f952db5 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Sun, 17 Nov 2024 10:45:29 -0500
+Subject: [PATCH] configure: update thin_check_needs_check logic
+
+If the user has explicitly passed a value for thin_check_needs_check,
+skip the autodetection logic entirely. Same for cache_check_needs_check.
+
+This allows lvm2 to be built consistently without having
+thin-provisioning-tools installed.
+---
+ configure.ac | 84 ++++++++++++++++++++++++++++------------------------
+ 1 file changed, 46 insertions(+), 38 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index cbea6adc6..4f77b4e6f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -422,7 +422,7 @@ dnl -- thin_check needs-check flag
+ AC_ARG_ENABLE(thin_check_needs_check,
+ 	      AS_HELP_STRING([--disable-thin_check_needs_check],
+ 			     [required if thin_check version is < 0.3.0]),
+-	      THIN_CHECK_NEEDS_CHECK=$enableval, THIN_CHECK_NEEDS_CHECK="yes")
++	      THIN_CHECK_NEEDS_CHECK=$enableval, THIN_CHECK_NEEDS_CHECK="autodetect")
+ 
+ # Test if necessary thin tools are available
+ # if not - use plain defaults and warn user
+@@ -437,20 +437,24 @@ AS_CASE(["$THIN"],
+ 			THIN_CONFIGURE_WARN="y"
+ 		])
+ 	])
+-	AS_IF([test "$THIN_CHECK_NEEDS_CHECK" = "yes" && test "$THIN_CONFIGURE_WARN" != "y"], [
+-		THIN_CHECK_VSN=$("$THIN_CHECK_CMD" -V 2>/dev/null)
+-		THIN_CHECK_VSN=${THIN_CHECK_VSN##* }  # trim away all before the first space
+-		THIN_CHECK_VSN_MAJOR=$(echo "$THIN_CHECK_VSN" | $AWK -F '.' '{print $1}')
+-		THIN_CHECK_VSN_MINOR=$(echo "$THIN_CHECK_VSN" | $AWK -F '.' '{print $2}')
+-
+-		AS_IF([test -z "$THIN_CHECK_VSN_MAJOR" || test -z "$THIN_CHECK_VSN_MINOR"], [
+-			AC_MSG_WARN([$THIN_CHECK_CMD: Bad version "$THIN_CHECK_VSN" found])
+-			THIN_CHECK_VERSION_WARN="y"
+-			THIN_CHECK_NEEDS_CHECK="no"
+-		], [test "$THIN_CHECK_VSN_MAJOR" -eq 0 && test "$THIN_CHECK_VSN_MINOR" -lt 3], [
+-			AC_MSG_WARN([$THIN_CHECK_CMD: Old version "$THIN_CHECK_VSN" found])
+-			THIN_CHECK_VERSION_WARN="y"
+-			THIN_CHECK_NEEDS_CHECK="no"
++	AS_IF([test "$THIN_CHECK_NEEDS_CHECK" = "autodetect"], [
++		AS_IF([test "$THIN_CONFIGURE_WARN" != "y"], [
++			THIN_CHECK_VSN=$("$THIN_CHECK_CMD" -V 2>/dev/null)
++			THIN_CHECK_VSN=${THIN_CHECK_VSN##* }  # trim away all before the first space
++			THIN_CHECK_VSN_MAJOR=$(echo "$THIN_CHECK_VSN" | $AWK -F '.' '{print $1}')
++			THIN_CHECK_VSN_MINOR=$(echo "$THIN_CHECK_VSN" | $AWK -F '.' '{print $2}')
++
++			AS_IF([test -z "$THIN_CHECK_VSN_MAJOR" || test -z "$THIN_CHECK_VSN_MINOR"], [
++				AC_MSG_WARN([$THIN_CHECK_CMD: Bad version "$THIN_CHECK_VSN" found])
++				THIN_CHECK_VERSION_WARN="y"
++				THIN_CHECK_NEEDS_CHECK="no"
++			], [test "$THIN_CHECK_VSN_MAJOR" -eq 0 && test "$THIN_CHECK_VSN_MINOR" -lt 3], [
++				AC_MSG_WARN([$THIN_CHECK_CMD: Old version "$THIN_CHECK_VSN" found])
++				THIN_CHECK_VERSION_WARN="y"
++				THIN_CHECK_NEEDS_CHECK="no"
++			], [
++				THIN_CHECK_NEEDS_CHECK="yes"
++			])
+ 		])
+ 	])
+ 	# Empty means a config way to ignore thin dumping
+@@ -535,7 +539,7 @@ dnl -- cache_check needs-check flag
+ AC_ARG_ENABLE(cache_check_needs_check,
+ 	      AS_HELP_STRING([--disable-cache_check_needs_check],
+ 			     [required if cache_check version is < 0.5]),
+-	      CACHE_CHECK_NEEDS_CHECK=$enableval, CACHE_CHECK_NEEDS_CHECK="yes")
++	      CACHE_CHECK_NEEDS_CHECK=$enableval, CACHE_CHECK_NEEDS_CHECK="autodetect")
+ 
+ # Test if necessary cache tools are available
+ # if not - use plain defaults and warn user
+@@ -550,30 +554,34 @@ AS_CASE(["$CACHE"],
+ 			CACHE_CONFIGURE_WARN="y"
+ 		])
+ 	])
+-	AS_IF([test "$CACHE_CHECK_NEEDS_CHECK" = "yes" && test "$CACHE_CONFIGURE_WARN" != "y"], [
+-		"$CACHE_CHECK_CMD" -V 2>/dev/null >conftest.tmp
+-		read -r CACHE_CHECK_VSN < conftest.tmp
+-		IFS=.- read -r CACHE_CHECK_VSN_MAJOR CACHE_CHECK_VSN_MINOR CACHE_CHECK_VSN_PATCH LEFTOVER < conftest.tmp
+-		rm -f conftest.tmp
+-
+-		# Require version >= 0.5.4 for --clear-needs-check-flag
+-		CACHE_CHECK_VSN_MAJOR=${CACHE_CHECK_VSN_MAJOR##* }
+-		AS_IF([test -z "$CACHE_CHECK_VSN_MAJOR" \
+-			|| test -z "$CACHE_CHECK_VSN_MINOR" \
+-			|| test -z "$CACHE_CHECK_VSN_PATCH"], [
+-			AC_MSG_WARN([$CACHE_CHECK_CMD: Bad version "$CACHE_CHECK_VSN" found])
+-			CACHE_CHECK_VERSION_WARN="y"
+-			CACHE_CHECK_NEEDS_CHECK="no"
+-		], [test "$CACHE_CHECK_VSN_MAJOR" -eq 0], [
+-			AS_IF([test "$CACHE_CHECK_VSN_MINOR" -lt 5 \
+-				|| ( test "$CACHE_CHECK_VSN_MINOR" -eq 5 && test "$CACHE_CHECK_VSN_PATCH" -lt 4 )], [
+-				AC_MSG_WARN([$CACHE_CHECK_CMD: Old version "$CACHE_CHECK_VSN" found])
++	AS_IF([test "$CACHE_CHECK_NEEDS_CHECK" = "autodetect"], [
++		AS_IF([test "$CACHE_CONFIGURE_WARN" != "y"], [
++			"$CACHE_CHECK_CMD" -V 2>/dev/null >conftest.tmp
++			read -r CACHE_CHECK_VSN < conftest.tmp
++			IFS=.- read -r CACHE_CHECK_VSN_MAJOR CACHE_CHECK_VSN_MINOR CACHE_CHECK_VSN_PATCH LEFTOVER < conftest.tmp
++			rm -f conftest.tmp
++
++			# Require version >= 0.5.4 for --clear-needs-check-flag
++			CACHE_CHECK_VSN_MAJOR=${CACHE_CHECK_VSN_MAJOR##* }
++			AS_IF([test -z "$CACHE_CHECK_VSN_MAJOR" \
++				|| test -z "$CACHE_CHECK_VSN_MINOR" \
++				|| test -z "$CACHE_CHECK_VSN_PATCH"], [
++				AC_MSG_WARN([$CACHE_CHECK_CMD: Bad version "$CACHE_CHECK_VSN" found])
+ 				CACHE_CHECK_VERSION_WARN="y"
+ 				CACHE_CHECK_NEEDS_CHECK="no"
+-			])
+-			AS_IF([test "$CACHE_CHECK_VSN_MINOR" -lt 7], [
+-				AC_MSG_WARN([$CACHE_CHECK_CMD: Old version "$CACHE_CHECK_VSN" does not support new cache format V2])
+-				CACHE_CHECK_VERSION_WARN=y
++			], [test "$CACHE_CHECK_VSN_MAJOR" -eq 0], [
++				AS_IF([test "$CACHE_CHECK_VSN_MINOR" -lt 5 \
++					|| ( test "$CACHE_CHECK_VSN_MINOR" -eq 5 && test "$CACHE_CHECK_VSN_PATCH" -lt 4 )], [
++					AC_MSG_WARN([$CACHE_CHECK_CMD: Old version "$CACHE_CHECK_VSN" found])
++					CACHE_CHECK_VERSION_WARN="y"
++					CACHE_CHECK_NEEDS_CHECK="no"
++				])
++				AS_IF([test "$CACHE_CHECK_VSN_MINOR" -lt 7], [
++					AC_MSG_WARN([$CACHE_CHECK_CMD: Old version "$CACHE_CHECK_VSN" does not support new cache format V2])
++					CACHE_CHECK_VERSION_WARN=y
++				])
++			], [
++				CACHE_CHECK_NEEDS_CHECK="yes"
+ 			])
+ 		])
+ 	])
+-- 
+2.47.0
+
diff --git a/sys-fs/lvm2/lvm2-2.03.22-r5.ebuild b/sys-fs/lvm2/lvm2-2.03.22-r5.ebuild
deleted file mode 100644
index e0a1e2d36d8c..000000000000
--- a/sys-fs/lvm2/lvm2-2.03.22-r5.ebuild
+++ /dev/null
@@ -1,307 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-TMPFILES_OPTIONAL=1
-inherit autotools linux-info systemd toolchain-funcs tmpfiles udev flag-o-matic
-
-DESCRIPTION="User-land utilities for LVM2 (device-mapper) software"
-HOMEPAGE="https://sourceware.org/lvm2/"
-SRC_URI="https://sourceware.org/ftp/lvm2/${PN^^}.${PV}.tgz"
-S="${WORKDIR}/${PN^^}.${PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="lvm readline sanlock selinux static static-libs systemd thin +udev valgrind"
-REQUIRED_USE="
-	static? ( !systemd !udev )
-	static-libs? ( static !udev )
-	systemd? ( udev )
-	thin? ( lvm )
-"
-
-DEPEND_COMMON="
-	udev? ( virtual/libudev:= )
-	lvm? (
-		dev-libs/libaio
-		sys-apps/util-linux
-		readline? ( sys-libs/readline:= )
-		sanlock? ( sys-cluster/sanlock )
-		systemd? ( sys-apps/systemd:= )
-	)
-"
-# /run is now required for locking during early boot. /var cannot be assumed to
-# be available -- thus, pull in recent enough baselayout for /run.
-# This version of LVM is incompatible with cryptsetup <1.1.2.
-RDEPEND="
-	${DEPEND_COMMON}
-	>=sys-apps/baselayout-2.2
-	lvm? (
-		virtual/tmpfiles
-		thin? ( >=sys-block/thin-provisioning-tools-1.0.6 )
-	)
-"
-# note: thin-0.3.0 is required to avoid --disable-thin_check_needs_check
-DEPEND="
-	${DEPEND_COMMON}
-	static? (
-		sys-apps/util-linux[static-libs]
-		lvm? (
-			dev-libs/libaio[static-libs]
-			readline? ( sys-libs/readline[static-libs] )
-		)
-		selinux? ( sys-libs/libselinux[static-libs] )
-	)
-	valgrind? ( >=dev-debug/valgrind-3.6 )
-"
-BDEPEND="
-	dev-build/autoconf-archive
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	# Gentoo specific modification(s):
-	"${FILESDIR}"/${PN}-2.03.20-example.conf.in.patch
-
-	# For upstream -- review and forward:
-	"${FILESDIR}"/${PN}-2.03.20-dmeventd-no-idle-exit.patch
-	"${FILESDIR}"/${PN}-2.03.20-freopen-musl.patch
-	"${FILESDIR}"/${PN}-2.03.22-autoconf-2.72-egrep.patch
-	"${FILESDIR}"/${PN}-2.03.22-thin-version-checking.patch
-)
-
-pkg_setup() {
-	local CONFIG_CHECK="~SYSVIPC"
-
-	if use udev; then
-		local WARNING_SYSVIPC="CONFIG_SYSVIPC:\tis not set (required for udev sync)\n"
-		if linux_config_exists; then
-			local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
-			if [[ -n "${uevent_helper_path}" ]] && [[ "${uevent_helper_path}" != '""' ]]; then
-				ewarn "It's recommended to set an empty value to the following kernel config option:"
-				ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
-			fi
-		fi
-	fi
-
-	check_extra_config
-
-	# 1. Genkernel no longer copies /sbin/lvm blindly.
-	if use static; then
-		elog "Warning, we no longer overwrite /sbin/lvm and /sbin/dmsetup with"
-		elog "their static versions. If you need the static binaries,"
-		elog "you must append .static to the filename!"
-	fi
-}
-
-src_prepare() {
-	default
-
-	# Users without systemd get no auto-activation of any logical volume
-	if ! use systemd ; then
-		eapply "${FILESDIR}"/${PN}-2.03.20-dm_lvm_rules_no_systemd.patch
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	filter-lto
-
-	# Workaround for bug #822210
-	tc-ld-disable-gold
-
-	# Most of this package does weird stuff.
-	# The build options are tristate, and --without is NOT supported
-	# options: 'none', 'internal', 'shared'
-	local myeconfargs=(
-		$(use_enable lvm dmfilemapd)
-		$(use_enable lvm dmeventd)
-		$(use_enable lvm cmdlib)
-		$(use_enable lvm fsadm)
-		$(use_enable lvm lvmpolld)
-
-		# This only causes the .static versions to become available
-		$(usev static --enable-static_link)
-
-		# dmeventd requires mirrors to be internal, and snapshot available
-		# so we cannot disable them
-		--with-mirrors="$(usex lvm internal none)"
-		--with-snapshots="$(usex lvm internal none)"
-	)
-
-	if use lvm && use thin; then
-		myeconfargs+=( --with-thin=internal --with-cache=internal )
-		local texec
-		for texec in check dump repair restore; do
-			myeconfargs+=( --with-thin-${texec}="${EPREFIX}"/usr/sbin/thin_${texec} )
-			myeconfargs+=( --with-cache-${texec}="${EPREFIX}"/usr/sbin/cache_${texec} )
-		done
-	else
-		myeconfargs+=( --with-thin=none --with-cache=none )
-	fi
-
-	myeconfargs+=(
-		# musl doesn't do symbol versioning so can end up with
-		# runtime breakage.
-		--with-symvers=$(usex elibc_glibc 'gnu' 'no')
-		$(use_enable readline)
-		$(use_enable selinux)
-		--enable-pkgconfig
-		--with-confdir="${EPREFIX}"/etc
-		--exec-prefix="${EPREFIX}"
-		--sbindir="${EPREFIX}/sbin"
-		--with-staticdir="${EPREFIX}"/sbin
-		--libdir="${EPREFIX}/$(get_libdir)"
-		--with-usrlibdir="${EPREFIX}/usr/$(get_libdir)"
-		--with-default-dm-run-dir=/run
-		--with-default-run-dir=/run/lvm
-		--with-default-locking-dir=/run/lock/lvm
-		--with-default-pid-dir=/run
-		$(use_enable udev udev_rules)
-		$(use_enable udev udev_sync)
-		$(use_with udev udevdir "${EPREFIX}$(get_udevdir)"/rules.d)
-		# USE=sanlock requires USE=lvm
-		$(use_enable $(usex lvm sanlock lvm) lvmlockd-sanlock)
-		$(use_enable systemd notify-dbus)
-		$(use_enable systemd app-machineid)
-		$(use_enable systemd systemd-journal)
-		$(use_with systemd systemd-run "/usr/bin/systemd-run")
-		$(use_enable valgrind valgrind-pool)
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-		CLDFLAGS="${LDFLAGS}"
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake V=1 -C include
-
-	if use lvm ; then
-		emake V=1
-		emake V=1 CC="$(tc-getCC)" -C scripts
-	else
-		emake V=1 device-mapper
-		# https://bugs.gentoo.org/878131
-		emake V=1 -C libdm/dm-tools device-mapper
-	fi
-}
-
-src_test() {
-	einfo "Tests are disabled because of device-node mucking, if you want to"
-	einfo "run tests, compile the package and see ${S}/tests"
-}
-
-src_install() {
-	local targets=()
-	if use lvm; then
-		targets+=( install install_tmpfiles_configuration )
-		if use systemd; then
-			# install systemd related files only when requested, bug #522430
-			targets+=( install_systemd_units )
-		fi
-	else
-		targets+=( install_device-mapper )
-	fi
-
-	# -j1 for bug #918125
-	emake -j1 V=1 DESTDIR="${D}" "${targets[@]}"
-
-	newinitd "${FILESDIR}"/device-mapper.rc-r3 device-mapper
-	newconfd "${FILESDIR}"/device-mapper.conf-r4 device-mapper
-
-	if use lvm ; then
-		newinitd "${FILESDIR}"/dmeventd.initd-r3 dmeventd
-		newinitd "${FILESDIR}"/lvm.rc-r1 lvm
-		newconfd "${FILESDIR}"/lvm.confd-r4 lvm
-		if ! use udev ; then
-			# We keep the variable but remove udev from it.
-			sed -r -i \
-				-e '/^rc_need=/s/\<udev\>//g' \
-				"${ED}"/etc/conf.d/lvm || die "Could not drop udev from rc_need"
-		fi
-
-		newinitd "${FILESDIR}"/lvm-monitoring.initd-r3 lvm-monitoring
-		newinitd "${FILESDIR}"/lvmpolld.initd-r1 lvmpolld
-
-		if use sanlock; then
-			newinitd "${FILESDIR}"/lvmlockd.initd-r2 lvmlockd
-		fi
-	fi
-
-	if use static-libs; then
-		dolib.a libdm/ioctl/libdevmapper.a
-		if use lvm; then
-			# depends on lvmetad
-			dolib.a libdaemon/client/libdaemonclient.a #462908
-			# depends on dmeventd
-			dolib.a daemons/dmeventd/libdevmapper-event.a
-		fi
-	else
-		rm -f "${ED}"/usr/$(get_libdir)/{libdevmapper-event,liblvm2cmd,liblvm2app,libdevmapper}.a || die
-	fi
-
-	insinto /etc
-	doins "${FILESDIR}"/dmtab
-
-	dodoc README VERSION* WHATS_NEW WHATS_NEW_DM doc/*.{c,txt} conf/*.conf
-}
-
-pkg_preinst() {
-	HAD_LVM=0
-
-	if has_version 'sys-fs/lvm2[lvm(+)]' ; then
-		HAD_LVM=1
-	fi
-}
-
-pkg_postinst() {
-	use lvm && tmpfiles_process lvm2.conf
-	use udev && udev_reload
-
-	# This is a new installation
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		if use lvm ; then
-			ewarn "Make sure the \"lvm\" init script is in the runlevels:"
-			ewarn "# rc-update add lvm boot"
-			ewarn
-			ewarn "Make sure to enable lvmetad in ${EROOT}/etc/lvm/lvm.conf if you want"
-			ewarn "to enable lvm autoactivation and metadata caching."
-		else
-			ewarn "Please enable USE=lvm if you need the LVM daemon and"
-			ewarn "tools like 'lvchange', 'vgchange', etc!"
-		fi
-	else
-		if ! use lvm && [[ ${HAD_LVM} -eq 1 ]] ; then
-			ewarn "LVM was previously enabled but is now disabled."
-			ewarn "Please enable USE=lvm if you need the LVM daemon and"
-			ewarn "tools like 'lvchange', 'vgchange', etc!"
-			ewarn "See the 2022-11-19-lvm2-default-USE-flags news item for more details."
-		fi
-	fi
-
-	if use udev && [[ -d /run ]] ; then
-		local permission_run_expected="drwxr-xr-x"
-		local permission_run=$(stat -c "%A" /run)
-		if [[ "${permission_run}" != "${permission_run_expected}" ]] ; then
-			ewarn "Found the following problematic permissions:"
-			ewarn ""
-			ewarn "    ${permission_run} /run"
-			ewarn ""
-			ewarn "Expected:"
-			ewarn ""
-			ewarn "    ${permission_run_expected} /run"
-			ewarn ""
-			ewarn "This is known to cause problems for udev-enabled LVM services."
-		fi
-	fi
-}
-
-pkg_postrm() {
-	if use udev && [[ -z ${REPLACED_BY_VERSION} ]]; then
-		udev_reload
-	fi
-}
diff --git a/sys-fs/lvm2/lvm2-2.03.22-r6.ebuild b/sys-fs/lvm2/lvm2-2.03.22-r6.ebuild
new file mode 100644
index 000000000000..45abee82f525
--- /dev/null
+++ b/sys-fs/lvm2/lvm2-2.03.22-r6.ebuild
@@ -0,0 +1,316 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+TMPFILES_OPTIONAL=1
+inherit autotools linux-info systemd toolchain-funcs tmpfiles udev flag-o-matic
+
+DESCRIPTION="User-land utilities for LVM2 (device-mapper) software"
+HOMEPAGE="https://sourceware.org/lvm2/"
+SRC_URI="https://sourceware.org/ftp/lvm2/${PN^^}.${PV}.tgz"
+S="${WORKDIR}/${PN^^}.${PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+IUSE="lvm readline sanlock selinux static static-libs systemd thin +udev valgrind"
+REQUIRED_USE="
+	static? ( !systemd !udev )
+	static-libs? ( static !udev )
+	systemd? ( udev )
+	thin? ( lvm )
+"
+
+DEPEND_COMMON="
+	udev? ( virtual/libudev:= )
+	lvm? (
+		dev-libs/libaio
+		sys-apps/util-linux
+		readline? ( sys-libs/readline:= )
+		sanlock? ( sys-cluster/sanlock )
+		systemd? ( sys-apps/systemd:= )
+	)
+"
+# /run is now required for locking during early boot. /var cannot be assumed to
+# be available -- thus, pull in recent enough baselayout for /run.
+# This version of LVM is incompatible with cryptsetup <1.1.2.
+RDEPEND="
+	${DEPEND_COMMON}
+	>=sys-apps/baselayout-2.2
+	lvm? ( virtual/tmpfiles )
+"
+
+PDEPEND="
+	lvm? (
+		thin? ( >=sys-block/thin-provisioning-tools-1.0.6 )
+	)
+"
+# note: thin-0.3.0 is required to avoid --disable-thin_check_needs_check
+DEPEND="
+	${DEPEND_COMMON}
+	static? (
+		sys-apps/util-linux[static-libs]
+		lvm? (
+			dev-libs/libaio[static-libs]
+			readline? ( sys-libs/readline[static-libs] )
+		)
+		selinux? ( sys-libs/libselinux[static-libs] )
+	)
+	valgrind? ( >=dev-debug/valgrind-3.6 )
+"
+BDEPEND="
+	dev-build/autoconf-archive
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	# Gentoo specific modification(s):
+	"${FILESDIR}"/${PN}-2.03.20-example.conf.in.patch
+
+	# For upstream -- review and forward:
+	"${FILESDIR}"/${PN}-2.03.20-dmeventd-no-idle-exit.patch
+	"${FILESDIR}"/${PN}-2.03.20-freopen-musl.patch
+	"${FILESDIR}"/${PN}-2.03.22-autoconf-2.72-egrep.patch
+	"${FILESDIR}"/${PN}-2.03.22-thin-version-checking.patch
+	"${FILESDIR}"/${PN}-2.03.22-thin-autodetect.patch
+)
+
+pkg_setup() {
+	local CONFIG_CHECK="~SYSVIPC"
+
+	if use udev; then
+		local WARNING_SYSVIPC="CONFIG_SYSVIPC:\tis not set (required for udev sync)\n"
+		if linux_config_exists; then
+			local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
+			if [[ -n "${uevent_helper_path}" ]] && [[ "${uevent_helper_path}" != '""' ]]; then
+				ewarn "It's recommended to set an empty value to the following kernel config option:"
+				ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
+			fi
+		fi
+	fi
+
+	check_extra_config
+
+	# 1. Genkernel no longer copies /sbin/lvm blindly.
+	if use static; then
+		elog "Warning, we no longer overwrite /sbin/lvm and /sbin/dmsetup with"
+		elog "their static versions. If you need the static binaries,"
+		elog "you must append .static to the filename!"
+	fi
+}
+
+src_prepare() {
+	default
+
+	# Users without systemd get no auto-activation of any logical volume
+	if ! use systemd ; then
+		eapply "${FILESDIR}"/${PN}-2.03.20-dm_lvm_rules_no_systemd.patch
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	filter-lto
+
+	# Workaround for bug #822210
+	tc-ld-disable-gold
+
+	# Most of this package does weird stuff.
+	# The build options are tristate, and --without is NOT supported
+	# options: 'none', 'internal', 'shared'
+	local myeconfargs=(
+		$(use_enable lvm dmfilemapd)
+		$(use_enable lvm dmeventd)
+		$(use_enable lvm cmdlib)
+		$(use_enable lvm fsadm)
+		$(use_enable lvm lvmpolld)
+
+		# This only causes the .static versions to become available
+		$(usev static --enable-static_link)
+
+		# dmeventd requires mirrors to be internal, and snapshot available
+		# so we cannot disable them
+		--with-mirrors="$(usex lvm internal none)"
+		--with-snapshots="$(usex lvm internal none)"
+	)
+
+	if use lvm && use thin; then
+		myeconfargs+=(
+			--with-thin=internal
+			--enable-thin_check_needs_check
+			--with-cache=internal
+			--enable-cache_check_needs_check
+		)
+		local texec
+		for texec in check dump repair restore; do
+			myeconfargs+=( --with-thin-${texec}="${EPREFIX}"/usr/sbin/thin_${texec} )
+			myeconfargs+=( --with-cache-${texec}="${EPREFIX}"/usr/sbin/cache_${texec} )
+		done
+	else
+		myeconfargs+=( --with-thin=none --with-cache=none )
+	fi
+
+	myeconfargs+=(
+		# musl doesn't do symbol versioning so can end up with
+		# runtime breakage.
+		--with-symvers=$(usex elibc_glibc 'gnu' 'no')
+		$(use_enable readline)
+		$(use_enable selinux)
+		--enable-pkgconfig
+		--with-confdir="${EPREFIX}"/etc
+		--exec-prefix="${EPREFIX}"
+		--sbindir="${EPREFIX}/sbin"
+		--with-staticdir="${EPREFIX}"/sbin
+		--libdir="${EPREFIX}/$(get_libdir)"
+		--with-usrlibdir="${EPREFIX}/usr/$(get_libdir)"
+		--with-default-dm-run-dir=/run
+		--with-default-run-dir=/run/lvm
+		--with-default-locking-dir=/run/lock/lvm
+		--with-default-pid-dir=/run
+		$(use_enable udev udev_rules)
+		$(use_enable udev udev_sync)
+		$(use_with udev udevdir "${EPREFIX}$(get_udevdir)"/rules.d)
+		# USE=sanlock requires USE=lvm
+		$(use_enable $(usex lvm sanlock lvm) lvmlockd-sanlock)
+		$(use_enable systemd notify-dbus)
+		$(use_enable systemd app-machineid)
+		$(use_enable systemd systemd-journal)
+		$(use_with systemd systemd-run "/usr/bin/systemd-run")
+		$(use_enable valgrind valgrind-pool)
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+		CLDFLAGS="${LDFLAGS}"
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	emake V=1 -C include
+
+	if use lvm ; then
+		emake V=1
+		emake V=1 CC="$(tc-getCC)" -C scripts
+	else
+		emake V=1 device-mapper
+		# https://bugs.gentoo.org/878131
+		emake V=1 -C libdm/dm-tools device-mapper
+	fi
+}
+
+src_test() {
+	einfo "Tests are disabled because of device-node mucking, if you want to"
+	einfo "run tests, compile the package and see ${S}/tests"
+}
+
+src_install() {
+	local targets=()
+	if use lvm; then
+		targets+=( install install_tmpfiles_configuration )
+		if use systemd; then
+			# install systemd related files only when requested, bug #522430
+			targets+=( install_systemd_units )
+		fi
+	else
+		targets+=( install_device-mapper )
+	fi
+
+	# -j1 for bug #918125
+	emake -j1 V=1 DESTDIR="${D}" "${targets[@]}"
+
+	newinitd "${FILESDIR}"/device-mapper.rc-r3 device-mapper
+	newconfd "${FILESDIR}"/device-mapper.conf-r4 device-mapper
+
+	if use lvm ; then
+		newinitd "${FILESDIR}"/dmeventd.initd-r3 dmeventd
+		newinitd "${FILESDIR}"/lvm.rc-r1 lvm
+		newconfd "${FILESDIR}"/lvm.confd-r4 lvm
+		if ! use udev ; then
+			# We keep the variable but remove udev from it.
+			sed -r -i \
+				-e '/^rc_need=/s/\<udev\>//g' \
+				"${ED}"/etc/conf.d/lvm || die "Could not drop udev from rc_need"
+		fi
+
+		newinitd "${FILESDIR}"/lvm-monitoring.initd-r3 lvm-monitoring
+		newinitd "${FILESDIR}"/lvmpolld.initd-r1 lvmpolld
+
+		if use sanlock; then
+			newinitd "${FILESDIR}"/lvmlockd.initd-r2 lvmlockd
+		fi
+	fi
+
+	if use static-libs; then
+		dolib.a libdm/ioctl/libdevmapper.a
+		if use lvm; then
+			# depends on lvmetad
+			dolib.a libdaemon/client/libdaemonclient.a #462908
+			# depends on dmeventd
+			dolib.a daemons/dmeventd/libdevmapper-event.a
+		fi
+	else
+		rm -f "${ED}"/usr/$(get_libdir)/{libdevmapper-event,liblvm2cmd,liblvm2app,libdevmapper}.a || die
+	fi
+
+	insinto /etc
+	doins "${FILESDIR}"/dmtab
+
+	dodoc README VERSION* WHATS_NEW WHATS_NEW_DM doc/*.{c,txt} conf/*.conf
+}
+
+pkg_preinst() {
+	HAD_LVM=0
+
+	if has_version 'sys-fs/lvm2[lvm(+)]' ; then
+		HAD_LVM=1
+	fi
+}
+
+pkg_postinst() {
+	use lvm && tmpfiles_process lvm2.conf
+	use udev && udev_reload
+
+	# This is a new installation
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		if use lvm ; then
+			ewarn "Make sure the \"lvm\" init script is in the runlevels:"
+			ewarn "# rc-update add lvm boot"
+			ewarn
+			ewarn "Make sure to enable lvmetad in ${EROOT}/etc/lvm/lvm.conf if you want"
+			ewarn "to enable lvm autoactivation and metadata caching."
+		else
+			ewarn "Please enable USE=lvm if you need the LVM daemon and"
+			ewarn "tools like 'lvchange', 'vgchange', etc!"
+		fi
+	else
+		if ! use lvm && [[ ${HAD_LVM} -eq 1 ]] ; then
+			ewarn "LVM was previously enabled but is now disabled."
+			ewarn "Please enable USE=lvm if you need the LVM daemon and"
+			ewarn "tools like 'lvchange', 'vgchange', etc!"
+			ewarn "See the 2022-11-19-lvm2-default-USE-flags news item for more details."
+		fi
+	fi
+
+	if use udev && [[ -d /run ]] ; then
+		local permission_run_expected="drwxr-xr-x"
+		local permission_run=$(stat -c "%A" /run)
+		if [[ "${permission_run}" != "${permission_run_expected}" ]] ; then
+			ewarn "Found the following problematic permissions:"
+			ewarn ""
+			ewarn "    ${permission_run} /run"
+			ewarn ""
+			ewarn "Expected:"
+			ewarn ""
+			ewarn "    ${permission_run_expected} /run"
+			ewarn ""
+			ewarn "This is known to cause problems for udev-enabled LVM services."
+		fi
+	fi
+}
+
+pkg_postrm() {
+	if use udev && [[ -z ${REPLACED_BY_VERSION} ]]; then
+		udev_reload
+	fi
+}
diff --git a/sys-fs/udisks/Manifest b/sys-fs/udisks/Manifest
index fb6ac592bf99..5e9726d6c604 100644
--- a/sys-fs/udisks/Manifest
+++ b/sys-fs/udisks/Manifest
@@ -5,7 +5,7 @@ AUX udisks-2.10.1-udiskslinuxmanager_use_after_free.patch 5722 BLAKE2B 954e9e2ef
 AUX udisks-2.9.4-undefined.patch 6251 BLAKE2B 1c2eb5b5448686dcd343fd582e5e79ecb38bbfae4108a56c5b27de9c446a49b7ec1e22f7f55778f7ace7f309b4d2bb7bae99932411917abbefbc58b62fd7dae0 SHA512 103cf151084dd239baa40554cfc2396281e478d8ca9e73c848cd4af42716d7677a50a7dd1b18d8a84a3f97210c695f392ea3556104ed03b50640d0cca96303cd
 DIST udisks-2.10.1.tar.bz2 1896207 BLAKE2B 41282e4dbbd93e6bda2a10a6ff2f2fb82bfc83b3ccbed9450cca7888c634cde9300fcd0b7d055e0d8e4c8fc0b431a75d5612a24132ea9b2677d194529732178d SHA512 9cdaeca4306a970c85f88d406dbe5d2dad23d72f47d9ab1c021b8c2888d4c790f680eb94388d86f9255024283b4a36e98b8aee4408d193a7d4aad1e74463356a
 DIST udisks-2.9.4.tar.bz2 1699288 BLAKE2B 913f6dd02988c0bded13ae15a5f05e5b3c6404f0b0d58a493601a0762c7534403f89e9fb46ec6a536b85d5f9ca1f788c7a308f5563a897b324d212da0e7bab4b SHA512 35f5429bc2a7092aa659cba9296837d127e2b17c23ab23111d0d9b230d15ef5a6965e112b1f3829748a69a52fb5b09722153f86f1ef70977b3ad7b7a4ec40ec5
-EBUILD udisks-2.10.1-r1.ebuild 3919 BLAKE2B dab1912909d4ff984778ca65e729642a6b5657d5bd960385472b864c90a26df2797e5d4f1372e926187f080db426bf68e03e6f457f5013101deedcb460d49736 SHA512 94980330d160a53c1df2ad31f62b58a8711465b2ab021b372ab7cea50be29b5e830940e1580517f02e8f3257467497823aecd058a0e67d8ae391de02da8c1988
+EBUILD udisks-2.10.1-r1.ebuild 3914 BLAKE2B 3b097125a14f76a03af588116be1752f5f895f7e7ec6613afde80fd0b0ae33e083e17762dd994a943f5889836d9efe3f52b04a0945bcc0b0d5bf0061e57318c1 SHA512 47d020fb4bc599572b7139b397405688fce58426e60df9d0af36be22ea14443b01f8dbce64b03107c5754bd36768ff4326abed9b8677b18f318a5a5daa6ae750
 EBUILD udisks-2.10.1.ebuild 3671 BLAKE2B b45d2bf42443b312721e7d5bce0cb2b950d67d62a2c429cff89e03d0797a1aa7862a2886e35b84ddefbbb781772a670dd28f16145f9aa9550e31f4afc697ac72 SHA512 6e515a8b9ef0301e73b5188a62955258b370e5e64b1c9c29ce1aa1fcc2d53a7113d57d2ce6063fc1dad7a718f0038433f2e132860a7e3c91ebfd1a842f17edb5
 EBUILD udisks-2.9.4-r3.ebuild 3948 BLAKE2B d6078b200453793cc925d605e6a60ef8ae3cf714099bbc28c3ad58c1894dafe3bbe4d5c9c18d1d0e9f2f6587b096a9ca8c68346024c3e7b5c8252c7d224e150b SHA512 68c827b6ad5b2f3b1b368e0a18e9cf7fd043b8c19102d1d3e3fc2b08e03447409ccd3b2a305b4e92c879b8042ca9ec980d5480b0a6528a40f01c753bc254e6ce
 MISC metadata.xml 817 BLAKE2B 8de63b889a0237db873c61e20fd4c03e0b3cba0e76af124ccc6ce8240557c6cb60b15e566918a358714a7c9c981fba2581c155a22fc8ca81bfc363012426b000 SHA512 26df20e075b5f6f23d78ee21c52908c54bd499502208570b575227464f4105044d08421c01e025cbd15fb5d003190f72ded2ea905bc037746b3df452a50999df
diff --git a/sys-fs/udisks/udisks-2.10.1-r1.ebuild b/sys-fs/udisks/udisks-2.10.1-r1.ebuild
index d2f4f213c1bb..d0175b0d780f 100644
--- a/sys-fs/udisks/udisks-2.10.1-r1.ebuild
+++ b/sys-fs/udisks/udisks-2.10.1-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/storaged-project/udisks/releases/download/${P}/${P}.
 
 LICENSE="LGPL-2+ GPL-2+"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc64 ~riscv x86"
 IUSE="acl +daemon debug elogind +introspection lvm nls selinux systemd"
 
 REQUIRED_USE="
-- 
cgit v1.2.3