diff --git a/Manifest b/Manifest
index 911a15a2c497..058c45e5fec2 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29292 BLAKE2B 3f5f3a5fc7d1f9cbe84121b1df417e23d2fe03fbe01f16be66512c93358d7e756ef5f92539d910339457c23cc5d334ca541b4322ef2c419532778b3fb932b264 SHA512 802bcd06cb56e5f087e362f3494d9dfcc4c137d4b70726f5d454ad21fd8ecddd8c002f7f9307b123559733dee401e44f484c91ec0f59e452b40e928ebecbb065
-TIMESTAMP 2021-03-18T10:38:33Z
+MANIFEST Manifest.files.gz 29295 BLAKE2B e0a2eb6136d22945da4d4d2c49ef8a6ec8e25ea6bd39ffc879dc60512109dce5f9a981ea1d631c646778dfd2c1f99ef03e18df9b587726cc1874d1672bea3fc5 SHA512 9fd9375a56a2106c413946cd4de822581b0a4cf3eeace0b8366a2a3a8d5e1a168592f01c4f2526981c49853b0b5d286b269a3e0b5437ecebf6ef420402f51bfc
+TIMESTAMP 2021-03-19T14:38:28Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmBTLalfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmBUt2RfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBWFhAAqrH8yU3gdvGSjvhgLhzTkutq1vDjV7QmE5qLnOy4fCtQsqjVDSYipPbU
-Ziiin1X+U44F3aQf+pLM29FE/voL14lLksXpvvVKNYU6QtFWEwnwo0iTtnWC5F31
-no0lI3ezhKtfT6lz2U1dgpumdpaKfFp/KYt2XA8EiArNMUlut2QNw8S/Nb+4FrF/
-9JTjoxzLbrbg3lpAZViBWFFrOYMppgphdjCw5jNiJZWiWsSDcgFu7WaZJa3mh835
-+/MliSDbfvJS8SeDnpSL43gQnssrwUoaZPdoUw74ctwama3kZUxbbEhqFKlguLJZ
-e46QiuHiutObnyedygwz44ZA4MP6sFkCAVs1CoGZWxiGPLsBBCQkf3RpFVZNobC9
-cigYqjPtn6Kz9qMOqtkpq4/lX84hWdAwQ/94i1LN1UJxRxAfLpc8+hGV3BnadVZQ
-apmu+tyjEQj+/5xyAo7zMQZraGj8sxdBGGlZVXUdxkTtebEcrqNJiWl6biXMuw39
-hy+CHsxKtoKBBndxD1PYeL7+4GJnN43acEuLrh2ZMKcKENJlzASrw1NjrLadUgZ6
-Wby4ynix0HdLoxzJj4KGEAIPDhXT13NxSo/gdvoaowbDAZZoT78jPuDWAhvIZ0mg
-EIVJqktQtWbSe8aHS/slkHEezg+Um3H9Z+ykakubUtmpI21iEYs=
-=gYty
+klCBvA/+J682w4t/1+D5S5m53rdtdUcD0uNvm1xoZT1lYksJ6ptetmUPhTxjSSwa
+rIUgM5xbcglpl1YmE8SeXnKqD2eNGoHeKEzBuO1idyVhCT+sZh/81pSSagmdT/J7
+vkNLf85lJEwel6bA15qgV1jbnT15YKWR6lw184DkVJUVkWKqEh7zkzRuirPoWfTd
+CzPbPCStWxDSxYFvbbBEojAnhEFMS3kbcB8X6KYZLlBrHdzr8bMTwoiKI6wBHESg
+RWAN2nECjMhRiQFcRuIjEHxIy3PS7Et0fI1HRAurQWeAoxrLsU6y+caCspFuwE88
+v6+EK9KuUFYG5HJlQH/S22vyqbw45caG/i1rT/VPc5Qt38jGGeKLYeDGFEDk46O2
+sOXiSsjqC3K822lvxwQ+hJIh0J5Elx+ZKmTy6XrXsPyPWnrbIop0Ti8qnSndS8uJ
+5FassLlk9h4zdX0zFYo/UW8d3KQePy+W7dJdqNjjtp6u5aAKOd4bTeway31Aex+l
+xLXXkthb2kNyv0CijuUpq2BwBTGu5VcjBNjGK//JA+/a+NmgUcNw74D2MW8Pqj2Y
+svR9ESmZKM4PmgR4V+CpVz3PdyzVguZod9yJ+GklK86+dOmUXY81BAXYMZ27/Gof
+si6o8g45LbDkiZQwAPcHsm1yv/9As7/HyJTbVGhprdbDYg+Qnt0=
+=Bgmy
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 2ad2c3cf9bac..a96605eb8cc0 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/app-benchmarks/Manifest.gz b/app-benchmarks/Manifest.gz
index 05e533644133..f4aaf983680f 100644
Binary files a/app-benchmarks/Manifest.gz and b/app-benchmarks/Manifest.gz differ
diff --git a/app-benchmarks/siege/Manifest b/app-benchmarks/siege/Manifest
index e8de1f85a824..b8bc458a1278 100644
--- a/app-benchmarks/siege/Manifest
+++ b/app-benchmarks/siege/Manifest
@@ -5,4 +5,4 @@ DIST siege-4.0.7.tar.gz 525654 BLAKE2B b97c7309d33387d15327dc39ae115bebdfe64fa0d
 EBUILD siege-4.0.4.ebuild 1123 BLAKE2B 8af237cd30a38f95543ab429ccd143bd336c46c4ffe6dac966219cf95c20fe73b74dbab4d576f0574c3f3f3d2fd02883b351e2492ef7da480b3ba6c025b5b6cf SHA512 19470077886d58d05d1e63d067137e3816af44639d49a59bc81f685be077790bcd927e27297ec7205173472edccf692cb7fb249af7404c6ab037baa588228d7d
 EBUILD siege-4.0.5.ebuild 1275 BLAKE2B c576911dadc810da8459e1c7d87be18b41da2275a9d445b2fbd15eaedea616db81bc11aeedb119c28df74322ef28fb9a92fc2248ae8025756dd2096f38ee5c44 SHA512 1aa8ad1f8d47675fa6284c02bc3db4b086c04bfb5cddc3c0566fdd1fb82fd2ee8b56f9e6bb08781d3844415c3bd4fba21e098b83c676a4a4c95c1ccb5a2f7883
 EBUILD siege-4.0.7.ebuild 1279 BLAKE2B 20c50d6ce94ab0ecaa8f17252206c021dd986797f607851cb7377b40a906e671636d4768049a1fb4781a6ca4ce6c47c41da50601070d0d986b039e23c35c353f SHA512 2b1f0a85963f39a1b972627d3c1873db513e1bb7da99dad36cbaca994d57b1f07a7ea91e3f14b3752925754278f1f92889a15a1984016ebe16c889c1f0fb48d7
-MISC metadata.xml 862 BLAKE2B 46756778e11365da53566dfd764cc5d43649f7f55813992caba2e20d2b8ea2e0a55c197691c741f950cd9e593567f1290e9fa6deac6c079eb77d07e736802f63 SHA512 d15e143c1c86de68643ed1af9e04df48ca6f2522a34c1898e0d2ee64b7f95bafbb7bb2d38ac69b285e3087c5273c8d28763638906b1de5e06bac0d2353d3c153
+MISC metadata.xml 627 BLAKE2B d43e5e0ad81fca703445acac8e1635211451853b9d2b17821f6639e82813c8dc929c7b5e40cfeff728e66778f1f4fa6292f30faf7109b50aaaa9da0dda355ad4 SHA512 ba04af10a151753dea1bfbcd1ee70ec17611f66a24718ebe9c9620b384bb1e89f97dcd030c375a0dc7c8714b61ac52313b1aebb76071e64d41963517703bd64f
diff --git a/app-benchmarks/siege/metadata.xml b/app-benchmarks/siege/metadata.xml
index e22c263e1562..52e7091e5b29 100644
--- a/app-benchmarks/siege/metadata.xml
+++ b/app-benchmarks/siege/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>andreacerisara@gmail.com</email>
-		<name>Andrea Cerisara</name>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>
 		Siege is an http load testing and benchmarking utility. It was designed to let
 		web developers measure their code under duress, to see how it will stand up to load on the internet.
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 166bcacab340..daad2ebf254d 100644
Binary files a/app-editors/Manifest.gz and b/app-editors/Manifest.gz differ
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index aec0d1f09aed..e2d1aca16d63 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -9,6 +9,7 @@ DIST emacs-25.3.tar.xz 42854740 BLAKE2B 4f4e2572bbef48b75c561497fc22046081e56099
 DIST emacs-26.3.tar.xz 44415140 BLAKE2B aa8434e6431992ee40402f03a890dd2c49784ee76f437888efe61d66b9aa2bdb816eb0bfe1055e9e154a8bb3ed065fee71623741b474d465a96964618ec775e3 SHA512 4d5a4319253afb081e105a3697eb6eeb8d8a0da18cd41346e376ca5af1e180a26e641f76c64fad1b0253168f14a511f0a4d9d4141524fb1cf4d04f25b05a76e9
 DIST emacs-27.1.91.tar.xz 44608052 BLAKE2B 50d4da099bb542a01f7a62d73ac33cf445fc667af9c81a7c44f4a477d50a29854b14be2fd28eb937d2a039b9d3726b84e5d66d5a667109473e9485ab36b70fcd SHA512 37efc0e472522f498cbd45b6bd734ed34348f7ccf07fb06aed106df6ec86cb0b077d5a54df76abc3147e5d97284f6e9e1a7166d3c32b9a072aecca8c13f8965b
 DIST emacs-27.1.tar.xz 43752012 BLAKE2B 433fbf234c711954269e7e10348abbd4a2bc4c357a59164c625a5ccee2de85a149636c70ad3fad3c09dbbd24900badfd2c0c645017bb33ab3e25d3decff72057 SHA512 dfb26531d2c19cf9fb56505f03d799654b45e5f9528e777900e8280ed2c1d21e04c52f510528e31e015977c471ae63164cedee6174b7439ebcf479a21fc18064
+DIST emacs-27.2-rc1.tar.xz 44630360 BLAKE2B aec7da38f23c440dbea4205ad22b90a61d3abae4e40c65185b250d3cadcf8f39e626f0ef09e032a897ffe6d40afd5a1ac192246332f1384745454bcaa91bb077 SHA512 9c6f337fb593594a92df5024fa47a28abbc59e4d2c06d807ecc1bed33cfb94df46d1e8a04e3f4aa4ca82e8fdd64d1e82b5a0423dc22cb6b1dd4571dca22ea4a8
 EBUILD emacs-18.59-r13.ebuild 4370 BLAKE2B eda9ea6895a647fb6576737cd1f45f528ac1fbc09aa45ad8c90d9b77130aac4f56f209808cf405c3a696afbf22fa919e5cb4ab0420925fdf971e0038fd868502 SHA512 c00ea63528ffe15ee6a40dc559d9736eed3aaaaa2a23237158a4a41386369e28dc7303d39146d82e640b8d601376d842de475fe892ce9e1eb453215bee66f796
 EBUILD emacs-23.4-r20.ebuild 11194 BLAKE2B 5a6ad012bc880a168592aaaa13ea478c40b33e3a4ab3e57e137be5e3ed6565263f406e75ee968c18b015524613ef8de9db1cbec990094c27220c22125d813297 SHA512 efbf5f07548f6e5faa5390322a06f05b40137994c0a85cadbdddc2f1359408fe16ec0a008734d0284119d78209e89894ac1904d3b27572b9878e747dc8d47be1
 EBUILD emacs-24.5-r10.ebuild 10959 BLAKE2B 9abbd5cd629f2b577a9ad4635b6579f69c98945a0e920f821ec84a92fbc916c40ebb9bae88b49aa691fc3145d3a6d8c6224d876f7df055da85d7c2f3b74d1dfa SHA512 eebf1fe7c54f5a812ee97da236f9a19cc2ea4af60f9eb23b6a46ac0ada41d0795363a536d7b524c067c1ee4cb698eae9508a3493e17498804863bd2418b4e4ee
@@ -17,5 +18,6 @@ EBUILD emacs-26.3-r4.ebuild 11944 BLAKE2B 85880167c9e31ca96fbd8f3c1bc6966c5823d0
 EBUILD emacs-27.1-r4.ebuild 14475 BLAKE2B 3dfb01869b832a9cd1b4068256a0f2df5918504b30d4941b06a3a1a8081e8c78a432629bca1da1b2eddbeb7322e96e5576b3bcaa8e90ea13250e64a98507816b SHA512 240eb0c39a890232016e479122acd878e072c49d0a6b635cdfcea2005f9c5319ea5689c5be7bf276d2c375e7defb50ff240639ed65aaeb4f8edab9624b2f6728
 EBUILD emacs-27.1.91-r1.ebuild 14440 BLAKE2B 8835a0672c4ac3f4f71819e432a6bc3508805e0d8240fd2b5a52c429e6947dc35df2dadd024c291893c493e244313868313f614af2dc6c4cd092e398a41c27f6 SHA512 740e47fbd48bd1497362967e352ec4b5b0aa2738dac0b58ff277064c13edd6aeabc0030467cca21519becbe8f9801e0128f2705568b21d3af4dd874becc19cfe
 EBUILD emacs-27.1.9999-r1.ebuild 14439 BLAKE2B dc38a21c9a51fa6aeaf502663c25e1e03a2036649ac15c49a68b50b6bd71e036e1cb4bdf8d0c1e4ed475701a0f7b76decd0fdbb23cd2be1b57db57c91c5ea39e SHA512 71136864772d724eda2a3b681e8bd28a00c4cfa7d3a71c4de756814da809ac9bed18aa15d1ef0b42a7e2bdd3ff2584b4ff4848f9b5f62611a1f1416234f52c17
+EBUILD emacs-27.2_rc1.ebuild 14440 BLAKE2B 8835a0672c4ac3f4f71819e432a6bc3508805e0d8240fd2b5a52c429e6947dc35df2dadd024c291893c493e244313868313f614af2dc6c4cd092e398a41c27f6 SHA512 740e47fbd48bd1497362967e352ec4b5b0aa2738dac0b58ff277064c13edd6aeabc0030467cca21519becbe8f9801e0128f2705568b21d3af4dd874becc19cfe
 EBUILD emacs-28.0.9999.ebuild 14022 BLAKE2B 7b0fdf5f481d594474901be3b491d8790672274fa87c597d3f36620edd406ca19b52b8bd3f8353e245ea729a287e3fe2082d24273b4826601d275910edaaca27 SHA512 5a29b5775ab0a5093ab2dd9d67ae2f05948312c9039c63f8d9b57c60f1f396dfa17008b01b6fe6ef253ad3578c3434dd27831d323d026ac3b11ec621b90efd5f
 MISC metadata.xml 3037 BLAKE2B fea30de2fe3c754253119e21c0f2c1023d4ac9c78ff0586fd5c427a8b44104ca620a16a8560de310afe342fd38e69be58781656ae45d59223d3e48d6510bb980 SHA512 07a5bf84aecac3fde3d6b0a698e875683f8479becc66037ba4d21f0bfef3e7d533331ab072ad1d5911cc36d9b5efdec979a3daafe812a5055139f8171d4ae6ea
diff --git a/app-editors/emacs/emacs-27.2_rc1.ebuild b/app-editors/emacs/emacs-27.2_rc1.ebuild
new file mode 100644
index 000000000000..acd274cb4f4e
--- /dev/null
+++ b/app-editors/emacs/emacs-27.2_rc1.ebuild
@@ -0,0 +1,446 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs
+
+if [[ ${PV##*.} = 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/emacs.git"
+	EGIT_BRANCH="emacs-27"
+	EGIT_CHECKOUT_DIR="${WORKDIR}/emacs"
+	S="${EGIT_CHECKOUT_DIR}"
+	SLOT="${PV%%.*}-vcs"
+else
+	# FULL_VERSION keeps the full version number, which is needed in
+	# order to determine some path information correctly for copy/move
+	# operations later on
+	FULL_VERSION="${PV%%_*}"
+	SRC_URI="mirror://gnu/emacs/${P}.tar.xz"
+	S="${WORKDIR}/emacs-${FULL_VERSION}"
+	# PV can be in any of the following formats:
+	# 27.1                 released version (slot 27)
+	# 27.1_rc1             upstream release candidate (27)
+	# 27.0.9999            live ebuild (slot 27-vcs)
+	# 27.0.90              upstream prerelease snapshot (27-vcs)
+	# 27.0.50_pre20191223  snapshot by Gentoo developer (27-vcs)
+	if [[ ${PV} == *_pre* ]]; then
+		SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
+		S="${WORKDIR}/emacs"
+	elif [[ ${PV//[0-9]} != "." ]]; then
+		SRC_URI="https://alpha.gnu.org/gnu/emacs/pretest/${PN}-${PV/_/-}.tar.xz"
+	fi
+	SLOT="${PV%%.*}"
+	[[ ${PV} == *.*.* ]] && SLOT+="-vcs"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+fi
+
+DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
+HOMEPAGE="https://www.gnu.org/software/emacs/"
+
+LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
+IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib"
+RESTRICT="test"
+
+RDEPEND="app-emacs/emacs-common-gentoo[games?,gui(-)?]
+	sys-libs/ncurses:0=
+	acl? ( virtual/acl )
+	alsa? ( media-libs/alsa-lib )
+	dbus? ( sys-apps/dbus )
+	games? ( acct-group/gamestat )
+	gmp? ( dev-libs/gmp:0= )
+	gpm? ( sys-libs/gpm )
+	!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
+	json? ( dev-libs/jansson )
+	kerberos? ( virtual/krb5 )
+	lcms? ( media-libs/lcms:2 )
+	libxml2? ( >=dev-libs/libxml2-2.2.0 )
+	mailutils? ( net-mail/mailutils[clients] )
+	!mailutils? ( acct-group/mail net-libs/liblockfile )
+	selinux? ( sys-libs/libselinux )
+	ssl? ( net-libs/gnutls:0= )
+	systemd? ( sys-apps/systemd )
+	zlib? ( sys-libs/zlib )
+	gui? ( !aqua? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXfixes
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+		x11-libs/libxcb
+		x11-misc/xbitmaps
+		gconf? ( >=gnome-base/gconf-2.26.2 )
+		gsettings? ( >=dev-libs/glib-2.28.6 )
+		gif? ( media-libs/giflib:0= )
+		jpeg? ( virtual/jpeg:0= )
+		png? ( >=media-libs/libpng-1.4:0= )
+		svg? ( >=gnome-base/librsvg-2.0 )
+		tiff? ( media-libs/tiff:0 )
+		xpm? ( x11-libs/libXpm )
+		imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= )
+		xft? (
+			media-libs/fontconfig
+			media-libs/freetype
+			x11-libs/libXft
+			x11-libs/libXrender
+			cairo? ( >=x11-libs/cairo-1.12.18 )
+			harfbuzz? ( media-libs/harfbuzz:0= )
+			m17n-lib? (
+				>=dev-libs/libotf-0.9.4
+				>=dev-libs/m17n-lib-1.5.1
+			)
+		)
+		gtk? (
+			x11-libs/gtk+:3
+			xwidgets? (
+				net-libs/webkit-gtk:4=
+				x11-libs/libXcomposite
+			)
+		)
+		!gtk? (
+			motif? (
+				>=x11-libs/motif-2.3:0
+				x11-libs/libXpm
+				x11-libs/libXmu
+				x11-libs/libXt
+			)
+			!motif? (
+				Xaw3d? (
+					x11-libs/libXaw3d
+					x11-libs/libXmu
+					x11-libs/libXt
+				)
+				!Xaw3d? ( athena? (
+					x11-libs/libXaw
+					x11-libs/libXmu
+					x11-libs/libXt
+				) )
+			)
+		)
+	) )"
+
+DEPEND="${RDEPEND}
+	gui? ( !aqua? ( x11-base/xorg-proto ) )"
+
+BDEPEND="app-eselect/eselect-emacs
+	sys-apps/texinfo
+	virtual/pkgconfig
+	gzip-el? ( app-arch/gzip )"
+
+RDEPEND="${RDEPEND}
+	!app-editors/emacs-vcs:27
+	app-eselect/eselect-emacs"
+
+EMACS_SUFFIX="emacs-${SLOT}"
+SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
+
+src_prepare() {
+	if [[ ${PV##*.} = 9999 ]]; then
+		FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[ \t]*\([^ \t,)]*\).*/\1/p' \
+			configure.ac)
+		[[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version"
+		einfo "Emacs branch: ${EGIT_BRANCH}"
+		einfo "Commit: ${EGIT_VERSION}"
+		einfo "Emacs version number: ${FULL_VERSION}"
+		[[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \
+			|| die "Upstream version number changed to ${FULL_VERSION}"
+	fi
+
+	eapply_user
+
+	# Fix filename reference in redirected man page
+	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die
+
+	#AT_M4DIR=m4 eautoreconf
+}
+
+src_configure() {
+	strip-flags
+	filter-flags -pie					#526948
+
+	if use ia64; then
+		replace-flags "-O[2-9]" -O1		#325373
+	else
+		replace-flags "-O[3-9]" -O2
+	fi
+
+	local myconf
+
+	if use alsa; then
+		use sound || ewarn \
+			"USE flag \"alsa\" overrides \"-sound\"; enabling sound support."
+		myconf+=" --with-sound=alsa"
+	else
+		myconf+=" --with-sound=$(usex sound oss)"
+	fi
+
+	if ! use gui; then
+		einfo "Configuring to build without window system support"
+		myconf+=" --without-x --without-ns"
+	elif use aqua; then
+		einfo "Configuring to build with Nextstep (Macintosh Cocoa) support"
+		myconf+=" --with-ns --disable-ns-self-contained"
+		myconf+=" --without-x"
+	else
+		myconf+=" --with-x --without-ns"
+		myconf+=" $(use_with gconf)"
+		myconf+=" $(use_with gsettings)"
+		myconf+=" $(use_with toolkit-scroll-bars)"
+		myconf+=" $(use_with gif)"
+		myconf+=" $(use_with jpeg)"
+		myconf+=" $(use_with png)"
+		myconf+=" $(use_with svg rsvg)"
+		myconf+=" $(use_with tiff)"
+		myconf+=" $(use_with xpm)"
+		myconf+=" $(use_with imagemagick)"
+
+		if use xft; then
+			myconf+=" --with-xft"
+			myconf+=" $(use_with cairo)"
+			myconf+=" $(use_with harfbuzz)"
+			myconf+=" $(use_with m17n-lib libotf)"
+			myconf+=" $(use_with m17n-lib m17n-flt)"
+		else
+			myconf+=" --without-xft"
+			myconf+=" --without-cairo"
+			myconf+=" --without-libotf --without-m17n-flt"
+			use cairo && ewarn \
+				"USE flag \"cairo\" has no effect if \"xft\" is not set."
+			use m17n-lib && ewarn \
+				"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
+		fi
+
+		local f line
+		if use gtk; then
+			einfo "Configuring to build with GIMP Toolkit (GTK+)"
+			while read line; do ewarn "${line}"; done <<-EOF
+				Your version of GTK+ will have problems with closing open
+				displays. This is no problem if you just use one display, but
+				if you use more than one and close one of them Emacs may crash.
+				See <https://gitlab.gnome.org/GNOME/gtk/-/issues/221> and
+				<https://gitlab.gnome.org/GNOME/gtk/-/issues/2315>.
+				If you intend to use more than one display, then it is strongly
+				recommended that you compile Emacs with the Athena/Lucid or the
+				Motif toolkit instead.
+			EOF
+			myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)"
+			for f in motif Xaw3d athena; do
+				use ${f} && ewarn \
+					"USE flag \"${f}\" has no effect if \"gtk\" is set."
+			done
+		elif use motif; then
+			einfo "Configuring to build with Motif toolkit"
+			myconf+=" --with-x-toolkit=motif"
+			for f in Xaw3d athena; do
+				use ${f} && ewarn \
+					"USE flag \"${f}\" has no effect if \"motif\" is set."
+			done
+		elif use athena || use Xaw3d; then
+			einfo "Configuring to build with Athena/Lucid toolkit"
+			myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
+		else
+			einfo "Configuring to build with no toolkit"
+			myconf+=" --with-x-toolkit=no"
+		fi
+		! use gtk && use xwidgets && ewarn \
+			"USE flag \"xwidgets\" has no effect if \"gtk\" is not set."
+	fi
+
+	if tc-is-cross-compiler; then
+		# Configure a CBUILD directory when cross-compiling to make tools
+		mkdir "${S}-build" && pushd "${S}-build" >/dev/null || die
+		ECONF_SOURCE="${S}" econf_build --without-all --without-x-toolkit
+		popd >/dev/null || die
+		# Don't try to execute the binary for dumping during the build
+		myconf+=" --with-dumping=none"
+	else
+		myconf+=" --with-dumping=pdumper"
+	fi
+
+	econf \
+		--program-suffix="-${EMACS_SUFFIX}" \
+		--includedir="${EPREFIX}"/usr/include/${EMACS_SUFFIX} \
+		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
+		--localstatedir="${EPREFIX}"/var \
+		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
+		--without-compress-install \
+		--without-hesiod \
+		--without-pop \
+		--with-file-notification=$(usev inotify || usev gfile || echo no) \
+		--with-pdumper \
+		$(use_enable acl) \
+		$(use_with dbus) \
+		$(use_with dynamic-loading modules) \
+		$(use_with games gameuser ":gamestat") \
+		$(use_with gmp libgmp) \
+		$(use_with gpm) \
+		$(use_with json) \
+		$(use_with kerberos) $(use_with kerberos kerberos5) \
+		$(use_with lcms lcms2) \
+		$(use_with libxml2 xml2) \
+		$(use_with mailutils) \
+		$(use_with selinux) \
+		$(use_with ssl gnutls) \
+		$(use_with systemd libsystemd) \
+		$(use_with threads) \
+		$(use_with wide-int) \
+		$(use_with zlib) \
+		${myconf}
+}
+
+src_compile() {
+	if tc-is-cross-compiler; then
+		# Build native tools for compiling lisp etc.
+		emake -C "${S}-build" src
+		emake lib	   # Cross-compile dependencies first for timestamps
+		# Save native build tools in the cross-directory
+		cp "${S}-build"/lib-src/make-{docfile,fingerprint} lib-src || die
+		# Specify the native Emacs to compile lisp
+		emake -C lisp all EMACS="${S}-build/src/emacs"
+	fi
+
+	emake
+}
+
+src_install() {
+	emake DESTDIR="${D}" NO_BIN_LINK=t BLESSMAIL_TARGET= install
+
+	mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} || die
+	mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die
+	mv "${ED}"/usr/share/metainfo/{emacs-,}${EMACS_SUFFIX}.appdata.xml || die
+
+	# move info dir to avoid collisions with the dir file generated by portage
+	mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} || die
+	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
+	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
+
+	# movemail must be setgid mail
+	if ! use mailutils; then
+		fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
+		fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
+	fi
+
+	# avoid collision between slots, see bug #169033 e.g.
+	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
+	rm -rf "${ED}"/usr/share/{appdata,applications,icons}
+	rm -rf "${ED}/usr/$(get_libdir)"
+	rm -rf "${ED}"/var
+
+	# remove unused <version>/site-lisp dir
+	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
+
+	# remove COPYING file (except for etc/COPYING used by describe-copying)
+	rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING
+
+	if use systemd; then
+		insinto /usr/lib/systemd/user
+		sed -e "/^##/d" \
+			-e "/^ExecStart/s,emacs,${EPREFIX}/usr/bin/${EMACS_SUFFIX}," \
+			-e "/^ExecStop/s,emacsclient,${EPREFIX}/usr/bin/&-${EMACS_SUFFIX}," \
+			etc/emacs.service | newins - ${EMACS_SUFFIX}.service
+		assert
+	fi
+
+	if use gzip-el; then
+		# compress .el files when a corresponding .elc exists
+		find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
+			-name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
+		assert "gzip .el failed"
+	fi
+
+	local cdir
+	if use source; then
+		cdir="/usr/share/emacs/${FULL_VERSION}/src"
+		insinto "${cdir}"
+		# This is not meant to install all the source -- just the
+		# C source you might find via find-function
+		doins src/*.{c,h,m}
+	elif has installsources ${FEATURES}; then
+		cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
+	fi
+
+	sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF || die
+	X
+	;;; ${EMACS_SUFFIX} site-lisp configuration
+	X
+	(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
+	Y  (setq find-function-C-source-directory
+	Y	"${EPREFIX}${cdir}")
+	X  (let ((path (getenv "INFOPATH"))
+	X	(dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
+	X	(re "\\\\\`${EPREFIX}/usr/share\\\\>"))
+	X    (and path
+	X	 ;; move Emacs Info dir before anything else in /usr/share
+	X	 (let* ((p (cons nil (split-string path ":" t))) (q p))
+	X	   (while (and (cdr q) (not (string-match re (cadr q))))
+	X	     (setq q (cdr q)))
+	X	   (setcdr q (cons dir (delete dir (cdr q))))
+	X	   (setq Info-directory-list (prune-directory-list (cdr p)))))))
+	EOF
+	elisp-site-file-install "${T}/${SITEFILE}" || die
+
+	dodoc README BUGS CONTRIBUTE
+
+	if use gui && use aqua; then
+		dodir /Applications/Gentoo
+		rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app
+		mv nextstep/Emacs.app \
+			"${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
+	fi
+
+	local DOC_CONTENTS="You can set the version to be started by
+		/usr/bin/emacs through the Emacs eselect module, which also
+		redirects man and info pages. Therefore, several Emacs versions can
+		be installed at the same time. \"man emacs.eselect\" for details.
+		\\n\\nIf you upgrade from a previous major version of Emacs, then
+		it is strongly recommended that you use app-admin/emacs-updater
+		to rebuild all byte-compiled elisp files of the installed Emacs
+		packages."
+	if use gui; then
+		DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
+			Installing media-fonts/font-adobe-{75,100}dpi on the X server's
+			machine would satisfy basic Emacs requirements under X11.
+			See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
+			for how to enable anti-aliased fonts."
+		use aqua && DOC_CONTENTS+="\\n\\n${EMACS_SUFFIX^}.app is in
+			\"${EPREFIX}/Applications/Gentoo\". You may want to copy or
+			symlink it into /Applications by yourself."
+	fi
+	tc-is-cross-compiler && DOC_CONTENTS+="\\n\\nEmacs did not write
+		a portable dump file due to being cross-compiled.
+		To create this file at run time, execute the following command:
+		\\n${EMACS_SUFFIX} --batch -Q --eval='(dump-emacs-portable
+		\"/usr/libexec/emacs/${FULL_VERSION}/${CHOST}/emacs.pdmp\")'"
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	# move Info dir file to correct name
+	if [[ -d ${ED}/usr/share/info ]]; then
+		mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} || die
+	fi
+}
+
+pkg_postinst() {
+	elisp-site-regen
+	readme.gentoo_print_elog
+
+	if use livecd; then
+		# force an update of the emacs symlink for the livecd/dvd,
+		# because some microemacs packages set it with USE=livecd
+		eselect emacs update
+	elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then
+		# refresh symlinks in case any installed files have changed
+		eselect emacs set ${EMACS_SUFFIX}
+	else
+		eselect emacs update ifunset
+	fi
+}
+
+pkg_postrm() {
+	elisp-site-regen
+	eselect emacs update ifunset
+}
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 5cda4cb95a4f..ed511d517fff 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/fuse-utils/Manifest b/app-emulation/fuse-utils/Manifest
index 0760d7a85c5b..757c3250160f 100644
--- a/app-emulation/fuse-utils/Manifest
+++ b/app-emulation/fuse-utils/Manifest
@@ -1,4 +1,4 @@
 AUX remove-local-prefix.patch 841 BLAKE2B c29e10ed335d431c0cbd88a26028c03599c32d9ded001fa1f61f805589bd1c52352b52ac8f99c147af315ee91d65681d1c0aa355567108f92767f36fa6f6dee1 SHA512 c15ac87af402e06296d76459a13b5817be7393839ca1566c6f0eefaa3055f7f3f0dc7589f762d9caa0e0bd356790bbb1aca5c3ee6166155577bf3520f25ed125
 DIST fuse-utils-1.4.3.tar.gz 501006 BLAKE2B 0637fe05b71416e89eb61e3618ff45bd71250201924fb3741a4c5b9898d09b30acecba9957baeaa864c2c9cfe1bcb9cb38a2af83368bc5729221cec36a1eda47 SHA512 13404d1be81a2de9262cd79cce9dd8dc3f17238fdbb75da8a724b76b0976c03f34da9978af36b808103fedcf3f5d5da4bb10f251c5510127d59ca8de5607b99e
-EBUILD fuse-utils-1.4.3.ebuild 906 BLAKE2B 5d0e2325e3256617e87a1a147626cfa74b3e77638dc0218a45952e469cdf046ca76e97f61667f41bd63965795fbdc69ec3adf0689f6f7464795608dca71415bd SHA512 0d64435c04cfeb91259f0969aeb99b2d84128861772f9c2baa344bb4956b18c9d14e0d8e7251c9491b7a0fabd6fb82d8e590ef210263c6e5050b2dd11724b347
+EBUILD fuse-utils-1.4.3-r1.ebuild 926 BLAKE2B afe7ad8f5fb60a8350835acf5d7710991d28b25f01bb9082a653759053d16815d9479cc956a62f2ac76755c0e604819a8c55792c8f44efe215b9292b6152ec4a SHA512 5b0bb4157d32d7916e75ef2f3f792d5dcb0e10f3aba71fbc96112d0a732baba6cbb2d3a1b4f4bb6540327ec2c8910869543256bc926dfa8497d0a044a3c960d5
 MISC metadata.xml 468 BLAKE2B d1653b29114c8a61280253b82ad6de47e100362a9a6113706648a25d3803e95eba5438c042b1af91c49e570eedef17598f4ce0987d3d01e76e6b3f4a908d7892 SHA512 b2a1360187920f5cb8516f9377cc1bec1732b84b83038a17ba33347b2bea403cdbfeb09a0abeb8e55157445f4cff13e803369bc125fc0a531aaa509b3aafe9e2
diff --git a/app-emulation/fuse-utils/fuse-utils-1.4.3.ebuild b/app-emulation/fuse-utils/fuse-utils-1.4.3-r1.ebuild
similarity index 82%
rename from app-emulation/fuse-utils/fuse-utils-1.4.3.ebuild
rename to app-emulation/fuse-utils/fuse-utils-1.4.3-r1.ebuild
index 8e44998a4a6a..cc6f021a658a 100644
--- a/app-emulation/fuse-utils/fuse-utils-1.4.3.ebuild
+++ b/app-emulation/fuse-utils/fuse-utils-1.4.3-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools
 
@@ -14,13 +14,13 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="audiofile gcrypt jpeg png zlib"
 
-RDEPEND=">=app-emulation/libspectrum-1.4.4[gcrypt?,zlib?]
+RDEPEND=">=app-emulation/libspectrum-1.4.4[audiofile?,gcrypt?,zlib?]
 	audiofile? ( >=media-libs/audiofile-0.3.6 )
 	jpeg? ( virtual/jpeg:0 )
 	png? ( media-libs/libpng:0 )
 	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}"/remove-local-prefix.patch
diff --git a/app-emulation/fuse/Manifest b/app-emulation/fuse/Manifest
index eefa6453d4ae..90b0236ec58a 100644
--- a/app-emulation/fuse/Manifest
+++ b/app-emulation/fuse/Manifest
@@ -1,5 +1,7 @@
 AUX multiple-definition.patch 508 BLAKE2B 9568d9f736d838ba4506e9bf6fc3f514952d086e1b412e19f56cc0646564a99411086e6a3a9ba106d741c727078a286c49a932d151f93222bbfd5c1f32221c70 SHA512 544a012a352f68e843c796a8ba2a2cf7b4586e3c99b059ef387fc7f343cf42c66de11c17bf9c15f92a819ec3e32fe3588a02bc7095996db7b13f536e66555795
 AUX remove-local-prefix.patch 745 BLAKE2B 752dc9df4ad9b33a84493e4939d9c30687a730ecc628301a4bbc16f46410d73c8f7b64376788721f04c06404685ef300c2dc423c1843258748c377c6d61232a4 SHA512 25771be029e61654398bb1c36b1c31bc44f136e7e369c72faa3869f94807558c0d1b324ac803d79a898410fd14661d02a8286cda19dc25c79ebca6c387b817a3
 DIST fuse-1.5.7.tar.gz 1634568 BLAKE2B 9d2f3c310132dc57336995c31adeb37d727506719d1089b2009a2f44cbfa59fc9c4e9252aeff64cdd22b7326328518b5da33af51be687f321b891b9d1dd2b646 SHA512 ac11e03fc203f98433253fb72d7700cf6285ad8662147f318bb4ceda3888bc865b80d85473a3b2bda9e0971989b1579fc928f41ddabbf01d58358362066be13d
+DIST fuse-1.6.0.tar.gz 1686171 BLAKE2B d1e6b166f2f649f408349b16a5eb40dd414750ed7a805eb6505b6c81be6ed7bcaa4e6f0b14057645172add1b1a77881f90b64767390fe1a64a486168f452d29d SHA512 5096b24b5b3d812942a7ad401b886b6a99f5493686912cb4aff18ede65404ae97a9bcafa6337aaed4378382f2a170918797d7d4570bb809476be5aa9fc625b8b
 EBUILD fuse-1.5.7.ebuild 1913 BLAKE2B e3cbe4591bf23d091555ec8d50cfce8ea5cc4ea42dd21788f29445d36c05802875fe01801401591f06d836c9009b403e09bba4bdf2e1b06930ea380db195abb8 SHA512 483ec51bdd5a493dfcb9fa66b576b5ad67e6fca9b00d81639127a19833344b99b9107e0c4f8d75d923ca825c10e76113461e26489a0f2acf7c545269523f0d1b
-MISC metadata.xml 666 BLAKE2B 829d930b9b5a8b72b70da9038d5f11e2822523fee8b09e3aae12489c9252f47c4aa44c34b2212ffaa0397a0c27d868e6f108563f67ae144919a08ff2e1f66193 SHA512 2b1c570adea1823501b44331078fab8ff942d274f5a338a21f84e5a119758164265755352fbf3ffa6b485607a9f0c051f9d671f70db52eaab700d6d17756b80c
+EBUILD fuse-1.6.0.ebuild 2916 BLAKE2B 0af606e43136c69fec26f7056225ff7ee2e0ed2ded6c83244a53a9e898b59568a37967507ae0d4537ec695a27c7844a2ee75b2d8e0c6254a3fdc7cc35ec3123d SHA512 1dc13be98ee7b8550836e77ce03acd775c129dee8135ddd99abcc2d3ee6486eb3b14f551de16b6ff4dd0b9198cc8d0b0e0ff4027b8fc662911dafc6c224082d7
+MISC metadata.xml 728 BLAKE2B 53fd75cce07e995581475b414394c05e5acadf5e49b3a6c9fcc4e8f5f34b14209f2628fb2ccee98d1018266888aa76778e63b87124a87a14f179601891153869 SHA512 0ec242e0640d786ed5e82c3e0553e4c054b4e493a7851aa47b1ed817f6826014aa2d1a91f8a398baefe76a5aa2535fb260003386f695a53c9c807b10994926b9
diff --git a/app-emulation/fuse/fuse-1.6.0.ebuild b/app-emulation/fuse/fuse-1.6.0.ebuild
new file mode 100644
index 000000000000..ddec66d72acc
--- /dev/null
+++ b/app-emulation/fuse/fuse-1.6.0.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools xdg
+
+DESCRIPTION="Free Unix Spectrum Emulator by Philip Kendall"
+HOMEPAGE="http://fuse-emulator.sourceforge.net"
+SRC_URI="mirror://sourceforge/fuse-emulator/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="alsa ao backend-X backend-fbcon +backend-gtk3 backend-sdl backend-svga gpm joystick memlimit png -pulseaudio +xml +zlib"
+
+# TODO:
+# - allow using sdl audio driver without using for the UI
+# - allow using sdl joystick support with gtk3 or X UI in place of libjsw
+# - when using sdl for one of the above but not the UI, allow using sdl2 instead
+
+# At most one audio driver and at most one UI back-end can be enabled at a time
+REQUIRED_USE="?? ( alsa ao backend-sdl pulseaudio )
+	?? ( backend-X backend-fbcon backend-gtk3 backend-sdl backend-svga )"
+
+RDEPEND="
+	>=app-emulation/libspectrum-1.5.0[zlib?]
+	dev-libs/glib:2
+	alsa? ( media-libs/alsa-lib )
+	ao? ( media-libs/libao )
+	backend-X? ( x11-libs/libX11 x11-libs/libXext )
+	backend-gtk3? ( x11-libs/gtk+:3 )
+	backend-sdl? ( media-libs/libsdl[joystick,sound] )
+	backend-svga? ( media-libs/svgalib )
+	gpm? ( backend-fbcon? ( sys-libs/gpm ) )
+	joystick? ( !backend-sdl? ( media-libs/libjsw ) )
+	png? ( media-libs/libpng:0= )
+	pulseaudio? ( media-sound/pulseaudio )
+	xml? ( dev-libs/libxml2:2 )
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+	backend-fbcon? ( virtual/linux-sources )"
+BDEPEND="dev-lang/perl
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog README THANKS )
+
+PATCHES=(
+	"${FILESDIR}"/remove-local-prefix.patch
+)
+
+_fuse_audio_driver() {
+	if use alsa; then
+		echo "alsa"
+	elif use ao; then
+		echo "libao"
+	elif use backend-sdl; then
+		echo "sdl"
+	elif use pulseaudio; then
+		echo "pulseaudio"
+	else
+		echo "null"
+	fi
+}
+
+src_prepare() {
+	xdg_src_prepare
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		--enable-desktop-integration
+		--without-win32
+		--with-audio-driver="$(_fuse_audio_driver)"
+		$(use_with gpm)
+		$(use_with joystick)
+		$(use_enable memlimit smallmem)
+		$(use_with png)
+		$(use_with xml libxml2)
+		$(use_with zlib)
+	)
+
+	# The pure-X UI hasn't got its own configure argument, instead it is
+	# what is used under Linux if all other back-ends have been disabled
+	# - and all except the Gtk+ one are off by default.
+	if use backend-X; then
+		myconf+=("--without-gtk")
+	elif use backend-fbcon; then
+		myconf+=("--with-fb")
+	elif use backend-gtk3; then
+		myconf+=("--with-gtk")
+	elif use backend-sdl; then
+		myconf+=("--with-sdl")
+	elif use backend-svga; then
+		myconf+=("--with-svgalib")
+	else
+		myconf+=("--with-null-ui")
+	fi
+
+	if use joystick; then
+		myconf+=( $(use_enable backend-sdl ui-joystick) )
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_test() {
+	emake test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	if use pulseaudio; then
+		ewarn "The PulseAudio driver in ${PN} is experimental"
+	fi
+}
diff --git a/app-emulation/fuse/metadata.xml b/app-emulation/fuse/metadata.xml
index a081999e0941..f6bb92e4f4f6 100644
--- a/app-emulation/fuse/metadata.xml
+++ b/app-emulation/fuse/metadata.xml
@@ -10,6 +10,7 @@
 	</upstream>
 	<use>
 		<flag name="backend-fbcon">Use framebuffer rendering backend</flag>
+		<flag name="backend-gtk3">Use Gtk+ rendering backend</flag>
 		<flag name="backend-sdl">Use SDL rendering backend</flag>
 		<flag name="backend-svga">Use svgalib rendering backend</flag>
 		<flag name="backend-X">Use X11 rendering backend</flag>
diff --git a/app-emulation/libspectrum/Manifest b/app-emulation/libspectrum/Manifest
index c704a6e8eb70..211443d31413 100644
--- a/app-emulation/libspectrum/Manifest
+++ b/app-emulation/libspectrum/Manifest
@@ -1,4 +1,6 @@
 AUX remove-local-prefix.patch 851 BLAKE2B 1e1b787c10499bfbeafca43b08f4cbd8c7525841c641a3fa1211822a7ec3e98b11c9925b1bd9cc8ac3b14e5d0625c34727a330e00f0e3aaf5aba1871a8810647 SHA512 bae42eec33ff2ae00547d8c649b8164fd5665b70e95b07f95cdcce41e342702de559c4b63d6ce95a97407d2e8012c7fe0142b923603c1c1d25b8978f29aaf7a3
 DIST libspectrum-1.4.4.tar.gz 568684 BLAKE2B b6ab4fc4173e7de9a7c3b14fda03420a56f02c5c590770158443bc37bee99a55dd3bdf6864f8ca33adb5ed59f4abd5c5b97736456ba2e6e6aaa2b49e07097cc4 SHA512 83bb9242010d49898531bb62e0d4d55439b0b6a548b57a7932f074429aca70cf252dfb195e9751384510b08c98bd6bc8eefd8cb3f82b0c8d07fa245ba66e9fe2
+DIST libspectrum-1.5.0.tar.gz 602354 BLAKE2B fc62437ececfe2c86b475efa512bf7aa7c5af182e16a00f75f77f78656fca01d46a71ac90b38008ff46e5fd0710b1c671b283d65544b5556d98e8c5b66525c35 SHA512 55f4cf623bc6c469a0fd80751ada694259d834c19d98400ba244aabf2ac21fed7cdd6de069d9ed7326e099bd3bd62c42cfb8a669b64ae002f90a52563fa2dcd1
 EBUILD libspectrum-1.4.4.ebuild 1040 BLAKE2B c66daea0426b3fbfc816255e49501a9e4162a25436c2dc35519b09e213980f75f3d691b198cc90574d319403f03477efb2ff256a9c9bef7290b65564ed7daa29 SHA512 cc20f0cb9bbfb3d34ba04c4d9a94a58cc14d53363b2a4f8536c0e1368066d3e5970e9a7cafc3f9d564f071b577e3df7e1c008a64168b98912f12208ce6ca9e99
+EBUILD libspectrum-1.5.0.ebuild 1049 BLAKE2B 4cfc6b4d94b6bc7a403a95c4be47b5f6980f9b1f87721492f7af2a1378f90655559c2ca49fdbc6a4e6282e51c5c04655ad1578fac5ad712329e00fe13fbef837 SHA512 27e3724b0301efb057ea9ac166d873c78e2c739d590aca5d58c11ff9dcbc5935629d319ab3c1c1ccd34ff26b5d1eed318080c24004905acbbaa2f979d93dfcc0
 MISC metadata.xml 807 BLAKE2B b7480d37223342e7c77327d2dc33bf7debb5436ed2ef5a4633a28e9eb2c8def8b5b44c8c66117297de34129f44d8e43870c625839c02b8684f2801d4ca1b59a3 SHA512 95fed51c49f34cab69fafbc0d814aaa63c302d3443bf9bfefd18bc6bd57d337f0329de1eef0f5656dcf5741d7046b6eb64d780dea1a8d24a9c131dc05dd51503
diff --git a/app-emulation/libspectrum/libspectrum-1.5.0.ebuild b/app-emulation/libspectrum/libspectrum-1.5.0.ebuild
new file mode 100644
index 000000000000..aec492d2edec
--- /dev/null
+++ b/app-emulation/libspectrum/libspectrum-1.5.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Spectrum emulation library"
+HOMEPAGE="http://fuse-emulator.sourceforge.net/libspectrum.php"
+SRC_URI="mirror://sourceforge/fuse-emulator/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="audiofile bzip2 gcrypt zlib"
+
+RDEPEND="dev-libs/glib:2
+	audiofile? ( >=media-libs/audiofile-0.3.6 )
+	bzip2? ( >=app-arch/bzip2-1.0 )
+	gcrypt? ( dev-libs/libgcrypt:0 )
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-lang/perl
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/remove-local-prefix.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		--disable-static
+		$(use_with audiofile libaudiofile)
+		$(use_with bzip2)
+		$(use_with gcrypt libgcrypt)
+		$(use_with zlib)
+	)
+	econf "${myconf[@]}"
+}
+
+src_test() {
+	# check only builds test executable but doesn't run it
+	emake check
+	./test/test || die
+}
+
+src_install() {
+	default
+	dodoc doc/*.txt *.txt
+}
diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest
index 461914deab02..3fbe3456621f 100644
--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@@ -1,11 +1,11 @@
 AUX xen-4.11-efi.patch 1971 BLAKE2B b24f9315cff7f2de2a945088363429b9f4dd7a4101d3f1c0d4bf9733189808f5e1c47f1d90d1784f17fa52ca1626972c81d20c5e1ee3d42d082cdefcf67eb8dc SHA512 17208dc107f4ae4c5ec226c2ac05126817134fb6084cd8923204dc1b014e645e12c34cd11296319127e595ccbf17747931e9df78218bf49814f66e3cc6a789fd
 AUX xen-4.14-efi.patch 1969 BLAKE2B dec62e9b04ce23025443caa68df2fd69c50a3fdf650bf26047b28f3a72d1aa58124127274cd2c1373a4e133784b2691145c49c9a182bd635aa9c60bb1e45a0c1 SHA512 3e32aac5ba2ec371a3877d64532e8d134c3b4fe3a6644477ee8ecf56cbb8378b20f9d5d7415bec891d96910550a787848779c82ee4b9d57046f4c13235531ea0
-DIST xen-4.13.2-upstream-patches-3.tar.xz 63660 BLAKE2B 80abc9529ff49e782b64d4b5032f724e7d95fd255c2a06b7065c693d5765e1db1df44ebd5ce00c5a1e1ff24e1e5d344b0c2e459c68282e58fa20963e208272d2 SHA512 35288a1feac1316c33586dad55685e2c6a30100795e31852f78455003ce3dd6906074bea023655ee545a97fe4a0a8ad9a05ab91fd83186e61e5b57d10aa6b155
 DIST xen-4.13.2-upstream-patches-4.tar.xz 65324 BLAKE2B 0e71e4600fffcf1341a52103a6318485c1da54101ec59dbdb9824be5a5ed1f977135a9c3e4ce48cf14922aa0a2e3ff5097dc870286e3b142d060c22d78079cb3 SHA512 3f0e41b685655c7753204862ea6b8e502ff4b4f76e4788ca07ab93a4bb3c636d24ad933c578f7c6e4c866cfb0d6b7b7234124da7c2fed0a4b34f2fbe401c56e1
+DIST xen-4.13.2-upstream-patches-5.tar.xz 76580 BLAKE2B 8eeab100c14d769174e7d935d4e081ffc2d72b771f8022ce5c31b89d860ddba5381baf55b87443dc3bc555b404595492d30bc7f2a103c77762004acfce70446e SHA512 5dd5c63267e9542626315efec94642901cff55f4a1f8148c58f86677254381242fce3d6c5c0ae72665b452441c54647d0b9a132a2a18ffb4ff7eaad86ef227de
 DIST xen-4.13.2.tar.gz 39037826 BLAKE2B ad2b7c3003ca29e5e60a85c581f706ef87d99eadf939ed36ebe8f6698582f7a29dbdaf502039b60a0afe7ad4ae6ce89713e69dc8b8a7d5abe65063da7f1baa5b SHA512 cd3092281c97e9421e303aa288aac04dcccd5536ba7c0ff4d51fbf3d07b5ffacfe3456ba06f5cf63577dafbf8cf3a5d9825ceb5e9ef8ca1427900cc3e57b50a3
-DIST xen-4.14.1-upstream-patches-1.tar.xz 11676 BLAKE2B 0d593b34e3b1b95b57c54ccc96666eb5bf36d63ba742dd9d6e6f5facdf57be62e1f8375beb23926967e6ea23c1e4fa459bb5087652716d7e45b2309440f81b0d SHA512 e530883d17738b4821fa36fd39a7597bdb42810e40740c7a3363c22945d71af80312340f6d33b18f5999498e59036f22033b7babe217bac7700702d007d5d881
+DIST xen-4.14.1-upstream-patches-2.tar.xz 22920 BLAKE2B 890cd9bcc3c72b4ed192476a913de0377d50ddeb180e0d6dc4720e86662387a699ad74b263adf2b867b2421fcf3efdcacaa17bf581643afc50c9dc7e8a3dfc60 SHA512 ca0e53f40fe23d9a6c6374b460fcc0c8063e511f03ca86c02291fcb73bf9f91594de6fd615609997e0aac2e9c59ccc8512e4151a1d2646a70f3b5bacd95ad325
 DIST xen-4.14.1.tar.gz 39970115 BLAKE2B 21e5838b2b4d78420dcaaae2b8fc98ac876230217e6a3764aa643920150b8cef96025663e6a2fc423ab15f7f470b62547e91ce1be0337fc78f00c148c7ff40ab SHA512 c75cbec82793435f5a7026626ffdb2e9a2166b42d2be4b2f1194240e0312458124f0ebd53eeb02ce7330c22afe402a28a96b32f8af66e41e9416fe94535724c9
-EBUILD xen-4.13.2-r4.ebuild 4443 BLAKE2B 2df57309d69ec69f73e83715e1aaf0f3a273f2adfc756d87a0939b42d1c2c2688fcc755ffd5609a7281648ba9e3ba63114503d4647cc93111bd93c925f5b75f8 SHA512 8b121636cfa76c024b7dd92a0757714133502d143d42587cec19a39514356bd75a2d0b82cb4547ac7ec06370acda9dcd27991f09fd722a79d537aaf9fdaba16a
 EBUILD xen-4.13.2-r5.ebuild 4460 BLAKE2B 8d0dda6a6c205410d844b8360d2f87de162613882c76f94ea0fde3ca39d30dd75d57b1e18963d22203f19138d3ceb1bf13a6281e8c40e213f1f749374bf73314 SHA512 4789c3808a7631c17df0194435da037ed26d48a68b179aef1638809e793d2ef761cdcc7c4d46f8186273cc9813da3f36090722fc619579affeec16ccf7871ba0
-EBUILD xen-4.14.1-r1.ebuild 4461 BLAKE2B 9f3674fcb933e69643d915a1a1954b2b43b6f99b1e38f79142733d8627b254e52c74b20455b735300719d995f2905a193883ba459bd30c9a4443ca1f880495ed SHA512 c1a2c4126a2544ea1db06d07127ef8c713c0e7be5d6c99352bb276f1e99baa5bd0fad14d2c0e3e00b0a682600be8d18e6165fa98b2fd72f3365a643efaeb63a1
+EBUILD xen-4.13.2-r6.ebuild 4461 BLAKE2B 51ec4190284c97258c5eee7769b0bd049fb63be964dc1077010a432b922ec484659e09864006a4186b0b177c9933da0bfc9e3c82cd018107ff46db5631710bcb SHA512 fc3dc7a4e67118f1d744d197111fdc8d9f74832a27d0142282fbc59f7a064421ec7e4913a179ffa293987434ac6b7d30e917c0fedb6d9c0a8f547d050c5c9bdd
+EBUILD xen-4.14.1-r2.ebuild 4461 BLAKE2B dba0b2e36c540adcef17e9ad611b15937f139cdea43732397f1825b8a2d5b03bf3c30d7b86e335cadbabf3dd4993e8a911e90789898d0900f0664e872c41c1d2 SHA512 32d97681abf3a0a9e17825e088a7221b577ec7902060c3b7a420de388c6ae48657350ec214886802479591a5111f1c6aece6430b38b5afa20e91ed07e272bf17
 MISC metadata.xml 675 BLAKE2B aee4c4775c388078e51a97212be21fee3ddd4771121a129b7ddf0e2454dc3bd91f4fa1a2ce2a2057c655a0d32ae9631c9fd29a77a247601867949be4aa79de26 SHA512 f77204ce3cffb9c453c779de4cb7e41591972c5b59567a88d02ba079bd6f827d4aec23d9ce7c28b3affcadd370858cb1e66f6448b32e0dfb795af6a1be8598d2
diff --git a/app-emulation/xen/xen-4.13.2-r4.ebuild b/app-emulation/xen/xen-4.13.2-r6.ebuild
similarity index 97%
rename from app-emulation/xen/xen-4.13.2-r4.ebuild
rename to app-emulation/xen/xen-4.13.2-r6.ebuild
index 4c38268d9b14..43eeeb028b8e 100644
--- a/app-emulation/xen/xen-4.13.2-r4.ebuild
+++ b/app-emulation/xen/xen-4.13.2-r6.ebuild
@@ -15,8 +15,8 @@ if [[ $PV == *9999 ]]; then
 	EGIT_REPO_URI="git://xenbits.xen.org/xen.git"
 	SRC_URI=""
 else
-	KEYWORDS="amd64 ~arm -x86"
-	UPSTREAM_VER=3
+	KEYWORDS="~amd64 ~arm -x86"
+	UPSTREAM_VER=5
 	SECURITY_VER=
 	GENTOO_VER=
 
@@ -138,7 +138,7 @@ src_install() {
 		mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
 	fi
 
-	emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install
+	emake LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" DESTDIR="${D}" -C xen ${myopt} install
 
 	# make install likes to throw in some extra EFI bits if it built
 	use efi || rm -rf "${D}/usr/$(get_libdir)/efi"
diff --git a/app-emulation/xen/xen-4.14.1-r1.ebuild b/app-emulation/xen/xen-4.14.1-r2.ebuild
similarity index 99%
rename from app-emulation/xen/xen-4.14.1-r1.ebuild
rename to app-emulation/xen/xen-4.14.1-r2.ebuild
index 92af1429434d..fb4f1614c207 100644
--- a/app-emulation/xen/xen-4.14.1-r1.ebuild
+++ b/app-emulation/xen/xen-4.14.1-r2.ebuild
@@ -16,7 +16,7 @@ if [[ $PV == *9999 ]]; then
 	SRC_URI=""
 else
 	KEYWORDS="~amd64 ~arm -x86"
-	UPSTREAM_VER=1
+	UPSTREAM_VER=2
 	SECURITY_VER=
 	GENTOO_VER=
 
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index e5f047a7e3c8..87bfa54f8b34 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/xmldiff/Manifest b/app-text/xmldiff/Manifest
index 4f0bf71512a4..359a1d8737b5 100644
--- a/app-text/xmldiff/Manifest
+++ b/app-text/xmldiff/Manifest
@@ -2,4 +2,4 @@ DIST xmldiff-2.3.tar.gz 92561 BLAKE2B f18805a9aa00a99a3f63640de60d3ea37393208ade
 DIST xmldiff-2.4.tar.gz 93437 BLAKE2B 9f0001da8e39b7a3e7d0af052ce60a43899b2cd644b3fa6c6cb7cfa08ebf71439bda3e3dc6cf497120f20cb0f9346b0a074b8e442b42531fd3bdbaaebdf73bf6 SHA512 d8a0c9cb850259b3288d8fb5fde50c69f24036bc46ea48f24f3d63c592ccdd2aab4daf416f0f75b38fd70cc58e00c12db626e61a983d1a002972a6720d62c6ae
 EBUILD xmldiff-2.3.ebuild 634 BLAKE2B 0a8b7df2c86fe4b6a1446284dd82957c15a4172eb8972c57a52060e9f8ec8ae75b5ebf87ab8cfc352373b4ab820ec729894b49c28f73831b7dc0010a62329d00 SHA512 201f5ebb12312e61900cbc7dbc664723a02d345bfecfbf48ecbd9f4151c7d41ad934e9b0177620b472981a152e6e0b0dc7bbef5e6f4d811ebaee88e25b6c84e2
 EBUILD xmldiff-2.4.ebuild 638 BLAKE2B 1d359e9782b14a28ad024906e3fd49bcbf76ce7d3e3bdc91be8d4c29b93cc668e4d5ecbb331f0b54a09392e3e50bebe16e61a1485f012a1ccb0eb7d7b8c5d3de SHA512 9d6ebc21102bb07aceaf5c84c9b5fd42e9e9091b066f0d7f8e48ab0b547e9e8d8cd07e68e41979ad0ead1d58fd33e38db52545ec0a34cdcb8a412d1301dc33b5
-MISC metadata.xml 806 BLAKE2B 18be31c3294138fb3388f87db3b7675901fd485ecbcdbafc4e06ccc21eabd575b2b8958d46ac2c919b56c60cfa8d42f0de2b10e3f368bc2fb2fd95091228eace SHA512 352a7118a35f2c4de0678431e6cf09b11eda71859b91b9438703391c7d7aaf745fc33f6fdbf435fedf3d353f32fe8cb119607f5e1e597499c674c2cc6bc734e1
+MISC metadata.xml 571 BLAKE2B 683529e9b239a0cb78efd35dd49ec77b50d251bd8f3468fcd368aef74bde57072438d1f39f0641a51a34c961aea74469e8c52061fbbdcff564a24c220d28c0f3 SHA512 3cada00af2e714f7c33e1c79de4276d107d4162a5f1d6d468724e128988560f1fc27ae2733f3db7f962c9ea08cef40f4333c624e957ca73d2153ee9941f28f62
diff --git a/app-text/xmldiff/metadata.xml b/app-text/xmldiff/metadata.xml
index d91236e8ec60..32124eb5f86a 100644
--- a/app-text/xmldiff/metadata.xml
+++ b/app-text/xmldiff/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>andreacerisara@gmail.com</email>
-		<name>Andrea Cerisara</name>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>
 		A python tool that figures out the differences between two
 		similar XML files, in the same way the diff utility does.
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 565af7df0d6d..f61345096ebc 100644
Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ
diff --git a/dev-db/pg_activity/Manifest b/dev-db/pg_activity/Manifest
index fb712860cf2f..c95a7a7c161e 100644
--- a/dev-db/pg_activity/Manifest
+++ b/dev-db/pg_activity/Manifest
@@ -1,3 +1,5 @@
 DIST pg_activity-1.6.2.tar.gz 127561 BLAKE2B 5ddebd3068ddc33196903892c01b947ffc50ecff7ec790e196626e87ee8933ff79242e3ba61c207ea1020535c5d85dbbc4ac9e4825a19ab98004bb27ea0b6a6c SHA512 fd743f369201c6ec3762373c39969b2b7632d79a8fb9c8ebd12a88b66b91915c30e445e93162844b4a176cf7e13009c9c8136e973180b00e7cc708ecd66b4853
+DIST pg_activity-2.1.3.tar.gz 277297 BLAKE2B 9677ebad581e2e66e266e5433454e054274693a8e2e5a959c5f807ec1641f3b02a4c202eac7bddb7abe7e51e131d32d25a513a439e97aca996e79be6e1e9c0be SHA512 e28c75d1b88f6b530820d82327d6428d2388341bd09ba4efec5e80e753aee17e995b4e6d5ee8b35b3b972f20aa1228d525fe0c4bdcb8e365795d568a4a25c076
 EBUILD pg_activity-1.6.2.ebuild 624 BLAKE2B 023b6368bd071c1fc01eddac90d205293bf0d6edde9a315e8549fe5c20ca8e4fa7048213a9e5e1ecc83c0d8241868ad3593de6fcd572ddead29198a62c9e8704 SHA512 121f3dc7c5d348d27bfd999e5d4dce387466d4a593dfa0aab4f20f1a1d6af80db03c617d340e3976e59b5c3e6fdc63ce73d8201241c540e53c3c1deb1e501151
+EBUILD pg_activity-2.1.3.ebuild 988 BLAKE2B 69eeb374337b00713cb593f0ba2eee64bf644aec89183105678797205b871ed0e1c67cdb0754eadad4694dbe951d41a4ff544c63bf14d3906cff4a4fd09c694b SHA512 4a03d3b88b369f1be169ca542a0e567d4f4099bb729929d1a428473bf9de9174c254d60d0cfc9ed8b9ae95d0214a50da3f6ca5f508a66900a21cd286d6b318d5
 MISC metadata.xml 339 BLAKE2B 216c15e347a9dd6061fa95a90fe2a6b5b14f9dcfe7dce8a36376f28dc1c30bad6ae505247d1a5133bf9d8c1d0d61aa07b0f827f1547d563a5046a40e300896ef SHA512 e4b44855c8acd726e3e43cf79e4706077edb2cbccb955ed70c3fe44ee91ed604a057d8b612e4f3950387ee8c96b3fc77fd8e5696e63b896280a243506c7c8853
diff --git a/dev-db/pg_activity/pg_activity-2.1.3.ebuild b/dev-db/pg_activity/pg_activity-2.1.3.ebuild
new file mode 100644
index 000000000000..745e50c6b85f
--- /dev/null
+++ b/dev-db/pg_activity/pg_activity-2.1.3.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=( python3_7 python3_8 python3_9 )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Realtime PostgreSQL database server monitoring tool"
+HOMEPAGE="https://github.com/dalibo/pg_activity"
+SRC_URI="https://github.com/dalibo/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+SLOT="0"
+LICENSE="POSTGRESQL"
+
+RDEPEND="
+	dev-python/attrs[${PYTHON_USEDEP}]
+	dev-python/blessed[${PYTHON_USEDEP}]
+	dev-python/humanize[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	dev-python/attrs[${PYTHON_USEDEP}]
+	test? (
+		dev-python/psycopg:2[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	# https://github.com/dalibo/pg_activity/issues/201
+	export COLUMNS="80"
+	epytest -k 'not test_ui.txt'
+}
+
+src_install() {
+	distutils-r1_src_install
+	doman docs/man/${PN}.1
+}
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index ff989ac693e7..4649f8712147 100644
Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ
diff --git a/dev-lang/elixir/Manifest b/dev-lang/elixir/Manifest
index 01a0c63b4ae7..094c2e0fa045 100644
--- a/dev-lang/elixir/Manifest
+++ b/dev-lang/elixir/Manifest
@@ -4,6 +4,8 @@ AUX elixir-1.11.2-mksh.patch 2058 BLAKE2B 45e14921fc59f5707ee9bc2aaebea5f090a599
 AUX elixir-1.9.1-disable-network-tests.patch 569 BLAKE2B fda6b9b99f80e81883723280de31933c1740167d41ef4783dc663bad277cf58b8782326abc4a72e0d989c513afb9cdf4494e7d79754b18d62baf75255a74aa45 SHA512 465831a389891680412d51d9209497d5b750ff0a5ff72d45807a7dba6ec7757156ee96048bbc81f46c9c24a5b13cdd5161539fdeb4ffcea655c407e29f6675fc
 DIST elixir-1.10.4.tar.gz 2331003 BLAKE2B 8cb54bcb16762ae345ad9d36a25c28696fd5bb57cf97c5037c21458671e001cfe51a722287243c6a70fe3cea65c9c219e759c8312fc168e93974ac5f0870b47a SHA512 844e405cf344539a9d32dc7f1ead0dc1dfb0d70a9ab718269f4e25e5262f611f96346f5be93cf8e34a75c58c6aabb12e8a796c5cb182955922510c270ef169e7
 DIST elixir-1.11.3.tar.gz 2394406 BLAKE2B 066e11651265d63c713809f1968b7dc7faf70e8254ef0aec1978a3db0f92da6bb894e882a1a6c1ba8da13d234c91dc84d2d750b0e044e4cd8706986ec7b2f382 SHA512 4962bb9fcf5f4190a8da22a3e42df5b4e521d73771f6a067edb482b911b0f9fbd2883841d06d94ae4ad6b1db2f61f691e5de4c118c722a16f95830c67ce3e45b
+DIST elixir-1.11.4.tar.gz 2396885 BLAKE2B f63e835991420bce8cacd38a920637aa5656c0372bd09e8c0a357a24bcca9a06350973f1453f482d3854a48712471c55389c3bd530df46a19c20a359376b779d SHA512 5dc940a31a31ae1c1537f874c15e58311cc0b0452f61e923bdfde0a5cfef3d8003eb3e85be320eb0acfb7bc0c0c0dc8ac965dec6727257c244048268fbf38ceb
 EBUILD elixir-1.10.4.ebuild 883 BLAKE2B c8945f6c84ce2ba4ef99b42f5f0f3c262cfb6d743cd418f66113cab8a9a90caf1ddc71441d96b3755e9025974688909d8306b63ded24d871733d263c54df1d56 SHA512 a3581664d0fe5c49bd7c4ed2b6f2fba7c4b402944daf7c79e79acbd7ffbb463c17e559d961f7abd3c54c5ca5e6d23520e379a5712d7d232439b5c878291cb3d7
 EBUILD elixir-1.11.3.ebuild 922 BLAKE2B 718117a8aee4294e70930d45d6b39d6522026c48165b9af54eae4b612458509e456586e8c6a256175ed4e66a6e36293d22d65d69b1fb40ec28efb6ee1b511fbf SHA512 e77cad093155fbcbab5247c18c4c45db407df167c296d9587c19826d303c0e38f431bb4c3ea61537dbfd0c211d4917ce08a38c6f6a2c7fb1c6040c0e279c9b8a
+EBUILD elixir-1.11.4.ebuild 925 BLAKE2B b0dc8a5e279524bf5683c635558992fb91e7dc943c6991601537b2273bac0b0a03b78618198bfbd4d8c40d55ca3e385bcac9c375d6a63dfd26af5c2530ca9441 SHA512 07c8f268f96f3fdaec2ae82762475fa1a94e4d5250786b2cbdb4ee5991d6486fead55e9d6d2c70aa11ed494e79c0720b4da65f79fe53533b9d22fefc971b511b
 MISC metadata.xml 820 BLAKE2B 7fd55cc9f7450d46060069909506fb74e93234ccd319b5f5b428580fd4f55c59c2ada78770ae744d784838574d87522d3e94f101eba06b5a64ebcb513db4eef3 SHA512 11300d8d6d6cbb73b55d4dfb44d04fc087867bab1fc3fcb0564473d911844d3be148170c03a9247c6a407d8de88442ca6017c00177d93be46b37166d3ba42593
diff --git a/dev-lang/elixir/elixir-1.11.4.ebuild b/dev-lang/elixir/elixir-1.11.4.ebuild
new file mode 100644
index 000000000000..4c9e14b12b16
--- /dev/null
+++ b/dev-lang/elixir/elixir-1.11.4.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Elixir programming language"
+HOMEPAGE="https://elixir-lang.org"
+SRC_URI="https://github.com/elixir-lang/elixir/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 ErlPL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~sparc ~x86"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	>=dev-lang/erlang-21:0=[ssl]
+"
+# 'mix' tool collides with sci-biology/phylip, bug #537514
+RDEPEND="${DEPEND}
+	!!sci-biology/phylip
+"
+DEPEND+="
+	test? ( dev-vcs/git )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.9.1-disable-network-tests.patch
+	"${FILESDIR}"/${PN}-1.10.3-no-Q.patch
+	"${FILESDIR}"/${PN}-1.10.3-epmd-daemon.patch
+	"${FILESDIR}"/${PN}-1.11.2-mksh.patch
+)
+
+src_install() {
+	emake DESTDIR="${D}" LIBDIR="$(get_libdir)" PREFIX="${EPREFIX}/usr" install
+	dodoc README.md CHANGELOG.md CODE_OF_CONDUCT.md
+}
diff --git a/dev-lang/mlton/Manifest b/dev-lang/mlton/Manifest
index 28923662a3a7..2ea39c405493 100644
--- a/dev-lang/mlton/Manifest
+++ b/dev-lang/mlton/Manifest
@@ -1,6 +1,3 @@
-AUX mlton-20070826-no-execmem.patch 1236 BLAKE2B 1d708bba547f8ea3076bdd494a5e45f8352430b9a852c45296258b6371fd2bee07a7d2d9cb224bc426e8c364b07d8d37b92d98d6fc186b0217b0650ac961e128 SHA512 d6f323bc181656fbdfdf25e0472e7e13e93b565f3ba64ea9cc81fbcb6c935580c1811f783035a5b1c45be082a38f157610666276aad9fb36d3fdb009fe7ce1c9
-AUX mlton-20130715-no-PIE.patch 2399 BLAKE2B a0af01c4eea65a38d788744f593303d8732a754de19230ce13ce14ce6368058840e9076934311385bed7951d94f1daed878847a57e70ac9330f4af575f35c1bf SHA512 ef0d675acfcbe05c1f810da2b9d684b4412a0f283e6025930c13d80912036ffc650972664f5a4fdd955e4c78c3564c751c1ba9bf279f738eca96801eeb57f0b2
-AUX mlton-20130715-split-make-for-pax-mark.patch 556 BLAKE2B a98f9a6b01edfc19723ef20eaeb0e9046162e179f3c63c69f59d07a39e0b723c4b429c3f10adb6099f912340431e8ea7b06a63d397cb8feff46d3d7d256a0e22 SHA512 9d334c930abe38f222bdd16c7dbdb0b1e0a70955aa8832fd441c9443c53f9d66c3ec49c06f59de501c014a66c6265a6df64269e0534c0ffdae0115718febb694
 AUX mlton-20180207-bootstrap.patch 980 BLAKE2B 4128d0d3aae1e30c6b234e9cc3e0d91ee6de7338e2f8d4e8da7bb5b63ea62138db3148f8ec9ab16966983587dac7c9040a52aea80d21409d5d8fdbb020d13f7f SHA512 7657185d7f4c4e9bff4fd44f3991cd3d115ea0e1e4f6c3b702ecba74a3b2fcb7c1c0c47a814dc26bd3af7a523a92aac50df4d4ddb873eba938c2689ac6b5cf0b
 AUX mlton-20180207-paxmark.patch 728 BLAKE2B 05bb27260dc8007a815ce74276a537a48127b4c336472afca571c39b0e29368be5be79ae03c21940dde6bd37f79613817adc8f22d986d570fab4cb184051b141 SHA512 78526ab383f481663cc892938f74ad1783aa7a2b1fcfd7032a67c4489daa5d141877806fb16232b8f0843e7b4e001d3f76a9a171a8da6413cd921688f493f7f9
 DIST mlton-20180207-1.amd64-linux.tgz 18772644 BLAKE2B 7fe2d9db7edfb2d3e301be88e90b7dffe1441ff315ddac1464ef42fb436be1a9dc4e2c03fdb93880779360aed04cb7662a1a5a733f2d4158082d228f718d8b93 SHA512 74ab847ff567cde365a113f8819bae69cc18df20c441a6c6666b600980d2687faf143311f42be21a261b2493dc5c45fbecb4737c599cf767c3680afec06c2e0c
diff --git a/dev-lang/mlton/files/mlton-20070826-no-execmem.patch b/dev-lang/mlton/files/mlton-20070826-no-execmem.patch
deleted file mode 100644
index f4d4bdf540bf..000000000000
--- a/dev-lang/mlton/files/mlton-20070826-no-execmem.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 544930de3b1c754fa8803169902a63bce7cc02ba Mon Sep 17 00:00:00 2001
-From: Adam Goode <adam@spicenitz.org>
-Date: Wed, 6 Feb 2008 20:17:51 -0500
-Subject: [PATCH] Remove PROT_EXEC from mprotect
-
-It looks like mprotect is used here as part of signal handling.
-There doesn't seems to be a reason to have the area of memory
-marked as executable. In fact, on Fedora 9, this causes MLton
-compiled binaries (including MLton itself) to fail.
----
- runtime/platform/mmap-protect.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/runtime/platform/mmap-protect.c b/runtime/platform/mmap-protect.c
-index f0dea49..df42215 100644
---- a/runtime/platform/mmap-protect.c
-+++ b/runtime/platform/mmap-protect.c
-@@ -7,7 +7,7 @@ void *GC_mmapAnon_safe_protect (void *start, size_t length,
-         if (mprotect (low, dead_low, PROT_NONE))
-                 diee ("mprotect failed");
-         result = (void*)((pointer)low + dead_low);
--        if (mprotect (result, length, PROT_READ | PROT_WRITE | PROT_EXEC))
-+        if (mprotect (result, length, PROT_READ | PROT_WRITE))
-                 diee ("mprotect failed");
-         high = (void*)((pointer)result + length);
-         if (mprotect (high, dead_high, PROT_NONE))
--- 
-1.5.4
-
diff --git a/dev-lang/mlton/files/mlton-20130715-no-PIE.patch b/dev-lang/mlton/files/mlton-20130715-no-PIE.patch
deleted file mode 100644
index a059b1598bec..000000000000
--- a/dev-lang/mlton/files/mlton-20130715-no-PIE.patch
+++ /dev/null
@@ -1,66 +0,0 @@
---- mlton-20130715-orig/bin/upgrade-basis	2013-07-16 05:59:09.000000000 +1000
-+++ mlton-20130715/bin/upgrade-basis	2013-12-17 18:17:24.165889500 +1100
-@@ -28,7 +28,7 @@
- tmp="$$.sml"
- 
- echo "val () = print \"I work\"" >"$tmp"
--if ! mlton "$tmp" 1>&2; then
-+if ! mlton -link-opt -fno-PIE "$tmp" 1>&2; then
-         die "Error: cannot upgrade basis because the compiler doesn't work"
- fi
- 
---- mlton-20130715-orig/mlton/Makefile	2013-07-16 05:59:09.000000000 +1000
-+++ mlton-20130715/mlton/Makefile	2013-12-17 23:35:06.137421195 +1100
-@@ -106,7 +106,7 @@
- 	rm -f control/version.sml
- 	$(MAKE) control/version.sml
- 	@echo 'Compiling mlton (takes a while)'
--	mlton $(FLAGS) $(FILE)
-+	mlton $(FLAGS) -link-opt -fno-PIE $(FILE)
- 
- .PHONY: def-use
- def-use: mlton.def-use
---- mlton-20130715-orig/mllex/Makefile	2013-07-16 05:59:09.000000000 +1000
-+++ mlton-20130715/mllex/Makefile	2013-12-18 07:03:29.592171611 +1100
-@@ -21,7 +21,7 @@
- 
- $(NAME): $(NAME).mlb $(shell PATH="$(BIN):$$PATH" && "$(MLTON)" -stop f $(NAME).mlb)
- 	@echo 'Compiling $(NAME)'
--	"$(MLTON)" $(FLAGS) $(NAME).mlb
-+	"$(MLTON)" $(FLAGS) -link-opt -fno-PIE $(NAME).mlb
- 
- html/index.html: $(TEX_FILES)
- 	mkdir -p html
---- mlton-20130715-orig/mlnlffigen/Makefile	2013-07-16 05:59:09.000000000 +1000
-+++ mlton-20130715/mlnlffigen/Makefile	2013-12-18 11:55:33.590660407 +1100
-@@ -22,7 +22,7 @@
- 
- $(NAME): $(NAME).mlb $(shell PATH="$(BIN):$$PATH" && "$(MLTON)" -stop f $(NAME).mlb)
- 	@echo 'Compiling $(NAME)'
--	$(MLTON) $(FLAGS) $(NAME).mlb
-+	$(MLTON) $(FLAGS) -link-opt -fno-PIE $(NAME).mlb
- 
- .PHONY: clean
- clean:
---- mlton-20130715-orig/mlprof/Makefile	2013-07-16 05:59:09.000000000 +1000
-+++ mlton-20130715/mlprof/Makefile	2013-12-20 14:02:50.292677796 +1100
-@@ -21,7 +21,7 @@
- 
- $(NAME): $(NAME).mlb $(shell PATH="$(BIN):$$PATH" && "$(MLTON)" -stop f $(NAME).mlb)
- 	@echo 'Compiling $(NAME)'
--	$(MLTON) $(FLAGS) $(NAME).mlb
-+	$(MLTON) $(FLAGS) -link-opt -fno-PIE $(NAME).mlb
- 
- .PHONY: clean
- clean:
---- mlton-20130715-orig/mlyacc/Makefile	2013-07-16 05:59:09.000000000 +1000
-+++ mlton-20130715/mlyacc/Makefile	2013-12-20 15:01:26.567775876 +1100
-@@ -41,7 +41,7 @@
- 
- $(NAME): $(NAME).mlb $(shell PATH="$(BIN):$$PATH" && "$(MLTON)" -stop f $(NAME).mlb)
- 	@echo 'Compiling $(NAME)'
--	"$(MLTON)" $(FLAGS) $(NAME).mlb
-+	"$(MLTON)" $(FLAGS) -link-opt -fno-PIE $(NAME).mlb
- 
- src/yacc.lex.sml: src/yacc.lex
- 	rm -f src/yacc.lex.sml && \
diff --git a/dev-lang/mlton/files/mlton-20130715-split-make-for-pax-mark.patch b/dev-lang/mlton/files/mlton-20130715-split-make-for-pax-mark.patch
deleted file mode 100644
index 3286d44e3522..000000000000
--- a/dev-lang/mlton/files/mlton-20130715-split-make-for-pax-mark.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mlton-20130715-orig/Makefile	2013-07-16 05:59:09.000000000 +1000
-+++ mlton-20130715/Makefile	2013-12-27 13:29:35.259563131 +1100
-@@ -58,7 +58,7 @@
- 
- .PHONY: all-no-docs
- all-no-docs:
--	$(MAKE) dirs runtime compiler basis-no-check script mlbpathmap constants libraries tools
-+	$(MAKE) basis-no-check script mlbpathmap constants libraries tools
- # Remove $(AOUT) so that the $(MAKE) compiler below will remake MLton.
- # We also want to re-run the just-built tools (mllex and mlyacc)
- # because they may be better than those that were used for the first
diff --git a/dev-lang/moarvm/Manifest b/dev-lang/moarvm/Manifest
index a94a47007194..731e026bfa6e 100644
--- a/dev-lang/moarvm/Manifest
+++ b/dev-lang/moarvm/Manifest
@@ -15,6 +15,6 @@ EBUILD moarvm-2020.09.ebuild 1467 BLAKE2B c20140017696176cf63a887c76bbd511a69349
 EBUILD moarvm-2020.10.ebuild 1467 BLAKE2B c20140017696176cf63a887c76bbd511a693493aa0fcad043a4919871f5eac4ee67d686b8dae5bbdea08576f5d576118064f41cfa4aefca8b55d6121eef20e1f SHA512 db2302a7eee365b212c122eb3389f417d34fd68ef828c705e992cf7e38283fc61343d4fc70a69d9d6677e4047ac698c173d2d2ceb2def85de46389e04803ae93
 EBUILD moarvm-2020.11.ebuild 1449 BLAKE2B c54c97f3c62bac54d140d3bd881cc616434fa88909dfa76f1168a22b9ea3acf346e06573cdb082e306bbc9b134b1ce82f3efbb760eedc91552f37cdbcbbc4fee SHA512 125e657028ada97b7e7cc5fcdcfec2a05450a494110aac1698fadd06465518423b5032f42f5a41692b3a8fb98964e3d8d225e1e6956fffb65937d6e637c670fb
 EBUILD moarvm-2020.12.ebuild 1449 BLAKE2B c54c97f3c62bac54d140d3bd881cc616434fa88909dfa76f1168a22b9ea3acf346e06573cdb082e306bbc9b134b1ce82f3efbb760eedc91552f37cdbcbbc4fee SHA512 125e657028ada97b7e7cc5fcdcfec2a05450a494110aac1698fadd06465518423b5032f42f5a41692b3a8fb98964e3d8d225e1e6956fffb65937d6e637c670fb
-EBUILD moarvm-2021.02.ebuild 1462 BLAKE2B 2e8676db60a8c03ec4c284f99285efaea1898aea9e11e6fbdd5779e7e313f9649089bb81ba02ca7c71b2d2d4d7aa91ac25a83974beffe431c5ff76aa9a2d2979 SHA512 d51d33f67857a4d4620bb0d7af5a3bbbd97f7ce10c54efa91961ab6a195c9ef0483c4da92fabdb05868d10fe729adb72f1035d91661a35d6444b8b3539e0e7db
+EBUILD moarvm-2021.02.ebuild 1449 BLAKE2B c54c97f3c62bac54d140d3bd881cc616434fa88909dfa76f1168a22b9ea3acf346e06573cdb082e306bbc9b134b1ce82f3efbb760eedc91552f37cdbcbbc4fee SHA512 125e657028ada97b7e7cc5fcdcfec2a05450a494110aac1698fadd06465518423b5032f42f5a41692b3a8fb98964e3d8d225e1e6956fffb65937d6e637c670fb
 EBUILD moarvm-9999.ebuild 1736 BLAKE2B 9f434f8561c55716165952dce8e35bd3659fbd0f3a42f688049e023faa0f10c4aa245ca810279ae80527c4ec5fe5c514bc5ae534aa30e839693657ce68fc7f9c SHA512 5867e2ee90401a86cd0341d8ab5ae75fecb7d366d88e1269439248686942b5c1855e45857b4388491631b26361aac3b0495d7214158931e955655a34d557fada
 MISC metadata.xml 920 BLAKE2B dc15290595649a4f4c514f26cd219c3d8a97bb589fedac8cca202b64abe49f6851fe50d24f95f82c0dd61d183ed1f4091a4fb0f500e8f89a9b91dd7e932cc1ff SHA512 9250682955318d688f59e27b740e1b04095a85f036578d8fe2a2eeb31e159e34845a191734ba4997034dca80a32e29c8f4a0658b9a76ea78ff5fb4479124696b
diff --git a/dev-lang/moarvm/moarvm-2021.02.ebuild b/dev-lang/moarvm/moarvm-2021.02.ebuild
index 27ecb3b89048..df017e9cd54a 100644
--- a/dev-lang/moarvm/moarvm-2021.02.ebuild
+++ b/dev-lang/moarvm/moarvm-2021.02.ebuild
@@ -9,7 +9,6 @@ MY_PN="MoarVM"
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git"
 	inherit git-r3
-	KEYWORDS=""
 	S="${WORKDIR}/${P}"
 else
 	SRC_URI="http://moarvm.org/releases/${MY_PN}-${PV}.tar.gz"
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index e8f6f7e46012..b0d1f80a5e4a 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -47,7 +47,7 @@ EBUILD python-3.10.0_alpha6-r1.ebuild 10137 BLAKE2B 411b359510370cd0d1fa7602bc9e
 EBUILD python-3.10.0_alpha6-r2.ebuild 10109 BLAKE2B 10d3497a3b1c2142a0b4df37eacddef81d8e7f500ce031256d84f3b69353d37fc3f996ebec8a3360b8fc9664b55b3f3b90f6eb44cf996e3df6e3462ca4f1bbfc SHA512 f462e316d5867ba9aee69c18442dbc088ddeef93e8df3f960a472ae46845e1138b3cebb2d7bc00d6fbf695fc0d7a6913f5990c102efd5bf023d93527d091342c
 EBUILD python-3.6.12-r2.ebuild 9884 BLAKE2B 6070ecc3e0b388012426d9591d87bdceed4ab7c76e7bfec69aca3a1980e0720fe8295b8d7fc9e5e6914fa68a4e7f3d146ff0f403a4959c5f9b750db46349a414 SHA512 f7f207e63071dfc4ff475d1106e970d83e6b03acb85ba09481a05f9279f96b2cccee6adae0ebf8a23c4ec9f5b8ccb74db4130270821457999075655c1e62852b
 EBUILD python-3.6.12_p3.ebuild 9897 BLAKE2B a3de467ac2e729268d122a6ba2572caf4671fd67526d0cb553755368d892340d03e06785b012cfe3d6aefaee2cce8aaac2ae397739210c8ed4ac859e1bfd8d89 SHA512 7b93d6ba30855586f451113c933555f1edc7efec3b97f6e6f161a32670f7717add5fde19effa6e5d712d834fb19dd8a4b727f608aa9d3231280664e75c34ed08
-EBUILD python-3.6.13.ebuild 9893 BLAKE2B a6ba4ffb71e6a4f9abbbcf4a5c5d7d6bce77375b905689aa1ce66d79b239ec432f4296b0535c24f8392c0749decac07b1f0b8c4377a310e429abf42e10a8cf04 SHA512 0101a6658f80051b14394375a11a3947094e02cec528d78e1e923b06b69ea0cc0bea496168d4b3c9ae7a8992ec8c29bafcd739bdb7f07491955d55f8596df2f4
+EBUILD python-3.6.13.ebuild 9892 BLAKE2B 85823ef6ed5265c577fcff0ad99ade598bde878a03f2bbd9d45f88dc41fef425a63c1635e07588df43b530d5bad050723c2b96a678c378ce9d8d4f24a2eab417 SHA512 71bf96b3a193ac51edff7b514ad350cc4edabb2d69b0bb13a07650a09818de6da72af2e4c4cd7da2990245e4cf242d41300f5840a8ba67acd84bf211c73b3dd0
 EBUILD python-3.7.10.ebuild 9698 BLAKE2B b5bb8bb80b19cffd30200b7f51ee2c659e7aa955dfe0acd2a29ce8c6511ff28053ca5c88e6e7cbcf83d65441b03f83e59173761c8e3326112d7776eb292bce90 SHA512 fcc7fe8e66ca19704603bb221a9865fcee6adca4c56c91677a91e930f69a89d4124ea185975f2f0534e7a0e3a88a2aed6fba8362dc3aea99d345371ce2ff5779
 EBUILD python-3.7.9-r2.ebuild 9689 BLAKE2B a7b010040fce4663b1693e36fd4f417a7774f4f72f3294656013d3c2ee6076cb1e8e3caf6f0ec76162248ba9db2bc73814e99c7ae83ddb2c59a4cc97f08fb079 SHA512 c59a1e356cca66351789f13b0aa78d322ea5d8e472746f120635a12bb5abba638f2f32033c4ccd0a9e986c7c531b85879772155ac47b194c8393d90384fc788d
 EBUILD python-3.7.9_p3.ebuild 9702 BLAKE2B 1732961443de66431d4363eef2d5ec0caa044afc102227bcf85efc51a6a9cdebe8be9dadfa1aedec7c757f478897d2af47c3fdbcbb9dccf05ff4f15b0509b957 SHA512 d6e2660554f8bb3acdfc93141ceb8132e9b880ff89bb8b3b12eb475a14c298b2141d1143e21470d378aace07d64f2169525aecd7d4be8c688db5918f5c2717e2
@@ -56,5 +56,5 @@ EBUILD python-3.8.7_p2.ebuild 9803 BLAKE2B af3770efda34e9281819b81cbfce96d8cb809
 EBUILD python-3.8.8.ebuild 9824 BLAKE2B 0ecf78715c2b833a54f2e6e4339f465047f650431d483228e7d3fa58b21ba1f30f33455ffd8cca50180a3ac492a06e105d22493e472ce6cb7f854131ee328e45 SHA512 e2500d7697c0dbce5ac20e9e8dfb91632097aba491ea4dac234c53706b0d775fd19d201fc9d01b3ca745f78a525c150006971c53c6a0b1af7da9e10044331c0c
 EBUILD python-3.9.1-r1.ebuild 9935 BLAKE2B 7c8f73800e02697200748e4beea21af471cd23664f6b35b40dc26d5f46fb3aa96c1bb3a4f2fc9038613b4117ddcb71586c68d3fefc1f6a646b083bdefff7a223 SHA512 f1536b40a0ccb25d41bd9f7933e1ec6391f367400a9a5b4a08541c7e4d69bf50c3235a20c80c84d7825611dd3c71adea7dceb476ffad2c5dfb316c3a6a6a0332
 EBUILD python-3.9.1_p2.ebuild 9942 BLAKE2B efad280cd9b6b8792defdb63e1618053e195a7c1421900032c1ade8de288a4fa6abd5f1705fd31d6f54740f5ed235c924b7244c816a6bf4ef5e32fc074926c92 SHA512 b9085e3ace1d842bd1e81b0882ece3249700936129cfd5f904635fb9c42a6e914c5699953a216e61663f3ed6fa4b3d6cc5f84af12048ffffce6b4d8ec846a12e
-EBUILD python-3.9.2.ebuild 9963 BLAKE2B fd59f863ac44c65b87d1d61c46b42966637adb2c3a542665a317014c26e31fc1a8e4c794bbf88da0f3b1f1f7061e5e420ba9e9a179e73d0aeca9e83ef1263570 SHA512 a5f7e1c6348c33041108022c15b780a90d685e9ed159fec9d3a1303cbe63946dd3ef0720c985ee0ec6893ed6583bec8731ef4be328933e6a72961fa425e138aa
+EBUILD python-3.9.2.ebuild 9962 BLAKE2B 3630079f824ca7cf90005c284da6293e7e78b50c2aa7a76961646f107de726b60e19200a7b82c8b99928d9386ea52c4cb2dc5205bb4cbc678813d5f374650de8 SHA512 07b4404d0d836ab6d271e7463bffae001c8d7fd5be6b8e99703a84feaf70df8b6db57ad19dca677102afa6ac3e10c464938b4314d6ccc2ab066b4643f130e7ab
 MISC metadata.xml 819 BLAKE2B 120c7c65d77488e726c5a0f4aa19469867ea6900e747169fae2f9cf8f14ec2936089d5edfe1935ce610bec26387273e261b1cc4b023680c8c4b229f2141a7223 SHA512 08f45707e5490067a21951b9d37c8ae67064ab67cccc5b8d8c204eab8d4a004fb910627b62989c67b849b89d301618f8f8f7996e99e1ef5bab38a239c49c124d
diff --git a/dev-lang/python/python-3.6.13.ebuild b/dev-lang/python/python-3.6.13.ebuild
index 9895dab7479a..7160fb22e843 100644
--- a/dev-lang/python/python-3.6.13.ebuild
+++ b/dev-lang/python/python-3.6.13.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}/${PYVER}m"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline +sqlite +ssl test +threads tk wininst +xml"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-lang/python/python-3.9.2.ebuild b/dev-lang/python/python-3.9.2.ebuild
index defe44939ba6..8fe2c15ca58a 100644
--- a/dev-lang/python/python-3.9.2.ebuild
+++ b/dev-lang/python/python-3.9.2.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline +sqlite +ssl test tk wininst +xml"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index b7485bafcb00..ca45f7243807 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/fddl/Manifest b/dev-libs/fddl/Manifest
index 5cba1ece46ac..ae9bb03c7da2 100644
--- a/dev-libs/fddl/Manifest
+++ b/dev-libs/fddl/Manifest
@@ -1,3 +1,3 @@
 DIST fddl-20111124.tar.gz 29608 BLAKE2B 5769edc935c4606cbc9662712ea05ff2cdd44646e36ef71a2b185a9efdd8655fd8ff0c7a0f0ed105cfee44f18c43815984771e7a74a2329adc29f6ff544fe64d SHA512 d9c4f3f4e10b92ffc158a8cd24726ac6f95050256178a17b6d11aefd4b5786452b17ee96e4d4f4762d07c372c248aba1f22cbe2c03cd6b0f709aeeb4d15a0266
-EBUILD fddl-20111124-r1.ebuild 1045 BLAKE2B 96a1e86d085cb91cb66f395f99cdc720fc93b11087bb5aed3dd751e310f4a3ec6cb5b799b13cc835d6f12afe6c4093d3e794d48508ff70ebfe2ffa193d68270d SHA512 457232f89f5aea21c796c777a432c343b8a785b7bbeb54d30ead9f96cd997dd27a66f9bfcaf4cfc7b395d2e22ae0c495d0f6cbf5c7cd88024e0296d145c2dc2c
+EBUILD fddl-20111124-r1.ebuild 1013 BLAKE2B c074eae4236d6cb6e58fa50484a4d128cb69351b1f0ce312b54aecfa1493924d7a527346b431dcb2baf824df690e03f6bfba8b6afd57c11d6a0500106b14b7f8 SHA512 8870e1d3cf7af6b6ce2421ae2b5e817fd0dad12ad9af68e3f8c524f508311224452a878825e9c50dfd31ae74165f12dfdf885609453e5b6c8e84586f3d637080
 MISC metadata.xml 388 BLAKE2B 04fbf4fd05fdfbcdd707e7d365979466d6df42ac6ab1af756263e6b468928c761266b1e949ff99ce83ac9be136bfc74862dff9ae3f766736302ec8e6b80f86c6 SHA512 bb5b6f0a1a76714330e83dbd98c6408326ebeb5bd2abcb89088daa835590a8101f5389ff23c5411af11916d66e24c7292438bdaf49cadd2fd79cb7b25b60fd55
diff --git a/dev-libs/fddl/fddl-20111124-r1.ebuild b/dev-libs/fddl/fddl-20111124-r1.ebuild
index 0e56e742f1f4..b25d4dd8bded 100644
--- a/dev-libs/fddl/fddl-20111124-r1.ebuild
+++ b/dev-libs/fddl/fddl-20111124-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils multilib vcs-snapshot
+inherit cmake vcs-snapshot
 
 DESCRIPTION="Free Decision Diagram Library"
 HOMEPAGE="http://itval.sourceforge.net/ https://github.com/atomopawn/FDDL"
@@ -12,12 +12,11 @@ SRC_URI="https://dev.gentoo.org/~pinkbyte/distfiles/snapshots/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
 DOCS=( AUTHORS ChangeLog INSTALL RELEASE )
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	# Remove references to files that were not shipped,
 	# prefer dynamic linking
diff --git a/dev-libs/libindicator/Manifest b/dev-libs/libindicator/Manifest
index c4dfa545888a..cddd8b4db9ca 100644
--- a/dev-libs/libindicator/Manifest
+++ b/dev-libs/libindicator/Manifest
@@ -1,5 +1,7 @@
-AUX libindicator-ldflags-spacing.patch 298 BLAKE2B 2d0fb361e2980d429beee418d9bf8d2f786de0d2b337b6775f9457158aa30d02b4dcbccdc488fa79236f04bf766aad49df732d25f48f1ecba923c46a4e239280 SHA512 fa283a8d6b88da0e2b6f5d0711ebe8a5cc0d4ab87cb07c3cecae9974dd68be751169b89503ae66751bca6cd73df2b2a262ac55a667c5c8e00e129d51f4452c67
+AUX libindicator-12.10.1-no-werror.patch 5307 BLAKE2B 8c4c9a4277968c1598b0d5f2084727b5236afa729568f767e561225cf7e532d65a9cd3a8f916a47b401ee0e6b76560adc79d138310568ef02e46355c32948a7c SHA512 dce99a58fec589633ccd86b94558a89a5d42145d514ded782828fd8545660ce659d0c3eb469b32a67220ec20ef8b1a60b1074bc50282cced18960a948fac9424
+AUX libindicator-12.10.1-nonbash.patch 573 BLAKE2B ae6b2806c99d99c83b36056b0ece7335ab673339e8ba275366efed3bc68413563ef4baffed64a0e3113473e8ae6dc0a143ae388e5280abdd7b84be97ee9f2afa SHA512 8a436dc62fb70d857b2bf3489e576e72fe9e06639a6563cf528686b6646adf2dbd5418c0904d986e44f5a3f9bf41e3687ce7cb2ff7895680a0d2bac792c2bb74
+AUX libindicator-ldflags-spacing.patch 351 BLAKE2B fe395bb718f1393bdfad20fb572afebe531623b299c5dcd6e69f8bc87dad5545aef8bbd6fc4c28788984b334f97a0642c9802983aa6aa0b41fda83a46491479e SHA512 0762b32efce30e680116a3ab451a0b036c9d6e9d45f6894b745e211746ad13a2854e0ac58ecf32e7011b0269a50581070c9107a6140b15d10d537c37f6f3bf9b
 DIST libindicator-12.10.1.tar.gz 427764 BLAKE2B 93cc774df0b55b7ee447c24a0ce49047080ab867c20403724b855153cfc5b93ed0da278532a2fc67bd69e4a9484a31286c2c585cd14d156028f338b5ed2b306a SHA512 d6d77d0309b15cf6b52539323920ab0c1594cb1c1cef8a8d67cd0f76f8ceeeac28eb6db6227563df1932e6f1fadcffac68d82982182b745257dfaf91f1c945af
-EBUILD libindicator-12.10.1-r201.ebuild 1197 BLAKE2B 5082a2b7963e66380a13b43323f9fca4492749fbebd89fcfb4f1a092292d8555f40398a1fc120e2bb771c784af12149dc13d95092c0b27146feb728c22f4e787 SHA512 01fa3c26a4a13d4db640e491cc12f19fbe3cdb86eaac3a2d81cdc9a007853ad338e3e0f65cadf6ab800d74bea41292399bdfe2a78b0365cf552370d962761713
-EBUILD libindicator-12.10.1-r301.ebuild 1178 BLAKE2B 8c4a9b86a23fe1cf355abe943fd69accff0baf2a8f38436c3bb15c2f3b99f01ad17187a5f62acaf2a3f752814092062eb71639f34b473ed19ef6ca849992609f SHA512 7a9df8a784836f37d45928e614af2228c303e30d4a5a5a9450468966f6a947b7d153190ab83ffc6afba8c672724fabe26e50507f6e207396e638435198d474f9
+EBUILD libindicator-12.10.1-r201.ebuild 1362 BLAKE2B af1856a0dcff13426d85530e178a7b8aa200342107d6dd14cb169664306b656b1fafa7fabda7f3237a78ed04abd2fca6551958bd4c5ed133af96179edd90b089 SHA512 2560bb73a841f80b401d0607e0843eabf2765f0f1e44483ea47dcd93a5dc98baf971b1aaa08e68308591fa0313787712e9d1d77d437880ba6e1730bd87540a78
+EBUILD libindicator-12.10.1-r301.ebuild 1275 BLAKE2B aa7aa82ff71d8ea1bd6c4fdc0a4d97aa86899dbfec020c132b40513f2492f85f60dd79ac145f1c339f4cd5441f0b1a9449cf038423a780eee81666f03e540fb4 SHA512 ef897424dde3a53e0966137e70d3a04a64ffb01d953290aa9353ea5964d376b2eb0e8ad5efe5370d8e077ed47f47feb617be65b6caea7c6822bd61986ff9e052
 MISC metadata.xml 247 BLAKE2B 216107f32a44b828d5bd65432dbdf2f3b71d81e96ee3580fc551392310b9ee554715698dfcba215fa2181a90f361564b6d04546c61848c3a2d176f3590602f69 SHA512 f24203e0188dd8311689fc59007368585764703b92f6fde9b4ea01666d37304193fc728a9f99b7f6c936f5a5a51a58a8402a101dc4eddc0bf2bf09f221bb0054
diff --git a/dev-libs/libindicator/files/libindicator-12.10.1-no-werror.patch b/dev-libs/libindicator/files/libindicator-12.10.1-no-werror.patch
new file mode 100644
index 000000000000..dcbf50b43151
--- /dev/null
+++ b/dev-libs/libindicator/files/libindicator-12.10.1-no-werror.patch
@@ -0,0 +1,196 @@
+https://bugs.gentoo.org/698774
+--- a/libindicator/Makefile.am
++++ b/libindicator/Makefile.am
+@@ -57,7 +57,7 @@ libindicator_la_CFLAGS = \
+ 	$(LIBINDICATOR_CFLAGS) \
+ 	$(COVERAGE_CFLAGS) \
+ 	-DG_LOG_DOMAIN=\"libindicator\" \
+-	-Wall -Werror
++	-Wall
+ 
+ libindicator_la_LIBADD = \
+ 	$(LIBINDICATOR_LIBS)
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -38,7 +38,7 @@ test_loader_SOURCES = \
+ 	test-loader.c
+ 
+ test_loader_CFLAGS = \
+-	-Wall -Werror \
++	-Wall \
+ 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir) \
+ 	-DBUILD_DIR="\"$(builddir)\""
+ 
+@@ -57,7 +57,7 @@ test_desktop_shortcuts_SOURCES = \
+ 	test-desktop-shortcuts.c
+ 
+ test_desktop_shortcuts_CFLAGS = \
+-	-Wall -Werror \
++	-Wall \
+ 	-DSRCDIR="\"$(srcdir)\"" \
+ 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir) \
+ 	-DBUILD_DIR="\"$(abs_builddir)\""
+@@ -91,7 +91,7 @@ libdummy_indicator_blank_la_SOURCES = \
+ 	dummy-indicator-blank.c
+ 
+ libdummy_indicator_blank_la_CFLAGS = \
+-	-Wall -Werror \
++	-Wall \
+ 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
+ 
+ libdummy_indicator_blank_la_LIBADD = \
+@@ -111,7 +111,7 @@ libdummy_indicator_null_la_SOURCES = \
+ 	dummy-indicator-null.c
+ 
+ libdummy_indicator_null_la_CFLAGS = \
+-	-Wall -Werror \
++	-Wall \
+ 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
+ 
+ libdummy_indicator_null_la_LIBADD = \
+@@ -131,7 +131,7 @@ libdummy_indicator_signaler_la_SOURCES = \
+ 	dummy-indicator-signaler.c
+ 
+ libdummy_indicator_signaler_la_CFLAGS = \
+-	-Wall -Werror \
++	-Wall \
+ 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
+ 
+ libdummy_indicator_signaler_la_LIBADD = \
+@@ -151,7 +151,7 @@ libdummy_indicator_simple_la_SOURCES = \
+ 	dummy-indicator-simple.c
+ 
+ libdummy_indicator_simple_la_CFLAGS = \
+-	-Wall -Werror \
++	-Wall \
+ 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
+ 
+ libdummy_indicator_simple_la_LIBADD = \
+@@ -172,7 +172,7 @@ libdummy_indicator_entry_func_la_SOURCES = \
+ 	dummy-indicator-entry-func.h
+ 
+ libdummy_indicator_entry_func_la_CFLAGS = \
+-	-Wall -Werror \
++	-Wall \
+ 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
+ 
+ libdummy_indicator_entry_func_la_LIBADD = \
+@@ -192,7 +192,7 @@ libdummy_indicator_visible_la_SOURCES = \
+ 	dummy-indicator-visible.c
+ 
+ libdummy_indicator_visible_la_CFLAGS = \
+-	-Wall -Werror \
++	-Wall \
+ 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
+ 
+ libdummy_indicator_visible_la_LIBADD = \
+@@ -214,7 +214,7 @@ service_shutdown_timeout_SOURCES = \
+ 	service-shutdown-timeout.c
+ 
+ service_shutdown_timeout_CFLAGS = \
+-	-Wall -Werror \
++	-Wall \
+ 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
+ 
+ service_shutdown_timeout_LDADD = \
+@@ -240,7 +240,7 @@ service_manager_no_connect_SOURCES = \
+ 	service-manager-no-connect.c
+ 
+ service_manager_no_connect_CFLAGS = \
+-	-Wall -Werror \
++	-Wall \
+ 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
+ 
+ service_manager_no_connect_LDADD = \
+@@ -272,7 +272,7 @@ service_manager_connect_SOURCES = \
+ 	service-manager-connect.c
+ 
+ service_manager_connect_CFLAGS = \
+-	-Wall -Werror \
++	-Wall \
+ 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
+ 
+ service_manager_connect_LDADD = \
+@@ -286,7 +286,7 @@ service_manager_connect_service_SOURCES = \
+ 	service-manager-connect-service.c
+ 
+ service_manager_connect_service_CFLAGS = \
+-	-Wall -Werror \
++	-Wall \
+ 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
+ 
+ service_manager_connect_service_LDADD = \
+@@ -319,7 +319,7 @@ service_version_manager_SOURCES = \
+ 	service-version-manager.c
+ 
+ service_version_manager_CFLAGS = \
+-	-Wall -Werror \
++	-Wall \
+ 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
+ 
+ service_version_manager_LDADD = \
+@@ -334,7 +334,7 @@ service_version_bad_service_SOURCES = \
+ 	service-version-bad-service.c
+ 
+ service_version_bad_service_CFLAGS = \
+-	-Wall -Werror \
++	-Wall \
+ 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
+ 
+ service_version_bad_service_LDADD = \
+@@ -349,7 +349,7 @@ service_version_good_service_SOURCES = \
+ 	service-version-good-service.c
+ 
+ service_version_good_service_CFLAGS = \
+-	-Wall -Werror \
++	-Wall \
+ 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
+ 
+ service_version_good_service_LDADD = \
+@@ -376,7 +376,7 @@ service_version_multiwatch_manager_SOURCES = \
+ 	service-version-multiwatch-manager.c
+ 
+ service_version_multiwatch_manager_CFLAGS = \
+-	-Wall -Werror \
++	-Wall \
+ 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
+ 
+ service_version_multiwatch_manager_LDADD = \
+@@ -391,7 +391,7 @@ service_version_multiwatch_manager_impolite_SOURCES = \
+ 	service-version-multiwatch-manager-impolite.c
+ 
+ service_version_multiwatch_manager_impolite_CFLAGS = \
+-	-Wall -Werror \
++	-Wall \
+ 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
+ 
+ service_version_multiwatch_manager_impolite_LDADD = \
+@@ -406,7 +406,7 @@ service_version_multiwatch_service_SOURCES = \
+ 	service-version-multiwatch-service.c
+ 
+ service_version_multiwatch_service_CFLAGS = \
+-	-Wall -Werror \
++	-Wall \
+ 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
+ 
+ service_version_multiwatch_service_LDADD = \
+@@ -432,7 +432,7 @@ service_manager_nostart_connect_SOURCES = \
+ 	service-manager-nostart-connect.c
+ 
+ service_manager_nostart_connect_CFLAGS = \
+-	-Wall -Werror \
++	-Wall \
+ 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
+ 
+ service_manager_nostart_connect_LDADD = \
+--- a/tools/Makefile.am
++++ b/tools/Makefile.am
+@@ -17,7 +17,7 @@ indicator_loader_SOURCES = \
+ 	indicator-loader.c
+ 
+ indicator_loader_CFLAGS = \
+-	-Wall -Werror \
++	-Wall \
+ 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir) \
+ 	-DBUILD_DIR="\"$(builddir)\""
+ 
diff --git a/dev-libs/libindicator/files/libindicator-12.10.1-nonbash.patch b/dev-libs/libindicator/files/libindicator-12.10.1-nonbash.patch
new file mode 100644
index 000000000000..eac1e73aa288
--- /dev/null
+++ b/dev-libs/libindicator/files/libindicator-12.10.1-nonbash.patch
@@ -0,0 +1,23 @@
+https://bugs.gentoo.org/777087
+https://bugs.launchpad.net/libindicator/+bug/1502925
+Thanks-to: orbea <orbea@riseup.net>
+--- a/configure.ac
++++ b/configure.ac
+@@ -15,7 +15,7 @@ AM_INIT_AUTOMAKE([1.11 -Wall tar-pax])
+ 
+ AM_MAINTAINER_MODE([enable])
+ 
+-AM_SILENT_RULES([yes])]
++AM_SILENT_RULES([yes])
+ 
+ # Check for programs
+ AC_PROG_CC
+@@ -66,7 +66,7 @@ AS_IF([test "x$with_gtk" = x3],
+ AM_CONDITIONAL(USE_GTK3, [test "x$with_gtk" = x3])
+ 
+ LT_LIB_M
+-LIBINDICATOR_LIBS+="$LIBM"
++LIBINDICATOR_LIBS="${LIBINDICATOR_LIBS} $LIBM"
+ 
+ ##############################
+ # Custom Junk
diff --git a/dev-libs/libindicator/files/libindicator-ldflags-spacing.patch b/dev-libs/libindicator/files/libindicator-ldflags-spacing.patch
index 8c4a55faec08..5bd2cf89d5a8 100644
--- a/dev-libs/libindicator/files/libindicator-ldflags-spacing.patch
+++ b/dev-libs/libindicator/files/libindicator-ldflags-spacing.patch
@@ -1,3 +1,4 @@
+https://bugs.launchpad.net/libindicator/+bug/1502925
 --- a/configure.ac	2012-07-11 14:07:33.167169453 -0400
 +++ b/configure.ac	2015-10-04 09:59:31.023669616 -0400
 @@ -66,7 +66,7 @@
diff --git a/dev-libs/libindicator/libindicator-12.10.1-r201.ebuild b/dev-libs/libindicator/libindicator-12.10.1-r201.ebuild
index 24ca42f49f2e..e5cd461a3d61 100644
--- a/dev-libs/libindicator/libindicator-12.10.1-r201.ebuild
+++ b/dev-libs/libindicator/libindicator-12.10.1-r201.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit autotools eutils flag-o-matic ltprune virtualx multilib-minimal
+EAPI=7
+
+inherit autotools flag-o-matic virtualx multilib-minimal
 
 DESCRIPTION="A set of symbols and convience functions that all indicators would like to use"
 HOMEPAGE="https://launchpad.net/libindicator"
@@ -14,31 +15,43 @@ KEYWORDS="amd64 ~arm x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-RDEPEND=">=dev-libs/glib-2.22[${MULTILIB_USEDEP}]
-	>=x11-libs/gtk+-2.18:2[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
+RDEPEND="
+	>=dev-libs/glib-2.22[${MULTILIB_USEDEP}]
+	>=x11-libs/gtk+-2.18:2[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	dev-util/glib-utils
 	virtual/pkgconfig
-	test? ( dev-util/dbus-test-runner )"
+	test? ( dev-util/dbus-test-runner )
+"
+
+PATCHES=(
+	# Fixed version of https://bugs.launchpad.net/libindicator/+bug/1502925
+	"${FILESDIR}"/${PN}-12.10.1-nonbash.patch
+	"${FILESDIR}"/${PN}-12.10.1-no-werror.patch
+)
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-ldflags-spacing.patch
+	default
+
 	eautoreconf
 }
 
 multilib_src_configure() {
 	append-flags -Wno-error
 
-	myconf=(
+	local myconf=(
 		--disable-static
 		--with-gtk=2
 	)
-	local ECONF_SOURCE=${S}
-	econf "${myconf[@]}"
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
 }
 
 multilib_src_test() {
-	Xemake check #391179
+	# bug #391179
+	virtx emake
 }
 
 multilib_src_install() {
@@ -46,10 +59,12 @@ multilib_src_install() {
 }
 
 multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files --all
+	default
+
+	find "${ED}" -name '*.la' -delete || die
 
 	rm -vf \
 		"${ED}"/usr/lib*/libdummy-indicator-* \
-		"${ED}"/usr/share/${PN}/*indicator-debugging
+		"${ED}"/usr/share/${PN}/*indicator-debugging \
+		|| die
 }
diff --git a/dev-libs/libindicator/libindicator-12.10.1-r301.ebuild b/dev-libs/libindicator/libindicator-12.10.1-r301.ebuild
index 068768b22c0f..a56e52859f3f 100644
--- a/dev-libs/libindicator/libindicator-12.10.1-r301.ebuild
+++ b/dev-libs/libindicator/libindicator-12.10.1-r301.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit autotools eutils flag-o-matic ltprune virtualx multilib-minimal
+EAPI=7
+
+inherit autotools flag-o-matic virtualx multilib-minimal
 
 DESCRIPTION="A set of symbols and convience functions that all indicators would like to use"
 HOMEPAGE="https://launchpad.net/libindicator"
@@ -14,32 +15,42 @@ KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-RDEPEND=">=dev-libs/glib-2.22[${MULTILIB_USEDEP}]
-	>=x11-libs/gtk+-3.2:3[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
+RDEPEND="
+	>=dev-libs/glib-2.22[${MULTILIB_USEDEP}]
+	>=x11-libs/gtk+-3.2:3[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	dev-util/glib-utils
 	virtual/pkgconfig
 	test? ( dev-util/dbus-test-runner )"
 
+PATCHES=(
+	# Fixed version of https://bugs.launchpad.net/libindicator/+bug/1502925
+	"${FILESDIR}"/${PN}-12.10.1-nonbash.patch
+	"${FILESDIR}"/${PN}-12.10.1-no-werror.patch
+)
+
 src_prepare() {
-	# https://bugs.launchpad.net/libindicator/+bug/1502925
-	epatch "${FILESDIR}"/${PN}-ldflags-spacing.patch
+	default
+
 	eautoreconf
 }
 
 multilib_src_configure() {
 	append-flags -Wno-error
 
-	myconf=(
+	local myconf=(
 		--disable-static
 		--with-gtk=3
 	)
-	local ECONF_SOURCE=${S}
-	econf "${myconf[@]}"
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
 }
 
 multilib_src_test() {
-	Xemake check #391179
+	# bug #391179
+	virtx emake
 }
 
 multilib_src_install() {
@@ -47,6 +58,7 @@ multilib_src_install() {
 }
 
 multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files --all
+	default
+
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/libsigsegv/Manifest b/dev-libs/libsigsegv/Manifest
index 2c313bad2c3b..55fdba6cbf46 100644
--- a/dev-libs/libsigsegv/Manifest
+++ b/dev-libs/libsigsegv/Manifest
@@ -2,5 +2,5 @@ AUX libsigsegv-2.12-skip-stackoverflow-tests.patch 461 BLAKE2B 021932c6eeb8a4a3a
 DIST libsigsegv-2.12.tar.gz 451408 BLAKE2B 3f2f37965dfdd5f8a7db3d5baff975003200e7ab157498524f8c99c60c285a5a8a1cf978ff3a69977d52604dc44493ac6d6d00476fca3380b285282b35873f99 SHA512 27986e8aaf4357ed131032aa7c281a5a28c5759530c62bb76f034aea33959547dcaae805e06347a1f532f0488b72fbbbdac4400f74e8d3f2128511526e8a5913
 DIST libsigsegv-2.13.tar.gz 460736 BLAKE2B 2202ef92e96b2b46d7496a69427159b06b0413e9610daa9bc035dd18f193fd650a06dcc5a2db3b36b6c68f95593f2da047579e644d5ca4e54bc17160a57dac8f SHA512 9c0cf01ee2a39f77f2e42eb06a2aa60644e10fe2cd39089de58f6206baf7fe7d61fe0ec6bf187276fcfccf61585154ce904fe374b474b7ba9fa050a61a2f3918
 EBUILD libsigsegv-2.12-r1.ebuild 759 BLAKE2B 0f1e96575db99253cb02f48d14a9f07918094b8a25db274b33e1ff07d5d35b50df5658f17426db1934f2aaa8ef6dd03ca03531d6f0c843b9ed46ed5da5c02ce2 SHA512 e7941e5ac2866276883a8fae1bd4191197ca52acf1aaaa242850dff627b80ed3487ce597e14e3e1eb626eb036bbf3898beac4f8900b256c9e8fc39fb8bf0baf3
-EBUILD libsigsegv-2.13.ebuild 794 BLAKE2B 296c0dedcbf752a532d3369052c19c3f77903ab77cbf6c629a6bcbcc492d05ccf3d6c4e83d6a8c5e55d11a3f2eca172a8fde7a1cc7502129e91da0f90fe660fd SHA512 290bb0db6316ae0945d994d2b8abe011a16dcfa71d0b3e63a6c3de5450d9fdeead59a844aafad08848c56dc8db69c9ba0ef98cad263cb2314769e8932da9c313
+EBUILD libsigsegv-2.13.ebuild 797 BLAKE2B d7a07942e11ffc9db6518450e738fe679175d6bf5191e6eaa2b78def3272877e5418f3c8006af7a6d1676bd7086f29e98ce8985f700c9b165bf3357a1c573006 SHA512 9f825cb3cff2b8b073eb34b571d8eebbd062cd1dd54a95576cb5e7936b5ba5776b8660d44f9544453a77d002909b48cb73f599eaa3e607fe9319dc8c890c0fd8
 MISC metadata.xml 811 BLAKE2B 648cadc6a317684a62fcdeceb885b3bb153841d57928e19a84ee20a0c0dbd8626343fecb6cf2367ef195cab26b9909c6c129a4a2afc999353300b48911317711 SHA512 7f985e3e2e50e351fc14e4932f30ceab0989346183ba87c0dd16a3dc874dd0e5534984e4bcc327dc1a4c0d15e78c89aeb8491b5a8c8789b6ae42dfdb89c18fb2
diff --git a/dev-libs/libsigsegv/libsigsegv-2.13.ebuild b/dev-libs/libsigsegv/libsigsegv-2.13.ebuild
index 5db18ac2c314..2f6d0e7207e4 100644
--- a/dev-libs/libsigsegv/libsigsegv-2.13.ebuild
+++ b/dev-libs/libsigsegv/libsigsegv-2.13.ebuild
@@ -29,6 +29,6 @@ src_configure() {
 
 src_install() {
 	emake DESTDIR="${D}" install
-	rm "${ED}/usr/$(get_libdir)"/*.la || die
+	rm -f "${ED}/usr/$(get_libdir)"/*.la || die
 	dodoc AUTHORS ChangeLog* NEWS PORTING README
 }
diff --git a/dev-libs/libtomcrypt/Manifest b/dev-libs/libtomcrypt/Manifest
index 8d51e931b18c..5321bbb7da3a 100644
--- a/dev-libs/libtomcrypt/Manifest
+++ b/dev-libs/libtomcrypt/Manifest
@@ -1,3 +1,4 @@
+AUX libtomcrypt-1.18.2-slibtool.patch 2859 BLAKE2B 2af276b50dd627a7dab88b6d349c908a32b364b0cbf199d14ca43019a65c4ac47ec16f8498c22e27454ce0144286502253fe3434cade6a614c7f9162d99fb20c SHA512 f6c5a802a581971b309815f82416c649a388e853c143f849bf89478ca4b9d883b3ab426c4ab5bbd94b5748d5b466f6ec56336c18959ca1c3ef5396b5be8d2da0
 DIST libtomcrypt-1.18.2.tar.xz 2638064 BLAKE2B fad67e9e2a2002425488db9987a853bda631d6638c2cb1052a1d0d1f393945e38037cc75c54cd3a4bf87bb2e13b1e868e81da054a84bbdb393519ddef5e27300 SHA512 f6117a12a42b07f8de4a8aedbccf6ff4ee94b4b81cb7263af99627c32eae646ca8ead7d3063737918db4aa118673001fcf2cfa8e4ca8b528fb00045fda7cc893
-EBUILD libtomcrypt-1.18.2-r2.ebuild 2798 BLAKE2B 1dc6dd3e1ea47b1f622163858fefb3fa79456d436b29f7b2cc48372772640025b23f308fd7bd26d36ad7b1e13db5e26c22869052c2ad90dba5afac60e7cb0803 SHA512 813e4c9f8d827d69c3b6a8d23c176b880501cba7cc25984d3545df893358fc55849fe21732781b946fbca8fa83a9f0f24c54423ed435259c69e0b6e79a351fd6
+EBUILD libtomcrypt-1.18.2-r2.ebuild 2948 BLAKE2B 6621119cf52e105c1fc2bb8d25558cda5e4411f7d06e9844bd7d2bb59f2799c50bd2c82f3642df701dcedef41d78bf9de8d218a124ca01a659cb34f1e946eb26 SHA512 00353d27023436f1d4154a6179ce17d74a1d5f342cfd58ff8bc4109c7841c97bbaa52106b5c337c0ac9000f25a4e6d0335653e0764c63ffe6ea165be2cb21953
 MISC metadata.xml 643 BLAKE2B e66df23ddfeb04650dfa8c4cbd7d6e6a1816164fd0cac86dba9990610b672957c5ff7b6e83a17f8b6c19f75d1f50a1b448b8b618058510b8d6f54259ad451822 SHA512 7517fc02844cd6b9a9801b371c2c8faf9626dded317ad610af234cd89078221be021acb9da66f9078bb4b754a5e2f1b5efcbca2ccb1ef5c58afd8cf925e7a44e
diff --git a/dev-libs/libtomcrypt/files/libtomcrypt-1.18.2-slibtool.patch b/dev-libs/libtomcrypt/files/libtomcrypt-1.18.2-slibtool.patch
new file mode 100644
index 000000000000..5c7bcda502c3
--- /dev/null
+++ b/dev-libs/libtomcrypt/files/libtomcrypt-1.18.2-slibtool.patch
@@ -0,0 +1,72 @@
+https://github.com/libtom/libtomcrypt/pull/433
+https://bugs.gentoo.org/777084
+
+From ccc18b9eda52c31cc70a3e46eb33b87b3c076d65 Mon Sep 17 00:00:00 2001
+From: orbea <orbea@fredslev.dk>
+Date: Mon, 13 Aug 2018 19:20:37 -0700
+Subject: [PATCH] makefile.shared: Support rlibtool.
+
+When building libtomcrypt with rlibtool instead of libtool it will fail
+when rlibtool fails to parse the generated libtool which does not exist.
+
+Since rlibtool should be the default choice for most slibtool users in
+the future this patch will use slibtool-shared instead which will
+correctly build the shared library.
+
+This could also help build the shared library on additional targets and
+hosts where the stock libtool does not have shared libraries enabled.
+---
+ makefile.shared | 17 +++++++++++------
+ 1 file changed, 11 insertions(+), 6 deletions(-)
+
+diff --git a/makefile.shared b/makefile.shared
+index 98ec2b501..c72f2ac8d 100644
+--- a/makefile.shared
++++ b/makefile.shared
+@@ -16,19 +16,24 @@
+ 
+ PLATFORM := $(shell uname | sed -e 's/_.*//')
+ 
++ifeq ($(LIBTOOL),rlibtool)
++  TGTLIBTOOL:=slibtool-shared
++endif
++
+ ifndef LIBTOOL
+   ifeq ($(PLATFORM), Darwin)
+     LIBTOOL:=glibtool
+   else
+     LIBTOOL:=libtool
+   endif
++  TGTLIBTOOL=$(LIBTOOL)
+ endif
+ ifeq ($(PLATFORM), CYGWIN)
+   NO_UNDEFINED:=-no-undefined
+ endif
+-LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC)
+-INSTALL_CMD = $(LIBTOOL) --mode=install install
+-UNINSTALL_CMD = $(LIBTOOL) --mode=uninstall rm
++LTCOMPILE = $(TGTLIBTOOL) --mode=compile --tag=CC $(CC)
++INSTALL_CMD = $(TGTLIBTOOL) --mode=install install
++UNINSTALL_CMD = $(TGTLIBTOOL) --mode=uninstall rm
+ 
+ #Output filenames for various targets.
+ ifndef LIBNAME
+@@ -49,15 +54,15 @@ src/ciphers/aes/aes_enc.o: src/ciphers/aes/aes.c src/ciphers/aes/aes_tab.c
+ LOBJECTS = $(OBJECTS:.o=.lo)
+ 
+ $(LIBNAME): $(OBJECTS)
+-	$(LIBTOOL) --mode=link --tag=CC $(CC) $(LTC_LDFLAGS) $(LOBJECTS) $(EXTRALIBS) -o $@ -rpath $(LIBPATH) -version-info $(VERSION_LT) $(NO_UNDEFINED)
++	$(TGTLIBTOOL) --mode=link --tag=CC $(CC) $(LTC_LDFLAGS) $(LOBJECTS) $(EXTRALIBS) -o $@ -rpath $(LIBPATH) -version-info $(VERSION_LT) $(NO_UNDEFINED)
+ 
+ test: $(call print-help,test,Builds the library and the 'test' application to run all self-tests) $(LIBNAME) $(TOBJECTS)
+-	$(LIBTOOL) --mode=link --tag=CC $(CC) $(LTC_LDFLAGS) -o $(TEST) $(TOBJECTS) $(LIBNAME) $(EXTRALIBS)
++	$(TGTLIBTOOL) --mode=link --tag=CC $(CC) $(LTC_LDFLAGS) -o $(TEST) $(TOBJECTS) $(LIBNAME) $(EXTRALIBS)
+ 
+ # build the demos from a template
+ define DEMO_template
+ $(1): $(call print-help,$(1),Builds the library and the '$(1)' demo) demos/$(1).o $$(LIBNAME)
+-	$$(LIBTOOL) --mode=link --tag=CC $$(CC) $$(LTC_LDFLAGS) $$^ $$(EXTRALIBS) -o $(1)
++	$$(TGTLIBTOOL) --mode=link --tag=CC $$(CC) $$(LTC_LDFLAGS) $$^ $$(EXTRALIBS) -o $(1)
+ endef
+ 
+ $(foreach demo, $(strip $(DEMOS)), $(eval $(call DEMO_template,$(demo))))
diff --git a/dev-libs/libtomcrypt/libtomcrypt-1.18.2-r2.ebuild b/dev-libs/libtomcrypt/libtomcrypt-1.18.2-r2.ebuild
index 134002447d9a..ba054acdcfa0 100644
--- a/dev-libs/libtomcrypt/libtomcrypt-1.18.2-r2.ebuild
+++ b/dev-libs/libtomcrypt/libtomcrypt-1.18.2-r2.ebuild
@@ -20,6 +20,10 @@ SLOT="0/1"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos"
 IUSE="+gmp +libtommath tomsfastmath"
 
+# Enforce at least one math provider
+# bug #772935
+REQUIRED_USE="|| ( gmp libtommath tomsfastmath )"
+
 BDEPEND="
 	sys-devel/libtool
 	virtual/pkgconfig
@@ -31,6 +35,10 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-slibtool.patch
+)
+
 mymake() {
 	# Standard boilerplate
 	# Upstream use homebrewed makefiles
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index afb6432c2797..c9348020ea5c 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -4,12 +4,10 @@ AUX nss-3.53-fix-building-on-ppc.patch 1206 BLAKE2B e6189802769197b290fd332ee2b7
 AUX nss-3.53-gentoo-fixups.patch 6886 BLAKE2B 1c605d8db02ebe0492c41955207368197a79990e43e219a71962cb28ac0cecd9e0acc2b76e16f5b116fdb8bf8790d96046cb4f376df9b8634ac48e54924589f8 SHA512 51031f92519f57d4b57a547cf549f2d5da1c5a7212d4b304fb0d71d6a85a5aefd64724ec9075c14c9b49c1e99c3ffe91cbec501c3504985aa9b16eacf2aa15ed
 AUX nss-3.58-always-tolerate-the-first-CCS-in-TLS1.3.patch 8546 BLAKE2B 25c222f44f714226364dbda760989e7e255ab93a79121238ccce2962c346c37971a8440e8cc16ac5555f78c15b7a1b72e7311a7b7257b254fefe7e9a75d94924 SHA512 79fff678895a5643b34c42a0b0d34299b1b63c19baf0bbeb43fcee6b7f01bb24baf7047261b16e913d39fe9e69a637c7dc2bba0fec9ceedd43fa4f5dcc99f38f
 DIST nss-3.58.tar.gz 81846254 BLAKE2B f8e7d0b231916b197ad21706a057d055f8377059d76d4f09aff523cc4cd071a3184f02dc488259df22109b70be7b8a5d5fa7ea2273a830de825cc9a8c95dcca9 SHA512 03d2ab1517ac07620ea3f02dcf680cf019e0129006ff2559b2d0a047036340c20b98c9679b17a594e5502aa30e158caf309f046901b9ec7c7adeeaa13ec50b80
-DIST nss-3.60.1.tar.gz 82036869 BLAKE2B 71f4ab4ee41a05b05493bb43bd0ebaa6258122ddf6bc82af565121ec32f72ae0f187ac2383501ed8e228b32b796f75a89538c76f737530215b3c6448ef1242a3 SHA512 ba398ddad6f90f3562a041b7fd5fc7b72eb20961cc5c1f4890c3b0d95d438404b26ae6feb54cb8c650707134479a915e1f522f0e9257bc2ede053dd0811156d5
-DIST nss-3.61.tar.gz 82034245 BLAKE2B f04dd0dd79d44abd335799ee53bb2229ab0c65f5b9d5bf5b61e49fb33ae2eb5c061c278d5e03328e697a6f0f461411ca35df79afb9ab51df9b555cb410c0167b SHA512 b2fb2288d20b49097b6b24286ee39ec839ebabe2a84afe2d6a31dbefa9c2d1386dc85c97e41011eb11b12b1e4a410242c84648ac19bbabb7432dba460305bb37
 DIST nss-3.62.tar.gz 82159506 BLAKE2B 9abd7504766fb57214a16608a7299f8cf6d25c9a4e285665eabd812bce536ba244b698de31fd53796148f3856e4bee6c8a03ce5b6c5234a9337d7af8f300f007 SHA512 7044008ea8e5d6f658da96e202a896e24a1ffa29d7ca862f32ed37cfa09adf8c2d5fbc371e3af6bc5151b2d1216c38207976b41888d5ad8efd4dc3049cb5831d
+DIST nss-3.63.tar.gz 82167087 BLAKE2B 3db1aea3aea8373ba8e285a5a87e8b5e39107af8cc5977701fb2fe29b6e7657dba1b1ea3bf80aa0768b0d5f6d130cacc3e029eec69b071a0d87da0825860ffd9 SHA512 2f1f75dce7fd049453cbcf53263a3d9d4d9e62ad2cc2fef4dd0d5645fe14dad4ce47ed64aae507a09214d7fccbe83c142844121f55b44783e5a1bcfe24ea671c
 DIST nss-cacert-class1-class3.patch 22950 BLAKE2B 9d5e60df5f161a3c27c41e5a9419440a54f888eda454e3cde5ebe626d4075b65cf9938b5144d0fb022377f4bd415bff5e5c67d104409860aa9391b3eb8872c68 SHA512 a5aa740bf110a3f0262e3f1ef2fc739ac2b44f042e220039d48aee8e97cd764d5c10718220364f4098aba955882bd02cadb5481512388971a8290312f88a7df0
 EBUILD nss-3.58-r2.ebuild 9243 BLAKE2B d064a59fb9780ffa37454397ff738b4ba91ceca46d98facfd9e2fff2f73980280a3ed06bc02d5ea8ba6915440c4cbf697006484cb5580fae8b16472230f01186 SHA512 ebf3a0df5de6170fa14428bfeae73d8a34d02bf010c9cac49d9edcfbc3303044dde0bd28d6b330f327a9f4f7e8cf9fe2b7b1fad8dba19768fbc51aee06ceaac9
-EBUILD nss-3.60.1.ebuild 9128 BLAKE2B dbaaefae2f76d42ed67eb868cbfd87c0db4f1f4b2c661e06e97b50df6aa274026925ad9c184eccd900d1229f57d71f143f3405e8b16c0d46770e86412a4acb56 SHA512 734687ac844cf3cc6d2726b4c4b01153c981c4532acbec77c65633d41ab70f4a97071b4c57fd192d386d315e0dbe67b85f608935668c03e39a216446bf6b5028
-EBUILD nss-3.61.ebuild 9128 BLAKE2B dbaaefae2f76d42ed67eb868cbfd87c0db4f1f4b2c661e06e97b50df6aa274026925ad9c184eccd900d1229f57d71f143f3405e8b16c0d46770e86412a4acb56 SHA512 734687ac844cf3cc6d2726b4c4b01153c981c4532acbec77c65633d41ab70f4a97071b4c57fd192d386d315e0dbe67b85f608935668c03e39a216446bf6b5028
 EBUILD nss-3.62.ebuild 9229 BLAKE2B 52f2a039116fed8ef049d585a9d70b5a0b021a36745f300b548f90c4c5a0936b415b38f0c5752bdb5ecf1b6e0a3995b2e7a63fce63010b259a6cbb6e745950c5 SHA512 36a492b736cec0b1ab99a798fdacf877af54d2f606c67b386b3f78d2edab550f096b88200329309dd916263773ad0d9313427aa2be307ab606301d60a4f89c6d
+EBUILD nss-3.63.ebuild 9229 BLAKE2B 52f2a039116fed8ef049d585a9d70b5a0b021a36745f300b548f90c4c5a0936b415b38f0c5752bdb5ecf1b6e0a3995b2e7a63fce63010b259a6cbb6e745950c5 SHA512 36a492b736cec0b1ab99a798fdacf877af54d2f606c67b386b3f78d2edab550f096b88200329309dd916263773ad0d9313427aa2be307ab606301d60a4f89c6d
 MISC metadata.xml 515 BLAKE2B a63fb05a1a3e1b06f929f963ab0794ec1230e89903fc97a7c7db81a0b3c7b7e8b9277eaa7440f8929738ec0f805d8a8dd51c8262e569fb9be2fa0938b08ad7a2 SHA512 6bec952825416ba0ab8282669483eb75935f6b4a3052e0f78dad911c0246b8d8ce245c86cbd82b292d49338848fa50fb2009fb4a9def1ac8d81bf9a3320cd2b0
diff --git a/dev-libs/nss/nss-3.61.ebuild b/dev-libs/nss/nss-3.61.ebuild
deleted file mode 100644
index 22ec72ccc32c..000000000000
--- a/dev-libs/nss/nss-3.61.ebuild
+++ /dev/null
@@ -1,358 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic multilib toolchain-funcs multilib-minimal
-
-NSPR_VER="4.29"
-RTM_NAME="NSS_${PV//./_}_RTM"
-
-DESCRIPTION="Mozilla's Network Security Services library that implements PKI support"
-HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"
-SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz
-	cacert? ( https://dev.gentoo.org/~axs/distfiles/${PN}-cacert-class1-class3.patch )"
-
-LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE="cacert utils"
-# pkg-config called by nss-config -> virtual/pkgconfig in RDEPEND
-RDEPEND="
-	>=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
-	>=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	virtual/pkgconfig
-"
-DEPEND="${RDEPEND}"
-
-RESTRICT="test"
-
-S="${WORKDIR}/${P}/${PN}"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/nss-config
-)
-
-PATCHES=(
-	# Custom changes for gentoo
-	"${FILESDIR}/${PN}-3.53-gentoo-fixups.patch"
-	"${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch"
-	"${FILESDIR}/${PN}-3.23-hppa-byte_order.patch"
-)
-
-src_prepare() {
-	if use cacert ; then #521462
-		PATCHES+=(
-			"${DISTDIR}/${PN}-cacert-class1-class3.patch"
-		)
-	fi
-
-	default
-
-	pushd coreconf >/dev/null || die
-	# hack nspr paths
-	echo 'INCLUDES += -I$(DIST)/include/dbm' \
-		>> headers.mk || die "failed to append include"
-
-	# modify install path
-	sed -e '/CORE_DEPTH/s:SOURCE_PREFIX.*$:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \
-		-i source.mk || die
-
-	# Respect LDFLAGS
-	sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk
-	popd >/dev/null || die
-
-	# Fix pkgconfig file for Prefix
-	sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \
-		config/Makefile || die
-
-	# use host shlibsign if need be #436216
-	if tc-is-cross-compiler ; then
-		sed -i \
-			-e 's:"${2}"/shlibsign:shlibsign:' \
-			cmd/shlibsign/sign.sh || die
-	fi
-
-	# dirty hack
-	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \
-		lib/ssl/config.mk || die
-	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../../lib/freebl/\$(OBJDIR):" \
-		cmd/platlibs.mk || die
-
-	multilib_copy_sources
-
-	strip-flags
-}
-
-multilib_src_configure() {
-	# Ensure we stay multilib aware
-	sed -i -e "/@libdir@/ s:lib64:$(get_libdir):" config/Makefile || die
-}
-
-nssarch() {
-	# Most of the arches are the same as $ARCH
-	local t=${1:-${CHOST}}
-	case ${t} in
-		aarch64*)echo "aarch64";;
-		hppa*)   echo "parisc";;
-		i?86*)   echo "i686";;
-		x86_64*) echo "x86_64";;
-		*)       tc-arch ${t};;
-	esac
-}
-
-nssbits() {
-	local cc cppflags="${1}CPPFLAGS" cflags="${1}CFLAGS"
-	if [[ ${1} == BUILD_ ]]; then
-		cc=$(tc-getBUILD_CC)
-	else
-		cc=$(tc-getCC)
-	fi
-	echo > "${T}"/test.c || die
-	${cc} ${!cppflags} ${!cflags} -c "${T}"/test.c -o "${T}/${1}test.o" || die
-	case $(file "${T}/${1}test.o") in
-		*32-bit*x86-64*) echo USE_X32=1;;
-		*64-bit*|*ppc64*|*x86_64*) echo USE_64=1;;
-		*32-bit*|*ppc*|*i386*) ;;
-		*) die "Failed to detect whether ${cc} builds 64bits or 32bits, disable distcc if you're using it, please";;
-	esac
-}
-
-multilib_src_compile() {
-	# use ABI to determine bit'ness, or fallback if unset
-	local buildbits mybits
-	case "${ABI}" in
-		n32) mybits="USE_N32=1";;
-		x32) mybits="USE_X32=1";;
-		s390x|*64) mybits="USE_64=1";;
-		${DEFAULT_ABI})
-			einfo "Running compilation test to determine bit'ness"
-			mybits=$(nssbits)
-			;;
-	esac
-	# bitness of host may differ from target
-	if tc-is-cross-compiler; then
-		buildbits=$(nssbits BUILD_)
-	fi
-
-	local makeargs=(
-		CC="$(tc-getCC)"
-		CCC="$(tc-getCXX)"
-		AR="$(tc-getAR) rc \$@"
-		RANLIB="$(tc-getRANLIB)"
-		OPTIMIZER=
-		${mybits}
-	)
-
-	# Take care of nspr settings #436216
-	local myCPPFLAGS="${CPPFLAGS} $($(tc-getPKG_CONFIG) nspr --cflags)"
-	unset NSPR_INCLUDE_DIR
-
-	export NSS_ALLOW_SSLKEYLOGFILE=1
-	export NSS_ENABLE_WERROR=0 #567158
-	export BUILD_OPT=1
-	export NSS_USE_SYSTEM_SQLITE=1
-	export NSDISTMODE=copy
-	export FREEBL_NO_DEPEND=1
-	export FREEBL_LOWHASH=1
-	export NSS_SEED_ONLY_DEV_URANDOM=1
-	export USE_SYSTEM_ZLIB=1
-	export ZLIB_LIBS=-lz
-	export ASFLAGS=""
-	# Fix build failure on arm64
-	export NS_USE_GCC=1
-	# Detect compiler type and set proper environment value
-	if tc-is-gcc; then
-		export CC_IS_GCC=1
-	elif tc-is-clang; then
-		export CC_IS_CLANG=1
-	fi
-
-	local d
-
-	# Build the host tools first.
-	LDFLAGS="${BUILD_LDFLAGS}" \
-	XCFLAGS="${BUILD_CFLAGS}" \
-	NSPR_LIB_DIR="${T}/fakedir" \
-	emake -j1 -C coreconf \
-		CC="$(tc-getBUILD_CC)" \
-		${buildbits-${mybits}}
-	makeargs+=( NSINSTALL="${PWD}/$(find -type f -name nsinstall)" )
-
-	# Then build the target tools.
-	for d in . lib/dbm ; do
-		CPPFLAGS="${myCPPFLAGS}" \
-		XCFLAGS="${CFLAGS} ${CPPFLAGS}" \
-		NSPR_LIB_DIR="${T}/fakedir" \
-		emake -j1 "${makeargs[@]}" -C ${d} OS_TEST="$(nssarch)"
-	done
-}
-
-# Altering these 3 libraries breaks the CHK verification.
-# All of the following cause it to break:
-# - stripping
-# - prelink
-# - ELF signing
-# http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn6.html
-# Either we have to NOT strip them, or we have to forcibly resign after
-# stripping.
-#local_libdir="$(get_libdir)"
-#export STRIP_MASK="
-#	*/${local_libdir}/libfreebl3.so*
-#	*/${local_libdir}/libnssdbm3.so*
-#	*/${local_libdir}/libsoftokn3.so*"
-
-export NSS_CHK_SIGN_LIBS="freebl3 nssdbm3 softokn3"
-
-generate_chk() {
-	local shlibsign="$1"
-	local libdir="$2"
-	einfo "Resigning core NSS libraries for FIPS validation"
-	shift 2
-	local i
-	for i in ${NSS_CHK_SIGN_LIBS} ; do
-		local libname=lib${i}.so
-		local chkname=lib${i}.chk
-		"${shlibsign}" \
-			-i "${libdir}"/${libname} \
-			-o "${libdir}"/${chkname}.tmp \
-		&& mv -f \
-			"${libdir}"/${chkname}.tmp \
-			"${libdir}"/${chkname} \
-		|| die "Failed to sign ${libname}"
-	done
-}
-
-cleanup_chk() {
-	local libdir="$1"
-	shift 1
-	local i
-	for i in ${NSS_CHK_SIGN_LIBS} ; do
-		local libfname="${libdir}/lib${i}.so"
-		# If the major version has changed, then we have old chk files.
-		[ ! -f "${libfname}" -a -f "${libfname}.chk" ] \
-			&& rm -f "${libfname}.chk"
-	done
-}
-
-multilib_src_install() {
-	pushd dist >/dev/null || die
-
-	dodir /usr/$(get_libdir)
-	cp -L */lib/*$(get_libname) "${ED}"/usr/$(get_libdir) || die "copying shared libs failed"
-	local i
-	for i in crmf freebl nssb nssckfw ; do
-		cp -L */lib/lib${i}.a "${ED}"/usr/$(get_libdir) || die "copying libs failed"
-	done
-
-	# Install nss-config and pkgconfig file
-	dodir /usr/bin
-	cp -L */bin/nss-config "${ED}"/usr/bin || die
-	dodir /usr/$(get_libdir)/pkgconfig
-	cp -L */lib/pkgconfig/nss.pc "${ED}"/usr/$(get_libdir)/pkgconfig || die
-
-	# create an nss-softokn.pc from nss.pc for libfreebl and some private headers
-	# bug 517266
-	sed 	-e 's#Libs:#Libs: -lfreebl#' \
-		-e 's#Cflags:#Cflags: -I${includedir}/private#' \
-		*/lib/pkgconfig/nss.pc >"${ED}"/usr/$(get_libdir)/pkgconfig/nss-softokn.pc \
-		|| die "could not create nss-softokn.pc"
-
-	# all the include files
-	insinto /usr/include/nss
-	doins public/nss/*.{h,api}
-	insinto /usr/include/nss/private
-	doins private/nss/{blapi,alghmac,cmac}.h
-
-	popd >/dev/null || die
-
-	local f nssutils
-	# Always enabled because we need it for chk generation.
-	nssutils=( shlibsign )
-
-	if multilib_is_native_abi ; then
-		if use utils; then
-			# The tests we do not need to install.
-			#nssutils_test="bltest crmftest dbtest dertimetest
-			#fipstest remtest sdrtest"
-			# checkcert utils has been removed in nss-3.22:
-			# https://bugzilla.mozilla.org/show_bug.cgi?id=1187545
-			# https://hg.mozilla.org/projects/nss/rev/df1729d37870
-			# certcgi has been removed in nss-3.36:
-			# https://bugzilla.mozilla.org/show_bug.cgi?id=1426602
-			nssutils+=(
-				addbuiltin
-				atob
-				baddbdir
-				btoa
-				certutil
-				cmsutil
-				conflict
-				crlutil
-				derdump
-				digest
-				makepqg
-				mangle
-				modutil
-				multinit
-				nonspr10
-				ocspclnt
-				oidcalc
-				p7content
-				p7env
-				p7sign
-				p7verify
-				pk11mode
-				pk12util
-				pp
-				rsaperf
-				selfserv
-				signtool
-				signver
-				ssltap
-				strsclnt
-				symkeyutil
-				tstclnt
-				vfychain
-				vfyserv
-			)
-			# install man-pages for utils (bug #516810)
-			doman doc/nroff/*.1
-		fi
-		pushd dist/*/bin >/dev/null || die
-		for f in ${nssutils[@]}; do
-			dobin ${f}
-		done
-		popd >/dev/null || die
-	fi
-
-	# Prelink breaks the CHK files. We don't have any reliable way to run
-	# shlibsign after prelink.
-	dodir /etc/prelink.conf.d
-	printf -- "-b ${EPREFIX}/usr/$(get_libdir)/lib%s.so\n" ${NSS_CHK_SIGN_LIBS} \
-		> "${ED}"/etc/prelink.conf.d/nss.conf
-}
-
-pkg_postinst() {
-	multilib_pkg_postinst() {
-		# We must re-sign the libraries AFTER they are stripped.
-		local shlibsign="${EROOT}/usr/bin/shlibsign"
-		# See if we can execute it (cross-compiling & such). #436216
-		"${shlibsign}" -h >&/dev/null
-		if [[ $? -gt 1 ]] ; then
-			shlibsign="shlibsign"
-		fi
-		generate_chk "${shlibsign}" "${EROOT}"/usr/$(get_libdir)
-	}
-
-	multilib_foreach_abi multilib_pkg_postinst
-}
-
-pkg_postrm() {
-	multilib_pkg_postrm() {
-		cleanup_chk "${EROOT}"/usr/$(get_libdir)
-	}
-
-	multilib_foreach_abi multilib_pkg_postrm
-}
diff --git a/dev-libs/nss/nss-3.60.1.ebuild b/dev-libs/nss/nss-3.63.ebuild
similarity index 97%
rename from dev-libs/nss/nss-3.60.1.ebuild
rename to dev-libs/nss/nss-3.63.ebuild
index 22ec72ccc32c..5e3240e8db8d 100644
--- a/dev-libs/nss/nss-3.60.1.ebuild
+++ b/dev-libs/nss/nss-3.63.ebuild
@@ -94,11 +94,12 @@ nssarch() {
 	# Most of the arches are the same as $ARCH
 	local t=${1:-${CHOST}}
 	case ${t} in
-		aarch64*)echo "aarch64";;
-		hppa*)   echo "parisc";;
-		i?86*)   echo "i686";;
-		x86_64*) echo "x86_64";;
-		*)       tc-arch ${t};;
+		*86*-pc-solaris2*) echo "i86pc"   ;;
+		aarch64*)          echo "aarch64" ;;
+		hppa*)             echo "parisc"  ;;
+		i?86*)             echo "i686"    ;;
+		x86_64*)           echo "x86_64"  ;;
+		*)                 tc-arch ${t}   ;;
 	esac
 }
 
diff --git a/dev-libs/tree-sitter/Manifest b/dev-libs/tree-sitter/Manifest
index eb002139e669..19ba4e556e3b 100644
--- a/dev-libs/tree-sitter/Manifest
+++ b/dev-libs/tree-sitter/Manifest
@@ -1,5 +1,5 @@
 AUX tree-sitter-No-static-libs-gentoo.patch 793 BLAKE2B 9f80752bff2b5d327889702b6d890a4cdfefc74965a8109e692ddbf576cdea62062df0b3757c2ac8264946e549bbc9885f1b52b870f932c4805b74f5171fa718 SHA512 8eb3e40f91ea5a23ae668a7208b697d6d8c67f34f5807c0c26e8ed56357a577b3f3e6e7138d32aa69f8d1865b274595341dfe77674abf8eea1be442ca023da9d
-DIST tree-sitter-0.19.3.tar.gz 2865501 BLAKE2B 0a2480457e7b82dcbd3217ef7f36f10db9dd07f277bd8318642867135d7f54a8fed6207f2017b125c7a8f9155040518e58cdb2a70504928896f0be9da3bf89a9 SHA512 49997fc69249a7fa935cf8a66d44bf4ba8dc8f19e56d3e0ea3ff08ed4bf2334b274b1d119989bdc7d693b284148cf7537e5f2acf5708661232bcb03f8a52c552
-EBUILD tree-sitter-0.19.3.ebuild 655 BLAKE2B c6c72c40dbec80c9eb7ed3758253994f6a7f1cd04e1bc6d8f7f3d0af4a358769821b194b3e25a68872def4e1dd1c50daf58de45b1393f31d77a9e326d2c18cab SHA512 ef6c62a4348ea56b87331699dad8f5ea5347ce9b47a5c56ca77dd55c3a99d5f92bf1292df758304b898207f6442f0e3511c4cbb2af37cd4777a5e9035cd2c408
+DIST tree-sitter-0.19.4.tar.gz 2869774 BLAKE2B 4f39a565d12f2fa0cb3a68c2015fd83a3445e5951a2293e1b37ac6c98c430aaeb1e219d33b11691de2c198b0039dd2319df53ab3be8c136c25a744f1c355d48c SHA512 269a9022f11c153c2dc09446273cc65de3f4fbab7ce2c42605b1b41abc5c98368660f6f10a5fd2deb751d6b9f21cf52a4351fcfec21bd6459be681e16eb2efc0
+EBUILD tree-sitter-0.19.4.ebuild 655 BLAKE2B c6c72c40dbec80c9eb7ed3758253994f6a7f1cd04e1bc6d8f7f3d0af4a358769821b194b3e25a68872def4e1dd1c50daf58de45b1393f31d77a9e326d2c18cab SHA512 ef6c62a4348ea56b87331699dad8f5ea5347ce9b47a5c56ca77dd55c3a99d5f92bf1292df758304b898207f6442f0e3511c4cbb2af37cd4777a5e9035cd2c408
 EBUILD tree-sitter-9999.ebuild 654 BLAKE2B ea5c2ccd0f68a7cee84e56b033a9ec62166cf128ec155f8657846d059e532d71e7b7a3589b3a3e950d413c0819d075bb20aed516c056e76155c25846f8fe9bea SHA512 cbdd8310e0f137e253a7f74b2d50d259e34137472754c0ecb2edc26ef3b98964586de6d4e0f59bf0561ec366f4930c277297036ebdf62bc018aa88cfe0046a6a
 MISC metadata.xml 706 BLAKE2B 4e97ffaf578bae056a4b8d431c23132480064c4e523e03978dfc5b1ea471795ff974d2b9537d335f08369270c59cbaecf2cc2f2bca14b7b99a44ac82e25c3fd7 SHA512 df5252ea536d659a1a8382dfb0a399c666d2b15c24e706b9a0b2a9d58006ddc04739c0df37bcb9e767f8108614a5cc52e33cdf925e0bd03acbd00d390abe1d65
diff --git a/dev-libs/tree-sitter/tree-sitter-0.19.3.ebuild b/dev-libs/tree-sitter/tree-sitter-0.19.4.ebuild
similarity index 100%
rename from dev-libs/tree-sitter/tree-sitter-0.19.3.ebuild
rename to dev-libs/tree-sitter/tree-sitter-0.19.4.ebuild
diff --git a/dev-libs/uriparser/Manifest b/dev-libs/uriparser/Manifest
index 8b72e1e99db9..5963c02d95b0 100644
--- a/dev-libs/uriparser/Manifest
+++ b/dev-libs/uriparser/Manifest
@@ -1,3 +1,5 @@
 DIST uriparser-0.9.4.tar.bz2 174551 BLAKE2B b95f270685757052fca02fae0a029f08de8bc14bea733bd56e62f0bcdc6592f015453ed38c87171cea9054618328dc94a512ff816519f70594653451f751c4f8 SHA512 c5e671ce2589aacd2c562e66facbee9e1cad3101e840f40b7ebdb917fa669e0c3ae7ed75623692f601655c0b82c10bcfe3086ad628beac8f965e613228e67ecd
+DIST uriparser-0.9.5.tar.bz2 176501 BLAKE2B 5ec3d993e60c62f2478e4012354cf82f2e4155ea1a69e9a3d6611d1765fe0f3b8ba5382c928852a5fd215f51ebb0688c9d713e9f1208f18f5ce2d8b8f0fb1dca SHA512 44d36a33565b7724d721e2b5e689530227bc87e609ee78f1d23e7353480191313b1b91039c7a046566d14b83eb320c97d75e74c8ef4841e1b9c8559c3feddb34
 EBUILD uriparser-0.9.4.ebuild 1114 BLAKE2B eeef9c2c0dc64680be9608407af7eee2bf7dcc93acf558857acfdcb16bdf6cccbe8ef8653098c77e5db9851fb1df0383d8e272affd6eef9c30b6cf7db647ca15 SHA512 a53fb91fbf4a9b274cd78e6f592f191a51f17a8c80a4d3b9be5d0ad815a4ed2389e3fb54e6bfa95a2a1bcd9725fd9cdda6bf6a5d52b4720024cd632c9a7758eb
+EBUILD uriparser-0.9.5.ebuild 1413 BLAKE2B 8a27ac829f2b24d066070b45810a7bfdbdc4892a7bcf3f1c0f887b84c563df7b9f8d8a36dbabffb6f4d07a2814a5568744ec1faef619b9b369560eb04f6e3680 SHA512 0948656fa671161f1ea15d39d6035031606d479b53749d746d7de13b069c51a4908d24a766b7976df7f8c93cb37e2d4fd20162bb49a1f0b3997a0e892c956fc9
 MISC metadata.xml 542 BLAKE2B ea02a2f11456940eeab83ac904b7b8893c0c41428161f0391eeb9aecbeb51f7d22ec215455837932f0a2b193e937ce41290d5e795ab0cc434b23e13b37dc7146 SHA512 6798e6f833cbbb1ebd80cf04bc5950e5bafd8b689d79211a0a778467b9785b18720918b1822106dadcb96044df2ec8f681c3cda049b1bf3ca1fa072f409dfc45
diff --git a/dev-libs/uriparser/uriparser-0.9.5.ebuild b/dev-libs/uriparser/uriparser-0.9.5.ebuild
new file mode 100644
index 000000000000..559813f6f523
--- /dev/null
+++ b/dev-libs/uriparser/uriparser-0.9.5.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Strictly RFC 3986 compliant URI parsing library in C"
+HOMEPAGE="https://uriparser.github.io/"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+IUSE="+doc qt5 test unicode"  # +doc to address warning RequiredUseDefaults
+
+REQUIRED_USE="qt5? ( doc ) test? ( unicode )"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	test? ( >=dev-cpp/gtest-1.8.1 )
+"
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		>=app-doc/doxygen-1.5.8
+		media-gfx/graphviz
+		qt5? ( dev-qt/qthelp:5 )
+	)
+"
+
+DOCS=( AUTHORS ChangeLog THANKS )
+
+src_configure() {
+	local mycmakeargs=(
+		-DURIPARSER_BUILD_CHAR=ON
+		-DURIPARSER_BUILD_DOCS=$(usex doc ON OFF)
+		-DURIPARSER_BUILD_TESTS=$(usex test ON OFF)
+		-DURIPARSER_BUILD_TOOLS=ON
+		-DURIPARSER_BUILD_WCHAR_T=$(usex unicode ON OFF)
+
+		# The usex wrapper is here to address this warning:
+		#   One or more CMake variables were not used by the project:
+		#   CMAKE_DISABLE_FIND_PACKAGE_Qt5Help
+		$(usex doc "$(cmake_use_find_package qt5 Qt5Help)")
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	if use doc && use qt5; then
+		dodoc "${BUILD_DIR}"/doc/*.qch
+		docompress -x /usr/share/doc/${PF}/${P}.qch
+	fi
+}
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index 668cecaa25ae..513304a0f140 100644
Binary files a/dev-ml/Manifest.gz and b/dev-ml/Manifest.gz differ
diff --git a/dev-ml/merlin/Manifest b/dev-ml/merlin/Manifest
new file mode 100644
index 000000000000..9362e2aaab9c
--- /dev/null
+++ b/dev-ml/merlin/Manifest
@@ -0,0 +1,6 @@
+AUX 50merlin-gentoo.el 195 BLAKE2B a5bcca9e3af1810b18337680b4878dcfc41296b98a4b949293367935a741b0ab8dcf9f40cfbab2042fc4afd95f09b3ac9980f7daa371dab93fe39cf56245c111 SHA512 7dfbbccee288d91c010cf0bd18d490ac2fdb8c5a2f6cb5ae55697f196ba9e4965ed6c0b0140aadc0685a3bfde58a4b30ca85658876c22c9f91b456aa1753ba4b
+DIST merlin-3.4.2.tar.gz 11016272 BLAKE2B 6fa55423df7ae8f7a8056e90be630f148dd101194de1921605843caf805bd6c9694fa3fe5b8c2f8eff5d57d7d0e9d8653036b6165a49af655158925c7af87d2f SHA512 8225366ebf27ca656ca89fe00d5aec581487ae332aeab81568e7606eaf575648a7614d4d2de8e0757a4e69c6f4014fefa4574c95da13d42acb310c9dd58a468a
+DIST merlin-4.1.tar.gz 2136082 BLAKE2B 3e7e1996611f0cefb3a33b2a78cd36b6e8b84d48bc48f46c45ba340c4be1b93b4a1876f8f4192e911c1c384c416ad7502ba3c7a2abb72eff01215f9fb26bfaf0 SHA512 f0f3ada007f8214b97a8557bddca87eded48ee01a8bb88aba6476e52881ead52d9f47e2666a9292b5c6a490e4cfdc7d8bb322e8489f78eaac7b0f80b6d1e87bc
+EBUILD merlin-3.4.2.ebuild 1260 BLAKE2B 20ec2604e89c88700609644aa0c8db04c2748e685dfbe3519533ddde4e8d1b81be155b8bc254c849cef5a3658130d1527572a3434804b71497c9e9cccfe9c8ea SHA512 93e6ec146e3a5fe8df2e5f651828356ce88f45c84f0cad8ee82be461dae15f077257a39818d24c554f99933cefb49db0dc11755b323c0e5dd3ac8897e3b31ce6
+EBUILD merlin-4.1.ebuild 1236 BLAKE2B d40b0b08e7f71a0cabf92110ea63e5eebf0565af3f3e58d596be54c11e17e1d8cb96caefe061a53796195df6e08658128140159cb3857f330e45b6b2c7e1cda5 SHA512 85d9879aab5a85ad231d84c6ee98775ca0743caa4cc7cdd6b119fefebe99a0a079138a129ed2265e470a983dc2538adb2e169083726135724b0efc51409b8850
+MISC metadata.xml 309 BLAKE2B 3d87e255533b30e9d93961fd4e19b7811eeec76ca1d0a23d2e5c2dbaf7702f19b4d1825ef5f4a8673dcbe99a7c283cd6cc0c380ebedf121757a1536a90eab129 SHA512 9f83661d41366e8a258849f199e738f8ead98612c0e444f5c1221fb4d5ab803b75d0d63a7c288f5714635faae33e8669da1598b932a7c2ec8e620cb232def482
diff --git a/dev-ml/merlin/files/50merlin-gentoo.el b/dev-ml/merlin/files/50merlin-gentoo.el
new file mode 100644
index 000000000000..fbbbf2019411
--- /dev/null
+++ b/dev-ml/merlin/files/50merlin-gentoo.el
@@ -0,0 +1,4 @@
+(push "@SLITELISP@" load-path) ; directory containing merlin.el
+(autoload 'merlin-mode "merlin" "Merlin mode" t)
+(add-hook 'tuareg-mode-hook 'merlin-mode)
+(add-hook 'caml-mode-hook 'merlin-mode)
diff --git a/dev-ml/merlin/merlin-3.4.2.ebuild b/dev-ml/merlin/merlin-3.4.2.ebuild
new file mode 100644
index 000000000000..6a56c013b530
--- /dev/null
+++ b/dev-ml/merlin/merlin-3.4.2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# TODO: vim-plugin, although it's not clear how to make it work here
+inherit elisp-common dune
+
+DESCRIPTION="Context sensitive completion for OCaml in Vim and Emacs"
+HOMEPAGE="https://github.com/ocaml/merlin"
+SRC_URI="https://github.com/ocaml/merlin/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="emacs +ocamlopt"
+
+RDEPEND="
+	app-emacs/auto-complete
+	app-emacs/company-mode
+	dev-ml/csexp:=
+	dev-ml/yojson:=
+	>=dev-lang/ocaml-4.09:=
+	<dev-lang/ocaml-4.12:=
+	emacs? ( >=app-editors/emacs-23.1:* )
+"
+DEPEND="${RDEPEND}"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+	default
+
+	# Handle installation via the eclass
+	rm emacs/dune || die
+}
+
+src_compile() {
+	dune_src_compile
+
+	if use emacs ; then
+		# Build the emacs integration
+		cd emacs || die
+
+		# iedit isn't packaged yet
+		rm merlin-iedit.el || die
+
+		elisp-compile *.el
+	fi
+}
+
+src_install() {
+	dune_src_install
+
+	if use emacs ; then
+		cd "${S}/emacs" || die
+		elisp-install ${PN} *.el *.elc
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-ml/merlin/merlin-4.1.ebuild b/dev-ml/merlin/merlin-4.1.ebuild
new file mode 100644
index 000000000000..44da757af904
--- /dev/null
+++ b/dev-ml/merlin/merlin-4.1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# TODO: vim-plugin, although it's not clear how to make it work here
+inherit elisp-common dune
+
+DESCRIPTION="Context sensitive completion for OCaml in Vim and Emacs"
+HOMEPAGE="https://github.com/ocaml/merlin"
+SRC_URI="https://github.com/ocaml/merlin/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="emacs +ocamlopt"
+
+RDEPEND="
+	app-emacs/auto-complete
+	app-emacs/company-mode
+	dev-ml/csexp:=
+	dev-ml/yojson:=
+	=dev-lang/ocaml-4.11*:=
+	emacs? ( >=app-editors/emacs-23.1:* )
+"
+DEPEND="${RDEPEND}"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+	default
+
+	# Handle installation via the eclass
+	rm emacs/dune || die
+}
+
+src_compile() {
+	dune_src_compile
+
+	if use emacs ; then
+		# Build the emacs integration
+		cd emacs || die
+
+		# iedit isn't packaged yet
+		rm merlin-iedit.el || die
+
+		elisp-compile *.el
+	fi
+}
+
+src_install() {
+	dune_src_install
+
+	if use emacs ; then
+		cd "${S}/emacs" || die
+		elisp-install ${PN} *.el *.elc
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-ml/merlin/metadata.xml b/dev-ml/merlin/metadata.xml
new file mode 100644
index 000000000000..fe5fd4f15a0a
--- /dev/null
+++ b/dev-ml/merlin/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>ml@gentoo.org</email>
+		<name>ML</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ocaml/merlin</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/Faker/Faker-6.6.2.ebuild b/dev-python/Faker/Faker-6.6.2.ebuild
new file mode 100644
index 000000000000..44adab5d87c2
--- /dev/null
+++ b/dev-python/Faker/Faker-6.6.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="A Python package that generates fake data for you"
+HOMEPAGE="https://github.com/joke2k/faker"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
+	>=dev-python/text-unidecode-1.3[${PYTHON_USEDEP}]
+	!dev-ruby/faker"
+BDEPEND="
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/random2[${PYTHON_USEDEP}]
+		dev-python/validators[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/Faker/Manifest b/dev-python/Faker/Manifest
index ec3388548bf6..78f2747c2b99 100644
--- a/dev-python/Faker/Manifest
+++ b/dev-python/Faker/Manifest
@@ -4,9 +4,11 @@ DIST Faker-6.4.1.tar.gz 1073921 BLAKE2B 1434375b8341ad3143e5977b26fd22af69aee2e3
 DIST Faker-6.5.1.tar.gz 1074618 BLAKE2B dfcd80c170ae1f68c4eb541804b4f91c5c2821669e51d3231daa92c6b2818b30e6ff6a6328e5836f534a7d1ddd24d4b089adffc461e785642d7663088ba47251 SHA512 7681e9afa48f39c3a7dd41ef48e70025a4a225de3cbb6b8272279f353df7d4b956a2398ae0d84926fc1e72530accda4b2407e1b0cee116494bccfbaaf21bc38d
 DIST Faker-6.6.0.tar.gz 1114719 BLAKE2B 2e3639eba6ad74784ef30e2e7e6aa8b9fdc61c1d64babb256994068e1f54133841225b6549b4edde3539c3888acdcacf3029fe7daa414fd1142e2c1df8ac201d SHA512 1e72fa5672e310ff846f0945481d60db3749d916b37cd4e267c8ca4ffc5a2eab067622f618e9b4c8bc704155be413424f197b5796a86975b86219556116e0d47
 DIST Faker-6.6.1.tar.gz 1115484 BLAKE2B b5c99a61cf0937c10bf2eab0e34c51f38eb1aa7e87f47bbd8618874a24278bc7c2230acaffbea69f51cca760e3f3de73d32ccc487201c3bae7a544511aadac94 SHA512 a15c42291656d32f962ee50217e67cfd4038e39a6c4ba4cca6708d4ad9b4698a2b946d899e53968f4a9c2fee02c494ba756cbcc4014b16a8adeb73c83b9b428a
+DIST Faker-6.6.2.tar.gz 1115505 BLAKE2B 40bc09cafa1dfdda05bbf6c78380c5c3c0de85157dae856251063b0f099e32a08009a223dff70e3b3c037d572e4249cfee942b8749f78bd52506191dc180a13c SHA512 b6b75fd1891644e49d47acacfab9e705540003f18a8df413683e7ff0a3fb1283ede9f6020b19aee1a242a4a002ac1a34713701f283aae2089ee52d84c00764f4
 EBUILD Faker-5.6.5.ebuild 797 BLAKE2B 79802fa2f75b54f955f02417689548235864e29e38d53afca8e80f5c9d07327daec7f9a877440420ddf80a3e63a873744cffabc9022715519abf75f4f4660a69 SHA512 4d4cd1bb4f17dfbcd41eec4e5dadc73d66438ae552ff7be1ec3dba2f8a61c13d902f857185df3d3083a53adf144ce4407d2ca95be6cb7d3bf3661326bf478501
 EBUILD Faker-6.4.1.ebuild 682 BLAKE2B 592c09b3f0caa3336c660c348a9a2cb09f6eb2e97a5d5c7594fd4d8d884062cea8f16d5c27867b282f59565dc0ad075832866f386158d6ab553ff68126f5555a SHA512 dcb4a5100c6b5779d283890a98c4bca15a1d77051e82802c0d4ab3eb264b2fa89b3230958b02071e367b65a9bf489a2de7c13aa79bb901ac886b4dc03001cbfb
 EBUILD Faker-6.5.1.ebuild 710 BLAKE2B c91b7a47573bb0d362fa570c1b4242c8e31f19364ec453d4513dec64ed9258e1cfe0c96d9c875d91eaf559c6b6bbf4ac5c843bc914a531e42387511d5a05729a SHA512 b6b1e1196bc8457165d7612a8e8f67f881eebb24bf646cbfeb4bcce4bcb6e730bc8d0dfaa8f758812238bd7a7f92dbd1534f23d9bfa6a56203fa685a77f59608
 EBUILD Faker-6.6.0.ebuild 710 BLAKE2B c91b7a47573bb0d362fa570c1b4242c8e31f19364ec453d4513dec64ed9258e1cfe0c96d9c875d91eaf559c6b6bbf4ac5c843bc914a531e42387511d5a05729a SHA512 b6b1e1196bc8457165d7612a8e8f67f881eebb24bf646cbfeb4bcce4bcb6e730bc8d0dfaa8f758812238bd7a7f92dbd1534f23d9bfa6a56203fa685a77f59608
 EBUILD Faker-6.6.1.ebuild 710 BLAKE2B c91b7a47573bb0d362fa570c1b4242c8e31f19364ec453d4513dec64ed9258e1cfe0c96d9c875d91eaf559c6b6bbf4ac5c843bc914a531e42387511d5a05729a SHA512 b6b1e1196bc8457165d7612a8e8f67f881eebb24bf646cbfeb4bcce4bcb6e730bc8d0dfaa8f758812238bd7a7f92dbd1534f23d9bfa6a56203fa685a77f59608
+EBUILD Faker-6.6.2.ebuild 710 BLAKE2B c91b7a47573bb0d362fa570c1b4242c8e31f19364ec453d4513dec64ed9258e1cfe0c96d9c875d91eaf559c6b6bbf4ac5c843bc914a531e42387511d5a05729a SHA512 b6b1e1196bc8457165d7612a8e8f67f881eebb24bf646cbfeb4bcce4bcb6e730bc8d0dfaa8f758812238bd7a7f92dbd1534f23d9bfa6a56203fa685a77f59608
 MISC metadata.xml 473 BLAKE2B 339c0263dce223547f0a5267983079a02f885abc66023578dd24a602c11dfda07faffb43b78f7805fcf31804de10568baeabff695bfbd64d85863a392056436a SHA512 414f9ce994c58c60b8f58e0531208d189698c932d18b25dae03dfb0eef181452532ff57ff9b40707acc896184742a36dc3793a92217257969bb92bb886e8b67d
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 64fadd9fa42c..fb606201feaa 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index c74dc48db9b4..12104b5b078c 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -14,6 +14,8 @@ DIST boto3-1.17.27.tar.gz 349887 BLAKE2B 1fde4af489c98b8c4f77660ad278abf6641f70d
 DIST boto3-1.17.28.tar.gz 350316 BLAKE2B a6fab50a064fd81337c013bb2516ba2baaa520aa8e7f08418ddaf9b6f0d99a1c8b8eb29b8fee6ab48620430153a0caf4bd296448e1de35a26a972d2e4bbf6df8 SHA512 c26800e18bb254707f0c7e7005b22b1270eae8bf0b8c13f6bcbbe46105ff7439b36c9c80863aefd1037df314abc687bf9b00045d12fb0d3b7337b02605810876
 DIST boto3-1.17.29.tar.gz 350960 BLAKE2B 8192d2ea8165b7d10ffdd56b30ba3fadf6f2373c61fc3a9b61713bd299f246ec1b00dce897254f954a93b3b7c150e1cbe8ddf4f0a5894a071e656963d3a06299 SHA512 f662a39aa66ffead103f1d8153ba4175a4905a96b152c1c23030ead3b731cdd008a50dea5f7192d719df2240f35e0290d9b4b3c00e87e77b5d396be7e707be8f
 DIST boto3-1.17.30.tar.gz 351634 BLAKE2B e6ad4b4e09ae45684ccd799da45dcf7844149b3dd735a378e90949fd4d533df494b93ef1b97c09057336bae63103bc03f8ce1e9500a5293c617fc8267bc35e89 SHA512 d2b6ac1307ccfe71fba12ea5838726c52c4f45a9467a9b0cf01c4e6898fa0744f6c7ea4cca7294b025dcd21b9e1f15d8aabd15c56e2796035b33e8e3c52f1e45
+DIST boto3-1.17.31.tar.gz 352268 BLAKE2B eefb7bcc3c6809fc03de2f175d5c3cfa750bc8650d56d5ee18608077a88a1c09ea79c2de1ce67f7d48129d5c948a7e5e30ab261c55a381ccf5c030dc42ff0ee0 SHA512 2d603a307575ff04877105ac98068d96b676faaa89b73ef470d9341951d5fcc148a57c7e80867d93bf257854ec700f61e48575ceebe19591091bbf2a68701138
+DIST boto3-1.17.32.tar.gz 352337 BLAKE2B 0d453ecd51d17291f10d2ffa4ae7b1036dced70a5ca0eafdc5f3073829942ecde57fe20f4d0139bfb2f75bdc47a000624281258ff621b98683ea41eae1a4bc71 SHA512 1bf61e3fcd2d650a534de5e7ed471bbdfeb2be6771f1dbde057ea2e3f3b6a29d6022011b5df90bae5c7ff231aec63ec49501cc3bd42421ec510d73e712060aad
 DIST boto3-1.17.7.tar.gz 346682 BLAKE2B 08c06dda1d59b4f555cad075673917b38cbf9ad8d0037f66027b17076e60b4d5fd32a93e088635320ebc3226a9cd8809c9208ec84f8588c26a77766b21dbee98 SHA512 2ba1817575c4a64c232c84a75a9d3b0db1de8634ded9aa31844930a82ccf4611805c6dd31b2e4d36cc9a2cc1813d233b4d7366305eaf28efd46a3b843d3c2993
 EBUILD boto3-1.16.63.ebuild 1353 BLAKE2B 66c5372ceee1dbf124e71a2a2e6c5b885571f36e0ad9f409865ea83916dc2ed0d8826a01f1bdcace97a63d47253a059461e9d994c9e28f507489667c5ee796ac SHA512 7d57c590630a3b5a8ef86e66de7365c9c77c3bbd4dbbac9d376cec3cbace41e9f75dadbe5a7402f2fbe3a7a586391955d1aaa81269c5bb9bcf4f49ae54f54787
 EBUILD boto3-1.17.12.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2c27b485f9dc87888ead8bbcea0d519c2968a100e1bf309a14127c409396fd3387cb201395cc7544959705d801 SHA512 d82769ad3ccd34a04ece5b63866451d593fe6166d44a50b019ed952dc5e7c0ad7bd2c25513fc7a7b8149ac5c537cf7cac9728bff5504793cad0b8c64bef8ae6d
@@ -31,6 +33,8 @@ EBUILD boto3-1.17.27.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2
 EBUILD boto3-1.17.28.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2c27b485f9dc87888ead8bbcea0d519c2968a100e1bf309a14127c409396fd3387cb201395cc7544959705d801 SHA512 d82769ad3ccd34a04ece5b63866451d593fe6166d44a50b019ed952dc5e7c0ad7bd2c25513fc7a7b8149ac5c537cf7cac9728bff5504793cad0b8c64bef8ae6d
 EBUILD boto3-1.17.29.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2c27b485f9dc87888ead8bbcea0d519c2968a100e1bf309a14127c409396fd3387cb201395cc7544959705d801 SHA512 d82769ad3ccd34a04ece5b63866451d593fe6166d44a50b019ed952dc5e7c0ad7bd2c25513fc7a7b8149ac5c537cf7cac9728bff5504793cad0b8c64bef8ae6d
 EBUILD boto3-1.17.30.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2c27b485f9dc87888ead8bbcea0d519c2968a100e1bf309a14127c409396fd3387cb201395cc7544959705d801 SHA512 d82769ad3ccd34a04ece5b63866451d593fe6166d44a50b019ed952dc5e7c0ad7bd2c25513fc7a7b8149ac5c537cf7cac9728bff5504793cad0b8c64bef8ae6d
+EBUILD boto3-1.17.31.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2c27b485f9dc87888ead8bbcea0d519c2968a100e1bf309a14127c409396fd3387cb201395cc7544959705d801 SHA512 d82769ad3ccd34a04ece5b63866451d593fe6166d44a50b019ed952dc5e7c0ad7bd2c25513fc7a7b8149ac5c537cf7cac9728bff5504793cad0b8c64bef8ae6d
+EBUILD boto3-1.17.32.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2c27b485f9dc87888ead8bbcea0d519c2968a100e1bf309a14127c409396fd3387cb201395cc7544959705d801 SHA512 d82769ad3ccd34a04ece5b63866451d593fe6166d44a50b019ed952dc5e7c0ad7bd2c25513fc7a7b8149ac5c537cf7cac9728bff5504793cad0b8c64bef8ae6d
 EBUILD boto3-1.17.7.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2c27b485f9dc87888ead8bbcea0d519c2968a100e1bf309a14127c409396fd3387cb201395cc7544959705d801 SHA512 d82769ad3ccd34a04ece5b63866451d593fe6166d44a50b019ed952dc5e7c0ad7bd2c25513fc7a7b8149ac5c537cf7cac9728bff5504793cad0b8c64bef8ae6d
 EBUILD boto3-9999.ebuild 1350 BLAKE2B 93fe4639ced27cf1ba9a359e276c7fa8f88642fc5e1c086712a4b167cce520ef5cb0a499303ca0c544924b22d37b8928edbc9989605e792bd0d8354d772349c6 SHA512 8140e73da7a57210df954e46c9cbb4f0a76beb2817ce4f1799bd58da71eef1a032cc80dec8c25de2e47f827fe0b015bab0fe237a30ba0cc8bb360de3a60f19ee
 MISC metadata.xml 711 BLAKE2B da283ea39f4540ad2445b1b88a12509a384e2f2a2ce0ffbc3845a475015c108de69b9e9868a0e43c0fb8c8b71a6ce498ece9676b0f623ed41b89efd92790be80 SHA512 80202cdc324464906b9ae7eae889d7d00c7c773aa5c49d22d8faab7deb621bbfe31cd4e66b289eadc7065e091b8615b284760736d915aa16ee15cf1c7f9e6b5d
diff --git a/dev-python/boto3/boto3-1.17.31.ebuild b/dev-python/boto3/boto3-1.17.31.ebuild
new file mode 100644
index 000000000000..74b9170a9119
--- /dev/null
+++ b/dev-python/boto3/boto3-1.17.31.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# prevent an infinite loop
+	rm tests/functional/docs/test_smoke.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/boto3/boto3-1.17.32.ebuild b/dev-python/boto3/boto3-1.17.32.ebuild
new file mode 100644
index 000000000000..74b9170a9119
--- /dev/null
+++ b/dev-python/boto3/boto3-1.17.32.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# prevent an infinite loop
+	rm tests/functional/docs/test_smoke.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 6cb77abf95dd..d66ffdf63f48 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -16,6 +16,8 @@ DIST botocore-1.20.27.tar.gz 7518860 BLAKE2B 73a5a5302a0adfe9c72ec40f0edec8fc97f
 DIST botocore-1.20.28.tar.gz 7526082 BLAKE2B 523db8ca7ff9ae87ad30fe539f20b34f4627b3a60f58635778d81b7ab055ac7cfbe04b4c4ca6508284dd37f2e6b953210ed2def9608026490332d200f306f7a9 SHA512 f3af2bd784b96a2778361a83d0ad61e5108b0a90b3756575bc4b93aaddb13a0a07e6589f582f03ca95252b272e1f84c350c5a2e1f342f98627f70e8f42350c18
 DIST botocore-1.20.29.tar.gz 7533728 BLAKE2B 75ca3262805177118d0f1a6060d98badf54b07f3b607c4c1c0d057045f671474b11493819030a9e65080af0cdd48c8ea686836b7c9ef7bfe6098babf260f221d SHA512 92d3887929b34e5e6a80b1330e00e6a72d8cfd96b81cc36eed969361db4756607c7c447af73b05f5ff0c27699e32636df12627693c667dea0a9955d2553ea35e
 DIST botocore-1.20.30.tar.gz 7534280 BLAKE2B bfa6066e8e2c28475807b8a469257cc8fc6dfb17de231e25db411223a55bc897534e90aa2d7f2a89a21378f8dbbbae52e553333292c1726d11c60cfeea4f4f7a SHA512 3d0d2cc120a1aaa225ebbd2a9393e0d413653c44e55f99094f36d62993737a2f2b5d63a64225e207c4a21b60971fb40eb8c30059efe77cdad6681ce00d4da5ac
+DIST botocore-1.20.31.tar.gz 7544090 BLAKE2B c8c158f69463e2eaf3c817d7577bd449724bf0a409e65bd83734cb7af3c0211999e4f7d240da97f017829ee04cbd4f69af0e7ea589adcfb413498dfd831630c9 SHA512 a7f8c02b4518a25e1eb0299b3cec5791810e81b7b6b1d8c9ef2e94cd9fcba21bdcdfc3fe96955e134fc0acb78e27aff850ee352a718d2bf518c8480287a1eb26
+DIST botocore-1.20.32.tar.gz 7543258 BLAKE2B 464b1b32d32f25874cf73a57c281436a6c6095d69dbd90ac6566fbfacb58fea4162e61d58092708c243917398fb9c1898feb3ed7903515a0a2f24c6cf16278d3 SHA512 e7a7a1fac7fab4e6ec49e38909c306ed7f54b544ebe85cefb0a743aa44882707b51877d4872926be282117ecfeeef564f1345b2be8daed9cd54dcd970d5d6811
 DIST botocore-1.20.7.tar.gz 7458254 BLAKE2B 8b9a1edda73e2564d3a3d67c6b3542d1ec9372403cb4d88396e58dfbcb5987821f278f2757e079e1ab32e03243ed3a6d1023ecc591b965512b3af5e2d43ea7b0 SHA512 9b023a31be866a50b94017a28aca40b5fe2e720959c928a3fd93db96041f3886049717f50461222a09572c0c56c5961a4614b80e400e4fa6d8b3ff4b4ab681df
 EBUILD botocore-1.19.63.ebuild 1494 BLAKE2B a255e29174ab1e24312ca7e0ac20a84809bcec4671fc7d885f50426bbb7f6fcc01cf5ac1ac28eb212c755db83c67cc4407d06044d1e1af9f0edc57bfe889d140 SHA512 74ca6dc19bec8ec8fe9b9721a859de82e974bdd6a8da2f7d9f757c56f4df040927b99f5406aaf91ef84c3daf8c600debf697edaf38972c508c316ae4d279a075
 EBUILD botocore-1.20.12.ebuild 1496 BLAKE2B 3b9c7b12c0a7037482b3e60ef95ba87c8659a9d5fb52b562e0a2ad02ce44e84db9b3aca408ede04198c0c58edd4e4e91b8f1b21642493ffbe3b8b6d1d76e1ef2 SHA512 c0a226f08044b1a2c7f69becac5de9b3ad942ce3cefef699f09f176d797bb24f7dc76d3b5795eddff97f0ca52459c3d876a3a67328b74670185e12b80652ae55
@@ -33,6 +35,8 @@ EBUILD botocore-1.20.27.ebuild 1496 BLAKE2B 3b9c7b12c0a7037482b3e60ef95ba87c8659
 EBUILD botocore-1.20.28.ebuild 1496 BLAKE2B 3b9c7b12c0a7037482b3e60ef95ba87c8659a9d5fb52b562e0a2ad02ce44e84db9b3aca408ede04198c0c58edd4e4e91b8f1b21642493ffbe3b8b6d1d76e1ef2 SHA512 c0a226f08044b1a2c7f69becac5de9b3ad942ce3cefef699f09f176d797bb24f7dc76d3b5795eddff97f0ca52459c3d876a3a67328b74670185e12b80652ae55
 EBUILD botocore-1.20.29.ebuild 1496 BLAKE2B 3b9c7b12c0a7037482b3e60ef95ba87c8659a9d5fb52b562e0a2ad02ce44e84db9b3aca408ede04198c0c58edd4e4e91b8f1b21642493ffbe3b8b6d1d76e1ef2 SHA512 c0a226f08044b1a2c7f69becac5de9b3ad942ce3cefef699f09f176d797bb24f7dc76d3b5795eddff97f0ca52459c3d876a3a67328b74670185e12b80652ae55
 EBUILD botocore-1.20.30.ebuild 1496 BLAKE2B 3b9c7b12c0a7037482b3e60ef95ba87c8659a9d5fb52b562e0a2ad02ce44e84db9b3aca408ede04198c0c58edd4e4e91b8f1b21642493ffbe3b8b6d1d76e1ef2 SHA512 c0a226f08044b1a2c7f69becac5de9b3ad942ce3cefef699f09f176d797bb24f7dc76d3b5795eddff97f0ca52459c3d876a3a67328b74670185e12b80652ae55
+EBUILD botocore-1.20.31.ebuild 1496 BLAKE2B 3b9c7b12c0a7037482b3e60ef95ba87c8659a9d5fb52b562e0a2ad02ce44e84db9b3aca408ede04198c0c58edd4e4e91b8f1b21642493ffbe3b8b6d1d76e1ef2 SHA512 c0a226f08044b1a2c7f69becac5de9b3ad942ce3cefef699f09f176d797bb24f7dc76d3b5795eddff97f0ca52459c3d876a3a67328b74670185e12b80652ae55
+EBUILD botocore-1.20.32.ebuild 1496 BLAKE2B 3b9c7b12c0a7037482b3e60ef95ba87c8659a9d5fb52b562e0a2ad02ce44e84db9b3aca408ede04198c0c58edd4e4e91b8f1b21642493ffbe3b8b6d1d76e1ef2 SHA512 c0a226f08044b1a2c7f69becac5de9b3ad942ce3cefef699f09f176d797bb24f7dc76d3b5795eddff97f0ca52459c3d876a3a67328b74670185e12b80652ae55
 EBUILD botocore-1.20.7.ebuild 1496 BLAKE2B 3b9c7b12c0a7037482b3e60ef95ba87c8659a9d5fb52b562e0a2ad02ce44e84db9b3aca408ede04198c0c58edd4e4e91b8f1b21642493ffbe3b8b6d1d76e1ef2 SHA512 c0a226f08044b1a2c7f69becac5de9b3ad942ce3cefef699f09f176d797bb24f7dc76d3b5795eddff97f0ca52459c3d876a3a67328b74670185e12b80652ae55
 EBUILD botocore-9999.ebuild 1606 BLAKE2B dd2cf59015a5d45b8b0d6bf20e711d982d5314d7aacd20ed74f4c93f6d77a2fd753cf97214b7b308ba5a32afeaa32e170195db7269509fc019a0861cd3d5879e SHA512 1363331284892dd6675d5f5a5ad484572ffbc25f262f37eb14688302120a37e41b87ab35954253eca6aaad6c73f7b5221c1cd25a91baee4cb9daf53f0c48cf4a
 MISC metadata.xml 717 BLAKE2B 6b5923518aebfebb4ac5de56ccc51b6d665b81870d4cdd915265ddef063db42dc9b0a4814c8cec71b44cb1aec7050797f6e2ec8f2a499b6c2e16d9cf312f7fb2 SHA512 fef7663fe63c373d775e419b5b5cfc63a896adf32a177e856c42ebf1c7574b3956fa989c30428d9ce69b19ecf68e553f19885fef46cbcaf7b434e27b15022b54
diff --git a/dev-python/botocore/botocore-1.20.31.ebuild b/dev-python/botocore/botocore-1.20.31.ebuild
new file mode 100644
index 000000000000..4e5d698e619b
--- /dev/null
+++ b/dev-python/botocore/botocore-1.20.31.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+	# very unstable
+	sed -i -e 's:test_stress_test_token_bucket:_&:' \
+		tests/functional/retries/test_bucket.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# note: suites need to be run separately as one of the unit tests
+	# seems to be leaking mocks and breaking a few functional tests
+	nosetests -v tests/unit ||
+		die "unit tests failed under ${EPYTHON}"
+	nosetests -v tests/functional ||
+		die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/botocore-1.20.32.ebuild b/dev-python/botocore/botocore-1.20.32.ebuild
new file mode 100644
index 000000000000..4e5d698e619b
--- /dev/null
+++ b/dev-python/botocore/botocore-1.20.32.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+	# very unstable
+	sed -i -e 's:test_stress_test_token_bucket:_&:' \
+		tests/functional/retries/test_bucket.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# note: suites need to be run separately as one of the unit tests
+	# seems to be leaking mocks and breaking a few functional tests
+	nosetests -v tests/unit ||
+		die "unit tests failed under ${EPYTHON}"
+	nosetests -v tests/functional ||
+		die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/cbor2/Manifest b/dev-python/cbor2/Manifest
index b9708addf93c..9564c56e94d9 100644
--- a/dev-python/cbor2/Manifest
+++ b/dev-python/cbor2/Manifest
@@ -1,5 +1,5 @@
 DIST cbor2-5.1.2.tar.gz 73247 BLAKE2B de033651c0483aee4bb3bb31f9a997bdd6329c2941dbde65acabe7f7a3bfde37ab0322085a3107fb581e36cb6792cfb4fcf07cdbedfcec4a18a907582081d141 SHA512 81e4c3e8c727fea6db8bbed657806ace8777d8ad157395de3db7f0dab369abcd7f173f0cfad538c325a49bf90b450eab16ad2f4aa4f69c324dd0807ae0ab556f
 DIST cbor2-5.2.0.tar.gz 81467 BLAKE2B ac35cf682f15eba2c2bff81f562fe2f22906ab8da39c04cbf65f403eeacb5e640e200b15a8cca0d7eede1d0106cd8674640b3093d166a4414a2d42452a374322 SHA512 101aed37c3921ace2f4a5fbb9964ddd2ec2ffcd23fb1a9f838b2f8925f17ffaf5eb39a40b5426e176f0c97a2ba1d3a045e96ceb53312b283101900eddacc6af4
 EBUILD cbor2-5.1.2.ebuild 791 BLAKE2B 4857cc41aea07863c682974d6fa84cfdaa2924f7bdbb434682fbcfd681ef142debb90ba4eb8a8bf21a80be3479aa0fe11b35bd942b2304a60cde081267637c01 SHA512 faf1ae283ce86f9d59849e32e618c5380491511d8f9daa45b3fb64278e214448ca9032064ff632dda825e4f5245b8b4336ad9c6140cfea2cd8bb428b683c0033
-EBUILD cbor2-5.2.0.ebuild 774 BLAKE2B 0170d1710b721f70ba757f8e3909e356936e4de08cc7e0c2f9e0409b43b5ca4773cbcc0a30397446cdac1986632c0c5ef4f959bc21fcb99aebcd45283b960dc1 SHA512 a4a69dde7678552b6d5800ee135c5cdee52bb740dfe2d68d502573daaf2fa98cbc946b28b9ec3067da11e8da9a7f4a6580826ff0f6e906ce5172af9b5184109a
+EBUILD cbor2-5.2.0.ebuild 896 BLAKE2B 063f14614963d60c90aabf14f001bf724ad3b135c6e80329dfa6af71632628aa528223c605252b18e52d07394fae67451f5d1feecf23353e054b1bfd517a374b SHA512 cc731c63785f9d929f456553b4c2e2f7e9bfd3e50067cad9def7c08c58e43a0af05f5caa72a4b171ee3058f22abc8b93bf1016de696d19b6d5a590cc81ca91d2
 MISC metadata.xml 893 BLAKE2B a56c40664c6526d741a1f4e6be15cb582e0a0402182545262e3f1f489441e94a2c17072c01797e95cbea02d40b2d6addc14027596e4cd2fa49ccb4cb0feadd09 SHA512 1695d3be04f9cb86ea83f3676f5e8628b196b7044bee019ba8ce234500ee1501d013144155fe86ca8f21a10abb35074cd98fbec7da9db7f33c1046229fca9f5e
diff --git a/dev-python/cbor2/cbor2-5.2.0.ebuild b/dev-python/cbor2/cbor2-5.2.0.ebuild
index a423f3fda5a9..2c4aa4f6195e 100644
--- a/dev-python/cbor2/cbor2-5.2.0.ebuild
+++ b/dev-python/cbor2/cbor2-5.2.0.ebuild
@@ -2,8 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_USE_SETUPTOOLS="bdepend"
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit distutils-r1
 
@@ -11,23 +10,13 @@ DESCRIPTION="Pure Python CBOR (de)serializer with extensive tag support"
 HOMEPAGE="https://github.com/agronholm/cbor2 https://pypi.org/project/cbor2/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-IUSE="test"
-RESTRICT="!test? ( test )"
-
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 ~arm arm64 ~x86"
 
-BDEPEND="
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-RDEPEND="${DEPEND}"
+distutils_enable_tests pytest
 
 python_prepare_all() {
-
 	# remove pytest-cov dep
 	sed -e "s/pytest-cov//" \
 		-e "s/--cov //" \
@@ -36,4 +25,16 @@ python_prepare_all() {
 	distutils-r1_python_prepare_all
 }
 
-distutils_enable_tests pytest
+python_test() {
+	local deselect=()
+
+	if use arm || use x86; then
+		# https://github.com/agronholm/cbor2/issues/99
+		deselect+=(
+			tests/test_decoder.py::test_huge_truncated_bytes
+			tests/test_decoder.py::test_huge_truncated_string
+		)
+	fi
+
+	epytest ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/flask-sqlalchemy/Manifest b/dev-python/flask-sqlalchemy/Manifest
index 9ddfdd83641c..3832eb8ca82d 100644
--- a/dev-python/flask-sqlalchemy/Manifest
+++ b/dev-python/flask-sqlalchemy/Manifest
@@ -1,3 +1,5 @@
 DIST Flask-SQLAlchemy-2.4.4.tar.gz 132193 BLAKE2B 044885af05463bfe377ef503baea6fe8b4a988e1f23aa6e8165ba76f85626d5b596226eabd7d69b984848149c8401b136806e8a68ed568d4cce97acbf402cbb4 SHA512 9d952a39f3d116306ae15c8f802780c987e54dbe519612a9b699bb77e8a45f272e90f994697f881283d1eaf5767d42eaef2ca017d22c08e48596d385d942b1ee
-EBUILD flask-sqlalchemy-2.4.4.ebuild 700 BLAKE2B e012699d865e7d8633c9c4d2af7f3f814d8a890c08e60ff84beedece6ce41176951f3831ce6a3dd01f3acf7032f481ce7d249d48d349010c0c398f73675d11c2 SHA512 2638ef3a3f35113872c17dde5e908fe9563ecdb9eeccd59c8064c843b5976c01afdc7b01c8b1770e666703a8e35dee5da9c628b77aa48f5a3a5e3fc0868d3aac
+DIST Flask-SQLAlchemy-2.5.1.tar.gz 132750 BLAKE2B 6378766e9ae5e697f9a0fe23471f0264e5ac1f4c824657e5197f6c35f9f12eb756528641c1078b1bf470170c557c3201314a80b922b4ab84e4664a0ccaad2a6c SHA512 5d483418204030837e62769d45c16af88c5be6dbafc7c340cc4e67ef1736ea5102f506156119864cd7673cf382b0d3f27050bda64273b93ef4805fce9e1a0f6f
+EBUILD flask-sqlalchemy-2.4.4-r1.ebuild 697 BLAKE2B 639e445866ab39eb3d13311479546b0680730eb41e38e1c0cb39088091060f053c2f59710a8727c622bd3d8729f7b17aaa2ee028f089f5c9d028c9b94c13834d SHA512 762a2a2462767f16f15e707597cb5b84dd430a19324151cbbd0c01b267f04ff0299e209b7db5b719f078804993af5c312fa73779c6430ed6676d768f517799e7
+EBUILD flask-sqlalchemy-2.5.1.ebuild 702 BLAKE2B 9fa45bf33cf6f89e6bf2a77b129179166341be6fae5868bb1eefae0a0fa33021843981e52ed4a9616dd64f25503c37a6f8bbc4ef6f86cc8c927626f66d7791cb SHA512 ad72127f0e49d7f0fc10c450ba0b915a2811198fb4e83398aa60f0d9e46dff46b20e32b863eef38bb232883d73fce091f2923f8bc8df1317077171ef28c77c35
 MISC metadata.xml 723 BLAKE2B da7085b4f5d703dcf5b108c0089fffba3c1c7ca5392f16aa6ccb6ea159408af392326a553b3802e851b8ef52d971276ae599552f9234702924867ecc3471049a SHA512 cb13ee8d399034ae0dea78c1ef504865ece6d8202feffdf8672576f22b92e246b386cb55398caef1e1c6504d650428fc93f5b8aefa4481674f81b789d42844a4
diff --git a/dev-python/flask-sqlalchemy/flask-sqlalchemy-2.4.4-r1.ebuild b/dev-python/flask-sqlalchemy/flask-sqlalchemy-2.4.4-r1.ebuild
new file mode 100644
index 000000000000..7d071dda76d6
--- /dev/null
+++ b/dev-python/flask-sqlalchemy/flask-sqlalchemy-2.4.4-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{7..9} )
+
+inherit distutils-r1
+
+MY_PN="Flask-SQLAlchemy"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="SQLAlchemy support for Flask applications"
+HOMEPAGE="https://pypi.org/project/Flask-SQLAlchemy/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 x86"
+
+RDEPEND="
+	>=dev-python/flask-0.10[${PYTHON_USEDEP}]
+	<dev-python/sqlalchemy-1.4[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs dev-python/pallets-sphinx-themes \
+	dev-python/sphinx-issues
diff --git a/dev-python/flask-sqlalchemy/flask-sqlalchemy-2.4.4.ebuild b/dev-python/flask-sqlalchemy/flask-sqlalchemy-2.5.1.ebuild
similarity index 89%
rename from dev-python/flask-sqlalchemy/flask-sqlalchemy-2.4.4.ebuild
rename to dev-python/flask-sqlalchemy/flask-sqlalchemy-2.5.1.ebuild
index 8f39d7cecf39..534c2d8a08e4 100644
--- a/dev-python/flask-sqlalchemy/flask-sqlalchemy-2.4.4.ebuild
+++ b/dev-python/flask-sqlalchemy/flask-sqlalchemy-2.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
 RDEPEND="
 	>=dev-python/flask-0.10[${PYTHON_USEDEP}]
diff --git a/dev-python/google-auth-oauthlib/Manifest b/dev-python/google-auth-oauthlib/Manifest
index c31440ac032a..594f1b04ded6 100644
--- a/dev-python/google-auth-oauthlib/Manifest
+++ b/dev-python/google-auth-oauthlib/Manifest
@@ -2,4 +2,4 @@ DIST google-auth-library-python-oauthlib-0.4.3.gh.tar.gz 48020 BLAKE2B bc5e575f3
 DIST google-auth-oauthlib-0.4.1.tar.gz 18687 BLAKE2B 1c9028f6b4c306bbee51fba5b55950d129d56ff5154645a166998c0c720b125202731f1cfed60837b8103d56fcdeeb818e39491b243a8d761969f73d9f88f67b SHA512 123707139353db8e05c81138af834e35007d323f0e19ae79088ad5ca4be86dda6c0df91e2f7794711475227a60312fab9101c91b49817bf8b84866ea6374c943
 EBUILD google-auth-oauthlib-0.4.1-r1.ebuild 763 BLAKE2B 9831129d76dbb7e468426c9497146d13b2af4b98eb7f18775aaf355b7f478476f60aac5b8daf71003658df719d2068fbc2a2a9c29925d877e6e09b174bdbfca4 SHA512 64f0879d1219a780fdabf99cb7f862eb0466c1a4c0518885d77ad689f23b0d222140867ab41e15fd07f607c1b40a9f3665a8dc3ba043176a216b1a2d5cf6728c
 EBUILD google-auth-oauthlib-0.4.3.ebuild 897 BLAKE2B d27f90b749025c63ee0ccd2e986dc021b21ce0280a2e7779dbbd754a3b68a7d779627459e20f485cd2bb5a41970863e24a84b3e108a216d3185d1806e079e4b6 SHA512 af995c0a3cd0d1ea53895af11fff39bdfd9e10c7b3cc430007332a196b823ba092a73afb210130cfe0523e0d3e42d1bb42800f0e12ade6ccc385f8057ee97b6d
-MISC metadata.xml 672 BLAKE2B 4049149415f3ebbb13fb758a6a62eb3dff1fab6617ff2126bcc39ecc5e38eaf9f624d8871c12c4701cfe98bc6858cfd92c542dc3a45b4da69334dc00271d5a1c SHA512 78e87d8d98e3e43935a6587608f3863df439d0acaf4bcee49f8995426c421343a33c18c5e596f12464c160de0adccc08ce0b0aff1e5a84a54e1803c83d057682
+MISC metadata.xml 409 BLAKE2B 4b38459e52530c4fd9b3a6c3bd632a8844401d09be81207ae05a01ca1c7c8982493ea16b62a1377c0368001a5c9e08fb1ef8a34a7b29e6b4c09c9b206f7ab73d SHA512 62191a46281e5e7f0f361c9b7705b8d84b9ac215508092b3b23dc92fadb31f7cc71c0ddd76fc6ba366e86cf4a1644d14c91de32f89060beaa8a0f7988ea5d83d
diff --git a/dev-python/google-auth-oauthlib/metadata.xml b/dev-python/google-auth-oauthlib/metadata.xml
index 4944f500ac01..ad78d5438748 100644
--- a/dev-python/google-auth-oauthlib/metadata.xml
+++ b/dev-python/google-auth-oauthlib/metadata.xml
@@ -1,14 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>andreacerisara@gmail.com</email>
-		<name>Andrea Cerisara</name>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 		<name>Python</name>
diff --git a/dev-python/lark-parser/Manifest b/dev-python/lark-parser/Manifest
index 9de8773a2e4a..a018b2a28b20 100644
--- a/dev-python/lark-parser/Manifest
+++ b/dev-python/lark-parser/Manifest
@@ -1,3 +1,5 @@
+DIST lark-parser-0.11.2.tar.gz 225851 BLAKE2B b4fec8701287237442d8fd3b2519f75f70f153a0d9deba8b39ba3317df358fe1ddda738f320ff689a7a8965ab157fefea7eb121ea980c6a6d8ca1b42d63941c9 SHA512 277be4e6d56d8e2747df434518d6d7918c149a67c3f6af3f978858be86f3fae9248989823c2429dbdff4a1c1615753607f5487fd9d6705cfafec698cb9d47e4b
 DIST lark-parser-0.7.8.tar.gz 276204 BLAKE2B c2d103f41b7b6ccb988c5935c53e422d495980c1d64cba125e9d27b9b7bf03c0864904e6c2c6b40ec56e8975a8051f1a18c9da126d02fe149dc3684ea7d41c30 SHA512 52eed1a5f26fa7ba79820298a8f6f7594b2351797abdaf8fd96f76e15a11711805955e055164ce287f7204edf3d19116562795cf56db464b4f2f15e40e1da561
+EBUILD lark-parser-0.11.2.ebuild 621 BLAKE2B 13609371418dba6d3a11da93e4dec266ffad5b281e2166f502be645707303926c1d7855bee3176e86240cc2d98a679a66a51198069448796f239a24130686040 SHA512 0008e3e37ba77243a566779a0c69853df389e1dab5957ed68f606b263cb178851d25435fcea3cc4b476e87b78174f4c52effc242c5524727f831e30c6034454b
 EBUILD lark-parser-0.7.8.ebuild 405 BLAKE2B 5605f1497ae47ea1496f40fafd16eeae8de06af7dc57ed676a9edef923542bb6dd0341adddecd26403d3031b16236298b573bc993c1ead949e1b2327713c5715 SHA512 af78a75077dff7bb32690c6b49959287bbd60e74ea82b8faa811b69501990f4f4b5acea98a6750cc7b3f16ad5af4ebd4a255b7a1b34d6fa191c908c021744a6b
 MISC metadata.xml 533 BLAKE2B 5fd09d685663433a17206fbffbd3eb2d94f0d9a4d90ca5be3915a24d6390da7788b28dd718f5ba0975d1e3402aeb666039bbb1c38948bfc7b145f3b1ea5d245e SHA512 59872af1a85b64f0ac2a0afd7c72af7e43102dcb9cc10d4ed95cf65fee33a6240fe471f52bc91ea679960cdf89bc181d898b7239551071bd96759a8cc788e063
diff --git a/dev-python/lark-parser/lark-parser-0.11.2.ebuild b/dev-python/lark-parser/lark-parser-0.11.2.ebuild
new file mode 100644
index 000000000000..ae23cc260e44
--- /dev/null
+++ b/dev-python/lark-parser/lark-parser-0.11.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python module to propose a modern general-purpose parsing library for Python"
+HOMEPAGE="https://github.com/lark-parser/lark"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		dev-python/regex[${PYTHON_USEDEP}]
+		dev-python/js2py[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	"${EPYTHON}" -m tests || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/markdown/Manifest b/dev-python/markdown/Manifest
index c8ae706a8032..d251d39665a2 100644
--- a/dev-python/markdown/Manifest
+++ b/dev-python/markdown/Manifest
@@ -1,7 +1,7 @@
 DIST Markdown-2.6.11.tar.gz 274132 BLAKE2B 0d14d308c97d925db83d71f3b9be5622e77ee4a159fced15c811390b39950e81bff9ffc567f32e878cbc44014640ab0a2f596258cfd0dce6b66029105cec7370 SHA512 4e7dd3e04f181fa2751a359aede301fb29a23b9af74867ff9d1d0fdd051dcd16d04a5891e37aff0b309649c5fd13363802ec7e10fc33896e9453991efcab4a66
 DIST Markdown-3.3.3.tar.gz 319531 BLAKE2B b7a527a7d202ee955106ecddb75541285589cb006a0cb3e587f06bb06aa3be8bdf8e976a35cc2ca63b2f085a8b462f8e8d5fad84710561dc105e533939c04204 SHA512 b8e42c1471d155be6cc9aa0b6ce649454b09d36df1de51ef7e45043ae3c1c87b9b09e1fae4c680a771bee52e7fa8ea82548b78b2ffb1d38e85785f0b0de25b36
 DIST Markdown-3.3.4.tar.gz 322192 BLAKE2B 37122305112440b85d7f0e5e1bf90bafe15a8bcb84e8d8bdd9b4183dcb4be1010d287450062bab7dc9017d8e618f84a8245e6fd35f8204e5e2ece14d302fb13b SHA512 37422619dd8f542bfcf7975c92e76a39e4eeeb42386727d52037869cee1617f8efcb74a382a9c7cb903907ebf3643a27ba0de583bc0dbd327a36e72bbf8520af
-EBUILD markdown-2.6.11.ebuild 822 BLAKE2B d1c0b1c327749c1e466280cee75ba4d332787955764aa93c38b62ef5fa43c677a1dd8953f0593095eb84261a1dcc9a7ab7973a3de8a5be90bc14a9861d65f616 SHA512 1157aee6ebd2534421b4731876bcd83f1f1a88496da81a833ec3dbf2617f7f8450d0fed1aed9ec7bf3a8ab5cd5c2654571cb79c72de8a665f714caae9aae9684
+EBUILD markdown-2.6.11.ebuild 822 BLAKE2B b817bff5c3d6d1d62b86b451d49076f2b84fcf1c9e448935258c1b35fd7f3fd59173d26628ce3b6338ec87a8b9c8866e430c5585fd93d186f5b8784e7fa8b31a SHA512 4c15ff73bfdac09321c707cb962c94f106787a0787dd828c86a4629eba6801b63db1ff10ba9ca87a2397a7599b73f4aa71ddf918886d9b3c6270f3c67b735c88
 EBUILD markdown-3.3.3.ebuild 1075 BLAKE2B 7a3dbdc4535c2efc623a7bdd8d83f167fd38f238bf8fe4baa33497ef6ca1e19641ccfd0f4b25e2da1e80edfd628679b8390c037772b64f13f0f8022d8a9d438c SHA512 c9d718aaf8e7b9b6ab425f90986866c0b0a23af77f59c340ca0ca384905384ff6c379e1a9033bc8dc636edbcf009076d9c70262746e634cab8e241f8f0e79450
 EBUILD markdown-3.3.4.ebuild 1083 BLAKE2B d67987834a7615e183497110151a93fba67a0a27a2ba7017c0fee76bd0e6afdeb9ba3f626b6fedb473610e69ad593f961ba489d74a1ee177f2a31b99b43a791e SHA512 b904672d15dba86de463b19420a5838d465803f2fb7f2eaf83c9c8ee06e72b313757a6de5d95bf7755c485aab1b5f2e59873a0e96d8849ddee1a29dd598405d0
 MISC metadata.xml 399 BLAKE2B 675bf8fa68dad4dc02b4572a74a7e4cd8c7876a78d7a9769b118551ae2f4217028a67f1d206537a08d2b0e26763ef0d396b007d0ca86b498397b6aec5d516435 SHA512 713fe9c2390fc8726140a5981c63bfd901e9288fac25b3b9aa5b7d6a1d5502334df09d4b9f57a1d0f4766ce6e2c36695161ddb796c1263bc090940f99bc1d689
diff --git a/dev-python/markdown/markdown-2.6.11.ebuild b/dev-python/markdown/markdown-2.6.11.ebuild
index 1879cab8d47b..c52e5e760917 100644
--- a/dev-python/markdown/markdown-2.6.11.ebuild
+++ b/dev-python/markdown/markdown-2.6.11.ebuild
@@ -16,8 +16,7 @@ SRC_URI="mirror://pypi/M/${PN^}/${P^}.tar.gz"
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc
-~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="doc"
 RESTRICT="test"
 
diff --git a/dev-python/pgspecial/Manifest b/dev-python/pgspecial/Manifest
index 36b0ce81dad3..8c374a83fb61 100644
--- a/dev-python/pgspecial/Manifest
+++ b/dev-python/pgspecial/Manifest
@@ -2,4 +2,4 @@ DIST pgspecial-1.11.10.tar.gz 45560 BLAKE2B f4554eb812fadad984f746e8035a7a91f224
 DIST pgspecial-1.12.1.tar.gz 47945 BLAKE2B e189695a3689f76f6fd3afc3b5f7c412dfc0a79fcd2465f8bca29b81de1609e045f0237fcc6b63a75c7df1d9a31d4c04cd8fa227493d6cce4cd6863a4c36cd2a SHA512 d1ef6462ab3d1cf5fe35f0dabc61698d7c2cf7e35b292c3cb540cce4bd613485d7dca53fd549a134209461c31c8144d72d1af1ee8aad5569766d9387b7e10e0b
 EBUILD pgspecial-1.11.10.ebuild 636 BLAKE2B 9b93d173d141bad2e04a91026534e9264085e24eefd26f0e43c01c0ca795b57dfe7e93deca8e61bd4d4dd3a0a54873b3c97bbb9c322c8b07d0c92971d36381d9 SHA512 a2e6123f1235fe8af6cbe631d6795b1df9758078396f5d0659afffb6cf83304ba74f752be75143fddc8c10c212ef6703c003fd1d0b7d757749982d71f9c09c32
 EBUILD pgspecial-1.12.1.ebuild 686 BLAKE2B 59bfd0546e6aa127a4511916a7c361f115e2852c9c0706a249289f1dea09ed8db475aaaf4b451bc68d8e900e55dd4f8631339a257dda4a15a3dc8a0e0c76b1fe SHA512 5a52f96408ad5f4454551a89a02a8ff7373a928a11567fc825fd9f74cdd285b0c015c3a97313a99712c0aab9c25771828dc0c69ff80dc61df36f1190bb2110d9
-MISC metadata.xml 703 BLAKE2B 126e2d788a0c80c381fee43c8cf51fc0363ef6f257b1b7d8c19e4b5b48b982168993a5d008746b87803db2b85df6c33762c2bf41d47998b9d65ab1f5f2a449a0 SHA512 0b09e70c75d5b84476b4a5ea2e34205163947a6431ce4e713917ce081639f3e0f4b5e694ffdd9e7a511c72cccb27342a1e5b4f49786f53d97e51784125663390
+MISC metadata.xml 468 BLAKE2B 7fb95be81dcba90a99cd8ac20a7eb3bd93d926ab8da91d328806fd5d6516a8f32c46ba8721a9d490e1243eb2f1954e2ca35d4543bc8df0d2c53f60dc280a8a5a SHA512 7b558945ce12f4be5c135118b3ca4d9e565ddf5ef978c0b84af6687e15f2d26efdcf27f55efc1c85fe7b9a023a506cd219490d2baf9607cf099e921b0709df0d
diff --git a/dev-python/pgspecial/metadata.xml b/dev-python/pgspecial/metadata.xml
index 4b55905d911b..2e7271b51206 100644
--- a/dev-python/pgspecial/metadata.xml
+++ b/dev-python/pgspecial/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>andreacerisara@gmail.com</email>
-		<name>Andrea Cerisara</name>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>
 		PGSpecial provides an API to execute meta-commands
 		(AKA "special", or "backslash commands") on PostgreSQL.
diff --git a/dev-python/pydocstyle/Manifest b/dev-python/pydocstyle/Manifest
index 75dab5a597d5..e0ca4a60ec3c 100644
--- a/dev-python/pydocstyle/Manifest
+++ b/dev-python/pydocstyle/Manifest
@@ -1,3 +1,5 @@
 DIST pydocstyle-5.1.1.tar.gz 70759 BLAKE2B 3cdb519d7f9459a201c9b7bc3002e69dae76b79758b155198b3101c6817c66db01616723e789dd8105d0339d6163fec02ab50db2370b13d3a8d1c5a17ecded6c SHA512 70c7408dfa4c8e54a3abf0548a9af26a7ad7ee0bb76f3a41bf6f2297ce09c13c03ab5e066b1b15404ba6390ddfcacbc5e199d8b73ee74e3b184759d88c8b2a51
+DIST pydocstyle-6.0.0.tar.gz 72143 BLAKE2B 1036a5eab38a38bda0f98371f7e4094248cf5057a9afd8743a478f153a5f06feab6b3e7d6be031615b5e88c388786f59a0619f774f492e40a722f39973051d5b SHA512 609a10307aa24513f476ef639771fc095fe7a65ffd8d530fad02886369c62969c69a5134fd0ec79a1e07d1b6cb8f920c3478db546c26aefb0e45771777c02a0b
 EBUILD pydocstyle-5.1.1.ebuild 909 BLAKE2B 78ffa0615df8e0b6ee603a26d800321f90d0528032084f515a284c7b8c3af58dc75be2f47abb26eff07143ec2464235735441c15c5d1835d1a9ab29b199a78dc SHA512 4da34c492a74c28dcc9b2212b9a79d7cbbb557b2c4cbd8bfa74f29a5f6c70f59dee98f1fe4d55c5376a1bac106ca0fc475dfbf560a1e8415e371e147793055f7
+EBUILD pydocstyle-6.0.0.ebuild 875 BLAKE2B 8b3b39f07dfa8c85baaeac6cbd3cd775b63f357f63b9ceda46e814ab0d7901bd44268082f51227a222548d871eb44d1b92fba2c7c3530742863ac0ac6e2fdb8e SHA512 f6436fd155f5b2bbb5a8e0d3edd3a325bbdf77fbbe20b1b7339496c69c84760cb46e6eb797f2e7625b96cc77164da90f75e897127589c6f06af5b7f39fe592a8
 MISC metadata.xml 817 BLAKE2B 850fe7b35b30a2d302a49409979b3ff43916b19bf2e970da7b1cad7e76cabb66c217fa68198959a1c2595766398151221643184812d98165045e7498b2d38932 SHA512 8e9b85d0e13750e8beacc06c3c448a6a9e3876216d882f34c7a0f75bf64911aa8335dd38221af8852fa399008ba740c5dd3038f465de14d55b465c3114754920
diff --git a/dev-python/pydocstyle/pydocstyle-6.0.0.ebuild b/dev-python/pydocstyle/pydocstyle-6.0.0.ebuild
new file mode 100644
index 000000000000..13f713bc7638
--- /dev/null
+++ b/dev-python/pydocstyle/pydocstyle-6.0.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Python docstring style checker"
+HOMEPAGE="https://github.com/PyCQA/pydocstyle/"
+SRC_URI="https://github.com/PyCQA/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="dev-python/snowballstemmer[${PYTHON_USEDEP}]"
+
+distutils_enable_tests --install pytest
+# Requires network to lookup github issues
+#distutils_enable_sphinx docs dev-python/sphinx_rtd_theme dev-python/sphinxcontrib-issuetracker
+
+src_prepare() {
+	# no, seriously, you don't need to install it yourself
+	sed -i -e '/pip/d' src/tests/test_integration.py || die
+
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/reno/Manifest b/dev-python/reno/Manifest
index 228de3e9ac5d..bf9b2768a237 100644
--- a/dev-python/reno/Manifest
+++ b/dev-python/reno/Manifest
@@ -1,3 +1,5 @@
 DIST reno-3.2.0.tar.gz 77316 BLAKE2B 43fe83a5f4c3e812daa3d2456f6c3b0bc7ba661193187f05527108e7b182dd078ec7a26b39e2939d51efc231e60f3d503479a4729b391faf764fa1e5d941c967 SHA512 b0399e5472afa4c883af563949cf4083571ee6dfcc05babb9845fa44fb9cfa2d0a1be6f315915597c22e86e0504102cb4f90aee59273ccbaceb15e93ed078b65
+DIST reno-3.3.0.tar.gz 81168 BLAKE2B 46afacfa437c9d5fed49d454edaf92b96ffbd677de02d91c7fd431b5ae98764918e099dd486345907446a19b2c94a1c36ac5cff9cf6d911438b48d41d9585ba1 SHA512 0fb6ff09e71b829cabe452693aac0c3a14d44f75f93e8934ebd0b0861e7dcd749a92b7bf19bc4f46202ecb02840edd6d5e5787c8b8a5b64a6b91fb52fe18287d
 EBUILD reno-3.2.0-r1.ebuild 1100 BLAKE2B 2e2123dfa3f760d88220006dc9bcbf915999c69473a1c2113f18b038ca4025b33cbaa31ab06a879d55ab7bcc5c2e80eb911c5b5cf8aa395bf5e3ee3db08cfc60 SHA512 5501d3ca55123aeeb1eb161e6542c6aadf9c3bb85b2e1802316e97c4ef5230d2887c31d58f47b56c7913df23f44e9809d5e37b24178695e5b617ff36317a8777
+EBUILD reno-3.3.0.ebuild 1103 BLAKE2B 231bde082a0b1179e350b769a84d0dc0796c826b087aae42bf53b3d28a1e59e2051a00f8e60e64a13e67ae0600bdca9becc3c7adcf00bdce1be8bc25e70f127c SHA512 d3f9df7acc97f0fbdce0a97f14532a4620c6fdb7942a08ea6de76a7427026434abc8816c0c8b912822031468d1098aa02385bdd0110707a9d8689d5207c9ba3b
 MISC metadata.xml 345 BLAKE2B 64bb3d1c4711fd517770e90167d9edcab33908e0f9ba511b8ae1c0e1ad6181bd4c4d2639d6cf802aeeef8cc77e623d749a3522e73e53514ecf39b30b77f8072b SHA512 127fc0515eae674566848c406e6695ca20d7db100d1378713d8900f25b2ec957eb89eb7f075aafc3efb48b3db7b290e88480248c78bf94456f680c528c7e6269
diff --git a/dev-python/reno/reno-3.3.0.ebuild b/dev-python/reno/reno-3.3.0.ebuild
new file mode 100644
index 000000000000..0dfe678e41c6
--- /dev/null
+++ b/dev-python/reno/reno-3.3.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Release notes manager, storing release notes in a git repo and building docs"
+HOMEPAGE="https://pypi.org/project/reno/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-python/pbr[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.3.1[${PYTHON_USEDEP}]
+	>=dev-python/dulwich-0.15.0[${PYTHON_USEDEP}]
+	>=dev-python/packaging-20.4[${PYTHON_USEDEP}]
+	>=dev-python/docutils-0.11[${PYTHON_USEDEP}]
+	>=dev-python/sphinx-2.1.1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/pbr[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+	)
+"
+
+# The doc needs to be built from a git repository
+distutils_enable_tests unittest
+
+python_prepare_all() {
+	# Some tests need to be run from a git repository
+	rm reno/tests/test_{cache,semver}.py || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/s3transfer/Manifest b/dev-python/s3transfer/Manifest
index 82e3c46b2e53..c1d2922b43de 100644
--- a/dev-python/s3transfer/Manifest
+++ b/dev-python/s3transfer/Manifest
@@ -1,4 +1,8 @@
 AUX s3transfer-0.3.3-py38.patch 1296 BLAKE2B 8b951643ec020c837c9fbf3678aa60923ab5345615c4868070884223baa59a54251de5c7601cb798fa580e1c58721c0285c5e74f23ace8a207136f2f2067b4e5 SHA512 54c88be4cccc8de33d773d01e4fec613e3d84c3a7e41c19323ea77e5bede433e65253f71469262aa0565258f8cd4f03829815e96741fe26e4bd890001eb9f2b3
 DIST s3transfer-0.3.4.tar.gz 118954 BLAKE2B 71436d3c8921650dfd2c3aec8a0ddbb2cdee8bb82da605b7a7cc38af112eccb9e2742720c597e01aff57fdd067f8a16a9789f5d5b56dd13f84977607e16ef470 SHA512 012b50cebff200dff3a424241bd0a1aa32bf88cb57a4e3a4616d96aac7c8d5d07e7bfee3a298195f55630d01925d27a3063701d915c6bd080dc2e9f7c01880e9
+DIST s3transfer-0.3.5.tar.gz 118959 BLAKE2B 8666ec91058752a1862582f886d373bd4eebbb3684571e1fcb0648e2c4ef3f24366b4e496960715487b6f1fb7fdc96f0031ee48259984f2bcdfbb2a8fe3d33bb SHA512 2a5a0b3163a8ae7097d82f897afec97533acc0d1a03271b5e261bc0b98a9af5a0fa0d594cc4cb701c1698bbc347d10b2b105c4393f349bfd5ef628d1844e7ddb
+DIST s3transfer-0.3.6.tar.gz 118877 BLAKE2B 0567b69ee71bd470b3b5bccce3db3e923eee6d8744d9e0e5a1789f3ba5f419742859f530ab43295e5ccb7ffe3c04da8db7ef92c973afac97ff2580bc13c6934f SHA512 3bf97f080b63a88f2860051ef9c0ecd4f06adf1a22eb5bd57c543532f7e85c39f722f0c9cd24022ac0ed3a54ca48a089a10b86703cb866730e265e53acbe602f
 EBUILD s3transfer-0.3.4.ebuild 731 BLAKE2B b81ae9a3411f6f4e5633da1fef1b34108e01c4c34dfaaf0d55bfc318984fcb670dc7414acde89b4789f37bd34c370f89832d3ae30a84d33a91a348b422860961 SHA512 19232c442fc89e2c7272255507cb9c21f23eb4cd3c04848798a799f9b089934b8dec296120ce6b211fd686ae1a9ae3c00f5573ec932c21d5828ab2312474c7bc
+EBUILD s3transfer-0.3.5.ebuild 629 BLAKE2B 3c55ebd4b1fdd64f387ba78c14b5f39b757c93e0603d7f6f8e631851fe00440fd2659db1bbe16a804dbf82bbd1784b07d2cda2e06206bc1a24272545b852666f SHA512 51a34516a4f957ef97a0c85b948b32570f330052b89836ab34a2255bbbbfc545a1c523b4c6ec57ef29b7f90ce7821e67dc0fe7374fae422eadcb672575ff2807
+EBUILD s3transfer-0.3.6.ebuild 629 BLAKE2B 3c55ebd4b1fdd64f387ba78c14b5f39b757c93e0603d7f6f8e631851fe00440fd2659db1bbe16a804dbf82bbd1784b07d2cda2e06206bc1a24272545b852666f SHA512 51a34516a4f957ef97a0c85b948b32570f330052b89836ab34a2255bbbbfc545a1c523b4c6ec57ef29b7f90ce7821e67dc0fe7374fae422eadcb672575ff2807
 MISC metadata.xml 502 BLAKE2B 36893006073506d27c6f9c13e6b823e251906bd046a297c36373a2132ef809ad0babc4819122f89ce5b26e7c0ef1c410924594a27ff32c911c3c519cfd722889 SHA512 855d52af629703d3f31e35c16723220b26f45f977e131e41fe4a1ae9a98fb18a60fd89315a59c3f7d436d17a469ba8101e79d859d6968e627d423ef26894ab24
diff --git a/dev-python/s3transfer/s3transfer-0.3.5.ebuild b/dev-python/s3transfer/s3transfer-0.3.5.ebuild
new file mode 100644
index 000000000000..48ca166b1782
--- /dev/null
+++ b/dev-python/s3transfer/s3transfer-0.3.5.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+
+inherit distutils-r1
+
+DESCRIPTION="An Amazon S3 Transfer Manager"
+HOMEPAGE="https://github.com/boto/s3transfer"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/botocore[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	epytest tests/{unit,functional}
+}
diff --git a/dev-python/s3transfer/s3transfer-0.3.6.ebuild b/dev-python/s3transfer/s3transfer-0.3.6.ebuild
new file mode 100644
index 000000000000..48ca166b1782
--- /dev/null
+++ b/dev-python/s3transfer/s3transfer-0.3.6.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+
+inherit distutils-r1
+
+DESCRIPTION="An Amazon S3 Transfer Manager"
+HOMEPAGE="https://github.com/boto/s3transfer"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/botocore[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	epytest tests/{unit,functional}
+}
diff --git a/dev-python/soupsieve/Manifest b/dev-python/soupsieve/Manifest
index aab58812ebc0..927a354b051b 100644
--- a/dev-python/soupsieve/Manifest
+++ b/dev-python/soupsieve/Manifest
@@ -1,3 +1,5 @@
+DIST soupsieve-2.2.1.tar.gz 99298 BLAKE2B 94532421f3b8e49d6ab75a54a60ac861a78eee9f6792ded096e39a8a43d46d195cff9b7d8feab918b0f2debc8a6dd35226ab714384fa7f4d795176e269b6c4cb SHA512 c1339cfca237af7f8915b6d644b8271f769f9a37aa68f8acf536236551baaf9bb44a2f2a736f9168a7649cde14d37b8c24614c9491acbf81e3f4fdaea96b4928
 DIST soupsieve-2.2.tar.gz 99261 BLAKE2B 637bed198a62a7f92f6b3c022dcb9a579c15a3dcb1e3581b5a18b9ff804c2075c976c3478f86d2400841c177f3160dc05da41991ca56731c91e6db5b95262671 SHA512 26402c831c19c9b133442dd8ea31363e1eadc3cafe172b933cdbc746df6dc9961e930d4fbe8399b847848bf3fcd5893d2449e912ed0cdf8766468997acf5ee87
+EBUILD soupsieve-2.2.1.ebuild 716 BLAKE2B 8ed0f3b1c9c3872d0d55cf502fee7968f958ab7573334a9a7cb272ba8bee1e2a4a83ee7edf63c9f6a12cb4a613b2269c2ae4117bca862673a59b6e955df183a7 SHA512 4a8267e6fbb07a3f56226dd94484714b3937037bdfa7f5d352ddd30a60fff94e1ef48826b5690e7a57508077233cd0124d212d368416cf7848f00a79be47ae10
 EBUILD soupsieve-2.2.ebuild 749 BLAKE2B 44429a899b62211112f7162e4a39f1d420009aead6ff24da64f2cab1d732dd53702ab3734bc8bd835724e97b10d82c08fbe2ea6c9e1f5b91374eacb984ac7119 SHA512 d561cc99db56fe9e10dc015b5b04bb6926dcfa54f3836ca6db5e118e802eb4ec18455a4bc55bf636cbe199c3c65bd3207dc61fdc470e214c96812de396785fcb
 MISC metadata.xml 398 BLAKE2B 0aea8c93259062872f7899179236d9ee52a85d4055e3a5eee8e3643127611686b989c0985ed571d491734e80e45598dd1ad9e4fc25f56ba5e657b28a8a9eaf37 SHA512 36a527cf2a4572c0149f7cd344c3247309b89ef461d65347dfe30129ade1742bc54ffcc6d1483971a2adbe5e4de3a15ef73f6e8ba631f4dabba8d32a3bb2c288
diff --git a/dev-python/soupsieve/soupsieve-2.2.1.ebuild b/dev-python/soupsieve/soupsieve-2.2.1.ebuild
new file mode 100644
index 000000000000..4dfffada94ea
--- /dev/null
+++ b/dev-python/soupsieve/soupsieve-2.2.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A modern CSS selector implementation for BeautifulSoup"
+HOMEPAGE="https://github.com/facelessuser/soupsieve/
+	https://pypi.org/project/soupsieve/"
+SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
+
+BDEPEND="
+	test? (
+		dev-python/beautifulsoup[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/html5lib[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 46134eb31557..79cf1f70a0ab 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/idea-community/Manifest b/dev-util/idea-community/Manifest
index cd7658655862..3b84dbf3adb4 100644
--- a/dev-util/idea-community/Manifest
+++ b/dev-util/idea-community/Manifest
@@ -2,5 +2,6 @@ AUX idea-community-jdk.patch 485 BLAKE2B 3ccbddf308b1cb1af020086e7568e05b4a60b28
 DIST ideaIC-3.1.203.6682.168.tar.gz 577542631 BLAKE2B d47d017b76fa9106a55805b558bd49d6d45dd216ac28151f03cc2a7f3a751707b62fa49623bb04b426d90cfd1cce4e04b2490bb91ec01dfeccdf4a80f1694f7e SHA512 71849f9440c34359a23af1f4735c3b0ac6378f6ab8ddf5799ad7e26036dc87b4abbc234043bd368a7698daf91f83cf989539054db7e1fb9ea95ebf7d756ac068
 DIST jbr-11_0_8-linux-x64-b1098.1.tar.gz 191689225 BLAKE2B 0da0f0e834709c89820f2e7e1c447dc33ea1c59c7dfb573aa47bc205f7920ccf485454f79931d42d4e6eb4de1017589bb908808d6a80cc586659757abc9958d3 SHA512 a455d8bd3332622592186cd7ae3995a9148a47717a81c274497f5408f1e89ef637c7478321b4ccd5dbe97c2e246a16ac8956c5ce475f8a4156232647f0ea7737
 EBUILD idea-community-2020.3.1.203.6682.168.ebuild 4024 BLAKE2B 6d1449e6d05c75658960eca5962fc59b4c51f8cf2da6b92f8bc03eacd26c0ea80c6d6dcfabe6929874dcc24a01f6ee6ad45af48abfc59c6e7fb481963ff7bb77 SHA512 7b82f9c06a7924db2c07e96bfddbfa97b84d54039d8e703988721be8a16fcc9836248038f95f1825f541a5798d5d6510e81f46defb4a6d0f8a4b10cdd564ed0f
+EBUILD idea-community-2021.3.1.203.6682.168-r1.ebuild 3954 BLAKE2B 0a76c751daec71affcd5b117559798b48862a89e1494cd27b328c27e5cb64fe59cbfc0ca28475e7572f418cf62920aa79d69a29c07f740e05bc031b8e1ec819d SHA512 bc0833aa192e0ca5fdaddbb8a27aaa7bf4fc9fc89cbad122c919c700f57af9f291fe59e5cd7b7a1c46479693922d0015e28e1f85000690d57d5d0af69e00f887
 EBUILD idea-community-2021.3.1.203.6682.168.ebuild 4024 BLAKE2B 6d1449e6d05c75658960eca5962fc59b4c51f8cf2da6b92f8bc03eacd26c0ea80c6d6dcfabe6929874dcc24a01f6ee6ad45af48abfc59c6e7fb481963ff7bb77 SHA512 7b82f9c06a7924db2c07e96bfddbfa97b84d54039d8e703988721be8a16fcc9836248038f95f1825f541a5798d5d6510e81f46defb4a6d0f8a4b10cdd564ed0f
 MISC metadata.xml 453 BLAKE2B f244aa814b9eb5c6b00f6fea725a344a7413710b1fae03edc4590dfa9c102872e0e4d1cdb669f739854d7fac351002f7819aec371f3bd0eeef2fdd4aa2c8f60b SHA512 e6c5f1094ca8ba70b9bfd5b028f11542c8150cea0b543b939da144887043e4ee20ddf6cc89641329bde7456492d6def6f0e72092b7fa21095463a20aba9e0b03
diff --git a/dev-util/idea-community/idea-community-2021.3.1.203.6682.168-r1.ebuild b/dev-util/idea-community/idea-community-2021.3.1.203.6682.168-r1.ebuild
new file mode 100644
index 000000000000..e6baaa247430
--- /dev/null
+++ b/dev-util/idea-community/idea-community-2021.3.1.203.6682.168-r1.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit eutils desktop
+
+SLOT="0"
+PV_STRING="$(ver_cut 2-6)"
+MY_PV="$(ver_cut 1-3)"
+MY_PN="idea"
+# Using the most recent Jetbrains Runtime binaries available at the time of writing
+# ( jre 11.0.8 build 1098.1  )
+JRE11_BASE="11_0_8"
+JRE11_VER="1098.1"
+
+# distinguish settings for official stable releases and EAP-version releases
+if [[ "$(ver_cut 7)"x = "prex" ]]
+then
+	# upstream EAP
+	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${PV_STRING}.tar.gz"
+else
+	# upstream stable
+	KEYWORDS="~amd64 ~arm64"
+	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${MY_PV}-no-jbr.tar.gz -> ${MY_PN}IC-${PV_STRING}.tar.gz
+		amd64? ( https://bintray.com/jetbrains/intellij-jbr/download_file?file_path=jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz -> jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz )"
+fi
+
+DESCRIPTION="A complete toolset for web, mobile and enterprise development"
+HOMEPAGE="https://www.jetbrains.com/idea"
+
+LICENSE="Apache-2.0 BSD BSD-2 CC0-1.0 CC-BY-2.5 CDDL-1.1
+	codehaus-classworlds CPL-1.0 EPL-1.0 EPL-2.0
+	GPL-2 GPL-2-with-classpath-exception ISC
+	JDOM LGPL-2.1 LGPL-2.1+ LGPL-3-with-linking-exception MIT
+	MPL-1.0 MPL-1.1 OFL ZLIB"
+
+DEPEND="
+	|| (
+		~dev-java/openjdk-11.0.9_p11:11
+		~dev-java/openjdk-bin-11.0.9_p11:11
+	)"
+RDEPEND="${DEPEND}
+	dev-java/jansi-native
+	dev-libs/libdbusmenu
+	=dev-util/lldb-10*"
+
+BDEPEND="dev-util/patchelf"
+RESTRICT="splitdebug"
+S="${WORKDIR}/${MY_PN}-IC-$(ver_cut 4-6)"
+
+QA_PREBUILT="opt/${PN}-${MY_PV}/*"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-jdk.patch"
+)
+
+src_unpack() {
+	default_src_unpack
+	mkdir jre64 && cd jre64 && unpack jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz
+}
+
+src_prepare() {
+
+	default_src_prepare
+
+	if use amd64; then
+		JRE_DIR=jre64
+	else
+		JRE_DIR=jre
+	fi
+
+	PLUGIN_DIR="${S}/${JRE_DIR}/lib/"
+
+	rm -vf ${PLUGIN_DIR}/libavplugin*
+	rm -vf "${S}"/plugins/maven/lib/maven3/lib/jansi-native/*/libjansi*
+	rm -vrf "${S}"/lib/pty4j-native/linux/ppc64le
+	rm -vf "${S}"/bin/libdbm64*
+	rm -vf "${S}"/lib/pty4j-native/linux/mips64el/libpty.so
+
+	if [[ -d "${S}"/"${JRE_DIR}" ]]; then
+		for file in "${PLUGIN_DIR}"/{libfxplugins.so,libjfxmedia.so}
+		do
+			if [[ -f "$file" ]]; then
+			  patchelf --set-rpath '$ORIGIN' $file || die
+			fi
+		done
+	fi
+
+	patchelf --replace-needed liblldb.so liblldb.so.10 "${S}"/plugins/Kotlin/bin/linux/LLDBFrontend || die "Unable to patch LLDBFrontend for lldb"
+	if use arm64; then
+		patchelf --replace-needed libc.so libc.so.6 "${S}"/lib/pty4j-native/linux/aarch64/libpty.so || die "Unable to patch libpty for libc"
+	else
+		rm -vf "${S}"/lib/pty4j-native/linux/aarch64/libpty.so
+	fi
+
+	sed -i \
+		-e "\$a\\\\" \
+		-e "\$a#-----------------------------------------------------------------------" \
+		-e "\$a# Disable automatic updates as these are handled through Gentoo's" \
+		-e "\$a# package manager. See bug #704494" \
+		-e "\$a#-----------------------------------------------------------------------" \
+		-e "\$aide.no.platform.update=Gentoo"  bin/idea.properties
+
+	eapply_user
+}
+
+src_install() {
+	local dir="/opt/${PN}-${MY_PV}"
+
+	insinto "${dir}"
+	doins -r *
+	fperms 755 "${dir}"/bin/{format.sh,idea.sh,inspect.sh,printenv.py,restart.py,fsnotifier{,64}}
+	if use amd64; then
+		JRE_DIR=jre64
+	else
+		JRE_DIR=jre
+	fi
+
+	JRE_BINARIES="jaotc java javapackager jjs jrunscript keytool pack200 rmid rmiregistry unpack200"
+	if [[ -d ${JRE_DIR} ]]; then
+		for jrebin in $JRE_BINARIES; do
+			fperms 755 "${dir}"/"${JRE_DIR}"/bin/"${jrebin}"
+		done
+	fi
+
+	make_wrapper "${PN}" "${dir}/bin/${MY_PN}.sh"
+	newicon "bin/${MY_PN}.png" "${PN}.png"
+	make_desktop_entry "${PN}" "IntelliJ Idea Community" "${PN}" "Development;IDE;"
+
+	# recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
+	mkdir -p "${D}/etc/sysctl.d/" || die
+	echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf" || die
+}
diff --git a/dev-util/pkgconf/Manifest b/dev-util/pkgconf/Manifest
index 89b3a0f725a8..8e35b276d428 100644
--- a/dev-util/pkgconf/Manifest
+++ b/dev-util/pkgconf/Manifest
@@ -1,9 +1,9 @@
 AUX pkgconf-1.7.3-darwin9.patch 517 BLAKE2B f6f2374bb32aa2e9513df0c91e51ee41e0c8d1c847c3d00ac3a420a6299d3abca74d211b0e3b52a41d1a64d737d18d4348e5ea72ae5537425d14e8bac1fd1a67 SHA512 f55e795a503d5a0349968a6b69f3aae6335d90daa38c6f829f7ce54ab63beedde48e37a59397263aa8dffefbabc1bd9d22aeeff8d0111f7e317b580272aa3d41
 DIST pkgconf-1.6.3.tar.xz 291216 BLAKE2B 04bf58590e2f0b37bac7b24b3d595ad08680e85647548cbd642495398d95706f9f738af5c6f9b9ad8801567caa20ade85d4c4d74179f08313420683cb1b34263 SHA512 437c5a5c9866e2047e62e0592639930b2420d4afd41d98cef51f3475165418a39e916477860025314828a6ee0a4eefc10fdf26bda66f80c291f324d9674fa5c1
-DIST pkgconf-1.7.2.tar.xz 292944 BLAKE2B dd0197afb75590e18b6ec8c76f9a7109edc3a0934b6b9ef7bf4006ffa73b0083d2a4aa120f2f3bd0a0e9d5fd564fd7d387aedeaa297fe72c63bc440518a51c6d SHA512 b0376178e93743fd844bdc94b5fa2678521ffe5022323e20f3c5196d500a87c3546d0edc2ac22e92cb528348116e2826d6f144bd7bd18d3f0afaa5cda74f25cd
 DIST pkgconf-1.7.3.tar.xz 293148 BLAKE2B b0fdad9e86c7e2aaf5f268de779730e55e14d6f0ddbec50f354b888aa9ca284f6d1d4c462f00b815cd6e0e17a3b41025ce77485f66a7d527f519a7b80283774d SHA512 37b6c4f9f3b93970e35b6970fde22fbbde65e7fa32a5634b3fdfc25cc1f33843582722ad13d9a8e96fd6768406fcbe86bf5feb76996ddd0bb66d6ff91e65f0b6
+DIST pkgconf-1.7.4.tar.xz 293888 BLAKE2B af814174b59e3ea7009230f639a6237226caafb22300946904dd10810c0b5cfcbfeea21767a3a1d2c2b5cb1fe4b7b1d995a52d820fcfce3adb383c66762b7576 SHA512 92c080684898b42824a1f1a7e3ce8a600896fc9c20fcf263f032b856fa4c7139607f87ba44d18ed358b8c5f4f04477708800d20a4e10f96e4268a55682f7f0c1
 EBUILD pkgconf-1.6.3.ebuild 1667 BLAKE2B 17a7957cfa6994523620d43977f569d1e82c229ce67f478a3531e03b94bc40bbb0c1a76f1d01fe38b6369c700e0f8f79aa4c3aa92f4a9ef4cc1a0d139cb391f8 SHA512 bb283e3c29ca6bed10c5c4357c8e9456b7fc169881d8d708155e56bcfca2ebe5dc90a27f3e6c4b8a8289d6b15e7605d6faeafe651d8da0ed1e4ceaf1cd2eaef5
-EBUILD pkgconf-1.7.2.ebuild 1676 BLAKE2B 415269c2b15399d877263b95ea77f56f065ec2fc4047228dabeeea5e65df62cf91a47cd23dfa2865a67101e419b36b63c88df2ea804c0ce7cf87d836dcaf0fb3 SHA512 367c84f00478c27a93e3be87243af32693a072fc7e12ecb2ff0d0baf08ddcc16c2ec080904c58c8fdf7864d04fd33e0a79284274d357dcd349d75258662a5139
 EBUILD pkgconf-1.7.3-r1.ebuild 1873 BLAKE2B ebe897ccef4d85b6e69318ccc11d4ecde771b5c6b61fd166f09a673481c5016612f79692ddab4147228a8018f310fa2c79b678ce23ab6437b35816058f3077c1 SHA512 88f90221e933b8b20d64836b4d7b06e914e03fb7058c1f1d895d02d72cfb76735ab3252a485001ccb412af32f2edd5fd2b23209662daced0f98f01a7616329d7
+EBUILD pkgconf-1.7.4.ebuild 1873 BLAKE2B ebe897ccef4d85b6e69318ccc11d4ecde771b5c6b61fd166f09a673481c5016612f79692ddab4147228a8018f310fa2c79b678ce23ab6437b35816058f3077c1 SHA512 88f90221e933b8b20d64836b4d7b06e914e03fb7058c1f1d895d02d72cfb76735ab3252a485001ccb412af32f2edd5fd2b23209662daced0f98f01a7616329d7
 EBUILD pkgconf-9999.ebuild 1766 BLAKE2B c470aa4fc8eeb6c2e61c636eab8d9b1684eda76d1d7f2c5734e5159ae9ab4f905adbdb372166ba38ab13bc5bf83c92022c07023a0ca7ac512baa0c348086ff1a SHA512 c101e8a92926436c40a82da763c6a92a43e503b10014cd59ed202b1ea257de52f12e5c8d1bd91ea23aa07880e11a0bf8fbaea89009cf563fa9495e3b8b8a9efe
 MISC metadata.xml 605 BLAKE2B 316f82c4daabf91792e48e82973daaf0b0af972f7760636990e64c94e5e68b41b7cf65fa5d15387ce81a25926a5ffea19519ffe29a1ae487046d973708495b75 SHA512 68a71f55636e987c721da3c54451c75068e3261a0b462189fed45309bb4c286d0ec00a8a29962969b54ac8e31a13a34167cfc3fd44f5da8b84e4ce36eb5b4b10
diff --git a/dev-util/pkgconf/pkgconf-1.7.2.ebuild b/dev-util/pkgconf/pkgconf-1.7.4.ebuild
similarity index 78%
rename from dev-util/pkgconf/pkgconf-1.7.2.ebuild
rename to dev-util/pkgconf/pkgconf-1.7.4.ebuild
index 40e4e28319d4..3923dd6417ea 100644
--- a/dev-util/pkgconf/pkgconf-1.7.2.ebuild
+++ b/dev-util/pkgconf/pkgconf-1.7.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2012-2020 Gentoo Authors
+# Copyright 2012-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://git.sr.ht/~kaniini/pkgconf"
 else
 	SRC_URI="http://distfiles.dereferenced.org/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~ppc-macos ~x64-macos"
 fi
 
 DESCRIPTION="pkg-config compatible replacement with no dependencies other than ANSI C89"
@@ -30,11 +30,7 @@ BDEPEND="
 	)
 "
 RDEPEND="
-	pkg-config? (
-		!dev-util/pkgconfig
-		!dev-util/pkg-config-lite
-		!dev-util/pkgconfig-openbsd[pkg-config]
-	)
+	pkg-config? ( !dev-util/pkgconfig )
 "
 
 MULTILIB_CHOST_TOOLS=(
@@ -44,6 +40,8 @@ MULTILIB_CHOST_TOOLS=(
 src_prepare() {
 	default
 
+	[[ ${CHOST} == *-darwin9 ]] && eapply "${FILESDIR}"/${P}-darwin9.patch
+
 	[[ ${PV} == "9999" ]] && eautoreconf
 	if use pkg-config; then
 		MULTILIB_CHOST_TOOLS+=(
@@ -54,7 +52,12 @@ src_prepare() {
 
 multilib_src_configure() {
 	local ECONF_SOURCE="${S}"
-	econf --disable-static
+	local args=(
+		--disable-static
+		--with-system-includedir="${EPREFIX}/usr/include"
+		--with-system-libdir="${EPREFIX}/$(get_libdir):${EPREFIX}/usr/$(get_libdir)"
+	)
+	econf "${args[@]}"
 }
 
 multilib_src_test() {
diff --git a/dev-util/rebar-bin/Manifest b/dev-util/rebar-bin/Manifest
index 9b518ad0488b..1152ede85369 100644
--- a/dev-util/rebar-bin/Manifest
+++ b/dev-util/rebar-bin/Manifest
@@ -1,5 +1,3 @@
-DIST rebar-bin-3.13.2 839684 BLAKE2B f7aab86b015549bb13a7fe2b3b0c64fc6b8383f46adef2fd50a080983a411f936d1c416be60eac70a2ea72439831c9a5e0e85381168ca973d6fcfbfa198e0987 SHA512 33cb7b083cd0e90159e06d6b21c1e8047cc5a2d49c469ae15449fefb8576427f2088977a294c677548f0543eb06cb25ad4c165e8df4b373e3562a7adc6125a94
-DIST rebar-bin-3.6.2 694889 BLAKE2B 3a8f5562a0c984caf5d7b3ba1063a90bf110a60cea316eaf88f5199b890e186f85193dc0302b36dc31051d3552912c8d1582f563f989df97ee28364a3f47512a SHA512 8fb5c7737d70fc7a706b1e124ab660550e8637da9258338016ab2e260f1c6d662548ef723705cd18210050d052e79945578623d9e9892e08dbfdb9cb04fd89fb
-EBUILD rebar-bin-3.13.2.ebuild 601 BLAKE2B 61e55196804a2eb904108d36ce183fcaff72eb0cf67006256015df7e2ca5bb2972bb5188fc50526679fcb5312caba1c58833388d201bcd4d8ac0ff4648d49ffe SHA512 60cbeb39494490552b18114d11c3db68d4e82c01986b4303522ec3e481f5dfaa6fe6e2e690ec6fe8a8613b31a7114466a625853c1bb38ee6cada505c311d1d1c
-EBUILD rebar-bin-3.6.2.ebuild 601 BLAKE2B 61e55196804a2eb904108d36ce183fcaff72eb0cf67006256015df7e2ca5bb2972bb5188fc50526679fcb5312caba1c58833388d201bcd4d8ac0ff4648d49ffe SHA512 60cbeb39494490552b18114d11c3db68d4e82c01986b4303522ec3e481f5dfaa6fe6e2e690ec6fe8a8613b31a7114466a625853c1bb38ee6cada505c311d1d1c
-MISC metadata.xml 939 BLAKE2B 3d451a472d9986f1aee67c4ede6ddc28d56cac865e0fd0a33f957f3007126d47d7cb3bf87916abca0be68138c167b138d884b38da65ca26d4dab79e42b839c58 SHA512 6e6e0a14df5031fee427dc518e0b69cafca6b8dcc429fa8cbcecacf78a1a56796c9cc6a545a6e9506a752e749c06a4ef7cf4cdb889ef2c6ca53bcf0f68fa363b
+DIST rebar-bin-3.14.4 943940 BLAKE2B b9196c44407783f5cdeec6d56acad20837b2f9c550e5dd1cc16d7190a5dd9897cf4044720175db216f154beed093fc81b4a3c26702e7f4675473924dc7508530 SHA512 35a8ca34a26c7fe0b7edc22ca0589b3813827ee6d59f49e7b2669186fc6183d4efd33c258a4659f14421bbe2b2d7c7c464ab7fd36f87297faa3c6f812945eb2d
+EBUILD rebar-bin-3.14.4.ebuild 601 BLAKE2B 6afd6e93bf2af1241125dc220b926b02e26858ea889cb08329e0724e342f85bb0eedb72178cc3cad97ab421fd7bbac1fd1e2f08e9cee8e4a8ae78b8f76aa8a58 SHA512 b68fc00c68544014bc89d00456eb03fc6e134e053b870d4b3ea6cd2d5e608a918fc3259850ddf099d8d55a5751c5c01aad7546c485063db758c48cae36c55fbd
+MISC metadata.xml 1186 BLAKE2B 2ab14359cd530e009f7e793334b93587adf02cf7a43ecc51cb710fe10bb59b5ccc82ccba8323b7b28f4872871048cce8d7acd468adb2d9d62ee426ed268c08da SHA512 7da7c4e15611f93e3692fa462e024ebb0f9b447a93c518ade6bb151a548a65437a285ae9bea4334ee84790ed75fcaaa2e57872f0ae117dbec66bd9f2d6da9031
diff --git a/dev-util/rebar-bin/metadata.xml b/dev-util/rebar-bin/metadata.xml
index 4c134f3392dc..504a42e86ef7 100644
--- a/dev-util/rebar-bin/metadata.xml
+++ b/dev-util/rebar-bin/metadata.xml
@@ -1,7 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<stabilize-allarches/>
+	<maintainer type="person" proxied="yes">
+		<email>matt@offtopica.uk</email>
+		<name>Matt Smith</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">
 		Rebar3 is an Erlang tool that makes it easy to create, develop, and
 		release Erlang libraries, applications, and systems in a repeatable
diff --git a/dev-util/rebar-bin/rebar-bin-3.13.2.ebuild b/dev-util/rebar-bin/rebar-bin-3.14.4.ebuild
similarity index 93%
rename from dev-util/rebar-bin/rebar-bin-3.13.2.ebuild
rename to dev-util/rebar-bin/rebar-bin-3.14.4.ebuild
index 4f7f563c355f..40d27f46700a 100644
--- a/dev-util/rebar-bin/rebar-bin-3.13.2.ebuild
+++ b/dev-util/rebar-bin/rebar-bin-3.14.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-util/rebar-bin/rebar-bin-3.6.2.ebuild b/dev-util/rebar-bin/rebar-bin-3.6.2.ebuild
deleted file mode 100644
index 4f7f563c355f..000000000000
--- a/dev-util/rebar-bin/rebar-bin-3.6.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN=${P#-bin}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="A sophisticated build-tool for Erlang projects that follows OTP principles"
-HOMEPAGE="https://github.com/erlang/rebar3"
-
-SRC_URI="https://github.com/erlang/rebar3/releases/download/${PV}/rebar3 -> ${P}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-lang/erlang"
-DEPEND=""
-
-S="${WORKDIR}"
-
-QA_PREBUILT="/usr/bin/rebar3"
-
-src_unpack() {
-	cp -v "${DISTDIR}/${P}" "${S}/rebar3" || die
-}
-
-src_install() {
-	dobin rebar3
-}
diff --git a/dev-util/systemtap/Manifest b/dev-util/systemtap/Manifest
index c330720e2675..8ddd8cede681 100644
--- a/dev-util/systemtap/Manifest
+++ b/dev-util/systemtap/Manifest
@@ -4,7 +4,7 @@ AUX systemtap-4.0-configure.ac-non-posix-test.patch 10038 BLAKE2B ce0bf23977dd5e
 AUX systemtap-4.4-configure.ac-non-posix-test.patch 9435 BLAKE2B df56bc874cc14afce539ad5f52f040abfb44d96401c809aa10ca925a20a9ee158aa809c79561e27dbf33aedcb8d383bc567d45b706e6e0aea101c314cd880b7e SHA512 22dc30701e1bfea872e0fdb1937ac0f43fbe72510c8322579e98b5ad75f37b6c1289718ad1786879d16890bd27ec4f051a27261d33421a7e9f0dc79ae0fba9f1
 DIST systemtap-4.0.tar.gz 5282312 BLAKE2B 9eac1cf9c9f13255ac12642c910b5591b0f5380b2a6337dedcb3d20785c0416900b9bee05f239632f7c548812be35ae90b24f524ab6f5c0c6ef474cf5de834a1 SHA512 66b5ba1902ed974101429dce9fee849273d3dc64e862c057177d158c5f284cc93299819ee8ee49d4bd3b7ff47a3512b1c68b74cad374147ce67fa406c7518c79
 DIST systemtap-4.4.tar.gz 5532282 BLAKE2B bcb2f744ad09821ce63d78b3e86eb489013aed247952c72d3dbc4cc6fc1a2b85f948b71c622487876f43b615c147eb1624b2c146e9b4176e3c91e2b7cbef9ea0 SHA512 8fb1fe5071ec99ce3c6bcf82afdc98a3e1abc0ea937f3019b225c3a1879ada30080740b1918a84c6db06fe1893e6d1e7dc84be26c7e597d7feda1efe11354e76
-EBUILD systemtap-4.0-r1.ebuild 2829 BLAKE2B 08d2fd325a6b6111cea070e6af3a99f4928e023bfb90cb6d550bc083cc08c3973f845811ffb6196944fbb5db7d298e35bd59b2c1c29e759d3ade0defec73cf41 SHA512 ebc821c97c9a4f61f38fc289b315e84b40b1ea46b4920ba347eb43952149fd8523003cc08854beabfdbacdad08d551d4281336d5291f0794198ee61d95f219fd
-EBUILD systemtap-4.0-r2.ebuild 2899 BLAKE2B 5d0346dc179f67a1a40c18f08938830d086c6c4741329afe31cada2e9e7b06e0f21e5e4334a77f1b635a0e05606e63624676591ab47e0bb7756fdf24dd25d7c4 SHA512 12ef285fbdf9a5ab4f6fdf5a96f5c59dae3437dc52ca123e1e18bc55262de074b4d1b00fa326c32ab2be34c0a036524e2f3df0d4d422b105fd59f2507a57faef
-EBUILD systemtap-4.4.ebuild 2865 BLAKE2B ab50a603e442c631c493b4a1121a85c641c08f5d6cfd76b68ba53f8d009e6c9a2a830299d32cd4a8a4a49f21b8462183aa6da0b59a9ffc60f7129d114f781dd9 SHA512 c72407408f48eca5634f0ad9c533eeba3a0cdc7a7afd276852ab311633642a973112daf5b9e95526419183c4da82cf1c8e16008ef6af6c2e3a85e9366560f9e5
+EBUILD systemtap-4.0-r1.ebuild 2856 BLAKE2B d49b03f84101093365efe67a0b477a829e05403dd94beae937059c52e4088f890ef577314e2a7f5f8174933e0d84cdaa01ca5a0ed01199af995eac1acc441067 SHA512 08a10f72bef1df25fcc735728680e4d493e5bafcced16adebc3fefe5013de31d33956349284b338ef7a318d81c124e2903b2e13d086bd8d0edc6bdb426d03420
+EBUILD systemtap-4.0-r2.ebuild 2926 BLAKE2B 7de3ae27e0e904f805f80138bcf67a366094a091de2bc4e432cf8fce6a091853fc9e972478b0f04babd6ab51f413e9fe96b41ea98fa9d17061fb71db1af4ec83 SHA512 959dba0ef465ed1ab64274c892dbfc6ed50abc3804cae620731c9f5907c35e1d8be269d557575681a069fdb4067f38e537d565d3dee8144010bdbe30c0c8522c
+EBUILD systemtap-4.4.ebuild 2892 BLAKE2B 725a690e263da0a13c04291e201f3771d2866da3e31e0832f8aba3b0ae5bcfc3802639e6888ec0a0ca2b38f9c5c63fc867d1444067072741098d80ff027c96ec SHA512 027197b55699f6c69f3ec482249d980ff33acf54832fb5e971084f46a683db8dac0b1d28d94ce6cd927abf41155bbae26bebbb0ee92a89ab059ded2d6548bd95
 MISC metadata.xml 302 BLAKE2B 1118f1c8c5cb76bb140947afd86eefece0251d75fd99bf58decced339e68a700f140b30d7d7f77f8c89fdcd468e79906574ced8c9339498078e6cc9edab83922 SHA512 4db366a3c2ff95cd2cfe271cf4a50fa2d5189985620d3b9e51708f2811609e53eec2656589ff754731d018bf1c184a1bab662be8683c714a8621e9296eacd9a9
diff --git a/dev-util/systemtap/systemtap-4.0-r1.ebuild b/dev-util/systemtap/systemtap-4.0-r1.ebuild
index 8756646eff70..de5dabdc1044 100644
--- a/dev-util/systemtap/systemtap-4.0-r1.ebuild
+++ b/dev-util/systemtap/systemtap-4.0-r1.ebuild
@@ -15,6 +15,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="libvirt selinux sqlite +ssl test zeroconf"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-libs/elfutils-0.142
 	dev-libs/json-c:=
diff --git a/dev-util/systemtap/systemtap-4.0-r2.ebuild b/dev-util/systemtap/systemtap-4.0-r2.ebuild
index dcf1f8df499f..cb49b3599c90 100644
--- a/dev-util/systemtap/systemtap-4.0-r2.ebuild
+++ b/dev-util/systemtap/systemtap-4.0-r2.ebuild
@@ -15,6 +15,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="libvirt selinux sqlite +ssl test zeroconf"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-libs/elfutils-0.142
 	dev-libs/json-c:=
diff --git a/dev-util/systemtap/systemtap-4.4.ebuild b/dev-util/systemtap/systemtap-4.4.ebuild
index 1e32ea4a68ac..5a3e3efea14c 100644
--- a/dev-util/systemtap/systemtap-4.4.ebuild
+++ b/dev-util/systemtap/systemtap-4.4.ebuild
@@ -15,6 +15,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="libvirt selinux sqlite +ssl test zeroconf"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-libs/elfutils-0.142
 	dev-libs/json-c:=
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index e8298745ee70..6a8237c7066c 100644
Binary files a/dev-vcs/Manifest.gz and b/dev-vcs/Manifest.gz differ
diff --git a/dev-vcs/git-extras/Manifest b/dev-vcs/git-extras/Manifest
new file mode 100644
index 000000000000..91e7029915b9
--- /dev/null
+++ b/dev-vcs/git-extras/Manifest
@@ -0,0 +1,4 @@
+AUX git-extras-6.1.0-no-bash-completion-install.patch 556 BLAKE2B 9fbf1516888da9c5952fdaedf28987bcf46e62c6dd1342f810c9150625a78198224855dd18b386076a4fd689418c05d61cc8f0c5c0f747fb96ac6209a4fb402f SHA512 70d25e577174238f5fce6a3810146358904493a7ec3963eef6be8780de7b62bcda7e2c542e8f02cf2dd229acfc7368b72dfd4aff668fbc4e841eb6754b2036f2
+DIST git-extras-6.1.0.tar.gz 153503 BLAKE2B 3450edecb3116e19ffcf918b118aee04f025c06d812e29e8701f35a3c466b13d2578d41c8e1ee93327743d0019bf98bb3f397189e19435f89e3a259ff1b82747 SHA512 098415339177f802299d93947e2979a2fc6c2935eb2d735cd71ad76e035d5489e4c8d9009e2673c109b28e393319745be249cc195814087d59b436f4a56dabab
+EBUILD git-extras-6.1.0.ebuild 1160 BLAKE2B 85d0d2077e00e01276b55f5ed70f9cff1d69546abcb93678e3f92e188190871058c75ec80594cbea5acf34bb972b7f3f2206b29863032ac01ffe88b7283bd822 SHA512 656f125a60213ac1d9e1477753fd110e5d78b3dd6e6852ae347114acf8b0518179105e5f46e2c71fe05b122d2e11e825aae38781ffd19f5fd07c1d016119df6b
+MISC metadata.xml 317 BLAKE2B 81e94ccb8505cef2f0dd08b3cfa09c0f00f8ec7ba52f507cdb85467d48d10d7edf311beddb8f766fbcf10a49f62245839dda84a194268a0a5fdfb66ace18015e SHA512 b9353731d4665fe680aed7ffd9236177651ce2bbf6a7210652055cacf5fea38ee5fb7caecaa7cdeefcd7068fdfac85a1fa504135eccc6dda56929a5c1c2dde1b
diff --git a/dev-vcs/git-extras/files/git-extras-6.1.0-no-bash-completion-install.patch b/dev-vcs/git-extras/files/git-extras-6.1.0-no-bash-completion-install.patch
new file mode 100644
index 000000000000..c1d606c3a38c
--- /dev/null
+++ b/dev-vcs/git-extras/files/git-extras-6.1.0-no-bash-completion-install.patch
@@ -0,0 +1,12 @@
+We shouldn't install this manually via the Makefile - or to that location.
+--- a/Makefile
++++ b/Makefile
+@@ -69,8 +69,6 @@ install: check
+ 		cp -f man/git-*.1 $(DESTDIR)$(MANPREFIX); \
+ 		echo "cp -f man/git-*.1 $(DESTDIR)$(MANPREFIX)"; \
+ 	fi
+-	@mkdir -p $(DESTDIR)$(SYSCONFDIR)/bash_completion.d
+-	cp -f etc/bash_completion.sh $(DESTDIR)$(SYSCONFDIR)/bash_completion.d/git-extras
+ 	@echo ""
+ 	@echo "If you are a zsh user, you may want to 'source $(CODE_DIR)etc/git-extras-completion.zsh'" \
+ 		"and put this line into ~/.zshrc to enable zsh completion"
diff --git a/dev-vcs/git-extras/git-extras-6.1.0.ebuild b/dev-vcs/git-extras/git-extras-6.1.0.ebuild
new file mode 100644
index 000000000000..7ee7468ae07c
--- /dev/null
+++ b/dev-vcs/git-extras/git-extras-6.1.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Git utilities -- repo summary, repl, changelog population, author commit percentages and more"
+HOMEPAGE="https://github.com/tj/git-extras"
+SRC_URI="https://github.com/tj/git-extras/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x64-macos"
+
+RDEPEND="
+	app-shells/bash
+	dev-vcs/git
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.1.0-no-bash-completion-install.patch
+)
+
+src_prepare() {
+	default
+
+	# For now, don't force including the git completion
+	# sed -i -e "1 i source $(get_bashcompdir)\/git" etc/bash_completion.sh || die
+}
+
+src_configure() {
+	return
+}
+
+src_compile() {
+	return
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		PREFIX="${EPREFIX}/usr" \
+		SYSCONFDIR="${EPREFIX}/etc" \
+		install
+
+	# TODO: Unfortunately, none of the completion seems to
+	# actually work for me yet(?)
+
+	#newbashcomp "${S}"/etc/bash_completion.sh ${PN}
+
+	#insinto /usr/share/zsh/site-functions
+	#newins "${S}"/etc/${PN}-completion.zsh _${PN}
+
+    #insinto /usr/share/fish/vendor_completions.d
+    #doins "${S}"/etc/${PN}.fish
+}
diff --git a/dev-vcs/git-extras/metadata.xml b/dev-vcs/git-extras/metadata.xml
new file mode 100644
index 000000000000..a74e708790bf
--- /dev/null
+++ b/dev-vcs/git-extras/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">tj/git-extras</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-vcs/git-publish/Manifest b/dev-vcs/git-publish/Manifest
new file mode 100644
index 000000000000..1131beed3d62
--- /dev/null
+++ b/dev-vcs/git-publish/Manifest
@@ -0,0 +1,3 @@
+DIST git-publish-1.7.0.tar.gz 21569 BLAKE2B 1438e5018ebe7d258fee2527597e56080b574765a87b03d814b6d0d41c68397cba6099866382e9f2c560d8bab58214fb9e5f54f0127433917178337df81ff789 SHA512 dbf343e0284c52edd42ba8d844a9db90810ddd02e7a98bcd1c2af72cd9f5242e9c0a9ea921edf47583bfe05943288286e57a018a7a6b2dcf25bae4f663225025
+EBUILD git-publish-1.7.0.ebuild 913 BLAKE2B 8a95cd61903dd64675c3fcde220b41170aedd9f19e79fd6fd9a435e03c8b887717a0fcb82cf18d599adeaa82feecbf4300c00a5580a392f4469c9978bb8affe0 SHA512 7dbcfd568e2186c352f495ac27d79798df4f0aeb039acb5feb0d6df851ba028e127f636e0befa012db47907778e28a86cc7df278615d1723ed4c1c8e9bcc8bee
+MISC metadata.xml 576 BLAKE2B 1dfa47470c8ff5c1fb852d1e16a8acf4984d08be910e666b8910b95dd693f08bc0507bbd83c885f28af1777838eff713906f33c991a7b08de6ff82ec3f2cec2e SHA512 a342fa5037d547429908fdc3b61b6acd153896a3875164555226bfe8d11d6d4c465c69b217c2c29cc5a6b35504c784f1c706e87fe18bb68f2c5099a4fec1a083
diff --git a/dev-vcs/git-publish/git-publish-1.7.0.ebuild b/dev-vcs/git-publish/git-publish-1.7.0.ebuild
new file mode 100644
index 000000000000..7a000d781109
--- /dev/null
+++ b/dev-vcs/git-publish/git-publish-1.7.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit python-single-r1
+
+DESCRIPTION="Tool for preparing and storing patch revisions as git tag"
+HOMEPAGE="https://github.com/stefanha/git-publish"
+SRC_URI="https://github.com/stefanha/git-publish/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+man"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-vcs/git
+"
+BDEPEND="${PYTHON_DEPS}
+	man? ( dev-lang/perl )
+"
+
+src_prepare() {
+	default
+	python_fix_shebang git-publish
+}
+
+src_compile() {
+	if use man; then
+		pod2man --center "git-publish Documentation" --release "${PV}" \
+			git-publish.pod git-publish.1 || die
+	fi
+}
+
+src_install() {
+	dobin git-publish
+	use man && doman git-publish.1
+	insinto /usr/share/${PN}/hooks
+	doins hooks/pre-publish-send-email.example
+}
diff --git a/dev-vcs/git-publish/metadata.xml b/dev-vcs/git-publish/metadata.xml
new file mode 100644
index 000000000000..b97d2e99f3b7
--- /dev/null
+++ b/dev-vcs/git-publish/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<longdescription>
+		git-publish prepares patches and stores them as git tags for future reference.
+		It works with individual patches as well as patch series. Revision numbering
+		is handled automatically.
+	</longdescription>
+	<maintainer type="person">
+		<email>dlan@gentoo.org</email>
+		<name>Yixun Lan</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="github">stefanha/git-publish</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-vcs/git-pw/Manifest b/dev-vcs/git-pw/Manifest
new file mode 100644
index 000000000000..3fe043e08608
--- /dev/null
+++ b/dev-vcs/git-pw/Manifest
@@ -0,0 +1,4 @@
+AUX git-pw-2.0.0-version.patch 278 BLAKE2B 8ff5fc1f4928449095b5b644a5d933ffac72feec36b47972ae9206416e75b2e8355defa1e15a4e3a75b4a6ed6b35c634b4ba9c93d2d1d1a0d1e35d5c9223465c SHA512 02ee7fd042f9ac2869da210c90a11a2d98c7d22d3c5f416aadd7bbb2d1faaf01a76ab12d575ad646a78979fe047c8e005af7cc7031012a9ce1b7d229db13f8f8
+DIST git-pw-2.0.0.tar.gz 32151 BLAKE2B f8ef04b31cb4457ac9bae333bae65deb7d17469cd25a3724a27201dab0c05f98151a5ec1066cb9d2de81d82360f4e46eaa59ebd08904dfa0d16106f589e17e4c SHA512 83ac4d56091bfe9b03733939fb3e4feab22ce4455eebe8508bc730705b69054a2f060cfb8a1ea469476d9519809a89116ff56210efe4cd76e50df5a5d40886fc
+EBUILD git-pw-2.0.0.ebuild 1013 BLAKE2B fa1c26120c84e82d9426ca31a6817cbd6034a02d27e8cf816b150a7b2e356c5dc252c0519c6611372713845479a8f3b6376e725e83d5393f9a0e26187a369910 SHA512 f7384c234dc3fe17a3111c5f09ecb9f0de5758c90f50f905c4a964fc8b3b42b86cd771f2ab7706c0981f1f3d728511634ac1cedcaa7f3fd904f6da82930311d6
+MISC metadata.xml 572 BLAKE2B e9bc2b6775ef17fe1a1975e40e374a9ee1b3f98e51e140acee6f3a9caae0eddad1aee41cd417f36847fccd75da5505ffed28daa0680e15177fea3e8c6255f88b SHA512 021c311570c06714ed3ee803e8139790205f57d8731796e43f83212c84ffe4cd3462f29cff53489255f0518f561da26adde8c13ee3858ff5738d923b0f2109ca
diff --git a/dev-vcs/git-pw/files/git-pw-2.0.0-version.patch b/dev-vcs/git-pw/files/git-pw-2.0.0-version.patch
new file mode 100644
index 000000000000..92706506c697
--- /dev/null
+++ b/dev-vcs/git-pw/files/git-pw-2.0.0-version.patch
@@ -0,0 +1,11 @@
+diff --git a/PKG-INFO b/PKG-INFO
+new file mode 100644
+index 0000000..9748ce5
+--- /dev/null
++++ b/PKG-INFO
+@@ -0,0 +1,5 @@
++Metadata-Version: 2.1
++Name: git-pw
++Version: 2.0.0
++Summary: A tool for integrating Git with Patchwork
++Home-page: https://github.com/getpatchwork/git-pw
diff --git a/dev-vcs/git-pw/git-pw-2.0.0.ebuild b/dev-vcs/git-pw/git-pw-2.0.0.ebuild
new file mode 100644
index 000000000000..8efc99b1623b
--- /dev/null
+++ b/dev-vcs/git-pw/git-pw-2.0.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+
+inherit distutils-r1
+if [[ "${PV}" == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/getpatchwork/git-pw.git"
+else
+	SRC_URI="https://github.com/getpatchwork/git-pw/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="A tool for integrating Git with Patchwork"
+HOMEPAGE="https://github.com/getpatchwork/git-pw"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	>=dev-python/arrow-0.10[${PYTHON_USEDEP}]
+	<dev-python/click-8.0[${PYTHON_USEDEP}]
+	dev-python/pbr[${PYTHON_USEDEP}]
+	<dev-python/requests-3.0[${PYTHON_USEDEP}]
+	>=dev-python/tabulate-0.8[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/pbr[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/mock-3.0.0[${PYTHON_USEDEP}]
+		<dev-python/pytest-6.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-cov-2.5[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=( "${FILESDIR}/${P}-version.patch" )
+
+distutils_enable_tests pytest
diff --git a/dev-vcs/git-pw/metadata.xml b/dev-vcs/git-pw/metadata.xml
new file mode 100644
index 000000000000..2845f37880c9
--- /dev/null
+++ b/dev-vcs/git-pw/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<longdescription>
+		git-pw is a tool for integrating Git with Patchwork, the web-based patch
+		tracking system. It only supports Patchwork 2.0+ and REST API support
+		must be enabled on the server end. 
+	</longdescription>
+	<maintainer type="person">
+		<email>dlan@gentoo.org</email>
+		<name>Yixun Lan</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="github">getpatchwork/git-pw</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index 4ad15d7138d0..0730209908be 100644
Binary files a/mail-client/Manifest.gz and b/mail-client/Manifest.gz differ
diff --git a/mail-client/thunderbird-bin/Manifest b/mail-client/thunderbird-bin/Manifest
index e6894ebd0b01..25f08fcb1ea0 100644
--- a/mail-client/thunderbird-bin/Manifest
+++ b/mail-client/thunderbird-bin/Manifest
@@ -4,70 +4,6 @@ AUX icon/thunderbird-bin-r2.desktop 882 BLAKE2B eb9c2e381b67319d9cd53f26e9b406f5
 AUX thunderbird-bin-wayland.sh 128 BLAKE2B 015511404f636845d7248fd3cec02eb9a4ec70567da442bfa5ca8f2168634347cb478c63161c422facbf47c8d5a6b7358ce7ee9cdbd48c4e555460248287e06e SHA512 9df7306d7046a9f51e60e70572e6e8e22d42e6065900416fd407dce5c083dab3212877ee9dfc7f5af7337996951577e7b7c75e583ab811d6ceaadf6e6c903a7b
 AUX thunderbird-bin-x11.sh 122 BLAKE2B 40fdde93db7c5c27174e22295b946834ebe37763b0499f710e4aa7030941654bdab714c886d4bc4ef4c8623e54819ca2ce6d6786901e8f5ce29213ec59228472 SHA512 907d34b5e67b8806dd3f546f67ab3818dc0fe5d487aa8706046feaf68e23ef69be6e0ead0a31c89c559151854f8837bda93fbeb336bf73d96839656ae649d1d3
 AUX thunderbird-bin.sh 2972 BLAKE2B f9cdb961ae34636c178df29094ef8e42ec29fd5f70d9aa830cfa4113b32c69aa5a47bed083e0923d2315b5b7a0ea72aabb298695b3457968a3338e28bd2c8159 SHA512 ce4afc6834268d3a42deea5da2173548fde02a4ea4a6ff69595f07af41886e7e31e1c8514abac1c52bdedf23e40a9366df83bbe8c2a00d9cb23fd2958dbf9fb0
-DIST thunderbird-78.8.0-af.xpi 548342 BLAKE2B 4165c5723013c15bab04013dc316f6c7574acdbdcac676d9971b35d6eadd13ed0cbeb2d4425faaa0d0b73b543920c7a2b4d569bc8ebc5f3502030dd85950c3f4 SHA512 6919ddf5549197a398a75ea9ec0e8074bd521772e9b1a0977f9322e4967fcf4db09ea708e07c73badd3ffddf351443719d0010b80edaead75cb3b75f8eb1b0a7
-DIST thunderbird-78.8.0-ar.xpi 648607 BLAKE2B aa6a845c9fee67edde83c77864bcefd4987d6e0de7bbe74dd393d04a29b3ab13d1063c5c05700e8f9aec4ed272d2dbc75c0b90977fa92047cef1abedf7cfac7f SHA512 6a607ca466ba05bbe439b3188a470782e3f5bdd1346c4d24eafd7ca7127c4f456d26de006208affda019a010e4290e1e6940943764ee03af6b4c0933153601ae
-DIST thunderbird-78.8.0-ast.xpi 561254 BLAKE2B 86b08175ae6aff2d3c32068cda3a814d6a7a004032f9998b5876a0c6c75ca619effd7c4b647d5dc92110f82da4c78e86dc38dfc180353a2eca5ba5119029ae8e SHA512 009df4311c18d408211bbd40179cc566dc248a9ff38eeabf7373b8a5551493c92486aeee114a09ca831f759e1ba321b56ce370f7f4be7eed82f0e90e6af5e449
-DIST thunderbird-78.8.0-be.xpi 666671 BLAKE2B 6f7d5d82f1e596678e0a2341e2be5ab53ac12fcbca51187ed27f9736bf19b606e09fb2d4f54630863e942e549e9499da8fcc01d8ab2fa1e50aedda347e2f24a2 SHA512 c3b4f7a251b558f5cd3925f99d47e03372ab2512ab538c98451866a58c8c0460230316079699ddecfd0e725f09a6cc0765d4194f5751da80814587bbe04bdecb
-DIST thunderbird-78.8.0-bg.xpi 672415 BLAKE2B 9d750e1fbc1bef06c645e79ca6588e428eae3a5c5d35e9d5a7b7df967faa7596a7332e52c251779b2d4768ea8c8dbdfa22dc021b63d5beb1d2adbf6b551bfee1 SHA512 58468edfcda578fc9b262524d38f31857d59411a4e63a608c5db517bfa9bd7b7bb20261ee25647ac74f5b48bc18c9ff542c8715323d59a63b2f01a0245e43647
-DIST thunderbird-78.8.0-br.xpi 604536 BLAKE2B a33c63a80b534e48f5cf38205b3711673a02b3de2163413b99d652cc048b9ee9726192d67a53636343bf2e1f80e6b7e9bbc8f37bda0fb00e994ae64556037b8b SHA512 f28ca741d5860347964388fcbdab173223ef56766c37051dfc05ccde0f1e77184d57fb41dced3636967f895ef1f92119b99982cb37f2e991ae833ff5de00a169
-DIST thunderbird-78.8.0-ca.xpi 620451 BLAKE2B c32b0469dccc4cae5bb4bcd3ced1a503df8cec0ef750bef6c6d11057b9549e327a93bdeaf293d0fb06a00e3b8cfa8c8bd2e02f5d464f2c1d6eb482e23d899537 SHA512 60fb3eb0e0e24c5a52ea5b3203fe1a2c83920579607cdffa5054e6a8d861e8963598ff23c24fb7e0fb5febf997e9b79126046b0413a01b5fc067547cffd64879
-DIST thunderbird-78.8.0-cak.xpi 635653 BLAKE2B ce92ac946377fb7144e50dfc170946360d673bf29095a7be4aff0dded75f34307c25679750b7ec766a98711e0f07ca681556026c99b073b51094a4ed362d527f SHA512 64e8d64f9729dedc63eb5a140237f060e5a4a37fad6fe1c71d5d04738dcead20ab44690c6cf12b1bcdca31a3a7ab2f6f06c4985ac3cd7e9356fb5c0370200f4c
-DIST thunderbird-78.8.0-cs.xpi 635349 BLAKE2B ead7ef55525a86804386ee118eb6f40dc850d3f83d9f70534b7841510a80b6eaf3ac3c8c306852bd610207c9f71409b3a085f2e173edd9a47ac49e627f78aea1 SHA512 3ba9a8ad0ad92c1f95f60fecbc5b06e9b4afc8e5862c19c5d7204a014b689e9022b05f7f25e7bea76a12bb53bc35fb2daeb0bafff248002490193e5a96091155
-DIST thunderbird-78.8.0-cy.xpi 646245 BLAKE2B 3bf8ae9c19903c49618ea9837f00a35ac61ca76c3b1b6d63544bc86e5d5fdf913646fde3fc2fadd12da373ad388bdf9527a2334d6ffccf73a776ffb97ae2d49f SHA512 e2859b10dd6a21cd534ed066cbf45f73b020624c0822ffe7c00a9bd38fced0f1e0d6684e907c855475e68d031934346d8c79a4280f91141b4bc6a6c3684b0f88
-DIST thunderbird-78.8.0-da.xpi 620998 BLAKE2B ad2d11535c67bb990da63b8c34bec78afb9ff2dea92f3fb82628b34c5cb144925d8f977937489a5c8bdbc3ed118ef26e8a9efd6bc866f694f22cd0147041f1ee SHA512 5df2c6e9d88554a120613839d07d13c7d181dcab4cb45941122ebae16311f810ff82e99464124a5de672c41a1dc99fe89a54da425ceaf3df0053e340049ace4a
-DIST thunderbird-78.8.0-de.xpi 665187 BLAKE2B 5f4326eee7d7b566d273e62dc8924f20d6ff515d49523552ef3dd982cf1b2c6646844785bd56bced0df65a3149c2c349d54067106f6d0c85b315698c4afb17d6 SHA512 7178f9d97fabc04d46e6c1b0857709ce88720f44e316868799e92e6c96a7186a5c978635f72f63cc5568b356a03b85a9e4bc4067eccef9bccc8a1e6ef4d61517
-DIST thunderbird-78.8.0-dsb.xpi 666773 BLAKE2B c8348d6df73e4d60bd4df2f71052862cda7b25684efd2b3a658e98015423546b5a2762e8f6c16e40960b29e6742390394a6223c939f105a34012f0a29d15a8ee SHA512 2b1eabf4fd17d1b99acad9fc0741093dc4d79fd94fab023868aa8f61d9e7dd92b53d2a963754584d2d4cf0ab95a167292cd4cf8a3d50d724f5ba4513c2564334
-DIST thunderbird-78.8.0-el.xpi 774460 BLAKE2B d9830af62f3e07e4655ccb4efe7eecb1dcd512cb2b12169b1a40388d1cb65a387cbf69d23f0c29c1764b9478fe427373665af7056d544302af6c1016d8ea789f SHA512 9753aca2e05439818e5d45a6bcbc64c48f3342a3ca7414378fd8edd72304637404b29581833ced3320640b8cb6bf66f5410a090f76df331cd56beac013c99a9f
-DIST thunderbird-78.8.0-en-CA.xpi 611769 BLAKE2B 88f182b41a461f19cedc03c3dbe54637e50bb08c34fc78c10aa680ec8b7cb97fd721b8758edbf49c3be0dfc8fd4784452864010a296d7cd9a1ffc9045fe06ce4 SHA512 cbfffc53c1b5fd4fce0037aca6ad8d795e997ed260583dc2794428da89dc43cb4a73e1ff04567b902266603421ad52e2d82e9ad3bd8b702f938d2db1b7532abf
-DIST thunderbird-78.8.0-en-GB.xpi 611186 BLAKE2B 170d4dfe3ed46b2ca6e912ee4bd4ebb297486104f4b9db4f7720ae2a44ab74a18b556e9b6a4212bb7e386b0cf7b7c73b8630d1be3ffff1acc1f8dc55c452d322 SHA512 ee301f1dbdc7c687b6825e7636121c583a6410465bef77965b3230638a4584dd45caa75b938d001a2b378a58a965e324912637fecb06a96b841aa0f11897899f
-DIST thunderbird-78.8.0-es-AR.xpi 657788 BLAKE2B 2c58fcc67575130a21f3c863247e300f79f675737857dbe2f48510bc37e9d2f982c8d93972b86087aaeb59a3b9e64e62e871a8f37f6e6e45f123e593f3b56444 SHA512 977a2dfbe08e86b5b15c5165d77a0c8b4218fd3a77c7c26b9d6ed60422ca2467e661b0fbb9a5e7fb0e791fb2e6c58743a2a540bd10b0efe077cd3f2a24f3c515
-DIST thunderbird-78.8.0-es-ES.xpi 569795 BLAKE2B a383ded35dab81b3777cc2431455df3b680110a4769d638aeef8d42f38744965a5c51d04ec9d9d56cfae5e7bfffdb92630e9159dadbc102cfb41a594ca6dd83a SHA512 24e84d2b01313466235fc0979b8d2547a453d4fbb5db42c606c3e95241a1e0047aee7e130f5095ab57a71a3f581c3bb312aac8a92c7dfe0b4f8b89d1072eda75
-DIST thunderbird-78.8.0-et.xpi 597734 BLAKE2B e14bb1b238e3f1d6e83a1b2cab5b8d4e7c72dc9d134128a190feeb9d8d1bd30aaa543f9613a93dc164fd54e31eaad53700e777fc21f98cf58dc26ac2d97360f4 SHA512 9cb6647db768f9693e93b9dc81f2fcc13c87465dc713661ef26f0e238bc7d61fd393749e26e85aff434fb5de253f8435cb81ade6637456cfc6a5cf52ad362522
-DIST thunderbird-78.8.0-eu.xpi 632966 BLAKE2B 181574e2029b48b613877c306a0802fd90e040b73e93a6cfa1ce1cdb38008ac4a598350ae1fbde9e5bd075f7f70e8269003c1f37f31f8ca9c62c35fabcea1068 SHA512 f00eda0202e562e64e0432978d2b0ab778189d28288c0e7afbe91a9e12d084b0b0e3c8b19ec329ab0112155713c67876fe9d81a9218e537d8e751b59a57af9b1
-DIST thunderbird-78.8.0-fa.xpi 639752 BLAKE2B 2641ae1d68498c9ea3f35917ce961d83f8248e320da3d4737f316f1338c548cc10384303095c7ddf6e16e8b67538e0b535394bb4cf879cbddee9cda6031ee0b5 SHA512 48c807a6ac991434a425122d41c8aaf0eefe184949c9113268a9d2cb872f1d6afdd189e48b04f1bf172a61f9ea0eef258396fea8621afa5fc99a74079afeacfb
-DIST thunderbird-78.8.0-fi.xpi 642446 BLAKE2B 9021bf414f4456c4bf31100fa9971c1d86ddbeafdda00afed720168e26259e8fc3662a01f6768e3e03dc11c35bd128c36aecf1ad3d62b910079df1ea1096063a SHA512 c1cccb2c151496009e19e11003f0ecb9b790a8d38eee729665ee5f0a60e8301a42187a6b7d6994cb01f429d282d4eaea8f8456898eb3ed02b35456e9aa029e80
-DIST thunderbird-78.8.0-fr.xpi 669487 BLAKE2B e3fe0ff95281e34809deee629ba2c4b373a51283da037a62b214f7168d2222166140b36a770cd77554c594240940eee0f297a40bd0f601bdba558477b168f98a SHA512 1db2d3a5315ef3354d62e0d3137f6c3a67686379b57d77db37c9528e9d7be2769fb0fec69923de792cd1c2e6f9d2021d18ab335bdb175f12b46dba4d761f29bf
-DIST thunderbird-78.8.0-fy-NL.xpi 653081 BLAKE2B e9f6970daa8443ce773d4f6cb1034ac80fbcaa26459d7b5462dfe55fb2f641ac5972e0170f066b1c6f274be3fc31de4c3dc6fccec5093d884be9eb294fb34f25 SHA512 be36ab1dc00f94924671aa208e5d0ce9026c207a905943e6858de8c3d1e5c3f3cca17090e43371802069079e05eba7d3d1fdd1a076d3f998959fbc1fe33a97fe
-DIST thunderbird-78.8.0-ga-IE.xpi 600699 BLAKE2B be75208495a5e984a5ca52d044be90ed08594f03f24c8aef2ff518907e7f8a1d5efff472664a45cd40bb75c209f02bf1c9b70454441160ad521ff0bd09a6b88b SHA512 f3ca1e2a43f67b30ece5ca766c6446a09ca840be153677947a0648365a36d863e2b6f9696856a8a0be489c3162c80f61b9e47984c6f139f9dd19841af2b14ccc
-DIST thunderbird-78.8.0-gd.xpi 609386 BLAKE2B deff30da088dcf3e8f001ac8b7c734aceba8cfb86f4ccf53887a0dd6ad4da6ab600eff9b0e6d276ced2f69e47b02463cda9a751c48cfc78de2c7d27e1d65d873 SHA512 7c1f1f955dbe7c93179e5cb0d4868af1c99947202e886016d74018aee79d29fe93a1fceba7bc14de2ccc354532f9a7b0bc27554041cd78a4bc064ba2ea5993c6
-DIST thunderbird-78.8.0-gl.xpi 615725 BLAKE2B feef84503450168170ddfe839fb21e24ee28004495c60591f55da021274c2db6d5871760fd2df46e99def462191c9a60cb565d0def417a57a3af78d8165b6271 SHA512 2703e48c68aaf84c7da1c71f59784e9df8cd0986da9e3174e968e41300acd51ba28adac97e293eef2f41c32fc7818037bb0e6df7ac9ef9a6e502cc1400107df2
-DIST thunderbird-78.8.0-he.xpi 640504 BLAKE2B 017cda134569d13b0e0200f0a63fef92925f6e37c465cdcecf5203b3e6994eb0ae4187fac66f538b8956db1fd6d1be824a76ce1ccde401394be7f82a0b8c5ade SHA512 84e4695b4d68b4adfb39a6937857473cbb03385f7508cd3644888ec27c9508e4a7fb370d80731ba319187dfaf0af62e46030c36b872dcca7995abfdd2caf188b
-DIST thunderbird-78.8.0-hr.xpi 629030 BLAKE2B 3816d4da01efde04b61912113b1c306c129a2b990788d64daaf2c16ee962fe88da4826c4396dd2414134e171f89458e283e09511c068da739053c4ea5bd0d4bb SHA512 09e7c9d85e59c0bb4a4c4e767fd240bf28a0271c4146bc1a77bb77fb5b23307fea046c711c1039e9914944f62287b2be749a2c2e1e1632b6726e6d8dbca6192d
-DIST thunderbird-78.8.0-hsb.xpi 668598 BLAKE2B 051f0348d5f5c61ed0c2b256fc3877cbe9ed66053a085aaa8e61fb7f81ef5ad9b3ec1f254b3e52d965fd0e2e60c5305da84c7d661e303eea0b2ddd34cf461c74 SHA512 04893aea2509b5d36283700a028e85399a25543308f70cae30d0023bdf580b3bba1aca47a042170029cb670d3ac16d5b4a48aeef7c29080a4c1c8e68050d74d8
-DIST thunderbird-78.8.0-hu.xpi 679835 BLAKE2B c66d7819ac1a878fddc35864472181be7b3b25718c13b9b9db8d075e3c234e224414ec3c1cc5028cf3f0f9ac8eaae142af61cae01b286df2607b5df3e6e42c76 SHA512 b79e5658913c27628ea94a3c8b0d52aa17dcb9009afeaf138dafd4d70945ff90c466666676f634c9f4c5808dfc71587ef72628e576b1d6389e6bd576130d41a3
-DIST thunderbird-78.8.0-hy-AM.xpi 713331 BLAKE2B 84f0385c330658fe89adc14e5a33b1298ddce4cb03ce2d79207f9165b9e9b2de8bd659c142f207f0d383bb24d8f6d258679149850501384305153ba2bfac1bab SHA512 779b0fd7be93ae028d3af8dfc1b90852fdd39eed6beaeedfef7608dd9b7d020e692939d441b0c59fec5f3cfceefacd36e2aaf0fd7b10084df97ce5630d59e069
-DIST thunderbird-78.8.0-id.xpi 620677 BLAKE2B 473a0ee4ffc941bde1ef51d3d604bcf34926b7134a638ff2a1b5352e72ae6dd4d6d3af2def8913d69ff668615eaaacd5afccccd8ed7f92f746fb9540128c7feb SHA512 e1416db889b9be0c023b4578cdba75adcbf9d4b88b29f6e00d5647c09aeaf1ab1afdcbd88f2fe2e3151454452b4077011e20fc5517d3ca528f36b2cfdfa67ca0
-DIST thunderbird-78.8.0-is.xpi 581648 BLAKE2B f436e88f7fd4aa3a45796dd31a26e8e356dc64f274b8b47fd96629c9a117fa30e0532180b895c15d434ca7472d10b05174e18bffd692314545515afa96e419c7 SHA512 6c4e2c9ee83130b64b150e85446df8b979af5984630de3a32e0f11f5a39cead50068a532c5a5971ee93ee9242190c176bf2ca4ae81d48d140e4fbef37bcd7a41
-DIST thunderbird-78.8.0-it.xpi 572965 BLAKE2B bd14e0ea976377cadeefb826843805481ccba23f5c287ec11190b0dcccd5a08fa6c859be4b105d5a5a56152a142ff9ef33d763996276ac5a51c7d686c43dcf62 SHA512 22024982614c700e1fe7ef048b83859e099d40499b57559758a03a8ea116dd36c1ab9820fa7ef550558c09f9558515b12dbe786f3d7b6d27a3ec077b8fee4d4e
-DIST thunderbird-78.8.0-ja.xpi 722454 BLAKE2B fe11bc934e89893e7f352fdfacec5b330b0bacfafded38d4574e96e1762a5a9ed9caec370fc1ea805d30d7a236b9927840a3b331dd86d506676daaef0a581816 SHA512 92f2590362935cada2769cb84e3f27395353953493bf15d1e8e6cbb8875cbeb594d071a3208d040ce4c79da501066ea2c082923ee8faefc46c3e158a4c1a23f0
-DIST thunderbird-78.8.0-ka.xpi 717017 BLAKE2B a9fd20a0064e7ebaf9b990c8bd0cb795331656ef5a8a8bb523262e46931048d00f4475d128787d90a2a8062b4c0207672ebb1bab8d93073e434cbe5863ac8c07 SHA512 a1a85daac4b3751db10ca9fcab144324ead5023245f02c10c2d712f7a027d6ff5dae5ca04a5f6e0875cb7fa9c2ddc0376d503c7cf06cb878db5c27ca8d9d5a7c
-DIST thunderbird-78.8.0-kab.xpi 651922 BLAKE2B 41bff182cfe72c270cd94e15512c8b134ab4d384dc7ec52bba86a808192312886e3256ca5c128f0523e99674789b516089d6239e432a6b694da0bdc01751d154 SHA512 49a75c15a0b6ecb97f518181afa711e15cf2c7e3b2e368582166d4e092fa9beebcadf4e572eeb729d8531f1ec5ccbfc688edde024c733dda5980be09101ae52b
-DIST thunderbird-78.8.0-kk.xpi 720468 BLAKE2B 21815445c1665808abe1ff93a77252d2f4622971b80e5210828746020850546e350c8764b8b7de5b4b22b7210662bd32df14d65ef84ade8769bced175cba310c SHA512 db40436d08152560134671e6e5c52e3ef1d5981561523519fe0bbffe88c2b0e305940fdb034837715aa1e7f2d40e9993f90f5614dc949fb4bd35aad3afc22efa
-DIST thunderbird-78.8.0-ko.xpi 688207 BLAKE2B 2666812be58bb367bd92f98712e83323ad61677431e8a3d1283bb943382b182e16b28ec58f435ec59861d819abeef1ebdd37712ae4ad94324d629c1a969dc2b9 SHA512 2e1b468fb2f74cebb4c8d1978549a12bf2472b8dc07581281e8eb993b2454c5c23c1fbf99adbc4360daa00b4f6744b1d7e45d165e3c835a1a656f0dd22976e9c
-DIST thunderbird-78.8.0-lt.xpi 660298 BLAKE2B 5f1bfe651c3af4fb008fcbce06f31747fb5145fc92180743ad08ff2a9afd585dd8b1a2cbf9fd2f2bc0dedae3a70319aaa796d4e763d4b8ea5ecb0a96e8900d68 SHA512 0e454ea9c7a87d34235d11ba843e9801bbd2a093366f5d845a2eaf0cc7e07430409f266a09f8608750e2bc78564e8a0a24591b95ffc2880452546e60f94b72a0
-DIST thunderbird-78.8.0-ms.xpi 572174 BLAKE2B d72c780ac2766622b72eaee552b9957750d0cca30b7ecef4ef1a5bfaa26f6c34a32f86b3e5200d03c487514b83abfa99ad3e82cb14d9bf98544f2968dbdf4976 SHA512 7872308796d453a7d04423f51d6e8e47ef320e49b0e43543bd0e381acea30d4a4a0539c2a5d29529fd5b5bfc0ffc9bf6f113229bc413f4c6e4d8a2a492ef1c17
-DIST thunderbird-78.8.0-nb-NO.xpi 637239 BLAKE2B ae4daad96278e5b4154b4be4675a84d838c1d3def8762904a73d33e20e458c1a676ca4796f46fd72742195c3d76565f116849fb2512ac88b46e9de7f1d46149e SHA512 ba07b4ea6a9e46b707306cb18074bc67e318195a1fd257d2632b90ac6de8c5c45db178dd04e51e2b168a9021ff278bd487597bd6840da1883f8874a37c0be17e
-DIST thunderbird-78.8.0-nl.xpi 644359 BLAKE2B 41965faf73c3c0f9fb017965b47468beaf4faa9e5dfd09b66cc984b1d0931963b0fa8f34fe641f7392731d86425e29ddfdd474b5f0d2debeb5d3af4d9a33701d SHA512 1053066a04e48dfaab69e409389cbc248b03aa32b9806c77f1c5ab2e69adbc9fa5d91142f4b87d8407d01daf958a035e73d44f7f0c3d1c13c141c79ff19ca9a4
-DIST thunderbird-78.8.0-nn-NO.xpi 640690 BLAKE2B 46cc9ac54bb43b20202213e033b7153be0c3c5313e48e44442f85c90a56222b77185511c244d67663205117391e02cb7ecfc1f28ce997be170bcc3a4bfe35d34 SHA512 1c08b8daa87b50ba0474d55a4d72161796e58e76e23a88e6c88035bf019aaad9834a625f8fd45cb42d106043252b15f346296573fdcafb7d11643ef2c73376a3
-DIST thunderbird-78.8.0-pa-IN.xpi 633219 BLAKE2B 4d508e848a9bc05aeaf4c54ee34d061187effed00dd2610bf27cb28df166866dfdf17e2fcf2745f973b6945eeb444bf6ab165f26b18f366874559e8acd28921f SHA512 65993d2cd037692b6b56eba803fe027f7dd5ac567dce89ae5d4929ffe99501d681976b3b0a99b9c74ec7b40223aba30de002923f87e8ec0ec7e38bfe0e49482e
-DIST thunderbird-78.8.0-pl.xpi 637132 BLAKE2B 795bdc308f7dbf56195cf6cf9c4a71d017795f367caf61611515cb37b4057313299efad6823274e56a7b23fb0daab5aaf7ce89fe4e24b9d4a043b7af56326c4d SHA512 cce74e59f21757582e83ee05035682dc6371f3e171226dcb20284c5528f9415c07254a3b1643e74a9d361f1d2441fb6b4d9194fc84630d58a35213bbc3bc3394
-DIST thunderbird-78.8.0-pt-BR.xpi 649415 BLAKE2B eb9b29ff21191682e402a31e63a6c24d6cb870f2608f525933a18da4e663db1d9cd6faa6979724a297c79e2dc1f0398ecd89ea623e1d7972cca675f5712cb2ca SHA512 bb6c5a9d6895de4faf6b19500d9c244976ec11fa88b16226c15fca17264a09f1ee7deaab7eb7b2b9b22b176c959a05aec578d9b28b4c0415f73e42300cc6d097
-DIST thunderbird-78.8.0-pt-PT.xpi 655502 BLAKE2B 450bce6537e58ac2750c7c8790270dfe994cf38e4bfb07fe322b9d1e6fec47665b7535724326cd4ebf8a0f790b30734db29b123b9289325d355038b2fd622fde SHA512 ec04f1ffb87cb5c83f1a0d1fff72d39e01621e35fd506344cf50217ba056428f6afb52a89824d89ae2968041a9f4a316532deecb10ea4621ac9eb93524b0299f
-DIST thunderbird-78.8.0-rm.xpi 646531 BLAKE2B 09ff8eb94d3d7b2d25104d4c17ad957ec6046a37f4b45d6c88a5d60c12e00eab5833204ade5f69f06bf689548eacc92e7e7db9b69bc06efd2bf1b0fc2b0d0755 SHA512 1bcfc9d9139fb30e0c65b688b1bb483d9c0cad0830840dd56b958c03e842400922351a5152a0c3d7a3e843fde35a51a26568a18ae664697ddead2a37c2fcbebe
-DIST thunderbird-78.8.0-ro.xpi 662627 BLAKE2B c82d2130d5ae2dc7b57b21f2f4465fc5d775ea71d504decaec25ccab59a6621816636a7d9051986c4809ebcbf617c2b88a0ec81ddd8a254bd74af62e871f2380 SHA512 7ba6221fb3282b13c399aacb5d68063a0bb4755d222099f74d63970a4b9087170e40a87c190b1201f1cbb2a932479bdced737cb52ae29715b64df0b827e18aaf
-DIST thunderbird-78.8.0-ru.xpi 756189 BLAKE2B 10eea9117fed75fe4cd4cc3ce74e36bf72047164e569dfc74f3fd38814e82e0c7597a9ec9577f92e7c59f482b56689c44b7186f373f3997a40a2a3ebbbd2fdef SHA512 79a8c316282f73bd2c717f8b01cea00d7899fe22b0e295c31350d81a1c4ab7e663d0489102284355daebbc58c3b1377a7f8495484a128cab9f5cbeda99bb8682
-DIST thunderbird-78.8.0-si.xpi 651103 BLAKE2B 9ac083d464dfddac5d265d80bf4d411e8c2f66f20e05e000a64e063da6e33176f400d4e47f27eb1adcf970e2aed563ed5f4ab62d0e34e29c3a2952405daee55f SHA512 673d7a600704c4539acc6a7e800f0403197303648633c860f38d330112ce6e17a99132019f95f011ed4f2073221358a758765577980565d6b941547daa0e83f6
-DIST thunderbird-78.8.0-sk.xpi 643225 BLAKE2B 249d1d14f0097792677ae71e780ba21293985f40db4acd9ec95111499554a53b4195730399f9aca514ca0ead37d3839271115fb38bb58756c139924269968bfb SHA512 44438e9c6fd938630ebdf768659acca14067ffbb7831e889def33109e09f24d551a5f181925587ffddf7d54c8abe5a4320c8c7110459bbba44f3b867c450d1d1
-DIST thunderbird-78.8.0-sl.xpi 632384 BLAKE2B 2fb5c7668b6933ce48fd236c3b38970de9219214aa8b215260f5753b9e2d4b1842c41356c43aa16825aa073ead5c3e68dc19f94e2bae6889f3f3d2458c525f5d SHA512 6fe972a136683994b595743527640d51f4d0bb3880b794df5c4c611a349dc56f5968a651b3fd62bec58511a6fe7c6ef7d30a77e7c469b20f1060b4444be4e2ef
-DIST thunderbird-78.8.0-sq.xpi 657816 BLAKE2B 9517fd6f8c35534350905919d1f0bb97a1702b8ad3a10f29861e9add9e88b4d489166b0fefd5fbd4a8b229169ab35dfb8ca2a6b390b82d4f984095e4de3ab3a8 SHA512 e9e9b22d813f5b825f660a977d3107caa7efabd6c9b8a7a2e9371cf18d5dbb3364bf400dce589864fd4252f9513227e3396589561939595e19ae575bb4b3d2dc
-DIST thunderbird-78.8.0-sr.xpi 683123 BLAKE2B 5deb3e13d436744c4b7f8c52c5eecfb9abfbdc069993fe7cad47a9b2e73e9685ca670c1ed0457e769b1e8b4233d88f275194ce5301adef77863d4d6685d020fd SHA512 0026010d0aff81ae619e1db8e9d595e1c51177aeb45c1e98d04d6ed276f3dbe4cc4758898d1982a6443f35869d0cdc89cb44ac9f2367a00fa2ecb350e294e0f3
-DIST thunderbird-78.8.0-sv-SE.xpi 648867 BLAKE2B a6c7b6137a8d540a506f3405119725dfc68c1136be2e715f9d72e25ae0cbbc4ed91f659f560cbc1c069aff8cbbe5fe1b7a094d87f73c2b2d5da557deae21d6d6 SHA512 1c25d41ceca01c6300c9cc42d643e59a5d97ed73aad810c148d2845dd51d28561bca1342f4d86da61285a511cba39aeeeb455325c38334586d5acfcd1d1e2768
-DIST thunderbird-78.8.0-th.xpi 712027 BLAKE2B 39a6186ed96ab458743ae3d03b938a694611a441340dd1dcccbc7ca3de8fb765e42387edcb529b228196fab01dc785ed13cb882d839a50dae98a10fbafec4278 SHA512 58f730506782d014ea1e0e0ba8a6c9f6226a3d3d617e793350703fab925606695a10f5eac396c9c3aa3d294f41989e94b7c5220a3af08c01e031cf6327c3d123
-DIST thunderbird-78.8.0-tr.xpi 649070 BLAKE2B 7d5c22de6bde5843914b05fd3aaa4679aa947103e447e0a5ac0d68cadabb2623a065bc973869cdd79223067aff334e2ebf87e4642d9cd2dba67b5cfd64857f4d SHA512 bcb6026d3deb8490998feae8504f729bcb559ad6c7dde330d6f8fb2a1e4eeff090e7ce1313fd2a6a7e8a44fcad519a4f2c8f2f40d739b4ad17cf0bd795ca85cc
-DIST thunderbird-78.8.0-uz.xpi 586600 BLAKE2B fbe31d8a104bbd3c3900c449bbac350144a11255f4fb8ac060809a221de2ebe364205838b43eaf9f6183451bae45e3b68e34b84e5a63bd9d0dcf636c99c7803f SHA512 09ea336d739be09ec97371f75f914a5b36f89042f1b8eb88bb2f89951ee55820ff74f3bc5b8ac17bf199ce0778e5404891dde4fc71bd4e671336c44b6171caea
-DIST thunderbird-78.8.0-vi.xpi 674601 BLAKE2B 4ffcd7e4015a24b72b2c6e63bc3be529900bced5e1ab42f82f9a8e7c7a1ebf1218b5cb36025318f7c774e135951476226d924223754626ddbb3e9cd59418eea4 SHA512 9bdf8e207003bfc9b82919794d7c8d94dc27d4acef4527fce2dafcbd8721f92c63fff72ae0f59f8f44d16d993e85a8c32672a62be8767172027565b1026c324a
-DIST thunderbird-78.8.0-zh-CN.xpi 687183 BLAKE2B 87e0d1b874cb21eef72b3cd53faeb5cd660fa39a0e9779e4c83321f25fa94c7c43b1ba3b268b33b9c637af671cfcdac03f8128f7edf371f5d8afe2a1e6422f66 SHA512 cc9a7ea3cf683c91066072121b1686057bbaf55d5e43a63deefbf40df8a14491e37d3c361babb38fbb839ac24aa31ff2a0cc9dbb48848a4bcd2047371fcc7bb7
-DIST thunderbird-78.8.0-zh-TW.xpi 687626 BLAKE2B a4a0c70b226b1f0672b25dd467d2000270042f5d474ef257dc56973949f06fbca51c1a8b520860762a9feec04c3d65ab4af537fff702affea38a7c724921b7e1 SHA512 e98b5772218608e5355635a80dc49156ccc18297c59368e5e4a6c5a40b3716b240e67e9ec3f69b8f230b8e7ed4b32cb6073743e843242d67e16c11937adab50a
 DIST thunderbird-78.8.1-af.xpi 548350 BLAKE2B 5f500ac162f5dcf34abc7ae79fc2734856482b8f1265d746367ec3ec78077b0beaae65fb2da770ca4a5076f954919d6e5c632e3fda8059223135a47b08480044 SHA512 e5c4a6894d8bf7e32f884efb8d96dc100962632ea9175febf1cb5d456c5d8439d8919b1dc3fdd970fd221a88f57893acf655ad64040014953fd670cebd974216
 DIST thunderbird-78.8.1-ar.xpi 648604 BLAKE2B 591792bf93b16f79e79e2fdb726ade85ded8c2166068194a15bd29a8cb673a908a846ffba9dd43e57a37d1d8d6c2eec83177ab416ffe6d00e46cefbd426d336b SHA512 5f77f0789a4bfed84604372f77a7907c5ec2b7ad1e09c6be3ec2caaa9616270b4316e7df73becaf08fd458dd730a077d5a004af6b44e5d6aac516ee2b5d70323
 DIST thunderbird-78.8.1-ast.xpi 561260 BLAKE2B 31441d0d894cc4d593a52e7688c19f377e787aef0815a35c2044cd55ddc6582e4f526176fa63da5f4ebf70a3b5465b0ddc5f16de92d9578e2e9bfc053f2ed29c SHA512 ab1ecede6ac20ec7ee75a9c644d2bda0f694fa85780b51f3ae8295e3c8dde2b4cb92260230d658bc0f41e5b810b768c679eb5e6b94cedd492eb86611363c08cc
@@ -132,10 +68,7 @@ DIST thunderbird-78.8.1-uz.xpi 586596 BLAKE2B 063839b8ffe5eeeef1b6bfb09a303e5b79
 DIST thunderbird-78.8.1-vi.xpi 674607 BLAKE2B 4e9171f411c664f28acf7cf5dfc592c22527f69a27b532bf475ea62f35c39d196e6a08ae0cac5cbb1bb27030c8069069c58c0ec0225e47dc076b7969c44efafe SHA512 95c9b9c4bf973a9b09aff80fc480509d17c487cd32a087befe810eda8169778e723fa6eff09bca13aca5e8a1b87566e3913d1eb11c03593a4c55e9ae3ca1113e
 DIST thunderbird-78.8.1-zh-CN.xpi 687180 BLAKE2B f280eb1c9255c51a3e0e9a3fece514bc65c219cc6665ec0013af78073420c2fbefb342293817bbba422011889e0389af4984855fe57c549e60a3ca43761bd46f SHA512 67636461fedbaa03c78f3e8015cb423c9186459fdb7dc4ebfc23b6b8caa079d873a726ec875036afbb9458cea84b959f1242e2fe9917a4d53b55b428172dacb5
 DIST thunderbird-78.8.1-zh-TW.xpi 687625 BLAKE2B 6ccafd9cb5d2991143dead267bb7515ec23d8d9e491ec694641dfa182eb2f49b104553a9e918557edee2f0a85993526ca43c2a2ea6b15bd3a9a54b35b2235a53 SHA512 86e3f9c6fa84268ed79568cdb3003fee3420f2f8205492fd87eee972bbda94556f2e3c8d241bd028b174834f84f957738e0ef1f238a963c49aa589b5d9563aed
-DIST thunderbird-bin_i686-78.8.0.tar.bz2 68251310 BLAKE2B caf9fcff16701892f52af6224341b7f7d25c90c7e8f31fb0b628e0624fe70f8ca48cb0b9405a1174c148528da5ade3590b44d5c0e47f921f6472509d3acb1c06 SHA512 5cf0bd3c7e72e077d8e4f8570e68a6e9a3644f77ef311e1d4af8657c38f122b09becb5f2fb4f66b77c808e8713efd1816f075e42920d3b37ebb9949a75b8db28
 DIST thunderbird-bin_i686-78.8.1.tar.bz2 68210803 BLAKE2B 05ba9cb1b965f3494804387a442daf9a8a9dcbca97aaa2f53243a403e344307c7dadec389d00b3af470aa5bff222ac946a666f6a4afbd4c79186c223dbb24e08 SHA512 1d0bd3deee03fe42fc411baa6fba230a2e747e775d125f7c5a5738377200b34efe88cabb356e6e59aa3e0e8db649ab16c6b19d89a3dab17f8b5df75f7326b621
-DIST thunderbird-bin_x86_64-78.8.0.tar.bz2 65386410 BLAKE2B 2ee6e42f95d7390728cda599bb6499ba0bcc1b1d6056d5ca83c3e5030b9dcde4ed52e7a831988e67380b2139daa8bac82f28422a5c53ed120fc71eb8a7ca53d4 SHA512 c226fd32ec0aa430f549d4d394e521587491ebdbe4fd66e4b21c37bbe47d8bc0c50a9e7bc79dade1bca1728794dfaf2492c3ec46082dc026a4a14dddb210141d
 DIST thunderbird-bin_x86_64-78.8.1.tar.bz2 65303564 BLAKE2B 466300d2a738151100935e625388a78bb487ad1862145dd1f7ed11c44fe9ade82133e5857823054eba3191cf9ac9e7efb4514630a5684a4e186aa5fe263e7c93 SHA512 c68838bcdd7075cb3c253a2c1231fe85d8d767cce75f4f76009c69dc845fdaa0e30fbe94a6f3b7227339006b7c88b77128f16ec348c3e6fbdd516ede828b97f7
-EBUILD thunderbird-bin-78.8.0.ebuild 10244 BLAKE2B 9eaa97eb96b73cc1f282cb902242ad177195ea97bea0e029b924aaa844e882baa77ce0f05e946cbf3d7edb9af9ac9b53471d30609f62b9a4116a9da1fb421ae2 SHA512 6c8cf873256648959cf39b6b7f8035fb654537cbb0243fee9b3b058de148fcb3fa6280c497e0d03c2082846c68de5956b5c933d874e02deebd7d756d4f73a973
 EBUILD thunderbird-bin-78.8.1.ebuild 10244 BLAKE2B 9eaa97eb96b73cc1f282cb902242ad177195ea97bea0e029b924aaa844e882baa77ce0f05e946cbf3d7edb9af9ac9b53471d30609f62b9a4116a9da1fb421ae2 SHA512 6c8cf873256648959cf39b6b7f8035fb654537cbb0243fee9b3b058de148fcb3fa6280c497e0d03c2082846c68de5956b5c933d874e02deebd7d756d4f73a973
 MISC metadata.xml 254 BLAKE2B b88b441b35ae1040470cb225b4b898a6c2a995beac668099b50cd32700cdcad63f41dc8c50416d9a2a1ed865f3f7ad45ca0a9cf053c0ab73cdf68fb9b2fc4553 SHA512 d159efb994f7a897f0e15392446c3e5d66abcb4bedb30d4e8743ea15cc3df99771b78fc665a988002acfd2d6c7701449f6001587bdcd748be684b41640b22261
diff --git a/mail-client/thunderbird-bin/thunderbird-bin-78.8.0.ebuild b/mail-client/thunderbird-bin/thunderbird-bin-78.8.0.ebuild
deleted file mode 100644
index 908f3ef026b2..000000000000
--- a/mail-client/thunderbird-bin/thunderbird-bin-78.8.0.ebuild
+++ /dev/null
@@ -1,378 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MOZ_ESR=
-
-MOZ_PV=${PV}
-MOZ_PV_SUFFIX=
-if [[ ${PV} =~ (_(alpha|beta|rc).*)$ ]] ; then
-	MOZ_PV_SUFFIX=${BASH_REMATCH[1]}
-
-	# Convert the ebuild version to the upstream Mozilla version
-	MOZ_PV="${MOZ_PV/_alpha/a}" # Handle alpha for SRC_URI
-	MOZ_PV="${MOZ_PV/_beta/b}"  # Handle beta for SRC_URI
-	MOZ_PV="${MOZ_PV%%_rc*}"    # Handle rc for SRC_URI
-fi
-
-if [[ -n ${MOZ_ESR} ]] ; then
-	# ESR releases have slightly different version numbers
-	MOZ_PV="${MOZ_PV}esr"
-fi
-
-MOZ_PN="${PN%-bin}"
-MOZ_P="${MOZ_PN}-${MOZ_PV}"
-MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}"
-MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}"
-
-inherit desktop pax-utils xdg
-
-MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}"
-
-SRC_URI="amd64? ( ${MOZ_SRC_BASE_URI}/linux-x86_64/en-US/${MOZ_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
-	x86? ( ${MOZ_SRC_BASE_URI}/linux-i686/en-US/${MOZ_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )"
-
-DESCRIPTION="Thunderbird Mail Client"
-HOMEPAGE="https://www.thunderbird.net/"
-
-KEYWORDS="-* amd64 x86"
-SLOT="0/$(ver_cut 1)"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="+alsa +ffmpeg +pulseaudio selinux wayland"
-
-RESTRICT="strip"
-
-BDEPEND="app-arch/unzip
-	alsa? (
-		!pulseaudio? (
-			dev-util/patchelf
-		)
-	)"
-
-CDEPEND="alsa? (
-		!pulseaudio? (
-			media-sound/apulse
-		)
-	)"
-
-DEPEND="${CDEPEND}"
-
-RDEPEND="${CDEPEND}
-	dev-libs/atk
-	dev-libs/dbus-glib
-	>=dev-libs/glib-2.26:2
-	media-libs/fontconfig
-	>=media-libs/freetype-2.4.10
-	sys-apps/dbus
-	virtual/freedesktop-icon-theme
-	>=x11-libs/cairo-1.10[X]
-	x11-libs/gdk-pixbuf
-	>=x11-libs/gtk+-2.18:2
-	>=x11-libs/gtk+-3.11:3[wayland?]
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrender
-	x11-libs/libXt
-	>=x11-libs/pango-1.22.0
-	ffmpeg? ( media-video/ffmpeg )
-	pulseaudio? ( media-sound/pulseaudio )
-	selinux? ( sec-policy/selinux-mozilla )
-"
-
-QA_PREBUILT="opt/${MOZ_PN}/*"
-
-MOZ_LANGS=(
-	af ar ast be bg br ca cak cs cy	da de dsb el en-CA en-GB en-US
-	es-AR es-ES et eu fa fi fr fy-NL ga-IE gd gl he hr hsb hu hy-AM
-	id is it ja ka kab kk ko lt ms nb-NO nl nn-NO pa-IN pl pt-BR
-	pt-PT rm ro ru si sk sl sq sr sv-SE th tr uz vi zh-CN zh-TW
-)
-
-mozilla_set_globals() {
-	# https://bugs.gentoo.org/587334
-	local MOZ_TOO_REGIONALIZED_FOR_L10N=(
-		fy-NL ga-IE gu-IN hi-IN hy-AM nb-NO ne-NP nn-NO pa-IN sv-SE
-	)
-
-	local lang xflag
-	for lang in "${MOZ_LANGS[@]}" ; do
-		# en and en_US are handled internally
-		if [[ ${lang} == en ]] || [[ ${lang} == en-US ]] ; then
-			continue
-		fi
-
-		# strip region subtag if $lang is in the list
-		if has ${lang} "${MOZ_TOO_REGIONALIZED_FOR_L10N[@]}" ; then
-			xflag=${lang%%-*}
-		else
-			xflag=${lang}
-		fi
-
-		SRC_URI+=" l10n_${xflag/[_@]/-}? ("
-		SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-x86_64/xpi/${lang}.xpi -> ${MOZ_P_DISTFILES}-${lang}.xpi"
-		SRC_URI+=" )"
-		IUSE+=" l10n_${xflag/[_@]/-}"
-	done
-}
-mozilla_set_globals
-
-moz_install_xpi() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 2 ]] ; then
-		die "${FUNCNAME} requires at least two arguments"
-	fi
-
-	local DESTDIR=${1}
-	shift
-
-	insinto "${DESTDIR}"
-
-	local emid xpi_file xpi_tmp_dir
-	for xpi_file in "${@}" ; do
-		emid=
-		xpi_tmp_dir=$(mktemp -d --tmpdir="${T}")
-
-		# Unpack XPI
-		unzip -qq "${xpi_file}" -d "${xpi_tmp_dir}" || die
-
-		# Determine extension ID
-		if [[ -f "${xpi_tmp_dir}/install.rdf" ]] ; then
-			emid=$(sed -n -e '/install-manifest/,$ { /em:id/!d; s/.*[\">]\([^\"<>]*\)[\"<].*/\1/; p; q }' "${xpi_tmp_dir}/install.rdf")
-			[[ -z "${emid}" ]] && die "failed to determine extension id from install.rdf"
-		elif [[ -f "${xpi_tmp_dir}/manifest.json" ]] ; then
-			emid=$(sed -n -e 's/.*"id": "\([^"]*\)".*/\1/p' "${xpi_tmp_dir}/manifest.json")
-			[[ -z "${emid}" ]] && die "failed to determine extension id from manifest.json"
-		else
-			die "failed to determine extension id"
-		fi
-
-		einfo "Installing ${emid}.xpi into ${ED}${DESTDIR} ..."
-		newins "${xpi_file}" "${emid}.xpi"
-	done
-}
-
-src_unpack() {
-	local _lp_dir="${WORKDIR}/language_packs"
-	local _src_file
-
-	mkdir "${S}" || die
-
-	if [[ ! -d "${_lp_dir}" ]] ; then
-		mkdir "${_lp_dir}" || die
-	fi
-
-	for _src_file in ${A} ; do
-		if [[ ${_src_file} == *.xpi ]]; then
-			cp "${DISTDIR}/${_src_file}" "${_lp_dir}" || die "Failed to copy '${_src_file}' to '${_lp_dir}'!"
-		else
-			MY_SRC_FILE=${_src_file}
-		fi
-	done
-}
-
-src_install() {
-	# Set MOZILLA_FIVE_HOME
-	local MOZILLA_FIVE_HOME="/opt/${MOZ_PN}"
-
-	dodir /opt
-	pushd "${ED}"/opt &>/dev/null || die
-	unpack "${MY_SRC_FILE}"
-	popd &>/dev/null || die
-
-	pax-mark m \
-		"${ED}${MOZILLA_FIVE_HOME}"/${MOZ_PN} \
-		"${ED}${MOZILLA_FIVE_HOME}"/${MOZ_PN}-bin \
-		"${ED}${MOZILLA_FIVE_HOME}"/plugin-container
-
-	# Patch alsa support
-	local apulselib=
-	if use alsa && ! use pulseaudio ; then
-		apulselib="${EPREFIX}/usr/$(get_libdir)/apulse"
-		patchelf --set-rpath "${apulselib}" "${ED}${MOZILLA_FIVE_HOME}/libxul.so" || die
-	fi
-
-	# Install policy (currently only used to disable application updates)
-	insinto "${MOZILLA_FIVE_HOME}/distribution"
-	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
-
-	# Install system-wide preferences
-	local PREFS_DIR="${MOZILLA_FIVE_HOME}/defaults/pref"
-	insinto "${PREFS_DIR}"
-	newins "${FILESDIR}"/gentoo-default-prefs.js gentoo-prefs.js
-
-	local GENTOO_PREFS="${ED}${PREFS_DIR}/gentoo-prefs.js"
-
-	# Install language packs
-	local langpacks=( $(find "${WORKDIR}/language_packs" -type f -name '*.xpi') )
-	if [[ -n "${langpacks}" ]] ; then
-		moz_install_xpi "${MOZILLA_FIVE_HOME}/distribution/extensions" "${langpacks[@]}"
-	fi
-
-	# Install icons
-	local icon_srcdir="${ED}/${MOZILLA_FIVE_HOME}/chrome/icons/default"
-
-	local icon size
-	for icon in "${icon_srcdir}"/default*.png ; do
-		size=${icon%.png}
-		size=${size##*/default}
-
-		if [[ ${size} -eq 48 ]] ; then
-			newicon "${icon}" ${PN}.png
-		fi
-
-		newicon -s ${size} "${icon}" ${PN}.png
-	done
-
-	# Install menus
-	local wrapper_wayland="${PN}-wayland.sh"
-	local wrapper_x11="${PN}-x11.sh"
-	local desktop_file="${FILESDIR}/icon/${PN}-r2.desktop"
-	local display_protocols="auto X11"
-	local icon="${PN}"
-	local name="Mozilla ${MOZ_PN^} (bin)"
-	local use_wayland="false"
-
-	if use wayland ; then
-		display_protocols+=" Wayland"
-		use_wayland="true"
-	fi
-
-	local app_name desktop_filename display_protocol exec_command
-	for display_protocol in ${display_protocols} ; do
-		app_name="${name} on ${display_protocol}"
-		desktop_filename="${PN}-${display_protocol,,}.desktop"
-
-		case ${display_protocol} in
-			Wayland)
-				exec_command="${PN}-wayland --name ${PN}-wayland"
-				newbin "${FILESDIR}/${wrapper_wayland}" ${PN}-wayland
-				;;
-			X11)
-				if ! use wayland ; then
-					# Exit loop here because there's no choice so
-					# we don't need wrapper/.desktop file for X11.
-					continue
-				fi
-
-				exec_command="${PN}-x11 --name ${PN}-x11"
-				newbin "${FILESDIR}/${wrapper_x11}" ${PN}-x11
-				;;
-			*)
-				app_name="${name}"
-				desktop_filename="${PN}.desktop"
-				exec_command="${PN}"
-				;;
-		esac
-
-		cp "${desktop_file}" "${WORKDIR}/${PN}.desktop-template" || die
-
-		sed -i \
-			-e "s:@NAME@:${app_name}:" \
-			-e "s:@EXEC@:${exec_command}:" \
-			-e "s:@ICON@:${icon}:" \
-			"${WORKDIR}/${PN}.desktop-template" \
-			|| die
-
-		newmenu "${WORKDIR}/${PN}.desktop-template" "${desktop_filename}"
-
-		rm "${WORKDIR}/${PN}.desktop-template" || die
-	done
-
-	# Install generic wrapper script
-	[[ -f "${ED}/usr/bin/${PN}" ]] && rm "${ED}/usr/bin/${PN}"
-	newbin "${FILESDIR}/${PN}.sh" ${PN}
-
-	# Update wrapper
-	local wrapper
-	for wrapper in \
-		"${ED}/usr/bin/${PN}" \
-		"${ED}/usr/bin/${PN}-x11" \
-		"${ED}/usr/bin/${PN}-wayland" \
-	; do
-		[[ ! -f "${wrapper}" ]] && continue
-
-		sed -i \
-			-e "s:@PREFIX@:${EPREFIX}/usr:" \
-			-e "s:@MOZ_FIVE_HOME@:${MOZILLA_FIVE_HOME}:" \
-			-e "s:@APULSELIB_DIR@:${apulselib}:" \
-			-e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
-			"${wrapper}" \
-			|| die
-	done
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if ! has_version 'gnome-base/gconf' || ! has_version 'gnome-base/orbit' \
-		|| ! has_version 'net-misc/curl'; then
-		einfo
-		einfo "For using the crashreporter, you need gnome-base/gconf,"
-		einfo "gnome-base/orbit and net-misc/curl emerged."
-		einfo
-	fi
-
-	use ffmpeg || ewarn "USE=-ffmpeg : HTML5 video will not render without media-video/ffmpeg installed"
-
-	local HAS_AUDIO=0
-	if use alsa || use pulseaudio; then
-		HAS_AUDIO=1
-	fi
-
-	if [[ ${HAS_AUDIO} -eq 0 ]] ; then
-		ewarn "USE=-pulseaudio & USE=-alsa : For audio please either set USE=pulseaudio or USE=alsa!"
-	fi
-
-	local show_doh_information show_normandy_information
-
-	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
-		# New install; Tell user that DoH is disabled by default
-		show_doh_information=yes
-		show_normandy_information=yes
-	else
-		local replacing_version
-		for replacing_version in ${REPLACING_VERSIONS} ; do
-			if ver_test "${replacing_version}" -lt 70 ; then
-				# Tell user only once about our DoH default
-				show_doh_information=yes
-			fi
-
-			if ver_test "${replacing_version}" -lt 74.0-r1 ; then
-				# Tell user only once about our Normandy default
-				show_normandy_information=yes
-			fi
-		done
-	fi
-
-	if [[ -n "${show_doh_information}" ]] ; then
-		elog
-		elog "Note regarding Trusted Recursive Resolver aka DNS-over-HTTPS (DoH):"
-		elog "Due to privacy concerns (encrypting DNS might be a good thing, sending all"
-		elog "DNS traffic to Cloudflare by default is not a good idea and applications"
-		elog "should respect OS configured settings), \"network.trr.mode\" was set to 5"
-		elog "(\"Off by choice\") by default."
-		elog "You can enable DNS-over-HTTPS in ${PN^}'s preferences."
-	fi
-
-	# bug 713782
-	if [[ -n "${show_normandy_information}" ]] ; then
-		elog
-		elog "Upstream operates a service named Normandy which allows Mozilla to"
-		elog "push changes for default settings or even install new add-ons remotely."
-		elog "While this can be useful to address problems like 'Armagadd-on 2.0' or"
-		elog "revert previous decisions to disable TLS 1.0/1.1, privacy and security"
-		elog "concerns prevail, which is why we have switched off the use of this"
-		elog "service by default."
-		elog
-		elog "To re-enable this service set"
-		elog
-		elog "    app.normandy.enabled=true"
-		elog
-		elog "in about:config."
-	fi
-}
diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index 9b23d3f3d252..facd8ed97a94 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -7,71 +7,6 @@ AUX thunderbird-wayland.sh 118 BLAKE2B 7ae701fd21972d3b67f94962441e37bdd04d6b71f
 AUX thunderbird-x11.sh 112 BLAKE2B f62f330ead8aa425d614249f7f968078def08f851d2529005cac6f0bb9257d0ffd6bc15e200b53283106a2739674c1d0cf900f6dc4270138281bcc7666b547b1 SHA512 24490cd7c9dbd4d04124f92a5cd523fc0c48cff2d7f37cb2492bb6644a986da7ff05e62beb744fff1187f991c6f3edd68474ce6cbdd8ea34479bce2c2ded4406
 AUX thunderbird.sh 3178 BLAKE2B 5219498d7dce79cff36ea440ad01dfec1c2ccf3707c4855aacbb93da8b429d5bbc109a8b593a158e6128082b7350660100c2fe3aac48c7de7e033a298dfb704a SHA512 e7963afb9fa57a33980d2a55b630736d4029fc9de2f394f498eaffb0787b5796268f06757728c3f2d93afb5494b5088b7cd923f24eac4615c57041b5799b85f6
 DIST firefox-78esr-patches-10.tar.xz 66396 BLAKE2B c29b723e47c58b10885b220080568aba751e1b73c58e28fce62a2da4c4c3ba8c71b63e60448d17599a3df4446dbd9f9387b4b2b75da5ed1e545591aafe8ec83c SHA512 6bb9caf1f6867b894ab315a73f8ae6f381b5c80c90539f38e786ee653c72c0df055aade854faa23f22cab2253f54abaf918a756945b76ed88f5a224ba8a8f12f
-DIST thunderbird-78.8.0-af.xpi 548342 BLAKE2B 4165c5723013c15bab04013dc316f6c7574acdbdcac676d9971b35d6eadd13ed0cbeb2d4425faaa0d0b73b543920c7a2b4d569bc8ebc5f3502030dd85950c3f4 SHA512 6919ddf5549197a398a75ea9ec0e8074bd521772e9b1a0977f9322e4967fcf4db09ea708e07c73badd3ffddf351443719d0010b80edaead75cb3b75f8eb1b0a7
-DIST thunderbird-78.8.0-ar.xpi 648607 BLAKE2B aa6a845c9fee67edde83c77864bcefd4987d6e0de7bbe74dd393d04a29b3ab13d1063c5c05700e8f9aec4ed272d2dbc75c0b90977fa92047cef1abedf7cfac7f SHA512 6a607ca466ba05bbe439b3188a470782e3f5bdd1346c4d24eafd7ca7127c4f456d26de006208affda019a010e4290e1e6940943764ee03af6b4c0933153601ae
-DIST thunderbird-78.8.0-ast.xpi 561254 BLAKE2B 86b08175ae6aff2d3c32068cda3a814d6a7a004032f9998b5876a0c6c75ca619effd7c4b647d5dc92110f82da4c78e86dc38dfc180353a2eca5ba5119029ae8e SHA512 009df4311c18d408211bbd40179cc566dc248a9ff38eeabf7373b8a5551493c92486aeee114a09ca831f759e1ba321b56ce370f7f4be7eed82f0e90e6af5e449
-DIST thunderbird-78.8.0-be.xpi 666671 BLAKE2B 6f7d5d82f1e596678e0a2341e2be5ab53ac12fcbca51187ed27f9736bf19b606e09fb2d4f54630863e942e549e9499da8fcc01d8ab2fa1e50aedda347e2f24a2 SHA512 c3b4f7a251b558f5cd3925f99d47e03372ab2512ab538c98451866a58c8c0460230316079699ddecfd0e725f09a6cc0765d4194f5751da80814587bbe04bdecb
-DIST thunderbird-78.8.0-bg.xpi 672415 BLAKE2B 9d750e1fbc1bef06c645e79ca6588e428eae3a5c5d35e9d5a7b7df967faa7596a7332e52c251779b2d4768ea8c8dbdfa22dc021b63d5beb1d2adbf6b551bfee1 SHA512 58468edfcda578fc9b262524d38f31857d59411a4e63a608c5db517bfa9bd7b7bb20261ee25647ac74f5b48bc18c9ff542c8715323d59a63b2f01a0245e43647
-DIST thunderbird-78.8.0-br.xpi 604536 BLAKE2B a33c63a80b534e48f5cf38205b3711673a02b3de2163413b99d652cc048b9ee9726192d67a53636343bf2e1f80e6b7e9bbc8f37bda0fb00e994ae64556037b8b SHA512 f28ca741d5860347964388fcbdab173223ef56766c37051dfc05ccde0f1e77184d57fb41dced3636967f895ef1f92119b99982cb37f2e991ae833ff5de00a169
-DIST thunderbird-78.8.0-ca.xpi 620451 BLAKE2B c32b0469dccc4cae5bb4bcd3ced1a503df8cec0ef750bef6c6d11057b9549e327a93bdeaf293d0fb06a00e3b8cfa8c8bd2e02f5d464f2c1d6eb482e23d899537 SHA512 60fb3eb0e0e24c5a52ea5b3203fe1a2c83920579607cdffa5054e6a8d861e8963598ff23c24fb7e0fb5febf997e9b79126046b0413a01b5fc067547cffd64879
-DIST thunderbird-78.8.0-cak.xpi 635653 BLAKE2B ce92ac946377fb7144e50dfc170946360d673bf29095a7be4aff0dded75f34307c25679750b7ec766a98711e0f07ca681556026c99b073b51094a4ed362d527f SHA512 64e8d64f9729dedc63eb5a140237f060e5a4a37fad6fe1c71d5d04738dcead20ab44690c6cf12b1bcdca31a3a7ab2f6f06c4985ac3cd7e9356fb5c0370200f4c
-DIST thunderbird-78.8.0-cs.xpi 635349 BLAKE2B ead7ef55525a86804386ee118eb6f40dc850d3f83d9f70534b7841510a80b6eaf3ac3c8c306852bd610207c9f71409b3a085f2e173edd9a47ac49e627f78aea1 SHA512 3ba9a8ad0ad92c1f95f60fecbc5b06e9b4afc8e5862c19c5d7204a014b689e9022b05f7f25e7bea76a12bb53bc35fb2daeb0bafff248002490193e5a96091155
-DIST thunderbird-78.8.0-cy.xpi 646245 BLAKE2B 3bf8ae9c19903c49618ea9837f00a35ac61ca76c3b1b6d63544bc86e5d5fdf913646fde3fc2fadd12da373ad388bdf9527a2334d6ffccf73a776ffb97ae2d49f SHA512 e2859b10dd6a21cd534ed066cbf45f73b020624c0822ffe7c00a9bd38fced0f1e0d6684e907c855475e68d031934346d8c79a4280f91141b4bc6a6c3684b0f88
-DIST thunderbird-78.8.0-da.xpi 620998 BLAKE2B ad2d11535c67bb990da63b8c34bec78afb9ff2dea92f3fb82628b34c5cb144925d8f977937489a5c8bdbc3ed118ef26e8a9efd6bc866f694f22cd0147041f1ee SHA512 5df2c6e9d88554a120613839d07d13c7d181dcab4cb45941122ebae16311f810ff82e99464124a5de672c41a1dc99fe89a54da425ceaf3df0053e340049ace4a
-DIST thunderbird-78.8.0-de.xpi 665187 BLAKE2B 5f4326eee7d7b566d273e62dc8924f20d6ff515d49523552ef3dd982cf1b2c6646844785bd56bced0df65a3149c2c349d54067106f6d0c85b315698c4afb17d6 SHA512 7178f9d97fabc04d46e6c1b0857709ce88720f44e316868799e92e6c96a7186a5c978635f72f63cc5568b356a03b85a9e4bc4067eccef9bccc8a1e6ef4d61517
-DIST thunderbird-78.8.0-dsb.xpi 666773 BLAKE2B c8348d6df73e4d60bd4df2f71052862cda7b25684efd2b3a658e98015423546b5a2762e8f6c16e40960b29e6742390394a6223c939f105a34012f0a29d15a8ee SHA512 2b1eabf4fd17d1b99acad9fc0741093dc4d79fd94fab023868aa8f61d9e7dd92b53d2a963754584d2d4cf0ab95a167292cd4cf8a3d50d724f5ba4513c2564334
-DIST thunderbird-78.8.0-el.xpi 774460 BLAKE2B d9830af62f3e07e4655ccb4efe7eecb1dcd512cb2b12169b1a40388d1cb65a387cbf69d23f0c29c1764b9478fe427373665af7056d544302af6c1016d8ea789f SHA512 9753aca2e05439818e5d45a6bcbc64c48f3342a3ca7414378fd8edd72304637404b29581833ced3320640b8cb6bf66f5410a090f76df331cd56beac013c99a9f
-DIST thunderbird-78.8.0-en-CA.xpi 611769 BLAKE2B 88f182b41a461f19cedc03c3dbe54637e50bb08c34fc78c10aa680ec8b7cb97fd721b8758edbf49c3be0dfc8fd4784452864010a296d7cd9a1ffc9045fe06ce4 SHA512 cbfffc53c1b5fd4fce0037aca6ad8d795e997ed260583dc2794428da89dc43cb4a73e1ff04567b902266603421ad52e2d82e9ad3bd8b702f938d2db1b7532abf
-DIST thunderbird-78.8.0-en-GB.xpi 611186 BLAKE2B 170d4dfe3ed46b2ca6e912ee4bd4ebb297486104f4b9db4f7720ae2a44ab74a18b556e9b6a4212bb7e386b0cf7b7c73b8630d1be3ffff1acc1f8dc55c452d322 SHA512 ee301f1dbdc7c687b6825e7636121c583a6410465bef77965b3230638a4584dd45caa75b938d001a2b378a58a965e324912637fecb06a96b841aa0f11897899f
-DIST thunderbird-78.8.0-es-AR.xpi 657788 BLAKE2B 2c58fcc67575130a21f3c863247e300f79f675737857dbe2f48510bc37e9d2f982c8d93972b86087aaeb59a3b9e64e62e871a8f37f6e6e45f123e593f3b56444 SHA512 977a2dfbe08e86b5b15c5165d77a0c8b4218fd3a77c7c26b9d6ed60422ca2467e661b0fbb9a5e7fb0e791fb2e6c58743a2a540bd10b0efe077cd3f2a24f3c515
-DIST thunderbird-78.8.0-es-ES.xpi 569795 BLAKE2B a383ded35dab81b3777cc2431455df3b680110a4769d638aeef8d42f38744965a5c51d04ec9d9d56cfae5e7bfffdb92630e9159dadbc102cfb41a594ca6dd83a SHA512 24e84d2b01313466235fc0979b8d2547a453d4fbb5db42c606c3e95241a1e0047aee7e130f5095ab57a71a3f581c3bb312aac8a92c7dfe0b4f8b89d1072eda75
-DIST thunderbird-78.8.0-et.xpi 597734 BLAKE2B e14bb1b238e3f1d6e83a1b2cab5b8d4e7c72dc9d134128a190feeb9d8d1bd30aaa543f9613a93dc164fd54e31eaad53700e777fc21f98cf58dc26ac2d97360f4 SHA512 9cb6647db768f9693e93b9dc81f2fcc13c87465dc713661ef26f0e238bc7d61fd393749e26e85aff434fb5de253f8435cb81ade6637456cfc6a5cf52ad362522
-DIST thunderbird-78.8.0-eu.xpi 632966 BLAKE2B 181574e2029b48b613877c306a0802fd90e040b73e93a6cfa1ce1cdb38008ac4a598350ae1fbde9e5bd075f7f70e8269003c1f37f31f8ca9c62c35fabcea1068 SHA512 f00eda0202e562e64e0432978d2b0ab778189d28288c0e7afbe91a9e12d084b0b0e3c8b19ec329ab0112155713c67876fe9d81a9218e537d8e751b59a57af9b1
-DIST thunderbird-78.8.0-fa.xpi 639752 BLAKE2B 2641ae1d68498c9ea3f35917ce961d83f8248e320da3d4737f316f1338c548cc10384303095c7ddf6e16e8b67538e0b535394bb4cf879cbddee9cda6031ee0b5 SHA512 48c807a6ac991434a425122d41c8aaf0eefe184949c9113268a9d2cb872f1d6afdd189e48b04f1bf172a61f9ea0eef258396fea8621afa5fc99a74079afeacfb
-DIST thunderbird-78.8.0-fi.xpi 642446 BLAKE2B 9021bf414f4456c4bf31100fa9971c1d86ddbeafdda00afed720168e26259e8fc3662a01f6768e3e03dc11c35bd128c36aecf1ad3d62b910079df1ea1096063a SHA512 c1cccb2c151496009e19e11003f0ecb9b790a8d38eee729665ee5f0a60e8301a42187a6b7d6994cb01f429d282d4eaea8f8456898eb3ed02b35456e9aa029e80
-DIST thunderbird-78.8.0-fr.xpi 669487 BLAKE2B e3fe0ff95281e34809deee629ba2c4b373a51283da037a62b214f7168d2222166140b36a770cd77554c594240940eee0f297a40bd0f601bdba558477b168f98a SHA512 1db2d3a5315ef3354d62e0d3137f6c3a67686379b57d77db37c9528e9d7be2769fb0fec69923de792cd1c2e6f9d2021d18ab335bdb175f12b46dba4d761f29bf
-DIST thunderbird-78.8.0-fy-NL.xpi 653081 BLAKE2B e9f6970daa8443ce773d4f6cb1034ac80fbcaa26459d7b5462dfe55fb2f641ac5972e0170f066b1c6f274be3fc31de4c3dc6fccec5093d884be9eb294fb34f25 SHA512 be36ab1dc00f94924671aa208e5d0ce9026c207a905943e6858de8c3d1e5c3f3cca17090e43371802069079e05eba7d3d1fdd1a076d3f998959fbc1fe33a97fe
-DIST thunderbird-78.8.0-ga-IE.xpi 600699 BLAKE2B be75208495a5e984a5ca52d044be90ed08594f03f24c8aef2ff518907e7f8a1d5efff472664a45cd40bb75c209f02bf1c9b70454441160ad521ff0bd09a6b88b SHA512 f3ca1e2a43f67b30ece5ca766c6446a09ca840be153677947a0648365a36d863e2b6f9696856a8a0be489c3162c80f61b9e47984c6f139f9dd19841af2b14ccc
-DIST thunderbird-78.8.0-gd.xpi 609386 BLAKE2B deff30da088dcf3e8f001ac8b7c734aceba8cfb86f4ccf53887a0dd6ad4da6ab600eff9b0e6d276ced2f69e47b02463cda9a751c48cfc78de2c7d27e1d65d873 SHA512 7c1f1f955dbe7c93179e5cb0d4868af1c99947202e886016d74018aee79d29fe93a1fceba7bc14de2ccc354532f9a7b0bc27554041cd78a4bc064ba2ea5993c6
-DIST thunderbird-78.8.0-gl.xpi 615725 BLAKE2B feef84503450168170ddfe839fb21e24ee28004495c60591f55da021274c2db6d5871760fd2df46e99def462191c9a60cb565d0def417a57a3af78d8165b6271 SHA512 2703e48c68aaf84c7da1c71f59784e9df8cd0986da9e3174e968e41300acd51ba28adac97e293eef2f41c32fc7818037bb0e6df7ac9ef9a6e502cc1400107df2
-DIST thunderbird-78.8.0-he.xpi 640504 BLAKE2B 017cda134569d13b0e0200f0a63fef92925f6e37c465cdcecf5203b3e6994eb0ae4187fac66f538b8956db1fd6d1be824a76ce1ccde401394be7f82a0b8c5ade SHA512 84e4695b4d68b4adfb39a6937857473cbb03385f7508cd3644888ec27c9508e4a7fb370d80731ba319187dfaf0af62e46030c36b872dcca7995abfdd2caf188b
-DIST thunderbird-78.8.0-hr.xpi 629030 BLAKE2B 3816d4da01efde04b61912113b1c306c129a2b990788d64daaf2c16ee962fe88da4826c4396dd2414134e171f89458e283e09511c068da739053c4ea5bd0d4bb SHA512 09e7c9d85e59c0bb4a4c4e767fd240bf28a0271c4146bc1a77bb77fb5b23307fea046c711c1039e9914944f62287b2be749a2c2e1e1632b6726e6d8dbca6192d
-DIST thunderbird-78.8.0-hsb.xpi 668598 BLAKE2B 051f0348d5f5c61ed0c2b256fc3877cbe9ed66053a085aaa8e61fb7f81ef5ad9b3ec1f254b3e52d965fd0e2e60c5305da84c7d661e303eea0b2ddd34cf461c74 SHA512 04893aea2509b5d36283700a028e85399a25543308f70cae30d0023bdf580b3bba1aca47a042170029cb670d3ac16d5b4a48aeef7c29080a4c1c8e68050d74d8
-DIST thunderbird-78.8.0-hu.xpi 679835 BLAKE2B c66d7819ac1a878fddc35864472181be7b3b25718c13b9b9db8d075e3c234e224414ec3c1cc5028cf3f0f9ac8eaae142af61cae01b286df2607b5df3e6e42c76 SHA512 b79e5658913c27628ea94a3c8b0d52aa17dcb9009afeaf138dafd4d70945ff90c466666676f634c9f4c5808dfc71587ef72628e576b1d6389e6bd576130d41a3
-DIST thunderbird-78.8.0-hy-AM.xpi 713331 BLAKE2B 84f0385c330658fe89adc14e5a33b1298ddce4cb03ce2d79207f9165b9e9b2de8bd659c142f207f0d383bb24d8f6d258679149850501384305153ba2bfac1bab SHA512 779b0fd7be93ae028d3af8dfc1b90852fdd39eed6beaeedfef7608dd9b7d020e692939d441b0c59fec5f3cfceefacd36e2aaf0fd7b10084df97ce5630d59e069
-DIST thunderbird-78.8.0-id.xpi 620677 BLAKE2B 473a0ee4ffc941bde1ef51d3d604bcf34926b7134a638ff2a1b5352e72ae6dd4d6d3af2def8913d69ff668615eaaacd5afccccd8ed7f92f746fb9540128c7feb SHA512 e1416db889b9be0c023b4578cdba75adcbf9d4b88b29f6e00d5647c09aeaf1ab1afdcbd88f2fe2e3151454452b4077011e20fc5517d3ca528f36b2cfdfa67ca0
-DIST thunderbird-78.8.0-is.xpi 581648 BLAKE2B f436e88f7fd4aa3a45796dd31a26e8e356dc64f274b8b47fd96629c9a117fa30e0532180b895c15d434ca7472d10b05174e18bffd692314545515afa96e419c7 SHA512 6c4e2c9ee83130b64b150e85446df8b979af5984630de3a32e0f11f5a39cead50068a532c5a5971ee93ee9242190c176bf2ca4ae81d48d140e4fbef37bcd7a41
-DIST thunderbird-78.8.0-it.xpi 572965 BLAKE2B bd14e0ea976377cadeefb826843805481ccba23f5c287ec11190b0dcccd5a08fa6c859be4b105d5a5a56152a142ff9ef33d763996276ac5a51c7d686c43dcf62 SHA512 22024982614c700e1fe7ef048b83859e099d40499b57559758a03a8ea116dd36c1ab9820fa7ef550558c09f9558515b12dbe786f3d7b6d27a3ec077b8fee4d4e
-DIST thunderbird-78.8.0-ja.xpi 722454 BLAKE2B fe11bc934e89893e7f352fdfacec5b330b0bacfafded38d4574e96e1762a5a9ed9caec370fc1ea805d30d7a236b9927840a3b331dd86d506676daaef0a581816 SHA512 92f2590362935cada2769cb84e3f27395353953493bf15d1e8e6cbb8875cbeb594d071a3208d040ce4c79da501066ea2c082923ee8faefc46c3e158a4c1a23f0
-DIST thunderbird-78.8.0-ka.xpi 717017 BLAKE2B a9fd20a0064e7ebaf9b990c8bd0cb795331656ef5a8a8bb523262e46931048d00f4475d128787d90a2a8062b4c0207672ebb1bab8d93073e434cbe5863ac8c07 SHA512 a1a85daac4b3751db10ca9fcab144324ead5023245f02c10c2d712f7a027d6ff5dae5ca04a5f6e0875cb7fa9c2ddc0376d503c7cf06cb878db5c27ca8d9d5a7c
-DIST thunderbird-78.8.0-kab.xpi 651922 BLAKE2B 41bff182cfe72c270cd94e15512c8b134ab4d384dc7ec52bba86a808192312886e3256ca5c128f0523e99674789b516089d6239e432a6b694da0bdc01751d154 SHA512 49a75c15a0b6ecb97f518181afa711e15cf2c7e3b2e368582166d4e092fa9beebcadf4e572eeb729d8531f1ec5ccbfc688edde024c733dda5980be09101ae52b
-DIST thunderbird-78.8.0-kk.xpi 720468 BLAKE2B 21815445c1665808abe1ff93a77252d2f4622971b80e5210828746020850546e350c8764b8b7de5b4b22b7210662bd32df14d65ef84ade8769bced175cba310c SHA512 db40436d08152560134671e6e5c52e3ef1d5981561523519fe0bbffe88c2b0e305940fdb034837715aa1e7f2d40e9993f90f5614dc949fb4bd35aad3afc22efa
-DIST thunderbird-78.8.0-ko.xpi 688207 BLAKE2B 2666812be58bb367bd92f98712e83323ad61677431e8a3d1283bb943382b182e16b28ec58f435ec59861d819abeef1ebdd37712ae4ad94324d629c1a969dc2b9 SHA512 2e1b468fb2f74cebb4c8d1978549a12bf2472b8dc07581281e8eb993b2454c5c23c1fbf99adbc4360daa00b4f6744b1d7e45d165e3c835a1a656f0dd22976e9c
-DIST thunderbird-78.8.0-lt.xpi 660298 BLAKE2B 5f1bfe651c3af4fb008fcbce06f31747fb5145fc92180743ad08ff2a9afd585dd8b1a2cbf9fd2f2bc0dedae3a70319aaa796d4e763d4b8ea5ecb0a96e8900d68 SHA512 0e454ea9c7a87d34235d11ba843e9801bbd2a093366f5d845a2eaf0cc7e07430409f266a09f8608750e2bc78564e8a0a24591b95ffc2880452546e60f94b72a0
-DIST thunderbird-78.8.0-ms.xpi 572174 BLAKE2B d72c780ac2766622b72eaee552b9957750d0cca30b7ecef4ef1a5bfaa26f6c34a32f86b3e5200d03c487514b83abfa99ad3e82cb14d9bf98544f2968dbdf4976 SHA512 7872308796d453a7d04423f51d6e8e47ef320e49b0e43543bd0e381acea30d4a4a0539c2a5d29529fd5b5bfc0ffc9bf6f113229bc413f4c6e4d8a2a492ef1c17
-DIST thunderbird-78.8.0-nb-NO.xpi 637239 BLAKE2B ae4daad96278e5b4154b4be4675a84d838c1d3def8762904a73d33e20e458c1a676ca4796f46fd72742195c3d76565f116849fb2512ac88b46e9de7f1d46149e SHA512 ba07b4ea6a9e46b707306cb18074bc67e318195a1fd257d2632b90ac6de8c5c45db178dd04e51e2b168a9021ff278bd487597bd6840da1883f8874a37c0be17e
-DIST thunderbird-78.8.0-nl.xpi 644359 BLAKE2B 41965faf73c3c0f9fb017965b47468beaf4faa9e5dfd09b66cc984b1d0931963b0fa8f34fe641f7392731d86425e29ddfdd474b5f0d2debeb5d3af4d9a33701d SHA512 1053066a04e48dfaab69e409389cbc248b03aa32b9806c77f1c5ab2e69adbc9fa5d91142f4b87d8407d01daf958a035e73d44f7f0c3d1c13c141c79ff19ca9a4
-DIST thunderbird-78.8.0-nn-NO.xpi 640690 BLAKE2B 46cc9ac54bb43b20202213e033b7153be0c3c5313e48e44442f85c90a56222b77185511c244d67663205117391e02cb7ecfc1f28ce997be170bcc3a4bfe35d34 SHA512 1c08b8daa87b50ba0474d55a4d72161796e58e76e23a88e6c88035bf019aaad9834a625f8fd45cb42d106043252b15f346296573fdcafb7d11643ef2c73376a3
-DIST thunderbird-78.8.0-pa-IN.xpi 633219 BLAKE2B 4d508e848a9bc05aeaf4c54ee34d061187effed00dd2610bf27cb28df166866dfdf17e2fcf2745f973b6945eeb444bf6ab165f26b18f366874559e8acd28921f SHA512 65993d2cd037692b6b56eba803fe027f7dd5ac567dce89ae5d4929ffe99501d681976b3b0a99b9c74ec7b40223aba30de002923f87e8ec0ec7e38bfe0e49482e
-DIST thunderbird-78.8.0-pl.xpi 637132 BLAKE2B 795bdc308f7dbf56195cf6cf9c4a71d017795f367caf61611515cb37b4057313299efad6823274e56a7b23fb0daab5aaf7ce89fe4e24b9d4a043b7af56326c4d SHA512 cce74e59f21757582e83ee05035682dc6371f3e171226dcb20284c5528f9415c07254a3b1643e74a9d361f1d2441fb6b4d9194fc84630d58a35213bbc3bc3394
-DIST thunderbird-78.8.0-pt-BR.xpi 649415 BLAKE2B eb9b29ff21191682e402a31e63a6c24d6cb870f2608f525933a18da4e663db1d9cd6faa6979724a297c79e2dc1f0398ecd89ea623e1d7972cca675f5712cb2ca SHA512 bb6c5a9d6895de4faf6b19500d9c244976ec11fa88b16226c15fca17264a09f1ee7deaab7eb7b2b9b22b176c959a05aec578d9b28b4c0415f73e42300cc6d097
-DIST thunderbird-78.8.0-pt-PT.xpi 655502 BLAKE2B 450bce6537e58ac2750c7c8790270dfe994cf38e4bfb07fe322b9d1e6fec47665b7535724326cd4ebf8a0f790b30734db29b123b9289325d355038b2fd622fde SHA512 ec04f1ffb87cb5c83f1a0d1fff72d39e01621e35fd506344cf50217ba056428f6afb52a89824d89ae2968041a9f4a316532deecb10ea4621ac9eb93524b0299f
-DIST thunderbird-78.8.0-rm.xpi 646531 BLAKE2B 09ff8eb94d3d7b2d25104d4c17ad957ec6046a37f4b45d6c88a5d60c12e00eab5833204ade5f69f06bf689548eacc92e7e7db9b69bc06efd2bf1b0fc2b0d0755 SHA512 1bcfc9d9139fb30e0c65b688b1bb483d9c0cad0830840dd56b958c03e842400922351a5152a0c3d7a3e843fde35a51a26568a18ae664697ddead2a37c2fcbebe
-DIST thunderbird-78.8.0-ro.xpi 662627 BLAKE2B c82d2130d5ae2dc7b57b21f2f4465fc5d775ea71d504decaec25ccab59a6621816636a7d9051986c4809ebcbf617c2b88a0ec81ddd8a254bd74af62e871f2380 SHA512 7ba6221fb3282b13c399aacb5d68063a0bb4755d222099f74d63970a4b9087170e40a87c190b1201f1cbb2a932479bdced737cb52ae29715b64df0b827e18aaf
-DIST thunderbird-78.8.0-ru.xpi 756189 BLAKE2B 10eea9117fed75fe4cd4cc3ce74e36bf72047164e569dfc74f3fd38814e82e0c7597a9ec9577f92e7c59f482b56689c44b7186f373f3997a40a2a3ebbbd2fdef SHA512 79a8c316282f73bd2c717f8b01cea00d7899fe22b0e295c31350d81a1c4ab7e663d0489102284355daebbc58c3b1377a7f8495484a128cab9f5cbeda99bb8682
-DIST thunderbird-78.8.0-si.xpi 651103 BLAKE2B 9ac083d464dfddac5d265d80bf4d411e8c2f66f20e05e000a64e063da6e33176f400d4e47f27eb1adcf970e2aed563ed5f4ab62d0e34e29c3a2952405daee55f SHA512 673d7a600704c4539acc6a7e800f0403197303648633c860f38d330112ce6e17a99132019f95f011ed4f2073221358a758765577980565d6b941547daa0e83f6
-DIST thunderbird-78.8.0-sk.xpi 643225 BLAKE2B 249d1d14f0097792677ae71e780ba21293985f40db4acd9ec95111499554a53b4195730399f9aca514ca0ead37d3839271115fb38bb58756c139924269968bfb SHA512 44438e9c6fd938630ebdf768659acca14067ffbb7831e889def33109e09f24d551a5f181925587ffddf7d54c8abe5a4320c8c7110459bbba44f3b867c450d1d1
-DIST thunderbird-78.8.0-sl.xpi 632384 BLAKE2B 2fb5c7668b6933ce48fd236c3b38970de9219214aa8b215260f5753b9e2d4b1842c41356c43aa16825aa073ead5c3e68dc19f94e2bae6889f3f3d2458c525f5d SHA512 6fe972a136683994b595743527640d51f4d0bb3880b794df5c4c611a349dc56f5968a651b3fd62bec58511a6fe7c6ef7d30a77e7c469b20f1060b4444be4e2ef
-DIST thunderbird-78.8.0-sq.xpi 657816 BLAKE2B 9517fd6f8c35534350905919d1f0bb97a1702b8ad3a10f29861e9add9e88b4d489166b0fefd5fbd4a8b229169ab35dfb8ca2a6b390b82d4f984095e4de3ab3a8 SHA512 e9e9b22d813f5b825f660a977d3107caa7efabd6c9b8a7a2e9371cf18d5dbb3364bf400dce589864fd4252f9513227e3396589561939595e19ae575bb4b3d2dc
-DIST thunderbird-78.8.0-sr.xpi 683123 BLAKE2B 5deb3e13d436744c4b7f8c52c5eecfb9abfbdc069993fe7cad47a9b2e73e9685ca670c1ed0457e769b1e8b4233d88f275194ce5301adef77863d4d6685d020fd SHA512 0026010d0aff81ae619e1db8e9d595e1c51177aeb45c1e98d04d6ed276f3dbe4cc4758898d1982a6443f35869d0cdc89cb44ac9f2367a00fa2ecb350e294e0f3
-DIST thunderbird-78.8.0-sv-SE.xpi 648867 BLAKE2B a6c7b6137a8d540a506f3405119725dfc68c1136be2e715f9d72e25ae0cbbc4ed91f659f560cbc1c069aff8cbbe5fe1b7a094d87f73c2b2d5da557deae21d6d6 SHA512 1c25d41ceca01c6300c9cc42d643e59a5d97ed73aad810c148d2845dd51d28561bca1342f4d86da61285a511cba39aeeeb455325c38334586d5acfcd1d1e2768
-DIST thunderbird-78.8.0-th.xpi 712027 BLAKE2B 39a6186ed96ab458743ae3d03b938a694611a441340dd1dcccbc7ca3de8fb765e42387edcb529b228196fab01dc785ed13cb882d839a50dae98a10fbafec4278 SHA512 58f730506782d014ea1e0e0ba8a6c9f6226a3d3d617e793350703fab925606695a10f5eac396c9c3aa3d294f41989e94b7c5220a3af08c01e031cf6327c3d123
-DIST thunderbird-78.8.0-tr.xpi 649070 BLAKE2B 7d5c22de6bde5843914b05fd3aaa4679aa947103e447e0a5ac0d68cadabb2623a065bc973869cdd79223067aff334e2ebf87e4642d9cd2dba67b5cfd64857f4d SHA512 bcb6026d3deb8490998feae8504f729bcb559ad6c7dde330d6f8fb2a1e4eeff090e7ce1313fd2a6a7e8a44fcad519a4f2c8f2f40d739b4ad17cf0bd795ca85cc
-DIST thunderbird-78.8.0-uz.xpi 586600 BLAKE2B fbe31d8a104bbd3c3900c449bbac350144a11255f4fb8ac060809a221de2ebe364205838b43eaf9f6183451bae45e3b68e34b84e5a63bd9d0dcf636c99c7803f SHA512 09ea336d739be09ec97371f75f914a5b36f89042f1b8eb88bb2f89951ee55820ff74f3bc5b8ac17bf199ce0778e5404891dde4fc71bd4e671336c44b6171caea
-DIST thunderbird-78.8.0-vi.xpi 674601 BLAKE2B 4ffcd7e4015a24b72b2c6e63bc3be529900bced5e1ab42f82f9a8e7c7a1ebf1218b5cb36025318f7c774e135951476226d924223754626ddbb3e9cd59418eea4 SHA512 9bdf8e207003bfc9b82919794d7c8d94dc27d4acef4527fce2dafcbd8721f92c63fff72ae0f59f8f44d16d993e85a8c32672a62be8767172027565b1026c324a
-DIST thunderbird-78.8.0-zh-CN.xpi 687183 BLAKE2B 87e0d1b874cb21eef72b3cd53faeb5cd660fa39a0e9779e4c83321f25fa94c7c43b1ba3b268b33b9c637af671cfcdac03f8128f7edf371f5d8afe2a1e6422f66 SHA512 cc9a7ea3cf683c91066072121b1686057bbaf55d5e43a63deefbf40df8a14491e37d3c361babb38fbb839ac24aa31ff2a0cc9dbb48848a4bcd2047371fcc7bb7
-DIST thunderbird-78.8.0-zh-TW.xpi 687626 BLAKE2B a4a0c70b226b1f0672b25dd467d2000270042f5d474ef257dc56973949f06fbca51c1a8b520860762a9feec04c3d65ab4af537fff702affea38a7c724921b7e1 SHA512 e98b5772218608e5355635a80dc49156ccc18297c59368e5e4a6c5a40b3716b240e67e9ec3f69b8f230b8e7ed4b32cb6073743e843242d67e16c11937adab50a
-DIST thunderbird-78.8.0.source.tar.xz 353232724 BLAKE2B 3c691393e0dbc71f345557632c734138cb7e603ffadbc364837c3fb759be07bac3f8b022b3e1261a7d850fc33bb917d7bb8fe314ea4c39dec6286d882f1c7f00 SHA512 c7d31ab6b2863c14fe7e11df4e805ca0ecd1f6e6b5e7d5ec73939500c5125faeec213b4df25f23a5f152345027926356b7df47efcfa60ff0f9e5b825119f0e51
 DIST thunderbird-78.8.1-af.xpi 548350 BLAKE2B 5f500ac162f5dcf34abc7ae79fc2734856482b8f1265d746367ec3ec78077b0beaae65fb2da770ca4a5076f954919d6e5c632e3fda8059223135a47b08480044 SHA512 e5c4a6894d8bf7e32f884efb8d96dc100962632ea9175febf1cb5d456c5d8439d8919b1dc3fdd970fd221a88f57893acf655ad64040014953fd670cebd974216
 DIST thunderbird-78.8.1-ar.xpi 648604 BLAKE2B 591792bf93b16f79e79e2fdb726ade85ded8c2166068194a15bd29a8cb673a908a846ffba9dd43e57a37d1d8d6c2eec83177ab416ffe6d00e46cefbd426d336b SHA512 5f77f0789a4bfed84604372f77a7907c5ec2b7ad1e09c6be3ec2caaa9616270b4316e7df73becaf08fd458dd730a077d5a004af6b44e5d6aac516ee2b5d70323
 DIST thunderbird-78.8.1-ast.xpi 561260 BLAKE2B 31441d0d894cc4d593a52e7688c19f377e787aef0815a35c2044cd55ddc6582e4f526176fa63da5f4ebf70a3b5465b0ddc5f16de92d9578e2e9bfc053f2ed29c SHA512 ab1ecede6ac20ec7ee75a9c644d2bda0f694fa85780b51f3ae8295e3c8dde2b4cb92260230d658bc0f41e5b810b768c679eb5e6b94cedd492eb86611363c08cc
@@ -137,6 +72,5 @@ DIST thunderbird-78.8.1-vi.xpi 674607 BLAKE2B 4e9171f411c664f28acf7cf5dfc592c225
 DIST thunderbird-78.8.1-zh-CN.xpi 687180 BLAKE2B f280eb1c9255c51a3e0e9a3fece514bc65c219cc6665ec0013af78073420c2fbefb342293817bbba422011889e0389af4984855fe57c549e60a3ca43761bd46f SHA512 67636461fedbaa03c78f3e8015cb423c9186459fdb7dc4ebfc23b6b8caa079d873a726ec875036afbb9458cea84b959f1242e2fe9917a4d53b55b428172dacb5
 DIST thunderbird-78.8.1-zh-TW.xpi 687625 BLAKE2B 6ccafd9cb5d2991143dead267bb7515ec23d8d9e491ec694641dfa182eb2f49b104553a9e918557edee2f0a85993526ca43c2a2ea6b15bd3a9a54b35b2235a53 SHA512 86e3f9c6fa84268ed79568cdb3003fee3420f2f8205492fd87eee972bbda94556f2e3c8d241bd028b174834f84f957738e0ef1f238a963c49aa589b5d9563aed
 DIST thunderbird-78.8.1.source.tar.xz 352875768 BLAKE2B cbc099669575a198d7c0ef1663848327f52fe1fe30473122075dd4e5e4327c006e03ef6b5bb9e741c782276dd5c8b43fbec16d8a11369c684a252241ec3ca931 SHA512 5158f7663acf3d00f45b457d1c172dcc95978d6782775faa4ec3995d3a799dfce668302e2c4b963a5607add831314fac76d516e45863a1971fbd4a6b0c4bdb10
-EBUILD thunderbird-78.8.0.ebuild 31626 BLAKE2B 3eec6f7960f024e5138eff2052dde15340b822363a3aa871ca53faea5494093eafee5462eb8d4786a4c733307811c42f23a876c1342624d51bd83d8f20f582d3 SHA512 e63d4d08622c911f1f132f6b4efc840e4c0293710841b954cff5f4c5bbe03d618cb395963df80f809bbe886bcbd3e704a96eb316d4655185204f48a7fbf2a5ea
 EBUILD thunderbird-78.8.1.ebuild 31626 BLAKE2B 3eec6f7960f024e5138eff2052dde15340b822363a3aa871ca53faea5494093eafee5462eb8d4786a4c733307811c42f23a876c1342624d51bd83d8f20f582d3 SHA512 e63d4d08622c911f1f132f6b4efc840e4c0293710841b954cff5f4c5bbe03d618cb395963df80f809bbe886bcbd3e704a96eb316d4655185204f48a7fbf2a5ea
 MISC metadata.xml 1740 BLAKE2B d51bd6ad55bd5a54ba77e732906443e19c639bc2f081abe48ef756514fb7bcf45946ae7898b30fb2b73cb654886cac98d107a0244707301c4b800fc2f7597f49 SHA512 d5980ffb710daf47bfdd6d46b0b74a198c2614fddf363438c75828516bb742720ac767887ee67ed7bd1e7c5c76daa0588778b5bc0dbf675ca04d7e1d19685c1e
diff --git a/mail-client/thunderbird/thunderbird-78.8.0.ebuild b/mail-client/thunderbird/thunderbird-78.8.0.ebuild
deleted file mode 100644
index 3289668057eb..000000000000
--- a/mail-client/thunderbird/thunderbird-78.8.0.ebuild
+++ /dev/null
@@ -1,1108 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-FIREFOX_PATCHSET="firefox-78esr-patches-10.tar.xz"
-
-LLVM_MAX_SLOT=11
-
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE="ncurses,sqlite,ssl"
-
-WANT_AUTOCONF="2.1"
-
-VIRTUALX_REQUIRED="pgo"
-
-MOZ_ESR=
-
-MOZ_PV=${PV}
-MOZ_PV_SUFFIX=
-if [[ ${PV} =~ (_(alpha|beta|rc).*)$ ]] ; then
-	MOZ_PV_SUFFIX=${BASH_REMATCH[1]}
-
-	# Convert the ebuild version to the upstream Mozilla version
-	MOZ_PV="${MOZ_PV/_alpha/a}" # Handle alpha for SRC_URI
-	MOZ_PV="${MOZ_PV/_beta/b}"  # Handle beta for SRC_URI
-	MOZ_PV="${MOZ_PV%%_rc*}"    # Handle rc for SRC_URI
-fi
-
-if [[ -n ${MOZ_ESR} ]] ; then
-	# ESR releases have slightly different version numbers
-	MOZ_PV="${MOZ_PV}esr"
-fi
-
-MOZ_PN="${PN%-bin}"
-MOZ_P="${MOZ_PN}-${MOZ_PV}"
-MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}"
-MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}"
-
-inherit autotools check-reqs desktop flag-o-matic gnome2-utils llvm \
-	multiprocessing pax-utils python-any-r1 toolchain-funcs \
-	virtualx xdg
-
-MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}"
-
-if [[ ${PV} == *_rc* ]] ; then
-	MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}"
-fi
-
-PATCH_URIS=(
-	https://dev.gentoo.org/~{axs,polynomial-c,whissi}/mozilla/patchsets/${FIREFOX_PATCHSET}
-)
-
-SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz -> ${MOZ_P_DISTFILES}.source.tar.xz
-	${PATCH_URIS[@]}"
-
-DESCRIPTION="Thunderbird Mail Client"
-HOMEPAGE="https://www.mozilla.org/thunderbird"
-
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-
-SLOT="0/$(ver_cut 1)"
-LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="+clang cpu_flags_arm_neon dbus debug eme-free
-	hardened hwaccel jack lto +openh264 pgo pulseaudio selinux
-	+system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent
-	+system-libvpx +system-webp wayland wifi"
-
-REQUIRED_USE="wifi? ( dbus )"
-
-BDEPEND="${PYTHON_DEPS}
-	app-arch/unzip
-	app-arch/zip
-	>=dev-util/cbindgen-0.14.3
-	>=net-libs/nodejs-10.21.0
-	virtual/pkgconfig
-	>=virtual/rust-1.41.0
-	|| (
-		(
-			sys-devel/clang:11
-			sys-devel/llvm:11
-			clang? (
-				=sys-devel/lld-11*
-				pgo? ( =sys-libs/compiler-rt-sanitizers-11*[profile] )
-			)
-		)
-		(
-			sys-devel/clang:10
-			sys-devel/llvm:10
-			clang? (
-				=sys-devel/lld-10*
-				pgo? ( =sys-libs/compiler-rt-sanitizers-10*[profile] )
-			)
-		)
-		(
-			sys-devel/clang:9
-			sys-devel/llvm:9
-			clang? (
-				=sys-devel/lld-9*
-				pgo? ( =sys-libs/compiler-rt-sanitizers-9*[profile] )
-			)
-		)
-	)
-	lto? (
-		!clang? ( sys-devel/binutils[gold] )
-	)
-	amd64? ( >=dev-lang/yasm-1.1 )
-	x86? ( >=dev-lang/yasm-1.1 )
-	!system-av1? (
-		amd64? ( >=dev-lang/nasm-2.13 )
-		x86? ( >=dev-lang/nasm-2.13 )
-	)"
-
-CDEPEND="
-	>=dev-libs/nss-3.53.1
-	>=dev-libs/nspr-4.25
-	dev-libs/atk
-	dev-libs/expat
-	>=x11-libs/cairo-1.10[X]
-	>=x11-libs/gtk+-2.18:2
-	>=x11-libs/gtk+-3.4.0:3[X]
-	x11-libs/gdk-pixbuf
-	>=x11-libs/pango-1.22.0
-	>=media-libs/libpng-1.6.35:0=[apng]
-	>=media-libs/mesa-10.2:*
-	media-libs/fontconfig
-	>=media-libs/freetype-2.4.10
-	kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) )
-	virtual/freedesktop-icon-theme
-	>=x11-libs/pixman-0.19.2
-	>=dev-libs/glib-2.26:2
-	>=sys-libs/zlib-1.2.3
-	>=dev-libs/libffi-3.0.10:=
-	media-video/ffmpeg
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrender
-	x11-libs/libXt
-	dbus? (
-		sys-apps/dbus
-		dev-libs/dbus-glib
-	)
-	system-av1? (
-		>=media-libs/dav1d-0.3.0:=
-		>=media-libs/libaom-1.0.0:=
-	)
-	system-harfbuzz? (
-		>=media-libs/harfbuzz-2.6.8:0=
-		>=media-gfx/graphite2-1.3.13
-	)
-	system-icu? ( >=dev-libs/icu-67.1:= )
-	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
-	system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] )
-	system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] )
-	system-webp? ( >=media-libs/libwebp-1.1.0:0= )
-	wifi? (
-		kernel_linux? (
-			sys-apps/dbus
-			dev-libs/dbus-glib
-			net-misc/networkmanager
-		)
-	)
-	jack? ( virtual/jack )
-	selinux? ( sec-policy/selinux-mozilla )"
-
-RDEPEND="${CDEPEND}
-	jack? ( virtual/jack )
-	openh264? ( media-libs/openh264:*[plugin] )
-	pulseaudio? (
-		|| (
-			media-sound/pulseaudio
-			>=media-sound/apulse-0.1.12-r4
-		)
-	)
-	selinux? ( sec-policy/selinux-mozilla )
-	!<x11-plugins/enigmail-2.2"
-
-DEPEND="${CDEPEND}
-	pulseaudio? (
-		|| (
-			media-sound/pulseaudio
-			>=media-sound/apulse-0.1.12-r4[sdk]
-		)
-	)
-	wayland? ( >=x11-libs/gtk+-3.11:3[wayland] )
-	amd64? ( virtual/opengl )
-	x86? ( virtual/opengl )"
-
-S="${WORKDIR}/${PN}-${PV%_*}"
-
-llvm_check_deps() {
-	if ! has_version -b "sys-devel/clang:${LLVM_SLOT}" ; then
-		ewarn "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-		return 1
-	fi
-
-	if use clang ; then
-		if ! has_version -b "=sys-devel/lld-${LLVM_SLOT}*" ; then
-			ewarn "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-			return 1
-		fi
-
-		if use pgo ; then
-			if ! has_version -b "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*" ; then
-				ewarn "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
-				return 1
-			fi
-		fi
-	fi
-
-	einfo "Using LLVM slot ${LLVM_SLOT} to build" >&2
-}
-
-MOZ_LANGS=(
-	af ar ast be bg br ca cak cs cy	da de dsb el en-CA en-GB en-US
-	es-AR es-ES et eu fa fi fr fy-NL ga-IE gd gl he hr hsb hu hy-AM
-	id is it ja ka kab kk ko lt ms nb-NO nl nn-NO pa-IN pl pt-BR
-	pt-PT rm ro ru si sk sl sq sr sv-SE th tr uz vi zh-CN zh-TW
-)
-
-mozilla_set_globals() {
-	# https://bugs.gentoo.org/587334
-	local MOZ_TOO_REGIONALIZED_FOR_L10N=(
-		fy-NL ga-IE gu-IN hi-IN hy-AM nb-NO ne-NP nn-NO pa-IN sv-SE
-	)
-
-	local lang xflag
-	for lang in "${MOZ_LANGS[@]}" ; do
-		# en and en_US are handled internally
-		if [[ ${lang} == en ]] || [[ ${lang} == en-US ]] ; then
-			continue
-		fi
-
-		# strip region subtag if $lang is in the list
-		if has ${lang} "${MOZ_TOO_REGIONALIZED_FOR_L10N[@]}" ; then
-			xflag=${lang%%-*}
-		else
-			xflag=${lang}
-		fi
-
-		SRC_URI+=" l10n_${xflag/[_@]/-}? ("
-		SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-x86_64/xpi/${lang}.xpi -> ${MOZ_P_DISTFILES}-${lang}.xpi"
-		SRC_URI+=" )"
-		IUSE+=" l10n_${xflag/[_@]/-}"
-	done
-}
-mozilla_set_globals
-
-moz_clear_vendor_checksums() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -ne 1 ]] ; then
-		die "${FUNCNAME} requires exact one argument"
-	fi
-
-	einfo "Clearing cargo checksums for ${1} ..."
-
-	sed -i \
-		-e 's/\("files":{\)[^}]*/\1/' \
-		"${S}"/third_party/rust/${1}/.cargo-checksum.json \
-		|| die
-}
-
-moz_install_xpi() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 2 ]] ; then
-		die "${FUNCNAME} requires at least two arguments"
-	fi
-
-	local DESTDIR=${1}
-	shift
-
-	insinto "${DESTDIR}"
-
-	local emid xpi_file xpi_tmp_dir
-	for xpi_file in "${@}" ; do
-		emid=
-		xpi_tmp_dir=$(mktemp -d --tmpdir="${T}")
-
-		# Unpack XPI
-		unzip -qq "${xpi_file}" -d "${xpi_tmp_dir}" || die
-
-		# Determine extension ID
-		if [[ -f "${xpi_tmp_dir}/install.rdf" ]] ; then
-			emid=$(sed -n -e '/install-manifest/,$ { /em:id/!d; s/.*[\">]\([^\"<>]*\)[\"<].*/\1/; p; q }' "${xpi_tmp_dir}/install.rdf")
-			[[ -z "${emid}" ]] && die "failed to determine extension id from install.rdf"
-		elif [[ -f "${xpi_tmp_dir}/manifest.json" ]] ; then
-			emid=$(sed -n -e 's/.*"id": "\([^"]*\)".*/\1/p' "${xpi_tmp_dir}/manifest.json")
-			[[ -z "${emid}" ]] && die "failed to determine extension id from manifest.json"
-		else
-			die "failed to determine extension id"
-		fi
-
-		einfo "Installing ${emid}.xpi into ${ED}${DESTDIR} ..."
-		newins "${xpi_file}" "${emid}.xpi"
-	done
-}
-
-mozconfig_add_options_ac() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 2 ]] ; then
-		die "${FUNCNAME} requires at least two arguments"
-	fi
-
-	local reason=${1}
-	shift
-
-	local option
-	for option in ${@} ; do
-		echo "ac_add_options ${option} # ${reason}" >>${MOZCONFIG}
-	done
-}
-
-mozconfig_add_options_mk() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 2 ]] ; then
-		die "${FUNCNAME} requires at least two arguments"
-	fi
-
-	local reason=${1}
-	shift
-
-	local option
-	for option in ${@} ; do
-		echo "mk_add_options ${option} # ${reason}" >>${MOZCONFIG}
-	done
-}
-
-mozconfig_use_enable() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 1 ]] ; then
-		die "${FUNCNAME} requires at least one arguments"
-	fi
-
-	local flag=$(use_enable "${@}")
-	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
-}
-
-mozconfig_use_with() {
-	debug-print-function ${FUNCNAME} "$@"
-
-	if [[ ${#} -lt 1 ]] ; then
-		die "${FUNCNAME} requires at least one arguments"
-	fi
-
-	local flag=$(use_with "${@}")
-	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
-}
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]] ; then
-		if use pgo ; then
-			if ! has usersandbox $FEATURES ; then
-				die "You must enable usersandbox as X server can not run as root!"
-			fi
-		fi
-
-		# Ensure we have enough disk space to compile
-		if use pgo || use lto || use debug ; then
-			CHECKREQS_DISK_BUILD="13500M"
-		else
-			CHECKREQS_DISK_BUILD="6400M"
-		fi
-
-		check-reqs_pkg_pretend
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] ; then
-		if use pgo ; then
-			if ! has userpriv ${FEATURES} ; then
-				eerror "Building ${PN} with USE=pgo and FEATURES=-userpriv is not supported!"
-			fi
-		fi
-
-		# Ensure we have enough disk space to compile
-		if use pgo || use lto || use debug ; then
-			CHECKREQS_DISK_BUILD="13500M"
-		else
-			CHECKREQS_DISK_BUILD="6400M"
-		fi
-
-		check-reqs_pkg_setup
-
-		llvm_pkg_setup
-
-		if use clang && use lto ; then
-			local version_lld=$(ld.lld --version 2>/dev/null | awk '{ print $2 }')
-			[[ -n ${version_lld} ]] && version_lld=$(ver_cut 1 "${version_lld}")
-			[[ -z ${version_lld} ]] && die "Failed to read ld.lld version!"
-
-			# temp fix for https://bugs.gentoo.org/768543
-			# we can assume that rust 1.{49,50}.0 always uses llvm 11
-			local version_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'release:' | awk '{ print $2 }')
-			[[ -n ${version_rust} ]] && version_rust=$(ver_cut 1-2 "${version_rust}")
-			[[ -z ${version_rust} ]] && die "Failed to read version from rustc!"
-
-			if ver_test "${version_rust}" -ge "1.49" && ver_test "${version_rust}" -le "1.50" ; then
-				local version_llvm_rust="11"
-			else
-				local version_llvm_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'LLVM version:' | awk '{ print $3 }')
-				[[ -n ${version_llvm_rust} ]] && version_llvm_rust=$(ver_cut 1 "${version_llvm_rust}")
-				[[ -z ${version_llvm_rust} ]] && die "Failed to read used LLVM version from rustc!"
-			fi
-
-			if ver_test "${version_lld}" -ne "${version_llvm_rust}" ; then
-				eerror "Rust is using LLVM version ${version_llvm_rust} but ld.lld version belongs to LLVM version ${version_lld}."
-				eerror "You will be unable to link ${CATEGORY}/${PN}. To proceed you have the following options:"
-				eerror "  - Manually switch rust version using 'eselect rust' to match used LLVM version"
-				eerror "  - Switch to dev-lang/rust[system-llvm] which will guarantee matching version"
-				eerror "  - Build ${CATEGORY}/${PN} without USE=lto"
-				die "LLVM version used by Rust (${version_llvm_rust}) does not match with ld.lld version (${version_lld})!"
-			fi
-		fi
-
-		python-any-r1_pkg_setup
-
-		# Avoid PGO profiling problems due to enviroment leakage
-		# These should *always* be cleaned up anyway
-		unset \
-			DBUS_SESSION_BUS_ADDRESS \
-			DISPLAY \
-			ORBIT_SOCKETDIR \
-			SESSION_MANAGER \
-			XAUTHORITY \
-			XDG_CACHE_HOME \
-			XDG_SESSION_COOKIE
-
-		# Build system is using /proc/self/oom_score_adj, bug #604394
-		addpredict /proc/self/oom_score_adj
-
-		if ! mountpoint -q /dev/shm ; then
-			# If /dev/shm is not available, configure is known to fail with
-			# a traceback report referencing /usr/lib/pythonN.N/multiprocessing/synchronize.py
-			ewarn "/dev/shm is not mounted -- expect build failures!"
-		fi
-
-		# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
-		# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
-		# get your own set of keys.
-		if [[ -z "${MOZ_API_KEY_GOOGLE+set}" ]] ; then
-			MOZ_API_KEY_GOOGLE="AIzaSyDEAOvatFogGaPi0eTgsV_ZlEzx0ObmepsMzfAc"
-		fi
-
-		if [[ -z "${MOZ_API_KEY_LOCATION+set}" ]] ; then
-			MOZ_API_KEY_LOCATION="AIzaSyB2h2OuRgGaPicUgy5N-5hsZqiPW6sH3n_rptiQ"
-		fi
-
-		# Mozilla API keys (see https://location.services.mozilla.com/api)
-		# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
-		# get your own set of keys.
-		if [[ -z "${MOZ_API_KEY_MOZILLA+set}" ]] ; then
-			MOZ_API_KEY_MOZILLA="edb3d487-3a84-46m0ap1e3-9dfd-92b5efaaa005"
-		fi
-
-		# Ensure we use C locale when building, bug #746215
-		export LC_ALL=C
-	fi
-}
-
-src_unpack() {
-	local _lp_dir="${WORKDIR}/language_packs"
-	local _src_file
-
-	if [[ ! -d "${_lp_dir}" ]] ; then
-		mkdir "${_lp_dir}" || die
-	fi
-
-	for _src_file in ${A} ; do
-		if [[ ${_src_file} == *.xpi ]]; then
-			cp "${DISTDIR}/${_src_file}" "${_lp_dir}" || die "Failed to copy '${_src_file}' to '${_lp_dir}'!"
-		else
-			unpack ${_src_file}
-		fi
-	done
-}
-
-src_prepare() {
-	use lto && rm -v "${WORKDIR}"/firefox-patches/*-LTO-Only-enable-LTO-*.patch
-	eapply "${WORKDIR}/firefox-patches"
-
-	# Allow user to apply any additional patches without modifing ebuild
-	eapply_user
-
-	# Make LTO respect MAKEOPTS
-	sed -i \
-		-e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
-		"${S}"/build/moz.configure/lto-pgo.configure \
-		|| die "sed failed to set num_cores"
-
-	# Make ICU respect MAKEOPTS
-	sed -i \
-		-e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
-		"${S}"/intl/icu_sources_data.py \
-		|| die "sed failed to set num_cores"
-
-	# sed-in toolchain prefix
-	sed -i \
-		-e "s/objdump/${CHOST}-objdump/" \
-		"${S}"/python/mozbuild/mozbuild/configure/check_debug_ranges.py \
-		|| die "sed failed to set toolchain prefix"
-
-	sed -i \
-		-e 's/ccache_stats = None/return None/' \
-		"${S}"/python/mozbuild/mozbuild/controller/building.py \
-		|| die "sed failed to disable ccache stats call"
-
-	einfo "Removing pre-built binaries ..."
-	find "${S}"/third_party -type f \( -name '*.so' -o -name '*.o' \) -print -delete || die
-
-	# Clearing checksums where we have applied patches
-	moz_clear_vendor_checksums target-lexicon-0.9.0
-
-	# Create build dir
-	BUILD_DIR="${WORKDIR}/${PN}_build"
-	mkdir -p "${BUILD_DIR}" || die
-
-	# Write API keys to disk
-	echo -n "${MOZ_API_KEY_GOOGLE//gGaPi/}" > "${S}"/api-google.key || die
-	echo -n "${MOZ_API_KEY_LOCATION//gGaPi/}" > "${S}"/api-location.key || die
-	echo -n "${MOZ_API_KEY_MOZILLA//m0ap1/}" > "${S}"/api-mozilla.key || die
-
-	xdg_src_prepare
-}
-
-src_configure() {
-	# Show flags set at the beginning
-	einfo "Current BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}"
-	einfo "Current CFLAGS:\t\t${CFLAGS:-no value set}"
-	einfo "Current CXXFLAGS:\t\t${CXXFLAGS:-no value set}"
-	einfo "Current LDFLAGS:\t\t${LDFLAGS:-no value set}"
-	einfo "Current RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}"
-
-	local have_switched_compiler=
-	if use clang && ! tc-is-clang ; then
-		# Force clang
-		einfo "Enforcing the use of clang due to USE=clang ..."
-		have_switched_compiler=yes
-		AR=llvm-ar
-		CC=${CHOST}-clang
-		CXX=${CHOST}-clang++
-		NM=llvm-nm
-		RANLIB=llvm-ranlib
-	elif ! use clang && ! tc-is-gcc ; then
-		# Force gcc
-		have_switched_compiler=yes
-		einfo "Enforcing the use of gcc due to USE=-clang ..."
-		AR=gcc-ar
-		CC=${CHOST}-gcc
-		CXX=${CHOST}-g++
-		NM=gcc-nm
-		RANLIB=gcc-ranlib
-	fi
-
-	if [[ -n "${have_switched_compiler}" ]] ; then
-		# Because we switched active compiler we have to ensure
-		# that no unsupported flags are set
-		strip-unsupported-flags
-	fi
-
-	# Ensure we use correct toolchain
-	export HOST_CC="$(tc-getBUILD_CC)"
-	export HOST_CXX="$(tc-getBUILD_CXX)"
-	tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
-
-	# Pass the correct toolchain paths through cbindgen
-	if tc-is-cross-compiler ; then
-		export BINDGEN_CFLAGS="${SYSROOT:+--sysroot=${ESYSROOT}} --target=${CHOST} ${BINDGEN_CFLAGS-}"
-	fi
-
-	# Set MOZILLA_FIVE_HOME
-	export MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
-
-	# python/mach/mach/mixin/process.py fails to detect SHELL
-	export SHELL="${EPREFIX}/bin/bash"
-
-	# Set MOZCONFIG
-	export MOZCONFIG="${S}/.mozconfig"
-
-	# Initialize MOZCONFIG
-	mozconfig_add_options_ac '' --enable-application=comm/mail
-	mozconfig_add_options_ac '' --enable-calendar
-
-	# Set Gentoo defaults
-	export MOZILLA_OFFICIAL=1
-
-	mozconfig_add_options_ac 'Gentoo default' \
-		--allow-addon-sideload \
-		--disable-cargo-incremental \
-		--disable-crashreporter \
-		--disable-install-strip \
-		--disable-strip \
-		--disable-updater \
-		--enable-official-branding \
-		--enable-release \
-		--enable-system-ffi \
-		--enable-system-pixman \
-		--host="${CBUILD:-${CHOST}}" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--prefix="${EPREFIX}/usr" \
-		--target="${CHOST}" \
-		--without-ccache \
-		--with-intl-api \
-		--with-libclang-path="$(llvm-config --libdir)" \
-		--with-system-nspr \
-		--with-system-nss \
-		--with-system-png \
-		--with-system-zlib \
-		--with-toolchain-prefix="${CHOST}-" \
-		--with-unsigned-addon-scopes=app,system \
-		--x-includes="${SYSROOT}${EPREFIX}/usr/include" \
-		--x-libraries="${SYSROOT}${EPREFIX}/usr/$(get_libdir)"
-
-	# Set update channel
-	local update_channel=release
-	[[ -n ${MOZ_ESR} ]] && update_channel=esr
-	mozconfig_add_options_ac '' --update-channel=${update_channel}
-
-	if ! use x86 && [[ ${CHOST} != armv*h* ]] ; then
-		mozconfig_add_options_ac '' --enable-rust-simd
-	fi
-
-	if [[ -s "${S}/api-google.key" ]] ; then
-		local key_origin="Gentoo default"
-		if [[ $(cat "${S}/api-google.key" | md5sum | awk '{ print $1 }') != 709560c02f94b41f9ad2c49207be6c54 ]] ; then
-			key_origin="User value"
-		fi
-
-		mozconfig_add_options_ac "${key_origin}" \
-			--with-google-safebrowsing-api-keyfile="${S}/api-google.key"
-	else
-		einfo "Building without Google API key ..."
-	fi
-
-	if [[ -s "${S}/api-location.key" ]] ; then
-		local key_origin="Gentoo default"
-		if [[ $(cat "${S}/api-location.key" | md5sum | awk '{ print $1 }') != ffb7895e35dedf832eb1c5d420ac7420 ]] ; then
-			key_origin="User value"
-		fi
-
-		mozconfig_add_options_ac "${key_origin}" \
-			--with-google-location-service-api-keyfile="${S}/api-location.key"
-	else
-		einfo "Building without Location API key ..."
-	fi
-
-	if [[ -s "${S}/api-mozilla.key" ]] ; then
-		local key_origin="Gentoo default"
-		if [[ $(cat "${S}/api-mozilla.key" | md5sum | awk '{ print $1 }') != 3927726e9442a8e8fa0e46ccc39caa27 ]] ; then
-			key_origin="User value"
-		fi
-
-		mozconfig_add_options_ac "${key_origin}" \
-			--with-mozilla-api-keyfile="${S}/api-mozilla.key"
-	else
-		einfo "Building without Mozilla API key ..."
-	fi
-
-	mozconfig_use_with system-av1
-	mozconfig_use_with system-harfbuzz
-	mozconfig_use_with system-harfbuzz system-graphite2
-	mozconfig_use_with system-icu
-	mozconfig_use_with system-jpeg
-	mozconfig_use_with system-libevent system-libevent "${SYSROOT}${EPREFIX}/usr"
-	mozconfig_use_with system-libvpx
-	mozconfig_use_with system-webp
-
-	mozconfig_use_enable dbus
-
-	use eme-free && mozconfig_add_options_ac '+eme-free' --disable-eme
-
-	if use hardened ; then
-		mozconfig_add_options_ac "+hardened" --enable-hardening
-		append-ldflags "-Wl,-z,relro -Wl,-z,now"
-	fi
-
-	mozconfig_use_enable jack
-
-	mozconfig_use_enable pulseaudio
-	# force the deprecated alsa sound code if pulseaudio is disabled
-	if use kernel_linux && ! use pulseaudio ; then
-		mozconfig_add_options_ac '-pulseaudio' --enable-alsa
-	fi
-
-	mozconfig_use_enable wifi necko-wifi
-
-	if use wayland ; then
-		mozconfig_add_options_ac '+wayland' --enable-default-toolkit=cairo-gtk3-wayland
-	else
-		mozconfig_add_options_ac '' --enable-default-toolkit=cairo-gtk3
-	fi
-
-	if use lto ; then
-		if use clang ; then
-			# Upstream only supports lld when using clang
-			mozconfig_add_options_ac "forcing ld=lld due to USE=clang and USE=lto" --enable-linker=lld
-
-			mozconfig_add_options_ac '+lto' --enable-lto=cross
-		else
-			# Linking only works when using ld.gold when LTO is enabled
-			mozconfig_add_options_ac "forcing ld=gold due to USE=lto" --enable-linker=gold
-
-			# ThinLTO is currently broken, see bmo#1644409
-			mozconfig_add_options_ac '+lto' --enable-lto=full
-		fi
-
-		if use pgo ; then
-			mozconfig_add_options_ac '+pgo' MOZ_PGO=1
-
-			if use clang ; then
-				# Used in build/pgo/profileserver.py
-				export LLVM_PROFDATA="llvm-profdata"
-			fi
-		fi
-	else
-		# Avoid auto-magic on linker
-		if use clang ; then
-			# This is upstream's default
-			mozconfig_add_options_ac "forcing ld=lld due to USE=clang" --enable-linker=lld
-		elif tc-ld-is-gold ; then
-			mozconfig_add_options_ac "linker is set to gold" --enable-linker=gold
-		else
-			mozconfig_add_options_ac "linker is set to bfd" --enable-linker=bfd
-		fi
-	fi
-
-	# LTO flag was handled via configure
-	filter-flags '-flto*'
-
-	mozconfig_use_enable debug
-	if use debug ; then
-		mozconfig_add_options_ac '+debug' --disable-optimize
-	else
-		if is-flag '-g*' ; then
-			if use clang ; then
-				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols=$(get-flag '-g*')
-			else
-				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols
-			fi
-		else
-			mozconfig_add_options_ac 'Gentoo default' --disable-debug-symbols
-		fi
-
-		if is-flag '-O0' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O0
-		elif is-flag '-O4' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O4
-		elif is-flag '-O3' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O3
-		elif is-flag '-O1' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O1
-		elif is-flag '-Os' ; then
-			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-Os
-		else
-			mozconfig_add_options_ac "Gentoo default" --enable-optimize=-O2
-		fi
-	fi
-
-	# Debug flag was handled via configure
-	filter-flags '-g*'
-
-	# Optimization flag was handled via configure
-	filter-flags '-O*'
-
-	# Modifications to better support ARM, bug #553364
-	if use cpu_flags_arm_neon ; then
-		mozconfig_add_options_ac '+cpu_flags_arm_neon' --with-fpu=neon
-
-		if ! tc-is-clang ; then
-			# thumb options aren't supported when using clang, bug 666966
-			mozconfig_add_options_ac '+cpu_flags_arm_neon' \
-				--with-thumb=yes \
-				--with-thumb-interwork=no
-		fi
-	fi
-
-	if [[ ${CHOST} == armv*h* ]] ; then
-		mozconfig_add_options_ac 'CHOST=armv*h*' --with-float-abi=hard
-
-		if ! use system-libvpx ; then
-			sed -i \
-				-e "s|softfp|hard|" \
-				"${S}"/media/libvpx/moz.build \
-				|| die
-		fi
-	fi
-
-	if use clang ; then
-		# https://bugzilla.mozilla.org/show_bug.cgi?id=1482204
-		# https://bugzilla.mozilla.org/show_bug.cgi?id=1483822
-		# toolkit/moz.configure Elfhack section: target.cpu in ('arm', 'x86', 'x86_64')
-		local disable_elf_hack=
-		if use amd64 ; then
-			disable_elf_hack=yes
-		elif use x86 ; then
-			disable_elf_hack=yes
-		elif use arm ; then
-			disable_elf_hack=yes
-		fi
-
-		if [[ -n ${disable_elf_hack} ]] ; then
-			mozconfig_add_options_ac 'elf-hack is broken when using Clang' --disable-elf-hack
-		fi
-	elif tc-is-gcc ; then
-		if ver_test $(gcc-fullversion) -ge 10 ; then
-			einfo "Forcing -fno-tree-loop-vectorize to workaround GCC bug, see bug 758446 ..."
-			append-cxxflags -fno-tree-loop-vectorize
-		fi
-	fi
-
-	# Additional ARCH support
-	case "${ARCH}" in
-		arm)
-			# Reduce the memory requirements for linking
-			if use clang ; then
-				# Nothing to do
-				:;
-			elif tc-ld-is-gold || use lto ; then
-				append-ldflags -Wl,--no-keep-memory
-			else
-				append-ldflags -Wl,--no-keep-memory -Wl,--reduce-memory-overheads
-			fi
-			;;
-	esac
-
-	if ! use elibc_glibc ; then
-		mozconfig_add_options_ac '!elibc_glibc' --disable-jemalloc
-	fi
-
-	# Allow elfhack to work in combination with unstripped binaries
-	# when they would normally be larger than 2GiB.
-	append-ldflags "-Wl,--compress-debug-sections=zlib"
-
-	# Make revdep-rebuild.sh happy; Also required for musl
-	append-ldflags -Wl,-rpath="${MOZILLA_FIVE_HOME}",--enable-new-dtags
-
-	# Pass $MAKEOPTS to build system
-	export MOZ_MAKE_FLAGS="${MAKEOPTS}"
-
-	# Use system's Python environment
-	export MACH_USE_SYSTEM_PYTHON=1
-
-	# Disable notification when build system has finished
-	export MOZ_NOSPAM=1
-
-	# Build system requires xargs but is unable to find it
-	mozconfig_add_options_mk 'Gentoo default' "XARGS=${EPREFIX}/usr/bin/xargs"
-
-	# Set build dir
-	mozconfig_add_options_mk 'Gentoo default' "MOZ_OBJDIR=${BUILD_DIR}"
-
-	# Show flags we will use
-	einfo "Build BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}"
-	einfo "Build CFLAGS:\t\t${CFLAGS:-no value set}"
-	einfo "Build CXXFLAGS:\t\t${CXXFLAGS:-no value set}"
-	einfo "Build LDFLAGS:\t\t${LDFLAGS:-no value set}"
-	einfo "Build RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}"
-
-	# Handle EXTRA_CONF and show summary
-	local ac opt hash reason
-
-	# Apply EXTRA_ECONF entries to $MOZCONFIG
-	if [[ -n ${EXTRA_ECONF} ]] ; then
-		IFS=\! read -a ac <<<${EXTRA_ECONF// --/\!}
-		for opt in "${ac[@]}"; do
-			mozconfig_add_options_ac "EXTRA_ECONF" --${opt#--}
-		done
-	fi
-
-	echo
-	echo "=========================================================="
-	echo "Building ${PF} with the following configuration"
-	grep ^ac_add_options "${MOZCONFIG}" | while read ac opt hash reason; do
-		[[ -z ${hash} || ${hash} == \# ]] \
-			|| die "error reading mozconfig: ${ac} ${opt} ${hash} ${reason}"
-		printf "    %-30s  %s\n" "${opt}" "${reason:-mozilla.org default}"
-	done
-	echo "=========================================================="
-	echo
-
-	./mach configure || die
-}
-
-src_compile() {
-	local virtx_cmd=
-
-	if use pgo ; then
-		virtx_cmd=virtx
-
-		# Reset and cleanup environment variables used by GNOME/XDG
-		gnome2_environment_reset
-
-		addpredict /root
-	fi
-
-	local -x GDK_BACKEND=x11
-
-	${virtx_cmd} ./mach build --verbose \
-		|| die
-}
-
-src_install() {
-	# xpcshell is getting called during install
-	pax-mark m \
-		"${BUILD_DIR}"/dist/bin/xpcshell \
-		"${BUILD_DIR}"/dist/bin/${PN} \
-		"${BUILD_DIR}"/dist/bin/plugin-container
-
-	DESTDIR="${D}" ./mach install || die
-
-	# Upstream cannot ship symlink but we can (bmo#658850)
-	rm "${ED}${MOZILLA_FIVE_HOME}/${PN}-bin" || die
-	dosym ${PN} ${MOZILLA_FIVE_HOME}/${PN}-bin
-
-	# Don't install llvm-symbolizer from sys-devel/llvm package
-	if [[ -f "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" ]] ; then
-		rm -v "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" || die
-	fi
-
-	# Install policy (currently only used to disable application updates)
-	insinto "${MOZILLA_FIVE_HOME}/distribution"
-	newins "${FILESDIR}"/distribution.ini distribution.ini
-	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
-
-	# Install system-wide preferences
-	local PREFS_DIR="${MOZILLA_FIVE_HOME}/defaults/pref"
-	insinto "${PREFS_DIR}"
-	newins "${FILESDIR}"/gentoo-default-prefs.js gentoo-prefs.js
-
-	local GENTOO_PREFS="${ED}${PREFS_DIR}/gentoo-prefs.js"
-
-	# Set dictionary path to use system hunspell
-	cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set spellchecker.dictionary_path pref"
-	pref("spellchecker.dictionary_path",       "${EPREFIX}/usr/share/myspell");
-	EOF
-
-	# Force hwaccel prefs if USE=hwaccel is enabled
-	if use hwaccel ; then
-		cat "${FILESDIR}"/gentoo-hwaccel-prefs.js \
-		>>"${GENTOO_PREFS}" \
-		|| die "failed to add prefs to force hardware-accelerated rendering to all-gentoo.js"
-	fi
-
-	# Force the graphite pref if USE=system-harfbuzz is enabled, since the pref cannot disable it
-	if use system-harfbuzz ; then
-		cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set gfx.font_rendering.graphite.enabled pref"
-		sticky_pref("gfx.font_rendering.graphite.enabled", true);
-		EOF
-	fi
-
-	# Install language packs
-	local langpacks=( $(find "${WORKDIR}/language_packs" -type f -name '*.xpi') )
-	if [[ -n "${langpacks}" ]] ; then
-		moz_install_xpi "${MOZILLA_FIVE_HOME}/distribution/extensions" "${langpacks[@]}"
-	fi
-
-	# Install icons
-	local icon_srcdir="${S}/comm/mail/branding/thunderbird"
-	local icon_symbolic_file="${icon_srcdir}/TB-symbolic.svg"
-
-	insinto /usr/share/icons/hicolor/symbolic/apps
-	newins "${icon_symbolic_file}" ${PN}-symbolic.svg
-
-	local icon size
-	for icon in "${icon_srcdir}"/default*.png ; do
-		size=${icon%.png}
-		size=${size##*/default}
-
-		if [[ ${size} -eq 48 ]] ; then
-			newicon "${icon}" ${PN}.png
-		fi
-
-		newicon -s ${size} "${icon}" ${PN}.png
-	done
-
-	# Install menus
-	local wrapper_wayland="${PN}-wayland.sh"
-	local wrapper_x11="${PN}-x11.sh"
-	local desktop_file="${FILESDIR}/icon/${PN}-r2.desktop"
-	local display_protocols="auto X11"
-	local icon="${PN}"
-	local name="Mozilla ${MOZ_PN^}"
-	local use_wayland="false"
-
-	if use wayland ; then
-		display_protocols+=" Wayland"
-		use_wayland="true"
-	fi
-
-	local app_name desktop_filename display_protocol exec_command
-	for display_protocol in ${display_protocols} ; do
-		app_name="${name} on ${display_protocol}"
-		desktop_filename="${PN}-${display_protocol,,}.desktop"
-
-		case ${display_protocol} in
-			Wayland)
-				exec_command="${PN}-wayland --name ${PN}-wayland"
-				newbin "${FILESDIR}/${wrapper_wayland}" ${PN}-wayland
-				;;
-			X11)
-				if ! use wayland ; then
-					# Exit loop here because there's no choice so
-					# we don't need wrapper/.desktop file for X11.
-					continue
-				fi
-
-				exec_command="${PN}-x11 --name ${PN}-x11"
-				newbin "${FILESDIR}/${wrapper_x11}" ${PN}-x11
-				;;
-			*)
-				app_name="${name}"
-				desktop_filename="${PN}.desktop"
-				exec_command="${PN}"
-				;;
-		esac
-
-		cp "${desktop_file}" "${WORKDIR}/${PN}.desktop-template" || die
-
-		sed -i \
-			-e "s:@NAME@:${app_name}:" \
-			-e "s:@EXEC@:${exec_command}:" \
-			-e "s:@ICON@:${icon}:" \
-			"${WORKDIR}/${PN}.desktop-template" \
-			|| die
-
-		newmenu "${WORKDIR}/${PN}.desktop-template" "${desktop_filename}"
-
-		rm "${WORKDIR}/${PN}.desktop-template" || die
-	done
-
-	# Install generic wrapper script
-	[[ -f "${ED}/usr/bin/${PN}" ]] && rm "${ED}/usr/bin/${PN}"
-	newbin "${FILESDIR}/${PN}.sh" ${PN}
-
-	# Update wrapper
-	local wrapper
-	for wrapper in \
-		"${ED}/usr/bin/${PN}" \
-		"${ED}/usr/bin/${PN}-x11" \
-		"${ED}/usr/bin/${PN}-wayland" \
-	; do
-		[[ ! -f "${wrapper}" ]] && continue
-
-		sed -i \
-			-e "s:@PREFIX@:${EPREFIX}/usr:" \
-			-e "s:@MOZ_FIVE_HOME@:${MOZILLA_FIVE_HOME}:" \
-			-e "s:@APULSELIB_DIR@:${apulselib}:" \
-			-e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
-			"${wrapper}" \
-			|| die
-	done
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-
-	# If the apulse libs are available in MOZILLA_FIVE_HOME then apulse
-	# does not need to be forced into the LD_LIBRARY_PATH
-	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
-		einfo "APULSE found; Generating library symlinks for sound support ..."
-		local lib
-		pushd "${ED}${MOZILLA_FIVE_HOME}" &>/dev/null || die
-		for lib in ../apulse/libpulse{.so{,.0},-simple.so{,.0}} ; do
-			# A quickpkg rolled by hand will grab symlinks as part of the package,
-			# so we need to avoid creating them if they already exist.
-			if [[ ! -L ${lib##*/} ]] ; then
-				ln -s "${lib}" ${lib##*/} || die
-			fi
-		done
-		popd &>/dev/null || die
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
-		elog "Apulse was detected at merge time on this system and so it will always be"
-		elog "used for sound.  If you wish to use pulseaudio instead please unmerge"
-		elog "media-sound/apulse."
-		elog
-	fi
-
-	local show_doh_information
-
-	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
-		# New install; Tell user that DoH is disabled by default
-		show_doh_information=yes
-	fi
-
-	if [[ -n "${show_doh_information}" ]] ; then
-		elog
-		elog "Note regarding Trusted Recursive Resolver aka DNS-over-HTTPS (DoH):"
-		elog "Due to privacy concerns (encrypting DNS might be a good thing, sending all"
-		elog "DNS traffic to Cloudflare by default is not a good idea and applications"
-		elog "should respect OS configured settings), \"network.trr.mode\" was set to 5"
-		elog "(\"Off by choice\") by default."
-		elog "You can enable DNS-over-HTTPS in ${PN^}'s preferences."
-	fi
-}
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 9888c84b64ab..19544480b3ea 100644
Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ
diff --git a/media-gfx/chafa/Manifest b/media-gfx/chafa/Manifest
index a08a004c0eb8..1974d3ce5b7a 100644
--- a/media-gfx/chafa/Manifest
+++ b/media-gfx/chafa/Manifest
@@ -1,5 +1,5 @@
 DIST chafa-1.4.1.tar.xz 389428 BLAKE2B 8ed6c6d57953d784763f10c274bd8b7acf7857b095bae58c476d2e17418a7112f1ec000d667eebfc2eda712c9588e686ad4021da017f4d187a5461c0435c5476 SHA512 f0bd1911fd544f93afadbb2105f151dc77e31a2f3af4c7f8441a06f547a7ebe0674664721b18c3a35a7c4e745dda666713adc1dfbe5e97dfdc54856a13bd5063
 DIST chafa-1.6.0.tar.xz 417888 BLAKE2B f9837a9062396f92974088ea2e59e050089b462442ac01af17dc7f47f4c3a24542facd4c977cac2ee9db3c4af9bae2349cea9186f9d0362cf7bb74f4e83d345b SHA512 47843b8bf1b0555ae3570f688229e9f848e2e30c80aa277278230196f6fdb583b7f9170d1740171f2f4c5d5d915e00df407722067bcf6f2dc888804b7bd074da
 EBUILD chafa-1.4.1.ebuild 866 BLAKE2B 24e4c50c2a29e9f3d5451f7b4ec9f4cc176dec6a2b5d4636e8de26e72f514b358957f78946ba0cd9cd9bde26d3c73c6677cac957d8db82733c45ba51e34c7165 SHA512 179ac5f28de859623651bfc30539d2242c2aeb949fd6398dd809a65ca7d4df80430dc1af7d2004f1a8852231d4666da29ed2ea3b404a9e43eb87a3055fd359a3
-EBUILD chafa-1.6.0.ebuild 767 BLAKE2B eb2c4aa4a41b02c12696ef877208c45c338e3b4c9076cb0dade84e0a04cab6c1f1bbabd67d825e546b911ffc657ccd1794144012abb3ab74871a7276804e8c2f SHA512 57b78dbd02a6b49a757cff05e869f8526b07412a837e6056a86b35cb99ec2084ca5711126d9b970ee83c5c04e99403de5c21bcf1eeb17a915318dd87397a95e6
+EBUILD chafa-1.6.0.ebuild 764 BLAKE2B ce21bd3bc7e46e99b53e6f9ae564cc1171a1a270dee7069e86fb680ccecedfbeba030611f485b68e7c1761d7eb9d90bad7fd9d753bd37e31279be2c9d2952aa7 SHA512 ce16aca3d3019961a6cbee7b2f78661dfdfc58218839ac5992a66bc9b2649c62d7d0bb5d5c3a0d3507d050f77c8a56203cef16403ee6140023614e91a21b5123
 MISC metadata.xml 546 BLAKE2B 9a2ccaaa61addeef86ae9c684d1030c1396c36a87b45df6e0af8b5e70ed4c25cfe808cf854758882e0fc5e265624f4e86b0ddeb1a7e495f8a2fb353b054e9978 SHA512 8ca7185a73da0bcaf78cfbc33bdb7546832877829e5ec6ac227c76b037623915e862e661ea14bfe5cae31deefd3af70698c8a4d8b34c7764652d0b7f4dec4541
diff --git a/media-gfx/chafa/chafa-1.6.0.ebuild b/media-gfx/chafa/chafa-1.6.0.ebuild
index 2c7e6798a528..9f4b4afc62fb 100644
--- a/media-gfx/chafa/chafa-1.6.0.ebuild
+++ b/media-gfx/chafa/chafa-1.6.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://hpjansson.org/chafa/releases/${P}.tar.xz"
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="+tools"
 
 RDEPEND="
diff --git a/media-gfx/frogr/Manifest b/media-gfx/frogr/Manifest
index 125f349b1ccd..a35719e37637 100644
--- a/media-gfx/frogr/Manifest
+++ b/media-gfx/frogr/Manifest
@@ -1,5 +1,5 @@
 DIST frogr-1.3.tar.xz 2552456 BLAKE2B 562f88898fec153c50696dce59b5396b6f9e88bc68cbf264e7954c2d2f402cb44cb2e6bf3c1c786d50285532c66167678f0fde053c317a0d23b6f4b210e69fa1 SHA512 82ca3ff1e97e7ff45bce1915f629809cc9efa6d33735b0e41b17bb8f69a31a2b035dd53045a3e56e7769d379b534a2468e37a684505438cfea70cc141103d1cb
 DIST frogr-1.5.tar.xz 2233600 BLAKE2B aeb04db0d5d57f470d377986f2e857ee63b47df85e9c3251cdfac8585efa19491650ecede0bfa95c157c2584298dc02173afec624bc439dcd8b52d101c465d54 SHA512 f4af5ec82ad1771e71387c40467fc697c7e3edff9f76ecd0f762e446d136a293477867cb7b6bc6d10bc0fdd95210b25f515eb56bf2d456f79009884019c44dd4
 EBUILD frogr-1.3.ebuild 626 BLAKE2B 9e17e2f7206f357020256d796ffc92b2f3bb63d3b5f8b52209289628d8ee76cf6ac18e84d5982ddd4828437275f2cefd039025d9104ce0d0f3ab958b9bf2cb96 SHA512 8b2eaa44c95a0266e1568becdc8fccca0dec6de3e31d9cd71a228fa068a361ea223efdc39b318459abb68c285efb9ef688cf5b44eed79f1d79e4db76b6d7427d
-EBUILD frogr-1.5.ebuild 891 BLAKE2B 444fd6ab77b7bd9015785d6c4eeefcfef3990d83b314f11119e91621e84646d633664bc2527150052252b40b39edfddf1213f051c3ff90d3942cbc689881aff4 SHA512 22e34ccd09564056a188cf2486b1c47edad79e231f27f909b2b38184a0067df1f9762eec4b35d65e15096d37bb67b6eaaa3fe48640f6b783a8cf9aec2a83948f
+EBUILD frogr-1.5.ebuild 926 BLAKE2B d2922cb892bbb39075cd5bd0639ee5fd9884e7147376fe51854f2fa3db7a2d7908e813c5e2988afc017f1fe1c0c52bb13de6259e707cc1b99550956ec24b171b SHA512 e48d0ce41802dc1f3b44e5b3ad829097fdbecc407ac1e5e2d22b12b23c700cd09f5e6095a587c81eec2c29100f87664a479c8bb6472ac8fb22f4e0acf3c0bb70
 MISC metadata.xml 386 BLAKE2B 5b6c13b6c0a981e0e1fd0c7092204999a4849c2339bb35de15b69bd04e736f8f5d1ea905f429f036852e34a7c729e744518f0171ef29c6cf016fc047332b2838 SHA512 660c88d236b1c2ba2ea1e20d0d2ea9a3acc5a9f8d0306b3ed98bfec2d616e67b9e8aceb137438e6b0a6517588252a676c715f6177b9e369d09019064254c8f53
diff --git a/media-gfx/frogr/frogr-1.5.ebuild b/media-gfx/frogr/frogr-1.5.ebuild
index 2cb753483f16..c10fdc5a79c7 100644
--- a/media-gfx/frogr/frogr-1.5.ebuild
+++ b/media-gfx/frogr/frogr-1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -30,7 +30,10 @@ DEPEND="${RDEPEND}
 # TODO add a useflag for enable-video or header-bar???
 
 src_configure() {
-	local emesonargs=()
+	local emesonargs=(
+		# bug #714132
+		-Dwerror=false
+	)
 	meson_src_configure
 }
 
diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index ed8f0782671b..42405e53e159 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -1,6 +1,8 @@
 AUX gmic-2.9.2_ipa-sra.patch 665 BLAKE2B b61fa87ac2da5fd5956c89cb4a6c128f266a175dca70cd34ff4bed0483c934241a375131eaddd6ebd5f3afb52e694d4fc6839d20718bc06463c0e263f15b6d5a SHA512 6f04cac4de5914cedd269655fe58ca406199c042bdbab6e706cfea49516d0a7e1234e61c51b6a142341a7984dd96e97c4b8f13c2efbe427627be26539af8653e
 DIST gmic_2.9.4.tar.gz 7279628 BLAKE2B ca5fc69a2990a86a340c4305dc406d4e9032ba04afa59819dc2c788b4c181d23bd03d3050380802fe1effa2b6389df60734f8b3523fac7b0ff6bc35b64a368a6 SHA512 76bb4798e91a68e76a985d7fbc488f8677facaa1efc4ab3a0b9c7d966aa3f5763d1ae1de80f572636d58f1831d9bdae1651ea0b6a76d49a18bf5ad6e12756d73
 DIST gmic_2.9.5.tar.gz 7304367 BLAKE2B 5227aced76cc5ff0a0144f940c71daeeb947e282b6f8c28894ecfda6b863803d0c2227bac869362ba0710fa33fcf81a4c77ea582cbea77ab8a670f65eef9826c SHA512 95d0642cad057eeaa8f7bdd4259719adf6f36189e7851e9e09399bb61f3a52722f0f83f0d2d5991c4e44a692fd3afc735fdb93e6fe45ae092d1e51a139560809
+DIST gmic_2.9.6.tar.gz 7304588 BLAKE2B 50afbc4d84e180a02bb920b0302dff800284c4f7bc2f11ecfcf74f4a505a3173317b670656c03c5e29149886deb238b0be17f192c019f29d43652072790e56fb SHA512 231bae405ad66e28488468d9cc0ff2d4ca7dad289b75c51d2e2984086c5b2cbe646432992be1185e533e3a8c13aa51e0a330253dbf21ec530f93d3ae83bdaaf2
 EBUILD gmic-2.9.4.ebuild 4845 BLAKE2B 998961857815fc1d5c993c96dd2ad74bdcde8353cd561bd5306e7808e2d07db73da4dbe1b020d23b85784a0cc4b0dd57e7e05ae9e530328355a32b699a90d2a7 SHA512 2cbb56d2a4433d63983b494cb5c7047054e2d320fca46b6db32c21c8abc4f389287e67f0ed522ca58a2c2e8c78013adf9df4914fb7a85335f4415284cd307d12
 EBUILD gmic-2.9.5.ebuild 4259 BLAKE2B 7596e851d7ad3b53e29c21a8e65c7f893d30bea57889237b844befe1124c8cdf9d5bf5d8fe8c71f90adbcb44d3809473214e0117877f53b2b2b85218b9756b0a SHA512 a124e2cbc12aa50bdb444114afc9b22ed85cb269c315370f75a5aeeeabb29cb11bbf17bbb8e2104fbca4c67f7b7a9e68324b455fe627c42d9cd6ede70c79b142
+EBUILD gmic-2.9.6.ebuild 4262 BLAKE2B ea9fdfb207a5a28d1d04136a916d806bab9906e0d4495dd37b29ecae0296a57d5c9f2fdfd6485ac7bfda9b7d5f104b976c4fb9232910839256c3727a115532ad SHA512 2402560d48ea661dabcb9b727d3dcb6669f71fe7270bf3986db57aa5a8f51366133d3950d748e0e631dec77c346ca9057bdd8540aef93c4d5d9bf8a20fd33bbd
 MISC metadata.xml 605 BLAKE2B f1ed3b46614a3e3273e4bdedfd7b45629eca482a0805ff1bda2161e4d785a478b91f8ccdbab399b184ec93d020211e35e4503fbf4205b1e2e1f04c7e547303bd SHA512 8303e0a301edb88bdb7522baf47e29b39e895ccaa729231d64b6a39af73f0eb1626c39439f1ed70d496d982f3abca4ff9586d20fc5a9d08b0e57a19b60bf088d
diff --git a/media-gfx/gmic/gmic-2.9.6.ebuild b/media-gfx/gmic/gmic-2.9.6.ebuild
new file mode 100644
index 000000000000..20cad100504d
--- /dev/null
+++ b/media-gfx/gmic/gmic-2.9.6.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_BUILD_TYPE=Release
+
+inherit cmake bash-completion-r1 toolchain-funcs
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/dtschump/gmic.git"
+	inherit git-r3
+else
+	SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+DESCRIPTION="GREYC's Magic Image Converter"
+HOMEPAGE="https://gmic.eu/ https://github.com/dtschump/gmic"
+
+LICENSE="CeCILL-2 GPL-3"
+SLOT="0"
+IUSE="cli curl ffmpeg fftw gimp graphicsmagick jpeg krita opencv openexr openmp png qt5 static-libs tiff X zlib"
+REQUIRED_USE="
+	gimp? ( png zlib fftw X )
+	krita? ( png zlib fftw X )
+	qt5? ( png zlib fftw X )
+"
+
+MIN_QT_VER="5.2.0"
+QT_DEPEND="
+	>=dev-qt/qtcore-${MIN_QT_VER}:5=
+	>=dev-qt/qtgui-${MIN_QT_VER}:5=
+	>=dev-qt/qtnetwork-${MIN_QT_VER}:5=
+	>=dev-qt/qtwidgets-${MIN_QT_VER}:5=
+"
+COMMON_DEPEND="
+	curl? ( net-misc/curl )
+	fftw? ( sci-libs/fftw:3.0=[threads] )
+	gimp? (
+		media-gfx/gimp:0/2
+		${QT_DEPEND}
+	)
+	graphicsmagick? ( media-gfx/graphicsmagick:0= )
+	jpeg? ( virtual/jpeg:0 )
+	krita? ( ${QT_DEPEND} )
+	opencv? ( >=media-libs/opencv-2.3.1a-r1:0= )
+	openexr? (
+		media-libs/ilmbase:0=
+		media-libs/openexr:0=
+	)
+	png? ( media-libs/libpng:0= )
+	qt5? ( ${QT_DEPEND} )
+	tiff? ( media-libs/tiff:0 )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXext
+	)
+	zlib? ( sys-libs/zlib:0= )"
+RDEPEND="${COMMON_DEPEND}
+	ffmpeg? ( media-video/ffmpeg:0= )
+"
+DEPEND="${COMMON_DEPEND}
+	gimp? ( dev-qt/linguist-tools )
+	krita? ( dev-qt/linguist-tools )
+	qt5? ( dev-qt/linguist-tools )
+"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.9.2_ipa-sra.patch
+)
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		if use openmp; then
+			tc-has-openmp || die "Please switch to an openmp compatible compiler"
+		fi
+	fi
+}
+
+src_prepare() {
+	cmake_src_prepare
+	sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt || die
+
+	if use gimp || use krita || use qt5; then
+		# respect user flags
+		sed -e '/CMAKE_CXX_FLAGS_RELEASE/d' \
+			-e '/${CMAKE_EXE_LINKER_FLAGS} -s/d' \
+			-i gmic-qt/CMakeLists.txt || die
+		local S="${S}/gmic-qt"
+		# Bug #753377
+		local PATCHES=()
+		cmake_src_prepare
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_LIB=ON
+		-DBUILD_LIB_STATIC=$(usex static-libs)
+		-DBUILD_CLI=$(usex cli)
+		-DBUILD_MAN=$(usex cli)
+		-DBUILD_BASH_COMPLETION=$(usex cli)
+		-DCUSTOM_CFLAGS=ON
+		-DENABLE_CURL=$(usex curl)
+		-DENABLE_X=$(usex X)
+		-DENABLE_FFMPEG=$(usex ffmpeg)
+		-DENABLE_FFTW=$(usex fftw)
+		-DENABLE_GRAPHICSMAGICK=$(usex graphicsmagick)
+		-DENABLE_JPEG=$(usex jpeg)
+		-DENABLE_OPENCV=$(usex opencv)
+		-DENABLE_OPENEXR=$(usex openexr)
+		-DENABLE_OPENMP=$(usex openmp)
+		-DENABLE_PNG=$(usex png)
+		-DENABLE_TIFF=$(usex tiff)
+		-DENABLE_ZLIB=$(usex zlib)
+		-DENABLE_DYNAMIC_LINKING=ON
+	)
+
+	cmake_src_configure
+
+	# configure gmic-qt frontends
+	local CMAKE_USE_DIR="${S}/gmic-qt"
+	mycmakeargs=(
+		-DENABLE_DYNAMIC_LINKING=ON
+		-DENABLE_CURL=$(usex curl)
+		-DGMIC_LIB_PATH="${BUILD_DIR}"
+		-DGMIC_PATH="${S}/src"
+	)
+
+	if use gimp; then
+		mycmakeargs+=( -DGMIC_QT_HOST=gimp )
+		BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_configure
+	fi
+
+	if use krita; then
+		mycmakeargs+=( -DGMIC_QT_HOST=krita )
+		BUILD_DIR="${BUILD_DIR}"/krita cmake_src_configure
+	fi
+
+	if use qt5; then
+		mycmakeargs+=( -DGMIC_QT_HOST=none )
+		BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_configure
+	fi
+}
+
+src_compile() {
+	cmake_src_compile
+
+	# build gmic-qt frontends
+	local S="${S}/gmic-qt"
+	use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_compile || die "failed building gimp plugin" ; }
+	use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake_src_compile || die "failed building krita plugin" ; }
+	use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_compile || die "failed building qt5 GUI" ; }
+}
+
+src_install() {
+	cmake_src_install
+	dodoc README
+	use cli && newbashcomp "${BUILD_DIR}"/resources/gmic_bashcompletion.sh ${PN}
+
+	local PLUGINDIR="/usr/$(get_libdir)/gimp/2.0/plug-ins"
+	insinto "${PLUGINDIR}"
+	doins resources/gmic_cluts.gmz
+
+	# install gmic-qt frontends
+	if use gimp; then
+		exeinto "${PLUGINDIR}"
+		doexe "${BUILD_DIR}"/gimp/gmic_gimp_qt
+	fi
+	use krita && dobin "${BUILD_DIR}"/krita/gmic_krita_qt
+	use qt5 && dobin "${BUILD_DIR}"/qt5/gmic_qt
+}
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index f9bc7c24f0a3..3a03f9b0a37f 100644
Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ
diff --git a/media-libs/libdca/Manifest b/media-libs/libdca/Manifest
index 97e73f41f16b..170158a5a38d 100644
--- a/media-libs/libdca/Manifest
+++ b/media-libs/libdca/Manifest
@@ -1,5 +1,6 @@
 AUX libdca-0.0.5-cflags.patch 492 BLAKE2B 3090b187518cd899b76fff017bc544ccafaac02d00e78903654ca68a4bd3093cd9216c3911eb35223931a6dc69edf248f4952d17d9549eb4a8a9507ae973e83b SHA512 cadc239c379c271db9a62c7a314607612e9b43a18a605e414b9943b962a65d6b760a2558917a2259a3875a07f61adc12a8c2d8767cfa76ff4894f02a0842e383
 AUX libdca-0.0.5-tests-optional.patch 508 BLAKE2B ed77381970c59dee10e0b32d36183b390574acb0cfec1216f83bc4f2af784bc973d303d051f6348fd4d69dcbbcbc8b1bbb2f3dc7857fdaf05c46c885a463aad5 SHA512 0998e84e4855367b4c43e27e73d87c2b12c849a80864de66805e344eb32ad8463d46602d63b92edf1dd177d4fe77aa119c07952c6c2bc5de6add13468a9082a6
+AUX libdca-0.0.7-slibtool.patch 864 BLAKE2B 67e8bc01ae9b6911215d25eb2bf86567332a11410e4e755d532d19efbb6b88bcfb0d7050aa4e25aaee108ee00f9ff1faf1bfd7c89e131a0b3438e68116dc5dba SHA512 65bc66482da55b2d08812819789e9de56ae019073b57f462fc0ffa86e5dc033daea2f25817f08714093511fa3a5a7d57fb72cd75a9aaa847721fdd0ca1c120f6
 DIST libdca-0.0.7.tar.bz2 158232 BLAKE2B 943ef3845f6b73d3d7a2cc47fd3c59517544c156f46e1be42b7940e11a164d8c533ba0e1436ea7bee95467bb7fdce95bb390e2816ebe7d8e208821eb325cb9de SHA512 dae15d77d066687c882833d5bed8d65a585c1fc0277b7276563c89ddd5a83b35389ec94cca445f38af28a9b01430b72647e9afd1b08f030959e711de1a08924a
-EBUILD libdca-0.0.7.ebuild 1322 BLAKE2B 72d80c5f1a3ebabffddd9d98fe78a1b219b3e4b4770d5d03748f394c930e086a583e5b0e82f5b62b5ef96dbcc23483dbf855deda398bd8ae98c1c0e9c89bd8db SHA512 50e0a63121bfe6b0fdc61be0b6c17e9a120023b6ea1c0892f9c21c4dc581024c7bcfcdd6d52e25d3f729045f0eeb71da2a5d811ab2f84c4364b15af249d689c3
+EBUILD libdca-0.0.7.ebuild 1364 BLAKE2B 56b893da56ac8fae8e7d21302939fdaa226f97bb95766a797482ab6ff41c3e7ff307a72921516ac3ca7c28f72b31fd1dae499352bc44736806971b89eb290d38 SHA512 c790547b7a2eecd94821dad401a26e1fbdb9f2ba2acc3127918e10119f25ca8dcc607c115678b19662c038ed739fd4dab89a16e98e31253543f5c3b8d95cb4f4
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/libdca/files/libdca-0.0.7-slibtool.patch b/media-libs/libdca/files/libdca-0.0.7-slibtool.patch
new file mode 100644
index 000000000000..cd6b89d060e7
--- /dev/null
+++ b/media-libs/libdca/files/libdca-0.0.7-slibtool.patch
@@ -0,0 +1,22 @@
+https://code.videolan.org/videolan/libdca/-/issues/4
+https://bugs.gentoo.org/775602
+
+commit c54898d587fda740b10e32055c5464eeae289889
+Author: orbea <orbea@riseup.net>
+Date:   Tue Mar 16 10:21:52 2021 -0700
+
+    build: Fix -version-info and -export-symbols-regex typos.
+
+diff --git a/libdca/Makefile.am b/libdca/Makefile.am
+index 05bdaca..891fb25 100644
+--- a/libdca/Makefile.am
++++ b/libdca/Makefile.am
+@@ -5,7 +5,7 @@ lib_LTLIBRARIES = libdca.la
+ libdca_la_SOURCES = dca_internal.h tables.h tables_quantization.h \
+ 		    tables_huffman.h tables_fir.h tables_adpcm.h tables_vq.h \
+ 		    bitstream.h bitstream.c parse.c downmix.c
+-libdca_la_LDFLAGS = -no-undefined -version 0:0:0 -export-symbol-regex dca_.*
++libdca_la_LDFLAGS = -no-undefined -version-info 0:0:0 -export-symbols-regex dca_.*
+ libdca_la_LIBADD = $(LIBDCA_LIBS)
+
+ pkgconfigdir = $(libdir)/pkgconfig
diff --git a/media-libs/libdca/libdca-0.0.7.ebuild b/media-libs/libdca/libdca-0.0.7.ebuild
index 177a74cd0a33..a273f17b90e0 100644
--- a/media-libs/libdca/libdca-0.0.7.ebuild
+++ b/media-libs/libdca/libdca-0.0.7.ebuild
@@ -19,6 +19,7 @@ DOCS=( AUTHORS ChangeLog NEWS README TODO doc/${PN}.txt )
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.0.5-cflags.patch
 	"${FILESDIR}"/${PN}-0.0.5-tests-optional.patch
+	"${FILESDIR}"/${PN}-0.0.7-slibtool.patch
 )
 
 src_prepare() {
diff --git a/media-libs/portaudio/Manifest b/media-libs/portaudio/Manifest
index fe6e9c604950..1a34f5cdcf7a 100644
--- a/media-libs/portaudio/Manifest
+++ b/media-libs/portaudio/Manifest
@@ -1,5 +1,6 @@
 AUX portaudio-19.06.00-AR.patch 349 BLAKE2B 0653ad46ccfff8b50c127471395c1f6bdc493c42a0376f6604544c5c242794ac9f4abd7c4b3d617a9d07cbc6e3c3907023f98243bdf67a44b8bb64d9fb0c2a95 SHA512 106acc5c072e9fa39763ce10a905c4a1c5b7f46951109c3cb06c8b2fba0e56791e8fd88f1bb3b0254ad0bd305d5e32bee3a19a44b0d49e633e3f8c86e6a3be35
+AUX portaudio-19.06.00-slibtool.patch 1722 BLAKE2B 938ad05ed0dc708d3617503273cb1fbd4ee1885ce7cd96025f115ec9073c831a9d500c4d43ece1ce0b2c38591faa8823ab24c9b54fb8523ab6d8db7349d26425 SHA512 7e472350e3bfdaad566ce68333bcacbf5d3353743d003916d7b8f0036cfe2bcee2cd619f05d955723f7ef58188ab5096620fafbb074f153e9b88cff1ed30ccd9
 DIST pa_stable_v190600_20161030.tgz 1450572 BLAKE2B 3cd63cca55ff222f452d306a1ab9035739545f48dbc9bc58196052cb51e518d86568059c7528533a6932c39c68d1a5210e06470a16343b92c7e4132b71cc552e SHA512 7ec692cbd8c23878b029fad9d9fd63a021f57e60c4921f602995a2fca070c29f17a280c7f2da5966c4aad29d28434538452f4c822eacf3a60af59a6dc8e9704c
 DIST portaudio-19.06.00-audacity-portmixer.patch 8722 BLAKE2B 2b69bcf26e55be46d354dc44756fd03b16031fa86a334b776eb4326a4c64a7e22abd6bf60794847526102391c8e65813b41338cf94c647e3e9b68d82ea5dc5f5 SHA512 f693aef477b516c7a03eb021260cbecb23200422a927a117e3e59a1b4e6c6c2983fbea8ee3a3714ebc55728933654bd7909327a0bab4450ccf4e6a02c86a63b5
-EBUILD portaudio-19.06.00-r3.ebuild 1643 BLAKE2B 6a0aa9824a5facd8bad84d4ce4255121d128673a8a330b42416c9011a12d2bf53fedc138713f032665f05eb0c1e60cc8c88d2d7464ecc858a2765bc1c280be21 SHA512 5dd1e9534fc80211e082d568ad24a2f6287d0a4f8a37be0ce51de977699b713ca0a9f6edb49c51b585c5945d6910e06e3eab208deb4b4a4a83fb192344667304
-MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
+EBUILD portaudio-19.06.00-r3.ebuild 1686 BLAKE2B 6dce2932001d865f65a4c84eb143666b33f6ffc5205b9e4e5d9a1a3eed980cb849b856600d60f311696751c463494641ce83a766be94738ffbc45720423fcefe SHA512 40d0ffea3bee3e14d09cf05c762a4a9a783817d0128bca890160df9a23012a8eb9770d873bfef6c5eebf00b051fe6719a9bb61068e9328e7e4031a12e1834b72
+MISC metadata.xml 337 BLAKE2B 2cb92258419e17576d907f759334b87c17eadf1402a9fbf73bb781602b7c1e73485a3f3c094d4166ec79d7d8b5b4ab10302da160bef0f66fe00abc1d08d9e363 SHA512 032d3d8605d98fb6b1a3c32647ffd15d2d8600be271628f417100b5e5dc9e751e93b3fe0d9b75699f80db127b1baf5eaa37c534af7637d74ebd8fc06cde19ad9
diff --git a/media-libs/portaudio/files/portaudio-19.06.00-slibtool.patch b/media-libs/portaudio/files/portaudio-19.06.00-slibtool.patch
new file mode 100644
index 000000000000..d7b67cf101f8
--- /dev/null
+++ b/media-libs/portaudio/files/portaudio-19.06.00-slibtool.patch
@@ -0,0 +1,60 @@
+https://bugs.gentoo.org/777072
+https://github.com/PortAudio/portaudio/pull/451
+https://github.com/PortAudio/portaudio/pull/452
+
+From ef36b577c844d28e90ac276c59c0b4d0fbf853c7 Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Wed, 20 Jan 2021 18:23:43 -0800
+Subject: [PATCH] autoconf build: add src dir src/hostapi/skeleton to fix out
+ of tree builds."
+
+---
+ Makefile.in | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Makefile.in b/Makefile.in
+index 5e1a7648..967bba38 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -146,6 +146,7 @@ SRC_DIRS = \
+ 	src/hostapi/dsound \
+ 	src/hostapi/jack \
+ 	src/hostapi/oss \
++	src/hostapi/skeleton \
+ 	src/hostapi/wasapi \
+ 	src/hostapi/wdmks \
+ 	src/hostapi/wmme \
+From c2dd992caa33b0927fb45228f0de0a2d51401f65 Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Wed, 20 Jan 2021 21:46:12 -0800
+Subject: [PATCH] build: Fix builds with parallel make.
+
+---
+ Makefile.in | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 5e1a7648..10f8e8ed 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -220,16 +220,16 @@ clean:
+ distclean: clean
+ 	$(RM) config.log config.status Makefile libtool portaudio-2.0.pc
+ 
+-%.o: %.c $(MAKEFILE) $(PAINC)
++%.o: %.c $(MAKEFILE) $(PAINC) lib-stamp
+ 	$(CC) -c $(CFLAGS) $< -o $@
+ 
+-%.lo: %.c $(MAKEFILE) $(PAINC)
++%.lo: %.c $(MAKEFILE) $(PAINC) lib-stamp
+ 	$(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $< -o $@
+ 
+-%.lo: %.cpp $(MAKEFILE) $(PAINC)
++%.lo: %.cpp $(MAKEFILE) $(PAINC) lib-stamp
+ 	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) -c $(CXXFLAGS) $< -o $@
+ 
+-%.o: %.cpp $(MAKEFILE) $(PAINC)
++%.o: %.cpp $(MAKEFILE) $(PAINC) lib-stamp
+ 	$(CXX) -c $(CXXFLAGS) $< -o $@
+ 
+ %.o: %.asm
diff --git a/media-libs/portaudio/metadata.xml b/media-libs/portaudio/metadata.xml
index c870d0eef0ab..f6d41702b01d 100644
--- a/media-libs/portaudio/metadata.xml
+++ b/media-libs/portaudio/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>sound@gentoo.org</email>
-	<name>Gentoo Sound project</name>
-</maintainer>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">PortAudio/portaudio</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-libs/portaudio/portaudio-19.06.00-r3.ebuild b/media-libs/portaudio/portaudio-19.06.00-r3.ebuild
index d7d2cd1ee3e4..d19d45237994 100644
--- a/media-libs/portaudio/portaudio-19.06.00-r3.ebuild
+++ b/media-libs/portaudio/portaudio-19.06.00-r3.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit autotools multilib-minimal
 
 DESCRIPTION="A free, cross-platform, open-source, audio I/O library"
@@ -29,6 +30,7 @@ DOCS=( README.txt )
 PATCHES=(
 	"${DISTDIR}/${PN}-19.06.00-audacity-portmixer.patch"
 	"${FILESDIR}"/${PN}-19.06.00-AR.patch # bug #720966, trigger reconf
+	"${FILESDIR}"/${PN}-19.06.00-slibtool.patch
 )
 
 src_prepare() {
@@ -66,7 +68,9 @@ src_compile() {
 }
 
 multilib_src_install_all() {
-	einstalldocs
+	default
+
 	use doc && dodoc -r doc/html
+
 	find "${ED}" -name "*.la" -delete || die
 }
diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index 64ddf8e2055b..5b93ec543aee 100644
Binary files a/media-plugins/Manifest.gz and b/media-plugins/Manifest.gz differ
diff --git a/media-plugins/kodi-pvr-vuplus/Manifest b/media-plugins/kodi-pvr-vuplus/Manifest
index 43d3a7bef9c9..bbbe8fb0f84d 100644
--- a/media-plugins/kodi-pvr-vuplus/Manifest
+++ b/media-plugins/kodi-pvr-vuplus/Manifest
@@ -1,6 +1,4 @@
-DIST kodi-pvr-vuplus-7.3.3.tar.gz 273471 BLAKE2B 1b16cce69c15fc5bf1cf188db2fe5f3178025692d37125b8e5ed43a4c92539f0b5fb616f651223a184483cf8883dfc917fd2e18fdb1f16ef2402e2c10ecc9415 SHA512 5b4cb03eca2d904b091d271576b943ce69b79f3f7468e0d415abe90717903623204831fcbe1118e2d105fc3570a32bd972f8c4ec0dccdf9f427069d8081ec501
-DIST kodi-pvr-vuplus-7.4.0.tar.gz 274465 BLAKE2B 8186329d833e1d06d11f9d22367b5cb8b09f30696550d498384b80032799eaa3ec29cb650529c5fe220e67e80e5ed511e7900851eb73569018445b87a4f51f47 SHA512 01a81d004959193a0428e56eecbd0b41912304882e986736f9f11a4a06e85cea5d615c0efeea9236f1d4acb8a3faf588d5b9d7ebb4b15f76cf02d1d86de326ce
-EBUILD kodi-pvr-vuplus-7.3.3.ebuild 764 BLAKE2B 34294324ae2b481783ce3dced714f8f60c6dea8d0fb8a9e9e971e86fc5c6fbc30ee24494bc5e8fddeb4459790a4a5b7f0db1b96788a686bd64f11056c499b7b3 SHA512 6f92acf11b269e64f0ed4931d75fcff76ffd4371bc26e44ca77cd009c40a9f9be41f8fc05a885199977ae29c114d586b807e5e2cf2b4e75a753e6bafa0043596
-EBUILD kodi-pvr-vuplus-7.4.0.ebuild 764 BLAKE2B 34294324ae2b481783ce3dced714f8f60c6dea8d0fb8a9e9e971e86fc5c6fbc30ee24494bc5e8fddeb4459790a4a5b7f0db1b96788a686bd64f11056c499b7b3 SHA512 6f92acf11b269e64f0ed4931d75fcff76ffd4371bc26e44ca77cd009c40a9f9be41f8fc05a885199977ae29c114d586b807e5e2cf2b4e75a753e6bafa0043596
+DIST kodi-pvr-vuplus-7.4.1.tar.gz 284978 BLAKE2B 3c42273ae1b62e0d97e589e1153fce20110c526ca133c993013e56afccce420ad3ed792caca8694db3ef707e1666e24061ac5ce7b2e92b39f4dd5ba8e8d1b934 SHA512 771283160020f9cb4f51e73a5ed86dbe3322158ea732c2a34d464b1586bf5f4dd77ef12181f9e4e3079551603d004d2f575728d9fe216b5ba868d4a9f5924569
+EBUILD kodi-pvr-vuplus-7.4.1.ebuild 764 BLAKE2B 34294324ae2b481783ce3dced714f8f60c6dea8d0fb8a9e9e971e86fc5c6fbc30ee24494bc5e8fddeb4459790a4a5b7f0db1b96788a686bd64f11056c499b7b3 SHA512 6f92acf11b269e64f0ed4931d75fcff76ffd4371bc26e44ca77cd009c40a9f9be41f8fc05a885199977ae29c114d586b807e5e2cf2b4e75a753e6bafa0043596
 EBUILD kodi-pvr-vuplus-9999.ebuild 765 BLAKE2B 65a7bb78532a89ffa205709e64b92a14f6088412e8456d8a836ab496f1a010150b602ce9f8841f38cdb585dcf1135662405f2ca200658a88ff0dd0944ad07852 SHA512 70534928d3d77fe610b75048d73443481ea0eaa0419a22a6376774aff60d04382f8e9305c5a8d42cd7425dbe5c4bde17dd81026ea8074323bfd3599c094d4b8f
 MISC metadata.xml 362 BLAKE2B b551dbe10d765427e74ffc88979ea464caa79988f4204b05ced79d38745ffb4dff3fefd0464a999af66de4d132dcc0439ceb1239ccea3f924bf2a2c9083fd3ee SHA512 c9053d27b0f39fcef4c226c9a6c5578ae9cb076288fdd8f6ee39fb12b12b445499005515e79e5de8e4ba9e96fa991fd0210b3621b682960b41143ded1d84ac14
diff --git a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-7.4.0.ebuild b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-7.4.0.ebuild
deleted file mode 100644
index 20323489f843..000000000000
--- a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-7.4.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake kodi-addon
-
-DESCRIPTION="Kodi's VuPlus client addon"
-HOMEPAGE="https://github.com/kodi-pvr/pvr.vuplus"
-SRC_URI=""
-
-case ${PV} in
-9999)
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.vuplus.git"
-	inherit git-r3
-	;;
-*)
-	CODENAME="Matrix"
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kodi-pvr/pvr.vuplus/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/pvr.vuplus-${PV}-${CODENAME}"
-	;;
-esac
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	=media-tv/kodi-19*
-	dev-libs/tinyxml
-	dev-cpp/nlohmann_json
-	"
-
-RDEPEND="
-	${DEPEND}
-	"
-
-src_prepare() {
-	[ -d depends ] && rm -rf depends || die
-	cmake_src_prepare
-}
diff --git a/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-7.3.3.ebuild b/media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-7.4.1.ebuild
similarity index 100%
rename from media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-7.3.3.ebuild
rename to media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-7.4.1.ebuild
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 1b8d757153d0..a12162fb366f 100644
Binary files a/metadata/Manifest.gz and b/metadata/Manifest.gz differ
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 26c42ed7fbe7..9b9ec4b16d20 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Thu, 18 Mar 2021 10:38:28 +0000
+Fri, 19 Mar 2021 14:38:24 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 4ef4ceecf460..04a5cd763abc 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 500540 BLAKE2B 7a48959b9c07be5fc6e9e98ffbda2d71400bbd137c089df45f7701ae5dd1ba444366d51af5a4656f0a37ca0bbed5e1b74627c57cf425e57c4516bb7194b7dc59 SHA512 e923ed887d7140a57ff660001f6646dac898bdcaefc8ab2effe01101b80e6b709f7e4d00bf72e6d181aa41f6d99fe7b4285de0597a1b60734104a3eee41ee946
-TIMESTAMP 2021-03-18T10:38:32Z
+TIMESTAMP 2021-03-19T14:38:27Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmBTLahfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmBUt2NfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAjiA/+MycFwqWXwABoPcVMArL36SwYKPrGk80OhoKIm7cIeRZAsCjx4y9fsral
-D3Qgd1zn4qEbIF6bASKjS9Q4fvtZ7lsOLgBtdEqZf6iSrFYby8cd1n7Vofo2Bpfb
-sTMbnIBFmyaB5sLHDQt81WqTPS483vaGGL7tReZC5Popc1T6D/BaAwunaXt94SHA
-Eo/dQfnwb1iI1W290VlDz9+wcjSWgTNwTlxukC6h1tvuwaad0AkUo0bvgJUzzWcW
-vY6PQNdn3deV3uO2kKbgciqVuAD20rc97za4jgu4zhnJdgRG7ZbaQj4/enLCGNLd
-/bWkiwc1KGE0ru3kzgGJwrNPMwrjb1e2lVE6dLaEd1KikTbt7BO6pgdNcZkoSbug
-1uy5+frMemTQ4GyF0dFNnb3vh2vqMjZUahhKBHER39yQYE/i7hhQn5JVkB0llmyC
-La2GpGjmQ9OBdaJnz2hQ29jqSKPWI/OAuZ4wT+RN7in8V8NDGyAidt/SbGB1pE0G
-67qAcN0rtreBsN8NA/MQL605FihE2zlBzInvk1+h8bkqGgjhC8DCUa6c7cVeew9Y
-KxCQ5mE1/4beOv5jNKU/5bg6GKKTCf77EZHXkRIw2KeaUO8wNCoxxSLRiEITLl1r
-INdConuwSIhewaWd1K9TOyGJ6Iaty8bn+UJg+G5ugiudIfNPCjY=
-=Dph3
+klBLkQ/+NMa0vG42zf6mftuRAVxCdwQlTIWXVKzGanmw3u1KqhKQgleoPjhCrPxt
+FTQutV0g0xRMIgUoPuDyKeBo3HcJAI/tS4XKQguJAIW1uy7IrCyBSXw5EYDJBJBs
+XS/hIFECTIVpXY2fm/nDS5uXS32BFHmUf+9qA4TOZ7wZKWSo/PewOCzdUrE02gGA
+d0uLtvEHzGne8T+Hy2gbsIziQ/F9eT7AvHo/m+gRtYNNt+NBC8uDundtE8z1dFJR
+DTqp8CHB1YrqFZaM1T0UP46oYXgE0lxii3NnidII1nzMr/CG+v7I1+phYbuSo9ia
+dgcmPyGJEkv6Po8ug4VAN9PN86CzQBCEoXfB8/OqqVffRYxpZRl2qvGqLHQwnoAs
+0Zo42cLZqFDOZvgd/f3QwidGXZkCiB0e2rlSgI2RQAmMVa6kmiXhu7kIjdDLnzM5
+Ot+Cu/i3y/iQdZMjGkdUiovQK13rqE+gcJH4YLZfpzSNwkcqs6vjIFUetaGJvmQ/
+Ldya5AgDrkeGs6bHQZadpqxpJ0bJ3MFDw22ZBbJa8a1xrU9iT2CQnuqgMKWnumq2
+rUmPoVU6NZNYIzLCLd4Ji0aInWALr6uz79wygB/58kU7T2FI0KMMFiOveu0jhLYv
+i+OV4iXtfDx7pMjX+hCiZAgIRS1OXCGhVjuXla9FoP62bADLWiA=
+=reUR
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 26c42ed7fbe7..9b9ec4b16d20 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Thu, 18 Mar 2021 10:38:28 +0000
+Fri, 19 Mar 2021 14:38:24 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index ae6c6ec107a4..b54a456c83dc 100644
Binary files a/metadata/md5-cache/Manifest.gz and b/metadata/md5-cache/Manifest.gz differ
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index aeff9941b339..95dab61a9325 100644
Binary files a/metadata/md5-cache/app-editors/Manifest.gz and b/metadata/md5-cache/app-editors/Manifest.gz differ
diff --git a/metadata/md5-cache/app-editors/emacs-27.2_rc1 b/metadata/md5-cache/app-editors/emacs-27.2_rc1
new file mode 100644
index 000000000000..44b13290fffb
--- /dev/null
+++ b/metadata/md5-cache/app-editors/emacs-27.2_rc1
@@ -0,0 +1,15 @@
+BDEPEND=app-eselect/eselect-emacs sys-apps/texinfo virtual/pkgconfig gzip-el? ( app-arch/gzip ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=app-emacs/emacs-common-gentoo[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) json? ( dev-libs/jansson ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) gui? ( !aqua? ( x11-base/xorg-proto ) )
+DESCRIPTION=The extensible, customizable, self-documenting real-time display editor
+EAPI=7
+HOMEPAGE=https://www.gnu.org/software/emacs/
+IUSE=acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+LICENSE=GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2
+RDEPEND=app-emacs/emacs-common-gentoo[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) json? ( dev-libs/jansson ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) gui? ( !aqua? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib:0= ) jpeg? ( virtual/jpeg:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:0 ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18 ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) !app-editors/emacs-vcs:27 app-eselect/eselect-emacs
+RESTRICT=test
+SLOT=27
+SRC_URI=https://alpha.gnu.org/gnu/emacs/pretest/emacs-27.2-rc1.tar.xz
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	elisp-common	d4b53ec63c580b993ed19445f411e1d2	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=e51e8e6d17b3c40f87e7704e7a0255fe
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index acc3b62dbb3e..50fda40eae6d 100644
Binary files a/metadata/md5-cache/app-emulation/Manifest.gz and b/metadata/md5-cache/app-emulation/Manifest.gz differ
diff --git a/metadata/md5-cache/app-emulation/fuse-1.6.0 b/metadata/md5-cache/app-emulation/fuse-1.6.0
new file mode 100644
index 000000000000..0339bb91caa8
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/fuse-1.6.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure postinst postrm preinst prepare test
+DEPEND=>=app-emulation/libspectrum-1.5.0[zlib?] dev-libs/glib:2 alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) backend-X? ( x11-libs/libX11 x11-libs/libXext ) backend-gtk3? ( x11-libs/gtk+:3 ) backend-sdl? ( media-libs/libsdl[joystick,sound] ) backend-svga? ( media-libs/svgalib ) gpm? ( backend-fbcon? ( sys-libs/gpm ) ) joystick? ( !backend-sdl? ( media-libs/libjsw ) ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2:2 ) zlib? ( sys-libs/zlib ) backend-fbcon? ( virtual/linux-sources ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Free Unix Spectrum Emulator by Philip Kendall
+EAPI=7
+HOMEPAGE=http://fuse-emulator.sourceforge.net
+IUSE=alsa ao backend-X backend-fbcon +backend-gtk3 backend-sdl backend-svga gpm joystick memlimit png -pulseaudio +xml +zlib
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2+
+RDEPEND=>=app-emulation/libspectrum-1.5.0[zlib?] dev-libs/glib:2 alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) backend-X? ( x11-libs/libX11 x11-libs/libXext ) backend-gtk3? ( x11-libs/gtk+:3 ) backend-sdl? ( media-libs/libsdl[joystick,sound] ) backend-svga? ( media-libs/svgalib ) gpm? ( backend-fbcon? ( sys-libs/gpm ) ) joystick? ( !backend-sdl? ( media-libs/libjsw ) ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) xml? ( dev-libs/libxml2:2 ) zlib? ( sys-libs/zlib )
+REQUIRED_USE=?? ( alsa ao backend-sdl pulseaudio ) ?? ( backend-X backend-fbcon backend-gtk3 backend-sdl backend-svga )
+SLOT=0
+SRC_URI=mirror://sourceforge/fuse-emulator/fuse-1.6.0.tar.gz
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b56831d1f04ddd2043573f4ef820c6a6
diff --git a/metadata/md5-cache/app-emulation/fuse-utils-1.4.3 b/metadata/md5-cache/app-emulation/fuse-utils-1.4.3
deleted file mode 100644
index ed0061124374..000000000000
--- a/metadata/md5-cache/app-emulation/fuse-utils-1.4.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=>=app-emulation/libspectrum-1.4.4[gcrypt?,zlib?] audiofile? ( >=media-libs/audiofile-0.3.6 ) jpeg? ( virtual/jpeg:0 ) png? ( media-libs/libpng:0 ) zlib? ( sys-libs/zlib ) virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Utils for the Free Unix Spectrum Emulator by Philip Kendall
-EAPI=6
-HOMEPAGE=http://fuse-emulator.sourceforge.net
-IUSE=audiofile gcrypt jpeg png zlib
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=app-emulation/libspectrum-1.4.4[gcrypt?,zlib?] audiofile? ( >=media-libs/audiofile-0.3.6 ) jpeg? ( virtual/jpeg:0 ) png? ( media-libs/libpng:0 ) zlib? ( sys-libs/zlib )
-SLOT=0
-SRC_URI=mirror://sourceforge/fuse-emulator/fuse-utils-1.4.3.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=4b11cb51404637486875b4f56e6d67bf
diff --git a/metadata/md5-cache/app-emulation/fuse-utils-1.4.3-r1 b/metadata/md5-cache/app-emulation/fuse-utils-1.4.3-r1
new file mode 100644
index 000000000000..3d6768dd3d81
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/fuse-utils-1.4.3-r1
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure prepare
+DEPEND=>=app-emulation/libspectrum-1.4.4[audiofile?,gcrypt?,zlib?] audiofile? ( >=media-libs/audiofile-0.3.6 ) jpeg? ( virtual/jpeg:0 ) png? ( media-libs/libpng:0 ) zlib? ( sys-libs/zlib )
+DESCRIPTION=Utils for the Free Unix Spectrum Emulator by Philip Kendall
+EAPI=7
+HOMEPAGE=http://fuse-emulator.sourceforge.net
+IUSE=audiofile gcrypt jpeg png zlib
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=app-emulation/libspectrum-1.4.4[audiofile?,gcrypt?,zlib?] audiofile? ( >=media-libs/audiofile-0.3.6 ) jpeg? ( virtual/jpeg:0 ) png? ( media-libs/libpng:0 ) zlib? ( sys-libs/zlib )
+SLOT=0
+SRC_URI=mirror://sourceforge/fuse-emulator/fuse-utils-1.4.3.tar.gz
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=b5ce7c07b95a80cdd3fafbac058a5b62
diff --git a/metadata/md5-cache/app-emulation/libspectrum-1.5.0 b/metadata/md5-cache/app-emulation/libspectrum-1.5.0
new file mode 100644
index 000000000000..d5fd04dc6b91
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/libspectrum-1.5.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare test
+DEPEND=dev-libs/glib:2 audiofile? ( >=media-libs/audiofile-0.3.6 ) bzip2? ( >=app-arch/bzip2-1.0 ) gcrypt? ( dev-libs/libgcrypt:0 ) zlib? ( sys-libs/zlib )
+DESCRIPTION=Spectrum emulation library
+EAPI=7
+HOMEPAGE=http://fuse-emulator.sourceforge.net/libspectrum.php
+IUSE=audiofile bzip2 gcrypt zlib
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib:2 audiofile? ( >=media-libs/audiofile-0.3.6 ) bzip2? ( >=app-arch/bzip2-1.0 ) gcrypt? ( dev-libs/libgcrypt:0 ) zlib? ( sys-libs/zlib )
+SLOT=0
+SRC_URI=mirror://sourceforge/fuse-emulator/libspectrum-1.5.0.tar.gz
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=6e4ce4a16f345a3ebc76cdf52f818e07
diff --git a/metadata/md5-cache/app-emulation/xen-4.13.2-r4 b/metadata/md5-cache/app-emulation/xen-4.13.2-r6
similarity index 85%
rename from metadata/md5-cache/app-emulation/xen-4.13.2-r4
rename to metadata/md5-cache/app-emulation/xen-4.13.2-r6
index 11b95be9a0c0..806a39ea95db 100644
--- a/metadata/md5-cache/app-emulation/xen-4.13.2-r4
+++ b/metadata/md5-cache/app-emulation/xen-4.13.2-r6
@@ -4,12 +4,12 @@ DESCRIPTION=The Xen virtual machine monitor
 EAPI=7
 HOMEPAGE=https://www.xenproject.org
 IUSE=debug efi flask
-KEYWORDS=amd64 ~arm -x86
+KEYWORDS=~amd64 ~arm -x86
 LICENSE=GPL-2
 PDEPEND=~app-emulation/xen-tools-4.13.2
 REQUIRED_USE=arm? ( debug )
 RESTRICT=test splitdebug strip
 SLOT=0
-SRC_URI=https://downloads.xenproject.org/release/xen/4.13.2/xen-4.13.2.tar.gz https://dev.gentoo.org/~dlan/distfiles/xen-4.13.2-upstream-patches-3.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-4.13.2-upstream-patches-3.tar.xz
+SRC_URI=https://downloads.xenproject.org/release/xen/4.13.2/xen-4.13.2.tar.gz https://dev.gentoo.org/~dlan/distfiles/xen-4.13.2-upstream-patches-5.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-4.13.2-upstream-patches-5.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c1081eb89717d0234f61e4fa26f196ac
+_md5_=2ddd51d35eca1a878db6b45707d8e02e
diff --git a/metadata/md5-cache/app-emulation/xen-4.14.1-r1 b/metadata/md5-cache/app-emulation/xen-4.14.1-r2
similarity index 87%
rename from metadata/md5-cache/app-emulation/xen-4.14.1-r1
rename to metadata/md5-cache/app-emulation/xen-4.14.1-r2
index 973be5487dc6..5773abb708b5 100644
--- a/metadata/md5-cache/app-emulation/xen-4.14.1-r1
+++ b/metadata/md5-cache/app-emulation/xen-4.14.1-r2
@@ -10,6 +10,6 @@ PDEPEND=~app-emulation/xen-tools-4.14.1
 REQUIRED_USE=arm? ( debug )
 RESTRICT=test splitdebug strip
 SLOT=0
-SRC_URI=https://downloads.xenproject.org/release/xen/4.14.1/xen-4.14.1.tar.gz https://dev.gentoo.org/~dlan/distfiles/xen-4.14.1-upstream-patches-1.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-4.14.1-upstream-patches-1.tar.xz
+SRC_URI=https://downloads.xenproject.org/release/xen/4.14.1/xen-4.14.1.tar.gz https://dev.gentoo.org/~dlan/distfiles/xen-4.14.1-upstream-patches-2.tar.xz https://github.com/hydrapolic/gentoo-dist/raw/master/xen/xen-4.14.1-upstream-patches-2.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=e43850dfdee1f1ba34a4cd93b500c692
+_md5_=77ea1253970cb59b08445540f71a944b
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index d106cd48d877..d135825aa891 100644
Binary files a/metadata/md5-cache/dev-db/Manifest.gz and b/metadata/md5-cache/dev-db/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-db/pg_activity-2.1.3 b/metadata/md5-cache/dev-db/pg_activity-2.1.3
new file mode 100644
index 000000000000..b9b37917e5a8
--- /dev/null
+++ b/metadata/md5-cache/dev-db/pg_activity-2.1.3
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/attrs[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/psycopg:2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( dev-python/attrs[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/blessed[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/humanize[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/psutil[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/setuptools[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Realtime PostgreSQL database server monitoring tool
+EAPI=7
+HOMEPAGE=https://github.com/dalibo/pg_activity
+IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64
+LICENSE=POSTGRESQL
+RDEPEND=dev-python/attrs[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/blessed[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/humanize[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/psutil[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/setuptools[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/dalibo/pg_activity/archive/v2.1.3.tar.gz -> pg_activity-2.1.3.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=1141ce16ad30573391252c1756487248
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 91355df08f03..c775f4012b05 100644
Binary files a/metadata/md5-cache/dev-lang/Manifest.gz and b/metadata/md5-cache/dev-lang/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-lang/elixir-1.11.4 b/metadata/md5-cache/dev-lang/elixir-1.11.4
new file mode 100644
index 000000000000..218c87d3a7db
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/elixir-1.11.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install
+DEPEND=>=dev-lang/erlang-21:0=[ssl] test? ( dev-vcs/git )
+DESCRIPTION=Elixir programming language
+EAPI=7
+HOMEPAGE=https://elixir-lang.org
+IUSE=test
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~sparc ~x86
+LICENSE=Apache-2.0 ErlPL-1.1
+RDEPEND=>=dev-lang/erlang-21:0=[ssl] !!sci-biology/phylip
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/elixir-lang/elixir/archive/v1.11.4.tar.gz -> elixir-1.11.4.tar.gz
+_md5_=07002b1b115d7f91a39b94cc5ba903a8
diff --git a/metadata/md5-cache/dev-lang/moarvm-2021.02 b/metadata/md5-cache/dev-lang/moarvm-2021.02
index f98a91308c4a..6b3c90713c10 100644
--- a/metadata/md5-cache/dev-lang/moarvm-2021.02
+++ b/metadata/md5-cache/dev-lang/moarvm-2021.02
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://moarvm.org/releases/MoarVM-2021.02.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ef0e95a947fb792236912372b1c09025
+_md5_=f7eb15f6e186a02e02518ef61a7840b6
diff --git a/metadata/md5-cache/dev-lang/python-3.6.13 b/metadata/md5-cache/dev-lang/python-3.6.13
index a37b829cf0b8..9ba5a047036c 100644
--- a/metadata/md5-cache/dev-lang/python-3.6.13
+++ b/metadata/md5-cache/dev-lang/python-3.6.13
@@ -5,7 +5,7 @@ DESCRIPTION=An interpreted, interactive, object-oriented programming language
 EAPI=7
 HOMEPAGE=https://www.python.org/
 IUSE=bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline +sqlite +ssl test +threads tk wininst +xml verify-sig
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=PSF-2
 PDEPEND=app-eselect/eselect-python
 RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !build? ( app-misc/mime-types )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=3.6/3.6m
 SRC_URI=https://www.python.org/ftp/python/3.6.13/Python-3.6.13.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.6.13.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.6.13/Python-3.6.13.tar.xz.asc )
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	verify-sig	40b4f4f782cf67118f594ce604cc4c0a	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=a2f330e71b8d28826968a5a9cddc74ab
+_md5_=d762493458cf003b65e9c381a2cbcda3
diff --git a/metadata/md5-cache/dev-lang/python-3.9.2 b/metadata/md5-cache/dev-lang/python-3.9.2
index 63b138c2d416..cec8963d76c5 100644
--- a/metadata/md5-cache/dev-lang/python-3.9.2
+++ b/metadata/md5-cache/dev-lang/python-3.9.2
@@ -5,7 +5,7 @@ DESCRIPTION=An interpreted, interactive, object-oriented programming language
 EAPI=7
 HOMEPAGE=https://www.python.org/
 IUSE=bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline +sqlite +ssl test tk wininst +xml verify-sig
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=PSF-2
 PDEPEND=app-eselect/eselect-python
 RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !build? ( app-misc/mime-types )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=3.9
 SRC_URI=https://www.python.org/ftp/python/3.9.2/Python-3.9.2.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.9.2.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.9.2/Python-3.9.2.tar.xz.asc )
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	verify-sig	40b4f4f782cf67118f594ce604cc4c0a	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=35b8d5b279a7be50d718b00ddc59d57f
+_md5_=2a606eed7f3225308b9a97107defadef
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index e1bfddeead3f..ed60c370becd 100644
Binary files a/metadata/md5-cache/dev-libs/Manifest.gz and b/metadata/md5-cache/dev-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-libs/fddl-20111124-r1 b/metadata/md5-cache/dev-libs/fddl-20111124-r1
index 171c424d9add..ac7591e08760 100644
--- a/metadata/md5-cache/dev-libs/fddl-20111124-r1
+++ b/metadata/md5-cache/dev-libs/fddl-20111124-r1
@@ -1,11 +1,11 @@
+BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6
 DESCRIPTION=Free Decision Diagram Library
-EAPI=6
+EAPI=7
 HOMEPAGE=http://itval.sourceforge.net/ https://github.com/atomopawn/FDDL
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~pinkbyte/distfiles/snapshots/fddl-20111124.tar.gz
-_eclasses_=cmake-utils	77cd39e6009811bf97a59d91ffd5b54f	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e2eabfc350779e711a9f3a82fb40155e
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-snapshot	b1abf460a493fc59ebb25de0df3f09dd	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ad19b744031dbd9f34e9557d4d8b6485
diff --git a/metadata/md5-cache/dev-libs/libindicator-12.10.1-r201 b/metadata/md5-cache/dev-libs/libindicator-12.10.1-r201
index 126cc74e6852..0eaf0e41b240 100644
--- a/metadata/md5-cache/dev-libs/libindicator-12.10.1-r201
+++ b/metadata/md5-cache/dev-libs/libindicator-12.10.1-r201
@@ -1,7 +1,8 @@
+BDEPEND=dev-util/glib-utils virtual/pkgconfig test? ( dev-util/dbus-test-runner ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/glib-2.22[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gtk+-2.18:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-util/glib-utils virtual/pkgconfig test? ( dev-util/dbus-test-runner ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEPEND=>=dev-libs/glib-2.22[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gtk+-2.18:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=A set of symbols and convience functions that all indicators would like to use
-EAPI=5
+EAPI=7
 HOMEPAGE=https://launchpad.net/libindicator
 IUSE=test test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=amd64 ~arm x86
@@ -10,5 +11,5 @@ RDEPEND=>=dev-libs/glib-2.22[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_m
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://launchpad.net/libindicator/12.10/12.10.1/+download/libindicator-12.10.1.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b82039679f8f7bcf4cb89569e61cd056
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=c39c1a7b357f576912474893b82e4731
diff --git a/metadata/md5-cache/dev-libs/libindicator-12.10.1-r301 b/metadata/md5-cache/dev-libs/libindicator-12.10.1-r301
index a1385c1a5687..de6bbe62be52 100644
--- a/metadata/md5-cache/dev-libs/libindicator-12.10.1-r301
+++ b/metadata/md5-cache/dev-libs/libindicator-12.10.1-r301
@@ -1,7 +1,8 @@
+BDEPEND=dev-util/glib-utils virtual/pkgconfig test? ( dev-util/dbus-test-runner ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/glib-2.22[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gtk+-3.2:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-util/glib-utils virtual/pkgconfig test? ( dev-util/dbus-test-runner ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEPEND=>=dev-libs/glib-2.22[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/gtk+-3.2:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=A set of symbols and convience functions that all indicators would like to use
-EAPI=5
+EAPI=7
 HOMEPAGE=https://launchpad.net/libindicator
 IUSE=test test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc64 x86
@@ -10,5 +11,5 @@ RDEPEND=>=dev-libs/glib-2.22[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_m
 RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=https://launchpad.net/libindicator/12.10/12.10.1/+download/libindicator-12.10.1.tar.gz
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=6adfa4f32e91e145041f5756a1df91a8
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=3b618b88f5248d5d93c3c766f91ff35e
diff --git a/metadata/md5-cache/dev-libs/libsigsegv-2.13 b/metadata/md5-cache/dev-libs/libsigsegv-2.13
index 08c199e6324e..460dab5e0f0c 100644
--- a/metadata/md5-cache/dev-libs/libsigsegv-2.13
+++ b/metadata/md5-cache/dev-libs/libsigsegv-2.13
@@ -8,4 +8,4 @@ LICENSE=GPL-2+
 SLOT=0
 SRC_URI=mirror://gnu/libsigsegv/libsigsegv-2.13.tar.gz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=6708c3dbf7d024cd193c8f7c909792f9
+_md5_=eaec576c8767ef228f232ab8dbb2bd5f
diff --git a/metadata/md5-cache/dev-libs/libtomcrypt-1.18.2-r2 b/metadata/md5-cache/dev-libs/libtomcrypt-1.18.2-r2
index 63c50995f5e8..2b6236e1267e 100644
--- a/metadata/md5-cache/dev-libs/libtomcrypt-1.18.2-r2
+++ b/metadata/md5-cache/dev-libs/libtomcrypt-1.18.2-r2
@@ -8,7 +8,8 @@ IUSE=+gmp +libtommath tomsfastmath
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos
 LICENSE=|| ( WTFPL-2 public-domain )
 RDEPEND=gmp? ( dev-libs/gmp:= ) libtommath? ( dev-libs/libtommath:= ) tomsfastmath? ( dev-libs/tomsfastmath:= )
+REQUIRED_USE=|| ( gmp libtommath tomsfastmath )
 SLOT=0/1
 SRC_URI=https://github.com/libtom/libtomcrypt/releases/download/v1.18.2/crypt-1.18.2.tar.xz -> libtomcrypt-1.18.2.tar.xz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=b34e287a6712c9ea154e26c9749d2488
+_md5_=26831e014d24f2aea4fbfdb5381c839f
diff --git a/metadata/md5-cache/dev-libs/nss-3.60.1 b/metadata/md5-cache/dev-libs/nss-3.60.1
deleted file mode 100644
index dd0c7c77f38d..000000000000
--- a/metadata/md5-cache/dev-libs/nss-3.60.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=dev-libs/nspr-4.29[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-db/sqlite-3.8.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig
-DESCRIPTION=Mozilla's Network Security Services library that implements PKI support
-EAPI=7
-HOMEPAGE=https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS
-IUSE=cacert utils abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
-LICENSE=|| ( MPL-2.0 GPL-2 LGPL-2.1 )
-RDEPEND=>=dev-libs/nspr-4.29[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-db/sqlite-3.8.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig
-RESTRICT=test
-SLOT=0
-SRC_URI=https://archive.mozilla.org/pub/security/nss/releases/NSS_3_60_1_RTM/src/nss-3.60.1.tar.gz cacert? ( https://dev.gentoo.org/~axs/distfiles/nss-cacert-class1-class3.patch )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ee25e08d5726fd95f043b171aa652bf3
diff --git a/metadata/md5-cache/dev-libs/nss-3.61 b/metadata/md5-cache/dev-libs/nss-3.63
similarity index 95%
rename from metadata/md5-cache/dev-libs/nss-3.61
rename to metadata/md5-cache/dev-libs/nss-3.63
index 59c6b2037010..6b45312036c8 100644
--- a/metadata/md5-cache/dev-libs/nss-3.61
+++ b/metadata/md5-cache/dev-libs/nss-3.63
@@ -9,6 +9,6 @@ LICENSE=|| ( MPL-2.0 GPL-2 LGPL-2.1 )
 RDEPEND=>=dev-libs/nspr-4.29[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-db/sqlite-3.8.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig
 RESTRICT=test
 SLOT=0
-SRC_URI=https://archive.mozilla.org/pub/security/nss/releases/NSS_3_61_RTM/src/nss-3.61.tar.gz cacert? ( https://dev.gentoo.org/~axs/distfiles/nss-cacert-class1-class3.patch )
+SRC_URI=https://archive.mozilla.org/pub/security/nss/releases/NSS_3_63_RTM/src/nss-3.63.tar.gz cacert? ( https://dev.gentoo.org/~axs/distfiles/nss-cacert-class1-class3.patch )
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=ee25e08d5726fd95f043b171aa652bf3
+_md5_=bb467ed23ecd9607b011653107b81c68
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-0.19.3 b/metadata/md5-cache/dev-libs/tree-sitter-0.19.4
similarity index 88%
rename from metadata/md5-cache/dev-libs/tree-sitter-0.19.3
rename to metadata/md5-cache/dev-libs/tree-sitter-0.19.4
index 71a6cdc7f4bd..585e74cf3325 100644
--- a/metadata/md5-cache/dev-libs/tree-sitter-0.19.3
+++ b/metadata/md5-cache/dev-libs/tree-sitter-0.19.4
@@ -5,5 +5,5 @@ HOMEPAGE=https://github.com/tree-sitter/tree-sitter
 KEYWORDS=~amd64
 LICENSE=MIT
 SLOT=0
-SRC_URI=https://github.com/tree-sitter/tree-sitter/archive/v0.19.3.tar.gz -> tree-sitter-0.19.3.tar.gz
+SRC_URI=https://github.com/tree-sitter/tree-sitter/archive/v0.19.4.tar.gz -> tree-sitter-0.19.4.tar.gz
 _md5_=b45e4e8dbf77ac54e52dbb3ba8cc6afb
diff --git a/metadata/md5-cache/dev-libs/uriparser-0.9.5 b/metadata/md5-cache/dev-libs/uriparser-0.9.5
new file mode 100644
index 000000000000..e2a6ed637a90
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/uriparser-0.9.5
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig doc? ( >=app-doc/doxygen-1.5.8 media-gfx/graphviz qt5? ( dev-qt/qthelp:5 ) ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( >=dev-cpp/gtest-1.8.1 )
+DESCRIPTION=Strictly RFC 3986 compliant URI parsing library in C
+EAPI=7
+HOMEPAGE=https://uriparser.github.io/
+IUSE=+doc qt5 test unicode
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+LICENSE=BSD
+REQUIRED_USE=qt5? ( doc ) test? ( unicode )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/uriparser/uriparser/releases/download/uriparser-0.9.5/uriparser-0.9.5.tar.bz2
+_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=05e82b27bdec4fe9c528d48f3d30874e
diff --git a/metadata/md5-cache/dev-ml/Manifest.gz b/metadata/md5-cache/dev-ml/Manifest.gz
index 1f857a230aad..b544486e165c 100644
Binary files a/metadata/md5-cache/dev-ml/Manifest.gz and b/metadata/md5-cache/dev-ml/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-ml/merlin-3.4.2 b/metadata/md5-cache/dev-ml/merlin-3.4.2
new file mode 100644
index 000000000000..d6d2e2cc8175
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/merlin-3.4.2
@@ -0,0 +1,14 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install postinst postrm prepare test
+DEPEND=app-emacs/auto-complete app-emacs/company-mode dev-ml/csexp:= dev-ml/yojson:= >=dev-lang/ocaml-4.09:= <dev-lang/ocaml-4.12:= emacs? ( >=app-editors/emacs-23.1:* ) >=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=Context sensitive completion for OCaml in Vim and Emacs
+EAPI=7
+HOMEPAGE=https://github.com/ocaml/merlin
+IUSE=emacs +ocamlopt
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=app-emacs/auto-complete app-emacs/company-mode dev-ml/csexp:= dev-ml/yojson:= >=dev-lang/ocaml-4.09:= <dev-lang/ocaml-4.12:= emacs? ( >=app-editors/emacs-23.1:* ) >=dev-lang/ocaml-4:=[ocamlopt?]
+SLOT=0/3.4.2
+SRC_URI=https://github.com/ocaml/merlin/archive/v3.4.2.tar.gz -> merlin-3.4.2.tar.gz
+_eclasses_=dune	46e13a2340ab32b2ad8ae98b653695ea	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_md5_=ecd38b418a5741582714e89880a5ecea
diff --git a/metadata/md5-cache/dev-ml/merlin-4.1 b/metadata/md5-cache/dev-ml/merlin-4.1
new file mode 100644
index 000000000000..d7a94d221fe8
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/merlin-4.1
@@ -0,0 +1,14 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install postinst postrm prepare test
+DEPEND=app-emacs/auto-complete app-emacs/company-mode dev-ml/csexp:= dev-ml/yojson:= =dev-lang/ocaml-4.11*:= emacs? ( >=app-editors/emacs-23.1:* ) >=dev-lang/ocaml-4:=[ocamlopt?]
+DESCRIPTION=Context sensitive completion for OCaml in Vim and Emacs
+EAPI=7
+HOMEPAGE=https://github.com/ocaml/merlin
+IUSE=emacs +ocamlopt
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=app-emacs/auto-complete app-emacs/company-mode dev-ml/csexp:= dev-ml/yojson:= =dev-lang/ocaml-4.11*:= emacs? ( >=app-editors/emacs-23.1:* ) >=dev-lang/ocaml-4:=[ocamlopt?]
+SLOT=0/4.1
+SRC_URI=https://github.com/ocaml/merlin/archive/v4.1.tar.gz -> merlin-4.1.tar.gz
+_eclasses_=dune	46e13a2340ab32b2ad8ae98b653695ea	elisp-common	d4b53ec63c580b993ed19445f411e1d2
+_md5_=4f2ee82e3fd088816b5fdbd383fdd64b
diff --git a/metadata/md5-cache/dev-python/Faker-6.6.2 b/metadata/md5-cache/dev-python/Faker-6.6.2
new file mode 100644
index 000000000000..d074af6df645
--- /dev/null
+++ b/metadata/md5-cache/dev-python/Faker-6.6.2
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/freezegun[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/random2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/validators[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/python-dateutil-2.4.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/text-unidecode-1.3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] !dev-ruby/faker >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A Python package that generates fake data for you
+EAPI=7
+HOMEPAGE=https://github.com/joke2k/faker
+IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/python-dateutil-2.4.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/text-unidecode-1.3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] !dev-ruby/faker python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/F/Faker/Faker-6.6.2.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=8a924b44f974c84613e3216a45187207
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 4a387445a1ca..90bf55545b98 100644
Binary files a/metadata/md5-cache/dev-python/Manifest.gz and b/metadata/md5-cache/dev-python/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-python/boto3-1.17.31 b/metadata/md5-cache/dev-python/boto3-1.17.31
new file mode 100644
index 000000000000..9132c510cbab
--- /dev/null
+++ b/metadata/md5-cache/dev-python/boto3-1.17.31
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) ) test? ( >=dev-python/botocore-1.20.31[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jmespath-0.7.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/s3transfer-0.3.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/nose-1.3.7-r4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=The AWS SDK for Python
+EAPI=7
+HOMEPAGE=https://github.com/boto/boto3
+IUSE=doc test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.20.31[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jmespath-0.7.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/s3transfer-0.3.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/boto/boto3/archive/1.17.31.tar.gz -> boto3-1.17.31.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=632f3a5a79935d84378ababb9d4c165a
diff --git a/metadata/md5-cache/dev-python/boto3-1.17.32 b/metadata/md5-cache/dev-python/boto3-1.17.32
new file mode 100644
index 000000000000..dd9e38b83912
--- /dev/null
+++ b/metadata/md5-cache/dev-python/boto3-1.17.32
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) ) test? ( >=dev-python/botocore-1.20.32[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jmespath-0.7.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/s3transfer-0.3.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/nose-1.3.7-r4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=The AWS SDK for Python
+EAPI=7
+HOMEPAGE=https://github.com/boto/boto3
+IUSE=doc test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.20.32[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jmespath-0.7.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/s3transfer-0.3.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/boto/boto3/archive/1.17.32.tar.gz -> boto3-1.17.32.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=632f3a5a79935d84378ababb9d4c165a
diff --git a/metadata/md5-cache/dev-python/botocore-1.20.31 b/metadata/md5-cache/dev-python/botocore-1.20.31
new file mode 100644
index 000000000000..41df328be7dc
--- /dev/null
+++ b/metadata/md5-cache/dev-python/botocore-1.20.31
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jsonschema[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) ) test? ( dev-python/six[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jmespath[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-dateutil[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/urllib3-1.25.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/nose-1.3.7-r4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Low-level, data-driven core of boto 3
+EAPI=7
+HOMEPAGE=https://github.com/boto/botocore
+IUSE=doc test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=dev-python/six[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jmespath[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-dateutil[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/urllib3-1.25.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/b/botocore/botocore-1.20.31.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=0cb391ae0ef3fed1bf28148d755b5f6f
diff --git a/metadata/md5-cache/dev-python/botocore-1.20.32 b/metadata/md5-cache/dev-python/botocore-1.20.32
new file mode 100644
index 000000000000..6f73a54dac9b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/botocore-1.20.32
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jsonschema[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) ) test? ( dev-python/six[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jmespath[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-dateutil[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/urllib3-1.25.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/nose-1.3.7-r4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Low-level, data-driven core of boto 3
+EAPI=7
+HOMEPAGE=https://github.com/boto/botocore
+IUSE=doc test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=dev-python/six[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jmespath[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-dateutil[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/urllib3-1.25.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/b/botocore/botocore-1.20.32.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=0cb391ae0ef3fed1bf28148d755b5f6f
diff --git a/metadata/md5-cache/dev-python/cbor2-5.2.0 b/metadata/md5-cache/dev-python/cbor2-5.2.0
index 4e7f664de4f0..bff100fb33b0 100644
--- a/metadata/md5-cache/dev-python/cbor2-5.2.0
+++ b/metadata/md5-cache/dev-python/cbor2-5.2.0
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/pytest[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Pure Python CBOR (de)serializer with extensive tag support
 EAPI=7
 HOMEPAGE=https://github.com/agronholm/cbor2 https://pypi.org/project/cbor2/
-IUSE=test test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=amd64 ~arm arm64 ~x86
 LICENSE=MIT
 RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test ) !test? ( test )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cbor2/cbor2-5.2.0.tar.gz
 _eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=ead7f357cd5daee77a8ed4d742605a70
+_md5_=8d288018de6752de77553b899575404d
diff --git a/metadata/md5-cache/dev-python/flask-sqlalchemy-2.4.4-r1 b/metadata/md5-cache/dev-python/flask-sqlalchemy-2.4.4-r1
new file mode 100644
index 000000000000..d8faf9657c56
--- /dev/null
+++ b/metadata/md5-cache/dev-python/flask-sqlalchemy-2.4.4-r1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/flask-0.10[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/sqlalchemy-1.4[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/pallets-sphinx-themes[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/sphinx-issues[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/pallets-sphinx-themes[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/sphinx-issues[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/pallets-sphinx-themes[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/sphinx-issues[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-),-python_single_target_pypy3(-)] dev-python/pallets-sphinx-themes[python_targets_pypy3(-),-python_single_target_pypy3(-)] dev-python/sphinx-issues[python_targets_pypy3(-),-python_single_target_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=SQLAlchemy support for Flask applications
+EAPI=7
+HOMEPAGE=https://pypi.org/project/Flask-SQLAlchemy/
+IUSE=test doc python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=amd64 ~arm ~arm64 x86
+LICENSE=BSD
+RDEPEND=>=dev-python/flask-0.10[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/sqlalchemy-1.4[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/F/Flask-SQLAlchemy/Flask-SQLAlchemy-2.4.4.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=a1b87d54dd8b4fa4e7013506d683a0ff
diff --git a/metadata/md5-cache/dev-python/flask-sqlalchemy-2.4.4 b/metadata/md5-cache/dev-python/flask-sqlalchemy-2.5.1
similarity index 97%
rename from metadata/md5-cache/dev-python/flask-sqlalchemy-2.4.4
rename to metadata/md5-cache/dev-python/flask-sqlalchemy-2.5.1
index 8d0b3e3b8646..06f35a083fc8 100644
--- a/metadata/md5-cache/dev-python/flask-sqlalchemy-2.4.4
+++ b/metadata/md5-cache/dev-python/flask-sqlalchemy-2.5.1
@@ -4,12 +4,12 @@ DESCRIPTION=SQLAlchemy support for Flask applications
 EAPI=7
 HOMEPAGE=https://pypi.org/project/Flask-SQLAlchemy/
 IUSE=test doc python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm ~arm64 x86
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-python/flask-0.10[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/sqlalchemy-0.8.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/F/Flask-SQLAlchemy/Flask-SQLAlchemy-2.4.4.tar.gz
+SRC_URI=mirror://pypi/F/Flask-SQLAlchemy/Flask-SQLAlchemy-2.5.1.tar.gz
 _eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=7a4b31ae3f64638e4e3c4feced903a38
+_md5_=116f830c266e18947bdc90c29aa2f15d
diff --git a/metadata/md5-cache/dev-python/lark-parser-0.11.2 b/metadata/md5-cache/dev-python/lark-parser-0.11.2
new file mode 100644
index 000000000000..bc0b27f1107e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/lark-parser-0.11.2
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/regex[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/js2py[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python module to propose a modern general-purpose parsing library for Python
+EAPI=7
+HOMEPAGE=https://github.com/lark-parser/lark
+IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/l/lark-parser/lark-parser-0.11.2.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=92bb02b3538eb01a1b36813c35b74684
diff --git a/metadata/md5-cache/dev-python/markdown-2.6.11 b/metadata/md5-cache/dev-python/markdown-2.6.11
index d9cd59501c5c..1e67f0b3e52b 100644
--- a/metadata/md5-cache/dev-python/markdown-2.6.11
+++ b/metadata/md5-cache/dev-python/markdown-2.6.11
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/M/Markdown/Markdown-2.6.11.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	distutils-r1	16579e06f8839831bd5c03455bb87e3f	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=83d8ec960559b2a6b61fe88a37ed4753
+_md5_=a41266be8c7aee6f55a155eaec59b183
diff --git a/metadata/md5-cache/dev-python/pydocstyle-6.0.0 b/metadata/md5-cache/dev-python/pydocstyle-6.0.0
new file mode 100644
index 000000000000..9172ce548c40
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pydocstyle-6.0.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/snowballstemmer[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python docstring style checker
+EAPI=7
+HOMEPAGE=https://github.com/PyCQA/pydocstyle/
+IUSE=test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos
+LICENSE=MIT
+RDEPEND=dev-python/snowballstemmer[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/PyCQA/pydocstyle/archive/6.0.0.tar.gz -> pydocstyle-6.0.0.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=e0a7dcb73c6f4667929db79ab78595d4
diff --git a/metadata/md5-cache/dev-python/reno-3.3.0 b/metadata/md5-cache/dev-python/reno-3.3.0
new file mode 100644
index 000000000000..d33c24bb627b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/reno-3.3.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/pbr[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( >=dev-python/testtools-1.4.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( dev-python/pbr[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyyaml-5.3.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/dulwich-0.15.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/packaging-20.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/docutils-0.11[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/sphinx-2.1.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Release notes manager, storing release notes in a git repo and building docs
+EAPI=7
+HOMEPAGE=https://pypi.org/project/reno/
+IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/pbr[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyyaml-5.3.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/dulwich-0.15.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/packaging-20.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/docutils-0.11[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/sphinx-2.1.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/r/reno/reno-3.3.0.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=3a112c13172421cf53d61a9250d0635c
diff --git a/metadata/md5-cache/dev-python/s3transfer-0.3.5 b/metadata/md5-cache/dev-python/s3transfer-0.3.5
new file mode 100644
index 000000000000..ebaf31464ea3
--- /dev/null
+++ b/metadata/md5-cache/dev-python/s3transfer-0.3.5
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( dev-python/botocore[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=An Amazon S3 Transfer Manager
+EAPI=7
+HOMEPAGE=https://github.com/boto/s3transfer
+IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=dev-python/botocore[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/s/s3transfer/s3transfer-0.3.5.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=2f31ee9b27071b43f26b71df58dc2768
diff --git a/metadata/md5-cache/dev-python/s3transfer-0.3.6 b/metadata/md5-cache/dev-python/s3transfer-0.3.6
new file mode 100644
index 000000000000..4cac3c393af5
--- /dev/null
+++ b/metadata/md5-cache/dev-python/s3transfer-0.3.6
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( dev-python/botocore[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=An Amazon S3 Transfer Manager
+EAPI=7
+HOMEPAGE=https://github.com/boto/s3transfer
+IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=dev-python/botocore[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/s/s3transfer/s3transfer-0.3.6.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=2f31ee9b27071b43f26b71df58dc2768
diff --git a/metadata/md5-cache/dev-python/soupsieve-2.2.1 b/metadata/md5-cache/dev-python/soupsieve-2.2.1
new file mode 100644
index 000000000000..e4c3e65b13ad
--- /dev/null
+++ b/metadata/md5-cache/dev-python/soupsieve-2.2.1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/beautifulsoup[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/lxml[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/html5lib[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A modern CSS selector implementation for BeautifulSoup
+EAPI=7
+HOMEPAGE=https://github.com/facelessuser/soupsieve/ https://pypi.org/project/soupsieve/
+IUSE=test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=MIT
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/facelessuser/soupsieve/archive/2.2.1.tar.gz -> soupsieve-2.2.1.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=41f5fe31a95f0dd013ea722de19e651c
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index ba95145342cb..85537e8850ee 100644
Binary files a/metadata/md5-cache/dev-util/Manifest.gz and b/metadata/md5-cache/dev-util/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-util/idea-community-2021.3.1.203.6682.168-r1 b/metadata/md5-cache/dev-util/idea-community-2021.3.1.203.6682.168-r1
new file mode 100644
index 000000000000..5dc380c06b38
--- /dev/null
+++ b/metadata/md5-cache/dev-util/idea-community-2021.3.1.203.6682.168-r1
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/patchelf
+DEFINED_PHASES=install prepare unpack
+DEPEND=|| ( ~dev-java/openjdk-11.0.9_p11:11 ~dev-java/openjdk-bin-11.0.9_p11:11 )
+DESCRIPTION=A complete toolset for web, mobile and enterprise development
+EAPI=7
+HOMEPAGE=https://www.jetbrains.com/idea
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0 BSD BSD-2 CC0-1.0 CC-BY-2.5 CDDL-1.1 codehaus-classworlds CPL-1.0 EPL-1.0 EPL-2.0 GPL-2 GPL-2-with-classpath-exception ISC JDOM LGPL-2.1 LGPL-2.1+ LGPL-3-with-linking-exception MIT MPL-1.0 MPL-1.1 OFL ZLIB
+RDEPEND=|| ( ~dev-java/openjdk-11.0.9_p11:11 ~dev-java/openjdk-bin-11.0.9_p11:11 ) dev-java/jansi-native dev-libs/libdbusmenu =dev-util/lldb-10*
+RESTRICT=splitdebug
+SLOT=0
+SRC_URI=https://download.jetbrains.com/idea/ideaIC-2021.3.1-no-jbr.tar.gz -> ideaIC-3.1.203.6682.168.tar.gz amd64? ( https://bintray.com/jetbrains/intellij-jbr/download_file?file_path=jbr-11_0_8-linux-x64-b1098.1.tar.gz -> jbr-11_0_8-linux-x64-b1098.1.tar.gz )
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=000c9ec5587b64918efa265c45452727
diff --git a/metadata/md5-cache/dev-util/pkgconf-1.7.2 b/metadata/md5-cache/dev-util/pkgconf-1.7.4
similarity index 74%
rename from metadata/md5-cache/dev-util/pkgconf-1.7.2
rename to metadata/md5-cache/dev-util/pkgconf-1.7.4
index 350ef8b1b1b4..702e50a725b8 100644
--- a/metadata/md5-cache/dev-util/pkgconf-1.7.2
+++ b/metadata/md5-cache/dev-util/pkgconf-1.7.4
@@ -4,11 +4,11 @@ DESCRIPTION=pkg-config compatible replacement with no dependencies other than AN
 EAPI=7
 HOMEPAGE=https://git.sr.ht/~kaniini/pkgconf
 IUSE=+pkg-config test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~ppc-macos ~x64-macos
 LICENSE=ISC
-RDEPEND=pkg-config? ( !dev-util/pkgconfig !dev-util/pkg-config-lite !dev-util/pkgconfig-openbsd[pkg-config] )
+RDEPEND=pkg-config? ( !dev-util/pkgconfig )
 RESTRICT=!test? ( test )
 SLOT=0/3
-SRC_URI=http://distfiles.dereferenced.org/pkgconf/pkgconf-1.7.2.tar.xz
+SRC_URI=http://distfiles.dereferenced.org/pkgconf/pkgconf-1.7.4.tar.xz
 _eclasses_=multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=ec0c67e96f5f60b390a6e77e61393bdf
+_md5_=31fa4709cea4ae0efc700bd8b0d25b66
diff --git a/metadata/md5-cache/dev-util/rebar-bin-3.13.2 b/metadata/md5-cache/dev-util/rebar-bin-3.14.4
similarity index 64%
rename from metadata/md5-cache/dev-util/rebar-bin-3.13.2
rename to metadata/md5-cache/dev-util/rebar-bin-3.14.4
index 84b087c7cec9..71cadaaa3d6d 100644
--- a/metadata/md5-cache/dev-util/rebar-bin-3.13.2
+++ b/metadata/md5-cache/dev-util/rebar-bin-3.14.4
@@ -6,5 +6,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=dev-lang/erlang
 SLOT=0
-SRC_URI=https://github.com/erlang/rebar3/releases/download/3.13.2/rebar3 -> rebar-bin-3.13.2
-_md5_=561358178619e76b21b723b3e1633981
+SRC_URI=https://github.com/erlang/rebar3/releases/download/3.14.4/rebar3 -> rebar-bin-3.14.4
+_md5_=4316102da60c3b89b6f1ce8066d05472
diff --git a/metadata/md5-cache/dev-util/rebar-bin-3.6.2 b/metadata/md5-cache/dev-util/rebar-bin-3.6.2
deleted file mode 100644
index 6424f503d3e5..000000000000
--- a/metadata/md5-cache/dev-util/rebar-bin-3.6.2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=A sophisticated build-tool for Erlang projects that follows OTP principles
-EAPI=7
-HOMEPAGE=https://github.com/erlang/rebar3
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-lang/erlang
-SLOT=0
-SRC_URI=https://github.com/erlang/rebar3/releases/download/3.6.2/rebar3 -> rebar-bin-3.6.2
-_md5_=561358178619e76b21b723b3e1633981
diff --git a/metadata/md5-cache/dev-util/systemtap-4.0-r1 b/metadata/md5-cache/dev-util/systemtap-4.0-r1
index 8996e9d08f13..e922d6e129e2 100644
--- a/metadata/md5-cache/dev-util/systemtap-4.0-r1
+++ b/metadata/md5-cache/dev-util/systemtap-4.0-r1
@@ -9,7 +9,8 @@ KEYWORDS=~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 s390 sparc x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/elfutils-0.142 dev-libs/json-c:= sys-libs/ncurses:0= sys-libs/readline:0= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) libvirt? ( >=app-emulation/libvirt-1.0.2 ) selinux? ( sys-libs/libselinux ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/nspr dev-libs/nss ) zeroconf? ( net-dns/avahi )
 REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.sourceware.org/systemtap/ftp/releases/systemtap-4.0.tar.gz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	user	b0a0d4ca9e3f79c38f8f4143b8d5a2d8	user-info	a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=27aa66b8bc0888b06e85402a6bbeb53c
+_md5_=f4ebcf899a8aa1c3b98e92b83c141acd
diff --git a/metadata/md5-cache/dev-util/systemtap-4.0-r2 b/metadata/md5-cache/dev-util/systemtap-4.0-r2
index c7f51449d405..444409fbf9fb 100644
--- a/metadata/md5-cache/dev-util/systemtap-4.0-r2
+++ b/metadata/md5-cache/dev-util/systemtap-4.0-r2
@@ -9,7 +9,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/elfutils-0.142 dev-libs/json-c:= sys-libs/ncurses:0= sys-libs/readline:0= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) libvirt? ( >=app-emulation/libvirt-1.0.2 ) selinux? ( sys-libs/libselinux ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/nspr dev-libs/nss ) zeroconf? ( net-dns/avahi ) acct-group/stapdev acct-group/stapsys acct-group/stapusr
 REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.sourceware.org/systemtap/ftp/releases/systemtap-4.0.tar.gz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=f48fdae64fe73ae9af583abb23607934
+_md5_=428e4b6ed7508482fcb7549b7488a82b
diff --git a/metadata/md5-cache/dev-util/systemtap-4.4 b/metadata/md5-cache/dev-util/systemtap-4.4
index bd9d6d1ad6b2..ac0c1dee00d2 100644
--- a/metadata/md5-cache/dev-util/systemtap-4.4
+++ b/metadata/md5-cache/dev-util/systemtap-4.4
@@ -9,7 +9,8 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/elfutils-0.142 dev-libs/json-c:= sys-libs/ncurses:0= sys-libs/readline:0= python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) libvirt? ( >=app-emulation/libvirt-1.0.2 ) selinux? ( sys-libs/libselinux ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/nspr dev-libs/nss ) zeroconf? ( net-dns/avahi ) acct-group/stapdev acct-group/stapsys acct-group/stapusr
 REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 )
+RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.sourceware.org/systemtap/ftp/releases/systemtap-4.4.tar.gz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=d2d9a01603d9f7979761a61f13d07c6a
+_md5_=d0a0b031708ecffc479febec33667d2b
diff --git a/metadata/md5-cache/dev-vcs/Manifest.gz b/metadata/md5-cache/dev-vcs/Manifest.gz
index 6e5083c4a31d..6fcc63c8eaad 100644
Binary files a/metadata/md5-cache/dev-vcs/Manifest.gz and b/metadata/md5-cache/dev-vcs/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-vcs/git-extras-6.1.0 b/metadata/md5-cache/dev-vcs/git-extras-6.1.0
new file mode 100644
index 000000000000..ac9ebd012629
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/git-extras-6.1.0
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile configure install prepare
+DESCRIPTION=Git utilities -- repo summary, repl, changelog population, author commit percentages and more
+EAPI=7
+HOMEPAGE=https://github.com/tj/git-extras
+KEYWORDS=~amd64 ~x64-macos
+LICENSE=MIT
+RDEPEND=app-shells/bash dev-vcs/git
+SLOT=0
+SRC_URI=https://github.com/tj/git-extras/archive/6.1.0.tar.gz -> git-extras-6.1.0.tar.gz
+_md5_=bbad8730a8ce1a41dc86483c2fdbc1cc
diff --git a/metadata/md5-cache/dev-vcs/git-publish-1.7.0 b/metadata/md5-cache/dev-vcs/git-publish-1.7.0
new file mode 100644
index 000000000000..bf1834ebde68
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/git-publish-1.7.0
@@ -0,0 +1,14 @@
+BDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) man? ( dev-lang/perl )
+DEFINED_PHASES=compile install prepare setup
+DESCRIPTION=Tool for preparing and storing patch revisions as git tag
+EAPI=7
+HOMEPAGE=https://github.com/stefanha/git-publish
+IUSE=+man python_single_target_python3_8 python_single_target_python3_9
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) dev-vcs/git
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
+SLOT=0
+SRC_URI=https://github.com/stefanha/git-publish/archive/v1.7.0.tar.gz -> git-publish-1.7.0.tar.gz
+_eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	python-single-r1	d3100de905f978df912135806cf27188	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=c837e3ce7ce0a4d4a705bc9e3950d61e
diff --git a/metadata/md5-cache/dev-vcs/git-pw-2.0.0 b/metadata/md5-cache/dev-vcs/git-pw-2.0.0
new file mode 100644
index 000000000000..614c330ce53a
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/git-pw-2.0.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/pbr[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( >=dev-python/mock-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/pytest-6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-cov-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/arrow-0.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/click-8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pbr[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/requests-3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/tabulate-0.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A tool for integrating Git with Patchwork
+EAPI=7
+HOMEPAGE=https://github.com/getpatchwork/git-pw
+IUSE=test python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=>=dev-python/arrow-0.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/click-8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pbr[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/requests-3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/tabulate-0.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/getpatchwork/git-pw/archive/2.0.0.tar.gz -> git-pw-2.0.0.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=67509cecdba99092d0b30561df983162
diff --git a/metadata/md5-cache/mail-client/Manifest.gz b/metadata/md5-cache/mail-client/Manifest.gz
index a1eb06e8399c..3f26a8c15ad9 100644
Binary files a/metadata/md5-cache/mail-client/Manifest.gz and b/metadata/md5-cache/mail-client/Manifest.gz differ
diff --git a/metadata/md5-cache/mail-client/thunderbird-78.8.0 b/metadata/md5-cache/mail-client/thunderbird-78.8.0
deleted file mode 100644
index a6c195e7dd59..000000000000
--- a/metadata/md5-cache/mail-client/thunderbird-78.8.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.9[ncurses,sqlite,ssl] dev-lang/python:3.8[ncurses,sqlite,ssl] dev-lang/python:3.7[ncurses,sqlite,ssl] ) app-arch/unzip app-arch/zip >=dev-util/cbindgen-0.14.3 >=net-libs/nodejs-10.21.0 virtual/pkgconfig >=virtual/rust-1.41.0 || ( ( sys-devel/clang:11 sys-devel/llvm:11 clang? ( =sys-devel/lld-11* pgo? ( =sys-libs/compiler-rt-sanitizers-11*[profile] ) ) ) ( sys-devel/clang:10 sys-devel/llvm:10 clang? ( =sys-devel/lld-10* pgo? ( =sys-libs/compiler-rt-sanitizers-10*[profile] ) ) ) ( sys-devel/clang:9 sys-devel/llvm:9 clang? ( =sys-devel/lld-9* pgo? ( =sys-libs/compiler-rt-sanitizers-9*[profile] ) ) ) ) lto? ( !clang? ( sys-devel/binutils[gold] ) ) amd64? ( >=dev-lang/yasm-1.1 ) x86? ( >=dev-lang/yasm-1.1 ) !system-av1? ( amd64? ( >=dev-lang/nasm-2.13 ) x86? ( >=dev-lang/nasm-2.13 ) ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4 pgo? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
-DEPEND=>=dev-libs/nss-3.53.1 >=dev-libs/nspr-4.25 dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3[X] x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.35:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=dev-libs/libffi-3.0.10:= media-video/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt dbus? ( sys-apps/dbus dev-libs/dbus-glib ) system-av1? ( >=media-libs/dav1d-0.3.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-libs/harfbuzz-2.6.8:0= >=media-gfx/graphite2-1.3.13 ) system-icu? ( >=dev-libs/icu-67.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wifi? ( kernel_linux? ( sys-apps/dbus dev-libs/dbus-glib net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4[sdk] ) ) wayland? ( >=x11-libs/gtk+-3.11:3[wayland] ) amd64? ( virtual/opengl ) x86? ( virtual/opengl ) !!sys-devel/llvm:0 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Thunderbird Mail Client
-EAPI=7
-HOMEPAGE=https://www.mozilla.org/thunderbird
-IUSE=+clang cpu_flags_arm_neon dbus debug eme-free hardened hwaccel jack lto +openh264 pgo pulseaudio selinux +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx +system-webp wayland wifi l10n_af l10n_ar l10n_ast l10n_be l10n_bg l10n_br l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB l10n_es-AR l10n_es-ES l10n_et l10n_eu l10n_fa l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_he l10n_hr l10n_hsb l10n_hu l10n_hy l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_ko l10n_lt l10n_ms l10n_nb l10n_nl l10n_nn l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_sq l10n_sr l10n_sv l10n_th l10n_tr l10n_uz l10n_vi l10n_zh-CN l10n_zh-TW pgo
-KEYWORDS=amd64 ~arm64 ~ppc64 x86
-LICENSE=MPL-2.0 GPL-2 LGPL-2.1
-RDEPEND=>=dev-libs/nss-3.53.1 >=dev-libs/nspr-4.25 dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.4.0:3[X] x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.35:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) virtual/freedesktop-icon-theme >=x11-libs/pixman-0.19.2 >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=dev-libs/libffi-3.0.10:= media-video/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt dbus? ( sys-apps/dbus dev-libs/dbus-glib ) system-av1? ( >=media-libs/dav1d-0.3.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-libs/harfbuzz-2.6.8:0= >=media-gfx/graphite2-1.3.13 ) system-icu? ( >=dev-libs/icu-67.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wifi? ( kernel_linux? ( sys-apps/dbus dev-libs/dbus-glib net-misc/networkmanager ) ) jack? ( virtual/jack ) selinux? ( sec-policy/selinux-mozilla ) jack? ( virtual/jack ) openh264? ( media-libs/openh264:*[plugin] ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4 ) ) selinux? ( sec-policy/selinux-mozilla ) !<x11-plugins/enigmail-2.2
-REQUIRED_USE=wifi? ( dbus )
-SLOT=0/78
-SRC_URI=https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/source/thunderbird-78.8.0.source.tar.xz -> thunderbird-78.8.0.source.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-78esr-patches-10.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-78esr-patches-10.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-78esr-patches-10.tar.xz l10n_af? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/af.xpi -> thunderbird-78.8.0-af.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/ar.xpi -> thunderbird-78.8.0-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/ast.xpi -> thunderbird-78.8.0-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/be.xpi -> thunderbird-78.8.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/bg.xpi -> thunderbird-78.8.0-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/br.xpi -> thunderbird-78.8.0-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/ca.xpi -> thunderbird-78.8.0-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/cak.xpi -> thunderbird-78.8.0-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/cs.xpi -> thunderbird-78.8.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/cy.xpi -> thunderbird-78.8.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/da.xpi -> thunderbird-78.8.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/de.xpi -> thunderbird-78.8.0-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/dsb.xpi -> thunderbird-78.8.0-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/el.xpi -> thunderbird-78.8.0-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/en-CA.xpi -> thunderbird-78.8.0-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/en-GB.xpi -> thunderbird-78.8.0-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/es-AR.xpi -> thunderbird-78.8.0-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/es-ES.xpi -> thunderbird-78.8.0-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/et.xpi -> thunderbird-78.8.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/eu.xpi -> thunderbird-78.8.0-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/fa.xpi -> thunderbird-78.8.0-fa.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/fi.xpi -> thunderbird-78.8.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/fr.xpi -> thunderbird-78.8.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/fy-NL.xpi -> thunderbird-78.8.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/ga-IE.xpi -> thunderbird-78.8.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/gd.xpi -> thunderbird-78.8.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/gl.xpi -> thunderbird-78.8.0-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/he.xpi -> thunderbird-78.8.0-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/hr.xpi -> thunderbird-78.8.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/hsb.xpi -> thunderbird-78.8.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/hu.xpi -> thunderbird-78.8.0-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/hy-AM.xpi -> thunderbird-78.8.0-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/id.xpi -> thunderbird-78.8.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/is.xpi -> thunderbird-78.8.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/it.xpi -> thunderbird-78.8.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/ja.xpi -> thunderbird-78.8.0-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/ka.xpi -> thunderbird-78.8.0-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/kab.xpi -> thunderbird-78.8.0-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/kk.xpi -> thunderbird-78.8.0-kk.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/ko.xpi -> thunderbird-78.8.0-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/lt.xpi -> thunderbird-78.8.0-lt.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/ms.xpi -> thunderbird-78.8.0-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/nb-NO.xpi -> thunderbird-78.8.0-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/nl.xpi -> thunderbird-78.8.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/nn-NO.xpi -> thunderbird-78.8.0-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/pa-IN.xpi -> thunderbird-78.8.0-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/pl.xpi -> thunderbird-78.8.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/pt-BR.xpi -> thunderbird-78.8.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/pt-PT.xpi -> thunderbird-78.8.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/rm.xpi -> thunderbird-78.8.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/ro.xpi -> thunderbird-78.8.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/ru.xpi -> thunderbird-78.8.0-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/si.xpi -> thunderbird-78.8.0-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/sk.xpi -> thunderbird-78.8.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/sl.xpi -> thunderbird-78.8.0-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/sq.xpi -> thunderbird-78.8.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/sr.xpi -> thunderbird-78.8.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/sv-SE.xpi -> thunderbird-78.8.0-sv-SE.xpi ) l10n_th? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/th.xpi -> thunderbird-78.8.0-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/tr.xpi -> thunderbird-78.8.0-tr.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/uz.xpi -> thunderbird-78.8.0-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/vi.xpi -> thunderbird-78.8.0-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/zh-CN.xpi -> thunderbird-78.8.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/zh-TW.xpi -> thunderbird-78.8.0-zh-TW.xpi )
-_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	llvm	96482dd3973a93c32659252dfeba1433	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=594b6c3f347903b9fcac8aaeec362e13
diff --git a/metadata/md5-cache/mail-client/thunderbird-bin-78.8.0 b/metadata/md5-cache/mail-client/thunderbird-bin-78.8.0
deleted file mode 100644
index addfc0450b9a..000000000000
--- a/metadata/md5-cache/mail-client/thunderbird-bin-78.8.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-arch/unzip alsa? ( !pulseaudio? ( dev-util/patchelf ) )
-DEFINED_PHASES=install postinst postrm preinst prepare unpack
-DEPEND=alsa? ( !pulseaudio? ( media-sound/apulse ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Thunderbird Mail Client
-EAPI=7
-HOMEPAGE=https://www.thunderbird.net/
-IUSE=+alsa +ffmpeg +pulseaudio selinux wayland l10n_af l10n_ar l10n_ast l10n_be l10n_bg l10n_br l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB l10n_es-AR l10n_es-ES l10n_et l10n_eu l10n_fa l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_he l10n_hr l10n_hsb l10n_hu l10n_hy l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_ko l10n_lt l10n_ms l10n_nb l10n_nl l10n_nn l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_sq l10n_sr l10n_sv l10n_th l10n_tr l10n_uz l10n_vi l10n_zh-CN l10n_zh-TW
-KEYWORDS=-* amd64 x86
-LICENSE=MPL-2.0 GPL-2 LGPL-2.1
-RDEPEND=alsa? ( !pulseaudio? ( media-sound/apulse ) ) dev-libs/atk dev-libs/dbus-glib >=dev-libs/glib-2.26:2 media-libs/fontconfig >=media-libs/freetype-2.4.10 sys-apps/dbus virtual/freedesktop-icon-theme >=x11-libs/cairo-1.10[X] x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.18:2 >=x11-libs/gtk+-3.11:3[wayland?] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt >=x11-libs/pango-1.22.0 ffmpeg? ( media-video/ffmpeg ) pulseaudio? ( media-sound/pulseaudio ) selinux? ( sec-policy/selinux-mozilla )
-RESTRICT=strip
-SLOT=0/78
-SRC_URI=amd64? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/en-US/thunderbird-78.8.0.tar.bz2 -> thunderbird-bin_x86_64-78.8.0.tar.bz2 ) x86? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/en-US/thunderbird-78.8.0.tar.bz2 -> thunderbird-bin_i686-78.8.0.tar.bz2 ) l10n_af? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/af.xpi -> thunderbird-78.8.0-af.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/ar.xpi -> thunderbird-78.8.0-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/ast.xpi -> thunderbird-78.8.0-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/be.xpi -> thunderbird-78.8.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/bg.xpi -> thunderbird-78.8.0-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/br.xpi -> thunderbird-78.8.0-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/ca.xpi -> thunderbird-78.8.0-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/cak.xpi -> thunderbird-78.8.0-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/cs.xpi -> thunderbird-78.8.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/cy.xpi -> thunderbird-78.8.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/da.xpi -> thunderbird-78.8.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/de.xpi -> thunderbird-78.8.0-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/dsb.xpi -> thunderbird-78.8.0-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/el.xpi -> thunderbird-78.8.0-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/en-CA.xpi -> thunderbird-78.8.0-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/en-GB.xpi -> thunderbird-78.8.0-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/es-AR.xpi -> thunderbird-78.8.0-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/es-ES.xpi -> thunderbird-78.8.0-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/et.xpi -> thunderbird-78.8.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/eu.xpi -> thunderbird-78.8.0-eu.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/fa.xpi -> thunderbird-78.8.0-fa.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/fi.xpi -> thunderbird-78.8.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/fr.xpi -> thunderbird-78.8.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/fy-NL.xpi -> thunderbird-78.8.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/ga-IE.xpi -> thunderbird-78.8.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/gd.xpi -> thunderbird-78.8.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/gl.xpi -> thunderbird-78.8.0-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/he.xpi -> thunderbird-78.8.0-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/hr.xpi -> thunderbird-78.8.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/hsb.xpi -> thunderbird-78.8.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/hu.xpi -> thunderbird-78.8.0-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/hy-AM.xpi -> thunderbird-78.8.0-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/id.xpi -> thunderbird-78.8.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/is.xpi -> thunderbird-78.8.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/it.xpi -> thunderbird-78.8.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/ja.xpi -> thunderbird-78.8.0-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/ka.xpi -> thunderbird-78.8.0-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/kab.xpi -> thunderbird-78.8.0-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/kk.xpi -> thunderbird-78.8.0-kk.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/ko.xpi -> thunderbird-78.8.0-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/lt.xpi -> thunderbird-78.8.0-lt.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/ms.xpi -> thunderbird-78.8.0-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/nb-NO.xpi -> thunderbird-78.8.0-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/nl.xpi -> thunderbird-78.8.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/nn-NO.xpi -> thunderbird-78.8.0-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/pa-IN.xpi -> thunderbird-78.8.0-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/pl.xpi -> thunderbird-78.8.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/pt-BR.xpi -> thunderbird-78.8.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/pt-PT.xpi -> thunderbird-78.8.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/rm.xpi -> thunderbird-78.8.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/ro.xpi -> thunderbird-78.8.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/ru.xpi -> thunderbird-78.8.0-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/si.xpi -> thunderbird-78.8.0-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/sk.xpi -> thunderbird-78.8.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/sl.xpi -> thunderbird-78.8.0-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/sq.xpi -> thunderbird-78.8.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/sr.xpi -> thunderbird-78.8.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/sv-SE.xpi -> thunderbird-78.8.0-sv-SE.xpi ) l10n_th? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/th.xpi -> thunderbird-78.8.0-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/tr.xpi -> thunderbird-78.8.0-tr.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/uz.xpi -> thunderbird-78.8.0-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/vi.xpi -> thunderbird-78.8.0-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/zh-CN.xpi -> thunderbird-78.8.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/xpi/zh-TW.xpi -> thunderbird-78.8.0-zh-TW.xpi )
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f99471bb6728676b111bc3ac979c4665
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index e298a720e02e..f772eab1e288 100644
Binary files a/metadata/md5-cache/media-gfx/Manifest.gz and b/metadata/md5-cache/media-gfx/Manifest.gz differ
diff --git a/metadata/md5-cache/media-gfx/chafa-1.6.0 b/metadata/md5-cache/media-gfx/chafa-1.6.0
index e04b73907c49..14c064153032 100644
--- a/metadata/md5-cache/media-gfx/chafa-1.6.0
+++ b/metadata/md5-cache/media-gfx/chafa-1.6.0
@@ -5,9 +5,9 @@ DESCRIPTION=versatile and fast Unicode/ASCII/ANSI graphics renderer
 EAPI=7
 HOMEPAGE=https://hpjansson.org/chafa/ https://github.com/hpjansson/chafa
 IUSE=+tools
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 arm64 x86
 LICENSE=LGPL-3+
 RDEPEND=dev-libs/glib:2 media-gfx/imagemagick:0= tools? ( >=media-libs/freetype-2.0.0 )
 SLOT=0
 SRC_URI=https://hpjansson.org/chafa/releases/chafa-1.6.0.tar.xz
-_md5_=8523f8d920bd962b01ecc528324b3f95
+_md5_=6c3828484f595999fb263dfe7ee58fd9
diff --git a/metadata/md5-cache/media-gfx/frogr-1.5 b/metadata/md5-cache/media-gfx/frogr-1.5
index cdcf2c2968f2..3e561f006c06 100644
--- a/metadata/md5-cache/media-gfx/frogr-1.5
+++ b/metadata/md5-cache/media-gfx/frogr-1.5
@@ -9,4 +9,4 @@ RDEPEND=>=dev-libs/glib-2.44:2 >=dev-libs/json-glib-1.2 >=x11-libs/gtk+-3.16:3[i
 SLOT=0
 SRC_URI=mirror://gnome/sources/frogr/1.5/frogr-1.5.tar.xz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	meson	e43eef9331f54965a573ed380854ff47	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	d3fb3ba33acc3bbbdc4d7970227c100d	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d0869a70de2179570154ac2a5b5388a7
+_md5_=6d6f71e0f821970092d015820c81a73a
diff --git a/metadata/md5-cache/media-gfx/gmic-2.9.6 b/metadata/md5-cache/media-gfx/gmic-2.9.6
new file mode 100644
index 000000000000..d137b0f4cc2d
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/gmic-2.9.6
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare pretend test
+DEPEND=curl? ( net-misc/curl ) fftw? ( sci-libs/fftw:3.0=[threads] ) gimp? ( media-gfx/gimp:0/2 >=dev-qt/qtcore-5.2.0:5= >=dev-qt/qtgui-5.2.0:5= >=dev-qt/qtnetwork-5.2.0:5= >=dev-qt/qtwidgets-5.2.0:5= ) graphicsmagick? ( media-gfx/graphicsmagick:0= ) jpeg? ( virtual/jpeg:0 ) krita? ( >=dev-qt/qtcore-5.2.0:5= >=dev-qt/qtgui-5.2.0:5= >=dev-qt/qtnetwork-5.2.0:5= >=dev-qt/qtwidgets-5.2.0:5= ) opencv? ( >=media-libs/opencv-2.3.1a-r1:0= ) openexr? ( media-libs/ilmbase:0= media-libs/openexr:0= ) png? ( media-libs/libpng:0= ) qt5? ( >=dev-qt/qtcore-5.2.0:5= >=dev-qt/qtgui-5.2.0:5= >=dev-qt/qtnetwork-5.2.0:5= >=dev-qt/qtwidgets-5.2.0:5= ) tiff? ( media-libs/tiff:0 ) X? ( x11-libs/libX11 x11-libs/libXext ) zlib? ( sys-libs/zlib:0= ) gimp? ( dev-qt/linguist-tools ) krita? ( dev-qt/linguist-tools ) qt5? ( dev-qt/linguist-tools )
+DESCRIPTION=GREYC's Magic Image Converter
+EAPI=7
+HOMEPAGE=https://gmic.eu/ https://github.com/dtschump/gmic
+IUSE=cli curl ffmpeg fftw gimp graphicsmagick jpeg krita opencv openexr openmp png qt5 static-libs tiff X zlib
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=CeCILL-2 GPL-3
+RDEPEND=curl? ( net-misc/curl ) fftw? ( sci-libs/fftw:3.0=[threads] ) gimp? ( media-gfx/gimp:0/2 >=dev-qt/qtcore-5.2.0:5= >=dev-qt/qtgui-5.2.0:5= >=dev-qt/qtnetwork-5.2.0:5= >=dev-qt/qtwidgets-5.2.0:5= ) graphicsmagick? ( media-gfx/graphicsmagick:0= ) jpeg? ( virtual/jpeg:0 ) krita? ( >=dev-qt/qtcore-5.2.0:5= >=dev-qt/qtgui-5.2.0:5= >=dev-qt/qtnetwork-5.2.0:5= >=dev-qt/qtwidgets-5.2.0:5= ) opencv? ( >=media-libs/opencv-2.3.1a-r1:0= ) openexr? ( media-libs/ilmbase:0= media-libs/openexr:0= ) png? ( media-libs/libpng:0= ) qt5? ( >=dev-qt/qtcore-5.2.0:5= >=dev-qt/qtgui-5.2.0:5= >=dev-qt/qtnetwork-5.2.0:5= >=dev-qt/qtwidgets-5.2.0:5= ) tiff? ( media-libs/tiff:0 ) X? ( x11-libs/libX11 x11-libs/libXext ) zlib? ( sys-libs/zlib:0= ) ffmpeg? ( media-video/ffmpeg:0= )
+REQUIRED_USE=gimp? ( png zlib fftw X ) krita? ( png zlib fftw X ) qt5? ( png zlib fftw X )
+SLOT=0
+SRC_URI=https://gmic.eu/files/source/gmic_2.9.6.tar.gz
+_eclasses_=bash-completion-r1	be99724bde4274de21e581204e9d164a	cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9c3260cc9a0b364c5b0a4e348a3f34b3
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index fd69a97740ce..846eeed45ffc 100644
Binary files a/metadata/md5-cache/media-libs/Manifest.gz and b/metadata/md5-cache/media-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/media-libs/libdca-0.0.7 b/metadata/md5-cache/media-libs/libdca-0.0.7
index 790b761cbba5..42888075637f 100644
--- a/metadata/md5-cache/media-libs/libdca-0.0.7
+++ b/metadata/md5-cache/media-libs/libdca-0.0.7
@@ -9,4 +9,4 @@ LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://www.videolan.org/pub/videolan/libdca/0.0.7/libdca-0.0.7.tar.bz2
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=53452bf36a50faa3a268c893f1720162
+_md5_=7eaae72c40fe69b5178ed4dcf538ab40
diff --git a/metadata/md5-cache/media-libs/portaudio-19.06.00-r3 b/metadata/md5-cache/media-libs/portaudio-19.06.00-r3
index 194a3b278898..8fa7af3faef1 100644
--- a/metadata/md5-cache/media-libs/portaudio-19.06.00-r3
+++ b/metadata/md5-cache/media-libs/portaudio-19.06.00-r3
@@ -11,4 +11,4 @@ RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi
 SLOT=0
 SRC_URI=http://www.portaudio.com/archives/pa_stable_v190600_20161030.tgz https://sources.debian.org/data/main/p/portaudio19/19.6.0-1/debian/patches/audacity-portmixer.patch -> portaudio-19.06.00-audacity-portmixer.patch
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=a852bd0acb11f54df51c235635eb28da
+_md5_=97579cee7604e0aeddae405eca790920
diff --git a/metadata/md5-cache/media-plugins/Manifest.gz b/metadata/md5-cache/media-plugins/Manifest.gz
index 2f4f898ac7cb..66cf98d42c62 100644
Binary files a/metadata/md5-cache/media-plugins/Manifest.gz and b/metadata/md5-cache/media-plugins/Manifest.gz differ
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-7.3.3 b/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-7.3.3
deleted file mode 100644
index 6f4138285c3f..000000000000
--- a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-7.3.3
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==media-tv/kodi-19* dev-libs/tinyxml dev-cpp/nlohmann_json
-DESCRIPTION=Kodi's VuPlus client addon
-EAPI=7
-HOMEPAGE=https://github.com/kodi-pvr/pvr.vuplus
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND==media-tv/kodi-19* dev-libs/tinyxml dev-cpp/nlohmann_json
-SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.vuplus/archive/7.3.3-Matrix.tar.gz -> kodi-pvr-vuplus-7.3.3.tar.gz
-_eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=aec77f31d984481de32e11d2cd9fd151
diff --git a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-7.4.0 b/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-7.4.1
similarity index 89%
rename from metadata/md5-cache/media-plugins/kodi-pvr-vuplus-7.4.0
rename to metadata/md5-cache/media-plugins/kodi-pvr-vuplus-7.4.1
index 53b98d384049..cd433992d5b1 100644
--- a/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-7.4.0
+++ b/metadata/md5-cache/media-plugins/kodi-pvr-vuplus-7.4.1
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND==media-tv/kodi-19* dev-libs/tinyxml dev-cpp/nlohmann_json
 SLOT=0
-SRC_URI=https://github.com/kodi-pvr/pvr.vuplus/archive/7.4.0-Matrix.tar.gz -> kodi-pvr-vuplus-7.4.0.tar.gz
+SRC_URI=https://github.com/kodi-pvr/pvr.vuplus/archive/7.4.1-Matrix.tar.gz -> kodi-pvr-vuplus-7.4.1.tar.gz
 _eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	kodi-addon	1be83fd24fef6d1c905c588b9a2c22de	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=aec77f31d984481de32e11d2cd9fd151
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index 4e3658c2d30f..59c27231b1e0 100644
Binary files a/metadata/md5-cache/net-analyzer/Manifest.gz and b/metadata/md5-cache/net-analyzer/Manifest.gz differ
diff --git a/metadata/md5-cache/net-analyzer/hydra-9.2 b/metadata/md5-cache/net-analyzer/hydra-9.2
index afaf3ef76383..9401aef13246 100644
--- a/metadata/md5-cache/net-analyzer/hydra-9.2
+++ b/metadata/md5-cache/net-analyzer/hydra-9.2
@@ -11,4 +11,4 @@ RDEPEND=gtk? ( dev-libs/atk dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:
 SLOT=0
 SRC_URI=https://github.com/vanhauser-thc/thc-hydra/archive/v9.2.tar.gz -> hydra-9.2.tar.gz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=8393228f2380561eb10a17a4ce8af57c
+_md5_=644ffe1bdbe477b23542fa2db9d7a510
diff --git a/metadata/md5-cache/net-analyzer/hydra-9999999 b/metadata/md5-cache/net-analyzer/hydra-9999999
index 063d6cde678b..c4ec91f6701e 100644
--- a/metadata/md5-cache/net-analyzer/hydra-9999999
+++ b/metadata/md5-cache/net-analyzer/hydra-9999999
@@ -10,4 +10,4 @@ PROPERTIES=live
 RDEPEND=gtk? ( dev-libs/atk dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 ) firebird? ( dev-db/firebird ) gcrypt? ( dev-libs/libgcrypt ) idn? ( net-dns/libidn:0= ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) memcached? ( dev-libs/libmemcached[sasl] ) mongodb? ( dev-libs/mongo-c-driver ) mysql? ( dev-db/mysql-connector-c:0= ) ncurses? ( sys-libs/ncurses:= ) oracle? ( dev-db/oracle-instantclient-basic ) pcre? ( dev-libs/libpcre ) postgres? ( dev-db/postgresql:* ) rdp? ( net-misc/freerdp ) libssh? ( >=net-libs/libssh-0.4.0 ) subversion? ( dev-vcs/subversion ) zlib? ( sys-libs/zlib )
 SLOT=0
 _eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=a830f5044ee19fa04e6556e25791113a
+_md5_=b00cb8d403dec2554eccf6913ce3dbe9
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index 15b5ba69f800..9718a5de8e7c 100644
Binary files a/metadata/md5-cache/net-dns/Manifest.gz and b/metadata/md5-cache/net-dns/Manifest.gz differ
diff --git a/metadata/md5-cache/net-dns/dnsviz-0.9.3 b/metadata/md5-cache/net-dns/dnsviz-0.9.3
new file mode 100644
index 000000000000..1d3eb14728e2
--- /dev/null
+++ b/metadata/md5-cache/net-dns/dnsviz-0.9.3
@@ -0,0 +1,16 @@
+BDEPEND=test? ( net-dns/bind ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=>=dev-python/dnspython-1.13[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/m2crypto-0.37.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pygraphviz-1.3.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DESCRIPTION=Tool suite for analysis and visualization of DNS and DNSSEC
+EAPI=7
+HOMEPAGE=https://dnsviz.net/
+IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-python/dnspython-1.13[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/m2crypto-0.37.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pygraphviz-1.3.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/dnsviz/dnsviz/archive/v0.9.3.tar.gz -> dnsviz-0.9.3.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	optfeature	6a2add34e06e5a05d88471a33ccdd73e	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=3b328bdff4c763b4e144e09616f129e9
diff --git a/metadata/md5-cache/net-mail/Manifest.gz b/metadata/md5-cache/net-mail/Manifest.gz
index 5a134cc6e142..88ee66abdb1c 100644
Binary files a/metadata/md5-cache/net-mail/Manifest.gz and b/metadata/md5-cache/net-mail/Manifest.gz differ
diff --git a/metadata/md5-cache/net-mail/rss2email-3.12.3 b/metadata/md5-cache/net-mail/rss2email-3.12.3
new file mode 100644
index 000000000000..1328a97940a6
--- /dev/null
+++ b/metadata/md5-cache/net-mail/rss2email-3.12.3
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=<dev-python/feedparser-6[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/html2text-3.01[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DESCRIPTION=A python script that converts RSS/Atom newsfeeds to email
+EAPI=7
+HOMEPAGE=https://github.com/rss2email/rss2email
+IUSE=python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 )
+RDEPEND=<dev-python/feedparser-6[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/html2text-3.01[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
+SLOT=0
+SRC_URI=https://github.com/rss2email/rss2email/archive/v3.12.3.tar.gz -> rss2email-3.12.3.tar.gz
+_eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=f6fc3c074abd888138e554cf8a55502d
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 343b4465b4c0..cba6eb326875 100644
Binary files a/metadata/md5-cache/net-misc/Manifest.gz and b/metadata/md5-cache/net-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/net-misc/asterisk-13.38.1-r2 b/metadata/md5-cache/net-misc/asterisk-13.38.1-r2
index 62de66d8646f..a6f8142996e0 100644
--- a/metadata/md5-cache/net-misc/asterisk-13.38.1-r2
+++ b/metadata/md5-cache/net-misc/asterisk-13.38.1-r2
@@ -1,10 +1,10 @@
-BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+BDEPEND=dev-libs/libxml2:2 virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst prepare pretend setup
 DEPEND=acct-user/asterisk acct-group/asterisk dev-db/sqlite:3 dev-libs/popt dev-libs/jansson dev-libs/libedit dev-libs/libxml2:2 dev-libs/libxslt sys-libs/ncurses:0= sys-libs/zlib alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez:= ) calendar? ( net-libs/neon:= dev-libs/libical:= dev-libs/iksemel ) caps? ( sys-libs/libcap ) blocks? ( sys-libs/blocksruntime ) cluster? ( sys-cluster/corosync ) curl? ( net-misc/curl ) dahdi? ( net-libs/libpri net-misc/dahdi-tools ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.6 ) iconv? ( virtual/libiconv ) ilbc? ( media-libs/libilbc ) ldap? ( net-nds/openldap ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) mysql? ( dev-db/mysql-connector-c:= ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) pjproject? ( net-libs/pjproject ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql:* ) radius? ( net-dialup/freeradius-client ) snmp? ( net-analyzer/net-snmp:= ) span? ( media-libs/spandsp ) speex? ( media-libs/libogg media-libs/speex media-libs/speexdsp ) srtp? ( net-libs/libsrtp:0 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) vorbis? ( media-libs/libogg media-libs/libvorbis ) voicemail_storage_imap? ( virtual/imap-c-client ) xmpp? ( dev-libs/iksemel )
 DESCRIPTION=Asterisk: A Modular Open Source PBX System
 EAPI=7
 HOMEPAGE=https://www.asterisk.org/
-IUSE=voicemail_storage_file voicemail_storage_odbc voicemail_storage_imap alsa blocks bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc ldap libressl lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog vorbis xmpp kernel_linux lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4
+IUSE=+voicemail_storage_file voicemail_storage_odbc voicemail_storage_imap alsa blocks bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc ldap libressl lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog vorbis xmpp kernel_linux lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4
 KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=acct-user/asterisk acct-group/asterisk dev-db/sqlite:3 dev-libs/popt dev-libs/jansson dev-libs/libedit dev-libs/libxml2:2 dev-libs/libxslt sys-libs/ncurses:0= sys-libs/zlib alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez:= ) calendar? ( net-libs/neon:= dev-libs/libical:= dev-libs/iksemel ) caps? ( sys-libs/libcap ) blocks? ( sys-libs/blocksruntime ) cluster? ( sys-cluster/corosync ) curl? ( net-misc/curl ) dahdi? ( net-libs/libpri net-misc/dahdi-tools ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.6 ) iconv? ( virtual/libiconv ) ilbc? ( media-libs/libilbc ) ldap? ( net-nds/openldap ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) mysql? ( dev-db/mysql-connector-c:= ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) pjproject? ( net-libs/pjproject ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql:* ) radius? ( net-dialup/freeradius-client ) snmp? ( net-analyzer/net-snmp:= ) span? ( media-libs/spandsp ) speex? ( media-libs/libogg media-libs/speex media-libs/speexdsp ) srtp? ( net-libs/libsrtp:0 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) vorbis? ( media-libs/libogg media-libs/libvorbis ) voicemail_storage_imap? ( virtual/imap-c-client ) xmpp? ( dev-libs/iksemel ) net-misc/asterisk-core-sounds net-misc/asterisk-extra-sounds net-misc/asterisk-moh-opsound selinux? ( sec-policy/selinux-asterisk ) syslog? ( virtual/logger ) virtual/tmpfiles
@@ -12,4 +12,4 @@ REQUIRED_USE=gtalk? ( xmpp ) lua? ( ^^ ( lua_single_target_lua5-1 lua_single_tar
 SLOT=0/13
 SRC_URI=https://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-13.38.1.tar.gz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	dc8e4917d734a019caa04ad3b8db560b	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=b84ba5a61920e5a7e289c68bdb7d7431
+_md5_=8e8593c676c217aad2e80bf558b33265
diff --git a/metadata/md5-cache/net-misc/asterisk-13.38.2 b/metadata/md5-cache/net-misc/asterisk-13.38.2
index f0f8de652cc2..2d165f2b7a9c 100644
--- a/metadata/md5-cache/net-misc/asterisk-13.38.2
+++ b/metadata/md5-cache/net-misc/asterisk-13.38.2
@@ -1,10 +1,10 @@
-BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+BDEPEND=dev-libs/libxml2:2 virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst prepare pretend setup
 DEPEND=acct-user/asterisk acct-group/asterisk dev-db/sqlite:3 dev-libs/popt dev-libs/jansson dev-libs/libedit dev-libs/libxml2:2 dev-libs/libxslt sys-libs/ncurses:0= sys-libs/zlib alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez:= ) calendar? ( net-libs/neon:= dev-libs/libical:= dev-libs/iksemel ) caps? ( sys-libs/libcap ) blocks? ( sys-libs/blocksruntime ) cluster? ( sys-cluster/corosync ) curl? ( net-misc/curl ) dahdi? ( net-libs/libpri net-misc/dahdi-tools ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.6 ) iconv? ( virtual/libiconv ) ilbc? ( media-libs/libilbc ) ldap? ( net-nds/openldap ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) mysql? ( dev-db/mysql-connector-c:= ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) pjproject? ( net-libs/pjproject ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql:* ) radius? ( net-dialup/freeradius-client ) snmp? ( net-analyzer/net-snmp:= ) span? ( media-libs/spandsp ) speex? ( media-libs/libogg media-libs/speex media-libs/speexdsp ) srtp? ( net-libs/libsrtp:0 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) vorbis? ( media-libs/libogg media-libs/libvorbis ) voicemail_storage_imap? ( virtual/imap-c-client ) xmpp? ( dev-libs/iksemel )
 DESCRIPTION=Asterisk: A Modular Open Source PBX System
 EAPI=7
 HOMEPAGE=https://www.asterisk.org/
-IUSE=voicemail_storage_file voicemail_storage_odbc voicemail_storage_imap alsa blocks bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc ldap libressl lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog vorbis xmpp kernel_linux lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4
+IUSE=+voicemail_storage_file voicemail_storage_odbc voicemail_storage_imap alsa blocks bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc ldap libressl lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog vorbis xmpp kernel_linux lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=acct-user/asterisk acct-group/asterisk dev-db/sqlite:3 dev-libs/popt dev-libs/jansson dev-libs/libedit dev-libs/libxml2:2 dev-libs/libxslt sys-libs/ncurses:0= sys-libs/zlib alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez:= ) calendar? ( net-libs/neon:= dev-libs/libical:= dev-libs/iksemel ) caps? ( sys-libs/libcap ) blocks? ( sys-libs/blocksruntime ) cluster? ( sys-cluster/corosync ) curl? ( net-misc/curl ) dahdi? ( net-libs/libpri net-misc/dahdi-tools ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.6 ) iconv? ( virtual/libiconv ) ilbc? ( media-libs/libilbc ) ldap? ( net-nds/openldap ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) mysql? ( dev-db/mysql-connector-c:= ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) pjproject? ( net-libs/pjproject ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql:* ) radius? ( net-dialup/freeradius-client ) snmp? ( net-analyzer/net-snmp:= ) span? ( media-libs/spandsp ) speex? ( media-libs/libogg media-libs/speex media-libs/speexdsp ) srtp? ( net-libs/libsrtp:0 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) vorbis? ( media-libs/libogg media-libs/libvorbis ) voicemail_storage_imap? ( virtual/imap-c-client ) xmpp? ( dev-libs/iksemel ) net-misc/asterisk-core-sounds net-misc/asterisk-extra-sounds net-misc/asterisk-moh-opsound selinux? ( sec-policy/selinux-asterisk ) syslog? ( virtual/logger ) virtual/tmpfiles
@@ -12,4 +12,4 @@ REQUIRED_USE=gtalk? ( xmpp ) lua? ( ^^ ( lua_single_target_lua5-1 lua_single_tar
 SLOT=0/13
 SRC_URI=https://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-13.38.2.tar.gz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	dc8e4917d734a019caa04ad3b8db560b	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=f2718016a9819299cdab9a72201a7e1e
+_md5_=6328b70429a13f2eceea81c10f4d65bb
diff --git a/metadata/md5-cache/net-misc/asterisk-13.38.2-r1 b/metadata/md5-cache/net-misc/asterisk-13.38.2-r1
new file mode 100644
index 000000000000..90503d1000ae
--- /dev/null
+++ b/metadata/md5-cache/net-misc/asterisk-13.38.2-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-libs/libxml2:2 virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare pretend setup
+DEPEND=acct-user/asterisk acct-group/asterisk dev-db/sqlite:3 dev-libs/popt dev-libs/jansson dev-libs/libedit dev-libs/libxml2:2 dev-libs/libxslt sys-libs/zlib alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez:= ) calendar? ( net-libs/neon:= dev-libs/libical:= dev-libs/iksemel ) caps? ( sys-libs/libcap ) blocks? ( sys-libs/blocksruntime ) cluster? ( sys-cluster/corosync ) curl? ( net-misc/curl ) dahdi? ( net-libs/libpri net-misc/dahdi-tools ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.6 ) iconv? ( virtual/libiconv ) ilbc? ( media-libs/libilbc ) ldap? ( net-nds/openldap ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) mysql? ( dev-db/mysql-connector-c:= ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) pjproject? ( net-libs/pjproject:= ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql:* ) radius? ( net-dialup/freeradius-client ) snmp? ( net-analyzer/net-snmp:= ) span? ( media-libs/spandsp ) speex? ( media-libs/speex media-libs/speexdsp ) srtp? ( net-libs/libsrtp:0 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) systemd? ( sys-apps/systemd ) !systemd? ( !sys-apps/systemd ) vorbis? ( media-libs/libogg media-libs/libvorbis ) voicemail_storage_imap? ( virtual/imap-c-client ) xmpp? ( dev-libs/iksemel )
+DESCRIPTION=Asterisk: A Modular Open Source PBX System
+EAPI=7
+HOMEPAGE=https://www.asterisk.org/
+IUSE=+voicemail_storage_file voicemail_storage_odbc voicemail_storage_imap alsa blocks bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc ldap libressl lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog systemd vorbis xmpp kernel_linux lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=acct-user/asterisk acct-group/asterisk dev-db/sqlite:3 dev-libs/popt dev-libs/jansson dev-libs/libedit dev-libs/libxml2:2 dev-libs/libxslt sys-libs/zlib alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez:= ) calendar? ( net-libs/neon:= dev-libs/libical:= dev-libs/iksemel ) caps? ( sys-libs/libcap ) blocks? ( sys-libs/blocksruntime ) cluster? ( sys-cluster/corosync ) curl? ( net-misc/curl ) dahdi? ( net-libs/libpri net-misc/dahdi-tools ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.6 ) iconv? ( virtual/libiconv ) ilbc? ( media-libs/libilbc ) ldap? ( net-nds/openldap ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) mysql? ( dev-db/mysql-connector-c:= ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) pjproject? ( net-libs/pjproject:= ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql:* ) radius? ( net-dialup/freeradius-client ) snmp? ( net-analyzer/net-snmp:= ) span? ( media-libs/spandsp ) speex? ( media-libs/speex media-libs/speexdsp ) srtp? ( net-libs/libsrtp:0 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) systemd? ( sys-apps/systemd ) !systemd? ( !sys-apps/systemd ) vorbis? ( media-libs/libogg media-libs/libvorbis ) voicemail_storage_imap? ( virtual/imap-c-client ) xmpp? ( dev-libs/iksemel ) net-misc/asterisk-core-sounds net-misc/asterisk-extra-sounds net-misc/asterisk-moh-opsound selinux? ( sec-policy/selinux-asterisk ) syslog? ( virtual/logger ) virtual/tmpfiles
+REQUIRED_USE=gtalk? ( xmpp ) lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) ^^ ( voicemail_storage_file voicemail_storage_odbc voicemail_storage_imap ) voicemail_storage_odbc? ( odbc )
+SLOT=0/13
+SRC_URI=https://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-13.38.2.tar.gz
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	dc8e4917d734a019caa04ad3b8db560b	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=1f599577d1d07c53ae87ffcd3a39cdc4
diff --git a/metadata/md5-cache/net-misc/asterisk-16.16.2 b/metadata/md5-cache/net-misc/asterisk-16.16.2
index bfaac70d2c31..1910447d78b3 100644
--- a/metadata/md5-cache/net-misc/asterisk-16.16.2
+++ b/metadata/md5-cache/net-misc/asterisk-16.16.2
@@ -1,10 +1,10 @@
-BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+BDEPEND=dev-libs/libxml2:2 virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst prepare pretend setup
 DEPEND=acct-user/asterisk acct-group/asterisk dev-db/sqlite:3 dev-libs/popt >=dev-libs/jansson-2.11 dev-libs/libedit dev-libs/libxml2:2 dev-libs/libxslt sys-apps/util-linux sys-libs/ncurses:0= sys-libs/zlib alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez:= ) calendar? ( net-libs/neon:= dev-libs/libical:= dev-libs/iksemel ) caps? ( sys-libs/libcap ) blocks? ( sys-libs/blocksruntime ) cluster? ( sys-cluster/corosync ) codec2? ( media-libs/codec2:= ) curl? ( net-misc/curl ) dahdi? ( net-libs/libpri net-misc/dahdi-tools ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.6 ) iconv? ( virtual/libiconv ) ilbc? ( media-libs/libilbc ) ldap? ( net-nds/openldap ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) mysql? ( dev-db/mysql-connector-c:= ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) pjproject? ( >=net-libs/pjproject-2.9 ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql:* ) radius? ( net-dialup/freeradius-client ) snmp? ( net-analyzer/net-snmp:= ) span? ( media-libs/spandsp ) speex? ( media-libs/libogg media-libs/speex media-libs/speexdsp ) srtp? ( net-libs/libsrtp:0 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) unbound? ( net-dns/unbound ) vorbis? ( media-libs/libogg media-libs/libvorbis ) voicemail_storage_imap? ( virtual/imap-c-client ) xmpp? ( dev-libs/iksemel )
 DESCRIPTION=Asterisk: A Modular Open Source PBX System
 EAPI=7
 HOMEPAGE=https://www.asterisk.org/
-IUSE=voicemail_storage_file voicemail_storage_odbc voicemail_storage_imap alsa blocks bluetooth calendar +caps cluster codec2 curl dahdi debug doc freetds gtalk http iconv ilbc ldap libressl lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog unbound vorbis xmpp kernel_linux lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4
+IUSE=+voicemail_storage_file voicemail_storage_odbc voicemail_storage_imap alsa blocks bluetooth calendar +caps cluster codec2 curl dahdi debug doc freetds gtalk http iconv ilbc ldap libressl lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog unbound vorbis xmpp kernel_linux lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=acct-user/asterisk acct-group/asterisk dev-db/sqlite:3 dev-libs/popt >=dev-libs/jansson-2.11 dev-libs/libedit dev-libs/libxml2:2 dev-libs/libxslt sys-apps/util-linux sys-libs/ncurses:0= sys-libs/zlib alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez:= ) calendar? ( net-libs/neon:= dev-libs/libical:= dev-libs/iksemel ) caps? ( sys-libs/libcap ) blocks? ( sys-libs/blocksruntime ) cluster? ( sys-cluster/corosync ) codec2? ( media-libs/codec2:= ) curl? ( net-misc/curl ) dahdi? ( net-libs/libpri net-misc/dahdi-tools ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.6 ) iconv? ( virtual/libiconv ) ilbc? ( media-libs/libilbc ) ldap? ( net-nds/openldap ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) mysql? ( dev-db/mysql-connector-c:= ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) pjproject? ( >=net-libs/pjproject-2.9 ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql:* ) radius? ( net-dialup/freeradius-client ) snmp? ( net-analyzer/net-snmp:= ) span? ( media-libs/spandsp ) speex? ( media-libs/libogg media-libs/speex media-libs/speexdsp ) srtp? ( net-libs/libsrtp:0 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) unbound? ( net-dns/unbound ) vorbis? ( media-libs/libogg media-libs/libvorbis ) voicemail_storage_imap? ( virtual/imap-c-client ) xmpp? ( dev-libs/iksemel ) net-misc/asterisk-core-sounds net-misc/asterisk-extra-sounds net-misc/asterisk-moh-opsound selinux? ( sec-policy/selinux-asterisk ) syslog? ( virtual/logger ) virtual/tmpfiles
@@ -12,4 +12,4 @@ REQUIRED_USE=gtalk? ( xmpp ) lua? ( ^^ ( lua_single_target_lua5-1 lua_single_tar
 SLOT=0/16
 SRC_URI=https://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-16.16.2.tar.gz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	dc8e4917d734a019caa04ad3b8db560b	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=16f74c2018514c0c659e3679230880bd
+_md5_=164d62bb7731371b24a2730c6205a67c
diff --git a/metadata/md5-cache/net-misc/asterisk-16.16.2-r1 b/metadata/md5-cache/net-misc/asterisk-16.16.2-r1
new file mode 100644
index 000000000000..5b6acb48cb39
--- /dev/null
+++ b/metadata/md5-cache/net-misc/asterisk-16.16.2-r1
@@ -0,0 +1,15 @@
+BDEPEND=dev-libs/libxml2:2 virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare pretend setup
+DEPEND=acct-user/asterisk acct-group/asterisk dev-db/sqlite:3 dev-libs/popt >=dev-libs/jansson-2.11 dev-libs/libedit dev-libs/libxml2:2 dev-libs/libxslt sys-apps/util-linux sys-libs/zlib alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez:= ) calendar? ( net-libs/neon:= dev-libs/libical:= dev-libs/iksemel ) caps? ( sys-libs/libcap ) blocks? ( sys-libs/blocksruntime ) cluster? ( sys-cluster/corosync ) codec2? ( media-libs/codec2:= ) curl? ( net-misc/curl ) dahdi? ( net-libs/libpri net-misc/dahdi-tools ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.6 ) iconv? ( virtual/libiconv ) ilbc? ( media-libs/libilbc ) ldap? ( net-nds/openldap ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) mysql? ( dev-db/mysql-connector-c:= ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) pjproject? ( >=net-libs/pjproject-2.9:= ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql:* ) radius? ( net-dialup/freeradius-client ) snmp? ( net-analyzer/net-snmp:= ) span? ( media-libs/spandsp ) speex? ( media-libs/libogg media-libs/speex media-libs/speexdsp ) srtp? ( net-libs/libsrtp:0 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) systemd? ( sys-apps/systemd ) !systemd? ( !sys-apps/systemd ) unbound? ( net-dns/unbound ) vorbis? ( media-libs/libogg media-libs/libvorbis ) voicemail_storage_imap? ( virtual/imap-c-client ) xmpp? ( dev-libs/iksemel )
+DESCRIPTION=Asterisk: A Modular Open Source PBX System
+EAPI=7
+HOMEPAGE=https://www.asterisk.org/
+IUSE=+voicemail_storage_file voicemail_storage_odbc voicemail_storage_imap alsa blocks bluetooth calendar +caps cluster codec2 curl dahdi debug -deprecated doc freetds gtalk http iconv ilbc ldap libressl lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog systemd unbound vorbis xmpp kernel_linux lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=acct-user/asterisk acct-group/asterisk dev-db/sqlite:3 dev-libs/popt >=dev-libs/jansson-2.11 dev-libs/libedit dev-libs/libxml2:2 dev-libs/libxslt sys-apps/util-linux sys-libs/zlib alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez:= ) calendar? ( net-libs/neon:= dev-libs/libical:= dev-libs/iksemel ) caps? ( sys-libs/libcap ) blocks? ( sys-libs/blocksruntime ) cluster? ( sys-cluster/corosync ) codec2? ( media-libs/codec2:= ) curl? ( net-misc/curl ) dahdi? ( net-libs/libpri net-misc/dahdi-tools ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.6 ) iconv? ( virtual/libiconv ) ilbc? ( media-libs/libilbc ) ldap? ( net-nds/openldap ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) mysql? ( dev-db/mysql-connector-c:= ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) pjproject? ( >=net-libs/pjproject-2.9:= ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql:* ) radius? ( net-dialup/freeradius-client ) snmp? ( net-analyzer/net-snmp:= ) span? ( media-libs/spandsp ) speex? ( media-libs/libogg media-libs/speex media-libs/speexdsp ) srtp? ( net-libs/libsrtp:0 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) systemd? ( sys-apps/systemd ) !systemd? ( !sys-apps/systemd ) unbound? ( net-dns/unbound ) vorbis? ( media-libs/libogg media-libs/libvorbis ) voicemail_storage_imap? ( virtual/imap-c-client ) xmpp? ( dev-libs/iksemel ) net-misc/asterisk-core-sounds net-misc/asterisk-extra-sounds net-misc/asterisk-moh-opsound selinux? ( sec-policy/selinux-asterisk ) syslog? ( virtual/logger ) virtual/tmpfiles
+REQUIRED_USE=gtalk? ( xmpp ) lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) ^^ ( voicemail_storage_file voicemail_storage_odbc voicemail_storage_imap ) voicemail_storage_odbc? ( odbc )
+SLOT=0/16
+SRC_URI=https://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-16.16.2.tar.gz
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	dc8e4917d734a019caa04ad3b8db560b	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=bec42aa387b626b825dcf369f95f405f
diff --git a/metadata/md5-cache/net-misc/asterisk-18.2.2 b/metadata/md5-cache/net-misc/asterisk-18.2.2
new file mode 100644
index 000000000000..70f6f8c189e3
--- /dev/null
+++ b/metadata/md5-cache/net-misc/asterisk-18.2.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-libs/libxml2:2 virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare pretend setup
+DEPEND=acct-user/asterisk acct-group/asterisk dev-db/sqlite:3 dev-libs/popt >=dev-libs/jansson-2.11 dev-libs/libedit dev-libs/libxml2:2 dev-libs/libxslt sys-apps/util-linux sys-libs/zlib alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez:= ) calendar? ( net-libs/neon:= dev-libs/libical:= dev-libs/iksemel ) caps? ( sys-libs/libcap ) blocks? ( sys-libs/blocksruntime ) cluster? ( sys-cluster/corosync ) codec2? ( media-libs/codec2:= ) curl? ( net-misc/curl ) dahdi? ( net-libs/libpri net-misc/dahdi-tools ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.6 ) iconv? ( virtual/libiconv ) ilbc? ( media-libs/libilbc ) ldap? ( net-nds/openldap ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) mysql? ( dev-db/mysql-connector-c:= ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) pjproject? ( >=net-libs/pjproject-2.9:= ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql:* ) radius? ( net-dialup/freeradius-client ) snmp? ( net-analyzer/net-snmp:= ) span? ( media-libs/spandsp ) speex? ( media-libs/libogg media-libs/speex media-libs/speexdsp ) srtp? ( net-libs/libsrtp:0 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) systemd? ( sys-apps/systemd ) !systemd? ( !sys-apps/systemd ) unbound? ( net-dns/unbound ) vorbis? ( media-libs/libogg media-libs/libvorbis ) voicemail_storage_imap? ( virtual/imap-c-client ) xmpp? ( dev-libs/iksemel )
+DESCRIPTION=Asterisk: A Modular Open Source PBX System
+EAPI=7
+HOMEPAGE=https://www.asterisk.org/
+IUSE=voicemail_storage_odbc voicemail_storage_imap alsa blocks bluetooth calendar +caps cluster codec2 curl dahdi debug -deprecated doc freetds gtalk http iconv ilbc ldap libressl lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog systemd unbound vorbis xmpp kernel_linux lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=acct-user/asterisk acct-group/asterisk dev-db/sqlite:3 dev-libs/popt >=dev-libs/jansson-2.11 dev-libs/libedit dev-libs/libxml2:2 dev-libs/libxslt sys-apps/util-linux sys-libs/zlib alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez:= ) calendar? ( net-libs/neon:= dev-libs/libical:= dev-libs/iksemel ) caps? ( sys-libs/libcap ) blocks? ( sys-libs/blocksruntime ) cluster? ( sys-cluster/corosync ) codec2? ( media-libs/codec2:= ) curl? ( net-misc/curl ) dahdi? ( net-libs/libpri net-misc/dahdi-tools ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.6 ) iconv? ( virtual/libiconv ) ilbc? ( media-libs/libilbc ) ldap? ( net-nds/openldap ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-2? ( dev-lang/lua:5.2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) mysql? ( dev-db/mysql-connector-c:= ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) pjproject? ( >=net-libs/pjproject-2.9:= ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql:* ) radius? ( net-dialup/freeradius-client ) snmp? ( net-analyzer/net-snmp:= ) span? ( media-libs/spandsp ) speex? ( media-libs/libogg media-libs/speex media-libs/speexdsp ) srtp? ( net-libs/libsrtp:0 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) systemd? ( sys-apps/systemd ) !systemd? ( !sys-apps/systemd ) unbound? ( net-dns/unbound ) vorbis? ( media-libs/libogg media-libs/libvorbis ) voicemail_storage_imap? ( virtual/imap-c-client ) xmpp? ( dev-libs/iksemel ) net-misc/asterisk-core-sounds net-misc/asterisk-extra-sounds net-misc/asterisk-moh-opsound selinux? ( sec-policy/selinux-asterisk ) syslog? ( virtual/logger ) virtual/tmpfiles
+REQUIRED_USE=gtalk? ( xmpp ) lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) voicemail_storage_odbc? ( odbc )
+SLOT=0/18
+SRC_URI=https://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-18.2.2.tar.gz
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	dc8e4917d734a019caa04ad3b8db560b	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=7d72d946c6be88410841b78e9f48746f
diff --git a/metadata/md5-cache/net-misc/dhcpcd-9.3.4 b/metadata/md5-cache/net-misc/dhcpcd-9.3.4
index a8f0e7b98c71..41147018bceb 100644
--- a/metadata/md5-cache/net-misc/dhcpcd-9.3.4
+++ b/metadata/md5-cache/net-misc/dhcpcd-9.3.4
@@ -5,10 +5,10 @@ DESCRIPTION=A fully featured, yet light weight RFC2131 compliant DHCP client
 EAPI=7
 HOMEPAGE=https://roy.marples.name/projects/dhcpcd
 IUSE=debug elibc_glibc +embedded ipv6 kernel_linux privsep +udev
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD-2
 RDEPEND=udev? ( virtual/udev ) privsep? ( acct-group/dhcpcd acct-user/dhcpcd )
 SLOT=0
 SRC_URI=https://roy.marples.name/downloads/dhcpcd/dhcpcd-9.3.4.tar.xz
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=1bd25101be55f4ae4187bb172f465251
+_md5_=1d57d8e0188768972349adaff02843dc
diff --git a/metadata/md5-cache/net-misc/dropbox-118.4.460 b/metadata/md5-cache/net-misc/dropbox-118.4.460
new file mode 100644
index 000000000000..44b6d46a6848
--- /dev/null
+++ b/metadata/md5-cache/net-misc/dropbox-118.4.460
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/patchelf virtual/pkgconfig
+DEFINED_PHASES=install postinst postrm preinst prepare unpack
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Dropbox daemon (pretends to be GUI-less)
+EAPI=7
+HOMEPAGE=https://www.dropbox.com/
+IUSE=selinux X
+KEYWORDS=~amd64 ~x86 ~x86-linux
+LICENSE=BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox
+RDEPEND=X? ( x11-themes/hicolor-icon-theme ) selinux? ( sec-policy/selinux-dropbox ) app-arch/bzip2 dev-libs/glib:2 dev-libs/libffi-compat:6 media-libs/fontconfig media-libs/freetype net-misc/wget sys-libs/zlib sys-libs/ncurses-compat:5 virtual/opengl x11-libs/libICE x11-libs/libSM x11-libs/libX11
+RESTRICT=mirror strip
+SLOT=0
+SRC_URI=amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-118.4.460.tar.gz ) x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-118.4.460.tar.gz )
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=02fa288e29ee0a9a2f7aa62d6a0f7805
diff --git a/metadata/md5-cache/net-misc/mobile-broadband-provider-info-20201225 b/metadata/md5-cache/net-misc/mobile-broadband-provider-info-20201225
index 89040543c477..7c953b1fe725 100644
--- a/metadata/md5-cache/net-misc/mobile-broadband-provider-info-20201225
+++ b/metadata/md5-cache/net-misc/mobile-broadband-provider-info-20201225
@@ -4,10 +4,10 @@ DESCRIPTION=Database of mobile broadband service providers
 EAPI=7
 HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager/MobileBroadband
 IUSE=test
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86
 LICENSE=CC-PD
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnome/sources/mobile-broadband-provider-info/20201225/mobile-broadband-provider-info-20201225.tar.xz
 _eclasses_=gnome.org	532d56d07b9eace4831aaa817d2b756a
-_md5_=ebf3ccbcdd8a6b57d1fcaffdefb2e2fb
+_md5_=5a94ee478dc4eddf47f6bba920f5336d
diff --git a/metadata/md5-cache/net-misc/unison-2.51.4_rc1 b/metadata/md5-cache/net-misc/unison-2.51.4_rc2
similarity index 83%
rename from metadata/md5-cache/net-misc/unison-2.51.4_rc1
rename to metadata/md5-cache/net-misc/unison-2.51.4_rc2
index 2e84ccde2b17..6d2d85b44ee7 100644
--- a/metadata/md5-cache/net-misc/unison-2.51.4_rc1
+++ b/metadata/md5-cache/net-misc/unison-2.51.4_rc2
@@ -10,6 +10,6 @@ LICENSE=GPL-2
 RDEPEND=gtk? ( dev-ml/lablgtk:2= || ( net-misc/x11-ssh-askpass net-misc/ssh-askpass-fullscreen ) ) >=app-eselect/eselect-unison-0.4
 RESTRICT=!ocamlopt? ( strip )
 SLOT=2.51
-SRC_URI=https://github.com/bcpierce00/unison/archive/v2.51.4_rc1.tar.gz -> unison-2.51.4_rc1.tar.gz
+SRC_URI=https://github.com/bcpierce00/unison/archive/v2.51.4_rc2.tar.gz -> unison-2.51.4_rc2.tar.gz
 _eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1ca11da7817b1f4537925baad8efdf29
+_md5_=116956d1dbee1a65242bade0ec33265e
diff --git a/metadata/md5-cache/net-misc/vde-2.3.2_p20191011-r1 b/metadata/md5-cache/net-misc/vde-2.3.2_p20191011-r1
new file mode 100644
index 000000000000..6955806ac029
--- /dev/null
+++ b/metadata/md5-cache/net-misc/vde-2.3.2_p20191011-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare
+DEPEND=pcap? ( net-libs/libpcap ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Virtual distributed ethernet emulator for emulators like qemu, bochs, and uml
+EAPI=6
+HOMEPAGE=https://virtualsquare.org
+IUSE=pcap selinux static-libs
+KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=pcap? ( net-libs/libpcap ) acct-group/qemu selinux? ( sec-policy/selinux-vde )
+SLOT=0
+SRC_URI=https://github.com/virtualsquare/vde-2/archive/c7b36a57831a9067c8619c3e17a03e595623b3eb.tar.gz -> vde-2.3.2_p20191011.tar.gz
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	e8f1ec13660dc2f44b32775765d85e42	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	multilib	d410501a125f99ffb560b0c523cd3d1e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=9c9142d7cd5f62bd475599a3bc7dc6dc
diff --git a/metadata/md5-cache/net-nds/Manifest.gz b/metadata/md5-cache/net-nds/Manifest.gz
index dced1dbfe43d..040c8712b265 100644
Binary files a/metadata/md5-cache/net-nds/Manifest.gz and b/metadata/md5-cache/net-nds/Manifest.gz differ
diff --git a/metadata/md5-cache/net-nds/openldap-2.4.58 b/metadata/md5-cache/net-nds/openldap-2.4.58
new file mode 100644
index 000000000000..9eef1276d0d2
--- /dev/null
+++ b/metadata/md5-cache/net-nds/openldap-2.4.58
@@ -0,0 +1,16 @@
+BDEPEND=!minimal? ( acct-group/ldap acct-user/ldap ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ssl? ( || ( dev-libs/openssl:0 dev-libs/libressl:0 ) ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test
+DEPEND=ssl? ( !gnutls? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libgcrypt-1.5.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) sasl? ( dev-libs/cyrus-sasl:= ) !minimal? ( dev-libs/libltdl sys-libs/e2fsprogs-libs >=dev-db/lmdb-0.9.18:= tcpd? ( sys-apps/tcp-wrappers ) odbc? ( !iodbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc ) ) perl? ( dev-lang/perl:=[-build(-)] ) samba? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) berkdb? ( <sys-libs/db-6.0:= || ( 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 sys-libs/db:4.4 ) ) smbkrb5passwd? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) kerberos? ( app-crypt/heimdal ) ) kerberos? ( virtual/krb5 kinit? ( !app-crypt/heimdal ) ) cxx? ( dev-libs/cyrus-sasl:= ) ) sys-apps/groff
+DESCRIPTION=LDAP suite of application and development tools
+EAPI=7
+HOMEPAGE=https://www.OpenLDAP.org/
+IUSE=crypt samba tcpd experimental minimal +berkdb overlays perl gnutls iodbc sasl ssl odbc debug ipv6 libressl +syslog selinux static-libs test smbkrb5passwd kerberos kinit pbkdf2 sha2 -cxx abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 ssl
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=OPENLDAP GPL-2
+RDEPEND=ssl? ( !gnutls? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libgcrypt-1.5.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) sasl? ( dev-libs/cyrus-sasl:= ) !minimal? ( dev-libs/libltdl sys-libs/e2fsprogs-libs >=dev-db/lmdb-0.9.18:= tcpd? ( sys-apps/tcp-wrappers ) odbc? ( !iodbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc ) ) perl? ( dev-lang/perl:=[-build(-)] ) samba? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) berkdb? ( <sys-libs/db-6.0:= || ( 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 sys-libs/db:4.4 ) ) smbkrb5passwd? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) kerberos? ( app-crypt/heimdal ) ) kerberos? ( virtual/krb5 kinit? ( !app-crypt/heimdal ) ) cxx? ( dev-libs/cyrus-sasl:= ) ) selinux? ( sec-policy/selinux-ldap ) virtual/tmpfiles
+REQUIRED_USE=cxx? ( sasl ) pbkdf2? ( ssl ) test? ( berkdb ) ?? ( test minimal )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.4.58.tgz http://gpl.savoirfairelinux.net/pub/mirrors/openldap/openldap-release/openldap-2.4.58.tgz http://repository.linagora.org/OpenLDAP/openldap-release/openldap-2.4.58.tgz http://mirror.eu.oneandone.net/software/openldap/openldap-release/openldap-2.4.58.tgz mirror://gentoo/rfc2307bis.schema-20140524
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	db-use	5b886219e6035ca01d8b1c58eba91679	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	preserve-libs	ef207dc62baddfddfd39a164d9797648	ssl-cert	8bf95e2477512d096a10bf218de41d5e	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	dc8e4917d734a019caa04ad3b8db560b	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=b8d76dc857153b5ca4d0fc076a83d315
diff --git a/metadata/md5-cache/net-p2p/Manifest.gz b/metadata/md5-cache/net-p2p/Manifest.gz
index 04b20852d5cc..7c2454ccc399 100644
Binary files a/metadata/md5-cache/net-p2p/Manifest.gz and b/metadata/md5-cache/net-p2p/Manifest.gz differ
diff --git a/metadata/md5-cache/net-p2p/eiskaltdcpp-2.4.2 b/metadata/md5-cache/net-p2p/eiskaltdcpp-2.4.2
index cc831c87e4f2..5b12c7d31f06 100644
--- a/metadata/md5-cache/net-p2p/eiskaltdcpp-2.4.2
+++ b/metadata/md5-cache/net-p2p/eiskaltdcpp-2.4.2
@@ -12,4 +12,4 @@ REQUIRED_USE=dbus? ( qt5 ) javascript? ( qt5 ) libcanberra? ( gtk ) libnotify? (
 SLOT=0
 SRC_URI=mirror://sourceforge/project/eiskaltdcpp/Sources/eiskaltdcpp-2.4.2.tar.xz
 _eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a90ebd385880123d640407b2f99d8d10
+_md5_=455cc9ba2e1016d4245bf943bb59ea4f
diff --git a/metadata/md5-cache/net-p2p/eiskaltdcpp-9999 b/metadata/md5-cache/net-p2p/eiskaltdcpp-9999
index de051aed3709..c29e85b6770a 100644
--- a/metadata/md5-cache/net-p2p/eiskaltdcpp-9999
+++ b/metadata/md5-cache/net-p2p/eiskaltdcpp-9999
@@ -11,4 +11,4 @@ RDEPEND=app-arch/bzip2 dev-libs/openssl:0= sys-apps/attr sys-libs/zlib virtual/l
 REQUIRED_USE=dbus? ( qt5 ) javascript? ( qt5 ) libcanberra? ( gtk ) libnotify? ( gtk ) lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-2 ) ) spell? ( qt5 ) sqlite? ( qt5 )
 SLOT=0
 _eclasses_=cmake	314a813be2f09820e8978cdee941e501	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	git-r3	3e7ec3d6619213460c85e2aa48398441	l10n	8cdd85e169b835d518bc2fd59f780d8e	lua-single	f91b5656f00869c220a6e35ae0521c54	lua-utils	736947973cfbc9de01fdb8548f942f82	multilib	d410501a125f99ffb560b0c523cd3d1e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e8f3bb49606325024147c4fe14ae2d23
+_md5_=a3d586f3ec984d6a9d3d00af7955a52e
diff --git a/metadata/md5-cache/net-proxy/Manifest.gz b/metadata/md5-cache/net-proxy/Manifest.gz
index 10f9a4eb9531..2fd335675a5a 100644
Binary files a/metadata/md5-cache/net-proxy/Manifest.gz and b/metadata/md5-cache/net-proxy/Manifest.gz differ
diff --git a/metadata/md5-cache/net-proxy/haproxy-1.8.29 b/metadata/md5-cache/net-proxy/haproxy-1.8.29
new file mode 100644
index 000000000000..a783518e765e
--- /dev/null
+++ b/metadata/md5-cache/net-proxy/haproxy-1.8.29
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install postinst setup
+DEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre pcre2-jit? ( dev-libs/libpcre2[jit] ) ) ssl? ( !libressl? ( dev-libs/openssl:0=[zlib?] ) libressl? ( dev-libs/libressl:0= ) ) slz? ( dev-libs/libslz:= ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c )
+DESCRIPTION=A TCP/HTTP reverse proxy for high availability environments
+EAPI=7
+HOMEPAGE=http://www.haproxy.org
+IUSE=+crypt doc examples libressl slz net_ns +pcre pcre-jit pcre2 pcre2-jit ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl kernel_linux
+KEYWORDS=~amd64 ~arm ~ppc ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre pcre2-jit? ( dev-libs/libpcre2[jit] ) ) ssl? ( !libressl? ( dev-libs/openssl:0=[zlib?] ) libressl? ( dev-libs/libressl:0= ) ) slz? ( dev-libs/libslz:= ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c ) acct-group/haproxy acct-user/haproxy
+REQUIRED_USE=pcre-jit? ( pcre ) pcre2-jit? ( pcre2 ) pcre? ( !pcre2 ) device-atlas? ( pcre ) ?? ( slz zlib )
+SLOT=0/1.8
+SRC_URI=http://haproxy.1wt.eu/download/1.8/src/haproxy-1.8.29.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=1aaedb1e137eb52dfcacab5a579fe21b
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.0.21 b/metadata/md5-cache/net-proxy/haproxy-2.0.21
new file mode 100644
index 000000000000..70938a61341d
--- /dev/null
+++ b/metadata/md5-cache/net-proxy/haproxy-2.0.21
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install postinst setup
+DEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre pcre2-jit? ( dev-libs/libpcre2[jit] ) ) ssl? ( !libressl? ( dev-libs/openssl:0=[zlib?] ) libressl? ( dev-libs/libressl:0= ) ) slz? ( dev-libs/libslz:= ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c )
+DESCRIPTION=A TCP/HTTP reverse proxy for high availability environments
+EAPI=7
+HOMEPAGE=http://www.haproxy.org
+IUSE=+crypt doc examples libressl slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl kernel_linux
+KEYWORDS=~amd64 ~arm ~ppc ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre pcre2-jit? ( dev-libs/libpcre2[jit] ) ) ssl? ( !libressl? ( dev-libs/openssl:0=[zlib?] ) libressl? ( dev-libs/libressl:0= ) ) slz? ( dev-libs/libslz:= ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c ) acct-group/haproxy acct-user/haproxy
+REQUIRED_USE=pcre-jit? ( pcre ) pcre2-jit? ( pcre2 ) pcre? ( !pcre2 ) device-atlas? ( pcre ) ?? ( slz zlib )
+SLOT=0/2.0
+SRC_URI=http://haproxy.1wt.eu/download/2.0/src/haproxy-2.0.21.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=fc388d4d0686a3d8900f00d3acbddb87
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.1.12 b/metadata/md5-cache/net-proxy/haproxy-2.1.12
new file mode 100644
index 000000000000..f64f07ec6053
--- /dev/null
+++ b/metadata/md5-cache/net-proxy/haproxy-2.1.12
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install postinst setup
+DEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre pcre2-jit? ( dev-libs/libpcre2[jit] ) ) ssl? ( !libressl? ( dev-libs/openssl:0=[zlib?] ) libressl? ( dev-libs/libressl:0= ) ) slz? ( dev-libs/libslz:= ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c )
+DESCRIPTION=A TCP/HTTP reverse proxy for high availability environments
+EAPI=7
+HOMEPAGE=http://www.haproxy.org
+IUSE=+crypt doc examples libressl slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl kernel_linux
+KEYWORDS=~amd64 ~arm ~ppc ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre pcre2-jit? ( dev-libs/libpcre2[jit] ) ) ssl? ( !libressl? ( dev-libs/openssl:0=[zlib?] ) libressl? ( dev-libs/libressl:0= ) ) slz? ( dev-libs/libslz:= ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c ) acct-group/haproxy acct-user/haproxy
+REQUIRED_USE=pcre-jit? ( pcre ) pcre2-jit? ( pcre2 ) pcre? ( !pcre2 ) device-atlas? ( pcre ) ?? ( slz zlib )
+SLOT=0/2.1
+SRC_URI=http://haproxy.1wt.eu/download/2.1/src/haproxy-2.1.12.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=fc388d4d0686a3d8900f00d3acbddb87
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.2.11 b/metadata/md5-cache/net-proxy/haproxy-2.2.11
new file mode 100644
index 000000000000..147561edb5ba
--- /dev/null
+++ b/metadata/md5-cache/net-proxy/haproxy-2.2.11
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install postinst setup
+DEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre pcre2-jit? ( dev-libs/libpcre2[jit] ) ) ssl? ( !libressl? ( dev-libs/openssl:0=[zlib?] ) libressl? ( dev-libs/libressl:0= ) ) slz? ( dev-libs/libslz:= ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c )
+DESCRIPTION=A TCP/HTTP reverse proxy for high availability environments
+EAPI=7
+HOMEPAGE=http://www.haproxy.org
+IUSE=+crypt doc examples libressl slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl kernel_linux
+KEYWORDS=~amd64 ~arm ~ppc ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=pcre? ( dev-libs/libpcre pcre-jit? ( dev-libs/libpcre[jit] ) ) pcre2? ( dev-libs/libpcre pcre2-jit? ( dev-libs/libpcre2[jit] ) ) ssl? ( !libressl? ( dev-libs/openssl:0=[zlib?] ) libressl? ( dev-libs/libressl:0= ) ) slz? ( dev-libs/libslz:= ) zlib? ( sys-libs/zlib ) lua? ( dev-lang/lua:5.3 ) device-atlas? ( dev-libs/device-atlas-api-c ) acct-group/haproxy acct-user/haproxy
+REQUIRED_USE=pcre-jit? ( pcre ) pcre2-jit? ( pcre2 ) pcre? ( !pcre2 ) device-atlas? ( pcre ) ?? ( slz zlib )
+SLOT=0/2.2
+SRC_URI=http://haproxy.1wt.eu/download/2.2/src/haproxy-2.2.11.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
+_md5_=fc388d4d0686a3d8900f00d3acbddb87
diff --git a/metadata/md5-cache/net-vpn/Manifest.gz b/metadata/md5-cache/net-vpn/Manifest.gz
index 10a3aa5092af..79eea906c246 100644
Binary files a/metadata/md5-cache/net-vpn/Manifest.gz and b/metadata/md5-cache/net-vpn/Manifest.gz differ
diff --git a/metadata/md5-cache/net-vpn/fp-multiuser-0.0.2 b/metadata/md5-cache/net-vpn/fp-multiuser-0.0.2
index c2ff6f1aa394..3fc02ee523a6 100644
--- a/metadata/md5-cache/net-vpn/fp-multiuser-0.0.2
+++ b/metadata/md5-cache/net-vpn/fp-multiuser-0.0.2
@@ -11,4 +11,4 @@ RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/gofrp/fp-multiuser/archive/v0.0.2.tar.gz -> fp-multiuser-0.0.2.tar.gz mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//github.com/!azure/go-ntlmssp/@v/v0.0.0-20200615164410-66371956d46c.mod -> github.com%2F!azure%2Fgo-ntlmssp%2F@v%2Fv0.0.0-20200615164410-66371956d46c.mod mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v0.0.0-20170623195520-56545f4a5d46.mod -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv0.0.0-20170623195520-56545f4a5d46.mod mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.0.0.mod -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20160726150825-5bd2802263f2.mod -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20160726150825-5bd2802263f2.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20190718012654-fb15b899a751.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190717042225-c3de453c63f4.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.mod mirror://goproxy//github.com/armon/go-socks5/@v/v0.0.0-20160902184237-e75332964ef5.mod -> github.com%2Farmon%2Fgo-socks5%2F@v%2Fv0.0.0-20160902184237-e75332964ef5.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.mod -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.mod mirror://goproxy//github.com/coreos/go-oidc/@v/v2.2.1+incompatible.mod -> github.com%2Fcoreos%2Fgo-oidc%2F@v%2Fv2.2.1+incompatible.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/docker/spdystream/@v/v0.0.0-20160310174837-449fdfce4d96.mod -> github.com%2Fdocker%2Fspdystream%2F@v%2Fv0.0.0-20160310174837-449fdfce4d96.mod mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20180725130230-947c36da3153.mod -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20180725130230-947c36da3153.mod mirror://goproxy//github.com/emicklei/go-restful/@v/v0.0.0-20170410110728-ff4f55a20633.mod -> github.com%2Femicklei%2Fgo-restful%2F@v%2Fv0.0.0-20170410110728-ff4f55a20633.mod mirror://goproxy//github.com/evanphx/json-patch/@v/v4.2.0+incompatible.mod -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.2.0+incompatible.mod mirror://goproxy//github.com/fatedier/beego/@v/v0.0.0-20171024143340-6c6a4f5bd5eb.zip -> github.com%2Ffatedier%2Fbeego%2F@v%2Fv0.0.0-20171024143340-6c6a4f5bd5eb.zip mirror://goproxy//github.com/fatedier/beego/@v/v0.0.0-20171024143340-6c6a4f5bd5eb.mod -> github.com%2Ffatedier%2Fbeego%2F@v%2Fv0.0.0-20171024143340-6c6a4f5bd5eb.mod mirror://goproxy//github.com/fatedier/frp/@v/v0.34.1.zip -> github.com%2Ffatedier%2Ffrp%2F@v%2Fv0.34.1.zip mirror://goproxy//github.com/fatedier/frp/@v/v0.34.1.mod -> github.com%2Ffatedier%2Ffrp%2F@v%2Fv0.34.1.mod mirror://goproxy//github.com/fatedier/golib/@v/v0.1.1-0.20200901083111-1f870741e185.zip -> github.com%2Ffatedier%2Fgolib%2F@v%2Fv0.1.1-0.20200901083111-1f870741e185.zip mirror://goproxy//github.com/fatedier/golib/@v/v0.1.1-0.20200901083111-1f870741e185.mod -> github.com%2Ffatedier%2Fgolib%2F@v%2Fv0.1.1-0.20200901083111-1f870741e185.mod mirror://goproxy//github.com/fatedier/kcp-go/@v/v2.0.4-0.20190803094908-fe8645b0a904+incompatible.mod -> github.com%2Ffatedier%2Fkcp-go%2F@v%2Fv2.0.4-0.20190803094908-fe8645b0a904+incompatible.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.9.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.mod mirror://goproxy//github.com/ghodss/yaml/@v/v0.0.0-20150909031657-73d445a93680.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv0.0.0-20150909031657-73d445a93680.mod mirror://goproxy//github.com/gin-contrib/sse/@v/v0.1.0.zip -> github.com%2Fgin-contrib%2Fsse%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/gin-contrib/sse/@v/v0.1.0.mod -> github.com%2Fgin-contrib%2Fsse%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gin-gonic/gin/@v/v1.5.0.zip -> github.com%2Fgin-gonic%2Fgin%2F@v%2Fv1.5.0.zip mirror://goproxy//github.com/gin-gonic/gin/@v/v1.5.0.mod -> github.com%2Fgin-gonic%2Fgin%2F@v%2Fv1.5.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.9.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-logr/logr/@v/v0.1.0.mod -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.0.0-20160704185906-46af16f9f7b1.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.0.0-20160704185906-46af16f9f7b1.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.0.0-20160704190145-13c6e3589ad9.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.0.0-20160704190145-13c6e3589ad9.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.0.0-20160808142527-6aced65f8501.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.0.0-20160808142527-6aced65f8501.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.0.0-20160704191624-1d0bd113de87.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.0.0-20160704191624-1d0bd113de87.mod mirror://goproxy//github.com/go-playground/locales/@v/v0.12.1.zip -> github.com%2Fgo-playground%2Flocales%2F@v%2Fv0.12.1.zip mirror://goproxy//github.com/go-playground/locales/@v/v0.12.1.mod -> github.com%2Fgo-playground%2Flocales%2F@v%2Fv0.12.1.mod mirror://goproxy//github.com/go-playground/universal-translator/@v/v0.16.0.zip -> github.com%2Fgo-playground%2Funiversal-translator%2F@v%2Fv0.16.0.zip mirror://goproxy//github.com/go-playground/universal-translator/@v/v0.16.0.mod -> github.com%2Fgo-playground%2Funiversal-translator%2F@v%2Fv0.16.0.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20160516000752-02826c3e7903.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.mod mirror://goproxy//github.com/golang/protobuf/@v/v0.0.0-20161109072736-4bd1920723d7.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv0.0.0-20161109072736-4bd1920723d7.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.0.20200221234624-67d41d38c208.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.0.20200221234624-67d41d38c208.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.4.0.20200313231945-b860323f09d0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.4.0.20200313231945-b860323f09d0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.1.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.1.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.1.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.0.0-20170729233727-0c5108395e2d.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.0.0-20170729233727-0c5108395e2d.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.1.0.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gorilla/mux/@v/v1.7.3.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.3.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.0.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20181012175058-2f1d1f20f75d.mod -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20181012175058-2f1d1f20f75d.mod mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.mod -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.zip -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.mod -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.7.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.8.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.8.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.9.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.9.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.9.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.9.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.2.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/klauspost/cpuid/@v/v1.2.0.mod -> github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/klauspost/reedsolomon/@v/v1.9.1.mod -> github.com%2Fklauspost%2Freedsolomon%2F@v%2Fv1.9.1.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/leodido/go-urn/@v/v1.1.0.zip -> github.com%2Fleodido%2Fgo-urn%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/leodido/go-urn/@v/v1.1.0.mod -> github.com%2Fleodido%2Fgo-urn%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20160728113105-d5b7844b561a.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20160728113105-d5b7844b561a.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.9.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.9.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.4.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180228061459-e0a39a4cb421.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.zip -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.zip mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180701023420-4b7aa43c6742.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.zip -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/munnerz/goautoneg/@v/v0.0.0-20120707110453-a547fc61f48d.mod -> github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20120707110453-a547fc61f48d.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod mirror://goproxy//github.com/mxk/go-flowrate/@v/v0.0.0-20140419014527-cca7078d478f.mod -> github.com%2Fmxk%2Fgo-flowrate%2F@v%2Fv0.0.0-20140419014527-cca7078d478f.mod mirror://goproxy//github.com/nxadm/tail/@v/v1.4.4.mod -> github.com%2Fnxadm%2Ftail%2F@v%2Fv1.4.4.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v0.0.0-20170829012221-11459a886d9c.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20170829012221-11459a886d9c.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.6.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.11.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.11.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.12.1.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.12.1.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.12.3.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.12.3.mod mirror://goproxy//github.com/onsi/gomega/@v/v0.0.0-20170829124025-dcabb60a477c.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20170829124025-dcabb60a477c.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.7.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.7.1.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.1.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.10.1.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.10.1.mod mirror://goproxy//github.com/pires/go-proxyproto/@v/v0.0.0-20190111085350-4d51b51e3bfc.mod -> github.com%2Fpires%2Fgo-proxyproto%2F@v%2Fv0.0.0-20190111085350-4d51b51e3bfc.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/pquerna/cachecontrol/@v/v0.0.0-20180517163645-1555304b9b35.mod -> github.com%2Fpquerna%2Fcachecontrol%2F@v%2Fv0.0.0-20180517163645-1555304b9b35.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.0.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.4.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/prometheus/common/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.2.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.8.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/rakyll/statik/@v/v0.1.1.mod -> github.com%2Frakyll%2Fstatik%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/rodaine/table/@v/v1.0.0.mod -> github.com%2Frodaine%2Ftable%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.3.zip -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.3.zip mirror://goproxy//github.com/spf13/cobra/@v/v0.0.3.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/spf13/pflag/@v/v0.0.0-20170130214245-9ff6c6923cff.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv0.0.0-20170130214245-9ff6c6923cff.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/templexxx/cpufeat/@v/v0.0.0-20170927014610-3794dfbfb047.mod -> github.com%2Ftemplexxx%2Fcpufeat%2F@v%2Fv0.0.0-20170927014610-3794dfbfb047.mod mirror://goproxy//github.com/templexxx/xor/@v/v0.0.0-20170926022130-0af8e873c554.mod -> github.com%2Ftemplexxx%2Fxor%2F@v%2Fv0.0.0-20170926022130-0af8e873c554.mod mirror://goproxy//github.com/tjfoc/gmsm/@v/v0.0.0-20171124023159-98aa888b79d8.mod -> github.com%2Ftjfoc%2Fgmsm%2F@v%2Fv0.0.0-20171124023159-98aa888b79d8.mod mirror://goproxy//github.com/ugorji/go/@v/v1.1.7.zip -> github.com%2Fugorji%2Fgo%2F@v%2Fv1.1.7.zip mirror://goproxy//github.com/ugorji/go/@v/v1.1.7.mod -> github.com%2Fugorji%2Fgo%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/ugorji/go/codec/@v/v1.1.7.zip -> github.com%2Fugorji%2Fgo%2Fcodec%2F@v%2Fv1.1.7.zip mirror://goproxy//github.com/ugorji/go/codec/@v/v1.1.7.mod -> github.com%2Fugorji%2Fgo%2Fcodec%2F@v%2Fv1.1.7.mod mirror://goproxy//github.com/vaughan0/go-ini/@v/v0.0.0-20130923145212-a98ad7ee00ec.mod -> github.com%2Fvaughan0%2Fgo-ini%2F@v%2Fv0.0.0-20130923145212-a98ad7ee00ec.mod mirror://goproxy//github.com/xtaci/lossyconn/@v/v0.0.0-20190602105132-8df528c0c9ae.mod -> github.com%2Fxtaci%2Flossyconn%2F@v%2Fv0.0.0-20190602105132-8df528c0c9ae.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190228161510-8dd112bcdc25.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190228161510-8dd112bcdc25.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20170114055629-f2499483f923.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20170114055629-f2499483f923.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180906233101-161cd47e91fd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190228165749-92fc7df08ae7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190228165749-92fc7df08ae7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190613194153-d28f0bde5980.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190613194153-d28f0bde5980.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191004110552-13f9640d40b9.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191004110552-13f9640d40b9.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200520004742-59133d7f0dd7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200520004742-59133d7f0dd7.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20170830134202-bb24a47a89ea.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20170830134202-bb24a47a89ea.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180909124046-d0be0721c37e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190422165155-953cdadca894.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190813064441-fde4db37ae7a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190813064441-fde4db37ae7a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190904154756-749cb33beabd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190904154756-749cb33beabd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191005200804-aed5e4c7ecf9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191005200804-aed5e4c7ecf9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191022100944-742c48ecaeb7.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191022100944-742c48ecaeb7.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191120155948-bd437916bb0e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191120155948-bd437916bb0e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200122134326-e047566fdf82.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200122134326-e047566fdf82.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200122134326-e047566fdf82.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200122134326-e047566fdf82.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200519105757-fe76b779f299.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200519105757-fe76b779f299.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200602225109-6fdc65e7d980.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200602225109-6fdc65e7d980.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200602225109-6fdc65e7d980.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200602225109-6fdc65e7d980.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20160726164857-2910a502d2bf.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20160726164857-2910a502d2bf.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181011042414-1f849cf54d09.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181011042414-1f849cf54d09.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181030221726-6c7e314b6563.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030221726-6c7e314b6563.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200109180630-ec00e32a8dfd.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200109180630-ec00e32a8dfd.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200221191635-4d8936d0db64.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200221191635-4d8936d0db64.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200228230310-ab0ca4ff8a60.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200228230310-ab0ca4ff8a60.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.20.1-0.20200309200217-e05f789c0967.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.20.1-0.20200309200217-e05f789c0967.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.21.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.0.zip -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.zip mirror://goproxy//google.golang.org/protobuf/@v/v1.23.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.mod -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod mirror://goproxy//gopkg.in/go-playground/assert.v1/@v/v1.2.1.zip -> gopkg.in%2Fgo-playground%2Fassert.v1%2F@v%2Fv1.2.1.zip mirror://goproxy//gopkg.in/go-playground/assert.v1/@v/v1.2.1.mod -> gopkg.in%2Fgo-playground%2Fassert.v1%2F@v%2Fv1.2.1.mod mirror://goproxy//gopkg.in/go-playground/validator.v9/@v/v9.29.1.zip -> gopkg.in%2Fgo-playground%2Fvalidator.v9%2F@v%2Fv9.29.1.zip mirror://goproxy//gopkg.in/go-playground/validator.v9/@v/v9.29.1.mod -> gopkg.in%2Fgo-playground%2Fvalidator.v9%2F@v%2Fv9.29.1.mod mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.mod -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.mod mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.4.1.mod -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.4.1.mod mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.mod -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.5.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.5.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.5.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.5.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.18.3.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.18.3.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20190128074634-0689ccc1d7d6.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20190128074634-0689ccc1d7d6.mod mirror://goproxy//k8s.io/klog/@v/v0.0.0-20181102134211-b9b56d5dfc92.mod -> k8s.io%2Fklog%2F@v%2Fv0.0.0-20181102134211-b9b56d5dfc92.mod mirror://goproxy//k8s.io/klog/@v/v1.0.0.mod -> k8s.io%2Fklog%2F@v%2Fv1.0.0.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20200410145947-61e04a5be9a6.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20200410145947-61e04a5be9a6.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/v3/@v/v3.0.0-20200116222232-67a7b8c61874.mod -> sigs.k8s.io%2Fstructured-merge-diff%2Fv3%2F@v%2Fv3.0.0-20200116222232-67a7b8c61874.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/v3/@v/v3.0.0.mod -> sigs.k8s.io%2Fstructured-merge-diff%2Fv3%2F@v%2Fv3.0.0.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.2.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.mod
 _eclasses_=go-module	92660621959e7fab813173772987588b	multilib	d410501a125f99ffb560b0c523cd3d1e	systemd	74b223e42834adf09a2d21fe5fe13741	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=7dfd6bfa33a86111e94dc0f252330e02
+_md5_=e9ab573613125fd125f16a80d0b0a924
diff --git a/metadata/md5-cache/sci-calculators/Manifest.gz b/metadata/md5-cache/sci-calculators/Manifest.gz
index 4ab17201f139..706cdec996ae 100644
Binary files a/metadata/md5-cache/sci-calculators/Manifest.gz and b/metadata/md5-cache/sci-calculators/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-calculators/bc-gh-3.3.2 b/metadata/md5-cache/sci-calculators/bc-gh-3.3.2
deleted file mode 100644
index 9b11c610f266..000000000000
--- a/metadata/md5-cache/sci-calculators/bc-gh-3.3.2
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=configure
-DESCRIPTION=Implementation of POSIX bc with GNU extensions
-EAPI=7
-HOMEPAGE=https://github.com/gavinhoward/bc
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=BSD-2
-SLOT=0
-SRC_URI=https://github.com/gavinhoward/bc/releases/download/3.3.2/bc-3.3.2.tar.xz
-_md5_=cf208556d773e569f21008e1746475e7
diff --git a/metadata/md5-cache/sci-calculators/bc-gh-3.3.0 b/metadata/md5-cache/sci-calculators/bc-gh-3.3.4
similarity index 94%
rename from metadata/md5-cache/sci-calculators/bc-gh-3.3.0
rename to metadata/md5-cache/sci-calculators/bc-gh-3.3.4
index cb1ea7ec1141..e944196d8d66 100644
--- a/metadata/md5-cache/sci-calculators/bc-gh-3.3.0
+++ b/metadata/md5-cache/sci-calculators/bc-gh-3.3.4
@@ -5,5 +5,5 @@ HOMEPAGE=https://github.com/gavinhoward/bc
 KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=BSD-2
 SLOT=0
-SRC_URI=https://github.com/gavinhoward/bc/releases/download/3.3.0/bc-3.3.0.tar.xz
+SRC_URI=https://github.com/gavinhoward/bc/releases/download/3.3.4/bc-3.3.4.tar.xz
 _md5_=cf208556d773e569f21008e1746475e7
diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz
index 108aa11e8385..9a173da703b2 100644
Binary files a/metadata/md5-cache/sci-mathematics/Manifest.gz and b/metadata/md5-cache/sci-mathematics/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-mathematics/gimps-30.4.9 b/metadata/md5-cache/sci-mathematics/gimps-30.5.1
similarity index 71%
rename from metadata/md5-cache/sci-mathematics/gimps-30.4.9
rename to metadata/md5-cache/sci-mathematics/gimps-30.5.1
index f14816a02a0b..fe83d0eadaab 100644
--- a/metadata/md5-cache/sci-mathematics/gimps-30.4.9
+++ b/metadata/md5-cache/sci-mathematics/gimps-30.5.1
@@ -3,11 +3,11 @@ DEFINED_PHASES=install postinst postrm
 DESCRIPTION=The Great Internet Mersenne Prime Search
 EAPI=7
 HOMEPAGE=https://www.mersenne.org/
-KEYWORDS=-* ~amd64
+KEYWORDS=-* ~amd64 ~x86
 LICENSE=GIMPS
 RDEPEND=net-misc/curl >=dev-libs/gmp-6.1.2 virtual/tmpfiles
 RESTRICT=mirror bindist
 SLOT=0
-SRC_URI=amd64? ( https://www.mersenne.org/ftp_root/gimps/p95v304b9.linux64.tar.gz )
+SRC_URI=amd64? ( https://www.mersenne.org/ftp_root/gimps/p95v305b1.linux64.tar.gz ) x86? ( https://www.mersenne.org/ftp_root/gimps/p95v305b1.linux32.tar.gz )
 _eclasses_=multilib	d410501a125f99ffb560b0c523cd3d1e	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	74b223e42834adf09a2d21fe5fe13741	tmpfiles	dc8e4917d734a019caa04ad3b8db560b	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=d67724538dd67c1c102eff0f9f4bf331
+_md5_=fc196d74cce6b501e862f34761df2725
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index e2ddc3a014fa..e84bdb4bd0a0 100644
Binary files a/metadata/md5-cache/sys-apps/Manifest.gz and b/metadata/md5-cache/sys-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-apps/file-5.39-r4 b/metadata/md5-cache/sys-apps/file-5.39-r4
index e89828e3966e..a9b7c31deb5d 100644
--- a/metadata/md5-cache/sys-apps/file-5.39-r4
+++ b/metadata/md5-cache/sys-apps/file-5.39-r4
@@ -5,11 +5,11 @@ DESCRIPTION=identify a file's format by scanning binary data for patterns
 EAPI=7
 HOMEPAGE=https://www.darwinsys.com/file/
 IUSE=bzip2 lzma python seccomp static-libs zlib python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD-2
 RDEPEND=bzip2? ( app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( app-arch/xz-utils[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/setuptools[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( !dev-python/python-magic ) seccomp? ( sys-libs/libseccomp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=python? ( || ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) )
 SLOT=0
 SRC_URI=ftp://ftp.astron.com/pub/file/file-5.39.tar.gz
 _eclasses_=distutils-r1	16579e06f8839831bd5c03455bb87e3f	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	multilib	d410501a125f99ffb560b0c523cd3d1e	multilib-build	9a65133006c608964888346a412cc454	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	6d099888c5b4dd4868c26508df307e95	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=74a2252307ac9070226d25785fcefe89
+_md5_=421f9f4eed54d0286192942f86e37686
diff --git a/metadata/md5-cache/sys-apps/grep-3.4 b/metadata/md5-cache/sys-apps/grep-3.4
index 5eefd2a61208..2b946dc705a7 100644
--- a/metadata/md5-cache/sys-apps/grep-3.4
+++ b/metadata/md5-cache/sys-apps/grep-3.4
@@ -11,4 +11,4 @@ RDEPEND=!static? ( pcre? ( >=dev-libs/libpcre-7.8-r1 ) ) nls? ( virtual/libintl
 SLOT=0
 SRC_URI=mirror://gnu/grep/grep-3.4.tar.xz mirror://gentoo/grep-3.4.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=d66060e46132f9711814e4936ba34ea6
+_md5_=8e4cc16267fa67a2ec067d16e3ef2871
diff --git a/metadata/md5-cache/sys-apps/grep-3.5 b/metadata/md5-cache/sys-apps/grep-3.5
index e4e8840bce88..0d14f9164fb3 100644
--- a/metadata/md5-cache/sys-apps/grep-3.5
+++ b/metadata/md5-cache/sys-apps/grep-3.5
@@ -11,4 +11,4 @@ RDEPEND=!static? ( pcre? ( >=dev-libs/libpcre-7.8-r1 ) ) nls? ( virtual/libintl
 SLOT=0
 SRC_URI=mirror://gnu/grep/grep-3.5.tar.xz mirror://gentoo/grep-3.5.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=c399a25616a87e93cea3df06976b1380
+_md5_=c79f7d44add061d7cf88d72959a204d2
diff --git a/metadata/md5-cache/sys-apps/grep-3.6 b/metadata/md5-cache/sys-apps/grep-3.6
index 2e8ddac03def..499084e3175b 100644
--- a/metadata/md5-cache/sys-apps/grep-3.6
+++ b/metadata/md5-cache/sys-apps/grep-3.6
@@ -11,4 +11,4 @@ RDEPEND=!static? ( pcre? ( >=dev-libs/libpcre-7.8-r1 ) ) nls? ( virtual/libintl
 SLOT=0
 SRC_URI=mirror://gnu/grep/grep-3.6.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	09a8beb8e6a8e02dc1e1bd83ac353741	l10n	8cdd85e169b835d518bc2fd59f780d8e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	wrapper	4251d4c84c25f59094fd557e0063a974
-_md5_=b1a21025765f719078c4f69bfa99dd85
+_md5_=16793370e574297afaadff2707258325
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index b621f27ea4dd..b979241c8049 100644
Binary files a/metadata/md5-cache/sys-kernel/Manifest.gz and b/metadata/md5-cache/sys-kernel/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.11.7 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.11.7
index f1c8084e2ef3..9f50f20cdab1 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.11.7
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.11.7
@@ -11,6 +11,6 @@ RDEPEND=!sys-kernel/gentoo-kernel-bin:5.11.7 || ( sys-kernel/installkernel-gento
 REQUIRED_USE=arm? ( savedconfig )
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.11.7
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.11.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.11-8.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.11-8.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.10.18.tar.gz -> gentoo-kernel-config-5.10.18.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/ee22e4872dec1ab1f08fabe765e18b945ebcc29e/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.11.7 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/ee22e4872dec1ab1f08fabe765e18b945ebcc29e/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.11.7 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/ee22e4872dec1ab1f08fabe765e18b945ebcc29e/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.11.7 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/ee22e4872dec1ab1f08fabe765e18b945ebcc29e/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.11.7 )
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.11.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.11-9.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.11-9.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.10.18.tar.gz -> gentoo-kernel-config-5.10.18.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/ee22e4872dec1ab1f08fabe765e18b945ebcc29e/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.11.7 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/ee22e4872dec1ab1f08fabe765e18b945ebcc29e/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.11.7 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/ee22e4872dec1ab1f08fabe765e18b945ebcc29e/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.11.7 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/ee22e4872dec1ab1f08fabe765e18b945ebcc29e/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.11.7 )
 _eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-build	b34a23faa4245fd914731f4abd7f70d4	kernel-install	2154935526abef328cb31b7a02890f47	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	b2e405b5a3f051d58b50c9ffc6b883cf	python-any-r1	0a79a9b53fce4525f438f8ea9695fb88	python-utils-r1	2dc8e06a3429719b43e9140f7292a425	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=1687654212710ec51da40ff741f32e42
+_md5_=33ea2a60c826727250887bdda6baddf9
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.11.7 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.11.7
index 62a240b7c187..7a272d8596cc 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.11.7
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.11.7
@@ -10,6 +10,6 @@ PDEPEND=>=virtual/dist-kernel-5.11.7
 RDEPEND=!sys-kernel/gentoo-kernel:5.11.7 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.11.7
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.11.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.11-8.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.11-8.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.11.7-1.xpak -> gentoo-kernel-5.11.7-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.11.7-1.xpak -> gentoo-kernel-5.11.7-1.x86.xpak )
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.11.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.11-9.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.11-9.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.11.7-1.xpak -> gentoo-kernel-5.11.7-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.11.7-1.xpak -> gentoo-kernel-5.11.7-1.x86.xpak )
 _eclasses_=dist-kernel-utils	ba761317b3fcd25e34c3fb8e5bf1e45f	kernel-install	2154935526abef328cb31b7a02890f47	mount-boot	060ced4c5e0fd737db17cbb609bbf557	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=17647ae32aae091a1fc3068d824145d0
+_md5_=cb9823513884c4539e79ad162ace2053
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.24 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.24
new file mode 100644
index 000000000000..6e797272fe8e
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.24
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 5.10 kernel tree
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=5.10.24
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-27.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-27.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-27.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-27.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-27.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-27.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-27.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-27.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-27.experimental.tar.xz )
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	29b0ddf528a34e7e8c7c179cfbdb5c26	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=60251a553ed169bb2696ca59642e5f30
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.11.7-r1 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.11.7-r1
new file mode 100644
index 000000000000..72ab3748fa7a
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.11.7-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 5.11 kernel tree
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=5.11.7-r1
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.11.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.11-9.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.11-9.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.11-9.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.11-9.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.11-9.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.11-9.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.11-9.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.11-9.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.11-9.experimental.tar.xz )
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	29b0ddf528a34e7e8c7c179cfbdb5c26	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=d99baec764d60955def25db52f848f04
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-5.11_p4 b/metadata/md5-cache/sys-kernel/pf-sources-5.11_p4
new file mode 100644
index 000000000000..97575b82f847
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/pf-sources-5.11_p4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Linux kernel fork that includes the pf-kernel patchset and Gentoo's genpatches
+EAPI=6
+HOMEPAGE=https://gitlab.com/post-factum/pf-kernel/-/wikis/README https://dev.gentoo.org/~mpagano/genpatches/
+IUSE=symlink build
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=5.11_p4
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.11.tar.xz https://github.com/pfactum/pf-kernel/compare/v5.11...v5.11-pf4.diff -> pf-sources-5.11_p4.patch https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.11-1.base.tar.xz https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-5.11-1.extras.tar.xz
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	29b0ddf528a34e7e8c7c179cfbdb5c26	multilib	d410501a125f99ffb560b0c523cd3d1e	optfeature	6a2add34e06e5a05d88471a33ccdd73e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
+_md5_=3a842db0f7b35847a080bea51186ad87
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index 5767a621d912..ebbf7c42b4c8 100644
Binary files a/metadata/md5-cache/www-client/Manifest.gz and b/metadata/md5-cache/www-client/Manifest.gz differ
diff --git a/metadata/md5-cache/www-client/links-2.22 b/metadata/md5-cache/www-client/links-2.22
new file mode 100644
index 000000000000..a110e987f5de
--- /dev/null
+++ b/metadata/md5-cache/www-client/links-2.22
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst postrm prepare
+DEPEND=brotli? ( app-arch/brotli ) bzip2? ( app-arch/bzip2 ) fbcon? ( media-libs/libpng:0= ) freetype? ( media-libs/fontconfig media-libs/freetype ) gpm? ( sys-libs/gpm ) jpeg? ( virtual/jpeg:0 ) libevent? ( dev-libs/libevent:0= ) livecd? ( media-libs/libpng:0= sys-libs/gpm virtual/jpeg:0 ) lzip? ( app-arch/lzip ) lzma? ( app-arch/xz-utils ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) svga? ( media-libs/libpng:0= media-libs/svgalib ) tiff? ( media-libs/tiff:0 ) X? ( media-libs/libpng:0= x11-libs/libXext ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd ) virtual/pkgconfig fbcon? ( virtual/os-headers ) livecd? ( virtual/os-headers ) X? ( dev-util/desktop-file-utils ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=A fast and lightweight web browser running in both graphics and text mode
+EAPI=6
+HOMEPAGE=http://links.twibright.com/
+IUSE=brotli bzip2 fbcon freetype gpm ipv6 jpeg libevent libressl livecd lzip lzma ssl suid svga tiff unicode X zlib zstd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=brotli? ( app-arch/brotli ) bzip2? ( app-arch/bzip2 ) fbcon? ( media-libs/libpng:0= ) freetype? ( media-libs/fontconfig media-libs/freetype ) gpm? ( sys-libs/gpm ) jpeg? ( virtual/jpeg:0 ) libevent? ( dev-libs/libevent:0= ) livecd? ( media-libs/libpng:0= sys-libs/gpm virtual/jpeg:0 ) lzip? ( app-arch/lzip ) lzma? ( app-arch/xz-utils ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) svga? ( media-libs/libpng:0= media-libs/svgalib ) tiff? ( media-libs/tiff:0 ) X? ( media-libs/libpng:0= x11-libs/libXext ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd )
+REQUIRED_USE=!livecd? ( fbcon? ( gpm ) ) svga? ( suid )
+SLOT=2
+SRC_URI=http://links.twibright.com/download/links-2.22.tar.bz2
+_eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	desktop	c0d27bf73aa08ca05b663dbd31fbef28	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=64b182f0f72d7b35b2d8eab5ac3c89f9
diff --git a/metadata/md5-cache/www-client/surf-9999 b/metadata/md5-cache/www-client/surf-9999
index 2298d2d0dcd4..f6644d63215d 100644
--- a/metadata/md5-cache/www-client/surf-9999
+++ b/metadata/md5-cache/www-client/surf-9999
@@ -4,10 +4,10 @@ DEPEND=app-crypt/gcr[gtk] dev-libs/glib:2 net-libs/webkit-gtk:4 x11-libs/gtk+:3
 DESCRIPTION=a simple web browser based on WebKit/GTK+
 EAPI=7
 HOMEPAGE=https://surf.suckless.org/
-IUSE=savedconfig
+IUSE=tabbed savedconfig
 LICENSE=MIT
 PROPERTIES=live
-RDEPEND=!sci-chemistry/surf app-crypt/gcr[gtk] dev-libs/glib:2 net-libs/webkit-gtk:4 x11-libs/gtk+:3 x11-libs/libX11 !savedconfig? ( >=x11-misc/dmenu-4.7 net-misc/curl x11-apps/xprop x11-terms/st )
+RDEPEND=!sci-chemistry/surf app-crypt/gcr[gtk] dev-libs/glib:2 net-libs/webkit-gtk:4 x11-libs/gtk+:3 x11-libs/libX11 !savedconfig? ( >=x11-misc/dmenu-4.7 net-misc/curl x11-apps/xprop x11-terms/st ) tabbed? ( x11-misc/tabbed )
 SLOT=0
 _eclasses_=git-r3	3e7ec3d6619213460c85e2aa48398441	multilib	d410501a125f99ffb560b0c523cd3d1e	portability	b2e405b5a3f051d58b50c9ffc6b883cf	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=8fbd29b5948200b85afc3c1d2991a069
+_md5_=91591362b317b7031f936a39402c81db
diff --git a/metadata/md5-cache/x11-wm/Manifest.gz b/metadata/md5-cache/x11-wm/Manifest.gz
index ad526567dbd7..fa0dfb736dfd 100644
Binary files a/metadata/md5-cache/x11-wm/Manifest.gz and b/metadata/md5-cache/x11-wm/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-wm/muffin-4.8.1 b/metadata/md5-cache/x11-wm/muffin-4.8.1
index c27a154e3142..d3031512808b 100644
--- a/metadata/md5-cache/x11-wm/muffin-4.8.1
+++ b/metadata/md5-cache/x11-wm/muffin-4.8.1
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/linuxmint/muffin/archive/4.8.1.tar.gz -> muffin-4.8.1.tar.gz
 _eclasses_=autotools	9988ecbe04129214297a7bbf3d253710	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	2d5b3f4b315094768576b6799e4f926e	gnome2-utils	c8e3fff820d850c0e003e22208d2eea3	l10n	8cdd85e169b835d518bc2fd59f780d8e	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	virtualx	7e60d3b10c791ab996f717bc1f30072f	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=aef11711802a8786ad93b4c3959ef854
+_md5_=563fdb3c3438dd4ef267acf3430b4c17
diff --git a/metadata/md5-cache/xfce-extra/Manifest.gz b/metadata/md5-cache/xfce-extra/Manifest.gz
index b8450ba25c65..612335ece34d 100644
Binary files a/metadata/md5-cache/xfce-extra/Manifest.gz and b/metadata/md5-cache/xfce-extra/Manifest.gz differ
diff --git a/metadata/md5-cache/xfce-extra/xfdashboard-0.9.1 b/metadata/md5-cache/xfce-extra/xfdashboard-0.9.1
new file mode 100644
index 000000000000..68a22bbfcbdb
--- /dev/null
+++ b/metadata/md5-cache/xfce-extra/xfdashboard-0.9.1
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/intltool virtual/pkgconfig
+DEFINED_PHASES=install postinst postrm
+DEPEND=>=dev-libs/glib-2.38:2 >=x11-libs/gtk+-3.2:3 >=media-libs/clutter-1.12:1.0=[gtk] >=x11-libs/libwnck-3:3= x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXdamage:= x11-libs/libXinerama:= >=xfce-base/garcon-0.2.0:= >=xfce-base/libxfce4ui-4.10:= >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfconf-4.14:=
+DESCRIPTION=Maybe a GNOME shell like dashboard for the Xfce desktop environment
+EAPI=7
+HOMEPAGE=https://goodies.xfce.org/projects/applications/xfdashboard/start
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.38:2 >=x11-libs/gtk+-3.2:3 >=media-libs/clutter-1.12:1.0=[gtk] >=x11-libs/libwnck-3:3= x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXdamage:= x11-libs/libXinerama:= >=xfce-base/garcon-0.2.0:= >=xfce-base/libxfce4ui-4.10:= >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfconf-4.14:=
+SLOT=0
+SRC_URI=https://archive.xfce.org/src/apps/xfdashboard/0.9/xfdashboard-0.9.1.tar.bz2
+_eclasses_=xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=03b616548c5fa41a751fc73b3db2016c
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index c09deb4900d7..9a12729559ea 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 10791 BLAKE2B 09f2380110aa789ac78721e30475f1299e4ad1c319c0ed4063528b8b340c6df850f9e35e6e70a46a047e16ce75eaa9e985e1d001f821e5e7f37d7e1fe907233d SHA512 ff6a62b432bda8c24c2bc9e3bee6d4c86e622637ab7796f81e9646b073e66fac67f4adcb5692f71f31fac9c31987ce0c3a4ee8ddd5532a3407abaeca2c2a8def
-TIMESTAMP 2021-03-18T10:38:32Z
+TIMESTAMP 2021-03-19T14:38:27Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmBTLahfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmBUt2NfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCiTg/+KTzFnfcYZh4+tkkjk/IuHcEZnSPyLerni5ZthT8m6Q9MBxY6NT7u4rJ+
-MQDFZZ++Ml+zXSA6iL9uHNe2Qe6nUNFqwpKfVkWK6K7EC41mhBvegkftz0Ld/Gxo
-BwL9r4sIBE1s7MeRdL8q0vWH9nsjhvvjb9FHck7VDk5xsRBF7OIUQJgNgZKl1gmi
-MND04igziPR14QiRbk7T28xrFdiZuM5Ae2ktOVQbYdLKIlY7h4iqxrcVFfUep0zo
-Xx7C+ItxpjMBwHFkv/BnAu2VKVInthJEKwyG5fEI2A064F8t1YCM4MWmtQsCILa8
-ce9wFKmMP2LZMaP5Bl59yObqyYQOWxnZTvUiMUEvDGSVeAYy7yvUV/aOj4+BGGP+
-T1L5xZp2BcMy+f9K9ky7RW3HyZNPaADwHjUOIKrbN6kyMYK5Hbfkfoegr34Iu8Kf
-lnQ0btOVcDO/GN4WDN2ZH9SAybtLEuV6un6XZgp3gma2PUYtzKA2GXrYH6BiXabf
-jT/g9WZdsDHuntorcx69yyvY0O5pkxeO9K2l5eeoUjAUwSBzpadJNdOmxD6CeBxs
-Ny4yvr0rnBQWhIBMnjL+ZrdzKqVAvesHN9thSmxh66ZVhQsw8wUNeyCY2G7Qjnw6
-02wfzwqXvlDceSM0s+K942MQjCnmYDPWXGZnigswFP/ATAIVh3o=
-=ab50
+klDpwQ/+MdeIxnYcdtDl6xBq3pURf4OSTTwozJWnOs9Wtxc+wEHhs2GCYukMH0Lp
+aOiwUmsrs1x//rF+RBIeTMd079EfGsl7SIXZJJpZ/8Ay8Cjja0We/ru26qjJjPP3
+b1FfeK3eVG78JjCpikhGicjNaZAzjLTUt705BUeAGysjsUaoOiHoUqwsnxtEPDvC
+hbzd5AGQt7mVd86K2IzTtdJJ963tNfUXEwjJ6ctKmIKWo11bYI7ri5e5AQAldYL/
+VmBg8QSHxjgkO2wOqhWJVUCOw6ZkXFG57nBnal66CQOCbLHlzZRNCu4wGhpR4VeL
+GXUlt50Vd4/G8v5On9y6q6qI/xtUCtjUxoeZy8YkMCgBzLRpT3G9cmQMxCQ7BM8x
+JqNkCLXTCNpPhDElgzGqzc/VwfTqYiTR31oPDaBJkr9AYMrFn474j5/mJOJGR424
+N29JONy2SRC2FNWuMspSQoNv8YnnwvY/3zxAiZA5Hi+DIDBaMNj4GIgNTmXj/3Fx
+Z6I8sZ63q9bBgDRKOGG8twqCLh/hRhKKEwN9aep8P+WdRtpfv4zgaJpAO9XMhNdG
+wCVVt9esHQBCbaqJNW07h59hGsrXRgIs1fQ1n9ZqCkkczYrcQRRmZq/jDKNCK9DR
+JNmRSzWKUtvWKHl9z9GKgAt3DaGeYyqkp3oPtmmjXN9AsJ/CQXU=
+=YosL
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 26c42ed7fbe7..9b9ec4b16d20 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Thu, 18 Mar 2021 10:38:28 +0000
+Fri, 19 Mar 2021 14:38:24 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 3757d54d5e45..c379eb38e4e8 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Thu Mar 18 10:38:28 AM UTC 2021
+Fri Mar 19 02:38:24 PM UTC 2021
diff --git a/metadata/timestamp.calculate b/metadata/timestamp.calculate
index e6aa4496f4fb..b0158bb96b4f 100644
--- a/metadata/timestamp.calculate
+++ b/metadata/timestamp.calculate
@@ -2303,6 +2303,7 @@
 2103141909 ./app-editors/emacs/emacs-27.1.91-r1.ebuild
 2103141909 ./app-editors/emacs/emacs-27.1.9999-r1.ebuild
 2103141909 ./app-editors/emacs/emacs-28.0.9999.ebuild
+2103182009 ./app-editors/emacs/emacs-27.2_rc1.ebuild
 2008291509 ./app-editors/emact/emact-2.58.0.ebuild
 1910022239 ./app-editors/ersatz-emacs/ersatz-emacs-20060515-r1.ebuild
 2005101338 ./app-editors/fe/fe-2.0.ebuild
@@ -2752,8 +2753,9 @@
 2102180309 ./app-emulation/free42/free42-2.5.24.ebuild
 2102271209 ./app-emulation/fs-uae-launcher/fs-uae-launcher-3.0.5.ebuild
 2004290239 ./app-emulation/fs-uae/fs-uae-3.0.5.ebuild
-2008161109 ./app-emulation/fuse-utils/fuse-utils-1.4.3.ebuild
+2103181809 ./app-emulation/fuse-utils/fuse-utils-1.4.3-r1.ebuild
 2010101039 ./app-emulation/fuse/fuse-1.5.7.ebuild
+2103191409 ./app-emulation/fuse/fuse-1.6.0.ebuild
 2008222309 ./app-emulation/gallium-nine-standalone/gallium-nine-standalone-9999.ebuild
 2102140239 ./app-emulation/gallium-nine-standalone/gallium-nine-standalone-0.7.ebuild
 1908281739 ./app-emulation/ganeti-os-noop/ganeti-os-noop-0.2.ebuild
@@ -2775,6 +2777,7 @@
 1812071939 ./app-emulation/libguestfs-appliance/libguestfs-appliance-1.38.0.ebuild
 2103131939 ./app-emulation/libguestfs/libguestfs-1.38.6-r103.ebuild
 2008161109 ./app-emulation/libspectrum/libspectrum-1.4.4.ebuild
+2103181709 ./app-emulation/libspectrum/libspectrum-1.5.0.ebuild
 1902160209 ./app-emulation/libvirt-glib/libvirt-glib-1.0.0-r1.ebuild
 1912290139 ./app-emulation/libvirt-glib/libvirt-glib-2.0.0.ebuild
 2006051038 ./app-emulation/libvirt-glib/libvirt-glib-3.0.0.ebuild
@@ -2908,9 +2911,9 @@
 2103141909 ./app-emulation/xen-pvgrub/xen-pvgrub-4.14.1.ebuild
 2101310343 ./app-emulation/xen-tools/xen-tools-4.13.2-r2.ebuild
 2102012239 ./app-emulation/xen-tools/xen-tools-4.14.1.ebuild
-2102041739 ./app-emulation/xen/xen-4.13.2-r4.ebuild
-2102211939 ./app-emulation/xen/xen-4.14.1-r1.ebuild
 2102251009 ./app-emulation/xen/xen-4.13.2-r5.ebuild
+2103182339 ./app-emulation/xen/xen-4.13.2-r6.ebuild
+2103182339 ./app-emulation/xen/xen-4.14.1-r2.ebuild
 2006280009 ./app-emulation/xtrs/xtrs-4.9d-r5.ebuild
 2101310343 ./app-emulation/crun/crun-0.16.ebuild
 2102021639 ./app-emulation/crun/crun-0.17.ebuild
@@ -5338,6 +5341,7 @@
 2101220239 ./dev-db/percona-xtrabackup/percona-xtrabackup-2.4.21.ebuild
 2101220239 ./dev-db/percona-xtrabackup/percona-xtrabackup-8.0.22.15.ebuild
 2101310343 ./dev-db/pg_activity/pg_activity-1.6.2.ebuild
+2103182009 ./dev-db/pg_activity/pg_activity-2.1.3.ebuild
 2101070439 ./dev-db/pg_top/pg_top-4.0.0-r1.ebuild
 2103052309 ./dev-db/pgadmin4/pgadmin4-4.29-r1.ebuild
 2103052309 ./dev-db/pgadmin4/pgadmin4-4.30-r1.ebuild
@@ -7306,6 +7310,7 @@
 2102151409 ./dev-lang/duktape/duktape-2.6.0.ebuild
 2009050609 ./dev-lang/elixir/elixir-1.10.4.ebuild
 2102121709 ./dev-lang/elixir/elixir-1.11.3.ebuild
+2103190209 ./dev-lang/elixir/elixir-1.11.4.ebuild
 2101062239 ./dev-lang/erlang/erlang-23.0.4.ebuild
 2102271409 ./dev-lang/erlang/erlang-23.2.3.ebuild
 2103040239 ./dev-lang/erlang/erlang-23.2.7.ebuild
@@ -7382,7 +7387,7 @@
 2102150339 ./dev-lang/moarvm/moarvm-2020.11.ebuild
 2102150339 ./dev-lang/moarvm/moarvm-2020.12.ebuild
 2102150339 ./dev-lang/moarvm/moarvm-9999.ebuild
-2102221939 ./dev-lang/moarvm/moarvm-2021.02.ebuild
+2103190739 ./dev-lang/moarvm/moarvm-2021.02.ebuild
 1910022239 ./dev-lang/mono-basic/mono-basic-4.8.ebuild
 2007040239 ./dev-lang/mono/mono-6.6.0.161.ebuild
 2008031539 ./dev-lang/mono/mono-6.10.0.104.ebuild
@@ -7441,10 +7446,10 @@
 2103031609 ./dev-lang/python/python-3.10.0_alpha6-r1.ebuild
 2103170039 ./dev-lang/python/python-2.7.18_p7.ebuild
 2103170039 ./dev-lang/python/python-3.10.0_alpha6-r2.ebuild
-2103170039 ./dev-lang/python/python-3.6.13.ebuild
 2103170039 ./dev-lang/python/python-3.7.10.ebuild
 2103170039 ./dev-lang/python/python-3.8.8.ebuild
-2103170039 ./dev-lang/python/python-3.9.2.ebuild
+2103182209 ./dev-lang/python/python-3.6.13.ebuild
+2103182209 ./dev-lang/python/python-3.9.2.ebuild
 2101071539 ./dev-lang/qu-prolog/qu-prolog-10.6.ebuild
 2102150339 ./dev-lang/rakudo/rakudo-2020.05.1.ebuild
 2102150339 ./dev-lang/rakudo/rakudo-2020.06.ebuild
@@ -7658,7 +7663,7 @@
 2101070439 ./dev-libs/expat/expat-2.2.10.ebuild
 2011142339 ./dev-libs/faxpp/faxpp-0.4-r1.ebuild
 2101062239 ./dev-libs/fcgi/fcgi-2.4.1_pre0910052249-r2.ebuild
-1704011901 ./dev-libs/fddl/fddl-20111124-r1.ebuild
+2103191609 ./dev-libs/fddl/fddl-20111124-r1.ebuild
 1704052014 ./dev-libs/ferrisloki/ferrisloki-3.0.13-r2.ebuild
 2101062239 ./dev-libs/ffcall/ffcall-2.1.ebuild
 2006041739 ./dev-libs/flatbuffers/flatbuffers-1.12.0.ebuild
@@ -7890,8 +7895,8 @@
 2103110639 ./dev-libs/libical/libical-3.0.9.ebuild
 2101062239 ./dev-libs/libiconv/libiconv-1.15.ebuild
 2002222009 ./dev-libs/libindicate/libindicate-12.10.1-r3.ebuild
-2006132027 ./dev-libs/libindicator/libindicator-12.10.1-r201.ebuild
-2006132027 ./dev-libs/libindicator/libindicator-12.10.1-r301.ebuild
+2103191409 ./dev-libs/libindicator/libindicator-12.10.1-r201.ebuild
+2103191409 ./dev-libs/libindicator/libindicator-12.10.1-r301.ebuild
 2102260839 ./dev-libs/libinput/libinput-1.17.0.ebuild
 2102272239 ./dev-libs/libinput/libinput-1.16.4.ebuild
 2103022009 ./dev-libs/libinput/libinput-1.16.5.ebuild
@@ -8033,7 +8038,7 @@
 2102160539 ./dev-libs/libsigc++/libsigc++-3.0.6.ebuild
 2103152139 ./dev-libs/libsigc++/libsigc++-2.10.6.ebuild
 2101062239 ./dev-libs/libsigsegv/libsigsegv-2.12-r1.ebuild
-2102031139 ./dev-libs/libsigsegv/libsigsegv-2.13.ebuild
+2103182339 ./dev-libs/libsigsegv/libsigsegv-2.13.ebuild
 1905220209 ./dev-libs/libslz/libslz-1.1.0.ebuild
 2101221109 ./dev-libs/libslz/libslz-1.2.0.ebuild
 2012311940 ./dev-libs/libsodium/libsodium-1.0.18.ebuild
@@ -8164,9 +8169,8 @@
 2102211609 ./dev-libs/nspr/nspr-4.29.ebuild
 2103180009 ./dev-libs/nspr/nspr-4.30.ebuild
 2102211609 ./dev-libs/nss/nss-3.58-r2.ebuild
-2102211609 ./dev-libs/nss/nss-3.60.1.ebuild
-2102211609 ./dev-libs/nss/nss-3.61.ebuild
 2102211609 ./dev-libs/nss/nss-3.62.ebuild
+2103191239 ./dev-libs/nss/nss-3.63.ebuild
 2103062209 ./dev-libs/nsync/nsync-1.24.0.ebuild
 2103071339 ./dev-libs/nsync/nsync-1.20.1.ebuild
 2101062239 ./dev-libs/ntl/ntl-11.4.3.ebuild
@@ -8332,6 +8336,7 @@
 2102150339 ./dev-libs/urdfdom_headers/urdfdom_headers-1.0.5.ebuild
 2102150339 ./dev-libs/urdfdom_headers/urdfdom_headers-9999.ebuild
 2103062139 ./dev-libs/uriparser/uriparser-0.9.4.ebuild
+2103182139 ./dev-libs/uriparser/uriparser-0.9.5.ebuild
 2005011639 ./dev-libs/userspace-rcu/userspace-rcu-0.12.1.ebuild
 2012311940 ./dev-libs/userspace-rcu/userspace-rcu-0.11.1.ebuild
 2102191509 ./dev-libs/userspace-rcu/userspace-rcu-0.12.2.ebuild
@@ -8445,7 +8450,7 @@
 2102260409 ./dev-libs/rocksdb/rocksdb-6.14.6-r1.ebuild
 2102260409 ./dev-libs/rocksdb/rocksdb-6.15.5.ebuild
 2101130009 ./dev-libs/tree-sitter/tree-sitter-9999.ebuild
-2103170039 ./dev-libs/tree-sitter/tree-sitter-0.19.3.ebuild
+2103190039 ./dev-libs/tree-sitter/tree-sitter-0.19.4.ebuild
 2103080509 ./dev-libs/libmpack/libmpack-1.0.5.ebuild
 2103072339 ./dev-libs/libnest2d/libnest2d-0.4-r1.ebuild
 2012072139 ./dev-libs/cxxopts/cxxopts-2.2.1-r1.ebuild
@@ -8454,7 +8459,7 @@
 2012171809 ./dev-libs/s2n/s2n-0.10.21-r1.ebuild
 2012162341 ./dev-libs/miniz/miniz-9999.ebuild
 2102050539 ./dev-libs/miniz/miniz-2.1.0-r2.ebuild
-2102200709 ./dev-libs/libtomcrypt/libtomcrypt-1.18.2-r2.ebuild
+2103190539 ./dev-libs/libtomcrypt/libtomcrypt-1.18.2-r2.ebuild
 2102251309 ./dev-libs/libretls/libretls-3.3.1-r1.ebuild
 2102272239 ./dev-libs/rccl/rccl-4.0.0-r2.ebuild
 2101251809 ./dev-libs/aml/aml-0.2.0.ebuild
@@ -8808,6 +8813,8 @@
 2102211309 ./dev-ml/uuidm/uuidm-0.9.7.ebuild
 2103042309 ./dev-ml/bigarray-compat/bigarray-compat-1.0.0.ebuild
 2103042309 ./dev-ml/cstruct/cstruct-5.2.0.ebuild
+2103191339 ./dev-ml/merlin/merlin-3.4.2.ebuild
+2103191339 ./dev-ml/merlin/merlin-4.1.ebuild
 2007030339 ./dev-perl/Ace/Ace-1.920.0-r6.ebuild
 2102100039 ./dev-perl/Acme-Damn/Acme-Damn-0.80.0.ebuild
 2101070139 ./dev-perl/Algorithm-Annotate/Algorithm-Annotate-0.100.0-r2.ebuild
@@ -11387,6 +11394,8 @@
 2103160039 ./dev-python/boto3/boto3-1.17.28.ebuild
 2103171109 ./dev-python/boto3/boto3-1.17.29.ebuild
 2103181239 ./dev-python/boto3/boto3-1.17.30.ebuild
+2103190239 ./dev-python/boto3/boto3-1.17.31.ebuild
+2103191109 ./dev-python/boto3/boto3-1.17.32.ebuild
 2101310343 ./dev-python/botocore/botocore-9999.ebuild
 2102131139 ./dev-python/botocore/botocore-1.20.7.ebuild
 2102201339 ./dev-python/botocore/botocore-1.20.12.ebuild
@@ -11405,6 +11414,8 @@
 2103160039 ./dev-python/botocore/botocore-1.20.28.ebuild
 2103171109 ./dev-python/botocore/botocore-1.20.29.ebuild
 2103181239 ./dev-python/botocore/botocore-1.20.30.ebuild
+2103190239 ./dev-python/botocore/botocore-1.20.31.ebuild
+2103191109 ./dev-python/botocore/botocore-1.20.32.ebuild
 2101310343 ./dev-python/bottle/bottle-0.12.19.ebuild
 2101310343 ./dev-python/bottleneck/bottleneck-1.3.2.ebuild
 2103020709 ./dev-python/bpython/bpython-0.21.ebuild
@@ -11674,7 +11685,8 @@
 2103052309 ./dev-python/flask-security/flask-security-3.4.4.ebuild
 2103052309 ./dev-python/flask-security/flask-security-3.4.5.ebuild
 2103040739 ./dev-python/flask-sphinx-themes/flask-sphinx-themes-1.0.2.ebuild
-2101310343 ./dev-python/flask-sqlalchemy/flask-sqlalchemy-2.4.4.ebuild
+2103190239 ./dev-python/flask-sqlalchemy/flask-sqlalchemy-2.4.4-r1.ebuild
+2103190239 ./dev-python/flask-sqlalchemy/flask-sqlalchemy-2.5.1.ebuild
 2101310343 ./dev-python/flask-wtf/flask-wtf-0.14.3.ebuild
 2101310343 ./dev-python/flask/flask-1.1.2-r1.ebuild
 2103021209 ./dev-python/flask/flask-9999.ebuild
@@ -11948,9 +11960,9 @@
 2101310343 ./dev-python/mamba/mamba-0.11.1.ebuild
 2101310343 ./dev-python/mando/mando-0.6.4.ebuild
 2102211139 ./dev-python/manuel/manuel-1.10.1.ebuild
-2101310343 ./dev-python/markdown/markdown-2.6.11.ebuild
 2101310343 ./dev-python/markdown/markdown-3.3.3.ebuild
 2102250109 ./dev-python/markdown/markdown-3.3.4.ebuild
+2103190739 ./dev-python/markdown/markdown-2.6.11.ebuild
 2101242339 ./dev-python/markdown2/markdown2-2.4.0.ebuild
 2103060109 ./dev-python/markups/markups-3.1.1.ebuild
 2103072309 ./dev-python/markups/markups-3.1.0.ebuild
@@ -12568,6 +12580,7 @@
 2103181209 ./dev-python/regex/regex-2021.3.17.ebuild
 2103052209 ./dev-python/rencode/rencode-1.0.6.ebuild
 2101310343 ./dev-python/reno/reno-3.2.0-r1.ebuild
+2103190239 ./dev-python/reno/reno-3.3.0.ebuild
 2102261709 ./dev-python/reportlab/reportlab-3.5.60.ebuild
 2103060109 ./dev-python/reportlab/reportlab-3.5.63.ebuild
 2103100309 ./dev-python/reportlab/reportlab-3.5.64.ebuild
@@ -12619,6 +12632,8 @@
 2103111939 ./dev-python/ruamel-yaml/ruamel-yaml-0.16.13-r1.ebuild
 2101310343 ./dev-python/ryu/ryu-4.34.ebuild
 2103021109 ./dev-python/s3transfer/s3transfer-0.3.4.ebuild
+2103190239 ./dev-python/s3transfer/s3transfer-0.3.5.ebuild
+2103191109 ./dev-python/s3transfer/s3transfer-0.3.6.ebuild
 2101310343 ./dev-python/sabyenc/sabyenc-4.0.2.ebuild
 2101310343 ./dev-python/scandir/scandir-1.10.0-r2.ebuild
 2101310343 ./dev-python/scripttest/scripttest-1.3.0-r1.ebuild
@@ -12957,6 +12972,7 @@
 2103141439 ./dev-python/xmlschema/xmlschema-1.5.3.ebuild
 2103150139 ./dev-python/xmlschema/xmlschema-1.5.1.ebuild
 2103150139 ./dev-python/soupsieve/soupsieve-2.2.ebuild
+2103191109 ./dev-python/soupsieve/soupsieve-2.2.1.ebuild
 2101310343 ./dev-python/alagitpull/alagitpull-0.0.23-r1.ebuild
 2101310343 ./dev-python/pipfile/pipfile-0.0.2.ebuild
 2101310343 ./dev-python/flit/flit-2.1.0.ebuild
@@ -12972,6 +12988,7 @@
 2101310343 ./dev-python/astunparse/astunparse-1.6.3.ebuild
 2101310343 ./dev-python/pyspectrum2/pyspectrum2-0.2.0.ebuild
 2101310343 ./dev-python/lark-parser/lark-parser-0.7.8.ebuild
+2103191109 ./dev-python/lark-parser/lark-parser-0.11.2.ebuild
 2102191209 ./dev-python/pybind11/pybind11-2.6.2.ebuild
 2102251439 ./dev-python/pybind11/pybind11-2.6.1.ebuild
 2103091339 ./dev-python/pyproject2setuppy/pyproject2setuppy-10.ebuild
@@ -13028,6 +13045,7 @@
 2102112340 ./dev-python/tikzplotlib/tikzplotlib-0.9.7.ebuild
 2102121239 ./dev-python/tikzplotlib/tikzplotlib-0.9.8.ebuild
 2012310939 ./dev-python/pydocstyle/pydocstyle-5.1.1.ebuild
+2103191309 ./dev-python/pydocstyle/pydocstyle-6.0.0.ebuild
 2009151139 ./dev-python/spyder-line-profiler/spyder-line-profiler-0.2.1.ebuild
 2009151139 ./dev-python/spyder-memory-profiler/spyder-memory-profiler-0.2.1.ebuild
 2103111039 ./dev-python/spyder-notebook/spyder-notebook-0.3.2.ebuild
@@ -13084,7 +13102,7 @@
 2101310343 ./dev-python/snapshottest/snapshottest-0.5.1.ebuild
 2101310343 ./dev-python/sphinxcontrib-httpexample/sphinxcontrib-httpexample-0.10.3.ebuild
 2101310343 ./dev-python/cbor2/cbor2-5.1.2.ebuild
-2101310343 ./dev-python/cbor2/cbor2-5.2.0.ebuild
+2103191309 ./dev-python/cbor2/cbor2-5.2.0.ebuild
 2101310343 ./dev-python/flatbuffers/flatbuffers-1.12.ebuild
 2101310343 ./dev-python/pypugjs/pypugjs-5.9.5.ebuild
 2101310343 ./dev-python/pypugjs/pypugjs-5.9.8.ebuild
@@ -13272,6 +13290,7 @@
 2103082209 ./dev-python/Faker/Faker-6.5.1.ebuild
 2103101409 ./dev-python/Faker/Faker-6.6.0.ebuild
 2103160039 ./dev-python/Faker/Faker-6.6.1.ebuild
+2103190239 ./dev-python/Faker/Faker-6.6.2.ebuild
 2101310343 ./dev-python/validators/validators-0.18.2.ebuild
 2101161109 ./dev-python/abydos/abydos-0.5.0.ebuild
 2102182039 ./dev-python/cleo/cleo-0.8.1.ebuild
@@ -16200,6 +16219,7 @@
 2103100439 ./dev-util/icmake/icmake-9.03.01.ebuild
 2102150339 ./dev-util/idea-community/idea-community-2020.3.1.203.6682.168.ebuild
 2102150339 ./dev-util/idea-community/idea-community-2021.3.1.203.6682.168.ebuild
+2103181709 ./dev-util/idea-community/idea-community-2021.3.1.203.6682.168-r1.ebuild
 2005151939 ./dev-util/ignition-cmake/ignition-cmake-2.2.0.ebuild
 2010231439 ./dev-util/ignition-cmake/ignition-cmake-2.5.0.ebuild
 2101310343 ./dev-util/imediff2/imediff2-1.1.2-r6.ebuild
@@ -16340,10 +16360,10 @@
 2103151709 ./dev-util/pkgcheck/pkgcheck-0.8.2-r1.ebuild
 2103151639 ./dev-util/pkgcheck/pkgcheck-0.9.3.ebuild
 2103172309 ./dev-util/pkgcheck/pkgcheck-0.9.2.ebuild
-2007131839 ./dev-util/pkgconf/pkgconf-1.7.2.ebuild
 2011142339 ./dev-util/pkgconf/pkgconf-1.6.3.ebuild
 2011252124 ./dev-util/pkgconf/pkgconf-9999.ebuild
 2101081339 ./dev-util/pkgconf/pkgconf-1.7.3-r1.ebuild
+2103181839 ./dev-util/pkgconf/pkgconf-1.7.4.ebuild
 2101070210 ./dev-util/pkgconfig/pkgconfig-0.28-r2.ebuild
 2101070210 ./dev-util/pkgconfig/pkgconfig-0.28-r3.ebuild
 2101070210 ./dev-util/pkgconfig/pkgconfig-0.29.1.ebuild
@@ -16390,8 +16410,7 @@
 2101310343 ./dev-util/rbtools/rbtools-1.0.3.ebuild
 2101310343 ./dev-util/rbtools/rbtools-2.0.ebuild
 2101070210 ./dev-util/re2c/re2c-2.0.3.ebuild
-2007201209 ./dev-util/rebar-bin/rebar-bin-3.13.2.ebuild
-2007201209 ./dev-util/rebar-bin/rebar-bin-3.6.2.ebuild
+2103191209 ./dev-util/rebar-bin/rebar-bin-3.14.4.ebuild
 2006212039 ./dev-util/rebar/rebar-2.6.4-r1.ebuild
 2101310343 ./dev-util/redo/redo-0.42a.ebuild
 2101310343 ./dev-util/redo/redo-0.42c.ebuild
@@ -16478,9 +16497,9 @@
 2012211539 ./dev-util/sysdig/sysdig-0.27.1-r100.ebuild
 2012040439 ./dev-util/sysprof/sysprof-3.36.0-r1.ebuild
 2102172209 ./dev-util/sysprof/sysprof-3.38.1.ebuild
-2103130009 ./dev-util/systemtap/systemtap-4.0-r1.ebuild
-2103130009 ./dev-util/systemtap/systemtap-4.0-r2.ebuild
-2103130009 ./dev-util/systemtap/systemtap-4.4.ebuild
+2103190139 ./dev-util/systemtap/systemtap-4.0-r1.ebuild
+2103190139 ./dev-util/systemtap/systemtap-4.0-r2.ebuild
+2103190139 ./dev-util/systemtap/systemtap-4.4.ebuild
 1903070739 ./dev-util/tinlink/tinlink-1.0.0-r1.ebuild
 1702282250 ./dev-util/tkdiff/tkdiff-4.2.ebuild
 2101230109 ./dev-util/tkdiff/tkdiff-5.1.ebuild
@@ -16708,6 +16727,9 @@
 2102190039 ./dev-vcs/lab/lab-0.19.0.ebuild
 2101310343 ./dev-vcs/git-big-picture/git-big-picture-1.0.0.ebuild
 2101310343 ./dev-vcs/git-big-picture/git-big-picture-1.1.1.ebuild
+2103190509 ./dev-vcs/git-extras/git-extras-6.1.0.ebuild
+2103190709 ./dev-vcs/git-publish/git-publish-1.7.0.ebuild
+2103190709 ./dev-vcs/git-pw/git-pw-2.0.0.ebuild
 2011220009 ./games-action/0verkill/0verkill-0.16-r4.ebuild
 2002112051 ./games-action/abuse/abuse-0.9_p20181213-r1.ebuild
 1906090109 ./games-action/apotheon/apotheon-1.26v.ebuild
@@ -18779,9 +18801,7 @@
 2011242139 ./mail-client/s-nail/s-nail-14.9.19.ebuild
 2103082139 ./mail-client/s-nail/s-nail-14.9.22.ebuild
 2008111639 ./mail-client/sylpheed/sylpheed-3.7.0-r1.ebuild
-2102240109 ./mail-client/thunderbird-bin/thunderbird-bin-78.8.0.ebuild
 2103090209 ./mail-client/thunderbird-bin/thunderbird-bin-78.8.1.ebuild
-2102252139 ./mail-client/thunderbird/thunderbird-78.8.0.ebuild
 2103100439 ./mail-client/thunderbird/thunderbird-78.8.1.ebuild
 2009031539 ./mail-client/trojita/trojita-9999.ebuild
 2012072239 ./mail-client/trojita/trojita-0.7-r6.ebuild
@@ -19215,7 +19235,7 @@
 2103062009 ./media-gfx/cairosvg/cairosvg-2.5.2.ebuild
 2011041109 ./media-gfx/cellwriter/cellwriter-1.3.6.ebuild
 2009181139 ./media-gfx/chafa/chafa-1.4.1.ebuild
-2102140039 ./media-gfx/chafa/chafa-1.6.0.ebuild
+2103191209 ./media-gfx/chafa/chafa-1.6.0.ebuild
 2006071209 ./media-gfx/clockphoto/clockphoto-1.2.ebuild
 1702282250 ./media-gfx/colorhug-client/colorhug-client-0.2.8.ebuild
 2102270139 ./media-gfx/converseen/converseen-0.9.9.0.ebuild
@@ -19278,7 +19298,7 @@
 2102150339 ./media-gfx/freewrl/freewrl-3.0.0-r1.ebuild
 2102150339 ./media-gfx/freewrl/freewrl-9999.ebuild
 1712202239 ./media-gfx/frogr/frogr-1.3.ebuild
-1811272209 ./media-gfx/frogr/frogr-1.5.ebuild
+2103191409 ./media-gfx/frogr/frogr-1.5.ebuild
 2011231209 ./media-gfx/geeqie/geeqie-9999.ebuild
 2012031609 ./media-gfx/geeqie/geeqie-1.5.1.ebuild
 2012041939 ./media-gfx/geeqie/geeqie-1.6.ebuild
@@ -19293,6 +19313,7 @@
 2102192039 ./media-gfx/gimp/gimp-2.10.22-r2.ebuild
 2102150909 ./media-gfx/gmic/gmic-2.9.4.ebuild
 2103150109 ./media-gfx/gmic/gmic-2.9.5.ebuild
+2103191539 ./media-gfx/gmic/gmic-2.9.6.ebuild
 2102270009 ./media-gfx/gnofract4d/gnofract4d-4.3_p20201029.ebuild
 2004202139 ./media-gfx/gnome-font-viewer/gnome-font-viewer-3.34.0.ebuild
 2101310343 ./media-gfx/gnome-photos/gnome-photos-3.34.2.ebuild
@@ -19696,7 +19717,7 @@
 2101061739 ./media-libs/libcuefile/libcuefile-477-r1.ebuild
 2004032241 ./media-libs/libdc1394/libdc1394-2.2.5-r1.ebuild
 2008311239 ./media-libs/libdc1394/libdc1394-2.2.6.ebuild
-2101061739 ./media-libs/libdca/libdca-0.0.7.ebuild
+2103190739 ./media-libs/libdca/libdca-0.0.7.ebuild
 2012291709 ./media-libs/libde265/libde265-9999.ebuild
 2102132239 ./media-libs/libde265/libde265-1.0.8.ebuild
 2012311940 ./media-libs/libdiscid/libdiscid-0.6.2.ebuild
@@ -19949,7 +19970,7 @@
 2101260039 ./media-libs/plib/plib-1.8.5-r3.ebuild
 2012311940 ./media-libs/plotutils/plotutils-2.6-r2.ebuild
 1702282250 ./media-libs/pnglite/pnglite-0.1.17.ebuild
-2101070439 ./media-libs/portaudio/portaudio-19.06.00-r3.ebuild
+2103190639 ./media-libs/portaudio/portaudio-19.06.00-r3.ebuild
 2101310343 ./media-libs/portmidi/portmidi-217-r3.ebuild
 2102221039 ./media-libs/ptex/ptex-2.3.2.ebuild
 2101061739 ./media-libs/qhull/qhull-2015.2.ebuild
@@ -20290,8 +20311,7 @@
 2010180539 ./media-plugins/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi-9999.ebuild
 2101170339 ./media-plugins/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi-8.2.2.ebuild
 2010191639 ./media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-9999.ebuild
-2102210509 ./media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-7.3.3.ebuild
-2103011739 ./media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-7.4.0.ebuild
+2103181739 ./media-plugins/kodi-pvr-vuplus/kodi-pvr-vuplus-7.4.1.ebuild
 2007292139 ./media-plugins/kodi-pvr-wmc/kodi-pvr-wmc-9999.ebuild
 2101211909 ./media-plugins/kodi-pvr-wmc/kodi-pvr-wmc-6.1.1.ebuild
 2008140009 ./media-plugins/kodi-screensaver-asteroids/kodi-screensaver-asteroids-2.4.2-r1.ebuild
@@ -21371,8 +21391,8 @@
 2103160009 ./net-analyzer/hydra/hydra-9.0-r1.ebuild
 2103160009 ./net-analyzer/hydra/hydra-9.0.ebuild
 2103160139 ./net-analyzer/hydra/hydra-9.1.ebuild
-2103160009 ./net-analyzer/hydra/hydra-9.2.ebuild
-2103160009 ./net-analyzer/hydra/hydra-9999999.ebuild
+2103190539 ./net-analyzer/hydra/hydra-9.2.ebuild
+2103190539 ./net-analyzer/hydra/hydra-9999999.ebuild
 2011270339 ./net-analyzer/ibmonitor/ibmonitor-1.4-r1.ebuild
 2010161509 ./net-analyzer/icinga2/icinga2-9999.ebuild
 2012242009 ./net-analyzer/icinga2/icinga2-2.12.3.ebuild
@@ -21737,6 +21757,7 @@
 2101310343 ./net-dns/dnsviz/dnsviz-0.8.2.ebuild
 2101310343 ./net-dns/dnsviz/dnsviz-0.9.1.ebuild
 2102092209 ./net-dns/dnsviz/dnsviz-0.9.2.ebuild
+2103182339 ./net-dns/dnsviz/dnsviz-0.9.3.ebuild
 2101061809 ./net-dns/dnswalk/dnswalk-2.0.2.ebuild
 1711140442 ./net-dns/ez-ipupdate/ez-ipupdate-3.0.11.13.3_beta8-r3.ebuild
 1702282250 ./net-dns/fpdns/fpdns-0.10.0_pre20130404-r1.ebuild
@@ -22521,6 +22542,7 @@
 2009150409 ./net-mail/ripmime/ripmime-1.4.0.10-r1.ebuild
 2012311940 ./net-mail/ripole/ripole-0.2.2.ebuild
 2102010209 ./net-mail/rss2email/rss2email-3.12.2-r1.ebuild
+2103190539 ./net-mail/rss2email/rss2email-3.12.3.ebuild
 1801032209 ./net-mail/safecat/safecat-1.13.ebuild
 1912111540 ./net-mail/sendEmail/sendEmail-1.56-r2.ebuild
 2009192109 ./net-mail/serialmail/serialmail-0.75-r5.ebuild
@@ -22566,9 +22588,12 @@
 2001232039 ./net-misc/asterisk-g729/asterisk-g729-13.0.3.1.9.ebuild
 2004131109 ./net-misc/asterisk-g729/asterisk-g729-16.0.3.1.9.ebuild
 2007201539 ./net-misc/asterisk-moh-opsound/asterisk-moh-opsound-2.03-r1.ebuild
-2103071509 ./net-misc/asterisk/asterisk-13.38.1-r2.ebuild
-2103091309 ./net-misc/asterisk/asterisk-13.38.2.ebuild
-2103091309 ./net-misc/asterisk/asterisk-16.16.2.ebuild
+2103191209 ./net-misc/asterisk/asterisk-13.38.1-r2.ebuild
+2103191209 ./net-misc/asterisk/asterisk-13.38.2-r1.ebuild
+2103191209 ./net-misc/asterisk/asterisk-13.38.2.ebuild
+2103191209 ./net-misc/asterisk/asterisk-16.16.2-r1.ebuild
+2103191209 ./net-misc/asterisk/asterisk-16.16.2.ebuild
+2103191209 ./net-misc/asterisk/asterisk-18.2.2.ebuild
 2012281609 ./net-misc/astmanproxy/astmanproxy-1.28.2.ebuild
 1910022239 ./net-misc/autossh/autossh-1.4g.ebuild
 1911110039 ./net-misc/autoupnp/autoupnp-0.4.7.ebuild
@@ -22638,8 +22663,8 @@
 2006042139 ./net-misc/dhcpcd/dhcpcd-9999.ebuild
 2012282309 ./net-misc/dhcpcd/dhcpcd-9.4.0.ebuild
 2101250409 ./net-misc/dhcpcd/dhcpcd-8.1.9-r1.ebuild
-2103171139 ./net-misc/dhcpcd/dhcpcd-9.3.4.ebuild
 2103171139 ./net-misc/dhcpcd/dhcpcd-9.4.0-r1.ebuild
+2103182209 ./net-misc/dhcpcd/dhcpcd-9.3.4.ebuild
 2012231444 ./net-misc/dhcping/dhcping-1.2.ebuild
 2007241439 ./net-misc/dibbler/dibbler-1.0.1-r2.ebuild
 2007241439 ./net-misc/dibbler/dibbler-1.0.1-r3.ebuild
@@ -22651,6 +22676,7 @@
 2101310343 ./net-misc/dropbox-cli/dropbox-cli-2020.03.04.ebuild
 2102081009 ./net-misc/dropbox-cli/dropbox-cli-2020.03.04-r1.ebuild
 2103071639 ./net-misc/dropbox/dropbox-117.4.378.ebuild
+2103191209 ./net-misc/dropbox/dropbox-118.4.460.ebuild
 2102191139 ./net-misc/econnman/econnman-1.1-r2.ebuild
 2009050409 ./net-misc/efax/efax-0.9a_p19_p1.ebuild
 2012310209 ./net-misc/electron-cash/electron-cash-4.2.3.ebuild
@@ -22791,7 +22817,7 @@
 2011011039 ./net-misc/miniupnpd/miniupnpd-2.2.0.ebuild
 2012211239 ./net-misc/miniupnpd/miniupnpd-2.2.1.ebuild
 2012311940 ./net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20190618.ebuild
-2103121839 ./net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20201225.ebuild
+2103182209 ./net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20201225.ebuild
 2012142009 ./net-misc/modemmanager/modemmanager-1.10.0.ebuild
 2012142009 ./net-misc/modemmanager/modemmanager-1.8.2-r1.ebuild
 2103121839 ./net-misc/modemmanager/modemmanager-1.14.8.ebuild
@@ -23022,7 +23048,7 @@
 2101061839 ./net-misc/unison/unison-2.48.15_p4-r2.ebuild
 2101061839 ./net-misc/unison/unison-2.51.3_p20201024.ebuild
 2103091309 ./net-misc/unison/unison-2.51.3_p20201127.ebuild
-2103091309 ./net-misc/unison/unison-2.51.4_rc1.ebuild
+2103191039 ./net-misc/unison/unison-2.51.4_rc2.ebuild
 2012311940 ./net-misc/unix2tcp/unix2tcp-0.8.2-r1.ebuild
 2011290239 ./net-misc/usbip/usbip-4.13-r1.ebuild
 2003072009 ./net-misc/utelnetd/utelnetd-0.1.11-r2.ebuild
@@ -23031,6 +23057,7 @@
 2011070709 ./net-misc/vde/vde-2.3.2-r6.ebuild
 2102150339 ./net-misc/vde/vde-2.3.2_p20191011.ebuild
 2102150339 ./net-misc/vde/vde-9999.ebuild
+2103181909 ./net-misc/vde/vde-2.3.2_p20191011-r1.ebuild
 2004022239 ./net-misc/vinagre/vinagre-3.22.0-r3.ebuild
 2004202139 ./net-misc/vino/vino-3.22.0-r3.ebuild
 2012231444 ./net-misc/vmnet/vmnet-0.4.ebuild
@@ -23102,6 +23129,7 @@
 1911091712 ./net-nds/led/led-1.111.ebuild
 2101310343 ./net-nds/nsscache/nsscache-0.39.ebuild
 2103071509 ./net-nds/openldap/openldap-2.4.57.ebuild
+2103191309 ./net-nds/openldap/openldap-2.4.58.ebuild
 1912052009 ./net-nds/phpldapadmin/phpldapadmin-1.2.5.ebuild
 2003261841 ./net-nds/rpcbind/rpcbind-9999.ebuild
 2004032241 ./net-nds/rpcbind/rpcbind-1.2.5.ebuild
@@ -23165,8 +23193,8 @@
 2101310343 ./net-p2p/deluge/deluge-9999.ebuild
 2102191539 ./net-p2p/deluge/deluge-2.0.3-r8.ebuild
 1902152239 ./net-p2p/ed2k_hash/ed2k_hash-0.4.0-r2.ebuild
-2103040909 ./net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild
-2103091239 ./net-p2p/eiskaltdcpp/eiskaltdcpp-2.4.2.ebuild
+2103190739 ./net-p2p/eiskaltdcpp/eiskaltdcpp-2.4.2.ebuild
+2103190739 ./net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild
 2003182109 ./net-p2p/fms/fms-0.3.82.ebuild
 1909141409 ./net-p2p/freenet/freenet-0.7.5_p1484.ebuild
 2008161009 ./net-p2p/freenet/freenet-0.7.5_p1486.ebuild
@@ -23291,6 +23319,10 @@
 2103031909 ./net-proxy/haproxy/haproxy-2.2.10.ebuild
 2103031839 ./net-proxy/haproxy/haproxy-2.3.6.ebuild
 2103161839 ./net-proxy/haproxy/haproxy-2.3.7.ebuild
+2103191509 ./net-proxy/haproxy/haproxy-1.8.29.ebuild
+2103181809 ./net-proxy/haproxy/haproxy-2.0.21.ebuild
+2103181709 ./net-proxy/haproxy/haproxy-2.1.12.ebuild
+2103181709 ./net-proxy/haproxy/haproxy-2.2.11.ebuild
 2101310343 ./net-proxy/hatop/hatop-0.8.0.ebuild
 1702282250 ./net-proxy/havp/havp-0.92a-r2.ebuild
 2103011239 ./net-proxy/mitmproxy/mitmproxy-6.0.2.ebuild
@@ -23410,7 +23442,7 @@
 2012130039 ./net-vpn/frp/frp-0.34.3.ebuild
 2103060509 ./net-vpn/frp/frp-0.35.1.ebuild
 2103170739 ./net-vpn/frp/frp-0.36.0.ebuild
-2103081139 ./net-vpn/fp-multiuser/fp-multiuser-0.0.2.ebuild
+2103182339 ./net-vpn/fp-multiuser/fp-multiuser-0.0.2.ebuild
 2102172009 ./net-wireless/aircrack-ng/aircrack-ng-1.6_p20200722.ebuild
 2102172009 ./net-wireless/aircrack-ng/aircrack-ng-9999.ebuild
 1912040339 ./net-wireless/airspy/airspy-1.0.9.ebuild
@@ -23983,9 +24015,8 @@
 2101022239 ./sci-calculators/transcalc/transcalc-0.14-r2.ebuild
 2102121709 ./sci-calculators/units/units-2.21.ebuild
 2011170309 ./sci-calculators/wcalc/wcalc-2.5.ebuild
-2102221809 ./sci-calculators/bc-gh/bc-gh-3.3.0.ebuild
-2103041739 ./sci-calculators/bc-gh/bc-gh-3.3.2.ebuild
 2103051939 ./sci-calculators/bc-gh/bc-gh-3.3.3.ebuild
+2103191039 ./sci-calculators/bc-gh/bc-gh-3.3.4.ebuild
 2102150339 ./sci-chemistry/GromacsWrapper/GromacsWrapper-0.8.0.ebuild
 2101310343 ./sci-chemistry/MDAnalysis/MDAnalysis-1.0.0.ebuild
 1902052209 ./sci-chemistry/aqua/aqua-3.2-r3.ebuild
@@ -24593,7 +24624,7 @@
 2103030639 ./sci-mathematics/gfan/gfan-0.6.2-r1.ebuild
 2002140110 ./sci-mathematics/ggnfs/ggnfs-0.77.1-r2.ebuild
 2011171139 ./sci-mathematics/gimps/gimps-30.3.6.ebuild
-2102221809 ./sci-mathematics/gimps/gimps-30.4.9.ebuild
+2103191039 ./sci-mathematics/gimps/gimps-30.5.1.ebuild
 2102161539 ./sci-mathematics/ginac/ginac-1.7.11.ebuild
 2101061839 ./sci-mathematics/glpk/glpk-4.65.ebuild
 2101061839 ./sci-mathematics/glpk/glpk-5.0.ebuild
@@ -25408,7 +25439,7 @@
 2101310343 ./sys-apps/file/file-5.38-r1.ebuild
 2101310343 ./sys-apps/file/file-5.39-r3.ebuild
 2101310343 ./sys-apps/file/file-9999.ebuild
-2103171209 ./sys-apps/file/file-5.39-r4.ebuild
+2103191209 ./sys-apps/file/file-5.39-r4.ebuild
 2101310343 ./sys-apps/findutils/findutils-4.7.0.ebuild
 2101310343 ./sys-apps/findutils/findutils-4.8.0.ebuild
 2003160109 ./sys-apps/firejail-lts/firejail-lts-0.9.56.2-r1.ebuild
@@ -25445,9 +25476,9 @@
 1910130039 ./sys-apps/gradm/gradm-3.1.201608131257.ebuild
 1910130039 ./sys-apps/gradm/gradm-3.1.201708012022.ebuild
 2002241139 ./sys-apps/gradm/gradm-3.1.201903191516.ebuild
-2101061839 ./sys-apps/grep/grep-3.4.ebuild
-2101061839 ./sys-apps/grep/grep-3.5.ebuild
-2101061839 ./sys-apps/grep/grep-3.6.ebuild
+2103191409 ./sys-apps/grep/grep-3.4.ebuild
+2103191409 ./sys-apps/grep/grep-3.5.ebuild
+2103191409 ./sys-apps/grep/grep-3.6.ebuild
 1702282250 ./sys-apps/grepcidr/grepcidr-2.0.ebuild
 2103142209 ./sys-apps/groff/groff-1.22.4.ebuild
 2002100339 ./sys-apps/gscanbus/gscanbus-0.8.ebuild
@@ -26854,6 +26885,8 @@
 2103172009 ./sys-kernel/gentoo-sources/gentoo-sources-4.9.262.ebuild
 2103172209 ./sys-kernel/gentoo-sources/gentoo-sources-5.11.7.ebuild
 2103172209 ./sys-kernel/gentoo-sources/gentoo-sources-5.4.106.ebuild
+2103182009 ./sys-kernel/gentoo-sources/gentoo-sources-5.10.24.ebuild
+2103190209 ./sys-kernel/gentoo-sources/gentoo-sources-5.11.7-r1.ebuild
 2103061939 ./sys-kernel/git-sources/git-sources-5.12_rc2.ebuild
 2103150139 ./sys-kernel/git-sources/git-sources-5.12_rc3.ebuild
 2101310343 ./sys-kernel/kergen/kergen-0.1.5.ebuild
@@ -26890,6 +26923,7 @@
 2102151909 ./sys-kernel/pf-sources/pf-sources-5.11_p1.ebuild
 2102202009 ./sys-kernel/pf-sources/pf-sources-5.11_p2.ebuild
 2103081939 ./sys-kernel/pf-sources/pf-sources-5.11_p3.ebuild
+2103190939 ./sys-kernel/pf-sources/pf-sources-5.11_p4.ebuild
 1903250339 ./sys-kernel/raspberrypi-image/raspberrypi-image-4.14.98_p20190215.ebuild
 1912031639 ./sys-kernel/raspberrypi-image/raspberrypi-image-4.19.75_p20190925.ebuild
 2011230809 ./sys-kernel/raspberrypi-image/raspberrypi-image-9999.ebuild
@@ -26993,8 +27027,8 @@
 2103112209 ./sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.105.ebuild
 2103110809 ./sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.97-r1.ebuild
 2103180339 ./sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.24.ebuild
-2103180339 ./sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.11.7.ebuild
 2103180339 ./sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.106.ebuild
+2103190239 ./sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.11.7.ebuild
 2102180209 ./sys-kernel/gentoo-kernel/gentoo-kernel-5.10.17.ebuild
 2102180209 ./sys-kernel/gentoo-kernel/gentoo-kernel-5.4.99.ebuild
 2102190339 ./sys-kernel/gentoo-kernel/gentoo-kernel-5.4.94.ebuild
@@ -27017,8 +27051,8 @@
 2103112209 ./sys-kernel/gentoo-kernel/gentoo-kernel-5.4.105.ebuild
 2103110809 ./sys-kernel/gentoo-kernel/gentoo-kernel-5.4.97.ebuild
 2103180339 ./sys-kernel/gentoo-kernel/gentoo-kernel-5.10.24.ebuild
-2103180339 ./sys-kernel/gentoo-kernel/gentoo-kernel-5.11.7.ebuild
 2103180339 ./sys-kernel/gentoo-kernel/gentoo-kernel-5.4.106.ebuild
+2103190239 ./sys-kernel/gentoo-kernel/gentoo-kernel-5.11.7.ebuild
 2101310343 ./sys-kernel/bliss-initramfs/bliss-initramfs-8.1.0-r1.ebuild
 2101310343 ./sys-kernel/bliss-initramfs/bliss-initramfs-9.3.0.ebuild
 2007152309 ./sys-kernel/bliss-kernel-bin/bliss-kernel-bin-4.14.178.ebuild
@@ -27850,6 +27884,7 @@
 1808061609 ./www-client/jd/jd-2.8.5_p120826.ebuild
 1808081609 ./www-client/jd/jd-2.8.9_p150226.ebuild
 2101061509 ./www-client/links/links-2.21.ebuild
+2103182339 ./www-client/links/links-2.22.ebuild
 2101180039 ./www-client/luakit/luakit-2.2.1-r100.ebuild
 2101180039 ./www-client/luakit/luakit-9999.ebuild
 2102271409 ./www-client/lynx/lynx-2.9.0_pre6-r1.ebuild
@@ -27873,7 +27908,7 @@
 2101310343 ./www-client/seamonkey/seamonkey-2.53.6.ebuild
 2103121839 ./www-client/seamonkey/seamonkey-2.53.7_beta1.ebuild
 1902071439 ./www-client/surf/surf-2.0.ebuild
-1904291109 ./www-client/surf/surf-9999.ebuild
+2103181439 ./www-client/surf/surf-9999.ebuild
 2009241739 ./www-client/surfraw/surfraw-99999.ebuild
 2103060139 ./www-client/surfraw/surfraw-2.3.0-r3.ebuild
 2012281609 ./www-client/uget/uget-9999.ebuild
@@ -29230,7 +29265,7 @@
 1804280439 ./x11-wm/matwm2/matwm2-0.1.2_pre3-r1.ebuild
 2007130039 ./x11-wm/metacity/metacity-3.36.1.ebuild
 2103011609 ./x11-wm/muffin/muffin-4.6.3.ebuild
-2103011609 ./x11-wm/muffin/muffin-4.8.1.ebuild
+2103190639 ./x11-wm/muffin/muffin-4.8.1.ebuild
 1906051039 ./x11-wm/musca/musca-0.9.24_p20100226-r4.ebuild
 2012102109 ./x11-wm/mutter/mutter-3.38.2.ebuild
 2101180139 ./x11-wm/mutter/mutter-3.38.3.ebuild
@@ -29361,6 +29396,7 @@
 2102080909 ./xfce-extra/xfdashboard/xfdashboard-0.8.0.ebuild
 2103041809 ./xfce-extra/xfdashboard/xfdashboard-0.8.1.ebuild
 2103051539 ./xfce-extra/xfdashboard/xfdashboard-0.9.0.ebuild
+2103191309 ./xfce-extra/xfdashboard/xfdashboard-0.9.1.ebuild
 2012231209 ./xfce-extra/xfce4-calculator-plugin/xfce4-calculator-plugin-0.7.1.ebuild
 2101010309 ./skel.ebuild
 2101092109 metadata/md5-cache/acct-group/abrt-0-r1
@@ -31794,9 +31830,10 @@
 2103141909 metadata/md5-cache/app-editors/emacs-28.0.9999
 2103142139 metadata/md5-cache/app-editors/neovim-0.4.4-r100
 2103150209 metadata/md5-cache/app-editors/dhex-0.69
-2103171909 metadata/md5-cache/app-editors/Manifest.gz
 2103170639 metadata/md5-cache/app-editors/ne-3.3.0
 2103171909 metadata/md5-cache/app-editors/wxhexeditor-0.24-r1
+2103182009 metadata/md5-cache/app-editors/Manifest.gz
+2103182009 metadata/md5-cache/app-editors/emacs-27.2_rc1
 2102151209 metadata/md5-cache/app-emacs/actionscript-mode-7.2.2_p20180527
 2102151209 metadata/md5-cache/app-emacs/adaptive-wrap-0.7
 2102151209 metadata/md5-cache/app-emacs/analog-1.9.99
@@ -32134,7 +32171,6 @@
 2101231224 metadata/md5-cache/app-emulation/dosemu-1.4.1_pre20130107-r5
 2101231224 metadata/md5-cache/app-emulation/fs-uae-3.0.5
 2101231224 metadata/md5-cache/app-emulation/fuse-1.5.7
-2101231224 metadata/md5-cache/app-emulation/fuse-utils-1.4.3
 2101231224 metadata/md5-cache/app-emulation/gxemul-0.6.2
 2101231224 metadata/md5-cache/app-emulation/hercules-3.10
 2101231224 metadata/md5-cache/app-emulation/hercules-3.12
@@ -32295,9 +32331,7 @@
 2103111213 metadata/md5-cache/app-emulation/virt-manager-9999
 2103111213 metadata/md5-cache/app-emulation/virtualbox-6.1.16-r1
 2103111213 metadata/md5-cache/app-emulation/virtualbox-6.1.18
-2103111213 metadata/md5-cache/app-emulation/xen-4.13.2-r4
 2103111213 metadata/md5-cache/app-emulation/xen-4.13.2-r5
-2103111213 metadata/md5-cache/app-emulation/xen-4.14.1-r1
 2103111213 metadata/md5-cache/app-emulation/xen-tools-4.13.2-r2
 2103111213 metadata/md5-cache/app-emulation/xen-tools-4.14.1
 2103121839 metadata/md5-cache/app-emulation/protontricks-1.4.3
@@ -32308,8 +32342,13 @@
 2103150209 metadata/md5-cache/app-emulation/wine-vanilla-6.4
 2103152309 metadata/md5-cache/app-emulation/libvirt-9999
 2103151609 metadata/md5-cache/app-emulation/protontricks-1.4.4
-2103171109 metadata/md5-cache/app-emulation/Manifest.gz
 2103171109 metadata/md5-cache/app-emulation/conmon-2.0.27
+2103191409 metadata/md5-cache/app-emulation/Manifest.gz
+2103191409 metadata/md5-cache/app-emulation/fuse-1.6.0
+2103181809 metadata/md5-cache/app-emulation/fuse-utils-1.4.3-r1
+2103181709 metadata/md5-cache/app-emulation/libspectrum-1.5.0
+2103182339 metadata/md5-cache/app-emulation/xen-4.13.2-r6
+2103182339 metadata/md5-cache/app-emulation/xen-4.14.1-r2
 1908281739 metadata/md5-cache/app-eselect/eselect-infinality-1-r1
 1908281739 metadata/md5-cache/app-eselect/eselect-infinality-1.1
 1708300239 metadata/md5-cache/app-eselect/eselect-renpy-0.7
@@ -34823,9 +34862,10 @@
 2103132339 metadata/md5-cache/dev-db/vsqlite++-0.3.13-r1
 2103150509 metadata/md5-cache/dev-db/redis-5.0.12
 2103150509 metadata/md5-cache/dev-db/redis-6.0.12
-2103180009 metadata/md5-cache/dev-db/Manifest.gz
 2103171209 metadata/md5-cache/dev-db/lmdb-0.9.28
 2103180009 metadata/md5-cache/dev-db/mysql-connector-c-8.0.23-r1
+2103182009 metadata/md5-cache/dev-db/Manifest.gz
+2103182009 metadata/md5-cache/dev-db/pg_activity-2.1.3
 2005162339 metadata/md5-cache/dev-dotnet/ndesk-dbus-0.6.1a
 2005162339 metadata/md5-cache/dev-dotnet/ndesk-dbus-glib-0.4.1
 2101231224 metadata/md5-cache/dev-dotnet/dbus-sharp-glib-0.5.0-r1
@@ -36823,7 +36863,6 @@
 2102192309 metadata/md5-cache/dev-lang/sassc-3.6.1
 2102201339 metadata/md5-cache/dev-lang/julia-1.5.2-r1
 2102201339 metadata/md5-cache/dev-lang/julia-1.5.3
-2102221939 metadata/md5-cache/dev-lang/moarvm-2021.02
 2102221939 metadata/md5-cache/dev-lang/nqp-2021.02
 2102202239 metadata/md5-cache/dev-lang/pcc-1.1.0-r1
 2102221939 metadata/md5-cache/dev-lang/rakudo-2021.02
@@ -36938,15 +36977,17 @@
 2103152139 metadata/md5-cache/dev-lang/vala-0.48.12
 2103160139 metadata/md5-cache/dev-lang/ghc-8.10.4
 2103162239 metadata/md5-cache/dev-lang/mlton-20180207
-2103170509 metadata/md5-cache/dev-lang/Manifest.gz
 2103170509 metadata/md5-cache/dev-lang/mujs-1.0.9
 2103170509 metadata/md5-cache/dev-lang/mujs-1.1.0
 2103170039 metadata/md5-cache/dev-lang/python-2.7.18_p7
 2103170039 metadata/md5-cache/dev-lang/python-3.10.0_alpha6-r2
-2103170039 metadata/md5-cache/dev-lang/python-3.6.13
 2103170039 metadata/md5-cache/dev-lang/python-3.7.10
 2103170039 metadata/md5-cache/dev-lang/python-3.8.8
-2103170039 metadata/md5-cache/dev-lang/python-3.9.2
+2103190739 metadata/md5-cache/dev-lang/Manifest.gz
+2103190209 metadata/md5-cache/dev-lang/elixir-1.11.4
+2103190739 metadata/md5-cache/dev-lang/moarvm-2021.02
+2103182209 metadata/md5-cache/dev-lang/python-3.6.13
+2103182209 metadata/md5-cache/dev-lang/python-3.9.2
 1808290309 metadata/md5-cache/dev-libs/bcm2835-1.57
 1908180639 metadata/md5-cache/dev-libs/darts-0.32
 1702282313 metadata/md5-cache/dev-libs/libb64-1.2.1
@@ -37317,7 +37358,6 @@
 2101272109 metadata/md5-cache/dev-libs/libevent-2.1.12
 2101271839 metadata/md5-cache/dev-libs/libfastjson-0.99.9
 2101300839 metadata/md5-cache/dev-libs/libtommath-1.2.0
-2102031139 metadata/md5-cache/dev-libs/libsigsegv-2.13
 2102030009 metadata/md5-cache/dev-libs/tomsfastmath-0.13.1-r1
 2102030309 metadata/md5-cache/dev-libs/uthash-2.2.0
 2102040039 metadata/md5-cache/dev-libs/libpipeline-1.5.3
@@ -37363,7 +37403,6 @@
 2102182339 metadata/md5-cache/dev-libs/xmlsec-1.2.31
 2102192109 metadata/md5-cache/dev-libs/dbus-c++-0.9.0-r4
 2102192109 metadata/md5-cache/dev-libs/hidapi-0.8.0_rc1_p20140719-r1
-2102200709 metadata/md5-cache/dev-libs/libtomcrypt-1.18.2-r2
 2102191509 metadata/md5-cache/dev-libs/userspace-rcu-0.12.2
 2102211641 metadata/md5-cache/dev-libs/atcore-1.0.0
 2102211641 metadata/md5-cache/dev-libs/avro-c-1.9.1
@@ -37417,8 +37456,6 @@
 2102211609 metadata/md5-cache/dev-libs/nspr-4.28
 2102211609 metadata/md5-cache/dev-libs/nspr-4.29
 2102211609 metadata/md5-cache/dev-libs/nss-3.58-r2
-2102211609 metadata/md5-cache/dev-libs/nss-3.60.1
-2102211609 metadata/md5-cache/dev-libs/nss-3.61
 2102211609 metadata/md5-cache/dev-libs/nss-3.62
 2102211641 metadata/md5-cache/dev-libs/pegtl-2.8.3-r1
 2102222209 metadata/md5-cache/dev-libs/pegtl-3.2.0
@@ -37501,7 +37538,6 @@
 2102241843 metadata/md5-cache/dev-libs/collada-dom-9999
 2102241843 metadata/md5-cache/dev-libs/dietlibc-0.34_pre20140729-r1
 2102241843 metadata/md5-cache/dev-libs/eventlog-0.2.12
-2102241843 metadata/md5-cache/dev-libs/fddl-20111124-r1
 2102241843 metadata/md5-cache/dev-libs/ferrisloki-3.0.13-r2
 2102241843 metadata/md5-cache/dev-libs/ffcall-2.1
 2102241843 metadata/md5-cache/dev-libs/gdl-3.34.0
@@ -37530,8 +37566,6 @@
 2102241843 metadata/md5-cache/dev-libs/libgpuarray-0.6.7
 2102241843 metadata/md5-cache/dev-libs/libgudev-233-r1
 2102241843 metadata/md5-cache/dev-libs/libindicate-12.10.1-r3
-2102241843 metadata/md5-cache/dev-libs/libindicator-12.10.1-r201
-2102241843 metadata/md5-cache/dev-libs/libindicator-12.10.1-r301
 2102241843 metadata/md5-cache/dev-libs/libmateweather-1.24.0-r1
 2102241843 metadata/md5-cache/dev-libs/libmateweather-1.24.1
 2102241843 metadata/md5-cache/dev-libs/libmba-0.9.1-r3
@@ -37859,7 +37893,6 @@
 2103161639 metadata/md5-cache/dev-libs/libmcrypt-2.5.8-r4
 2103162139 metadata/md5-cache/dev-libs/libpwquality-1.4.4
 2103162139 metadata/md5-cache/dev-libs/vala-common-0.48.12
-2103180009 metadata/md5-cache/dev-libs/Manifest.gz
 2103170139 metadata/md5-cache/dev-libs/cyrus-sasl-2.1.27-r4
 2103170109 metadata/md5-cache/dev-libs/hyphen-2.8.8-r1
 2103170109 metadata/md5-cache/dev-libs/liblinear-243
@@ -37867,7 +37900,15 @@
 2103180009 metadata/md5-cache/dev-libs/nspr-4.30
 2103170039 metadata/md5-cache/dev-libs/ntl-11.4.4
 2103172109 metadata/md5-cache/dev-libs/simdjson-0.9.0
-2103170039 metadata/md5-cache/dev-libs/tree-sitter-0.19.3
+2103191609 metadata/md5-cache/dev-libs/Manifest.gz
+2103191609 metadata/md5-cache/dev-libs/fddl-20111124-r1
+2103191409 metadata/md5-cache/dev-libs/libindicator-12.10.1-r201
+2103191409 metadata/md5-cache/dev-libs/libindicator-12.10.1-r301
+2103182339 metadata/md5-cache/dev-libs/libsigsegv-2.13
+2103190539 metadata/md5-cache/dev-libs/libtomcrypt-1.18.2-r2
+2103191239 metadata/md5-cache/dev-libs/nss-3.63
+2103190039 metadata/md5-cache/dev-libs/tree-sitter-0.19.4
+2103182139 metadata/md5-cache/dev-libs/uriparser-0.9.5
 2012231444 metadata/md5-cache/dev-lisp/hyperspec-7.0-r1
 2101231224 metadata/md5-cache/dev-lisp/roswell-20.01.14.104
 2101231224 metadata/md5-cache/dev-lisp/roswell-20.04.14.105
@@ -38215,8 +38256,10 @@
 2103150109 metadata/md5-cache/dev-ml/ocaml-ctypes-0.17.1
 2103150709 metadata/md5-cache/dev-ml/opam-installer-2.0.8-r1
 2103150709 metadata/md5-cache/dev-ml/ppx_tools_versioned-5.4.0
-2103171239 metadata/md5-cache/dev-ml/Manifest.gz
 2103171209 metadata/md5-cache/dev-ml/ocamlnet-4.1.8-r1
+2103191339 metadata/md5-cache/dev-ml/Manifest.gz
+2103191339 metadata/md5-cache/dev-ml/merlin-3.4.2
+2103191339 metadata/md5-cache/dev-ml/merlin-4.1
 1910170740 metadata/md5-cache/dev-perl/Apache-CGI-Builder-1.300.0-r2
 1910170740 metadata/md5-cache/dev-perl/Apache2-AuthenNTLM-0.20.0-r2
 1910170740 metadata/md5-cache/dev-perl/Bio-Das-1.170.0-r2
@@ -40880,7 +40923,6 @@
 2103111213 metadata/md5-cache/dev-python/catkin_pkg-9999
 2103111213 metadata/md5-cache/dev-python/cbor-1.0.0-r1
 2103111213 metadata/md5-cache/dev-python/cbor2-5.1.2
-2103111213 metadata/md5-cache/dev-python/cbor2-5.2.0
 2103111213 metadata/md5-cache/dev-python/certifi-10001-r1
 2103111213 metadata/md5-cache/dev-python/cffi-1.14.4
 2103111213 metadata/md5-cache/dev-python/cfn-python-lint-0.46.0
@@ -41162,7 +41204,6 @@
 2103111213 metadata/md5-cache/dev-python/flask-security-3.4.5
 2103111213 metadata/md5-cache/dev-python/flask-security-4.0.0
 2103111213 metadata/md5-cache/dev-python/flask-sphinx-themes-1.0.2
-2103111213 metadata/md5-cache/dev-python/flask-sqlalchemy-2.4.4
 2103111213 metadata/md5-cache/dev-python/flask-wtf-0.14.3
 2103111213 metadata/md5-cache/dev-python/flatbuffers-1.12
 2103111213 metadata/md5-cache/dev-python/fleep-1.0.1
@@ -41451,7 +41492,6 @@
 2103111213 metadata/md5-cache/dev-python/mamba-0.11.1
 2103111213 metadata/md5-cache/dev-python/mando-0.6.4
 2103111213 metadata/md5-cache/dev-python/manuel-1.10.1
-2103111213 metadata/md5-cache/dev-python/markdown-2.6.11
 2103111213 metadata/md5-cache/dev-python/markdown-3.3.3
 2103111213 metadata/md5-cache/dev-python/markdown-3.3.4
 2103111213 metadata/md5-cache/dev-python/markdown2-2.4.0
@@ -42732,7 +42772,6 @@
 2103171109 metadata/md5-cache/dev-python/virtualenv-20.4.3
 2103171639 metadata/md5-cache/dev-python/xlrd-2.0.1
 2103172239 metadata/md5-cache/dev-python/zope-testrunner-5.3.0
-2103181239 metadata/md5-cache/dev-python/Manifest.gz
 2103181239 metadata/md5-cache/dev-python/boto3-1.17.30
 2103181239 metadata/md5-cache/dev-python/botocore-1.20.30
 2103181209 metadata/md5-cache/dev-python/phonenumbers-8.12.20
@@ -42742,6 +42781,22 @@
 2103181209 metadata/md5-cache/dev-python/rfc3986-validator-0.1.1
 2103181209 metadata/md5-cache/dev-python/rfc3987-1.3.8-r1
 2103181239 metadata/md5-cache/dev-python/sqlalchemy-1.4.1
+2103190239 metadata/md5-cache/dev-python/Faker-6.6.2
+2103191309 metadata/md5-cache/dev-python/Manifest.gz
+2103190239 metadata/md5-cache/dev-python/boto3-1.17.31
+2103191109 metadata/md5-cache/dev-python/boto3-1.17.32
+2103190239 metadata/md5-cache/dev-python/botocore-1.20.31
+2103191109 metadata/md5-cache/dev-python/botocore-1.20.32
+2103191309 metadata/md5-cache/dev-python/cbor2-5.2.0
+2103190239 metadata/md5-cache/dev-python/flask-sqlalchemy-2.4.4-r1
+2103190239 metadata/md5-cache/dev-python/flask-sqlalchemy-2.5.1
+2103191109 metadata/md5-cache/dev-python/lark-parser-0.11.2
+2103190739 metadata/md5-cache/dev-python/markdown-2.6.11
+2103191309 metadata/md5-cache/dev-python/pydocstyle-6.0.0
+2103190239 metadata/md5-cache/dev-python/reno-3.3.0
+2103190239 metadata/md5-cache/dev-python/s3transfer-0.3.5
+2103191109 metadata/md5-cache/dev-python/s3transfer-0.3.6
+2103191109 metadata/md5-cache/dev-python/soupsieve-2.2.1
 2101101239 metadata/md5-cache/dev-qt/qt-docs-5.15.2_p202011130614
 2101231224 metadata/md5-cache/dev-qt/qtchooser-66
 2101231224 metadata/md5-cache/dev-qt/qtlockedfile-2.4.1_p20171024
@@ -45313,8 +45368,6 @@
 2005042309 metadata/md5-cache/dev-util/abootimg-20150323
 2005150039 metadata/md5-cache/dev-util/opencl-headers-2020.03.13-r1
 2007092039 metadata/md5-cache/dev-util/shellcheck-bin-0.7.1
-2007201209 metadata/md5-cache/dev-util/rebar-bin-3.13.2
-2007201209 metadata/md5-cache/dev-util/rebar-bin-3.6.2
 2008131309 metadata/md5-cache/dev-util/pkgdiff-1.7.2
 2008292209 metadata/md5-cache/dev-util/cpptest-2.0.0-r1
 2009021410 metadata/md5-cache/dev-util/abi-compliance-checker-9999
@@ -45481,7 +45534,6 @@
 2101231224 metadata/md5-cache/dev-util/patchelf-0.12
 2101231224 metadata/md5-cache/dev-util/peg-0.1.18
 2101231224 metadata/md5-cache/dev-util/pkgconf-1.6.3
-2101231224 metadata/md5-cache/dev-util/pkgconf-1.7.2
 2101231224 metadata/md5-cache/dev-util/pkgconf-1.7.3-r1
 2101231224 metadata/md5-cache/dev-util/pkgconf-9999
 2101231224 metadata/md5-cache/dev-util/plan9port-0_pre20200526
@@ -45997,9 +46049,6 @@
 2103111213 metadata/md5-cache/dev-util/xdelta-3.1.0
 2103111213 metadata/md5-cache/dev-util/ydiff-1.2
 2103122009 metadata/md5-cache/dev-util/jenkins-bin-2.283
-2103130009 metadata/md5-cache/dev-util/systemtap-4.0-r1
-2103130009 metadata/md5-cache/dev-util/systemtap-4.0-r2
-2103130009 metadata/md5-cache/dev-util/systemtap-4.4
 2103131809 metadata/md5-cache/dev-util/diffoscope-169
 2103131309 metadata/md5-cache/dev-util/pkgdev-0.1.1
 2103131309 metadata/md5-cache/dev-util/pkgdev-9999
@@ -46016,8 +46065,14 @@
 2103170039 metadata/md5-cache/dev-util/bats-1.3.0
 2103170539 metadata/md5-cache/dev-util/codeblocks-20.03-r2
 2103172309 metadata/md5-cache/dev-util/pkgcheck-0.9.2
-2103181109 metadata/md5-cache/dev-util/Manifest.gz
 2103181109 metadata/md5-cache/dev-util/cmake-3.20.0_rc5
+2103191209 metadata/md5-cache/dev-util/Manifest.gz
+2103181709 metadata/md5-cache/dev-util/idea-community-2021.3.1.203.6682.168-r1
+2103181839 metadata/md5-cache/dev-util/pkgconf-1.7.4
+2103191209 metadata/md5-cache/dev-util/rebar-bin-3.14.4
+2103190139 metadata/md5-cache/dev-util/systemtap-4.0-r1
+2103190139 metadata/md5-cache/dev-util/systemtap-4.0-r2
+2103190139 metadata/md5-cache/dev-util/systemtap-4.4
 1902111809 metadata/md5-cache/dev-vcs/cvs2cl-2.71-r1
 1809152309 metadata/md5-cache/dev-vcs/cvsutils-0.2.5-r1
 1807302309 metadata/md5-cache/dev-vcs/easygit-1.7.5.2
@@ -46123,12 +46178,15 @@
 2103121839 metadata/md5-cache/dev-vcs/tortoisehg-9999
 2103131409 metadata/md5-cache/dev-vcs/hg-evolve-10.3.0
 2103152109 metadata/md5-cache/dev-vcs/repo-2.12-r1
-2103181239 metadata/md5-cache/dev-vcs/Manifest.gz
 2103181239 metadata/md5-cache/dev-vcs/git-2.31.0-r1
 2103181239 metadata/md5-cache/dev-vcs/git-9999
 2103181239 metadata/md5-cache/dev-vcs/git-9999-r1
 2103181239 metadata/md5-cache/dev-vcs/git-9999-r2
 2103181239 metadata/md5-cache/dev-vcs/git-9999-r3
+2103190709 metadata/md5-cache/dev-vcs/Manifest.gz
+2103190509 metadata/md5-cache/dev-vcs/git-extras-6.1.0
+2103190709 metadata/md5-cache/dev-vcs/git-publish-1.7.0
+2103190709 metadata/md5-cache/dev-vcs/git-pw-2.0.0
 1707090139 metadata/md5-cache/games-action/nighthawk-2.2-r1
 1707090139 metadata/md5-cache/games-action/xbomber-101-r1
 2009060239 metadata/md5-cache/games-action/descent2-demodata-1.0-r1
@@ -48221,7 +48279,6 @@
 2102241843 metadata/md5-cache/mail-client/mutt-2.0.5
 2102241843 metadata/md5-cache/mail-client/novell-groupwise-client-8.0.2.96933-r1
 2102241843 metadata/md5-cache/mail-client/sylpheed-3.7.0-r1
-2102241843 metadata/md5-cache/mail-client/thunderbird-bin-78.8.0
 2102271339 metadata/md5-cache/mail-client/roundcube-1.4.11
 2103020809 metadata/md5-cache/mail-client/clawsker-1.3.4
 2103041509 metadata/md5-cache/mail-client/claws-mail-9999
@@ -48230,7 +48287,6 @@
 2103071539 metadata/md5-cache/mail-client/mutt-2.0.6
 2103082139 metadata/md5-cache/mail-client/s-nail-14.9.22
 2103090209 metadata/md5-cache/mail-client/thunderbird-bin-78.8.1
-2103121109 metadata/md5-cache/mail-client/Manifest.gz
 2103111213 metadata/md5-cache/mail-client/alot-0.9
 2103111213 metadata/md5-cache/mail-client/alot-0.9.1
 2103111213 metadata/md5-cache/mail-client/alot-9999
@@ -48240,8 +48296,8 @@
 2103101739 metadata/md5-cache/mail-client/neomutt-20201127-r1
 2103101739 metadata/md5-cache/mail-client/neomutt-20210205
 2103101739 metadata/md5-cache/mail-client/neomutt-99999999
-2103111213 metadata/md5-cache/mail-client/thunderbird-78.8.0
 2103111213 metadata/md5-cache/mail-client/thunderbird-78.8.1
+2103191039 metadata/md5-cache/mail-client/Manifest.gz
 1910071209 metadata/md5-cache/mail-filter/spampd-2.42
 1702282325 metadata/md5-cache/mail-filter/spamprobe-1.4d-r1
 1911161109 metadata/md5-cache/mail-filter/zdkimfilter-1.8
@@ -48771,7 +48827,6 @@
 2102070139 metadata/md5-cache/media-gfx/llgal-0.13.19-r1
 2102091309 metadata/md5-cache/media-gfx/pngcheck-3.0.2
 2102121839 metadata/md5-cache/media-gfx/libimagequant-2.14.0
-2102140039 metadata/md5-cache/media-gfx/chafa-1.6.0
 2102150909 metadata/md5-cache/media-gfx/graphicsmagick-1.3.36
 2102151839 metadata/md5-cache/media-gfx/imagemagick-9999
 2102192039 metadata/md5-cache/media-gfx/gimp-2.10.22-r2
@@ -48910,7 +48965,6 @@
 2103112339 metadata/md5-cache/media-gfx/feh-3.6.2
 2103111213 metadata/md5-cache/media-gfx/fontforge-20200314
 2103111213 metadata/md5-cache/media-gfx/fontforge-20201107
-2103111213 metadata/md5-cache/media-gfx/frogr-1.5
 2103111213 metadata/md5-cache/media-gfx/gimp-2.99.4
 2103111213 metadata/md5-cache/media-gfx/gimp-9999
 2103111213 metadata/md5-cache/media-gfx/gnofract4d-4.3_p20201029
@@ -48967,9 +49021,12 @@
 2103150109 metadata/md5-cache/media-gfx/qrencode-4.1.1
 2103160039 metadata/md5-cache/media-gfx/engauge-10.6
 2103161839 metadata/md5-cache/media-gfx/zbar-0.23.1
-2103171209 metadata/md5-cache/media-gfx/Manifest.gz
 2103170139 metadata/md5-cache/media-gfx/gpicview-0.2.5-r2
 2103171209 metadata/md5-cache/media-gfx/sane-backends-1.0.31
+2103191539 metadata/md5-cache/media-gfx/Manifest.gz
+2103191209 metadata/md5-cache/media-gfx/chafa-1.6.0
+2103191409 metadata/md5-cache/media-gfx/frogr-1.5
+2103191539 metadata/md5-cache/media-gfx/gmic-2.9.6
 1802221208 metadata/md5-cache/media-libs/blib-1.1.7-r2
 1902171239 metadata/md5-cache/media-libs/libggimisc-2.2.2-r1
 1805290208 metadata/md5-cache/media-libs/libpqstego-0.0.1
@@ -49071,7 +49128,6 @@
 2101231224 metadata/md5-cache/media-libs/libcdr-9999
 2101231224 metadata/md5-cache/media-libs/libdc1394-2.2.5-r1
 2101231224 metadata/md5-cache/media-libs/libdc1394-2.2.6
-2101231224 metadata/md5-cache/media-libs/libdca-0.0.7
 2101231224 metadata/md5-cache/media-libs/libde265-9999
 2101231224 metadata/md5-cache/media-libs/libdv-1.0.0-r4
 2101231224 metadata/md5-cache/media-libs/libdvd-audio-1.0.0
@@ -49157,7 +49213,6 @@
 2101231224 metadata/md5-cache/media-libs/openh264-2.1.1
 2101231224 metadata/md5-cache/media-libs/opus-1.3.1-r1
 2101231224 metadata/md5-cache/media-libs/plotutils-2.6-r2
-2101231224 metadata/md5-cache/media-libs/portaudio-19.06.00-r3
 2101231224 metadata/md5-cache/media-libs/quvi-0.9.5
 2101231224 metadata/md5-cache/media-libs/raptor-2.0.15-r2
 2101231224 metadata/md5-cache/media-libs/rtaudio-5.1.0
@@ -49542,13 +49597,15 @@
 2103162139 metadata/md5-cache/media-libs/harfbuzz-2.7.4
 2103162139 metadata/md5-cache/media-libs/libepoxy-1.5.5
 2103162139 metadata/md5-cache/media-libs/libgphoto2-2.5.26
-2103171109 metadata/md5-cache/media-libs/Manifest.gz
 2103170509 metadata/md5-cache/media-libs/bcg729-1.1.1
 2103162339 metadata/md5-cache/media-libs/glew-2.2.0
 2103171109 metadata/md5-cache/media-libs/harfbuzz-2.8.0
 2103170439 metadata/md5-cache/media-libs/libopenaptx-0.2.0
 2103170439 metadata/md5-cache/media-libs/libopenaptx-9999
 2103170409 metadata/md5-cache/media-libs/suil-0.10.10
+2103190739 metadata/md5-cache/media-libs/Manifest.gz
+2103190739 metadata/md5-cache/media-libs/libdca-0.0.7
+2103190639 metadata/md5-cache/media-libs/portaudio-19.06.00-r3
 1908120039 metadata/md5-cache/media-plugins/hexter-1.1.0
 1911121409 metadata/md5-cache/media-plugins/ladspa-bs2b-0.9.1-r1
 1912241539 metadata/md5-cache/media-plugins/vdr-burn-templates-0.0.3
@@ -49779,7 +49836,6 @@
 2102211641 metadata/md5-cache/media-plugins/kodi-pvr-vbox-9999
 2102211641 metadata/md5-cache/media-plugins/kodi-pvr-vdr-vnsi-8.2.2
 2102211641 metadata/md5-cache/media-plugins/kodi-pvr-vdr-vnsi-9999
-2102211641 metadata/md5-cache/media-plugins/kodi-pvr-vuplus-7.3.3
 2102211641 metadata/md5-cache/media-plugins/kodi-pvr-vuplus-9999
 2102211641 metadata/md5-cache/media-plugins/kodi-pvr-wmc-6.1.1
 2102211641 metadata/md5-cache/media-plugins/kodi-pvr-wmc-9999
@@ -49936,7 +49992,6 @@
 2102281339 metadata/md5-cache/media-plugins/vdr-imonlcd-1.0.2
 2102281209 metadata/md5-cache/media-plugins/vdr-satip-2.2.5
 2102281209 metadata/md5-cache/media-plugins/vdr-satip-2.4.0_p20210131
-2103011739 metadata/md5-cache/media-plugins/kodi-pvr-vuplus-7.4.0
 2103040339 metadata/md5-cache/media-plugins/gst-plugins-vpx-1.16.3
 2103061839 metadata/md5-cache/media-plugins/vdr-osdteletext-0.9.8
 2103081709 metadata/md5-cache/media-plugins/kodi-pvr-mythtv-7.3.1
@@ -49952,8 +50007,9 @@
 2103111213 metadata/md5-cache/media-plugins/mda-lv2-1.2.6
 2103111213 metadata/md5-cache/media-plugins/mythplugins-31.0-r1
 2103111213 metadata/md5-cache/media-plugins/vamp-aubio-plugins-0.5.1-r1
-2103152309 metadata/md5-cache/media-plugins/Manifest.gz
 2103151609 metadata/md5-cache/media-plugins/kodi-pvr-hts-8.2.4
+2103181739 metadata/md5-cache/media-plugins/Manifest.gz
+2103181739 metadata/md5-cache/media-plugins/kodi-pvr-vuplus-7.4.1
 1703122008 metadata/md5-cache/media-radio/adifmerg-31-r1
 1908231409 metadata/md5-cache/media-radio/dxcc-20190309
 2002201639 metadata/md5-cache/media-radio/gpredict-2.2.1
@@ -51092,8 +51148,6 @@
 2103160009 metadata/md5-cache/net-analyzer/hydra-9.0
 2103160009 metadata/md5-cache/net-analyzer/hydra-9.0-r1
 2103160139 metadata/md5-cache/net-analyzer/hydra-9.1
-2103160009 metadata/md5-cache/net-analyzer/hydra-9.2
-2103160009 metadata/md5-cache/net-analyzer/hydra-9999999
 2103160139 metadata/md5-cache/net-analyzer/ifstatus-2.0.0
 2103160309 metadata/md5-cache/net-analyzer/labrea-2.5_p1
 2103160139 metadata/md5-cache/net-analyzer/lft-3.91-r1
@@ -51115,7 +51169,6 @@
 2103162239 metadata/md5-cache/net-analyzer/netselect-0.4-r2
 2103162239 metadata/md5-cache/net-analyzer/netselect-9999
 2103161809 metadata/md5-cache/net-analyzer/tcptrace-6.6.7_p6
-2103171239 metadata/md5-cache/net-analyzer/Manifest.gz
 2103171209 metadata/md5-cache/net-analyzer/arpwatch-3.1-r2
 2103170509 metadata/md5-cache/net-analyzer/fail2ban-0.11.2
 2103170509 metadata/md5-cache/net-analyzer/fail2ban-9999
@@ -51131,6 +51184,9 @@
 2103170509 metadata/md5-cache/net-analyzer/tcpdump-4.99.0
 2103170509 metadata/md5-cache/net-analyzer/tcpdump-9999
 2103171209 metadata/md5-cache/net-analyzer/tcpstat-1.5_p8
+2103190539 metadata/md5-cache/net-analyzer/Manifest.gz
+2103190539 metadata/md5-cache/net-analyzer/hydra-9.2
+2103190539 metadata/md5-cache/net-analyzer/hydra-9999999
 1704281609 metadata/md5-cache/net-dialup/dial-1.2-r2
 2012311940 metadata/md5-cache/net-dialup/ppp-scripts-0
 2012311940 metadata/md5-cache/net-dialup/wvdial-1.61
@@ -51258,9 +51314,10 @@
 2103111213 metadata/md5-cache/net-dns/unbound-1.13.0-r1
 2103111213 metadata/md5-cache/net-dns/unbound-1.13.1
 2103180009 metadata/md5-cache/net-dns/resolv_wrapper-1.1.7
-2103181309 metadata/md5-cache/net-dns/Manifest.gz
 2103181309 metadata/md5-cache/net-dns/bind-9.16.13
 2103181309 metadata/md5-cache/net-dns/bind-tools-9.16.13
+2103182339 metadata/md5-cache/net-dns/Manifest.gz
+2103182339 metadata/md5-cache/net-dns/dnsviz-0.9.3
 1902190039 metadata/md5-cache/net-firewall/ipkungfu-0.6.1-r1
 2001260341 metadata/md5-cache/net-firewall/lutelwall-0.99-r1
 2101231224 metadata/md5-cache/net-firewall/arno-iptables-firewall-2.0.3
@@ -52021,7 +52078,8 @@
 2103111213 metadata/md5-cache/net-mail/rss2email-3.12.2-r1
 2103130209 metadata/md5-cache/net-mail/isync-1.4.1
 2103131609 metadata/md5-cache/net-mail/mu-1.4.15-r1
-2103162309 metadata/md5-cache/net-mail/Manifest.gz
+2103190539 metadata/md5-cache/net-mail/Manifest.gz
+2103190539 metadata/md5-cache/net-mail/rss2email-3.12.3
 1910170740 metadata/md5-cache/net-misc/arpsponge-3.17.11
 1910022239 metadata/md5-cache/net-misc/autossh-1.4g
 1911110039 metadata/md5-cache/net-misc/autoupnp-0.4.7
@@ -52441,9 +52499,6 @@
 2103052209 metadata/md5-cache/net-misc/openssh-8.5_p1
 2103071639 metadata/md5-cache/net-misc/dropbox-117.4.378
 2103071439 metadata/md5-cache/net-misc/rsync-3.2.3-r2
-2103090139 metadata/md5-cache/net-misc/asterisk-13.38.1-r2
-2103091309 metadata/md5-cache/net-misc/asterisk-13.38.2
-2103091309 metadata/md5-cache/net-misc/asterisk-16.16.2
 2103100209 metadata/md5-cache/net-misc/cadaver-0.23.3
 2103090139 metadata/md5-cache/net-misc/chrony-4.0
 2103090139 metadata/md5-cache/net-misc/chrony-9999
@@ -52467,7 +52522,6 @@
 2103090139 metadata/md5-cache/net-misc/stunnel-5.55
 2103090139 metadata/md5-cache/net-misc/stunnel-5.56-r1
 2103091309 metadata/md5-cache/net-misc/unison-2.51.3_p20201127
-2103091309 metadata/md5-cache/net-misc/unison-2.51.4_rc1
 2103111213 metadata/md5-cache/net-misc/casync-2_p20190407
 2103111213 metadata/md5-cache/net-misc/chrome-remote-desktop-88.0.4324.33
 2103112009 metadata/md5-cache/net-misc/connman-1.39-r1
@@ -52551,7 +52605,6 @@
 2103122139 metadata/md5-cache/net-misc/dahdi-tools-3.1.0-r1
 2103121839 metadata/md5-cache/net-misc/icaclient-21.1.0.14
 2103121839 metadata/md5-cache/net-misc/icaclient-21.3.0.38
-2103121839 metadata/md5-cache/net-misc/mobile-broadband-provider-info-20201225
 2103121839 metadata/md5-cache/net-misc/modemmanager-1.14.8
 2103121839 metadata/md5-cache/net-misc/networkmanager-1.28.0-r1
 2103121939 metadata/md5-cache/net-misc/oidc-agent-4.0.2
@@ -52565,10 +52618,20 @@
 2103150709 metadata/md5-cache/net-misc/youtube-dl-2021.03.03
 2103160039 metadata/md5-cache/net-misc/modemmanager-1.14.8-r1
 2103162239 metadata/md5-cache/net-misc/openssh-8.5_p1-r1
-2103180409 metadata/md5-cache/net-misc/Manifest.gz
-2103171139 metadata/md5-cache/net-misc/dhcpcd-9.3.4
 2103171139 metadata/md5-cache/net-misc/dhcpcd-9.4.0-r1
 2103180409 metadata/md5-cache/net-misc/networkmanager-1.30.2
+2103191209 metadata/md5-cache/net-misc/Manifest.gz
+2103191209 metadata/md5-cache/net-misc/asterisk-13.38.1-r2
+2103191209 metadata/md5-cache/net-misc/asterisk-13.38.2
+2103191209 metadata/md5-cache/net-misc/asterisk-13.38.2-r1
+2103191209 metadata/md5-cache/net-misc/asterisk-16.16.2
+2103191209 metadata/md5-cache/net-misc/asterisk-16.16.2-r1
+2103191209 metadata/md5-cache/net-misc/asterisk-18.2.2
+2103182209 metadata/md5-cache/net-misc/dhcpcd-9.3.4
+2103191209 metadata/md5-cache/net-misc/dropbox-118.4.460
+2103182209 metadata/md5-cache/net-misc/mobile-broadband-provider-info-20201225
+2103191039 metadata/md5-cache/net-misc/unison-2.51.4_rc2
+2103181909 metadata/md5-cache/net-misc/vde-2.3.2_p20191011-r1
 1911091712 metadata/md5-cache/net-nds/led-1.111
 2011031239 metadata/md5-cache/net-nds/smbldap-tools-0.9.10-r1
 2012231444 metadata/md5-cache/net-nds/phpldapadmin-1.2.5
@@ -52587,8 +52650,9 @@
 2102241843 metadata/md5-cache/net-nds/tac_plus-4.0.4.27a
 2103090139 metadata/md5-cache/net-nds/openldap-2.4.57
 2103111213 metadata/md5-cache/net-nds/389-ds-base-1.4.4.13
-2103111213 metadata/md5-cache/net-nds/Manifest.gz
 2103111213 metadata/md5-cache/net-nds/nsscache-0.39
+2103191309 metadata/md5-cache/net-nds/Manifest.gz
+2103191309 metadata/md5-cache/net-nds/openldap-2.4.58
 1702282329 metadata/md5-cache/net-news/amphetadesk-0.93.1-r1
 2002112051 metadata/md5-cache/net-news/yydecode-0.2.10-r1
 2101231224 metadata/md5-cache/net-news/rssguard-3.8.3
@@ -52676,12 +52740,10 @@
 2102241843 metadata/md5-cache/net-p2p/syncthing-1.10.0
 2102241843 metadata/md5-cache/net-p2p/transmission-remote-gtk-1.4.1
 2102241843 metadata/md5-cache/net-p2p/vuze-5.7.6.0
-2103040909 metadata/md5-cache/net-p2p/eiskaltdcpp-9999
 2103041809 metadata/md5-cache/net-p2p/syncthing-1.14.0
 2103050039 metadata/md5-cache/net-p2p/ktorrent-20.12.3
 2103050239 metadata/md5-cache/net-p2p/litecoind-0.10.4.0
 2103060309 metadata/md5-cache/net-p2p/go-ethereum-1.10.0
-2103091239 metadata/md5-cache/net-p2p/eiskaltdcpp-2.4.2
 2103081339 metadata/md5-cache/net-p2p/go-ethereum-1.10.1
 2103091509 metadata/md5-cache/net-p2p/go-ipfs-0.8.0
 2103090139 metadata/md5-cache/net-p2p/resilio-sync-2.6.1
@@ -52703,8 +52765,10 @@
 2103111213 metadata/md5-cache/net-p2p/torrentinfo-1.8.6-r2
 2103111213 metadata/md5-cache/net-p2p/tremc-0.9.2
 2103121839 metadata/md5-cache/net-p2p/nicotine+-2.2.2
-2103150939 metadata/md5-cache/net-p2p/Manifest.gz
 2103150939 metadata/md5-cache/net-p2p/syncthing-1.13.1
+2103190739 metadata/md5-cache/net-p2p/Manifest.gz
+2103190739 metadata/md5-cache/net-p2p/eiskaltdcpp-2.4.2
+2103190739 metadata/md5-cache/net-p2p/eiskaltdcpp-9999
 1702282329 metadata/md5-cache/net-print/fax4cups-1.29-r1
 1702282329 metadata/md5-cache/net-print/ink-0.5.1
 1702282329 metadata/md5-cache/net-print/ink-0.5.2
@@ -52807,8 +52871,12 @@
 2103111213 metadata/md5-cache/net-proxy/trojan-1.16.0-r2
 2103132309 metadata/md5-cache/net-proxy/squid-4.13-r1
 2103132309 metadata/md5-cache/net-proxy/squid-4.14
-2103161839 metadata/md5-cache/net-proxy/Manifest.gz
 2103161839 metadata/md5-cache/net-proxy/haproxy-2.3.7
+2103191509 metadata/md5-cache/net-proxy/Manifest.gz
+2103191509 metadata/md5-cache/net-proxy/haproxy-1.8.29
+2103181809 metadata/md5-cache/net-proxy/haproxy-2.0.21
+2103181709 metadata/md5-cache/net-proxy/haproxy-2.1.12
+2103181709 metadata/md5-cache/net-proxy/haproxy-2.2.11
 2102150339 metadata/md5-cache/net-voip/yate-6.2.0
 2102150339 metadata/md5-cache/net-voip/yate-9999
 2103111213 metadata/md5-cache/net-voip/Manifest.gz
@@ -52878,7 +52946,6 @@
 2102241843 metadata/md5-cache/net-vpn/vpncwatch-1.8.1
 2103010239 metadata/md5-cache/net-vpn/badvpn-1.999.129
 2103060509 metadata/md5-cache/net-vpn/frp-0.35.1
-2103081139 metadata/md5-cache/net-vpn/fp-multiuser-0.0.2
 2103081039 metadata/md5-cache/net-vpn/openfortivpn-1.16.0
 2103090139 metadata/md5-cache/net-vpn/tailscale-1.2.10-r1
 2103090139 metadata/md5-cache/net-vpn/tailscale-1.4.0
@@ -52894,8 +52961,9 @@
 2103111213 metadata/md5-cache/net-vpn/protonvpn-cli-2.2.4
 2103111213 metadata/md5-cache/net-vpn/protonvpn-cli-2.2.6
 2103151739 metadata/md5-cache/net-vpn/wireguard-tools-1.0.20210315
-2103170739 metadata/md5-cache/net-vpn/Manifest.gz
 2103170739 metadata/md5-cache/net-vpn/frp-0.36.0
+2103182339 metadata/md5-cache/net-vpn/Manifest.gz
+2103182339 metadata/md5-cache/net-vpn/fp-multiuser-0.0.2
 1808170009 metadata/md5-cache/net-wireless/bladerf-firmware-2.2.0
 1808170009 metadata/md5-cache/net-wireless/bladerf-fpga-0.7.3
 1909122209 metadata/md5-cache/net-wireless/gr-scan-20160211
@@ -53463,7 +53531,6 @@
 2101231224 metadata/md5-cache/sci-calculators/orpie-1.5.2-r1
 2101231224 metadata/md5-cache/sci-calculators/pcalc-3-r1
 2101231224 metadata/md5-cache/sci-calculators/pcalc-4
-2102221809 metadata/md5-cache/sci-calculators/bc-gh-3.3.0
 2102211641 metadata/md5-cache/sci-calculators/hcalc-1.2-r1
 2102211641 metadata/md5-cache/sci-calculators/keurocalc-1.3.0
 2102241843 metadata/md5-cache/sci-calculators/calcoo-1.3.18-r1
@@ -53472,11 +53539,11 @@
 2102241843 metadata/md5-cache/sci-calculators/wcalc-2.5
 2102271939 metadata/md5-cache/sci-calculators/qalculate-gtk-3.16.0
 2102281539 metadata/md5-cache/sci-calculators/speedcrunch-0.12.0-r1
-2103041739 metadata/md5-cache/sci-calculators/bc-gh-3.3.2
 2103051939 metadata/md5-cache/sci-calculators/bc-gh-3.3.3
 2103052339 metadata/md5-cache/sci-calculators/tilp2-1.18
-2103111213 metadata/md5-cache/sci-calculators/Manifest.gz
 2103111213 metadata/md5-cache/sci-calculators/units-2.21
+2103191039 metadata/md5-cache/sci-calculators/Manifest.gz
+2103191039 metadata/md5-cache/sci-calculators/bc-gh-3.3.4
 1808262139 metadata/md5-cache/sci-chemistry/xds-bin-20170930
 2002230040 metadata/md5-cache/sci-chemistry/bodr-10
 2009162339 metadata/md5-cache/sci-chemistry/clashlist-3.17-r1
@@ -54149,7 +54216,6 @@
 2103030639 metadata/md5-cache/sci-mathematics/gfan-0.6.2-r1
 2103032109 metadata/md5-cache/sci-mathematics/yafu-1.34.3
 2103090139 metadata/md5-cache/sci-mathematics/gimps-30.3.6
-2103090139 metadata/md5-cache/sci-mathematics/gimps-30.4.9
 2103111213 metadata/md5-cache/sci-mathematics/cvc4-1.7-r1
 2103111213 metadata/md5-cache/sci-mathematics/dunshire-0.1.1-r1
 2103121309 metadata/md5-cache/sci-mathematics/fann-2.2.0-r1
@@ -54165,8 +54231,9 @@
 2103112309 metadata/md5-cache/sci-mathematics/z3-4.8.10
 2103152109 metadata/md5-cache/sci-mathematics/flint-2.6.3-r1
 2103160139 metadata/md5-cache/sci-mathematics/agda-2.6.1.2
-2103170209 metadata/md5-cache/sci-mathematics/Manifest.gz
 2103170209 metadata/md5-cache/sci-mathematics/topcom-0.17.8-r1
+2103191039 metadata/md5-cache/sci-mathematics/Manifest.gz
+2103191039 metadata/md5-cache/sci-mathematics/gimps-30.5.1
 1702282331 metadata/md5-cache/sci-misc/flashdot-1.1.4-r1
 2005151939 metadata/md5-cache/sci-misc/ViSP-images-3.3.0
 2007260509 metadata/md5-cache/sci-misc/tango-9.2.5a
@@ -54940,9 +55007,6 @@
 2101231224 metadata/md5-cache/sys-apps/gentoo-systemd-integration-7
 2101231224 metadata/md5-cache/sys-apps/gentoo-systemd-integration-9999
 2101231224 metadata/md5-cache/sys-apps/gradm-3.1.201903191516
-2101231224 metadata/md5-cache/sys-apps/grep-3.4
-2101231224 metadata/md5-cache/sys-apps/grep-3.5
-2101231224 metadata/md5-cache/sys-apps/grep-3.6
 2101231224 metadata/md5-cache/sys-apps/grepcidr-2.0
 2101231224 metadata/md5-cache/sys-apps/haveged-1.9.8c-r1
 2101231224 metadata/md5-cache/sys-apps/hd-idle-1.05-r1
@@ -55334,10 +55398,13 @@
 2103161809 metadata/md5-cache/sys-apps/acl-2.3.1
 2103161809 metadata/md5-cache/sys-apps/attr-2.5.1
 2103162239 metadata/md5-cache/sys-apps/mount-gtk-1.4.5.1
-2103172309 metadata/md5-cache/sys-apps/Manifest.gz
-2103171209 metadata/md5-cache/sys-apps/file-5.39-r4
 2103172309 metadata/md5-cache/sys-apps/pkgcore-0.11.4-r1
 2103171739 metadata/md5-cache/sys-apps/systemd-247.2-r4
+2103191409 metadata/md5-cache/sys-apps/Manifest.gz
+2103191209 metadata/md5-cache/sys-apps/file-5.39-r4
+2103191409 metadata/md5-cache/sys-apps/grep-3.4
+2103191409 metadata/md5-cache/sys-apps/grep-3.5
+2103191409 metadata/md5-cache/sys-apps/grep-3.6
 1802112038 metadata/md5-cache/sys-auth/polkit-pkla-compat-0.1
 2009141809 metadata/md5-cache/sys-auth/docker_auth-1.5.0
 2011160239 metadata/md5-cache/sys-auth/ykclient-2.15
@@ -56509,12 +56576,9 @@
 2103111739 metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.99
 2103131909 metadata/md5-cache/sys-kernel/genkernel-9999
 2103150139 metadata/md5-cache/sys-kernel/git-sources-5.12_rc3
-2103180339 metadata/md5-cache/sys-kernel/Manifest.gz
 2103180339 metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.24
-2103180339 metadata/md5-cache/sys-kernel/gentoo-kernel-5.11.7
 2103180339 metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.106
 2103180339 metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.24
-2103180339 metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.11.7
 2103180339 metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.106
 2103172009 metadata/md5-cache/sys-kernel/gentoo-sources-4.14.226
 2103172009 metadata/md5-cache/sys-kernel/gentoo-sources-4.19.181
@@ -56533,6 +56597,12 @@
 2103172339 metadata/md5-cache/sys-kernel/vanilla-sources-5.10.24
 2103172339 metadata/md5-cache/sys-kernel/vanilla-sources-5.11.7
 2103172339 metadata/md5-cache/sys-kernel/vanilla-sources-5.4.106
+2103190939 metadata/md5-cache/sys-kernel/Manifest.gz
+2103190239 metadata/md5-cache/sys-kernel/gentoo-kernel-5.11.7
+2103190239 metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.11.7
+2103182009 metadata/md5-cache/sys-kernel/gentoo-sources-5.10.24
+2103190209 metadata/md5-cache/sys-kernel/gentoo-sources-5.11.7-r1
+2103190939 metadata/md5-cache/sys-kernel/pf-sources-5.11_p4
 1804301209 metadata/md5-cache/sys-libs/fortify-headers-0.6
 1804301209 metadata/md5-cache/sys-libs/fortify-headers-0.7
 1908101709 metadata/md5-cache/sys-libs/libservicelog-1.1.18
@@ -57345,7 +57415,6 @@
 2101231224 metadata/md5-cache/www-client/luakit-9999
 2101231224 metadata/md5-cache/www-client/midori-9.0
 2101231224 metadata/md5-cache/www-client/surf-2.0
-2101231224 metadata/md5-cache/www-client/surf-9999
 2101231224 metadata/md5-cache/www-client/surfraw-99999
 2101231224 metadata/md5-cache/www-client/uget-9999
 2101231224 metadata/md5-cache/www-client/w3m-0.5.3_p20180125
@@ -57403,8 +57472,10 @@
 2103150109 metadata/md5-cache/www-client/google-chrome-unstable-91.0.4442.4
 2103150139 metadata/md5-cache/www-client/vivaldi-3.6.2165.40
 2103161439 metadata/md5-cache/www-client/vivaldi-snapshot-3.7.2218.32
-2103162339 metadata/md5-cache/www-client/Manifest.gz
 2103162339 metadata/md5-cache/www-client/chromium-89.0.4389.90
+2103182339 metadata/md5-cache/www-client/Manifest.gz
+2103182339 metadata/md5-cache/www-client/links-2.22
+2103181439 metadata/md5-cache/www-client/surf-9999
 1910071209 metadata/md5-cache/www-misc/profile-sync-daemon-5.75
 1910090839 metadata/md5-cache/www-misc/profile-sync-daemon-6.35
 1904231239 metadata/md5-cache/www-misc/wsmake-0.6.4
@@ -58782,7 +58853,6 @@
 2102241843 metadata/md5-cache/x11-wm/xmonad-0.15
 2102282039 metadata/md5-cache/x11-wm/icewm-2.2.0
 2103011609 metadata/md5-cache/x11-wm/muffin-4.6.3
-2103011609 metadata/md5-cache/x11-wm/muffin-4.8.1
 2103021809 metadata/md5-cache/x11-wm/icewm-2.2.1
 2103031709 metadata/md5-cache/x11-wm/icewm-2.1.2
 2103111213 metadata/md5-cache/x11-wm/enlightenment-0.24.2-r1
@@ -58805,7 +58875,8 @@
 2103130009 metadata/md5-cache/x11-wm/treewm-0.4.5-r2
 2103150209 metadata/md5-cache/x11-wm/openbox-3.6.1-r3
 2103150209 metadata/md5-cache/x11-wm/openbox-9999
-2103162309 metadata/md5-cache/x11-wm/Manifest.gz
+2103190639 metadata/md5-cache/x11-wm/Manifest.gz
+2103190639 metadata/md5-cache/x11-wm/muffin-4.8.1
 2004111339 metadata/md5-cache/xfce-base/xfce4-meta-4.14-r2
 2012231139 metadata/md5-cache/xfce-base/xfce4-meta-4.16
 2101231509 metadata/md5-cache/xfce-base/thunar-4.17.0
@@ -58887,10 +58958,11 @@
 2103040739 metadata/md5-cache/xfce-extra/xfce4-screensaver-4.16.0
 2103041809 metadata/md5-cache/xfce-extra/xfdashboard-0.8.1
 2103051539 metadata/md5-cache/xfce-extra/xfdashboard-0.9.0
-2103111213 metadata/md5-cache/xfce-extra/Manifest.gz
 2103111213 metadata/md5-cache/xfce-extra/xfce4-alsa-plugin-0.3.0
 2103102039 metadata/md5-cache/xfce-extra/xfce4-netload-plugin-1.4.0
 2103111213 metadata/md5-cache/xfce-extra/xfce4-panel-profiles-1.0.12
 2103111213 metadata/md5-cache/xfce-extra/xfce4-panel-profiles-1.0.13
 2103102039 metadata/md5-cache/xfce-extra/xfce4-systemload-plugin-1.3.0
-2103181339 metadata/md5-cache/Manifest.gz
+2103191309 metadata/md5-cache/xfce-extra/Manifest.gz
+2103191309 metadata/md5-cache/xfce-extra/xfdashboard-0.9.1
+2103191609 metadata/md5-cache/Manifest.gz
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 8baee3d71547..01763f755457 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Thu, 18 Mar 2021 11:00:01 +0000
+Fri, 19 Mar 2021 15:00:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 85ae6834548d..b0251aa832b5 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-950b512dde3a2fef38e36329d2e8e7b70b8e2bb7 1616062807 2021-03-18T10:20:07+00:00
+6ea421def8fcd0324fbb7e23591052f5ff1ecea9 1616157979 2021-03-19T12:46:19+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index baff235180f5..95be5b9b68fd 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1616063701 Thu 18 Mar 2021 10:35:01 AM UTC
+1616164501 Fri 19 Mar 2021 02:35:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 26c42ed7fbe7..9b9ec4b16d20 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Thu, 18 Mar 2021 10:38:28 +0000
+Fri, 19 Mar 2021 14:38:24 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index cf5a5debf0e3..8ce2994de2df 100644
Binary files a/net-analyzer/Manifest.gz and b/net-analyzer/Manifest.gz differ
diff --git a/net-analyzer/hydra/Manifest b/net-analyzer/hydra/Manifest
index 4ca7b87f1924..fda5771e865b 100644
--- a/net-analyzer/hydra/Manifest
+++ b/net-analyzer/hydra/Manifest
@@ -1,11 +1,12 @@
 AUX hydra-9.0-unneeded-buf.patch 1503 BLAKE2B 3d8da1b656263e2abcc68e3b2b2f6c2c4937d684c7080105c2821678711146d864c6ccb2985df0e17673f4e762b5e0fc078c35e5f460a93df9891920e873ca23 SHA512 34ffce41ebebed70529eec9a6f617493fc323792fc2f7771fb1fd62bfd6fa5ae5fa96c49910dc79f8e72cee6cdc88afe0505b8f41053db8e3f64016e8f479a01
 AUX hydra-9.0-vnc.patch 407 BLAKE2B b64b12b33435a84564aea4345e86b868155b5d7c4dc1fc8f8c83f98d6429499ffd6d5d54983242415676a9556caedf5c58163ad0b09a00db2545d26f9630c145 SHA512 a4f554526cbfdf0560c1866f158a210b0fbd510a60fa2ad8e8c2cca0bb4ecf58e3eeb10d3bac747162231585c3ea827e10c0a4f4fb9e949832673afc6f9b93cf
+AUX hydra-9.2-respect-cflags-more.patch 1072 BLAKE2B 4361f339a0cd9ea3a32a9671bb1a31f2775dceb6b2b305885a2a3e72a2329c5337221c895ab49129e920c36941d5b34101877ebf0d35f10f46d601de58981c21 SHA512 b00112c17f025b657111c93decdecc5ee4a10f388e259929ed2f55ca08888d24fb2fac1892df017d00602943ba93a72dcbbb4cf00fa808c2bc05ed1b95cb428a
 DIST hydra-9.0.tar.gz 1168498 BLAKE2B b4834c66fb1bebcd19151784b75d4c9220cbf7045b289a063a1cbc48a793abfa2edcb466d43234bd4c8e14074a2e2a39ccd697698392f24f39c84da54ee07165 SHA512 58067bd2696e82645bb959fe5537f2876e1d8c170a15fe6a9ac65bbdc33cfb75b47fd1a969c314a6c6d91b2b6c0ce4ba087680bbd67a5a38925a2a8b5c5ad338
 DIST hydra-9.1.tar.gz 611846 BLAKE2B 9a5b6dc52b5f4069bf326e86728ebaf8c1fe018536f3943b83493de934703bff6770ae3f7a9a223ee00b5f52f7bd10ee4ddc272e1bbad00c399aa19cc0c083ba SHA512 863176375fe1aae4c0a2b74c11aba297682d66e522c98c926c539348309b0af4e407e460b4cb803d2c83c008787c73f7f1e56ac6aca9791351e1b596c2e4fbb2
 DIST hydra-9.2.tar.gz 614176 BLAKE2B 102c744fbdd3702c624b1c8339178883b689db093d9f1c66d8e04816327eb8095f3e3133f889b2a6ee6dcabb9e5af0c71ec8470731b4b174021fbd79741d05e7 SHA512 ee8ecd854b61ac9d708098c8a0d9a128d8b80b38db1a2ba8eb06de6fbbc6865135d994620ade8e3742fb993899274ed9d8fd0e95bed7a9fbeb1ca9e182540322
 EBUILD hydra-9.0-r1.ebuild 3716 BLAKE2B 2d9d455c9f620808543630a784c382f4769521e81141cca5821ca25d90536023376a874077ed1c91e775e8a89f9044329b9897f9d0519949c2755988061e6e28 SHA512 d8e95cb07cc08d6ef37fa1c4a975de86c777cdc5b48fd3ea585dd9cd4b0f6f553b3f09a91d4e9d0ff13f39e71bbb241cd389af1109424fe0dc3d5dc3e8be0730
 EBUILD hydra-9.0.ebuild 3620 BLAKE2B 79f6117e6de4892d9597bd431020151abfd11c9948235051e5abdb45cb21329e37ebe998ae318568c3a29cafc371464d7f37700fe43e726367fab8b255e40fa8 SHA512 12fc637a1e756c26eaf396c353cabf0295d15f078cb9b48441f99532e31d62d8f7ef086894ddb493f23bfaab845304cd0f5a76c8a6985de1d13f42b433b44968
 EBUILD hydra-9.1.ebuild 3626 BLAKE2B d89f6e3dd2a8040183551e96f51012dcb8ddd2277873f83294f789523848ac893e5e4471476edac35a299611d7e9b116715510d55d7ca6cbbe9a04538f2ed124 SHA512 5a835262af5aee665550955909549fcb5838a8d9ba0a5226d659576c56ddf7d984cf6a8bc97839c8f15340edb67609c8e2ef3279d1fa2df33e8bce7d9d946387
-EBUILD hydra-9.2.ebuild 3599 BLAKE2B 4baa830ca44edec84f0f14c9247e6f16110b209b112e1e515d1615fafeeea1c9db4407b708d722459094fe67ca622067fb780b35efbaefee8727d36a80f8c68e SHA512 3552dedab87e466796fc1d8d05ddb55cad5f7cc8d6efba067304e04df5edfd83ab2e0fe2b0095d486b5b0cd9fa786822354e1046ef4b440ae92c0287ac8b7eaa
-EBUILD hydra-9999999.ebuild 3546 BLAKE2B 801e97e877e0b582cc43f003d8177855cd1432e54b28f345509199871f66dc8bdb8aeb1f5f20c4b05e73ed7e9473e3a7abb251b4c43cc8ab21a5d7abc4a04802 SHA512 9e1c457e6abac4760d206b73ef33ca5dcf48daaabe19c286bb3bc2d514a5994c5d18be75f8b5342fbb8c8625eb12d20a51f572900032fd0b9118344b3fce01ab
+EBUILD hydra-9.2.ebuild 3662 BLAKE2B e49f162de992b218bd65ae480f52887188caa337ec0202b6ff19f52dc967e7ad93a7112203754541b2e065ce00fe245550b519bb7f47fa8c42fdc3d957379cea SHA512 f4db9ae074d853275a1a4fddbcaf7b81af05fdb91c3594327aa6dd39b51ad5f5513d0d7f6c65b4862ca184903be75851db361e317f7c8efd3cb58af25a87ade7
+EBUILD hydra-9999999.ebuild 3586 BLAKE2B d510ae7b3a31e0064563f7858c87b5830849ffb68fd4277e0716bf927fb2a879786844aa840c54c7da4beddd56b7518a9ade811ad26b3b63f55e44eae717fdf2 SHA512 73bd694d30bc004c10ff5ab4a61ff610e5830db180205991a4ba5e066904b663afba91554fe728496bf5f67d2bcc6383d1bc668931965cb996185369c3e3ad78
 MISC metadata.xml 583 BLAKE2B 4471d2ece7889ace03be32f2d7227bfe9a0b7795a0d6292b97cb46fb9944cdac8b248deafcef087bbbc885c885cc60d2d58c4ccac391dc6f90bcdd975bdff3df SHA512 ab05494b6f96f007c06d7f86b696d148a8b2bf12ab23e193751785023733d9472623a873167f3b580d9167021d794466304732958ffbc0e67027a06076fd2ec5
diff --git a/net-analyzer/hydra/files/hydra-9.2-respect-cflags-more.patch b/net-analyzer/hydra/files/hydra-9.2-respect-cflags-more.patch
new file mode 100644
index 000000000000..8d158640803f
--- /dev/null
+++ b/net-analyzer/hydra/files/hydra-9.2-respect-cflags-more.patch
@@ -0,0 +1,26 @@
+Don't inject hardening CFLAGS. We already have these by default in Gentoo.
+--- a/configure
++++ b/configure
+@@ -1376,22 +1376,6 @@ if [ -n "$CRYPTO_PATH" ]; then
+   echo "                                  ... RSA_generate_key()$RSA found"
+ fi
+ 
+-echo "Checking for secure compile option support in $CC ..."
+-GCCSEC="no"
+-LDSEC="no"
+-GCCSECOPT="-fstack-protector-all --param ssp-buffer-size=4 -D_FORTIFY_SOURCE=2"
+-echo '#include <stdio.h>' > $TMPC.c
+-echo 'int main() { printf(""); return 0; }' >> $TMPC.c
+-$CC -pie -fPIE $GCCSEPOPT -o $TMPC $TMPC.c > /dev/null 2> $TMPC.c.err
+-test -x $TMPC && GCCSEC="yes"
+-grep -q fPI $TMPC.c.err || GCCSECOPT="-pie -fPIE $GCCSECOPT"
+-rm -f "$TMPC"
+-$CC $GCCSECOPT -Wl,-z,now -Wl,-z,relro -o $TMPC $TMPC.c > /dev/null 2> $TMPC.c.err
+-test -x $TMPC && { LDSEC="yes" ; GCCSECOPT="$GCCSECOPT -Wl,-z,now -Wl,-z,relro" ; }
+-rm -f $TMPC $TMPC.c $TMPC.c.err
+-echo "                                                  Compiling... $GCCSEC"
+-echo "                                                  Linking... $LDSEC"
+-
+ echo
+ XDEFINES=""
+ XLIBS=""
diff --git a/net-analyzer/hydra/hydra-9.2.ebuild b/net-analyzer/hydra/hydra-9.2.ebuild
index 5ce7e4c52418..ff6615335797 100644
--- a/net-analyzer/hydra/hydra-9.2.ebuild
+++ b/net-analyzer/hydra/hydra-9.2.ebuild
@@ -45,6 +45,10 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-9.2-respect-cflags-more.patch
+)
+
 src_prepare() {
 	default
 
@@ -89,7 +93,7 @@ src_configure() {
 	hydra_sed pcre '-lpcre' '$( "${PKG_CONFIG}" --libs libpcre )' '-DHAVE_PCRE'
 	hydra_sed postgres '-lpq' '$( "${PKG_CONFIG}" --libs libpq )' '-DLIBPOSTGRES'
 	hydra_sed oracle '-locci -lclntsh' '' '-DLIBORACLE'
-	hydra_sed rdp '-lfreerdp2' '$( "${PKG_CONFIG}" --libs freerdp2 )' '-DLIBFREERDP2'
+	hydra_sed rdp '-lfreerdp2' '$( "${PKG_CONFIG}" --libs freerdp2 )' '-DLIBFREERDP'
 	# TODO: https://bugs.gentoo.org/686148
 	#hydra_sed subversion '-lsvn_client-1 -lapr-1 -laprutil-1 -lsvn_subr-1' '$( "${PKG_CONFIG}" --libs libsvn_client )' '-DLIBSVN'
 	hydra_sed subversion '-lsvn_client-1 -lapr-1 -laprutil-1 -lsvn_subr-1' '' '-DLIBSVN'
diff --git a/net-analyzer/hydra/hydra-9999999.ebuild b/net-analyzer/hydra/hydra-9999999.ebuild
index 8745aff71916..fd067f1b4ca5 100644
--- a/net-analyzer/hydra/hydra-9999999.ebuild
+++ b/net-analyzer/hydra/hydra-9999999.ebuild
@@ -8,7 +8,6 @@ inherit git-r3 toolchain-funcs
 DESCRIPTION="Parallelized network login hacker"
 HOMEPAGE="https://github.com/vanhauser-thc/thc-hydra"
 EGIT_REPO_URI="https://github.com/vanhauser-thc/thc-hydra"
-S="${WORKDIR}/thc-${P}"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -44,6 +43,10 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-9.2-respect-cflags-more.patch
+)
+
 src_prepare() {
 	default
 
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 97afa9b019f6..77075edea93f 100644
Binary files a/net-dns/Manifest.gz and b/net-dns/Manifest.gz differ
diff --git a/net-dns/dnsviz/Manifest b/net-dns/dnsviz/Manifest
index c82c6a0363ec..c5a5363ec0e1 100644
--- a/net-dns/dnsviz/Manifest
+++ b/net-dns/dnsviz/Manifest
@@ -2,8 +2,10 @@ AUX dnsviz-0.8.2-add-ed448-support.patch 6452 BLAKE2B 77f12acf3bd4224200f677b248
 DIST dnsviz-0.8.2.tar.gz 404265 BLAKE2B c4ba6b5a7d6fee7c8e2cba0c90f29560152dd4beed1ef4d80a6a3bf9f81646ee8f0d61c38329233e300f2b434cb5d9e9d2a926dc72997ae68ff0a57e147bafcf SHA512 5414d9bda6c0bf5fdc5a84a09cb5833619110702749b12f87d63f5149de473f4bd1b6960c506c60ec5fc5ff82d789536cee70a299ff13c960a45776de2916c80
 DIST dnsviz-0.9.1.tar.gz 477806 BLAKE2B 24fc4c34a763cf4ea6018f42bb4ab12c376ff1a5ff29e4bc4502600c997195d5c83fd0b4d18c72fddc0d669380d3a39930d7bd6d3970671becd64a5c3083d269 SHA512 006377676173c225eb3a18d09d0808ab35412d09e988b984fd67598c8a6917a4fefd9381c32ea4dda404d7dde8d51e7b36dc49d85a8b4c2a8928fbde89075adf
 DIST dnsviz-0.9.2.tar.gz 477947 BLAKE2B 62b94e6b05d1129d5c4655ff1faf8adb3c2eec868db6049e09dd180cebccab94412eee25293d83ec3e6bc5b18fae33ba0acfe3c3b30cececdd4952005879eab0 SHA512 8ad9e1aabb4704ff4939617532c32e5edde0d369efd2e4a7a6f30d33b8bac941b2d1073e98fed90e2a11438a0b1c18b8fafe07f4122fb888ebdb24bd2426abf6
+DIST dnsviz-0.9.3.tar.gz 477931 BLAKE2B e3e020fdddacdf06a4e7b78edade72136d6530dac5b243b30e97f609c9fb3b912fb6d6c00b8c54e17f1d2ba411a2b116f9cb89bfc51c01f43d8a1a03a00755aa SHA512 8ccaa29df6cc7824db7153950d5cb423d1ac7a76ae20a15b35c2e66d362b3340e23a9973f71b884ea7e7b861e2bb0051e32abc3e45795792a7db3b01b62449c5
 EBUILD dnsviz-0.8.2-r1.ebuild 1716 BLAKE2B 43691ab360ea1eb74b9fd366ccfcd80e48ae10f336124ae176fa4b92a45965f80ed31dffda23f76fb29e2e42620c9d53b95a49f9d19b7a1722a7b0fee1626a2f SHA512 3a311bca10f923e84d19a88e4bb95da1ed79e22bd429b338537959b146c4122dec317494a3781279205a1435571619e4971c2e11386e6f39cf4c4b36c52ffb66
 EBUILD dnsviz-0.8.2.ebuild 1393 BLAKE2B 5222ca7525399e152fa3b2e56525bf1dc431dba6287be43469f1b9491e196cd1d22817108701f662430e640743b57d5d86342d6f4d61e08c8833f645deb13c99 SHA512 d9f10a330f0f56327148802a6a2f97b24dc93ab73e458a2be6459d74595554e579ca7e12d907387f918b6799e24dcdb41cff61345b3f6380e0c3ea1c32ea0bf6
 EBUILD dnsviz-0.9.1.ebuild 1514 BLAKE2B c326f5b921b3a0516d688ad3caa5ab38a95099a946e5fff3775e1d97775239c48407730098bdda5747967fb056c39d1c61b2d004a59c93daa02a2abe3d9a2c06 SHA512 81021f27b7a4100e6e5321132f588bb8295e8dfe4f03e9297eb5f5b53fc30ac4bb118e84e171aa0bef490e075574e55c8984330664c93135763c07d5969f7d46
 EBUILD dnsviz-0.9.2.ebuild 1514 BLAKE2B c326f5b921b3a0516d688ad3caa5ab38a95099a946e5fff3775e1d97775239c48407730098bdda5747967fb056c39d1c61b2d004a59c93daa02a2abe3d9a2c06 SHA512 81021f27b7a4100e6e5321132f588bb8295e8dfe4f03e9297eb5f5b53fc30ac4bb118e84e171aa0bef490e075574e55c8984330664c93135763c07d5969f7d46
+EBUILD dnsviz-0.9.3.ebuild 1514 BLAKE2B c326f5b921b3a0516d688ad3caa5ab38a95099a946e5fff3775e1d97775239c48407730098bdda5747967fb056c39d1c61b2d004a59c93daa02a2abe3d9a2c06 SHA512 81021f27b7a4100e6e5321132f588bb8295e8dfe4f03e9297eb5f5b53fc30ac4bb118e84e171aa0bef490e075574e55c8984330664c93135763c07d5969f7d46
 MISC metadata.xml 829 BLAKE2B 2c2ba75f7e751553e235c661645e887a87c573dfab97cd7b3383bc9eee53dc74254971aedc2fdf255b548d36ab1319046f29c35a3ac7c9e1f8aff3fe4dd898ca SHA512 bab42a3edb09f79961ab58a9c2d38151e5fd924091def378aafdf8987ba02e0ddd9a06d7fa4a2fe0d58a55477fd5dda665dd6d65b7055f3946ef46b72a23944a
diff --git a/net-dns/dnsviz/dnsviz-0.9.3.ebuild b/net-dns/dnsviz/dnsviz-0.9.3.ebuild
new file mode 100644
index 000000000000..7c7e9021cc6b
--- /dev/null
+++ b/net-dns/dnsviz/dnsviz-0.9.3.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Tool suite for analysis and visualization of DNS and DNSSEC"
+HOMEPAGE="https://dnsviz.net/"
+SRC_URI="https://github.com/dnsviz/dnsviz/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="test? ( net-dns/bind )"
+
+DEPEND=">=dev-python/dnspython-1.13[${PYTHON_USEDEP}]
+	>=dev-python/m2crypto-0.37.0[${PYTHON_USEDEP}]
+	>=dev-python/pygraphviz-1.3.1[${PYTHON_USEDEP}]"
+
+RDEPEND="${DEPEND}"
+
+python_prepare_all() {
+	# Fix the ebuild to use correct FHS/Gentoo policy paths
+	sed -i \
+		-e "s|share/doc/dnsviz|share/doc/${PF}|g" \
+			"${S}"/setup.py \
+			|| die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	distutils_install_for_testing
+
+	"${EPYTHON}" tests/dnsviz_probe_run_offline.py -v || die
+	"${EPYTHON}" tests/dnsviz_print_options.py -v || die
+	"${EPYTHON}" tests/dnsviz_print_run.py -v || die
+	"${EPYTHON}" tests/dnsviz_graph_options.py -v || die
+	"${EPYTHON}" tests/dnsviz_graph_run.py -v || die
+	"${EPYTHON}" tests/dnsviz_grok_options.py -v || die
+	"${EPYTHON}" tests/dnsviz_grok_run.py -v || die
+}
+
+pkg_postinst() {
+	elog "Support for extra feature can be get from:"
+	optfeature "Support for pre-deployment testing" net-dns/bind
+	optfeature "Support for DNSSEC signatures using GOST algorithm or digest" dev-libs/ghost-engine
+}
diff --git a/net-dns/openresolv/Manifest b/net-dns/openresolv/Manifest
index 0aac0af8cb0d..cdc1c25558d8 100644
--- a/net-dns/openresolv/Manifest
+++ b/net-dns/openresolv/Manifest
@@ -4,4 +4,4 @@ DIST openresolv-3.9.0.tar.xz 18844 BLAKE2B 0aa2125d79305aab04a8d052d56328493d51a
 EBUILD openresolv-3.10.0.ebuild 1046 BLAKE2B 0d2d2c8b93a27d02d1dc3ce6321c550dd99e98c50cacc55b6357f7b12e4aed44468e17c8c6c41bebce7f183616f506adcfc76867a51f7208a65dd94f2cfe2e73 SHA512 03a64836140098e17b58eb63ffa87a60175eaa5f3e0d21faf7bacf6ae38a20a7282180852eb53d32fb7d65c85cc7ed84d8f4efde9aa15fa5dd02da66e90cc6d7
 EBUILD openresolv-3.11.0.ebuild 1054 BLAKE2B 6d8afb6396bbcc82eb4957afce12914c29c66c765cbaca39a91bc256cab5551c11c88ca57faa5dd394df677a4a21cacedab984a0d714c6ac3bfd97a27dc540f7 SHA512 8c8a50bd91f96cd3c8ff688e46fc9ea1e39995d26cb2c5f65a1b79e20de48de44f569a50426a1246a2e9683a1431b6318bf0a83492ece338a8f66b3a25d04498
 EBUILD openresolv-3.9.0.ebuild 988 BLAKE2B 9eeaa5bb03ff5da326a9c421364216eb0c89f4e2d3ca9f5df64c3a036cd1006393c705ce1761a6f963849d4b896b1101ebc60b7bbee3fa6aaa8d17c19680a570 SHA512 b490a9558d670c224bc714d5b6b8b4b2f00025c6629e6750d2a460188f375c7571ef39ab67aeff369cb7d7a129b34e4f339522ed8db80dee102d6503f0f3b11c
-MISC metadata.xml 426 BLAKE2B 49ce8e0bddec995980b539361156e0be3e1ea113dfa30145d68dcfdb3a1f381599120122ca04326bf6ff2e1b669612b20fe57f0de48776c81794bff3301495ca SHA512 0fc62d94fc8cbd867cce1e06fcd749c82b4887695078ed329c398016f81595f1b63393613f19248a987cd0856a248f2d0f5c5a340bc569427f0ae4024d1206d8
+MISC metadata.xml 191 BLAKE2B 8bff04ca02f4930d6f77dd32df009c145cacaad2d1cf271d91ae928f85acdccb0d73b0202a41aa3e60470ba6c7853e41ef76587601b2163f9ec249b7fa1c5274 SHA512 da06af54ba93db06f717082e3f09bbca9e17adad4b070a28131f2ffec15d0dfc82c79a3b2fb045fa33d6756c6df85254733622b0b7b1952b33d5590a71865c62
diff --git a/net-dns/openresolv/metadata.xml b/net-dns/openresolv/metadata.xml
index ab4e99bc5800..3c58a0219fbe 100644
--- a/net-dns/openresolv/metadata.xml
+++ b/net-dns/openresolv/metadata.xml
@@ -1,13 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>andreacerisara@gmail.com</email>
-		<name>Andrea Cerisara</name>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index bf26426cc01e..d160d00e433b 100644
Binary files a/net-mail/Manifest.gz and b/net-mail/Manifest.gz differ
diff --git a/net-mail/rss2email/Manifest b/net-mail/rss2email/Manifest
index c860de9c7d8d..6bbc4d7f9885 100644
--- a/net-mail/rss2email/Manifest
+++ b/net-mail/rss2email/Manifest
@@ -1,3 +1,5 @@
 DIST rss2email-3.12.2.tar.gz 74096 BLAKE2B 5b7d6808d5741795de805e49bb955694a39a087e1dd64820303243227bf4b12ff9ee9354008c4f6cce415a8a8f84266266f8a677d6fed4eefa69713e5f664de9 SHA512 4df498cebd74bb25ffa2caa5aa851ccb106b0fa1b98113c5643cdd3ed8f9a73d266a649df521b8237740ea491ba086a65df0ba60c28a60a3d63360b8280a3888
+DIST rss2email-3.12.3.tar.gz 74151 BLAKE2B 5bbd796d204e6fbb7720de3c23df19c28374faea757907f69d6cd38cc560503bdc7229e7dc71aaaa89b8303942369a800d3bf9c5ac2d1d0def2b27d795352bc8 SHA512 189f6d81020a582a6a0d142cd31cf2dd200382037f4e87444a4d3df58d9feeb3b5503a689ea91c5ad88d70cfc6a7f9767314cbaa0dad0f20cb525a8251df3026
 EBUILD rss2email-3.12.2-r1.ebuild 769 BLAKE2B 89df0b5714085967eed8d19ff839f12ee764ada6d8d96d1399dc17621ae8c29a6b326fab67ff38ccc0e226ee81c8b276d722aacc9bf7dfa86f590298af8116a2 SHA512 b45fe99e4c1ccfbcb6dddb4fe96764653449a8a2c2df652821770541110954afb76b4e69cef0e75f6d1617f7682eba25554e9a62c071e868d8c80422678cd870
+EBUILD rss2email-3.12.3.ebuild 732 BLAKE2B f7e222d4ec1264c9f6d347067f82b8894a44de914949cae3e7f3f67ea21770222fc873892dfad4353fefda33bd5a43f3f0f23580f17f430cf2369ff07312016f SHA512 097694250cebd769d4139d48804558fadbe2da633c22403b03f1b34355b19b75e34e09ed6ad09dac10b7abb7c7443c387a41283864299fd150aeeb80e27edbfb
 MISC metadata.xml 459 BLAKE2B d361bd0e82327a97b801bb7c064f0609a67d2fc0cd58b69216e6acb0f304ce0897da7843255f1ce1bbeed76c5fc1e199201b2eb35910fc7b1c5e09d4995bb838 SHA512 4a05845c1148372f0c22bb68bba353aca4fc03e1c418b72f67e85f3cc0a9ee4b029c8bd0271c1d5cbbffe1e5b0105a13dcac544f36b4e3e91fc6c9c0e93d8983
diff --git a/net-mail/rss2email/rss2email-3.12.3.ebuild b/net-mail/rss2email/rss2email-3.12.3.ebuild
new file mode 100644
index 000000000000..d77199fe53f2
--- /dev/null
+++ b/net-mail/rss2email/rss2email-3.12.3.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Support for Python >=3.9 currently broken by feedparser <6
+# (see bug https://bugs.gentoo.org/768120)
+PYTHON_COMPAT=( python3_{7..8} )
+
+inherit distutils-r1
+
+DESCRIPTION="A python script that converts RSS/Atom newsfeeds to email"
+HOMEPAGE="https://github.com/rss2email/rss2email"
+SRC_URI="https://github.com/rss2email/rss2email/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( GPL-2 GPL-3 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="<dev-python/feedparser-6[${PYTHON_USEDEP}]
+	>=dev-python/html2text-3.01[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}"
+
+src_install() {
+	distutils-r1_src_install
+	doman r2e.1
+}
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 6da5cf2b003d..b4c217ec0b5d 100644
Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ
diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index acff24741e8c..a791fbadfa28 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -2,18 +2,26 @@ AUX 1.6.2/asterisk.logrotate4 848 BLAKE2B b169368ad6893e2fc2680b788569cf8b746575
 AUX asterisk-13.18.1-r2-autoconf-2.70.patch 535 BLAKE2B 06f880515f27166a75738bde6e81be1cac961a2ec2eec049cddbbb39b58d350f37a4feb49e86157d6dd5e80abaf251cf6b122ec094e0109c1f20f3e9b0f65c29 SHA512 77d1bb1be97fe5b8df78a8b21173c0d12a91f9a543404d73e4f4af2080a0b4edb87b3ccd36b1935f4fbd2a0bb44e971d303eba774e648c48c2a453c8e42838a7
 AUX asterisk-13.38.1-r1-autoconf-lua-version.patch 2320 BLAKE2B 5f9a4b4063286f964da0756698134ce9127a3ae854e19ccec098fb554f4835cbb1698da6ac76293dcb1af3dfd8ea741e9450d58b61c7da440ff3077c848dae68 SHA512 dae3daad5a6755a8a932b40c5d209c348a72266c139a2e05420ea4b8f292062832cf791bc8d41de4bf8c1e0516e8699efdb80724a5afb2d017ab707073d7fca8
 AUX asterisk-13.38.1-r1-func_lock-fix-races.patch 9580 BLAKE2B 174aa69b0738c87f02692c2eec978171216b2117218a54b9785a836d0b72b779ed1aa48a3c3b624deb9e16e3485d60a8390b60019c90524f6248665d1ae0ff44 SHA512 bff6f20a677eef837a6727859c1c90309e6f012621743b7e8b6b92ad17cf44c9b94aa75a0b64550ae39a6260210a944725d9e9603fbe0ca7bcbd4fd61d991748
+AUX asterisk-13.38.2-r1-menuselect-exitcodes.patch 1736 BLAKE2B 32f18fe623c6a9ba4db24001bc6669a2bc0838f2b757a2bcacde6eeb6b63f31881af877ce25cf7f38f6b7c010d92b5a1065d22b3f7526bcdc22799a09b22a975 SHA512 c4888e24051f0913c7dd13dbadbc38e7638bdedfee36b6f6cee047f6113d39cd09d79d9ecbfbb38f72ae6c9092e1423a0eff885118cfa44d4995f11d95c4a1d3
 AUX asterisk-16.15.1-r2-autoconf-2.70.patch 499 BLAKE2B d52c6514d3cd120402298322dac081d88821035a13a5210bddf8574dfe69ec1e6eca1f3335dbd2976e870a8dfc634d1883b3e0db707557581da38b074f7359e6 SHA512 a55725377a874ee15a722076fc63323d73a976592aad524e56bdff5f4164eaa7e533723f5add93b738f39532392541bd2615fc39b3a4fd55a49f57f584d82846
-AUX asterisk-16.16.2-no-var-run-install.patch 745 BLAKE2B fccfadf92aed04072d84e982cf2016ac648dbc6afa35bdc7446c2a032731bb93b227414dc75035a6c93329db3f1c2b81dc815690174f5c7d7c3a7078e5acffb4 SHA512 99b96357aa39a288a3381c8662cdb4a528fb998365d5456ba28863302cb528f568f3f7aecdb6ca830f2cda310f2a940d001e9096124a2df1ad064a62025e0e06
+AUX asterisk-16.16.2-no-var-run-install.patch 728 BLAKE2B 25fc61c4aa68d9e3243d1161e68e0b61b14b5505eadd00fdf46e1c3977e7fb536afd42dc6c9a07f400a686c19afd04fd8f00fc1cb916978783a9e54ecfe81dd4 SHA512 ab1e7ac700711125162396c4ebe590eb000f4ad6c4cbe8845794f5d06353a4a52167fcc83ee97860f38540089cad6d45f2e8589c1f30098e85479a2b4c722f75
 AUX asterisk-historic-no-var-run-install.patch 790 BLAKE2B 6fb753a3dc1b557b4cca8df1dc93eba3de70114f0bb206692461a3faf4068ffbf641740fa51e5010cabf0cbb64d8856dd9a830eba802b1988208b8a185a1fc57 SHA512 9c941d49a1ea10f702b7ce2c9c4a120c0e8ea297f13ecaa9d2a9b059cf4452a981aa0e0eabd5c4711c222311e3f9a52ee1135c59433ba878a9bd3a979be852fd
 AUX asterisk.service 456 BLAKE2B 4a5da9f0e45aa3b1eff29d59317d09e061e0a0e3c0e38cd39732e7880e96b7f34a68b44001d2608a7636b1259803f567b94bdb85ef15428727427fa1081ee385 SHA512 d443c3821d50e78a76b7cad8906f560ab0f4b58007f6c9322256626bc4a502bdbd844f1ee48cdaf86d499bf78f50cebb0cfc88a0cab0c4876f4e853bc2e76aa8
 AUX asterisk.service.conf 324 BLAKE2B b802f69897f050f661412631da7ddc6e3207ff0d776ad2c2cfb13677049b8e3fce8c565103057745a48a4245f8c660f805088844fdea7fb042facd32b5ec13b7 SHA512 94be3b27f9d862d357b62d14b9d59ca47487bfd4987ce3b0ea2bb862c6d03e1d3c8b536590f20295fd085166da3efdff869c4cfc37542a31933d22b6d9b73da3
 AUX asterisk.tmpfiles2.conf 43 BLAKE2B b459348ce0bf46a915b0a64a4961d753bb9610486dc8499e7ff4eb2fab8d1afda59d880057bd4862f12a497d4cba5b025d73f5f510987d349dd46d269a4d1869 SHA512 65e35490966095a7be6f4acb9e338fe94021976860319fd1c13b8d1b19376854f45348e182ce3a6c02d459c6dfeae62236148b7c992ddfaeb0ed55d0d8682e1b
+AUX asterisk.tmpfiles3.conf 88 BLAKE2B 826beba7712e4d096c5506fed353a1a21c89b4acbc6b6ae99f60fbc7e338a331056ec145bd885dd23b7058f4bdf3109d68fddff715ae32e9ec0fc88ce68bef56 SHA512 992902fd01dfd03a2d77bf8a6c7b3adbdcd769478cf0bfa019632515107222aa59b12be10f5dfd26b4e18651e51b81939f1321ae29531dda0f3a623306e6a983
 AUX confd-13.32.0 3895 BLAKE2B eada6c9ef6bb6754645679e6f2f5f2d299d89a3df3830f32ad468d2b83da3e98a4dda51250d86b5625e240c89dc151b26199e23b4131fd00764bcad223d15768 SHA512 55e8b2e2ac4da129375224cdfbb1165032b934fcce3da509e966083c80d7606af77025460214349da5203d9650cc03a9d4087266128459c7d99593068d94aae5
+AUX confd-16.16.2-r1 4078 BLAKE2B 9d49eb95660f5cb92d62d34a262d77909ab9acd68afa353dcff2d8c239cb203da289a7af91c083f4b89350d64bc2e87b1d7422266207605997badfab00ea24fc SHA512 4b4402ce62527084d0f82c5ad975d6b85276bb9c1e97d6f405737c6eee3c15f45e1b48f149d508c4f5cd70dd23a5e9be3ebd673047f80f4dfcda4913c9b6b287
 AUX initd-13.32.0-r1 9945 BLAKE2B 231bb632b6634fbe1455ba9e6312562c00a14552a2a38fe88dce5655e36628644e38f07984e305c706b167ec3674eec63933fb889586b78a9386c16bb3765766 SHA512 6c31c7627e30b15a35540d9eabad310841b5f740f8f361fc01630fd6ab389bae02f0d1092ee35e6375b5ae93a7d8d71d03cb06201045d084882177a2ce49a4da
+AUX initd-16.16.2-r1 9986 BLAKE2B 4b1c9537ef85c9de1d0064a851472163576480f08b573839db7860fd10828f444aef0f08d189a4e129a5545538424c1698e7d9d980cdbb44da2e68ff73dd0c75 SHA512 81747f6e6b4142b341797a8b2e9b212a48870d8db661669759020cc4c3ab0b66996a37dbd35afaa842dc00cd43aa834d3146021420b3f29b0d2f8b6e11d3fca7
 DIST asterisk-13.38.1.tar.gz 33705256 BLAKE2B c783ee40880455cee5a60b111f69d95fdc42bd42a598834236e9999d0f2f401548229560e937fa8d842c5d24715d3891e7860f098d35d5630522e7a659123242 SHA512 270b7c8374104b3c2e9999503fa5cab5b465e37ddfa6759c1019fb99b6bb5877fe4505501ac3306a708ce911aeda36d04796f51156312c04fec013dbaa56a57f
 DIST asterisk-13.38.2.tar.gz 33708267 BLAKE2B f8c188f6500a01e807982518486972c18f8f903285910e64b4d8e2a4f553d42534f910696a02ab13e371dbd83dfd932c5cb7a6cea08817862ecaddcc7afd99d2 SHA512 bd9755503048cd8dcf8e39947dd5cfb617c20c4b1ad5033ae297499a4967c06ba11b6e43233c1ae0d33f8f11a81dbb9b4487f16a1f4786007172028caf1ee051
 DIST asterisk-16.16.2.tar.gz 27808852 BLAKE2B dc05fe7c797f9b848c918121ffe7e7648bca75fccb70412fcd39f37beb3fd33e7d64cd198919cb6ae2867cd685651497ae15a30fb280988a9c7184e80de235ae SHA512 9e47ea2906a2c0d1a2f527d106ef6200a8d0cce76a31a6cfb3ca720a2ef7b5f723ae5c6266c74b0bdfd5718346e8d01a30fc346981463fa4ee7a4b7c99a67928
-EBUILD asterisk-13.38.1-r2.ebuild 9702 BLAKE2B e35e6757ff6429b49580eb0af9b203d9071334964ae0f588994028f14bb26b9aa1901991a6b7d00ce04c1c898276290f1b19862b15102ed5a7b1c925193ec7d7 SHA512 381907b16af92653d10df9679c770185f7fb639c63971cbf98732e856c19b08d56b6f7626753f20e4a9bd152e3290dac0742bc81e33a3abe5fefcb61dee5203e
-EBUILD asterisk-13.38.2.ebuild 9704 BLAKE2B fd0412c01c13bb1ae61afc25f7361722ffa06f0070e5dacf8ffa4752a6da27903f256cda72d1e423129f71510ef14ab59b7e48c1549ac25c883c247094e481bd SHA512 59a4471cb839682a312597ee17336a4f61c8d9fa7f3fd52b50060f4135171493cf46bf75f77e5dc2d45d8c797cbfbc0c462634be2dfdb247b4456812debac9fd
-EBUILD asterisk-16.16.2.ebuild 9893 BLAKE2B c84f1403a0405224650395cc577f3e8af06a52856af956229499f1025fb933b1dedde19c638487e4f2b84b34dbea3c4e8441ba5647ba2c9ce86721a6c02c48bd SHA512 547c80803791260513d16f73b2fbe744ca31f46d20c28aa17f13f3708533d9c66e2740a21c1af86840b75865e9368ae5477f7a22b7c5d4deadaaeae91d931ced
-MISC metadata.xml 1407 BLAKE2B eeb1d556a36abcf7f78c02fc2dffea0b8215ce8df72a3765b7cb1a909aa931a3f7e6806c300731774530b180bdc825d624fb8eb1799e2024977a5f57d76f0ea4 SHA512 bfa19a292e1f58747a312d8d52a6fa717729e61a5514e12de2773bc2728b2bf9a4a3fcc480284450a5bf9948e069f444cf01166cca3f48c9478e34d387d66a81
+DIST asterisk-18.2.2.tar.gz 27888521 BLAKE2B 5837b6434568a8e9f7a8963098994ccb487cfe9b85d59b30e5866e4eb67d222c4ac2c77036f7d461de72acc6ffd07fcd2d56bcaa618f4aecdbdba60d609eeb93 SHA512 e15fe3c7f46d49991bcb6f6f565f15e4af0d658b4cd6b091079209dd95a8027858effdc2f2314d72ed46a73cdebc089d3c27d5cf8db50d2d21f3c317a8a4a546
+EBUILD asterisk-13.38.1-r2.ebuild 9725 BLAKE2B a25d483b9242d2ca6223226d75f5da9f5b56ef0aafc865393e876a1178fec355867e98ed178bb4be7dd5ea805137ee809a6e3274a53a54a6d0628a2cb8c6b9e9 SHA512 9021cd20e0bf2d825cbd9855d975c3a562bbbd00d6c4c8e8c246d85c839f3198b19cb62819c9a1708b4aec5d2784bb05079a04ead3f937f7fc661ef072434dd6
+EBUILD asterisk-13.38.2-r1.ebuild 10793 BLAKE2B 9e0ba0d5db3f56b8726a557e8f80ac5833aceb1a023f5d107f5736a275eb3866f98eec6cc9234af73c8ecbdc44302207a0b595e89e7f2a4c578b8553037e8ea5 SHA512 d324345df46ae82b113b06746a9ee4020700de68619f1f82f7c2d41da46f8056c9479b4f9e2cea96bc964c89b72e7fc300d9d5f91162eb0e0a922170916f9b61
+EBUILD asterisk-13.38.2.ebuild 9727 BLAKE2B 23045501df1313e8eaffff84854c636b451c62d866e08faad95c5e9437c3a4663bb8da102fe41e9ca353b1f281572aafead82a6cb949db173aebf6b5f9909654 SHA512 ff7df049d824e33618e7759930df761bdb0ab5e6dca852409daff2bd94bdb84fb99ae3139e877d14655b2cd7a12ec423a87fb2a9fe8aa13c7e9cb2a29867044b
+EBUILD asterisk-16.16.2-r1.ebuild 11358 BLAKE2B 11dfe65926cad46998ccc2942e00d2a43343dee69c6a0ce2b32c070d1927a58cefba753463467d55e0c3133bb3b01941c5879ebd8881c227cbc94089947b2722 SHA512 ab299440f47d5dc2aa16af46f6859ab4317ec1d83aef853fadcc403a44d3cbc4043a9b6cfe7ce146e6b3bc5958123072e04705e80a3b964009177266a12570a5
+EBUILD asterisk-16.16.2.ebuild 9916 BLAKE2B a02bc1d09394459ca9737f43dea546b16fe3230319585bf7a86a8bbccc123342054f63578382b17bf1c02cee94749c1516860aaea383aaec173990267ba41f35 SHA512 c06ebbc5202ddbda233747120b17b2cda0cb8db4465ea5f445f0d064c8efdb49ef7cf957c5da759bc392dcb5e5805e30b47268062c94b241d2cb27e0ec33c152
+EBUILD asterisk-18.2.2.ebuild 11331 BLAKE2B 89f1eb498c7e25872918ec01a865bb00c393f4b86e6199622f49259b9ceff341c71992d99adce75d8ef808edbf4d139106c3bd41f2ee46e69e013da1b0af03bb SHA512 f4568a1caf38249e2e62ee6a0033aeb023bb0c731820b42429f02afd3f7faffa64fa66f95d708f7f19a0032bdd0ab7c830dfe5a4f985f7ff40b0f7108ccdfb58
+MISC metadata.xml 1482 BLAKE2B 71a7d51199cb53116efd36963d5881264faa13f8beb375ab68074c3ab560443c3ea9cb021c5c03c9c55fdfa9fc27425c90b4313d3a3bd680079add6ebf5763d1 SHA512 df1f06ccc232488d08202b9f6bfc62e17769ef740a2c1da9ee8a2c48d40d7a293f522b6c9c899c7ae202ba7c6b207fc25e69730d2983bb307921f82c070a09ee
diff --git a/net-misc/asterisk/asterisk-13.38.1-r2.ebuild b/net-misc/asterisk/asterisk-13.38.1-r2.ebuild
index 00fb2c78dce3..4afefac8480b 100644
--- a/net-misc/asterisk/asterisk-13.38.1-r2.ebuild
+++ b/net-misc/asterisk/asterisk-13.38.1-r2.ebuild
@@ -19,7 +19,7 @@ IUSE_VOICEMAIL_STORAGE=(
 	voicemail_storage_odbc
 	voicemail_storage_imap
 )
-IUSE="${IUSE_VOICEMAIL_STORAGE[*]//+/} alsa blocks bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc ldap libressl lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog vorbis xmpp"
+IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc ldap libressl lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog vorbis xmpp"
 REQUIRED_USE="gtalk? ( xmpp )
 	lua? ( ${LUA_REQUIRED_USE} )
 	^^ ( ${IUSE_VOICEMAIL_STORAGE[*]//+/} )
@@ -99,7 +99,8 @@ RDEPEND="${DEPEND}
 	selinux? ( sec-policy/selinux-asterisk )
 	syslog? ( virtual/logger )"
 
-BDEPEND="virtual/pkgconfig"
+BDEPEND="dev-libs/libxml2:2
+	virtual/pkgconfig"
 
 QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+"
 
@@ -285,7 +286,7 @@ src_install() {
 	dodoc UPGRADE* BUGS CREDITS
 
 	# install extra documentation
-	use doc &&doc/*.{txt,pdf}
+	use doc && dodoc doc/*.{txt,pdf}
 
 	# install logrotate snippet; bug #329281
 	#
diff --git a/net-misc/asterisk/asterisk-13.38.2-r1.ebuild b/net-misc/asterisk/asterisk-13.38.2-r1.ebuild
new file mode 100644
index 000000000000..93a5d9eec9aa
--- /dev/null
+++ b/net-misc/asterisk/asterisk-13.38.2-r1.ebuild
@@ -0,0 +1,348 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..4} )
+
+inherit autotools linux-info lua-single systemd toolchain-funcs tmpfiles
+
+DESCRIPTION="Asterisk: A Modular Open Source PBX System"
+HOMEPAGE="https://www.asterisk.org/"
+SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0/${PV%%.*}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+IUSE_VOICEMAIL_STORAGE=(
+	+voicemail_storage_file
+	voicemail_storage_odbc
+	voicemail_storage_imap
+)
+IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc ldap libressl lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog systemd vorbis xmpp"
+REQUIRED_USE="gtalk? ( xmpp )
+	lua? ( ${LUA_REQUIRED_USE} )
+	^^ ( ${IUSE_VOICEMAIL_STORAGE[*]//+/} )
+	voicemail_storage_odbc? ( odbc )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-historic-no-var-run-install.patch"
+	"${FILESDIR}/${PN}-13.38.1-r1-autoconf-lua-version.patch"
+	"${FILESDIR}/${PN}-13.38.1-r1-func_lock-fix-races.patch"
+	"${FILESDIR}/${PN}-13.18.1-r2-autoconf-2.70.patch"
+	"${FILESDIR}/${PN}-13.38.2-r1-menuselect-exitcodes.patch"
+)
+
+DEPEND="acct-user/asterisk
+	acct-group/asterisk
+	dev-db/sqlite:3
+	dev-libs/popt
+	dev-libs/jansson
+	dev-libs/libedit
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	sys-libs/zlib
+	alsa? ( media-libs/alsa-lib )
+	bluetooth? ( net-wireless/bluez:= )
+	calendar? (
+		net-libs/neon:=
+		dev-libs/libical:=
+		dev-libs/iksemel
+	)
+	caps? ( sys-libs/libcap )
+	blocks? ( sys-libs/blocksruntime )
+	cluster? ( sys-cluster/corosync )
+	curl? ( net-misc/curl )
+	dahdi? (
+		net-libs/libpri
+		net-misc/dahdi-tools
+	)
+	freetds? ( dev-db/freetds )
+	gtalk? ( dev-libs/iksemel )
+	http? ( dev-libs/gmime:2.6 )
+	iconv? ( virtual/libiconv )
+	ilbc? ( media-libs/libilbc )
+	ldap? ( net-nds/openldap )
+	lua? ( ${LUA_DEPS} )
+	mysql? ( dev-db/mysql-connector-c:= )
+	newt? ( dev-libs/newt )
+	odbc? ( dev-db/unixODBC )
+	pjproject? ( net-libs/pjproject:= )
+	portaudio? ( media-libs/portaudio )
+	postgres? ( dev-db/postgresql:* )
+	radius? ( net-dialup/freeradius-client )
+	snmp? ( net-analyzer/net-snmp:= )
+	span? ( media-libs/spandsp )
+	speex? (
+		media-libs/speex
+		media-libs/speexdsp
+	)
+	srtp? ( net-libs/libsrtp:0 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	systemd? ( sys-apps/systemd )
+	!systemd? ( !sys-apps/systemd )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+	voicemail_storage_imap? ( virtual/imap-c-client )
+	xmpp? ( dev-libs/iksemel )
+"
+
+RDEPEND="${DEPEND}
+	net-misc/asterisk-core-sounds
+	net-misc/asterisk-extra-sounds
+	net-misc/asterisk-moh-opsound
+	selinux? ( sec-policy/selinux-asterisk )
+	syslog? ( virtual/logger )"
+
+BDEPEND="dev-libs/libxml2:2
+	virtual/pkgconfig"
+
+QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+"
+
+_make_args=(
+	"NOISY_BUILD=yes"
+	"ASTDBDIR=\$(ASTDATADIR)/astdb"
+	"OPTIMIZE="
+	"DEBUG="
+	"DESTDIR=${D}"
+	"CONFIG_SRC=configs/samples"
+	"CONFIG_EXTEN=.sample"
+)
+
+pkg_pretend() {
+	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
+	local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
+	have reported that this module dropped critical SIP packets in their deployments. You
+	may want to disable it if you see such problems."
+	check_extra_config
+
+	[[ "${MERGE_TYPE}" == binary ]] && return
+
+	if tc-is-clang; then
+		use blocks || die "CC=clang requires USE=blocks"
+	else
+		use blocks && die "USE=blocks can only be used with CC=clang"
+	fi
+}
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+}
+
+src_prepare() {
+	default
+	AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" eautoreconf
+}
+
+src_configure() {
+	local vmst
+	local copt cstate
+
+	econf \
+		LUA_VERSION="${ELUA#lua}" \
+		--libdir="/usr/$(get_libdir)" \
+		--localstatedir="/var" \
+		--with-crypto \
+		--with-gsm=internal \
+		--with-popt \
+		--with-z \
+		--with-libedit \
+		$(use_with caps cap) \
+		$(use_with lua lua) \
+		$(use_with http gmime) \
+		$(use_with newt) \
+		$(use_with pjproject) \
+		$(use_with portaudio) \
+		$(use_with ssl)
+
+	_menuselect() {
+		menuselect/menuselect "$@" || die "menuselect $* failed."
+	}
+
+	_use_select() {
+		local state=$(usex "$1" enable disable)
+		shift # remove use from parameters
+
+		while [[ -n $1 ]]; do
+			_menuselect --${state} "$1" menuselect.makeopts
+			shift
+		done
+	}
+
+	# Blank out sounds/sounds.xml file to prevent
+	# asterisk from installing sounds files (we pull them in via
+	# asterisk-{core,extra}-sounds and asterisk-moh-opsound.
+	>"${S}"/sounds/sounds.xml
+
+	# That NATIVE_ARCH chatter really is quite bothersome
+	sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
+
+	# Compile menuselect binary for optional components
+	emake "${_make_args[@]}" menuselect.makeopts
+
+	# Disable BUILD_NATIVE (bug #667498)
+	_menuselect --disable build_native menuselect.makeopts
+
+	# Broken functionality is forcibly disabled (bug #360143)
+	_menuselect --disable chan_misdn menuselect.makeopts
+	_menuselect --disable chan_ooh323 menuselect.makeopts
+
+	# Utility set is forcibly enabled (bug #358001)
+	_menuselect --enable smsq menuselect.makeopts
+	_menuselect --enable streamplayer menuselect.makeopts
+	_menuselect --enable aelparse menuselect.makeopts
+	_menuselect --enable astman menuselect.makeopts
+
+	# this is connected, otherwise it would not find
+	# ast_pktccops_gate_alloc symbol
+	_menuselect --enable chan_mgcp menuselect.makeopts
+	_menuselect --enable res_pktccops menuselect.makeopts
+
+	# SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
+	_menuselect --enable pbx_dundi menuselect.makeopts
+	_menuselect --enable func_aes menuselect.makeopts
+	_menuselect --enable chan_iax2 menuselect.makeopts
+
+	# SQlite3 is now the main database backend, enable related features
+	_menuselect --enable cdr_sqlite3_custom menuselect.makeopts
+	_menuselect --enable cel_sqlite3_custom menuselect.makeopts
+
+	# The others are based on USE-flag settings
+	_use_select alsa         chan_alsa
+	_use_select bluetooth    chan_mobile
+	_use_select calendar     res_calendar res_calendar_{caldav,ews,exchange,icalendar}
+	_use_select cluster      res_corosync
+	_use_select curl         func_curl res_config_curl res_curl
+	_use_select dahdi        app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi
+	_use_select freetds      {cdr,cel}_tds
+	_use_select gtalk        chan_motif
+	_use_select http         res_http_post
+	_use_select iconv        func_iconv
+	_use_select ilbc         codec_ilbc format_ilbc
+	_use_select ldap         res_config_ldap
+	_use_select lua          pbx_lua
+	_use_select mysql        app_mysql cdr_mysql res_config_mysql
+	_use_select odbc         cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
+	_use_select oss          chan_oss
+	_use_select postgres     {cdr,cel}_pgsql res_config_pgsql
+	_use_select radius       {cdr,cel}_radius
+	_use_select snmp         res_snmp
+	_use_select span         res_fax_spandsp
+	_use_select speex        {codec,func}_speex
+	_use_select srtp         res_srtp
+	_use_select statsd       res_statsd res_{endpoint,chan}_stats
+	_use_select syslog       cdr_syslog
+	_use_select vorbis       format_ogg_vorbis
+	_use_select xmpp         res_xmpp
+
+	# Voicemail storage ...
+	for vmst in "${IUSE_VOICEMAIL_STORAGE[@]}"; do
+		if use "${vmst#+}"; then
+			_menuselect --enable "$(echo "${vmst##*_}" | tr '[:lower:]' '[:upper:]')_STORAGE" menuselect.makeopts
+		fi
+	done
+
+	if use debug; then
+		for o in DONT_OPTIMIZE DEBUG_FD_LEAKS MALLOC_DEBUG BETTER_BACKTRACES; do
+			_menuselect --enable $o menuselect.makeopts
+		done
+	fi
+
+	if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then
+		for copt in ${GENTOO_ASTERISK_CUSTOM_MENUSELECT}; do
+			cstate=--enable
+			[[ "${copt}" == -* ]] && cstate=--disable
+			ebegin "Custom option ${copt#[-+]} ${cstate:2}d"
+			_menuselect ${cstate} "${copt#[-+]}"
+			eend $?
+		done
+	fi
+}
+
+src_compile() {
+	emake "${_make_args[@]}"
+}
+
+src_install() {
+	local d
+
+	dodir "/usr/$(get_libdir)/pkgconfig"
+	diropts -m 0750 -o root -g asterisk
+	dodir	/etc/asterisk
+
+	emake "${_make_args[@]}" install install-configs
+
+	fowners asterisk: /var/lib/asterisk/astdb
+
+	if use radius; then
+		insinto /etc/radiusclient/
+		doins contrib/dictionary.digium
+	fi
+
+	# keep directories
+	diropts -m 0750 -o asterisk -g root
+	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail,recording}
+	diropts -m 0750 -o asterisk -g asterisk
+	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
+
+	newinitd "${FILESDIR}"/initd-13.32.0-r1 asterisk
+	newconfd "${FILESDIR}"/confd-13.32.0 asterisk
+
+	systemd_dounit "${FILESDIR}"/asterisk.service
+	newtmpfiles "${FILESDIR}"/asterisk.tmpfiles2.conf asterisk.conf
+	systemd_install_serviced "${FILESDIR}"/asterisk.service.conf
+
+	# Reset diropts else dodoc uses it for doc installations.
+	diropts -m0755
+
+	# install the upgrade documentation
+	dodoc UPGRADE* BUGS CREDITS
+
+	# install extra documentation
+	use doc && dodoc doc/*.{txt,pdf}
+
+	# install logrotate snippet; bug #329281
+	#
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/1.6.2/asterisk.logrotate4" asterisk
+
+	# Asterisk installs a few folders that's empty by design,
+	# but still required.  This finds them, and marks them for
+	# portage.
+	while read d < <(find "${ED}"/var -type d -empty || die "Find failed."); do
+		keepdir "${d#${ED}}"
+	done
+}
+
+pkg_postinst() {
+	if [ -z "${REPLACING_VERSIONS}" ]; then
+		elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/"
+		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.freenode.net"
+	elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then
+		elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:"
+		elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)"
+		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.freenode.net"
+	fi
+
+	if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then
+		ewarn "You are using GENTOO_ASTERISK_CUSTOM_MENUSELECT, this should only be used"
+		ewarn "for debugging, for anything else, please file a bug on https://bugs.gentoo.org"
+	fi
+
+	if [[ -f /var/lib/asterisk/astdb.sqlite3 ]]; then
+		ewarn "Default astdb location has changed from /var/lib/asterisk to /var/lib/asterisk/astdb"
+		ewarn "You still have a /var/lib/asterisk/astdb.sqlite file.  You need to either set"
+		ewarn "astdbdir in /etc/asterisk/asterisk.conf to /var/lib/asterisk or follow these"
+		ewarn "steps to migrate:"
+		ewarn "1.  /etc/init.d/asterisk stop"
+		ewarn "2.  mv /var/lib/asterisk/astdb.sqlite /var/lib/asterisk/astdb/"
+		ewarn "3.  /etc/init.d/asterisk start"
+		ewarn "This update was done partly for security reasons so that /var/lib/asterisk can be root owned."
+	fi
+}
diff --git a/net-misc/asterisk/asterisk-13.38.2.ebuild b/net-misc/asterisk/asterisk-13.38.2.ebuild
index 84f0aec402f7..7a8d1d57cf86 100644
--- a/net-misc/asterisk/asterisk-13.38.2.ebuild
+++ b/net-misc/asterisk/asterisk-13.38.2.ebuild
@@ -19,7 +19,7 @@ IUSE_VOICEMAIL_STORAGE=(
 	voicemail_storage_odbc
 	voicemail_storage_imap
 )
-IUSE="${IUSE_VOICEMAIL_STORAGE[*]//+/} alsa blocks bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc ldap libressl lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog vorbis xmpp"
+IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc ldap libressl lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog vorbis xmpp"
 REQUIRED_USE="gtalk? ( xmpp )
 	lua? ( ${LUA_REQUIRED_USE} )
 	^^ ( ${IUSE_VOICEMAIL_STORAGE[*]//+/} )
@@ -99,7 +99,8 @@ RDEPEND="${DEPEND}
 	selinux? ( sec-policy/selinux-asterisk )
 	syslog? ( virtual/logger )"
 
-BDEPEND="virtual/pkgconfig"
+BDEPEND="dev-libs/libxml2:2
+	virtual/pkgconfig"
 
 QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+"
 
@@ -285,7 +286,7 @@ src_install() {
 	dodoc UPGRADE* BUGS CREDITS
 
 	# install extra documentation
-	use doc &&doc/*.{txt,pdf}
+	use doc && dodoc doc/*.{txt,pdf}
 
 	# install logrotate snippet; bug #329281
 	#
diff --git a/net-misc/asterisk/asterisk-16.16.2-r1.ebuild b/net-misc/asterisk/asterisk-16.16.2-r1.ebuild
new file mode 100644
index 000000000000..4dc58a42a482
--- /dev/null
+++ b/net-misc/asterisk/asterisk-16.16.2-r1.ebuild
@@ -0,0 +1,365 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..4} )
+
+inherit autotools linux-info lua-single systemd toolchain-funcs tmpfiles
+
+DESCRIPTION="Asterisk: A Modular Open Source PBX System"
+HOMEPAGE="https://www.asterisk.org/"
+SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0/${PV%%.*}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+IUSE_VOICEMAIL_STORAGE=(
+	+voicemail_storage_file
+	voicemail_storage_odbc
+	voicemail_storage_imap
+)
+IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster codec2 curl dahdi debug -deprecated doc freetds gtalk http iconv ilbc ldap libressl lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog systemd unbound vorbis xmpp"
+IUSE_EXPAND="VOICEMAIL_STORAGE"
+REQUIRED_USE="gtalk? ( xmpp )
+	lua? ( ${LUA_REQUIRED_USE} )
+	^^ ( ${IUSE_VOICEMAIL_STORAGE[*]//+/} )
+	voicemail_storage_odbc? ( odbc )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-16.16.2-no-var-run-install.patch"
+	"${FILESDIR}/${PN}-16.15.1-r2-autoconf-2.70.patch"
+	"${FILESDIR}/${PN}-13.38.2-r1-menuselect-exitcodes.patch"
+)
+
+DEPEND="acct-user/asterisk
+	acct-group/asterisk
+	dev-db/sqlite:3
+	dev-libs/popt
+	>=dev-libs/jansson-2.11
+	dev-libs/libedit
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	sys-apps/util-linux
+	sys-libs/zlib
+	alsa? ( media-libs/alsa-lib )
+	bluetooth? ( net-wireless/bluez:= )
+	calendar? (
+		net-libs/neon:=
+		dev-libs/libical:=
+		dev-libs/iksemel
+	)
+	caps? ( sys-libs/libcap )
+	blocks? ( sys-libs/blocksruntime )
+	cluster? ( sys-cluster/corosync )
+	codec2? ( media-libs/codec2:= )
+	curl? ( net-misc/curl )
+	dahdi? (
+		net-libs/libpri
+		net-misc/dahdi-tools
+	)
+	freetds? ( dev-db/freetds )
+	gtalk? ( dev-libs/iksemel )
+	http? ( dev-libs/gmime:2.6 )
+	iconv? ( virtual/libiconv )
+	ilbc? ( media-libs/libilbc )
+	ldap? ( net-nds/openldap )
+	lua? ( ${LUA_DEPS} )
+	mysql? ( dev-db/mysql-connector-c:= )
+	newt? ( dev-libs/newt )
+	odbc? ( dev-db/unixODBC )
+	pjproject? ( >=net-libs/pjproject-2.9:= )
+	portaudio? ( media-libs/portaudio )
+	postgres? ( dev-db/postgresql:* )
+	radius? ( net-dialup/freeradius-client )
+	snmp? ( net-analyzer/net-snmp:= )
+	span? ( media-libs/spandsp )
+	speex? (
+		media-libs/libogg
+		media-libs/speex
+		media-libs/speexdsp
+	)
+	srtp? ( net-libs/libsrtp:0 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	systemd? ( sys-apps/systemd )
+	!systemd? ( !sys-apps/systemd )
+	unbound? ( net-dns/unbound )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+	voicemail_storage_imap? ( virtual/imap-c-client )
+	xmpp? ( dev-libs/iksemel )
+"
+
+RDEPEND="${DEPEND}
+	net-misc/asterisk-core-sounds
+	net-misc/asterisk-extra-sounds
+	net-misc/asterisk-moh-opsound
+	selinux? ( sec-policy/selinux-asterisk )
+	syslog? ( virtual/logger )"
+
+BDEPEND="dev-libs/libxml2:2
+	virtual/pkgconfig"
+
+QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+"
+
+_make_args=(
+	"NOISY_BUILD=yes"
+	"ASTDBDIR=\$(ASTDATADIR)/astdb"
+	"ASTCACHEDIR=/var/cache/asterisk"
+	"OPTIMIZE="
+	"DEBUG="
+	"DESTDIR=${D}"
+	"CONFIG_SRC=configs/samples"
+	"CONFIG_EXTEN=.sample"
+)
+
+pkg_pretend() {
+	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
+	local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
+	have reported that this module dropped critical SIP packets in their deployments. You
+	may want to disable it if you see such problems."
+	check_extra_config
+
+	[[ "${MERGE_TYPE}" == binary ]] && return
+
+	if tc-is-clang; then
+		use blocks || die "CC=clang requires USE=blocks"
+	else
+		use blocks && die "USE=blocks can only be used with CC=clang"
+	fi
+}
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+}
+
+src_prepare() {
+	default
+	AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" eautoreconf
+}
+
+src_configure() {
+	local vmst
+	local copt cstate
+
+	econf \
+		LUA_VERSION="${ELUA#lua}" \
+		--libdir="/usr/$(get_libdir)" \
+		--localstatedir="/var" \
+		--with-crypto \
+		--with-gsm=internal \
+		--with-popt \
+		--with-z \
+		--with-libedit \
+		--without-jansson-bundled \
+		--without-pjproject-bundled \
+		$(use_with caps cap) \
+		$(use_with codec2) \
+		$(use_with lua lua) \
+		$(use_with http gmime) \
+		$(use_with newt) \
+		$(use_with pjproject) \
+		$(use_with portaudio) \
+		$(use_with ssl) \
+		$(use_with unbound)
+
+	_menuselect() {
+		menuselect/menuselect "$@" || die "menuselect $* failed."
+	}
+
+	_use_select() {
+		local state=$(use "$1" && echo enable || echo disable)
+		shift # remove use from parameters
+
+		while [[ -n $1 ]]; do
+			_menuselect --${state} "$1" menuselect.makeopts
+			shift
+		done
+	}
+
+	# Blank out sounds/sounds.xml file to prevent
+	# asterisk from installing sounds files (we pull them in via
+	# asterisk-{core,extra}-sounds and asterisk-moh-opsound.
+	>"${S}"/sounds/sounds.xml
+
+	# That NATIVE_ARCH chatter really is quite bothersome
+	sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
+
+	# Compile menuselect binary for optional components
+	emake "${_make_args[@]}" menuselect.makeopts
+
+	# Disable BUILD_NATIVE (bug #667498)
+	_menuselect --disable build_native menuselect.makeopts
+
+	# Broken functionality is forcibly disabled (bug #360143)
+	_menuselect --disable chan_misdn menuselect.makeopts
+	_menuselect --disable chan_ooh323 menuselect.makeopts
+
+	# Utility set is forcibly enabled (bug #358001)
+	_menuselect --enable smsq menuselect.makeopts
+	_menuselect --enable streamplayer menuselect.makeopts
+	_menuselect --enable aelparse menuselect.makeopts
+	_menuselect --enable astman menuselect.makeopts
+
+	# this is connected, otherwise it would not find
+	# ast_pktccops_gate_alloc symbol
+	_menuselect --enable chan_mgcp menuselect.makeopts
+	_menuselect --enable res_pktccops menuselect.makeopts
+
+	# SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
+	_menuselect --enable pbx_dundi menuselect.makeopts
+	_menuselect --enable func_aes menuselect.makeopts
+	_menuselect --enable chan_iax2 menuselect.makeopts
+
+	# SQlite3 is now the main database backend, enable related features
+	_menuselect --enable cdr_sqlite3_custom menuselect.makeopts
+	_menuselect --enable cel_sqlite3_custom menuselect.makeopts
+
+	# The others are based on USE-flag settings
+	_use_select alsa         chan_alsa
+	_use_select bluetooth    chan_mobile
+	_use_select calendar     res_calendar res_calendar_{caldav,ews,exchange,icalendar}
+	_use_select cluster      res_corosync
+	_use_select codec2       codec_codec2
+	_use_select curl         func_curl res_config_curl res_curl
+	_use_select dahdi        app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi
+	_use_select deprecated   app_macro
+	_use_select freetds      {cdr,cel}_tds
+	_use_select gtalk        chan_motif
+	_use_select http         res_http_post
+	_use_select iconv        func_iconv
+	_use_select ilbc         codec_ilbc format_ilbc
+	_use_select ldap         res_config_ldap
+	_use_select lua          pbx_lua
+	_use_select mysql        app_mysql cdr_mysql res_config_mysql
+	_use_select odbc         cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
+	_use_select oss          chan_oss
+	_use_select postgres     {cdr,cel}_pgsql res_config_pgsql
+	_use_select radius       {cdr,cel}_radius
+	_use_select snmp         res_snmp
+	_use_select span         res_fax_spandsp
+	_use_select speex        {codec,func}_speex
+	_use_select speex        format_ogg_speex
+	_use_select srtp         res_srtp
+	_use_select statsd       res_statsd res_{endpoint,chan}_stats
+	_use_select syslog       cdr_syslog
+	_use_select vorbis       format_ogg_vorbis
+	_use_select xmpp         res_xmpp
+
+	# Voicemail storage ...
+	for vmst in "${IUSE_VOICEMAIL_STORAGE[@]}"; do
+		if use "${vmst#+}"; then
+			_menuselect --enable "$(echo "${vmst##*_}" | tr '[:lower:]' '[:upper:]')_STORAGE" menuselect.makeopts
+		fi
+	done
+
+	if use debug; then
+		for o in DONT_OPTIMIZE DEBUG_FD_LEAKS MALLOC_DEBUG BETTER_BACKTRACES; do
+			_menuselect --enable "${o}" menuselect.makeopts
+		done
+	fi
+
+	if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then
+		for copt in ${GENTOO_ASTERISK_CUSTOM_MENUSELECT}; do
+			cstate=--enable
+			[[ "${copt}" == -* ]] && cstate=--disable
+			ebegin "Custom option ${copt#[-+]} ${cstate:2}d"
+			_menuselect ${cstate} "${copt#[-+]}"
+			eend $?
+		done
+	fi
+}
+
+src_compile() {
+	emake "${_make_args[@]}"
+}
+
+src_install() {
+	local d
+
+	dodir "/usr/$(get_libdir)/pkgconfig"
+
+	diropts -m 0750 -o root -g asterisk
+	dodir /etc/asterisk
+
+	emake "${_make_args[@]}" install install-configs
+
+	fowners asterisk: /var/lib/asterisk/astdb
+
+	if use radius; then
+		insinto /etc/radiusclient/
+		doins contrib/dictionary.digium
+	fi
+
+	# keep directories
+	diropts -m 0750 -o asterisk -g root
+	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail,recording}
+	diropts -m 0750 -o asterisk -g asterisk
+	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
+
+	newinitd "${FILESDIR}"/initd-16.16.2-r1 asterisk
+	newconfd "${FILESDIR}"/confd-16.16.2-r1 asterisk
+
+	systemd_dounit "${FILESDIR}"/asterisk.service
+	newtmpfiles "${FILESDIR}"/asterisk.tmpfiles3.conf asterisk.conf
+	systemd_install_serviced "${FILESDIR}"/asterisk.service.conf
+
+	# Reset diropts else dodoc uses it for doc installations.
+	diropts -m0755
+
+	# install the upgrade documentation
+	dodoc UPGRADE* BUGS CREDITS
+
+	# install extra documentation
+	use doc && dodoc doc/*.{txt,pdf}
+
+	# install logrotate snippet; bug #329281
+	#
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/1.6.2/asterisk.logrotate4" asterisk
+
+	# Asterisk installs a few folders that's empty by design,
+	# but still required.  This finds them, and marks them for
+	# portage.
+	while read d < <(find "${ED}"/var -type d -empty || die "Find failed."); do
+		keepdir "${d#${ED}}"
+	done
+}
+
+pkg_postinst() {
+	if [ -z "${REPLACING_VERSIONS}" ]; then
+		elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/"
+		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.freenode.net"
+	elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then
+		elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:"
+		elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)"
+		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.freenode.net"
+	fi
+
+	if use deprecated; then
+		ewarn "You really aught to port whatever code you have that depends on this since these are going to go away."
+		ewarn "Refer: https://wiki.asterisk.org/wiki/display/AST/Module+Deprecation"
+	fi
+
+	if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then
+		ewarn "You are using GENTOO_ASTERISK_CUSTOM_MENUSELECT, this should only be used"
+		ewarn "for debugging, for anything else, please file a bug on https://bugs.gentoo.org"
+	fi
+
+	if [[ -f /var/lib/asterisk/astdb.sqlite3 ]]; then
+		ewarn "Default astdb location has changed from /var/lib/asterisk to /var/lib/asterisk/astdb"
+		ewarn "You still have a /var/lib/asterisk/astdb.sqlite file.  You need to either set"
+		ewarn "astdbdir in /etc/asterisk/asterisk.conf to /var/lib/asterisk or follow these"
+		ewarn "steps to migrate:"
+		ewarn "1.  /etc/init.d/asterisk stop"
+		ewarn "2.  mv /var/lib/asterisk/astdb.sqlite /var/lib/asterisk/astdb/"
+		ewarn "3.  /etc/init.d/asterisk start"
+		ewarn "This update was done partly for security reasons so that /var/lib/asterisk can be root owned."
+	fi
+}
diff --git a/net-misc/asterisk/asterisk-16.16.2.ebuild b/net-misc/asterisk/asterisk-16.16.2.ebuild
index 6a7ee37f0807..2ca6f4a6d01d 100644
--- a/net-misc/asterisk/asterisk-16.16.2.ebuild
+++ b/net-misc/asterisk/asterisk-16.16.2.ebuild
@@ -19,7 +19,7 @@ IUSE_VOICEMAIL_STORAGE=(
 	voicemail_storage_odbc
 	voicemail_storage_imap
 )
-IUSE="${IUSE_VOICEMAIL_STORAGE[*]//+/} alsa blocks bluetooth calendar +caps cluster codec2 curl dahdi debug doc freetds gtalk http iconv ilbc ldap libressl lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog unbound vorbis xmpp"
+IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster codec2 curl dahdi debug doc freetds gtalk http iconv ilbc ldap libressl lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog unbound vorbis xmpp"
 IUSE_EXPAND="VOICEMAIL_STORAGE"
 REQUIRED_USE="gtalk? ( xmpp )
 	lua? ( ${LUA_REQUIRED_USE} )
@@ -101,7 +101,8 @@ RDEPEND="${DEPEND}
 	selinux? ( sec-policy/selinux-asterisk )
 	syslog? ( virtual/logger )"
 
-BDEPEND="virtual/pkgconfig"
+BDEPEND="dev-libs/libxml2:2
+	virtual/pkgconfig"
 
 QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+"
 
@@ -292,7 +293,7 @@ src_install() {
 	dodoc UPGRADE* BUGS CREDITS
 
 	# install extra documentation
-	use doc &&doc/*.{txt,pdf}
+	use doc && dodoc doc/*.{txt,pdf}
 
 	# install logrotate snippet; bug #329281
 	#
diff --git a/net-misc/asterisk/asterisk-18.2.2.ebuild b/net-misc/asterisk/asterisk-18.2.2.ebuild
new file mode 100644
index 000000000000..c253eb63cf92
--- /dev/null
+++ b/net-misc/asterisk/asterisk-18.2.2.ebuild
@@ -0,0 +1,364 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..4} )
+
+inherit autotools linux-info lua-single systemd toolchain-funcs tmpfiles
+
+DESCRIPTION="Asterisk: A Modular Open Source PBX System"
+HOMEPAGE="https://www.asterisk.org/"
+SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0/${PV%%.*}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+IUSE_VOICEMAIL_STORAGE=(
+	voicemail_storage_odbc
+	voicemail_storage_imap
+)
+IUSE="${IUSE_VOICEMAIL_STORAGE[*]} alsa blocks bluetooth calendar +caps cluster codec2 curl dahdi debug -deprecated doc freetds gtalk http iconv ilbc ldap libressl lua mysql newt odbc oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog systemd unbound vorbis xmpp"
+IUSE_EXPAND="VOICEMAIL_STORAGE"
+REQUIRED_USE="gtalk? ( xmpp )
+	lua? ( ${LUA_REQUIRED_USE} )
+	voicemail_storage_odbc? ( odbc )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-16.16.2-no-var-run-install.patch"
+	"${FILESDIR}/${PN}-16.15.1-r2-autoconf-2.70.patch"
+	"${FILESDIR}/${PN}-13.38.2-r1-menuselect-exitcodes.patch"
+)
+
+DEPEND="acct-user/asterisk
+	acct-group/asterisk
+	dev-db/sqlite:3
+	dev-libs/popt
+	>=dev-libs/jansson-2.11
+	dev-libs/libedit
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	sys-apps/util-linux
+	sys-libs/zlib
+	alsa? ( media-libs/alsa-lib )
+	bluetooth? ( net-wireless/bluez:= )
+	calendar? (
+		net-libs/neon:=
+		dev-libs/libical:=
+		dev-libs/iksemel
+	)
+	caps? ( sys-libs/libcap )
+	blocks? ( sys-libs/blocksruntime )
+	cluster? ( sys-cluster/corosync )
+	codec2? ( media-libs/codec2:= )
+	curl? ( net-misc/curl )
+	dahdi? (
+		net-libs/libpri
+		net-misc/dahdi-tools
+	)
+	freetds? ( dev-db/freetds )
+	gtalk? ( dev-libs/iksemel )
+	http? ( dev-libs/gmime:2.6 )
+	iconv? ( virtual/libiconv )
+	ilbc? ( media-libs/libilbc )
+	ldap? ( net-nds/openldap )
+	lua? ( ${LUA_DEPS} )
+	mysql? ( dev-db/mysql-connector-c:= )
+	newt? ( dev-libs/newt )
+	odbc? ( dev-db/unixODBC )
+	pjproject? ( >=net-libs/pjproject-2.9:= )
+	portaudio? ( media-libs/portaudio )
+	postgres? ( dev-db/postgresql:* )
+	radius? ( net-dialup/freeradius-client )
+	snmp? ( net-analyzer/net-snmp:= )
+	span? ( media-libs/spandsp )
+	speex? (
+		media-libs/libogg
+		media-libs/speex
+		media-libs/speexdsp
+	)
+	srtp? ( net-libs/libsrtp:0 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	systemd? ( sys-apps/systemd )
+	!systemd? ( !sys-apps/systemd )
+	unbound? ( net-dns/unbound )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+	voicemail_storage_imap? ( virtual/imap-c-client )
+	xmpp? ( dev-libs/iksemel )
+"
+
+RDEPEND="${DEPEND}
+	net-misc/asterisk-core-sounds
+	net-misc/asterisk-extra-sounds
+	net-misc/asterisk-moh-opsound
+	selinux? ( sec-policy/selinux-asterisk )
+	syslog? ( virtual/logger )"
+
+BDEPEND="dev-libs/libxml2:2
+	virtual/pkgconfig"
+
+QA_DT_NEEDED="/usr/lib.*/libasteriskssl[.]so[.][0-9]\+"
+
+_make_args=(
+	"NOISY_BUILD=yes"
+	"ASTDBDIR=\$(ASTDATADIR)/astdb"
+	"ASTCACHEDIR=/var/cache/asterisk"
+	"OPTIMIZE="
+	"DEBUG="
+	"DESTDIR=${D}"
+	"CONFIG_SRC=configs/samples"
+	"CONFIG_EXTEN=.sample"
+)
+
+pkg_pretend() {
+	CONFIG_CHECK="~!NF_CONNTRACK_SIP"
+	local WARNING_NF_CONNTRACK_SIP="SIP (NAT) connection tracking is enabled. Some users
+	have reported that this module dropped critical SIP packets in their deployments. You
+	may want to disable it if you see such problems."
+	check_extra_config
+
+	[[ "${MERGE_TYPE}" == binary ]] && return
+
+	if tc-is-clang; then
+		use blocks || die "CC=clang requires USE=blocks"
+	else
+		use blocks && die "USE=blocks can only be used with CC=clang"
+	fi
+}
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+}
+
+src_prepare() {
+	default
+	AT_M4DIR="autoconf third-party third-party/pjproject third-party/jansson" eautoreconf
+}
+
+src_configure() {
+	local vmst
+	local copt cstate
+
+	econf \
+		LUA_VERSION="${ELUA#lua}" \
+		--libdir="/usr/$(get_libdir)" \
+		--localstatedir="/var" \
+		--with-crypto \
+		--with-gsm=internal \
+		--with-popt \
+		--with-z \
+		--with-libedit \
+		--without-jansson-bundled \
+		--without-pjproject-bundled \
+		$(use_with caps cap) \
+		$(use_with codec2) \
+		$(use_with lua lua) \
+		$(use_with http gmime) \
+		$(use_with newt) \
+		$(use_with pjproject) \
+		$(use_with portaudio) \
+		$(use_with ssl) \
+		$(use_with unbound)
+
+	_menuselect() {
+		menuselect/menuselect "$@" || die "menuselect $* failed."
+	}
+
+	_use_select() {
+		local state=$(use "$1" && echo enable || echo disable)
+		shift # remove use from parameters
+
+		while [[ -n $1 ]]; do
+			_menuselect --${state} "$1" menuselect.makeopts
+			shift
+		done
+	}
+
+	# Blank out sounds/sounds.xml file to prevent
+	# asterisk from installing sounds files (we pull them in via
+	# asterisk-{core,extra}-sounds and asterisk-moh-opsound.
+	>"${S}"/sounds/sounds.xml
+
+	# That NATIVE_ARCH chatter really is quite bothersome
+	sed -i 's/NATIVE_ARCH=/NATIVE_ARCH=0/' build_tools/menuselect-deps || die "Unable to squelch noisy build system"
+
+	# Compile menuselect binary for optional components
+	emake "${_make_args[@]}" menuselect.makeopts
+
+	# Disable BUILD_NATIVE (bug #667498)
+	_menuselect --disable build_native menuselect.makeopts
+
+	# Broken functionality is forcibly disabled (bug #360143)
+	_menuselect --disable chan_misdn menuselect.makeopts
+	_menuselect --disable chan_ooh323 menuselect.makeopts
+
+	# Utility set is forcibly enabled (bug #358001)
+	_menuselect --enable smsq menuselect.makeopts
+	_menuselect --enable streamplayer menuselect.makeopts
+	_menuselect --enable aelparse menuselect.makeopts
+	_menuselect --enable astman menuselect.makeopts
+
+	# this is connected, otherwise it would not find
+	# ast_pktccops_gate_alloc symbol
+	_menuselect --enable chan_mgcp menuselect.makeopts
+	_menuselect --enable res_pktccops menuselect.makeopts
+
+	# SSL is forcibly enabled, IAX2 & DUNDI are expected to be available
+	_menuselect --enable pbx_dundi menuselect.makeopts
+	_menuselect --enable func_aes menuselect.makeopts
+	_menuselect --enable chan_iax2 menuselect.makeopts
+
+	# SQlite3 is now the main database backend, enable related features
+	_menuselect --enable cdr_sqlite3_custom menuselect.makeopts
+	_menuselect --enable cel_sqlite3_custom menuselect.makeopts
+
+	# The others are based on USE-flag settings
+	_use_select alsa         chan_alsa
+	_use_select bluetooth    chan_mobile
+	_use_select calendar     res_calendar res_calendar_{caldav,ews,exchange,icalendar}
+	_use_select cluster      res_corosync
+	_use_select codec2       codec_codec2
+	_use_select curl         func_curl res_config_curl res_curl
+	_use_select dahdi        app_dahdiras app_meetme chan_dahdi codec_dahdi res_timing_dahdi
+	_use_select deprecated   app_macro
+	_use_select freetds      {cdr,cel}_tds
+	_use_select gtalk        chan_motif
+	_use_select http         res_http_post
+	_use_select iconv        func_iconv
+	_use_select ilbc         codec_ilbc format_ilbc
+	_use_select ldap         res_config_ldap
+	_use_select lua          pbx_lua
+	_use_select mysql        app_mysql cdr_mysql res_config_mysql
+	_use_select odbc         cdr_adaptive_odbc res_config_odbc {cdr,cel,res,func}_odbc
+	_use_select oss          chan_oss
+	_use_select postgres     {cdr,cel}_pgsql res_config_pgsql
+	_use_select radius       {cdr,cel}_radius
+	_use_select snmp         res_snmp
+	_use_select span         res_fax_spandsp
+	_use_select speex        {codec,func}_speex
+	_use_select speex        format_ogg_speex
+	_use_select srtp         res_srtp
+	_use_select statsd       res_statsd res_{endpoint,chan}_stats
+	_use_select syslog       cdr_syslog
+	_use_select vorbis       format_ogg_vorbis
+	_use_select xmpp         res_xmpp
+
+	# Voicemail storage ...
+	_menuselect --enable app_voicemail menuselect.makeopts
+	for vmst in "${IUSE_VOICEMAIL_STORAGE[@]}"; do
+		if use "${vmst#+}"; then
+			_menuselect --enable "app_voicemail_${vmst##*_}" menuselect.makeopts
+		fi
+	done
+
+	if use debug; then
+		for o in DONT_OPTIMIZE DEBUG_FD_LEAKS MALLOC_DEBUG BETTER_BACKTRACES; do
+			_menuselect --enable "${o}" menuselect.makeopts
+		done
+	fi
+
+	if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then
+		for copt in ${GENTOO_ASTERISK_CUSTOM_MENUSELECT}; do
+			cstate=--enable
+			[[ "${copt}" == -* ]] && cstate=--disable
+			ebegin "Custom option ${copt#[-+]} ${cstate:2}d"
+			_menuselect ${cstate} "${copt#[-+]}"
+			eend $?
+		done
+	fi
+}
+
+src_compile() {
+	emake "${_make_args[@]}"
+}
+
+src_install() {
+	local d
+
+	dodir "/usr/$(get_libdir)/pkgconfig"
+
+	diropts -m 0750 -o root -g asterisk
+	dodir /etc/asterisk
+
+	emake "${_make_args[@]}" install install-headers install-configs
+
+	fowners asterisk: /var/lib/asterisk/astdb
+
+	if use radius; then
+		insinto /etc/radiusclient/
+		doins contrib/dictionary.digium
+	fi
+
+	# keep directories
+	diropts -m 0750 -o asterisk -g root
+	keepdir /var/spool/asterisk/{system,tmp,meetme,monitor,dictate,voicemail,recording}
+	diropts -m 0750 -o asterisk -g asterisk
+	keepdir /var/log/asterisk/{cdr-csv,cdr-custom}
+
+	newinitd "${FILESDIR}"/initd-16.16.2-r1 asterisk
+	newconfd "${FILESDIR}"/confd-16.16.2-r1 asterisk
+
+	systemd_dounit "${FILESDIR}"/asterisk.service
+	newtmpfiles "${FILESDIR}"/asterisk.tmpfiles3.conf asterisk.conf
+	systemd_install_serviced "${FILESDIR}"/asterisk.service.conf
+
+	# Reset diropts else dodoc uses it for doc installations.
+	diropts -m0755
+
+	# install the upgrade documentation
+	dodoc UPGRADE* BUGS CREDITS
+
+	# install extra documentation
+	use doc && dodoc doc/*.{txt,pdf}
+
+	# install logrotate snippet; bug #329281
+	#
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/1.6.2/asterisk.logrotate4" asterisk
+
+	# Asterisk installs a few folders that's empty by design,
+	# but still required.  This finds them, and marks them for
+	# portage.
+	while read d < <(find "${ED}"/var -type d -empty || die "Find failed."); do
+		keepdir "${d#${ED}}"
+	done
+}
+
+pkg_postinst() {
+	if [ -z "${REPLACING_VERSIONS}" ]; then
+		elog "Asterisk Wiki: https://wiki.asterisk.org/wiki/"
+		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.freenode.net"
+	elif [ "$(ver_cut 1 "${REPLACING_VERSIONS}")" != "$(ver_cut 1)" ]; then
+		elog "You are updating from Asterisk $(ver_cut 1 "${REPLACING_VERSIONS}") upgrade document:"
+		elog "https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+$(ver_cut 1)"
+		elog "Gentoo VoIP IRC Channel: #gentoo-voip @ irc.freenode.net"
+	fi
+
+	if use deprecated; then
+		ewarn "You really aught to port whatever code you have that depends on this since these are going to go away."
+		ewarn "Refer: https://wiki.asterisk.org/wiki/display/AST/Module+Deprecation"
+	fi
+
+	if [[ -n "${GENTOO_ASTERISK_CUSTOM_MENUSELECT:+yes}" ]]; then
+		ewarn "You are using GENTOO_ASTERISK_CUSTOM_MENUSELECT, this should only be used"
+		ewarn "for debugging, for anything else, please file a bug on https://bugs.gentoo.org"
+	fi
+
+	if [[ -f /var/lib/asterisk/astdb.sqlite3 ]]; then
+		ewarn "Default astdb location has changed from /var/lib/asterisk to /var/lib/asterisk/astdb"
+		ewarn "You still have a /var/lib/asterisk/astdb.sqlite file.  You need to either set"
+		ewarn "astdbdir in /etc/asterisk/asterisk.conf to /var/lib/asterisk or follow these"
+		ewarn "steps to migrate:"
+		ewarn "1.  /etc/init.d/asterisk stop"
+		ewarn "2.  mv /var/lib/asterisk/astdb.sqlite /var/lib/asterisk/astdb/"
+		ewarn "3.  /etc/init.d/asterisk start"
+		ewarn "This update was done partly for security reasons so that /var/lib/asterisk can be root owned."
+	fi
+}
diff --git a/net-misc/asterisk/files/asterisk-13.38.2-r1-menuselect-exitcodes.patch b/net-misc/asterisk/files/asterisk-13.38.2-r1-menuselect-exitcodes.patch
new file mode 100644
index 000000000000..90c97e9df5e3
--- /dev/null
+++ b/net-misc/asterisk/files/asterisk-13.38.2-r1-menuselect-exitcodes.patch
@@ -0,0 +1,67 @@
+From 840eaa67e1ee0d10aa6bfb1e34659efa3095b772 Mon Sep 17 00:00:00 2001
+From: Jaco Kroon <jaco@uls.co.za>
+Date: Sat, 13 Mar 2021 13:01:50 +0200
+Subject: [PATCH] menuselect: exit non-zero in case of failure on
+ --enable|disable options.
+
+Change-Id: I77e3466435f5a51a57538b29addb68d811af238d
+Signed-off-by: Jaco Kroon <jaco@uls.co.za>
+---
+ menuselect/menuselect.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/menuselect/menuselect.c b/menuselect/menuselect.c
+index 2eea3f09eb..adb6fa1777 100644
+--- a/menuselect/menuselect.c
++++ b/menuselect/menuselect.c
+@@ -2090,6 +2090,7 @@ int main(int argc, char *argv[])
+ 		/* Reset options processing */
+ 		option_index = 0;
+ 		optind = 1;
++		res = 0;
+ 
+ 		while ((c = getopt_long(argc, argv, "", long_options, &option_index)) != -1) {
+ 			print_debug("Got option %c\n", c);
+@@ -2100,6 +2101,7 @@ int main(int argc, char *argv[])
+ 						set_member_enabled(mem);
+ 					} else {
+ 						fprintf(stderr, "'%s' not found\n", optarg);
++						res = 1;
+ 					}
+ 				}
+ 				break;
+@@ -2109,6 +2111,7 @@ int main(int argc, char *argv[])
+ 						set_all(cat, 1);
+ 					} else {
+ 						fprintf(stderr, "'%s' not found\n", optarg);
++						res = 1;
+ 					}
+ 				}
+ 				break;
+@@ -2123,6 +2126,7 @@ int main(int argc, char *argv[])
+ 						clear_member_enabled(mem);
+ 					} else {
+ 						fprintf(stderr, "'%s' not found\n", optarg);
++						res = 1;
+ 					}
+ 				}
+ 				break;
+@@ -2132,6 +2136,7 @@ int main(int argc, char *argv[])
+ 						set_all(cat, 0);
+ 					} else {
+ 						fprintf(stderr, "'%s' not found\n", optarg);
++						res = 1;
+ 					}
+ 				}
+ 				break;
+@@ -2146,7 +2151,6 @@ int main(int argc, char *argv[])
+ 				break;
+ 			}
+ 		}
+-		res = 0;
+ 	}
+ 
+ 	if (!res) {
+-- 
+2.26.2
+
diff --git a/net-misc/asterisk/files/asterisk-16.16.2-no-var-run-install.patch b/net-misc/asterisk/files/asterisk-16.16.2-no-var-run-install.patch
index 63b2896bb097..cde9ea0e15ae 100644
--- a/net-misc/asterisk/files/asterisk-16.16.2-no-var-run-install.patch
+++ b/net-misc/asterisk/files/asterisk-16.16.2-no-var-run-install.patch
@@ -5,7 +5,7 @@
  NEWHEADERS=$(notdir $(wildcard include/asterisk/*.h))
  OLDHEADERS=$(filter-out $(NEWHEADERS) $(notdir $(DESTDIR)$(ASTHEADERDIR)),$(notdir $(wildcard $(DESTDIR)$(ASTHEADERDIR)/*.h)))
 -INSTALLDIRS="$(ASTLIBDIR)" "$(ASTMODDIR)" "$(ASTSBINDIR)" "$(ASTCACHEDIR)" "$(ASTETCDIR)" "$(ASTVARRUNDIR)" \
-+INSTALLDIRS="$(ASTLIBDIR)" "$(ASTMODDIR)" "$(ASTSBINDIR)" "$(ASTCACHEDIR)" "$(ASTETCDIR)" \
++INSTALLDIRS="$(ASTLIBDIR)" "$(ASTMODDIR)" "$(ASTSBINDIR)" "$(ASTETCDIR)" \
  	"$(ASTSPOOLDIR)" "$(ASTSPOOLDIR)/dictate" "$(ASTSPOOLDIR)/meetme" \
  	"$(ASTSPOOLDIR)/monitor" "$(ASTSPOOLDIR)/system" "$(ASTSPOOLDIR)/tmp" \
  	"$(ASTSPOOLDIR)/voicemail" "$(ASTSPOOLDIR)/recording" \
diff --git a/net-misc/asterisk/files/asterisk.tmpfiles3.conf b/net-misc/asterisk/files/asterisk.tmpfiles3.conf
new file mode 100644
index 000000000000..7af4ed720d43
--- /dev/null
+++ b/net-misc/asterisk/files/asterisk.tmpfiles3.conf
@@ -0,0 +1,2 @@
+d /var/run/asterisk 0750 asterisk asterisk
+d /var/cache/asterisk 0750 asterisk asterisk
diff --git a/net-misc/asterisk/files/confd-16.16.2-r1 b/net-misc/asterisk/files/confd-16.16.2-r1
new file mode 100644
index 000000000000..a2da978af924
--- /dev/null
+++ b/net-misc/asterisk/files/confd-16.16.2-r1
@@ -0,0 +1,171 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+#
+# Additional options for asterisk
+#
+# see "asterisk -h" for a list of options
+#
+# No default.
+#
+#ASTERISK_OPTS=""
+
+#
+# User and group to run asterisk as
+#
+# Value: double-colon separated list of user and group, or empty to run as root:
+#
+#
+# "asterisk:asterisk" to run as user "asterisk" and group "asterisk"
+# "asterisk" to run as user "asterisk" and all groups that user "asterisk" is a member of
+# ":asterisk" to run as user "root" and group "asterisk"
+#
+# Default: asterisk
+#
+#ASTERISK_USER="asterisk"
+
+#
+# Nicelevel
+#
+# Set the priority of the asterisk process
+#
+# Value: (highest) -20..19 (lowest)
+#
+# No default (leave scheduling to be system default).
+#
+#ASTERISK_NICE="19"
+
+# Send crash notifications emails to this address
+# (needs a working mail service and /usr/sbin/sendmail to do so (e.g. ssmtp))
+#
+# Value: Email address or empty to disable
+#
+# No default.
+#
+#ASTERISK_NOTIFY_EMAIL="root"
+
+#
+# Send asterisk's output to this terminal
+#
+# Value: Full path to device node or a number
+#
+# No default.
+#
+#ASTERISK_TTY="/dev/tty9"
+
+#
+# Start an asterisk console on the terminal specified by ASTERISK_TTY
+#
+# Warning! Use only for debugging, this is a potential security issue!
+#
+# Value: yes/no
+#
+# Default: no
+#
+#ASTERISK_CONSOLE="no"
+
+#
+# Maximum size of core files.
+#
+# Value: Size in bytes, unlimited for no limit or empty to disable.
+#
+# Default:  do not generate core dumps
+#
+#ASTERISK_CORE_SIZE="unlimited"
+
+#
+# ASTERISK_CORE_DIR
+#
+# Value: Directory (will be created if non-existant).
+#
+# Default: /tmp
+#
+#ASTERISK_CORE_DIR="/var/lib/asterisk/core"
+
+#
+# Max number of filedescriptors.  asterisk can trivially run out of
+# descriptors.  In most (SIP) cases it uses at least four descriptors per call,
+# and this is a conservative value.
+#
+# Value: Number of descriptors
+#
+# Default: leave system default in place.
+#
+ASTERISK_MAX_FD="4096"
+
+#
+# Delay time before restarting asterisk after a crash.
+#
+# Value: Number of seconds to sleep after a crash before restarting.
+#
+# Default: 5
+#
+#ASTERISK_RESTART_DELAY=5
+
+#
+# The stop mechanism to use.  Asterisk can do gracefully, when convenient or now.
+# By default we expect you to want to stop as soon as possible, so we default
+#
+# Default: gracefully
+#
+#ASTERISK_STOP_METHOD="when convenient"
+
+#
+# By default the init script waits two minutes for asterisk to stop.  This allows
+# you to change that, or even completely disable and go into wait for ever mode (-1).
+# The value here is in seconds.
+#
+# Default: 120
+#
+#ASTERISK_STOP_TIMEOUT=-1
+
+#
+# Kill these tasks after asterisk crashed
+#
+# Warning! This will kill _ALL_ tasks with the specified names!
+#
+# Value: Space separated list of names in double quotes (e.g. "mpg123 mad")
+#
+# Default is to not do stupid things like killing random processes.
+#
+#ASTERISK_CLEANUP_ON_CRASH="mpg123 asterisk-mpg123 mad"
+
+#
+# ASTERISK_CONFDIR
+#
+# If you'd like an alternative folder to /etc/${RC_SVCNAME} to be used
+# (typically /etc/asterisk) to be used for configuration.
+#
+# Default: /etc/${RC_SVCNAME}
+#
+#ASTERISK_CONFDIR="/etc/foo/bar"
+
+# ASTERISK_CACHEDIR
+#
+# Value: Directory to which astcachedir in asterisk.conf is set.
+#
+# Default: /var/cache/asterisk
+#
+#ASTERISK_CACHEDIR="/var/cache/asterisk"
+
+
+#
+# Normally the init script will not wait for asterisk to fully boot.  With this
+# setting set to yes/true/1 it will issue a "core waitfullybooted" directly
+# after starting asterisk, and wait for asterisk to start up completely.  This
+# is useful in certain conditions where other software requires asterisk to be
+# properly started before they themselves can be started.
+#
+# Default:  no
+#
+#ASTERISK_WAITBOOTED=yes
+
+#
+# When core-dumping, the default was to generate core-$(date +%Y%m%d-%H%M%S).
+# In certain highly unusual configurations it's helpful to also get the
+# hostname into this filename.  By enabling this option the wrapper loop will
+# adjust the core file to be named core-$(hostname)-$(date ...).
+#
+# Default: no
+#
+#ASTERISK_CORE_USEHOSTNAME=yes
diff --git a/net-misc/asterisk/files/initd-16.16.2-r1 b/net-misc/asterisk/files/initd-16.16.2-r1
new file mode 100644
index 000000000000..bdd979a56978
--- /dev/null
+++ b/net-misc/asterisk/files/initd-16.16.2-r1
@@ -0,0 +1,363 @@
+#!/sbin/openrc-run
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+extra_started_commands="forcestop reload"
+
+depend() {
+	need net
+	use nscd dns dahdi mysql postgresql slapd capi
+}
+
+is_running() {
+	[ -r "${ast_rundir}/asterisk.pid" ] || return 1
+	PID="$(cat "${ast_rundir}/asterisk.pid")"
+	[ -d "/proc/${PID}" ] || return 1
+	EXE="$(readlink -f /proc/${PID}/exe)"
+	EXE="${EXE% (deleted)}" # in case asterisk got upgraded and we're still looking at an old one.
+	[ "${EXE}" = /usr/sbin/asterisk ] || return 1 # pid got re-used for another process.
+
+	# PID reported in pidfile is active, and is still an asterisk instance.
+	return 0
+}
+
+# Sets up a few variables for us for use
+# ast_instancename: eg, asterisk when RC_SVCNAME=asterisk, or asterisk(foo) when asterisk.foo.
+# ast_rundir: directory to be used as run folder (pid and ctl files).
+setup_svc_variables()
+{
+	local t
+
+	ast_instancename=asterisk
+	ast_rundir=/var/run/${RC_SVCNAME}
+	ast_logdir=/var/log/${RC_SVCNAME}
+	ast_confdir=/etc/${RC_SVCNAME/.//}
+	ast_cachedir=/var/cache/asterisk
+	ast_stop_timeout=120
+	ast_stop_method="gracefully"
+
+	if [ "${RC_SVCNAME}" != "asterisk" ]; then
+		t="${RC_SVCNAME#asterisk.}"
+		if [ "${RC_SVCNAME}" = "${t}" ]; then
+			eerror "Invalid SVCNAME of ${RC_SVCNAME}, must be of the format asterisk.name."
+			return 1
+		fi
+		ast_instancename+="(${t})"
+	fi
+
+	[ -n "${ASTERISK_RUNDIR}" ] && ast_rundir="${ASTERISK_RUNDIR}"
+	[ -n "${ASTERISK_LOGDIR}" ] && ast_logdir="${ASTERISK_LOGDIR}"
+	[ -n "${ASTERISK_CONFDIR}" ] && ast_confdir="${ASTERISK_CONFDIR}"
+	[ -n "${ASTERISK_CACHEDIR}" ] && ast_confdir="${ASTERISK_CACHEDIR}"
+	[ -n "${ASTERISK_STOP_TIMEOUT}" ] && ast_stop_timeout="${ASTERISK_STOP_TIMEOUT}"
+	case "${ASTERISK_STOP_METHOD}" in
+		gracefully|when\ convenient|now)
+			ast_stop_method="${ASTERISK_STOP_METHOD}"
+		;;
+	esac
+	ast_group=
+	if [ -n "${ASTERISK_USER}" ]; then
+		ast_user="${ASTERISK_USER%%:*}"
+		if [ "${ast_user}" != "${ASTERISK_USER}" ]; then
+			ast_group="${ASTERISK_USER#*:}"
+			ast_group="${ast_group%%:*}"
+		fi
+	fi
+
+	[ -z "${ast_user}" ] && ast_user=asterisk
+
+	ast_pgroup="$(getent group $(getent passwd "${ast_user}" | awk -F: '{ print $4 }') | sed -re 's/:.*//')"
+
+	return 0
+}
+
+asterisk_run_loop() {
+	local result=0 signal=0
+
+	echo "Initializing ${ast_instancename} wrapper"
+	OPTS="$*"
+
+	trap "rm -f '${ast_rundir}/wrapper_loop.running'" EXIT
+	touch "${ast_rundir}/wrapper_loop.running"
+
+	while [ -r "${ast_rundir}/wrapper_loop.running" ]; do
+		if [ -n "${TTY}" ]; then
+			/usr/bin/stty -F "${TTY}" sane
+			${NICE} /usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" ${OPTS} >"${TTY}" 2>&1 <"${TTY}"
+			result=$?
+		else
+			${NICE} /usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" ${OPTS} >/dev/null 2>&1
+			result=$?
+		fi
+
+		if [ "$result" -eq 0 ]; then
+			echo "Asterisk terminated normally"
+			break
+		else
+			if [ "$result" -gt 128 ]; then
+				signal="$(expr "$result" - 128)"
+				MSG="Asterisk terminated with Signal: $signal"
+
+				CORE_TARGET="core-"
+				yesno "${ASTERISK_CORE_USEHOSTNAME}" && CORE_TARGET+="$(hostname)-"
+				CORE_TARGET+="$(date "+%Y%m%d-%H%M%S")"
+
+				local CORE_DUMPED=0
+				if [ -f "${ASTERISK_CORE_DIR}/core" ]; then
+					mv "${ASTERISK_CORE_DIR}/core" \
+					   "${ASTERISK_CORE_DIR}/${CORE_TARGET}"
+					CORE_DUMPED=1
+
+				elif [ -f "${ASTERISK_CORE_DIR}/core.${PID}" ]; then
+					mv "${ASTERISK_CORE_DIR}/core.${PID}" \
+					   "${ASTERISK_CORE_DIR}/${CORE_TARGET}"
+					CORE_DUMPED=1
+
+				fi
+
+				[ $CORE_DUMPED -eq 1 ] && \
+					MSG="${MSG}\n\rCore dumped: ${ASTERISK_CORE_DIR}/${CORE_TARGET}"
+			else
+				MSG="Asterisk terminated with return code: $result"
+			fi
+
+			# kill left-over tasks
+			for X in ${ASTERISK_CLEANUP_ON_CRASH}; do
+				kill -9 "$(pidof "${X}")";
+			done
+		fi
+
+		[ -n "${TTY}" ] \
+			&& echo "${MSG}" >"${TTY}" \
+			|| echo "${MSG}"
+
+
+		if [ -n "${ASTERISK_NOTIFY_EMAIL}" ] && \
+		   [ -x /usr/sbin/sendmail ]; then
+			echo -e -n "Subject: Asterisk crashed\r\n${MSG}\r\n" |\
+				 /usr/sbin/sendmail "${ASTERISK_NOTIFY_EMAIL}"
+		fi
+		sleep "${ASTERISK_RESTART_DELAY}"
+		echo "Restarting Asterisk..."
+	done
+
+	echo "Terminating wrapper loop."
+	return 0
+}
+
+start() {
+	local OPTS PID
+	local tmp x
+
+	local OPTS ARGS
+
+	setup_svc_variables || return $?
+
+	ebegin "Starting ${ast_instancename} PBX"
+
+	eindent
+
+	# filter (redundant) arguments
+	OPTS="$(echo "${ASTERISK_OPTS}" | sed -re "s:-[cfF]::g")"
+
+	# default options
+	OPTS="${OPTS} -f"  # don't fork / detach breaks wrapper script...
+
+	# ensure that ASTERISK_RESTART_DELAY is integer.
+	ASTERISK_RESTART_DELAY="$(echo "${ASTERISK_RESTART_DELAY}" | sed -re 's/^([0-9]*).*/\1/')"
+	[ -z "${ASTERISK_RESTART_DELAY}" ] && ASTERISK_RESTART_DELAY=5
+
+	if [ -n "${ASTERISK_CORE_SIZE}" ] &&
+	   [ "${ASTERISK_CORE_SIZE}" != "0" ]; then
+		ulimit -c ${ASTERISK_CORE_SIZE}
+
+		if [ -n "${ASTERISK_CORE_DIR}" ] && \
+		   [ ! -d "${ASTERISK_CORE_DIR}" ]
+		then
+			checkpath -d -m 0755 -o ${ast_user}:${ast_group} "${ASTERISK_CORE_DIR}"
+		fi
+		ASTERISK_CORE_DIR="${ASTERISK_CORE_DIR:-/tmp}"
+
+		cd "${ASTERISK_CORE_DIR}"
+		einfo "Core dump size            : ${ASTERISK_CORE_SIZE}"
+		einfo "Core dump location        : ${ASTERISK_CORE_DIR}"
+
+		OPTS="${OPTS} -g"
+	fi
+
+	if [ -n "${ASTERISK_MAX_FD}" ]; then
+		ulimit -n ${ASTERISK_MAX_FD}
+		einfo "Max open filedescriptors  : ${ASTERISK_MAX_FD}"
+	fi
+
+	if [ -n "${ASTERISK_NICE}" ]; then
+		if [ ${ASTERISK_NICE} -ge -20 ] && \
+		   [ ${ASTERISK_NICE} -le  19 ]; then
+			einfo "Nice level                : ${ASTERISK_NICE}"
+			NICE="nice -n ${ASTERISK_NICE} --"
+		else
+			eerror "Nice value must be between -20 and 19"
+			return 1
+		fi
+	else
+		NICE=""
+	fi
+
+	if [ -n "${ASTERISK_NOTIFY_EMAIL}" ]; then
+		if [ -x /usr/sbin/sendmail ]; then
+			einfo "Email notifications go to : ${ASTERISK_NOTIFY_EMAIL}"
+		else
+			ewarn "Notifications disabled, /usr/sbin/sendmail doesn't exist or is not executable!"
+			unset ASTERISK_NOTIFY_EMAIL
+		fi
+	fi
+
+	if [ -n "${ASTERISK_TTY}" ]; then
+		for x in "${ASTERISK_TTY}" \
+			 "/dev/tty${ASTERISK_TTY}" \
+			 "/dev/vc/${ASTERISK_TTY}"
+		do
+			if [ -c "${x}" ]; then
+				TTY="${x}"
+			fi
+		done
+		[ -n "${TTY}" ] && \
+			einfo "Messages are sent to      : ${TTY}"
+	fi
+
+	if yesno "${ASTERISK_CONSOLE}" && [ -n "${TTY}" ]; then
+		einfo "Starting Asterisk console : Yes"
+		OPTS="${OPTS} -c"
+	fi
+
+	if ! getent passwd "${ast_user}" &>/dev/null; then
+		eerror "Requested to run asterisk as ${ast_user}, which doesn't exist."
+		return 1
+	fi
+	OPTS="${OPTS} -U ${ast_user}"
+
+	if [ -n "${ast_group}" ] && ! getent group "${ast_group}" &>/dev/null; then
+		eerror "Requested to run ${ast_instancename} with group ${ast_group}, which doesn't exist."
+		return 1
+	fi
+	[ -n "${ast_group}" ] && OPTS="${OPTS} -G ${ast_group}"
+
+	if [ "${ast_user}" = root ]; then
+		ewarn "Starting asterisk as root is not recommended (SERIOUS SECURITY CONSIDERATIONS)."
+	elif [ "${ast_group}" = root ]; then
+		ewarn "Starting asterisk with group root is not recommended (SERIOUS SECURITY CONSIDERATIONS)."
+	fi
+
+	checkpath -d -m 0755 -o "${ast_user}:${ast_group}" "${ast_logdir}" "${ast_rundir}"
+	checkpath -d -m 0750 -o "${ast_user}:${ast_group}" "${ast_cachedir}"
+
+	einfo "Starting asterisk as      : ${ast_user}:${ast_group:-${ast_pgroup} (+supplementaries)}"
+	asterisk_run_loop ${OPTS} 2>&1 | logger -t "wrapper:${ast_instancename}" &>/dev/null &
+	result=$?
+
+	if [ $result -eq 0 ]; then
+		# 2 seconds should be enough for asterisk to start
+		sleep 2
+		is_running
+		result=$?
+
+		[ $result -eq 0 ] || wrapperstop
+	fi
+
+	eoutdent
+	eend $result
+
+	if [ $result -eq 0 ] && yesno "${ASTERISK_WAITBOOTED}"; then
+		if [ ! -r "${ast_rundir}/asterisk.ctl" ]; then
+			# asterisk can crash during startup ...
+			ebegin "Waiting for ctl file to appear"
+			while is_running && [ ! -r "${ast_rundir}/asterisk.ctl" ]; do
+				sleep 1
+			done
+			is_running
+			result=$?
+			eend $result
+		fi
+		if [ $result -eq 0 ]; then
+			ebegin "Waiting for ${ast_instancename} to fully boot"
+			/usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" -r -x "core waitfullybooted" &>/dev/null
+			eend $?
+		fi
+	fi
+
+	return $result
+}
+
+wrapperstop() {
+	# Accomodate system upgrades (so a previous version of the wrapper script that still uses a pid file may be running).
+	if [ -r "${ast_rundir}/wrapper_loop.pid" ]; then
+		ebegin "Killing ${ast_instancename} wrapper script"
+		kill "$(cat /var/run/asterisk/wrapper_loop.pid)"
+		eend $?
+	fi
+
+	# The new one (due to "hardened" requirements) uses a simpler
+	# flag to indicate running or shutting down.
+	if [ -r "${ast_rundir}/wrapper_loop.running" ]; then
+		ebegin "Signalling ${ast_instancename} wrapper script to terminate"
+		rm "${ast_rundir}/wrapper_loop.running"
+		eend $?
+	fi
+
+	return 0
+}
+
+forcestop() {
+	setup_svc_variables || return $?
+
+	# Just to be sure - when we want to forcestop we should make it all tear down.
+	wrapperstop
+
+	ebegin "Stopping ${ast_instancename} PBX"
+	start-stop-daemon --stop --pidfile /var/run/asterisk/asterisk.pid
+	eend $?
+}
+
+stop() {
+	setup_svc_variables || return $?
+
+	wrapperstop
+
+	if ! is_running; then
+		eerror "${ast_instancename} is not running!"
+		return 0
+	fi
+
+	ebegin "Stopping ${ast_instancename} PBX ${ast_stop_method}"
+	/usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" -r -x "core stop ${ast_stop_method}" &>/dev/null
+	# Now we have to wait until asterisk has _really_ stopped.
+	sleep 1
+	if is_running; then
+		einfon "Waiting for ${ast_instancename} to shutdown ."
+		local cnt=0
+		while is_running; do
+			cnt="$(expr $cnt + 2)"
+			if [ ${ast_stop_timeout} -gt 0 -a $cnt -gt ${ast_stop_timeout} ] ; then
+				echo
+				eend 1 "Failed waiting for ${ast_instancename} to stop."
+				return 1
+			fi
+			sleep 2
+			echo -n "."
+		done
+		echo
+	fi
+	eend 0
+}
+
+reload() {
+	setup_svc_variables || return $?
+
+	if is_running; then
+		ebegin "Forcing ${ast_instancename} to reload configuration"
+		/usr/sbin/asterisk -C "${ast_confdir}/asterisk.conf" -r -x "module reload" &>/dev/null
+		eend $?
+	else
+		eerror "${ast_instancename} is not running!"
+	fi
+}
diff --git a/net-misc/asterisk/metadata.xml b/net-misc/asterisk/metadata.xml
index 3146734cac38..730a8e858f29 100644
--- a/net-misc/asterisk/metadata.xml
+++ b/net-misc/asterisk/metadata.xml
@@ -13,7 +13,8 @@
 		<flag name="blocks">Utlize -fblocks (only supported by, and required when using, clang/LLVM)</flag>
 		<flag name="cluster">Enable high-availability support through the Corosync Cluster Engine</flag>
 		<flag name="codec2">Enable Codec2 support in asterisk</flag>
-		<flag name="dahdi">Support Digium compatible hardware (formerly known as Zaptel).</flag>
+		<flag name="dahdi">Support Digium compatible hardware (formerly known as Zaptel)</flag>
+		<flag name="deprecated">Enable deprecated features (eg, app_macro)</flag>
 		<flag name="gtalk">Enable support for Google Talk services</flag>
 		<flag name="http">Enable embedded web server</flag>
 		<flag name="ilbc">Enable the Internet Low Bitrate Codec (iLBC)</flag>
diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
index f11a2e803b79..57e01f355dd3 100644
--- a/net-misc/dhcpcd/Manifest
+++ b/net-misc/dhcpcd/Manifest
@@ -10,7 +10,7 @@ DIST dhcpcd-8.1.9.tar.xz 230288 BLAKE2B 5606ddfce37c67ac3d60257104fcf15bd7da6502
 DIST dhcpcd-9.3.4.tar.xz 255212 BLAKE2B cd64dca55bd8adfcfa8ffb5f75a949c6f8aef9f1bf7925060590f7f5f0325e08de3c766c8ff780736eb2bed40ba3ae7b59c3cf3e03f2ad1bd7ff4c92aafb6370 SHA512 00125cbed9a20ba016cbb383c02ce61a58482dcf6c46144e573ee3759dbaf19b5f470eaf19038197d0ff4249c852773c537294bab30b5bf3f5bae4d754741517
 DIST dhcpcd-9.4.0.tar.xz 256440 BLAKE2B 16d63e957dbdf49647806ebe69487edc96502f43af8b8b6c6e40311994611d2516e2c839fed41863b8509a0953421091577d4cb202ebda3b300f3b1c761c07ce SHA512 e2cff86564062e8d5f9c8f48f245ffa31406494e2fafadedabc1ba9932b534cbda064783ffdd7fb337544459aba2ef7e9b49ad0973120897dc04159747e8635f
 EBUILD dhcpcd-8.1.9-r1.ebuild 4505 BLAKE2B a1646a494c20d4d7038ec42941e4afaeac4cf1b2246f89eca4614ef060ad31813575218a3fdd121566001a0c41cf316ca50d91dde3ecd11603cd48c6d4bb47d0 SHA512 3ee0e788ceb7534702147458c192c57aed9e091a94cf0958f28f2a108890f1e07079aa024e964e9f529c62d2c1ce89cf3c54023d9f90ba34f41c9e24e3132ea4
-EBUILD dhcpcd-9.3.4.ebuild 4677 BLAKE2B bce064aa2174d06e18f1eb81b5671bf159d48d4ee773558ac1c99e65f45f6a91451125b811a9766774fe9e91f68430ffdec6d3cb8afb78c6fffe4c5dce2dd2ed SHA512 e8c9c6ee3a81e06a8e70841caa3efeb49128d8458c25be482c6c3b53b4335fe7bde6fa5dfc82ee1983cc0670f33718528cf5d0a85fdc806f865a064a9528a171
+EBUILD dhcpcd-9.3.4.ebuild 4676 BLAKE2B d7015dcb29660199edc472049b8dbd7eff7f7bf1d8d2ff91a28125056dab73cb5292ca8d5e106381a6e1a3c0baae5f537b0d64822a10da331d0404100babe245 SHA512 2260f54aaed43a4eeba216b1dd930bfa63692336c6ee93f5db2f1c46e23d8ab0d0bb1b3910f4feb240ca833ba8039b6b1d3cff9c1f3eb03e6957192c7bb9e181
 EBUILD dhcpcd-9.4.0-r1.ebuild 4752 BLAKE2B 5b8044625fd6cfcceced8c61ec58d821854e730e5563acade906f66039e1414f3414b8e454e39120d638eaab64840c6de20a135085e1b745f014d5edebceba4e SHA512 bc1ac38efdf606c7da4d12573741d9b6bbd626c056cfa4f4cb4e702448766540e5969cdcdaee354948667255694c015f13b4d0ed2abab456df69062506a4b02b
 EBUILD dhcpcd-9.4.0.ebuild 4613 BLAKE2B 7072757995a8936ad02afffed460ca109347410f27444e48dd28f3b58ca08a3506201a703292919da3a92032a4ec95c70f4f10e36e5a6791b17d1fa4830b56aa SHA512 9b7832ceb3ed64613dcaf52b8ab3b8a13737110197bdd275ea0a65ac7b0969d21e3be8c7153ab6cae727e0d22513aefe0aaa03708f0491f0c160e830cb415ebf
 EBUILD dhcpcd-9999.ebuild 4613 BLAKE2B 7072757995a8936ad02afffed460ca109347410f27444e48dd28f3b58ca08a3506201a703292919da3a92032a4ec95c70f4f10e36e5a6791b17d1fa4830b56aa SHA512 9b7832ceb3ed64613dcaf52b8ab3b8a13737110197bdd275ea0a65ac7b0969d21e3be8c7153ab6cae727e0d22513aefe0aaa03708f0491f0c160e830cb415ebf
diff --git a/net-misc/dhcpcd/dhcpcd-9.3.4.ebuild b/net-misc/dhcpcd/dhcpcd-9.3.4.ebuild
index 71dc46831ee3..90ee346ea29a 100644
--- a/net-misc/dhcpcd/dhcpcd-9.3.4.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-9.3.4.ebuild
@@ -13,7 +13,7 @@ else
 	MY_P="${MY_P/_beta/-beta}"
 	MY_P="${MY_P/_rc/-rc}"
 	SRC_URI="https://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/net-misc/dropbox/Manifest b/net-misc/dropbox/Manifest
index bf1c5d76ed68..c3675b9d1b04 100644
--- a/net-misc/dropbox/Manifest
+++ b/net-misc/dropbox/Manifest
@@ -2,6 +2,9 @@ AUX dropbox.conf 322 BLAKE2B db94efba3a73841cb56a0fcc75f4f6d7fb7424a35f48a7eb3ad
 AUX dropbox.initd 1581 BLAKE2B c23a753b7e4d1132d516d607e0eee35072130f6e66c59af008cedd9d9d8c104d9ae1c4644ad984a40ec48a498782b442f79058f499e61c3a3b7a700886353b4b SHA512 4275b7cca361978be6d4379f9d14edc75e51684708a61c1b9880f63e0a02e75c4eb165145bf5a2b4e0704daa5a506dc3506a953db6f5a95977f0101fbbda4912
 AUX dropbox_at.service-r2 1582 BLAKE2B 7a5d8eb1e99d6a9f6cc7d903d8d2cb6b124b4a5217e978d05f0afb08de90b3634bb802bd075a053b84b0ec4f5ef6643d2efb00beb964f9f14dd3dd234806358b SHA512 ce465614c848103ac19d3782bf55508ab9b3a3f1c0159cd0ccb7daa7374f014382b30a99bf2eb5488ab4474cad953ce0b4710c8222e5196ea49672db5d183b85
 DIST dropbox-lnx.x86-117.4.378.tar.gz 98240407 BLAKE2B 2a4a1f2967cc3b4fb59461d3ab94a8cb120db5ec3283d4ef0b1b13ad69e903bb87e11dbc72b1d1e2969aded63f03390af0087026864699c679276d195ec6e54f SHA512 261aad190643e02a102b70ce5418cf61f8affcf3607e6b35d91ec5713fb7ee058d2e20390fd6e8c434ae69d6f888ff390b12d2f544aa2b08a7ac98a9c545811d
+DIST dropbox-lnx.x86-118.4.460.tar.gz 98620060 BLAKE2B 3b2aa51cd93d2ccfc78efe434ba2fd2a7bf270c54e64d009ce7d82927b85805d1616525aa8433afe3c59c8b7d15b3cfd129b8f85a504210e05fd2d95024e9589 SHA512 1858c1bafcb87cf5db44549ac3b12f56402ac2ef63e959d9d22a42952ca4a620115f92021736560e350730a5f5f0da52abf2d5b5c7765f82e39fb4f9b76098e4
 DIST dropbox-lnx.x86_64-117.4.378.tar.gz 101675442 BLAKE2B 42dbb52a4cb1998b1e114e5486acc0a89191c1856f1391c3f19186937faeae12ceec39e5496744f3237e457656f50d4c6af6b4f9ad5b02541e946c96f325ba92 SHA512 876314d7d56692c34c714c7aa8d03d5e9250a5a5bb72c74a16eaee68cf1cf28d4585e4b3ac457dc42d0230d222d62eeeab66672765c182d999f7200a1335a4b7
+DIST dropbox-lnx.x86_64-118.4.460.tar.gz 102012647 BLAKE2B 87ee9e246e5e4c7cd4b5fe7aacbbe028ebec3f02abf650b1d8d8f867aea0900d05ae697ec02916b59b19ad3049606bfa1c63a286f7d21a335650a4322978c345 SHA512 206bb2bc4932d0784438df8de4dfecbbc6deda4ca71f8cd5dced17066293f41f8a722d7e05516e24fcc163cdb9e475733d75d19b369a7f63b3a7f1a966f0d5f4
 EBUILD dropbox-117.4.378.ebuild 2617 BLAKE2B 3ab6af76887a88cdf680627eda87132975196762ff48d6825e72340575949ea25d095022448c86c22c93e790f89fde7c9a4c015eb68499837035f3f1a5022027 SHA512 c5667dfdb2b202382f7484aec41aecb77eef8b07675a74be492e0babba02459cc492ca0b0160703a474e4768ca1bd69a87543373f59e78e48b5503ba9aeed425
+EBUILD dropbox-118.4.460.ebuild 2619 BLAKE2B d06e213989e8f510e35428371d832f5a8b3828843ae8c932e563130fa79964a8e2a56d4ddab37d978e08579819f578aeffa94fa9700cdc12191b53699903e2ab SHA512 00717249a02ad1415ca9ae63dfed9d062474148800fe343a9b78f7156353b51403862cd52207222cefc9a67021c8c15509aac2d2bba9ea00de11f22bee0e885d
 MISC metadata.xml 335 BLAKE2B 6b61d3baf32526555421f8507defe48e5dff38e51a27fdbe7a3006a1083f2334b5ea83d4d4d9cf87b45af211a267a31e8bec805a1db1766087090455268fe724 SHA512 ee923a78e49b35d74453bdf51ce5be59f695f5aaf54f7ff58eb2d3165dc9acf97371110f92456a5a39d862a5ebe967c3225489ba407c6ea1250443868255613a
diff --git a/net-misc/dropbox/dropbox-118.4.460.ebuild b/net-misc/dropbox/dropbox-118.4.460.ebuild
new file mode 100644
index 000000000000..a77b20f7a3b2
--- /dev/null
+++ b/net-misc/dropbox/dropbox-118.4.460.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop pax-utils systemd xdg
+
+DESCRIPTION="Dropbox daemon (pretends to be GUI-less)"
+HOMEPAGE="https://www.dropbox.com/"
+SRC_URI="
+	amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-${PV}.tar.gz )
+	x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-${PV}.tar.gz )"
+
+LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-linux"
+IUSE="selinux X"
+
+RESTRICT="mirror strip"
+
+QA_PREBUILT="opt/.*"
+QA_EXECSTACK="opt/dropbox/dropbox"
+
+BDEPEND="dev-util/patchelf"
+
+# Be sure to have GLIBCXX_3.4.9, #393125
+RDEPEND="
+	X? (
+		x11-themes/hicolor-icon-theme
+	)
+	selinux? ( sec-policy/selinux-dropbox )
+	app-arch/bzip2
+	dev-libs/glib:2
+	dev-libs/libffi-compat:6
+	media-libs/fontconfig
+	media-libs/freetype
+	net-misc/wget
+	sys-libs/zlib
+	sys-libs/ncurses-compat:5
+	virtual/opengl
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+"
+
+src_unpack() {
+	unpack ${A}
+	mkdir -p "${S}" || die
+	mv "${WORKDIR}"/.dropbox-dist/* "${S}" || die
+	mv "${S}"/dropbox-lnx.*-${PV}/* "${S}" || die
+	rmdir "${S}"/dropbox-lnx.*-${PV}/ || die
+	rmdir .dropbox-dist || die
+}
+
+src_prepare() {
+	default
+	# we supply all of these in RDEPEND
+	rm -vf libGL.so.1 libX11* libffi.so.6 || die
+	# some of these do not appear to be used
+	rm -vf libQt5{OpenGL,PrintSupport,Qml,Quick,Sql,WebKit,WebKitWidgets}.so.5 \
+		PyQt5.QtPrintSupport.* PyQt5.QtQml.* PyQt5.QtQuick.*  \
+		wmctrl libdrm.so.2 libpopt.so.0 || die
+	if use X ; then
+		mv images/hicolor/16x16/status "${T}" || die
+	else
+		rm -vrf images || die
+	fi
+	patchelf --set-rpath '$ORIGIN' \
+		apex._apex.*.so \
+		nucleus_python.*.so \
+		tprt.*.so \
+		|| die
+	pax-mark cm dropbox
+	mv README ACKNOWLEDGEMENTS "${T}" || die
+}
+
+src_install() {
+	local targetdir="/opt/dropbox"
+
+	insinto "${targetdir}"
+	doins -r *
+	fperms a+x "${targetdir}"/{dropbox,dropboxd}
+	dosym "${targetdir}/dropboxd" "/opt/bin/dropbox"
+
+	use X && doicon -s 16 -c status "${T}"/status
+
+	make_desktop_entry "${PN}" "Dropbox" "dropboxstatus-logo"
+
+	newinitd "${FILESDIR}"/dropbox.initd dropbox
+	newconfd "${FILESDIR}"/dropbox.conf dropbox
+	systemd_newunit "${FILESDIR}"/dropbox_at.service-r2 "dropbox@.service"
+
+	dodoc "${T}"/{README,ACKNOWLEDGEMENTS}
+}
+
+pkg_postinst() {
+	einfo "Warning: while running, dropbox may attempt to autoupdate itself in"
+	einfo " your user's home directory.  To prevent this, run the following as"
+	einfo " each user who will run dropbox:"
+	einfo ""
+	einfo "install -dm0 ~/.dropbox-dist"
+}
diff --git a/net-misc/mobile-broadband-provider-info/Manifest b/net-misc/mobile-broadband-provider-info/Manifest
index 9baf0e6ff9cc..625b0e6e9e28 100644
--- a/net-misc/mobile-broadband-provider-info/Manifest
+++ b/net-misc/mobile-broadband-provider-info/Manifest
@@ -1,5 +1,5 @@
 DIST mobile-broadband-provider-info-20190618.tar.xz 82640 BLAKE2B 6aad85193297a17c4606bdc700b0d3c7ce59c897d5d8fe0cec4ba3d17168aa519971c52a6b4c1f133c24a8fbd3f2ed1f3d45461248612ac95fbb746a3de9217f SHA512 511e6561b9b0db6c26f2e08bd06bb1dc9bb46696730fe6c6eba82cceec600dad684dc8dbe27adae78956367fb00dd8745070046acaa7a1129f194d8f16df425a
 DIST mobile-broadband-provider-info-20201225.tar.xz 83052 BLAKE2B 53f37e1d5796350a9ddd1ecf7de491a365baa854d5021c45e9359ff51cd0e545867858ef172eeccf81f0df072b207c6dce8024ca805921b69f0c50d3febfcc0b SHA512 26064451f43494e4895b65912e3dd06a62ca8afbe3334f09ca8428c1812318f7dac4accbd1c3aa9e83fcc1ee177fb187cb6fe77fab56608abd28c5f5ec3499cd
 EBUILD mobile-broadband-provider-info-20190618.ebuild 471 BLAKE2B 3dd2b83a80549cac5a0249633c04de1c397d6995dbf7621655fe10dd993db3420b4e7ed30a89efb2bc0cbcebe32d7d687b92c3635da6e18880729fbf006dbfa4 SHA512 bd040faa3a25d10b21d38e558a2a3c2fd2ed95eb0f3e886c2dfb24682f18bb260b9a282bb7d8bb2d8d3f3de37053418e30a2efa43479b620bb0c80a886801f55
-EBUILD mobile-broadband-provider-info-20201225.ebuild 478 BLAKE2B 95128a4b1f11c25446b95a448dc66b14317599610102775a92774770cba6fbd1bb356ea3de3738671b2a02d4f077e8d998a83d4a165ebf737918859568e05bbd SHA512 1bdfae3b170831d67042e0c57f6435c4b6c2e7f24c0d23132bada85b1a628515e6b12b16ecbc5f57a8230f74c6e3079193283ea0dd2060a43f7083c7ac514edb
+EBUILD mobile-broadband-provider-info-20201225.ebuild 477 BLAKE2B 381d683d7a1a0fc9e4ad858bdeafbc8c082c233811d4c4b08d0ba395a1b918a61362acdba2f6a79b26b4912404eec692dc91fa9e77d11eee13c9ac86644c09fb SHA512 9d8cccd2c9f22d545e61fba035f8bbf7b8dd044a36086d5861f975643b842fe67bb95d036751a819dddac24ffc962544d9cd3babc2744247cd743f6d13e2cd15
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20201225.ebuild b/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20201225.ebuild
index b064a2911136..706d0a27443b 100644
--- a/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20201225.ebuild
+++ b/net-misc/mobile-broadband-provider-info/mobile-broadband-provider-info-20201225.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager/MobileBroadband"
 
 LICENSE="CC-PD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/net-misc/unison/Manifest b/net-misc/unison/Manifest
index cbcc8b4307b0..fa2450f284ce 100644
--- a/net-misc/unison/Manifest
+++ b/net-misc/unison/Manifest
@@ -5,9 +5,9 @@ DIST unison-2.48.4-manual.html 278110 BLAKE2B 8a85662399aff31a016964783b32c195cb
 DIST unison-2.48.4-manual.pdf 516093 BLAKE2B 8e752a01b8c4335d6687b1f4f20ee09fda90b7521b7ed87af43273416fb3119682078d969772e8c3f7395ef499257dafd67c455a4646868008090ea15063869e SHA512 514da1eda0405416e53b1c8e027d39a803f9030824deccfaf5630aec21c52c6c9ea0d1006461faa8fb26738f4a33eecfe1ae24126fdb7a53ada6b90db270e6c9
 DIST unison-2.51.3_p20201024.tar.gz 1371551 BLAKE2B 780cc176ed203345408551aaa11990e4da1ec0d4adfd928f3e8ff9c180f35fafb6ac097c00c95da8fe9178db122ea025e9f4336413f0694cea099ab80e2ae00e SHA512 87c7ce33621bc323607e901547da30b8fc0a842ba35128627f5d44fb4befd76ff94586ec1f8eb1f3359da756d09d8bf2481cf0d6eb2ea421113e0e4efdcbdf61
 DIST unison-2.51.3_p20201127.tar.gz 1374770 BLAKE2B 83c133f2cb99e10fac96efde333291a671edab5eb45dd6dcf56cb25845385425353a5f413ab752361124ec7bbac21daf3f813d5539b21229d943cf7f0bfae2fd SHA512 4b978a5e3df620317b7a9214054d64f319d09c5617b07ddf3cf76b18c6888841ce791f7b6a4ef70c64b146e3e4f25a5904584fb576703c2de4b17cfcffa8905a
-DIST unison-2.51.4_rc1.tar.gz 1374314 BLAKE2B 8b0218fa903ed8f1ceb3b489df8fbda5ba9fddfbe4b9440098d16dd298e15666bfc3722d1735069843511b7b39e8b49463c5b26b940ff770c7fcdfbd63eed1c2 SHA512 7b3fe2d09ff35ccdd68306d8fce6edd947489554c54afebe44d096210d2d8e58c6947386c2795c668070f5ba14a28547cee31d947d54ec90ed63927ad766c0bb
+DIST unison-2.51.4_rc2.tar.gz 1377263 BLAKE2B d403e019f0757f66be5157cff97596c9dae1306a5ba33af27fe55a69fb1ae50d6ef6db54403d14a0afb27cb7a0ebe198021d6cdf58430c530575fc934c837703 SHA512 c61f827490036fbe3074ce5d970e6b4e981a4fde848c307c817f51d73f450d4b5d437503f5392bd2b654121547919b9724112383f71736a9e0e7b308bc3e99b6
 EBUILD unison-2.48.15_p4-r2.ebuild 2998 BLAKE2B 3477822b9772652c245d6047e29ecdf70522f7668e9fb2e29e9556afdaf26dd96635983bf182ea5b2b56a0cd56b4bdae06ac0f2be399d1dd616d0e936fd346e5 SHA512 a6d3fb96a29e5156e7519f3f62a07622e1333b530afbfa1fa5cbf11524f5e9e8aa7df63af589d949bb904d8ab1fd6840d970fc27496f72033da2e9291d89c6c7
 EBUILD unison-2.51.3_p20201024.ebuild 2772 BLAKE2B 4e1973839a992c1af50332b8f84c6a7d5d03c1962af8f4a9c183551f1247bc1890d85aa7651d71a12f96134e63e367c00f79bd2917322c8cd278afbc852b4daa SHA512 086fd563d0f74661d710ab07ead1c73ea7702b4fe427336a5da39d8c4d3b4e2fcbf2f25fa7c65e0ddb895b13e0fca3dd381825b2fac41da8e32bf20c01569e2d
 EBUILD unison-2.51.3_p20201127.ebuild 2756 BLAKE2B 3699033422041cf1bf5e626637f9ede038f474884564b921269e6bb996d0b725a09c52ffee6f9246a29b11433b7ea16212f6559184f2da21c129f71f5759962e SHA512 8e0ff13147e90eb51a9c49ed3b6020a288838490c8e6ccc11b5f9a2e75511d872d1a5bd84bd4242a1e1a73fb0ed7e633bed149a4ad25e8d94cd0ee46e3f1dc61
-EBUILD unison-2.51.4_rc1.ebuild 2662 BLAKE2B 604940ff64c3da3eba3116f6ce593b50ed249280ad3a85ce6fa469e752277cd976b0e9ce584a7000cd6583f9c6425a666e9b37c627f581ffc2b7e94f483ee19a SHA512 22f11f7a31acef79d3dbe0e663f3178988faabcd23f83e0924a92d65f95ef60efe4a725283cbb819c9ffe0f674f53aff3bad1815148f140553197404d96e13e9
+EBUILD unison-2.51.4_rc2.ebuild 2651 BLAKE2B 15f2abf27b02e733927caa6730f7ab1d5bb5181bd5b43c6bda4adc883b6524b030b64be790578783d057c4c0e2840a5fc6683ee95c53fdb17efe6d217ffe0d58 SHA512 588a30ea2cb26ffcc14c4bc00aadafde4b3df7729518e98bb215c969519d5abb76ed1e0142fd9c9090f485b393cf162d46e7312b080b15d8840d357bdcf33345
 MISC metadata.xml 450 BLAKE2B 55d917828a118580b283b301e205453121b52d46495f02f5f488f71b325b3d290ffb768c3c89b2fc685f6dd6e87e37dc91b387d8b9d0f872681f70c7afeafe57 SHA512 fcc876158d2c94e56aae6a3d78df3e3b13b0d0a5d100513fe5f980c11c06d1fb055d5b943fcd4b01063343c80d78c328f23a82d73cccd65159b5306b35dac502
diff --git a/net-misc/unison/unison-2.51.4_rc1.ebuild b/net-misc/unison/unison-2.51.4_rc2.ebuild
similarity index 89%
rename from net-misc/unison/unison-2.51.4_rc1.ebuild
rename to net-misc/unison/unison-2.51.4_rc2.ebuild
index 7ce1abe5eaba..db9797ada80a 100644
--- a/net-misc/unison/unison-2.51.4_rc1.ebuild
+++ b/net-misc/unison/unison-2.51.4_rc2.ebuild
@@ -28,38 +28,38 @@ RDEPEND="gtk? ( dev-ml/lablgtk:2=
 DOCS=( BUGS.txt CONTRIB INSTALL NEWS README ROADMAP.txt TODO.txt )
 
 src_prepare() {
+	default
 	# https://github.com/bcpierce00/unison/issues/416
 	sed -e "/ifdef\ HEVEA/,/endif/d" -i doc/Makefile || die
 	# https://github.com/bcpierce00/unison/pull/415
 	sed -e "/myName/d" -i doc/docs.ml || die
-	default
 }
 
 src_compile() {
 	local myconf
 
 	if use threads; then
-		myconf="$myconf THREADS=true"
+		myconf+=( THREADS=true )
 	fi
 
 	if use debug; then
-		myconf="$myconf DEBUGGING=true"
+		myconf+=( DEBUGGING=true )
 	fi
 
 	if use gtk; then
-		myconf="$myconf UISTYLE=gtk2"
+		myconf+=( UISTYLE=gtk2 )
 	else
-		myconf="$myconf UISTYLE=text"
+		myconf+=( UISTYLE=text )
 	fi
 
-	use ocamlopt || myconf="$myconf NATIVE=false"
+	use ocamlopt || myconf+=( NATIVE=false )
 
 	if use doc; then
-		VARTEXFONTS="${T}/fonts" emake $myconf CFLAGS="" HEVEA=false docs
+		VARTEXFONTS="${T}/fonts" emake "${myconf[@]}" CFLAGS="" HEVEA=false docs
 	fi
 
 	# Discard cflags as it will try to pass them to ocamlc...
-	emake $myconf CFLAGS="" src
+	emake "${myconf[@]}" CFLAGS="" src
 }
 
 src_test() {
diff --git a/net-misc/vde/Manifest b/net-misc/vde/Manifest
index 73b3ac698377..a860a8551313 100644
--- a/net-misc/vde/Manifest
+++ b/net-misc/vde/Manifest
@@ -1,11 +1,13 @@
 AUX vde-2.3.2-fix-inline-funcs-r1.patch 698 BLAKE2B 131ede6fed47cc8e9835604df3d34cd3c679ba717c81d67d292c9da17e1ce6a652412244f8e113a295bc17f08a525de22782dcb3b95aa8df05d768ec6765dc49 SHA512 2e7b16a7fd7cccbc79ac8f1c64e5e22399bbf219b37626b8c700d22e7f1d3b3250cb32cbfbd592743065bc68443b1b0443dedeb731f917de59a0e2568db6cbf4
 AUX vde-2.3.2-format-security.patch 547 BLAKE2B 757f0008ed24eea80225c9e194584f2320fda48ee21c2ce49a3a500ce0700b1475ece3c3826d2a2f42c0abfab20194214b73071a7422b9a86c9c47ac098844d2 SHA512 05d4ef0c8e45a30ccdf24ce65e7b1ed268f7e8da095d20d8743193eef1018bc11cf13996bde32231739d153af9e4b1828bd2073d862e06ac21e7e64b6945cbf4
 AUX vde-2.3.2-openssl-1.1.patch 2739 BLAKE2B 57062de9d624875255a4bb9a77408a356e8832163ce70bdee5f15884dfe641dcdd3f697d0d57340384f4380836c0867edb27b155249b3a54e4369639d72ca783 SHA512 fe7f549917267e025ccc6417b76af7409002a72d0a1e8133dcfde84ab44e954b9fef7c725bf102f7cdd3c1328da06dfe2fb0b309ea454e2094abdcf95b9cee3f
+AUX vde-2.3.2-slibtool-support.patch 1583 BLAKE2B 6667d3a5d158a72b43576e813405620b387e1ab3f12b8592411e64524a610a7422caa89c37d92565d4946ae6d629c632bc09324e4a3ee79dcd5bee25905eddc3 SHA512 c734000ee5481fb6297d8df39c573624486aafd91491d2fe9aa6f7e714a4dd76dab503f2218d9b67d90bbb89a6b0b6b0df57c685f01b43a2c7c59272d10dc15b
 AUX vde.conf-r1 341 BLAKE2B b61648c4559e7fdc240ce7c82da6a0c0d53c4a94637ab0a4fd0d30e80306e6006c9242b9967f5fa6100c05efe2f4eb317ee55a05fbb3a4d79030fc14ea6ac61b SHA512 5aa5a52fb150f54672465b36dd215dc24e45f60015bf7afc4b376e046093089c656db642a4d8c4a98205cd0c453427e38ecc3c36cab79bf5f9d2936c61c914df
 AUX vde.init-r1 1022 BLAKE2B 3859d94c2e0871998eda1ccdddf88ab01a00a67c86ec9c28710efe8347d302a97fe727fe3d58c61c1c3abda5a5fb401ca12672fe06cbaaa75b1beea1fa6d9281 SHA512 599b3560721b6e31cbcc21e764df772bde2a8bbf131b47ebb575bf31855a53237dd1c265d33f31c91e3115d6f8cb9f94493d2dd6792c8bedb011299d1ed6d8e9
 DIST vde-2.3.2_p20191011.tar.gz 381468 BLAKE2B 6d25df2a4cf89a0159875eac1c2c3a27e6b6856f24494ee2e181ab8d8a2fa9c3350b9c7b9b9474cbcbd8afd50fc61fd167a5cc18398b771d05178c5c3a402f73 SHA512 0e9f9f28a8ef0acd765307908dfd9ab9462f67df21b06be5b48ed1795900be546e28e1869528ee8e5a6d7eb6e6fa91ded116b826a501e13ec7f1562f1b84f971
 DIST vde2-2.3.2.tar.bz2 600527 BLAKE2B 6c4900578b992eff914136f29395a822bc52945906d291eee78b3bf7cb806bbf4d8ebeec2080daa10923e98b648d071ce1f846214143e4dce749da9be8b48990 SHA512 51be75fde5a526b988060f25322a8b20289b1677db2e3aa6dbee55875c1d7af564f9d8d201a0a4a1a842471cce06f29fcd83e55a5ff7acfdc36a8349cb2f3cc6
 EBUILD vde-2.3.2-r6.ebuild 1491 BLAKE2B 25089bade969f2bcde7f4c16e85cf049d84b21a21ee073bac1fcfcd504889c82cb15dcc17c4ecad53016733231d7a47cc501e3b5a57985d4bcda6798d9ee603f SHA512 66e5797b6da812bcf167f528fe2cb3a5291a86973f1571c5e1a0274327f29eadc0baa4b3086081e071555f9213c15a127043964c20c2bec07e5e72f835157a19
+EBUILD vde-2.3.2_p20191011-r1.ebuild 2253 BLAKE2B 70e765767c62982412cca9661897c475357d46effadafa6a27c98be8c6c00caa69bdb02639828cce31a6d5f95b05a814c43d5dcba8863d5d83522d5f9df36584 SHA512 1c4156310670d3a19c5b1835857bb226735a8f8d24a55a37d9e9d71f46a3cb5aa28ee1ccb90bdc77b197ff928768151cdd77355bf083b5ce5554f317b49dc56f
 EBUILD vde-2.3.2_p20191011.ebuild 2177 BLAKE2B f7f717b46c2cab78b94b35b90d0803b0bc0d03b103feaefed2b8fdc41dbb0e7b8b966f4372d8000b3d2444e93a12a49a09dcdfb30bf766c8fb713e369e1d8cba SHA512 282b24866c4be23e2dd2c1f12c7cbfc594c016893c3ec192735d6460646868e7ad84bd8f0890e2104e62ca8ad96fb2de87de83ccdb558a3be844e5f4ac60aa2c
 EBUILD vde-9999.ebuild 2177 BLAKE2B f7f717b46c2cab78b94b35b90d0803b0bc0d03b103feaefed2b8fdc41dbb0e7b8b966f4372d8000b3d2444e93a12a49a09dcdfb30bf766c8fb713e369e1d8cba SHA512 282b24866c4be23e2dd2c1f12c7cbfc594c016893c3ec192735d6460646868e7ad84bd8f0890e2104e62ca8ad96fb2de87de83ccdb558a3be844e5f4ac60aa2c
 MISC metadata.xml 985 BLAKE2B 93cbf3b5a644fc2c4ea5e40c8a367ba9763968fc6f769df2f1b7114d07734786570cae38d42195deb628007e3d49b1d5a5b4a943cf7575da10ae10eea59e4e28 SHA512 cdbc3fffa569b4a7f5daf04b3fbdb7dbb57df6dfa100398b61e6373efe61924daa523ba2b75cd21556414e592a91c2813aa396290abad91eb2afa01f7e178a01
diff --git a/net-misc/vde/files/vde-2.3.2-slibtool-support.patch b/net-misc/vde/files/vde-2.3.2-slibtool-support.patch
new file mode 100644
index 000000000000..5eeb3a5c9026
--- /dev/null
+++ b/net-misc/vde/files/vde-2.3.2-slibtool-support.patch
@@ -0,0 +1,49 @@
+From d11d9dd8b370016a2d10ffd35c450c9f68e578a5 Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Wed, 17 Mar 2021 15:14:45 -0700
+Subject: [PATCH] build: Only use -module for libraries.
+
+---
+ src/vde_l3/Makefile.am     | 9 +++++++--
+ src/vde_router/Makefile.am | 2 +-
+ 2 files changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/src/vde_l3/Makefile.am b/src/vde_l3/Makefile.am
+index 748cb78..855081c 100644
+--- a/src/vde_l3/Makefile.am
++++ b/src/vde_l3/Makefile.am
+@@ -1,7 +1,6 @@
+-
+ moddir = $(pkglibdir)/vde_l3
+ 
+-AM_LDFLAGS = -module -avoid-version -export-dynamic
++AM_LDFLAGS = -avoid-version -export-dynamic
+ AM_LIBTOOLFLAGS = --tag=disable-static
+ AM_CPPFLAGS = -I$(top_srcdir)/include
+ 
+@@ -15,6 +14,12 @@ pfifo_la_SOURCES = pfifo.c  vde_buff.h
+ tbf_la_SOURCES = tbf.c  vde_buff.h
+ bfifo_la_SOURCES = bfifo.c  vde_buff.h
+ 
++vde_l3_lib_LDFLAGS = -module
++
++pfifo_la_LDFLAGS = $(vde_l3_lib_LDFLAGS)
++bfifo_la_LDFLAGS = $(vde_l3_lib_LDFLAGS)
++tbf_la_LDFLAGS = $(vde_l3_lib_LDFLAGS)
++
+ pfifo_la_LIBADD = $(top_builddir)/src/common/libvdecommon.la
+ bfifo_la_LIBADD = $(top_builddir)/src/common/libvdecommon.la
+ tbf_la_LIBADD = $(top_builddir)/src/common/libvdecommon.la
+diff --git a/src/vde_router/Makefile.am b/src/vde_router/Makefile.am
+index d872388..d055259 100644
+--- a/src/vde_router/Makefile.am
++++ b/src/vde_router/Makefile.am
+@@ -1,7 +1,7 @@
+ 
+ moddir = $(pkglibdir)/vde_router
+ 
+-AM_LDFLAGS = -module -avoid-version -export-dynamic
++AM_LDFLAGS = -avoid-version -export-dynamic
+ AM_LIBTOOLFLAGS = --tag=disable-static
+ AM_CPPFLAGS = -I$(top_srcdir)/include
+ 
diff --git a/net-misc/vde/vde-2.3.2_p20191011-r1.ebuild b/net-misc/vde/vde-2.3.2_p20191011-r1.ebuild
new file mode 100644
index 000000000000..142f3837ed9b
--- /dev/null
+++ b/net-misc/vde/vde-2.3.2_p20191011-r1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic
+
+if [[ ${PV} == 9999 ]]; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/virtualsqaure/MY_PN"
+	KEYWORDS=""
+elif [[ ${PV} = *_p* ]]; then
+	inherit autotools
+	MY_PN="vde-2"
+	COMMIT="c7b36a57831a9067c8619c3e17a03e595623b3eb"
+	SRC_URI="https://github.com/virtualsquare/${MY_PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+
+	S="${WORKDIR}/${MY_PN}-${COMMIT}"
+else
+	MY_P="${PN}2-${PV}"
+	SRC_URI="mirror://sourceforge/vde/${MY_P}.tar.bz2"
+	KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+DESCRIPTION="Virtual distributed ethernet emulator for emulators like qemu, bochs, and uml"
+HOMEPAGE="https://virtualsquare.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+#IUSE="pcap selinux ssl libressl static-libs"
+# upstream switched to wolfssl
+IUSE="pcap selinux static-libs"
+
+COMMON_DEPS="pcap? ( net-libs/libpcap )"
+# upstream switched to wolfssl
+#	ssl? (
+#		!libressl? ( dev-libs/openssl:0= )
+#		libressl? ( dev-libs/libressl:0= )
+#	)"
+DEPEND="${COMMON_DEPS}"
+RDEPEND="${COMMON_DEPS}
+	acct-group/qemu
+	selinux? ( sec-policy/selinux-vde )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.3.2-slibtool-support.patch"
+)
+
+# upstream switched to wolfssl
+src_prepare() {
+	default
+	if [[ ${PV} == 9999 ]] || [[ ${PV} == *_p* ]]; then
+		eautoreconf
+	fi
+# upstream switched to wolfssl
+#	has_version ">=dev-libs/openssl-1.1.0" && \
+#		eapply "${FILESDIR}/${PN}-2.3.2-openssl-1.1.patch"
+}
+
+src_configure() {
+	filter-flags -O0 -Os
+# upstream switched to wolfssl
+#		$(use_enable ssl cryptcab) \
+	econf \
+		--disable-python \
+		--disable-cryptcab \
+		$(use_enable pcap) \
+		$(use_enable static-libs static)
+}
+
+src_compile() {
+	# https://github.com/virtualsquare/vde-2/issues/6
+	emake -j1
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -type f -delete || die
+
+	newinitd "${FILESDIR}"/vde.init-r1 vde
+	newconfd "${FILESDIR}"/vde.conf-r1 vde
+}
+
+pkg_postinst() {
+	einfo "To start vde automatically add it to the default runlevel:"
+	einfo "# rc-update add vde default"
+	einfo "You need to setup tap0 in /etc/conf.d/net"
+	einfo "To use it as an user be sure to set a group in /etc/conf.d/vde"
+}
diff --git a/net-nds/Manifest.gz b/net-nds/Manifest.gz
index 5b06404c0edd..65c3a6e56fde 100644
Binary files a/net-nds/Manifest.gz and b/net-nds/Manifest.gz differ
diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest
index 5475cd0db22c..7bd06d226b5e 100644
--- a/net-nds/openldap/Manifest
+++ b/net-nds/openldap/Manifest
@@ -22,6 +22,8 @@ AUX slapd.service 284 BLAKE2B 27e3863a8b0e854e5b6b1efce50da624acbfe0d2416af1eedf
 AUX slapd.service.conf 443 BLAKE2B 7cf9d3935ea100006fe4f8667b792d32627c933c72220a91e4d9bf99fab4af9c590834f9aaed57d80eadd2fdf75e49f55739ef6027d11f012f8da3a711707c27 SHA512 be9cf4bf19111bd77c0ce481428e6f3cc183a6939775ed1a2d7606a5162da34178cb139d666288f6a35b8413bd4dc5f8f1bd60b39f3cca8f749557674b93910b
 AUX slapd.tmpfilesd 90 BLAKE2B f9cdde975b45c61c18773e4a3b30e3cb3c2a7d979bfef6d0513cd33ee5d31acdbe19c0af72a6478576acfaa88a2f063213cb9fd3025f4dda6ac401a8b9488719 SHA512 c462c92911635a2a6a30eb7239e74b529062224f9798351f53dca9a2e25cbc7f9fbb3743f98a015b7ccac0823ab85adb42d91d980f053bc3f12fdce760ce4bec
 DIST openldap-2.4.57.tgz 5883912 BLAKE2B 439605e1bebcf34968f0a552aaade1b72b7671ae2a94a0b700a84f9f715acd162e7b8dadfdd3ffd5b0a785f9306b5f5033ab956cf0ffd26b66119a7110d0aa57 SHA512 b929bced0f5ba9a90e015a24b8037c8958fbb7282db272bd0cacf43b5f7540ab42159a3c4441148074340228bb5f07f93651c0dbb2affde961be156058f99ce5
+DIST openldap-2.4.58.tgz 5885225 BLAKE2B effb618dba03497796a497cd7f53ec52e389133769321dd242433bed5ec4b1f66cf7353f08a49d5f3465880f6bcfc9afc9c7d2a28e075b66f5fd926b02213541 SHA512 2fa2aa36117692eca44e55559f162c8c796f78469e6c2aee91b06d46f2b755d416979c913a3d89bbf9db14cc84881ecffee69af75b48e1d16b7aa9d2e3873baa
 DIST rfc2307bis.schema-20140524 12262 BLAKE2B 98031f49e9bde1e4821e637af3382364d8344ed7017649686a088070d96a632dffa6c661552352656b1b159c0fd962965580069a64c7f3d5bb6a3ed75f60fd99 SHA512 83b89a1deeefc8566b97e7e865b9b6d04541099cbdf719e24538a7d27d61b6209e87ab9003a9f140bd9afd018ec569e71721e3a24090e1902c8b6659d2ba103e
 EBUILD openldap-2.4.57.ebuild 29298 BLAKE2B 99af40a491e5253a14ff1d35c11d570bdc6428120e634f0124d4010655c0347d34aa406e62a446daab966d9cd29817a527184004db0867582111100df3d72093 SHA512 a3b5f76634d9ff2e2514dc7cb6d4dbdd797dbfeaf67a9f4e791e38d50688e2b0fb8c9ed8524c2fd6ed2b3af3c874d7d82433275328b1be1302fe809926343b2a
+EBUILD openldap-2.4.58.ebuild 29306 BLAKE2B eea99d3cf4be97a981a40a07ef6fcdaaf7213e14eef742bbb637951372b4b00819fafc6e469f20dad58f8de7e317ab5712c2e88cf6aa2573527f8167629b3600 SHA512 00db5b4d37fad1d7b3085bcbff9e3ec64769d056fa1a2246999c0c1617fbc8b61ad5cd2a8ab173a85dd89c556207b7f6317f95e13c46b3e5002b897f7aef2cdd
 MISC metadata.xml 1030 BLAKE2B b940261c1e1fac05fceffc80673100d3102e53b532b8936b2e51bbf5a6bdf2ff5cfe633c53b494856d973a86c8d0f2b5acf8f2c26d2c62d16f1313fb8dab798a SHA512 c031e0cbe8d8f6d5fcdd8d4c4e036e5087068c35ae44264b5e244c0d6dee429836f493d75f6bb2cb422d14ccd0a7934b13748cf83517791e61c51fd6d924deb3
diff --git a/net-nds/openldap/openldap-2.4.58.ebuild b/net-nds/openldap/openldap-2.4.58.ebuild
new file mode 100644
index 000000000000..f2095a16dd2a
--- /dev/null
+++ b/net-nds/openldap/openldap-2.4.58.ebuild
@@ -0,0 +1,912 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools db-use flag-o-matic multilib-minimal preserve-libs ssl-cert toolchain-funcs systemd tmpfiles
+
+BIS_PN=rfc2307bis.schema
+BIS_PV=20140524
+BIS_P="${BIS_PN}-${BIS_PV}"
+
+DESCRIPTION="LDAP suite of application and development tools"
+HOMEPAGE="https://www.OpenLDAP.org/"
+
+# upstream mirrors are mostly not working, using canonical URI
+SRC_URI="
+	https://openldap.org/software/download/OpenLDAP/openldap-release/${P}.tgz
+	http://gpl.savoirfairelinux.net/pub/mirrors/openldap/openldap-release/${P}.tgz
+	http://repository.linagora.org/OpenLDAP/openldap-release/${P}.tgz
+	http://mirror.eu.oneandone.net/software/openldap/openldap-release/${P}.tgz
+	mirror://gentoo/${BIS_P}"
+
+LICENSE="OPENLDAP GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+
+IUSE_DAEMON="crypt samba tcpd experimental minimal"
+IUSE_BACKEND="+berkdb"
+IUSE_OVERLAY="overlays perl"
+IUSE_OPTIONAL="gnutls iodbc sasl ssl odbc debug ipv6 libressl +syslog selinux static-libs test"
+IUSE_CONTRIB="smbkrb5passwd kerberos kinit pbkdf2 sha2"
+IUSE_CONTRIB="${IUSE_CONTRIB} -cxx"
+IUSE="${IUSE_DAEMON} ${IUSE_BACKEND} ${IUSE_OVERLAY} ${IUSE_OPTIONAL} ${IUSE_CONTRIB}"
+
+RESTRICT="!test? ( test )"
+REQUIRED_USE="cxx? ( sasl )
+	pbkdf2? ( ssl )
+	test? ( berkdb )
+	?? ( test minimal )"
+
+# always list newer first
+# Do not add any AGPL-3 BDB here!
+# See bug 525110, comment 15.
+# Advanced usage: OPENLDAP_BDB_SLOTS in the environment can be used to force a slot during build.
+BDB_SLOTS="${OPENLDAP_BDB_SLOTS:=5.3 5.1 4.8 4.7 4.6 4.5 4.4}"
+BDB_PKGS=''
+for _slot in $BDB_SLOTS; do BDB_PKGS="${BDB_PKGS} sys-libs/db:${_slot}" ; done
+
+# openssl is needed to generate lanman-passwords required by samba
+COMMON_DEPEND="
+	ssl? (
+		!gnutls? (
+			!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
+			libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+		)
+		gnutls? (
+			>=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}]
+			>=dev-libs/libgcrypt-1.5.3:0=[${MULTILIB_USEDEP}]
+		)
+	)
+	sasl? ( dev-libs/cyrus-sasl:= )
+	!minimal? (
+		dev-libs/libltdl
+		sys-libs/e2fsprogs-libs
+		>=dev-db/lmdb-0.9.18:=
+		tcpd? ( sys-apps/tcp-wrappers )
+		odbc? ( !iodbc? ( dev-db/unixODBC )
+			iodbc? ( dev-db/libiodbc ) )
+		perl? ( dev-lang/perl:=[-build(-)] )
+		samba? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:0= )
+		)
+		berkdb? (
+			<sys-libs/db-6.0:=
+			|| ( ${BDB_PKGS} )
+			)
+		smbkrb5passwd? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:0= )
+			kerberos? ( app-crypt/heimdal )
+			)
+		kerberos? (
+			virtual/krb5
+			kinit? ( !app-crypt/heimdal )
+			)
+		cxx? ( dev-libs/cyrus-sasl:= )
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	sys-apps/groff
+"
+RDEPEND="${COMMON_DEPEND}
+	selinux? ( sec-policy/selinux-ldap )
+"
+
+# The user/group are only used for running daemons which are
+# disabled in minimal builds, so elide the accounts too.
+# for tracking versions
+
+BDEPEND="!minimal? (
+		acct-group/ldap
+		acct-user/ldap
+)
+"
+
+OPENLDAP_VERSIONTAG=".version-tag"
+OPENLDAP_DEFAULTDIR_VERSIONTAG="/var/lib/openldap-data"
+
+MULTILIB_WRAPPED_HEADERS=(
+	# USE=cxx
+	/usr/include/LDAPAsynConnection.h
+	/usr/include/LDAPAttrType.h
+	/usr/include/LDAPAttribute.h
+	/usr/include/LDAPAttributeList.h
+	/usr/include/LDAPConnection.h
+	/usr/include/LDAPConstraints.h
+	/usr/include/LDAPControl.h
+	/usr/include/LDAPControlSet.h
+	/usr/include/LDAPEntry.h
+	/usr/include/LDAPEntryList.h
+	/usr/include/LDAPException.h
+	/usr/include/LDAPExtResult.h
+	/usr/include/LDAPMessage.h
+	/usr/include/LDAPMessageQueue.h
+	/usr/include/LDAPModList.h
+	/usr/include/LDAPModification.h
+	/usr/include/LDAPObjClass.h
+	/usr/include/LDAPRebind.h
+	/usr/include/LDAPRebindAuth.h
+	/usr/include/LDAPReferenceList.h
+	/usr/include/LDAPResult.h
+	/usr/include/LDAPSaslBindResult.h
+	/usr/include/LDAPSchema.h
+	/usr/include/LDAPSearchReference.h
+	/usr/include/LDAPSearchResult.h
+	/usr/include/LDAPSearchResults.h
+	/usr/include/LDAPUrl.h
+	/usr/include/LDAPUrlList.h
+	/usr/include/LdifReader.h
+	/usr/include/LdifWriter.h
+	/usr/include/SaslInteraction.h
+	/usr/include/SaslInteractionHandler.h
+	/usr/include/StringList.h
+	/usr/include/TlsOptions.h
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.4.17-gcc44.patch
+
+	"${FILESDIR}"/${PN}-2.2.14-perlthreadsfix.patch
+	"${FILESDIR}"/${PN}-2.4.15-ppolicy.patch
+
+	# bug #116045 - still present in 2.4.28
+	"${FILESDIR}"/${PN}-2.4.35-contrib-smbk5pwd.patch
+	# bug #408077 - samba4
+	"${FILESDIR}"/${PN}-2.4.35-contrib-samba4.patch
+
+	# bug #189817
+	"${FILESDIR}"/${PN}-2.4.11-libldap_r.patch
+
+	# bug #233633
+	"${FILESDIR}"/${PN}-2.4.45-fix-lmpasswd-gnutls-symbols.patch
+
+	# bug #281495
+	"${FILESDIR}"/${PN}-2.4.28-gnutls-gcrypt.patch
+
+	# bug #294350
+	"${FILESDIR}"/${PN}-2.4.6-evolution-ntlm.patch
+
+	# unbreak /bin/sh -> dash
+	"${FILESDIR}"/${PN}-2.4.28-fix-dash.patch
+
+	# bug #420959
+	"${FILESDIR}"/${PN}-2.4.31-gcc47.patch
+
+	# unbundle lmdb
+	"${FILESDIR}"/${PN}-2.4.42-mdb-unbundle.patch
+
+	# bug #622464
+	"${FILESDIR}"/${PN}-2.4.47-libressl.patch
+
+	# fix some compiler warnings
+	"${FILESDIR}"/${PN}-2.4.47-warnings.patch
+)
+
+openldap_filecount() {
+	local dir="$1"
+	find "${dir}" -type f ! -name '.*' ! -name 'DB_CONFIG*' | wc -l
+}
+
+openldap_find_versiontags() {
+	# scan for all datadirs
+	local openldap_datadirs=()
+	if [[ -f "${EROOT}"/etc/openldap/slapd.conf ]]; then
+		openldap_datadirs=( $(awk '{if($1 == "directory") print $2 }' "${EROOT}"/etc/openldap/slapd.conf) )
+	fi
+	openldap_datadirs+=( ${OPENLDAP_DEFAULTDIR_VERSIONTAG} )
+
+	einfo
+	einfo "Scanning datadir(s) from slapd.conf and"
+	einfo "the default installdir for Versiontags"
+	einfo "(${OPENLDAP_DEFAULTDIR_VERSIONTAG} may appear twice)"
+	einfo
+
+	# scan datadirs if we have a version tag
+	openldap_found_tag=0
+	have_files=0
+	for each in ${openldap_datadirs[@]} ; do
+		CURRENT_TAGDIR="${ROOT}$(sed "s:\/::" <<< ${each})"
+		CURRENT_TAG="${CURRENT_TAGDIR}/${OPENLDAP_VERSIONTAG}"
+		if [[ -d "${CURRENT_TAGDIR}" ]] && [[ "${openldap_found_tag}" == 0 ]] ; then
+			einfo "- Checking ${each}..."
+			if [[ -r "${CURRENT_TAG}" ]] ; then
+				# yey, we have one :)
+				einfo "   Found Versiontag in ${each}"
+				source "${CURRENT_TAG}"
+				if [[ "${OLDPF}" == "" ]] ; then
+					eerror "Invalid Versiontag found in ${CURRENT_TAGDIR}"
+					eerror "Please delete it"
+					eerror
+					die "Please kill the invalid versiontag in ${CURRENT_TAGDIR}"
+				fi
+
+				OLD_MAJOR=$(ver_cut 2-3 ${OLDPF})
+
+				[[ "$(openldap_filecount ${CURRENT_TAGDIR})" -gt 0 ]] && have_files=1
+
+				# are we on the same branch?
+				if [[ "${OLD_MAJOR}" != "${PV:0:3}" ]] ; then
+					ewarn "   Versiontag doesn't match current major release!"
+					if [[ "${have_files}" == "1" ]] ; then
+						eerror "   Versiontag says other major and you (probably) have datafiles!"
+						echo
+						openldap_upgrade_howto
+					else
+						einfo "   No real problem, seems there's no database."
+					fi
+				else
+					einfo "   Versiontag is fine here :)"
+				fi
+			else
+				einfo "   Non-tagged dir ${each}"
+				[[ "$(openldap_filecount ${each})" -gt 0 ]] && have_files=1
+				if [[ "${have_files}" == "1" ]] ; then
+					einfo "   EEK! Non-empty non-tagged datadir, counting `ls -a ${each} | wc -l` files"
+					echo
+
+					eerror
+					eerror "Your OpenLDAP Installation has a non tagged datadir that"
+					eerror "possibly contains a database at ${CURRENT_TAGDIR}"
+					eerror
+					eerror "Please export data if any entered and empty or remove"
+					eerror "the directory, installation has been stopped so you"
+					eerror "can take required action"
+					eerror
+					eerror "For a HOWTO on exporting the data, see instructions in the ebuild"
+					eerror
+					openldap_upgrade_howto
+					die "Please move the datadir ${CURRENT_TAGDIR} away"
+				fi
+			fi
+			einfo
+		fi
+	done
+	[[ "${have_files}" == "1" ]] && einfo "DB files present" || einfo "No DB files present"
+
+	# Now we must check for the major version of sys-libs/db linked against.
+	SLAPD_PATH="${EROOT}/usr/$(get_libdir)/openldap/slapd"
+	if [[ "${have_files}" == "1" ]] && [[ -f "${SLAPD_PATH}" ]]; then
+		OLDVER="$(/usr/bin/ldd ${SLAPD_PATH} \
+			| awk '/libdb-/{gsub("^libdb-","",$1);gsub(".so$","",$1);print $1}')"
+		if use berkdb; then
+			# find which one would be used
+			for bdb_slot in ${BDB_SLOTS} ; do
+				NEWVER="$(db_findver "=sys-libs/db-${bdb_slot}*")"
+				[[ -n "${NEWVER}" ]] && break
+			done
+		fi
+		local fail=0
+		if [[ -z "${OLDVER}" ]] && [[ -z "${NEWVER}" ]]; then
+			:
+			# Nothing wrong here.
+		elif [[ -z "${OLDVER}" ]] && [[ -n "${NEWVER}" ]]; then
+			eerror "	Your existing version of OpenLDAP was not built against"
+			eerror "	any version of sys-libs/db, but the new one will build"
+			eerror "	against	${NEWVER} and your database may be inaccessible."
+			echo
+			fail=1
+		elif [[ -n "${OLDVER}" ]] && [[ -z "${NEWVER}" ]]; then
+			eerror "	Your existing version of OpenLDAP was built against"
+			eerror "	sys-libs/db:${OLDVER}, but the new one will not be"
+			eerror "	built against any version and your database may be"
+			eerror "	inaccessible."
+			echo
+			fail=1
+		elif [[ "${OLDVER}" != "${NEWVER}" ]]; then
+			eerror "	Your existing version of OpenLDAP was built against"
+			eerror "	sys-libs/db:${OLDVER}, but the new one will build against"
+			eerror "	${NEWVER} and your database would be inaccessible."
+			echo
+			fail=1
+		fi
+		[[ "${fail}" == "1" ]] && openldap_upgrade_howto
+	fi
+
+	echo
+	einfo
+	einfo "All datadirs are fine, proceeding with merge now..."
+	einfo
+}
+
+openldap_upgrade_howto() {
+	local d l i
+	eerror
+	eerror "A (possible old) installation of OpenLDAP was detected,"
+	eerror "installation will not proceed for now."
+	eerror
+	eerror "As major version upgrades can corrupt your database,"
+	eerror "you need to dump your database and re-create it afterwards."
+	eerror
+	eerror "Additionally, rebuilding against different major versions of the"
+	eerror "sys-libs/db libraries will cause your database to be inaccessible."
+	eerror ""
+	d="$(date -u +%s)"
+	l="/root/ldapdump.${d}"
+	i="${l}.raw"
+	eerror " 1. /etc/init.d/slapd stop"
+	eerror " 2. slapcat -l ${i}"
+	eerror " 3. egrep -v '^(entry|context)CSN:' <${i} >${l}"
+	eerror " 4. mv /var/lib/openldap-data/ /var/lib/openldap-data-backup/"
+	eerror " 5. emerge --update \=net-nds/${PF}"
+	eerror " 6. etc-update, and ensure that you apply the changes"
+	eerror " 7. slapadd -l ${l}"
+	eerror " 8. chown ldap:ldap /var/lib/openldap-data/*"
+	eerror " 9. /etc/init.d/slapd start"
+	eerror "10. check that your data is intact."
+	eerror "11. set up the new replication system."
+	eerror
+	if [[ "${FORCE_UPGRADE}" != "1" ]]; then
+		die "You need to upgrade your database first"
+	else
+		eerror "You have the magical FORCE_UPGRADE=1 in place."
+		eerror "Don't say you weren't warned about data loss."
+	fi
+}
+
+pkg_setup() {
+	if ! use sasl && use cxx ; then
+		die "To build the ldapc++ library you must emerge openldap with sasl support"
+	fi
+	# Bug #322787
+	if use minimal && ! has_version "net-nds/openldap" ; then
+		einfo "No datadir scan needed, openldap not installed"
+	elif use minimal && has_version 'net-nds/openldap[minimal]' ; then
+		einfo "Skipping scan for previous datadirs as requested by minimal useflag"
+	else
+		openldap_find_versiontags
+	fi
+}
+
+src_prepare() {
+	# ensure correct SLAPI path by default
+	sed -e 's,\(#define LDAPI_SOCK\).*,\1 "'"${EPREFIX}"'/var/run/openldap/slapd.sock",' \
+		-i include/ldap_defaults.h || die
+
+	default
+	rm -r libraries/liblmdb || die
+
+	pushd build &>/dev/null || die "pushd build"
+	einfo "Making sure upstream build strip does not do stripping too early"
+	sed -i.orig \
+		-e '/^STRIP/s,-s,,g' \
+		top.mk || die "Failed to block stripping"
+	popd &>/dev/null || die
+
+	# wrong assumption that /bin/sh is /bin/bash
+	sed \
+		-e 's|/bin/sh|/bin/bash|g' \
+		-i tests/scripts/* || die "sed failed"
+
+	# Required for autoconf-2.70 #765043
+	sed 's@^AM_INIT_AUTOMAKE.*@AC_PROG_MAKE_SET@' -i configure.in || die
+	AT_NOEAUTOMAKE=yes eautoreconf
+}
+
+build_contrib_module() {
+	# <dir> <sources> <outputname>
+	pushd "${S}/contrib/slapd-modules/$1" &>/dev/null || die "pushd contrib/slapd-modules/$1"
+	einfo "Compiling contrib-module: $3"
+	# Make sure it's uppercase
+	local define_name="$(LC_ALL=C tr '[:lower:]' '[:upper:]' <<< "SLAPD_OVER_${1}")"
+	"${lt}" --mode=compile --tag=CC \
+		"${CC}" \
+		-D${define_name}=SLAPD_MOD_DYNAMIC \
+		-I"${BUILD_DIR}"/include \
+		-I../../../include -I../../../servers/slapd ${CFLAGS} \
+		-o ${2%.c}.lo -c $2 || die "compiling $3 failed"
+	einfo "Linking contrib-module: $3"
+	"${lt}" --mode=link --tag=CC \
+		"${CC}" -module \
+		${CFLAGS} \
+		${LDFLAGS} \
+		-rpath "${EPREFIX}"/usr/$(get_libdir)/openldap/openldap \
+		-o $3.la ${2%.c}.lo || die "linking $3 failed"
+	popd &>/dev/null || die
+}
+
+src_configure() {
+	# Bug 408001
+	use elibc_FreeBSD && append-cppflags -DMDB_DSYNC=O_SYNC -DMDB_FDATASYNC=fsync
+
+	# connectionless ldap per bug #342439
+	append-cppflags -DLDAP_CONNECTIONLESS
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myconf=()
+
+	use debug && myconf+=( $(use_enable debug) )
+
+	# ICU exists only in the configure, nowhere in the codebase, bug #510858
+	export ac_cv_header_unicode_utypes_h=no ol_cv_lib_icu=no
+
+	if ! use minimal && multilib_is_native_abi; then
+		local CPPFLAGS=${CPPFLAGS}
+
+		# re-enable serverside overlay chains per bug #296567
+		# see ldap docs chaper 12.3.1 for details
+		myconf+=( --enable-ldap )
+
+		# backends
+		myconf+=( --enable-slapd )
+		if use berkdb ; then
+			einfo "Using Berkeley DB for local backend"
+			myconf+=( --enable-bdb --enable-hdb )
+			DBINCLUDE=$(db_includedir ${BDB_SLOTS})
+			einfo "Using ${DBINCLUDE} for sys-libs/db version"
+			# We need to include the slotted db.h dir for FreeBSD
+			append-cppflags -I${DBINCLUDE}
+		else
+			myconf+=( --disable-bdb --disable-hdb )
+		fi
+		for backend in dnssrv ldap mdb meta monitor null passwd relay shell sock; do
+			myconf+=( --enable-${backend}=mod )
+		done
+
+		myconf+=( $(use_enable perl perl mod) )
+
+		myconf+=( $(use_enable odbc sql mod) )
+		if use odbc ; then
+			local odbc_lib="unixodbc"
+			if use iodbc ; then
+				odbc_lib="iodbc"
+				append-cppflags -I"${EPREFIX}"/usr/include/iodbc
+			fi
+			myconf+=( --with-odbc=${odbc_lib} )
+		fi
+
+		# slapd options
+		myconf+=(
+			$(use_enable crypt)
+			--disable-slp
+			$(use_enable samba lmpasswd)
+			$(use_enable syslog)
+		)
+		if use experimental ; then
+			myconf+=(
+				--enable-dynacl
+				--enable-aci=mod
+			)
+		fi
+		for option in aci cleartext modules rewrite rlookups slapi; do
+			myconf+=( --enable-${option} )
+		done
+
+		# slapd overlay options
+		# Compile-in the syncprov, the others as module
+		myconf+=( --enable-syncprov=yes )
+		use overlays && myconf+=( --enable-overlays=mod )
+
+	else
+		myconf+=(
+			--disable-backends
+			--disable-slapd
+			--disable-bdb
+			--disable-hdb
+			--disable-mdb
+			--disable-overlays
+			--disable-syslog
+		)
+	fi
+
+	# basic functionality stuff
+	myconf+=(
+		$(use_enable ipv6)
+		$(multilib_native_use_with sasl cyrus-sasl)
+		$(multilib_native_use_enable sasl spasswd)
+		$(use_enable tcpd wrappers)
+	)
+
+	# Some cross-compiling tests don't pan out well.
+	tc-is-cross-compiler && myconf+=(
+		--with-yielding-select=yes
+	)
+
+	local ssl_lib="no"
+	if use ssl || ( ! use minimal && use samba ) ; then
+		ssl_lib="openssl"
+		use gnutls && ssl_lib="gnutls"
+	fi
+
+	myconf+=( --with-tls=${ssl_lib} )
+
+	for basicflag in dynamic local proctitle shared; do
+		myconf+=( --enable-${basicflag} )
+	done
+
+	tc-export AR CC CXX
+	CONFIG_SHELL="/bin/sh" \
+	ECONF_SOURCE="${S}" \
+	STRIP=/bin/true \
+	econf \
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/openldap \
+		$(use_enable static-libs static) \
+		"${myconf[@]}"
+	emake depend
+}
+
+src_configure_cxx() {
+	# This needs the libraries built by the first build run.
+	# So we have to run it AFTER the main build, not just after the main
+	# configure.
+	local myconf_ldapcpp=(
+		--with-ldap-includes="${S}"/include
+	)
+
+	mkdir -p "${BUILD_DIR}"/contrib/ldapc++ || die
+	pushd "${BUILD_DIR}/contrib/ldapc++" &>/dev/null || die "pushd contrib/ldapc++"
+
+	local LDFLAGS=${LDFLAGS} CPPFLAGS=${CPPFLAGS}
+	append-ldflags -L"${BUILD_DIR}"/libraries/liblber/.libs \
+		-L"${BUILD_DIR}"/libraries/libldap/.libs
+	append-cppflags -I"${BUILD_DIR}"/include
+	ECONF_SOURCE=${S}/contrib/ldapc++ \
+	econf "${myconf_ldapcpp[@]}" \
+		CC="${CC}" \
+		CXX="${CXX}"
+	popd &>/dev/null || die
+}
+
+multilib_src_compile() {
+	tc-export AR CC CXX
+	emake CC="${CC}" AR="${AR}" SHELL="${EPREFIX}"/bin/sh
+	local lt="${BUILD_DIR}/libtool"
+	export echo="echo"
+
+	if ! use minimal && multilib_is_native_abi ; then
+		if use cxx ; then
+			einfo "Building contrib library: ldapc++"
+			src_configure_cxx
+			pushd "${BUILD_DIR}/contrib/ldapc++" &>/dev/null || die "pushd contrib/ldapc++"
+			emake CC="${CC}" CXX="${CXX}"
+			popd &>/dev/null || die
+		fi
+
+		if use smbkrb5passwd ; then
+			einfo "Building contrib-module: smbk5pwd"
+			pushd "${S}/contrib/slapd-modules/smbk5pwd" &>/dev/null || die "pushd contrib/slapd-modules/smbk5pwd"
+
+			MY_DEFS="-DDO_SHADOW"
+			if use samba ; then
+				MY_DEFS="${MY_DEFS} -DDO_SAMBA"
+				MY_KRB5_INC=""
+			fi
+			if use kerberos ; then
+				MY_DEFS="${MY_DEFS} -DDO_KRB5"
+				MY_KRB5_INC="$(krb5-config --cflags)"
+			fi
+
+			emake \
+				DEFS="${MY_DEFS}" \
+				KRB5_INC="${MY_KRB5_INC}" \
+				LDAP_BUILD="${BUILD_DIR}" \
+				CC="${CC}" libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap"
+			popd &>/dev/null || die
+		fi
+
+		if use overlays ; then
+			einfo "Building contrib-module: samba4"
+			pushd "${S}/contrib/slapd-modules/samba4" &>/dev/null || die "pushd contrib/slapd-modules/samba4"
+
+			emake \
+				LDAP_BUILD="${BUILD_DIR}" \
+				CC="${CC}" libexecdir="/usr/$(get_libdir)/openldap"
+			popd &>/dev/null || die
+		fi
+
+		if use kerberos ; then
+			if use kinit ; then
+				build_contrib_module "kinit" "kinit.c" "kinit"
+			fi
+			pushd "${S}/contrib/slapd-modules/passwd" &>/dev/null || die "pushd contrib/slapd-modules/passwd"
+			einfo "Compiling contrib-module: pw-kerberos"
+			"${lt}" --mode=compile --tag=CC \
+				"${CC}" \
+				-I"${BUILD_DIR}"/include \
+				-I../../../include \
+				${CFLAGS} \
+				$(krb5-config --cflags) \
+				-DHAVE_KRB5 \
+				-o kerberos.lo \
+				-c kerberos.c || die "compiling pw-kerberos failed"
+			einfo "Linking contrib-module: pw-kerberos"
+			"${lt}" --mode=link --tag=CC \
+				"${CC}" -module \
+				${CFLAGS} \
+				${LDFLAGS} \
+				-rpath "${EPREFIX}"/usr/$(get_libdir)/openldap/openldap \
+				-o pw-kerberos.la \
+				kerberos.lo || die "linking pw-kerberos failed"
+			popd &>/dev/null || die
+		fi
+
+		if use pbkdf2; then
+			pushd "${S}/contrib/slapd-modules/passwd/pbkdf2" &>/dev/null || die "pushd contrib/slapd-modules/passwd/pbkdf2"
+			einfo "Compiling contrib-module: pw-pbkdf2"
+			"${lt}" --mode=compile --tag=CC \
+				"${CC}" \
+				-I"${BUILD_DIR}"/include \
+				-I../../../../include \
+				${CFLAGS} \
+				-o pbkdf2.lo \
+				-c pw-pbkdf2.c || die "compiling pw-pbkdf2 failed"
+			einfo "Linking contrib-module: pw-pbkdf2"
+			"${lt}" --mode=link --tag=CC \
+				"${CC}" -module \
+				${CFLAGS} \
+				${LDFLAGS} \
+				-rpath "${EPREFIX}"/usr/$(get_libdir)/openldap/openldap \
+				-o pw-pbkdf2.la \
+				pbkdf2.lo || die "linking pw-pbkdf2 failed"
+			popd &>/dev/null || die
+		fi
+
+		if use sha2 ; then
+			pushd "${S}/contrib/slapd-modules/passwd/sha2" &>/dev/null || die "pushd contrib/slapd-modules/passwd/sha2"
+			einfo "Compiling contrib-module: pw-sha2"
+			"${lt}" --mode=compile --tag=CC \
+				"${CC}" \
+				-I"${BUILD_DIR}"/include \
+				-I../../../../include \
+				${CFLAGS} \
+				-o sha2.lo \
+				-c sha2.c || die "compiling pw-sha2 failed"
+			"${lt}" --mode=compile --tag=CC \
+				"${CC}" \
+				-I"${BUILD_DIR}"/include \
+				-I../../../../include \
+				${CFLAGS} \
+				-o slapd-sha2.lo \
+				-c slapd-sha2.c || die "compiling pw-sha2 failed"
+			einfo "Linking contrib-module: pw-sha2"
+			"${lt}" --mode=link --tag=CC \
+				"${CC}" -module \
+				${CFLAGS} \
+				${LDFLAGS} \
+				-rpath "${EPREFIX}"/usr/$(get_libdir)/openldap/openldap \
+				-o pw-sha2.la \
+				sha2.lo slapd-sha2.lo || die "linking pw-sha2 failed"
+			popd &>/dev/null || die
+		fi
+
+		# We could build pw-radius if GNURadius would install radlib.h
+		pushd "${S}/contrib/slapd-modules/passwd" &>/dev/null || die "pushd contrib/slapd-modules/passwd"
+		einfo "Compiling contrib-module: pw-netscape"
+		"${lt}" --mode=compile --tag=CC \
+			"${CC}" \
+			-I"${BUILD_DIR}"/include \
+			-I../../../include \
+			${CFLAGS} \
+			-o netscape.lo \
+			-c netscape.c || die "compiling pw-netscape failed"
+		einfo "Linking contrib-module: pw-netscape"
+		"${lt}" --mode=link --tag=CC \
+			"${CC}" -module \
+			${CFLAGS} \
+			${LDFLAGS} \
+			-rpath "${EPREFIX}"/usr/$(get_libdir)/openldap/openldap \
+			-o pw-netscape.la \
+			netscape.lo || die "linking pw-netscape failed"
+
+		#build_contrib_module "acl" "posixgroup.c" "posixGroup" # example code only
+		#build_contrib_module "acl" "gssacl.c" "gss" # example code only, also needs kerberos
+		build_contrib_module "addpartial" "addpartial-overlay.c" "addpartial-overlay"
+		build_contrib_module "allop" "allop.c" "overlay-allop"
+		build_contrib_module "allowed" "allowed.c" "allowed"
+		build_contrib_module "autogroup" "autogroup.c" "autogroup"
+		build_contrib_module "cloak" "cloak.c" "cloak"
+		# build_contrib_module "comp_match" "comp_match.c" "comp_match" # really complex, adds new external deps, questionable demand
+		build_contrib_module "denyop" "denyop.c" "denyop-overlay"
+		build_contrib_module "dsaschema" "dsaschema.c" "dsaschema-plugin"
+		build_contrib_module "dupent" "dupent.c" "dupent"
+		build_contrib_module "lastbind" "lastbind.c" "lastbind"
+		# lastmod may not play well with other overlays
+		build_contrib_module "lastmod" "lastmod.c" "lastmod"
+		build_contrib_module "noopsrch" "noopsrch.c" "noopsrch"
+		#build_contrib_module "nops" "nops.c" "nops-overlay" https://bugs.gentoo.org/641576
+		#build_contrib_module "nssov" "nssov.c" "nssov-overlay" RESO:LATER
+		build_contrib_module "trace" "trace.c" "trace"
+		popd &>/dev/null || die
+		# build slapi-plugins
+		pushd "${S}/contrib/slapi-plugins/addrdnvalues" &>/dev/null || die "pushd contrib/slapi-plugins/addrdnvalues"
+		einfo "Building contrib-module: addrdnvalues plugin"
+		"${CC}" -shared \
+			-I"${BUILD_DIR}"/include \
+			-I../../../include \
+			${CFLAGS} \
+			-fPIC \
+			${LDFLAGS} \
+			-o libaddrdnvalues-plugin.so \
+			addrdnvalues.c || die "Building libaddrdnvalues-plugin.so failed"
+		popd &>/dev/null || die
+	fi
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi; then
+		cd tests || die
+		emake tests
+	fi
+}
+
+multilib_src_install() {
+	local lt="${BUILD_DIR}/libtool"
+	emake DESTDIR="${D}" SHELL="${EPREFIX}"/bin/sh install
+
+	if ! use minimal && multilib_is_native_abi; then
+		# openldap modules go here
+		# TODO: write some code to populate slapd.conf with moduleload statements
+		keepdir /usr/$(get_libdir)/openldap/openldap/
+
+		# initial data storage dir
+		keepdir /var/lib/openldap-data
+		use prefix || fowners ldap:ldap /var/lib/openldap-data
+		fperms 0700 /var/lib/openldap-data
+
+		echo "OLDPF='${PF}'" > "${ED}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}"
+		echo "# do NOT delete this. it is used"	>> "${ED}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}"
+		echo "# to track versions for upgrading." >> "${ED}${OPENLDAP_DEFAULTDIR_VERSIONTAG}/${OPENLDAP_VERSIONTAG}"
+
+		# use our config
+		rm "${ED}"/etc/openldap/slapd.conf
+		insinto /etc/openldap
+		newins "${FILESDIR}"/${PN}-2.4.40-slapd-conf slapd.conf
+		configfile="${ED}"/etc/openldap/slapd.conf
+
+		# populate with built backends
+		ebegin "populate config with built backends"
+		for x in "${ED}"/usr/$(get_libdir)/openldap/openldap/back_*.so; do
+			einfo "Adding $(basename ${x})"
+			sed -e "/###INSERTDYNAMICMODULESHERE###$/a# moduleload\t$(basename ${x})" -i "${configfile}" || die
+		done
+		sed -e "s:###INSERTDYNAMICMODULESHERE###$:# modulepath\t${EPREFIX}/usr/$(get_libdir)/openldap/openldap:" -i "${configfile}"
+		use prefix || fowners root:ldap /etc/openldap/slapd.conf
+		fperms 0640 /etc/openldap/slapd.conf
+		cp "${configfile}" "${configfile}".default || die
+		eend
+
+		# install our own init scripts and systemd unit files
+		einfo "Install init scripts"
+		sed -e "s,/usr/lib/,/usr/$(get_libdir)/," "${FILESDIR}"/slapd-initd-2.4.40-r2 > "${T}"/slapd || die
+		doinitd "${T}"/slapd
+		newconfd "${FILESDIR}"/slapd-confd-2.4.28-r1 slapd
+
+		einfo "Install systemd service"
+		sed -e "s,/usr/lib/,/usr/$(get_libdir)/," "${FILESDIR}"/slapd.service > "${T}"/slapd.service || die
+		systemd_dounit "${T}"/slapd.service
+		systemd_install_serviced "${FILESDIR}"/slapd.service.conf
+		newtmpfiles "${FILESDIR}"/slapd.tmpfilesd slapd.conf
+
+		# If built without SLP, we don't need to be before avahi
+			sed -i \
+				-e '/before/{s/avahi-daemon//g}' \
+				"${ED}"/etc/init.d/slapd \
+				|| die
+
+		if use cxx ; then
+			einfo "Install the ldapc++ library"
+			cd "${BUILD_DIR}/contrib/ldapc++" || die
+			emake DESTDIR="${D}" libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap" install
+			cd "${S}"/contrib/ldapc++ || die
+			newdoc README ldapc++-README
+		fi
+
+		if use smbkrb5passwd ; then
+			einfo "Install the smbk5pwd module"
+			cd "${S}/contrib/slapd-modules/smbk5pwd" || die
+			emake DESTDIR="${D}" \
+				LDAP_BUILD="${BUILD_DIR}" \
+				libexecdir="${EPREFIX}/usr/$(get_libdir)/openldap" install
+			newdoc README smbk5pwd-README
+		fi
+
+		if use overlays ; then
+			einfo "Install the samba4 module"
+			cd "${S}/contrib/slapd-modules/samba4" || die
+			emake DESTDIR="${D}" \
+				LDAP_BUILD="${BUILD_DIR}" \
+				libexecdir="/usr/$(get_libdir)/openldap" install
+			newdoc README samba4-README
+		fi
+
+		einfo "Installing contrib modules"
+		cd "${S}/contrib/slapd-modules" || die
+		for l in */*.la */*/*.la; do
+			[[ -e ${l} ]] || continue
+			"${lt}" --mode=install cp ${l} \
+				"${ED}"/usr/$(get_libdir)/openldap/openldap || \
+				die "installing ${l} failed"
+		done
+
+		dodoc "${FILESDIR}"/DB_CONFIG.fast.example
+		docinto contrib
+		doman */*.5
+		#newdoc acl/README*
+		newdoc addpartial/README addpartial-README
+		newdoc allop/README allop-README
+		newdoc allowed/README  allowed-README
+		newdoc autogroup/README autogroup-README
+		newdoc dsaschema/README dsaschema-README
+		newdoc passwd/README passwd-README
+		cd "${S}/contrib/slapi-plugins" || die
+		insinto /usr/$(get_libdir)/openldap/openldap
+		doins  */*.so
+		docinto contrib
+		newdoc addrdnvalues/README addrdnvalues-README
+
+		insinto /etc/openldap/schema
+		newins "${DISTDIR}"/${BIS_P} ${BIS_PN}
+
+		docinto back-sock ; dodoc "${S}"/servers/slapd/back-sock/searchexample*
+		docinto back-shell ; dodoc "${S}"/servers/slapd/back-shell/searchexample*
+		docinto back-perl ; dodoc "${S}"/servers/slapd/back-perl/SampleLDAP.pm
+
+		dosbin "${S}"/contrib/slapd-tools/statslog
+		newdoc "${S}"/contrib/slapd-tools/README README.statslog
+	fi
+
+	if ! use static-libs ; then
+		find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc ANNOUNCEMENT CHANGES COPYRIGHT README
+	docinto rfc ; dodoc doc/rfc/*.txt
+}
+
+pkg_preinst() {
+	# keep old libs if any
+	preserve_old_lib /usr/$(get_libdir)/{liblber,libldap_r,liblber}-2.3$(get_libname 0)
+	# bug 440470, only display the getting started help there was no openldap before,
+	# or we are going to a non-minimal build
+	! has_version net-nds/openldap || has_version 'net-nds/openldap[minimal]'
+	OPENLDAP_PRINT_MESSAGES=$((! $?))
+}
+
+pkg_postinst() {
+	if ! use minimal ; then
+		# You cannot build SSL certificates during src_install that will make
+		# binary packages containing your SSL key, which is both a security risk
+		# and a misconfiguration if multiple machines use the same key and cert.
+		if use ssl; then
+			install_cert /etc/openldap/ssl/ldap
+			use prefix || chown ldap:ldap "${EROOT}"/etc/openldap/ssl/ldap.*
+			ewarn "Self-signed SSL certificates are treated harshly by OpenLDAP 2.[12]"
+			ewarn "Self-signed SSL certificates are treated harshly by OpenLDAP 2.[12]"
+			ewarn "add 'TLS_REQCERT allow' if you want to use them."
+		fi
+
+		if use prefix; then
+			# Warn about prefix issues with slapd
+			eerror "slapd might NOT be usable on Prefix systems as it requires root privileges"
+			eerror "to start up, and requires that certain files directories be owned by"
+			eerror "ldap:ldap.  As Prefix does not support changing ownership of files and"
+			eerror "directories, you will have to manually fix this yourself."
+		fi
+
+		# These lines force the permissions of various content to be correct
+		if [[ -d "${EROOT}"/var/run/openldap ]]; then
+			use prefix || { chown ldap:ldap "${EROOT}"/var/run/openldap || die; }
+			chmod 0755 "${EROOT}"/var/run/openldap || die
+		fi
+		use prefix || chown root:ldap "${EROOT}"/etc/openldap/slapd.conf{,.default}
+		chmod 0640 "${EROOT}"/etc/openldap/slapd.conf{,.default} || die
+		use prefix || chown ldap:ldap "${EROOT}"/var/lib/openldap-data
+	fi
+
+	if has_version 'net-nds/openldap[-minimal]' && ((${OPENLDAP_PRINT_MESSAGES})); then
+		elog "Getting started using OpenLDAP? There is some documentation available:"
+		elog "Gentoo Guide to OpenLDAP Authentication"
+		elog "(https://wiki.gentoo.org/wiki/Centralized_authentication_using_OpenLDAP)"
+		elog "---"
+		elog "An example file for tuning BDB backends with openldap is"
+		elog "DB_CONFIG.fast.example in /usr/share/doc/${PF}/"
+	fi
+
+	preserve_old_lib_notify /usr/$(get_libdir)/{liblber,libldap,libldap_r}-2.3$(get_libname 0)
+}
diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index d553dcd3aba1..f734c7aa3896 100644
Binary files a/net-p2p/Manifest.gz and b/net-p2p/Manifest.gz differ
diff --git a/net-p2p/eiskaltdcpp/Manifest b/net-p2p/eiskaltdcpp/Manifest
index 11d8ed0ac9a2..951bb7eab15c 100644
--- a/net-p2p/eiskaltdcpp/Manifest
+++ b/net-p2p/eiskaltdcpp/Manifest
@@ -1,4 +1,4 @@
 DIST eiskaltdcpp-2.4.2.tar.xz 4320140 BLAKE2B 8b58a297934398f106bd200d451b5caab7664bee9dbeb34761571fbc4db065aea0cb7e47cbbd95f11eaceef94a0393b1b92bc832607d3b3b68b8acc84a28441c SHA512 f9309188b209636f205295d1686b6aea5a5b59c160e724a10bf642f051f18f64113978144725371ee67db762f6f573cbc95ae934d232918344a9f250c8c044ea
-EBUILD eiskaltdcpp-2.4.2.ebuild 3738 BLAKE2B ea6511736a979fa0f680fe50fa3a0ea58aea9989305a60ea6ce831cd8365e5edee395c35ff1ccc0699243d1dac15a3b465f9854064a9ef88039b43a6f045ac47 SHA512 6cb3c12837c5ed7e8629e9facce415c109d1de8472900811b90408bb12afb6696de39beef2ae9c1ffb2f13510b4c1c8fe96544f7ff00a482cf33ca88415a872c
-EBUILD eiskaltdcpp-9999.ebuild 3689 BLAKE2B 9837ae9ae10dd54af0e59b7a636c22c60a49ee506427f0e57764c99fa5717a5eba693238e4291e9ebf45c5e37a5cd38ed18c92e490ae4352f3d5555e02923222 SHA512 8225fc6b86a417e7a2cf27c2cd0fa9934b487c6286d56697198b4b12d3e44e5aa96d33545d6b6060941dd5c96007f4cad689515ec7ad501d8b419c3c0dd7c0b0
+EBUILD eiskaltdcpp-2.4.2.ebuild 3725 BLAKE2B 212ad5cdbd414eeeaeda0f8620e968476fe20ef4a3f5d84ba5ad586c56018223b02e3f5d24d92d161be57866c26dbf374c30f430e0e5a985d7820793b9aa837e SHA512 1cf9f6346225365f3b224f01ec3df7bcc26086b56a82ed0d36cea90f380ea182ba43cfd48d79dd0c77cd6060b6603014dd4f6df1f7fe18c929fd9b559fc8649a
+EBUILD eiskaltdcpp-9999.ebuild 3676 BLAKE2B 5da6cc475341fe433275d4dfa05717f29299fa24d2ccc9bedc07d08737e7d2673c63366a0920daedd573b1c391c6e30ab8a63f285e8b038ec1437d36bf58031e SHA512 35bacb0fa48bba92023ef04e8164b583a8b3193b27442f7fc8329310c64b633df76f4d96ed4ec84a37c02498c18702421667d9b83c1faa6e3eb074c2cf724009
 MISC metadata.xml 1238 BLAKE2B 6386c6dd1b0e559584966e27c31871d0aaaecbca31bc1ffde5c309f6d17a0855d106e7455e868716b5d01d0a76fbb9e856dc31cd8fa237aaade5b084596de043 SHA512 ce2a02bbaec3f47f91d812dfb25108220c678322e0f129764b0b7d158e51edf27562ab8598e9e93d4ad79eacb46669e9351d8dec95f50e63913d44fe72c756d9
diff --git a/net-p2p/eiskaltdcpp/eiskaltdcpp-2.4.2.ebuild b/net-p2p/eiskaltdcpp/eiskaltdcpp-2.4.2.ebuild
index 9fc3dc202fe1..6a9de498c3ae 100644
--- a/net-p2p/eiskaltdcpp/eiskaltdcpp-2.4.2.ebuild
+++ b/net-p2p/eiskaltdcpp/eiskaltdcpp-2.4.2.ebuild
@@ -32,7 +32,6 @@ if [[ ${PV} != *9999* ]]; then
 	KEYWORDS="~amd64 ~x86"
 else
 	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
-	KEYWORDS=""
 fi
 
 RDEPEND="
diff --git a/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild b/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild
index c160df0f27be..2c795225234b 100644
--- a/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild
+++ b/net-p2p/eiskaltdcpp/eiskaltdcpp-9999.ebuild
@@ -32,7 +32,6 @@ if [[ ${PV} != *9999* ]]; then
 	KEYWORDS="~amd64 ~x86"
 else
 	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
-	KEYWORDS=""
 fi
 
 RDEPEND="
diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index 18d4ba9789be..1a0a3218cdaf 100644
Binary files a/net-proxy/Manifest.gz and b/net-proxy/Manifest.gz differ
diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index f2a8b27cefbe..2de73b34c4b7 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -2,22 +2,30 @@ AUX haproxy-2.3.0-hpack-VAR_ARRAY.patch 1230 BLAKE2B 282f82e498126771c3837f2da3c
 AUX haproxy.confd 610 BLAKE2B 89c6ea0c2f623bbe7aa80a4f42de1d7fb38a2fa6e9edb5b9c758ee1c5140e750fa6be046e4854c94806a609bd3b487f2553bfeafb1db43871032731425b54f59 SHA512 80a6e109432c7e751e9e1063853f73d3269c4c3967728a90cf94230cb32308b396f9f9ad7795b74b919dae4f61e5a29a9ae7badf0908148accbe0e8ca2238913
 AUX haproxy.initd-r6 1705 BLAKE2B af8b9ad2fcb499d7fec97fe4210af8685a15881aa98634551bad8ec90bd2fe412a7af337fcb5f3ced7715433fb1d98fa175ecb83fa61108802973976109a7c6d SHA512 59693dfb0ae004559e57fb751ebd4abc85a982733699230ff51aa94a2bb7db9875bc63f6a03355b7434448736beb513e923b2ad9c70661f4110e4b2ad2bba753
 DIST haproxy-1.8.28.tar.gz 2211162 BLAKE2B 81123750285a34891248fad675511c372aa87ff5047b2d7d8635984a7a71183ee2b3fce78c42a999424b70b1ee5d8a26b46bbe9dec1e951ed1845332bc566109 SHA512 67e7ff9bb5cba7b2ca2274a9fe72397d9a9c85257acdb963f20988db3760c0cd2deba09022b95df18d8a90601c55bd83fe7282fc0a124c796c54714788a39794
+DIST haproxy-1.8.29.tar.gz 2213262 BLAKE2B e63a437fce005f08615bc87937a7a38f404845f1d73fe1b06881c26ee7ab2577af2a409cbbd4df89b54274589780c13e1b750f37deaa31d27dd866d36464e767 SHA512 dbdb0c47d94cc332cb7a20558ee50b6e96781295af36f4e342799db8f9254f8a4b4f11d91004405aca4ece6d3d43b66d93f8a979238507e3db7a7c37af1573d3
 DIST haproxy-2.0.14.tar.gz 2651320 BLAKE2B dd5aed78e52b3d3dd295f3883d45adf8795efac93cf6c23fbe39be031f29d19adad0afb400e8041281413f4570bc074f06d9cd88bee672789311e56f57b258d0 SHA512 6b63b713a1009eff59a2622fa93462deb8794c910685840f142711a61be88ea228c7cb2ec7ca50bba0803288625e1a65b2d2f87ffbcedfd23debfbbbb5d96993
 DIST haproxy-2.0.20.tar.gz 2693943 BLAKE2B ff09ca70ed0644c190af73b691aeaced1b491289cf7f4d05dace9cd469bb47f6e8507fc210936b0489867f7e799220278a2b8076b2ee0b87b58e2bd62f1af9ea SHA512 804c0e46f2aa0495b796710335c9080c17b98ea0fa2d60a65eb3cdc51e960a76a13b4c34945ebed75766088836e80f8e5c8e40abaa8caf2c5a5cc4a449d1eb2b
+DIST haproxy-2.0.21.tar.gz 2696549 BLAKE2B 97f211a768006370d85c0b2bda539440ac26051d445d3430a8fbaa135692165fb3ce32e998fcf54e669d9a2e08a23526a769b841fdd36b69d484ec86812d0a6c SHA512 a2273928568ca27d164a9bfae579a4635afa57f8d52f576073758d26a60973bb713a49fbafa6173e3130ca5712efdbf4e214bf85b7530b23eb523b667848f588
 DIST haproxy-2.1.11.tar.gz 2726723 BLAKE2B eef039eaf2808aa7a9b824ddd8e5e25623fc2467d541d5c24f71e7308c167c8eaa8fa6f7356250388c40802aa0581ae02f370b973e8f1169048dea7a7eaea3dc SHA512 59c72cd5154a387849e3dbca87ef5a635508342e7690c5bfa2d325bd6c5a00786f3dc834903a8b81a35ea90d05694eaac17a87b17235ba02cd6657acfec9c69f
+DIST haproxy-2.1.12.tar.gz 2731180 BLAKE2B fe1d586c5f6a7844606d4b8cd8cb810464f0d7d5615d53e7d53e8d45eb383021952e419e2f00a9277dd9b92d2c62dad60db9dd7ea9a87e21a04c960287c05cba SHA512 e33735311b0c7f349d5f6aa88fd69e1e9838c08fdf793f6e0d27779cd0c165d9a85022c778be880a8284f62c3c511c2b2d16374bf466268c902045631a4fbff1
 DIST haproxy-2.1.4.tar.gz 2684568 BLAKE2B 0618e069e6cf6fd20eb9fad0cfcb5ca1714d4001a794e20ce60d812741f4f65d44088c46599e4181cb79536566a940d748030552d0bd010ba14d1552cf7156f4 SHA512 fd029ac1ec877fa89a9410944439b66795b1392b6c8416aaa7978943170530c3826ba50ea706366f3f7785b7cffed58497cb362fc2480dd6920a99af4f920d98
 DIST haproxy-2.2.10.tar.gz 2904903 BLAKE2B cd9f3cce6797349190b1502377a25d72a75ea8bae53993ed43cba6b434efcffaf77336be383c131fed88d864eff4d9eda788b7ebc74bdeb2182a1890ebf93527 SHA512 b32d1f06dae6df1f266a6ea329dc1769db7153d373e778b7fc7406242b7b70b8e6dd0b9b2b9e38c9484d5f2528e35cdbf10502fab447deace12a5f9d655cff19
+DIST haproxy-2.2.11.tar.gz 2907128 BLAKE2B 76ce4d75e6be1b3e169fe1f2a3ca4dc104f7b0a7af308e1713ce7c235e45525d094bcff71853de9d78e9b6d32115b96616d3d86fb72397d8fdf7d70f375f2547 SHA512 bf05666a712710a1b99e6014a97aceb0a3e9a3184afdaaf2ae4454e8f444f6b85fd855c41c211882e8158d5939f81f1da2dc8468a6a778914e6caa4a9246a5d3
 DIST haproxy-2.2.5.tar.gz 2876429 BLAKE2B 1da993769302186ab0d7e1b0c8651c7e9a151295176da44bc854461f6b27831cadaa01a71b153046a23b43de91b2ba17b11ee52ecea12f744ae7af5b9f66ee98 SHA512 74e3c8b2b786f1fb5fcb8b8071751450f45a58ff847b336a8e4413727dea87b7d5a140853e3a445603ae5c4079f371ce9aa31a9f06c18ff4eea7462661775dca
 DIST haproxy-2.3.6.tar.gz 2918082 BLAKE2B 52998996c48b1ba9aaa1437ea2c5bdadda00dce58a7c1cbbafe686997a3b6fe03622986c3f5cd4dd7e3a982047e1a7c295ce6e6de2a65d36546b5e6dfff07800 SHA512 46000e08698db7a25d37b0a7e49b8c69e41eaef3cf17ea21bfda5075737110f682b8454196a72f09932a8c0bde0321e8cd075169cda840e2283aeb38bbbdf719
 DIST haproxy-2.3.7.tar.gz 2924802 BLAKE2B c2f82a49e7422b36f5af5568790002f2e5761adb971f4692406b8573035245782b155f6f05cd388400476f1af3734284dccf9922ba8a04ee3497dbf03d926bab SHA512 ba567294c61dbd19c178acace8804979fdb26384115e77a4eb88444fa9d45b1c62f22a171efafeeba027ae65f3a70fb67b7a3f84042eada025b6cce3b9ad62ec
 EBUILD haproxy-1.8.28.ebuild 4821 BLAKE2B 1da71c014918e7b65a0ff50ee732da0a5f6894fb06a2819d3c3cc0bb885a54dd4a3b07f070092236c3a2b5faa3a864bd6dbc7256de22fd5c281efb4eca17a6bf SHA512 85a1a777244c54ca9d66475f6a34581a03749a7cc9ea904672a356c4aa3dc1f8f7bdb4b1e9c4e5b23663c8bbe7a918e4130519296f6188dabdf0b442e82e69e2
+EBUILD haproxy-1.8.29.ebuild 4821 BLAKE2B 1da71c014918e7b65a0ff50ee732da0a5f6894fb06a2819d3c3cc0bb885a54dd4a3b07f070092236c3a2b5faa3a864bd6dbc7256de22fd5c281efb4eca17a6bf SHA512 85a1a777244c54ca9d66475f6a34581a03749a7cc9ea904672a356c4aa3dc1f8f7bdb4b1e9c4e5b23663c8bbe7a918e4130519296f6188dabdf0b442e82e69e2
 EBUILD haproxy-2.0.14-r2.ebuild 5358 BLAKE2B feaf455162ba2bceb9ab6b2e93b23b4dc4edaa073ad4f2b16b6caac2693dce4947fdecf8ad3fca13d8fd1da85c449f0c32fb9b482a7b64d8e7af9480fbdac56f SHA512 15befeccd36f285b1a7c121c755eaa8707be230949d18e1c85eab07abaa3c997c9ea061dcc78f6a7f5994df76100ebfb94a732192bb923a1bf1b21a6c03e595e
 EBUILD haproxy-2.0.20.ebuild 5361 BLAKE2B d438a92940018c82ef5980b1751f3ad80a6a39c969d6eab45a5cb9c51ef0d26ccfc5a1d7a326d196bbf421bd1ef96257c8197d25d3a86796c14f9a87bfb0c06c SHA512 230a92ee546271e82da682fa7039928c4338a39a4f3816611c01d5cd10c8de715cc5e384ec7afd94603d00bf3845d659aa24aa5a9206ba5edb1a145a8808a015
+EBUILD haproxy-2.0.21.ebuild 5361 BLAKE2B d438a92940018c82ef5980b1751f3ad80a6a39c969d6eab45a5cb9c51ef0d26ccfc5a1d7a326d196bbf421bd1ef96257c8197d25d3a86796c14f9a87bfb0c06c SHA512 230a92ee546271e82da682fa7039928c4338a39a4f3816611c01d5cd10c8de715cc5e384ec7afd94603d00bf3845d659aa24aa5a9206ba5edb1a145a8808a015
 EBUILD haproxy-2.0.9999.ebuild 5239 BLAKE2B 3e890c8af0d46e57e321b2942152ef13ff35a20f2b4250d1c1e7f7689d35c51c49d84b9fd3a95256ca0b1870577e40a500bee1b5d0a8f4676185b33a3a0f371e SHA512 5831d7d419c71d4ccf32a37be69d4409b35764c45684e4d795edc538c3c8fc029d63773f7ef64c93ac7f7b233d15b443186e656c12bc2daca8971c18d06693bd
 EBUILD haproxy-2.1.11.ebuild 5361 BLAKE2B d438a92940018c82ef5980b1751f3ad80a6a39c969d6eab45a5cb9c51ef0d26ccfc5a1d7a326d196bbf421bd1ef96257c8197d25d3a86796c14f9a87bfb0c06c SHA512 230a92ee546271e82da682fa7039928c4338a39a4f3816611c01d5cd10c8de715cc5e384ec7afd94603d00bf3845d659aa24aa5a9206ba5edb1a145a8808a015
+EBUILD haproxy-2.1.12.ebuild 5361 BLAKE2B d438a92940018c82ef5980b1751f3ad80a6a39c969d6eab45a5cb9c51ef0d26ccfc5a1d7a326d196bbf421bd1ef96257c8197d25d3a86796c14f9a87bfb0c06c SHA512 230a92ee546271e82da682fa7039928c4338a39a4f3816611c01d5cd10c8de715cc5e384ec7afd94603d00bf3845d659aa24aa5a9206ba5edb1a145a8808a015
 EBUILD haproxy-2.1.4-r2.ebuild 5358 BLAKE2B feaf455162ba2bceb9ab6b2e93b23b4dc4edaa073ad4f2b16b6caac2693dce4947fdecf8ad3fca13d8fd1da85c449f0c32fb9b482a7b64d8e7af9480fbdac56f SHA512 15befeccd36f285b1a7c121c755eaa8707be230949d18e1c85eab07abaa3c997c9ea061dcc78f6a7f5994df76100ebfb94a732192bb923a1bf1b21a6c03e595e
 EBUILD haproxy-2.1.9999.ebuild 5361 BLAKE2B e61c765fe67bc5d13e0f2168da97a087473bece19199aeae7aaa8d1fbf52c03924de605e4fdb9d44fbe5bb260c5b724df83ac90c712d17e194a9eb4b12cea700 SHA512 b721d70a871ee786d1f58b13db431599626b65ee6697b83e1c430a2335b0b4c6c051841cbce48e29922042cb6a8c974bb7625202aff5242b475118f9654ff0ba
 EBUILD haproxy-2.2.10.ebuild 5361 BLAKE2B d438a92940018c82ef5980b1751f3ad80a6a39c969d6eab45a5cb9c51ef0d26ccfc5a1d7a326d196bbf421bd1ef96257c8197d25d3a86796c14f9a87bfb0c06c SHA512 230a92ee546271e82da682fa7039928c4338a39a4f3816611c01d5cd10c8de715cc5e384ec7afd94603d00bf3845d659aa24aa5a9206ba5edb1a145a8808a015
+EBUILD haproxy-2.2.11.ebuild 5361 BLAKE2B d438a92940018c82ef5980b1751f3ad80a6a39c969d6eab45a5cb9c51ef0d26ccfc5a1d7a326d196bbf421bd1ef96257c8197d25d3a86796c14f9a87bfb0c06c SHA512 230a92ee546271e82da682fa7039928c4338a39a4f3816611c01d5cd10c8de715cc5e384ec7afd94603d00bf3845d659aa24aa5a9206ba5edb1a145a8808a015
 EBUILD haproxy-2.2.5-r1.ebuild 5417 BLAKE2B 21ad458ae0384f80859a1aea97d03671ddd001c60876fd9c0d596ad25da28e8c12a9e330ea7afcf3bbf68941fceb2995853f9a2833b3c6acd8bf5237454599b8 SHA512 1ef5ed092ce62f2b21bcd04e7a49ad3dd02573d6ddb9f87b54fe54c8b27b4b82fa19a267aa75f3ab09a8cb839cde6df8677a1959492f99a2ca83b316467392bc
 EBUILD haproxy-2.2.9999.ebuild 5361 BLAKE2B e61c765fe67bc5d13e0f2168da97a087473bece19199aeae7aaa8d1fbf52c03924de605e4fdb9d44fbe5bb260c5b724df83ac90c712d17e194a9eb4b12cea700 SHA512 b721d70a871ee786d1f58b13db431599626b65ee6697b83e1c430a2335b0b4c6c051841cbce48e29922042cb6a8c974bb7625202aff5242b475118f9654ff0ba
 EBUILD haproxy-2.3.6.ebuild 5270 BLAKE2B 415388e0efb3925109bb8778a23727ba48331750241d2c448c8e47569ed0c04aed390881f1657bb34739a1cfd7513c71d0777935cf8fef59f36ec63fbe9b8993 SHA512 93467747e2267c89e69dad6df9397c9ebf5cb865d3cf4d4a2f63bbf521d693e19fcd54ca092694c4551677151b8474987e661b141f8d688a334989f2c731e7aa
diff --git a/net-proxy/haproxy/haproxy-1.8.29.ebuild b/net-proxy/haproxy/haproxy-1.8.29.ebuild
new file mode 100644
index 000000000000..038c860b3686
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-1.8.29.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+[[ ${PV} == *9999 ]] && SCM="git-r3"
+inherit toolchain-funcs flag-o-matic systemd linux-info $SCM
+
+MY_P="${PN}-${PV/_beta/-dev}"
+
+DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
+HOMEPAGE="http://www.haproxy.org"
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~ppc ~x86"
+else
+	EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/"
+	EGIT_BRANCH=master
+fi
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0/$(ver_cut 1-2)"
+IUSE="+crypt doc examples libressl slz net_ns +pcre pcre-jit pcre2 pcre2-jit ssl
+systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
+REQUIRED_USE="pcre-jit? ( pcre )
+	pcre2-jit? ( pcre2 )
+	pcre? ( !pcre2 )
+	device-atlas? ( pcre )
+	?? ( slz zlib )"
+
+DEPEND="
+	pcre? (
+		dev-libs/libpcre
+		pcre-jit? ( dev-libs/libpcre[jit] )
+	)
+	pcre2? (
+		dev-libs/libpcre
+		pcre2-jit? ( dev-libs/libpcre2[jit] )
+	)
+	ssl? (
+		!libressl? ( dev-libs/openssl:0=[zlib?] )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	slz? ( dev-libs/libslz:= )
+	zlib? ( sys-libs/zlib )
+	lua? ( dev-lang/lua:5.3 )
+	device-atlas? ( dev-libs/device-atlas-api-c )"
+RDEPEND="${DEPEND}
+	acct-group/haproxy
+	acct-user/haproxy"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
+CONTRIBS=( halog iprange )
+# ip6range is present in 1.6, but broken.
+ver_test $PV -ge 1.7.0 && CONTRIBS+=( ip6range spoa_example tcploop )
+# TODO: mod_defender - requires apache / APR, modsecurity - the same
+ver_test $PV -ge 1.8.0 && CONTRIBS+=( hpack )
+
+haproxy_use() {
+	(( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
+
+	usex "${1}" "USE_${2}=1" "USE_${2}="
+}
+
+pkg_setup() {
+	if use net_ns; then
+		CONFIG_CHECK="~NET_NS"
+		linux-info_pkg_setup
+	fi
+}
+
+src_compile() {
+	local -a args=(
+		V=1
+		TARGET=linux2628
+		USE_GETADDRINFO=1
+		USE_TFO=1
+	)
+
+	# TODO: PCRE2_WIDTH?
+	args+=( $(haproxy_use threads THREAD) )
+	args+=( $(haproxy_use crypt LIBCRYPT) )
+	args+=( $(haproxy_use net_ns NS) )
+	args+=( $(haproxy_use pcre PCRE) )
+	args+=( $(haproxy_use pcre-jit PCRE_JIT) )
+	args+=( $(haproxy_use ssl OPENSSL) )
+	args+=( $(haproxy_use slz SLZ) )
+	args+=( $(haproxy_use zlib ZLIB) )
+	args+=( $(haproxy_use lua LUA) )
+	args+=( $(haproxy_use 51degrees 51DEGREES) )
+	args+=( $(haproxy_use device-atlas DEVICEATLAS) )
+	args+=( $(haproxy_use wurfl WURFL) )
+	args+=( $(haproxy_use systemd SYSTEMD) )
+
+	# For now, until the strict-aliasing breakage will be fixed
+	append-cflags -fno-strict-aliasing
+
+	emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
+	emake -C contrib/systemd SBINDIR=/usr/sbin
+
+	if use tools ; then
+		for contrib in ${CONTRIBS[@]} ; do
+			emake -C contrib/${contrib} \
+				CFLAGS="${CFLAGS}" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
+		done
+	fi
+}
+
+src_install() {
+	dosbin haproxy
+	dosym ../sbin/haproxy /usr/bin/haproxy
+
+	newconfd "${FILESDIR}/${PN}.confd" $PN
+	newinitd "${FILESDIR}/${PN}.initd-r6" $PN
+
+	doman doc/haproxy.1
+
+	systemd_dounit contrib/systemd/haproxy.service
+
+	einstalldocs
+
+	# The errorfiles are used by upstream defaults.
+	insinto /etc/haproxy/errors/
+	doins examples/errorfiles/*
+
+	if use doc; then
+		dodoc ROADMAP doc/*.txt
+		#if use lua; then
+		# TODO: doc/lua-api/
+		#fi
+	fi
+
+	if use tools ; then
+		has halog "${CONTRIBS[@]}" && dobin contrib/halog/halog
+		has "iprange" "${CONTRIBS[@]}" && newbin contrib/iprange/iprange haproxy_iprange
+		has "ip6range" "${CONTRIBS[@]}" && newbin contrib/ip6range/ip6range haproxy_ip6range
+		has "spoa_example" "${CONTRIBS[@]}" && newbin contrib/spoa_example/spoa haproxy_spoa_example
+		has "spoa_example" "${CONTRIBS[@]}" && newdoc contrib/spoa_example/README README.spoa_example
+		has "tcploop" "${CONTRIBS[@]}" && newbin contrib/tcploop/tcploop haproxy_tcploop
+		has "hpack" "${CONTRIBS[@]}" && newbin contrib/hpack/gen-rht haproxy_hpack
+	fi
+
+	if use examples ; then
+		docinto examples
+		dodoc examples/*.cfg
+		dodoc examples/seamless_reload.txt
+	fi
+
+	if use vim-syntax ; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins examples/haproxy.vim
+	fi
+}
+
+pkg_postinst() {
+	if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then
+		ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service."
+		ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created."
+		ewarn "Make use of them with the \"user\" and \"group\" directives."
+
+		if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then
+			einfo "Please consult the installed documentation for learning the configuration file's syntax."
+			einfo "The documentation and sample configuration files are installed here:"
+			einfo "   ${EROOT}/usr/share/doc/${PF}"
+		fi
+	fi
+}
diff --git a/net-proxy/haproxy/haproxy-2.0.21.ebuild b/net-proxy/haproxy/haproxy-2.0.21.ebuild
new file mode 100644
index 000000000000..09bca46c32f8
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-2.0.21.ebuild
@@ -0,0 +1,180 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+[[ ${PV} == *9999 ]] && SCM="git-r3"
+inherit toolchain-funcs flag-o-matic systemd linux-info $SCM
+
+MY_P="${PN}-${PV/_beta/-dev}"
+
+DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
+HOMEPAGE="http://www.haproxy.org"
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~ppc ~x86"
+else
+	EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/"
+	EGIT_BRANCH=master
+fi
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0/$(ver_cut 1-2)"
+IUSE="+crypt doc examples libressl slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter
+ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
+REQUIRED_USE="pcre-jit? ( pcre )
+	pcre2-jit? ( pcre2 )
+	pcre? ( !pcre2 )
+	device-atlas? ( pcre )
+	?? ( slz zlib )"
+
+DEPEND="
+	pcre? (
+		dev-libs/libpcre
+		pcre-jit? ( dev-libs/libpcre[jit] )
+	)
+	pcre2? (
+		dev-libs/libpcre
+		pcre2-jit? ( dev-libs/libpcre2[jit] )
+	)
+	ssl? (
+		!libressl? ( dev-libs/openssl:0=[zlib?] )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	slz? ( dev-libs/libslz:= )
+	zlib? ( sys-libs/zlib )
+	lua? ( dev-lang/lua:5.3 )
+	device-atlas? ( dev-libs/device-atlas-api-c )"
+RDEPEND="${DEPEND}
+	acct-group/haproxy
+	acct-user/haproxy"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
+CONTRIBS=( halog iprange )
+# ip6range is present in 1.6, but broken.
+ver_test $PV -ge 1.7.0 && CONTRIBS+=( ip6range spoa_example tcploop )
+# TODO: mod_defender - requires apache / APR, modsecurity - the same
+ver_test $PV -ge 1.8.0 && CONTRIBS+=( hpack )
+
+haproxy_use() {
+	(( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
+
+	usex "${1}" "USE_${2}=1" "USE_${2}="
+}
+
+pkg_setup() {
+	if use net_ns; then
+		CONFIG_CHECK="~NET_NS"
+		linux-info_pkg_setup
+	fi
+}
+
+src_compile() {
+	local -a args=(
+		V=1
+		TARGET=linux-glibc
+	)
+
+	# TODO: PCRE2_WIDTH?
+	args+=( $(haproxy_use threads THREAD) )
+	args+=( $(haproxy_use crypt LIBCRYPT) )
+	args+=( $(haproxy_use net_ns NS) )
+	args+=( $(haproxy_use pcre PCRE) )
+	args+=( $(haproxy_use pcre-jit PCRE_JIT) )
+	args+=( $(haproxy_use pcre2 PCRE2) )
+	args+=( $(haproxy_use pcre2-jit PCRE2_JIT) )
+	args+=( $(haproxy_use ssl OPENSSL) )
+	args+=( $(haproxy_use slz SLZ) )
+	args+=( $(haproxy_use zlib ZLIB) )
+	args+=( $(haproxy_use lua LUA) )
+	args+=( $(haproxy_use 51degrees 51DEGREES) )
+	args+=( $(haproxy_use device-atlas DEVICEATLAS) )
+	args+=( $(haproxy_use wurfl WURFL) )
+	args+=( $(haproxy_use systemd SYSTEMD) )
+
+	# For now, until the strict-aliasing breakage will be fixed
+	append-cflags -fno-strict-aliasing
+
+	# Bug #668002
+	if use ppc || use arm || use hppa; then
+		TARGET_LDFLAGS=-latomic
+	fi
+
+	if use prometheus-exporter; then
+		EXTRA_OBJS="contrib/prometheus-exporter/service-prometheus.o"
+	fi
+
+	# HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing
+	emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" ${args[@]}
+	emake -C contrib/systemd SBINDIR=/usr/sbin
+
+	if use tools ; then
+		for contrib in ${CONTRIBS[@]} ; do
+			# Those two includes are a workaround for hpack Makefile missing those
+			emake -C contrib/${contrib} \
+				CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
+		done
+	fi
+}
+
+src_install() {
+	dosbin haproxy
+	dosym ../sbin/haproxy /usr/bin/haproxy
+
+	newconfd "${FILESDIR}/${PN}.confd" $PN
+	newinitd "${FILESDIR}/${PN}.initd-r6" $PN
+
+	doman doc/haproxy.1
+
+	systemd_dounit contrib/systemd/haproxy.service
+
+	einstalldocs
+
+	# The errorfiles are used by upstream defaults.
+	insinto /etc/haproxy/errors/
+	doins examples/errorfiles/*
+
+	if use doc; then
+		dodoc ROADMAP doc/*.txt
+		#if use lua; then
+		# TODO: doc/lua-api/
+		#fi
+	fi
+
+	if use tools ; then
+		has halog "${CONTRIBS[@]}" && dobin contrib/halog/halog
+		has "iprange" "${CONTRIBS[@]}" && newbin contrib/iprange/iprange haproxy_iprange
+		has "ip6range" "${CONTRIBS[@]}" && newbin contrib/ip6range/ip6range haproxy_ip6range
+		has "spoa_example" "${CONTRIBS[@]}" && newbin contrib/spoa_example/spoa haproxy_spoa_example
+		has "spoa_example" "${CONTRIBS[@]}" && newdoc contrib/spoa_example/README README.spoa_example
+		has "tcploop" "${CONTRIBS[@]}" && newbin contrib/tcploop/tcploop haproxy_tcploop
+		has "hpack" "${CONTRIBS[@]}" && newbin contrib/hpack/gen-rht haproxy_hpack
+	fi
+
+	if use examples ; then
+		docinto examples
+		dodoc examples/*.cfg
+		dodoc doc/seamless_reload.txt
+	fi
+
+	if use vim-syntax ; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins contrib/syntax-highlight/haproxy.vim
+	fi
+}
+
+pkg_postinst() {
+	if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then
+		ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service."
+		ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created."
+		ewarn "Make use of them with the \"user\" and \"group\" directives."
+
+		if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then
+			einfo "Please consult the installed documentation for learning the configuration file's syntax."
+			einfo "The documentation and sample configuration files are installed here:"
+			einfo "   ${EROOT}/usr/share/doc/${PF}"
+		fi
+	fi
+}
diff --git a/net-proxy/haproxy/haproxy-2.1.12.ebuild b/net-proxy/haproxy/haproxy-2.1.12.ebuild
new file mode 100644
index 000000000000..09bca46c32f8
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-2.1.12.ebuild
@@ -0,0 +1,180 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+[[ ${PV} == *9999 ]] && SCM="git-r3"
+inherit toolchain-funcs flag-o-matic systemd linux-info $SCM
+
+MY_P="${PN}-${PV/_beta/-dev}"
+
+DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
+HOMEPAGE="http://www.haproxy.org"
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~ppc ~x86"
+else
+	EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/"
+	EGIT_BRANCH=master
+fi
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0/$(ver_cut 1-2)"
+IUSE="+crypt doc examples libressl slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter
+ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
+REQUIRED_USE="pcre-jit? ( pcre )
+	pcre2-jit? ( pcre2 )
+	pcre? ( !pcre2 )
+	device-atlas? ( pcre )
+	?? ( slz zlib )"
+
+DEPEND="
+	pcre? (
+		dev-libs/libpcre
+		pcre-jit? ( dev-libs/libpcre[jit] )
+	)
+	pcre2? (
+		dev-libs/libpcre
+		pcre2-jit? ( dev-libs/libpcre2[jit] )
+	)
+	ssl? (
+		!libressl? ( dev-libs/openssl:0=[zlib?] )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	slz? ( dev-libs/libslz:= )
+	zlib? ( sys-libs/zlib )
+	lua? ( dev-lang/lua:5.3 )
+	device-atlas? ( dev-libs/device-atlas-api-c )"
+RDEPEND="${DEPEND}
+	acct-group/haproxy
+	acct-user/haproxy"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
+CONTRIBS=( halog iprange )
+# ip6range is present in 1.6, but broken.
+ver_test $PV -ge 1.7.0 && CONTRIBS+=( ip6range spoa_example tcploop )
+# TODO: mod_defender - requires apache / APR, modsecurity - the same
+ver_test $PV -ge 1.8.0 && CONTRIBS+=( hpack )
+
+haproxy_use() {
+	(( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
+
+	usex "${1}" "USE_${2}=1" "USE_${2}="
+}
+
+pkg_setup() {
+	if use net_ns; then
+		CONFIG_CHECK="~NET_NS"
+		linux-info_pkg_setup
+	fi
+}
+
+src_compile() {
+	local -a args=(
+		V=1
+		TARGET=linux-glibc
+	)
+
+	# TODO: PCRE2_WIDTH?
+	args+=( $(haproxy_use threads THREAD) )
+	args+=( $(haproxy_use crypt LIBCRYPT) )
+	args+=( $(haproxy_use net_ns NS) )
+	args+=( $(haproxy_use pcre PCRE) )
+	args+=( $(haproxy_use pcre-jit PCRE_JIT) )
+	args+=( $(haproxy_use pcre2 PCRE2) )
+	args+=( $(haproxy_use pcre2-jit PCRE2_JIT) )
+	args+=( $(haproxy_use ssl OPENSSL) )
+	args+=( $(haproxy_use slz SLZ) )
+	args+=( $(haproxy_use zlib ZLIB) )
+	args+=( $(haproxy_use lua LUA) )
+	args+=( $(haproxy_use 51degrees 51DEGREES) )
+	args+=( $(haproxy_use device-atlas DEVICEATLAS) )
+	args+=( $(haproxy_use wurfl WURFL) )
+	args+=( $(haproxy_use systemd SYSTEMD) )
+
+	# For now, until the strict-aliasing breakage will be fixed
+	append-cflags -fno-strict-aliasing
+
+	# Bug #668002
+	if use ppc || use arm || use hppa; then
+		TARGET_LDFLAGS=-latomic
+	fi
+
+	if use prometheus-exporter; then
+		EXTRA_OBJS="contrib/prometheus-exporter/service-prometheus.o"
+	fi
+
+	# HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing
+	emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" ${args[@]}
+	emake -C contrib/systemd SBINDIR=/usr/sbin
+
+	if use tools ; then
+		for contrib in ${CONTRIBS[@]} ; do
+			# Those two includes are a workaround for hpack Makefile missing those
+			emake -C contrib/${contrib} \
+				CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
+		done
+	fi
+}
+
+src_install() {
+	dosbin haproxy
+	dosym ../sbin/haproxy /usr/bin/haproxy
+
+	newconfd "${FILESDIR}/${PN}.confd" $PN
+	newinitd "${FILESDIR}/${PN}.initd-r6" $PN
+
+	doman doc/haproxy.1
+
+	systemd_dounit contrib/systemd/haproxy.service
+
+	einstalldocs
+
+	# The errorfiles are used by upstream defaults.
+	insinto /etc/haproxy/errors/
+	doins examples/errorfiles/*
+
+	if use doc; then
+		dodoc ROADMAP doc/*.txt
+		#if use lua; then
+		# TODO: doc/lua-api/
+		#fi
+	fi
+
+	if use tools ; then
+		has halog "${CONTRIBS[@]}" && dobin contrib/halog/halog
+		has "iprange" "${CONTRIBS[@]}" && newbin contrib/iprange/iprange haproxy_iprange
+		has "ip6range" "${CONTRIBS[@]}" && newbin contrib/ip6range/ip6range haproxy_ip6range
+		has "spoa_example" "${CONTRIBS[@]}" && newbin contrib/spoa_example/spoa haproxy_spoa_example
+		has "spoa_example" "${CONTRIBS[@]}" && newdoc contrib/spoa_example/README README.spoa_example
+		has "tcploop" "${CONTRIBS[@]}" && newbin contrib/tcploop/tcploop haproxy_tcploop
+		has "hpack" "${CONTRIBS[@]}" && newbin contrib/hpack/gen-rht haproxy_hpack
+	fi
+
+	if use examples ; then
+		docinto examples
+		dodoc examples/*.cfg
+		dodoc doc/seamless_reload.txt
+	fi
+
+	if use vim-syntax ; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins contrib/syntax-highlight/haproxy.vim
+	fi
+}
+
+pkg_postinst() {
+	if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then
+		ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service."
+		ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created."
+		ewarn "Make use of them with the \"user\" and \"group\" directives."
+
+		if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then
+			einfo "Please consult the installed documentation for learning the configuration file's syntax."
+			einfo "The documentation and sample configuration files are installed here:"
+			einfo "   ${EROOT}/usr/share/doc/${PF}"
+		fi
+	fi
+}
diff --git a/net-proxy/haproxy/haproxy-2.2.11.ebuild b/net-proxy/haproxy/haproxy-2.2.11.ebuild
new file mode 100644
index 000000000000..09bca46c32f8
--- /dev/null
+++ b/net-proxy/haproxy/haproxy-2.2.11.ebuild
@@ -0,0 +1,180 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+[[ ${PV} == *9999 ]] && SCM="git-r3"
+inherit toolchain-funcs flag-o-matic systemd linux-info $SCM
+
+MY_P="${PN}-${PV/_beta/-dev}"
+
+DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
+HOMEPAGE="http://www.haproxy.org"
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~ppc ~x86"
+else
+	EGIT_REPO_URI="http://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/"
+	EGIT_BRANCH=master
+fi
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0/$(ver_cut 1-2)"
+IUSE="+crypt doc examples libressl slz +net_ns +pcre pcre-jit pcre2 pcre2-jit prometheus-exporter
+ssl systemd +threads tools vim-syntax +zlib lua device-atlas 51degrees wurfl"
+REQUIRED_USE="pcre-jit? ( pcre )
+	pcre2-jit? ( pcre2 )
+	pcre? ( !pcre2 )
+	device-atlas? ( pcre )
+	?? ( slz zlib )"
+
+DEPEND="
+	pcre? (
+		dev-libs/libpcre
+		pcre-jit? ( dev-libs/libpcre[jit] )
+	)
+	pcre2? (
+		dev-libs/libpcre
+		pcre2-jit? ( dev-libs/libpcre2[jit] )
+	)
+	ssl? (
+		!libressl? ( dev-libs/openssl:0=[zlib?] )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	slz? ( dev-libs/libslz:= )
+	zlib? ( sys-libs/zlib )
+	lua? ( dev-lang/lua:5.3 )
+	device-atlas? ( dev-libs/device-atlas-api-c )"
+RDEPEND="${DEPEND}
+	acct-group/haproxy
+	acct-user/haproxy"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
+CONTRIBS=( halog iprange )
+# ip6range is present in 1.6, but broken.
+ver_test $PV -ge 1.7.0 && CONTRIBS+=( ip6range spoa_example tcploop )
+# TODO: mod_defender - requires apache / APR, modsecurity - the same
+ver_test $PV -ge 1.8.0 && CONTRIBS+=( hpack )
+
+haproxy_use() {
+	(( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
+
+	usex "${1}" "USE_${2}=1" "USE_${2}="
+}
+
+pkg_setup() {
+	if use net_ns; then
+		CONFIG_CHECK="~NET_NS"
+		linux-info_pkg_setup
+	fi
+}
+
+src_compile() {
+	local -a args=(
+		V=1
+		TARGET=linux-glibc
+	)
+
+	# TODO: PCRE2_WIDTH?
+	args+=( $(haproxy_use threads THREAD) )
+	args+=( $(haproxy_use crypt LIBCRYPT) )
+	args+=( $(haproxy_use net_ns NS) )
+	args+=( $(haproxy_use pcre PCRE) )
+	args+=( $(haproxy_use pcre-jit PCRE_JIT) )
+	args+=( $(haproxy_use pcre2 PCRE2) )
+	args+=( $(haproxy_use pcre2-jit PCRE2_JIT) )
+	args+=( $(haproxy_use ssl OPENSSL) )
+	args+=( $(haproxy_use slz SLZ) )
+	args+=( $(haproxy_use zlib ZLIB) )
+	args+=( $(haproxy_use lua LUA) )
+	args+=( $(haproxy_use 51degrees 51DEGREES) )
+	args+=( $(haproxy_use device-atlas DEVICEATLAS) )
+	args+=( $(haproxy_use wurfl WURFL) )
+	args+=( $(haproxy_use systemd SYSTEMD) )
+
+	# For now, until the strict-aliasing breakage will be fixed
+	append-cflags -fno-strict-aliasing
+
+	# Bug #668002
+	if use ppc || use arm || use hppa; then
+		TARGET_LDFLAGS=-latomic
+	fi
+
+	if use prometheus-exporter; then
+		EXTRA_OBJS="contrib/prometheus-exporter/service-prometheus.o"
+	fi
+
+	# HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing
+	emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" ${args[@]}
+	emake -C contrib/systemd SBINDIR=/usr/sbin
+
+	if use tools ; then
+		for contrib in ${CONTRIBS[@]} ; do
+			# Those two includes are a workaround for hpack Makefile missing those
+			emake -C contrib/${contrib} \
+				CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
+		done
+	fi
+}
+
+src_install() {
+	dosbin haproxy
+	dosym ../sbin/haproxy /usr/bin/haproxy
+
+	newconfd "${FILESDIR}/${PN}.confd" $PN
+	newinitd "${FILESDIR}/${PN}.initd-r6" $PN
+
+	doman doc/haproxy.1
+
+	systemd_dounit contrib/systemd/haproxy.service
+
+	einstalldocs
+
+	# The errorfiles are used by upstream defaults.
+	insinto /etc/haproxy/errors/
+	doins examples/errorfiles/*
+
+	if use doc; then
+		dodoc ROADMAP doc/*.txt
+		#if use lua; then
+		# TODO: doc/lua-api/
+		#fi
+	fi
+
+	if use tools ; then
+		has halog "${CONTRIBS[@]}" && dobin contrib/halog/halog
+		has "iprange" "${CONTRIBS[@]}" && newbin contrib/iprange/iprange haproxy_iprange
+		has "ip6range" "${CONTRIBS[@]}" && newbin contrib/ip6range/ip6range haproxy_ip6range
+		has "spoa_example" "${CONTRIBS[@]}" && newbin contrib/spoa_example/spoa haproxy_spoa_example
+		has "spoa_example" "${CONTRIBS[@]}" && newdoc contrib/spoa_example/README README.spoa_example
+		has "tcploop" "${CONTRIBS[@]}" && newbin contrib/tcploop/tcploop haproxy_tcploop
+		has "hpack" "${CONTRIBS[@]}" && newbin contrib/hpack/gen-rht haproxy_hpack
+	fi
+
+	if use examples ; then
+		docinto examples
+		dodoc examples/*.cfg
+		dodoc doc/seamless_reload.txt
+	fi
+
+	if use vim-syntax ; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins contrib/syntax-highlight/haproxy.vim
+	fi
+}
+
+pkg_postinst() {
+	if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then
+		ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service."
+		ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created."
+		ewarn "Make use of them with the \"user\" and \"group\" directives."
+
+		if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then
+			einfo "Please consult the installed documentation for learning the configuration file's syntax."
+			einfo "The documentation and sample configuration files are installed here:"
+			einfo "   ${EROOT}/usr/share/doc/${PF}"
+		fi
+	fi
+}
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index 7e36a78ae01a..74e218b7bfaa 100644
Binary files a/net-vpn/Manifest.gz and b/net-vpn/Manifest.gz differ
diff --git a/net-vpn/fp-multiuser/Manifest b/net-vpn/fp-multiuser/Manifest
index 9e7f44540e48..d9a63bc920a5 100644
--- a/net-vpn/fp-multiuser/Manifest
+++ b/net-vpn/fp-multiuser/Manifest
@@ -251,5 +251,5 @@ DIST sigs.k8s.io%2Fstructured-merge-diff%2Fv3%2F@v%2Fv3.0.0-20200116222232-67a7b
 DIST sigs.k8s.io%2Fstructured-merge-diff%2Fv3%2F@v%2Fv3.0.0.mod 298 BLAKE2B c8069652ef0558d03282ef0f8444222d09708f1dcdc1ab19ed698d7acfb8d3421d9d9c9d053f3060848673d3dd30befd94c09b075ced36f79bef28940e7b351b SHA512 d153dd32bc1485e17771bad3142f576d967e0986702050431a656eb990af3bbfe809542745ac7752c0d72e6beee78bf3c285a4b41b37b8ebef50ecd7b3f53f8d
 DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod 24 BLAKE2B d33080dbc62b185d029eb43f75d66328dbfa7c463a3117b3efd5419ab8e1e52cc6f5d5a288d553421025c785ec6948b3aa68588cae19bd325f6acc0d043bb5fb SHA512 78f6402daccb04510f4ef35ee457ee13e4f447fba8e6aa33b4d32aa666e925861bf3b3f22c5ba9573871ec7e830f99e4caae0969724a54eadf40e6a7ed7931a0
 DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.mod 106 BLAKE2B bd5d8af6c5046c6de9b171ea2915c308de08e9696a8c82b3831bf5dc01f8aefc21b13b5b9a210f24ff8782909308137c25363074753427109e009889b7860f5f SHA512 712a936d07bfe4c2e67a4f199346d7e96db35486a0f051365c4636ddbc6505cf540995bc67e6a03b1b58e1e4816ece573418f23bf9ce93fcdc141a05f922f527
-EBUILD fp-multiuser-0.0.2.ebuild 13740 BLAKE2B 6a6dc36bd472507317a2cbed413fcdc189989b11cb2939d9557628f6957d9517e87f7bb7f91ec31070d0fb8cb7e924a06012926085f377090c7c7bcf687ec5aa SHA512 861d13edc8861c898d41c733bb267f05fd2d65c67dff2afb77e8d599eadbfeccf5d92293f411cef94c7e020cb253b758c27e97e0f73d006c1557b5348d98da6b
+EBUILD fp-multiuser-0.0.2.ebuild 13807 BLAKE2B b0b832f2a0821d828a67971551771b950a97aba57e5904819706c3146bf32cfe8465a5b16116ebca3d6aa82a1f7c0864fdd8e78736f640fabc3d4e19c7def7fe SHA512 e942a790122277c0f7cee8c438d6e9c1941f72efe88fb938eeead2a76b5ecf94d30f02dd44bf9210ac0414c12e79458a6cca060fde40941f4833ec211cc59a85
 MISC metadata.xml 327 BLAKE2B e2d7e49bd930bd5b780e82bd0edad42040351adf2c7e8d2e4eb7c4bdc377f6f5d80be8a8fa13c39d38313bc32db6ae7be587253490c683e79f455b4ad1d0174e SHA512 37dfef72461d2237d21a8f8b05521099a2113cadf3b423aaf026ca63de11e4a6788faaf93a0bf3279509f941653b3b2d57e0943e11345b3119409dfb60ac013e
diff --git a/net-vpn/fp-multiuser/fp-multiuser-0.0.2.ebuild b/net-vpn/fp-multiuser/fp-multiuser-0.0.2.ebuild
index 1e1769fedceb..ccee847057a1 100644
--- a/net-vpn/fp-multiuser/fp-multiuser-0.0.2.ebuild
+++ b/net-vpn/fp-multiuser/fp-multiuser-0.0.2.ebuild
@@ -280,5 +280,7 @@ src_install() {
 	systemd_dounit "${FILESDIR}/fp-multiuser.service"
 	newinitd "${FILESDIR}/initd" "${PN}"
 	newconfd "${FILESDIR}/confd" "${PN}"
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/logrotated" "${PN}"
 	dodoc README*.md
 }
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index a58f3959c1f8..3c234a8f2a92 100644
Binary files a/profiles/Manifest.gz and b/profiles/Manifest.gz differ
diff --git a/profiles/package.mask b/profiles/package.mask
index 168295557f24..62aa9c4686e9 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -32,6 +32,14 @@
 
 #--- END OF EXAMPLES ---
 
+# Marek Szuba <marecki@gentoo.org> (2021-03-19)
+# Depends on bundled out-of-date Qt5 libraries, and even with those
+# installed recent upstream versions fail to run. Moreover, we have now
+# got a source variant in the tree which, while still CLI-only for now,
+# is up to date and actually works.
+# Removal in 30 days. Bug #768228.
+mail-mta/protonmail-bridge-bin
+
 # Joonas Niilola <juippis@gentoo.org> (2021-03-16)
 # A library without consumers, unbuildable for years, ebuilds not 
 # touched in years either. Bugs #664776, #747592. Removal in ~30 days.
@@ -537,7 +545,9 @@ net-misc/gnome-remote-desktop
 =app-arch/cpio-2.13
 
 # Lars Wendler <polynomial-c@gentoo.org> (2019-10-16)
+# Joonas Niilola <juippis@gentoo.org> (2021-03-18)
 # Depends on apache-2.2
+# Removal on 2021-04-01. Bug #655502
 dev-libs/OpenSRF
 
 # Matt Turner <mattst88@gentoo.org> (2019-09-01)
diff --git a/profiles/targets/desktop/gnome/package.use b/profiles/targets/desktop/gnome/package.use
index a685386e588a..abfa91e4c9c3 100644
--- a/profiles/targets/desktop/gnome/package.use
+++ b/profiles/targets/desktop/gnome/package.use
@@ -1,6 +1,13 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Marek Szuba <marecki@gentoo.org> (2021-03-18)
+# FUSE cannot be built with multiple audio drivers, and desktop/gnome
+# profiles set both USE=pulseaudio (directly) and USE=alsa (inherited
+# from desktop). Default to the latter for now because PulseAudio support
+# in FUSE is currently considered experimental.
+app-emulation/fuse -pulseaudio
+
 # Mart Raudsepp <leio@gentoo.org> (2020-05-08)
 # evolution-data-server requires libical[vala] by default
 dev-libs/libical vala
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 79ad08f6f9d7..8739e0ba39b9 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -498,6 +498,7 @@ app-emulation/fs-uae:glew - Enable support for The OpenGL Extension Wrangler Lib
 app-emulation/fs-uae-launcher:lha - Enable LHA archive support
 app-emulation/fuse:backend-X - Use X11 rendering backend
 app-emulation/fuse:backend-fbcon - Use framebuffer rendering backend
+app-emulation/fuse:backend-gtk3 - Use Gtk+ rendering backend
 app-emulation/fuse:backend-sdl - Use SDL rendering backend
 app-emulation/fuse:backend-svga - Use svgalib rendering backend
 app-emulation/fuse:memlimit - Add compile-time memory usage limiting
@@ -6178,7 +6179,8 @@ net-misc/aria2:ssh - Enable SFTP support.
 net-misc/asterisk:blocks - Utlize -fblocks (only supported by, and required when using, clang/LLVM)
 net-misc/asterisk:cluster - Enable high-availability support through the Corosync Cluster Engine
 net-misc/asterisk:codec2 - Enable Codec2 support in asterisk
-net-misc/asterisk:dahdi - Support Digium compatible hardware (formerly known as Zaptel).
+net-misc/asterisk:dahdi - Support Digium compatible hardware (formerly known as Zaptel)
+net-misc/asterisk:deprecated - Enable deprecated features (eg, app_macro)
 net-misc/asterisk:gtalk - Enable support for Google Talk services
 net-misc/asterisk:http - Enable embedded web server
 net-misc/asterisk:ilbc - Enable the Internet Low Bitrate Codec (iLBC)
@@ -8611,6 +8613,7 @@ www-client/seamonkey:system-libevent - Use the system-wide dev-libs/libevent ins
 www-client/seamonkey:system-libvpx - Use the system-wide media-libs/libvpx instead of bundled
 www-client/seamonkey:system-sqlite - Use the system-wide dev-db/sqlite installation with secure-delete enabled
 www-client/surf:savedconfig - Without a saved config.h, this package depends on net-misc/curl and x11-terms/st for a default download mechanism
+www-client/surf:tabbed - Install surf-open.sh script for running surf in x11-misc/tabbed
 www-client/uget:aria2 - Enable support for net-misc/aria2 through xmlrpc. You'll find the plugin in the app's settings.
 www-client/uget:control-socket - Enable JSON-RPC over unix domain socket
 www-client/uget:openssl - Use dev-libs/openssl instead of net-libs/gnutls
diff --git a/sci-calculators/Manifest.gz b/sci-calculators/Manifest.gz
index 35ee8b525489..3e9a796b0628 100644
Binary files a/sci-calculators/Manifest.gz and b/sci-calculators/Manifest.gz differ
diff --git a/sci-calculators/bc-gh/Manifest b/sci-calculators/bc-gh/Manifest
index d8603deca7e7..90ba01b7a9ae 100644
--- a/sci-calculators/bc-gh/Manifest
+++ b/sci-calculators/bc-gh/Manifest
@@ -1,7 +1,5 @@
-DIST bc-3.3.0.tar.xz 229580 BLAKE2B 0528d50f566fce648561276434eed45a82fb1dc2d3c56a684758daa866802e7a3781a0e0d6a0993cdc356b416f5ff998de5c51a5e203d2ff415d6b098fb1743a SHA512 b8d0b6d6d9c5d4fc62df62d1b9b7e7006a8b430e063fe0d5f646cfaeb4c6fc9c7037b644e853b7ae7d5c5f42f079221e9cdc32564d70c9ddd6bb867ddc7056de
-DIST bc-3.3.2.tar.xz 228892 BLAKE2B 013e4708afbe93b3a17ecce002a6e393cd53b28659fb66aec1d857f2d5bef97341b90ca119ba7efdee88545af95d2223e3a4cb0f1c3b04739496053e1c81c00a SHA512 ae3e99c49137e1335c6c6c0f5a39a5488d174b98bdf85ce1c9311546ea093cd6ed2d8d0a3e6d401cdf093d509717ae01ec71e6e60d580e71101c673da5efc953
 DIST bc-3.3.3.tar.xz 229688 BLAKE2B 7d06565161b37216f60d1037b48a254eb467f41a66170e2a6b8f188b33aeeabaf8568ebb66e402d5010aa5991a4a197ea746959808f5c3d2e94c4eab80c90f20 SHA512 dfdd8023453406d9f681e04da7acaad4459e632fded0f2edb2b51607438a27074935af6db4b3580120daf56e6b52283275d0c2c809380caa164957f1901e9dde
-EBUILD bc-gh-3.3.0.ebuild 469 BLAKE2B de445258a29c37f7d6539dcc0be67c3531e4489fd7ccc10441816ce84f0b425c8ae656276071e09efbc0841cf05a807342d2a6a9f5959c14120e59aa435014ed SHA512 3af7bf904de23c93e952b1f713a747770899cb7cc819a0120acc04ad2db22145f50de34512c3b90ed5e227a5a82616a50063dc6ee956de8cddf0276ca04b6c61
-EBUILD bc-gh-3.3.2.ebuild 469 BLAKE2B de445258a29c37f7d6539dcc0be67c3531e4489fd7ccc10441816ce84f0b425c8ae656276071e09efbc0841cf05a807342d2a6a9f5959c14120e59aa435014ed SHA512 3af7bf904de23c93e952b1f713a747770899cb7cc819a0120acc04ad2db22145f50de34512c3b90ed5e227a5a82616a50063dc6ee956de8cddf0276ca04b6c61
+DIST bc-3.3.4.tar.xz 230264 BLAKE2B 38a6689a76c30127d5e27004c424cf4f9d1922129ab5235ab72f62f63f319e6b7d64c27a5f7a3ecd4a44001bb6eaa3990f5d0134548008233e7f28ae297f8fcd SHA512 212b36a3fafbda28c6416d29e2d9e49272c42d95dcdc3bbbb3691e4686ca3f0a9fec883a099d059c5bd21a9b08bf5b2eff01169de20df9777c2fce66a8cda783
 EBUILD bc-gh-3.3.3.ebuild 469 BLAKE2B de445258a29c37f7d6539dcc0be67c3531e4489fd7ccc10441816ce84f0b425c8ae656276071e09efbc0841cf05a807342d2a6a9f5959c14120e59aa435014ed SHA512 3af7bf904de23c93e952b1f713a747770899cb7cc819a0120acc04ad2db22145f50de34512c3b90ed5e227a5a82616a50063dc6ee956de8cddf0276ca04b6c61
+EBUILD bc-gh-3.3.4.ebuild 469 BLAKE2B de445258a29c37f7d6539dcc0be67c3531e4489fd7ccc10441816ce84f0b425c8ae656276071e09efbc0841cf05a807342d2a6a9f5959c14120e59aa435014ed SHA512 3af7bf904de23c93e952b1f713a747770899cb7cc819a0120acc04ad2db22145f50de34512c3b90ed5e227a5a82616a50063dc6ee956de8cddf0276ca04b6c61
 MISC metadata.xml 971 BLAKE2B aab101798e58a61a84c4d1a65f6ba8350baee939bd9e97668c8c0dff88a1326ad99460406a9eea95794e820ad3ad23f297e38fc30f0a67d85d7c3381bcaa963c SHA512 4f6051b731b1517940519e52676bb5220a695eb9a3ee37b7e22df09a862247671b0fcc809e93d3af0b8fb474102cdbe2ab4393d8b26d1266c9de636241f825b9
diff --git a/sci-calculators/bc-gh/bc-gh-3.3.2.ebuild b/sci-calculators/bc-gh/bc-gh-3.3.2.ebuild
deleted file mode 100644
index 89c8c7658afa..000000000000
--- a/sci-calculators/bc-gh/bc-gh-3.3.2.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Implementation of POSIX bc with GNU extensions"
-HOMEPAGE="https://github.com/gavinhoward/bc"
-SRC_URI="https://github.com/gavinhoward/bc/releases/download/${PV}/bc-${PV}.tar.xz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-S="${WORKDIR}/bc-${PV}"
-
-src_configure() {
-	EXECSUFFIX="-gh" PREFIX="${EPREFIX}/usr" ./configure.sh -GTl || die
-}
diff --git a/sci-calculators/bc-gh/bc-gh-3.3.0.ebuild b/sci-calculators/bc-gh/bc-gh-3.3.4.ebuild
similarity index 100%
rename from sci-calculators/bc-gh/bc-gh-3.3.0.ebuild
rename to sci-calculators/bc-gh/bc-gh-3.3.4.ebuild
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index e6f881f6a23c..82667e972a1b 100644
Binary files a/sci-mathematics/Manifest.gz and b/sci-mathematics/Manifest.gz differ
diff --git a/sci-mathematics/gimps/Manifest b/sci-mathematics/gimps/Manifest
index 21441d158294..446abde1c298 100644
--- a/sci-mathematics/gimps/Manifest
+++ b/sci-mathematics/gimps/Manifest
@@ -5,7 +5,8 @@ AUX gimps.service 283 BLAKE2B db6c0c777d514aa0216c1af087418ead25561ffa950752e237
 AUX gimps.tmpfiles 38 BLAKE2B c306d739ed0a0cc8bb4c80c7051ad93326cf0054d3f7fd61c4ed8a7d518356d521f7d3c3202d0b8b69723b8e7178457a34c65e92732eb15e8e64c3dff468ae2a SHA512 61c5eda13289175cdf55704442ceab4d5391d24cfa49f04155799fc2798e5ad5f1e624802e1c04b99685b1560f9898d1b0fc0c15c82251d1a765dd5de93024d8
 DIST p95v303b6.linux32.tar.gz 5702312 BLAKE2B 728c8b8e7e2b5187dc8126bccc5e2c165fbfbc0900d6c35517cd21b78e5292df143641e3766cc0146918062039b1eecab568f9b278f64b1b9197ee2f775603b9 SHA512 3e06fb77be07334949ece3ae152bdf5491f0b7f8e33e0e8ed2af3c34332841975a9514d1993ed2355abfa4e09f93e42093d02f96dc30c3471ae9f974cc2de11a
 DIST p95v303b6.linux64.tar.gz 7046127 BLAKE2B 9cde9c2670203071cfc463434a47c8123064cb232bfeb25d8767cad2c25ea75b395e2ec135b7b4a6dc9616e9d6b05ead371e1083274a82468f62a0e1de93c98f SHA512 6d6ded9a1724993d42adee28d400b0337835c52a4ce42271e62efb37134adfc6f017f55475860fbc1224e377a227ef8547b8852a35c082c37e996f4a1c1b570c
-DIST p95v304b9.linux64.tar.gz 7163658 BLAKE2B 3958437d31e39bc18248deeed29aa425ab7fd23c963b7eb9cc00524dbf272acbfb96b03d7ed83547501b7e8b7795b9e0e4d413e9a311b014c2202c328ea12a23 SHA512 f9517088af31ffb5f0ee931ba0027fbddfa5598f72de39aae78cbdb43368ca605444e31c9ef297d08ae85d7a8540dd25eb26015f288c3777e36fa9c04eb179e2
+DIST p95v305b1.linux32.tar.gz 5695975 BLAKE2B d2ab3724cf8743292533a7cb5c73b2fc6743c6e11507f92218b6b65f39e78c2f61147a6898d0a77fef590a0c989aa6f17d1984a6e4801594fbe4c3a7484d1750 SHA512 74e2592c1f3c4bb45cc076e35cd70d5c295d613ab142feb1c18138ea8816c21c56f5531c4938c49706bbb66f30ad84c5dd2f76f2184e1a1ea0de7423e941df52
+DIST p95v305b1.linux64.tar.gz 7166108 BLAKE2B 60880e36ed618ad94aacd0f89811b72137fd27e99dff33b02286ea0f4778bce320c9b8da7b470fa491ea2e333f03d9d2994c2ea1513289acfc2f5b63695509fd SHA512 c38416b83850104d8d78191a4591fbef1bd356f8804725ccfdd7ebe065bc05ed86c09a128ac7824f809242712d60a1eb7ecb200358c1cde37fc4b7c13b82006f
 EBUILD gimps-30.3.6.ebuild 1808 BLAKE2B 3483a73734d0b0008c992a946d36558f1e8ac93872a46bf80d79bb21ae65720c5614df1e1380fb15c2db2537559bc1969fc90dba0614afef1c2f8a6419ea996d SHA512 0dd32cf22373ec922a2716afc7f60ed5af2b0f76ba8f91b94eef891b1137b1dc597f0aca3609f76cb56b3f90b973953decd946d37e02cb6a1db1df1fd81c55a4
-EBUILD gimps-30.4.9.ebuild 1798 BLAKE2B b90eb57316e3cb619ecc84ea1e8a86e0f5ff1ca57f99a1a6bf7b603b3ce555335e5b13792b42347340bcc09c40e5f15ebd957e4c6b534f2dd2742c22330a61a4 SHA512 e9c7147cd7b9488273406c3f2085e34650e961cd29ac8f1f2314a6828edcaa9e2f70600b33aa3186f34f0d4acd21b62f440ebdfda79a4a6e713fd39b4104c88d
+EBUILD gimps-30.5.1.ebuild 1884 BLAKE2B ab8a5f9fec9a8cef6bdd4284364201fd29bb7a25070170f4de072e18be7749a7e0406a37f8a5321cbeb5709f1cfb2f1d4d655914d0032d9ee2ec67c59d720b62 SHA512 d2f7e56482733997dc72872e83e0b64a47d15ff1985b61bde6be2aec8c3543a97638d625125e4b30ec4a057e748f3fb422fc06c0c8d25c22a74a221bb675fcc9
 MISC metadata.xml 559 BLAKE2B ab97b02069d576618a0055447960e4831ee40c80dea70657b50e7cd729cdefb00ea0fe1d66e402470e7a1b29e1cda6db37f6c52c923ca0f31bd1056a72bc6e88 SHA512 4e0a74efc9add574ccdb07bc011ccb6b111f1b2182ba2d83c9528d0b6c5ee9d663fd6f50ac8a789888c59be5a4579c5a27bbdbf0b84970a6b4178ba53da834b0
diff --git a/sci-mathematics/gimps/gimps-30.4.9.ebuild b/sci-mathematics/gimps/gimps-30.5.1.ebuild
similarity index 94%
rename from sci-mathematics/gimps/gimps-30.4.9.ebuild
rename to sci-mathematics/gimps/gimps-30.5.1.ebuild
index 59980c5dd0c3..7a7160c336ab 100644
--- a/sci-mathematics/gimps/gimps-30.4.9.ebuild
+++ b/sci-mathematics/gimps/gimps-30.5.1.ebuild
@@ -16,12 +16,13 @@ MY_PV=$(ver_rs 2 'b' )
 
 SRC_URI="
 	amd64? ( https://www.mersenne.org/ftp_root/gimps/p95v${MY_PV/./}.linux64.tar.gz )
+	x86? ( https://www.mersenne.org/ftp_root/gimps/p95v${MY_PV/./}.linux32.tar.gz )
 	"
 
 SLOT="0"
 LICENSE="GIMPS"
 RESTRICT="mirror bindist"
-KEYWORDS="-* ~amd64"
+KEYWORDS="-* ~amd64 ~x86"
 
 # Since there are no statically linked binaries for this version of mprime,
 # and no static binaries for amd64 in general, we use the dynamically linked
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index d504fe92438c..a70c08b8c570 100644
Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ
diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest
index ed0459e32abd..fbef851dae0d 100644
--- a/sys-apps/file/Manifest
+++ b/sys-apps/file/Manifest
@@ -12,6 +12,6 @@ DIST file-5.39.tar.gz 954266 BLAKE2B 4d6d9a6317961e0a2aa391f502b0be8bbb40ede57c3
 EBUILD file-5.37-r1.ebuild 3153 BLAKE2B 19df45e9db45ca58085f3758d9396a074b6cd3a2475228ff7774551e85adb321203091958ae36eaa2aa12bbbfc2bf7aa79ad1e8b95345a106accd20fd621f54a SHA512 786d0ad8abe705e1e5ed1c3604dc4d6e4ae00ab27150368dd00475baefaeb37ec72c45297fd68def3fcb276b2ee29a8b8982e0010223d87df55450d49c8a1d76
 EBUILD file-5.38-r1.ebuild 3366 BLAKE2B cde302d8a08639b8b2a5f8aec2f4f00a0dce1bcc7a9b34b7ce9e2786cbc421659fba7acd50d81b90604dcdca84ee3ef9d8fb7bb431d01a98a2e47c7a82832e37 SHA512 af1fae92b1c27efb812b4a6b6944f9ebbdd35e0cf852b6e69bde503bcc9c5c08e97d4e7eac7139e674c4651650eb5e853dd3e3d4ee094d234d54606dd66b13ff
 EBUILD file-5.39-r3.ebuild 3390 BLAKE2B b8443b97f7364c7958ead19c0485321f821fe2a3c5d489be5c25a2dd9257faa0937cd0ddf900f860bd1790a2c196cc8d8566c65139619777335d742605e3d9f0 SHA512 6f8ff5ff5658fc9abe9d7803058763cf76ff63f269482c74956756befc95b993d2587f94b428305e19e5b66fb6b95f04d4eb32be4264bdf60cff07cbedbe0088
-EBUILD file-5.39-r4.ebuild 3453 BLAKE2B 27503e2cd17db6aca522b8f8183a732ed2745f67602665e44b262cbf9f776fced4fca3890c6081c19e98bc59bb2f365285afd462e1d743c80f5f5e2b23ae626b SHA512 d0cbcd984c02854df10fb9f3e1823b17438b99beb0300e0cbdcd2a18768b0a080e70d76003133cd313bf493103cebc7d6436320b7c2fe84ae7e69a9a91ff5544
+EBUILD file-5.39-r4.ebuild 3451 BLAKE2B 5671ec10d0d409f2843f39c7113c2f5c4022e55ea1bebd49f61084e0a8ffbd99bca9a8fdc6f37b34f3d6544ab724f9c94fdd992e0ca7d0fdf41dd92fb48c856b SHA512 56f4099f550aa4bacca098b29bc9adf8961ea771822446dbf63eaaf915e8be01aca662d00f09c44a36d8fe9882da661fc49c3267167e4771689efb4e323f0962
 EBUILD file-9999.ebuild 3296 BLAKE2B 6e56f6436decee04e4c97dfccbe87d5942e328b003a7898e4ae12bb8a9c8c5150c0cb4b304cc3488f6698f2b33456e2d296dddda709cc351f69d07ac95378647 SHA512 4842d01087da26426d0ebe4438e2d20da6653e258e3848f2e01b0433856a9c08258a0391b6a6455714682baab67423660570f01cdd927bd0ed3c5fb4fcd2438c
 MISC metadata.xml 381 BLAKE2B 242f4a2403d0a4c69c7ff400fdbd447bb7fb8572dc57dc05f3edd0c875da68433217bec46d43467fa03c5e9ec69616e3450635ff2662ae3ed830a138521e23ab SHA512 f69d67890ecb0b574d414c432df12f6e8d31ceb7755055683941017563da8713d07728e49cd4a7277699a97cd3ba732c946ecf5435cee94778a0d5652e7d6857
diff --git a/sys-apps/file/file-5.39-r4.ebuild b/sys-apps/file/file-5.39-r4.ebuild
index ad02729dee66..331509b85e3a 100644
--- a/sys-apps/file/file-5.39-r4.ebuild
+++ b/sys-apps/file/file-5.39-r4.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="identify a file's format by scanning binary data for patterns"
diff --git a/sys-apps/grep/Manifest b/sys-apps/grep/Manifest
index 6cc8dda53963..916213ecbeca 100644
--- a/sys-apps/grep/Manifest
+++ b/sys-apps/grep/Manifest
@@ -1,7 +1,7 @@
 DIST grep-3.4.tar.xz 1555820 BLAKE2B 4e1924d6d5eb66faca93b405cce9784d726a476f26a384c3b44375cb09f817008aeedaa701a30b6c1f21c030902d603a80ec80105b2d5d76eadf09b910d573a7 SHA512 0f1506bd19971fbdcb47a111277ca63e8ad045456f096980852fd0a61c860f29f4b369bbaaa5cbce4b0a81718e3e3274d9a078b491f2109baa9a02ce600ee206
 DIST grep-3.5.tar.xz 1586396 BLAKE2B 62c98acb29b9998e60b64cacbe82df4f03a8d8a427a060d00283506155e6acadc4d77e8b8c2fa110227715c314ac7cde38a38eff0b92eb0ec793c59ba2562ea5 SHA512 8367aa930ecf7fa5c07153666bf7991097648bd7bf4ca672e6b14e0bb806c89991ec55d2880812877761cbde1d33562f22803835d74bfcd293c2246e274306c4
 DIST grep-3.6.tar.xz 1589412 BLAKE2B 86be3af6718ea3bf29982e1618c0ea9afc135f07e452a7ac8b618b863c0754a979482d4d418e558e703e03a4afcef7818a84ebcbe119aa63cd2892ad09e1a772 SHA512 8934544a19ded61344d83ff2cab501e86f17f8ae338892e0c36c2d2d8e63c76817840a0071ef5e3fcbca9115eba8a1aae0e4c46b024e75cd9a2e3bd05f933d90
-EBUILD grep-3.4.ebuild 1483 BLAKE2B 10a274f820dc338f8058adf3c9ad76fa23faca41b695ce6749b16e0460e3bb97c071075662f5e4335030755c150f1420f96fb44383d475ac6ace57e5681ea75c SHA512 9c090efff4b3e1c81ab5867f04c20f66bf3b4d6a0bb1a7e2fc6be9623ba6fb5728e955218144ea18b06cd7ac3315bd3bd89b8a99b32b17fcd1eba0a59ba37b28
-EBUILD grep-3.5.ebuild 1485 BLAKE2B 00235fd67f3f37ad0def3d57378e2ef802c9eafa45ae442b088b7447f010f6832b7c0c4a433d88ea69d4bb04972bacce7cc116cdfef31c8c603be90d1b4a1b0d SHA512 93d066fd92d75de0829ac686424914a662e902b4ddd5a9c17b30be5209ff357edce19976df95086f571ab8f5e2eddccb235bda2588df24983005f3bcfe96b855
-EBUILD grep-3.6.ebuild 1463 BLAKE2B a6076ab22306df9fe8dbc3fe7410c6ebe4b058de8b2385c6dac4a80975c9dce16894f899bcf71d299188b083056a822660aa37a38c53dde80b5ec3e2fe876df8 SHA512 43c891dd21e1a1cd4f5e3786c0aace2591c84f2e34a86091034bc4ba4940bdc07ff0fdaef9ce310bf8e29897ad2208c38e3012c640e3f2470963645092ea92b9
+EBUILD grep-3.4.ebuild 1496 BLAKE2B 7abaf611e588c187df417df78d2b3e91d38455ee29ded09af8d7f7b5855748d9acf2b97a74a0c870e7716ed2d6ff7dc1745ea4f893cff21c75e646071e3cec73 SHA512 5dcf6ce5e50442ec490cab1f5e8ac5f68541e3b1609468c48680cffd8ba51f4bb245944763d40424e7e416b8e06f0ee0514c1c2d4510b79a2904023e464746c1
+EBUILD grep-3.5.ebuild 1498 BLAKE2B 7f7c000f1dea830b2fa231561af26bdd5e9d7f0e4ae76733620c1640f89ab72d91f47c7651350f4a78a85f7082ac0a3b19aaeb5b8255fc7652202f77587bb02c SHA512 717583a2987ee45708fe302502e1cee271ac17ad1e337c5b8928304af4392d4f673ed950aaccef19588088e85f45e2ed28922608f1c956d77a048bd0d2691dfd
+EBUILD grep-3.6.ebuild 1476 BLAKE2B f44b88f10ebb7ab4e5722fbf8e1b35d3951c450076d635cbfe9c6f028673a3553fbe0537208f79a69f152dc4cef2db7f5a1af75898b85df7786baea9c20a14a6 SHA512 841b71ddf3c9b8bffd504047082b10086b9dd6a2fff80983f2034daf36f7cabd80234106aa96cfff6fb03eb54a622fc6fa960fdb06e9e550d11f6bb025721c43
 MISC metadata.xml 327 BLAKE2B 4b377e001da15ee2ba05c41866d06eb3e9833f46b6985c38adb405842fb434bdfb49d944557787f4ed68d8e7194036d298b662973c480043ac841ff628a57f53 SHA512 394c0bd736594ec5ef916f1bd0b4b1d8b5547132bb375fe04f67da49fd0cdaec184206e8255f054b8cb5656dc5426e92a51781758cc1b6373200f31bd3152d6f
diff --git a/sys-apps/grep/grep-3.4.ebuild b/sys-apps/grep/grep-3.4.ebuild
index 89e057e1a1c1..a33a051b2f6b 100644
--- a/sys-apps/grep/grep-3.4.ebuild
+++ b/sys-apps/grep/grep-3.4.ebuild
@@ -39,7 +39,7 @@ src_prepare() {
 
 src_configure() {
 	use static && append-ldflags -static
-	# don't link against libsigsegv even when available
+	# don't link against libsigsegv even when available, bug #673524
 	export ac_cv_libsigsegv=no
 	# Always use pkg-config to get lib info for pcre.
 	export ac_cv_search_pcre_compile=$(
diff --git a/sys-apps/grep/grep-3.5.ebuild b/sys-apps/grep/grep-3.5.ebuild
index 1ddad9147b1f..c66425de5967 100644
--- a/sys-apps/grep/grep-3.5.ebuild
+++ b/sys-apps/grep/grep-3.5.ebuild
@@ -39,7 +39,7 @@ src_prepare() {
 
 src_configure() {
 	use static && append-ldflags -static
-	# don't link against libsigsegv even when available
+	# don't link against libsigsegv even when available, bug #673524
 	export ac_cv_libsigsegv=no
 	# Always use pkg-config to get lib info for pcre.
 	export ac_cv_search_pcre_compile=$(
diff --git a/sys-apps/grep/grep-3.6.ebuild b/sys-apps/grep/grep-3.6.ebuild
index 549cc796ef0d..576125c1c746 100644
--- a/sys-apps/grep/grep-3.6.ebuild
+++ b/sys-apps/grep/grep-3.6.ebuild
@@ -38,7 +38,7 @@ src_prepare() {
 
 src_configure() {
 	use static && append-ldflags -static
-	# don't link against libsigsegv even when available
+	# don't link against libsigsegv even when available, bug #673524
 	export ac_cv_libsigsegv=no
 	# Always use pkg-config to get lib info for pcre.
 	export ac_cv_search_pcre_compile=$(
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 524092bd324c..091910fab459 100644
Binary files a/sys-kernel/Manifest.gz and b/sys-kernel/Manifest.gz differ
diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 49c9984c31da..5d3d8e6a082a 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -20,8 +20,8 @@ DIST genpatches-5.11-6.base.tar.xz 294752 BLAKE2B 324b5e8647c47b3d876ebc500664af
 DIST genpatches-5.11-6.extras.tar.xz 1768 BLAKE2B c9244edc9b61c2a190c72c93a33ea45144a788b9b331af3541c05fa200e706961471472fd586f5d6ea44c38858f62d65e4fad5424e27361ba27baa49e080b3be SHA512 db9e2da16874304103103f71f87799c4c7799ee87ea6343b0603d85cefb4ff41c49309025e4c74a870d88337caf0e478a73c8d3a755ae16760f9528c8ca77de7
 DIST genpatches-5.11-7.base.tar.xz 309432 BLAKE2B 2ada3d18e2c5e55c56d00ce460083b1bcc0d4643f4ebc82a74acef6722c93c1585b9d4034692f5e332c39c0fa9a8661378e677710c5774c0a7e74bed0e0eec9f SHA512 87fa07527691a7b0c466db8625eb8892b8e7400af1f131265cb8e2e66e551f47a32d7cba9be6167d00e1f584de414bdb1409b504dad70e6139817999fb34a346
 DIST genpatches-5.11-7.extras.tar.xz 1772 BLAKE2B cdd50d5c8d837cab21d3d06a259b3db19aad9de31e592665e5274e288fa66257bb20eb6b15770732de25bf9be3b901bdc497f5fa301ec7f025de4384dd657120 SHA512 29b62027052e57645b23ba3615697195e324aca7a1af5a46fe0b1d8d2c8a170979c6713c538788577ca22dc8b0d05d4070e656172f6c9388b8ff9a027b33cb5d
-DIST genpatches-5.11-8.base.tar.xz 399768 BLAKE2B 13df51c5a4bf35b2a87a0a5ab86f94f8d2cb012db34b6bbc2fab65f4901a8066f00303408aa864cc735bfdded7ee27bebe476533edb8758b6c86b38d770f26e1 SHA512 5a0ce9facca4f5fe2d2d469e424cb35d77630151dd67733260eb759c43a549d63bf597de515403ef3ae47e020540d3aacbe52c28301288a2a4079a43c9ec4566
-DIST genpatches-5.11-8.extras.tar.xz 1772 BLAKE2B 2181060dc6ef787a5bb82d614774a576218291f822c968321744d0d81ac0b07919f9980cfb9b2f858f4551c2d84f7db9f58d6d85158cdca90454a8f17674ac4a SHA512 b507ec60456d1e95a28a4a7710df7b7187030444d21d9f65b3f5429aefd6851c31b2395ff30c76d257ab86e766d5bf7604befd3c117b624f02a77aa04ddefd04
+DIST genpatches-5.11-9.base.tar.xz 399972 BLAKE2B 20b8cd6948130ac3a1266bbae7da6cd49c4ff584c649698f8fc4a240046c443c7ba5d286e747cb89729e1e08b0d442aea0cecd51d3756cebd21b429e320ca4e6 SHA512 cbc95199c97e408c3b0e436d9257e5154d18623ab537ddcd16b9e1539d8c44c6fbe5f18d12321b89de632997afbefcaca0d9a4b2b2cab57581fef4916d209064
+DIST genpatches-5.11-9.extras.tar.xz 1772 BLAKE2B 62513783209afca2d8c5067ea6ea5196282b93b3e511af16fa0bc105e785142b97751f6938f8d37f6c0673a6349560df27745fb41c1a543e3ba45a5b7a90c069 SHA512 4d3026572d8d733f1d03f0657d45db3ad3e8058221a92868361aeca2a141ac58fddc5fd56f00823c7a89846f47a5d831465f24f5934fb9235e18734003fa3e6f
 DIST genpatches-5.4-104.base.tar.xz 3093716 BLAKE2B da8a9f572f4a22eb101a477ed2b2a81b0adaed65f1913c163b58dc958de661707733fb1e0d06e49ec342666ca0c212313d3a5fbca60c79779009b91361e23f42 SHA512 2ef214d2e4ea982c6702991519aaa183d6731f882fa59db5cc2d7832c7fcaf8de57dc2173f4a59922e5d90da2d046753b3eed609513c84c784c13d5be747303b
 DIST genpatches-5.4-104.extras.tar.xz 1768 BLAKE2B 7f335d61bd5f44cfa74ce2082259a48791ed90c21da4d05ff13c191adf1f658e68634c4cf9779274e6f775409695634ca40187754b0f9d50b406c26df26adbc4 SHA512 a8080605c59079063065d9bebc9d846ab8aab73f2f192f6c5becea2b51304a1e4d91e20d9aacd61f2cfa5b967bb8e30d620ddd60592017f308ad2f65ab7287a5
 DIST genpatches-5.4-105.base.tar.xz 3163684 BLAKE2B e11b77067fb714f827d68ca0773ae5f097a4234f89eb0ea5bb04ef6cbf39d416a676696a8a97e1473dbd36205b84e681f3b0e94dec8cdab5c111883a7f911285 SHA512 42217305887d22987bcc88565c02b4dfd864449c10726ce4e819c4b3fe8af6d2898fdd453ebfb95a45af90843000e219f5447def048ca52ac7c509219396c2cc
@@ -128,7 +128,7 @@ EBUILD gentoo-kernel-bin-5.11.4.ebuild 2677 BLAKE2B 92b909253e380e0ee1bf79916236
 EBUILD gentoo-kernel-bin-5.11.5-r1.ebuild 2541 BLAKE2B 69c1d51459d7e42055426072d98a8da3142d44143d9ef99c441b48ab4767e527cd092f1645d56397d8b5c95c48f073b99537ac08262086c287c2b60305268a7c SHA512 f3c50e8b5e6d2a05ab0d3b97637d083b532ff849e515d0ae3a1c92e4f3eba47054233876308ddcc1a72e63e9cb0a5762ae3b98a48b5245283d2dd7514b23d169
 EBUILD gentoo-kernel-bin-5.11.5.ebuild 2677 BLAKE2B 92b909253e380e0ee1bf79916236e89b71091c163f5b375fb9fb374b43552dcbb2e824611fe7c3c2eec2eca1782e70d72d8bf3a681d2d6e155abdbb76ce77d42 SHA512 a9e471d16e4ebd10326b72341d78f3280c0624936cebdd225a14a027ab577153a131bebec6c1c1bd643c393a80d36adb06bd51cad08ba1d52745bd398a01f6a0
 EBUILD gentoo-kernel-bin-5.11.6.ebuild 2677 BLAKE2B 92b909253e380e0ee1bf79916236e89b71091c163f5b375fb9fb374b43552dcbb2e824611fe7c3c2eec2eca1782e70d72d8bf3a681d2d6e155abdbb76ce77d42 SHA512 a9e471d16e4ebd10326b72341d78f3280c0624936cebdd225a14a027ab577153a131bebec6c1c1bd643c393a80d36adb06bd51cad08ba1d52745bd398a01f6a0
-EBUILD gentoo-kernel-bin-5.11.7.ebuild 2677 BLAKE2B 92b909253e380e0ee1bf79916236e89b71091c163f5b375fb9fb374b43552dcbb2e824611fe7c3c2eec2eca1782e70d72d8bf3a681d2d6e155abdbb76ce77d42 SHA512 a9e471d16e4ebd10326b72341d78f3280c0624936cebdd225a14a027ab577153a131bebec6c1c1bd643c393a80d36adb06bd51cad08ba1d52745bd398a01f6a0
+EBUILD gentoo-kernel-bin-5.11.7.ebuild 2677 BLAKE2B 36ea71e86c73f165c48bf0be61a199b287b19d8b5a24577a671c458ab58a1489d27d03390092f24cf5685f4e3ec52c7062afd39eb2ba7e3f00cf0bf13caf0c5c SHA512 7a4d3a7525feb32b33e173d469decb36eb65d61a7c0d1bc5454ad3037200fd4d8ce0bb20d421cb88edb72e6846501cb79999c58161c08166d022163b49072634
 EBUILD gentoo-kernel-bin-5.4.100-r1.ebuild 1414 BLAKE2B 302c99d5a8b257906feeab8f300da0f842307a8af759be317e32e5fc0930ca96905747c4e4fcfa78a2454c7a1e0aca9a02cc476ba7b0aecfc03fa2f9528a057f SHA512 38b3bf91391fd44b7af11feaa26f6537a55a793d05be47d7c4aaf03fe453f4afcc9501d0492c0262b9c0c86357da68569ca78da83d3874d8a71ef9930997b17e
 EBUILD gentoo-kernel-bin-5.4.100.ebuild 1293 BLAKE2B c12099f3cea4e909bb45b0387b6ae63a16fdcb5e14dfde9ab97a532c5d361480acdf7277e730ee629ed44c371a3ad582f629fc1d668416595b6a404704acd6fb SHA512 452d85bab90a81bafd7cd86560e59ffd32682f3c942a6a506fbeaa9061021e98ada32ac745b968325f8b170c764453d88ed9cbabbd079660d31bceb3c7966fb1
 EBUILD gentoo-kernel-bin-5.4.101-r1.ebuild 1414 BLAKE2B 302c99d5a8b257906feeab8f300da0f842307a8af759be317e32e5fc0930ca96905747c4e4fcfa78a2454c7a1e0aca9a02cc476ba7b0aecfc03fa2f9528a057f SHA512 38b3bf91391fd44b7af11feaa26f6537a55a793d05be47d7c4aaf03fe453f4afcc9501d0492c0262b9c0c86357da68569ca78da83d3874d8a71ef9930997b17e
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.11.7.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.11.7.ebuild
index c31025c57600..e00d3ebb8dc1 100644
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.11.7.ebuild
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.11.7.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit kernel-install toolchain-funcs
 
 MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 1 ))
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 2 ))
 BINPKG=${P/-bin/}-1
 
 DESCRIPTION="Pre-built Linux kernel with genpatches"
diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index 1155dc7c0ab1..22b37f7b3056 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -24,8 +24,8 @@ DIST genpatches-5.11-6.base.tar.xz 294752 BLAKE2B 324b5e8647c47b3d876ebc500664af
 DIST genpatches-5.11-6.extras.tar.xz 1768 BLAKE2B c9244edc9b61c2a190c72c93a33ea45144a788b9b331af3541c05fa200e706961471472fd586f5d6ea44c38858f62d65e4fad5424e27361ba27baa49e080b3be SHA512 db9e2da16874304103103f71f87799c4c7799ee87ea6343b0603d85cefb4ff41c49309025e4c74a870d88337caf0e478a73c8d3a755ae16760f9528c8ca77de7
 DIST genpatches-5.11-7.base.tar.xz 309432 BLAKE2B 2ada3d18e2c5e55c56d00ce460083b1bcc0d4643f4ebc82a74acef6722c93c1585b9d4034692f5e332c39c0fa9a8661378e677710c5774c0a7e74bed0e0eec9f SHA512 87fa07527691a7b0c466db8625eb8892b8e7400af1f131265cb8e2e66e551f47a32d7cba9be6167d00e1f584de414bdb1409b504dad70e6139817999fb34a346
 DIST genpatches-5.11-7.extras.tar.xz 1772 BLAKE2B cdd50d5c8d837cab21d3d06a259b3db19aad9de31e592665e5274e288fa66257bb20eb6b15770732de25bf9be3b901bdc497f5fa301ec7f025de4384dd657120 SHA512 29b62027052e57645b23ba3615697195e324aca7a1af5a46fe0b1d8d2c8a170979c6713c538788577ca22dc8b0d05d4070e656172f6c9388b8ff9a027b33cb5d
-DIST genpatches-5.11-8.base.tar.xz 399768 BLAKE2B 13df51c5a4bf35b2a87a0a5ab86f94f8d2cb012db34b6bbc2fab65f4901a8066f00303408aa864cc735bfdded7ee27bebe476533edb8758b6c86b38d770f26e1 SHA512 5a0ce9facca4f5fe2d2d469e424cb35d77630151dd67733260eb759c43a549d63bf597de515403ef3ae47e020540d3aacbe52c28301288a2a4079a43c9ec4566
-DIST genpatches-5.11-8.extras.tar.xz 1772 BLAKE2B 2181060dc6ef787a5bb82d614774a576218291f822c968321744d0d81ac0b07919f9980cfb9b2f858f4551c2d84f7db9f58d6d85158cdca90454a8f17674ac4a SHA512 b507ec60456d1e95a28a4a7710df7b7187030444d21d9f65b3f5429aefd6851c31b2395ff30c76d257ab86e766d5bf7604befd3c117b624f02a77aa04ddefd04
+DIST genpatches-5.11-9.base.tar.xz 399972 BLAKE2B 20b8cd6948130ac3a1266bbae7da6cd49c4ff584c649698f8fc4a240046c443c7ba5d286e747cb89729e1e08b0d442aea0cecd51d3756cebd21b429e320ca4e6 SHA512 cbc95199c97e408c3b0e436d9257e5154d18623ab537ddcd16b9e1539d8c44c6fbe5f18d12321b89de632997afbefcaca0d9a4b2b2cab57581fef4916d209064
+DIST genpatches-5.11-9.extras.tar.xz 1772 BLAKE2B 62513783209afca2d8c5067ea6ea5196282b93b3e511af16fa0bc105e785142b97751f6938f8d37f6c0673a6349560df27745fb41c1a543e3ba45a5b7a90c069 SHA512 4d3026572d8d733f1d03f0657d45db3ad3e8058221a92868361aeca2a141ac58fddc5fd56f00823c7a89846f47a5d831465f24f5934fb9235e18734003fa3e6f
 DIST genpatches-5.4-101.base.tar.xz 3089116 BLAKE2B c6e716ab8d0e98d3b3b4c492d6a516ada65f5e77d375cb9164a080aabd94311c50a222135499eef9dcad3f80b29b831a3fe015c3006178651c2136620f9079c5 SHA512 1bdd6f8f23a6151298e2e2fec493c9a2e95a1a65f4a4b6ff95598f45d4fad783da2a596c05b5582ec3d82ed8d8aaf654706da768a1b248bdae37fb08481b3dc3
 DIST genpatches-5.4-101.extras.tar.xz 1768 BLAKE2B 44b92b9c288f4f10f499e5b6d2179b44ee3418890905341703901a71b703ff99e992d6e7424521e67d3b1f80e41286c2357187c66e9b1ae7c1feef430f0ed74a SHA512 e397f970bc3b68b91f059e4b4f2d6163f8416340096b16b040eed8a5242a001db37b0fe8c1fd2a54c73bf6121aa55efa1c362b7837e930b758bc3bd33f8dce09
 DIST genpatches-5.4-102.base.tar.xz 3090460 BLAKE2B fa17228e7cfebb2c128b73682cc97f9e96a1a3c4936f98b021ae3f21a1f6a1167c357db2570902ca554b6facf27d507a0d258c4a9e9898cacde502762306c2ca SHA512 e3b7b0826115a7f7c92f5509eafe25803ea943733a8be8404a333d54ac93c607704f742ab20576517a7ac6e5467a7dfc9c2a54205a10f3fcf4af9b2557a5da0d
@@ -81,7 +81,7 @@ EBUILD gentoo-kernel-5.11.3.ebuild 2590 BLAKE2B c4b2474b3aa266eb0854c146e4d49cdf
 EBUILD gentoo-kernel-5.11.4.ebuild 2653 BLAKE2B 44d031daf8d988938a7202e49c984b53554665b83684a1168ce21e4665d99d008cf96bcc308e51b309718bd562c939205b24cdd7c5e1c9121e6e36275ebb3ed6 SHA512 59700d9bf36ae34abb9d83c4a5c91dd07308c171f609904632c7aeb2629407cf063b357f0c79d3835c899f0a5e4ee871861cc297a0c7b525d2d7bdff69994561
 EBUILD gentoo-kernel-5.11.5.ebuild 2653 BLAKE2B 44d031daf8d988938a7202e49c984b53554665b83684a1168ce21e4665d99d008cf96bcc308e51b309718bd562c939205b24cdd7c5e1c9121e6e36275ebb3ed6 SHA512 59700d9bf36ae34abb9d83c4a5c91dd07308c171f609904632c7aeb2629407cf063b357f0c79d3835c899f0a5e4ee871861cc297a0c7b525d2d7bdff69994561
 EBUILD gentoo-kernel-5.11.6.ebuild 2653 BLAKE2B 44d031daf8d988938a7202e49c984b53554665b83684a1168ce21e4665d99d008cf96bcc308e51b309718bd562c939205b24cdd7c5e1c9121e6e36275ebb3ed6 SHA512 59700d9bf36ae34abb9d83c4a5c91dd07308c171f609904632c7aeb2629407cf063b357f0c79d3835c899f0a5e4ee871861cc297a0c7b525d2d7bdff69994561
-EBUILD gentoo-kernel-5.11.7.ebuild 2653 BLAKE2B 85d4c2ca0f26041f220ea17fb775dbc0699b129a5d6367d3d1fb58652cf42d12c3b7d5321b3fd7673f7666c5d77a97cf3808888785412a923fa6e5cd94d6a5e3 SHA512 472009fc6f3a1f719202f4d45a60309964b9fce47fc5c600862815d060eb5bd755d503ef6e332cf74f2fffe1dec3ef790b6ad4e82d91da69f5af8a99315d581e
+EBUILD gentoo-kernel-5.11.7.ebuild 2653 BLAKE2B f7cb9a644d76f3c6dace7cd70e8817b6b3456d845b65b6584dd06f8c3c20aa5dd72c5dcce742ed26fa7ffafe16ba73525603daa9177f4601efed6aae5f7e996a SHA512 b1c1c5da79f5480f4b054dfb21cfcf1df8fb2e721c5b5ee1c0e9fd4d5c51b3aa9e1236729063e96c286a738e95151dde579c83432770712342bc938779d0944e
 EBUILD gentoo-kernel-5.4.100.ebuild 2761 BLAKE2B 5372389797ccad85d86d0d5f85aeebc4252ec61de616952b11a38ab92e185a939c3d7d6ca33812644cef968d4c75da52335813f67ab88949231db9704ce59084 SHA512 e25f274c6049eb8f988fe55140b6cda58b314dea3519a875256cdd09d159ea4494f706449d6b14206d08fd9438eeedb8aad9ac3024c8f4b5d41f84e6aa48aa82
 EBUILD gentoo-kernel-5.4.101.ebuild 2759 BLAKE2B 09e0829a8ebddefc5ae14ea9423034c5296a78594fb1782820a53f69c5a8f4aa80e5c9997172cf3e675f1cdbe5961eff85ee480db2accf6533624faed2f82a31 SHA512 10e415565cfd450bd42a9fd20a22eb94b6b4e507f63201d4f9b91affc5b81b27ce5fceff23840397d308c30aa4f58b59a22040616278de69a3ca89ed5445901b
 EBUILD gentoo-kernel-5.4.102.ebuild 2759 BLAKE2B 09e0829a8ebddefc5ae14ea9423034c5296a78594fb1782820a53f69c5a8f4aa80e5c9997172cf3e675f1cdbe5961eff85ee480db2accf6533624faed2f82a31 SHA512 10e415565cfd450bd42a9fd20a22eb94b6b4e507f63201d4f9b91affc5b81b27ce5fceff23840397d308c30aa4f58b59a22040616278de69a3ca89ed5445901b
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.11.7.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.11.7.ebuild
index 300367c4b234..3289e86dc48a 100644
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.11.7.ebuild
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.11.7.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit kernel-build
 
 MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 1 ))
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 2 ))
 # https://koji.fedoraproject.org/koji/packageinfo?packageID=8
 CONFIG_VER=5.11.7
 CONFIG_HASH=ee22e4872dec1ab1f08fabe765e18b945ebcc29e
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index b8304bc95d0a..e3813b0b46f1 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -82,6 +82,9 @@ DIST genpatches-5.10-25.extras.tar.xz 1772 BLAKE2B deaff4896b8ce8ea5387ea49cde3e
 DIST genpatches-5.10-26.base.tar.xz 780252 BLAKE2B d3da07e58183e25210b0a14dc5cdb4eaaa4e0ad6e6955f9e99ff06b6575af24d2710a63781fb7fb3c9f0b142c6198c0853c71ab63f3ea1ff07c4eb405fad4cb3 SHA512 c5d73387e6caa2140f1e5c48763132797d98abae0e64911f0bf1bece03440462ccc793a2ed4ae5916235b570aace12e9ba7b625cdaf71a9802956f0ad2836c1e
 DIST genpatches-5.10-26.experimental.tar.xz 17812 BLAKE2B 37a68871008d76143d14ad2ad016c68da80c48463fc7bb1d1e8bf67274fd118295686bb7dcd9b0c8cf492828d05917e8ee05ade6b813e8f64346329613c3580a SHA512 1839dd0c3621f001d9024eeb38435003032512971cc070626cc12fa30508c68a01c7ce68ff1895dc601556c2aa33c646e4be3e92536f02727be3f8717bb17958
 DIST genpatches-5.10-26.extras.tar.xz 1772 BLAKE2B d6e02010a72510e5c18b80102f2383002acf45b645c34d35b31234d6da9ad7b38ed70837bfbb3563c9c3871121ec4638bdebeaaaf225b3f3c6d50dd30ba30547 SHA512 8e1c534b5160553f0fafe542953a3f229082cf541f744038831c2aba1cc061a8ba14713155cb98245ca99e62514619ab6969bd8f61c3886d65c65b67e410ff0a
+DIST genpatches-5.10-27.base.tar.xz 862992 BLAKE2B 6b8e6bc6b1a1b9b07d6de58f38efec32272c6d5d4b01ab9761821b9ee1d45fa805c504b2a6e6755a03558138fcb098113cddb0da349a811ddfb8290b8206b451 SHA512 c9290804d54af33212bec8ef1515cc8162226a949b7043fc65c9b73261c06c61d65df1a6ba5706cf3a31d80acb659a7046c722612cd4868f1fa19e3799be8047
+DIST genpatches-5.10-27.experimental.tar.xz 17820 BLAKE2B 3f40cbb5088f808e0d1cb2520c4fd0cce9df35acbb88597f4331a540ce9c146321760abc2f36ba7838537007a024ea2912b4fb5a27bd0f999c1a595bc44fb599 SHA512 f9392abd6302860ec48db313389ec18233c445b0b0420dc4c135cfab8d7fc3c41e564885565b639de4445b5d8d596a1c019e60fd84b74f2f43782a27e534bd09
+DIST genpatches-5.10-27.extras.tar.xz 1772 BLAKE2B ef13bdf8726981575e0c123f198ae7fe93172ae6deaafad5df08e61eb57af5cb920853fa3bafd29e20433368372a11cc1c6e13fe95bff893776f5267ffeded67 SHA512 b75bbc811ae2998ad0b3a56dabe1d84437753c33b5c584c73d3c3e90af5befb91856efb331c5a3260de2c26d5669006bed8ed453374e39c125dd493b40f0abdc
 DIST genpatches-5.11-3.base.tar.xz 11280 BLAKE2B 83a975b07b3e04e19b008e5a5c4f08fa551b3558b68afb800cb3c886f782a21950d5ea1029b631a6caa2658f02e7ae819e8d8c137a076470120d94deab99e524 SHA512 0a8b19f888af853e6a12aff9d6675f7a9977fef92efa19e69c79a6325fc1626efe7aa9fec8c42ee65ba29f0757b166567679a54d0351f19ea502183e92a63ac5
 DIST genpatches-5.11-3.experimental.tar.xz 6092 BLAKE2B ac1c5aa031e99dd332c51c44c05e00460bf2d1244ab6e00179d81c941b58c97c9aef3b8dd14ebc87e3b00f2fb4a393172d17e38121898850452ec3377ce02b7c SHA512 248d5a585d8963a31e3951a0ecce5c6b0522c32df14505bb6d7ad4fa69a9e00eb4dd5c31e561f13f14dd3aeac50db9aa2c43ff8dcb10cb363eba5af386fe8788
 DIST genpatches-5.11-3.extras.tar.xz 1772 BLAKE2B 165d5928e6afc65544392186737efd1df9e1179591ef7edd85a1868971ea76016161a38a615e9e692c4515fe7fc19424a0cfd01420b5ec57a60c8d1d2d223cb7 SHA512 c74015c4e1b824c61db9e9deca6b30a839ae9a8fb5747cb6c46e2af99a9221f11bb971099554107bbfc58ea5389d96e810f9cf8e55d0bcc16a093eef941c6ec8
@@ -100,6 +103,9 @@ DIST genpatches-5.11-7.extras.tar.xz 1772 BLAKE2B cdd50d5c8d837cab21d3d06a259b3d
 DIST genpatches-5.11-8.base.tar.xz 399768 BLAKE2B 13df51c5a4bf35b2a87a0a5ab86f94f8d2cb012db34b6bbc2fab65f4901a8066f00303408aa864cc735bfdded7ee27bebe476533edb8758b6c86b38d770f26e1 SHA512 5a0ce9facca4f5fe2d2d469e424cb35d77630151dd67733260eb759c43a549d63bf597de515403ef3ae47e020540d3aacbe52c28301288a2a4079a43c9ec4566
 DIST genpatches-5.11-8.experimental.tar.xz 6440 BLAKE2B 1e519e0bf61ff2fa6bdb0e1284df5da05f659351c94a2bd333e213e01b78d7205fdb104e40a4acbb3389ff853f5f918509ddfece1b8c1c0c9ac8a581fe6410b2 SHA512 7b5992cd43406f3f49ff928d0d58424e5115cbd53fc545b505b1551c255be7814e96547407f626fee9c049da7da7d7114edea6ae83c13dadb6c448e6f563ebe9
 DIST genpatches-5.11-8.extras.tar.xz 1772 BLAKE2B 2181060dc6ef787a5bb82d614774a576218291f822c968321744d0d81ac0b07919f9980cfb9b2f858f4551c2d84f7db9f58d6d85158cdca90454a8f17674ac4a SHA512 b507ec60456d1e95a28a4a7710df7b7187030444d21d9f65b3f5429aefd6851c31b2395ff30c76d257ab86e766d5bf7604befd3c117b624f02a77aa04ddefd04
+DIST genpatches-5.11-9.base.tar.xz 399972 BLAKE2B 20b8cd6948130ac3a1266bbae7da6cd49c4ff584c649698f8fc4a240046c443c7ba5d286e747cb89729e1e08b0d442aea0cecd51d3756cebd21b429e320ca4e6 SHA512 cbc95199c97e408c3b0e436d9257e5154d18623ab537ddcd16b9e1539d8c44c6fbe5f18d12321b89de632997afbefcaca0d9a4b2b2cab57581fef4916d209064
+DIST genpatches-5.11-9.experimental.tar.xz 69292 BLAKE2B 57127ef336047d188691d72db4aba2a9c0a1016712d2e3f73ffaead6050b91575f9b35d0a26b408647d1ed6b5d2149d60b57cc5856e50382c8566a577102cfa6 SHA512 47ab02d21d542e9ac9a56682a7352af23ed90992c8961a6804fd04a366d94c2b128182f353ec0f5d9e3dd218b5dae3c280733b81b34c2a9bcbd360f8ac41e8a5
+DIST genpatches-5.11-9.extras.tar.xz 1772 BLAKE2B 62513783209afca2d8c5067ea6ea5196282b93b3e511af16fa0bc105e785142b97751f6938f8d37f6c0673a6349560df27745fb41c1a543e3ba45a5b7a90c069 SHA512 4d3026572d8d733f1d03f0657d45db3ad3e8058221a92868361aeca2a141ac58fddc5fd56f00823c7a89846f47a5d831465f24f5934fb9235e18734003fa3e6f
 DIST genpatches-5.4-105.base.tar.xz 3163684 BLAKE2B e11b77067fb714f827d68ca0773ae5f097a4234f89eb0ea5bb04ef6cbf39d416a676696a8a97e1473dbd36205b84e681f3b0e94dec8cdab5c111883a7f911285 SHA512 42217305887d22987bcc88565c02b4dfd864449c10726ce4e819c4b3fe8af6d2898fdd453ebfb95a45af90843000e219f5447def048ca52ac7c509219396c2cc
 DIST genpatches-5.4-105.experimental.tar.xz 18080 BLAKE2B d4840bc3c5d8256cb89df166bbaa9f1ed419f275348a9b88ae0c5f738df95f01f44b049f43cd70aaf85b2b7a7513cfa4bedf18ec5cf5a89c987ee511fbc7886c SHA512 9decef34bb9a5c4727a0ebbcd2d3038693589d0314baa9cd5207409f88264cf5db26402067990fa601859bb2544b0f317696a71067eed7c99c10498d8e1687a1
 DIST genpatches-5.4-105.extras.tar.xz 1772 BLAKE2B 049452ce9e48c45954a6f71218b38ff1adfea0b3e60452039687e860485dbb1e302b8d18595d64b9f2c2e3bf26d65ee747b876cbdf531745a68381b4cbf417d1 SHA512 d5b6915fc19c20fef72bcdb26a82d7e74d6c8af627d4fb50923a380514c6e505e2acd2d106f3a020a6508864d6f10451713346aeaad5d2f40088c4f36103ed5d
@@ -156,11 +162,13 @@ EBUILD gentoo-sources-5.10.20.ebuild 742 BLAKE2B c5eed799dba9dd05f4ef88d1eb88c07
 EBUILD gentoo-sources-5.10.21.ebuild 742 BLAKE2B 1f0900e3cf988818c20b340f3e254c77bf50695f590647251ad15076db1c71e35fd266358da0ef95a712d0020983048313a12f8e25d33137d9c421eb222e4772 SHA512 50d40dca1ea5d6bf33fbb17bf7a3d4e6cf324c418d7bea881ba1025ca4a2a0e2b51897f09ab1a21f81f16be2da0013d1dba696b55d695800a16f61a41490e69b
 EBUILD gentoo-sources-5.10.22.ebuild 742 BLAKE2B 28181ece1f4794457ba9063cf8d2198aea024be0e485f525f9c36ca1910fdd644d6a2add0f473ac76d03f7c9cccff00de7be39c7a3f48da0b43b71ef5b285f85 SHA512 2330be5f5b154f72a161480bda0dc7932c1e001b38e0f09ff1ee4821783ebb07e6e8762d74b18fedf2fc59ff181bf3af540bcdb79c8ef07ac549d70b58a24b28
 EBUILD gentoo-sources-5.10.23.ebuild 742 BLAKE2B 323484ece6b0c5529bc9c4c527cc6b95a86fb0dab58856cd7dfeee22cb534e7d8900cc952cc32686c2e005de367c32a654f9c7155784faf57bf61a46f594de64 SHA512 104f56f9ad60457a2af483796e215cee919987be4596dd3dd787fc130ceac256548d2941c5aed0ee0aa8175f2920d9711556b8af9326b6063c5ac4881b99c5d6
+EBUILD gentoo-sources-5.10.24.ebuild 742 BLAKE2B 573ad3143238e590acb0b65baa18c48566291c017741f1d116371543d4a91bc4342de454f393a94ac6e738a63e096fe295acb2515238f0d2ee11188bbd477f61 SHA512 b74799d8e57d8ebc6593fcc93c94aa932114f63485f0ddbdd8b7404f6bfa4ad6d7473741c5677ed62b563fa3dfcc30fc4146f148daeba9f4f61c4a54a9306146
 EBUILD gentoo-sources-5.11.2.ebuild 741 BLAKE2B 13c39d4121588e1eb4f810c40c44079e36f7831abb953f1b381cedb297f179096a6935ad3a1be13dfa2955ad233e716d74568e3b3fe4e3bbe8533856d1d9dd44 SHA512 740f502285d2c600a81d8ea51cdd877be85d480191dea6956d1c5a735d65c92d2126bf023bcd512cf849bf1027eade4efdd7c325d5c830b97d5b04679528ba59
 EBUILD gentoo-sources-5.11.3.ebuild 741 BLAKE2B 768d81f1d14b3fbd818745030a355177c89e901fac5b3b016fff6c719ef430298ff1f215fba9cc88521d38f70f41e3d83bc0fac1743d950ade9aa2150339c8be SHA512 ba1fbec8961170dbe522d56c0f2645a8b029f2700a0dfd808690808bb1bde75c3faf90e09d19fbf32e331a086829965ba6feba6895449629910d7f853978914c
 EBUILD gentoo-sources-5.11.4.ebuild 741 BLAKE2B a54555a526ed9d1d71c06bbda7e0d4b773ae59062546f900dbdd497befbdb1ee3effbcf248ed1937150cf42c78096aeb262ffaf77fe96921231cc343106df4bc SHA512 b232f171ab7308b6705ad7b5bab6214fd9f26b0de9641e5875a78246cf0b64d4f4a74937e8d1d18d1ef4da0d5994f2763fb462342ce401a8532a8b6644a27a70
 EBUILD gentoo-sources-5.11.5.ebuild 741 BLAKE2B b90925d645449a5f12006080c7661c2300c3fa0044379c96654b53f4a17be8a02315a699d4b5c692d902cc8e277ab45e0b8eefbc10d5ef65649197e5e16621bc SHA512 7b76108dc5f8cfd155d3d923906d22f611cbd2eeda27dff8865e9eead1ade3dd688e5dc97a007af45f8dc63db5ecdb104123978ca9b020b4f1a7807e54f34c3f
 EBUILD gentoo-sources-5.11.6.ebuild 741 BLAKE2B bdef5b26fab5342b4d0b0520e6cffe1fb786486b5d028fa9f7a71aff335bf0a9888a55d63661be9fc024a8938f6b83383b57441e91101d2b91b6922f28b1fd4b SHA512 8f0214f581887a2ef5a080fb011cf85ac9baab46c2b8fa15871b90f036a36fff099e839879805e9b4600c449e3cfc6cfafd766708b48a15a7a889792665d5e18
+EBUILD gentoo-sources-5.11.7-r1.ebuild 741 BLAKE2B dbb6301bac6b43e08f884c1aa6902bef8353d6c9e5e9f7222d76ebc3ea1d89f360b4b071925fac565141354f9a5fea6cdfe3961b19bce5fdcdc507e5b2445e36 SHA512 a15a14c2a712cbe3206c1cb11e6fc7e7ebb86e887cce0dba1872c597fd640fdde6bd73a56cb35bb161829b2195842f6c011844acdf6d3c4da5b487aa0358af3a
 EBUILD gentoo-sources-5.11.7.ebuild 741 BLAKE2B 13a5181db2a567cfc3612769bcadd2615cd2ce980fb5bd3b481782f47e767b850367ecafaf2a187159d74fbf17ca3c5ea97b443b9d0405c3bce3237a8d302937 SHA512 401691d121ded72ae783ce88a34ce90fb331c896543ff7c36adec17c9636815eb6047074d89847aa416d49f65d842bd0a1d593734bb3cb0554d9bf129e58be41
 EBUILD gentoo-sources-5.4.102.ebuild 736 BLAKE2B 6dfdddd1a7ec53ca8ac0a04621c5fa92257c0ce9d84a664a1c2302049aa88f6bafe134fa962f1ad20a532bda6cf2e6c9147c28143d063d8c4a8c957f425f11e7 SHA512 5df0f1a5e06ea232d7a1e7bb2c9ad2a8e94c53593db5fbcf2b03a4e84d74fad4417046fdb5977726aa893e0984c6a710ee20b387bdd75d9c7e02ade752b9c855
 EBUILD gentoo-sources-5.4.103.ebuild 736 BLAKE2B c0ef4a6d05b1391ef6d9ae0f0c9f59acc96fef63d7336aa77f2085d6dbcdeb30274a204e3767f10c6e96dedb0c2d7faced133a0c99664c49c6e8ee312be213aa SHA512 56c995460e636cf32d80f8de08d7db638cd15edaa08f017b8e233f0991bd27e06436fb01d1569dfd232f57d79281f7a4c98c98c957856ab4846b667a931acc14
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.10.24.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.10.24.ebuild
new file mode 100644
index 000000000000..067633b0bc8d
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.10.24.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="27"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.11.7-r1.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.11.7-r1.ebuild
new file mode 100644
index 000000000000..7af695b24846
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.11.7-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="9"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/pf-sources/Manifest b/sys-kernel/pf-sources/Manifest
index 9f363086502c..af732fd4b8a5 100644
--- a/sys-kernel/pf-sources/Manifest
+++ b/sys-kernel/pf-sources/Manifest
@@ -11,10 +11,12 @@ DIST pf-sources-5.10_p12.patch 5244822 BLAKE2B ca004890e20a07864e858bf1834265f12
 DIST pf-sources-5.11_p1.patch 2710131 BLAKE2B 67a3528d1c59f24af9f09bc669e736d41394041874e07ebaa68bba8393d98b6094f3c733f1f395cb0a816f418702934d7ac828fceabebcec187526ca378929f4 SHA512 0bc79a5eb093c0b072826098b78894d59bab2bb8107221c9727c4aebb839b2e4d066c2f4918614bfbf4e3af210a6d1852189303f9ebf338f2e5038f166d4dfb0
 DIST pf-sources-5.11_p2.patch 2720760 BLAKE2B db2ccb4449d6ed2d545c15ef82b99d581e462908ab2290b62119c09da93a7cf202e3a1792a1bf3afb6ae98f4c9f8ea34ef7ad7056206f3eac7daa8a7a9559f4a SHA512 1ab4748cac5a8a210a48543606c2c3e30e4528c819b4e7d7e29d992d4f9b14ae6e7219d7d96d090fc887d72887735e52dad9a8d396d775c8c32b80b01532a9ea
 DIST pf-sources-5.11_p3.patch 3932843 BLAKE2B 655d68a6cced89aeab7b71cb67d0469567201766f378371e0e6c933fb4ac48317e27c5a148dc70117550c4f09c2b8d4c7690f5f0d88754d80fe8ca9ab9bc2415 SHA512 3b1444baa42a737166c1ce7b40d616123b2df197f9f6fc3041fded977f760627603656fbb6f41c12ad008ec724d96ae81664bbaedda4f3759aec50cb5820776b
+DIST pf-sources-5.11_p4.patch 4443076 BLAKE2B 294d1eb3ec09de6c5d6011913a8d831185a424a85e3bc6d245bd3ef4fe6b50d8e2b64decf398c153435de0b24c2417a7076ae854424201ce61cfdbbdedf4565f SHA512 3a14d63039e1a3701493d17b164364ef3c9167333e16aa8202b2967eebfaab3bd0c233b1e09af44a190a86a1b5599ee339f9ae06298c77404e7f99c6f9f14df7
 DIST pf-sources-5.9_p7.patch 3027972 BLAKE2B 9247ea63b30f9d42d79303b73a900d468a71e703333932f7f15ae697cdba52c46358297023e037226c219fad5df912fb5d21e6f4b7190556ca799fa84924480e SHA512 c69e14f59bf98944b3329c65b7e2c271d74a756bc8c890130bf3cc68b4b96d31f1c33c4edb128580fcaefeb6e42dd04b1eb3d7f071b2d58bc764d26322bda8cd
 EBUILD pf-sources-5.10_p12.ebuild 1983 BLAKE2B e83387ab0da8b543b8acbea44c29e92e07c0a08d1fe7aa24b94f7aba2f7bcc153460f4c3238e939e7dfa989bee9a6167c73cff4d7c3a0582940bcdf2336ec827 SHA512 c068d8bae5b15a25de07aaf6cb14879600d4a7d30dc824cd05e97e120bad86211538c6a4e268347a1cc1d8b576863c55e61ee3198fdd16b3540701967bfad078
 EBUILD pf-sources-5.11_p1.ebuild 1983 BLAKE2B e83387ab0da8b543b8acbea44c29e92e07c0a08d1fe7aa24b94f7aba2f7bcc153460f4c3238e939e7dfa989bee9a6167c73cff4d7c3a0582940bcdf2336ec827 SHA512 c068d8bae5b15a25de07aaf6cb14879600d4a7d30dc824cd05e97e120bad86211538c6a4e268347a1cc1d8b576863c55e61ee3198fdd16b3540701967bfad078
 EBUILD pf-sources-5.11_p2.ebuild 1983 BLAKE2B e83387ab0da8b543b8acbea44c29e92e07c0a08d1fe7aa24b94f7aba2f7bcc153460f4c3238e939e7dfa989bee9a6167c73cff4d7c3a0582940bcdf2336ec827 SHA512 c068d8bae5b15a25de07aaf6cb14879600d4a7d30dc824cd05e97e120bad86211538c6a4e268347a1cc1d8b576863c55e61ee3198fdd16b3540701967bfad078
 EBUILD pf-sources-5.11_p3.ebuild 1983 BLAKE2B e83387ab0da8b543b8acbea44c29e92e07c0a08d1fe7aa24b94f7aba2f7bcc153460f4c3238e939e7dfa989bee9a6167c73cff4d7c3a0582940bcdf2336ec827 SHA512 c068d8bae5b15a25de07aaf6cb14879600d4a7d30dc824cd05e97e120bad86211538c6a4e268347a1cc1d8b576863c55e61ee3198fdd16b3540701967bfad078
+EBUILD pf-sources-5.11_p4.ebuild 1983 BLAKE2B e83387ab0da8b543b8acbea44c29e92e07c0a08d1fe7aa24b94f7aba2f7bcc153460f4c3238e939e7dfa989bee9a6167c73cff4d7c3a0582940bcdf2336ec827 SHA512 c068d8bae5b15a25de07aaf6cb14879600d4a7d30dc824cd05e97e120bad86211538c6a4e268347a1cc1d8b576863c55e61ee3198fdd16b3540701967bfad078
 EBUILD pf-sources-5.9_p7.ebuild 1958 BLAKE2B 45ad93609aef6566468c1365734aa1a42c563a0fcf87135c1f6cdec8af3c637ce3434c69e55f75ccebed12de28250b61bf15d7c2f961c1effc1dc6e03c37cad8 SHA512 b669acb26f1c7a745a99e23107b8b0cc327b3b66044f7934a962281f78bb3cc31bfc0ec3b0ee20f9180d5e9f86822febad923c9337cb552626f194bfa9fb3c9f
 MISC metadata.xml 345 BLAKE2B 26083da0607ae4e301d8dd622cd9b0016630e1e70dd6197fb8b95912578015a13da38c8434df3cebdf13f22566a132ffa9ac2ee4a32ed482cf780c55327316da SHA512 4bbc43612402fe253b02894ae6bf290ae44082c98a48d31e3d822946a8709752d3c4fb9d338fdb6779d6b421e73073c67f5f951ef423728aaa5cc18ac7958b2e
diff --git a/sys-kernel/pf-sources/pf-sources-5.11_p4.ebuild b/sys-kernel/pf-sources/pf-sources-5.11_p4.ebuild
new file mode 100644
index 000000000000..223e79a03a51
--- /dev/null
+++ b/sys-kernel/pf-sources/pf-sources-5.11_p4.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# Define what default functions to run
+ETYPE="sources"
+
+# No 'experimental' USE flag provided, but we still want to use genpatches
+K_EXP_GENPATCHES_NOUSE="1"
+
+# Just get basic genpatches, -pf patch set already includes vanilla-linux updates
+K_GENPATCHES_VER="1"
+
+# -pf already sets EXTRAVERSION to kernel Makefile
+K_NOSETEXTRAVERSION="1"
+
+# Not supported by the Gentoo security team
+K_SECURITY_UNSUPPORTED="1"
+
+# We want the very basic patches from gentoo-sources, experimental patch is
+# already included in pf-sources
+K_WANT_GENPATCHES="base extras"
+
+inherit kernel-2 optfeature
+detect_version
+
+DESCRIPTION="Linux kernel fork that includes the pf-kernel patchset and Gentoo's genpatches"
+HOMEPAGE="https://gitlab.com/post-factum/pf-kernel/-/wikis/README
+	https://dev.gentoo.org/~mpagano/genpatches/"
+SRC_URI="${KERNEL_URI}
+	https://github.com/pfactum/pf-kernel/compare/v${PV/_p*/}...v${PV/_p*/}-pf${PV/*_p/}.diff -> ${P}.patch
+	https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${PV/_p*/}-${K_GENPATCHES_VER}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/genpatches/tarballs/genpatches-${PV/_p*/}-${K_GENPATCHES_VER}.extras.tar.xz"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+S="${WORKDIR}/linux-${PVR}-pf"
+
+PATCHES=( "${DISTDIR}/${P}.patch" )
+
+K_EXTRAEINFO="For more info on pf-sources and details on how to report problems,
+	see: ${HOMEPAGE}."
+
+pkg_setup() {
+	ewarn ""
+	ewarn "${PN} is *not* supported by the Gentoo Kernel Project in any way."
+	ewarn "If you need support, please contact the pf developers directly."
+	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
+	ewarn "the ebuilds. Thank you."
+	ewarn ""
+
+	kernel-2_pkg_setup
+}
+
+src_prepare() {
+	# kernel-2_src_prepare doesn't apply PATCHES().
+	default
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+
+	elog "Optional features:"
+	optfeature "Userspace KSM helper" sys-process/uksmd
+}
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index e30d0ea3a9da..8e097fef6121 100644
Binary files a/www-client/Manifest.gz and b/www-client/Manifest.gz differ
diff --git a/www-client/links/Manifest b/www-client/links/Manifest
index ba6cca159ac5..2e09f43831d0 100644
--- a/www-client/links/Manifest
+++ b/www-client/links/Manifest
@@ -1,4 +1,6 @@
 AUX swap-echo-for-printf.patch 898 BLAKE2B a96020c7522ee0940e9371c82c6b323aeccbdb102599f04002bb1f55e2a81412a57fa59c313509f0b6e9faff498421d5208d41c8e53e68165df1778ac9757006 SHA512 83c8586ab4c335dbe8eaa7bdd0608336b954e66db7b87a6bffd07cec9a54c75b7451bd84f2e6d22f251442adf38e0c1cff98e754172f7f9d38ed3f166da518b7
 DIST links-2.21.tar.bz2 6491465 BLAKE2B a60d2fbd252b97ead45e451c1d1d16204a23e618a59016c6b46a56b7c2f96189d3d7f71e9d647f188824ad7e7c36fd8d62dac3c7125eb9cf833591a6ce3206e6 SHA512 11fd523d0aa102d8160957bdbd36674a621aeb2e33237f0df35dcc3fad92ec288acd31dc2e7542717406047165f1249d68972c77cdb27fda076645636a056da8
+DIST links-2.22.tar.bz2 6481705 BLAKE2B a6855fcc62377116fe61adb01623c0cd757ee47ae36bfb35ae657a6d6587f9e47b6b1f78ad73e3fca911ad4aee8c15f364d4af911d694f04229b107d10d6f422 SHA512 d2c9f764d64c2d73b85c998db9fc8c241556977380eef1f4041623ca306f5798227b2b57daecf09ee85e0b07f8738bdfe0b84fefc924d6e05d931e29d29ba40e
 EBUILD links-2.21.ebuild 3491 BLAKE2B f95d934992e1f5ccc13d50b83a19cc1af845d6bc0813c595e4cc3b62cca05a632f556771bf9eb98eba7858c875059585f8bc5f491821359718fea17acf8cc7f2 SHA512 03615b9eda63f9a70fd52233a6d6634049e2bf909bf7d5f844b278571926cb5176fd2ae4c01a736a5aff559ade0ce6adf371ee9cf41553e779ec716ec5a7d371
+EBUILD links-2.22.ebuild 3445 BLAKE2B 0d19c955880f7351a188da6035862735cc4fa7c455c9f224561bc17271bba46c2fe291eb4a3f39ddd0f1c6caa8d391a0ad88cac26fd38101ae25393941723ef6 SHA512 c9fd02977465f4865345fb001661b139e13575cfa21febf8500a1a72eec26842b737468a6917426ffb599c6705176aed94c5359618b99a549176464b75c78590
 MISC metadata.xml 671 BLAKE2B a27e4d153f5b73c96a6e15b21306a3d47c1df9cc9492b115d58ddcf3af8ba8b7c5b51b985c32b31fd04e88b400022f1db873063fab519792aa18c67538f0b790 SHA512 6913a9c3b54ac53235f85ef4a4ba8c370b7ffa4fd429e2a3d1a065eab96ba5e36f35b704622c9599585cdcbad43e14783ef92934c0e250bc315a3d9754aac360
diff --git a/www-client/links/links-2.22.ebuild b/www-client/links/links-2.22.ebuild
new file mode 100644
index 000000000000..bee0327268dd
--- /dev/null
+++ b/www-client/links/links-2.22.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools desktop xdg-utils
+
+DESCRIPTION="A fast and lightweight web browser running in both graphics and text mode"
+HOMEPAGE="http://links.twibright.com/"
+SRC_URI="http://${PN}.twibright.com/download/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="brotli bzip2 fbcon freetype gpm ipv6 jpeg libevent libressl livecd lzip lzma ssl suid svga tiff unicode X zlib zstd"
+
+GRAPHICS_DEPEND="media-libs/libpng:0="
+
+RDEPEND="
+	brotli? (
+		app-arch/brotli
+	)
+	bzip2? (
+		app-arch/bzip2
+	)
+	fbcon? (
+		${GRAPHICS_DEPEND}
+	)
+	freetype? (
+		media-libs/fontconfig
+		media-libs/freetype
+	)
+	gpm? (
+		sys-libs/gpm
+	)
+	jpeg? (
+		virtual/jpeg:0
+	)
+	libevent? (
+		dev-libs/libevent:0=
+	)
+	livecd? (
+		${GRAPHICS_DEPEND}
+		sys-libs/gpm
+		virtual/jpeg:0
+	)
+	lzip? (
+		app-arch/lzip
+	)
+	lzma? (
+		app-arch/xz-utils
+	)
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	svga? (
+		${GRAPHICS_DEPEND}
+		media-libs/svgalib
+	)
+	tiff? (
+		media-libs/tiff:0
+	)
+	X? (
+		${GRAPHICS_DEPEND}
+		x11-libs/libXext
+	)
+	zlib? (
+		sys-libs/zlib
+	)
+	zstd? (
+		app-arch/zstd
+	)"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	fbcon? ( virtual/os-headers )
+	livecd? ( virtual/os-headers )
+	X? ( dev-util/desktop-file-utils )"
+
+REQUIRED_USE="!livecd? ( fbcon? ( gpm ) )
+	svga? ( suid )"
+
+DOCS=( AUTHORS BRAILLE_HOWTO ChangeLog KEYS NEWS README SITES )
+
+src_prepare() {
+	use X && xdg_environment_reset
+
+	if use unicode; then
+		pushd intl > /dev/null || die
+		./gen-intl || die
+		./synclang || die
+		popd > /dev/null || die
+	fi
+
+	# error: conditional "am__fastdepCXX" was never defined (for eautoreconf)
+	sed -i \
+		-e '/AC_PROG_CXX/s:dnl ::' \
+		-e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
+		configure.in || die #467020
+
+	# Upstream configure produced by broken autoconf-2.13. This also fixes
+	# toolchain detection.
+	mv configure.in configure.ac || die
+
+	default
+	eautoreconf #131440 and #103483#c23
+}
+
+src_configure() {
+	local myconf
+
+	if use livecd; then
+		export ac_cv_lib_gpm_Gpm_Open=yes
+		myconf+=' --with-fb --with-libjpeg'
+	else
+		export ac_cv_lib_gpm_Gpm_Open=$(usex gpm)
+	fi
+
+	if use X || use fbcon || use svga || use livecd; then
+		myconf+=' --enable-graphics'
+	fi
+
+	econf \
+		--without-directfb \
+		--without-librsvg \
+		$(use_with brotli) \
+		$(use_with bzip2) \
+		$(use_with fbcon fb) \
+		$(use_with freetype) \
+		$(use_with ipv6) \
+		$(use_with jpeg libjpeg) \
+		$(use_with libevent) \
+		$(use_with lzip) \
+		$(use_with lzma) \
+		$(use_with ssl) \
+		$(use_with svga svgalib) \
+		$(use_with tiff libtiff) \
+		$(use_with X x) \
+		$(use_with zlib) \
+		$(use_with zstd) \
+		${myconf}
+}
+
+src_install() {
+	HTML_DOCS="doc/links_cal/*"
+	default
+
+	if use X; then
+		newicon Links_logo.png links.png
+		make_desktop_entry 'links -g %u' Links links 'Network;WebBrowser'
+		local d="${ED}"/usr/share/applications
+		echo 'MimeType=x-scheme-handler/http;' >> "${d}"/*.desktop || die
+		if use ssl; then
+			sed -i -e 's:x-scheme-handler/http;:&x-scheme-handler/https;:' \
+			"${d}"/*.desktop || die
+		fi
+	fi
+
+	use suid && fperms 4755 /usr/bin/links
+}
+
+pkg_postinst() {
+	use X && xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	use X && xdg_desktop_database_update
+}
diff --git a/www-client/surf/Manifest b/www-client/surf/Manifest
index d7b6df402d33..bd2f0709d574 100644
--- a/www-client/surf/Manifest
+++ b/www-client/surf/Manifest
@@ -1,6 +1,6 @@
-AUX surf-2.0-gentoo.patch 2393 BLAKE2B ba68e17f77bb631f42e477837e392008526e5786a2657370e0e9698f7e6e0862fab4780d292e5bab1a336dbffcbcde730db7474f1e11b08e98b0c54ae19ea15a SHA512 7c431dca5805eda29f68d52798f1b6bfc9df89ee342fb183241f6cf06a760ae7bb61dd6a976c2b21404edf25afae25b9696971d8a1ba0904045af2914d64a8db
+AUX surf-2.0-gentoo.patch 2395 BLAKE2B 45722d17b9ec85601d7354b7714388ca6cbc041c88e0a75bca609bffec31956bbe5567b0674f242a81eb551ecf7844f6d6ed742fe3176ccf308c743fcd2f881f SHA512 109d49f0648942781781c970be518c83c89137af6c578773da23a96b20cc922a11b5478453439d4dd22f934ad8f8a3989c2f62620a9312cfaea4753efa9ee7c2
 AUX surf-9999-gentoo.patch 1147 BLAKE2B 4766afd176d300bcf26fc7730e60344b6461133cab976fc96b9afa1a99df6189085ecc802b308df653871866971ce078b586bda5f9c124c74d9b555377174b0e SHA512 d0a50f8b396b3989827e9c2fe20d0de58ba626a2f551aafc7a776ca545f1b76c548580a1f813bcef3fc2ec2d0fe60af76036a4d9d182955a7abcd44dc7185709
 DIST surf-2.0.tar.gz 19056 BLAKE2B d9ef974ec14ce1ddf2437a43ccb0f424ada75d64ce926b19ac56f072d3589e6d251220842372f100f835ffbcccea2c402306a0c9f19f25462f5cb69fe4d7d175 SHA512 75798bb189fa2c2c93827672089a86cf155aa7b5c7c1a0887a34817ca41763907e44a02f52947535d37a043f827d2c0fe75d16a3d172079f9cab8da341e4c0c5
 EBUILD surf-2.0.ebuild 1216 BLAKE2B ac3980a08b6fd54ebb1c8424578ede2d0a1e4a911071cc62b8c506901f26453a031c4297c45d7fdae68ae391ad13c991c6df2590640cd5f77222030d9ea95b83 SHA512 a176f138ebb9779d94a94e5ff274390be1043b20cccf1130b14f8212d19c0a43063d6b34b6f7f2fc2daf9a2de4f3f52f3b80de55bb2af7ca075dc7c673ec44d1
-EBUILD surf-9999.ebuild 1241 BLAKE2B 438aad0c8a8529f4042235f8490a7b980e922b3500afbc83e2d95d144bef9a46a786abe98d09c65a6a3f056458e78f96593933a25b10c5d3bff97b9587bba9f7 SHA512 c06d268dd882efd15ea7128a4e4966f0b1ffbd9c8da3ce180f1976a469d89566bc3a7dbcdb39dcb5769b4b9feefde46358cd79a99b58f79ccef4fdaeaf28ccc5
-MISC metadata.xml 347 BLAKE2B 8787a8c0af8355eee5eaa3538dd76b5a4c6deb6de8ef90c468e343fa5ee26eb0978394e3943c841566fc600ca62f4d7324cece0f486c7f912b60da48af790db6 SHA512 e4f1adf1f17bfd24d065e8869983ec556f3438b0fcaa806125dbc0d9848102edfdd2a7d5ceb5c73987f400bfa019024cf69d9fa7a57a047c95dd60044764efdb
+EBUILD surf-9999.ebuild 1331 BLAKE2B 0181a924a03247c3a60aece43b5029702162df785c208082df610f38b8d499ba33d4824b2b5f99985f7de45dcca68028fe7dd4d1b4037fcd9cfa978acd679af0 SHA512 ffefee4fe16bd708b8c09ffe590a39553a53266797a92509df108faf495a83f6da5e509bf8a8d743dd2a29bd5f4f836f87a93256a5e1a958c12ea3b807c3ba6c
+MISC metadata.xml 463 BLAKE2B 1c11d2d7ca09b28800b060f289acb8250669d30792765d89f5afe8372150efea49317db94bd0b8ba7a40fb46c38778cfe519d4081270dc77976650b9d99417db SHA512 22d63cb756b13ed0f054a91c9c202ea71aed493f9eb41344eb80ae8fd9d6c9effd1df5d636d50021be10afec6d2f67a4982cfdfd1acc43cdcc9a276ef4d420e6
diff --git a/www-client/surf/files/surf-2.0-gentoo.patch b/www-client/surf/files/surf-2.0-gentoo.patch
index 07aa6568f55c..b0a7b5c8ef0f 100644
--- a/www-client/surf/files/surf-2.0-gentoo.patch
+++ b/www-client/surf/files/surf-2.0-gentoo.patch
@@ -29,8 +29,8 @@
  CPPFLAGS = -DVERSION=\"${VERSION}\" -DWEBEXTDIR=\"${LIBPREFIX}\" -D_DEFAULT_SOURCE
 -CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
 -LDFLAGS = -s ${LIBS}
-+CFLAGS = -std=c99 -pedantic -Wall ${INCS} ${CPPFLAGS}
-+LDFLAGS = ${LIBS}
++CFLAGS += -std=c99 -pedantic -Wall ${INCS} ${CPPFLAGS}
++LDFLAGS += ${LIBS}
  
  # Solaris
  #CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"
diff --git a/www-client/surf/metadata.xml b/www-client/surf/metadata.xml
index 5e4c14c17c06..52593948c041 100644
--- a/www-client/surf/metadata.xml
+++ b/www-client/surf/metadata.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-<use>
-<flag name="savedconfig">Without a saved config.h, this package depends on <pkg>net-misc/curl</pkg> and <pkg>x11-terms/st</pkg> for a default download mechanism</flag>
-</use>
+  <!-- maintainer-needed -->
+  <use>
+    <flag name="savedconfig">Without a saved config.h, this package depends on <pkg>net-misc/curl</pkg> and <pkg>x11-terms/st</pkg> for a default download mechanism</flag>
+    <flag name="tabbed">Install surf-open.sh script for running surf in <pkg>x11-misc/tabbed</pkg></flag>
+  </use>
 </pkgmetadata>
diff --git a/www-client/surf/surf-9999.ebuild b/www-client/surf/surf-9999.ebuild
index 8670c83e868f..d6b737a623dc 100644
--- a/www-client/surf/surf-9999.ebuild
+++ b/www-client/surf/surf-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,6 +12,7 @@ EGIT_BRANCH="surf-webkit2"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS=""
+IUSE="tabbed"
 
 COMMON_DEPEND="
 	app-crypt/gcr[gtk]
@@ -33,6 +34,7 @@ RDEPEND="
 		x11-apps/xprop
 		x11-terms/st
 	)
+	tabbed? ( x11-misc/tabbed )
 "
 PATCHES=(
 	"${FILESDIR}"/${PN}-9999-gentoo.patch
@@ -62,5 +64,9 @@ src_prepare() {
 src_install() {
 	default
 
+	if use tabbed; then
+		dobin surf-open.sh
+	fi
+
 	save_config config.h
 }
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 9eee0726b442..450a7f985eaf 100644
Binary files a/x11-wm/Manifest.gz and b/x11-wm/Manifest.gz differ
diff --git a/x11-wm/muffin/Manifest b/x11-wm/muffin/Manifest
index 1340250ce570..67df17a99496 100644
--- a/x11-wm/muffin/Manifest
+++ b/x11-wm/muffin/Manifest
@@ -1,5 +1,6 @@
+AUX muffin-4.8.1-slibtool.patch 6241 BLAKE2B be4f0ed369f5f500201d4ae22238f67deff1e1e14cc4725c408253c3ce120dfe02b5f9c30ca6505cc3c6611af88daa3a74f6606f74923cb3c00c92ffd89d700e SHA512 85b986cfcdd0daa06cc5ee95cf23c6f0b2957080dc726fec840581227d154583f5a928157554830dad3c80cd87a82d1312d72c650c7764a1fe3e93fd5d37c9a4
 DIST muffin-4.6.3.tar.gz 5196072 BLAKE2B 1b8c0eeab13c35fc0b66898328f378331cb2bfc78b27a48a8f9e22c842df1a223613f27f5b29fe28c1edaaeb59972262024ed656dfabafa6c9454c4c4c0a74b9 SHA512 c07d83656d3a9164ad488b500f98acb88e0c8e2374af858776ff27dbe90880db4310405505d79539222ba3b4ddedb22934ef3e0f1f6198dc7b36986b784b48f5
 DIST muffin-4.8.1.tar.gz 5195618 BLAKE2B 33dbbf7231b8f8d5c7df23d6cf8ddb29a86caca7b8c3b4af1231c98e114ee797d1c6bc866574348fcabaa65a93ff95c80366329bd5a41a46a74ba53ba81ce545 SHA512 61b621c7a4e25fc8ac69f2f5182e2caf52dfcfd456154f3b91ebb8b126319e704acd927ab5abe9e19ff057f38002a3b7e322e8d411db21e0fee7ec19d7928d31
 EBUILD muffin-4.6.3.ebuild 2204 BLAKE2B a5c62fdb96cce1b9b3ba424c801caab4cec0fbc70abf42c8f425e56a6afc5fd27ddf9834a74b75d9ccfc908728b202da318afe6434f62ff2fbc873972bd3028d SHA512 1a3af4ecd5b38aba64ab9f7d802e615d8c8080b59577e51b9c1197d4863f257133a90af97f7bc1308d1d7958fa3ca365366201dd8e9c2036c676d6d8e32aee36
-EBUILD muffin-4.8.1.ebuild 2338 BLAKE2B 9f88d9f356e4cc3033836d2c659575b82f477fa178fb1dc473d445d1e6b7407441aa268e4a76a590f0a0709d4dad14668eeecc52a71cf199b3a32c3fb25b5682 SHA512 27d26ae3fea92ef20a89e7d9503d31a0c3128776292b31d5b80b3f510e566fc023565806d3753587594581de2f7aaa95ef6784a172a10d442c56a14ec01cfb8d
+EBUILD muffin-4.8.1.ebuild 2393 BLAKE2B a133ddfaf9af27c6c5dac92cc6b5664214cbe75c2299f724a6eeccc178391d0469664f5c2d54d955003f01e2f8139d6e56d256786bfd1ebcf794e3e4be2968e8 SHA512 c810f6f0aeacccb32f2b5d4e1dc512a455191832e2b4a19a4b693c71c7144f8608f71a088ce7a22ae5143c026ccbb8ad6c798697fe51563457b787f884e8611f
 MISC metadata.xml 485 BLAKE2B 9c98a549cc02d9f3406afb6677215d183d8b8a78bfaaf322d1094d976352bc7f7bc361d3dbdb2ec935cecf991bec6b43cc869e4a6f61b88913c7643aa2d3d6fd SHA512 901c002088995674a0b3ef67d2558ea63bc1989c6ee459bb0bc074edd7a3e20d09284f8e76d87a4609bda6342586a1022e16caa61fbe5d4db8ba0024922c8998
diff --git a/x11-wm/muffin/files/muffin-4.8.1-slibtool.patch b/x11-wm/muffin/files/muffin-4.8.1-slibtool.patch
new file mode 100644
index 000000000000..65f70b22023d
--- /dev/null
+++ b/x11-wm/muffin/files/muffin-4.8.1-slibtool.patch
@@ -0,0 +1,146 @@
+https://github.com/linuxmint/muffin/pull/577
+https://bugs.gentoo.org/767139
+
+From c10ab2d741cf4bbeff8f40f6859c9381606dbf26 Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Mon, 25 Jan 2021 22:30:35 -0800
+Subject: [PATCH 1/2] build: Add missing libtool depedencies.
+
+This fixes the build with slibtool.
+---
+ clutter/clutter/Makefile.am | 18 +++++++++++++++---
+ src/Makefile.am             |  9 +++++++--
+ 2 files changed, 22 insertions(+), 5 deletions(-)
+
+diff --git a/clutter/clutter/Makefile.am b/clutter/clutter/Makefile.am
+index a6366f4f2..ecfa568b7 100644
+--- a/clutter/clutter/Makefile.am
++++ b/clutter/clutter/Makefile.am
+@@ -666,7 +666,11 @@ Clutter-@MUFFIN_PLUGIN_API_VERSION@.gir: libmuffin-clutter-@MUFFIN_PLUGIN_API_VE
+ 
+ Clutter_@MUFFIN_PLUGIN_API_VERSION@_gir_NAMESPACE = Clutter
+ Clutter_@MUFFIN_PLUGIN_API_VERSION@_gir_VERSION = @MUFFIN_PLUGIN_API_VERSION@
+-Clutter_@MUFFIN_PLUGIN_API_VERSION@_gir_LIBS = libmuffin-clutter-@MUFFIN_PLUGIN_API_VERSION@.la
++Clutter_@MUFFIN_PLUGIN_API_VERSION@_gir_LIBS = \
++	libmuffin-clutter-@MUFFIN_PLUGIN_API_VERSION@.la \
++	$(top_builddir)/../cogl/cogl/libmuffin-cogl-@MUFFIN_PLUGIN_API_VERSION@.la \
++	$(top_builddir)/../cogl/cogl-pango/libmuffin-cogl-pango-@MUFFIN_PLUGIN_API_VERSION@.la \
++	$(top_builddir)/../cogl/cogl-path/libmuffin-cogl-path-@MUFFIN_PLUGIN_API_VERSION@.la
+ Clutter_@MUFFIN_PLUGIN_API_VERSION@_gir_FILES = \
+ 	$(clutter_include_HEADERS) \
+ 	$(clutter_deprecated_HEADERS) \
+@@ -687,7 +691,11 @@ Cally-@MUFFIN_PLUGIN_API_VERSION@.gir: Makefile Clutter-@MUFFIN_PLUGIN_API_VERSI
+ 
+ Cally_@MUFFIN_PLUGIN_API_VERSION@_gir_NAMESPACE = Cally
+ Cally_@MUFFIN_PLUGIN_API_VERSION@_gir_VERSION = @MUFFIN_PLUGIN_API_VERSION@
+-Cally_@MUFFIN_PLUGIN_API_VERSION@_gir_LIBS = libmuffin-clutter-@MUFFIN_PLUGIN_API_VERSION@.la
++Cally_@MUFFIN_PLUGIN_API_VERSION@_gir_LIBS = \
++	libmuffin-clutter-@MUFFIN_PLUGIN_API_VERSION@.la \
++	$(top_builddir)/../cogl/cogl/libmuffin-cogl-@MUFFIN_PLUGIN_API_VERSION@.la \
++	$(top_builddir)/../cogl/cogl-pango/libmuffin-cogl-pango-@MUFFIN_PLUGIN_API_VERSION@.la \
++	$(top_builddir)/../cogl/cogl-path/libmuffin-cogl-path-@MUFFIN_PLUGIN_API_VERSION@.la
+ Cally_@MUFFIN_PLUGIN_API_VERSION@_gir_FILES = $(cally_sources_h) $(cally_sources_c)
+ Cally_@MUFFIN_PLUGIN_API_VERSION@_gir_CFLAGS = $(AM_CPPFLAGS) $(CLUTTER_CFLAGS)
+ Cally_@MUFFIN_PLUGIN_API_VERSION@_gir_SCANNERFLAGS = \
+@@ -702,7 +710,11 @@ ClutterX11-@MUFFIN_PLUGIN_API_VERSION@.gir: Makefile Clutter-@MUFFIN_PLUGIN_API_
+ 
+ ClutterX11_@MUFFIN_PLUGIN_API_VERSION@_gir_NAMESPACE = ClutterX11
+ ClutterX11_@MUFFIN_PLUGIN_API_VERSION@_gir_INCLUDES = xlib-2.0
+-ClutterX11_@MUFFIN_PLUGIN_API_VERSION@_gir_LIBS = libmuffin-clutter-@MUFFIN_PLUGIN_API_VERSION@.la
++ClutterX11_@MUFFIN_PLUGIN_API_VERSION@_gir_LIBS = \
++	libmuffin-clutter-@MUFFIN_PLUGIN_API_VERSION@.la \
++	$(top_builddir)/../cogl/cogl/libmuffin-cogl-@MUFFIN_PLUGIN_API_VERSION@.la \
++	$(top_builddir)/../cogl/cogl-pango/libmuffin-cogl-pango-@MUFFIN_PLUGIN_API_VERSION@.la \
++	$(top_builddir)/../cogl/cogl-path/libmuffin-cogl-path-@MUFFIN_PLUGIN_API_VERSION@.la
+ ClutterX11_@MUFFIN_PLUGIN_API_VERSION@_gir_FILES = $(x11_introspection)
+ ClutterX11_@MUFFIN_PLUGIN_API_VERSION@_gir_CFLAGS = $(AM_CPPFLAGS) $(CLUTTER_CFLAGS)
+ ClutterX11_@MUFFIN_PLUGIN_API_VERSION@_gir_SCANNERFLAGS = \
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 9cb3af14e..37274a4bd 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -277,7 +277,12 @@ Meta-$(api_version).gir: libmuffin.la
+ @META_GIR@_INCLUDES = GObject-2.0 CDesktopEnums-3.0 Gdk-3.0 Gtk-3.0 Cogl-$(MUFFIN_PLUGIN_API_VERSION) Clutter-$(MUFFIN_PLUGIN_API_VERSION) xlib-2.0 xfixes-4.0
+ @META_GIR@_PACKAGES = gtk+-3.0
+ @META_GIR@_CFLAGS = $(AM_CPPFLAGS)
+-@META_GIR@_LIBS = libmuffin.la
++@META_GIR@_LIBS = \
++	libmuffin.la \
++	$(top_builddir)/clutter/clutter/libmuffin-clutter-@MUFFIN_PLUGIN_API_VERSION@.la \
++	$(top_builddir)/cogl/cogl/libmuffin-cogl-@MUFFIN_PLUGIN_API_VERSION@.la \
++	$(top_builddir)/cogl/cogl-pango/libmuffin-cogl-pango-@MUFFIN_PLUGIN_API_VERSION@.la \
++	$(top_builddir)/cogl/cogl-path/libmuffin-cogl-path-@MUFFIN_PLUGIN_API_VERSION@.la
+ @META_GIR@_FILES =				\
+ 	muffin-enum-types.h			\
+ 	$(libmuffininclude_base_headers)	\
+@@ -383,4 +388,4 @@ install-exec-local:
+ 	      { rm -f libmuffin-$$lib-0.so && ln -s muffin/libmuffin-$$lib-0.so libmuffin-$$lib-0.so; }; \
+ 	    } \
+ 	  ) ; \
+-	done
+\ No newline at end of file
++	done
+
+From 0762515b658b6331c076603340ce572c002f9458 Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Mon, 25 Jan 2021 22:30:44 -0800
+Subject: [PATCH 2/2] build: Fix undefined references with slibtool.
+
+---
+ Makefile.am                        | 2 +-
+ src/Makefile.am                    | 2 +-
+ src/compositor/plugins/Makefile.am | 9 ++++++---
+ 3 files changed, 8 insertions(+), 5 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index cf8382b67..c5d589ff7 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,5 +1,5 @@
+ 
+-SUBDIRS=cogl clutter src po doc data
++SUBDIRS=cogl clutter src src/compositor/plugins po doc data
+ 
+ EXTRA_DIST = HACKING MAINTAINERS rationales.txt
+ 
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 37274a4bd..b75b1879f 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -3,7 +3,7 @@
+ 
+ lib_LTLIBRARIES = libmuffin.la
+ 
+-SUBDIRS=wm-tester tools compositor/plugins
++SUBDIRS=wm-tester tools
+ 
+ NULL =
+ 
+diff --git a/src/compositor/plugins/Makefile.am b/src/compositor/plugins/Makefile.am
+index 09ab325a5..241b514c3 100644
+--- a/src/compositor/plugins/Makefile.am
++++ b/src/compositor/plugins/Makefile.am
+@@ -2,9 +2,9 @@
+ pkglibdir=@MUFFIN_PLUGIN_DIR@
+ 
+ AM_CPPFLAGS= \
+-  $(WARN_CFLAGS) \
++	$(WARN_CFLAGS) \
+ 	$(MUFFIN_CFLAGS) \
+-  -I$(top_builddir)/src						\
++	-I$(top_builddir)/src						\
+ 	-I$(top_srcdir)/src						\
+ 	-I$(top_srcdir)/cogl						\
+ 	-I$(top_builddir)/cogl						\
+@@ -27,7 +27,10 @@ AM_CPPFLAGS= \
+ default_la_CFLAGS   = $(WARN_CFLAGS) -fPIC
+ default_la_SOURCES  = default.c
+ default_la_LDFLAGS  = $(WARN_LDFLAGS) -module -avoid-version -no-undefined
+-default_la_LIBADD   = $(CLUTTER_LIBS)
++default_la_LIBADD   = \
++	$(CLUTTER_LIBS) \
++	$(top_builddir)/src/libmuffin.la \
++	$(top_builddir)/clutter/clutter/libmuffin-clutter-@MUFFIN_PLUGIN_API_VERSION@.la
+ 
+ pkglib_LTLIBRARIES = default.la
+ 
diff --git a/x11-wm/muffin/muffin-4.8.1.ebuild b/x11-wm/muffin/muffin-4.8.1.ebuild
index 28b45d8ec772..2e14e5cfece0 100644
--- a/x11-wm/muffin/muffin-4.8.1.ebuild
+++ b/x11-wm/muffin/muffin-4.8.1.ebuild
@@ -61,6 +61,10 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.8.1-slibtool.patch
+)
+
 src_prepare() {
 	default
 	eautoreconf
diff --git a/xfce-extra/Manifest.gz b/xfce-extra/Manifest.gz
index 3da4662df9a1..17dcbd007a7c 100644
Binary files a/xfce-extra/Manifest.gz and b/xfce-extra/Manifest.gz differ
diff --git a/xfce-extra/xfdashboard/Manifest b/xfce-extra/xfdashboard/Manifest
index a547ca7a5273..84ec74ccf45a 100644
--- a/xfce-extra/xfdashboard/Manifest
+++ b/xfce-extra/xfdashboard/Manifest
@@ -1,7 +1,9 @@
 DIST xfdashboard-0.8.0.tar.bz2 3341109 BLAKE2B 8787bd5069d8c4781c1b728e051e344dab227c847faf0762595079556a206b61ba4e6e45cc967f0f7267b41125bee62ff5fdf05cbbc7b3663fa785ad1fdddc16 SHA512 3bbddf079f129c8f32b764f61c75cc4efac52dff752375bdafd5537ad9c9435a5b12ead51176a684fca8fdc24f5bf44d774d8d3d6eae6942b266e1d0e4e89d62
 DIST xfdashboard-0.8.1.tar.bz2 3365273 BLAKE2B 1ab93a684f680a813fa32ca0ef610835d17aa9a854fc114298762abf92ac82f49a026ce123dacd03966667ea64ff31b05396faf94db4ea5f4ffb63e8a8f1b016 SHA512 235b5e0c4b9fd58a8b0078e4a5432ed84366865d8db0a248d377a593d31304fe68d48138c1dd9408abc02ed59b24542d5debaee3288a5fa0bf080e84632bf2fb
 DIST xfdashboard-0.9.0.tar.bz2 3331542 BLAKE2B 2155035082fe9948ae6fbc484dd09fbf748183e09d62911e7b63348884ce6e0fdd5fdd5abbe32db93be8499fbf2ebe38c3e5c81c2a3dad828f944819b69b52c9 SHA512 f13a58c781349f9c9e1d027cebfcb2828a4c646eaf16743bb20342c5681f29248d6d6193991bd890a931bb5db2713d89c507a18f4c50c48fa68b239db9f52ca0
+DIST xfdashboard-0.9.1.tar.bz2 3341851 BLAKE2B 6e2c06b59798d578ecfee99c03be40b66377012d44d9fd463de8f92ed47ce7e44c390767ac87fe50f19b903dc5c34c698b547da30a392d8053f4674a53613f29 SHA512 676b138633b519d3af9bc9b7597a0d3f5464826b190076cc146bb7c739b275c56eb5c0b912fc7f700eb9de01e1457dec814790b4c3575ee9b675a31ad675f249
 EBUILD xfdashboard-0.8.0.ebuild 970 BLAKE2B 9fb26980d359fc3f2b4516f50e9be9491508614b6b724b9f73e20a3adfa8277228e8a82340061390eb98386ec8a526ee2987f42addc2f865fa89340dafa57d2e SHA512 0d18609b5468352be4ace3cce3593003c141532e60ef7bbce888e5e828af515614ce66f75f93f0202bd1bc7a875c22652672ec7d043806cf78ab5fbc8396872b
 EBUILD xfdashboard-0.8.1.ebuild 972 BLAKE2B 99387be39b24da3f830f9cbde0520f75bd46595758fe5285ada54fade9ad0a43f68d45c9f7cccb69e43dd8563a9a354149b3feb583ccd952bc97a5f6b9304206 SHA512 f71c08bbe00da1674137f83a5182ba551cb99e0957880d8aff4d5b178ce68c9c39ebeece538eecc12ff4d25bfd92da5e2a6a237c5d74d15c65bd52140ff56603
 EBUILD xfdashboard-0.9.0.ebuild 972 BLAKE2B 99387be39b24da3f830f9cbde0520f75bd46595758fe5285ada54fade9ad0a43f68d45c9f7cccb69e43dd8563a9a354149b3feb583ccd952bc97a5f6b9304206 SHA512 f71c08bbe00da1674137f83a5182ba551cb99e0957880d8aff4d5b178ce68c9c39ebeece538eecc12ff4d25bfd92da5e2a6a237c5d74d15c65bd52140ff56603
+EBUILD xfdashboard-0.9.1.ebuild 972 BLAKE2B 5146e0494dfd67a7b7097921275752dc4d0960ed6040b98991fba1ca80a9d344bf861384475a4d34eb6c860d42df9ecee8ecf8dbfebce3d989911cc8e1b52233 SHA512 41929be5dfefc7ac71fcf505daccea02ecd234542dea29485a1e891cd2eb66ffd953026a884e1f5c3136870f43872996b9964780277dc5be5085537f32134609
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-extra/xfdashboard/xfdashboard-0.9.1.ebuild b/xfce-extra/xfdashboard/xfdashboard-0.9.1.ebuild
new file mode 100644
index 000000000000..1d0bea1ef308
--- /dev/null
+++ b/xfce-extra/xfdashboard/xfdashboard-0.9.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg-utils
+
+DESCRIPTION="Maybe a GNOME shell like dashboard for the Xfce desktop environment"
+HOMEPAGE="https://goodies.xfce.org/projects/applications/xfdashboard/start"
+SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2.38:2
+	>=x11-libs/gtk+-3.2:3
+	>=media-libs/clutter-1.12:1.0=[gtk]
+	>=x11-libs/libwnck-3:3=
+	x11-libs/libX11:=
+	x11-libs/libXcomposite:=
+	x11-libs/libXdamage:=
+	x11-libs/libXinerama:=
+	>=xfce-base/garcon-0.2.0:=
+	>=xfce-base/libxfce4ui-4.10:=
+	>=xfce-base/libxfce4util-4.10:=
+	>=xfce-base/xfconf-4.14:="
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/intltool
+	virtual/pkgconfig"
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}