gentoo resync : 17.08.2021

9 files changed, 6 insertions, 714 deletions

diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index 3ef88f94caa1..5f6f110ea0f5 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -1,21 +1,14 @@
 AUX runuser-l.pamd 188 BLAKE2B 4fbd934c05386732b32281fdfac19153f01e0610868f3168026fbc4eb828ed1fe177677939958322fb074a95c8f64bdbaea42a4e9c039ac86dee0154ac96242e SHA512 86538adbd3d01c4b9e46fee00c38d298d2857fb1224461206425532404c212f03331308b74347c9af2e00583a3b50802085bdc6cb2bd393cf5e9d032e7290301
 AUX runuser.pamd 278 BLAKE2B 61afa98e02a4ee030176dad97b7aa7d7075b07584c0e9f2c254f90bf22f6bad7ad8d87cb6d7c95efb789dcbec01e266c3192e135a3a36d817ab47c6bc05e7a01 SHA512 a4c4d41078acdc7c7f1d1f1894d20d052d3d5a3c66d5680d7f76665e251c614fd76ca9678a27ea376147f49250c716a1b3b0c0afa9595bd74d26d2190d1680fd
-AUX util-linux-2.37-avoid_autoreconf.patch 3661 BLAKE2B 5098c11338238c944b69a4f4d7929afa522f80ad1e93044592eabe89eda6bd3684ec7d4a382d4cb39527fdde6d046b3608a515a9d7da328b61c5af40d6137bf3 SHA512 6d6609235e05bf79f51bf03a306cab72e457031b92f7b49379c1fcc70ece0e49a72c633a727814e138aa9cbc10370664040e3f3bf1414da74bb99ffa79128b2f
-AUX util-linux-2.37-lcrypt_link_fix.patch 1545 BLAKE2B 85b9259ae3f8f4d39b94387212cd3db743194c7f8e645deb9b626792e78084f0d786f37d7c6fca0051ea161f020d72a89b3359d9dd9f624e0e009285d9cc937d SHA512 8f0f6ecbbab84b7f0f64111d9fd27852f6a8d9bac69598ae292b2978c0d7a9bc6beaad509ebe7d3bbaf239c9c04a592db13da6642b0029a485c2ad354b0a13ce
-AUX util-linux-2.37-lcrypt_use_LIBS.patch 2486 BLAKE2B bc1e73604932f6dc65c3ed262af37a6a180dd89d9196c531678f713ec3c3d979cef3f0f0627652a891079b71952463250e4edf29e9aaa898eefb9f25b99a0adc SHA512 cb2c37c8f5d668430eef15d87af0dcf237102d5b196ee674e2a4d5fe14482b323f2e915a1cb4f538f07330869dcf04af93281a955ddaa796db283971b1921723
-AUX util-linux-2.37-ppc-nortas.patch 1038 BLAKE2B 0e1ea63056a78476a86cb1fadc5a46e39d2d91af5a4de703857cd3720bc328c931f0ca10383930c414ab98aa7d85c16388da6d91c1192d68cca91365619423c1 SHA512 d8253a3c81cf703533a577e0efed7f1508ee5e979a3ec319e42eedd1e9b8883e0defcdca37852088557d2a027eac6e9008ad95355b7f925b98b165327a017da4
 AUX util-linux-2.37.1-agetty_ctrl-c_erase.patch 1900 BLAKE2B 570c03cc5059198efdec4bfe367c560bcc863de61e8b0e1055535d4731525613ee20eaee5efeac6f96b399df1a60865c29e554df6684e3525f71dac821c8205c SHA512 e970c7b3c6e50bffc2e57f90f3284ba55906d71d286e8d23f06fd9905f66273796712cbd8cf3fa1a12bbb2dc404c72b790caba11ec63c8ff84ed9e4e041f64ca
 AUX util-linux-2.37.1-ipcutils_calloc_check.patch 845 BLAKE2B 44e92d33ccf3bd56c86f5d9d0e4acc9e31fdc7c5e7f9e19c76eace88dbe1488140d57eb73a00e7e15f0b11bcdc676032f5b58597a5a369c4a24b9975a0b1a993 SHA512 d2f9ca3180867d23eeddf2dea89bcf7ec1294b24fec8a5116208ba187b816bc29f3456f6daef3f5a55560e1a06da4f6f08113214d8040ea824a79c00480ac4f7
 AUX util-linux-2.37.1-libmount_setgroups_fix.patch 1039 BLAKE2B a04ece245e5f27b48d585795c2bda419a710382801e518cfdbd9c304eb9329d5e6c41deae6c23f13885f20ec60e8dad403c1b5f51e04961b279d363b8bc3055b SHA512 cfa5b399509740109e034401984d75245ec6f84ea57ac01945fe3580f317967a462cced4f002ad34639c37c37dbe22471043ccee8814587cf36e02532a428027
 AUX util-linux-2.37.1-lscpu_NULL_dereference_fix.patch 1796 BLAKE2B 58034cae22d589640010bbeccc5d13dfb1d5ed6f51bbc17c6977732ddefb346a0bf46ea472e5dfddfd7f21b62dbc8b92212f18ca4e976ab67f9c6da1b21aa07d SHA512 da7114d008c52f27662aecb9aecfea05f54c5d8ce4a5948a43ce6fac3b12a61c86f8f943848f05f04d65eeff6595a0fab65e0df36436aabd25a8aff9baa8e80f
-AUX util-linux-2.37.1-lscpu_nullptr.patch 828 BLAKE2B 1847450e9b3580964d54184718f3e8971d42c00a4ba51f320a969058ace35a00bac9eae4e188dd6be6ce4c120aca53429011f4e3a2d9affea03000bdcfa6362c SHA512 29228cd5024eb94394f665656cd033ac52560e023a4575ce311393dd0922b80a753508dc9b23f16ba92fe0f00a171dada8b4789660225f571823614dfe439f9e
 DIST util-linux-2.36.2.tar.xz 5348032 BLAKE2B 17e49515f8d0430f3ed26b80bf1d6e811d847141020d0dae1340dc92887549b7b711f3db6e3913120871fc912435def73586a7aef09d8d9cc6ff7ca331b2770f SHA512 6ab141f44ca4cb6b600081f10eae17e15d23abd122a37eb3ac6c845513a6a4396dc9dcff30b3032de80116ddde50e27dfbc86f92708c1051f84f0c919194664b
-DIST util-linux-2.37-manpages.tar.xz 160156 BLAKE2B 39572332cfe4cac2313941ae922a01f5f4fe34cceb2ca3c806e87ec55187053dfce044790ad497d04adafc2abc513ae1429a1686e71b3b4e0e7907d17c9b6548 SHA512 2f3f1da3eae10b90daa672690ec90de303d87e9b0390f795daf80927a7c42f6aac9d3516b63051a6237a5609b5fda1dec92a1b8adc172115f3478b7edfa04918
 DIST util-linux-2.37.1.tar.xz 5628360 BLAKE2B 309ea7202f32c0ec750cb01486cf32c3e9dd457d83e5beab8d6b97a5e7f312332ecfcd1ddbb88ae5ec9ee483bb15452b8d58bce1f931f9dfa35be3ce042da3da SHA512 ec300c830869e10a0d7f8c0b99e9bb46e0b88fc51f3c6c6a4d9752a89f035e8d69d81f25fd103ef8d7d253e81440695ef3f5d72dccc94815ec8d5f6f949f7555
-DIST util-linux-2.37.tar.xz 5519268 BLAKE2B 37d4f260d636539c60b7196545c7c542c7e08a24cf3395be0c14054b5f05765c9f8234ded1c8fed60855e76bf0cfedc557d45e99b37d1e6b4a0244897fe06860 SHA512 84cf1df46165f286caa1a1204b335dc1fc826a8e1d52a817c28eb80ef19734eccd6efdfb078e87ade9e4381a9102e59d4df83e9bb100e4c73aff2aa4bfb85615
+DIST util-linux-2.37.2.tar.xz 5621624 BLAKE2B 40ab80485781dfc58e6d0e98dae115b96f11ee0cc370524e1e13d3c4a4dfed3a5a4a248311f8ca645f6f84bbaf4785412ca8282b840af4e37a01312764885abe SHA512 38f0fe820445e3bfa79550e6581c230f98c7661566ccc4daa51c7208a5f972c61b4e57dfc86bed074fdbc7c40bc79f856be8f6a05a8860c1c0cecc4208e8b81d
 EBUILD util-linux-2.36.2-r1.ebuild 8943 BLAKE2B 02deedf4a71d2acc2cd15fce983471237f84bf131debc2f161ec9afa7102b70dcdbd0aa70062ca4208d0e2fa444f5a9effe4650d07e4d9ec027fa7c1004b0e85 SHA512 4ac8f481c02d804078a16c3d92ffaf9320028630ca4bd9233ca5461a1ed373cb8c5aaee7a08be49b38ed103698f089cb5db0e87f119911423154b4754e39d23f
-EBUILD util-linux-2.37-r1.ebuild 9999 BLAKE2B fc8118a93be6b7c434d86773da8e3b5dd78e18153cce7eb6b806a9e6e0741cc2a30e2cce4cf9f0637fb2fab73b1db27396abb06023e722642350779135ed775a SHA512 5588ac089b27a20df5f813a15164ba282d3321cc288b4c0fcbffc7fba36db57eed496af7f8cb05d372bc87e1466195bc3a31035ea2de03b74bf65784035ece9c
 EBUILD util-linux-2.37.1-r1.ebuild 9500 BLAKE2B bc24b39aef44405c5a2043fad701fec7ed115378e18c309322aa2543b12b1d3747c76259cb28f5bdccead828f46fbdbbee08a73a7f642f5d00ce1f035f5d8cd9 SHA512 bdfde984bace6c53f186be04eeafa1491e052c3e6c4d5b13fb23241bd4611fa4c758bdd8bb1b47fec592eee4196025654e699161572789c8fc36ae633b6ca210
-EBUILD util-linux-2.37.1.ebuild 9288 BLAKE2B 3be449936783f0da3269d4e45f8c39881cb28c96a6844a14f498991a697286e168700bafe092df750e941bbe099e503c2782ca098027733dee8f46aa2f12ec50 SHA512 d6accd9769ec8dfc23bd6602e195d1b62a8776fec5754418cf2f8fd06caca48d4bc90c5fe12c86f53782fe5d334d528c517f5ef558e52958d460fd297a843161
-EBUILD util-linux-9999.ebuild 9227 BLAKE2B 2b797ee2166256daa32f4d04593d28663746937fa81a07821b7204b07b31b92874c8266e0ffa3d9b1eeb7191f0329d6d7d13e228360f47e0e94a2e4921a74db8 SHA512 9a430472ec02d0e3c76927f9479ee4b5bdab9231e249991c8c6ff48f4922a099bc15d6533a2502ddd455f18def6530ad21c7d166fb39790614348db6eed3aef7
+EBUILD util-linux-2.37.2.ebuild 9301 BLAKE2B be36a4e14d3fcd9052f29f96ac8e2517ea1accada937ccafca6cc7865d489651e9224e0a6a34ef4389c1f5d171cfad51d13625ea56356e9bc866fb93413ff66c SHA512 debcf3ba1ffbc231a1edec77a3a56f2de0f93264ef3ecd16d7cf7f9bd9dbf8e623c351e6d0b1b4ed1aa76d61f82d8ddc565ddd2f6f499b6aa3f5d4ec13854230
+EBUILD util-linux-9999.ebuild 9226 BLAKE2B 827ddedb6525d13f491a337be25ba220104b1c13f26f8eb1349f233cbdf62051f9300de9bef13e54fef075af345d5396866b7bb3195f11fd99afaac27e08fe56 SHA512 b794514c3e4119ae22b79354cce7af8b996143e40fbccf7f58ad20ca1207259468a06058d1d3fd00a6cc514f8c3ddbe5b5c74ca76d8701d581a95a2d744507ed
 MISC metadata.xml 1364 BLAKE2B 0221b836433dfffc122d794272c554b6114862efb7d474e68507fb399e56cf32bc86f0dba0d519782634eb45638d2e15dd25c8147d7209f5a3de536ba7ecf38b SHA512 094e0b577f2322b73ace41db762ea88736650a3f3010fb8a26f649a51efc83d09a66bbdaf7a24b24164264b2dbbf7839be49b21e0a125c95ca39f1c4cd6201e4
diff --git a/sys-apps/util-linux/files/util-linux-2.37-avoid_autoreconf.patch b/sys-apps/util-linux/files/util-linux-2.37-avoid_autoreconf.patch
deleted file mode 100644
index 44ea6e5c2bed..000000000000
--- a/sys-apps/util-linux/files/util-linux-2.37-avoid_autoreconf.patch
+++ /dev/null
@@ -1,136 +0,0 @@
---- util-linux-2.37/config.h.in
-+++ util-linux-2.37/config.h.in
-@@ -216,9 +216,6 @@
- /* Define to 1 if you have the `cap-ng' library (-lcap-ng). */
- #undef HAVE_LIBCAP_NG
- 
--/* Do we need -lcrypt? */
--#undef HAVE_LIBCRYPT
--
- /* Define if libeconf is available */
- #undef HAVE_LIBECONF
- 
---- util-linux-2.37/configure
-+++ util-linux-2.37/configure
-@@ -4965,12 +4965,7 @@
- program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
- 
- if test x"${MISSING+set}" != xset; then
--  case $am_aux_dir in
--  *\ * | *\	*)
--    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
--  *)
--    MISSING="\${SHELL} $am_aux_dir/missing" ;;
--  esac
-+  MISSING="\${SHELL} '$am_aux_dir/missing'"
- fi
- # Use eval to expand $SHELL
- if eval "$MISSING --is-lightweight"; then
-@@ -25591,7 +25586,10 @@
- 
- else
- 
-+
-+  old_LIBS="$LIBS"
-   LIBS="$LIBS -lcrypt"
-+
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
-@@ -25612,10 +25610,7 @@
-   return 0;
- }
- _ACEOF
--if ac_fn_c_try_compile "$LINENO"; then :
--
--
--$as_echo "#define HAVE_LIBCRYPT 1" >>confdefs.h
-+if ac_fn_c_try_link "$LINENO"; then :
- 
-   have_libcrypt=yes
-   have_crypt=yes
-@@ -25626,7 +25621,11 @@
- $as_echo "$as_me: WARNING: crypt() is not available" >&2;}
- 
- fi
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+
-+  LIBS="$old_LIBS"
-+
- 
- fi
- rm -f core conftest.err conftest.$ac_objext \
-@@ -25768,12 +25767,8 @@
- 
- 
- 
--  old_CFLAGS="$CFLAGS"
--  old_CPPFLAGS="$CPPFLAGS"
--  old_LDFLAGS="$LDFLAGS"
--  CFLAGS="$CFLAGS "
--  CPPFLAGS="$CPPFLAGS "
--  LDFLAGS="$LDFLAGS $SELINUX_LIBS"
-+  old_LIBS="$LIBS"
-+  LIBS="$LIBS $SELINUX_LIBS"
- 
-     # This function is missing in old libselinux 1.xx versions
-     for ac_func in security_get_initial_context
-@@ -25788,9 +25783,7 @@
- done
- 
- 
--  CFLAGS="$old_CFLAGS"
--  CPPFLAGS="$old_CPPFLAGS"
--  LDFLAGS="$old_LDFLAGS"
-+  LIBS="$old_LIBS"
- 
- 
- fi
---- util-linux-2.37/Makefile.in
-+++ util-linux-2.37/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.16.2 from Makefile.am.
-+# Makefile.in generated by automake 1.16.3 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994-2020 Free Software Foundation, Inc.
-@@ -4649,6 +4649,8 @@
- GZIP_ENV = --best
- DIST_ARCHIVES = $(distdir).tar.xz
- DIST_TARGETS = dist-xz
-+# Exists only to be overridden by the user if desired.
-+AM_DISTCHECK_DVI_TARGET = dvi
- distuninstallcheck_listfiles = find . -type f -print
- am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
-   | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
-@@ -14854,7 +14856,7 @@
- 	    $(DISTCHECK_CONFIGURE_FLAGS) \
- 	    --srcdir=../.. --prefix="$$dc_install_base" \
- 	  && $(MAKE) $(AM_MAKEFLAGS) \
--	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
-+	  && $(MAKE) $(AM_MAKEFLAGS) $(AM_DISTCHECK_DVI_TARGET) \
- 	  && $(MAKE) $(AM_MAKEFLAGS) check \
- 	  && $(MAKE) $(AM_MAKEFLAGS) install \
- 	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-@@ -14920,7 +14922,8 @@
- 	done
- install: $(BUILT_SOURCES)
- 	$(MAKE) $(AM_MAKEFLAGS) install-recursive
--install-exec: install-exec-recursive
-+install-exec: $(BUILT_SOURCES)
-+	$(MAKE) $(AM_MAKEFLAGS) install-exec-recursive
- install-data: install-data-recursive
- uninstall: uninstall-recursive
- 
-@@ -16157,7 +16160,8 @@
- 	uninstall-man8
- 
- .MAKE: $(am__recursive_targets) all check check-am install install-am \
--	install-data-am install-exec-am install-strip uninstall-am
-+	install-data-am install-exec install-exec-am install-strip \
-+	uninstall-am
- 
- .PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
- 	am--depfiles am--refresh check check-am check-local clean \
diff --git a/sys-apps/util-linux/files/util-linux-2.37-lcrypt_link_fix.patch b/sys-apps/util-linux/files/util-linux-2.37-lcrypt_link_fix.patch
deleted file mode 100644
index 2da99b2841d6..000000000000
--- a/sys-apps/util-linux/files/util-linux-2.37-lcrypt_link_fix.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 637cc045ee464909c261d6fa16c71ed15cd455e3 Mon Sep 17 00:00:00 2001
-From: Alex Xu <351006+Hello71@users.noreply.github.com>
-Date: Wed, 16 Jun 2021 13:58:25 +0000
-Subject: [PATCH] build-sys: Update configure.ac
-
-1. the test incorrectly used AC_COMPILE_IFELSE instead of
-   AC_LINK_IFELSE, defeating the purpose of checking -lcrypt.
-2. the test did not properly restore LIBS, causing later checks to all
-   fail if libcrypt wasn't found.
-3. HAVE_LIBCRYPT only controls whether to use -lcrypt, it is not
-   needed or used in any source files.
-
-[kzak@redhat.com: - improve commit message
-                  - use UL_{SET,RESTORE}_FLAGS() rather than directly
-		    modify $LIBS]
-
-Signed-off-by: Karel Zak <kzak@redhat.com>
----
- configure.ac | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 5181d524c..939c6d2d3 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -845,8 +845,8 @@ char *c = crypt("abc","pw");
-   have_libcrypt=no
-   have_crypt=yes
- ],[
--  LIBS="$LIBS -lcrypt"
--  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-+  UL_SET_FLAGS([], [], [-lcrypt])
-+  AC_LINK_IFELSE([AC_LANG_PROGRAM([[
-   #ifdef HAVE_CRYPT_H
-   #include <crypt.h>
-   #else
-@@ -856,12 +856,12 @@ char *c = crypt("abc","pw");
-   ]], [[
-   char *c = crypt("abc","pw");
-   ]])],[
--  AC_DEFINE([HAVE_LIBCRYPT], [1], [Do we need -lcrypt?])
-   have_libcrypt=yes
-   have_crypt=yes
-   ],[
-   AC_MSG_WARN([crypt() is not available])
-   ])
-+  UL_RESTORE_FLAGS
- ])
- AM_CONDITIONAL([HAVE_LIBCRYPT], [test "x$have_libcrypt" = xyes])
- 
diff --git a/sys-apps/util-linux/files/util-linux-2.37-lcrypt_use_LIBS.patch b/sys-apps/util-linux/files/util-linux-2.37-lcrypt_use_LIBS.patch
deleted file mode 100644
index 2173195be612..000000000000
--- a/sys-apps/util-linux/files/util-linux-2.37-lcrypt_use_LIBS.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From 75cba8d5cdb2a0e84c23de26007feac977837a6f Mon Sep 17 00:00:00 2001
-From: Karel Zak <kzak@redhat.com>
-Date: Fri, 18 Jun 2021 17:21:13 +0200
-Subject: [PATCH] build-sys: use $LIBS rather than LDFLAGS
-
-Fixes: https://github.com/karelzak/util-linux/pull/1349
-Signed-off-by: Karel Zak <kzak@redhat.com>
----
- configure.ac |  8 ++++----
- m4/ul.m4     | 29 +++++++++++------------------
- 2 files changed, 15 insertions(+), 22 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 939c6d2d3..234cebc68 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -845,7 +845,7 @@ char *c = crypt("abc","pw");
-   have_libcrypt=no
-   have_crypt=yes
- ],[
--  UL_SET_FLAGS([], [], [-lcrypt])
-+  UL_SET_LIBS([-lcrypt])
-   AC_LINK_IFELSE([AC_LANG_PROGRAM([[
-   #ifdef HAVE_CRYPT_H
-   #include <crypt.h>
-@@ -861,7 +861,7 @@ char *c = crypt("abc","pw");
-   ],[
-   AC_MSG_WARN([crypt() is not available])
-   ])
--  UL_RESTORE_FLAGS
-+  UL_RESTORE_LIBS
- ])
- AM_CONDITIONAL([HAVE_LIBCRYPT], [test "x$have_libcrypt" = xyes])
- 
-@@ -883,10 +883,10 @@ AS_IF([test "x$with_selinux" = xno], [
-     UL_PKG_STATIC([SELINUX_LIBS_STATIC], [libselinux])
-     AM_CONDITIONAL([HAVE_SELINUX], [true])
- 
--    UL_SET_FLAGS([], [], [$SELINUX_LIBS])
-+    UL_SET_LIBS([$SELINUX_LIBS])
-     # This function is missing in old libselinux 1.xx versions
-     AC_CHECK_FUNCS([security_get_initial_context])
--    UL_RESTORE_FLAGS
-+    UL_RESTORE_LIBS
-   ])
- ])
- AC_SUBST([SELINUX_LIBS])
-diff --git a/m4/ul.m4 b/m4/ul.m4
-index 951db7371..724579462 100644
---- a/m4/ul.m4
-+++ b/m4/ul.m4
-@@ -67,28 +67,21 @@ AC_DEFUN([UL_SET_ARCH], [
- ])
- 
- 
--dnl UL_SET_FLAGS(CFLAGS, CPPFLAGS, LDFLAGS)
--dnl
--dnl Sets new global CFLAGS, CPPFLAGS and LDFLAG, the original
--dnl setting could be restored by UL_RESTORE_FLAGS()
--dnl
--AC_DEFUN([UL_SET_FLAGS], [
--  old_CFLAGS="$CFLAGS"
--  old_CPPFLAGS="$CPPFLAGS"
--  old_LDFLAGS="$LDFLAGS"
--  CFLAGS="$CFLAGS $1"
--  CPPFLAGS="$CPPFLAGS $2"
--  LDFLAGS="$LDFLAGS $3"
-+dnl UL_SET_LIBS(LIBS)
-+dnl
-+dnl Sets new global LIBS, the original setting could be restored by UL_RESTORE_LIBS()
-+dnl
-+AC_DEFUN([UL_SET_LIBS], [
-+  old_LIBS="$LIBS"
-+  LIBS="$LIBS $1"
- ])
- 
--dnl UL_RESTORE_FLAGS()
-+dnl UL_RESTORE_LIBS()
- dnl
--dnl Restores CFLAGS, CPPFLAGS and LDFLAG previously saved by UL_SET_FLAGS()
-+dnl Restores LIBS previously saved by UL_SET_LIBS()
- dnl
--AC_DEFUN([UL_RESTORE_FLAGS], [
--  CFLAGS="$old_CFLAGS"
--  CPPFLAGS="$old_CPPFLAGS"
--  LDFLAGS="$old_LDFLAGS"
-+AC_DEFUN([UL_RESTORE_LIBS], [
-+  LIBS="$old_LIBS"
- ])
- 
- 
diff --git a/sys-apps/util-linux/files/util-linux-2.37-ppc-nortas.patch b/sys-apps/util-linux/files/util-linux-2.37-ppc-nortas.patch
deleted file mode 100644
index b3ac47163233..000000000000
--- a/sys-apps/util-linux/files/util-linux-2.37-ppc-nortas.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 45cd3aa4ded6df54dde85e6939b48bb273c8b6c3 Mon Sep 17 00:00:00 2001
-From: Georgy Yakovlev <gyakovlev@gentoo.org>
-Date: Wed, 2 Jun 2021 13:59:26 -0700
-Subject: [PATCH] lscpu: fix build on powerpc
-
-fails with error: label at end of compound statement
-and fix typo as bonus.
-
-Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org>
----
- sys-utils/lscpu-cputype.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/sys-utils/lscpu-cputype.c b/sys-utils/lscpu-cputype.c
-index cf7af361c..d5ca8e1f1 100644
---- a/sys-utils/lscpu-cputype.c
-+++ b/sys-utils/lscpu-cputype.c
-@@ -724,7 +724,7 @@ int lscpu_read_archext(struct lscpu_cxt *cxt)
- 	}
- 
- #if defined(HAVE_LIBRTAS)
--	/* Get PowerPC speficic info */
-+	/* Get PowerPC specific info */
- 	if (!cxt->noalive) {
- 		int rc, len, ntypes;
- 
-@@ -745,8 +745,8 @@ int lscpu_read_archext(struct lscpu_cxt *cxt)
- 		ct->physsockets = strbe16toh(buf, 4);
- 		ct->physchips = strbe16toh(buf, 6);
- 		ct->physcoresperchip = strbe16toh(buf, 8);
--nortas:
- 	}
-+nortas:
- #endif
- 	return 0;
- }
diff --git a/sys-apps/util-linux/files/util-linux-2.37.1-lscpu_nullptr.patch b/sys-apps/util-linux/files/util-linux-2.37.1-lscpu_nullptr.patch
deleted file mode 100644
index bfb528cf1f15..000000000000
--- a/sys-apps/util-linux/files/util-linux-2.37.1-lscpu_nullptr.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-If you call a function which can return a null pointer you probably want
-to check the return value before attempting to dereference it. </sarcasm>
-
---- a/sys-utils/lscpu.c
-+++ b/sys-utils/lscpu.c
-@@ -966,7 +966,7 @@
- 		*(p - 2) = '\0';
- 		add_summary_s(tb, sec, _("CPU op-mode(s):"), buf);
- 	}
--	if (ct->addrsz)
-+	if (ct && ct->addrsz)
- 		add_summary_s(tb, sec, _("Address sizes:"), ct->addrsz);
- #if !defined(WORDS_BIGENDIAN)
- 	add_summary_s(tb, sec, _("Byte Order:"), "Little Endian");
-@@ -1008,9 +1008,9 @@
- 	sec = NULL;
- 
- 	/* Section: cpu type description */
--	if (ct->vendor)
-+	if (ct && ct->vendor)
- 		sec = add_summary_s(tb, NULL, _("Vendor ID:"), ct->vendor);
--	if (ct->bios_vendor)
-+	if (ct && ct->bios_vendor)
- 		add_summary_s(tb, sec, _("BIOS Vendor ID:"), ct->bios_vendor);
- 
- 	for (i = 0; i < cxt->ncputypes; i++)
diff --git a/sys-apps/util-linux/util-linux-2.37-r1.ebuild b/sys-apps/util-linux/util-linux-2.37-r1.ebuild
deleted file mode 100644
index 5aa4349db6e9..000000000000
--- a/sys-apps/util-linux/util-linux-2.37-r1.ebuild
+++ /dev/null
@@ -1,362 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 usr-ldscript \
-	pam python-r1 multilib-minimal multiprocessing systemd
-
-MY_PV="${PV/_/-}"
-MY_P="${PN}-${MY_PV}"
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-r3 autotools
-	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
-else
-	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-	SRC_URI="https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz
-		https://dev.gentoo.org/~polynomial-c/${MY_P}-manpages.tar.xz"
-fi
-
-DESCRIPTION="Various useful Linux utilities"
-HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/karelzak/util-linux"
-
-LICENSE="GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain"
-SLOT="0"
-IUSE="audit build caps +cramfs cryptsetup fdformat hardlink kill +logger magic ncurses nls pam python +readline selinux slang static-libs su +suid systemd test tty-helpers udev unicode userland_GNU"
-
-# Most lib deps here are related to programs rather than our libs,
-# so we rarely need to specify ${MULTILIB_USEDEP}.
-RDEPEND="
-	virtual/libcrypt:=
-	audit? ( >=sys-process/audit-2.6:= )
-	caps? ( sys-libs/libcap-ng )
-	cramfs? ( sys-libs/zlib:= )
-	cryptsetup? ( >=sys-fs/cryptsetup-2.1.0 )
-	hardlink? ( dev-libs/libpcre2:= )
-	ncurses? (
-		sys-libs/ncurses:=[unicode(+)?]
-		magic? ( sys-apps/file:0= )
-	)
-	nls? ( virtual/libintl[${MULTILIB_USEDEP}] )
-	pam? ( sys-libs/pam )
-	ppc? ( sys-libs/librtas )
-	ppc64? ( sys-libs/librtas )
-	python? ( ${PYTHON_DEPS} )
-	readline? ( sys-libs/readline:0= )
-	selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] )
-	slang? ( sys-libs/slang )
-	!build? ( systemd? ( sys-apps/systemd ) )
-	udev? ( virtual/libudev:= )"
-BDEPEND="
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	test? ( sys-devel/bc )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/os-headers
-"
-RDEPEND+="
-	hardlink? ( !app-arch/hardlink )
-	logger? ( !>=app-admin/sysklogd-2.0[logger] )
-	kill? (
-		!sys-apps/coreutils[kill]
-		!sys-process/procps[kill]
-	)
-	su? (
-		!<sys-apps/shadow-4.7-r2
-		!>=sys-apps/shadow-4.7-r2[su]
-	)
-	!net-wireless/rfkill
-	!<app-shells/bash-completion-2.7-r1
-"
-
-# Required for man-page generation
-if [[ "${PV}" == 9999 ]] ; then
-	BDEPEND+="
-		dev-ruby/asciidoctor
-	"
-fi
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	# https://github.com/karelzak/util-linux/pull/1329
-	"${FILESDIR}/${P}-ppc-nortas.patch"
-
-	"${FILESDIR}/${P}-lcrypt_link_fix.patch" # 801403
-	"${FILESDIR}/${P}-lcrypt_use_LIBS.patch" # 801403
-	"${FILESDIR}/${P}-avoid_autoreconf.patch" # 801403
-)
-
-rm_man() {
-	[[ -n $1 ]] || die
-	local el
-	for el in $1 ; do
-		find "${WORKDIR}/man" -type f -name "${el}.?" -delete \
-			|| die
-	done
-}
-
-src_prepare() {
-	default
-
-	# Prevent uuidd test failure due to socket path limit. #593304
-	sed -i \
-		-e "s|UUIDD_SOCKET=\"\$(mktemp -u \"\${TS_OUTDIR}/uuiddXXXXXXXXXXXXX\")\"|UUIDD_SOCKET=\"\$(mktemp -u \"${T}/uuiddXXXXXXXXXXXXX.sock\")\"|g" \
-		tests/ts/uuid/uuidd || die "Failed to fix uuidd test"
-
-	if ! use userland_GNU ; then
-		# test runner is using GNU-specific xargs call
-		sed -i -e 's:xargs:gxargs:' tests/run.sh || die
-		# test requires util-linux uuidgen (which we don't build)
-		rm tests/ts/uuid/oids || die
-	fi
-
-	if [[ ${PV} == 9999 ]] ; then
-		po/update-potfiles
-		eautoreconf
-	else
-		# Conditionally remove some man-pages
-		use hardlink 	|| rm_man "hardlink"
-		use kill 	|| rm_man "kill"
-		use logger 	|| rm_man "logger"
-		use ncurses 	|| rm_man "pg"
-		use su 		|| rm_man "su"
-		use tty-helpers	|| rm_man "mesg wall write"
-	fi
-
-	elibtoolize
-}
-
-lfs_fallocate_test() {
-	# Make sure we can use fallocate with LFS #300307
-	cat <<-EOF > "${T}"/fallocate.${ABI}.c
-		#define _GNU_SOURCE
-		#include <fcntl.h>
-		main() { return fallocate(0, 0, 0, 0); }
-	EOF
-	append-lfs-flags
-	$(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.${ABI}.c -o /dev/null >/dev/null 2>&1 \
-		|| export ac_cv_func_fallocate=no
-	rm -f "${T}"/fallocate.${ABI}.c
-}
-
-python_configure() {
-	local myeconfargs=(
-		"${commonargs[@]}"
-		--disable-all-programs
-		--disable-bash-completion
-		--without-systemdsystemunitdir
-		--with-python
-	)
-	if use userland_GNU ; then
-		myeconfargs+=(
-			--enable-libblkid
-			--enable-libmount
-			--enable-pylibmount
-		)
-	fi
-	mkdir "${BUILD_DIR}" || die
-	pushd "${BUILD_DIR}" >/dev/null || die
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-	popd >/dev/null || die
-}
-
-multilib_src_configure() {
-	lfs_fallocate_test
-	# The scanf test in a run-time test which fails while cross-compiling.
-	# Blindly assume a POSIX setup since we require libmount, and libmount
-	# itself fails when the scanf test fails. #531856
-	tc-is-cross-compiler && export scanf_cv_alloc_modifier=ms
-	export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) #485486
-	export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam) #545042
-
-	# Undo bad ncurses handling by upstream. Fall back to pkg-config. #601530
-	export NCURSES6_CONFIG=false NCURSES5_CONFIG=false
-	export NCURSESW6_CONFIG=false NCURSESW5_CONFIG=false
-
-	# configure args shared by python and non-python builds
-	local commonargs=(
-		--enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin"
-	)
-
-	local myeconfargs=(
-		"${commonargs[@]}"
-		--with-bashcompletiondir="$(get_bashcompdir)"
-		--without-python
-		$(multilib_native_use_enable suid makeinstall-chown)
-		$(multilib_native_use_enable suid makeinstall-setuid)
-		$(multilib_native_use_with readline)
-		$(multilib_native_use_with slang)
-		$(multilib_native_use_with systemd)
-		$(multilib_native_use_with udev)
-		$(multilib_native_usex ncurses "$(use_with magic libmagic)" '--without-libmagic')
-		$(multilib_native_usex ncurses "$(use_with unicode ncursesw)" '--without-ncursesw')
-		$(multilib_native_usex ncurses "$(use_with !unicode ncurses)" '--without-ncurses')
-		$(multilib_native_use_with audit)
-		$(tc-has-tls || echo --disable-tls)
-		$(use_enable nls)
-		$(use_enable unicode widechar)
-		$(use_enable static-libs static)
-		$(use_with ncurses tinfo)
-		$(use_with selinux)
-	)
-	# build programs only on GNU, on *BSD we want libraries only
-	if multilib_is_native_abi && use userland_GNU ; then
-		myeconfargs+=(
-			--disable-chfn-chsh
-			--disable-login
-			--disable-newgrp
-			--disable-nologin
-			--disable-pylibmount
-			--disable-vipw
-			--enable-agetty
-			--enable-bash-completion
-			--enable-line
-			--enable-partx
-			--enable-raw
-			--enable-rename
-			--enable-rfkill
-			--enable-schedutils
-			--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-			$(use_enable caps setpriv)
-			$(use_enable cramfs)
-			$(use_enable fdformat)
-			$(use_enable hardlink)
-			$(use_enable kill)
-			$(use_enable logger)
-			$(use_enable ncurses pg)
-			$(use_enable su)
-			$(use_enable tty-helpers mesg)
-			$(use_enable tty-helpers wall)
-			$(use_enable tty-helpers write)
-			$(use_with cryptsetup)
-		)
-		if [[ ${PV} == *9999 ]] ; then
-			myeconfargs+=( --enable-asciidoc )
-		else
-			# We ship pre-generated man-pages for releases
-			myeconfargs+=( --disable-asciidoc )
-		fi
-	else
-		myeconfargs+=(
-			--disable-all-programs
-			--disable-asciidoc
-			--disable-bash-completion
-			--without-systemdsystemunitdir
-			# build libraries
-			--enable-libuuid
-			--enable-libblkid
-			--enable-libsmartcols
-			--enable-libfdisk
-		)
-		if use userland_GNU ; then
-			# those libraries don't work on *BSD
-			myeconfargs+=(
-				--enable-libmount
-			)
-		fi
-	fi
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-
-	if multilib_is_native_abi && use python ; then
-		python_foreach_impl python_configure
-	fi
-}
-
-python_compile() {
-	pushd "${BUILD_DIR}" >/dev/null || die
-	emake all
-	popd >/dev/null || die
-}
-
-multilib_src_compile() {
-	emake all
-
-	if multilib_is_native_abi && use python ; then
-		python_foreach_impl python_compile
-	fi
-}
-
-python_test() {
-	pushd "${BUILD_DIR}" >/dev/null || die
-	emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot"
-	popd >/dev/null || die
-}
-
-multilib_src_test() {
-	emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot"
-	if multilib_is_native_abi && use python ; then
-		python_foreach_impl python_test
-	fi
-}
-
-python_install() {
-	pushd "${BUILD_DIR}" >/dev/null || die
-	emake DESTDIR="${D}" install
-	python_optimize
-	popd >/dev/null || die
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi && use python ; then
-		python_foreach_impl python_install
-	fi
-
-	# This needs to be called AFTER python_install call (#689190)
-	emake DESTDIR="${D}" install
-
-	if multilib_is_native_abi && use userland_GNU ; then
-		# need the libs in /
-		gen_usr_ldscript -a blkid fdisk mount smartcols uuid
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*}
-
-	# e2fsprogs-libs didnt install .la files, and .pc work fine
-	find "${ED}" -name "*.la" -delete || die
-
-	if [[ ${PV} != 9999 ]] ; then
-		doman "${WORKDIR}"/man/man*/*
-	fi
-
-	if ! use userland_GNU ; then
-		# manpage collisions
-		# TODO: figure out a good way to keep them
-		rm "${ED}"/usr/share/man/man3/uuid* || die
-	fi
-
-	if use pam ; then
-		newpamd "${FILESDIR}/runuser.pamd" runuser
-		newpamd "${FILESDIR}/runuser-l.pamd" runuser-l
-	fi
-
-	# Note:
-	# Bash completion for "runuser" command is provided by same file which
-	# would also provide bash completion for "su" command. However, we don't
-	# use "su" command from this package.
-	# This triggers a known QA warning which we ignore for now to magically
-	# keep bash completion for "su" command which shadow package does not
-	# provide.
-}
-
-pkg_postinst() {
-	if ! use tty-helpers ; then
-		elog "The mesg/wall/write tools have been disabled due to USE=-tty-helpers."
-	fi
-
-	if [[ -z ${REPLACING_VERSIONS} ]] ; then
-		elog "The agetty util now clears the terminal by default. You"
-		elog "might want to add --noclear to your /etc/inittab lines."
-	fi
-}
diff --git a/sys-apps/util-linux/util-linux-2.37.1.ebuild b/sys-apps/util-linux/util-linux-2.37.2.ebuild
index c0b9a494a98e..43b2f16fe98d 100644
--- a/sys-apps/util-linux/util-linux-2.37.1.ebuild
+++ b/sys-apps/util-linux/util-linux-2.37.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8,9} )
 
 inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 usr-ldscript \
 	pam python-r1 multilib-minimal multiprocessing systemd
@@ -87,7 +87,7 @@ RESTRICT="!test? ( test )"
 S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-2.37.1-lscpu_nullptr.patch
+	"${FILESDIR}"/${PN}-2.37.1-agetty_ctrl-c_erase.patch #804972
 )
 
 src_prepare() {
diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild
index 4f991bccc9a5..887e3f07cbc4 100644
--- a/sys-apps/util-linux/util-linux-9999.ebuild
+++ b/sys-apps/util-linux/util-linux-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8,9} )
 
 inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 usr-ldscript \
 	pam python-r1 multilib-minimal multiprocessing systemd