Updating liguros repo

author: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2020-12-08 12:48:26 +0000
committer: Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> 2020-12-08 12:48:26 +0000
commit: 7ec39a79bef58709b3729177b36483ab7609e0b2 (patch)
tree: 92623c0522da104cdea86596e0c0e4492acda288
parent: 8e73fa4fbc3144ab12179c85177465b25b7f7f30 (diff)
download: baldeagleos-repo-7ec39a79bef58709b3729177b36483ab7609e0b2.tar.gz
baldeagleos-repo-7ec39a79bef58709b3729177b36483ab7609e0b2.tar.xz
baldeagleos-repo-7ec39a79bef58709b3729177b36483ab7609e0b2.zip
105 files changed, 3006 insertions, 450 deletions
diff --git a/app-eselect/eselect-php/Manifest b/app-eselect/eselect-php/Manifest
index 313fb404135d..c68b2b5c945e 100644
--- a/app-eselect/eselect-php/Manifest
+++ b/app-eselect/eselect-php/Manifest
@@ -1 +1,2 @@
 DIST eselect-php-0.9.6.tar.xz 53236 BLAKE2B 38478d4792f8a527e5f519abd7765211aff8c1d132ceeba5eec70ea3b8d1f254be52564334fed3840950c2461ff4a30784b92fbb8b21cc448083617797eab1d4 SHA512 d3f14288b3493cb48717c1f27430ae8b60881e9f6f48e4b7644a4596d9fc1b9823a6af8b7101a62b28a92e3bff164b1717617a2642a5bb02e8dd46de56d4f410
+DIST eselect-php-0.9.7.tar.bz2 8460 BLAKE2B 160c87d1373b10cb2bd2d48210c7382f721433fb45557d0a5336af0ea25a1a49b151bcbbcf253947e6a5018b5740e8f9f9b1a66544bd74539a4e54aeab047a74 SHA512 f6c909906228906bc75be24bdf69330db10b0ea84822a5a016a185ac2855eec34bf6cb0bdaf22f3edc331002e72c8ae56733e1ea13cf815948a7a58439240fa9
diff --git a/app-eselect/eselect-php/eselect-php-0.9.7.ebuild b/app-eselect/eselect-php/eselect-php-0.9.7.ebuild
new file mode 100644
index 000000000000..c118dbec2492
--- /dev/null
+++ b/app-eselect/eselect-php/eselect-php-0.9.7.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd autotools
+
+DESCRIPTION="PHP eselect module"
+HOMEPAGE="https://gitweb.gentoo.org/proj/eselect-php.git/"
+SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
+
+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 ~x86-macos"
+IUSE="fpm apache2"
+
+# The "DirectoryIndex" line in 70_mod_php.conf requires mod_dir.
+RDEPEND="app-admin/eselect
+	apache2? ( www-servers/apache[apache2_modules_dir] )"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# We expect localstatedir to be "var"ish, not "var/lib"ish, because
+	# that's what PHP upstream expects. See for example the FPM
+	# configuration where they put logs in @localstatedir@/log.
+	#
+	# The libdir is passed explicitly in case the /usr/lib symlink
+	# is not present (bug 624528).
+	econf --libdir="${EPREFIX}/usr/$(get_libdir)" \
+		  --localstatedir="${EPREFIX}/var" \
+		  --with-piddir="${EPREFIX}/run" \
+		  $(use_enable apache2) \
+		  $(use_enable fpm)
+}
diff --git a/dev-go/go-bindata/Manifest b/dev-go/go-bindata/Manifest
index e89354dd767c..bab3f4c9d656 100644
--- a/dev-go/go-bindata/Manifest
+++ b/dev-go/go-bindata/Manifest
@@ -1 +1 @@
-DIST go-bindata-3.1.3.tar.gz 21280 BLAKE2B cf54b50113006f02eeab47312fcf1eaa1e4b820847ee9c579318a5aac0b720648f73cbf3d2d41e120ea79b65dc3dcfa32accaff16ed4610bcf9a9dd317e9d819 SHA512 870f939cfb07b43c54000d39fa37e8151ca5c20d13eac9bde59e7ec3e2693d8386a1ea4b5372171dac42f8a4f69a754445cb9a4fa51a7a7ba9ec54f3e8a2a2f6
+DIST go-bindata-3.21.0.tar.gz 15615959 BLAKE2B b635869202025992a7f92645de7aa96fadd18f5c99d5e312a1e645712940d05342e192401eb5aec04aac72c50b17d1fe370ef317356d47a40141cec3dc8f01a7 SHA512 004b9f0389d26f82d1419e8e8ad249d33583e85c4b4aaa4e36215bd5289a24146a237bcb55b9d51ff29c1b01ebd822ff60dcf205cb73d34f810e6838df172265
diff --git a/dev-go/go-bindata/go-bindata-3.1.3.ebuild b/dev-go/go-bindata/go-bindata-3.1.3.ebuild
deleted file mode 100644
index 10d5d8179d7e..000000000000
--- a/dev-go/go-bindata/go-bindata-3.1.3.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2020 Liguros Authors
-# Distributed under the terms of the GNU General Public License v2
-EAPI=7
-inherit golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/go-bindata/go-bindata/..."
-KEYWORDS="amd64 ~arm ~arm64"
-
-DESCRIPTION="A small utility which generates Go code from any file"
-HOMEPAGE="https://github.com/go-bindata/go-bindata"
-SRC_URI="https://github.com/go-bindata/go-bindata/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="CC-PD"
-SLOT="0/${PVR}"
-
-src_install() {
-	GOBIN=${S}/bin \
-		golang-build_src_install
-	dobin bin/*
-}
diff --git a/dev-go/go-bindata/go-bindata-3.21.0.ebuild b/dev-go/go-bindata/go-bindata-3.21.0.ebuild
new file mode 100644
index 000000000000..02d914964278
--- /dev/null
+++ b/dev-go/go-bindata/go-bindata-3.21.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Go Overlay Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# NOTE: The original github.com/jteeuwen/go-bindata is no more maintained.
+#       Instead, we use a fork which is API compatible.
+#       For more details, see https://github.com/Dr-Terrible/go-overlay/issues/76
+GOLANG_PKG_IMPORTPATH="github.com/kevinburke"
+GOLANG_PKG_ARCHIVEPREFIX="v"
+GOLANG_PKG_IS_MULTIPLE=1
+GOLANG_PKG_HAVE_TEST=1
+
+inherit golang-single
+
+DESCRIPTION="A small utility for embedding binary data in a GoLang program."
+
+LICENSE="CC0-1.0"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 x86"
diff --git a/dev-go/go-bindata/metadata.xml b/dev-go/go-bindata/metadata.xml
index 8c1d74d431e9..0afda6620771 100644
--- a/dev-go/go-bindata/metadata.xml
+++ b/dev-go/go-bindata/metadata.xml
@@ -1,12 +1,18 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>dev@liguros.net</email>
-    <name>Development</name>
-  </maintainer>
+	<maintainer type="person">
+		<email>toffanin.mauro@gmail.com</email>
+		<name>Mauro Toffanin</name>
+		<description>Maintainer. Assign bugs to him</description>
+	</maintainer>
 	<upstream>
-		<remote-id type="github">jteeuwen/go-bindata</remote-id>
+		<bugs-to>https://github.com/jteeuwen/go-bindata/issues</bugs-to>
 	</upstream>
-	<origin>ports</origin>
+	<longdescription lang="en">
+		This package converts any file into managable Go source code. Useful for
+		embedding binary data into a go program. The file data is optionally
+		gzip compressed before being converted to a raw byte slice.
+	</longdescription>
+	<origin>go-overlay</origin>
 </pkgmetadata>
diff --git a/dev-lang/moarvm/moarvm-2020.11.ebuild b/dev-lang/moarvm/moarvm-2020.11.ebuild
index 7729babf1b4b..dfc9e614ad17 100644
--- a/dev-lang/moarvm/moarvm-2020.11.ebuild
+++ b/dev-lang/moarvm/moarvm-2020.11.ebuild
@@ -26,7 +26,6 @@ IUSE="asan clang debug doc +jit optimize static-libs ubsan"
 
 RDEPEND="dev-libs/libatomic_ops
 		>=dev-libs/libuv-1.26
-		dev-lang/lua:0=
 		dev-libs/libffi"
 DEPEND="${RDEPEND}
 	clang? ( >=sys-devel/clang-3.1 )
diff --git a/dev-lang/moarvm/moarvm-9999.ebuild b/dev-lang/moarvm/moarvm-9999.ebuild
index c7d6089da4dc..b8580ba67306 100644
--- a/dev-lang/moarvm/moarvm-9999.ebuild
+++ b/dev-lang/moarvm/moarvm-9999.ebuild
@@ -26,7 +26,6 @@ IUSE="asan clang debug doc static-libs optimize ubsan"
 
 RDEPEND="dev-libs/libatomic_ops
 		>=dev-libs/libuv-1.26
-		dev-lang/lua:0=
 		dev-libs/libffi"
 DEPEND="${RDEPEND}"
 BDEPEND="${RDEPEND}
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 0e0a2d22d670..718e2e97bedd 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -10,3 +10,4 @@ DIST php-7.4.11.tar.xz 10302076 BLAKE2B e32e77057ddd7b12553766e30366262812d43427
 DIST php-7.4.12.tar.xz 10311980 BLAKE2B 11052d59881f84d4012fa993e5969abf52d4419877bf595ba524b31f5971f623adc382f49d4f7ed75f33dcf85c903a66d88b7c983807ee5f79152314334061c5 SHA512 6c06fb74f8e479ead000b0e2e56602c217d012f1a80e47e151543c033bb5426e56aaa5e8acfcd19fd49ae14c4ca827c8e57a5b56386b20002dbc80fbd07ab04f
 DIST php-7.4.13.tar.xz 10319848 BLAKE2B c1da97eb605f1fc2b36190bfe92feb1fd527f4aaf1483865561a08cf990e70445f5520c8abcea7d9c6482dc47e500507644e0cd2cc756cfa99adfec0359cd795 SHA512 3525f4fd4ea6d97ed75ed8360d2a851e8577c09247ae3c6eb7e7b43265ee418297d91c1022bf5bbb64d1eecdebbbc2e0f6d42b560f584a741b475db2c6897ea7
 DIST php-7.4.9.tar.xz 10289560 BLAKE2B 0fd9d82539a46f7ce58857560f5aeb4be6dfe5f5a05f8b8c55c30d6000d19408b4ecc460c9135736298cdb8312ec958ab8358110b2b265bb8c185f80b1522dc6 SHA512 6179c2d867d6775d7f41785003c36d06ce620e7746ea7e6a4d275264e814a66d465776b47b04e2926ed1228cf58f2c15cdda74faf10372435c74ede7aeb79e18
+DIST php-8.0.0.tar.xz 10726788 BLAKE2B 16c4aa075ba5dee6d47086323cd152b33dc7b62ac6b3ab6637ec386c1048e256a160d72e72cbc88450af1e84389042ebf2d644d3361c9a34879cc494d5b9b64f SHA512 65630940c95436f3e3ecb71b9f1ca15bb4118267dbda604ed1ee009d528c21a3ec21f48a15e4dd3529fe9cd2b354c211a7b4975b5de43e1f2afa6656cabe1fd0
diff --git a/dev-lang/php/php-8.0.0.ebuild b/dev-lang/php/php-8.0.0.ebuild
new file mode 100644
index 000000000000..801d79b66ceb
--- /dev/null
+++ b/dev-lang/php/php-8.0.0.ebuild
@@ -0,0 +1,747 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+WANT_AUTOMAKE="none"
+
+inherit flag-o-matic systemd autotools
+
+MY_PV=${PV/_rc/rc}
+DESCRIPTION="The PHP language runtime engine"
+HOMEPAGE="https://www.php.net/"
+SRC_URI="https://www.php.net/distributions/${P}.tar.xz"
+
+LICENSE="PHP-3.01
+	BSD
+	Zend-2.0
+	bcmath? ( LGPL-2.1+ )
+	fpm? ( BSD-2 )
+	gd? ( gd )
+	unicode? ( BSD-2 LGPL-2.1 )"
+
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+# We can build the following SAPIs in the given order
+SAPIS="embed cli cgi fpm apache2 phpdbg"
+
+# SAPIs and SAPI-specific USE flags (cli SAPI is default on):
+IUSE="${IUSE}
+	${SAPIS/cli/+cli}
+	threads"
+
+IUSE="${IUSE} acl argon2 bcmath berkdb bzip2 calendar cdb cjk
+	coverage +ctype curl debug
+	enchant exif ffi +fileinfo +filter firebird
+	+flatfile ftp gd gdbm gmp +iconv imap inifile
+	intl iodbc ipv6 kerberos ldap ldap-sasl libedit libressl lmdb
+	mhash mssql mysql mysqli nls
+	oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm
+	readline selinux +session session-mm sharedmem
+	+simplexml snmp soap sockets sodium spell sqlite ssl
+	sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode webp
+	+xml xmlreader xmlwriter xpm xslt zip zlib"
+
+# Without USE=readline or libedit, the interactive "php -a" CLI will hang.
+REQUIRED_USE="
+	|| ( cli cgi fpm apache2 embed phpdbg )
+	cli? ( ^^ ( readline libedit ) )
+	!cli? ( ?? ( readline libedit ) )
+	truetype? ( gd zlib )
+	webp? ( gd zlib )
+	cjk? ( gd zlib )
+	exif? ( gd zlib )
+	xpm? ( gd zlib )
+	gd? ( zlib )
+	simplexml? ( xml )
+	soap? ( xml )
+	xmlreader? ( xml )
+	xmlwriter? ( xml )
+	xslt? ( xml )
+	ldap-sasl? ( ldap )
+	qdbm? ( !gdbm )
+	session-mm? ( session !threads )
+	mysql? ( || ( mysqli pdo ) )
+	firebird? ( pdo )
+	mssql? ( pdo )
+"
+
+RESTRICT="!test? ( test )"
+
+# The supported (that is, autodetected) versions of BDB are listed in
+# the ./configure script. Other versions *work*, but we need to stick to
+# the ones that can be detected to avoid a repeat of bug #564824.
+COMMON_DEPEND="
+	>=app-eselect/eselect-php-0.9.7[apache2?,fpm?]
+	>=dev-libs/libpcre2-10.30[unicode]
+	fpm? ( acl? ( sys-apps/acl ) )
+	apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] )
+	argon2? ( app-crypt/argon2:= )
+	berkdb? ( || (	sys-libs/db:5.3
+					sys-libs/db:5.1
+					sys-libs/db:4.8
+					sys-libs/db:4.7
+					sys-libs/db:4.6
+					sys-libs/db:4.5 ) )
+	bzip2? ( app-arch/bzip2:0= )
+	cdb? ( || ( dev-db/cdb dev-db/tinycdb ) )
+	coverage? ( dev-util/lcov )
+	curl? ( >=net-misc/curl-7.29.0 )
+	enchant? ( app-text/enchant:2 )
+	ffi? ( >=dev-libs/libffi-3.0.11 )
+	firebird? ( dev-db/firebird )
+	gd? ( >=virtual/jpeg-0-r3:0 media-libs/libpng:0= )
+	gdbm? ( >=sys-libs/gdbm-1.8.0:0= )
+	gmp? ( dev-libs/gmp:0= )
+	iconv? ( virtual/libiconv )
+	imap? ( >=virtual/imap-c-client-2[kerberos=,ssl=] )
+	intl? ( dev-libs/icu:= )
+	kerberos? ( virtual/krb5 )
+	ldap? ( >=net-nds/openldap-1.2.11 )
+	ldap-sasl? ( dev-libs/cyrus-sasl )
+	libedit? ( dev-libs/libedit )
+	lmdb? ( dev-db/lmdb:= )
+	mssql? ( dev-db/freetds[mssql] )
+	nls? ( sys-devel/gettext )
+	oci8-instant-client? ( dev-db/oracle-instantclient-basic )
+	odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( >=dev-db/unixODBC-1.8.13 ) )
+	postgres? ( >=dev-db/postgresql-9.1:* )
+	qdbm? ( dev-db/qdbm )
+	readline? ( sys-libs/readline:0= )
+	session-mm? ( dev-libs/mm )
+	snmp? ( >=net-analyzer/net-snmp-5.2 )
+	sodium? ( dev-libs/libsodium:= )
+	spell? ( >=app-text/aspell-0.50 )
+	sqlite? ( >=dev-db/sqlite-3.7.6.3 )
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-1.0.1:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	tidy? ( || ( app-text/tidy-html5 app-text/htmltidy ) )
+	tokyocabinet? ( dev-db/tokyocabinet )
+	truetype? ( =media-libs/freetype-2* )
+	unicode? ( dev-libs/oniguruma:= )
+	webp? ( media-libs/libwebp:0= )
+	xml? ( >=dev-libs/libxml2-2.9.0 )
+	xpm? ( x11-libs/libXpm )
+	xslt? ( dev-libs/libxslt )
+	zip? ( >=dev-libs/libzip-1.2.0:= )
+	zlib? ( >=sys-libs/zlib-1.2.0.4:0= )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/mta
+	fpm? (
+		selinux? ( sec-policy/selinux-phpfpm )
+		systemd? ( sys-apps/systemd ) )"
+
+# Bison isn't actually needed when building from a release tarball
+# However, the configure script will warn if it's absent or if you
+# have an incompatible version installed. See bug 593278.
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils
+	>=sys-devel/bison-3.0.1"
+
+BDEPEND="virtual/pkgconfig"
+
+PHP_MV="$(ver_cut 1)"
+
+PATCHES=( "${FILESDIR}/php-iodbc-header-location.patch" )
+
+php_install_ini() {
+	local phpsapi="${1}"
+
+	# work out where we are installing the ini file
+	php_set_ini_dir "${phpsapi}"
+
+	# Always install the production INI file, bug 611214.
+	local phpinisrc="php.ini-production-${phpsapi}"
+	cp php.ini-production "${phpinisrc}" || die
+
+	# default to /tmp for save_path, bug #282768
+	sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" || die
+
+	# Set the extension dir
+	sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" \
+		-i "${phpinisrc}" || die
+
+	# Set the include path to point to where we want to find PEAR packages
+	sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die
+
+	insinto "${PHP_INI_DIR#${EPREFIX}}"
+	newins "${phpinisrc}" php.ini
+
+	elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}"
+	elog
+
+	dodir "${PHP_EXT_INI_DIR#${EPREFIX}}"
+	dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}"
+
+	if use opcache; then
+		elog "Adding opcache to $PHP_EXT_INI_DIR"
+		echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> \
+			 "${D}/${PHP_EXT_INI_DIR}"/opcache.ini
+		dosym "../ext/opcache.ini" \
+			  "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini"
+	fi
+
+	# SAPI-specific handling
+	if [[ "${sapi}" == "fpm" ]] ; then
+		einfo "Installing FPM config files php-fpm.conf and www.conf"
+		insinto "${PHP_INI_DIR#${EPREFIX}}"
+		doins sapi/fpm/php-fpm.conf
+		insinto "${PHP_INI_DIR#${EPREFIX}}/fpm.d"
+		doins sapi/fpm/www.conf
+	fi
+
+	dodoc php.ini-{development,production}
+}
+
+php_set_ini_dir() {
+	PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}"
+	PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext"
+	PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active"
+}
+
+src_prepare() {
+	default
+
+	# In php-7.x, the FPM pool configuration files have been split off
+	# of the main config. By default the pool config files go in
+	# e.g. /etc/php-fpm.d, which isn't slotted. So here we move the
+	# include directory to a subdirectory "fpm.d" of $PHP_INI_DIR. Later
+	# we'll install the pool configuration file "www.conf" there.
+	php_set_ini_dir fpm
+	sed -i "s~^include=.*$~include=${PHP_INI_DIR}/fpm.d/*.conf~" \
+		sapi/fpm/php-fpm.conf.in \
+		|| die 'failed to move the include directory in php-fpm.conf'
+
+	# Emulate buildconf to support cross-compilation
+	rm -fr aclocal.m4 autom4te.cache config.cache \
+		configure main/php_config.h.in || die
+	eautoconf --force
+	eautoheader
+}
+
+src_configure() {
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+	PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}"
+
+	# The php-fpm config file wants localstatedir to be ${EPREFIX}/var
+	# and not the Gentoo default ${EPREFIX}/var/lib. See bug 572002.
+	local our_conf=(
+		--prefix="${PHP_DESTDIR}"
+		--mandir="${PHP_DESTDIR}/man"
+		--infodir="${PHP_DESTDIR}/info"
+		--libdir="${PHP_DESTDIR}/lib"
+		--with-libdir="$(get_libdir)"
+		--localstatedir="${EPREFIX}/var"
+		--without-pear
+		$(use_enable threads zts)
+	)
+
+	our_conf+=(
+		$(use_with argon2 password-argon2 "${EPREFIX}/usr")
+		$(use_enable bcmath)
+		$(use_with bzip2 bz2 "${EPREFIX}/usr")
+		$(use_enable calendar)
+		$(use_enable coverage gcov)
+		$(use_enable ctype)
+		$(use_with curl)
+		$(use_enable xml dom)
+		$(use_with enchant)
+		$(use_enable exif)
+		$(use_with ffi)
+		$(use_enable fileinfo)
+		$(use_enable filter)
+		$(use_enable ftp)
+		$(use_with nls gettext "${EPREFIX}/usr")
+		$(use_with gmp gmp "${EPREFIX}/usr")
+		$(use_with mhash mhash "${EPREFIX}/usr")
+		$(use_with iconv iconv \
+			$(use elibc_glibc || use elibc_musl || use elibc_FreeBSD || echo "${EPREFIX}/usr"))
+		$(use_enable intl)
+		$(use_enable ipv6)
+		$(use_with kerberos)
+		$(use_with xml libxml)
+		$(use_enable unicode mbstring)
+		$(use_with ssl openssl)
+		$(use_enable pcntl)
+		$(use_enable phar)
+		$(use_enable pdo)
+		$(use_enable opcache)
+		$(use_with postgres pgsql "${EPREFIX}/usr")
+		$(use_enable posix)
+		$(use_with spell pspell "${EPREFIX}/usr")
+		$(use_enable simplexml)
+		$(use_enable sharedmem shmop)
+		$(use_with snmp snmp "${EPREFIX}/usr")
+		$(use_enable soap)
+		$(use_enable sockets)
+		$(use_with sodium)
+		$(use_with sqlite sqlite3)
+		$(use_enable sysvipc sysvmsg)
+		$(use_enable sysvipc sysvsem)
+		$(use_enable sysvipc sysvshm)
+		$(use_with tidy tidy "${EPREFIX}/usr")
+		$(use_enable tokenizer)
+		$(use_enable xml)
+		$(use_enable xmlreader)
+		$(use_enable xmlwriter)
+		$(use_with xslt xsl)
+		$(use_with zip)
+		$(use_with zlib zlib "${EPREFIX}/usr")
+		$(use_enable debug)
+	)
+
+	# DBA support
+	if use cdb || use berkdb || use flatfile || use gdbm || use inifile \
+		|| use qdbm || use lmdb || use tokyocabinet ; then
+		our_conf+=( "--enable-dba" )
+	fi
+
+	# DBA drivers support
+	our_conf+=(
+		$(use_with cdb)
+		$(use_with berkdb db4 "${EPREFIX}/usr")
+		$(use_enable flatfile)
+		$(use_with gdbm gdbm "${EPREFIX}/usr")
+		$(use_enable inifile)
+		$(use_with qdbm qdbm "${EPREFIX}/usr")
+		$(use_with tokyocabinet tcadb "${EPREFIX}/usr")
+		$(use_with lmdb lmdb "${EPREFIX}/usr")
+	)
+
+	# Support for the GD graphics library
+	our_conf+=(
+		$(use_with truetype freetype)
+		$(use_enable cjk gd-jis-conv)
+		$(use_with gd jpeg)
+		$(use_with xpm)
+		$(use_with webp)
+	)
+	# enable gd last, so configure can pick up the previous settings
+	our_conf+=( $(use_enable gd) )
+
+	# IMAP support
+	if use imap ; then
+		our_conf+=(
+			$(use_with imap imap "${EPREFIX}/usr")
+			$(use_with ssl imap-ssl "${EPREFIX}/usr")
+		)
+	fi
+
+	# LDAP support
+	if use ldap ; then
+		our_conf+=(
+			$(use_with ldap ldap "${EPREFIX}/usr")
+			$(use_with ldap-sasl)
+		)
+	fi
+
+	# MySQL support
+	local mysqllib="mysqlnd"
+	local mysqlilib="mysqlnd"
+
+	our_conf+=( $(use_with mysqli mysqli "${mysqlilib}") )
+
+	local mysqlsock="${EPREFIX}/var/run/mysqld/mysqld.sock"
+	if use mysql || use mysqli ; then
+		our_conf+=( $(use_with mysql mysql-sock "${mysqlsock}") )
+	fi
+
+	# ODBC support
+	if use odbc && use iodbc ; then
+		our_conf+=(
+			--without-unixODBC
+			--with-iodbc
+			$(use_with pdo pdo-odbc "iODBC,${EPREFIX}/usr")
+		)
+	elif use odbc ; then
+		our_conf+=(
+			--with-unixODBC="${EPREFIX}/usr"
+			--without-iodbc
+			$(use_with pdo pdo-odbc "unixODBC,${EPREFIX}/usr")
+		)
+	else
+		our_conf+=(
+			--without-unixODBC
+			--without-iodbc
+			--without-pdo-odbc
+		)
+	fi
+
+	# Oracle support
+	our_conf+=( $(use_with oci8-instant-client oci8) )
+
+	# PDO support
+	if use pdo ; then
+		our_conf+=(
+			$(use_with mssql pdo-dblib "${EPREFIX}/usr")
+			$(use_with mysql pdo-mysql "${mysqllib}")
+			$(use_with postgres pdo-pgsql)
+			$(use_with sqlite pdo-sqlite)
+			$(use_with firebird pdo-firebird "${EPREFIX}/usr")
+			$(use_with oci8-instant-client pdo-oci)
+		)
+	fi
+
+	# readline/libedit support
+	our_conf+=(
+		$(use_with readline readline "${EPREFIX}/usr")
+		$(use_with libedit)
+	)
+
+	# Session support
+	if use session ; then
+		our_conf+=( $(use_with session-mm mm "${EPREFIX}/usr") )
+	else
+		our_conf+=( $(use_enable session) )
+	fi
+
+	# Use pic for shared modules such as apache2's mod_php
+	our_conf+=( --with-pic )
+
+	# we use the system copy of pcre
+	# --with-external-pcre affects ext/pcre
+	# Many arches don't support pcre-jit
+	our_conf+=(
+		--with-external-pcre
+		--without-pcre-jit
+	)
+
+	# Catch CFLAGS problems
+	# Fixes bug #14067.
+	# Changed order to run it in reverse for bug #32022 and #12021.
+	replace-cpu-flags "k6*" "i586"
+
+	# Cache the ./configure test results between SAPIs.
+	our_conf+=( --cache-file="${T}/config.cache" )
+
+	# Support user-passed configuration parameters
+	our_conf+=( ${EXTRA_ECONF:-} )
+
+	# Support the Apache2 extras, they must be set globally for all
+	# SAPIs to work correctly, especially for external PHP extensions
+
+	local one_sapi
+	local sapi
+	mkdir -p "${WORKDIR}/sapis-build" || die
+	for one_sapi in $SAPIS ; do
+		use "${one_sapi}" || continue
+		php_set_ini_dir "${one_sapi}"
+
+		# The BUILD_DIR variable is used to determine where to output
+		# the files that autotools creates. This was all originally
+		# based on the autotools-utils eclass.
+		BUILD_DIR="${WORKDIR}/sapis-build/${one_sapi}"
+		cp -a "${S}" "${BUILD_DIR}" || die
+		cd "${BUILD_DIR}" || die
+
+		local sapi_conf=(
+			--with-config-file-path="${PHP_INI_DIR}"
+			--with-config-file-scan-dir="${PHP_EXT_INI_DIR_ACTIVE}"
+		)
+
+		for sapi in $SAPIS ; do
+			case "$sapi" in
+				cli|cgi|embed|fpm|phpdbg)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( "--enable-${sapi}" )
+						if [[ "fpm" == "${sapi}" ]] ; then
+							sapi_conf+=(
+								$(use_with acl fpm-acl)
+								$(use_with systemd fpm-systemd)
+							)
+						fi
+					else
+						sapi_conf+=( "--disable-${sapi}" )
+					fi
+					;;
+
+				apache2)
+					if [[ "${one_sapi}" == "${sapi}" ]] ; then
+						sapi_conf+=( --with-apxs2="${EPREFIX}/usr/bin/apxs" )
+					else
+						sapi_conf+=( --without-apxs2 )
+					fi
+					;;
+			esac
+		done
+
+		# Construct the $myeconfargs array by concatenating $our_conf
+		# (the common args) and $sapi_conf (the SAPI-specific args).
+		local myeconfargs=( "${our_conf[@]}" )
+		myeconfargs+=( "${sapi_conf[@]}" )
+
+		pushd "${BUILD_DIR}" > /dev/null || die
+		econf "${myeconfargs[@]}"
+		popd > /dev/null || die
+	done
+}
+
+src_compile() {
+	# snmp seems to run during src_compile, too (bug #324739)
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+	addpredict /var/lib/net-snmp/mib_indexes #nowarn
+
+	local sapi
+	for sapi in ${SAPIS} ; do
+		if use "${sapi}"; then
+			cd "${WORKDIR}/sapis-build/$sapi" || \
+				die "Failed to change dir to ${WORKDIR}/sapis-build/$1"
+			emake
+		fi
+	done
+}
+
+src_install() {
+	# see bug #324739 for what happens when we don't have that
+	addpredict /usr/share/snmp/mibs/.index #nowarn
+
+	# grab the first SAPI that got built and install common files from there
+	local first_sapi="", sapi=""
+	for sapi in $SAPIS ; do
+		if use $sapi ; then
+			first_sapi=$sapi
+			break
+		fi
+	done
+
+	# Makefile forgets to create this before trying to write to it...
+	dodir "${PHP_DESTDIR#${EPREFIX}}/bin"
+
+	# Install php environment (without any sapis)
+	cd "${WORKDIR}/sapis-build/$first_sapi" || die
+	emake INSTALL_ROOT="${D}" \
+		install-build install-headers install-programs
+
+	local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)"
+
+	# Create the directory where we'll put version-specific php scripts
+	keepdir "/usr/share/php${PHP_MV}"
+
+	local file=""
+	local sapi_list=""
+
+	for sapi in ${SAPIS}; do
+		if use "${sapi}" ; then
+			einfo "Installing SAPI: ${sapi}"
+			cd "${WORKDIR}/sapis-build/${sapi}" || die
+
+			if [[ "${sapi}" == "apache2" ]] ; then
+				# We're specifically not using emake install-sapi as libtool
+				# may cause unnecessary relink failures (see bug #351266)
+				insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/"
+				newins ".libs/libphp$(get_libname)" \
+					   "libphp${PHP_MV}$(get_libname)"
+				keepdir "/usr/$(get_libdir)/apache2/modules"
+			else
+				# needed each time, php_install_ini would reset it
+				local dest="${PHP_DESTDIR#${EPREFIX}}"
+				into "${dest}"
+				case "$sapi" in
+					cli)
+						source="sapi/cli/php"
+						# Install the "phar" archive utility.
+						if use phar ; then
+							emake INSTALL_ROOT="${D}" install-pharcmd
+							dosym "..${dest#/usr}/bin/phar" "/usr/bin/phar${SLOT}"
+						fi
+						;;
+					cgi)
+						source="sapi/cgi/php-cgi"
+						;;
+					fpm)
+						source="sapi/fpm/php-fpm"
+						;;
+					embed)
+						source="libs/libphp$(get_libname)"
+						;;
+					phpdbg)
+						source="sapi/phpdbg/phpdbg"
+						;;
+					*)
+						die "unhandled sapi in src_install"
+						;;
+				esac
+
+				if [[ "${source}" == *"$(get_libname)" ]]; then
+					dolib.so "${source}"
+				else
+					dobin "${source}"
+					local name="$(basename ${source})"
+					dosym "..${dest#/usr}/bin/${name}" "/usr/bin/${name}${SLOT}"
+				fi
+			fi
+
+			php_install_ini "${sapi}"
+
+			# construct correct SAPI string for php-config
+			# thanks to ferringb for the bash voodoo
+			if [[ "${sapi}" == "apache2" ]]; then
+				sapi_list="${sapi_list:+${sapi_list} }apache2handler"
+			else
+				sapi_list="${sapi_list:+${sapi_list} }${sapi}"
+			fi
+		fi
+	done
+
+	# Installing opcache module
+	if use opcache ; then
+		into "${PHP_DESTDIR#${EPREFIX}}"
+		dolib.so "modules/opcache$(get_libname)"
+	fi
+
+	# Install env.d files
+	newenvd "${FILESDIR}/20php5-envd" "20php${SLOT}"
+	sed -e "s|/lib/|/$(get_libdir)/|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+	sed -e "s|php5|php${SLOT}|g" -i "${ED}/etc/env.d/20php${SLOT}" || die
+
+	# set php-config variable correctly (bug #278439)
+	sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \
+		"${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" || die
+
+	if use fpm ; then
+		if use systemd; then
+			systemd_newunit "${FILESDIR}/php-fpm_at.service" \
+							"php-fpm@${SLOT}.service"
+		else
+			systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" \
+							"php-fpm@${SLOT}.service"
+		fi
+	fi
+}
+
+src_test() {
+	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+	PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php"
+	if [[ ! -x "${PHP_BIN}" ]] ; then
+		ewarn "Test phase requires USE=cli, skipping"
+		return
+	else
+		export TEST_PHP_EXECUTABLE="${PHP_BIN}"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi" ]] ; then
+		export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis-build/cgi/sapi/cgi/php-cgi"
+	fi
+
+	if [[ -x "${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg" ]] ; then
+		export TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
+	fi
+
+	REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n  -d \
+					  "session.save_path=${T}" \
+					  "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d \
+					  "session.save_path=${T}"
+
+	for name in ${EXPECTED_TEST_FAILURES}; do
+		mv "${name}.out" "${name}.out.orig" 2>/dev/null || die
+	done
+
+	local failed="$(find -name '*.out')"
+	if [[ ${failed} != "" ]] ; then
+		ewarn "The following test cases failed unexpectedly:"
+		for name in ${failed}; do
+			ewarn "  ${name/.out/}"
+		done
+	else
+		einfo "No unexpected test failures, all fine"
+	fi
+
+	if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then
+		local passed=""
+		for name in ${EXPECTED_TEST_FAILURES}; do
+			[[ -f "${name}.diff" ]] && continue
+			passed="${passed} ${name}"
+		done
+		if [[ ${passed} != "" ]] ; then
+			einfo "The following test cases passed unexpectedly:"
+			for name in ${passed}; do
+				ewarn "  ${passed}"
+			done
+		else
+			einfo "None of the known-to-fail tests passed, all fine"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	# Output some general info to the user
+	if use apache2 ; then
+		elog
+		elog "To enable PHP in apache, you will need to add \"-D PHP\" to"
+		elog "your apache2 command. OpenRC users can append that string to"
+		elog "APACHE2_OPTS in /etc/conf.d/apache2."
+		elog
+		elog "The apache module configuration file 70_mod_php.conf is"
+		elog "provided (and maintained) by eselect-php."
+		elog
+	fi
+
+	# Create the symlinks for php
+	local m
+	for m in ${SAPIS}; do
+		[[ ${m} == 'embed' ]] && continue;
+		if use $m ; then
+			local ci=$(eselect php show $m)
+			if [[ -z $ci ]]; then
+				eselect php set $m php${SLOT} || die
+				einfo "Switched ${m} to use php:${SLOT}"
+				einfo
+			elif [[ $ci != "php${SLOT}" ]] ; then
+				elog "To switch $m to use php:${SLOT}, run"
+				elog "    eselect php set $m php${SLOT}"
+				elog
+			fi
+		fi
+	done
+
+	# Remove dead symlinks for SAPIs that were just disabled. For
+	# example, if the user has the cgi SAPI enabled, then he has an
+	# eselect-php symlink for it. If he later reinstalls PHP with
+	# USE="-cgi", that symlink will break. This call to eselect is
+	# supposed to remove that dead link per bug 572436.
+	eselect php cleanup || die
+
+	if ! has "php${SLOT/./-}" ${PHP_TARGETS}; then
+	   elog "To build extensions for this version of PHP, you will need to"
+	   elog "add php${SLOT/./-} to your PHP_TARGETS USE_EXPAND variable."
+	   elog
+	fi
+
+	# Warn about the removal of PHP_INI_VERSION if the user has it set.
+	if [[ -n "${PHP_INI_VERSION}" ]]; then
+		ewarn 'The PHP_INI_VERSION variable has been phased out. You may'
+		ewarn 'remove it from your configuration at your convenience. See'
+		ewarn
+		ewarn '  https://bugs.gentoo.org/611214'
+		ewarn
+		ewarn 'for more information.'
+	fi
+
+	elog "For details on how version slotting works, please see"
+	elog "the wiki:"
+	elog
+	elog "  https://wiki.gentoo.org/wiki/PHP"
+	elog
+}
+
+pkg_postrm() {
+	# This serves two purposes. First, if we have just removed the last
+	# installed version of PHP, then this will remove any dead symlinks
+	# belonging to eselect-php. Second, if a user upgrades slots from
+	# (say) 5.6 to 7.0 and depcleans the old slot, then this will update
+	# his existing symlinks to point to the new 7.0 installation. The
+	# latter is bug 432962.
+	#
+	# Note: the eselect-php package may not be installed at this point,
+	# so we can't die() if this command fails.
+	eselect php cleanup
+}
diff --git a/dev-libs/libdazzle/Manifest b/dev-libs/libdazzle/Manifest
index 8806a53421c5..1e951178d8ab 100644
--- a/dev-libs/libdazzle/Manifest
+++ b/dev-libs/libdazzle/Manifest
@@ -1 +1,2 @@
 DIST libdazzle-3.36.0.tar.xz 446400 BLAKE2B 027d5e5b733fdf10b5797f9e17460ea50f26827c9f23f6ba9cf76b21c1ee63cc5b724f80b75af5ee7ccbdf1b04c28b776d4d542538db3039ca2d9cb2da6994b5 SHA512 d020161a1c744192657a551f53c4a7bb61bf8e9df93401085168c75aaf1305d548bf56a39b7a9e202656f453451a6615f1950992f78e3a23cba4324999f1e37f
+DIST libdazzle-3.38.0.tar.xz 447304 BLAKE2B 77add33e1947dc33a086501928377cc9547563a9a8095f38283a5bc4b1916bafe1ac3073abe4111ba4907857de0726d2325458663acda4df122e6237f703281f SHA512 76dee75fab5a508c274f45cf5f51bac4edc80786942ccc64e49ffe1721607d88f9067b0a7751f44a48bfe38ee87b6986d449e8c5e6b704c6ec32de84d21f7e69
diff --git a/dev-libs/libdazzle/libdazzle-3.38.0.ebuild b/dev-libs/libdazzle/libdazzle-3.38.0.ebuild
new file mode 100644
index 000000000000..bb1360473dc1
--- /dev/null
+++ b/dev-libs/libdazzle/libdazzle-3.38.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org meson xdg vala virtualx
+
+DESCRIPTION="Experimental new features for GTK+ and GLib"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/libdazzle"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="gtk-doc +introspection test +vala"
+REQUIRED_USE="vala? ( introspection )"
+RESTRICT="!test? ( test )"
+
+# We keep newer glib/gtk+ deps to avoid GtkEventControllerMotion backports gettings used
+RDEPEND="
+	>=dev-libs/glib-2.56.0:2
+	>=x11-libs/gtk+-3.24.0:3[introspection?]
+	introspection? ( dev-libs/gobject-introspection:= )
+"
+DEPEND="${RDEPEND}"
+# libxml2 required for glib-compile-resources; glib-utils for glib-mkenums
+BDEPEND="
+	>=dev-util/meson-0.49.0
+	vala? ( $(vala_depend) )
+	dev-libs/libxml2:2
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	gtk-doc? ( dev-util/gtk-doc )
+"
+
+src_prepare() {
+	use vala && vala_src_prepare
+	xdg_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		-Denable_tracing=false # extra trace debugging that would make things slower
+		-Denable_profiling=false # -pg passing
+		# On linux it'll always use a vdso based implementation that is even faster
+		# than rdtscp insn, thus never build with rdtscp until we don't support non-linux
+		# as the rdtscp using function will never get called anyways.
+		-Denable_rdtscp=false
+		-Denable_tools=true # /usr/bin/dazzle-list-counters
+		$(meson_use introspection with_introspection)
+		$(meson_use vala with_vapi)
+		$(meson_use gtk-doc enable_gtk_doc)
+		$(meson_use test enable_tests)
+	)
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test
+}
diff --git a/dev-libs/qtkeychain/Manifest b/dev-libs/qtkeychain/Manifest
index 3197a0391a1b..741f9c5baccc 100644
--- a/dev-libs/qtkeychain/Manifest
+++ b/dev-libs/qtkeychain/Manifest
@@ -1 +1,2 @@
 DIST qtkeychain-0.10.0.tar.gz 38488 BLAKE2B 229270158f08a17e391a68bb6eaf6a1924fd1e5caa9ba026e15619dd159d1514894000a74301a2f2dda706f0629b5bc06afeb38191700e834d412c9cff505263 SHA512 de35d1a39c717db5c8c3b8a59571e96ed8925836a7043dd9f236c284bf92de4875c4b53686ba73244bbc84b55a88d44316a16da3012e50cbc7594fbf0b1140b6
+DIST qtkeychain-0.11.1.tar.gz 41001 BLAKE2B 155ca333d403e6ad91c2f733dec06e7957d3998c8124156cf33ea9b79521a6838e9c5a317b591897543b820d436d89ce3eada6425318d801834c133b6c55c982 SHA512 45551003000b8ed76d44767c54d18dcbb956d5aeb63d8bf2f0fc06c61eab4d7d2e70b894e9c0729722dfcb5004f818f4f4c9a413444fc2aebe0271f104b500e6
diff --git a/dev-libs/qtkeychain/qtkeychain-0.11.1.ebuild b/dev-libs/qtkeychain/qtkeychain-0.11.1.ebuild
new file mode 100644
index 000000000000..d70d621d53e4
--- /dev/null
+++ b/dev-libs/qtkeychain/qtkeychain-0.11.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+HOMEPAGE="https://github.com/frankosterfeld/qtkeychain"
+DESCRIPTION="Qt API for storing passwords securely"
+
+if [[ ${PV} != *9999* ]]; then
+	SRC_URI="https://github.com/frankosterfeld/qtkeychain/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+else
+	inherit git-r3
+	EGIT_REPO_URI="${HOMEPAGE}.git"
+fi
+
+LICENSE="BSD"
+SLOT="0/1"
+IUSE="gnome-keyring"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+"
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	gnome-keyring? (
+		app-crypt/libsecret
+		dev-libs/glib:2
+	)
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( ChangeLog ReadMe.txt )
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_WITH_QT4=OFF
+		-DQTKEYCHAIN_STATIC=OFF
+		-DBUILD_TEST_APPLICATION=OFF
+		-DBUILD_TRANSLATIONS=ON
+		-DLIBSECRET_SUPPORT=$(usex gnome-keyring)
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-libs/xmlrpc-c/xmlrpc-c-1.51.06-r1.ebuild b/dev-libs/xmlrpc-c/xmlrpc-c-1.51.06-r1.ebuild
new file mode 100644
index 000000000000..c4eb58260557
--- /dev/null
+++ b/dev-libs/xmlrpc-c/xmlrpc-c-1.51.06-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal
+
+# Upstream maintains 3 release channels: http://xmlrpc-c.sourceforge.net/release.html
+# 1. Only the "Super Stable" series is released as a tarball
+# 2. SVN tagging of releases seems spotty: http://svn.code.sf.net/p/xmlrpc-c/code/release_number/
+# Because of this, we are following the "Super Stable" release channel
+
+DESCRIPTION="A lightweigt RPC library based on XML and HTTP"
+HOMEPAGE="https://sourceforge.net/projects/xmlrpc-c/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+IUSE="abyss +cgi +curl +cxx +libxml2 threads test"
+
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="test? ( abyss curl cxx )"
+
+RDEPEND="
+	sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
+	sys-libs/readline:0=[${MULTILIB_USEDEP}]
+	curl? ( net-misc/curl[${MULTILIB_USEDEP}] )
+	libxml2? ( dev-libs/libxml2[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	use curl || ewarn "Curl support disabled: No client library will be built"
+}
+
+src_prepare() {
+	sed -i \
+		-e "/CFLAGS_COMMON/s|-g -O3$||" \
+		-e "/CXXFLAGS_COMMON/s|-g$||" \
+		common.mk || die
+
+	default
+
+	# Out-of-source install phase is broken
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} \
+	econf \
+		--disable-libwww-client \
+		--disable-wininet-client \
+		--without-libwww-ssl \
+		$(use_enable abyss abyss-server) \
+		$(use_enable cgi cgi-server) \
+		$(use_enable curl curl-client) \
+		$(use_enable cxx cplusplus) \
+		$(use_enable libxml2 libxml2-backend) \
+		$(use_enable threads abyss-threads)
+}
+
+multilib_src_compile() {
+	default_src_compile
+	# Tools building is broken in this release
+	#multilib_is_native_abi && use tools && emake -rC "${S}"/tools
+}
+
+#multilib_src_install_all() {
+#	# Tools building is broken in this release
+#	#use tools && emake DESTDIR="${D}" -rC "${S}"/tools install
+#}
diff --git a/dev-perl/File-Next/File-Next-1.180.0-r1.ebuild b/dev-perl/File-Next/File-Next-1.180.0-r1.ebuild
index 0192ce2174a5..56e4db5bad1b 100644
--- a/dev-perl/File-Next/File-Next-1.180.0-r1.ebuild
+++ b/dev-perl/File-Next/File-Next-1.180.0-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="An iterator-based module for finding files"
 
 LICENSE="Artistic-2 GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-php/pecl-radius/pecl-radius-1.4.0_beta1-r2.ebuild b/dev-php/pecl-radius/pecl-radius-1.4.0_beta1-r3.ebuild
index a18ff95d221c..467867d6f62c 100644
--- a/dev-php/pecl-radius/pecl-radius-1.4.0_beta1-r2.ebuild
+++ b/dev-php/pecl-radius/pecl-radius-1.4.0_beta1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -7,7 +7,7 @@ PHP_EXT_NAME="radius"
 PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="no"
 
-USE_PHP="php5-6 php7-1 php7-2 php7-3 php7-4"
+USE_PHP="php7-2 php7-3 php7-4"
 PHP_EXT_PECL_FILENAME="${PN/pecl-/}-${PV/_beta/b}.tgz"
 PHP_EXT_S="${WORKDIR}/${PHP_EXT_PECL_FILENAME%.tgz}"
 
@@ -18,14 +18,14 @@ KEYWORDS="~amd64 ~x86"
 DESCRIPTION="Provides support for RADIUS authentication (RFC 2865) and accounting (RFC 2866)"
 LICENSE="BSD"
 SLOT="0"
-IUSE="examples"
+IUSE="examples test"
+RESTRICT="!test? ( test )"
 
 S="${PHP_EXT_S}"
 
 RDEPEND="
-	php_targets_php5-6? ( dev-lang/php:5.6[pcntl,sockets] )
-	php_targets_php7-1? ( dev-lang/php:7.1[pcntl,sockets] )
-	php_targets_php7-2? ( dev-lang/php:7.2[pcntl,sockets] )
-	php_targets_php7-3? ( dev-lang/php:7.3[pcntl,sockets] )
-	php_targets_php7-4? ( dev-lang/php:7.3[pcntl,sockets] )
+	php_targets_php7-2? ( dev-lang/php:7.2[pcntl(-),sockets(-)] )
+	php_targets_php7-3? ( dev-lang/php:7.3[pcntl(-),sockets(-)] )
+	php_targets_php7-4? ( dev-lang/php:7.4[pcntl(-),sockets(-)] )
 "
+DEPEND="test? ( ${RDEPEND} )"
diff --git a/dev-php/xdebug-client/xdebug-client-2.9.8.ebuild b/dev-php/xdebug-client/xdebug-client-2.9.8.ebuild
index ad1c2866a297..36607c13f71b 100644
--- a/dev-php/xdebug-client/xdebug-client-2.9.8.ebuild
+++ b/dev-php/xdebug-client/xdebug-client-2.9.8.ebuild
@@ -9,7 +9,7 @@ MY_PN="xdebug"
 MY_PV="${PV/_/}"
 MY_PV="${MY_PV/rc/RC}"
 
-inherit autotools
+inherit autotools toolchain-funcs
 
 DESCRIPTION="Xdebug client for the Common Debugger Protocol (DBGP)"
 HOMEPAGE="https://xdebug.org/"
@@ -32,6 +32,7 @@ src_prepare() {
 }
 
 src_configure() {
+	tc-export CC LD
 	econf $(use_with libedit)
 }
 
diff --git a/dev-python/backrefs/Manifest b/dev-python/backrefs/Manifest
new file mode 100644
index 000000000000..fadf7bacd69a
--- /dev/null
+++ b/dev-python/backrefs/Manifest
@@ -0,0 +1 @@
+DIST backrefs-4.5.0.tar.gz 5995247 BLAKE2B ce3d33b91ab307811e555689a2ece0ba47e53d8245fd4fa367156a76893c5ca342cb47d014a3c94c6f30ebb32487fb36975a2fa6c7acf0a626305d05e0d80048 SHA512 c1e30a78c2e7a86efce1670000612b6450b6cae78f8c799cec6832aa88e4145fee6ffc3e1b8c54b55091f7c21ea4b09c1ee36af852bb51973434b593273e04a8
diff --git a/dev-python/backrefs/backrefs-4.5.0.ebuild b/dev-python/backrefs/backrefs-4.5.0.ebuild
new file mode 100644
index 000000000000..233f3f489f06
--- /dev/null
+++ b/dev-python/backrefs/backrefs-4.5.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+DOCS_BUILDER="mkdocs"
+DOCS_DEPEND="
+	dev-python/mkdocs-git-revision-date-localized-plugin
+	~dev-python/mkdocs_pymdownx_material_extras-1.0.7
+	dev-python/mkdocs-minify-plugin
+	dev-python/mkdocs-material
+	dev-python/pyspelling
+"
+
+inherit distutils-r1 docs
+
+DESCRIPTION="Wrapper around re or regex that adds additional back references"
+HOMEPAGE="
+	https://github.com/facelessuser/backrefs
+	https://pypi.org/project/backrefs
+"
+SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/regex[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# mkdocs-git-revision-date-localized-plugin needs git repo
+	if use doc; then
+		git init || die
+		git config --global user.email "you@example.com" || die
+		git config --global user.name "Your Name" || die
+		git add . || die
+		git commit -m 'init' || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/backrefs/metadata.xml b/dev-python/backrefs/metadata.xml
new file mode 100644
index 000000000000..3171f3f83948
--- /dev/null
+++ b/dev-python/backrefs/metadata.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+	<maintainer type="person">
+		<email>lssndrbarbieri@gmail.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>andrewammerlaan@riseup.net</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">facelessuser/backrefs</remote-id>
+		<remote-id type="pypi">backrefs</remote-id>
+	</upstream>
+	<longdescription lang="en">
+Backrefs is a wrapper around Python's built-in Re and the 3rd party Regex library. Backrefs adds various additional back references (and a couple other features) that are known to some regular expression engines, but not to Python's Re and/or Regex. The supported back references actually vary depending on the regular expression engine being used as the engine may already have support for some.
+	</longdescription>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/dev-python/bracex/Manifest b/dev-python/bracex/Manifest
new file mode 100644
index 000000000000..ea2f1af7fbb1
--- /dev/null
+++ b/dev-python/bracex/Manifest
@@ -0,0 +1 @@
+DIST bracex-2.0.1.tar.gz 24356 BLAKE2B dc4df37c569e26a4319d4240694a397926075ba8cc3d6f44cb35ae42dd20c36f690f904d6a6895aa4e02d7108b3bc173d4a6f672ac9bf5ee426f280dab5fc0e1 SHA512 28758ce4796ad64cceeab0e93edf4c9bb71c6a968db3b917db3e22619278a4639e587da7070c15c5a3c8c1121871541e7764904769859c3c590ac8611f224a13
diff --git a/dev-python/bracex/bracex-2.0.1.ebuild b/dev-python/bracex/bracex-2.0.1.ebuild
new file mode 100644
index 000000000000..3df1e719577e
--- /dev/null
+++ b/dev-python/bracex/bracex-2.0.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+DOCS_BUILDER="mkdocs"
+DOCS_DEPEND="
+	dev-python/mkdocs-git-revision-date-localized-plugin
+	dev-python/mkdocs-material
+	dev-python/mkdocs-minify-plugin
+	dev-python/mkdocs_pymdownx_material_extras
+	dev-python/pyspelling
+"
+
+inherit distutils-r1 docs
+
+DESCRIPTION="Bash style brace expansion for Python"
+HOMEPAGE="
+	https://github.com/facelessuser/bracex
+	https://pypi.org/project/bracex
+"
+SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="test? ( dev-vcs/git )"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# mkdocs-git-revision-date-localized-plugin needs git repo
+	if use doc; then
+		git init || die
+		git config --global user.email "you@example.com" || die
+		git config --global user.name "Your Name" || die
+		git add . || die
+		git commit -m 'init' || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/bracex/metadata.xml b/dev-python/bracex/metadata.xml
new file mode 100644
index 000000000000..2246794a0865
--- /dev/null
+++ b/dev-python/bracex/metadata.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+	<maintainer type="person">
+		<email>lssndrbarbieri@gmail.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>andrewammerlaan@riseup.net</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">facelessuser/bracex</remote-id>
+		<remote-id type="pypi">bracex</remote-id>
+	</upstream>
+	<longdescription lang="en">
+		Why Bracex over other solutions?
+
+		Bracex actually follows pretty closely to how Bash processes braces. It is not a 1:1 implementation of how Bash handles braces, but generally, it follows very closely. Almost all of the test cases are run through Bash first, then our implementation is compared against the results Bash gives. There are a few cases where we have purposely deviated. For instance, we are not handling Bash's command line inputs, so we are not giving special meaning to back ticks and quotes at this time.
+	</longdescription>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/dev-python/gevent/gevent-20.9.0.ebuild b/dev-python/gevent/gevent-20.9.0.ebuild
index 7de3c8e06156..f3cd0e7ceb1c 100644
--- a/dev-python/gevent/gevent-20.9.0.ebuild
+++ b/dev-python/gevent/gevent-20.9.0.ebuild
@@ -20,7 +20,7 @@ IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	>=dev-libs/libev-4.23:=
+	>=dev-libs/libev-4.31:=
 	dev-libs/libuv:=
 	>=net-dns/c-ares-1.12:=
 	>=dev-python/greenlet-0.4.17
diff --git a/dev-python/mkdocs-bootstrap/mkdocs-bootstrap-1.1-r1.ebuild b/dev-python/mkdocs-bootstrap/mkdocs-bootstrap-1.1-r1.ebuild
index 820b9c467047..83b72d723b87 100644
--- a/dev-python/mkdocs-bootstrap/mkdocs-bootstrap-1.1-r1.ebuild
+++ b/dev-python/mkdocs-bootstrap/mkdocs-bootstrap-1.1-r1.ebuild
@@ -4,7 +4,6 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
 
 DOCS_BUILDER="mkdocs"
 
diff --git a/dev-python/mkdocs-bootswatch/mkdocs-bootswatch-1.1-r1.ebuild b/dev-python/mkdocs-bootswatch/mkdocs-bootswatch-1.1-r1.ebuild
index f10c12dea86e..5f6886e1de0c 100644
--- a/dev-python/mkdocs-bootswatch/mkdocs-bootswatch-1.1-r1.ebuild
+++ b/dev-python/mkdocs-bootswatch/mkdocs-bootswatch-1.1-r1.ebuild
@@ -4,7 +4,6 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
 
 DOCS_BUILDER="mkdocs"
 
diff --git a/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest b/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest
new file mode 100644
index 000000000000..acc012c31140
--- /dev/null
+++ b/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest
@@ -0,0 +1 @@
+DIST mkdocs-git-revision-date-localized-plugin-0.8.tar.gz 364352 BLAKE2B cfd1709b5c9e1f99ca1a2d8d194634afde6d57aecaca1d2cb70edc21c28d0b210c3497a4214d6a95592bc5a7aad3b88d96b275427f3218aa198ab7b3ae8f364a SHA512 84f19aa13189b74f18f98433939935052f1d757f66972d4f1cc1bfd14b614f8fd57b0ac0dcf41fcb678eb8dddba93ddc78dc776d6a81977d096920128d31f58e
diff --git a/dev-python/mkdocs-git-revision-date-localized-plugin/metadata.xml b/dev-python/mkdocs-git-revision-date-localized-plugin/metadata.xml
new file mode 100644
index 000000000000..fd025cf5ac9b
--- /dev/null
+++ b/dev-python/mkdocs-git-revision-date-localized-plugin/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="person">
+    <email>andrewammerlaan@riseup.net</email>
+    <name>Andrew Ammerlaan</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">timvink/mkdocs-git-revision-date-localized-plugin</remote-id>
+    <remote-id type="pypi">mkdocs-git-revision-date-localized-plugin</remote-id>
+  </upstream>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-0.8.ebuild b/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-0.8.ebuild
new file mode 100644
index 000000000000..be64b3d56ee9
--- /dev/null
+++ b/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-0.8.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Display the localized date of the last git modification of a markdown file"
+HOMEPAGE="
+	https://github.com/timvink/mkdocs-git-revision-date-localized-plugin
+	https://pypi.org/project/mkdocs-git-revision-date-localized-plugin
+"
+SRC_URI="https://github.com/timvink/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/Babel-2.7.0[${PYTHON_USEDEP}]
+	dev-python/GitPython[${PYTHON_USEDEP}]
+	>=dev-python/mkdocs-1.0[${PYTHON_USEDEP}]
+"
+BDEPEND="test? (
+	dev-python/click[${PYTHON_USEDEP}]
+	dev-python/mkdocs-material[${PYTHON_USEDEP}]
+	dev-vcs/git
+)"
+
+distutils_enable_tests --install pytest
+
+python_prepare_all() {
+	# mkdocs-git-revision-date-localized-plugin's tests need git repo
+	if use test; then
+		git init || die
+		git config --global user.email "you@example.com" || die
+		git config --global user.name "Your Name" || die
+		git add . || die
+		git commit -m 'init' || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/mkdocs-material-extensions/Manifest b/dev-python/mkdocs-material-extensions/Manifest
new file mode 100644
index 000000000000..2ef134ab7d48
--- /dev/null
+++ b/dev-python/mkdocs-material-extensions/Manifest
@@ -0,0 +1 @@
+DIST mkdocs-material-extensions-1.0.1.tar.gz 12259 BLAKE2B 464b0856f10f0b9311d5c6fe15def4af9384354ab86e62392052ae1bb7450bd09ac56b5d3e9f40b252b30c924f1cf35597ffc9c898f0cffb2c11a74b45da4090 SHA512 68bfdde71f654a9ae42cb6d4545005eddc235e74f6a4c49707853de9cb30261c77ab8c8534b15019c7030d01b97a32645f5355a9e6511470466bf0e6f17b6890
diff --git a/dev-python/mkdocs-material-extensions/metadata.xml b/dev-python/mkdocs-material-extensions/metadata.xml
new file mode 100644
index 000000000000..24530809f857
--- /dev/null
+++ b/dev-python/mkdocs-material-extensions/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+	<maintainer type="person">
+		<email>andrewammerlaan@riseup.net</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">facelessuser/mkdocs-material-extensions</remote-id>
+		<remote-id type="pypi">mkdocs-material-extensions</remote-id>
+	</upstream>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/dev-python/mkdocs-material-extensions/mkdocs-material-extensions-1.0.1.ebuild b/dev-python/mkdocs-material-extensions/mkdocs-material-extensions-1.0.1.ebuild
new file mode 100644
index 000000000000..fb0c28d3ae59
--- /dev/null
+++ b/dev-python/mkdocs-material-extensions/mkdocs-material-extensions-1.0.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Extension pack for Python Markdown"
+HOMEPAGE="
+	https://github.com/facelessuser/mkdocs-material-extensions
+	https://pypi.org/project/mkdocs-material-extensions
+"
+SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# mkdocs-material depends on this package creating a circular dep
+PDEPEND=">=dev-python/mkdocs-material-5.0.0[${PYTHON_USEDEP}]"
+
+# we still need mkdocs-material for test, but the circular dep can be avoided
+# by first emerging with FEATURES="-test"
+BDEPEND="test? ( ${PDEPEND} )"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# AssertionError: False is not true
+	sed -i -e 's:test_material_svg_injection:_&:' \
+		tests/extensions/test_emoji.py  || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/mkdocs-material/Manifest b/dev-python/mkdocs-material/Manifest
new file mode 100644
index 000000000000..d9c436bb34a6
--- /dev/null
+++ b/dev-python/mkdocs-material/Manifest
@@ -0,0 +1 @@
+DIST mkdocs-material-6.1.7.tar.gz 4580050 BLAKE2B 9919a94b008be298dcff569a33c6dacfa783b338cbf1a09afde6f14c85636b9f971f65863d82f9616c527c3521490c945c0d3ad3647adf69ff8e2795a1b43166 SHA512 ddca360760db8a29055bbf41b58d568943965ffe3bcce5b77fbd4af17caaaebba94f41a9dec6d1042c537054ab92eb6da41cc267ef4421d91ed69373417cde99
diff --git a/dev-python/mkdocs-material/metadata.xml b/dev-python/mkdocs-material/metadata.xml
new file mode 100644
index 000000000000..253f3a76fddb
--- /dev/null
+++ b/dev-python/mkdocs-material/metadata.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="person">
+    <email>andrewammerlaan@riseup.net</email>
+    <name>Andrew Ammerlaan</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <longdescription lang="en">
+What to expect
+
+    Responsive design and fluid layout for all kinds of screens and devices, designed to serve your project documentation in a user-friendly way in 41 languages with optimal readability.
+
+    Easily customizable primary and accent color, fonts, favicon and logo; straight forward localization through theme extension; integrated with Google Analytics, Disqus and GitHub.
+
+    Well-designed search interface accessible through hotkeys (F or S), intelligent grouping of search results, search term highlighting and lazy loading.
+  </longdescription>
+  <upstream>
+    <remote-id type="github">squidfunk/mkdocs-material</remote-id>
+    <remote-id type="pypi">mkdocs-material</remote-id>
+  </upstream>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/dev-python/mkdocs-material/mkdocs-material-6.1.7.ebuild b/dev-python/mkdocs-material/mkdocs-material-6.1.7.ebuild
new file mode 100644
index 000000000000..be425c2f3932
--- /dev/null
+++ b/dev-python/mkdocs-material/mkdocs-material-6.1.7.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+DOCS_BUILDER="mkdocs"
+DOCS_DEPEND="
+	dev-python/mkdocs-minify-plugin
+	dev-python/mkdocs-redirects
+"
+
+inherit distutils-r1 docs
+
+DESCRIPTION="A Material Design theme for MkDocs"
+HOMEPAGE="
+	https://github.com/squidfunk/mkdocs-material
+	https://pypi.org/project/mkdocs-material
+"
+SRC_URI="https://github.com/squidfunk/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
+	>=dev-python/mkdocs-1.1[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.4[${PYTHON_USEDEP}]
+	>=dev-python/pymdown-extensions-7.0[${PYTHON_USEDEP}]
+	>=dev-python/mkdocs-material-extensions-1.0[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/mkdocs-minify-plugin/Manifest b/dev-python/mkdocs-minify-plugin/Manifest
new file mode 100644
index 000000000000..aff01e13d939
--- /dev/null
+++ b/dev-python/mkdocs-minify-plugin/Manifest
@@ -0,0 +1 @@
+DIST mkdocs-minify-plugin-0.3.0.tar.gz 3101 BLAKE2B 6b3451734d2d87f967c46521350f53cfd3cacdb555777328056ca61ed80e2341da86041be32fe87a0174241e3f36f0f0d7ca43538d0a8ca7a45cc06b6b4254e3 SHA512 97d8cb1ca3b0abfa362b9f71c7f881c889eb08963519ff0a356778b446c62140edb70ec344cbf54df7990e94ef515202b567799d0426e518a1abd6c3886a4281
diff --git a/dev-python/mkdocs-minify-plugin/metadata.xml b/dev-python/mkdocs-minify-plugin/metadata.xml
new file mode 100644
index 000000000000..7230df4b433e
--- /dev/null
+++ b/dev-python/mkdocs-minify-plugin/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+	<maintainer type="person">
+		<email>andrewammerlaan@riseup.net</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">byrnereese/mkdocs-minify-plugin</remote-id>
+		<remote-id type="pypi">mkdocs-minify-plugin</remote-id>
+	</upstream>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.3.0.ebuild b/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.3.0.ebuild
new file mode 100644
index 000000000000..51841a393fe6
--- /dev/null
+++ b/dev-python/mkdocs-minify-plugin/mkdocs-minify-plugin-0.3.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="An MkDocs plugin to minify HTML and/or JS files prior to being written to disk"
+HOMEPAGE="
+	https://github.com/byrnereese/mkdocs-minify-plugin
+	https://pypi.org/project/mkdocs-minify-plugin/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/mkdocs-1.0.4[${PYTHON_USEDEP}]
+	>=app-text/htmlmin-0.1.4[${PYTHON_USEDEP}]
+	>=dev-python/jsmin-2.2.2[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/mkdocs-redirects/Manifest b/dev-python/mkdocs-redirects/Manifest
new file mode 100644
index 000000000000..dffce1a98b69
--- /dev/null
+++ b/dev-python/mkdocs-redirects/Manifest
@@ -0,0 +1 @@
+DIST mkdocs-redirects-1.0.1.tar.gz 5772 BLAKE2B e48a35b18690c040efcca2e3e6a97650a3f951b89d537537b54b297e61c590099c6891dd1d64f21dd4efcc4a20d3d709a2815280c2846324f9f57b5a953a31bb SHA512 e3eb31ce920aceab2e4c93988853fc0e63ba789db229ac798791061b26252416c5c68b2c221f82e3a08ce7522e6b2aa58ca606b9a31653f782e31c415861f7d0
diff --git a/dev-python/mkdocs-redirects/metadata.xml b/dev-python/mkdocs-redirects/metadata.xml
new file mode 100644
index 000000000000..071f0db035ac
--- /dev/null
+++ b/dev-python/mkdocs-redirects/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+	<maintainer type="person">
+		<email>andrewammerlaan@riseup.net</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">datarobot/mkdocs-redirects</remote-id>
+		<remote-id type="pypi">mkdocs-redirects</remote-id>
+	</upstream>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/dev-python/mkdocs-redirects/mkdocs-redirects-1.0.1.ebuild b/dev-python/mkdocs-redirects/mkdocs-redirects-1.0.1.ebuild
new file mode 100644
index 000000000000..590facc897aa
--- /dev/null
+++ b/dev-python/mkdocs-redirects/mkdocs-redirects-1.0.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Plugin for Mkdocs page redirects"
+HOMEPAGE="
+	https://github.com/datarobot/mkdocs-redirects
+	https://pypi.org/project/mkdocs-redirects/
+"
+SRC_URI="https://github.com/datarobot/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/mkdocs-1.0.4[${PYTHON_USEDEP}]
+	dev-python/twine[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/mkdocs_pymdownx_material_extras/Manifest b/dev-python/mkdocs_pymdownx_material_extras/Manifest
new file mode 100644
index 000000000000..e4d3e5437408
--- /dev/null
+++ b/dev-python/mkdocs_pymdownx_material_extras/Manifest
@@ -0,0 +1,2 @@
+DIST mkdocs_pymdownx_material_extras-1.0.7.tar.gz 17995 BLAKE2B a7a8715ec07b9ef5551eadb37e618f45ca2f8f3c707aa5269eb7d2587db70ba29cfaa8027bb606c4264bbf93d7b3950d7a5dc03640b71afc677658b044d064fa SHA512 33fe8fddd0ee5856fdfb02068e2698f26a8db139458d7736715b776fbc2d8ae8ccb3170dbb786c52338e4e7a1612006046eb429f2268469f6f2bb5ba7f8e256d
+DIST mkdocs_pymdownx_material_extras-1.1.3.tar.gz 40029 BLAKE2B faa17e6e4d27a5d5e34a98a6830e34b934f8623fafb87a73051eb424cf95d29c5dd185bbfbbe49dd3e93eeee00a8310ac0543d480ab70e5abee4047b1cecc774 SHA512 340818ebcd8f9cf175e5049028d0932a0d6208de3d8f86cf5ea47747680079c6b9b3bf27e0c32ee10ee6a1bc7ab8ffc6cc3aa48470be43ed32adfde74f44d5dd
diff --git a/dev-python/mkdocs_pymdownx_material_extras/metadata.xml b/dev-python/mkdocs_pymdownx_material_extras/metadata.xml
new file mode 100644
index 000000000000..148f8ebc7536
--- /dev/null
+++ b/dev-python/mkdocs_pymdownx_material_extras/metadata.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+	<maintainer type="person">
+		<email>lssndrbarbieri@gmail.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>andrewammerlaan@riseup.net</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">facelessuser/mkdocs_pymdownx_material_extras</remote-id>
+		<remote-id type="pypi">mkdocs-pymdownx-material-extras</remote-id>
+	</upstream>
+	<longdescription lang="en">
+A plugin that for MkDocs and specifically the MkDocs Material Theme. 
+Adds additional resources that are used in the PyMdown Extensions documentation, and other @facelessuser projects.
+While this is not specifically meant for outside consumption, and was originally written for @facelessuser projects, it can be freely used if desired.
+Files are copied from the pymdown-extensions project.
+	</longdescription>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-1.0.7.ebuild b/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-1.0.7.ebuild
new file mode 100644
index 000000000000..380d702f3735
--- /dev/null
+++ b/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-1.0.7.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Custom alterations based on Mkdocs-Material"
+HOMEPAGE="
+	https://github.com/facelessuser/mkdocs_pymdownx_material_extras
+	https://pypi.org/project/mkdocs-pymdownx-material-extras"
+SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/mkdocs-material-5.0.2[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-1.1.3.ebuild b/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-1.1.3.ebuild
new file mode 100644
index 000000000000..380d702f3735
--- /dev/null
+++ b/dev-python/mkdocs_pymdownx_material_extras/mkdocs_pymdownx_material_extras-1.1.3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Custom alterations based on Mkdocs-Material"
+HOMEPAGE="
+	https://github.com/facelessuser/mkdocs_pymdownx_material_extras
+	https://pypi.org/project/mkdocs-pymdownx-material-extras"
+SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/mkdocs-material-5.0.2[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/pymdown-extensions/Manifest b/dev-python/pymdown-extensions/Manifest
new file mode 100644
index 000000000000..715d3ad0bc4a
--- /dev/null
+++ b/dev-python/pymdown-extensions/Manifest
@@ -0,0 +1 @@
+DIST pymdown-extensions-8.0.1.tar.gz 642787 BLAKE2B fe25fd828633bb1a653430431de9fd2f9abc881ff457d2c630befd7c094a147f4d4883088488a66c601190794c15fdfb8297a3252ba3b070412b2f18872f6126 SHA512 3f85bfe9128dcdc63cea4c2eb4d55173d697ae9d112559a74527ed64b3bd63f67eee119b81a54d0ac927bc21b6eb8411c03dc7afc77673739a81772c10ebe62a
diff --git a/dev-python/pymdown-extensions/metadata.xml b/dev-python/pymdown-extensions/metadata.xml
new file mode 100644
index 000000000000..aaa35da88011
--- /dev/null
+++ b/dev-python/pymdown-extensions/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+	<maintainer type="person">
+		<email>andrewammerlaan@riseup.net</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">facelessuser/pymdown-extensions</remote-id>
+		<remote-id type="pypi">pymdown-extensions</remote-id>
+	</upstream>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/dev-python/pymdown-extensions/pymdown-extensions-8.0.1.ebuild b/dev-python/pymdown-extensions/pymdown-extensions-8.0.1.ebuild
new file mode 100644
index 000000000000..50aba6858131
--- /dev/null
+++ b/dev-python/pymdown-extensions/pymdown-extensions-8.0.1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+DOCS_BUILDER="mkdocs"
+DOCS_DEPEND="
+	dev-python/mkdocs-git-revision-date-localized-plugin
+	dev-python/mkdocs-minify-plugin
+	dev-python/mkdocs-material
+	dev-python/pymdown-lexers
+	dev-python/pyspelling
+"
+
+inherit distutils-r1 docs
+
+DESCRIPTION="Extensions for Python Markdown."
+HOMEPAGE="
+	https://github.com/facelessuser/pymdown-extensions
+	https://pypi.org/project/pymdown-extensions
+"
+SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=dev-python/markdown-3.2[${PYTHON_USEDEP}]"
+
+BDEPEND="test? (
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-vcs/git
+)"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# Fails on whitspaces
+	rm tests/test_syntax.py || die
+
+	# AssertionError: False is not true
+	sed -i -e 's:test_no_pygments_linenums_custom_class:_&:' \
+		tests/test_extensions/test_highlight.py  || die
+
+	sed -i -e 's:test_default_override:_&:' \
+		tests/test_extensions/test_superfences.py  || die
+
+	sed -i -e 's:test_tabbed:_&:' \
+		-e 's:test_tabbed_split:_&:' \
+		tests/test_extensions/test_tabbed.py  || die
+
+	# mkdocs-git-revision-date-localized-plugin needs git repo
+	if use doc; then
+		git init || die
+		git config --global user.email "you@example.com" || die
+		git config --global user.name "Your Name" || die
+		git add . || die
+		git commit -m 'init' || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/pymdown-lexers/Manifest b/dev-python/pymdown-lexers/Manifest
new file mode 100644
index 000000000000..d1be47278bb9
--- /dev/null
+++ b/dev-python/pymdown-lexers/Manifest
@@ -0,0 +1 @@
+DIST pymdown-lexers-0_pre20180905.tar.gz 2596 BLAKE2B ff08ac12fbb242ab5b51b80f91d18281cf8cd9bf121b1a6d389ef47a069c614991d6fb99ff05cca9802e68b4dfc2c89d9f6d4b02051a133968ab9ee24943756b SHA512 d0a509cdd9924053b79259b873ec3a3671869b37f7a97112370d21c360f6315961d13610cf08a00e10f58d5e25ac360b3844fc997392dfe724ec14f02a079596
diff --git a/dev-python/pymdown-lexers/metadata.xml b/dev-python/pymdown-lexers/metadata.xml
new file mode 100644
index 000000000000..12c53dcb3236
--- /dev/null
+++ b/dev-python/pymdown-lexers/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+	<maintainer type="person">
+		<email>lssndrbarbieri@gmail.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>andrewammerlaan@riseup.net</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">facelessuser/pymdown-lexers</remote-id>
+	</upstream>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/dev-python/pymdown-lexers/pymdown-lexers-0_pre20180905.ebuild b/dev-python/pymdown-lexers/pymdown-lexers-0_pre20180905.ebuild
new file mode 100644
index 000000000000..d1c45db5597a
--- /dev/null
+++ b/dev-python/pymdown-lexers/pymdown-lexers-0_pre20180905.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit distutils-r1
+
+COMMIT="fa422cb95b794157760259c5c20a1235e4a459be"
+
+DESCRIPTION="Additional lexers for use in Pygments"
+HOMEPAGE="https://github.com/facelessuser/pymdown-lexers"
+SRC_URI="https://github.com/facelessuser/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/pygments-2.0.1[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}/${PN}-${COMMIT}"
diff --git a/dev-python/pyspelling/Manifest b/dev-python/pyspelling/Manifest
new file mode 100644
index 000000000000..b85ac18e5687
--- /dev/null
+++ b/dev-python/pyspelling/Manifest
@@ -0,0 +1 @@
+DIST pyspelling-2.7.0.tar.gz 149425 BLAKE2B f8e600a41ebd4ec290562307306e7fd5c67d384b9186de037b98d50d58016ded19c426caa892497ca44e309fb3db04292b890612afbe25a34f9f6b06985d3740 SHA512 2fcd225a66cb02fff10d5ca652e523a01bd0488a005dafa32ba1151fba9afe73809781501c957d6df00927baa9fb6779872973b32e2d3fe8a09306fdc4191995
diff --git a/dev-python/pyspelling/metadata.xml b/dev-python/pyspelling/metadata.xml
new file mode 100644
index 000000000000..406187c23002
--- /dev/null
+++ b/dev-python/pyspelling/metadata.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+	<maintainer type="person">
+		<email>lssndrbarbieri@gmail.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>andrewammerlaan@riseup.net</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">facelessuser/pyspelling</remote-id>
+	</upstream>
+	<longdescription lang="en">
+PySpelling is a module to help with automating spell checking in a project with Aspell or 
+Hunspell. It is essentially a wrapper around the command line utility of these two spell 
+checking tools, and allows you to setup different spelling tasks for different file types. 
+You can apply specific and different filters and options to each task. PySpelling can also 
+be used in CI environments to fail the build if there are misspelled words.
+Aspell and Hunspell are very good spell checking tools. Aspell particularly comes with a couple of filters, but the filters are limited in types and aren't extremely flexible. PySpelling was created to work around Aspell's and Hunspell's filtering shortcomings by creating a wrapper around them that could be extended to handle more kinds of file formats and provide more advanced filtering. If you need to filter out specific HTML tags with specific IDs or class names, PySpelling can do it. If you want to scan Python files for docstrings, but also avoid specific content within the docstring, you can do that as well. If PySpelling doesn't have a filter you need, with access to so many available Python modules, you can easily write your own.
+	</longdescription> 
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/dev-python/pyspelling/pyspelling-2.7.0.ebuild b/dev-python/pyspelling/pyspelling-2.7.0.ebuild
new file mode 100644
index 000000000000..31fca876c8ea
--- /dev/null
+++ b/dev-python/pyspelling/pyspelling-2.7.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+DOCS_BUILDER="mkdocs"
+DOCS_DEPEND="
+	~dev-python/mkdocs_pymdownx_material_extras-1.1.3
+	dev-python/mkdocs-git-revision-date-localized-plugin
+	dev-python/mkdocs-minify-plugin
+"
+
+inherit distutils-r1 docs
+
+DESCRIPTION="Spell checker automation tool"
+HOMEPAGE="https://github.com/facelessuser/pyspelling"
+SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	|| ( app-text/aspell app-text/hunspell )
+
+	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/html5lib[${PYTHON_USEDEP}]
+	dev-python/markdown[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	>=dev-python/soupsieve-1.8[${PYTHON_USEDEP}]
+	>=dev-python/wcmatch-6.0.3[${PYTHON_USEDEP}]
+"
+
+BDEPEND="test? ( dev-vcs/git )"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# mkdocs-git-revision-date-localized-plugin needs git repo
+	if use doc; then
+		git init || die
+		git config --global user.email "you@example.com" || die
+		git config --global user.name "Your Name" || die
+		git add . || die
+		git commit -m 'init' || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/wcmatch/Manifest b/dev-python/wcmatch/Manifest
new file mode 100644
index 000000000000..eb561b1f9514
--- /dev/null
+++ b/dev-python/wcmatch/Manifest
@@ -0,0 +1 @@
+DIST wcmatch-7.1.tar.gz 105744 BLAKE2B 0add1c68025c92ac57d6ea64d82bddb20bace60de5d319fb16e16802f208d788d876695bfcd186b80630039f544565c631d36e1c7327dee5d8c799eff8c80ce2 SHA512 79d62d85f13d245e38d0fe92a275e24058b86af8aaf9a926bfd950dad4ec47e40e763c18b08d3eb4ddd925832ae9910f13407094070442b41dbe2fe4ad11fb39
diff --git a/dev-python/wcmatch/metadata.xml b/dev-python/wcmatch/metadata.xml
new file mode 100644
index 000000000000..74ac9d9243fb
--- /dev/null
+++ b/dev-python/wcmatch/metadata.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+	<maintainer type="person">
+		<email>lssndrbarbieri@gmail.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>andrewammerlaan@riseup.net</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">facelessuser/wcmatch</remote-id>
+		<remote-id type="pypi">wcmatch</remote-id>
+	</upstream>
+	<longdescription lang="en">
+Wildcard Match provides an enhanced fnmatch, glob, and pathlib library in order to provide 
+file matching and globbing that more closely follows the features found in Bash. In some 
+ways these libraries are similar to Python's builtin libraries as they provide a similar 
+interface to match, filter, and glob the file system. But they also include a number of 
+features found in Bash's globbing such as backslash escaping, brace expansion, extended 
+glob pattern groups, etc. They also add a number of new useful functions as well, such as 
+globmatch which functions like fnmatch, but for paths.
+Wildcard Match also adds a file search utility called wcmatch that is built on top of fnmatch and globmatch. It was 
+originally written for Rummage, but split out into this project to be used by other 
+projects that may find its approach useful.
+Bash is used as a guide when making decisions on behavior for fnmatch and glob. Behavior may differ from Bash version to Bash version, 
+but an attempt is made to keep Wildcard Match up with the latest relevant changes. With 
+all of this said, there may be a few corner cases in which we've intentionally chosen to 
+not exactly mirror Bash. If an issue is found where Wildcard Match seems to deviate in an 
+illogical way, we'd love to hear about it in the issue tracker.
+Features
+A quick overview of Wildcard Match's
+Features:
+		Provides an interface comparable to Python's builtin in fnamtch, glob, and pathlib. 
+		Allows for a much more configurable experience when matching or globbing with many more features. Adds support for ** in glob.
+		Adds support for escaping characters with \.
+		Add support for POSIX style character classes inside sequences: [[:alnum:]], etc. The C locale is used for byte strings and Unicode properties for Unicode strings.
+		Adds support for brace expansion: a{b,{c,d}} --> ab ac ad.
+		Adds support for expanding ~ or ~username to the appropriate user path.
+		Adds support for extended match patterns: @(...), +(...), *(...), ?(...), and !(...).
+		Adds ability to match path names via the path centric globmatch.
+		Provides a pathlib variant that uses Wildcard Match's glob library instead of Python's default.
+		Provides an alternative file crawler called wcmatch.
+		And more...
+	</longdescription>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/dev-python/wcmatch/wcmatch-7.1.ebuild b/dev-python/wcmatch/wcmatch-7.1.ebuild
new file mode 100644
index 000000000000..93df4e72467d
--- /dev/null
+++ b/dev-python/wcmatch/wcmatch-7.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+DOCS_BUILDER="mkdocs"
+DOCS_DEPEND="
+	~dev-python/mkdocs_pymdownx_material_extras-1.0.7
+	dev-python/mkdocs-material
+	dev-python/mkdocs-git-revision-date-localized-plugin
+	dev-python/mkdocs-minify-plugin
+	dev-python/pyspelling
+"
+
+inherit distutils-r1 docs
+
+DESCRIPTION="Wildcard/glob file name matcher"
+HOMEPAGE="
+	https://github.com/facelessuser/wcmatch
+	https://pypi.org/project/wcmatch"
+SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/backrefs-4.1[${PYTHON_USEDEP}]
+	>=dev-python/bracex-2.0[${PYTHON_USEDEP}]
+"
+
+BDEPEND="test? (
+	dev-python/mock[${PYTHON_USEDEP}]
+	dev-vcs/git
+)"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# no such file or dir ~homedir
+	sed -i -e 's:test_tilde_user:_&:' \
+		tests/test_glob.py || die
+
+	# mkdocs-git-revision-date-localized-plugin needs git repo
+	if use doc; then
+		git init || die
+		git config --global user.email "you@example.com" || die
+		git config --global user.name "Your Name" || die
+		git add . || die
+		git commit -m 'init' || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-ruby/fakefs/Manifest b/dev-ruby/fakefs/Manifest
index bde623897e40..7f9ae62a88e9 100644
--- a/dev-ruby/fakefs/Manifest
+++ b/dev-ruby/fakefs/Manifest
@@ -2,3 +2,4 @@ DIST fakefs-0.19.2.tar.gz 53405 BLAKE2B c9841f7f2aee5135d149187d03f7f3034d3c6cbc
 DIST fakefs-0.20.1.tar.gz 53626 BLAKE2B 013f49b57355943eb6624540be93bc069c95409f9e1d49c8cced034656f596ee98fc3ee4dd40cb80383d447164f11242e16a5ffb9b35ba2e28fb136e0f72a09e SHA512 61d83868a0cf4d0abf071fadc9ca21176e3ef8f2ccc781760a8b0b3e55713750d3e952482e90a87e8665163a262e8bdef8e6b2f3c423fabe696d64f356862aa4
 DIST fakefs-1.2.1.tar.gz 54106 BLAKE2B bd1128871a36dcf8f0137c9ee13c581cddf2ace5a2959e863c66e52dc5b682c75e0f4507c7d939f6725bc1b5a8446e1747d188b98b1cf557c0d1fccd1d3c7040 SHA512 e18d9c1c5ac444f2a9db362dac3c4563f27c4f9b6e6870960e85882ab28dadee53bd56f6933f6317d3128a5ad3862980fa9e2a72cbf7352c58c18a6cee68163f
 DIST fakefs-1.2.2.tar.gz 54072 BLAKE2B 6e1865377c6586fb409f6392b0313e750c1810b9479c120622757f711da55644e8224c8245ce0ac187c6d531a80ae54081add5572b5170f367fdf1d58b4df924 SHA512 4bd0995a1dca27a15da49962b0fddc1daf1e11f88767bcc36e57883ec62e4270d5d6873f52d64859301a5f186e467d368fbfbc0dcabfbfe24bfdff6b6a14389d
+DIST fakefs-1.2.3.tar.gz 54054 BLAKE2B ae8202b7f28d4d1b326e016d96382b7cfaf012fb842d63150bb09b6ddb5de96bb6d548635877d2d057137bbc23c46c30340ebae3641d70d7955f609bb4cc4af2 SHA512 5051a3b81ba5919cdb6cd4a92f4e6af6ed5140afb35247b1775f4602083e23f903c582e038596a3bb27ab3f69128ef3d9fc2635d015fdb23babf21ff200c4692
diff --git a/dev-ruby/fakefs/fakefs-1.2.3.ebuild b/dev-ruby/fakefs/fakefs-1.2.3.ebuild
new file mode 100644
index 000000000000..16d45a8ca419
--- /dev/null
+++ b/dev-ruby/fakefs/fakefs-1.2.3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_EXTRADOC="CONTRIBUTORS README.md"
+
+RUBY_FAKEGEM_GEMSPEC="fakefs.gemspec"
+
+inherit ruby-fakegem eutils
+
+DESCRIPTION="A fake filesystem. Use it in your tests"
+HOMEPAGE="https://github.com/defunkt/fakefs"
+SRC_URI="https://github.com/defunkt/fakefs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/rspec-3.1:3
+		>=dev-ruby/maxitest-3.6:1
+	)"
+
+all_ruby_prepare() {
+	# Remove bundler
+	rm Gemfile || die
+
+	# Avoid unneeded minitest-rg dependency.
+	sed -i -e '1igem "minitest", "~>5.5"' \
+		-e '/bundler/ s:^:#:' \
+		-e '/minitest\/rg/ s:^:#:' test/test_helper.rb || die
+
+	sed -i -e 's/git ls-files/find/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	RSPEC_VERSION=3 ruby-ng_rspec
+	${RUBY} -Ilib:.:test -e 'Dir["test/**/*_test.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/faker/Manifest b/dev-ruby/faker/Manifest
index bd3c9401e1d4..cc40b1fc8e23 100644
--- a/dev-ruby/faker/Manifest
+++ b/dev-ruby/faker/Manifest
@@ -2,3 +2,4 @@ DIST faker-2.11.0.tar.gz 1033369 BLAKE2B 51677346980bd5070a145b1d8dd11a6426cf9da
 DIST faker-2.12.0.tar.gz 1100460 BLAKE2B 8be31911c9612d7433433121344a1fbfc735740898cb4fa7115a9ec33d22f610e5eca9ace3369da7f6e107478493e7b732a74650a233171ebb8b306f3e2d872e SHA512 7adc89cc3ba7e4d802d5f96199e21a6ed1dc9f0144d2da5a9a5adb705097d1acf4830c7ff0ce733fb9b0ddc11fba0290cade9f791824db5ab737b3facd93f93d
 DIST faker-2.13.0.tar.gz 1129212 BLAKE2B 358a959a600d5638681bbad20b05618cd2d67857de120a4ff6d8d6c3c723d1efd24ebfa617e3d2090862e111271bd3c12ac3f3f340e8eda6811760c1de31f642 SHA512 700a3d4d6f9019bd7c7e61ed770c6eb2e9dede6e4af9e3a06ca1858a2eebdd67491b94a41396ba1ab4940f0f7fd00f2203db78f5267adb08360b95823c633131
 DIST faker-2.14.0.tar.gz 1150487 BLAKE2B 51343e8d45d2615d180fac4845d2cc8a6509b3710528c2770e52f2e4203e458ba07e3fa4f8f7559704598379b54fe38d8d557fc6cc0b614f3695cee8265adc49 SHA512 3a65a65c587f9e2a12c0d7a1e5ecbb12d059146cfda944d5bca950dd2b8cbdb509722b7b181fc619f395ebb526c3f99461ed74803a79cda1b74df83c203db518
+DIST faker-2.15.1.tar.gz 1213822 BLAKE2B dd627078ce1edab63a3f16a5e893c29911b9bf8d88b6d490a368ec16a633e7138124ee66d439738c4f2a8e14b6d0815611ed744d5323817873a0e13f2bddfb06 SHA512 de3721290683a86f985c2783c749be530c3306be73d929517fb54dcde2f64b124cedfa6b10c51e390a38a0b5ac81e2feb0b491c165d0bae9f017463596794fbf
diff --git a/dev-ruby/faker/faker-2.15.1.ebuild b/dev-ruby/faker/faker-2.15.1.ebuild
new file mode 100644
index 000000000000..9ae0563a25d2
--- /dev/null
+++ b/dev-ruby/faker/faker-2.15.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+
+RUBY_FAKEGEM_GEMSPEC="faker.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A library for generating fake data such as names, addresses, and phone numbers"
+HOMEPAGE="https://github.com/stympy/faker"
+SRC_URI="https://github.com/stympy/faker/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="test"
+
+ruby_add_rdepend ">=dev-ruby/i18n-1.6:1 !!<dev-ruby/faker-1.9.6-r1"
+
+ruby_add_bdepend "test? ( dev-ruby/timecop )"
+
+all_ruby_prepare() {
+	sed -i -e '/\(bundler\|rubocop\|yard\)/I s:^:#:' Rakefile || die
+	sed -i -e '/simplecov/,/^end/ s:^:#:' test/test_helper.rb || die
+}
diff --git a/eclass/docs.eclass b/eclass/docs.eclass
index 73c9ec99ca5c..adacae4abda6 100644
--- a/eclass/docs.eclass
+++ b/eclass/docs.eclass
@@ -19,7 +19,7 @@
 # to the location of the compiled documentation
 #
 # The aim of this eclass is to make it easy to add additional
-# doc builders. To do this, add a <DOCS_BUILDER>-setup and
+# doc builders. To do this, add a <DOCS_BUILDER>-deps and
 # <DOCS_BUILDER>-build function for your doc builder.
 # For python based doc builders you can use the
 # python_append_deps function to append [${PYTHON_USEDEP}]
@@ -77,10 +77,6 @@ esac
 # Sets whether to use sphinx.ext.autodoc/mkautodoc
 # Defaults to 1 (True) for sphinx, and 0 (False) for mkdocs
 
-# @ECLASS-VARIABLE: DOCS_EXTRA_ARGS
-# @DESCRIPTION:
-# Extra arguments to parse to the DOCS_BUILDER
-
 # @ECLASS-VARIABLE: DOCS_OUTDIR
 # @DESCRIPTION:
 # Sets where the compiled files will be put.
@@ -90,7 +86,7 @@ esac
 #
 # HTML_DOCS=( "${yourdocs}" "${DOCS_OUTDIR}/." )
 #
-# Defaults to ${DOCS_DIR}/_build/html
+# Defaults to ${S}/_build/html
 
 # @ECLASS-VARIABLE: DOCS_CONFIG_NAME
 # @DESCRIPTION:
@@ -122,21 +118,6 @@ case ${DOCS_BUILDER} in
 		;;
 esac
 
-# @FUNCTION: python_check_deps
-# @DESCRIPTION:
-# Check if the dependencies are valid
-python_check_deps() {
-	debug-print-function ${FUNCNAME}
-	use doc || return 0
-
-	local dep
-	for dep in ${CHECK_DEPS[@]}; do
-		has_version "${dep}[${PYTHON_USEDEP}]" || return 1
-	done
-}
-# Save this before we start manipulating it
-CHECK_DEPS=${DOCS_DEPEND}
-
 # @FUNCTION: python_append_dep
 # @DESCRIPTION:
 # Appends [\${PYTHON_USEDEP}] to all dependencies
@@ -145,10 +126,10 @@ CHECK_DEPS=${DOCS_DEPEND}
 python_append_deps() {
 	debug-print-function ${FUNCNAME}
 
-	local temp=()
+	local temp
 	local dep
 	for dep in ${DOCS_DEPEND[@]}; do
-		temp+=(" ${dep}[\${PYTHON_USEDEP}]")
+		temp+=" ${dep}[\${PYTHON_USEDEP}]"
 	done
 	DOCS_DEPEND=${temp}
 }
@@ -165,7 +146,8 @@ sphinx_deps() {
 		if [[ -n "${DOCS_DEPEND}" ]]; then
 			die "${FUNCNAME}: do not set DOCS_AUTODOC to 0 if external plugins are used"
 		else
-			DOCS_DEPEND="dev-python/sphinx"
+			DOCS_DEPEND="$(python_gen_any_dep "
+			dev-python/sphinx[\${PYTHON_USEDEP}]")"
 		fi
 	elif [[ ${DOCS_AUTODOC} == 1 ]]; then
 		DOCS_DEPEND="$(python_gen_any_dep "
@@ -203,7 +185,7 @@ sphinx_compile() {
 	sed -i -e 's:^intersphinx_mapping:disabled_&:' \
 		"${DOCS_DIR}"/conf.py || die
 	# not all packages include the Makefile in pypi tarball
-	sphinx-build "${DOCS_EXTRA_ARGS}" -b html -d "${DOCS_DIR}"/_build/doctrees "${DOCS_DIR}" \
+	sphinx-build -b html -d "${DOCS_OUTDIR}"/_build/doctrees "${DOCS_DIR}" \
 	"${DOCS_OUTDIR}" || die "${FUNCNAME}: sphinx-build failed"
 }
 
@@ -244,7 +226,7 @@ mkdocs_compile() {
 		die "${FUNCNAME}: ${mkdocsyml} not found, DOCS_DIR=${DOCS_DIR} wrong"
 
 	pushd "${DOCS_DIR}" || die
-	mkdocs build "${DOCS_EXTRA_ARGS}" -d "${DOCS_OUTDIR}" || die "${FUNCNAME}: mkdocs build failed"
+	mkdocs build -d "${DOCS_OUTDIR}" || die "${FUNCNAME}: mkdocs build failed"
 	popd || die
 
 	# remove generated .gz variants
@@ -283,7 +265,7 @@ doxygen_compile() {
 	mkdir -p "${DOCS_OUTDIR}" || die
 
 	pushd "${DOCS_DIR}" || die
-	(cat "${DOCS_CONFIG_NAME}" ; echo "HTML_OUTPUT=${DOCS_OUTDIR}") | doxygen - "${DOCS_EXTRA_ARGS}" || die "${FUNCNAME}: doxygen failed"
+	(cat "${DOCS_CONFIG_NAME}" ; echo "HTML_OUTPUT=${DOCS_OUTDIR}") | doxygen - || die "${FUNCNAME}: doxygen failed"
 	popd || die
 }
 
@@ -305,7 +287,7 @@ docs_compile() {
 	: ${DOCS_DIR:="${S}"}
 
 	# Where to put the compiled files?
-	: ${DOCS_OUTDIR:="${DOCS_DIR}/_build/html"}
+	: ${DOCS_OUTDIR:="${S}/_build/html"}
 
 	${DOCS_BUILDER}_compile
 
diff --git a/games-util/steam-launcher/Manifest b/games-util/steam-launcher/Manifest
index 3a93a1410923..baad77293f63 100644
--- a/games-util/steam-launcher/Manifest
+++ b/games-util/steam-launcher/Manifest
@@ -1 +1 @@
-DIST steam_1.0.0.64.tar.gz 3013735 BLAKE2B f8e19a768ecc507fa503ad774ce2bbf31f79f8bbaf205d687153a523761cb067ae83b718a0954ec6389dbdc7b97001932163efd888de7c73a12e1dec7e429dab SHA512 4a287b993d0ba6f49041d116512a28ca827eeac280808b70542d304f0de2d489be1f75d66d614f65ae11686a78e0d026b12e983ead7843e9ad0a28f1d21bdf4c
+DIST steam_1.0.0.67.tar.gz 2959520 BLAKE2B 1a47f1d5a1fea7ba01c250f8765b2ee8bea87f0cd242ae52bdc78b51fb05c43c333efb667d3e7cf7b401a2fa5131efce176cead3c5ecdb214257fb2da75a36cf SHA512 74af8019b9d216c02860654e9a0162b1089b979e63bbe13645be2ee79414f896e9e57cbb85d762725756e99ed6333a75c8712a827dd88de2b3631bc119b6b0b8
diff --git a/games-util/steam-launcher/metadata.xml b/games-util/steam-launcher/metadata.xml
new file mode 100644
index 000000000000..907f2c278497
--- /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-overlay</origin>
+</pkgmetadata>
diff --git a/games-util/steam-launcher/steam-launcher-1.0.0.64.ebuild b/games-util/steam-launcher/steam-launcher-1.0.0.67.ebuild
index 350d9e8c7d5b..87f35fafd126 100644
--- a/games-util/steam-launcher/steam-launcher-1.0.0.64.ebuild
+++ b/games-util/steam-launcher/steam-launcher-1.0.0.67.ebuild
@@ -6,16 +6,16 @@ EAPI=7
 # Please report bugs/suggestions on: https://github.com/anyc/steam-overlay
 # or come to #gentoo-gamerlay in freenode IRC
 
-inherit linux-info prefix udev xdg-utils
+inherit linux-info prefix xdg-utils
 
 DESCRIPTION="Installer, launcher and supplementary files for Valve's Steam client"
 HOMEPAGE="https://steampowered.com"
-SRC_URI="https://repo-steampowered-com.steamos.cloud/steam/pool/steam/s/steam/steam_${PV}.tar.gz"
+SRC_URI="https://repo.steampowered.com/steam/archive/precise/steam_${PV}.tar.gz"
 
 LICENSE="ValveSteamLicense MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+steamruntime"
+IUSE="+joystick +steamruntime +udev"
 RESTRICT="bindist mirror test"
 
 RDEPEND="
@@ -27,6 +27,9 @@ RDEPEND="
 			x11-terms/xterm
 			)
 
+		joystick? (
+			udev? ( games-util/game-device-udev-rules )
+		)
 		steamruntime? (
 			virtual/opengl[abi_x86_32]
 			x11-libs/libX11[abi_x86_32]
@@ -86,9 +89,6 @@ src_prepare() {
 	xdg_environment_reset
 	default
 
-	sed -i 's:TAG+="uaccess":\0, TAG+="udev-acl":g' \
-		subprojects/steam-devices/*.rules || die
-
 	sed \
 		-e "s#@@PVR@@#${PVR}#g" \
 		-e "s#@@GENTOO_LD_LIBRARY_PATH@@#$(multilib_path_entries debiancompat fltk)#g" \
@@ -110,14 +110,11 @@ src_install() {
 
 	dodoc README debian/changelog
 	doman steam.6
-
-	udev_dorules subprojects/steam-devices/60-steam-{input,vr}.rules
 }
 
 pkg_postinst() {
 	xdg_icon_cache_update
 	xdg_desktop_database_update
-	udev_reload
 
 	elog "Execute ${EPREFIX}/usr/bin/steam to download and install the actual"
 	elog "client into your home folder. After installation, the script"
diff --git a/gnome-base/gnome-shell/gnome-shell-3.38.2.ebuild b/gnome-base/gnome-shell/gnome-shell-3.38.2.ebuild
index bc4f3309d716..ecda21f55d22 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.38.2.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.38.2.ebuild
@@ -42,7 +42,7 @@ DEPEND="
 		net-libs/libnma[introspection]
 		>=app-crypt/libsecret-0.18
 		dev-libs/dbus-glib )
-	systemd? ( >=sys-apps/systemd-31
+	systemd? ( >=sys-apps/systemd-242
 		>=gnome-base/gnome-desktop-3.34.2:3=[systemd] )
 	elogind? ( >=sys-auth/elogind-237 )
 	app-arch/gnome-autoar
diff --git a/net-dns/nsd/Manifest b/net-dns/nsd/Manifest
index e36535c6bd43..b0b1f2df68f3 100644
--- a/net-dns/nsd/Manifest
+++ b/net-dns/nsd/Manifest
@@ -1,3 +1 @@
-DIST nsd-4.2.4.tar.gz 1148826 BLAKE2B e2508c225d0bebeb9134c6eb3f00dfaf00d2de1a545cf9719b3bf04de8cf4a173ed744ebe5ff50a7062f5fb3135f4e476b9111736442fa358eb6ce20faac8406 SHA512 5d4f546a2a4484b182c65d3337d44596e935bca074c0eda2947b9d128a56db08a00240c6ec9ce22bc9a436e009c00c3283c4a5cbd1163ca4a429eaa92ec54208
-DIST nsd-4.3.3.tar.gz 1181082 BLAKE2B 611027e015f89a6aef0bc9e0b74242e683a1475f5cd2a79dc16a30011989c33a4d3bd21aced24dc6040469a304414b7e775261b097beb007e06c3c025dbf2b9e SHA512 5e7e2037e0939af20af137c913943904e36cf7da517292d40dbbd4f7ebc878b0e97acd7f6cbbaaebbb525a84f6d6ae9e82c34df9c8482075653c4802777a9fa6
 DIST nsd-4.3.4.tar.gz 1182467 BLAKE2B 10c06be9df393774627a42a7cf254202fe9800e7cd5048d392fbf90a65321a4596e742165b1157b3a0ce0645a80ae5425f7d43eb0a453077e45bff06d52347d4 SHA512 fe332caecfd3c6bb8ae1a92fec26984a7953e5e462515e8622c1079b217c962728e841826cdf7899f47f9ac24af1dd383f8ba7981541b05a2338cd288c40b0a7
diff --git a/net-dns/nsd/nsd-4.2.4.ebuild b/net-dns/nsd/nsd-4.2.4.ebuild
deleted file mode 100644
index 3eb9252a70db..000000000000
--- a/net-dns/nsd/nsd-4.2.4.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools systemd
-
-# version voodoo needed only for non-release tarballs: 4.0.0_rc1 => 4.0.0rc1
-MY_PV="${PV/_beta/b}"
-MY_PV="${MY_PV/_rc/rc}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="An authoritative only, high performance, open source name server"
-HOMEPAGE="https://www.nlnetlabs.nl/projects/nsd"
-SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${MY_P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="amd64 x86"
-IUSE="bind8-stats dnstap ipv6 libevent minimal-responses mmap munin +nsec3 ratelimit root-server runtime-checks ssl systemd libressl"
-
-S="${WORKDIR}/${MY_P}"
-
-RDEPEND="
-	acct-group/nsd
-	acct-user/nsd
-	dnstap? (
-		dev-libs/fstrm
-		dev-libs/protobuf-c
-	)
-	libevent? ( dev-libs/libevent )
-	munin? ( net-analyzer/munin )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	systemd? ( sys-apps/systemd )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-devel/flex
-	virtual/yacc
-	systemd? ( virtual/pkgconfig )
-"
-
-PATCHES=(
-	# Fix the paths in the munin plugin to match our install
-	"${FILESDIR}"/nsd_munin_.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-largefile
-		--enable-pie
-		--enable-relro-now
-		--enable-tcp-fastopen
-		--with-dbfile="${EPREFIX}"/var/db/nsd/nsd.db
-		--with-logfile="${EPREFIX}"/var/log/nsd.log
-		--with-pidfile="${EPREFIX}"/run/nsd/nsd.pid
-		--with-xfrdfile="${EPREFIX}"/var/db/nsd/xfrd.state
-		--with-xfrdir="${EPREFIX}"/var/db/nsd
-		--with-zonelistfile="${EPREFIX}"/var/db/nsd/zone.list
-		--with-zonesdir="${EPREFIX}"/var/lib/nsd
-		$(use_enable bind8-stats)
-		$(use_enable bind8-stats zone-stats)
-		$(use_enable dnstap)
-		$(use_enable ipv6)
-		$(use_enable minimal-responses)
-		$(use_enable mmap)
-		$(use_enable nsec3)
-		$(use_enable ratelimit)
-		$(use_enable root-server)
-		$(use_enable runtime-checks checking)
-		$(use_enable systemd)
-		$(use_with libevent)
-		$(use_with ssl)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc doc/{ChangeLog,CREDITS,NSD-4-features,NSD-FOR-BIND-USERS,README,RELNOTES,REQUIREMENTS}
-
-	newinitd "${FILESDIR}"/nsd.initd-r1 nsd
-
-	# install munin plugin and config
-	if use munin ; then
-		exeinto /usr/libexec/munin/plugins
-		doexe contrib/nsd_munin_
-		insinto /etc/munin/plugin-conf.d
-		newins "${FILESDIR}"/nsd.munin-conf nsd_munin
-	fi
-
-	systemd_dounit "${FILESDIR}"/nsd.service
-
-	# remove the /run directory that usually resides on tmpfs and is
-	# being taken care of by the nsd init script anyway (checkpath)
-	rm -r "${ED}"/run || die "Failed to remove /run"
-
-	keepdir /var/db/${PN}
-}
-
-pkg_postinst() {
-	# database directory, writable by nsd for database updates and zone transfers
-	install -d -m 750 -o nsd -g nsd "${EROOT}"/var/db/nsd
-
-	# zones directory, writable by nsd for zone file updates (nsd-control write)
-	install -d -m 750 -o nsd -g nsd "${EROOT}"/var/lib/nsd
-}
diff --git a/net-dns/nsd/nsd-4.3.3.ebuild b/net-dns/nsd/nsd-4.3.3.ebuild
deleted file mode 100644
index ad89272df852..000000000000
--- a/net-dns/nsd/nsd-4.3.3.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools systemd
-
-# version voodoo needed only for non-release tarballs: 4.0.0_rc1 => 4.0.0rc1
-MY_PV="${PV/_beta/b}"
-MY_PV="${MY_PV/_rc/rc}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="An authoritative only, high performance, open source name server"
-HOMEPAGE="https://www.nlnetlabs.nl/projects/nsd"
-SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${MY_P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="~amd64 ~x86"
-IUSE="bind8-stats dnstap ipv6 libevent minimal-responses mmap munin +nsec3 ratelimit root-server runtime-checks ssl systemd libressl"
-
-S="${WORKDIR}/${MY_P}"
-
-RDEPEND="
-	acct-group/nsd
-	acct-user/nsd
-	dnstap? (
-		dev-libs/fstrm
-		dev-libs/protobuf-c
-	)
-	libevent? ( dev-libs/libevent )
-	munin? ( net-analyzer/munin )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	systemd? ( sys-apps/systemd )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-devel/flex
-	virtual/yacc
-	systemd? ( virtual/pkgconfig )
-"
-
-PATCHES=(
-	# Fix the paths in the munin plugin to match our install
-	"${FILESDIR}"/nsd_munin_.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-largefile
-		--enable-pie
-		--enable-relro-now
-		--enable-tcp-fastopen
-		--with-dbfile="${EPREFIX}"/var/db/nsd/nsd.db
-		--with-logfile="${EPREFIX}"/var/log/nsd.log
-		--with-pidfile="${EPREFIX}"/run/nsd/nsd.pid
-		--with-xfrdfile="${EPREFIX}"/var/db/nsd/xfrd.state
-		--with-xfrdir="${EPREFIX}"/var/db/nsd
-		--with-zonelistfile="${EPREFIX}"/var/db/nsd/zone.list
-		--with-zonesdir="${EPREFIX}"/var/lib/nsd
-		$(use_enable bind8-stats)
-		$(use_enable bind8-stats zone-stats)
-		$(use_enable dnstap)
-		$(use_enable ipv6)
-		$(use_enable minimal-responses)
-		$(use_enable mmap)
-		$(use_enable nsec3)
-		$(use_enable ratelimit)
-		$(use_enable root-server)
-		$(use_enable runtime-checks checking)
-		$(use_enable systemd)
-		$(use_with libevent)
-		$(use_with ssl)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc doc/{ChangeLog,CREDITS,NSD-4-features,NSD-FOR-BIND-USERS,README,RELNOTES,REQUIREMENTS}
-
-	newinitd "${FILESDIR}"/nsd.initd-r1 nsd
-
-	# install munin plugin and config
-	if use munin ; then
-		exeinto /usr/libexec/munin/plugins
-		doexe contrib/nsd_munin_
-		insinto /etc/munin/plugin-conf.d
-		newins "${FILESDIR}"/nsd.munin-conf nsd_munin
-	fi
-
-	systemd_dounit "${FILESDIR}"/nsd.service
-
-	# remove the /run directory that usually resides on tmpfs and is
-	# being taken care of by the nsd init script anyway (checkpath)
-	rm -r "${ED}"/run || die "Failed to remove /run"
-
-	keepdir /var/db/${PN}
-}
-
-pkg_postinst() {
-	# database directory, writable by nsd for database updates and zone transfers
-	install -d -m 750 -o nsd -g nsd "${EROOT}"/var/db/nsd
-
-	# zones directory, writable by nsd for zone file updates (nsd-control write)
-	install -d -m 750 -o nsd -g nsd "${EROOT}"/var/lib/nsd
-}
diff --git a/net-dns/nsd/nsd-4.3.4.ebuild b/net-dns/nsd/nsd-4.3.4.ebuild
index 734ef9bea873..605c0b69f2c1 100644
--- a/net-dns/nsd/nsd-4.3.4.ebuild
+++ b/net-dns/nsd/nsd-4.3.4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${MY_P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 [[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="bind8-stats dnstap ipv6 libevent minimal-responses mmap munin +nsec3 ratelimit root-server runtime-checks ssl systemd libressl"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index a221518bf102..74ea1b1ddfa4 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -2,3 +2,4 @@ DIST NetworkManager-1.22.10.tar.bz2 6292347 BLAKE2B b6cb06a0630685714cdd3c8b8e1d
 DIST NetworkManager-1.26.0.tar.xz 4956796 BLAKE2B 752b6b47387bac5787d06be7f31cc7387798d0c917977c8e72d6d21538a86c167003901d628e596109aec28816f56fd8cd6bf2b46a8d4918a7e6cf1946586550 SHA512 46035fda8f154497ba4a634e4bf7f0a11f579d0d3f4ffdcea7d47ea0bde6dd0183885491f5453255af7b163ae3db4f0c62c3161913a8c30c35b6475887235b6d
 DIST NetworkManager-1.26.2.tar.xz 4972240 BLAKE2B f9f0879ad01d7aee8edc28b33a08d903637b0a9c0738d64480394d0298a02e4fa4277f6a14a7fec62eeb7e1ca50646f47d08f735827b5dbe698070669fd558c4 SHA512 4029bf5224523d851a36766376813c7edc85c2fef3600ceaffc0c7e6faadcfebf843a406ee071bdc59c21bceb7bf3de8c87fca6bb2f2116d9eddbb70e11bf517
 DIST NetworkManager-1.26.4.tar.xz 5051424 BLAKE2B 53a8fd9f9a061b9ac6b117f431e72b1967cfd2fffb539e0dc9335c37a3a59dc33562e81f7887019c3460f403a95b96e8105b1ae41b00c8488ae12a370a3d82ff SHA512 91e865c83a6ae694c9f6aa50e7f938dfa55bfddac32a6dfb73e6edb34b2539068ff9f83bf662bb2d689bd3c66cf53d7fa015930940cf7bda2d4a16561cf02328
+DIST NetworkManager-1.26.6.tar.xz 4975020 BLAKE2B 0c66b307a98e71e31d253a7ad5a3d3ee625c1c66e75a1775b49182e63c7a03fb4175ccc2c5cbe92216d7aac6369158f9601fa27a2045892116684e22e74b5ccd SHA512 f43869473bf625be270e3781a77310a877a8e945df08a6f9e668bb66fe173615e990fd9b3011c1c7b3aa23a9007db99c2f06c67f1185f7547771a816b06caf64
diff --git a/net-misc/networkmanager/networkmanager-1.26.6.ebuild b/net-misc/networkmanager/networkmanager-1.26.6.ebuild
new file mode 100644
index 000000000000..472c62f11ef1
--- /dev/null
+++ b/net-misc/networkmanager/networkmanager-1.26.6.ebuild
@@ -0,0 +1,348 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME_ORG_MODULE="NetworkManager"
+GNOME2_LA_PUNT="yes"
+VALA_USE_DEPEND="vapigen"
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd readme.gentoo-r1 vala virtualx udev multilib-minimal
+
+DESCRIPTION="A set of co-operative tools that make networking simple and straightforward"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+IUSE="audit bluetooth connection-sharing dhclient dhcpcd elogind gnutls +introspection iwd json kernel_linux +nss +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="
+	bluetooth? ( modemmanager )
+	iwd? ( wifi )
+	vala? ( introspection )
+	wext? ( wifi )
+	|| ( nss gnutls )
+	?? ( elogind systemd )
+"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# gobject-introspection-0.10.3 is needed due to gnome bug 642300
+# wpa_supplicant-0.7.3-r3 is needed due to bug 359271
+COMMON_DEPEND="
+	>=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}]
+	policykit? ( >=sys-auth/polkit-0.106 )
+	net-libs/libndp[${MULTILIB_USEDEP}]
+	>=net-misc/curl-7.24
+	net-misc/iputils
+	sys-apps/util-linux[${MULTILIB_USEDEP}]
+	sys-libs/readline:0=
+	>=virtual/libudev-175:=[${MULTILIB_USEDEP}]
+	audit? ( sys-process/audit )
+	bluetooth? ( >=net-wireless/bluez-5 )
+	connection-sharing? (
+		net-dns/dnsmasq[dbus,dhcp]
+		net-firewall/iptables )
+	dhclient? ( >=net-misc/dhcp-4[client] )
+	dhcpcd? ( net-misc/dhcpcd )
+	elogind? ( >=sys-auth/elogind-219 )
+	introspection? ( >=dev-libs/gobject-introspection-0.10.3:= )
+	json? ( >=dev-libs/jansson-2.5[${MULTILIB_USEDEP}] )
+	modemmanager? ( >=net-misc/modemmanager-0.7.991:0=
+		net-misc/mobile-broadband-provider-info )
+	ncurses? ( >=dev-libs/newt-0.52.15 )
+	nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] )
+	!nss? ( gnutls? (
+		dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}]
+		>=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}] ) )
+	ofono? ( net-misc/ofono )
+	ovs? ( dev-libs/jansson )
+	ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] )
+	resolvconf? ( net-dns/openresolv )
+	selinux? ( sys-libs/libselinux )
+	systemd? ( >=sys-apps/systemd-209:0= )
+	teamd? (
+		dev-libs/jansson
+		>=net-misc/libteam-1.9
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	acct-group/plugdev
+	|| (
+		net-misc/iputils[arping(+)]
+		net-analyzer/arping
+	)
+	wifi? (
+		!iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
+		iwd? ( net-wireless/iwd )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+	>=sys-kernel/linux-headers-3.18
+	virtual/pkgconfig
+	introspection? (
+		$(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
+		dev-lang/perl
+		dev-libs/libxslt
+	)
+	vala? ( $(vala_depend) )
+	test? (
+		$(python_gen_any_dep '
+			dev-python/dbus-python[${PYTHON_USEDEP}]
+			dev-python/pygobject:3[${PYTHON_USEDEP}]')
+	)
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.26.4-iwd-fixes-pr640.patch )
+
+python_check_deps() {
+	if use introspection; then
+		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
+	fi
+	if use test; then
+		has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
+		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
+	fi
+}
+
+sysfs_deprecated_check() {
+	ebegin "Checking for SYSFS_DEPRECATED support"
+
+	if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
+		eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel"
+		eerror "or NetworkManager will not work correctly."
+		eerror "See https://bugs.gentoo.org/333639 for more info."
+		die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
+	fi
+	eend $?
+}
+
+pkg_pretend() {
+	if use kernel_linux; then
+		get_version
+		if linux_config_exists; then
+			sysfs_deprecated_check
+		else
+			ewarn "Was unable to determine your kernel .config"
+			ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly."
+			ewarn "See https://bugs.gentoo.org/333639 for more info."
+		fi
+
+	fi
+}
+
+pkg_setup() {
+	if use connection-sharing; then
+		if kernel_is lt 5 1; then
+			CONFIG_CHECK="~NF_NAT_IPV4 ~NF_NAT_MASQUERADE_IPV4"
+		else
+			CONFIG_CHECK="~NF_NAT ~NF_NAT_MASQUERADE"
+		fi
+		linux-info_pkg_setup
+	fi
+	if use introspection || use test; then
+		python-any-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	DOC_CONTENTS="To modify system network connections without needing to enter the
+		root password, add your user account to the 'plugdev' group."
+
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+
+	sed -i \
+		-e 's#/usr/bin/sed#/bin/sed#' \
+		data/84-nm-drivers.rules \
+		|| die
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--disable-more-warnings
+		--disable-static
+		--localstatedir=/var
+		--with-runstatedir=/run
+		--disable-lto
+		--disable-qt
+		--without-netconfig
+		--with-dbus-sys-dir=/etc/dbus-1/system.d
+		$(multilib_native_with nmcli)
+		--with-udev-dir="$(get_udevdir)"
+		--with-config-plugins-default=keyfile
+		--with-iptables=/sbin/iptables
+		--with-ebpf=yes
+		$(multilib_native_enable concheck)
+		--with-nm-cloud-setup=$(multilib_is_native_abi && echo yes || echo no)
+		--with-crypto=$(usex nss nss gnutls)
+		# elogind lacks multilib for now, and consolekit doesn't require linking against, so we use it as a fake option
+		# This SHOULD be removable once elogind has that. We abuse the fact that 'consolekit' does nothing at buildtime.
+		# (There is no off switch, and we do not support upower.)
+		# bug #747358
+		--with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit))
+		--with-suspend-resume=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit))
+		$(multilib_native_use_with audit libaudit)
+		$(multilib_native_use_enable bluetooth bluez5-dun)
+		--without-dhcpcanon
+		$(use_with dhclient)
+		$(use_with dhcpcd)
+		--with-config-dhcp-default=internal
+		$(multilib_native_use_enable introspection)
+		$(use_enable json json-validation)
+		$(multilib_native_use_enable ppp)
+		--without-libpsl
+		$(multilib_native_use_with modemmanager modem-manager-1)
+		$(multilib_native_use_with ncurses nmtui)
+		$(multilib_native_use_with ofono)
+		$(multilib_native_use_enable ovs)
+		$(multilib_native_use_enable policykit polkit)
+		$(multilib_native_use_with resolvconf)
+		$(multilib_native_use_with selinux)
+		$(multilib_native_use_with systemd systemd-journal)
+		$(multilib_native_use_enable teamd teamdctl)
+		$(multilib_native_use_enable test tests)
+		$(multilib_native_use_enable vala)
+		--without-valgrind
+		$(multilib_native_use_with wifi iwd)
+		$(multilib_native_use_with wext)
+		$(multilib_native_use_enable wifi)
+	)
+
+	# Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
+	if use ppp; then
+		local PPPD_VER=`best_version net-dialup/ppp`
+		PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
+		PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
+		myconf+=( --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER} )
+	fi
+
+	# unit files directory needs to be passed only when systemd is enabled,
+	# otherwise systemd support is not disabled completely, bug #524534
+	use systemd && myconf+=( --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" )
+
+	if multilib_is_native_abi; then
+		# work-around man out-of-source brokenness, must be done before configure
+		ln -s "${S}/docs" docs || die
+		ln -s "${S}/man" man || die
+	fi
+
+	ECONF_SOURCE=${S} gnome2_src_configure "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		emake
+	else
+		local targets=(
+			libnm/libnm.la
+		)
+		emake "${targets[@]}"
+	fi
+}
+
+multilib_src_test() {
+	if use test && multilib_is_native_abi; then
+		python_setup
+		virtx emake check
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		# Install completions at proper place, bug #465100
+		gnome2_src_install completiondir="$(get_bashcompdir)"
+		insinto /usr/lib/NetworkManager/conf.d #702476
+		doins "${S}"/examples/nm-conf.d/31-mac-addr-change.conf
+	else
+		local targets=(
+			install-libLTLIBRARIES
+			install-libnmincludeHEADERS
+			install-nodist_libnmincludeHEADERS
+			install-pkgconfigDATA
+		)
+		emake DESTDIR="${D}" "${targets[@]}"
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	! use systemd && readme.gentoo_create_doc
+
+	newinitd "${FILESDIR}/init.d.NetworkManager-r2" NetworkManager
+	newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
+
+	# Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
+	keepdir /etc/NetworkManager/dispatcher.d
+
+	# Provide openrc net dependency only when nm is connected
+	exeinto /etc/NetworkManager/dispatcher.d
+	newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status
+	sed -e "s:@EPREFIX@:${EPREFIX}:g" \
+		-i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
+
+	keepdir /etc/NetworkManager/system-connections
+	chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594
+
+	# Allow users in plugdev group to modify system connections
+	insinto /usr/share/polkit-1/rules.d/
+	doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
+
+	if use iwd; then
+		# This goes to $nmlibdir/conf.d/ and $nmlibdir is '${prefix}'/lib/$PACKAGE, thus always lib, not get_libdir
+		cat <<-EOF > "${ED%/}"/usr/lib/NetworkManager/conf.d/iwd.conf
+		[device]
+		wifi.backend=iwd
+		EOF
+	fi
+
+	# Empty
+	rmdir "${ED%/}"/var{/lib{/NetworkManager,},} || die
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	systemd_reenable NetworkManager.service
+	! use systemd && readme.gentoo_print_elog
+
+	if [[ -e "${EROOT}etc/NetworkManager/nm-system-settings.conf" ]]; then
+		ewarn "The ${PN} system configuration file has moved to a new location."
+		ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
+		ewarn "to ${EROOT}etc/NetworkManager/NetworkManager.conf"
+		ewarn
+		ewarn "After doing so, you can remove ${EROOT}etc/NetworkManager/nm-system-settings.conf"
+	fi
+
+	# NM fallbacks to plugin specified at compile time (upstream bug #738611)
+	# but still show a warning to remember people to have cleaner config file
+	if [[ -e "${EROOT}etc/NetworkManager/NetworkManager.conf" ]]; then
+		if grep plugins "${EROOT}etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then
+			ewarn
+			ewarn "You seem to use 'ifnet' plugin in ${EROOT}etc/NetworkManager/NetworkManager.conf"
+			ewarn "Since it won't be used, you will need to stop setting ifnet plugin there."
+			ewarn
+		fi
+	fi
+
+	# NM shows lots of errors making nmcli almost unusable, bug #528748 upstream bug #690457
+	if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then
+		ewarn "You have psk-flags=1 setting in above files, you will need to"
+		ewarn "either reconfigure affected networks or, at least, set the flag"
+		ewarn "value to '0'."
+	fi
+
+	if use dhclient || use dhcpcd; then
+		ewarn "You have enabled USE=dhclient and/or USE=dhcpcd, but NetworkManager since"
+		ewarn "version 1.20 defaults to the internal DHCP client. If the internal client"
+		ewarn "works for you, and you're happy with, the alternative USE flags can be"
+		ewarn "disabled. If you want to use dhclient or dhcpcd, then you need to tweak"
+		ewarn "the main.dhcp configuration option to use one of them instead of internal."
+	fi
+}
diff --git a/profiles/package.mask/00-gentoo b/profiles/package.mask/00-gentoo
index fa0e2ba2882c..3d5a5fd3b13d 100644
--- a/profiles/package.mask/00-gentoo
+++ b/profiles/package.mask/00-gentoo
@@ -32,6 +32,11 @@
 
 #--- END OF EXAMPLES ---
 
+# Thomas Deutschmann <whissi@gentoo.org> (2020-12-08)
+# Fails to validate certificates which have multiple trusted
+# paths.
+=net-libs/gnutls-3.7.0
+
 # Lars Wendler <polynomial-c@gentoo.org> (2020-12-07)
 # Masked for testing
 >=app-shells/bash-5.1
diff --git a/sec-policy/apparmor-profiles/Manifest b/sec-policy/apparmor-profiles/Manifest
index 89bb054ab20e..db15b30feded 100644
--- a/sec-policy/apparmor-profiles/Manifest
+++ b/sec-policy/apparmor-profiles/Manifest
@@ -1,2 +1,3 @@
 DIST apparmor-2.13.4.tar.gz 7390179 BLAKE2B 49818a010d5e5757dd43710f2af925fbb62a9f8f9be74556ff31a9a8834bebac010762fc6bef3da8d295e487b65d0e0135f4be25bcb01a834846c5e5d65d92a4 SHA512 d42748bf36ae66849f79653a62d499e9d17a97c4d680fb653eb1c379d0593aaa09f7ddfc6f2fa0d2fb468bce05fb25444976f60a5ec24778fdd7ec20d1c13651
 DIST apparmor-3.0.0.tar.gz 7780686 BLAKE2B a9d9edb4fd2cb32b3db322a3f145aac7cea40fac3401b82947b2c5183598cc326d70859466823e3ac0a2227483c7ed7ba0b2f727e9fb7fbf532468716ef8d18f SHA512 2465a8bc400e24e548b0589b7b022fb8325c53858429b9c54204f989d5589d7bd99c9507bde88a48f9965a55edcbac98efeeb6b93aeefe6a27afa0b7e851aea6
+DIST apparmor-3.0.1.tar.gz 7785713 BLAKE2B c530d159a4139de8e59d9d975af866259b56d555e3abe2d1e2a6bfd2db57d8371d643bb93f1cd6ca96172960c09a74cc05c82d34a2e253c4c1f6ecce747f4129 SHA512 e1073e7b2cde7cc4cefcfddce8fa5069845b5873c260b9fbd4bea2ff801708101d813ff30e23a64da36f3c6394cd9339e01a170e9add69deef2d70ecd9ed9687
diff --git a/sec-policy/apparmor-profiles/apparmor-profiles-3.0.1.ebuild b/sec-policy/apparmor-profiles/apparmor-profiles-3.0.1.ebuild
new file mode 100644
index 000000000000..2231d39bbf24
--- /dev/null
+++ b/sec-policy/apparmor-profiles/apparmor-profiles-3.0.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PV="$(ver_cut 1-2)"
+
+DESCRIPTION="A collection of profiles for the AppArmor application security system"
+HOMEPAGE="https://gitlab.com/apparmor/apparmor/wikis/home"
+SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${PV}/+download/apparmor-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="minimal"
+
+RESTRICT="test"
+
+S=${WORKDIR}/apparmor-${PV}/profiles
+
+src_install() {
+	if use minimal ; then
+		insinto /etc/apparmor.d
+		doins -r apparmor.d/{abi,abstractions,tunables}
+	else
+		default
+	fi
+}
diff --git a/sys-apps/ack/ack-3.4.0.ebuild b/sys-apps/ack/ack-3.4.0.ebuild
index b076054a04a2..ee0ad246b94f 100644
--- a/sys-apps/ack/ack-3.4.0.ebuild
+++ b/sys-apps/ack/ack-3.4.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://beyondgrep.com"
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-apps/apparmor-utils/Manifest b/sys-apps/apparmor-utils/Manifest
index 89bb054ab20e..db15b30feded 100644
--- a/sys-apps/apparmor-utils/Manifest
+++ b/sys-apps/apparmor-utils/Manifest
@@ -1,2 +1,3 @@
 DIST apparmor-2.13.4.tar.gz 7390179 BLAKE2B 49818a010d5e5757dd43710f2af925fbb62a9f8f9be74556ff31a9a8834bebac010762fc6bef3da8d295e487b65d0e0135f4be25bcb01a834846c5e5d65d92a4 SHA512 d42748bf36ae66849f79653a62d499e9d17a97c4d680fb653eb1c379d0593aaa09f7ddfc6f2fa0d2fb468bce05fb25444976f60a5ec24778fdd7ec20d1c13651
 DIST apparmor-3.0.0.tar.gz 7780686 BLAKE2B a9d9edb4fd2cb32b3db322a3f145aac7cea40fac3401b82947b2c5183598cc326d70859466823e3ac0a2227483c7ed7ba0b2f727e9fb7fbf532468716ef8d18f SHA512 2465a8bc400e24e548b0589b7b022fb8325c53858429b9c54204f989d5589d7bd99c9507bde88a48f9965a55edcbac98efeeb6b93aeefe6a27afa0b7e851aea6
+DIST apparmor-3.0.1.tar.gz 7785713 BLAKE2B c530d159a4139de8e59d9d975af866259b56d555e3abe2d1e2a6bfd2db57d8371d643bb93f1cd6ca96172960c09a74cc05c82d34a2e253c4c1f6ecce747f4129 SHA512 e1073e7b2cde7cc4cefcfddce8fa5069845b5873c260b9fbd4bea2ff801708101d813ff30e23a64da36f3c6394cd9339e01a170e9add69deef2d70ecd9ed9687
diff --git a/sys-apps/apparmor-utils/apparmor-utils-3.0.1.ebuild b/sys-apps/apparmor-utils/apparmor-utils-3.0.1.ebuild
new file mode 100644
index 000000000000..521128040a6f
--- /dev/null
+++ b/sys-apps/apparmor-utils/apparmor-utils-3.0.1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+inherit eapi7-ver perl-module python-r1 toolchain-funcs
+
+MY_PV="$(ver_cut 1-2)"
+
+DESCRIPTION="Additional userspace utils to assist with AppArmor profile management"
+HOMEPAGE="https://gitlab.com/apparmor/apparmor/wikis/home"
+SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${PV}/+download/apparmor-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="test"
+
+COMMON_DEPEND="
+	dev-lang/perl
+	~sys-libs/libapparmor-${PV}
+	${PYTHON_DEPS}"
+DEPEND="${COMMON_DEPEND}
+	sys-devel/gettext
+"
+RDEPEND="${COMMON_DEPEND}
+	~sys-libs/libapparmor-${PV}[perl,python,${PYTHON_USEDEP}]
+	~sys-apps/apparmor-${PV}
+	dev-perl/Locale-gettext
+	dev-perl/RPC-XML
+	dev-perl/TermReadKey
+	dev-python/notify2[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	virtual/perl-Data-Dumper
+	virtual/perl-Getopt-Long"
+
+S=${WORKDIR}/apparmor-${PV}
+
+src_prepare() {
+	default
+
+	sed -i binutils/Makefile \
+		-e 's/Bstatic/Bdynamic/g' || die
+
+	sed -i utils/aa-remove-unknown \
+		-e 's#^\(APPARMOR_FUNCTIONS=\).*#\1/usr/libexec/rc.apparmor.functions#' || die
+}
+
+src_compile() {
+	python_setup
+
+	pushd utils > /dev/null || die
+	# launches non-make subprocesses causing "make jobserver unavailable"
+	# error messages to appear in generated code
+	emake -j1
+	popd > /dev/null || die
+
+	pushd binutils > /dev/null || die
+	export EXTRA_CFLAGS="${CFLAGS}"
+	emake CC="$(tc-getCC)" USE_SYSTEM=1
+	popd > /dev/null || die
+}
+
+src_install() {
+	pushd utils > /dev/null || die
+	perl_set_version
+	emake DESTDIR="${D}" PERLDIR="${D}/${VENDOR_LIB}/Immunix" \
+		VIM_INSTALL_PATH="${D}/usr/share/vim/vimfiles/syntax" install
+
+	install_python() {
+		local -x PYTHONDONTWRITEBYTECODE=
+		"${PYTHON}" "${S}"/utils/python-tools-setup.py install --prefix=/usr \
+			--root="${D}" --optimize 2
+	}
+
+	python_foreach_impl install_python
+	python_replicate_script "${D}"/usr/bin/aa-easyprof \
+		"${D}"/usr/sbin/aa-{audit,autodep,cleanprof,complain,disable,enforce,genprof,logprof,mergeprof,unconfined}
+	popd > /dev/null || die
+
+	pushd binutils > /dev/null || die
+	emake install DESTDIR="${D}" USE_SYSTEM=1
+	popd > /dev/null || die
+}
diff --git a/sys-apps/apparmor/Manifest b/sys-apps/apparmor/Manifest
index 89bb054ab20e..db15b30feded 100644
--- a/sys-apps/apparmor/Manifest
+++ b/sys-apps/apparmor/Manifest
@@ -1,2 +1,3 @@
 DIST apparmor-2.13.4.tar.gz 7390179 BLAKE2B 49818a010d5e5757dd43710f2af925fbb62a9f8f9be74556ff31a9a8834bebac010762fc6bef3da8d295e487b65d0e0135f4be25bcb01a834846c5e5d65d92a4 SHA512 d42748bf36ae66849f79653a62d499e9d17a97c4d680fb653eb1c379d0593aaa09f7ddfc6f2fa0d2fb468bce05fb25444976f60a5ec24778fdd7ec20d1c13651
 DIST apparmor-3.0.0.tar.gz 7780686 BLAKE2B a9d9edb4fd2cb32b3db322a3f145aac7cea40fac3401b82947b2c5183598cc326d70859466823e3ac0a2227483c7ed7ba0b2f727e9fb7fbf532468716ef8d18f SHA512 2465a8bc400e24e548b0589b7b022fb8325c53858429b9c54204f989d5589d7bd99c9507bde88a48f9965a55edcbac98efeeb6b93aeefe6a27afa0b7e851aea6
+DIST apparmor-3.0.1.tar.gz 7785713 BLAKE2B c530d159a4139de8e59d9d975af866259b56d555e3abe2d1e2a6bfd2db57d8371d643bb93f1cd6ca96172960c09a74cc05c82d34a2e253c4c1f6ecce747f4129 SHA512 e1073e7b2cde7cc4cefcfddce8fa5069845b5873c260b9fbd4bea2ff801708101d813ff30e23a64da36f3c6394cd9339e01a170e9add69deef2d70ecd9ed9687
diff --git a/sys-apps/apparmor/apparmor-3.0.1.ebuild b/sys-apps/apparmor/apparmor-3.0.1.ebuild
new file mode 100644
index 000000000000..c857b1c46fa1
--- /dev/null
+++ b/sys-apps/apparmor/apparmor-3.0.1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd toolchain-funcs
+
+MY_PV="$(ver_cut 1-2)"
+
+DESCRIPTION="Userspace utils and init scripts for the AppArmor application security system"
+HOMEPAGE="https://gitlab.com/apparmor/apparmor/wikis/home"
+SRC_URI="https://launchpad.net/${PN}/${MY_PV}/${PV}/+download/${PN}-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc"
+
+RESTRICT="test" # bug 675854
+
+RDEPEND="~sys-libs/libapparmor-${PV}"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	sys-devel/bison
+	sys-devel/gettext
+	sys-devel/flex
+	doc? ( dev-tex/latex2html )
+"
+
+S=${WORKDIR}/apparmor-${PV}/parser
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.0.0-makefile.patch"
+	"${FILESDIR}/${PN}-2.11.1-dynamic-link.patch"
+)
+
+src_prepare() {
+	default
+
+	# remove warning about missing file that controls features
+	# we don't currently support
+	sed -e "/installation problem/ctrue" -i rc.apparmor.functions || die
+
+	# bug 634782
+	sed -e "s/cpp/$(tc-getCPP) -/" \
+		-i ../common/list_capabilities.sh \
+		-i ../common/list_af_names.sh || die
+}
+
+src_compile() {
+	emake \
+		AR="$(tc-getAR)" \
+		CC="$(tc-getCC)" \
+		CPP="$(tc-getCPP) -" \
+		CXX="$(tc-getCXX)" \
+		USE_SYSTEM=1 \
+		arch manpages
+	use doc && emake pdf
+}
+
+src_test() {
+	emake CXX="$(tc-getCXX)" USE_SYSTEM=1 check
+}
+
+src_install() {
+	emake \
+		CPP="$(tc-getCPP) -" \
+		DESTDIR="${D}" \
+		DISTRO="unknown" \
+		USE_SYSTEM=1 \
+		install
+
+	dodir /etc/apparmor.d/disable
+
+	newinitd "${FILESDIR}/${PN}-init-1" ${PN}
+	systemd_newunit "${FILESDIR}/apparmor.service" apparmor.service
+
+	use doc && dodoc techdoc.pdf
+
+	exeinto /usr/share/apparmor
+	doexe "${FILESDIR}/apparmor_load.sh"
+	doexe "${FILESDIR}/apparmor_unload.sh"
+}
diff --git a/sys-block/whdd/Manifest b/sys-block/whdd/Manifest
index b42987e174f4..14d190257d52 100644
--- a/sys-block/whdd/Manifest
+++ b/sys-block/whdd/Manifest
@@ -1,2 +1,3 @@
 DIST whdd-2.2.tar.gz 33317 BLAKE2B 0f0f6a36c37ec8b0df538fe6c353fc14bfd1f2cecbe2b6c0c94727d4a417c1cba3e96ecd323d52a60a67b8f169ecde2e50196db090657f496cd7d46d37fb7079 SHA512 ab30c1e418cb7ba9881b1a91b99d0b1d5389172c4d5802be69d98cb9c16f1282ff7808e2b40bb937987a9d3ad9fa7f20e630d19307eb0aa1090cff531a904d4a
+DIST whdd-3.0.1.tar.gz 45671 BLAKE2B f16bcfc09356f43b5ae303e007cc3f0930316c67aa3c8622ffc7a3f6ee0f1c5339d7ff32e9b4707a42388fc955f70bf7d3ccc4bd36082d5592a5852d646832c7 SHA512 2cc207d5f0e5da1018ce4ec46f369cdd5c3ed2e55c063f583f8ca68f37949265d4ed8b6ea3ff9133a44cf254a95c3e819ba90f9d822aa3bc2f994cb16d0dc877
 DIST whdd-3.0.tar.gz 45865 BLAKE2B 788ae197c5607f9044f68523336786eacf40eca382d531c590d3b45ec3710c5ea66740f8f5a9750a9746d78a0c6b7e9c77153345ef39cff962a6b2652f3f5d80 SHA512 f53888383dc0ed4158c13a064a2cd45e8e312b389bb79c1bfc9ce86c8a61a195fe5003821c868715316eeaba7ee5bcb387324fb6577af7f875679789cd5af5d7
diff --git a/sys-block/whdd/whdd-3.0.1.ebuild b/sys-block/whdd/whdd-3.0.1.ebuild
new file mode 100644
index 000000000000..e3e2b0a37fc6
--- /dev/null
+++ b/sys-block/whdd/whdd-3.0.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Diagnostic and recovery tool for block devices"
+HOMEPAGE="https://whdd.github.io"
+
+inherit toolchain-funcs
+
+if [[ ${PV} == 9999 ]]
+then
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/${PN}/${PN}/tarball/${PV} -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	inherit vcs-snapshot
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	dev-util/dialog:=
+	sys-libs/ncurses:0=[unicode]"
+RDEPEND="${DEPEND}
+	sys-apps/smartmontools"
+
+src_compile() {
+	tc-export CC
+	default
+}
diff --git a/sys-cluster/cinder/Manifest b/sys-cluster/cinder/Manifest
index fb24d90ec0a2..4ef1b661c341 100644
--- a/sys-cluster/cinder/Manifest
+++ b/sys-cluster/cinder/Manifest
@@ -1,6 +1,6 @@
 DIST cinder-16.2.0.tar.gz 5484918 BLAKE2B f2259dd21c060280e856c053bece8fd635f289d8100710b177105227a5ce3a4c4e380b49261671294cf85975c9f665646cefe5f9d66d873e1938a7d141156f4e SHA512 586057d49f9c94daaf163dacf979e62d18be7489b43eeedfa7caa4d23a4a6060f455eea7162020319187466f308d0480a3efb047d0b34ce013f1b5c632e30755
-DIST cinder-17.0.0.tar.gz 5759659 BLAKE2B f8a2e6647e38185b962311087f06364108db4a80def2eef909e837d37adfe539f0794cc9d9b95aee88da9aeeb5a6a0fe019fc37bafb8e4ceed8dbdfaa2a7c27b SHA512 cd7b74e5da1e696bd72e8e37f2bbff7c7fe4012aa5eaae4ccc51ddfc743ac68cc9fae885063c75d199a48978e4f479cc55813f489787a84914d98521a42d7fd4
+DIST cinder-17.0.1.tar.gz 5815391 BLAKE2B cae43e4668560b9a329e65738533a6c015b42210c45f10d82ab758509f676778503152ba75f0ac862b040b9a489b92cf59f8da83e36e9610696e14c9e0d573c8 SHA512 44cadb33ea22953c05105e336555798b2332b0c77f1e9baedeaef58fe300caa70174a5fa4ad94a515f1bd0c685b15ca639053001d4a5b12ad9cceb385f2a63ba
 DIST cinder.conf.sample-16.2.0 183294 BLAKE2B 5d0f28b9ad200d912c42c34ca030a5ec3660c57db332677e1b66b314a2865187862c83baf78d122fc0af7f73fbf4f0c7f04b9253882d228dcb863bfc88e37e72 SHA512 faf712a3da37af05e642b3c14f98ce8d4e3db5b736b208d7ca8a18be02ac5626c94b4ed314bd0030d5fa3771b325ba0f24ec3a45188d27fd9de79c97b56e2626
-DIST cinder.conf.sample-17.0.0 186451 BLAKE2B efc75cf3c5e852d411d9c2ed2080eb554a5f81c9b39a2ee9cf44add21842c05ea5b03cc66747da2182d2efc73d83b55323cecd4aa34db99369bf62b5ed1795bc SHA512 ee60a62ec8490a38c995f9c4a9ede8eeec631745bdbc9bc6e1d195370687de5d99aa8754ea017f23e6a9542b987842c7ffd7cf203bfed37f2a7ddbe61a82d517
+DIST cinder.conf.sample-17.0.1 186451 BLAKE2B efc75cf3c5e852d411d9c2ed2080eb554a5f81c9b39a2ee9cf44add21842c05ea5b03cc66747da2182d2efc73d83b55323cecd4aa34db99369bf62b5ed1795bc SHA512 ee60a62ec8490a38c995f9c4a9ede8eeec631745bdbc9bc6e1d195370687de5d99aa8754ea017f23e6a9542b987842c7ffd7cf203bfed37f2a7ddbe61a82d517
 DIST cinder.conf.sample-2020.1.9999 183294 BLAKE2B 5d0f28b9ad200d912c42c34ca030a5ec3660c57db332677e1b66b314a2865187862c83baf78d122fc0af7f73fbf4f0c7f04b9253882d228dcb863bfc88e37e72 SHA512 faf712a3da37af05e642b3c14f98ce8d4e3db5b736b208d7ca8a18be02ac5626c94b4ed314bd0030d5fa3771b325ba0f24ec3a45188d27fd9de79c97b56e2626
 DIST cinder.conf.sample-2020.2.9999 186451 BLAKE2B efc75cf3c5e852d411d9c2ed2080eb554a5f81c9b39a2ee9cf44add21842c05ea5b03cc66747da2182d2efc73d83b55323cecd4aa34db99369bf62b5ed1795bc SHA512 ee60a62ec8490a38c995f9c4a9ede8eeec631745bdbc9bc6e1d195370687de5d99aa8754ea017f23e6a9542b987842c7ffd7cf203bfed37f2a7ddbe61a82d517
diff --git a/sys-cluster/cinder/cinder-17.0.0.ebuild b/sys-cluster/cinder/cinder-17.0.1.ebuild
index d9ba2739a0fa..d9ba2739a0fa 100644
--- a/sys-cluster/cinder/cinder-17.0.0.ebuild
+++ b/sys-cluster/cinder/cinder-17.0.1.ebuild
diff --git a/sys-libs/libapparmor/Manifest b/sys-libs/libapparmor/Manifest
index 89bb054ab20e..db15b30feded 100644
--- a/sys-libs/libapparmor/Manifest
+++ b/sys-libs/libapparmor/Manifest
@@ -1,2 +1,3 @@
 DIST apparmor-2.13.4.tar.gz 7390179 BLAKE2B 49818a010d5e5757dd43710f2af925fbb62a9f8f9be74556ff31a9a8834bebac010762fc6bef3da8d295e487b65d0e0135f4be25bcb01a834846c5e5d65d92a4 SHA512 d42748bf36ae66849f79653a62d499e9d17a97c4d680fb653eb1c379d0593aaa09f7ddfc6f2fa0d2fb468bce05fb25444976f60a5ec24778fdd7ec20d1c13651
 DIST apparmor-3.0.0.tar.gz 7780686 BLAKE2B a9d9edb4fd2cb32b3db322a3f145aac7cea40fac3401b82947b2c5183598cc326d70859466823e3ac0a2227483c7ed7ba0b2f727e9fb7fbf532468716ef8d18f SHA512 2465a8bc400e24e548b0589b7b022fb8325c53858429b9c54204f989d5589d7bd99c9507bde88a48f9965a55edcbac98efeeb6b93aeefe6a27afa0b7e851aea6
+DIST apparmor-3.0.1.tar.gz 7785713 BLAKE2B c530d159a4139de8e59d9d975af866259b56d555e3abe2d1e2a6bfd2db57d8371d643bb93f1cd6ca96172960c09a74cc05c82d34a2e253c4c1f6ecce747f4129 SHA512 e1073e7b2cde7cc4cefcfddce8fa5069845b5873c260b9fbd4bea2ff801708101d813ff30e23a64da36f3c6394cd9339e01a170e9add69deef2d70ecd9ed9687
diff --git a/sys-libs/libapparmor/libapparmor-3.0.1.ebuild b/sys-libs/libapparmor/libapparmor-3.0.1.ebuild
new file mode 100644
index 000000000000..961f4d15a022
--- /dev/null
+++ b/sys-libs/libapparmor/libapparmor-3.0.1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_OPTIONAL=1
+DISTUTILS_USE_SETUPTOOLS="no"
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+GENTOO_DEPEND_ON_PERL="no"
+
+inherit autotools distutils-r1 perl-functions
+
+MY_PV="$(ver_cut 1-2)"
+
+DESCRIPTION="Library to support AppArmor userspace utilities"
+HOMEPAGE="https://gitlab.com/apparmor/apparmor/wikis/home"
+SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${PV}/+download/apparmor-${PV}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="doc +perl +python static-libs"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="perl? ( dev-lang/perl:= )
+	python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}
+	sys-devel/autoconf-archive
+	sys-devel/bison
+	sys-devel/flex
+	doc? ( dev-lang/perl )
+	perl? ( dev-lang/swig )
+	python? ( dev-lang/swig	)"
+
+S=${WORKDIR}/apparmor-${PV}/libraries/${PN}
+
+# depends on the package already being installed
+RESTRICT="test"
+
+src_prepare() {
+	rm -r m4 || die "failed to remove bundled macros"
+	default
+	eautoreconf
+	use python && distutils-r1_src_prepare
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		$(use_with perl) \
+		$(use_with python)
+}
+
+src_compile() {
+	emake -C src
+	emake -C include
+	use doc && emake -C doc
+	use perl && emake -C swig/perl
+
+	if use python ; then
+		pushd swig/python > /dev/null
+		emake libapparmor_wrap.c
+		distutils-r1_src_compile
+		popd > /dev/null
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" -C src install
+	emake DESTDIR="${D}" -C include install
+	use doc && emake DESTDIR="${D}" -C doc install
+
+	if use perl ; then
+		emake DESTDIR="${D}" -C swig/perl install
+		perl_set_version
+		insinto "${VENDOR_ARCH}"
+		doins swig/perl/LibAppArmor.pm
+
+		# bug 620886
+		perl_delete_localpod
+		perl_fix_packlist
+	fi
+
+	if use python ; then
+		pushd swig/python > /dev/null
+		distutils-r1_src_install
+
+		python_moduleinto LibAppArmor
+		python_foreach_impl python_domodule LibAppArmor.py
+		popd > /dev/null
+	fi
+
+	dodoc AUTHORS ChangeLog NEWS README
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/virtual/httpd-php/httpd-php-8.0.ebuild b/virtual/httpd-php/httpd-php-8.0.ebuild
new file mode 100644
index 000000000000..75a1a6f67174
--- /dev/null
+++ b/virtual/httpd-php/httpd-php-8.0.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+DESCRIPTION="Virtual to provide PHP-enabled webservers"
+SLOT="${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+RDEPEND="|| ( dev-lang/php:${SLOT}[fpm]
+			  dev-lang/php:${SLOT}[apache2]
+			  dev-lang/php:${SLOT}[cgi] )"
diff --git a/www-apps/mediawiki/mediawiki-1.35.0.ebuild b/www-apps/mediawiki/mediawiki-1.35.0.ebuild
index d9e69a4d4cd8..991f13c009f3 100644
--- a/www-apps/mediawiki/mediawiki-1.35.0.ebuild
+++ b/www-apps/mediawiki/mediawiki-1.35.0.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="~alpha amd64 ~arm ~arm64 ppc x86"
 IUSE="imagemagick mysql postgres +sqlite"
 REQUIRED_USE="|| ( mysql postgres sqlite )"
 
-RDEPEND=">=dev-lang/php-7.3.19[ctype,fileinfo,iconv,json,postgres?,session,ssl,unicode,xml,xmlreader]
+RDEPEND=">=dev-lang/php-7.3.19[ctype,fileinfo,iconv,json(+),postgres?,session,ssl,unicode,xml,xmlreader]
 	imagemagick? ( virtual/imagemagick-tools )
 	!imagemagick? ( dev-lang/php[gd] )
 	mysql? ( dev-lang/php[mysql,mysqli] )
diff --git a/www-client/microsoft-edge-dev/Manifest b/www-client/microsoft-edge-dev/Manifest
index 81c8fe30e9c3..94a269445e5b 100644
--- a/www-client/microsoft-edge-dev/Manifest
+++ b/www-client/microsoft-edge-dev/Manifest
@@ -1 +1 @@
-DIST microsoft-edge-dev_88.0.705.9-1_amd64.deb 88167812 BLAKE2B cc3620ece429268e8dafdd5f2a73e2f23a6d51f0a381331cc9623805891a1211c4734dc6b5498d587a9aca52a22e56475ea36d1e4114b63d08938f667828bf20 SHA512 2afe62f5e21750919ec7931b4fb7b0e9e267a01e8388e8ad35b8449713e294a5ae743c28ce2f3c941660ebc2df8c7a6c62db8391ec101e020908a54f1df95423
+DIST microsoft-edge-dev_88.0.705.15-1_amd64.deb 87945596 BLAKE2B a770aa4edc4f11d350b7ff77dcc7d953115c815caebac5d9858f8ed5e24ec14d4f407ae3ad7f97d32f78849f024c91b75278c21eecdd8197f0c375253fcca653 SHA512 ad388d4b784e71db4f7e30f2f5ee36d3e8abcd7e2c3cac351e68d1a81476017d1c3e784fda2aaf59ec98b537d6ab3ee90aeb8e77597c3204122c6770149b427e
diff --git a/www-client/microsoft-edge-dev/microsoft-edge-dev-88.0.705.9.ebuild b/www-client/microsoft-edge-dev/microsoft-edge-dev-88.0.705.15.ebuild
index 41108ab2bece..41108ab2bece 100644
--- a/www-client/microsoft-edge-dev/microsoft-edge-dev-88.0.705.9.ebuild
+++ b/www-client/microsoft-edge-dev/microsoft-edge-dev-88.0.705.15.ebuild
diff --git a/www-client/vivaldi-snapshot/Manifest b/www-client/vivaldi-snapshot/Manifest
index 1aedca26c9cc..1f9cba32333c 100644
--- a/www-client/vivaldi-snapshot/Manifest
+++ b/www-client/vivaldi-snapshot/Manifest
@@ -1,8 +1,8 @@
-DIST vivaldi-snapshot_3.5.2115.63-1_amd64.deb 76791600 BLAKE2B bdd9fa9847fc12686ba35be4ea2dee457f35821a6d5fbc54c9a16db84bf1d4d9add635cb8d8d8ba43111c421902959a4126b03887a0a09bea818d08a6aa9182f SHA512 cb7dc760bccb9c821a21e4345f8cf5799456019062f2e3d2c4dce93c99a415a14d01d7a2fe0e72d3c8cf88222b23425c3ac0a2f8fe8d5e05c9724ff308a65544
-DIST vivaldi-snapshot_3.5.2115.63-1_arm64.deb 69047684 BLAKE2B 024562eb45bf181bc23bcaea90543c0d1731d3a3e2f71ac0901c119e470986ef25e99662725dec77488a9568f8c837d110a9316cb1b3a3ef333ab3bdfd4517d4 SHA512 976a24004d846ea3d665690a435e0805b8fafe0660479c9520f7dea8002c668f8881b1aeccb723d5fad8f952e87ae1c8ef23e22676e152b6c5077cfd1fdbb16e
-DIST vivaldi-snapshot_3.5.2115.63-1_armhf.deb 68124956 BLAKE2B 0e0ac854f0194706fe9eabac14ccfdd0f74aa6c5addbc71ac37a81dd01bcbf95a3888097f76c3d5276eb73c3e046d16be19575e31b1d84b1aa3241444e3dcab1 SHA512 e93af0ce0386973e9b63125b2af786114f97420c86a472807e0915704c76a181b4cdf5c81895739b908b8bb522dca48ccc4dd9b03a4cac16f99fd057c6c650e7
-DIST vivaldi-snapshot_3.5.2115.63-1_i386.deb 73575640 BLAKE2B e2f4f427f38756aa5fd044cb6d83a8fa8062629338a75bf2a9861e8b3f35d1593f0777ad257422be1ebfc9b6840af36b38fce0431289d3497c4eac847f4841fd SHA512 bbdbe7931e2263052ab8d2d03c707e98f7924d4a6d38e498a8b10a65e7776d7877e0fcb335eefbf41cb537241df5276dc346e2d20090c5b91238e376172143d4
 DIST vivaldi-snapshot_3.5.2115.67-1_amd64.deb 76803740 BLAKE2B cc26eb17612c6f1997ad5bfa738baf82bdc179967d2bedabfa11266f68b2752b82a97fe90a56ce65b46f8ada30a405940b40a19dfba32b4159956fe6a16fa7be SHA512 e850c15f684f5ae10f19788c89fe86747b79f89a7b40e86d027c3d3c4af5c4375105eb3485e7a1105fa44323bcfb3634f8664243846b7afa2d690397bfe1d6a4
 DIST vivaldi-snapshot_3.5.2115.67-1_arm64.deb 69026260 BLAKE2B 2d8465c33b56103d1eb57d8b78c5757a9f229dedc4ac37fe851e4db0c17424e8e59ec47873ccfb9b59030f4953080eafa88225e369cc7201b6863c932102a718 SHA512 908f0ebfe33640dd4af6a9148b3bbd31ded386b56e009174e5e59c329411da582a0e3907ce24bd01bd0f45208f17ae955efd75a4bbb29b1027a164c5ab9732be
 DIST vivaldi-snapshot_3.5.2115.67-1_armhf.deb 68126168 BLAKE2B 1e23d2c6a03ee96c65bbb314780083296ea9a2eab7d725fead8d89291ba593b7abd4e6ee8c66c066085e6dc73c74da57e058d250727b08bb2c08ee32e85deae3 SHA512 dc7f50bb6421b0a6c13a8282b97a8ad362c7cf976a34a9de5a46c886eec53c9337563cf078779e51eaa2b27d7f329ab7beb83cbfae54046f174a860d9ebf4561
 DIST vivaldi-snapshot_3.5.2115.67-1_i386.deb 73582040 BLAKE2B 4248f973271239a410d8f0baa2fffc665e710d18c606ac553af1366f075ee4955203dd54310df36243030e26ed7db763180a65b26e2bdaf0c18ee91756641813 SHA512 f5b322131bb3bfe92876660eced53de8aa435505e1ced5d8654a14bc1fbce4edbcf5f3d6a20165baf39b6e846422e31e7e52e7bde5d3937c7741496a8f8201fc
+DIST vivaldi-snapshot_3.5.2115.71-1_amd64.deb 76782912 BLAKE2B 99741b49846193093b6dc2aee1cca3ba56e5be658d9c5f3260b961171267d56fd9071e9ab65a98d6ab564523e4262af72e7ff2f39067974c67ad1c3267aa0802 SHA512 34752c5cdd20a6a2b03fd70a7284d98e434004341637006eb44bda74f44fc256686dd4e8259453eab650421278de543867e7c5d254d4a70f5b81ca4a7dfa1cae
+DIST vivaldi-snapshot_3.5.2115.71-1_arm64.deb 69041316 BLAKE2B 810a43a61a04c3ad6d36e2fe4b2a17a4b0b67413d06ab98e1fb903c170f6fad5ae9aa8fee01221e799fac4fc61cf29718a778487b1e7b7f7938f5d42f8402122 SHA512 48d3b68f3ae8da8355047a1ce737b3d41a0f6b9ed9fd93020c5dcf35986fd88aa9aa2979875ee7724bed3ff2d70352de0c2bd51cb64fd672e84d7759455c0b10
+DIST vivaldi-snapshot_3.5.2115.71-1_armhf.deb 68130280 BLAKE2B 24f10b5a4e82671c73b6f6d30c45011c4718e98cf4d161c09e0b557fdc2d6f9b8389f234e8f38e8fded9da1ef67ecf1c49354e1845468d2e58993cf98e2bc894 SHA512 09b8446ec1b967463d51b99b915f1d9f1755b780396cab622d38fb4ded89141b415e63818fe2c4e0bfa76f3a7b247225d2ae75ce7b1675475f65af5c68f4eb6c
+DIST vivaldi-snapshot_3.5.2115.71-1_i386.deb 73583972 BLAKE2B 149905a822c037b692f48aa7b69ee3ab0b200775c7ea9803f462f98bcda230b777bbb1949383299549fc7bacd0e96bd1d6bfa38c2f300109341f184e5f5f178a SHA512 8802cb2853b79cb2deed601c3441c7198d4969904075e18a2856327a23d1384b3166b5ae1b79dfb3d0048c438bc1849cc48dff3136fed82fc35140e69eb94187
diff --git a/www-client/vivaldi-snapshot/vivaldi-snapshot-3.5.2115.63.ebuild b/www-client/vivaldi-snapshot/vivaldi-snapshot-3.5.2115.71.ebuild
index f69da1d681b9..f69da1d681b9 100644
--- a/www-client/vivaldi-snapshot/vivaldi-snapshot-3.5.2115.63.ebuild
+++ b/www-client/vivaldi-snapshot/vivaldi-snapshot-3.5.2115.71.ebuild
diff --git a/www-client/vivaldi/Manifest b/www-client/vivaldi/Manifest
index 8631817e1ad0..b8341cac1097 100644
--- a/www-client/vivaldi/Manifest
+++ b/www-client/vivaldi/Manifest
@@ -2,7 +2,7 @@ DIST vivaldi-3.4.2066.106_p1-amd64.deb 75692172 BLAKE2B 6311f405833e99652d3905c0
 DIST vivaldi-3.4.2066.106_p1-arm64.deb 68074616 BLAKE2B 90677ffe9f7b76a45a686dc1953c4eccb956a438c1c5afccf8e7af2fbdf3a22b5446fb4932c309c57ada545af2844f45a4c4fb3ec9c5731c7fe6ca29ba96aa27 SHA512 a8c44bcb0643f5282de37935161dad0e0cd278ead1ea1bcd4ee7a907ab630c41e5d88bb271c4221e3e8ca87fd5de0df9a902121ed7cd7266dc9f6942eb1d4f95
 DIST vivaldi-3.4.2066.106_p1-armhf.deb 67022536 BLAKE2B 5ee874dc41c484aa2130ca20a1a68b48178f7a55db1c56c010b4319448aada2c0c4e0b2d7ab36dd85d37cf4f789e25ec57679a3b6ea87c086e537025ab56199f SHA512 3fc1f20dcf7c0baa2c7a021b5e9d3480f62a04eb65697712df1481f85ef7afdc019a94e2873964ffba870bda525d5b84dbf3201a7e660428576e00c4770c067e
 DIST vivaldi-3.4.2066.106_p1-i386.deb 72096496 BLAKE2B 6728eaefa74d4ee061d75d510817ccd7196455bd1e1f0347c90f7528358c33c7f81bd6e46edaafd94e0da1880e633dcf0aeee795eaeee3b88497a06f3ba9533b SHA512 cac85271513bbcc4af08c5e53c2652b4ac616ce7a11b5896af1c856879cd354298243314fb3ae535d059145cd412f66177b93d9e28f63a741411e04db4030ad7
-DIST vivaldi-3.4.2066.86_p1-amd64.deb 75651984 BLAKE2B 4b5b9caac33f490066ae69453311b6de14d62a49196d7f4ee945e48ca182c242c0de3c0e7ab6fe461073615360e24201972c8a4816f001c9ae75e91d73e4d804 SHA512 98a7100880c9d267ac16a12249452b8fcf66645226b1f9a9da720032e37b8f33ccb1ece77a987472d64a1a54575f9134f67f9468a8e40388f9959b6e7bdf67b4
-DIST vivaldi-3.4.2066.86_p1-arm64.deb 68056016 BLAKE2B 4e811146ba59096b90026b09f982012e4cb3b29c66e9ecca9737a7809b4821c28ab6c65aef4a00c2a06d95b5191c1cbd931fa99aec004d8715712cffaeffbfaf SHA512 889725b266a320397f9b983216eea18863f7047cf70e0f92b39765ab3789b98a3f0206603353f78ec77874eee9d5e019dd453373e211f7f800535b2e0595d518
-DIST vivaldi-3.4.2066.86_p1-armhf.deb 66985864 BLAKE2B b1ff5408d1fe254f169ae2a93e0b41a0a4e590448206e182996e154591964453ab2e508688a3a844812353f4d78c2e9a2b58ef329e4fa4e34b6895c6f8c79b33 SHA512 6a3ccbebc62cb64bf4f4813686b7376d4dd13f0081e849524f8e995282accda6d5fed22b6e562bdf831f23cb6cfb0d6421cb6c7c0dc9ce80ccc32566a4fcbc9b
-DIST vivaldi-3.4.2066.86_p1-i386.deb 72748188 BLAKE2B ac949d03e3e24dfdac9461e212ea48135d6100a1b367c02cf23e0d9b0d2fe6826fb3a3a8207570ba26deac37f916f12a49d87894668a43218a8ce64a6fe1aa04 SHA512 4604fe7797c28e81fd71403fb32214ef48d06e508070da8f613ea16afd3b8074bc65fb81f7dacdbeb71847cb2704aa5ef1eb399199affc047a22582b629d9142
+DIST vivaldi-stable_3.5.2115.73-1_amd64.deb 76802208 BLAKE2B 1421a38a20fc1c25c5e8cebe5eeddf4a991759c325675538c2fc31c2d0001a9846a31a785f8f3f508a6cabc5e52d4365feb2e0a58d60d4cf160b86fc0333eae3 SHA512 f43ac8ebe8c86e244366160bcd5c2c33d22d0cd44602eaa8a4fa512cfc255ee0cfefd6e865eb12ed0f711c182d0f4313836e865cde416890bc694c2835e21bf7
+DIST vivaldi-stable_3.5.2115.73-1_arm64.deb 69054028 BLAKE2B fc17e2d84900d101d5a716fa79990cd6501e741c2e3c80889e3b4b5c057a2ea0dad29b9b22fc71768a14ad75677666ab6755ca3babd29cd9babbf72b15b3830d SHA512 af84e3d1719cfa0f19ccae17af48c375a03e676e68be92a8ab5babb6bec3d36d6cd1ce4b13daeeffd5f0117e2614d4c1da53f5c2690c7f373003cf805b7ca99d
+DIST vivaldi-stable_3.5.2115.73-1_armhf.deb 68138412 BLAKE2B 22c061ac3112d2e8f81b3b9ad0e6fb3d852245f5ba15ca24a6a914d5fe5e8216e973b22e80cb3c94812eb7b02ed7a3b165390bd7651498c9149bfee07994664b SHA512 e1997250bec3f1591000b88a3e08446a8e2d1ffea057cb5faf101e048a1adad1db5d240ee6e12d959ad8d5172de8710ef969c407363b1693b9da83cd39091799
+DIST vivaldi-stable_3.5.2115.73-1_i386.deb 73581952 BLAKE2B 4cc3bc2109056dfcfab741ebee15337fc01213379c258ade99d460ab2e0f588eb54c34ac2596f8f6bc16761e69f43132ca2a8c1e81785f79238668f44be7de22 SHA512 65a25d67ec6decfbfb57fcfaead79600d6eabe3c7278b25c9c5103648e3dfff80d36838f210076bb85cdccf7ca3f4dbc9ef764cb449e76fd8ba54f05f9ed3ed2
diff --git a/www-client/vivaldi/metadata.xml b/www-client/vivaldi/metadata.xml
index e506d2dbc668..daca39ebaf3d 100644
--- a/www-client/vivaldi/metadata.xml
+++ b/www-client/vivaldi/metadata.xml
@@ -5,5 +5,9 @@
 		<email>chewi@gentoo.org</email>
 		<name>James Le Cuirot</name>
 	</maintainer>
+	<use>
+		<flag name="proprietary-codecs">Use system <pkg>media-video/ffmpeg</pkg> to support patent-encumbered media codecs</flag>
+		<flag name="widevine">Unsupported closed-source DRM capability (required by Netflix VOD)</flag>
+	</use>
 	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/www-client/vivaldi/vivaldi-3.4.2066.86_p1.ebuild b/www-client/vivaldi/vivaldi-3.4.2066.86_p1.ebuild
deleted file mode 100644
index f807af0fd17c..000000000000
--- a/www-client/vivaldi/vivaldi-3.4.2066.86_p1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-CHROMIUM_LANGS="
-	af am ar be bg bn ca cs da de de-CH el en-GB en-US eo es es-419 es-PE et eu
-	fa fi fil fr fy gd gl gu he hi hr hu hy id io is it ja jbo ka kn ko ku lt
-	lv mk ml mr ms nb nl nn pl pt-BR pt-PT ro ru sc sk sl sq sr sv sw ta te th
-	tr uk vi zh-CN zh-TW
-"
-inherit chromium-2 multilib unpacker toolchain-funcs xdg
-
-#VIVALDI_BRANCH="snapshot"
-
-VIVALDI_PN="${PN}-${VIVALDI_BRANCH:-stable}"
-VIVALDI_BIN="${PN}${VIVALDI_BRANCH/snapshot/-snapshot}"
-VIVALDI_HOME="opt/${VIVALDI_BIN}"
-DESCRIPTION="A browser for our friends"
-HOMEPAGE="https://vivaldi.com/"
-VIVALDI_BASE_URI="https://downloads.${PN}.com/${VIVALDI_BRANCH:-stable}/${VIVALDI_PN}_${PV/_p/-}_"
-SRC_URI="
-	amd64? ( ${VIVALDI_BASE_URI}amd64.deb -> ${P}-amd64.deb )
-	arm64? ( ${VIVALDI_BASE_URI}arm64.deb -> ${P}-arm64.deb )
-	arm? ( ${VIVALDI_BASE_URI}armhf.deb -> ${P}-armhf.deb )
-	x86? ( ${VIVALDI_BASE_URI}i386.deb -> ${P}-i386.deb )
-"
-
-LICENSE="Vivaldi"
-SLOT="0"
-KEYWORDS="-* amd64 ~arm ~arm64 x86"
-RESTRICT="bindist mirror"
-
-DEPEND="
-	virtual/libiconv
-"
-RDEPEND="
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/speex
-	net-print/cups
-	sys-apps/dbus
-	sys-libs/libcap
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/pango[X]
-"
-QA_PREBUILT="*"
-S=${WORKDIR}
-
-src_unpack() {
-	unpack_deb ${A}
-}
-
-src_prepare() {
-	iconv -c -t UTF-8 usr/share/applications/${VIVALDI_PN}.desktop > "${T}"/${VIVALDI_PN}.desktop || die
-	mv "${T}"/${VIVALDI_PN}.desktop usr/share/applications/${VIVALDI_PN}.desktop || die
-
-	sed -i \
-		-e "s|${VIVALDI_BIN}|${PN}|g" \
-		usr/share/applications/${VIVALDI_PN}.desktop \
-		usr/share/xfce4/helpers/${VIVALDI_BIN}.desktop || die
-
-	mv usr/share/doc/${VIVALDI_PN} usr/share/doc/${PF} || die
-	chmod 0755 usr/share/doc/${PF} || die
-
-	gunzip usr/share/doc/${PF}/changelog.gz || die
-
-	rm \
-		_gpgbuilder \
-		etc/cron.daily/${VIVALDI_BIN} \
-		|| die
-	rmdir \
-		etc/cron.daily/ \
-		etc/ \
-		|| die
-
-	local c d
-	for d in 16 22 24 32 48 64 128 256; do
-		mkdir -p usr/share/icons/hicolor/${d}x${d}/apps || die
-		cp \
-			${VIVALDI_HOME}/product_logo_${d}.png \
-			usr/share/icons/hicolor/${d}x${d}/apps/${PN}.png || die
-	done
-
-	pushd "${VIVALDI_HOME}/locales" > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	eapply_user
-}
-
-src_install() {
-	rm -r usr/share/appdata || die
-	mv * "${D}" || die
-	dosym /${VIVALDI_HOME}/${PN} /usr/bin/${PN}
-
-	fperms 4711 /${VIVALDI_HOME}/${PN}-sandbox
-}
diff --git a/www-client/vivaldi/vivaldi-3.5.2115.73.ebuild b/www-client/vivaldi/vivaldi-3.5.2115.73.ebuild
new file mode 100644
index 000000000000..f69da1d681b9
--- /dev/null
+++ b/www-client/vivaldi/vivaldi-3.5.2115.73.ebuild
@@ -0,0 +1,194 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CHROMIUM_LANGS="
+	af
+	am
+	ar
+	be
+	bg
+	bn
+	ca
+	cs
+	da
+	de
+	de-CH
+	el
+	en-GB
+	en-US
+	eo
+	es
+	es-419
+	es-PE
+	et
+	eu
+	fa
+	fi
+	fil
+	fr
+	fy
+	gd
+	gl
+	gu
+	he
+	hi
+	hr
+	hu
+	hy
+	id
+	io
+	is
+	it
+	ja
+	jbo
+	ka
+	kn
+	ko
+	ku
+	lt
+	lv
+	mk
+	ml
+	mr
+	ms
+	nb
+	nl
+	nn
+	pl
+	pt-BR
+	pt-PT
+	ro
+	ru
+	sc
+	sk
+	sl
+	sq
+	sr
+	sv
+	sw
+	ta
+	te
+	th
+	tr
+	uk
+	vi
+	zh-CN
+	zh-TW
+"
+
+inherit chromium-2 desktop unpacker xdg
+
+VIVALDI_PN="${PN/%vivaldi/vivaldi-stable}"
+VIVALDI_HOME="opt/${PN}"
+DESCRIPTION="A browser for our friends"
+HOMEPAGE="https://vivaldi.com/"
+
+if [[ ${PV} = *_p* ]]; then
+	DEB_REV="${PV#*_p}"
+else
+	DEB_REV=1
+fi
+
+VIVALDI_BASE_URI="https://downloads.vivaldi.com/${VIVALDI_PN#vivaldi-}/${VIVALDI_PN}_${PV%_p*}-${DEB_REV}_"
+SRC_URI="
+	amd64? ( ${VIVALDI_BASE_URI}amd64.deb )
+	arm64? ( ${VIVALDI_BASE_URI}arm64.deb )
+	arm? ( ${VIVALDI_BASE_URI}armhf.deb )
+	x86? ( ${VIVALDI_BASE_URI}i386.deb )
+"
+
+LICENSE="Vivaldi"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~arm ~arm64 ~x86"
+IUSE="proprietary-codecs widevine"
+RESTRICT="bindist mirror"
+
+RDEPEND="
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/speex
+	net-print/cups
+	sys-apps/dbus
+	sys-libs/libcap
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	x11-libs/libXScrnSaver
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/pango[X]
+	proprietary-codecs? ( media-video/ffmpeg:0/56.58.58[chromium(-)] )
+	widevine? ( www-plugins/chrome-binary-plugins )
+"
+
+QA_PREBUILT="*"
+S="${WORKDIR}"
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+src_prepare() {
+	# Rename docs directory to our needs.
+	mv usr/share/doc/{${VIVALDI_PN},${PF}}/ || die
+
+	# Decompress the docs.
+	gunzip usr/share/doc/${PF}/changelog.gz || die
+
+	# The appdata directory is deprecated.
+	mv usr/share/{appdata,metainfo}/ || die
+
+	# Remove cron job for updating from Debian repos.
+	rm etc/cron.daily/${PN} ${VIVALDI_HOME}/cron/${PN} || die
+	rmdir etc/{cron.daily/,} ${VIVALDI_HOME}/cron/ || die
+
+	# Remove scripts that will most likely break things.
+	rm ${VIVALDI_HOME}/update-{ffmpeg,widevine} || die
+
+	pushd ${VIVALDI_HOME}/locales > /dev/null || die
+	rm ja-KS.pak || die # No flag for Kansai as not in IETF list.
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	eapply_user
+}
+
+src_install() {
+	mv */ "${D}" || die
+	dosym /${VIVALDI_HOME}/${PN} /usr/bin/${PN}
+	fperms 4711 /${VIVALDI_HOME}/vivaldi-sandbox
+
+	local logo size
+	for logo in "${ED}"/${VIVALDI_HOME}/product_logo_*.png; do
+		size=${logo##*_}
+		size=${size%.*}
+		newicon -s "${size}" "${logo}" ${PN}.png
+	done
+
+	if use proprietary-codecs; then
+		dosym ../../../usr/$(get_libdir)/chromium/libffmpeg.so \
+			  /${VIVALDI_HOME}/lib/libffmpeg.so
+	fi
+
+	if use widevine; then
+		dosym ../../usr/$(get_libdir)/chromium-browser/WidevineCdm \
+			  /${VIVALDI_HOME}/WidevineCdm
+	else
+		rm "${ED}"/${VIVALDI_HOME}/WidevineCdm || die
+	fi
+}
diff --git a/www-client/waterfox-classic/Manifest b/www-client/waterfox-classic/Manifest
index 5a06420bf80a..f4c28e5c327e 100644
--- a/www-client/waterfox-classic/Manifest
+++ b/www-client/waterfox-classic/Manifest
@@ -1,3 +1,3 @@
 DIST waterfox-2019.12-patches-01.tar.xz 9872 BLAKE2B 8500f9818b5fc2b99af9586b559a6b4cc25419ac994b8fe797cf77a423e8abc5485e82ec0ade848d0fb0aac1805b983029054433a07e233e98acdd44f5f49030 SHA512 76e77a6f96de69a97f065d63d6fd5b7fa68a35d5ae77b69141181f8990b25456dfc46c6f643fb34b5fc8058bfc9bef16284e90f881c87a4d574e1e5a2cd80e55
-DIST waterfox-classic-2020.09.tar.gz 476808044 BLAKE2B 35a359f2c8237ab284a895f06a721a921807d4862f5415fdd61142e540783e14a6d92c10c5c00acbeac24a638afdcd0b3b14fd808fb9303406c605865afc4c92 SHA512 fbf3d36dcd8b90e509612d08276d55aa0e09d2e0158c90a538d91499b8d6840782b6194eedaa6eb949d2f47c1b7e247831370c6d9971de813920d7bf7f1c6fc1
 DIST waterfox-classic-2020.10.tar.gz 476818156 BLAKE2B 7f191fe78a14abff1908b9de89980131e83d08e758d4c64bb236944ed5ff950dc6ca11bf6877a3f0989438a0192cff90094bc0b879f3e4f10a15799abbcff1e1 SHA512 d057ddc73056dcc1d27a441366cc6e4113fdb4934bf524eb67e36e8463b65d40090181a299cc914b357b032fcc22ccde62ee45b825734bf89882d69010a60286
+DIST waterfox-classic-2020.12.tar.gz 476849336 BLAKE2B d77b5eaf65cb689e1421269ae89fe9de54aadf7ab01359b4afe92ddcddeabf8134b9ce0380030cd7bd4cdcd0121e10e5ec7a525b9969f74a5d59d1f6acada9ce SHA512 56067226ae9010cd9623f1a2e5553145d3e3b22ef1cb7c7a83cd9285b0ea34d6ff8c63fb630b198dc096fa46be672c9897432c130a24658b155b56a4d379cbc3
diff --git a/www-client/waterfox-classic/waterfox-classic-2020.09.ebuild b/www-client/waterfox-classic/waterfox-classic-2020.12.ebuild
index d9e112c9b245..d9e112c9b245 100644
--- a/www-client/waterfox-classic/waterfox-classic-2020.09.ebuild
+++ b/www-client/waterfox-classic/waterfox-classic-2020.12.ebuild
diff --git a/x11-libs/gdk-pixbuf-xlib/Manifest b/x11-libs/gdk-pixbuf-xlib/Manifest
index 228d7944b43b..528a205b0c9b 100644
--- a/x11-libs/gdk-pixbuf-xlib/Manifest
+++ b/x11-libs/gdk-pixbuf-xlib/Manifest
@@ -1 +1 @@
-DIST gdk-pixbuf-xlib-2.40.2.tar.bz2 52418 BLAKE2B 95c01aef9cafa80171e1ca2d6eb372a3d4e13bdb8d098a1da9259d6cc881494da1954936d20c24d06a38ec5258323e3fc4f6dc4cfc5a9f1ad6e50bc5861e65c6 SHA512 b9831bd1b4db8718b35ed96057496824696e311ce1661394397306ea9d544e6113aaa6865cdd1c1a250bc3617515fd81e3f45d997531507d2592fe294cbde01c
+DIST gdk-pixbuf-xlib-2.40.2.tar.xz 53588 BLAKE2B a515e86bc69f59910f61fe9c275ab89c0732f0aa2cfb614ac94e597de420d25708a11b9b21313c7cfe3763434f45a8318412ae5889c24c8ed57dac68e09c0227 SHA512 246bcace03f4d7d694c4d08f28c7ad044cab63b5cf264b478ee1fe161499e7607c7ffeff93908f1f3b308e5108d78c4b51a3f90b79189d42a1a653c8edc53e37
diff --git a/x11-libs/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.40.2.ebuild b/x11-libs/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.40.2.ebuild
index e846536da7e5..5b12a3493a54 100644
--- a/x11-libs/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.40.2.ebuild
+++ b/x11-libs/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.40.2.ebuild
@@ -3,12 +3,11 @@
 
 EAPI=7
 
-inherit meson multilib-minimal
+inherit gnome.org meson multilib-minimal
 
 DESCRIPTION="Deprecated Xlib integration for GdkPixbuf"
 HOMEPAGE="https://gitlab.gnome.org/Archive/gdk-pixbuf-xlib"
-SRC_URI="https://gitlab.gnome.org/Archive/${PN}/-/archive/${PV}/${P}.tar.bz2"
-LICENSE="LGPL-2.1"
+LICENSE="LGPL-2+ MPL-1.1"
 SLOT="0"
 
 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"
diff --git a/x11-libs/gdk-pixbuf/Manifest b/x11-libs/gdk-pixbuf/Manifest
index abfeaec502c7..7718a8935955 100644
--- a/x11-libs/gdk-pixbuf/Manifest
+++ b/x11-libs/gdk-pixbuf/Manifest
@@ -1,2 +1,3 @@
 DIST gdk-pixbuf-2.40.0.tar.xz 5512160 BLAKE2B 26049a9ede60e7a50bdc5e9a731136e4bc6de031d01abd42667a0bf92617c36bcdc61d2dc18beb3c5223e32eab461ddb9fc9880a014ac1154763d3b7ee3e7200 SHA512 6512befd379494dbfd89a16fc4c92641842eb7b82fc820ec83a5b057526209947db646570db1124c073b0ef69c117bdf0f8d3fea807e302a4950db39187c35aa
 DIST gdk-pixbuf-2.42.0.tar.xz 6510964 BLAKE2B 1299d050620a08582cb80d3d726713a1c005de3148e6e24a425248ea85f705ee741199c8ab445e4de4c3338904bf37c7a4ff0e61fee4fb23d68a93489b972b84 SHA512 c9962d42e5bf13514091234342e259be1e06b2c4dea2936e16104a3b58f0b6837f070224c04be9541d75f5ea34d1da398f178a1eed1f9059f6429faf5c223e34
+DIST gdk-pixbuf-2.42.2.tar.xz 6514352 BLAKE2B 1230378ee1843f7a861772e708eba64d80a55379104c64b45efa35617aa6d9f0b49ea7996762d91ba1223172162b2b7c1209a53d906c1be43448163f9e230e08 SHA512 f341d032ea410efed7a35f8ca6a7389bf988f663dae16e774d114d6f11611e9e182c835e90d752b71c258c905cc5c4c785ea697feed5e6921a2a676c9deaa5f2
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.2.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.2.ebuild
new file mode 100644
index 000000000000..a76260745fec
--- /dev/null
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.2.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org gnome2-utils meson multilib multilib-minimal xdg
+
+DESCRIPTION="Image loading library for GTK+"
+HOMEPAGE="https://git.gnome.org/browse/gdk-pixbuf"
+
+LICENSE="LGPL-2.1+"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="gtk-doc +introspection jpeg tiff"
+
+# TODO: For windows/darwin support: shared-mime-info conditional, native_windows_loaders option review
+DEPEND="
+	>=dev-libs/glib-2.56.0:2[${MULTILIB_USEDEP}]
+	x11-misc/shared-mime-info
+	>=media-libs/libpng-1.4:0=[${MULTILIB_USEDEP}]
+	jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
+	tiff? ( >=media-libs/tiff-3.9.2:0=[${MULTILIB_USEDEP}] )
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+RDEPEND="${DEPEND}
+	!<x11-libs/gtk+-2.90.4:3
+"
+BDEPEND="
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	dev-util/glib-utils
+	gtk-doc? ( >=dev-util/gtk-doc-1.20
+		app-text/docbook-xml-dtd:4.3 )
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	>=dev-util/meson-0.55.3
+"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/gdk-pixbuf-query-loaders$(get_exeext)
+)
+
+PATCHES=(
+	# Do not run lowmem test on uclibc
+	# See https://bugzilla.gnome.org/show_bug.cgi?id=756590
+	"${FILESDIR}"/${PN}-2.32.3-fix-lowmem-uclibc.patch
+)
+
+src_prepare() {
+	xdg_src_prepare
+	# This will avoid polluting the pkg-config file with versioned libpng,
+	# which is causing problems with libpng14 -> libpng15 upgrade
+	# See upstream bug #667068
+	# First check that the pattern is present, to catch upstream changes on bumps,
+	# because sed doesn't return failure code if it doesn't do any replacements
+	grep -q "foreach png: \[ 'libpng16', 'libpng15', 'libpng14', 'libpng13', 'libpng12', 'libpng10' \]" meson.build || die "libpng check order has changed upstream"
+	sed -e "s/foreach png: \[ 'libpng16', 'libpng15', 'libpng14', 'libpng13', 'libpng12', 'libpng10' \]/foreach png: \[ 'libpng', 'libpng16', 'libpng15', 'libpng14', 'libpng13', 'libpng12', 'libpng10' \]/" -i meson.build || die
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dpng=true
+		$(meson_use tiff)
+		$(meson_use jpeg)
+		-Dbuiltin_loaders=png
+		-Drelocatable=false
+		#native_windows_loaders
+		-Dinstalled_tests=false
+		-Dgio_sniffing=true
+	)
+	if multilib_is_native_abi; then
+		emesonargs+=(
+			$(meson_use gtk-doc gtk_docs)
+			$(meson_feature introspection)
+			-Dman=true
+		)
+	else
+		emesonargs+=(
+			-Dgtk_doc=false
+			-Dintrospection=disabled
+			-Dman=false
+		)
+	fi
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_test() {
+	meson_src_test
+}
+
+multilib_src_install() {
+	meson_src_install
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+
+	multilib_pkg_preinst() {
+		# Make sure loaders.cache belongs to gdk-pixbuf alone
+		local cache="usr/$(get_libdir)/${PN}-2.0/2.10.0/loaders.cache"
+
+		if [[ -e ${EROOT}/${cache} ]]; then
+			cp "${EROOT}"/${cache} "${ED}"/${cache} || die
+		else
+			touch "${ED}"/${cache} || die
+		fi
+	}
+
+	multilib_foreach_abi multilib_pkg_preinst
+	gnome2_gdk_pixbuf_savelist
+}
+
+pkg_postinst() {
+	# causes segfault if set, see bug 375615
+	unset __GL_NO_DSO_FINALIZER
+
+	xdg_pkg_postinst
+	multilib_foreach_abi gnome2_gdk_pixbuf_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+
+	if [[ -z ${REPLACED_BY_VERSION} ]]; then
+		rm -f "${EROOT}"/usr/lib*/${PN}-2.0/2.10.0/loaders.cache
+	fi
+}
diff --git a/x11-terms/rxvt-unicode/files/urxvtd.service b/x11-terms/rxvt-unicode/files/urxvtd.service
new file mode 100644
index 000000000000..758e8154cee6
--- /dev/null
+++ b/x11-terms/rxvt-unicode/files/urxvtd.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=rxvt-unicode terminal daemon
+Documentation=man:urxvtd
+
+[Service]
+ExecStart=/usr/bin/urxvtd
+
+[Install]
+WantedBy=default.target
diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r5.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r6.ebuild
index ebd6f08028f2..219d96ff6b62 100644
--- a/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r5.ebuild
+++ b/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools desktop
+inherit autotools desktop systemd
 
 COLOUR_PATCH_NAME="${PN}-9.22_24-bit-color_cpixl-20201108.patch"
 
@@ -90,6 +90,8 @@ src_compile() {
 src_install() {
 	default
 
+	systemd_douserunit "${FILESDIR}"/urxvtd.service
+
 	make_desktop_entry urxvt rxvt-unicode utilities-terminal \
 		"System;TerminalEmulator"
 }
author	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2020-12-08 12:48:26 +0000
committer	Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net>	2020-12-08 12:48:26 +0000
commit	7ec39a79bef58709b3729177b36483ab7609e0b2 (patch)
tree	92623c0522da104cdea86596e0c0e4492acda288
parent	8e73fa4fbc3144ab12179c85177465b25b7f7f30 (diff)
download	baldeagleos-repo-7ec39a79bef58709b3729177b36483ab7609e0b2.tar.gz baldeagleos-repo-7ec39a79bef58709b3729177b36483ab7609e0b2.tar.xz baldeagleos-repo-7ec39a79bef58709b3729177b36483ab7609e0b2.zip