gentoo resync : 30.10.2021

34 files changed, 383 insertions, 15 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 0c37e1df27ae..bc2c786230b4 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/apmd/files/apmd.rc6 b/sys-apps/apmd/files/apmd.rc6
index cce594a57df7..cce594a57df7 100755..100644
--- a/sys-apps/apmd/files/apmd.rc6
+++ b/sys-apps/apmd/files/apmd.rc6
diff --git a/sys-apps/apparmor/files/apparmor_load.sh b/sys-apps/apparmor/files/apparmor_load.sh
index e6fe6b684317..e6fe6b684317 100755..100644
--- a/sys-apps/apparmor/files/apparmor_load.sh
+++ b/sys-apps/apparmor/files/apparmor_load.sh
diff --git a/sys-apps/apparmor/files/apparmor_unload.sh b/sys-apps/apparmor/files/apparmor_unload.sh
index 19e598bb84c4..19e598bb84c4 100755..100644
--- a/sys-apps/apparmor/files/apparmor_unload.sh
+++ b/sys-apps/apparmor/files/apparmor_unload.sh
diff --git a/sys-apps/clrngd/files/clrngd-init.d b/sys-apps/clrngd/files/clrngd-init.d
index d8196717a36f..d8196717a36f 100755..100644
--- a/sys-apps/clrngd/files/clrngd-init.d
+++ b/sys-apps/clrngd/files/clrngd-init.d
diff --git a/sys-apps/collectl/files/collectl.initd-2 b/sys-apps/collectl/files/collectl.initd-2
index b5ff5cedaae8..b5ff5cedaae8 100755..100644
--- a/sys-apps/collectl/files/collectl.initd-2
+++ b/sys-apps/collectl/files/collectl.initd-2
diff --git a/sys-apps/daisydog/files/daisydog.init.d b/sys-apps/daisydog/files/daisydog.init.d
index 5eae48824b61..5eae48824b61 100755..100644
--- a/sys-apps/daisydog/files/daisydog.init.d
+++ b/sys-apps/daisydog/files/daisydog.init.d
diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index 78f7da60ed57..cbb653d4f8aa 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -3,5 +3,5 @@ AUX dbus-daemon-optional.patch 2701 BLAKE2B 28054bf147ffc29d893017dd9b8a6c9b3a03
 AUX dbus-enable-elogind.patch 2801 BLAKE2B c9ef41ff7b31af6cbaf28ca16974fb62aa0f2492f1c6970b41216758768d1139d2ce9aabbb3aff952d625b0decd1e8c2b25f79bb0a13c146aa9453dd4f7b5c5a SHA512 84c5eacc9c305ce1fa9f7a50407b7e836a20c679273cef06004ff57665c27818d2c33e0cfa9ea91ae89c50da4f7b9a92077e607f0f17b9300892d16e881a7d9a
 AUX dbus.initd.in 841 BLAKE2B 7df68814224e066e6356ec30215cf76507c4c1d0b0fed7e97339cba680f7a6f4628b71ca5660f9bc2c0efde75b9a083c08b121d186fd7900b3dea0443a7c0760 SHA512 6bc5bf619369448a221e4eb7c5af421b7610d9488f0409cf1847539b94bc2554238a8e53a60432d7ef60f9b812a3efb0b2ae2ca2544b6ed77b845ec0f5ba1a21
 DIST dbus-1.12.20.tar.gz 2095511 BLAKE2B b467526e7e0281db7b8c7c178469fe006dab29ccb1ea197c02495bd297e8de766230b68ed86c4a7e05dbe09ca30ce941a15e0bf8030fe0df66c04febf0534b3b SHA512 0964683bc6859374cc94e42e1ec0cdb542cca67971c205fcba4352500b6c0891665b0718e7d85eb060c81cb82e3346c313892bc02384da300ddd306c7eef0056
-EBUILD dbus-1.12.20-r3.ebuild 7568 BLAKE2B 74ddb495c2782539877849500922f4114ef9310c4434c20460657e9d7fa0a497e93d867cce7bf2e4bb1323396854c4c9d5b22966f5d4c90d68e98c8a252699f0 SHA512 5f1efe03ee490aef500474f4efa3e0c5aef3615a6aa9c0fed0093c46892c9e05f46b7bfcbb6c61fe06c6edb651527c931a745e674ae2e85a91f72cc1238ff1ca
+EBUILD dbus-1.12.20-r3.ebuild 7570 BLAKE2B e2b45dfd750abd71e37b162fdbc5dd3a14ea1de6fa5d56878fa8e9b39d21ceecbbfa08d9916159566579f3c7e145c94e3c02d090f299cd6e0a48bbd0e9cfdf40 SHA512 bb570e284f2c07e98709bce5c0a84ade205a1a943a50f2d60f1176e82a2199e40d28a8e640d75736a691eec3ebfa3c85cc68aa094209d78d22e18974bb8e7783
 MISC metadata.xml 596 BLAKE2B 6d21d91c952bb0fb0ac067a95e02555c2d7cf532c4327bae062ca902b5d4eb88d6be5e71715ed9f61c11db90e32888104d19b67c4be6258d41208b6157033331 SHA512 759367dfe6da3be576a5d6d641f64c93b799594d00fc304a94bb9a48b3bf3f02c6ad9285f21b83b4360f6c2c30b342644314af8089ae99157241c1e99abdfb34
diff --git a/sys-apps/dbus/dbus-1.12.20-r3.ebuild b/sys-apps/dbus/dbus-1.12.20-r3.ebuild
index d108b73feed6..bd52c647f33c 100644
--- a/sys-apps/dbus/dbus-1.12.20-r3.ebuild
+++ b/sys-apps/dbus/dbus-1.12.20-r3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 TMPFILES_OPTIONAL=1
 
 inherit autotools flag-o-matic linux-info python-any-r1 readme.gentoo-r1 systemd tmpfiles virtualx multilib-minimal
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index 9394f3b4079c..551a150fbbc0 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -12,5 +12,5 @@ EBUILD fwupd-1.5.9-r1.ebuild 4380 BLAKE2B f47d3b9dc882649c85549f3139ea2cd6473c21
 EBUILD fwupd-1.6.2.ebuild 4560 BLAKE2B f85eebae29ee6e20705e7db84bbf8ebc33d109a1fc063c6225c24faf70e1289ae693da3ba6bb36c53ab56e5cfefe39c99a684bbf5393abca8c94b082ce5c9a50 SHA512 f9556caeb5e6678a7bded64b97523e5917a81500a2f7791963c18c769e7e650e3d435c4fd0efe4bb3a0e771d95e294be28bee28a798c974abfaa252de90eb5ea
 EBUILD fwupd-1.6.3.ebuild 4504 BLAKE2B 78cb6e9716c4109fcf2e26cad2c8d5d84d952a1514827f2b48106b8b15d9a65085468396fee88584bc498441ed230dba5b150f682326e982c2fe45620aa3c1ed SHA512 01927eff188e8bf7fa80d394f9666bcc47266bf7e685264da4484ab4c7966adab92669007473c1602b31253cb35ec9bef44737bf4ba78d0ac8b1cb4d9799c255
 EBUILD fwupd-1.6.4-r1.ebuild 4504 BLAKE2B a5efb85ec19fd9484769314b6fcdcdffd1a7d331150496385e1f071421eaa20580c3b7590e52d83e36f752e8953fb6415873cff29fca9a70ea2e66722d4cf105 SHA512 f79dea7b0732564e976507863d39ea2af2d02a4218efc683476f9be1a18248ec8a25f1ff7729a44d5ff0171dc725cac3ebc3057b25c8704365c127a9ac6b9cde
-EBUILD fwupd-1.7.0.ebuild 4652 BLAKE2B 48b044c4754efbecee6eca050b64b3678f03dff3e8bdbe9ac3ddc6dd127c4dd73324ca65af97785892208356bdfef913798bcc3c380465180ff60f5dc34753ff SHA512 ed311b4b86b348db0132679ae6f959ec6785917ca48cc31d67fef1ea8b443a7b9a980e478df477a7ccdc8e3089d9f5c77b19ae3de3cc5cb374a1f21e68676763
+EBUILD fwupd-1.7.0.ebuild 4672 BLAKE2B 78bbf50d08d5bff520729ba37b774e0760c40d8f2f914f0e958bd06ca76bbf75098fd06eb7620df883069d7b73571edfb4ef0d10d650e760e15036fed67f4fb3 SHA512 7616d9e55c61bc92cea0fd580a79e093c68393d286af493ba92e5a0b6bdfac6d3069a0de936cfdb68f8059ea4ee5418f07de8546e0f67f69c076568eb143a91b
 MISC metadata.xml 1429 BLAKE2B be825264920779449312aca9b1de8aff1811c6d8a2f7e46b184214e41f7658b2af9731172f6950e146bcf9fe175a757b814ea97cab8cbc835c76d57b714f0f15 SHA512 824e5d791e4b631af5b2559cc99f43e19acd6f07e33bb540c1e1bce3ff7eaa336a1c5f325317c79958907a581cab61f53f2465c23927323dcf44dcd179e224c0
diff --git a/sys-apps/fwupd/fwupd-1.7.0.ebuild b/sys-apps/fwupd/fwupd-1.7.0.ebuild
index 2e580029d434..4cf8e1b87b63 100644
--- a/sys-apps/fwupd/fwupd-1.7.0.ebuild
+++ b/sys-apps/fwupd/fwupd-1.7.0.ebuild
@@ -18,6 +18,7 @@ IUSE="agent amt archive bluetooth dell elogind flashrom gnutls gtk-doc gusb intr
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	^^ ( elogind minimal systemd )
 	dell? ( uefi )
+	logitech? ( gusb )
 	minimal? ( !introspection )
 	spi? ( lzma )
 	synaptics? ( gnutls )
diff --git a/sys-apps/gawk/Manifest b/sys-apps/gawk/Manifest
index 2257cd626d5e..37429e6be61e 100644
--- a/sys-apps/gawk/Manifest
+++ b/sys-apps/gawk/Manifest
@@ -1,3 +1,6 @@
 DIST gawk-5.1.0.tar.xz 3154564 BLAKE2B a969b03f45e1d830d2b3760d75530de97eb521a35ac448cf441d7fd2d1a8c1059bd9240cb9571f58ef6ec122864ced3d274a07453c3138177deda895ac3433d9 SHA512 971e6a7617eb051d587984f64be2ff830e49eb60721c3401e8944401e3c3a7cd3334f0334b6e28bfc9283aaff15d83b0933f1fd77b0f8c7059068fa3f94c3cb4
+DIST gawk-5.1.1.tar.xz 3250860 BLAKE2B 35eec6f4c9bf52496ac16e4b0e1b98947ae0dd46d0ab1df9ec13ede24374a4917214e492182a16e25fc515fa62a765340914feac16a006d980ba1328634a5291 SHA512 794538fff03fdb9a8527a6898b26383d01988e8f8456f8d48131676387669a8bb3e706fa1a17f6b6316ddba0ebe653c24ad5dd769f357de509d6ec25f3ff1a43
 EBUILD gawk-5.1.0.ebuild 2272 BLAKE2B eefcb6bd789cc7681873db57a83d1a9e1b00f4f2bc2b2d7df67252537f87f99436e0922abfb61ceba1ea21e80090d605df726f23ba17a002501f802c9ba2f06b SHA512 9ed71f1ef8e5178df8332d328fb037c39b8f7017a8bd3020867c1210ba26ca6d7272de26b26b5892b6965c21019403754c34864dc0aa7c0ff124e212abc876cf
+EBUILD gawk-5.1.1-r1.ebuild 2431 BLAKE2B f2a48d0d138bd18da5698c3cc821ce6e98148bb543b6fa391385b2a6d6f9ab27f4dabc1c3d21096c123c143a70a977f77d3e5ffce394e9da0b243b9aecb440f5 SHA512 b92e9db130955698c2274b32c7eef9fcb21c24c9c1e90f5b8646ac64156f31b8b363aa2e9a8fecbd7ac5839416243e7cd136cb5dd5a8fb7d70598cc88019fb20
+EBUILD gawk-5.1.1.ebuild 2280 BLAKE2B 32860987ff3cbb1ba0c6bc7c35432a229f1eff36aff50b2ad42a7d39f33c785f30a9ab53a96315ce6aa63f090b062e23d0a6132362004658f07d70655342fa3a SHA512 f847f241617b0368c06d1af0453160b96a22f2afb29d8ae9df1119416935f110a1e9a0bc0c331bd14ccfe85807e8dbcef53d15e2a2a510fee239a02909cd3d6d
 MISC metadata.xml 348 BLAKE2B dd212d42a4218147703b0dd20699b3040aa7fa6e214d26b7919e7e547a71d4ba22f827aa952952ad97314f90444fb27dbd79da73988f33084c457e1a358b5d1c SHA512 8a6da25157316d3caf69f2a2f68c93d98ba76e89304237b2df04032db39849349c1911e69037da4d8789d8c284792de1071e7eda66e62f2be5523806c6f13223
diff --git a/sys-apps/gawk/gawk-5.1.1-r1.ebuild b/sys-apps/gawk/gawk-5.1.1-r1.ebuild
new file mode 100644
index 000000000000..c8b984dd637c
--- /dev/null
+++ b/sys-apps/gawk/gawk-5.1.1-r1.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="GNU awk pattern-matching language"
+HOMEPAGE="https://www.gnu.org/software/gawk/gawk.html"
+SRC_URI="mirror://gnu/gawk/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="mpfr nls readline"
+
+RDEPEND="
+	mpfr? (
+		dev-libs/gmp:=
+		dev-libs/mpfr:=
+	)
+	readline? ( sys-libs/readline:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=sys-apps/texinfo-6.7
+	>=sys-devel/bison-3.5.4
+	nls? ( sys-devel/gettext )
+"
+
+src_prepare() {
+	default
+
+	# Use symlinks rather than hardlinks, and disable version links
+	sed -i \
+		-e '/^LN =/s:=.*:= $(LN_S):' \
+		-e '/install-exec-hook:/s|$|\nfoo:|' \
+		Makefile.in doc/Makefile.in || die
+
+	# bug #413327
+	sed -i '/^pty1:$/s|$|\n_pty1:|' test/Makefile.in || die
+
+	# Fix typo in configure
+	# https://lists.gnu.org/archive/html/bug-gawk/2021-10/msg00022.html
+	sed -i -e 's/AR_FLAGS = /AR_FLAGS=/' configure || die
+
+	# Fix standards conflict on Solaris
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		sed -i \
+			-e '/\<_XOPEN_SOURCE\>/s/1$/600/' \
+			-e '/\<_XOPEN_SOURCE_EXTENDED\>/s/1//' \
+			extension/inplace.c || die
+	fi
+}
+
+src_configure() {
+	# Avoid automagic dependency on libsigsegv
+	export ac_cv_libsigsegv=no
+
+	local myeconfargs=(
+		--libexec='$(libdir)/misc'
+		$(use_with mpfr)
+		$(use_enable nls)
+		$(use_with readline)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	# Automatic dodocs barfs
+	rm -rf README_d || die
+
+	default
+
+	# Install headers
+	insinto /usr/include/awk
+	doins *.h
+	rm "${ED}"/usr/include/awk/config.h || die
+}
+
+pkg_postinst() {
+	# Symlink creation here as the links do not belong to gawk, but to any awk
+	if has_version app-admin/eselect && has_version app-eselect/eselect-awk ; then
+		eselect awk update ifunset
+	else
+		local l
+		for l in "${EROOT}"/usr/share/man/man1/gawk.1* "${EROOT}"/usr/bin/gawk ; do
+			if [[ -e ${l} ]] && ! [[ -e ${l/gawk/awk} ]] ; then
+				ln -s "${l##*/}" "${l/gawk/awk}" || die
+			fi
+		done
+
+		if ! [[ -e ${EROOT}/bin/awk ]] ; then
+			ln -s "../usr/bin/gawk" "${EROOT}/bin/awk" || die
+		fi
+	fi
+}
+
+pkg_postrm() {
+	if has_version app-admin/eselect && has_version app-eselect/eselect-awk ; then
+		eselect awk update ifunset
+	fi
+}
diff --git a/sys-apps/gawk/gawk-5.1.1.ebuild b/sys-apps/gawk/gawk-5.1.1.ebuild
new file mode 100644
index 000000000000..0d846599ecd1
--- /dev/null
+++ b/sys-apps/gawk/gawk-5.1.1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="GNU awk pattern-matching language"
+HOMEPAGE="https://www.gnu.org/software/gawk/gawk.html"
+SRC_URI="mirror://gnu/gawk/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="mpfr nls readline"
+
+RDEPEND="
+	dev-libs/gmp:0=
+	mpfr? ( dev-libs/mpfr:0= )
+	readline? ( sys-libs/readline:0= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=sys-apps/texinfo-6.7
+	>=sys-devel/bison-3.5.4
+	nls? ( sys-devel/gettext )
+"
+
+src_prepare() {
+	default
+
+	# Use symlinks rather than hardlinks, and disable version links
+	sed -i \
+		-e '/^LN =/s:=.*:= $(LN_S):' \
+		-e '/install-exec-hook:/s|$|\nfoo:|' \
+		Makefile.in doc/Makefile.in || die
+
+	# bug #413327
+	sed -i '/^pty1:$/s|$|\n_pty1:|' test/Makefile.in || die
+
+	# Fix standards conflict on Solaris
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		sed -i \
+			-e '/\<_XOPEN_SOURCE\>/s/1$/600/' \
+			-e '/\<_XOPEN_SOURCE_EXTENDED\>/s/1//' \
+			extension/inplace.c || die
+	fi
+}
+
+src_configure() {
+	# Avoid automagic dependency on libsigsegv
+	export ac_cv_libsigsegv=no
+
+	local myeconfargs=(
+		--libexec='$(libdir)/misc'
+		$(use_with mpfr)
+		$(use_enable nls)
+		$(use_with readline)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	# Automatic dodocs barfs
+	rm -rf README_d || die
+
+	default
+
+	# Install headers
+	insinto /usr/include/awk
+	doins *.h
+	rm "${ED}"/usr/include/awk/config.h || die
+}
+
+pkg_postinst() {
+	# Symlink creation here as the links do not belong to gawk, but to any awk
+	if has_version app-admin/eselect && has_version app-eselect/eselect-awk ; then
+		eselect awk update ifunset
+	else
+		local l
+		for l in "${EROOT}"/usr/share/man/man1/gawk.1* "${EROOT}"/usr/bin/gawk ; do
+			if [[ -e ${l} ]] && ! [[ -e ${l/gawk/awk} ]] ; then
+				ln -s "${l##*/}" "${l/gawk/awk}" || die
+			fi
+		done
+
+		if ! [[ -e ${EROOT}/bin/awk ]] ; then
+			ln -s "../usr/bin/gawk" "${EROOT}/bin/awk" || die
+		fi
+	fi
+}
+
+pkg_postrm() {
+	if has_version app-admin/eselect && has_version app-eselect/eselect-awk ; then
+		eselect awk update ifunset
+	fi
+}
diff --git a/sys-apps/hwloc/Manifest b/sys-apps/hwloc/Manifest
index 7dcc47219b00..ab24a1c4b7f0 100644
--- a/sys-apps/hwloc/Manifest
+++ b/sys-apps/hwloc/Manifest
@@ -2,7 +2,9 @@ AUX hwloc-1.8.1-gl.patch 542 BLAKE2B d0264d6ef139add1b76befd8f8b440dd6c4b994bea6
 DIST hwloc-1.11.13.tar.bz2 4120436 BLAKE2B a6a09f7d6abeaa9d23df555cfd2186ae61f0f67f83fa8f1aa4bc29376b233a8511f11745f35064f39545c7e62e9d271c1334b6906712028729e138e41d1f212f SHA512 dd38bcc9a5df2dcfd3bbd828ab13fdb1c1d21747a0b62e6c87df95d2835c0472590344ff5bda4f6c28e597eaba1ea11c0bc96907ad45f1215f51f95ac9f58138
 DIST hwloc-2.3.0.tar.bz2 6414781 BLAKE2B 60bc80ae73d0ae9ff9a438474efe682dfff28149b843645c928d4c5531f25c7763311816d5c86028efa9e07aa86935dbb6cff56ec429ee607ce4e5b5b88d4bbe SHA512 ecb0950cd08eab7d97f7cbef9db0dc31cb5b4debedaae6f48814625ee5da0153fdc1f863fa84c5d59b76634e877a348fa556f3c8c29fc43bc6ae7211c313906c
 DIST hwloc-2.5.0.tar.bz2 6688349 BLAKE2B 684367afa5fc056b9bf04b3a95bd8239ec70127d5e582948ca16a09323614ad0ef77278a120544af0a740b456f1ba24bffc861b9f132293fafb7da0597d0b688 SHA512 9e8b829868cb9f5fd2fe84d8515d0dc8725ddc84c788a61c1e9e918eb2b29659eb73cf22a4189e6b887f5bfa3255c206f4ba924bd7fe2c88c185f4308c0949cd
+DIST hwloc-2.6.0.tar.bz2 6728585 BLAKE2B 96099ae3527e11a83adc068e07756752d2effa38b4bae174045e5142a3457af8790e9fd3d778ff2d91708101aaf6e108affed7688918195e0f2bdbd55235ad46 SHA512 3f35ee685507469e2c7d4a2ab4c339eff24123b4bc21d96bc53fd2737a36bdd371f1e1e4440b410ecac6cf1881562187243bfbf846203cb3702a4c4c7be0d5df
 EBUILD hwloc-1.11.13.ebuild 2167 BLAKE2B 0518fb6472ee433835781125b914e68c788e5d219c5a120ddf99df6d3770de279c769a0c4fdfa6638a0b747190adf9f32e090cf1f4ecfc5d678a8f09dcb22058 SHA512 cad8bbd45d68521c0e5aa1fbdbdb763eeafdcb7b406aed1fd1d61dde9285d523da2e031c907f9dc5729d921298dafff126a1b493b66b21f0c7bd00e67f50d03a
 EBUILD hwloc-2.3.0.ebuild 2926 BLAKE2B 42a8053f8baa463ccc1805d3586698d7e99e57498d14ff2c633148b258133a6ddd6f0370a15e6dc3d0ea87827f4229e40b23e1f21e8aaa1d1a9a282fa2883bae SHA512 8f855c6dca0daf997c37f0dac6f295698b2c3037c270ba12a20978ac61d82f98485bb082c68407c0609fdc1c585dabf491d653bb188ea9d4f90d82a931d55bb0
 EBUILD hwloc-2.5.0.ebuild 2929 BLAKE2B d2700b93da84746f22b26ff5b37b63fe7dfa25a33a4bc6e5deda9695241807ceb3a58c4dc787cc8fcf841a5070ca5435f20e2d54a834d5184d2a953b31de74e4 SHA512 99aa8785173360b31b3bfb1503902c911abe9600f559519c90c3b85bd02d165bf0de210d2d4a24898d559ddd007c8fc41c9c3649298cd89f079714b87a84f144
+EBUILD hwloc-2.6.0.ebuild 2978 BLAKE2B 4c2bee72a5dc36d0f21a1bae9f30bcdb776841aec10ed1f85f310c381ac3e67e1dd2b7c9039b09350a9e3c695e8d53414269429d3ff065a0a860f06e77343f4f SHA512 e314467f21584298bd9143928e22f5a0208933ea16a7c2738d7acb0a4ddb802f7aed8395cfaa3a5592c4ab4d4b7db904b5706c513a82251b36c2987fe377a534
 MISC metadata.xml 1704 BLAKE2B 4b0dde09ca25988c711048ffef54dcb0ec39e3afde391bb68a288b13232f18339a6b2391c942a2ce261777f4575b973e7517e69277e7be852f44c807db62d5ed SHA512 70b020e6cc65180537d11e9f55f033e1c56cb5c708e7b643e38e83eab9e84bf0f4b8460b3b81e9b6cbb701a7be4a554214a1c6aac3bdb31be4e580321c798317
diff --git a/sys-apps/hwloc/hwloc-2.6.0.ebuild b/sys-apps/hwloc/hwloc-2.6.0.ebuild
new file mode 100644
index 000000000000..e9b6ea7e9d16
--- /dev/null
+++ b/sys-apps/hwloc/hwloc-2.6.0.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools bash-completion-r1 cuda flag-o-matic systemd toolchain-funcs multilib-minimal
+
+MY_PV="v$(ver_cut 1-2)"
+
+DESCRIPTION="displays the hardware topology in convenient formats"
+HOMEPAGE="https://www.open-mpi.org/projects/hwloc/"
+SRC_URI="https://www.open-mpi.org/software/${PN}/${MY_PV}/downloads/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0/15"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="cairo +cpuid cuda debug gl nvml +pci static-libs svg udev xml X"
+
+# opencl support dropped with x11-drivers/ati-drivers being removed (bug #582406).
+# Anyone with hardware is welcome to step up and help test to get it re-added.
+RDEPEND=">=sys-libs/ncurses-5.9-r3:0[${MULTILIB_USEDEP}]
+
+	cairo?		( >=x11-libs/cairo-1.12.14-r4[X?,svg?,${MULTILIB_USEDEP}] )
+	cuda?		( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1:= )
+	gl?		( x11-drivers/nvidia-drivers[static-libs,tools] )
+	nvml?		( x11-drivers/nvidia-drivers[${MULTILIB_USEDEP}] )
+	pci?		(
+				>=sys-apps/pciutils-3.3.0-r2[${MULTILIB_USEDEP}]
+				>=x11-libs/libpciaccess-0.13.1-r1[${MULTILIB_USEDEP}]
+			)
+	udev?	( virtual/libudev )
+	xml?		( >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+# 2.69-r5 for --runstatedir
+BDEPEND="
+	>=sys-devel/autoconf-2.69-r5
+	virtual/pkgconfig
+"
+
+PATCHES=( "${FILESDIR}/${PN}-1.8.1-gl.patch" )
+
+DOCS=( AUTHORS NEWS README VERSION )
+
+src_prepare() {
+	default
+
+	eautoreconf
+
+	if use cuda ; then
+		append-cflags "-I${ESYSROOT}/opt/cuda/include"
+		append-cppflags "-I${ESYSROOT}/opt/cuda/include"
+	fi
+}
+
+multilib_src_configure() {
+	# bug #393467
+	export HWLOC_PKG_CONFIG="$(tc-getPKG_CONFIG)"
+
+	if use cuda ; then
+		local -x LDFLAGS="${LDFLAGS}"
+		append-ldflags "-L${ESYSROOT}/opt/cuda/$(get_libdir)"
+	fi
+
+	local myconf=(
+		--disable-opencl
+		# netloc is deprecated upstream, about to be removed
+		# bug #796797
+		--disable-netloc
+		--disable-plugin-ltdl
+		--enable-plugins
+		--enable-shared
+		--runstatedir="${EPREFIX}/run"
+		$(multilib_native_use_enable cuda)
+		$(multilib_native_use_enable gl)
+		$(use_enable cairo)
+		$(use_enable cpuid)
+		$(use_enable debug)
+		$(use_enable udev libudev)
+		$(use_enable nvml)
+		$(use_enable pci)
+		$(use_enable static-libs static)
+		$(use_enable xml libxml2)
+		$(use_with X x)
+	)
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+}
+
+multilib_src_install_all() {
+	default
+
+	case ${ARCH} in
+		# hwloc-dump-hwdata binary only built on those arches, so don't install non-working unit.
+		amd64|x86)
+			systemd_dounit "${ED}/usr/share/hwloc/hwloc-dump-hwdata.service" ;;
+	esac
+
+	mv "${ED}"/usr/share/bash-completion/completions/hwloc{,-annotate} || die
+	bashcomp_alias hwloc-annotate \
+		hwloc-{diff,ps,compress-dir,gather-cpuid,distrib,info,bind,patch,calc,ls,gather-topology}
+	bashcomp_alias hwloc-annotate lstopo{,-no-graphics}
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sys-apps/i2c-tools/Manifest b/sys-apps/i2c-tools/Manifest
index f68216507dbd..2bc088561c63 100644
--- a/sys-apps/i2c-tools/Manifest
+++ b/sys-apps/i2c-tools/Manifest
@@ -1,5 +1,5 @@
 DIST i2c-tools-4.1.tar.xz 83576 BLAKE2B 0a9ed3bb335b61f6c17a6b6c705502ff008b4fb8bab6a5fde63163a32528b5214d92affc4b8d6cca29676dc7ba82dfa84be5f14943b7e81c8612a7d9419ac628 SHA512 83262bcfd94c2adf74517cc50095dd78221fa4d16a62397245d4a538de7463272abf4f6727024be8ab1ca8ecbfe647af85ba2a553e5b5e68a53e50dfcad20248
 DIST i2c-tools-4.2.tar.xz 87600 BLAKE2B 89f84ad07f4c042f67c308d48a402aa9ed46352062ddad3456d048730019e099e6eef626d487d802e07b100ae2c836e9aa6b2345950ff8744cbc0fe1a22616fb SHA512 5e230be4983c5c9c5718491d3ce9ee2e6205edea75c4097735eb32a25e522e37a074ef4cb61d2492707efebf0cb1b75ff65f1b2ae8c0bc1684a169526809a096
 EBUILD i2c-tools-4.1-r1.ebuild 1950 BLAKE2B 5c926d1ab2f68669edb32c18afa7f850019fcfd442831b2bfb59c09119a81c6c03102a76eabd5f4a80c6f0998c861960a2a042c4a43d736051d6d8af1963154c SHA512 7dfef8c4f41023505161146cb6a9ec7dfc945d75a76615aab35d4de2f371240be173276d15b4c18f3819e2e0f5998712bb0df2586d819e22baa9852149978f0d
-EBUILD i2c-tools-4.2.ebuild 1724 BLAKE2B f424d139dffd96c5a735c5f8456878a80f237343a5e715df5b9949ffe16da7c6795df6eaf730e787b726d6448bba20479b43e94c8936c5df4fbc19cdb1d1ae89 SHA512 4f44690fce213c37b65b815ea58898ba996686148c495f409ddc7f5e28ed89282bdd4c2c5c4177b11615f594c1fe43714c870ac5183b05f7bc271b3f859feba4
+EBUILD i2c-tools-4.2.ebuild 1723 BLAKE2B 34e6fbb2d6714b3388e57359968c88c2011fe9f486c1b2c68927e331f78aef5459699b6d3056a186321b20c7fbce11c3fde575eca588e647099824e418c39058 SHA512 d24ca25b10db462c3b64f243f97bc50e1823dc1ab042508a4986ffe580a382ddc5e3362f456e5adbaf9c30753f94f0744df14422690860ecc7ba5bbd70d55f14
 MISC metadata.xml 244 BLAKE2B 94b04f9b5ade506f66b25651b1fdabfaf11febaff3175956406893e90548e87145186ef43a617e24803bd22d9da3f90ea8d72cfea7847aea521974b3138e92ad SHA512 20225e64357a690e86df86aa4d784300459d28b775e3989f77fd31e752ef968de63e41b59bb3c78b331e817f9eceab6dd6ef01131451753a1b5d3a309770611a
diff --git a/sys-apps/i2c-tools/i2c-tools-4.2.ebuild b/sys-apps/i2c-tools/i2c-tools-4.2.ebuild
index 42aa13592a84..49fdd89041cc 100644
--- a/sys-apps/i2c-tools/i2c-tools-4.2.ebuild
+++ b/sys-apps/i2c-tools/i2c-tools-4.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.kernel.org/pub/software/utils/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="perl python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/sys-apps/isapnptools/files/isapnp.rc b/sys-apps/isapnptools/files/isapnp.rc
index 07dd2f391d33..07dd2f391d33 100755..100644
--- a/sys-apps/isapnptools/files/isapnp.rc
+++ b/sys-apps/isapnptools/files/isapnp.rc
diff --git a/sys-apps/logwatch/files/logwatch b/sys-apps/logwatch/files/logwatch
index 50ba356d3984..50ba356d3984 100755..100644
--- a/sys-apps/logwatch/files/logwatch
+++ b/sys-apps/logwatch/files/logwatch
diff --git a/sys-apps/mcstrans/files/mcstransd.init b/sys-apps/mcstrans/files/mcstransd.init
index dc516654e33f..dc516654e33f 100755..100644
--- a/sys-apps/mcstrans/files/mcstransd.init
+++ b/sys-apps/mcstrans/files/mcstransd.init
diff --git a/sys-apps/netkit-base/files/inetd.rc6 b/sys-apps/netkit-base/files/inetd.rc6
index e124cf8b303d..e124cf8b303d 100755..100644
--- a/sys-apps/netkit-base/files/inetd.rc6
+++ b/sys-apps/netkit-base/files/inetd.rc6
diff --git a/sys-apps/netplug/files/netplug-2 b/sys-apps/netplug/files/netplug-2
index 539f1465516a..539f1465516a 100755..100644
--- a/sys-apps/netplug/files/netplug-2
+++ b/sys-apps/netplug/files/netplug-2
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index b981d3aa936a..011420f21a73 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -10,6 +10,6 @@ DIST portage-3.0.20.tar.gz 1348818 BLAKE2B e8af0662d073110a921ef23865872b0440f5e
 DIST portage-3.0.28.tar.bz2 1153994 BLAKE2B 8d9e3af04acd9bb5fdb3cff5b928abbf707db13f6c25afdac4399ea47adb67b2621ebb733927b4f9386e3f285fa7daac0423ae3fb0509a9df747b41c82865313 SHA512 148484b0384672116f2f2187eaddb56f646548324cd5f6c8e187a02bc965fb2bea6632214aed9b40c615acb89eb6124ab831ad85c59bac9a416b02a07506669b
 EBUILD portage-3.0.18.ebuild 8756 BLAKE2B f4a457de8df4a6c79568de33f898c56016ef44fc44b8965befd5c15dd16b93a800c8797ebfaddb0cb6e81c1a6f7af68eb297d9399bad9aa534ea75117eba73e0 SHA512 40329720f7ea7538da334479835cf21560f2e3c3420863593cbaf7dfb454dae1b01293256622ee09c05d3e7d8949e4f2839d1d1bd0911ccb9d6e63254003790d
 EBUILD portage-3.0.20-r6.ebuild 9875 BLAKE2B 5057f1c542c443088fb5349692da20e01a113be85748e17d02c3034355d66bb6b94932baca8016d90d5f58b7d00baee5ee1dfd22842d3f25c31a8255808c26a4 SHA512 cb309c78a7f02df7b7b67b8ffbfb03b27106fef0a59ab89858e9be2d1257a2c9efe7bc6f0d2a9fdcb2c4ab9bc82387f2460270676dbdf3128552f20377c461b5
-EBUILD portage-3.0.28.ebuild 8529 BLAKE2B 51799634afff695c7890f7630db83fb021cda430fc54c088baad3ecda5ab8d56883bf829ce30e9b0eeba2d35e61512fa570a41821288df936a99518c9ddf6462 SHA512 1821f6ccbfb06ee5129a320ffc56c7f861016443870410f8a88d00cd422653ae5ea4463b430650bad84bbb67cb78250ead61a8e8f3bc5b3d75b201af5ab59295
+EBUILD portage-3.0.28.ebuild 8523 BLAKE2B 14c0cd474a8aa00e39056122f49478bfd88f8a049a0d02e0937ade01f748fd2db4bd9fe7d571b3589eefc3c4566e73615943f74ebe684bbd6a5da5951c38e9fd SHA512 dcb604e81580247fdbbabb93d0118ffa4829b12bc8bf514b8e5c089da45fa58bebedc230ff025875d69ed6b30d9566d363f90d2f0a22abfa831888bc3543657c
 EBUILD portage-9999.ebuild 7797 BLAKE2B 9bd82de59c964dbcd36f9048baa9723371e52feb38e2abc18f49c0db92b52eb5a15dbd806a36afab48ea65db9440fe8da30ea328ee7dda6027df70621e30c072 SHA512 9bf7e45bc04a0c122ceb0aee8994558dc8d1f0cbe2d2abd69b1bce915080fcbdcaf2456d5f6c6056fc9792ca09a069a7a40bd01f6075bb1c3f06b0f107815f61
 MISC metadata.xml 1483 BLAKE2B 5f164044c11b8fc7a103c459be58268403dab87fbbfeedd0f5fa4d1a4edf9ec7d4983cc7d5a3e6d298b268859fc1eb91723f0c98313e9b3b5dfb0368aedb1a20 SHA512 284a46b4708fc88734ca87f041fb6a88bc4a7e6a50ce03533a1eef9602694adcb09679b665a3793e4609ea85fd41b84438b27479ffa00ac53cbf9d4bb89a3402
diff --git a/sys-apps/portage/portage-3.0.28.ebuild b/sys-apps/portage/portage-3.0.28.ebuild
index 7fe9d4cd4534..b7767bce94e4 100644
--- a/sys-apps/portage/portage-3.0.28.ebuild
+++ b/sys-apps/portage/portage-3.0.28.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
 SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2"
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
 SLOT="0"
 IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux test xattr"
 RESTRICT="!test? ( test )"
diff --git a/sys-apps/preload/files/preload-0.6.4.init.in-r2 b/sys-apps/preload/files/preload-0.6.4.init.in-r2
index f8cae0c4d93e..f8cae0c4d93e 100755..100644
--- a/sys-apps/preload/files/preload-0.6.4.init.in-r2
+++ b/sys-apps/preload/files/preload-0.6.4.init.in-r2
diff --git a/sys-apps/restorecond/files/restorecond.init b/sys-apps/restorecond/files/restorecond.init
index 2179010627bd..2179010627bd 100755..100644
--- a/sys-apps/restorecond/files/restorecond.init
+++ b/sys-apps/restorecond/files/restorecond.init
diff --git a/sys-apps/sandbox/Manifest b/sys-apps/sandbox/Manifest
index 2d8b6bd2ff16..8a4aa14bd1f1 100644
--- a/sys-apps/sandbox/Manifest
+++ b/sys-apps/sandbox/Manifest
@@ -3,8 +3,10 @@ DIST sandbox-2.24.tar.xz 438408 BLAKE2B 5e725d17da0abc06d56216f4df2f4034076f5016
 DIST sandbox-2.25.tar.xz 436004 BLAKE2B c9c7d351cdefbb2b1a585904c38742a5a3bde50d3d690c57cff9cdc71ffb822e78a2b56c47afd03fbc70834de5dda13c5a300d9d6b35e09ec400a050d4f8e82c SHA512 4e998c4d9ba6eb69369cc49849060a2e90535eae91fbb64c4d46371fe0ed5182413b14674f10c773fd997b6895bc870ccb23586351f5bb06b69dc11a0cddbe1d
 DIST sandbox-2.26.tar.xz 444412 BLAKE2B 3bc88d86ba4e2522895c4448dff6da2cffceb912e5ff9610fe4c3aea255ffd9b9ca9bbe8e45d94508f45e9c141aa6945a9a8d82cba0f3ca102ff6a1624c84161 SHA512 f20766daf2ce43753772a184c86a7b6847f96ab7b60b202616e15d791bc1f770162035a9b1ffe38765dff8d2567ad971a9a2bdeba9a8769845a758fcd95206fa
 DIST sandbox-2.27.tar.xz 448948 BLAKE2B 03a311c8c7c8719bac398e39ce49e7149bdaa1d5b2811f395eb2251a32aabba995f97c3d5d27461aadb64bf43adf2b0cbaa7c2f141dd86f64f8dd326422ac104 SHA512 2a53e6fc87cec975962737b1fadc447d86985d27b18ad2caed711116da2ba435f54db0f7dadb02664b2638b9dc77752831cd4820390f5c3e61a42429e13462a7
+DIST sandbox-2.28.tar.xz 450840 BLAKE2B 1a144db1dcd140ce393f47b224c4389693bd3db6d056749968a9e78730b1075192148aa63fdfd5ab93893dfb96a87bcc36bee8b4540abefca0590a8def8365f2 SHA512 eaac54fbc35f51da3c94bfa10e0556f0fd39c20660fea2aa7d3cbf76dd3e4c9fb4a16cc198425988b79313f9331af030e1dca431c3f057ee4a04927c96897895
 EBUILD sandbox-2.24.ebuild 1617 BLAKE2B 5bb22638ea5e5735242e538cb8e0e2598a38237001162fa0cd4d4c3dba6ddb7b9d4607b04ab20b00cb2e7b17c7a759808117d6c0c521a7ba6843fb42e29d1ab2 SHA512 845b5ae83d2c12dc7101d01b76af6693ae888237eda43d2207ef4a1fd3c121d79c554cbb1e7395365867cb96b6a27bbae1c26ff79c301ed00e536acef396dae9
 EBUILD sandbox-2.25.ebuild 1615 BLAKE2B b42f819adc73df7f3c7b0f2654eeaa41f23840763c3fe5abe64ba147b20cf74f1df7411a1309d2581b4264a9a5152eda6386551acadfc04125d31251557c10b6 SHA512 df4789dff85f482c7e9750d8581d2b74686bef82a5b4dd15d1a4b7923f7a2541f68afa5e5b5c091ccdab8234eba2708110401bad527c99e25e236dd8921e8abd
-EBUILD sandbox-2.26.ebuild 1544 BLAKE2B 379c4679d0c7c98aa3cbe454f8d3bc3a147b5879aea7e004528a1d0616fb8ec38a4f08dceef9123cbd7b763ab1ea3dde0b6845ae61b053e59cc9f3887e608560 SHA512 2cbfe0f5d0398b684034a67031f9d3ac0f14d3a8b2f6c8615413d5dc73774da7ce2b7995b9d1f10f9a16686b59e4c4e4b83d9590bc63d85a75e8e2eac16eab4a
-EBUILD sandbox-2.27.ebuild 1649 BLAKE2B 64bd35d61dbbd9084a9459ed3a67b9049b0c84ffb94fc76978919f060da0e79625cb94fe1cb3b6a6c246dd9ebab0363c261ab8461f7348f15828cf0252309eee SHA512 6fc2fa2b81f247da62ce318a34d37aabef92e9df7114c7a2c830477ab51daeb4abcaab4c0c2db9476d84624656e488fb201af77b7c4eaafa981c7e099718b46a
+EBUILD sandbox-2.26.ebuild 1455 BLAKE2B d1d05a952f34ec697b26176ba6183006d636d546af197277d30a1811b7200a45d1327db669ac411174e74989024f4c87d69ffbd68834e7a76fdf5a8ce8bd0446 SHA512 8fb95b39aad62153208436bb73c84fd6d891333cb251958ac2ee71913cdc59b98002f53dbb471fbbb2e76ae954b34c3cedc8c94b4f5d6e4fb65ffd40e4c8b3d7
+EBUILD sandbox-2.27.ebuild 1560 BLAKE2B 26d1f86f4161cd33f748a544556a05bf2392722a709cff67ab34ba065bab868d7cfcee374381291caf303d7d195fcf4359d84d62984c18a99c76df161c76fe06 SHA512 4148963c26accefcf5e752c23ce306360487477e7810b121cfb2e8c4c8efe0793332ffcedbb33206dfb5ff0d25e0ef5e7772f7b10f6d08179e20146a8dcaabca
+EBUILD sandbox-2.28.ebuild 1560 BLAKE2B 26d1f86f4161cd33f748a544556a05bf2392722a709cff67ab34ba065bab868d7cfcee374381291caf303d7d195fcf4359d84d62984c18a99c76df161c76fe06 SHA512 4148963c26accefcf5e752c23ce306360487477e7810b121cfb2e8c4c8efe0793332ffcedbb33206dfb5ff0d25e0ef5e7772f7b10f6d08179e20146a8dcaabca
 MISC metadata.xml 377 BLAKE2B fcbc91501a4a61bfa3c3cc01b0746f5f638093933cf8a9ba1e6206071cb0482c9ba18c5c10541d934327cf805ee0e40c010b3f25a221ab63fefa2fd9f39da0d7 SHA512 92aa26a3200dd1508fb86da0e0bc70be66ccbcf66593ee6833102c9961ac17c8a99c5b070a2cd2e79dba8e5daa0316cdb6744baa3fbd9342953fcc00b1277d35
diff --git a/sys-apps/sandbox/sandbox-2.26.ebuild b/sys-apps/sandbox/sandbox-2.26.ebuild
index 5203f1537c28..414c25760264 100644
--- a/sys-apps/sandbox/sandbox-2.26.ebuild
+++ b/sys-apps/sandbox/sandbox-2.26.ebuild
@@ -42,9 +42,7 @@ multilib_src_configure() {
 
 multilib_src_test() {
 	# Default sandbox build will run with --jobs set to # cpus.
-	# -j1 to prevent test faiures caused by file descriptor
-	# injection GNU make does.
-	emake -j1 check TESTSUITEFLAGS="--jobs=$(makeopts_jobs)"
+	emake check TESTSUITEFLAGS="--jobs=$(makeopts_jobs)"
 }
 
 multilib_src_install_all() {
diff --git a/sys-apps/sandbox/sandbox-2.27.ebuild b/sys-apps/sandbox/sandbox-2.27.ebuild
index ed70783105b7..83e908988817 100644
--- a/sys-apps/sandbox/sandbox-2.27.ebuild
+++ b/sys-apps/sandbox/sandbox-2.27.ebuild
@@ -46,9 +46,7 @@ multilib_src_configure() {
 
 multilib_src_test() {
 	# Default sandbox build will run with --jobs set to # cpus.
-	# -j1 to prevent test faiures caused by file descriptor
-	# injection GNU make does.
-	emake -j1 check TESTSUITEFLAGS="--jobs=$(makeopts_jobs)"
+	emake check TESTSUITEFLAGS="--jobs=$(makeopts_jobs)"
 }
 
 multilib_src_install_all() {
diff --git a/sys-apps/sandbox/sandbox-2.28.ebuild b/sys-apps/sandbox/sandbox-2.28.ebuild
new file mode 100644
index 000000000000..83e908988817
--- /dev/null
+++ b/sys-apps/sandbox/sandbox-2.28.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic multilib-minimal multiprocessing
+
+DESCRIPTION="sandbox'd LD_PRELOAD hack"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Sandbox"
+SRC_URI="https://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+nnp"
+
+DEPEND="app-arch/xz-utils
+	>=app-misc/pax-utils-0.1.19" #265376
+RDEPEND=""
+
+has sandbox_death_notice ${EBUILD_DEATH_HOOKS} || EBUILD_DEATH_HOOKS+=" sandbox_death_notice"
+
+sandbox_death_notice() {
+	ewarn "If configure failed with a 'cannot run C compiled programs' error, try this:"
+	ewarn "FEATURES='-sandbox -usersandbox' emerge sandbox"
+}
+
+src_prepare() {
+	default
+
+	if ! use nnp ; then
+		sed -i 's:PR_SET_NO_NEW_PRIVS:___disable_nnp_hack:' src/sandbox.c || die
+	fi
+
+	# sandbox uses `__asm__ (".symver "...` which does
+	# not play well with gcc's LTO: https://gcc.gnu.org/PR48200
+	append-flags -fno-lto
+	append-ldflags -fno-lto
+}
+
+multilib_src_configure() {
+	filter-lfs-flags #90228
+
+	ECONF_SOURCE="${S}" econf
+}
+
+multilib_src_test() {
+	# Default sandbox build will run with --jobs set to # cpus.
+	emake check TESTSUITEFLAGS="--jobs=$(makeopts_jobs)"
+}
+
+multilib_src_install_all() {
+	doenvd "${FILESDIR}"/09sandbox
+
+	dodoc AUTHORS ChangeLog* README.md
+}
+
+pkg_postinst() {
+	mkdir -p "${EROOT}"/var/log/sandbox
+	chown root:portage "${EROOT}"/var/log/sandbox
+	chmod 0770 "${EROOT}"/var/log/sandbox
+}
diff --git a/sys-apps/setserial/files/serial-2.17-r4 b/sys-apps/setserial/files/serial-2.17-r4
index fca37d67a480..fca37d67a480 100755..100644
--- a/sys-apps/setserial/files/serial-2.17-r4
+++ b/sys-apps/setserial/files/serial-2.17-r4
diff --git a/sys-apps/usbguard/files/usbguard-0.7.6-usbguard-dbus.openrc b/sys-apps/usbguard/files/usbguard-0.7.6-usbguard-dbus.openrc
index 2c923123c186..2c923123c186 100755..100644
--- a/sys-apps/usbguard/files/usbguard-0.7.6-usbguard-dbus.openrc
+++ b/sys-apps/usbguard/files/usbguard-0.7.6-usbguard-dbus.openrc
diff --git a/sys-apps/usbguard/files/usbguard-0.7.6-usbguard.openrc b/sys-apps/usbguard/files/usbguard-0.7.6-usbguard.openrc
index 3ea514cce169..3ea514cce169 100755..100644
--- a/sys-apps/usbguard/files/usbguard-0.7.6-usbguard.openrc
+++ b/sys-apps/usbguard/files/usbguard-0.7.6-usbguard.openrc