gentoo resync : 22.01.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-01-22 20:28:19 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2021-01-22 20:28:19 +0000
commit: abaa75b10f899ada8dd05b23cc03205064394bc6 (patch)
tree: eca3dd248b73b92013cba00a0fcc1edf2696e19a /sys-apps
parent: 24fd814c326e282c4321965c31f341dad77e270d (diff)
99 files changed, 1189 insertions, 2085 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 04567a359aad..4acae0e6d44e 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/baselayout-prefix/Manifest b/sys-apps/baselayout-prefix/Manifest
index 58a269593c5e..3a82bf8160fb 100644
--- a/sys-apps/baselayout-prefix/Manifest
+++ b/sys-apps/baselayout-prefix/Manifest
@@ -1,4 +1,3 @@
-DIST baselayout-2.2.tar.bz2 40744 BLAKE2B 3a1dfdd64b45d5aa8fb3ff9781aa9b1218095874a0bb6d9dd0d2da4c447945272b25258b53b7ea130f3e1067c799fc4c0d14e577f3a3f749f19d72734136e6e9 SHA512 a5199c42e835d9f2683cc94f3c4c47ecdc392316c24e0932845736e2e90479b0c5c8ad72ead8e0537f097405b7d7548d00b87b7ff8c9e3651486e3c5c0970b36
 DIST baselayout-2.6.tar.bz2 31871 BLAKE2B 4a51d173dc5a2837f78cd1247b5eadd89e7d0b5f2dbc72e75f027b0c23a5db9a386c53e756e80240f36ad4d63e3fe421bf9510c18321d7a31fda140ad47b2860 SHA512 5cad5faf56871ae951120643e29db0c39fea6dc845b4755382bd469eca32639ec6cd0cd046d3c439a7cc607b18770036f9c256260d35beaffb094e23cb13740b
 DIST baselayout-prefix-395424f90c8ca6969589905cbf86d74fae9d7ea6.patch 1760 BLAKE2B 227ea5a9f70e927ba19de675f408ad01c4d934575cfeb780a525a4e24afd46d9d91d4e4acf773403cb6ac4a493b81da1cad787a5c0e41096056ad4e233b3cfc8 SHA512 77b4c3cad19251497808b6a07a384846f3ebb2282860d55197cee03d373b16622ef3b6c95e411e1cbb79702f10fe2e9c43cfe4175cca1db3ea6c06c6b2331ac9
 DIST baselayout-prefix-5926fe447541607ed137d67ca84080326584b2fc.patch 809 BLAKE2B 237eb610b6935ec5139299f1dccc6260b31a1d47a82390d713fc759ef37de986de8392a82068c70c1f63f382a9212103025fe019614796f5b6a3b4ed0f81f8b2 SHA512 6cd1bf81d8619be27c20fcd703be9a97cc6129d9c13402172e7f16adf6e9b9eb0238edfd311ca8b98b3898876d2bf9686a2a3905510d26608773a3da5233ee95
@@ -7,7 +6,5 @@ DIST baselayout-prefix-a054fcc408ad48f775f7379834385c6a707d7a53.patch 1166 BLAKE
 DIST baselayout-prefix-bb4c4f5f45b6798f5c9658e0e862077c404c675c.patch 1168 BLAKE2B 241d3dd665a7373563fb413ea9613a0597deb5b1b5213567ed0abf1edb00c495acec9570f5c3b2365c00683cbc32fb9e518666928c73640bebe99d3345fcd764 SHA512 96c4d63b5782e388882760cefd57157927543570a920f66c88cf3c58335c7e05918805510dc6e07f07f06564756482d055987c99b0cca7c31b432936558cadc6
 DIST baselayout-prefix-c88ceddbfc6a965dc0153aef21e012e774d9e30c.patch 2499 BLAKE2B 18f26331aec2b74c119f6064c79540f9a4dd90796841e8db10450b58b0fa7b7e10e6fd6c96e1f1e4b8d47c7cdc31628cf262a55eaca56e0ce23d6505ac73b0e1 SHA512 abd262fcbd3a7df57a9abbe54474517123e8cd8946f377c6e5be848b48b8638636b4e5a424ad76b59d61653c44473ad1423959ff8939ea388ede9514895e1ce2
 DIST baselayout-prefix-c9338e89cdb603c1e08998bba28fbc977a62fc51.patch 9370 BLAKE2B 0e665e08db0ddec93604103d65d6e5a9249afdd55b22106b95e232128b724acd680bc875401cba15bc9aefcc19eddc4cf55b056a83e00a5a3862352470321d04 SHA512 d91c9537f445a8fd4308d5392fc42149e8d08c9ee3282e382995cd32ee531d77d73a94437c9b436b67e8c44aa598147ef63cc79a72ec2e9a83b078c5776ede51
-EBUILD baselayout-prefix-2.2-r5.ebuild 2874 BLAKE2B 5f5cd3610bdd77da24715acfad1f862f21af3538f4ee10fb3b45ed54d353508aa284a5a32ec45813fef97b9bb3acf04256a0405385c0ea51fce77f9c4a0a5cc7 SHA512 3fac056af962a325c494e01c1cfe88ba209f1ee60a4c2a906a62a9e6d7fd77e061a4413d380da081b433b7c01f4a40d9090fb5d7b19048eab9d733be1170bf38
-EBUILD baselayout-prefix-2.6-r1.ebuild 10988 BLAKE2B 80936e19891b8271bdacd53eefcf59f185d25365bde1f0c408d6751bac87863c9aa97f2b04d3e50f84ee3aa56e54f3ceb5a9a8e27e597eeb70933a6f379aba98 SHA512 c164e27911fc38c698fde0b78ec67ed2a4c86ec71935fdd25bb0ed4967417584b5ee38caad9c467a8d84af281f03b8d47af8b7ef1a417602bfcfdbc3f053d990
-EBUILD baselayout-prefix-2.6-r2.ebuild 11089 BLAKE2B d0160e71164c386d2c5d14f239a1bfcb3b464cc5fa2d206def92afa3e6f2321c018e5053f2156db1492bae8735c54f6db10cc2006a911cd4cd1184e655414207 SHA512 11b19a4ccda61fa358d039ddaf5dcc47055f25401d1cdbd8b3db70406de04ae7a164ca3b5f3e82305c27f66ceaf9588dacf4cadbf01238c77c6ead082e5636d9
+EBUILD baselayout-prefix-2.6-r2.ebuild 11130 BLAKE2B e47bc88ea12c6779862175f3d194235d02a16a63c46f95c206d709b78687f96537fcb4134309fb854f5d6ecad6faaaccf4714748b288e66146acaad3f88593bb SHA512 cc044b70eedd10ca4eda69b0fba5223d7dbbfe77403943d52c3dddc587def378832177a594de3350698ebdc1164a5054e27b0f4fd1a592d19e96ff6848cabd6a
 MISC metadata.xml 317 BLAKE2B 023b00acfd1afc0255ae1356c8a9627a2d3d81e762b8a7bbd155c2e5e626c4a7663ced36ac04590a127e3a845122a17e07f7c0614dec091919e958883e71ced2 SHA512 3893a08cbe1db5c7888ba808a3cf04c20c8ba5988078791a707978f91e56bf2049244e30096617bf5906e3ff4257538407a02645ceb1a49a61ffef57980bcb27
diff --git a/sys-apps/baselayout-prefix/baselayout-prefix-2.2-r5.ebuild b/sys-apps/baselayout-prefix/baselayout-prefix-2.2-r5.ebuild
deleted file mode 100644
index 775cc96e9530..000000000000
--- a/sys-apps/baselayout-prefix/baselayout-prefix-2.2-r5.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils multilib libtool
-
-MY_P=${P/-prefix/}  # just use "upstream" sources
-DESCRIPTION="Minimal baselayout for Gentoo Prefix installs"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="mirror://gentoo/${MY_P}.tar.bz2
-	https://dev.gentoo.org/~vapier/dist/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~arm ~arm64 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-
-RDEPEND="sys-apps/gentoo-functions"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_preinst() {
-	# This is written in src_install (so it's in CONTENTS), but punt all
-	# pending updates to avoid user having to do etc-update (and make the
-	# pkg_postinst logic simpler).
-	rm -f "${EROOT}"/etc/._cfg????_gentoo-release
-}
-
-src_install() {
-	# make functions.sh available in /etc/init.d (from gentoo-functions)
-	# Note: we cannot replace the symlink with a file here, or Portage will
-	# config-protect it, and etc-update can't handle symlink to file updates
-	dodir etc/init.d
-	dosym ../../lib/gentoo/functions.sh /etc/init.d/functions.sh
-
-	dodir etc
-	sed \
-		-e "/PATH=/!s:/\(etc\|usr/bin\|bin\):\"${EPREFIX}\"/\1:g" \
-		-e "/PATH=/s|\([:\"]\)/|\1${EPREFIX}/|g" \
-		etc/profile > "${ED}"/etc/profile || die
-	sed \
-		-e "/PATH=.*\/sbin/s|\"$|:/usr/sbin:/sbin\"|" \
-		-e "/PATH=.*\/bin/s|\"$|:/usr/bin:/bin\"|" \
-		-i "${ED}"/etc/profile || die
-	dodir etc/env.d
-	sed \
-		-e "s:/\(etc/env.d\|opt\|usr\):${EPREFIX}/\1:g" \
-		-e "/^PATH=/s|\"$|:${EPREFIX}/usr/sbin:${EPREFIX}/sbin\"|" \
-		etc/env.d/00basic > "${ED}"/etc/env.d/00basic || die
-	dodoc ChangeLog.svn
-
-	# add the host OS MANPATH
-	if [[ -d "${ROOT}"/usr/share/man ]] ; then
-		echo 'MANPATH="/usr/share/man"' > "${ED}"/etc/env.d/99basic || die
-	fi
-
-	# rc-scripts version for testing of features that *should* be present
-	echo "Gentoo Prefix Base System release ${PV}" > "${ED}"/etc/gentoo-release
-
-	# FHS compatibility symlinks stuff
-	dosym /var/tmp /usr/tmp
-
-	# add a dummy to avoid Portage shebang errors
-	dodir sbin
-	cat > "${ED}"/sbin/runscript <<- EOF
-		#!/usr/bin/env sh
-		source "${EPREFIX}/lib/gentoo/functions.sh"
-
-		eerror "runscript/openrc-run not supported by Gentoo Prefix Base System release ${PV}" 1>&2
-		exit 1
-	EOF
-	chmod 755 "${ED}"/sbin/runscript || die
-	cp "${ED}"/sbin/{runscript,openrc-run} || die
-}
-
-pkg_postinst() {
-	# Take care of the etc-update for the user
-	if [ -e "${EROOT}"/etc/._cfg0000_gentoo-release ] ; then
-		mv "${EROOT}"/etc/._cfg0000_gentoo-release "${EROOT}"/etc/gentoo-release
-	fi
-
-	# baselayout leaves behind a lot of .keep files, so let's clean them up
-	find "${EROOT}"/lib/rcscripts/ -name .keep -exec rm -f {} + 2>/dev/null
-	find "${EROOT}"/lib/rcscripts/ -depth -type d -exec rmdir {} + 2>/dev/null
-}
diff --git a/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r1.ebuild b/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r1.ebuild
deleted file mode 100644
index 902bfdcf5755..000000000000
--- a/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r1.ebuild
+++ /dev/null
@@ -1,336 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib
-
-# just use "upstream" sources
-MY_P=${P/-prefix/}
-MY_PN=${PN/-prefix/}
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Filesystem baselayout and init scripts"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-if [[ ${PV} = 9999 ]]; then
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${MY_PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://gitweb.gentoo.org/proj/${MY_PN}.git/snapshot/${MY_P}.tar.bz2"
-	KEYWORDS="~arm ~arm64 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="build kernel_FreeBSD kernel_linux +split-usr"
-
-my_prefix_commits=(
-	# commits in reverse order as listed by:
-	# git log --decorate=no --oneline --no-abbrev-commit origin/master..
-	a054fcc408ad48f775f7379834385c6a707d7a53 # also create etc/gentoo-release
-	5926fe447541607ed137d67ca84080326584b2fc # create usr/bin during layout-usrmerge
-	395424f90c8ca6969589905cbf86d74fae9d7ea6 # add prefix-stack support
-	95a8e95af948014d024842892be1405d656ab5fc # add prefix-guest support
-	c88ceddbfc6a965dc0153aef21e012e774d9e30c # sync prefix usage for Makefile target 'layout'
-	c9338e89cdb603c1e08998bba28fbc977a62fc51 # add prefix support per Makefile target 'install'
-)
-for my_c in ${my_prefix_commits[*]}
-do
-	SRC_URI+=" https://github.com/haubi/gentoo-baselayout/commit/${my_c}.patch -> ${PN}-${my_c}.patch"
-	PATCHES=( "${DISTDIR}/${PN}-${my_c}.patch" "${PATCHES[@]}" )
-done
-unset my_prefix_commits my_c
-
-pkg_setup() {
-	multilib_layout
-}
-
-# Create our multilib dirs - the Makefile has no knowledge of this
-multilib_layout() {
-	use prefix && return 0
-	local dir def_libdir libdir libdirs
-	local prefix prefix_lst
-	def_libdir=$(get_abi_LIBDIR $DEFAULT_ABI)
-	libdirs=$(get_all_libdirs)
-	: ${libdirs:=lib}	# it isn't that we don't trust multilib.eclass...
-
-	if [[ -z "${SYMLINK_LIB}" || ${SYMLINK_LIB} = no ]] ; then
-		prefix_lst=( "${EROOT}"{,usr/,usr/local/} )
-		for prefix in ${prefix_lst[@]}; do
-			for libdir in ${libdirs}; do
-				dir="${prefix}${libdir}"
-				if [[ -e "${dir}" ]]; then
-					[[ ! -d "${dir}" ]] &&
-						die "${dir} exists but is not a directory"
-					continue
-				fi
-				if ! use split-usr && [[ ${prefix} = ${EROOT} ]]; then
-					einfo "symlinking ${dir} to usr/${libdir}"
-					ln -s usr/${libdir} ${dir} ||
-						die " Unable to make ${dir} symlink"
-				else
-					einfo "creating directory ${dir}"
-					mkdir -p "${dir}" ||
-						die "Unable to create ${dir} directory"
-				fi
-			done
-		done
-		return 0
-	fi
-
-	[ -z "${def_libdir}" ] &&
-		die "your DEFAULT_ABI=$DEFAULT_ABI appears to be invalid"
-
-	# figure out which paths should be symlinks and which should be directories
-	local dirs syms exp d
-	for libdir in ${libdirs} ; do
-		if use split-usr ; then
-			exp=( {,usr/,usr/local/}${libdir} )
-		else
-			exp=( {usr/,usr/local/}${libdir} )
-		fi
-		for d in "${exp[@]}" ; do
-			# most things should be dirs
-			if [ "${SYMLINK_LIB}" = "yes" ] && [ "${libdir}" = "lib" ] ; then
-				[ ! -h "${d}" ] && [ -e "${d}" ] && dirs+=" ${d}"
-			else
-				[ -h "${d}" ] && syms+=" ${d}"
-			fi
-		done
-	done
-	if [ -n "${syms}${dirs}" ] ; then
-		ewarn "Your system profile has SYMLINK_LIB=${SYMLINK_LIB:-no}, so that means you need to"
-		ewarn "have these paths configured as follows:"
-		[ -n "${dirs}" ] && ewarn "symlinks to '${def_libdir}':${dirs}"
-		[ -n "${syms}" ] && ewarn "directories:${syms}"
-		ewarn "The ebuild will attempt to fix these, but only for trivial conversions."
-		ewarn "If things fail, you will need to manually create/move the directories."
-		echo
-	fi
-
-	# setup symlinks and dirs where we expect them to be; do not migrate
-	# data ... just fall over in that case.
-	if use split-usr ; then
-		prefix_lst=( "${EROOT}"{,usr/,usr/local/} )
-	else
-		prefix_lst=( "${EROOT}"{usr/,usr/local/} )
-	fi
-	for prefix in "${prefix_lst[@]}"; do
-		if [ "${SYMLINK_LIB}" = yes ] ; then
-			# we need to make sure "lib" points to the native libdir
-			if [ -h "${prefix}lib" ] ; then
-				# it's already a symlink!  assume it's pointing to right place ...
-				continue
-			elif [ -d "${prefix}lib" ] ; then
-				# "lib" is a dir, so need to convert to a symlink
-				ewarn "Converting ${prefix}lib from a dir to a symlink"
-				rm -f "${prefix}lib"/.keep
-				if rmdir "${prefix}lib" 2>/dev/null ; then
-					ln -s ${def_libdir} "${prefix}lib" || die
-				else
-					die "non-empty dir found where we needed a symlink: ${prefix}lib"
-				fi
-			else
-				# nothing exists, so just set it up sanely
-				ewarn "Initializing ${prefix}lib as a symlink"
-				mkdir -p "${prefix}" || die
-				rm -f "${prefix}lib" || die
-				ln -s ${def_libdir} "${prefix}lib" || die
-				mkdir -p "${prefix}${def_libdir}" #423571
-			fi
-		else
-			# we need to make sure "lib" is a dir
-			if [ -h "${prefix}lib" ] ; then
-				# "lib" is a symlink, so need to convert to a dir
-				ewarn "Converting ${prefix}lib from a symlink to a dir"
-				rm -f "${prefix}lib" || die
-				if [ -d "${prefix}lib32" ] ; then
-					ewarn "Migrating ${prefix}lib32 to ${prefix}lib"
-					mv "${prefix}lib32" "${prefix}lib" || die
-				else
-					mkdir -p "${prefix}lib" || die
-				fi
-			elif [ -d "${prefix}lib" ] && ! has lib32 ${libdirs} ; then
-				# make sure the old "lib" ABI location does not exist; we
-				# only symlinked the lib dir on systems where we moved it
-				# to "lib32" ...
-				case ${CHOST} in
-				*-gentoo-freebsd*) ;; # We want it the other way on fbsd.
-				i?86*|x86_64*|powerpc*|sparc*|s390*)
-					if [[ -d ${prefix}lib32 && ! -h ${prefix}lib32 ]] ; then
-						rm -f "${prefix}lib32"/.keep
-						if ! rmdir "${prefix}lib32" 2>/dev/null ; then
-							ewarn "You need to merge ${prefix}lib32 into ${prefix}lib"
-							die "non-empty dir found where there should be none: ${prefix}lib32"
-						fi
-					fi
-					;;
-				esac
-			else
-				# nothing exists, so just set it up sanely
-				ewarn "Initializing ${prefix}lib as a dir"
-				mkdir -p "${prefix}lib" || die
-			fi
-		fi
-	done
-	if ! use split-usr ; then
-		for libdir in ${libdirs}; do
-			if [[ ! -e "${EROOT}${libdir}" ]]; then
-				ln -s usr/"${libdir}" "${EROOT}${libdir}"
-			fi
-		done
-	fi
-}
-
-pkg_preinst() {
-	# This is written in src_install (so it's in CONTENTS), but punt all
-	# pending updates to avoid user having to do etc-update (and make the
-	# pkg_postinst logic simpler).
-	rm -f "${EROOT}"/etc/._cfg????_gentoo-release
-
-	# We need to install directories and maybe some dev nodes when building
-	# stages, but they cannot be in CONTENTS.
-	# Also, we cannot reference $S as binpkg will break so we do this.
-	multilib_layout
-	if use build ; then
-		if use split-usr ; then
-			emake -C "${ED}/usr/share/${PN}" DESTDIR="${ROOT}" layout
-		else
-			emake -C "${ED}/usr/share/${PN}" DESTDIR="${ROOT}" layout-usrmerge
-		fi
-	fi
-	rm -f "${ED}"/usr/share/${PN}/Makefile
-}
-
-src_prepare() {
-	default
-
-	# handle multilib paths.  do it here because we want this behavior
-	# regardless of the C library that you're using.  we do explicitly
-	# list paths which the native ldconfig searches, but this isn't
-	# problematic as it doesn't change the resulting ld.so.cache or
-	# take longer to generate.  similarly, listing both the native
-	# path and the symlinked path doesn't change the resulting cache.
-	local libdir ldpaths
-	for libdir in $(get_all_libdirs) ; do
-		ldpaths+=":${EPREFIX}/${libdir}:${EPREFIX}/usr/${libdir}"
-		ldpaths+=":${EPREFIX}/usr/local/${libdir}"
-	done
-	echo "LDPATH='${ldpaths#:}'" >> etc/env.d/50baselayout
-}
-
-src_configure() {
-	local OS
-	# although having a prefix, RAP uses full Linux baselayout
-	OS=$(usex prefix-stack prefix-stack \
-		 $(usex prefix-guest prefix-guest \
-		   $(usex kernel_FreeBSD BSD \
-			 Linux ) ) )
-	# set up immutable Makefile variables once
-	sed -e "/^EPREFIX\s*?\?=\s*$/s|?\?=.*|= ${EPREFIX}|" \
-		-e   "/^BROOT\s*?\?=\s*$/s|?\?=.*|= ${BROOT}|" \
-		-e      "/^OS\s*?\?=\s*$/s|?\?=.*|= ${OS}|" \
-		-i Makefile || die
-}
-
-src_install() {
-	emake ROOT="${ROOT}" DESTDIR="${D}" install
-	dodoc ChangeLog
-
-	# need the makefile in pkg_preinst
-	insinto /usr/share/${PN}
-	doins Makefile
-
-	use prefix-guest || return 0
-
-	# add a dummy to avoid Portage shebang errors
-	dodir sbin
-	cat > "${ED}"/sbin/runscript <<- EOF
-		#!/usr/bin/env sh
-		source "${EPREFIX}/lib/gentoo/functions.sh"
-
-		eerror "runscript/openrc-run not supported by Gentoo Prefix Base System release ${PV}" 1>&2
-		exit 1
-	EOF
-	chmod 755 "${ED}"/sbin/runscript || die
-	cp "${ED}"/sbin/{runscript,openrc-run} || die
-}
-
-pkg_postinst() {
-	local x
-
-	# We installed some files to /usr/share/baselayout instead of /etc to stop
-	# (1) overwriting the user's settings
-	# (2) screwing things up when attempting to merge files
-	# (3) accidentally packaging up personal files with quickpkg
-	# If they don't exist then we install them
-	for x in master.passwd passwd shadow group fstab ; do
-		[ -e "${EROOT}/etc/${x}" ] && continue
-		[ -e "${EROOT}/usr/share/baselayout/${x}" ] || continue
-		cp -p "${EROOT}/usr/share/baselayout/${x}" "${EROOT}"/etc
-	done
-
-	# Force shadow permissions to not be world-readable #260993
-	for x in shadow ; do
-		[ -e "${EROOT}/etc/${x}" ] && chmod o-rwx "${EROOT}/etc/${x}"
-	done
-
-	# Take care of the etc-update for the user
-	if [ -e "${EROOT}"/etc/._cfg0000_gentoo-release ] ; then
-		mv "${EROOT}"/etc/._cfg0000_gentoo-release "${EROOT}"/etc/gentoo-release
-	fi
-
-	# whine about users that lack passwords #193541
-	if [[ -e "${EROOT}"/etc/shadow ]] ; then
-		local bad_users=$(sed -n '/^[^:]*::/s|^\([^:]*\)::.*|\1|p' "${EROOT}"/etc/shadow)
-		if [[ -n ${bad_users} ]] ; then
-			echo
-			ewarn "The following users lack passwords!"
-			ewarn ${bad_users}
-		fi
-	fi
-
-	# whine about users with invalid shells #215698
-	if [[ -e "${EROOT}"/etc/passwd ]] ; then
-		local bad_shells=$(awk -F: 'system("test -e " $7) { print $1 " - " $7}' "${EROOT}"/etc/passwd | sort)
-		if [[ -n ${bad_shells} ]] ; then
-			echo
-			ewarn "The following users have non-existent shells!"
-			ewarn "${bad_shells}"
-		fi
-	fi
-
-	# https://bugs.gentoo.org/361349
-	if use kernel_linux; then
-		mkdir -p "${EROOT}"/run
-
-		local found fstype mountpoint
-		while read -r _ mountpoint fstype _; do
-		[[ ${mountpoint} = /run ]] && [[ ${fstype} = tmpfs ]] && found=1
-		done < "${ROOT}"/proc/mounts
-		[[ -z ${found} ]] &&
-			ewarn "You should reboot now to get /run mounted with tmpfs!"
-	fi
-
-	for x in ${REPLACING_VERSIONS}; do
-		if ver_test ${x} -lt 2.4; then
-			ewarn "After updating ${EROOT}/etc/profile, please run"
-			ewarn "env-update && . ${EPREFIX}/etc/profile"
-		fi
-
-		if ver_test ${x} -lt 2.6; then
-			ewarn "Please run env-update then log out and back in to"
-			ewarn "update your path."
-		fi
-		# clean up after 2.5 typos
-		# https://bugs.gentoo.org/show_bug.cgi?id=656380
-		if [[ ${x} == 2.5 ]]; then
-			rm -fr "${EROOT}{,usr"
-		fi
-	done
-
-	if [[ -e "${EROOT}"/etc/env.d/00basic ]]; then
-		ewarn "${EROOT}/etc/env.d/00basic is now ${EROOT}/etc/env.d/50baselayout"
-		ewarn "Please migrate your changes."
-	fi
-}
diff --git a/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r2.ebuild b/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r2.ebuild
index a2a404b6929a..837a4b033565 100644
--- a/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r2.ebuild
+++ b/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r2.ebuild
@@ -24,6 +24,8 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="build kernel_FreeBSD kernel_linux +split-usr"
 
+RDEPEND="!sys-apps/baselayout"  #681760
+
 my_prefix_commits=(
 	# commits in reverse order as listed by:
 	# git log --decorate=no --oneline --no-abbrev-commit origin/master..
diff --git a/sys-apps/bat/Manifest b/sys-apps/bat/Manifest
index 14ff114c82f6..4f9d3822fd81 100644
--- a/sys-apps/bat/Manifest
+++ b/sys-apps/bat/Manifest
@@ -238,5 +238,6 @@ DIST xml-rs-0.8.3.crate 52547 BLAKE2B cffdece0269b9c04c763481af3a3a25df53d759355
 DIST yaml-rust-0.4.3.crate 45768 BLAKE2B 6af7374439000dc5e8795b26fccb1bc691040846f844e10765fe5df06237f5cf52752b0f9d25ed7c6f62337f628ee7be2e024f8aeb6b55a7c76f0d3b2ad0489c SHA512 31b0236fe041706befa938cdeb9c74940daccd2f80bdbd4e0e890901c868ecffc39367a41914c8bb98373d1002904f18b18ff13a08bbecd19dec634c08b7a7a3
 DIST yaml-rust-0.4.4.crate 48359 BLAKE2B 3c504a593663eff6ccdc96b949f2bf5ff9e9030b2cb08dd4bdb6ab2d0409513d4454ae99af4afe69a1dea1d7560454f2eed434cc6ded2c0cbaf9bedea2f3be85 SHA512 63cb5518101a8c841700efa556a14199d136ab390da3b79c9d11a54789e497d0ca0f420bfa31fa75257864beac619d1b28182714c99a8c92f44e333b299d1d6a
 EBUILD bat-0.15.4.ebuild 3975 BLAKE2B 1f53e7236725360091e06e9568a0b00f4e5193c7842ad4fe1929feb0021cd1c3f24dada83504b97d149517687802b33feb8760159a8f9f7f93127ffed69452e7 SHA512 301acd3940aad422b93aaae0cc7f6695cc7e6fcf3d93b70a40141c7e4e4000ca0dc40ff8e23dde4424b2f08b79e841e66e728677bf62fadbd5962685b38b30a7
+EBUILD bat-0.17.1-r1.ebuild 3825 BLAKE2B 0e3129e4e0a406384f96b0669836708e20c655b782bc8cdf31772c3adb487018c89f794a319092901b3497e85625260db3680a5b7dd813b7461fd58c3d20ed63 SHA512 3d4d476f9c020c583c681752c0d039fc7abbc31c9ecfe5ef4fef04786e3b77a27ae619f2231c4fb54de4c60bc79d2b74668bca5fd45d5111f916f5e18df6d4dc
 EBUILD bat-0.17.1.ebuild 3817 BLAKE2B 2b07c6231ec1cf4380875f5b8384fc357fc24be96d3f2545d60f5ba189b2414e35a666d70173f10fb8e88b760b8482a0f9e5134a806a853dd2571fa571c2612f SHA512 444fe3586c0f429fb26c87cb495c1dcde535f52257363fcfc0081277d06fecbe3fb7ce998b20eca164758aa73f30f29f9081f34e621e5049c50d80ff23677477
 MISC metadata.xml 818 BLAKE2B a006c6a94fd0c73b87ec6395c42e29e0b6986224606ee98d1eb058b22bb7530048035fbad80f58696d651e4192bcd0c841610011390a7e043a425520b92a9df8 SHA512 0f74f00f4e135e8daaa1744b3d3c7b05d1d5b8c1bc1a6bdeb72d9a7375c5ec2a15be332489ba8d9f7bb24d3d2c695ed592407b672990e58a762bf754780a100e
diff --git a/sys-apps/bat/bat-0.17.1-r1.ebuild b/sys-apps/bat/bat-0.17.1-r1.ebuild
new file mode 100644
index 000000000000..a3647111ee7a
--- /dev/null
+++ b/sys-apps/bat/bat-0.17.1-r1.ebuild
@@ -0,0 +1,200 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CRATES="
+adler-0.2.3
+aho-corasick-0.7.13
+ansi_colours-1.0.1
+ansi_term-0.11.0
+ansi_term-0.12.1
+arrayref-0.3.6
+arrayvec-0.5.1
+assert_cmd-1.0.1
+atty-0.2.14
+autocfg-1.0.1
+base64-0.12.3
+bincode-1.3.1
+bitflags-1.2.1
+bit-set-0.5.2
+bit-vec-0.6.2
+blake2b_simd-0.5.10
+block-buffer-0.7.3
+block-padding-0.1.5
+bstr-0.2.13
+byteorder-1.3.4
+byte-tools-0.3.1
+cc-1.0.60
+cfg-if-0.1.10
+chrono-0.4.19
+clap-2.33.3
+clircle-0.1.3
+console-0.13.0
+constant_time_eq-0.1.5
+content_inspector-0.2.4
+crc32fast-1.2.0
+crossbeam-utils-0.7.2
+difference-2.0.0
+digest-0.8.1
+dirs-3.0.1
+dirs-sys-0.3.5
+doc-comment-0.3.3
+dtoa-0.4.6
+encode_unicode-0.3.6
+encoding-0.2.33
+encoding-index-japanese-1.20141219.5
+encoding-index-korean-1.20141219.5
+encoding-index-simpchinese-1.20141219.5
+encoding-index-singlebyte-1.20141219.5
+encoding_index_tests-0.1.4
+encoding-index-tradchinese-1.20141219.5
+error-chain-0.12.4
+fake-simd-0.1.2
+fancy-regex-0.3.5
+flate2-1.0.18
+float-cmp-0.8.0
+fnv-1.0.7
+fuchsia-cprng-0.1.1
+generic-array-0.12.3
+getrandom-0.1.15
+git2-0.13.12
+glob-0.3.0
+globset-0.4.6
+hashbrown-0.9.1
+hermit-abi-0.1.16
+idna-0.2.0
+indexmap-1.6.0
+itoa-0.4.6
+jobserver-0.1.21
+lazycell-1.3.0
+lazy_static-1.4.0
+libc-0.2.78
+libgit2-sys-0.12.14+1.1.0
+libz-sys-1.1.2
+line-wrap-0.1.1
+linked-hash-map-0.5.3
+log-0.4.11
+maplit-1.0.2
+matches-0.1.8
+memchr-2.3.3
+miniz_oxide-0.4.2
+nix-0.19.0
+normalize-line-endings-0.3.0
+num-integer-0.1.43
+num-traits-0.2.12
+onig-6.1.0
+onig_sys-69.5.1
+opaque-debug-0.2.3
+path_abs-0.5.0
+percent-encoding-2.1.0
+pest-2.1.3
+pest_derive-2.1.0
+pest_generator-2.1.3
+pest_meta-2.1.3
+pkg-config-0.3.18
+plist-1.0.0
+predicates-1.0.5
+predicates-core-1.0.0
+predicates-tree-1.0.0
+proc-macro2-1.0.24
+quote-1.0.7
+rand-0.4.6
+rand_core-0.3.1
+rand_core-0.4.2
+rdrand-0.4.0
+redox_syscall-0.1.57
+redox_users-0.3.5
+regex-1.3.9
+regex-syntax-0.6.18
+remove_dir_all-0.5.3
+rust-argon2-0.8.2
+ryu-1.0.5
+safemem-0.3.3
+same-file-1.0.6
+semver-0.11.0
+semver-parser-0.10.0
+serde-1.0.117
+serde_derive-1.0.117
+serde_json-1.0.58
+serde_yaml-0.8.14
+sha-1-0.8.2
+shell-words-1.0.0
+std_prelude-0.2.12
+strsim-0.8.0
+syn-1.0.42
+syntect-4.4.0
+tempdir-0.3.7
+terminal_size-0.1.13
+term_size-0.3.2
+textwrap-0.11.0
+thread_local-1.0.1
+tinyvec-0.3.4
+treeline-0.1.0
+typenum-1.12.0
+ucd-trie-0.1.3
+unicode-bidi-0.3.4
+unicode-normalization-0.1.13
+unicode-width-0.1.8
+unicode-xid-0.2.1
+url-2.1.1
+vcpkg-0.2.10
+vec_map-0.8.2
+version_check-0.9.2
+wait-timeout-0.2.0
+walkdir-2.3.1
+wasi-0.9.0+wasi-snapshot-preview1
+wild-2.0.4
+winapi-0.3.9
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-util-0.1.5
+winapi-x86_64-pc-windows-gnu-0.4.0
+xml-rs-0.8.3
+yaml-rust-0.4.4
+"
+
+inherit cargo
+
+DESCRIPTION="cat(1) clone with syntax highlighting and Git integration"
+HOMEPAGE="https://github.com/sharkdp/bat"
+SRC_URI="https://github.com/sharkdp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" $(cargo_crate_uris ${CRATES})"
+
+LICENSE="Apache-2.0 Boost-1.0 BSD BSD-2 CC0-1.0 ISC LGPL-3+ MIT Apache-2.0 Unlicense ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="
+	>=dev-libs/libgit2-1.1.0:=[threads]
+	dev-libs/oniguruma:=
+	sys-libs/zlib
+"
+# >app-backup/bacula-9.2[qt5] has file collisions, #686118
+RDEPEND="${DEPEND}
+	!>app-backup/bacula-9.2[qt5]
+"
+
+DOCS=( README.md doc/alternatives.md )
+
+QA_FLAGS_IGNORED="/usr/bin/bat"
+
+src_configure() {
+	export RUSTONIG_SYSTEM_LIBONIG=1
+	export LIBGIT2_SYS_USE_PKG_CONFIG=1
+	export PKG_CONFIG_ALLOW_CROSS=1
+}
+
+src_install() {
+	cargo_src_install
+
+	einstalldocs
+
+	doman target/release/build/bat-*/out/assets/manual/bat.1
+
+	insinto /usr/share/fish/vendor_completions.d/
+	doins target/release/build/bat-*/out/assets/completions/bat.fish
+
+	insinto /usr/share/zsh/site-functions/
+	newins target/release/build/bat-*/out/assets/completions/bat.zsh _${PN}
+}
diff --git a/sys-apps/biosdevname/Manifest b/sys-apps/biosdevname/Manifest
index 8a6870e4e15f..31c382127865 100644
--- a/sys-apps/biosdevname/Manifest
+++ b/sys-apps/biosdevname/Manifest
@@ -1,5 +1,3 @@
-DIST biosdevname-0.7.2.tar.gz 193926 BLAKE2B b9242c11b082d1c4d52c2976031d680159cfb7c0a6140fe83ecd4abfc23dda89b7c59788f026a169a843a7451e70a7f0f19171e619a3994006eeea1da5cf3f4d SHA512 2b71d33b3c7ab6c19f6129763a4c044f9cb4cbc43aec0e0d2a83177d8edb1440c17ffc4ab2eae448ae997dcb4b52315f8266c2e4010367f9690e4552cba89502
 DIST biosdevname-0.7.3.tar.gz 96231 BLAKE2B d572b15f86ba1ddaba191f859afcfbd39fa0fe397ee6968ab794e217d37b875b9f9d20c219cb44f62fc5d3fede7aa487963f54423ca20086c75c15b17d755c8e SHA512 9cd2b7d115d6ee487f4aafa21b00025a3917d3c89489fe70ab3de8aa979158477a1d0b5287101b7cec7200fef0d2f6894a0e6389a174d6f8670dcd7530dc445d
-EBUILD biosdevname-0.7.2.ebuild 610 BLAKE2B 0d3962d28703d92cfc4546ed94cb2dbdb18e7e9a49fa4d0c5b7bbafd96f1e9f921f39883fb3380127c9a45142ac92ff0956b1e4c5bf10c1e741871637d908fb7 SHA512 48a3dfb359d1b76f23ebed71d169da6f8eb0712cd5a7f60feb8effe296779b61a176b62ae32ae8d926c6b56171ee0f8847459861d35d24d4d5605e2e1634c909
-EBUILD biosdevname-0.7.3.ebuild 670 BLAKE2B cb4da8a608f4539f7cf5c001c6b01e47c0f4137d8d8b6bdd64bf77ac2fac774657bf59eef7b7baff767bb39972f6d4f484251f983cdfd1280ba9edc10b5eca56 SHA512 3f8c3fe3b8a9dfb032045b3421c660aa92ebbf0835e445134a561febadfabacc30d1377ca126d31aab007f0b3218af004db858ad954ea6f5ee1b78e3259d7c32
-MISC metadata.xml 514 BLAKE2B 6b9e377a0ee3b17e72e4128bad01d5281296531e69d53a33b515a885cc86e38e39b4e25b454230f657bde2750437d8c0e5b1d6667e18bd4910f698c2e073ba36 SHA512 df492ed01d6dd66bdbdabc281b6e802b67247d4bcaa0b1ccd9530891256228b90f677855ef6bab9a2d958f30765e24b878cca884ac2945f68139f19922c36cf9
+EBUILD biosdevname-0.7.3.ebuild 626 BLAKE2B e1b95694af9223e0ed37998155a1ef21dacc216f8192d1fce9a8dd6d57a9c6620cc49027d0ed052cf1288c4b88f7816778abba58a91923812cef620671c09934 SHA512 b9447820c7d320bcdfe1f08a3c5f06755cb2fa29e1894181f4ffefec208f03ec622c82154e35ff3e6c09b4cb95abd35bfaac94893da49c50067e190dca40f0d1
+MISC metadata.xml 602 BLAKE2B e0fa700aa7a51e128b703d455b60d9d425b7d6cbb9edf922a95fb8120969669ca19702cc4435e930d463573bc9406d8e9a000b2f36363e9ae1ca53a2806a28cd SHA512 d66452a9435c837dec1bb9b1580efeebd2f49f556094d49dd16c8c0cac28cf7538cce583694f108745bcb3ac979ae9afd9d8595941c4e300c13617c6ecadcd44
diff --git a/sys-apps/biosdevname/biosdevname-0.7.2.ebuild b/sys-apps/biosdevname/biosdevname-0.7.2.ebuild
deleted file mode 100644
index bfccd3161ba9..000000000000
--- a/sys-apps/biosdevname/biosdevname-0.7.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit udev
-
-DESCRIPTION="Sets BIOS-given device names instead of kernel eth* names"
-HOMEPAGE="http://linux.dell.com/biosdevname/"
-SRC_URI="http://linux.dell.com/biosdevname/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-CDEPEND="virtual/udev"
-DEPEND="${CDEPEND}
-	sys-apps/pciutils"
-RDEPEND="${CDEPEND}"
-
-src_prepare() {
-	sed -i -e 's|/sbin/biosdevname|/usr\0|g' biosdevname.rules.in || die
-	sed -i -e "/RULEDEST/s:/lib/udev:$(get_udevdir):" configure{,.ac} || die
-}
diff --git a/sys-apps/biosdevname/biosdevname-0.7.3.ebuild b/sys-apps/biosdevname/biosdevname-0.7.3.ebuild
index 3382b9289a96..08955d3cbcfd 100644
--- a/sys-apps/biosdevname/biosdevname-0.7.3.ebuild
+++ b/sys-apps/biosdevname/biosdevname-0.7.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit udev
+inherit autotools udev
 
 DESCRIPTION="Sets BIOS-given device names instead of kernel eth* names"
 HOMEPAGE="http://linux.dell.com/biosdevname/"
@@ -11,13 +11,11 @@ SRC_URI="https://github.com/dell/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
+KEYWORDS="amd64 x86"
 
-CDEPEND="virtual/udev"
-DEPEND="${CDEPEND}
+RDEPEND="virtual/udev"
+DEPEND="${RDEPEND}
 	sys-apps/pciutils"
-RDEPEND="${CDEPEND}"
 
 src_prepare() {
 	default
@@ -25,5 +23,5 @@ src_prepare() {
 	sed -i -e 's|/sbin/biosdevname|/usr\0|g' biosdevname.rules.in || die
 	sed -i -e "/RULEDEST/s:/lib/udev:$(get_udevdir):" configure.ac || die
 
-	./autogen.sh --no-configure || die
+	eautoreconf
 }
diff --git a/sys-apps/biosdevname/metadata.xml b/sys-apps/biosdevname/metadata.xml
index ac6d117c6c65..afc179ff42c0 100644
--- a/sys-apps/biosdevname/metadata.xml
+++ b/sys-apps/biosdevname/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-<longdescription lang="en">
-biosdevname in its simplest form takes a kernel device name as an argument, and
-returns the BIOS-given name it "should" be.  This is necessary on systems where
-the BIOS name for a given device (e.g. the label on the chassis is "Gb1")
-doesn't map directly and obviously to the kernel name (e.g. eth0).
-</longdescription>
+	<!-- maintainer-needed -->
+	<longdescription lang="en">
+	biosdevname in its simplest form takes a kernel device name as an argument, and
+	returns the BIOS-given name it "should" be.  This is necessary on systems where
+	the BIOS name for a given device (e.g. the label on the chassis is "Gb1")
+	doesn't map directly and obviously to the kernel name (e.g. eth0).
+	</longdescription>
+	<upstream>
+		<remote-id type="github">dell/biosdevname</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-apps/bleachbit/Manifest b/sys-apps/bleachbit/Manifest
index 51d21590dba5..43a2d731565b 100644
--- a/sys-apps/bleachbit/Manifest
+++ b/sys-apps/bleachbit/Manifest
@@ -1,3 +1,5 @@
 DIST bleachbit-4.0.0.tar.bz2 599756 BLAKE2B 05a4dbf9e0b6bbcba528875a82e36eb9f91ae84c5bdc6f8f69063a54bd192332f5dd1d22ee5a737243eb5fb74cf0362eace1b50a73f7c1d0557a8cba146dea01 SHA512 ce120239b411c6e177af0e22a16b583ac3ae8903ba13579878942492e4e221355da28f737d6c78811312bfcc888af7c8dba6c153673f4e1542cc2aceedf2d2c9
+DIST bleachbit-4.2.0.tar.bz2 606223 BLAKE2B c45a11db556b9c3e3a19583bfaa633244e2ea2e374ec8b883cba486126cfb33617cd7930af79d379711980ad4b56426b39a3e68532462be1918da1386369d137 SHA512 6d43da42c6a2a328c8fb766a3f00f4511e72a00836316c279c8dc3a24468abb4c2ce909b42c568ee0b8417c08827c7cb79ae197ae693b8d6ce60faf22422effb
 EBUILD bleachbit-4.0.0.ebuild 1482 BLAKE2B 070e66a4c002c3a47f4987e9b000a5d78e05dc41ba3b597cf91e4100da9c6811ee39fccf1ada4bc703b70e9e156690a58181ddad754f1427be681bcbd2213733 SHA512 b860352fbe80dbe550646de268cfc73fcc96cde4fc90153314fcaf53b03eef2f213342612de6f76fc58b24f69406fc2af3b1e1577b6055c8de5eeff8af47d310
+EBUILD bleachbit-4.2.0.ebuild 1644 BLAKE2B e0ce7f3565f2300f1cc151bcf575de7b1c104e7ed5271744d29411d09784c8bac683bdac3587a4ce711f3bbeca9df4a430ec5d8d7364b623f85480691ff647a6 SHA512 03ba6a6ce72c9569567644f60197cb081cb1aae8762cfa23448f0f247645fd88c5505c567689fc3f6f44a9805bfcf3e36e0e2aeeae8e7660ec97fc93ab27dc0e
 MISC metadata.xml 526 BLAKE2B f55f30792d579d5fc57553b3aa8a8f97d450778a1813c53e82a0fea4cc01fe3039d249ed89c8097a973c1bd923390e3bd1b85ae1a1d2386ab3373a9baae08623 SHA512 d2179dee28e6bacaa540039b726eb5ab47b87abc73a5c86621de3230f3d6355d082e8189c9e167871fb8c15975815341ce02bbef80195b984728c3b1b0652bf1
diff --git a/sys-apps/bleachbit/bleachbit-4.2.0.ebuild b/sys-apps/bleachbit/bleachbit-4.2.0.ebuild
new file mode 100644
index 000000000000..c3523862ab44
--- /dev/null
+++ b/sys-apps/bleachbit/bleachbit-4.2.0.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_REQ_USE="sqlite(+)"
+DISTUTILS_SINGLE_IMPL=1
+
+inherit desktop distutils-r1 virtualx
+
+DESCRIPTION="Clean junk to free disk space and to maintain privacy"
+HOMEPAGE="https://www.bleachbit.org"
+SRC_URI="https://download.bleachbit.org/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/chardet[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+	')
+"
+BDEPEND="
+	sys-devel/gettext
+	test? (
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]')
+	)
+"
+
+distutils_enable_tests unittest
+
+# tests fail under FEATURES=usersandbox
+RESTRICT="test"
+
+python_prepare_all() {
+	if use test; then
+		# avoid tests requiring internet access
+		rm tests/Test{Chaff,Update}.py || die
+
+		# fails due to non-existent $HOME/.profile
+		rm tests/TestInit.py || die
+
+		# these fail on upstream Travis CI as well as on Gentoo
+		sed -e "s/test_notify(self)/_&/" \
+			-i tests/TestGUI.py || die
+
+		sed -e "s/test_get_proc_swaps(self)/_&/" \
+			-i tests/TestMemory.py || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	emake -C po local
+}
+
+python_test() {
+	virtx emake tests
+}
+
+python_install() {
+	distutils-r1_python_install
+	python_newscript ${PN}.py ${PN}
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	emake -C po DESTDIR="${D}" install
+
+	insinto /usr/share/bleachbit/cleaners
+	doins cleaners/*.xml
+
+	insinto /usr/share/bleachbit
+	doins data/app-menu.ui
+
+	doicon ${PN}.png
+	domenu org.${PN}.BleachBit.desktop
+}
diff --git a/sys-apps/bolt/Manifest b/sys-apps/bolt/Manifest
index 5f5e08dd151d..c2b6e3440657 100644
--- a/sys-apps/bolt/Manifest
+++ b/sys-apps/bolt/Manifest
@@ -1,5 +1,4 @@
 AUX bolt.openrc 362 BLAKE2B 1cefc0db24bcd6dca7483a582f89a68800e13651330d8873c2b9f3042c70e0f8d8a2b7c363ceeae5ec63fa4b736b42e129f9e90ea4a576e5419af7e0e26d848e SHA512 59616543c6cd101373249b06bcbc0b7dd13fb2c8e45d6dc61a56088434cdf0a6b57630471bd2d788dd6253b66bcbfc3ec60b11ba8442043e837119130344216e
 DIST bolt-0.9.tar.gz 238596 BLAKE2B 8032ecb83d39d6c3550c000eed400ee0451e5ed94f7c898ffe9c8fcf512af387cfd759bd94241a47623b5aac63615bcda40ddb3e9ae3ec4060da20e46d7e9b7d SHA512 427e9ad95a8d018dd22326cc4b458fc9149b001d3aa6e4bb8e4047eaf6c3cf04a4dc3be9396049734dc0bd54f990b3bce31b6eef4031e3b671a6202a588cfe78
-EBUILD bolt-0.9-r1.ebuild 1177 BLAKE2B a7a5ceab008d24574f7083de09add23527d5e40038f2ba4eb59f74976b5a78001d4bd1fee77dd4dcba158b7012c4c8488cd46d905f6c32241788d195e46cbad4 SHA512 d3012cc8b13f071d2a16b67bb0ccac040275068ff2044d403f6b6dcb19f9955fb69ccf3f3dd1e0ba93a161824570ae250b02b28fd7ca35275174b7b206d6a9c7
-EBUILD bolt-0.9-r2.ebuild 1346 BLAKE2B 43be6bb874f701c691ac94f8cb5d655e15048aaf5c0f99f4c287d9dc1cce35201f0c349e1d25b859f3bd57d5d835649e2f9ebf41eea7ac26422f1905d96a0655 SHA512 621f50a5d1dcd18e5a7ea7c1163f094537a67f03e2bc317e9f2271110737a6d32ae5649c3183ba2935063880b37563f448ca56ddfbc0fde5395ff21e566be12c
+EBUILD bolt-0.9-r2.ebuild 1344 BLAKE2B 7742674b1eff6b2ed07b90a9ae76b94b4050b585b172609bd74597ee64b1bac3a9822fd7d9ff5a80966e5e931780bdbb2ccc86a703882c3d0a281285926edbbe SHA512 c1b0353b4d69d022fc570a5e38a01c56e72f3f48adab3e876ca9fadcf9eee9e35bde22db118418f2a6141b070614346a0c74a10ec30862260219fb65b14c656f
 MISC metadata.xml 254 BLAKE2B 731c7015b1415180253ab851fc24ad031153050aa0feff41781a5c16ced70787ca132b4fe53adaa8a189de944dda987c65081162895f1f03d68dc77405308fa7 SHA512 49faa8aa0aef31db638fe291aa55ff114f96fd9f9b2c733f88b326b44f3e9dbf627e825de7c41d45f208b2b7e5e6cd5c03e6fee3fa6013625ce7ce158bbc9a31
diff --git a/sys-apps/bolt/bolt-0.9-r1.ebuild b/sys-apps/bolt/bolt-0.9-r1.ebuild
deleted file mode 100644
index afb1c1ec6aad..000000000000
--- a/sys-apps/bolt/bolt-0.9-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-info meson systemd
-
-DESCRIPTION="Userspace system daemon to enable security levels for Thunderbolt 3"
-HOMEPAGE="https://gitlab.freedesktop.org/bolt/bolt"
-SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc systemd"
-
-DEPEND="
-	>=dev-libs/glib-2.56.0:2
-	dev-util/glib-utils
-	virtual/libudev
-	virtual/udev
-	dev-util/umockdev
-	sys-auth/polkit[introspection]
-	systemd? ( sys-apps/systemd )
-	doc? ( app-text/asciidoc )"
-RDEPEND="${DEPEND}"
-
-pkg_pretend() {
-	CONFIG_CHECK="~THUNDERBOLT"
-	ERROR_THUNDERBOLT="This package requires the thunderbolt kernel driver."
-	check_extra_config
-
-	CONFIG_CHECK="~HOTPLUG_PCI"
-	ERROR_HOTPLUG_PCI="Thunderbolt requires PCI hotplug support."
-	check_extra_config
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dman=$(usex doc true false)
-		--sysconfdir=/etc
-		--localstatedir=/var
-		--sharedstatedir=/var/lib
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	newinitd "${FILESDIR}"/${PN}.openrc boltd
-	keepdir /var/lib/boltd
-}
diff --git a/sys-apps/bolt/bolt-0.9-r2.ebuild b/sys-apps/bolt/bolt-0.9-r2.ebuild
index ddf044ade359..778cd7da043b 100644
--- a/sys-apps/bolt/bolt-0.9-r2.ebuild
+++ b/sys-apps/bolt/bolt-0.9-r2.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=7
@@ -11,7 +11,7 @@ SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc systemd"
 
 DEPEND="
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index 25f46fbe1aba..c713e18b7dc3 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -14,13 +14,11 @@ AUX syslogd.confd 234 BLAKE2B a1601c31dab14e5c2712f49133758479914bcf37e0d9704fe7
 AUX syslogd.initd 267 BLAKE2B 1daf252138bfb5904feb04dcc2127b8e8058d9d43652474e7594d60bb9adfbbb631eede30f375cf38370606c93d10e8fba05f50e88ede6709ee30b6ae6aec7a7 SHA512 856dd97ed46b08fdd13e497737f1eb192594e33bfc5d395d7ca6eed2e6bc212cf0cf33518b36a6f9a18d6962d462430c7b50c07e9dc08e85606ef68b240b1211
 AUX watchdog.confd 232 BLAKE2B 14ff3813297bc987e98bf3cabee2e7b150e23d8aa9f016303396569ffca3633b3e048497f85649c20d769233baa430a4cb54d2d5e5d63646db8113761960552d SHA512 8fd7121075535195f3e5d43ec773713c883fb7865cd5e5927b3b20c2605c50acb81d50461bd1a246c1282006ce74b11932ac1cec67ddc2be15da2f9aa8674232
 AUX watchdog.initd 219 BLAKE2B 3726fec4551962d6e20859c52e18582fbf127e2fc2807379afe9d490ad32b19a6d10d456155fdeb0468c67816f061b1cac166db7f104dbadadf0d175082efdb4 SHA512 d329fb72ce078a95a1fb77b72321dee56d19c76b45cb78a7a57a46d9fa385b982a114be49dd8696c2d4fc2b2dd90a17ee728ef2938172cc2f8b12b5a9ebd62f5
-DIST busybox-1.31.1.tar.bz2 2430221 BLAKE2B 95c2345bc715eb7a1f08816a40add9b7a6176ef509a84069343ec2caddec58d8d57a07676ca2b03c209734169321433e27ba963b4c8b98dbfda4e409dcc347b4 SHA512 0d1197c25d963d7f95ef21e08c06c0d6124ac7b59c99989e891f744ffee4878a3b1fe44a247241a9da39fa5de0ba87f1b6d862401b591f277e66e89c02764bbf
 DIST busybox-1.32.0.tar.bz2 2439463 BLAKE2B 75937ae6e1401d7ab947d80f4b206112023ff2b7d04257ffa2c254cadabb92282ba04d5d608659b6c98fade1ccd0b0f6b204c8758263d59dea6508a3157a7c69 SHA512 1b1227af69a97e820e28f5f1c62413e4e179202ab525725ea0b1afe9b9f9a5f00e5e32f4603e804ba1596b0fedd60d60457a6d2b8fcedfab45b6e049caeb319b
 DIST busybox-1.32.1.tar.bz2 2444679 BLAKE2B b0258345d40628d8c12b4cc5c3efdb318cfb469e029242942cdad22aeec5142963291a746fbac450b43a4a1f2f7e9204442456691fa98f18eeaa58c70d714caf SHA512 3a33e99adaf7cbd51dcbeb31b5361123bf61ac040c0a032656c654ddb69c4074af75fb4335ba63f283067f61a22d7d7cbca8e1ed265c9522982c453ce48ea2fd
 DIST busybox-1.33.0.tar.bz2 2448841 BLAKE2B bc25c2187cd7e357dd2f75b3eaae33ab9da318bbcec861e0b6b00da8466a86a17a71933035958f70badb9f1f143fa7f11f114c12a52f3680042730471f56cefe SHA512 20f8f5197c5cbc8b244f69d82d6628066296c7306a9736ee1344cb555882854412cf7f264490f9a735251c139b9621004f48e972d06ef2623a3c99278f8e765a
-EBUILD busybox-1.31.1-r3.ebuild 9530 BLAKE2B 80e81e1c4c2c372171b40265549bf56afe1ff0953699de74332c396cda4b18df8e2fb880d7030352c295dd2a2530752dc234ab21308b8c92e4be94188896f00f SHA512 066b9baae3e80b8b1ae95be670f99d7900a0c501e8d95e4f750901c30674ac7951440efe727b8a2423afb7a85145e0c33190d3a15c1eac8a97ea4ef289edace4
-EBUILD busybox-1.32.0-r1.ebuild 9488 BLAKE2B a10d4f1881df9ff82fb3ee8ec6b251f0878ffa5034345416f532d3a31d009f757dd8acddd366c5c7dbdffe5f73d6e13bdb4cd7a25b6a506c4b6bbe4c3cdfb60d SHA512 1a41b906a3185d9daa6e709554253d243935171d4225a27b37a2efed773252969df4edb7f577d33fd55a0c0472d8fbcfab7111091ec47da35791e77327227dd7
-EBUILD busybox-1.32.1.ebuild 9493 BLAKE2B 54b44ae3a230bf7fd6f03b76b293e0e42b351049a3b2200928c2a6dfff459a62115e48bc279b280151a73cfbc660f8403a5f9673e88d4e1e30445029fe9c4cc0 SHA512 54af8a0e8f4c1d6c4bf28f85f2c205487c6d0449baab0f7872b9cb11121d7ddf7f142dd902a2abed3a770080d70e7b2d0b39f4f7d775d83dd3b22013c05d1aa9
+EBUILD busybox-1.32.0-r1.ebuild 9485 BLAKE2B 0749d7f1a94bcbcae70ef9e305720a20c309397fb0013a411a8ea6caa4d24c93772a583a808d2467d81ce970be5762fcd2850b84295ac78a05f1e3b1ae788529 SHA512 c4dbabff8ee7ebfb3515ae94efa39b6c4e6de3bd478a243fb3156ef70f0f5b4b75c70beb77531d12abdbec3af4ea4a1c59437cbf462fd62c70a8d9bf82e74f7a
+EBUILD busybox-1.32.1.ebuild 9485 BLAKE2B 0749d7f1a94bcbcae70ef9e305720a20c309397fb0013a411a8ea6caa4d24c93772a583a808d2467d81ce970be5762fcd2850b84295ac78a05f1e3b1ae788529 SHA512 c4dbabff8ee7ebfb3515ae94efa39b6c4e6de3bd478a243fb3156ef70f0f5b4b75c70beb77531d12abdbec3af4ea4a1c59437cbf462fd62c70a8d9bf82e74f7a
 EBUILD busybox-1.33.0.ebuild 9493 BLAKE2B 54b44ae3a230bf7fd6f03b76b293e0e42b351049a3b2200928c2a6dfff459a62115e48bc279b280151a73cfbc660f8403a5f9673e88d4e1e30445029fe9c4cc0 SHA512 54af8a0e8f4c1d6c4bf28f85f2c205487c6d0449baab0f7872b9cb11121d7ddf7f142dd902a2abed3a770080d70e7b2d0b39f4f7d775d83dd3b22013c05d1aa9
 EBUILD busybox-9999.ebuild 9438 BLAKE2B ff3b404b01449191451c5126eab5368eb97c4a3ddada5f988b5ee106e483808ea008b7106bce99f357642fae4d600097ff0977df1f28c1338ac8e4270cdf1eb1 SHA512 45f808c10761fdbdc7571714590530fe5ed2de13ce70be1351e7b871bf8d34bcdc0e72837461459cd1a3ca2acc8f2af6177f9a85bcbad0e5d218a685c4fbd54d
 MISC metadata.xml 872 BLAKE2B e42037070f8473e11bcf693727c7f4649348afce6cd14aec53b2ebf5f683c32ceb3218d83e8efd3ec34f5c55ece4cc83b24725bc133669bd03825bbe2fd62396 SHA512 c0b3f8b9348553d8a4db25c1c51ef5a82bcd14a09251568c0709b392e2dea9bc35dced96377d11a32ad53ba09052603781caebf754428debf7acb0aaedafbf07
diff --git a/sys-apps/busybox/busybox-1.31.1-r3.ebuild b/sys-apps/busybox/busybox-1.31.1-r3.ebuild
deleted file mode 100644
index af324ce621a7..000000000000
--- a/sys-apps/busybox/busybox-1.31.1-r3.ebuild
+++ /dev/null
@@ -1,338 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# See `man savedconfig.eclass` for info on how to use USE=savedconfig.
-
-EAPI=7
-
-inherit flag-o-matic savedconfig toolchain-funcs
-
-DESCRIPTION="Utilities for rescue and embedded systems"
-HOMEPAGE="https://www.busybox.net/"
-if [[ ${PV} == "9999" ]] ; then
-	MY_P=${P}
-	EGIT_REPO_URI="https://git.busybox.net/busybox"
-	inherit git-r3
-else
-	MY_P=${PN}-${PV/_/-}
-	SRC_URI="https://www.busybox.net/downloads/${MY_P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="GPL-2" # GPL-2 only
-SLOT="0"
-IUSE="debug ipv6 livecd make-symlinks math mdev pam selinux sep-usr static syslog systemd"
-REQUIRED_USE="pam? ( !static )"
-RESTRICT="test"
-
-COMMON_DEPEND="!static? ( selinux? ( sys-libs/libselinux ) )
-	pam? ( sys-libs/pam )
-	virtual/libcrypt:="
-DEPEND="${COMMON_DEPEND}
-	static? (
-		virtual/libcrypt[static-libs]
-		selinux? ( sys-libs/libselinux[static-libs(+)] )
-	)
-	>=sys-kernel/linux-headers-2.6.39"
-RDEPEND="${COMMON_DEPEND}
-	mdev? ( !<sys-apps/openrc-0.13 )"
-
-S="${WORKDIR}/${MY_P}"
-
-busybox_config_option() {
-	local flag=$1 ; shift
-	if [[ ${flag} != [yn] && ${flag} != \"* ]] ; then
-		busybox_config_option $(usex ${flag} y n) "$@"
-		return
-	fi
-	local expr
-	while [[ $# -gt 0 ]] ; do
-		case ${flag} in
-		y) expr="s:.*\<CONFIG_$1\>.*set:CONFIG_$1=y:g" ;;
-		n) expr="s:CONFIG_$1=y:# CONFIG_$1 is not set:g" ;;
-		*) expr="s:.*\<CONFIG_$1\>.*:CONFIG_$1=${flag}:g" ;;
-		esac
-		sed -i -e "${expr}" .config || die
-		einfo "$(grep "CONFIG_$1[= ]" .config || echo "Could not find CONFIG_$1 ...")"
-		shift
-	done
-}
-
-busybox_config_enabled() {
-	local val=$(sed -n "/^CONFIG_$1=/s:^[^=]*=::p" .config)
-	case ${val} in
-	"") return 1 ;;
-	y)  return 0 ;;
-	*)  echo "${val}" | sed -r 's:^"(.*)"$:\1:' ;;
-	esac
-}
-
-# patches go here!
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.26.2-bb.patch
-	"${FILESDIR}"/${PN}-1.31.1-glibc-2.31.patch
-	# "${FILESDIR}"/${P}-*.patch
-)
-
-src_prepare() {
-	default
-	unset KBUILD_OUTPUT #88088
-	append-flags -fno-strict-aliasing #310413
-	use ppc64 && append-flags -mminimal-toc #130943
-
-	cp "${FILESDIR}"/ginit.c init/ || die
-
-	# flag cleanup
-	sed -i -r \
-		-e 's:[[:space:]]?-(Werror|Os|falign-(functions|jumps|loops|labels)=1|fomit-frame-pointer)\>::g' \
-		Makefile.flags || die
-	#sed -i '/bbsh/s:^//::' include/applets.h
-	sed -i '/^#error Aborting compilation./d' applets/applets.c || die
-	use elibc_glibc && sed -i 's:-Wl,--gc-sections::' Makefile
-	sed -i \
-		-e "/^CROSS_COMPILE/s:=.*:= ${CHOST}-:" \
-		-e "/^AR\>/s:=.*:= $(tc-getAR):" \
-		-e "/^CC\>/s:=.*:= $(tc-getCC):" \
-		-e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
-		-e "/^PKG_CONFIG\>/s:=.*:= $(tc-getPKG_CONFIG):" \
-		Makefile || die
-	sed -i \
-		-e 's:-static-libgcc::' \
-		Makefile.flags || die
-}
-
-src_configure() {
-	# check for a busybox config before making one of our own.
-	# if one exist lets return and use it.
-
-	restore_config .config
-	if [ -f .config ]; then
-		yes "" | emake -j1 -s oldconfig >/dev/null
-		return 0
-	else
-		ewarn "Could not locate user configfile, so we will save a default one"
-	fi
-
-	# setup the config file
-	emake -j1 -s allyesconfig >/dev/null
-	# nommu forces a bunch of things off which we want on #387555
-	busybox_config_option n NOMMU
-	sed -i '/^#/d' .config
-	yes "" | emake -j1 -s oldconfig >/dev/null
-
-	# now turn off stuff we really don't want
-	busybox_config_option n DMALLOC
-	busybox_config_option n FEATURE_2_4_MODULES #607548
-	busybox_config_option n FEATURE_SUID_CONFIG
-	busybox_config_option n BUILD_AT_ONCE
-	busybox_config_option n BUILD_LIBBUSYBOX
-	busybox_config_option n FEATURE_CLEAN_UP
-	busybox_config_option n MONOTONIC_SYSCALL
-	busybox_config_option n USE_PORTABLE_CODE
-	busybox_config_option n WERROR
-	# triming the BSS size may be dangerous
-	busybox_config_option n FEATURE_USE_BSS_TAIL
-
-	# These cause trouble with musl.
-	if use elibc_musl; then
-		busybox_config_option n FEATURE_UTMP
-		busybox_config_option n EXTRA_COMPAT
-		busybox_config_option n FEATURE_VI_REGEX_SEARCH
-	fi
-
-	# If these are not set and we are using a uclibc/busybox setup
-	# all calls to system() will fail.
-	busybox_config_option y ASH
-	busybox_config_option y SH_IS_ASH
-	busybox_config_option n HUSH
-	busybox_config_option n SH_IS_HUSH
-
-	busybox_config_option '"/run"' PID_FILE_PATH
-	busybox_config_option '"/run/ifstate"' IFUPDOWN_IFSTATE_PATH
-
-	# disable ipv6 applets
-	if ! use ipv6; then
-		busybox_config_option n FEATURE_IPV6
-		busybox_config_option n TRACEROUTE6
-		busybox_config_option n PING6
-		busybox_config_option n UDHCPC6
-	fi
-
-	busybox_config_option pam PAM
-	busybox_config_option static STATIC
-	busybox_config_option syslog {K,SYS}LOGD LOGGER
-	busybox_config_option systemd FEATURE_SYSTEMD
-	busybox_config_option math FEATURE_AWK_LIBM
-
-	# disable features that uClibc doesn't (yet?) provide.
-	if use elibc_uclibc; then
-		busybox_config_option n FEATURE_SYNC_FANCY #567598
-		busybox_config_option n NSENTER
-	fi
-
-	# all the debug options are compiler related, so punt them
-	busybox_config_option n DEBUG_SANITIZE
-	busybox_config_option n DEBUG
-	busybox_config_option y NO_DEBUG_LIB
-	busybox_config_option n DMALLOC
-	busybox_config_option n EFENCE
-	busybox_config_option $(usex debug y n) TFTP_DEBUG
-
-	busybox_config_option selinux SELINUX
-
-	# this opt only controls mounting with <linux-2.6.23
-	busybox_config_option n FEATURE_MOUNT_NFS
-
-	# glibc-2.26 and later does not ship RPC implientation
-	busybox_config_option n FEATURE_HAVE_RPC
-	busybox_config_option n FEATURE_INETD_RPC
-
-	# default a bunch of uncommon options to off
-	local opt
-	for opt in \
-		ADD_SHELL \
-		BEEP BOOTCHARTD \
-		CRONTAB \
-		DC DEVFSD DNSD DPKG{,_DEB} \
-		FAKEIDENTD FBSPLASH FOLD FSCK_MINIX FTP{GET,PUT} \
-		FEATURE_DEVFS \
-		HOSTID HUSH \
-		INETD INOTIFYD IPCALC \
-		LOCALE_SUPPORT LOGNAME LPD \
-		MAKEMIME MKFS_MINIX MSH \
-		OD \
-		RDEV READPROFILE REFORMIME REMOVE_SHELL RFKILL RUN_PARTS RUNSV{,DIR} \
-		SLATTACH SMEMCAP SULOGIN SV{,LOGD} \
-		TASKSET TCPSVD \
-		RPM RPM2CPIO \
-		UDPSVD UUDECODE UUENCODE
-	do
-		busybox_config_option n ${opt}
-	done
-
-	emake -j1 oldconfig > /dev/null
-}
-
-src_compile() {
-	unset KBUILD_OUTPUT #88088
-	export SKIP_STRIP=y
-
-	emake V=1 busybox
-}
-
-src_install() {
-	unset KBUILD_OUTPUT #88088
-	save_config .config
-
-	into /
-	dodir /bin
-	if use sep-usr ; then
-		# install /ginit to take care of mounting stuff
-		exeinto /
-		newexe busybox_unstripped ginit
-		dosym /ginit /bin/bb
-		dosym bb /bin/busybox
-	else
-		newbin busybox_unstripped busybox
-		dosym busybox /bin/bb
-	fi
-	if use mdev ; then
-		dodir /$(get_libdir)/mdev/
-		use make-symlinks || dosym /bin/bb /sbin/mdev
-		cp "${S}"/examples/mdev_fat.conf "${ED}"/etc/mdev.conf
-
-		exeinto /$(get_libdir)/mdev/
-		doexe "${FILESDIR}"/mdev/*
-
-		newinitd "${FILESDIR}"/mdev.initd mdev
-	fi
-	if use livecd ; then
-		dosym busybox /bin/vi
-	fi
-
-	# add busybox daemon's, bug #444718
-	if busybox_config_enabled FEATURE_NTPD_SERVER; then
-		newconfd "${FILESDIR}/ntpd.confd" "busybox-ntpd"
-		newinitd "${FILESDIR}/ntpd.initd" "busybox-ntpd"
-	fi
-	if busybox_config_enabled SYSLOGD; then
-		newconfd "${FILESDIR}/syslogd.confd" "busybox-syslogd"
-		newinitd "${FILESDIR}/syslogd.initd" "busybox-syslogd"
-	fi
-	if busybox_config_enabled KLOGD; then
-		newconfd "${FILESDIR}/klogd.confd" "busybox-klogd"
-		newinitd "${FILESDIR}/klogd.initd" "busybox-klogd"
-	fi
-	if busybox_config_enabled WATCHDOG; then
-		newconfd "${FILESDIR}/watchdog.confd" "busybox-watchdog"
-		newinitd "${FILESDIR}/watchdog.initd" "busybox-watchdog"
-	fi
-	if busybox_config_enabled UDHCPC; then
-		local path=$(busybox_config_enabled UDHCPC_DEFAULT_SCRIPT)
-		exeinto "${path%/*}"
-		newexe examples/udhcp/simple.script "${path##*/}"
-	fi
-	if busybox_config_enabled UDHCPD; then
-		insinto /etc
-		doins examples/udhcp/udhcpd.conf
-	fi
-
-	# bundle up the symlink files for use later
-	emake DESTDIR="${ED}" install
-	rm _install/bin/busybox
-	# for compatibility, provide /usr/bin/env
-	mkdir -p _install/usr/bin
-	ln -s /bin/env _install/usr/bin/env
-	tar cf busybox-links.tar -C _install . || : #;die
-	insinto /usr/share/${PN}
-	use make-symlinks && doins busybox-links.tar
-
-	dodoc AUTHORS README TODO
-
-	cd docs
-	docinto txt
-	dodoc *.txt
-	docinto pod
-	dodoc *.pod
-	docinto html
-	dodoc *.html
-
-	cd ../examples
-	docinto examples
-	dodoc inittab depmod.pl *.conf *.script undeb unrpm
-}
-
-pkg_preinst() {
-	if use make-symlinks && [[ ! ${VERY_BRAVE_OR_VERY_DUMB} == "yes" ]] && [[ -z "${ROOT}" ]] ; then
-		ewarn "setting USE=make-symlinks and emerging to / is very dangerous."
-		ewarn "it WILL overwrite lots of system programs like: ls bash awk grep (bug 60805 for full list)."
-		ewarn "If you are creating a binary only and not merging this is probably ok."
-		ewarn "set env VERY_BRAVE_OR_VERY_DUMB=yes if this is really what you want."
-		die "silly options will destroy your system"
-	fi
-
-	if use make-symlinks ; then
-		mv "${ED}"/usr/share/${PN}/busybox-links.tar "${T}"/ || die
-	fi
-}
-
-pkg_postinst() {
-	savedconfig_pkg_postinst
-
-	if use make-symlinks ; then
-		cd "${T}" || die
-		mkdir _install
-		tar xf busybox-links.tar -C _install || die
-		cp -vpPR _install/* "${ROOT}"/ || die "copying links for ${x} failed"
-	fi
-
-	if use sep-usr ; then
-		elog "In order to use the sep-usr support, you have to update your"
-		elog "kernel command line.  Add the option:"
-		elog "     init=/ginit"
-		elog "To launch a different init than /sbin/init, use:"
-		elog "     init=/ginit /sbin/yourinit"
-		elog "To get a rescue shell, you may boot with:"
-		elog "     init=/ginit bb"
-	fi
-}
diff --git a/sys-apps/busybox/busybox-1.32.0-r1.ebuild b/sys-apps/busybox/busybox-1.32.0-r1.ebuild
index a325c2012322..a0431ffc93b7 100644
--- a/sys-apps/busybox/busybox-1.32.0-r1.ebuild
+++ b/sys-apps/busybox/busybox-1.32.0-r1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_P=${PN}-${PV/_/-}
 	SRC_URI="https://www.busybox.net/downloads/${MY_P}.tar.bz2"
-	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv s390 ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="GPL-2" # GPL-2 only
diff --git a/sys-apps/busybox/busybox-1.32.1.ebuild b/sys-apps/busybox/busybox-1.32.1.ebuild
index 7dd2ce8e7480..a0431ffc93b7 100644
--- a/sys-apps/busybox/busybox-1.32.1.ebuild
+++ b/sys-apps/busybox/busybox-1.32.1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_P=${PN}-${PV/_/-}
 	SRC_URI="https://www.busybox.net/downloads/${MY_P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="GPL-2" # GPL-2 only
diff --git a/sys-apps/conspy/Manifest b/sys-apps/conspy/Manifest
index efc509794187..8d3e14ad8f75 100644
--- a/sys-apps/conspy/Manifest
+++ b/sys-apps/conspy/Manifest
@@ -1,6 +1,6 @@
 AUX conspy-1.14-tinfo.patch 324 BLAKE2B ac9259d614d712164f5773ead18fd8ca7c60ec70be2d4d14c552a4293221971423e6bdc65f901ac74a0a314a6b43cb9192a13f36d43571028d4cfacf40b13ff5 SHA512 ae42dd823e5b99bcf4a3c556b9ae8724b0c35b2de4791293f7d83b2da69ddf3c5dc3454b1da2d82b5e97ef230911832fa8d9297df76e698fd6c190c98def978b
-DIST conspy-1.10.tar.gz 25211 BLAKE2B 2cb2d2c02bc38ab26bc2f08737c7e2f87dacb4fd04240bda63900e0b9018f98d28b2ee2fa00dba5ca931d59b823a72f2e0dd282828b081b31d91dd64c652dbef SHA512 f22ddff140935f767bff34c8c274ff088ebae049ac61c543ad37fa126bbab2e1cec72bdd93f51cb513d00368b909935491d06a36dbff215f17cdea7a658dbad2
 DIST conspy-1.14.tar.gz 26637 BLAKE2B 6fd4e3c35bf978ca7041aac0de23745a5c7cb200e4b29ec841cc195ea75194ed9a65ef46c85fc40b549ca68593ddab1af39499725880da403a602f97650982cd SHA512 46c25770e399c46de5aadcfbf4cff4ab5bc0f83771d6930b5752b9493f8c6864cc86d787ef6f297a00944e65987a56f6bf2cf99975eff689864745c0eef45b0d
-EBUILD conspy-1.10.ebuild 697 BLAKE2B fbb80b581c4bfdc7e2b57155a0685d63d70363e8ac1bc2a5894271741eca3704522b1f4bfc7c2a6ff1c44d55eb866b83ceebc92e42942e9d751b6579049abc51 SHA512 436173c77cc803d2c9f2b764e676192fdf36b440124506a9d290dc22c3aaed52ac3d55a4cb87e06ad8bb3eae6d69cc223f1e523c0942b674ee3258168c3428cb
-EBUILD conspy-1.14.ebuild 557 BLAKE2B afbbde0768c8d08acaa506ba4b628bf5d39f830374cafcf4d5ace387216c98f5dd33c5dd00174ee617097130609600b9a49e917a7d6047f57cbc23c0e90bb3d3 SHA512 acc0770c7954b3e678e0e854b70c062988fa755124d651c139166d0690c0ac38d47e7aaa688b70376aa14b833ae5449ec5d4c44a957d2ff544411262809c1a09
-MISC metadata.xml 243 BLAKE2B fad93b0e83e7f09f38b0dc6325e39935af5996efe0fffd095d820a8cfabc2c67fff5c0f6f51d3183e208ee062fd986a2546e177c98f97c415d158ab2f940e5e2 SHA512 21d54d715c02242f7048485e46145ad45996250e2e34e26f83b6abf7758c56c0f458446ae865c42e1dec640b44579227819c7437e6fe6aaca9f5a79db5677a7f
+DIST conspy-1.16.tar.gz 26893 BLAKE2B dfae1677a989c2b9107bf656186513c9624a02a1624976440346138b15f023deb9691d0f4ad651ab2ce0ba96a664d8501685db3ac1ad30a175d6662267d87601 SHA512 231f049c5af379ad6d4b87f462da363fad3fd70138d32986f3de42ba9ae4515b6a3e082ac8d523f70716260f9e4c84d3d01deda0df5e6e7f7f39c0e06ca87ea6
+EBUILD conspy-1.14.ebuild 555 BLAKE2B 6d6788b76b3c6f2a0c213aab6c85fa9f37182cf8b110f283f746c03bca48b399a3207018ee85dc63aeb4972f4560e4730cc6da99a18992e982814c9841364f53 SHA512 cf64540bb3e8d82fb66cc6673c3ccef8b4b59f5791b851ce151ee35f4058141675e6e54e375e7b2556bcb5fab44bb3b458aaca98cd1cf9b91a8020aa8eb5554a
+EBUILD conspy-1.16.ebuild 525 BLAKE2B 2b133ef41575c6d74f866094641fbe5f9a29d21914c11eae5c75bdd7f6e23b91d8110267fd49ba0a96dcf787f292ebeae583ecc169cf8fe5d37ccdd1d9ecd5e1 SHA512 b2317289ecc226d4c2ea651692fb6a2b1c0d41f6282083d109f4237e01a527fa8bad4c4864ec3d46dac33c20e1abaf4f360a3a5546214fde14b51e6f1af6cf6e
+MISC metadata.xml 312 BLAKE2B 1f3a2c93eee2566bdfaec2341e2f915fc85299abc816eb946cfe3eb5164dcd612ed741b9c895458c1834af000556eca0b211daaae447f4a67adbb8bc588968b1 SHA512 5cb0c52bf89c53e54947467aa49704dbd75c13ed473a3083f1dd30df67e232908a9bf91631227b64114c892972bb0f95dd32655717ca0f780f89731dceb412e7
diff --git a/sys-apps/conspy/conspy-1.10.ebuild b/sys-apps/conspy/conspy-1.10.ebuild
deleted file mode 100644
index 488d0abf5504..000000000000
--- a/sys-apps/conspy/conspy-1.10.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=true
-inherit autotools-utils
-
-DESCRIPTION="Remote control for Linux virtual consoles"
-HOMEPAGE="http://conspy.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-1/${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="sys-libs/ncurses:0="
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	autotools-utils_src_configure
-
-	mv \
-		"${WORKDIR}"/${P}_build/Makefile-automake \
-		"${WORKDIR}"/${P}_build/Makefile || die
-}
-
-src_install() {
-	dobin "${WORKDIR}"/${P}_build/${PN}
-	doman ${PN}.1
-	dodoc ChangeLog.txt README.txt
-	dohtml ${PN}.html
-}
diff --git a/sys-apps/conspy/conspy-1.14.ebuild b/sys-apps/conspy/conspy-1.14.ebuild
index 1185be89bd36..e44b2bafa38e 100644
--- a/sys-apps/conspy/conspy-1.14.ebuild
+++ b/sys-apps/conspy/conspy-1.14.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
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-1/${P}.tar.gz"
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	sys-libs/ncurses:0=
diff --git a/sys-apps/conspy/conspy-1.16.ebuild b/sys-apps/conspy/conspy-1.16.ebuild
new file mode 100644
index 000000000000..ad2a0d3382ac
--- /dev/null
+++ b/sys-apps/conspy/conspy-1.16.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Remote control for Linux virtual consoles"
+HOMEPAGE="http://conspy.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-1/${P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="sys-libs/ncurses:0="
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.14-tinfo.patch
+)
+
+DOCS=( ChangeLog.txt README.txt ${PN}.html )
+
+src_prepare() {
+	default
+	eautoreconf
+}
diff --git a/sys-apps/conspy/metadata.xml b/sys-apps/conspy/metadata.xml
index 1d132679808f..35e1a14d1c88 100644
--- a/sys-apps/conspy/metadata.xml
+++ b/sys-apps/conspy/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
 	<!-- maintainer-needed -->
 	<upstream>
+		<changelog>http://conspy.sourceforge.net/ChangeLog.txt</changelog>
 		<remote-id type="sourceforge">conspy</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/sys-apps/ed/Manifest b/sys-apps/ed/Manifest
index fb9bb20d4dba..9445e27042e9 100644
--- a/sys-apps/ed/Manifest
+++ b/sys-apps/ed/Manifest
@@ -1,5 +1,5 @@
-DIST ed-1.15.tar.xz 67924 BLAKE2B 89a5614e528f974853d8c23060b77a872ae34675f6898b713543109d3a21d0d42b4d07fea5e86e842a34619617d342058ebb82655088320764295422f700fdc4 SHA512 b723353d4f2a1e719b79cb210750596c723be87c282ab96285524eb707d5ae15c242b2d7b0a282ce2ebd0aaf221cd2be41897e79f8fc17f10e9e318a9be487a0
 DIST ed-1.16.tar.xz 68432 BLAKE2B 222ab30f72fb466372cd7ced75807e9324a916ca5962c6829d562476ae1d9ae9c01235a130e58f952bd6029b931f6362d2a695b35963ca32bb3cfa539dceab0d SHA512 45b29fb86c7e7d8569c02c8177a9c7f7e691e08e913bc07b301b34210b6dc27377858ce60dd695feb950ef436c86d7059ade90396364c95aefa3c1e7a9d3a2a4
-EBUILD ed-1.15-r1.ebuild 909 BLAKE2B 126921a2b52a84baf2888d7fbe936b966c471cf635e7cf6b432ca7ad2b2dd1bdd9b05f79f1ec1aeb20ccdf3fa5975c973a57fd9742b23d9aa9b60f3ff70f32dd SHA512 1e8096e4cb312aed67ad0d81a4bcfeb422a169fc29330b09021239760f99600b52d7f3d1d84e2072e536307a5f00b85adc3f732586001a7a11de59b29aa35f6e
+DIST ed-1.17.tar.xz 68516 BLAKE2B 975e6547f0062dc980bf4490bbbc98e0ac77fc18b2960e18a4c86a6c9190dbd6e1afb155678a1b7d891dc6cb1c5f5c07612365bbf3ffae15bf7575989e4b67d7 SHA512 ebe755ea7d12a7f54379ad8e03b703e9c0dd9aec26b4a79e5014db4368ab2d2926ae094f2ef1aef90cc9b2d541746a81af472578fa44cdf5bfe78aff5882451d
 EBUILD ed-1.16.ebuild 988 BLAKE2B e5b78961d557678be89e600f5c25939ac0337d88ce89e7474b5ce2db94281e4f27055839a1f29986ca1be4c7d79f6a49b4afad74a8b1e3890cebfcedbca1c1f4 SHA512 d017d4aecaa044458ca946c935dab5dabb46fd8d1b68c8076c14afac80a400a9c22a98c698e8a7e8ac840f036a45d52c0c3cb2ce8b622bae227b04fec22ac0a2
+EBUILD ed-1.17.ebuild 997 BLAKE2B 129c0bb2e7b206d9823281f94ac14680de98ad217067384d98ed6b6f92ac99ff4ae21229c51dc75a42a61a1f40b202aa2eda94069bd526beda30dedc440b1b12 SHA512 48ae2f43b8e415ec3959bfe9927f7095084a652cd5226d109436d5abb26f91537b20615c1bee1fd5c9453614bb3dd017d5a8e04ac04baf89ad1127448d4a7d6a
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/ed/ed-1.15-r1.ebuild b/sys-apps/ed/ed-1.17.ebuild
index 5fb157bb1917..0d33f5f31e92 100644
--- a/sys-apps/ed/ed-1.15-r1.ebuild
+++ b/sys-apps/ed/ed-1.17.ebuild
@@ -5,20 +5,25 @@ EAPI="7"
 
 inherit toolchain-funcs
 
+MY_P="${PN}-${PV/_/-}"
+
 DESCRIPTION="Your basic line editor"
 HOMEPAGE="https://www.gnu.org/software/ed/"
 #SRC_URI="mirror://gnu/ed/${P}.tar.lz"
 # Using gzip instead -- the filesize diff is small and lzip uncommon #545344
-SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${P}.tar.xz"
+SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${MY_P}.tar.xz"
 
 LICENSE="GPL-3"
 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"
+[[ "${PV}" == *_rc* ]] || \
+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=""
 
 DEPEND="sys-apps/texinfo"
 RDEPEND=""
 
+S="${WORKDIR}/${MY_P}"
+
 src_configure() {
 	# Upstream configure script is moronic.
 	./configure \
diff --git a/sys-apps/fakechroot/Manifest b/sys-apps/fakechroot/Manifest
index dfa57cafc52a..edbe73ef6285 100644
--- a/sys-apps/fakechroot/Manifest
+++ b/sys-apps/fakechroot/Manifest
@@ -1,5 +1,5 @@
 DIST fakechroot-2.19.tar.gz 492346 BLAKE2B 9ad9d6515756e867f5e936deec3f6a020f2d8937000f1b7ea9f0f915db68efc4a8f1075d9ee1932c1f20d1c20db04f97de22574f6c51905a070dc1d130a435c4 SHA512 3f1846360dac2ebf9430949651ab0e4b232218cb576a3408b7199dac1e8b555d550ec281eacc65890e79f079f558308c9d56c10a6c7ff38e1419bb45ada7450a
 DIST fakechroot-2.20.1.tar.gz 504343 BLAKE2B 73459895319c1fd6297ab455e0d15f4b9985f433d958598d8581a35268e4df0f631b39d026061fe5c00ec6b805f3bf4f5f261039b93176db460b6f936c0de1b8 SHA512 9ddc715ff5c550b700c2384284c9f0cf6c2a99353a06d8e4c3b8363f4affdf9a11757ed5d1c9b85c83499b3bec054544290508a20f2ee16d46e66dc824a924ed
 EBUILD fakechroot-2.19.ebuild 560 BLAKE2B b7ca8b03cf134d813ccf36ab31e8b183a8f02c2393abdd66081a82ebbefa2f2f3abd48c2d16a56a0f76b311226790cc9b494b535d64c390bb3a41a3f66078493 SHA512 c6159d2ebd987f2b58b392786d8cf438689d1170160ec3062baae1b4adb5228c3b0426cfbdce938846c5b0025eb61130b21d91577208b5dc22bde31b1583396c
-EBUILD fakechroot-2.20.1.ebuild 565 BLAKE2B a9f08da2069e74a5bdaefecacb714a720e4874d3346b3328b1e82bd22389e196f61200e2c0f504f156e92742026469225d9b583ec6d0044a9e83a1245633303b SHA512 e2ac3e708865d29fad990513e4924466c4d62c0e43cda6cda84ee4b8c4cd15c6d99e12a8b944ef52026eba2f7d4c3b12ead02e300d300f3bfb5b710a7cef3cf7
+EBUILD fakechroot-2.20.1.ebuild 560 BLAKE2B 35a4553fc0b2bb1fb4765a1a54d635c63b642334f88ed9d946ac2285400d2638c8d4c890240cd28f56462a643d65a953822e32784e533fc5ac592c04329ceae3 SHA512 5b55ecb9d0b079dd0fd9ae76a9492cbee8876134d13a70c2cc33fc2393cbb07aaaa12a83906d012d37a23d1c7e1b0ecdf7e66f945fb3531856a7ce21a9af58e6
 MISC metadata.xml 249 BLAKE2B c28e86a35ce07ccc4abb7f53597931333d12ba3676c698252179744b361ff822b6346565d8eaa3d1ccd699569240dfd11387f8a80c456bdcec42707863e9377f SHA512 3a7a3d57ead4b33905b475bd13d7a4e6db1c9badcc8d5954d2a9fc4232146e8ace0fecff65c66070fa47ed989b5ee68b87ec5351daacc88d7c9c06f02c8d2b64
diff --git a/sys-apps/fakechroot/fakechroot-2.20.1.ebuild b/sys-apps/fakechroot/fakechroot-2.20.1.ebuild
index 4657276f544b..bc454feffc49 100644
--- a/sys-apps/fakechroot/fakechroot-2.20.1.ebuild
+++ b/sys-apps/fakechroot/fakechroot-2.20.1.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
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/dex4er/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86"
 
 RESTRICT="test"
 
diff --git a/sys-apps/fbset/Manifest b/sys-apps/fbset/Manifest
index 97611d8cbb23..0bd7204055ee 100644
--- a/sys-apps/fbset/Manifest
+++ b/sys-apps/fbset/Manifest
@@ -1,5 +1,5 @@
 AUX fbset-2.1-add-linux-types-h.patch 275 BLAKE2B 177b56c3989bf360609d3f4541537b279e6a57e3f83420c2f55edb472a5b685602dc73b852626232784afb044a79e0532cee0107ee2a4204b42cf68fbb820b2a SHA512 fb13052aed519da65e1197d81b1c583cae0c6528c362966caa3c65b324a115345745550e2589a92e0c8bab49215dd99252c14704dff71a2950332281ae83749c
 AUX fbset-2.1-build.patch 458 BLAKE2B 93340436783aed64145832fd491223a085a4497adfcfe44a7d3ed100171e0f4dfc608beda73e2659fe93dc9a965d0df47eaf0018a4e91087cabcd5482fbffdaa SHA512 97d8df2776c634ccdcf49433bb45e8e7d944e5d7cc34fe0f55085f76f0f5dfc216323a0f4e58d256767e83987dd73e96be3393bd727d791edd12f0b63ebed819
 DIST fbset-2.1.tar.gz 27721 BLAKE2B 3d078a41d178ed5347d3e8907fa4ff55c1971ccfcca3ac07ec251f7f2949b7133b4589628e349eb29c344e9a5969844b8bb3c423b329f99943a5a5f93e152d65 SHA512 7e0380760f77b0db7dcc128f6375a3ed8da4b8521d1926faba27812c5cb20e6f1a62f3a539591a81a6b7e7986940db4cd83e03d6de487e0ab7f0760ed1d21b28
-EBUILD fbset-2.1.ebuild 784 BLAKE2B 627b4efe6f466a3a5986747ad0d83f4f84011587e4c9a6b635e22d6b10dc72c087323d8d08584991040f6ea546806519424ccd6e799228fa470a5a1ca94ea49d SHA512 209ca70d2960b032e1a89f85031be40e906e11e73509e4ca17ef064b2a00a8fdda46e081c38fdcee70ee1ad38dbb109fd3d7a41fa883a5771b477ae64e04f2d1
+EBUILD fbset-2.1.ebuild 749 BLAKE2B ce9cb40ffab4ccc50d2328cc0f48f4ff371263d60286bc22e315635e1a0f8fefb79df45c0156eb4ece6990cc3dffb41f8adb7801d27d7e86a6d05f307f2715e9 SHA512 0debd81cb517984175257bf3b03af379ecd157f0a020d722bf4a5e28dd958456ec1fe0bb1383e60d48e38dbc35508a6a72e162b59d57f59713fbce17823af9e4
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/fbset/fbset-2.1.ebuild b/sys-apps/fbset/fbset-2.1.ebuild
index d6d2979ad87a..282b230b79a3 100644
--- a/sys-apps/fbset/fbset-2.1.ebuild
+++ b/sys-apps/fbset/fbset-2.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit toolchain-funcs flag-o-matic eutils
+inherit toolchain-funcs flag-o-matic
 
 DESCRIPTION="A utility to set the framebuffer videomode"
 HOMEPAGE="http://users.telenet.be/geertu/Linux/fbdev/"
@@ -14,15 +14,14 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86"
 IUSE="static"
 
-DEPEND="sys-devel/bison
+BDEPEND="sys-devel/bison
 	sys-devel/flex"
 RDEPEND=""
 
-src_prepare() {
-	epatch "${FILESDIR}/${P}-build.patch"
-	epatch "${FILESDIR}/${P}-add-linux-types-h.patch"
-	default
-}
+PATCHES=(
+	"${FILESDIR}/${P}-build.patch"
+	"${FILESDIR}/${P}-add-linux-types-h.patch"
+)
 
 src_compile() {
 	use static && append-ldflags -static
diff --git a/sys-apps/findutils/Manifest b/sys-apps/findutils/Manifest
index 2cb58b8c035e..a8bb4991f53a 100644
--- a/sys-apps/findutils/Manifest
+++ b/sys-apps/findutils/Manifest
@@ -1,3 +1,5 @@
 DIST findutils-4.7.0.tar.xz 1895048 BLAKE2B 5d9f1f2f6bc47415057f9139af3d28abae7be9f812a15bce6016a4478eb3206f35c9329f281fda892f614d017f4f5615003ad60b6a74996ebfad81b1f4b54bf0 SHA512 650a24507f8f4ebff83ad28dd27daa4785b4038dcaadc4fe00823b976e848527074cce3f9ec34065b7f037436d2aa6e9ec099bc05d7472c29864ac2c69de7f2e
+DIST findutils-4.8.0.tar.xz 1983096 BLAKE2B e1f030ef11c252d33e92bf58dca20a6dd681938aad74b1bbd2bf64a0d175d64c8edac1edce71d13379e04a27e47ffa6099e105bb731957cf5247ffe01d856538 SHA512 eaa2da304dbeb2cd659b9210ac37da1bde4cd665c12a818eca98541c5ed5cba1050641fc0c39c0a446a5a7a87a8d654df0e0e6b0cee21752ea485188c9f1071e
 EBUILD findutils-4.7.0.ebuild 1649 BLAKE2B f51592d9eaf3b9f55e145aea9a650f4b3ed23d4a53e1666c83cce76002f436af8c297e8f9a9727aa5400821282634668741b94ad33ad1beca88d84fccfd3ebcf SHA512 e4734c5d46017cf34863096957746c9da1121d3d2f7bb100088526dd06d76a0fb2ffd92e03cf142afc10ae6e8f433c4d20c60c81247927ab9c3cb5582ffd8378
+EBUILD findutils-4.8.0.ebuild 1655 BLAKE2B af65282570a6d67b06a4924e920458762816e57a189c460b384c11ce7900edbac20a1cd1745fa368211bb353a0769a9eb322909aa82a5aa05c382134d94f4df8 SHA512 25872fef02c9e2d20e281c95701d7311c561495e2737288ab89933d6dd0597b641ccf4c81af09381ecac4af92772cb87f4578188331d8b21ec3d712af24e5e1c
 MISC metadata.xml 332 BLAKE2B 80d4fb8b79e20a96fe0b5f718c3ee4028ce08811b5cb935b77e526edc576c15c292a048424b55b1198d7848b4500e4195912e5044025a234e83b6ae858d7d031 SHA512 35951bfca173276d17ced243bd870ca62804bf3db766f964cad94f8b100ab33bc0a3b157547527451bae42fc9ea4d414e56ef06f424638e9ab4b5319c6ee8b00
diff --git a/sys-apps/findutils/findutils-4.8.0.ebuild b/sys-apps/findutils/findutils-4.8.0.ebuild
new file mode 100644
index 000000000000..54ec533e88b9
--- /dev/null
+++ b/sys-apps/findutils/findutils-4.8.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit flag-o-matic toolchain-funcs python-any-r1
+
+DESCRIPTION="GNU utilities for finding files"
+HOMEPAGE="https://www.gnu.org/software/findutils/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-3+"
+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="nls selinux static test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="selinux? ( sys-libs/libselinux )
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	test? ( ${PYTHON_DEPS} )
+"
+BDEPEND="
+	nls? ( sys-devel/gettext )
+"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# Don't build or install locate because it conflicts with mlocate,
+	# which is a secure version of locate.  See bug 18729
+	sed \
+		-e '/^SUBDIRS/s@locate@@' \
+		-e '/^built_programs/s@ frcode locate updatedb@@' \
+		-i Makefile.in || die
+
+	default
+}
+
+src_configure() {
+	if use static; then
+		append-flags -pthread
+		append-ldflags -static
+	fi
+
+	program_prefix=$(usex userland_GNU '' g)
+	local myeconfargs=(
+		--with-packager="Gentoo"
+		--with-packager-version="${PVR}"
+		--with-packager-bug-reports="https://bugs.gentoo.org/"
+		--program-prefix=${program_prefix}
+		$(use_enable nls)
+		$(use_with selinux)
+		--libexecdir='$(libdir)'/find
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	# We don't build locate, but the docs want a file in there.
+	emake -C locate dblocation.texi
+	default
+}
diff --git a/sys-apps/flashrom/Manifest b/sys-apps/flashrom/Manifest
index ab507fb27a46..1e717c752c31 100644
--- a/sys-apps/flashrom/Manifest
+++ b/sys-apps/flashrom/Manifest
@@ -4,6 +4,6 @@ AUX flashrom-1.2_meson-install-manpage.patch 1208 BLAKE2B a4290c046d82a7c8b8dbfb
 DIST flashrom-v1.2.tar.bz2 366995 BLAKE2B 091e01a91e12b486154ace334a5e74bccbb5f5311ad76e37f43a28167080757873d8c78b8f549d2e77eb984922c830895ba955b23eb6ee4fc24f1ffed259954b SHA512 8e01395a54d0d1344bc55e7e4975f43bb8e59ebe83fb5f2766d14f76756d718b487254ce9a19ef4093aed04fb9d40fff5fe8f709b18c512f6e6fad894f83d7b8
 EBUILD flashrom-1.2-r1.ebuild 4520 BLAKE2B d00007833d23c42b7b59cc1503565e75037d7f4dc835f79c280299a2818bb5ff2f48868958940a237ef52721f971a1c055f0ef35c0167ef263b5ef36232266d9 SHA512 9c7a87c29bf7f57ff9878127c8b38d21d97f3019e0a350e64d7271a208253d85091addff5799e6e947182490a8494f6743e2e2029d3b4ae6d5ab9c9b14900d3f
 EBUILD flashrom-1.2-r2.ebuild 5071 BLAKE2B 44b157d811e994054620a78ea0871e034de2396e8b8affa705b24b4d22b2932c60301f4c40337c473a946e6108f0edeb6a00ffd81136bfdbffefbd646b98e27b SHA512 9429863450f128888ff84815a0ea05cbb5b7d7e26c890f08bc6275e1fdc0a27bf484523f43a47a90942220ba88c80d9aef84d0eb807aa9d5a89e9961703fbb5e
-EBUILD flashrom-1.2-r3.ebuild 4344 BLAKE2B 35c916ff5dbc60e9033f0896720fe5c3feb2bcd610c4b228f54a5a41f8908c4a52a2b06dc62aa0300026900df8b4a07dea0f485beebb9f85fc11c8002a7c6133 SHA512 5675097256ae4add72b36a315fc580648f4ebfb7c24b59b1a6a8b4d0c2eac4202c566e98262792a583d755012aff0b1fdd7a613e9396e3e3af9c254e0123a024
+EBUILD flashrom-1.2-r3.ebuild 4343 BLAKE2B 3c075bddb34069081508434ad0310547a5271ff7af40626ace19d84d85dad4bb110bb1d0840008ddd6ab698af6ed67416550520af7c6bd00dafe8e1d11ff8858 SHA512 1ec2c508cd46cdfb9db995cc516e64e3562b568a1ea3d04a98753b042ce8aca44fa807f8c41a828953874211794aac415fe4e66c87a8d2d2c74dd0edc4e20f15
 EBUILD flashrom-9999.ebuild 4499 BLAKE2B 1253b00811d15e4ab8fe4411b133efaafe0bb3c126de9c36d47d608ce17e68dcf28927037178d27ef8e7629dfd63c72cdfcb2ad5b43df17b85b4c9caa4f3126a SHA512 80cedf318b434f2c9fca4348af7f64d7127069867b7268560a12c9f01be37b923db435b8b3e34770c443f81bdf6799576b4633d6cc5fdd5b1540601d13b2e41f
 MISC metadata.xml 5037 BLAKE2B 3027f42fb0ab5965684cb79857991888772126fbf48e2f9c314a0e01c831cf38474a20ce846964631ea95dc459629396c3796fc89d858b35f239f2a3fb343c1b SHA512 8602f9ad7419bae5f10620400f9451d16c43d12223173873ab53191c93064bf0bdb72c78ee5cde8dc9fa091ce1c6c80575cf586141080c13c971370fa0ac85f8
diff --git a/sys-apps/flashrom/flashrom-1.2-r3.ebuild b/sys-apps/flashrom/flashrom-1.2-r3.ebuild
index 106814bb570b..ba78c0a5a373 100644
--- a/sys-apps/flashrom/flashrom-1.2-r3.ebuild
+++ b/sys-apps/flashrom/flashrom-1.2-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=7
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_P="${PN}-v${PV}"
 	SRC_URI="https://download.flashrom.org/releases/${MY_P}.tar.bz2"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/sys-apps/flatpak/Manifest b/sys-apps/flatpak/Manifest
index 32e0038602d7..45e7427801a6 100644
--- a/sys-apps/flatpak/Manifest
+++ b/sys-apps/flatpak/Manifest
@@ -1,5 +1,5 @@
-DIST flatpak-1.8.2.tar.xz 1424468 BLAKE2B 4ade582176cd4ed494d0afc2a75b81168dc2263183d4ec2ef731b2d3ccbd96a7cc0fdb012f07966b4429529ab69c79b32abbcc4c1a8640b030d3ba2edfbce36d SHA512 f27c05b2621328dce31e4c31ae097765864bac84f6c1fada23f48c0235c6b85f447948a07861653f7bed4e17e43f8ff3d2c60263e23426c765c787b5f447a4e2
-DIST flatpak-1.9.2.tar.xz 1490540 BLAKE2B 23e5c4cefaadebb1e9fd599ba8e372ddef9e7e241b186032a142f60bc07b243926d3fb514cc62e90437d2e8ddb17098476b4d73913c2ad656b2719268705057a SHA512 ab4feb6c10161a1bd92e428623772c4217ce3700db412c6280de3415247ffd39eb800dc917937529a82328d778e089f45bd0a8b48fdd7e0c8bf34c494dcb085b
-EBUILD flatpak-1.8.2.ebuild 2341 BLAKE2B f27ddca127f893a74a0450e81178dafa9e01d2e824dee11e1a59f6fc584aef88c30735df457f5d5a34cf20236c69fa48251b1fd54c8167b9c89d404725437c2e SHA512 97afcccc5806149b2939ae93a725f83dd2899bfb37e66c27b6b44bdb83001b114a875ab8fa1b3a007269f9ec4be0eae8989fd549aac98aae48ab6721694c8c13
-EBUILD flatpak-1.9.2.ebuild 2344 BLAKE2B de6e186e4b9ef761378907e3a2c1deb0c8811218ece8e33586b711ba76880855f48884e4d020015d700a1ea555e76f060348a00c6b62a43489819b83f4b39498 SHA512 f4932cabb3c5031104243e214115c5b4e4696ce1b74da8a0f56afcb87c438fb7a9d802cdbce7dbf6ce5cc1f099275c86dfa62ac65c576482f8211bf846b20af4
+DIST flatpak-1.10.0.tar.xz 1504300 BLAKE2B 213fb5449b075250cbec9f43ea5b02afae809b8e58d3be0afd39a70d78431f7efc7912462ce46061a53aa4dc2ef8f5e9504cdaffe4b39d2f53292736442ceb3d SHA512 8eaabd66cbd26f5288fb72cddcd195ea4702243e9f5ceff425836b5f305e2b7a4172e67d30cc0e74ad97937c007e8f4ab81080a7ada3f528d05f74845c923aeb
+DIST flatpak-1.8.5.tar.xz 1430600 BLAKE2B dfa589073d3147725144c6c9c8f720a8b32918a6687a28af0f0284063e07278ece2ef191343b603e541401a5816ec095dbf3570ab7f27bba186ac416a359fbce SHA512 bdd330376e3d9ce184717692ee12f2b1ccbf1400411133ac955ea21c2d5e04ea7af9709a61ae897eae17fe258e40048576c2d829290721f349de7e6d74a9de71
+EBUILD flatpak-1.10.0.ebuild 2343 BLAKE2B ac0c0593efb4dd67708f92eb67b3d8967822e7052cea13bde89620b8548a9952e933a851a47dc4898994ad9c001088b4997730c7e32d4a104634a71567eecb99 SHA512 318b49b5bdd1ff3c0a84b3c23e1c27161a57a5a8e9e27cb483b28da4f2acc8f1566ce89c6c3bd9ffef44bb8b0478520f4a55a4095c0e6f85639f248a7a08fa5c
+EBUILD flatpak-1.8.5.ebuild 2346 BLAKE2B 1295a9f66a941ce5f183175c98e3a5b5f56260cf38212cf3255ce61f49440e05e0e84571c4e07dd11b8cb9a834e77c9398efdc879f033c72874d2440b66d809c SHA512 27ff9ef463217a01888a0646e859dd2b414f6413a45db21ce5dc6e84d19e35d8bedf5dc1b149534720c33678bf94f0e86fd45f60581df4cc3ba9725842effe30
 MISC metadata.xml 324 BLAKE2B edeb76b1ab3c052555564fdca397116a0ca48a7b2eafddf8958e080a7c8ccab9a04613fe67504c4c1d51d75eccc8cd25cc0d4223958f21e37f8ae056b3fd4686 SHA512 667951ea59e4871daf2508bdb4e56a68638d37bbf6fce0a56923cf3c0632a28d2eae3aedbc38e8db04e80c03fe06918569b1697e890bf20055add72ab0c7c15d
diff --git a/sys-apps/flatpak/flatpak-1.9.2.ebuild b/sys-apps/flatpak/flatpak-1.10.0.ebuild
index be7b57cfebd3..62dc9a6edd2e 100644
--- a/sys-apps/flatpak/flatpak-1.9.2.ebuild
+++ b/sys-apps/flatpak/flatpak-1.10.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://flatpak.org/"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="doc gtk kde introspection policykit seccomp systemd"
 RESTRICT+=" test"
 
diff --git a/sys-apps/flatpak/flatpak-1.8.2.ebuild b/sys-apps/flatpak/flatpak-1.8.5.ebuild
index 2402feb98a35..80b3f809a200 100644
--- a/sys-apps/flatpak/flatpak-1.8.2.ebuild
+++ b/sys-apps/flatpak/flatpak-1.8.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index 363216b17c45..e91242ad5511 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -2,9 +2,9 @@ AUX fwupd-1.3.9-logind_plugin.patch 281 BLAKE2B 237c6d6f8a43408186c6707f1c373b26
 AUX fwupd-1.4.4-help2man_var.patch 2642 BLAKE2B c0a8f9f5a79c84a1521fc85feb9cd8afbb58a44b9af69726c86d4c1720a202d1721d74a83e35bb431b2c4e6e56281249353975954a69145a80f8e8b9b0152eea SHA512 f9b72f1ca470ac2e33428e03d3287420877d20597a83bf8db21510e3ab4980a26f1832091a087888f38891be4e912cf29e1568fc67d2e604622c28303cb5701e
 AUX fwupd-r1 303 BLAKE2B c940e8272c042ce1f82817f15faa82a3fd1bcd495da187473c8409db21a5e2e10da7cbe4bfd3b89d5b51d4f4d24c7f3c10214fa93e81c78c2c021c74dfd228df SHA512 f69438b16d3fa237cec0e5b48afb37b65835cebb47c682997eb0fa8a05e1ee8872da120c4003a8c8ed0801f7b4fe6bfd252349f9aaa4efe4b9b65517e6826acb
 DIST fwupd-1.4.6.tar.gz 2368201 BLAKE2B 86f4e8a3264b69eb72a357f59db082e81534dc28822934df328b1bf94aacb7ed1a219f8e5a03a9a37a0d07c248410822a3d12c4fd6b5df3a14157795e092a095 SHA512 c456704f40e7c5a5225255dbe3e4b794819d3fa982683a31b15a81f5467f007eef00cd80dac1844eca00ebab9ae12061139ae31c1fd7e2a6e012779d2a4b59f9
-DIST fwupd-1.5.3.tar.gz 2429886 BLAKE2B 576823f6d235ed9ce2854cd0f44b9a7dd1eace46180ce978f906becaaefabb32e93f86cc672abafc99387427d33e3ab17052e98adfba4b6cbed85c5502a7ec1b SHA512 0c98dd7ca55afeaa4c895a837fc8d6eafcc51d215cc02be659916c7a39ddaa6bc3752adddba8cd2a9c77a4eca707b6c71522645f2847330c1c2ef44910451bf3
 DIST fwupd-1.5.4.tar.gz 2435897 BLAKE2B 23318f5305e3f2478c866e17e150ca3863e5eebf922e81f28a35541af4d9786dada8d2084e51b51e97343bdbf132e9b9981b8bb321ad4e76fba8c42b8b1e2e64 SHA512 961c9298e7672f720f4b6865d374b6066379f0a1c1a99356a9efd9359ee737cf9f9ab2c708f81505c971484d172b8dae96bc5f06be6e6f13c4a55604e6c346e7
+DIST fwupd-1.5.5.tar.gz 2460482 BLAKE2B 79d1b34c07a0befe355e9a6c68770dfbbc575fd540802dd20ae4f65061d9fffd6245944e6f33b702539a5e88563afc7b4c619ca1507e31465dcf40138f92902f SHA512 a37f16b01e6700b0302293a916a379a89b574eed13f63577c19fa8b0ec396bd19f7f7d5c708085f3817af60fca65c02b0ddc4370de82104a5e8e65f583ff3f4a
 EBUILD fwupd-1.4.6.ebuild 4058 BLAKE2B b5741ff3e24a276de100341b9a0bb37bcc71ac958ac19c2437b3c5471212247c75d71aad74c136ad4f103daf8397be495cc01ee858d3ea25886675e3ec637a37 SHA512 c25d3f5b6f8c74937761ba587959bc39a053ad74059750ee63d13ccc098f92c8fe91b1b8cb37d0ee86220f65f05235fd403de8a3cc670035e89a97ddceb90ff1
-EBUILD fwupd-1.5.3.ebuild 4010 BLAKE2B fedc0742777efe79ec0fb6194eff732848ff7317ce31136abaf2eb056f52821da080bed2c154751211126b6e97e95cff6b29c44ad6ea898fcf7910e6536d7a31 SHA512 f84205d02a7702cb49b9e7f5268d3fec37642ee7ff5203a17c5c31a31b536cd952e511c28aef19150c9c323ce24ee1abf93a3bb29ca25935617db5f53c558cb3
 EBUILD fwupd-1.5.4.ebuild 4005 BLAKE2B b21a36c9fa30d7dd48f1b4bb64cdb129f8d4672d17a3d3946840f9007f8e64cc4e543324d16d84b0f97863b6b205930ff3ee8e548ed28dc87b39c5a315b77eae SHA512 089ad0ce8114c28d268d97878b2a56a60e838127ddf99a7c628f279636316591ed755f3f3fd609963caddf7371b070bf9e6e45b8ba20575a697f59041c5ba54c
+EBUILD fwupd-1.5.5.ebuild 4097 BLAKE2B 6e16ecf9aff49031c667b689f27289d927de9019cd2dbe577fa8215523181b24689c2156140cee6b990308191db0da179f3e02a9bdf8a1de2f8d848573712cf3 SHA512 acc70b25cbeb9048adef22a59ba2a1fd18a7803aa9ae111ade5d9cd18933a1e00027ca9fbca72f8e07074f66c448b5998b9703d494d19168158efcd1cff1b99f
 MISC metadata.xml 1038 BLAKE2B e4c7d1ce48108981032cc875ed3512e16eb5ea81197380c42cbf828c67259ec42fa0623b12a4aca12015c2c72033e8edcfeab3a15f9970ad45886cb8b860e1a6 SHA512 0bc97498a83deb2d8ae85df1f7ed8d2191a4b9d0814f388fd32c5cd4efbdc86c5359eb9e8ba2e62561d73dd2af5537c5f6ec61862a2fd24606ac5a96c7fa30d2
diff --git a/sys-apps/fwupd/fwupd-1.5.3.ebuild b/sys-apps/fwupd/fwupd-1.5.5.ebuild
index f9dd4bc46643..2aa0d3875a00 100644
--- a/sys-apps/fwupd/fwupd-1.5.3.ebuild
+++ b/sys-apps/fwupd/fwupd-1.5.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit linux-info meson python-single-r1 vala xdg toolchain-funcs
 
@@ -55,21 +55,19 @@ CDEPEND="${PYTHON_DEPS}
 	net-misc/curl
 	virtual/libelf:0=
 	virtual/udev
-	dell? (
-		>=sys-libs/libsmbios-2.4.0
-	)
+	dell? ( >=sys-libs/libsmbios-2.4.0 )
 	elogind? ( >=sys-auth/elogind-211 )
 	flashrom? ( >=sys-apps/flashrom-1.2-r3 )
-	policykit? (
-		>=sys-auth/polkit-0.103
-	)
+	policykit? ( >=sys-auth/polkit-0.103 )
 	systemd? ( >=sys-apps/systemd-211 )
 	tpm? ( app-crypt/tpm2-tss )
 	uefi? (
 		media-libs/fontconfig
 		media-libs/freetype
+		net-libs/gnutls
 		sys-boot/gnu-efi
 		sys-boot/efibootmgr
+		sys-fs/udisks
 		sys-libs/efivar
 		x11-libs/cairo
 	)
@@ -92,7 +90,7 @@ PATCHES=(
 
 pkg_setup() {
 	python-single-r1_pkg_setup
-	if use nvme; then
+	if use nvme ; then
 		kernel_is -ge 4 4 || die "NVMe support requires kernel >= 4.4"
 	fi
 }
@@ -126,10 +124,12 @@ src_configure() {
 		$(meson_use test tests)
 		$(meson_use thunderbolt plugin_thunderbolt)
 		$(meson_use tpm)
-		$(meson_use uefi plugin_uefi)
+		$(meson_use uefi plugin_uefi_capsule)
+		$(meson_use uefi plugin_uefi_pk)
+		-Dconsolekit="false"
+		-Dcurl="true"
 		# Dependencies are not available (yet?)
 		-Dplugin_modem_manager="false"
-		-Dconsolekit="false"
 	)
 	use ppc64 && emesonargs+=( -Dplugin_msr="false" )
 	export CACHE_DIRECTORY="${T}"
diff --git a/sys-apps/gptfdisk/Manifest b/sys-apps/gptfdisk/Manifest
index 7dbd49238597..4655b08372b7 100644
--- a/sys-apps/gptfdisk/Manifest
+++ b/sys-apps/gptfdisk/Manifest
@@ -1,5 +1,7 @@
 DIST gptfdisk-1.0.4.tar.gz 204075 BLAKE2B 45be16bd4e8312e4797a70c07447702a7f966edec94a9e9e17cff89eee51bf33cb9418dcac2a103e68ea2ebb8df4e7a997fd006bfa4109cfd774838bd4bd7d19 SHA512 2df6db6974c06a6677a155d32566b8b46dad0df7781131e9018072db9acce5e41f6c4e7024b0e5f236dd43350a63572be34fb4b6fdb580cd9b946619a7a683bf
 DIST gptfdisk-1.0.5.tar.gz 205973 BLAKE2B e026dd4b4f2b63ca660feef34a1fdfb14034d0d64e4828fddf4a0c63756cbc840b3292231838f0c016256be2358069bde8a17ef0e33dec355c48406a9a930e75 SHA512 3d3a59e3488dd3d6bda5d103b9ad8b7936752210346b9787ddc936681498fba90577b6ae950c471d09a01bf6405fce32038ff1777c52db0b21e5277737fe3703
+DIST gptfdisk-1.0.6.tar.gz 207017 BLAKE2B d00e0f00dc8dce3b6088250aa39e05f41c96bee2218eec1dca34a160e70129d1006abc4341031994c53e77068b5de510b923c69858903627ccf786f3cc848a86 SHA512 a3bf95c813f707d9d41513295c3419916301a0e88b4c6ade70ad7d9422a507d519e092e68a3868d53092428d159bdbb248817c4f40d8ac88b0175d5afbd79dbc
 EBUILD gptfdisk-1.0.4.ebuild 1244 BLAKE2B 5e1ed279d0996ac37fb669a8025334a7d2168cb2956604eed0212fa6031ff97654b402d4c88434b90b9718b8993ac289c4889216a8b2dddf8097a372f6684b9d SHA512 74bbf5c72a625e7b8bc2cb6c219712bbde4e58679d3c1c0e56c2dde58a556ec25e7fe9c59c87042f419094db81b33fa85647a75246fcd398a91d3ae758ff2cba
 EBUILD gptfdisk-1.0.5.ebuild 1251 BLAKE2B 47a900ddfdf051e80f28f9c0ed3cb4649e7d1c8009aa978aba5f31c38565388249b5aa192173a8409fbd868a5a568f9a8b78c577b4f726e1f353516eac232dd8 SHA512 54a7a0f1ed2ca43c78261925be662a8ed46502a6e8f457aaed42da151e2b2804a92b0ef73db1a167e83cc9f8edd199b22e9bbae93c8167ab0bc7f2b52acb59f3
+EBUILD gptfdisk-1.0.6.ebuild 1252 BLAKE2B 31480c49e299e1dc5b3f533998d6a473c930cf18652a62ced07c6a0b27cf82d571972b47ca42f1402d4c30ae9b8b044ef3385d59a828920dc0c24c9255612375 SHA512 8392f645d7fa03a51a243bcb8c42dbee4dc7832ac32fb84d3c61016f96825dffffb2d440f1765d70da89ab498de38e874d9eaf890b922ae93b9090653b90d79c
 MISC metadata.xml 339 BLAKE2B 3f08c8aa6a482a6d923388fcbf800cac3282c5c864b9fe27868491d10e7edb75ed04f8d7bc86f5295c90e338d99d59b275ae79813b4d549a04331992526c6979 SHA512 d8334a3e741adf97739f9fef66d7b38bfab9e2d189ac5fbc96ab27a7c1551938b6184ebb08b03ef8b6864f6e43d536836f373e03f3491cacc8f6ee3496f615b5
diff --git a/sys-apps/gptfdisk/gptfdisk-1.0.6.ebuild b/sys-apps/gptfdisk/gptfdisk-1.0.6.ebuild
new file mode 100644
index 000000000000..253377c376a9
--- /dev/null
+++ b/sys-apps/gptfdisk/gptfdisk-1.0.6.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="GPT partition table manipulator for Linux"
+HOMEPAGE="https://www.rodsbooks.com/gdisk/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="kernel_linux ncurses static"
+
+# libuuid from util-linux is required.
+RDEPEND="!static? (
+		dev-libs/popt
+		ncurses? ( >=sys-libs/ncurses-5.7-r7:0=[unicode] )
+		kernel_linux? ( sys-apps/util-linux )
+	)"
+DEPEND="
+	${RDEPEND}
+	static? (
+		dev-libs/popt[static-libs(+)]
+		ncurses? ( >=sys-libs/ncurses-5.7-r7:0=[unicode,static-libs(+)] )
+		kernel_linux? ( sys-apps/util-linux[static-libs(+)] )
+	)
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+
+	tc-export CXX PKG_CONFIG
+
+	if ! use ncurses ; then
+		sed -i \
+			-e '/^all:/s: cgdisk::' \
+			Makefile || die
+	fi
+
+	sed \
+		-e '/g++/s:=:?=:g' \
+		-e 's:-lncursesw:$(shell $(PKG_CONFIG) --libs ncursesw):g' \
+		-i Makefile || die
+
+	use static && append-ldflags -static
+}
+
+src_install() {
+	dosbin gdisk sgdisk $(usex ncurses cgdisk '') fixparts
+	doman *.8
+	dodoc NEWS README
+}
diff --git a/sys-apps/groff/Manifest b/sys-apps/groff/Manifest
index 0b4e7f4483bd..0ce4c12ce88d 100644
--- a/sys-apps/groff/Manifest
+++ b/sys-apps/groff/Manifest
@@ -1,4 +1,4 @@
 AUX groff-1.19.2-man-unicode-dashes.patch 582 BLAKE2B 73e0868465b5372376e5bb5b382f2a4918fb9227208ad001f35ae041af93fda494a9be355e732697d264ec974d6e9528f9f91e0d26b2ecd82a41508222f1e439 SHA512 7d9f88c8bcc1b220c82c214f2f638601e8b44bd3933df03c74a2ef51b555773734c92044a3162bf5815932ddaae08158994a7c5106098de3e9f3bf202975de97
 DIST groff-1.22.4.tar.gz 4137480 BLAKE2B cdda8a7e8e42b8d8991656ecfbffe0cd0ed5d8932467cab2f3c1eecb3365f4a5c03321b6ed929d451c3dfb00a46046a781303a1c55c4aa65eb7d178fb36b1cbc SHA512 1c42d3cd71efaf067b5850945d9097fa1f0fadd5e2b6ba7446bd9d4f439fe1ad058e4ddb0d4e0f503682137dfc7c822944ce1e3e5cf981673f8ba197ea77126d
-EBUILD groff-1.22.4.ebuild 2523 BLAKE2B b8881820bbc9497b4dfe62672d75a910af7168cbc3a64aa9c3bf96b53c5adb7980fc1f3d4cf9565ab4b3f69450c6e06fa8afd52ffb560544621f8816459911c5 SHA512 0e3ea9668f975f8b95c0970affe43becf054e3b3530ecebcf904d20a5bde1f0e36c3fc154787941be8b8719ae2bf0bd230872392c17432a7e3b5cdd8bf788858
-MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
+EBUILD groff-1.22.4.ebuild 2588 BLAKE2B 52ab9be415539123465e1822f9e62c7c630b93e3ce8963a2bc0d4dfe5f89c07d8930794280dec38c5fbfa14b3daef8a6aeb37ab14408566fdef1f0a8d59b41e3 SHA512 2eff052b057557216f892769675b10b9a501b6b38bfbbad662b06cdfa51e73510a1463aece519c8d204b02f2daf57d2c173f9c84d81229ef81fd6e5f228f1613
+MISC metadata.xml 365 BLAKE2B 0cf4dd1abdfcb39494154dc55c2e86b43d23638caa9644b6002e2e7919b05503feda2e7ab85c0a620a8a29b7c2fef7d699795c7d3185fe24afb6c863af80336b SHA512 4fcb10e056f0c0933c7877635fe42b565f330e0b99946855f223fb6624bc3a756a94d9170bfef89ae6eddee4f751a6c0234f3a126f0a11e456c70fd931927544
diff --git a/sys-apps/groff/groff-1.22.4.ebuild b/sys-apps/groff/groff-1.22.4.ebuild
index 8ddffb888635..0d89c116a831 100644
--- a/sys-apps/groff/groff-1.22.4.ebuild
+++ b/sys-apps/groff/groff-1.22.4.ebuild
@@ -16,9 +16,10 @@ LICENSE="GPL-2"
 SLOT="0"
 [[ "${PV}" == *_rc* ]] || \
 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="examples X"
+IUSE="examples uchardet X"
 
 RDEPEND="
+	uchardet? ( app-i18n/uchardet )
 	X? (
 		x11-libs/libX11
 		x11-libs/libXt
@@ -62,6 +63,7 @@ src_prepare() {
 src_configure() {
 	local myeconfargs=(
 		--with-appresdir="${EPREFIX}"/usr/share/X11/app-defaults
+		$(use_with uchardet)
 		$(use_with X x)
 	)
 	econf "${myeconfargs[@]}"
diff --git a/sys-apps/groff/metadata.xml b/sys-apps/groff/metadata.xml
index 56c124413057..b96055e1c5a3 100644
--- a/sys-apps/groff/metadata.xml
+++ b/sys-apps/groff/metadata.xml
@@ -5,4 +5,7 @@
 	<email>base-system@gentoo.org</email>
 	<name>Gentoo Base System</name>
 </maintainer>
+<use>
+	<flag name="uchardet">Enable automatic encoding detection via <pkg>app-i18n/uchardet</pkg></flag>
+</use>
 </pkgmetadata>
diff --git a/sys-apps/haveged/Manifest b/sys-apps/haveged/Manifest
index 9e7fba8937f2..098bf6a001a8 100644
--- a/sys-apps/haveged/Manifest
+++ b/sys-apps/haveged/Manifest
@@ -3,12 +3,8 @@ AUX haveged-conf.d 207 BLAKE2B 0c6adb8c4e4f6d769e2ceb039b4a553c2e75bfdecd277c16c
 AUX haveged-init.d.3 322 BLAKE2B 7484eee6c17a5c6ecf20fa656b8c3976c732ba40f370d92635517dc14dfaab1b26778f660d03389a7bb1df217d78e9ee5d8a03934bec3b53f0edc717ca8f9ef9 SHA512 057cafb7f74423759834d470664558dcf16d226fbf1f47f569bacf04a8f76334aacc7fc25348d055847f6da4c644383b0519d80a7553058bae5264508eeb4ad4
 AUX haveged.conf 147 BLAKE2B 7bdf29071f7a1a3b90266af308ab0a0a56c46f8c9ae8b6acc3b4055a89ac14c0e3cbc2e370d344debe8fb69f9ceacae6882c17d2620e0daea171d349073672d4 SHA512 052696a31ab7b9a0dda06ccb24c08524bef0cfa9c601a1ba6819bb2e42886a6b3d9b77710880d589534fae3c600d123304586f825fac554e68ce50d8b5acd563
 AUX service.gentoo 322 BLAKE2B 302a1506492e5122a03ea616de11dea493637d904cde1415abbbdeff3794251e911c6efee7d9331a4cb1e8dde1dbb579f46935cd52c58fbaeb77404b587985cb SHA512 7d7caaef45cbf268a1c1a813537a9e4ef6543addcfebe99fd178e37a8c516bbd5419fb8f47decf2370cee0562f066c72501b6c176307b1f5884b56f561386b88
-DIST haveged-1.9.13.tar.gz 495737 BLAKE2B 5a8c154d27ca7dc71e7d34051a5e24ec2bd49be7a68175c351293958261083f2cfb0b318daaf005cc95f6a9b76664df63d4c41d28d4276f6906081d21097475a SHA512 dff0f4273643ed6b2fea26f1ba5c17be3d655d27ab0b96091bcd23e1cb984fc440cc81e694cc7bcc84a9a667d96f3c04a73675f79ecae525ee56390940cce576
 DIST haveged-1.9.14.tar.gz 496346 BLAKE2B 9df0b51dc5856b4b943a0c1c1c8f9b947dd3d22bdf45639920911e2619264fc771cba68ad70559b34523a6361cc5da588392bf0b24de1dbf824f1dfc7898a2bb SHA512 bdb6d9de667298d32b474bcbdd5f90c12b870b154b86f8817948de787d378b428bf823234f20129666bd1abced2f154643b5999e43975969f6bba87124650924
-DIST haveged-1.9.2.tar.gz 494682 BLAKE2B a972d128b19fecc3d01e17bd4cf6d5ec03ae716c4b4934c73193e03f3d3f9ff3461a8280ec0a20885499fd334343deb193ddc98b0697b2b14f92fff897bbf59b SHA512 65f70950fb90ef9c24ff3bf1b26e19a9cde2bec4749e2e64d5461a51646a20cf610efa2a5014219b8605957afa0084abd2ba11c7dc15f9379afce784971627b8
 DIST haveged-1.9.8c.tar.gz 494470 BLAKE2B 840aa0b985107feb38a7b5823f94de3473e79f75542565e571c4ec9b2640dddcabb09d598e101678defbdd2eb04fe2fc1fb1f8466157e53d7c41272131450dec SHA512 24167e8a9773d96b3c57cd3e57def7e291f3de86873e796cafc1a59d3f89818c6cb8d46d05e5ae4eb2683fc86b313b1acaed7f210724dadb7df3939e1b3900aa
-EBUILD haveged-1.9.13.ebuild 951 BLAKE2B 8cb8eacf9227fd0d68cab0f612145c806eddbd02dac0420bb20355a2aa685b0180a518a83faff6768e0026405e5979a62cf820217ada046ca863ed6137593686 SHA512 b0427a8e45ba0dea92e0395dd1de5c9cc6a6a14f97fd0456891080401b6bcdc76024f9dba965b672ce9cde979c35a998c33698b3e427b202ae81be28f0510a41
-EBUILD haveged-1.9.14.ebuild 951 BLAKE2B 12ef8d388695bf07df766b355ae25d2e5c1d17fd485a013aa75bb1ad2ea81bed6b7e76830a5aaffc05a3db2be57e8f5a2e81a068b5715fbeda921fe3ab3f994b SHA512 b48393a5c4ce57b27ca0f6f39bc3fe0cba16f2c5047d3b9e3ecd27c50542d2c71392f60e5ff2ff4f9e59d3762eee64ceec312298e5dbcba01bf2aa539ff538dc
-EBUILD haveged-1.9.2-r1.ebuild 963 BLAKE2B bf2f2452d79d16443399910a5e21867b76ee3ba1199018b866419bf33b75b7b02dcca985b26cc062a8871160382a83d24aa151188e0eba03c2fec80df127aefa SHA512 3322e6668948ce18dc1857fb8f72521ce348f0590fd81e6fc945e37724653b8e4e856ad403e7bc4f6dfca17ac69221a57dd29227d123987caa91c857625fd52b
-EBUILD haveged-1.9.8c.ebuild 1013 BLAKE2B c6bd3c7abed9f3689ae5963510e90e2e8d313e9de6df1e1923685b5ed149997251982af5f4180c0003644d9eb37759e7e1d680403d6fea2f43ec3042b60d34d5 SHA512 e497acb97c2086916b9c9876926493805cc5873ba253ec9a2549383db3696a51301633b2d73ff86d24b0b134cf24c2519c42b1fdcd9142cae3cdb16324310404
+EBUILD haveged-1.9.14-r1.ebuild 1002 BLAKE2B 886fda49b906433092ca85b679b8bcddf6c6959649dbe066f90b5c0802c57b2b07deba62212043f68294a75f57ecc41fe9015d87a2f5e781e9a084b14a8a40d0 SHA512 e042a95f3810fc69e8e5bd5e2be27ad119fbc2fc1768461867d3aaa7e3f1bda7623f36b9a3aa7a45c86fdc1c054fda3e4d602fb9da85067f6f99965542882cfb
+EBUILD haveged-1.9.8c-r1.ebuild 1064 BLAKE2B 60289aa161de1a57286387bb5ad64e67287120e659763f3874bd10282cb32f42619d9e9c749b7a7cd2ac237208bf0ddb1ffa73550e46687d3f62f946c58a5e75 SHA512 7098595525b1d88bbf6d182332b843cb4e5c26baf450c9231a88c59d5da5b8ce9d0c045483a00213225b3b9d5fbd3bb17896183123a6e0c4321045e7f846637d
 MISC metadata.xml 371 BLAKE2B d44d1873136cfff8c9c1ae42ee0ded780af875987caecc98494afba60017c3da105423642f10f2475d344636d54c71885607649ceb4f285a477698b40449d2ef SHA512 640e188a0829d4408d9bc7ca0c7558222ed8148afef25a88a136c0ae5bb44531bc8352c9c1da1c13e395cb54d67c62a485fa4f6329ad7b76255def9d979b70d0
diff --git a/sys-apps/haveged/haveged-1.9.13.ebuild b/sys-apps/haveged/haveged-1.9.13.ebuild
deleted file mode 100644
index e312af7ae69d..000000000000
--- a/sys-apps/haveged/haveged-1.9.13.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit systemd
-
-DESCRIPTION="A simple entropy daemon using the HAVEGE algorithm"
-HOMEPAGE="http://www.issihosts.com/haveged/"
-SRC_URI="https://github.com/jirka-h/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE="selinux static-libs threads"
-
-RDEPEND="
-	!<sys-apps/openrc-0.11.8
-	selinux? ( sec-policy/selinux-entropyd )
-"
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable threads)
-		--bindir=/usr/sbin
-		--enable-nistest
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	# Install gentoo ones instead
-	newinitd "${FILESDIR}"/haveged-init.d.3 haveged
-	newconfd "${FILESDIR}"/haveged-conf.d haveged
-
-	systemd_newunit "${FILESDIR}"/service.gentoo ${PN}.service
-	insinto /etc
-	doins "${FILESDIR}"/haveged.conf
-}
diff --git a/sys-apps/haveged/haveged-1.9.14.ebuild b/sys-apps/haveged/haveged-1.9.14-r1.ebuild
index 92c901487af4..832568999fea 100644
--- a/sys-apps/haveged/haveged-1.9.14.ebuild
+++ b/sys-apps/haveged/haveged-1.9.14-r1.ebuild
@@ -38,4 +38,6 @@ src_install() {
 	systemd_newunit "${FILESDIR}"/service.gentoo ${PN}.service
 	insinto /etc
 	doins "${FILESDIR}"/haveged.conf
+
+	find "${ED}" -type f -name "*.la" -delete || die
 }
diff --git a/sys-apps/haveged/haveged-1.9.2-r1.ebuild b/sys-apps/haveged/haveged-1.9.2-r1.ebuild
deleted file mode 100644
index c3429c8d4723..000000000000
--- a/sys-apps/haveged/haveged-1.9.2-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit systemd
-
-DESCRIPTION="A simple entropy daemon using the HAVEGE algorithm"
-HOMEPAGE="http://www.issihosts.com/haveged/"
-SRC_URI="http://www.issihosts.com/haveged/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~ppc x86"
-IUSE="selinux static-libs"
-
-DEPEND=""
-RDEPEND="!<sys-apps/openrc-0.11.8
-		 selinux? ( sec-policy/selinux-entropyd )"
-
-# threads are broken right now, but eventually
-# we should add $(use_enable threads)
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		--bindir=/usr/sbin \
-		--enable-nistest \
-		--disable-threads
-}
-
-src_install() {
-	default
-
-	# Install gentoo ones instead
-	newinitd "${FILESDIR}"/haveged-init.d.3 haveged
-	newconfd "${FILESDIR}"/haveged-conf.d haveged
-
-	systemd_newunit "${FILESDIR}"/service.gentoo ${PN}.service
-	insinto /etc
-	doins "${FILESDIR}"/haveged.conf
-}
diff --git a/sys-apps/haveged/haveged-1.9.8c.ebuild b/sys-apps/haveged/haveged-1.9.8c-r1.ebuild
index 52a76b0dcb25..8861599ce688 100644
--- a/sys-apps/haveged/haveged-1.9.8c.ebuild
+++ b/sys-apps/haveged/haveged-1.9.8c-r1.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=7
@@ -42,4 +42,6 @@ src_install() {
 	systemd_newunit "${FILESDIR}"/service.gentoo ${PN}.service
 	insinto /etc
 	doins "${FILESDIR}"/haveged.conf
+
+	find "${ED}" -type f -name "*.la" -delete || die
 }
diff --git a/sys-apps/help2man/Manifest b/sys-apps/help2man/Manifest
index 12f834395ab4..79f7a3358acc 100644
--- a/sys-apps/help2man/Manifest
+++ b/sys-apps/help2man/Manifest
@@ -1,4 +1,6 @@
 AUX help2man-1.46.1-linguas.patch 2352 BLAKE2B c79cf163fc358f08192517527ee59df2ac429fdf8b8bcc4e387ed686d44b3aceebcd517578cbf6348d751ce2fb62f1b7580d6a645a4f912c7fa374eb165b2600 SHA512 5907aed1745b199b0cad44f6e7669c663761b308b2bb1b669be8ba118d990481c37d1da5477df2cfa9cba30ecffe99c3863215779d683f056fe0c41241a0049b
 DIST help2man-1.47.16.tar.xz 203036 BLAKE2B 8e06c2c2e90adfc2ab8345908516b15ae50b02a7a9554d5d9beee4373b71c131aeaa0c148b9a988c531bbfe2149c25069af56a79101a4248b6c1adfeb734a132 SHA512 b427e60a9e3d2e805caf1ae84c337b09c7ca6f92b7ff14771f946c4a1bf7adf177df99b9c1c223ad76df99756005ababf5b548ff8e08d4746702ff7f8150b544
+DIST help2man-1.47.17.tar.xz 211476 BLAKE2B 67b1ccd4b6b66510a2fff424663bc2051e49e93c37c7e2a2b4631f3781d3773a97fd1773f96ca5ca2ba644bcd79ae35338931eff857ce199a847cc312d778b0e SHA512 185cd04aa6db6d8a4c898b61ad6a0aded7775659c7f02244b45927310eb3f8cd932fe9dd725ccac3e793aa22c656338b5d16f291f3a0420ed121681d4a4bac25
 EBUILD help2man-1.47.16.ebuild 1034 BLAKE2B dc7c42555d1efd3896ba09d0602017ad721ab5aa94cc2dad5b9cc4f127f191a64fffc19f47f838ed81d2f4918d5262189ff369c220e9afd4f02d6a2dc6f11bb9 SHA512 e6dac61eb7d535c184cc15ea54c70bda3e0745a21cb8d47acaf6186780fb836e90f92d1869c9335433f857a44b9d6be24cc21ffe25986320cd33b8bd4e2054bc
+EBUILD help2man-1.47.17.ebuild 1043 BLAKE2B a409c6688242306b58aa9b395c4800166b31a301bd356cd93505e522169ebb4e1b1b82b61b3f2ed737691956fae33516faf69dd9819b8b07abe4bbc981ab7f23 SHA512 68652e40fd2ab4e8ffd862c9783bc7aa891e76a30419b955891134a7a96f8e132ce08dcb4b1be32937398970dfff57c6a09b401fad7cb6207c16a99a12a2a491
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/help2man/help2man-1.47.17.ebuild b/sys-apps/help2man/help2man-1.47.17.ebuild
new file mode 100644
index 000000000000..2f5c10989e9b
--- /dev/null
+++ b/sys-apps/help2man/help2man-1.47.17.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="GNU utility to convert program --help output to a man page"
+HOMEPAGE="https://www.gnu.org/software/help2man/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="nls"
+
+RDEPEND="dev-lang/perl
+	nls? ( dev-perl/Locale-gettext )"
+DEPEND="${RDEPEND}"
+
+DOCS=( debian/changelog NEWS README THANKS ) #385753
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.46.1-linguas.patch
+)
+
+src_prepare() {
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		sed -i \
+			-e 's/-shared/-bundle/' \
+			Makefile.in || die
+	fi
+	default
+}
+
+src_configure() {
+	# Disable gettext requirement as the release includes the gmo files #555018
+	local myeconfargs=(
+		ac_cv_path_MSGFMT=$(type -P false)
+		$(use_enable nls)
+	)
+	econf "${myeconfargs[@]}"
+}
diff --git a/sys-apps/kmod/Manifest b/sys-apps/kmod/Manifest
index d5ed15fb65d3..7a201b157955 100644
--- a/sys-apps/kmod/Manifest
+++ b/sys-apps/kmod/Manifest
@@ -1,9 +1,8 @@
-AUX kmod-26-libressl.patch 4014 BLAKE2B db7a2ce3206210cd0358d136c8d0568dae077399075164320ff608ca6ba5f1bca16d206ca975d8f5f9977ec80fcfed5b81146f9649d61e8e88f5f8589368ab1e SHA512 b5d26fda11398d4877821cbe8bd36967bec095d6e6c2489ec8aa4ef968795f0e238a74e2a9c4db8435fc176dc046920a365771a387a25cb1d0ea763210a92483
 AUX kmod-27-depmod-do-not-output-.bin-to-stdout.patch 1521 BLAKE2B 3b1f0808198f065a017bccfdffddbcf76382004c9a7710ff682ed27a502660d7686f544b904a66eb10d50c094152eceb02e9156473380c430a2996720bd384b5 SHA512 344185ea38f4bb6a939b8ce29cf406776b60f193e5e0eaea7ed154fcc4a9be4237bcd2635d2bc614d74a9109fad056674e9356022b46e3bf00fc5db6c964a3de
 AUX kmod-static-nodes-r1 500 BLAKE2B 44ae03377e6cc7b5a271063828fcb39ec6925d82e52207771e1b6b4f921d0a07e51e97a8e6f432b542d88fb0195e1298cd54ba92d462a828ddd94dab7f924eb3 SHA512 8210d90f5d0702aea626b6db00adbabbd550009d8275fe430c8b113fcb0593a4dfb9efb22c061dde259e1bd94390be49823415d3fd99909e22a2bbf7ae349f63
-DIST kmod-26.tar.xz 552032 BLAKE2B 3e596d06b48599bf4919346475a036b058fb18a7b19d39953e24fa943b95fdbe34a29a5062f6b4fe3510e667ae873d3b9ae03b72350fa85ddbb40ca6a7730b34 SHA512 3ca276c6fc13c2dd2220ec528b8dc4ab4edee5d2b22e16b6f945c552e51f74342c01c33a53740e6af8c893d42bd4d6f629cd8fa6e15ef8bd8da30cb003ef0865
 DIST kmod-27.tar.xz 548924 BLAKE2B 9f12bf5792d4c867e28e0776c279369c063e84269212e3f699ae6e5e69b8b2b466b5033e43e17ac64d6101592edcf3c34881916afb6ae676b49dc8838dfe1396 SHA512 e0513094935333fca1fb4c3e3493b232507a579ab00a6457cc9ed3e928363d05aad80634fb65a8287a336bf9895194c7be8ddc41bb088a6c2cca44fc1bfbdb6c
-EBUILD kmod-26-r5.ebuild 5144 BLAKE2B d9e4f661d521e39d4d47376713c771b4f14f29138d4b4647d8b8bf47696911b9944f284634a575dac08029229e4924b2e7510a54b895848f53bf699fbab98adb SHA512 00a1c056e0736558c4f7d8469634582dd888869fa8afc6905abb8915a32f34da0b15ad91855f9925249de89bccd64de8e80479048807d34c82e05430ae4a6458
+DIST kmod-28.tar.xz 552448 BLAKE2B af41a0c5681fb94eb5264f46ed2ae666d171d4e2d0dc21419a3c2f4b12a783350a06b408fb02a7afb00fcea1cd994ee35864c1ec8b7a8cc58a8c9dcdeffaf1b3 SHA512 50646dc72675a5e17b01e327e3d41b972f18aaeac20c8b00983c4d099c6218f35c32c184a833a2d7f716755d6a86851c90913d2835874cef933bdc4a9722df9a
 EBUILD kmod-27-r2.ebuild 5268 BLAKE2B c2f171bee8116149fe57fc28d5b816a50ab3f4661b61736158daa84a1fbb9c7abe861cfe7350564d12e2686becbb396c8a37327ef9db822808f4c0c18341dbba SHA512 291260c0c7f871eab37dd6603a0de78e68bd1af75b6e33c6bee8c0c45de1b7b50922fecec17d8e332001d37cede84f15d7bd61e19152e5e4a8cba1b8e06de129
-EBUILD kmod-9999.ebuild 5201 BLAKE2B aac231cb1b5e3ef35ee66d0cf3b2a61bca0ebbe8548404642539cde4803d6d7c15ffb7fb86561972d86306e4e308182884542d4f623fe6f33319ae60dfcdeae0 SHA512 a1b26b0cb6ab8bfc5a723bc238d1860d3ca0174991736a0fd330bbf698165649a4c424964c89ae64b7c21e1281c1add1a64ae7149d78b800d5e6c2423c9ea4d2
+EBUILD kmod-28.ebuild 5296 BLAKE2B 9f38f8d9199988c5511761d5df8f80b0b7674a47a7a80aff032c9d3dc35f41b9da7b1731950abaa70be358be3f1b757f528454062321dc6f1c4625c70e60b4d3 SHA512 e5035726a72992ea75a18ee428ae24b3b815169d489e7854361689078d44abc94c758dccdd6f3c2409d7458bdad34f35e626a4ce855595458ada9c4bc43998d9
+EBUILD kmod-9999.ebuild 5300 BLAKE2B c2a476ba315c1e512a5a15032f6a09c50f591a10010d7b269b3746a9d2b93cc3ebc9f0107e3ee85e5e20ff0e0d0bfdc6c8f617488e8bcd857c668543d336a8f7 SHA512 ae897b9388fd5307b7016415bf05ca04b5a3f632286e882feca76f91b4a23ed33f3fc88b3c35d5b1a0c001aaffa47b9d01ba05958bf2643b3097709189bc04b5
 MISC metadata.xml 689 BLAKE2B 51a8819951b28ef934c7de80176ef6aeeacb09ac073a7fcf056428ee2c1a0ad851119e680b4ef2cdd48a26541c2a3e16f6cb6606231a6ed542a00cfdb0e3b2d4 SHA512 4282ad5b89b14e8e50aad8779e68cca6eb2e1c876a3284b6782a221c0da2e79db871d1d23d686c8ac1532ea453faa1291ff596afff716431d0560460953c3aed
diff --git a/sys-apps/kmod/files/kmod-26-libressl.patch b/sys-apps/kmod/files/kmod-26-libressl.patch
deleted file mode 100644
index cb36ab401c21..000000000000
--- a/sys-apps/kmod/files/kmod-26-libressl.patch
+++ /dev/null
@@ -1,143 +0,0 @@
-From 628677e066198d8658d7edd5511a5bb27cd229f5 Mon Sep 17 00:00:00 2001
-From: Stefan Strogin <steils@gentoo.org>
-Date: Sun, 19 May 2019 03:42:01 +0300
-Subject: [PATCH] libkmod-signature: use PKCS#7 instead of CMS
-
-Linux uses either PKCS #7 or CMS for signing modules (see
-scripts/sign-file.c). CMS is not supported by LibreSSL or older OpenSSL,
-so PKCS #7 is used on systems with these libcrypto providers.
-
-CMS and PKCS #7 formats are very similar. CMS is newer but is as much as
-possible backward compatible with PKCS #7 [1]. PKCS #7 is supported in
-the latest OpenSSL as well as CMS. The fields used for signing kernel
-modules are supported both in PKCS #7 and CMS.
-
-For now modinfo uses CMS with no alternative requiring OpenSSL 1.1.0 or
-newer.
-
-Use PKCS #7 for parsing module signature information, so that modinfo
-could be used both with OpenSSL and LibreSSL.
-
-[1] https://tools.ietf.org/html/rfc5652#section-1.1
-
-Changes v1->v2:
-- Don't use ifdefs for keeping redundant CMS code, just use PKCS #7 both
-with OpenSSL and LibreSSL.
-
-Upstream-Status: Accepted
-[https://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git/commit/?id=628677e066198d8658d7edd5511a5bb27cd229f5]
-Signed-off-by: Stefan Strogin <steils@gentoo.org>
----
- libkmod/libkmod-signature.c | 37 +++++++++++++++++++------------------
- 1 file changed, 19 insertions(+), 18 deletions(-)
-
-diff --git a/libkmod/libkmod-signature.c b/libkmod/libkmod-signature.c
-index 48d0145..4e8748c 100644
---- a/libkmod/libkmod-signature.c
-+++ b/libkmod/libkmod-signature.c
-@@ -20,7 +20,7 @@
- #include <endian.h>
- #include <inttypes.h>
- #ifdef ENABLE_OPENSSL
--#include <openssl/cms.h>
-+#include <openssl/pkcs7.h>
- #include <openssl/ssl.h>
- #endif
- #include <stdio.h>
-@@ -122,7 +122,7 @@ static bool fill_default(const char *mem, off_t size,
- #ifdef ENABLE_OPENSSL
- 
- struct pkcs7_private {
--	CMS_ContentInfo *cms;
-+	PKCS7 *pkcs7;
- 	unsigned char *key_id;
- 	BIGNUM *sno;
- };
-@@ -132,7 +132,7 @@ static void pkcs7_free(void *s)
- 	struct kmod_signature_info *si = s;
- 	struct pkcs7_private *pvt = si->private;
- 
--	CMS_ContentInfo_free(pvt->cms);
-+	PKCS7_free(pvt->pkcs7);
- 	BN_free(pvt->sno);
- 	free(pvt->key_id);
- 	free(pvt);
-@@ -197,11 +197,10 @@ static bool fill_pkcs7(const char *mem, off_t size,
- 		       struct kmod_signature_info *sig_info)
- {
- 	const char *pkcs7_raw;
--	CMS_ContentInfo *cms;
--	STACK_OF(CMS_SignerInfo) *sis;
--	CMS_SignerInfo *si;
--	int rc;
--	ASN1_OCTET_STRING *key_id;
-+	PKCS7 *pkcs7;
-+	STACK_OF(PKCS7_SIGNER_INFO) *sis;
-+	PKCS7_SIGNER_INFO *si;
-+	PKCS7_ISSUER_AND_SERIAL *is;
- 	X509_NAME *issuer;
- 	ASN1_INTEGER *sno;
- 	ASN1_OCTET_STRING *sig;
-@@ -220,31 +219,33 @@ static bool fill_pkcs7(const char *mem, off_t size,
- 
- 	in = BIO_new_mem_buf(pkcs7_raw, sig_len);
- 
--	cms = d2i_CMS_bio(in, NULL);
--	if (cms == NULL) {
-+	pkcs7 = d2i_PKCS7_bio(in, NULL);
-+	if (pkcs7 == NULL) {
- 		BIO_free(in);
- 		return false;
- 	}
- 
- 	BIO_free(in);
- 
--	sis = CMS_get0_SignerInfos(cms);
-+	sis = PKCS7_get_signer_info(pkcs7);
- 	if (sis == NULL)
- 		goto err;
- 
--	si = sk_CMS_SignerInfo_value(sis, 0);
-+	si = sk_PKCS7_SIGNER_INFO_value(sis, 0);
- 	if (si == NULL)
- 		goto err;
- 
--	rc = CMS_SignerInfo_get0_signer_id(si, &key_id, &issuer, &sno);
--	if (rc == 0)
-+	is = si->issuer_and_serial;
-+	if (is == NULL)
- 		goto err;
-+	issuer = is->issuer;
-+	sno = is->serial;
- 
--	sig = CMS_SignerInfo_get0_signature(si);
-+	sig = si->enc_digest;
- 	if (sig == NULL)
- 		goto err;
- 
--	CMS_SignerInfo_get0_algs(si, NULL, NULL, &dig_alg, &sig_alg);
-+	PKCS7_SIGNER_INFO_get0_algs(si, NULL, &dig_alg, &sig_alg);
- 
- 	sig_info->sig = (const char *)ASN1_STRING_get0_data(sig);
- 	sig_info->sig_len = ASN1_STRING_length(sig);
-@@ -277,7 +278,7 @@ static bool fill_pkcs7(const char *mem, off_t size,
- 	if (pvt == NULL)
- 		goto err3;
- 
--	pvt->cms = cms;
-+	pvt->pkcs7 = pkcs7;
- 	pvt->key_id = key_id_str;
- 	pvt->sno = sno_bn;
- 	sig_info->private = pvt;
-@@ -290,7 +291,7 @@ err3:
- err2:
- 	BN_free(sno_bn);
- err:
--	CMS_ContentInfo_free(cms);
-+	PKCS7_free(pkcs7);
- 	return false;
- }
- 
--- 
-2.21.0
-
diff --git a/sys-apps/kmod/kmod-26-r5.ebuild b/sys-apps/kmod/kmod-28.ebuild
index 53000bb3debc..94820b237d3c 100644
--- a/sys-apps/kmod/kmod-26-r5.ebuild
+++ b/sys-apps/kmod/kmod-28.ebuild
@@ -1,19 +1,19 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6..9} )
 
-inherit bash-completion-r1 multilib python-r1
+inherit autotools bash-completion-r1 multilib python-r1
 
 if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git"
-	inherit autotools git-r3
+	inherit git-r3
 else
 	SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
-	inherit libtool
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	#inherit libtool
 fi
 
 DESCRIPTION="library and tools for managing linux kernel modules"
@@ -21,7 +21,7 @@ HOMEPAGE="https://git.kernel.org/?p=utils/kernel/kmod/kmod.git"
 
 LICENSE="LGPL-2"
 SLOT="0"
-IUSE="debug doc libressl lzma pkcs7 python static-libs +tools zlib"
+IUSE="debug doc libressl +lzma pkcs7 python static-libs +tools +zlib zstd"
 
 # Upstream does not support running the test suite with custom configure flags.
 # I was also told that the test suite is intended for kmod developers.
@@ -29,6 +29,7 @@ IUSE="debug doc libressl lzma pkcs7 python static-libs +tools zlib"
 # See bug #408915.
 RESTRICT="test"
 
+# >=zlib-1.2.6 required because of bug #427130
 # Block systemd below 217 for -static-nodes-indicate-that-creation-of-static-nodes-.patch
 RDEPEND="!sys-apps/module-init-tools
 	!sys-apps/modutils
@@ -40,15 +41,21 @@ RDEPEND="!sys-apps/module-init-tools
 		!libressl? ( >=dev-libs/openssl-1.1.0:0= )
 		libressl? ( dev-libs/libressl:0= )
 	)
-	zlib? ( >=sys-libs/zlib-1.2.6 )" #427130
-DEPEND="${RDEPEND}
-	doc? ( dev-util/gtk-doc )
+	zlib? ( >=sys-libs/zlib-1.2.6 )
+	zstd? ( >=app-arch/zstd-1.4.4 )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	doc? (
+		dev-util/gtk-doc
+		dev-util/gtk-doc-am
+	)
 	lzma? ( virtual/pkgconfig )
 	python? (
 		dev-python/cython[${PYTHON_USEDEP}]
 		virtual/pkgconfig
 		)
-	zlib? ( virtual/pkgconfig )"
+	zlib? ( virtual/pkgconfig )
+"
 if [[ ${PV} == 9999* ]]; then
 	DEPEND="${DEPEND}
 		dev-libs/libxslt"
@@ -58,15 +65,12 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 DOCS="NEWS README TODO"
 
-PATCHES=(
-	"${FILESDIR}/${P}-libressl.patch" # bug 677960
-)
-
 src_prepare() {
 	default
 
-	if [[ ! -e configure ]] ; then
+	if [[ ! -e configure ]] || use doc ; then
 		if use doc; then
+			cp "${EROOT}"/usr/share/aclocal/gtk-doc.m4 m4 || die
 			gtkdocize --copy --docdir libkmod/docs || die
 		else
 			touch libkmod/docs/gtk-doc.make
@@ -89,12 +93,13 @@ src_configure() {
 		--with-bashcompletiondir="$(get_bashcompdir)"
 		--with-rootlibdir="${EPREFIX}/$(get_libdir)"
 		$(use_enable debug)
-		$(use_enable doc gtk-doc)
+		$(usex doc '--enable-gtk-doc' '')
 		$(use_enable static-libs static)
 		$(use_enable tools)
 		$(use_with lzma xz)
 		$(use_with pkcs7 openssl)
 		$(use_with zlib)
+		$(use_with zstd)
 	)
 
 	local ECONF_SOURCE="${S}"
@@ -148,7 +153,7 @@ src_install() {
 		python_foreach_impl python_install
 	fi
 
-	find "${ED}" -name "*.la" -delete || die
+	find "${ED}" -type f -name "*.la" -delete || die
 
 	if use tools; then
 		local cmd
@@ -174,23 +179,23 @@ src_install() {
 }
 
 pkg_postinst() {
-	if [[ -L ${EROOT%/}/etc/runlevels/boot/static-nodes ]]; then
+	if [[ -L ${EROOT}/etc/runlevels/boot/static-nodes ]]; then
 		ewarn "Removing old conflicting static-nodes init script from the boot runlevel"
-		rm -f "${EROOT%/}"/etc/runlevels/boot/static-nodes
+		rm -f "${EROOT}"/etc/runlevels/boot/static-nodes
 	fi
 
 	# Add kmod to the runlevel automatically if this is the first install of this package.
 	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		if [[ ! -d ${EROOT%/}/etc/runlevels/sysinit ]]; then
-			mkdir -p "${EROOT%/}"/etc/runlevels/sysinit
+		if [[ ! -d ${EROOT}/etc/runlevels/sysinit ]]; then
+			mkdir -p "${EROOT}"/etc/runlevels/sysinit
 		fi
-		if [[ -x ${EROOT%/}/etc/init.d/kmod-static-nodes ]]; then
-			ln -s /etc/init.d/kmod-static-nodes "${EROOT%/}"/etc/runlevels/sysinit/kmod-static-nodes
+		if [[ -x ${EROOT}/etc/init.d/kmod-static-nodes ]]; then
+			ln -s /etc/init.d/kmod-static-nodes "${EROOT}"/etc/runlevels/sysinit/kmod-static-nodes
 		fi
 	fi
 
-	if [[ -e ${EROOT%/}/etc/runlevels/sysinit ]]; then
-		if ! has_version sys-apps/systemd && [[ ! -e ${EROOT%/}/etc/runlevels/sysinit/kmod-static-nodes ]]; then
+	if [[ -e ${EROOT}/etc/runlevels/sysinit ]]; then
+		if ! has_version sys-apps/systemd && [[ ! -e ${EROOT}/etc/runlevels/sysinit/kmod-static-nodes ]]; then
 			ewarn
 			ewarn "You need to add kmod-static-nodes to the sysinit runlevel for"
 			ewarn "kernel modules to have required static nodes!"
diff --git a/sys-apps/kmod/kmod-9999.ebuild b/sys-apps/kmod/kmod-9999.ebuild
index a7e386f475ad..d608f43bcf14 100644
--- a/sys-apps/kmod/kmod-9999.ebuild
+++ b/sys-apps/kmod/kmod-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit autotools bash-completion-r1 multilib python-r1
 
@@ -21,7 +21,7 @@ HOMEPAGE="https://git.kernel.org/?p=utils/kernel/kmod/kmod.git"
 
 LICENSE="LGPL-2"
 SLOT="0"
-IUSE="debug doc libressl lzma pkcs7 python static-libs +tools zlib"
+IUSE="debug doc libressl +lzma pkcs7 python static-libs +tools +zlib zstd"
 
 # Upstream does not support running the test suite with custom configure flags.
 # I was also told that the test suite is intended for kmod developers.
@@ -29,6 +29,7 @@ IUSE="debug doc libressl lzma pkcs7 python static-libs +tools zlib"
 # See bug #408915.
 RESTRICT="test"
 
+# >=zlib-1.2.6 required because of bug #427130
 # Block systemd below 217 for -static-nodes-indicate-that-creation-of-static-nodes-.patch
 RDEPEND="!sys-apps/module-init-tools
 	!sys-apps/modutils
@@ -40,7 +41,8 @@ RDEPEND="!sys-apps/module-init-tools
 		!libressl? ( >=dev-libs/openssl-1.1.0:0= )
 		libressl? ( dev-libs/libressl:0= )
 	)
-	zlib? ( >=sys-libs/zlib-1.2.6 )" #427130
+	zlib? ( >=sys-libs/zlib-1.2.6 )
+	zstd? ( >=app-arch/zstd-1.4.4 )"
 DEPEND="${RDEPEND}"
 BDEPEND="
 	doc? (
@@ -55,13 +57,13 @@ BDEPEND="
 	zlib? ( virtual/pkgconfig )
 "
 if [[ ${PV} == 9999* ]]; then
-	DEPEND="${DEPEND}
+	BDEPEND="${BDEPEND}
 		dev-libs/libxslt"
 fi
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
-DOCS="NEWS README TODO"
+DOCS=( NEWS README TODO )
 
 src_prepare() {
 	default
@@ -97,6 +99,7 @@ src_configure() {
 		$(use_with lzma xz)
 		$(use_with pkcs7 openssl)
 		$(use_with zlib)
+		$(use_with zstd)
 	)
 
 	local ECONF_SOURCE="${S}"
diff --git a/sys-apps/man-db/Manifest b/sys-apps/man-db/Manifest
index 85a7337d7a4d..f0e1d2b33260 100644
--- a/sys-apps/man-db/Manifest
+++ b/sys-apps/man-db/Manifest
@@ -2,7 +2,7 @@ AUX man-db-2.9.3-clock_gettime64.patch 1493 BLAKE2B 5c080767d380c26ee97983cb82ad
 AUX man-db-2.9.3-sandbox-env-tests.patch 315 BLAKE2B d6f4835e9e32f8afffe6ab1a70ee664192db05fbe74013724fcdbe112ead2d4288f90be032777a58ee41515c23d5561ab9cde495a92aa9f74ee353479ef884e3 SHA512 d8840d45c3b115f51bb9b3fc11ece2fecadfe284cd7db29cd012ed32faed990b12a9920cf11282358e5dd27df4bcf3c1a0316116ecae58917ef3c65efb1eb22b
 AUX man-db.cron-r1 252 BLAKE2B 1d48851bd11ddf65ee24cae65a8bdb43b2c0df515a790661680775598fae21ef0776f04736425d511d48e97873d44b36a04d6ff41a53fceda0d8254482a4b53a SHA512 c2c7c05bcf241bb066c3ef98e33fb8c3b06abf92c20709f97c1e1e048d47aa4cf5ea412231a490008b3f1d87b284e381e611bb3275e8413ad031dac113112054
 DIST man-db-2.9.3.tar.xz 1885840 BLAKE2B 6163660af60a2900220d7b1de74caa9cb9e5764cc5da20469a8fb08e19ee1948937916664fdc493b89da8fd829aa512877892245fabc00fb586c7754c0da3d53 SHA512 ca1c1214753483f6e22efe69a9df9852e0de01a9ad3b9950dcbbc9f38e6060100b98a84333256f8c734002e66e2fd6256bc017a31bd9acfc42002dca2c0f879b
-EBUILD man-db-2.9.3-r1.ebuild 4131 BLAKE2B 58c61c45cc644475695308ef63e927c16784afa617a8f90b4a6f2bc65d50ef10a6585b72122d0fba3607b5055570b3d69668b0862fc131ec0d433dac6cfbae1f SHA512 4a43b27d53c43fc02c71da7ef827d5780bdd74ca7e726749c04ebdaa90b820ae4e91e0d94b37cc03fab6227c1e4ab2fc1b44dd9fbaf8eabd101653aa4acd6ab4
+EBUILD man-db-2.9.3-r1.ebuild 4130 BLAKE2B 0f7ca98bcbb087890f4029ae0929ff14b0675b84aba757b0bf657a0f5236ca3c10f94132a4c0b8372ff27653e662335c595972a2a7e8eaf7628fa1fa59b7b721 SHA512 008759545c7694a19adc37a7330bdacc37048be62dddf6b208ae411a658594f9185afe104138a6cce55d05cf2ce7ed7e7de7c219a293246c14e39f8a31b5286d
 EBUILD man-db-2.9.3.ebuild 4077 BLAKE2B 19274e434d5fc98ce1df87ffaa49a884c633311d9d5a93c777bb54c074309d5e65c84bec754bf1381a41ee9c060aebf6fafcbad8ae2107fa7feb99f694147ae0 SHA512 a37207b489c41d6db34c31d7e5e6f7aaf269482d16bd9d3a276bdbb5efa30c62949acfd4b31cd990cd3b938b1baba57f9a5efd32f4a0f4175cbdd2bddad990c1
 EBUILD man-db-9999.ebuild 4088 BLAKE2B 87925a8bd8a382f2cdff2fe3e05b734ef8e41086ad5fe3c7619b9209eacd6ee1da37e5ec68c73ef648d1eea7c323c42e4b273e10abfe1bbcb183329f9ea11c05 SHA512 706759d5da2b2704ebdc4537405613bef5095bd750a02128a5825f38548f9ad6fa3ae1be3cc09b83b90f436e39f25810cef9d6bfdb32da6d38c5a164ff33a558
 MISC metadata.xml 342 BLAKE2B ac0d63182d2d7a73dc256fd0ae1f9994218da535ed39bd756e7db950899fda9a019f9107e8f0d9e4dab1987ba2650ae1fb8cddc9901240cba829c780db69e9b5 SHA512 553cf56ab0b3b6c9403612a7ccd1db073f557b432c68d60adb4716169250a9986b4c112023f6ae200a6fbc2df31cdafd9ab08e04d92ca35cffb81f690bd43d79
diff --git a/sys-apps/man-db/man-db-2.9.3-r1.ebuild b/sys-apps/man-db/man-db-2.9.3-r1.ebuild
index b61f464d342e..c3ae301e8134 100644
--- a/sys-apps/man-db/man-db-2.9.3-r1.ebuild
+++ b/sys-apps/man-db/man-db-2.9.3-r1.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=7
@@ -12,7 +12,7 @@ if [[ "${PV}" = 9999* ]] ; then
 	EGIT_REPO_URI="https://git.savannah.gnu.org/git/man-db.git"
 else
 	SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="GPL-3"
diff --git a/sys-apps/memtest86-bin/Manifest b/sys-apps/memtest86-bin/Manifest
new file mode 100644
index 000000000000..b1930c2a3193
--- /dev/null
+++ b/sys-apps/memtest86-bin/Manifest
@@ -0,0 +1,6 @@
+AUX memtest86-bin-grub.d 467 BLAKE2B cf36f784b4032f615e5e3cd07d67125ea54c2d4fd9c7ce2f05a6a87fb4a2636491edabc77a0833039c6a8667d0cefffb20c3d4a755bc9571a363b3c6193a1831 SHA512 0f8063689c2a1dcc5d5aee2b7a7e7db4c195012ab6c641bbd66c3c495bec5252a5733664e900483580e78ee47a29a6e8e078127ef1c723ee6419e9accb4a7bc0
+DIST memtest86-bin-9.0_beta1.zip 9208162 BLAKE2B d21a2755b08a61c56e25f57a2e253ff6ab8f5e7aec9b291aa33daeb817ee9c6a5da7d40c5d2e97bfa39ba633567c9e601971767c1d6a6e6f699616b37b2149c4 SHA512 86c7962ad5abaf300f7a29cbcfc33bd20ad6d3b363d0c76a426682ec7ea2195e351c2fcace387e81e927aa30d2c66050ddc5415180401d17af3ef77d6a8b41a1
+DIST memtest86-bin-9.0_beta2.zip 10126202 BLAKE2B b6b7e2e5f6bba76fedc37244fd92b56be6fc3ed40efd42c55fc061c403a0e492f58f2ed719b2ff7b47596f41b3b6ccab1e13fbe885c168f59b51a783d7eb400f SHA512 f28cd912e98b2fa0a3a0f98a10b57627073e85acc24eb79a4e326ff5fe9c8401fa093a8007179365137cac2654de9a762f31373fa0b66850400c9884f925393f
+EBUILD memtest86-bin-9.0_beta1.ebuild 739 BLAKE2B 79c16ad886a1aded670b250536595e1ad9bba3002211ab034be32e5eda593e5f2aa1a0b486f82937c0157390afd10f85c9824ef646c9fe12e9efa2d22dd67c26 SHA512 224902ad958d528a821415d4aebc3fca510538f5c0304f05814fc60fb31abb5c174836134577c4ddb86992302feb9fd842ab171f8fc5a8437542468e7a4fc1f2
+EBUILD memtest86-bin-9.0_beta2.ebuild 739 BLAKE2B 79c16ad886a1aded670b250536595e1ad9bba3002211ab034be32e5eda593e5f2aa1a0b486f82937c0157390afd10f85c9824ef646c9fe12e9efa2d22dd67c26 SHA512 224902ad958d528a821415d4aebc3fca510538f5c0304f05814fc60fb31abb5c174836134577c4ddb86992302feb9fd842ab171f8fc5a8437542468e7a4fc1f2
+MISC metadata.xml 244 BLAKE2B 24ebafa89c32f799b62237b0d9442143de8ccb86c1625f2a49dd91ec9caa63cadc52000005b5b5ef148df89e907e1407330a8d8411ffb5f4facaf629a3184cb8 SHA512 d7a2290eb2970ef7fb9bea275b209c7ace388daadcf3e317b099767d72c7d9f0b894e23492f02e973d27010a7568e48549e4f502c9628efc3133012680304784
diff --git a/sys-apps/memtest86-bin/files/memtest86-bin-grub.d b/sys-apps/memtest86-bin/files/memtest86-bin-grub.d
new file mode 100644
index 000000000000..db1ddf855d0e
--- /dev/null
+++ b/sys-apps/memtest86-bin/files/memtest86-bin-grub.d
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+. /usr/share/grub/grub-mkconfig_lib
+
+memtest_efi=/boot/memtest86-bin.efi
+
+if [ -f "${memtest_efi}" ]; then
+	echo "Found MemTest86-EFI" >&2
+	device="$("${grub_probe}" --target=device "${memtest_efi}")"
+	path="$(make_system_path_relative_to_its_root "${memtest_efi}")"
+	cat <<EOF
+if [ "x\$grub_platform" = xefi ]; then
+	menuentry "MemTest86-EFI" {
+EOF
+	prepare_grub_to_access_device "${device}" | grub_add_tab
+	cat <<EOF
+		chainloader "${path}"
+	}
+fi
+EOF
+fi
diff --git a/sys-apps/memtest86-bin/memtest86-bin-9.0_beta1.ebuild b/sys-apps/memtest86-bin/memtest86-bin-9.0_beta1.ebuild
new file mode 100644
index 000000000000..c6682f17f678
--- /dev/null
+++ b/sys-apps/memtest86-bin/memtest86-bin-9.0_beta1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit mount-boot
+
+MY_PV=${PV/_beta/-beta-}
+
+DESCRIPTION="Stand alone memory testing software for x86 computers"
+HOMEPAGE="http://www.memtest86.com/"
+SRC_URI="https://www.memtest86.com/downloads/memtest86-usb-${MY_PV}.zip -> ${P}.zip"
+
+LICENSE="PassMark-EULA"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+IUSE=""
+
+BDEPEND="app-arch/unzip
+	sys-fs/fatcat"
+
+S=${WORKDIR}
+
+src_unpack() {
+	default
+	fatcat memtest86-usb.img -O 1048576 -r /EFI/BOOT/BOOTX64.efi > ${PN}.efi || die
+}
+
+src_install() {
+	insinto /boot
+	doins ${PN}.efi
+
+	exeinto /etc/grub.d/
+	newexe "${FILESDIR}"/${PN}-grub.d 39_memtest86-bin
+
+	dodoc MemTest86_User_Guide_UEFI.pdf
+}
diff --git a/sys-apps/memtest86-bin/memtest86-bin-9.0_beta2.ebuild b/sys-apps/memtest86-bin/memtest86-bin-9.0_beta2.ebuild
new file mode 100644
index 000000000000..c6682f17f678
--- /dev/null
+++ b/sys-apps/memtest86-bin/memtest86-bin-9.0_beta2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit mount-boot
+
+MY_PV=${PV/_beta/-beta-}
+
+DESCRIPTION="Stand alone memory testing software for x86 computers"
+HOMEPAGE="http://www.memtest86.com/"
+SRC_URI="https://www.memtest86.com/downloads/memtest86-usb-${MY_PV}.zip -> ${P}.zip"
+
+LICENSE="PassMark-EULA"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+IUSE=""
+
+BDEPEND="app-arch/unzip
+	sys-fs/fatcat"
+
+S=${WORKDIR}
+
+src_unpack() {
+	default
+	fatcat memtest86-usb.img -O 1048576 -r /EFI/BOOT/BOOTX64.efi > ${PN}.efi || die
+}
+
+src_install() {
+	insinto /boot
+	doins ${PN}.efi
+
+	exeinto /etc/grub.d/
+	newexe "${FILESDIR}"/${PN}-grub.d 39_memtest86-bin
+
+	dodoc MemTest86_User_Guide_UEFI.pdf
+}
diff --git a/sys-apps/memtest86-bin/metadata.xml b/sys-apps/memtest86-bin/metadata.xml
new file mode 100644
index 000000000000..c67d4dcaca5b
--- /dev/null
+++ b/sys-apps/memtest86-bin/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>bkohler@gentoo.org</email>
+		<name>Ben Kohler</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/sys-apps/pick/Manifest b/sys-apps/pick/Manifest
index aae34dc68be7..c50a256b6857 100644
--- a/sys-apps/pick/Manifest
+++ b/sys-apps/pick/Manifest
@@ -1,3 +1,6 @@
+AUX pick-4.0.0-tinfo.patch 805 BLAKE2B ab40112024bec12d18f25a84f39cf09850c11f2878acbcdb91bf33fa74c1a35525da04917381c548437017714c70def44aa8ed4697f13639669c64b148c4a0f0 SHA512 d974ded22d5527522178eac47845c85de1fb0c50df626fdc9792798de3439bf6e6ced12f2434d89086a8fe7c5f11a775745d880cd0f58066108e48cae2912042
 DIST pick-3.0.1.tar.gz 29878 BLAKE2B 8910bf726102802a76717ecc20360882c1c25bc346324c33173eb64872066ff284636557bf10a98a6cfbecc50dd4c8cd87b68aa924b976b072e5fead8989e316 SHA512 7448e7937640f69d397bd1bd48526865b8866a8f47eb04b7af918df992f36b6e932a1cb68e845f9262faa9c88c1afcb354368b7e1c6b1dd8503aafdb53e4b70f
+DIST pick-4.0.0.tar.gz 29786 BLAKE2B c1d119cfb5dd91bd3c71171d32a6ce92d06ab8ea1cfa5a40c042448b7b90ef5d24c02dc04962b24ef91fd3ea5cb56858b231901c7035f47e2c04682f99e5c61e SHA512 690f8ee174f69ec5897831b71f22bc82dbdaf71329e2b540cfb06e49963231196efe6192d1f564c1c7029c7335736d42f02483850ccbb2bd5bcd1dc52b034f56
 EBUILD pick-3.0.1.ebuild 654 BLAKE2B daa505885757851edf558654770b275661a8a94771e5fcf019fa0146d0bffa7dbfb5c625b0abb36146d5fbebc477f714e93e4fbc77ac30a49cbd767acc6802e8 SHA512 d194db2a604de6eb826220d619c72d77372f5fa86d679b9bea4488bb65026a5006c470b27f37db2005cc6289eb0e8cefe291bb8313d7f11fd3f379db6c2a0630
+EBUILD pick-4.0.0.ebuild 706 BLAKE2B 4bd61519fda8c56a801352c14bf96618841cbbd5e150ea80d238f9ea007f872cd78edff76fb48026785d969af9704e7c6f375e2b0f5b1c2da55e090b9bbf2b98 SHA512 f3159eab84352e1fa3e131f178313da4ddf706d10ec717d5c70f32703e5ffc253abada95d43e22b4e049e47e6de9ed0e431dd47a7b20f6e8bdbcc17546a2d08d
 MISC metadata.xml 242 BLAKE2B 3917c4e887e59cb27fa14a1ea92192b5a924ce39a4dd39a2cd75d04d7a861f57f7c9e969581a243339ea432f132f6e0963efe9940ad1678b506588317da0ace0 SHA512 03639d79f8e79b78d86d64d217268bfbb6255cfb2d37188a764465686dcae9ffe5e41b01cc746f465a6ba92a3bc2c9d87d56889e00317c96fd759d37b840fae0
diff --git a/sys-apps/pick/files/pick-4.0.0-tinfo.patch b/sys-apps/pick/files/pick-4.0.0-tinfo.patch
new file mode 100644
index 000000000000..7797f1422d94
--- /dev/null
+++ b/sys-apps/pick/files/pick-4.0.0-tinfo.patch
@@ -0,0 +1,28 @@
+From a21522afa9fcd0f299923767f71577feac34be4c Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Sun, 10 Jan 2021 00:51:36 +0100
+Subject: [PATCH] configure: Fix build against ncurses with separate tinfo lib
+
+Gentoo-bug: https://bugs.gentoo.org/685712
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+---
+ configure | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/configure b/configure
+index 857ce4e..e0f26ee 100755
+--- a/configure
++++ b/configure
+@@ -161,6 +161,9 @@ set -x
+ if (LDFLAGS=-lcurses check_curses); then
+ 	HAVE_CURSES=1
+ 	LDFLAGS="${LDFLAGS} -lcurses"
++elif (LDFLAGS=-ltinfow check_curses); then
++	HAVE_NCURSESW=1
++	LDFLAGS="${LDFLAGS} -ltinfow"
+ elif (LDFLAGS=-lncursesw check_curses); then
+ 	HAVE_NCURSESW=1
+ 	LDFLAGS="${LDFLAGS} -lncursesw"
+-- 
+2.30.0
+
diff --git a/sys-apps/pick/pick-4.0.0.ebuild b/sys-apps/pick/pick-4.0.0.ebuild
new file mode 100644
index 000000000000..9bf033c64ad7
--- /dev/null
+++ b/sys-apps/pick/pick-4.0.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="a fuzzy search tool for the command-line"
+HOMEPAGE="https://github.com/mptre/pick"
+SRC_URI="https://github.com/mptre/pick/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="sys-libs/ncurses:0="
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.0.0-tinfo.patch"
+)
+
+src_configure() {
+	# not autoconf
+	./configure || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake DESTDIR="${ED}" BINDIR=/usr/bin MANDIR=/usr/share/man install
+	dodoc CHANGELOG.md
+}
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 8d39e53dff3e..50dad17137e0 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -2,20 +2,14 @@ AUX README.RESCUE 134 BLAKE2B 2cd153e0077388f29e11779670086c50fb1a470b9bb76969a7
 AUX portage-ccache.conf 60 BLAKE2B b45ac69ba4bf6b221191ab9618aa484948ad8765ae906402e83df4b72fd10e006621523fe5b6d59219318a978e368649047784bb85771cd189b2542a2e19f941 SHA512 36427e57046118ecf982fc3b1a80a3543b5682e3eef7df5dfc8a50b261a5da56f997dd75f63c5194049aceea204c37aee638a3bc383b9f7a0eff8ac9c35f3b1c
 DIST portage-2.3.89-bug-718578.patch 1325 BLAKE2B 7a3bc520274617736eac2e3d078e90d151bdb5d8615f6217a499c0f5d4c80813f2c753e7902cf34482df0725ad0b43a38707764c8be14aae9f7ca34f0bd8721f SHA512 6f1c5d7b42beb8078c45cccbad2bd65374b69af92521d9be3beb6784477ca5bcdd75d8e762b239e44e3121e6fe5e3a040c92c9b61521e4a9b1d6bafee10d4c88
 DIST portage-2.3.99.tar.bz2 1051210 BLAKE2B dd3f990dbc87e655a767ce01e1ee3f0b1d5226fa818949408e54b81a2f96e50a4215a79af42b00dc795792858c4f86453b238b14baef4f0793c937b5617534b8 SHA512 176842318a4134ce54c5aa6485fef296f5a14edd2a72421c2011973a0f1a6af39bc5398f1e9eb3b8666d5fc307589c5b91ab93c219bdedb2d307357d8ddefbf5
-DIST portage-3.0.10.tar.bz2 1048234 BLAKE2B 9011c7a3a7ea6c5c78190c5344370d26700e4bf95e56fdf7036c3c4e1ef2e8bf691f5ee21142aaa4e15d5798404e5abadfdb2b5fea288451666840f0adb0ef77 SHA512 d5823fa263876350f5128e03c92350a90f665a5539e0eeea1cfb9320a1c83cfdffe91315bfa54dbc1ba6ffb42fdcbda3b0b728f79aaf3ef254ebb7fd09563188
-DIST portage-3.0.11-bug-754903-pdepend.patch 5379 BLAKE2B 34d2bca2af7d0a7286fa8ca7e3486341112c0a2d52f79d76a89cf5b68d85be4bc66434b8c3916987824ffdb799ed97db4a50f7b10744d55e229c6ca923e8d3ba SHA512 ecb01de1dfd1a331231a6d7a4e77bce36f7f663354cacd1640eefacdd14873b64ebf30c30105df87b4857fc7d1b8612d61f5f44d6d617bc109fad7583d3940b2
-DIST portage-3.0.11-bug-757741-AttributeError.patch 1077 BLAKE2B 6411f23746781ec5ebb5eb59679a0e1ea5bca650ca6f06d2c3cf0d8fb78fbaf47b915b33839e2f8aedcffb9b961787ceec92c614284482d65a72ce80f3ac148f SHA512 b0c0135f0db9ddc723ec996a922a36510b009e08d67ff7b1eafd208a11e3c2914c11e18fe26d56ae3f1ca986f1057a230bec9c25555c7e4c9ca5308bc34b0c2a
-DIST portage-3.0.11.tar.bz2 1048734 BLAKE2B d52e6d90750da0a2474e7b0071955111382aaf14d0c464bd66e673fc953ee90c2a426bd2e05b3642339483184a390ba416b2024849779d0fd95172d383ad4851 SHA512 048f7df9f2748565b8cc258667d1ea8fe0cd5e2dbea58d70ce9670885ba00949c16f9c5e7d2c3b2f795fd8f1d977792a9cb083613376128d33bdf9c1e1e4a8e9
 DIST portage-3.0.12.tar.bz2 1049335 BLAKE2B 9f7b17ebfe068559ffbc2bc0799f72901abab8b8b5bb608c8f6afe1f8f7fdaae1026c2a04d9b2256b367711196e32b58c6927ea6fc57146148ed71b295acdcb8 SHA512 6f93f35c06ac765f926f5281e2fac99d52140e8c5d95ee4224796c1ea23ed5f45ed5382acbbfc7aebf9f68a9c585fc1b41b615ef765be2d16577909032de1350
-DIST portage-3.0.4.tar.bz2 1042654 BLAKE2B 6f869b2eb24f9e590bf8e01172050105a1bd9ea88657db5893133b4620231a0ddcda871d6fcc10623f7f2ef809116310c76355263819be6c3734b0ca184d5fc0 SHA512 7a0c39cd4ed65aebd84ff8bbadba29760b3aa392a0d606c5b29a1112fd0845c42f74eebb0728a069b2b097a6eb7eec2d18af615fd9edcc38f1018ae6ff686812
-DIST portage-3.0.8.tar.bz2 1046968 BLAKE2B 662147c37a9e7b81030fadb4d6438b734ee57a9eb9bfcee80991d137a017aa3541565961282ebf8736db71aeb05532ffa139ff3a34a84bc9064cf74427acb666 SHA512 5f97870a11ecca30ffe8f463f87cd16a1edb52b44832c6eaba15cadcfde2b4f7edf963749e45c8043b45b38e53ee210dc913aa2d2432a2bd3928cc27c8765a85
+DIST portage-3.0.13.tar.bz2 1049930 BLAKE2B 092e4a25896d613dcfcdaaa1c75f29d19112688328c4078a8ab2b24edcf1e26fff3273da56a79f8b35aada5e11e3cf7f14ef40aca742da0874ea7e907c4778bc SHA512 a9106fce311053523fd026c6c65cb85562bae69ab6ea6b5ae784044ffedbfeb0e3b1c3758ebea9204b11f885da383f9d8ee31d34ad52ac14f059cf97894e3590
+DIST portage-3.0.14.tar.bz2 1049983 BLAKE2B 174fe1f14bf1cabbe044724bab5eeada6e4d86be7ffd00db1dfe97568dca450aa44856ef7c241e7ed194f99aecb6f8bcffaf30e428c17e53d4afd4265543b495 SHA512 796f34922abe8dcc0deb687c7b42644bc82fedf8751eeb97ef26355dcd600cd134809abcc71c3bdfc233e1c15511c13cbb06c66b5889f47f2b2f51d5384d5888
 DIST portage-3.0.9.tar.bz2 1047839 BLAKE2B 44cf96ac69c1b6d2f95aea8b6e87af5665bfa797ef97d3ae09d4faeefa5b36671f542a5bb8b141b0d914afef96d536a63da4539d27336471621363008d2f73bd SHA512 01ad255a12381fb3b52a8d6c1b04cb377c52b8856973aa296a1086f2d89dd6458244486a0d477e95d4247c3edf7e8e3bb20523263979401443b212085737e618
 EBUILD portage-2.3.99-r2.ebuild 8482 BLAKE2B 9880361867a65a42c22b277e46fdf973d32b57679519dcce4728fe3297a6b55990a0cc319e161f3056f33c72979101e9b54168e01ef6a1a2bfdc6a92df042821 SHA512 c04cf3569d920a4e55da0eac94cbf93b5780d9b2eb3afa45c918fbae88c11a0f130aba4370b1897628a0f03fd24dcf573aad03164c4e9a786ec754f96cd0939d
-EBUILD portage-3.0.10-r1.ebuild 8627 BLAKE2B 305994b05147a9e3fd5c8fc8f4281c23f356371dd8bd016f7976e0411da6f55d7b37cd6bff0f3d2e6c05cf7ae3f6d6e58c1f1ee6d7256d4933992b713b3a3118 SHA512 92679a639c18d00b38f9dae80e07641e5c78801111ac1a9b8f0e99f226ecd4fa1453417a9da4c6468412ad783683edbf84c63fcef4cc63dfc3da6f3d2ad21b26
-EBUILD portage-3.0.11-r2.ebuild 8785 BLAKE2B 735df2fdb2481176693a377fe9aeda86e3122ac6c60aff3ccace8cfe7ba42cb2c66130a5bb8d7914e8e885a636a89d81d13a9f1eee3641257ab6ce0fda200308 SHA512 569f0a6f6d4d8dd2f61611c88857da2ac4fd613cb1bb487687f7e5567a9add4b2bb77b2b0df717c34c4c591d451a573fe2f93268dfb1293a194f14d4c5f91dc3
 EBUILD portage-3.0.12.ebuild 8396 BLAKE2B fb901d6ea7947920456a76d8185b70f4a83db2ea0a607b15c06e4553100065f01c8ec0cd3327c68ea6c5d47a5529c27f2e25e96b88760a76515c3c3cd81ee492 SHA512 fbdddbfc8663294880a9e15048547b1df10371e5646807f2b7ede67c63021b1463b845f1115f3aa5ca419980d64868c92a04da5865f8846bfcd29b0c9bff9416
-EBUILD portage-3.0.4-r1.ebuild 8527 BLAKE2B 631108e364ee22d284e334c5c641f4e807375ac75804a7c3099837d94a74f4c41cbbaf6ca365624516f858ee68c07b8551a3c1c9f1950f6352d0186db4bd28c6 SHA512 8ff2a857a31c283408b9d8a6f5d1a984c6299ccd1b7f8eaaff2e3b5f3b1dcc62f32bee8dbc1496a4a75e836f4772f91a295a23facb005d035c337032ed63d6a1
-EBUILD portage-3.0.8.ebuild 8379 BLAKE2B d2c21e67e7e182c79c0435033dcafdef239a28d4108a953a74839bd6cd8fc83076bdd324f35cc2d64028c13f6a9b4bbb6a725b3f797be035e1a0710f07a9e980 SHA512 b000f7461b73ea27b71e228df180f7cca078890d93a89f8c835986e49eba31d9faa1b6ade34db6aa9e35a4fb9cfed05eb104611e9952dbbd6f99cff41f75b850
+EBUILD portage-3.0.13.ebuild 8397 BLAKE2B 49e8ae6b8d1defd42926d2ce124e96829cd414a21279f927491588b9d10b9d7e051bb9e3a04dd4abdb11b07028718252e5b0fc06831fe9eb384aef722c95a8ee SHA512 c6a25ea1ea16de2f2a94407e1ba357283cf3b2b525c38f7fa11f45c3159d23b7c41d6de43071816f81704f2f794a1675f69a35ec417eb9986f6247788eb18549
+EBUILD portage-3.0.14.ebuild 8405 BLAKE2B 3b5f95034ea4a91f76c4636b14eebb6eabf853848aa4d4f1ec08a10154ba4db06731ccb1d8cadc42d80c9d30a3c9c2283df09e4fe228e7de192dbb1f109323b2 SHA512 a7a5c7fffa71eec64a45668b4576ec3513358656ea7c8a01de1112ea66df97e2f585052a740eb510351b0940213d5c3d6f07aa7646a2af69be58e38a0d47f2c4
 EBUILD portage-3.0.9.ebuild 8377 BLAKE2B 8c9826354e9e3ca8633f20a14ce5e861b1d2b117b0c2dd33bc097692c4193065404aaa6745029c6cd07692d2d6c0ac34415c3e4048b655dbe2240374c25a1f00 SHA512 b22a6a04a419b935fd02f34140918f93dc9c28a4d8cdc59e97d1c5e696ff877901c6054cf859b2a203a9ecb6d632230cd6583d970f4cdcb97e0e2e732c61ddaf
 EBUILD portage-9999.ebuild 7436 BLAKE2B ba3a4366b6afd933d6ffaf84cc3f8af028614a0102a3e500fd3e5c3bb1b5d0d098d2b0ec187168927a4b1aeb53fd239c1c02b680a12bc599d8e24e89a902536c SHA512 d767c20d363689c7ff906ad92f4cb13726b398ddfbff71adf5fa8897ff4c928d07cd307da7ee5f71ec33ab48fbaec56e5521470c0d2d5da1d187eea73bd267b6
 MISC metadata.xml 1482 BLAKE2B 1f75075b708135bace30a6fb3caaca01a411bcc53805e47720f639d7a8866ad703aac0a1d0b5e5dc3db5efa502c112b733535d3c7c40a691d444958cab3f065b SHA512 5ccf338f8847b8e958efdadb475af12bf689e1227830dccd117682f74b1ae4711359337a5c688b3ed9fc8056e4cbbd37a7e24f5bfdc2f650ab90f6e185091c2a
diff --git a/sys-apps/portage/portage-3.0.11-r2.ebuild b/sys-apps/portage/portage-3.0.11-r2.ebuild
deleted file mode 100644
index 91955bb7a5cc..000000000000
--- a/sys-apps/portage/portage-3.0.11-r2.ebuild
+++ /dev/null
@@ -1,274 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( pypy3 python3_{6..9} )
-PYTHON_REQ_USE='bzip2(+),threads(+)'
-
-inherit distutils-r1 linux-info tmpfiles prefix
-
-DESCRIPTION="Portage is the package management and distribution system for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
-
-LICENSE="GPL-2"
-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 )"
-
-BDEPEND="test? ( dev-vcs/git )"
-DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
-	>=app-arch/tar-1.27
-	dev-lang/python-exec:2
-	>=sys-apps/sed-4.0.5 sys-devel/patch
-	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
-	apidoc? (
-		dev-python/sphinx
-		dev-python/sphinx-epytext
-	)"
-# Require sandbox-2.2 for bug #288863.
-# For whirlpool hash, require python[ssl] (bug #425046).
-# For compgen, require bash[readline] (bug #445576).
-# app-portage/gemato goes without PYTHON_USEDEP since we're calling
-# the executable.
-RDEPEND="
-	app-arch/zstd
-	>=app-arch/tar-1.27
-	dev-lang/python-exec:2
-	>=sys-apps/findutils-4.4
-	!build? (
-		>=sys-apps/sed-4.0.5
-		app-shells/bash:0[readline]
-		>=app-admin/eselect-1.2
-		rsync-verify? (
-			>=app-portage/gemato-14.5[${PYTHON_USEDEP}]
-			>=app-crypt/openpgp-keys-gentoo-release-20180706
-			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
-		)
-	)
-	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
-	elibc_musl? ( >=sys-apps/sandbox-2.2 )
-	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
-	kernel_linux? ( sys-apps/util-linux )
-	>=app-misc/pax-utils-0.1.17
-	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
-	xattr? ( kernel_linux? (
-		>=sys-apps/install-xattr-0.3
-	) )
-	!<app-admin/logrotate-3.8.0
-	!<app-portage/gentoolkit-0.4.6
-	!<app-portage/repoman-2.3.10
-	!~app-portage/repoman-3.0.0"
-PDEPEND="
-	!build? (
-		>=net-misc/rsync-2.6.4
-		userland_GNU? ( >=sys-apps/coreutils-6.4 )
-	)"
-# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
-# NOTE: FEATURES=installsources requires debugedit and rsync
-
-SRC_ARCHIVES="https://dev.gentoo.org/~zmedico/portage/archives"
-
-prefix_src_archives() {
-	local x y
-	for x in ${@}; do
-		for y in ${SRC_ARCHIVES}; do
-			echo ${y}/${x}
-		done
-	done
-}
-
-TARBALL_PV=${PV}
-SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
-	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)
-	https://github.com/gentoo/portage/commit/07a604537e746814613dc171a5c09072ef0266af.patch -> portage-3.0.11-bug-754903-pdepend.patch
-	https://github.com/gentoo/portage/commit/ff270ae58eca457a1e2bbf9507d8438123082ca0.patch -> portage-3.0.11-bug-757741-AttributeError.patch"
-
-PATCHES=(
-	"${DISTDIR}/portage-3.0.11-bug-754903-pdepend.patch"
-	"${DISTDIR}/portage-3.0.11-bug-757741-AttributeError.patch"
-)
-
-pkg_pretend() {
-	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS"
-
-	check_extra_config
-}
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	sed -e "s:^VERSION = \"HEAD\"$:VERSION = \"${PV}\":" -i lib/portage/__init__.py || die
-
-	if use gentoo-dev; then
-		einfo "Disabling --dynamic-deps by default for gentoo-dev..."
-		sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \
-			-i lib/_emerge/create_depgraph_params.py || \
-			die "failed to patch create_depgraph_params.py"
-
-		einfo "Enabling additional FEATURES for gentoo-dev..."
-		echo 'FEATURES="${FEATURES} strict-keepdir"' \
-			>> cnf/make.globals || die
-	fi
-
-	if use native-extensions; then
-		printf "[build_ext]\nportage-ext-modules=true\n" >> \
-			setup.cfg || die
-	fi
-
-	if ! use ipc ; then
-		einfo "Disabling ipc..."
-		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
-			-i lib/_emerge/AbstractEbuildProcess.py || \
-			die "failed to patch AbstractEbuildProcess.py"
-	fi
-
-	if use xattr && use kernel_linux ; then
-		einfo "Adding FEATURES=xattr to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-	if use build || ! use rsync-verify; then
-		sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \
-			-e '/^sync-webrsync-verify-signature/s|yes|no|' \
-			-i cnf/repos.conf || die "sed failed"
-	fi
-
-	if [[ -n ${EPREFIX} ]] ; then
-		einfo "Setting portage.const.EPREFIX ..."
-		hprefixify -e "s|^(EPREFIX[[:space:]]*=[[:space:]]*\").*|\1${EPREFIX}\"|" \
-			-w "/_BINARY/" lib/portage/const.py
-
-		einfo "Prefixing shebangs ..."
-		while read -r -d $'\0' ; do
-			local shebang=$(head -n1 "$REPLY")
-			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
-				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
-					die "sed failed"
-			fi
-		done < <(find . -type f ! -name etc-update -print0)
-
-		einfo "Adjusting make.globals, repos.conf and etc-update ..."
-		hprefixify cnf/{make.globals,repos.conf} bin/etc-update
-
-		if use prefix-guest ; then
-			sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
-				-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
-				-e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
-				-i cnf/repos.conf || die "sed failed"
-		fi
-
-		einfo "Adding FEATURES=force-prefix to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-	cd "${S}/cnf" || die
-	if [ -f "make.conf.example.${ARCH}".diff ]; then
-		patch make.conf.example "make.conf.example.${ARCH}".diff || \
-			die "Failed to patch make.conf.example"
-	else
-		eerror ""
-		eerror "Portage does not have an arch-specific configuration for this arch."
-		eerror "Please notify the arch maintainer about this issue. Using generic."
-		eerror ""
-	fi
-}
-
-python_compile_all() {
-	local targets=()
-	use doc && targets+=( docbook )
-	use apidoc && targets+=( apidoc )
-
-	if [[ ${targets[@]} ]]; then
-		esetup.py "${targets[@]}"
-	fi
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install() {
-	# Install sbin scripts to bindir for python-exec linking
-	# they will be relocated in pkg_preinst()
-	distutils-r1_python_install \
-		--system-prefix="${EPREFIX}/usr" \
-		--bindir="$(python_get_scriptdir)" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
-		--sbindir="$(python_get_scriptdir)" \
-		--sysconfdir="${EPREFIX}/etc" \
-		"${@}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	local targets=()
-	use doc && targets+=(
-		install_docbook
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-	)
-	use apidoc && targets+=(
-		install_apidoc
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-	)
-
-	# install docs
-	if [[ ${targets[@]} ]]; then
-		esetup.py "${targets[@]}"
-	fi
-
-	dotmpfiles "${FILESDIR}"/portage-ccache.conf
-
-	# Due to distutils/python-exec limitations
-	# these must be installed to /usr/bin.
-	local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
-	einfo "Moving admin scripts to the correct directory"
-	dodir /usr/sbin
-	for target in ${sbin_relocations}; do
-		einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
-		mv "${ED}/usr/bin/${target}" "${ED}/usr/sbin/${target}" || die "sbin scripts move failed!"
-	done
-}
-
-pkg_preinst() {
-	python_setup
-	local sitedir=$(python_get_sitedir)
-	[[ -d ${D}${sitedir} ]] || die "${D}${sitedir}: No such directory"
-	env -u DISTDIR \
-		-u PORTAGE_OVERRIDE_EPREFIX \
-		-u PORTAGE_REPOSITORIES \
-		-u PORTDIR \
-		-u PORTDIR_OVERLAY \
-		PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
-		"${PYTHON}" -m portage._compat_upgrade.default_locations || die
-
-	env -u BINPKG_COMPRESS \
-		PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
-		"${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die
-
-	# elog dir must exist to avoid logrotate error for bug #415911.
-	# This code runs in preinst in order to bypass the mapping of
-	# portage:portage to root:root which happens after src_install.
-	keepdir /var/log/portage/elog
-	# This is allowed to fail if the user/group are invalid for prefix users.
-	if chown portage:portage "${ED}"/var/log/portage{,/elog} 2>/dev/null ; then
-		chmod g+s,ug+rwx "${ED}"/var/log/portage{,/elog}
-	fi
-
-	if has_version "<${CATEGORY}/${PN}-2.3.77"; then
-		elog "The emerge --autounmask option is now disabled by default, except for"
-		elog "portions of behavior which are controlled by the --autounmask-use and"
-		elog "--autounmask-license options. For backward compatibility, previous"
-		elog "behavior of --autounmask=y and --autounmask=n is entirely preserved."
-		elog "Users can get the old behavior simply by adding --autounmask to the"
-		elog "make.conf EMERGE_DEFAULT_OPTS variable. For the rationale for this"
-		elog "change, see https://bugs.gentoo.org/658648."
-	fi
-}
diff --git a/sys-apps/portage/portage-3.0.8.ebuild b/sys-apps/portage/portage-3.0.13.ebuild
index fdd4768a458d..9fe6d014b0bf 100644
--- a/sys-apps/portage/portage-3.0.8.ebuild
+++ b/sys-apps/portage/portage-3.0.13.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=7
@@ -13,7 +13,7 @@ DESCRIPTION="Portage is the package management and distribution system for Gento
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
 
 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 )"
@@ -34,6 +34,7 @@ DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
 # app-portage/gemato goes without PYTHON_USEDEP since we're calling
 # the executable.
 RDEPEND="
+	acct-user/portage
 	app-arch/zstd
 	>=app-arch/tar-1.27
 	dev-lang/python-exec:2
diff --git a/sys-apps/portage/portage-3.0.10-r1.ebuild b/sys-apps/portage/portage-3.0.14.ebuild
index 671587b66362..38c73c3e5444 100644
--- a/sys-apps/portage/portage-3.0.10-r1.ebuild
+++ b/sys-apps/portage/portage-3.0.14.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=7
@@ -34,6 +34,7 @@ DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
 # app-portage/gemato goes without PYTHON_USEDEP since we're calling
 # the executable.
 RDEPEND="
+	acct-user/portage
 	app-arch/zstd
 	>=app-arch/tar-1.27
 	dev-lang/python-exec:2
@@ -93,11 +94,6 @@ pkg_pretend() {
 python_prepare_all() {
 	distutils-r1_python_prepare_all
 
-	# Apply ae8b18f868c9bd039643f89f28f9d92ce8966c3c for bug 755950
-	sed -e 's:^\(from portage.util._xattr import\) \(xattr\)$:\1 XATTRS_WORKS, \2:' \
-		-e 's:xattr\.XATTRS_WORKS:XATTRS_WORKS:' \
-		-i lib/portage/util/_compare_files.py || die
-
 	sed -e "s:^VERSION = \"HEAD\"$:VERSION = \"${PV}\":" -i lib/portage/__init__.py || die
 
 	if use gentoo-dev; then
diff --git a/sys-apps/portage/portage-3.0.4-r1.ebuild b/sys-apps/portage/portage-3.0.4-r1.ebuild
deleted file mode 100644
index c57a8412713c..000000000000
--- a/sys-apps/portage/portage-3.0.4-r1.ebuild
+++ /dev/null
@@ -1,270 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( pypy3 python3_{6..9} )
-PYTHON_REQ_USE='bzip2(+),threads(+)'
-
-inherit distutils-r1 linux-info tmpfiles prefix
-
-DESCRIPTION="Portage is the package management and distribution system for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
-
-LICENSE="GPL-2"
-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 )"
-
-BDEPEND="test? ( dev-vcs/git )"
-DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
-	>=app-arch/tar-1.27
-	dev-lang/python-exec:2
-	>=sys-apps/sed-4.0.5 sys-devel/patch
-	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
-	apidoc? (
-		dev-python/sphinx
-		dev-python/sphinx-epytext
-	)"
-# Require sandbox-2.2 for bug #288863.
-# For whirlpool hash, require python[ssl] (bug #425046).
-# For compgen, require bash[readline] (bug #445576).
-# app-portage/gemato goes without PYTHON_USEDEP since we're calling
-# the executable.
-RDEPEND="
-	app-arch/zstd
-	>=app-arch/tar-1.27
-	dev-lang/python-exec:2
-	>=sys-apps/findutils-4.4
-	!build? (
-		>=sys-apps/sed-4.0.5
-		app-shells/bash:0[readline]
-		>=app-admin/eselect-1.2
-		rsync-verify? (
-			>=app-portage/gemato-14.4-r1[${PYTHON_USEDEP}]
-			>=app-crypt/openpgp-keys-gentoo-release-20180706
-			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
-		)
-	)
-	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
-	elibc_musl? ( >=sys-apps/sandbox-2.2 )
-	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
-	kernel_linux? ( sys-apps/util-linux )
-	>=app-misc/pax-utils-0.1.17
-	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
-	xattr? ( kernel_linux? (
-		>=sys-apps/install-xattr-0.3
-	) )
-	!<app-admin/logrotate-3.8.0
-	!<app-portage/gentoolkit-0.4.6
-	!<app-portage/repoman-2.3.10
-	!~app-portage/repoman-3.0.0"
-PDEPEND="
-	!build? (
-		>=net-misc/rsync-2.6.4
-		userland_GNU? ( >=sys-apps/coreutils-6.4 )
-	)"
-# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
-# NOTE: FEATURES=installsources requires debugedit and rsync
-
-SRC_ARCHIVES="https://dev.gentoo.org/~zmedico/portage/archives"
-
-prefix_src_archives() {
-	local x y
-	for x in ${@}; do
-		for y in ${SRC_ARCHIVES}; do
-			echo ${y}/${x}
-		done
-	done
-}
-
-TARBALL_PV=${PV}
-SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
-	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
-
-pkg_pretend() {
-	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS"
-
-	check_extra_config
-}
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	# Apply b0ed587308eb3cbfafe9abcb1c59f24f48b97cdc for bug 738766.
-	sed "/scheduler.wait()/d" -i lib/portage/util/futures/iter_completed.py || die
-
-	sed -e "s:^VERSION = \"HEAD\"$:VERSION = \"${PV}\":" -i lib/portage/__init__.py || die
-
-	if use gentoo-dev; then
-		einfo "Disabling --dynamic-deps by default for gentoo-dev..."
-		sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \
-			-i lib/_emerge/create_depgraph_params.py || \
-			die "failed to patch create_depgraph_params.py"
-
-		einfo "Enabling additional FEATURES for gentoo-dev..."
-		echo 'FEATURES="${FEATURES} strict-keepdir"' \
-			>> cnf/make.globals || die
-	fi
-
-	if use native-extensions; then
-		printf "[build_ext]\nportage-ext-modules=true\n" >> \
-			setup.cfg || die
-	fi
-
-	if ! use ipc ; then
-		einfo "Disabling ipc..."
-		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
-			-i lib/_emerge/AbstractEbuildProcess.py || \
-			die "failed to patch AbstractEbuildProcess.py"
-	fi
-
-	if use xattr && use kernel_linux ; then
-		einfo "Adding FEATURES=xattr to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-	if use build || ! use rsync-verify; then
-		sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \
-			-e '/^sync-webrsync-verify-signature/s|yes|no|' \
-			-i cnf/repos.conf || die "sed failed"
-	fi
-
-	if [[ -n ${EPREFIX} ]] ; then
-		einfo "Setting portage.const.EPREFIX ..."
-		hprefixify -e "s|^(EPREFIX[[:space:]]*=[[:space:]]*\").*|\1${EPREFIX}\"|" \
-			-w "/_BINARY/" lib/portage/const.py
-
-		einfo "Prefixing shebangs ..."
-		while read -r -d $'\0' ; do
-			local shebang=$(head -n1 "$REPLY")
-			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
-				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
-					die "sed failed"
-			fi
-		done < <(find . -type f ! -name etc-update -print0)
-
-		einfo "Adjusting make.globals, repos.conf and etc-update ..."
-		hprefixify cnf/{make.globals,repos.conf} bin/etc-update
-
-		if use prefix-guest ; then
-			sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
-				-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
-				-e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
-				-i cnf/repos.conf || die "sed failed"
-		fi
-
-		einfo "Adding FEATURES=force-prefix to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-	cd "${S}/cnf" || die
-	if [ -f "make.conf.example.${ARCH}".diff ]; then
-		patch make.conf.example "make.conf.example.${ARCH}".diff || \
-			die "Failed to patch make.conf.example"
-	else
-		eerror ""
-		eerror "Portage does not have an arch-specific configuration for this arch."
-		eerror "Please notify the arch maintainer about this issue. Using generic."
-		eerror ""
-	fi
-}
-
-python_compile_all() {
-	local targets=()
-	use doc && targets+=( docbook )
-	use apidoc && targets+=( apidoc )
-
-	if [[ ${targets[@]} ]]; then
-		esetup.py "${targets[@]}"
-	fi
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install() {
-	# Install sbin scripts to bindir for python-exec linking
-	# they will be relocated in pkg_preinst()
-	distutils-r1_python_install \
-		--system-prefix="${EPREFIX}/usr" \
-		--bindir="$(python_get_scriptdir)" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
-		--sbindir="$(python_get_scriptdir)" \
-		--sysconfdir="${EPREFIX}/etc" \
-		"${@}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	local targets=()
-	use doc && targets+=(
-		install_docbook
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-	)
-	use apidoc && targets+=(
-		install_apidoc
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-	)
-
-	# install docs
-	if [[ ${targets[@]} ]]; then
-		esetup.py "${targets[@]}"
-	fi
-
-	dotmpfiles "${FILESDIR}"/portage-ccache.conf
-
-	# Due to distutils/python-exec limitations
-	# these must be installed to /usr/bin.
-	local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
-	einfo "Moving admin scripts to the correct directory"
-	dodir /usr/sbin
-	for target in ${sbin_relocations}; do
-		einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
-		mv "${ED}/usr/bin/${target}" "${ED}/usr/sbin/${target}" || die "sbin scripts move failed!"
-	done
-}
-
-pkg_preinst() {
-	python_setup
-	local sitedir=$(python_get_sitedir)
-	[[ -d ${D}${sitedir} ]] || die "${D}${sitedir}: No such directory"
-	env -u DISTDIR \
-		-u PORTAGE_OVERRIDE_EPREFIX \
-		-u PORTAGE_REPOSITORIES \
-		-u PORTDIR \
-		-u PORTDIR_OVERLAY \
-		PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
-		"${PYTHON}" -m portage._compat_upgrade.default_locations || die
-
-	env -u BINPKG_COMPRESS \
-		PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
-		"${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die
-
-	# elog dir must exist to avoid logrotate error for bug #415911.
-	# This code runs in preinst in order to bypass the mapping of
-	# portage:portage to root:root which happens after src_install.
-	keepdir /var/log/portage/elog
-	# This is allowed to fail if the user/group are invalid for prefix users.
-	if chown portage:portage "${ED}"/var/log/portage{,/elog} 2>/dev/null ; then
-		chmod g+s,ug+rwx "${ED}"/var/log/portage{,/elog}
-	fi
-
-	if has_version "<${CATEGORY}/${PN}-2.3.77"; then
-		elog "The emerge --autounmask option is now disabled by default, except for"
-		elog "portions of behavior which are controlled by the --autounmask-use and"
-		elog "--autounmask-license options. For backward compatibility, previous"
-		elog "behavior of --autounmask=y and --autounmask=n is entirely preserved."
-		elog "Users can get the old behavior simply by adding --autounmask to the"
-		elog "make.conf EMERGE_DEFAULT_OPTS variable. For the rationale for this"
-		elog "change, see https://bugs.gentoo.org/658648."
-	fi
-}
diff --git a/sys-apps/qingy/Manifest b/sys-apps/qingy/Manifest
index db0d204d9dce..e61858c099f3 100644
--- a/sys-apps/qingy/Manifest
+++ b/sys-apps/qingy/Manifest
@@ -5,5 +5,5 @@ AUX qingy_at.service 391 BLAKE2B 2dd7ea5a1c18502fb77a5bfa4beafe10e96877199c45c9c
 DIST qingy-1.0.0-screensavers.patch.gz 17372 BLAKE2B 4bfd2c2b0ce1a2721046607b0f9cd18e7ee8c76d880eb2d0f0d379d56dc3693fac24ab7fd70db6208579c4302f3be390399503a8b9a7bb0978b6dfcc8f7efe7b SHA512 563a146acf92d7a4757abd8f537ca912882501d4ef407a3f0ce44f2b334da2872edafe8b489acfc6e4fdafefb60992f8ca13c322047311e5ff16eed091827d64
 DIST qingy-1.0.0.tar.bz2 611393 BLAKE2B 139d01ca03b31919e89172ca4404cc694ce0b81f2ebf5a77add16c5959822169c76a1103af7694c2c9a28916265d83a763bdd7730ab8b3ac4621d4b2fd6906d8 SHA512 79af86de9d1530f429f21a32ef6542987f62f6b5461fe5ba6553deb4fcf36d5746cdb3c6ae8d7c08ace298dd4304cb90a11203239ac7f5c2093c3c5b80f34b54
 DIST qingy-gentoo-theme-2.1.tar.bz2 150702 BLAKE2B 0144a66fd95f5b8afc58db862ae90259e653c58b5698e1bbc619f6b5fcdcab6be6885ecce57febdbbcf3a6253d190c28cf9a81004ee22eb14be7f1f268653359 SHA512 4e5e35f3f14c831e3a383e846018cd39b07761c7f1977f94923ae8889383a3cc5f63cd061b85174c076488e697018ff58bdac3ddaeefab352a3058700a130abd
-EBUILD qingy-1.0.0-r4.ebuild 3778 BLAKE2B bf32ab97caf57825efcdcbff9cdf48948d6b56bddd4a4d893377fe86cc6ecf1061795db0f212ef611981da915e647210d4385f0ea1115e3a2dbc01b544a9edf5 SHA512 4d1e326896a4717d0b097ddc8e8c42060eefd144a084cc00c7bc6a92a311e738fccef140fd04bc3e0c0b0738588bd60f4827f8d7ab1c9c8d2807d515a9b4d185
+EBUILD qingy-1.0.0-r5.ebuild 3802 BLAKE2B f4218625e84f3bbcbbc3d5a8947792aab2b8b830b866a19e49568934b3212476900f33d661476819767eff459f6cad0103182ce50276d6f7ca7a4031e4647aad SHA512 c90fe53304698e86f9c95aa2c385f69ca2dc97f4592a1babca4f6988ac2496808f37bb375516c1887ecbbed955a13247974023599e750c69c5188712fe99a2e3
 MISC metadata.xml 455 BLAKE2B 1f5c9e9578a79b34f81001fe4123f9027bd1c08f669359992ec7f046ecbdefc0da541d0c72091c2ae51c1ff4e920f7d7f2c32bc6d7d9feef1c7d587fb3f18e20 SHA512 4f6eed8a90fb3b6dd96a3e7036aeead5b9bb550b92f5b3d519461775a6d1c710e0a3434b31b9e371392c2219e952419a38c1b90edb1f4ddc450281b165a0934b
diff --git a/sys-apps/qingy/qingy-1.0.0-r4.ebuild b/sys-apps/qingy/qingy-1.0.0-r5.ebuild
index 2aae7adf571d..0b1c6141e41c 100644
--- a/sys-apps/qingy/qingy-1.0.0-r4.ebuild
+++ b/sys-apps/qingy/qingy-1.0.0-r5.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
@@ -101,7 +101,10 @@ src_install() {
 	use emacs && elisp-site-file-install "${FILESDIR}"/${SITEFILE}
 
 	rm "${D}"/etc/pam.d/qingy
-	pamd_mimic system-local-login qingy auth account password session
+
+	if use pam; then
+		pamd_mimic system-local-login qingy auth account password session
+	fi
 
 	systemd_newunit "${FILESDIR}/${PN}_at.service" "${PN}@.service"
 }
diff --git a/sys-apps/smc-sum/Manifest b/sys-apps/smc-sum/Manifest
index 198a839682c6..9750a5fb0d8e 100644
--- a/sys-apps/smc-sum/Manifest
+++ b/sys-apps/smc-sum/Manifest
@@ -1,3 +1,3 @@
-DIST sum_2.5.0_Linux_x86_64_20200722.tar.gz 11280455 BLAKE2B 5c25c2b35b6d82b1d3c856e97f1669e92ecb3406188398ee29cca44e44bb30e651fe9db7a39c93a78375b3021d5836e8d92b680b07ead0892f588f6ec9a03454 SHA512 af99c3fef1436d1ef97fbd03c619d0f4e1eea9afd00d03c905cf92a5ec826b1a5aec1ae2a2f69fa406eee91d5bed4bd2fcd3935243dc6dbae4efe04e0dcdff21
-EBUILD smc-sum-2.5.0.20200722.ebuild 938 BLAKE2B 7dfab4976702112788ff228cd6576b896684aacc6b1e1b2877fa0b4a23c666bdeda5690c0d2ce7cc4c0f72137d38487ab2800143a3cadd07c77e3bef2ee7baa4 SHA512 f7ea58623162c521a6f20c33cb1a6e513b00bc4d65c97f65bb33f1c67f083597496a190bf7e1eab61f631b2ccc1e94580924d3cc45ec85feb5e8af5165d7c504
+DIST sum_2.5.1_Linux_x86_64_20201112.tar.gz 10589459 BLAKE2B 94a5306b0e0aafc942c8fb75043a74502b28837b599977a8850065688e8606405ca911e12229c1a4c25830cd33f6232c088572e545cfcd4a691f155735133958 SHA512 33e20b966dc10586be594eb416715fe68b2c9435e9784569fd49808a7efdc65a8bf89c94e9fd28bf22a87b1581d877a8bf0ba095204cc3eb2eb2bfc329d74982
+EBUILD smc-sum-2.5.1.20201112.ebuild 938 BLAKE2B da628d52d8e560424cb5aab9f370865966e5af1484849cddde149268fe582707fd7d4216dfc3775f173b691fccb812d0080e284cd179d65595a419a128e533ab SHA512 8e679dd845a7a0a37836f09e4af5c2ed9d27edd1216a99fb01873aac21c397b29f3dafa00d2889cd5214206221b49cbac3a33bc8f4db84ed8040102bfdc8fa73
 MISC metadata.xml 1097 BLAKE2B 2614ed1fd32c33675e1e78fc069670ec2b156efc376beecead2ebc2d7212e918f0fdf923d90f9d6db61a1c672f565701c2fff812e801a6ed955d299506653cf6 SHA512 cebd02c5e048668caf78a5bfc19114ebef9fd55ae9c25adb8c61275b847d7311ae38ab1825b029770bc191b65b334eafcddcbf1c50825c234542e1454b78e730
diff --git a/sys-apps/smc-sum/smc-sum-2.5.0.20200722.ebuild b/sys-apps/smc-sum/smc-sum-2.5.1.20201112.ebuild
index 07ffd44db9d6..a0915d539ee5 100644
--- a/sys-apps/smc-sum/smc-sum-2.5.0.20200722.ebuild
+++ b/sys-apps/smc-sum/smc-sum-2.5.1.20201112.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=7
diff --git a/sys-apps/superdiag/Manifest b/sys-apps/superdiag/Manifest
index c451730ed97c..c5e13cc29446 100644
--- a/sys-apps/superdiag/Manifest
+++ b/sys-apps/superdiag/Manifest
@@ -1,3 +1,3 @@
-DIST SuperDiag_1.3.0_20200109.zip 5223744 BLAKE2B fd4ce0ebc0bc3d3fcd947a54f7c2166371131f4cb1fd172967dc2488bae48df48f2e2f4937aaf20d9ebd4f2d3187e0937a45d789c6f491554096f2009f3d8288 SHA512 6cc2e24ec7a8754c0b8c31b6bc6fdea9e961d1fb8e7c96c4450072ab0f35f3e8f8eee2463ac4d446511cabcde4db07272d19d3ff0cd4739aa31e4fe93707b448
-EBUILD superdiag-1.3.0.20200109.ebuild 1522 BLAKE2B 16dfe9381efd9b7819f9794c066cfbd4de419c4a132e6091dcae151a679f032d373099e555da81ac48c7f711484b537a2a3cf4f2bad9091fb7deda4228dc5433 SHA512 73f936a9026fe0426ccc983cbd6f73ba000579f9368a7bbcc3cf4ffdd22edced838c3f3294be78d01c8b123c5b3469f5b443bca40093ed69c507d7af7616a983
+DIST SuperDiag_1.4.0_20201120.zip 5537813 BLAKE2B 014a3770944fdf9f9396e894320cfa65acebc63cfc1f396b4170a351813b72cca5902a27df21f62bf04a25ab5f9db306795ab108d8669045a205f990b1ef73a1 SHA512 d1e33f0fcb22c0b3794dd3677efa6d1041c81cdf09b92e297035a907e4110482daf896c109437380750ad2905008651b017718e97b1ca1e9f8ceee8c24ee0943
+EBUILD superdiag-1.4.0.20201120.ebuild 1522 BLAKE2B 27ccc547b0c671e35f36cb7ac8f2821f662077c65540aa7945c0a244e59bc96531cc7fa9480fa4c4aa095a573dc743d78fb25b69eb118e38b4e438c40dd5b9f1 SHA512 821092f25b1ca5dc5f706c6f5dfea5350572fb9b4e411b6b183cae8b0189239694d0afc296c8cbfd27e020d5aea2834384518158a01356861e5a27988f0c28eb
 MISC metadata.xml 910 BLAKE2B 59eaa7f51cc6c2c733b62b5f5bdebac5737b3af580fb8afe91f6f5b96e5cb49e66635b182d204a6536141aad275307d0e580ca272ba8d5020635c9c96f9e106b SHA512 e066b98f13d3669a2dd97a38b454c20ec59f5e40ad95fcad43e29bb6baf6958091517f95d94380c2ea2edd41b057f284b687267422bf01da62628f07ca255e0d
diff --git a/sys-apps/superdiag/superdiag-1.3.0.20200109.ebuild b/sys-apps/superdiag/superdiag-1.4.0.20201120.ebuild
index e383bfe1660f..2203a544278f 100644
--- a/sys-apps/superdiag/superdiag-1.3.0.20200109.ebuild
+++ b/sys-apps/superdiag/superdiag-1.4.0.20201120.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=7
diff --git a/sys-apps/toybox/Manifest b/sys-apps/toybox/Manifest
index d61d193e2300..8e4bd6048634 100644
--- a/sys-apps/toybox/Manifest
+++ b/sys-apps/toybox/Manifest
@@ -1,8 +1,10 @@
 DIST toybox-0.8.0.tar.gz 975002 BLAKE2B e137c3616d2affaf8b6f234cab49190b98540fe8f954244172f9ca80c749069f85ff8addd94e1018d3680f1a307df54671ee9b01726c5279f340f8fee3669609 SHA512 aeb15a02782cc0b3b46a892e2d82834e5172a7da04e2498eaefec58221305dd24a86aada5ce05978bd4694895ffeb94ae980fd767f4ee00c499b3dd518fd3e20
 DIST toybox-0.8.1.tar.gz 1015363 BLAKE2B a765a133910b7c8d903a1fa95338b8dee1267c3b7430267d47c4157d966256d16c615500acc38428296b9612649fafdaa111a149df7415ac580c01cfdd361025 SHA512 22f91046c75f986e44927ec89feab6c6afa1f614e5b0eae73e43f6ccd5c4328991ad283858fb1a5cb4d697806f38b8ab81782c160860a2c34ecbef3885636d5e
 DIST toybox-0.8.3.tar.gz 1098057 BLAKE2B d962c4fd1c79229ace5a0836b6170e3ce8a5435df660b5306f5dd0aab32f4509b5c3cf5cc87eea597d336c7cdd51ca4895cadd420febeb9ef9270e85909f8dec SHA512 e2c5a22547cbd85bfee84c4aed3016895e4e0eba9b6f3dfc6cdfa0a0d59dfd74203a35389dcd0b2c557dd04eebbb051f9a458762af3abb32b473bd8924ed7b74
+DIST toybox-0.8.4.tar.gz 1133770 BLAKE2B adc695c2ddd592b9de7137db623621410afaa4cdf2dfde647f24f25d38de99ad38907b5e5aa2ded0d6b2eceafc71763a25e04abc33e8f057934fceed6df22e69 SHA512 507604f96ee89094ca7b4b218985659a8de41578d1a4f267c7282baf11306419e94bb4bfcb06835dff3e46f974a0bb49f89e4c427c69c590738a4a37b62969b8
 EBUILD toybox-0.8.0.ebuild 1150 BLAKE2B 60afaa318851dcdf112b5e46a5963f539e095444f53f4ab9d9645a1ebac53b4cc78ff0eafa54b6dc413590c7e2ea21dbebbb8dd373c4d0d560b60d00e8869075 SHA512 0d0402203c6f292dbc1ea35fbde8a3bb37f3b5ea217c93d33a6865332be020bd4b1dbe376638a2531ef6b1bc65d9c83fcf57a35fb7518242d6b31c8ea82ec9ba
 EBUILD toybox-0.8.1.ebuild 1152 BLAKE2B 5085537d8d99a88301e9a1d4cb835d88207fb584a23ca38abdb3c00c459ba37a669f83c98c838fafbcdc73695c7060abfc08bca49a0c56959a2c070a88d4a310 SHA512 b52bd51a23f1e413abbb8f4e07e4d116f024e7113f0fa78c53788896322d448820f80de74db5fbd267204c4d6e1ee0c3e96b07db568ccddf9b969a0851d36c18
 EBUILD toybox-0.8.3.ebuild 1152 BLAKE2B 69e582a35a852a026721e245e63e4cd48b3ceea36d2c3e412aac8bc31b3372b439668b3eb2343a8eac1eeaa5c526aa8f486ff4459cc68eee7c9edd5cb5abd338 SHA512 2f4f3619467b6b1fed69666d63dc43824fbab1e25e0fd2ffb179deb7d366852674a4ec84de5f40c7f2812d3afd0b5e78142de7baf6b3ae6bff0b08833b302df7
-EBUILD toybox-9999.ebuild 1152 BLAKE2B e8687d50b6363eb7f58e1c5dcc08fc2121dc7870e71b67d8b309316134a7f08b60469b3673109f78449e026191aa265f12b6a299482344ffea25e96f65216572 SHA512 0d3ab83fe880a38388b8d9e88e9688bf82247790792f3e22bf7f25aaf7c19552022e6f260cf1e4f5dc53a4d32a302805c3fcb9c11273620cbc49e405a8427936
+EBUILD toybox-0.8.4.ebuild 1154 BLAKE2B 1eeb73e01ab5428395dbfd2e78c943c02e994a27e3be0342c1620f8f5a60ff7a3142a8e5e42a9df7a06044dd51e1b42d22193d1d0026e371332805d2260f77c7 SHA512 8a3b37c51d1c27c1e63f1b5f45afdd91f711772bcc07134a05c6ee61c0fe6c200a4f4dd0c25aabd586bd5fee60ab7f078cd279fc328cb44ac3654d850ca6bd05
+EBUILD toybox-9999.ebuild 1154 BLAKE2B 1eeb73e01ab5428395dbfd2e78c943c02e994a27e3be0342c1620f8f5a60ff7a3142a8e5e42a9df7a06044dd51e1b42d22193d1d0026e371332805d2260f77c7 SHA512 8a3b37c51d1c27c1e63f1b5f45afdd91f711772bcc07134a05c6ee61c0fe6c200a4f4dd0c25aabd586bd5fee60ab7f078cd279fc328cb44ac3654d850ca6bd05
 MISC metadata.xml 253 BLAKE2B 7dac7f77dcc8de31f439cc6d7770a503f95be9c2f8ae57df9e725df941e2b31a90a43664a485a5fad9510b9ae060ba7aaaddba29324338dd9eb07d88a63c7dce SHA512 303268e1f46e337e32c64b544c0962ecbe8de1799c42736b3c3515b6f31954a655830c402317bd0534cac12059e17eeb5f360d010432dff795a136662a5c10f1
diff --git a/sys-apps/toybox/toybox-0.8.4.ebuild b/sys-apps/toybox/toybox-0.8.4.ebuild
new file mode 100644
index 000000000000..5b1788940a17
--- /dev/null
+++ b/sys-apps/toybox/toybox-0.8.4.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multiprocessing savedconfig toolchain-funcs
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/landley/toybox.git"
+else
+	SRC_URI="https://landley.net/code/toybox/downloads/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Common linux commands in a multicall binary"
+HOMEPAGE="https://landley.net/code/toybox/"
+
+# The source code does not explicitly say that it's BSD, but the author has repeatedly said it
+LICENSE="BSD-2"
+SLOT="0"
+
+src_prepare() {
+	default
+	restore_config .config
+}
+
+src_configure() {
+	tc-export CC STRIP
+	export HOSTCC="$(tc-getBUILD_CC)"
+	# Respect CFLAGS
+	export OPTIMIZE="${CFLAGS}"
+
+	if [[ -f .config ]]; then
+		yes "" | emake -j1 oldconfig > /dev/null
+		return 0
+	else
+		einfo "Could not locate user configfile, so we will save a default one"
+		emake -j1 defconfig > /dev/null
+	fi
+}
+
+src_compile() {
+	unset CROSS_COMPILE
+	export CPUS=$(makeopts_jobs)
+	emake V=1
+}
+
+src_test() {
+	emake test
+}
+
+src_install() {
+	save_config .config
+	newbin generated/unstripped/toybox toybox
+}
diff --git a/sys-apps/toybox/toybox-9999.ebuild b/sys-apps/toybox/toybox-9999.ebuild
index 68a184db8ebe..5b1788940a17 100644
--- a/sys-apps/toybox/toybox-9999.ebuild
+++ b/sys-apps/toybox/toybox-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=7
 
 inherit multiprocessing savedconfig toolchain-funcs
 
@@ -13,16 +13,12 @@ else
 	KEYWORDS="~amd64 ~x86"
 fi
 
-# makefile is stupid
-RESTRICT="test"
-
 DESCRIPTION="Common linux commands in a multicall binary"
 HOMEPAGE="https://landley.net/code/toybox/"
 
 # The source code does not explicitly say that it's BSD, but the author has repeatedly said it
 LICENSE="BSD-2"
 SLOT="0"
-IUSE=""
 
 src_prepare() {
 	default
@@ -32,7 +28,10 @@ src_prepare() {
 src_configure() {
 	tc-export CC STRIP
 	export HOSTCC="$(tc-getBUILD_CC)"
-	if [ -f .config ]; then
+	# Respect CFLAGS
+	export OPTIMIZE="${CFLAGS}"
+
+	if [[ -f .config ]]; then
 		yes "" | emake -j1 oldconfig > /dev/null
 		return 0
 	else
diff --git a/sys-apps/tuned/Manifest b/sys-apps/tuned/Manifest
index de752c4b47fd..dcd31583e141 100644
--- a/sys-apps/tuned/Manifest
+++ b/sys-apps/tuned/Manifest
@@ -1,4 +1,6 @@
 AUX tuned.initd 421 BLAKE2B b60d6fbf4110ba7e0b5c36159dc9624460ccb8774f101a50b89e633bb177a8ef9d7c36fa425a27d8c5ec6c7b9b19965212cb5ee4b60e02abb3c3990beb26840a SHA512 0123e60def031887040df8690222cc553d93b3c5eb7413e19f722ef04ccf2aeb6468709f66866d432d4d0b0c0ed6875929f1292fde8ad18c4a6b589d1b40fab4
 DIST tuned-2.13.0.tar.gz 193816 BLAKE2B 1e51a9da855f54db9ac8ed6e764c091d513c1101771422a62c7c501dc3c8741430eb3503803b408709868d16d4791fbedb9dbc088b36fb693f065a1b6054fa15 SHA512 d81b0a80f911fe808ca324319da3e42c3c15196c0c37343d33b45c2b34f33e205e2913d77ffda8598379a91ef72ab73d88d7b83a4684b6a067e3f36d98a85927
+DIST tuned-2.15.0.tar.gz 207775 BLAKE2B 307b0598d9e99831526f2b26d5544df3832db7e17f28935c6f8d9293ec0d03729fb66906dca4739d48690e488f05383d448e7e714f6ae4824489564c295784c9 SHA512 67acdf10ecccd7910c4dcfd737610b4cb7651c7bf937bc0ed9c51869262d9f3a46f262d0b7636bc7a86a8abf579542a46f551e4f6c7561a061d8d58459be4589
 EBUILD tuned-2.13.0-r1.ebuild 1328 BLAKE2B 43c9abb31c7253a9fa6c1e6734ade3cbff8e8a4f08756b8eb7e368719c86748637e1073ad5c4a3cbfce719e0ce36fd2a4b8f11c0ed4e6bcbeb19477408854da3 SHA512 fc8f6a57e78f8723a15a1d167fecf59242ec20d2cb70077fda0511907bc765c91d837f0a18d3d6208c24929ff0073ed484fb3c44d09ba245126013120ecf9592
+EBUILD tuned-2.15.0.ebuild 1381 BLAKE2B f1871b0149edc249e8730a53df67536a5ab3e7cc929cea10a222658e1fc6421e872ac1102301403518f3043312e590bb61102d9f6c7a80b88c637c91d9169815 SHA512 6d592fc209e7efc1bcf757fdee1b93c5d38a313f8d0772887dfb354cc19a74eac2b03c6f3fd19a01277fad05016361bf17fafc737d3d850b5b4386905b95c14c
 MISC metadata.xml 388 BLAKE2B fba6c8b1e8afb1e474dca668ef0f1d9adc633f9c382ce7772235a8a38c1530dcb9329730d9b1c912a7b44a48ef43572f046751f51c3efcce3f4a6c7c2cdc012e SHA512 6f25c8d915777f95c6f134ba77006290b2d4c02ba70c7254ce7225062da042d8c9f7eb312f842a2988866804ff5069f5f3871e54f97d23bfac936da994d456ea
diff --git a/sys-apps/tuned/tuned-2.15.0.ebuild b/sys-apps/tuned/tuned-2.15.0.ebuild
new file mode 100644
index 000000000000..58b76e9dde2c
--- /dev/null
+++ b/sys-apps/tuned/tuned-2.15.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit python-single-r1 xdg-utils
+
+DESCRIPTION="Daemon for monitoring and adaptive tuning of system devices"
+HOMEPAGE="https://github.com/redhat-performance/tuned"
+SRC_URI="https://github.com/redhat-performance/tuned/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/configobj[${PYTHON_MULTI_USEDEP}]
+		dev-python/decorator[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyudev[${PYTHON_MULTI_USEDEP}]
+		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		dev-python/python-linux-procfs[${PYTHON_MULTI_USEDEP}]
+	')"
+
+RDEPEND="
+	${DEPEND}
+	sys-apps/dbus
+	sys-apps/ethtool
+	sys-power/powertop
+	dev-util/systemtap"
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e "/^PYTHON/s:/usr/bin/python3:${EPYTHON}:" \
+		-e "/^export DOCDIR/s/$/&\-\$(VERSION)/g" \
+		-e "/\$(DESTDIR)\/run\/tuned/d" \
+		-e "/\$(DESTDIR)\/var\/lib\/tuned/d" \
+		-e "/\$(DESTDIR)\/var\/log\/tuned/d" \
+		Makefile || die
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	python_fix_shebang "${D}"
+	python_optimize
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
diff --git a/sys-apps/ucspi-ssl/Manifest b/sys-apps/ucspi-ssl/Manifest
index 9e83f9c5f10b..e2a1ae18aa61 100644
--- a/sys-apps/ucspi-ssl/Manifest
+++ b/sys-apps/ucspi-ssl/Manifest
@@ -1,11 +1,4 @@
-DIST ucspi-ssl-0.94.tgz 112640 BLAKE2B c85c75664e7da4486fbc1b7e0ba3c8e2c57b4719471527d67661d75e0903c953fa7667a6f2384d5c3ffcf8aa3bacaef464957f7e2149749b72bb1aaf50944435 SHA512 a2b7fcea0da4c99a02cd0cf9402d59e55309a65031232e8afc9f29134be268c2e385840f5616c2046649a3f421563f1abcb707a8a8e93c7d29e7aef4a368b604
-DIST ucspi-ssl-0.97.tgz 112640 BLAKE2B ead9a3d720e9aee8855039ce3873f30d9766ad78dcd7eece41e52bbf670945248ae0f8e0b9391c3abe390eef9174e0a31880be605af3378422356f170ab86eaa SHA512 2cafa091f700e0b06b6e0ab23ac02b9459003d747c1ee0e8e95cf0922d94f8f32bde5c956307e333b193ce4514cf99078383a3cc7ffee45aadbd303e2eb454c7
-DIST ucspi-ssl-0.98b.tgz 112640 BLAKE2B 3b970525f8c3f9511daadfc2fda3840566e679b885acd3c17b0d1b2a775d837b59e9ccbbf5543614440366bedd8c24ba5f8f1c4d6b94877c7ef92d3859fdf652 SHA512 c9f6749048059f870b5221296ecb01d4b5c57c1d8c8b3574c67926b60569bce983f257afacfc3383b1b9a60d55b470a5a1548d2c19b0a505b953171a83cee12b
-DIST ucspi-ssl-0.99.tgz 112640 BLAKE2B da1974f59d2fece5877f645f5843311eadd509bfb715576a56b59bc79f6f9954eca9bad88bb36b055aa939d533a8b95b4fb3d3ae9ebde1081bcd6a51b60af5b4 SHA512 2fd29d0f6b31b54f2b53206c6ccd0cf35c759834f34aab26d2a883319d33ff2257163150fc85a2e450c7bd81ce7bbed7b59c4013d71a35a9b3446a6338cb406e
+AUX ucspi-ssl-0.99e-fno-common.patch 1255 BLAKE2B 0a278c0340f2c8f7663afe25bc9478e5798e7fb51195a52fcf4a2ac887fd4d809ef4a617131f146a89095748208ecaea753746b6d4075cd528aad0ddac081a5a SHA512 87b0f8d955f4e9a0c3168d1ff7e29dd8844d34086b0aa77c2cc9b2bdbb1858a2e22e07178a18e04175e325e1e6fb4e4bacec89bdc3571dd973731344664012cc
 DIST ucspi-ssl-0.99e.tgz 112640 BLAKE2B 6db975f412723da1c6c76ff1040c27001c2d5b2b0c8bb3199f37226c31cf1e48f629aa1f8234319c844f2ccf8001d6d9ffd7700da2ae57b6cb22177cfc1e56f8 SHA512 231ef75eedc4f52f46c1f7d6f44feac54069d859da206f9ea874d3a8082dead1be310cc4b7da1148564847b5b452b691718b7ba8076a03145e2002e9250182aa
-EBUILD ucspi-ssl-0.94-r1.ebuild 1217 BLAKE2B 29860c443f9dff6363b630da7c54d1341408652b9b542b494197c36d08a04b2b37a30f96e12eb0cb4cf8ab8d0849d539be6e0e8332de36c29da093ddacb22936 SHA512 cf6c7eee887da29cd462c15529795686ae7ed1d88f9cea3e3beb2c1e8b7a3a99aa398eff17b476925c8336c042026ee3af64ee0a852d39f206c3ffe6596632f3
-EBUILD ucspi-ssl-0.97.ebuild 1284 BLAKE2B 909f26fb66bda9f2b963d7d125496eb29d15ad6a50cc50713ff5a171c1cc8ce6a7adeb8902ab4307dae07e7eb4a42b142907a05c2fbb7400efbdb8eea6b43395 SHA512 473dbba22b26f7167e97ffb91773a85f5bceb3545dd9648d365a758543d7d1afa0e128bd3bb67a5489dc1d8cbccec18664fa39cde4afa5f264bfc6d442938d36
-EBUILD ucspi-ssl-0.98b.ebuild 1254 BLAKE2B 343c3a29a1034913840a1e73427a71bf589afd22625fe5b4f9407a0625e92c66cd189c3b1ef866c3601e943734653b91487daa5ae76ea7a74490aedd5f3bff4c SHA512 5a05bdbec11af831d8e921722425a757acbd944877b474bcb5f7f62351efa60988bc84130ab41c63a3ff707b9b0d30dd32a26b9a6da312d6e65a0f4ddb73aa3a
-EBUILD ucspi-ssl-0.99.ebuild 1254 BLAKE2B fb0dc76802a85bf458c05104f2c7550bc57fff52db5edd82862866864e8705f93f237419820a9016714118bb32bd9bc445e672b273b264ebf6b4b5064e8a8c7f SHA512 efda666c5a18c291cabc933e2e59b396775d957a30a5249472d7ca21902a06437c198fde858679722e3d5cc559aabc88756c5b1e509e05be245bc95d0098fc9d
-EBUILD ucspi-ssl-0.99e.ebuild 1557 BLAKE2B e50a5dddb35998c26a5cc3c36081aec6a539e5053b4e3e93031b4aa15ac0295b1f53785fb6c60b33abd030d7e747948ca7449aa376baa8f75beaa5db124ec6f8 SHA512 71317023c9e9e2591da1d1ea89ed2f011f39e84b8ac844284975bf78c7de710b482d0cde792e2b342a14eff62e588a27bdad5560bb64cdf2dc1ec2cc26d4c5dd
+EBUILD ucspi-ssl-0.99e.ebuild 1603 BLAKE2B 46584930009cc07be6aa8459c8a8475d1029f935321a2436782d60df8ffa3bc0a806c85d4da4e5ad11026c351eb291f280fb13c56052c580e7a8d98704639e83 SHA512 e8834e91cf83360cfcd4ccff01623d9b2a1d4a9e1866557f16db04958a9047c1266aad22f389cace5369ead082cb689065b50173d1bfd29d672610943858124d
 MISC metadata.xml 550 BLAKE2B da79281578d7c1fcb0646eb789b7b12e431ae96f645e9fbd944b1c1089a9321c65a66570a0c9a32ff6502a06794422bcb1129a3edba5016ca3d7f14821058a05 SHA512 e4f99e1cb7f634dfe7252a62fca125bcdc1f7f1e868c8b9786bd4e4d7b857fb983f2567a2022fea697bb4694911807fc0099d0641cb3025558f7bf22c235d2d6
diff --git a/sys-apps/ucspi-ssl/files/ucspi-ssl-0.99e-fno-common.patch b/sys-apps/ucspi-ssl/files/ucspi-ssl-0.99e-fno-common.patch
new file mode 100644
index 000000000000..ea7aa0a47688
--- /dev/null
+++ b/sys-apps/ucspi-ssl/files/ucspi-ssl-0.99e-fno-common.patch
@@ -0,0 +1,56 @@
+https://bugs.gentoo.org/707156
+--- a/src/ip6_bit.c
++++ b/src/ip6_bit.c
+@@ -7,7 +7,7 @@
+ 
+ #define BITSUBSTITUTION
+ 
+-char strnum[FMT_ULONG];
++extern char strnum[FMT_ULONG];
+ 
+ /**
+  * This function converts a IPv6 address into its binary representation.
+--- a/src/remoteinfo.c
++++ b/src/remoteinfo.c
+@@ -50,7 +50,7 @@ static int doit(stralloc *out,int s,char ipremote[4],uint16 portremote,char iplo
+ {
+   buffer b;
+   char bspace[128];
+-  char strnum[FMT_ULONG];
++  extern char strnum[FMT_ULONG];
+   int numcolons;
+   char ch;
+ 
+--- a/src/sslclient.c
++++ b/src/sslclient.c
+@@ -98,7 +98,7 @@ static stralloc moreaddresses;
+ 
+ static stralloc tmp;
+ static stralloc fqdn;
+-char strnum[FMT_ULONG];
++extern char strnum[FMT_ULONG];
+ char ipstr[IP6_FMT];
+ 
+ char seed[128];
+--- a/src/sslhandle.c
++++ b/src/sslhandle.c
+@@ -91,7 +91,7 @@ static stralloc remotehostsa;
+ char *remotehost = 0;
+ char *verifyhost = 0;
+ 
+-char strnum[FMT_ULONG];
++extern char strnum[FMT_ULONG];
+ char strnum2[FMT_ULONG];
+ 
+ static stralloc tmp;
+--- a/src/sslserver.c
++++ b/src/sslserver.c
+@@ -87,7 +87,7 @@ char *verifyhost = 0;
+ unsigned long uid = 0;
+ unsigned long gid = 0;
+ 
+-char strnum[FMT_ULONG];
++extern char strnum[FMT_ULONG];
+ char strnum2[FMT_ULONG];
+ 
+ static stralloc tmp;
diff --git a/sys-apps/ucspi-ssl/ucspi-ssl-0.94-r1.ebuild b/sys-apps/ucspi-ssl/ucspi-ssl-0.94-r1.ebuild
deleted file mode 100644
index b7f0ec1c65e0..000000000000
--- a/sys-apps/ucspi-ssl/ucspi-ssl-0.94-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils fixheadtails qmail
-
-DESCRIPTION="Command-line tools for building SSL client-server applications"
-HOMEPAGE="http://www.fehcom.de/ipnet/ucspi-ssl.html"
-SRC_URI="http://www.fehcom.de/ipnet/ucspi-ssl/${P}.tgz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ppc ppc64 s390 sparc x86"
-IUSE="perl"
-
-DEPEND="
-	>=dev-libs/openssl-0.9.6g:=
-	net-libs/libnsl
-	perl? ( dev-lang/perl:= )
-"
-RDEPEND="
-	${DEPEND}
-	sys-apps/ucspi-tcp
-"
-
-S="${WORKDIR}"/host/superscript.com/net/${P}/src
-
-src_prepare() {
-	ht_fix_all
-	sed -i -e 's:HOME/command:/usr/bin:' sslcat.sh sslconnect.sh https\@.sh || die
-	sed -i -e 's:auto:gcc:' conf-cc || die
-	sed -i -e 's:-m64::' conf-ld || die
-
-	qmail_set_cc
-
-	echo "/usr/bin" > conf-tcpbin || die
-	echo "/usr/" > home || die
-	echo "/usr/share/ca-certificates/" > conf-cadir || die
-	echo "${QMAIL_HOME}/control/dh1024.pem" > conf-dhfile || die
-}
-
-src_compile() {
-	# build fails without setting to j1
-	emake -j1
-}
-
-src_install() {
-	dodoc ../doc/*
-	doman ../man/*.*
-	dobin sslserver sslclient sslcat sslconnect https\@
-	use perl && dobin sslperl
-}
diff --git a/sys-apps/ucspi-ssl/ucspi-ssl-0.97.ebuild b/sys-apps/ucspi-ssl/ucspi-ssl-0.97.ebuild
deleted file mode 100644
index ca948ff43849..000000000000
--- a/sys-apps/ucspi-ssl/ucspi-ssl-0.97.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit fixheadtails qmail
-
-DESCRIPTION="Command-line tools for building SSL client-server applications"
-HOMEPAGE="http://www.fehcom.de/ipnet/ucspi-ssl.html"
-SRC_URI="http://www.fehcom.de/ipnet/ucspi-ssl/${P}.tgz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="perl"
-
-DEPEND="
-	>=dev-libs/openssl-0.9.8z_p8:=
-	net-libs/libnsl
-	perl? ( dev-lang/perl:= )
-"
-RDEPEND="
-	${DEPEND}
-	sys-apps/ucspi-tcp
-"
-
-S="${WORKDIR}"/host/superscript.com/net/${P}
-
-src_prepare() {
-	ht_fix_all
-	sed -i -e 's:auto:gcc:' conf-cc || die
-	sed -i -e 's:-m64::' conf-ld || die
-
-	qmail_set_cc
-
-	echo "/usr/bin" > conf-tcpbin || die
-	echo "/usr/share/ca-certificates/" > conf-cadir || die
-	echo "${QMAIL_HOME}/control/dh1024.pem" > conf-dhfile || die
-
-	cd src || die
-	echo "/usr/" > home || die
-	sed -i -e 's:HOME/command:/usr/bin:' sslcat.sh sslconnect.sh https\@.sh || die
-
-	eapply_user
-}
-
-src_compile() {
-	# build fails without setting to j1
-	emake -j1 -C src
-}
-
-src_install() {
-	dodoc doc/*
-	doman man/*.*
-	dobin src/https\@ src/sslcat src/sslclient src/sslconnect src/sslprint src/sslserver
-	use perl && dobin src/sslperl
-}
diff --git a/sys-apps/ucspi-ssl/ucspi-ssl-0.98b.ebuild b/sys-apps/ucspi-ssl/ucspi-ssl-0.98b.ebuild
deleted file mode 100644
index aafef7060ff4..000000000000
--- a/sys-apps/ucspi-ssl/ucspi-ssl-0.98b.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit fixheadtails qmail
-
-DESCRIPTION="Command-line tools for building SSL client-server applications"
-HOMEPAGE="http://www.fehcom.de/ipnet/ucspi-ssl.html"
-SRC_URI="http://www.fehcom.de/ipnet/ucspi-ssl/${P}.tgz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="perl"
-
-DEPEND="
-	dev-libs/openssl:0=
-	net-libs/libnsl
-	perl? ( dev-lang/perl:= )
-"
-RDEPEND="
-	${DEPEND}
-	sys-apps/ucspi-tcp
-"
-
-S="${WORKDIR}"/host/superscript.com/net/${P}
-
-src_prepare() {
-	ht_fix_all
-	sed -i -e 's:auto:gcc:' conf-cc || die
-	sed -i -e 's:-m64::' conf-ld || die
-
-	qmail_set_cc
-
-	echo "/usr/bin" > conf-tcpbin || die
-	echo "/usr/share/ca-certificates/" > conf-cadir || die
-	echo "${QMAIL_HOME}/control/dh1024.pem" > conf-dhfile || die
-
-	cd src || die
-	echo "/usr/" > home || die
-	sed -i -e 's:HOME/command:/usr/bin:' sslcat.sh sslconnect.sh https\@.sh || die
-
-	eapply_user
-}
-
-src_compile() {
-	emake sysdeps -C src
-	emake -C src
-}
-
-src_install() {
-	dodoc doc/*
-	doman man/*.*
-	dobin src/https\@ src/sslcat src/sslclient src/sslconnect src/sslprint src/sslserver
-	use perl && dobin src/sslperl
-}
diff --git a/sys-apps/ucspi-ssl/ucspi-ssl-0.99.ebuild b/sys-apps/ucspi-ssl/ucspi-ssl-0.99.ebuild
deleted file mode 100644
index 7d270cb39f74..000000000000
--- a/sys-apps/ucspi-ssl/ucspi-ssl-0.99.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit fixheadtails qmail
-
-DESCRIPTION="Command-line tools for building SSL client-server applications"
-HOMEPAGE="http://www.fehcom.de/ipnet/ucspi-ssl.html"
-SRC_URI="http://www.fehcom.de/ipnet/ucspi-ssl/${P}.tgz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="perl"
-
-DEPEND="dev-libs/openssl:=
-	net-libs/libnsl
-	perl? ( dev-lang/perl:= )"
-RDEPEND="${DEPEND}
-	sys-apps/ucspi-tcp"
-
-S="${WORKDIR}"/host/superscript.com/net/${P}
-
-src_prepare() {
-	ht_fix_all
-
-	sed -i -e 's:auto:gcc:' conf-cc || die
-	sed -i -e 's:-m64::' conf-ld || die
-	qmail_set_cc
-
-	echo "/usr/bin" > conf-tcpbin || die
-	echo "/usr/share/ca-certificates/" > conf-cadir || die
-	echo "${QMAIL_HOME}/control/dh1024.pem" > conf-dhfile || die
-	echo "/usr/" > src/home || die
-	sed -i -e 's:HOME/command:/usr/bin:' \
-		src/sslcat.sh src/sslconnect.sh src/https\@.sh || die
-
-	eapply_user
-}
-
-src_compile() {
-	cd src || die
-	emake sysdeps
-	emake uint32.h
-	emake
-}
-
-src_install() {
-	dodoc doc/*
-	doman man/*.*
-
-	cd src || die
-	dobin $(<../package/commands-base)
-	use perl && dobin $(<../package/commands-sslperl)
-}
diff --git a/sys-apps/ucspi-ssl/ucspi-ssl-0.99e.ebuild b/sys-apps/ucspi-ssl/ucspi-ssl-0.99e.ebuild
index 2b8ea0ee5f83..03a26b48ecbf 100644
--- a/sys-apps/ucspi-ssl/ucspi-ssl-0.99e.ebuild
+++ b/sys-apps/ucspi-ssl/ucspi-ssl-0.99e.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=7
@@ -14,7 +14,8 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ppc ppc64 s390 sparc x86"
 IUSE="bindist perl libressl"
 
-DEPEND="libressl? ( dev-libs/libressl:0= )
+DEPEND="
+	libressl? ( dev-libs/libressl:0= )
 	!libressl? ( dev-libs/openssl:0=[bindist=] )
 	perl? ( dev-lang/perl:= )"
 RDEPEND="${DEPEND}
@@ -22,6 +23,8 @@ RDEPEND="${DEPEND}
 
 S="${WORKDIR}"/host/superscript.com/net/${P}
 
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
+
 src_prepare() {
 	ht_fix_all
 
@@ -41,8 +44,7 @@ src_prepare() {
 	if use bindist; then
 		echo > conf-ecdh || die
 	fi
-
-	eapply_user
+	default
 }
 
 src_compile() {
diff --git a/sys-apps/udevil/Manifest b/sys-apps/udevil/Manifest
index 0ad31c28b155..206fdc042b88 100644
--- a/sys-apps/udevil/Manifest
+++ b/sys-apps/udevil/Manifest
@@ -1,6 +1,8 @@
 AUX udevil-0.4.3-flags.patch 1051 BLAKE2B d9c6ad984ac5ef75f20226f7d2e2a3ce73126af48e92fef672307356ede10185bc14c7cb36d07bf6fedccea2813de2c994390533f03fa490142b7b1355fb4c6f SHA512 9c4cb6c11b776f55475b481f3b21d5f4d1c9750bbe3da980f1c26fb794b5eb9aac651d73a4fe810d67431c224904817f2f0a26e144d8f82a0c8c475a8fb6ef80
 AUX udevil-0.4.4-include-sysmacros.patch 398 BLAKE2B 36369bc56a5d3b66dd455f8fc481481156a4fa2b005046e7718ca186a2c3a1b980456d0025ffe3e25db476c91b3011fa5a3a209f270847508e78aaf2081c1b2a SHA512 ce9070dcce7fb0117e50cda0f8b27f493a24f881a9e11fef2024ff3e3b70a1804bb7beef35c9935247baa1f74a499a0ad928a9ff7dbcc586b8c7ee26c5a57776
+AUX udevil-0.4.4-no-libtool.patch 223 BLAKE2B d31cc00b2aeb4143a2ce58f36dd13f3701ed8f8e30604e73757c3c04e21fd80fb69f50d80bfa30360b83c3a8a882e72009c99767cbb7a0c90c3403b00477c92d SHA512 bc77d93ac17f8345b973df6dd81890dc3e437e7926d53db5cbbbb17a5c3f2067ad0ff027b0d870c15276a5528bbc869bed6d7ec5b090927e671865783ffc37a2
 AUX udevil-0.4.4-stat.patch 234 BLAKE2B 834ac0c306e4f13cea623304637729e285ff5d286b40e6b4a05f8a8acbf4ce8ff95d6552b6274e01de22ebfc3ee683376decb2de2afa70b56d66bc944a325590 SHA512 92a9889e3c70e3b9b0bdd4f6470ba0368a69d42eb852f10bcf00bb1f06ae126ea1579cfaaff15127e359c790f0672c655b34efddb7c27fe88addee70ec4d7583
 DIST udevil-0.4.4.tar.gz 477254 BLAKE2B 16a1980da8b3b98e36921c8e2fe6490c495066178dd928695a07eb8d5d7367cae49e314983f251a1ec684bd16a34286ea4ccc83329c9af0dd71af84c77ced20d SHA512 adce4916e06d1cc4965521abbcbc2901e53930691167f431cb18e28d3ef8bde740e95a6a5f40dfc58dfd7b4b661b4475d3dd2b6174a5d7a55ae7c65629b82327
 EBUILD udevil-0.4.4-r3.ebuild 1960 BLAKE2B a1aec5c2fd909c3b0361651bb39771bb88dcb939654af6a6e149b2407453e15693d19a15293a63400e9e7279c8dc056edf62f87c7494a8cd2554896de904c2ff SHA512 e1a6f76c8e7e1423288fb3c486bffbaf37b28ec3975e30c8d857f8f369cea6060c9f373358b9f4cf0b2c731efaf3a2254b8d71978715c3652d07c3cdbaa48489
+EBUILD udevil-0.4.4-r4.ebuild 2006 BLAKE2B 2054111055dd3b2ec19cf9ddbc4ffd27b2da998a28cebb26a280a72b90d9856a05a77a901081591dd214978b71732cefa3e6cbd9b80c0f8ca15628bb847e4e97 SHA512 11e46baa39bc7ad7425ff0c8e4bc9dc0c4c0d4a42064fa6dc7dadab32efa39b55d90be6256a279f3fec123609fce1db407931725a42eade4a1a3640f536f8783
 MISC metadata.xml 250 BLAKE2B 0a529fe4be14917719f846d11e5d49e7129b42ec81e665a0895c29fe63ea1300d30a5e470b9c0c06f18d214a862cd02669c7e3f92f174aa21339b84e29dd3f14 SHA512 6b612fb510b795abda0fb36e0440a98c315e1d09b397e2865f8eea7b740763f93673a19cb356e8366ace8f00f1c4e2e4246d74d6c4fa87e3427300d33f975537
diff --git a/sys-apps/udevil/files/udevil-0.4.4-no-libtool.patch b/sys-apps/udevil/files/udevil-0.4.4-no-libtool.patch
new file mode 100644
index 000000000000..ba01e94f15f7
--- /dev/null
+++ b/sys-apps/udevil/files/udevil-0.4.4-no-libtool.patch
@@ -0,0 +1,10 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -11,7 +11,6 @@ AM_MAINTAINER_MODE
+ AC_ISC_POSIX
+ AM_PROG_CC_C_O
+ AC_HEADER_STDC
+-AM_PROG_LIBTOOL
+ AC_PROG_INSTALL
+ 
+ AC_DEFINE_UNQUOTED(UDEVIL_VERSION, "$VERSION", [udevil version])
diff --git a/sys-apps/udevil/udevil-0.4.4-r4.ebuild b/sys-apps/udevil/udevil-0.4.4-r4.ebuild
new file mode 100644
index 000000000000..c65d66c45e09
--- /dev/null
+++ b/sys-apps/udevil/udevil-0.4.4-r4.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="mount and unmount removable devices without a password"
+HOMEPAGE="https://ignorantguru.github.com/udevil/"
+SRC_URI="https://github.com/IgnorantGuru/udevil/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	acct-group/plugdev
+	>=app-shells/bash-4.0:*
+	dev-libs/glib:2
+	sys-apps/util-linux
+	virtual/acl
+	>=virtual/udev-143"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+PATCHES=(
+	# This works for 0.4.4 too, no sense copying the patch
+	"${FILESDIR}"/${PN}-0.4.3-flags.patch
+	"${FILESDIR}"/${PN}-0.4.4-stat.patch
+	"${FILESDIR}"/${PN}-0.4.4-include-sysmacros.patch
+	"${FILESDIR}"/${PN}-0.4.4-no-libtool.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--with-setfacl-prog="$(type -P setfacl)" \
+		--enable-systemd
+}
+
+src_install() {
+	default
+	fowners root:plugdev /usr/bin/udevil
+	fperms 4754 /usr/bin/udevil
+}
+
+pkg_postinst() {
+	einfo
+	elog "Please add your user to the plugdev group"
+	elog "to be able to use ${PN} as a user"
+	elog
+	elog "Optional dependencies:"
+	elog "  gnome-extra/zenity (devmon popups)"
+	elog "  net-fs/davfs2      (mount WebDAV resources)"
+	elog "  net-fs/cifs-utils  (mounting samba shares)"
+	elog "  net-fs/curlftpfs   (mounting ftp shares)"
+	elog "  net-fs/nfs-utils   (mounting nfs shares)"
+	elog "  net-fs/sshfs       (mounting sftp shares)"
+	elog "  virtual/eject      (eject via devmon)"
+	if ! has_version 'sys-fs/udisks' ; then
+		elog
+		elog "When using ${PN} without udisks, and without the udisks-daemon running,"
+		elog "you may need to enable kernel polling for device media changes to be detected."
+		elog "See https://ignorantguru.github.com/${PN}/#polling"
+		has_version '<virtual/udev-173' && ewarn "You need at least udev-173"
+		kernel_is lt 2 6 38 && ewarn "You need at least kernel 2.6.38"
+		einfo
+	fi
+}
diff --git a/sys-apps/usbguard/Manifest b/sys-apps/usbguard/Manifest
index f7ec8610d6f5..284b78fe8c21 100644
--- a/sys-apps/usbguard/Manifest
+++ b/sys-apps/usbguard/Manifest
@@ -2,6 +2,8 @@ AUX usbguard-0.7.6-usbguard-dbus.openrc 278 BLAKE2B 58f11c693e25436605af6ad41a1f
 AUX usbguard-0.7.6-usbguard.openrc 309 BLAKE2B d5297058d0ee8ce0f9fc91f2158f4aef5f077e1087800449a0319038d677a2a70274305058cd104ba30529b3c9daf82ffbe16ca5cdf20a3b4817e66d499d08c5 SHA512 512a08f59caf9de22b0776473a1ea9a4322b05c6286c99dac3055e0c6d52c78542448c33e19708338080cfdcdfcfb0f9868e8c523155e978c0161c262081da09
 DIST usbguard-0.7.6.tar.gz 1189194 BLAKE2B 4fefd9ccf13b094f64942559f481144f08986dc71154b87c1623459d2429c07e2738a17877d3f6c275e83ce904067b1284c588c9a95023c7205cc5e21ca118f0 SHA512 0b0d42276e48baac2dc1f9031eec25e3f622a8d6178cb0400b97c7d32005bfa158b60fd286fdc66206a8684658fefaf6389ef93511e942f025e75671d7455628
 DIST usbguard-0.7.8.tar.gz 1220764 BLAKE2B 8127acc0ef5dd89cc540097a71f10d56f3cb0a166453e27161e444d37dbf51cc4861bc9c71dcca16e9fec7187b3dcabb2bf08af522b2aaa4693fa4f4913a9ae0 SHA512 315c25ed7eb61cc0920047836dcca035cb07aecb6dfece9e4f6dc2ad61aaf6fdbf86898e43493958f3d12a146eb4c8f88b90bb246da0df83bb2097ce5b853e88
+DIST usbguard-1.0.0.tar.gz 1260374 BLAKE2B ea9b48f14a4091f4ce61b6c171947cf2412c47e9aa3edb816e933f7aad6247b32e89bee90675ca5a0136b460fef8f2d423c0c81ad49d52453d0d3803b881503a SHA512 068a9be8bd5ea05efcdad79e2c4beb5e8b646b4703fbe1f8bb262e37ae9a6284a6eeb811a6bd441250a38bce1e45b7f44ad15726aa5963da2e1b56e85f5e16fd
 EBUILD usbguard-0.7.6-r1.ebuild 1907 BLAKE2B 5cde16f4d987a58407ced3161b78840464b349d647cb32652cc6090e3d18946b711226610af2a69bb2facabf58708eac7fa2dc74976d9f0775c608c774906e3c SHA512 3678951cba045a47164edf3bf18ec977fd96a14ca89a14afca515d6c83a22f9ea3273286c463d80147befa52c60ecda53a52f94c8c03ab04a06b83f72147c6b1
 EBUILD usbguard-0.7.8.ebuild 1939 BLAKE2B 005089535c659c4bb5a66410b2bcfb6610a39cab2512563db6c72d9036bd4999b046b184d9cb5d120bc204e6e09d07e28266cc8c3f0ec6d9395f63fcaeb215f2 SHA512 56597f7718e59236cc7e19f9c37ac413092704551acdaa1ef9cb5d148cd73da4aac9f70d1b59c2f44c32379253d116da77c3a7cc0635f43bf5af8d5967c8203d
+EBUILD usbguard-1.0.0.ebuild 1974 BLAKE2B 4b10f0d508675c43f6f24ffc50bc8e04cbcd2d0c1a86d273a666eed378dc2dec90280c937732810bb4ff645e180a29da36051af95f44feec220823cfdc5c1987 SHA512 53f8185a814b5f546f207a3e3ad7623be06576eab73a26794005db401df76081732735e3f9bf3ba3b02e427f58a1ac966d2f1ec4cf8eec230587422f77691b75
 MISC metadata.xml 249 BLAKE2B 3647e2ef94ad009c86dc9d42c1396ad9420ade97042882b8d8f60f676c465cfd6ea3cea4b77caccadd99eb0cbe1ef83b18b799ec676da4ecfbff528d21bb5ffb SHA512 334ac61f9acc5c4917fd29afb3b420b1689b39be80cada419bed1db033e64130866d0995abe5f1c75eb1290f51734e9ad4c8d06fd8b49c288ecf617a0693d273
diff --git a/sys-apps/usbguard/usbguard-1.0.0.ebuild b/sys-apps/usbguard/usbguard-1.0.0.ebuild
new file mode 100644
index 000000000000..761a616c07c0
--- /dev/null
+++ b/sys-apps/usbguard/usbguard-1.0.0.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Daemon protecting your computer against BadUSB"
+HOMEPAGE="https://github.com/USBGuard/usbguard"
+SRC_URI="https://github.com/USBGuard/usbguard/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0/1"  # due to libusbguard.so.<1>.0.0
+KEYWORDS="~amd64 ~x86"
+IUSE="bash-completion dbus ldap policykit static-libs systemd"
+
+REQUIRED_USE="policykit? ( dbus )"
+
+CDEPEND="
+	dev-libs/pegtl
+	>=dev-libs/libsodium-0.4.5:=
+	>=dev-libs/protobuf-2.5.0:=
+	>=sys-cluster/libqb-0.16.0:=
+	sys-devel/gcc:*[cxx]
+	>=sys-libs/libcap-ng-0.7.0
+	>=sys-libs/libseccomp-2.0.0
+	>=sys-process/audit-2.7.7
+	bash-completion? ( >=app-shells/bash-completion-2.0 )
+	dbus? (
+		dev-libs/glib:2
+		sys-apps/dbus
+		policykit? ( sys-auth/polkit[introspection] )
+	)
+	ldap? ( net-nds/openldap )
+	systemd? ( sys-apps/systemd )
+	"
+RDEPEND="${CDEPEND}
+	virtual/udev
+	"
+DEPEND="${CDEPEND}
+	app-text/asciidoc
+	dev-cpp/catch:1
+	dbus? (
+		dev-libs/libxml2
+		dev-libs/libxslt
+		dev-util/gdbus-codegen
+	)
+	"
+
+src_configure() {
+	local myargs=(
+		$(use_with dbus)
+		$(use_with ldap)
+		$(use_with policykit polkit)
+		$(use_enable static-libs static)
+		$(use_enable systemd)
+	)
+
+	econf "${myargs[@]}"
+}
+
+src_install() {
+	default
+
+	keepdir /var/lib/log/usbguard
+
+	newinitd "${FILESDIR}"/${PN}-0.7.6-usbguard.openrc usbguard
+	use dbus && newinitd "${FILESDIR}"/${PN}-0.7.6-usbguard-dbus.openrc usbguard-dbus
+}
+
+pkg_postinst() {
+	ewarn
+	ewarn 'BEFORE STARTING USBGUARD please be sure to create/generate'
+	ewarn '                         a rules file at /etc/usbguard/rules.conf'
+	ewarn '                         so that you do not'
+	ewarn '                                            GET LOCKED OUT'
+	ewarn "                         of this system (\"$(hostname)\")."
+	ewarn
+	ewarn 'This command may be of help:'
+	ewarn '  sudo sh -c "usbguard generate-policy > /etc/usbguard/rules.conf"'
+	ewarn
+}
diff --git a/sys-apps/usermode-utilities/Manifest b/sys-apps/usermode-utilities/Manifest
index 7e5070dcfa46..72db39618364 100644
--- a/sys-apps/usermode-utilities/Manifest
+++ b/sys-apps/usermode-utilities/Manifest
@@ -2,6 +2,5 @@ AUX usermode-utilities-20070815-headers.patch 491 BLAKE2B 0c4e274101ada3c084cd65
 AUX usermode-utilities-20070815-humfsify-owner.patch 460 BLAKE2B 5135621f69d9f923021059606c9faf1089ad7ee3273224a40ad570e233664dd781c633f7af61e41cacd2bdda298e23a79e04ec71a38875c95f9649a886d0b93e SHA512 f048d1fde80a5fae33a67c99aad5927f64343a1bec15cdab94bb5c8798b96192fccedda66a9aa8f14fb90de803cba031ddec4d9bc6eec236b8245aaa7b74115f
 AUX usermode-utilities-20070815-rollup.patch 4619 BLAKE2B d8701507d464fa10ebb99663dbf32c1d57040059bf7f43fcbcef82637d98d51ca55cd4fb28c7d7feb79c9b1597f4aa7ac01e7494e1db5549f75445ef9ba7854b SHA512 9cfc5a2fa98b7aff45c732629812ab691d3a56e5526f70d9ddb93dd666b9bf743296914f63043a94611e045915ed8046c87507a451deebc3d889d0827dc76439
 DIST uml_utilities_20070815.tar.bz2 50159 BLAKE2B d11e7bc92892f2f5bc655bf580d66b1364d2c1f8e97e85ff39a6aeb85ed979c33c1d7c084b0a5e442df5622f7fa657677a322748e44c7ecf67f14d6b39a7536c SHA512 a246ca04bcba2282ceb976e69399f496cc85d14ee13c1e4704f943d7fcef032eda92e9e8c4341f6e8878c6353ed97c7f77b283e62e152987c792a7a6258f1d1a
-EBUILD usermode-utilities-20070815-r3.ebuild 1269 BLAKE2B 916b02adfab8a141c1b6cf402df5d5356f207dafa2087b14e95595a8d1fad7e91681ce1b6290c97c70c04e9b9f0280bebbd20097568d6b28fe3260a7541d1924 SHA512 21db6e3680315826e40397c9f9703de051ccd6db856afd48093ce5fa7a31d730e32030bcd9385c641830f9a07497cc638f4f1dd131333c9af926cdd726c9330f
-EBUILD usermode-utilities-20070815-r4.ebuild 1275 BLAKE2B dc9df93b62c5bdfec21afe7b204aa09d89e064bb126f930e43868aafca27779dc676a574df40d550f209614e8ac4ae744565871a3a179b750b332d508d59ffa9 SHA512 e24b1df034c6ca6e38be371949107a45d01391c5906ae86aae9011336b4a524393aea6dfd6c84b5d8dd66f8c6c7d25848fdf36c8f7e975a6ed19deeda30f0d54
+EBUILD usermode-utilities-20070815-r4.ebuild 1272 BLAKE2B 19c421c2680e7b953f6c7ea19ecf8c32f525b0f4038da8495937626812e93e9c4ae1ee3f6112dbb5ba6c0ac9d44e45e8ba409722387e176482793fef71ecd516 SHA512 d2c36f0308eba22a98ee6d122ad5333ee8737d1343a5fa1a0608d20ec4246eeb1c18c48b68edbb0f2773485e444d4b8d77ec2e89d726498fff197b03023169d5
 MISC metadata.xml 340 BLAKE2B 8e392fbd4b9aea114ed7bd1d7cd15ced02e48b2cffced6a23700ceea02f645e7fef352e54f3a3a324536e2686de3324973a648858202e6cc310e633b1e155e42 SHA512 cd72a8e80c3b9410363e3e9d3ddb194f858138598e3fd0375b38ab43d4ce82d29309aba07b71c3d2756e871168fbf1c8bb3f3ba87c00d0b27f1f3add2627734d
diff --git a/sys-apps/usermode-utilities/usermode-utilities-20070815-r3.ebuild b/sys-apps/usermode-utilities/usermode-utilities-20070815-r3.ebuild
deleted file mode 100644
index 86a15526f28f..000000000000
--- a/sys-apps/usermode-utilities/usermode-utilities-20070815-r3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Tools for use with Usermode Linux virtual machines"
-HOMEPAGE="http://user-mode-linux.sourceforge.net/"
-SRC_URI="http://user-mode-linux.sourceforge.net/uml_utilities_${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-IUSE="fuse"
-
-RDEPEND="fuse? ( sys-fs/fuse )
-	sys-libs/readline:0="
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"/tools-${PV}
-
-src_prepare() {
-	# Merge previous patches with fix for bug #331099
-	epatch "${FILESDIR}"/${P}-rollup.patch
-	# Fix owner of humfsify; bug #364531
-	epatch "${FILESDIR}"/${P}-humfsify-owner.patch
-	epatch "${FILESDIR}"/${P}-headers.patch #580816
-
-	sed -i -e 's:-o \$(BIN):$(LDFLAGS) -o $(BIN):' "${S}"/*/Makefile || die "LDFLAGS sed failed"
-	sed -i -e 's:-o \$@:$(LDFLAGS) -o $@:' "${S}"/moo/Makefile || die "LDFLAGS sed (moo) failed"
-	if ! use fuse; then
-		einfo "Skipping build of umlmount to avoid sys-fs/fuse dependency."
-		sed -i -e 's/\<umlfs\>//' Makefile || die "sed to remove sys-fs/fuse dependency failed"
-	fi
-}
-
-src_compile() {
-	tc-export AR CC
-	emake CFLAGS="${CFLAGS} ${CPPFLAGS} -DTUNTAP -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -g -Wall" all
-}
diff --git a/sys-apps/usermode-utilities/usermode-utilities-20070815-r4.ebuild b/sys-apps/usermode-utilities/usermode-utilities-20070815-r4.ebuild
index 04ceb9e3621c..1f37ae892809 100644
--- a/sys-apps/usermode-utilities/usermode-utilities-20070815-r4.ebuild
+++ b/sys-apps/usermode-utilities/usermode-utilities-20070815-r4.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
@@ -10,7 +10,7 @@ SRC_URI="http://user-mode-linux.sourceforge.net/uml_utilities_${PV}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 arm x86"
 IUSE="fuse"
 
 RDEPEND="
diff --git a/sys-apps/xdg-desktop-portal-gtk/Manifest b/sys-apps/xdg-desktop-portal-gtk/Manifest
index dcb5a9b5aa51..9601c14065a3 100644
--- a/sys-apps/xdg-desktop-portal-gtk/Manifest
+++ b/sys-apps/xdg-desktop-portal-gtk/Manifest
@@ -1,3 +1,3 @@
 DIST xdg-desktop-portal-gtk-1.8.0.tar.xz 370196 BLAKE2B d15a054e8fbc74718db7ad2d0f7b53c86b392e729fb4d5b8bdd87b16c0ebbf4feb11b29bc27da12990b351f520faa23bde694721819589513b6cfd1e4ea2f092 SHA512 832b3c4cb9ea738f2ab7641fbd7e14beaa5f6a1ae88f012cd44b12f4bc51588f61868b5982301e3dfd67965d6a69fd8669a9832b6ec7017168d611c87d76689b
-EBUILD xdg-desktop-portal-gtk-1.8.0.ebuild 987 BLAKE2B 5bdf3f125a5f557ff292dfe60c5d7f1bc63207ed2655c1f44e9c9a1437c8af7c14130dd6ee6eb17c65b02fec98be7ea02804e5bd16b551e504d8b46d4a086d22 SHA512 e894c73a439901681821aeb3dc8dc5c4ba54d0d11e99556ff6e134b0ef138e0330a2e2166e0f5f91c54a4dfd0790f8cea7bf59160d79a6e261e1cf2bf4a52387
+EBUILD xdg-desktop-portal-gtk-1.8.0.ebuild 986 BLAKE2B b21a169dd7b4cca4e739e1e018b814c6f0d1144bebbc84586d23c3219e4f2956abe228be29360ee98dff2ea862379783bb4bd5e8fc051c0ae8a29a77d8eafa75 SHA512 5a6442c7c2150f8f4f262af2b4f0b142ca5c1ebaf99344a6ce23a23503805705ee36f82f639d48b02d015b61fd61061c39b730f5239e2b1c6649fc119224af27
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/sys-apps/xdg-desktop-portal-gtk/xdg-desktop-portal-gtk-1.8.0.ebuild b/sys-apps/xdg-desktop-portal-gtk/xdg-desktop-portal-gtk-1.8.0.ebuild
index f35e8cfddecc..9d097a11e0a5 100644
--- a/sys-apps/xdg-desktop-portal-gtk/xdg-desktop-portal-gtk-1.8.0.ebuild
+++ b/sys-apps/xdg-desktop-portal-gtk/xdg-desktop-portal-gtk-1.8.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/flatpak/${PN}/releases/download/${MY_PV}/${MY_P}.tar
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
 IUSE="wayland X"
 
 BDEPEND="
author	V3n3RiX <venerix@redcorelinux.org>	2021-01-22 20:28:19 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2021-01-22 20:28:19 +0000
commit	abaa75b10f899ada8dd05b23cc03205064394bc6 (patch)
tree	eca3dd248b73b92013cba00a0fcc1edf2696e19a /sys-apps
parent	24fd814c326e282c4321965c31f341dad77e270d (diff)