gentoo resync : 03.11.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-11-03 16:06:58 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-11-03 16:06:58 +0000
commit: bd4aeefe33e63f613512604e47bfca7b2187697d (patch)
tree: adb35b5a9a00ee7ea591ab0c987f70167c23b597 /net-misc
parent: 48ece6662cbd443015f5a57ae6d8cbdbd69ef37c (diff)
123 files changed, 1062 insertions, 2504 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index a9dcfef36e49..356b42ec759d 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/chrony/Manifest b/net-misc/chrony/Manifest
index 724ecaa3f52c..dc3b58e471fb 100644
--- a/net-misc/chrony/Manifest
+++ b/net-misc/chrony/Manifest
@@ -14,6 +14,6 @@ DIST chrony-3.5.tar.gz 458226 BLAKE2B 611f21e36c6e745208e00eba988519fcd912c6c0c3
 EBUILD chrony-3.1.ebuild 2825 BLAKE2B c3af56079c3130002499dda974bb5117a2cce988f8a1aaca7cb6f9f11a0aa011fefe3f600262939b72b4f41d7e096a94dd1305572a04aabe96519cff36ec0165 SHA512 f97265a0a7006c1f8fc07f4a25f27ff0f78b123fdeabe2329a0e48ba33409e16a8373d6c114c2d25f463f560b47e8ef5510c140e5e045a02ccfd4eb669f463b3
 EBUILD chrony-3.3.ebuild 2909 BLAKE2B 2d314e96402839948b95e9f8650e8523676f201deab27230ac9d006a0a73c878239c23c7118d0698bec9d7c2796b3a08be9cfa695c21b84ee333c23161d963ad SHA512 0ef1db3668f626dc07057728f7d33d9a200f1e4fcb93e6fb3b69e874b8d5d0e3bbb2d57c21513d7825151b08b0a86a36ef1838c44f27e536aa7abd5b9e973cdf
 EBUILD chrony-3.4.ebuild 2912 BLAKE2B 0b8948414c95862295efec709f2f4467974c2955fc03153d5d2bfa15a74fcee2714f012425b4b1002b90cafe9008fa7ce02f0f40582b7b4b0917d82363cc9c77 SHA512 13c6caf8f3d813e1caa515d1ab00f1e5c1539198ee51913f649ee2ef2562bffee15b0f78c78ff5419728740a867d02a90eb889f2711a32db85f7756c3bdda3b3
-EBUILD chrony-3.5-r2.ebuild 3042 BLAKE2B e5cb16eb143b4ea9db59ae163b77d4ee20e31dfdcffae283f9effa5945b81fb5f49002e384fca0a6d7fdaf15d5211d7794f25d270c6e7077e72e000ffcbdae43 SHA512 72865b3925c98ef17af7a761bfa0528ede5ba716f177b609ac4b7f2c04093df3d3d43c1fbd8059bb12b3397f5340504e51fbfff901383aef679adf75c70b1741
+EBUILD chrony-3.5-r2.ebuild 3039 BLAKE2B 586dfa644540bb271c5eef6a9cc074def39b9b03a89a5909c2eaddc249f9daa435d2ab4304b2f833ffce38506d13c3e3a45dfb738ec7b6f1692d79efdbfa57c9 SHA512 4a3fc6278fec578cd75c1ebdeb56cd7d2e3fb0bbb3b8aa79e0dbdffaa172a89c8e2caf98fda387b7432cb4fc6c38bc790b9695c6f16232a8549e51428c6dafb1
 EBUILD chrony-9999.ebuild 2934 BLAKE2B 325fccb1baf09e65dee2fd3d4a7f1fa1e665ae95daf36a8b9a00ffa9770f69bf29940584595c9cb13bd32ef8695169dc3d19c6d2f34812da00540efc67b6a57a SHA512 2414c0b1f95ae47de1ec308dabacc4a791982af9dad4fa8a45297c336695298df826bca0a5a565adc6667a69166a41910aa093bd4c120827aba4a1d533fe0a9c
 MISC metadata.xml 1566 BLAKE2B 88bf43a72fed47580395641d87651a7828fa3fb443a36568bc8ee44f2d09117aa296f8b214f1560279cce2e9bad189a3d941708fe37c1760b053f3669f25ed8e SHA512 acdca169396f72dbbfd3c2ca781024818133ec4af07661a0c8b5a619ca6a43713910aadc28e6d8e5b3d0d8da960ac1bfba05ec5cb5c49d80b17fdf9c1c5d1b1d
diff --git a/net-misc/chrony/chrony-3.5-r2.ebuild b/net-misc/chrony/chrony-3.5-r2.ebuild
index c1d5a7b717e3..094dcb376834 100644
--- a/net-misc/chrony/chrony-3.5-r2.ebuild
+++ b/net-misc/chrony/chrony-3.5-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm hppa ~ppc ~ppc64 ~sparc x86"
 IUSE="
 	+adns caps +cmdmon html ipv6 libedit +ntp +phc pps readline +refclock +rtc
 	seccomp selinux
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 355004e9eb19..872b737f8ee8 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 6953 BLAKE2B 3f0dcce2560ef08897189f44afd843e0322176d6e1368a9bf02211670d4b5fed096d23b1eeb02f89eb44d12f10f1e78839f8dac2a5ad66b225bba5d967942a39 SHA512 b554bca7de8c0cc32e2075d35103da865929fc29c447d9fd0314a161b3b300f3e89d0df2ff8dca15e2d2aa6484ec97ca4ba078cb14abfca57a7b43e8d93d90f5
 EBUILD curl-7.65.3.ebuild 7138 BLAKE2B 06732af10263c41e523f0b36637597fb81d51cd26eedbd198cc2cc59758da3c36e74fc2810296400df2576576b94255637e35c018751c91be9d8333a441b90ca SHA512 f13cbc01affb023970ec54686d09d56bf59660c634399383c709405074e9e77ffa476a418ca9b89aacadb1541b4f2e01c2180e871f1bf5885020b9f0e9ab6494
-EBUILD curl-7.66.0.ebuild 7223 BLAKE2B 6dd95d4ac83ecfca3684c2eaa15f3fe65f072a003eefdf00b72fe7434d6c3986bb964477945271a929f32d380ea5ebea816feac83cf4d5b662b0d43c18e892bd SHA512 58a2c03b1a2d19a1b839a6800c22f78ecf4ca48fcdd5c3fd374ba2bb8829d42db73ef822a3159ad27e00bff0006356677fe24eda09371153bd8aebf31d31a50b
-MISC metadata.xml 1016 BLAKE2B 3b6cced0cc67b21cd3b8939d2c75106cf72eb92f186e2cd12a3c55b3d58a9d1e216f21b090db920c7b0cf18c4744358f5642602d2cd1472bd36ad554b87e7d33 SHA512 dbf81245497503293ad73160f337cffac29f7e7771e2a026d840bbed04c994164e62f72523f677a4e2ae3b656c27f90d5aba518e46f05df819f8696bb66fdb1b
+EBUILD curl-7.66.0.ebuild 7570 BLAKE2B de2b7007a5b1a2510bc800eb137df7a002c8547277c7dd8a62ac7e424adb1201bd9d30eb5503b5a8dc38d4c7937e615cee5d6167556a5377185e1f52c8633794 SHA512 57364b4a92e680484f0fb704908520bdda772efe9cb7a39b6c2e0d3430624656ebc4464f64f08e5700d6424b52e18283dc7f28071b4e13ce7c8dc10d25f7d11e
+MISC metadata.xml 1219 BLAKE2B 981090b46e9e66661074be920692e688ebd351ad1770b3a1b76ac6f3b6cc66c70c370031affdf5f72b2141e04ab7e4e073b4bc1fcd0295624e14a929cc3714d1 SHA512 9f86ffa85c0ac69c7289a97a92d5e592a17e5cc23b62be980540cdc8702cf6151361be4f171446fca317d2dcb1c5879ba8ae1ad0b0d99ffb54366ca35df4052d
diff --git a/net-misc/curl/curl-7.66.0.ebuild b/net-misc/curl/curl-7.66.0.ebuild
index 86708b83a0ca..0c4c734a8049 100644
--- a/net-misc/curl/curl-7.66.0.ebuild
+++ b/net-misc/curl/curl-7.66.0.ebuild
@@ -11,9 +11,10 @@ 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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 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+=" nghttp3 quiche"
 IUSE+=" elibc_Winnt"
 
 #lead to lots of false negatives, bug #285669
@@ -43,6 +44,11 @@ RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
 		)
 	)
 	http2? ( net-libs/nghttp2[${MULTILIB_USEDEP}] )
+	nghttp3? (
+		net-libs/nghttp3[${MULTILIB_USEDEP}]
+		net-libs/ngtcp2[ssl,${MULTILIB_USEDEP}]
+	)
+	quiche? ( net-libs/quiche[${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}] )
@@ -201,9 +207,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 nghttp3) \
+		$(use_with nghttp3 ngtcp2) \
+		$(use_with quiche) \
 		$(use_with rtmp librtmp) \
 		$(use_with brotli) \
 		--without-schannel \
@@ -230,6 +236,14 @@ multilib_src_configure() {
 		libs+=( "-lnghttp2" )
 		priv+=( "libnghttp2" )
 	fi
+	if use quiche; then
+		libs+=( "-lquiche" )
+		priv+=( "libquiche" )
+	fi
+	if use nghttp3; then
+		libs+=( "-lnghttp3" "-lngtcp2" )
+		priv+=( "libnghttp3" "-libtcp2" )
+	fi
 	if use ssl && use curl_ssl_openssl; then
 		libs+=( "-lssl" "-lcrypto" )
 		priv+=( "openssl" )
diff --git a/net-misc/curl/metadata.xml b/net-misc/curl/metadata.xml
index a4deda9a7a5f..b62cf6ee3c7c 100644
--- a/net-misc/curl/metadata.xml
+++ b/net-misc/curl/metadata.xml
@@ -8,8 +8,10 @@
 	<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>
+		<flag name="http2">Enable HTTP/2.0 support</flag>
+		<flag name="nghttp3">Enable HTTP/3.0 support using <pkg>net-libs/nghttp3</pkg> and <pkg>net-libs/ngtcp2</pkg></flag>
+		<flag name="quiche">Enable HTTP/3.0 support using <pkg>net-libs/quiche</pkg></flag>
+		<flag name="ssh">Enable 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>
diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
index acbcbc505904..89a8299d53d5 100644
--- a/net-misc/dhcpcd/Manifest
+++ b/net-misc/dhcpcd/Manifest
@@ -2,9 +2,9 @@ AUX dhcpcd.initd 328 BLAKE2B 72ef6bb16e4f80b440890112cd399eca1057ae42ddc96ee1a29
 AUX dhcpcd.service 227 BLAKE2B e24aa85c15d0211856b02508b681f7e3c1f8b8b1743f31ced9600c2c33da04b61f2166cad7696776ae81ce1be5701cae2691f6dfd86aaf8679f20e459e87c7e5 SHA512 4a030dc291fa7deba9c1f33d61dafdda710247ef7f3743c28e46b767a190e359e468433147bda23c82fae9c93ec31cd68905bfdb51cb8c2d9176ea789b31b14e
 DIST dhcpcd-7.2.3.tar.xz 213552 BLAKE2B 5f89e11424b85702b05da6207ec346480c029de1416cc8892471de428ca0a4395a8915700e2237bfa2b133648973bc2a7c7d15aa2d0ba492f96fbf3908d7f613 SHA512 271cca422fad10eaf842acfd5b590c0ad537f5f23ee919a3928d8ad98463ab03bde21c0bc08741ea9618ee31095160a7c00066155eae2c74b17c49af65ba566f
 DIST dhcpcd-8.0.6.tar.xz 224552 BLAKE2B 5d0fab5977597ce182a2de56c8c4d085d3595a8f1209fc76788b707af0fffd4285a958cebfe7bab6c04ae7a2ba94c466d689dc9c3a71708c1baabd328b2bbf3e SHA512 19a568800a4e510a250de7cc111700b364c68bfe3907f1ac2cda81aacd079cb9ac87731cbabbf8f1e85e055a11c7ba88e419f6c4d7b33f8842dfaeadc7d1e193
-DIST dhcpcd-8.1.0.tar.xz 225716 BLAKE2B 5b9fd2213089b6b522b405fa4ba8d9e530b34aa459508fff7bd818c9568586224e78c69ee45677fae82ab9bb3a0ddc0355c039d9b11864124f562e0282361012 SHA512 1bfb6b5be11c4a9ae4669130f0e549b4f51d96201988e5c0e32bd8e1f85b41488f8eed0c49c578ef99811ec892b740726697a667d4afb8fb11350cb01d0346e5
+DIST dhcpcd-8.1.1.tar.xz 227088 BLAKE2B ab9ab5ec5ed969f79dd2092a1ab2dbc10b0f4c40afe8edaf67381b50fc34a9aee4ff264f4f50d439eed200d0273a1abed52875fe90cffcd0587d993220ef1d28 SHA512 2acca049029fa629ab6ba4f45959a2b67cf20c13e8659e71c1d5688fff5527df7007a4edfd9e88634ded9c76179d91b3e7adb92719f7a049d4f0cdbbd06e9a79
 EBUILD dhcpcd-7.2.3.ebuild 4385 BLAKE2B df0815025660e0500e89ca24703d2d102d160f63fe049b0b8b254623da1a46e77b038db5c25a04ff42f266c6381104cec39d22096ec38bfa95b2a2ce30a49a62 SHA512 3302777fd50a12f7a6d69fd3d66682cee889c4a41e810a42ed9c13172312101bd0d349dcbb024dea0637c2607fb29b9eb64a17747e77e70ffe116a4592487618
 EBUILD dhcpcd-8.0.6.ebuild 4398 BLAKE2B 0ae3be12a91b88313d9a702e709b5133175ab19eac38c7cedaded1ce719da2dce75bb61bcc566d382354bb25a000596b2e2e3d23f49156c524c18aaf80eea3bf SHA512 399729e9555bfd91bbc658789f96242e0fc16acf7b279bea222247a6ca6d15a8ef3afb8d981f71cf74b07b39a72b8ec5ca63bb5922730157af7d3551100e3691
-EBUILD dhcpcd-8.1.0.ebuild 4398 BLAKE2B 0ae3be12a91b88313d9a702e709b5133175ab19eac38c7cedaded1ce719da2dce75bb61bcc566d382354bb25a000596b2e2e3d23f49156c524c18aaf80eea3bf SHA512 399729e9555bfd91bbc658789f96242e0fc16acf7b279bea222247a6ca6d15a8ef3afb8d981f71cf74b07b39a72b8ec5ca63bb5922730157af7d3551100e3691
+EBUILD dhcpcd-8.1.1.ebuild 4398 BLAKE2B 0ae3be12a91b88313d9a702e709b5133175ab19eac38c7cedaded1ce719da2dce75bb61bcc566d382354bb25a000596b2e2e3d23f49156c524c18aaf80eea3bf SHA512 399729e9555bfd91bbc658789f96242e0fc16acf7b279bea222247a6ca6d15a8ef3afb8d981f71cf74b07b39a72b8ec5ca63bb5922730157af7d3551100e3691
 EBUILD dhcpcd-9999.ebuild 4398 BLAKE2B 0ae3be12a91b88313d9a702e709b5133175ab19eac38c7cedaded1ce719da2dce75bb61bcc566d382354bb25a000596b2e2e3d23f49156c524c18aaf80eea3bf SHA512 399729e9555bfd91bbc658789f96242e0fc16acf7b279bea222247a6ca6d15a8ef3afb8d981f71cf74b07b39a72b8ec5ca63bb5922730157af7d3551100e3691
 MISC metadata.xml 569 BLAKE2B 0507986b52ed21277e159089c7f4736602917c44f0577d62e7501d728c348b49ecf3a2c92842c8e32a59402ad2c2e4e5c3fba510e227aca738a3d763b62689fe SHA512 9083c03d22c5753f54d9525ac954df8df0cceaed07c05c14367ea2b8598e7d7ab64711c810dc89a46be8d76cba6b9aa14fa389f0d686ed12792c0bfcbabc266a
diff --git a/net-misc/dhcpcd/dhcpcd-8.1.0.ebuild b/net-misc/dhcpcd/dhcpcd-8.1.1.ebuild
index 97babad6cfa4..97babad6cfa4 100644
--- a/net-misc/dhcpcd/dhcpcd-8.1.0.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-8.1.1.ebuild
diff --git a/net-misc/dropbox/Manifest b/net-misc/dropbox/Manifest
index fa42bddfa1e2..25e299690530 100644
--- a/net-misc/dropbox/Manifest
+++ b/net-misc/dropbox/Manifest
@@ -2,17 +2,10 @@ AUX dropbox.conf 322 BLAKE2B db94efba3a73841cb56a0fcc75f4f6d7fb7424a35f48a7eb3ad
 AUX dropbox.initd 1581 BLAKE2B c23a753b7e4d1132d516d607e0eee35072130f6e66c59af008cedd9d9d8c104d9ae1c4644ad984a40ec48a498782b442f79058f499e61c3a3b7a700886353b4b SHA512 4275b7cca361978be6d4379f9d14edc75e51684708a61c1b9880f63e0a02e75c4eb165145bf5a2b4e0704daa5a506dc3506a953db6f5a95977f0101fbbda4912
 AUX dropbox_at.service-r1 220 BLAKE2B 3e7111d8b49bc52626343960d2609f084032c8015c06d700883d47c8ce7569ef5bcb881b682c68a2a911d5f24bcbf554a0e098722f4bf0f1477b80243c6978b0 SHA512 ea685e6eb901b841e54aeb9b530d5a0d2a367d8b598019f7f0d2ae69b013be7cf3986c68fabbbaa30c51c9fb5406dc45b07ff15914c7cf18a7aceacf466328e5
 AUX dropbox_at.service-r2 1582 BLAKE2B 7a5d8eb1e99d6a9f6cc7d903d8d2cb6b124b4a5217e978d05f0afb08de90b3634bb802bd075a053b84b0ec4f5ef6643d2efb00beb964f9f14dd3dd234806358b SHA512 ce465614c848103ac19d3782bf55508ab9b3a3f1c0159cd0ccb7daa7374f014382b30a99bf2eb5488ab4474cad953ce0b4710c8222e5196ea49672db5d183b85
-DIST dropbox-lnx.x86-48.3.56.tar.gz 108876564 BLAKE2B b809a220605265685026657e791aff3e716f7ff51e1fc5074d66df87eb8dc473c63c7513c94ca0715844c600fe71aaa3c42a108be4baee2e3e72baade97e3429 SHA512 3174c41e19a01cbd986c111711bc0df80b68882d595a5c869b81bfa1982b3f219da4cda852168bf7fdc9d67b91f52260017f4d25508f6372efd470536a6b96c8
-DIST dropbox-lnx.x86-58.3.88.tar.gz 73782589 BLAKE2B 406758f056dce4348706d181f1620a16199f99d82c6a24b2cbe7773de32b8f64dc10199b88b8c0b7c3a577deb8658e5de18ce28fb00e509a46a5cd21db890f89 SHA512 455b6e0f78b4307d65f6420b76454229b7542475aba089961117d387290ae60df44a659bb6f8d22975cc6f51827d80b3141cb09832fe327fb5cf9861337b08d3
-DIST dropbox-lnx.x86-81.4.195.tar.gz 93761227 BLAKE2B de0349126a701166eb9d1be64dbfad3d3386518dada09bf9544422336a92d69cbe01d252c04ce3141d55f32232f36823ec680d91c7161d80ba01af1c880d391d SHA512 4d78400bcad4492eb82ba692fab0ce518c653a9ddf04c57a668ddb60da63652be69b74c09f74c2770bccb4a7e9ca57d4774214622a1858606c0e45276b317ca1
-DIST dropbox-lnx.x86-82.4.155.tar.gz 94112380 BLAKE2B bcff1c01c6ed8e30285defbd186bd51707eca05813dbb75cd1dcb15c03aa794bfdb0c9dd24b5b703bf6d37a2dde8d8dcb9d34cb43a2f551309e89752e0498469 SHA512 c9b005f7d99d023b74d59a6306b31d7a97af9455c71b54ad54513a64758cf3af8c03923746be645853a17734882adbc91174966f9f71b5d433dbbd1569386b2c
-DIST dropbox-lnx.x86_64-48.3.56.tar.gz 114940928 BLAKE2B 7d678344b59aa12bdbd28f3e425c0b80b15feae403911ef25a03150d1dfa47e94da1eb17d4b703feea6721d2fdfa721da54fab92e1a56b6b8f31456482bc3614 SHA512 cbd3eed71286be079aa8c898929dea305a4cefb9b5e2e41b196d07f68bfc3b5f2839f78d676a3fd7df62644fe00b9ad1930121bde88a6eea9c864d956ccb6f8e
-DIST dropbox-lnx.x86_64-58.3.88.tar.gz 77899313 BLAKE2B ecf729f4cf8c8fabed0f6ca19a9c908f7adec1a58719fae8ef3a6cc80f26b453c678d241af987339e26ccbe988db45f57402ea497c54245691cb702a868fc2dd SHA512 50199f6e60f34a13376725d0deee7c0e6aa31e63574ecdcaf69b43427d262fb35dbf979798b704d6a5a33756e9cea5867591d9a632a311b111d6645123f3385e
-DIST dropbox-lnx.x86_64-81.4.195.tar.gz 98084742 BLAKE2B a21a9237b9f507d654de51f488c114a0a98d8b9e3659dc01713d14c8af94527724145bca1b4d39b3610828c625c1acec7b36ddd8090b49f77dc752d788e42a45 SHA512 684ca4e643d9e662bb6273def6bd3bfcba358b3e3279d88ec2fbf60c90d57026af7b83fc92ecb3e882633501433f1f7e6331213291879f28b70cc4d19003680f
-DIST dropbox-lnx.x86_64-82.4.155.tar.gz 98437566 BLAKE2B 972d9132a3225408844e4679d1c065a3fb9e6f2135eb6f99341848cff1235d6d1a5719c1a50539ba0e0051d99939c1636b34722d55a509e88be3ba85281da070 SHA512 a829eedebfc6d8814fec2a04834f392b5c32ae334289376cc736cb6c9473bbfdcd29b063805ef1def7a22134771cc246569e85f337a4adee9eec9f34a929c272
-EBUILD dropbox-48.3.56.ebuild 3053 BLAKE2B d20ac8f0f864a757c0e37b8187aaa90818960bf2ab6a064d969bd4aadf1dfae6b103ccf3ec98cb242f333b3f2f5b5de166fbcb230c8d4a670a1472416550ab28 SHA512 a0dd103afa32c328a3a3c8e96aba25b2a8d530dec35739af01fb8860607e516cd55bf707978e2a6e4b080dd0e27d791acceaa75c43f496242a7d61b2468d1608
-EBUILD dropbox-58.3.88-r1.ebuild 3031 BLAKE2B 8cc71679628fe2b0ce777d141eaeca8849ad6d5e976597c8f338952cfcc423745133c427ce4e50e9ab8137677c9bb3dd325d3e0cff3d311cdf4df9826f72577f SHA512 fafe75fb1cd941590530b3e52dd20a23ad60645832f5395633adc9a5925303c5a93b85f0c1e31cac47a4e8c88776207b14b41921cad1bdd43e1ecc13f2e5fc91
-EBUILD dropbox-58.3.88.ebuild 3043 BLAKE2B 4f2638f01a5b705bc1fdae3112bbd7b6cdcdf3884c757a3685aed0612ebdac7eb8c2c8ed72aeba7cb01a0f02e346c963ce7040d23b9f2487cd44fd72cef40b1b SHA512 c7cacbd6e86712ba3a69e0707f08fc6a99925a8f9e98d5034de864c0dde720af28dd913f35b3a1d25bed05caf1b043fd3ff007aa533e77f85dbc57cfd2d8e041
-EBUILD dropbox-81.4.195.ebuild 2859 BLAKE2B e865174defcaf358c97298807457cadfb3f73adeddca647d715dcc34f5369267fd27f8cd01f74eacf6b50e59cb9ac063c259f5bc6ffbf9a9bfce1b251cda5053 SHA512 2dea903cb2a131c3af77d9bab61aa1dc8397285b08cfcea79e5ca21a401fed1a1bf9a809c8dd3bebb13d3ff7c2de0840328671fa9f7a510999652c422c507d3b
-EBUILD dropbox-82.4.155.ebuild 2859 BLAKE2B e865174defcaf358c97298807457cadfb3f73adeddca647d715dcc34f5369267fd27f8cd01f74eacf6b50e59cb9ac063c259f5bc6ffbf9a9bfce1b251cda5053 SHA512 2dea903cb2a131c3af77d9bab61aa1dc8397285b08cfcea79e5ca21a401fed1a1bf9a809c8dd3bebb13d3ff7c2de0840328671fa9f7a510999652c422c507d3b
+DIST dropbox-lnx.x86-83.4.152.tar.gz 94612498 BLAKE2B ddf86853785ee4806cc96f2427a300b2db751bf3a5b12ec1508bdbc68ba7ff35d2d65e83e86b5a09ad4a7cc160e0f94e7cd141a819d35f9be87aea7f3cb8dd0d SHA512 75793878c15ecd7224f0ef1897e38c1050d36e11ddf1c30db8e79c22dcb40ceed48fd6e4be204b19c54fe4ef7a2c68d5528df6e10a041cbe4220d9c129619a4b
+DIST dropbox-lnx.x86-84.4.170.tar.gz 95127426 BLAKE2B 09f985565839c5411647fba7eaf84c88a69941456c6e64b23e6e2ca0cc21b8f393153210db23be7ddc4ee0deb3771c9af8ac2b5fefb2325227e8ae3b52a3be0a SHA512 69ab398860bd7559d971ecc42a271a432839b00ab920b8c068d317d420bd521b1ffc1c74912c98d56627b72cd972c059a5eb0ab89c53bb50ab766179baeda448
+DIST dropbox-lnx.x86_64-83.4.152.tar.gz 98772192 BLAKE2B c023fe81128217b8e11b287afdf6d5cd74d7dd4229c7845aa8e96065f03912720dfe3531995bacc45c50a2971dac0bb7e10364206c531fe5f4e23ce6c617a1d4 SHA512 55874247f3dcfafc62d07aad459a6b3d951c87e675a28f6e66c9c51c9190ca8e4dc32bce5339e338694d31036bc8e1b039f54460b84bce0ee1fff9dd3d6aa684
+DIST dropbox-lnx.x86_64-84.4.170.tar.gz 99360343 BLAKE2B 05dd47e681f03757a622079121001060a73f4c0415fc6508d74738026388f8d27f4b59b41535280a793d2f95976fbf6da9e1c0ec963cc002ad2f14ab46dd73be SHA512 e89e6b727699a439c7cf1fed57f5c7db6fd98c7ef484c9530b2c4ce0b09a86de59a50934afd4d18fd591db024eb92d57181d75574d3d32e587dd76682524b871
+EBUILD dropbox-83.4.152.ebuild 2857 BLAKE2B 4018ebd8749c24f4b321789d6c31c990f83757381f54310b755eb46d218b0fc227f7d97e106730c0da9891e53070d25f803239ec805a8abc73e66ffeb32d18fa SHA512 b4208396c6bedf47278f0507a5c14c9ac184bf8a91d2a8433708178c4c92484d26fc1d32dc3781f8a85623f4dcea8dbf2e9f34720ca76c695c0e9cf2878629e5
+EBUILD dropbox-84.4.170.ebuild 2859 BLAKE2B e865174defcaf358c97298807457cadfb3f73adeddca647d715dcc34f5369267fd27f8cd01f74eacf6b50e59cb9ac063c259f5bc6ffbf9a9bfce1b251cda5053 SHA512 2dea903cb2a131c3af77d9bab61aa1dc8397285b08cfcea79e5ca21a401fed1a1bf9a809c8dd3bebb13d3ff7c2de0840328671fa9f7a510999652c422c507d3b
 MISC metadata.xml 503 BLAKE2B e87633e1962a70d62a58006f874a93170d1a5e2729ef6158bf44ab331b5dde53c848266b942fe21579bdc83fda10a421795f630276b96e1c71a954a54ba3436f SHA512 b766938aa2c74e5e9d4558fe882c2d0354c14c9744a7e5eac664ed5234cb723601fc5d04d65e19877c3bb60d8bdaa305eb1c8273704ac2fa1a5779de60d9484f
diff --git a/net-misc/dropbox/dropbox-48.3.56.ebuild b/net-misc/dropbox/dropbox-48.3.56.ebuild
deleted file mode 100644
index 2252fe9e49ab..000000000000
--- a/net-misc/dropbox/dropbox-48.3.56.ebuild
+++ /dev/null
@@ -1,121 +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 python3_6 )
-inherit eutils gnome2-utils pax-utils systemd python-single-r1
-
-DESCRIPTION="Dropbox daemon (pretends to be GUI-less)"
-HOMEPAGE="https://www.dropbox.com/"
-SRC_URI="
-	x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-${PV}.tar.gz )
-	amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-${PV}.tar.gz )"
-
-LICENSE="CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
-SLOT="0"
-KEYWORDS="amd64 x86 ~x86-linux"
-IUSE="+librsync-bundled selinux X"
-RESTRICT="mirror strip"
-
-QA_PREBUILT="opt/.*"
-QA_EXECSTACK="opt/dropbox/dropbox"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="librsync-bundled? ( dev-util/patchelf )"
-
-# Be sure to have GLIBCXX_3.4.9, #393125
-# USE=X require wxGTK's dependencies. system-library cannot be used due to
-# missing symbol (CtlColorEvent). #443686
-RDEPEND="${PYTHON_DEPS}
-	X? (
-		dev-libs/glib:2
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-		dev-qt/qtdeclarative:5
-		dev-qt/qtgui:5[-gles2,xcb]
-		dev-qt/qtopengl:5[-gles2]
-		dev-qt/qtnetwork:5
-		dev-qt/qtprintsupport:5[-gles2]
-		dev-qt/qtwebkit:5
-		dev-qt/qtwidgets:5[-gles2]
-		media-libs/fontconfig
-		media-libs/freetype
-		virtual/jpeg
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXinerama
-		x11-libs/libXxf86vm
-		x11-libs/pango[X]
-		x11-misc/wmctrl
-		x11-themes/hicolor-icon-theme
-	)
-	!librsync-bundled? ( <net-libs/librsync-2 )
-	selinux? ( sec-policy/selinux-dropbox )
-	app-arch/bzip2
-	dev-libs/popt
-	net-misc/wget
-	>=sys-devel/gcc-4.2.0
-	sys-libs/zlib
-	sys-libs/ncurses-compat:5"
-
-src_unpack() {
-	unpack ${A}
-	mkdir -p "${S}" || die
-	mv "${WORKDIR}"/.dropbox-dist/* "${S}" || die
-	mv "${S}"/dropbox-lnx.*-${PV}/* "${S}" || die
-	rmdir "${S}"/dropbox-lnx.*-${PV}/ || die
-	rmdir .dropbox-dist || die
-}
-
-src_prepare() {
-	eapply_user
-
-	rm -vf libGL.so.1 libX11* libdrm.so.2 libffi.so.6 libpopt.so.0 wmctrl || die
-	# tray icon doesnt load when removing libQt5* (bug 641416)
-	#rm -vrf libQt5* libicu* qt.conf plugins/ || die
-	if use X ; then
-		mv images/hicolor/16x16/status "${T}" || die
-	else
-		rm -vrf PyQt5* *pyqt5* images || die
-	fi
-	if use librsync-bundled ; then
-		patchelf --set-rpath '$ORIGIN' librsyncffi.compiled._librsyncffi*.so || die
-	else
-		rm -vf librsync.so.1 || die
-	fi
-	pax-mark cm dropbox
-	mv README ACKNOWLEDGEMENTS "${T}" || die
-}
-
-src_install() {
-	local targetdir="/opt/dropbox"
-
-	insinto "${targetdir}"
-	doins -r *
-	fperms a+x "${targetdir}"/{dropbox,dropbox_py3,dropboxd}
-	dosym "${targetdir}/dropboxd" "/opt/bin/dropbox"
-
-	use X && doicon -s 16 -c status "${T}"/status
-
-	make_desktop_entry "${PN}" "Dropbox"
-
-	newinitd "${FILESDIR}"/dropbox.initd dropbox
-	newconfd "${FILESDIR}"/dropbox.conf dropbox
-	systemd_newunit "${FILESDIR}"/dropbox_at.service-r1 "dropbox@.service"
-
-	dodoc "${T}"/{README,ACKNOWLEDGEMENTS}
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/net-misc/dropbox/dropbox-58.3.88-r1.ebuild b/net-misc/dropbox/dropbox-58.3.88-r1.ebuild
deleted file mode 100644
index 53f28efd4d2d..000000000000
--- a/net-misc/dropbox/dropbox-58.3.88-r1.ebuild
+++ /dev/null
@@ -1,121 +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 python3_6 )
-inherit eutils gnome2-utils pax-utils systemd python-single-r1
-
-DESCRIPTION="Dropbox daemon (pretends to be GUI-less)"
-HOMEPAGE="https://www.dropbox.com/"
-SRC_URI="
-	x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-${PV}.tar.gz )
-	amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-${PV}.tar.gz )"
-
-LICENSE="CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-linux"
-IUSE="+librsync-bundled selinux X"
-RESTRICT="mirror strip"
-
-QA_PREBUILT="opt/.*"
-QA_EXECSTACK="opt/dropbox/dropbox"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="librsync-bundled? ( dev-util/patchelf )"
-
-# Be sure to have GLIBCXX_3.4.9, #393125
-# USE=X require wxGTK's dependencies. system-library cannot be used due to
-# missing symbol (CtlColorEvent). #443686
-RDEPEND="${PYTHON_DEPS}
-	X? (
-		dev-libs/glib:2
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-		dev-qt/qtdeclarative:5
-		dev-qt/qtgui:5[-gles2,xcb]
-		dev-qt/qtopengl:5[-gles2]
-		dev-qt/qtnetwork:5
-		dev-qt/qtprintsupport:5[-gles2]
-		dev-qt/qtwebkit:5
-		dev-qt/qtwidgets:5[-gles2]
-		media-libs/fontconfig
-		media-libs/freetype
-		virtual/jpeg
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXinerama
-		x11-libs/libXxf86vm
-		x11-libs/pango[X]
-		x11-misc/wmctrl
-		x11-themes/hicolor-icon-theme
-	)
-	!librsync-bundled? ( <net-libs/librsync-2 )
-	selinux? ( sec-policy/selinux-dropbox )
-	app-arch/bzip2
-	dev-libs/popt
-	net-misc/wget
-	>=sys-devel/gcc-4.2.0
-	sys-libs/zlib
-	sys-libs/ncurses-compat:5"
-
-src_unpack() {
-	unpack ${A}
-	mkdir -p "${S}" || die
-	mv "${WORKDIR}"/.dropbox-dist/* "${S}" || die
-	mv "${S}"/dropbox-lnx.*-${PV}/* "${S}" || die
-	rmdir "${S}"/dropbox-lnx.*-${PV}/ || die
-	rmdir .dropbox-dist || die
-}
-
-src_prepare() {
-	eapply_user
-
-	rm -vf libGL.so.1 libX11* libdrm.so.2 libpopt.so.0 wmctrl || die
-	# tray icon doesnt load when removing libQt5* (bug 641416)
-	#rm -vrf libQt5* libicu* qt.conf plugins/ || die
-	if use X ; then
-		mv images/hicolor/16x16/status "${T}" || die
-	else
-		rm -vrf PyQt5* *pyqt5* images || die
-	fi
-	if use librsync-bundled ; then
-		patchelf --set-rpath '$ORIGIN' librsyncffi.compiled._librsyncffi*.so || die
-	else
-		rm -vf librsync.so.1 || die
-	fi
-	pax-mark cm dropbox
-	mv README ACKNOWLEDGEMENTS "${T}" || die
-}
-
-src_install() {
-	local targetdir="/opt/dropbox"
-
-	insinto "${targetdir}"
-	doins -r *
-	fperms a+x "${targetdir}"/{dropbox,dropboxd}
-	dosym "${targetdir}/dropboxd" "/opt/bin/dropbox"
-
-	use X && doicon -s 16 -c status "${T}"/status
-
-	make_desktop_entry "${PN}" "Dropbox"
-
-	newinitd "${FILESDIR}"/dropbox.initd dropbox
-	newconfd "${FILESDIR}"/dropbox.conf dropbox
-	systemd_newunit "${FILESDIR}"/dropbox_at.service-r1 "dropbox@.service"
-
-	dodoc "${T}"/{README,ACKNOWLEDGEMENTS}
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/net-misc/dropbox/dropbox-58.3.88.ebuild b/net-misc/dropbox/dropbox-58.3.88.ebuild
deleted file mode 100644
index 6ae52f6051c8..000000000000
--- a/net-misc/dropbox/dropbox-58.3.88.ebuild
+++ /dev/null
@@ -1,121 +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 python3_6 )
-inherit eutils gnome2-utils pax-utils systemd python-single-r1
-
-DESCRIPTION="Dropbox daemon (pretends to be GUI-less)"
-HOMEPAGE="https://www.dropbox.com/"
-SRC_URI="
-	x86? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86-${PV}.tar.gz )
-	amd64? ( https://clientupdates.dropboxstatic.com/dbx-releng/client/dropbox-lnx.x86_64-${PV}.tar.gz )"
-
-LICENSE="CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-linux"
-IUSE="+librsync-bundled selinux X"
-RESTRICT="mirror strip"
-
-QA_PREBUILT="opt/.*"
-QA_EXECSTACK="opt/dropbox/dropbox"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="librsync-bundled? ( dev-util/patchelf )"
-
-# Be sure to have GLIBCXX_3.4.9, #393125
-# USE=X require wxGTK's dependencies. system-library cannot be used due to
-# missing symbol (CtlColorEvent). #443686
-RDEPEND="${PYTHON_DEPS}
-	X? (
-		dev-libs/glib:2
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-		dev-qt/qtdeclarative:5
-		dev-qt/qtgui:5[-gles2,xcb]
-		dev-qt/qtopengl:5[-gles2]
-		dev-qt/qtnetwork:5
-		dev-qt/qtprintsupport:5[-gles2]
-		dev-qt/qtwebkit:5
-		dev-qt/qtwidgets:5[-gles2]
-		media-libs/fontconfig
-		media-libs/freetype
-		virtual/jpeg
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXinerama
-		x11-libs/libXxf86vm
-		x11-libs/pango[X]
-		x11-misc/wmctrl
-		x11-themes/hicolor-icon-theme
-	)
-	!librsync-bundled? ( <net-libs/librsync-2 )
-	selinux? ( sec-policy/selinux-dropbox )
-	app-arch/bzip2
-	dev-libs/popt
-	net-misc/wget
-	>=sys-devel/gcc-4.2.0
-	sys-libs/zlib
-	sys-libs/ncurses-compat:5"
-
-src_unpack() {
-	unpack ${A}
-	mkdir -p "${S}" || die
-	mv "${WORKDIR}"/.dropbox-dist/* "${S}" || die
-	mv "${S}"/dropbox-lnx.*-${PV}/* "${S}" || die
-	rmdir "${S}"/dropbox-lnx.*-${PV}/ || die
-	rmdir .dropbox-dist || die
-}
-
-src_prepare() {
-	eapply_user
-
-	rm -vf libGL.so.1 libX11* libdrm.so.2 libffi.so.6 libpopt.so.0 wmctrl || die
-	# tray icon doesnt load when removing libQt5* (bug 641416)
-	#rm -vrf libQt5* libicu* qt.conf plugins/ || die
-	if use X ; then
-		mv images/hicolor/16x16/status "${T}" || die
-	else
-		rm -vrf PyQt5* *pyqt5* images || die
-	fi
-	if use librsync-bundled ; then
-		patchelf --set-rpath '$ORIGIN' librsyncffi.compiled._librsyncffi*.so || die
-	else
-		rm -vf librsync.so.1 || die
-	fi
-	pax-mark cm dropbox
-	mv README ACKNOWLEDGEMENTS "${T}" || die
-}
-
-src_install() {
-	local targetdir="/opt/dropbox"
-
-	insinto "${targetdir}"
-	doins -r *
-	fperms a+x "${targetdir}"/{dropbox,dropboxd}
-	dosym "${targetdir}/dropboxd" "/opt/bin/dropbox"
-
-	use X && doicon -s 16 -c status "${T}"/status
-
-	make_desktop_entry "${PN}" "Dropbox"
-
-	newinitd "${FILESDIR}"/dropbox.initd dropbox
-	newconfd "${FILESDIR}"/dropbox.conf dropbox
-	systemd_newunit "${FILESDIR}"/dropbox_at.service-r1 "dropbox@.service"
-
-	dodoc "${T}"/{README,ACKNOWLEDGEMENTS}
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/net-misc/dropbox/dropbox-82.4.155.ebuild b/net-misc/dropbox/dropbox-83.4.152.ebuild
index c21396bd015d..ee4f6c9229cd 100644
--- a/net-misc/dropbox/dropbox-82.4.155.ebuild
+++ b/net-misc/dropbox/dropbox-83.4.152.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="BSD-2 CC-BY-ND-3.0 FTL MIT LGPL-2 openssl dropbox"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-linux"
+KEYWORDS="amd64 x86 ~x86-linux"
 IUSE="+librsync-bundled selinux X"
 RESTRICT="mirror strip"
 
diff --git a/net-misc/dropbox/dropbox-81.4.195.ebuild b/net-misc/dropbox/dropbox-84.4.170.ebuild
index c21396bd015d..c21396bd015d 100644
--- a/net-misc/dropbox/dropbox-81.4.195.ebuild
+++ b/net-misc/dropbox/dropbox-84.4.170.ebuild
diff --git a/net-misc/eventd/Manifest b/net-misc/eventd/Manifest
index 161652675b45..3e2ff3909178 100644
--- a/net-misc/eventd/Manifest
+++ b/net-misc/eventd/Manifest
@@ -1,5 +1,3 @@
-DIST eventd-0.21.0.tar.xz 392080 BLAKE2B 14d01d46e07e650f392abca53716c1fd5a5d70f05fe006e8a230d38be610e36ee0369742d258b46697376317be4ff6a071166a45528ef2840159a1024057d6cc SHA512 5907d453c493c9f2332df506037027ef7df021b1e29a6773cf8bb5c32c7a301b65ca55d3e3ea40982d3e48b837738c97b5420309a45a550f409d8912636d1dae
-DIST eventd-0.24.1.tar.xz 184276 BLAKE2B cd14506d7f539bd6076540c713c7957d52db1fb3a4a09ad52d2b1d4ab4b3d3c31c8245063a85efcef1abbc127fa534c15db1b297f9f651ac113b3723842f76f2 SHA512 c99a42364796cf7421bbb3c8b0d0810e1933b226c8bc4f74240d276d40bd9b96aae5d6016b8da92435222572fd1bf04441a63039f14162702f87aa0bdd4d67ed
-EBUILD eventd-0.21.0.ebuild 2966 BLAKE2B e6d82d1078f3bb0e6fecca2ae8a7809cd0a71744eda832f59b2516adaebbc9b8b88bb5ae3b9b1f644540ca9b773c6d33d79fc0e8805a613cea1f2363dfcdcdad SHA512 c01234e76c5d57a059da82843a3cfd33c088723432e4964a23440c7ab5276755a7e159a23bf10a736e999e7c0566a8d87dd751b58b7112cf19b5abebe5e032a1
-EBUILD eventd-0.24.1.ebuild 3177 BLAKE2B ea39b2cd49d1844241a971ffcb983f7313c638f243dfcc27a31f0a77ef53b181ab20c8d308000fd52af89534a3bacceef1c98ca1b23348f703783b2176bafef6 SHA512 f12e2fde8ec56245287f6c2475d99b999661b30b6b5dd72012fe287516061d995ec6345dd0785528f05dd5fd058dc629d54757557c5e0e63bf90161184a61888
+DIST eventd-0.27.0.tar.xz 188000 BLAKE2B 06779168e9049714aabc051f8a85a5e5764509c3deceddd300c103f4831b6679f082748858bebb9629dcd47fa0b570158c6cf2b665167ab8e20a7dc0f12cc00f SHA512 586fdf36742cfda5a3c5e4cf4600307b8d699701fdf32eec25a7b294c815ded6e7e41210e65c706c34c5f2d911cadec89b677f082dad183f486fb7d1a55a2302
+EBUILD eventd-0.27.0.ebuild 2551 BLAKE2B a24f06ab3ec1df9775820e41f43ea248a0a87fbf3059fbc32dc4769991288ee808a5216c5268d40519e9e36b6614c893942340533a80db86d9df8160dfb08809 SHA512 10380d0efa56e13914e2b2c0d7c6e58f1b682294be9d8e1c7352b9c56c0bc141c427b7ae4cadcbb77fecd35d2de9a118fd65dd693a1e71afe356b75adf989d6f
 MISC metadata.xml 907 BLAKE2B f615133974e8aa1afefed00bf6d5e856b18feac63189f8c338de145145c10870de3bf45a764c53c9003fbac6215961ba9e4ca8898c0e2089545a20bc3b147342 SHA512 9132a923a1c3b140374a480473665aa85ab0a9d8f7aa74298a78b4905c5d2bbb97a0fa9d8564c600a9023f64e67151ac47b9443c55e6e7642bbebaf22da061aa
diff --git a/net-misc/eventd/eventd-0.21.0.ebuild b/net-misc/eventd/eventd-0.21.0.ebuild
deleted file mode 100644
index e367b620f030..000000000000
--- a/net-misc/eventd/eventd-0.21.0.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit linux-info systemd xdg-utils
-
-DESCRIPTION="A small daemon to act on remote or local events"
-HOMEPAGE="https://www.eventd.org/"
-SRC_URI="https://www.eventd.org/download/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-3+ LGPL-3+ MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="debug fbcon +introspection ipv6 libcanberra libnotify +notification
-	pulseaudio purple speech systemd test upnp websocket +X zeroconf"
-
-REQUIRED_USE="
-	X? ( notification )
-	fbcon? ( notification )
-	notification? ( || ( X fbcon ) )
-"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.40:2
-	sys-apps/util-linux
-	introspection? ( >=dev-libs/gobject-introspection-1.42 )
-	libcanberra? ( media-libs/libcanberra )
-	libnotify? ( x11-libs/gdk-pixbuf:2 )
-	notification? (
-		x11-libs/cairo
-		x11-libs/pango
-		x11-libs/gdk-pixbuf:2
-		X? (
-			x11-libs/cairo[xcb]
-			x11-libs/libxcb:=
-			x11-libs/xcb-util
-			x11-libs/xcb-util-wm
-		)
-	)
-	pulseaudio? (
-		media-libs/libsndfile
-		media-sound/pulseaudio
-	)
-	purple? ( net-im/pidgin )
-	speech? ( app-accessibility/speech-dispatcher )
-	systemd? ( sys-apps/systemd:= )
-	upnp? ( net-libs/gssdp:= )
-	websocket? ( >=net-libs/libsoup-2.50:2.4 )
-	zeroconf? ( net-dns/avahi[dbus] )
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.5
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	virtual/pkgconfig
-	fbcon? ( virtual/os-headers )
-"
-RDEPEND="${COMMON_DEPEND}
-	net-libs/glib-networking[ssl]
-"
-
-pkg_setup() {
-	if use ipv6; then
-		CONFIG_CHECK=$(usex test 'IPV6' '~IPV6')
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	default_src_prepare
-
-	# Workaround Gentoo bug 604398.
-	sed -i \
-		-e 's|libspeechd|speech-dispatcher/libspeechd|g' \
-		plugins/tts/src/tts.c || die
-
-	# Prevent access violations from introspection metadata generation.
-	xdg_environment_reset
-}
-
-src_configure() {
-	local myeconfargs=(
-		--with-systemduserunitdir="$(systemd_get_userunitdir)"
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-		--with-dbussessionservicedir="${EPREFIX}/usr/share/dbus-1/services"
-		$(use_enable websocket)
-		$(use_enable zeroconf dns-sd)
-		$(use_enable upnp ssdp)
-		$(use_enable introspection)
-		$(use_enable ipv6)
-		$(use_enable systemd)
-		$(use_enable notification notification-daemon)
-		# Wayland plugin requires wayland-wall, which is currently WIP.
-		# See https://github.com/wayland-wall/wayland-wall/issues/1
-		--disable-nd-wayland
-		$(use_enable X nd-xcb)
-		$(use_enable fbcon nd-fbdev)
-		$(use_enable purple im)
-		$(use_enable pulseaudio sound)
-		$(use_enable speech tts)
-		$(use_enable libnotify)
-		$(use_enable libcanberra)
-		$(use_enable debug)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	local -x EVENTD_TESTS_TMP_DIR="${T}"
-	default_src_test
-}
-
-pkg_postinst() {
-	if { use notification || use libnotify; } && ! has_version 'gnome-base/librsvg'; then
-		elog
-		elog "For SVG icons in notifications, please install 'gnome-base/librsvg'."
-		elog
-	fi
-}
diff --git a/net-misc/eventd/eventd-0.24.1.ebuild b/net-misc/eventd/eventd-0.24.1.ebuild
deleted file mode 100644
index b981fafccea5..000000000000
--- a/net-misc/eventd/eventd-0.24.1.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit linux-info meson systemd xdg-utils
-
-DESCRIPTION="A small daemon to act on remote or local events"
-HOMEPAGE="https://www.eventd.org/"
-SRC_URI="https://www.eventd.org/download/eventd/${P}.tar.xz"
-
-LICENSE="GPL-3+ LGPL-3+ MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="debug fbcon +introspection ipv6 libcanberra libnotify +notification
-	pulseaudio purple speech systemd test upnp webhook websocket +X zeroconf"
-
-REQUIRED_USE="
-	X? ( notification )
-	fbcon? ( notification )
-	notification? ( || ( X fbcon ) )
-	test? ( websocket )
-"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.40:2
-	sys-apps/util-linux
-	x11-libs/libxkbcommon
-	introspection? ( >=dev-libs/gobject-introspection-1.42 )
-	libcanberra? ( media-libs/libcanberra )
-	libnotify? ( x11-libs/gdk-pixbuf:2 )
-	notification? (
-		x11-libs/cairo
-		x11-libs/pango
-		x11-libs/gdk-pixbuf:2
-		X? (
-			x11-libs/cairo[xcb]
-			x11-libs/libxcb:=
-			x11-libs/xcb-util
-			x11-libs/xcb-util-wm
-		)
-	)
-	pulseaudio? (
-		media-libs/libsndfile
-		media-sound/pulseaudio
-	)
-	purple? ( net-im/pidgin )
-	speech? ( >=app-accessibility/speech-dispatcher-0.8.7 )
-	systemd? ( sys-apps/systemd:= )
-	upnp? ( net-libs/gssdp:= )
-	webhook? ( >=net-libs/libsoup-2.42:2.4 )
-	websocket? ( >=net-libs/libsoup-2.50:2.4 )
-	zeroconf? ( net-dns/avahi[dbus] )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/meson-0.44.1
-	app-text/docbook-xml-dtd:4.5
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	virtual/pkgconfig
-	fbcon? ( virtual/os-headers )
-"
-RDEPEND="${COMMON_DEPEND}
-	net-libs/glib-networking[ssl]
-"
-
-pkg_setup() {
-	if use ipv6; then
-		CONFIG_CHECK=$(usex test 'IPV6' '~IPV6')
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	default_src_prepare
-
-	# Prevent access violations from introspection metadata generation.
-	xdg_environment_reset
-}
-
-eventd_use_enable() {
-	echo "-D${2:-${1}}=$(usex ${1} 'true' 'false')" || die
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dsystemduserunitdir="$(systemd_get_userunitdir)"
-		-Dsystemdsystemunitdir="$(systemd_get_systemunitdir)"
-		-Ddbussessionservicedir="${EPREFIX}/usr/share/dbus-1/services"
-		$(eventd_use_enable websocket)
-		$(eventd_use_enable zeroconf dns-sd)
-		$(eventd_use_enable upnp ssdp)
-		$(eventd_use_enable ipv6)
-		$(eventd_use_enable systemd)
-		$(eventd_use_enable notification notification-daemon)
-		# Wayland plugin requires wayland-wall, which is currently WIP.
-		# See https://github.com/wayland-wall/wayland-wall/issues/1
-		-Dnd-wayland="false"
-		$(eventd_use_enable X nd-xcb)
-		$(eventd_use_enable fbcon nd-fbdev)
-		$(eventd_use_enable purple im)
-		$(eventd_use_enable pulseaudio sound)
-		$(eventd_use_enable speech tts)
-		$(eventd_use_enable webhook)
-		$(eventd_use_enable libnotify)
-		$(eventd_use_enable libcanberra)
-		$(eventd_use_enable introspection gobject-introspection)
-		$(eventd_use_enable debug)
-	)
-	meson_src_configure
-}
-
-src_test() {
-	EVENTD_TESTS_TMP_DIR="${T}" meson_src_test
-}
-
-pkg_postinst() {
-	if { use notification || use libnotify; } && ! has_version 'gnome-base/librsvg'; then
-		elog
-		elog "For SVG icons in notifications, please install 'gnome-base/librsvg'."
-		elog
-	fi
-}
diff --git a/net-misc/eventd/eventd-0.27.0.ebuild b/net-misc/eventd/eventd-0.27.0.ebuild
new file mode 100644
index 000000000000..f4197d8b68a3
--- /dev/null
+++ b/net-misc/eventd/eventd-0.27.0.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-info meson systemd
+
+DESCRIPTION="A small daemon to act on remote or local events"
+HOMEPAGE="https://www.eventd.org/"
+SRC_URI="https://www.eventd.org/download/eventd/${P}.tar.xz"
+
+LICENSE="GPL-3+ LGPL-3+ ISC MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug fbcon +introspection ipv6 libcanberra libnotify +notification
+	pulseaudio purple speech systemd test upnp wayland webhook websocket
+	+X zeroconf"
+
+REQUIRED_USE="
+	X? ( notification )
+	fbcon? ( notification )
+	notification? ( || ( X fbcon ) )
+	test? ( websocket )
+"
+
+COMMON_DEPEND="
+	dev-libs/glib:2
+	sys-apps/util-linux
+	x11-libs/libxkbcommon
+	introspection? ( dev-libs/gobject-introspection )
+	libcanberra? ( media-libs/libcanberra )
+	libnotify? ( x11-libs/gdk-pixbuf:2 )
+	notification? (
+		gnome-base/librsvg
+		x11-libs/cairo
+		x11-libs/pango
+		x11-libs/gdk-pixbuf:2
+		X? (
+			x11-libs/cairo[xcb]
+			x11-libs/libxcb:=[xkb]
+			x11-libs/xcb-util
+			x11-libs/xcb-util-wm
+		)
+	)
+	pulseaudio? (
+		media-libs/libsndfile
+		media-sound/pulseaudio
+	)
+	purple? ( net-im/pidgin )
+	speech? ( app-accessibility/speech-dispatcher )
+	systemd? ( sys-apps/systemd:= )
+	upnp? ( net-libs/gssdp:= )
+	wayland? ( dev-libs/wayland )
+	webhook? ( net-libs/libsoup:2.4 )
+	websocket? ( net-libs/libsoup:2.4 )
+	zeroconf? ( net-dns/avahi[dbus] )
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	fbcon? ( virtual/os-headers )
+"
+RDEPEND="${COMMON_DEPEND}
+	net-libs/glib-networking[ssl]
+"
+BDEPEND="virtual/pkgconfig"
+
+pkg_setup() {
+	if use ipv6; then
+		CONFIG_CHECK=$(usex test 'IPV6' '~IPV6')
+		linux-info_pkg_setup
+	fi
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dsystemduserunitdir="$(systemd_get_userunitdir)"
+		-Dsystemdsystemunitdir="$(systemd_get_systemunitdir)"
+		-Ddbussessionservicedir="${EPREFIX}/usr/share/dbus-1/services"
+		$(meson_feature websocket)
+		$(meson_feature zeroconf dns-sd)
+		$(meson_feature upnp ssdp)
+		$(meson_use ipv6)
+		$(meson_use systemd)
+		$(meson_use notification notification-daemon)
+		$(meson_use wayland nd-wayland)
+		$(meson_use X nd-xcb)
+		$(meson_use fbcon nd-fbdev)
+		$(meson_use purple im)
+		$(meson_use pulseaudio sound)
+		$(meson_use speech tts)
+		$(meson_use webhook)
+		$(meson_use libnotify)
+		$(meson_use libcanberra)
+		$(meson_use introspection gobject-introspection)
+		$(meson_use debug debug-output)
+	)
+
+	meson_src_configure
+}
+
+src_test() {
+	EVENTD_TESTS_TMP_DIR="${T}" meson_src_test
+}
diff --git a/net-misc/gerbera/Manifest b/net-misc/gerbera/Manifest
index 8c6137475728..fa95d1a45890 100644
--- a/net-misc/gerbera/Manifest
+++ b/net-misc/gerbera/Manifest
@@ -3,10 +3,10 @@ AUX gerbera-1.0.0.config 6164 BLAKE2B f16c1e32be600b778e6818267b76bff34a26653d8a
 AUX gerbera-1.0.0.initd 555 BLAKE2B acd14eaf50dac5eed5fa7b8606e70a9b5166caa71d8f6fb6e5bf5511f3b727a9fe10792cb1e8660b92afe9047d0a845553bc922dcfda832b1f32e8a2ed8b183b SHA512 dfdb6c1b4c7ce252a18303507c9e0df38145865dbcacd1c27026d4bca5203beede99e6315e1abd57fd7713a89860b33aadd07df9448ed54a2ed64c872ee8926d
 AUX gerbera-1.3.0.config 6342 BLAKE2B 519b2b0f79803bb516b5bd43a692af38039a273318a3486b67c9f040ab9061fb9a2b2aef484fb9e22b584fa7f5d1e0a4f7e61f896f6f9b1ce4f657349506b873 SHA512 e551413ad62ca849561991880ba9049ebb6662ec06ff21d5483bbcc2499df04c72ac170fc4235ebd05c5d95926cdd7fc4db27083cb10fa4fe38f10a1141bf417
 DIST gerbera-1.2.0.tar.gz 2910704 BLAKE2B b0d0f52dcfbcefe09d96e6b63a73005fb069176fb42af16cf9a4729742988d5c5a0b68109ab50b93ba65ec604c3ced7a827fb75300d6c3409bdde77e18346589 SHA512 5472136b0605e4cc9645219ab9fbe9ae4240a4b80f52fc611456cef0336a7eac8136448132f30fab04655d4bdb0f85f5a37e92e2830ec976f71c6b294935e1dc
-DIST gerbera-1.3.1.tar.gz 2803481 BLAKE2B b6fef9b2f5904eb778279e2e8ff1f9b3cc53713142390c67d68d86d80893957aa55309c23df878766a188c2917bc33b2788d153317d9ef1ce60e96a452039e18 SHA512 dbac60300d2f3e0b7eb520c9cb3026be3a4e1e4a3e1f5a1c6ddb2279ffe7c30ed5c1a59373f0d9e43de2cec751a5ff6644c3af53f866fc6a54f549ae934a26e1
 DIST gerbera-1.3.2.tar.gz 2845728 BLAKE2B 15c8294486e9c5eb804d4b433e491b9db98821e0cc7274696b0056a8dde69beded83e092beddf31a171085d5913533a5d7dfe01afd1385f659da6fadd2eebaec SHA512 32a66dc25340969bbbbc2810199735b72ff258eb2d4a359402469f4ce21690843d37ad4134667d10f03967d113b33b08bcae7329cdda49dfd60dbd01b21d5b27
+DIST gerbera-1.3.3.tar.gz 2891422 BLAKE2B f9317f878f718083c2ca8a72642fca1c6f83c619494dea487318bfa274698531257fbf1c4640304c592d5ab3f0c2f074c5be7aaa8ee4c0983c0b031205c5f6da SHA512 d579a36265f178f24fd88aa3c9ede8bf678e89b1fe455bf4047369d8483e1104c0b2fd995b4dca0b473585e0dbcccc23b2894c3931db350d8b85a3224505fefd
 EBUILD gerbera-1.2.0-r1.ebuild 2558 BLAKE2B c5f81e11241cb74d63428c263cd0141d61a90f595f8c42ad4f2987d73f885ff6275b85f9ad772b8ff8862847119dd953206972ebe8461e659cf5bc9476b3da89 SHA512 57b790ea36d49c2ecff0116d0aa2e583a8a6bc9847e79396d93061156c06d2b9380f9725a543e4f1cd6f91574b6cd77c26fec65b77552308998b886f6f993495
-EBUILD gerbera-1.3.1.ebuild 2558 BLAKE2B c7ef27b4cdb27c2be3c5d3378afb5456aff2086ff36650c0896e9bf098f6e103e34c5cb573d104f5ad699887674db15003dace58c411a5f931f961ae5cc7144e SHA512 25012edd148b79d9426c2847e289239dd2cb7b8300cb4240e3ac01cb0a2aaaed4e8705ab9694ebc51b783820e596a5564aa47c76d8a31d9a200afb0ef06cd11f
 EBUILD gerbera-1.3.2.ebuild 2558 BLAKE2B c7ef27b4cdb27c2be3c5d3378afb5456aff2086ff36650c0896e9bf098f6e103e34c5cb573d104f5ad699887674db15003dace58c411a5f931f961ae5cc7144e SHA512 25012edd148b79d9426c2847e289239dd2cb7b8300cb4240e3ac01cb0a2aaaed4e8705ab9694ebc51b783820e596a5564aa47c76d8a31d9a200afb0ef06cd11f
+EBUILD gerbera-1.3.3.ebuild 2558 BLAKE2B c7ef27b4cdb27c2be3c5d3378afb5456aff2086ff36650c0896e9bf098f6e103e34c5cb573d104f5ad699887674db15003dace58c411a5f931f961ae5cc7144e SHA512 25012edd148b79d9426c2847e289239dd2cb7b8300cb4240e3ac01cb0a2aaaed4e8705ab9694ebc51b783820e596a5564aa47c76d8a31d9a200afb0ef06cd11f
 EBUILD gerbera-9999.ebuild 2558 BLAKE2B c7ef27b4cdb27c2be3c5d3378afb5456aff2086ff36650c0896e9bf098f6e103e34c5cb573d104f5ad699887674db15003dace58c411a5f931f961ae5cc7144e SHA512 25012edd148b79d9426c2847e289239dd2cb7b8300cb4240e3ac01cb0a2aaaed4e8705ab9694ebc51b783820e596a5564aa47c76d8a31d9a200afb0ef06cd11f
 MISC metadata.xml 1142 BLAKE2B 000fa449f9dff3541b6d1507e6945a2508c0478ac19ed4a1ff1108ecde9dbbad96b76d304da9f34a2169bdaf620be5d710b111e0c442e05c94ab58747a7dab87 SHA512 28acbb3ef7011c52e77a323a4ec346ca25a3c255f8dc41da4c4c6c8f21bcbf0fcc8ebef501efd0f225ac2f0d29d828584a904774d7fb061635b007a0ea123f54
diff --git a/net-misc/gerbera/gerbera-1.3.1.ebuild b/net-misc/gerbera/gerbera-1.3.3.ebuild
index 1b1129c47251..1b1129c47251 100644
--- a/net-misc/gerbera/gerbera-1.3.1.ebuild
+++ b/net-misc/gerbera/gerbera-1.3.3.ebuild
diff --git a/net-misc/gsutil/Manifest b/net-misc/gsutil/Manifest
index 3447dcae4736..c1d4d361a876 100644
--- a/net-misc/gsutil/Manifest
+++ b/net-misc/gsutil/Manifest
@@ -1,5 +1,7 @@
 AUX dummy.boto 128 BLAKE2B f366c006392ef65857a3af2334f6776ce9609841fab260e27c15579b7f2603cc547f55f97ad053027aef670616e2e8c65c0c932ca930cb2a59de1428c62c3887 SHA512 9e420dde9d7e8e9fe2513529fd2681994763e8b9069ae9911c56a3ee72d77e40a8e5c8b0e7c006fe5c336ccb78935d908b20bd1bd275dded317a0c5d2b7bc97d
 AUX gsutil-4.41-tests.patch 810 BLAKE2B 93a2e7163d0684c8ad03ce03ae94aebc168922861ac89958e0a13a1fc3e53635b03d08531bd29b8301772c0a724647c33e5091af47e1c4bcf4c0478b4487fad6 SHA512 85fad475926755f32c4d08eaad9b023c9808c4ef696a2a7da4c61a68101d781c207c4f5817cda286f123e0c50477e8f7bf032a03d40420004d1aee412ef8375a
 DIST gsutil_4.41.tar.gz 3685987 BLAKE2B 7586d6c64c87c27e4c5f3e86372bfe6d7fdfbdcbe4146308ed497d86b6e3fb984a79d3f07ba3ed055ac09bfe70eef893b8b764a46921703c48c8e54e49cac7eb SHA512 f96500a4761cb244039ba20ccb328b143134a74822990538585116fe6afa6f9e23cfecc9958e34d5deb4291edc9cbe97c6176b3a0f0136ed6e8e81303b5b8c4a
+DIST gsutil_4.45.tar.gz 3695514 BLAKE2B 9b129ae1e87620b2430368818929fbd884319cd2cf7788275ba556f873b13700b9333c59b753202d8c88a81eaa47e223f39f6ded26adf8d16144324763528886 SHA512 9b21162afcfcd063976be51151d1d51aaeac1a32c2b7d0ee79aaccb28f5202f93623b39ed994bd796ab508a56363fea69429fe42cd770cff3c7c8352a4956212
 EBUILD gsutil-4.41.ebuild 2613 BLAKE2B 2c08175115e2db69fd50b9e1695374ed5feb1df7a0e42ca2366ae67109ed0d13301f229a814497213dd2f9894454a7df068c465b01ecfe98f66fc581c48ac8b5 SHA512 61a9a371ea6aee9f4448a359d6ac9f06ba4c3ae2b0a0c1ade10b0e229256d7cd2e7c48101964d49c17983bea5cdb021c6a88a22568ac6106cf162ca2621e5a7d
-MISC metadata.xml 309 BLAKE2B 2e96100ac1f7d7ec8002836564ada61c1f60527f13dedb03063940bbed304147766406ad2dfe3269385320f1f81d3f7ce0979077c6f43ec49d6e8f99d5913cd7 SHA512 9ef28b80fa82fb11b954bdaf65bb385203f18a44dcfa53f2f8cdf47f62ece37eea0ecec1c83e067485d16fc0dd6b8bfb8a0fe625b5af8e5d07cb48a1e52b3178
+EBUILD gsutil-4.45.ebuild 2613 BLAKE2B 2c08175115e2db69fd50b9e1695374ed5feb1df7a0e42ca2366ae67109ed0d13301f229a814497213dd2f9894454a7df068c465b01ecfe98f66fc581c48ac8b5 SHA512 61a9a371ea6aee9f4448a359d6ac9f06ba4c3ae2b0a0c1ade10b0e229256d7cd2e7c48101964d49c17983bea5cdb021c6a88a22568ac6106cf162ca2621e5a7d
+MISC metadata.xml 514 BLAKE2B b37a6acae57aa619dd2adc4722283fbf1f5076ed9b3fa18558fdbe0d9ea39eb9fd1e0a678ce2df59c2c37f444558f9e4d1e913be7c7fdf1b2a16f31e809b7588 SHA512 d97ecaa80d5996fb0bb424681861e552c4f3ee206ec0b5d7a4f703247ea495e0a201757ebe4a5288389cab58208ead2718288107cad173684f37ecb9357bf06e
diff --git a/net-misc/gsutil/gsutil-4.45.ebuild b/net-misc/gsutil/gsutil-4.45.ebuild
new file mode 100644
index 000000000000..c645f1344db9
--- /dev/null
+++ b/net-misc/gsutil/gsutil-4.45.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"
+
+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/gsutil/metadata.xml b/net-misc/gsutil/metadata.xml
index 6625c00f3193..8d2593986484 100644
--- a/net-misc/gsutil/metadata.xml
+++ b/net-misc/gsutil/metadata.xml
@@ -1,9 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="google-code">gsutil</remote-id>
-		<remote-id type="github">GoogleCloudPlatform/gsutil</remote-id>
-	</upstream>
+  <maintainer type="person">
+    <email>chutzpah@gentoo.org</email>
+    <name>Patrick McLean</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>zmedico@gentoo.org</email>
+    <name>Zac Medico</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="google-code">gsutil</remote-id>
+    <remote-id type="github">GoogleCloudPlatform/gsutil</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/net-misc/icaclient/Manifest b/net-misc/icaclient/Manifest
index ee38a6aed47f..d4e3ac479645 100644
--- a/net-misc/icaclient/Manifest
+++ b/net-misc/icaclient/Manifest
@@ -4,10 +4,10 @@ AUX conncenter.desktop 194 BLAKE2B 96fdae8892ec9cef05a92e129bba42efb666874a2a218
 AUX new_store.desktop 235 BLAKE2B 43bbf97a6982485e8b21f30c15889d64063ef0ce294b0695b368c08600af8a5a7764ee09ae7fe5d7f9c105d1217cae37fc2211542535ce31cea5d2b9f36d996f SHA512 a2857ecadeceb1252039f02e779a3d366cb863758802fc2927b9edd44a6580ba175db8ce332e3cbdd4ab0354fc0144432934abf8fed9f68c3e1a639775613258
 AUX selfservice.desktop 183 BLAKE2B 45d0830601ceac5159e239ec149cf3cdeabd43beb2ad6964935129fad6cd2c2e7c36cfc473e89b5db3b3b6cce2df909dd6013c3463631a7d868b470a49494285 SHA512 c4a2bdd83a29171c331b8adc98b33b8150fef5616d1fde8a0c9ccf1972b8ecc222dc1c0bc4e7779d93b851f44e79f5166138af7b7d36de964932ff3b63a4801b
 AUX wfica.desktop 242 BLAKE2B 6e90bb02824a6319035814050919c55907b2104c65e2abcc7379a4c694a585945c2e10ada114c4dfb906ee3b1fa90a0251dcb1ec3aac1fb6015a2d2ecbef4452 SHA512 a233bbdfadaee080d8dda67ed81a60ef74902c1f2100cb08bc402186be23f1bbb82f84abb93da88d610d187a267f7db28e6bfebe689839c921ae5a94a4bdf1d7
-DIST linuxx64-19.6.0.60.tar.gz 101850500 BLAKE2B c292a6dbde3f6b7a52952ceb1c6127729be9c82b2447138bc3487bc3eafba95cbe6b54e18df8b91583330dcd47f30cd51a1ebc0bcbc869baaf003024a889efb7 SHA512 952a81734b8284489a3e03a894ca721ba1f47227217cbc021fcca310ed6ebc53195b7df24985f408062b472b5be580b4b4719d1809ee01b0ab634d5cb5e06258
+DIST linuxx64-19.10.0.15.tar.gz 102164402 BLAKE2B d432c0addc7dc01f371dbede8125d134c82b985b359afa9d91c23b4916976f19513e6b72bac969526879ff6f3de56ab1898f729123274af93273526138553653 SHA512 0244e09bbb4b7f1c53170127215a94b87754ab633d75100e8af4777d3013344c3a06f6ec3080e9c77bd5bf54b117ac520ff04aa349e9b291cb041b06903da71b
 DIST linuxx64-19.8.0.20.tar.gz 101850343 BLAKE2B 275896b781addbc4b83e2ce54b46136a2595b65eb8adf9675b2a2695aea5acd36d99ee01b0171498a6f724c5d1878ec4a7741f3fae27a08b93d1bb6a79a9c49a SHA512 141f2c3a0fef7be341568029228a4c32ed5d578014a513fb3ca1fd6213b42b613a07b0c5dcf350712a0d7190006b9443ed3d7279707a29d0c00ddc4108b7b090
-DIST linuxx86-19.6.0.60.tar.gz 108052444 BLAKE2B ce784be607ac74a4087a66fa492625fbb6aec6cf04271ecc6114e0a1d8940314f0f715dcfc3842cb145f05cf880f164dd83b4bec7d3ba63fa021bc2a5fde0d9e SHA512 9056d716f0c9f895d5d24eb81582b6f9ac1cc5db5063d2edf892841ad87d4bd58d68ba67b03f7f04f7287d2472b067ae3d2040bc3c773e5c2a79a401dbd04732
+DIST linuxx86-19.10.0.15.tar.gz 109350883 BLAKE2B e7f7b98e04db9259b02177e18d5f2bf62975a50635e745b99d9c860370b468e63b30f01b85090b0749f962916c3606f4b53b66e1b6a271f6b33ba6a5d39c8ad7 SHA512 0d9e1692855d4122cef478a04059b0a7261165a50cebbf1524a426b841f65b6e26e01aa98865f7ba35ba7c8386eaf7d7301e5fc03019f9034c91971a53459c1d
 DIST linuxx86-19.8.0.20.tar.gz 108044897 BLAKE2B a76d8c507bdc662f62c7874e19bbbbbe5a59f0f146b7226f3f989ff9626db3def036b7b218c47a71f75c5ec873cd81a785d79a69291c49d3db3ca630950379b2 SHA512 0c88f511b289caac27d1b8a83e8a1c49a9a9f431b880f53172229a58df85052d67890bbb1b5e3f8272c9c7f6d3dd9e588aff481ac727293cec6148a18facb061
-EBUILD icaclient-19.6.0.60-r1.ebuild 4560 BLAKE2B 3134576f7a893a1eaa82d768d94391ba5b3bfac015437ec8e00223866206fcdd8ef2242a7b2bcccd3c6c12beb792f50c319229979d5a222bc82ba501e0ff91dd SHA512 cc4eeefd96a0c3fcebea06a408abb34bd51f9fdd322ec408026b37397d41970e94a04a8b05fc8caca03a4deb9b66ca00a09b94d2bec9d34cac3a1a26e85e6196
-EBUILD icaclient-19.8.0.20.ebuild 4562 BLAKE2B ecc1d62665c372e622df639a2445ba67a04011622ca01551f56164ca7bd7a89eb24954765ae8ddc24975e2730cf2de4bb44505e986387c1121cc417b8db508c2 SHA512 ea51340b1bc5d1b5435e3067a5eae1410055454503bf85abc9c7be22f2e5d5abdc0789617c6c7d99298f04765fd5ba10d736574face335510cf908778b1c4d0b
+EBUILD icaclient-19.10.0.15.ebuild 4562 BLAKE2B ecc1d62665c372e622df639a2445ba67a04011622ca01551f56164ca7bd7a89eb24954765ae8ddc24975e2730cf2de4bb44505e986387c1121cc417b8db508c2 SHA512 ea51340b1bc5d1b5435e3067a5eae1410055454503bf85abc9c7be22f2e5d5abdc0789617c6c7d99298f04765fd5ba10d736574face335510cf908778b1c4d0b
+EBUILD icaclient-19.8.0.20.ebuild 4560 BLAKE2B 3134576f7a893a1eaa82d768d94391ba5b3bfac015437ec8e00223866206fcdd8ef2242a7b2bcccd3c6c12beb792f50c319229979d5a222bc82ba501e0ff91dd SHA512 cc4eeefd96a0c3fcebea06a408abb34bd51f9fdd322ec408026b37397d41970e94a04a8b05fc8caca03a4deb9b66ca00a09b94d2bec9d34cac3a1a26e85e6196
 MISC metadata.xml 602 BLAKE2B d0a0f2a13b43053f748f4250ff9fd0f7aee5d53501d773081e646097e40b5a60bb49c4517ec4689272c2e14bfd51acff76c8b4c8575533697f8f069854a4d5eb SHA512 281c87fd74b63941c4ae76772c7020b0c70adfcde3e87be13cb9b0994aa4794df2c2904e623518812d1da8ea602b45c95db083ea7d239e7f0e7c9c92487bd68c
diff --git a/net-misc/icaclient/icaclient-19.6.0.60-r1.ebuild b/net-misc/icaclient/icaclient-19.10.0.15.ebuild
index 935af4875168..941c09b0cfba 100644
--- a/net-misc/icaclient/icaclient-19.6.0.60-r1.ebuild
+++ b/net-misc/icaclient/icaclient-19.10.0.15.ebuild
@@ -13,7 +13,7 @@ SRC_URI="amd64? ( linuxx64-${PV}.tar.gz )
 
 LICENSE="icaclient"
 SLOT="0"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE="l10n_de l10n_es l10n_fr l10n_ja l10n_zh-CN"
 RESTRICT="mirror strip userpriv fetch"
 
diff --git a/net-misc/icaclient/icaclient-19.8.0.20.ebuild b/net-misc/icaclient/icaclient-19.8.0.20.ebuild
index 941c09b0cfba..935af4875168 100644
--- a/net-misc/icaclient/icaclient-19.8.0.20.ebuild
+++ b/net-misc/icaclient/icaclient-19.8.0.20.ebuild
@@ -13,7 +13,7 @@ SRC_URI="amd64? ( linuxx64-${PV}.tar.gz )
 
 LICENSE="icaclient"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 IUSE="l10n_de l10n_es l10n_fr l10n_ja l10n_zh-CN"
 RESTRICT="mirror strip userpriv fetch"
 
diff --git a/net-misc/ipv6calc/Manifest b/net-misc/ipv6calc/Manifest
index 4aad00952e5e..257994ca6571 100644
--- a/net-misc/ipv6calc/Manifest
+++ b/net-misc/ipv6calc/Manifest
@@ -1,5 +1,5 @@
 DIST ipv6calc-1.0.0.tar.gz 1342987 BLAKE2B 0c5a28b8431a82669870c475c5a73c239368f3486c9d16e66918a110937ec134d79f9b3ce79edffe65ab2789b36b7ac9ecd90e57f891759ba4542d608bcc5380 SHA512 46e33697551c4bf0a472c7f2dd51c11ae21d49c7d78fe5213bce60c1d11f9230491c328e425f36733c7262a369644bcedb8392ffe2279031eb2552092a5ac209
 DIST ipv6calc-2.1.0.tar.gz 1452903 BLAKE2B 52221e0ff08f6cffbf37900a750359b3e89fc7711ec0fc15b1dd974aa06a4e093ca53fb59e8d75e12824c60079bcefd9df5092365a375825fa9e2e583f0af6dd SHA512 b2ff8557a4af99e1d08b617b2d0a20652d23d80fb532104aefe3708c90fd42ed1309dc9697c7f405715140a2efdb460f4915b797fddf4a7966d165e74224695e
-EBUILD ipv6calc-1.0.0.ebuild 1506 BLAKE2B e1c0db4b5904351ba98a0b141dcd906836cce9eac0f81d20ab86bafe52b9101f9cef108dc6fb08b948d940e42001b74533cd2c9e0fbe7ca0c7aa02eac12211fe SHA512 4dd8479d8738b0ba7c0cb31462981715dec73f820c4c6fb2829693359944b32babbba53315d019d37290c7722da1f4b941927c6baefd8bbd927f200d72fea78f
-EBUILD ipv6calc-2.1.0.ebuild 1559 BLAKE2B 684d3ff677db62f49c19049e8450c791bb45cc3d7630aab914b94194449d4bfc6375d4d6c39aaa337c766fd99252f4fa88e07f043d03738df4a42eb506f22e66 SHA512 82dd0bbe8070ec2bc1070fe6680cd7745af241d7b59f20be4c7731e00eaa97aef852873f3c14e19c4cda7e865b8da04267e1a0ef3a18a2c0cd3f7cfaf9571c69
-MISC metadata.xml 252 BLAKE2B f6282e2a99df668246ea8570c72345463f06d282b6adc6d9de2a08ef0827cf4572332c580caa594aad5ba8e200870d8d25494549ee4413798025f0d885b61a68 SHA512 cbda7bf9832872764ae776ce16b2966c37a2ba3a1982d9817006fd6b82d7b17146434cde428bf114062a483e9053d2acdcdd004695e6ebf428d19cdc09937c65
+EBUILD ipv6calc-1.0.0.ebuild 1518 BLAKE2B a0e0d68cc77ba1e2ca7ad31376e1e8ea25635fb745d1f1eb4ebd0ed9284de22b186e9410ad29d161becc204ddb4cde373fb3c38236e7366bc540f5567c5b91fd SHA512 2be8ead786d648ca451417666e208ba257ad509c28549ab86c93d2340c7491c3cdf3d1edc823cb70a8afcba83dfb6aada50ee103e2d79a836ba89af5cb092653
+EBUILD ipv6calc-2.1.0.ebuild 1560 BLAKE2B 8a73501730d20b225119c0d227ff3719a71a99371f6f22d6fe9e0a9ea0771223cb87f3c172267195c5f6cbe8e778f6c0413b486be62f2e4c8be96d842322a08a SHA512 402dab6ebeffb0e8049aa34eb93604dce5854ab0bea95915411fe500f2be90b1273455fc5129660de5fd6529e6819abd2c09525014b94e31ec1ad0e8ed5dda00
+MISC metadata.xml 334 BLAKE2B 78e76af76293fbb24c7ad6bd4f884a67d449c26d4fd7b4ff220a324f5d421c51d56d53800b2116a02777e59c3d6f4a353823c3df31073c9676443c9816fadfe3 SHA512 ef70d2c2da48d173396b2dbb2e13104ca57e7c9ab81150c07c3c166604168984d37934815eb34a4e26c2cadbdbdcaea8983141c6eea6a36b26dfb4e89157ae6e
diff --git a/net-misc/ipv6calc/ipv6calc-1.0.0.ebuild b/net-misc/ipv6calc/ipv6calc-1.0.0.ebuild
index b0e61d909d24..995376c6640e 100644
--- a/net-misc/ipv6calc/ipv6calc-1.0.0.ebuild
+++ b/net-misc/ipv6calc/ipv6calc-1.0.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
 DESCRIPTION="IPv6 address calculator"
-HOMEPAGE="http://www.deepspace6.net/projects/ipv6calc.html"
-SRC_URI="ftp://ftp.bieringer.de/pub/linux/IPv6/ipv6calc/${P}.tar.gz"
+HOMEPAGE="https://www.deepspace6.net/projects/ipv6calc.html"
+SRC_URI="https://github.com/pbiering/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-misc/ipv6calc/ipv6calc-2.1.0.ebuild b/net-misc/ipv6calc/ipv6calc-2.1.0.ebuild
index 077b47c137f1..898a06fd0de2 100644
--- a/net-misc/ipv6calc/ipv6calc-2.1.0.ebuild
+++ b/net-misc/ipv6calc/ipv6calc-2.1.0.ebuild
@@ -4,7 +4,7 @@
 EAPI="7"
 
 DESCRIPTION="IPv6 address calculator"
-HOMEPAGE="http://www.deepspace6.net/projects/ipv6calc.html"
+HOMEPAGE="https://www.deepspace6.net/projects/ipv6calc.html"
 SRC_URI="https://github.com/pbiering/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/net-misc/ipv6calc/metadata.xml b/net-misc/ipv6calc/metadata.xml
index d920e3ba3e56..16255ab1a98b 100644
--- a/net-misc/ipv6calc/metadata.xml
+++ b/net-misc/ipv6calc/metadata.xml
@@ -5,4 +5,7 @@
 		<email>blueness@gentoo.org</email>
 		<name>Anthony G. Basile</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">pbiering/ipv6calc</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/istioctl/Manifest b/net-misc/istioctl/Manifest
index a6e9fea8cdb8..52e5fcc94ce2 100644
--- a/net-misc/istioctl/Manifest
+++ b/net-misc/istioctl/Manifest
@@ -1,5 +1,3 @@
-DIST istioctl-1.1.12.tar.gz 20720842 BLAKE2B c7b70ee162daabcf82cc8cbd8ec61d49b68189fcab43a1f04daa9dee6701075330557d2567cabae7f8fa37a2b3ebac23def53cca43930a9c1bf5079c15198f48 SHA512 a7aa37a2ec12b802d38a27cc4b6131ec604e14f0c64d2a3619f2918cc24cbf7bf0e291d58185e0481d544b28264f8782636abdca5afdacde6c3ad41ae616b90d
-DIST istioctl-1.1.8.tar.gz 20718514 BLAKE2B 20b492932906bab3d8fd2e66452acf42a3b8fc07bb42e95217410b32ede68f2dc4256f4e33b104428996a3cfa2f30c798ccf2cc3794079c8936d353330763c88 SHA512 907bff4a7239e0e615fcc3ea92c98d944916dc88c744d574b5362e622729e8fb5a79e549a7f0beece5235918d7891ef6283e6b1e3f789980450d7eee1e131e2b
-EBUILD istioctl-1.1.12.ebuild 848 BLAKE2B e78cd34eb328abb702bdd235049eb7287d094dace9c1c2a14f9a3009ee1bdad67bc873a4028b148ed1503eef79bda4215948d8dca62358617f1457a96a3fc3b4 SHA512 fe327960385a5e1e6c9ca5c76e24ad27eed95e37985f3fefd1c661ba54e8ba3c98cc569b04114afe8658a1cd37acb3174cbce66e6a324dcfa4904d12d10c028c
-EBUILD istioctl-1.1.8.ebuild 848 BLAKE2B 685fd155192b5f99a7f04ecde94b2cc0c019dad6ca36aacd6e427ae56c4df599e3364ea4b1b932ac8b09d3aeab8e506322e163837cc018611fc41bbf2cbaaa65 SHA512 2d7ec1b4e628855aa31efde1db7316ec9bb8829369f91ae0ae95cb0ef593573696332cca5cab2b2bab54fc0d78f32e46219ff10e04eacf9380a18cfe3e50acc1
+DIST istioctl-1.1.17.tar.gz 20765634 BLAKE2B e5192176312cbbd8b8f0ae46026909539df6c4784376a9e997b98d8147e7e9d4435ba97cbcb00880c99dc0ab2cd3ebbd4f385354c086f8a5fe71db57a8243802 SHA512 8d2057fbcb636f1fabc24a2f4c29b5426a9b68b0870a46ac9b5db6ea1f39336e5c1c7b13f040b346edbc35d1f359aacda1efd35b5417bd2ed90e693009cdda15
+EBUILD istioctl-1.1.17.ebuild 848 BLAKE2B 8ce6c940d9683ff2f74bd8a141ba9b862d029d27dd33d80a29aff9049dddf2ee182a3169c137cd773bd99994faa4006ca019633fca22389e4afe668b33c5bb33 SHA512 c8f03acca7628385c120294bf118537e0b24e129e73fed27328b1ed3d884c735d0e1b4b9a90810e097bc2c25a03aebfb6b7274d81165f515f26699ac5d996ae6
 MISC metadata.xml 321 BLAKE2B 46078d652e4352893c239c5e6b7d30a160f48b370f932357a5c2940c67ddae2f6c932ca6dd1b0b784b0e2a03a7649936ebe317dc95da5ad7a9acbd2e497a01d1 SHA512 cb45dda3fe092fbc1d18cdd21f44ad5cd89c51fee4e10aee6140bd66b25e46c9253672b8f36fe0ae6a83ff9a76c9b1bd35de59846abb9054b1f5095e33858d88
diff --git a/net-misc/istioctl/istioctl-1.1.12.ebuild b/net-misc/istioctl/istioctl-1.1.17.ebuild
index 40518fcd4c12..ce116f5676db 100644
--- a/net-misc/istioctl/istioctl-1.1.12.ebuild
+++ b/net-misc/istioctl/istioctl-1.1.17.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 inherit golang-vcs-snapshot
 
-GIT_COMMIT="473d9b3"
+GIT_COMMIT="149c2fc"
 
 KEYWORDS="~amd64"
 DESCRIPTION="Istio configuration command line utility"
diff --git a/net-misc/istioctl/istioctl-1.1.8.ebuild b/net-misc/istioctl/istioctl-1.1.8.ebuild
deleted file mode 100644
index bf2567f64cbf..000000000000
--- a/net-misc/istioctl/istioctl-1.1.8.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit golang-vcs-snapshot
-
-GIT_COMMIT="145b18a"
-
-KEYWORDS="~amd64"
-DESCRIPTION="Istio configuration command line utility"
-EGO_PN="istio.io/istio"
-HOMEPAGE="https://github.com/istio/istio"
-MY_PV=${PV/_/-}
-SRC_URI="https://github.com/istio/istio/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RESTRICT="test"
-
-src_compile() {
-	pushd "src/${EGO_PN}" || die
-	BUILDINFO="istio.io/istio/pkg/version.buildVersion=${PV}
-		istio.io/istio/pkg/version.buildGitRevision=${GIT_COMMIT}
-		istio.io/istio/pkg/version.buildStatus=Clean" \
-	VERBOSE=1 GOPATH="${WORKDIR}/${P}" TAG=${PV} emake istioctl
-	popd || die
-}
-
-src_install() {
-	dobin out/linux_amd64/release/${PN}
-	pushd "src/${EGO_PN}" || die
-	dodoc README.md
-}
diff --git a/net-misc/kea/Manifest b/net-misc/kea/Manifest
index 22ba40077e51..ef3df8deab84 100644
--- a/net-misc/kea/Manifest
+++ b/net-misc/kea/Manifest
@@ -2,7 +2,9 @@ AUX kea-confd 87 BLAKE2B 564c4c3b7e4d3b16ad03a7971b842e83f1d332a3fd9d5c63d3905b9
 AUX kea-initd 1814 BLAKE2B bf6383f4b8b7f2ef4c8603e3ae1783026753ab39cfa6fec61ae1095dcf08dc5438570fefbc35a087e5285ee6b9f424c1fd62153ef8355246c4cc9fb30bf61acb SHA512 7247df003b2083728f57dac0669b72de41c3c2838ccf601198eca84c2e605efe088d091b6a78fa8cf2705514b7307178914225d209ab8fcc450d63a1951abd31
 DIST kea-1.6.0.tar.gz 7154301 BLAKE2B b05bd6cbf53140e10da2614917d2f314a048035f1ba5b33bc260166d203c3c99c1aa6438f886569aa5a809f705572096834dbb0ccea67eee1a93c1ed61fc0d9c SHA512 09e670996ad3dbfc523ad7639e3cfd43147bf370069cec80a6ba6af4c45264f33318594a20073f1c5d75bd19bcaa275e3167b243e13c5a6c151c10d634f338af
 DIST kea-1.7.0.tar.gz 7155043 BLAKE2B 8d4e218a769089fbea98578289eadc4dd012c39c4513528cceb5f69dc07e622be8636b4ff8325eb38db2e8e301326172d50dc23f56ca401b55cb9e0c5016e618 SHA512 70fb303ee528d8c5611f723cdf0f68d7dbbda061ee963a3f5d6ec0396a986cdc36370dec48bd6483fbe9acb551b53ad377ea1be6cea0a97456db4352bc162d06
+DIST kea-1.7.1.tar.gz 7203950 BLAKE2B 40684401e39a5e95dfa1b6d899fe8c6a9e3418a65d3314215b287bb9898324a52b296292c7bdd11cfdb4d1d2f7f7c15c26a3f7999269672272486240f2d7cc28 SHA512 7c8ff3fb0bb53fcccf406660ad50593afa5f03328889c03791f6ac28dd41fbbec2094071d786f03b5cac96f887b48c5cca5c1d10a8922a1027279726458522d1
 EBUILD kea-1.6.0.ebuild 1750 BLAKE2B a4d18a5a46923bddac174ed443d03c838cd6d6bbc253683a890f921ff11683ba2566fcbaf18d6004505132e738da9f54fd2dcda2d0df666707337339c76fb52a SHA512 64c24cf23105b94a1df01bcac4ed3fbb8a70c4ea2507becfa58a75e9951161ac3280a8e62b261b532fec733fb30185c9169b0dc2e66fc7c2c6295d8d56c0d588
 EBUILD kea-1.7.0.ebuild 1751 BLAKE2B b7583dec6559db10ca04aa42e0403d5e13aea1378eb173df28ac0b9a7fc4ea55d21466bce11b7176398422d9e947facb65621766eea9cdeed79df61a4304e355 SHA512 c33b772170d0eb59e33fb0fb68cdb75cb75c4df0199de2769aea5ffb0c62f75ad5c0d870580d8ab4359f254c50910889d3aa0fb7d6d3e6badbdd8ee13ab3c9a2
+EBUILD kea-1.7.1.ebuild 1751 BLAKE2B b7583dec6559db10ca04aa42e0403d5e13aea1378eb173df28ac0b9a7fc4ea55d21466bce11b7176398422d9e947facb65621766eea9cdeed79df61a4304e355 SHA512 c33b772170d0eb59e33fb0fb68cdb75cb75c4df0199de2769aea5ffb0c62f75ad5c0d870580d8ab4359f254c50910889d3aa0fb7d6d3e6badbdd8ee13ab3c9a2
 EBUILD kea-9999.ebuild 1751 BLAKE2B b7583dec6559db10ca04aa42e0403d5e13aea1378eb173df28ac0b9a7fc4ea55d21466bce11b7176398422d9e947facb65621766eea9cdeed79df61a4304e355 SHA512 c33b772170d0eb59e33fb0fb68cdb75cb75c4df0199de2769aea5ffb0c62f75ad5c0d870580d8ab4359f254c50910889d3aa0fb7d6d3e6badbdd8ee13ab3c9a2
 MISC metadata.xml 522 BLAKE2B bef1cd45abb947d0273e3ff4898930f9301af1a002e2f041eda4af09c7d8fab0f226498071fe8c8db6732d16427990cd580cc49f119d0258dad29e875299d7da SHA512 f879683f8d58f4367e72d623b95915257218926405e83baae3ef1610dba2c14c347f23157c2d99835663409b14ff909e586eba53b4455de763afc36a38fb8975
diff --git a/net-misc/kea/kea-1.7.1.ebuild b/net-misc/kea/kea-1.7.1.ebuild
new file mode 100644
index 000000000000..c915fee4402e
--- /dev/null
+++ b/net-misc/kea/kea-1.7.1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs user
+
+MY_PV="${PV//_p/-P}"
+MY_PV="${MY_PV/_/-}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="High-performance production grade DHCPv4 & DHCPv6 server"
+HOMEPAGE="http://www.isc.org/kea/"
+if [[ ${PV} = 9999* ]] ; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/isc-projects/kea.git"
+else
+	SRC_URI="ftp://ftp.isc.org/isc/kea/${MY_P}.tar.gz
+		ftp://ftp.isc.org/isc/kea/${MY_PV}/${MY_P}.tar.gz"
+	[[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="ISC BSD SSLeay GPL-2" # GPL-2 only for init script
+SLOT="0"
+IUSE="mysql +openssl postgres samples"
+
+DEPEND="
+	dev-libs/boost:=
+	dev-cpp/gtest
+	dev-libs/log4cplus
+	mysql? ( dev-db/mysql-connector-c )
+	!openssl? ( dev-libs/botan:2= )
+	openssl? ( dev-libs/openssl:0= )
+	postgres? ( dev-db/postgresql:* )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+	[[ ${PV} = *9999 ]] && eautoreconf
+	# Brand the version with Gentoo
+	sed -i \
+		-e "/VERSION=/s:'$: Gentoo-${PR}':" \
+		configure || die
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-static
+		--enable-perfdhcp
+		--localstatedir="${EPREFIX}/var"
+		--without-werror
+		$(use_with mysql)
+		$(use_with openssl)
+		$(use_with postgres pgsql)
+		$(use_enable samples install-configurations)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	newconfd "${FILESDIR}"/${PN}-confd ${PN}
+	newinitd "${FILESDIR}"/${PN}-initd ${PN}
+	keepdir /var/{lib,run}/${PN} /var/log
+	find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die
+}
+
+pkg_preinst() {
+	enewgroup dhcp
+	enewuser dhcp -1 -1 /var/lib/dhcp dhcp
+}
diff --git a/net-misc/memcached/Manifest b/net-misc/memcached/Manifest
index 640aa96fb50f..a1ca53ee9c95 100644
--- a/net-misc/memcached/Manifest
+++ b/net-misc/memcached/Manifest
@@ -6,11 +6,7 @@ AUX memcached.confd 872 BLAKE2B d57dfb6da370f5e980b9e7143323a6cf51fecea802e5d034
 AUX memcached.init2 2205 BLAKE2B d27dbf6fb4d72ec49ff89cb3957770a25afe467c96c05648e75dddea47cdacee09d073e138e72d3b8671c3538e2005049dcd05440083b03e25136b3fd206c4d9 SHA512 b7b68362a4e4b24e9db893b85c3959184d17ea0bf8346a38561235461cfc8c94cf6d546f1c31bbe34bb7ca3409db2209171dd08214d5f057d00c65885663992a
 AUX memcached.service 273 BLAKE2B bfe217d2ec7fd9aead468f4f5b100843287a49bef163dd106349f3275acbffaca60e09c8b723a566a96065d8208eb52f44f7c3ad24a8aaf3980471e8d0478b77 SHA512 647f06160142c5e38e4009203609bf2152dd1bdd4b94be9e2bf3c5741e631419fc9cf300575a65a905956eec916d736c4e3b3d3e3c80438f1b33cd10fe4dcd95
 DIST memcached-1.5.14.tar.gz 485076 BLAKE2B 729b4b708e921184bfedadbb02b0304eb09dcebbbd1420605deb608dcd7dea25a8982ca0f387f237a1a6412b4682372018c593396ef9bff5aa0fa901c0fdafd6 SHA512 d06083d971d0a40195b4dfb252a3bf7c3a0d20b2dcad56726ff9e0b87ba84024309300516dad40181f1b7af4d9c4f35924383977c5e1ff9b5f13d2ef05f684ed
-DIST memcached-1.5.17.tar.gz 490891 BLAKE2B a971083ec29452755de953537ff9c23fc872496d4746420c9c20e91c226481bd3818c00495cb7a5d85f2bd38683061e57a9e92cbfe0e4cd28bcafde37f05cabf SHA512 533c916015d738ff4c7ba8420654ae15b19370b3e959b89d43bc60cae1bda65d36906be05fad44a025ea1878570a8c1a36041c4e4c0cdf0cea84e6bb0e7ba325
-DIST memcached-1.5.18.tar.gz 502185 BLAKE2B a138dd2178906607fb75e76fa9806e41fe284cefd57a1be6b49f64ae4d3fd972c6996f1dedc161871e02271c9d3c42fbb4c957426f24c100f6024327fa03ba41 SHA512 00d12a97b6ae00814735491b31d1390a8dd15c99e971ae99547e70bf6b343023b88d6e26bb8404dea5f8636f26688e71cd39d8612d06902285b9be91786f9931
 DIST memcached-1.5.19.tar.gz 517380 BLAKE2B 8c6e7c87e786d88c783da87396daec9deb0c9f8c4112fa7cec6d79e8e96505576c2b7f3dff91317a3f45582322cfdb435535a41bb537b0a0bfec9df6f8d5986f SHA512 4445f383e18ffc53071c13b495c3864978658f4f6f439ab4579dd831fc12ad4850e04e9526954608ae627b0b23a9d6cb327560f02d15abff23e12f5d7c1723b4
 EBUILD memcached-1.5.14.ebuild 2902 BLAKE2B ac9d561fc47ca13f81329356c6df5b4e8a01d9455523d2f76ec59dc72f988c0a419419f20ee6554e43b47256f9ee575f8d6b003c55a31456ac0980049fcd04d4 SHA512 40d6050f2d55fbe1f3aa44813d3838d7bc6f7b8450b28812b560d71fc3ff5d2c3d091add8561832109c2675c91eb0947126f29e693fa08972e3a03a77840c12e
-EBUILD memcached-1.5.17.ebuild 2910 BLAKE2B 45f2b2f38071fbac8b3136504cb867ce0bc3ff88f07a16ac345a9c6e1e25b911d2a444a205f724cbf99cdc01d12c9f91b0bc59ea3cec3f7fc20b59d6eb3892cd SHA512 eea0bfb868eb713e062903928d3a3a6994d4aaa6ef655ccdd040f124d992ef7e85008ab96c44e4f563bc97ffd8c742d6efb85780962a245d0b76d65daf9c4cae
-EBUILD memcached-1.5.18.ebuild 2912 BLAKE2B 5e92d52481f8513af0f9e4f8a706626a169893b54cd0e50d90769dca712733291ffd8f752ea88d3758f29ed1dd8b38ebeb5b2bcc456cbaf81882cb1f99bafa0b SHA512 88178683bb649b2c06b021e1e6a26bf38eff9d48ca7841308929dfb1f658e55e6d58c0ba8813ac4bff39bc3bfd3ebb2ba8ec41c6dfa2d7cd853f83d87a422056
-EBUILD memcached-1.5.19.ebuild 2912 BLAKE2B 5e92d52481f8513af0f9e4f8a706626a169893b54cd0e50d90769dca712733291ffd8f752ea88d3758f29ed1dd8b38ebeb5b2bcc456cbaf81882cb1f99bafa0b SHA512 88178683bb649b2c06b021e1e6a26bf38eff9d48ca7841308929dfb1f658e55e6d58c0ba8813ac4bff39bc3bfd3ebb2ba8ec41c6dfa2d7cd853f83d87a422056
+EBUILD memcached-1.5.19.ebuild 2910 BLAKE2B 45f2b2f38071fbac8b3136504cb867ce0bc3ff88f07a16ac345a9c6e1e25b911d2a444a205f724cbf99cdc01d12c9f91b0bc59ea3cec3f7fc20b59d6eb3892cd SHA512 eea0bfb868eb713e062903928d3a3a6994d4aaa6ef655ccdd040f124d992ef7e85008ab96c44e4f563bc97ffd8c742d6efb85780962a245d0b76d65daf9c4cae
 MISC metadata.xml 1134 BLAKE2B 3313deb6a6fda71074f08e202dcd43b53fcd4ab9af50b78b84aac67309f3c2a4a966f874c9d8f5c4688542e6fe03d4e2f7b3f854842638210ab64fc35bcdab30 SHA512 c3ce23016f9ea9067f6628f246866e3fcee6624f1a21360e448c7eebc3babd8fa3717966e58eeb0b6fd9885730609fa732a3e10b0a4dfaa57b0f0acc85c20bb4
diff --git a/net-misc/memcached/memcached-1.5.17.ebuild b/net-misc/memcached/memcached-1.5.17.ebuild
deleted file mode 100644
index c2d8ac61d125..000000000000
--- a/net-misc/memcached/memcached-1.5.17.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils flag-o-matic systemd user
-
-MY_PV="${PV/_rc/-rc}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="High-performance, distributed memory object caching system"
-HOMEPAGE="http://memcached.org/"
-SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz
-	https://www.memcached.org/files/old/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="debug sasl seccomp selinux slabs-reassign test" # hugetlbfs later
-
-RDEPEND=">=dev-libs/libevent-1.4:=
-	dev-lang/perl
-	sasl? ( dev-libs/cyrus-sasl )
-	seccomp? ( sys-libs/libseccomp )
-	selinux? ( sec-policy/selinux-memcached )"
-DEPEND="${RDEPEND}
-		test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.2.2-fbsd.patch"
-	epatch "${FILESDIR}/${PN}-1.4.0-fix-as-needed-linking.patch"
-	epatch "${FILESDIR}/${PN}-1.4.4-as-needed.patch"
-	epatch "${FILESDIR}/${PN}-1.4.17-EWOULDBLOCK.patch"
-	sed -i -e 's,-Werror,,g' configure.ac || die
-	sed -i -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,' configure.ac || die
-	eautoreconf
-	use slabs-reassign && append-flags -DALLOW_SLABS_REASSIGN
-
-	# Tweak upstream systemd unit to use Gentoo variables/envfile.
-	# As noted by bug #587440
-	sed -i -e '/^ExecStart/{
-			s,{USER},{MEMCACHED_RUNAS},g;
-			s,{CACHESIZE},{MEMUSAGE},g;
-			s,OPTIONS,MISC_OPTS,g;
-		};
-		/Environment=/{s,OPTIONS,MISC_OPTS,g;};
-		/EnvironmentFile=/{s,/sysconfig/,/conf.d/,g;};
-		' \
-		"${S}"/scripts/memcached.service
-	default
-}
-
-src_configure() {
-	econf \
-		--disable-docs \
-		$(use_enable sasl)
-	# The xml2rfc tool to build the additional docs requires TCL :-(
-	# `use_enable doc docs`
-}
-
-src_compile() {
-	# There is a heavy degree of per-object compile flags
-	# Users do NOT know better than upstream. Trying to compile the testapp and
-	# the -debug version with -DNDEBUG _WILL_ fail.
-	append-flags -UNDEBUG -pthread
-	emake testapp memcached-debug CFLAGS="${CFLAGS}"
-	filter-flags -UNDEBUG
-	emake
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dobin scripts/memcached-tool
-	use debug && dobin memcached-debug
-
-	dodoc AUTHORS ChangeLog NEWS README.md doc/{CONTRIBUTORS,*.txt}
-
-	newconfd "${FILESDIR}/memcached.confd" memcached
-	newinitd "${FILESDIR}/memcached.init2" memcached
-	systemd_dounit "${S}/scripts/memcached.service"
-}
-
-pkg_postinst() {
-	enewuser memcached -1 -1 /dev/null daemon
-
-	elog "With this version of Memcached Gentoo now supports multiple instances."
-	elog "To enable this you should create a symlink in /etc/init.d/ for each instance"
-	elog "to /etc/init.d/memcached and create the matching conf files in /etc/conf.d/"
-	elog "Please see Gentoo bug #122246 for more info"
-}
-
-src_test() {
-	emake -j1 test
-}
diff --git a/net-misc/memcached/memcached-1.5.18.ebuild b/net-misc/memcached/memcached-1.5.18.ebuild
deleted file mode 100644
index e16d121a5c35..000000000000
--- a/net-misc/memcached/memcached-1.5.18.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils flag-o-matic systemd user
-
-MY_PV="${PV/_rc/-rc}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="High-performance, distributed memory object caching system"
-HOMEPAGE="http://memcached.org/"
-SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz
-	https://www.memcached.org/files/old/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="debug sasl seccomp selinux slabs-reassign test" # hugetlbfs later
-
-RDEPEND=">=dev-libs/libevent-1.4:=
-	dev-lang/perl
-	sasl? ( dev-libs/cyrus-sasl )
-	seccomp? ( sys-libs/libseccomp )
-	selinux? ( sec-policy/selinux-memcached )"
-DEPEND="${RDEPEND}
-		test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.2.2-fbsd.patch"
-	epatch "${FILESDIR}/${PN}-1.4.0-fix-as-needed-linking.patch"
-	epatch "${FILESDIR}/${PN}-1.4.4-as-needed.patch"
-	epatch "${FILESDIR}/${PN}-1.4.17-EWOULDBLOCK.patch"
-	sed -i -e 's,-Werror,,g' configure.ac || die
-	sed -i -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,' configure.ac || die
-	eautoreconf
-	use slabs-reassign && append-flags -DALLOW_SLABS_REASSIGN
-
-	# Tweak upstream systemd unit to use Gentoo variables/envfile.
-	# As noted by bug #587440
-	sed -i -e '/^ExecStart/{
-			s,{USER},{MEMCACHED_RUNAS},g;
-			s,{CACHESIZE},{MEMUSAGE},g;
-			s,OPTIONS,MISC_OPTS,g;
-		};
-		/Environment=/{s,OPTIONS,MISC_OPTS,g;};
-		/EnvironmentFile=/{s,/sysconfig/,/conf.d/,g;};
-		' \
-		"${S}"/scripts/memcached.service
-	default
-}
-
-src_configure() {
-	econf \
-		--disable-docs \
-		$(use_enable sasl)
-	# The xml2rfc tool to build the additional docs requires TCL :-(
-	# `use_enable doc docs`
-}
-
-src_compile() {
-	# There is a heavy degree of per-object compile flags
-	# Users do NOT know better than upstream. Trying to compile the testapp and
-	# the -debug version with -DNDEBUG _WILL_ fail.
-	append-flags -UNDEBUG -pthread
-	emake testapp memcached-debug CFLAGS="${CFLAGS}"
-	filter-flags -UNDEBUG
-	emake
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dobin scripts/memcached-tool
-	use debug && dobin memcached-debug
-
-	dodoc AUTHORS ChangeLog NEWS README.md doc/{CONTRIBUTORS,*.txt}
-
-	newconfd "${FILESDIR}/memcached.confd" memcached
-	newinitd "${FILESDIR}/memcached.init2" memcached
-	systemd_dounit "${S}/scripts/memcached.service"
-}
-
-pkg_postinst() {
-	enewuser memcached -1 -1 /dev/null daemon
-
-	elog "With this version of Memcached Gentoo now supports multiple instances."
-	elog "To enable this you should create a symlink in /etc/init.d/ for each instance"
-	elog "to /etc/init.d/memcached and create the matching conf files in /etc/conf.d/"
-	elog "Please see Gentoo bug #122246 for more info"
-}
-
-src_test() {
-	emake -j1 test
-}
diff --git a/net-misc/memcached/memcached-1.5.19.ebuild b/net-misc/memcached/memcached-1.5.19.ebuild
index e16d121a5c35..c2d8ac61d125 100644
--- a/net-misc/memcached/memcached-1.5.19.ebuild
+++ b/net-misc/memcached/memcached-1.5.19.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug sasl seccomp selinux slabs-reassign test" # hugetlbfs later
 
 RDEPEND=">=dev-libs/libevent-1.4:=
diff --git a/net-misc/mikutter/Manifest b/net-misc/mikutter/Manifest
index 8a579a9444f0..addb60c2a35b 100644
--- a/net-misc/mikutter/Manifest
+++ b/net-misc/mikutter/Manifest
@@ -1,8 +1,6 @@
 AUX mikutter 136 BLAKE2B ba1a252d63dc3a190f61ad3f0489ac7222a90d48dc01cdaadb24f02d870ef64d0fd20b5c913f8469b590ab4b961accfcb14b7b7d7fa1542fbf0b938dac35024d SHA512 bae3b58b6983c7ad6e0c10f006f4338eb0923b1056b6f74f518a1b3caeeef7c414f8de8dd927420611ae8542dde8507f1c25ca0529e7cd3a17f6ac8fc25e16b0
-DIST mikutter.3.5.4.tar.gz 3743674 BLAKE2B af166219af2a36e84c4e13209830d12be6e085e6c76fa101c265c40bc85d465f50f56311783b647f10ec0021450fd45ca411643e7612e8225df6c9e75ac83be1 SHA512 adb7a1902026ee01737840d0b7f9004ab363e874e01f7c497bd9252fccb3cc16f86f1959bb2eff3d309cb7ba1fa93376d9a1e46d5226859a1279069de7f2ba8e
 DIST mikutter.3.8.6.tar.gz 3174454 BLAKE2B 3fc3802ae840fc310f1b9abd51c560fb804b57aad6bf78bd1e3b8046a42dc785c8a454de722a5e57d499bda15884a255da50d3919a1c5bbcd9e5753948d45f46 SHA512 102c25263df804fd005928ac8605ca4d115040c0e3bd13a09e73bac5b1a4ddedff92b45ac38c54692bf388b5ac8ea422a0b5c42851bb3616c74991943f1cd98f
 DIST twitter_api_keys.rb 336 BLAKE2B 9b134fb9169f96c99582d1ceffe39cfa1675b6e747a8a46f6123cbff73b7e255e59aba3f6cf247decc9824244947d260658011b5aa72a915d50565e797e31703 SHA512 39efeed878f763101329c781fb501c5b5df848e4ae3c1f6bcdf3e6b151c5d647c68127f906eccf7861466d2ff88e7f1bdc27065205ed91a80e9cdc89fa5152e4
-EBUILD mikutter-3.5.4-r1.ebuild 1629 BLAKE2B 1fefca3c2d9e10e7e6df2e8bb557a3aa1df3bf2834a0ba9658a93f09409a636d5c6b778e8dff230e79134f17e019dd4931c2cc42de313ef3cac5545a77595a9b SHA512 99bf96b72853df0af06cc3fcb445fe12d7cc836764dcbac960ee0ab992f6a772378c791ce5d6f7baf0d7a595365b2cbbc0c949d632a0bc13ad528b3259a84403
 EBUILD mikutter-3.8.6.ebuild 2838 BLAKE2B b683e9128ea872a2768e771f85163bda44dfdfdee45f56fb7eaf1c7ed962b3139df8c2447e6271566c82a0461a7457e8b67f2631554cabd7bf47ed8a451fb00f SHA512 633ea75970bd249bad849ecbab1efdce6e2494aad74dd54c2bf9964a157208b088161f00b08af7f5b4ee50bb17f772b266ab86d166c9b2d7393efe436f6474a4
 EBUILD mikutter-9999.ebuild 2838 BLAKE2B b683e9128ea872a2768e771f85163bda44dfdfdee45f56fb7eaf1c7ed962b3139df8c2447e6271566c82a0461a7457e8b67f2631554cabd7bf47ed8a451fb00f SHA512 633ea75970bd249bad849ecbab1efdce6e2494aad74dd54c2bf9964a157208b088161f00b08af7f5b4ee50bb17f772b266ab86d166c9b2d7393efe436f6474a4
 MISC metadata.xml 214 BLAKE2B 8c736c7fcedf2d2c712e43cb3a7850254057fca17f9ec3647598d76e726cd4eea542ce40b339abb3f96a56b17a3f355d9508a5980dd7c7e243bbc19b68a6a5b7 SHA512 3950e95b95a325c58612d9c601ee4c59714d0387574f31bc8ac8eb35305082413aebe00435aeca391fe8dc72a0901aef3ee68ee0da10a14e88908ae766d637c3
diff --git a/net-misc/mikutter/mikutter-3.5.4-r1.ebuild b/net-misc/mikutter/mikutter-3.5.4-r1.ebuild
deleted file mode 100644
index 3e15d01d0712..000000000000
--- a/net-misc/mikutter/mikutter-3.5.4-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby23 ruby24"
-
-inherit eutils ruby-ng
-
-if [ "${PV}" = "9999" ]; then
-	EGIT_REPO_URI="git://toshia.dip.jp/mikutter.git"
-	inherit git-2
-	KEYWORDS=""
-	EGIT_SOURCEDIR="${WORKDIR}/all"
-else
-	MY_P="${PN}.${PV}"
-	SRC_URI="http://mikutter.hachune.net/bin/${MY_P}.tar.gz"
-	KEYWORDS="~amd64"
-	RUBY_S="${PN}"
-fi
-
-DESCRIPTION="Simple, powerful and moeful twitter client"
-HOMEPAGE="http://mikutter.hachune.net/"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="+libnotify"
-
-DEPEND=""
-RDEPEND="
-	libnotify? ( x11-libs/libnotify )
-	media-sound/alsa-utils"
-
-ruby_add_rdepend "dev-ruby/addressable
-	dev-ruby/delayer
-	dev-ruby/delayer-deferred
-	dev-ruby/httpclient
-	dev-ruby/json:0
-	dev-ruby/instance_storage
-	<dev-ruby/memoist-0.16
-	>=dev-ruby/moneta-0.7
-	dev-ruby/nokogiri
-	>=dev-ruby/oauth-0.5.1
-	dev-ruby/pluggaloid
-	dev-ruby/rcairo
-	>=dev-ruby/ruby-gettext-3.0.1
-	>=dev-ruby/ruby-gtk2-3.1.1
-	dev-ruby/ruby-hmac
-	dev-ruby/totoridipjp
-	dev-ruby/twitter-text
-	dev-ruby/typed-array
-	virtual/ruby-ssl"
-
-all_ruby_unpack() {
-	if [ "${PV}" = "9999" ];then
-		git-2_src_unpack
-	else
-		default
-	fi
-}
-
-each_ruby_install() {
-	local rubyversion
-
-	if use ruby_targets_ruby23; then
-		rubyversion=ruby23
-	elif use ruby_targets_ruby22; then
-		rubyversion=ruby22
-	fi
-
-	exeinto /usr/share/mikutter
-	doexe mikutter.rb
-	insinto /usr/share/mikutter
-	doins -r core plugin
-	sed -e "s/ruby19/${rubyversion}/" "${FILESDIR}"/mikutter \
-		| newbin - mikutter
-	dodoc README
-	make_desktop_entry mikutter Mikutter \
-		/usr/share/mikutter/core/skin/data/icon.png
-}
diff --git a/net-misc/modemmanager/Manifest b/net-misc/modemmanager/Manifest
index 1f65707a71d1..685e66f6f89b 100644
--- a/net-misc/modemmanager/Manifest
+++ b/net-misc/modemmanager/Manifest
@@ -1,6 +1,6 @@
 AUX 01-org.freedesktop.ModemManager1.rules 293 BLAKE2B 56c4edb97cf97328a71f569625cbb6bb0be236fe8c612d8cf83da0f6bb8cf0064b9159cc88197f8dcd42f718bb50e796461639e1c9793c79f576d8fc6ee18a26 SHA512 1839bd770dfaf4c85048a16e41389c7ef43fac1cd36b81cf9129877444db1e0bc00cdbd2344b577316858f13a103d6007be6467d19de075060cab78c40859460
 DIST ModemManager-1.10.0.tar.xz 2201468 BLAKE2B 4a572feba7d62269ed9d6066565e1b7d41db3bece5d450796ee18f43a9a91a886f76dfe0db4887c9ca13643f72f4460c93b3dd2ae7643eb4c37b01905a3ff3c4 SHA512 676b11892b284c2da587895e71903f80ec96978c66eafae5e2d90e5c0f1dae18e50efc68b704c7907f01f208d585f5a8140316cf83e093df3f782c80949c33bc
 DIST ModemManager-1.8.2.tar.xz 2088248 BLAKE2B e53ec3dacac2b1d57191de0eba130ea575a40047e5faa1c813543f1ca17164d71a18478ec6c0392adabea94d2455ee510ceceefc16798fec6f26ec834ebbf84c SHA512 fb00ce6f3dc9795468e81ba295ad82e9586add2d7118661ea5f287a99afca97dc3aea64488393792bb1198e7abf2605bbc5ded2517980d67f8819931effdeea5
-EBUILD modemmanager-1.10.0.ebuild 3665 BLAKE2B d91a7604aaf597bc6f25c4a4db6122cf8f83cdc0ad0352e52542459ee9db7e199c226952e9953b399f2689f75dd9ed4a06518f3ff35df848ed1b28b40e4196ab SHA512 e9f25dbd713a28a8281e6f1c01ae91e1e07155358e64408ccaccd79cab51bdfb2957c0c42bc854cff0ce79baf8e74e1a49a041bcd3accb7dc3555da55d898269
-EBUILD modemmanager-1.8.2-r1.ebuild 3659 BLAKE2B 6ef3bbe4362f5432ba5366051f512b036f74fa349b457deb2ca24fab4e308dea6d2a66afaef79eb233436950698e6f15b0f549b64c6464a24546c280535abb45 SHA512 4cc03cfc6776aa6a716fed0773a6e35d013fecc1925a093ecce31d01e37bc02d70bc8d3b47377becdb984e35fe7d81989bf6c1c05785656ff1f42624d0c796f3
+EBUILD modemmanager-1.10.0.ebuild 3666 BLAKE2B 23145c8af5d9a895e52c5f90a2cb5f244cb660a9a50ef431061e11ab55f39e5fce04c7a20d5e770f60ef2029a7ae5aef9b50a5b81599be6b43d1035f7413d4e4 SHA512 0b46581a5bb841c09661fb55b8254f355011c8a28274f6eec4ee92a3b7c1d8ad6a63f916a346e036e6ea18dcef928980970563d4a66f486f2c535f10207ea6c8
+EBUILD modemmanager-1.8.2-r1.ebuild 3660 BLAKE2B 95ab23bf54720d3d15886437fe74c42c6b847d3b8310d84de4188dc901671855dba4be3ebd22ce94aec93bce215161a2267c69d9c4b3d26ea946844dedc679c0 SHA512 ef13e13c227cd257647f13cc6f15f8909602eaef328f9f5095e295ab9b69718511f44e7be1ad63b3a027d5caf3ba4464457a21ca7e96ebf451c1f0e34f82c50f
 MISC metadata.xml 431 BLAKE2B 26bfa60702d5e90e5eaf6ca1cc6e734486014870951cbc2fd3e2fa37383f0918604d0e388be1589ed6dd5f36396c499ba011f42fc00f608522f21c736c8205b2 SHA512 dd79c43f378b564769087531ce871d7daf0b07d15720b375e9f3114e5794c692c19ac4d3cfa5b041e88cbf3dca78bf51de9dee861aba3f717eb77248a4d8edde
diff --git a/net-misc/modemmanager/modemmanager-1.10.0.ebuild b/net-misc/modemmanager/modemmanager-1.10.0.ebuild
index 3f68591007d6..b5e1e657cfc8 100644
--- a/net-misc/modemmanager/modemmanager-1.10.0.ebuild
+++ b/net-misc/modemmanager/modemmanager-1.10.0.ebuild
@@ -23,7 +23,7 @@ REQUIRED_USE="
 
 RDEPEND="
 	>=dev-libs/glib-2.36.0:2
-	udev? ( >=virtual/libgudev-230:= )
+	udev? ( >=dev-libs/libgudev-230:= )
 	introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
 	mbim? ( >=net-libs/libmbim-1.18.0 )
 	policykit? ( >=sys-auth/polkit-0.106[introspection] )
diff --git a/net-misc/modemmanager/modemmanager-1.8.2-r1.ebuild b/net-misc/modemmanager/modemmanager-1.8.2-r1.ebuild
index 7457b97ba8a4..1e50b9f22e50 100644
--- a/net-misc/modemmanager/modemmanager-1.8.2-r1.ebuild
+++ b/net-misc/modemmanager/modemmanager-1.8.2-r1.ebuild
@@ -23,7 +23,7 @@ REQUIRED_USE="
 
 RDEPEND="
 	>=dev-libs/glib-2.36.0:2
-	udev? ( >=virtual/libgudev-230:= )
+	udev? ( >=dev-libs/libgudev-230:= )
 	introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
 	mbim? ( >=net-libs/libmbim-1.16.0 )
 	policykit? ( >=sys-auth/polkit-0.106[introspection] )
diff --git a/net-misc/netdate/Manifest b/net-misc/netdate/Manifest
index 5a9c188516fc..344ff1c2121f 100644
--- a/net-misc/netdate/Manifest
+++ b/net-misc/netdate/Manifest
@@ -1,4 +1,3 @@
 DIST netdate-1.2.tar.bz2 7516 BLAKE2B b044f8294716a5660cab8c77cc9bfccf0f606a89f8b4d73d93a760f69bcdb4e48aaad7b6c0fbf7a22468e1f3aa1f026647159270456a989d9df65c3af458e3db SHA512 a6c3dde42dfb886a01a137485b1a52f4cfb00150bec3a9603a7475405cecd621c5604fe66e2d3e4fd50feee18ac9d60423231a377fc5629e465530b16b0ce918
-EBUILD netdate-1.2-r1.ebuild 478 BLAKE2B afeeb46b24fddb2967d0148595abc1b9f18f76364cd31e9153de80d7209c36607012d4353a570317345dd929b39f3e14647a0cc7980fe3bdcf25c321bb7841be SHA512 78da5f89b214847a3b3190e4dd638c38162a407234ab3e296a7b94b8e4867ae3d52548355f15308534e4ef66d64f007622d179a06b23e048f124113a520efd16
-EBUILD netdate-1.2.ebuild 535 BLAKE2B 14074500c0cba9682841812a42e15252f50c53a20bc78a2c3df337e186d58cc2046b8235d387449b8f32f07c82d96444c630baecfc94f5489ad7ff720f2c65b0 SHA512 fb43df0792b2e7e30cc45b7b6192fdbe67b26ec5dd00f6442ae683c20af89633ca4f803e1e71bb8488dd5c6643c826ea44b6a10db9bc438f67c4df60803e1383
+EBUILD netdate-1.2-r1.ebuild 476 BLAKE2B 67e8471dc38d62bdbd837c1e3a3655dda7fe785c243706566dec63134df7e7ec6aa3d7dc724611c6fbba0539abaf7b1b48cc3b25980e612f09dad8db4168e2ea SHA512 9f9ccb6349632ac4c48426c99f8e381f10ca9c160e93f733a3537c0161dc6c83d015962c78343df420327e56ad1e65a5c3ba0333701dc04a70377ec38e27ade9
 MISC metadata.xml 216 BLAKE2B 20531789dc11e43feee7ec315a0c1c7249fdf73764e29cb7d6db439826e9ff72f24a5cdb8eb7f1ab99bbb41fb6e4226874a1d1fa4185de52598602bb3b0479a3 SHA512 e881b59fe49746eb25ad66c258b41aba501e4eb563129093a3898ea970a20506e7898f7c355cfcf99605234962bf2c77c1309c258b9a2b84ee4302ccb71c9dbd
diff --git a/net-misc/netdate/netdate-1.2-r1.ebuild b/net-misc/netdate/netdate-1.2-r1.ebuild
index 5d6c96c935bd..6e61ada26064 100644
--- a/net-misc/netdate/netdate-1.2-r1.ebuild
+++ b/net-misc/netdate/netdate-1.2-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="ftp://ftp.suse.com/pub/people/kukuk/ipv6/${P}.tar.bz2"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~mips s390 ~sh sparc x86"
+KEYWORDS="amd64 arm ~mips s390 sh sparc x86"
 
 S="${WORKDIR}/${PN}"
 
diff --git a/net-misc/netdate/netdate-1.2.ebuild b/net-misc/netdate/netdate-1.2.ebuild
deleted file mode 100644
index 3ce61d63e484..000000000000
--- a/net-misc/netdate/netdate-1.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="A Utility to synchronize the time with ntp-servers"
-HOMEPAGE="ftp://ftp.suse.com/pub/people/kukuk/ipv6/"
-SRC_URI="ftp://ftp.suse.com/pub/people/kukuk/ipv6/${P}.tar.bz2"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips s390 sh sparc x86"
-IUSE=""
-
-DEPEND=""
-
-S=${WORKDIR}/${PN}
-
-src_compile() {
-	emake || die "make failed"
-}
-
-src_install() {
-	dobin netdate || die
-	doman netdate.8
-	dodoc README
-}
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index 2a3681766353..727744dc948c 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -2,8 +2,9 @@ AUX 01-org.freedesktop.NetworkManager.settings.modify.system.rules 265 BLAKE2B 0
 AUX 10-openrc-status-r4 1182 BLAKE2B ab6f3e8340c3c53f5df667395489071c42320040a90356c94bca15c45a4d66c5e3e0870a17cda6531a98adee4ec92ca886f9be298765f1afbca864786abb495e SHA512 b1f0cd7eaeb13af9ab1ce192fd3f47e52d505c4ad5a0888af1ad2598701a034231c03f5346441f44443daca84f2089cb68e08c2876396be0e668c484c3d331ec
 AUX conf.d.NetworkManager 230 BLAKE2B 987b6b39c6c8b14a788575241575f9a0761f320117ad8c70ff084e88f3282c2d384f49042beecdbf876a534e49d26b9ff8e385cd2f301a056a0ba3c45d5e04fc SHA512 f8c9331834cbc66ab0e4e6f4a120fde6a08a435d680a1e1087718fdbb2b9843a313e7ec30b7008822999dafd98e152aa7d2a96f87320ba9c91c3adb63e0b7c9a
 AUX init.d.NetworkManager-r1 1822 BLAKE2B 81479268fc38412150ff480753f9be609c3d11448f645c24d24e5280eb547a3c56fe991e454c968365330d33c622466cb1140cfd0e15811a904623c33742611a SHA512 a8356480592ec5e818b390b83cb258248d64850748e9e485bed68befabf067219d02fda137ee63684e0cd2c0e4f5fca30f94f8db71f811149183ff4715159658
+AUX networkmanager-data-fix-the-ID_NET_DRIVER-udev-rule.patch 1350 BLAKE2B 4cffb7d29c1ffdff7106485e2fe1a74ec403c8b9cb5235a066021fd91d0231aef7b9f621cd82706e58adbe27085d13600a651f5957e6a20f3ca241af483cf88c SHA512 f541c873f097b8424e04fdc0fb2ca6256a3e17cb60021f1c931908ff39bbf95de3e40975ea62b19c18aa35476a5f7e07fc96135a0fb0bc1128acc5b62724bd3e
 DIST NetworkManager-1.18.2.tar.xz 4872252 BLAKE2B 8a3fa74837a6cf2a09af807b9bd164c949d31efb81fc212485f49e24f0a215ff06db10c4259712f6c51d7480bda1b53457bf50bda9b2df8330891e8c8ba394c8 SHA512 a220d856632693298af0bd23ae4393ee597684fcae400c8ed35bae5e543bcdbd0b0e879f4a7587b674ae86c5fdfbee955acd0fb6226cb95ed31372cb7c222814
 DIST NetworkManager-1.18.4.tar.xz 4875196 BLAKE2B 9c58d6d7317562332dfa9639f8e236a0a7f6b58e7dad5af83916b1c6178899a6bcf12bc289fb401d84fd6420306364b4c4c0a25eda2a08eef812acde1862a18a SHA512 9fd22775a400ee8d20c75ebddfee842bfbd8780966444dd537e371a65918f41640e921d2c441853afe8f72d693e9b4c1415435136a07004666a6af4799fd3350
-EBUILD networkmanager-1.18.2.ebuild 11121 BLAKE2B 1599674ae5a7eba5a71051cb407389426861ebe5028fa495bc069a2cd7e0921d380356b3a9a648dc4f83c3a2c86edf88cc945ab986a29c6c45346f646597d8cc SHA512 00ae391ff577b8b0c74db9ff0603e54a643c9f3eeb462266f413470bfdc7744bfb460bdbd4ce8555428202529be909578760dbbce46362a2d24854eca9cb356f
-EBUILD networkmanager-1.18.4.ebuild 11127 BLAKE2B 532483e642985d46835b81de8804d97063c6de3c11e2182bd13212180ab665dbb63c9e718c8bbd642bc8e70f472b4fea0a2bbb37650cdfbb786e721200389e96 SHA512 587506654b147eb04378ae37f3ceb66c756612b13ddb03419a05fae1689c4c41c0e72f40ba62b7dc9a883ceef4fb8440e4d67237478ef3e9558270d517f1b721
+EBUILD networkmanager-1.18.2.ebuild 11217 BLAKE2B d5190b2531fc5aa165091829e2c31ee0eea3b54c6aaa561aba45fe01e3f6eefe1b34ed5ad00bdc7d770138c2aa2637de0594b92585cd1724526882fec3cbc2eb SHA512 d0f729c1b70ec7da5fc648951fda0a790a3bc2a6105c0dc88f2d25c68f5e4fd833e809197a6c6008a3d6e74bfa6742c66e305d4328421315deb59201a95bd9e6
+EBUILD networkmanager-1.18.4-r1.ebuild 11300 BLAKE2B 1fcce945d90dc1cf95f27b8263b4f479bd9f2b78f6a542ef7fd0b4c6cb803fe48ec2e25ce7b1735eee69e3ae3c612bdd87acba58acec5f716f192b2301c6fcca SHA512 69415e44ac4fc19b276d1e07755c11e10d373f15ad718dd9ec7fe81e6ab3f3e4c05f3e75295f2e41e2581bf5b21bc7886ec159e375be1bea84f3ba67aa33c39a
 MISC metadata.xml 2024 BLAKE2B afcda61aaa575f102f68affb5cf6a5f419262df83a8d488a29c6a07fe60f17ca36f82f1c89c95ee709766046266ac21e06314ea017271ae63c38f1729c789e30 SHA512 e79b229a5b96f81c79de4e4336d3f5cc19ccf3d9ebff180757f3e6da95f5dc21da17d82e93d5dbff1c44f7e4b4ee4b182cf6dc8df6dd7cc15d26b85309d9bcd0
diff --git a/net-misc/networkmanager/files/networkmanager-data-fix-the-ID_NET_DRIVER-udev-rule.patch b/net-misc/networkmanager/files/networkmanager-data-fix-the-ID_NET_DRIVER-udev-rule.patch
new file mode 100644
index 000000000000..1b94ab478d8b
--- /dev/null
+++ b/net-misc/networkmanager/files/networkmanager-data-fix-the-ID_NET_DRIVER-udev-rule.patch
@@ -0,0 +1,33 @@
+From 27d380b70ea839c7badab420361e4e65e023e8e9 Mon Sep 17 00:00:00 2001
+From: Lubomir Rintel <lkundrak@v3.sk>
+Date: Fri, 16 Aug 2019 13:22:09 +0200
+Subject: [PATCH] data: fix the ID_NET_DRIVER udev rule
+
+Systemd v243 is complaining about the wrong substitution there. That is
+sort of harmless, because systemd-udevd in that version doesn't need the
+rule anyway. But still fix it, to avoid a warning.
+
+Also, newer udevd's $PATH doesn't include sbin. That is also okay,
+because we don't need the rule to actually work there. But fix it
+anyway.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1740655
+---
+ data/84-nm-drivers.rules | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/data/84-nm-drivers.rules b/data/84-nm-drivers.rules
+index d246ef6ce..e398cb9f2 100644
+--- a/data/84-nm-drivers.rules
++++ b/data/84-nm-drivers.rules
+@@ -7,6 +7,6 @@ ACTION!="add|change", GOTO="nm_drivers_end"
+ # Determine ID_NET_DRIVER if there's no ID_NET_DRIVER or DRIVERS (old udev?)
+ ENV{ID_NET_DRIVER}=="?*", GOTO="nm_drivers_end"
+ DRIVERS=="?*", GOTO="nm_drivers_end"
+-PROGRAM="/bin/sh -c 'ethtool -i $1 | sed -n s/^driver:\ //p' -- $env{INTERFACE}", RESULT=="?*", ENV{ID_NET_DRIVER}="%c"
++PROGRAM="/bin/sh -c '/usr/sbin/ethtool -i $$1 |/usr/bin/sed -n s/^driver:\ //p' -- $env{INTERFACE}", ENV{ID_NET_DRIVER}="%c"
+ 
+ LABEL="nm_drivers_end"
+-- 
+2.21.0
+
diff --git a/net-misc/networkmanager/networkmanager-1.18.2.ebuild b/net-misc/networkmanager/networkmanager-1.18.2.ebuild
index 4342ec029bab..2c4f15a72ad4 100644
--- a/net-misc/networkmanager/networkmanager-1.18.2.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.18.2.ebuild
@@ -139,7 +139,11 @@ pkg_pretend() {
 
 pkg_setup() {
 	if use connection-sharing; then
-		CONFIG_CHECK="~NF_NAT ~NF_NAT_MASQUERADE"
+		if kernel_is lt 5 1; then
+			CONFIG_CHECK="~NF_NAT_IPV4 ~NF_NAT_MASQUERADE_IPV4"
+		else
+			CONFIG_CHECK="~NF_NAT ~NF_NAT_MASQUERADE"
+		fi
 		linux-info_pkg_setup
 	fi
 	if use introspection || use test; then
diff --git a/net-misc/networkmanager/networkmanager-1.18.4.ebuild b/net-misc/networkmanager/networkmanager-1.18.4-r1.ebuild
index 79e755a86569..349e1bbb84c9 100644
--- a/net-misc/networkmanager/networkmanager-1.18.4.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.18.4-r1.ebuild
@@ -101,6 +101,10 @@ DEPEND="${COMMON_DEPEND}
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-data-fix-the-ID_NET_DRIVER-udev-rule.patch
+)
+
 python_check_deps() {
 	if use introspection; then
 		has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
@@ -139,7 +143,11 @@ pkg_pretend() {
 
 pkg_setup() {
 	if use connection-sharing; then
-		CONFIG_CHECK="~NF_NAT ~NF_NAT_MASQUERADE"
+		if kernel_is lt 5 1; then
+			CONFIG_CHECK="~NF_NAT_IPV4 ~NF_NAT_MASQUERADE_IPV4"
+		else
+			CONFIG_CHECK="~NF_NAT ~NF_NAT_MASQUERADE"
+		fi
 		linux-info_pkg_setup
 	fi
 	if use introspection || use test; then
diff --git a/net-misc/nextcloud-client/Manifest b/net-misc/nextcloud-client/Manifest
index 8c70f8f338b8..db345476a672 100644
--- a/net-misc/nextcloud-client/Manifest
+++ b/net-misc/nextcloud-client/Manifest
@@ -1,5 +1,5 @@
 DIST nextcloud-client-2.5.2.tar.gz 18995992 BLAKE2B 6ad23962d327c1feeec34f59092021f7f82f4baeaf973fac0572db55cb03bc8ba2ed0c5037bcbfa80ca057d3976aaf6e402e129f2ec963b3a9c432330ef6aaf3 SHA512 1000b420355d7a4104ca5b41e813d467dcb345b60c79c78ce532de9c58ea89cad10d5565a433409bd512f0f7771c18c7c27974b968c74f84ccfda1ed3510d3ae
 DIST nextcloud-client-2.6.0.tar.gz 18789917 BLAKE2B db5c703ecf630a96c141c9c8a7b15894c5a679e1b36217f38a02cd55307fadb5ea19c13ab44371fbbcf0610ddafdd2fb0c1ef6119db04808b94a72dbfb27da9a SHA512 161733540de85c436e204b150fb91b527737fee213e569335248ce7c6e1446497aad5e3fa814b3f98a1ec0cdb94fad64ccc0807eb953a94170f9d40abb478545
-EBUILD nextcloud-client-2.5.2.ebuild 2006 BLAKE2B 2e5da149dd376fef452c36eb7279ce4a0e7832219d5edc25f823bc691b2d5c37c838b148c2affef9854532625292a99282cfdfe073cc6e6ea3e0f9d67a7a6bfc SHA512 cdc60ee671e822eef98ec463382afe43997a0f220f7bde50cb0a20940131c4262384ccc767db2e5dcb86c7ba86eed1b7f80508764530569a122a648a9c0f83a7
+EBUILD nextcloud-client-2.5.2.ebuild 2004 BLAKE2B bf10f233d3d41a8aeefef7c8c14fd996b75dacd66daa79573ae391896704397fc448b7c85ce3047372bf1fe02938aee85d0a9e85287e4e7fb1ab99a6c8a92df2 SHA512 b10fe3a2a696763d6ea390966b3597efd76da7c88d1b98a757031a47ea9762f9fa02d762ce337c142a723ec8ed4bf81dec59c78c73ffc3127a8d235c5c7b64a5
 EBUILD nextcloud-client-2.6.0.ebuild 1997 BLAKE2B 93dcb863a801307fc378326d0d3027e23b6db25d70cadd8c58d5a5cc5a17d4847f8018574823a933b634c76b2018590a64083ef12cc7b4384d1d0e8701c1739b SHA512 39367dad554bbf6a6d062dc1f85474b931d6a92d099957f0322ec100eaa540c925574afefbd69407a007509bf2f0ba2960065aafe61d5538d2f5c86b48e21a0b
 MISC metadata.xml 590 BLAKE2B 6ddde648f1b75a5ac3b83ff6b24cdef05b016052257dc99d152db249b029c88854a2b44a2d5a5e7a2b87b9148dbb677fa5bf12066c7f59a9ef5812bdbd57964b SHA512 27f8098bbdec79e03007513d2f4bd6799a399fc5930871542eedf3d018a13cacc1c4dfa23f9c78275c8e5a61830b1b6d4ebe667e3a4ff42541581d5287e940b4
diff --git a/net-misc/nextcloud-client/nextcloud-client-2.5.2.ebuild b/net-misc/nextcloud-client/nextcloud-client-2.5.2.ebuild
index fed415b280bb..ec0ad38c8fec 100644
--- a/net-misc/nextcloud-client/nextcloud-client-2.5.2.ebuild
+++ b/net-misc/nextcloud-client/nextcloud-client-2.5.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/nextcloud/desktop/archive/v${PV/_/-}.tar.gz -> ${P}.
 
 LICENSE="CC-BY-3.0 GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="doc dolphin nautilus shibboleth test"
 
 COMMON_DEPEND=">=dev-db/sqlite-3.4:3
diff --git a/net-misc/npapi-sdk/Manifest b/net-misc/npapi-sdk/Manifest
index 8b20479b77e9..c99d6c7288bc 100644
--- a/net-misc/npapi-sdk/Manifest
+++ b/net-misc/npapi-sdk/Manifest
@@ -1,4 +1,4 @@
 DIST npapi-sdk-0.27.2.tar.bz2 65811 BLAKE2B 7f746f077bb87ef8de31499cc3ba0f0c15197ebd9da7891096ecb368d66ca2a7a54fc2b27e7ecc78e942c74e1623b09ca1d39df8f4fbb0843a5cc0ab98b9caa9 SHA512 827d52fbc8eb601ac0e486aed267b1ca6cb8732c92f1224f4b38e039288b77d07d47c5d4cf384a3114403b85e7f086f345912f1b20b41d27785c9bb367514842
 EBUILD npapi-sdk-0.27.2.ebuild 415 BLAKE2B f72288c34f3828f2f58ab4c955b1265c2c1e9c28191a280297492887e8e0cc181f9524568d90570bc32f18d5d05337245f9cb220de5b44248ab5462098b428b6 SHA512 3ab904ff87f507bf07ee1febe0aaa3b708fade6f5f4aef1a7d0b283a2806b5f966eb159bd16e676ad6ae6de88044edf4fa14d54538d2bf8823c79949242c37de
 EBUILD npapi-sdk-9999.ebuild 577 BLAKE2B 09a4a13d1cb6ee4563d9b227297afbffa72735c108a5553729aeee260a7776262e4f1a5ee33e707a7d4c6965483e7cd65e42a1c1f948c421cded9a7d29eef0e8 SHA512 aba465072a130b85c1257d6e769a3cae53ca63fc2d06180e7befb2013dd3f2e97f955124e81ea0255102505fe09360324b33928965d55ea6370d05d8a17e50bb
-MISC metadata.xml 554 BLAKE2B 59d5b3ef0386ace117d29123793e45f78d3dd8998069a25341c9f56fce1438cd1d5af3fafd84cffd09c6c956496fc493ac0e3af4d010e63e3a01788cbc125f8c SHA512 f64e6e5dcb310e3529ccee303071fe765de9dc1df0230969b654a11e0df90ce011cb6c999151db0e913f4fbaa2b5456395c32fe08ac50885dd92762da7d9e2bb
+MISC metadata.xml 446 BLAKE2B e07f9be14637daae4d18800ea41e81cb184807ec5b1ba3aabcc969305abff9ec92726cf2be5ff3a2e52e280d9bfd6d93d086f9acd6e8bce9f133e5df3c3be970 SHA512 10be832423bb894889549683ab994b00cbca688a6f38cd3b34f66fb955ed4c9ca1bfff6e5cff02083aeea860d3d0223d7ce63c446b9ba03e265a4bdca414cc13
diff --git a/net-misc/npapi-sdk/metadata.xml b/net-misc/npapi-sdk/metadata.xml
index 1df7a04f2cb5..cc6d3e382c6a 100644
--- a/net-misc/npapi-sdk/metadata.xml
+++ b/net-misc/npapi-sdk/metadata.xml
@@ -5,10 +5,6 @@
 		<email>mgorny@gentoo.org</email>
 		<name>Michał Górny</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>anarchy@gentoo.org</email>
-		<name>Jory A. Pratt</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>mozilla@gentoo.org</email>
 		<name>Gentoo Mozilla Team</name>
diff --git a/net-misc/ntpsec/Manifest b/net-misc/ntpsec/Manifest
index 459d2d8fc3f8..f4bf2f7d347f 100644
--- a/net-misc/ntpsec/Manifest
+++ b/net-misc/ntpsec/Manifest
@@ -1,4 +1,5 @@
 AUX ntp.conf 727 BLAKE2B 1b37cee807c41593ffc44994e390c98406c49154477bc2a603ba4037308ac1e3c83fc49700c1c0d6ee2e3f274dcb76bc13bfaeefdc9cd533a56cef9454ee27eb SHA512 5b55618b870e436b2160e46ede5e1b8031dab368d72bf376a6a9664f1cb528ae37e10eedeb7d438fee8155e3c50139ac240af95a14215aebbfef3133f3b68694
+AUX ntpd-r1.service 597 BLAKE2B a1185493452a57f3b7b8c506bedecca93dc7e92b7ce6a817792f812a5cb6d035fb7a13398aa5b1259f88d57d88d0b0cca2931019a2baefea820dcb8cfdb40cc6 SHA512 e7052fbc5f369f13497f365b91b5f6d154c2024bc535b226d650851c0f0ff843c6fda4ea7c1f47adce86c8acffb6c4ad679f6e8f344fff9e94920d415d4837f3
 AUX ntpd.confd 90 BLAKE2B 980ea88c97b1deff65f53c13410fe46bc1e19a80140776002ae2fdc0a3ad18c9855b74a70f1a89eb31854bbdad6729753c3a199cddb25b58178a79a0ea0a7050 SHA512 a2fdf88f6f55bcf0a6545db77817e3a740dba50bf56b4fdd80d335e8c909d0880fbd962041754d7f5fb3946ed131d9a739ec72008bacab9f1f47ff82dc74c542
 AUX ntpd.rc-r2 484 BLAKE2B 826a3ee09486d912525fe6d44b967e25d8b31485d89a80987afcf459ea335058ff8a7835f3931017505aad6c5ba60e546b608ce26a51ad38f5972675d0a47559 SHA512 dc89a58edf6f83878d42522a015f2c3e12db9505ea3d6bc4b04e6e82947a7be6e8d143e8808bb58644641dd754744fd4be20c8b944a4261b460c30b95436fc31
 AUX ntpd.service 299 BLAKE2B 307dbf3a8569cdd1d54095bdb9b409986a9de3c7ec98405b4544f1df565828da2b685ce408061bc03f9a7991fbd61a9b42577c4e6db06bd2a4a012949cafe2dc SHA512 b625e993bbeba5da9c0f14ec8ff9d256575d9590a6c506436e834a9dc17877bfd57920b008bd01409d47de71acfb221a0d92c0203e2aacca33083e196466faf9
@@ -8,6 +9,6 @@ DIST ntpsec-1.1.6.tar.gz 2600632 BLAKE2B 1ee3e266f9a0ff45fc8f001a2b5a1722c6acf75
 DIST ntpsec-1.1.7.tar.gz 2534524 BLAKE2B 5777ecca4ceb988632fadc0e7124530993a7758cdf335e8cd90f0ec1a8b643be89b67c0e2bf49d6d7193bf92ded138af0df4b5856c0d113f552ef22dd8a6cadf SHA512 734b12820539e655e504dd5071a58b9d1f80c0b0c3c7458c797ba7ada23d8e446751fbcbddd9832d9151a3ba9464749878db9e77e23cdd5f6215ab9e1d908ae9
 EBUILD ntpsec-1.1.4.ebuild 4130 BLAKE2B c14e7e7d1bf4d4f840b9e555cfe13b967824901ce1b5dc021be0fb9d0cdb53a358e1e73037bab9e251400238d99a9f2fac69c48232df2d8c49bf105927b363c5 SHA512 a40332b0d7621e905099dbffe43e336a8b32e842d888c15eac07e87de9bc89cedf23eef2e04681704a8011b84965b9a6c294eba7dfb5df5b10883b973e322984
 EBUILD ntpsec-1.1.6.ebuild 4088 BLAKE2B 80075131dd2cae62f97508c4e54e51a89c819616f487e7e3d63103d3deef03ad7e5fe09742a2230a30d8d817061da0551eb15cb802d9f2bddcfadb88868ae427 SHA512 728819a43dc5bfa8815cec23deeeeb81f5a54cc3d9c870b1d6050970225aa643fb19165e6dc9d5ae051ed40e3bdaaf9fc41aced473a193c576e8c4ff4525b885
-EBUILD ntpsec-1.1.7.ebuild 4118 BLAKE2B 1a3868de0faa65eef3d194b34d7d135cf830a0d60a507cc7a2c46e1fc6d540682c06f70f3e0d258f8e3166d03dc3453d0a828e30504579242777d6c7b601633d SHA512 11258a2ede28b442101a415d21691c9188dbd589be4d2c7989b22ef91cc5cf71ad9e050e27ce92f55c779b09948bc0ffb8f414eae4356727ca8525f95193c225
-EBUILD ntpsec-9999.ebuild 4088 BLAKE2B 80075131dd2cae62f97508c4e54e51a89c819616f487e7e3d63103d3deef03ad7e5fe09742a2230a30d8d817061da0551eb15cb802d9f2bddcfadb88868ae427 SHA512 728819a43dc5bfa8815cec23deeeeb81f5a54cc3d9c870b1d6050970225aa643fb19165e6dc9d5ae051ed40e3bdaaf9fc41aced473a193c576e8c4ff4525b885
+EBUILD ntpsec-1.1.7-r1.ebuild 4125 BLAKE2B 24648c76c7fe5e49b49ffcef95064f1b8f127b8471d29d6c25e581bb33f9d6ef7421455d4499d057419b7d5c57419c3feb6c69b9626729b8ed6f08abbf826311 SHA512 0d6e3f1163c696992add8430c316ee4398018115b4d18238f1266dd0c852fb649de317e5518ae0d0a31f13375e87976f82d7478529baf5ce811c656981d6007c
+EBUILD ntpsec-9999.ebuild 4091 BLAKE2B d776a2bdd01b332e0946b36a2958af3a75fecf452017a8dbc109b929f8ee5d42974f9ca147f4030dbe7dc11a7b4c1d3122e35b5cde75a247e02f0b0bfc5ce139 SHA512 b1ee562a25162b9dc7a753fe2fede321973e50ec6d1e623d9949917b120b8c05d6915443796128537149a8da3bf78d041e7ad551b7329132cbe34d6b09897d9e
 MISC metadata.xml 2078 BLAKE2B c15f3c9143653044f1da8fdf1e36298df819a6266ca369c511a9d4247cf32d93377b26f4898070c60d59b4737581b22b27a1097de38c314ec03cc908a18a31d3 SHA512 691f4b463d437616d897d979538e20726eda0a4835f3209639ef0ae7ecbcea6fd01c7bfd1849b91bfdd37e71b8306daa07cf6223a08848c7e45f8128135fa6fc
diff --git a/net-misc/ntpsec/files/ntpd-r1.service b/net-misc/ntpsec/files/ntpd-r1.service
new file mode 100644
index 000000000000..5da473805aa0
--- /dev/null
+++ b/net-misc/ntpsec/files/ntpd-r1.service
@@ -0,0 +1,19 @@
+[Unit]
+Description=Network Time Service
+After=network.target nss-lookup.target
+Conflicts=systemd-timesyncd.service
+
+[Service]
+Type=forking
+PrivateTmp=true
+EnvironmentFile=-/etc/conf.d/ntp
+ExecStart=/usr/sbin/ntpd ${NTPD_OPTS}
+# Specifying -g on the command line allows ntpd to make large adjustments to
+# the clock on boot.  However, if Restart=yes is set, a malicious (or broken)
+# server could send the incorrect time, trip the panic threshold, and when
+# ntpd restarts, serve it the incorrect time (which would be accepted).
+Restart=no
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-misc/ntpsec/ntpsec-1.1.7.ebuild b/net-misc/ntpsec/ntpsec-1.1.7-r1.ebuild
index e5bf13be3bed..1ef2fda749d3 100644
--- a/net-misc/ntpsec/ntpsec-1.1.7.ebuild
+++ b/net-misc/ntpsec/ntpsec-1.1.7-r1.ebuild
@@ -12,12 +12,12 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://gitlab.com/NTPsec/ntpsec.git"
 	BDEPEND=""
-	KEYWORDS=""
+	KEYWORDS="amd64"
 else
 	SRC_URI="ftp://ftp.ntpsec.org/pub/releases/${PN}-${PV}.tar.gz"
 	RESTRICT="mirror"
 	BDEPEND=""
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~x86"
 fi
 
 DESCRIPTION="The NTP reference implementation, refactored"
@@ -132,7 +132,7 @@ src_install() {
 	newconfd "${FILESDIR}"/ntpd.confd ntp
 
 	# Install the systemd unit file
-	systemd_newunit "${FILESDIR}"/ntpd.service ntpd.service
+	systemd_newunit "${FILESDIR}"/ntpd-r1.service ntpd.service
 
 	# Prepare a directory for the ntp.drift file
 	mkdir -pv "${ED}"/var/lib/ntp
diff --git a/net-misc/ntpsec/ntpsec-9999.ebuild b/net-misc/ntpsec/ntpsec-9999.ebuild
index 7cc6f74f6d34..050f701b387d 100644
--- a/net-misc/ntpsec/ntpsec-9999.ebuild
+++ b/net-misc/ntpsec/ntpsec-9999.ebuild
@@ -131,7 +131,7 @@ src_install() {
 	newconfd "${FILESDIR}"/ntpd.confd ntp
 
 	# Install the systemd unit file
-	systemd_newunit "${FILESDIR}"/ntpd.service ntpd.service
+	systemd_newunit "${FILESDIR}"/ntpd-r1.service ntpd.service
 
 	# Prepare a directory for the ntp.drift file
 	mkdir -pv "${ED}"/var/lib/ntp
diff --git a/net-misc/ofono/Manifest b/net-misc/ofono/Manifest
index 661af4712480..8ebd7ce693e2 100644
--- a/net-misc/ofono/Manifest
+++ b/net-misc/ofono/Manifest
@@ -2,7 +2,9 @@ AUX ofono.initd 418 BLAKE2B 0a0f8894ec52b7213e46c8a1474f1a6061324f6e31842910e241
 DIST ofono-1.16.tar.xz 854296 BLAKE2B 4ee8f895e21903b8181fe14f5a91fea466eb3a2f66c8a5ab270a8dd81c601dc5e2a1beae368cf0f14b556f0dfb8301439d40d93bfd1d058d43ce864cdd1f0788 SHA512 21887e1bc3b8af18881f9456f950b97885b567164e28ebe2ab6fc5a3042c439891a20b5034a8fa0c7a78567286ac53c1b8a72122f428fbcf5da8bf139423b913
 DIST ofono-1.28.tar.xz 1016308 BLAKE2B 0aec5bc6c845c0906548f62bda95bfee5ca5ef17bc2defd60fe4b0967b9f58fcbbbfeb9593aa33f6852360266ea4ea025a87a07ac95ef50829b592accfb5bc72 SHA512 963471fac89db746d0e99fee805413342203be0d200bc14f0e56c5ec3053e25ea8112943657c88c57c539ae485ac11eb5f80052aad12443c248888f6e6a4114e
 DIST ofono-1.29.tar.xz 1019512 BLAKE2B e073f324c58fee1beac31ba685d92ee85814ccb072aaedc0fa2d0d25419d60449557fcabd0e1b3e5aad6c349582a2abe6fb69094f36b61dbea0f94ed0f8dff4e SHA512 14c3cd3a7ee134dd85f286e3ce47914a10c48a9a2bbbebd0d2715334f233a9b7e4e01bae5a151e4f4b3fb3e98eab96ba345f3fb2c2960d2f9c0645f36c218a99
+DIST ofono-1.30.tar.xz 1030428 BLAKE2B 94248b7eb7b48000333fdee38eaecf13c259adf2ca71946a25c06463abc052c568974981b0116ef5e006a6bd9f106a0bf2a5d2b1f9ad06beaffceff6cb3bbde4 SHA512 e65c5af7f09eef31c1e8c2b8202315b1bfeeb18e6e3cca07e3758ee693e51f8d8007211cba9e0da17656b063f362858a51234908c89a2bfd1ef0e057d538bda5
 EBUILD ofono-1.16.ebuild 1624 BLAKE2B 1948438d3150f5cdc848ce72c10fcd70105d1854bec2f0e941d5eb24aaf869826e6e7de8b7b46c92d4f9a5a56a537baacaecce29d406abf1302964b4ab46a2e7 SHA512 fafe6075e7c1abb6b513c0a09620c61ce8e1472b6972d69ec23bfc652b7b63d2e983affe67bad31a5160e885e40576d3c67230e4f67ab0c989714ece954457bd
 EBUILD ofono-1.28.ebuild 1642 BLAKE2B 4588c877b0dbeb2eb46d65b6e0eaee6bbe2d55f6d9bebe272346fd925bcda89909fd18db0e641962b4de28a1b5e319a8bf17adc2ac07033d94cee43fa4221bec SHA512 f5eeb1ec9a0df58193fc1cf260155af8ea5cc4a1a69451051df31cb9d8ecd68ab64e66dcc949831c0d99173e62bf18cc1f50f5f705254d2fa803a19d1e462784
 EBUILD ofono-1.29.ebuild 1642 BLAKE2B 4588c877b0dbeb2eb46d65b6e0eaee6bbe2d55f6d9bebe272346fd925bcda89909fd18db0e641962b4de28a1b5e319a8bf17adc2ac07033d94cee43fa4221bec SHA512 f5eeb1ec9a0df58193fc1cf260155af8ea5cc4a1a69451051df31cb9d8ecd68ab64e66dcc949831c0d99173e62bf18cc1f50f5f705254d2fa803a19d1e462784
+EBUILD ofono-1.30.ebuild 1642 BLAKE2B 4588c877b0dbeb2eb46d65b6e0eaee6bbe2d55f6d9bebe272346fd925bcda89909fd18db0e641962b4de28a1b5e319a8bf17adc2ac07033d94cee43fa4221bec SHA512 f5eeb1ec9a0df58193fc1cf260155af8ea5cc4a1a69451051df31cb9d8ecd68ab64e66dcc949831c0d99173e62bf18cc1f50f5f705254d2fa803a19d1e462784
 MISC metadata.xml 951 BLAKE2B fd63ccff3b96dea1e770b7ec50c1a9e5e583fe81bcb2ca9c1915386a4fbd85a30c806f9ac3e163b1110e93b44f6714c555cee9273ecf90d5a9f9e209f0774897 SHA512 26f8b8b3ac43991d14534b4b1257a5c4dc1dd0eaca83c9f30aab74bbc721d9573e93e8f245a4ac2d0805ea9325aa759ca144951fef1b158b0b68f54df4df3e7e
diff --git a/net-misc/ofono/ofono-1.30.ebuild b/net-misc/ofono/ofono-1.30.ebuild
new file mode 100644
index 000000000000..406ed49a7a36
--- /dev/null
+++ b/net-misc/ofono/ofono-1.30.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils multilib systemd
+
+DESCRIPTION="Open Source mobile telephony (GSM/UMTS) daemon"
+HOMEPAGE="https://01.org/ofono"
+SRC_URI="https://www.kernel.org/pub/linux/network/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+atmodem bluetooth +cdmamodem +datafiles doc dundee examples +isimodem +phonesim +provision +qmimodem tools +udev upower"
+
+REQUIRED_USE="dundee? ( bluetooth )"
+
+RDEPEND=">=sys-apps/dbus-1.4
+	>=dev-libs/glib-2.32
+	net-misc/mobile-broadband-provider-info
+	bluetooth? ( >=net-wireless/bluez-4.99 )
+	udev? ( virtual/udev )
+	examples? ( dev-python/dbus-python )
+	tools? ( virtual/libusb:1 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=( ChangeLog AUTHORS )
+
+src_configure() {
+	econf \
+		$(use_enable udev) \
+		$(use_enable isimodem) \
+		$(use_enable atmodem) \
+		$(use_enable cdmamodem) \
+		$(use_enable datafiles) \
+		$(use_enable dundee) \
+		$(use_enable bluetooth) \
+		$(use_enable phonesim) \
+		$(use_enable provision) \
+		$(use_enable qmimodem) \
+		$(use_enable tools) \
+		$(use_enable examples test) \
+		$(use_enable upower) \
+		--disable-maintainer-mode \
+		--disable-rilmodem
+		--localstatedir=/var \
+		--with-systemdunitdir="$(systemd_get_systemunitdir)"
+}
+
+src_install() {
+	default
+
+	if use tools ; then
+		dobin tools/auto-enable \
+			tools/huawei-audio \
+			tools/lookup-provider-name \
+			tools/lookup-apn \
+			tools/get-location \
+			tools/tty-redirector
+	fi
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	use doc && dodoc doc/*.txt
+}
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index 900ed083938d..e4925b010dec 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -35,6 +35,8 @@ AUX openssh-8.0_p1-hpn-glue.patch 7029 BLAKE2B cf6fb2c59b768aecf846f0d037ae6d48f
 AUX openssh-8.0_p1-hpn-version.patch 590 BLAKE2B 1ff20ab17e7e1a20f7a96ded56ff7c059fd509d7773d9abaeac83743102385d9713284c630dc932d40672a9bfc8a894b57c6b073e93a7b024de7490ea54a589c SHA512 37250881f17a44e4a4b0ac164d06961e0731528847d5cbbb263e3f9a286a192c8dae92250b85db3f2e1f280a464c7b3bfc8a7c9e85552375c013e16a6fcf28ed
 AUX openssh-8.0_p1-tests.patch 1493 BLAKE2B 2e28d9f27d6d9f7e1716cf5f85bbb92af96faf8842e0047d79262a36f5273cd9252bfc576a22e4fc5523942eb7dea80d968045fea317e523d430373c59160ed0 SHA512 1f191076d3199b33e4cfa66e901d086dba32d7ee620c6dfa3bdaa7c9cba8e98d36b7f27d2f2dca7eb8d2549da37dd4b3638e392d8dbd9c36cb4a9ba09a45043f
 AUX openssh-8.1_p1-GSSAPI-dns.patch 11639 BLAKE2B 2bc9e618c0acbf6b85496a33055894471235d01f20b76c9b75302dce58c7d6033984c8471789d2f8095d6231f5f271a4eb2f6099936b1631ec261464bc7a3ada SHA512 722a769da482876f0629e110109f02065e47848ff79395e9e64de39ae066d8c5a207f849c59d95b72e70b874f4bedf4e52a2f7ad1752d9c84b99ccdbfa19c73d
+AUX openssh-8.1_p1-X509-12.3-tests.patch 405 BLAKE2B 1a1c29fea98c4ce277c943709576b5130a573e9786a33c957229d74d0e572ca6e5d0dce68b5b515b5c3f44862f1f4dafe2dad1cd3d3710ca415137f8a4013b86 SHA512 0e80b79d3aa8b7e89cf250b31e6bbc2471990b9a2c0ab8b54e6af4c3de77adff3dc6db83f4f14524f830455b5ce4d586f630d33b4ac4b134d1028e325ab351b3
+AUX openssh-8.1_p1-X509-glue-12.3.patch 1613 BLAKE2B aef1de72da18a2af0fae1793eed5baa1be2af9f26a522e6772f43f1053d263f154db76cf0ebe3ddebbfd9798ffb334100ce5eb3894ad3095b1cd48d1ef5b9839 SHA512 e533175bcabd1ddbb50c6cc605cba0190d2cde24149d5451a807cdc05847fa95a2b72188bc23866876e8ec88073df8039e0e85e703560e90f53a92df6f616572
 AUX openssh-8.1_p1-hpn-glue.patch 7830 BLAKE2B 81c239f57d252b3a9bb1c7aed56ac67196ad11a316163db0cf6d4c75d73db1cbae038707ec788c5101f40ebf455257fa2cd1b9d7facab1081b5b856317543dd7 SHA512 2cf4e5da60e30932619c6915295b1659f53db3e784e87fcbbd25b8d167df8e29a1712235413bb2d485956494111aa682d086f9b5a36c3f55a286d40599df8b8c
 AUX sshd-r1.confd 774 BLAKE2B df3f3f28cb4d35b49851399b52408c42e242ae3168ff3fc79add211903567da370cfe86a267932ca9cf13c3afbc38a8f1b53e753a31670ee61bf8ba8747832f8 SHA512 3a69752592126024319a95f1c1747af508fd639c86eca472106c5d6c23d5eeaa441ca74740d4b1aafaa0db759d38879e3c1cee742b08d6166ebc58cddac1e2fe
 AUX sshd-r1.initd 2675 BLAKE2B 47e87cec2d15b90aae362ce0c8e8ba08dada9ebc244e28be1fe67d24deb00675d3d9b8fef40def8a9224a3e2d15ab717574a3d837e099133c1cf013079588b55 SHA512 257d6437162b76c4a3a648ecc5d4739ca7eaa60b192fde91422c6c05d0de6adfa9635adc24d57dc3da6beb92b1b354ffe8fddad3db453efb610195d5509a4e27
@@ -63,6 +65,7 @@ DIST openssh-7_8_P1-hpn-DynWinNoneSwitch-14.16.diff 43356 BLAKE2B 776fa140d64a16
 DIST openssh-8.0p1+x509-12.1-gentoo.diff.gz 680853 BLAKE2B b24ee61d6328bf2de8384d6ecbfc5ae0be4719a3c7a2d714be3a144d327bba5038e7e36ffcc313af2a8a94960ce1f56387654d2d21920af51826af61957aa4cc SHA512 178728139473b277fe50a03f37be50b3f8e539cea8f5937ddfe710082944e799d845cdb5994f585c13564c4a89b80ccf75e87753102aebacdb4c590f0b8a1482
 DIST openssh-8.0p1-sctp-1.2.patch.xz 7348 BLAKE2B bc3d3815f1ef5dbab605b93182a00c2fec258f49d56684defb6564d2b60886429c615a7ab076cc071a590f9df0908b1862ceb0961b7e6f6d1090237fec9035d3 SHA512 2f9f774286db75d0240e6fb01655a8a193fb2a5dc4596ad68ed22d64f97c9c46dad61a06478f2e972fd37cbad4d9aca5829bb91097cc56638601ff94a972b24f
 DIST openssh-8.0p1.tar.gz 1597697 BLAKE2B 5ba79872eabb3b3964d95a8cdd690bfe0323f018d7f944d4e1acb52576c9f6d7a1ddac15e88dc42eac6ecbfabfad1c228e303a2262588769e307c38107a4cd54 SHA512 e280fa2d56f550efd37c5d2477670326261aa8b94d991f9eb17aad90e0c6c9c939efa90fe87d33260d0f709485cb05c379f0fd1bd44fc0d5190298b6398c9982
+DIST openssh-8.1p1+x509-12.3.diff.gz 689934 BLAKE2B 57a302a25bec1d630b9c36f74ab490e11c97f9bcbaf8f527e46ae7fd5bade19feb3d8853079870b5c08b70a55e289cf4bf7981c11983973fa588841aeb21e650 SHA512 8d7c321423940f5a78a51a25ad5373f5db17a4a8ca7e85041e503998e0823ad22068bc652e907e9f5787858d45ce438a4bba18240fa72e088eb10b903e96b192
 DIST openssh-8.1p1-sctp-1.2.patch.xz 7672 BLAKE2B f1aa0713fcb114d8774bd8d524d106401a9d7c2c73a05fbde200ccbdd2562b3636ddd2d0bc3eae9f04b4d7c729c3dafd814ae8c530a76c4a0190fae71d1edcd2 SHA512 2bffab0bbae5a4c1875e0cc229bfd83d8565bd831309158cd489d8b877556c69b936243888a181bd9ff302e19f2c174156781574294d260b6384c464d003d566
 DIST openssh-8.1p1.tar.gz 1625894 BLAKE2B d525be921a6f49420a58df5ac434d43a0c85e0f6bf8428ecebf04117c50f473185933e6e4485e506ac614f71887a513b9962d7b47969ba785da8e3a38f767322 SHA512 b987ea4ffd4ab0c94110723860273b06ed8ffb4d21cbd99ca144a4722dc55f4bf86f6253d500386b6bee7af50f066e2aa2dd095d50746509a10e11221d39d925
 DIST openssh-lpk-7.5p1-0.3.14.patch.xz 17040 BLAKE2B 5b2204316dd244bb8dd11db50d5bc3a194e2cc4b64964a2d3df68bbe54c53588f15fc5176dbc3811e929573fa3e41cf91f412aa2513bb9a4b6ed02c2523c1e24 SHA512 9ce5d7e5d831c972f0f866b686bf93a048a03979ab38627973f5491eeeaa45f9faab0520b3a7ed90a13a67213fdc9cd4cf11e423acad441ea91b71037c8b435b
@@ -70,5 +73,5 @@ EBUILD openssh-7.5_p1-r4.ebuild 11137 BLAKE2B 371ae94d3f12874e8ee17416cd2c1b8105
 EBUILD openssh-7.7_p1-r9.ebuild 15919 BLAKE2B be6c6ac296d5332805d9a90c72a23598d17ca02212f2309bbb9dbff5c0374a6ef1c7d346fdd365afc0b0b853c5744c98f2db0d66347313a173aad4942abefc23 SHA512 36357ad30be27388decd08db6ae580984363b4c98c53cb634e5164b2924887cac4d19ea941f686b2290f8ff93db8c4f506fb2f76b24a1790364677ef851f6ce3
 EBUILD openssh-7.9_p1-r4.ebuild 16293 BLAKE2B 1f96b90873bed0b45da2ba26c3b1b9fb170598e6f6bc3090b8edfc7274185291f7e351a0e945e1a04ccb4e2c8fde18ba50f7bf7cd145a98721092a7608991875 SHA512 ee4fc5f36febc96c188d30d2d46b6d14c3d80178c2801802160ffbbce2d019ba6e26f26ae41e752748dc6999e676a4b2dae9e27ab7a42500c3c386f578bc24e7
 EBUILD openssh-8.0_p1-r4.ebuild 16661 BLAKE2B 7b58c80723df0c0c8c7b2a0724b6cb7549211cd618b54bba53e769af0f29c4c887e454a29e06a9e95b30ccc23156e9cfbfc63801df3a224126c296ac43d1f277 SHA512 3d5fe15f2ae2dda9c9b42d153a4fb9efcd553a79b0c136c51f8ee5770679334580ecc062aba8c01119fe4795669b76284f1a051d58797284e0de1c0e1f296c7e
-EBUILD openssh-8.1_p1.ebuild 16352 BLAKE2B 2452ba7f2ee139860e648885d6abdecbfaa2fd829090c5176334280663376c3a732dc3458fc6c1645bf9668107172a75a0dc53659dae169913b348db64877b0f SHA512 b29c5431724f708722bd5b901b77a0390a607817ed52bf38f0558e99be53c29e93eb1d91124667ae8a7b0de25d85a28c9c3d5b7d35a1329f9c39791168f95575
+EBUILD openssh-8.1_p1-r1.ebuild 16292 BLAKE2B 08b5a318e7f161e329416e208d9611ad2fdd438e7d0ed5c20997005be346fc59895795a62e9d5c9d6390fc147ba9382c0b8b15b31a6cc26e3d01317cdff55844 SHA512 0da71560098f9747b061f90b0d1536cb2cd420c178eaa3ae26a272fcbb46562ed3ccc58a6922acbf4b201ecb855b7889de9accee9a68d89406edc9d06de2d553
 MISC metadata.xml 2291 BLAKE2B 9e12fbae3c37a48c3b04876a7247bf38c33d6cc5be210b382e35e45c9318b3c3e7c91a0ef32a9fda96ac7a68a00f9d703aacfc1c1f23e59511ea97d159527488 SHA512 8605c7aa2e4594a04006b3abfac3fad359e3e44182be53116e25159b7419d4429176617c10b50354d0d10c2be26af550e9a2b6e4c7085906558a569dddf5c8f3
diff --git a/net-misc/openssh/files/openssh-8.1_p1-X509-12.3-tests.patch b/net-misc/openssh/files/openssh-8.1_p1-X509-12.3-tests.patch
new file mode 100644
index 000000000000..67a93fe2a0b1
--- /dev/null
+++ b/net-misc/openssh/files/openssh-8.1_p1-X509-12.3-tests.patch
@@ -0,0 +1,11 @@
+--- a/openbsd-compat/regress/Makefile.in	2019-06-17 10:59:01.210601434 -0700
++++ b/openbsd-compat/regress/Makefile.in	2019-06-17 10:59:18.753485852 -0700
+@@ -7,7 +7,7 @@
+ CC=@CC@
+ LD=@LD@
+ CFLAGS=@CFLAGS@
+-CPPFLAGS=-I. -I.. -I$(srcdir) -I$(srcdir)/.. @CPPFLAGS@ @DEFS@
++CPPFLAGS=-I. -I.. -I../.. -I$(srcdir) -I$(srcdir)/.. @CPPFLAGS@ @DEFS@
+ EXEEXT=@EXEEXT@
+ LIBCOMPAT=../libopenbsd-compat.a
+ LIBS=@LIBS@
diff --git a/net-misc/openssh/files/openssh-8.1_p1-X509-glue-12.3.patch b/net-misc/openssh/files/openssh-8.1_p1-X509-glue-12.3.patch
new file mode 100644
index 000000000000..48cce797904e
--- /dev/null
+++ b/net-misc/openssh/files/openssh-8.1_p1-X509-glue-12.3.patch
@@ -0,0 +1,35 @@
+Only in b: .openssh-8.1p1+x509-12.3.diff.un~
+diff -ur a/openssh-8.1p1+x509-12.3.diff b/openssh-8.1p1+x509-12.3.diff
+--- a/openssh-8.1p1+x509-12.3.diff	2019-10-14 11:33:45.796485604 -0700
++++ b/openssh-8.1p1+x509-12.3.diff	2019-10-14 11:39:44.960312587 -0700
+@@ -35343,12 +35343,11 @@
+  
+  install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf host-key check-config
+  install-nokeys: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf
+-@@ -339,6 +360,8 @@
++@@ -339,6 +360,7 @@
+  	$(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)5
+  	$(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)8
+  	$(MKDIR_P) $(DESTDIR)$(libexecdir)
+ +	$(MKDIR_P) $(DESTDIR)$(sshcadir)
+-+	$(MKDIR_P) $(DESTDIR)$(piddir)
+  	$(MKDIR_P) -m 0755 $(DESTDIR)$(PRIVSEP_PATH)
+  	$(INSTALL) -m 0755 $(STRIP_OPT) ssh$(EXEEXT) $(DESTDIR)$(bindir)/ssh$(EXEEXT)
+  	$(INSTALL) -m 0755 $(STRIP_OPT) scp$(EXEEXT) $(DESTDIR)$(bindir)/scp$(EXEEXT)
+@@ -83536,16 +83535,6 @@
+ +	return mbtowc(NULL, s, n);
+ +}
+ +#endif
+-diff -ruN openssh-8.1p1/version.h openssh-8.1p1+x509-12.3/version.h
+---- openssh-8.1p1/version.h	2019-10-09 03:31:03.000000000 +0300
+-+++ openssh-8.1p1+x509-12.3/version.h	2019-10-13 09:07:00.000000000 +0300
+-@@ -2,5 +2,4 @@
+- 
+- #define SSH_VERSION	"OpenSSH_8.1"
+- 
+--#define SSH_PORTABLE	"p1"
+--#define SSH_RELEASE	SSH_VERSION SSH_PORTABLE
+-+#define SSH_RELEASE	PACKAGE_STRING ", " SSH_VERSION "p1"
+ diff -ruN openssh-8.1p1/version.m4 openssh-8.1p1+x509-12.3/version.m4
+ --- openssh-8.1p1/version.m4	1970-01-01 02:00:00.000000000 +0200
+ +++ openssh-8.1p1+x509-12.3/version.m4	2019-10-13 09:07:00.000000000 +0300
diff --git a/net-misc/openssh/openssh-8.1_p1.ebuild b/net-misc/openssh/openssh-8.1_p1-r1.ebuild
index b75fb6f1a88f..2469a92fb870 100644
--- a/net-misc/openssh/openssh-8.1_p1.ebuild
+++ b/net-misc/openssh/openssh-8.1_p1-r1.ebuild
@@ -18,7 +18,7 @@ HPN_PATCHES=(
 )
 
 SCTP_VER="1.2" SCTP_PATCH="${PARCH}-sctp-${SCTP_VER}.patch.xz"
-#X509_VER="12.1" X509_PATCH="${PARCH}+x509-${X509_VER}.diff.gz"
+X509_VER="12.3" X509_PATCH="${PARCH}+x509-${X509_VER}.diff.gz"
 
 PATCH_SET="openssh-7.9p1-patches-1.0"
 
@@ -72,13 +72,14 @@ RDEPEND="
 	kerberos? ( virtual/krb5 )"
 DEPEND="${RDEPEND}
 	static? ( ${LIB_DEPEND} )
-	virtual/pkgconfig
-	virtual/os-headers
-	sys-devel/autoconf"
+	virtual/os-headers"
 RDEPEND="${RDEPEND}
 	pam? ( >=sys-auth/pambase-20081028 )
 	userland_GNU? ( virtual/shadow )
 	X? ( x11-apps/xauth )"
+BDEPEND="
+	virtual/pkgconfig
+	sys-devel/autoconf"
 
 S="${WORKDIR}/${PARCH}"
 
@@ -129,7 +130,6 @@ src_prepare() {
 	if use X509 ; then
 		pushd "${WORKDIR}" &>/dev/null || die
 		eapply "${FILESDIR}/${P}-X509-glue-"${X509_VER}".patch"
-		eapply "${FILESDIR}/${P}-X509-dont-make-piddir-"${X509_VER}".patch"
 		popd &>/dev/null || die
 
 		eapply "${WORKDIR}"/${X509_PATCH%.*}
diff --git a/net-misc/pump/Manifest b/net-misc/pump/Manifest
deleted file mode 100644
index 795b6bf5ccb6..000000000000
--- a/net-misc/pump/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST pump_0.8.24-7.diff.gz 29280 BLAKE2B 194df4e0dd11db6c34e50ae101ae32b21cef19db8ff37785b3d2fc9d025f122a2563e109acfbe4e95878896b293ca2d3426a41df1d7c2ad16cd48396691d3cd7 SHA512 8d70bb31f9d56d79b4cb74def6d3df2a3115b62672190d8c38b7fa628ad35481ad637dd4854e8331a4c5a649fa573c58c9b867b014bbaad7fe6c8c870a02eae2
-DIST pump_0.8.24.orig.tar.gz 79790 BLAKE2B f66e61ac240acc54027558059f628d1443a42a68873388366a07f58cc65bd6c03ec3f119c2679ccd9d5ab9d97234490728d8d474db478e33ea999e9b94a42987 SHA512 b6956f0ab2a5fbcda2320efd454d21aee651816a13a55622e21dc3a29919aef7db7c9a8d71c3b37b1969f29cff37c67d313f763a17404652fb962bc54eabcb34
-EBUILD pump-0.8.24-r4.ebuild 1401 BLAKE2B 174b23b30dd1d0b84490a05b978faf91b336038cb1de1cacd8e76ba4141750c8680af4022d45f539c33d71e16d133b72706418cee937fc78d3bbf3d30820d8f1 SHA512 5b96107c27a1c63653c0e541dc9f099c02c82c12c182391bd345f0d54ca188ce4ddf947e04b9e1271c9ac7eab06b98a4a8cee1a371b532175dd285732a7704d0
-MISC metadata.xml 238 BLAKE2B 6684835e62c92f4ead14f58c403c933431aec23a181f0cd367d8c85293ee23c76b69aa65d2ba6f364878ca0e61691566e563676cb028ac8d79a1b8fd286d2ffc SHA512 852836ec4f7a56d54fcdb6f5cd189be8d15770fa64bb9ecde5b22a8e12dfc2d6f38a905a85a1f493d8100e1889283c0bb32d25521e13de98b7c00d2e45450261
diff --git a/net-misc/pump/metadata.xml b/net-misc/pump/metadata.xml
deleted file mode 100644
index ef1a6e7a5e0e..000000000000
--- a/net-misc/pump/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-needed -->
-	<longdescription lang="en">
-		A DHCP/BOOTP client
-	</longdescription>
-</pkgmetadata>
diff --git a/net-misc/pump/pump-0.8.24-r4.ebuild b/net-misc/pump/pump-0.8.24-r4.ebuild
deleted file mode 100644
index e02eb9581e3b..000000000000
--- a/net-misc/pump/pump-0.8.24-r4.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-PATCHLEVEL="7"
-
-DESCRIPTION="This is the DHCP/BOOTP client written by RedHat"
-HOMEPAGE="http://ftp.debian.org/debian/pool/main/p/pump/"
-SRC_URI="mirror://debian/pool/main/p/${PN}/${PN}_${PV}.orig.tar.gz
-	mirror://debian/pool/main/p/${PN}/${PN}_${PV}-${PATCHLEVEL}.diff.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm hppa ia64 ppc sparc x86"
-IUSE=""
-
-DEPEND=">=dev-libs/popt-1.5"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# Fix Debian patch to fit epatch logic
-	sed -i \
-		-e 's:/debian::g' \
-		-e '/^---/s:pump-0.8.24.orig/::' \
-		-e '/^+++/s:pump-0.8.24/::' \
-		"${WORKDIR}/${PN}_${PV}-${PATCHLEVEL}.diff" || die "sed on ${PN}_${PV}-${PATCHLEVEL}.diff failed"
-
-	# Apply Debians pump patchset - they fix things good :)
-	# Debian patchset 7 include gentoo patchset too
-	epatch "${WORKDIR}/${PN}_${PV}-${PATCHLEVEL}.diff"
-	# Add LC_ALL workaround to make sure that patches are applied in right order(bug 471666)
-	LC_ALL=C EPATCH_FORCE="yes" EPATCH_SOURCE="patches" EPATCH_SUFFIX="patch" epatch
-
-	# respect AR, wrt bug #458482
-	tc-export AR
-
-	epatch_user
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" DEB_CFLAGS="-fPIC ${CFLAGS}" pump
-}
-
-src_install() {
-	exeinto /sbin
-	doexe pump
-
-	doman pump.8
-	dodoc changelog CREDITS
-
-	dolib.a libpump.a
-	doheader pump.h
-}
diff --git a/net-misc/putty/Manifest b/net-misc/putty/Manifest
index 01301140e5d0..7d98bf973045 100644
--- a/net-misc/putty/Manifest
+++ b/net-misc/putty/Manifest
@@ -1,10 +1,5 @@
-AUX putty-0.71-no-gssapi.patch 10370 BLAKE2B 785e3710f175f01cde6c236b719d7e7b410036758980ad41e7703dcb169b0ea4518682ba8eb196800ebe04ac68c1ffa12febe407b447f1abf1469bfea226e655 SHA512 c2bd2480605e9a52fc429463eee53c5850cc2e81fbc486f059aa759aee22ba5f18e3e27d052c3b549aa0e6f2ce2a8ef8b4172d8e4d5bb4cde5ec74ef7fd9ddf5
-DIST putty-0.71.tar.gz 2423752 BLAKE2B fa4202d76d3b96e016a62c805db3835a6f61b05e7f63900919ffcd5bbec5159ef0e06b643398ed33aef5cd9ecf04eb9a981828683de7d565b88abbd4552237f6 SHA512 f8791210bd5925b26d51b13f0558eea15dbac40808051165b236d6436226f5c2b0aa7d69288ed9e2bddc1066455678cfd0af73ef6b715a136c42f3b6f754ac07
-DIST putty-0.72.tar.gz 2449516 BLAKE2B 8d5b2e812bb7bb0bfabf210b2bd6f9e0858cb80b9f7edc241a1426f4a520896c9acc214fb732cb169c88914c89461968afdf73a7b9392e85113e6653902f3221 SHA512 a963985e55dcd589c08ef51085808a6364629edd8ce6708ebdf516e0339a41b7f186f91d7d7f26b1fec03d60767f365246e6fa06e9ef042898355c2f90f355dd
 DIST putty-0.73.tar.gz 2459115 BLAKE2B 594ad1ebd66bdb27ac8d297525c0c5d846f8a15f7c9c5e750da8a57b08367b5c94a9d1439d6a42862e7e7b7a7d7c0dea285e9197fa45651d9eb12757b57e82a7 SHA512 4ada4b8c6d68be44afede2676bc661fedfd1ea0b574b8232ad9aaa6f3a48baa9f4f0ded2955b3f2677a14db85a508f53c965cb00fcd7538a1ed9844031f0c5e5
 DIST putty-icons.tar.bz2 4878 BLAKE2B 589f1bace82e3fd202b70bd35661d2ec4ef383363f8ae6716d4a6828bd822ef624b0acde39354d3d837e2d2bb49a34dbb89e031c64c520cbc675cad79813acff SHA512 4e419a71e26770e159221f6b516e7210d29272917b4b9a9e0b67c72e73508b97278e56c82111b02e106c5d513c2561fec6da372b4b18246f29372ae618ff5f71
-EBUILD putty-0.71-r2.ebuild 1708 BLAKE2B c7521ebc45c975bb5d739697c507aa5ffbcbdc84f1afbbc63dd86f4f6fb6e9489ef919439d6730c2eeef769874416b28f1dbdf20e6fadd2f2ab41f8865b94702 SHA512 82082ad7b56f404719468fe34aa6caf3774f323252d00bf87b437703e38061b33877519f01771641a954465f1ae0b1e23c1824bf3271bf40175b05e989a19525
-EBUILD putty-0.72.ebuild 1589 BLAKE2B eee910bf44a2c60ecfab2b7ca453d3c9dc67685341873efb28c25c80f19a21c0873625b82a85db42fb9937929fce8cd39e2d92c7b41080eb8589719f2c09cde8 SHA512 68d0b707f2af6c3efec730dd65f675d2eaaf95cfdbf9f7b1480e13b051acd326fade352ddfb31fcaad602b9af56136bcded04984348860a3ed5363aacb739925
-EBUILD putty-0.73.ebuild 1585 BLAKE2B 20bd2592ebcf6ab65e7a448be49b192f48e054db1d5c0190c54fab6e48e1696f05bc0958efed82b1fbcbccd26fb8ea48a3934fe63352f6092a44a211d917aa63 SHA512 268405b23671d841e82db78bdfd9fcd70e5d06a9f29b2a41588adc8f7ccebb9e21e9693ffdfc31d81c7b83de6420fd785a48a13295b0eea09439124f9cb7c70c
+EBUILD putty-0.73.ebuild 1583 BLAKE2B 33f94b46afa426085333e04c748567713f0ddf617ef826bc96629b80e496d3378e4a43af6a06ef9056d22782d7dfd4c22f3574367125aa7df740d6c6fad4c1e9 SHA512 189cc8a9bc35da3115389bd1b79427973158eed6a96d33f2aa4a251543bf43976563bef7529660045cb16ad53d1337a63e52da81586ade49333598afc9d12e63
 EBUILD putty-9999.ebuild 1693 BLAKE2B 7f8e29cb9624afb649639374e42269c5e72dcb9eb329e1c40d0eac20bb7ca4a0d8bd903a2d71412eb81733167745fabe27f0699627f5f125a128fe1ade7107fa SHA512 16c7df06d0309f1d3c3df3119dcb72c842451e188203a67c2fcf7409e781f2faa9dcd76cfb31b40526b3d3a00ed8e6842d84727d264cac0374ac6aa036e9e505
 MISC metadata.xml 977 BLAKE2B b73c9f54eaa8d9cdb3e000f25ef6c1eece6a13063d6a646017d2b7c9ee4b91076cfc8797aa021a9148e1750a9f3f6bef9c9c5a5e0c86f6ba67a15a12dbbc4a22 SHA512 ff427f7d01ad2656f8b91937001d451e4c1f5154fd54e04715d82551accf12d6b430ef47c09cb567a03ef7ec644cdd277766a033e9063916ca6aec0922e60fa6
diff --git a/net-misc/putty/files/putty-0.71-no-gssapi.patch b/net-misc/putty/files/putty-0.71-no-gssapi.patch
deleted file mode 100644
index 33a3f226851f..000000000000
--- a/net-misc/putty/files/putty-0.71-no-gssapi.patch
+++ /dev/null
@@ -1,262 +0,0 @@
-From 7ad08649a223a4cd61e67d8334a147f55c79399d Mon Sep 17 00:00:00 2001
-From: Jacob Nevins <jacobn@chiark.greenend.org.uk>
-Date: Mon, 25 Mar 2019 23:46:59 +0000
-Subject: [PATCH] Fix compilation with NO_GSSAPI.
-
-This is a fairly shallow patch, which removes the UI and interactions
-with external libraries. Some other machinery (which is dead code in
-this configuration) is left in place.
-
-Adapted by me from a patch by Jeroen Roovers.
----
- config.c        |  4 ++++
- settings.c      | 12 ++++++++++--
- ssh.c           | 16 +++++++++++++++-
- ssh2transport.c |  3 +--
- ssh2userauth.c  |  8 ++++++--
- sshserver.c     | 13 ++++++++++++-
- 6 files changed, 48 insertions(+), 8 deletions(-)
-
-diff --git a/config.c b/config.c
-index 9c299fee..6528a969 100644
---- a/config.c
-+++ b/config.c
-@@ -2442,10 +2442,12 @@ void setup_config_box(struct controlbox *b, bool midsession,
- 			      HELPCTX(ssh_kexlist),
- 			      kexlist_handler, P(NULL));
-             c->listbox.height = KEX_MAX;
-+#ifndef NO_GSSAPI
- 	    ctrl_checkbox(s, "Attempt GSSAPI key exchange",
- 			  'k', HELPCTX(ssh_gssapi),
- 			  conf_checkbox_handler,
- 			  I(CONF_try_gssapi_kex));
-+#endif
- 
- 	    s = ctrl_getset(b, "Connection/SSH/Kex", "repeat",
- 			    "Options controlling key re-exchange");
-@@ -2455,11 +2457,13 @@ void setup_config_box(struct controlbox *b, bool midsession,
- 			 conf_editbox_handler,
- 			 I(CONF_ssh_rekey_time),
- 			 I(-1));
-+#ifndef NO_GSSAPI
-             ctrl_editbox(s, "Minutes between GSS checks (0 for never)", NO_SHORTCUT, 20,
-                          HELPCTX(ssh_kex_repeat),
-                          conf_editbox_handler,
-                          I(CONF_gssapirekey),
-                          I(-1));
-+#endif
- 	    ctrl_editbox(s, "Max data before rekey (0 for no limit)", 'x', 20,
- 			 HELPCTX(ssh_kex_repeat),
- 			 conf_editbox_handler,
-diff --git a/settings.c b/settings.c
-index 8d563026..54f5ab7b 100644
---- a/settings.c
-+++ b/settings.c
-@@ -592,21 +592,25 @@ void save_open_settings(settings_w *sesskey, Conf *conf)
-     write_setting_b(sesskey, "Compression", conf_get_bool(conf, CONF_compression));
-     write_setting_b(sesskey, "TryAgent", conf_get_bool(conf, CONF_tryagent));
-     write_setting_b(sesskey, "AgentFwd", conf_get_bool(conf, CONF_agentfwd));
-+#ifndef NO_GSSAPI
-     write_setting_b(sesskey, "GssapiFwd", conf_get_bool(conf, CONF_gssapifwd));
-+#endif
-     write_setting_b(sesskey, "ChangeUsername", conf_get_bool(conf, CONF_change_username));
-     wprefs(sesskey, "Cipher", ciphernames, CIPHER_MAX, conf, CONF_ssh_cipherlist);
-     wprefs(sesskey, "KEX", kexnames, KEX_MAX, conf, CONF_ssh_kexlist);
-     wprefs(sesskey, "HostKey", hknames, HK_MAX, conf, CONF_ssh_hklist);
-     write_setting_i(sesskey, "RekeyTime", conf_get_int(conf, CONF_ssh_rekey_time));
-+#ifndef NO_GSSAPI
-     write_setting_i(sesskey, "GssapiRekey", conf_get_int(conf, CONF_gssapirekey));
-+#endif
-     write_setting_s(sesskey, "RekeyBytes", conf_get_str(conf, CONF_ssh_rekey_data));
-     write_setting_b(sesskey, "SshNoAuth", conf_get_bool(conf, CONF_ssh_no_userauth));
-     write_setting_b(sesskey, "SshBanner", conf_get_bool(conf, CONF_ssh_show_banner));
-     write_setting_b(sesskey, "AuthTIS", conf_get_bool(conf, CONF_try_tis_auth));
-     write_setting_b(sesskey, "AuthKI", conf_get_bool(conf, CONF_try_ki_auth));
-+#ifndef NO_GSSAPI
-     write_setting_b(sesskey, "AuthGSSAPI", conf_get_bool(conf, CONF_try_gssapi_auth));
-     write_setting_b(sesskey, "AuthGSSAPIKEX", conf_get_bool(conf, CONF_try_gssapi_kex));
--#ifndef NO_GSSAPI
-     wprefs(sesskey, "GSSLibs", gsslibkeywords, ngsslibs, conf, CONF_ssh_gsslist);
-     write_setting_filename(sesskey, "GSSCustom", conf_get_filename(conf, CONF_ssh_gss_custom));
- #endif
-@@ -937,7 +941,9 @@ void load_open_settings(settings_r *sesskey, Conf *conf)
-     gppb(sesskey, "TryAgent", true, conf, CONF_tryagent);
-     gppb(sesskey, "AgentFwd", false, conf, CONF_agentfwd);
-     gppb(sesskey, "ChangeUsername", false, conf, CONF_change_username);
-+#ifndef NO_GSSAPI
-     gppb(sesskey, "GssapiFwd", false, conf, CONF_gssapifwd);
-+#endif
-     gprefs(sesskey, "Cipher", "\0",
- 	   ciphernames, CIPHER_MAX, conf, CONF_ssh_cipherlist);
-     {
-@@ -990,7 +996,9 @@ void load_open_settings(settings_r *sesskey, Conf *conf)
-     gprefs(sesskey, "HostKey", "ed25519,ecdsa,rsa,dsa,WARN",
-            hknames, HK_MAX, conf, CONF_ssh_hklist);
-     gppi(sesskey, "RekeyTime", 60, conf, CONF_ssh_rekey_time);
-+#ifndef NO_GSSAPI
-     gppi(sesskey, "GssapiRekey", GSS_DEF_REKEY_MINS, conf, CONF_gssapirekey);
-+#endif
-     gpps(sesskey, "RekeyBytes", "1G", conf, CONF_ssh_rekey_data);
-     {
- 	/* SSH-2 only by default */
-@@ -1007,9 +1015,9 @@ void load_open_settings(settings_r *sesskey, Conf *conf)
-     gppb(sesskey, "SshBanner", true, conf, CONF_ssh_show_banner);
-     gppb(sesskey, "AuthTIS", false, conf, CONF_try_tis_auth);
-     gppb(sesskey, "AuthKI", true, conf, CONF_try_ki_auth);
-+#ifndef NO_GSSAPI
-     gppb(sesskey, "AuthGSSAPI", true, conf, CONF_try_gssapi_auth);
-     gppb(sesskey, "AuthGSSAPIKEX", true, conf, CONF_try_gssapi_kex);
--#ifndef NO_GSSAPI
-     gprefs(sesskey, "GSSLibs", "\0",
- 	   gsslibkeywords, ngsslibs, conf, CONF_ssh_gsslist);
-     gppfile(sesskey, "GSSCustom", conf, CONF_ssh_gss_custom);
-diff --git a/ssh.c b/ssh.c
-index e35ebc64..e8ad61b8 100644
---- a/ssh.c
-+++ b/ssh.c
-@@ -50,7 +50,9 @@ struct Ssh {
-     ssh_sharing_state *connshare;
-     bool attempting_connshare;
- 
-+#ifndef NO_GSSAPI
-     struct ssh_connection_shared_gss_state gss_state;
-+#endif
- 
-     char *savedhost;
-     int savedport;
-@@ -252,10 +254,18 @@ static void ssh_got_ssh_version(struct ssh_version_receiver *rcv,
-                     conf_get_bool(ssh->conf, CONF_tryagent), username,
-                     conf_get_bool(ssh->conf, CONF_change_username),
-                     conf_get_bool(ssh->conf, CONF_try_ki_auth),
-+#ifndef NO_GSSAPI
-                     conf_get_bool(ssh->conf, CONF_try_gssapi_auth),
-                     conf_get_bool(ssh->conf, CONF_try_gssapi_kex),
-                     conf_get_bool(ssh->conf, CONF_gssapifwd),
--                    &ssh->gss_state);
-+                    &ssh->gss_state
-+#else
-+                    false,
-+                    false,
-+                    false,
-+                    NULL
-+#endif
-+                    );
-                 ssh_connect_ppl(ssh, userauth_layer);
-                 transport_child_layer = userauth_layer;
- 
-@@ -267,7 +277,11 @@ static void ssh_got_ssh_version(struct ssh_version_receiver *rcv,
-                 ssh->fullhostname,
-                 ssh_verstring_get_local(old_bpp),
-                 ssh_verstring_get_remote(old_bpp),
-+#ifndef NO_GSSAPI
-                 &ssh->gss_state,
-+#else
-+                NULL,
-+#endif
-                 &ssh->stats, transport_child_layer, false);
-             ssh_connect_ppl(ssh, ssh->base_layer);
- 
-diff --git a/ssh2transport.c b/ssh2transport.c
-index 8640d89d..5e8955a0 100644
---- a/ssh2transport.c
-+++ b/ssh2transport.c
-@@ -1781,6 +1781,7 @@ static void ssh2_transport_gss_update(struct ssh2_transport_state *s,
-     if (mins > 0 && s->gss_ctxt_lifetime <= mins * 60)
-         s->gss_status |= GSS_CTXT_EXPIRES;
- }
-+#endif /* NO_GSSAPI */
- 
- ptrlen ssh2_transport_get_session_id(PacketProtocolLayer *ppl)
- {
-@@ -1805,8 +1806,6 @@ void ssh2_transport_notify_auth_done(PacketProtocolLayer *ppl)
-     queue_idempotent_callback(&s->ppl.ic_process_queue);
- }
- 
--#endif /* NO_GSSAPI */
--
- static bool ssh2_transport_get_specials(
-     PacketProtocolLayer *ppl, add_special_fn_t add_special, void *ctx)
- {
-diff --git a/ssh2userauth.c b/ssh2userauth.c
-index fc413923..7f5a1292 100644
---- a/ssh2userauth.c
-+++ b/ssh2userauth.c
-@@ -613,8 +613,10 @@ static void ssh2_userauth_process_queue(PacketProtocolLayer *ppl)
-                  * Scan it for method identifiers we know about.
-                  */
-                 bool srv_pubkey = false, srv_passwd = false;
--                bool srv_keyb_inter = false, srv_gssapi = false;
--                bool srv_gssapi_keyex_auth = false;
-+                bool srv_keyb_inter = false;
-+#ifndef NO_GSSAPI
-+                bool srv_gssapi = false, srv_gssapi_keyex_auth = false;
-+#endif
- 
-                 for (ptrlen method; get_commasep_word(&methods, &method) ;) {
-                     if (ptrlen_eq_string(method, "publickey"))
-@@ -623,10 +625,12 @@ static void ssh2_userauth_process_queue(PacketProtocolLayer *ppl)
-                         srv_passwd = true;
-                     else if (ptrlen_eq_string(method, "keyboard-interactive"))
-                         srv_keyb_inter = true;
-+#ifndef NO_GSSAPI
-                     else if (ptrlen_eq_string(method, "gssapi-with-mic"))
-                         srv_gssapi = true;
-                     else if (ptrlen_eq_string(method, "gssapi-keyex"))
-                         srv_gssapi_keyex_auth = true;
-+#endif
-                 }
- 
-                 /*
-diff --git a/sshserver.c b/sshserver.c
-index 5f6e7dde..5c34bb35 100644
---- a/sshserver.c
-+++ b/sshserver.c
-@@ -50,7 +50,9 @@ struct server {
-     PacketProtocolLayer *base_layer;
-     ConnectionLayer *cl;
- 
-+#ifndef NO_GSSAPI
-     struct ssh_connection_shared_gss_state gss_state;
-+#endif
- };
- 
- static void ssh_server_free_callback(void *vsrv);
-@@ -245,9 +247,11 @@ Plug *ssh_server_plug(
-     bufchain_init(&srv->out_raw);
-     bufchain_init(&srv->dummy_user_input);
- 
-+#ifndef NO_GSSAPI
-     /* FIXME: replace with sensible */
-     srv->gss_state.libs = snew(struct ssh_gss_liblist);
-     srv->gss_state.libs->nlibraries = 0;
-+#endif
- 
-     return &srv->plug;
- }
-@@ -297,7 +301,9 @@ static void ssh_server_free_callback(void *vsrv)
-     conf_free(srv->conf);
-     log_free(srv->logctx);
- 
-+#ifndef NO_GSSAPI
-     sfree(srv->gss_state.libs);        /* FIXME: replace with sensible */
-+#endif
- 
-     sfree(srv);
- 
-@@ -442,7 +448,12 @@ static void server_got_ssh_version(struct ssh_version_receiver *rcv,
-             srv->conf, NULL, 0, NULL,
-             ssh_verstring_get_remote(old_bpp),
-             ssh_verstring_get_local(old_bpp),
--            &srv->gss_state, &srv->stats, transport_child_layer, true);
-+#ifndef NO_GSSAPI
-+            &srv->gss_state,
-+#else
-+            NULL,
-+#endif
-+            &srv->stats, transport_child_layer, true);
-         ssh2_transport_provide_hostkeys(
-             srv->base_layer, srv->hostkeys, srv->nhostkeys);
-         if (userauth_layer)
--- 
-2.11.0
-
diff --git a/net-misc/putty/putty-0.71-r2.ebuild b/net-misc/putty/putty-0.71-r2.ebuild
deleted file mode 100644
index 1974742b0e61..000000000000
--- a/net-misc/putty/putty-0.71-r2.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 autotools eutils gnome2-utils toolchain-funcs
-
-DESCRIPTION="A Free Telnet/SSH Client"
-HOMEPAGE="https://www.chiark.greenend.org.uk/~sgtatham/putty/"
-LICENSE="MIT"
-
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
-IUSE="doc +gtk gtk2 ipv6 gssapi"
-SRC_URI="
-	https://dev.gentoo.org/~jer/${PN}-icons.tar.bz2
-	https://the.earth.li/~sgtatham/${PN}/latest/${P}.tar.gz
-"
-
-RDEPEND="
-	!net-misc/pssh
-	gtk? (
-		dev-libs/glib:2
-		x11-libs/gdk-pixbuf
-		x11-libs/libX11
-		x11-libs/pango
-		gtk2? ( x11-libs/gtk+:2 )
-		!gtk2? ( x11-libs/gtk+:3[X] )
-	)
-	gssapi? ( virtual/krb5 )
-"
-DEPEND="
-	${RDEPEND}
-	dev-lang/perl
-	virtual/pkgconfig
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.71-no-gssapi.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e '/AM_PATH_GTK(/d' \
-		-e 's|-Werror||g' \
-		configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	cd "${S}"/unix || die
-	econf \
-		$(use_with gssapi) \
-		$(usex gtk --with-gtk= --without-gtk $(usex gtk2 2 3 ) )
-}
-
-src_compile() {
-	cd "${S}"/unix || die
-	emake AR=$(tc-getAR) $(usex ipv6 '' COMPAT=-DNO_IPV6)
-}
-
-src_install() {
-	dodoc doc/puttydoc.txt
-
-	if use doc; then
-		docinto html
-		dodoc doc/*.html
-	fi
-
-	cd "${S}"/unix || die
-	default
-
-	if use gtk ; then
-		for i in 16 22 24 32 48 64 128 256; do
-			newicon -s ${i} "${WORKDIR}"/${PN}-icons/${PN}-${i}.png ${PN}.png
-		done
-
-		# install desktop file provided by Gustav Schaffter in #49577
-		make_desktop_entry ${PN} PuTTY ${PN} Network
-	fi
-}
-
-pkg_preinst() {
-	use gtk && gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	use gtk && gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	use gtk && gnome2_icon_cache_update
-}
diff --git a/net-misc/putty/putty-0.72.ebuild b/net-misc/putty/putty-0.72.ebuild
deleted file mode 100644
index ca57ab5f550e..000000000000
--- a/net-misc/putty/putty-0.72.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools desktop toolchain-funcs xdg-utils
-
-DESCRIPTION="A Free Telnet/SSH Client"
-HOMEPAGE="https://www.chiark.greenend.org.uk/~sgtatham/putty/"
-LICENSE="MIT"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc +gtk gtk2 ipv6 gssapi"
-SRC_URI="
-	https://dev.gentoo.org/~jer/${PN}-icons.tar.bz2
-	https://the.earth.li/~sgtatham/${PN}/latest/${P}.tar.gz
-"
-
-RDEPEND="
-	!net-misc/pssh
-	gtk? (
-		dev-libs/glib:2
-		x11-libs/gdk-pixbuf
-		x11-libs/libX11
-		x11-libs/pango
-		gtk2? ( x11-libs/gtk+:2 )
-		!gtk2? ( x11-libs/gtk+:3[X] )
-	)
-	gssapi? ( virtual/krb5 )
-"
-DEPEND="
-	${RDEPEND}
-	dev-lang/perl
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e 's|-Werror||g' \
-		configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	cd "${S}"/unix || die
-	econf \
-		$(use_with gssapi) \
-		$(usex gtk --with-gtk= --without-gtk $(usex gtk2 2 3 ) )
-}
-
-src_compile() {
-	emake -C "${S}"/doc
-	emake -C "${S}"/unix AR=$(tc-getAR) $(usex ipv6 '' COMPAT=-DNO_IPV6)
-}
-
-src_install() {
-	dodoc doc/puttydoc.txt
-
-	if use doc; then
-		docinto html
-		dodoc doc/*.html
-	fi
-
-	cd "${S}"/unix || die
-	default
-
-	if use gtk ; then
-		for i in 16 22 24 32 48 64 128 256; do
-			newicon -s ${i} "${WORKDIR}"/${PN}-icons/${PN}-${i}.png ${PN}.png
-		done
-
-		# install desktop file provided by Gustav Schaffter in #49577
-		make_desktop_entry ${PN} PuTTY ${PN} Network
-	fi
-}
-
-pkg_postinst() {
-	use gtk && xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	use gtk && xdg_icon_cache_update
-}
diff --git a/net-misc/putty/putty-0.73.ebuild b/net-misc/putty/putty-0.73.ebuild
index 5d214b3163c0..7205f7c6c6ac 100644
--- a/net-misc/putty/putty-0.73.ebuild
+++ b/net-misc/putty/putty-0.73.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://www.chiark.greenend.org.uk/~sgtatham/putty/"
 LICENSE="MIT"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 hppa ppc ppc64 sparc x86"
 IUSE="doc +gtk gtk2 ipv6 gssapi"
 SRC_URI="
 	https://dev.gentoo.org/~jer/${PN}-icons.tar.bz2
diff --git a/net-misc/rclone/Manifest b/net-misc/rclone/Manifest
index d9738a42a224..630cee6cbc62 100644
--- a/net-misc/rclone/Manifest
+++ b/net-misc/rclone/Manifest
@@ -1,6 +1,8 @@
 DIST rclone-1.45.tar.gz 16494131 BLAKE2B 17ca4182af4efe23a367fc38226dc7fe146da55fea47a5f76773f1dcc3d3b629cca7964ffe41aa1e4dbd2fe36bd80545f336d2823a25ebb6b3effc768d4b46d2 SHA512 348dbd6a069f736219b7f925b6aa5234a4d70724ee5bfdb56067241063be36c44a091a37acb3285627803fa013329a6ef804aab4c0070ddaf322c5324b9e2a5a
 DIST rclone-1.47.0.tar.gz 17282254 BLAKE2B 57c4f3576427778db0fdc523d8b95b33db5cebfb0081d927abc8925eeaf90c0d2079f1d9572e81faac41e98cfee3028f39c9aed89e6db17188efb3541e3daa6a SHA512 90e68021f589bfad95989b45d91c47da63066e9bc60040052e866d1c7e420bc2784335cc5dbab0e4372c4f8686acb0a65853877c41081c8406eddada42550125
+DIST rclone-1.49.1.tar.gz 18196519 BLAKE2B 22a2f5984f65a64972c40fa845f0b4e5a8d52840ee9dc35463605e3eea399ab01a3b36f1f25a07d5c583829684863b8cbeaf82282e9b59ca994a8fa1d9558ebf SHA512 05b864932fdec7d1bc7185a4e2d33b7bd06b840399f100b1f58806e2ab6f752e4b7cb0f2691cfa92785f45b2f587aebaf7c9e5ab256c2d9b63c262d90ea1e3ac
 EBUILD rclone-1.45.ebuild 855 BLAKE2B 6fa5fed6fa510426c7b0e9fc071628567d2dfd3656d42eec32e4ee53421a0d2e4a0d3a76985b659b07dc92dd781d3ee64d09237bec89f4f6cced00cf4bce213b SHA512 3ebe305dd275b7514361c8e83c66ebcf670cf1e403a5e0bfac65d8ebd97dca2314c8d9a5c89cfac968f0c8db35c68fce49b13e436dc3fe6b81a816d25360dc8a
 EBUILD rclone-1.47.0.ebuild 855 BLAKE2B 6fa5fed6fa510426c7b0e9fc071628567d2dfd3656d42eec32e4ee53421a0d2e4a0d3a76985b659b07dc92dd781d3ee64d09237bec89f4f6cced00cf4bce213b SHA512 3ebe305dd275b7514361c8e83c66ebcf670cf1e403a5e0bfac65d8ebd97dca2314c8d9a5c89cfac968f0c8db35c68fce49b13e436dc3fe6b81a816d25360dc8a
-EBUILD rclone-9999.ebuild 857 BLAKE2B 23908780bf153eabb1e45e3a011d5cf3c8a262ac040a24c272e8a9c05dda5e1332accb190b133141d96562ea812459e91595b7f53e0dda63d9a5ce7dd1e49293 SHA512 55a50a88e62179f4a665b45b3da697284b1a1117af190adb0a8eb8c57586f1bb5a23455e625a51d95f0525b274eee20c2d4d05318f88d333145e0f3fcf437356
+EBUILD rclone-1.49.1.ebuild 860 BLAKE2B 3f6b7bebb4e5625d0524b6327321cc3381b1af24482fc7c2c39e6d8499fea8991af1986d81ea78ac6faefe0f76e77fec77319912ab123b2d12fb578ac3357060 SHA512 ac2af4aa2922e7479328fab6ae946bc0c0ef38be07b05b416bfda7e996dafa81f22b6ff784eecf7abedb8f091f9337b819245316a9d8c88aa05fb1cd80ab1102
+EBUILD rclone-9999.ebuild 860 BLAKE2B 3f6b7bebb4e5625d0524b6327321cc3381b1af24482fc7c2c39e6d8499fea8991af1986d81ea78ac6faefe0f76e77fec77319912ab123b2d12fb578ac3357060 SHA512 ac2af4aa2922e7479328fab6ae946bc0c0ef38be07b05b416bfda7e996dafa81f22b6ff784eecf7abedb8f091f9337b819245316a9d8c88aa05fb1cd80ab1102
 MISC metadata.xml 247 BLAKE2B fad006bd63156a3ffcdfe9e4c216b806d3b341fa5b7e8de2608ad51674b482493f7d0fabdeb6010ce0c41aef65a55abe404b8ba5ba7d72f36822b7d96d58182b SHA512 189f876175728dfb474cf2ccb122ebfe48b068cc5fd65a3cfed7dad947dd9ce0fc7c89ce5c0982fdee5262025236b7d5cccf48b55c67c5cd33e84910c28e0b46
diff --git a/net-misc/rclone/rclone-1.49.1.ebuild b/net-misc/rclone/rclone-1.49.1.ebuild
new file mode 100644
index 000000000000..8c2e65193573
--- /dev/null
+++ b/net-misc/rclone/rclone-1.49.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit golang-build bash-completion-r1
+EGO_PN="github.com/rclone/${PN}"
+
+if [[ ${PV} == *9999* ]]; then
+	inherit golang-vcs
+else
+	KEYWORDS="~amd64 ~arm ~x86"
+	EGIT_COMMIT="v${PV}"
+	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	inherit golang-vcs-snapshot
+fi
+
+DESCRIPTION="A program to sync files to and from various cloud storage providers"
+HOMEPAGE="https://rclone.org/"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+src_install() {
+	dobin ${PN}
+	doman src/${EGO_PN}/${PN}.1
+	dodoc src/${EGO_PN}/README.md
+
+	./rclone genautocomplete bash ${PN}.bash || die
+	newbashcomp ${PN}.bash ${PN}
+
+	./rclone genautocomplete zsh ${PN}.zsh || die
+	insinto /usr/share/zsh/site-functions
+	newins ${PN}.zsh _${PN}
+}
diff --git a/net-misc/rclone/rclone-9999.ebuild b/net-misc/rclone/rclone-9999.ebuild
index e1f64b65bde7..8c2e65193573 100644
--- a/net-misc/rclone/rclone-9999.ebuild
+++ b/net-misc/rclone/rclone-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 inherit golang-build bash-completion-r1
-EGO_PN="github.com/ncw/${PN}"
+EGO_PN="github.com/rclone/${PN}"
 
 if [[ ${PV} == *9999* ]]; then
 	inherit golang-vcs
diff --git a/net-misc/rdesktop/Manifest b/net-misc/rdesktop/Manifest
index dd739a1714b7..3073c826e873 100644
--- a/net-misc/rdesktop/Manifest
+++ b/net-misc/rdesktop/Manifest
@@ -2,13 +2,11 @@ AUX rdesktop-1.6.0-sound_configure.patch 818 BLAKE2B 131a59e1e403982d269acf9e0eb
 AUX rdesktop-1.8.3-no_strip.patch 428 BLAKE2B 86249bbebd944fc5d3f8e79978f712ab3633b199ce907017656c79a3be4a5e85cdc76b5e11d49cd6fa83c248c34244177eecc7d1e5bbcc4456044765ba34f16c SHA512 bdf1c4e89f14cc87cf5acc657b5998947c37e3e3103254a3dd4dea0a544f61d9e1b421bddaecca339d993dcd367ef836c328f6782152072fb755aba1662bff03
 AUX rdesktop-1.8.3-xrandr_configure.patch 666 BLAKE2B 1d2b0b57069b4e8a4eeed2d3d81628ebd9f4770bf70c3e88a123d636778240de37cec9c7fa6e5131fc9e019b9d7d6e22b5c8dbd39059ffe1b121c8c800777111 SHA512 f887b2499f71992501485061b047905dbd38445fc45a24e65f5b7e22b83aa14a80b339346ecfc5c185f5fd77e15daeeb5361f009ef02a2858f55cd1a34c56c3d
 AUX rdesktop-1.8.4-libressl.patch 395 BLAKE2B d7ae01de041bcba333c6c72348c28665a8b1cab12ace786848515b6455f189121c8e87a393255ac25b116d5027d0756a35b1de60007f37426e82f32c9cdc2f5e SHA512 dfc8b4af9d22d587846f5d18d3063c4932b3add419b60a01ff391e3ac5f7b1d6b40614e54cdff61c66b2690a879550d7ffad38c71188d62e598a8f63d347dd98
-AUX rdesktop-1.8.4-use_standard_gssapi.patch 2696 BLAKE2B 01f5542dc294d51f6d2fccf7141fc02ed199042cc25000bbc90d3387d6cd0b93ebce1a3ebbcaa1a8817bdd660dedd09d115f979fabb561b3ccc9e56e126bbd60 SHA512 ae91f4e0eb1e2c3141aedef660eb89628b334155c8c0559805cc4ac75274fff94101daf665052b27fe5074ce7468ff854fab865e7efd377d08d525319c7aa150
 AUX rdesktop-1.8.5-use_standard_gssapi.patch 1909 BLAKE2B 5e9b2b4b7bde0c38ba3302c780cbaec1a2ecea437fa686ce812c0e898427cac5e742ed69b96df9cbbc38378b99eef00f8326c25ed389461f689aab92f14e2a79 SHA512 1f886a23fd416f421bbab449b72fc889f60908b0408436f4c26229386d3baa48256bb78b4c72575ab9877932c634575345511f8418c20bef3345e231ef5d78ca
 AUX rdesktop-1.8.6-sec_decrypt.patch 1730 BLAKE2B 22b7c254b4fee01b72e51d28622795b622cc3ed495920780240afb153f14630b048d5e9592ec6eda1df7dd25e633c70c04d15aa286033397dc504d61826e7574 SHA512 a3a863afe18aea932a29b66f584d4beb7ceb8446522dccfde4251141ea56949b567711f69a849793e88bc12d65b8f93b659032478eebc2d8b5e61620e86044a3
-DIST rdesktop-1.8.4.tar.gz 321448 BLAKE2B b4d5a91f77a63258d08823c860b2d7045b0ee7ad0feb144746c904146c410c6456391eb3f2b7b9a6a40c2fb34515bb7518888c2c9da8dfcaf17c5309ff21cad3 SHA512 9e4f6723eb0baab31ad11f1c5c29a4753c655386c2381d01646b7834c959ffc2ec1e0c2f3f73626255aa018889709758d97387c7563da98bb1b7f269610929ae
 DIST rdesktop-1.8.6.tar.gz 321061 BLAKE2B bd61ecfbdca3f05b2a8d7f84c10296af3845870f5bd2522ecd768ce27cdbf790787ba9af2f53c85bcd674926488b77a610e48cafbb891fced9a458f86a2ee9e1 SHA512 a7d624dad27e531cf38d73bd879e66aaf72e527d082a4adb59e259e4e5b9a779ee6938db74601fbb2be7e7b015c806109fe8dfc99d78cbd06f0ba4d8f89b28ee
-EBUILD rdesktop-1.8.4-r1.ebuild 1726 BLAKE2B 65ff5e4a01889704fdb899f540d27e5ba75b343f5d787e940f799204e2af8272c1e523567ad2166c24a8cd118bd418c636553d4b4df4399659dda3c00f26e1ec SHA512 89cdd9bda2dab478253134d1db0739f5051a8bc3d652a3ab73cdd9f287f56d47f49bfee8e29c3db680b2f03975c0bf5f681fc41461486bf004219931437a3094
-EBUILD rdesktop-1.8.4-r2.ebuild 1773 BLAKE2B 4c6f446911b8941b2133a0c75ede13028e8fdfbaa64aa9b36418639b3039f61efe88d8199578c5c82abdb46fdfceb3f8d6e108117b72f0c5157e64da7b917f3e SHA512 cf68883751ed8b113dd8d389dc32d59a9e43cedc89c29da29883cfcfbe7d5c9937ab83195bb83954641d03d8cb93517423711e9f472eb1105e7781048432b871
+DIST rdesktop-1.9.0.tar.gz 368980 BLAKE2B c3545e1c0f8ff04adeb8f36e24684a0719a4d4bb0176491a1826b3c5c2976a96d96d773280ca5b27b936aa5f79957e7faec77be996048115d8f8c0a3f0cc0d6d SHA512 e101147b496ae70118c2756bf120007d4748aad9d9917d9ebc0878ffaf35764500861c548ef0528722777555c78e1d3d146b6f3691daa2b8657b0d3a541094f5
 EBUILD rdesktop-1.8.6-r1.ebuild 1825 BLAKE2B 719b968928addf924edddc9e4266b0130d820e69c63672fbc6e4b29c9deed82782ec3fbb7ad4965d732ba19b48a3d7a7089941189b99b19864145407a48fc0c0 SHA512 252c717a7d630ff951400b5fe9100c1ad277fdf957522d37fb4ebb9f89fd4e2df94349084275edd0e8360caca3a85ed9d2e8bd859bf0aa1d11650a0d36efaf09
 EBUILD rdesktop-1.8.6.ebuild 1779 BLAKE2B 7babb9b744d549177311e42829179047b79f54a852418fb41d93131185278be0cdf0a59851a99eaeab1b280ed2ebe7194819c119e76808467212cc6f786add1e SHA512 bfcaf2817c1a1e452ae33d8b25b9f144e29b19204aa1f02da34d69882f441b46eb57e8b4442eafba6b45d9910fa00d8165ba5690c36c18e5424903631807552f
-MISC metadata.xml 919 BLAKE2B d3ad5ad5db82b4b266954587621d3e0346a49bc25bf28bf41de96e35a131e4672729dc85aad0e59de9f038061549eb0f0df23d0a6466ddbd970ab9d81ae2d937 SHA512 643df7da200a49ca631da801bc12af2f7fd3ca273a10be6e08a2fb19ecccf9e75e9777385e862b96f50d1e6e4f8bdec950148e801c67134ebeaee627f51fe5ea
+EBUILD rdesktop-1.9.0.ebuild 1684 BLAKE2B cc0132d1dd28d79e17408f2262abe8b69001c790084e8ab10db69bdf0a3f89ee8fac7e9066d9fbc392889ce4ef4d5efffe8470ed241e33daf0f415fd2c23a8b2 SHA512 0e4321e237ff0e64634a1da949da9b8670158de391679cf6643a18232b9e21665b3f1faa37bfde2ea44c37408451d3bb897f498316973d24036535c5c30e30c6
+MISC metadata.xml 883 BLAKE2B 9ad73132150a724eb69cf65c62aea7cb0530e45fb4ca0395bb916cc95f48452b2dbd34edc7116ef9b8184527ea2dee16213b419185eac7b5aba8346dc7978cbc SHA512 5a68b2d8f23e4039efd76a52ea19400b2d17dfb01d0cb16504914bd0e2fb6f0523a135e7e98a19d7a0f371c1b149cb9426fc308303a0fa09a0bd0ebd118c1ea2
diff --git a/net-misc/rdesktop/files/rdesktop-1.8.4-use_standard_gssapi.patch b/net-misc/rdesktop/files/rdesktop-1.8.4-use_standard_gssapi.patch
deleted file mode 100644
index 5befcf02e55b..000000000000
--- a/net-misc/rdesktop/files/rdesktop-1.8.4-use_standard_gssapi.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From 71f1cfb909c0a955632001cf9fad80a321a43372 Mon Sep 17 00:00:00 2001
-From: Pierre Ossman <ossman@cendio.se>
-Date: Mon, 10 Jul 2017 15:12:26 +0200
-Subject: [PATCH 1/2] Fix pointer types for gss_wrap()/gss_unrap()
-
-We were using the incorrect type for the context for these two calls.
-No practical effects, but some noise from the compiler about the wrong
-pointer type.
----
- cssp.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/cssp.c b/cssp.c
-index 9f4c0829..6ac37746 100644
---- a/cssp.c
-+++ b/cssp.c
-@@ -173,7 +173,7 @@ cssp_gss_get_service_name(char *server, gss_name_t * name)
- }
- 
- static RD_BOOL
--cssp_gss_wrap(gss_ctx_id_t * ctx, STREAM in, STREAM out)
-+cssp_gss_wrap(gss_ctx_id_t ctx, STREAM in, STREAM out)
- {
- 	int conf_state;
- 	OM_uint32 major_status;
-@@ -212,7 +212,7 @@ cssp_gss_wrap(gss_ctx_id_t * ctx, STREAM in, STREAM out)
- }
- 
- static RD_BOOL
--cssp_gss_unwrap(gss_ctx_id_t * ctx, STREAM in, STREAM out)
-+cssp_gss_unwrap(gss_ctx_id_t ctx, STREAM in, STREAM out)
- {
- 	OM_uint32 major_status;
- 	OM_uint32 minor_status;
-
-From b556651fe109c8802a0c798b8a680e5ff883bf4e Mon Sep 17 00:00:00 2001
-From: Pierre Ossman <ossman@cendio.se>
-Date: Mon, 10 Jul 2017 15:14:01 +0200
-Subject: [PATCH 2/2] Use standard GSSAPI rather than libgssglue
-
-That project is abandoned and the distributions aren't including
-it anymore.
----
- configure.ac | 15 ++++-----------
- 1 file changed, 4 insertions(+), 11 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index e045c409..a969ad5d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -122,27 +122,20 @@ fi
- 
- dnl CredSSP feature
- AC_ARG_ENABLE([credssp], AS_HELP_STRING([--disable-credssp], [disable support for CredSSP]))
--AC_ARG_ENABLE([static-gssglue], AS_HELP_STRING([--enable-static-gssglue]), 
--	      [static_gssglue=yes], [static_gssglue=no])
- AS_IF([test "x$enable_credssp" != "xno"], [
- 	  if test -n "$PKG_CONFIG"; then
--	    PKG_CHECK_MODULES(GSSGLUE, libgssglue, [WITH_CREDSSP=1], [WITH_CREDSSP=0])
-+	    PKG_CHECK_MODULES(GSSAPI, krb5-gssapi, [WITH_CREDSSP=1], [WITH_CREDSSP=0])
- 	  fi
- 
- 	  if test x"$WITH_CREDSSP" = "x1"; then
- 	      CREDSSPOBJ="cssp.o"
--	      CFLAGS="$CFLAGS $GSSGLUE_CFLAGS"
--
--	      AS_IF([test "x$static_gssglue" != "xno"], [
--	          LIBS="$LIBS -Wl,-Bstatic -lgssglue -Wl,-Bdynamic"
--	      ], [
--	          LIBS="$LIBS -lgssglue"
--	      ])
-+	      CFLAGS="$CFLAGS $GSSAPI_CFLAGS"
-+	      LIBS="$LIBS $GSSAPI_LIBS"
- 
- 	      AC_DEFINE(WITH_CREDSSP)
- 	  else
- 		echo
--		echo "CredSSP support requires libgssglue, install the dependency"
-+		echo "CredSSP support requires GSSAPI, install the dependency"
- 		echo "or disable the feature using --disable-credssp."
- 		echo
- 		exit 1
diff --git a/net-misc/rdesktop/metadata.xml b/net-misc/rdesktop/metadata.xml
index 905d0e56c9b9..8e11088a21d4 100644
--- a/net-misc/rdesktop/metadata.xml
+++ b/net-misc/rdesktop/metadata.xml
@@ -9,7 +9,7 @@
 		An open source client for Windows NT Terminal Server and Windows 2000/2003 Terminal Services, capable of natively speaking Remote Desktop Protocol (RDP) in order to present the user's NT desktop. Unlike Citrix ICA, no server extensions are required.
 	</longdescription>
 	<use>
-		<flag name="kerberos">Enable CredSPP support + Kerberos authentication with <pkg>net-libs/libgssglue</pkg></flag>
+		<flag name="kerberos">Enable CredSPP support + Kerberos authentication</flag>
 		<flag name="pcsc-lite">Enable smartcard support with <pkg>sys-apps/pcsc-lite</pkg> driver</flag>
 		<flag name="xrandr">Enable XRandR window extension support</flag>
 	</use>
diff --git a/net-misc/rdesktop/rdesktop-1.8.4-r1.ebuild b/net-misc/rdesktop/rdesktop-1.8.4-r1.ebuild
deleted file mode 100644
index 29441af60524..000000000000
--- a/net-misc/rdesktop/rdesktop-1.8.4-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools eutils
-
-MY_PV=${PV/_/-}
-
-DESCRIPTION="A Remote Desktop Protocol Client"
-HOMEPAGE="http://www.rdesktop.org/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="alsa ao debug ipv6 kerberos libressl libsamplerate oss pcsc-lite xrandr"
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-RDEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:= )
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXau
-	x11-libs/libXdmcp
-	alsa? ( media-libs/alsa-lib )
-	ao? ( >=media-libs/libao-0.8.6 )
-	kerberos? ( net-libs/libgssglue )
-	libsamplerate? ( media-libs/libsamplerate )
-	pcsc-lite? ( >=sys-apps/pcsc-lite-1.6.6 )
-	xrandr? ( x11-libs/libXrandr )"
-DEPEND="${RDEPEND}
-	x11-libs/libXt"
-BDEPEND=virtual/pkgconfig
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.6.0-sound_configure.patch
-	"${FILESDIR}"/${PN}-1.8.3-no_strip.patch
-	"${FILESDIR}"/${PN}-1.8.3-xrandr_configure.patch
-	"${FILESDIR}"/${P}-libressl.patch
-)
-
-DOCS=( doc/HACKING doc/TODO doc/keymapping.txt )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	if use ao; then
-		sound_conf=$(use_with ao sound libao)
-	else if use alsa; then
-			sound_conf=$(use_with alsa sound alsa)
-		else
-			sound_conf=$(use_with oss sound oss)
-		fi
-	fi
-
-	econf \
-		--with-openssl="${EPREFIX}"/usr \
-		$(use_with debug) \
-		$(use_with ipv6) \
-		$(use_with libsamplerate) \
-		$(use_with xrandr) \
-		$(use_enable kerberos credssp) \
-		$(use_enable pcsc-lite smartcard) \
-		${sound_conf}
-}
diff --git a/net-misc/rdesktop/rdesktop-1.8.4-r2.ebuild b/net-misc/rdesktop/rdesktop-1.9.0.ebuild
index 1e02cb53258d..2a3e18a9ba61 100644
--- a/net-misc/rdesktop/rdesktop-1.8.4-r2.ebuild
+++ b/net-misc/rdesktop/rdesktop-1.9.0.ebuild
@@ -13,36 +13,43 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="alsa ao debug ipv6 kerberos libressl libsamplerate oss pcsc-lite xrandr"
+IUSE="alsa ao ipv6 kerberos oss pcsc-lite pulseaudio xrandr"
 
 S=${WORKDIR}/${PN}-${MY_PV}
 
 RDEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:= )
+	dev-libs/nettle:0=
+	>=net-libs/gnutls-3.2.0:0=
 	x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXau
 	x11-libs/libXdmcp
-	alsa? ( media-libs/alsa-lib )
-	ao? ( >=media-libs/libao-0.8.6 )
+	alsa? (
+		media-libs/alsa-lib
+		media-libs/libsamplerate
+	)
+	ao? (
+		>=media-libs/libao-0.8.6
+		media-libs/libsamplerate
+	)
 	kerberos? ( virtual/krb5 )
-	libsamplerate? ( media-libs/libsamplerate )
 	pcsc-lite? ( >=sys-apps/pcsc-lite-1.6.6 )
+	oss? ( media-libs/libsamplerate )
+	pulseaudio? (
+		media-libs/libsamplerate
+		media-sound/pulseaudio
+	)
 	xrandr? ( x11-libs/libXrandr )"
 DEPEND="${RDEPEND}
 	x11-libs/libXt"
 BDEPEND=virtual/pkgconfig
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.6.0-sound_configure.patch
 	"${FILESDIR}"/${PN}-1.8.3-no_strip.patch
 	"${FILESDIR}"/${PN}-1.8.3-xrandr_configure.patch
-	"${FILESDIR}"/${P}-libressl.patch
-	"${FILESDIR}"/${P}-use_standard_gssapi.patch
 )
 
-DOCS=( doc/HACKING doc/TODO doc/keymapping.txt )
+DOCS=( doc/ChangeLog doc/HACKING doc/TODO doc/keymapping.txt )
 
 src_prepare() {
 	default
@@ -50,20 +57,18 @@ src_prepare() {
 }
 
 src_configure() {
-	if use ao; then
-		sound_conf=$(use_with ao sound libao)
-	else if use alsa; then
-			sound_conf=$(use_with alsa sound alsa)
-		else
-			sound_conf=$(use_with oss sound oss)
-		fi
+	if use pulseaudio; then
+		sound_conf="--with-sound=pulse"
+	elif use ao; then
+		sound_conf="--with-sound=libao"
+	elif use alsa; then
+		sound_conf="--with-sound=alsa"
+	else
+		sound_conf=$(use_with oss sound oss)
 	fi
 
 	econf \
-		--with-openssl="${EPREFIX}"/usr \
-		$(use_with debug) \
 		$(use_with ipv6) \
-		$(use_with libsamplerate) \
 		$(use_with xrandr) \
 		$(use_enable kerberos credssp) \
 		$(use_enable pcsc-lite smartcard) \
diff --git a/net-misc/seafile-client/Manifest b/net-misc/seafile-client/Manifest
index eacadd020f5e..6287fd703982 100644
--- a/net-misc/seafile-client/Manifest
+++ b/net-misc/seafile-client/Manifest
@@ -1,4 +1,6 @@
 AUX seafile-client-select-qt5.patch 807 BLAKE2B bc28c24a114899fa4d864a3ea10d1d2ab08410d0360e8499d40aee2a26358b5bc401edd8e57121306a5e840b674c50930840c3b8723eae1930421eaf3dbfe919 SHA512 565cd7a3b4f187ef52b9a95b0d657a35cc9722c78e92dfc413b64f781c3cae129aba23ab302f80c7526ccab234b0354709e95d1e79d356a502cce47370524f41
 DIST seafile-client-6.2.11.tar.gz 2346059 BLAKE2B 107ed7af53a8e0244a9d9805d3c84f66e273f00d306663cfaa07983f94ed98f0dc23cce7d1ff7592bdb64915d1e7dd32cb5a2e9bb10f4b36b87bd28f8f3a9082 SHA512 4ba39c33c41cb95e2ff5bb9704cdac1f95561bb4ff0b59d0993364070c5ee10284c51d640591195b7361b595221fd899a4aeafcac1c917625b175e98b9a894a2
+DIST seafile-client-7.0.2.tar.gz 2365981 BLAKE2B 9e11d3e2b770f2b85bb55f0108344c1c69e1fb28ea69ea8a5022efc7811f6336a2fee0de4f38981343d7a29270051e292c14f656d7a7b99e0d646d0f3fee9a9b SHA512 3edafb9728eb39e1b2adbcb0526758279599d25020c5303aa6b610aac1296eef0ebe66447f6555c21dbe125aa5ac1d605736359b52f2bd8933187efd04c2e8df
 EBUILD seafile-client-6.2.11.ebuild 1079 BLAKE2B 1c0063f8e7a59724543578fd7b86afba18d613d310713446790c4fd01e5f0a0d0a15f0329dfa60e55c80b0cec8f190ff137ebf3bb533fee5a003e60385521e93 SHA512 7fd40b48cbf3fc6533c56450f8fea78aa3685ebe9c04e40172ae18a5ac8f2a25d6e05567d6b35385485e64a3dd51336b2fc69f6baa9381d302d0a9f1410f60e5
-MISC metadata.xml 345 BLAKE2B 5bb1b4c7f29473d3796c8c466c2ed836b01251edcbabe2b1800e19be723e206810ea9fd9f1ae9426d7bade242c31c677c9ccffb9c0fa2874c0f852c194980710 SHA512 6365751dd09e9f9caf9441e3c9235e39a47c80daa36697aa8c96ab9015029565ac0ae308916625549115a9a8ed0e5544e584e46928ae44a55aa9d88e5d00c1cb
+EBUILD seafile-client-7.0.2.ebuild 1089 BLAKE2B 5b6c502226191237424bf3bf90e394faadae6739be6c9b8bca3bfd89517adfe29d4bc7fed666eaef88fba6180e0d173faf29d954c6dca8ef6364ac346d1265f0 SHA512 05af2e61619a742929888e6f1a22b52576172d0ef0bbe4c6b90adc699d9da07ec1b959a18c15c0e0e5da4b63f69180ba6ed75dd9ef206894304181747cd0e9de
+MISC metadata.xml 541 BLAKE2B 994b8936e2a25627989635426eb7f2e3a23f1943b2c5908f50a789bc1f5f84753efe6e305effb1046bb4948224c068233079fac0003e3f5b2beb507aafdac9f8 SHA512 4ce109a926de9d456bf209ff539f57e15f11c8bd486ea1984658383f5435fbec3ae7b8a77cef45409f5fc6a7e4c6c91b7890bccb6e8ccf3eaa721b92d916a33f
diff --git a/net-misc/seafile-client/metadata.xml b/net-misc/seafile-client/metadata.xml
index f8cd338dfd6d..b8aedb1fc8fa 100644
--- a/net-misc/seafile-client/metadata.xml
+++ b/net-misc/seafile-client/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>efremov@linux.com</email>
+		<name>Denis Efremov</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="shibboleth">Build support for Shibboleth single sign-on</flag>
 	</use>
diff --git a/net-misc/seafile-client/seafile-client-7.0.2.ebuild b/net-misc/seafile-client/seafile-client-7.0.2.ebuild
new file mode 100644
index 000000000000..8305fcd55b44
--- /dev/null
+++ b/net-misc/seafile-client/seafile-client-7.0.2.ebuild
@@ -0,0 +1,52 @@
+# 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}
+	test? ( dev-qt/qttest:5 )"
+BDEPEND="dev-qt/linguist-tools: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 f292b1fdaaa9..3dfbdfa7f80b 100644
--- a/net-misc/seafile/Manifest
+++ b/net-misc/seafile/Manifest
@@ -1,3 +1,5 @@
 DIST seafile-6.2.11.tar.gz 703739 BLAKE2B a072b103875e3a90a9c457079d3101262abc826659c604130f7c3e9d1b129e7d806b687a5673109b37cf040bba02a0a862374997a819cf384ecf2bd3bb6af058 SHA512 90ff1ca4c2a75da9a44d7833209800629c7bec3e8d5b651a820d158261bee77a3b7e599748e6ed350fe919fb67685882a215c18720b0a9702d56e384b8561985
+DIST seafile-7.0.2.tar.gz 698373 BLAKE2B 171ef14253c260d0e1ed9e984219a545bc5c86895fd554223148515feeb8fd2c6f9ab802f0f505ada0ed504def01999cdd254683de6e0d00f77272eb9d491f4b SHA512 f348139662edb061bbb2da534cd099619f23e09b1383cc97a53116c7e1eb5b41e95d61f719a83f3a69d3914e64836baf15900a9597a7b6ddfb8d23f3e362b8cd
 EBUILD seafile-6.2.11.ebuild 1048 BLAKE2B 8427d6e2fbaf0c0cd07539c75b2710773f802bbf64b47cc19c5278faa767f8ec8ebd6b48d81410f1ec9960bac6baaf1eaa6d432f36629572db510cb055d2f2b2 SHA512 8bb17b48494317a758d414c56db5751a229859072aa6634cc826208eae48c4cd21c1659b86064100032f1d685140fc3c55e2df623ac5aa5f3bb29344075e29ea
-MISC metadata.xml 246 BLAKE2B 982e99661e8894a8808c39c6ee396fbe1fcf4430ad6a4c820b357c5e96f45e008d92d3319734f94c7403b926bc7befaf231037e832bc3521952ecf9bc42f51bf SHA512 71bf99d5820faaf9004a517dffec80e1a2240e31b0db7449f672b68926c0e229cd710670468e95cf305d6136edc5e2d825e597d4648a90f68929bf8d82a1d61a
+EBUILD seafile-7.0.2.ebuild 1049 BLAKE2B 535fe6fb71c373a01ef4749c4d4e5dc94082069c05c933a08c6512d14f4874eb626cf74ced0830626d5817167bfd5ce1e068e1dde8ff382de2296a520f7ff99d SHA512 f98355eb1e314085de614899e6ebf8b9e23f15957d0f77e95b8fa5a90eff7ef4aa459c7f87f40438659490326e06524e5be0b64d3fb64f24b5aaf0735ba1e3de
+MISC metadata.xml 442 BLAKE2B 46c5da41a70765d782fa536789caa196545f800145ad109df96cc0cc819e41411aae7e0beec1161e09a37479ec9e6c79ff08395fe73eba8a092c07ed40a37f41 SHA512 b134c065c3c389e0db935094b7efbed1eb82e09be3ab83b31b2b84c3c6860c7fe002554e1ee817f69c8f873a67a352127b8d8e663a5088f5a38255ef15f2e20b
diff --git a/net-misc/seafile/metadata.xml b/net-misc/seafile/metadata.xml
index 36923d5c8719..f2d263d441e9 100644
--- a/net-misc/seafile/metadata.xml
+++ b/net-misc/seafile/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>efremov@linux.com</email>
+		<name>Denis Efremov</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">haiwen/seafile</remote-id>
 	</upstream>
diff --git a/net-misc/seafile/seafile-7.0.2.ebuild b/net-misc/seafile/seafile-7.0.2.ebuild
new file mode 100644
index 000000000000..4c5040c1196d
--- /dev/null
+++ b/net-misc/seafile/seafile-7.0.2.ebuild
@@ -0,0 +1,43 @@
+# 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/spice-gtk/Manifest b/net-misc/spice-gtk/Manifest
index f0d295f2e103..63fd50671b3c 100644
--- a/net-misc/spice-gtk/Manifest
+++ b/net-misc/spice-gtk/Manifest
@@ -1,10 +1,10 @@
 AUX README.gentoo 527 BLAKE2B 5f02dbe14485894513b67bfb8b6f6159321e081f82f24c76a4b05f1463f8a6e332fffb2510b791a04fb9ad99ce7caba761b313fe2252c8d44893faa6ccef0d29 SHA512 2f8a79f6eea330ac9a6927c6cce29f9232c3c0650436f3f4c459d324bd5054a4ad82786d926e5e4c7384e74cb84d1fbb387c25b0b4c27fdb9514d526cbe02f9b
 AUX spice-gtk-0.34-openssl11.patch 518 BLAKE2B d9c692996f64ccfb61f16f2c8b620559d1321f35c74072c3e0c51a115f7d40039b7c6dd484cf3beec90c8950df5fbb42575ab62e3c309da3405b5217864b746b SHA512 f879a3f26be439a68e1f40e32e654eea301efc9f5494039b7166673337688f0832e180ab77863cde55627ee033572caf04d5bb08816d4272382d9dccf43ef7f1
 AUX spice-gtk-0.35-libressl.patch 2025 BLAKE2B f1123494cfa4f2cf3d168ae1f2a1277b77dd2afc9a0c4911a65941977f8bac30b30de1d03575fcaf483cd5f9cc8f4ff150a40b6f1bfb8b19da18d2027fc1f04f SHA512 b7717296b66a32f3dd3458de27059c82fd826479143b0261819d0abad5f496cedaca61da42706808b686e1b55bb8c7613187c0b103ccbc9566abb3385c7a36de
+AUX spice-gtk-0.37-adjust-to-window-scaling.patch 5257 BLAKE2B a60692c0e08cfed4933cdfe15378c428d4bd006b6f91412f5071519d9027efe95b94ecd3baf4ebabd7143d358433cccc7335ea41a9a5fb9ed280e63664c04d01 SHA512 13afe7b894954d25635c2fc146b6386eb3973c151363067ec0762f95a349bf6d2d26005521214db07fd2a69ce9e994c9d25b92d0b80882c015b8313bb2016328
 DIST spice-gtk-0.35.tar.bz2 1437231 BLAKE2B f2731a794cf22b491bf858fff44506288af730b37f1c37e16ac3042d662373b4e4021808d5ca72440012fb36a5119ad11858cb8cf872b04376518487faebef49 SHA512 f0914a4a9baf892e39dab7d51aa9f5ab4dbb4ef01f09da158b20756f890745837d0a6c8c1f7897844e695be2ed01f3b1d04ada1cacc958b5cfadb0d4bf7c4729
 DIST spice-gtk-0.37.tar.bz2 1303111 BLAKE2B cf4b6664ac86d126cf14f1a31b1df93079e15fc0a0af69bfaf61cb84284daa7b6b8cb2a2ee3345f6a475838ffc0fb2a2b0bdd61301e2c1479fb5f5e0c28babbe SHA512 a0a20bc6f25337d86e57fe1fc9586c4cc84457fc8c38cdcc5a728990a69018da0fca3ab5aa63349786b5a7508c82b716c94803eefb3495cffb7df4526db2d029
-EBUILD spice-gtk-0.35-r1.ebuild 3644 BLAKE2B d9af139bcc0ebf73761baf6ca0e7576b79d0684bad33ca49b48ceca06f4ae895f8d9fd737f575f241f90fc988e57d84f78f0c0795aa7532649c6d88a7f9afdb0 SHA512 139c7e72429d06b82272141430927bb6d163d64a6b9011f094cad504733dd3fdb3f8b9899fab41514e5ceedcf11b29dddad6882d9069af4a850fb8eae78c2195
-EBUILD spice-gtk-0.35.ebuild 3606 BLAKE2B e9847a0cdf2093241e8e54bfb4d56d9617c8f812abfbe3461fab52a2a3ad4440c781ab221c236eac52ea51bbb3cd3f0ce059abd81b42a218f259c0bde17ac085 SHA512 260bef70ecbea74788de9cb7730ede3e345407c382ca57fb428d2b548ccd7ede67fe948b4cc61a70055edd6c184d5cd5b37b9e144a97f35484d77f30710ba3bd
-EBUILD spice-gtk-0.37-r2.ebuild 3672 BLAKE2B 60e5a10d61c571185ce7abb56b9d8e6449338f87d09604c7ee8485360ed5945c02a02003797ae3edb1e7ca5edec35f0c4d3e6c7159232b6b3a96edd930806b53 SHA512 ce882723b5a1f445fca3332a54225b24d362a27dea6554153c5a96c19b807f945ed87f8952c1ba8956bc3b5b8675cd606ee10c5e979921475c357568b6534954
-EBUILD spice-gtk-9999.ebuild 3637 BLAKE2B 6a95666f309c1d29779b33a225d8a429caf6954f6a4ba5ee993ea7e0db539b6341d2e3d85f66ae5d4fe2e05a7b61a69e80a578ff2ea8de1c8de3ca44f1529de9 SHA512 39f419bc6188c40e25332111ae4953f3eeccfbb6880fd7b22d20be90ce534f9267e6e6f094e36e8cb76d3677cccbea50895f53039acd46b934d24dd3b2e3c9c2
+EBUILD spice-gtk-0.35.ebuild 3607 BLAKE2B 85b9ecbdd8cf0f7fd919325142c7bef634fcdc6985a18738f032bc5671fb4f57d79eeb20792cdc908ccc6ec82844250bc0031bc4b399dee822a480ab94c0842d SHA512 c0a4ed0daac8b060615f7edbcbf1518dbc38a895c48b4192e1a7f4acb1feed31b7179f5636d95cc63a1dd5f7872ab44db9e27512e1036a303f41f3fc610d0b0d
+EBUILD spice-gtk-0.37-r2.ebuild 3739 BLAKE2B df139b67cd3c1038e07662b9afcf8c4bdd4a79fad2d624366287563ee695df045c2cf5aeefd575af45bc703491e491887945ea225995d18deb012e2a3ba416f0 SHA512 71688a1d0c8de4e360a67c91ef1f313ba05515393354f32980084f2438cebdec410c4e0ec060128549b7eeba38d1c80dbcadf41cb18d7cb0115d470f525bbd81
+EBUILD spice-gtk-9999.ebuild 3394 BLAKE2B 2014ce9d0d762a51286f1f0b6cf7802606dad6dba0c2fe7e83ffd005828c81a0f09287de4561f51ea897195ed2261b5bba354d938b0d3ff518ef725d681e7759 SHA512 f9c4cd502006ce73f3129d32907e3e52ff2a217f497021ce398f49a6e2c422e2ae6de61acc70c250778a2a6fcfc09baed4f9577f9cb65aeefa7d713bbf5e7a85
 MISC metadata.xml 1072 BLAKE2B 0dec19853765b4a606a94fb31df1e6d569bc0131a7e2a9a28d822218b7f11d0d039d27d9bf4cdc43e073ed2ea433f1af7971a48a0529cd46b10f45f7b5ec1ff7 SHA512 8f94f0d99d6bfefba369f974d0b8358f86f5e3910279e5ab8ccb08b5ffb428f911ae64bb8904415e330c543609ee46c2dbd68f34912b50aca3929016fcac26de
diff --git a/net-misc/spice-gtk/files/spice-gtk-0.37-adjust-to-window-scaling.patch b/net-misc/spice-gtk/files/spice-gtk-0.37-adjust-to-window-scaling.patch
new file mode 100644
index 000000000000..504cb7c4848b
--- /dev/null
+++ b/net-misc/spice-gtk/files/spice-gtk-0.37-adjust-to-window-scaling.patch
@@ -0,0 +1,132 @@
+From 262c84081fbd3cfc3d92e6ae9a60a780549d6c2f Mon Sep 17 00:00:00 2001
+From: Snir Sheriber <ssheribe@redhat.com>
+Date: Thu, 28 Feb 2019 11:44:34 +0200
+Subject: [PATCH] Adjust to window scaling
+
+When GDK_SCALE is != 1 and egl is used, the image presented does not
+fit to the window (scale of 2 is often used with hidpi monitors).
+Usually this is not a problem since all components are adjusted by
+gdk/gtk but with egl, pixel-based data is not being scaled. In this
+case window's scale value can be used in order to determine whether
+to use a pixel resource with higher resolution data.
+
+In order to reproduce the problem set spice with virgl/Intel-vGPU
+and run spice-gtk with GDK_SCALE=2
+
+This issue was also reported at freedesktop gitlab repo:
+https://gitlab.freedesktop.org/spice/spice-gtk/issues/99
+
+Signed-off-by: Snir Sheriber <ssheribe@redhat.com>
+Acked-by: Victor Toso <victortoso@redhat.com>
+---
+ src/spice-widget-egl.c |  7 ++++---
+ src/spice-widget.c     | 27 +++++++++++++++++++--------
+ 2 files changed, 23 insertions(+), 11 deletions(-)
+
+diff --git a/src/spice-widget-egl.c b/src/spice-widget-egl.c
+index 43fccd7..7bae4e5 100644
+--- a/src/spice-widget-egl.c
++++ b/src/spice-widget-egl.c
+@@ -360,9 +360,9 @@ gboolean spice_egl_realize_display(SpiceDisplay *display, GdkWindow *win, GError
+     DISPLAY_DEBUG(display, "egl realize");
+     if (!spice_widget_init_egl_win(display, win, err))
+         return FALSE;
+-
+-    spice_egl_resize_display(display, gdk_window_get_width(win),
+-                             gdk_window_get_height(win));
++    gint scale_factor = gtk_widget_get_scale_factor(GTK_WIDGET(display));
++    spice_egl_resize_display(display, gdk_window_get_width(win) * scale_factor,
++                             gdk_window_get_height(win) * scale_factor);
+ 
+     return TRUE;
+ }
+@@ -426,6 +426,7 @@ void spice_egl_unrealize_display(SpiceDisplay *display)
+ #endif
+ }
+ 
++/* w and h should be adjusted to gdk scaling */
+ G_GNUC_INTERNAL
+ void spice_egl_resize_display(SpiceDisplay *display, int w, int h)
+ {
+diff --git a/src/spice-widget.c b/src/spice-widget.c
+index 1f2a154..a9ba1f1 100644
+--- a/src/spice-widget.c
++++ b/src/spice-widget.c
+@@ -1382,7 +1382,8 @@ static void set_egl_enabled(SpiceDisplay *display, bool enabled)
+     }
+ 
+     if (enabled && d->egl.context_ready) {
+-        spice_egl_resize_display(display, d->ww, d->wh);
++        gint scale_factor = gtk_widget_get_scale_factor(GTK_WIDGET(display));
++        spice_egl_resize_display(display, d->ww * scale_factor, d->wh * scale_factor);
+     }
+ 
+     d->egl.enabled = enabled;
+@@ -1978,11 +1979,14 @@ static void transform_input(SpiceDisplay *display,
+     SpiceDisplayPrivate *d = display->priv;
+     int display_x, display_y, display_w, display_h;
+     double is;
++    gint scale_factor = 1;
+ 
+     spice_display_get_scaling(display, NULL,
+                               &display_x, &display_y,
+                               &display_w, &display_h);
+-
++    if (egl_enabled(d)) {
++        scale_factor = gtk_widget_get_scale_factor(GTK_WIDGET(display));
++    }
+     /* For input we need a different scaling factor in order to
+        be able to reach the full width of a display. For instance, consider
+        a display of 100 pixels showing in a window 10 pixels wide. The normal
+@@ -1998,7 +2002,7 @@ static void transform_input(SpiceDisplay *display,
+        coordinates in the inverse direction (window -> display) as the fb size
+        (display -> window).
+     */
+-    is = (double)(d->area.width-1) / (double)(display_w-1);
++    is = ((double)(d->area.width-1) / (double)(display_w-1)) * scale_factor;
+ 
+     window_x -= display_x;
+     window_y -= display_y;
+@@ -2183,8 +2187,10 @@ static void size_allocate(GtkWidget *widget, GtkAllocation *conf, gpointer data)
+         d->wh = conf->height;
+         recalc_geometry(widget);
+ #if HAVE_EGL
+-        if (egl_enabled(d))
+-            spice_egl_resize_display(display, conf->width, conf->height);
++        if (egl_enabled(d)) {
++            gint scale_factor = gtk_widget_get_scale_factor(widget);
++            spice_egl_resize_display(display, conf->width * scale_factor, conf->height * scale_factor);
++        }
+ #endif
+     }
+ 
+@@ -2942,10 +2948,14 @@ void spice_display_get_scaling(SpiceDisplay *display,
+     int ww, wh;
+     int x, y, w, h;
+     double s;
++    gint scale_factor = 1;
+ 
+     if (gtk_widget_get_realized (GTK_WIDGET(display))) {
+-        ww = gtk_widget_get_allocated_width(GTK_WIDGET(display));
+-        wh = gtk_widget_get_allocated_height(GTK_WIDGET(display));
++        if (egl_enabled(d)) {
++            scale_factor = gtk_widget_get_scale_factor(GTK_WIDGET(display));
++        }
++        ww = gtk_widget_get_allocated_width(GTK_WIDGET(display)) * scale_factor;
++        wh = gtk_widget_get_allocated_height(GTK_WIDGET(display)) * scale_factor;
+     } else {
+         ww = fbw;
+         wh = fbh;
+@@ -3091,7 +3101,8 @@ void spice_display_widget_gl_scanout(SpiceDisplay *display)
+             g_clear_error(&err);
+         }
+ 
+-        spice_egl_resize_display(display, d->ww, d->wh);
++        gint scale_factor = gtk_widget_get_scale_factor(GTK_WIDGET(display));
++        spice_egl_resize_display(display, d->ww * scale_factor, d->wh * scale_factor);
+     }
+ #endif
+ 
+-- 
+2.21.0
+
diff --git a/net-misc/spice-gtk/spice-gtk-0.35-r1.ebuild b/net-misc/spice-gtk/spice-gtk-0.35-r1.ebuild
deleted file mode 100644
index 2bf65fbe5552..000000000000
--- a/net-misc/spice-gtk/spice-gtk-0.35-r1.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-GCONF_DEBUG="no"
-VALA_MIN_API_VERSION="0.14"
-VALA_USE_DEPEND="vapigen"
-
-inherit autotools eutils xdg-utils vala readme.gentoo-r1
-
-DESCRIPTION="Set of GObject and Gtk objects for connecting to Spice servers and a client GUI"
-HOMEPAGE="https://www.spice-space.org https://cgit.freedesktop.org/spice/spice-gtk/"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-SRC_URI="https://www.spice-space.org/download/gtk/${P}.tar.bz2"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="dbus gstaudio gstvideo +gtk3 +introspection lz4 mjpeg policykit pulseaudio sasl smartcard static-libs usbredir vala webdav libressl"
-
-REQUIRED_USE="?? ( pulseaudio gstaudio )"
-
-# TODO:
-# * check if sys-freebsd/freebsd-lib (from virtual/acl) provides acl/libacl.h
-# * use external pnp.ids as soon as that means not pulling in gnome-desktop
-RDEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	pulseaudio? ( media-sound/pulseaudio[glib] )
-	gstvideo? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-		media-libs/gst-plugins-good:1.0
-		)
-	gstaudio? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-		media-libs/gst-plugins-good:1.0
-		)
-	>=x11-libs/pixman-0.17.7
-	media-libs/opus
-	gtk3? ( x11-libs/gtk+:3[introspection?] )
-	>=dev-libs/glib-2.46:2
-	>=x11-libs/cairo-1.2
-	virtual/jpeg:0=
-	sys-libs/zlib
-	introspection? ( dev-libs/gobject-introspection )
-	lz4? ( app-arch/lz4 )
-	sasl? ( dev-libs/cyrus-sasl )
-	smartcard? ( app-emulation/qemu[smartcard] )
-	usbredir? (
-		sys-apps/hwids
-		>=sys-apps/usbredir-0.4.2
-		virtual/libusb:1
-		virtual/libgudev:=
-		policykit? (
-			sys-apps/acl
-			>=sys-auth/polkit-0.110-r1
-			!~sys-auth/polkit-0.111 )
-		)
-	webdav? (
-		net-libs/phodav:2.0
-		>=net-libs/libsoup-2.49.91 )
-"
-DEPEND="${RDEPEND}
-	>=app-emulation/spice-protocol-0.12.14
-	dev-perl/Text-CSV
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.14
-	>=dev-util/intltool-0.40.0
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.34-openssl11.patch
-	"${FILESDIR}"/${P}-libressl.patch
-)
-
-src_prepare() {
-	# bug 558558
-	export GIT_CEILING_DIRECTORIES="${WORKDIR}"
-
-	default
-
-	eautoreconf
-
-	use vala && vala_src_prepare
-}
-
-src_configure() {
-	# Prevent sandbox violations, bug #581836
-	# https://bugzilla.gnome.org/show_bug.cgi?id=744134
-	# https://bugzilla.gnome.org/show_bug.cgi?id=744135
-	addpredict /dev
-
-	# Clean up environment, bug #586642
-	xdg_environment_reset
-
-	local myconf
-	myconf="
-		$(use_enable static-libs static)
-		$(use_enable introspection)
-		$(use_with sasl)
-		$(use_enable smartcard)
-		$(use_enable usbredir)
-		$(use_with usbredir usb-ids-path /usr/share/misc/usb.ids)
-		$(use_with usbredir usb-acl-helper-dir /usr/libexec)
-		$(use_with gtk3 gtk 3.0)
-		$(use_enable policykit polkit)
-		$(use_enable pulseaudio pulse)
-		$(use_enable gstaudio)
-		$(use_enable gstvideo)
-		$(use_enable mjpeg builtin-mjpeg)
-		$(use_enable vala)
-		$(use_enable webdav)
-		$(use_enable dbus)
-		--disable-celt051
-		--disable-gtk-doc
-		--disable-maintainer-mode
-		--disable-werror
-		--enable-pie"
-
-	econf ${myconf}
-}
-
-src_compile() {
-	# Prevent sandbox violations, bug #581836
-	# https://bugzilla.gnome.org/show_bug.cgi?id=744134
-	# https://bugzilla.gnome.org/show_bug.cgi?id=744135
-	addpredict /dev
-
-	default
-}
-
-src_install() {
-	default
-
-	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
-
-	# Remove .la files if they're not needed
-	use static-libs || prune_libtool_files
-
-	make_desktop_entry spicy Spicy "utilities-terminal" "Network;RemoteAccess;"
-	readme.gentoo_create_doc
-}
diff --git a/net-misc/spice-gtk/spice-gtk-0.35.ebuild b/net-misc/spice-gtk/spice-gtk-0.35.ebuild
index d6e46f5386d3..07b64a227a3c 100644
--- a/net-misc/spice-gtk/spice-gtk-0.35.ebuild
+++ b/net-misc/spice-gtk/spice-gtk-0.35.ebuild
@@ -48,10 +48,10 @@ RDEPEND="
 	sasl? ( dev-libs/cyrus-sasl )
 	smartcard? ( app-emulation/qemu[smartcard] )
 	usbredir? (
+		dev-libs/libgudev:=
 		sys-apps/hwids
 		>=sys-apps/usbredir-0.4.2
 		virtual/libusb:1
-		virtual/libgudev:=
 		policykit? (
 			sys-apps/acl
 			>=sys-auth/polkit-0.110-r1
diff --git a/net-misc/spice-gtk/spice-gtk-0.37-r2.ebuild b/net-misc/spice-gtk/spice-gtk-0.37-r2.ebuild
index 146bbc7608c1..cb24fbda3a85 100644
--- a/net-misc/spice-gtk/spice-gtk-0.37-r2.ebuild
+++ b/net-misc/spice-gtk/spice-gtk-0.37-r2.ebuild
@@ -26,7 +26,7 @@ RDEPEND="
 	dev-libs/json-glib:0=
 	media-libs/gst-plugins-base:1.0
 	media-libs/gst-plugins-good:1.0
-	media-libs/gstreamer:1.0
+	media-libs/gstreamer:1.0[introspection?]
 	media-libs/opus
 	sys-libs/zlib
 	virtual/jpeg:0=
@@ -74,6 +74,7 @@ DEPEND="${RDEPEND}
 "
 
 PATCHES=(
+	"${FILESDIR}"/${P}-adjust-to-window-scaling.patch
 )
 
 src_prepare() {
diff --git a/net-misc/spice-gtk/spice-gtk-9999.ebuild b/net-misc/spice-gtk/spice-gtk-9999.ebuild
index c4e0bd6c740b..96f51b0281d4 100644
--- a/net-misc/spice-gtk/spice-gtk-9999.ebuild
+++ b/net-misc/spice-gtk/spice-gtk-9999.ebuild
@@ -3,12 +3,10 @@
 
 EAPI=7
 
-GCONF_DEBUG="no"
-WANT_AUTOMAKE="1.12"
 VALA_MIN_API_VERSION="0.14"
 VALA_USE_DEPEND="vapigen"
 
-inherit autotools desktop eutils git-r3 readme.gentoo-r1 vala xdg-utils
+inherit desktop eutils git-r3 meson readme.gentoo-r1 vala xdg-utils
 
 DESCRIPTION="Set of GObject and Gtk objects for connecting to Spice servers and a client GUI"
 HOMEPAGE="https://www.spice-space.org https://cgit.freedesktop.org/spice/spice-gtk/"
@@ -17,7 +15,7 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 EGIT_REPO_URI="https://anongit.freedesktop.org/git/spice/spice-gtk.git"
 KEYWORDS=""
-IUSE="+gtk3 +introspection lz4 mjpeg policykit pulseaudio sasl smartcard static-libs usbredir vala webdav libressl"
+IUSE="+gtk3 +introspection lz4 mjpeg policykit pulseaudio sasl smartcard usbredir vala webdav libressl"
 
 # TODO:
 # * check if sys-freebsd/freebsd-lib (from virtual/acl) provides acl/libacl.h
@@ -27,7 +25,7 @@ RDEPEND="
 	dev-libs/json-glib:0=
 	media-libs/gst-plugins-base:1.0
 	media-libs/gst-plugins-good:1.0
-	media-libs/gstreamer:1.0
+	media-libs/gstreamer:1.0[introspection?]
 	media-libs/opus
 	sys-libs/zlib
 	virtual/jpeg:0=
@@ -80,8 +78,6 @@ src_prepare() {
 
 	default
 
-	eautoreconf
-
 	use vala && vala_src_prepare
 }
 
@@ -94,28 +90,22 @@ src_configure() {
 	# Clean up environment, bug #586642
 	xdg_environment_reset
 
-	local myconf
-	myconf="
-		$(use_with gtk3 gtk 3.0)
-		$(use_enable introspection)
-		$(use_enable mjpeg builtin-mjpeg)
-		$(use_enable policykit polkit)
-		$(use_enable pulseaudio pulse)
-		$(use_with sasl)
-		$(use_enable smartcard)
-		$(use_enable static-libs static)
-		$(use_enable usbredir)
-		$(use_with usbredir usb-acl-helper-dir /usr/libexec)
-		$(use_with usbredir usb-ids-path /usr/share/misc/usb.ids)
-		$(use_enable vala)
-		$(use_enable webdav)
-		--disable-celt051
-		--disable-gtk-doc
-		--disable-maintainer-mode
-		--disable-werror
-		--enable-pie"
-
-	econf ${myconf}
+	local emesonargs=(
+		$(meson_feature gtk3 gtk)
+		$(meson_feature introspection)
+		$(meson_use mjpeg builtin-mjpeg)
+		$(meson_feature policykit polkit)
+		$(meson_feature pulseaudio pulse)
+		$(meson_feature sasl)
+		$(meson_feature smartcard)
+		$(meson_feature usbredir)
+		$(usex usbredir -Dusb-acl-helper-dir=/usr/libexec)
+		$(usex usbredir -Dusb-ids-path=/usr/share/misc/usb.ids)
+		$(meson_feature vala vapi)
+		$(meson_feature webdav)
+	)
+
+	meson_src_configure
 }
 
 src_compile() {
@@ -124,14 +114,11 @@ src_compile() {
 	# https://bugzilla.gnome.org/show_bug.cgi?id=744135
 	addpredict /dev
 
-	default
+	meson_src_compile
 }
 
 src_install() {
-	default
-
-	# Remove .la files if they're not needed
-	use static-libs || find "${D}" -name '*.la' -delete || die
+	meson_src_install
 
 	make_desktop_entry spicy Spicy "utilities-terminal" "Network;RemoteAccess;"
 	readme.gentoo_create_doc
diff --git a/net-misc/suite3270/Manifest b/net-misc/suite3270/Manifest
index 7136600989a1..ed50d45db241 100644
--- a/net-misc/suite3270/Manifest
+++ b/net-misc/suite3270/Manifest
@@ -3,8 +3,8 @@ DIST suite3270-3.5ga10-src.tgz 3412329 BLAKE2B c9ed308cf970da150da985d76ec377c83
 DIST suite3270-3.5ga12-src.tgz 3412286 BLAKE2B 5602f8bbe7b916a977c97848ff9a413a873f61e1c0c62b8c118dc43703adcd4a668e3cc301f9e37a139eebeeae44aca3cdedd0c10de15870ad8ead00d783e1ef SHA512 c7cb25b5c82b0d7ccac8c3ed17317a5a5ebce24fb32dcdfcaf7158157578617a7bccc265fdb67fce0557caa9c75d1afc2d8152a06b98af43ad9a9e29b5f2a267
 DIST suite3270-3.6ga4-src.tgz 3288095 BLAKE2B 34245d6050f7d70ef6195dc669fea55eed70cb9b6c616a4bc88bc52bcfd9d837e527debc87eba4ccdc47c4a453e16749c23b9618d5bf4198e4131573f437209b SHA512 5309c4b4ad0d730033166b0bdb7638bba5fc00908776a229d5f0a131f72741897a0bf6b86dee3b1c9f3d480dc4f23e03e812d3349cec7094908c6a54a87d5ccb
 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 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
+EBUILD suite3270-3.5_p10.ebuild 2111 BLAKE2B 3720091974c742b7f15dac52389a61fcab79ba58a5069cb22f6298f6e780c0de1f04c969bdf5d75418e3e60ea89b4e06cafc687015cc10e91e3444370dff21db SHA512 0957867c66c3e13f181061b754256e386bd8693441c22d0135e9634c6b52c9744a894415a296d30186be2ae65824844eb034d7fcc3b8a6e5198221aa92ae87fe
+EBUILD suite3270-3.5_p12.ebuild 2111 BLAKE2B 3720091974c742b7f15dac52389a61fcab79ba58a5069cb22f6298f6e780c0de1f04c969bdf5d75418e3e60ea89b4e06cafc687015cc10e91e3444370dff21db SHA512 0957867c66c3e13f181061b754256e386bd8693441c22d0135e9634c6b52c9744a894415a296d30186be2ae65824844eb034d7fcc3b8a6e5198221aa92ae87fe
+EBUILD suite3270-3.6_p4.ebuild 2116 BLAKE2B e37c59bc618a3b93f0bbea5514759b3b7de4abf77d6f0c5da239818260f7f95ece0240e5b4207e26b4f8dc5db78c0a80ccc7c4fc0787a76f72b04e9edf36f669 SHA512 d7a82a99a30fa7e142d3d5af95870242c8d15f5093145362ab81f023e67d6e8119d8b43e295188a4f5d7248679bf0276e2aafe0cdf3d83aa2c54678fc08c2f9c
+EBUILD suite3270-3.6_p8.ebuild 2131 BLAKE2B ce8b9914fd1a727ae89275f0e8b3c249e801acb57f81a500b4bbe3adb48e4305bfb6edc3c12d30ff182a292d2f509bc81c7977851db7abb2f6f0ff0d6019998e SHA512 9060597d86be01a6de0e2c1b06399cff3ff0a354caa9330710bd90c43ea4d09253fb47d7a2daca461ca1f4b7b1ae09f458e48848a4f4685cffeda1d7a03468bd
 MISC metadata.xml 463 BLAKE2B 5035d30c690419dbe52b4caf68981eb40c858f09787189439dda81dd57096276a029201b0ea3eb67840a14552d9c4dcf21eb00003ea530b79b85219cc607c19b SHA512 ef297d66d1c0b2c7ab6f8d0c489f355267124cd1f0cc09d18cf1b2cd33458be4c8e1716e84753ba6e49903a90fb676fb7ae908205672f927656ebd9c11879e45
diff --git a/net-misc/suite3270/suite3270-3.5_p10.ebuild b/net-misc/suite3270/suite3270-3.5_p10.ebuild
index 8f3125ae488d..887b8223af5c 100644
--- a/net-misc/suite3270/suite3270-3.5_p10.ebuild
+++ b/net-misc/suite3270/suite3270-3.5_p10.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="5"
@@ -41,7 +41,7 @@ DEPEND="${RDEPEND}
 		x11-base/xorg-proto
 		x11-misc/xbitmaps
 		app-text/rman
-		x11-apps/mkfontdir
+		>=x11-apps/mkfontscale-1.2.0
 		x11-apps/bdftopcf
 	)"
 
diff --git a/net-misc/suite3270/suite3270-3.5_p12.ebuild b/net-misc/suite3270/suite3270-3.5_p12.ebuild
index 8f3125ae488d..887b8223af5c 100644
--- a/net-misc/suite3270/suite3270-3.5_p12.ebuild
+++ b/net-misc/suite3270/suite3270-3.5_p12.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="5"
@@ -41,7 +41,7 @@ DEPEND="${RDEPEND}
 		x11-base/xorg-proto
 		x11-misc/xbitmaps
 		app-text/rman
-		x11-apps/mkfontdir
+		>=x11-apps/mkfontscale-1.2.0
 		x11-apps/bdftopcf
 	)"
 
diff --git a/net-misc/suite3270/suite3270-3.6_p4.ebuild b/net-misc/suite3270/suite3270-3.6_p4.ebuild
index f842aa368b8c..3b9de305c879 100644
--- a/net-misc/suite3270/suite3270-3.6_p4.ebuild
+++ b/net-misc/suite3270/suite3270-3.6_p4.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="5"
@@ -41,7 +41,7 @@ DEPEND="${RDEPEND}
 		x11-base/xorg-proto
 		x11-misc/xbitmaps
 		app-text/rman
-		x11-apps/mkfontdir
+		>=x11-apps/mkfontscale-1.2.0
 		x11-apps/bdftopcf
 	)"
 
diff --git a/net-misc/suite3270/suite3270-3.6_p8.ebuild b/net-misc/suite3270/suite3270-3.6_p8.ebuild
index d8808e7e2afd..f81e1979db33 100644
--- a/net-misc/suite3270/suite3270-3.6_p8.ebuild
+++ b/net-misc/suite3270/suite3270-3.6_p8.ebuild
@@ -41,7 +41,7 @@ DEPEND="${RDEPEND}
 		x11-base/xorg-proto
 		x11-misc/xbitmaps
 		app-text/rman
-		x11-apps/mkfontdir
+		>=x11-apps/mkfontscale-1.2.0
 		x11-apps/bdftopcf
 	)"
 
diff --git a/net-misc/teamviewer/Manifest b/net-misc/teamviewer/Manifest
index c7157ed552fe..30a3adfaa0b9 100644
--- a/net-misc/teamviewer/Manifest
+++ b/net-misc/teamviewer/Manifest
@@ -1,17 +1,8 @@
 AUX teamviewerd14.init 282 BLAKE2B af900eacf64f57d6c3a404cde9b42d4e45037c7bf8d5466422ebfddbce4fc1eb27c3982dd81d4bb918479b8da00104cd1b761e64738d00e70efb3b1d7fe2134e SHA512 0905da2033afbf2f4464fae31f7d22b87469c584b912d2f8b652d05a1f2a63709e87d0e70cb981cb87803e9d66f25c399f13eea0ecd0e665bd0a9c1f6994c3f1
-DIST teamviewer_14.2.2558_amd64.tar.xz 11986724 BLAKE2B 1369d60fcc10b31e7065bf8e8e238e7fc42cd57572c69ffb698b301ee2d421443663cd6d6e5f800cb0a046e3ac1ff97b82d103574cb46f2cf6beffad8d849261 SHA512 c64ca29d0a90c597c61993e90d6f66d85ffe3c9d8c59115abbde8814e2141c1e69092b8ce16aac413ed1bfa5eb2bd47cb9f0f737f14b22055a8a92c120e8a66e
-DIST teamviewer_14.2.2558_i386.tar.xz 12459844 BLAKE2B 108474be22f2b5d64cadb6d228232553aef304d017976a6785a716324d157c3fa580f4b54486b642f4d14ee258198a6f5cb6076d1ddc5de593c22fc320fc124f SHA512 f6c22ca12bddcec11a77ab67db7e8e5d83fc8ef41bdb5124afac23f1aa6ef908f4054bfce2d9cf1d20ddad9c39cbb5ecdd13d535c4f734f40271e23b824f7f01
-DIST teamviewer_14.2.8352_amd64.tar.xz 12000972 BLAKE2B 29c0222f940eea66a7dbcf380090caf5fe0f44f7c6929fb0d9d8beed3ba7dc036ba905df73e6752460e513da02f67fa9de35daf0c700313be7b57a6f0b95a220 SHA512 12367fa1a7fae0189cffc19bd106418d1c221207ac8d35e8cb4391e491b1a93bd94363c7a1a47dddf966298631481a4ea923b132886abfffa0f4efcbf63985a4
-DIST teamviewer_14.2.8352_i386.tar.xz 12469004 BLAKE2B 3aee7371b200ca1e599c7981b4ca725a9376b90bfb60ec66e7d93c658d5e69e77aab72d81f12d063c5b75a626c9fd7e8d9d1a9582b5fe19e86f769efb557bb0a SHA512 e391b7f8d9168dcf29146f6466693baa81b5e7956cc515e2d0301ced9055bfc67dc16b2d011ea3824fcc548d0d625a1cab574fafdae5ac61c9a37982be29d03b
-DIST teamviewer_14.4.2669_amd64.tar.xz 12237660 BLAKE2B d3c1638645720748fed6f8e588e59211e54625548b0c0a45316f2c51bf7560d6853fdfd86fdb1468a33ef75e1454c24c0afa2eccbec5a7a7848071edaa6b27ee SHA512 3a371538aaeb128156542b00a051e0db9ea20830a5dd666b7b2f5d239529d639407dbd520828b27d37f80d8fa06a9d09cfc1738357ac86df1e8f9fe7188dfd6a
-DIST teamviewer_14.4.2669_i386.tar.xz 12726704 BLAKE2B e8ab743646448488fc39ea9979e52a49c42e941cb173e89257dfcd3544dc2709a763d6c552c269c1559b3a7ccdf83265e30e06d06cebe8dcfca6dfe8a591791c SHA512 bbd6d48d1c70941d468c793bdede3b0a1aebbc7fd433c55be327f56cfd53435ffaebdd845ee595820dcce41d94f8a3fe9de00d2908901c4501ff61e34ad9349c
-DIST teamviewer_14.5.5819_amd64.tar.xz 12386480 BLAKE2B 2d5c11c811f10f3fd4a55e5ecbb010964b6317f9a813f73e543bf7c5be7cbd5b9c1e89a5f5ab1865a2e25eadc3e15c80485b725315019831b76ace3340df8dec SHA512 28a2733f8131fd9943ddc78166058939cf9a8682053153c3f7ccd64ff39feed8c9199adf93f5b96432d6e87f13067fdd649cce2a0af383d87f2adc0e223e20cb
-DIST teamviewer_14.5.5819_i386.tar.xz 12883512 BLAKE2B d7f5749a5e53ec3f6921c55c3d4256f00e9f8b67fddbae6d08fffc1f364850274c80df7578a90444cea092d553f535491a02d82fc21adaa850700ec2d60b2d70 SHA512 ed7e4be50c32fae14845317f59465c5052693e49cd32ed60f7106b718a3ab05df2a8a040d2daccffed45e05cf7f61553a9767e478b826f3e2895e8236f20d938
 DIST teamviewer_14.6.2452_amd64.tar.xz 12507160 BLAKE2B b84f085f3371877952680305808ae1201330a6402fb0e6e4812978801b8e888b6166a8f9f39bcea16ce60e2df039fdee6800a32612028f6d8237dd763f87383e SHA512 7d82356df572e19ffc1de6de5b94f1e95e511f986c4aa88ff2a80dc6dfd12c798f93e62d7886c66c57c51a432fd265cfadaf267a56dbccb029207e3ebd719c30
 DIST teamviewer_14.6.2452_i386.tar.xz 13055508 BLAKE2B b2adc4c98aecae2886a9fc51bdb9e233250985b7863ebc4376d7d0e8240e8ed2eafc878a9a522a2d5c2c0493b4e483cd70b2ea14f57c13892635f7756f398cd8 SHA512 0ed6d712c3df7ac13748f013bb9ad27d57dda0f0f5e29847a12529253e619a47c05806a209a3e20e7760f59c9feba5bb9d33de0a739adc6619a8e6e52dcec86d
-EBUILD teamviewer-14.2.2558.ebuild 3701 BLAKE2B 2413ca30f73a54cf75f69600d9928d8803b0d6c66a4ef0e40c37703573845984ab15f00dfdba33b9359676a1412828df84dafeb5649d68e71d4f8ce3e8331dd8 SHA512 871ded4d964787d875a4731fa6e44590df92746c855ec1e5d471ed8cea8b7d464c591b308df4ebfd9dcf29cfa5e6cedcc53a98d40547ee3725a54536f83fe65a
-EBUILD teamviewer-14.2.8352.ebuild 3701 BLAKE2B 2413ca30f73a54cf75f69600d9928d8803b0d6c66a4ef0e40c37703573845984ab15f00dfdba33b9359676a1412828df84dafeb5649d68e71d4f8ce3e8331dd8 SHA512 871ded4d964787d875a4731fa6e44590df92746c855ec1e5d471ed8cea8b7d464c591b308df4ebfd9dcf29cfa5e6cedcc53a98d40547ee3725a54536f83fe65a
-EBUILD teamviewer-14.4.2669.ebuild 4103 BLAKE2B 1c4b8bcf00e3e8d651c25e3e59f87757eaa7acde99578cc54eb6fa37535424234fe7d8943fb3b74343a385deb48d8801554bf43079f07dc3073cc3ce531946c1 SHA512 c2ffd27b0edc59c40de948f1169617db5495520caa12b4b633413a645537ca41b2e8f22a0e085f439c2376c0b6d6c67a7d189ad8cfa407ecead0bd24742363cc
-EBUILD teamviewer-14.5.5819.ebuild 4103 BLAKE2B 1c4b8bcf00e3e8d651c25e3e59f87757eaa7acde99578cc54eb6fa37535424234fe7d8943fb3b74343a385deb48d8801554bf43079f07dc3073cc3ce531946c1 SHA512 c2ffd27b0edc59c40de948f1169617db5495520caa12b4b633413a645537ca41b2e8f22a0e085f439c2376c0b6d6c67a7d189ad8cfa407ecead0bd24742363cc
+DIST teamviewer_14.7.1965_amd64.tar.xz 12459308 BLAKE2B 4a4b8005220f5433458ac61d3b9cb483d275ffc617328c49a0c7000f19b46dd620d3e517c80a680ab6c29a24924c436853d894dd6940a924afe5db848dcadc03 SHA512 b5d18bec8a5584d23687bc9f57bb8e7c44218ec9cb8adef274c9c9580bbcde51aa63d8a72d0755f1cca61305d535d20994b3a263233aca67a844b7ae6da42fcd
+DIST teamviewer_14.7.1965_i386.tar.xz 12958172 BLAKE2B bb5d66a2ec3d456b62d540217b9f6c798005419a0a14671968d47efc67532da844813af72cede8ca1c66e547af92b0af2acf2a85712a9f008fc0adfc01251632 SHA512 43ac26e851ba1018de61b20f7e8a6849e3141ecee809efd44f47cda080150aac9d1cd4fdbc911292c7d543c37830922f67bd1416ebe5c4603a07ffcaa30de517
 EBUILD teamviewer-14.6.2452.ebuild 4103 BLAKE2B 1c4b8bcf00e3e8d651c25e3e59f87757eaa7acde99578cc54eb6fa37535424234fe7d8943fb3b74343a385deb48d8801554bf43079f07dc3073cc3ce531946c1 SHA512 c2ffd27b0edc59c40de948f1169617db5495520caa12b4b633413a645537ca41b2e8f22a0e085f439c2376c0b6d6c67a7d189ad8cfa407ecead0bd24742363cc
+EBUILD teamviewer-14.7.1965.ebuild 4103 BLAKE2B 1c4b8bcf00e3e8d651c25e3e59f87757eaa7acde99578cc54eb6fa37535424234fe7d8943fb3b74343a385deb48d8801554bf43079f07dc3073cc3ce531946c1 SHA512 c2ffd27b0edc59c40de948f1169617db5495520caa12b4b633413a645537ca41b2e8f22a0e085f439c2376c0b6d6c67a7d189ad8cfa407ecead0bd24742363cc
 MISC metadata.xml 353 BLAKE2B 6b23f0ea5f9e3bc076641d6991535e7069dab3abd3f30e1d1052580223ec1f2ad94a8b0f6dfc6ee0019cdb3f1b3ea31edc5bbd04579da77f866291922f4c675a SHA512 bb21752978f1cf4c9cabf6b5fad33e0dbb820d27a5dd3ef40fd54f4a86893b77cd994dfe77395ff8fdd69f4e0f805bca622486538a4781b0f30b55ffdcf1540d
diff --git a/net-misc/teamviewer/teamviewer-14.2.2558.ebuild b/net-misc/teamviewer/teamviewer-14.2.2558.ebuild
deleted file mode 100644
index 2887c5d78191..000000000000
--- a/net-misc/teamviewer/teamviewer-14.2.2558.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN=${PN}${PV/\.*}
-inherit desktop gnome2-utils systemd
-
-DESCRIPTION="All-In-One Solution for Remote Access and Support over the Internet"
-HOMEPAGE="https://www.teamviewer.com"
-SRC_URI="amd64? ( https://dl.tvcdn.de/download/linux/version_${PV/\.*}x/${PN}_${PV}_amd64.tar.xz )
-		x86? ( https://dl.tvcdn.de/download/linux/version_${PV/\.*}x/${PN}_${PV}_i386.tar.xz )"
-
-LICENSE="TeamViewer MIT"
-SLOT="${PV/\.*}"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-
-DEPEND="sys-apps/sed"
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtquickcontrols:5
-	dev-qt/qtwebkit:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	sys-apps/dbus
-"
-
-RESTRICT="bindist mirror"
-
-# Silence QA messages
-QA_PREBUILT="opt/${MY_PN}/*"
-
-S="${WORKDIR}"/teamviewer
-
-src_prepare() {
-	default
-
-	# Switch operation mode from 'portable' to 'installed'
-	sed -e "s/TAR_NI/TAR_IN/g" -i tv_bin/script/tvw_config || die
-
-	sed -e "/^ExecStart/s/${PN}/${MY_PN}/" \
-		-i tv_bin/script/teamviewerd.service || die
-}
-
-src_install() {
-	local dst="/opt/${MY_PN}" # install destination
-
-	# Quirk:
-	# Remove Intel 80386 32-bit ELF binary 'libdepend' present in all
-	# archives. It will trip the 'emerge @preserved-libs' logic on amd64
-	# when changing the ABI of one of its dependencies. According to the
-	# TeamViewer devs, this binary is an unused remnant of previous Wine-
-	# based builds and will be removed in future releases anyway
-	rm tv_bin/script/libdepend
-
-	insinto ${dst}
-	doins -r tv_bin
-
-	# Set permissions for executables and libraries
-	for exe in $(find tv_bin -type f -executable -or -name '*.so'); do
-		fperms 755 ${dst}/${exe}
-	done
-
-	# No slotting here, binary expects this service path
-	newinitd "${FILESDIR}"/teamviewerd14.init teamviewerd
-	systemd_dounit tv_bin/script/teamviewerd.service
-
-	insinto /usr/share/dbus-1/services
-	doins tv_bin/script/com.teamviewer.TeamViewer.service
-	doins tv_bin/script/com.teamviewer.TeamViewer.Desktop.service
-
-	insinto /usr/share/polkit-1/actions
-	doins tv_bin/script/com.teamviewer.TeamViewer.policy
-
-	for size in 16 24 32 48 256; do
-		newicon -s ${size} tv_bin/desktop/teamviewer_${size}.png TeamViewer.png
-	done
-
-	# Install documents (NOTE: using 'dodoc -r doc' instead of loop will
-	# have the undesired result of installing subdirectory 'doc' in /usr/
-	# share/doc/teamviewer-<version>)
-	for doc in $(find doc -type f); do
-		dodoc ${doc}
-	done
-
-	keepdir /etc/${MY_PN}
-	dosym ../../etc/${MY_PN} ${dst}/config
-
-	# Create directory and symlink for log files (NOTE: according to Team-
-	# Viewer devs, all paths are hard-coded in the binaries; therefore
-	# using the same path as the DEB/RPM archives, i.e. '/var/log/teamviewer
-	# <major-version>')
-	keepdir /var/log/${MY_PN}
-	dosym ../../var/log/${MY_PN} ${dst}/logfiles
-
-	dodir /opt/bin
-	dosym ${dst}/tv_bin/teamviewerd /opt/bin/teamviewerd
-	dosym ${dst}/tv_bin/script/teamviewer /opt/bin/teamviewer
-
-	make_desktop_entry teamviewer "TeamViewer ${SLOT}" TeamViewer
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-
-	elog "Please note that parallel installation of multiple versions of"
-	elog "TeamViewer is currently not supported at runtime. Bug #621818"
-	elog ""
-	elog "Before using TeamViewer, you need to start its daemon:"
-	elog "OpenRC:"
-	elog "# /etc/init.d/teamviewerd start"
-	elog "# rc-update add teamviewerd default"
-	elog
-	elog "Systemd:"
-	elog "# systemctl start teamviewerd.service"
-	elog "# systemctl enable teamviewerd.service"
-	elog
-	elog "To display additional command line options simply run:"
-	elog "$ teamviewer help"
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/net-misc/teamviewer/teamviewer-14.2.8352.ebuild b/net-misc/teamviewer/teamviewer-14.2.8352.ebuild
deleted file mode 100644
index 2887c5d78191..000000000000
--- a/net-misc/teamviewer/teamviewer-14.2.8352.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN=${PN}${PV/\.*}
-inherit desktop gnome2-utils systemd
-
-DESCRIPTION="All-In-One Solution for Remote Access and Support over the Internet"
-HOMEPAGE="https://www.teamviewer.com"
-SRC_URI="amd64? ( https://dl.tvcdn.de/download/linux/version_${PV/\.*}x/${PN}_${PV}_amd64.tar.xz )
-		x86? ( https://dl.tvcdn.de/download/linux/version_${PV/\.*}x/${PN}_${PV}_i386.tar.xz )"
-
-LICENSE="TeamViewer MIT"
-SLOT="${PV/\.*}"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-
-DEPEND="sys-apps/sed"
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtquickcontrols:5
-	dev-qt/qtwebkit:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	sys-apps/dbus
-"
-
-RESTRICT="bindist mirror"
-
-# Silence QA messages
-QA_PREBUILT="opt/${MY_PN}/*"
-
-S="${WORKDIR}"/teamviewer
-
-src_prepare() {
-	default
-
-	# Switch operation mode from 'portable' to 'installed'
-	sed -e "s/TAR_NI/TAR_IN/g" -i tv_bin/script/tvw_config || die
-
-	sed -e "/^ExecStart/s/${PN}/${MY_PN}/" \
-		-i tv_bin/script/teamviewerd.service || die
-}
-
-src_install() {
-	local dst="/opt/${MY_PN}" # install destination
-
-	# Quirk:
-	# Remove Intel 80386 32-bit ELF binary 'libdepend' present in all
-	# archives. It will trip the 'emerge @preserved-libs' logic on amd64
-	# when changing the ABI of one of its dependencies. According to the
-	# TeamViewer devs, this binary is an unused remnant of previous Wine-
-	# based builds and will be removed in future releases anyway
-	rm tv_bin/script/libdepend
-
-	insinto ${dst}
-	doins -r tv_bin
-
-	# Set permissions for executables and libraries
-	for exe in $(find tv_bin -type f -executable -or -name '*.so'); do
-		fperms 755 ${dst}/${exe}
-	done
-
-	# No slotting here, binary expects this service path
-	newinitd "${FILESDIR}"/teamviewerd14.init teamviewerd
-	systemd_dounit tv_bin/script/teamviewerd.service
-
-	insinto /usr/share/dbus-1/services
-	doins tv_bin/script/com.teamviewer.TeamViewer.service
-	doins tv_bin/script/com.teamviewer.TeamViewer.Desktop.service
-
-	insinto /usr/share/polkit-1/actions
-	doins tv_bin/script/com.teamviewer.TeamViewer.policy
-
-	for size in 16 24 32 48 256; do
-		newicon -s ${size} tv_bin/desktop/teamviewer_${size}.png TeamViewer.png
-	done
-
-	# Install documents (NOTE: using 'dodoc -r doc' instead of loop will
-	# have the undesired result of installing subdirectory 'doc' in /usr/
-	# share/doc/teamviewer-<version>)
-	for doc in $(find doc -type f); do
-		dodoc ${doc}
-	done
-
-	keepdir /etc/${MY_PN}
-	dosym ../../etc/${MY_PN} ${dst}/config
-
-	# Create directory and symlink for log files (NOTE: according to Team-
-	# Viewer devs, all paths are hard-coded in the binaries; therefore
-	# using the same path as the DEB/RPM archives, i.e. '/var/log/teamviewer
-	# <major-version>')
-	keepdir /var/log/${MY_PN}
-	dosym ../../var/log/${MY_PN} ${dst}/logfiles
-
-	dodir /opt/bin
-	dosym ${dst}/tv_bin/teamviewerd /opt/bin/teamviewerd
-	dosym ${dst}/tv_bin/script/teamviewer /opt/bin/teamviewer
-
-	make_desktop_entry teamviewer "TeamViewer ${SLOT}" TeamViewer
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-
-	elog "Please note that parallel installation of multiple versions of"
-	elog "TeamViewer is currently not supported at runtime. Bug #621818"
-	elog ""
-	elog "Before using TeamViewer, you need to start its daemon:"
-	elog "OpenRC:"
-	elog "# /etc/init.d/teamviewerd start"
-	elog "# rc-update add teamviewerd default"
-	elog
-	elog "Systemd:"
-	elog "# systemctl start teamviewerd.service"
-	elog "# systemctl enable teamviewerd.service"
-	elog
-	elog "To display additional command line options simply run:"
-	elog "$ teamviewer help"
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/net-misc/teamviewer/teamviewer-14.5.5819.ebuild b/net-misc/teamviewer/teamviewer-14.5.5819.ebuild
deleted file mode 100644
index 6650185440e6..000000000000
--- a/net-misc/teamviewer/teamviewer-14.5.5819.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN=${PN}${PV/\.*}
-inherit desktop gnome2-utils systemd
-
-DESCRIPTION="All-In-One Solution for Remote Access and Support over the Internet"
-HOMEPAGE="https://www.teamviewer.com"
-SRC_URI="amd64? ( https://dl.tvcdn.de/download/linux/version_${PV/\.*}x/${PN}_${PV}_amd64.tar.xz )
-		x86? ( https://dl.tvcdn.de/download/linux/version_${PV/\.*}x/${PN}_${PV}_i386.tar.xz )"
-
-LICENSE="TeamViewer MIT"
-SLOT="${PV/\.*}"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-
-DEPEND="sys-apps/sed"
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtquickcontrols:5
-	dev-qt/qtwebkit:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	sys-apps/dbus
-	!sys-auth/consolekit
-"
-
-# For consolekit incompatibility see https://forums.gentoo.org/viewtopic-p-8332956.html?sid=3cc21e5a27935e38975ee85bf03317ae#8332956
-
-RESTRICT="bindist mirror"
-
-# Silence QA messages
-QA_PREBUILT="opt/${MY_PN}/*"
-
-S="${WORKDIR}"/teamviewer
-
-src_prepare() {
-	default
-
-	# Switch operation mode from 'portable' to 'installed'
-	sed -e "s/TAR_NI/TAR_IN/g" -i tv_bin/script/tvw_config || die
-
-	sed -e "/^ExecStart/s/${PN}/${MY_PN}/" \
-		-i tv_bin/script/teamviewerd.service || die
-}
-
-src_install() {
-	local dst="/opt/${MY_PN}" # install destination
-
-	# Quirk:
-	# Remove Intel 80386 32-bit ELF binary 'libdepend' present in all
-	# archives. It will trip the 'emerge @preserved-libs' logic on amd64
-	# when changing the ABI of one of its dependencies. According to the
-	# TeamViewer devs, this binary is an unused remnant of previous Wine-
-	# based builds and will be removed in future releases anyway
-	rm tv_bin/script/libdepend
-
-	insinto ${dst}
-	doins -r tv_bin
-
-	# Set permissions for executables and libraries
-	for exe in $(find tv_bin -type f -executable -or -name '*.so'); do
-		fperms 755 ${dst}/${exe}
-	done
-
-	# No slotting here, binary expects this service path
-	newinitd "${FILESDIR}"/teamviewerd14.init teamviewerd
-	systemd_dounit tv_bin/script/teamviewerd.service
-
-	insinto /usr/share/dbus-1/services
-	doins tv_bin/script/com.teamviewer.TeamViewer.service
-	doins tv_bin/script/com.teamviewer.TeamViewer.Desktop.service
-
-	insinto /usr/share/polkit-1/actions
-	doins tv_bin/script/com.teamviewer.TeamViewer.policy
-
-	for size in 16 24 32 48 256; do
-		newicon -s ${size} tv_bin/desktop/teamviewer_${size}.png TeamViewer.png
-	done
-
-	# Install documents (NOTE: using 'dodoc -r doc' instead of loop will
-	# have the undesired result of installing subdirectory 'doc' in /usr/
-	# share/doc/teamviewer-<version>)
-	for doc in $(find doc -type f); do
-		dodoc ${doc}
-	done
-
-	keepdir /etc/${MY_PN}
-	dosym ../../etc/${MY_PN} ${dst}/config
-
-	# Create directory and symlink for log files (NOTE: according to Team-
-	# Viewer devs, all paths are hard-coded in the binaries; therefore
-	# using the same path as the DEB/RPM archives, i.e. '/var/log/teamviewer
-	# <major-version>')
-	keepdir /var/log/${MY_PN}
-	dosym ../../var/log/${MY_PN} ${dst}/logfiles
-
-	dodir /opt/bin
-	dosym ${dst}/tv_bin/teamviewerd /opt/bin/teamviewerd
-	dosym ${dst}/tv_bin/script/teamviewer /opt/bin/teamviewer
-
-	make_desktop_entry teamviewer "TeamViewer ${SLOT}" TeamViewer
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-
-	elog "Please note that parallel installation of multiple versions of"
-	elog "TeamViewer is currently not supported at runtime. Bug #621818"
-	elog ""
-	elog "Before using TeamViewer, you need to start its daemon:"
-	elog "OpenRC:"
-	elog "# /etc/init.d/teamviewerd start"
-	elog "# rc-update add teamviewerd default"
-	elog
-	elog "Systemd:"
-	elog "# systemctl start teamviewerd.service"
-	elog "# systemctl enable teamviewerd.service"
-	elog
-	elog "To display additional command line options simply run:"
-	elog "$ teamviewer help"
-	elog
-	elog "Most likely TeamViewer will work normally only on systems with systemd"
-	elog "or elogind. See this thread for additional info:"
-	elog "https://forums.gentoo.org/viewtopic-p-8332956.html?sid=3cc21e5a27935e38975ee85bf03317ae#8332956"
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/net-misc/teamviewer/teamviewer-14.4.2669.ebuild b/net-misc/teamviewer/teamviewer-14.7.1965.ebuild
index 6650185440e6..6650185440e6 100644
--- a/net-misc/teamviewer/teamviewer-14.4.2669.ebuild
+++ b/net-misc/teamviewer/teamviewer-14.7.1965.ebuild
diff --git a/net-misc/throttle/Manifest b/net-misc/throttle/Manifest
index be3507b596dd..55390a1f9c23 100644
--- a/net-misc/throttle/Manifest
+++ b/net-misc/throttle/Manifest
@@ -1,3 +1,4 @@
 DIST throttle-1.2.tar.gz 72501 BLAKE2B 8374d09f12f37f60a2dd52c5e3e08ef53af0862fdb51d530883f291b1d0ab2a1127dcc70a08d4179e3052788a84e9a8183db3dbb53ae8181e62fc3728005c7a3 SHA512 ec0a639e6fed5e4a5fbb32498a77e08e0b53f3d6ffdb1788a6b52480387c87c43a5d17507941c9660406721bdbd5d4eedd4d6f1c0153dc41dc44a2aae0f9492f
+EBUILD throttle-1.2-r1.ebuild 480 BLAKE2B e52e6be7d2d65676739ec5b8fa9a2d593bde06c0edb18e4585727e102ec57a1ebc467c7e3b85dce9189d7740bbcbd125141fa55015ae608a27a13ccbd2cb2047 SHA512 532c66b373f2cdcf273930b29ee195a225dec74758529caa499c5df20c76b2cbbe8219e518d2248aa928406ec827cab0a6d9334e4438e40b605dea70112148eb
 EBUILD throttle-1.2.ebuild 428 BLAKE2B f3b53e535fdceae9b6bde42ac8ddf5f6d2664289128dfcb40b6b41b5bda900e02d3a95fde11966f6cdad1148deb9c642877a0c7a8948dc0751082b23aec59f63 SHA512 39568aa1b31c9ff4e83b15a1407de8af014ccc43a53a39610687232db6451313b5252421386ba95f890f03250d4e47af653d8cfb2a53cd5694dceff1e47deb41
 MISC metadata.xml 370 BLAKE2B a472fb5ba4c9dd2f9d29f932befe96a997d27ed559ca0173388d6c8ca842032a34f2b4df8f962f6a275bddc83cc7498d5c971b79e91c5f4ef1314d52c7b4f954 SHA512 39d066692873cf85dc75f2d6f5c566ac799aa1e2fdc6743915d19167913f92800ade4be1d101780fc011362757531d8f59615e3d150a160f7196a43314d64c69
diff --git a/net-misc/throttle/throttle-1.2-r1.ebuild b/net-misc/throttle/throttle-1.2-r1.ebuild
new file mode 100644
index 000000000000..b6feb193f2df
--- /dev/null
+++ b/net-misc/throttle/throttle-1.2-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+# orphaned package, we keep its sources, but upstream is long gone, and
+# disappeared
+
+DESCRIPTION="Bandwidth limiting pipe"
+HOMEPAGE="https://www.gentoo.org/"
+SRC_URI="https://dev.gentoo.org/~grobian/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~ppc-macos ~x86-macos"
+IUSE=""
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
index 8169ccebcec0..1db1cc53e631 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -6,5 +6,5 @@ AUX xserver120-drmfourcc-header.patch 1300 BLAKE2B d1be2072020a4eff663e56e1210b8
 AUX xserver120.patch 3699 BLAKE2B f85933c025dc0347040261710e820232fbb21a572cf311bf8b37e8e1873046919fbecf1023f0178793e939ba33e834b55c6e8277f88bd2b145716badc8b4a5c4 SHA512 bf69a4b65742c5f2351b7d0f0b7ad44f44050dd8f54972d9545ea873f27f8fe88314b016b07746b31ac75bde6648b249f523a1f3d9948a9cb26001d6096d4f3d
 DIST tigervnc-1.9.0.tar.gz 1506520 BLAKE2B 292c2e5fb9ffe2573e216257e889d259abfdca5964559492c318e24ea00563211e7477a4f1b2b09d0e962343d4aeb2c12dcfdd6857a3282882ee9f91fdf8103a SHA512 333910f567e6b5e4a5a22d898b2d4c3f4b834cb4cc8fc13ff55d31401894c0d5122a127692ec5eb51e412c945ff3ea5b8146f9ab22cbe1e47541e09239ec8c9d
 DIST xorg-server-1.20.0.tar.bz2 6096838 BLAKE2B 34ee6d6dbbde54d54e082a0791e85ad52d728e239a7d8fadb75ebcbdbaab8752b90ca6d075f096d971db7ec68ce4ecac5c70fcf536ce23c20b8dce8f32e2c046 SHA512 1489e8511c9da682ef0460182dfeeddd241c72d4ef4d206d9706f1e39572c09953df851fab18cefb65a1ee4c6710c6ba13c63c9c9fc0bc1b5f12c50780412cde
-EBUILD tigervnc-1.9.0-r1.ebuild 4371 BLAKE2B f1e3e5b24ad5f5b743ca1900197d0f2cb2191eb4852020e0a0068377d60c766186a72e17e06a73fc84bb0f1fb6ce72ac6ef58a1cd52da043e9a062ec8e770f9d SHA512 69311d243fa1542d5bc9ecd6d15000c1b5b7d3032b6c32f2cec788005168a4e478f4d7a8c2a4cb5de67866c3cb998f71453ab66ef3400591cc5de69f6a217333
+EBUILD tigervnc-1.9.0-r1.ebuild 4570 BLAKE2B 6801a82c1919664258bd6649917419eacd8d130230c90ddd73b8aba7b2c3b36bb9f62b552f9bed47550baacb59bcd7859dec19fd7946d422cfe8b536363976fd SHA512 f52cf989920adaf1c3e39b545e5f3536ca516783d946599802af44cb1457e7f9cd798237567853a994371a67705845f9aa881e0e892d3b047c153e04243eaac5
 MISC metadata.xml 750 BLAKE2B 2a76715a23dd2d3797ae85c20ef7e08854ebfcd74f42969d10bc2605870dcd69a03806437483eceeebc3dfbd52006091609e7464a9278aec2d938295b230cab1 SHA512 768e087e274e83dc9347cf719e61db39597d2ab07aae24ab6158fe9851d93f9594e74ec66579b0da2abf9bc839d9d28d3a31f207d7274bc0a9e1e9c8bbee9997
diff --git a/net-misc/tigervnc/tigervnc-1.9.0-r1.ebuild b/net-misc/tigervnc/tigervnc-1.9.0-r1.ebuild
index 3585565e6360..8238651efc1a 100644
--- a/net-misc/tigervnc/tigervnc-1.9.0-r1.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.9.0-r1.ebuild
@@ -85,12 +85,17 @@ src_prepare() {
 		cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/. unix/xserver || die
 	fi
 
+	# do not rely on the build system to install docs
+	sed -i 's:^\(install(.* DESTINATION ${DOC_DIR})\):#\1:' \
+		cmake/BuildPackages.cmake || die
+
 	cmake-utils_src_prepare
 
 	if use server ; then
 		cd unix/xserver || die
 		eapply "${FILESDIR}"/xserver120.patch
 		eapply "${FILESDIR}"/xserver120-drmfourcc-header.patch
+		sed -i -e 's/"gl >= .*"/"gl"/' configure.ac || die
 		eautoreconf
 	fi
 }
diff --git a/net-misc/vconfig/Manifest b/net-misc/vconfig/Manifest
index 67b14348ae5b..26cfe4d1ecf6 100644
--- a/net-misc/vconfig/Manifest
+++ b/net-misc/vconfig/Manifest
@@ -1,3 +1,3 @@
 DIST vlan.1.9.tar.gz 176135 BLAKE2B 195acf3d3bf12de3d11856ec3fdab9791d744af8a5c0003d42a2dd8dda5b22d92bdb43aac392a2c3281cf43f67c2b05dc442352f1cfb589bc540593a92a2a46d SHA512 7602679c1f1569d1742da37062213fea3a14b875bec9c41fc6b10c28a09a312db80f6eae4a8641a1892946545b2b4ef4699e61fddd8514469970e334a9dab0c5
-EBUILD vconfig-1.9.ebuild 1121 BLAKE2B e7a5a1c065d289c3752da7dd4fba90811fbce1aa155c54e7bfc2688f770e0c74609641c136a756ba07793cf8e2018624f0a459f9231c888d3133ad74cb555f38 SHA512 230e462ffc2396027de399bd4abd40457868e75248b3ca43a5ccbf084c99e3b8036be947dc02fad8b50cf4ffb51d3896e05ea1451b8799cbc8fc17c0ffdf0fda
+EBUILD vconfig-1.9.ebuild 1107 BLAKE2B 226b300112a0d9bd30b2f3403a2933b586d44c3eba81ce755eb3b06e2a90469e9eb92341bf1dda65ca4b224d6025b83ec6ff4fef3d848e164720d4c505a48c84 SHA512 f62acc5035cfe1f9b1ebac2878a654e4f74760a43f4870a97a3e94d5412b9d92394a92d621193511b57fcada9d0140b9c33a9f7463236b00b9936bf8a07ca37f
 MISC metadata.xml 490 BLAKE2B 905a8d5d5d679a42695a20af7320d7030d57e5e58e46231e0d9a586890d5c244cdf518d8a60e7a7a346478281b4a69d497bd83e0b7b432c47455849da555d27c SHA512 bfc7141dc32d3992efa44836da7c032ad28829e77d0ca6038ab3d70b540f8b67ea5428c86c138f9f6f5b3bc1e007e17ad3941eb4dc7e65fc6d34d962ae8606b4
diff --git a/net-misc/vconfig/vconfig-1.9.ebuild b/net-misc/vconfig/vconfig-1.9.ebuild
index 4671806983be..68ad081deeef 100644
--- a/net-misc/vconfig/vconfig-1.9.ebuild
+++ b/net-misc/vconfig/vconfig-1.9.ebuild
@@ -1,37 +1,51 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
-inherit eutils flag-o-matic toolchain-funcs
+inherit flag-o-matic toolchain-funcs
 
 MY_PN="vlan"
-S=${WORKDIR}/${MY_PN}
 
 DESCRIPTION="802.1Q vlan control utility"
 HOMEPAGE="http://www.candelatech.com/~greear/vlan.html"
 SRC_URI="http://www.candelatech.com/~greear/vlan/${MY_PN}.${PV}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm hppa ~ppc ~ppc64 sparc x86"
 IUSE="static"
 
+S="${WORKDIR}/${MY_PN}"
+
+src_prepare() {
+	default
+	sed -e "s:/usr/local/bin/vconfig:/sbin/vconfig:g" -i vlan_test.pl || die
+	sed -e "s:/usr/local/bin/vconfig:/sbin/vconfig:g" -i vlan_test2.pl || die
+}
+
+src_configure() {
+	use static && append-ldflags -static
+}
+
 src_compile() {
-	use static && appened-ldflags -static
 	emake purge
-	emake CC="$(tc-getCC)" CCFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" STRIP="true" vconfig || die
+	emake \
+		CC="$(tc-getCC)" \
+		CCFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		STRIP="true" vconfig
 }
 
 src_install() {
 	into /
-	dosbin vconfig || die "dosbin error"
+	dosbin vconfig
 
-	sed -e "s:/usr/local/bin/vconfig:/sbin/vconfig:g" -i vlan_test.pl
-	sed -e "s:/usr/local/bin/vconfig:/sbin/vconfig:g" -i vlan_test2.pl
+	local HTML_DOCS=( {howto,vlan}.html )
+	einstalldocs
+	dodoc vlan_test*.pl
 
-	doman vconfig.8 || die "doman error"
-	dohtml howto.html vlan.html || die "dohtml error"
-	dodoc CHANGELOG README vlan_test*.pl || die "dodoc error"
+	doman vconfig.8
 }
 
 pkg_postinst() {
diff --git a/net-misc/whois/Manifest b/net-misc/whois/Manifest
index 17f092db048b..6baf7e4629a1 100644
--- a/net-misc/whois/Manifest
+++ b/net-misc/whois/Manifest
@@ -1,12 +1,8 @@
 AUX whois-4.7.2-config-file.patch 202 BLAKE2B b5c421655f40c22fcb9c9ac3194821e6e4100657bd11013ed220cea3c81c77e3c7e50432361c8e08274b59d96ff04ca22d8f500436fbefef981d587e26ef75a7 SHA512 932ce9dd51b29750a88da3082bdb1f3fd994e1d859fbdef45fadd3c833ee24d12acb6530989db60f4df3df9481d34cc5cabbdad4bf5150389a06ef7c832daf65
 AUX whois-5.3.0-libidn_automagic.patch 778 BLAKE2B b9214f6f0c081abf6141057ee9f82db30dad7306fe611b1cb70d256b235d0ba544887f8b084d7b71a21486ad68d312ad98075aed51765f59ecbf7ced45684772 SHA512 8df8c99320ee4a4327f35a62dbaca0b071a3472d398604304d772f2424d607d109d87056b1a138b041c4c391409828cc7397dc62ed973dee500b2eb9f1735676
-DIST whois-5.5.1.tar.gz 103269 BLAKE2B c737c922b7ef5a8619e1778521da66b3507e96ed82b2fdde8fe61df22d7c40bd4494fa26b3de83e51cbeaf4811d912cbeff8de230f7bce9c0dbeb021567c2908 SHA512 bc32208e32f632b515792767c6c72a94cb66e7f42aed3dc5dc6ede3f5f28860cc279c5e6b1579db45b0f7dc6d55ec910b81cf1dfadb91354fb3833b1272b93fc
 DIST whois-5.5.2.tar.gz 103312 BLAKE2B a1b5c7ad0147dd5b9a63deed9433f31f46f141af88673e858f7316bd6ea72c632c9c804fc0691faabb992bf525d29e6c1e0106f98b6457933adab87d94f51a2d SHA512 39cb2a8eb105096d8905d9509b86750e4850808e74d5a3640c0e57185255e2ae18b322b7cfe98f2e00ad13638e5403d93c78280b0ae2477e6e7ae8a0f0b8c234
 DIST whois_5.4.3.tar.xz 83904 BLAKE2B 19b78ca984c86ad711c317ca6090003ae354eee2b39f353081e99f44396e254b3cb75d38c8f6df9fe88283c5036e9e02f38c74401de8245dbd4f5dae3a6e1a0a SHA512 762feec983d29696796bea87fb47c5bd7357ca96d701b2e30cccb186c248225c45b451289ab45936d7e3eed5c0ff4e8fa249255ceb061a4e1ba1f6cd8fcdf084
-DIST whois_5.5.0.tar.xz 85600 BLAKE2B 37c90324e1b7c773793e1eaff70816f90a6429ab91bafcff36dfa02ea09b4eb5e83b8cd36e1ca0bc5eb3a043f1973f4479037de38cf41a7b7ac646845697636f SHA512 a26730613b8019385e48c7432bcc9871984a7035e53e56188a876e70e255a1adf23d546dfeb1706879af5c4a8f2231976fe89d2571b3d2cb6d615a7834a2d876
 EBUILD whois-5.4.3.ebuild 1573 BLAKE2B 9308d736931da85ca666b44725576371eba07b91e8db65c22e1ff5394b5a09cff13b25c856fd2b7e53c57cb7a1a2263d3ee5b865f4432749c7ace193e375ab00 SHA512 be379cd50b6b169809d04e451420068802cfbd5ab2821f353ce318cf94b03217f5e072118153a6d516b30c4427e2d6ba041f6ccdd88bcee7e1945d91412de6c0
-EBUILD whois-5.5.0.ebuild 1614 BLAKE2B e0cba205cc21bab7adde1030ad3afd5161d5002f9b85bbad8df8195c196dd88e82155b257db8ecb4525ad07b1a8b7ddee78f5f975880459b9c35ed9f9e8cc9b1 SHA512 0b5a1d9c8375cb58c6a5569b53a70320b7b794e605d328b644627fd6b100a65f4dd291bc0d7bd215475c7c76b5482d6ef7f660f4086a9dd791cee3d06b9befb1
-EBUILD whois-5.5.1.ebuild 1780 BLAKE2B 31fb99160417ba67d2f2e5867f22d558bf53ac1222ac00b3161a83e770eda8cfe9fd9fc5ad269d4982ae8d7696d9bbc3ccaaf43517a07924b7f32d7350746293 SHA512 e067181f4cdfce4e0640181349b673a4217bba36470dcc1390645bbb79d078ea83e3d8f10cfb2a1d78963e320b9ee8f628ca3fcbb38f0478a62985df785545b1
 EBUILD whois-5.5.2.ebuild 1780 BLAKE2B 31fb99160417ba67d2f2e5867f22d558bf53ac1222ac00b3161a83e770eda8cfe9fd9fc5ad269d4982ae8d7696d9bbc3ccaaf43517a07924b7f32d7350746293 SHA512 e067181f4cdfce4e0640181349b673a4217bba36470dcc1390645bbb79d078ea83e3d8f10cfb2a1d78963e320b9ee8f628ca3fcbb38f0478a62985df785545b1
 EBUILD whois-9999.ebuild 1780 BLAKE2B 31fb99160417ba67d2f2e5867f22d558bf53ac1222ac00b3161a83e770eda8cfe9fd9fc5ad269d4982ae8d7696d9bbc3ccaaf43517a07924b7f32d7350746293 SHA512 e067181f4cdfce4e0640181349b673a4217bba36470dcc1390645bbb79d078ea83e3d8f10cfb2a1d78963e320b9ee8f628ca3fcbb38f0478a62985df785545b1
 MISC metadata.xml 335 BLAKE2B 105a64d3c2f98d051101083c04232489e806ea86a66e27bbd33ebaf00cd7ce3cde1e4cce051adf86c6b61201973f9aec9c10f5b49f11586208260b7d7b40b292 SHA512 81d7c5fe370408b1cd3470c7e6b46127a8de700db07da3b0c7416263d7f0f7558da56dd2256cb4120a2fd398765d8a295436a517fbd0e9313d6abe9f5358d51d
diff --git a/net-misc/whois/whois-5.5.0.ebuild b/net-misc/whois/whois-5.5.0.ebuild
deleted file mode 100644
index 8281aeeca5bf..000000000000
--- a/net-misc/whois/whois-5.5.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-MY_P="${P/-/_}"
-DESCRIPTION="improved Whois Client"
-HOMEPAGE="https://github.com/rfc1036/whois"
-SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="iconv idn nls"
-RESTRICT="test" #59327
-
-RDEPEND="iconv? ( virtual/libiconv )
-	idn? ( net-dns/libidn2:= )
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-arch/xz-utils
-	>=dev-lang/perl-5
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.7.2-config-file.patch
-	"${FILESDIR}"/${PN}-5.3.0-libidn_automagic.patch
-)
-
-S="${WORKDIR}/${PN}-5.4.4"
-
-src_prepare() {
-	default
-	if use nls ; then
-		sed -i -e 's:#\(.*pos\):\1:' Makefile || die
-	else
-		sed -i -e '/ENABLE_NLS/s:define:undef:' config.h || die
-
-		# don't generate po files when nls is disabled (bug #419889)
-		sed -i -e '/^all:/s/ pos//' \
-			-e '/^install:/s/ install-pos//' Makefile || die
-	fi
-}
-
-src_configure() { :; } # expected no-op
-
-src_compile() {
-	unset HAVE_ICONV HAVE_LIBIDN
-	use iconv && export HAVE_ICONV=1
-	use idn && export HAVE_LIBIDN=1
-	tc-export CC
-	emake CFLAGS="${CFLAGS} ${CPPFLAGS}"
-}
-
-src_install() {
-	emake BASEDIR="${ED}" prefix=/usr install
-	insinto /etc
-	doins whois.conf
-	dodoc README debian/changelog
-
-	if [[ ${USERLAND} != "GNU" ]]; then
-		mv "${ED}"/usr/share/man/man1/{whois,mdwhois}.1 || die
-		mv "${ED}"/usr/bin/{whois,mdwhois} || die
-	fi
-}
diff --git a/net-misc/whois/whois-5.5.1.ebuild b/net-misc/whois/whois-5.5.1.ebuild
deleted file mode 100644
index 8b649d81bce7..000000000000
--- a/net-misc/whois/whois-5.5.1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-MY_P="${P/-/_}"
-DESCRIPTION="improved Whois Client"
-HOMEPAGE="https://github.com/rfc1036/whois"
-if [[ "${PV}" == *9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/rfc1036/whois.git"
-else
-	#SRC_URI="mirror://debian/pool/main/w/whois/${MY_P}.tar.xz"
-	SRC_URI="https://github.com/rfc1036/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="iconv idn nls"
-RESTRICT="test" #59327
-
-RDEPEND="iconv? ( virtual/libiconv )
-	idn? ( net-dns/libidn2:= )
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-arch/xz-utils
-	>=dev-lang/perl-5
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.7.2-config-file.patch
-	"${FILESDIR}"/${PN}-5.3.0-libidn_automagic.patch
-)
-
-src_prepare() {
-	default
-	if use nls ; then
-		sed -i -e 's:#\(.*pos\):\1:' Makefile || die
-	else
-		sed -i -e '/ENABLE_NLS/s:define:undef:' config.h || die
-
-		# don't generate po files when nls is disabled (bug #419889)
-		sed -i -e '/^all:/s/ pos//' \
-			-e '/^install:/s/ install-pos//' Makefile || die
-	fi
-}
-
-src_configure() { :; } # expected no-op
-
-src_compile() {
-	unset HAVE_ICONV HAVE_LIBIDN
-	use iconv && export HAVE_ICONV=1
-	use idn && export HAVE_LIBIDN=1
-	tc-export CC
-	emake CFLAGS="${CFLAGS} ${CPPFLAGS}"
-}
-
-src_install() {
-	emake BASEDIR="${ED}" prefix=/usr install
-	insinto /etc
-	doins whois.conf
-	dodoc README debian/changelog
-
-	if [[ ${USERLAND} != "GNU" ]]; then
-		mv "${ED}"/usr/share/man/man1/{whois,mdwhois}.1 || die
-		mv "${ED}"/usr/bin/{whois,mdwhois} || die
-	fi
-}
diff --git a/net-misc/wol/Manifest b/net-misc/wol/Manifest
index 31a656034f98..d5b0823a6c57 100644
--- a/net-misc/wol/Manifest
+++ b/net-misc/wol/Manifest
@@ -1,4 +1,4 @@
 DIST wol-0.7.1.tar.gz 445648 BLAKE2B 80e34ee5a588f7caec92c17d3455abec8227789c30dcde46ecbb75d2f5d7f2a852f6a8c11dea54c036e63db73e28f6d2aaa32bbf7b5708f23c9005f163a17f5f SHA512 233cbd038633c4b04a22710c04a8349d7706c6b4ff0554b6899ee3309349502a318f6fb05a4ad4c80cd373c362b2ad8818cb52a432d768f569e80f05658615a3
 EBUILD wol-0.7.1-r1.ebuild 391 BLAKE2B b52ef1bcb4732b58edd4a0c6bc8d8de51eff4238e9714d9df05d1e38c3d97fffdb057c805278bf48568bf2a5665e6c848daf900800054e7a475b8cc3f3ab5a53 SHA512 afd52d0860c638bf12f4a659598f61b504d0cb0a3d59e3346dc53f70ce1ae8e5c1c0222eb5a07bbe94b9d5c94895a3e00126f375ab2ef17db64241e735a81959
-EBUILD wol-0.7.1-r2.ebuild 471 BLAKE2B fbe9ade399105163772079e0a4972125dddbb4df2cdfdeec87aa4f1137576024ed73c1717af5a73b78732c51ffeb979887e572a19fc0de098af79bc2343b7dfb SHA512 b55886cb62902f399ba2c47af738eec49fec4626c7b53ea8bedb3def11644a00a653bf5d915d51c87b494566ce42594a39849c0bbced4867525834d0dda3b206
+EBUILD wol-0.7.1-r2.ebuild 470 BLAKE2B a08ce1d19e18344da85e7beba9651bdd670688d6183b092e9542a1cb46010c106b41b2ea10d0cf38040788e12a94d62ffb68485cc765efb8beea395fcec4e33c SHA512 666796af7b0d8647293c97823ea423086c673193a5c075175840cd078c89696e0eb2638e48df1a84d13d533fcb1b305f1e453e8f023b8c81acd2ea1895707211
 MISC metadata.xml 735 BLAKE2B 6c3b6199ccb776a5ad5b817d70e72da0416207f98fd3b7bcf082f98088e592535da06571fe4f77c82d40b456e55271f3084ccff2f64e4c5cd610c31cd24c44e8 SHA512 0cff2c4127942f5dc455beeb78c63a271451a7ae38e03e53dace85c64353fc9214e803f67d39996289096b19e60ec2ae5ff3a4be61dd7a2570d9c9864182fcb7
diff --git a/net-misc/wol/wol-0.7.1-r2.ebuild b/net-misc/wol/wol-0.7.1-r2.ebuild
index 5e38e31fd64a..f9ecc3aff5d2 100644
--- a/net-misc/wol/wol-0.7.1-r2.ebuild
+++ b/net-misc/wol/wol-0.7.1-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/ahh/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86"
+KEYWORDS="amd64 arm ppc ~ppc64 x86"
 IUSE="nls"
 
 src_configure() {
diff --git a/net-misc/x11-ssh-askpass/Manifest b/net-misc/x11-ssh-askpass/Manifest
index a440e0bbc28d..f0b1e836fd71 100644
--- a/net-misc/x11-ssh-askpass/Manifest
+++ b/net-misc/x11-ssh-askpass/Manifest
@@ -1,3 +1,4 @@
 DIST x11-ssh-askpass-1.2.4.1.tar.gz 29229 BLAKE2B 0b49f8eeb568ccba9843e216a688cc64f3ec4799efae0c0f870803c166e40d5f5d52a9eb45a5d3e5475bbf461e5898feda0b2c91c91c61bf984b81ec89839abe SHA512 879887cc1d6eb26662494e3a6b59b79a8d153b354abf86e8e8667940545c8e07d0aa051491f5ba6ca5273e3a7fcc367edb4cc79bb2e4bf1bdbd0e234690ad6b9
 EBUILD x11-ssh-askpass-1.2.4.1-r1.ebuild 923 BLAKE2B 0c58c634c173af9549c4c68e6496455bf39f5414a3fb7b387d139a03f9d2d5ff90bb1e446d9861b58cb2593c21c2e4f6f375e258259094f72f3ff6c83819e192 SHA512 52d0706cdb99e3c68ec624f82c816da9dd7a7e84329788335c13fe54a9000dfa02430a2a9f43c0f1f051b11b54d53835b912935513bae98f9698107c81b39f43
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+EBUILD x11-ssh-askpass-1.2.4.1-r2.ebuild 976 BLAKE2B b41c791844939138f78e52c2c24440c9fe93d8b2adc97506415624e7221210d00573771aaa3d6e07ee49b252b40ae7488e0cb23f9743677cfa94631409268dca SHA512 c6d978abcb0d25cfc93b100b6dbb0a1531cf6cbba5a16c884a4772428888fca9a28d9c673813415b6aa8ddc073d422d9ba7cc2bc674c10bfb0360192c45cf8db
+MISC metadata.xml 673 BLAKE2B 916fd47492be5b298834b6abd7561edbcc2af1fcab3de2db3e595c5ddb08318a74ac61f008e5edbc38857c1670e765add0432f893eb8d30626f4465d9f9999c3 SHA512 18222b1092cd44e1e040d42a37d7f600489b8a09e8b75008182925eeff2e750e3a82523e0d4afe379ee35acd10f85b14df8c5e7feac053d497c55228b787b2a4
diff --git a/net-misc/x11-ssh-askpass/metadata.xml b/net-misc/x11-ssh-askpass/metadata.xml
index 6f49eba8f496..344661c689f9 100644
--- a/net-misc/x11-ssh-askpass/metadata.xml
+++ b/net-misc/x11-ssh-askpass/metadata.xml
@@ -1,5 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>spiderx@spiderx.dp.ua</email>
+		<name>Vladimir Pavljuchenkov</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription lang="en">
+	This is an X11-based passphrase dialog for use with OpenSSH.
+	These dialogs are intended to be called from the ssh-add program
+	and not invoked directly.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">sigmavirus24/x11-ssh-askpass</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/x11-ssh-askpass/x11-ssh-askpass-1.2.4.1-r2.ebuild b/net-misc/x11-ssh-askpass/x11-ssh-askpass-1.2.4.1-r2.ebuild
new file mode 100644
index 000000000000..65224da4bf5b
--- /dev/null
+++ b/net-misc/x11-ssh-askpass/x11-ssh-askpass-1.2.4.1-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="X11-based passphrase dialog for use with OpenSSH"
+HOMEPAGE="http://www.liquidmeme.net/software/x11-ssh-askpass
+	https://github.com/sigmavirus24/x11-ssh-askpass"
+SRC_URI="http://www.liquidmeme.net/software/x11-ssh-askpass/${P}.tar.gz"
+
+LICENSE="HPND"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND="virtual/ssh
+	x11-libs/libXt
+	x11-libs/libX11
+	x11-libs/libSM
+	x11-libs/libICE"
+DEPEND="${RDEPEND}"
+BDEPEND="x11-misc/imake
+	app-text/rman"
+
+src_configure() {
+	econf --libexecdir=/usr/$(get_libdir)/misc \
+		--disable-installing-app-defaults
+	xmkmf || die "xmkmf failed"
+}
+
+src_compile() {
+	emake includes
+	emake CC="$(tc-getCC)" CDEBUGFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	default
+	newman x11-ssh-askpass.man x11-ssh-askpass.1
+	dosym ../"$(get_libdir)"/misc/x11-ssh-askpass /usr/bin/x11-ssh-askpass
+}
diff --git a/net-misc/you-get/Manifest b/net-misc/you-get/Manifest
index 39cd88d56715..e822fa0a4e3b 100644
--- a/net-misc/you-get/Manifest
+++ b/net-misc/you-get/Manifest
@@ -1,5 +1,7 @@
 DIST you-get-0.4.1270.tar.gz 143127 BLAKE2B 2c18a97001caf0c44a5baf30042cde61ac0ad2e8a5d0c0dc178474ba9cb70671c4bc9ecbbb72515f4fec2306598ba1b42d66192f2a16aa8fd0d65ff47eeb0b61 SHA512 fc21563396d73b0fbd7ff02c423a256be548957ef5d72277c887d33ee05269c2aa404a66972e934d4f0076ebd30bfa1b0914b05c25b38b63b3701dad1361587b
+DIST you-get-0.4.1355.tar.gz 143921 BLAKE2B da303fbcedd0818d785f846da4022364c3782d74b50f01b8aa2c0da38f4d61108da22a991e3ae02660021df6ee3378fb9e03826210563aee37e7f85e72b52fa1 SHA512 20f092d49e554f994b57dec4f12a8a0f4aaf418f8e0ce68611e1424f5ee512cad104c5498fe7d133ae8fa1c65440fdbebb8d523d9792336ea5c62ac3a58aa9ba
 DIST you-get-0.4.536.tar.gz 104745 BLAKE2B 48a5432ae1d4448ce0dcbbfdf52225920eb8cd8e575030cc62da0637f10cc7bb02a983c27c5bdd4a9fac1b45ab129db4f7fcc2ebb4bd17189918e04dabae0cfd SHA512 13d280dd5f0e6b6b5033de6eb94a251007bfc21bd99a9c0af86a5ed7b1c9b267d742c278dd80ec0a13445e09f2e22aea23bc77a5da12557be33f97731258abc6
 EBUILD you-get-0.4.1270.ebuild 487 BLAKE2B 6c58374899f3a47ff69bc7a444b7776f5e5ef022d930c31b4aec49e8e05c6c52e9e2831ac825d5819394b5c449ada1fe408ba889c5676d1736970a3afdf4c17f SHA512 071fb6d7f9730196f24506fa810ca22cb80f5c029732cc5111f60c9d24235b868b20d1e7f97d5ee303247b8b35c1fa5eaf87f2b726fa7d35b1e53d08217b5f69
+EBUILD you-get-0.4.1355.ebuild 491 BLAKE2B df2c52667746888d5d237efd9709fb6f906fd134e1f5577b49a2da44c6f758ae18adfed916a05ada93961b843155daeefbd0d7d097472f0a9aaece057fe88849 SHA512 daf09f61ee41802d6ac30498d8fed7258d63e7bae58e990b5b240c3a948293df3af04d798e6adc0b13c016dd498c5a86536c29680c8d0dcc007aeedaec89d649
 EBUILD you-get-0.4.536.ebuild 485 BLAKE2B ad233ced25f0b304b79dde1e452c7c5393052ab4fbbd240cf08b60e27317c2d37e240cbb8ad92aa3f0d0573e42284f47bbd0fef1e4aa614c5ea99942196c7875 SHA512 69f0b7f67b115bb6393c09ccea4bcee23b2fca6545df43765c475e54667bd33013b1d81ad648ca7b21316cc09df388569bd7155ac4f0214915a45719512dc61a
 MISC metadata.xml 330 BLAKE2B 9d17cf8bd3386e62f13765cd48f3351ef8a3abd726772d0d2d1365c8f8fa531efe401c33a46232092aae2a0f846cee99d5bfba400f5f1b2d10466220d20477c5 SHA512 923e442a3f28cd825b34e717db363907d19638656c7045e705f1cd4460868e7b602de696096157097e2723d9b537d09130d2d8506ec206b3c874d205150a1dd6
diff --git a/net-misc/you-get/you-get-0.4.1355.ebuild b/net-misc/you-get/you-get-0.4.1355.ebuild
new file mode 100644
index 000000000000..4565235b1499
--- /dev/null
+++ b/net-misc/you-get/you-get-0.4.1355.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=(python{3_5,3_6,3_7})
+
+inherit eutils distutils-r1
+
+DESCRIPTION="utility to download media contents from the web"
+HOMEPAGE="http://www.soimort.org/you-get"
+SRC_URI="https://github.com/soimort/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+RDEPEND="
+	${PYTHON_DEPS}
+	virtual/ffmpeg
+"
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index fdaca2cfaa5b..090d4767851e 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,4 +1,4 @@
-DIST youtube-dl-2019.09.28.tar.gz 3181163 BLAKE2B e3e7b166f07cbbbe8f77c7116254000d5c864efcc2701533a7f7aa296450323a27072509acabd5a1be27c5aab208037e5545aa21e152b14ea0374e1c629c3ef5 SHA512 b5d5034f9ace17ee18b550b825431797b49d1f916963d483c95a737a3f2842c4c916f6d24f2056efbb786ed3c2ddf269f28f736a650a47b7ff0f94256aba4e94
-EBUILD youtube-dl-2019.09.28.ebuild 2124 BLAKE2B 608cd130bf27ff5253236fea27c22981fd804fa73e49ee6d0e67173d1840bd266349334f041307b4fe82c7a0708ae1a032d8f3d113dda7e0931197267f4b1246 SHA512 7ff84adcc79769d2acd9f9baa88e6f4222c65e8c892de335200e0f27d2aa15dc839241363bd2f58a6fe37e0af1345b072c5147a2205a927caeb9b9540dc17f72
+DIST youtube-dl-2019.10.29.tar.gz 3172150 BLAKE2B 2cdaed88f1518245515d3d4030db8dd22b83ad1955bbd08fcef52b581d35f2de28dd9a95aafaede4edcba67aaf3b6e7697142ed6c715754da957a5cf8476cf80 SHA512 53d79440a86a08c39ec2f6d26e54aec12594b41419aeba2494eab087b49de97485beaeabc17cf819024799cf6f44d2386422c9d8f484c091c34b8cb202023c9d
+EBUILD youtube-dl-2019.10.29.ebuild 2124 BLAKE2B 608cd130bf27ff5253236fea27c22981fd804fa73e49ee6d0e67173d1840bd266349334f041307b4fe82c7a0708ae1a032d8f3d113dda7e0931197267f4b1246 SHA512 7ff84adcc79769d2acd9f9baa88e6f4222c65e8c892de335200e0f27d2aa15dc839241363bd2f58a6fe37e0af1345b072c5147a2205a927caeb9b9540dc17f72
 EBUILD youtube-dl-99999999.ebuild 1997 BLAKE2B 7b5974dc4df22cbb2fb7d87f60e73b2fddc7117331a6a81e8e9f0efef84788211d5fdefb1c96e9d4df0677fda2d264ef2846f36e60a890233fa79b06722b2abb SHA512 71019b536d5301dfbd5e9cb8085d1a001854f5bf204c0e76866c16a9553516a55081c17396bcc89c0128e44116b6e2dc451541b7e89d677822f3d541b316d5c5
 MISC metadata.xml 218 BLAKE2B 717fcfd86a1f75e0ad21845c9b496cf01d7bc7c80b6be8c08143ea304a08fbb75352e82e8fc883398e96da9c037f8912c4a9612b5cf85ffb25b3a5f041b02fe2 SHA512 d36d668a636222ce6394eca2598850e68139819543fd3cf0e76301e2a61c9b9303026b49536d1ed1b52f44d5703dc5e4247df786e0b4a704b28872e0a4a71b27
diff --git a/net-misc/youtube-dl/youtube-dl-2019.09.28.ebuild b/net-misc/youtube-dl/youtube-dl-2019.10.29.ebuild
index 8b7913f66a7d..8b7913f66a7d 100644
--- a/net-misc/youtube-dl/youtube-dl-2019.09.28.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2019.10.29.ebuild
diff --git a/net-misc/youtube-viewer/Manifest b/net-misc/youtube-viewer/Manifest
index 76fe5c2811be..c3ff3afeaa15 100644
--- a/net-misc/youtube-viewer/Manifest
+++ b/net-misc/youtube-viewer/Manifest
@@ -3,6 +3,6 @@ DIST youtube-viewer-3.5.5.tar.gz 238922 BLAKE2B 8e5b57f5e83ce53b3249e948e141042a
 DIST youtube-viewer-3.5.8.tar.gz 239590 BLAKE2B 7230518b87f77d153820ba8c60af8e017cbc7e5f65d96597673f5c9500f5116a63aac28f385eac92a0df9e7f36ea7c3af8c4efa5b1ad55ae66afdb03abad95d7 SHA512 1d657c08ccf4fc4d79408e2020fda1f9187ffc1b6faea5524b4190627b46d22336b8faff22330882507ac81e3717344fdef614ea57717c1face1807a835ef746
 EBUILD youtube-viewer-3.5.4.ebuild 2077 BLAKE2B aeccdf3f4c52ef9c7c1d87fcf73abbaae60ed073379e8d49296555cefa04a8a4a35377a5813701de4434473efd9b7f93122b4432aab38f713b5840a16c28533e SHA512 e643fd7e4b39e992619b4c16acc4fbd23ff5227348a3d0379a67cb4608164c7115bcd5737db3e3be4075182ed963aa646e194715ea19162ad3698a4701e55181
 EBUILD youtube-viewer-3.5.5.ebuild 2077 BLAKE2B aeccdf3f4c52ef9c7c1d87fcf73abbaae60ed073379e8d49296555cefa04a8a4a35377a5813701de4434473efd9b7f93122b4432aab38f713b5840a16c28533e SHA512 e643fd7e4b39e992619b4c16acc4fbd23ff5227348a3d0379a67cb4608164c7115bcd5737db3e3be4075182ed963aa646e194715ea19162ad3698a4701e55181
-EBUILD youtube-viewer-3.5.8.ebuild 2078 BLAKE2B 01429597f4165f51927b917bad7e9d98ed8d97e984246cc6a520f30722ff19d40dcacf97c57b7e094307368c5fd46727ba75b90b47d2ddefe035b565e606c151 SHA512 b134287f341b13dff777e469350e2ec40bd8126b89e5da0816a27906bfb39a40e5ec2c48d1809a8d98c64b2900019e6752c4f197cec9f21b2f5af30030378de2
+EBUILD youtube-viewer-3.5.8-r1.ebuild 2126 BLAKE2B b4cdfcdf7e1ba4e9764c49d417b4109767254a3c848abe9580231b168a0232e72900d776178b90a487ecfe36aee7713e5f8c1ca5c5ca964aa2594335cacc34d8 SHA512 132f0f0cfb73393428e79a86b95a4109c1dec252ec2d6c67c7d58318d90595fdb08c86a105464f0d8ed9f620142840fda1090179ed05e83c6cb19a7b87e2abd8
 EBUILD youtube-viewer-9999.ebuild 2066 BLAKE2B 2e4b124f1665cf74802d26c2846bada76df74c1ec3c924209b5337317f54eec6966e91938813d07dc3a19b1fe175da51744a10ea1647a879d332865bece9c325 SHA512 020de8cd2fe7a25980841da52c21deab563bebd1e40f5135b8cac247dff88f55d5ddb1736ed75d631c82b171f2bdc1482040b5b723e5c4ffdfe32f6a0ff70b4a
 MISC metadata.xml 1001 BLAKE2B ea9aae31db72d91c37e3f37b672404262ad303a26461df31c78d4a45050ac27c46e9ed18b160eb96f34d15b08bd6250139ed2960834b0aa93923c2651bd19e58 SHA512 2136df64736fa79cae9cda680d3412ff700c03b943c19184a0d1c94d51f161b34eddefee88468ef63a99e87a553973caeb1241226fbac13eabb5462990d98fd6
diff --git a/net-misc/youtube-viewer/youtube-viewer-3.5.8.ebuild b/net-misc/youtube-viewer/youtube-viewer-3.5.8-r1.ebuild
index d9ae295f2cef..676951a81313 100644
--- a/net-misc/youtube-viewer/youtube-viewer-3.5.8.ebuild
+++ b/net-misc/youtube-viewer/youtube-viewer-3.5.8-r1.ebuild
@@ -35,7 +35,7 @@ RDEPEND="
 		virtual/freedesktop-icon-theme
 		x11-libs/gdk-pixbuf:2[X,jpeg]
 	)
-	|| ( media-video/ffmpeg[openssl] media-video/ffmpeg[gnutls] )
+	|| ( media-video/ffmpeg[openssl,-libressl] media-video/ffmpeg[-openssl,libressl] media-video/ffmpeg[gnutls] )
 	|| ( media-video/mpv media-video/mplayer media-video/vlc gtk? ( media-video/smplayer ) )"
 DEPEND="dev-perl/Module-Build"
author	V3n3RiX <venerix@redcorelinux.org>	2019-11-03 16:06:58 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-11-03 16:06:58 +0000
commit	bd4aeefe33e63f613512604e47bfca7b2187697d (patch)
tree	adb35b5a9a00ee7ea591ab0c987f70167c23b597 /net-misc
parent	48ece6662cbd443015f5a57ae6d8cbdbd69ef37c (diff)