gentoo resync : 25.10.2021

3 files changed, 29 insertions, 22 deletions

diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest
index 74d251118b9a..5e11d9d6d332 100644
--- a/sys-fs/lvm2/Manifest
+++ b/sys-fs/lvm2/Manifest
@@ -26,12 +26,12 @@ AUX lvm2-2.03.06-example.conf.in.patch 1833 BLAKE2B 21f9d51be4a704417dc35ed7d5ae
 AUX lvm2-2.03.12-dynamic-static-ldflags.patch 2591 BLAKE2B b1edda6bd715d805ae12967ca453e08859c44f5e48d32e6d264682a6aac6a27fb47aa8fcb36b68b28e3237d76c8b5d060b050736c38d6913a7647b6168a98c3d SHA512 5c9c1d65579a14585c68a348c00b867a48398ebe7a871e6bfcc8cd3a6776c260aa6200f22c108f95ecd65b61ba4b260a5e6acae17dc8c9e639692bbcca2bdf37
 AUX lvm2-2.03.12-static-libm.patch 1000 BLAKE2B 4bde7eda80a00f7c692341ebc74ab30308f3157162caba4d789dac42318fd5a16d6b1471463bc2a1f02f50313ce274ecc5aeb039c90e0b979d73146cc9497fba SHA512 cc7764fdaadd767e88d68a3a071f72a7ce30e5bc98fb55b49cf8ba00c3c5a1cac288f2aad0fec94eba5dd2100108756f1315b9704e872d7d64100bbeff1b7a17
 AUX lvm2-2.03.12-static-pkgconfig-libs-2.patch 1260 BLAKE2B 3ee43306af649c4d23ac9b096f0649b48f40416a6e77098e449429e6b8a881a23e8e1158be72ab4c2b5d9bf11dda4b983da1b03d13ec614250d530b57d6d8ec1 SHA512 94704e273c82272fcb3e77da66894204f96bfa28343d3f3edc3aa90aeba6334872bace17c57c64cf35114113cd6d20d628702d1516b7c1296f6ceafd75c5c3b6
-AUX lvm2-2.03.12-static-pkgconfig-libs.patch 4438 BLAKE2B 0b24f49401f0ac5c440e3b6dbb768d368ed30609cdb9720598700855c2d8394feb5f495945ef67129ce3897b50a1d029ac8e46a7303461f2163b52605b694a02 SHA512 a68db7128107220631db0b3752a1c4ff89d376a50e71700c24ed12833a1a1394caf88769ab376277a838f1878991c0c208b3d40e61ffd616b988c2f6dacf3095
+AUX lvm2-2.03.14-static-pkgconfig-libs.patch 4600 BLAKE2B 18fb5d69fb77625189539a64d4189b8ec5bc783ddb10e6e38033633b9a7049203264f0cd7b6c4b6c999c9767130f5da3526a805ffdb187c7aff98de592c11b35 SHA512 c2bc3b7b92bdfed028703a5bb57873c976978a6c84a409098828b96258b0fa349715bd2f140d6d41cbbacbfc34fc7c7901428e21716e04bfbf2d58847653c34e
 AUX lvmetad.initd-2.02.116-r3 345 BLAKE2B d458efd01fa08debe0857072c880adf951477445dd619a052f50cab9da39d8a38c9d480fc2d20fe899e01dcbcdaea0696d5c3e65af128652feea3186857d206e SHA512 f3143c6e1d00893009c68141f5ffd7e1e6bcf5b7ef0ff8505bc6c7049d83b2f9ddd2dc5a3cfdc2641a20603830b5dba07d73740cc5ce82e6b1b602a9b737a241
 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.02.188.tgz 2421550 BLAKE2B bed90c8454cd4b20fdeec6dcbf5a9f97c9310671aea3b2252f8069cfa439fcb050f5ad95f928a7125a1734a4dc5ac985da99a4a570538e377a7205191a505476 SHA512 8c9db17c49dc8ebcab6c7f246ab85870a80658be811cf7f4d8f36abbebafa355b030bfc1e3bcbad73ccccb7fcd06d4a95ac547ca15d18d33715126da92703dca
-DIST LVM2.2.03.13.tgz 2619537 BLAKE2B 8f93896105e4d392ab88f027bbc0ea874b179a73d10ff8d0850ead2625e86468fe69d55c6fb0108f57a1efc1d3e8cc94647f1bc06636e4a714d0817224bbbfd7 SHA512 8b4fb6da5dd46ddeb754436189072bea79be594fab6d57d9be63c6ce3e3cb68d38601a2c031c493681321281cfb1f1459ace19974c00beb569364f44863cfc4a
+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.13-r2.ebuild 9711 BLAKE2B 06e679ec5390c0298f1716256002b1a7dec3e700b081b647de213218a8a300bafe69e608b9bbbf36f2f45333d64c423ef645af141cbaca37bb958d1f4f5c2356 SHA512 dcf402220a61614591559c4a274cafba896dcf3cd4318182e3c0ed8e62fa37f2a7d68be652b83daa28b189d5ef263e4f7471c01f4d1ca79024bf8802f187588c
+EBUILD lvm2-2.03.14.ebuild 9711 BLAKE2B 1ae67efc26a6f77822786ffe6a4d1a92398f2676218515869a4573e0f3192894e0eeaf8116ff785c0948fea785b50ae190a51a56ace5085f23ee310a720a5bdb SHA512 43ba1592c735b6493e22f01ab5d1cec25b3a1ed5317507680d7e44d7a18495a170e9be13db4de2e719b4a97e961fb740b9a6f2901c1c94912eafe50acc238c78
 MISC metadata.xml 1035 BLAKE2B 363c4aefb6831140dbad128de1856a51025a267ec3f91c8e904623acd37f768241476e75c0445188a22892c1c7f63ad30302c7325f529c024d9cd0939dfba91d SHA512 6b4c9f27d96b1b90362db7d167d9f9b05f5f7f8d70394502d4cd581e8677c184ff05cf8474882902dce6c5ac746ec9c73d8a09ee8fb12ec48e006e13372c1f92
diff --git a/sys-fs/lvm2/files/lvm2-2.03.12-static-pkgconfig-libs.patch b/sys-fs/lvm2/files/lvm2-2.03.14-static-pkgconfig-libs.patch
index 083a7327c6a6..e259547a47b0 100644
--- a/sys-fs/lvm2/files/lvm2-2.03.12-static-pkgconfig-libs.patch
+++ b/sys-fs/lvm2/files/lvm2-2.03.14-static-pkgconfig-libs.patch
@@ -1,4 +1,4 @@
-From 88aeb306dfd1e0174bf02cc208d46f0d722204dc Mon Sep 17 00:00:00 2001
+From ac7cce039825ff779795b5c2ae0ecf00ba43a401 Mon Sep 17 00:00:00 2001
 From: "Robin H. Johnson" <robbat2@gentoo.org>
 Date: Sun, 9 May 2021 11:00:22 +0200
 Subject: [PATCH] Use pkgconfig to detect static libs
@@ -9,10 +9,10 @@ Subject: [PATCH] Use pkgconfig to detect static libs
  2 files changed, 22 insertions(+), 3 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 354b53b5ec..e872d70256 100644
+index 6cdf1a7e65..90452ebf7c 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1097,6 +1097,7 @@ if test "$BLKID_WIPING" != no; then
+@@ -1168,6 +1168,7 @@ if test "$BLKID_WIPING" != no; then
  	PKG_CHECK_MODULES(BLKID, blkid >= 2.24,
  			  [ BLKID_WIPING=yes
  			    BLKID_PC="blkid"
@@ -20,7 +20,7 @@ index 354b53b5ec..e872d70256 100644
  			    DEFAULT_USE_BLKID_WIPING=1
  			    AC_DEFINE([BLKID_WIPING_SUPPORT], 1, [Define to 1 to use libblkid detection of signatures when wiping.])
  			  ], [if test "$BLKID_WIPING" = maybe; then
-@@ -1145,6 +1146,7 @@ AC_MSG_RESULT($UDEV_SYNC)
+@@ -1213,6 +1214,7 @@ AC_MSG_RESULT($UDEV_SYNC)
  if test "$UDEV_SYNC" = yes; then
  	pkg_config_init
  	PKG_CHECK_MODULES(UDEV, libudev >= 143, [UDEV_PC="libudev"])
@@ -28,7 +28,7 @@ index 354b53b5ec..e872d70256 100644
  	AC_DEFINE([UDEV_SYNC_SUPPORT], 1, [Define to 1 to enable synchronisation with udev processing.])
  
  	AC_CHECK_LIB(udev, udev_device_get_is_initialized, AC_DEFINE([HAVE_LIBUDEV_UDEV_DEVICE_GET_IS_INITIALIZED], 1,
-@@ -1369,19 +1371,30 @@ dnl -- Check for selinux
+@@ -1432,19 +1434,30 @@ dnl -- Check for selinux
  if test "$SELINUX" = yes; then
  	AC_CHECK_LIB([sepol], [sepol_check_context], [
  		AC_DEFINE([HAVE_SEPOL], 1, [Define to 1 if sepol_check_context is available.])
@@ -61,7 +61,7 @@ index 354b53b5ec..e872d70256 100644
  fi
  
  ################################################################################
-@@ -1755,6 +1768,7 @@ AC_DEFINE_UNQUOTED(LVM_CONFIGURE_LINE, "$CONFIGURE_LINE", [configure command lin
+@@ -1834,6 +1847,7 @@ AC_ARG_VAR([UDEV_LIBS], [linker flags for udev])
  ################################################################################
  AC_SUBST(AWK)
  AC_SUBST(BLKID_PC)
@@ -69,15 +69,15 @@ index 354b53b5ec..e872d70256 100644
  AC_SUBST(BUILD_CMIRRORD)
  AC_SUBST(BUILD_DMEVENTD)
  AC_SUBST(BUILD_LVMDBUSD)
-@@ -1857,6 +1871,7 @@ AC_SUBST(SALCK_LIBS)
+@@ -1934,6 +1948,7 @@ AC_SUBST(SALCK_LIBS)
  AC_SUBST(SBINDIR)
  AC_SUBST(SELINUX_LIBS)
  AC_SUBST(SELINUX_PC)
 +AC_SUBST(SELINUX_STATIC_LIBS)
  AC_SUBST(SYSCONFDIR)
- AC_SUBST(SYSTEMD_LIBS)
  AC_SUBST(SNAPSHOTS)
-@@ -1875,6 +1890,7 @@ AC_SUBST(CACHE_REPAIR_CMD)
+ AC_SUBST(STATICDIR)
+@@ -1950,6 +1965,7 @@ AC_SUBST(CACHE_REPAIR_CMD)
  AC_SUBST(CACHE_RESTORE_CMD)
  AC_SUBST(UDEV_PC)
  AC_SUBST(UDEV_RULES)
@@ -86,7 +86,7 @@ index 354b53b5ec..e872d70256 100644
  AC_SUBST(UDEV_SYSTEMD_BACKGROUND_JOBS)
  AC_SUBST(UDEV_RULE_EXEC_DETECTION)
 diff --git a/make.tmpl.in b/make.tmpl.in
-index 99f02e8b77..ae189546d0 100644
+index cccda10d6f..bf6c3e5596 100644
 --- a/make.tmpl.in
 +++ b/make.tmpl.in
 @@ -64,7 +64,7 @@ PYCOMPILE = $(top_srcdir)/autoconf/py-compile
@@ -98,20 +98,27 @@ index 99f02e8b77..ae189546d0 100644
  DEFS += @DEFS@
  # FIXME set this only where it's needed, not globally?
  CFLAGS ?= @COPTIMISE_FLAG@ @CFLAGS@
-@@ -83,10 +83,13 @@ PTHREAD_LIBS = @PTHREAD_LIBS@
+@@ -82,6 +82,7 @@ AIO_CFLAGS = @AIO_CFLAGS@
+ AIO_LIBS = @AIO_LIBS@
+ BLKID_CFLAGS = @BLKID_CFLAGS@
+ BLKID_LIBS = @BLKID_LIBS@
++BLKID_STATIC_LIBS = @BLKID_STATIC_LIBS@
+ CPG_CFLAGS = @CPG_CFLAGS@
+ CPG_LIBS = @CPG_LIBS@
+ EDITLINE_CFLAGS = @EDITLINE_CFLAGS@
+@@ -90,10 +91,12 @@ PTHREAD_LIBS = @PTHREAD_LIBS@
+ READLINE_CFLAGS = @READLINE_CFLAGS@
  READLINE_LIBS = @READLINE_LIBS@
- EDITLINE_LIBS = @EDITLINE_LIBS@
  SELINUX_LIBS = @SELINUX_LIBS@
 +SELINUX_STATIC_LIBS = @SELINUX_STATIC_LIBS@
+ SYSTEMD_CFLAGS = @SYSTEMD_CFLAGS@
+ SYSTEMD_LIBS = @SYSTEMD_LIBS@
  UDEV_CFLAGS = @UDEV_CFLAGS@
  UDEV_LIBS = @UDEV_LIBS@
 +UDEV_STATIC_LIBS = @UDEV_STATIC_LIBS@
- BLKID_CFLAGS = @BLKID_CFLAGS@
- BLKID_LIBS = @BLKID_LIBS@
-+BLKID_STATIC_LIBS = @BLKID_STATIC_LIBS@
- SYSTEMD_LIBS = @SYSTEMD_LIBS@
  VALGRIND_CFLAGS = @VALGRIND_CFLAGS@
- USE_TRACKING = @USE_TRACKING@
+ VALGRIND_LIBS = @VALGRIND_LIBS@
+ 
 -- 
-2.31.1
+2.33.1
 
diff --git a/sys-fs/lvm2/lvm2-2.03.13-r2.ebuild b/sys-fs/lvm2/lvm2-2.03.14.ebuild
index f23621e8619b..1cc2795b71b0 100644
--- a/sys-fs/lvm2/lvm2-2.03.13-r2.ebuild
+++ b/sys-fs/lvm2/lvm2-2.03.14.ebuild
@@ -63,7 +63,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.02.99-locale-muck.patch #330373
 	#"${FILESDIR}"/${PN}-2.02.178-asneeded.patch # -Wl,--as-needed
 	"${FILESDIR}"/${PN}-2.03.12-dynamic-static-ldflags.patch #332905
-	"${FILESDIR}"/${PN}-2.03.12-static-pkgconfig-libs.patch #370217, #439414 + blkid
+	"${FILESDIR}"/${PN}-2.03.14-static-pkgconfig-libs.patch #370217, #439414 + blkid
 	"${FILESDIR}"/${PN}-2.03.12-static-pkgconfig-libs-2.patch
 	"${FILESDIR}"/${PN}-2.03.05-pthread-pkgconfig.patch #492450
 	"${FILESDIR}"/${PN}-2.03.12-static-libm.patch #617756