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

7 files changed, 33 insertions, 17 deletions

diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index edd6713e4450..fa7e88a16d18 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/duf/Manifest b/sys-fs/duf/Manifest
index ce7b6ecec7c7..aa9d7150ab7e 100644
--- a/sys-fs/duf/Manifest
+++ b/sys-fs/duf/Manifest
@@ -1,4 +1,4 @@
 DIST duf-0.8.1-deps.tar.xz 6372212 BLAKE2B 01baf089f6142759ef8e376b352e31ecd482f0a94106a4e2606c2f6146cdd7ec33b431621dd680876650896f9d590a21d242b871777164af588e35804a11477e SHA512 51b966b5a8701c8e39ea2d022ca6ee1e0c64fd189b3531d8d0e253d46ee2b5d7270963c3a4930e964312085914edac45c78ed8fa440b459df13977c83ab3c964
 DIST duf-0.8.1.tar.gz 138214 BLAKE2B 388b7494ae15bdc026303ec81f529c08c66e34a8fb82d13c9b7fa730b1684edee5711497d866cbd16376573a386ef9311288e7e9d6143a577d2381425f8218bc SHA512 598318cd90e8a27bdc448cb84682f3846baa02bab0f527a26de42b8b3efd3ba258a76b6f7a74a41405e20b23ccff92db1b6ef7d3412fc8261942a8ccde4241dc
-EBUILD duf-0.8.1.ebuild 613 BLAKE2B 83cf70dd011bccd2e467e984155614594e7b47c62b7f3bff7f7420a9b06b05a6cb83d4fb2a8ceeacd92fe6ccd86c96f3bd6f5743705bb55a0a40c709047b5018 SHA512 a174b7dc51eb40d2478c265717408e07c0803d388e0f1673f1f254d525f2164207723e90753e6edb985c668aca12a508942513ad252a877b24acec0c9607b3fb
+EBUILD duf-0.8.1.ebuild 613 BLAKE2B 92c153ed5809325dc8e76f7aca8b1ea8e419b0fabbdad4387799b15ada3474a1c94574f17bb2e3e6846bd1022e88dd46969ce0ac2f5519b0922f40688a84817b SHA512 70dee1acab978e5febb3de567aac505f752bbd2ddc0680e988c1936d1a6ec40e95ad13d9990e01ac8d9f8cfb7ab4b7e06db4784a05699371b75941738c3d9ee1
 MISC metadata.xml 767 BLAKE2B e6612eda8c95561b5bdc9f75ce9059cd557c0e56ade957968235fbb3917bf5a1d0cb1f1daf2e20b0a41e0490555f0f33ef25333ccfb87ed41b77d6bc3963c963 SHA512 bb56a029fb0f82f0cbecb4181bfd3cd67b51188795441b3e702906644b7da10e929018a77740825a5c68e781e0711446a06480ecb3ffb745edb885cb2e277eac
diff --git a/sys-fs/duf/duf-0.8.1.ebuild b/sys-fs/duf/duf-0.8.1.ebuild
index d948b7dff84d..9f64f0d84c61 100644
--- a/sys-fs/duf/duf-0.8.1.ebuild
+++ b/sys-fs/duf/duf-0.8.1.ebuild
@@ -8,7 +8,7 @@ inherit go-module
 DESCRIPTION="Disk Usage/Free Utility - a better 'df' alternative"
 HOMEPAGE="https://github.com/muesli/duf"
 SRC_URI="https://github.com/muesli/duf/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://github.com/mrmagic223325/duf/releases/download/${PV}/${P}-deps.tar.xz"
+SRC_URI+=" https://github.com/mrmagic223325/deps/releases/download/${P}/${P}-deps.tar.xz"
 
 LICENSE="MIT BSD Apache-2.0"
 SLOT="0"
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
 }
diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest
index a64e6d8dd36d..79ce5c8c4c16 100644
--- a/sys-fs/xfsprogs/Manifest
+++ b/sys-fs/xfsprogs/Manifest
@@ -3,8 +3,8 @@ AUX xfsprogs-5.18.0-include.patch 570 BLAKE2B c53be8940cfae61eed0cf75d3ac90c3985
 AUX xfsprogs-5.3.0-libdir.patch 1137 BLAKE2B 7e455b8b82c553a819155fb4c1fee3d5c31bef0fa4c7ab0bf4ad4558a9a5b0b2f408138558c3601deb3ba85d465ab2dae5248bc20a4ba83f08cf733b27a796a1 SHA512 eaec31b6dab500c2e9c4fe7d5d82e60a40f3073cff99af0ae2aa817f6e4541f6a3de0a48f9151a274c6dd97e99ca26192b95b920aea1c5227d75232b808c98fa
 DIST xfsprogs-5.18.0.tar.xz 1310008 BLAKE2B a2a2835d53ee6ac55279636f3f3cdcecab8757911ce5c1ea5f350a4da9ff4c1ca64b2aba1c0e5424c0c0a01fd0504396d5fecca12e4689c372ed5bb76b9ac24e SHA512 47d035a33367edae7357e34c70bdb0fe9219231153fb4c4f418ed1462d137dd77338c12a199eb71cd70e88903e5fc11e1e4fb595c622183786e87346e2f65739
 DIST xfsprogs-6.0.0.tar.xz 1320744 BLAKE2B ae1d175e3dc5f0f6819397f8166a419847da07616d472f81928e3086b9fac420c09e9406d752a34a957d6d9c82a45defb17d6773e87e3b5f4ff509952ef3e76e SHA512 a3ddccdea1129038420d933f1e9ae8f9e75b3ad59fd0fe4c61b7a4dc6145f47b4262f68aefc3216d37cc33ee5643cd6f260ec83cd39d6b61a1cd046c03674ad8
-DIST xfsprogs-6.1.0.tar.xz 1322908 BLAKE2B 0be85ec90079bb4cb5888785f872365382dc2bdeb9f64780dfd3dd2c8ec5fdea7eda76f5fe683de7f768d5d4b822e85a59e80ed713f196647f5c4431601fab7b SHA512 6b6896ea2312836642fc3536aa47c1b96074c495dfa5876ebf06370f8b64d36df6149798153f86bb6ba3fde54354694f74ee72446dd4c6ab509013d82d25e8b0
+DIST xfsprogs-6.1.1.tar.xz 1322528 BLAKE2B f6551356ccc68ee6d0bdc50edcf9717bfc94053e97b408f0fa6b316d51391bd347baa8c6ce09e269d09177eec14befc4235738e92d5e4408bda1113c79b2b18b SHA512 ec11cb9be34502a006f18ebea0a62aa227580753fce57cb7b6394d079fa41aee778382c06116a2fa45b67989a1501bbba2013829d2348b51e1136e668966c5e6
 EBUILD xfsprogs-5.18.0-r1.ebuild 2327 BLAKE2B 58e5d854515fcde4f9315c9c718fa8a370ee21239ff7a010473ebe06e9e8bb7f1a02f17bbae308c5918d41d18e89fc01a3f1cb56067d7e602738cbf746cc7c37 SHA512 4249c3b7cf9893b30b708c572b30b7f7f9e377fbcb7ebb970b89c993dee65892819c11c6d3526415fa795276bc420940e0da9f47749a1080b445cb8d60731ee3
 EBUILD xfsprogs-6.0.0.ebuild 2327 BLAKE2B 58e5d854515fcde4f9315c9c718fa8a370ee21239ff7a010473ebe06e9e8bb7f1a02f17bbae308c5918d41d18e89fc01a3f1cb56067d7e602738cbf746cc7c37 SHA512 4249c3b7cf9893b30b708c572b30b7f7f9e377fbcb7ebb970b89c993dee65892819c11c6d3526415fa795276bc420940e0da9f47749a1080b445cb8d60731ee3
-EBUILD xfsprogs-6.1.0.ebuild 2335 BLAKE2B 8ea81b9ca1540e56a9754e9f1411b19e36f5a847c95177f5886da15d5b6aec691a54ba5878797c966f8a4d1c0525d4fc6d0a79150d7834466d6567fbbddf6032 SHA512 0dd2c5ea7cd021f867a28e379ab5347d6ff18bf811b056ce549c1c09109bd6b8163179b715b16d71d6052b5bb74ee30e8579e5b5b4924e47edf66224c8b7a4cd
+EBUILD xfsprogs-6.1.1.ebuild 2293 BLAKE2B b01fe644c1ad6e7302925b1a20c426845d20adf2db58572ff9f91fa50de68b31ce6cb53e6683bfb1a8b96448d23b61beeab409f55397b3757a2bcf4981df8076 SHA512 ad91ee2b536108b2f5ce93ff9253aac67a415250c9ed63497986769a0b1dd249900a5214b2554331609588df127c34453a81c1d80aa565d72ff38a0905814436
 MISC metadata.xml 339 BLAKE2B b7d67fc8bcf854e7a2453c23e5d5d8c193525ccd16a643e80415a103d2d22c892458ea6ada32653d04b3d471c780f07b2b0537a317d9e64468130e065c6f5ab1 SHA512 445b4f6d853a272cc6bf8fde42745adf226512fa310f9af4bbabad4cfa5a6888b2c2215dfc0896c07b800820b69417c6d408bb21ed17a5224b5c9e3412c5f62d
diff --git a/sys-fs/xfsprogs/xfsprogs-6.1.0.ebuild b/sys-fs/xfsprogs/xfsprogs-6.1.1.ebuild
index 22663401ef36..99a0dfd3f25d 100644
--- a/sys-fs/xfsprogs/xfsprogs-6.1.0.ebuild
+++ b/sys-fs/xfsprogs/xfsprogs-6.1.1.ebuild
@@ -26,7 +26,6 @@ RDEPEND+=" selinux? ( sec-policy/selinux-xfs )"
 PATCHES=(
 	"${FILESDIR}"/${PN}-5.3.0-libdir.patch
 	"${FILESDIR}"/${PN}-5.18.0-docdir.patch
-	"${FILESDIR}"/${PN}-5.18.0-include.patch
 )
 
 src_prepare() {