gentoo resync : 29.01.2021

41 files changed, 371 insertions, 474 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 4acae0e6d44e..6c4776680d1f 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/flashrom/Manifest b/sys-apps/flashrom/Manifest
index 1e717c752c31..85bb5e150256 100644
--- a/sys-apps/flashrom/Manifest
+++ b/sys-apps/flashrom/Manifest
@@ -1,9 +1,6 @@
-AUX flashrom-1.2_make-libflashrom-usable.patch 3230 BLAKE2B ddf5677e8a6b931d372059bf270b74a1dcd6ebfdfb1cf3e7c976e647fdc8180d005f19416ee15bb0b25f1f2b891348a42a83f8e6d44c528864947cd4be78e0da SHA512 dd60f4e25ab519f6b5f03c4e80be2fe24ab2c5c206c78aff2802f91026d5ef3889d2376f88bc4baa32de5c48951afe0cb1d62dbfc65c4965058caccfadff65d1
 AUX flashrom-1.2_meson-fixes.patch 7977 BLAKE2B 5ac9e09c6fbcf08f36da1fc874511f7023338b0bffe775c61be9f7c253d6d8343833ec64ff86dc3b4733e90e67435e3cc0d52e6ae11c8d368fe2f21b6a85bc59 SHA512 a0e30c2a87775342302fabfd594c91015b6ea9fba71a7d1b294c399a8336167f85b07fdcc2ff80174cc43362ef5ca28965571ca52e1a76922ef59dcb15991664
 AUX flashrom-1.2_meson-install-manpage.patch 1208 BLAKE2B a4290c046d82a7c8b8dbfba0d58abed2384506d761272929ca7972c68a92a314de2ad17af5bd49cb86af5fea119d36fb126c45febdd5ac99210949158d33fc75 SHA512 1345bc880317e37d028bc3d40c98e5b5b4b17c7cde18d3b17762c9792cf0e4ac19613702ae1d367937f86dd3dbb02732851774d91ef1372e5bbb8f998346526d
 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 4343 BLAKE2B 3c075bddb34069081508434ad0310547a5271ff7af40626ace19d84d85dad4bb110bb1d0840008ddd6ab698af6ed67416550520af7c6bd00dafe8e1d11ff8858 SHA512 1ec2c508cd46cdfb9db995cc516e64e3562b568a1ea3d04a98753b042ce8aca44fa807f8c41a828953874211794aac415fe4e66c87a8d2d2c74dd0edc4e20f15
-EBUILD flashrom-9999.ebuild 4499 BLAKE2B 1253b00811d15e4ab8fe4411b133efaafe0bb3c126de9c36d47d608ce17e68dcf28927037178d27ef8e7629dfd63c72cdfcb2ad5b43df17b85b4c9caa4f3126a SHA512 80cedf318b434f2c9fca4348af7f64d7127069867b7268560a12c9f01be37b923db435b8b3e34770c443f81bdf6799576b4633d6cc5fdd5b1540601d13b2e41f
+EBUILD flashrom-1.2-r3.ebuild 4339 BLAKE2B c68cb290611caac7c67d3c30570c8e9d54c3e5d24c63a269c8e3ff87de932950722bc86bc8b4c8b884d5dd65006f1576eac0c88328a50fd958b6f9b748473251 SHA512 41afda3a5123d9d124fc032f51dfa8b553b9044443c1783b32aa076a0c5d2b0af42e60dfbc4735166ba23f606e7d01bc6b8e70c4e924ca1150a8a6cffbd710b6
+EBUILD flashrom-9999.ebuild 4501 BLAKE2B c9424d845e9e9e9617b7f7f34a5c4035af50567eecca422e1f06c388ba2400d97824c9e854d1088480637fa36c32e9812470e7532f111e503ff772ae2f9ccb14 SHA512 110cc4d1ae0465c8f29bb0c8a66729d6d23ceaf155aafa60774e6a1a074f8ba2e381f3ea686462b1eea378bbe1501bc7abf8ed5e6cf67012a71cd258dee748c5
 MISC metadata.xml 5037 BLAKE2B 3027f42fb0ab5965684cb79857991888772126fbf48e2f9c314a0e01c831cf38474a20ce846964631ea95dc459629396c3796fc89d858b35f239f2a3fb343c1b SHA512 8602f9ad7419bae5f10620400f9451d16c43d12223173873ab53191c93064bf0bdb72c78ee5cde8dc9fa091ce1c6c80575cf586141080c13c971370fa0ac85f8
diff --git a/sys-apps/flashrom/files/flashrom-1.2_make-libflashrom-usable.patch b/sys-apps/flashrom/files/flashrom-1.2_make-libflashrom-usable.patch
deleted file mode 100644
index ea15a4230592..000000000000
--- a/sys-apps/flashrom/files/flashrom-1.2_make-libflashrom-usable.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-1. Add an (extremely primitive) rule for generating a pkgconfig file
-   for libflashrom, as fwupd cannot find it without one. Note that this
-   rule depends on several variables to be passed to make, see ebuilds
-   using this patch for details;
-2. Tweak the way library dependencies are passed around a bit to make it
-   easier to inject them into said pkgconfig file;
-3. Move print.o from CLI_OBJS to LIB_OBJS - it contains the array
-   'boards_known' which is used in library code. Upstream have already
-   fixed this in Meson files but not in the Makefile.
-
-diff -urN a/flashrom.pc.in b/flashrom.pc.in
---- a/flashrom.pc.in	1970-01-01 01:00:00.000000000 +0100
-+++ b/flashrom.pc.in	2020-07-28 22:47:01.928679346 +0200
-@@ -0,0 +1,9 @@
-+prefix=@PREFIX@
-+libdir=${prefix}/@LIBDIR@
-+includedir=${prefix}/@INCLUDEDIR@
-+
-+Name: libflashrom
-+Description: library to interact with flashrom
-+Version: @VERSION@
-+Libs: -L${libdir} -lflashrom @LIBS@
-+Cflags: -I${includedir}
-diff -urN a/Makefile b/Makefile
---- a/Makefile	2019-12-31 18:25:41.000000000 +0100
-+++ b/Makefile	2020-07-28 23:18:41.019492448 +0200
-@@ -570,12 +570,12 @@
- ###############################################################################
- # Library code.
- 
--LIB_OBJS = libflashrom.o layout.o flashrom.o udelay.o programmer.o helpers.o ich_descriptors.o fmap.o
-+LIB_OBJS = libflashrom.o layout.o flashrom.o udelay.o programmer.o helpers.o ich_descriptors.o fmap.o print.o
- 
- ###############################################################################
- # Frontend related stuff.
- 
--CLI_OBJS = cli_classic.o cli_output.o cli_common.o print.o
-+CLI_OBJS = cli_classic.o cli_output.o cli_common.o
- 
- # versioninfo.inc stores metadata required to build a packaged flashrom. It is generated by the export rule and
- # imported below. If versioninfo.inc is not found and the variables are not defined by the user, the info will
-@@ -1130,11 +1130,16 @@
- 	@+$(MAKE) -C util/ich_descriptors_tool/ TARGET_OS=$(TARGET_OS) EXEC_SUFFIX=$(EXEC_SUFFIX)
- endif
- 
-+ALL_LIBS = $(LIBS) $(PCILIBS) $(FEATURE_LIBS) $(USBLIBS) $(USB1LIBS) $(JAYLINKLIBS) $(NI845X_LIBS)
-+
-+flashrom.pc:
-+	sed -e "s#@PREFIX@#$(PREFIX)#" -e "s#@LIBDIR@#$(LIBDIR)#" -e "s#@INCLUDEDIR@#$(INCLUDEDIR)#" -e "s#@VERSION@#$(VERSION)#" -e "s#@LIBS@#$(ALL_LIBS)#" < $@.in > $@.tmp && mv $@.tmp $@
-+
- $(PROGRAM)$(EXEC_SUFFIX): $(OBJS)
--	$(CC) $(LDFLAGS) -o $(PROGRAM)$(EXEC_SUFFIX) $(OBJS) $(LIBS) $(PCILIBS) $(FEATURE_LIBS) $(USBLIBS) $(USB1LIBS) $(JAYLINKLIBS) $(NI845X_LIBS)
-+	$(CC) $(LDFLAGS) -o $(PROGRAM)$(EXEC_SUFFIX) $(OBJS) $(ALL_LIBS)
- 
--libflashrom.a: $(LIBFLASHROM_OBJS)
--	$(AR) rcs $@ $^
-+libflashrom.a: $(LIBFLASHROM_OBJS) flashrom.pc
-+	$(AR) rcs $@ $(LIBFLASHROM_OBJS)
- 	$(RANLIB) $@
- 
- # TAROPTIONS reduces information leakage from the packager's system.
-@@ -1149,7 +1154,7 @@
- # This includes all frontends and libflashrom.
- # We don't use EXEC_SUFFIX here because we want to clean everything.
- clean:
--	rm -f $(PROGRAM) $(PROGRAM).exe libflashrom.a *.o *.d $(PROGRAM).8 $(PROGRAM).8.html $(BUILD_DETAILS_FILE)
-+	rm -f $(PROGRAM) $(PROGRAM).exe libflashrom.a flashrom.pc *.o *.d $(PROGRAM).8 $(PROGRAM).8.html $(BUILD_DETAILS_FILE)
- 	@+$(MAKE) -C util/ich_descriptors_tool/ clean
- 
- distclean: clean
diff --git a/sys-apps/flashrom/flashrom-1.2-r1.ebuild b/sys-apps/flashrom/flashrom-1.2-r1.ebuild
deleted file mode 100644
index e984e762420a..000000000000
--- a/sys-apps/flashrom/flashrom-1.2-r1.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://review.coreboot.org/flashrom.git"
-	inherit git-r3
-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"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-DESCRIPTION="Utility for reading, writing, erasing and verifying flash ROM chips"
-HOMEPAGE="https://flashrom.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-# The defaults match the upstream Makefile.
-# Note: Do not list bitbang_spi as it is not a programmer; it's a backend used
-# by some other spi programmers.
-IUSE_PROGRAMMERS="
-	atahpt
-	+atapromise
-	+atavia
-	+buspirate-spi
-	+ch341a-spi
-	+dediprog
-	+developerbox-spi
-	+digilent-spi
-	+drkaiser
-	+dummy
-	+ft2232-spi
-	+gfxnvidia
-	+internal
-	+it8212
-	jlink-spi
-	+linux-mtd
-	+linux-spi
-	mstarddc-spi
-	+nic3com
-	+nicintel
-	+nicintel-eeprom
-	+nicintel-spi
-	nicnatsemi
-	+nicrealtek
-	+ogp-spi
-	+pickit2-spi
-	+pony-spi
-	+rayer-spi
-	+satamv
-	+satasii
-	+serprog
-	stlinkv3-spi
-	+usbblaster-spi
-"
-
-IUSE="${IUSE_PROGRAMMERS} +internal-dmi static tools +wiki"
-
-LIB_DEPEND="
-	atahpt? ( sys-apps/pciutils[static-libs(+)] )
-	atapromise? ( sys-apps/pciutils[static-libs(+)] )
-	atavia? ( sys-apps/pciutils[static-libs(+)] )
-	ch341a-spi? ( virtual/libusb:1[static-libs(+)] )
-	dediprog? ( virtual/libusb:1[static-libs(+)] )
-	developerbox-spi? ( virtual/libusb:1[static-libs(+)] )
-	digilent-spi? ( virtual/libusb:1[static-libs(+)] )
-	drkaiser? ( sys-apps/pciutils[static-libs(+)] )
-	ft2232-spi? ( dev-embedded/libftdi:=[static-libs(+)] )
-	gfxnvidia? ( sys-apps/pciutils[static-libs(+)] )
-	internal? ( sys-apps/pciutils[static-libs(+)] )
-	it8212? ( sys-apps/pciutils[static-libs(+)] )
-	jlink-spi? ( dev-embedded/libjaylink[static-libs(+)] )
-	nic3com? ( sys-apps/pciutils[static-libs(+)] )
-	nicintel-eeprom? ( sys-apps/pciutils[static-libs(+)] )
-	nicintel-spi? ( sys-apps/pciutils[static-libs(+)] )
-	nicintel? ( sys-apps/pciutils[static-libs(+)] )
-	nicnatsemi? ( sys-apps/pciutils[static-libs(+)] )
-	nicrealtek? ( sys-apps/pciutils[static-libs(+)] )
-	ogp-spi? ( sys-apps/pciutils[static-libs(+)] )
-	pickit2-spi? ( virtual/libusb:0[static-libs(+)] )
-	rayer-spi? ( sys-apps/pciutils[static-libs(+)] )
-	satamv? ( sys-apps/pciutils[static-libs(+)] )
-	satasii? ( sys-apps/pciutils[static-libs(+)] )
-	stlinkv3-spi? ( virtual/libusb:1[static-libs(+)] )
-	usbblaster-spi? ( dev-embedded/libftdi:=[static-libs(+)] )
-"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )
-	sys-apps/diffutils"
-RDEPEND+=" !internal-dmi? ( sys-apps/dmidecode )"
-
-_flashrom_enable() {
-	local c="CONFIG_${2:-$(echo "$1" | tr '[:lower:]-' '[:upper:]_')}"
-	args+=( "${c}=$(usex $1 yes no)" )
-}
-flashrom_enable() {
-	local u
-	for u ; do _flashrom_enable "${u}" ; done
-}
-
-src_prepare() {
-	# To make libflashrom.a actually useful
-	append-flags -fPIC
-
-	default
-}
-
-src_compile() {
-	# Help keep things in sync.
-	local sprogs=$(echo $(
-		grep -o 'CONFIG_[A-Z0-9_]*' flashrom.c | \
-			LC_ALL=C sort -u | \
-			sed 's:^CONFIG_::' | \
-			tr '[:upper:]_' '[:lower:]-' | \
-			grep -v ni845x-spi))
-	local eprogs=$(echo ${IUSE_PROGRAMMERS} | sed -E 's/\B[-+]\b//g')
-	if [[ ${sprogs} != "${eprogs}" ]] ; then
-		eerror "The ebuild needs to be kept in sync."
-		eerror "IUSE set to: ${eprogs}"
-		eerror "flashrom.c : ${sprogs}"
-		die "sync IUSE to the list of source programmers"
-	fi
-
-	# Turn USE flags into CONFIG_xxx settings.
-	local args=()
-	flashrom_enable ${eprogs}
-	_flashrom_enable wiki PRINT_WIKI
-	_flashrom_enable static STATIC
-
-	# You have to specify at least one programmer, and if you specify more than
-	# one programmer you have to include either dummy or internal in the list.
-	# We pick dummy as the default because internal requires libpci.
-	if ! use internal && ! use dummy ; then
-		if [[ ${#args[@]} -ne 1 ]] ; then
-			ewarn "You have to specify at least one programmer, and if you specify"
-			ewarn "more than one programmer, you have to enable either dummy or"
-			ewarn "internal as well.  'dummy' will be the default now."
-			args+=( CONFIG_DUMMY=yes )
-		fi
-	fi
-
-	tc-export AR CC PKG_CONFIG RANLIB
-	emake WARNERROR=no "${args[@]}" all libflashrom.a
-}
-
-src_install() {
-	dosbin flashrom
-	doman flashrom.8
-	dodoc README Documentation/*.txt
-	dolib.a libflashrom.a
-	doheader libflashrom.h
-
-	if use tools; then
-		dosbin util/ich_descriptors_tool/ich_descriptors_tool
-	fi
-}
diff --git a/sys-apps/flashrom/flashrom-1.2-r2.ebuild b/sys-apps/flashrom/flashrom-1.2-r2.ebuild
deleted file mode 100644
index d8bff2a09caf..000000000000
--- a/sys-apps/flashrom/flashrom-1.2-r2.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://review.coreboot.org/flashrom.git"
-	inherit git-r3
-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"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-DESCRIPTION="Utility for reading, writing, erasing and verifying flash ROM chips"
-HOMEPAGE="https://flashrom.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-# The defaults match the upstream Makefile.
-# Note: Do not list bitbang_spi as it is not a programmer; it's a backend used
-# by some other spi programmers.
-IUSE_PROGRAMMERS="
-	atahpt
-	+atapromise
-	+atavia
-	+buspirate-spi
-	+ch341a-spi
-	+dediprog
-	+developerbox-spi
-	+digilent-spi
-	+drkaiser
-	+dummy
-	+ft2232-spi
-	+gfxnvidia
-	+internal
-	+it8212
-	jlink-spi
-	+linux-mtd
-	+linux-spi
-	mstarddc-spi
-	+nic3com
-	+nicintel
-	+nicintel-eeprom
-	+nicintel-spi
-	nicnatsemi
-	+nicrealtek
-	+ogp-spi
-	+pickit2-spi
-	+pony-spi
-	+rayer-spi
-	+satamv
-	+satasii
-	+serprog
-	stlinkv3-spi
-	+usbblaster-spi
-"
-
-IUSE="${IUSE_PROGRAMMERS} +internal-dmi static tools +wiki"
-
-LIB_DEPEND="
-	atahpt? ( sys-apps/pciutils[static-libs(+)] )
-	atapromise? ( sys-apps/pciutils[static-libs(+)] )
-	atavia? ( sys-apps/pciutils[static-libs(+)] )
-	ch341a-spi? ( virtual/libusb:1[static-libs(+)] )
-	dediprog? ( virtual/libusb:1[static-libs(+)] )
-	developerbox-spi? ( virtual/libusb:1[static-libs(+)] )
-	digilent-spi? ( virtual/libusb:1[static-libs(+)] )
-	drkaiser? ( sys-apps/pciutils[static-libs(+)] )
-	ft2232-spi? ( dev-embedded/libftdi:=[static-libs(+)] )
-	gfxnvidia? ( sys-apps/pciutils[static-libs(+)] )
-	internal? ( sys-apps/pciutils[static-libs(+)] )
-	it8212? ( sys-apps/pciutils[static-libs(+)] )
-	jlink-spi? ( dev-embedded/libjaylink[static-libs(+)] )
-	nic3com? ( sys-apps/pciutils[static-libs(+)] )
-	nicintel-eeprom? ( sys-apps/pciutils[static-libs(+)] )
-	nicintel-spi? ( sys-apps/pciutils[static-libs(+)] )
-	nicintel? ( sys-apps/pciutils[static-libs(+)] )
-	nicnatsemi? ( sys-apps/pciutils[static-libs(+)] )
-	nicrealtek? ( sys-apps/pciutils[static-libs(+)] )
-	ogp-spi? ( sys-apps/pciutils[static-libs(+)] )
-	pickit2-spi? ( virtual/libusb:0[static-libs(+)] )
-	rayer-spi? ( sys-apps/pciutils[static-libs(+)] )
-	satamv? ( sys-apps/pciutils[static-libs(+)] )
-	satasii? ( sys-apps/pciutils[static-libs(+)] )
-	stlinkv3-spi? ( virtual/libusb:1[static-libs(+)] )
-	usbblaster-spi? ( dev-embedded/libftdi:=[static-libs(+)] )
-"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )
-	sys-apps/diffutils"
-RDEPEND+=" !internal-dmi? ( sys-apps/dmidecode )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.2_make-libflashrom-usable.patch
-)
-
-_flashrom_enable() {
-	local c="CONFIG_${2:-$(echo "$1" | tr '[:lower:]-' '[:upper:]_')}"
-	args+=( "${c}=$(usex $1 yes no)" )
-}
-flashrom_enable() {
-	local u
-	for u ; do _flashrom_enable "${u}" ; done
-}
-
-src_prepare() {
-	# To make libflashrom.a actually useful
-	append-flags -fPIC
-
-	default
-}
-
-src_compile() {
-	# Help keep things in sync.
-	local sprogs=$(echo $(
-		grep -o 'CONFIG_[A-Z0-9_]*' flashrom.c | \
-			LC_ALL=C sort -u | \
-			sed 's:^CONFIG_::' | \
-			tr '[:upper:]_' '[:lower:]-' | \
-			grep -v ni845x-spi))
-	local eprogs=$(echo ${IUSE_PROGRAMMERS} | sed -E 's/\B[-+]\b//g')
-	if [[ ${sprogs} != "${eprogs}" ]] ; then
-		eerror "The ebuild needs to be kept in sync."
-		eerror "IUSE set to: ${eprogs}"
-		eerror "flashrom.c : ${sprogs}"
-		die "sync IUSE to the list of source programmers"
-	fi
-
-	# Turn USE flags into CONFIG_xxx settings.
-	local args=()
-	flashrom_enable ${eprogs}
-	_flashrom_enable wiki PRINT_WIKI
-	_flashrom_enable static STATIC
-
-	# You have to specify at least one programmer, and if you specify more than
-	# one programmer you have to include either dummy or internal in the list.
-	# We pick dummy as the default because internal requires libpci.
-	if ! use internal && ! use dummy ; then
-		if [[ ${#args[@]} -ne 1 ]] ; then
-			ewarn "You have to specify at least one programmer, and if you specify"
-			ewarn "more than one programmer, you have to enable either dummy or"
-			ewarn "internal as well.  'dummy' will be the default now."
-			args+=( CONFIG_DUMMY=yes )
-		fi
-	fi
-
-	tc-export AR CC PKG_CONFIG RANLIB
-	# PREFIX, INCLUDEDIR and LIBDIR are injected into the libflashrom pkgconfig
-	# file, which is why we pass them here even though src_install() puts all
-	# files in correct locations without employing make.
-	# VERSION too goes into the pkgconfig file, and we override the upstream
-	# value to get rid of the prefix 'v'.
-	emake \
-		INCLUDEDIR="include" \
-		LIBDIR="$(get_libdir)" \
-		PREFIX="${EPREFIX}/usr" \
-		VERSION="${PV}" \
-		WARNERROR=no "${args[@]}" \
-		all libflashrom.a
-}
-
-src_install() {
-	dosbin flashrom
-	doman flashrom.8
-	dodoc README Documentation/*.txt
-	dolib.a libflashrom.a
-	doheader libflashrom.h
-
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins ${PN}.pc
-
-	if use tools; then
-		dosbin util/ich_descriptors_tool/ich_descriptors_tool
-	fi
-}
diff --git a/sys-apps/flashrom/flashrom-1.2-r3.ebuild b/sys-apps/flashrom/flashrom-1.2-r3.ebuild
index ba78c0a5a373..773755292456 100644
--- a/sys-apps/flashrom/flashrom-1.2-r3.ebuild
+++ b/sys-apps/flashrom/flashrom-1.2-r3.ebuild
@@ -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
 
@@ -68,7 +68,7 @@ LIB_DEPEND="
 	developerbox-spi? ( virtual/libusb:1[static-libs(+)] )
 	digilent-spi? ( virtual/libusb:1[static-libs(+)] )
 	drkaiser? ( sys-apps/pciutils[static-libs(+)] )
-	ft2232-spi? ( dev-embedded/libftdi:=[static-libs(+)] )
+	ft2232-spi? ( dev-embedded/libftdi:1=[static-libs(+)] )
 	gfxnvidia? ( sys-apps/pciutils[static-libs(+)] )
 	internal? ( sys-apps/pciutils[static-libs(+)] )
 	it8212? ( sys-apps/pciutils[static-libs(+)] )
@@ -85,7 +85,7 @@ LIB_DEPEND="
 	satamv? ( sys-apps/pciutils[static-libs(+)] )
 	satasii? ( sys-apps/pciutils[static-libs(+)] )
 	stlinkv3-spi? ( virtual/libusb:1[static-libs(+)] )
-	usbblaster-spi? ( dev-embedded/libftdi:=[static-libs(+)] )
+	usbblaster-spi? ( dev-embedded/libftdi:1=[static-libs(+)] )
 "
 RDEPEND="${LIB_DEPEND//\[static-libs(+)]}"
 DEPEND="${RDEPEND}
diff --git a/sys-apps/flashrom/flashrom-9999.ebuild b/sys-apps/flashrom/flashrom-9999.ebuild
index 0a8400359fa9..a307041b2749 100644
--- a/sys-apps/flashrom/flashrom-9999.ebuild
+++ b/sys-apps/flashrom/flashrom-9999.ebuild
@@ -74,7 +74,7 @@ LIB_DEPEND="
 	developerbox-spi? ( virtual/libusb:1[static-libs(+)] )
 	digilent-spi? ( virtual/libusb:1[static-libs(+)] )
 	drkaiser? ( sys-apps/pciutils[static-libs(+)] )
-	ft2232-spi? ( dev-embedded/libftdi:=[static-libs(+)] )
+	ft2232-spi? ( dev-embedded/libftdi:1=[static-libs(+)] )
 	gfxnvidia? ( sys-apps/pciutils[static-libs(+)] )
 	internal? ( sys-apps/pciutils[static-libs(+)] )
 	it8212? ( sys-apps/pciutils[static-libs(+)] )
@@ -91,7 +91,7 @@ LIB_DEPEND="
 	satamv? ( sys-apps/pciutils[static-libs(+)] )
 	satasii? ( sys-apps/pciutils[static-libs(+)] )
 	stlinkv3-spi? ( virtual/libusb:1[static-libs(+)] )
-	usbblaster-spi? ( dev-embedded/libftdi:=[static-libs(+)] )
+	usbblaster-spi? ( dev-embedded/libftdi:1=[static-libs(+)] )
 "
 RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
 DEPEND="${RDEPEND}
diff --git a/sys-apps/init-system-helpers/Manifest b/sys-apps/init-system-helpers/Manifest
index 3d7e47b72c94..41f875c931a7 100644
--- a/sys-apps/init-system-helpers/Manifest
+++ b/sys-apps/init-system-helpers/Manifest
@@ -1,4 +1,6 @@
-AUX revert-openrc-management.patch 798 BLAKE2B 1e04e2f9c361eb0c125e5b23d0b18c58198ad968fec5965f43e6a5e8b8201d29c7ad2c05431d7107d99acc75ab397cfd90121f7f0618f9bb440a8d6687039c20 SHA512 8d8cc8886b5d731b7538425e6be10b4fa8d0c8b8eb946a64e885a0f9dc19c02d596a803716a8a6d681fb9e408650993b9c81ef23d2d0ab53485d65b15863ace7
+AUX revert-openrc-management.patch 929 BLAKE2B 58d0fa10956bf930c176a84573a5b780fa4bcb87f6df180a179f0cbac93ede8f2147fe620007f68e563ec4a3e86228efacc2ca33dce135c5d1fa1d639cd7fc82 SHA512 ba046ae948f93d0d861fd70637c2b1acaa37ba3ef225453162eb19ae854504f518a1024c484118b86bde3f57099bb7a44d46e3765bca4b1766bf2565c990f356
 DIST init-system-helpers_1.49.tar.xz 42660 BLAKE2B 548711283b04e3df13e9287154e2648b99ac80c2cdc71a428b4496220cd7c319f8f7afccb1e611c07b9d801837ef8799a3295a0490aa62812d47b728ba5ddba9 SHA512 bd612207e51e18a44f9c90e1e5b069ab39e06c776b8a0d6c9ecb367890d4a44ff02b3028418ac10a688782745331f39bb9299ba836f333b712e6fdd7ddc8da16
+DIST init-system-helpers_1.60.tar.xz 40584 BLAKE2B ad21a65ef3c4bcec16b14fc4db890fb7f83df625d1038fe217c20e9391404914df189ae31506b9bbef0442cdd333f46bd9c4d9009b7d671d9ae2deb6b05eee8e SHA512 3739613fa8afa1fa6032f47f8cec67c526171987a7d1eae31d479db9cc1e49ae3cd397a858130c17680d62becb9c6499bd1da1268e9ed25b044337ab69f0dd88
 EBUILD init-system-helpers-1.49-r1.ebuild 880 BLAKE2B c09d877d803227f4fad496a7792f572815d4e1672db33039eccdc4035c3bbc27ce793cf38b2e7f9cc5e70680842bbc55d6a7afaf714400389106eccae146f1ee SHA512 d55404655ef89bc03a2fb2a10467cbe529287969ac9ff530a563899f660fdd18c18b6eb0caaff1a529d2a003212e519be5959062567a61cabb2981b5ad56e293
-MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
+EBUILD init-system-helpers-1.60.ebuild 982 BLAKE2B f6359e737f907df2ced6fb068710c6549212d1d027d36583bae1bdf73a34ff361692a7240a291374017eebf07992b70e1dfec04cdeec08efbd17c372f02d90f0 SHA512 4ea35046b48276d18f4be2582ee71af622d4fefa2d82664fb8d4c1f70f24265b30a96ca85073770e9ffcc24f335e643f060727bf5d99a274aed993b016f2abc0
+MISC metadata.xml 191 BLAKE2B 8bff04ca02f4930d6f77dd32df009c145cacaad2d1cf271d91ae928f85acdccb0d73b0202a41aa3e60470ba6c7853e41ef76587601b2163f9ec249b7fa1c5274 SHA512 da06af54ba93db06f717082e3f09bbca9e17adad4b070a28131f2ffec15d0dfc82c79a3b2fb045fa33d6756c6df85254733622b0b7b1952b33d5590a71865c62
diff --git a/sys-apps/init-system-helpers/files/revert-openrc-management.patch b/sys-apps/init-system-helpers/files/revert-openrc-management.patch
index 49b4916fab31..582b71d9b1c4 100644
--- a/sys-apps/init-system-helpers/files/revert-openrc-management.patch
+++ b/sys-apps/init-system-helpers/files/revert-openrc-management.patch
@@ -1,3 +1,6 @@
+Tries to manage started service instead of allowing OpenRC to do it.
+https://bugs.gentoo.org/641836
+https://bugs.gentoo.org/649014
 --- a/script/service
 +++ b/script/service
 @@ -159,23 +160,6 @@ run_via_sysvinit() {
diff --git a/sys-apps/init-system-helpers/init-system-helpers-1.60.ebuild b/sys-apps/init-system-helpers/init-system-helpers-1.60.ebuild
new file mode 100644
index 000000000000..f42c39be7445
--- /dev/null
+++ b/sys-apps/init-system-helpers/init-system-helpers-1.60.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Helper scripts useful for both OpenRC and systemd"
+HOMEPAGE="https://packages.debian.org/sid/init-system-helpers"
+# git repo: https://anonscm.debian.org/git/collab-maint/init-system-helpers.git
+SRC_URI="http://http.debian.net/debian/pool/main/i/${PN}/${PN}_${PV}.tar.xz"
+
+LICENSE="BSD GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+BDEPEND="dev-python/docutils"
+RDEPEND="!<sys-apps/openrc-0.33"
+
+PATCHES=(
+	"${FILESDIR}/revert-openrc-management.patch"
+)
+
+src_install() {
+	# We only care about 'service' script/manpage:
+	exeinto /sbin/
+	doexe script/service
+
+	rst2man.py man8/service.rst > man8/service.8 || die "Failed to generate man page"
+
+	# FIXME: need to patch to remove *rc.d references, which we don't ship
+	# And should probably add a list of supported options (e.g., start/stop/etc.)
+	doman man8/service.8
+}
diff --git a/sys-apps/init-system-helpers/metadata.xml b/sys-apps/init-system-helpers/metadata.xml
index 7a38bb900964..3c58a0219fbe 100644
--- a/sys-apps/init-system-helpers/metadata.xml
+++ b/sys-apps/init-system-helpers/metadata.xml
@@ -2,4 +2,5 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/sys-apps/man-db/Manifest b/sys-apps/man-db/Manifest
index f0e1d2b33260..b4742bb8428d 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 4130 BLAKE2B 0f7ca98bcbb087890f4029ae0929ff14b0675b84aba757b0bf657a0f5236ca3c10f94132a4c0b8372ff27653e662335c595972a2a7e8eaf7628fa1fa59b7b721 SHA512 008759545c7694a19adc37a7330bdacc37048be62dddf6b208ae411a658594f9185afe104138a6cce55d05cf2ce7ed7e7de7c219a293246c14e39f8a31b5286d
+EBUILD man-db-2.9.3-r1.ebuild 4129 BLAKE2B 92a05bea3a84a6dfd3945d8aa8c5a9136c8e92a35aff356046de6e2af0ea8de784fd9112595e8a42046fe6eec8f82cf6af87db6231d8476344c73623430efb44 SHA512 4e273cb69e23f49054eb9133f7ddee58837b6cccfd6d08cc8fc70a71d6f74fe3e08d5a2aeb00792df201eef803eeb1f8125b33f50c392a64ddfdc145f7239a09
 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 c3ae301e8134..2dc1438844d8 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
@@ -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/man-pages-posix/Manifest b/sys-apps/man-pages-posix/Manifest
index 60190e7234fd..fca069121623 100644
--- a/sys-apps/man-pages-posix/Manifest
+++ b/sys-apps/man-pages-posix/Manifest
@@ -1,5 +1,5 @@
 DIST man-pages-posix-2013-a.tar.xz 930736 BLAKE2B 4d496a4ea7bcf9f101a9b5c31eaa437317e872d9d266c202a1fcfd16d9b2fa71f968c3653bc9789ba18916a93802736e795c43bb3f87324397f49aed0f6d1556 SHA512 e6ec8eb57269fadf368aeaac31b5a98b9c71723d4d5cc189f9c4642d6e865c88e44f77481dccbdb72e31526488eb531f624d455016361687a834ccfcac19fa14
 DIST man-pages-posix-2017-a.tar.xz 935196 BLAKE2B 45d732c712f8d6b18f151c7383130a367d5774ec9d814cf9e61accb01e9d91ad3e9b49bc4f1b993f28688e9c39cf1fbea91b86b00c05968b0bc0a5665211defb SHA512 dac6bd5bb3e1d5f8918bad3eb15e08eeb3e06ae160c04ccd5619bfb0c536139ac06faa62b6856656a1bb9a7496f3148e52a5227b83e4099be6e6b93230de211d
 EBUILD man-pages-posix-2013a.ebuild 759 BLAKE2B e391bd771a0a017e3836bab1dbab874846a37e3e062dded952398f63e09847e0d9a0bdadfdfa30b65e71c1dfd482186d9c34722b32d4ab5f22be8355b191409e SHA512 59f50c9a6d476fde645a697eab073515ea5d19c8e082e28defc339e45a869d35d7c10fd446f98fe0021b755b406ce827e4fcbd45e0d0318f1267031df68fbb56
-EBUILD man-pages-posix-2017a.ebuild 740 BLAKE2B 1de9bdd73fb3f4a7ad68c95410f11898bc3bce82f722a2513ded670f168985c3d37c1cd10cf2badc69de621f13cbda5f6f4ca42ee7d70d9fb799f5f85a697865 SHA512 59d58c35ceef05fde0b4b8f6dc955e9755d5ec89bcbe8488bd3dffa9e05642a05a2d9ab4331082831f0b2ed5063f13019cd0cc445be22100383b1e596c8673a7
-MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
+EBUILD man-pages-posix-2017a.ebuild 731 BLAKE2B fe1526eff6ce8dabc613133c6f32207adabbbcca828d821d5efe2b08deffca27306c7a073321fbd62b187f0835744e996f013cfb97d8fd71baf0924c360614a2 SHA512 59a1eda1c3ce2fb15ef1341d49e3445550d477e17b41940b62c3b60c3a67b4ad35db5a196efff15ce53eb1d44748e320037bfa578ef94e82e546ba13ed0d4344
+MISC metadata.xml 276 BLAKE2B db75e173038497d8042224c9688330289e32f45997677daba5a31b4bbc3b3107f952801840a593cee563aa9bfe69c106aa9ac02bb0a1a724852da00aa26b0033 SHA512 c21ecc4f65303ae346b382f4158fc932401e49297d2dd9c55047ffe7e74283783e21a7b58de649bd97bb77cf920306734daf0ff70ed313505c999efa566fe574
diff --git a/sys-apps/man-pages-posix/man-pages-posix-2017a.ebuild b/sys-apps/man-pages-posix/man-pages-posix-2017a.ebuild
index 5dbafbb699f0..10385ec76269 100644
--- a/sys-apps/man-pages-posix/man-pages-posix-2017a.ebuild
+++ b/sys-apps/man-pages-posix/man-pages-posix-2017a.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.kernel.org/pub/linux/docs/man-pages/${PN}/${MY_P}.tar.xz"
 
 LICENSE="man-pages-posix-2013"
 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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE=""
 RESTRICT="binchecks"
 
diff --git a/sys-apps/man-pages-posix/metadata.xml b/sys-apps/man-pages-posix/metadata.xml
index 56c124413057..e51634279815 100644
--- a/sys-apps/man-pages-posix/metadata.xml
+++ b/sys-apps/man-pages-posix/metadata.xml
@@ -5,4 +5,5 @@
 	<email>base-system@gentoo.org</email>
 	<name>Gentoo Base System</name>
 </maintainer>
+<stabilize-allarches/>
 </pkgmetadata>
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index f71b4761ecb8..408f09a9407f 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -2,6 +2,6 @@ AUX openrc-0.42.1-gcc-10.patch 1679 BLAKE2B 464fa390a6626538dad9d68d9e1c81195ee5
 AUX openrc.logrotate 43 BLAKE2B 0587cd211767937fd6273e6b159271490443a94d80a54b5a20ef625a1959e77dbf38cd1756838337fb39a061c4ee19a39cccd2f5867fab9f04fb916a74029aaa SHA512 12bb6354e808fbf47bbab963de55ee7901738b4a912659982c57ef2777fff9a670e867fcb8ec316a76b151032c92dc89a950d7d1d835ef53f753a8f3b41d2cec
 AUX start-stop-daemon.pam 63 BLAKE2B df39a1a12fe09dbbc0746eac67035d9e6d4a63323f6c937ef3888c70787354128e415b3c1c8bccccec0c987b3e789711cd1ddaba55e9b53a7f67b332c4ca9d5b SHA512 85cf440611b8f87f51bf24bdd9fa03639a75b950f00096d81b8826c21ae85ff9784b8c56b8ddb482e70f08bce933d4561b30750346d51fb2cef3be34acc065cb
 DIST openrc-0.42.1.tar.gz 242848 BLAKE2B 381f52552c13afbbcf45456fe71078bacf9182adfd67c97394093986977f5e8262d8a3c64219501745575a5210f525afe9fccee72f7625485a9f575108baa369 SHA512 579b9bfbb151b945a364a2c12b037d2e15991820ca99a07ac18e9bdc50074e67fbf0dcf9865aa4deabe2bf82092e4623be51c9e0b4014384951e0a92ac1e7646
-EBUILD openrc-0.42.1.ebuild 5404 BLAKE2B c8e1bb298988e4249d3b3bc8143b3dc0cc08514278ca50663f2d87d1c0f4501921545413736b91978495e09f5456ccae6253780f15fdfc0398cefb0313e960b1 SHA512 6e7c07b0575c098339c71234d061d605b50cf5255407addc4c0414b8b80229b0f1ee909a3f396a32e8a6cf3070e263e9a50f2755c3fcbf35ab4926f6c37725a2
-EBUILD openrc-9999.ebuild 5025 BLAKE2B 9f19179f99c2ce4885917e4d5bffc82caa10deda853ee84160ec7617a91062fe169220b4a8e3cf51a7a5e6ba3cbb118804c36dd1ad17312e0d241ba0f2b7d386 SHA512 5517b720f81200a6d086e05a016d5192e982960980a3f2c03923a41d132ea3771de380c35f9a167bc6c4824b14847bfc21208e415c25cee41b537bb2533ab94d
+EBUILD openrc-0.42.1-r1.ebuild 5429 BLAKE2B 50181bacf4d317348ba3baafea5fd7c5068e0f6bef96b86d5dbeba17043aa3372973de74db7c3881442c8341f2a20841266429576b6fa0b5236c04750d3f1568 SHA512 13387e7f2757ca60d2da6a7b88d7dfaf4d4a421fd3828b9d5fdb077542f49856ebec3a686fcda7347e7f233a24451ce11dffa5fc0e2aad653b2fdff037ecfd42
+EBUILD openrc-9999.ebuild 5050 BLAKE2B 2cddf0e5ad3ffbdade6e3efc570f0cc52e7c582b9cd4ba54d093b169a90bfd8162ab77efa2e3b0625b673b31a20ef9bd8de5e7b7114027f98a891712161948d6 SHA512 aa000e1ff437b9c6c376c4721d89fdd852e226be601f14752e752b60cc16091585a91062e55e71d979c749674df43f6a1b6fbe0353965ca8d5ac6bf96215c6cb
 MISC metadata.xml 706 BLAKE2B 1d6a4937d577fff7db7fd64617328ca49faccaa61749adabc411a215960ee06c1af32499be697921012eee34f5c680295e46f545099f06393965a17c0d0d034d SHA512 d5d669cdcf8707689c855cab678031c6e9b1e33e4b931c7d80bbe2ad442aedabef718018466f0cb15bd8a329292a0de844935f9332611f3fb334b57d14aa39c1
diff --git a/sys-apps/openrc/openrc-0.42.1.ebuild b/sys-apps/openrc/openrc-0.42.1-r1.ebuild
index a10ce3384c69..141359685084 100644
--- a/sys-apps/openrc/openrc-0.42.1.ebuild
+++ b/sys-apps/openrc/openrc-0.42.1-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
@@ -135,9 +135,11 @@ src_install() {
 	insinto /etc/logrotate.d
 	newins "${FILESDIR}"/openrc.logrotate openrc
 
-	# install gentoo pam.d files
-	newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon
-	newpamd "${FILESDIR}"/start-stop-daemon.pam supervise-daemon
+	if use pam; then
+		# install gentoo pam.d files
+		newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon
+		newpamd "${FILESDIR}"/start-stop-daemon.pam supervise-daemon
+	fi
 
 	# install documentation
 	dodoc ChangeLog *.md
diff --git a/sys-apps/openrc/openrc-9999.ebuild b/sys-apps/openrc/openrc-9999.ebuild
index c159c6cdce2d..da6d7d50ca18 100644
--- a/sys-apps/openrc/openrc-9999.ebuild
+++ b/sys-apps/openrc/openrc-9999.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
@@ -125,9 +125,11 @@ src_install() {
 	insinto /etc/logrotate.d
 	newins "${FILESDIR}"/openrc.logrotate openrc
 
-	# install gentoo pam.d files
-	newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon
-	newpamd "${FILESDIR}"/start-stop-daemon.pam supervise-daemon
+	if use pam; then
+		# install gentoo pam.d files
+		newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon
+		newpamd "${FILESDIR}"/start-stop-daemon.pam supervise-daemon
+	fi
 
 	# install documentation
 	dodoc ChangeLog *.md
diff --git a/sys-apps/pcsc-lite/Manifest b/sys-apps/pcsc-lite/Manifest
index 272f03885ebc..da1d16542765 100644
--- a/sys-apps/pcsc-lite/Manifest
+++ b/sys-apps/pcsc-lite/Manifest
@@ -8,5 +8,5 @@ DIST pcsc-lite-1.8.26.tar.bz2 754838 BLAKE2B 98bc1abdd66a08dde479821f8b1ef489980
 DIST pcsc-lite-1.9.0.tar.bz2 755963 BLAKE2B 30d027ac61aba1f57224c88ffc4ec8568dcc2747f3f7e24be07e7ce52bd23ad7a71b6a2f78d912f827a4c02a22c13ff16bc1450c02bafd92bc87ac0e34a2bbcb SHA512 35c85b15ab54c14403a080d6671b3d986910372651d46a5477111172d42c6d2cf58f4a3ce95427e7a84f6b4d3bee30ea57bf69b855f753160a3c6e72f93e34f3
 EBUILD pcsc-lite-1.8.25-r1.ebuild 3069 BLAKE2B 38f39ac010742a7fc8a26956b706003420ea93da7c1fd5e90e54c941bfcc130c6fce0dcbb5f2aedb15e2966ec7596323bbba53f0a4dfd0ff11b604dc7136cbe2 SHA512 9612f648bf51132f0e389f07d9c0c5513cc33e785d72d8de88b49ed706374f1ed6edf752f70777fe638606d0bec7511ff8b4cfb89d3872831d3e88b460f22939
 EBUILD pcsc-lite-1.8.26.ebuild 3169 BLAKE2B 015dd457d5c3a754022cf7d2d7b5958d54b11256112449f68146c4c5cd8190d414c29d8ff1d6ec462c2a73a9aa43bcb111680f94b50f186425815ac1fd7465f3 SHA512 c222971da9110c11af0ea4da6becdd58564cd02a648bc17dc1d6384a13f6ef224a115d3c4eee8ef01d3f9c9c6079704a66836a78f54542784dc2d2ebb441ca65
-EBUILD pcsc-lite-1.9.0.ebuild 3165 BLAKE2B f0ea2112dad7e9f1541484663f44e805c4a61b03b3030df9fa661b92445b5de4785a591d0ba980a359483cfba3f253146793e76de842e822e2efeaa6951b3fc5 SHA512 547d29a953857ff692b8de2a5e9211daebe222d3ac7e9b842340c5d244e28333c70a5d00533450f898240425ae83c929660c559e70d3f6a248de286297b50e56
+EBUILD pcsc-lite-1.9.0.ebuild 3169 BLAKE2B de0557416a662d85815cb365126fcdcd29c412a8366e62e31dd592a44b885284d453579c75b859dd2139071684104e629cfddfb44b9e3f6c9ed42ea9e6df245d SHA512 7033616187d1d2df2c4caaf267d0fa19098ba14c5ccca965403db91cca8e09e6e2b50e4bdf3d3dad06c92ff0f9f2f6067bcf292c9963b75dc709cf4e5858436f
 MISC metadata.xml 1078 BLAKE2B b47112f9457ca29308517a6cbac1502a83bb8c3ac19f95db1788d0695808c07e3cd1955cbe0ea2f861e6cd9a78cab793f9fbeb699ffb0952d1fa4c3372b8ead9 SHA512 b1804b8e9ec6044221e4158a0127e1dfeb2381d264383f3ba4faa69d6a6ac8a1bd0fcf7681dec92ef7105c05463191bb6e890962bbf419f839d47d51f1d8f7d2
diff --git a/sys-apps/pcsc-lite/pcsc-lite-1.9.0.ebuild b/sys-apps/pcsc-lite/pcsc-lite-1.9.0.ebuild
index ec7386ccf059..268a60b0bc60 100644
--- a/sys-apps/pcsc-lite/pcsc-lite-1.9.0.ebuild
+++ b/sys-apps/pcsc-lite/pcsc-lite-1.9.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_7,3_8} )
+PYTHON_COMPAT=( python{3_7,3_8,3_9} )
 
 inherit python-single-r1 systemd udev multilib-minimal
 
diff --git a/sys-apps/pkgcore/Manifest b/sys-apps/pkgcore/Manifest
index 2a810b575cb8..5d3658bef69a 100644
--- a/sys-apps/pkgcore/Manifest
+++ b/sys-apps/pkgcore/Manifest
@@ -1,7 +1,10 @@
 AUX pkgcore-0.10.13-metadata-xsd.patch 750 BLAKE2B 93a75ca69597422da66b42aed94e0ad67b1b80802103b90b4306c8967ea5d1723860b9851085186e078c50e3c222cbe8a78bc0fa071ed7c0cf85b4218920f4dc SHA512 d2f2f16167b9d2c32b80783b4d21d04e47328209b3ccff24c057044286ae8896fb3205ec103edbe1f6fd5e20c4ed7871bf3c27b1fc134e8299c76b7ff86ba33b
 DIST pkgcore-0.10.13.tar.gz 647320 BLAKE2B ef80320a0a8d35ed68b1d77d52a3cfb2ffbadae2fe9f11efe3f42c68f55388074b5c4b2857f265f1add4cfe479cba9716d45afaf141d113b0874d409955269c7 SHA512 acc5ee2cc6fd0f897129f311e0484e28a1c8f374c5a2e56a29d228fee74b7be0cb6059171b743e0db35544b5b5779d35efcda21e46e65285653ba4155205281f
 DIST pkgcore-0.10.14.tar.gz 627149 BLAKE2B 05012f21998ae97212364f63ca6d423806e20d0f2fd5785b9a52ec3c535c12675cd2a8f300ed1b3fbfe627d33ab9b138bf28a3a2792c405dbe068045d73243af SHA512 f4e4959d55d412b81306a4e7205163814b95b2f454dd7bb233c9a16d5a5975c0d2e20882e73859266ebf1bd6233e4d88e97291632b2f6cf2c2ae58cb5a680a3b
+DIST pkgcore-0.11.0.tar.gz 641831 BLAKE2B 93b2d680b0daa6611ee4fe3782e90736950859135b1e22d05068abdcb64d3a94bcbd564af4940d8944cf8d49f867404f61697ba7b1d1b45d0ba31c93232bdd44 SHA512 d9a1f3cecd0a84b353a2515e6053d300aba0257b7034d852e469177f04e05f79c95cd9bd1278afcedd321b825f5f46241d2098317e1bc29bb77efef9f641ccef
 EBUILD pkgcore-0.10.13-r1.ebuild 1146 BLAKE2B 1b94b7836087ace2e4b5a3b366a97fc42bfda6de298d8db11a54c6b495c4c9f22b41d56e1c8d15a51cb3dca0fba0428ae23f93c3248b624f371e7c1d90fac034 SHA512 b9347581bf17afbaa09a57cea1a9a161d837fe64d430754d3579c6ec1844e5cda273253f52feca4a80e3fb5607e91c8d01b2646a3ec3903811bbd47d8f3520ea
-EBUILD pkgcore-0.10.14.ebuild 1092 BLAKE2B 17275b35c805e84b4ece1da35bfc6dba4fbff5a84fb199395883e41039ec52399164235f811d6aab0a0ddef4e9aaed3fa633ebfdfedbcdef71d69e0121421bc5 SHA512 c41c2f332a98f77bb577ef8dc999753bf00037cdd449416383899148949a544c0e88e7fb9b8d0c38a576c2a0feaf13ff80c5e7de02d43dd99ddeb1aeddce62c9
-EBUILD pkgcore-9999.ebuild 1094 BLAKE2B a69c2f28b93b31865fe4cccecbd38c37fb500c0b75f4f864cd5da5e7ea6daddc334c98b336694339b5001484c0eeb1cf2c403cd73a37eafa63eae7b5a3f1535b SHA512 74bb7df8582464aab7c6f71a9731ec5b3dddcfe3359c629e4b409439e7204c338fc3895065e52cf8add22e5965c655a18e14675e26f8ec44eed4d306ef4b74bb
+EBUILD pkgcore-0.10.14-r1.ebuild 1094 BLAKE2B 4f34fa4e80c1bb45f6a65e4cc49710ee286d5689df1dd1620d5db6ec70cde9afee34624d92ced2c1c1f1ea141fa86f4f138f43bc713ba8a4e00a1d87dcc7ee0e SHA512 028b1458b694f4808cbcac91db41a29613c7bbfea235f67e388b9a4e4c86f982e9c65d2d09107e99e9e2c2ada4b1c120dc5aeacb6032e8898ab69e0cfc4f0838
+EBUILD pkgcore-0.10.14.ebuild 1091 BLAKE2B d0fbdeb0cc80c9ced6405e84cab56cc09f0145c6c8c572edfc954692d16e24e83d52c325fe36d78fd8297c40a43ae702466881d325d7d384e58b45119c5dc2bf SHA512 149b1c7c17c4f0a342f15f50214e90a2e2e9f12199b80f399026a51bf3818e252c8a7583c6ae464253b6a09962e14980e5c6c5cdb70de735a87e0e96c5989f70
+EBUILD pkgcore-0.11.0.ebuild 1003 BLAKE2B 6ef0f5b2ab8a77e1d8f44ce07bf4a2105a1643d121032b56d00161a80eaeef580fe24dcb71ec2f9fd757f2adb365f370a116f5684ea8200a5727f8efa20689f5 SHA512 d20617349e2095443b0d749f3c67d9c5db88a43ef47cb4d6ad7bc28f19a96fb5758a47cc21ba00eb6f4474b27bb579618a1b4cbd7d2febe9c8590a51a9fe9af3
+EBUILD pkgcore-9999.ebuild 1003 BLAKE2B 6ef0f5b2ab8a77e1d8f44ce07bf4a2105a1643d121032b56d00161a80eaeef580fe24dcb71ec2f9fd757f2adb365f370a116f5684ea8200a5727f8efa20689f5 SHA512 d20617349e2095443b0d749f3c67d9c5db88a43ef47cb4d6ad7bc28f19a96fb5758a47cc21ba00eb6f4474b27bb579618a1b4cbd7d2febe9c8590a51a9fe9af3
 MISC metadata.xml 337 BLAKE2B 8980bf734cb1f95d4089aed57ac9ac0538b12aff969f37fe298581b5af005a805027962c343fcd88f7b828fc4e837f9bd47478fad7fb9bfd7a8e3bc3bc7a432c SHA512 1c1e68deab3ccdb8a2c80d0d13a9c3ed481f84bcaeae4a9e593c9f0080e9ed0762051d195ea9206ddeca4e60687a39210483aba3f51004031afd1b6bd2e7e5b5
diff --git a/sys-apps/pkgcore/pkgcore-0.10.14-r1.ebuild b/sys-apps/pkgcore/pkgcore-0.10.14-r1.ebuild
new file mode 100644
index 000000000000..259e6675cd17
--- /dev/null
+++ b/sys-apps/pkgcore/pkgcore-0.10.14-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{8..9} )
+DISTUTILS_IN_SOURCE_BUILD=1
+inherit distutils-r1
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/pkgcore/pkgcore.git"
+	inherit git-r3
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+fi
+
+DESCRIPTION="a framework for package management"
+HOMEPAGE="https://github.com/pkgcore/pkgcore"
+
+LICENSE="BSD MIT"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]"
+if [[ ${PV} == *9999 ]]; then
+	RDEPEND+=" ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
+else
+	RDEPEND+=" >=dev-python/snakeoil-0.8.9[${PYTHON_USEDEP}]"
+fi
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)
+"
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	local DOCS=( NEWS.rst )
+	[[ ${PV} == *9999 ]] || doman man/*
+	distutils-r1_python_install_all
+}
diff --git a/sys-apps/pkgcore/pkgcore-0.10.14.ebuild b/sys-apps/pkgcore/pkgcore-0.10.14.ebuild
index 2d52d107eb91..2a12a6c0e41f 100644
--- a/sys-apps/pkgcore/pkgcore-0.10.14.ebuild
+++ b/sys-apps/pkgcore/pkgcore-0.10.14.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/pkgcore/pkgcore.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~ppc ~ppc64 ~s390 sparc ~x86 ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm arm64 hppa ~ia64 ~ppc ~ppc64 ~s390 sparc ~x86 ~x64-macos"
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 fi
 
diff --git a/sys-apps/pkgcore/pkgcore-0.11.0.ebuild b/sys-apps/pkgcore/pkgcore-0.11.0.ebuild
new file mode 100644
index 000000000000..2998f6377a3f
--- /dev/null
+++ b/sys-apps/pkgcore/pkgcore-0.11.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..9} )
+DISTUTILS_IN_SOURCE_BUILD=1
+inherit distutils-r1
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/pkgcore/pkgcore.git"
+	inherit git-r3
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+fi
+
+DESCRIPTION="a framework for package management"
+HOMEPAGE="https://github.com/pkgcore/pkgcore"
+
+LICENSE="BSD MIT"
+SLOT="0"
+
+RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]"
+if [[ ${PV} == *9999 ]]; then
+	RDEPEND+=" ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
+else
+	RDEPEND+=" >=dev-python/snakeoil-0.9.0[${PYTHON_USEDEP}]"
+fi
+BDEPEND="
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)
+"
+
+distutils_enable_tests setup.py
+
+python_install_all() {
+	local DOCS=( NEWS.rst )
+	[[ ${PV} == *9999 ]] || doman man/*
+	distutils-r1_python_install_all
+}
diff --git a/sys-apps/pkgcore/pkgcore-9999.ebuild b/sys-apps/pkgcore/pkgcore-9999.ebuild
index 9ade7b1bcd9e..2998f6377a3f 100644
--- a/sys-apps/pkgcore/pkgcore-9999.ebuild
+++ b/sys-apps/pkgcore/pkgcore-9999.ebuild
@@ -1,7 +1,7 @@
-# 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_{8..9} )
 DISTUTILS_IN_SOURCE_BUILD=1
 inherit distutils-r1
@@ -19,26 +19,21 @@ HOMEPAGE="https://github.com/pkgcore/pkgcore"
 
 LICENSE="BSD MIT"
 SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]"
 if [[ ${PV} == *9999 ]]; then
 	RDEPEND+=" ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
 else
-	RDEPEND+=" >=dev-python/snakeoil-0.8.9[${PYTHON_USEDEP}]"
+	RDEPEND+=" >=dev-python/snakeoil-0.9.0[${PYTHON_USEDEP}]"
 fi
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
+BDEPEND="
 	test? (
 		dev-python/pytest[${PYTHON_USEDEP}]
 		dev-vcs/git
 	)
 "
 
-python_test() {
-	esetup.py test
-}
+distutils_enable_tests setup.py
 
 python_install_all() {
 	local DOCS=( NEWS.rst )
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 50dad17137e0..ed98d39d3ef1 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -8,7 +8,7 @@ DIST portage-3.0.14.tar.bz2 1049983 BLAKE2B 174fe1f14bf1cabbe044724bab5eeada6e4d
 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.12.ebuild 8396 BLAKE2B fb901d6ea7947920456a76d8185b70f4a83db2ea0a607b15c06e4553100065f01c8ec0cd3327c68ea6c5d47a5529c27f2e25e96b88760a76515c3c3cd81ee492 SHA512 fbdddbfc8663294880a9e15048547b1df10371e5646807f2b7ede67c63021b1463b845f1115f3aa5ca419980d64868c92a04da5865f8846bfcd29b0c9bff9416
-EBUILD portage-3.0.13.ebuild 8397 BLAKE2B 49e8ae6b8d1defd42926d2ce124e96829cd414a21279f927491588b9d10b9d7e051bb9e3a04dd4abdb11b07028718252e5b0fc06831fe9eb384aef722c95a8ee SHA512 c6a25ea1ea16de2f2a94407e1ba357283cf3b2b525c38f7fa11f45c3159d23b7c41d6de43071816f81704f2f794a1675f69a35ec417eb9986f6247788eb18549
+EBUILD portage-3.0.13.ebuild 8396 BLAKE2B fb901d6ea7947920456a76d8185b70f4a83db2ea0a607b15c06e4553100065f01c8ec0cd3327c68ea6c5d47a5529c27f2e25e96b88760a76515c3c3cd81ee492 SHA512 fbdddbfc8663294880a9e15048547b1df10371e5646807f2b7ede67c63021b1463b845f1115f3aa5ca419980d64868c92a04da5865f8846bfcd29b0c9bff9416
 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
diff --git a/sys-apps/portage/portage-3.0.13.ebuild b/sys-apps/portage/portage-3.0.13.ebuild
index 9fe6d014b0bf..3048a7d74ceb 100644
--- a/sys-apps/portage/portage-3.0.13.ebuild
+++ b/sys-apps/portage/portage-3.0.13.ebuild
@@ -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 )"
diff --git a/sys-apps/qcontrol/Manifest b/sys-apps/qcontrol/Manifest
index 4e920640db21..bbcd67e976f8 100644
--- a/sys-apps/qcontrol/Manifest
+++ b/sys-apps/qcontrol/Manifest
@@ -4,5 +4,5 @@ AUX init.d 2211 BLAKE2B 5656083b4689db24bfa77b07704316123a4690e8160d355b42d6bdc3
 DIST qcontrol_0.4.2-6.diff.gz 11426 BLAKE2B 5f4374d2a6a2f79ca357827437d7ec42c6122b8f3ba008bb8c39adaf80a2edff24ed4f0abb29780ad70cac09eb1d39124d3d9762d603c896c8857ad7b8e7910e SHA512 ce450d04c72052c8e7ce0bf26d21d9942d3ea02b958b510efdf26d368ee69778eaf61bec2084c4d21cc1a5d281d1331e40b7bcaf388b4b59174a37ed037dd984
 DIST qcontrol_0.4.2.orig.tar.gz 18344 BLAKE2B c90d3d31ffd624bad11e70a2c700e0e058c9fa6cc2cfa6bb803471df67d07d03a88ae134d5543dbbefe30b5870089a29151614a545dc171de5eb4732d6592461 SHA512 f132faff54833f11ae79622dc8e33b4e0f2516f7377633ff47a4ebe71335503c5e4892723c049b00888622ce059026cd97c6856b425b94163ec09887bd21e81e
 EBUILD qcontrol-0.4.2-r1.ebuild 1464 BLAKE2B dd6758a5e88a759187f99cb790c2cff2db024fe9b61e9cc920080b3030397e056d61a4469e5029d03fc4b4995bea75952853cfbf7672fddff8e1490a790bb864 SHA512 fa18cf1eb376a5362b0bb75f15b8c56cbc445f8a37e15a7ebefd11967e37a12573a7bf859e03c723469c169207d432b13512f0e0279f69710cb7ff26c22843f1
-EBUILD qcontrol-0.4.2-r100.ebuild 1595 BLAKE2B 6f4fe53462724852c82b20dfb543fccbac1eed102a00081862717d490ba6d3065ca824106fbb2946379f26a41f47e258170ee14500f170054d83ce3ea7f8bc0e SHA512 392ea7d3efa598245b2358da81e48ff83a373af6a1f3f3518b7018be563ac7d562dc8328c86ec6784cd16402c478420c5168dd09b790d6d4bcb5e5c7280813f1
+EBUILD qcontrol-0.4.2-r100.ebuild 1594 BLAKE2B bcdf7251d73111c61df1dbf1804fd4574042636756d9841db881e982f8c730f1673fa274dd42585bf48d1b33a6fef27de513e43ed605e8c8c3d58852387bff42 SHA512 42ffbf7e529c0fa5c67f79343849bd8e2d18e9668a9c85bb04f9ebade4c5f312fd7e9d09a69c5b50f3d5465b0d6e711965804ecc18c492b7267ef4132716619a
 MISC metadata.xml 367 BLAKE2B 8a20a869201a1a69097488f15283baa6eaff5e80667974605e34470d0fbeef210efce302a5feb1b30075273c468b96cf197125d7f7dcdef93faff7b35fb34664 SHA512 ee0131a33df4a79331dfe2a7485d71b05f8f386d3b6ce0b26ab76a7c9f8d9b20efb931fda54d499feb9dd6c3feba34299cf8943fbac2ffea2076e634d49087de
diff --git a/sys-apps/qcontrol/qcontrol-0.4.2-r100.ebuild b/sys-apps/qcontrol/qcontrol-0.4.2-r100.ebuild
index 13c3d4b5faa3..c61448f88447 100644
--- a/sys-apps/qcontrol/qcontrol-0.4.2-r100.ebuild
+++ b/sys-apps/qcontrol/qcontrol-0.4.2-r100.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,7 @@ SRC_URI="mirror://debian/pool/main/q/qcontrol/${P/-/_}.orig.tar.gz
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~arm"
+KEYWORDS="arm"
 IUSE=""
 
 REQUIRED_USE="${LUA_REQUIRED_USE}"
diff --git a/sys-apps/smartmontools/Manifest b/sys-apps/smartmontools/Manifest
index 93c51edacdbc..885a99d719fc 100644
--- a/sys-apps/smartmontools/Manifest
+++ b/sys-apps/smartmontools/Manifest
@@ -3,7 +3,7 @@ AUX smartd.confd 107 BLAKE2B fe687733a13f7a9c32aee16a759feef798fe7db158783497c6c
 AUX smartmontools-update-drivedb 42 BLAKE2B d3a501dc6a3855bd665a16ce0f105269754a29450201f312369acdbf429c8e0c7c4162de8854ca945b2082cb734dbbbb1326df39e4fb1adf271f215329bd2105 SHA512 8ad70fc85ab67b7c32eda95dd37517382c2447862df08b810a54dcdedb1eb8148f3a0e29f402a54adff31d1e88d80d09a258ed9e1e13b597ab2a358ebeda0ce8
 DIST smartmontools-7.1.tar.gz 971468 BLAKE2B de3e1b10997903cb9bf6107f1bd1be9587b66af08a94e368dc9ed3aa6d69ba93d6b41d1ba60076275603702d9d0b47b26e376d3c9f020eb18fde5af4b686485b SHA512 440b2a957da10d240a8ef0008bd3358b83adb9eaca0f8d3e049b25d56a139c61dcd0bb4b27898faef6f189a27e159bdca3331e52e445c0eebf35e5d930f9e295
 DIST smartmontools-7.2.tar.gz 992256 BLAKE2B 9f671656e610404b0ab8b6ec51421b4046c64d16331cff821a8d9dbf34dd6c4be4fa63d3a2eaffe2aa869b09acf5f18b9c9750f76e33423710ef9166212e3a92 SHA512 d7e724295b5d53797b5e4136eea5f5cc278db81e4016ba65142438b8c68c54f85a32c582c147a1590b9bc8f74a58952bcb57b9923dd69d34582530a0985799ea
-EBUILD smartmontools-7.1-r1.ebuild 4042 BLAKE2B 46c72078bf69257c1a9658337d49bbb3da43387ca8a05679f552c3879caad128e3c63c045a524f4d93d11b51893577b118a7cf6bd59b4b93922914a297fd7a28 SHA512 223826860e45decc575cb74465f3f6a5e503749bfd430a39f938e490391ca410ce8d9f0dd894c6acf137d8dc8fffc16fcce45eb05d123cdb9b7b41c27618653f
-EBUILD smartmontools-7.2.ebuild 4115 BLAKE2B a2d0de1ebe9e37cf4d58c6dd4477ba572219eea5b48f5a524aa0eade68e03bc781feef5bd93be3a13862cc4cf41a731736008b3eb1763edcab6a11fd4ac4fdc4 SHA512 d2e932dd464c65f1b402f0d615c121b195a4da4e843b1a69c30bb042ea773f08d0179d715b389e7e6a85a59a156fba88e418f4c17770afcafcf3366796bc4233
-EBUILD smartmontools-9999.ebuild 4115 BLAKE2B a2d0de1ebe9e37cf4d58c6dd4477ba572219eea5b48f5a524aa0eade68e03bc781feef5bd93be3a13862cc4cf41a731736008b3eb1763edcab6a11fd4ac4fdc4 SHA512 d2e932dd464c65f1b402f0d615c121b195a4da4e843b1a69c30bb042ea773f08d0179d715b389e7e6a85a59a156fba88e418f4c17770afcafcf3366796bc4233
+EBUILD smartmontools-7.1-r1.ebuild 4040 BLAKE2B 7f82711dacc792547dc076b261f9ad086978f636d7c6d62878f278f3e3107a5deef93f22f5bbd66fbadc44b548fdcd6839b86194ecf23f83b2e2466fbf4fa681 SHA512 5ded0a30a32eb2643eb48bf1f8d4764c84b35cc8c397ba4386d03f6cb16590dee1410d26ba8985ec4779862539f8596262e462c969bd0632748f18261818bb37
+EBUILD smartmontools-7.2.ebuild 4113 BLAKE2B 7e01726db047e2390c037cf75cd5a44da3f8749e0e39d2d6863d75fdf8acf9c5461a0df41898476a723d6e5774221335ab65c746d2e3d843311716d7819144e8 SHA512 a803668aba5cabb2653f29093bdcedab45dec38124baef8c39c5ac355199d3bba0779e3e76d73209cdfac721810bc12b414a07086c7b0f5749088b380b805fcb
+EBUILD smartmontools-9999.ebuild 4113 BLAKE2B 7e01726db047e2390c037cf75cd5a44da3f8749e0e39d2d6863d75fdf8acf9c5461a0df41898476a723d6e5774221335ab65c746d2e3d843311716d7819144e8 SHA512 a803668aba5cabb2653f29093bdcedab45dec38124baef8c39c5ac355199d3bba0779e3e76d73209cdfac721810bc12b414a07086c7b0f5749088b380b805fcb
 MISC metadata.xml 628 BLAKE2B a619effbf00a8b83df53ae6b7e191ed97af2e996ba3f025328021b67b49a167c3eae0be016b1fe106bef263a8b29e5add385f067efaef18ea07da451ede84ebc SHA512 ae5c3076410f080d87db55935a6254768ed07faf5bafed2ed9bb9d469b263b6bd8d418a1e50d1030aa6873f0c82014887ef7f2df8e032b6487f782f72a1ea54e
diff --git a/sys-apps/smartmontools/smartmontools-7.1-r1.ebuild b/sys-apps/smartmontools/smartmontools-7.1-r1.ebuild
index 158bfd6444fc..823bf3d00684 100644
--- a/sys-apps/smartmontools/smartmontools-7.1-r1.ebuild
+++ b/sys-apps/smartmontools/smartmontools-7.1-r1.ebuild
@@ -114,8 +114,8 @@ src_install() {
 
 pkg_postinst() {
 	if use daemon || use update-drivedb; then
-		local initial_db_file="${EROOT}/usr/share/${PN}/drivedb.h"
-		local db_path="${EROOT}/var/db/${PN}"
+		local initial_db_file="${EROOT}usr/share/${PN}/drivedb.h"
+		local db_path="${EROOT}var/db/${PN}"
 
 		if [[ ! -f "${db_path}/drivedb.h" ]] ; then
 			# No initial database found
diff --git a/sys-apps/smartmontools/smartmontools-7.2.ebuild b/sys-apps/smartmontools/smartmontools-7.2.ebuild
index bcbd184c16d7..8743a731e871 100644
--- a/sys-apps/smartmontools/smartmontools-7.2.ebuild
+++ b/sys-apps/smartmontools/smartmontools-7.2.ebuild
@@ -118,8 +118,8 @@ src_install() {
 
 pkg_postinst() {
 	if use daemon || use update-drivedb; then
-		local initial_db_file="${EROOT}/usr/share/${PN}/drivedb.h"
-		local db_path="${EROOT}/var/db/${PN}"
+		local initial_db_file="${EROOT}usr/share/${PN}/drivedb.h"
+		local db_path="${EROOT}var/db/${PN}"
 
 		if [[ ! -f "${db_path}/drivedb.h" ]] ; then
 			# No initial database found
diff --git a/sys-apps/smartmontools/smartmontools-9999.ebuild b/sys-apps/smartmontools/smartmontools-9999.ebuild
index bcbd184c16d7..8743a731e871 100644
--- a/sys-apps/smartmontools/smartmontools-9999.ebuild
+++ b/sys-apps/smartmontools/smartmontools-9999.ebuild
@@ -118,8 +118,8 @@ src_install() {
 
 pkg_postinst() {
 	if use daemon || use update-drivedb; then
-		local initial_db_file="${EROOT}/usr/share/${PN}/drivedb.h"
-		local db_path="${EROOT}/var/db/${PN}"
+		local initial_db_file="${EROOT}usr/share/${PN}/drivedb.h"
+		local db_path="${EROOT}var/db/${PN}"
 
 		if [[ ! -f "${db_path}/drivedb.h" ]] ; then
 			# No initial database found
diff --git a/sys-apps/systemd-tmpfiles/Manifest b/sys-apps/systemd-tmpfiles/Manifest
index 89e71cd92348..c1522ed3b037 100644
--- a/sys-apps/systemd-tmpfiles/Manifest
+++ b/sys-apps/systemd-tmpfiles/Manifest
@@ -3,5 +3,5 @@ AUX stmpfiles-setup.initd 396 BLAKE2B 54796d5db9fc350a98e467cf763afaa82bc27f5477
 AUX stmpfiles.confd 56 BLAKE2B c26aafd0e47b01354c7f20869cd71d36d7a8560e9013863eca6abb736d78c1eeb3eec00427c6bc8d37ab5b9bb88155d11b9e18809da9110ed40c77a34ebb1a82 SHA512 464cb238b87a8fbeb57e6534d0f2d861e8ade4219be9b7e2faf05c799f717cd2f23d176393bdd3c3b236058aa6f8bda837ad947fbe8f9489405760e9bfedbe40
 DIST systemd-246.tar.gz 9534036 BLAKE2B 71b72abcd4d066d35d45d9835d41bec8faa9a7eddc80b48fe7073223f07d32f78a8442c52dc0800940f9750d9c5502123a633738981d797cf610d85df2035bf0 SHA512 7103f7da53f7ced3b5543c238f23bd11c82af8e37166c1720a90576b6b431b4329320c78726166c65a9f5e101dd465c0a86dd13c586c4e55e608a6273d8f324f
 DIST systemd-tmpfiles-246-musl.tar.xz 25860 BLAKE2B 87fc4ca37abec9c1a0cee48bf78c575bd53e16a50d427eff338159dc6d5474ffd328af533ccf90a0e1e160a16baa7378070f418f2be0d7f77e00907a5d07d30e SHA512 4a93d9f0cb2df2dd0a2f91820615dd3a95d19583f45dc0589e37ceaedfc2040112310a6e3fc525e28e222e96a91498af2fe8541b5bf86a635c0f52dd1a84deb7
-EBUILD systemd-tmpfiles-246.ebuild 4564 BLAKE2B a1bea3e658ff600a43d1efe50653657138604ed1b67e14cb15fba995a3e6925d18f802b827297e29d92c5c663c64df7f5f6c751ea4971bd1b6288c3820e8b1a6 SHA512 0aa13da16c17fd3481d51b7fe427737ce00b06a6d3dfa264e42a1e25562676a39858fa799e4135510544035ca419849b4ff2f2231d1e07a9e926ba77c5397db2
+EBUILD systemd-tmpfiles-246.ebuild 4576 BLAKE2B 269b7674abee8b6cf280fb2f4c26e58efc0f5749ffbc2f05c56bbb7140e0048c92eeb91aa720e4137a8305237970b88e2db5ba0d5dbb1babd77b383e27d3d7c2 SHA512 9e12386a158045ba960792921ec695229b118ae98a26288ab78e4cdf8360b2c8d2587afe5c280d0864c2810da059b181e75979a09223b0a92aa502fd4d5f56d1
 MISC metadata.xml 251 BLAKE2B e9e9d48943645d8b737bc1f7ab0efb05db0f8eddad759c9bb40d07dc008fbfb8f5cca2020de71a9ff6945f5d66292ac02355773545010cd49c77fe6dd5ab7b40 SHA512 1b6a6955118c1a74cc89a77d6de9be8f4ff9c7137c186753462670a5b93457dfd034ad5d1f4d2507ac95cc149c2a042fa5324220b58702a56b09d91de40151c9
diff --git a/sys-apps/systemd-tmpfiles/systemd-tmpfiles-246.ebuild b/sys-apps/systemd-tmpfiles/systemd-tmpfiles-246.ebuild
index dae5539fd8c7..e4e1196d3663 100644
--- a/sys-apps/systemd-tmpfiles/systemd-tmpfiles-246.ebuild
+++ b/sys-apps/systemd-tmpfiles/systemd-tmpfiles-246.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
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> systemd-${P
 
 LICENSE="BSD-2 GPL-2 LGPL-2.1 MIT public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="selinux test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index bcb84afc804d..29e897fcc9ec 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -8,7 +8,7 @@ DIST systemd-246.tar.gz 9534036 BLAKE2B 71b72abcd4d066d35d45d9835d41bec8faa9a7ed
 DIST systemd-stable-246.6.tar.gz 9545237 BLAKE2B 5290736b30ca1a3188335a74d49b4f3e8b48007d9563efac1985ea6428a8b8fd6cad7ae87c35e13a32f851ebd27821829738274d35cfbff9340750bd3b086621 SHA512 1936b291d9831cf61f800fe718a4c2c2fe9b2a11fd817fe32bd48da2087a675dfc91013209a3478ea52e8ada593300ed906e248b8081dcf9141bf1cc17483ea9
 DIST systemd-stable-247.2.tar.gz 9890845 BLAKE2B 5363f429f4e629b9a05248b77f7c102da37e23c5678e14621ca67edeea59d7995064d037f04eb0ce57dd17a1b3a40a04e00619f77dbde82a61aabbc02f5bc412 SHA512 220739bedb7ccbb35d9d2ff441a52e0615fbe80da5141f7e0420d469f4d66d3604ea72ce70c3deaa2afa5a32b3c7eec4340738337c96891b471e23ed43cd6a82
 EBUILD systemd-246-r2.ebuild 15224 BLAKE2B 7b1108222a77b92640c21d46c09bca1d40247cc0711913341dae37740d8b38c70741be0471360d4ba602e4823628a9cbb0f26e8535b3c223bfbb29bc494dfef7 SHA512 cb7f79c8cf8bc638c1104f141345043a7a041d3729a514debc62a1e726467c387ed11bd6160fc02e9993a56dede7958aa1b664dec0a62c603254842708f1d59b
-EBUILD systemd-246.6.ebuild 15260 BLAKE2B c4f0800e64d042ca74626e88bb34072ea4b84931a27192362ba096a3aeea73350cd4d49fe0d614a66d774a8166d1929b7664a227ae750bd5ccd15bdb4da70aaf SHA512 eff22df11fb3ff8d5707b8d122b6caeafb29b04194f3e70439028c64f57f4a5eceee6ff2aeca9643cbcdb8a42daed18bd9ce3f771d6fd18e3729b045c4263a67
+EBUILD systemd-246.6.ebuild 15258 BLAKE2B 157431bae82d3d4fe0ae36e9b9cec1637436b0da21abb49d55f5fb3f9cf09cede7e1b6a453658298131fec81357d7722f197b9cd1ccb09ccba93391c55568454 SHA512 b29795a61308b7a35af73a0c86fbba97406050ae78bb2d75c9d3621b64f9b1848e607f1a0dfa20d76ef0f8913b1bf0de1a0fdf8c26fe3bf090ec3d52392dc950
 EBUILD systemd-247.2-r4.ebuild 15594 BLAKE2B 3a90c524674407cf4cf63561f2a035a7d0c533e6e2fccd1f85b6746f45c32ee3efcd36021dde4ef3b4b24f33b16c0e1b24a2ebbbaa10b502db2354ca65d767aa SHA512 cbd6b278c63f0d632f6be7ab36b49d67fa00eb9651a77e731888040a12bdc629143372bc8bb2553eeea87e761998a03e3a6cd340659c6dd9fa5a4ab65c811969
 EBUILD systemd-9999.ebuild 15594 BLAKE2B 3a90c524674407cf4cf63561f2a035a7d0c533e6e2fccd1f85b6746f45c32ee3efcd36021dde4ef3b4b24f33b16c0e1b24a2ebbbaa10b502db2354ca65d767aa SHA512 cbd6b278c63f0d632f6be7ab36b49d67fa00eb9651a77e731888040a12bdc629143372bc8bb2553eeea87e761998a03e3a6cd340659c6dd9fa5a4ab65c811969
 MISC metadata.xml 2373 BLAKE2B fac7a9db4c217998f84bcbb5bc490eee748a35f9d991962d5aa21c6ec562d494af06b67fe35879ee2b245445d22ea7eadc4db6305215f393c4565b86665b3130 SHA512 e2d999684255f6c6509af7dca1b9e1411eac9a4cde6f30d9631c5b9d2bbe749a40f3d08c067d2cad5eb1cdd8ad823c3afb6844cc5e3c1d455fbd8cd20d87a696
diff --git a/sys-apps/systemd/systemd-246.6.ebuild b/sys-apps/systemd/systemd-246.6.ebuild
index 081914a1233f..8b525c7af060 100644
--- a/sys-apps/systemd/systemd-246.6.ebuild
+++ b/sys-apps/systemd/systemd-246.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2011-2020 Gentoo Authors
+# Copyright 2011-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ else
 	MY_P=${MY_PN}-${MY_PV}
 	S=${WORKDIR}/${MY_P}
 	SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 fi
 
 PYTHON_COMPAT=( python3_{6,7,8} )
diff --git a/sys-apps/xdg-desktop-portal/Manifest b/sys-apps/xdg-desktop-portal/Manifest
index e94e5e2dbe00..3f6640cc4539 100644
--- a/sys-apps/xdg-desktop-portal/Manifest
+++ b/sys-apps/xdg-desktop-portal/Manifest
@@ -1,3 +1,5 @@
+AUX xdg-desktop-portal-1.8.0-fix-doc-portal.patch 4954 BLAKE2B 3ba7ad250eaabc707d5a139196d7ad428dc6356f7a35da6e8636214d8600f47b700eecbf5bca2194fd6b3e44d2fc60e38e0c664e6cd777a3400d608503445126 SHA512 350b0ae907c7927a08632f370f080296dcdfc054df5e9ca9e74fed3ec0b6e2d21af3f07d7ae072e372b5774ec578830f7187eb14e5baf3a5f516ff2faf0d97b1
 DIST xdg-desktop-portal-1.8.0.tar.xz 470692 BLAKE2B f21da5ad11dc2b1611983fdac87335b3c7e9c13222bbe3b90b276d75726a6f16d950a9ba62606aa31d52f57b8d076393ec0d48014b1623ab03dee23c524ed0ef SHA512 6d9760b41447af711d5937279b0031bcc88947e11204351accfcd9e6e19e498e9021675753185f92f7bd40336decc1895968796b1b71508c7caf5f6fc32a51a4
+EBUILD xdg-desktop-portal-1.8.0-r1.ebuild 1073 BLAKE2B 87d601924c2c2d8f4830478c30b8c3471343229106b2ea3d60db57eabd2a03d2bf3462f26517bc1cdd848e746b98431aa96d0ff5c8fa7e1ac46f4a69b482a639 SHA512 a3616d3411aa7838cd4a8ff386321a35013ae2108b45f499fd3d4ba1b22ffc969eedcc84c6ae599a6f9e980cf608478282947ee61ce44691eee21c119495e78c
 EBUILD xdg-desktop-portal-1.8.0.ebuild 1017 BLAKE2B aebe178b476eb447327553bf9514a0e51e98cdc02265162d6c5f98b34aa1ff7501b490b7b2a12a100125a02e07ba7eb0846ebc61e5ea4025703d4379ee70eb5b SHA512 b313f6c0de8618f1dad47c6fc048466a312ea9e974802357a70d6ed5a98a08d07d3867ef503f9c01291d035225b0bdfb146134a330e6cfe3eaa28d45bc9f8ed4
 MISC metadata.xml 360 BLAKE2B 1e3fae0173fab20df0be6a2bd8432477d2c0ab2b9c4272e72a9d8a9eee3255c56311364ea079d288f87032fbc2ec8cad69f32a6bc41b152d19e307ee84493b49 SHA512 4e7232bd03fad6442491ce16c155b0d447050dfc383bb2c16b51297c8c2dcc2793b6d9ce6703451e9516d5a3017fb9e20e85ed7208c94c0faa4489bcbd897e22
diff --git a/sys-apps/xdg-desktop-portal/files/xdg-desktop-portal-1.8.0-fix-doc-portal.patch b/sys-apps/xdg-desktop-portal/files/xdg-desktop-portal-1.8.0-fix-doc-portal.patch
new file mode 100644
index 000000000000..46b3aaf0fb40
--- /dev/null
+++ b/sys-apps/xdg-desktop-portal/files/xdg-desktop-portal-1.8.0-fix-doc-portal.patch
@@ -0,0 +1,135 @@
+From 57096483afb069e69b9addcc39fe92b72051f1d2 Mon Sep 17 00:00:00 2001
+From: James Henstridge <james@jamesh.id.au>
+Date: Tue, 24 Nov 2020 15:48:19 +0800
+Subject: [PATCH] xdp-utils: check if alternate doc portal path matches in
+ path_for_fd()
+
+The document portal uses different inode number when exposing a
+particular document in different parts of the file system.  As sandboxed
+apps only have a subtree of the document portal file system mounted, the
+"same file" checks in xdp_app_info_get_path_for_fd() would fail for
+document portal paths.
+
+To fix this, we check to see whether the corresponding "by-app/$app_id"
+path matches the stat information of the file descriptor.
+
+Fixes #545
+---
+ document-portal/document-portal.c |  2 ++
+ src/documents.c                   |  2 ++
+ src/xdp-utils.c                   | 47 +++++++++++++++++++++++++++++--
+ src/xdp-utils.h                   |  3 ++
+ 5 files changed, 85 insertions(+), 2 deletions(-)
+
+diff --git a/document-portal/document-portal.c b/document-portal/document-portal.c
+index a4c044a..a4aacc4 100644
+--- a/document-portal/document-portal.c
++++ b/document-portal/document-portal.c
+@@ -1448,6 +1448,8 @@ on_name_acquired (GDBusConnection *connection,
+ 
+   fuse_dev = stbuf.st_dev;
+ 
++  xdp_set_documents_mountpoint (xdp_fuse_get_mountpoint ());
++
+   while ((invocation = g_queue_pop_head (&get_mount_point_invocations)) != NULL)
+     {
+       xdp_dbus_documents_complete_get_mount_point (dbus_api, invocation, xdp_fuse_get_mountpoint ());
+diff --git a/src/documents.c b/src/documents.c
+index 99de9e4..9ddc4ac 100644
+--- a/src/documents.c
++++ b/src/documents.c
+@@ -31,6 +31,7 @@
+ #include <gio/gunixfdlist.h>
+ 
+ #include "xdp-dbus.h"
++#include "xdp-utils.h"
+ #include "document-enums.h"
+ 
+ static XdpDocuments *documents = NULL;
+@@ -46,6 +47,7 @@ init_document_proxy (GDBusConnection *connection)
+   xdp_documents_call_get_mount_point_sync (documents,
+                                            &documents_mountpoint,
+                                            NULL, NULL);
++  xdp_set_documents_mountpoint (documents_mountpoint);
+ }
+ 
+ char *
+diff --git a/src/xdp-utils.c b/src/xdp-utils.c
+index fa6ca6f..ef68f0f 100644
+--- a/src/xdp-utils.c
++++ b/src/xdp-utils.c
+@@ -884,6 +884,35 @@ verify_proc_self_fd (XdpAppInfo *app_info,
+   return xdp_app_info_remap_path (app_info, path_buffer);
+ }
+ 
++static char *documents_mountpoint = NULL;
++
++void
++xdp_set_documents_mountpoint (const char *path)
++{
++  g_clear_pointer (&documents_mountpoint, g_free);
++  documents_mountpoint = g_strdup (path);
++}
++
++/* alternate_document_path converts a file path  */
++char *
++xdp_get_alternate_document_path (const char *path, const char *app_id)
++{
++  int len;
++
++  /* If we don't know where the document portal is mounted, then there
++   * is no alternate path */
++  if (documents_mountpoint == NULL)
++    return NULL;
++
++  /* If the path is not within the document portal, then there is no
++   * alternative path */
++  len = strlen (documents_mountpoint);
++  if (!g_str_has_prefix (path, documents_mountpoint) || path[len] != '/')
++    return NULL;
++
++  return g_strconcat (documents_mountpoint, "/by-app/", app_id, &path[len], NULL);
++}
++
+ char *
+ xdp_app_info_get_path_for_fd (XdpAppInfo *app_info,
+                               int fd,
+@@ -981,8 +1010,22 @@ xdp_app_info_get_path_for_fd (XdpAppInfo *app_info,
+       st_buf->st_dev != real_st_buf.st_dev ||
+       st_buf->st_ino != real_st_buf.st_ino)
+     {
+-      /* Different files on the inside and the outside, reject the request */
+-      return NULL;
++      /* If the path is provided by the document portal, the inode
++         number will not match, due to only a subtree being mounted in
++         the sandbox.  So we check to see if the equivalent path
++         within that subtree matches our file descriptor.
++
++         If the alternate path doesn't match either, then we treat it
++         as a failure.
++      */
++      g_autofree char *alt_path = NULL;
++      alt_path = xdp_get_alternate_document_path (path, xdp_app_info_get_id (app_info));
++
++      if (alt_path == NULL ||
++          stat (alt_path, &real_st_buf) < 0 ||
++          st_buf->st_dev != real_st_buf.st_dev ||
++          st_buf->st_ino != real_st_buf.st_ino)
++        return NULL;
+     }
+ 
+   if (writable_out)
+diff --git a/src/xdp-utils.h b/src/xdp-utils.h
+index 7105bce..fea28b8 100644
+--- a/src/xdp-utils.h
++++ b/src/xdp-utils.h
+@@ -88,6 +88,9 @@ char **     xdp_app_info_rewrite_commandline (XdpAppInfo *app_info,
+ 
+ G_DEFINE_AUTOPTR_CLEANUP_FUNC(XdpAppInfo, xdp_app_info_unref)
+ 
++void  xdp_set_documents_mountpoint    (const char *path);
++char *xdp_get_alternate_document_path (const char *path, const char *app_id);
++
+ XdpAppInfo *xdp_invocation_lookup_app_info_sync (GDBusMethodInvocation *invocation,
+                                                  GCancellable          *cancellable,
+                                                  GError               **error);
diff --git a/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.8.0-r1.ebuild b/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.8.0-r1.ebuild
new file mode 100644
index 000000000000..bb8cc5472f0b
--- /dev/null
+++ b/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.8.0-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools systemd
+
+DESCRIPTION="Desktop integration portal"
+HOMEPAGE="https://flatpak.org/ https://github.com/flatpak/xdg-desktop-portal"
+SRC_URI="https://github.com/flatpak/${PN}/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="geolocation screencast"
+
+BDEPEND="
+	dev-util/gdbus-codegen
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+DEPEND="
+	dev-libs/glib:2
+	dev-libs/json-glib
+	media-libs/fontconfig
+	sys-fs/fuse:0
+	geolocation? ( >=app-misc/geoclue-2.5.3:2.0 )
+	screencast? ( >=media-video/pipewire-0.3:= )
+"
+RDEPEND="${DEPEND}
+	sys-apps/dbus
+"
+
+PATCHES=( "${FILESDIR}/${P}-fix-doc-portal.patch" )
+
+src_configure() {
+	local myeconfargs=(
+		--with-systemduserunitdir="$(systemd_get_userunitdir)"
+		$(use_enable geolocation geoclue)
+		$(use_enable screencast pipewire)
+		--disable-docbook-docs # flatpak not packaged
+		--disable-libportal # not packaged
+	)
+	econf "${myeconfargs[@]}"
+}