gentoo new year resync : 01.01.2021

23 files changed, 636 insertions, 403 deletions

diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 59c689e0143b..a7af39dfd041 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/elinks/Manifest b/www-client/elinks/Manifest
index 63af33d3899c..54f802c0c233 100644
--- a/www-client/elinks/Manifest
+++ b/www-client/elinks/Manifest
@@ -2,7 +2,7 @@ AUX elinks-0.13.4-ruby-gcc10.patch 337 BLAKE2B 4b01f5cd0c311dca3dbc939157e9cb14b
 AUX elinks-9999-parallel-make.patch 1620 BLAKE2B d3b345813b9c9c82a93f2709036d9ae63f8014b6ff50d96f5534d1c08a0eaf73825da5cf1605d8a0997c6bd659b621b8f174a555f1adc026823fd2f87196eadb SHA512 bdd612c1ce226115170e97d70519b5ec4816d8469e0cd31ec66000b603c92913645f2b57eca9f030b90af811e43db5647928d27f7bc3a8c06560be40a8063248
 DIST elinks-0.13.4.tar.gz 3594672 BLAKE2B 67a44c05a24c200f7b472c6e7c3d0f0966c820ff6d7837ec2cf60e985f5b64cdd63f67103fcc897c293867174cf7162178c2b4af2ec2fdc261b130907cd7f8f7 SHA512 028ed8e6c00de5c65cde80b2e2c42a6568696d277dc8e5645130377d7bb5a3f6adacbea626b6e19ae3e756eb40b4dca5d642839d57943c1a04eb1fe65aa98fe6
 DIST elinks-0.13.5.tar.gz 3600196 BLAKE2B e1e51674b5630d6dab3de3030aee671876750fc97808bf4dca50b505fa2c31af669c4c3773b3830186fb98acda5c692ff1902c6e1240251ea699103a70bb4e43 SHA512 786f6142c03bca4a47a1043ca4f9c36aab431d192eb13bcad14c1da391f5746779a8f65e53eb781dff79f619ceb3ed30ef939eae8d81f64251fad9b803c0ae7b
-EBUILD elinks-0.13.4-r1.ebuild 3779 BLAKE2B 5b30e6086b17eb7bd0696b1f3fbb277cc297730d396f13a0d709098323cd50bc3e284598941cc605598baae41eb3012f7e4e2d385758020b5c3fb69052d20cb6 SHA512 d283ed9034e413d565714558d1c906529352a8c77a8cd71f8449de4ddbd07f9457531c0b88af71d11face66cb2527aa10676070a8995ef5b5db3885578a2b54a
+EBUILD elinks-0.13.4-r1.ebuild 3780 BLAKE2B 3e444c3bc551c32cb41e12a680a4f605bea31ccb3bcb74136f26e553abf41a00b928305d44e80d943a564d52dcdf17b6fa7dd1b1e8c877f5033f25dd12f3ccd7 SHA512 2cf51c918f1532f16610148df9aa0db3bd59070a24364ab5e0fa245c505bb0158b06e2c2f9a9d264a22c8cfa02a84b2d0da751d59ebfd3836a97f86ce7e8a9f9
 EBUILD elinks-0.13.5-r100.ebuild 3870 BLAKE2B 43123c6cade590002c21091603edea982b7f1a3cb58b01f9fc4c270f9b61016a2eb8ec6d2c698b595d2e4a48faf42fd734f49b414ed4dde523426d311b63fcb8 SHA512 91e877d2193a439e6b325cc91778710135c4be5d0afd3869dec1eccc38c1f4f0b829ca4bbd512216aadb4a3c423dc2d1167e46166b32e867c11e28440d335e5b
 EBUILD elinks-0.13.5.ebuild 3797 BLAKE2B 82f8e655e14a8fe41a711668c533f4d9257890c87cf628c7c40713ee7f2848bc27ec46915197a866acdb1c9d541b9b9475249867adaf61bd688c99537016a1b8 SHA512 083cd1dc993c752c184f63b0332bbddaba1736dd295ca470efe07576107579240a31b54015c0eb12565a7df50d39a52a67d93b23056e78b3156cb737a8583822
 EBUILD elinks-9999.ebuild 3693 BLAKE2B 9ff813506cb2e0f251b0783c3b9bd3ecc9887c8048d890ae51a798dcfce765536b9c384ea61b0a91f0f6f5d892656617114353ee20795513d914d7b01c732aee SHA512 eb697d53cdc9e053709631f26ca48813014f0ac22b94c5ef52ba670fb6c58c4e74f90be804c135ac68fb58aa3bfcc80c455e1f8d50b7f970fc8b4b994878514e
diff --git a/www-client/elinks/elinks-0.13.4-r1.ebuild b/www-client/elinks/elinks-0.13.4-r1.ebuild
index 11660c2e694f..97ce5b248f5a 100644
--- a/www-client/elinks/elinks-0.13.4-r1.ebuild
+++ b/www-client/elinks/elinks-0.13.4-r1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/felinks-${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="bittorrent brotli bzip2 debug finger ftp gopher gnutls gpm guile idn ipv6
 	javascript libressl lua +mouse nls nntp perl ruby samba ssl tre unicode X xml zlib"
 
diff --git a/www-client/links/Manifest b/www-client/links/Manifest
index 23587b4fb862..601c126523d3 100644
--- a/www-client/links/Manifest
+++ b/www-client/links/Manifest
@@ -1,7 +1,4 @@
 AUX swap-echo-for-printf.patch 898 BLAKE2B a96020c7522ee0940e9371c82c6b323aeccbdb102599f04002bb1f55e2a81412a57fa59c313509f0b6e9faff498421d5208d41c8e53e68165df1778ac9757006 SHA512 83c8586ab4c335dbe8eaa7bdd0608336b954e66db7b87a6bffd07cec9a54c75b7451bd84f2e6d22f251442adf38e0c1cff98e754172f7f9d38ed3f166da518b7
-DIST links-2.20.2.tar.bz2 6474383 BLAKE2B c69c421a85114b3dc0d7f2b37ce5454655b426ea9463c80e4a826f02374c0740d963251b4e9ed6c960dcad15403511c33f3a2e199a728e8f5425a359963bd102 SHA512 82be459856f49f45c9b824589b78c0f58b039b09802e077420053e9449bc1ded272bb8ad57ea10522d8b3305ceb212a5dd08b01052538cd5b4f0447d0ba02152
 DIST links-2.21.tar.bz2 6491465 BLAKE2B a60d2fbd252b97ead45e451c1d1d16204a23e618a59016c6b46a56b7c2f96189d3d7f71e9d647f188824ad7e7c36fd8d62dac3c7125eb9cf833591a6ce3206e6 SHA512 11fd523d0aa102d8160957bdbd36674a621aeb2e33237f0df35dcc3fad92ec288acd31dc2e7542717406047165f1249d68972c77cdb27fda076645636a056da8
-EBUILD links-2.20.2-r1.ebuild 3523 BLAKE2B c274db743c6eb206a7576800b5a86d60568d456488b550b6b1977844fd4ec9768e423af9c2ecefca7c75508021289a6c948a819eae7766f5af30d75090d861b9 SHA512 1994bd36ddfa75cb55b093acb0bb3b36b282634c1f65842c4bcc9a64d76c295ae988fb714a5ea278661b898d2509f5b39f98c421c10c663c1b1db81c5e1eab5c
-EBUILD links-2.20.2.ebuild 3414 BLAKE2B 1cb7231e2c4b73d134f0e4109b57d340311e32196c3cefd8f2fd50bea8af94f18946bfb3bfbb510e05d94ec122bd06070b35ef38525645665bd29c9720dae013 SHA512 7c493d283ec1a272b8f85e8bfc60c68f1e501aac5507882626effa974904de8aa8bccc3f87d71516ebf202e29257ba6c0cfb7d95663fb13696d4a648a6c5234a
-EBUILD links-2.21.ebuild 3521 BLAKE2B ffe9e1eeeca13c18b4cc13b35b94e512e77c719a49e9b4b9616f8624db221f7681bda7ec4d0c0d85f995e5a4ce10072c3d073b223d04fa21dd6cb04bf87e1e3b SHA512 fe080499cf28d1ef860a486a523a93e2e45baf9cda650ca282e5ab6e009d73e05dfc7e864660811961fae66440975c9b175479e9241d624ad104c7edad6266f5
+EBUILD links-2.21.ebuild 3502 BLAKE2B 7ec6a93470ab9d128686be953c18f2efd7015a1e6319d94fe85dfe80cf71941f0f87f83669c4f8058b494aa692f7b5df0fbf20f425f5e621f44182d2c2b64317 SHA512 e611512fe38bae1343d7a6376932063f36e79a91142525d198dafb9c76e74bd6605245d82a5411dfdcd86e85bc31c55c14d783cd5cb7efe0649d98784ea43f3e
 MISC metadata.xml 671 BLAKE2B a27e4d153f5b73c96a6e15b21306a3d47c1df9cc9492b115d58ddcf3af8ba8b7c5b51b985c32b31fd04e88b400022f1db873063fab519792aa18c67538f0b790 SHA512 6913a9c3b54ac53235f85ef4a4ba8c370b7ffa4fd429e2a3d1a065eab96ba5e36f35b704622c9599585cdcbad43e14783ef92934c0e250bc315a3d9754aac360
diff --git a/www-client/links/links-2.20.2-r1.ebuild b/www-client/links/links-2.20.2-r1.ebuild
deleted file mode 100644
index 0c528094f163..000000000000
--- a/www-client/links/links-2.20.2-r1.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2020 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 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 )
-
-PATCHES=( "${FILESDIR}/swap-echo-for-printf.patch" )
-
-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/links/links-2.20.2.ebuild b/www-client/links/links-2.20.2.ebuild
deleted file mode 100644
index 73c6ea3e019c..000000000000
--- a/www-client/links/links-2.20.2.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools desktop xdg
-
-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 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 )"
-
-REQUIRED_USE="!livecd? ( fbcon? ( gpm ) )
-	svga? ( suid )"
-
-DOCS=( AUTHORS BRAILLE_HOWTO ChangeLog KEYS NEWS README SITES )
-
-src_prepare() {
-	xdg_src_prepare
-
-	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
-	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_preinst() {
-	use X && xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	use X && xdg_pkg_postinst
-}
-
-pkg_postrm() {
-	use X && xdg_pkg_postrm
-}
diff --git a/www-client/links/links-2.21.ebuild b/www-client/links/links-2.21.ebuild
index 6d23dac483b0..21f10bc4e758 100644
--- a/www-client/links/links-2.21.ebuild
+++ b/www-client/links/links-2.21.ebuild
@@ -11,7 +11,7 @@ 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 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~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="
diff --git a/www-client/lynx/Manifest b/www-client/lynx/Manifest
index ae2ffbf0dcc0..a6fcde12a7be 100644
--- a/www-client/lynx/Manifest
+++ b/www-client/lynx/Manifest
@@ -3,7 +3,7 @@ AUX lynx-2.8.9_p1-parallel.patch 2127 BLAKE2B f78dd62fdf81dfa3403ad358286dc2e27d
 DIST lynx2.8.9rel.1.tar.bz2 2689171 BLAKE2B 7cff536660e8fe77d40a56262c2f12e2093ffbb3e22a5ac8e7eab4410f0255e98df19e51f0c98d53aeb3ba63d0d1c2fcabe145242811bebcafb6e548a162a9fb SHA512 61edbe082684fcbd91bdbf4f4d27c3baf92358811aaffc2f8af46adf23ca7b48aede1520fc5f2a8fc974a2f4bbf4e57e7e6027a187bfc6101e56878c98178e6d
 DIST lynx2.9.0dev.4.tar.bz2 2723001 BLAKE2B aad4a5ad357d77b5f7e6d342178f0fe400d5494f5da8f394f05ff0363b5c09235ce17cba524a008aac821b23174f11528f6f4f8d504acd867449a4ebaa8fd039 SHA512 ea07de2d3d14bc5c79e308ba06436d7b9e37b6f316214821e539a454d0e2989327e2073757b951a7c82fb8db09d8867062a263fd684e1c49d89b8efa27fd611b
 DIST lynx2.9.0dev.5.tar.bz2 2725365 BLAKE2B 0c8529c301796c66211120faeca204beac79b611efb367ab7861736f8d4bcd5e6f287c07d3ef8c56e7137f6b1ea9fbc0b6f31870d02ea62c4a32ffc1b921aacf SHA512 b5ce8afdab835cb65452c9bc016b861db84d8a971f1e5175118ad481708dfbe6cbd336b49602dd92a4db28ecb407ba472e839115b21ab36f5abf4a9057e1b159
-EBUILD lynx-2.8.9_p1.ebuild 2558 BLAKE2B 50d4afbd426bc51e6bd6efceefafb6f774554508afc50cbb82e5f3e6e8d18ebc8cdd2b34bd9a4cbafcb9c3d2a21af3cec12c9fe1f05d6f0b9459092bc1c4eb04 SHA512 5c198abee36e683237ff599dff9d80bd718da7c476a6f1bb0dcc802deeb05dbf019f2a9e2b0efb95679e7b6ee50e9998960be4594d054ce4dda4ddff1f7943e2
-EBUILD lynx-2.9.0_pre4.ebuild 2577 BLAKE2B 5108ff39932f112874ed1188727bd1ac32ce53ba39bdeb5039589b7304cc79d49757b70b4ce2a8ca0323c119da329dd0c57cdc01af589ad2a39cf2eca6426ca8 SHA512 c58a3d3e571eac879fd5e1f1c47e234c24c2a11c2f43ff04f791c09e4ce9acbda92c5a79bcebd19cc2042bef6fb53fb09347f099dfa3720d2346113399bfc001
-EBUILD lynx-2.9.0_pre5.ebuild 2577 BLAKE2B 5108ff39932f112874ed1188727bd1ac32ce53ba39bdeb5039589b7304cc79d49757b70b4ce2a8ca0323c119da329dd0c57cdc01af589ad2a39cf2eca6426ca8 SHA512 c58a3d3e571eac879fd5e1f1c47e234c24c2a11c2f43ff04f791c09e4ce9acbda92c5a79bcebd19cc2042bef6fb53fb09347f099dfa3720d2346113399bfc001
+EBUILD lynx-2.8.9_p1.ebuild 2538 BLAKE2B 0c8426535f93cd094bd68135695f4a96a08236e791bc7db9257e041179359e1ce0073e0b46bb770e5f638ad4ec495705e98261c3c596efd9149065c827a837ca SHA512 2ffbe57e57c3bce4885d3a7db160260c4751f7d189367711a7c1486eabbb6faad3f5c6acf68547e1c9ecfa156cc00cc8ed84e97d4c55da00113b700834d1cf89
+EBUILD lynx-2.9.0_pre4.ebuild 2557 BLAKE2B be380aa4400b2ee3171d9ded30eee90e9292507fa3068fd54c1ad3173a9444ca7a37c1bf33295f6017b8930ddf12d2941eabdd4ac7a1ee8db76e905ff1bef110 SHA512 431d7afb03f641b843f382202b29fe4d7270445acfec5fb3af1cdcd0e2eae34f9775afa3cde55bb13101894a194494443c1018afc3077570e2243a7f3699efbb
+EBUILD lynx-2.9.0_pre5.ebuild 2557 BLAKE2B be380aa4400b2ee3171d9ded30eee90e9292507fa3068fd54c1ad3173a9444ca7a37c1bf33295f6017b8930ddf12d2941eabdd4ac7a1ee8db76e905ff1bef110 SHA512 431d7afb03f641b843f382202b29fe4d7270445acfec5fb3af1cdcd0e2eae34f9775afa3cde55bb13101894a194494443c1018afc3077570e2243a7f3699efbb
 MISC metadata.xml 348 BLAKE2B 579b933a675b5a84e1768be567d0ede438995c2f075519f214ff1d9430ff230058ed30a16b3d1ff58ea79a73d487db372cb4237d749be00ee4f8f86cbef153e1 SHA512 836cdc6de0757684512955ee56620611ea89f6d1f5fd9c0b2ee470fc2cf5d5bac75ccfec2ddbc083dd5ead28e4274784ad434b5c5c99de4de42b81ffaccb1ce8
diff --git a/www-client/lynx/lynx-2.8.9_p1.ebuild b/www-client/lynx/lynx-2.8.9_p1.ebuild
index 00bf73901b12..6d4cf5da40ed 100644
--- a/www-client/lynx/lynx-2.8.9_p1.ebuild
+++ b/www-client/lynx/lynx-2.8.9_p1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://invisible-mirror.net/archives/lynx/tarballs/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 cjk gnutls idn ipv6 nls ssl unicode libressl"
 
 RDEPEND="
diff --git a/www-client/lynx/lynx-2.9.0_pre4.ebuild b/www-client/lynx/lynx-2.9.0_pre4.ebuild
index 52ea78289b97..d44d0b32dd57 100644
--- a/www-client/lynx/lynx-2.9.0_pre4.ebuild
+++ b/www-client/lynx/lynx-2.9.0_pre4.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://invisible-mirror.net/archives/lynx/tarballs/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 cjk gnutls idn ipv6 nls ssl unicode libressl"
 
 RDEPEND="
diff --git a/www-client/lynx/lynx-2.9.0_pre5.ebuild b/www-client/lynx/lynx-2.9.0_pre5.ebuild
index 52ea78289b97..d44d0b32dd57 100644
--- a/www-client/lynx/lynx-2.9.0_pre5.ebuild
+++ b/www-client/lynx/lynx-2.9.0_pre5.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://invisible-mirror.net/archives/lynx/tarballs/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 cjk gnutls idn ipv6 nls ssl unicode libressl"
 
 RDEPEND="
diff --git a/www-client/pybugz/Manifest b/www-client/pybugz/Manifest
index e96ba52fb1fa..ca5ede99f3ff 100644
--- a/www-client/pybugz/Manifest
+++ b/www-client/pybugz/Manifest
@@ -1,4 +1,4 @@
 DIST pybugz-0.13.tar.gz 26876 BLAKE2B fbab5ff308e137bf590620362fe102408444c7c1cb375f2c2d426cf5873fba5cf8759d7083be4c6bd305191680af8d1afc3aaf0648e186a93af4dd0b60442093 SHA512 2cbbd32b44d0d513e91e5c35dca5c68e34a963190c31f9139922f6b8ba69c7362063155b35833a00c2bd064f94d99367e2941a573aed4488f9a71a3b163d4b54
-EBUILD pybugz-0.13.ebuild 1063 BLAKE2B 3ae7492fd6a7c17b9e5e87b9ed9e52d6cf80a9ad163ee2be0ef36d7f6477849462e3c57998a7f94e20ac466e38224a94bb9ece21cbfdaf4038624cf9fc326a21 SHA512 998a399fdeba85fa4d280e3be79a271f129317c23f612dbb51bfaad7bb4b78b676035c817d1452da7f3f29f20d63557e3c5f298e8d471a5fb9674dee273035bd
-EBUILD pybugz-9999.ebuild 1066 BLAKE2B 55aee6baef77e5644dc79ede87334657494346cfc1b2956d9da1052b2542587cc2a39d008744c5edd9c59feb45d26eedd9e7f3705b9c8d35d2be4e2e33738f61 SHA512 644aef71df1eb3ce91c9c984fa4a9dfe3a355d93fb9c8f78c6a414de256f89abf81866febc1516a4ff187bdecb19962c99920d3acccc88ccae939cb990153739
+EBUILD pybugz-0.13.ebuild 1054 BLAKE2B 8b8ade6611607cc7ae17bd73e93dbf0e89fc864be0577cb6573b8aee2ed091822643570dea3125b826f6f764637b110ea7e79c6afd07c971f0aa337971681204 SHA512 a667bb15add4dd73717ce5d61dd704d85ca1fd4f9c8b547cc91cddf312cf070888935495e608abf3430ef347a8c3b6af6a0151b7a3f1526455ba584aaf389abe
+EBUILD pybugz-9999.ebuild 1057 BLAKE2B 5ac73c66db6c6b6d392a870cb7e44ed7f1f2505031f30fc2c1b8b41f5481bafc7fc8484fd16ddb7da2137954367559ae2564882c1b618c40f1f1bbc12081b946 SHA512 5d67efc7bc8cd34ec8e11dff800b93220b8a171b19e41339262b2f291f1fbaefa1daadbc33f3fb24edafa2286f4cf86e042f6f27971bfdd546e4bd6657643c22
 MISC metadata.xml 307 BLAKE2B 35d9a21eb8997a7ebed4e14a088ac85802c9828d3d968adc0b41b1c7f5a54d863747cd32a96624785e16caecb6ca0a5b645aec61459c19ce746bedd67000a3a6 SHA512 ae4880029f219b2a1db5b8975ae0b442eb23d9059bdf5798f79d2f23a7d43bdd5efd7e8c626cb3dc642936f7ae84bbdf66d9509cd96e5c986bba136c77668b75
diff --git a/www-client/pybugz/pybugz-0.13.ebuild b/www-client/pybugz/pybugz-0.13.ebuild
index 226dd0826b8f..638ea47e52ec 100644
--- a/www-client/pybugz/pybugz-0.13.ebuild
+++ b/www-client/pybugz/pybugz-0.13.ebuild
@@ -10,7 +10,7 @@ if [ "${PV}" = "9999" ]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/williamh/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 fi
 
 inherit bash-completion-r1 distutils-r1
diff --git a/www-client/pybugz/pybugz-9999.ebuild b/www-client/pybugz/pybugz-9999.ebuild
index 2f1f75bd296c..2210d7f4327a 100644
--- a/www-client/pybugz/pybugz-9999.ebuild
+++ b/www-client/pybugz/pybugz-9999.ebuild
@@ -10,7 +10,7 @@ if [ "${PV}" = "9999" ]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/williamh/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 fi
 
 inherit bash-completion-r1 distutils-r1
diff --git a/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifest
index ac217260cc8f..0f671d444e55 100644
--- a/www-client/seamonkey/Manifest
+++ b/www-client/seamonkey/Manifest
@@ -1,9 +1,14 @@
 AUX all-gentoo-1.js 1008 BLAKE2B 50418db37f55b9b9e53049abb95af79a5ee5137df9aab3ef6d1791e51a0c2f35d78b390982c5c20f4a57acebfaa013139276d0343cd4733a925510c8a5567c69 SHA512 5d1c9331db3c988f79be7756b57254bb3d2cb56cf10c7e79878d9968f882713cdcca0013d3507c4d69fcc7e99164a27b05ffbbb5ce78ee86b91ecce366a997c4
+AUX seamonkey-2.53.6_beta1-confvars_use_posix_sh.patch 1459 BLAKE2B 057ff24962656a6e072eb5ea0f6b33e25436cf6c492ca83cfad01fcd603baffdacc1fc3b1d7422a67ed401d0dac30cc68d04a23dad7cbf14fbc2bbdb7606f491 SHA512 31018b9f536cf6b0b9af359856e4826690dea064ba61d503cc205782eb306301a35e1a4419ee4ab643f3eefd828a72f3d6fec2cc6a1760eedfc02d7ed3dc2502
 AUX seamonkey.desktop 307 BLAKE2B 81aaa9a69dc60ae0872ebdfe796d3a6afbd4bd15c1c83c14abc06579c15bed2e48114e3fb374bab0ba7d9d4de28109b215601a2d6bd56af3aa9e82a4d0baaa91 SHA512 081d8ec12e9e2035fc8020238803ab9df98dac4350ce90a29e9e65a38efa13bb14cba0fbc2e68a2a857c5046142c68ecc8ab4535da4f284c0e04a3879afc429f
 DIST seamonkey-2.53.3-system_libvpx-1.8.patch.xz 3128 BLAKE2B f73802d2715a11964a4b4d34b582a2999ab42cff9ed005c5ca8c002ae745a973fbb682c3e568f6727a7fe93dc2d7a5ba3367adc4e1d256b8ab0cf8d940fceb8a SHA512 80b87c260445af181d1a0d39de9f95ac7c93f76e12328c1799e8607f50ca9e2a20bc4f15de3f32efbbabb444fd5352612b2629fee61875fa0acd6d050df338a2
 DIST seamonkey-2.53.5.1-rust148-packed_simd.patch 45781 BLAKE2B f028f56c68d03ee5231457dd233fe046cae7170d808a3db1c27a7c11f5cc97539df22ab1c05f305fed918d0a8a9ad2be53a9972b42607811ea2e60e3b56d6015 SHA512 74eec456b7aa872d682962b7585f74705b4ad4cbd27cfa11f5c6c2dfef303706dac414e72df882ba106df31305db79ff73158cdeba960bf74cad962e02fa3931
 DIST seamonkey-2.53.5.1.source-l10n.tar.xz 12108000 BLAKE2B f8e3b3bcdadf92decaa2cffacac937a6c219017a205385136e98fa6fa13d5176dc000ee00ac910951d1e623c82241b1ed3d0b0b6754c5c5e0d2cf315c9bd097a SHA512 6532465d0ffbe2f36e5db0b54a801bf3b5d5481a1f39933620bea641e7faf8fcc0a04f5ff1e72272f119954835663e6d1fdb3d0595468a2fbb336b71d0290ce6
 DIST seamonkey-2.53.5.1.source.tar.xz 285624492 BLAKE2B 1785872f9b5e3fdd92cc9d9b53f503e923451af116cc8c0581b6e61cf542d8fff7a4139f57c6d3db55865caa2f1292eaaa8125fe05ca1e18cc0ee02376c5644a SHA512 6ee8a1c5b81ede02cabcfc7b650805bab661b2898fd0f6d7c0ae1f99da19930efb69f25ce7374888cac6333e669ec79d72705fec69cfe617054b9daacd31297c
 DIST seamonkey-2.53.5_beta1-patches-02.tar.xz 44096 BLAKE2B e0c31af11b3bf88f572703403f186bda71af0c26cd52a99b773dfd765961c430f2d516bba266871b28e5848d5c0f9e9df1a074b05f4b5da7323fd9042c25054e SHA512 434e4cad74d659f46a051207bf43087ad780e40c29b465a9c4c8e7366e9d8b197da20e5ffbafadb8ddb3f1754ad81b75f3d7a899adadd3bb8a7b83e501cfaf9a
+DIST seamonkey-2.53.6_beta1-patches-01.tar.xz 44160 BLAKE2B f6a959a983e726cd919ab5004b27cd496a78cd58759168d6dd64e155059c7b52f269bc42143ddb69a1e8880c72779257216d942a1abc58800491fde9eaaea061 SHA512 710e668209f76f2ca4112923c61219e435123791dfcfcb202af1f7975436d17f13ab025722e9725f219e9de9d024091514d23c71a851d68f750c11ea8d56c2b9
+DIST seamonkey-2.53.6_beta1.source-l10n.tar.xz 13520676 BLAKE2B cae6fad22f30c0e685ef3829e4a67f09420a1114e259e71a998819e7bf33ecf7428959aa99bb4299482e5d149fe85575e8f4ea5ba254dae0fe10e2a634be2aa5 SHA512 aabbe7a93c2a78ad5dde819265540ea7516f0bc1cbc876a64b81969697e6389467d3ea682a02d15ebdd182a5d0c5ae122ecce9ce18874910ab968ee7664fe501
+DIST seamonkey-2.53.6_beta1.source.tar.xz 284481888 BLAKE2B ea8d1b72cd2ef919a633f8dcbccd5c2787ed124bd6bc28ad7a3742e753a4b9667716a1551ebef37f026b6d9cd931964a96ad442c5ca826db1e224899a367113c SHA512 f990f0e4b10e3aefd25848aee3c2368accf7527226409e8f6838fd2aa9464ac9459f9249c6169dd02b35b3e977565f5a1eec84f4a506758a56109bea8096cd10
 EBUILD seamonkey-2.53.5.1.ebuild 16674 BLAKE2B f984187931a806f8deceaf3ffedf2097b4b8d4a80a425aac09ca5fb1b6e19de078bfb01d92b23614d0f4b9d7379af5f96df4309b05818209024d3d6b6d5fe4ff SHA512 af7ecf1a2c54788addee4840bac84a7c2641075ea212de6c770dda407177b1b661d2e9ce829be0be1efe72c597caef7fa6e2104f8a94a5ea90ead1230f122151
+EBUILD seamonkey-2.53.6_beta1.ebuild 15904 BLAKE2B 5f7c1e97ebb239d4c77065b69478d5813ef40fc6770c580d93d380b5837dbabf0d93c03f9fa41816261e4a066e9325941722f628519937f0ef45f5662230428c SHA512 dbe148281bbcf2ab6077ec798a9c52812c98efa3596688c9763643b9a1f7a714f988a192eab47f688177c2a04bb976b7a97e34a0f1eaa50e9904fed2a88e5380
 MISC metadata.xml 1903 BLAKE2B 24d0d1914eb2965b065dca44093fd7162a735190082874f1230f090ba1f5c7728531a5e5c5bbec6e23036d51a1d71fc0d95d19ebca3fd68e82261e981b7fe402 SHA512 98c0c07a83d496ff6ab274787d6d76379fbfdd352bb58177f20dc53055ef6d426819cf67860b5e6d57941c9cd3d6f439365d135c7235cecb8d654733b0bb2799
diff --git a/www-client/seamonkey/files/seamonkey-2.53.6_beta1-confvars_use_posix_sh.patch b/www-client/seamonkey/files/seamonkey-2.53.6_beta1-confvars_use_posix_sh.patch
new file mode 100644
index 000000000000..a2be4a20e106
--- /dev/null
+++ b/www-client/seamonkey/files/seamonkey-2.53.6_beta1-confvars_use_posix_sh.patch
@@ -0,0 +1,56 @@
+
+# HG changeset patch
+# User Tom Prince <mozilla@hocat.ca>
+# Date 1516732239 25200
+# Node ID 5fad234e2e846377d9361f8ea500556dbf523da8
+# Parent  266495d41b7376f67e1999b769205bc6ca8e40bf
+Bug 1399679: Use posix shell in comm-confvars.sh; r=me
+
+--- a/comm/comm-confvars.sh
++++ b/comm/comm-confvars.sh
+@@ -1,24 +1,26 @@
+ #!/bin/sh
+ 
+-if [[ "$MOZ_BUILD_APP" == *comm* ]]
+-then
+-  # we are building with comm/ as the subdirectory
+-  # $srcdir is the mozilla repo, comm is in the subdir
+-  moztopsrcdir=$srcdir
+-  commtopsrcdir=$srcdir/comm
++case "$MOZ_BUILD_APP" in
++  *comm*)
++    # we are building with comm/ as the subdirectory
++    # $srcdir is the mozilla repo, comm is in the subdir
++    moztopsrcdir=$srcdir
++    commtopsrcdir=$srcdir/comm
+ 
+-  mozreltopsrcdir=.
+-  commreltopsrcdir=comm
++    mozreltopsrcdir=.
++    commreltopsrcdir=comm
+ 
+-  commtopobjdir=$_objdir/comm
+-else
+-  # we are building with mozilla/ as the subdirectory
+-  # $srcdir is still the mozilla repo, so use the parent for comm
+-  moztopsrcdir=$srcdir
+-  commtopsrcdir=$srcdir/..
++    commtopobjdir=$_objdir/comm
++    ;;
++  *)
++    # we are building with mozilla/ as the subdirectory
++    # $srcdir is still the mozilla repo, so use the parent for comm
++    moztopsrcdir=$srcdir
++    commtopsrcdir=$srcdir/..
+ 
+-  mozreltopsrcdir=mozilla
+-  commreltopsrcdir=.
++    mozreltopsrcdir=mozilla
++    commreltopsrcdir=.
+ 
+-  commtopobjdir=$_objdir
+-fi
++    commtopobjdir=$_objdir
++    ;;
++esac
+
diff --git a/www-client/seamonkey/seamonkey-2.53.6_beta1.ebuild b/www-client/seamonkey/seamonkey-2.53.6_beta1.ebuild
new file mode 100644
index 000000000000..3a90d1a67e71
--- /dev/null
+++ b/www-client/seamonkey/seamonkey-2.53.6_beta1.ebuild
@@ -0,0 +1,529 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+WANT_AUTOCONF="2.1"
+
+PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_REQ_USE='ncurses,sqlite,ssl,threads(+)'
+
+# This list can be updated with scripts/get_langs.sh from the mozilla overlay
+# note - could not roll langpacks for: ca fi
+#MOZ_LANGS=(ca cs de en-GB es-AR es-ES fi fr gl hu it ja lt nb-NO nl pl pt-PT
+#	    ru sk sv-SE tr uk zh-CN zh-TW)
+MOZ_LANGS=(cs de en-GB es-AR es-ES fr hu it ja lt nl pl pt-PT
+	    ru sk sv-SE zh-CN zh-TW)
+
+MOZ_PV="${PV/_pre*}"
+MOZ_PV="${MOZ_PV/_alpha/a}"
+MOZ_PV="${MOZ_PV/_beta/b}"
+MOZ_PV="${MOZ_PV/_rc/rc}"
+MOZ_P="${P}"
+MY_MOZ_P="${PN}-${MOZ_PV}"
+
+if [[ ${PV} == *_pre* ]] ; then
+	MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/candidates/${MOZ_PV}-candidates/build${PV##*_pre}"
+else
+	MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases/${MOZ_PV}"
+fi
+
+S="${WORKDIR}/${MY_MOZ_P}"
+SRC_URI="${MOZ_HTTP_URI}/source/${MY_MOZ_P}.source.tar.xz -> ${P}.source.tar.xz
+	${MOZ_HTTP_URI}/source/${MY_MOZ_P}.source-l10n.tar.xz -> ${P}.source-l10n.tar.xz"
+
+MOZ_GENERATE_LANGPACKS=1
+MOZ_L10N_SOURCEDIR="${S}/${P}-l10n"
+inherit autotools check-reqs flag-o-matic mozcoreconf-v6 mozextension mozlinguas-v2 pax-utils toolchain-funcs xdg-utils
+
+PATCH="${PN}-2.53.6_beta1-patches-01"
+
+DESCRIPTION="Seamonkey Web Browser"
+HOMEPAGE="http://www.seamonkey-project.org"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+SLOT="0"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+SYSTEM_IUSE=( +system-{av1,harfbuzz,icu,jpeg,libevent,libvpx,sqlite} )
+IUSE="+chatzilla +crypt dbus debug +gmp-autoupdate +ipc jack minimal
+neon pulseaudio +roaming selinux startup-notification ${SYSTEM_IUSE[@]} test
+wifi"
+RESTRICT="!test? ( test )"
+
+SRC_URI+="
+	https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/${PATCH}.tar.xz
+	system-libvpx? ( https://dev.gentoo.org/~polynomial-c/mozilla/${PN}-2.53.3-system_libvpx-1.8.patch.xz )
+"
+
+ASM_DEPEND=">=dev-lang/yasm-1.1"
+
+# Convert to BDEPEND once the ebuild goes EAPI-7
+DEPEND="
+	app-arch/unzip
+	app-arch/zip
+	dev-lang/perl
+	sys-apps/findutils
+	>=sys-devel/binutils-2.16.1
+	virtual/pkgconfig
+	>=virtual/rust-1.34.0
+	amd64? (
+		${ASM_DEPEND}
+	)
+	x86? (
+		${ASM_DEPEND}
+	)
+"
+
+CDEPEND="
+	>=app-text/hunspell-1.5.4:=
+	dev-libs/atk
+	>=dev-libs/glib-2.26:2
+	>=dev-libs/libffi-3.0.10:=
+	>=dev-libs/nspr-4.23
+	>=dev-libs/nss-3.47.1
+	media-libs/fontconfig
+	>=media-libs/freetype-2.4.10
+	>=media-libs/libpng-1.6.31:0=[apng]
+	>=media-libs/mesa-10.2:=
+	>=sys-libs/zlib-1.2.3
+	>=x11-libs/cairo-1.10[X]
+	x11-libs/gdk-pixbuf
+	>=x11-libs/gtk+-2.18:2
+	>=x11-libs/gtk+-3.4.0:3
+	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
+	>=x11-libs/pixman-0.19.2
+	media-video/ffmpeg
+	virtual/freedesktop-icon-theme
+	dbus? (
+		>=dev-libs/dbus-glib-0.72
+		>=sys-apps/dbus-0.60
+	)
+	jack? ( virtual/jack )
+	crypt? ( <x11-plugins/enigmail-2.1.0 )
+	kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) )
+	pulseaudio? ( || (
+		media-sound/pulseaudio
+		>=media-sound/apulse-0.1.9
+	) )
+	startup-notification? ( >=x11-libs/startup-notification-0.8 )
+	system-av1? (
+		>=media-libs/dav1d-0.3.0:=
+		>=media-libs/libaom-1.0.0:=
+	)
+	system-harfbuzz? (
+		>=media-gfx/graphite2-1.3.9-r1
+		>=media-libs/harfbuzz-1.3.3:0=
+	)
+	system-icu? ( >=dev-libs/icu-59.1:= )
+	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
+	system-libevent? ( >=dev-libs/libevent-2.0:0= )
+	system-libvpx? ( >=media-libs/libvpx-1.8.0:0=[postproc] )
+	system-sqlite? ( >=dev-db/sqlite-3.19.3:3[secure-delete,debug=] )
+	wifi? (
+		kernel_linux? (
+			>=dev-libs/dbus-glib-0.72
+			net-misc/networkmanager
+			>=sys-apps/dbus-0.60
+		)
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	selinux? ( sec-policy/selinux-mozilla )
+"
+DEPEND+="${CDEPEND}
+	amd64? ( virtual/opengl )
+	x86? ( virtual/opengl )
+"
+
+# allow GMP_PLUGIN_LIST to be set in an eclass or
+# overridden in the enviromnent (advanced hackers only)
+if [[ -z ${GMP_PLUGIN_LIST} ]] ; then
+	GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
+fi
+
+BUILD_OBJ_DIR="${S}/seamonk"
+
+pkg_setup() {
+	if [[ ${PV} == *_beta* ]] || [[ ${PV} == *_pre* ]] ; then
+		ewarn "You're using an unofficial release of ${PN}. Don't file any bug in"
+		ewarn "Gentoo's Bugtracker against this package in case it breaks for you."
+		ewarn "Those belong to upstream: https://bugzilla.mozilla.org"
+	fi
+
+	moz_pkgsetup
+}
+
+pkg_pretend() {
+	# Ensure we have enough disk space to compile
+	if use debug || use test ; then
+		CHECKREQS_DISK_BUILD="16G"
+	else
+		CHECKREQS_DISK_BUILD="12G"
+	fi
+	check-reqs_pkg_setup
+}
+
+src_unpack() {
+	local l10n_sources="${P}.source-l10n.tar.xz"
+	unpack ${A/ ${l10n_sources}}
+
+	mkdir "${S}/${P}-l10n" || die
+	cd "${S}/${P}-l10n" || die
+	unpack ${l10n_sources}
+}
+
+src_prepare() {
+	# Apply our patches
+	eapply "${WORKDIR}"/mozilla
+
+	eapply "${FILESDIR}/${P}-confvars_use_posix_sh.patch"
+
+	# Shell scripts sometimes contain DOS line endings; bug 391889
+	grep -rlZ --include="*.sh" $'\r$' . |
+	while read -r -d $'\0' file ; do
+		einfo edos2unix "${file}"
+		edos2unix "${file}"
+	done
+
+	use system-libvpx \
+		&& eapply -p2 "${WORKDIR}/${PN}-2.53.3-system_libvpx-1.8.patch"
+
+	# Allow user to apply any additional patches without modifing ebuild
+	eapply_user
+
+	# Don't error for format with gcc-9
+	grep -rl -- '-Werror=format' | xargs sed -i 's/error=format/no-&/' || die
+
+	# Enable gnomebreakpad
+	if use debug ; then
+		sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \
+			build/unix/run-mozilla.sh || die
+	fi
+
+	# Ensure that are plugins dir is enabled as default
+	sed -i -e "s:/usr/$(get_libdir)/mozilla/plugins:/usr/$(get_libdir)/${PN}/plugins:" \
+		xpcom/io/nsAppFileLocationProvider.cpp || die
+
+	# Don't exit with error when some libs are missing which we have in
+	# system.
+	sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \
+		-i comm/suite/installer/Makefile.in || die
+	# Don't error out when there's no files to be removed:
+	sed 's@\(xargs rm\)$@\1 -f@' \
+		-i toolkit/mozapps/installer/packager.mk || die
+
+	# Don't build libs-% locale files for chatzilla if we are not building chatzilla
+	# (this is hard-coded in the build system at present rather than being based on configuration)
+	if ! use chatzilla ; then
+		sed '/extensions\/irc\/locales libs-/s@^@#@' \
+			-i comm/suite/locales/Makefile.in || die
+	fi
+
+	eautoreconf old-configure.in
+	cd js/src || die
+	eautoconf old-configure.in
+}
+
+src_configure() {
+	MEXTENSIONS="default"
+	# 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.
+	_google_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
+
+	####################################
+	#
+	# mozconfig, CFLAGS and CXXFLAGS setup
+	#
+	####################################
+
+	mozconfig_init
+
+	##################################
+	# Former mozconfig_config() part #
+	##################################
+
+	# Migrated from mozcoreconf-2
+	mozconfig_annotate 'system_libs' --with-system-bz2
+	mozconfig_annotate 'system_libs' --with-system-zlib
+
+	# Disable for testing purposes only
+	mozconfig_annotate 'Upstream bug 1341234' --disable-stylo
+
+	# Must pass release in order to properly select linker via gold useflag
+	mozconfig_annotate 'Enable by Gentoo' --enable-release
+
+	# Must pass --enable-gold if using ld.gold
+	if tc-ld-is-gold ; then
+		mozconfig_annotate 'tc-ld-is-gold=true' --enable-gold
+	else
+		mozconfig_annotate 'tc-ld-is-gold=false' --disable-gold
+	fi
+
+	# Enable position independent executables
+	mozconfig_annotate 'enabled by Gentoo' --enable-pie
+
+	mozconfig_use_enable debug
+	mozconfig_use_enable debug tests
+	if ! use debug ; then
+		mozconfig_annotate 'disabled by Gentoo' --disable-debug-symbols
+	else
+		mozconfig_annotate 'enabled by Gentoo' --enable-debug-symbols
+	fi
+
+	mozconfig_use_enable startup-notification
+
+	# wifi pulls in dbus so manage both here
+	mozconfig_use_enable wifi necko-wifi
+	if use kernel_linux && use wifi && ! use dbus ; then
+		echo "Enabling dbus support due to wifi request"
+		mozconfig_annotate 'dbus required by necko-wifi on linux' --enable-dbus
+	else
+		mozconfig_use_enable dbus
+		mozconfig_annotate 'disabled' --disable-necko-wifi
+	fi
+
+	# These are enabled by default in all mozilla applications
+	mozconfig_annotate '' --with-system-nspr --with-nspr-prefix="${SYSROOT}${EPREFIX%/}"/usr
+	mozconfig_annotate '' --with-system-nss --with-nss-prefix="${SYSROOT}${EPREFIX%/}"/usr
+	mozconfig_annotate '' --x-includes="${SYSROOT}${EPREFIX%/}"/usr/include --x-libraries="${SYSROOT}${EPREFIX%/}"/usr/$(get_libdir)
+	if use system-libevent ; then
+		mozconfig_annotate '' --with-system-libevent="${SYSROOT}${EPREFIX%/}"/usr
+	fi
+	mozconfig_annotate '' --prefix="${EPREFIX%/}"/usr
+	mozconfig_annotate '' --libdir="${EPREFIX%/}"/usr/$(get_libdir)
+	mozconfig_annotate 'Gentoo default' --enable-system-hunspell
+	mozconfig_annotate '' --disable-crashreporter
+	mozconfig_annotate 'Gentoo default' --with-system-png
+	mozconfig_annotate '' --enable-system-ffi
+	mozconfig_annotate '' --disable-gconf
+	mozconfig_annotate '' --with-intl-api
+
+	# skia has no support for big-endian platforms
+	if [[ $(tc-endian) == "big" ]] ; then
+		mozconfig_annotate 'big endian target' --disable-skia
+	else
+		mozconfig_annotate '' --enable-skia
+	fi
+
+	# default toolkit is cairo-gtk3, optional use flags can change this
+	mozconfig_annotate '' --enable-default-toolkit=cairo-gtk3
+
+	# Instead of the standard --build= and --host=, mozilla uses --host instead
+	# of --build, and --target intstead of --host.
+	# Note, mozilla also has --build but it does not do what you think it does.
+	# Set both --target and --host as mozilla uses python to guess values otherwise
+	mozconfig_annotate '' --target="${CHOST}"
+	mozconfig_annotate '' --host="${CBUILD:-${CHOST}}"
+
+	mozconfig_use_enable pulseaudio
+	# force the deprecated alsa sound code if pulseaudio is disabled
+	if use kernel_linux && ! use pulseaudio ; then
+		mozconfig_annotate '-pulseaudio' --enable-alsa
+	fi
+
+	# For testing purpose only
+	mozconfig_annotate 'Sandbox' --enable-content-sandbox
+
+	mozconfig_use_enable system-sqlite
+	mozconfig_use_with system-jpeg
+	mozconfig_use_with system-icu
+	mozconfig_use_with system-libvpx
+	mozconfig_use_with system-harfbuzz
+	mozconfig_use_with system-harfbuzz system-graphite2
+	mozconfig_use_with system-av1
+
+	# Modifications to better support ARM, bug 553364
+	if use neon ; then
+		mozconfig_annotate '' --with-fpu=neon
+		mozconfig_annotate '' --with-thumb=yes
+		mozconfig_annotate '' --with-thumb-interwork=no
+	fi
+	if [[ ${CHOST} == armv* ]] ; then
+		mozconfig_annotate '' --with-float-abi=hard
+		if ! use system-libvpx ; then
+			sed -i -e "s|softfp|hard|" \
+				media/libvpx/moz.build || die
+		fi
+	fi
+	##################################
+	# Former mozconfig_config() end  #
+	##################################
+
+	# enable JACK, bug 600002
+	mozconfig_use_enable jack
+
+	# It doesn't compile on alpha without this LDFLAGS
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# Linking fails without this due to memory exhaustion
+	use x86 && append-ldflags "-Wl,--no-keep-memory"
+
+	if ! use chatzilla ; then
+		MEXTENSIONS+=",-irc"
+	fi
+	if ! use roaming ; then
+		MEXTENSIONS+=",-sroaming"
+	fi
+
+	# Setup api key for location services
+	echo -n "${_google_api_key}" > "${S}"/google-api-key
+	mozconfig_annotate '' --with-google-location-service-api-keyfile="${S}/google-api-key"
+	mozconfig_annotate '' --with-google-safebrowsing-api-keyfile="${S}/google-api-key"
+
+	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
+
+	# Use an objdir to keep things organized.
+	echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig
+	echo "mk_add_options XARGS=/usr/bin/xargs" >> "${S}"/.mozconfig
+
+	mozlinguas_mozconfig
+
+	# Finalize and report settings
+	mozconfig_final
+
+	# Work around breakage in makeopts with --no-print-directory
+	MAKEOPTS="${MAKEOPTS/--no-print-directory/}"
+
+	if [[ $(gcc-major-version) -lt 4 ]] ; then
+		append-cxxflags -fno-stack-protector
+	elif [[ $(gcc-major-version) -gt 4 || $(gcc-minor-version) -gt 3 ]] ; then
+		if use amd64 || use x86 ; then
+			append-flags -mno-avx
+		fi
+	fi
+
+	# 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
+
+	# workaround for funky/broken upstream configure...
+	SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \
+	emake V=1 -f client.mk configure
+	#./mach configure || die
+}
+
+src_compile() {
+	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL}" \
+	emake V=1 -f client.mk
+	#./mach build --verbose || die
+
+	mozlinguas_src_compile
+}
+
+src_install() {
+	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+	DICTPATH="\"${EPREFIX%/}/usr/share/myspell\""
+
+	local emid
+	cd "${BUILD_OBJ_DIR}" || die
+
+	# Pax mark xpcshell for hardened support, only used for startupcache creation.
+	pax-mark m dist/bin/xpcshell
+
+	# Copy our preference before omnijar is created.
+	sed "s|SEAMONKEY_PVR|${PVR}|" "${FILESDIR}"/all-gentoo-1.js > \
+		dist/bin/defaults/pref/all-gentoo.js \
+		|| die
+
+	# Set default path to search for dictionaries.
+	echo "pref(\"spellchecker.dictionary_path\", ${DICTPATH});" \
+		>> dist/bin/defaults/pref/all-gentoo.js \
+		|| die
+
+	echo 'pref("extensions.autoDisableScopes", 3);' >> \
+		dist/bin/defaults/pref/all-gentoo.js \
+		|| die
+
+	local plugin
+	if ! use gmp-autoupdate ; then
+		for plugin in "${GMP_PLUGIN_LIST[@]}" ; do
+			echo "pref(\"media.${plugin}.autoupdate\", false);" >> \
+				dist/bin/defaults/pref/all-gentoo.js || die
+		done
+	fi
+
+	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \
+	emake DESTDIR="${D}" install
+	MOZ_P="${MY_MOZ_P}" mozlinguas_src_install
+
+	cp "${FILESDIR}"/${PN}.desktop "${T}" || die
+
+	sed 's|^\(MimeType=.*\)$|\1text/x-vcard;text/directory;application/mbox;message/rfc822;x-scheme-handler/mailto;|' \
+		-i "${T}"/${PN}.desktop || die
+	sed 's|^\(Categories=.*\)$|\1Email;|' -i "${T}"/${PN}.desktop \
+		|| die
+
+	# Install icon and .desktop for menu entry
+	newicon "${S}"/comm/suite/branding/${PN}/default64.png ${PN}.png
+	domenu "${T}"/${PN}.desktop
+
+	# Required in order to use plugins and even run seamonkey on hardened.
+	pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/{seamonkey,seamonkey-bin,plugin-container}
+
+	if use minimal ; then
+		rm -rf "${ED}"/usr/include "${ED}${MOZILLA_FIVE_HOME}"/{idl,include,lib,sdk}
+	fi
+
+	if use chatzilla ; then
+		emid='{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}'
+
+		# remove the en_US-only xpi file so a version with all requested locales can be installed
+		if [[ -e "${ED}"${MOZILLA_FIVE_HOME}/distribution/extensions/${emid}.xpi ]] ; then
+			rm -f "${ED}"${MOZILLA_FIVE_HOME}/distribution/extensions/${emid}.xpi || die
+		fi
+
+		# merge the extra locales into the main extension
+		mozlinguas_xpistage_langpacks dist/xpi-stage/chatzilla
+
+		# install the merged extension
+		mkdir -p "${T}/${emid}" || die
+		cp -RLp -t "${T}/${emid}" dist/xpi-stage/chatzilla/* || die
+		insinto ${MOZILLA_FIVE_HOME}/distribution/extensions
+		doins -r "${T}/${emid}"
+	fi
+
+	# Provide a place for plugins
+	keepdir "${MOZILLA_FIVE_HOME}/plugins"
+
+	# revdep-rebuild entry
+	insinto /etc/revdep-rebuild
+	echo "SEARCH_DIRS_MASK=${MOZILLA_FIVE_HOME}*" >> ${T}/11${PN}
+	doins "${T}"/11${PN}
+
+}
+
+pkg_preinst() {
+	SEAMONKEY_PLUGINS_DIR="${ROOT}/usr/$(get_libdir)/${PN}/plugins"
+
+	if [[ -L "${SEAMONKEY_PLUGINS_DIR}" ]] ; then
+		rm "${SEAMONKEY_PLUGINS_DIR}" || die
+	fi
+}
+
+pkg_postinst() {
+	# Update mimedb for the new .desktop file
+	xdg_desktop_database_update
+
+	if ! use gmp-autoupdate ; then
+		elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or"
+		elog "installing into new profiles:"
+		local plugin
+		for plugin in "${GMP_PLUGIN_LIST[@]}"; do elog "\t ${plugin}" ; done
+	fi
+
+	if use chatzilla ; then
+		elog "chatzilla is now an extension which can be en-/disabled and configured via"
+		elog "the Add-on manager."
+	fi
+}
diff --git a/www-client/surfraw/Manifest b/www-client/surfraw/Manifest
index 7117533d8178..2c6dd2f6d4ed 100644
--- a/www-client/surfraw/Manifest
+++ b/www-client/surfraw/Manifest
@@ -1,7 +1,7 @@
 AUX surfraw-2.3.0-completion.patch 1202 BLAKE2B 5ee51e874e51c9007e4d1948fb197caf5cb4f62845b56e75baa45741efe3c3405bec7735c77165dc4f9a03047125cc3e35d68cb3e768ef411668f90adf125218 SHA512 6bee4b435d3c52d2165ff76029ab3f7b898d358468c52304f9bf70f5c991e0387928d154d1097cfdd08d826f9c8695e85f587ef529978f7d97cbe07caf183443
 AUX surfraw-99999-sr-completion-path.patch 463 BLAKE2B f13c4436756532f6ea15718ae40f01dc257cd0ebcd17a890466d27027149de49da80872e9050440aeabaff7e3379136ae4747230ea5345584fb11c2485be466e SHA512 80d110e18c4e7d1b258b9bbb809973d0f83f20f137889593e1cc90bc192eb4d54c1a39eac3145610b184e7f40de6e0bd5c75a59fbb543f90f58ca3ff253dadd5
 DIST Surfraw-surfraw-2.3.0.tar.bz2 114065 BLAKE2B 91105b225737fe8f3a016e8c723421a2386c48f0c245b6ed119e4cc0f1032c9362e83a062134d0fef8b1cb14f58af07d3d9abe72c4efef9e79c6eb4c93bab25c SHA512 43f0dd2b48a045a47e73e8ef8058e0590a0409367e8378a086497ef912c58317614ba318b006913803529a51a641858a58c1f9f6a2f93dcdea9a45a26484af02
-EBUILD surfraw-2.3.0-r1.ebuild 2551 BLAKE2B d133c24fc4124485752353e66db1cdefb5f90d0cb1bc2e98437de78f13ccb45ac5479dfd4c3c9237e4bc3264cd826983e32cfb024f8616beabd4c7c5e13e34ed SHA512 44d14989a604b2b9db566bfa5fc980e9de9f7b069d4c89922af2a9750b01ab7877c3cfeb80b6eb7b7a164d394ec641ce2f3af1118e6313cdcd41446ed733a700
+EBUILD surfraw-2.3.0-r1.ebuild 2552 BLAKE2B c67934ca16a0444346e7634c36b42f17053f3d754ab37937a82324a79eb4b127fcec2e306c5c5ff086663684b95f4cc3584d8ad8c4004a99e8b68b93f6cb6f52 SHA512 e5027ff3f0330ff15841bd385d5c22f63971833f7621284c1b4b5b2e58bb80a5e6ae0d365c4c9a7125fd058fabb8be1ec5ed591e14ef7b1b3f0f88c161593d14
 EBUILD surfraw-2.3.0-r2.ebuild 2510 BLAKE2B db46028bea6faa656ff5b3c853c0d8827b20b7e3288da1a873222e73d8588af72f6fee01e3b7f7f1903b8cc11ab8de04a650a7cafca7823c48fc97a52573c48b SHA512 49155576c86f0887eb78ec467c4e797029a765563913518e39ffc42e9fe6444fe626ee0e4799d33d789f6e4ae54bb71f9b003662198655e3603ef2bb994fc73a
 EBUILD surfraw-2.3.0-r3.ebuild 2936 BLAKE2B 38d52ffc6e80f4b51dab460779f2b062daf95855d11943e5fe010adf344a758cec2071a724f57ad573dd1fd79cad590381b276098514b5b012272336f637742b SHA512 e63247e30c605f047d9fc4c22fe638da71d327078aafc8bab9d98135a48f1493f8bbb97a3bf0a13b242234831642b73a37ad3f03cf2016dd54f656314b53184a
 EBUILD surfraw-99999.ebuild 1274 BLAKE2B 30a2f4f4a90ddfa92bccef0f47e75af6bbdc8535644ec378b68bd7bee11581886ee80d11e105ef92b87af148a28a75e384bdd46a1d4b64d9012cc4b1a4fa671b SHA512 ba478cafb5c958adabe27bba76da46a1c4a08bc5bbdd7a2f7132d43687b7a42fb68f981147793dd49d1e3775083a16fe476aeb2c153959744bf62363542580f6
diff --git a/www-client/surfraw/surfraw-2.3.0-r1.ebuild b/www-client/surfraw/surfraw-2.3.0-r1.ebuild
index 644b28c661b3..451419a8fe8c 100644
--- a/www-client/surfraw/surfraw-2.3.0-r1.ebuild
+++ b/www-client/surfraw/surfraw-2.3.0-r1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://gitlab.com/surfraw/Surfraw"
 SRC_URI="https://gitlab.com/surfraw/Surfraw/-/archive/${P}/${PN^}-${P}.tar.bz2"
 SLOT="0"
 LICENSE="public-domain"
-KEYWORDS="amd64 hppa ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="amd64 ~hppa ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 
 RDEPEND="
 	dev-lang/perl
diff --git a/www-client/uget/Manifest b/www-client/uget/Manifest
index 41ad790f7156..caca45835ef6 100644
--- a/www-client/uget/Manifest
+++ b/www-client/uget/Manifest
@@ -1,6 +1,7 @@
+AUX uget-2.2.1-fno-common.patch 144 BLAKE2B 107c0876bd4c4813836c7d6a4a87ac1f14eb03b2b0bc60af87346d25545eafb79899a781e195a6285d3c0856d026f0f169a71d4e3491fe709cfb3981a30eee31 SHA512 d92104b3ea8af9f66e09e2de78c7d12ea0b4655dabe1dcdd1f3bbdc0bc78eb2b4fb417430a3b16b7c13826d7fa467e634bb026289d6102d380c05e798d692309
 DIST uget-2.2.0.tar.gz 997012 BLAKE2B 4b6207edbb3e5871c5a8d179856920fa5985e65d9655c0d42e7ff9f1d34dfd6489bb1b75615e12432b5d5bbadb3be503bb605eb5256ba3566465ef4e07559466 SHA512 c3e7f0b7cc31df9d1a6c3717f65ad9b14c9e60acb756997b6f6b94f464257c7fb120be5e15bd1d871b89f6485160fb095bd120fb27abc81bd0ee29e57edde468
 DIST uget-2.2.1.tar.gz 1006697 BLAKE2B 2580cbcbe12d3001ada252a46358c4bc357fbe2ca4e3433e13ad95efb8e99d567a194db024eaf2ba58246a35937a5262be62aac4ee24272421f531dc72eeab20 SHA512 b76e5240e42cd0aa5bc47eb1a9cff0a0d8cdea87995455d72cf925923321f492200896ad904960e7f7462eb9655284f5b295b8a779b42223fe73a098a143576f
 EBUILD uget-2.2.0.ebuild 1329 BLAKE2B 6a8a0af373d4ec53f3af75f47b7613ca97fcc3918fc1f67f1beddd9f2335e143ac196ee275b9189395602b775f5d3cf67f8f03f7a83a72d25d8ee07aa7e34cb3 SHA512 cec68ef122b43196f367637e7dba47f7eca19f592ab820bd0204b429db43b3bc809a98b2eb3339d13a4eaed44242a7a24fa62667674999b3f08b3321bfd5b60a
-EBUILD uget-2.2.1.ebuild 1331 BLAKE2B ec2ee2368e11b9b35343ff3deac72eb17e0166f744f023091fa5dcc855a3b4eeb397871104fa56c7fd99817b78157b66c505c55f932bda13ef6168407b40a352 SHA512 9c0017826a0d7046566af7a514da2d0b4f1ebe859b61e59f794568169b96b1816d0f034c94789b4c3f3c39d97c0e55a99c2c60525bd9a7e3d4ec7975cb00dc0f
-EBUILD uget-9999.ebuild 1333 BLAKE2B 2432499a465f72076b3d0d61bf0ad4fcc1f91ee52e19cc92ba918eb81ef76d673b61d666fe0f40f6f019293638b13da70e6280e15498e5cc972a1cc19d483929 SHA512 204efea7e53166b1d25126cbd9b99dbeb3bb7e7be6488fb63dbc239fe9a876678efc1377c49277530d6a4e73de38dea7eb9f91877dd000fe5fecee689911cd2e
+EBUILD uget-2.2.1.ebuild 1202 BLAKE2B 4aea42e15ea85f3b253fddae3ceb7b4d3ee8ebd77d68bade00e2ac13e6aeee4b45b5f85cb5bf7601429ca2c98d4bd937b693f3b77cf84b73e3a76acb1b449630 SHA512 8bbc1a6bb8c071d0c5794c72e2ca9c35b4d9947a6c5e3be93038245eaaba5efe5703a3c779fadbe9da4b2fadcd8140400914c49e14fb04f142b1bca5ea66a692
+EBUILD uget-9999.ebuild 1128 BLAKE2B 690445c625407e1b8de293f8f405e9887825cd8072e0429bd6cbe2582660a90ce841450869576627bfebc5f0975fe19c211f3baf38c1d7f3571db23c2aa7e5df SHA512 9cfb2b8c9cd4361f2609aa02106748cc84bc24a7a5e4bdc8f9e52eb068c88451d6550fd5fdd17f6174742761383c606b69dd13631d1e7cb17f7e5942854823b1
 MISC metadata.xml 1122 BLAKE2B 09b2ce4fb6a0b65557c7e2564eb499f7da42fdfe2e48e046df182dd9b3418424391bf3011e69cee68534b568750f73e59a5886f46cfb0ac129d96426ce4d359e SHA512 7c4a793bfb36dedc7b07096f6ec3d82ee3196c350245c6d30bfab81b1ab56bc0934d62a3b1dd23972ede9eb4970bc9d9d605532d5305ba21c3d2f26fec526095
diff --git a/www-client/uget/files/uget-2.2.1-fno-common.patch b/www-client/uget/files/uget-2.2.1-fno-common.patch
new file mode 100644
index 000000000000..8910c338e80f
--- /dev/null
+++ b/www-client/uget/files/uget-2.2.1-fno-common.patch
@@ -0,0 +1,8 @@
+--- a/ui-gtk/UgtkBanner.h
++++ b/ui-gtk/UgtkBanner.h
+@@ -64,7 +64,7 @@
+ 		UgetRssFeed*    feed;
+ 		UgetRssItem*    item;
+ 	} rss;
+-} banner;
++};
diff --git a/www-client/uget/uget-2.2.1.ebuild b/www-client/uget/uget-2.2.1.ebuild
index 3608bf8baca1..de91193f2cd9 100644
--- a/www-client/uget/uget-2.2.1.ebuild
+++ b/www-client/uget/uget-2.2.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
-inherit gnome2-utils xdg-utils
+inherit xdg
 
 DESCRIPTION="Download manager using gtk+ and libcurl"
 HOMEPAGE="http://www.ugetdm.com"
@@ -16,9 +16,9 @@ IUSE="aria2 appindicator control-socket +gnutls gstreamer libnotify nls openssl
 REQUIRED_USE="^^ ( gnutls openssl )"
 
 RDEPEND="
-	>=net-misc/curl-7.19.1
+	dev-libs/glib:2
 	dev-libs/libpcre
-	>=dev-libs/glib-2.32:2
+	net-misc/curl
 	>=x11-libs/gtk+-3.4:3
 	gnutls? (
 		net-libs/gnutls
@@ -28,13 +28,14 @@ RDEPEND="
 	appindicator? ( dev-libs/libappindicator:3 )
 	gstreamer? ( media-libs/gstreamer:1.0 )
 	libnotify? ( x11-libs/libnotify )
-	openssl? ( dev-libs/openssl:0 )
-	"
-DEPEND="${RDEPEND}
+	openssl? ( dev-libs/openssl:0 )"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	dev-util/intltool
-	virtual/pkgconfig
 	sys-devel/gettext
-	"
+	virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
 
 src_configure() {
 	local myconf=(
@@ -50,13 +51,3 @@ src_configure() {
 
 	econf "${myconf[@]}"
 }
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/www-client/uget/uget-9999.ebuild b/www-client/uget/uget-9999.ebuild
index a713a776b893..15ba6ecf8dde 100644
--- a/www-client/uget/uget-9999.ebuild
+++ b/www-client/uget/uget-9999.ebuild
@@ -1,24 +1,22 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
-inherit gnome2-utils xdg-utils git-r3 autotools
+inherit autotools git-r3 xdg
 
 DESCRIPTION="Download manager using gtk+ and libcurl"
 HOMEPAGE="http://www.ugetdm.com"
-SRC_URI=""
 EGIT_REPO_URI="git://git.code.sf.net/p/urlget/uget2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS=""
 IUSE="aria2 appindicator control-socket +gnutls gstreamer libnotify nls openssl rss"
 
 RDEPEND="
-	>=net-misc/curl-7.19.1
+	dev-libs/glib:2
 	dev-libs/libpcre
-	>=dev-libs/glib-2.32:2
+	net-misc/curl
 	>=x11-libs/gtk+-3.4:3
 	gnutls? (
 		net-libs/gnutls
@@ -27,16 +25,15 @@ RDEPEND="
 	aria2? ( net-misc/aria2[xmlrpc] )
 	appindicator? ( dev-libs/libappindicator:3 )
 	gstreamer? ( media-libs/gstreamer:1.0 )
-	libnotify? ( x11-libs/libnotify )
-	"
-DEPEND="${RDEPEND}
+	libnotify? ( x11-libs/libnotify )"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	dev-util/intltool
 	virtual/pkgconfig
-	sys-devel/gettext
-	"
+	sys-devel/gettext"
 
 src_prepare() {
-	eapply_user
+	default
 	eautoreconf
 }
 
@@ -55,13 +52,3 @@ src_configure() {
 
 	econf "${myconf[@]}"
 }
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}