gentoo resync : 19.07.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-07-19 22:05:27 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-07-19 22:05:27 +0100
commit: 121ed4eec41fbf03e1998d09eede1bf449da63b9 (patch)
tree: ce9341d77d1507f67d4a3a1472da9011b5baa0a8 /net-misc
parent: dd762ff83c330186ee2ede002e08b2f780cddd51 (diff)
47 files changed, 753 insertions, 413 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 8cb805eda042..fade0f3af3fd 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/cbugzilla/Manifest b/net-misc/cbugzilla/Manifest
index 6166c03e5e43..a950e1c6fc3f 100644
--- a/net-misc/cbugzilla/Manifest
+++ b/net-misc/cbugzilla/Manifest
@@ -1,3 +1,3 @@
 DIST cbugzilla-0.2.1.tar.xz 240824 BLAKE2B ff3332d954d0c3be92b5104e1a13668be66952ee20caaa65ad302a299c87b893f77179415b5a90d0873550f2ddf5646eadd18040851c7bc3ba913e130930db32 SHA512 4a5671bfb222d17841082d123e68250526f6504aee3ba816b454b5d37174391eb464a7e3eaa9fdcfbbb5619b443b4af28ae520dc4bfd49faab1e523d59e2392f
 EBUILD cbugzilla-0.2.1.ebuild 503 BLAKE2B 1e47e7d9607e6abc3c00242c0f5d600284dd8b8ae359b9ef27723570439827103758f59b91df0f42a0109e82f60a9ee5364a8d21afae084f891747a6bc666ef9 SHA512 191078acc3f87c586801b2ec50f9517a1c66f68414275364caf60e2d26014fbf061348db5bebf7e3289c507af9dd8b29452d5a082eec35388cc11176cad11625
-MISC metadata.xml 219 BLAKE2B 0c7422756c9b86df8fe0d55be057acafeb2db06a687328c8f8590c5f0b25fe6166f86399830d1784e25c6117a6529c4de4d2b7a7fbcc8ad09f2fafc6b274e1c7 SHA512 021d496fe799448cd9007cc723d597e6c30da18cfc421ee24e3bedd3a642bde8874530e5f5357a1ea6443f6112f3039fd1117050062a1ba6b6e89b8d55607b91
+MISC metadata.xml 245 BLAKE2B e88caa06a239232c934e30a1256673bba436fe7ae970a140b68721315fd41bfab31fc6bab9c5fb006c8ca934b3a77c8d2c19a18d58f3d4553d819e3149601121 SHA512 b3fc951a81d8cb12e1d4be68f5ac51b67f1d7bcfab18c504c010b059e80ea890e7e363a0e077f3aafdac38b950afbc49157f6b4a38d4c060a596bd88608ec40e
diff --git a/net-misc/cbugzilla/metadata.xml b/net-misc/cbugzilla/metadata.xml
index eec401c4071e..2f0f855adfc8 100644
--- a/net-misc/cbugzilla/metadata.xml
+++ b/net-misc/cbugzilla/metadata.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<!--maintainer-needed-->
 	<upstream>
 		<remote-id type="github">yaccz/cbugzilla</remote-id>
 	</upstream>
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index b231f78622dc..17b405c31d07 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -5,8 +5,10 @@ DIST curl-7.64.0.tar.bz2 3012077 BLAKE2B 512edeaa7a4ff3a998903771307070b08f1dc53
 DIST curl-7.64.1.tar.bz2 3000536 BLAKE2B 787b9f9662dad4e3497357dc3f9cff0fb2c997e2603cf3c621633d9983fd011c346640be5227ddc4b363bdb7e1a64532a44ae9d5ccc27e405275e08f150d63fa SHA512 e04532d68896b79f28aea3b30aec2d5b53076d0d27c8f6404769618300828eed96633e7bd5945125bca76241bb1e169f5002ac9566108bcaddc8c51b513106b6
 DIST curl-7.65.0.tar.xz 2392324 BLAKE2B e5aec8c6cb6f6baabd035ce2ea159dba1541011658892bb883e917541aaffe6ebfb0d2b9f18e2357059a7bc1e3a8db47b2aed7a74597b21c14f0892ad6e9eb68 SHA512 032c065c1d4bd07ba028625f8fab6a09e7cb8505a5f19339b3abdee5a9cda7d091c11f075fe3fc227d082690a66c558c770a4cd9fb17b52acc13794976a770c5
 DIST curl-7.65.1.tar.xz 2392672 BLAKE2B 96519ad3b342944d2e6ae645a8435ba902e319830a95a2f873f4ab71cf2585daf98b5e44509dd394eaa6db71ac3d2cc6dd9e45deead7021e5d2e96db5de295ab SHA512 aba2d979a416d14a0f0852d595665e49fc4f7bff3bee31f3a52b90ba9dc5ffdb09c092777f124215470b72c47ebca7ddb47844cbf5c0e9142099272b6ac55df4
+DIST curl-7.65.3.tar.xz 2392472 BLAKE2B 25726e1f1568fad6a8419b29dde41bed4d9de4be70740119879beeb08ff2a6ace7737efe1fb6d96ecaacaf8f90dc0142ceede2b90c84275ea8f72bcd09f21dba SHA512 fc4f041d3d6682378ce9eef2c6081e6ad83bb2502ea4c992c760266584c09e9ebca7c6d35958bd32a888702d9308cbce7aef69c431f97994107d7ff6b953941b
 EBUILD curl-7.64.0.ebuild 6857 BLAKE2B 768a2b4559ba419b7211ae44edb63eca018f2bb98a078c05c9eae2f5be74c76501dbe78eee0372e64bcbb5a462a698959533b57d944cf83d40c8140e59b07b02 SHA512 2aa729057a5fca87b89cc412a157c67a02fefc172b374592ffdf832cc8fe88f9648958abb7534bf57e96fab8f14c5f3034688c242d5c660d8d7841112d727cda
 EBUILD curl-7.64.1.ebuild 6976 BLAKE2B 703d33296158e3e7514588080c11308926d9ae246c416e993a23e623ea6c846e8ad50dff2624e4c9e7d2c228dd165716909c009a5f9a11243589f13d19dfa499 SHA512 5eac3bf04054a2b7bceb22a7840cad1b6c04743bf02d468e5ae9789318f3dd087ae0f8dd3dc6da0ce23c48261cb62d756c1b75cb92cc83f9ea22d21bfb0b4052
 EBUILD curl-7.65.0.ebuild 6975 BLAKE2B 3ba830aa65b0c9e98f5128289a7c8cef5c3cbc2ee91881f47bb9318c2fe82f5121942c4263cbcef5d6ab26c602e4a2b1ffca795e8253800c5318a3c4f6c16f23 SHA512 fef5557f9175b3a8c6240e6a89dfb994412948a6e44ec356e308f4fdafd0362df2f63400048c9ea0d6cece07240370965ba51d39424c3014ee761db1d799bc15
 EBUILD curl-7.65.1.ebuild 6986 BLAKE2B b060aef8e919418996ed1815507b500c93dfb886565e184414ce968515f5ef8316cafb4232228fa6b3466583adc613f1fd6f55e83580d64862aff4e94c84fdad SHA512 ea65a7aaa2ba8b3f2931a4726cb3756fe14adcb8a44293ca3bd09d4b2482c272470e5f7b89f818a9a88866e81b1602049a0cd34678f7a4599c0705b383d3ae3b
-MISC metadata.xml 900 BLAKE2B a370dc14334bd729842d0ac979d804d0ff35332dc1fade6e2fbc33649a02db17ef04897c61727d786a4bc3d8acc2a20ddcfe97abdc350b65d9ecfdfe4509f9ef SHA512 ff16407a74d8688f4ed0d7158ea5bd31bc47e828672c874e2f43f4cda1fcd741922c98c5ff5d7f114154b149983e252319f0e812197b4ca7a0979683b5cec8ad
+EBUILD curl-7.65.3.ebuild 7160 BLAKE2B 2dbbba6596cf5d1dde4e0a85f992327379043508bc78b1e2bb10dd29c2738a9505abdda5cd991ec36b9b56aeae3f13b5d5088429cd136185d9383956d80241db SHA512 2f4bde9132616c39f053e81cd068ad7529fa6baf68eb96f9da55b9308f49e51321bf458023df445b3d0eeebc13394cccc20ad2b902fc8dbe34b80863f3a421ea
+MISC metadata.xml 963 BLAKE2B 5bec839fdacef23398bbdf097aa8d25dae2579501d2f4a385c251ff4b37e246bb762c30ebc5f24e0fdafc65a11ff7a58406777f44071b10f43203ea6c68a5508 SHA512 d70b0f5aee074f53272cd6292503f4705142d4e9cc274e4e13228dda30bd6357618af3b70601ef9624bf98522525cde011d6c756faf24563cbf8953f9683400d
diff --git a/net-misc/curl/curl-7.65.3.ebuild b/net-misc/curl/curl-7.65.3.ebuild
new file mode 100644
index 000000000000..85324e17a3e7
--- /dev/null
+++ b/net-misc/curl/curl-7.65.3.ebuild
@@ -0,0 +1,246 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit autotools eutils prefix multilib-minimal
+
+DESCRIPTION="A Client that groks URLs"
+HOMEPAGE="https://curl.haxx.se/"
+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+=" curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl"
+IUSE+=" elibc_Winnt"
+
+#lead to lots of false negatives, bug #285669
+RESTRICT="test"
+
+RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
+	brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] )
+	ssl? (
+		curl_ssl_gnutls? (
+			net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}]
+			dev-libs/nettle:0=[${MULTILIB_USEDEP}]
+			app-misc/ca-certificates
+		)
+		curl_ssl_libressl? (
+			dev-libs/libressl:0=[static-libs?,${MULTILIB_USEDEP}]
+		)
+		curl_ssl_mbedtls? (
+			net-libs/mbedtls:0=[${MULTILIB_USEDEP}]
+			app-misc/ca-certificates
+		)
+		curl_ssl_openssl? (
+			dev-libs/openssl:0=[static-libs?,${MULTILIB_USEDEP}]
+		)
+		curl_ssl_nss? (
+			dev-libs/nss:0[${MULTILIB_USEDEP}]
+			app-misc/ca-certificates
+		)
+	)
+	http2? ( net-libs/nghttp2[${MULTILIB_USEDEP}] )
+	idn? ( net-dns/libidn2:0=[static-libs?,${MULTILIB_USEDEP}] )
+	adns? ( net-dns/c-ares:0[${MULTILIB_USEDEP}] )
+	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+	metalink? ( >=media-libs/libmetalink-0.1.1[${MULTILIB_USEDEP}] )
+	rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
+	ssh? ( net-libs/libssh2[${MULTILIB_USEDEP}] )
+	sys-libs/zlib[${MULTILIB_USEDEP}]"
+
+# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303
+#	rtmp? (
+#		media-video/rtmpdump
+#		curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] )
+#		curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] )
+#	)
+
+# ssl providers to be added:
+# fbopenssl  $(use_with spnego)
+
+DEPEND="${RDEPEND}
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	test? (
+		sys-apps/diffutils
+		dev-lang/perl
+	)"
+
+# c-ares must be disabled for threads
+# only one ssl provider can be enabled
+REQUIRED_USE="
+	curl_ssl_winssl? ( elibc_Winnt )
+	threads? ( !adns )
+	ssl? (
+		^^ (
+			curl_ssl_gnutls
+			curl_ssl_libressl
+			curl_ssl_mbedtls
+			curl_ssl_nss
+			curl_ssl_openssl
+			curl_ssl_winssl
+		)
+	)"
+
+DOCS=( CHANGES README docs/FEATURES docs/INTERNALS.md \
+	docs/FAQ docs/BUGS docs/CONTRIBUTE.md )
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/curl/curlbuild.h
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/curl-config
+)
+
+src_prepare() {
+	eapply "${FILESDIR}"/${PN}-7.30.0-prefix.patch
+	eapply "${FILESDIR}"/${PN}-respect-cflags-3.patch
+	eapply "${FILESDIR}"/${PN}-fix-gnutls-nettle.patch
+
+	sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241
+	sed -i '/CURL_MAC_CFLAGS/d' configure.ac || die #637252
+
+	eapply_user
+	eprefixify curl-config.in
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# We make use of the fact that later flags override earlier ones
+	# So start with all ssl providers off until proven otherwise
+	# TODO: in the future, we may want to add wolfssl (https://www.wolfssl.com/)
+	local myconf=()
+	myconf+=( --without-gnutls --without-mbedtls --without-nss --without-polarssl --without-ssl --without-winssl )
+	myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt  )
+	if use ssl ; then
+		if use curl_ssl_gnutls; then
+			einfo "SSL provided by gnutls"
+			myconf+=( --with-gnutls --with-nettle )
+		elif use curl_ssl_libressl; then
+			einfo "SSL provided by LibreSSL"
+			myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
+		elif use curl_ssl_mbedtls; then
+			einfo "SSL provided by mbedtls"
+			myconf+=( --with-mbedtls )
+		elif use curl_ssl_nss; then
+			einfo "SSL provided by nss"
+			myconf+=( --with-nss )
+		elif use curl_ssl_openssl; then
+			einfo "SSL provided by openssl"
+			myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
+		elif use curl_ssl_winssl; then
+			einfo "SSL provided by Windows"
+			myconf+=( --with-winssl )
+		else
+			eerror "We can't be here because of REQUIRED_USE."
+		fi
+	else
+		einfo "SSL disabled"
+	fi
+
+	# These configuration options are organized alphabetically
+	# within each category.  This should make it easier if we
+	# ever decide to make any of them contingent on USE flags:
+	# 1) protocols first.  To see them all do
+	# 'grep SUPPORT_PROTOCOLS configure.ac'
+	# 2) --enable/disable options second.
+	# 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort
+	# 3) --with/without options third.
+	# grep -- --with configure | grep Check | awk '{ print $4 }' | sort
+
+	ECONF_SOURCE="${S}" \
+	econf \
+		--disable-alt-svc \
+		--enable-crypto-auth \
+		--enable-dict \
+		--enable-file \
+		--enable-ftp \
+		--enable-gopher \
+		--enable-http \
+		--enable-imap \
+		$(use_enable ldap) \
+		$(use_enable ldap ldaps) \
+		--disable-ntlm-wb \
+		--enable-pop3 \
+		--enable-rt  \
+		--enable-rtsp \
+		$(use_enable samba smb) \
+		$(use_with ssh libssh2) \
+		--enable-smtp \
+		--enable-telnet \
+		--enable-tftp \
+		--enable-tls-srp \
+		$(use_enable adns ares) \
+		--enable-cookies \
+		--enable-dateparse \
+		--enable-dnsshuffle \
+		--enable-doh \
+		--enable-hidden-symbols \
+		--enable-http-auth \
+		$(use_enable ipv6) \
+		--enable-largefile \
+		--without-libpsl \
+		--enable-manual \
+		--enable-mime \
+		--enable-netrc \
+		$(use_enable progress-meter) \
+		--enable-proxy \
+		--disable-sspi \
+		$(use_enable static-libs static) \
+		$(use_enable threads threaded-resolver) \
+		$(use_enable threads pthreads) \
+		--disable-versioned-symbols \
+		--without-amissl \
+		--without-cyassl \
+		--without-darwinssl \
+		--without-fish-functions-dir \
+		$(use_with idn libidn2) \
+		$(use_with kerberos gssapi "${EPREFIX}"/usr) \
+		$(use_with metalink libmetalink) \
+		$(use_with http2 nghttp2) \
+		$(use_with rtmp librtmp) \
+		$(use_with brotli) \
+		--without-schannel \
+		--without-secure-transport \
+		--without-spnego \
+		--without-winidn \
+		--without-wolfssl \
+		--with-zlib \
+		"${myconf[@]}"
+
+	if ! multilib_is_native_abi; then
+		# avoid building the client
+		sed -i -e '/SUBDIRS/s:src::' Makefile || die
+		sed -i -e '/SUBDIRS/s:scripts::' Makefile || die
+	fi
+
+	# Fix up the pkg-config file to be more robust.
+	# https://github.com/curl/curl/issues/864
+	local priv=() libs=()
+	# We always enable zlib.
+	libs+=( "-lz" )
+	priv+=( "zlib" )
+	if use http2; then
+		libs+=( "-lnghttp2" )
+		priv+=( "libnghttp2" )
+	fi
+	if use ssl && use curl_ssl_openssl; then
+		libs+=( "-lssl" "-lcrypto" )
+		priv+=( "openssl" )
+	fi
+	grep -q Requires.private libcurl.pc && die "need to update ebuild"
+	libs=$(printf '|%s' "${libs[@]}")
+	sed -i -r \
+		-e "/^Libs.private/s:(${libs#|})( |$)::g" \
+		libcurl.pc || die
+	echo "Requires.private: ${priv[*]}" >> libcurl.pc
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -type f -name '*.la' -delete
+	rm -rf "${ED}"/etc/
+}
diff --git a/net-misc/curl/metadata.xml b/net-misc/curl/metadata.xml
index b911bba47df7..a6d736bd7cf3 100644
--- a/net-misc/curl/metadata.xml
+++ b/net-misc/curl/metadata.xml
@@ -10,6 +10,7 @@
 		<flag name="http2">Enabled HTTP/2.0 support</flag>
 		<flag name="ssh">Enabled SSH urls in curl using libssh2</flag>
 		<flag name="metalink">Enable metalink support</flag>
+		<flag name="progress-meter">Enable the progress meter</flag>
 		<flag name="ssl">Enable crypto engine support (via openssl if USE='-gnutls -nss')</flag>
 		<flag name="rtmp">Enable RTMP Streaming Media support</flag>
 	</use>
diff --git a/net-misc/datapipe/Manifest b/net-misc/datapipe/Manifest
index 4be7fc52012e..f45581b373ec 100644
--- a/net-misc/datapipe/Manifest
+++ b/net-misc/datapipe/Manifest
@@ -1,3 +1,3 @@
 DIST datapipe-1.0.tar.gz 3129 BLAKE2B 75f6012a55327b12cae20bc951bb338daeb3fb31b223d085a30ae1af0e2c1282966ea04071f36044384f8fe9d6be710f51dd5f9ecbc065a00ccb9b5eb49ea84a SHA512 d5bcd774f41fe465cf104bcb4128fa980967823ff0adc55fa7e145ba736c058a6b25ff519d18963d54ecdc2431510b6e290b44a2c1c202182efceb93e3532df7
-EBUILD datapipe-1.0-r2.ebuild 610 BLAKE2B 666648925ed4baa9d3dc18636401cda2c6a195db7cced321932369a5f39708b48786f756beafc390169d036d0b58977cad94bd171f0be827e26c47e8dc3b7ac9 SHA512 637281944686130ef987ba81b64c135ade31384cb7defc7468c5d82645b7ac957172bb4b34023622daf4911f9474dfe9db327eacd1646202bb18f45c52b2838d
+EBUILD datapipe-1.0-r2.ebuild 607 BLAKE2B b3c831866054225577637a9e0eb8a8e8333920d50b7437f226534e521b7ddf543c78d1b6cc7f12fd73d9f511da6b994af077e6182e9e426111d982c37bfbd35e SHA512 b53eafec4d0795b62f286b78e267730cff2455d38ee76a4a49476f02c2a282e00fa0a0406613c1c8717c19c098cd15feff5d71451d6f58206c07744e763223f9
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-misc/datapipe/datapipe-1.0-r2.ebuild b/net-misc/datapipe/datapipe-1.0-r2.ebuild
index 503b4e448264..840d7da32660 100644
--- a/net-misc/datapipe/datapipe-1.0-r2.ebuild
+++ b/net-misc/datapipe/datapipe-1.0-r2.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
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.distributed.net/pub/dcti/unsupported/${P}.tar.gz http://http.
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~arm ~amd64"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
 
 src_compile() {
 	$(tc-getCC) ${CFLAGS} ${LDFLAGS} -o datapipe datapipe.c
diff --git a/net-misc/gns3-converter/Manifest b/net-misc/gns3-converter/Manifest
index b86bfbc39f44..e10967ed5af5 100644
--- a/net-misc/gns3-converter/Manifest
+++ b/net-misc/gns3-converter/Manifest
@@ -1,3 +1,3 @@
 DIST gns3-converter-1.3.0.tar.gz 45837 BLAKE2B 9265773c941a0b3a364d912498fb1c7188259c4ebd244d688fe6a7f3a3110892adfb6e045d1f11938aa0f79c72721020a74e9a0bc297f93e44fee2bd7a3e3526 SHA512 ac2e44b3f02c8f0429158e11c964bf342973809139dcf34863071905400964006d7adbc3ddb80efe57a5ecc5eaf59e228bf7d07a7e5776dd6bcf51b4e1d3fe57
 EBUILD gns3-converter-1.3.0.ebuild 511 BLAKE2B d36fbc6e190d0ba30aec3de1ee39ad745d5492016503f0d01ffad114f86c3676666c2532e673b8d4a887bf665fde8bcfd1f32fd960d1700d401024af5e92a7f4 SHA512 2cb36d55add5a3830456eae477bd1e7669105b5c2085bd7aac9af1925931b28e210622b2c24911489c65579e181b41f3f4d28174ab90ba66ef379acf210227e2
-MISC metadata.xml 241 BLAKE2B 2cc47e12ef61022b2dbc00904091b1e35dbbeb5c4ab35dc697ae06adfc7e78782065e35b1ebebe2779f180b2b573dad22ba516a393f47c3e26e1be2ad6a3d65c SHA512 edc53eaf933b709bb0a2e8507209a85cc3901ce6e4db3bf40e061a01ece0e4b0f83d30b93b2131316c802def4a08081a5ac3b3606624271184680421b7f0323b
+MISC metadata.xml 442 BLAKE2B e9b21bbc318820cdb4df0b3d8a4a0b261d4309fa62987123907c0b4cb387dca9afa8bc405cde987c3093aefd393f1867f24c7020e4b9001a373a18bf6e838a46 SHA512 3ab532db9d5d3ff339cbc80f867a48785386292423bc7a47ffc99451da79b1ed64ed7a9444915248e876e6250cc185b866097a5e94caf8a8b6e4a568b3ed4a16
diff --git a/net-misc/gns3-converter/metadata.xml b/net-misc/gns3-converter/metadata.xml
index 7012b6c468af..019d76c33613 100644
--- a/net-misc/gns3-converter/metadata.xml
+++ b/net-misc/gns3-converter/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>onigino@protonmail.com</email>
+		<name>Gino McCarty</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">gns-3</remote-id>
 	</upstream>
diff --git a/net-misc/gns3-gui/Manifest b/net-misc/gns3-gui/Manifest
index 0728597bfdc1..4749171badfe 100644
--- a/net-misc/gns3-gui/Manifest
+++ b/net-misc/gns3-gui/Manifest
@@ -1,3 +1,3 @@
-DIST gns3-gui-2.1.3.tar.gz 4792762 BLAKE2B 577381bdee06f967e4fddec3b0885920e8a25380d834ab1c983e010d40a14f63c69912f745bb72b4605e49cdf7192fe52ac57380d5f65f03d067a2f1dd03f7d6 SHA512 da90eea0920f9fc10bb5ea7e0039ca11bfaf36870e182a6b97ffdbab9f12da0d13b58c4a13ca747add675426324f3c1cde5eedbd858a68ee4bbefdcdff193904
-EBUILD gns3-gui-2.1.3-r1.ebuild 1127 BLAKE2B 09e3f3a922044a9aa6fa4fce926e24995ac70eafd78efaa3f06e579be3010b3ad1b41525e50e8a4cb0a36ea5aa5d927c25649f9318bc695901d685369acf3550 SHA512 7d4cba288d958ccd204362ebf7df0ada7bf70099369114fcf191ae9f1d3fe6e0c98c39a56a50f1b138c905ef9f18ba3cd1be1d42cd4ab7673319b7eb3b04c700
-MISC metadata.xml 241 BLAKE2B 2cc47e12ef61022b2dbc00904091b1e35dbbeb5c4ab35dc697ae06adfc7e78782065e35b1ebebe2779f180b2b573dad22ba516a393f47c3e26e1be2ad6a3d65c SHA512 edc53eaf933b709bb0a2e8507209a85cc3901ce6e4db3bf40e061a01ece0e4b0f83d30b93b2131316c802def4a08081a5ac3b3606624271184680421b7f0323b
+DIST gns3-gui-2.1.21.tar.gz 4845512 BLAKE2B 93af250719a0aafe8645926552c61d43152e5a5620d42b4d73cd58d597b3280d11935043771f15cf04e5d116f6740d929e04c27b1af6732d65b7c6e36313ed3c SHA512 b9b03c59064214323fe7375256075c56368747c8cd273bea41791b101ea7d6b877443e81dd57f13faf4b4bdc6de558e98648770de4734b1edd1c82911f2fcb9b
+EBUILD gns3-gui-2.1.21.ebuild 918 BLAKE2B f6b7176dbbe09e64bd5818e0f60d116bda52389ed201b7440d2c3a83c97ec8d7bd498ad50bb06f4bc04f3855d5b2b2967fa4746d665a1540f5ceaa195d2be973 SHA512 313424646b0e856637185492d2c15711dcbb1cad6634ea6d6c164cf3b40cfa4728624aa6d434d7cdad7ecb4a3809d7d9686191ec6f789f1485e2b204a6b78274
+MISC metadata.xml 442 BLAKE2B e9b21bbc318820cdb4df0b3d8a4a0b261d4309fa62987123907c0b4cb387dca9afa8bc405cde987c3093aefd393f1867f24c7020e4b9001a373a18bf6e838a46 SHA512 3ab532db9d5d3ff339cbc80f867a48785386292423bc7a47ffc99451da79b1ed64ed7a9444915248e876e6250cc185b866097a5e94caf8a8b6e4a568b3ed4a16
diff --git a/net-misc/gns3-gui/gns3-gui-2.1.3-r1.ebuild b/net-misc/gns3-gui/gns3-gui-2.1.21.ebuild
index 30e07906ba51..f2fd83afc281 100644
--- a/net-misc/gns3-gui/gns3-gui-2.1.3-r1.ebuild
+++ b/net-misc/gns3-gui/gns3-gui-2.1.21.ebuild
@@ -1,43 +1,34 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2019 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python3_{5,6} )
 
-inherit distutils-r1 eutils
+inherit distutils-r1 desktop
 
 DESCRIPTION="Graphical Network Simulator"
 HOMEPAGE="http://www.gns3.net/"
 SRC_URI="https://github.com/GNS3/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-# tests are severely broken upstream and they have been notified
-RESTRICT="test"
 
 #net-misc/gns3-server version should always match gns3-gui version
 
 RDEPEND="
-	>=dev-python/libcloud-0.15.1[${PYTHON_USEDEP}]
-	>=dev-python/ws4py-0.3.4[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.6.0[${PYTHON_USEDEP}]
-	>=dev-python/paramiko-1.15.1[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/raven-5.23.0[${PYTHON_USEDEP}]
+	>=dev-python/psutil-2.2.1[${PYTHON_USEDEP}]
 	~net-misc/gns3-server-${PV}[${PYTHON_USEDEP}]
 	dev-python/PyQt5[gui,network,svg,websockets,widgets,${PYTHON_USEDEP}]
 "
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
-src_prepare() {
-	default
-
-	rm -rf tests || die
-}
-
 python_install_all() {
 	distutils-r1_python_install_all
 
-	doicon "${WORKDIR}/${P}/resources/images/gns3.ico"
-	make_desktop_entry "gns3" "GNS3" "/usr/share/pixmaps/gns3.ico" "Utility"
+	doicon "resources/images/gns3.ico"
+	make_desktop_entry "gns3" "GNS3" "gns3.ico" "Utility"
 }
diff --git a/net-misc/gns3-gui/metadata.xml b/net-misc/gns3-gui/metadata.xml
index 7012b6c468af..019d76c33613 100644
--- a/net-misc/gns3-gui/metadata.xml
+++ b/net-misc/gns3-gui/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>onigino@protonmail.com</email>
+		<name>Gino McCarty</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">gns-3</remote-id>
 	</upstream>
diff --git a/net-misc/gns3-server/Manifest b/net-misc/gns3-server/Manifest
index 6c1c41f44ded..4e3dd54c7c53 100644
--- a/net-misc/gns3-server/Manifest
+++ b/net-misc/gns3-server/Manifest
@@ -1,4 +1,3 @@
-AUX gns3-server-2.1.3-typing.patch 259 BLAKE2B 5950ecf364b86f472bab5d5a8c59982086be7b3c541b841f0b6c31e3b4b585d88c4a8e3e013939635cb5c89e8cadf65a428521429ec166879d1a5f90e776b92d SHA512 02a7cafb1c0c306be8177c8c206800511953dd115b428810baa6711ba2e8bba9ae5be7bd9768a87fceb1bf75618fc59c31349e5bf3d55eebe1636a3c71e7fb00
-DIST gns3-server-2.1.3.tar.gz 1658657 BLAKE2B 4ce83aceff8f70f93032b2baafb0dd5c94062b8c431a73b9a83401266ae77f18a4e318651ecd05b789b71c512fc3549d0d1fb95b26fe1fdd23b2953b3367f04c SHA512 df6a98943f893f3d10c16b2a4242869a1407adad56e6c127e6525fe49acefbac9329bf76bc2b16904997985843fdb2b94d03c58f658034ec44763e6d69f7ddaf
-EBUILD gns3-server-2.1.3-r4.ebuild 1887 BLAKE2B 794e2d3dfbb51b15c07d726b443a00cce7b313a6f994c194ed7e1de0688f21ccc11b3921d56fb4a3a08eba23e40ab9350fd8477776c84af0e94b8e5e6522ed69 SHA512 efb46c9b0cf5d68814880ccf5b2e54d7a49504c3ded206c857395ec05cb5f7b1b55eabac036fecdab2ec898054cb0da50e7482f4787455c975e6bb8a2be838de
-MISC metadata.xml 361 BLAKE2B 52549a2862a4e5aaf855909c27ce68640e52549b8e56a2284081cc1eedfe5b5e6e95c3f957f2d34022c43ce541ebd9c6cf94ff723d2843fc85732b76d6358d7a SHA512 10af38136367903504fcc02e0e3cce154283979bcf4c3398d4fde8fb48fc6716448fdece6a74bb240dd74f37487ef07e1ca0209f4c2b567b4f5f3c67c8ed7a4d
+DIST gns3-server-2.1.21.tar.gz 1713993 BLAKE2B 719306e05fd86b22b7413a60eb6fccc0d16a25cc3a34850344124433d0871bce5e85b195386615c1eaebf083295775de4031eee93c477bb8bd07078b839b2ee1 SHA512 3aeb7609f0fad3cf239a4de24affb124b5bed4a3af78c6a6e287a1b771e206c476849a04cf4ab731ce4923ca072d66928068fec5720bc0eb81d6819ed63f71c8
+EBUILD gns3-server-2.1.21.ebuild 1867 BLAKE2B a3e8742132ee6b1ea28c1776351acd7f37579859334abba52ebdc9bb987404b7cfddb56059853b8fcf9f7d747343767df4b90837b32d7e33375aa47e3ea56210 SHA512 8b1e094e3c63aecfe8de74a95052ed7607f872a84492010b349565b7a6fcb126ae9b058fd4149edb2f89638a751708de6c8ac72735894a20f7978a82be132e88
+MISC metadata.xml 562 BLAKE2B ceb6caa8dcb6c506ad0834282075e35a399502c1c4f1c6886223c886d1405f93718439332ede39f1c18ecd169a61af862a128af9ddb6453ef3dce176de9835f2 SHA512 e2113aa60bffff0f9499d300dcd39799f4d096eedd9e2b6212573e4c64bd997d7df1c36c4f68e0d40ac900d59dbec79f44ff34289421b2a9179442e0f06f626c
diff --git a/net-misc/gns3-server/files/gns3-server-2.1.3-typing.patch b/net-misc/gns3-server/files/gns3-server-2.1.3-typing.patch
deleted file mode 100644
index 99b32df27ad8..000000000000
--- a/net-misc/gns3-server/files/gns3-server-2.1.3-typing.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/requirements.txt
-+++ b/requirements.txt
-@@ -6,5 +6,5 @@
- raven>=5.23.0
- psutil>=3.0.0
- zipstream>=1.1.4
--typing>=3.5.3.0 # Otherwise yarl fails with python 3.4
-+typing>=3.5.3.0;python_version<"3.5" # Otherwise yarl fails with python 3.4
- prompt-toolkit
diff --git a/net-misc/gns3-server/gns3-server-2.1.3-r4.ebuild b/net-misc/gns3-server/gns3-server-2.1.21.ebuild
index f1d6d0ec699a..aebe51927092 100644
--- a/net-misc/gns3-server/gns3-server-2.1.3-r4.ebuild
+++ b/net-misc/gns3-server/gns3-server-2.1.21.ebuild
@@ -1,52 +1,52 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 PYTHON_COMPAT=( python3_{5,6} )
 
-inherit distutils-r1 eutils
+inherit distutils-r1 python-utils-r1
 
 DESCRIPTION="GNS3 server to asynchronously manage emulators"
 HOMEPAGE="http://www.gns3.net/"
 SRC_URI="https://github.com/GNS3/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-RESTRICT="test"
 
 RDEPEND="
-	>=app-emulation/dynamips-0.2.12
-	>=dev-python/aiohttp-2.2.0[${PYTHON_USEDEP}]
-	<dev-python/aiohttp-cors-0.6[${PYTHON_USEDEP}]
-	>=dev-python/aiohttp-cors-0.5.3[${PYTHON_USEDEP}]
-	>=dev-python/docker-py-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.8-r2[${PYTHON_USEDEP}]
+	>=dev-python/aiohttp-2.3.3[${PYTHON_USEDEP}]
+	<dev-python/aiohttp-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/aiohttp-cors-0.6.0[${PYTHON_USEDEP}]
+	sys-apps/busybox
+	<dev-python/async_timeout-3.0.0[${PYTHON_USEDEP}]
+	>=app-emulation/dynamips-0.2.18
 	>=dev-python/jinja-2.7.3[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/libcloud-0.14.1[${PYTHON_USEDEP}]
-	>=dev-python/raven-5.23.0[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
 	dev-python/prompt_toolkit[${PYTHON_USEDEP}]
 	>=dev-python/psutil-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-14.3.1[${PYTHON_USEDEP}]
 	>=dev-python/python-zipstream-1.1.4[${PYTHON_USEDEP}]
+	>=dev-python/raven-5.23.0[${PYTHON_USEDEP}]
 	>=net-misc/ubridge-0.9.14
-	>=www-servers/tornado-3.1.1[${PYTHON_USEDEP}]
-	virtual/python-typing[${PYTHON_USEDEP}]
-	>=dev-python/yarl-0.11[${PYTHON_USEDEP}]
 "
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
-# https://github.com/GNS3/gns3-server/pull/1368
-PATCHES=( "${FILESDIR}/${P}-typing.patch" )
-
 src_prepare() {
 	default
 
+	#Remove Pre-built busybox binary
+	rm gns3server/compute/docker/resources/bin/busybox || die
 	# Package installs 'tests' package which is forbidden
 	rm -rf tests || die
 }
 
+python_install() {
+	distutils-r1_python_install
+
+	mkdir -p "${D}$(python_get_sitedir)/gns3server/compute/docker/resources/bin" || die
+	ln -s /bin/busybox "${D}$(python_get_sitedir)/gns3server/compute/docker/resources/bin/busybox" || die
+}
+
 pkg_postinst() {
 	elog "net-misc/gns3-server has several optional packages that must be merged manually for additional functionality."
 	elog ""
diff --git a/net-misc/gns3-server/metadata.xml b/net-misc/gns3-server/metadata.xml
index 1ff1650e8848..e4aa7df0de5a 100644
--- a/net-misc/gns3-server/metadata.xml
+++ b/net-misc/gns3-server/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>onigino@protonmail.com</email>
+		<name>Gino McCarty</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">gns-3</remote-id>
 		<remote-id type="github">GNS3/gns3-server</remote-id>
diff --git a/net-misc/gsutil/Manifest b/net-misc/gsutil/Manifest
index e6cc592bcf2e..325860b7274b 100644
--- a/net-misc/gsutil/Manifest
+++ b/net-misc/gsutil/Manifest
@@ -2,12 +2,15 @@ AUX dummy.boto 128 BLAKE2B f366c006392ef65857a3af2334f6776ce9609841fab260e27c155
 AUX gsutil-4.27-use-friendy-version-checks.patch 745 BLAKE2B 71c404d864f38528836c635b36a49dfa67b7d0370da5ed5486539a8bf5a79130bee1c950d012053fd610ea101be16ce120468221a343e893cbaa6a6507c95d8c SHA512 ed060d08fe58c171df591c010aec1c597a4ba2f08ecf4d5806a78437b90aedd9309f16f48a7cc24143c508b9cac44d865aa3b4499cd11ab8fa1cc0c6196796ad
 AUX gsutil-4.28-use-friendy-version-checks.patch 750 BLAKE2B a4b2e54e3d0d983f5ed2ed41ae092b2ef398a8702830a890c97aef4f6ac1655689f96537c0cf6c99dfb4e2fdca29537aabc09cab2a9a772e5d71c3f303c82aa9 SHA512 461668e10d4480f21144af93f14d4059a2cdfc15b739bc58f7fe9547a96dd38a8bf0f6c7f10b9928fdc1c5e1e402292eaabbbcfb808a4b5dae09cfac1c797e27
 AUX gsutil-4.30-use-friendy-version-checks.patch 759 BLAKE2B 10f482f828c53f4f569a097bbe6e77734b9df697c0280da1cadbf4cbb7e52965dc89d08e4831963e740d8a3a52ebe9082ed58d6363dab70e823de1a8ddcdcfdf SHA512 3d1afc9568d5fb50ffd154352e5e92941000852a64ece5c1e0e4f86835f7b7d2f1d04e1c7e0c115d89a0c6e4214d7f18464153213d5fbec26d5b8cb0d2a98412
+AUX gsutil-4.41-tests.patch 810 BLAKE2B 93a2e7163d0684c8ad03ce03ae94aebc168922861ac89958e0a13a1fc3e53635b03d08531bd29b8301772c0a724647c33e5091af47e1c4bcf4c0478b4487fad6 SHA512 85fad475926755f32c4d08eaad9b023c9808c4ef696a2a7da4c61a68101d781c207c4f5817cda286f123e0c50477e8f7bf032a03d40420004d1aee412ef8375a
 DIST gsutil_4.27.tar.gz 3107288 BLAKE2B 4322335779645caf8d1ce717140a92a2173871e3c572c70a1a07cfe3f2c3b054becb74a3b4cdd2cfac912b3f84758b1b40e65223cc9e3582653392bc3fc180d5 SHA512 0c05e3f1baa8e11e89fc5af2a42474984fc4d5b3cfbd28f3a0efd7603aeee9062f55899c8325579a10e37a6b70a2ad770daf03589f43d0a8a696595c1cdf7b57
 DIST gsutil_4.28.tar.gz 3410500 BLAKE2B ef6d5460f9f04d27c0f172db5880e02cc88f461455ca05c3eb125656f80c29cba9fcf96ceb0c5958f14a7dc1ac85fcae3a2234a2876c7757ece5e756e910da08 SHA512 fbba505f58bc46a737ae8c02aa6a112f71f2543e3aaa4d45afd8e81cda0850c7180216827f3510858b90dfcad85c2d4b54a8c74a04c9b4ab580e966fee7bde0a
 DIST gsutil_4.30.tar.gz 3549515 BLAKE2B e6ef7e3832922d0ac1dafee27d56ce810fb6daab0ffb19e3c5644c9f6b71c3a68490c809fce101c723a15a2124013691321c1cf5a6e5be0970bb8f9cb8878ead SHA512 504f21e3a79695959b128aac9c1b53fda8a5752c813b81edeff3d435c95e5cf269c75e682467a615e093a00ae2b52a6c9c7f0fc2a2fd49440f633124d47f197c
 DIST gsutil_4.32.tar.gz 3644450 BLAKE2B 0e8667504d2bcb499723cf55e6bf825cf555609209c73efaf544183d01a2a5e696ee7c4968f87ded36158a517abf397a295a770d8b9e230695720e90ce52f2d9 SHA512 9000d67cc29af6e28b6210edee3e2143bd382ff7fbea76bd75dabfd0caaafe82832c86e4148005edd1d9f986127f573d16b8a3387747bc28a6091ff189829e8a
+DIST gsutil_4.41.tar.gz 3685987 BLAKE2B 7586d6c64c87c27e4c5f3e86372bfe6d7fdfbdcbe4146308ed497d86b6e3fb984a79d3f07ba3ed055ac09bfe70eef893b8b764a46921703c48c8e54e49cac7eb SHA512 f96500a4761cb244039ba20ccb328b143134a74822990538585116fe6afa6f9e23cfecc9958e34d5deb4291edc9cbe97c6176b3a0f0136ed6e8e81303b5b8c4a
 EBUILD gsutil-4.27.ebuild 1783 BLAKE2B 528b5d30dc29765fa28807f4f2ac059dfb5060684a88acb1cd258e1fbe004f9bfb9315d158049c7fd97cf20bf128a0a055fc20a7c57e16a0cdb966ed7687673c SHA512 afc5055223dfd3c2ef7bdd1c4681ebec2f81cfbcae9e6c06a4ca8abe887c020050ef261e2e047160bdb0f3f49da57ae67e9e6dc75928a886eb25cc696e5488bf
 EBUILD gsutil-4.28.ebuild 1787 BLAKE2B 8f310bf7a9f0f318a2a7a018c27259f76d0d5bebde508880f83fa72932b062d4453a25ea819a183ae439614be57c4d1ee54faa80cb0ef0608b6f7f2fcef7ad31 SHA512 95c1a8b2a379a1efd1ae6cc1816bb799dace33b88bb5983e2c98165df118360e4174a7561a357ca8accec6520f13909ec53b0b7289185f909ce72fe9aabe97ad
 EBUILD gsutil-4.30.ebuild 1789 BLAKE2B 088ae1fa8dccdc6144597d7101517373075b853fce3068d4493af5a840088886f10324f1864e2bc7173b1dbc8cab4324b0c18f3692a14f791b16ccf440480bd8 SHA512 382ac24aa1093c90c64ad3c4d1e059bfe83f37c098810ee93a46325025dae125a3b80a552659b766642fc748a8792944e394dfe8921a73855f201a9727ad85e2
 EBUILD gsutil-4.32.ebuild 2547 BLAKE2B 3a5caf6b54cb38b7d615b20bf1909a289b13c4ec3e632565da07e830a5956e57c8495eed4d55781b4643e2ae199464670fee1efb82513d3dafe93d2a54c2ee14 SHA512 47f01bfce6091f5f7911663fd71fb7cef7e6f0cd5434607cd669c0d7b757003c6f7b1f3dc68b88ff18f00334e14a1b4c18e52136f554260b7f2a62347bc9b3bf
+EBUILD gsutil-4.41.ebuild 2634 BLAKE2B d6d0be415e1b7c0c9c0da6c1117340a536fbcad9bd27d1557e5a4c5e70388e1a0feb2c84b85d168b99eb207b9218e1ba6ef555a1cdd910355475f646095a7cad SHA512 e2f7a9d41fdf862e894b0e91d1c2ee79b5eff57b7026cf394af6757e9e903a95d9c5e8124053c364be6864c93330b3ee11e949aa3baabf50da856188e285f6a3
 MISC metadata.xml 309 BLAKE2B 2e96100ac1f7d7ec8002836564ada61c1f60527f13dedb03063940bbed304147766406ad2dfe3269385320f1f81d3f7ce0979077c6f43ec49d6e8f99d5913cd7 SHA512 9ef28b80fa82fb11b954bdaf65bb385203f18a44dcfa53f2f8cdf47f62ece37eea0ecec1c83e067485d16fc0dd6b8bfb8a0fe625b5af8e5d07cb48a1e52b3178
diff --git a/net-misc/gsutil/files/gsutil-4.41-tests.patch b/net-misc/gsutil/files/gsutil-4.41-tests.patch
new file mode 100644
index 000000000000..9b4a0bf509ae
--- /dev/null
+++ b/net-misc/gsutil/files/gsutil-4.41-tests.patch
@@ -0,0 +1,14 @@
+diff --git a/gslib/third_party/storage_apitools/storage_v1_client.py b/gslib/third_party/storage_apitools/storage_v1_client.py
+index b8162310..933082e9 100644
+--- a/gslib/third_party/storage_apitools/storage_v1_client.py
++++ b/gslib/third_party/storage_apitools/storage_v1_client.py
+@@ -64,8 +64,7 @@ class StorageV1(base_api.BaseApiClient):
+         log_request=log_request, log_response=log_response,
+         credentials_args=credentials_args,
+         default_global_params=default_global_params,
+-        additional_http_headers=additional_http_headers,
+-        response_encoding=response_encoding)
++        additional_http_headers=additional_http_headers)
+     self._version = version
+     self.bucketAccessControls = self.BucketAccessControlsService(self)
+     self.buckets = self.BucketsService(self)
diff --git a/net-misc/gsutil/gsutil-4.41.ebuild b/net-misc/gsutil/gsutil-4.41.ebuild
new file mode 100644
index 000000000000..1bb18ea172b4
--- /dev/null
+++ b/net-misc/gsutil/gsutil-4.41.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_6 )
+
+inherit distutils-r1
+
+DESCRIPTION="command line tool for interacting with cloud storage services"
+HOMEPAGE="https://github.com/GoogleCloudPlatform/gsutil"
+SRC_URI="http://commondatastorage.googleapis.com/pub/${PN}_${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="test"
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-python/argcomplete-1.9.4[${PYTHON_USEDEP}]
+	>=dev-python/boto-2.49.0[${PYTHON_USEDEP}]
+	>=dev-python/crcmod-1.7[${PYTHON_USEDEP}]
+	>=dev-python/fasteners-0.14.1[${PYTHON_USEDEP}]
+	>=dev-python/gcs-oauth2-boto-plugin-2.5[${PYTHON_USEDEP}]
+	>=dev-python/google-apitools-0.5.30[${PYTHON_USEDEP}]
+	dev-python/google-reauth-python[${PYTHON_USEDEP}]
+	>=dev-python/httplib2-0.11.3[${PYTHON_USEDEP}]
+	>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/monotonic-1.4[${PYTHON_USEDEP}]
+	>=dev-python/oauth2client-4.1.2[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
+	>=dev-python/retry-decorator-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.12.0[${PYTHON_USEDEP}]
+	>=dev-python/PySocks-1.01[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+PATCHES=(
+	"${FILESDIR}/gsutil-4.41-tests.patch"
+)
+
+S="${WORKDIR}/${PN}"
+
+DOCS=( README.md CHANGES.md )
+
+# needs to talk to Google to run tests
+RESTRICT="test? ( network-sandbox )"
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	sed -e 's/boto==/boto>=/' \
+		-e 's/mock==/mock>=/' \
+		-e 's/oauth2client==/oauth2client>=/' \
+		-e 's/SocksiPy-branch==/PySocks>=/' \
+		-i setup.py || die
+
+	# For debugging purposes, temporarily uncomment this in order to
+	# show hidden tracebacks.
+	#sed -e 's/^  except OSError as e:$/&\n    raise/' \
+	#	-e 's/def _HandleUnknownFailure(e):/&\n  raise/' \
+	#	-i gslib/__main__.py || die
+
+	# create_bucket raised ResponseNotReady
+	sed -e 's/test_cp_unwritable_tracker_file/_&/' \
+		-e 's/test_cp_unwritable_tracker_file_download/_&/' \
+		-i gslib/tests/test_cp.py || die
+
+	sed -e 's/\(executable_prefix =\).*/\1 [sys.executable]/' \
+		-i gslib/commands/test.py || die
+
+	# IOError: close() called during concurrent operation on the same file object.
+	sed -e 's/sys.stderr.close()/#&/' \
+		-i gslib/tests/testcase/unit_testcase.py
+
+	# Package installs 'test' package which is forbidden and likely a bug in the build system
+	rm -rf "${S}/test" || die
+	sed -i -e '/recursive-include test/d' MANIFEST.in || die
+}
+
+python_test() {
+	BOTO_CONFIG=${FILESDIR}/dummy.boto \
+		${PYTHON} gslib/__main__.py test -u || die "tests failed"
+}
diff --git a/net-misc/hylafaxplus/Manifest b/net-misc/hylafaxplus/Manifest
index 71c308af466b..0c93de0412e1 100644
--- a/net-misc/hylafaxplus/Manifest
+++ b/net-misc/hylafaxplus/Manifest
@@ -8,4 +8,4 @@ DIST hylafax-5.6.1.tar.gz 1370677 BLAKE2B bd93d54f2c3e2c5c4c33617a0d95569c82bcbd
 EBUILD hylafaxplus-5.5.5.ebuild 4715 BLAKE2B 9d6ca4008ad1c725374ea961f7573daa2ec4fff75506b5d131a6680ba95dfdae6bbd734e1d003f07093d47bbfe07fd5db0b7001bf226e50360968e1deae3cf82 SHA512 e3b531d0ea6ed7039abbf2488f8ac5955b41691d1fa47da7182c06e7f44ec2f59082f8b3a1b7493c6129859e477bc72c2b8f21dfc795530fcf5e89de01bab05f
 EBUILD hylafaxplus-5.5.9.ebuild 4293 BLAKE2B 5c3e2ba530b2f8ad984f3db95189f77194fe1bfdd529c3ab5ece560c1fcf0ae97eba2fb56f20f1313ec2ee0c5ba960341acd2d29b8704f27a86d0329d078dc8d SHA512 4b19d97455b3679981d316dbb5f063df8056b4a95e8cb229978bb06e62e43e79ac8af018c79faa5d4f8e175ded1b490b6bc657a2ab876adc175902707af22665
 EBUILD hylafaxplus-5.6.1.ebuild 4293 BLAKE2B 5c3e2ba530b2f8ad984f3db95189f77194fe1bfdd529c3ab5ece560c1fcf0ae97eba2fb56f20f1313ec2ee0c5ba960341acd2d29b8704f27a86d0329d078dc8d SHA512 4b19d97455b3679981d316dbb5f063df8056b4a95e8cb229978bb06e62e43e79ac8af018c79faa5d4f8e175ded1b490b6bc657a2ab876adc175902707af22665
-MISC metadata.xml 578 BLAKE2B 2188942965a0a84ce976c7447444c4858651f4a36ec29a21b169e5224137d7a03eb8dca7522c4ab5ce0d58356ba6de3a276810ba4bf37955628ec0a6ae3940d0 SHA512 1f8cbc639c7ed84086201f71010c2ed662ebad39a3529cf0d9450be66f2d0d4660dde88b16050ef6e112672ce5d23db2210ea3d14a44452233f55aa22f28215d
+MISC metadata.xml 604 BLAKE2B 012e03ab403ae6f27142ac9394736f1ad10bd049e5403e673259371d39119162ad5c61bd84248f1a1ec4f659f20c879e5682b0855d54f096b51c75688975e835 SHA512 bcaa18269a7ece318c970552134c79f89eb41c76a7e471e430d72ad9a8dc4ea10fa57d6b89434759f6cd1aa22db6ad8b5fb8933b7e65ffcdab11275cfce14593
diff --git a/net-misc/hylafaxplus/metadata.xml b/net-misc/hylafaxplus/metadata.xml
index 2a90e2a4335b..80224275b19e 100644
--- a/net-misc/hylafaxplus/metadata.xml
+++ b/net-misc/hylafaxplus/metadata.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<!--maintainer-needed-->
 	<longdescription>
 		Enterprise client-server fax package for class 1 and 2 fax modems.
 	</longdescription>
diff --git a/net-misc/iputils/Manifest b/net-misc/iputils/Manifest
index e30caff7b87b..8a44e7a63af4 100644
--- a/net-misc/iputils/Manifest
+++ b/net-misc/iputils/Manifest
@@ -6,9 +6,12 @@ AUX rarpd.conf.d 250 BLAKE2B 5370ad1151911132ffff03952bc74ba2727eb71fb824b0d3f6c
 AUX rarpd.init.d 583 BLAKE2B 527579b7cc8211af9910702ff730b0911cd84dc2efe8c5272b78e8be5bf656ee7a938a3c3cdaa6a1b8e51fa221f6ff71f3cef4e48b932995b0e66a35a5d7a838 SHA512 926feed1792799ba63afd9a67111c7c3bf8157b758190a5f1587c25b016aa82cdeb4fbffa41ffa5012f2c3dae05fb8f4c0f0bf0ae2b3048c1299d9489ce1bada
 DIST iputils-20180629.tar.gz 195094 BLAKE2B 81bf6ef427eac0769ea3f95c20294b46c81f9c619551234eb265b3a428998a96cf3df0cdc7499f9eea280c1999e899e87c3f4a863141de251a9c509840bc83b3 SHA512 16b8f5ad1cf88083ebaee0a71fddb14bb0a904336fd0baebfcca86c27ac0773553b21d12790b05cab7661d6432c75bbb1523e871e5e1b77faacd13ccc84f4476
 DIST iputils-20190515.tar.gz 403228 BLAKE2B cebe2460ac4da5471a9b8e655bed1c1640f69d4dc41a724ab197533e3d532e34c28e9ccbc852e057d18c9867d9d668e2f73848b005439463dc4e7735c68ae87c SHA512 adb8831ca3a567b9a5f3762227c631aefa62eedbaa7578c2bfea90b6d494b9e0cccf49b68713912611ec56c352d6c517df9e8409c9c9478cfc5732371c8cf250
+DIST iputils-20190709.tar.gz 404101 BLAKE2B 38e66366cc13a77b7da1a85afe7245891c6c7069c218bc8d5d0dd3664d07a5c4004aa6fc56c192b90bfacf2e5e103997cd671a236aa0a9932a5818eca1e10744 SHA512 5db18ac49fa46ed810da4d508e78f4baf2d5c07e7f923eb49d005ad8745743d8861e5788b34a7e37fb7261cee7ddfb768b737eee9d200502ea53537142cac6b5
 DIST iputils-manpages-20180629.tar.xz 29804 BLAKE2B 15983cc97bc6b6853c193f046687f10be11902f7e1d2dc2eec6c58edd1926f10152108d378858b0d7eb2d2908f038965b05515c4927aedc460282a22307883ad SHA512 1c5b0bab8496a3f3d9b5080029221231a497d9a5e91c61bd0ddd0b63fd51572d052801294aafd08e1dc8ad448b82cdaf48c72f0b08cc143f9c144f3db6848d9a
 DIST iputils-manpages-20190515.tar.xz 27556 BLAKE2B adf3eb5c7f3fd71fa24ff48daffd367ba6abc0377bca45ddc439803d177bf668f7dfc7bd3da7a06e89d9ffdd68f2bb0dbb9aa0ac150c98cd1f2b207a68d4fb46 SHA512 4013fe05c592ccc09d6b947ee59d56515bfe49e9a9d5610225d4a2b8c5034a7f1e8dc41c214cf03ce909d36bc5a8438541ad302cddeb1f0b4359a9b9c85ad4b2
+DIST iputils-manpages-20190709.tar.xz 27588 BLAKE2B 9780a96dfde077625a7a499182511066ede63ca364d2de729403354af7cea6b25629da1408ee2081f9da1b21756ee956d04642ea36d05ee02ef7ef05b66c1ad5 SHA512 4de796666426574bd134f4c4ea4d560d8e3eae8bd8ac19b89793fe252a1ef9eebd1833cafb72a2987118f3061eaf00da8a2468e8bced1568611f9391a1203066
 EBUILD iputils-20180629.ebuild 3968 BLAKE2B 34a3f150c222ae7e39771337309a79db140b83f04c6c363a19111c1698ea136e7afcd3c348793e2b51fe0e3d353268cf7bc46a53815568c0bbf8b45ce200b1d9 SHA512 701b6b4fa3fcce5fe59ca72011143bd36744658ed94f15b6cad411115029701efe63798e6e61191d8819daa624a603807509299b9b54e9e46e67dc2c01f1574c
 EBUILD iputils-20190515.ebuild 4916 BLAKE2B c432eba2ed92debe453da5433a91c471cc4efda6ce8540820658421f07fde827a11f9f4efe281c60e9e83741a2823eda1a2bf6354c9d8c3b4be2f75a6e442e66 SHA512 2235ff71f13c2b8be707d2f14f7077adc315b080b6d38dc09d9299f7a398aaf0e7b9f72b7e44a207654619adc9fbf8ac590d2bdcba74c37d3bb1d0273a4e9ac2
-EBUILD iputils-99999999.ebuild 4875 BLAKE2B da3098c6ec01c92e7e4b773188a70d020c43c37f6f9c1428c13f99a166589716e339eb3adabc4675c2a3b3e0840423f3eb47672ef431f13c848e4b4a218a3080 SHA512 0cbc2050d94d55a775d5d5ef8263e19b7016bce9c924ff4b5aed74bbd9ae0ee29079b3f536107f71683341ccee6044631ef3212ee01b26076e034c759d23974b
+EBUILD iputils-20190709.ebuild 4849 BLAKE2B e15bd9cc372a0512726d6e9f522d0f5738f56e5940f6b4abecbe26e59a6e223c9f3d22c4fef3121b9ece3f7d28f80fca6686e6185ce79122f61c4296857f066e SHA512 56a15483326d13fd4bd5cfdf628f1a7819d2b4d3a927c194c6c5e0f1d3242c5fb976f9dd959f3a20b071c204ae78f227cef7e532d1c9f798317d000a45159f3f
+EBUILD iputils-99999999.ebuild 4856 BLAKE2B a45da5d66dd052fb98d00ee8b15574460178cab2598a8b094683b28c15a8b16fb47e3372f3aaf7f25b099d9940fe52dbef260e0c614c3e345be2365126aadece SHA512 0528921d494b624508f42cd34b792663d8b112f037bbf3caa23304cb4bb6e7f749d9794066350854d24fbab847a4491cf339c4d7e3840a202c2ce1c081d0b901
 MISC metadata.xml 1625 BLAKE2B c29d113e691929f035c7dffbe52e043c1552941565a51021efe401a299aebb5d818ff33a1c99ae086bdc5ecd5a1063db5180b8bd1107dc103e45a8c9450913d2 SHA512 86d64befb808172b14c5e5c53fdc901d51f380045dcc5f42cf770ec03c1722a78677824c2a4823357bdce438edc92cf3d3340436968935c615fa49c4173cc17e
diff --git a/net-misc/iputils/iputils-20190709.ebuild b/net-misc/iputils/iputils-20190709.ebuild
new file mode 100644
index 000000000000..31637094b14f
--- /dev/null
+++ b/net-misc/iputils/iputils-20190709.ebuild
@@ -0,0 +1,201 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# For released versions, we precompile the man/html pages and store
+# them in a tarball on our mirrors.  This avoids ugly issues while
+# building stages, and reduces depedencies.
+# To regenerate man/html pages emerge iputils-99999999[doc] with
+# EGIT_COMMIT set to release tag and tar ${S}/doc folder.
+
+EAPI="7"
+
+PLOCALES="ja"
+
+inherit fcaps flag-o-matic l10n meson systemd toolchain-funcs
+
+if [[ ${PV} == "99999999" ]] ; then
+	EGIT_REPO_URI="https://github.com/iputils/iputils.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/iputils/iputils/archive/s${PV}.tar.gz -> ${P}.tar.gz
+		https://dev.gentoo.org/~whissi/dist/iputils/${PN}-manpages-${PV}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="Network monitoring tools including ping and ping6"
+HOMEPAGE="https://wiki.linuxfoundation.org/networking/iputils"
+
+LICENSE="BSD GPL-2+ rdisc"
+SLOT="0"
+IUSE="+arping caps clockdiff doc gcrypt idn ipv6 libressl nettle nls rarpd rdisc SECURITY_HAZARD ssl static tftpd tracepath traceroute6"
+
+BDEPEND="
+	virtual/os-headers
+	virtual/pkgconfig
+"
+
+LIB_DEPEND="
+	caps? ( sys-libs/libcap[static-libs(+)] )
+	idn? ( net-dns/libidn2:=[static-libs(+)] )
+	ipv6? (
+		ssl? (
+			gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] )
+			!gcrypt? (
+				nettle? ( dev-libs/nettle[static-libs(+)] )
+				!nettle? (
+					libressl? ( dev-libs/libressl:0=[static-libs(+)] )
+					!libressl? ( dev-libs/openssl:0=[static-libs(+)] )
+				)
+			)
+		)
+	)
+	nls? ( sys-devel/gettext[static-libs(+)] )
+"
+
+RDEPEND="
+	arping? ( !net-misc/arping )
+	rarpd? ( !net-misc/rarpd )
+	traceroute6? ( !net-analyzer/traceroute )
+	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+"
+
+DEPEND="
+	${RDEPEND}
+	static? ( ${LIB_DEPEND} )
+"
+
+if [[ ${PV} == "99999999" ]] ; then
+	DEPEND+="
+		app-text/docbook-xml-dtd:4.2
+		app-text/docbook-xml-dtd:4.5
+		app-text/docbook-xsl-ns-stylesheets
+		app-text/docbook-xsl-stylesheets
+		dev-libs/libxslt:0
+	"
+fi
+
+[ "${PV}" == "99999999" ] || S="${WORKDIR}/${PN}-s${PV}"
+
+PATCHES=()
+
+src_prepare() {
+	use SECURITY_HAZARD && PATCHES+=( "${FILESDIR}"/${PN}-20150815-nonroot-floodping.patch )
+
+	default
+
+	l10n_get_locales > po/LINGUAS || die
+}
+
+src_configure() {
+	use static && append-ldflags -static
+
+	local emesonargs=(
+		-DUSE_CAP="$(usex caps true false)"
+		-DUSE_IDN="$(usex idn true false)"
+		-DBUILD_ARPING="$(usex arping true false)"
+		-DBUILD_CLOCKDIFF="$(usex clockdiff true false)"
+		-DBUILD_PING="true"
+		-DBUILD_RARPD="$(usex rarpd true false)"
+		-DBUILD_RDISC="$(usex rdisc true false)"
+		-DENABLE_RDISC_SERVER="$(usex rdisc true false)"
+		-DBUILD_TFTPD="$(usex tftpd true false)"
+		-DBUILD_TRACEPATH="$(usex tracepath true false)"
+		-DBUILD_TRACEROUTE6="$(usex ipv6 $(usex traceroute6 true false) false)"
+		-DBUILD_NINFOD="false"
+		-DNINFOD_MESSAGES="false"
+		-DNO_SETCAP_OR_SUID="true"
+		-Dsystemdunitdir="$(systemd_get_systemunitdir)"
+		-DUSE_GETTEXT="$(usex nls true false)"
+	)
+
+	if use ipv6 && use ssl ; then
+		emesonargs+=(
+			-DUSE_CRYPTO="$(usex gcrypt gcrypt $(usex nettle nettle openssl))"
+		)
+	else
+		emesonargs+=(
+			-DUSE_CRYPTO="none"
+		)
+	fi
+
+	if [[ "${PV}" == 99999999 ]] ; then
+		emesonargs+=(
+			-DBUILD_HTML_MANS="$(usex doc true false)"
+			-DBUILD_MANS="true"
+		)
+	else
+		emesonargs+=(
+			-DBUILD_HTML_MANS="false"
+			-DBUILD_MANS="false"
+		)
+	fi
+
+	meson_src_configure
+}
+
+src_compile() {
+	tc-export CC
+	meson_src_compile
+}
+
+src_install() {
+	meson_src_install
+
+	dodir /bin
+	local my_bin
+	for my_bin in $(usex arping arping '') ping ; do
+		mv "${ED%/}"/usr/bin/${my_bin} "${ED%/}"/bin/ || die
+	done
+	dosym ping /bin/ping4
+
+	if use tracepath ; then
+		dosym tracepath /usr/bin/tracepath4
+	fi
+
+	if use ipv6 ; then
+		dosym ping /bin/ping6
+
+		if use tracepath ; then
+			dosym tracepath /usr/bin/tracepath6
+			dosym tracepath.8 /usr/share/man/man8/tracepath6.8
+		fi
+	fi
+
+	if [[ "${PV}" != 99999999 ]] ; then
+		local -a man_pages
+		local -a html_man_pages
+
+		while IFS= read -r -u 3 -d $'\0' my_bin
+		do
+			my_bin=$(basename "${my_bin}")
+			[[ -z "${my_bin}" ]] && continue
+
+			if [[ -f "${S}/doc/${my_bin}.8" ]] ; then
+				man_pages+=( ${my_bin}.8 )
+			fi
+
+			if [[ -f "${S}/doc/${my_bin}.html" ]] ; then
+				html_man_pages+=( ${my_bin}.html )
+			fi
+		done 3< <(find "${ED%/}"/{bin,usr/bin,usr/sbin} -type f -perm -a+x -print0 2>/dev/null)
+
+		pushd doc &>/dev/null || die
+		doman "${man_pages[@]}"
+		if use doc ; then
+			docinto html
+			dodoc "${html_man_pages[@]}"
+		fi
+		popd &>/dev/null || die
+	else
+		if use doc ; then
+			mv "${ED%/}"/usr/share/${PN} "${ED%/}"/usr/share/doc/${PF}/html || die
+		fi
+	fi
+}
+
+pkg_postinst() {
+	fcaps cap_net_raw \
+		bin/ping \
+		$(usex arping 'bin/arping' '') \
+		$(usex clockdiff 'usr/bin/clockdiff' '')
+}
diff --git a/net-misc/iputils/iputils-99999999.ebuild b/net-misc/iputils/iputils-99999999.ebuild
index 4e19ac8bb2b2..ffc2311cad4e 100644
--- a/net-misc/iputils/iputils-99999999.ebuild
+++ b/net-misc/iputils/iputils-99999999.ebuild
@@ -7,7 +7,7 @@
 # To regenerate man/html pages emerge iputils-99999999[doc] with
 # EGIT_COMMIT set to release tag and tar ${S}/doc folder.
 
-EAPI="6"
+EAPI="7"
 
 PLOCALES="ja"
 
@@ -29,6 +29,11 @@ LICENSE="BSD GPL-2+ rdisc"
 SLOT="0"
 IUSE="+arping caps clockdiff doc gcrypt idn ipv6 libressl nettle nls rarpd rdisc SECURITY_HAZARD ssl static tftpd tracepath traceroute6"
 
+BDEPEND="
+	virtual/os-headers
+	virtual/pkgconfig
+"
+
 LIB_DEPEND="
 	caps? ( sys-libs/libcap[static-libs(+)] )
 	idn? ( net-dns/libidn2:=[static-libs(+)] )
@@ -53,12 +58,12 @@ RDEPEND="
 	traceroute6? ( !net-analyzer/traceroute )
 	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
 "
+
 DEPEND="
 	${RDEPEND}
 	static? ( ${LIB_DEPEND} )
-	virtual/os-headers
-	virtual/pkgconfig
 "
+
 if [[ ${PV} == "99999999" ]] ; then
 	DEPEND+="
 		app-text/docbook-xml-dtd:4.2
@@ -160,7 +165,6 @@ src_install() {
 		local -a man_pages
 		local -a html_man_pages
 
-		local oifs=${IFS}
 		while IFS= read -r -u 3 -d $'\0' my_bin
 		do
 			my_bin=$(basename "${my_bin}")
@@ -174,7 +178,6 @@ src_install() {
 				html_man_pages+=( ${my_bin}.html )
 			fi
 		done 3< <(find "${ED%/}"/{bin,usr/bin,usr/sbin} -type f -perm -a+x -print0 2>/dev/null)
-		IFS=${oifs}
 
 		pushd doc &>/dev/null || die
 		doman "${man_pages[@]}"
diff --git a/net-misc/lambdamoo/Manifest b/net-misc/lambdamoo/Manifest
index 724263840322..49b55743103c 100644
--- a/net-misc/lambdamoo/Manifest
+++ b/net-misc/lambdamoo/Manifest
@@ -2,5 +2,5 @@ AUX 1.8.1-enable-outbound.patch 451 BLAKE2B 71c9fa7921e258df1b785e7b5d92eed3b380
 AUX lambdamoo.conf 185 BLAKE2B d681b52af98a278c9ee4c4485afcd0919f952e5a5cd1740a4365af233f60c273833c3c35d9a65f4e1e48ebe99d93e9c0ee307ed8b052b97e41abdd6d8e4a3bd2 SHA512 fa96885e674b571c6eccb682cb4ab47d09a723a1dd82d6a11a42e5760c2b53ab24919627823ab9c4a2aeb5d3d2d41984df3eb9f3de382164b062e024639ba2b2
 AUX lambdamoo.rc 1145 BLAKE2B c6b5b7d25644c0a2832144a6c8b6be3af082d9bac30f5916c84a3ecac983556095018cbbbdbd138c046927873c9e52cbb02560ef1b84a553b666f0c5514534c3 SHA512 ce0d41459aac2249b2982d5bc174810e2fd5a77ad5c5f102929c350306bb799cdd9582926dda42c062d7f60b77ae59dd26d7f32d249193d13e9b9feb888ebd96
 DIST LambdaMOO-1.8.1.tar.gz 363803 BLAKE2B 0bca69eff651911d97f1de66c93aaa0ebb14e199277bb83171e0855313291501ef501272b58a0524da1e3764359f0c6b79377d021db0b45097ed29674793024e SHA512 1629375d74c67851e20ac007411261bb24c642249e4ede0415580b5c87e0df77b23e8a70b249f734ad3b5bc3b8859b5f0162dc55f69b9756ce2afa6a9553b7fc
-EBUILD lambdamoo-1.8.1-r3.ebuild 931 BLAKE2B aacfdbd0bbb487266bbecbc37ba35ec986e1bc44bd0101173661ec523fe3fa9d14c97f10557b774898e8b8eeeb9920c9e349a15bc0d93580d1cb7388ee9f5c4f SHA512 16c1138b96b38ad023a463cbb2a7f6fdde8df29f29a416d2725b4ad5c5978784ed71e1c12840da2931e7f760050cf317d86171feba2c9b71f5c02e1cac218fb3
+EBUILD lambdamoo-1.8.1-r3.ebuild 928 BLAKE2B 8bc36e61e619bf4539182d02e6b227d3d66a1e1fd4a19fae78cd48b990b51d99f9ef9eac5fe87d2d5d6cf3f433845285937a7d9d40c38582ff4a11865b5309ef SHA512 07e89e0752a214274f0abd6fd88e39918c3ec5d0f570f0e1fdcf1ff6b9015b7e462fe3aaabd88d84bbf67ad2e0fab6b619d32932f72316033c87662c4d57f482
 MISC metadata.xml 246 BLAKE2B 6b18c71f3f566648546a95f1d92b4579d58d2041f249cc1fa2a5c7f6e1bf70b062ba78ef7368e0500e71ef4b25e7e6b7d3b415e161d493e37946e5577cd6610b SHA512 2e061a29f6379f4379aec8e6ba1da5b4265f6594e0a414e7e5a04fa5b3ca8ec3c2487f86049d234c37221303050050a8a9264c8c08fe3992c0a0cb2ecfa74d6e
diff --git a/net-misc/lambdamoo/lambdamoo-1.8.1-r3.ebuild b/net-misc/lambdamoo/lambdamoo-1.8.1-r3.ebuild
index 296ae54cd94a..447f42484f06 100644
--- a/net-misc/lambdamoo/lambdamoo-1.8.1-r3.ebuild
+++ b/net-misc/lambdamoo/lambdamoo-1.8.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/lambdamoo/LambdaMOO-${PV}.tar.gz"
 
 LICENSE="LambdaMOO GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~sparc"
+KEYWORDS="~sparc ~x86"
 IUSE=""
 
 DEPEND="sys-devel/bison"
diff --git a/net-misc/monmotha/Manifest b/net-misc/monmotha/Manifest
index fdbb2d003eb7..9313bfa1e12d 100644
--- a/net-misc/monmotha/Manifest
+++ b/net-misc/monmotha/Manifest
@@ -1,4 +1,4 @@
 AUX monmotha.rc6 825 BLAKE2B 0dd41a71c1f22291f83baeafabe4be4ec627b17e8c2a6df12033718055d737544d55fe30f9e97c775e5243a1b148133472b861f5954b5519302f6cdf4191ff8b SHA512 4d11a2c00d1829664a39ac1338b8dc803d4e32c8703a929b9ce93fdeed42e1ccdb11fa5ab7e837d883dae0a7534b1fe40cba281f4d88a3d291ebd2911e34bd10
 DIST rc.firewall-2.3.8 56204 BLAKE2B d699d5eb2c7efdfe258a2f38e2ffc1bb1e568c260c90a77a0fd1d27fbbe5b08ecefcc99d798fd210133ff8f7943fddacfc06a754044434e7525cd6449a92dc46 SHA512 ccdd3427a274204c697a64a8936d4311cb34fbb66738c6afc4c242baad01407d1a36adac7a73b24b432943cd7cec05c9c1d9b2d4845b8b132bd61378c0c2e098
-EBUILD monmotha-2.3.8-r1.ebuild 1231 BLAKE2B fa83a87c8a993dedb8f104a4828fd97a27273c949b38f1c0ca2a01e9e46f4d6fafe546150d8da33c9652a3c31fe7e8bb06d81d5f2048aff2ae21fa7132d0d9de SHA512 a3ffd4a1adc3129e645d96c0ed82413f8944f5109577447587e8fb3a17e72f6714b1983d922913aed39f6e1a49e403cad032e1882bb10f0876f2dd8d550b020e
+EBUILD monmotha-2.3.8-r1.ebuild 1228 BLAKE2B 48a264b3d0633e9f41865f491ff824ef5fa548d675d1c97b11f873d71cf1c5d0bc81e6e6c2caca4fab4198b853cb91c28696d8e61d462bf8be9e9e381b23c6e3 SHA512 80e2ea648ea4e4d32809ee69466db988a7f71a68e44e355aa9d1444bcc46fa0015d6c53e1219b2d387b4e81e8e8b7dc0ece240d70ce6269a7de099b9400256ea
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-misc/monmotha/monmotha-2.3.8-r1.ebuild b/net-misc/monmotha/monmotha-2.3.8-r1.ebuild
index 99f20cae77ef..1fca00fb467e 100644
--- a/net-misc/monmotha/monmotha-2.3.8-r1.ebuild
+++ b/net-misc/monmotha/monmotha-2.3.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ DESCRIPTION="MonMotha IPTables-based firewall script"
 HOMEPAGE="http://monmotha.mplug.org/firewall/"
 LICENSE="GPL-2"
 
-KEYWORDS="x86 ~amd64"
+KEYWORDS="~amd64 x86"
 IUSE=""
 SLOT="0"
 RDEPEND=">=net-firewall/iptables-1.2.5"
diff --git a/net-misc/ntpsec/Manifest b/net-misc/ntpsec/Manifest
index 76aa339d32d1..c6cf6f3c0ace 100644
--- a/net-misc/ntpsec/Manifest
+++ b/net-misc/ntpsec/Manifest
@@ -3,12 +3,8 @@ AUX ntpd.confd 90 BLAKE2B 980ea88c97b1deff65f53c13410fe46bc1e19a80140776002ae2fd
 AUX ntpd.rc-r2 484 BLAKE2B 826a3ee09486d912525fe6d44b967e25d8b31485d89a80987afcf459ea335058ff8a7835f3931017505aad6c5ba60e546b608ce26a51ad38f5972675d0a47559 SHA512 dc89a58edf6f83878d42522a015f2c3e12db9505ea3d6bc4b04e6e82947a7be6e8d143e8808bb58644641dd754744fd4be20c8b944a4261b460c30b95436fc31
 AUX ntpd.service 299 BLAKE2B 307dbf3a8569cdd1d54095bdb9b409986a9de3c7ec98405b4544f1df565828da2b685ce408061bc03f9a7991fbd61a9b42577c4e6db06bd2a4a012949cafe2dc SHA512 b625e993bbeba5da9c0f14ec8ff9d256575d9590a6c506436e834a9dc17877bfd57920b008bd01409d47de71acfb221a0d92c0203e2aacca33083e196466faf9
 DIST ntpsec-1.1.3.tar.gz 2462330 BLAKE2B 903e569ad72939def9df31d7b51b2623b140754de67362213f39e39ad770d903d70c45a10a18e98ae35927792666ae27de40b41a5c0bfe6fd8cfa6a37102d4e8 SHA512 df60c5fa63d4c94529ba1e8b21c7d6b5d0c9fb810ed7546a621b072725a6ff03edbd2dcbc3baf19ac3b3a9b82d7aff3ddee4ab8c93559b7065ed06a211b538c4
-DIST ntpsec-1.1.4.tar.gz 2536268 BLAKE2B 320e7afee1b776e0327f8bf34bc0b8cd3a2c67fd9fd16564323ce825cb9e36d7d5fb48a38b734600286cbd039f41f296d9e488e25d2680f08412aa983101987b SHA512 1b74e7cb87e189137e1b66b52ce89498e0061a10abf017c36bfdecb4aefe9c3fb6e8fd7819a9f822fb946dca6ae20ee724b2aed35e03d73f8e3015d8818d02db
-DIST ntpsec-1.1.5.tar.gz 2597462 BLAKE2B 4fb4592796c1ee5c18d9e2065551057e7866c46515f9cc179b5f42a296b9a0d6d6b59877f4165091b31bb7074c45174effd642796a92ef5d85868ce15abfe041 SHA512 14761fed544e59e96390aada3b681ba3815acb6f414d45c65c82a9e5c394030d4cf517983289aac04ec42c7f606936a7ef636e5989e1dfd03c82e6515c102a4a
 DIST ntpsec-1.1.6.tar.gz 2600632 BLAKE2B 1ee3e266f9a0ff45fc8f001a2b5a1722c6acf75a2151ee3724812acef3409eccbb865b321a3a346c7ced1770aa24190281a94593b881b4bbb0a2b2e6df5629cc SHA512 f57fde6f329a858313968798d64df5e93d7eba43edf4752cd0eb45ff1a2237ce2731b4603ec997c493dea85edb42976f96eb1508beae087a8c2ae8a76c0a6941
 EBUILD ntpsec-1.1.3.ebuild 4068 BLAKE2B a0dc5a6733d392982c0c6a55760974b3ff22b055a220c0841a5e0aa1d1e01291495c115d8751317eaf83e8aad1556cfb48962dec7b5c19d788aee0dc16de51ca SHA512 fc551143326b61f2039e747ccae7d7d82409768d4a447eb51858207aa6c7f3656121e4d7e89a75b94b4b0e5f04bb20cbf19f67a78ea454d4204bbbe25f962f5a
-EBUILD ntpsec-1.1.4.ebuild 4064 BLAKE2B e85f6d74f70f0302d6d93d2dcd1d5769f743d86c85d880113ad25fd483dbbfac97c408efa012e22bd81c94a3bd0a6dcd92a0910a3f39f4ac5a65212544c2482e SHA512 dcd0195ee1c8585d3c88dcb6ce77fb1301cb59b879a5c77e84732d74bf272f5a2b02a2e0661bfe7393f4914c1bd9c917c58cec63c54caf4098151810cf3c299a
-EBUILD ntpsec-1.1.5.ebuild 4064 BLAKE2B e85f6d74f70f0302d6d93d2dcd1d5769f743d86c85d880113ad25fd483dbbfac97c408efa012e22bd81c94a3bd0a6dcd92a0910a3f39f4ac5a65212544c2482e SHA512 dcd0195ee1c8585d3c88dcb6ce77fb1301cb59b879a5c77e84732d74bf272f5a2b02a2e0661bfe7393f4914c1bd9c917c58cec63c54caf4098151810cf3c299a
-EBUILD ntpsec-1.1.6.ebuild 4064 BLAKE2B e85f6d74f70f0302d6d93d2dcd1d5769f743d86c85d880113ad25fd483dbbfac97c408efa012e22bd81c94a3bd0a6dcd92a0910a3f39f4ac5a65212544c2482e SHA512 dcd0195ee1c8585d3c88dcb6ce77fb1301cb59b879a5c77e84732d74bf272f5a2b02a2e0661bfe7393f4914c1bd9c917c58cec63c54caf4098151810cf3c299a
-EBUILD ntpsec-9999.ebuild 4064 BLAKE2B e85f6d74f70f0302d6d93d2dcd1d5769f743d86c85d880113ad25fd483dbbfac97c408efa012e22bd81c94a3bd0a6dcd92a0910a3f39f4ac5a65212544c2482e SHA512 dcd0195ee1c8585d3c88dcb6ce77fb1301cb59b879a5c77e84732d74bf272f5a2b02a2e0661bfe7393f4914c1bd9c917c58cec63c54caf4098151810cf3c299a
+EBUILD ntpsec-1.1.6.ebuild 4004 BLAKE2B 935bc24d6acd6d181c1049af4cb0e3af9fd8f09e922bc480fe0dc7f48fd32d6b0434f2c1074e4939fce93e2223afc1a924707d6ce55ca0f05858ee3b5af67ff0 SHA512 3ab05594f166700869fd2ad699f91fe24c828d7e9ac7aaf2fd678feb58a8a397032d434f9aaa77330875ef216dd5ff44bb26fa8727bf0789cf24c4d9c558497e
+EBUILD ntpsec-9999.ebuild 4004 BLAKE2B 935bc24d6acd6d181c1049af4cb0e3af9fd8f09e922bc480fe0dc7f48fd32d6b0434f2c1074e4939fce93e2223afc1a924707d6ce55ca0f05858ee3b5af67ff0 SHA512 3ab05594f166700869fd2ad699f91fe24c828d7e9ac7aaf2fd678feb58a8a397032d434f9aaa77330875ef216dd5ff44bb26fa8727bf0789cf24c4d9c558497e
 MISC metadata.xml 2008 BLAKE2B e4f1a7e79fbaf5011ba2b26143c138f39663be73664ec9f1270e9b6cbcb553c245201c9a5bd0771435a24e1f342907861e8a2b6808cc2e3f6d6a7a10ad6ed021 SHA512 5c8fc24233d577ebc254a6d92d93734bfb10ef287217ef61f4f6e8b28f059ee7e92bc5e18326d61a9e80fa7504f79c820d831cdad489321a9f45bae0a4d54a16
diff --git a/net-misc/ntpsec/ntpsec-1.1.4.ebuild b/net-misc/ntpsec/ntpsec-1.1.4.ebuild
deleted file mode 100644
index b227382f452e..000000000000
--- a/net-misc/ntpsec/ntpsec-1.1.4.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-PYTHON_REQ_USE='threads(+)'
-
-inherit flag-o-matic python-r1 waf-utils systemd user
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.com/NTPsec/ntpsec.git"
-	BDEPEND=""
-	KEYWORDS=""
-else
-	SRC_URI="ftp://ftp.ntpsec.org/pub/releases/${PN}-${PV}.tar.gz"
-	RESTRICT="mirror"
-	BDEPEND=""
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-DESCRIPTION="The NTP reference implementation, refactored"
-HOMEPAGE="https://www.ntpsec.org/"
-
-NTPSEC_REFCLOCK=(
-	oncore trimble truetime gpsd jjy generic spectracom
-	shm pps hpgps zyfer arbiter nmea neoclock modem
-	local)
-
-IUSE_NTPSEC_REFCLOCK=${NTPSEC_REFCLOCK[@]/#/rclock_}
-
-LICENSE="HPND MIT BSD-2 BSD CC-BY-SA-4.0"
-SLOT="0"
-IUSE="${IUSE_NTPSEC_REFCLOCK} debug doc early gdb heat libressl nist ntpviz samba seccomp smear tests" #ionice
-REQUIRED_USE="${PYTHON_REQUIRED_USE} nist? ( rclock_local )"
-
-# net-misc/pps-tools oncore,pps
-CDEPEND="${PYTHON_DEPS}
-	${BDEPEND}
-	sys-libs/libcap
-	dev-python/psutil[${PYTHON_USEDEP}]
-	libressl? ( dev-libs/libressl:0= )
-	!libressl? ( dev-libs/openssl:0= )
-	seccomp? ( sys-libs/libseccomp )
-"
-RDEPEND="${CDEPEND}
-	ntpviz? ( sci-visualization/gnuplot media-fonts/liberation-fonts )
-	!net-misc/ntp
-	!net-misc/openntpd
-"
-DEPEND="${CDEPEND}
-	app-text/asciidoc
-	app-text/docbook-xsl-stylesheets
-	sys-devel/bison
-	rclock_oncore? ( net-misc/pps-tools )
-	rclock_pps? ( net-misc/pps-tools )
-"
-
-WAF_BINARY="${S}/waf"
-
-pkg_setup() {
-	enewgroup ntp 123
-	enewuser ntp 123 -1 /dev/null ntp
-}
-
-src_prepare() {
-	default
-	# Remove autostripping of binaries
-	sed -i -e '/Strip binaries/d' wscript
-	python_copy_sources
-}
-
-src_configure() {
-	is-flagq -flto* && filter-flags -flto* -fuse-linker-plugin
-
-	local string_127=""
-	local rclocks="";
-	local CLOCKSTRING=""
-
-	for refclock in ${NTPSEC_REFCLOCK[@]} ; do
-		if use rclock_${refclock} ; then
-			string_127+="$refclock,"
-		fi
-	done
-	CLOCKSTRING="`echo ${string_127}|sed 's|,$||'`"
-
-	local myconf=(
-		--nopyc
-		--nopyo
-		--refclock="${CLOCKSTRING}"
-		$(use doc	&& echo "--enable-doc")
-		$(use early	&& echo "--enable-early-droproot")
-		$(use gdb	&& echo "--enable-debug-gdb")
-		$(use nist	&& echo "--enable-lockclock")
-		$(use samba	&& echo "--enable-mssntp")
-		$(use seccomp	&& echo "--enable-seccomp")
-		$(use smear	&& echo "--enable-leap-smear")
-		$(use tests	&& echo "--alltests")
-		$(use debug	&& echo "--enable-debug")
-	)
-
-	python_configure() {
-		waf-utils_src_configure "${myconf[@]}"
-	}
-	python_foreach_impl run_in_build_dir python_configure
-}
-
-src_compile() {
-	unset MAKEOPTS
-	python_compile() {
-		waf-utils_src_compile
-	}
-	python_foreach_impl run_in_build_dir python_compile
-}
-
-src_install() {
-	python_install() {
-		waf-utils_src_install
-	}
-	python_foreach_impl run_in_build_dir python_install
-
-	# Install heat generating scripts
-	use heat && dosbin "${S}"/contrib/ntpheat{,usb}
-
-	# Install the openrc files
-	newinitd "${FILESDIR}"/ntpd.rc-r2 ntp
-	newconfd "${FILESDIR}"/ntpd.confd ntp
-
-	# Install the systemd unit file
-	systemd_newunit "${FILESDIR}"/ntpd.service ntpd.service
-
-	# Prepare a directory for the ntp.drift file
-	mkdir -pv "${ED}"/var/lib/ntp
-	chown ntp:ntp "${ED}"/var/lib/ntp
-	chmod 770 "${ED}"/var/lib/ntp
-	keepdir /var/lib/ntp
-
-	# Install a log rotate script
-	mkdir -pv "${ED}"/etc/logrotate.d
-	cp -v "${S}"/etc/logrotate-config.ntpd "${ED}"/etc/logrotate.d/ntpd
-
-	# Install the configuration file and sample configuration
-	cp -v "${FILESDIR}"/ntp.conf "${ED}"/etc/ntp.conf
-	cp -Rv "${S}"/etc/ntp.d/ "${ED}"/etc/
-
-	# move doc files to /usr/share/doc/"${P}"
-	use doc && mv -v "${ED}"/usr/share/doc/"${PN}" "${ED}"/usr/share/doc/"${P}"/html
-}
-
-pkg_postinst() {
-	einfo "If you want to serve time on your local network, then"
-	einfo "you should disable all the ref_clocks unless you have"
-	einfo "one and can get stable time from it.  Feel free to try"
-	einfo "it but PPS probably won't work unless you have a UART"
-	einfo "GPS that actually provides PPS messages."
-}
diff --git a/net-misc/ntpsec/ntpsec-1.1.5.ebuild b/net-misc/ntpsec/ntpsec-1.1.5.ebuild
deleted file mode 100644
index b227382f452e..000000000000
--- a/net-misc/ntpsec/ntpsec-1.1.5.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-PYTHON_REQ_USE='threads(+)'
-
-inherit flag-o-matic python-r1 waf-utils systemd user
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.com/NTPsec/ntpsec.git"
-	BDEPEND=""
-	KEYWORDS=""
-else
-	SRC_URI="ftp://ftp.ntpsec.org/pub/releases/${PN}-${PV}.tar.gz"
-	RESTRICT="mirror"
-	BDEPEND=""
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-DESCRIPTION="The NTP reference implementation, refactored"
-HOMEPAGE="https://www.ntpsec.org/"
-
-NTPSEC_REFCLOCK=(
-	oncore trimble truetime gpsd jjy generic spectracom
-	shm pps hpgps zyfer arbiter nmea neoclock modem
-	local)
-
-IUSE_NTPSEC_REFCLOCK=${NTPSEC_REFCLOCK[@]/#/rclock_}
-
-LICENSE="HPND MIT BSD-2 BSD CC-BY-SA-4.0"
-SLOT="0"
-IUSE="${IUSE_NTPSEC_REFCLOCK} debug doc early gdb heat libressl nist ntpviz samba seccomp smear tests" #ionice
-REQUIRED_USE="${PYTHON_REQUIRED_USE} nist? ( rclock_local )"
-
-# net-misc/pps-tools oncore,pps
-CDEPEND="${PYTHON_DEPS}
-	${BDEPEND}
-	sys-libs/libcap
-	dev-python/psutil[${PYTHON_USEDEP}]
-	libressl? ( dev-libs/libressl:0= )
-	!libressl? ( dev-libs/openssl:0= )
-	seccomp? ( sys-libs/libseccomp )
-"
-RDEPEND="${CDEPEND}
-	ntpviz? ( sci-visualization/gnuplot media-fonts/liberation-fonts )
-	!net-misc/ntp
-	!net-misc/openntpd
-"
-DEPEND="${CDEPEND}
-	app-text/asciidoc
-	app-text/docbook-xsl-stylesheets
-	sys-devel/bison
-	rclock_oncore? ( net-misc/pps-tools )
-	rclock_pps? ( net-misc/pps-tools )
-"
-
-WAF_BINARY="${S}/waf"
-
-pkg_setup() {
-	enewgroup ntp 123
-	enewuser ntp 123 -1 /dev/null ntp
-}
-
-src_prepare() {
-	default
-	# Remove autostripping of binaries
-	sed -i -e '/Strip binaries/d' wscript
-	python_copy_sources
-}
-
-src_configure() {
-	is-flagq -flto* && filter-flags -flto* -fuse-linker-plugin
-
-	local string_127=""
-	local rclocks="";
-	local CLOCKSTRING=""
-
-	for refclock in ${NTPSEC_REFCLOCK[@]} ; do
-		if use rclock_${refclock} ; then
-			string_127+="$refclock,"
-		fi
-	done
-	CLOCKSTRING="`echo ${string_127}|sed 's|,$||'`"
-
-	local myconf=(
-		--nopyc
-		--nopyo
-		--refclock="${CLOCKSTRING}"
-		$(use doc	&& echo "--enable-doc")
-		$(use early	&& echo "--enable-early-droproot")
-		$(use gdb	&& echo "--enable-debug-gdb")
-		$(use nist	&& echo "--enable-lockclock")
-		$(use samba	&& echo "--enable-mssntp")
-		$(use seccomp	&& echo "--enable-seccomp")
-		$(use smear	&& echo "--enable-leap-smear")
-		$(use tests	&& echo "--alltests")
-		$(use debug	&& echo "--enable-debug")
-	)
-
-	python_configure() {
-		waf-utils_src_configure "${myconf[@]}"
-	}
-	python_foreach_impl run_in_build_dir python_configure
-}
-
-src_compile() {
-	unset MAKEOPTS
-	python_compile() {
-		waf-utils_src_compile
-	}
-	python_foreach_impl run_in_build_dir python_compile
-}
-
-src_install() {
-	python_install() {
-		waf-utils_src_install
-	}
-	python_foreach_impl run_in_build_dir python_install
-
-	# Install heat generating scripts
-	use heat && dosbin "${S}"/contrib/ntpheat{,usb}
-
-	# Install the openrc files
-	newinitd "${FILESDIR}"/ntpd.rc-r2 ntp
-	newconfd "${FILESDIR}"/ntpd.confd ntp
-
-	# Install the systemd unit file
-	systemd_newunit "${FILESDIR}"/ntpd.service ntpd.service
-
-	# Prepare a directory for the ntp.drift file
-	mkdir -pv "${ED}"/var/lib/ntp
-	chown ntp:ntp "${ED}"/var/lib/ntp
-	chmod 770 "${ED}"/var/lib/ntp
-	keepdir /var/lib/ntp
-
-	# Install a log rotate script
-	mkdir -pv "${ED}"/etc/logrotate.d
-	cp -v "${S}"/etc/logrotate-config.ntpd "${ED}"/etc/logrotate.d/ntpd
-
-	# Install the configuration file and sample configuration
-	cp -v "${FILESDIR}"/ntp.conf "${ED}"/etc/ntp.conf
-	cp -Rv "${S}"/etc/ntp.d/ "${ED}"/etc/
-
-	# move doc files to /usr/share/doc/"${P}"
-	use doc && mv -v "${ED}"/usr/share/doc/"${PN}" "${ED}"/usr/share/doc/"${P}"/html
-}
-
-pkg_postinst() {
-	einfo "If you want to serve time on your local network, then"
-	einfo "you should disable all the ref_clocks unless you have"
-	einfo "one and can get stable time from it.  Feel free to try"
-	einfo "it but PPS probably won't work unless you have a UART"
-	einfo "GPS that actually provides PPS messages."
-}
diff --git a/net-misc/ntpsec/ntpsec-1.1.6.ebuild b/net-misc/ntpsec/ntpsec-1.1.6.ebuild
index b227382f452e..d8f848a621db 100644
--- a/net-misc/ntpsec/ntpsec-1.1.6.ebuild
+++ b/net-misc/ntpsec/ntpsec-1.1.6.ebuild
@@ -32,16 +32,15 @@ IUSE_NTPSEC_REFCLOCK=${NTPSEC_REFCLOCK[@]/#/rclock_}
 
 LICENSE="HPND MIT BSD-2 BSD CC-BY-SA-4.0"
 SLOT="0"
-IUSE="${IUSE_NTPSEC_REFCLOCK} debug doc early gdb heat libressl nist ntpviz samba seccomp smear tests" #ionice
+IUSE="${IUSE_NTPSEC_REFCLOCK} debug doc early gdb heat nist ntpviz samba seccomp smear tests" #ionice
 REQUIRED_USE="${PYTHON_REQUIRED_USE} nist? ( rclock_local )"
 
 # net-misc/pps-tools oncore,pps
 CDEPEND="${PYTHON_DEPS}
 	${BDEPEND}
 	sys-libs/libcap
+	dev-libs/openssl:0=
 	dev-python/psutil[${PYTHON_USEDEP}]
-	libressl? ( dev-libs/libressl:0= )
-	!libressl? ( dev-libs/openssl:0= )
 	seccomp? ( sys-libs/libseccomp )
 "
 RDEPEND="${CDEPEND}
diff --git a/net-misc/ntpsec/ntpsec-9999.ebuild b/net-misc/ntpsec/ntpsec-9999.ebuild
index b227382f452e..d8f848a621db 100644
--- a/net-misc/ntpsec/ntpsec-9999.ebuild
+++ b/net-misc/ntpsec/ntpsec-9999.ebuild
@@ -32,16 +32,15 @@ IUSE_NTPSEC_REFCLOCK=${NTPSEC_REFCLOCK[@]/#/rclock_}
 
 LICENSE="HPND MIT BSD-2 BSD CC-BY-SA-4.0"
 SLOT="0"
-IUSE="${IUSE_NTPSEC_REFCLOCK} debug doc early gdb heat libressl nist ntpviz samba seccomp smear tests" #ionice
+IUSE="${IUSE_NTPSEC_REFCLOCK} debug doc early gdb heat nist ntpviz samba seccomp smear tests" #ionice
 REQUIRED_USE="${PYTHON_REQUIRED_USE} nist? ( rclock_local )"
 
 # net-misc/pps-tools oncore,pps
 CDEPEND="${PYTHON_DEPS}
 	${BDEPEND}
 	sys-libs/libcap
+	dev-libs/openssl:0=
 	dev-python/psutil[${PYTHON_USEDEP}]
-	libressl? ( dev-libs/libressl:0= )
-	!libressl? ( dev-libs/openssl:0= )
 	seccomp? ( sys-libs/libseccomp )
 "
 RDEPEND="${CDEPEND}
diff --git a/net-misc/omniORB/Manifest b/net-misc/omniORB/Manifest
index 9aa9a6b58276..9a00e1ec9706 100644
--- a/net-misc/omniORB/Manifest
+++ b/net-misc/omniORB/Manifest
@@ -9,4 +9,4 @@ DIST omniORB-4.2.2.tar.bz2 2673800 BLAKE2B 6afe4759cf19b69bd02d4864e305a0ebd0d11
 EBUILD omniORB-4.1.4-r2.ebuild 2184 BLAKE2B b35249c5020bb321c91e7327edba33f7325a93352eba985cb695c0d62cf5fd13ed62529900197c43c5eb7aaa7c5ec8a901e67766c2ddae65eb687334ece63c8a SHA512 a4d08d26cdf8b7fbee13bed2a92eee52190ccdba863a46f8b87cd210fb212ef2eb85a0a84ec1e6895f360d3b1ae76d91c2f15a322bf85e0e35759d4c659185af
 EBUILD omniORB-4.2.1_p2.ebuild 2868 BLAKE2B 9e04f87b95f12c8c07910bc56a25a69d7896b655283d9e0197b43672ea8138b7cd4bd81997c8aa3e5a8ce2294f3cd70b26b5cbe80abc76eef3c1a3655e7f2214 SHA512 cd5b8534d4a9c6a745e2c6d3d51c69b7c9521ff8d46a93461f09cc5b113645357496ab42f597bc3de45c642c523bb512a70150a336c33c499127864c4f4bda60
 EBUILD omniORB-4.2.2.ebuild 2715 BLAKE2B 82966544593b19da2b9db6c8eb723f51d423cc26e2f4b6cae90779c9b8f45078660dd14848993cd78ee4bc8f7b303d868160e5485edca03e96861be39ec91b88 SHA512 6a35c3279d3ce09f462f166cc3c761fc36dae0fa6c30b632af4beebf944a3f4e47699b082696a2dc044982504f94000f3d28a62aaa80af4750a99e3a771a5002
-MISC metadata.xml 220 BLAKE2B 56890af80b2c3a19dbe8168671207bcd3c19714c1dc227b71207f01a67ed1691524adc94e609937da117b560faadc574ba210139fd13455b3bef2ed30cde0c2d SHA512 a8201f66fb2504f83b9b89adf3e3b23b1b78410cbcfa740e49ea0c984e164aa430eadfe01fe05b1ad4d9c6cd1206e8ef614fc31a1aad86f3e4af183781cea563
+MISC metadata.xml 247 BLAKE2B c2c840442760456aa29eeda2b225baa3eca5af75444074a09d500b1063f59ce978b5053c0d79fb7cd3717a477ef8e8e343dcf731a5a99e27058b0528c5066a4f SHA512 d76af24fd2513c0ed4a1f3066c9e9b9eb6407d1c013f22b3bcc9646fb771560c45c42c3851075ce9aa32bfe6ef68534cf1ccd3fefc9657fdb0b2794424ab8d1f
diff --git a/net-misc/omniORB/metadata.xml b/net-misc/omniORB/metadata.xml
index 000f9330f8c4..6b2cd5252fce 100644
--- a/net-misc/omniORB/metadata.xml
+++ b/net-misc/omniORB/metadata.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+  <!--maintainer-needed-->
   <upstream>
     <remote-id type="sourceforge">omniorb</remote-id>
   </upstream>
diff --git a/net-misc/seafile-client/Manifest b/net-misc/seafile-client/Manifest
index dce6e7b82045..2989f1b23261 100644
--- a/net-misc/seafile-client/Manifest
+++ b/net-misc/seafile-client/Manifest
@@ -1,6 +1,8 @@
 AUX seafile-client-select-qt5.patch 807 BLAKE2B bc28c24a114899fa4d864a3ea10d1d2ab08410d0360e8499d40aee2a26358b5bc401edd8e57121306a5e840b674c50930840c3b8723eae1930421eaf3dbfe919 SHA512 565cd7a3b4f187ef52b9a95b0d657a35cc9722c78e92dfc413b64f781c3cae129aba23ab302f80c7526ccab234b0354709e95d1e79d356a502cce47370524f41
 DIST seafile-client-6.1.7.tar.gz 2260217 BLAKE2B 96d032d5d9332cd40fabc135a132ad96e74520e677ab3071c3bb5765d17fb2ec0f7e243a8110e482137ce599672b5513b3e83d1d2ebb0cf4be66149a2891e068 SHA512 545f47a93c16fff9c000add19f55784c08878cf3b1448a8307fc0d25f7f5c35d671dd20940842c4f9e97df3ae3754fbbf170d0669097d67484226aad60ba09da
+DIST seafile-client-6.2.11.tar.gz 2346059 BLAKE2B 107ed7af53a8e0244a9d9805d3c84f66e273f00d306663cfaa07983f94ed98f0dc23cce7d1ff7592bdb64915d1e7dd32cb5a2e9bb10f4b36b87bd28f8f3a9082 SHA512 4ba39c33c41cb95e2ff5bb9704cdac1f95561bb4ff0b59d0993364070c5ee10284c51d640591195b7361b595221fd899a4aeafcac1c917625b175e98b9a894a2
 DIST seafile-client-6.2.4.tar.gz 2345481 BLAKE2B 7efc25830c6d4b2203390ae453d2e9162b62e477cc12f58a03c9fed0730630c8c077f37aff2b467dd960671a3ab9f41b18be32283bcc3e6b597b9a4f1cb99688 SHA512 754d317e812d340c1a3d4eddeede6d8fe535b02c2f0aca4bda07c020389dad3bd7bc937b1c13ea7ac8ee3e833c8e2fe8f7b74f1051395b5a35deda46d727beeb
 EBUILD seafile-client-6.1.7.ebuild 1333 BLAKE2B e43343c956390b439e47bf7738b2fb9999b451e6e51c3db0bed3cf05e9d1c9628bf2c6a307663fe182b4db60151da302c250537f1dd0cd145bc6384f8eea878b SHA512 99e4fa02aa9270e7467a7c719f527a8bd892d56fa99fe011fe198fe9d61c652ad62ff4ab3723ab1484821a997d282dcaa9acbbb30bcac5936961e93ac8d6e121
+EBUILD seafile-client-6.2.11.ebuild 1079 BLAKE2B 1c0063f8e7a59724543578fd7b86afba18d613d310713446790c4fd01e5f0a0d0a15f0329dfa60e55c80b0cec8f190ff137ebf3bb533fee5a003e60385521e93 SHA512 7fd40b48cbf3fc6533c56450f8fea78aa3685ebe9c04e40172ae18a5ac8f2a25d6e05567d6b35385485e64a3dd51336b2fc69f6baa9381d302d0a9f1410f60e5
 EBUILD seafile-client-6.2.4.ebuild 1310 BLAKE2B 04ca777eb8579e5f9a03cfada1364606cacf6cb0b27268bfdcc9fb11074e66faadcfb64f2d835eceaa4b2cf1b6b3cd63b89e6637e44776025c211d1f2be3f83c SHA512 d1054c6d049d25bcaf5d172d7707b5b06cdc670aed8c0cac5f0f083cbb1bda7ceab7c5ba22c30b55ce8b62ae9a27c9be51bdd847412250080270be732450d305
 MISC metadata.xml 345 BLAKE2B 5bb1b4c7f29473d3796c8c466c2ed836b01251edcbabe2b1800e19be723e206810ea9fd9f1ae9426d7bade242c31c677c9ccffb9c0fa2874c0f852c194980710 SHA512 6365751dd09e9f9caf9441e3c9235e39a47c80daa36697aa8c96ab9015029565ac0ae308916625549115a9a8ed0e5544e584e46928ae44a55aa9d88e5d00c1cb
diff --git a/net-misc/seafile-client/seafile-client-6.2.11.ebuild b/net-misc/seafile-client/seafile-client-6.2.11.ebuild
new file mode 100644
index 000000000000..422282c9fbb9
--- /dev/null
+++ b/net-misc/seafile-client/seafile-client-6.2.11.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit cmake-utils xdg-utils
+
+DESCRIPTION="Seafile desktop client"
+HOMEPAGE="https://github.com/haiwen/seafile-client/ http://www.seafile.com/"
+SRC_URI="https://github.com/haiwen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="shibboleth test"
+
+RDEPEND="net-libs/libsearpc
+	~net-misc/seafile-${PV}
+	dev-libs/libevent
+	dev-libs/jansson
+	dev-libs/openssl:0
+	dev-db/sqlite:3
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtdbus:5
+	shibboleth? ( dev-qt/qtwebengine:5[widgets] )"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+	test? ( dev-qt/qttest:5 )"
+
+src_prepare() {
+	eapply "${FILESDIR}/${PN}-select-qt5.patch"
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHIBBOLETH_SUPPORT="$(usex shibboleth)"
+		-DBUILD_TESTING="$(usex test)"
+	)
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/net-misc/seafile/Manifest b/net-misc/seafile/Manifest
index e0a18816990b..ff463161f5d5 100644
--- a/net-misc/seafile/Manifest
+++ b/net-misc/seafile/Manifest
@@ -1,5 +1,7 @@
 DIST seafile-6.1.7.tar.gz 825734 BLAKE2B 204ede4870f15cbfa9da7e51f565078290b4d03d36a0f8f7a35d54ca1f26c414c350ac05628054d290723b067dfda45aeec1777a2d32e1b376654323106083a4 SHA512 5ae27b2f8e84d57ecd9d81a42fab9611d56a260adb027fba427a700d0d17cd215b3c5b5b37df7e14181bb9ae7df611df9895181de135425ec42da44511d2545e
+DIST seafile-6.2.11.tar.gz 703739 BLAKE2B a072b103875e3a90a9c457079d3101262abc826659c604130f7c3e9d1b129e7d806b687a5673109b37cf040bba02a0a862374997a819cf384ecf2bd3bb6af058 SHA512 90ff1ca4c2a75da9a44d7833209800629c7bec3e8d5b651a820d158261bee77a3b7e599748e6ed350fe919fb67685882a215c18720b0a9702d56e384b8561985
 DIST seafile-6.2.4.tar.gz 705760 BLAKE2B 2fc0d0c370f3a3de11cbee017be3599aa2b099c08de75b23a86a0b586ab83d928d4305f2e2c0571b3b6b1f7de1eaf23a1868febcc3db9e65f08072826a5dd480 SHA512 f9d95990e913ff63835c83d429df6be66f78c993df0c38bb029090a20dfbb4d789e18e679450634f0c6d918c7ff824347301412805b86f797b81719aafa43f9a
 EBUILD seafile-6.1.7.ebuild 1091 BLAKE2B dab7de91b98b99108a2aed235ccfdb5b72e3a3aa5fb56f0ae8cdd5611b6c0b72656a80bf02de318f5ee5656591e73c734417dc4df70db37cc63a710e459f15d6 SHA512 bc9b4513c3c7217c26a0a71dbd140197fd4c762e3718796e1a9a3f871d7a2e838e59525cfff0ea52e0687c8b7ff30b924a6e082eac2dd1617b4b6638259ba290
+EBUILD seafile-6.2.11.ebuild 1048 BLAKE2B 8427d6e2fbaf0c0cd07539c75b2710773f802bbf64b47cc19c5278faa767f8ec8ebd6b48d81410f1ec9960bac6baaf1eaa6d432f36629572db510cb055d2f2b2 SHA512 8bb17b48494317a758d414c56db5751a229859072aa6634cc826208eae48c4cd21c1659b86064100032f1d685140fc3c55e2df623ac5aa5f3bb29344075e29ea
 EBUILD seafile-6.2.4.ebuild 1092 BLAKE2B d6d273f7665619cca3214411dba88c36fbe6e601b81dff00decaeef82e35f598956e52b816712ccfd46d4dccc9c5cdf34676115e1d8958a687906409c4915b2b SHA512 0c1f06cb14353dfb65d21387d6803834d47807ca6b305fc4a754caab706084d91404c41d0510175f04024d9f6048b121ca782d32e4ac239eeaefaab7bd6d2ac9
 MISC metadata.xml 246 BLAKE2B 982e99661e8894a8808c39c6ee396fbe1fcf4430ad6a4c820b357c5e96f45e008d92d3319734f94c7403b926bc7befaf231037e832bc3521952ecf9bc42f51bf SHA512 71bf99d5820faaf9004a517dffec80e1a2240e31b0db7449f672b68926c0e229cd710670468e95cf305d6136edc5e2d825e597d4648a90f68929bf8d82a1d61a
diff --git a/net-misc/seafile/seafile-6.2.11.ebuild b/net-misc/seafile/seafile-6.2.11.ebuild
new file mode 100644
index 000000000000..a667cc035f78
--- /dev/null
+++ b/net-misc/seafile/seafile-6.2.11.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 )
+inherit autotools python-single-r1 vala
+
+DESCRIPTION="File syncing and sharing software with file encryption and group sharing"
+HOMEPAGE="https://github.com/haiwen/seafile/ http://www.seafile.com/"
+SRC_URI="https://github.com/haiwen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+-with-openssl-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	net-libs/libsearpc[${PYTHON_USEDEP}]
+	dev-libs/glib:2
+	dev-libs/libevent:0
+	dev-libs/jansson
+	sys-libs/zlib:0
+	net-misc/curl
+	dev-libs/openssl:0
+	dev-db/sqlite:3"
+DEPEND="${RDEPEND}
+	$(vala_depend)"
+
+src_prepare() {
+	default
+	sed -i -e 's/valac /${VALAC} /' lib/Makefile.am || die
+	eautoreconf
+	vala_src_prepare
+}
+
+src_install() {
+	default
+	# Remove unnecessary .la files, as recommended by ltprune.eclass
+	find "${ED}" -name '*.la' -delete || die
+	python_fix_shebang "${ED}"/usr/bin
+}
diff --git a/net-misc/switzerland/Manifest b/net-misc/switzerland/Manifest
index f4426aa9b67a..cfa9c9dcc54b 100644
--- a/net-misc/switzerland/Manifest
+++ b/net-misc/switzerland/Manifest
@@ -1,4 +1,4 @@
 AUX Makefile 178 BLAKE2B b046bcd4f4f10037ac183219f6d01ba15d02bb58abcc65d621f72a7623b22ee5452a3c0e9f9f923e4549a61be690703d7f82da822361758a219fe99f83ac767b SHA512 5fd441aa419dedef9eab6848a1a5c6bc9b4748a9e8a19680cb110833a9cae58db1f810d37e2e6c383edee3c1d439e7f3f208a8bfa3bd6d3b2fcc8c26d2aaff0a
 DIST switzerland-0.1.0.tgz 592922 BLAKE2B dc0a7557d48bb8004c07468b47d026048662a3b2c743eddc29e37ffe3c839e28d5b12957a6a50d0355be7e5f946556d9827652bf7899cfd40cda0c57db115cc1 SHA512 3a5474c005bf45cddf8eede7c1e2faa5855bf9017f5c732555cfe2c8b7b82381ea25c2ada000a9945a330ff3af19f1e861a11508ff057c81a78eab53de1d0cdb
-EBUILD switzerland-0.1.0.ebuild 805 BLAKE2B 75a221ee4e2a5e42a1707659c7f659723c3c15aa9c693b955b1788a230f4918d9f94e0fba25b5b4661604b804122c460f5cf011fe39a9d292a8b247d2f334445 SHA512 8d15e4d57de128ad4005a3af97abeacf8124d72d1fc0f9bb8cb63dab64fb564732df03a97af3a96532fc916784e054ecbc48006b008a2da99fd3ec24cc470bc5
+EBUILD switzerland-0.1.0.ebuild 802 BLAKE2B 85950f944167e1772977c2e5a3e532902a84263a0a306c57dd7f03df6a3cdfa1866170036ca8b021795dadfe3f1c955185de1faf08e1cbdff4e002d7c7d26aef SHA512 5d491f2712dea44c172a50694aecd8af720725092e7cb995976e2042a02a7598b4eb7659907c044438612bf62912d9495ea535638a0aeab332301aa585daf993
 MISC metadata.xml 673 BLAKE2B 7cea5ade1f69640d3c056cd312009c7b116788fc3945abc93f3f736c53e7d3929b8fba994bf73e1401e0ad6851990e0ea4835ec9eb0a9097349f82fa2c593aaf SHA512 295754b6dec585585511b93a004f0e9857466a94b7c34c903ee55aa2a8557648dd2fd93e6bbfc790459d0c19d592fbeb49f8b749528a488014c89a3ad96313e4
diff --git a/net-misc/switzerland/switzerland-0.1.0.ebuild b/net-misc/switzerland/switzerland-0.1.0.ebuild
index 2ff94e8d6285..10925c2dacf4 100644
--- a/net-misc/switzerland/switzerland-0.1.0.ebuild
+++ b/net-misc/switzerland/switzerland-0.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/switzerland/${P}.tgz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 
 DEPEND="net-libs/libpcap"
 RDEPEND=${DEPEND}
diff --git a/net-misc/vrrpd/Manifest b/net-misc/vrrpd/Manifest
index bf97a989226f..81423774307b 100644
--- a/net-misc/vrrpd/Manifest
+++ b/net-misc/vrrpd/Manifest
@@ -1,6 +1,6 @@
 AUX vrrpd-1.9-rollup.patch 820 BLAKE2B 4862766d23aa2811023c5f7a37fd3ed08f74701a6b434ae1d6ae84dd1aa72f31d599db6779edd6216fa0e1b499c701f0f442dce7ae150173b74b370e8a03a880 SHA512 20dd64876125707cb0cca6c45363a4db05a9472a0bec7bded2665229ee9db44a8429703294cf39b53a703fa9c66b6644e89edf98d1e87c090d763da2a3b07b7a
 DIST vrrpd-1.0.tar.gz 68819 BLAKE2B 96d5d7b4e5aaf6670c48c472a6e886c7a78502b3c3f3c83192e865f3a6784790484ac30358a1f593dd3dfa46bdfa73288e17fda2ae21b0d04dc67d2e59fd2021 SHA512 bf855d4d196fe7ee2d6fb8db02d86941ce6e0ddac59896c649df99eb20002d23a42a60dc11ddb1a35da6bb6b20099df81e2e6114915e71d06cbc82d93a0ff82f
 DIST vrrpd-1.9.tar.gz 542249 BLAKE2B a412559be70791515c6b82639a8e1d5fc33954963fbf00aa3c549434ac0748b9d0ea657b2d02b1a3537a30742c18fe6d6db832a11c23b6989151c5f04c771d05 SHA512 8c719cabbd6a799e4e439dbb698af9d6e24cf2635cfbd71a204b46bd2b65c1384e53f130b663d0fcfc903d89080ff25d9c97ae4cd9f6b2434d5462cf678a306b
-EBUILD vrrpd-1.0.ebuild 642 BLAKE2B 9cb3de0b437450723e334e2de92348af83f264891df0ef6f36f87521231dc7de286142bde84d717d221516dc4dff1da72d6afbb4de39ef869a5140d82cc2de09 SHA512 9b9a974fe653ba8ed7ae23ce405ba4c88a9f2964386d1577c1bacd68d49fece26d5380c39e9a828b3ceff5432a6d38fde9fa1a67cfd00e4e113a5bd75901d227
-EBUILD vrrpd-1.9.ebuild 862 BLAKE2B c23399c77db9ac9374efc1fe4f7763351c077f6519357b8a5047f6bbc6d3d0cbadc2b8fb3ce89adca3838bb5f74f401bc0691217e85fd9130237968a357e8857 SHA512 433bdb266ed1788f28cc38555a00208fe896a1ed301f8eac82d2a07d5006fec4b01767e2c5bde2f3587f147c72b5a5511349e599342296978c9a61d86e35334c
+EBUILD vrrpd-1.0.ebuild 639 BLAKE2B d8c34021aaa36dacf7913e8db50b3efcf902082b67f036d2a9e7f9de7d7f6b51ecf88b729324dbbf563145e89747aed0f740d9a3ce1ff2973389cf14f55edde0 SHA512 0e5cfaefda17231bc9f6a26698ec713a0b61fb20445c877323b3a89f69e265afe2a9009fd5244b5e0b2a6bf2623ee204c6e257f61e0e85eb1741d1f10c96c5b3
+EBUILD vrrpd-1.9.ebuild 859 BLAKE2B 65feca5595a6067691f4a51521713a0a715aa75eeb6ce8fa14589c1a46d050ac807875a55de17de707188d5d8a7ef0c54e8576522a026445d38d3a6b7627efd7 SHA512 1799b975303ca607e1c4bf9de722ac9e29c4f8cd3c9f08c4dffa6f5ed53416f006adf1e8ceac76f85b316fa7c508bd46d9fb6d640f649a090c2ed0ad2f1739a7
 MISC metadata.xml 392 BLAKE2B 476ecd46527b390c48296ad27b9771efaacd8f508bcfe5397a7731b968df34bc260846d18c21bdf9cdd96687be0dc9ab9d946bb9a81cd9b0838b7e919732ea8b SHA512 1e3efb18e8680a55af393d09389ce819d187cf18e8c196be5acf9bd831afb1440d23d490c3b1137a4f7faadd734a8858c671a59ed0451430e0dcd928ee75b338
diff --git a/net-misc/vrrpd/vrrpd-1.0.ebuild b/net-misc/vrrpd/vrrpd-1.0.ebuild
index fe78feecdfe2..34654623edac 100644
--- a/net-misc/vrrpd/vrrpd-1.0.ebuild
+++ b/net-misc/vrrpd/vrrpd-1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}/1.0/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="sys-devel/gcc"
 RDEPEND=""
diff --git a/net-misc/vrrpd/vrrpd-1.9.ebuild b/net-misc/vrrpd/vrrpd-1.9.ebuild
index 79f102e990c4..c08aef2822a9 100644
--- a/net-misc/vrrpd/vrrpd-1.9.ebuild
+++ b/net-misc/vrrpd/vrrpd-1.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/fredbcode/Vrrpd/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="sys-devel/gcc"
 RDEPEND=""
diff --git a/net-misc/wput/Manifest b/net-misc/wput/Manifest
index 3b81cdf8262f..0ef3c1dc28dc 100644
--- a/net-misc/wput/Manifest
+++ b/net-misc/wput/Manifest
@@ -2,4 +2,4 @@ AUX wput-0.6-gentoo.diff 641 BLAKE2B 2876ac3eb4f42590d01cde847cd5866ddfc7cd7e463
 AUX wput-0.6-respectldflags.patch 391 BLAKE2B fd2c41ce1fcc4866b5951bba49f4cd4d7ff5f4a9891016460e99d14ff78d3275273d234fd86df1b1cb3ecc5d5a4c7527f5b80cb2a00106a69f5d82badfc46497 SHA512 3ae0d882e94b23a84b40b3c79a793dd21c7a070019fe3003f6aa213e269eef455826830e316483328507c359b0c27e5723f919d383af0a73eb0d8559954db146
 DIST wput-0.6.1.tgz 312342 BLAKE2B 67053f71307e9fbb3f085e9347c7843f4bcaf951858164fa228f9cfd80898192efc344f1f9cbf65a3db286fae5b514da64ed3599627f264586c9242ac753f62b SHA512 f5eb5e343c77cec0f3370e8d73679e3c720a848a963c2cdc64e6c52f30b47d76e0de9ccde965da9af97d2e5f23f45dd894f26371f56ead498d28fadffe65fc4b
 EBUILD wput-0.6.1-r1.ebuild 771 BLAKE2B 11233a6e15d359f028f1abe461ad17b63236daf5eede7311e0fe86989941153033334575be4c41a8470f931161e1de535be12446ebccaf47037a6684e11e9ea8 SHA512 284e8945df93ba93a2322f1f62254b4fa671a1bd6045cecbe52bfcb54918b12f27cde9d710f896ea39839cafa1dfe617597fe6674717d8c297cf512dc43e9702
-MISC metadata.xml 213 BLAKE2B fc154a4a8f3de9a525bbf6fb99faa45fbc8a7acc300b3ebc91e2c7b69a2094f47fa312e0141e060b3e4f83e9f7fbc3b61f3d2c8946b3c6663120f1a791834f86 SHA512 6aa0dd15c8b17b8007764f93049ca69537377c25282ff538d14b792fda16dd1eb4d847b2354d140e1ff68c2df28b4280d6e93b2ca0c90f862c4a6748d916ae4c
+MISC metadata.xml 239 BLAKE2B a1e387e39d693cc8b109174934b235238904f96fb78916bc73bd86e4b442443cc3b225409745025fb826de6086eb6356429527338c3aa1b42e92f1d886d7a094 SHA512 8326a50cb35d854df982951d3632c3b36672f9ba75f9644da70a4814a27ffda0c7c435e733c5be15210e2d2eb39ca781500ce55c1d409a1e81844fcecd859a10
diff --git a/net-misc/wput/metadata.xml b/net-misc/wput/metadata.xml
index 2d3a29a13dc8..5f952b22ea88 100644
--- a/net-misc/wput/metadata.xml
+++ b/net-misc/wput/metadata.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<!--maintainer-needed-->
 	<upstream>
 		<remote-id type="sourceforge">wput</remote-id>
 	</upstream>
author	V3n3RiX <venerix@redcorelinux.org>	2019-07-19 22:05:27 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-07-19 22:05:27 +0100
commit	121ed4eec41fbf03e1998d09eede1bf449da63b9 (patch)
tree	ce9341d77d1507f67d4a3a1472da9011b5baa0a8 /net-misc
parent	dd762ff83c330186ee2ede002e08b2f780cddd51 (diff)