gentoo auto-resync : 15:01:2023 - 17:55:24

2 files changed, 29 insertions, 12 deletions

diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest
index a836cab8434f..f52a9774b07f 100644
--- a/sys-fs/lvm2/Manifest
+++ b/sys-fs/lvm2/Manifest
@@ -24,5 +24,5 @@ AUX lvm2-2.03.17-readelf.patch 1804 BLAKE2B 559eea74823b3d333e68ac9fddd104661714
 AUX lvmlockd.initd-2.02.166-r1 390 BLAKE2B aebfa2a654eca784da24fd4e4d46b3e6c97256a42b725e015a13c9673e79c0d1a10213d1eecb6c75d4ce1ebd99e6200010f19c36d758018bdef303ea08ee5549 SHA512 6359b3cbff1fa05944fb69582234220cac593b2c8f8317162a728bac72ced4f8b492ce11e6ced6d848a7654fa4a506c1e658f546cff302344a739646479a62dc
 AUX lvmpolld.initd-2.02.183 348 BLAKE2B cba0419add6591320dc60ef7616b66706e042b566284a4ec42002fbb5331a7173fc8b4b39be7198426fe4bbdcd3ad94b69fc3d8950705b6331c5f3f4cda4ad66 SHA512 b9b8376cbc8b6703868afab18e5baa4ef5354569e57f0596d38a8005fa725299f6858ac86b39fcca10e5a0f1adbd3a4cfa6cc6b62405e78916cc1287d8b36d0d
 DIST LVM2.2.03.17.tgz 2726793 BLAKE2B 425e52fe2d7832f8440203d2b6ffc3a097903abea8be07bbbf4864001d5f55083954e561a92b0fe4fc467533e465af3958b25cf33d2693f50f077dc3d9b74bd2 SHA512 ce9f4c10a7e89b397fa021098976117c062227da4f25996296dd3678c0aeb826edf9b7e4f5d3992f42156865ae47cb98671ec37a26868710174a473b42cc70a9
-EBUILD lvm2-2.03.17-r1.ebuild 9405 BLAKE2B f55fbb12323e740c9b0d0c988adece5bfc2339121b837ad6bbe0c41b0c77d3382af2f32095aa73fa325d804b9e4742e2d7280e9c024de9ae90ed25ec8a6529c7 SHA512 a05157e0af5f1cea307d009859740a95ac89e91a326132b0bc6bfb88174de832f4518c396bb268bf1ebb4dcd155f59d0a4fe97a823a140c28ec739e86f8b1506
+EBUILD lvm2-2.03.17-r2.ebuild 9952 BLAKE2B 875bc183ee4e0e9f81c57e3b5faab740dd71ae421713f15497e94fb249d09200be653c8121ecd7c80e9c15a7ad1492ce33538b3b083c19c5164d8867f303e829 SHA512 4891ac05e9f3418b3f5c11f8a9d75d33842316e1be980a9cf6cb42222e34199541b6c6c929c213fa9c4c4f6b89a2b5c9c53dbb586f55c09ec8105902289fa944
 MISC metadata.xml 922 BLAKE2B 8688e31c04a110d0e522a13724896a2a7c22a9ce33d8d4384a7fbfb54e3c42c231d3b5791ceda976453d54062c5a8318cd514979fcad177ab1ff2a01b791ca65 SHA512 423e499010daffc24141021bc5328b83f9e39e1534bb30fdbbf6839f4ed426897d764d0ca6d0e96267bc67986d3a2cfa9cc5ec3f0e3b2e7aa5ef34095de95a61
diff --git a/sys-fs/lvm2/lvm2-2.03.17-r1.ebuild b/sys-fs/lvm2/lvm2-2.03.17-r2.ebuild
index f0470c0a4165..27f458ee325f 100644
--- a/sys-fs/lvm2/lvm2-2.03.17-r1.ebuild
+++ b/sys-fs/lvm2/lvm2-2.03.17-r2.ebuild
@@ -263,20 +263,37 @@ src_install() {
 	dodoc README VERSION* WHATS_NEW WHATS_NEW_DM doc/*.{c,txt} conf/*.conf
 }
 
-pkg_postinst() {
-	use lvm && tmpfiles_process lvm2.conf
+pkg_preinst() {
+	HAD_LVM=0
 
-	if use udev; then
-		udev_reload
+	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
-		# This is a new installation
-		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 /etc/lvm/lvm.conf if you want"
-		ewarn "to enable lvm autoactivation and metadata caching."
+		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
@@ -291,7 +308,7 @@ pkg_postinst() {
 			ewarn ""
 			ewarn "    ${permission_run_expected} /run"
 			ewarn ""
-			ewarn "This is known to be causing problems for UDEV-enabled LVM services."
+			ewarn "This is known to cause problems for udev-enabled LVM services."
 		fi
 	fi
 }