gentoo resync : 15.09.2019

31 files changed, 87 insertions, 745 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 267ed6ffbbed..e1a91f640f66 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/chrome-remote-desktop/Manifest b/net-misc/chrome-remote-desktop/Manifest
index eaebca8b9c2f..c0a789de66e0 100644
--- a/net-misc/chrome-remote-desktop/Manifest
+++ b/net-misc/chrome-remote-desktop/Manifest
@@ -1,9 +1,8 @@
 AUX chrome-remote-desktop-44.0.2403.44-always-sudo.patch 820 BLAKE2B f1e2c9d3a7bf2d53407b9ee4e4f34bf915d59502799bc4d38c9886d6c216dafb8ad957229a454da2ff750b00bc967e668cb022b06d4ad382e7427d61907970a1 SHA512 aa35c9e81b056fded2ff95b6fc7ab9cf3bb89282513b7bf1a04a9d25567d0e59da9c8c9877500e7290e40d712f4be06ae8b482d3f830d818ea5897e6ffde248b
-AUX chrome-remote-desktop.conf.d 579 BLAKE2B 30b23526aa888ffeaa4b4e3bb7ae642e550cdb044e5e538666859d704cafe423ee2851410c3897c9ee1587cf267f6683e71555aedb82aa6db8eb9d86f05dc00a SHA512 60d6f49bd9f08553b0e317d74571c66bd5e42f9a59cbd2c350802b4a3a4958cd75eca96222e96bae600b6c6f1e6f221a33093df4de0a3b499c1ebaaf5c081983
-AUX chrome-remote-desktop.rc 1388 BLAKE2B 937378e8ad7bb295333dc537a9c333e1a1041a75333de142c8b2299ea1c2cd9c2deb82bdac7e49e075996d30c96c1cfccb7edf130c922491edbfd164ad1b77b1 SHA512 f5d0755bfa337b7f3bf7b9d58cd9bd820404e1257e2d64cf74a073afece6af4dcb00a46ee2192087870eadd768b85a0b5ebd2b50223f13d105496a3902d094c2
-DIST chrome-remote-desktop_49.0.2623.40_amd64.deb 20315570 BLAKE2B 03725450590fad81105ae5314f9a1c9c9acc1b3f2d294ee1401379c264d59d737c2c39333ab5cb7a77e5885855ca484db360f0936be6c5bc2c84aa0cb38afe72 SHA512 d936885a986a749a0b4ebb1bb68fe0bc14d10d21363a409abbbb224b4f3ee048ef030ee81469be9bbb8c3852d7c6793fcab1f51d52fcaf5b02cda07550b72330
-DIST chrome-remote-desktop_49.0.2623.40_i386.deb 20941574 BLAKE2B 7f86e734fdc9c95f8820912aa075d4be805896f4f045ba39fb1fedc9ba6e3b576d71ce67692f683009ff005c2c248ed067ef4980906ae9e158c107aa96b58470 SHA512 00cf6641ee993fb8c295ca99cb57cde42eb3dd6cc34ae4684f858279615695d5b1a257081e8988293f94e887986492e112bc0276f572cd592d9879dec88eace8
+AUX chrome-remote-desktop.conf.d 283 BLAKE2B a0146298fa2e18e16911587de10aa3dd229cfb26a2d1865637cc4c69c317f4cb303b98daa7f91b6e69cc34c6fbbab3d19332396d4f5c11eeef4958401e26ff14 SHA512 5391c4a2d5787047f773abbf1c5a9dd3842160d768122edc32f0a0275e198882a41a3ca88526d52347f89d1fb4e1a51b6dc785c4dd4a0c0b5935e1e6eff30f49
+AUX chrome-remote-desktop.rc 1183 BLAKE2B d1d56ac91a2ced2c6f13019f9d5c7f1d554c2fbd3f57842d6d0b791f2e90233e4d6e8a49155b634a5e20c0bad212a5bc5f63924b1a83d45db01b1fd69445fa07 SHA512 831391b6fcaeeda476a3064d6fff1fdcebb8037aba124814a81ad4a1336a68973f319a003d1ed0938eea68f5ddad179fe29fb12efa05fd204f7fa9c5fb8dd735
 DIST chrome-remote-desktop_63.0.3239.17_amd64.deb 19026074 BLAKE2B 9a62d317768d6c0ab3cf3c6e7c5dea074133cc7c5d2b04ffdc1e0f9877f5f606c044ebab7b230914eba2ade51d2805fb1267f7b1731fa36235495a8192eb3c48 SHA512 2843deb7817217c8b8e41931b1e9ef0fdfb40c6a4ceb1bc69499aed16cc729d7ed64f88200c9bb2366a768f294a164da2360ed2b9654d1626696bcf0403e347a
-EBUILD chrome-remote-desktop-49.0.2623.40.ebuild 3668 BLAKE2B f149fbab2512737be2bf8668ac1aa6b0c2873a23afcbbef60fbb7d67fafd3ce213496860ff4266a05527712a26f6f9cf964258f8c8b5bb5c6638034c4f19ff5c SHA512 7486227050481ba09ac2f5a0c1fa205d1461210354bbbd2b1fdcd40195fc223ed018b439ad421c1f93c825e67106042e867f57552b68c26134fd185daa4126be
-EBUILD chrome-remote-desktop-63.0.3239.17-r1.ebuild 4080 BLAKE2B a0e1646c93031ae3a09b9bbd4e2ec2935498c9104354a8656acff039e1b726b222563e4c7385b44018f5bf974b4359ad68a19b285ecf5de854ff7d4592696f46 SHA512 26c40842a4d067e6690baccc0126379292dc2cfd6b555043fd961cd4152b69bfef7ff33841e5beebad3b0b05f0b926d2633b5b3f420fa880763fd5fe56b50874
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+DIST chrome-remote-desktop_77.0.3865.32_amd64.deb 35724698 BLAKE2B 25828e144d88072fde7a7e50cd278df1a90b94e0281038239d67e2369eaf93e82897cbda4624cffe34f045b185437a892671541eeb685b80a912733380e3afb8 SHA512 1181592536b9313ca136ce280c8349e3d7325b2bfa116714adc4fcb4d4b4f8659cb53cba134d2476b696fa73f55eefbc0a255f6cc76fb1a93eecfff42eb1d425
+EBUILD chrome-remote-desktop-63.0.3239.17-r1.ebuild 4112 BLAKE2B 0edc1e59c9eec6489a2cec2e8339aa793a6fd7a8968de8b1fc850c34b7f3036c74116071bde5f91138077f23f3f28ecd746d61957056dea4e21c3a9280689681 SHA512 7ea1764f4597fb3c8fa88a74db4b0b55a194202957694b10fd7cfd6f065d4b037319ff89606b7ef66b80666b43ed1347b55ddc76eb9452095a6964bdf88c28db
+EBUILD chrome-remote-desktop-77.0.3865.32.ebuild 4526 BLAKE2B d9c5a1b957b7b3c205537583df068083043929b408480b59a37adfc153d1a97c5078e6e25c4bf00bef4ecb64a4b4a7cd0ed861ed01905bfc156924aaf4c615c3 SHA512 6d42984536a841a24a4a549df5fc1100ecb5b6b90454f7904f2c0229151b51fa9cf77bf11c5d0c6653b686f113bf461447b4972459ea85e4008eec305873eeac
+MISC metadata.xml 276 BLAKE2B 8a6fe5ae6cacd4a94f3fe945063ae91355ba3cbf182272d90763581a55d6ba3c19242f48e626613556ba6eb9fc4063166aaaf50667c602005b6b1b6dc2d0488f SHA512 623ac9a8a7fbc2916d94c4d97a8861b637c54505d5b66caefcfb6cd622582500ca4fa96be8729b1a4806f6f21fe8e3c935eab9cc704e45cec7b01687c96fea32
diff --git a/net-misc/chrome-remote-desktop/chrome-remote-desktop-63.0.3239.17-r1.ebuild b/net-misc/chrome-remote-desktop/chrome-remote-desktop-63.0.3239.17-r1.ebuild
index d8dbea31d66a..fcf88e2f7fb0 100644
--- a/net-misc/chrome-remote-desktop/chrome-remote-desktop-63.0.3239.17-r1.ebuild
+++ b/net-misc/chrome-remote-desktop/chrome-remote-desktop-63.0.3239.17-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Base URL: https://dl.google.com/linux/chrome-remote-desktop/deb/
@@ -29,7 +29,7 @@ SRC_URI="amd64? ( ${BASE_URI}_amd64.deb )"
 LICENSE="google-chrome"
 SLOT="0"
 KEYWORDS="-* amd64"
-IUSE=""
+IUSE="xrandr"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 # All the libs this package links against.
@@ -61,6 +61,7 @@ RDEPEND="app-admin/sudo
 # Settings we just need at runtime.
 # TODO: Look at switching to xf86-video-dummy & xf86-input-void instead of xvfb.
 RDEPEND+="
+	xrandr? ( x11-apps/xrandr )
 	x11-base/xorg-server[xvfb]"
 DEPEND=""
 
diff --git a/net-misc/chrome-remote-desktop/chrome-remote-desktop-49.0.2623.40.ebuild b/net-misc/chrome-remote-desktop/chrome-remote-desktop-77.0.3865.32.ebuild
index 36683aa535d6..8703e9d55eb7 100644
--- a/net-misc/chrome-remote-desktop/chrome-remote-desktop-49.0.2623.40.ebuild
+++ b/net-misc/chrome-remote-desktop/chrome-remote-desktop-77.0.3865.32.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Base URL: https://dl.google.com/linux/chrome-remote-desktop/deb/
@@ -11,25 +11,25 @@
 #  pool/main/c/chrome-remote-desktop/chrome-remote-desktop_29.0.1547.32_amd64.deb
 #
 # Use curl to find the answer:
-#  curl -q https://dl.google.com/linux/chrome-remote-desktop/deb/dists/stable/main/binary-i386/Packages | grep ^Filename
+#  curl -q https://dl.google.com/linux/chrome-remote-desktop/deb/dists/stable/main/binary-amd64/Packages | grep ^Filename
 
-EAPI="5"
+EAPI="6"
 
 PYTHON_COMPAT=( python2_7 )
+PLOCALES="am ar bg bn ca cs da de el en_GB en es_419 es et fa fil fi fr gu he hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt_BR pt_PT ro ru sk sl sr sv sw ta te th tr uk vi zh_CN zh_TW"
 
-inherit unpacker eutils python-single-r1
+inherit unpacker eutils python-single-r1 l10n
 
 DESCRIPTION="access remote computers via Chrome!"
 PLUGIN_URL="https://chrome.google.com/remotedesktop"
 HOMEPAGE="https://support.google.com/chrome/answer/1649523 ${PLUGIN_URL}"
 BASE_URI="https://dl.google.com/linux/chrome-remote-desktop/deb/pool/main/c/${PN}/${PN}_${PV}"
-SRC_URI="amd64? ( ${BASE_URI}_amd64.deb )
-	x86? ( ${BASE_URI}_i386.deb )"
+SRC_URI="amd64? ( ${BASE_URI}_amd64.deb )"
 
 LICENSE="google-chrome"
 SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE=""
+KEYWORDS="-* ~amd64"
+IUSE="xrandr"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 # All the libs this package links against.
@@ -46,6 +46,8 @@ RDEPEND="app-admin/sudo
 	sys-devel/gcc
 	sys-libs/glibc
 	sys-libs/pam
+	x11-apps/xdpyinfo
+	x11-apps/setxkbmap
 	x11-libs/cairo
 	x11-libs/gtk+:2
 	x11-libs/libX11
@@ -57,7 +59,12 @@ RDEPEND="app-admin/sudo
 	x11-libs/libXtst
 	x11-libs/pango"
 # Settings we just need at runtime.
+# TODO: Look at switching to xf86-video-dummy & xf86-input-void instead of xvfb.
+# - The env var (CHROME_REMOTE_DESKTOP_USE_XORG) seems to be stripped before being checked.
+# - The Xorg invocation uses absolute paths with -logfile & -config which are rejected.
+# - The config takes over the active display in addition to starting up a virtual one.
 RDEPEND+="
+	xrandr? ( x11-apps/xrandr )
 	x11-base/xorg-server[xvfb]"
 DEPEND=""
 
@@ -65,18 +72,37 @@ S=${WORKDIR}
 
 QA_PREBUILT="/opt/google/chrome-remote-desktop/*"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-44.0.2403.44-always-sudo.patch #541708
+)
+
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-44.0.2403.44-always-sudo.patch #541708
-	python_fix_shebang opt/google/chrome-remote-desktop/chrome-remote-desktop
+	default
+
+	gunzip usr/share/doc/${PN}/*.gz || die
+
+	cd opt/google/chrome-remote-desktop
+	python_fix_shebang chrome-remote-desktop
+
+	cd remoting_locales
+	rm fake-bidi* || die
+	PLOCALES=${PLOCALES//_/-} l10n_find_plocales_changes "${PWD}" '' '.pak'
 }
 
 src_install() {
+	pushd opt/google/chrome-remote-desktop/remoting_locales >/dev/null || die
+	rm_pak() { local l=${1//_/-}; rm "${l}.pak" "${l}.pak.info"; }
+	l10n_for_each_disabled_locale_do rm_pak
+	popd >/dev/null
+
 	insinto /etc
 	doins -r etc/opt
+	dosym ../opt/chrome/native-messaging-hosts /etc/chromium/native-messaging-hosts #581754
 
 	insinto /opt
 	doins -r opt/google
 	chmod a+rx "${ED}"/opt/google/${PN}/* || die
+	fperms +s /opt/google/${PN}/user-session
 
 	dodir /etc/pam.d
 	dosym system-remote-login /etc/pam.d/${PN}
@@ -98,9 +124,10 @@ pkg_postinst() {
 		elog "(2) headless system"
 		elog "    (a) install the Chrome plugin on the client:"
 		elog "        ${PLUGIN_URL}"
-		elog "    (b) visit https://accounts.google.com/o/oauth2/auth?response_type=code&scope=https://www.googleapis.com/auth/chromoting+https://www.googleapis.com/auth/googletalk+https://www.googleapis.com/auth/userinfo.email&access_type=offline&redirect_uri=https://chromoting-auth.googleplex.com/auth&approval_prompt=force&client_id=440925447803-avn2sj1kc099s0r7v62je5s339mu0am1.apps.googleusercontent.com&hl=en&from_login=1&as=-760f476eeaec11b8&pli=1&authuser=0"
-		elog "    (c) run the command mentioned on the server"
-		elog "    (d) on the client, connect to the server"
+		elog "    (b) run ${EPREFIX}opt/google/chrome-remote-desktop/start-host --help to get the auth URL"
+		elog "    (c) when it redirects you to a blank page, look at the URL for a code=XXX field"
+		elog "    (d) run start-host again, and past the code when asked for an authorization code"
+		elog "    (e) on the client, connect to the server"
 		elog
 		elog "Configuration settings you might want to be aware of:"
 		elog "  ~/.${PN}-session - shell script to start your session"
diff --git a/net-misc/chrome-remote-desktop/files/chrome-remote-desktop.conf.d b/net-misc/chrome-remote-desktop/files/chrome-remote-desktop.conf.d
index db24cdd4ab11..aa3d8919c87f 100644
--- a/net-misc/chrome-remote-desktop/files/chrome-remote-desktop.conf.d
+++ b/net-misc/chrome-remote-desktop/files/chrome-remote-desktop.conf.d
@@ -4,11 +4,4 @@
 CHROME_REMOTING_USERS=''
 
 # Options to pass to chrome-remote-desktop.  Only the -s option is interesting.
-# Note: In order to support resizing, you need to:
-# (1) Apply this patch to xorg-server (via epatch_user):
-#     http://patchwork.freedesktop.org/patch/51428/
-# (2) Create a symlink /usr/bin/Xvfb-randr -> Xvfb
 #OPTIONS='-s 1600x1200 -s 3840x1600'
-
-# Directory to use for storing log files.
-#CHROME_REMOTE_DESKTOP_LOG_DIR='/var/log'
diff --git a/net-misc/chrome-remote-desktop/files/chrome-remote-desktop.rc b/net-misc/chrome-remote-desktop/files/chrome-remote-desktop.rc
index 0604c61c78a4..272923ce6afb 100644
--- a/net-misc/chrome-remote-desktop/files/chrome-remote-desktop.rc
+++ b/net-misc/chrome-remote-desktop/files/chrome-remote-desktop.rc
@@ -32,21 +32,15 @@ for_users() {
 	local user ret msg log
 	msg=$1; shift
 
-	: ${CHROME_REMOTE_DESKTOP_LOG_DIR:=/var/log}
-
 	for user in ${CHROME_REMOTING_USERS} ; do
 		ebegin "${msg} ${SVCNAME} for ${user}"
 
-		log="${CHROME_REMOTE_DESKTOP_LOG_DIR}/${SVCNAME}.${user}.log"
-		checkpath -f -m 0600 -o "${user}" "${log}"
-
 		# We need to background the app as it won't fork until the network
 		# (including DNS) is available.
 		start-stop-daemon \
 			-b \
 			-u "${user}" \
 			-x "${CRD}" \
-			-e "CHROME_REMOTE_DESKTOP_LOG_FILE=${log}" \
 			-- \
 			${OPTIONS} \
 			"$@"
diff --git a/net-misc/chrome-remote-desktop/metadata.xml b/net-misc/chrome-remote-desktop/metadata.xml
index 6f49eba8f496..1d1150f20e08 100644
--- a/net-misc/chrome-remote-desktop/metadata.xml
+++ b/net-misc/chrome-remote-desktop/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <!-- maintainer-needed -->
+<use>
+	<flag name="xrandr">Enable support for the XRandR extension for dynamic desktop resizing</flag>
+</use>
 </pkgmetadata>
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 13e471845f1d..27a3dd3a1f90 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -6,5 +6,5 @@ DIST curl-7.65.3.tar.xz 2392472 BLAKE2B 25726e1f1568fad6a8419b29dde41bed4d9de4be
 DIST curl-7.66.0.tar.xz 2414840 BLAKE2B f5d731c304c826442a8509016d00b9c68438ef9102b3c844c15315181c307e338f79930dc548d7f189b944dd74cc7eeb19d130b5a967ea2efa9862d15ae78bab SHA512 81170e7e4fa9d99ee2038d96d7f2ab10dcf52435331c818c7565c1a733891720f845a08029915e52ba532c6a344c346e1678474624aac1cc333aea6d1eacde35
 EBUILD curl-7.65.0.ebuild 6975 BLAKE2B 3ba830aa65b0c9e98f5128289a7c8cef5c3cbc2ee91881f47bb9318c2fe82f5121942c4263cbcef5d6ab26c602e4a2b1ffca795e8253800c5318a3c4f6c16f23 SHA512 fef5557f9175b3a8c6240e6a89dfb994412948a6e44ec356e308f4fdafd0362df2f63400048c9ea0d6cece07240370965ba51d39424c3014ee761db1d799bc15
 EBUILD curl-7.65.3.ebuild 7160 BLAKE2B 2dbbba6596cf5d1dde4e0a85f992327379043508bc78b1e2bb10dd29c2738a9505abdda5cd991ec36b9b56aeae3f13b5d5088429cd136185d9383956d80241db SHA512 2f4bde9132616c39f053e81cd068ad7529fa6baf68eb96f9da55b9308f49e51321bf458023df445b3d0eeebc13394cccc20ad2b902fc8dbe34b80863f3a421ea
-EBUILD curl-7.66.0.ebuild 7160 BLAKE2B 2dbbba6596cf5d1dde4e0a85f992327379043508bc78b1e2bb10dd29c2738a9505abdda5cd991ec36b9b56aeae3f13b5d5088429cd136185d9383956d80241db SHA512 2f4bde9132616c39f053e81cd068ad7529fa6baf68eb96f9da55b9308f49e51321bf458023df445b3d0eeebc13394cccc20ad2b902fc8dbe34b80863f3a421ea
-MISC metadata.xml 963 BLAKE2B 5bec839fdacef23398bbdf097aa8d25dae2579501d2f4a385c251ff4b37e246bb762c30ebc5f24e0fdafc65a11ff7a58406777f44071b10f43203ea6c68a5508 SHA512 d70b0f5aee074f53272cd6292503f4705142d4e9cc274e4e13228dda30bd6357618af3b70601ef9624bf98522525cde011d6c756faf24563cbf8953f9683400d
+EBUILD curl-7.66.0.ebuild 7236 BLAKE2B 51f16135e0dd3c0ecf6248874402bcf0ecce320d8b8b2eac695e11f859c84d7802154f52f72784936d538362d1981765b27ded037e44834d0b4558e3d269ed76 SHA512 4ff5bbb4436a2117892199eba43df7b154165a1351a027258312c46da9935e61adf9ff8e7a1debcf0f1a0eb8c4088b78008270c52d2b1a202c2be418b78d2c37
+MISC metadata.xml 1016 BLAKE2B 3b6cced0cc67b21cd3b8939d2c75106cf72eb92f186e2cd12a3c55b3d58a9d1e216f21b090db920c7b0cf18c4744358f5642602d2cd1472bd36ad554b87e7d33 SHA512 dbf81245497503293ad73160f337cffac29f7e7771e2a026d840bbed04c994164e62f72523f677a4e2ae3b656c27f90d5aba518e46f05df819f8696bb66fdb1b
diff --git a/net-misc/curl/curl-7.66.0.ebuild b/net-misc/curl/curl-7.66.0.ebuild
index 85324e17a3e7..66454bf5359d 100644
--- a/net-misc/curl/curl-7.66.0.ebuild
+++ b/net-misc/curl/curl-7.66.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://curl.haxx.se/download/${P}.tar.xz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="adns brotli http2 idn ipv6 kerberos ldap metalink +progress-meter rtmp samba ssh ssl static-libs test threads"
+IUSE="adns alt-svc brotli http2 idn ipv6 kerberos ldap metalink +progress-meter rtmp samba ssh ssl static-libs test threads"
 IUSE+=" curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl"
 IUSE+=" elibc_Winnt"
 
@@ -153,7 +153,7 @@ multilib_src_configure() {
 
 	ECONF_SOURCE="${S}" \
 	econf \
-		--disable-alt-svc \
+		$(use_enable alt-svc) \
 		--enable-crypto-auth \
 		--enable-dict \
 		--enable-file \
@@ -201,6 +201,9 @@ multilib_src_configure() {
 		$(use_with kerberos gssapi "${EPREFIX}"/usr) \
 		$(use_with metalink libmetalink) \
 		$(use_with http2 nghttp2) \
+		--without-nghttp3 \
+		--without-ngtcp2 \
+		--without-quiche \
 		$(use_with rtmp librtmp) \
 		$(use_with brotli) \
 		--without-schannel \
diff --git a/net-misc/curl/metadata.xml b/net-misc/curl/metadata.xml
index a6d736bd7cf3..a4deda9a7a5f 100644
--- a/net-misc/curl/metadata.xml
+++ b/net-misc/curl/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Anthony G. Basile</name>
 	</maintainer>
 	<use>
+		<flag name="alt-svc">Enable alt-svc support</flag>
 		<flag name="brotli">Enable brotli compression support</flag>
 		<flag name="http2">Enabled HTTP/2.0 support</flag>
 		<flag name="ssh">Enabled SSH urls in curl using libssh2</flag>
diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
index c2b1b5f2d533..1bc6721aa879 100644
--- a/net-misc/dhcpcd/Manifest
+++ b/net-misc/dhcpcd/Manifest
@@ -1,10 +1,8 @@
 AUX dhcpcd.initd 328 BLAKE2B 72ef6bb16e4f80b440890112cd399eca1057ae42ddc96ee1a29482a048682dd34e065bb68876329ecfe2f1db4c084e320f4185b3029b89c2328d6ab27a1a7e80 SHA512 6d3220155f2d9ed3e3a00afd378eeb70d435e19804201f8bb35498f1f7f3dfdaeaa2f4a01a18f5e96b457d9c173bc6a206b3e67ebf6d95da7e7b350dcd153fde
 AUX dhcpcd.service 227 BLAKE2B e24aa85c15d0211856b02508b681f7e3c1f8b8b1743f31ced9600c2c33da04b61f2166cad7696776ae81ce1be5701cae2691f6dfd86aaf8679f20e459e87c7e5 SHA512 4a030dc291fa7deba9c1f33d61dafdda710247ef7f3743c28e46b767a190e359e468433147bda23c82fae9c93ec31cd68905bfdb51cb8c2d9176ea789b31b14e
 DIST dhcpcd-7.2.3.tar.xz 213552 BLAKE2B 5f89e11424b85702b05da6207ec346480c029de1416cc8892471de428ca0a4395a8915700e2237bfa2b133648973bc2a7c7d15aa2d0ba492f96fbf3908d7f613 SHA512 271cca422fad10eaf842acfd5b590c0ad537f5f23ee919a3928d8ad98463ab03bde21c0bc08741ea9618ee31095160a7c00066155eae2c74b17c49af65ba566f
-DIST dhcpcd-8.0.3.tar.xz 223104 BLAKE2B ca1b35e0fc0f8b345d2a55e380aa4e10b864f18f4b5368659875ef5efc955fac442b0505b0192578d83fa8c3b304942e50aa082d753e98dc3cd44237100f106c SHA512 0a740286181e1b24e7ac5157f60727c2a3abd81080235efc8ba86628bb8e2aa877b8d9348055c16cdae1a819f443afbf452907a25152bb936a6dc72f3a179944
-DIST dhcpcd-8.0.4.tar.xz 224236 BLAKE2B ae1bc71fef58526482d5c0b34f66d68ad4baf84979da2fa90d51ec1831ccdc2a2d77dc1a09b52b8fa58deed42ff7c6af49a165afba50decae0085788bcbb10c2 SHA512 d5ea895b841a1afcabd50013800f567c0a9c077cd409ec18c5442b3da6bac814db5e9ae4a4218076eb5119bd7ccb732d3f58e22dcbba38ede26ee668f9733ec4
+DIST dhcpcd-8.0.6.tar.xz 224552 BLAKE2B 5d0fab5977597ce182a2de56c8c4d085d3595a8f1209fc76788b707af0fffd4285a958cebfe7bab6c04ae7a2ba94c466d689dc9c3a71708c1baabd328b2bbf3e SHA512 19a568800a4e510a250de7cc111700b364c68bfe3907f1ac2cda81aacd079cb9ac87731cbabbf8f1e85e055a11c7ba88e419f6c4d7b33f8842dfaeadc7d1e193
 EBUILD dhcpcd-7.2.3.ebuild 4407 BLAKE2B 6f5df954ec0be66be6a4f4c1b63a1dee87e78d5cab8de8cbe935bd0d2a82caf70c5dc8d513ddc69b6e317a3d44c2a527529420da71ecf1489a71cdc2f4384eb5 SHA512 aa591926ec797c71c9d28d91a64257eaee76e2fae6853925e0b0fdf9001fd6279bdae68bdd2727f500661b8142c96b3c66ab28b055fb8887c4b7d96162d42843
-EBUILD dhcpcd-8.0.3.ebuild 4420 BLAKE2B d1788540e773dc7708565dd2343989522004ad307e0ae24fad827f9ecc8ebf181d47bc34e16179f50a16ece7105761f9177cb4e310a586b0ed11a5343dc97b03 SHA512 207fb14d4e3c6089d1f4ac5816fd3635c2e38d74e0f1dd19d41aa482d5b399f90a8b352e77eec7153019168746d7f1c63499a741430a8df95f3734bf7cfd878b
-EBUILD dhcpcd-8.0.4.ebuild 4420 BLAKE2B d1788540e773dc7708565dd2343989522004ad307e0ae24fad827f9ecc8ebf181d47bc34e16179f50a16ece7105761f9177cb4e310a586b0ed11a5343dc97b03 SHA512 207fb14d4e3c6089d1f4ac5816fd3635c2e38d74e0f1dd19d41aa482d5b399f90a8b352e77eec7153019168746d7f1c63499a741430a8df95f3734bf7cfd878b
+EBUILD dhcpcd-8.0.6.ebuild 4420 BLAKE2B d1788540e773dc7708565dd2343989522004ad307e0ae24fad827f9ecc8ebf181d47bc34e16179f50a16ece7105761f9177cb4e310a586b0ed11a5343dc97b03 SHA512 207fb14d4e3c6089d1f4ac5816fd3635c2e38d74e0f1dd19d41aa482d5b399f90a8b352e77eec7153019168746d7f1c63499a741430a8df95f3734bf7cfd878b
 EBUILD dhcpcd-9999.ebuild 4420 BLAKE2B d1788540e773dc7708565dd2343989522004ad307e0ae24fad827f9ecc8ebf181d47bc34e16179f50a16ece7105761f9177cb4e310a586b0ed11a5343dc97b03 SHA512 207fb14d4e3c6089d1f4ac5816fd3635c2e38d74e0f1dd19d41aa482d5b399f90a8b352e77eec7153019168746d7f1c63499a741430a8df95f3734bf7cfd878b
 MISC metadata.xml 569 BLAKE2B 0507986b52ed21277e159089c7f4736602917c44f0577d62e7501d728c348b49ecf3a2c92842c8e32a59402ad2c2e4e5c3fba510e227aca738a3d763b62689fe SHA512 9083c03d22c5753f54d9525ac954df8df0cceaed07c05c14367ea2b8598e7d7ab64711c810dc89a46be8d76cba6b9aa14fa389f0d686ed12792c0bfcbabc266a
diff --git a/net-misc/dhcpcd/dhcpcd-8.0.4.ebuild b/net-misc/dhcpcd/dhcpcd-8.0.4.ebuild
deleted file mode 100644
index d8940210a7b5..000000000000
--- a/net-misc/dhcpcd/dhcpcd-8.0.4.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd toolchain-funcs
-
-if [[ ${PV} == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://roy.marples.name/git/dhcpcd.git"
-else
-	MY_P="${P/_alpha/-alpha}"
-	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 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
-HOMEPAGE="https://roy.marples.name/projects/dhcpcd"
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="elibc_glibc +embedded ipv6 kernel_linux +udev"
-
-COMMON_DEPEND="udev? ( virtual/udev )"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-
-src_configure() {
-	local myeconfargs=(
-		--dbdir="${EPREFIX}/var/lib/dhcpcd"
-		--libexecdir="${EPREFIX}/lib/dhcpcd"
-		--localstatedir="${EPREFIX}/var"
-		--prefix="${EPREFIX}"
-		--with-hook=ntp.conf
-		$(use_enable embedded)
-		$(use_enable ipv6)
-		$(usex elibc_glibc '--with-hook=yp.conf' '')
-		$(usex kernel_linux '--rundir=${EPREFIX}/run' '')
-		$(usex udev '' '--without-dev --without-udev')
-		CC="$(tc-getCC)"
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	keepdir /var/lib/dhcpcd
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-}
-
-pkg_postinst() {
-	local dbdir="${EROOT}"/var/lib/dhcpcd old_files=()
-
-	local old_old_duid="${EROOT}"/var/lib/dhcpcd/dhcpcd.duid
-	local old_duid="${EROOT}"/etc/dhcpcd.duid
-	local new_duid="${dbdir}"/duid
-	if [[ -e "${old_old_duid}" ]] ; then
-		# Upgrade the duid file to the new format if needed
-		if ! grep -q '..:..:..:..:..:..' "${old_old_duid}"; then
-			sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_old_duid}"
-		fi
-
-		# Move the duid to /etc, a more sensible location
-		if [[ ! -e "${old_duid}" ]] ; then
-			cp -p "${old_old_duid}" "${new_duid}"
-		fi
-		old_files+=( "${old_old_duid}" )
-	fi
-
-	# dhcpcd-7 moves the files out of /etc
-	if [[ -e "${old_duid}" ]] ; then
-		if [[ ! -e "${new_duid}" ]] ; then
-			cp -p "${old_duid}" "${new_duid}"
-		fi
-		old_files+=( "${old_duid}" )
-	fi
-	local old_secret="${EROOT}"/etc/dhcpcd.secret
-	local new_secret="${dbdir}"/secret
-	if [[ -e "${old_secret}" ]] ; then
-		if [[ ! -e "${new_secret}" ]] ; then
-			cp -p "${old_secret}" "${new_secret}"
-		fi
-		old_files+=( "${old_secret}" )
-	fi
-
-	# dhcpcd-7 renames some files in /var/lib/dhcpcd
-	local old_rdm="${dbdir}"/dhcpcd-rdm.monotonic
-	local new_rdm="${dbdir}"/rdm_monotonic
-	if [[ -e "${old_rdm}" ]] ; then
-		if [[ ! -e "${new_rdm}" ]] ; then
-			cp -p "${old_rdm}" "${new_rdm}"
-		fi
-		old_files+=( "${old_rdm}" )
-	fi
-	local lease=
-	for lease in "${dbdir}"/dhcpcd-*.lease*; do
-		[[ -f "${lease}" ]] || continue
-		old_files+=( "${lease}" )
-		local new_lease=$(basename "${lease}" | sed -e "s/dhcpcd-//")
-		[[ -e "${dbdir}/${new_lease}" ]] && continue
-		cp "${lease}" "${dbdir}/${new_lease}"
-	done
-
-	# Warn about removing stale files
-	if [[ -n "${old_files[@]}" ]] ; then
-		elog
-		elog "dhcpcd-7 has copied dhcpcd.duid and dhcpcd.secret from"
-		elog "${EROOT}/etc to ${dbdir}"
-		elog "and copied leases in ${dbdir} to new files with the dhcpcd-"
-		elog "prefix dropped."
-		elog
-		elog "You should remove these files if you don't plan on reverting"
-		elog "to an older version:"
-		local old_file=
-		for old_file in ${old_files[@]}; do
-			elog "	${old_file}"
-		done
-	fi
-
-	if [ -z "${REPLACING_VERSIONS}" ]; then
-		elog
-		elog "dhcpcd has zeroconf support active by default."
-		elog "This means it will always obtain an IP address even if no"
-		elog "DHCP server can be contacted, which will break any existing"
-		elog "failover support you may have configured in your net configuration."
-		elog "This behaviour can be controlled with the noipv4ll configuration"
-		elog "file option or the -L command line switch."
-		elog "See the dhcpcd and dhcpcd.conf man pages for more details."
-
-		elog
-		elog "Dhcpcd has duid enabled by default, and this may cause issues"
-		elog "with some dhcp servers. For more information, see"
-		elog "https://bugs.gentoo.org/show_bug.cgi?id=477356"
-	fi
-
-	if ! has_version net-dns/bind-tools; then
-		elog
-		elog "If you activate the lookup-hostname hook to look up your hostname"
-		elog "using the dns, you need to install net-dns/bind-tools."
-	fi
-}
diff --git a/net-misc/dhcpcd/dhcpcd-8.0.3.ebuild b/net-misc/dhcpcd/dhcpcd-8.0.6.ebuild
index d8940210a7b5..d8940210a7b5 100644
--- a/net-misc/dhcpcd/dhcpcd-8.0.3.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-8.0.6.ebuild
diff --git a/net-misc/hblink/Manifest b/net-misc/hblink/Manifest
deleted file mode 100644
index e63983a731e5..000000000000
--- a/net-misc/hblink/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD hblink-9999.ebuild 1245 BLAKE2B 67d220cd1afcb6a1e20c82ae23cdf493d1e15900b148c63a00ef00fb925acfd8a57f5b38414d64367f4c898651d9e1fb4742f3f1da93747d3e3e9ae8bc1d9660 SHA512 aa5e2651e709de4d78f7aec4d2c3cd50cb404ec70886e4b3f28f827eb725d63062ca3a01bc4a13dbb0fac41903c115502c769e4be15f44d28eded7737941eba9
-MISC metadata.xml 247 BLAKE2B 0f6116ad1a6532d4d062e4e8dadf00f3053ccd4408f030535d3adc5f0399e43ac1682b3786a1a321ba7dd8c1b448cebc5938207a5af59fc033e0e6cf4c654c40 SHA512 8111616dc98858617382132291d5d7a4900eb04643a2c67d4c2eae21dbd08e2fd5f73d533befaa5a0c6a074b04046f1e5bf7a139386ca10ffffef329825d0514
diff --git a/net-misc/hblink/hblink-9999.ebuild b/net-misc/hblink/hblink-9999.ebuild
deleted file mode 100644
index c616379777ee..000000000000
--- a/net-misc/hblink/hblink-9999.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-inherit git-r3 python-single-r1 systemd
-
-DESCRIPTION="HomeBrew Repeater protocol as used by DMR+, MMDVM and Brandmeister"
-HOMEPAGE="https://github.com/n0mjs710/HBlink"
-EGIT_REPO_URI="https://github.com/n0mjs710/HBlink.git"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS=""
-IUSE="systemd"
-
-PDEPEND="dev-python/bitstring["${PYTHON_USEDEP}"]
-		dev-python/bitarray["${PYTHON_USEDEP}"]
-		dev-python/twisted["${PYTHON_USEDEP}"]
-		net-misc/dmr_utils["${PYTHON_USEDEP}"]"
-
-src_prepare() {
-	rm -r retired || die
-	sed -i "s#/opt/HBlink#/usr/share/${PN}#" systemd/*.service
-	default
-}
-
-src_install() {
-	if use systemd; then
-		insinto "$(systemd_get_systemunitdir)"
-		doins systemd/*.service
-	fi
-	rm -r systemd || die
-
-	insinto /etc/hblink
-	newins hblink-SAMPLE.cfg hblink.cfg
-
-	insinto /usr/share/"${PN}"
-	doins -r *
-	python_fix_shebang "${ED}/usr/share/${PN}"
-	ln -s /etc/hblink/hblink.cfg "${ED}"/usr/share/"${PN}"/hblink.cfg
-
-	dodir /usr/bin
-	for i in hb_bridge_all hb_confbridge
-	do
-		cat <<-EOF > "${ED}"/usr/bin/${i}
-			#! /bin/sh
-			cd /usr/share/${PN}
-			python2 ./${i}.py "\$@"
-		EOF
-		fperms +x /usr/bin/${i}
-	done
-}
diff --git a/net-misc/hblink/metadata.xml b/net-misc/hblink/metadata.xml
deleted file mode 100644
index f4c696b2c619..000000000000
--- a/net-misc/hblink/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<name>Rick Farina</name>
-		<email>zerochaos@gentoo.org</email>
-	</maintainer>
-</pkgmetadata>
diff --git a/net-misc/java-wakeonlan/Manifest b/net-misc/java-wakeonlan/Manifest
deleted file mode 100644
index 6fdfad55b86d..000000000000
--- a/net-misc/java-wakeonlan/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX java-wakeonlan-1.0.0-build.xml.patch 1134 BLAKE2B 16de46ce3f44335e9befe8c50dea2861ad616d135da352f0050c3b153dfde6bcf2384a315e381f28c44e9e00f739dfa0051a275537e5869971c8b527e39bad49 SHA512 5b4c6e81a7835dfd841349a69443c988ae8803fe5777089b76fadbd07bbd6b50b013160d79b9b97a3282f4914d645b8643f9f085193184df6a361f886d2bed13
-DIST wakeonlan-1.0.0.zip 352181 BLAKE2B 99d7d51c9211dcac0876e2b70980d813188a7b24ea9c082df402e019a67fdfeffcb9e1f6cf180107c134ede987881a239647a6170a206f2b53ec99d98843bc3d SHA512 286cba36b70fae8a85dfdbb1fa4c0e3345f1d3b67187571d9134fc7cb432874613f6a713d40c1d9d9874af09dc03214441a5f88f9ea3d3cf29ce0d059fddcdee
-EBUILD java-wakeonlan-1.0.0-r2.ebuild 1201 BLAKE2B f363bc10fd1e1392c90eb12522b8285345b51f1d0a2795ea7e7a2d00c0fff0c09a33a637d2337d73033169eb577327a4c90b9013d26d8b10587fe54a44bffba2 SHA512 f7a4e13e1dcbf658192f3a85b428a67b30642c2c8540009004785c8e3b7341df5ac2cf7a75880d2b3f9dfa866e328b402872cc42f8be131e832e5a54082c875b
-MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/net-misc/java-wakeonlan/files/java-wakeonlan-1.0.0-build.xml.patch b/net-misc/java-wakeonlan/files/java-wakeonlan-1.0.0-build.xml.patch
deleted file mode 100644
index d3c352bd52d1..000000000000
--- a/net-misc/java-wakeonlan/files/java-wakeonlan-1.0.0-build.xml.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- build.xml	2004-06-03 16:21:44.000000000 +0300
-+++ build.xml.fixed	2009-01-31 11:48:56.000000000 +0200
-@@ -38,7 +38,6 @@
- 			target="${build.target}" 
- 			classpathref="build.classpath" >
- 			<src path="${src.dir}" />
--			<src path="${testsrc.dir}" />
- 		</javac>
- 		<copy todir="${build.classes.dir}" overwrite="true">
- 			<fileset dir="${src.dir}">
-@@ -56,6 +55,16 @@
- 		</copy>
- 	</target>
- 	
-+	<target name="build-test">
-+		<javac destdir="${build.classes.dir}" 
-+			debug="${build.debug}" 
-+			optimize="${build.optimize}" 
-+			target="${build.target}" 
-+			classpathref="build.classpath" >
-+			<src path="${testsrc.dir}" />
-+		</javac>
-+	</target>
-+	
- 	<target name="init.javadoc">
- 		<mkdir dir="${deploy.javadoc.dir}"/>
- 	</target>
-@@ -74,7 +83,7 @@
- 		</javadoc>
- 	</target>
- 	
--	<target name="test" depends="build">
-+	<target name="test" depends="build-test">
- 		<junit showoutput="true" printsummary="true">
- 			<classpath >
- 				<path refid="build.classpath" />
-@@ -179,4 +188,4 @@
- 		<antcall target="deploy.ws" />
- 		<antcall target="deploy.zip" />
- 	</target>
--</project>
-\ Dosya sonunda yenisatır yok.
-+</project>
diff --git a/net-misc/java-wakeonlan/java-wakeonlan-1.0.0-r2.ebuild b/net-misc/java-wakeonlan/java-wakeonlan-1.0.0-r2.ebuild
deleted file mode 100644
index 61ffce601346..000000000000
--- a/net-misc/java-wakeonlan/java-wakeonlan-1.0.0-r2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A wakeonlan commandline tool and Java library"
-SRC_URI="http://www.moldaner.de/wakeonlan/download/wakeonlan-${PV}.zip"
-HOMEPAGE="http://www.moldaner.de/wakeonlan/"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-CDEPEND="dev-java/jsap:0
-	dev-java/junit:4"
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-DEPEND=">=virtual/jdk-1.6
-	app-arch/unzip
-	test? (
-		dev-java/ant-junit:0
-	)
-	${CDEPEND}"
-
-S=${WORKDIR}/wakeonlan-${PV}
-
-EANT_GENTOO_CLASSPATH="jsap"
-EANT_BUILD_TARGET="deploy"
-JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
-
-src_unpack() {
-	unpack ${A}
-}
-
-java_prepare() {
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-build.xml.patch
-	find -name "*.jar" | xargs rm -v
-	java-ant_rewrite-classpath
-}
-
-EANT_TEST_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
-EANT_TEST_TARGET="test"
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_dojar deploy/wakeonlan.jar
-	java-pkg_dolauncher ${PN} --main wol.WakeOnLan
-	dodoc doc/README
-	use doc && java-pkg_dojavadoc deploy/doc/javadoc
-	use source && java-pkg_dosrc src/wol
-}
diff --git a/net-misc/java-wakeonlan/metadata.xml b/net-misc/java-wakeonlan/metadata.xml
deleted file mode 100644
index 2444066aa02b..000000000000
--- a/net-misc/java-wakeonlan/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>java@gentoo.org</email>
-	<name>Java</name>
-</maintainer>
-</pkgmetadata>
diff --git a/net-misc/radvd/Manifest b/net-misc/radvd/Manifest
index 1593ed5ee445..a5dc6d84a8de 100644
--- a/net-misc/radvd/Manifest
+++ b/net-misc/radvd/Manifest
@@ -11,5 +11,5 @@ DIST radvd-2.18.tar.gz 224183 BLAKE2B 4bacf9e17b78286a032ca5e6b6424aa8742d2e42b3
 EBUILD radvd-2.14.ebuild 1763 BLAKE2B ffe1ecff2d2fa70d7bfb9e8dd20fc7e15a017d8ce363ed3fe36780ee803676aa6ab3d650ba8d48bd8f5fd1f2207a86486916edb831d16c723511bc9d907d71ba SHA512 7f7e28f4d4b84e088fb60a50c26ce2a42eb3ddbcfce094f035d779a01aa235b27e24ed590646ab186f2faec854e6d13f5b2c32e0e580d76dfc6d08ba5e4f9550
 EBUILD radvd-2.17-r1.ebuild 1575 BLAKE2B 327a7eb2dc9a567145a14f556e4e4bb7d35e0184b83d7336d963f3754c96cfc4d1bd8db85b074c6ccf547cf4331b2260ace20a05ee085eea895fd5088cd16e2d SHA512 d4df95d439844c4be3dd7df39609c762acb27a8f3b6db1dba081c1961e03289cf0fdb795bf1d10f20053bac9e587995944a70efa5c9d6e53ab0e7cc88c1d86b8
 EBUILD radvd-2.17-r2.ebuild 1628 BLAKE2B caaaedd5d8d132165e080f1ad9888c629a2cc44f7a75a0213cbd1ffa32fd50725ded8366eeb5ecf08ce2d3d5a8873730dca7f7aff7931e3aa2ea67dbaab4ef9c SHA512 7b1ca29b1537e18c66dcd7e6bf764df08e350b9006e589de9e5388684d12ff7532e1d4b86c36d1981da8760b766916ae33a010a1052c52d51010a4e3dd3a6206
-EBUILD radvd-2.18.ebuild 1585 BLAKE2B 4b7ee406b6a20b3ad44e1dbc01d47db91af0d6ea623e1939d6030c46aeeeb651a7d1e40ea1dc9a611c907ac77c7db34b0ec130b8946078c2bc6ab59d3fb568e9 SHA512 b715af5af67cb90b30e43f79392db9942124e099151c2411a885809f586eff843428a0546e7783971e9c535aba7d3e6131986cee511fc72d4f3ab3874f2c549e
+EBUILD radvd-2.18.ebuild 1584 BLAKE2B d6e8e4e912e5ae7575a7c4cadce775d33e36b16ca6dd5c3609bbe245499f6df9c92e268bd9520030e84df729323143b1707e0c60cb0a00ab8a2c088f2eafbca6 SHA512 a18b943a3f8fb84b49a99f17bcedde0f54c045d99f925c38cf4a12d84dbf2625e64f3b290447255ffb73ee240274c681a86853cfef753bafa94e7b91e12caa6a
 MISC metadata.xml 357 BLAKE2B 7a671f4f2fc8439f4fb80a70b5e436e9002464600ce9ad0c9aacdc22d7c3d090e26ac30431d39107ab1081f6238528b91e67d3e1e59a7ba64a85e92c584bc4d8 SHA512 d81daf7b68978a8012b5c5de47074fa35bfcd457f99ef873f0ac46409022d93c41eac5bd7492f7af1b9f7b1bae94da7eb8e6fa537414b6371ca77ba13b70e1c1
diff --git a/net-misc/radvd/radvd-2.18.ebuild b/net-misc/radvd/radvd-2.18.ebuild
index e42974c512d2..7503085d0a1c 100644
--- a/net-misc/radvd/radvd-2.18.ebuild
+++ b/net-misc/radvd/radvd-2.18.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://v6web.litech.org/radvd/dist/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 hppa ppc sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 arm arm64 hppa ppc sparc x86 ~x86-fbsd"
 IUSE="kernel_FreeBSD selinux test"
 
 CDEPEND="dev-libs/libdaemon"
diff --git a/net-misc/remmina/Manifest b/net-misc/remmina/Manifest
index cbf89dd5578e..a3d182ba59a1 100644
--- a/net-misc/remmina/Manifest
+++ b/net-misc/remmina/Manifest
@@ -1,13 +1,5 @@
-DIST Remmina-v1.2.31.3.tar.gz 1248295 BLAKE2B da748ceea5aa50702b060075c8e5c4aefe11ca1ebbc301b2951df76208da5998746631ef4c57f5692678e948839a8869a183b777f7046d416a55e5ac5b0d76d1 SHA512 f95c4dcebd833b590fbf0b418854bae66541743bc77cda4b0b97e1e49b158927fa859907619fd532b0660fc30eee80be472e02c38a2afe33e477c4a903a99e28
-DIST Remmina-v1.3.3.tar.gz 1362239 BLAKE2B 8ae5b72293ffe2f627a46aa9354256d84d318819b0d5c236f4d5628764eaa9e3a3d07f3130ae04ee271cbc6ac207ccfaf495533b3fa59ee184d3da19c8738bc8 SHA512 72d0303f922619c3842880365bb68b967eb2134fef7187d0fd83aeec2b50fb499573849f853d509216608eefc02db7ced91cfc65f89154b51d0657e42bd0d637
 DIST Remmina-v1.3.4.tar.gz 1365473 BLAKE2B f71a9c0a0fa9eafa547abf192972da39f0cfe1ca3745a87783d6a9ec5bab0674d93df8815b589b25659990bb345748f8f464f401c7efb934e8e71b207b0dab67 SHA512 212ebc6e08c694861522a05feb51e4efa012ef3361debf079384c07e4354370f6cf7d2880ff442bbe03782421bac7f33343d8049207073d90925d1c894d30e7a
 DIST Remmina-v1.3.6.tar.gz 1538166 BLAKE2B f3fc60df2a1a31bd5aae7d8de2d85cd579fa4cc35a0351fbce80433e21583b67cfc81665307d02fbd4863f6a55695be81f9c4d07423d6c8122d84dd625b69c3b SHA512 ce16379aa163467d05018c900d0dc7c2a7d73c1c22dd06a9a3092efa7675fda505bfa31b20131b9a3a10c74788377db17961c0bc9e59c47b1c7a15bf347f3bab
-DIST remmina-1.2.0_rc24.tar.gz 1052140 BLAKE2B 57b3d2ed8a765f98f1ffd3c79df076d07e00329bf95dfddb9094d8bc62838b0f6742b404b4deef0a037bd88259751799e1842fb97313337e11b8f0faed8ad302 SHA512 aab421c580e434ca673be063f3662f1d9128cc83aaee6f9bc6acf6996af0379af6fb99cc63273941c40c6b989653b972de6c43b575ca06bf56ec7c266590c17e
-DIST remmina-1.3.5_p20190731.tar.gz 1475593 BLAKE2B 0a2ddb9c45474e65de9a5be28155ad45f06779170dc360f415ed7ce96fd8595d730eb5f89f756075f89ba5e8e124962fdd07f85d4ac90157eb1e0fae99169fbf SHA512 8b25dae17e13812184481d0640f44a253f0b66260e5e41b06d4e65e9d4dd673d0a17fab2453c9a29ba4691d53ac6e49cb35160931c546a7c68bc483e11eab987
-EBUILD remmina-1.2.0_rc24.ebuild 2035 BLAKE2B 7490ba779c88bf0caf7f1de2398dec1484acf428f3f1ddd06b021965d3ef255927d9637e24c56a71a3737707ef6a2df0257dc1a486c60e665e99721aaa5c1092 SHA512 058740deb4f072b8677fcb5bcedf2c870dccf748c166594cdf24cc09574b1fd1b8fb0157b89c82e43bd3dabcc892e72f561ed4db816ea269c40b2da9b73ce3cf
-EBUILD remmina-1.2.31.3.ebuild 2239 BLAKE2B 65e7720bc587f060e1014ea7c35832a4eb3a7c3a618913b35803c56103f814e0d82e65756471cef1e55da3f5d6a2044660b8adb33e7fa82618dba3c376e5fa6d SHA512 f038e0f8242aee5eb86403dc0e4758278f91407b9382b837d248de914037d88f7fac489ce326f5499c4cc548215f924b17ae10e8792955efec868b9e4c00f3f6
-EBUILD remmina-1.3.3.ebuild 2247 BLAKE2B 99065b1b37f957f07f0a16487f2dd4c9dc3f7c60cf9657584b6c0f1ed06b41602f8763d3e88f02234a42ad424080818e35df676e61dde7a6042d4934526ce65b SHA512 f80bf47e941b0c505610f757647c3260c7182d230e2f8067c3ed3781bd37c1ebcdab52aba279e9a51bda2f6faec78a7c0eb4e75c8c85f6fadb965ab0ff9910b3
 EBUILD remmina-1.3.4.ebuild 2245 BLAKE2B 256d9073a83f692a70c9db223a0d201f30100a5ff80d411f1990a53afd4954e6b96b8be0e9ef47600c4d3f2039b9250daf33fb9dc5ff6d6d74d451d860e52d49 SHA512 d2181e7130c47df3b0849936bea4cef88444ecbd2873a45b5f2f46e3269d310dc27d958138ecf7f0ed3d6929a82a8a9b0a3999838eb9dfb1646b137a481772d1
-EBUILD remmina-1.3.5_p20190731.ebuild 2530 BLAKE2B 88ee3101aa2954144e0e633a3a0f3e099b66eeb5451546dae5605176f8a8ae08a6619f51aca1f149ba23f33358eb63d7d958d9da189172183982d9a56ef384ab SHA512 ec5265dcf6489f7d0edd6eb48f2733cfc2b70ff208fb63d39af0e9e5a6b1908f646cfc431f039a53ee4df114265c98b458dc066dcc80e87131f10e5e9735800b
 EBUILD remmina-1.3.6.ebuild 2474 BLAKE2B 88edb239965f778136ffeda7464f73f5bec967e79309876ff8575c2573d91f836cfed7310f42dabf8f653b91b91e6c967415e28bd8cd22327fa4d955318a1728 SHA512 72550d956488a237ce029b3bf1fc61091820dd669804c2920cb83adb1167f55a2e6db212024dbb02cb511cb9a27c2afabc623189aa58a9fc47985fd1df5a3d73
 MISC metadata.xml 1310 BLAKE2B bcf7c45908f6d13c26cbb7564e78d925c34000ed1ba20f793ada10d34e0f5f8b7ca380cb2688029eb4bac52b8afa3ed06cf5e635d8789d64f4cb420d23167cd5 SHA512 8bc4313586204ce7d2e386815599ef8694b8e39816612b0bdc7984676fd17f0a78f94f96677c1a51b5bd8876402c0cfef58a629c60c091ebfed14912e4ca9bff
diff --git a/net-misc/remmina/remmina-1.2.0_rc24.ebuild b/net-misc/remmina/remmina-1.2.0_rc24.ebuild
deleted file mode 100644
index 7d87cd64d66a..000000000000
--- a/net-misc/remmina/remmina-1.2.0_rc24.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils eutils gnome2-utils
-
-MY_PV="${PV//_rc/-rcgit.}"
-
-DESCRIPTION="A GTK+ RDP, SPICE, VNC, XDMCP and SSH client"
-HOMEPAGE="https://remmina.org/"
-SRC_URI="https://github.com/FreeRDP/Remmina/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="ayatana crypt rdp gnome-keyring nls spice ssh telepathy vnc zeroconf"
-
-CDEPEND="
-	dev-libs/glib:2
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	x11-libs/libxkbfile
-	ayatana? ( dev-libs/libappindicator:3 )
-	crypt? ( dev-libs/libgcrypt:0= )
-	rdp? ( >=net-misc/freerdp-2.0.0_rc0 <net-misc/freerdp-2.0.0_rc3 )
-	gnome-keyring? ( app-crypt/libsecret )
-	spice? ( net-misc/spice-gtk[gtk3] )
-	ssh? ( net-libs/libssh[sftp]
-		x11-libs/vte:2.91 )
-	telepathy? ( net-libs/telepathy-glib )
-	vnc? ( net-libs/libvncserver )
-	zeroconf? ( net-dns/avahi[gtk3] )
-"
-DEPEND="${CDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-RDEPEND="${CDEPEND}
-	virtual/freedesktop-icon-theme
-"
-
-DOCS=( AUTHORS CHANGELOG.md README.md THANKS.md )
-
-S="${WORKDIR}/Remmina-${MY_PV}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_APPINDICATOR=$(usex ayatana)
-		-DWITH_GCRYPT=$(usex crypt)
-		-DWITH_LIBSECRET=$(usex gnome-keyring)
-		-DWITH_GETTEXT=$(usex nls)
-		-DWITH_TRANSLATIONS=$(usex nls)
-		-DWITH_FREERDP=$(usex rdp)
-		-DWITH_SPICE=$(usex spice)
-		-DWITH_LIBSSH=$(usex ssh)
-		-DWITH_VTE=$(usex ssh)
-		-DWITH_TELEPATHY=$(usex telepathy)
-		-DWITH_LIBVNCSERVER=$(usex vnc)
-		-DWITH_AVAHI=$(usex zeroconf)
-		-DGTK_VERSION=3
-	)
-	cmake-utils_src_configure
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-
-	elog "To get additional features, some optional runtime dependencies"
-	elog "may be installed:"
-	elog ""
-	optfeature "encrypted VNC connections" net-libs/libvncserver[gcrypt]
-	optfeature "XDMCP support" x11-base/xorg-server[xephyr]
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/net-misc/remmina/remmina-1.2.31.3.ebuild b/net-misc/remmina/remmina-1.2.31.3.ebuild
deleted file mode 100644
index 661521f4fdd7..000000000000
--- a/net-misc/remmina/remmina-1.2.31.3.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils eutils gnome2-utils xdg-utils
-
-MY_P="${PN^}-v${PV}"
-
-DESCRIPTION="A GTK+ RDP, SPICE, VNC, XDMCP and SSH client"
-HOMEPAGE="https://remmina.org/"
-SRC_URI="https://gitlab.com/Remmina/Remmina/-/archive/v${PV}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2+-with-openssl-exception"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="ayatana crypt examples gnome-keyring libressl nls spice ssh rdp telepathy vnc zeroconf"
-
-CDEPEND="
-	dev-libs/glib:2
-	dev-libs/json-glib
-	net-libs/libsoup
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	x11-libs/libxkbfile
-	ayatana? ( dev-libs/libappindicator:3 )
-	crypt? ( dev-libs/libgcrypt:0= )
-	rdp? ( >=net-misc/freerdp-2.0.0_rc2 )
-	gnome-keyring? ( app-crypt/libsecret )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	spice? ( net-misc/spice-gtk[gtk3] )
-	ssh? ( net-libs/libssh:0=[sftp]
-		x11-libs/vte:2.91 )
-	telepathy? ( net-libs/telepathy-glib )
-	vnc? ( net-libs/libvncserver )
-	zeroconf? ( net-dns/avahi[gtk3] )
-"
-DEPEND="${CDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-RDEPEND="${CDEPEND}
-	virtual/freedesktop-icon-theme
-"
-
-DOCS=( AUTHORS CHANGELOG.md README.md THANKS.md )
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_APPINDICATOR=$(usex ayatana)
-		-DWITH_GCRYPT=$(usex crypt)
-		-DWITH_EXAMPLES=$(usex examples)
-		-DWITH_LIBSECRET=$(usex gnome-keyring)
-		-DWITH_GETTEXT=$(usex nls)
-		-DWITH_TRANSLATIONS=$(usex nls)
-		-DWITH_FREERDP=$(usex rdp)
-		-DWITH_SPICE=$(usex spice)
-		-DWITH_LIBSSH=$(usex ssh)
-		-DWITH_VTE=$(usex ssh)
-		-DWITH_TELEPATHY=$(usex telepathy)
-		-DWITH_LIBVNCSERVER=$(usex vnc)
-		-DWITH_AVAHI=$(usex zeroconf)
-	)
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-
-	elog "To get additional features, some optional runtime dependencies"
-	elog "may be installed:"
-	elog ""
-	optfeature "encrypted VNC connections" net-libs/libvncserver[gcrypt]
-	optfeature "XDMCP support" x11-base/xorg-server[xephyr]
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
diff --git a/net-misc/remmina/remmina-1.3.3.ebuild b/net-misc/remmina/remmina-1.3.3.ebuild
deleted file mode 100644
index 834591991fa1..000000000000
--- a/net-misc/remmina/remmina-1.3.3.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils eutils gnome2-utils xdg-utils
-
-MY_P="${PN^}-v${PV}"
-
-DESCRIPTION="A GTK+ RDP, SPICE, VNC, XDMCP and SSH client"
-HOMEPAGE="https://remmina.org/"
-SRC_URI="https://gitlab.com/Remmina/Remmina/-/archive/v${PV}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2+-with-openssl-exception"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ayatana crypt examples gnome-keyring libressl nls spice ssh rdp telepathy vnc zeroconf"
-
-CDEPEND="
-	dev-libs/glib:2
-	dev-libs/json-glib
-	net-libs/libsoup
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	x11-libs/libxkbfile
-	ayatana? ( dev-libs/libappindicator:3 )
-	crypt? ( dev-libs/libgcrypt:0= )
-	rdp? ( >=net-misc/freerdp-2.0.0_rc4 )
-	gnome-keyring? ( app-crypt/libsecret )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	spice? ( net-misc/spice-gtk[gtk3] )
-	ssh? ( net-libs/libssh:0=[sftp]
-		x11-libs/vte:2.91 )
-	telepathy? ( net-libs/telepathy-glib )
-	vnc? ( net-libs/libvncserver[jpeg] )
-	zeroconf? ( net-dns/avahi[gtk3] )
-"
-DEPEND="${CDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-RDEPEND="${CDEPEND}
-	virtual/freedesktop-icon-theme
-"
-
-DOCS=( AUTHORS CHANGELOG.md README.md THANKS.md )
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_APPINDICATOR=$(usex ayatana)
-		-DWITH_GCRYPT=$(usex crypt)
-		-DWITH_EXAMPLES=$(usex examples)
-		-DWITH_LIBSECRET=$(usex gnome-keyring)
-		-DWITH_GETTEXT=$(usex nls)
-		-DWITH_TRANSLATIONS=$(usex nls)
-		-DWITH_FREERDP=$(usex rdp)
-		-DWITH_SPICE=$(usex spice)
-		-DWITH_LIBSSH=$(usex ssh)
-		-DWITH_VTE=$(usex ssh)
-		-DWITH_TELEPATHY=$(usex telepathy)
-		-DWITH_LIBVNCSERVER=$(usex vnc)
-		-DWITH_AVAHI=$(usex zeroconf)
-	)
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-
-	elog "To get additional features, some optional runtime dependencies"
-	elog "may be installed:"
-	elog ""
-	optfeature "encrypted VNC connections" net-libs/libvncserver[gcrypt]
-	optfeature "XDMCP support" x11-base/xorg-server[xephyr]
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
diff --git a/net-misc/remmina/remmina-1.3.5_p20190731.ebuild b/net-misc/remmina/remmina-1.3.5_p20190731.ebuild
deleted file mode 100644
index c2cca7a2478a..000000000000
--- a/net-misc/remmina/remmina-1.3.5_p20190731.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils eutils gnome2-utils vcs-snapshot xdg-utils
-
-MY_P="${PN^}-v${PV}"
-COMMIT="d3cfd641333b45ffb160dab2080fda3f4bbb8d68"
-
-DESCRIPTION="A GTK+ RDP, SPICE, VNC, XDMCP and SSH client"
-HOMEPAGE="https://remmina.org/"
-SRC_URI="https://gitlab.com/Remmina/Remmina/-/archive/master/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+-with-openssl-exception"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ayatana crypt examples gnome-keyring kwallet libressl nls spice ssh rdp telepathy vnc webkit zeroconf"
-
-CDEPEND="
-	dev-libs/glib:2
-	dev-libs/json-glib
-	dev-libs/libsodium:=
-	net-libs/libsoup
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	x11-libs/libxkbfile
-	ayatana? ( dev-libs/libappindicator:3 )
-	crypt? ( dev-libs/libgcrypt:0= )
-	rdp? ( >=net-misc/freerdp-2.0.0_rc4 )
-	gnome-keyring? ( app-crypt/libsecret )
-	kwallet? ( kde-frameworks/kwallet )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	spice? ( net-misc/spice-gtk[gtk3] )
-	ssh? ( net-libs/libssh:0=[sftp]
-		x11-libs/vte:2.91 )
-	telepathy? ( net-libs/telepathy-glib )
-	vnc? ( net-libs/libvncserver[jpeg] )
-	webkit? ( net-libs/webkit-gtk:4 )
-	zeroconf? ( net-dns/avahi[gtk3] )
-"
-DEPEND="${CDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-RDEPEND="${CDEPEND}
-	virtual/freedesktop-icon-theme
-"
-
-DOCS=( AUTHORS CHANGELOG.md README.md THANKS.md )
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_APPINDICATOR=$(usex ayatana)
-		-DWITH_GCRYPT=$(usex crypt)
-		-DWITH_EXAMPLES=$(usex examples)
-		-DWITH_LIBSECRET=$(usex gnome-keyring)
-		-DWITH_KF5WALLET=$(usex kwallet)
-		-DWITH_GETTEXT=$(usex nls)
-		-DWITH_TRANSLATIONS=$(usex nls)
-		-DWITH_FREERDP=$(usex rdp)
-		-DWITH_SPICE=$(usex spice)
-		-DWITH_LIBSSH=$(usex ssh)
-		-DWITH_VTE=$(usex ssh)
-		-DWITH_TELEPATHY=$(usex telepathy)
-		-DWITH_LIBVNCSERVER=$(usex vnc)
-		-DWITH_WWW=$(usex webkit)
-		-DWITH_AVAHI=$(usex zeroconf)
-		-DWITH_ICON_CACHE=OFF
-		-DWITH_UPDATE_DESKTOP_DB=OFF
-	)
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-
-	elog "To get additional features, some optional runtime dependencies"
-	elog "may be installed:"
-	elog ""
-	optfeature "encrypted VNC connections" net-libs/libvncserver[gcrypt]
-	optfeature "XDMCP support" x11-base/xorg-server[xephyr]
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
diff --git a/net-misc/suite3270/Manifest b/net-misc/suite3270/Manifest
index f0c1b3a271d7..7136600989a1 100644
--- a/net-misc/suite3270/Manifest
+++ b/net-misc/suite3270/Manifest
@@ -1,10 +1,10 @@
-AUX suite3270-3.5_p8-tinfo.patch 2793 BLAKE2B ca7c74e15022d5db381ef49103d966614e5b23e295af9766e8d5f0bc4c5af21ef0b0013772f34e962267aa9ea5f531b4ea9e729d4d21fdd571e0314be15cd410 SHA512 67a7fe63228dad755f73582eda7d1bc7efda18f454b99258f6bbfb45aa081a14c583797a6c940b80604eacfc719d4ba1be83ba2425c99de3afa4d1e027b3402b
-DIST suite3270-3.4ga10-src.tgz 3398730 BLAKE2B 4adc02b416d5fbf2facbf4e42c58a2bd3ed551ce46494ece039ef129663957632316882d5a5b28e272fa47010105a3682618b8ac2d355e745c576af74d0bb310 SHA512 d9ed4aa41c45a2e961d5c2d0c00c6b81526da64b9c1765b0c5e39cb647157026a787db2054b2feb55c57e5a458a31062141471447b1177fd46cbbeb7d71e3f28
+AUX suite3270-3.5_p8-tinfo.patch 2733 BLAKE2B ea2d966d5138e33289d803223a4e49f4dc314ed206e5b5dd838e0ae7152a03417bb4b9044f544b8bf729421bb35f723bcb48ee2f58fcfaf27d460f51ed172d73 SHA512 5b748df7b50957746423954bea86b2ce43063b33a0e5ad3d22d93653c4e3dd11494111e46b4c83c45add41dc448c004ddc3b217be23712953682784c79f76564
 DIST suite3270-3.5ga10-src.tgz 3412329 BLAKE2B c9ed308cf970da150da985d76ec377c83a03041eddfcbad9baa7211776a7b68292109cccb2ec250952edb77eeca79143137eb8a94da8b774e952c3e5790c6231 SHA512 0cce1212ca7589595cd2f775d18086f231a9e6d621716be5a41123a379358d9ac08c9668de2bd6a2e401ae54d12a4905c3c260cb7ba90482bbce6790d8e3efb8
 DIST suite3270-3.5ga12-src.tgz 3412286 BLAKE2B 5602f8bbe7b916a977c97848ff9a413a873f61e1c0c62b8c118dc43703adcd4a668e3cc301f9e37a139eebeeae44aca3cdedd0c10de15870ad8ead00d783e1ef SHA512 c7cb25b5c82b0d7ccac8c3ed17317a5a5ebce24fb32dcdfcaf7158157578617a7bccc265fdb67fce0557caa9c75d1afc2d8152a06b98af43ad9a9e29b5f2a267
 DIST suite3270-3.6ga4-src.tgz 3288095 BLAKE2B 34245d6050f7d70ef6195dc669fea55eed70cb9b6c616a4bc88bc52bcfd9d837e527debc87eba4ccdc47c4a453e16749c23b9618d5bf4198e4131573f437209b SHA512 5309c4b4ad0d730033166b0bdb7638bba5fc00908776a229d5f0a131f72741897a0bf6b86dee3b1c9f3d480dc4f23e03e812d3349cec7094908c6a54a87d5ccb
-EBUILD suite3270-3.4_p10.ebuild 2060 BLAKE2B a971fa860797532519f96c733d6525ef38cab44e3724d4243b771e2308a6ac243c318d76c5ce8d10a060e03be688eaac07d301446458cc7aeeddd6a057d59bd3 SHA512 dd59e26bff90d8d48508430ac0694861726300f3507e87ddc80af501e8045a214fa50b574a1d6808bb19540a322b46200bc5733738b6552942ccc8a5f53e3d9e
+DIST suite3270-3.6ga8-src.tgz 3296047 BLAKE2B 98bcee4591c3eea12c7127aa2eeb39613f6f090c041ceab7a7b0f1bf0e946c3048ba2f93eaacf2bbaf04b44ba78a8895f6b7acdcf20baea19a408464f83f4d62 SHA512 88a00bec19ae7be92e5bc0edd6ae1e27bef7fbbf8c3f419efda3ba2b3a0cb5e72693916cd44d50166d5745ce0f9d8497641481cedbb0bb3149567b6f51b1a987
 EBUILD suite3270-3.5_p10.ebuild 2104 BLAKE2B 41e2667ef2aecbe97cecec803926c5cc138c74fc2b81d8f8c86cf111456b3846d4075a14cab2a9d3edb85c63551e54b11eef822638e22bdd316711c4121e1aba SHA512 29f7f0dad54c07444dd1718f60e60b520dc6abc1ad7500878355b4aaafdc80f6243e706e74c421b144e097380342ee5d17ee91b904ae77e5f117b4a8df81ad7b
-EBUILD suite3270-3.5_p12.ebuild 2109 BLAKE2B afcae541a73ed17a11d17d4c28cd1162bbd93a1d62df8a105debbaa82e1dbffed20df2a6d7f01a577907d4e8230b94e0d51f77e835f57ee426f18de93f738176 SHA512 20ea6a35f9f0fdef4c8417ed0a7017c7195ec4256535d340cde43fcae72db28c876b8e8d7d085d1a94d96c4d3af270e4b8c05a1361380c93eb5560608affe4ed
+EBUILD suite3270-3.5_p12.ebuild 2104 BLAKE2B 41e2667ef2aecbe97cecec803926c5cc138c74fc2b81d8f8c86cf111456b3846d4075a14cab2a9d3edb85c63551e54b11eef822638e22bdd316711c4121e1aba SHA512 29f7f0dad54c07444dd1718f60e60b520dc6abc1ad7500878355b4aaafdc80f6243e706e74c421b144e097380342ee5d17ee91b904ae77e5f117b4a8df81ad7b
 EBUILD suite3270-3.6_p4.ebuild 2109 BLAKE2B afcae541a73ed17a11d17d4c28cd1162bbd93a1d62df8a105debbaa82e1dbffed20df2a6d7f01a577907d4e8230b94e0d51f77e835f57ee426f18de93f738176 SHA512 20ea6a35f9f0fdef4c8417ed0a7017c7195ec4256535d340cde43fcae72db28c876b8e8d7d085d1a94d96c4d3af270e4b8c05a1361380c93eb5560608affe4ed
+EBUILD suite3270-3.6_p8.ebuild 2121 BLAKE2B c1c4f5bb3f6afa7658dea77891676663c06af954cbdd0a3131691302679d2858fc55fc536c2e70e98840082e822c3ff0279603239bb40e598b9cd0cb8f454802 SHA512 70dd2f6216069872be4c1e8b7fe4721ca22baf1cb7355ff407a769fe5f24039e51d1500edc2924225f3ad8cc84b4ad709b5f2237fb498610410f513b7d391660
 MISC metadata.xml 463 BLAKE2B 5035d30c690419dbe52b4caf68981eb40c858f09787189439dda81dd57096276a029201b0ea3eb67840a14552d9c4dcf21eb00003ea530b79b85219cc607c19b SHA512 ef297d66d1c0b2c7ab6f8d0c489f355267124cd1f0cc09d18cf1b2cd33458be4c8e1716e84753ba6e49903a90fb676fb7ae908205672f927656ebd9c11879e45
diff --git a/net-misc/suite3270/files/suite3270-3.5_p8-tinfo.patch b/net-misc/suite3270/files/suite3270-3.5_p8-tinfo.patch
index 9235809f02ef..54be6e0510ce 100644
--- a/net-misc/suite3270/files/suite3270-3.5_p8-tinfo.patch
+++ b/net-misc/suite3270/files/suite3270-3.5_p8-tinfo.patch
@@ -10,14 +10,14 @@ ld: screen.o: undefined reference to symbol 'meta'
 /usr/lib64/libtinfo.so.6: error adding symbols: DSO missing from command line
 collect2: error: ld returned 1 exit status
 ---
- x3270/c3270/configure.in |  1 +
- x3270/c3270/configure    | 45 +++++++++++++++++++++++++++++++++++++++++++++
+ c3270/configure.in |  1 +
+ c3270/configure    | 45 +++++++++++++++++++++++++++++++++++++++++++++
  2 files changed, 46 insertions(+)
 
-diff --git a/x3270/c3270/configure.in b/x3270/c3270/configure.in
+diff --git a/c3270/configure.in b/c3270/configure.in
 index d9f19e6..8c6d852 100644
---- a/x3270/c3270/configure.in
-+++ b/x3270/c3270/configure.in
+--- a/c3270/configure.in
++++ b/c3270/configure.in
 @@ -129,6 +129,7 @@ dnl first, so that objects in them can be used by subsequent libraries.
  AC_SEARCH_LIBS(forkpty, util)
  AC_CHECK_FUNCS(forkpty)
@@ -26,10 +26,10 @@ index d9f19e6..8c6d852 100644
  if test "$with_readline" != no; then
  AC_CHECK_LIB(readline, rl_initialize)
  fi
-diff --git a/x3270/c3270/configure b/x3270/c3270/configure
+diff --git a/c3270/configure b/c3270/configure
 index bef2dff..9946e83 100755
---- a/x3270/c3270/configure
-+++ b/x3270/c3270/configure
+--- a/c3270/configure
++++ b/c3270/configure
 @@ -4020,6 +4020,51 @@ fi
  
  fi
diff --git a/net-misc/suite3270/suite3270-3.5_p12.ebuild b/net-misc/suite3270/suite3270-3.5_p12.ebuild
index f842aa368b8c..8f3125ae488d 100644
--- a/net-misc/suite3270/suite3270-3.5_p12.ebuild
+++ b/net-misc/suite3270/suite3270-3.5_p12.ebuild
@@ -21,7 +21,7 @@ SRC_URI="mirror://sourceforge/x3270/${MY_P}-src.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~s390 ~sparc ~x86"
+KEYWORDS="amd64 ppc s390 sparc x86"
 IUSE="cjk doc ncurses ssl tcl X"
 
 RDEPEND="ssl? ( dev-libs/openssl:0= )
diff --git a/net-misc/suite3270/suite3270-3.4_p10.ebuild b/net-misc/suite3270/suite3270-3.6_p8.ebuild
index 8eaf62808b26..d8808e7e2afd 100644
--- a/net-misc/suite3270/suite3270-3.4_p10.ebuild
+++ b/net-misc/suite3270/suite3270-3.6_p8.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="6"
 
 MY_PV=${PV/_p/ga}
 MY_P=${PN}-${MY_PV}
@@ -11,7 +11,7 @@ S=${WORKDIR}/${PN}-${SUB_PV}
 
 # only the x3270 package installs fonts
 FONT_PN="x3270"
-FONT_S=${WORKDIR}/${FONT_PN}
+FONT_S="${S}/${FONT_PN}"
 
 inherit eutils font
 
@@ -21,7 +21,7 @@ SRC_URI="mirror://sourceforge/x3270/${MY_P}-src.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc s390 sparc x86"
+KEYWORDS="~amd64 ~ppc ~s390 ~sparc ~x86"
 IUSE="cjk doc ncurses ssl tcl X"
 
 RDEPEND="ssl? ( dev-libs/openssl:0= )
@@ -45,6 +45,10 @@ DEPEND="${RDEPEND}
 		x11-apps/bdftopcf
 	)"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.5_p8-tinfo.patch
+)
+
 suite3270_makelist() {
 	echo pr3287 s3270 \
 		$(usex ncurses c3270 '') \
@@ -53,6 +57,8 @@ suite3270_makelist() {
 }
 
 src_prepare() {
+	default
+
 	# Some subdirs (like c3270/x3270/s3270) install the same set of data files
 	# (they have the same contents).  Wrap that in a retry to avoid errors.
 	cat <<-EOF > _install