gentoo resync : 13.11.2021

4 files changed, 17 insertions, 18 deletions

diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest
index 5e11d9d6d332..fb4b2227463e 100644
--- a/sys-fs/lvm2/Manifest
+++ b/sys-fs/lvm2/Manifest
@@ -32,6 +32,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.02.188.tgz 2421550 BLAKE2B bed90c8454cd4b20fdeec6dcbf5a9f97c9310671aea3b2252f8069cfa439fcb050f5ad95f928a7125a1734a4dc5ac985da99a4a570538e377a7205191a505476 SHA512 8c9db17c49dc8ebcab6c7f246ab85870a80658be811cf7f4d8f36abbebafa355b030bfc1e3bcbad73ccccb7fcd06d4a95ac547ca15d18d33715126da92703dca
 DIST LVM2.2.03.14.tgz 2639538 BLAKE2B 806f5e9cb76a05febef6f8ce8cfc42c92927b9538f62a21029c5ffc426a4fd7c3f32709be08dbd8028b53891b1075d1d13cb3b0d7b1815071ee8eb927d8f3ed3 SHA512 6a93bed1d5cf36f0f48d4d413d028b0e480cd4fc20e25d173770a892f265d2a0cc68d01a720b1513469953649e989532cd0c45f9538f92a4190eb3dc4555857d
-EBUILD lvm2-2.02.188-r2.ebuild 10201 BLAKE2B b5e314a58938aac469c41deacfccbae61764e6935cdde28aaae27c793ba0fed0ddbd3606ddce0a16187aaa6755f8a513e56a20066c9222a9f439980a7c602579 SHA512 d7d1f489eb84101a5c98b2d40dc73742329aec811c0feaeb9ac459a04d2f018fd9ecc13913b70a2a3524df97e2e461106631d425bee4515c021da3385b5322e5
-EBUILD lvm2-2.03.14.ebuild 9711 BLAKE2B 1ae67efc26a6f77822786ffe6a4d1a92398f2676218515869a4573e0f3192894e0eeaf8116ff785c0948fea785b50ae190a51a56ace5085f23ee310a720a5bdb SHA512 43ba1592c735b6493e22f01ab5d1cec25b3a1ed5317507680d7e44d7a18495a170e9be13db4de2e719b4a97e961fb740b9a6f2901c1c94912eafe50acc238c78
-MISC metadata.xml 1035 BLAKE2B 363c4aefb6831140dbad128de1856a51025a267ec3f91c8e904623acd37f768241476e75c0445188a22892c1c7f63ad30302c7325f529c024d9cd0939dfba91d SHA512 6b4c9f27d96b1b90362db7d167d9f9b05f5f7f8d70394502d4cd581e8677c184ff05cf8474882902dce6c5ac746ec9c73d8a09ee8fb12ec48e006e13372c1f92
+EBUILD lvm2-2.02.188-r2.ebuild 10131 BLAKE2B 1fb4372993e615678e9f5f1a44bcb530ad959ec727a9db5e78bad15bdc32aba31825e75539780987cbede765f16d655d09d1d3cde1e88892fd3b7fa7794056fc SHA512 cb60df19a2ed209c0b47fd50637b1ab18788ac63c865b50e175e6e48b842a8ffa00f53a460305f6554f7a732763c705ba27b1e21e4a2f5a8cb81dbee32946374
+EBUILD lvm2-2.03.14.ebuild 9740 BLAKE2B a7457c9ba8a9f0c0bc31e6670a229f7f4ad27bb1d677650cc9cee3bce083a183ab93737ee7a5c4203b352e8b0a0ec7895ed2fb34e470250d5eee81ec3c0b4d0b SHA512 44722ccf1e9ec4a270a04a187244b267d0ed958dc2de3a1e5fa68318641d570d6f4498923fdb5ec353831b97c0bda2a8130b8d61b2e56fc5ac87eaf6a6e7638a
+MISC metadata.xml 1035 BLAKE2B b9a3162e72e1ea09c7530edca817046434186c3948ef763c1a4efedb45aa8f842b7819efdbb09fb40897368e61b26a43896ef28a4a9d1ae554ea3cdb81f88dc7 SHA512 a16653a343d66eab8bd790eb974cc95d75f48321051ebb37eef87b3c7ad9903b2be1f0c70aff4b711b4469fa2715a5fb0c8566c46e6a83173bf998cf182ce964
diff --git a/sys-fs/lvm2/lvm2-2.02.188-r2.ebuild b/sys-fs/lvm2/lvm2-2.02.188-r2.ebuild
index dcba617a6048..60cc0d980580 100644
--- a/sys-fs/lvm2/lvm2-2.02.188-r2.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.188-r2.ebuild
@@ -13,8 +13,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 ~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 lvm2create-initrd sanlock selinux +udev +thin device-mapper-only"
+REQUIRED_USE="device-mapper-only? ( !lvm2create-initrd !sanlock !thin )
 	static? ( !systemd !udev )
 	static-libs? ( !udev )
 	systemd? ( udev )"
@@ -32,11 +32,8 @@ DEPEND_COMMON="
 # This version of LVM is incompatible with cryptsetup <1.1.2.
 RDEPEND="${DEPEND_COMMON}
 	>=sys-apps/baselayout-2.2
-	!<sys-apps/openrc-0.11
-	!<sys-fs/cryptsetup-1.1.2
-	!!sys-fs/lvm-user
 	>=sys-apps/util-linux-2.16
-	lvm2create_initrd? ( sys-apps/makedev )
+	lvm2create-initrd? ( sys-apps/makedev )
 	!device-mapper-only? ( 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
@@ -254,7 +251,7 @@ src_install() {
 		rm -f "${ED}"/usr/$(get_libdir)/{libdevmapper-event,liblvm2cmd,liblvm2app,libdevmapper}.a
 	fi
 
-	if use lvm2create_initrd; then
+	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
diff --git a/sys-fs/lvm2/lvm2-2.03.14.ebuild b/sys-fs/lvm2/lvm2-2.03.14.ebuild
index 1cc2795b71b0..d95b20485c02 100644
--- a/sys-fs/lvm2/lvm2-2.03.14.ebuild
+++ b/sys-fs/lvm2/lvm2-2.03.14.ebuild
@@ -13,8 +13,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 ~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 lvm2create-initrd sanlock selinux +udev +thin device-mapper-only"
+REQUIRED_USE="device-mapper-only? ( !lvm2create-initrd !sanlock !thin )
 	static? ( !systemd !udev )
 	static-libs? ( !udev )
 	systemd? ( udev )"
@@ -32,16 +32,14 @@ DEPEND_COMMON="
 # This version of LVM is incompatible with cryptsetup <1.1.2.
 RDEPEND="${DEPEND_COMMON}
 	>=sys-apps/baselayout-2.2
-	!<sys-apps/openrc-0.11
-	!<sys-fs/cryptsetup-1.1.2
-	!!sys-fs/lvm-user
 	>=sys-apps/util-linux-2.16
-	lvm2create_initrd? ( sys-apps/makedev )
+	lvm2create-initrd? ( sys-apps/makedev )
 	!device-mapper-only? ( 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}
 	static? (
+		readline? ( sys-libs/readline[static-libs] )
 		selinux? ( sys-libs/libselinux[static-libs] )
 		>=sys-apps/util-linux-2.16[static-libs]
 	)"
@@ -120,6 +118,10 @@ src_prepare() {
 
 src_configure() {
 	filter-flags -flto
+
+	# Workaround for bug #822210
+	tc-ld-disable-gold
+
 	local myeconfargs=()
 
 	# Most of this package does weird stuff.
@@ -242,7 +244,7 @@ src_install() {
 		rm -f "${ED}"/usr/$(get_libdir)/{libdevmapper-event,liblvm2cmd,liblvm2app,libdevmapper}.a
 	fi
 
-	if use lvm2create_initrd; then
+	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
diff --git a/sys-fs/lvm2/metadata.xml b/sys-fs/lvm2/metadata.xml
index 75aaff4f1e52..e264bd799086 100644
--- a/sys-fs/lvm2/metadata.xml
+++ b/sys-fs/lvm2/metadata.xml
@@ -15,7 +15,7 @@
 		<description>Upstream Maintainer (please CC on bugs)</description>
 	</maintainer>
 	<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="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="sanlock">Enable lvmlockd with support for sanlock</flag>