gentoo auto-resync : 28:10:2022 - 22:00:04

11 files changed, 129 insertions, 96 deletions

diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index e2c90329484c..fb0dadf960b4 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index ea4f53a6c810..d6f0a15bf1bc 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -2,6 +2,6 @@ AUX e2fsck.conf 138 BLAKE2B b97a754b6aebf1f7fcd4001b720eead61d183eaf5a2c9eb86e83
 AUX e2fsprogs-1.42.13-fix-build-cflags.patch 290 BLAKE2B b37f9fd204bd35631776d68dda5cc9defb5e2bc54e0061778e5bea4886820829605cb092bb40a7f65cd0626d8ffe689bd1c8aad7d29f7c67e5166dd578925ddb SHA512 fed2a8502fafb56a21c88d680a42848bdc8921b228f74842ce3f702279917b6e6c0d1204ee060ea0d2d5ebb02465fc1f3d1a4304068a59b45bf1ddfbdfd46507
 AUX e2fsprogs-1.46.5-parallel-make.patch 1646 BLAKE2B f3e0158afa723e436a5b4004a6e331c4ad2405f9d4e25ab4a11baaa7ac88d120362d004a69067850ae1ebdc437eef586e381101f9e96736a4e707cf2d18fe6f6 SHA512 c5cb7d01293465621e90e0807b6dad32b2f0105686d91bb886935967eb184463036d34dfc716da1a92c75bfe99300d07a84a7770499b6f38ecee15fbc0f9905b
 DIST e2fsprogs-1.46.5.tar.xz 7040672 BLAKE2B 8d8c02e891c464782a7cff518c41d793fc73366b57e17d80ffc5afd96e6144e354290e667e9710509a9dde4e5dab7e7185c5bf084c5bfd26219f05e5e92e0830 SHA512 53282e1c524f62a95012b1aceef296d494f5238c82c9b08b29fbe6a803dbf7ccfdcd9124eb2f11fe2ff9de26387c78751a92c3217ca414f6db6242098a72d3fa
-EBUILD e2fsprogs-1.46.5-r1.ebuild 4420 BLAKE2B 3f0557a4e835948873392c67f69cc68c90fc81ff046580552e05a1149af67151fefb0d226ac5a527c84ef7bf92b94fd6ecc74652b5673f63a263e23b0513decc SHA512 bd0719065bf1b8e16df444d787e77398c07c77322d7dff087868ee70629288221ad332c22a7a303447fdae619be1483b9db33d8ff29804263b083e23fcda6e45
-EBUILD e2fsprogs-1.46.5-r2.ebuild 4406 BLAKE2B 488856c7e5b0d7d1fc5d0fb0adec5c3033bf9c5784d7741d44dc4fcaa2c20aa7a696aeb5eaf18549a17f60c2d9723444672bae3bbcf2b3fb157e8bb9a1a33de0 SHA512 5611089a6c5b186bbae1347ea312f4325f91cd2e00e597e9d5ae178d5e20625ff483e3267894fe8682d405107d31b9bf5ed1160135a6728d6cf0abc8d4d4ac60
+EBUILD e2fsprogs-1.46.5-r3.ebuild 4401 BLAKE2B 925f540d8b21482abea0b9db6e4c9c0697df29a33b7cabe85159b8cd4354d7453be25b8056957e65ab9bda1f576cd786ff969843f4e23a3611f0101591507f08 SHA512 9f34a974b65c59722afac7328307b32e6bb8aea0cf605c4b0b8c1a78993e7e158211ed0f35d1cfa0b9f71937315243d935e6a930b12a5798e3876cd96023e0bf
+EBUILD e2fsprogs-1.46.5-r4.ebuild 4387 BLAKE2B 495e5e1d6638f3af2add5b7b9ae37226e16802c24ea8132abd8b04c2cf25094179d94565c82ae7db5469c90e391753be2bf7d549ce9e36d266ff371f527a96a1 SHA512 33d71a6c7a40b8aabc9c5a546b1f0d717408139fd0a7ae087a475ca826cd5dfc00d388961e8f39452f1c0d202bc022e29ee04e78c9da10dd93f9c1138bb72613
 MISC metadata.xml 781 BLAKE2B 966522db6501509fbe12c1f896e6f59ffcb2a9dc0980b6086213383894df169dfdadce5cc6c37de5016bb5e96db6565f937183c5e78fad1bb6c15d6c964aec92 SHA512 5d2a09fb1027344f3ed7c24afa49af06a26c5c813f49e8b5614ce629360d1b0252ad93a360d9bd189fa3aa6027b7afceea8ce9fb0fe67f57546d54c348fed74f
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.46.5-r1.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.46.5-r3.ebuild
index 8da61d9a0ff1..09e9ee84888f 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.46.5-r1.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.46.5-r3.ebuild
@@ -17,7 +17,7 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	!sys-libs/${PN}-libs
-	cron? ( sys-fs/lvm2[-device-mapper-only(-)] )
+	cron? ( sys-fs/lvm2[lvm] )
 	fuse? ( sys-fs/fuse:0 )
 	nls? ( virtual/libintl )
 	tools? ( sys-apps/util-linux )"
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.46.5-r2.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.46.5-r4.ebuild
index 37e0cf5c7af1..01be94e1f77e 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.46.5-r2.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.46.5-r4.ebuild
@@ -17,7 +17,7 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	!sys-libs/${PN}-libs
-	cron? ( sys-fs/lvm2[-device-mapper-only(-)] )
+	cron? ( sys-fs/lvm2[lvm] )
 	fuse? ( sys-fs/fuse:0 )
 	nls? ( virtual/libintl )
 	tools? ( sys-apps/util-linux )"
diff --git a/sys-fs/exfatprogs/Manifest b/sys-fs/exfatprogs/Manifest
index a435488bb574..e70e3f2faad9 100644
--- a/sys-fs/exfatprogs/Manifest
+++ b/sys-fs/exfatprogs/Manifest
@@ -1,4 +1,6 @@
 DIST exfatprogs-1.1.3.tar.xz 261936 BLAKE2B 7d1e471eb24f408999efd7fd6e8e2b60f0ef4efbceca9780de5a52c0b0bcad18a25648b7e669e805a40f382541406c01ea75cd40b4660f44281848bf38f9d1c0 SHA512 d23bfe4d0233d944b0d5a484e1167746db77ea9b7fbacdbfac2dd4d37a8a1d747f2445b09baced9fd7b5d3dbfc7664bdc1efe16326d7e678d05294eee124efa3
+DIST exfatprogs-1.2.0.tar.xz 272716 BLAKE2B d8b4188ee2fd96b4b0abab52540e894f55279e3031596081f8077a45a2ad5737870298a0658feee177818dbf02ae036e035c350437c3ea4b7ab7100f46fc8772 SHA512 61a78af024e1ff7e12f2d7449c3ee2ff9476c8746269e29c453c77dbc73d3f52af7ca8fc3e1bd85d6a75b6ed8b7712b5f80e5cc1dffc5ff00fb63455a57ca9bf
 EBUILD exfatprogs-1.1.3.ebuild 623 BLAKE2B 0a18440e3d1b53f3b8da000793db3de0cd5792dc225394fd9a522b618d332be16096240b61cada89b3153ba61fa2388d66283a6c988d101d485e133219e3bc7c SHA512 1201ba29fdd440594cccc4330f3764ef3e7263f690311ab39fbd80d1fb8eae415de0c205bdbf0cff2dfd6efb2caffe07ce2b39ef0d60dd9e0049c9f69866ada7
-EBUILD exfatprogs-9999.ebuild 627 BLAKE2B d3b0215501ec60e66b917ad551444ed9ef68bc53393cb5f34918ba33952be687945139f5f6ebd1c40588e4e9b4ca8d5e5b6cdde8ef22281db54686f7cef90691 SHA512 8e912bda0ec2086d1fa40e7969638e61f28323cd848f51abbd3ad1a564e6af3880f5eb02e884bf5cca35a74d2ff9b098efa094d907b15a4a1d2755e397263e03
+EBUILD exfatprogs-1.2.0.ebuild 616 BLAKE2B 91c306c2f4b3021dde2621ffc22c8a4848e060cbc0d105e0f10b83f5426ef4d7b9c1c5a42998c93e9c95bc68222224639fab76ca2074fc2974eeb52b08db9554 SHA512 6915a80d52ecfb9425a38faffc3c3e5769a7780751a6b808e3b9ebb1695bc26c2cec91b8b5761394654f57f162f47cda65440399a7edb40959fb288ef655502b
+EBUILD exfatprogs-9999.ebuild 616 BLAKE2B 91c306c2f4b3021dde2621ffc22c8a4848e060cbc0d105e0f10b83f5426ef4d7b9c1c5a42998c93e9c95bc68222224639fab76ca2074fc2974eeb52b08db9554 SHA512 6915a80d52ecfb9425a38faffc3c3e5769a7780751a6b808e3b9ebb1695bc26c2cec91b8b5761394654f57f162f47cda65440399a7edb40959fb288ef655502b
 MISC metadata.xml 344 BLAKE2B 6f45e027a37eb3d01018cfd5b1d07691129367cb969896e42303b38ca81bbdc8aef68f1dc542b2a5aefa793d2f28c60c8c5dc2261b75b817973302dd7e817541 SHA512 5ce136106ee694a1a8725e3498189a1162aa249a91b4597a3cd6f87c202b6a30fd1bd6daa13e9f80fe108f3e024ca995502b9b18b30bbad47722b18fa325fa1d
diff --git a/sys-fs/exfatprogs/exfatprogs-1.2.0.ebuild b/sys-fs/exfatprogs/exfatprogs-1.2.0.ebuild
new file mode 100644
index 000000000000..6d2c947cbb32
--- /dev/null
+++ b/sys-fs/exfatprogs/exfatprogs-1.2.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Userspace utilities for new exfat filesystem (kernel 5.7+)"
+HOMEPAGE="https://github.com/exfatprogs/exfatprogs"
+
+if [[ ${PV} == *9999 ]] ; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/exfatprogs/exfatprogs.git"
+else
+	SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+fi
+LICENSE="GPL-2"
+SLOT="0"
+
+RDEPEND="!sys-fs/exfat-utils"
+
+src_prepare() {
+	default
+
+	[[ ${PV} == *9999 ]] && eautoreconf
+}
diff --git a/sys-fs/exfatprogs/exfatprogs-9999.ebuild b/sys-fs/exfatprogs/exfatprogs-9999.ebuild
index e9fc0d2e9745..6d2c947cbb32 100644
--- a/sys-fs/exfatprogs/exfatprogs-9999.ebuild
+++ b/sys-fs/exfatprogs/exfatprogs-9999.ebuild
@@ -1,11 +1,12 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DESCRIPTION="Userspace utilities for new exfat filesystem (kernel 5.7+)"
 HOMEPAGE="https://github.com/exfatprogs/exfatprogs"
-if [[ "${PV}" == *9999 ]] ; then
+
+if [[ ${PV} == *9999 ]] ; then
 	inherit autotools git-r3
 	EGIT_REPO_URI="https://github.com/exfatprogs/exfatprogs.git"
 else
@@ -15,11 +16,10 @@ fi
 LICENSE="GPL-2"
 SLOT="0"
 
-IUSE=""
-
 RDEPEND="!sys-fs/exfat-utils"
 
 src_prepare() {
 	default
-	[[ "${PV}" == *9999 ]] && eautoreconf
+
+	[[ ${PV} == *9999 ]] && eautoreconf
 }
diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest
index 73b30d3f96d0..da46a1d8daff 100644
--- a/sys-fs/lvm2/Manifest
+++ b/sys-fs/lvm2/Manifest
@@ -29,6 +29,6 @@ AUX lvmlockd.initd-2.02.166-r1 390 BLAKE2B aebfa2a654eca784da24fd4e4d46b3e6c9725
 AUX lvmpolld.initd-2.02.183 348 BLAKE2B cba0419add6591320dc60ef7616b66706e042b566284a4ec42002fbb5331a7173fc8b4b39be7198426fe4bbdcd3ad94b69fc3d8950705b6331c5f3f4cda4ad66 SHA512 b9b8376cbc8b6703868afab18e5baa4ef5354569e57f0596d38a8005fa725299f6858ac86b39fcca10e5a0f1adbd3a4cfa6cc6b62405e78916cc1287d8b36d0d
 DIST LVM2.2.03.14.tgz 2639538 BLAKE2B 806f5e9cb76a05febef6f8ce8cfc42c92927b9538f62a21029c5ffc426a4fd7c3f32709be08dbd8028b53891b1075d1d13cb3b0d7b1815071ee8eb927d8f3ed3 SHA512 6a93bed1d5cf36f0f48d4d413d028b0e480cd4fc20e25d173770a892f265d2a0cc68d01a720b1513469953649e989532cd0c45f9538f92a4190eb3dc4555857d
 DIST LVM2.2.03.16.tgz 2658805 BLAKE2B 05c6089adff0c61ff1281a05a917f75480ad4acc28cb0214a42589d206a61168f68de07891b9af9814ed7998f16aff6f29ba29b85b23de36f38bf3b5f27802c1 SHA512 084ba4080537359458db936637fc7f83bb9bfcf2de9f3660882551b5c31c7e9900c7d381b238ce1bb7629942c740c121f0dea5e404c302d31ed028b5c65efaa5
-EBUILD lvm2-2.03.14-r3.ebuild 9996 BLAKE2B 6b362736c095df126b9b6ebcea21cec474f0b194cf186b7af2568820cfb2521accdaa5f4247cb5a205190c741ca866bfc409cede0b814ac12a3c1e1003df60fd SHA512 a5931ee69d8a3fb9d32ad7e8fe91c9a9d07224f4b220e1b5a6dce290ea73c87eeb125ddc0c466c7bd4aa854f8c98af4a0e7d878f6a0be101dda6288f3f63760e
-EBUILD lvm2-2.03.16.ebuild 10055 BLAKE2B 86b12b246425bd349ede5dd62e54bd1251343fffd558ccd3bfb7f5cb246c36f6ec85ca98793ea4c749bdc9c755ee1b54edebf22ddc9dab1ed2a45984ba264828 SHA512 b6bcb929f0d40a87afda4a7e9e60accdf444c32190074bd4942214454d56153d1504dd26a26b37852952574b78f715f0e351a9ac5e217d1c7747d9f5a1230467
-MISC metadata.xml 976 BLAKE2B 62a8892f78c85315386a5d52acbc2eddc957e9dcceba6b762e57a2229f78648a1e5ec3b1adc3eeecda3c0730a23c83ff3e08c4eef374a06cbfef2463fc053115 SHA512 4c058826b51181cd230b813390fd11d30697e2ff352d6af5ba576f30c35703c336c5390663d7aeb6e74203b9d457d45d3079fad88a79d89b21272b07a21f7e39
+EBUILD lvm2-2.03.14-r4.ebuild 9754 BLAKE2B fb0bc82154959383aebdb494229f521c39fdb1fcd9efd44ed43257456610cfe3cc1822878ff929eaacb4b5aea6f2fbb8acdb5c7a388066ec547933cc9d2e4fb0 SHA512 8a266fbee2cf9ee8e48be42a415483f37a4ea3959c7d6e8e7118d13ebc3f7dbb0d6858f3714f292947affa3a1914df08d22d58d637d87bd6b9943d27ff8fe593
+EBUILD lvm2-2.03.16-r1.ebuild 9680 BLAKE2B 5205dad55e1b3c698c5c5df2e3180ccc6efd1f96d06999da9900cbed699287a65fc32140ff21c976acac39a49d347e8f1d10421a3dfbb977119ca3a898e6c7aa SHA512 38189585f7fb88bebfcfae78c098308c39c204db97c96894a1a62170de53229d865c8664b95cfe1dbf89b84aee083072d845fcfff259f6cbfb65d2e8e507809b
+MISC metadata.xml 939 BLAKE2B a3f004d1454fd139e640d70d7e53b472faa4f70f1b7b7b015a85ddd15766746ed89d0691ab8988b826d50d384d9be689dc5c2162358255c86fe24056c06acd55 SHA512 4bbc76d6ab664633ad7306965a430ae7071f3822e5dcc55d102ab19f2a853ead2c33144372892e38c51c264ca3e2ff7bcf4765105a7e7960fb5c835879e81621
diff --git a/sys-fs/lvm2/lvm2-2.03.14-r3.ebuild b/sys-fs/lvm2/lvm2-2.03.14-r4.ebuild
index b0b0fa745cfe..b8512c8bc5ce 100644
--- a/sys-fs/lvm2/lvm2-2.03.14-r3.ebuild
+++ b/sys-fs/lvm2/lvm2-2.03.14-r4.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 TMPFILES_OPTIONAL=1
 inherit autotools linux-info systemd toolchain-funcs tmpfiles udev flag-o-matic
 
@@ -13,8 +14,8 @@ SRC_URI="ftp://sourceware.org/pub/lvm2/${PN/lvm/LVM}.${PV}.tgz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="readline static static-libs systemd lvm2create-initrd sanlock selinux +udev +thin device-mapper-only"
-REQUIRED_USE="device-mapper-only? ( !lvm2create-initrd !sanlock !thin )
+IUSE="readline static static-libs systemd +lvm lvm2create-initrd sanlock selinux +udev +thin"
+REQUIRED_USE="!lvm? ( !lvm2create-initrd !sanlock !thin )
 	static? ( !systemd !udev )
 	static-libs? ( static !udev )
 	systemd? ( udev )"
@@ -34,7 +35,7 @@ RDEPEND="${DEPEND_COMMON}
 	>=sys-apps/baselayout-2.2
 	>=sys-apps/util-linux-2.16
 	lvm2create-initrd? ( sys-apps/makedev )
-	!device-mapper-only? ( virtual/tmpfiles )
+	lvm? ( virtual/tmpfiles )
 	thin? ( >=sys-block/thin-provisioning-tools-0.3.0 )"
 # note: thin- 0.3.0 is required to avoid --disable-thin_check_needs_check
 DEPEND="${DEPEND_COMMON}
@@ -133,20 +134,20 @@ src_configure() {
 	# The build options are tristate, and --without is NOT supported
 	# options: 'none', 'internal', 'shared'
 	myeconfargs+=(
-		$(use_enable !device-mapper-only dmfilemapd)
-		$(use_enable !device-mapper-only dmeventd)
-		$(use_enable !device-mapper-only cmdlib)
-		$(use_enable !device-mapper-only fsadm)
-		$(use_enable !device-mapper-only lvmpolld)
-		$(usex device-mapper-only --disable-udev-systemd-background-jobs '')
+		$(use_enable lvm dmfilemapd)
+		$(use_enable lvm dmeventd)
+		$(use_enable lvm cmdlib)
+		$(use_enable lvm fsadm)
+		$(use_enable lvm lvmpolld)
+		$(usex !lvm --disable-udev-systemd-background-jobs '')
 
 		# This only causes the .static versions to become available
 		$(usex static --enable-static_link '')
 
 		# dmeventd requires mirrors to be internal, and snapshot available
 		# so we cannot disable them
-		--with-mirrors="$(usex device-mapper-only none internal)"
-		--with-snapshots="$(usex device-mapper-only none internal)"
+		--with-mirrors="$(usex !lvm none internal)"
+		--with-snapshots="$(usex !lvm none internal)"
 
 		# disable O_DIRECT support on hppa, breaks pv detection (#99532)
 		$(usex hppa --disable-o_direct '')
@@ -197,7 +198,7 @@ src_compile() {
 	emake V=1
 	popd >/dev/null
 
-	if use device-mapper-only ; then
+	if use !lvm ; then
 		emake V=1 device-mapper
 		# https://bugs.gentoo.org/878131
 		emake -C libdm/dm-tools V=1 device-mapper
@@ -217,13 +218,13 @@ src_install() {
 	local INSTALL_TARGETS=( install install_tmpfiles_configuration )
 	# install systemd related files only when requested, bug #522430
 	use systemd && INSTALL_TARGETS+=( SYSTEMD_GENERATOR_DIR="$(systemd_get_systemgeneratordir)" install_systemd_units install_systemd_generators )
-	use device-mapper-only && INSTALL_TARGETS=( install_device-mapper )
+	use !lvm && INSTALL_TARGETS=( install_device-mapper )
 	emake V=1 DESTDIR="${D}" "${INSTALL_TARGETS[@]}"
 
 	newinitd "${FILESDIR}"/device-mapper.rc-2.02.105-r2 device-mapper
 	newconfd "${FILESDIR}"/device-mapper.conf-1.02.22-r3 device-mapper
 
-	if use !device-mapper-only ; then
+	if use lvm ; then
 		newinitd "${FILESDIR}"/dmeventd.initd-2.02.184-r2 dmeventd
 		newinitd "${FILESDIR}"/lvm.rc-2.02.187 lvm
 		newconfd "${FILESDIR}"/lvm.confd-2.02.184-r3 lvm
@@ -244,7 +245,7 @@ src_install() {
 
 	if use static-libs; then
 		dolib.a libdm/ioctl/libdevmapper.a
-		if use !device-mapper-only; then
+		if use lvm; then
 			# depends on lvmetad
 			dolib.a libdaemon/client/libdaemonclient.a #462908
 			# depends on dmeventd
@@ -267,7 +268,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	if ! use device-mapper-only; then
+	if use lvm; then
 		tmpfiles_process lvm2.conf
 	fi
 
diff --git a/sys-fs/lvm2/lvm2-2.03.16.ebuild b/sys-fs/lvm2/lvm2-2.03.16-r1.ebuild
index cd7d14565326..70e6c17be7d5 100644
--- a/sys-fs/lvm2/lvm2-2.03.16.ebuild
+++ b/sys-fs/lvm2/lvm2-2.03.16-r1.ebuild
@@ -1,54 +1,57 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+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/pub/lvm2/${PN/lvm/LVM}.${PV}.tgz
-	https://sourceware.org/pub/lvm2/old/${PN/lvm/LVM}.${PV}.tgz"
+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 ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="readline static static-libs systemd lvm2create-initrd sanlock selinux +udev +thin device-mapper-only"
-REQUIRED_USE="device-mapper-only? ( !lvm2create-initrd !sanlock !thin )
+IUSE="+lvm lvm2create-initrd readline sanlock selinux static static-libs systemd +thin +udev"
+REQUIRED_USE="
 	static? ( !systemd !udev )
 	static-libs? ( static !udev )
 	systemd? ( udev )"
 
 DEPEND_COMMON="
-	dev-libs/libaio[static-libs?]
-	static? ( dev-libs/libaio[static-libs] )
-	!static? ( dev-libs/libaio[static-libs?] )
-	readline? ( sys-libs/readline:0= )
-	sanlock? ( sys-cluster/sanlock )
-	systemd? ( >=sys-apps/systemd-205:0= )
-	udev? ( >=virtual/libudev-208:= )"
+	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
-	>=sys-apps/util-linux-2.16
-	lvm2create-initrd? ( sys-apps/makedev )
-	!device-mapper-only? ( virtual/tmpfiles )
-	thin? ( >=sys-block/thin-provisioning-tools-0.3.0 )"
+	lvm? (
+		virtual/tmpfiles
+		lvm2create-initrd? ( sys-apps/makedev )
+		thin? ( sys-block/thin-provisioning-tools )
+	)"
 # note: thin- 0.3.0 is required to avoid --disable-thin_check_needs_check
 DEPEND="${DEPEND_COMMON}
 	static? (
-		readline? ( sys-libs/readline[static-libs] )
+		lvm? (
+			dev-libs/libaio[static-libs]
+			sys-apps/util-linux[static-libs]
+			readline? ( sys-libs/readline[static-libs] )
+		)
 		selinux? ( sys-libs/libselinux[static-libs] )
-		>=sys-apps/util-linux-2.16[static-libs]
 	)"
 BDEPEND="
 	sys-devel/autoconf-archive
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${PN/lvm/LVM}.${PV}"
+	virtual/pkgconfig"
 
 PATCHES=(
 	# Gentoo specific modification(s):
@@ -72,6 +75,8 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.03.16-readelf.patch
 )
 
+QA_CONFIGURE_OPTIONS="--disable-static"
+
 pkg_setup() {
 	local CONFIG_CHECK="~SYSVIPC"
 
@@ -114,7 +119,7 @@ src_prepare() {
 	sed -i -e "s:/usr/bin/true:$(type -P true):" scripts/blk_availability_systemd_red_hat.service.in || die #517514
 
 	# Don't install thin man page when not requested
-	if ! use thin ; then
+	if ! use lvm || ! use thin ; then
 		sed -i -e 's/^\(MAN7+=.*\) $(LVMTHINMAN) \(.*\)$/\1 \2/' man/Makefile.in || die
 	fi
 
@@ -133,26 +138,26 @@ src_configure() {
 	# The build options are tristate, and --without is NOT supported
 	# options: 'none', 'internal', 'shared'
 	myeconfargs+=(
-		$(use_enable !device-mapper-only dmfilemapd)
-		$(use_enable !device-mapper-only dmeventd)
-		$(use_enable !device-mapper-only cmdlib)
-		$(use_enable !device-mapper-only fsadm)
-		$(use_enable !device-mapper-only lvmpolld)
-		$(usex device-mapper-only --disable-udev-systemd-background-jobs '')
+		$(use_enable lvm dmfilemapd)
+		$(use_enable lvm dmeventd)
+		$(use_enable lvm cmdlib)
+		$(use_enable lvm fsadm)
+		$(use_enable lvm lvmpolld)
+		$(usev !lvm --disable-udev-systemd-background-jobs)
 
 		# This only causes the .static versions to become available
-		$(usex static --enable-static_link '')
+		$(usev static --enable-static_link)
 
 		# dmeventd requires mirrors to be internal, and snapshot available
 		# so we cannot disable them
-		--with-mirrors="$(usex device-mapper-only none internal)"
-		--with-snapshots="$(usex device-mapper-only none internal)"
+		--with-mirrors="$(usex lvm internal none)"
+		--with-snapshots="$(usex lvm internal none)"
 
 		# disable O_DIRECT support on hppa, breaks pv detection (#99532)
-		$(usex hppa --disable-o_direct '')
+		$(usev hppa --disable-o_direct)
 	)
 
-	if use thin; then
+	if use lvm && use thin; then
 		myeconfargs+=( --with-thin=internal --with-cache=internal )
 		local texec
 		for texec in check dump repair restore; do
@@ -181,7 +186,8 @@ src_configure() {
 		$(use_enable udev udev_rules)
 		$(use_enable udev udev_sync)
 		$(use_with udev udevdir "${EPREFIX}$(get_udevdir)"/rules.d)
-		$(use_enable sanlock lvmlockd-sanlock)
+		# USE=sanlock requires USE=lvm
+		$(use_enable $(usex lvm sanlock lvm) lvmlockd-sanlock)
 		$(use_enable systemd udev-systemd-background-jobs)
 		$(use_enable systemd notify-dbus)
 		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
@@ -190,22 +196,19 @@ src_configure() {
 	)
 	# Hard-wire this to bash as some shells (dash) don't know
 	# "-o pipefail" #682404
-	CONFIG_SHELL="/bin/bash" \
-	econf "${myeconfargs[@]}"
+	CONFIG_SHELL="${BROOT}/bin/bash" econf "${myeconfargs[@]}"
 }
 
 src_compile() {
-	pushd include >/dev/null
-	emake V=1
-	popd >/dev/null
+	emake V=1 -C include
 
-	if use device-mapper-only ; then
+	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 -C libdm/dm-tools V=1 device-mapper
-	else
-		emake V=1
-		emake V=1 CC="$(tc-getCC)" -C scripts #lvm2_activation_generator_systemd_red_hat
+		emake V=1 -C libdm/dm-tools device-mapper
 	fi
 }
 
@@ -215,17 +218,21 @@ src_test() {
 }
 
 src_install() {
-	local inst
-	local INSTALL_TARGETS=( install install_tmpfiles_configuration )
-	# install systemd related files only when requested, bug #522430
-	use systemd && INSTALL_TARGETS+=( SYSTEMD_GENERATOR_DIR="$(systemd_get_systemgeneratordir)" install_systemd_units install_systemd_generators )
-	use device-mapper-only && INSTALL_TARGETS=( install_device-mapper )
+	local INSTALL_TARGETS=(
+		# full LVM2
+		$(usev lvm "install install_tmpfiles_configuration")
+		# install systemd related files only when requested, bug #522430
+		$(usev $(usex lvm systemd lvm) "SYSTEMD_GENERATOR_DIR=$(systemd_get_systemgeneratordir) install_systemd_units install_systemd_generators")
+
+		# install dm unconditionally
+		install_device-mapper
+	)
 	emake V=1 DESTDIR="${D}" "${INSTALL_TARGETS[@]}"
 
 	newinitd "${FILESDIR}"/device-mapper.rc-2.02.105-r2 device-mapper
 	newconfd "${FILESDIR}"/device-mapper.conf-1.02.22-r3 device-mapper
 
-	if use !device-mapper-only ; then
+	if use lvm ; then
 		newinitd "${FILESDIR}"/dmeventd.initd-2.02.184-r2 dmeventd
 		newinitd "${FILESDIR}"/lvm.rc-2.02.187 lvm
 		newconfd "${FILESDIR}"/lvm.confd-2.02.184-r3 lvm
@@ -233,33 +240,33 @@ src_install() {
 			# 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"
+				"${ED}"/etc/conf.d/lvm || die "Could not drop udev from rc_need"
 		fi
 
 		newinitd "${FILESDIR}"/lvm-monitoring.initd-2.02.105-r2 lvm-monitoring
 		newinitd "${FILESDIR}"/lvmpolld.initd-2.02.183 lvmpolld
-	fi
 
-	if use sanlock; then
-		newinitd "${FILESDIR}"/lvmlockd.initd-2.02.166-r1 lvmlockd
+		if use lvm2create-initrd; then
+			dosbin scripts/lvm2create_initrd/lvm2create_initrd
+			doman scripts/lvm2create_initrd/lvm2create_initrd.8
+			newdoc scripts/lvm2create_initrd/README README.lvm2create_initrd
+		fi
+
+		if use sanlock; then
+			newinitd "${FILESDIR}"/lvmlockd.initd-2.02.166-r1 lvmlockd
+		fi
 	fi
 
 	if use static-libs; then
 		dolib.a libdm/ioctl/libdevmapper.a
-		if use !device-mapper-only; then
+		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
-	fi
-
-	if use lvm2create-initrd; then
-		dosbin scripts/lvm2create_initrd/lvm2create_initrd
-		doman scripts/lvm2create_initrd/lvm2create_initrd.8
-		newdoc scripts/lvm2create_initrd/README README.lvm2create_initrd
+		rm -f "${ED}"/usr/$(get_libdir)/{libdevmapper-event,liblvm2cmd,liblvm2app,libdevmapper}.a || die
 	fi
 
 	insinto /etc
@@ -269,9 +276,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	if ! use device-mapper-only; then
-		tmpfiles_process lvm2.conf
-	fi
+	use lvm && tmpfiles_process lvm2.conf
 
 	if use udev; then
 		udev_reload
diff --git a/sys-fs/lvm2/metadata.xml b/sys-fs/lvm2/metadata.xml
index 1f13a2e87d3b..58bb7db61599 100644
--- a/sys-fs/lvm2/metadata.xml
+++ b/sys-fs/lvm2/metadata.xml
@@ -13,7 +13,7 @@
 	<use>
 		<flag name="lvm2create-initrd">Install lvm2create_initrd script and pull in <pkg>sys-apps/makedev</pkg> for the /sbin/MAKEDEV command</flag>
 		<flag name="thin">Support for thin volumes</flag>
-		<flag name="device-mapper-only">Build only device-mapper and not the rest of LVM2 (UNSUPPORTED)</flag>
+		<flag name="lvm">Build all of LVM2, not just device-mapper</flag>
 		<flag name="sanlock">Enable lvmlockd with support for sanlock</flag>
 	</use>
 	<upstream>