Sync with portage [Mon Jan 25 09:24:14 MSK 2021].

3 years ago · 4c972eebdd
parent 32aa6753bb
commit 4c972eebdd
2299 changed files with 12656 additions and 23668 deletions
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/app-accessibility/Manifest.gz
+++ b/app-accessibility/Manifest.gz
--- a/app-accessibility/caribou/metadata.xml
+++ b/app-accessibility/caribou/metadata.xml
@ -1,15 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
+	<maintainer type="person">
-	<email>gnome@gentoo.org</email>
+		<email>sparky@bluefang-logic.com</email>
-	<name>Gentoo GNOME Desktop</name>
+		<name>Matthew Turnbull</name>
-</maintainer>
+	</maintainer>
-<longdescription lang="en">
+	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<longdescription lang="en">
 Caribou is a text entry and UI navigation application being developed as an
 alternative to the Gnome On-screen Keyboard. The overarching goal for Caribou
 is to create a usable solution for people whose primary way of accessing a
 computer is a switch device. The initial goal is to make an in-place on-screen
 keyboard suitable for people who can use a mouse but not a hardware keyboard.
-</longdescription>
+	</longdescription>
 </pkgmetadata>
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
--- a/app-admin/conky/conky-1.11.6-r2.ebuild
+++ b/app-admin/conky/conky-1.11.6-r2.ebuild
@ -13,7 +13,7 @@ SRC_URI="https://github.com/brndnmtthws/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 LICENSE="GPL-3 BSD LGPL-2.1 MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ppc ppc64 sparc x86"
 IUSE="apcupsd bundled-toluapp cmus curl doc hddtemp ical iconv imlib iostats
 	ipv6 irc lua-cairo lua-imlib lua-rsvg math moc mpd mysql nano-syntax
 	ncurses nvidia +portmon pulseaudio rss systemd thinkpad truetype
--- a/app-admin/conserver/conserver-8.2.3-r1.ebuild
+++ b/app-admin/conserver/conserver-8.2.3-r1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
@ -81,7 +81,9 @@ src_install() {
 	docinto examples
 	dodoc -r conserver.cf/samples/.
-	newpamd "${FILESDIR}"/conserver.pam-pambase conserver
+	if use pam; then
 		newpamd "${FILESDIR}"/conserver.pam-pambase conserver
 	fi
 }
 src_test() {
--- a/app-admin/conserver/conserver-8.2.4-r1.ebuild
+++ b/app-admin/conserver/conserver-8.2.4-r1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
@ -81,7 +81,9 @@ src_install() {
 	docinto examples
 	dodoc -r conserver.cf/samples/.
-	newpamd "${FILESDIR}"/conserver.pam-pambase conserver
+	if use pam; then
 		newpamd "${FILESDIR}"/conserver.pam-pambase conserver
 	fi
 }
 src_test() {
--- a/app-admin/conserver/conserver-8.2.5-r1.ebuild
+++ b/app-admin/conserver/conserver-8.2.5-r1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
@ -79,7 +79,9 @@ src_install() {
 	docinto examples
 	dodoc -r conserver.cf/samples/.
-	newpamd "${FILESDIR}"/conserver.pam-pambase conserver
+	if use pam; then
 		newpamd "${FILESDIR}"/conserver.pam-pambase conserver
 	fi
 }
 src_test() {
--- a/app-admin/conserver/conserver-8.2.6-r1.ebuild
+++ b/app-admin/conserver/conserver-8.2.6-r1.ebuild
@ -83,7 +83,9 @@ src_install() {
 	docinto examples
 	dodoc -r conserver.cf/samples/.
-	newpamd "${FILESDIR}"/conserver.pam-pambase conserver
+	if use pam; then
 		newpamd "${FILESDIR}"/conserver.pam-pambase conserver
 	fi
 }
 src_test() {
--- a/app-admin/newsyslog/files/newsyslog-1.1.0.81-fno-common.patch
+++ b/app-admin/newsyslog/files/newsyslog-1.1.0.81-fno-common.patch
@ -0,0 +1,43 @@
 https://bugs.gentoo.org/707452
 --- a/sig2str.c
 +++ b/sig2str.c
@@ -63,7 +63,7 @@ extern const unsigned int sys_nsigname;	/* also from sys_signame.c */
 #endif
 #if !defined(SYS_SIGNAME_DECLARED)
 -const char *const sys_signame[];	/* defined in sys_signame.c */
 +extern const char *const sys_signame[];	/* defined in sys_signame.c */
 #endif
 #if !defined(HAVE_DECL_SIG2STR)
 --- a/str2sig.c
 +++ b/str2sig.c
@@ -29,7 +29,7 @@ static const char rcsid[] =
 #include "newsyslog.h"		/* generic portability definitions */
 #if !defined(SYS_SIGNAME_DECLARED)
 -const char *const sys_signame[];		/* defined in signame.c */
 +extern const char *const sys_signame[];		/* defined in signame.c */
 #endif
 /* NetBSD gained sys_nsig sometime just prior to 1.4 */
@@ -65,7 +65,7 @@ extern const unsigned int sys_nsigname;	/* also from sys_signame.c */
 #endif
 #if !defined(SYS_SIGNAME_DECLARED)
 -const char *const sys_signame[];	/* defined in sys_signame.c */
 +extern const char *const sys_signame[];	/* defined in sys_signame.c */
 #endif
 #if !defined(HAVE_DECL_STR2SIG)
 --- a/sys_signame.c
 +++ b/sys_signame.c
@@ -22,7 +22,7 @@
 #include "config.h"
 #include <sys/types.h>
 -const char *const sys_signame[] = {
 +extern const char *const sys_signame[] = {
 /*  0 */ "Signal 0",	/* Fake value for zero */
 /*  1 */ "HUP",		/* Control TTY hangup */
 /*  2 */ "INT",		/* Control TTY interrupt */
--- a/app-admin/newsyslog/files/newsyslog-1.1.0.81-html.patch
+++ b/app-admin/newsyslog/files/newsyslog-1.1.0.81-html.patch
@ -1,5 +1,5 @@
--- a/Makefile.in	2018-06-24 14:36:18.647850208 +0000
+--- a/Makefile.in
-+++ b/Makefile.in	2018-06-24 14:37:50.216321235 +0000
+++ b/Makefile.in
@@ -763,7 +763,7 @@
 .8.8.html:
--- a/app-admin/newsyslog/newsyslog-1.1.0.81-r1.ebuild
+++ b/app-admin/newsyslog/newsyslog-1.1.0.81-r1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
@ -11,28 +11,28 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
-DEPEND="
+BDEPEND="sys-apps/groff"
 	sys-apps/groff"
 RDEPEND="
 	virtual/cron
 	app-arch/gzip"
-PATCHES=( "${FILESDIR}/${P}-html.patch" )
+PATCHES=(
-
+	"${FILESDIR}"/${P}-html.patch
-DOCS=( newsyslog.conf AUTHORS ChangeLog INSTALL NEWS ToDo )
+	"${FILESDIR}"/${P}-fno-common.patch
 )
 src_configure() {
-	local myconf="--with-syslogd_pid=/var/run/syslog.pid"
+	local myconf=(
-
+		--with-gzip
 		--with-newsyslog_conf="${EPREFIX}"/etc/newsyslog.conf
 	)
 	if has_version 'app-admin/syslog-ng'; then
-		myconf="--with-syslogd_pid=/var/run/syslog-ng.pid"
+		myconf+=( --with-syslogd_pid="${EPREFIX}"/var/run/syslog-ng.pid )
 	else
 		myconf+=( --with-syslogd_pid="${EPREFIX}"/var/run/syslog.pid )
 	fi
-	econf \
+	econf "${myconf[@]}"
 		--with-gzip \
 		--with-newsyslog_conf=/etc/newsyslog.conf \
 		${myconf}
 }
 src_install() {
@ -40,5 +40,7 @@ src_install() {
 		DESTDIR="${D}" \
 		catmandir="${T}"/dont-install \
 		install
 	einstalldocs
 	dodoc newsyslog.conf ToDo
 }
--- a/app-admin/newsyslog/newsyslog-1.1.0.81.ebuild
+++ b/app-admin/newsyslog/newsyslog-1.1.0.81.ebuild
@ -1,42 +0,0 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
 DESCRIPTION="a highly configurable program for managing and archiving log files"
 HOMEPAGE="http://www.weird.com/~woods/projects/newsyslog.html"
 SRC_URI="http://download.openpkg.org/components/cache/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
 DEPEND="sys-apps/groff"
 RDEPEND="
 	virtual/cron
 	app-arch/gzip"
 PATCHES=( "${FILESDIR}/${P}-html.patch" )
 DOCS=( newsyslog.conf AUTHORS ChangeLog INSTALL NEWS ToDo )
 src_configure() {
 	local myconf="--with-syslogd_pid=/var/run/syslog.pid"
 	has_version 'app-admin/syslog-ng' \
 	    && myconf="--with-syslogd_pid=/var/run/syslog-ng.pid"
 	econf \
 	    --with-gzip \
 	    --with-newsyslog_conf=/etc/newsyslog.conf \
 	    ${myconf}
 }
 src_install() {
 	emake \
 		DESTDIR="${D}" \
 		catmandir="${T}"/dont-install \
 		install
 	einstalldocs
 }
--- a/app-admin/salt/salt-3002.2-r2.ebuild
+++ b/app-admin/salt/salt-3002.2-r2.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
@ -17,7 +17,7 @@ if [[ ${PV} == 9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm ~x86"
 fi
 LICENSE="Apache-2.0"
--- a/app-admin/system-config-printer/system-config-printer-1.5.15.ebuild
+++ b/app-admin/system-config-printer/system-config-printer-1.5.15.ebuild
@ -13,7 +13,7 @@ SRC_URI="https://github.com/OpenPrinting/${PN}/releases/download/v${PV}/${P}.tar
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ~ppc64 ~sparc x86"
 IUSE="gnome-keyring policykit"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
--- a/app-arch/lxqt-archiver/lxqt-archiver-0.3.0.ebuild
+++ b/app-arch/lxqt-archiver/lxqt-archiver-0.3.0.ebuild
@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 LICENSE="GPL-2 GPL-2+"
--- a/app-arch/pax/Manifest
+++ b/app-arch/pax/Manifest
@ -1 +1,2 @@
 DIST paxmirabilis-20161104.cpio.gz 148061 BLAKE2B 997a126d3048488e1a4e49ff9753de2ebdbe75b7daedbea8c95ab5f1902d4768d4b12b13fa684cb2a7c2fe8470ab60e19ea3f9430429a6a4e6e1d57993130fd4 SHA512 42ec8365a5efb9ffb9d383cece39ffaac85c1c8d69856ec557a5567cf0d28d98a0f2d4b7fed53572366eba12c71111cc80b591d51c6a19a3e6437efb62af33ce
 DIST paxmirabilis-20201030.cpio.gz 171982 BLAKE2B cdda22bf73ff60cda7b8873ed278d1d9d7daab170084ca17760dacffc88b8edd29a0498155f860019b22641d9c84186074c5e696c67846e1997f5883267761b0 SHA512 14c913db49c05b92f3448b7ae2e11b4fdb86c2daa5f269d86e044e8779eec7ea19b41534fbd8ebfe31cffe6b50e51c0460c3994307ba2cfa07029602604882de
--- a/app-arch/pax/metadata.xml
+++ b/app-arch/pax/metadata.xml
@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person">
 		<email>slyfox@gentoo.org</email>
 		<name>Sergei Trofimovich</name>
 	</maintainer>
 </pkgmetadata>
--- a/app-arch/pax/pax-20201030.ebuild
+++ b/app-arch/pax/pax-20201030.ebuild
@ -0,0 +1,43 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 inherit unpacker toolchain-funcs flag-o-matic
 DESCRIPTION="pax (Portable Archive eXchange) is the POSIX standard archive tool"
 HOMEPAGE="https://www.mirbsd.org/pax.htm"
 SRC_URI="https://www.mirbsd.org/MirOS/dist/mir/cpio/paxmirabilis-${PV}.cpio.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 RDEPEND="elibc_musl? ( sys-libs/fts-standalone )"
 DEPEND="${RDEPEND}"
 BDEPEND="$(unpacker_src_uri_depends)"
 S=${WORKDIR}/${PN}
 src_configure() {
 	use elibc_musl && append-libs -lfts
 	tc-export CC
 	tc-getPROG SIZE size
 }
 src_compile() {
 	set -- sh ./Build.sh
 	echo "$@"
 	"$@"
 }
 src_install() {
 	dobin pax
 	doman pax.1
 	dosym pax /usr/bin/paxcpio
 	newman cpio.1 paxcpio.1
 	dosym pax /usr/bin/paxtar
 	newman tar.1 paxtar.1
 }
--- a/app-arch/pigz/Manifest
+++ b/app-arch/pigz/Manifest
@ -1 +1,2 @@
 DIST pigz-2.4.tar.gz 98234 BLAKE2B 763fe3975c6a83f46b94741d4e16b40a4edef20b7677e8d32b99856498f951edebd86634c227b0f212f0aff87fd3626e21348fdb3839a6abfb21a547bed88be6 SHA512 79b2357176f93b9f3e2bc07fee393fc4d79b7bd0041808f8ddfd23eafccde72e60ca95e97595bb624a4f732fe3612bf46d57c44541c36ae62f9aa6336abe16ba
 DIST pigz-2.5.tar.gz 106438 BLAKE2B d1db42e412d91243aebdc06204a032e1d9dd7e01f659cc428e8a194df26242782d22328658b773b61ccbdf1e34a7ada4d358a93d9c6eda7d7e78c4291ca901ac SHA512 8f52900b8664c67b5b1813ac2f6e226d899c72ba19eefd6424181dc4dc0416d38ad3c7e5fe3dce6bdb58f5ac34ec0269f846c43f9aef6f69a121713113c1643a
--- a/app-arch/pigz/metadata.xml
+++ b/app-arch/pigz/metadata.xml
@ -15,5 +15,6 @@
 	</use>
 	<upstream>
 		<remote-id type="cpe">cpe:/a:zlib:pigz</remote-id>
 		<remote-id type="github">madler/pigz</remote-id>
 	</upstream>
 </pkgmetadata>
--- a/app-arch/pigz/pigz-2.4-r1.ebuild
+++ b/app-arch/pigz/pigz-2.4-r1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
@ -11,7 +11,7 @@ SRC_URI="https://www.zlib.net/pigz/${P}.tar.gz"
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~ppc-macos ~sparc64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~ppc-macos ~sparc64-solaris"
 IUSE="static symlink test"
 RESTRICT="!test? ( test )"
--- a/app-arch/pigz/pigz-2.5.ebuild
+++ b/app-arch/pigz/pigz-2.5.ebuild
@ -0,0 +1,39 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 inherit toolchain-funcs flag-o-matic
 DESCRIPTION="A parallel implementation of gzip"
 HOMEPAGE="https://www.zlib.net/pigz/"
 SRC_URI="https://www.zlib.net/pigz/${P}.tar.gz"
 LICENSE="ZLIB"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~sparc64-solaris"
 IUSE="static symlink test"
 RESTRICT="!test? ( test )"
 LIB_DEPEND="sys-libs/zlib[static-libs(+)]"
 RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
 DEPEND="${RDEPEND}
 	static? ( ${LIB_DEPEND} )
 	test? ( app-arch/ncompress )"
 src_compile() {
 	use static && append-ldflags -static
 	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 }
 src_install() {
 	dobin ${PN}
 	dosym ${PN} /usr/bin/un${PN}
 	dodoc README
 	doman ${PN}.1
 	if use symlink; then
 		dosym ${PN} /usr/bin/gzip
 		dosym un${PN} /usr/bin/gunzip
 	fi
 }
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
--- a/app-backup/amanda/Manifest
+++ b/app-backup/amanda/Manifest
@ -1,2 +1 @@
 DIST amanda-3.3.9.tar.gz 4673301 BLAKE2B 8123a4f0d1fd961562a1ae6b97c2bddc4d9cb735b994c3c5f2359fa8a475a20658fc7e94c86307ab11710f23989a98c77b320e34d881b38d56a51ab0ab2f1bbd SHA512 345670a20cff335453e8dcbf457d1fcdb9f266e4a03d729c2b1ba762f4fac323de4a87713d0fd54c11ca244a08dc97fb8c641625f7fa81cb241b3c17748b1b7e
 DIST amanda-3.5.1.tar.gz 5402093 BLAKE2B 4c342fb55b2b5fc0d338a1616bf26b1d844b0ecd6627432b849996c0072756090e1f695050605af0a5c3eda2daeb63131fbe16b5ac728af9137699f4d916b8e8 SHA512 8d5451b6b3f18f9a705592ba6baf8ffb7fb4fe62261eac8a4f4fae4eded3f7f447f547ac6f016bcb57ea43f116cf87fdc48f8e77b117bbdecf00d3e37dd0f39f
--- a/app-backup/amanda/amanda-3.3.9.ebuild
+++ b/app-backup/amanda/amanda-3.3.9.ebuild
@ -1,480 +0,0 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=5
 inherit autotools eutils perl-module user systemd toolchain-funcs
 DESCRIPTION="The Advanced Maryland Automatic Network Disk Archiver"
 HOMEPAGE="http://www.amanda.org/"
 SRC_URI="mirror://sourceforge/amanda/${P}.tar.gz"
 LICENSE="HPND BSD BSD-2 GPL-2+ GPL-3+"
 SLOT="0"
 IUSE="curl gnuplot ipv6 kerberos minimal nls readline s3 samba systemd xfs"
 KEYWORDS="amd64 ppc ppc64 ~sparc x86"
 RDEPEND="sys-libs/readline:=
 	virtual/awk
 	app-arch/tar
 	dev-lang/perl:=
 	app-arch/dump
 	net-misc/openssh
 	>=dev-libs/glib-2.26.0
 	nls? ( virtual/libintl )
 	s3? ( >=net-misc/curl-7.10.0 )
 	!s3? ( curl? ( >=net-misc/curl-7.10.0 ) )
 	samba? ( net-fs/samba:= )
 	kerberos? ( app-crypt/mit-krb5 )
 	xfs? ( sys-fs/xfsdump )
 	!minimal? (
 		dev-perl/XML-Simple
 		virtual/mailx
 		app-arch/mt-st:=
 		sys-block/mtx
 		gnuplot? ( sci-visualization/gnuplot )
 		app-crypt/aespipe
 		app-crypt/gnupg
 	)"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )
 	>=app-text/docbook-xsl-stylesheets-1.72.0
 	app-text/docbook-xml-dtd
 	dev-libs/libxslt
 	"
 MYFILESDIR="${T}/files"
 ENVDIR="/etc/env.d"
 ENVDFILE="97amanda"
 TMPENVFILE="${T}/${ENVDFILE}"
 # This is a complete list of Amanda settings that the ebuild takes from the
 # build environment. This allows users to alter the behavior of the package as
 # upstream intended, but keeping with Gentoo style. We store a copy of them in
 # /etc/env.d/97amanda during the install, so that they are preserved for future
 # installed. This variable name must not start with AMANDA_, as we do not want
 # it captured into the env file.
 ENV_SETTINGS_AMANDA="
 AMANDA_GROUP_GID AMANDA_GROUP_NAME
 AMANDA_USER_NAME AMANDA_USER_UID AMANDA_USER_SH AMANDA_USER_HOMEDIR AMANDA_USER_GROUPS
 AMANDA_SERVER AMANDA_SERVER_TAPE AMANDA_SERVER_INDEX
 AMANDA_TAR_LISTDIR AMANDA_TAR
 AMANDA_PORTS_UDP AMANDA_PORTS_TCP AMANDA_PORTS_BOTH AMANDA_PORTS
 AMANDA_CONFIG_NAME AMANDA_TMPDIR"
 amanda_variable_setup() {
 	# Setting vars
 	local currentamanda
 	# Grab the current settings
 	currentamanda="$(set | egrep "^AMANDA_" | grep -v '^AMANDA_ENV_SETTINGS' | xargs)"
 	# First we set the defaults
 	[ -z "${AMANDA_GROUP_GID}" ] && AMANDA_GROUP_GID=87
 	[ -z "${AMANDA_GROUP_NAME}" ] && AMANDA_GROUP_NAME=amanda
 	[ -z "${AMANDA_USER_NAME}" ] && AMANDA_USER_NAME=amanda
 	[ -z "${AMANDA_USER_UID}" ] && AMANDA_USER_UID=87
 	[ -z "${AMANDA_USER_SH}" ] && AMANDA_USER_SH=/bin/bash
 	[ -z "${AMANDA_USER_HOMEDIR}" ] && AMANDA_USER_HOMEDIR=/var/spool/amanda
 	[ -z "${AMANDA_USER_GROUPS}" ] && AMANDA_USER_GROUPS="${AMANDA_GROUP_NAME}"
 	# This installs Amanda, with the server. However, it could be a client,
 	# just specify an alternate server name in AMANDA_SERVER.
 	[ -z "${AMANDA_SERVER}" ] && AMANDA_SERVER="${HOSTNAME}"
 	[ -z "${AMANDA_SERVER_TAPE}" ] && AMANDA_SERVER_TAPE="${AMANDA_SERVER}"
 	[ -z "${AMANDA_SERVER_INDEX}" ] && AMANDA_SERVER_INDEX="${AMANDA_SERVER}"
 	[ -z "${AMANDA_TAR_LISTDIR}" ] && AMANDA_TAR_LISTDIR=${AMANDA_USER_HOMEDIR}/tar-lists
 	[ -z "${AMANDA_CONFIG_NAME}" ] && AMANDA_CONFIG_NAME=DailySet1
 	[ -z "${AMANDA_TMPDIR}" ] && AMANDA_TMPDIR=/var/tmp/amanda
 	[ -z "${AMANDA_DBGDIR}" ] && AMANDA_DBGDIR="$AMANDA_TMPDIR"
 	# These are left empty by default
 	[ -z "${AMANDA_PORTS_UDP}" ] && AMANDA_PORTS_UDP=
 	[ -z "${AMANDA_PORTS_TCP}" ] && AMANDA_PORTS_TCP=
 	[ -z "${AMANDA_PORTS_BOTH}" ] && AMANDA_PORTS_BOTH=
 	[ -z "${AMANDA_PORTS}" ] && AMANDA_PORTS=
 	# What tar to use
 	[ -z "${AMANDA_TAR}" ] && AMANDA_TAR=/bin/tar
 	# Now pull in the old stuff
 	if [ -f "${ROOT}${ENVDIR}/${ENVDFILE}" ]; then
 		# We don't just source it as we don't want everything in there.
 		eval $(egrep "^AMANDA_" "${ROOT}${ENVDIR}/${ENVDFILE}" | grep -v '^AMANDA_ENV_SETTINGS')
 	fi
 	# Re-apply the new settings if any
 	[ -n "${currentamanda}" ] && eval `echo "${currentamanda}"`
 }
 pkg_setup() {
 	amanda_variable_setup
 	# If USE=minimal, give out a warning, if AMANDA_SERVER is not set to
 	# another host than HOSTNAME.
 	if use minimal && [ "${AMANDA_SERVER}" = "${HOSTNAME}" ] ; then
 		elog "You are installing a client-only version of Amanda."
 		elog "You should set the variable \$AMANDA_SERVER to point at your"
 		elog "Amanda-tape-server, otherwise you will have to specify its name"
 		elog "when using amrecover on the client."
 		elog "For example: Use something like"
 		elog "AMANDA_SERVER=\"myserver\" emerge amanda"
 		elog
 	fi
 	enewgroup "${AMANDA_GROUP_NAME}" "${AMANDA_GROUP_GID}"
 	enewuser "${AMANDA_USER_NAME}" "${AMANDA_USER_UID}" "${AMANDA_USER_SH}" "${AMANDA_USER_HOMEDIR}" "${AMANDA_USER_GROUPS}"
 }
 src_unpack() {
 	# we do not want the perl src_unpack
 	default_src_unpack
 }
 src_prepare() {
 	# gentoo bug #331111
 	sed -i '/^check-local: check-perl$/d' "${S}"/config/automake/scripts.am
 	sed -i '/^check-local:/s,syntax-check,,g' "${S}"/perl/Makefile.am
 	# bug with glibc-2.16.0
 	sed -i -e '/gets is a security/d' "${S}"/gnulib/stdio.in.h
 	eautoreconf
 	# places for us to work in
 	mkdir -p "${MYFILESDIR}"
 	# Now we store the settings we just created
 	set | egrep "^AMANDA_" | grep -v '^AMANDA_ENV_SETTINGS' > "${TMPENVFILE}"
 	# Prepare our custom files
 	einfo "Building custom configuration files"
 	local i # our iterator
 	local sedexpr # var for sed expr
 	sedexpr=''
 	for i in ${ENV_SETTINGS_AMANDA} ; do
 		local val
 		eval "val=\"\${${i}}\""
 		sedexpr="${sedexpr}s|__${i}__|${val}|g;"
 	done
 	# now apply the sed expr
 	for i in "${FILESDIR}"/amanda-* ; do
 		sed -re "${sedexpr}" <"${i}" >"${MYFILESDIR}/`basename ${i}`"
 	done
 	(
 		cat "${MYFILESDIR}"/amanda-amandahosts-client-2.5.1_p3-r1
 		use minimal || cat "${MYFILESDIR}"/amanda-amandahosts-server-2.5.1_p3-r1
 	) > "${T}"/amandahosts
 	if ! use minimal; then
 		sed -i -e 's:^\(my $amandahomedir\)=.*:\1 = $localstatedir;:' \
 			server-src/am{addclient,serverconfig}.pl || die
 	fi
 	epatch "${FILESDIR}"/${P}-stuck.patch
 }
 src_configure() {
 	# fix bug #36316
 	addpredict /var/cache/samba/gencache.tdb
 	# fix bug #376169
 	addpredict /run/blkid
 	addpredict /etc/blkid.tab
 	[ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
 	source "${TMPENVFILE}"
 	local myconf
 	einfo "Using ${AMANDA_SERVER_TAPE} for tape server."
 	myconf="${myconf} --with-tape-server=${AMANDA_SERVER_TAPE}"
 	einfo "Using ${AMANDA_SERVER_INDEX} for index server."
 	myconf="${myconf} --with-index-server=${AMANDA_SERVER_INDEX}"
 	einfo "Using ${AMANDA_USER_NAME} for amanda user."
 	myconf="${myconf} --with-user=${AMANDA_USER_NAME}"
 	einfo "Using ${AMANDA_GROUP_NAME} for amanda group."
 	myconf="${myconf} --with-group=${AMANDA_GROUP_NAME}"
 	einfo "Using ${AMANDA_TAR} as Tar implementation."
 	myconf="${myconf} --with-gnutar=${AMANDA_TAR}"
 	einfo "Using ${AMANDA_TAR_LISTDIR} as tar listdir."
 	myconf="${myconf} --with-gnutar-listdir=${AMANDA_TAR_LISTDIR}"
 	einfo "Using ${AMANDA_CONFIG_NAME} as default config name."
 	myconf="${myconf} --with-config=${AMANDA_CONFIG_NAME}"
 	einfo "Using ${AMANDA_TMPDIR} as Amanda temporary directory."
 	myconf="${myconf} --with-tmpdir=${AMANDA_TMPDIR}"
 	if [ -n "${AMANDA_PORTS_UDP}" ] && [ -n "${AMANDA_PORTS_TCP}" ] && [ -z "${AMANDA_PORTS_BOTH}" ] ; then
 		eerror "If you want _both_ UDP and TCP ports, please use only the"
 		eerror "AMANDA_PORTS environment variable for identical ports, or set"
 		eerror "AMANDA_PORTS_BOTH."
 		die "Bad port setup!"
 	fi
 	if [ -n "${AMANDA_PORTS_UDP}" ]; then
 		einfo "Using UDP ports ${AMANDA_PORTS_UDP/,/-}"
 		myconf="${myconf} --with-udpportrange=${AMANDA_PORTS_UDP}"
 	fi
 	if [ -n "${AMANDA_PORTS_TCP}" ]; then
 		einfo "Using TCP ports ${AMANDA_PORTS_TCP/,/-}"
 		myconf="${myconf} --with-tcpportrange=${AMANDA_PORTS_TCP}"
 	fi
 	if [ -n "${AMANDA_PORTS}" ]; then
 		einfo "Using ports ${AMANDA_PORTS/,/-}"
 		myconf="${myconf} --with-portrange=${AMANDA_PORTS}"
 	fi
 	# Extras
 	# Speed option
 	myconf="${myconf} --with-buffered-dump"
 	# "debugging" in the configuration is NOT debug in the conventional sense.
 	# It is actually just useful output in the application, and should remain
 	# enabled. There are some cases of breakage with MTX tape changers as of
 	# 2.5.1p2 that it exposes when turned off as well.
 	myconf="${myconf} --with-debugging"
 	# Where to put our files
 	myconf="${myconf} --localstatedir=${AMANDA_USER_HOMEDIR}"
 	# Samba support
 	myconf="${myconf} `use_with samba smbclient /usr/bin/smbclient`"
 	# Support for BSD, SSH, BSDUDP, BSDTCP security methods all compiled in by
 	# default
 	myconf="${myconf} --with-bsd-security"
 	myconf="${myconf} --with-ssh-security"
 	myconf="${myconf} --with-bsdudp-security"
 	myconf="${myconf} --with-bsdtcp-security"
 	# kerberos-security mechanism version 5
 	myconf="${myconf} `use_with kerberos krb5-security`"
 	# Amazon S3 support
 	myconf="${myconf} `use_enable s3 s3-device`"
 	# libcurl is required for S3 but otherwise optional
 	if ! use s3; then
 		myconf="${myconf} $(use_with curl libcurl)"
 	fi
 	# Client only, as requested in bug #127725
 	if use minimal ; then
 		myconf="${myconf} --without-server"
 	else
 		# amplot
 		myconf="${myconf} $(use_with gnuplot)"
 	fi
 	# IPv6 fun.
 	myconf="${myconf} `use_with ipv6`"
 	# This is to prevent the IPv6-is-working test
 	# As the test fails on binpkg build hosts with no IPv6.
 	use ipv6 && export amanda_cv_working_ipv6=yes
 	# I18N
 	myconf="${myconf} `use_enable nls`"
 	# Bug #296634: Perl location
 	perl_set_version
 	myconf="${myconf} --with-amperldir=${VENDOR_LIB}"
 	# Bug 296633: --disable-syntax-checks
 	# Some tests are not safe for production systems
 	myconf="${myconf} --disable-syntax-checks"
 	# build manpages
 	myconf="${myconf} --enable-manpage-build"
 	# bug #483120
 	tc-export AR
 	econf \
 		$(use_with readline) \
 		${myconf}
 }
 src_compile() {
 	# Again, do not want the perl-module src_compile
 	default_src_compile
 }
 src_install() {
 	[ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
 	source ${TMPENVFILE}
 	einfo "Doing stock install"
 	emake DESTDIR="${D}" install
 	# Build the envdir file
 	# Don't forget this..
 	einfo "Building environment file"
 	(
 		echo "# These settings are what was present in the environment when this"
 		echo "# Amanda was compiled.  Changing anything below this comment will"
 		echo "# have no effect on your application, but it merely exists to"
 		echo "# preserve them for your next emerge of Amanda"
 		cat "${TMPENVFILE}" | sed "s,=\$,='',g"
 	) >> "${MYFILESDIR}/${ENVDFILE}"
 	# Env.d
 	einfo "Installing environment config file"
 	doenvd "${MYFILESDIR}/${ENVDFILE}"
 	# Lock down next section (up until docs).
 	insopts -m0640
 	# Installing Amanda Xinetd Services Definition
 	einfo "Installing xinetd service file"
 	insinto /etc/xinetd.d
 	if use minimal ; then
 		newins "${MYFILESDIR}"/amanda-xinetd-2.6.1_p1-client amanda
 	else
 		newins "${MYFILESDIR}"/amanda-xinetd-2.6.1_p1-server amanda
 	fi
 	if ! use minimal; then
 		einfo "Installing Sample Daily Cron Job for Amanda"
 		insinto /etc/cron.daily
 		newins "${MYFILESDIR}/amanda-cron" amanda
 	fi
 	einfo "Installing systemd service and socket files for Amanda"
 	systemd_dounit "${FILESDIR}"/amanda.socket || die
 	systemd_newunit "${FILESDIR}"/amanda.service-r1 'amanda@.service' || die
 	insinto /etc/amanda
 	einfo "Installing .amandahosts File for ${AMANDA_USER_NAME} user"
 	doins "${T}/amandahosts"
 	fperms 600 /etc/amanda/amandahosts
 	dosym /etc/amanda/amandahosts "${AMANDA_USER_HOMEDIR}/.amandahosts"
 	insinto "${AMANDA_USER_HOMEDIR}"
 	einfo "Installing .profile for ${AMANDA_USER_NAME} user"
 	newins "${MYFILESDIR}/amanda-profile" .profile
 	insinto /etc/amanda
 	doins "${S}/example/amanda-client.conf"
 	if ! use minimal ; then
 		insinto "/etc/amanda/${AMANDA_CONFIG_NAME}"
 		doins "${S}/example/amanda.conf"
 		doins "${S}/example/disklist"
 		keepdir "${AMANDA_USER_HOMEDIR}/${AMANDA_CONFIG_NAME}/index"
 	fi
 	keepdir "${AMANDA_TAR_LISTDIR}"
 	keepdir "${AMANDA_USER_HOMEDIR}/amanda"
 	keepdir "${AMANDA_TMPDIR}/dumps"
 	# Just make sure it exists for XFS to work...
 	use xfs && keepdir /var/xfsdump/inventory
 	local i
 	for i in "${AMANDA_USER_HOMEDIR}" "${AMANDA_TAR_LISTDIR}" \
 		"${AMANDA_TMPDIR}" /etc/amanda; do
 		einfo "Securing directory (${i})"
 		fowners -R ${AMANDA_USER_NAME}:${AMANDA_GROUP_NAME} ${i}
 	done
 	# Do NOT use -R
 	fperms 0700 \
 		"${AMANDA_USER_HOMEDIR}" "${AMANDA_TAR_LISTDIR}" \
 		"${AMANDA_TMPDIR}" "${AMANDA_TMPDIR}/dumps" \
 		 "${AMANDA_USER_HOMEDIR}/amanda" \
 		 /etc/amanda
 	if ! use minimal ; then
 		fperms 0700 \
 			 "${AMANDA_USER_HOMEDIR}/${AMANDA_CONFIG_NAME}" \
 	         /etc/amanda/${AMANDA_CONFIG_NAME}
 	fi
 	einfo "Setting setuid permissions"
 	amanda_permissions_fix "${D}"
 	# Relax permissions again
 	insopts -m0644
 	# docs
 	einfo "Installing documentation"
 	dodoc AUTHORS ChangeLog DEVELOPING NEWS README ReleaseNotes UPGRADING
 	# our inetd sample
 	einfo "Installing standard inetd sample"
 	newdoc "${MYFILESDIR}/amanda-inetd.amanda.sample-2.6.0_p2-r2" amanda-inetd.amanda.sample
 	# Amanda example configs
 	einfo "Installing example configurations"
 	rm "${D}"/usr/share/amanda/{COPYRIGHT,ChangeLog,NEWS,ReleaseNotes}
 	mv "${D}/usr/share/amanda/example" "${D}/usr/share/doc/${PF}/"
 	docinto example1
 	newdoc "${FILESDIR}/example_amanda.conf" amanda.conf
 	newdoc "${FILESDIR}/example_disklist-2.5.1_p3-r1" disklist
 	newdoc "${FILESDIR}/example_global.conf" global.conf
 	einfo "Cleaning up dud .la files"
 	perl_set_version
 	find "${D}"/"${VENDOR_LIB}" -name '*.la' -print0 |xargs -0 rm -f
 }
 pkg_postinst() {
 	[ ! -f "${TMPENVFILE}" -a "$MERGE_TYPE" == "binary" ] && \
 		TMPENVFILE="${ROOT}${ENVDIR}/${ENVDFILE}"
 	[ ! -f "${TMPENVFILE}" ] && die "Variable setting file (${TMPENVFILE}) should exist!"
 	source "${TMPENVFILE}"
 	# Migration of amandates from /etc to $localstatedir/amanda
 	if [ -f "${ROOT}/etc/amandates" -a \
 		! -f "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/amandates" ]; then
 		einfo "Migrating amandates from /etc/ to ${AMANDA_USER_HOMEDIR}/amanda"
 		einfo "A backup is also placed at /etc/amandates.orig"
 		cp -dp "${ROOT}/etc/amandates" "${ROOT}/etc/amandates.orig"
 		mkdir -p "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/"
 		cp -dp "${ROOT}/etc/amandates" "${ROOT}/${AMANDA_USER_HOMEDIR}/amanda/amandates"
 	fi
 	if [ -f "${ROOT}/etc/amandates" ]; then
 		einfo "If you have migrated safely, please delete /etc/amandates"
 	fi
 	einfo "Checking setuid permissions"
 	amanda_permissions_fix "${ROOT}"
 	elog "You should configure Amanda in /etc/amanda now."
 	elog
 	elog "If you use xinetd, Don't forget to check /etc/xinetd.d/amanda"
 	elog "and restart xinetd afterwards!"
 	elog
 	elog "Otherwise, please look at /usr/share/doc/${PF}/inetd.amanda.sample"
 	elog "as an example of how to configure your inetd."
 	elog
 	elog "systemd-users: enable and start amanda.socket or the relevant services"
 	elog "regarding what auth method you use."
 	elog
 	elog "NOTICE: If you need raw access to partitions you need to add the"
 	elog "amanda user to the 'disk' group."
 	elog
 	elog "NOTICE: If you have a tape changer, you need to add the amanda user"
 	elog "to the 'tape' group."
 	elog
 	elog "If you use localhost in your disklist your restores may break."
 	elog "You should replace it with the actual hostname!"
 	elog "Please also see the syntax changes to amandahosts."
 	elog "The only exception is when you use the authentication method 'local'."
 	elog "Please note that this package no longer explicitly depends on"
 	elog "virtual/inetd, as it supports modes where an inetd is not needed"
 	elog "(see bug #506028 for details)."
 }
 # We have had reports of amanda file permissions getting screwed up.
 # Losing setuid, becoming too lax etc.
 # ONLY root and users in the amanda group should be able to run these binaries!
 amanda_permissions_fix() {
 	local root="$1"
 	[ -z "${root}" ] && die "Failed to pass root argument to amanda_permissions_fix!"
 	local le="/usr/libexec/amanda"
 	for i in /usr/sbin/amcheck "${le}"/calcsize "${le}"/killpgrp \
 		"${le}"/rundump "${le}"/runtar "${le}"/dumper \
 		"${le}"/planner ; do
 		chown root:${AMANDA_GROUP_NAME} "${root}"/${i}
 		chmod u=srwx,g=rx,o= "${root}"/${i}
 	done
 }
 # We do not want the perl-module tests.
 src_test() {
 	default_src_test
 }
--- a/app-backup/amanda/amanda-3.5.1-r3.ebuild
+++ b/app-backup/amanda/amanda-3.5.1-r3.ebuild
@ -13,7 +13,7 @@ LICENSE="HPND BSD BSD-2 GPL-2+ GPL-3+"
 SLOT="0"
 IUSE="curl gnuplot ipv6 kerberos minimal ndmp nls readline s3 samba systemd xfs"
-KEYWORDS="amd64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ppc ppc64 ~sparc x86"
 DEPEND="
 	acct-group/amanda
 	acct-user/amanda
--- a/app-backup/amanda/files/amanda-3.3.9-stuck.patch
+++ b/app-backup/amanda/files/amanda-3.3.9-stuck.patch
@ -1,11 +0,0 @@
 --- a/amanda/server-src/driver.c
 +++ b/amanda/server-src/driver.c
@@ -3957,6 +3957,8 @@
     driver_debug(2, _("new_data: %lld\n"), (long long)new_data);
     driver_debug(2, _("data_free: %lld\n"), (long long)data_free);
 ;
 +    tapeq_size -= data_free;
 +    tapeq_size += new_data;
     driver_debug(2, _("tapeq_size: %lld\n"), (long long)tapeq_size);
     sched_size = runq_size + tapeq_size + dumpers_size;
--- a/app-backup/backupninja/Manifest
+++ b/app-backup/backupninja/Manifest
@ -1 +1,2 @@
 DIST backupninja-backupninja_upstream-1.1.0.tar.gz 188991 BLAKE2B 0fb7b10b4a7e635ec29238590e1fae8778e3031cdcd906bb81c4fd97e3ddf083db0e063daadbdfd0c0efe6e2447a7704a25767f65f7229705dba8f8f64c2ee2b SHA512 bea1b024f5bb8d103618f942afa07a7677f0b1896cbef611c461ba586e98c4667112282aa57fdc195f899920072b9cde7cbf97dee7c332fff67df36bb5288f87
 DIST backupninja-backupninja_upstream-1.2.0.tar.gz 186229 BLAKE2B dc96e10a2db2002d548f6340c807d79b258be7b02d6075450763467b2b9a1fa0c3141093c1725f3fece8efff5d5a35d3fc5deb9cb509c97068836cdd5f160049 SHA512 59c7d64136027f93c1e1fe8051d449405298e1fbb47f93db9af180a64e1356e1ee0a4f83db483c7b26c0ecd0c5a6b7cf023ab1b9bdb123ee04cb44b449442246
--- a/app-backup/backupninja/backupninja-1.2.0.ebuild
+++ b/app-backup/backupninja/backupninja-1.2.0.ebuild
@ -0,0 +1,21 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
 DESCRIPTION="lightweight, extensible meta-backup system"
 HOMEPAGE="https://0xacab.org/riseuplabs/backupninja"
 SRC_URI="https://0xacab.org/riseuplabs/backupninja/-/archive/backupninja_upstream/${PV}/backupninja-backupninja_upstream-${PV}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 RDEPEND="dev-util/dialog"
 DEPEND=""
 S="${WORKDIR}/${PN}-${PN}_upstream-${PV}"
 src_configure() {
 	econf --localstatedir=/var #578614
 }
--- a/app-benchmarks/Manifest.gz
+++ b/app-benchmarks/Manifest.gz
--- a/app-benchmarks/hyperfine/hyperfine-1.11.0.ebuild
+++ b/app-benchmarks/hyperfine/hyperfine-1.11.0.ebuild
@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
@ -89,7 +89,7 @@ SRC_URI="https://github.com/sharkdp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 Boost-1.0 ISC MIT MPL-2.0 Unlicense"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
+KEYWORDS="amd64 ~ppc64"
 QA_FLAGS_IGNORED="usr/bin/${PN}"
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
--- a/app-crypt/ccid/Manifest
+++ b/app-crypt/ccid/Manifest
@ -1,4 +1,2 @@
 DIST ccid-1.4.30.tar.bz2 642342 BLAKE2B fd43aa2a4c8840abb0545760f6ceb31bb9d7dc22d7283888c9a142e0c3b34310ec4530d18986451b21c6b1a3975b1212ab653a4c8d58466b28713f0f72ce1cdb SHA512 1761a4053a99eb28184d0ffece951aec5d4b646080597b4ae36b18a31fb7a76c55fabfa57ee8e5d7f2db1a6e13d209f7fa995fe6ed067f44558bea34a26d46da
 DIST ccid-1.4.31.tar.bz2 644039 BLAKE2B bd8e9c69e122348ffbeddc4f85f939d7d4c93dbfe5f712bc16f671af144570ce2c3bc6da04503851f4ce0f95f0c89bbbe6bbf0852be97cf5574993875d865870 SHA512 51d102c6be5b234ed568522d51b97bdb27c4c22d9610874abd7a18314f4e8ebe81fcb18a16a1edbdc814ee652a037d50202673a50de2fdeb0eac74063b149ed3
 DIST ccid-1.4.32.tar.bz2 657200 BLAKE2B 9598b010f2eb085d1d02d9363136b294dc30ea1cf9256d398838461016fae5572926d5f24e3065384c9a349b0a9783670c8cb9d4f59bf50171c7f5501b963d82 SHA512 80fc3bac547ee7c37ff0e72cc650d0a5e1102720698bdc1278581ec53ff1407e0e719eb0345775fbc76c0d56d9271dcb07a9ddc98450bba2ff37823f23a8adbf
 DIST ccid-1.4.33.tar.bz2 659673 BLAKE2B f8dd37ed4fd2bd15e6313417dc01feecd0303502d24eeae101ad13233510b5e26b08439c4de453abc734695618faa1c8031e545d045527aa841ab9056a3d729e SHA512 ccfcecbaca4c8f1ee4a4925bd313ced6d6f15ad422cbcc387627aef203a9ae0ff7775c4a2c5d25978ab33ebfd93c34de50e1f783df787b77ea7c774a45ed126b
 DIST ccid-1.4.34.tar.bz2 667477 BLAKE2B 81f8f97fdb4526fa2f0bfe0890cc447c87671989159022a51fa15ed6e85760f7fc3a9b3f673e2cbf72373a9fc67df5304c0a93a945b97f5ad483de213f5b1a45 SHA512 8a71c100e2f0adfd6de89a86dab6690629b10c91d1fddc0a810df2ebeaea978eaaa7c6a21fa964b5cd1ea277b0efe75a2885b490f9bd9ac4776b8ff1848e4122
--- a/app-crypt/ccid/ccid-1.4.30.ebuild
+++ b/app-crypt/ccid/ccid-1.4.30.ebuild
@ -1,61 +0,0 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 inherit toolchain-funcs udev
 DESCRIPTION="CCID free software driver"
 HOMEPAGE="https://ccid.apdu.fr https://github.com/LudovicRousseau/CCID"
 SRC_URI="https://ccid.apdu.fr/files/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sparc x86"
 IUSE="twinserial kobil-midentity +usb"
 RDEPEND=">=sys-apps/pcsc-lite-1.8.3
 	usb? ( virtual/libusb:1 )"
 DEPEND="${RDEPEND}"
 BDEPEND="kernel_linux? ( virtual/pkgconfig )"
 DOCS=( README AUTHORS )
 src_configure() {
 	econf \
 		LEX=: \
 		$(use_enable twinserial) \
 		$(use_enable usb libusb)
 }
 src_compile() {
 	default
 	use kobil-midentity && emake -C contrib/Kobil_mIDentity_switch
 }
 src_install() {
 	default
 	if use kobil-midentity; then
 		dosbin contrib/Kobil_mIDentity_switch/Kobil_mIDentity_switch
 		doman contrib/Kobil_mIDentity_switch/Kobil_mIDentity_switch.8
 	fi
 	if use kernel_linux; then
 		# note: for eudev support, rules probably will always need to be
 		# installed to /usr
 		# ccid >=1.4.11 version changed the rules drastically in a minor
 		# release to no longer use the pcscd group. Using the old ones in
 		# the mean time.
 		udev_newrules "${FILESDIR}"/92_pcscd_ccid-2.rules 92-pcsc-ccid.rules
 		# disable Kobil_mIDentity_switch udev rule with USE=-kobil-midentity
 		if ! use kobil-midentity; then
 			sed \
 				-e '/Kobil_mIDentity_switch/s/^/#/' \
 				-i "${D}/$(get_udevdir)"/rules.d/92-pcsc-ccid.rules || die
 		fi
 	fi
 }
--- a/app-crypt/ccid/ccid-1.4.32.ebuild
+++ b/app-crypt/ccid/ccid-1.4.32.ebuild
@ -1,61 +0,0 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 inherit toolchain-funcs udev
 DESCRIPTION="CCID free software driver"
 HOMEPAGE="https://ccid.apdu.fr https://github.com/LudovicRousseau/CCID"
 SRC_URI="https://ccid.apdu.fr/files/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="twinserial kobil-midentity +usb"
 RDEPEND=">=sys-apps/pcsc-lite-1.8.3
 	usb? ( virtual/libusb:1 )"
 DEPEND="${RDEPEND}"
 BDEPEND="kernel_linux? ( virtual/pkgconfig )"
 DOCS=( README.md AUTHORS )
 src_configure() {
 	econf \
 		LEX=: \
 		$(use_enable twinserial) \
 		$(use_enable usb libusb)
 }
 src_compile() {
 	default
 	use kobil-midentity && emake -C contrib/Kobil_mIDentity_switch
 }
 src_install() {
 	default
 	if use kobil-midentity; then
 		dosbin contrib/Kobil_mIDentity_switch/Kobil_mIDentity_switch
 		doman contrib/Kobil_mIDentity_switch/Kobil_mIDentity_switch.8
 	fi
 	if use kernel_linux; then
 		# note: for eudev support, rules probably will always need to be
 		# installed to /usr
 		# ccid >=1.4.11 version changed the rules drastically in a minor
 		# release to no longer use the pcscd group. Using the old ones in
 		# the mean time.
 		udev_newrules "${FILESDIR}"/92_pcscd_ccid-2.rules 92-pcsc-ccid.rules
 		# disable Kobil_mIDentity_switch udev rule with USE=-kobil-midentity
 		if ! use kobil-midentity; then
 			sed \
 				-e '/Kobil_mIDentity_switch/s/^/#/' \
 				-i "${D}/$(get_udevdir)"/rules.d/92-pcsc-ccid.rules || die
 		fi
 	fi
 }
--- a/app-crypt/ccid/ccid-1.4.33.ebuild
+++ b/app-crypt/ccid/ccid-1.4.33.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
@ -11,7 +11,7 @@ SRC_URI="https://ccid.apdu.fr/files/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sparc x86"
 IUSE="twinserial kobil-midentity +usb"
 RDEPEND=">=sys-apps/pcsc-lite-1.8.3
--- a/app-crypt/ccid/ccid-1.4.34.ebuild
+++ b/app-crypt/ccid/ccid-1.4.34.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
--- a/app-crypt/gcr/Manifest
+++ b/app-crypt/gcr/Manifest
@ -1,2 +1,3 @@
 DIST gcr-3.36.0.tar.xz 1025760 BLAKE2B 03f0d0ed40b600ed80e894111fedff3efcbbaaf6f261d6a44a3649a1acb50c4f35f3dc9a7ddb60f56cab241f68fef83aa5a02a94036e70a6556b35300f2c8fb5 SHA512 0431e7971b73accc62869c9497fcff7c111c453aa6a8ff25b42f19ceae1be0aec52e0e4eb504676f967c6e4f179198c15c521278690822e3457dbc5fe512fd5e
 DIST gcr-3.38.0.tar.xz 1029784 BLAKE2B cf295a9f497d6c54067717e806439166965f90670ed5f7283802bb70c547465d9cc28d452970269d4315d02d24cc31f483a0a1fc1807f9b9720e70aa2b8249b9 SHA512 24c35ac514a67a1dee6a5738e829b55921a490b060ffa597421cea0abac3ddc62695370d2c7b3504c0adfd55b1ade878ad3ca5e6cb869428b4a19f4a11563bc6
 DIST gcr-3.38.1.tar.xz 1030360 BLAKE2B 474b501a5f6c339b0b4fb460a094dec6d5a297ca44daf050c6c88bc05ee822358309f57490f92c42f84a1e9f36a1d3c09c4b2788d7142ee5e86e2acf7987ea14 SHA512 4dc8c3f84023a7cd6f069f4529cb063d7153e589c2f9547410c7eeb5298dc238ea7fc4f22e22d8c237391f31bfcd814190e55125195f20b913665b9ca81d9c21
--- a/app-crypt/gcr/gcr-3.38.1.ebuild
+++ b/app-crypt/gcr/gcr-3.38.1.ebuild
@ -0,0 +1,84 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 VALA_USE_DEPEND="vapigen"
 PYTHON_COMPAT=( python3_{6..9} )
 inherit gnome.org gnome2-utils meson python-any-r1 vala xdg
 DESCRIPTION="Libraries for cryptographic UIs and accessing PKCS#11 modules"
 HOMEPAGE="https://gitlab.gnome.org/GNOME/gcr"
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0/1" # subslot = suffix of libgcr-base-3 and co
 IUSE="gtk gtk-doc +introspection test +vala"
 REQUIRED_USE="vala? ( introspection )"
 RESTRICT="!test? ( test )"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 DEPEND="
 	>=dev-libs/glib-2.44.0:2
 	>=dev-libs/libgcrypt-1.2.2:0=
 	>=app-crypt/p11-kit-0.19.0
 	gtk? ( >=x11-libs/gtk+-3.12:3[X,introspection?] )
 	>=sys-apps/dbus-1
 	introspection? ( >=dev-libs/gobject-introspection-1.58:= )
 "
 RDEPEND="${DEPEND}"
 PDEPEND="app-crypt/gnupg"
 BDEPEND="
 	${PYTHON_DEPS}
 	gtk? ( dev-libs/libxml2:2 )
 	dev-util/gdbus-codegen
 	dev-util/glib-utils
 	gtk-doc? (
 		>=dev-util/gtk-doc-1.9
 		app-text/docbook-xml-dtd:4.1.2
 	)
 	>=sys-devel/gettext-0.19.8
 	test? ( app-crypt/gnupg )
 	virtual/pkgconfig
 	vala? ( $(vala_depend) )
 "
 PATCHES=(
 	"${FILESDIR}"/3.38.0-avoid-gnupg-circular-dep.patch
 	"${FILESDIR}"/3.38.0-optional-vapi.patch
 )
 pkg_setup() {
 	python-any-r1_pkg_setup
 }
 src_prepare() {
 	use vala && vala_src_prepare
 	xdg_src_prepare
 }
 src_configure() {
 	local emesonargs=(
 		$(meson_use introspection)
 		$(meson_use gtk)
 		$(meson_use gtk-doc gtk_doc)
 		-Dgpg_path="${EPREFIX}"/usr/bin/gpg
 		$(meson_use vala vapi)
 	)
 	meson_src_configure
 }
 src_test() {
 	dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed'
 }
 pkg_postinst() {
 	xdg_pkg_postinst
 	gnome2_schemas_update
 }
 pkg_postrm() {
 	xdg_pkg_postrm
 	gnome2_schemas_update
 }
--- a/app-crypt/libnitrokey/Manifest
+++ b/app-crypt/libnitrokey/Manifest
@ -1 +1,2 @@
 DIST libnitrokey-3.5.tar.gz 94356 BLAKE2B 9e53213f309e903d26e0e8e01ab213d6bc42c5b8d720e4b19f27adb607f20ad0c6e1707bf7b55c525efbd6a4fbf7b9c87983decf6b05dab7d03701ae0ea8277f SHA512 d2a95071e92d839c8cde4ac1435158bb469c25662f2988a4e824dbc0dfe83af841e6d04589293deddd77746dbec17b30c50fab69af58cc727ed5e0f2dbd0b5e7
 DIST libnitrokey-3.6.tar.gz 98038 BLAKE2B 27f99e7b6de93548fc7a373f37ce784da0aa50503a5c635b4d90282e6330a5ff4c0dcc03a83a7e57045b8a1aabaab27d76a090d7c49693a6ff1037b81e75ece9 SHA512 a00a6724e5c64715eca688ec254efd979acceb5ff4cad28a205f7128e44db8674a5924634fd7da6c69d589deafca7b28b99e1d05a244c321d5cb429f2e5a3bec
--- a/app-crypt/libnitrokey/libnitrokey-3.6.ebuild
+++ b/app-crypt/libnitrokey/libnitrokey-3.6.ebuild
@ -0,0 +1,47 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 inherit udev cmake
 DESCRIPTION="Support library for the Nitrokey"
 HOMEPAGE="https://github.com/Nitrokey/libnitrokey"
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/Nitrokey/libnitrokey.git"
 	# Disable pulling in bundled dependencies
 	EGIT_SUBMODULES=()
 else
 	SRC_URI="https://github.com/Nitrokey/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~ppc64 ~x86"
 fi
 LICENSE="GPL-3"
 SLOT="0"
 IUSE="test"
 RESTRICT="!test? ( test )"
 RDEPEND="
 	dev-libs/hidapi:=
 	virtual/udev"
 DEPEND="
 	${RDEPEND}
 	test? ( >=dev-cpp/catch-2.5.0:0 )"
 BDEPEND="virtual/pkgconfig"
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_INSTALL_UDEVRULESDIR="$(get_udevdir)"/rules.d
 		# actual hardware tests
 		#   1. require a connected Nitrokey
 		#   2. may kill data on your Nitrokey
 		# hence the main testsuite is disabled
 		-DCOMPILE_TESTS=OFF
 		-DCOMPILE_OFFLINE_TESTS=$(usex test)
 	)
 	cmake_src_configure
 }
--- a/app-crypt/libnitrokey/libnitrokey-9999.ebuild
+++ b/app-crypt/libnitrokey/libnitrokey-9999.ebuild
@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
-inherit cmake-utils udev
+inherit udev cmake
 DESCRIPTION="Support library for the Nitrokey"
 HOMEPAGE="https://github.com/Nitrokey/libnitrokey"
@ -43,5 +43,5 @@ src_configure() {
 		-DCOMPILE_TESTS=OFF
 		-DCOMPILE_OFFLINE_TESTS=$(usex test)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
--- a/app-crypt/nitrokey-app/nitrokey-app-1.4.2.ebuild
+++ b/app-crypt/nitrokey-app/nitrokey-app-1.4.2.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
@ -16,7 +16,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_SUBMODULES=()
 else
 	SRC_URI="https://github.com/Nitrokey/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~ppc64 ~x86"
 fi
 LICENSE="GPL-3"
--- a/app-crypt/openpgp-keys-python/openpgp-keys-python-20210121.ebuild
+++ b/app-crypt/openpgp-keys-python/openpgp-keys-python-20210121.ebuild
@ -20,7 +20,7 @@ SRC_URI="
 LICENSE="public-domain"
 SLOT="0"
-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"
 S=${WORKDIR}
--- a/app-crypt/qca/files/qca-2.3.1-gcc11.patch
+++ b/app-crypt/qca/files/qca-2.3.1-gcc11.patch
@ -0,0 +1,30 @@
 From f015cc64889035c084138864e2e030ece19c257b Mon Sep 17 00:00:00 2001
 From: Jeff Law <law@redhat.com>
 Date: Dec 04 2020 03:55:48 +0000
 Subject: Fix missing includes for gcc-11
 diff --git a/src/qca_cert.cpp b/src/qca_cert.cpp
 index 5e73d98..225aecd 100644
 --- a/src/qca_cert.cpp
 +++ b/src/qca_cert.cpp
@@ -19,6 +19,7 @@
  *
  */
 +#include <memory>
 #include "qca_cert.h"
 #include "qca_publickey.h"
 diff --git a/src/qca_default.cpp b/src/qca_default.cpp
 index fd35702..db87e87 100644
 --- a/src/qca_default.cpp
 +++ b/src/qca_default.cpp
@@ -19,6 +19,7 @@
  *
  */
 +#include <memory>
 #include "qca_core.h"
 #include <QMutex>
--- a/app-crypt/qca/qca-2.3.1.ebuild
+++ b/app-crypt/qca/qca-2.3.1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
@ -39,7 +39,10 @@ DEPEND="${RDEPEND}
 	)
 "
-PATCHES=( "${FILESDIR}/${PN}-disable-pgp-test.patch" )
+PATCHES=(
 	"${FILESDIR}/${PN}-disable-pgp-test.patch"
 	"${FILESDIR}/${P}-gcc11.patch" # bug 764047
 )
 qca_plugin_use() {
 	echo -DWITH_${2:-$1}_PLUGIN=$(usex "$1")
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
--- a/app-editors/gedit/gedit-3.34.1.ebuild
+++ b/app-editors/gedit/gedit-3.34.1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
@ -17,9 +17,8 @@ SLOT="0"
 IUSE="+introspection +python gtk-doc spell vala"
 REQUIRED_USE="python? ( introspection ${PYTHON_REQUIRED_USE} ) spell? ( python )"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 # X libs are not needed for OSX (aqua)
 DEPEND="
 	>=dev-libs/glib-2.44:2
 	>=x11-libs/gtk+-3.22.0:3[introspection?]
--- a/app-editors/gedit/gedit-3.36.2.ebuild
+++ b/app-editors/gedit/gedit-3.36.2.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
@ -19,7 +19,6 @@ REQUIRED_USE="python? ( introspection ${PYTHON_REQUIRED_USE} )"
 KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 # X libs are not needed for OSX (aqua)
 DEPEND="
 	>=dev-libs/glib-2.52:2
 	>=dev-libs/libpeas-1.14.1[gtk]
--- a/app-editors/gedit/gedit-3.38.1.ebuild
+++ b/app-editors/gedit/gedit-3.38.1.ebuild
@ -19,7 +19,6 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 # X libs are not needed for OSX (aqua)
 DEPEND="
 	>=dev-libs/glib-2.64:2
 	>=dev-libs/libpeas-1.14.1[gtk]
--- a/app-editors/gvim/gvim-8.2.0814-r100.ebuild
+++ b/app-editors/gvim/gvim-8.2.0814-r100.ebuild
@ -17,7 +17,7 @@ if [[ ${PV} == 9999* ]]; then
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
 		https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 fi
 DESCRIPTION="GUI version of the Vim text editor"
--- a/app-editors/scite/scite-4.4.4-r10.ebuild
+++ b/app-editors/scite/scite-4.4.4-r10.ebuild
@ -13,7 +13,7 @@ SRC_URI="https://www.scintilla.org/${PN}${PV//./}.tgz -> ${P}.tgz"
 LICENSE="HPND lua? ( MIT )"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="lua"
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
@ -53,6 +53,10 @@ pkg_pretend() {
 	fi
 }
 pkg_setup() {
 	use lua && lua-single_pkg_setup
 }
 src_prepare() {
 	tc-export AR CC CXX RANLIB
--- a/app-editors/texworks/texworks-0.6.5-r100.ebuild
+++ b/app-editors/texworks/texworks-0.6.5-r100.ebuild
@ -4,7 +4,7 @@
 EAPI=7
 LUA_COMPAT=( lua5-{1..3} )
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 inherit lua-single python-single-r1 cmake virtualx xdg-utils
--- a/app-editors/texworks/texworks-0.6.5.ebuild
+++ b/app-editors/texworks/texworks-0.6.5.ebuild
@ -1,74 +0,0 @@
 # 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} )
 inherit python-single-r1 cmake virtualx xdg-utils
 DESCRIPTION="A simple interface for working with TeX documents"
 HOMEPAGE="http://tug.org/texworks/"
 SRC_URI="https://github.com/TeXworks/texworks/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="lua python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RDEPEND="app-text/hunspell:=
 	app-text/poppler[qt5]
 	dev-qt/designer:5
 	dev-qt/qtcore:5
 	dev-qt/qtconcurrent:5
 	dev-qt/qtdbus:5
 	dev-qt/qtgui:5
 	dev-qt/qtscript:5[scripttools]
 	lua? ( dev-lang/lua:0 )
 	python? ( ${PYTHON_DEPS} ) "
 DEPEND="dev-qt/linguist-tools:5
 	${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 S=${WORKDIR}/${PN}-release-${PV}
 RESTRICT="!test? ( test )"
 pkg_setup() {
 	python-single-r1_pkg_setup
 }
 src_prepare() {
 	cmake_src_prepare
 	eapply "${FILESDIR}"/qt5.15-support.patch
 }
 src_configure() {
 	local mycmakeargs=(
 		-Wno-dev
 		-DPREFER_BUNDLED_SYNCTEX=ON
 		-DWITH_LUA=$(usex lua ON OFF)
 		-DWITH_PYTHON=$(usex python ON OFF)
 		-DTeXworks_PLUGIN_DIR="/usr/$(get_libdir)/texworks"
 		-DTeXworks_DOCS_DIR="/share/doc/${PF}"
 		-DQTPDF_VIEWER=ON
 		-DBUILD_SHARED_LIBS=ON
 		-DBUILD_SHARED_PLUGINS=ON
 	)
 	cmake_src_configure
 }
 src_test() {
 	virtx default_src_test
 }
 pkg_postinst() {
 	xdg_desktop_database_update
 }
 pkg_postrm() {
 	xdg_desktop_database_update
 }
--- a/app-editors/vim-core/vim-core-8.2.0814.ebuild
+++ b/app-editors/vim-core/vim-core-8.2.0814.ebuild
@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]] ; then
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
 		https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 DESCRIPTION="vim and gvim shared files"
--- a/app-editors/vim/vim-8.2.0814-r100.ebuild
+++ b/app-editors/vim/vim-8.2.0814-r100.ebuild
@ -16,7 +16,7 @@ if [[ ${PV} == 9999* ]] ; then
 else
 	SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> ${P}.tar.gz
 		https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 DESCRIPTION="Vim, an improved vi-style text editor"
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
--- a/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20200303.ebuild
+++ b/app-emacs/nxml-gentoo-schemas/nxml-gentoo-schemas-20200303.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
@ -9,7 +9,7 @@ DESCRIPTION="Extension for nxml-mode with Gentoo-specific schemas"
 HOMEPAGE="https://gitweb.gentoo.org/proj/nxml-gentoo-schemas.git/"
 SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
-LICENSE="HPND"
+LICENSE="HPND MIT GPL-2+"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
--- a/app-emulation/qemu/qemu-5.1.0-r3.ebuild
+++ b/app-emulation/qemu/qemu-5.1.0-r3.ebuild
@ -23,7 +23,7 @@ if [[ ${PV} = *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://download.qemu.org/${P}.tar.xz"
-	KEYWORDS="amd64 arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 arm64 ~ppc ppc64 x86"
 fi
 DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
--- a/app-emulation/qemu/qemu-5.2.0-r1.ebuild
+++ b/app-emulation/qemu/qemu-5.2.0-r1.ebuild
@ -23,7 +23,7 @@ if [[ ${PV} = *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="https://download.qemu.org/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm64 ~ppc ppc64 x86"
 fi
 DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
--- a/app-emulation/vendor-reset/Manifest
+++ b/app-emulation/vendor-reset/Manifest
@ -0,0 +1 @@
 DIST vendor-reset-0.1.0.tar.gz 12718324 BLAKE2B 762ec8bc289b572ab8f8ecc3fa233e3c78c48c48a261c58ce1be9c10356a55957e0bd8fd01e3143443be74236bf9ed540b84d332788c67aa949599ccc5a564d3 SHA512 ed4dcb1a71fa8901732e729d37b501ac105cc2c93d0666e44c08e311d99a244027339d5709a9305ff992ca2acb2f337793cdb1f9369197911985cd20d6f3139f
--- a/app-emulation/vendor-reset/files/modload.conf
+++ b/app-emulation/vendor-reset/files/modload.conf
@ -0,0 +1 @@
 vendor-reset
--- a/app-emulation/vendor-reset/metadata.xml
+++ b/app-emulation/vendor-reset/metadata.xml
@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
 		<email>sarnex@gentoo.org</email>
 		<name>Nick Sarnie</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">wkhtmltopdf/wkhtmltopdf</remote-id>
+		<remote-id type="github">gnif/vendor-reset</remote-id>
 	</upstream>
 </pkgmetadata>
--- a/app-emulation/vendor-reset/vendor-reset-0.1.0.ebuild
+++ b/app-emulation/vendor-reset/vendor-reset-0.1.0.ebuild
@ -0,0 +1,46 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 inherit linux-mod
 if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/gnif/vendor-reset.git"
 	EGIT_BRANCH="master"
 	inherit git-r3
 else
 	KEYWORDS="~amd64"
 	SRC_URI="https://github.com/gnif/vendor-reset/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 fi
 DESCRIPTION="Linux kernel vendor specific hardware reset module"
 HOMEPAGE="https://github.com/gnif/vendor-reset"
 LICENSE="GPL-2"
 SLOT="0"
 DEPEND=""
 RDEPEND="${DEPEND}"
 pkg_setup() {
 	local CONFIG_CHECK="FTRACE KPROBES PCI_QUIRKS KALLSYMS FUNCTION_TRACER"
 	linux-mod_pkg_setup
 }
 src_compile() {
 	set_arch_to_kernel
 	emake \
 		DESTDIR="${ED}" \
 		INSTALL_MOD_PATH="${ED}"
 }
 src_install() {
 	set_arch_to_kernel
 	emake \
 		DESTDIR="${ED}" \
 		INSTALL_MOD_PATH="${ED}" \
 		install
 	insinto /etc/modules-load.d/
 	newins "${FILESDIR}"/modload.conf vendor-reset.conf
 }
--- a/app-emulation/vendor-reset/vendor-reset-9999.ebuild
+++ b/app-emulation/vendor-reset/vendor-reset-9999.ebuild
@ -0,0 +1,46 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 inherit linux-mod
 if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/gnif/vendor-reset.git"
 	EGIT_BRANCH="master"
 	inherit git-r3
 else
 	KEYWORDS="~amd64"
 	SRC_URI="https://github.com/gnif/vendor-reset/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 fi
 DESCRIPTION="Linux kernel vendor specific hardware reset module"
 HOMEPAGE="https://github.com/gnif/vendor-reset"
 LICENSE="GPL-2"
 SLOT="0"
 DEPEND=""
 RDEPEND="${DEPEND}"
 pkg_setup() {
 	local CONFIG_CHECK="FTRACE KPROBES PCI_QUIRKS KALLSYMS FUNCTION_TRACER"
 	linux-mod_pkg_setup
 }
 src_compile() {
 	set_arch_to_kernel
 	emake \
 		DESTDIR="${ED}" \
 		INSTALL_MOD_PATH="${ED}"
 }
 src_install() {
 	set_arch_to_kernel
 	emake \
 		DESTDIR="${ED}" \
 		INSTALL_MOD_PATH="${ED}" \
 		install
 	insinto /etc/modules-load.d/
 	newins "${FILESDIR}"/modload.conf vendor-reset.conf
 }
--- a/app-eselect/Manifest.gz
+++ b/app-eselect/Manifest.gz
--- a/app-eselect/eselect-lua/eselect-lua-4-r1.ebuild
+++ b/app-eselect/eselect-lua/eselect-lua-4-r1.ebuild
@ -8,7 +8,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 RDEPEND="app-admin/eselect
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
--- a/app-i18n/enca/enca-1.19-r2.ebuild
+++ b/app-i18n/enca/enca-1.19-r2.ebuild
@ -1,82 +0,0 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
 inherit autotools eutils flag-o-matic ltprune multilib-minimal toolchain-funcs
 DESCRIPTION="Detect and convert encoding of text files"
 HOMEPAGE="https://cihar.com/software/enca/"
 SRC_URI="https://dl.cihar.com/${PN}/${P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 IUSE="doc +iconv recode static-libs"
 RDEPEND="
 	iconv? ( virtual/libiconv[${MULTILIB_USEDEP}] )
 	recode? ( app-text/recode:0=[${MULTILIB_USEDEP}] )
 "
 DEPEND="${RDEPEND}
 	sys-devel/gettext
 	doc? ( dev-util/gtk-doc )
 "
 pkg_pretend() {
 	if tc-is-cross-compiler && use iconv; then
 		die "${PN} can't be cross built with iconv USE enabled. See Gentoo bug 593220."
 	fi
 }
 src_prepare() {
 	default_src_prepare
 	# Disable unconditional documentation build.
 	sed -i -e '/SUBDIRS/s/ devel-docs//g' Makefile.am || die
 	eautoreconf
 }
 multilib_src_configure() {
 	# Workaround GCC-4.8 brokenness. See Gentoo bug 501386.
 	if tc-is-gcc && [[ $(gcc-version) == "4.8" ]]; then
 		replace-flags -O[3-9] -O2
 	fi
 	local myeconfargs=(
 		--enable-external
 		$(use_enable doc gtk-doc)
 		$(use_enable static-libs static)
 		$(use_with iconv libiconv-prefix "${EPREFIX}/usr")
 		$(use_with recode librecode "${EPREFIX}/usr")
 	)
 	# Workaround automagic virtual/libiconv dependency.
 	use iconv || export am_cv_func_iconv=no
 	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 }
 multilib_src_compile() {
 	# Workaround cross compilation issues. See Gentoo bug 424473.
 	tc-is-cross-compiler && tc-env_build emake -e -C tools
 	if ! multilib_is_native_abi; then
 		emake -C lib
 	else
 		emake
 		use doc && emake -C devel-docs docs
 	fi
 }
 multilib_src_install() {
 	if ! multilib_is_native_abi; then
 		emake -C lib DESTDIR="${D}" install
 		emake DESTDIR="${D}" install-pkgconfigDATA
 	else
 		emake DESTDIR="${D}" install
 		use doc && emake -C devel-docs DESTDIR="${D}" install
 	fi
 	prune_libtool_files
 }
--- a/app-i18n/enca/enca-1.19-r3.ebuild
+++ b/app-i18n/enca/enca-1.19-r3.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://dl.cihar.com/${PN}/${P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 IUSE="doc +iconv recode"
 BDEPEND="doc? ( dev-util/gtk-doc )"
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
--- a/app-misc/lcd4linux/lcd4linux-0.11.0_pre20170527-r5.ebuild
+++ b/app-misc/lcd4linux/lcd4linux-0.11.0_pre20170527-r5.ebuild
@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 inherit autotools flag-o-matic python-single-r1
@ -142,11 +142,7 @@ src_prepare() {
 		rm ax_python_devel.m4
 		# Use correct python version.
-		if use python_single_target_python3_6 || use python_single_target_python3_7; then
+		append-libs "-lpython${EPYTHON#python}$(usex python_single_target_python3_7 'm' '')"
 			append-libs "-lpython${EPYTHON#python}m"
 		else
 			append-libs "-lpython${EPYTHON#python}"
 		fi
 	fi
 	eautoreconf
--- a/app-misc/remind/Manifest
+++ b/app-misc/remind/Manifest
@ -1,4 +1,2 @@
 DIST remind-03.01.15.tar.gz 363101 BLAKE2B a5e27b83c20428991982c3cae22b32be6cc054bfd51a868ee3515f5ec4a37aa24f8ec476f566860ca0fbb6f29e7c9f3e6ed023714e52091ebca103162936877f SHA512 335f3ca88237f1ae53768b9ecdeb03f0bb1e706a8afd3ba36121ec76048a08fbc0d5ec72b05e552394b4cf2131be335c49533e1212b7e713ef16002a0621fc84
-DIST remind-03.02.00.tar.gz 365896 BLAKE2B 3ee47e5c0093c56a2ed95d41eff815ebac26523b64dc09b91ee46d66bac6b2b017d73902ffac61dd12c2088dac8d445fb41d832e22692f47e6e125162f0d436e SHA512 978ee2e6a45756e02bc2de0495d95c4b4377d9af76cb1ea5070f8e2438a451d2bf44245b93018bcbf6ea217520b7b4c8766d5eab354f9a0bc4982b25e90bd278
+DIST remind-03.03.05.tar.gz 402481 BLAKE2B 8fabc3269a06aaf3502c2245653442ddf6c101c3f62718769418c28850da467d210f381ef3452e95b6dbc921fe06979b4c38be8b7389a9defd76865da66080f3 SHA512 56b37dfc50a6c6a8a284691d7f1c39d542b7309ec12a029c65b68f7921cd43521d3cef9fc8d21f4a9f4a7609b0e00013e7f2793b529f39f80d63ae1fe5194fd4
 DIST remind-03.03.00.tar.gz 390762 BLAKE2B efb17d51f9b71c175f8ff79d8d77cca44ddaa79c4837842673530ea130daea864bacd9139c27233a5846708b4162cdb0851ed57ccecce4b59b58d0acc79aca51 SHA512 0ddd751e42e01a841f46eb21a1392d353efa4e4d63c15b7ba6d7874becb16af537df4e41683db5b1bc3749d5e334c972f8b708b92bbe6f0a9e5bb6a80756486c
 DIST remind-03.03.01.tar.gz 395920 BLAKE2B b3b69ef624a70efff5f262b1da0fdd7fba1ea60c6a1375d95e1de6b6b317a2abcafb2298779e4d989c51665633a552fbd0580949dc017a2ed80b331991a0093d SHA512 25b99027b303150af05a3dc971addac970cf1f8086441e9967cba56f51e710bcb7e8e3a1b31bc72ab5205aaefbcf9bac46757b4efb59d07a109ff7e2c8680b94
--- a/app-misc/remind/metadata.xml
+++ b/app-misc/remind/metadata.xml
@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
  <maintainer type="person">
    <email>r+gentoo@r78.nl</email>
    <name>Remco Rĳnders</name>
  </maintainer>
  <maintainer type="project">
-    <email>desktop-misc@gentoo.org</email>
+    <email>proxy-maint@gentoo.org</email>
-    <name>Gentoo Desktop Miscellaneous Project</name>
+    <name>Proxy Maintainers</name>
  </maintainer>
 </pkgmetadata>
--- a/app-misc/remind/remind-03.03.00.ebuild
+++ b/app-misc/remind/remind-03.03.00.ebuild
@ -1,49 +0,0 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 DESCRIPTION="Ridiculously functional reminder program"
 HOMEPAGE="https://dianne.skoll.ca/projects/remind/"
 SRC_URI="https://dianne.skoll.ca/projects/remind/download/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="tk"
 RDEPEND="
 	tk? ( dev-lang/tk dev-tcltk/tcllib )
 "
 DOCS="docs/WHATSNEW examples/defs.rem www/README.*"
 src_prepare() {
 	default
 	sed -i 's:$(MAKE) install:&-nostripped:' "${S}"/Makefile || die
 }
 src_test() {
 	if [[ ${EUID} -eq 0 ]] ; then
 		ewarn "Testing fails if run as root. Skipping tests"
 	else
 		emake test
 	fi
 }
 src_install() {
 	default
 	dobin www/rem2html
 	if ! use tk ; then
 		rm \
 			"${D}"/usr/bin/cm2rem* \
 			"${D}"/usr/bin/tkremind \
 			"${D}"/usr/share/man/man1/cm2rem* \
 			"${D}"/usr/share/man/man1/tkremind* \
 			|| die
 	fi
 	rm "${S}"/contrib/rem2ics-*/{Makefile,rem2ics.spec} || die
 	insinto /usr/share/${PN}
 	doins -r contrib/
 }
--- a/app-misc/remind/remind-03.03.01.ebuild
+++ b/app-misc/remind/remind-03.03.01.ebuild
@ -1,49 +0,0 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 DESCRIPTION="Ridiculously functional reminder program"
 HOMEPAGE="https://dianne.skoll.ca/projects/remind/"
 SRC_URI="https://dianne.skoll.ca/projects/remind/download/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="tk"
 RDEPEND="
 	tk? ( dev-lang/tk dev-tcltk/tcllib )
 "
 DOCS="docs/WHATSNEW examples/defs.rem www/README.*"
 src_prepare() {
 	default
 	sed -i 's:$(MAKE) install:&-nostripped:' "${S}"/Makefile || die
 }
 src_test() {
 	if [[ ${EUID} -eq 0 ]] ; then
 		ewarn "Testing fails if run as root. Skipping tests"
 	else
 		emake test
 	fi
 }
 src_install() {
 	default
 	dobin www/rem2html
 	if ! use tk ; then
 		rm \
 			"${D}"/usr/bin/cm2rem* \
 			"${D}"/usr/bin/tkremind \
 			"${D}"/usr/share/man/man1/cm2rem* \
 			"${D}"/usr/share/man/man1/tkremind* \
 			|| die
 	fi
 	rm "${S}"/contrib/rem2ics-*/{Makefile,rem2ics.spec} || die
 	insinto /usr/share/${PN}
 	doins -r contrib/
 }
--- a/app-misc/remind/remind-03.03.05.ebuild
+++ b/app-misc/remind/remind-03.03.05.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
@ -13,7 +13,7 @@ KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="tk"
 RDEPEND="
-	tk? ( dev-lang/tk dev-tcltk/tcllib )
+	tk? ( >=dev-lang/tk-8.5 dev-tcltk/tcllib )
 "
 DOCS="docs/WHATSNEW examples/defs.rem www/README.*"
--- a/app-misc/worker/worker-3.8.3-r100.ebuild
+++ b/app-misc/worker/worker-3.8.3-r100.ebuild
@ -13,7 +13,7 @@ SRC_URI="http://www.boomerangsworld.de/cms/worker/downloads/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~hppa ppc ~ppc64 x86"
 IUSE="avfs debug dbus examples libnotify lua +magic xinerama xft"
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
--- a/app-office/ledger/Manifest
+++ b/app-office/ledger/Manifest
@ -1,2 +1 @@
 DIST ledger-3.2.0.tar.gz 790404 BLAKE2B 081ca5d857238aecbeae5a0ba3267864442a8c1772a71b1894f5a9fb33173f9a0bd488ad4db3844fce8172268e516ebb92ba0556ced6e67b2a089fbb5adfde36 SHA512 580f4f39d7c3cd2bd1d05bcc36b127cfb311219f39fe50dbf23f582f73dd986729d4b5fa76bfd89cd5db9bfdfcdd5dca5b9d6b24766650040e45b881726e65ea
 DIST ledger-3.2.1.tar.gz 790959 BLAKE2B a25b08f37c6bcf409fb60e0bcc6e11021515fe17f7eb6f23781bd7a7c16b58ac92d4684e5936901ed87f2f5be4df427bd95fe856f8e7eff1e2609329866de71a SHA512 526c60cee354c9d2ead38cef3b89b349467e41fa3ec0927b51e7246a3352f19f0f81574211f20ba9bac5915590b870b9f9478a103ab661d3d9a10f41c52f4512
--- a/app-office/ledger/ledger-3.2.0.ebuild
+++ b/app-office/ledger/ledger-3.2.0.ebuild
@ -1,113 +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} )
 CMAKE_REMOVE_MODULES_LIST=( FindPython Support )
 inherit bash-completion-r1 check-reqs cmake python-single-r1
 DESCRIPTION="Double-entry accounting system with a command-line reporting interface"
 HOMEPAGE="https://www.ledger-cli.org/"
 SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="debug doc python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RESTRICT="test"
 CHECKREQS_MEMORY=8G
 RDEPEND="
 	dev-libs/boost:=[python?]
 	dev-libs/gmp:0=
 	dev-libs/mpfr:0=
 	python? (
 		$(python_gen_cond_dep '
 			dev-libs/boost:=[${PYTHON_USEDEP}]
 			dev-python/cheetah3:=[${PYTHON_USEDEP}]
 		')
 		${PYTHON_DEPS}
 	)
 "
 DEPEND="${RDEPEND}
 	dev-libs/utfcpp
 	doc? (
 		dev-texlive/texlive-fontsrecommended
 		sys-apps/texinfo
 		virtual/texi2dvi
 	)
 "
 pkg_pretend() {
 	if use python; then
 		check-reqs_pkg_pretend
 	fi
 }
 pkg_setup() {
 	if use python; then
 		check-reqs_pkg_setup
 		python-single-r1_pkg_setup
 	fi
 }
 src_prepare() {
 	cmake_src_prepare
 	# Want to type "info ledger" not "info ledger3"
 	sed -i -e 's/ledger3/ledger/g' \
 		doc/{CMakeLists.txt,ledger3.texi} test/CheckTexinfo.py \
 		tools/{cleanup.sh,gendocs.sh,prepare-commit-msg,spellcheck.sh} \
 		|| die "Failed to update info file name in file contents"
 	mv doc/ledger{3,}.texi || die "Failed to rename info file name"
 	rm -r lib/utfcpp || die
 }
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_DOCS="$(usex doc)"
 		-DBUILD_WEB_DOCS="$(usex doc)"
 		-DUSE_PYTHON="$(usex python)"
 		-DCMAKE_INSTALL_DOCDIR="/usr/share/doc/${PF}"
 		-DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=ON
 		-DBUILD_DEBUG="$(usex debug)"
 		-DUTFCPP_PATH="${ESYSROOT}/usr/include/utf8cpp"
 	)
 	if use python; then
 		mycmakeargs+=(
 			-DPython_EXECUTABLE="${PYTHON}"
 			-DPython_INCLUDE_DIR="$(python_get_includedir)"
 		)
 	fi
 	cmake_src_configure
 }
 src_compile() {
 	cmake_src_compile
 	use doc && cmake_src_compile doc
 }
 src_install() {
 	cmake_src_install
 	newbashcomp contrib/${PN}-completion.bash ${PN}
 }
 pkg_postinst() {
 	elog
 	elog "Since version 3, vim support is released separately."
 	elog "See https://github.com/ledger/vim-ledger"
 	elog
 	elog "For Emacs mode, emerge app-emacs/ledger-mode"
 }
 # rainy day TODO:
 # - IUSE test
--- a/app-office/ledger/ledger-3.2.1.ebuild
+++ b/app-office/ledger/ledger-3.2.1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug doc python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
--- a/app-office/libreoffice/files/libreoffice-7.0.4.2-gcc11.patch
+++ b/app-office/libreoffice/files/libreoffice-7.0.4.2-gcc11.patch
@ -0,0 +1,31 @@
 From 8830cf86b146b1252ac37f351a23246088d569b0 Mon Sep 17 00:00:00 2001
 From: Jeff Law <law@redhat.com>
 Date: Tue, 3 Nov 2020 08:05:03 -0700
 Subject: include cstddef for gcc11
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 Change-Id: I2f845ce9bb660ad6c1eea80ea81dd71add2c0db1
 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107191
 Tested-by: Jenkins
 Reviewed-by: Caolán McNamara <caolanm@redhat.com>
 ---
 include/o3tl/lru_map.hxx | 1 +
 1 file changed, 1 insertion(+)
 diff --git a/include/o3tl/lru_map.hxx b/include/o3tl/lru_map.hxx
 index c7132fd079c4..96fb3161782d 100644
 --- a/include/o3tl/lru_map.hxx
 +++ b/include/o3tl/lru_map.hxx
@@ -14,6 +14,7 @@
 #include <cassert>
 #include <list>
 #include <unordered_map>
 +#include <cstddef>
 namespace o3tl
 {
 -- 
 cgit v1.2.1
--- a/app-office/libreoffice/libreoffice-7.0.4.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.0.4.2.ebuild
@ -292,6 +292,9 @@ PATCHES=(
 	"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
 	"${FILESDIR}/${PN}-6.1-nomancompress.patch"
 	"${FILESDIR}/${PN}-7.0.3.1-qt5detect.patch"
 	# 7.0 branch
 	"${FILESDIR}/${PN}-7.0.4.2-gcc11.patch"
 )
 S="${WORKDIR}/${PN}-${MY_PV}"
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
--- a/app-portage/portpeek/Manifest
+++ b/app-portage/portpeek/Manifest
@ -1 +1,2 @@
 DIST portpeek-3.1.5.tar.gz 13501 BLAKE2B a22b039e77d3c72c0cfd71e6abb097ed7aa6f0d4b00bb3c4108bda2980ceceedb21d75eb630cbc8eba2d842fd4cbd77c6e8e54c4c842351d2fb86251abbca522 SHA512 8245e40f9a2fada1919583a67de13ba2b6c111c85c9fd0a02e9177e188e2d8edc42882685399f4c61206d4414d4a8296e93d51d4c45ddac0fc968be43a13c639
 DIST portpeek-3.2.0.tar.gz 13793 BLAKE2B 224ffff46090ee8c6ddc338623a5a1b4323ad2104514f0be8962b5af9070ab8217d76e3b19fdeac148b13cee77531ddb0261b89e563bb9a999b895b2a2475c69 SHA512 2b0592b92ce122c53c687e1897e1a51319527dca70c16ca38564dde870a05ccd0f4a00de88b53194046c9b2a4fef3a3ccf1a5fb84777de8437f66bb6cc25da94
--- a/app-portage/portpeek/portpeek-3.2.0.ebuild
+++ b/app-portage/portpeek/portpeek-3.2.0.ebuild
@ -0,0 +1,30 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI="7"
 PYTHON_COMPAT=( python3_{8,9} )
 inherit python-r1
 DESCRIPTION="A helper program for maintaining the package.keyword and package.unmask files"
 HOMEPAGE="https://www.mpagano.com/blog/?page_id=3"
 SRC_URI="https://www.mpagano.com/downloads/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~sparc ~x86"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 DEPEND="${PYTHON_DEPS}"
 RDEPEND="${DEPEND}
 	>=app-portage/gentoolkit-0.5.0
 	|| (
 		>=sys-apps/portage-3.0.13[${PYTHON_USEDEP}]
 	)"
 src_install() {
 	python_foreach_impl python_doscript ${PN}
 	doman *.[0-9]
 }
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
--- a/app-shells/bash/bash-5.0_p11-r1.ebuild
+++ b/app-shells/bash/bash-5.0_p11-r1.ebuild
@ -46,7 +46,7 @@ fi
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline"
 DEPEND="
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
--- a/app-text/build-docbook-catalog/build-docbook-catalog-1.21.ebuild
+++ b/app-text/build-docbook-catalog/build-docbook-catalog-1.21.ebuild
@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
 DESCRIPTION="DocBook XML catalog auto-updater"
 HOMEPAGE="https://sources.gentoo.org/gentoo-src/build-docbook-catalog/"
@ -11,23 +11,27 @@ SRC_URI="mirror://gentoo/${P}.tar.xz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
-RDEPEND="|| ( sys-apps/util-linux app-misc/getopt )
+RDEPEND="
 	dev-libs/libxml2
 	|| ( sys-apps/util-linux app-misc/getopt )
 	!<app-text/docbook-xsl-stylesheets-1.73.1
-	dev-libs/libxml2"
+"
 DEPEND=""
 pkg_setup() {
 	# export for bug #490754
 	export MAKEOPTS+=" EPREFIX=${EPREFIX}"
 }
 src_prepare() {
 	default
 	sed -i -e "/^EPREFIX=/s:=.*:='${EPREFIX}':" build-docbook-catalog || die
 	has_version sys-apps/util-linux || sed -i -e '/^GETOPT=/s/getopt/&-long/' build-docbook-catalog || die
 }
 src_configure() {
 	# export for bug #490754
 	export MAKEOPTS+=" EPREFIX=${EPREFIX}"
 	default
 }
 pkg_postinst() {
 	# New version -> regen files
 	build-docbook-catalog
--- a/app-text/highlight/highlight-3.57-r100.ebuild
+++ b/app-text/highlight/highlight-3.57-r100.ebuild
@ -13,7 +13,7 @@ SRC_URI="http://www.andre-simon.de/zip/${P}.tar.bz2"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="examples qt5"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
--- a/app-text/htmldoc/Manifest
+++ b/app-text/htmldoc/Manifest
@ -1,2 +1 @@
 DIST htmldoc-1.8.30-source.tar.gz 3901592 BLAKE2B 1aad75973ce485fdbe15d6db99701f88a0fd48a075014c401cc8fdb1f9031214a148748e6731542ca8df7bfa5e5f4c50ec772dac4231fdd71e70f6b092bd20ac SHA512 713dc67622533dae896745ac8809e43a7f91696715aeb77df2628bd04c0d3e16c8402891499e8e0c10cab793b44114e600d5935b3c76a3cfa303c10897456804
 DIST htmldoc-1.9.11-source.tar.gz 4471815 BLAKE2B a76da0f5129d8d637c440ee1880bdc4c314db02294f8e7387abe28ab7f76a81b47c4670a27d34759f89b82e9b1d7c259d154fac7cb8c2b7caa6e1f99f3a35ebf SHA512 5ee6a61f129be9a7d26c554f1acb533f1edfbf34eefd8f4924e07bcead2680407c68b4e2c9840203d7bb07daf51ea18c422d7c04e33c4b346dd207531f330678
--- a/app-text/htmldoc/htmldoc-1.8.30.ebuild
+++ b/app-text/htmldoc/htmldoc-1.8.30.ebuild
@ -1,44 +0,0 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
 inherit toolchain-funcs xdg
 DESCRIPTION="Convert HTML pages into a PDF document"
 HOMEPAGE="https://www.msweet.org/htmldoc/"
 SRC_URI="https://github.com/michaelrsweet/${PN}/releases/download/v${PV}/${P}-source.tar.gz"
 IUSE="fltk"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc x86"
 DEPEND=">=media-libs/libpng-1.4:0=
 	virtual/jpeg:0
 	fltk? ( x11-libs/fltk:1 )"
 RDEPEND="${DEPEND}"
 S="${WORKDIR}"
 src_prepare() {
 	default
 	# make sure not to use the libs htmldoc ships with
 	rm -r jpeg png zlib || die 'failed to unbundle jpeg, png, and zlib'
 	# Fix the documentation path in a few places. Some Makefiles aren't
 	# autotoolized =(
 	for file in configure doc/Makefile doc/htmldoc.man; do
 		sed -i "${file}" \
 			-e "s:/doc/htmldoc:/doc/${PF}/html:g" \
 			|| die "failed to fix documentation path in ${file}"
 	done
 }
 src_configure() {
 	CC=$(tc-getCC) CXX=$(tc-getCXX)	DSTROOT="${D}" econf $(use_with fltk gui)
 }
 src_install() {
 	emake DSTROOT="${D}" install
 }
--- a/app-text/htmldoc/htmldoc-1.9.11-r1.ebuild
+++ b/app-text/htmldoc/htmldoc-1.9.11-r1.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://github.com/michaelrsweet/${PN}/releases/download/v${PV}/${P}-so
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="fltk ssl"
 BDEPEND="virtual/pkgconfig"
--- a/app-text/podofo/podofo-0.9.6_p20190928-r100.ebuild
+++ b/app-text/podofo/podofo-0.9.6_p20190928-r100.ebuild
@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~zmedico/dist/${P}.tar.xz"
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/${PV%_*}"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86"
 IUSE="+boost idn libressl debug test +tools"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="${LUA_REQUIRED_USE}
--- a/app-text/recode/Manifest
+++ b/app-text/recode/Manifest
@ -1,4 +1,2 @@
 DIST recode-3.6.tar.gz 1751886 BLAKE2B 94436343969da0ee6d16ed69a211d4f36b7a9cb59ce931ef71cfc1e0f11e5709e67ee1e0bb24f5320e6c7d6d01920a6c4d9edce87ff2c6aaaa8c80e30f3b536d SHA512 68de277ac8cd5f6023bb077b959ab5778a78edac1299d507bab906824080b6f86e9bfcd89169aa474197c2faa9af2ceb1ed272c8dd4d50caef373afa05daed1b
 DIST recode-3.7.6.tar.gz 2210564 BLAKE2B 8c99b6d2eb93482785fe7e36063514e4c153516cc8059a9b98fc9f1b08704314b7933390a5fd7921525648ef58e9f995242182b8de23b7db33cbf94383e28f29 SHA512 ababefc445fcc47b6bf9ed640b767aed374bb8ce93cdccb641dd1ba5d298360583dd79070a0bb458f1190a8d6f1ddeb3b04eec34a61305b69def0963cec5843f
 DIST recode-3.7.8.tar.gz 2230154 BLAKE2B 853a53d86a3a3600e5d70a8dc67bab9b0fa7a9dfab79e3f4ae8611f54c955802862689077774f7b21ce360f2d91c65ee238406ffa137a84545157e3a70853f42 SHA512 e6cd9c7d3eb5c179d3f62804018d1d19b71a3fae72b0d76aec730c36e64c50a571cbfda5340ac50244a16ccdd9265f5610deadb8908067c3866fa68cbbf0ac70
 DIST recode_3.6-20.debian.tar.gz 341117 BLAKE2B 748ee36b68f1d1501edde23e8afcbd58df70a86745e7c366a27a33496e539dcae11b746fb46767e95ae99b68a18684e3e85c1ea961692ac57ad1a01a895734a7 SHA512 bc586534e77b49da7d387187a8ddb042a12871f87f4f32c818ce7218b7254ac5ba6eccb14aaaf0312579f27958883f2da620016a7049c3af24c8bfba81acc3ef
--- a/Show More
+++ b/Show More
`@ -1 +1,2 @@`
	`DIST paxmirabilis-20161104.cpio.gz 148061 BLAKE2B 997a126d3048488e1a4e49ff9753de2ebdbe75b7daedbea8c95ab5f1902d4768d4b12b13fa684cb2a7c2fe8470ab60e19ea3f9430429a6a4e6e1d57993130fd4 SHA512 42ec8365a5efb9ffb9d383cece39ffaac85c1c8d69856ec557a5567cf0d28d98a0f2d4b7fed53572366eba12c71111cc80b591d51c6a19a3e6437efb62af33ce`	`DIST paxmirabilis-20161104.cpio.gz 148061 BLAKE2B 997a126d3048488e1a4e49ff9753de2ebdbe75b7daedbea8c95ab5f1902d4768d4b12b13fa684cb2a7c2fe8470ab60e19ea3f9430429a6a4e6e1d57993130fd4 SHA512 42ec8365a5efb9ffb9d383cece39ffaac85c1c8d69856ec557a5567cf0d28d98a0f2d4b7fed53572366eba12c71111cc80b591d51c6a19a3e6437efb62af33ce`
		`DIST paxmirabilis-20201030.cpio.gz 171982 BLAKE2B cdda22bf73ff60cda7b8873ed278d1d9d7daab170084ca17760dacffc88b8edd29a0498155f860019b22641d9c84186074c5e696c67846e1997f5883267761b0 SHA512 14c913db49c05b92f3448b7ae2e11b4fdb86c2daa5f269d86e044e8779eec7ea19b41534fbd8ebfe31cffe6b50e51c0460c3994307ba2cfa07029602604882de`
`@ -1 +1,2 @@`
	`DIST pigz-2.4.tar.gz 98234 BLAKE2B 763fe3975c6a83f46b94741d4e16b40a4edef20b7677e8d32b99856498f951edebd86634c227b0f212f0aff87fd3626e21348fdb3839a6abfb21a547bed88be6 SHA512 79b2357176f93b9f3e2bc07fee393fc4d79b7bd0041808f8ddfd23eafccde72e60ca95e97595bb624a4f732fe3612bf46d57c44541c36ae62f9aa6336abe16ba`	`DIST pigz-2.4.tar.gz 98234 BLAKE2B 763fe3975c6a83f46b94741d4e16b40a4edef20b7677e8d32b99856498f951edebd86634c227b0f212f0aff87fd3626e21348fdb3839a6abfb21a547bed88be6 SHA512 79b2357176f93b9f3e2bc07fee393fc4d79b7bd0041808f8ddfd23eafccde72e60ca95e97595bb624a4f732fe3612bf46d57c44541c36ae62f9aa6336abe16ba`
		`DIST pigz-2.5.tar.gz 106438 BLAKE2B d1db42e412d91243aebdc06204a032e1d9dd7e01f659cc428e8a194df26242782d22328658b773b61ccbdf1e34a7ada4d358a93d9c6eda7d7e78c4291ca901ac SHA512 8f52900b8664c67b5b1813ac2f6e226d899c72ba19eefd6424181dc4dc0416d38ad3c7e5fe3dce6bdb58f5ac34ec0269f846c43f9aef6f69a121713113c1643a`
`@ -1,2 +1 @@`
	`DIST amanda-3.3.9.tar.gz 4673301 BLAKE2B 8123a4f0d1fd961562a1ae6b97c2bddc4d9cb735b994c3c5f2359fa8a475a20658fc7e94c86307ab11710f23989a98c77b320e34d881b38d56a51ab0ab2f1bbd SHA512 345670a20cff335453e8dcbf457d1fcdb9f266e4a03d729c2b1ba762f4fac323de4a87713d0fd54c11ca244a08dc97fb8c641625f7fa81cb241b3c17748b1b7e`
	`DIST amanda-3.5.1.tar.gz 5402093 BLAKE2B 4c342fb55b2b5fc0d338a1616bf26b1d844b0ecd6627432b849996c0072756090e1f695050605af0a5c3eda2daeb63131fbe16b5ac728af9137699f4d916b8e8 SHA512 8d5451b6b3f18f9a705592ba6baf8ffb7fb4fe62261eac8a4f4fae4eded3f7f447f547ac6f016bcb57ea43f116cf87fdc48f8e77b117bbdecf00d3e37dd0f39f`	`DIST amanda-3.5.1.tar.gz 5402093 BLAKE2B 4c342fb55b2b5fc0d338a1616bf26b1d844b0ecd6627432b849996c0072756090e1f695050605af0a5c3eda2daeb63131fbe16b5ac728af9137699f4d916b8e8 SHA512 8d5451b6b3f18f9a705592ba6baf8ffb7fb4fe62261eac8a4f4fae4eded3f7f447f547ac6f016bcb57ea43f116cf87fdc48f8e77b117bbdecf00d3e37dd0f39f`
`@ -1 +1,2 @@`
	`DIST backupninja-backupninja_upstream-1.1.0.tar.gz 188991 BLAKE2B 0fb7b10b4a7e635ec29238590e1fae8778e3031cdcd906bb81c4fd97e3ddf083db0e063daadbdfd0c0efe6e2447a7704a25767f65f7229705dba8f8f64c2ee2b SHA512 bea1b024f5bb8d103618f942afa07a7677f0b1896cbef611c461ba586e98c4667112282aa57fdc195f899920072b9cde7cbf97dee7c332fff67df36bb5288f87`	`DIST backupninja-backupninja_upstream-1.1.0.tar.gz 188991 BLAKE2B 0fb7b10b4a7e635ec29238590e1fae8778e3031cdcd906bb81c4fd97e3ddf083db0e063daadbdfd0c0efe6e2447a7704a25767f65f7229705dba8f8f64c2ee2b SHA512 bea1b024f5bb8d103618f942afa07a7677f0b1896cbef611c461ba586e98c4667112282aa57fdc195f899920072b9cde7cbf97dee7c332fff67df36bb5288f87`
		`DIST backupninja-backupninja_upstream-1.2.0.tar.gz 186229 BLAKE2B dc96e10a2db2002d548f6340c807d79b258be7b02d6075450763467b2b9a1fa0c3141093c1725f3fece8efff5d5a35d3fc5deb9cb509c97068836cdd5f160049 SHA512 59c7d64136027f93c1e1fe8051d449405298e1fbb47f93db9af180a64e1356e1ee0a4f83db483c7b26c0ecd0c5a6b7cf023ab1b9bdb123ee04cb44b449442246`
`@ -1 +1,2 @@`
	`DIST libnitrokey-3.5.tar.gz 94356 BLAKE2B 9e53213f309e903d26e0e8e01ab213d6bc42c5b8d720e4b19f27adb607f20ad0c6e1707bf7b55c525efbd6a4fbf7b9c87983decf6b05dab7d03701ae0ea8277f SHA512 d2a95071e92d839c8cde4ac1435158bb469c25662f2988a4e824dbc0dfe83af841e6d04589293deddd77746dbec17b30c50fab69af58cc727ed5e0f2dbd0b5e7`	`DIST libnitrokey-3.5.tar.gz 94356 BLAKE2B 9e53213f309e903d26e0e8e01ab213d6bc42c5b8d720e4b19f27adb607f20ad0c6e1707bf7b55c525efbd6a4fbf7b9c87983decf6b05dab7d03701ae0ea8277f SHA512 d2a95071e92d839c8cde4ac1435158bb469c25662f2988a4e824dbc0dfe83af841e6d04589293deddd77746dbec17b30c50fab69af58cc727ed5e0f2dbd0b5e7`
		`DIST libnitrokey-3.6.tar.gz 98038 BLAKE2B 27f99e7b6de93548fc7a373f37ce784da0aa50503a5c635b4d90282e6330a5ff4c0dcc03a83a7e57045b8a1aabaab27d76a090d7c49693a6ff1037b81e75ece9 SHA512 a00a6724e5c64715eca688ec254efd979acceb5ff4cad28a205f7128e44db8674a5924634fd7da6c69d589deafca7b28b99e1d05a244c321d5cb429f2e5a3bec`
		`@ -0,0 +1 @@`
							`DIST vendor-reset-0.1.0.tar.gz 12718324 BLAKE2B 762ec8bc289b572ab8f8ecc3fa233e3c78c48c48a261c58ce1be9c10356a55957e0bd8fd01e3143443be74236bf9ed540b84d332788c67aa949599ccc5a564d3 SHA512 ed4dcb1a71fa8901732e729d37b501ac105cc2c93d0666e44c08e311d99a244027339d5709a9305ff992ca2acb2f337793cdb1f9369197911985cd20d6f3139f`
`@ -1,2 +1 @@`
	`DIST ledger-3.2.0.tar.gz 790404 BLAKE2B 081ca5d857238aecbeae5a0ba3267864442a8c1772a71b1894f5a9fb33173f9a0bd488ad4db3844fce8172268e516ebb92ba0556ced6e67b2a089fbb5adfde36 SHA512 580f4f39d7c3cd2bd1d05bcc36b127cfb311219f39fe50dbf23f582f73dd986729d4b5fa76bfd89cd5db9bfdfcdd5dca5b9d6b24766650040e45b881726e65ea`
	`DIST ledger-3.2.1.tar.gz 790959 BLAKE2B a25b08f37c6bcf409fb60e0bcc6e11021515fe17f7eb6f23781bd7a7c16b58ac92d4684e5936901ed87f2f5be4df427bd95fe856f8e7eff1e2609329866de71a SHA512 526c60cee354c9d2ead38cef3b89b349467e41fa3ec0927b51e7246a3352f19f0f81574211f20ba9bac5915590b870b9f9478a103ab661d3d9a10f41c52f4512`	`DIST ledger-3.2.1.tar.gz 790959 BLAKE2B a25b08f37c6bcf409fb60e0bcc6e11021515fe17f7eb6f23781bd7a7c16b58ac92d4684e5936901ed87f2f5be4df427bd95fe856f8e7eff1e2609329866de71a SHA512 526c60cee354c9d2ead38cef3b89b349467e41fa3ec0927b51e7246a3352f19f0f81574211f20ba9bac5915590b870b9f9478a103ab661d3d9a10f41c52f4512`
`@ -1 +1,2 @@`
	`DIST portpeek-3.1.5.tar.gz 13501 BLAKE2B a22b039e77d3c72c0cfd71e6abb097ed7aa6f0d4b00bb3c4108bda2980ceceedb21d75eb630cbc8eba2d842fd4cbd77c6e8e54c4c842351d2fb86251abbca522 SHA512 8245e40f9a2fada1919583a67de13ba2b6c111c85c9fd0a02e9177e188e2d8edc42882685399f4c61206d4414d4a8296e93d51d4c45ddac0fc968be43a13c639`	`DIST portpeek-3.1.5.tar.gz 13501 BLAKE2B a22b039e77d3c72c0cfd71e6abb097ed7aa6f0d4b00bb3c4108bda2980ceceedb21d75eb630cbc8eba2d842fd4cbd77c6e8e54c4c842351d2fb86251abbca522 SHA512 8245e40f9a2fada1919583a67de13ba2b6c111c85c9fd0a02e9177e188e2d8edc42882685399f4c61206d4414d4a8296e93d51d4c45ddac0fc968be43a13c639`
		`DIST portpeek-3.2.0.tar.gz 13793 BLAKE2B 224ffff46090ee8c6ddc338623a5a1b4323ad2104514f0be8962b5af9070ab8217d76e3b19fdeac148b13cee77531ddb0261b89e563bb9a999b895b2a2475c69 SHA512 2b0592b92ce122c53c687e1897e1a51319527dca70c16ca38564dde870a05ccd0f4a00de88b53194046c9b2a4fef3a3ccf1a5fb84777de8437f66bb6cc25da94`
`@ -1,2 +1 @@`
	`DIST htmldoc-1.8.30-source.tar.gz 3901592 BLAKE2B 1aad75973ce485fdbe15d6db99701f88a0fd48a075014c401cc8fdb1f9031214a148748e6731542ca8df7bfa5e5f4c50ec772dac4231fdd71e70f6b092bd20ac SHA512 713dc67622533dae896745ac8809e43a7f91696715aeb77df2628bd04c0d3e16c8402891499e8e0c10cab793b44114e600d5935b3c76a3cfa303c10897456804`
	`DIST htmldoc-1.9.11-source.tar.gz 4471815 BLAKE2B a76da0f5129d8d637c440ee1880bdc4c314db02294f8e7387abe28ab7f76a81b47c4670a27d34759f89b82e9b1d7c259d154fac7cb8c2b7caa6e1f99f3a35ebf SHA512 5ee6a61f129be9a7d26c554f1acb533f1edfbf34eefd8f4924e07bcead2680407c68b4e2c9840203d7bb07daf51ea18c422d7c04e33c4b346dd207531f330678`	`DIST htmldoc-1.9.11-source.tar.gz 4471815 BLAKE2B a76da0f5129d8d637c440ee1880bdc4c314db02294f8e7387abe28ab7f76a81b47c4670a27d34759f89b82e9b1d7c259d154fac7cb8c2b7caa6e1f99f3a35ebf SHA512 5ee6a61f129be9a7d26c554f1acb533f1edfbf34eefd8f4924e07bcead2680407c68b4e2c9840203d7bb07daf51ea18c422d7c04e33c4b346dd207531f330678`