gentoo resync : 28.07.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-07-28 10:27:13 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-07-28 10:27:13 +0100
commit: f4fc10428424904caf2035cffc442195cb088b2c (patch)
tree: 72f320d5963e55586cfdeed2b14c72b8191b6327 /sys-apps
parent: fbd9734cedfe790955100b8e4ab3613457d77b1a (diff)
41 files changed, 429 insertions, 405 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index fbd0cb2dc38e..a40c39ae7976 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/accountsservice/Manifest b/sys-apps/accountsservice/Manifest
index 368b3b1e7019..5b0c3c2dccb6 100644
--- a/sys-apps/accountsservice/Manifest
+++ b/sys-apps/accountsservice/Manifest
@@ -3,5 +3,5 @@ AUX accountsservice-0.6.50-loaded-state.patch 1579 BLAKE2B 40c5f1a641967fe24b740
 DIST accountsservice-0.6.50.tar.xz 384484 BLAKE2B 52c06ba85498f292204834f967211d8f0940786dc2ea3070124d3aecccd551375bfbc8fc31f23a2c3c86e23359294307656c3b927c4e819fc102d8626ae0dd82 SHA512 6e07cd318452b1cbedeacd729f0ebb200525caf1b09981abb2bac16fd90756a790ebec08aca0a0cea016f14ab27c159a68fe1332ef4bc636c5863b8c61040f64
 DIST accountsservice-0.6.55.tar.xz 97972 BLAKE2B aba3adfeb53e64455ce8e672b9db754bae4af6b4de0823cc021d0311a381ec40af04371e78f7c84eab7fb72356b26e22db78aad0343d57f65ea71a7742b51fc7 SHA512 c12e6a8e80f9b087f97238da4734d2d3a14a7c5cbd870a32a04b00116f176c818c39fb886f6dc72c3e93c136b0c2074ddf8f77e20431fa3bd54f138bea9d262d
 EBUILD accountsservice-0.6.50-r1.ebuild 1555 BLAKE2B 1e15144179c307d9bf5c416d61530b7ac52fba53dcb0382d791aff4b2c9f3771aef62fb24bb62cca41563ffa8480c6b6e6e91faf50c4075ea79f0a9377ee8272 SHA512 fe72073aa66755b56fd167310f1b47da4d8381b6db2ee7f5deeec26915dc82ded0707d6018c32eba2604f1816794c742318b3104ecce59698342dc1aeba6a379
-EBUILD accountsservice-0.6.55-r1.ebuild 1731 BLAKE2B dbf077378d561999631d813d34ab8101e88997a627e6d6f1d9bdfef2dd2465f6db3c095626876b951222dd586a401ad074aababbe5d763efcf57182b7391a1dd SHA512 d291606682723ab2c5cf05b817cfe659d9efc8361a4f9732c987d41afa48647a647a60653c855533067ad44dccb58d8a3579e3d9b626b33163edfff5d9d64a58
+EBUILD accountsservice-0.6.55-r1.ebuild 1738 BLAKE2B bf31c4ffd3aa68978ebc92786e25e09b3b6acc264bb36cc68d120de68b0d73a847b711861bdd61736bc95f784188acab11bbb76467cb38446304f9dd0c270660 SHA512 3953008aa4ab7ea5f7bf2e9bf772ea41cdfe4cc3b5336a266da4fa0afdb3ae99f596442f3e10eabc9b27fb4ef821aea42f95f9c4761324750efec1c1809e461f
 MISC metadata.xml 434 BLAKE2B 46541f7aaa7da92604569da647a34de043cb792782e618369705b62ddb1054ad6f4a68259e729cff9a56eaa983ec564bdfda88bbc1e0ff8a5e0105111b56cc16 SHA512 7c299dbf564c82b4f10e665bd5d7238e7869fd2e499e9824a27594ece220419bff6c167a47f5d1ed0955707f7d0f6309301220e43939a6fcdcff3cc3d17181a9
diff --git a/sys-apps/accountsservice/accountsservice-0.6.55-r1.ebuild b/sys-apps/accountsservice/accountsservice-0.6.55-r1.ebuild
index 885bc63536ee..9c0dcab956dd 100644
--- a/sys-apps/accountsservice/accountsservice-0.6.55-r1.ebuild
+++ b/sys-apps/accountsservice/accountsservice-0.6.55-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86"
 
 IUSE="doc elogind gtk-doc +introspection selinux systemd"
 REQUIRED_USE="^^ ( elogind systemd )"
diff --git a/sys-apps/earlyoom/Manifest b/sys-apps/earlyoom/Manifest
index 8295916f7087..1efde3085918 100644
--- a/sys-apps/earlyoom/Manifest
+++ b/sys-apps/earlyoom/Manifest
@@ -4,6 +4,6 @@ AUX earlyoom-r1 138 BLAKE2B a95a6db627133ed3d9e4fa02505a1fb8abfc17c345a16df9956d
 DIST earlyoom-1.3.tar.gz 31399 BLAKE2B 3867540afb23493fbb532bcb72a5cfacca4ed297a053ff5e2c7e394bfa3640887e3e7c6430789bc1eda4b7a68680d8a74ab56b641fe9e5d4caa4406e2edb0667 SHA512 c5de742289e82c2098bd88c61dcb3e20eb022905a015b4894c95a4de3978ce18d794a9e7c17c97851ca9f8888728908f7bf978c014b3b69799bffa8b546d258a
 DIST earlyoom-1.6.2.tar.gz 49006 BLAKE2B 85a02d4171ba1bb94d5ddf573b8f5ac58d28a0cf9766f4fb2c96be5b45eee7aab853008c36f9e3aac76685b70008051faa2fe339797ecf9137469f089935a6b3 SHA512 d622a5347591d2017f6e62255940482af431e647acf1b35ab035e0dbfd44da7fc52633e6dd6433e42a1348fd294d766550ba092260f3ec59bd51e545f08e466b
 EBUILD earlyoom-1.3.ebuild 1035 BLAKE2B 64ab6ed459eb6138383569f8b1e03fad94bc4573353ea749ca65a564b2be47f398072974ea5a26c40d3521aa40e27296ebc2a4cd794a01376a652fdcce4dc304 SHA512 79d26e8b94db7b379a9745f2a4a3268fa25cfd97a53897ef29caf7267ab9428b3e096744861c64d6c64afa54cd55e4a565faf3c568a296323d486207ce0a7595
-EBUILD earlyoom-1.6.2.ebuild 1056 BLAKE2B 1d55010ddc8d720a57fdccefdaf2b645e84d9063e8711d9a124f99cf5fcdb511685fd70a99bb14f615a4acd210e9badc33f14c21af7740c5dd7577f1674001be SHA512 ef844ed96e78c9cf8776b422623d6523926e7d835445e30bb3d319325a86ca680f10288a80101a063e4b73bc6795437e8eedbd3c66d9c7091670184040699778
+EBUILD earlyoom-1.6.2.ebuild 1055 BLAKE2B b44ce2881587ced020d5ca03a5c159fcaaa43c232fc1709a63eeb55d9c863f5c4a9b45b2fb91233d129eade27966fa6ed5dfb47fd2012dda41b6a31b3d90df0f SHA512 505051bf11eeac75d153c11b2f168afe4d06669ee951fab5d124c87fa6f868de166ddd705e1c9dce0d09867e33966427f8306db293ac269e391bd684b88d6e24
 EBUILD earlyoom-9999.ebuild 970 BLAKE2B 88a517b48f7367e9abac73dcbc1661e0f0344626506c8e5380a88e6d61fd7b996d93696952fa10b057c579cb5a5490abfa516cecd90a6f916f28f834343cb1df SHA512 342d48f9a0ebedeea82a6995a3ae456745d95d099e61f9ba2d27122a7193df2d8566e139526aa95286e9c12ac401971f1704d029d42783f8faf6956f128e2b10
 MISC metadata.xml 307 BLAKE2B e51a83c88fdb7b817981979a1de41249b2255900e6575eb555489bbc6e924e0bb0ac41d1c214279e0e4e87cba96eb4c0dd92b8dc591a1a1fa7f83e7b6fa9eda5 SHA512 28e7739c241e47e235f1cf897bf4fe5befbcdf783451906ed200c7fac9da0b57c24c6b79900493379709aebbd0a81b4999436d070ad2557cce3886a1efc4c806
diff --git a/sys-apps/earlyoom/earlyoom-1.6.2.ebuild b/sys-apps/earlyoom/earlyoom-1.6.2.ebuild
index fbc56b98e496..1b2e94871b28 100644
--- a/sys-apps/earlyoom/earlyoom-1.6.2.ebuild
+++ b/sys-apps/earlyoom/earlyoom-1.6.2.ebuild
@@ -15,7 +15,7 @@ if [ "${PV}" = "9999" ]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/rfjakob/earlyoom/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 IUSE="docs systemd test"
 
diff --git a/sys-apps/fxload/Manifest b/sys-apps/fxload/Manifest
index dd4bd0abf6d1..b9feb2dd5c15 100644
--- a/sys-apps/fxload/Manifest
+++ b/sys-apps/fxload/Manifest
@@ -1,3 +1,3 @@
 DIST fxload-2008_10_13.tar.gz 23926 BLAKE2B 61401b6ea11bfafe8bdb4128dd1658123cac83c1e2b7995a1554b5c9dfa9cf25c2f261bb76a2fc0946940c64ec69fce021e187c383201f4f7a3561a68c3f8ac8 SHA512 f8a654c51a392ac95672a24962ac3b83ea4e0cb62d51a0696f6bdfdefbc7b5cfb033aa9cd80ee676a6bb00061bd635d7eb3920769f982188d8733c862838bc32
-EBUILD fxload-20081013-r1.ebuild 726 BLAKE2B 936c86f1a56cacf5a533838aba0585b15af5ff2471e137c39e84cfa06e27988a719c6b41ecf5b954f160ffa41d91dcb546bcd813584cde4662751c3730c0d071 SHA512 67e1630d7af508f9c0c209b380665b3df2a74f382e9e51be34ea8d337c477c789ffe23560567c7eb6829733e949421cda5c8dfec2ed952ef12d38a00cd7d2693
+EBUILD fxload-20081013-r1.ebuild 753 BLAKE2B 65b52c44012d1eda44aa909c9bfbf48bb759c4f0393b245e4b8bc6bb7d1f26db9f3e8a5c25d874a616902e3b0324730c5c689967f155c88537d40bb4ffa57c15 SHA512 50e15c4d3518a1bc69504db8652135660375f7c902c05732da09bef0400b0721ac54f98185e64d008a89fea91de3d0aaae76ac291e474933493b51dbe5e6a12c
 MISC metadata.xml 250 BLAKE2B 78bfa62c2b315a16f4c255dae1c32ed1c9184c0638658cb5a8a83641deb97c079b73789e020c754731d6d3153d397df00f546c59781855b7d3f8e01933b626a2 SHA512 bc48eb750cab3e4f45a71b1ccea94faabf8dc43826df2b701320cc03318700234bfea551ab12963356f775932fb62d22fb1182d5ac083c3eafd63b3feeb1b0fe
diff --git a/sys-apps/fxload/fxload-20081013-r1.ebuild b/sys-apps/fxload/fxload-20081013-r1.ebuild
index e5da4db9cfe4..c934c82104a2 100644
--- a/sys-apps/fxload/fxload-20081013-r1.ebuild
+++ b/sys-apps/fxload/fxload-20081013-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit toolchain-funcs
 
@@ -10,17 +10,17 @@ MY_P="${PN}-${PV:0:4}_${PV:4:2}_${PV:6:2}"
 DESCRIPTION="USB firmware uploader"
 HOMEPAGE="http://linux-hotplug.sourceforge.net/"
 SRC_URI="mirror://sourceforge/linux-hotplug/${MY_P}.tar.gz"
+S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 
 src_prepare() {
+	default
+
 	sed -i \
-		-e 's:$(CC) -o:$(CC) $(LDFLAGS) -o:' \
+		-e 's:$(CC) -o:$(CC) $(CPPFLAGS) $(LDFLAGS) -o:' \
 		Makefile || die
 }
 
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index b6de7c8c03f6..a5899b3cb0cf 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -2,7 +2,6 @@ AUX iproute2-3.1.0-mtu.patch 1649 BLAKE2B cbecd9770391ca7c7f25b860a95bb5b2783073
 AUX iproute2-4.20.0-no-ipv6.patch 1334 BLAKE2B 612fa64a897fe8c601aca529a09508cc865f2f0fb7cb865ba28f3369748086622b6910f25052047c972f495b5e20014cdf6e9f73b230124f372cfe6301bc0bf2 SHA512 f4b42667d4433225b2e4272b6e629fc43b73ede02ac0e706d2e46d81ffcecd19ca45b8b9789904b4bd6d10d34c82239f9b3c33cfcf3f9e5b309d828a3494c864
 AUX iproute2-5.1.0-portability.patch 1117 BLAKE2B 8e3a2f275ffb774a30165f46d85ad01f7cd3a932085519255f661dd898462ccb5e8f11c2a57e015d6c19d8c917c82eb76f4b9c779ff91b4cfb7b874fcdda3088 SHA512 5e46e5870e41c15213f04582f40bef18c081f5058f8b530c844fab4f42f56935386f461f0d46f33d17352eebd79a167bb9b6f1edc93bb62b805283cc3872f4f9
 AUX iproute2-5.10.0-configure-nomagic.patch 6511 BLAKE2B f7e75bf8db95c6af4798fbedd936ac7ce1d470c9cf5d31809fda9df8475ce2dafbca2b6d80ab1d2ced544ed1a3310d1db2898a3288e24356d691d08f633b14bd SHA512 025f60975f7579dae9dc9cf0410fa8cef4ee96f954133af17e9c4f8a860fba4c33086845a568f46e68f2a4f4088f84e57c200fd4b4bc417e6f3c48d7cf9e7bcb
-AUX iproute2-5.11.0-configure-nomagic.patch 6701 BLAKE2B 8e4176b88adca58d5cc9f7a168a68718db3830173399375fb23b4e861b7a3684c731f61854dfa5647767e1af9dbbf30161240bed33ed8a47ea353119a4251d9e SHA512 1d51c66909c92ba4ca096bf53f067712a7740ab4e8d4c893dfb47b3bea52ded89995ff9f36cc0364a0a21e7486909e390f457ca62fef2b28b519d867b31ce971
 AUX iproute2-5.12.0-configure-nomagic.patch 6967 BLAKE2B 8707ace3766d2bb797901886032bbbfc78b3116b548d317038144307a52ba86a01dc49460fa8b4524f03de3abc5b56f4901a9cb24f1f6cacfbd7a5b92cea7145 SHA512 a6184d1fc150717ab40a278c2a6ce439ea04e9967d55f1d10fecc8162452a1a38a6e11c2f736c5aebfe0ffe726bfa80e154169004ccc571b89dcef9c0dbe1242
 AUX iproute2-5.7.0-mix-signal.h-include.patch 213 BLAKE2B ad6def6d017ff1d78587d1bfb9d92379983d989d9d4a396e773f02c655ac14c57cc25c5d4e37fbdb0e0d1cb1d35fc94ee70077b81d1285ac2d58cb1b19fa69db SHA512 09a9d450179b06c434a41b7bdd8d4a47b8ca2303de3d08b2b101e8695aec28e5d1e454a8c62e1b71d66b6e776dc6975f2837acc0a0f8a2a3f1e31b1eb56b71e3
 DIST iproute2-5.10.0.tar.xz 798776 BLAKE2B 8c17e65f03427f45b71dc17b289b272545549a6687257498676a23e4fdc4a590a7215bfdba3c7ac4b1ccde6c38ba8e3eb222eea2532374fa9680633aa198d347 SHA512 a468eefa797898b6de452212aa432c0a931434defacae5fb4335754c1292c5d86a8c8dbf3017f90cec266d71a2a17ae469aac17e1a85a5cbddc70814313e4c13
diff --git a/sys-apps/iproute2/files/iproute2-5.11.0-configure-nomagic.patch b/sys-apps/iproute2/files/iproute2-5.11.0-configure-nomagic.patch
deleted file mode 100644
index 8ccd02a10e2f..000000000000
--- a/sys-apps/iproute2/files/iproute2-5.11.0-configure-nomagic.patch
+++ /dev/null
@@ -1,235 +0,0 @@
-The hand-rolled configure script, for multiple options (selinux,mnl,elf), sets
-a variable as well as modifying CFLAGS & LDLIBS.
-
-If config.mk is later amended to disable a feature, the CFLAGS/LDLIBS tweaks
-are still in place.
-
-Push the CFLAGS/LDLIBS changes into new conditional Makefile code, so that they
-are only passed when correctly needed.
-
-Prior Gentoo testcase for reproduction:
-USE=minimal ebuild ... compile.
-- Linking with libbsd, libelf, libmnl & libcap based only on presence.
-- Links based on libselinux based only on presence.
-
-Closes: https://bugs.gentoo.org/643722
-Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-
-Forward-ported from v4.14.1 to v4.16.0 by Lars Wendler <polynomial-c@gentoo.org>
-Added libcap to v4.17.0 by Lars Wendler <polynomial-c@gentoo.org>
-Forward-ported from v4.17.0 to v4.20.0 by Lars Wendler <polynomial-c@gentoo.org>
-Forward-ported from v4.20.0 to v5.11.0 by Lars Wendler <polynomial-c@gentoo.org>
-
---- iproute2-5.11.0/bridge/Makefile
-+++ iproute2-5.11.0/bridge/Makefile
-@@ -2,6 +2,7 @@
- BROBJ = bridge.o fdb.o monitor.o link.o mdb.o vlan.o
- 
- include ../config.mk
-+include ../config.include
- 
- all: bridge
- 
---- iproute2-5.11.0/config.include
-+++ iproute2-5.11.0/config.include
-@@ -0,0 +1,32 @@
-+# We can only modify CFLAGS/LDLIBS after all the config options are known.
-+ifeq ($(IP_CONFIG_SETNS),y)
-+	CFLAGS += $(IP_CONFIG_SETNS_CFLAGS)
-+endif
-+ifeq ($(HAVE_ELF),y)
-+	CFLAGS += $(HAVE_ELF_CFLAGS)
-+	LDLIBS += $(HAVE_ELF_LDLIBS)
-+endif
-+ifeq ($(HAVE_SELINUX),y)
-+	CFLAGS += $(HAVE_SELINUX_CFLAGS)
-+	LDLIBS += $(HAVE_SELINUX_LDLIBS)
-+endif
-+ifeq ($(HAVE_MNL),y)
-+	CFLAGS += $(HAVE_MNL_CFLAGS)
-+	LDLIBS += $(HAVE_MNL_LDLIBS)
-+endif
-+ifeq ($(HAVE_CAP),y)
-+	CFLAGS += $(HAVE_CAP_CFLAGS)
-+	LDLIBS += $(HAVE_CAP_LDLIBS)
-+endif
-+ifeq ($(HAVE_LIBBSD),y)
-+	CFLAGS += $(HAVE_LIBBSD_CFLAGS)
-+	LDLIBS += $(HAVE_LIBBSD_LDLIBS)
-+else
-+	CFLAGS += -DNEED_STRLCPY
-+endif
-+
-+# Rules can only be declared after all variables in them are known.
-+%.o: %.c
-+	$(QUIET_CC)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(CPPFLAGS) -c -o $@ $<
-+
-+# vim: ft=make:
---- iproute2-5.11.0/configure
-+++ iproute2-5.11.0/configure
-@@ -195,7 +195,7 @@
-     if $CC -I$INCLUDE -o $TMPDIR/setnstest $TMPDIR/setnstest.c >/dev/null 2>&1; then
- 	echo "IP_CONFIG_SETNS:=y" >>$CONFIG
- 	echo "yes"
--	echo "CFLAGS += -DHAVE_SETNS" >>$CONFIG
-+	echo "IP_CONFIG_SETNS_CFLAGS += -DHAVE_SETNS" >>$CONFIG
-     else
- 	echo "no"
-     fi
-@@ -238,8 +238,8 @@
- 	echo "HAVE_ELF:=y" >>$CONFIG
- 	echo "yes"
- 
--	echo 'CFLAGS += -DHAVE_ELF' `${PKG_CONFIG} libelf --cflags` >> $CONFIG
--	echo 'LDLIBS += ' `${PKG_CONFIG} libelf --libs` >>$CONFIG
-+	echo 'HAVE_ELF_CFLAGS += -DHAVE_ELF' `${PKG_CONFIG} libelf --cflags` >> $CONFIG
-+	echo 'HAVE_ELF_LDLIBS += ' `${PKG_CONFIG} libelf --libs` >>$CONFIG
-     else
- 	echo "no"
-     fi
-@@ -357,8 +357,8 @@
- 		echo "HAVE_SELINUX:=y" >>$CONFIG
- 		echo "yes"
- 
--		echo 'LDLIBS +=' `${PKG_CONFIG} --libs libselinux` >>$CONFIG
--		echo 'CFLAGS += -DHAVE_SELINUX' `${PKG_CONFIG} --cflags libselinux` >>$CONFIG
-+		echo 'HAVE_SELINUX_CFLAGS += -DHAVE_SELINUX' `${PKG_CONFIG} --cflags libselinux` >>$CONFIG
-+		echo 'HAVE_SELINUX_LDLIBS +=' `${PKG_CONFIG} --libs libselinux` >>$CONFIG
- 	else
- 		echo "no"
- 	fi
-@@ -370,8 +370,8 @@
- 		echo "HAVE_MNL:=y" >>$CONFIG
- 		echo "yes"
- 
--		echo 'CFLAGS += -DHAVE_LIBMNL' `${PKG_CONFIG} libmnl --cflags` >>$CONFIG
--		echo 'LDLIBS +=' `${PKG_CONFIG} libmnl --libs` >> $CONFIG
-+		echo 'HAVE_MNL_CFLAGS += -DHAVE_LIBMNL' `${PKG_CONFIG} libmnl --cflags` >>$CONFIG
-+		echo 'HAVE_MNL_LDLIBS +=' `${PKG_CONFIG} libmnl --libs` >> $CONFIG
- 	else
- 		echo "no"
- 	fi
-@@ -411,8 +411,8 @@
- 	echo "no"
-     else
- 	if ${PKG_CONFIG} libbsd --exists; then
--		echo 'CFLAGS += -DHAVE_LIBBSD' `${PKG_CONFIG} libbsd --cflags` >>$CONFIG
--		echo 'LDLIBS +=' `${PKG_CONFIG} libbsd --libs` >> $CONFIG
-+		echo 'HAVE_LIBBSD_CFLAGS += -DHAVE_LIBBSD' `${PKG_CONFIG} libbsd --cflags` >>$CONFIG
-+		echo 'HAVE_LIBBSD_LDLIBS +=' `${PKG_CONFIG} libbsd --libs` >> $CONFIG
- 		echo "no"
- 	else
- 		echo 'CFLAGS += -DNEED_STRLCPY' >>$CONFIG
-@@ -428,8 +428,8 @@
- 		echo "HAVE_CAP:=y" >>$CONFIG
- 		echo "yes"
- 
--		echo 'CFLAGS += -DHAVE_LIBCAP' `${PKG_CONFIG} libcap --cflags` >>$CONFIG
--		echo 'LDLIBS +=' `${PKG_CONFIG} libcap --libs` >> $CONFIG
-+		echo 'HAVE_CAP_CFLAGS += -DHAVE_LIBCAP' `${PKG_CONFIG} libcap --cflags` >>$CONFIG
-+		echo 'HAVE_CAP_LDLIBS +=' `${PKG_CONFIG} libcap --libs` >> $CONFIG
- 	else
- 		echo "no"
- 	fi
-@@ -512,7 +512,3 @@
- 
- echo -n "libcap support: "
- check_cap
--
--echo >> $CONFIG
--echo "%.o: %.c" >> $CONFIG
--echo '	$(QUIET_CC)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(CPPFLAGS) -c -o $@ $<' >> $CONFIG
---- iproute2-5.11.0/dcb/Makefile
-+++ iproute2-5.11.0/dcb/Makefile
-@@ -1,5 +1,6 @@
- # SPDX-License-Identifier: GPL-2.0
- include ../config.mk
-+include ../config.include
- 
- TARGETS :=
- 
---- iproute2-5.11.0/devlink/Makefile
-+++ iproute2-5.11.0/devlink/Makefile
-@@ -1,5 +1,6 @@
- # SPDX-License-Identifier: GPL-2.0
- include ../config.mk
-+include ../config.include
- 
- TARGETS :=
- 
---- iproute2-5.11.0/genl/Makefile
-+++ iproute2-5.11.0/genl/Makefile
-@@ -2,6 +2,7 @@
- GENLOBJ=genl.o
- 
- include ../config.mk
-+include ../config.include
- SHARED_LIBS ?= y
- 
- CFLAGS += -fno-strict-aliasing
---- iproute2-5.11.0/ip/Makefile
-+++ iproute2-5.11.0/ip/Makefile
-@@ -16,6 +16,7 @@
- RTMONOBJ=rtmon.o
- 
- include ../config.mk
-+include ../config.include
- 
- ALLOBJ=$(IPOBJ) $(RTMONOBJ)
- SCRIPTS=ifcfg rtpr routel routef
---- iproute2-5.11.0/lib/Makefile
-+++ iproute2-5.11.0/lib/Makefile
-@@ -1,5 +1,6 @@
- # SPDX-License-Identifier: GPL-2.0
- include ../config.mk
-+include ../config.include
- 
- CFLAGS += -fPIC
- 
---- iproute2-5.11.0/misc/Makefile
-+++ iproute2-5.11.0/misc/Makefile
-@@ -5,6 +5,7 @@
- TARGETS=ss nstat ifstat rtacct lnstat
- 
- include ../config.mk
-+include ../config.include
- 
- ifeq ($(HAVE_BERKELEY_DB),y)
- 	TARGETS += arpd
---- iproute2-5.11.0/netem/Makefile
-+++ iproute2-5.11.0/netem/Makefile
-@@ -1,5 +1,6 @@
- # SPDX-License-Identifier: GPL-2.0
- include ../config.mk
-+include ../config.include
- 
- DISTGEN = maketable normal pareto paretonormal
- DISTDATA = normal.dist pareto.dist paretonormal.dist experimental.dist
---- iproute2-5.11.0/rdma/Makefile
-+++ iproute2-5.11.0/rdma/Makefile
-@@ -1,5 +1,6 @@
- # SPDX-License-Identifier: GPL-2.0 OR Linux-OpenIB
- include ../config.mk
-+include ../config.include
- 
- TARGETS :=
- 
---- iproute2-5.11.0/tc/Makefile
-+++ iproute2-5.11.0/tc/Makefile
-@@ -4,6 +4,7 @@
-        emp_ematch.tab.o emp_ematch.lex.o
- 
- include ../config.mk
-+include ../config.include
- 
- SHARED_LIBS ?= y
- 
---- iproute2-5.11.0/tipc/Makefile
-+++ iproute2-5.11.0/tipc/Makefile
-@@ -1,5 +1,6 @@
- # SPDX-License-Identifier: GPL-2.0
- include ../config.mk
-+include ../config.include
- 
- TARGETS :=
- 
diff --git a/sys-apps/mawk/Manifest b/sys-apps/mawk/Manifest
index 698633acd267..70a902cf0f59 100644
--- a/sys-apps/mawk/Manifest
+++ b/sys-apps/mawk/Manifest
@@ -1,3 +1,3 @@
 DIST mawk-1.3.4-20200120.tgz 468855 BLAKE2B dd8bb8f66cb8bd67d8415ee25ce928113cf3f33f8135bc432a16f30b83df861cd2e29da9e0fac1dfb1a6796239d0c838ed72cf51467f8ed79b96068e3e1f1e93 SHA512 14d9a6642ce931bf6457d248fc2d6da4f0ea7541976ca282ea708b26df048f86fdf92c27f72d497501ccd43a244d1d1a606f1a2f266a7558306fea35dcc3041b
-EBUILD mawk-1.3.4_p20200120.ebuild 863 BLAKE2B 63a5bf377c2668dc7d166c885a8a61e2cd59a05441a8d85e8eeab7e907ee8a9eeff69dc9969254f113ec5216505037e0704ed21957574a33d7db64b55b6e2b3b SHA512 b1002e1739f0f988036856e4db1dd8b5b49f5c1a9a2c01f2c86dac38315740600415794519f35a6090a5522f55a2747e9d85af7e4129f757c4dd19a2bf96bc24
+EBUILD mawk-1.3.4_p20200120.ebuild 862 BLAKE2B 4e7a4bbe1d17b457e494b2f58a72e38156a162508527b96d9474b0acef9b3cb7ada1f529b452dc1cd94cf762e1e4bebe514b06241e9d4ffe60da66ace5aca6fc SHA512 8ca56fa8d99b6b83854345dd7aa8b0de86903125ff43a99a81602bce707ef0968c2f450280834167f3ca4c572e5cce5e1cc514fdd0f83c1f250e005eefc3da71
 MISC metadata.xml 354 BLAKE2B e8a003a587171e7313564e5b8f97a607fc26b434e5045426789dc5e8e1fd54fac9830fb7b262b5b116b9c46f2eaffb8d24cc84aa0efea8b2adba659629d55b19 SHA512 64ebb5869d73b897984a63747eacda76fd6ba1b374e4995df9b3ff4b4e4908570dd2e0e6028581983486b5eb4ce2f61743da737eb353b2822ab8d5e16fe49bed
diff --git a/sys-apps/mawk/mawk-1.3.4_p20200120.ebuild b/sys-apps/mawk/mawk-1.3.4_p20200120.ebuild
index 105d8f9933ed..7c38dd64e7e7 100644
--- a/sys-apps/mawk/mawk-1.3.4_p20200120.ebuild
+++ b/sys-apps/mawk/mawk-1.3.4_p20200120.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://invisible-mirror.net/archives/${PN}/${MY_P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="app-eselect/eselect-awk"
 DEPEND="${RDEPEND}"
diff --git a/sys-apps/memtester/Manifest b/sys-apps/memtester/Manifest
index 74cfd2a9de28..7b826ca7e8d6 100644
--- a/sys-apps/memtester/Manifest
+++ b/sys-apps/memtester/Manifest
@@ -1,5 +1,5 @@
 DIST memtester-4.5.0.tar.gz 23286 BLAKE2B 841b68026a9b4eae69490c469dbaf062500b642d9ab11e3b1052e7c850e49af3665d0fd01c49670cf297ea5e03a4916ea01bb0219910d487de87568060115e2b SHA512 17df913509df33851fbc58751df993a77bff765a9799ac2b7976518b0a659a2322c9a93a7438e9daa314035e0c08cfcee5cbc97c6be1631917c47e221f15d363
 DIST memtester-4.5.1.tar.gz 23655 BLAKE2B bb7214a41f7cfa39dff6ab4f1efcd1788f5e6bd4cc1defba8c77ae030321703c1da7b6c1c6f1a67ea59e2cb9fc960772b710050b7c6d14b0799db4d9d99e9c31 SHA512 cf5744f11a931338a94158aee3047ad2dab18b0cb27b8998184a98f33aaebc678beec74841a2bcbbd7154cc2e46a20f746d9cae01a9274714bcedb93f29f8c80
 EBUILD memtester-4.5.0.ebuild 721 BLAKE2B 899588b6707b5cb7d7f5ecec63089e577202e3934981c2fb72785bffe0a0073c99f74a6bedcfdc34a5b84581a5f9103a9329eea2bfebfa76735a188ffe1187b7 SHA512 05557e5a04890b7fc6424e603493504793d68921c2325da5e94809b16aa431c79b34269e7119a8ad40474eaff09986302b908e4780b6ff3605b5b27cbe3ef1ee
-EBUILD memtester-4.5.1.ebuild 726 BLAKE2B 3a1154c21365b09c3fae329ec5d600b4450bfcf05622e4e93474bf98e66b0aa59e2dfb0ce2c0381c59ae4a09a4e0c058c63b80dcd50e6e05843ac75455ff0238 SHA512 e6c082e5bdb54f85089f51033c1e07ff1f5e09636df1700dfc16963b2aefb18500ac5ddf60a00dc3c715e0944b155592d535e1fbfb136800e99b64e5736676a0
+EBUILD memtester-4.5.1.ebuild 733 BLAKE2B cd4e9114110d48f4b50791f990cebd35f6380689c86eb532ca67c697987891f782b6bec3993c989f0ee97b589e32c2ace9aa9dc3ce5c8997fe7f38650e255b98 SHA512 3b568cc76fc439515eb74e2e553d86f61364124d92607530ef31a8e866ce817956f7449f0dee64a16592c4a263f030c619339d270e494563156045ae838973d7
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/memtester/memtester-4.5.1.ebuild b/sys-apps/memtester/memtester-4.5.1.ebuild
index 2084213eb705..f4e51b6711df 100644
--- a/sys-apps/memtester/memtester-4.5.1.ebuild
+++ b/sys-apps/memtester/memtester-4.5.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 
 src_configure() {
 	echo "$(tc-getCC) ${CFLAGS} ${CPPFLAGS} -DPOSIX -c" > conf-cc || die
diff --git a/sys-apps/netplug/Manifest b/sys-apps/netplug/Manifest
index bd5c06538350..e7d8fc4b3ece 100644
--- a/sys-apps/netplug/Manifest
+++ b/sys-apps/netplug/Manifest
@@ -5,5 +5,5 @@ AUX netplug-1.2.9.2-multi-waitpid-sigchld.patch 1865 BLAKE2B c70d7fbf21c27bdaf70
 AUX netplug-2 715 BLAKE2B df2ffc7a904a86bedb5c160ad0ba8a2d49a8125ed3042f85a361a6270ab79668cdb4dd693e022908b2637a4522f8038f22c0c03b19909d1cdaca2e7da0da21ae SHA512 11efb8b8916d40615840c5721aba089dc9f81bf30f2af6f47d6df2fd8f2b6f22e0cd59ebd37fd9875c4af31e064128e93acbef5cf859b3cabb553fbdd2f3c9ee
 DIST netplug-1.2.9.2.tar.bz2 22332 BLAKE2B 3a4232178e782417e30da3dc33361c4043d5ff9bb610c2f9a82281d395af470ddeab9cf12f91ef4a18f4fe6ff49f85b7015fecc7018b1b561e2e7f179d8d206b SHA512 b68a00eb8874ec7dd6aa9f7b7f529a6e1d9ecece4b798c8cee996b7f3534c556656f642de0ac4b2a6d06fbaf18e3bfaab00934a9292b95939a4935e673e9ca8c
 EBUILD netplug-1.2.9.2-r2.ebuild 1367 BLAKE2B 623141474c25647e63dbb7353f4e98c8a46046ce0f3731d7561d2020d09f23ea5de1007e437b3395feb13582b7f39921bd1df2c311eed51c1eccff4dbdbc71d1 SHA512 fe7bb9d19ae3e4f649b50ecda9a7669a7e130c4b4136037441760098c77de5df485ea7f3173659f3d722c7b8a5904862d2ba48f13c135be930bdd45af3ae887b
-EBUILD netplug-1.2.9.2-r3.ebuild 1482 BLAKE2B e8824dcc19b0bcf8ea470ad12f9397bc0daed15a2dc290496e05be3a6ce3b25475f1b6a085dc1fb6d7e0610412aa7bd01e41a1559f31a103d3961d92fc8560a3 SHA512 88cada59afc0e373415eb14955141967ebe541bda2f1669354e73cb5018fbca88afb2938be6bf3919050f0878e70c37fdf31d2624c14b6690803fa058d429da0
+EBUILD netplug-1.2.9.2-r3.ebuild 1489 BLAKE2B f9146daa95f58dd05e8338f74428aab3f8e71f92a8d9499fa691c8140c920313d5a93dfbbe89662573fef27fc2ced7910db644ec19a0c1e6f9ac8fa56b14e522 SHA512 76e2f43d74f6d64b5d2c6e28be936f3ab0f262fcc91e829ad8070ff61c256759ccd3aac37b6ecac78c0753cab42b0902aefd97b80888061a50bd8bb0850dc886
 MISC metadata.xml 251 BLAKE2B 2e2f0363feb3f8ad15ed8d2ef5130493f501acf64faf4fe567079d18a6066c0a1136f6c0cf53ba4ec854a38b5d4211e48e0a2ddac6677ca02266a3f993e36965 SHA512 0ccc4891c6c5de39cbe83d8391b0345611be252a2b1fedea6644ba1cfb283140a8250f32cd26b701db9c60d42782b214d03574592ef3b585bb15d2ffcb5f016e
diff --git a/sys-apps/netplug/netplug-1.2.9.2-r3.ebuild b/sys-apps/netplug/netplug-1.2.9.2-r3.ebuild
index a452c1ad1c3d..41043cb0afdc 100644
--- a/sys-apps/netplug/netplug-1.2.9.2-r3.ebuild
+++ b/sys-apps/netplug/netplug-1.2.9.2-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://www.red-bean.com/~bos/netplug/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="debug doc"
 
 DEPEND="doc? ( app-text/ghostscript-gpl
diff --git a/sys-apps/osinfo-db/Manifest b/sys-apps/osinfo-db/Manifest
index 84c3690f9d0d..ced88fae7567 100644
--- a/sys-apps/osinfo-db/Manifest
+++ b/sys-apps/osinfo-db/Manifest
@@ -1,7 +1,3 @@
-DIST osinfo-db-20210426.tar.xz 118640 BLAKE2B 934e738ede6b261d59fcb30e3c12d64db86ece75977709cbd59b2e105297731e1bdb6687b0d4cda80972ba2a20cc445edeca289c49bc5d056668bee5066d1216 SHA512 b5c2ed444559dfd1903e16f6c29cfd55cd279a789db93e7b5a0dd450ee48a3bc07cf59ff057220b8ccf1097a04ca1be4cd77c10fea292570ac58893fd788c0fd
-DIST osinfo-db-20210531.tar.xz 118600 BLAKE2B 5068014ecfe5bf213e5dcdaca392701199362297bf7bea0793f7add21602285e53184a48a7743da3d02427bb5eb94062f222fc83e0b46d4052039b562a692d7f SHA512 59fed0d89865958338938b8129065f7416813602d190f41c06817c6ec7e634cede7a306f8cd3797cda37c276efb11598448fe1ce215a9ecb5df9135418cff932
 DIST osinfo-db-20210621.tar.xz 118292 BLAKE2B 6051916322b52cc3496819a29257940421dfaa3071a7d3adc2aa644fd04e1100b2c6d272e88a9fb0205d97c4b7e9035f6e4d5833bf901b985c472164ab98034d SHA512 c0ed0621d799b6515038716bd3b78f6b9f7fa6f80dc83899f691e69a9dc604a43d8d36f0ba5810c68731f0e3ded5fac0a66b7be9c66a14d501384c6850bdb797
-EBUILD osinfo-db-20210426.ebuild 646 BLAKE2B cb2303b33652d1a20a3a7daa6e09803d8f099e7d30bc6f6165c6627ec68547e15d381fb14e309584f9ea3cbba5995ac212969d49bee13b93e3702708217c8320 SHA512 91a69da519966c175e9ba3712ca281e5b1bd68f936c97c534207a7913bed8d105d9539f1af81fb2bfbbdce52917a32e4b3bdbb51ef404e2c59a872ddc092b91d
-EBUILD osinfo-db-20210531.ebuild 649 BLAKE2B 80c3a428f78561c85970aaa059ad466cd0d8e1a3c322b705fd42248a0ddbbc39f3b7949c671b67a93e746d1ec2b2fdd6b8a32b69bd143adee059a242d6c5ff1a SHA512 1b79aad1bba76087ea026480b9ff907aaec79701f0a2f2844a37590fedd7e55394759761ff948710acad4289db8e50c7a34c7cd3201e62d1b2abb2b84f4f6ffd
 EBUILD osinfo-db-20210621.ebuild 646 BLAKE2B cb2303b33652d1a20a3a7daa6e09803d8f099e7d30bc6f6165c6627ec68547e15d381fb14e309584f9ea3cbba5995ac212969d49bee13b93e3702708217c8320 SHA512 91a69da519966c175e9ba3712ca281e5b1bd68f936c97c534207a7913bed8d105d9539f1af81fb2bfbbdce52917a32e4b3bdbb51ef404e2c59a872ddc092b91d
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/sys-apps/osinfo-db/osinfo-db-20210426.ebuild b/sys-apps/osinfo-db/osinfo-db-20210426.ebuild
deleted file mode 100644
index 109cfb6ee818..000000000000
--- a/sys-apps/osinfo-db/osinfo-db-20210426.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="osinfo database files"
-HOMEPAGE="https://libosinfo.org/"
-SRC_URI="https://releases.pagure.org/libosinfo/${P}.tar.xz"
-S="${WORKDIR}"
-
-LICENSE="GPL-2+"
-SLOT="0"
-
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-BDEPEND="sys-apps/osinfo-db-tools"
-
-# we don't depend on intltool here, contrary to README, as the tarball already
-# contains the processed results with translations in XML files
-
-src_unpack() { :; }
-
-src_install() {
-	osinfo-db-import --root "${D}" --dir "/usr/share/osinfo" "${DISTDIR}/${A}"
-}
diff --git a/sys-apps/osinfo-db/osinfo-db-20210531.ebuild b/sys-apps/osinfo-db/osinfo-db-20210531.ebuild
deleted file mode 100644
index b76468286d57..000000000000
--- a/sys-apps/osinfo-db/osinfo-db-20210531.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="osinfo database files"
-HOMEPAGE="https://libosinfo.org/"
-SRC_URI="https://releases.pagure.org/libosinfo/${P}.tar.xz"
-S="${WORKDIR}"
-
-LICENSE="GPL-2+"
-SLOT="0"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-BDEPEND="sys-apps/osinfo-db-tools"
-
-# we don't depend on intltool here, contrary to README, as the tarball already
-# contains the processed results with translations in XML files
-
-src_unpack() { :; }
-
-src_install() {
-	osinfo-db-import --root "${D}" --dir "/usr/share/osinfo" "${DISTDIR}/${A}"
-}
diff --git a/sys-apps/pcmciautils/Manifest b/sys-apps/pcmciautils/Manifest
index eadecbc980a4..61bce1990981 100644
--- a/sys-apps/pcmciautils/Manifest
+++ b/sys-apps/pcmciautils/Manifest
@@ -1,5 +1,5 @@
 AUX pcmciautils-018_p8-flex-2.6.3-fix.patch 593 BLAKE2B bff765ae6c80daf3d2413528c4d42aefb7af7e3823590d33315c7089a5221d99c82802378cf9b51502b53bd920e0b5b4b68aaa82d50a92e83f5dfe7207c39a49 SHA512 b96f9bc3176f1eeb936a31f8fab5a495ce14218e92fbae2350aa970328b53bd6732ade90721f1ca55d80a94436189773f83a300aa8af7c43ecc5ed62c95f3557
 DIST pcmciautils_018-8.debian.tar.gz 11213 BLAKE2B cf28ecf71ebfd5c4ad7d882cbadab71b787f407adb2d20258cdc1157ca7d542bf398ff09207037d1d6e933d43e477b50b28ca3f0ac0e557fbaefb9f31656843e SHA512 8a00d776e208b43d01fe22b9d4e889bc1b2c5982aa1bf225bdd613ffb0f5b37f5266ccc1cb91df9ac49c4ee3e3653ebb29807b61fff53c585e2cfed5aa2cd9e9
 DIST pcmciautils_018.orig.tar.gz 48516 BLAKE2B 0b197cdd7d0940e5c0eee2da961f0f4dd972a3178ba5d07a6492185d0ab156cd61f5343c8f9d812cff402f04af76a15baa3db564d14317d3817e5325dd8811fb SHA512 f0af1fc6155686ae61c1c85a6451b032088a3880dfbc05c1d1ed33ca8e975745f9d4bedb0f3ee0a1252461aa008bed8014c73ff850cddd89d930524a6d68d47d
-EBUILD pcmciautils-018_p8-r3.ebuild 1552 BLAKE2B ab756adb42aeb06fd23b022b0a9c064204808dfb5f2f4d396e622634686cc881b8a53d760ee4638b66ec8d46cea3e9252126a8bb993813099f10ec99b98968ce SHA512 0ed8d900a3ba3ea65bf4a7666f8be2f04eea1507bf9f296dbd41e90e7f375461e73fdb643e4d41eaa4f0ed61a933868d7e1bf6c6187b1ad2d0282178390864fe
+EBUILD pcmciautils-018_p8-r3.ebuild 1559 BLAKE2B cb31e5636739ff7887728729f4bbf7ca128c22272646edc62222a922dd477b0472c795cee88e1f4145d502648e16f177994cb0387d59ac036c5d3c3d3ba302f1 SHA512 cd8a207d30f4ca09f48f35a91bd6152996b2e178d7947a6656be683437b297382d7bf2aecb1126288c1255c9fcc6bcb7f790bbed7f9cfbb8250920d99f86200e
 MISC metadata.xml 244 BLAKE2B 98282e1c41cb6f5c3e984cc3d0558218b91a7eaf13774ab9f7e3eec7351fb18831088c0ecf1422ec6bac434b1c46654cf253f41bd3a748f4c724bfed2b35e82f SHA512 5c9aa921d361b670fdacbc49e93fb5e3a8ed161e0866ebc08ec0940c480a6bed654059642675e37596d1ede56f0ca5b55ae31ed96040fcf8d01f9f683ce444f6
diff --git a/sys-apps/pcmciautils/pcmciautils-018_p8-r3.ebuild b/sys-apps/pcmciautils/pcmciautils-018_p8-r3.ebuild
index 6ba72087ffb2..927b43039600 100644
--- a/sys-apps/pcmciautils/pcmciautils-018_p8-r3.ebuild
+++ b/sys-apps/pcmciautils/pcmciautils-018_p8-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${MY_PV}.orig.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ppc x86"
+KEYWORDS="amd64 arm ~arm64 ppc x86"
 IUSE="debug staticsocket"
 
 RDEPEND="sys-apps/kmod[tools]"
diff --git a/sys-apps/pcsc-lite/Manifest b/sys-apps/pcsc-lite/Manifest
index 0a980a45bb97..9bb58f33ef45 100644
--- a/sys-apps/pcsc-lite/Manifest
+++ b/sys-apps/pcsc-lite/Manifest
@@ -6,5 +6,5 @@ AUX pcscd-udev 330 BLAKE2B 50e99953aec238fe98c6aee5219d3978b44d37c90ce74c9cb8e19
 DIST pcsc-lite-1.9.0.tar.bz2 755963 BLAKE2B 30d027ac61aba1f57224c88ffc4ec8568dcc2747f3f7e24be07e7ce52bd23ad7a71b6a2f78d912f827a4c02a22c13ff16bc1450c02bafd92bc87ac0e34a2bbcb SHA512 35c85b15ab54c14403a080d6671b3d986910372651d46a5477111172d42c6d2cf58f4a3ce95427e7a84f6b4d3bee30ea57bf69b855f753160a3c6e72f93e34f3
 DIST pcsc-lite-1.9.1.tar.bz2 763525 BLAKE2B b85364f5e2a92450b020bfc28439774c6a6ffb9016ea4072d1925fbc1cef76cd370b298c0b414ba322205d859018308bd7101ef89c5b6f96b97e4f223035ac35 SHA512 4f59ea6acb5b258092018f10609987e12b8e601049e6ffed4b4b82abd3c4b35c38a60e1cda28fdc884202e694d1bc3a3b5d930c5b1e9c1b9c309bd17ef463e63
 EBUILD pcsc-lite-1.9.0.ebuild 3167 BLAKE2B 9172b138a531936e2de9bd0d9d961d252f88d57950ae414b6ea3816f0d25f60406ede13d3d1e17159bf33681d7294526e9778f42a10292aaf846a70c6978c208 SHA512 baacae6682f43ce2ab5d89c5e278d11cc9cc5420d14821bbaa7b03e000884953d9aa1cda9df634d090444ba16af9fb7e2ed7e12d5b6d568ab4808960f5ee16da
-EBUILD pcsc-lite-1.9.1.ebuild 3174 BLAKE2B 64e94f5bd9b187888f472209d9427d743bc217f3ee22b2000d80f4ad725e3a1a6e2dfd058ec242f9e79454a380b03ef9079a2e4d6d2bd75fc02b1d8f5ac07dad SHA512 28a35ec3d2478c9d4c356ee7e24c4ca0aefcc6e69781196b817ac9eb5a47fea14c1b4045b7b9b4d8b67621e4e93cd1e0f4788dfa3002ba6906231d6f1e1e1640
+EBUILD pcsc-lite-1.9.1.ebuild 3181 BLAKE2B 5d67ccc4a2705aa85746347ff32f6d15e6613ea40ea244d7c810061a3dd5c023606f070b6d73544e4ef9f86ddfe4444e37c335177d65eb2a02ba06d4abb8ce0a SHA512 c8fee2822eada5dd7cbbe334be1ca72318a009fde315c8dc46fb9380f8f76a0965445bfc858bbadff1baae6bf80353223b59eb4990c9097970d8d891d07f9a02
 MISC metadata.xml 1082 BLAKE2B 2a17c8ba7222cbaa7f85fe736c81e8acf5516d35493c5c288f490ea6718eb7734856c12cf856ccf7963d142843fc354f38e265a0324f66aa44647071a252770e SHA512 3538f225dd27a1fee2f02a2ed7c656534f5445cf3c54f453571aa87246c84016cae556e3b683a0f34fc4434f1a0eb8b7855bf872a8ca1989a8c871767e565b0c
diff --git a/sys-apps/pcsc-lite/pcsc-lite-1.9.1.ebuild b/sys-apps/pcsc-lite/pcsc-lite-1.9.1.ebuild
index 1d51c5e54861..5ad5f5d7b9f6 100644
--- a/sys-apps/pcsc-lite/pcsc-lite-1.9.1.ebuild
+++ b/sys-apps/pcsc-lite/pcsc-lite-1.9.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://pcsclite.apdu.fr/files/${P}.tar.bz2"
 # upstream.
 LICENSE="BSD ISC MIT GPL-3+ GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 # This is called libusb so that it doesn't fool people in thinking that
 # it is _required_ for USB support. Otherwise they'll disable udev and
diff --git a/sys-apps/plocate/Manifest b/sys-apps/plocate/Manifest
index cc3ef44b749c..75031cd30f04 100644
--- a/sys-apps/plocate/Manifest
+++ b/sys-apps/plocate/Manifest
@@ -3,5 +3,5 @@ AUX plocate-cron.conf 237 BLAKE2B 531d6461309b520db31ab8f682ebbe56f2cd425222ebbc
 AUX plocate.cron 1392 BLAKE2B 89f7eb05879c0c1a6c30376d36dc469dde0b94df3758ae659012cf9fb6e9fb2783a0d8e53ea5f79d99e2f00be72ef24a254f2d91038a30dc9e19cd2b250782f9 SHA512 b15583e98e253c2fcb658bd9c1c589bacddb8b033eb565333d9f990b1fd320fcfbe1d950657c8b5823d4cb034ccad369bdd2178ef955e42aa9c2f8e8a0268b3f
 AUX updatedb.conf 898 BLAKE2B de832ebc92e103ccaf8923b2eb872ad8e1ef36be2dfaa463a054e3e9fc256102db676ab0568501b695d943fcb74ae6ab01585bf7301cc6aa9ce6d709cc1690b5 SHA512 8b0b32e949636aef46c5439b0c963cc113306cedb1e5c84dbbfa2efba6562ca6dd602fdbfa0b3bc9095b0cf30a619ebb366535406cdb461f20d012ec1af7ff9d
 DIST plocate-1.1.8.tar.gz 71569 BLAKE2B 06ad0e9535b76bf0102cdeeb6014e2d84f85f51f5926520566e9c6871f04ac09651bb0674ed679d2a4c0d4e516e55dfef35a7021112fad3549bf76993554aeb5 SHA512 a685347df64ac1a3eb7789cb7023b4d0ffed5fb7435a4bd88c3943991e145a387829532ec0c01d30d851b97b8d3173ff4c7c274775e639b75f0b1b45e5bca2a6
-EBUILD plocate-1.1.8.ebuild 2057 BLAKE2B a84f97d14af3204e33a0b4dd144a6766baba0f429e8e1c4e66383dfa16bc2fe6e8a7c23d483bd644f5cea2155add9ac119b62fa3e0486f54f62d35bc3c9fb817 SHA512 e0d9c63f9e358e931ef2817c6ae1738a99c6c4442b61aca1c0d3905e4297f7dd06d3e670d479aed89229653df0442fde6cca7b82d4eb6a5d11358c3ed53c4fa5
+EBUILD plocate-1.1.8.ebuild 2063 BLAKE2B 35011f66c0957b50861f4a8e4c658ac6457e1d64bc3171713dd7627fcb358a6dd55d9d270966cfaf928bd007d5897e1c0fffa639d00065d2de06450a57dce0b4 SHA512 24b7f3f25aceba3661c38b60a76d6e4229d8bc57c1ce45e00461bd4f264d43bab8432a592ca9abb0b662bad77e0c8072c6243164f0f395a07abda602b8de3d1d
 MISC metadata.xml 1392 BLAKE2B b0e97157995ec77af0df5fe42d8bfe2949163b3f1ac9631e5b79942786491a3f9c2e29d004901abe994735373cef5cbe4f31646847e9cde1d26620b229396e81 SHA512 35cfb62bc7d28abb528835566018b03a724a1c4fa0a68661478007f924a685f42c5b43a2661e7a0b27548d3feae1f64223ac0f9be1c6d3ff600a57aadde69dcf
diff --git a/sys-apps/plocate/plocate-1.1.8.ebuild b/sys-apps/plocate/plocate-1.1.8.ebuild
index a708c02300a6..5cc0edbe149d 100644
--- a/sys-apps/plocate/plocate-1.1.8.ebuild
+++ b/sys-apps/plocate/plocate-1.1.8.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://plocate.sesse.net/download/${P}.tar.gz"
 # GPL-2+ for plocate itself
 LICENSE="GPL-2 GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64 ~arm64"
 IUSE="+io-uring"
 
 RDEPEND="
diff --git a/sys-apps/rescan-scsi-bus/Manifest b/sys-apps/rescan-scsi-bus/Manifest
deleted file mode 100644
index 8af3f2ab0d30..000000000000
--- a/sys-apps/rescan-scsi-bus/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST rescan-scsi-bus.sh-1.57 22575 BLAKE2B 71737a9b2df22d8aecc756bb690cc401343c7951f0e809804eee43e01566e9f5377d5fd2c1d3628602ed64536402a71770dfe8e6514ab2d36851c7f0827f0c7c SHA512 93a061af852e5f9dd3d64ad62692809a11d8ffaac68f5ce08ba1a4fd9201fc66a0a5482d3e6da6e5c36fb00805fa4f7483fc2c85c5aaf6bfc190690ccf7bc733
-EBUILD rescan-scsi-bus-1.57-r2.ebuild 856 BLAKE2B 9b87e53b45a9192d9fb0b1e9ce893874d0682d628834ae0d486325a017317a1ce91746db0e0ed39edf12677f01611b90aa25607f48ab32328ea8d85df14c122e SHA512 f188a989e4b4e86f43a86b23652fa62c942bca2f359e36e1afdee028e0789d2a5ba53cb567408f67d9562466dda826370e725243776c2c70b8983297dd93467e
-MISC metadata.xml 329 BLAKE2B d3b79b0a53a4a98cf288ff1ee8ae8cb477b90dad4529cedf04a52b25a3fc359121851c2cea28d703b2d2a42c5813bfe9b84398786e9045521eaff01b94f543c4 SHA512 3baca06564c2219ea6175ea39cea467ada4e7bf21a4341fcdc9d5b885ae387f4ca4f93605464b900a2524d64badfae641c5459d0acd0569de1ce848528a46ee4
diff --git a/sys-apps/rescan-scsi-bus/metadata.xml b/sys-apps/rescan-scsi-bus/metadata.xml
deleted file mode 100644
index 9590fe15fc00..000000000000
--- a/sys-apps/rescan-scsi-bus/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-	<email>robbat2@gentoo.org</email>
-</maintainer>
-<maintainer type="project">
-	<email>base-system@gentoo.org</email>
-	<name>Gentoo Base System</name>
-</maintainer>
-</pkgmetadata>
diff --git a/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.57-r2.ebuild b/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.57-r2.ebuild
deleted file mode 100644
index 569d87f745e5..000000000000
--- a/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.57-r2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Script to rescan the SCSI bus without rebooting"
-HOMEPAGE="http://www.garloff.de/kurt/linux/"
-SCRIPT_NAME="${PN}.sh"
-SRC_NAME="${SCRIPT_NAME}-${PV}"
-SRC_URI="http://www.garloff.de/kurt/linux/${SRC_NAME}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-
-RDEPEND=">=sys-apps/sg3_utils-1.24
-	<sys-apps/sg3_utils-1.44
-	app-admin/killproc
-	app-shells/bash
-	sys-apps/kmod[tools]"
-
-S=${WORKDIR}
-
-src_unpack() {
-	cp -f "${DISTDIR}"/${SRC_NAME} "${WORKDIR}"/${SCRIPT_NAME}
-}
-
-src_install() {
-	into /usr
-	dosbin ${SCRIPT_NAME}
-	# Some scripts look for this without the trailing .sh
-	# Some look for it with the trailing .sh, so have a symlink
-	dosym ${SCRIPT_NAME} /usr/sbin/${PN}
-}
diff --git a/sys-apps/rng-tools/Manifest b/sys-apps/rng-tools/Manifest
index 6a4766f28570..9262c8566857 100644
--- a/sys-apps/rng-tools/Manifest
+++ b/sys-apps/rng-tools/Manifest
@@ -4,5 +4,5 @@ AUX rngd-initd-6.11 1789 BLAKE2B 317c6d3d1b7ad10e137c6b5b615354ba7a6deb256da5ef9
 DIST rng-tools-6.11.tar.gz 57366 BLAKE2B d613502bcb24560638c0abc956987e57ec54b6594bed414ce2b70086716f73a9a9eec4800c86097c4a14b91401f0f28be62f5182ee01c328c9a32cd79eaec561 SHA512 0058ca5d0c1ddb554284fe8e6b9c0b85f130e0b9e0b9f0f0219f434302766e07c321d4fc0c01bdeb59053d5cd14dab67dc1c306422ef35a62a267af9fbdf7deb
 DIST rng-tools-6.13.tar.gz 59311 BLAKE2B e4601a2fa8158775a8ef7188edbe61a5eb1df35dccc9e1a0ab6b31b559f2f11dd67b682cf9995f0a67834690417e283d443ae6fa54e99ab6462a1185f9b9e09b SHA512 def5f2dcdd1771e8fe5af9476de866ff89a225065416672165af6019cbb166f874fae936b3705221aa47dc13ae99fa63d054d7d49b612f3151cd922a0a129490
 EBUILD rng-tools-6.11-r1.ebuild 1793 BLAKE2B 07215f34a520bea511c8931960af5fccdf3b92cfcb5c2ba70881ae80cac1229a5cbd40a80ccc167dc0a248ac0712d47b2a9ec03fd9c314ce528bed3cc421e196 SHA512 ea1a99eb14f59c685c2d4ea8823051b807f36fd1573ccc66a6c3fe93fb10dc278a72af901767819759832549272be5de96afbac7b7d897ea72473e45b8fc8b47
-EBUILD rng-tools-6.13.ebuild 1708 BLAKE2B 3f63b13e0dca5e6a0573b23044792e79ad167d28d42f3cf624bd2cbc082bbf04a3bb92f273de096de1200d6d1e2feb232d6ef432ac0740087017825375225f47 SHA512 f5df5fcc33af68cd487d1b7ad833bbfdbc3bf4443b7bdf29d31428a18bfc38e649a5b76ddc4a45433fba51e01af1f107e3b32fc9525ffa577f1454694be7e3bd
+EBUILD rng-tools-6.13.ebuild 1705 BLAKE2B a6ca110edd7f950372bb3d746d32631542a3bc7e6f9eb682fe68fe0253585efe17da60ca46bbcb78f57e25194077818bf09ecb8a0a694694172dd4054851ac2a SHA512 c8d318d9d0ad66c3ae93bacd89df17a719c7de74ef00b0f109782a7d9fcca17ba5df5be636b7c92bf8a60de21a2e1007380efc039cde043d8274d6712097e466
 MISC metadata.xml 713 BLAKE2B c05a29fb9b1c47eff6e8fbdf72bcd911bff431d72e1fb432e40f5ef760d82c26ec29322ccef9d06816b5d137708922b8c44df7ed0c1c60a07eba3b319fa0e1f5 SHA512 65b2454b2161f61cf187bb14b66f8cac59de3b023ed007e7780338533b8bc5c6aa0cff00d99d958f33b566b3fd9d2a597d698275c3a7914541233a9f9336cd64
diff --git a/sys-apps/rng-tools/rng-tools-6.13.ebuild b/sys-apps/rng-tools/rng-tools-6.13.ebuild
index 3b5e5e5b34ad..a053373f0109 100644
--- a/sys-apps/rng-tools/rng-tools-6.13.ebuild
+++ b/sys-apps/rng-tools/rng-tools-6.13.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/nhorman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 ~riscv x86"
 IUSE="jitterentropy nistbeacon pkcs11 selinux"
 
 DEPEND="
diff --git a/sys-apps/sdparm/Manifest b/sys-apps/sdparm/Manifest
index d21a18da2ca6..be80a7883774 100644
--- a/sys-apps/sdparm/Manifest
+++ b/sys-apps/sdparm/Manifest
@@ -1,3 +1,3 @@
 DIST sdparm-1.12.tgz 486592 BLAKE2B 8c872967f859763c5d8fc9e086175010c474e2332e82d79da76bfec636e90cbf54256f0b3c046db159e69b0d1ee64595757177901c48db66d2ea77ad53d623d6 SHA512 00e2775c290c6db3a02780dd3eefa58ac40e1df79a7f19f80a9d497c019a9a4a9a16fb2726f48e7083d0104a8e74326e683c3f5f44c7d1f591a0f607e10493b1
-EBUILD sdparm-1.12.ebuild 1013 BLAKE2B b6ad08363dc6b2bcb1313ec286a8c8f89d0d00a606413f5df8021cfe5523143050bc30a5be3d774de29c84adbbce3449e0dcbfbc0ee2c505a2e2e698ccba1d0e SHA512 09908f1ed86909834dc4e42d310b4e411d446a28dd8d1da74b65a1d6246121443cec3ee55be72e507b12ac723794c9b09b8a0f810da77c7ebd27661d71d975aa
+EBUILD sdparm-1.12.ebuild 1020 BLAKE2B 09bc99d1ac680c211061789189f7ed86c62fcf9853bf044415f16938b375f99032eae16f3d05719e4b6d10ae7cdb7708483ca451f8ce82d9e07c0f546caa8ce5 SHA512 00a4f4c9b5d4578defe8baae420a091289517a2292351eafc85158ec7e1b5299263899423ddf50d0328bed5c019557eaac007eaefb3334dcd3e9c908690952da
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/sdparm/sdparm-1.12.ebuild b/sys-apps/sdparm/sdparm-1.12.ebuild
index 3a51faebd89d..c89c04cefa04 100644
--- a/sys-apps/sdparm/sdparm-1.12.ebuild
+++ b/sys-apps/sdparm/sdparm-1.12.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://sg.danny.cz/sg/p/${P}.tgz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 # Older releases contain a conflicting sas_disk_blink
diff --git a/sys-apps/sg3_utils/Manifest b/sys-apps/sg3_utils/Manifest
index 9528ce379c9c..47669fcdc426 100644
--- a/sys-apps/sg3_utils/Manifest
+++ b/sys-apps/sg3_utils/Manifest
@@ -1,5 +1,4 @@
 AUX sg3_utils-1.26-stdint.patch 678 BLAKE2B 52a78fcc176492e6ca5a7a4465e76a3b6642b27c3b6dd77d5d0e8e7f7c59e564cd7e78f2297847db2e0c6b4611284cf5a67973ec9bcc533deab4625381f27d04 SHA512 07f7d46d70f79508169c482bbe251dd4057be4d546ce8ac4b0928ca8708c55086ca2765c78e5f894af1828ff7383ff33b5d354d4c1af9857a9122dfd6fc916fb
-AUX sg3_utils-1.42-sysmacros.patch 925 BLAKE2B 0a066dccd2e69c0a9a5e6ed20d87700e85061146956601777c754e9411b70de01456bb894091fb0ea0228eb060172601492ea678de158c4733f6ec423f176156 SHA512 f90ecb687f851a45684ad0b1f13269c4d674e849f6782b4f328d7f43f04209ee8442a7b428c27a57610f0ffc4c04343f357e700b22a6817835a3da09300a4f89
 DIST sg3_utils-1.46.tar.xz 1031800 BLAKE2B 034af23d10da49938979ea4d0041c6ce4309b9ceac13f06bd524011dccf285e88fbc5f4c3f261ec3e316db86278ccff235015de43d98b0b62ff05a2f98df0850 SHA512 0b4caab97ccc11fb45e88219e460b37c6ff69b8f3c79e513279aef51783ff22399d141253abdbf55db198db0815bc39d30e9b1e3bd7dda5e15c5f4dae3fe89cf
 EBUILD sg3_utils-1.46-r1.ebuild 1066 BLAKE2B 4871a822cc621c43c04838380cc6d4afc1360ecc851414106141c3e676d29fb236b0a7e386af7c629386beeeb8e2dbd15d083fda0deb8464901c0d3ba1e1325c SHA512 fc2717f60f31087fed00be923c0fa7e04a66928093f1a93524de9629a48f1292bcaa4a43599473ac8eb0da86ac6195f7ff5619643f30042a61598f61bf3deeaf
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/sg3_utils/files/sg3_utils-1.42-sysmacros.patch b/sys-apps/sg3_utils/files/sg3_utils-1.42-sysmacros.patch
deleted file mode 100644
index e8440fb8c322..000000000000
--- a/sys-apps/sg3_utils/files/sg3_utils-1.42-sysmacros.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 13ff34d408cf69339ce1f28756f5c7b5ad5f528b Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Mon, 18 Apr 2016 18:36:09 -0400
-Subject: [PATCH] include sys/sysmacros.h for major/minor funcs
-
-These functions are not part of any official spec, and glibc has always
-kept them in sys/sysmacros.h.  As glibc moves to conform to POSIX, and
-more alternative C libraries come up, we need to include this header
-explicitly to get the prototypes.  Otherwise we fail to build like:
-
-sg_map26.o: In function 'nd_match_scandir_select':
-sg_map26.c:(.text+0x37b): undefined reference to 'major'
----
- include/sg_lib.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/include/sg_lib.h b/include/sg_lib.h
-index b3e741b..a0e483c 100644
---- a/include/sg_lib.h
-+++ b/include/sg_lib.h
-@@ -32,6 +32,7 @@
- 
- #include <stdio.h>
- #include <stdint.h>
-+#include <sys/sysmacros.h>
- 
- #ifdef __cplusplus
- extern "C" {
--- 
-2.7.4
-
diff --git a/sys-apps/shadow/Manifest b/sys-apps/shadow/Manifest
index 293b2138d298..38cadc69d905 100644
--- a/sys-apps/shadow/Manifest
+++ b/sys-apps/shadow/Manifest
@@ -4,6 +4,10 @@ AUX pam.d-include/passwd 144 BLAKE2B 95e159c70416218950ad5cdc41c83b52f8d2ec042d3
 AUX pam.d-include/shadow 152 BLAKE2B 82d1f678abc60586ea873da7e2f4907349d77a64085cc475fa09c47cb008b41a7a00a7de2816b2c5cb2f48452d1b07523be35f8dd29026736ba8fbd3ae3d7c56 SHA512 d07611c350d0d6f3386db5080c80a84e4135cf33e44fd3a390cb1092e034f9bd2a69495fadd4bda6ede9962e9658e77f2c8e12d3189cdcda6c7b3c607336f0c3
 AUX pam.d-include/shadow-r1 116 BLAKE2B bc7baa8e224cb90b6ef79762941b3b7505fcf4b8ed8c5da06a33a8a7fefa91098e4ac0c0f915eeca4a19714d60a2bf43e3922805347e3dfe0ccc80f210bf88e4 SHA512 ddecc5cc8f667f9931ddf5d98d89a986712c5a6e44826add1e1d9ead37064758a3879f6afd1fc45c89c216956593852051e2ef3abc52e2ab58a0e191adfe75d1
 AUX shadow-4.1.3-dots-in-usernames.patch 302 BLAKE2B a83f463be9267c3a704997b98d67cd0daddf8ee05debf447d091530517a855078bd53ce28c87045643b2b8c467dd09caad06a4eb0a6568c271e6a42b49a54dcc SHA512 ad20fb3f4f0292f39b5da796e41df71e9e8b1b81dd11a99b2d988440c1b435b0061333a0a5a37a909598d5a840a75946e8c59c74426bae7452de88cf673a5f7d
+AUX shadow-4.9-libsubid_oot_build.patch 2933 BLAKE2B 9bc638bd1d0733c6e51b54ab1f1db132bd4499a24b33efc76c58c306267015ebd9e2e927e774c3631cfa94490bb249b4d2267a163ae85f9f6ba18b964fcc81d4 SHA512 7f42cd84cb606fde19750f26883c4650642499dc6cb0078bc733d5d61a51b39c9f1c3898000e2df8ceb84eaecadbab6ae502178bf51d205fe644bb8c58a62bfa
+AUX shadow-4.9-libsubid_pam_linking.patch 706 BLAKE2B 8d9b3f6ab2aea004275e6347568013b0092beb57d08a51e6bbca0480773525518febd0ec975dd37a9c071c5ec17d56541586b9afa12010081a392dc60cee4c13 SHA512 49a40045520358d1fb29daae30f9fef1f8aab4516596f16781d3702642ef70592959536d69f4755d57689fc6e30d029c5dfc545d95362e811a284900cb628b6b
 DIST shadow-4.8.1.tar.xz 1611196 BLAKE2B 952707cdd55dc6c00dcbc60dbc3bf84ac618dbe916b36d993802b3ce42594de332a9bc22933a28881af3d317a340eab017ada55511b4e4fbc3ca6b422c4bc254 SHA512 780a983483d847ed3c91c82064a0fa902b6f4185225978241bc3bc03fcc3aa143975b46aee43151c6ba43efcfdb1819516b76ba7ad3d1d3c34fcc38ea42e917b
-EBUILD shadow-4.8.1-r4.ebuild 6170 BLAKE2B 5e69b94f3a9e300eff2699144a343583b01e4be6427b38bee98d251db24b311450b2d0dedb0c47422497c6e2f4b3f115304f7d63250f74d6a09ad48e583da130 SHA512 47dc3428cbbe714a78d5cbbb022863c5106bea0ad31b6ffb5cad63acc518a81ded3215404b21fa41bcd38895f6e51ad6d0602e577fc2f057806834f1ffcf857a
+DIST shadow-4.9.tar.xz 1627008 BLAKE2B 7a9a6a489115c7a20520cfec61f008fc0f70f7f50aaf539e94dfdcb20035d2de88ab3198e76812a4e3eb944b92c76c0ca2e85e35f4342537711c2c033248a72b SHA512 254cda49bb14505a7604821e7fa898bf4bf317d648e9ddc881ab80a6860d52053dfffacad6feab87c7d16608c35ed6b6cee99e7757eac930da3a7b31cdcd4b95
+EBUILD shadow-4.8.1-r4.ebuild 6134 BLAKE2B a3effe54f52408bfee5ed17134a58806e005aab38391d4ff78888e3ae18c86f0d76dd946c2494bc92901e8400e7b98db0e4045f004a8880cb6c437acff28d560 SHA512 2e7375dd6c94bdc85eabfe8cb65d0c7df4bb1bc9b2aff418824046a8af80493f3a481476f63bdc91abca4aefcc61105b2aa6c551e8b260b8da1db2d0587b56fb
+EBUILD shadow-4.9-r1.ebuild 6299 BLAKE2B 248e374de4098b388e264561bf43179d33d65421fc6ab02c036d296b4abae40c9bd0fc13752da8244ea270e286cfc285618efaa466138b1f6334764a917e4506 SHA512 80f60d49b550420b1512ac4484ea845e0fde472746b90f32bbe631012607cf19c87d278c098f27ce1905234f0746833a63514d481be7df83717da6aae43a9be0
 MISC metadata.xml 562 BLAKE2B 7ea54e53f53a91898e5cb5975e9f1aa37639b0ca887213e389c85e0b46cc2dcdf6a1a80795ecd3a74ecc1c4b76d600af563b8d26ce618de1030914ae04f4b152 SHA512 35e207e3d5e3de3f93c8c4a580ec7109bbb778d2d424eef76c5c6b25f8b47d68480a55e9d2b15f9be4f27a273443d6220752337eb538dc05517c0c5a004722e7
diff --git a/sys-apps/shadow/files/shadow-4.9-libsubid_oot_build.patch b/sys-apps/shadow/files/shadow-4.9-libsubid_oot_build.patch
new file mode 100644
index 000000000000..6609ccd6d3a5
--- /dev/null
+++ b/sys-apps/shadow/files/shadow-4.9-libsubid_oot_build.patch
@@ -0,0 +1,109 @@
+From 537b8cd90be7b47b45c45cfd27765ef85eb0ebf1 Mon Sep 17 00:00:00 2001
+From: Serge Hallyn <serge@hallyn.com>
+Date: Fri, 23 Jul 2021 17:51:13 -0500
+Subject: [PATCH] Fix out of tree builds with respect to libsubid includes
+
+There's a better way to do this, and I hope to clean that up,
+but this fixes out of tree builds for me right now.
+
+Closes #386
+
+Signed-off-by: Serge Hallyn <serge@hallyn.com>
+---
+ lib/Makefile.am      | 2 ++
+ libmisc/Makefile.am  | 2 +-
+ libsubid/Makefile.am | 4 ++--
+ src/Makefile.am      | 6 ++++++
+ 4 files changed, 11 insertions(+), 3 deletions(-)
+
+diff --git a/lib/Makefile.am b/lib/Makefile.am
+index ecf3ee25..5ac2e111 100644
+--- a/lib/Makefile.am
++++ b/lib/Makefile.am
+@@ -10,6 +10,8 @@ if HAVE_VENDORDIR
+ libshadow_la_CPPFLAGS += -DVENDORDIR=\"$(VENDORDIR)\"
+ endif
+ 
++libshadow_la_CPPFLAGS += -I$(top_srcdir)
++
+ libshadow_la_SOURCES = \
+ 	commonio.c \
+ 	commonio.h \
+diff --git a/libmisc/Makefile.am b/libmisc/Makefile.am
+index 9766a7ec..9f237e0d 100644
+--- a/libmisc/Makefile.am
++++ b/libmisc/Makefile.am
+@@ -1,7 +1,7 @@
+ 
+ EXTRA_DIST = .indent.pro xgetXXbyYY.c
+ 
+-AM_CPPFLAGS = -I$(top_srcdir)/lib $(ECONF_CPPFLAGS)
++AM_CPPFLAGS = -I$(top_srcdir)/lib -I$(top_srcdir) $(ECONF_CPPFLAGS)
+ 
+ noinst_LTLIBRARIES = libmisc.la
+ 
+diff --git a/libsubid/Makefile.am b/libsubid/Makefile.am
+index 83051560..99308c1f 100644
+--- a/libsubid/Makefile.am
++++ b/libsubid/Makefile.am
+@@ -20,8 +20,8 @@ MISCLIBS = \
+ 	$(LIBPAM)
+ 
+ libsubid_la_LIBADD = \
+-	$(top_srcdir)/lib/libshadow.la \
+-	$(top_srcdir)/libmisc/libmisc.la \
++	$(top_builddir)/lib/libshadow.la \
++	$(top_builddir)/libmisc/libmisc.la \
+ 	$(MISCLIBS) -ldl
+ 
+ AM_CPPFLAGS = \
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 35027013..7c1a3491 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -10,6 +10,7 @@ sgidperms = 2755
+ AM_CPPFLAGS = \
+ 	-I${top_srcdir}/lib \
+ 	-I$(top_srcdir)/libmisc \
++	-I$(top_srcdir) \
+ 	-DLOCALEDIR=\"$(datadir)/locale\"
+ 
+ # XXX why are login and su in /bin anyway (other than for
+@@ -183,6 +184,7 @@ list_subid_ranges_LDADD = \
+ list_subid_ranges_CPPFLAGS = \
+ 	-I$(top_srcdir)/lib \
+ 	-I$(top_srcdir)/libmisc \
++	-I$(top_srcdir) \
+ 	-I$(top_srcdir)/libsubid
+ 
+ get_subid_owners_LDADD = \
+@@ -194,11 +196,13 @@ get_subid_owners_LDADD = \
+ get_subid_owners_CPPFLAGS = \
+ 	-I$(top_srcdir)/lib \
+ 	-I$(top_srcdir)/libmisc \
++	-I$(top_srcdir) \
+ 	-I$(top_srcdir)/libsubid
+ 
+ new_subid_range_CPPFLAGS = \
+ 	-I$(top_srcdir)/lib \
+ 	-I$(top_srcdir)/libmisc \
++	-I$(top_srcdir) \
+ 	-I$(top_srcdir)/libsubid
+ 
+ new_subid_range_LDADD = \
+@@ -210,6 +214,7 @@ new_subid_range_LDADD = \
+ free_subid_range_CPPFLAGS = \
+ 	-I$(top_srcdir)/lib \
+ 	-I$(top_srcdir)/libmisc \
++	-I$(top_srcdir) \
+ 	-I$(top_srcdir)/libsubid
+ 
+ free_subid_range_LDADD = \
+@@ -220,6 +225,7 @@ free_subid_range_LDADD = \
+ 
+ check_subid_range_CPPFLAGS = \
+ 	-I$(top_srcdir)/lib \
++	-I$(top_srcdir) \
+ 	-I$(top_srcdir)/libmisc
+ 
+ check_subid_range_LDADD = \
diff --git a/sys-apps/shadow/files/shadow-4.9-libsubid_pam_linking.patch b/sys-apps/shadow/files/shadow-4.9-libsubid_pam_linking.patch
new file mode 100644
index 000000000000..7fb03f6ff429
--- /dev/null
+++ b/sys-apps/shadow/files/shadow-4.9-libsubid_pam_linking.patch
@@ -0,0 +1,28 @@
+From f4a84efb468b8be21be124700ce35159c444e9d6 Mon Sep 17 00:00:00 2001
+From: Xi Ruoyao <xry111@mengyan1223.wang>
+Date: Fri, 23 Jul 2021 14:38:08 +0800
+Subject: [PATCH] libsubid: link to PAM libraries
+
+libsubid.so links to libmisc.a, which contains several routines referring to
+PAM functions.
+---
+ libsubid/Makefile.am | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/libsubid/Makefile.am b/libsubid/Makefile.am
+index 189165b0..83051560 100644
+--- a/libsubid/Makefile.am
++++ b/libsubid/Makefile.am
+@@ -16,7 +16,8 @@ MISCLIBS = \
+ 	$(LIBCRYPT) \
+ 	$(LIBACL) \
+ 	$(LIBATTR) \
+-	$(LIBTCB)
++	$(LIBTCB) \
++	$(LIBPAM)
+ 
+ libsubid_la_LIBADD = \
+ 	$(top_srcdir)/lib/libshadow.la \
+-- 
+2.32.0
+
diff --git a/sys-apps/shadow/shadow-4.8.1-r4.ebuild b/sys-apps/shadow/shadow-4.8.1-r4.ebuild
index 3ef5b2f92a56..0f0c0c206359 100644
--- a/sys-apps/shadow/shadow-4.8.1-r4.ebuild
+++ b/sys-apps/shadow/shadow-4.8.1-r4.ebuild
@@ -45,7 +45,7 @@ RDEPEND="${COMMON_DEPEND}
 	!=sys-apps/man-pages-5.12-r1
 	nls? (
 		!<app-i18n/man-pages-it-5.06-r1
-		!<app-i18n/man-pages-ja-20171215-r1 !=app-i18n/man-pages-ja-20180315-r0
+		!<app-i18n/man-pages-ja-20180315-r1
 		!<app-i18n/man-pages-ru-5.03.2390.2390.20191017-r1
 	)
 	pam? ( >=sys-auth/pambase-20150213 )
diff --git a/sys-apps/shadow/shadow-4.9-r1.ebuild b/sys-apps/shadow/shadow-4.9-r1.ebuild
new file mode 100644
index 000000000000..4e3c4cc53a2b
--- /dev/null
+++ b/sys-apps/shadow/shadow-4.9-r1.ebuild
@@ -0,0 +1,252 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools pam
+
+DESCRIPTION="Utilities to deal with user accounts"
+HOMEPAGE="https://github.com/shadow-maint/shadow"
+SRC_URI="https://github.com/shadow-maint/shadow/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="acl audit bcrypt cracklib nls pam selinux skey split-usr +su xattr"
+# Taken from the man/Makefile.am file.
+LANGS=( cs da de es fi fr hu id it ja ko pl pt_BR ru sv tr zh_CN zh_TW )
+
+REQUIRED_USE="?? ( cracklib pam )"
+
+BDEPEND="
+	app-arch/xz-utils
+	sys-devel/gettext
+"
+COMMON_DEPEND="
+	virtual/libcrypt:=
+	acl? ( sys-apps/acl:0= )
+	audit? ( >=sys-process/audit-2.6:0= )
+	cracklib? ( >=sys-libs/cracklib-2.7-r3:0= )
+	nls? ( virtual/libintl )
+	pam? ( sys-libs/pam:0= )
+	skey? ( sys-auth/skey:0= )
+	selinux? (
+		>=sys-libs/libselinux-1.28:0=
+		sys-libs/libsemanage:0=
+	)
+	xattr? ( sys-apps/attr:0= )
+"
+DEPEND="${COMMON_DEPEND}
+	>=sys-kernel/linux-headers-4.14
+"
+RDEPEND="${COMMON_DEPEND}
+	!<sys-apps/man-pages-5.11-r1
+	!=sys-apps/man-pages-5.12-r0
+	!=sys-apps/man-pages-5.12-r1
+	nls? (
+		!<app-i18n/man-pages-it-5.06-r1
+		!<app-i18n/man-pages-ja-20180315-r1
+		!<app-i18n/man-pages-ru-5.03.2390.2390.20191017-r1
+	)
+	pam? ( >=sys-auth/pambase-20150213 )
+	su? ( !sys-apps/util-linux[su(-)] )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.1.3-dots-in-usernames.patch"
+	"${FILESDIR}/${P}-libsubid_pam_linking.patch"
+	"${FILESDIR}/${P}-libsubid_oot_build.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+	#elibtoolize
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-account-tools-setuid
+		--with-btrfs
+		--without-group-name-max-length
+		--without-tcb
+		$(use_enable nls)
+		$(use_with acl)
+		$(use_with audit)
+		$(use_with bcrypt)
+		$(use_with cracklib libcrack)
+		$(use_with elibc_glibc nscd)
+		$(use_with pam libpam)
+		$(use_with selinux)
+		$(use_with skey)
+		$(use_with su)
+		$(use_with xattr attr)
+	)
+	econf "${myeconfargs[@]}"
+
+	has_version 'sys-libs/uclibc[-rpc]' && sed -i '/RLOGIN/d' config.h #425052
+
+	if use nls ; then
+		local l langs="po" # These are the pot files.
+		for l in ${LANGS[*]} ; do
+			has ${l} ${LINGUAS-${l}} && langs+=" ${l}"
+		done
+		sed -i "/^SUBDIRS = /s:=.*:= ${langs}:" man/Makefile || die
+	fi
+}
+
+set_login_opt() {
+	local comment="" opt=${1} val=${2}
+	if [[ -z ${val} ]]; then
+		comment="#"
+		sed -i \
+			-e "/^${opt}\>/s:^:#:" \
+			"${ED}"/etc/login.defs || die
+	else
+		sed -i -r \
+			-e "/^#?${opt}\>/s:.*:${opt} ${val}:" \
+			"${ED}"/etc/login.defs
+	fi
+	local res=$(grep "^${comment}${opt}\>" "${ED}"/etc/login.defs)
+	einfo "${res:-Unable to find ${opt} in /etc/login.defs}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" suidperms=4711 install
+
+	# 4.9 regression: https://github.com/shadow-maint/shadow/issues/389
+	emake DESTDIR="${D}" -C man install
+
+	# Remove libshadow and libmisc; see bug 37725 and the following
+	# comment from shadow's README.linux:
+	#   Currently, libshadow.a is for internal use only, so if you see
+	#   -lshadow in a Makefile of some other package, it is safe to
+	#   remove it.
+	rm -f "${ED}"/{,usr/}$(get_libdir)/lib{misc,shadow}.{a,la}
+
+	insinto /etc
+	if ! use pam ; then
+		insopts -m0600
+		doins etc/login.access etc/limits
+	fi
+
+	# needed for 'useradd -D'
+	insinto /etc/default
+	insopts -m0600
+	doins "${FILESDIR}"/default/useradd
+
+	if use split-usr ; then
+		# move passwd to / to help recover broke systems #64441
+		# We cannot simply remove this or else net-misc/scponly
+		# and other tools will break because of hardcoded passwd
+		# location
+		dodir /bin
+		mv "${ED}"/usr/bin/passwd "${ED}"/bin/ || die
+		dosym ../../bin/passwd /usr/bin/passwd
+	fi
+
+	cd "${S}" || die
+	insinto /etc
+	insopts -m0644
+	newins etc/login.defs login.defs
+
+	set_login_opt CREATE_HOME yes
+	if ! use pam ; then
+		set_login_opt MAIL_CHECK_ENAB no
+		set_login_opt SU_WHEEL_ONLY yes
+		set_login_opt CRACKLIB_DICTPATH /usr/lib/cracklib_dict
+		set_login_opt LOGIN_RETRIES 3
+		set_login_opt ENCRYPT_METHOD SHA512
+		set_login_opt CONSOLE
+	else
+		dopamd "${FILESDIR}"/pam.d-include/shadow
+
+		for x in chsh shfn ; do
+			newpamd "${FILESDIR}"/pam.d-include/passwd ${x}
+		done
+
+		for x in chpasswd newusers ; do
+			newpamd "${FILESDIR}"/pam.d-include/chpasswd ${x}
+		done
+
+		newpamd "${FILESDIR}"/pam.d-include/shadow-r1 groupmems
+
+		# comment out login.defs options that pam hates
+		local opt sed_args=()
+		for opt in \
+			CHFN_AUTH \
+			CONSOLE \
+			CRACKLIB_DICTPATH \
+			ENV_HZ \
+			ENVIRON_FILE \
+			FAILLOG_ENAB \
+			FTMP_FILE \
+			LASTLOG_ENAB \
+			MAIL_CHECK_ENAB \
+			MOTD_FILE \
+			NOLOGINS_FILE \
+			OBSCURE_CHECKS_ENAB \
+			PASS_ALWAYS_WARN \
+			PASS_CHANGE_TRIES \
+			PASS_MIN_LEN \
+			PORTTIME_CHECKS_ENAB \
+			QUOTAS_ENAB \
+			SU_WHEEL_ONLY
+		do
+			set_login_opt ${opt}
+			sed_args+=( -e "/^#${opt}\>/b pamnote" )
+		done
+		sed -i "${sed_args[@]}" \
+			-e 'b exit' \
+			-e ': pamnote; i# NOTE: This setting should be configured via /etc/pam.d/ and not in this file.' \
+			-e ': exit' \
+			"${ED}"/etc/login.defs || die
+
+		# remove manpages that pam will install for us
+		# and/or don't apply when using pam
+		find "${ED}"/usr/share/man -type f \
+			'(' -name 'limits.5*' -o -name 'suauth.5*' ')' \
+			-delete
+
+		# Remove pam.d files provided by pambase.
+		rm "${ED}"/etc/pam.d/{login,passwd} || die
+		if use su ; then
+			rm "${ED}"/etc/pam.d/su || die
+		fi
+	fi
+
+	# Remove manpages that are handled by other packages
+	find "${ED}"/usr/share/man -type f \
+		'(' -name id.1 -o -name getspnam.3 ')' \
+		-delete
+
+	cd "${S}" || die
+	dodoc ChangeLog NEWS TODO
+	newdoc README README.download
+	cd doc || die
+	dodoc HOWTO README* WISHLIST *.txt
+}
+
+pkg_preinst() {
+	rm -f "${EROOT}"/etc/pam.d/system-auth.new \
+		"${EROOT}/etc/login.defs.new"
+}
+
+pkg_postinst() {
+	# Enable shadow groups.
+	if [ ! -f "${EROOT}"/etc/gshadow ] ; then
+		if grpck -r -R "${EROOT}" 2>/dev/null ; then
+			grpconv -R "${EROOT}"
+		else
+			ewarn "Running 'grpck' returned errors.  Please run it by hand, and then"
+			ewarn "run 'grpconv' afterwards!"
+		fi
+	fi
+
+	[[ ! -f "${EROOT}"/etc/subgid ]] &&
+		touch "${EROOT}"/etc/subgid
+	[[ ! -f "${EROOT}"/etc/subuid ]] &&
+		touch "${EROOT}"/etc/subuid
+
+	einfo "The 'adduser' symlink to 'useradd' has been dropped."
+}
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 6443dbd9ed74..464588813580 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -4,9 +4,9 @@ AUX gentoo-journald-audit.patch 1485 BLAKE2B 9cba28ce907330bbc1eafcf04a837987ed6
 AUX gentoo-systemctl-disable-sysv-sync-r1.patch 821 BLAKE2B f5ef796725e023bb1ed83b34a3e4d45bb008de9a134892a5321b37b56809c7a44530d18e33c7877177e8b64b2d89dfc2de844bed433db6d5e57831d20fbfb456 SHA512 8d697dbd305f6b95a4ddc47cf9d99a0e954f54e161bd59164917b62a78ff5c23fa2d5be2614569c0a2297595dae59e1ee71bb04da72cbe0c0807e1abd7da974d
 AUX nsswitch.conf 734 BLAKE2B 5f5a7821a84f6c8aa31fe9a68c29a1a0f24be578d427a623f14a9ef795e7da481f226efe5511d92932b5edf5638fa719808a0c3a0b8fd340799dd6bcb703a0a1 SHA512 dcbd51dacaaebdff32edb3840cc7b9b47b6521009b8786690e3673a2e78bc60bfd8e591b1048c5d452117c6659b9917ae2864462f5057cc39b704b0130522e60
 AUX systemd-user.pam 122 BLAKE2B cccc07cab47dfc0481438e503c34fa1a0b2c6b1f8ab282197719a523421d2a526f19230bb459e0347cbeb2046e35a407c78178a3fb5b79619e987cbc4ac7d5e4 SHA512 c5437677ff00fbb45798fe594e8d61b1c2bfc2d103105d7bd82e476240452477ac263700800f5d0ba91ddc895eb85f4517d5cb15c80611ec1680a686d47cd781
-DIST systemd-stable-248.5.tar.gz 10388105 BLAKE2B 7976c31730bce6d90e14c26ddc5d240e5e3a9e9b16dae6186f7b65a4a8708427cde0314d5820ebb817f78061cd14e3aac53d9761f6e1a34a1e16262d63454df5 SHA512 38cdb31e2e5ba1186154da06368b0b467c452368f3dd667d7ef0fb907d314545f903ea9ade3550bf057e9e487d4fdb16a0fa5bce1d0134d2e17223c0795f55cf
-DIST systemd-stable-249.1.tar.gz 10590518 BLAKE2B 85eec7bc4f6af9a39fbf51e8fc65a2b02052a151ab6147e61485a307692a4984543b2506b71dae6715fc9447e85fba8052b847fbb2e5d14c23c7264b9d7fcf36 SHA512 e2c1dd39fc3b9a1a9c2aee4317dc1b2aa66cc47d0275fa4fa8214a9b43e37fd737daf1562db9aa94892128918473bad73cc16a6f0c657498389c3dadb6cf87de
-EBUILD systemd-248.5.ebuild 15190 BLAKE2B 62e9e842209da6ab45c25c4e4ff582477fd0f3b89c84b312a81155d69defa33833d767fb5fced0c3a56de24fd64c1c05ef4431a95b8f1ac7924f19ad9a46619f SHA512 f25e1f5e5ebcefca0f495e50cf7a9eceae12d48ca8e4b5156c1098a6767a00c21e57f12399d3996042071040daab03a4182d5fc71b6fea6722d8983892416bb2
-EBUILD systemd-249.1.ebuild 14853 BLAKE2B c0005455615de6e5e562b930601b02350049dc9fac5ec23928ed178c52568bb3505ca77942dff7e9c7eb24c0ebbb5f232df628ad45f4b88cbbee2c200fb2eaee SHA512 d4e85e01f3c771e4c9da039f34eea401bd5b83a72852ae865a1fb3b06414e0cf9f4b3602b22b7c18f80d371c40fdae40e77097cdcfece0c619216b65c408e36d
+DIST systemd-stable-248.6.tar.gz 10388927 BLAKE2B a102d0fd37a3422f673ced2bbd5bb88b6589195e1f436f43231fd91d79aaf9f548154a3ab2a62a9b409527b3f2e7a9ea735925364ece15c2e151d06c0e4f303f SHA512 35a9d4a9ae04423959c71ad0175d04a1792b9ab39897a497776b93cea166de58b8fb111207c104c0e747d3ffbd85480d8b0cab38e3dc0defbbf09b15211954ce
+DIST systemd-stable-249.2.tar.gz 10591728 BLAKE2B fb24c681cf2328aa26fa49a8ba20cccd1ee0fae82ec9f9931a69eaa377fc01b2ece12fdf407444514d494b8ac1418f155b0fceeff4925bebaba691f0b8a2acc8 SHA512 4f42a0b93156529a464545361436fa98193e12a7e0809315b9fdedbcf33b81dd2037acac27fb0dfefcb2679bc49ebb6da4d152ecb4b15db797c81f7ca4588a11
+EBUILD systemd-248.6.ebuild 15190 BLAKE2B 62e9e842209da6ab45c25c4e4ff582477fd0f3b89c84b312a81155d69defa33833d767fb5fced0c3a56de24fd64c1c05ef4431a95b8f1ac7924f19ad9a46619f SHA512 f25e1f5e5ebcefca0f495e50cf7a9eceae12d48ca8e4b5156c1098a6767a00c21e57f12399d3996042071040daab03a4182d5fc71b6fea6722d8983892416bb2
+EBUILD systemd-249.2.ebuild 14900 BLAKE2B c5a24664029ef8024c66515c4638c9d150105c207f71b8e506ce6e55d00ff6a183e94ade8c1a5920732d9c198a8820ffa4f55ec881662b0bc328bf6c214c61d4 SHA512 4f97d6c63057e2684e517684d74465d19de38dcc000ca27efad81b531047881e604b3224dd4b6e23738af2e5e3b5472d2f79c9f0869aa0300892f608309a3e23
 EBUILD systemd-9999.ebuild 14812 BLAKE2B aee682e4b01400bd2fd3b347be8f219014681e2ce314ec64bc0d51c9187e1c06239efef9985b7c88580ec29e333f3ac959ab8df7d943b5be0ea3c3e3b7b1948f SHA512 0199f497a1d5607f7b1f751efdac6eed18eff34b1d6e8276bf6004778006cba09fe0cbc952e6a178efa44d77f959a2e8f6080c9cce6fa3f2b39097ff6bd59d8b
 MISC metadata.xml 2418 BLAKE2B bec7b05950f495cd678359bca70723286c33d4943407fee45e1214a53d9bfbbb25d3612a5b1bb51d885c38ea63719b3de2f0341d2b8aeb5d5919a29459cb89e4 SHA512 46979fbafe3561a722efefeb82e283e221cb930e56e9f43c25a47c299712dac21f6ef4c970afed86cb390e21dc8dd86b23eea310d5dd7e66a7a6fde250b929d7
diff --git a/sys-apps/systemd/systemd-248.5.ebuild b/sys-apps/systemd/systemd-248.6.ebuild
index 8bd8d0b12c40..8bd8d0b12c40 100644
--- a/sys-apps/systemd/systemd-248.5.ebuild
+++ b/sys-apps/systemd/systemd-248.6.ebuild
diff --git a/sys-apps/systemd/systemd-249.1.ebuild b/sys-apps/systemd/systemd-249.2.ebuild
index aca935e27ce4..e26b4a1abdbc 100644
--- a/sys-apps/systemd/systemd-249.1.ebuild
+++ b/sys-apps/systemd/systemd-249.2.ebuild
@@ -159,6 +159,7 @@ python_check_deps() {
 	has_version -b "dev-python/lxml[${PYTHON_USEDEP}]"
 }
 
+QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
 QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
 
 pkg_pretend() {
author	V3n3RiX <venerix@redcorelinux.org>	2021-07-28 10:27:13 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-07-28 10:27:13 +0100
commit	f4fc10428424904caf2035cffc442195cb088b2c (patch)
tree	72f320d5963e55586cfdeed2b14c72b8191b6327 /sys-apps
parent	fbd9734cedfe790955100b8e4ab3613457d77b1a (diff)