Updating liguros repo

55 files changed, 431 insertions, 153 deletions

diff --git a/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20200704.ebuild b/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20200704.ebuild
index ef55df38d098..f829b9696742 100644
--- a/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20200704.ebuild
+++ b/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20200704.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dev.gentoo.org/~mgorny/dist/openpgp-keys/gentoo-release.asc.${P
 
 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"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-office/gnucash/gnucash-3.8b-r1.ebuild b/app-office/gnucash/gnucash-3.8b-r1.ebuild
index 11cd69bf6cc1..5bff0e982194 100644
--- a/app-office/gnucash/gnucash-3.8b-r1.ebuild
+++ b/app-office/gnucash/gnucash-3.8b-r1.ebuild
@@ -17,6 +17,7 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 
 IUSE="aqbanking debug doc examples gnome-keyring +gui mysql nls ofx postgres
 	  python quotes -register2 smartcard sqlite test"
+RESTRICT="!test? ( test )"
 
 # Examples doesn't build unless GUI is also built
 REQUIRED_USE="
diff --git a/app-office/gnucash/gnucash-3.8b.ebuild b/app-office/gnucash/gnucash-3.8b.ebuild
index 3e8a410ad27c..feedc24063a1 100644
--- a/app-office/gnucash/gnucash-3.8b.ebuild
+++ b/app-office/gnucash/gnucash-3.8b.ebuild
@@ -17,6 +17,7 @@ KEYWORDS="amd64 ~ppc ~ppc64 x86"
 
 IUSE="aqbanking debug doc examples gnome-keyring +gui mysql nls ofx postgres
 	  python quotes -register2 smartcard sqlite test"
+RESTRICT="!test? ( test )"
 
 # Examples doesn't build unless GUI is also built
 REQUIRED_USE="
diff --git a/app-portage/cpuid2cpuflags/cpuid2cpuflags-11.ebuild b/app-portage/cpuid2cpuflags/cpuid2cpuflags-11.ebuild
index e2adcb1a4c18..68febed6eb13 100644
--- a/app-portage/cpuid2cpuflags/cpuid2cpuflags-11.ebuild
+++ b/app-portage/cpuid2cpuflags/cpuid2cpuflags-11.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/mgorny/cpuid2cpuflags/releases/download/v${PV}/${P}.
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~ppc ~ppc64 ~x86 ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 arm arm64 ~ppc ~ppc64 ~x86 ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 pkg_postinst() {
diff --git a/app-shells/gentoo-zsh-completions/Manifest b/app-shells/gentoo-zsh-completions/Manifest
index 0cadb7eac113..7a03f7747877 100644
--- a/app-shells/gentoo-zsh-completions/Manifest
+++ b/app-shells/gentoo-zsh-completions/Manifest
@@ -1 +1 @@
-DIST gentoo-zsh-completions-20180228.tar.gz 23246 BLAKE2B a6e4004aa7592cbb097cad55fe9d7286f39bd264d8c463ed22e665ca6a60732b0bc8678a0ac09715e2f34abbadd0e4466d783fdb228ce364bcbe13fb7f097649 SHA512 2b3dcfb910e297eb2f03f4ad9f3749b379ceb60f8b6cbcb7c7d03b7921b79aa21f8d3aa50931c5d4eff52f988a208f1a810c6da7c20720be7a3f2ce4a4564788
+DIST gentoo-zsh-completions-20200914.tar.gz 25823 BLAKE2B 2a4af0fe85819f5cb8b3669f5a3b5b0e9672864a1562641c1760b7fa889648d3b405d5e28fd863bcea7800faca3c7392ecf3c5169755345bbf75d17c996c0de2 SHA512 a7f65e255a3c9f342d266d3a8604645c117124bd3f714d90aa63b3f6f873a4cf46224d7a9969061fc522107139b97695b8bbeb8a6dcb360f41128079adf9ce8c
diff --git a/app-shells/gentoo-zsh-completions/gentoo-zsh-completions-20180228.ebuild b/app-shells/gentoo-zsh-completions/gentoo-zsh-completions-20200914.ebuild
index ff98a19ddf2a..ff98a19ddf2a 100644
--- a/app-shells/gentoo-zsh-completions/gentoo-zsh-completions-20180228.ebuild
+++ b/app-shells/gentoo-zsh-completions/gentoo-zsh-completions-20200914.ebuild
diff --git a/app-text/docbook-sgml-utils/metadata.xml b/app-text/docbook-sgml-utils/metadata.xml
index 9fdc855f61bd..fa3ea7af02f8 100644
--- a/app-text/docbook-sgml-utils/metadata.xml
+++ b/app-text/docbook-sgml-utils/metadata.xml
@@ -7,8 +7,8 @@
 	</maintainer>
 	<use>
 		<flag name="jadetex">
-			Add support for <pkg>app-text/jadetex</pkg> (for processing tex
-			files produced by the TeX backend of Jade)
+			Add support for processing tex files produced by the TeX
+			backend of Jade
 		</flag>
 	</use>
 	<origin>gentoo-staging</origin>
diff --git a/app-text/mandoc/mandoc-1.14.5.ebuild b/app-text/mandoc/mandoc-1.14.5.ebuild
index 5fdb433abdbd..f79cec58e05a 100644
--- a/app-text/mandoc/mandoc-1.14.5.ebuild
+++ b/app-text/mandoc/mandoc-1.14.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://mdocml.bsd.lv/snapshots/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE="static"
 
 LIB_DEPEND="sys-libs/zlib[static-libs(+)]"
diff --git a/dev-libs/libmowgli/files/libmowgli-2.1.3-use-host-tools-for-ar-and-ranlib.patch b/dev-libs/libmowgli/files/libmowgli-2.1.3-use-host-tools-for-ar-and-ranlib.patch
new file mode 100644
index 000000000000..e49e7c2c99b5
--- /dev/null
+++ b/dev-libs/libmowgli/files/libmowgli-2.1.3-use-host-tools-for-ar-and-ranlib.patch
@@ -0,0 +1,15 @@
+diff --git a/configure.ac b/configure.ac
+index dfebb14..b3bd072 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -36,8 +36,8 @@ if test "$pgac_cv_var_PS_STRINGS" = yes ; then
+   AC_DEFINE([HAVE_PS_STRINGS], [], [Define to 1 if the PS_STRINGS struct exists on your platform (likely no).])
+ fi
+ 
+-AC_PATH_PROG(AR, ar)
+-AC_PATH_PROG(RANLIB, ranlib)
++AC_CHECK_TOOL(AR, ar)
++AC_CHECK_TOOL(RANLIB, ranlib)
+ 
+ LIBMOWGLI_MODULES="core base container dns eventloop ext linebuf module object platform thread vio"
+ AC_SUBST(LIBMOWGLI_MODULES)
diff --git a/dev-libs/libmowgli/libmowgli-2.1.3-r1.ebuild b/dev-libs/libmowgli/libmowgli-2.1.3-r2.ebuild
index 2597f8dcc4c6..4158cb1b6e2c 100644
--- a/dev-libs/libmowgli/libmowgli-2.1.3-r1.ebuild
+++ b/dev-libs/libmowgli/libmowgli-2.1.3-r2.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=7
 
+inherit autotools
+
 DESCRIPTION="Useful set of performance and usability-oriented extensions to C"
 HOMEPAGE="https://github.com/atheme/libmowgli-2"
 SRC_URI="https://github.com/atheme/libmowgli-2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
@@ -20,10 +22,22 @@ RDEPEND="ssl? (
 DEPEND="${RDEPEND}"
 
 DOCS=( AUTHORS README doc/BOOST doc/design-concepts.txt )
-PATCHES=( "${FILESDIR}"/${P}-cacheline-Ensure-sysconf-var-is-defined-before-use.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-cacheline-Ensure-sysconf-var-is-defined-before-use.patch
+	"${FILESDIR}"/${P}-use-host-tools-for-ar-and-ranlib.patch
+)
+
 S="${WORKDIR}/${PN}-2-${PV}"
 
+src_prepare() {
+	default
+
+	# $(MAKE) invocation will handle passing down flags.
+	sed -i -e 's/${MFLAGS}//' buildsys.mk.in || die
+
+	AT_M4DIR="m4" eautoreconf
+}
+
 src_configure() {
-	econf \
-		$(use_with ssl openssl)
+	econf $(use_with ssl openssl)
 }
diff --git a/dev-libs/zziplib/Manifest b/dev-libs/zziplib/Manifest
index ecc774b0985a..3dca2d49d453 100644
--- a/dev-libs/zziplib/Manifest
+++ b/dev-libs/zziplib/Manifest
@@ -1 +1,2 @@
 DIST zziplib-0.13.71.tar.gz 1150654 BLAKE2B 00394de5da8b3c5b95ef0aea060e523354845261b846e3c876b13d2d05c6569496475a279d6b211c3215a6f17e6bfe53958baabcebb13cd72d30a9f0c40d9449 SHA512 e035d0ac26dca78335ae3defc652543ff7b353a1a95d76ed1beeb21a08e16f287a62d488f528cfbb77d5b558581b68d439aa0823577524e9aa61a3cf5f208cb5
+DIST zziplib-0.13.71_p20200419.tar.gz 1153032 BLAKE2B 34aa38fde43805636a83f34c064ab09880b7200c414d3666786b7d750a26d8f39dbb431dde7cb81e785cd20a0d444e2a7308b5c79eb71bf0e9f52a051fe01883 SHA512 7f94524ddd745d81656ea9b0314db791e636ed9a8305c4fde7f88572b0302bff4c7f8fa76ccf368b7b8b1c8062a4ad85dfab8f30cdf6ee37f835ff5758751222
diff --git a/dev-libs/zziplib/files/zziplib-0.13.71-find-bash.patch b/dev-libs/zziplib/files/zziplib-0.13.71-find-bash.patch
index e29599c1b2d1..6c62442c5dfb 100644
--- a/dev-libs/zziplib/files/zziplib-0.13.71-find-bash.patch
+++ b/dev-libs/zziplib/files/zziplib-0.13.71-find-bash.patch
@@ -9,7 +9,7 @@ index 7ceba4a..c1b8172 100644
 +find_package ( UnixCommands REQUIRED ) # bash
  join_paths(libdir "\${prefix}" "${CMAKE_INSTALL_LIBDIR}")
  join_paths(includedir "\${prefix}" "${CMAKE_INSTALL_INCLUDEDIR}")
- add_custom_command(OUTPUT SDL_rwops_zzip.pc
+ join_paths(pc_zzipsdldir "\${prefix}" "${zzipsdldir}")
 diff --git a/zzip/CMakeLists.txt b/zzip/CMakeLists.txt
 index a9f6e3a..2cdd275 100644
 --- a/zzip/CMakeLists.txt
diff --git a/dev-libs/zziplib/files/zziplib-0.13.71-installing-man3-pages.patch b/dev-libs/zziplib/files/zziplib-0.13.71-installing-man3-pages.patch
new file mode 100644
index 000000000000..08130f958dda
--- /dev/null
+++ b/dev-libs/zziplib/files/zziplib-0.13.71-installing-man3-pages.patch
@@ -0,0 +1,14 @@
+# https://github.com/gdraheim/zziplib/issues/93
+diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
+index b679f7b..e2887ee 100644
+--- a/docs/CMakeLists.txt
++++ b/docs/CMakeLists.txt
+@@ -190,7 +190,7 @@ add_custom_target(install-manpages
+ endif()
+ if(ZZIP_MANPAGES)
+    install(CODE "message(STATUS \"Installing: man3 pages to ${mandir}/man3\")")
+-   install(DIRECTORY man3/ DESTINATION ${mandir}/man3 MESSAGE_NEVER)
++   install(DIRECTORY ${outdir}/man3/ DESTINATION ${mandir}/man3 MESSAGE_NEVER)
+ endif()
+ add_custom_target(install-docs DEPENDS install-manpages install-htmpages install-site)
+ add_custom_target(install-mans DEPENDS install-manpages)
diff --git a/dev-libs/zziplib/metadata.xml b/dev-libs/zziplib/metadata.xml
index 4f6074969053..0c26fa0ea951 100644
--- a/dev-libs/zziplib/metadata.xml
+++ b/dev-libs/zziplib/metadata.xml
@@ -10,6 +10,7 @@
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<upstream>
+		<remote-id type="github">gdraheim/zziplib</remote-id>
 		<remote-id type="sourceforge">zziplib</remote-id>
 	</upstream>
 	<origin>gentoo-staging</origin>
diff --git a/dev-libs/zziplib/zziplib-0.13.71-r2.ebuild b/dev-libs/zziplib/zziplib-0.13.71-r2.ebuild
index cc9f27115fc2..20fc04ec8876 100644
--- a/dev-libs/zziplib/zziplib-0.13.71-r2.ebuild
+++ b/dev-libs/zziplib/zziplib-0.13.71-r2.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{7,8,9} )
 inherit cmake flag-o-matic python-any-r1
 
 DESCRIPTION="Lightweight library for extracting data from files archived in a single zip file"
-HOMEPAGE="https://sourceforge.net/projects/zziplib/"
+HOMEPAGE="https://github.com/gdraheim/zziplib http://zziplib.sourceforge.net/"
 SRC_URI="https://github.com/gdraheim/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
diff --git a/dev-libs/zziplib/zziplib-0.13.71_p20200419.ebuild b/dev-libs/zziplib/zziplib-0.13.71_p20200419.ebuild
new file mode 100644
index 000000000000..e77b18db777c
--- /dev/null
+++ b/dev-libs/zziplib/zziplib-0.13.71_p20200419.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+inherit cmake flag-o-matic python-any-r1
+
+MY_COMMIT="223930775aa5b325f04cec01f0b18726a7918821"
+
+DESCRIPTION="Lightweight library for extracting data from files archived in a single zip file"
+HOMEPAGE="https://github.com/gdraheim/zziplib http://zziplib.sourceforge.net/"
+SRC_URI="https://github.com/gdraheim/${PN}/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
+SLOT="0/13"
+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"
+IUSE="sdl static-libs test"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	test? ( app-arch/zip )
+"
+DEPEND="
+	sys-libs/zlib
+	sdl? ( >=media-libs/libsdl-1.2.6 )
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}-${MY_COMMIT}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.13.69-009-perror.patch
+	"${FILESDIR}"/${PN}-0.13.71-installing-man3-pages.patch
+)
+
+pkg_setup() {
+	if use test; then
+		python-any-r1_pkg_setup
+	fi
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing # bug reported upstream
+
+	local mycmakeargs=(
+		-DZZIPSDL="$(usex sdl)"
+		-DBUILD_STATIC_LIBS="$(usex static-libs)"
+		-DBUILD_TESTS="$(usex test)"
+		-DZZIPTEST="$(usex test)"
+		-DZZIPDOCS=ON
+		-DZZIPWRAP=OFF
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-python/coverage/Manifest b/dev-python/coverage/Manifest
index df32ed379034..dbb4b8a2e1c9 100644
--- a/dev-python/coverage/Manifest
+++ b/dev-python/coverage/Manifest
@@ -2,3 +2,4 @@ DIST coverage-4.5.2.tar.gz 384845 BLAKE2B a7b4f249a68e025449d26ef8ee2194b9ce355c
 DIST coverage-4.5.4.tar.gz 385185 BLAKE2B 9d040bff13cebd1cb7147f15c3ec03bb08648cf801b5b2bb046a6b5bcadb3d3886be8bf0a624d225f25d10a5ca82fe5fb88f55e44e92a0a3285836b837972970 SHA512 ba534e04fe35cbadc4b16735f25c08f579a49a6677ec106680f222f2dfb3d0f1e011d0962f1c2108c375173ac4588bea1619ecda05ff9ba6fd888daddfd27b0e
 DIST coverage-5.1.tar.gz 687427 BLAKE2B f4eee548cd6fb58c4a527b9e0ac5ee4133c984358f42ca0c87301f95eb60253a2748ccf9d4e88358941d7897998e68e3c5e70e6dc7387bf5e60eda950f4a679c SHA512 7bd3ca158fe2eab1946c52161fb877623d4ed0382de193aa6eb267443fdda86089ec7aaae518115d6a3b5487fd1400320eb503b9afe83182fb3c3621ccbfb6d7
 DIST coverage-5.2.1.tar.gz 694076 BLAKE2B 0aaf9b5668c2fac1220c377d5b841341b534bd14579b70fa3d4c5e64239df71b95c2278e041f46ae3f9d2ae55145894d51457caabdd9540b7d8ce3f32f8d409c SHA512 bda6129a4f4e2db3d26878036ceec137e4f359b8d37ce087e4007751bf0bbda7d706967a50b120378fa533f980e70142328099332374a1f303fa0083ffc078b0
+DIST coverage-5.3.tar.gz 693632 BLAKE2B 9daa3a0fd7f8c3ff7c9d68603e11a0a419d3ab50e3c3fb6be5b694aa1f7566040e1212b7175dfa4f71a0a309db325c00f94a85e0e9e755ae8c4f09c499d0daf4 SHA512 f40a21c394b1a72118965f702ae2b8e09c4e0b2fe92709aedf1de4c8074cd9c2cae0ed4860fbb863e4e5479f1067ff806d7051f7683d6b324de9945c0cacfc39
diff --git a/dev-python/coverage/coverage-5.3.ebuild b/dev-python/coverage/coverage-5.3.ebuild
new file mode 100644
index 000000000000..74dee29511d6
--- /dev/null
+++ b/dev-python/coverage/coverage-5.3.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite(+)"
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Code coverage measurement for Python"
+HOMEPAGE="https://coverage.readthedocs.io/en/latest/ https://pypi.org/project/coverage/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+#IUSE="test"
+# The tests are impossible to appease.  Please run them externally
+# via tox.  Or fix the ebuild if you have hours of time to spend
+# on something utterly useless.
+RESTRICT="test"
+
+#BDEPEND="
+#	test? (
+#		dev-python/PyContracts[${PYTHON_USEDEP}]
+#		dev-python/flaky[${PYTHON_USEDEP}]
+#		dev-python/hypothesis[${PYTHON_USEDEP}]
+#		dev-python/mock[${PYTHON_USEDEP}]
+#		dev-python/pytest[${PYTHON_USEDEP}]
+#		>=dev-python/unittest-mixins-1.4[${PYTHON_USEDEP}]
+#	)
+#"
+
+src_prepare() {
+	# avoid the dep on xdist, run tests verbosely
+	sed -i -e '/^addopts/s:-n3:-v:' setup.cfg || die
+	distutils-r1_src_prepare
+}
+
+python_compile() {
+	if [[ ${EPYTHON} == python2.7 ]]; then
+		local CFLAGS="${CFLAGS} -fno-strict-aliasing"
+		export CFLAGS
+	fi
+
+	distutils-r1_python_compile
+}
+
+python_test() {
+	distutils_install_for_testing
+	local bindir=${TEST_DIR}/scripts
+
+	pushd tests/eggsrc >/dev/null || die
+	distutils_install_for_testing
+	popd >/dev/null || die
+
+	"${EPYTHON}" igor.py zip_mods || die
+	PATH="${bindir}:${PATH}" "${EPYTHON}" igor.py test_with_tracer py || die
+
+	# No C extensions under pypy
+	if [[ ${EPYTHON} != pypy* ]]; then
+		cp -l -- "${TEST_DIR}"/lib/*/coverage/*.so coverage/ || die
+		PATH="${bindir}:${PATH}" "${EPYTHON}" igor.py test_with_tracer c || die
+	fi
+
+	# clean up leftover "egg1" directory
+	rm -rf build/lib/egg1 || die
+}
diff --git a/dev-python/matplotlib/matplotlib-3.2.2-r1.ebuild b/dev-python/matplotlib/matplotlib-3.2.2-r2.ebuild
index 6c8a05de1073..eea2abbc7115 100644
--- a/dev-python/matplotlib/matplotlib-3.2.2-r1.ebuild
+++ b/dev-python/matplotlib/matplotlib-3.2.2-r2.ebuild
@@ -32,7 +32,7 @@ RDEPEND="
 	>=dev-python/cycler-0.10.0-r1[${PYTHON_USEDEP}]
 	>=dev-python/kiwisolver-1.2.0[${PYTHON_USEDEP}]
 	>=dev-python/numpy-1.18.2[${PYTHON_USEDEP}]
-	>=dev-python/pillow-7.1.1[${PYTHON_USEDEP}]
+	>=dev-python/pillow-7.1.1[jpeg,${PYTHON_USEDEP}]
 	>=dev-python/pyparsing-1.5.6[${PYTHON_USEDEP}]
 	dev-python/python-dateutil:0[${PYTHON_USEDEP}]
 	>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
diff --git a/dev-python/matplotlib/matplotlib-3.3.0.ebuild b/dev-python/matplotlib/matplotlib-3.3.0-r1.ebuild
index f2b3a2bf8ad6..49171fc094c8 100644
--- a/dev-python/matplotlib/matplotlib-3.3.0.ebuild
+++ b/dev-python/matplotlib/matplotlib-3.3.0-r1.ebuild
@@ -32,7 +32,7 @@ RDEPEND="
 	>=dev-python/cycler-0.10.0-r1[${PYTHON_USEDEP}]
 	>=dev-python/kiwisolver-1.2.0[${PYTHON_USEDEP}]
 	>=dev-python/numpy-1.18.2[${PYTHON_USEDEP}]
-	>=dev-python/pillow-7.1.1[${PYTHON_USEDEP}]
+	>=dev-python/pillow-7.1.1[jpeg,${PYTHON_USEDEP}]
 	>=dev-python/pyparsing-1.5.6[${PYTHON_USEDEP}]
 	dev-python/python-dateutil:0[${PYTHON_USEDEP}]
 	>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
diff --git a/dev-python/matplotlib/matplotlib-3.3.1-r1.ebuild b/dev-python/matplotlib/matplotlib-3.3.1-r2.ebuild
index aead0d77f471..ac48ec5d07ed 100644
--- a/dev-python/matplotlib/matplotlib-3.3.1-r1.ebuild
+++ b/dev-python/matplotlib/matplotlib-3.3.1-r2.ebuild
@@ -33,7 +33,7 @@ RDEPEND="
 	>=dev-python/cycler-0.10.0-r1[${PYTHON_USEDEP}]
 	>=dev-python/kiwisolver-1.2.0[${PYTHON_USEDEP}]
 	>=dev-python/numpy-1.18.2[${PYTHON_USEDEP}]
-	>=dev-python/pillow-7.1.1[${PYTHON_USEDEP}]
+	>=dev-python/pillow-7.1.1[jpeg,${PYTHON_USEDEP}]
 	>=dev-python/pyparsing-1.5.6[${PYTHON_USEDEP}]
 	dev-python/python-dateutil:0[${PYTHON_USEDEP}]
 	>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
diff --git a/dev-python/pyrsistent/Manifest b/dev-python/pyrsistent/Manifest
index 4c1f66c8fd2d..1e5996fd311a 100644
--- a/dev-python/pyrsistent/Manifest
+++ b/dev-python/pyrsistent/Manifest
@@ -2,3 +2,4 @@ DIST pyrsistent-0.15.6.tar.gz 107424 BLAKE2B 432ce7223fee524cbcd65237171af6f0fa1
 DIST pyrsistent-0.16.0.tar.gz 108012 BLAKE2B 62283b8ef478302964fc6b1869c3646c23b78762c5f4fad68aa239433c54d9c652544d5ce05dee18107c8f9604b689043d07f67b9396f6dce0cce3aab022e2de SHA512 d5764b1a185d4578bf308f338037e0546b06e79a3e7189b904e24e95e0e907bc98d7c1c68becc5549a541a5864df75aba6088cafa3558ecb0a63dafb22f5674a
 DIST pyrsistent-0.17.0.tar.gz 106451 BLAKE2B 6d752f9d396b03cc6391979cb908b4b1a112e160e31961cd7d437f789c99a61c8dfa1406ad18c0873f96a3609e779e12cadcd2d75dd290e4ef4ca1a4e4feaf0e SHA512 e361b1e7e53153fd6d8195766e548a9c708624f2f8ba1c05c1c137306f11f336bffc95d62b6484ee810e71d96ca9faa703b1ebb4e8ff485f28371ecaf5ea27f1
 DIST pyrsistent-0.17.2.tar.gz 106594 BLAKE2B c6135f45b43d4742ac39c722636b42813c24823e5319dc34f4c3f2e97a0e311046bc7cfef305cc0710fb26c5b7b595963953307485645c35d1ccc75383ec08df SHA512 58b78457481b188b65bfbe29da1318128795732b8c98ff89b1bdec1741d821807ae120000ae79115b2c4881f328dd8853e7ae48b0406e0e7fc69fca3c41fcd6f
+DIST pyrsistent-0.17.3.tar.gz 106911 BLAKE2B 90a05617ad1e32801286d3da834bf52b4ea864e7463a0789904e4a3bbfda2f7b987e13ea93e16980f2cf3b5d999e6040b7c5980a81b516999175b4e5f2ed392e SHA512 2d18e1d4cfe9a0a576fd363f466ba920094af0b1cbbb49aec11b32df6c23e59f6552235a496838dab00928cc7f6dad2a4a8aaa0b52cb6a38eba6faedd12846c8
diff --git a/dev-python/pyrsistent/pyrsistent-0.17.3.ebuild b/dev-python/pyrsistent/pyrsistent-0.17.3.ebuild
new file mode 100644
index 000000000000..c6c35de1daef
--- /dev/null
+++ b/dev-python/pyrsistent/pyrsistent-0.17.3.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Persistent/Functional/Immutable data structures"
+HOMEPAGE="https://github.com/tobgu/pyrsistent/ https://pypi.org/project/pyrsistent/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/xmlschema/Manifest b/dev-python/xmlschema/Manifest
index 8ba0830523b4..026758327dfb 100644
--- a/dev-python/xmlschema/Manifest
+++ b/dev-python/xmlschema/Manifest
@@ -1,2 +1,3 @@
 DIST xmlschema-1.2.2.tar.gz 318829 BLAKE2B 5ebb8749d56491e65a2c09b56e965ea6b3e9be3d453a01671fa0da065389ca4bf44993693517bed4ef9df22cb94b9398660a7a838405c1757ee1c6f40aedacd3 SHA512 51be4317530cd1055438a4bf8e484b70d8a9414da5507fd30ed506271317859e5255fc729ed9fa5df2230e2af049ff40e693c67a5062e61fda43a1329ef2138d
 DIST xmlschema-1.2.3.tar.gz 322076 BLAKE2B 2b6c587772a14b4b804a35614a2e1e77ade9be0ef25cabfc331efc3a443058fd51c178339f1d6df2cbda77d2a8d1c2ac2c33155406e7e7f36c10225ecb70a3e7 SHA512 15c47c7e93cb0bf14534dfc298848ba4ac332677583ee14eca0c5908fd935e1a3dc01b96f92e7df6eb45b215eae2b67d74ee2d4d227fb3e3360be944815532b7
+DIST xmlschema-1.2.4.tar.gz 287636 BLAKE2B bbb06fcf0e93b98ad7b9746fa0492bc79705dab79fa3d738bc02368e5d777b61cce60f6bd65f095dc99395037d7f0af3056c0877f0c96efb830fa65e1a389c2b SHA512 27f50890728be149e3c36a5ad706b27c32efecf859699a99bebe9a0b81dea2c1ab733860366a2cf0d30680de7f45d8ae581cb445ba78708db3ed25ff7eef94ee
diff --git a/dev-python/xmlschema/xmlschema-1.2.4.ebuild b/dev-python/xmlschema/xmlschema-1.2.4.ebuild
new file mode 100644
index 000000000000..f1e5e4e9af89
--- /dev/null
+++ b/dev-python/xmlschema/xmlschema-1.2.4.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="An XML Schema validator and decoder"
+HOMEPAGE="https://github.com/sissaschool/xmlschema https://pypi.org/project/xmlschema/"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/elementpath-2.0.2[${PYTHON_USEDEP}]"
+BDEPEND="${RDEPEND}
+	test? (
+		dev-python/lxml[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	"${EPYTHON}" tests/test_all.py -v ||
+		die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-ros/console_bridge_vendor/console_bridge_vendor-1.2.1.ebuild b/dev-ros/console_bridge_vendor/console_bridge_vendor-1.2.1.ebuild
index 375f312a4250..abed157f020d 100644
--- a/dev-ros/console_bridge_vendor/console_bridge_vendor-1.2.1.ebuild
+++ b/dev-ros/console_bridge_vendor/console_bridge_vendor-1.2.1.ebuild
@@ -26,6 +26,7 @@ else
 	KEYWORDS="~amd64"
 fi
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	>=dev-libs/console_bridge-1.0.1
diff --git a/dev-ros/console_bridge_vendor/console_bridge_vendor-9999.ebuild b/dev-ros/console_bridge_vendor/console_bridge_vendor-9999.ebuild
index 375f312a4250..abed157f020d 100644
--- a/dev-ros/console_bridge_vendor/console_bridge_vendor-9999.ebuild
+++ b/dev-ros/console_bridge_vendor/console_bridge_vendor-9999.ebuild
@@ -26,6 +26,7 @@ else
 	KEYWORDS="~amd64"
 fi
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	>=dev-libs/console_bridge-1.0.1
diff --git a/dev-ros/poco_vendor/poco_vendor-9999.ebuild b/dev-ros/poco_vendor/poco_vendor-9999.ebuild
index e3fd503e1e64..c87cc24566bd 100644
--- a/dev-ros/poco_vendor/poco_vendor-9999.ebuild
+++ b/dev-ros/poco_vendor/poco_vendor-9999.ebuild
@@ -26,6 +26,7 @@ else
 	KEYWORDS="~amd64"
 fi
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	>=dev-libs/poco-1.6.1
diff --git a/dev-util/pkgcheck/pkgcheck-0.7.7.ebuild b/dev-util/pkgcheck/pkgcheck-0.7.7.ebuild
index a5dd0f1b75df..a3937f970dfc 100644
--- a/dev-util/pkgcheck/pkgcheck-0.7.7.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-0.7.7.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 fi
 
diff --git a/games-util/steam-launcher/metadata.xml b/games-util/steam-launcher/metadata.xml
new file mode 100644
index 000000000000..2038b81bdb2f
--- /dev/null
+++ b/games-util/steam-launcher/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>dev@kicherer.org</email>
+		<name>Mario Kicherer</name>
+	</maintainer>
+	<longdescription>
+		This ebuild installs common files for the Steam environment,
+		like bootstrap archive and icons, but not the client itself.
+	</longdescription>
+	<upstream>
+		<bugs-to>https://github.com/anyc/steam-overlay</bugs-to>
+	</upstream>
+	<use>
+		<flag name='steamruntime'>Use the official steam runtime libraries</flag>
+	</use>
+	<origin>steam-overlayl</origin>
+</pkgmetadata>
diff --git a/gnome-extra/nemo-fileroller/Manifest b/gnome-extra/nemo-fileroller/Manifest
index 21000abd033a..eb25f7e430ae 100644
--- a/gnome-extra/nemo-fileroller/Manifest
+++ b/gnome-extra/nemo-fileroller/Manifest
@@ -1,2 +1,2 @@
-DIST nemo-extensions-4.6.0.tar.gz 754433 BLAKE2B 83ce84f78a1b991edc7eca156ce7ddb792b70e467004671a00a713227488ca96576c9ab280805eff71090dc47b6eecfdeec636aa4e20d046e38241cba95de987 SHA512 b496732b984f3d4f3fc93dc96ef65b711eaa55bb9c777c19ab224e7ab138f8c6784aa2f16e9a0cc77e79581ed7a04a439955369804dbf930b835df042d7dbd32
-EBUILD nemo-fileroller-4.6.0.ebuild 633 BLAKE2B 7b754a69a1fa0ce08c74eb153eec2fc791cf79b3ddccd8ec65f26a0326e40ea41825eab08632fb7d0eb2dd52f128350ced9ce703ae5ba77479f46dd3a37dc17a SHA512 31853fae4d30f41474523f2f253270744a41bed55fa8d2cd9d3f1e61190771f169247de33ef27ffb971e6c6e4be58014d321eb9f3c25e4810030efcbc2538b86
+DIST 3.2.0.tar.gz 1162843 BLAKE2B 79c864f4d74e2e8d382185abd16c873b64e745ac176a2aa162db37a86a3644d3f0d8ff83c6f2e2a1986d35dba18b5ce0769926a81afd8a193cf35c443f3a1097 SHA512 961aafd1f48033e538b6da2ceee11f98e4319944709b874ad78416790e7d42fd1a82e94a1625fbcd1dbf1fac52f7734be1f58684476e97a66ca63b13ccd7a626
+DIST 4.4.0.tar.gz 790589 BLAKE2B 655edfcfb99baf2b36cc8fea4ee12a1d2f6ed9740bbae0231d8e4daacbf8e2117cbcc12420c0d6eac56eb45dd91dd632e5544581b72063d7095ed6a4dc784c8c SHA512 5ca2cf57950986fdc0f3ed5962fa8ee914ac34bf46c702a0fe0323169060ae8f300406bcb5194fbf88b50aa41e6deb8fa2ee32fdf14eedb7fd9553b10240a2c9
diff --git a/gnome-extra/nemo-fileroller/nemo-fileroller-3.2.0.ebuild b/gnome-extra/nemo-fileroller/nemo-fileroller-3.2.0.ebuild
new file mode 100644
index 000000000000..83a06b536884
--- /dev/null
+++ b/gnome-extra/nemo-fileroller/nemo-fileroller-3.2.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="File Roller integration for Nemo"
+HOMEPAGE="https://github.com/linuxmint/nemo-extensions"
+SRC_URI="https://github.com/linuxmint/nemo-extensions/archive/${PV}.tar.gz"
+S="${WORKDIR}/nemo-extensions-${PV}/${PN}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc"
+
+DEPEND="app-arch/file-roller
+	>=gnome-extra/nemo-${PV}[introspection]"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	if [[ ! -e configure ]] ; then
+		./autogen.sh || die
+	fi
+}
diff --git a/gnome-extra/nemo-fileroller/nemo-fileroller-4.4.0.ebuild b/gnome-extra/nemo-fileroller/nemo-fileroller-4.4.0.ebuild
new file mode 100644
index 000000000000..a35d1af48b05
--- /dev/null
+++ b/gnome-extra/nemo-fileroller/nemo-fileroller-4.4.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="File Roller integration for Nemo"
+HOMEPAGE="https://github.com/linuxmint/nemo-extensions"
+SRC_URI="https://github.com/linuxmint/nemo-extensions/archive/${PV}.tar.gz"
+S="${WORKDIR}/nemo-extensions-${PV}/${PN}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc"
+
+DEPEND="app-arch/file-roller
+	>=gnome-extra/nemo-${PV}"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	if [[ ! -e configure ]] ; then
+		./autogen.sh || die
+	fi
+}
diff --git a/gnome-extra/nemo-fileroller/nemo-fileroller-4.6.0.ebuild b/gnome-extra/nemo-fileroller/nemo-fileroller-4.6.0.ebuild
deleted file mode 100644
index 06de99fc4051..000000000000
--- a/gnome-extra/nemo-fileroller/nemo-fileroller-4.6.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Nemo file-roller integration"
-HOMEPAGE="https://github.com/linuxmint/nemo-extensions"
-SRC_URI="https://github.com/linuxmint/nemo-extensions/archive/${PV}.tar.gz -> nemo-extensions-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="gnome-extra/nemo"
-RDEPEND="${DEPEND}
-	app-arch/file-roller"
-
-S="${WORKDIR}/nemo-extensions-${PV}/${PN}"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_install() {
-	default
-
-	find "${D}" \( -name '*.a' -o -name '*.la' \) -delete || die
-}
diff --git a/gnustep-apps/aclock/aclock-0.4.0-r1.ebuild b/gnustep-apps/aclock/aclock-0.4.0-r1.ebuild
index 4b81de5917e7..81094303f24d 100644
--- a/gnustep-apps/aclock/aclock-0.4.0-r1.ebuild
+++ b/gnustep-apps/aclock/aclock-0.4.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://savannah.nongnu.org/download/gap/${MY_P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc ~x86"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/gnustep-apps/addresses/addresses-0.4.8-r1.ebuild b/gnustep-apps/addresses/addresses-0.4.8-r1.ebuild
index 6121c0d0c7ae..1432885d81aa 100644
--- a/gnustep-apps/addresses/addresses-0.4.8-r1.ebuild
+++ b/gnustep-apps/addresses/addresses-0.4.8-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://savannah.nongnu.org/download/gap/${P/a/A}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc ~x86"
 
 S="${WORKDIR}/${P/a/A}"
 
diff --git a/gnustep-apps/gmines/gmines-0.2-r1.ebuild b/gnustep-apps/gmines/gmines-0.2-r1.ebuild
index 8f98d4744372..c8eb8963bfe4 100644
--- a/gnustep-apps/gmines/gmines-0.2-r1.ebuild
+++ b/gnustep-apps/gmines/gmines-0.2-r1.ebuild
@@ -8,7 +8,7 @@ DESCRIPTION="The well-known minesweeper game"
 HOMEPAGE="https://gap.nongnu.org/gmines/index.html"
 SRC_URI="https://savannah.nongnu.org/download/gap/${P/gm/GM}.tar.gz"
 
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc ~x86"
 SLOT="0"
 LICENSE="GPL-2+"
 
diff --git a/gui-apps/gtkgreet/gtkgreet-0.6.ebuild b/gui-apps/gtkgreet/gtkgreet-0.6-r1.ebuild
index 9bd30fd0243d..a74b52eb2e4b 100644
--- a/gui-apps/gtkgreet/gtkgreet-0.6.ebuild
+++ b/gui-apps/gtkgreet/gtkgreet-0.6-r1.ebuild
@@ -10,9 +10,10 @@ inherit meson
 
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="https://git.sr.ht/~kennylevinsen/gtkgreet.git"
+	EGIT_REPO_URI="https://git.sr.ht/~kennylevinsen/gtkgreet"
 else
-	SRC_URI="https://git.sr.ht/~kennylevinsen/gtkgreet/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	MY_PV=${PV/_rc/-rc}
+	SRC_URI="https://git.sr.ht/~kennylevinsen/gtkgreet/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~ppc64 ~x86"
 fi
 
@@ -22,8 +23,8 @@ IUSE="+layershell +man"
 
 DEPEND="
 	dev-libs/json-c:=
-	gui-libs/gtk-layer-shell
 	x11-libs/gtk+:3
+	layershell? ( gui-libs/gtk-layer-shell )
 "
 RDEPEND="
 	${DEPEND}
diff --git a/gui-apps/gtkgreet/gtkgreet-9999.ebuild b/gui-apps/gtkgreet/gtkgreet-9999.ebuild
index 9bd30fd0243d..bc41aaec11f9 100644
--- a/gui-apps/gtkgreet/gtkgreet-9999.ebuild
+++ b/gui-apps/gtkgreet/gtkgreet-9999.ebuild
@@ -10,7 +10,7 @@ inherit meson
 
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="https://git.sr.ht/~kennylevinsen/gtkgreet.git"
+	EGIT_REPO_URI="https://git.sr.ht/~kennylevinsen/gtkgreet"
 else
 	SRC_URI="https://git.sr.ht/~kennylevinsen/gtkgreet/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~ppc64 ~x86"
@@ -22,7 +22,7 @@ IUSE="+layershell +man"
 
 DEPEND="
 	dev-libs/json-c:=
-	gui-libs/gtk-layer-shell
+	layershell? ( gui-libs/gtk-layer-shell )
 	x11-libs/gtk+:3
 "
 RDEPEND="
diff --git a/mail-filter/afew/Manifest b/mail-filter/afew/Manifest
index 4bfa3c8585d1..80deed73ca07 100644
--- a/mail-filter/afew/Manifest
+++ b/mail-filter/afew/Manifest
@@ -1,4 +1,2 @@
-DIST afew-1.2.0.tar.gz 31831 BLAKE2B 7976dfc1e56461afbd6244220c5d548c7de5e95649bd7ac0c986457c99cfc4574e6f5d6b90bc8985ef37e84f55f52b8417fcc1644c9aadf0a37123e0ea0ecba2 SHA512 98184808ae37e169bdbda9ac43db00e3e0712aaadc9b75e07c8d483c8024aa0cafb0a3424bda5703dfe77a09f5efd9812b80b3468009cfb4562eb5d0069558e4
-DIST afew-1.3.0.tar.gz 33361 BLAKE2B 2553c04fce7e1c9f0a6551a8a01ed85735320bea95fe723050bdbde97aea80b93631c3621ec6cb0687753cbd88ac26725b1c608f7b8a6bcb4fc5bce6d3fce411 SHA512 2e15dc2aa6032b14c3fed57cb5912e3c3471592586f5fa40991b2a007d8a9579c0e1f69e455e1405923b93de64b9b8c126b5ccf8da72144528c57108beea7370
-DIST afew-2.0.0.tar.gz 33116 BLAKE2B 59f2686a6495ee9e4a0afaf3180a83667bc65aaee453fe73cb2813401778d63fbb67adb45ed5f98c5c593d07d53411042096d44d85e652157d6705eb2e236152 SHA512 09eaca6fd387b76f310879f6e04c21f3247e703300d9995d40c420a06a5884cb08ebd51e5d1caee6d8c5be29844f6d562838104445e7b7efd372690c1856f97d
 DIST afew-3.0.0.tar.gz 36525 BLAKE2B fd9b676ad00d9f6d989d8901f8885a7861d753ab96e4a768f2a1118b72893517fc3a8122a7a63d2e26659bf1afc2467bc7503f279b8037c65da9c250c18b152b SHA512 8d1947d547bde7fdc9ec2fc8fb212165fecc1cd4bc37c2dda60133e5ffe31dee1393ad0a92e4f0e2c85863a01f7ae252555e88868fa8ba5dece8380080f0e36c
+DIST afew-3.0.1.tar.gz 40092 BLAKE2B 9ce125ec2359f7cf4630b9602b3068327adc06a699d325c90bc9b545df9ce7f3a62623cc733dfec55ee3e51523e4512ebec04e7186470fc56bb1589a7141cbc9 SHA512 1a76ecc78ed9fb8598be74c48a1d51c78db20df08b27c04c24779aaba01aa457c776457a647c54a5e92f0fda364a86810957a95c0d3f686e77e083d2103b1bf1
diff --git a/mail-filter/afew/afew-1.2.0.ebuild b/mail-filter/afew/afew-1.2.0.ebuild
deleted file mode 100644
index eb2505f3f660..000000000000
--- a/mail-filter/afew/afew-1.2.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python3_{5,6,7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Initial tagging script for Notmuch"
-HOMEPAGE="https://github.com/afewmail/afew"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/chardet[${PYTHON_MULTI_USEDEP}]
-		net-mail/notmuch[python,${PYTHON_MULTI_USEDEP}]
-	')"
-
-DOCS=( "README.rst" )
-
-src_prepare() {
-	sed -r \
-		-e "s/^([[:space:]]+)use_scm_version=.*,$/\1version='${PV}',/" \
-		-e "/^([[:space:]]+)setup_requires=.*,$/d" \
-		-i setup.py || die
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	distutils-r1_src_install
-	dodoc afew/defaults/afew.config
-}
diff --git a/mail-filter/afew/afew-1.3.0-r1.ebuild b/mail-filter/afew/afew-1.3.0-r1.ebuild
deleted file mode 100644
index 32002e5813f5..000000000000
--- a/mail-filter/afew/afew-1.3.0-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python3_{5,6,7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Initial tagging script for Notmuch"
-HOMEPAGE="https://github.com/afewmail/afew"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/chardet[${PYTHON_MULTI_USEDEP}]
-		dev-python/dkimpy[${PYTHON_MULTI_USEDEP}]
-		net-mail/notmuch[python,${PYTHON_MULTI_USEDEP}]
-	')"
-
-DOCS=( "README.rst" )
-
-src_prepare() {
-	sed -r \
-		-e "s/^([[:space:]]+)use_scm_version=.*,$/\1version='${PV}',/" \
-		-e "/^([[:space:]]+)setup_requires=.*,$/d" \
-		-i setup.py || die
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	distutils-r1_src_install
-	dodoc afew/defaults/afew.config
-}
diff --git a/mail-filter/afew/afew-2.0.0.ebuild b/mail-filter/afew/afew-3.0.1.ebuild
index 85ba9fba2eb7..3caa00149849 100644
--- a/mail-filter/afew/afew-2.0.0.ebuild
+++ b/mail-filter/afew/afew-3.0.1.ebuild
@@ -4,6 +4,7 @@
 EAPI=7
 
 DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{5,6,7,8,9} )
 
 inherit distutils-r1
@@ -19,13 +20,13 @@ IUSE="doc"
 
 RDEPEND="
 	$(python_gen_cond_dep '
-		dev-python/chardet[${PYTHON_MULTI_USEDEP}]
-		dev-python/dkimpy[${PYTHON_MULTI_USEDEP}]
-		net-mail/notmuch[python,${PYTHON_MULTI_USEDEP}]
+		dev-python/chardet[${PYTHON_USEDEP}]
+		dev-python/dkimpy[${PYTHON_USEDEP}]
+		net-mail/notmuch[python,${PYTHON_USEDEP}]
 	')"
-DEPEND="
+BDEPEND="
 	$(python_gen_cond_dep '
-		dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
 	')"
 
 DOCS=( "README.rst" )
@@ -46,5 +47,6 @@ python_compile_all() {
 python_install_all() {
 	doman docs/build/man/*
 	dodoc afew/defaults/afew.config
-	use doc && local HTML_DOCS=( docs/build/html/. )
+	use doc && HTML_DOCS=( docs/build/html/. )
+	einstalldocs
 }
diff --git a/net-analyzer/ossec-hids/ossec-hids-3.6.0.ebuild b/net-analyzer/ossec-hids/ossec-hids-3.6.0.ebuild
index 366aa7098bd3..a716eb211cf9 100644
--- a/net-analyzer/ossec-hids/ossec-hids-3.6.0.ebuild
+++ b/net-analyzer/ossec-hids/ossec-hids-3.6.0.ebuild
@@ -19,7 +19,7 @@ RDEPEND="acct-user/ossec
 	acct-user/ossecm
 	acct-user/ossecr
 	dev-libs/libevent
-	dev-libs/libpcre2
+	dev-libs/libpcre2[jit]
 	mysql? ( virtual/mysql )
 	postgres? ( dev-db/postgresql:= )
 	sqlite? ( dev-db/sqlite:3 )"
diff --git a/net-dns/openresolv/Manifest b/net-dns/openresolv/Manifest
index bb865fe16c20..8c719faa916c 100644
--- a/net-dns/openresolv/Manifest
+++ b/net-dns/openresolv/Manifest
@@ -1,3 +1,4 @@
 DIST openresolv-3.10.0.tar.xz 20296 BLAKE2B 2e4fc22aebeb345fcdcc5395603a183a978e2ea24a4b419d76ab41e5179b640e3a317d5f1ef36bc6901d933b20daaca615489c785a41d76a89abc938c20e2723 SHA512 f28fc43887f18f6cbdcdabbb48777fc704ed653e77f34caf349b5c4e5f5f6e7686242ea9f2617f2f65d40d14c794ce28cffee0ec5e5c7b8a19566f3bd72e9ec5
+DIST openresolv-3.11.0.tar.xz 20552 BLAKE2B 5564ecac60124fa391a13979da533c4f7cf99601acc896cb5d3cc029bff15ef48ea36e867a0fc6d1e6e475a7536660fbd819120b3066dd2aadc12abf0e16c8ff SHA512 09708b8a1abf7de926f75a1825d4243be6e59fc1de7cc3d7ab7f5a317e11175bd24af03bff2c878ccc54c96913feed27630765647c70fec8a9f9aa7370744e24
 DIST openresolv-3.9.0.tar.xz 18844 BLAKE2B 0aa2125d79305aab04a8d052d56328493d51aa6ff5b44fdfe08e96ccc78ae1d84f2115e5d59940e7e1cedf7e4fe7dc36a461839bcef8fc2c5b2e21242e441f36 SHA512 4498db60f0b5a762194dd3651b94cc8b01a349a8cfb891e10d040cd6b8e22fa0e9897909517831591787ad22ffad97c78d3281e32296aa1ee67de5dff9bf765e
 DIST openresolv-3.9.2.tar.xz 20200 BLAKE2B 25cb56fd85114c3866207a3bf83d1295eb135f1746f141d8cb8f0fb18cdd96e184ad3fbb47d1f65ce4193b57da61e918ca4306a502eaba650ca438589be9a29b SHA512 2f88ccbb53c6e830eeb7dd53666ee72b9fa30f38324766e1d1734896bc9b7f531e42e234c882b921c79604a3bde2877db2681bab9dd8c590f02779da908d0649
diff --git a/net-dns/openresolv/openresolv-3.11.0.ebuild b/net-dns/openresolv/openresolv-3.11.0.ebuild
new file mode 100644
index 000000000000..45ba61bc2c8d
--- /dev/null
+++ b/net-dns/openresolv/openresolv-3.11.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A framework for managing DNS information"
+HOMEPAGE="https://roy.marples.name/projects/openresolv"
+SRC_URI="https://roy.marples.name/downloads/${PN}/${P}.tar.xz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="selinux"
+
+RDEPEND="selinux? ( sec-policy/selinux-resolvconf )"
+
+src_configure() {
+	local myeconfargs=(
+		--prefix="${EPREFIX}"
+		--rundir="${EPREFIX}"/var/run
+		--libexecdir="${EPREFIX}"/lib/resolvconf
+	)
+	econf "${myeconfargs[@]}"
+}
+
+pkg_config() {
+	if [[ ${ROOT} != / ]]; then
+		eerror "We cannot configure unless \$ROOT=/"
+		return 1
+	fi
+
+	if [[ -n "$(resolvconf -l)" ]]; then
+		einfo "${PN} already has DNS information"
+	else
+		ebegin "Copying /etc/resolv.conf to resolvconf -a dummy"
+		resolvconf -a dummy </etc/resolv.conf
+		eend $? || return $?
+		einfo "The dummy interface will disappear when you next reboot"
+	fi
+}
+
+DOCS=( LICENSE README.md )
diff --git a/net-dns/openresolv/openresolv-3.9.0.ebuild b/net-dns/openresolv/openresolv-3.9.0.ebuild
index dde233146880..bf2ea346e270 100644
--- a/net-dns/openresolv/openresolv-3.9.0.ebuild
+++ b/net-dns/openresolv/openresolv-3.9.0.ebuild
@@ -12,8 +12,6 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="selinux"
 
-DEPEND="!net-dns/resolvconf-gentoo
-	!<net-dns/dnsmasq-2.40-r1"
 RDEPEND="selinux? ( sec-policy/selinux-resolvconf )"
 
 src_configure() {
diff --git a/net-dns/openresolv/openresolv-3.9.2.ebuild b/net-dns/openresolv/openresolv-3.9.2.ebuild
index 7efc80a0a9a3..763dc738699d 100644
--- a/net-dns/openresolv/openresolv-3.9.2.ebuild
+++ b/net-dns/openresolv/openresolv-3.9.2.ebuild
@@ -12,8 +12,6 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="selinux"
 
-DEPEND="!net-dns/resolvconf-gentoo
-	!<net-dns/dnsmasq-2.40-r1"
 RDEPEND="selinux? ( sec-policy/selinux-resolvconf )"
 
 src_configure() {
diff --git a/sci-libs/eccodes/eccodes-2.16.0.ebuild b/sci-libs/eccodes/eccodes-2.16.0.ebuild
index a3c8f6263a48..0f289bcddc2c 100644
--- a/sci-libs/eccodes/eccodes-2.16.0.ebuild
+++ b/sci-libs/eccodes/eccodes-2.16.0.ebuild
@@ -19,7 +19,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
 
 IUSE="defs examples extra-test -fortran memfs netcdf jpeg2k png python szip test threads"
-
+RESTRICT="!test? ( test )"
 REQUIRED_USE="threads? ( !fortran ) test? ( defs !memfs ) extra-test? ( test ) !test? ( memfs? ( python ) )"
 
 RDEPEND="
diff --git a/sci-libs/ignition-fuel-tools/ignition-fuel-tools-4.1.0.ebuild b/sci-libs/ignition-fuel-tools/ignition-fuel-tools-4.1.0.ebuild
index 1a7dd11d3928..f19f9dec6f47 100644
--- a/sci-libs/ignition-fuel-tools/ignition-fuel-tools-4.1.0.ebuild
+++ b/sci-libs/ignition-fuel-tools/ignition-fuel-tools-4.1.0.ebuild
@@ -16,6 +16,7 @@ LICENSE="Apache-2.0"
 SLOT="${IGN_MAJOR}"
 KEYWORDS="~amd64"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-libs/tinyxml2:=
diff --git a/sys-apps/pkgcore/pkgcore-0.10.13.ebuild b/sys-apps/pkgcore/pkgcore-0.10.13.ebuild
index 5dbbaab26af2..f8d0d5b22f14 100644
--- a/sys-apps/pkgcore/pkgcore-0.10.13.ebuild
+++ b/sys-apps/pkgcore/pkgcore-0.10.13.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/pkgcore/pkgcore.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 fi
 
diff --git a/sys-kernel/git-sources/Manifest b/sys-kernel/git-sources/Manifest
index a1861ddf0848..646c3d6bd33d 100644
--- a/sys-kernel/git-sources/Manifest
+++ b/sys-kernel/git-sources/Manifest
@@ -3,3 +3,4 @@ DIST patch-5.9-rc1.patch 62103655 BLAKE2B 7197c9a1811abdd708f74c06893b805d6d185b
 DIST patch-5.9-rc2.patch 62542182 BLAKE2B bc724f610ec553f36faae409bd89b82cc59f04587a9f1595e2cfaa93e17dc16dcf3d64eacbcb3e6ad2206ede32948c0759ac2839542e7be9c86d675948c73887 SHA512 848539231d9a6c6a85ed1af59b9140264a104200269815bd62613f30aa2ab5577f4e89b847adf55c758ec66c4dbee87a71a3e05f9dee157841f3de23ec71e860
 DIST patch-5.9-rc3.patch 63570996 BLAKE2B 7bd2b596298f5cee0baf480544592d0964b473068003c5ee5e4cda064fed5265079b60377779a879b1f2107ccb194500db4d201adcb055ec519981ef7a67d7f0 SHA512 82607e7c3038fe1031d175f4a964e752f90114428bdf3a577764247a33dff3a7ea2a6dba526d1e495a8eb3f55bf87d656e26ef6acf1f96b56c3bdae2542bf320
 DIST patch-5.9-rc4.patch 63952223 BLAKE2B 13121098e6d93ed02b21e9dcef1fd2dc806b0b11958261e05feee2b2b3f946833fe266b1016c84fee7554278d64158f87da91779313b79fbf8407b2e8d2e92ca SHA512 0b167737a08e413a1fb62a7656e7130029e997bbc733924b9e523cea95945126f1da6e7c90a2c5fd97f9621a4c4ddb27e5e462ac4c4b227e4f0492096c0f1201
+DIST patch-5.9-rc5.patch 64122375 BLAKE2B 0f7d66eb7a8bb70fba3068fb77d3a21349e775f4c8f97c4f971fec8c3414d463450928a8c4cc30d26e06d9a7ca8796714631fe7a084c71cf89c6942ffe24503c SHA512 414d7c0d1c42487de01398657e7e8f8801258ad0cbcd5087af6aa59372c04420379fc5a639005a07ef0dce4e7a8cede3c389c3a409ad4647d48cad6a1123ad6d
diff --git a/sys-kernel/git-sources/git-sources-5.9_rc5.ebuild b/sys-kernel/git-sources/git-sources-5.9_rc5.ebuild
new file mode 100644
index 000000000000..c239fcfa16c8
--- /dev/null
+++ b/sys-kernel/git-sources/git-sources-5.9_rc5.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+UNIPATCH_STRICTORDER="yes"
+K_NOUSENAME="yes"
+K_NOSETEXTRAVERSION="yes"
+K_NOUSEPR="yes"
+K_SECURITY_UNSUPPORTED="1"
+K_BASE_VER="5.8"
+K_EXP_GENPATCHES_NOUSE="1"
+K_FROM_GIT="yes"
+ETYPE="sources"
+CKV="${PVR/-r/-git}"
+
+# only use this if it's not an _rc/_pre release
+[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
+inherit kernel-2
+detect_version
+
+DESCRIPTION="The very latest -git version of the Linux kernel"
+HOMEPAGE="https://www.kernel.org"
+SRC_URI="${KERNEL_URI}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE=""
+
+K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
+experimental nature. If you have any issues, try a matching vanilla-sources
+ebuild -- if the problem is not there, please contact the upstream kernel
+developers at https://bugzilla.kernel.org and on the linux-kernel mailing list to
+report the problem so it can be fixed in time for the next kernel release."
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	>=sys-devel/patch-2.7.5"
+
+pkg_postinst() {
+	postinst_sources
+}
diff --git a/xfce-extra/xfce4-time-out-plugin/xfce4-time-out-plugin-1.1.1.ebuild b/xfce-extra/xfce4-time-out-plugin/xfce4-time-out-plugin-1.1.1.ebuild
index 1b0834db8b7b..8974ee5e9643 100644
--- a/xfce-extra/xfce4-time-out-plugin/xfce4-time-out-plugin-1.1.1.ebuild
+++ b/xfce-extra/xfce4-time-out-plugin/xfce4-time-out-plugin-1.1.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/xfce-extra/xfce4-timer-plugin/xfce4-timer-plugin-1.7.1.ebuild b/xfce-extra/xfce4-timer-plugin/xfce4-timer-plugin-1.7.1.ebuild
index f15899695d09..1fc07d2b2e03 100644
--- a/xfce-extra/xfce4-timer-plugin/xfce4-timer-plugin-1.7.1.ebuild
+++ b/xfce-extra/xfce4-timer-plugin/xfce4-timer-plugin-1.7.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 #libx11?