Sync with portage [Sun Jul 12 10:08:59 MSK 2020].

4 years ago · 8ba209837a
parent d7799a9c6d
commit 8ba209837a
2194 changed files with 11550 additions and 15580 deletions
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/acct-group/Manifest.gz
+++ b/acct-group/Manifest.gz
--- a/acct-group/dnscrypt-proxy/metadata.xml
+++ b/acct-group/dnscrypt-proxy/metadata.xml
@ -5,8 +5,4 @@
 		<email>sam@gentoo.org</email>
 		<name>Sam James</name>
 	</maintainer>
 	<maintainer type="person">
 		<email>gyakovlev@gentoo.org</email>
 		<name>Georgy Yakovlev</name>
 	</maintainer>
 </pkgmetadata>
--- a/acct-user/Manifest.gz
+++ b/acct-user/Manifest.gz
--- a/acct-user/dnscrypt-proxy/metadata.xml
+++ b/acct-user/dnscrypt-proxy/metadata.xml
@ -5,8 +5,4 @@
 		<email>sam@gentoo.org</email>
 		<name>Sam James</name>
 	</maintainer>
 	<maintainer type="person">
 		<email>gyakovlev@gentoo.org</email>
 		<name>Georgy Yakovlev</name>
 	</maintainer>
 </pkgmetadata>
--- a/app-accessibility/Manifest.gz
+++ b/app-accessibility/Manifest.gz
--- a/app-accessibility/accerciser/Manifest
+++ b/app-accessibility/accerciser/Manifest
@ -1 +1,2 @@
 DIST accerciser-3.22.0.tar.xz 3060756 BLAKE2B a648c764c5f101f323458c692cb4171704b7b710558f4103b57d87ca58c2d0d9c03cad72de1d3be9483d317ad94c95e43bb2437515093d6ffd93089a58e5fab1 SHA512 980db5dcd0bdc78314ab87cce95cfcfa018bf302acc66ea2dd1bddfb61de5bfe2e64344cff63740c38be33124ff49c75699aa6867d5e85b25d422b5af1b025c1
 DIST accerciser-3.36.2.tar.xz 1995756 BLAKE2B 14d569f159cda685bb5217cb650d64c473c296e6c0e74bf2d6290908ea4aef06fd736aa8bdb7782a7bbd5231895a53e85fa362382fd15cf0554721fe46c8cbe9 SHA512 fb2ecb35826f1a868a8badcefcb4941258273bfc639996b8d4cecbd5d9700cb48e102891105842fcf3b0cb5f7a53df28de3283a80130d83695528db06ff0f268
--- a/app-accessibility/accerciser/accerciser-3.36.2.ebuild
+++ b/app-accessibility/accerciser/accerciser-3.36.2.ebuild
@ -0,0 +1,48 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
 PYTHON_COMPAT=( python3_{6,7} )
 PYTHON_REQ_USE="xml"
 inherit gnome2 python-single-r1
 DESCRIPTION="Interactive Python accessibility explorer"
 HOMEPAGE="https://wiki.gnome.org/Apps/Accerciser"
 LICENSE="BSD CC-BY-SA-3.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RDEPEND="
 	>=app-accessibility/at-spi2-core-2.5.2:2
 	>=x11-libs/gtk+-3.1.13:3[introspection]
 	$(python_gen_cond_dep '
 		>=dev-python/pygobject-2.90.3:3[${PYTHON_USEDEP}]
 		>=dev-python/ipython-0.11[${PYTHON_USEDEP}]
 		>=dev-python/pyatspi-2.1.5[${PYTHON_USEDEP}]
 		dev-python/pycairo[${PYTHON_USEDEP}]
 		dev-python/python-xlib[${PYTHON_USEDEP}]
 	')
 	dev-libs/atk[introspection]
 	>=dev-libs/glib-2.28:2
 	dev-libs/gobject-introspection:=
 	x11-libs/gdk-pixbuf[introspection]
 	x11-libs/libwnck:3[introspection]
 	x11-libs/pango[introspection]
 	gnome-base/librsvg[introspection]
 	${PYTHON_DEPS}
 "
 DEPEND="${RDEPEND}
 	dev-util/itstool
 	>=sys-devel/gettext-0.19.8
 	virtual/pkgconfig
 "
 src_install() {
 	gnome2_src_install
 	python_optimize
 }
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
--- a/app-admin/denyhosts/Manifest
+++ b/app-admin/denyhosts/Manifest
@ -1,2 +1 @@
 DIST denyhosts-2.9.tar.gz 49472 BLAKE2B 94f18da3db9dd7e0d979d4fb536160114fe1dc95ac43ad1f7bf3f235702698210e62b3872bf7f3360945228b187d97a274797d535a9b12b552bddf649b5d1fdf SHA512 f41e2985e84f0eeaa493def6b8609de934889d02b124962b0bfd02ebe5e41d0670822124eb50ed84eb1c3b8a2a96775fbe09386cef48a3c3e04949fd6b1452c1
 DIST denyhosts-3.0.tar.gz 56283 BLAKE2B 1ecb8a13ec9511cb4ac65579aa8f88117264f231b586c30a61ad9c78abd17aeebc5642e70f162fa7e73fe81a99821d494efca213b1bf864fd0e2043fa4374e6a SHA512 8a1c796c259049ffab2c88cef780b175ec75c94216841421f831dfbf45f4ba0cdbcfbb0e3dab7200aa79eeb2416db5234ad5016d5770d8ab2f28ef4c9754e70d
--- a/app-admin/denyhosts/denyhosts-2.9.ebuild
+++ b/app-admin/denyhosts/denyhosts-2.9.ebuild
@ -1,72 +0,0 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1 eutils readme.gentoo systemd
 DESCRIPTION="DenyHosts is a utility to help sys admins thwart ssh hackers"
 HOMEPAGE="http://denyhost.sourceforge.net/"
 SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm hppa ppc sparc x86"
 IUSE=""
 DEPEND=""
 RDEPEND=""
 DISABLE_AUTOFORMATTING="yes"
 DOC_CONTENTS="
 >=net-misc/openssh-6.7p1 dropped support for sys-apps/tcp-wrappers
 (see bug#531156) that means you either have patch openssh or use
 denyhosts' iptables feature to get any protection.
 You can configure DenyHosts to run as a daemon by running:
 # rc-update add denyhosts default
 or:
 # systemctl enable denyhosts.service
 (if you use systemd)
 To run DenyHosts as a cronjob instead of a daemon add the following
 to /etc/crontab
 # run DenyHosts every 10 minutes
 */10  *  * * *    root    /usr/bin/denyhosts.py -c /etc/denyhosts.conf
 More information can be found at ${HOMEPAGE}faq.html"
 src_prepare() {
 	#systemd needs HOSTNAME
 	epatch "${FILESDIR}"/${PN}-2.6-hostname.patch
 	sed -e '/^DENY_THRESHOLD_VALID =/s/=.*/= 5/' \
 		-e '/^SECURE_LOG/s/^/#/' \
 		-e '\@#SECURE_LOG.*/var/log/messages@s/^#//' \
 		-i denyhosts.conf || die "sed failed"
 	distutils-r1_src_prepare
 }
 src_install() {
 	readme.gentoo_create_doc
 	dodoc CHANGELOG.txt README.txt PKG-INFO
 	distutils-r1_src_install
 	dodir /etc/logrotate.d
 	insinto /etc/logrotate.d
 	newins "${FILESDIR}"/${PN}.logrotate-r2 ${PN}
 	newinitd "${FILESDIR}"/denyhosts.init-r2 denyhosts
 	systemd_dounit "${FILESDIR}"/${PN}.service
 	keepdir /var/lib/denyhosts
 }
 pkg_postinst() {
 	[[ -f "${EROOT}etc/hosts.deny" ]] || touch "${EROOT}etc/hosts.deny"
 	readme.gentoo_print_elog
 }
--- a/app-admin/denyhosts/denyhosts-3.0.ebuild
+++ b/app-admin/denyhosts/denyhosts-3.0.ebuild
@ -1,63 +0,0 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1 eutils readme.gentoo systemd
 DESCRIPTION="DenyHosts is a utility to help sys admins thwart ssh hackers"
 HOMEPAGE="https://github.com/denyhosts/denyhosts"
 SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~sparc x86"
 IUSE=""
 DEPEND=""
 RDEPEND=""
 DISABLE_AUTOFORMATTING="yes"
 DOC_CONTENTS="
 >=net-misc/openssh-6.7p1 dropped support for sys-apps/tcp-wrappers
 (see bug#531156) that means you either have patch openssh or use
 denyhosts' iptables feature to get any protection.
 You can configure DenyHosts to run as a daemon by running:
 # rc-update add denyhosts default
 or:
 # systemctl enable denyhosts.service
 (if you use systemd)
 To run DenyHosts as a cronjob instead of a daemon add the following
 to /etc/crontab
 # run DenyHosts every 10 minutes
 */10  *  * * *    root    /usr/bin/denyhosts.py -c /etc/denyhosts.conf
 More information can be found at ${HOMEPAGE}faq.html"
 src_prepare() {
 	sed -e '/^DENY_THRESHOLD_VALID =/s/=.*/= 5/' \
 		-e '/^SECURE_LOG/s/^/#/' \
 		-e '\@#SECURE_LOG.*/var/log/messages@s/^#//' \
 		-i denyhosts.conf || die "sed failed"
 	distutils-r1_src_prepare
 }
 src_install() {
 	readme.gentoo_create_doc
 	dodoc CHANGELOG.txt README.md
 	distutils-r1_src_install
 	dodir /etc/logrotate.d
 	insinto /etc/logrotate.d
 	newins "${FILESDIR}"/${PN}.logrotate-r2 ${PN}
 	newinitd "${FILESDIR}"/denyhosts.init-r2 denyhosts
 	systemd_dounit "${FILESDIR}"/${PN}.service
 	keepdir /var/lib/denyhosts
 }
--- a/app-admin/denyhosts/files/denyhosts-2.6-hostname.patch
+++ b/app-admin/denyhosts/files/denyhosts-2.6-hostname.patch
@ -1,21 +0,0 @@
 diff -up ./denyhosts.py.orig ./denyhosts.py
 --- ./denyhosts.py.orig	2012-01-30 13:14:41.146715839 -0600
 +++ ./denyhosts.py	2012-01-30 14:45:14.372539341 -0600
@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 import os
 +import platform
 import sys
 import DenyHosts.python_version
@@ -107,6 +108,10 @@ if __name__ == '__main__':
             print "DenyHosts version:", VERSION
             sys.exit(0)
 +    # This is generally expected to be in the environment, but there's no
 +    # non-hackish way to get systemd to set it, so just hack it in here.
 +    os.environ['HOSTNAME'] = platform.node()
 +
     prefs = Prefs(config_file)    
     first_time = 0
--- a/app-admin/denyhosts/metadata.xml
+++ b/app-admin/denyhosts/metadata.xml
@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
+  <!-- maintainer-needed -->
    <email>proxy-maint@gentoo.org</email>
    <name>Proxy Maintainers</name>
  </maintainer>
  <upstream>
    <remote-id type="github">denyhosts/denyhosts</remote-id>
    <remote-id type="sourceforge">denyhost</remote-id>
--- a/app-admin/hcloud/Manifest
+++ b/app-admin/hcloud/Manifest
@ -1,2 +1,2 @@
 DIST hcloud-1.16.1.tar.xz 649100 BLAKE2B a019f21d8c87dd47fc3c2eb069576fd367c1dd6dac7a5909f76a9c31fe9922e93ba4e1fdde3bd86dcbdb25bb2cf84b1eaddd9c7e6b62bb08647ba9d7a804e06a SHA512 e8a4e3d9c883b009eea98443716264115d55b93b212b0a0df64316f63310210a3812b3948d16f822b6f8f32d029029da5b51be7b7561d9396f28a406061a507c
-DIST hcloud-1.16.2.tar.xz 678408 BLAKE2B 01d10032b93295ac5e255103b38023b323b545cb30f78cbd9e6a0dc392579c94142b9c7575e383c5dbd5e88fb17ca1b51419df014782d517f4392683e987c9a5 SHA512 74902f212ebd432d4bec8c566a13daddf38349989e3329b62d75f332941930b55839392efcb7d9e8081700352505def9912220b228f45b92a4a3e853b8091722
+DIST hcloud-1.17.0.tar.xz 687880 BLAKE2B c83530946dd04afc59d45a2bbb12b6a4034dfe5b8c3826e4e78f29e88891672c21e896fd9d24394ce943f9b6574928ae144a564abde3fec8a243cc5fc87e8bdb SHA512 5025357392e9b7661876f059a416e6d6f9eea89e16a9abaacaeb72506aaa5d4d6a193e266d23f01cd0f5d32048f66a3f6e22a1c9c042c2e3183a1e164da2ccc6
--- a/app-admin/hcloud/hcloud-1.17.0.ebuild
+++ b/app-admin/hcloud/hcloud-1.17.0.ebuild
--- a/app-admin/puppet-lint/puppet-lint-2.4.2.ebuild
+++ b/app-admin/puppet-lint/puppet-lint-2.4.2.ebuild
@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26"
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
--- a/app-arch/fastjar/fastjar-0.98-r3.ebuild
+++ b/app-arch/fastjar/fastjar-0.98-r3.ebuild
@ -11,7 +11,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
+KEYWORDS="amd64 ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
 IUSE=""
--- a/app-arch/pigz/files/2.4-trailing-junk.patch
+++ b/app-arch/pigz/files/2.4-trailing-junk.patch
@ -0,0 +1,27 @@
 From 1414ff3eb0b1ac9e5f096b0a28efa459cb8be1cd Mon Sep 17 00:00:00 2001
 From: Georgy Yakovlev <gyakovlev@gentoo.org>
 Date: Fri, 10 Jul 2020 19:46:10 -0700
 Subject: [PATCH] Ignore trailing junk on .gz by default, to emulate gzip.
 backport of
 https://github.com/madler/pigz/commit/9696c84cb1963651707e649978afb07d0c11b254
 ---
 pigz.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 diff --git a/pigz.c b/pigz.c
 index bbbfd2c..f2e79d7 100644
 --- a/pigz.c
 +++ b/pigz.c
@@ -3368,7 +3368,7 @@ local void infchk(void) {
         cat();
     else if (was > 1 && get_header(0) != -5)
         complain("warning: %s: entries after the first were ignored", g.inf);
 -    else if ((was == 0 && ret != -1) || (was == 1 && (GET(), !g.in_eof)))
 +    else if (( g.verbosity > 1 && was == 0 && ret != -1) || (was == 1 && (GET(), !g.in_eof)))
         complain("warning: %s: trailing junk was ignored", g.inf);
 }
 -- 
 2.27.0
--- a/app-arch/pigz/pigz-2.4-r1.ebuild
+++ b/app-arch/pigz/pigz-2.4-r1.ebuild
@ -21,6 +21,8 @@ DEPEND="${RDEPEND}
 	static? ( ${LIB_DEPEND} )
 	test? ( app-arch/ncompress )"
 PATCHES=( "${FILESDIR}/${PV}-trailing-junk.patch" )
 src_compile() {
 	use static && append-ldflags -static
 	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
--- a/app-doc/Manifest.gz
+++ b/app-doc/Manifest.gz
--- a/app-doc/doxygen/doxygen-1.8.17.ebuild
+++ b/app-doc/doxygen/doxygen-1.8.17.ebuild
@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="http://doxygen.nl/files/${P}.src.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 DESCRIPTION="Documentation system for most programming languages"
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
--- a/app-emulation/protontricks/protontricks-1.4.1-r1.ebuild
+++ b/app-emulation/protontricks/protontricks-1.4.1-r1.ebuild
@ -3,7 +3,7 @@
 EAPI=7
-PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
 DISTUTILS_SINGLE_IMPL=1
 DISTUTILS_USE_SETUPTOOLS=rdepend
--- a/app-emulation/qemu-riscv64-bin/Manifest
+++ b/app-emulation/qemu-riscv64-bin/Manifest
@ -1 +1,2 @@
 DIST qemu-riscv64-bin-3.1.0-r4.tar.xz 889764 BLAKE2B 888fef2f27f44be098e9b834b083558ce18d98337612b4de2278ffe5d6599248d9ed4e99153ad9b2c1a5b773131c420bb23ce6d080943af744df34464660bc42 SHA512 bc92110f6730c61bd39056d0bf3f84b35ed340a47af51b28b27554f9f2f72409221d2c81826b718742475d0fc48040c81e8f051e29b4f13412c3a39e282471e0
 DIST qemu-riscv64-bin-5.0.0.tar.xz 922240 BLAKE2B d4ff41c8e45ca99bc1b9e795d9e218b05be283b32d179e8ab88d07bd333a52fce7893739e6572219083d5d56a7abb7cc1870df7c585ca41af15b56a5dc30369d SHA512 1ba28679ce4bf1f11b77059dae8cb76f0095cc4427159d769947b8a1b1212c9de0a25a236c69ff9780dd111a22fa6e01519a3017b0b0a5d29069575501552f40
--- a/app-emulation/qemu-riscv64-bin/qemu-riscv64-bin-5.0.0.ebuild
+++ b/app-emulation/qemu-riscv64-bin/qemu-riscv64-bin-5.0.0.ebuild
@ -0,0 +1,22 @@
 # Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 DESCRIPTION="Statically linked x86-64 binary of app-emulation/qemu, riscv64 emulator"
 HOMEPAGE="http://www.qemu.org"
 SRC_URI="https://dev.gentoo.org/~dilfridge/distfiles/${PN}-${PVR}.tar.xz"
 LICENSE="GPL-2 LGPL-2 BSD-2"
 SLOT="0"
 KEYWORDS="~amd64"
 RDEPEND="!app-emulation/qemu[qemu_user_targets_riscv64]"
 QA_PREBUILT="*"
 S=${WORKDIR}
 src_install() {
 	dobin qemu-riscv64
 }
--- a/app-emulation/qemu/metadata.xml
+++ b/app-emulation/qemu/metadata.xml
@ -40,6 +40,7 @@
 		<flag name="rbd">Enable rados block device backend support, see http://ceph.newdream.net/wiki/QEMU-RBD</flag>
 		<flag name="sdl">Enable the SDL-based console</flag>
 		<flag name="sdl-image">SDL Image support for icons</flag>
 		<flag name="slirp">Enable TCP/IP in hypervisor via <pkg>net-libs/libslirp</pkg></flag>
 		<flag name="spice">Enable Spice protocol support via <pkg>app-emulation/spice</pkg></flag>
 		<flag name="ssh">Enable SSH based block device support via <pkg>net-libs/libssh2</pkg></flag>
 		<flag name="static-user">Build the User targets as static binaries</flag>
@ -58,8 +59,7 @@
 		<flag name="virtfs">Enable VirtFS via virtio-9p-pci / fsdev. See http://wiki.qemu.org/Documentation/9psetup</flag>
 		<flag name="vte">Enable terminal support (<pkg>x11-libs/vte</pkg>) in the GTK+ interface</flag>
 		<flag name="xattr">Add support for getting and setting POSIX extended attributes, through
-		<pkg>sys-apps/attr</pkg>. Requisite for the virtfs backend.
+		<pkg>sys-apps/attr</pkg>. Requisite for the virtfs backend.</flag>
 	</flag>
 		<flag name="xen">Enables support for Xen backends</flag>
 		<flag name="xfs">Support xfsctl() notification and syncing for XFS backed
 		virtual disks.</flag>
--- a/app-emulation/qemu/qemu-5.0.0-r2.ebuild
+++ b/app-emulation/qemu/qemu-5.0.0-r2.ebuild
@ -0,0 +1,840 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI="7"
 PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 PYTHON_REQ_USE="ncurses,readline"
 PLOCALES="bg de_DE fr_FR hu it tr zh_CN"
 FIRMWARE_ABI_VERSION="4.0.0-r50"
 inherit eutils linux-info toolchain-funcs multilib python-r1 \
 	udev fcaps readme.gentoo-r1 pax-utils l10n xdg-utils
 if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://git.qemu.org/git/qemu.git"
 	EGIT_SUBMODULES=(
 		tests/fp/berkeley-{test,soft}float-3
 		ui/keycodemapdb
 	)
 	inherit git-r3
 	SRC_URI=""
 else
 	SRC_URI="https://download.qemu.org/${P}.tar.xz"
 	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
 fi
 DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
 HOMEPAGE="http://www.qemu.org http://www.linux-kvm.org"
 LICENSE="GPL-2 LGPL-2 BSD-2"
 SLOT="0"
 IUSE="accessibility +aio alsa bzip2 capstone +caps +curl debug doc
 	+fdt glusterfs gnutls gtk infiniband iscsi io-uring
 	jemalloc +jpeg kernel_linux
 	kernel_FreeBSD lzo ncurses nfs nls numa opengl +oss +pin-upstream-blobs
 	plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux
 	slirp
 	smartcard snappy spice ssh static static-user systemtap tci test usb
 	usbredir vde +vhost-net vhost-user-fs virgl virtfs +vnc vte xattr xen
 	xfs +xkb zstd"
 COMMON_TARGETS="aarch64 alpha arm cris hppa i386 m68k microblaze microblazeel
 	mips mips64 mips64el mipsel nios2 or1k ppc ppc64 riscv32 riscv64 s390x
 	sh4 sh4eb sparc sparc64 x86_64 xtensa xtensaeb"
 IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS}
 	lm32 moxie rx tricore unicore32"
 IUSE_USER_TARGETS="${COMMON_TARGETS}
 	aarch64_be armeb mipsn32 mipsn32el ppc64abi32 ppc64le sparc32plus
 	tilegx"
 use_softmmu_targets=$(printf ' qemu_softmmu_targets_%s' ${IUSE_SOFTMMU_TARGETS})
 use_user_targets=$(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS})
 IUSE+=" ${use_softmmu_targets} ${use_user_targets}"
 RESTRICT="!test? ( test )"
 # Allow no targets to be built so that people can get a tools-only build.
 # Block USE flag configurations known to not work.
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	qemu_softmmu_targets_arm? ( fdt )
 	qemu_softmmu_targets_microblaze? ( fdt )
 	qemu_softmmu_targets_mips64el? ( fdt )
 	qemu_softmmu_targets_ppc64? ( fdt )
 	qemu_softmmu_targets_ppc? ( fdt )
 	qemu_softmmu_targets_riscv32? ( fdt )
 	qemu_softmmu_targets_riscv64? ( fdt )
 	static? ( static-user !alsa !gtk !opengl !pulseaudio !plugins !rbd !snappy )
 	static-user? ( !plugins )
 	virtfs? ( xattr )
 	vte? ( gtk )
 	plugins? ( !static !static-user )
 "
 # Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...)
 # and user/softmmu targets (qemu-*, qemu-system-*).
 #
 # Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
 #
 # The attr lib isn't always linked in (although the USE flag is always
 # respected).  This is because qemu supports using the C library's API
 # when available rather than always using the external library.
 ALL_DEPEND="
 	>=dev-libs/glib-2.0[static-libs(+)]
 	sys-libs/zlib[static-libs(+)]
 	python? ( ${PYTHON_DEPS} )
 	systemtap? ( dev-util/systemtap )
 	xattr? ( sys-apps/attr[static-libs(+)] )"
 # Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...)
 # softmmu targets (qemu-system-*).
 SOFTMMU_TOOLS_DEPEND="
 	dev-libs/libxml2[static-libs(+)]
 	xkb? ( x11-libs/libxkbcommon[static-libs(+)] )
 	>=x11-libs/pixman-0.28.0[static-libs(+)]
 	accessibility? (
 		app-accessibility/brltty[api]
 		app-accessibility/brltty[static-libs(+)]
 	)
 	aio? ( dev-libs/libaio[static-libs(+)] )
 	alsa? ( >=media-libs/alsa-lib-1.0.13 )
 	bzip2? ( app-arch/bzip2[static-libs(+)] )
 	capstone? ( dev-libs/capstone:= )
 	caps? ( sys-libs/libcap-ng[static-libs(+)] )
 	curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
 	fdt? ( >=sys-apps/dtc-1.5.0[static-libs(+)] )
 	glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] )
 	gnutls? (
 		dev-libs/nettle:=[static-libs(+)]
 		>=net-libs/gnutls-3.0:=[static-libs(+)]
 	)
 	gtk? (
 		x11-libs/gtk+:3
 		vte? ( x11-libs/vte:2.91 )
 	)
 	infiniband? (
 		sys-fabric/libibumad:=[static-libs(+)]
 		sys-fabric/libibverbs:=[static-libs(+)]
 		sys-fabric/librdmacm:=[static-libs(+)]
 	)
 	iscsi? ( net-libs/libiscsi )
 	io-uring? ( sys-libs/liburing[static-libs(+)] )
 	jemalloc? ( dev-libs/jemalloc )
 	jpeg? ( virtual/jpeg:0=[static-libs(+)] )
 	lzo? ( dev-libs/lzo:2[static-libs(+)] )
 	ncurses? (
 		sys-libs/ncurses:0=[unicode]
 		sys-libs/ncurses:0=[static-libs(+)]
 	)
 	nfs? ( >=net-fs/libnfs-1.9.3:=[static-libs(+)] )
 	numa? ( sys-process/numactl[static-libs(+)] )
 	opengl? (
 		virtual/opengl
 		media-libs/libepoxy[static-libs(+)]
 		media-libs/mesa[static-libs(+)]
 		media-libs/mesa[egl,gbm]
 	)
 	png? ( media-libs/libpng:0=[static-libs(+)] )
 	pulseaudio? ( media-sound/pulseaudio )
 	rbd? ( sys-cluster/ceph )
 	sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
 	sdl? (
 		media-libs/libsdl2[video]
 		media-libs/libsdl2[static-libs(+)]
 	)
 	sdl-image? ( media-libs/sdl2-image[static-libs(+)] )
 	seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] )
 	slirp? ( net-libs/libslirp )
 	smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] )
 	snappy? ( app-arch/snappy:= )
 	spice? (
 		>=app-emulation/spice-protocol-0.12.3
 		>=app-emulation/spice-0.12.0[static-libs(+)]
 	)
 	ssh? ( >=net-libs/libssh-0.8.6[static-libs(+)] )
 	usb? ( >=virtual/libusb-1-r2[static-libs(+)] )
 	usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] )
 	vde? ( net-misc/vde[static-libs(+)] )
 	virgl? ( media-libs/virglrenderer[static-libs(+)] )
 	virtfs? ( sys-libs/libcap )
 	xen? ( app-emulation/xen-tools:= )
 	xfs? ( sys-fs/xfsprogs[static-libs(+)] )
 	zstd? ( >=app-arch/zstd-1.4.0[static-libs(+)] )
 "
 X86_FIRMWARE_DEPEND="
 	pin-upstream-blobs? (
 		~sys-firmware/edk2-ovmf-201905[binary]
 		~sys-firmware/ipxe-1.0.0_p20190728[binary]
 		~sys-firmware/seabios-1.12.0[binary,seavgabios]
 		~sys-firmware/sgabios-0.1_pre8[binary]
 	)
 	!pin-upstream-blobs? (
 		sys-firmware/edk2-ovmf
 		sys-firmware/ipxe
 		>=sys-firmware/seabios-1.10.2[seavgabios]
 		sys-firmware/sgabios
 	)"
 PPC64_FIRMWARE_DEPEND="
 	pin-upstream-blobs? (
 		~sys-firmware/seabios-1.12.0[binary,seavgabios]
 	)
 	!pin-upstream-blobs? (
 		>=sys-firmware/seabios-1.10.2[seavgabios]
 	)
 "
 BDEPEND="
 	$(python_gen_impl_dep)
 	dev-lang/perl
 	sys-apps/texinfo
 	virtual/pkgconfig
 	doc? ( dev-python/sphinx )
 	gtk? ( nls? ( sys-devel/gettext ) )
 	test? (
 		dev-libs/glib[utils]
 		sys-devel/bc
 	)
 "
 CDEPEND="
 	!static? (
 		${ALL_DEPEND//\[static-libs(+)]}
 		${SOFTMMU_TOOLS_DEPEND//\[static-libs(+)]}
 	)
 	qemu_softmmu_targets_i386? ( ${X86_FIRMWARE_DEPEND} )
 	qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} )
 	qemu_softmmu_targets_ppc64? ( ${PPC64_FIRMWARE_DEPEND} )
 "
 DEPEND="${CDEPEND}
 	kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
 	static? (
 		${ALL_DEPEND}
 		${SOFTMMU_TOOLS_DEPEND}
 	)
 	static-user? ( ${ALL_DEPEND} )"
 RDEPEND="${CDEPEND}
 	acct-group/kvm
 	selinux? ( sec-policy/selinux-qemu )"
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.11.1-capstone_include_path.patch
 	"${FILESDIR}"/${PN}-4.0.0-mkdir_systemtap.patch #684902
 	"${FILESDIR}"/${PN}-4.2.0-cflags.patch
 	"${FILESDIR}"/${PN}-5.0.0-epoll-strace.patch
 	"${FILESDIR}"/${PN}-5.0.0-ipv6-slirp-CVE-2020-10756.patch #731992
 )
 QA_PREBUILT="
 	usr/share/qemu/hppa-firmware.img
 	usr/share/qemu/openbios-ppc
 	usr/share/qemu/openbios-sparc64
 	usr/share/qemu/openbios-sparc32
 	usr/share/qemu/palcode-clipper
 	usr/share/qemu/s390-ccw.img
 	usr/share/qemu/s390-netboot.img
 	usr/share/qemu/u-boot.e500"
 QA_WX_LOAD="usr/bin/qemu-i386
 	usr/bin/qemu-x86_64
 	usr/bin/qemu-alpha
 	usr/bin/qemu-arm
 	usr/bin/qemu-cris
 	usr/bin/qemu-m68k
 	usr/bin/qemu-microblaze
 	usr/bin/qemu-microblazeel
 	usr/bin/qemu-mips
 	usr/bin/qemu-mipsel
 	usr/bin/qemu-or1k
 	usr/bin/qemu-ppc
 	usr/bin/qemu-ppc64
 	usr/bin/qemu-ppc64abi32
 	usr/bin/qemu-sh4
 	usr/bin/qemu-sh4eb
 	usr/bin/qemu-sparc
 	usr/bin/qemu-sparc64
 	usr/bin/qemu-armeb
 	usr/bin/qemu-sparc32plus
 	usr/bin/qemu-s390x
 	usr/bin/qemu-unicore32"
 DOC_CONTENTS="If you don't have kvm compiled into the kernel, make sure you have the
 kernel module loaded before running kvm. The easiest way to ensure that the
 kernel module is loaded is to load it on boot.
 	For AMD CPUs the module is called 'kvm-amd'.
 	For Intel CPUs the module is called 'kvm-intel'.
 Please review /etc/conf.d/modules for how to load these.
 Make sure your user is in the 'kvm' group. Just run
 	$ gpasswd -a <USER> kvm
 then have <USER> re-login.
 For brand new installs, the default permissions on /dev/kvm might not let
 you access it.  You can tell udev to reset ownership/perms:
 	$ udevadm trigger -c add /dev/kvm
 If you want to register binfmt handlers for qemu user targets:
 For openrc:
 	# rc-update add qemu-binfmt
 For systemd:
 	# ln -s /usr/share/qemu/binfmt.d/qemu.conf /etc/binfmt.d/qemu.conf"
 pkg_pretend() {
 	if use kernel_linux && kernel_is lt 2 6 25; then
 		eerror "This version of KVM requres a host kernel of 2.6.25 or higher."
 	elif use kernel_linux; then
 		if ! linux_config_exists; then
 			eerror "Unable to check your kernel for KVM support"
 		else
 			CONFIG_CHECK="~KVM ~TUN ~BRIDGE"
 			ERROR_KVM="You must enable KVM in your kernel to continue"
 			ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in"
 			ERROR_KVM_AMD+=" your kernel configuration."
 			ERROR_KVM_INTEL="If you have an Intel CPU, you must enable"
 			ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration."
 			ERROR_TUN="You will need the Universal TUN/TAP driver compiled"
 			ERROR_TUN+=" into your kernel or loaded as a module to use the"
 			ERROR_TUN+=" virtual network device if using -net tap."
 			ERROR_BRIDGE="You will also need support for 802.1d"
 			ERROR_BRIDGE+=" Ethernet Bridging for some network configurations."
 			use vhost-net && CONFIG_CHECK+=" ~VHOST_NET"
 			ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net"
 			ERROR_VHOST_NET+=" support"
 			if use amd64 || use x86 || use amd64-linux || use x86-linux; then
 				if grep -q AuthenticAMD /proc/cpuinfo; then
 					CONFIG_CHECK+=" ~KVM_AMD"
 				elif grep -q GenuineIntel /proc/cpuinfo; then
 					CONFIG_CHECK+=" ~KVM_INTEL"
 				fi
 			fi
 			use python && CONFIG_CHECK+=" ~DEBUG_FS"
 			ERROR_DEBUG_FS="debugFS support required for kvm_stat"
 			# Now do the actual checks setup above
 			check_extra_config
 		fi
 	fi
 	if grep -qs '/usr/bin/qemu-kvm' "${EROOT}"/etc/libvirt/qemu/*.xml; then
 		eerror "The kvm/qemu-kvm wrappers no longer exist, but your libvirt"
 		eerror "instances are still pointing to it.  Please update your"
 		eerror "configs in /etc/libvirt/qemu/ to use the -enable-kvm flag"
 		eerror "and the right system binary (e.g. qemu-system-x86_64)."
 		die "update your virt configs to not use qemu-kvm"
 	fi
 }
 # Sanity check to make sure target lists are kept up-to-date.
 check_targets() {
 	local var=$1 mak=$2
 	local detected sorted
 	pushd "${S}"/default-configs >/dev/null || die
 	# Force C locale until glibc is updated. #564936
 	detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | LC_COLLATE=C sort -u))
 	sorted=$(echo $(printf '%s\n' ${!var} | LC_COLLATE=C sort -u))
 	if [[ ${sorted} != "${detected}" ]] ; then
 		eerror "The ebuild needs to be kept in sync."
 		eerror "${var}: ${sorted}"
 		eerror "$(printf '%-*s' ${#var} configure): ${detected}"
 		die "sync ${var} to the list of targets"
 	fi
 	popd >/dev/null
 }
 handle_locales() {
 	# Make sure locale list is kept up-to-date.
 	local detected sorted
 	detected=$(echo $(cd po && printf '%s\n' *.po | grep -v messages.po | sed 's:.po$::' | sort -u))
 	sorted=$(echo $(printf '%s\n' ${PLOCALES} | sort -u))
 	if [[ ${sorted} != "${detected}" ]] ; then
 		eerror "The ebuild needs to be kept in sync."
 		eerror "PLOCALES: ${sorted}"
 		eerror " po/*.po: ${detected}"
 		die "sync PLOCALES"
 	fi
 	# Deal with selective install of locales.
 	if use nls ; then
 		# Delete locales the user does not want. #577814
 		rm_loc() { rm po/$1.po || die; }
 		l10n_for_each_disabled_locale_do rm_loc
 	else
 		# Cheap hack to disable gettext .mo generation.
 		rm -f po/*.po
 	fi
 }
 src_prepare() {
 	check_targets IUSE_SOFTMMU_TARGETS softmmu
 	check_targets IUSE_USER_TARGETS linux-user
 	default
 	# Use correct toolchain to fix cross-compiling
 	tc-export AR AS LD NM OBJCOPY PKG_CONFIG RANLIB
 	export WINDRES=${CHOST}-windres
 	# Verbose builds
 	MAKEOPTS+=" V=1"
 	# Run after we've applied all patches.
 	handle_locales
 	# Remove bundled copy of libfdt
 	rm -r dtc || die
 }
 ##
 # configures qemu based on the build directory and the build type
 # we are using.
 #
 qemu_src_configure() {
 	debug-print-function ${FUNCNAME} "$@"
 	local buildtype=$1
 	local builddir="${S}/${buildtype}-build"
 	mkdir "${builddir}"
 	local conf_opts=(
 		--prefix=/usr
 		--sysconfdir=/etc
 		--bindir=/usr/bin
 		--libdir=/usr/$(get_libdir)
 		--datadir=/usr/share
 		--docdir=/usr/share/doc/${PF}/html
 		--mandir=/usr/share/man
 		--with-confsuffix=/qemu
 		--localstatedir=/var
 		--disable-bsd-user
 		--disable-guest-agent
 		--disable-strip
 		--disable-werror
 		# We support gnutls/nettle for crypto operations.  It is possible
 		# to use gcrypt when gnutls/nettle are disabled (but not when they
 		# are enabled), but it's not really worth the hassle.  Disable it
 		# all the time to avoid automatically detecting it. #568856
 		--disable-gcrypt
 		--python="${PYTHON}"
 		--cc="$(tc-getCC)"
 		--cxx="$(tc-getCXX)"
 		--host-cc="$(tc-getBUILD_CC)"
 		$(use_enable debug debug-info)
 		$(use_enable debug debug-tcg)
 		$(use_enable doc docs)
 		$(use_enable plugins)
 		$(use_enable tci tcg-interpreter)
 		$(use_enable xattr attr)
 	)
 	# Disable options not used by user targets. This simplifies building
 	# static user targets (USE=static-user) considerably.
 	conf_notuser() {
 		if [[ ${buildtype} == "user" ]] ; then
 			echo "--disable-${2:-$1}"
 		else
 			use_enable "$@"
 		fi
 	}
 	conf_opts+=(
 		$(conf_notuser accessibility brlapi)
 		$(conf_notuser aio linux-aio)
 		$(conf_notuser bzip2)
 		$(conf_notuser capstone)
 		$(conf_notuser caps cap-ng)
 		$(conf_notuser curl)
 		$(conf_notuser fdt)
 		$(conf_notuser glusterfs)
 		$(conf_notuser gnutls)
 		$(conf_notuser gnutls nettle)
 		$(conf_notuser gtk)
 		$(conf_notuser infiniband rdma)
 		$(conf_notuser iscsi libiscsi)
 		$(conf_notuser io-uring linux-io-uring)
 		$(conf_notuser jemalloc jemalloc)
 		$(conf_notuser jpeg vnc-jpeg)
 		$(conf_notuser kernel_linux kvm)
 		$(conf_notuser lzo)
 		$(conf_notuser ncurses curses)
 		$(conf_notuser nfs libnfs)
 		$(conf_notuser numa)
 		$(conf_notuser opengl)
 		$(conf_notuser png vnc-png)
 		$(conf_notuser rbd)
 		$(conf_notuser sasl vnc-sasl)
 		$(conf_notuser sdl)
 		$(conf_notuser sdl-image)
 		$(conf_notuser seccomp)
 		$(conf_notuser slirp slirp system)
 		$(conf_notuser smartcard)
 		$(conf_notuser snappy)
 		$(conf_notuser spice)
 		$(conf_notuser ssh libssh)
 		$(conf_notuser usb libusb)
 		$(conf_notuser usbredir usb-redir)
 		$(conf_notuser vde)
 		$(conf_notuser vhost-net)
 		$(conf_notuser vhost-user-fs)
 		$(conf_notuser virgl virglrenderer)
 		$(conf_notuser virtfs)
 		$(conf_notuser vnc)
 		$(conf_notuser vte)
 		$(conf_notuser xen)
 		$(conf_notuser xen xen-pci-passthrough)
 		$(conf_notuser xfs xfsctl)
 		$(conf_notuser xkb xkbcommon)
 		$(conf_notuser zstd)
 	)
 	if [[ ${buildtype} == "user" ]] ; then
 		conf_opts+=( --disable-libxml2 )
 	else
 		conf_opts+=( --enable-libxml2 )
 	fi
 	if [[ ! ${buildtype} == "user" ]] ; then
 		# audio options
 		local audio_opts=(
 			# Note: backend order matters here: #716202
 			# We iterate from higher-level to lower level.
 			$(usex pulseaudio pa "")
 			$(usev sdl)
 			$(usev alsa)
 			$(usev oss)
 		)
 		conf_opts+=(
 			--audio-drv-list=$(printf "%s," "${audio_opts[@]}")
 		)
 	fi
 	case ${buildtype} in
 	user)
 		conf_opts+=(
 			--enable-linux-user
 			--disable-system
 			--disable-blobs
 			--disable-tools
 		)
 		local static_flag="static-user"
 		;;
 	softmmu)
 		conf_opts+=(
 			--disable-linux-user
 			--enable-system
 			--disable-tools
 		)
 		local static_flag="static"
 		;;
 	tools)
 		conf_opts+=(
 			--disable-linux-user
 			--disable-system
 			--disable-blobs
 			--enable-tools
 		)
 		local static_flag="static"
 		;;
 	esac
 	local targets="${buildtype}_targets"
 	[[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" )
 	# Add support for SystemTAP
 	use systemtap && conf_opts+=( --enable-trace-backend=dtrace )
 	# We always want to attempt to build with PIE support as it results
 	# in a more secure binary. But it doesn't work with static or if
 	# the current GCC doesn't have PIE support.
 	if use ${static_flag}; then
 		conf_opts+=( --static --disable-pie )
 	else
 		tc-enables-pie && conf_opts+=( --enable-pie )
 	fi
 	echo "../configure ${conf_opts[*]}"
 	cd "${builddir}"
 	../configure "${conf_opts[@]}" || die "configure failed"
 	# FreeBSD's kernel does not support QEMU assigning/grabbing
 	# host USB devices yet
 	use kernel_FreeBSD && \
 		sed -i -E -e "s|^(HOST_USB=)bsd|\1stub|" "${S}"/config-host.mak
 }
 src_configure() {
 	local target
 	python_setup
 	softmmu_targets= softmmu_bins=()
 	user_targets= user_bins=()
 	for target in ${IUSE_SOFTMMU_TARGETS} ; do
 		if use "qemu_softmmu_targets_${target}"; then
 			softmmu_targets+=",${target}-softmmu"
 			softmmu_bins+=( "qemu-system-${target}" )
 		fi
 	done
 	for target in ${IUSE_USER_TARGETS} ; do
 		if use "qemu_user_targets_${target}"; then
 			user_targets+=",${target}-linux-user"
 			user_bins+=( "qemu-${target}" )
 		fi
 	done
 	softmmu_targets=${softmmu_targets#,}
 	user_targets=${user_targets#,}
 	[[ -n ${softmmu_targets} ]] && qemu_src_configure "softmmu"
 	[[ -n ${user_targets}    ]] && qemu_src_configure "user"
 	qemu_src_configure "tools"
 }
 src_compile() {
 	if [[ -n ${user_targets} ]]; then
 		cd "${S}/user-build"
 		default
 	fi
 	if [[ -n ${softmmu_targets} ]]; then
 		cd "${S}/softmmu-build"
 		default
 	fi
 	cd "${S}/tools-build"
 	default
 }
 src_test() {
 	if [[ -n ${softmmu_targets} ]]; then
 		cd "${S}/softmmu-build"
 		pax-mark m */qemu-system-* #515550
 		emake check
 	fi
 }
 qemu_python_install() {
 	python_domodule "${S}/python/qemu"
 	python_doscript "${S}/scripts/kvm/vmxcap"
 	python_doscript "${S}/scripts/qmp/qmp-shell"
 	python_doscript "${S}/scripts/qmp/qemu-ga-client"
 }
 # Generate binfmt support files.
 #   - /etc/init.d/qemu-binfmt script which registers the user handlers (openrc)
 #   - /usr/share/qemu/binfmt.d/qemu.conf (for use with systemd-binfmt)
 generate_initd() {
 	local out="${T}/qemu-binfmt"
 	local out_systemd="${T}/qemu.conf"
 	local d="${T}/binfmt.d"
 	einfo "Generating qemu binfmt scripts and configuration files"
 	# Generate the debian fragments first.
 	mkdir -p "${d}"
 	"${S}"/scripts/qemu-binfmt-conf.sh \
 		--debian \
 		--exportdir "${d}" \
 		--qemu-path "${EPREFIX}/usr/bin" \
 		|| die
 	# Then turn the fragments into a shell script we can source.
 	sed -E -i \
 		-e 's:^([^ ]+) (.*)$:\1="\2":' \
 		"${d}"/* || die
 	# Generate the init.d script by assembling the fragments from above.
 	local f qcpu package interpreter magic mask
 	cat "${FILESDIR}"/qemu-binfmt.initd.head >"${out}" || die
 	for f in "${d}"/qemu-* ; do
 		source "${f}"
 		# Normalize the cpu logic like we do in the init.d for the native cpu.
 		qcpu=${package#qemu-}
 		case ${qcpu} in
 		arm*)   qcpu="arm";;
 		mips*)  qcpu="mips";;
 		ppc*)   qcpu="ppc";;
 		s390*)  qcpu="s390";;
 		sh*)    qcpu="sh";;
 		sparc*) qcpu="sparc";;
 		esac
 		# we use 'printf' here to be portable across 'sh'
 		# implementations: #679168
 		cat <<EOF >>"${out}"
 	if [ "\${cpu}" != "${qcpu}" -a -x "${interpreter}" ] ; then
 		printf '%s\n' ':${package}:M::${magic}:${mask}:${interpreter}:'"\${QEMU_BINFMT_FLAGS}" >/proc/sys/fs/binfmt_misc/register
 	fi
 EOF
 		echo ":${package}:M::${magic}:${mask}:${interpreter}:OC" >>"${out_systemd}"
 	done
 	cat "${FILESDIR}"/qemu-binfmt.initd.tail >>"${out}" || die
 }
 src_install() {
 	if [[ -n ${user_targets} ]]; then
 		cd "${S}/user-build"
 		emake DESTDIR="${ED}" install
 		# Install binfmt handler init script for user targets.
 		generate_initd
 		doinitd "${T}/qemu-binfmt"
 		# Install binfmt/qemu.conf.
 		insinto "/usr/share/qemu/binfmt.d"
 		doins "${T}/qemu.conf"
 	fi
 	if [[ -n ${softmmu_targets} ]]; then
 		cd "${S}/softmmu-build"
 		emake DESTDIR="${ED}" install
 		# This might not exist if the test failed. #512010
 		[[ -e check-report.html ]] && dodoc check-report.html
 		if use kernel_linux; then
 			udev_newrules "${FILESDIR}"/65-kvm.rules-r1 65-kvm.rules
 		fi
 		if use python; then
 			python_foreach_impl qemu_python_install
 		fi
 	fi
 	cd "${S}/tools-build"
 	emake DESTDIR="${ED}" install
 	# Disable mprotect on the qemu binaries as they use JITs to be fast #459348
 	pushd "${ED}"/usr/bin >/dev/null
 	pax-mark mr "${softmmu_bins[@]}" "${user_bins[@]}" # bug 575594
 	popd >/dev/null
 	# Install config file example for qemu-bridge-helper
 	insinto "/etc/qemu"
 	doins "${FILESDIR}/bridge.conf"
 	cd "${S}"
 	dodoc Changelog MAINTAINERS docs/specs/pci-ids.txt
 	newdoc pc-bios/README README.pc-bios
 	# Disallow stripping of prebuilt firmware files.
 	dostrip -x ${QA_PREBUILT}
 	if [[ -n ${softmmu_targets} ]]; then
 		# Remove SeaBIOS since we're using the SeaBIOS packaged one
 		rm "${ED}/usr/share/qemu/bios.bin"
 		rm "${ED}/usr/share/qemu/bios-256k.bin"
 		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
 			dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
 			dosym ../seabios/bios-256k.bin /usr/share/qemu/bios-256k.bin
 		fi
 		# Remove vgabios since we're using the seavgabios packaged one
 		rm "${ED}/usr/share/qemu/vgabios.bin"
 		rm "${ED}/usr/share/qemu/vgabios-cirrus.bin"
 		rm "${ED}/usr/share/qemu/vgabios-qxl.bin"
 		rm "${ED}/usr/share/qemu/vgabios-stdvga.bin"
 		rm "${ED}/usr/share/qemu/vgabios-virtio.bin"
 		rm "${ED}/usr/share/qemu/vgabios-vmware.bin"
 		# PPC64 loads vgabios-stdvga
 		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 || use qemu_softmmu_targets_ppc64; then
 			dosym ../seavgabios/vgabios-isavga.bin /usr/share/qemu/vgabios.bin
 			dosym ../seavgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin
 			dosym ../seavgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin
 			dosym ../seavgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
 			dosym ../seavgabios/vgabios-virtio.bin /usr/share/qemu/vgabios-virtio.bin
 			dosym ../seavgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin
 		fi
 		# Remove sgabios since we're using the sgabios packaged one
 		rm "${ED}/usr/share/qemu/sgabios.bin"
 		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
 			dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin
 		fi
 		# Remove iPXE since we're using the iPXE packaged one
 		rm "${ED}"/usr/share/qemu/pxe-*.rom
 		if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
 			dosym ../ipxe/8086100e.rom /usr/share/qemu/pxe-e1000.rom
 			dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom
 			dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom
 			dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom
 			dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom
 			dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom
 		fi
 	fi
 	DISABLE_AUTOFORMATTING=true
 	readme.gentoo_create_doc
 }
 firmware_abi_change() {
 	local pv
 	for pv in ${REPLACING_VERSIONS}; do
 		if ver_test $pv -lt ${FIRMWARE_ABI_VERSION}; then
 			return 0
 		fi
 	done
 	return 1
 }
 pkg_postinst() {
 	if [[ -n ${softmmu_targets} ]] && use kernel_linux; then
 		udev_reload
 	fi
 	xdg_icon_cache_update
 	[[ -z ${EPREFIX} ]] && [[ -f ${EROOT}/usr/libexec/qemu-bridge-helper ]] && \
 		fcaps cap_net_admin ${EROOT}/usr/libexec/qemu-bridge-helper
 	DISABLE_AUTOFORMATTING=true
 	readme.gentoo_print_elog
 	if use pin-upstream-blobs && firmware_abi_change; then
 		ewarn "This version of qemu pins new versions of firmware blobs:"
 		ewarn "	$(best_version sys-firmware/edk2-ovmf)"
 		ewarn "	$(best_version sys-firmware/ipxe)"
 		ewarn "	$(best_version sys-firmware/seabios)"
 		ewarn "	$(best_version sys-firmware/sgabios)"
 		ewarn "This might break resume of hibernated guests (started with a different"
 		ewarn "firmware version) and live migration to/from qemu versions with different"
 		ewarn "firmware. Please (cold) restart all running guests. For functional"
 		ewarn "guest migration ensure that all"
 		ewarn "hosts run at least"
 		ewarn "	app-emulation/qemu-${FIRMWARE_ABI_VERSION}."
 	fi
 }
 pkg_info() {
 	echo "Using:"
 	echo "  $(best_version app-emulation/spice-protocol)"
 	echo "  $(best_version sys-firmware/edk2-ovmf)"
 	if has_version 'sys-firmware/edk2-ovmf[binary]'; then
 		echo "    USE=binary"
 	else
 		echo "    USE=''"
 	fi
 	echo "  $(best_version sys-firmware/ipxe)"
 	echo "  $(best_version sys-firmware/seabios)"
 	if has_version 'sys-firmware/seabios[binary]'; then
 		echo "    USE=binary"
 	else
 		echo "    USE=''"
 	fi
 	echo "  $(best_version sys-firmware/sgabios)"
 }
 pkg_postrm() {
 	xdg_icon_cache_update
 }
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.ebuild
@ -16,7 +16,6 @@ inherit eutils linux-info toolchain-funcs multilib python-r1 \
 if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://git.qemu.org/git/qemu.git"
 	EGIT_SUBMODULES=(
 		slirp
 		tests/fp/berkeley-{test,soft}float-3
 		ui/keycodemapdb
 	)
@ -38,6 +37,7 @@ IUSE="accessibility +aio alsa bzip2 capstone +caps +curl debug doc
 	jemalloc +jpeg kernel_linux
 	kernel_FreeBSD lzo ncurses nfs nls numa opengl +oss +pin-upstream-blobs
 	plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux
 	slirp
 	smartcard snappy spice ssh static static-user systemtap tci test usb
 	usbredir vde +vhost-net vhost-user-fs virgl virtfs +vnc vte xattr xen
 	xfs +xkb zstd"
@ -146,6 +146,7 @@ SOFTMMU_TOOLS_DEPEND="
 	)
 	sdl-image? ( media-libs/sdl2-image[static-libs(+)] )
 	seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] )
 	slirp? ( net-libs/libslirp )
 	smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] )
 	snappy? ( app-arch/snappy:= )
 	spice? (
@ -468,6 +469,7 @@ qemu_src_configure() {
 		$(conf_notuser sdl)
 		$(conf_notuser sdl-image)
 		$(conf_notuser seccomp)
 		$(conf_notuser slirp slirp system)
 		$(conf_notuser smartcard)
 		$(conf_notuser snappy)
 		$(conf_notuser spice)
--- a/app-emulation/vagrant/metadata.xml
+++ b/app-emulation/vagrant/metadata.xml
@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<!-- maintainer-needed -->
 		<email>gyakovlev@gentoo.org</email>
 		<name>Georgy Yakovlev</name>
 	</maintainer>
 	<use>
 		<flag name="virtualbox">
 			Use VirtualBox provider.
--- a/app-forensics/Manifest.gz
+++ b/app-forensics/Manifest.gz
--- a/app-forensics/lynis/Manifest
+++ b/app-forensics/lynis/Manifest
@ -1 +1 @@
-DIST lynis-2.7.5.tar.gz 288688 BLAKE2B e82dd67a49c234745e8af8faca9c4a9664568db9e6c9f9e33c1a3213582f2110a27109fa370642135bd3ec90fc9086314836cfe6d9712bedb110ef61e93aa115 SHA512 0ec814cb65252e3e8a44013ad0902e188a4825c521d47280586c0dd9924dfb7b79cce9797055ab7b7be59dacc111607d114175e0a793844227eadda76f68980b
+DIST lynis-3.0.0.tar.gz 320637 BLAKE2B a69346a0a0ba8236b6872a0523a36ae03be934bc128ad57f67179f120291197019f9387ffb6ec6390b344f7d17224b104c657fe8b474b339f0521a2a544f69cd SHA512 2f156002ff1cfcd2333c95b57e82e76260364fa58419b9414f2bb461aa77a22c2f1af57a6a934e88030baeb69aa9c274045cfcef359eb496d10acd5b886cb856
--- a/app-forensics/lynis/lynis-3.0.0.ebuild
+++ b/app-forensics/lynis/lynis-3.0.0.ebuild
@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-EAPI="6"
+EAPI="7"
 inherit eutils bash-completion-r1
@ -45,6 +45,6 @@ src_install() {
 pkg_postinst() {
 	einfo
-	einfo "A cron script has been installed to ${ROOT}etc/cron.daily/lynis."
+	einfo "A cron script has been installed to ${ROOT}/etc/cron.daily/lynis."
 	einfo
 }
--- a/app-metrics/Manifest.gz
+++ b/app-metrics/Manifest.gz
--- a/app-metrics/process-exporter/Manifest
+++ b/app-metrics/process-exporter/Manifest
@ -1 +1,38 @@
 DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod 31 BLAKE2B f69b0989e51b0b649f81b044169fe4309f130eba5bcc6ff33aa9666b1b754aa0e524b8c7a627a91000ccc4f93bf93cdee3e97bd3b2184b050878bc3f413f0c72 SHA512 f21fd002853e4435421f8396e6be016f65be1537815c60d23940caf26e3f14dd6f2caac802cb64cd586b1b1f1220b2727de347b3d1816b8e741f68d87ebcf03f
 DIST github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.zip 15013 BLAKE2B daecbcbb12a60a1423c4f419db44a0d63108fe622cf843593abb16fd75dcea703b3cf56f1c13433959eccbfb2a9bd5640f837f4be3296220366438dd7ed04f86 SHA512 44ccb3d6134742a80ac15830613c169d1b0d43e6ce40c2f2fdea07203bec134e1ba80dc57c6d14a007014ea141dca311b3ebe61b12d2181311665a9ffe83ca39
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.1.0.mod 34 BLAKE2B a4239cba934b6e80714b93d47e88f22ad28ce41d1d984c4261cc3f5f3b857fb28785223fa911b258e2665be2a9d24ffbd925e9e0f374452a2aacd712ad9d5f75 SHA512 e059a34363bb826bbcb8981adbfc10da90e04b86dc5376ab20bdfe1fab135953cff41ef1daa116aff10e9f3e6503168f6baf902f09aa0e8cd9a0da96b932f4b6
 DIST github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.1.0.zip 473783 BLAKE2B 78f0e771c6ad1bca65780994413055cb5f83d1b2ba3cf16cf21285c5cee875a2d3eb3ca8d8b57d89899808c76eb5b6c61b32e311bb0d92d45ab91b60168a47ea SHA512 c22665c5f590a415041a302d128a1e0a5606de4b21c8bcb79a77852795fb19bedeef4107b6edeffe87d1fe2295aa26579fd8c8d2b14cd4c960ce7a29138f1e06
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod 40 BLAKE2B c717b6aaf18662c20120746a021b0ca878e7b190b3456cab24ec98032390a85b0af8540295e470647d403bf1beb582c8f8a74fa7129c4cbf747257206235c5a5 SHA512 351dc24af135b9c9d714aadce40fe9fa1ec05a35a4df90af79926d5119c3f33a6510ab9d78243748d7dad10bd2178f47d342ea2389972b88d5e9b4be6dee7daa
 DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.zip 99651 BLAKE2B 14632f8da685fecc046b2cc9e61eecca02e7bd4720ebb1d3cd01a299e59d47cc604abc57d5518e18dea69785e3d5d539d87da211279e238a78dd23e3d7f8c7bd SHA512 4b47aa3677a464af17f3e320f41f59e775b45f04cabf2cf749e00ba1aa97e27ee78a07daad347bac4b5c41e2c430634fba57c6edbcd7ad405b5a084142871362
 DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod 67 BLAKE2B 2e1b4a8a38998179a32db321d331db54f881770a89719410876cdde1799cb8558ca2862bc70838d606540606d05918c4b115cf1c125945a77ed376c2efc4aa85 SHA512 4d841fc7a022e4e09e0a95925ad92a75809a67c30fb88de9190e4a2196383038dab9a5b3294b6a0b4786248977a0e09eea857a34100cbf22f8a52912ce9fa58d
 DIST github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip 11159 BLAKE2B c176e4bc9b5534b0df153e027f22be7d28eefbea1c0adab10979f19d601b95d300c54086b5ee388f453c73b9931339b9b04208fc5e6512385b348c49faff5488 SHA512 bad73f3c47f70de55a90a977a1e2b4a68de545a8425c71533de081c7a8f71d7ab1b489001c56ba2e88dcb78c08804275f7f8128c812f50d005a074ed6dd9286f
 DIST github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod 25 BLAKE2B 63db8520df2f699bca5a7ccecc44ee04973307d86099cfe66ded30e2ca1bdd76fc3db48cfca0138673c20c6f94061caf219f018b21b9d67231fe959eef338596 SHA512 967fcdce835c12afbf3b12bb204a256f32d46a3da535e2a7250159f62781a163ee107dd2a4fa20743b76bbf52b97e627e11e895c8d5ef73aede37d6a89e326eb
 DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod 64 BLAKE2B 475c51201a379df2cc4ff8c5681b6a7a1524f60d0b8fd0853fef569dea754efabf3425cd4b84e8427db8a6cf3e9b1141d5050d48d5d429cc1ce82162aa70050c SHA512 11d2502a7d241a0edf4e67bcb651a890a12f49d00f8b944cc9eb8f6e9cf5fbb2b2827e696021649bc795ffa275e95ee700e4a1706e03e88fa9ae079f5b9f48ce
 DIST github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip 12591 BLAKE2B 944b0b9a802757e78e3dfb11d6c4d79e0e0d90489d49262b7079e6ea4728328457f8773b392c8a618aacb5fdec78948a16cc852eff71ca6f4fb9eb422c03890b SHA512 3f0d00b0545769ad882e25a9a6f30b96ce4b72a8a46bb3c064907c94e2dda4e499eb32354c149f89752f9bc5d1ee5cb2ee5cafa46e2f65ea329fb432d0c0029f
 DIST github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod 56 BLAKE2B 50d2d6dc9c1ee92d629af8c9aae9fe5f70a0c6fe270a95a8232cee3c50132ef90c68218ac64a3b5b72d94e23ecbea5f567fef39a81be3d4585bae3f4f5348545 SHA512 5235188477921a263176fefaffccdaca4bf8175a2e248356a06596e37fa868400203172c7fe9fb80d0a65d335d23d80edefd242657de0eb83d9360589e063bba
 DIST github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.zip 44378 BLAKE2B 15ccda2b94bb024656859fb8a6968782b9a1bffb786b0b1ed69a3284b01f4a2100b3f3c46b6ebcb8f7febedb5bd4f6762fe333b7d4f1d14c700f8fce60843352 SHA512 e9349ee2a7d5e5b129ec6a1c0507854aebca82cf9ac2d0a681cac2f4630ea35551ede48e1931494362232a83dc9f26b6b4162c6114e0176084c50101b1da46b0
 DIST github.com%2Fncabatoff%2Ffakescraper%2F@v%2Fv0.0.0-20161023141611-15938421d91a.mod 40 BLAKE2B cf71a7ca097d44c84961da2eed5d0467d50be10ba5e0873b45690eb73f95927581fa1bb7bbfc122f3d476268f47f88fa1c7689cc8fbcb7ed8e0295a76991a4f4 SHA512 ac167f1b8790e6e8323bd975bfaddd524f6c5f4d17437a8934080f0d13001280b51d2bf47cbe7bf726376dce4714bad2b3134ba9a4bcf5760eb4b47b20496dae
 DIST github.com%2Fncabatoff%2Ffakescraper%2F@v%2Fv0.0.0-20161023141611-15938421d91a.zip 1389 BLAKE2B ea470af58a1f0d72984078c99f05c692ad58460bc7752e3e9724e8f132db2713291f78b03b3fc08ed0b4f3e97bd6705d7a88917c48711cc6c7ded380cbc66e3b SHA512 218903445a17b4efc07bfdf3966ac044239b1aff171fdab6c92feaf964a8f06aeaf1f637098bf586909faee4fe5d7a7c41e04eae3f715c818821fa2ba72facaf
 DIST github.com%2Fncabatoff%2Fgo-seq%2F@v%2Fv0.0.0-20180805175032-b08ef85ed833.mod 35 BLAKE2B 3c4fc1367c6c735ba21df6d6686f9db4baf98ade3d5bf7c4604a672d4ab8ee00ea8c790e713505f5cfc2d1785953abea3e35a41c673706419dd2433edea9635e SHA512 991cdd6e2928ea76db243926f6c84e59509532f5f8b92fbc7631be6679724173e60b8402af438ef1f161c6982f8c9957d00c628bdefcc01a71ab9c1029de1c99
 DIST github.com%2Fncabatoff%2Fgo-seq%2F@v%2Fv0.0.0-20180805175032-b08ef85ed833.zip 4863 BLAKE2B ae6a85af245ae269f4ddd3d50217e1049dea01e637ce0f80f977fe327027ce3d8bf72c61d429b47c49c5e27afd9c69a9b41028269075f206dd444a2d9fa21834 SHA512 b16ae60a7373f92f0bbc19a35dc5d3211e576436abd815cff678b5687b67c3ba23af42b34abf14efbe9c87126387fb18afb4c222c87e5c085ac3584bc91af2cc
 DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.8.0.mod 43 BLAKE2B 2bfedb841a10d8d6a861189203de74eb9bc6bc37bb10cdfc2404b1e972b7672568ed27d235e143d831cf2f840943c039398296cb78f1309f00d1ad9e0ce21056 SHA512 191cf6496c41b2b82c9a8f2ab2aeab63ede47807160f7cf746c548b3e92e367fc8f80ff8c6efbb7e91ca5903d5672b235c1ab9f14d3f9f988e8ff1c821d3b8bf
 DIST github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.8.0.zip 111363 BLAKE2B 07c1938d531b8176c55e2afbe0ce9cc7bc9cd86ec9699a7f9898b9b19f31cef22c2b98f47200d1b12aa7c0ed747051d84a2ee69aeeec91f889f8594871136f75 SHA512 18c5d4d5a563716e58ac31003bb9a25c6b32f9ae74bbb21c11c63f620539619cd9f79c7dfa7a59ba9567e551e34f4132084cccf63be1e11a540fbeb4b919598c
 DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod 42 BLAKE2B 5519896b44b7bc3089a8965dc61aae63745c64ba1a390d3fff1202be7f8dd34f59862c04b49e377d6616a93a0341662becce65d431d445703a160ba49eda208b SHA512 c84dfe43954b19c1e4ac5ff8738e79db469f3bc1dc55e69b12503d0a5cf125cc74f4797ddbfe64b2a1bd1e2940575c32678671d51f67161c4f5b53b2a85ac46a
 DIST github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.zip 68325 BLAKE2B 9b783cb98fd4f1ceb158d8a72ffdc7d0c232a8a9740de221b4321b2c7e240d98bb5f2bfca74222c6a7796368d48b1d3e315229a9d2c0436d5590bc200be31817 SHA512 25290d540c185fa2010b06596a70b6d06d4ae14fd92b4e5596b48074e4e5ef5ec6b990c8d0bc39cb44f0c2a83a0a1ac4415f86ea4e3fb69970bb2496f148d0c9
 DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20180801064454-c7de2306084e.mod 36 BLAKE2B 39120b6af83d45857c990115ff52d8828278a9ce158b01621d8dcc517c23ff139532a2c2e53ec97616f0c65a2e0db3ede7c5fe59eb33be277e2c60650362b232 SHA512 1b262da0100655c3a56c0e551866491b81d2b88fd5fed9cc43a57bce3634c88c82c798ed1a823237011f6be68b5f0e1fe8284526cd68204851de30a44fc34fbf
 DIST github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20180801064454-c7de2306084e.zip 129149 BLAKE2B c28cf5021255ad8f2150db609ee74fe675f9990f14bf95024029330b950489a1ef1756e9c0635f5d0fcaf89863ef08904a3e7ada1f8cad8f42395a9221fd461b SHA512 a6e76b1d9e34fc77e2b39c2828c04cb3979407cefcd413aff5218bf96379dbf3b78c5956f8de3c980311375026018178367d105a0296faf23f92926a794dd7c8
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.12-0.20200505152635-9654394ca94a.mod 198 BLAKE2B 9b5c175c915db6a1fdf18f440acf348e395fd2059e1f44fb1fd556e7c2c6821cfa397f88d2123f681b41fe5c5689ebc58c7c75865ef63f7f1c61fd8d323d8117 SHA512 7a54bddb87350ba24423842fcf1cd8b031be427e9f689467503d8d6a876691b209a5d2ac33d848a977d2c3890284d816fe4f2fa9391642010c96c3c0d691efcb
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.12-0.20200505152635-9654394ca94a.zip 260771 BLAKE2B 24d7c6328ce7b1c799da96a0b4f50a0fd7d49d3b5ac1e08103b120505ea45627655bac35f8007869bee73ef8900b1a2cf07e5f557814e6d786130a369f7e8aea SHA512 9e72c0ab744fabc832060ca7a5295a1e3546b2c48dc55512ee57bbfc24f0f11ebb56bb842f8b2fd83ad78a13a7eef13a9f5416435018694520c142d85c5e9d45
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.12-0.20200513160535-c6ff04bafc38.mod 198 BLAKE2B 9b5c175c915db6a1fdf18f440acf348e395fd2059e1f44fb1fd556e7c2c6821cfa397f88d2123f681b41fe5c5689ebc58c7c75865ef63f7f1c61fd8d323d8117 SHA512 7a54bddb87350ba24423842fcf1cd8b031be427e9f689467503d8d6a876691b209a5d2ac33d848a977d2c3890284d816fe4f2fa9391642010c96c3c0d691efcb
 DIST github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.12-0.20200513160535-c6ff04bafc38.zip 262398 BLAKE2B 9c8596bf810c2fef1a2371a5e17867bcb7859bb11a82f77cab74b81fca58f09f3630f61fc6a69df2ccb63953398527eb552f0782a2fabd85dc8805788df282a2 SHA512 a33749d6d4c14cab201c1d7689eb142c07a3627d93fde5914004f30406f0bc94b983dc14ac5a232e2fc2c2145c757c3f530d66a49a4d9b0f858d41d99875d9a6
 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
 DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.zip 26635 BLAKE2B a464a4ad04b36e50cfe966e6e6dc299c0f8b45d0f4198ba64483bb70ab815d033cec5cde60753b76dd1fbb16fed087b41179100a2002b0a61cd4a08f9de779fc SHA512 ae6f29d5f7790b37d1722d65f31708670bf19f429c60b2f6633756ecd40e47c1fab40fc128e0d70b3b6ed0ba47ce5f970ce5f4e55b8f1fa407d2efee7444b646
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200106162015-b016eb3dc98e.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
 DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200106162015-b016eb3dc98e.zip 1913169 BLAKE2B c50435879fb1df50f91b1f37dd92f6504047944d41797350f0871a581d5bf17cf474845d3b422fb219c56f7627f2fdb302059d68657bd7860ebc604861cfae72 SHA512 b732d79f0828b9a900595b8dc98377436dcdcc24e2d3d9fe0472a8170d477c0e2487bb4b8e2da4eb7ca9b19251e29ea3b38a9de777d03c069425897ac47e325e
 DIST gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
 DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
 DIST gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.zip 41465 BLAKE2B 9a7183d3ac6591399b5208026208047a670c85e8b6014ad29955b168c63bb4953fa972d31025613c2ab12d7207adeebe9578b3c15b65ebb792f1e41df2668297 SHA512 fa7c68a2b5a6bb14f99cda92a3e77aad0e4160f659c54ea73e9813af9ff9449df6b0cab42ee283971e778b6b9da4a6098df805dd284c3b1aedfcd3a0b8504bde
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
 DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.zip 77767 BLAKE2B d77644df22edfcda7d99d4a4a23a1fd1154fa21489dc36b9a8f9ffc45e341d8d793faae76d4d3d32290766c7b13cea30d17efaa7e8e74786ead90b0605f70967 SHA512 bc935858e1d5c341c7d53c41bdf6f856976a469c8f54f017e41e8be742064ce9980cc6881353e022f854d6e19096a37f5ff62bf7b01019b0425a0c03dc6fe14a
 DIST process-exporter-0.4.0.tar.gz 378006 BLAKE2B 053379e8e0cb95f099cebf53289c48c39d6c8ef22c8b0dcf0bd128453e601da98be9205bb5c7cda8a05d5f50addabbcb46f6ece44926da17c1bd8616e452783a SHA512 88f6f0e07bb7f3ea6c593ba359c09ace47eb0830ff0759b1f4dd64219a6c9069dc2891a328a90bdef13ea02efc576fb71de7ff095788b4dd45c2683c90904363
 DIST process-exporter-0.7.1.tar.gz 1659703 BLAKE2B 8eab993f13e8096a2c5734cb62bb13b2d5427479e1b33581dd568433c8d20f9b242078ac8a4d32e526fb020102ad8c2fa9f34695bbe5513734a966be1b807f6f SHA512 f75a060e70e6267014104aac906a5571b0333a7f082129b58b0d8fd77fe12c02c310d7370db591a37a012ddd87271db033fe2519a1e645e12264e4dab097104f
--- a/app-metrics/process-exporter/process-exporter-0.7.1.ebuild
+++ b/app-metrics/process-exporter/process-exporter-0.7.1.ebuild
@ -0,0 +1,69 @@
 # Copyright 2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 inherit go-module systemd
 DESCRIPTION="Process exporter for prometheus"
 HOMEPAGE="https://github.com/ncabatoff/process-exporter"
 EGO_SUM=(
 	"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973"
 	"github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod"
 	"github.com/golang/protobuf v1.1.0"
 	"github.com/golang/protobuf v1.1.0/go.mod"
 	"github.com/google/go-cmp v0.3.1"
 	"github.com/google/go-cmp v0.3.1/go.mod"
 	"github.com/kr/pretty v0.1.0"
 	"github.com/kr/pretty v0.1.0/go.mod"
 	"github.com/kr/pty v1.1.1/go.mod"
 	"github.com/kr/text v0.1.0"
 	"github.com/kr/text v0.1.0/go.mod"
 	"github.com/matttproud/golang_protobuf_extensions v1.0.1"
 	"github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod"
 	"github.com/ncabatoff/fakescraper v0.0.0-20161023141611-15938421d91a"
 	"github.com/ncabatoff/fakescraper v0.0.0-20161023141611-15938421d91a/go.mod"
 	"github.com/ncabatoff/go-seq v0.0.0-20180805175032-b08ef85ed833"
 	"github.com/ncabatoff/go-seq v0.0.0-20180805175032-b08ef85ed833/go.mod"
 	"github.com/prometheus/client_golang v0.8.0"
 	"github.com/prometheus/client_golang v0.8.0/go.mod"
 	"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910"
 	"github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod"
 	"github.com/prometheus/common v0.0.0-20180801064454-c7de2306084e"
 	"github.com/prometheus/common v0.0.0-20180801064454-c7de2306084e/go.mod"
 	"github.com/prometheus/procfs v0.0.12-0.20200505152635-9654394ca94a"
 	"github.com/prometheus/procfs v0.0.12-0.20200505152635-9654394ca94a/go.mod"
 	"github.com/prometheus/procfs v0.0.12-0.20200513160535-c6ff04bafc38"
 	"github.com/prometheus/procfs v0.0.12-0.20200513160535-c6ff04bafc38/go.mod"
 	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e"
 	"golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod"
 	"golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e"
 	"golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod"
 	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
 	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127"
 	"gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod"
 	"gopkg.in/yaml.v2 v2.2.1"
 	"gopkg.in/yaml.v2 v2.2.1/go.mod"
 	)
 go-module_set_globals
 SRC_URI="https://github.com/ncabatoff/process-exporter/archive/v${PV}.tar.gz -> ${P}.tar.gz
 	${EGO_SUM_SRC_URI}"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
 src_compile() {
 	emake build
 }
 src_install() {
 	dobin ${PN}
 dodoc *.md
 	insinto /etc/${PN}
 	doins packaging/conf/all.yaml
 	systemd_dounit packaging/${PN}.service
 	newinitd "${FILESDIR}"/${PN}.initd ${PN}
 	keepdir /var/log/${PN}
 }
--- a/app-metrics/redis_exporter/redis_exporter-1.2.1.ebuild
+++ b/app-metrics/redis_exporter/redis_exporter-1.2.1.ebuild
@ -2,20 +2,17 @@
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
-inherit user golang-build golang-vcs-snapshot systemd
+inherit go-module user systemd
-
+EGIT_COMMIT=55b9cfabb601b5a71822fa396f914a07a31dcbe4
 EGO_PN="github.com/oliver006/redis_exporter"
 EGIT_COMMIT="55b9cfabb601b5a71822fa396f914a07a31dcbe4"
 ARCHIVE_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 KEYWORDS="~amd64"
 DESCRIPTION="Prometheus Exporter for Redis Metrics. Supports Redis 2.x, 3.x and 4.x"
 HOMEPAGE="https://github.com/oliver006/redis_exporter"
-SRC_URI="${ARCHIVE_URI}"
+SRC_URI="https://github.com/oliver006/redis_exporter/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT Apache-2.0 BSD"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
 S=${WORKDIR}/${P}/src/${EGO_PN}
 pkg_setup() {
 	enewgroup ${PN}
@ -48,9 +45,8 @@ src_prepare() {
 }
 src_compile() {
-	export -n GOCACHE XDG_CACHE_HOME #684052
+	export GOBIN="${S}/bin"
-	export GO111MODULE=on GOFLAGS="-mod=vendor -v -x" GOBIN="${WORKDIR}/${P}/bin"
+	go install -mod=vendor \
 	go install -work ${EGO_BUILD_FLAGS} \
 		-ldflags="-X main.BuildVersion=${PV} -X main.BuildCommitSha=${EGIT_COMMIT} -X main.BuildDate=$(date +%F-%T)" \
 		"${EGO_PN}" || die
 }
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
--- a/app-misc/abook/abook-0.6.1.ebuild
+++ b/app-misc/abook/abook-0.6.1.ebuild
@ -1,46 +0,0 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=5
 inherit autotools
 MY_P="${P/_/}"
 DESCRIPTION="Abook is a text-based addressbook program designed to use with mutt mail client"
 HOMEPAGE="http://abook.sourceforge.net/"
 SRC_URI="http://abook.sourceforge.net/devel/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
 IUSE="nls"
 RDEPEND="sys-libs/ncurses
 	sys-libs/readline
 	dev-libs/libvformat
 	nls? ( virtual/libintl )"
 DEPEND="nls? ( sys-devel/gettext )"
 S="${WORKDIR}/${MY_P}"
 src_prepare() {
 	# TODO: do the right thing and find out whats wrong with Makefile.in
 	eautoreconf
 }
 src_configure() {
 	econf \
 		--with-curses \
 		--with-readline \
 		--enable-vformat \
 		$(use_enable nls)
 }
 src_compile() {
 	# bug 570428
 	emake CFLAGS="${CFLAGS} -std=gnu89"
 }
 src_install() {
 	emake DESTDIR="${D}" install
 	dodoc BUGS ChangeLog FAQ README TODO sample.abookrc
 }
--- a/app-misc/abook/metadata.xml
+++ b/app-misc/abook/metadata.xml
@ -4,7 +4,6 @@
 	<maintainer type="person">
 		<email>cedk@gentoo.org</email>
 	</maintainer>
 	<longdescription>abook is a text-based addressbook program for the mutt mail client.</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">abook</remote-id>
 	</upstream>
--- a/app-misc/carbon-c-relay/Manifest
+++ b/app-misc/carbon-c-relay/Manifest
@ -1,3 +1,3 @@
 DIST carbon-c-relay-3.5.tar.gz 304570 BLAKE2B 4b2595eb3aecab7793e2f8a96a6f0a28b967d5e753ee25b175d70fcd2c9d6c492252b2ece5012fd446ba586da9f82e80cc10a9ed3f520bd6600f17e7137fd5ec SHA512 5461e9c32b2953e2c182f71bcaebde33f571dc9672d63231aedf88aca65b2576d0787ab24e871905d46fd0a4176b31f817f75aee09f93a66a280ca67caf74e66
 DIST carbon-c-relay-3.6.tar.gz 557612 BLAKE2B 9921a6488a0f04d6b8a7bbe54d13d23dcf979331103e1b862a8a504ead92afdc7530c665cd5a8973ac0cee952c7454ca8fcfb7b9e632ebf8c175083e83c10cc1 SHA512 7336e29890610d5248059c9de7653892d761005881897bff8279c0b12396a5d9aaedf4987121338f43951b8d322cddaaab43a2151b89e98eee9e4da8c7188cd4
-DIST carbon-c-relay-3.7.1.tar.gz 560830 BLAKE2B 31a539af2ecb82e13a5c60399920c3d0e98ba250e72d245d652b9d5307454abc696843385f0d8f100114b5c9da8b0d05319eb8d0a11787c4ab934c7f61dce74c SHA512 5447942007304f1f52a895690375d20cd8c7c76a7abb920c7766ac13a9b7719720454dfc8bbf204fdd22aabdd74c965d2f4256e2518c2949298a482bb7823600
+DIST carbon-c-relay-3.7.2.tar.gz 561080 BLAKE2B 55674699b2afcffa911954a52e3c51b92380c81083db0330e7e6eab495e72938b7761a8c7bc17ac65ea56db1c11f4c360bab3b7442ca13f3466170d6bb3f6fd6 SHA512 dab2eaf2da07afd429012b93f0c826e2fe6e43371afa07d34793dd212820790af2487f5710524deac52c3ed18b874ce8ff54d90b3872e269dc570b7ad30c1826
--- a/app-misc/carbon-c-relay/carbon-c-relay-3.7.2.ebuild
+++ b/app-misc/carbon-c-relay/carbon-c-relay-3.7.2.ebuild
--- a/app-misc/golly/golly-3.3-r2.ebuild
+++ b/app-misc/golly/golly-3.3-r2.ebuild
@ -1,70 +0,0 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 WX_GTK_VER=3.0
 PYTHON_COMPAT=( python{2_7,3_{7,8,9}} )
 inherit autotools desktop python-single-r1 wxwidgets xdg-utils
 DESCRIPTION="simulator for Conway's Game of Life and other cellular automata"
 HOMEPAGE="http://golly.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="tiff"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 DEPEND="virtual/opengl
 	sys-libs/zlib
 	x11-libs/wxGTK:${WX_GTK_VER}[X,opengl,tiff?]
 	${PYTHON_DEPS}
 "
 RDEPEND="${DEPEND}"
 S=${WORKDIR}/${P}-src
 PATCHES=(
 	"${FILESDIR}"/${P}-nondynamic-python.patch
 	"${FILESDIR}"/${P}-allow-py23-exec.patch
 	"${FILESDIR}"/${P}-glife-py23.patch
 	"${FILESDIR}"/${P}-allow-py3.patch
 )
 pkg_setup() {
 	python-single-r1_pkg_setup
 	setup-wxwidgets
 }
 src_prepare() {
 	default
 	# patches change configure.ac and Makefile.am
 	pushd gui-wx/configure
 		eautoreconf
 	popd
 }
 src_configure() {
 	ECONF_SOURCE=gui-wx/configure econf \
 		--with-wxshared
 }
 src_install() {
 	emake docdir= DESTDIR="${D}" install
 	dodoc docs/ReadMe.html
 	newicon --size 32 gui-wx/icons/appicon.xpm ${PN}.xpm
 	make_desktop_entry ${PN} "Golly" ${PN} "Science"
 }
 pkg_postinst() {
 	xdg_icon_cache_update
 }
 pkg_postrm() {
 	xdg_icon_cache_update
 }
--- a/app-misc/physlock/physlock-13-r1.ebuild
+++ b/app-misc/physlock/physlock-13-r1.ebuild
@ -0,0 +1,41 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 inherit toolchain-funcs pam
 DESCRIPTION="Lightweight Linux console locking tool"
 HOMEPAGE="https://github.com/muennich/physlock"
 SRC_URI="https://github.com/muennich/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
 IUSE="elogind systemd"
 REQUIRED_USE="?? ( elogind systemd )"
 RDEPEND="sys-libs/pam"
 DEPEND="${RDEPEND}
 	elogind? ( sys-auth/elogind )
 	systemd? ( sys-apps/systemd )
 "
 pkg_setup() {
 	export MY_CONF="HAVE_SYSTEMD=$(usex systemd 1 0) HAVE_ELOGIND=$(usex elogind 1 0)"
 }
 src_prepare() {
 	default
 	tc-export CC
 }
 src_compile() {
 	emake ${MY_CONF}
 }
 src_install() {
 	emake ${MY_CONF} DESTDIR="${D}" PREFIX=/usr install
 	newpamd physlock.pam ${PN}
 }
--- a/app-misc/skim/metadata.xml
+++ b/app-misc/skim/metadata.xml
@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<!-- maintainer-needed -->
 		<email>gyakovlev@gentoo.org</email>
 		<name>Georgy Yakovlev</name>
 	</maintainer>
 	<use>
 		<flag name="tmux">Install sk-tmux script to run skim in a tmux pane</flag>
 		<flag name="vim">Install vim plugin for skim</flag>
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
--- a/app-office/impressive/Manifest
+++ b/app-office/impressive/Manifest
@ -1,2 +1 @@
 DIST Impressive-0.13.0-beta1a.tar.gz 213098 BLAKE2B c76ce023f9c44865db68d1d2049aba022581d5e62cf027cc4df63ae541a8471867e75749a2f72c8e1f9e2e7ca2640611e090080ac563cff54f521ea47a351304 SHA512 5484f9764848129150d03233a9b270d2c31ec5f5083100662dd3cca85d3c7ead0000bd23b7d531ad45667410e1a1ea5d97ca1a2f4e8a2449dc730273144e56e8
 DIST Impressive-0.13.0-beta2.tar.gz 311905 BLAKE2B fb912ada1f44b2af9bd1eed4c7e1d4bfae5ba42449a9b1a154500a9d892c1070c9da127c8c3cbd35ce033a768a00db359deb1a045996cfeb7253f92d289aed82 SHA512 45c094d30e898a1843869cdcd490315c8280bbe2f5cc58f7695be2f0876075718517a502af16e040981b3f3a8fd955000d9ff76e20850b4bedf52c0d2bbd098e
--- a/app-office/impressive/impressive-0.13.0_beta1.ebuild
+++ b/app-office/impressive/impressive-0.13.0_beta1.ebuild
@ -1,55 +0,0 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
 PYTHON_COMPAT=( python3_{7,8} )
 inherit eutils python-r1
 MY_PN="Impressive"
 DESCRIPTION="Stylish way of giving presentations with Python"
 HOMEPAGE="http://impressive.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_PN}/${PV/_/-}/${MY_PN}-${PV/_/-}a.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 DEPEND=""
 RDEPEND="${PYTHON_DEPS}
 	dev-python/pygame[${PYTHON_USEDEP}]
 	dev-python/pillow[${PYTHON_USEDEP}]
 	x11-apps/xrandr
 	app-text/mupdf
 	|| ( media-fonts/dejavu media-fonts/corefonts )
 "
 DOCS=(
 	changelog.txt
 	demo.pdf
 )
 HTML_DOCS=(
 	impressive.html
 )
 S="${WORKDIR}/${MY_PN}-${PV/_/-}a"
 src_install() {
 	default
 	python_foreach_impl python_doscript ${PN}.py
 	doman impressive.1
 }
 pkg_postinst() {
 	elog "The experience with ${PN} can be enhanced by folowing packages:"
 	optfeature "starting web or e-mail hyperlinks from PDF documents" x11-misc/xdg-utils
 	optfeature "sound and video playback" media-video/ffmpeg
 	optfeature "sound and video playback" media-video/mplayer
 	optfeature "sound and video playback" media-video/mplayer2
 	optfeature "extraction of PDF page titles" app-text/pdftk
 }
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@ -325,3 +325,4 @@ DIST bash50-014 1747 BLAKE2B d52f9160d74b340fd5722725b572ac1abe74caf41add5421dfa
 DIST bash50-015 2565 BLAKE2B 7df76369726332299c089db156c1e9bc6619fe2e925732da46ca47ca627f1bd7df4ea188a2c0f636e42623f2ee7ca40bc98551b5bd339ed4d5bee20b24ba38d0 SHA512 3a1a552d1f03dec9ed41be8d8c319fb3cbd01df9978ab25a7b37322913014beca6703980f342ea908250b666d72db95402d7b8219ffdd3df717acb36ed4b72b9
 DIST bash50-016 1534 BLAKE2B 8c9bb752a441b70b11655a9bd48e48ec9756a34d0513837faa94c64675c11d57ba1fb0bfc43a033040539f9c475a0efd00f375cf8ffe04a6d9d1d1c19575572e SHA512 dbc3bd0fe3bddad8f6417b210fc5638a9c0c545f9d27638d63bac48aba9d3b93181a4f2e9898584d231b658589573fad5e4627ccbcf3e9d87e7663ac730b51aa
 DIST bash50-017 6517 BLAKE2B d8ec55e796fa2b17774fdf846c7b24ab1428a1dd94210e0d6b3174f99afe7f9c7f33448e1116c81f43407cb8d95390dd634cb8bd543046699898f471ffd68433 SHA512 d4a4b2746a106a7e78f7df2467cfd4ca486ab36b3e6e97eb9d47ede728033b1246bc1b60edc271cdb49df998af196619b09e598c0da1b425f05455237e256b65
 DIST bash50-018 1242 BLAKE2B e5f811ede6938e3b09d2ca658dc2ff2b30d6debed4334369ddf7755992cd1c591188595465552f4b5d0ab7d2d62759ff0b4f14a07466650cde0d25778b26df7c SHA512 cfbad36b1805ad76cb21d9136843171d794e57383318a014522e2d35905cf262d6721615f0a79972cacc45152de636977c957cbbad08ccb52f96de40b09bba5c
--- a/app-shells/bash/bash-5.0_p18.ebuild
+++ b/app-shells/bash/bash-5.0_p18.ebuild
@ -0,0 +1,261 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 inherit eutils flag-o-matic toolchain-funcs multilib prefix
 # Official patchlevel
 # See ftp://ftp.cwru.edu/pub/bash/bash-5.0-patches/
 PLEVEL=${PV##*_p}
 MY_PV=${PV/_p*}
 MY_PV=${MY_PV/_/-}
 MY_P=${PN}-${MY_PV}
 is_release() {
 	case ${PV} in
 	*_alpha*|*_beta*|*_rc*) return 1 ;;
 	*) return 0 ;;
 	esac
 }
 [[ ${PV} != *_p* ]] && PLEVEL=0
 patches() {
 	local opt=$1 plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
 	[[ ${plevel} -eq 0 ]] && return 1
 	eval set -- {1..${plevel}}
 	set -- $(printf "${pn}${pv/\.}-%03d " "$@")
 	if [[ ${opt} == -s ]] ; then
 		echo "${@/#/${DISTDIR}/}"
 	else
 		local u
 		for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${pn} ; do
 			printf "${u}/${pn}-${pv}-patches/%s " "$@"
 		done
 	fi
 }
 # The version of readline this bash normally ships with.
 READLINE_VER="8.0"
 DESCRIPTION="The standard GNU Bourne again shell"
 HOMEPAGE="http://tiswww.case.edu/php/chet/bash/bashtop.html"
 if is_release ; then
 	SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
 else
 	SRC_URI="ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz"
 fi
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline"
 DEPEND="
 	>=sys-libs/ncurses-5.2-r2:0=
 	nls? ( virtual/libintl )
 	readline? ( >=sys-libs/readline-${READLINE_VER}:0= )
 "
 RDEPEND="
 	${DEPEND}
 "
 # we only need yacc when the .y files get patched (bash42-005)
 #DEPEND+=" virtual/yacc"
 S="${WORKDIR}/${MY_P}"
 PATCHES=(
 	# Patches from Chet sent to bashbug ml
 	"${FILESDIR}"/${PN}-5.0-history-append.patch
 	"${FILESDIR}"/${PN}-5.0-syslog-history-extern.patch
 )
 pkg_setup() {
 	if is-flag -malign-double ; then #7332
 		eerror "Detected bad CFLAGS '-malign-double'.  Do not use this"
 		eerror "as it breaks LFS (struct stat64) on x86."
 		die "remove -malign-double from your CFLAGS mr ricer"
 	fi
 	if use bashlogger ; then
 		ewarn "The logging patch should ONLY be used in restricted (i.e. honeypot) envs."
 		ewarn "This will log ALL output you enter into the shell, you have been warned."
 	fi
 }
 src_unpack() {
 	unpack ${MY_P}.tar.gz
 }
 src_prepare() {
 	# Include official patches
 	[[ ${PLEVEL} -gt 0 ]] && eapply -p0 $(patches -s)
 	# Clean out local libs so we know we use system ones w/releases.
 	if is_release ; then
 		rm -rf lib/{readline,termcap}/*
 		touch lib/{readline,termcap}/Makefile.in # for config.status
 		sed -ri -e 's:\$[(](RL|HIST)_LIBSRC[)]/[[:alpha:]]*.h::g' Makefile.in || die
 	fi
 	# Prefixify hardcoded path names. No-op for non-prefix.
 	hprefixify pathnames.h.in
 	# Avoid regenerating docs after patches #407985
 	sed -i -r '/^(HS|RL)USER/s:=.*:=:' doc/Makefile.in || die
 	touch -r . doc/*
 	eapply -p0 "${PATCHES[@]}"
 	eapply_user
 }
 src_configure() {
 	local myconf=(
 		--disable-profiling
 		--with-curses
 		$(use_enable mem-scramble)
 		$(use_enable net net-redirections)
 		$(use_enable readline)
 		$(use_enable readline bang-history)
 		$(use_enable readline history)
 		$(use_with afs)
 		$(use_with mem-scramble bash-malloc)
 	)
 	# For descriptions of these, see config-top.h
 	# bashrc/#26952 bash_logout/#90488 ssh/#24762 mktemp/#574426
 	append-cppflags \
 		-DDEFAULT_PATH_VALUE=\'\"${EPREFIX}/usr/local/sbin:${EPREFIX}/usr/local/bin:${EPREFIX}/usr/sbin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/bin\"\' \
 		-DSTANDARD_UTILS_PATH=\'\"${EPREFIX}/bin:${EPREFIX}/usr/bin:${EPREFIX}/sbin:${EPREFIX}/usr/sbin\"\' \
 		-DSYS_BASHRC=\'\"${EPREFIX}/etc/bash/bashrc\"\' \
 		-DSYS_BASH_LOGOUT=\'\"${EPREFIX}/etc/bash/bash_logout\"\' \
 		-DNON_INTERACTIVE_LOGIN_SHELLS \
 		-DSSH_SOURCE_BASHRC \
 		$(use bashlogger && echo -DSYSLOG_HISTORY)
 	# Don't even think about building this statically without
 	# reading Bug 7714 first.  If you still build it statically,
 	# don't come crying to us with bugs ;).
 	#use static && export LDFLAGS="${LDFLAGS} -static"
 	use nls || myconf+=( --disable-nls )
 	# Historically, we always used the builtin readline, but since
 	# our handling of SONAME upgrades has gotten much more stable
 	# in the PM (and the readline ebuild itself preserves the old
 	# libs during upgrades), linking against the system copy should
 	# be safe.
 	# Exact cached version here doesn't really matter as long as it
 	# is at least what's in the DEPEND up above.
 	export ac_cv_rl_version=${READLINE_VER%%_*}
 	# Force linking with system curses ... the bundled termcap lib
 	# sucks bad compared to ncurses.  For the most part, ncurses
 	# is here because readline needs it.  But bash itself calls
 	# ncurses in one or two small places :(.
 	if is_release ; then
 		# Use system readline only with released versions.
 		myconf+=( --with-installed-readline=. )
 	fi
 	if use plugins; then
 		append-ldflags -Wl,-rpath,/usr/$(get_libdir)/bash
 	else
 		# Disable the plugins logic by hand since bash doesn't
 		# provide a way of doing it.
 		export ac_cv_func_dl{close,open,sym}=no \
 			ac_cv_lib_dl_dlopen=no ac_cv_header_dlfcn_h=no
 		sed -i \
 			-e '/LOCAL_LDFLAGS=/s:-rdynamic::' \
 			configure || die
 	fi
 	tc-export AR #444070
 	econf "${myconf[@]}"
 }
 src_compile() {
 	emake
 	if use plugins ; then
 		emake -C examples/loadables all others
 	fi
 }
 src_install() {
 	local d f
 	default
 	dodir /bin
 	mv "${ED}"/usr/bin/bash "${ED}"/bin/ || die
 	dosym bash /bin/rbash
 	insinto /etc/bash
 	doins "${FILESDIR}"/bash_logout
 	doins "$(prefixify_ro "${FILESDIR}"/bashrc)"
 	keepdir /etc/bash/bashrc.d
 	insinto /etc/skel
 	for f in bash{_logout,_profile,rc} ; do
 		newins "${FILESDIR}"/dot-${f} .${f}
 	done
 	local sed_args=(
 		-e "s:#${USERLAND}#@::"
 		-e '/#@/d'
 	)
 	if ! use readline ; then
 		sed_args+=( #432338
 			-e '/^shopt -s histappend/s:^:#:'
 			-e 's:use_color=true:use_color=false:'
 		)
 	fi
 	sed -i \
 		"${sed_args[@]}" \
 		"${ED}"/etc/skel/.bashrc \
 		"${ED}"/etc/bash/bashrc || die
 	if use plugins ; then
 		exeinto /usr/$(get_libdir)/bash
 		doexe $(echo examples/loadables/*.o | sed 's:\.o::g')
 		insinto /usr/include/bash-plugins
 		doins *.h builtins/*.h include/*.h lib/{glob/glob.h,tilde/tilde.h}
 	fi
 	if use examples ; then
 		for d in examples/{functions,misc,scripts,startup-files} ; do
 			exeinto /usr/share/doc/${PF}/${d}
 			docinto ${d}
 			for f in ${d}/* ; do
 				if [[ ${f##*/} != PERMISSION ]] && [[ ${f##*/} != *README ]] ; then
 					doexe ${f}
 				else
 					dodoc ${f}
 				fi
 			done
 		done
 	fi
 	doman doc/*.1
 	newdoc CWRU/changelog ChangeLog
 	dosym bash.info /usr/share/info/bashref.info
 }
 pkg_preinst() {
 	if [[ -e ${EROOT}/etc/bashrc ]] && [[ ! -d ${EROOT}/etc/bash ]] ; then
 		mkdir -p "${EROOT}"/etc/bash
 		mv -f "${EROOT}"/etc/bashrc "${EROOT}"/etc/bash/
 	fi
 	if [[ -L ${EROOT}/bin/sh ]] ; then
 		# rewrite the symlink to ensure that its mtime changes. having /bin/sh
 		# missing even temporarily causes a fatal error with paludis.
 		local target=$(readlink "${EROOT}"/bin/sh)
 		local tmp=$(emktemp "${EROOT}"/bin)
 		ln -sf "${target}" "${tmp}"
 		mv -f "${tmp}" "${EROOT}"/bin/sh
 	fi
 }
 pkg_postinst() {
 	# If /bin/sh does not exist, provide it
 	if [[ ! -e ${EROOT}/bin/sh ]] ; then
 		ln -sf bash "${EROOT}"/bin/sh
 	fi
 }
--- a/app-shells/fish/fish-3.0.2.ebuild
+++ b/app-shells/fish/fish-3.0.2.ebuild
@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/${PN}-shell/${PN}-shell.git"
 else
 	SRC_URI="https://github.com/${PN}-shell/${PN}-shell/releases/download/${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 fi
 LICENSE="GPL-2"
--- a/app-shells/fzy/fzy-1.0-r1.ebuild
+++ b/app-shells/fzy/fzy-1.0-r1.ebuild
@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/jhawthorn/fzy.git"
 else
 	SRC_URI="https://github.com/jhawthorn/${PN}/releases/download/${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~ppc64 x86"
+	KEYWORDS="amd64 arm arm64 ppc64 x86"
 fi
 DESCRIPTION="Fuzzy text selector (interactive grep) for console"
--- a/app-shells/loksh/metadata.xml
+++ b/app-shells/loksh/metadata.xml
@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<!-- maintainer-needed -->
 		<email>gyakovlev@gentoo.org</email>
 		<name>Georgy Yakovlev</name>
 	</maintainer>	
 	<upstream>
 		<remote-id type="github">dimkr/loksh</remote-id>
 	</upstream>
--- a/app-shells/mcfly/metadata.xml
+++ b/app-shells/mcfly/metadata.xml
@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<!-- maintainer-needed -->
 		<email>gyakovlev@gentoo.org</email>
 		<name>Georgy Yakovlev</name>
 	</maintainer>
 	<longdescription lang="en">
 		McFly replaces your default ctrl-r Bash history search with an intelligent search engine
 		that takes into account your working directory and the context of recently executed commands.
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
--- a/app-text/editorconfig-core-c/editorconfig-core-c-0.12.3-r1.ebuild
+++ b/app-text/editorconfig-core-c/editorconfig-core-c-0.12.3-r1.ebuild
@ -0,0 +1,31 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 inherit cmake
 DESCRIPTION="EditorConfig core library written in C"
 HOMEPAGE="https://github.com/editorconfig/editorconfig-core-c/"
 SRC_URI="https://github.com/editorconfig/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="cli doc"
 BDEPEND="app-doc/doxygen"
 DEPEND="dev-libs/libpcre2:="
 RDEPEND="${DEPEND}
 	cli? ( !dev-python/editorconfig-core-py[cli] )"
 PATCHES=( "${FILESDIR}/${P}-no-static-libs.patch" )
 src_install() {
 	use doc && local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
 	cmake_src_install
 	if ! use cli; then
 		rm -r "${ED}/usr/bin" || die
 	fi
 }
--- a/app-text/editorconfig-core-c/editorconfig-core-c-0.12.3.ebuild
+++ b/app-text/editorconfig-core-c/editorconfig-core-c-0.12.3.ebuild
@ -1,39 +0,0 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 inherit cmake-utils
 DESCRIPTION="EditorConfig core library written in C"
 HOMEPAGE="https://github.com/editorconfig/editorconfig-core-c/"
 SRC_URI="https://github.com/editorconfig/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="cli doc"
 CDEPEND="dev-libs/libpcre:="
 DEPEND="${CDEPEND}
 	doc? ( app-doc/doxygen )"
 RDEPEND="${CDEPEND}
 	cli? ( !dev-python/editorconfig-core-py[cli] )"
 src_prepare() {
 	sed -e 's:OUTPUT_NAME editorconfig_static:OUTPUT_NAME editorconfig:' \
 		-i src/lib/CMakeLists.txt || die
 	cmake-utils_src_prepare
 }
 src_configure() {
 	local mycmakeargs=()
 	use doc && mycmakeargs+=(-DINSTALL_HTML_DOC=ON)
 	cmake-utils_src_configure
 	sed -e "s:/share/doc/editorconfig\":/share/doc/${PF}\":" \
 		-i "${BUILD_DIR}/doc/cmake_install.cmake" || die
 }
 src_install() {
 	cmake-utils_src_install
 	use cli || rm -rf "${ED}/usr/bin"
 }
--- a/app-text/editorconfig-core-c/files/editorconfig-core-c-0.12.3-no-static-libs.patch
+++ b/app-text/editorconfig-core-c/files/editorconfig-core-c-0.12.3-no-static-libs.patch
@ -0,0 +1,69 @@
 From 4fa85f00f824b1dd5d1244c77667ea497d94f02b Mon Sep 17 00:00:00 2001
 From: Andreas Sturmlechner <asturm@gentoo.org>
 Date: Sat, 11 Jul 2020 21:11:58 +0200
 Subject: [PATCH] Do not build static lib if BUILD_STATICALLY_LINKED_EXE=OFF
 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
 ---
 src/lib/CMakeLists.txt | 36 +++++++++++++++++++++++-------------
 1 file changed, 23 insertions(+), 13 deletions(-)
 diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt
 index 353ab1c..12db621 100644
 --- a/src/lib/CMakeLists.txt
 +++ b/src/lib/CMakeLists.txt
@@ -44,16 +44,18 @@ if(WIN32)
 endif()
 target_link_libraries(editorconfig_shared ${PCRE2_LIBRARIES})
 -add_library(editorconfig_static STATIC ${editorconfig_LIBSRCS})
 -set_target_properties(editorconfig_static PROPERTIES
 -    OUTPUT_NAME editorconfig_static
 -    VERSION ${PROJECT_VERSION})
 +if(BUILD_STATICALLY_LINKED_EXE)
 +    add_library(editorconfig_static STATIC ${editorconfig_LIBSRCS})
 +    set_target_properties(editorconfig_static PROPERTIES
 +        OUTPUT_NAME editorconfig_static
 +        VERSION ${PROJECT_VERSION})
 -# We need to link Shwapi since we use PathIsRelative
 -if(WIN32)
 -    target_link_libraries(editorconfig_static Shlwapi)
 +    # We need to link Shwapi since we use PathIsRelative
 +    if(WIN32)
 +        target_link_libraries(editorconfig_static Shlwapi)
 +    endif()
 +    target_link_libraries(editorconfig_static ${PCRE2_LIBRARIES})
 endif()
 -target_link_libraries(editorconfig_static ${PCRE2_LIBRARIES})
 # EditorConfig package name for find_package() and the CMake package registry.
 # On UNIX the system registry is usually just "lib/cmake/<package>".
@@ -65,11 +67,19 @@ set(editorconfig_CONFIG_EXPORT_NAME "${config_package_name}Targets")
 set(editorconfig_CONFIG_INSTALL_LIBDIR
     "${CMAKE_INSTALL_LIBDIR}/cmake/${config_package_name}")
 -install(TARGETS editorconfig_shared editorconfig_static
 -    EXPORT ${editorconfig_CONFIG_EXPORT_NAME}
 -    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
 -    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
 -    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
 +if(BUILD_STATICALLY_LINKED_EXE)
 +    install(TARGETS editorconfig_static
 +        EXPORT ${editorconfig_CONFIG_EXPORT_NAME}
 +        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
 +        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
 +        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
 +else()
 +    install(TARGETS editorconfig_shared
 +        EXPORT ${editorconfig_CONFIG_EXPORT_NAME}
 +        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
 +        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
 +        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
 +endif()
 configure_file(
     ${CMAKE_CURRENT_SOURCE_DIR}/editorconfig.pc.in
 -- 
 2.27.0
--- a/app-text/fblog/metadata.xml
+++ b/app-text/fblog/metadata.xml
@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<!-- maintainer-needed -->
 		<email>gyakovlev@gentoo.org</email>
 		<name>Georgy Yakovlev</name>
 	</maintainer>
 	<upstream>
 		<bugs-to>https://github.com/brocode/fblog/issues</bugs-to>
 		<remote-id type="github">brocode/fblog</remote-id>
--- a/app-text/gv/gv-3.7.3.90.ebuild
+++ b/app-text/gv/gv-3.7.3.90.ebuild
@ -12,7 +12,7 @@ SRC_URI="mirror://gnu-alpha/gv/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="xinerama"
 RDEPEND="
--- a/app-text/hunspell/hunspell-1.7.0-r2.ebuild
+++ b/app-text/hunspell/hunspell-1.7.0-r2.ebuild
@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/hunspell"
 SLOT="0/$(ver_cut 1-2)"
 LICENSE="MPL-1.1 GPL-2 LGPL-2.1"
 IUSE="ncurses nls readline static-libs"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 RDEPEND="
 	ncurses? ( sys-libs/ncurses:0= )
--- a/app-text/passivetex/passivetex-1.25-r2.ebuild
+++ b/app-text/passivetex/passivetex-1.25-r2.ebuild
@ -14,10 +14,9 @@ S=${WORKDIR}/${PN}
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 IUSE=""
 RDEPEND="virtual/latex-base
-	>=dev-tex/xmltex-1.9"
+	dev-texlive/texlive-formatsextra"
 DEPEND="${RDEPEND}
 	app-arch/unzip"
--- a/app-text/texlive/texlive-2020-r5.ebuild
+++ b/app-text/texlive/texlive-2020-r5.ebuild
@ -71,7 +71,7 @@ RDEPEND="${DEPEND}
 	humanities? ( >=${TEXLIVE_CAT}/texlive-humanities-${PV} )
 	tex4ht? ( >=dev-tex/tex4ht-20090611_p1038-r3 )
 	xml? (
-		>=dev-tex/xmltex-1.9-r2
+		>=${TEXLIVE_CAT}/texlive-formatsextra-${PV}
 		app-text/passivetex
 	)
 	jadetex? ( >=app-text/jadetex-3.13-r2 )
--- a/app-text/xmlto/xmlto-0.0.28-r2.ebuild
+++ b/app-text/xmlto/xmlto-0.0.28-r2.ebuild
@ -22,7 +22,7 @@ RDEPEND=">=app-text/docbook-xsl-stylesheets-1.62.0-r1
 	|| ( sys-apps/util-linux app-misc/getopt )
 	sys-apps/which
 	text? ( || ( virtual/w3m www-client/lynx www-client/elinks ) )
-	latex? ( >=app-text/passivetex-1.25 >=dev-tex/xmltex-1.9-r2 )"
+	latex? ( >=app-text/passivetex-1.25 dev-texlive/texlive-formatsextra )"
 # We only depend on flex when we patch the imput lexer.
 DEPEND="${RDEPEND}"
--- a/dev-embedded/Manifest.gz
+++ b/dev-embedded/Manifest.gz
--- a/dev-embedded/libftdi/Manifest
+++ b/dev-embedded/libftdi/Manifest
@ -1,3 +1,2 @@
 DIST libftdi-0.20.tar.gz 423570 BLAKE2B f0aa420a704e18c4257b99a4593dbaf46a15806d980b24909fe8678b36e74b568cd5915db1e14f8b904541334fbf3d18f069dc479a0bf66b2ea8e113611cb82b SHA512 540e5eb201a65936c3dbabff70c251deba1615874b11ff27c5ca16c39d71c150cf61758a68b541135a444fe32ab403b0fba0daf55c587647aaf9b3f400f1dee7
 DIST libftdi1-1.2.tar.bz2 100672 BLAKE2B 314ee2695324bc3f6adad56d7ff8fddabfb86714a689ee309afc6aa8498a19fc55d2ea8f4edf0c378d944494505def3faabf1d9c3bb98e6c228526c392d26f09 SHA512 d175e2b39dda880653a2e46db67e49a8921095e69eff6598159c3c31292d4ce76617c2f1617fd6727b08c930fcea335d8ef01857debbb60e7ac384b516d38a05
 DIST libftdi1-1.4.tar.bz2 109521 BLAKE2B 4186342afb2a0118c454230a925ccff2ed0aedd942cdd3afb1ac59519f1cd48db7f04421ecdb5aa6e53993666a903de00ce447fd81d00839806f8cc0d34c6e52 SHA512 dbab74f7bc35ca835b9c6dd5b70a64816948d65da1f73a9ece37a0f0f630bd0df1a676543acc517b02a718bc34ba4f7a30cbc48b6eed1c154c917f8ef0a358fc
--- a/dev-embedded/libftdi/libftdi-1.2-r1.ebuild
+++ b/dev-embedded/libftdi/libftdi-1.2-r1.ebuild
@ -1,74 +0,0 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
 PYTHON_COMPAT=( python3_6 )
 inherit cmake-utils python-single-r1
 MY_P="${PN}1-${PV}"
 if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="git://developer.intra2net.com/${PN}"
 else
 	SRC_URI="https://www.intra2net.com/en/developer/${PN}/download/${MY_P}.tar.bz2"
 	KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 sparc x86"
 fi
 DESCRIPTION="Userspace access to FTDI USB interface chips"
 HOMEPAGE="https://www.intra2net.com/en/developer/libftdi/"
 LICENSE="LGPL-2"
 SLOT="1"
 IUSE="cxx doc examples python static-libs test tools"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RDEPEND="virtual/libusb:1
 	cxx? ( dev-libs/boost )
 	python? ( ${PYTHON_DEPS} )
 	tools? (
 		!<dev-embedded/ftdi_eeprom-1.0
 		dev-libs/confuse
 	)"
 DEPEND="${RDEPEND}
 	python? ( dev-lang/swig )
 	doc? ( app-doc/doxygen )"
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
 }
 S=${WORKDIR}/${MY_P}
 src_configure() {
 	local mycmakeargs=(
 		-DFTDIPP=$(usex cxx)
 		-DDOCUMENTATION=$(usex doc)
 		-DEXAMPLES=$(usex examples)
 		-DPYTHON_BINDINGS=$(usex python)
 		-DSTATICLIBS=$(usex static-libs)
 		-DBUILD_TESTS=$(usex test)
 		-DFTDI_EEPROM=$(usex tools)
 		-DCMAKE_SKIP_BUILD_RPATH=ON
 	)
 	cmake-utils_src_configure
 }
 src_install() {
 	cmake-utils_src_install
 	use python && python_optimize
 	dodoc AUTHORS ChangeLog README TODO
 	if use doc ; then
 		# Clean up crap man pages. #356369
 		rm -vf "${CMAKE_BUILD_DIR}"/doc/man/man3/_* || die
 		doman "${CMAKE_BUILD_DIR}"/doc/man/man3/*
 		dodoc -r "${CMAKE_BUILD_DIR}"/doc/html
 	fi
 	if use examples ; then
 		docinto examples
 		dodoc examples/*.c
 	fi
 }
--- a/dev-embedded/libftdi/libftdi-1.2-r2.ebuild
+++ b/dev-embedded/libftdi/libftdi-1.2-r2.ebuild
@ -1,74 +0,0 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
 PYTHON_COMPAT=( python3_6 )
 inherit cmake-utils python-single-r1
 MY_P="${PN}1-${PV}"
 if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="git://developer.intra2net.com/${PN}"
 else
 	SRC_URI="https://www.intra2net.com/en/developer/${PN}/download/${MY_P}.tar.bz2"
 	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 fi
 DESCRIPTION="Userspace access to FTDI USB interface chips"
 HOMEPAGE="https://www.intra2net.com/en/developer/libftdi/"
 LICENSE="LGPL-2"
 SLOT="1"
 IUSE="cxx doc examples python static-libs test tools"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RDEPEND="virtual/libusb:1
 	cxx? ( dev-libs/boost )
 	python? ( ${PYTHON_DEPS} )
 	tools? (
 		!<dev-embedded/ftdi_eeprom-1.0
 		dev-libs/confuse:=
 	)"
 DEPEND="${RDEPEND}
 	python? ( dev-lang/swig )
 	doc? ( app-doc/doxygen )"
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
 }
 S=${WORKDIR}/${MY_P}
 src_configure() {
 	local mycmakeargs=(
 		-DFTDIPP=$(usex cxx)
 		-DDOCUMENTATION=$(usex doc)
 		-DEXAMPLES=$(usex examples)
 		-DPYTHON_BINDINGS=$(usex python)
 		-DSTATICLIBS=$(usex static-libs)
 		-DBUILD_TESTS=$(usex test)
 		-DFTDI_EEPROM=$(usex tools)
 		-DCMAKE_SKIP_BUILD_RPATH=ON
 	)
 	cmake-utils_src_configure
 }
 src_install() {
 	cmake-utils_src_install
 	use python && python_optimize
 	dodoc AUTHORS ChangeLog README TODO
 	if use doc ; then
 		# Clean up crap man pages. #356369
 		rm -vf "${CMAKE_BUILD_DIR}"/doc/man/man3/_* || die
 		doman "${CMAKE_BUILD_DIR}"/doc/man/man3/*
 		dodoc -r "${CMAKE_BUILD_DIR}"/doc/html
 	fi
 	if use examples ; then
 		docinto examples
 		dodoc examples/*.c
 	fi
 }
--- a/dev-erlang/Manifest.gz
+++ b/dev-erlang/Manifest.gz
--- a/dev-erlang/base64url/base64url-1.0.1.ebuild
+++ b/dev-erlang/base64url/base64url-1.0.1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
@ -12,7 +12,7 @@ SRC_URI="https://github.com/dvv/base64url/archive/${PV}.tar.gz
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~sparc ~x86"
 DEPEND=">=dev-lang/erlang-17.1"
 RDEPEND="${DEPEND}"
--- a/dev-erlang/eimp/eimp-1.0.15.ebuild
+++ b/dev-erlang/eimp/eimp-1.0.15.ebuild
@ -12,7 +12,7 @@ SRC_URI="https://github.com/processone/eimp/archive/${PV}.tar.gz
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~sparc ~x86"
 RDEPEND=">=dev-lang/erlang-17.1
 	>=dev-erlang/p1_utils-1.0.19
--- a/dev-erlang/jose/jose-1.10.1.ebuild
+++ b/dev-erlang/jose/jose-1.10.1.ebuild
@ -12,7 +12,7 @@ SRC_URI="https://github.com/potatosalad/erlang-jose/archive/${PV}.tar.gz
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~sparc ~x86"
 IUSE=""
 DEPEND=">=dev-lang/erlang-19.0"
--- a/dev-erlang/mqtree/mqtree-1.0.7.ebuild
+++ b/dev-erlang/mqtree/mqtree-1.0.7.ebuild
@ -12,7 +12,7 @@ SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~sparc"
 DEPEND=">=dev-lang/erlang-17.5
 	>=dev-erlang/p1_utils-1.0.18"
--- a/dev-erlang/p1_acme/p1_acme-1.0.5.ebuild
+++ b/dev-erlang/p1_acme/p1_acme-1.0.5.ebuild
@ -12,7 +12,7 @@ SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~sparc"
 DEPEND=">=dev-lang/erlang-17.1
 	>=dev-erlang/jiffy-1.0.1
--- a/dev-erlang/pkix/pkix-1.0.5.ebuild
+++ b/dev-erlang/pkix/pkix-1.0.5.ebuild
@ -12,7 +12,7 @@ SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~sparc"
 DEPEND=">=dev-lang/erlang-17.5"
 RDEPEND="${DEPEND}"
--- a/dev-erlang/xmpp/xmpp-1.4.7.ebuild
+++ b/dev-erlang/xmpp/xmpp-1.4.7.ebuild
@ -12,7 +12,7 @@ SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc"
+KEYWORDS="~amd64 ~ia64 ~ppc ~sparc"
 RDEPEND=">=dev-erlang/ezlib-1.0.7
 	>=dev-erlang/fast_tls-1.1.6
--- a/dev-go/Manifest.gz
+++ b/dev-go/Manifest.gz
--- a/dev-go/gogo-protobuf/Manifest
+++ b/dev-go/gogo-protobuf/Manifest
@ -1 +1,11 @@
-DIST gogo-protobuf-0.4_p20170815.tar.gz 2572704 BLAKE2B 5a536c01dfa71f274f54e788ca863e74737cd356fbc4f3dad75d540589951140ed6c03a72cc8b84952a9dfceebab71c549715b0843ec704ad5de972e448e658d SHA512 3ab7f2e0006e537999e5fd0ba52272ad53c4707688401bb1e415007600f1ac5200dd8a03bd706977813b17c7712ba94a8b43fcf13b6498114a1d79c72bb216e7
+DIST github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.mod 143 BLAKE2B 128f8934f81d0e497e1258ec65129fe5d8831b66058669a5aef3fdb2fbe5f6d8ab30bfe97a1de7befadd34aafd55d6d15bb787e8948fb7718761392817203874 SHA512 c5e546822036a7114a29454e28290f8e1082392a47a101fb1d370e0969fc2c83186b4487473f903dd638abb8a763ce3180dc87993906895a2df33db7d8bc4790
 DIST github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.0.zip 18257 BLAKE2B da8b70d502d0a158f016e697781f7dfa36fb36511d78ecb936a1f28d01d5ecf8294dbaacd3af1af421c541356db6cec80f47d405e886110e92b1b8be82dee68d SHA512 840140a0059fab470fa431ed5d76a6405c7954c0776d128290d25a3a4746a92d08b48aa35514fe8525e2ad3051dec4436f0c1f0e4b35e07ce082a0d7b019b64b
 DIST github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod 98 BLAKE2B b9d3c55999054ed927f666a43066ccc6758a6c5f550651f43ad5d85b5403c882ee76ac2b2553803d71789da33c60ea41857ed545003072ab6c666dbb77118e00 SHA512 3529b37d770af511a716a612b7fd7fb6a4805d13166e3a6f9378950443f6eceb2f3d95db5a46027437ce55b36e571c75bba72a03769d21ecdc97888019d80a68
 DIST github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.zip 21331 BLAKE2B 9e5e52229bde22035a34b7d3883106b3a663daf914560887db12c6c1112b8a94f13c4d0067d1a0958df57f0a4b0c3747ad61005501505c5eb63faa547ae63c96 SHA512 65d0271eede1389084e66c6d1bb547b240aa97747d6b7e74b5edc99cf0453eee10f24d64865b34c29a6a536c138942bb6d070b639d23bc3e78af3a7eca6949a1
 DIST github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod 35 BLAKE2B 2f43dcbab430f12316fde243db4bafe24372c74d60874b05917269e249a36660309c23da151db31d89c0d0a8fd0f179e2dd7f386af3ca533c95ef74017609af9 SHA512 86aca37f7f94ada381e0528a535b344c8fdbab9e0dcc7b71d716083501ad3d61db701ee159ccfb5455a351fc18a405301abe798037dd1200f9950bdd805d3dc9
 DIST github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.zip 18981 BLAKE2B c940bf7f20236ef2b770dc683b5bd5525bc1413c86ae63dd328b2ab1aec7a319d5201733cc832b31185027e27739a6dcd5277d76856f1f95197b3b7797a23bf1 SHA512 9eba5f95e6c5d29b2928708ed91b1cd5a023f0b7053b5529095112a2190d097ba26be7f63b7719f7ee2ed29e698bfe7c4dfa0b33f60b4e475fd1d420453fe7e2
 DIST gogo-protobuf-1.3.1.tar.gz 2038188 BLAKE2B aee5f1910018ada96b4e52070bc487f6703c6cce4366cf5e1f167234702a7a318dc8dc74c19fc6612579d7d59b7e8220cea0edb6e70ee37c141093d857872607 SHA512 a901a849d5161fb9806ded3b4e57afc53a355875625ef285a74895deff32d799bf96feace6fe55aff40be5f16347a491ec16529c8d1ca4cbf087174960f013a1
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.zip 2585456 BLAKE2B cea45d54359b81dc553f826f3b6496fc1e4d7fb99dfb8397b2c21d62b7439836ad28821600ee6ffec67095bb35a2a281afe77db72cf208e9557f018fe8a1ac7c SHA512 f6d44993b03e54a30fe6562ff95491c807d851bf028ed5c713f019b8d5fa1985efa023e887cc91020137a4b4611a7fb12460be16488ac074b32b64eb20bba2b3
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030221726-6c7e314b6563.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030221726-6c7e314b6563.zip 3180971 BLAKE2B 8822257027065f8b6aec01abb45bace2c32ed0b2e4646dca1574327cb09b007474993d376fc0c4360824a57158c5a92d392dc1c781c66f60f8a5623353c83ece SHA512 b9bc3fead52b144168017fa1400dfa789f8b1b22557173799c06df70a2b149a64aade686680d56e054961a937b88013297c0ca9e23d6e9b20cfa5684d9c16a1d
--- a/dev-go/gogo-protobuf/gogo-protobuf-0.4_p20170815.ebuild
+++ b/dev-go/gogo-protobuf/gogo-protobuf-0.4_p20170815.ebuild
@ -1,41 +0,0 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
 EGO_PN="github.com/gogo/protobuf"
 EGIT_COMMIT="fcdc5011193ff531a548e9b0301828d5a5b97fd8"
 inherit golang-build golang-vcs-snapshot
 ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 KEYWORDS="~amd64"
 DESCRIPTION="Protocol Buffers for Go with Gadgets"
 HOMEPAGE="https://github.com/gogo/protobuf"
 SRC_URI="${ARCHIVE_URI}"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
 RESTRICT="test"
 src_compile() {
 	pushd src || die
 	GOPATH="${WORKDIR}/${P}"\
 		go install ${EGO_PN}/protoc-gen-gogo || die
 	GOPATH="${WORKDIR}/${P}"\
 		go install ${EGO_PN}/protoc-gen-gofast || die
 	GOPATH="${WORKDIR}/${P}"\
 		go install ${EGO_PN}/protoc-gen-gogofast || die
 	GOPATH="${WORKDIR}/${P}"\
 		go install ${EGO_PN}/protoc-gen-gogoslick || die
 		GOPATH="${WORKDIR}/${P}"\
 		go install ${EGO_PN}/protoc-gen-gogofaster || die
 	popd || die
 }
 src_install() {
 	dobin bin/protoc-gen-{gogo,gofast,gogofast,gogofaster}
 	dodoc src/${EGO_PN}/README
 }
--- a/dev-go/gogo-protobuf/gogo-protobuf-1.3.1.ebuild
+++ b/dev-go/gogo-protobuf/gogo-protobuf-1.3.1.ebuild
@ -0,0 +1,42 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 inherit go-module
 DESCRIPTION="Protocol Buffers for Go with Gadgets"
 HOMEPAGE="https://github.com/gogo/protobuf"
 EGO_SUM=(
 	"github.com/kisielk/errcheck v1.1.0"
 	"github.com/kisielk/errcheck v1.1.0/go.mod"
 	"github.com/kisielk/errcheck v1.2.0"
 	"github.com/kisielk/errcheck v1.2.0/go.mod"
 	"github.com/kisielk/gotool v1.0.0"
 	"github.com/kisielk/gotool v1.0.0/go.mod"
 	"golang.org/x/tools v0.0.0-20180221164845-07fd8470d635"
 	"golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod"
 	"golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563"
 	"golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod"
 	)
 go-module_set_globals
 SRC_URI="https://github.com/gogo/protobuf/archive/v${PV}.tar.gz -> ${P}.tar.gz
 	${EGO_SUM_SRC_URI}"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
 RESTRICT+=" test"
 S="${WORKDIR}/protobuf-${PV}"
 src_compile() {
 	GOBIN="${S}/bin" emake install || die
 }
 src_install() {
 	dobin bin/*
 	dodoc README
 }
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
--- a/dev-lang/erlang/Manifest
+++ b/dev-lang/erlang/Manifest
@ -2,6 +2,7 @@ DIST erlang-21.1.1.tar.gz 53854332 BLAKE2B 32ab508b5a305eb92eac9f49bd513374c5739
 DIST erlang-22.3.2.tar.gz 55856668 BLAKE2B d5d2ae17b8fb1b7c3da0c145e4e17d38e47d5291d6bc77228c9280eaa114630003f0e75cc0b6eafd21642a86448d8fd907d95c006cdfe6f18978e796e20585bd SHA512 02333fed57394012834452aff38d9a3340c52b109b14e444b6e7975ac3a65485de1deda6ae6c732a28f75ca2518000de576f70497118306699e35af5f249a0d1
 DIST erlang-22.3.4.tar.gz 55861416 BLAKE2B 881eb664ea449fa021cdb6daaeb998ea5f736eae0900ad67c1416c0e0e0888b212e1fd1fc0ee655f1c05821b56bae52f150c3f29c2eddbac205d2a6f2fce5494 SHA512 14e90efb40568a1fd7a32b82fcdf32df8ccbda938b9e538bb3b1a77d343ae16f5721abb3d47e8dd567d7aa91d1dea6da8b7ada8a5cd8d33c38ba324f1d65eca1
 DIST erlang-23.0.1.tar.gz 56387006 BLAKE2B 4ecbb5a4de0f83d80da179071d5bed7c6e7eca11f5f8f8c5681673967eaf6f0573240b9ac59e00e7162fdaa3d41e89b357263f47371f0ff9365b448a9f7cf4a9 SHA512 fc9114312327f2b7289078b29ae658a1100c860dfae03e892c1b316007b5ff286cfc301772b336eb1f5b983b3d5f507f03eff2917f418b1b9cb9714f42a59db4
 DIST erlang-23.0.2.tar.gz 56391276 BLAKE2B a9f3203a28dfb3a8abe93f7cabd34b7c34346cf400dbad751c180dcbe33c40761c74680ef7ed1a3221a69c0519f37183787463f659e5a10393404df95c59fbec SHA512 82764ab879ea7588de505c6d58716999dc207163d8dcded226fe6849a3239c00088cb614558b77c038dcad1440f9b2e3ca2b2f1251df5d71b423d3f6e7497c6e
 DIST erlang_doc_html_21.1.tar.gz 32692731 BLAKE2B a7fa8ebe1c876ab7eecd2dd46ffd4d288db6d308e0f131d53c26ee4b67a92cb6fcb89b6c880ef34df395c7ad61fcdc81eac32e0fcf7336be7d517263218146bc SHA512 0d659f55bfb01eecf140a310154724489ef56b6ccbe9ac30f6b053f598276721b80de7b5b3200707cf8a6e77b8854eae5453f655225f431fcc982550539f767f
 DIST erlang_doc_html_22.3.tar.gz 34041790 BLAKE2B 76372acf5d6a581fb97cac9fa8230f1505650e9398d0a8e6ed163718f6d64cbbb3b7c79a1b7129827482345ddf950be4a5d83f0dac44e173f0ef45b148b73faa SHA512 9199b6229b73a22e271c232ce03b83b65c265367062d57ca5babd23a2f0a088fde3054b25c65c1bf2cb714cb70354ce4324aa8e865db72beb1f788c27389558c
 DIST erlang_doc_html_23.0.tar.gz 36238699 BLAKE2B bce5fb1d766d3a795728cf7c00529129690f52e5dbe7363095cb7e63d5331a4dfc05c2042d24f10c7f3facbd187284aa323a92c0ed7515c1750aee4cd890fbd4 SHA512 bd0b1adf8639674d31152024e1351105249c6e6f93f28362e9e4b66ce6daadbe5eef5917a5889c926130e81bd000cfc44895ebaa309bf9a0c1c125713b715927
--- a/dev-lang/erlang/erlang-23.0.2.ebuild
+++ b/dev-lang/erlang/erlang-23.0.2.ebuild
@ -0,0 +1,158 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 WX_GTK_VER="3.0-gtk3"
 inherit elisp-common java-pkg-opt-2 systemd wxwidgets
 # NOTE: If you need symlinks for binaries please tell maintainers or
 # open up a bug to let it be created.
 UPSTREAM_V="$(ver_cut 1-2)"
 DESCRIPTION="Erlang programming language, runtime environment and libraries (OTP)"
 HOMEPAGE="https://www.erlang.org/"
 SRC_URI="https://github.com/erlang/otp/archive/OTP-${PV}.tar.gz -> ${P}.tar.gz
 	http://erlang.org/download/otp_doc_man_${UPSTREAM_V}.tar.gz -> ${PN}_doc_man_${UPSTREAM_V}.tar.gz
 	doc? ( http://erlang.org/download/otp_doc_html_${UPSTREAM_V}.tar.gz -> ${PN}_doc_html_${UPSTREAM_V}.tar.gz )"
 LICENSE="Apache-2.0"
 # We use this subslot because Compiled HiPE Code can be loaded on the exact
 # same build of ERTS that was used when compiling the code.  See
 # http://erlang.org/doc/system_principles/misc.html for more information.
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE="doc emacs +hipe java +kpoll libressl odbc sctp ssl systemd tk wxwidgets"
 RDEPEND="
 	acct-group/epmd
 	acct-user/epmd
 	sys-libs/ncurses:0
 	sys-libs/zlib
 	emacs? ( >=app-editors/emacs-23.1:* )
 	java? ( >=virtual/jdk-1.8:* )
 	odbc? ( dev-db/unixODBC )
 	sctp? ( net-misc/lksctp-tools )
 	ssl? (
 		!libressl? ( >=dev-libs/openssl-0.9.7d:0= )
 		libressl? ( dev-libs/libressl:0= )
 	)
 	systemd? ( sys-apps/systemd )
 	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
 "
 DEPEND="${RDEPEND}
 	dev-lang/perl
 "
 S="${WORKDIR}/otp-OTP-${PV}"
 PATCHES=(
 	"${FILESDIR}/18.2.1-wx3.0.patch"
 	"${FILESDIR}/${PN}-22.0-dont-ignore-LDFLAGS.patch"
 )
 SITEFILE=50"${PN}"-gentoo.el
 src_prepare() {
 	default
 	./otp_build autoconf || die
 }
 src_configure() {
 	use wxwidgets && setup-wxwidgets
 	local myconf=(
 		--disable-builtin-zlib
 		$(use_enable hipe)
 		$(use_enable kpoll kernel-poll)
 		$(use_with java javac)
 		$(use_enable sctp)
 		$(use_with ssl ssl "${EPREFIX}"/usr)
 		$(use_enable ssl dynamic-ssl-lib)
 		$(use_enable systemd)
 		$(usex wxwidgets "--with-wx-config=${WX_CONFIG}" "--with-wxdir=/dev/null")
 	)
 	econf "${myconf[@]}"
 }
 src_compile() {
 	emake
 	if use emacs ; then
 		pushd lib/tools/emacs &>/dev/null || die
 		elisp-compile *.el
 		popd &>/dev/null || die
 	fi
 }
 extract_version() {
 	local path="$1"
 	local var_name="$2"
 	sed -n -e "/^${var_name} = \(.*\)$/s::\1:p" "${S}/${path}/vsn.mk" || die "extract_version() failed"
 }
 src_install() {
 	local erl_libdir_rel="$(get_libdir)/erlang"
 	local erl_libdir="/usr/${erl_libdir_rel}"
 	local erl_interface_ver="$(extract_version lib/erl_interface EI_VSN)"
 	local erl_erts_ver="$(extract_version erts VSN)"
 	local my_manpath="/usr/share/${PN}/man"
 	[[ -z "${erl_erts_ver}" ]] && die "Couldn't determine erts version"
 	[[ -z "${erl_interface_ver}" ]] && die "Couldn't determine interface version"
 	emake INSTALL_PREFIX="${D}" install
 	if use doc ; then
 		# Note: we explicitly install docs into:
 		#     /usr/share/doc/${PF}/{doc,lib,erts-*}
 		# To maintain that layout we gather everything in 'html-docs'.
 		# See bug #684376.
 		mkdir html-docs || die
 		mv "${WORKDIR}"/doc "${WORKDIR}"/lib "${WORKDIR}"/erts-* html-docs/ || die
 		local DOCS=( "AUTHORS" "HOWTO"/* "README.md" "CONTRIBUTING.md" html-docs/. )
 		docompress -x /usr/share/doc/${PF}
 	else
 		local DOCS=("README.md")
 	fi
 	einstalldocs
 	dosym "../${erl_libdir_rel}/bin/erl" /usr/bin/erl
 	dosym "../${erl_libdir_rel}/bin/erlc" /usr/bin/erlc
 	dosym "../${erl_libdir_rel}/bin/escript" /usr/bin/escript
 	dosym "../${erl_libdir_rel}/lib/erl_interface-${erl_interface_ver}/bin/erl_call" /usr/bin/erl_call
 	dosym "../${erl_libdir_rel}/erts-${erl_erts_ver}/bin/beam.smp" /usr/bin/beam.smp
 	## Clean up the no longer needed files
 	rm "${ED}/${erl_libdir}/Install" || die
 	insinto "${my_manpath}"
 	doins -r "${WORKDIR}"/man/*
 	# extend MANPATH, so the normal man command can find it
 	# see bug 189639
 	newenvd - "90erlang" <<-_EOF_
 		MANPATH="${my_manpath}"
 	_EOF_
 	if use emacs ; then
 		elisp-install erlang lib/tools/emacs/*.{el,elc}
 		sed -e "s:/usr/share:${EPREFIX}/usr/share:g" \
 			"${FILESDIR}/${SITEFILE}" > "${T}/${SITEFILE}" || die
 		elisp-site-file-install "${T}/${SITEFILE}"
 	fi
 	newinitd "${FILESDIR}"/epmd.init-r2 epmd
 	newconfd "${FILESDIR}"/epmd.confd-r2 epmd
 	use systemd && systemd_newunit "${FILESDIR}"/epmd.service-r1 epmd.service
 }
 pkg_postinst() {
 	use emacs && elisp-site-regen
 }
 pkg_postrm() {
 	use emacs && elisp-site-regen
 }
--- a/dev-lang/python/python-3.6.11-r1.ebuild
+++ b/dev-lang/python/python-3.6.11-r1.ebuild
@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="PSF-2"
 SLOT="${PYVER}/${PYVER}m"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test +threads tk wininst +xml"
 RESTRICT="!test? ( test )"
--- a/dev-lang/python/python-3.7.8-r1.ebuild
+++ b/dev-lang/python/python-3.7.8-r1.ebuild
@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="PSF-2"
 SLOT="${PYVER}/${PYVER}m"
-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"
 IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test tk wininst +xml"
 RESTRICT="!test? ( test )"
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
--- a/dev-libs/c-blosc/c-blosc-1.19.0.ebuild
+++ b/dev-libs/c-blosc/c-blosc-1.19.0.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://github.com/Blosc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0/1"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="+lz4 +snappy test zlib zstd"
 RESTRICT="!test? ( test )"
--- a/dev-libs/cgreen/Manifest
+++ b/dev-libs/cgreen/Manifest
@ -0,0 +1 @@
 DIST cgreen-1.3.0.tar.gz 350959 BLAKE2B 467af04aae61745e1a78e872be9c174a0b21db7a470b48a3d96132f4bc97300b0d51fd4617e4588491a2f032b3ba82e665c7bd49be3d360a33dae0e1323716a5 SHA512 3734be08722900b4c6aaa1cd8a7a31ffd876c12742cf81266014158dad0919db46a457fbc742f3d7e9b1fdf75530ee872045962469eeeb6d1fc45fddf2b6d332
--- a/dev-libs/cgreen/cgreen-1.3.0.ebuild
+++ b/dev-libs/cgreen/cgreen-1.3.0.ebuild
@ -0,0 +1,22 @@
 # Copyright 2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 inherit cmake
 DESCRIPTION="Unit test and mocking framework for C and C++"
 HOMEPAGE="https://cgreen-devs.github.io/"
 SRC_URI="https://github.com/cgreen-devs/cgreen/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="ISC"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 DEPEND="sys-libs/glibc:="
 RDEPEND="${DEPEND}"
 PATCHES=(
 	#Patch to fix git directory detection see https://github.com/cgreen-devs/cgreen/issues/234
 	"${FILESDIR}/${P}-cmake-git.patch"
 )
--- a/dev-libs/cgreen/files/cgreen-1.3.0-cmake-git.patch
+++ b/dev-libs/cgreen/files/cgreen-1.3.0-cmake-git.patch
@ -0,0 +1,13 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
 index 350bb89..d496f5a 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
@@ -62,7 +62,6 @@ execute_process(
   OUTPUT_VARIABLE GITDIR
   OUTPUT_STRIP_TRAILING_WHITESPACE
   )
 -get_filename_component(GITDIR "${GITDIR}" ABSOLUTE)
 # config.h checks
 include(ConfigureChecks.cmake)
--- a/dev-libs/cgreen/metadata.xml
+++ b/dev-libs/cgreen/metadata.xml
@ -0,0 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>jonas.licht@gmail.com</email>
 		<name>Jonas Licht</name>
 	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">cgreen-devs/cgreen</remote-id>
 	</upstream>
 </pkgmetadata>
--- a/dev-libs/distorm64/Manifest
+++ b/dev-libs/distorm64/Manifest
@ -1,2 +1 @@
 DIST distorm3-3.4.4.tar.gz 134803 BLAKE2B 4c496db182c874b1f2d3e1433b53f59c51000d18c2e128d642e8088cb3150757a54d16d4f8303a2d46dfa0e83a941f9e75798d03643835938451c4b4903fd1f4 SHA512 ee39054a37436bb2137261d8fcf6da5e4849ef649bfa323c4523c195c1d9ee90708057fd1e1818f676300a410a184006d8db54ec3eef9aa8f5fcd455b25fc7a2
 DIST distorm3-3.5.0.tar.gz 137500 BLAKE2B 01d426f0b76a232503ebe4e1edb719bcdd1480a6ab729f3e49eff3e3fee5e9e4af6e6051c1e7675b14aa39a2fc999df2c1535976bb0981a23baef0e78aec8bd3 SHA512 ad9415a0a1a65a7ad3824b19ec83df90459eeb153494efb6623a8f02c60b6d0cf61d7dae4143eb1dd0586f5c7a7115f4a53cea5609296f703e5db612ce925011
--- a/dev-libs/distorm64/distorm64-3.4.4.ebuild
+++ b/dev-libs/distorm64/distorm64-3.4.4.ebuild
@ -1,32 +0,0 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 PYTHON_COMPAT=( python3_{6,7,8} )
 inherit distutils-r1
 DESCRIPTION="The ultimate disassembler library (X86-32, X86-64)"
 HOMEPAGE="http://www.ragestorm.net/distorm/"
 MY_PN=distorm3
 MY_P=${MY_PN}-${PV}
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 S="${WORKDIR}/${MY_P}"
 DEPEND=""
 RDEPEND=""
 LICENSE="BSD-4"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 python_install() {
 	distutils-r1_python_install
 	# don't know why it does not happen by default
 	python_optimize
 }
--- a/dev-libs/leatherman/Manifest
+++ b/dev-libs/leatherman/Manifest
@ -1,3 +1,4 @@
 DIST leatherman-1.11.0.tar.gz 815946 BLAKE2B 73afb7c517ea93d0c3dc1c88adb3e5041c764bbfb223357b14a6a3f864ff614d178e7a71293eb533f09013fe3f64d5afe40c9404882d2fe6836da7322e869d8f SHA512 0cbc558ba6976d4f14947efbc59e2ebc306a8c7e4590a22fa2e2f044b37ffd8804dbabaf96c599c47394fd9379f2de1330ce5282237b5009730d8d3b87349ae5
 DIST leatherman-1.12.0.tar.gz 815947 BLAKE2B cc268275f7ef7e9bddca9a2ca25c1a6b0bca64d57f90a485b83103a2477d476a39fe91ccf46798f1885b29c697de6556890131c7aac2a9e61590edab66fd6ea7 SHA512 2ceb16f94bf3d06bfe477a40e15db5a1d3d3999eaa7023245a08ab4e0054179f28308d9bf6ba73a839ca3a68130259894593fc8e77664b672ac5f3d20511a4d2
 DIST leatherman-1.12.1.tar.gz 816002 BLAKE2B 286bbc24971b2769c8fae73a274b05ce34ad5469f8647681869cecf133f2c3d9c9fab75327fd610aa8957c359baed645c221aa0670789a0f75888f624ea473a7 SHA512 d2bb2b9aab2749df61fb29e984a9058165851c0d4dce45efb102673dbb2e7b56d12005db106f967a6e5ad93b37ea7f7ed88337bf41ffb503db8b2152c87151ad
 DIST leatherman-1.3.0.tar.gz 434229 BLAKE2B e0c19bca2378afc4928554ac0862543504ba725aadc6cffd78220f7f7f1b725cad960fc6d9fdd2d54a43c233b35959ebcb9c71d1191a5535703599fa32e3301e SHA512 5e06be7add652f69b0d4a8d778e33dfb68183c4d598217cc6542d2431f7984f0af989c27bd69e89b77ab03d6dd2adab9d70f68cd87dae20d8e24ae05923fbe9b
--- a/dev-libs/leatherman/leatherman-1.12.1.ebuild
+++ b/dev-libs/leatherman/leatherman-1.12.1.ebuild
@ -0,0 +1,65 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 inherit cmake-utils multilib
 DESCRIPTION="A C++ toolkit"
 HOMEPAGE="https://github.com/puppetlabs/leatherman"
 SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="Apache-2.0"
 IUSE="debug static-libs test"
 RESTRICT="!test? ( test )"
 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
 SLOT="0/${PV}"
 RDEPEND="net-misc/curl"
 DEPEND=">=dev-libs/boost-1.73:=[nls]
 	net-misc/curl
 	>=sys-devel/gcc-4.8:*"
 PATCHES=( "${FILESDIR}"/portage-sandbox-test-fix.patch )
 src_prepare() {
 	sed -i 's/\-Werror\ //g' "cmake/cflags.cmake" || die
 	# vendored boost lib conflicts with boost 1.73 and above
 	sed -i '/nowide/d' CMakeLists.txt
 	sed -i '/nowide/d' file_util/CMakeLists.txt || die
 	sed -i '/nowide/d' windows/CMakeLists.txt || die
 	sed -i '/nowide/d' execution/CMakeLists.txt || die
 	sed -i '/nowide/d' logging/CMakeLists.txt || die
 	sed -i '/nowide/d' util/CMakeLists.txt || die
 	cmake-utils_src_prepare
 }
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_VERBOSE_MAKEFILE=ON
 		-DCMAKE_BUILD_TYPE=None
 	)
 	if ! use static-libs; then
 		mycmakeargs+=(
 			-DLEATHERMAN_SHARED=ON
 		)
 	else
 		mycmakeargs+=(
 			-DLEATHERMAN_SHARED=OFF
 		)
 	fi
 	if use debug; then
 		mycmakeargs+=(
 		  -DCMAKE_BUILD_TYPE=Debug
 		)
 	fi
 	cmake-utils_src_configure
 }
 src_test() {
 	"${WORKDIR}/${P}"_build/bin/leatherman_test
 }
 src_install() {
 	cmake-utils_src_install
 }
--- a/dev-libs/libcbor/libcbor-0.7.0.ebuild
+++ b/dev-libs/libcbor/libcbor-0.7.0.ebuild
@ -12,7 +12,7 @@ SRC_URI="https://github.com/PJK/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="+custom-alloc doc test"
 BDEPEND="
--- a/dev-libs/libfido2/libfido2-1.4.0.ebuild
+++ b/dev-libs/libfido2/libfido2-1.4.0.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://github.com/Yubico/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD-2"
 SLOT="0/1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="libressl +static-libs"
 DEPEND="
--- a/dev-libs/log4cpp/files/log4cpp-1.1-glibc-2.31.patch
+++ b/dev-libs/log4cpp/files/log4cpp-1.1-glibc-2.31.patch
@ -0,0 +1,22 @@
 diff --git a/tests/testDailyRollingFileAppender.cpp b/tests/testDailyRollingFileAppender.cpp
 index 9958f41..158c08b 100644
 --- a/tests/testDailyRollingFileAppender.cpp
 +++ b/tests/testDailyRollingFileAppender.cpp
@@ -22,6 +22,7 @@
 #ifndef WIN32    // only available on Win32
 #include <dirent.h>
 +#include <sys/time.h>
 #else
 #include <direct.h>  
 #endif
@@ -232,7 +233,8 @@ namespace OnlyManualTesting {
 		now += seconds;
 -		if (stime(&now) == -1) {
 +		struct timeval tv = {.tv_sec = now, .tv_usec = 0};
 +		if (settimeofday(&tv, NULL) < 0) {
 			std::cerr << "Can not set date. Need admin privileges?" << std::endl;
 			return -1;
 		}
--- a/Show More
+++ b/Show More
`@ -1 +1,2 @@`
	`DIST accerciser-3.22.0.tar.xz 3060756 BLAKE2B a648c764c5f101f323458c692cb4171704b7b710558f4103b57d87ca58c2d0d9c03cad72de1d3be9483d317ad94c95e43bb2437515093d6ffd93089a58e5fab1 SHA512 980db5dcd0bdc78314ab87cce95cfcfa018bf302acc66ea2dd1bddfb61de5bfe2e64344cff63740c38be33124ff49c75699aa6867d5e85b25d422b5af1b025c1`	`DIST accerciser-3.22.0.tar.xz 3060756 BLAKE2B a648c764c5f101f323458c692cb4171704b7b710558f4103b57d87ca58c2d0d9c03cad72de1d3be9483d317ad94c95e43bb2437515093d6ffd93089a58e5fab1 SHA512 980db5dcd0bdc78314ab87cce95cfcfa018bf302acc66ea2dd1bddfb61de5bfe2e64344cff63740c38be33124ff49c75699aa6867d5e85b25d422b5af1b025c1`
		`DIST accerciser-3.36.2.tar.xz 1995756 BLAKE2B 14d569f159cda685bb5217cb650d64c473c296e6c0e74bf2d6290908ea4aef06fd736aa8bdb7782a7bbd5231895a53e85fa362382fd15cf0554721fe46c8cbe9 SHA512 fb2ecb35826f1a868a8badcefcb4941258273bfc639996b8d4cecbd5d9700cb48e102891105842fcf3b0cb5f7a53df28de3283a80130d83695528db06ff0f268`
`@ -1,2 +1 @@`
	`DIST denyhosts-2.9.tar.gz 49472 BLAKE2B 94f18da3db9dd7e0d979d4fb536160114fe1dc95ac43ad1f7bf3f235702698210e62b3872bf7f3360945228b187d97a274797d535a9b12b552bddf649b5d1fdf SHA512 f41e2985e84f0eeaa493def6b8609de934889d02b124962b0bfd02ebe5e41d0670822124eb50ed84eb1c3b8a2a96775fbe09386cef48a3c3e04949fd6b1452c1`
	`DIST denyhosts-3.0.tar.gz 56283 BLAKE2B 1ecb8a13ec9511cb4ac65579aa8f88117264f231b586c30a61ad9c78abd17aeebc5642e70f162fa7e73fe81a99821d494efca213b1bf864fd0e2043fa4374e6a SHA512 8a1c796c259049ffab2c88cef780b175ec75c94216841421f831dfbf45f4ba0cdbcfbb0e3dab7200aa79eeb2416db5234ad5016d5770d8ab2f28ef4c9754e70d`	`DIST denyhosts-3.0.tar.gz 56283 BLAKE2B 1ecb8a13ec9511cb4ac65579aa8f88117264f231b586c30a61ad9c78abd17aeebc5642e70f162fa7e73fe81a99821d494efca213b1bf864fd0e2043fa4374e6a SHA512 8a1c796c259049ffab2c88cef780b175ec75c94216841421f831dfbf45f4ba0cdbcfbb0e3dab7200aa79eeb2416db5234ad5016d5770d8ab2f28ef4c9754e70d`
`@ -1,2 +1,2 @@`
	`DIST hcloud-1.16.1.tar.xz 649100 BLAKE2B a019f21d8c87dd47fc3c2eb069576fd367c1dd6dac7a5909f76a9c31fe9922e93ba4e1fdde3bd86dcbdb25bb2cf84b1eaddd9c7e6b62bb08647ba9d7a804e06a SHA512 e8a4e3d9c883b009eea98443716264115d55b93b212b0a0df64316f63310210a3812b3948d16f822b6f8f32d029029da5b51be7b7561d9396f28a406061a507c`	`DIST hcloud-1.16.1.tar.xz 649100 BLAKE2B a019f21d8c87dd47fc3c2eb069576fd367c1dd6dac7a5909f76a9c31fe9922e93ba4e1fdde3bd86dcbdb25bb2cf84b1eaddd9c7e6b62bb08647ba9d7a804e06a SHA512 e8a4e3d9c883b009eea98443716264115d55b93b212b0a0df64316f63310210a3812b3948d16f822b6f8f32d029029da5b51be7b7561d9396f28a406061a507c`
	`DIST hcloud-1.16.2.tar.xz 678408 BLAKE2B 01d10032b93295ac5e255103b38023b323b545cb30f78cbd9e6a0dc392579c94142b9c7575e383c5dbd5e88fb17ca1b51419df014782d517f4392683e987c9a5 SHA512 74902f212ebd432d4bec8c566a13daddf38349989e3329b62d75f332941930b55839392efcb7d9e8081700352505def9912220b228f45b92a4a3e853b8091722`	`DIST hcloud-1.17.0.tar.xz 687880 BLAKE2B c83530946dd04afc59d45a2bbb12b6a4034dfe5b8c3826e4e78f29e88891672c21e896fd9d24394ce943f9b6574928ae144a564abde3fec8a243cc5fc87e8bdb SHA512 5025357392e9b7661876f059a416e6d6f9eea89e16a9abaacaeb72506aaa5d4d6a193e266d23f01cd0f5d32048f66a3f6e22a1c9c042c2e3183a1e164da2ccc6`
`@ -1 +1,2 @@`
	`DIST qemu-riscv64-bin-3.1.0-r4.tar.xz 889764 BLAKE2B 888fef2f27f44be098e9b834b083558ce18d98337612b4de2278ffe5d6599248d9ed4e99153ad9b2c1a5b773131c420bb23ce6d080943af744df34464660bc42 SHA512 bc92110f6730c61bd39056d0bf3f84b35ed340a47af51b28b27554f9f2f72409221d2c81826b718742475d0fc48040c81e8f051e29b4f13412c3a39e282471e0`	`DIST qemu-riscv64-bin-3.1.0-r4.tar.xz 889764 BLAKE2B 888fef2f27f44be098e9b834b083558ce18d98337612b4de2278ffe5d6599248d9ed4e99153ad9b2c1a5b773131c420bb23ce6d080943af744df34464660bc42 SHA512 bc92110f6730c61bd39056d0bf3f84b35ed340a47af51b28b27554f9f2f72409221d2c81826b718742475d0fc48040c81e8f051e29b4f13412c3a39e282471e0`
		`DIST qemu-riscv64-bin-5.0.0.tar.xz 922240 BLAKE2B d4ff41c8e45ca99bc1b9e795d9e218b05be283b32d179e8ab88d07bd333a52fce7893739e6572219083d5d56a7abb7cc1870df7c585ca41af15b56a5dc30369d SHA512 1ba28679ce4bf1f11b77059dae8cb76f0095cc4427159d769947b8a1b1212c9de0a25a236c69ff9780dd111a22fa6e01519a3017b0b0a5d29069575501552f40`
`@ -1 +1 @@`
	`DIST lynis-2.7.5.tar.gz 288688 BLAKE2B e82dd67a49c234745e8af8faca9c4a9664568db9e6c9f9e33c1a3213582f2110a27109fa370642135bd3ec90fc9086314836cfe6d9712bedb110ef61e93aa115 SHA512 0ec814cb65252e3e8a44013ad0902e188a4825c521d47280586c0dd9924dfb7b79cce9797055ab7b7be59dacc111607d114175e0a793844227eadda76f68980b`	`DIST lynis-3.0.0.tar.gz 320637 BLAKE2B a69346a0a0ba8236b6872a0523a36ae03be934bc128ad57f67179f120291197019f9387ffb6ec6390b344f7d17224b104c657fe8b474b339f0521a2a544f69cd SHA512 2f156002ff1cfcd2333c95b57e82e76260364fa58419b9414f2bb461aa77a22c2f1af57a6a934e88030baeb69aa9c274045cfcef359eb496d10acd5b886cb856`
`@ -1,2 +1 @@`
	`DIST Impressive-0.13.0-beta1a.tar.gz 213098 BLAKE2B c76ce023f9c44865db68d1d2049aba022581d5e62cf027cc4df63ae541a8471867e75749a2f72c8e1f9e2e7ca2640611e090080ac563cff54f521ea47a351304 SHA512 5484f9764848129150d03233a9b270d2c31ec5f5083100662dd3cca85d3c7ead0000bd23b7d531ad45667410e1a1ea5d97ca1a2f4e8a2449dc730273144e56e8`
	`DIST Impressive-0.13.0-beta2.tar.gz 311905 BLAKE2B fb912ada1f44b2af9bd1eed4c7e1d4bfae5ba42449a9b1a154500a9d892c1070c9da127c8c3cbd35ce033a768a00db359deb1a045996cfeb7253f92d289aed82 SHA512 45c094d30e898a1843869cdcd490315c8280bbe2f5cc58f7695be2f0876075718517a502af16e040981b3f3a8fd955000d9ff76e20850b4bedf52c0d2bbd098e`	`DIST Impressive-0.13.0-beta2.tar.gz 311905 BLAKE2B fb912ada1f44b2af9bd1eed4c7e1d4bfae5ba42449a9b1a154500a9d892c1070c9da127c8c3cbd35ce033a768a00db359deb1a045996cfeb7253f92d289aed82 SHA512 45c094d30e898a1843869cdcd490315c8280bbe2f5cc58f7695be2f0876075718517a502af16e040981b3f3a8fd955000d9ff76e20850b4bedf52c0d2bbd098e`
		`@ -0,0 +1 @@`
							`DIST cgreen-1.3.0.tar.gz 350959 BLAKE2B 467af04aae61745e1a78e872be9c174a0b21db7a470b48a3d96132f4bc97300b0d51fd4617e4588491a2f032b3ba82e665c7bd49be3d360a33dae0e1323716a5 SHA512 3734be08722900b4c6aaa1cd8a7a31ffd876c12742cf81266014158dad0919db46a457fbc742f3d7e9b1fdf75530ee872045962469eeeb6d1fc45fddf2b6d332`
`@ -1,2 +1 @@`
	`DIST distorm3-3.4.4.tar.gz 134803 BLAKE2B 4c496db182c874b1f2d3e1433b53f59c51000d18c2e128d642e8088cb3150757a54d16d4f8303a2d46dfa0e83a941f9e75798d03643835938451c4b4903fd1f4 SHA512 ee39054a37436bb2137261d8fcf6da5e4849ef649bfa323c4523c195c1d9ee90708057fd1e1818f676300a410a184006d8db54ec3eef9aa8f5fcd455b25fc7a2`
	`DIST distorm3-3.5.0.tar.gz 137500 BLAKE2B 01d426f0b76a232503ebe4e1edb719bcdd1480a6ab729f3e49eff3e3fee5e9e4af6e6051c1e7675b14aa39a2fc999df2c1535976bb0981a23baef0e78aec8bd3 SHA512 ad9415a0a1a65a7ad3824b19ec83df90459eeb153494efb6623a8f02c60b6d0cf61d7dae4143eb1dd0586f5c7a7115f4a53cea5609296f703e5db612ce925011`	`DIST distorm3-3.5.0.tar.gz 137500 BLAKE2B 01d426f0b76a232503ebe4e1edb719bcdd1480a6ab729f3e49eff3e3fee5e9e4af6e6051c1e7675b14aa39a2fc999df2c1535976bb0981a23baef0e78aec8bd3 SHA512 ad9415a0a1a65a7ad3824b19ec83df90459eeb153494efb6623a8f02c60b6d0cf61d7dae4143eb1dd0586f5c7a7115f4a53cea5609296f703e5db612ce925011`