gentoo resync : 18.08.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-08-18 18:16:17 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-08-18 18:16:17 +0100
commit: fc637fb28da700da71ec2064d65ca5a7a31b9c6c (patch)
tree: 326613a08f25851c388715e205576a2e7d25dc4f /net-misc
parent: b24bd25253fe093f722ab576d29fdc41d04cb1ee (diff)
94 files changed, 783 insertions, 712 deletions
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index e5df6a1b0f50..a5604d411c5c 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/anydesk/Manifest b/net-misc/anydesk/Manifest
index fcca2cbeca8d..21649ac305b5 100644
--- a/net-misc/anydesk/Manifest
+++ b/net-misc/anydesk/Manifest
@@ -4,6 +4,6 @@ DIST anydesk-4.0.1-amd64.tar.gz 3663439 BLAKE2B 6d693262569708d0289f9e4b03e15a4d
 DIST anydesk-4.0.1-i686.tar.gz 3658518 BLAKE2B 39bcad58de9b5ae76da5e96e32a8799343e1b6f7f78b3db3d02e675acae1ebbfa5c2a47a043b9d88810644656bce027bc347a783fcccbf37cdf44f986f1a8548 SHA512 e922e296149811a7ef77ae642c9ba73ca9888be57f13b0616ba5008f6837c86245d4b8b3a4b8ab6739a97fffa9b397b20d572c1fae7d5a5b2d909e8ee07112cc
 DIST anydesk-5.0.0-amd64.tar.gz 4258837 BLAKE2B 1ebb7cb70226873e9a2207823a1d66eb6b2dda9846d2921fc4484638f1bb4b9bf1abe4897af38fe7fb4c1c585187121bcf54bda5bd33a48c052fa5021f5cac07 SHA512 f18a3374dfdc62fecb7d47cdc6d43f7ec71433ed06f4c7165056e9b9526acd624305b0409cf1140f85631f8d7b72cf032ff32298ea24781c8e48e58d7e50abf0
 DIST anydesk-5.0.0-i686.tar.gz 4259050 BLAKE2B 43eb38dda82e6846c3e3c47f28f2556d93a4a420ea82639c7be0fc122a4d1bfdeecc5bbe7088687a54a0cc992307bd0ca4502a9c46539e459cea2d362a962622 SHA512 bfe3b39540aec09432343c554ec761072dc688f271bf164c1b3d6cb54271336b5cf35b51a93902bfad2d92d530c186abe108cc250f2a7f88641c66abd42b3c6a
-EBUILD anydesk-4.0.1-r1.ebuild 2272 BLAKE2B e8d7054d8237607150316ad90e8cf7be776c11770734a0e67ded1f19344fb0bbb82bf2704523a0f3457c319e54ca708c94def234fca4c9e02ad8b02c6513bb82 SHA512 5a7a368670b7d1337ff2246f23d1b26101b9630b9cfd00416d155b6ece5b240355bcf879ccdf535f61c8fb290cb5009b54387d4cfade1ff240f5e60b4a409384
-EBUILD anydesk-5.0.0.ebuild 2253 BLAKE2B 50ce9bfb0f309d63b150e6120aea5a6d12945bac42e26af30de6d21c5154e93b1f1f6e51a7f8e7547a6a813626dfb400b94b02ccd4a65a92267d3dbe4b9eada3 SHA512 f5ee8ee569d69562b90bbca805bb9a3d22b18d4800dc0ba61109329200f2b181b76c794a5582ffe6d4a778500e500b59d2e0961c7bcec689e6ff6fb938678722
+EBUILD anydesk-4.0.1-r1.ebuild 2278 BLAKE2B 52408a66fb764f8286f4efdf25ecb63f0343bca3c19687fc54f91f0ed478d89e0a87a3c5db5b12df78fe962564ade248d87883e0edf1492448601c1db7592975 SHA512 1990f9f67117e25f46ccd4af5ad6d9a23a8854c226f0c808b2f0222b8845da5a750b6f796eb3460992577b654bd8fa8f777c5fbdbfcccac419b125414031399c
+EBUILD anydesk-5.0.0.ebuild 2259 BLAKE2B af0627e3eff482a7d4383244334775c08b1ecad8eb021fd161576f1357812794de6679c9da42a186d8d606c9658cb6d9715ec1d17459328bd0b327a21943a0f0 SHA512 b53cf1b2f63e9b6d7157a4cbcab416744716de1465a1a8f908575d0af8273fbc6ed9d2538fa40b6badee6f8a1bcbd507e85700943ccf481038cef0fbcf9f8124
 MISC metadata.xml 782 BLAKE2B 4052c9f572568a3ab3a9c4bc1f567439cc7a4438a5f3fc1c4b14b0b7d4582d19d74ef106d5ad845e2f7549b734eeb539a3c79bc287f0359301c02d04083c303f SHA512 4c8eda43942444eeb6df7a19bb27528973a9efa412536b5b297640c77ae94065bd3b46e722289f1762494742d61ac6c9b47c5f967afa1c226a1daef30484fb03
diff --git a/net-misc/anydesk/anydesk-4.0.1-r1.ebuild b/net-misc/anydesk/anydesk-4.0.1-r1.ebuild
index 0d1c769a03b3..5f3f5977062f 100644
--- a/net-misc/anydesk/anydesk-4.0.1-r1.ebuild
+++ b/net-misc/anydesk/anydesk-4.0.1-r1.ebuild
@@ -21,7 +21,7 @@ RDEPEND="
 	media-libs/fontconfig
 	media-libs/freetype
 	media-libs/glu
-	media-libs/mesa
+	media-libs/mesa[X(+)]
 	sys-auth/polkit
 	x11-libs/cairo
 	x11-libs/gdk-pixbuf
diff --git a/net-misc/anydesk/anydesk-5.0.0.ebuild b/net-misc/anydesk/anydesk-5.0.0.ebuild
index d6ab3121665b..6bd890da6453 100644
--- a/net-misc/anydesk/anydesk-5.0.0.ebuild
+++ b/net-misc/anydesk/anydesk-5.0.0.ebuild
@@ -21,7 +21,7 @@ RDEPEND="
 	media-libs/fontconfig
 	media-libs/freetype
 	media-libs/glu
-	media-libs/mesa
+	media-libs/mesa[X(+)]
 	sys-auth/polkit
 	x11-libs/cairo
 	x11-libs/gdk-pixbuf
diff --git a/net-misc/asterisk-moh-opsound/Manifest b/net-misc/asterisk-moh-opsound/Manifest
index c1b81700d625..73478059d000 100644
--- a/net-misc/asterisk-moh-opsound/Manifest
+++ b/net-misc/asterisk-moh-opsound/Manifest
@@ -7,5 +7,5 @@ DIST asterisk-moh-opsound-siren7-2.03.tar.gz 4233366 BLAKE2B b628d092b47997b1cd2
 DIST asterisk-moh-opsound-sln16-2.03.tar.gz 31309094 BLAKE2B 1567b63c6e93ea70a1ff3452ed7a0a457bb118a2605248d5fd9cae11ac72ef53e8bb663fb826031a8c680715194d05bb6c0abc7ff7597e62f61608ab403437ba SHA512 e5555af8f08720c01bff19200efb7f139dcbb9d1ffa168716dbf93bed97009a441bfe63080c9ca7b15db2c98fe5839d311c39cdf8c0a8a40f8dd93a89b8a11b6
 DIST asterisk-moh-opsound-ulaw-2.03.tar.gz 7479839 BLAKE2B 87ae22a72ab6da7358fe887af5562a701bca89bec35d7f72644cb6f691e0619671bfacd02ec0f0f269447dad1cd050f144b22254af3812268fbabb1944056bc5 SHA512 2827b635a61e520bb0efb8c5e77ce0d1319d58c027cd3721819b58e4136918b7767c5776a4ca02f675cdb35d6f40154fc863eb7d7cb702a637fe9ec966fe13c1
 DIST asterisk-moh-opsound-wav-2.03.tar.gz 15359473 BLAKE2B a3e9ddf0d54989f07c581facfe4f157120e2b2ae9dbba84bb2edb85ec4bdb98db5bc4783924af0845920d3736c5a512a7615effdf8c4f0b212ea347193efd115 SHA512 e8fefcac32ac88735519f3f9df766d77d1007c8e98952c396943966dd554d4237177f7fbfbb707a838b5f4d479c13c6b4bfecd62d78ba5ea40b248d1bf007872
-EBUILD asterisk-moh-opsound-2.03.ebuild 1124 BLAKE2B 101336fb5a67c94daa4685752a66a65bcbe4befa4a533e15a2b2d4d77f68799ded7455eb17af8427d27b8bb617266ef970e4c9a4d09e938e72e7e5ecdf097d31 SHA512 d0b234a7fec579a522dcdf4a135ae26016315d5e9303be045b802348cbd7de700c92e9e923d0c649253872cf8ce055de32f19f50452b2597bfe4c7b1154d256a
+EBUILD asterisk-moh-opsound-2.03.ebuild 1140 BLAKE2B 7bdcca804e6f84086415dc3bbe06025b2225267bd261aefea6590fdbc048879db6f2d887862eb4f0d1fe41c573a2389fe932113dd2ba5a8c9e278e66281ca846 SHA512 feff1f6cbdb0786c81e8917a3a5a958d0ebc3d518cc98f93f8d2a2142cf745ab3b05616a15269e92fea082743e4d5f0ddd1f7b18daeb4484f1aa5c242087a7e7
 MISC metadata.xml 917 BLAKE2B 267b110b5ef3fea60a4fba48147dc7d47897f0b5854039df6e8a47f3c2ce3ddb94f832926b28853caa6fa3e6dbfd0182cd63cf07c4377e796b9ad467ccec1ff8 SHA512 834aff23b944bdd2ad940458323fee9db3e4b9cf3b2e83265bc59a1c7a1b9d992c244b834fbf465a1f3d135470741b27dfa150193f9371519e19d8550a86742a
diff --git a/net-misc/asterisk-moh-opsound/asterisk-moh-opsound-2.03.ebuild b/net-misc/asterisk-moh-opsound/asterisk-moh-opsound-2.03.ebuild
index db7bd7d99a96..526cb5401975 100644
--- a/net-misc/asterisk-moh-opsound/asterisk-moh-opsound-2.03.ebuild
+++ b/net-misc/asterisk-moh-opsound/asterisk-moh-opsound-2.03.ebuild
@@ -19,6 +19,8 @@ KEYWORDS="amd64 ~ppc x86"
 
 DEPEND=">=net-misc/asterisk-1.4"
 
+S="${WORKDIR}"
+
 src_install() {
 	local c
 
diff --git a/net-misc/bgpq3/Manifest b/net-misc/bgpq3/Manifest
index be2a9355d6f3..624c3d00ce32 100644
--- a/net-misc/bgpq3/Manifest
+++ b/net-misc/bgpq3/Manifest
@@ -1,5 +1,5 @@
-DIST bgpq3-0.1.22.tgz 62550 BLAKE2B ffafdefdfa0e9e80de6c05ce3b6aeb33731984f28ccd3eb8186e66311e9bf877c055e5e40d181d42f1ddd8e71b78cc719ec186c49fe7e64b2c48c62d34704d15 SHA512 c2d0d1f209bdd1016a0c5d3e048b3700c1725b6c4135ba8d47daf3ef03fc05f31a190b640d143f3b6ac8b529754539285673caaf3dbf9cc11d80df1b8920f79c
 DIST bgpq3-0.1.33.tar.gz 82696 BLAKE2B d6a8b950747ed0889d2e67873f4b029127d49b730bb0cf4047df7025415db2ee1870d4be632e9347cfe7930f3a453d34e87ba236314825eb994809a5c2b990e6 SHA512 f4faec46eaa5fe77a9118ed76e3d2dddce855cebfe6ead3dadffe0f72ea720502e378febd04829409039fd2bd6a693e518814408c628df1a9e5c7e7c5c170f49
-EBUILD bgpq3-0.1.22.ebuild 624 BLAKE2B 0512d0644b3e5e8c2a737bf788629d3b2b62007b28302c0b0542bdd7ffa54bd5be7bbe66ff76984911a4bb78cc6c00ff7795007e6dc7e448fad671e73f78b269 SHA512 f960e4d4104f14b8e1d10f3b1b830fe5fba11a7f39c292974dd1090d11249f3317d62d8e5da08d45df2b4ed58e14b9c525edac72fdbcf67e6154c8934c3a1175
+DIST bgpq3-0.1.35.tar.gz 87066 BLAKE2B b217d490ed74e9174cbbd70ed5d1dd4bc72b136a23d583b6b9cede8fd38d8b579a463d8a146313f9eec1904e836ac4db0b75a2c1554c00c5df79a8d0d32f950f SHA512 a41a424fc0230a0ab7d64ff017b9c1a52e32d7deae542ba096d4815e0e5ce76342ad55c204bbcc22ae4c47ad486917410c53b0dbb2306d40fa5c5a5cf93fcd01
 EBUILD bgpq3-0.1.33.ebuild 674 BLAKE2B 14f8d30ead4bbba32fb56baf8292aba0eeb03bbcc17e48c0fabc6ef00806beabb64acb5044a514a7510813829280719b8f3d39a200d98b9e0cccccc7aeca5117 SHA512 dcbb1c3312da4aec1455b74d2fa9a741c295e1053ae55651a6df2c86011a0f0dbf0799f1dbb4d30383539fff9a6c8f8931022bf6650d3795f76e3ccd6e377bb0
+EBUILD bgpq3-0.1.35.ebuild 768 BLAKE2B 275fbc4571d5beb7225c29a59aa3300b4534d0e059c4f7816ec42293a943f3b19f4254429593c440988a139b00e5e6a82567c366d7ca479249e4fa9b8c2e908e SHA512 195a72098033c91ab86da0a709b97bd6e0d80361e3d85d6c36a0b486f6efdfb6f0b2460e80794c2aa7765eb0241e02e663cbd1ab547ad3e88a6321e704c00cd3
 MISC metadata.xml 1265 BLAKE2B 08a5d75cc81e3edee274fe845a5d0495bc6c2dafc127f41350dfae62a0ad7425cfb34817ede9fafec65c510f34d9728ecab15e621ba7310093f2d41d9ce32141 SHA512 9364ecadb0b1fd98841b69d59e5bf000be9cd92997c4203506ee4ebfba9513b33141526153defc23bbeb3e5ae6542648e5ba7d2583893fb06420e831b2cd41a1
diff --git a/net-misc/bgpq3/bgpq3-0.1.22.ebuild b/net-misc/bgpq3/bgpq3-0.1.35.ebuild
index c2b0ceab0697..2ee24d24e3db 100644
--- a/net-misc/bgpq3/bgpq3-0.1.22.ebuild
+++ b/net-misc/bgpq3/bgpq3-0.1.35.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit eutils
+inherit autotools eutils
 
 DESCRIPTION="Generate access-lists for Cisco/Juniper routers, successor of bgpq"
-HOMEPAGE="http://snar.spb.ru/prog/bgpq3/"
-SRC_URI="http://snar.spb.ru/prog/bgpq3/${P}.tgz"
+HOMEPAGE="https://github.com/snar/bgpq3/"
+SRC_URI="https://github.com/snar/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
@@ -20,7 +20,11 @@ src_prepare() {
 		-e '/^CFLAGS=/s/ -O0//' \
 		Makefile.in || die 'sed on Makefile.in failed'
 
-	epatch_user
+	# configure.in in package is actually valid configure.ac
+	mv configure.in configure.ac || die
+
+	eapply_user
+	eautoreconf
 }
 
 src_install() {
diff --git a/net-misc/cadaver/Manifest b/net-misc/cadaver/Manifest
index 393d873d3df1..3e4f963bd179 100644
--- a/net-misc/cadaver/Manifest
+++ b/net-misc/cadaver/Manifest
@@ -1,4 +1,4 @@
 AUX cadaver-0.23.2-disable-nls.patch 324 BLAKE2B 5ae07a17eb6079f9801ece8b8a3b893c1d52e13d2cd3693a1e412a873329709b86b2eda9c2bb68d07f850708a49185e6c63602148f9530ab729a2b178fb52b31 SHA512 4c9d7d93af1d747432bfb393b33d5f575f7ad1c2dda1c88238cb40a274f979aee91b75c1cd5c2f91787156e3085df0864204989944be6cfe1b7013c61db25f4f
 DIST cadaver-0.23.3.tar.gz 831884 BLAKE2B 40da7f2a500d05fa7e00ee77eba7e4efa74c751ed381db8d0e9e3a191b7a8461fe8d4e362b3375fe30c1ffb7674cd1fe4158b9c656a4ad0fcb302a1c20220dcb SHA512 48fe0a266be0ca7239f325377e5e2a8dc57a5d60466c7160e36c060ad24c09a50727695b9fa931844b1e66e173ebbb838f390d6c60fd07b614bd3b636cd4dd41
 EBUILD cadaver-0.23.3.ebuild 1073 BLAKE2B dc2af096996fafb295055cf9843465c323ce5f04b97a42e7d2fc201c8ef34c5ca93c28c97723a3671abc968fec9adec094a69d0c9c812c3afde8857edf3952b4 SHA512 217e5a20da9bea6e7eb099b61b33447ef074596d53e45d0318712771596c00adda66e0546e1f15e9067c25b51a842697451219e4b843ab06b428f98f619156ae
-MISC metadata.xml 338 BLAKE2B b00867702effd06d43020a0a3f5962d8aa1ae94197580af3d08c43458e0094f9967abdaa8f3cbf204d14c31c9ee37b31151cd05926978f18dc3344b52c2ca397 SHA512 7d37b09863b6d2a4a6c00930f8f4b9d2237cd216e52af58ea002875d0f65325b7c1a112a9832046db347d7b4bd5881e01cd06257be61516f9e1f975939989749
+MISC metadata.xml 222 BLAKE2B 94ebd170c2e2b56a2a280b892081f4a2b380a9dd63304df741df254293ac82054167980b6e986315718abdf0da5f6d26226df0d13c3f1eedc4ee2f32bdb5a798 SHA512 c4199e672c74e701df271dc48c920480d853cdc341936ef071bb5d1cd3a28127ff0fdf6a4e135ce7e805bcb99bebe93407dd2aa4dfda91a8c66d6cc2d2ae9a01
diff --git a/net-misc/cadaver/metadata.xml b/net-misc/cadaver/metadata.xml
index c2d1a82c0e89..58be4f4a109f 100644
--- a/net-misc/cadaver/metadata.xml
+++ b/net-misc/cadaver/metadata.xml
@@ -4,8 +4,4 @@
 	<maintainer type="person">
 		<email>arfrever.fta@gmail.com</email>
 	</maintainer>
-<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 </pkgmetadata>
diff --git a/net-misc/cni-plugins/Manifest b/net-misc/cni-plugins/Manifest
index b884dcbc3177..91374a8f5c75 100644
--- a/net-misc/cni-plugins/Manifest
+++ b/net-misc/cni-plugins/Manifest
@@ -1,7 +1,9 @@
 DIST cni-plugins-0.7.5.tar.gz 862670 BLAKE2B 17734beabde562cfd52efd479cb24805681a3d8a8abd4fd9fdcf9dbd891b2d5b3026b84a880355388c893db147fd0952786a86716438e140a46cc9a2dfffe0c2 SHA512 7ab43f88b4763907f56ff26d684385e5a3f6314ffb4bcbe356ec33a014fc15207392bd26e2d3041e117c604a386d21841a37d093b04e003303554b03721b32c6
-DIST cni-plugins-0.8.0.tar.gz 3249919 BLAKE2B 78c0b20c3745d8ceb3596b65a57323cc3baaa4ca02bed6de2bffeb5dbc7075f86f536faa5b75ad1bc05c359b2d9add8e6084831110337c0df08665b252eb8413 SHA512 de685a66e0e875e8a2209b76c5d1f5fd0e426804e3db6084cf2e89695a8b1876eae47ff1fcfdf065a3b027918fe7c4775d2321358402dbd1206928538edb52b4
+DIST cni-plugins-0.7.6.tar.gz 862694 BLAKE2B 4c66d80be260217f977f6f80ecd36ec8e3209b57ad34e1bfb03dc5df453ead6aeac24e2852a068430e94a83fc314f92bb9dac41432e16851508e170fa4e77c58 SHA512 28baaa9793dcec4d9417d6beaf4d85cb1eb433f401b3f7d905b2a60709825de0e9ac80a713d8944433e72c7381d502b14aff85c3dc5d665bfca3160f1bfcc13d
 DIST cni-plugins-0.8.1.tar.gz 3253670 BLAKE2B 7de5b53e310b496137c0ea0d6b4d22d5604e49fb4ada456eaad377a0b20d0b8883e7420a8d5f8cf92922e98b493608d495126772fd4205e4efb42b784fe3cea7 SHA512 ed57162fc3d014c897ee2f7f82b738624ca42ad7c238ac6ac5c1eb9ac865fe27f8ded1510cfb131f7b43e44f6cd0366ab83011386bcb6add36ea11235767760f
+DIST cni-plugins-0.8.2.tar.gz 1997790 BLAKE2B a3c0196c589a3a77de100a87ca8d3eb952478190c78dc50bc7b65d6229ec33593fe77be4a8c5b593d9ea8bb806f9b8d04768bc52b689b006640cfa34c176a0a1 SHA512 383540232593c7ef8c28f83e660a58ae6dd2592c6d97a43c8fc1f046a3fa448911d4066ec0a6a7d7e770a1a2dceee7c31d742100b0871e07d691fe6bdffd42f9
 EBUILD cni-plugins-0.7.5.ebuild 1070 BLAKE2B 752d58ce8af422059a73dba9dcf25c3695f63fc12b66ceca111c16b0a82b4c419256e454f6ef2618d2b2766d9419ab8fcd8b18c2115542e8c07be98cbc6f7d9f SHA512 da1505026c64b785ea08445748b5f262a4b1a078a220781f367ade8d7b61774829b6c0beb277cb9a6a53a9ad946c1538cd2d6c7e6b23de29c222bca03e7d9364
-EBUILD cni-plugins-0.8.0.ebuild 1131 BLAKE2B 16a64477e9238bacf2d3826ea9da620b2fea26dcb1f49fd61779f3c510d936f81bb7c9c8e82da7e2eb411eb6d276a4522d8e6f050175e45a82e27694ce4e6920 SHA512 2c8a59a874f191a5a6a7d6d367472ada15ff09c65c734df2943897398dbd06f4f6cec975ebdf2eee3c1fab2daa538f290c44c817151a2375a1cc4ccf83d0d495
+EBUILD cni-plugins-0.7.6.ebuild 1071 BLAKE2B c91d75b0731d98706fa8a739c245a807267e9f1523f6fcf0572d60126d53ca316a6229fc54890321e4e54953c55aa00398a74075b7a5c03ac357c01bce9f3a1f SHA512 e587dc1bef7bd8f476f31e99444636c38d175827cd75742f96dee2fc40e2a1a5c6a69519137ca42c9a0a1ae50c7efdb4813a89994552183160c4c0dc6bdc74fb
 EBUILD cni-plugins-0.8.1.ebuild 1130 BLAKE2B 1aa3cef41088f7be1bdbd050a547425ccd2ce2cefc0afcf8ac029980b043ff6f0cca65b576dda9315bdb5613a80abd3088e14a890759a2173009cdc0ce838dae SHA512 acb61386ae8a713f971138ca95e3394807ac238c906308695cac766bebdca5599607311e704fe77224401f42bd7e2c7d7b2db325b8f7278aa6fadb8411544725
+EBUILD cni-plugins-0.8.2.ebuild 1181 BLAKE2B 9cf5c0c0ede72dbf6454166a2a1fab9c9adcdc40277d2542b526f6584148f9a4416fb710a4f352bd4916d9c4aeb29386527cf86cce7a57deaa35a22e68b4e11f SHA512 0c14d1b3a0df0a397d3c0253592ab4e6d76cdad8335db44a960b74fcf1424a6c21e4c4fa54d8460db9db3d5c7e41404c1c6872536d05699f1012c466b15af5b5
 MISC metadata.xml 347 BLAKE2B 3028c057ca5c58bc39b10c01e9989088f0a2498a5a95a1ada88517dffe62daba52c8e6ead2fc8a7245ae06a95ffbc9306de03eecc82464ae0a6d2fbb4cdfb99b SHA512 b977f4287446648ff730c36e71002f524ae9a96c3fb104ee8542da90f6f996926a9b9809007f285e930d79842d9663cf4e462e8ee50da8319dcd3e07cf6dee05
diff --git a/net-misc/cni-plugins/cni-plugins-0.7.6.ebuild b/net-misc/cni-plugins/cni-plugins-0.7.6.ebuild
new file mode 100644
index 000000000000..5351454f1564
--- /dev/null
+++ b/net-misc/cni-plugins/cni-plugins-0.7.6.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit golang-vcs-snapshot
+
+KEYWORDS="~amd64"
+DESCRIPTION="Standard networking plugins for container networking"
+EGO_PN="github.com/containernetworking/plugins"
+HOMEPAGE="https://github.com/containernetworking/plugins"
+SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="hardened"
+
+src_compile() {
+	pushd src || die
+	local i
+	for i in plugins/{meta/{flannel,portmap,tuning},main/{bridge,host-device,ipvlan,loopback,macvlan,ptp,vlan},ipam/{dhcp,host-local},sample}; do
+		CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')" GOPATH="${WORKDIR}/${P}" go install -v "${EGO_PN}/${i}" || die
+	done
+	popd || die
+}
+
+src_install() {
+	exeinto /opt/cni/bin
+	doexe bin/*
+	pushd src/${EGO_PN} || die
+	dodoc README.md
+	local i
+	for i in plugins/{meta/{flannel,portmap,tuning},main/{bridge,host-device,ipvlan,loopback,macvlan,ptp,vlan},ipam/{dhcp,host-local},sample}; do
+		newdoc README.md ${i##*/}.README.md
+	done
+	popd || die
+}
diff --git a/net-misc/cni-plugins/cni-plugins-0.8.0.ebuild b/net-misc/cni-plugins/cni-plugins-0.8.2.ebuild
index c8c1659634b8..4fd45539a5a6 100644
--- a/net-misc/cni-plugins/cni-plugins-0.8.0.ebuild
+++ b/net-misc/cni-plugins/cni-plugins-0.8.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit golang-vcs-snapshot
+inherit linux-info golang-vcs-snapshot
 
 KEYWORDS="~amd64"
 DESCRIPTION="Standard networking plugins for container networking"
@@ -14,6 +14,8 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="hardened"
 
+CONFIG_CHECK="~BRIDGE_VLAN_FILTERING"
+
 src_compile() {
 	pushd src || die
 	local i
diff --git a/net-misc/dcetest/Manifest b/net-misc/dcetest/Manifest
index 0dbcc14e2d9b..dd3f7b5f487e 100644
--- a/net-misc/dcetest/Manifest
+++ b/net-misc/dcetest/Manifest
@@ -1,3 +1,4 @@
-DIST dcetest.tar 133120 BLAKE2B 23896f8e40711f8e5123bc24194d302d6ad697e7412d98b7d53f0f89d308a52139e3c892a6de9e55dbfa10cc8e0b24d70fd6284b7d1ea5e461146edb27653fec SHA512 ac14f753fbd88be14a4d060f24773200967228154be0d3eb19becb38fd90093e0feca0d9a43873ffad59f5ea2489d35de5e4958f72c2064f98506954b698afdf
-EBUILD dcetest-2.0.ebuild 750 BLAKE2B b0622290704b278ffd9b2ea56e6f5a87ad3f8a9952419e9a62c61645ac283ef124ee90aa4f2f9b7146a92ea59def2a4b019e5c8df89752ae5006500d5ac01810 SHA512 d83d0668b69d0d356f8c1eb5743bb3f51357a826c2cc060dc83b811006bd5ca627712834bc90a18cc75a93502518eb02a026ddeb5efb16d176aed41f84cb4bbc
+AUX dcetest-2.0-fix-build-system.patch 383 BLAKE2B 0bae31116e4cce63d8ab94aa32c7cc26d51640d434da533bd34df4f1005012a8c457cc1df3d46dd1223da51bbb11babcf618acb1ad8b29de5c52f12adb69c8db SHA512 2305949aedbcbbc152edb1ea992f3801e40b1096dec1e1fd972154d3351df6c691d64af737e6782e30b03de972635bd91be8063cefdbb528f9330cb0a01c4ac7
+DIST dcetest-2.0.tar 133120 BLAKE2B 23896f8e40711f8e5123bc24194d302d6ad697e7412d98b7d53f0f89d308a52139e3c892a6de9e55dbfa10cc8e0b24d70fd6284b7d1ea5e461146edb27653fec SHA512 ac14f753fbd88be14a4d060f24773200967228154be0d3eb19becb38fd90093e0feca0d9a43873ffad59f5ea2489d35de5e4958f72c2064f98506954b698afdf
+EBUILD dcetest-2.0.ebuild 635 BLAKE2B f8ffab2606ca50cac5fb7d55a9179c3e27ba2e0c3b2637261001acbf33198bcf15816aa6aab797fc56c7c919372300103f0bbbe5cac94bd0471f9f3ae1774f64 SHA512 45418b834438305dab0f1de8847dedc774300d5a4db6100887d43d8cdc83b1fb7539b49aeb869994d4582576f9f268ee1e0cd8e2eaa16f6323168e51ebc355a9
 MISC metadata.xml 1150 BLAKE2B 2d8ca02885c19ca28b1fa4e4786a8f71b3b8fc9354bf364c458353c35a7d816e85745ae96a6df2878b82e05a20331eda0879cb145171fa7a8d84920f9573bb13 SHA512 b145c72107ab8df8b6f04c72ab71a3604a9f8447080b82266e79173f8a7dba8df65e9c2cc8731667663a31dddc60b62f6c7cd1e0c4e772791bfddbd9f5bb11e2
diff --git a/net-misc/dcetest/dcetest-2.0.ebuild b/net-misc/dcetest/dcetest-2.0.ebuild
index b88a73a876f2..b0b822c166a4 100644
--- a/net-misc/dcetest/dcetest-2.0.ebuild
+++ b/net-misc/dcetest/dcetest-2.0.ebuild
@@ -1,32 +1,27 @@
-# 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 flag-o-matic toolchain-funcs
 
 DESCRIPTION="dcetest is a clone of the Windows rpcinfo"
 HOMEPAGE="http://www.atstake.com/research/tools/info_gathering/"
-SRC_URI="http://www.atstake.com/research/tools/info_gathering/dcetest.tar"
+SRC_URI="mirror://gentoo/${PN}.tar -> ${P}.tar"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="ppc x86"
-IUSE=""
-DEPEND="sys-apps/sed"
-RDEPEND=""
-S=${WORKDIR}/${PN}
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# cleanup the makefile a little
-	sed -e '/^CC/d' -i Makefile
-	sed -e 's/CFLAGS.*/CFLAGS += -Wall -funsigned-char -fPIC/g' -i Makefile
-}
+S="${WORKDIR}/${PN}"
+PATCHES=( "${FILESDIR}"/${PN}-2.0-fix-build-system.patch )
 
-src_compile() {
-	emake || die
+src_configure() {
+	tc-export CC
+	append-cflags -funsigned-char -Wall
 }
 
 src_install() {
-	dobin dcetest || die
+	dobin dcetest
 	dodoc CHANGELOG README VERSION nt4sp6adefault.txt out out.txt out2.txt w2ksp0.txt
 }
diff --git a/net-misc/dcetest/files/dcetest-2.0-fix-build-system.patch b/net-misc/dcetest/files/dcetest-2.0-fix-build-system.patch
new file mode 100644
index 000000000000..af7736a31448
--- /dev/null
+++ b/net-misc/dcetest/files/dcetest-2.0-fix-build-system.patch
@@ -0,0 +1,23 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,19 +1 @@
+-.SUFFIXES: .a .o .c
+-CC              =  gcc
+-CFLAGS          =  -Wall -funsigned-char -c -fPIC -ggdb
+-
+-BINS = dcetest
+-ALL = $(BINS)
+-
+-DCE_OBJS = dcetest.o tcpstuff.o
+-
+-dcetest: $(DCE_OBJS)
+-	$(CC) -o dcetest $(DCE_OBJS)
+-
+-clean:
+-	rm -f *~ *.bak
+-	rm -f include/*~ include/*.bak
+-	rm -f *.o
+-	rm -f dcetest
+-
+-
++dcetest: tcpstuff.o
diff --git a/net-misc/dhcp/Manifest b/net-misc/dhcp/Manifest
index 31071f474a9c..14f18ba3a705 100644
--- a/net-misc/dhcp/Manifest
+++ b/net-misc/dhcp/Manifest
@@ -5,7 +5,6 @@ AUX dhcp-4.3.3-ldap-ipv6-client-id.patch 2095 BLAKE2B 6f35bfb4ee123d6c0c5ecc56d8
 AUX dhcp-4.3.6-dhclient-ntp.patch 6810 BLAKE2B 9cf5ea5d55277e1821f2c97dc807e63a67b7712770f621e95272f58f3ac9cc12e586511114dc3c046a18624fc08caada1dd6bf4c36724219751f330a306071ff SHA512 13e4215c4fe02ea8d17a1559b2653de1bb72675eb72ae7b17707c2cf138fd620406f1d57eea3812f491df475f942e2f44b9b784d5ad5a2f352d455bef3df771e
 AUX dhcp-4.3.6-dhclient-resolvconf.patch 15340 BLAKE2B 57bd2576fa861d866b568e8814f591614167801bd3ef30270f81fd4b25637b255dd455ea8824d291b91a3a084f3aa0e55e1285fced0f8a5c684633f6ebe47a90 SHA512 264a2e073a80109c9dced6a3f7834f958990a15e578dd1435128e7ef9335b0b9751020166fbb0e1b01193c19eb28322648226fc5a1b07dc0b9452b702903cc8d
 AUX dhcp-4.3.6-iproute2-path.patch 451 BLAKE2B dcb948428326f7ca198061b1956f25981441c80d7bb8275a09f7b97c50644ba500966edf9b6483c43b96d88abba348976a0fb23b29032682da58014a9d559415 SHA512 91f20102e41cef81253617c80ba4d8193f35f51419606ab62e01f07153f1f616c70e0c43838c3d83913402f8d02ff333e4e36e08efd50aa8f8fe83939f91ae3e
-AUX dhcp-4.3.6-lmdb-removal.patch 569 BLAKE2B dfc88697db8ce607a6b9934276b2df43f8eb3058eb14f349a95e18918d9256ea01930d492089e014744d10663166739b3f4ec9234e4b3b3ede80b7923be01fb4 SHA512 802be48012a627fb83114fee9cd0d2ec7f161955f19aa9ec0d51279208c4e8dd99f2a24d5132631cc5f45c17732971f7abd3f6d292b6c4e865645a3469a5c08a
 AUX dhcp-4.3.6-nogateway.patch 1904 BLAKE2B 9cb4c4a491e590958ed0654f0b1d7006e310ff5e40b3872bdcb17de45f7fb023d3d08b2433b25a362f13da89c0b818d88bb5f2d9737b3a00528c581a297f65f5 SHA512 571320f652ba5b24813ce9707f333f1d44d09c046c6371c86d011bd9d1c3c1288918851df336a881a62c6c095b6ac3bd9699f022e6f30dbb2542157b10ec20f7
 AUX dhcp-4.3.6-quieter-ping.patch 2622 BLAKE2B fc9c49f60419d39f81d097c70ee61db879578225c4d6c90eb9828852bd1c3fb5daf8de5651b0d75a020767bb7e8b7917355d7e68cc7f8fc3052e010e96115be1 SHA512 4338ca0fd733676ed6ecc790cd5305b9eca468a9be206f0a1d195d024974aabdb7def81d2181261d3b6033fd4e9b5461c07adfb3b16d1df1dc2e5f819c90ba47
 AUX dhcp-4.4.0-always-accept-4.patch 889 BLAKE2B ce7ddd45c924f31c37294eb091476ec1aae4a658beadfd1481e2b0a2044f2d1a5be6798eac3c8f677c223eadf9be043ff3e38bfaec14305a0ad823ec3b2930b8 SHA512 2801de50402443196c412d2c578c74cc040869b7dd59f6e7ae9e66e69edb1fd567de7acbc2b2612b46b5cddca08f984401fefc4f81c26ea630b193f0e0f1884e
diff --git a/net-misc/dhcp/files/dhcp-4.3.6-lmdb-removal.patch b/net-misc/dhcp/files/dhcp-4.3.6-lmdb-removal.patch
deleted file mode 100644
index 6f80d7401f57..000000000000
--- a/net-misc/dhcp/files/dhcp-4.3.6-lmdb-removal.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uNr dhcp-4.3.6.ORIG/bind/Makefile.in dhcp-4.3.6/bind/Makefile.in
---- dhcp-4.3.6.ORIG/bind/Makefile.in	2017-09-19 23:37:59.459485673 +0100
-+++ dhcp-4.3.6/bind/Makefile.in	2017-09-19 23:38:19.970484566 +0100
-@@ -28,7 +28,7 @@
- 
- bindconfig = --disable-kqueue --disable-epoll --disable-devpoll \
- 	--without-openssl --without-libxml2 --enable-exportlib \
--	--with-gssapi=no --enable-threads=no --without-lmdb @BINDCONFIG@ \
-+	--with-gssapi=no --enable-threads=no @BINDCONFIG@ \
- 	--with-export-includedir=${binddir}/include \
- 	--with-export-libdir=${binddir}/lib
- 
diff --git a/net-misc/dhcpcd/Manifest b/net-misc/dhcpcd/Manifest
index a3708d2efc93..aa83e8587874 100644
--- a/net-misc/dhcpcd/Manifest
+++ b/net-misc/dhcpcd/Manifest
@@ -1,8 +1,9 @@
+AUX dhcpcd-8.0.2-string_termination.patch 1827 BLAKE2B d90f757e740cf73adc76d82705f669bd0d43415f523ff01d11c0afe911ab744cf5d36b32906209abc110eff2355f1687b2055cfac4a22085ba4aee65c74e5e27 SHA512 1d232efc8c822534dd55a5e5998392e4ded7b9051b69413a7ef44b450a1e050c651467148d560008fd537a5388873ba0d2efe9f4f6e4b7829f3f6ae87d82971e
 AUX dhcpcd.initd 328 BLAKE2B 72ef6bb16e4f80b440890112cd399eca1057ae42ddc96ee1a29482a048682dd34e065bb68876329ecfe2f1db4c084e320f4185b3029b89c2328d6ab27a1a7e80 SHA512 6d3220155f2d9ed3e3a00afd378eeb70d435e19804201f8bb35498f1f7f3dfdaeaa2f4a01a18f5e96b457d9c173bc6a206b3e67ebf6d95da7e7b350dcd153fde
 AUX dhcpcd.service 227 BLAKE2B e24aa85c15d0211856b02508b681f7e3c1f8b8b1743f31ced9600c2c33da04b61f2166cad7696776ae81ce1be5701cae2691f6dfd86aaf8679f20e459e87c7e5 SHA512 4a030dc291fa7deba9c1f33d61dafdda710247ef7f3743c28e46b767a190e359e468433147bda23c82fae9c93ec31cd68905bfdb51cb8c2d9176ea789b31b14e
 DIST dhcpcd-7.2.3.tar.xz 213552 BLAKE2B 5f89e11424b85702b05da6207ec346480c029de1416cc8892471de428ca0a4395a8915700e2237bfa2b133648973bc2a7c7d15aa2d0ba492f96fbf3908d7f613 SHA512 271cca422fad10eaf842acfd5b590c0ad537f5f23ee919a3928d8ad98463ab03bde21c0bc08741ea9618ee31095160a7c00066155eae2c74b17c49af65ba566f
 DIST dhcpcd-8.0.2.tar.xz 222408 BLAKE2B fb27a33cd64c7aeedb28e05c885c860618d923ac857895b9fdc7daa608f433587bea1e6630fd9897426b371a45b8a336e1edaa804d76eda6e9fc2adc1411aed2 SHA512 a6e3aa66800adc8b209324bae02a6e373e2623735bf0695ffec4a7c972d65c3498f55e4da62f93df0bc6cddb4bee8ab667b3743b5b25cd5f4cc9da4d1f8e15c4
 EBUILD dhcpcd-7.2.3.ebuild 4407 BLAKE2B 6f5df954ec0be66be6a4f4c1b63a1dee87e78d5cab8de8cbe935bd0d2a82caf70c5dc8d513ddc69b6e317a3d44c2a527529420da71ecf1489a71cdc2f4384eb5 SHA512 aa591926ec797c71c9d28d91a64257eaee76e2fae6853925e0b0fdf9001fd6279bdae68bdd2727f500661b8142c96b3c66ab28b055fb8887c4b7d96162d42843
-EBUILD dhcpcd-8.0.2.ebuild 4420 BLAKE2B d1788540e773dc7708565dd2343989522004ad307e0ae24fad827f9ecc8ebf181d47bc34e16179f50a16ece7105761f9177cb4e310a586b0ed11a5343dc97b03 SHA512 207fb14d4e3c6089d1f4ac5816fd3635c2e38d74e0f1dd19d41aa482d5b399f90a8b352e77eec7153019168746d7f1c63499a741430a8df95f3734bf7cfd878b
+EBUILD dhcpcd-8.0.2-r1.ebuild 4486 BLAKE2B 4fa85a2475043c6a24402a596a38f1ff01aa9d8df9ce03270b411060383d4382e21958b7eb69c7e1963f3b9f5a9296bdbd4cc814c7e344a759fbd0e5500d1f3b SHA512 ba68295d42423c80ab51c332b642837e19bad3126584d9f0cb210fccf9ce4d51d197e159f79b7edfefc80996bc96d98a1dba7e0dc51d213bea54ebd596960982
 EBUILD dhcpcd-9999.ebuild 4420 BLAKE2B d1788540e773dc7708565dd2343989522004ad307e0ae24fad827f9ecc8ebf181d47bc34e16179f50a16ece7105761f9177cb4e310a586b0ed11a5343dc97b03 SHA512 207fb14d4e3c6089d1f4ac5816fd3635c2e38d74e0f1dd19d41aa482d5b399f90a8b352e77eec7153019168746d7f1c63499a741430a8df95f3734bf7cfd878b
 MISC metadata.xml 569 BLAKE2B 0507986b52ed21277e159089c7f4736602917c44f0577d62e7501d728c348b49ecf3a2c92842c8e32a59402ad2c2e4e5c3fba510e227aca738a3d763b62689fe SHA512 9083c03d22c5753f54d9525ac954df8df0cceaed07c05c14367ea2b8598e7d7ab64711c810dc89a46be8d76cba6b9aa14fa389f0d686ed12792c0bfcbabc266a
diff --git a/net-misc/dhcpcd/dhcpcd-8.0.2.ebuild b/net-misc/dhcpcd/dhcpcd-8.0.2-r1.ebuild
index d8940210a7b5..1696c38dcf71 100644
--- a/net-misc/dhcpcd/dhcpcd-8.0.2.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-8.0.2-r1.ebuild
@@ -27,6 +27,10 @@ COMMON_DEPEND="udev? ( virtual/udev )"
 DEPEND="${COMMON_DEPEND}"
 RDEPEND="${COMMON_DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-string_termination.patch #691426
+)
+
 src_configure() {
 	local myeconfargs=(
 		--dbdir="${EPREFIX}/var/lib/dhcpcd"
diff --git a/net-misc/dhcpcd/files/dhcpcd-8.0.2-string_termination.patch b/net-misc/dhcpcd/files/dhcpcd-8.0.2-string_termination.patch
new file mode 100644
index 000000000000..a1bc19ec974d
--- /dev/null
+++ b/net-misc/dhcpcd/files/dhcpcd-8.0.2-string_termination.patch
@@ -0,0 +1,80 @@
+https://bugs.gentoo.org/691426
+
+diff --git a/src/dhcp-common.c b/src/dhcp-common.c
+index 08ab9493..9f556557 100644
+--- a/src/dhcp-common.c
++++ b/src/dhcp-common.c
+@@ -645,14 +645,16 @@ print_option(FILE *fp, const char *prefix, const struct dhcp_opt *opt,
+ 	if (fputc('=', fp) == EOF)
+ 		return -1;
+ 	if (dl == 0)
+-		return 1;
++		goto out;
+ 
+ 	if (opt->type & OT_RFC1035) {
+ 		char domain[NS_MAXDNAME];
+ 
+ 		sl = decode_rfc1035(domain, sizeof(domain), data, dl);
+-		if (sl == 0 || sl == -1)
+-			return sl;
++		if (sl == -1)
++			return -1;
++		if (sl == 0)
++			goto out;
+ 		if (valid_domainname(domain, opt->type) == -1)
+ 			return -1;
+ 		return efprintf(fp, "%s", domain);
+@@ -693,9 +695,7 @@ print_option(FILE *fp, const char *prefix, const struct dhcp_opt *opt,
+ 					return -1;
+ 			}
+ 		}
+-		if (fputc('\0', fp) == EOF)
+-			return -1;
+-		return 1;
++		goto out;
+ 	}
+ 
+ 	t = data;
+@@ -760,6 +760,7 @@ print_option(FILE *fp, const char *prefix, const struct dhcp_opt *opt,
+ 		}
+ 	}
+ 
++out:
+ 	if (fputc('\0', fp) == EOF)
+ 		return -1;
+ 	return 1;
+diff --git a/src/script.c b/src/script.c
+index 74aef1b1..3dee7b08 100644
+--- a/src/script.c
++++ b/src/script.c
+@@ -33,6 +33,7 @@
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
+ 
++#include <assert.h>
+ #include <ctype.h>
+ #include <errno.h>
+ #include <signal.h>
+@@ -477,12 +478,21 @@ dumplease:
+ 	fp = NULL;
+ #endif
+ 
++	/* Count the terminated env strings.
++	 * assert that the terminations are correct. */
+ 	nenv = 0;
+ 	endp = buf + buf_pos;
+ 	for (bufp = buf; bufp < endp; bufp++) {
+-		if (*bufp == '\0')
++		if (*bufp == '\0') {
++#ifndef NDEBUG
++			if (bufp + 1 < endp)
++				assert(*(bufp + 1) != '\0');
++#endif
+ 			nenv++;
++		}
+ 	}
++	assert(*--bufp == '\0');
++
+ 	if (ctx->script_envlen < nenv) {
+ 		env = reallocarray(ctx->script_env, nenv + 1, sizeof(*env));
+ 		if (env == NULL)
diff --git a/net-misc/electrum/Manifest b/net-misc/electrum/Manifest
index 9793aa81d987..5a96691f3448 100644
--- a/net-misc/electrum/Manifest
+++ b/net-misc/electrum/Manifest
@@ -1,13 +1,9 @@
 AUX 3.1.2-no-user-root.patch 847 BLAKE2B 7c682268f4f76884b364fad9dfef63931ffb694c529b3fb17d6c579bf908872b4bfcca6edbe1aa30b93475aa4891283c196cd803579654988d1a1a73d42f1afa SHA512 e4d94693f4a01577b9c4e1e1ce8ef71e9d2ae74edb4c1cad11c6c5615ed50df3ed5f785ff69ff869f534cb4887e21c1cc263fa94972bebc31b5421e0b7be4173
-AUX 3.1.2-pip-optional-pkgs.patch 458 BLAKE2B 25f2ef7a37cb7e05fb0d4e9f70b6e4656d1423d940a1dcc8b6700d2fc67c221250a55f14fc5df99e2d6dede27c47223755e19e48ed776eb34432c8fd173a28a4 SHA512 ffe18ebfb67f6de8456e38228cbf864afce94a686ebc11ef866f4d9f0c324b3d96b8f3a315c13bd0efba0c62f6ee2af6f093005115be3cfb4d8a284d3a236b3f
-AUX 3.1.3-desktop.patch 683 BLAKE2B 15babc615c74152d5005ddc8dc644557fcaf176825fed335fa84168e66c16e2d3d946bd1be75bb15c78a06fc9efcb23a1797c6cfc74c821c2fe83044153fc6b2 SHA512 c05abf3d387143543ffec3342bdc6c820a56d82064f596c5e619286056f105c048db1947d13706d9aec45454f9133109bf3ec3de3ebf4aa4ace523f441a44b90
 AUX 3.2.3-pip-optional-pkgs.patch 348 BLAKE2B e49855ff70c50b73c67190ef085454cc23ec7d3e0a8dd419b5837ebb85b56b280518c4b8f260288bed7286578ceb9b4683b30db617c99d965bba653c6fa0ed54 SHA512 24dad9328e867e1d65150a35391aef0df8af1f4859516b24b5c725ff57c2c6e7d1e8ca6e78efbca60a53a1bd2b98744ed8c2cec0e4396b9e2664ea125675e6dd
 AUX 3.3.2-desktop.patch 685 BLAKE2B b946f95ad017048e957e8567b7ce52ed085bb15daa155509ab08c447eb32d3d984696d636dbe46456a09dfb3ca93b1619bb6a4d90654ee46f43c662661debafe SHA512 a7c826e736f1661821d846ff8443dedeaa49a82f7e7a1a8f23924dbc1c9c12d71f5d8056e592ff8c6d44fc8bf4483f09e3b8d1e262b3ef408991f01ca1a283ff
-DIST Electrum-3.1.3.tar.gz 2806178 BLAKE2B e03a6ee8d7b211b26d99adfbaf42a9d43317e5a4ca887f62f5ef0e57d8f990c18ff07e15d4ac8faea33322cd7ae25d7544e59e9ff1fbe883b3b7be138d990421 SHA512 745d00ec944e46040a4ae21d23c5919b943696a85baf84ee553616ca73cd21f2fa95999212a23f9a96ad5606def2890ee057e5f5f18e82591fd4a9e497ba5439
 DIST Electrum-3.3.4.tar.gz 8606286 BLAKE2B a815a577509cc7d31f02347b5ce52d0fe9fd52ddbe4b60200a02423f8e6bf43a6c24d3c1db6ab265a69f6f3891db63886fe6c138d601bc48c0c8fdb66191e941 SHA512 297eb757dccb166d40a652be2c1c058e42f16416b586b69f32223966ff1e92a34e5d01822d71bd063bfa72b7bbbcae4251a63f7373600d0eeb139e923d17a2b3
 DIST Electrum-3.3.6.tar.gz 8789792 BLAKE2B dcac9a317364780a7dc3ae1083e6ba7fd3a4559d0b7f6375197bdf639143ab9da2c5a001605af5a0590fb900de2e98999aea171c6dcec390a47beb610af3b490 SHA512 b25fc67883b7a90bf902f62d07574f283c4c04b3c6dfbb4e890448ddb938d477e036470f82b45e426aa581a1da2425e13e6974a730b18b130fd265b8d01d0d91
 DIST Electrum-3.3.8.tar.gz 8911228 BLAKE2B af24f44f5805a5722d0b9500776ae1ea4f70e0869045535ea3bf27d24a61013ba718230e6292061581f55a4fae655cbacae9024a321efe655eb9816bae11ae75 SHA512 5f756da4d2df59c69997925c69f651011def07bfbdbc582f492ecc19386eee7d79b9951732a792e6041da902d776052d6590cbd2d7004bc93c8406bcf9093fe6
-EBUILD electrum-3.1.3-r1.ebuild 4320 BLAKE2B 84d8e4688ac9d9cd5a79aa46f8ba7e52e710dc4e7aa5c6148d01de506e460ca84f6fb9ba6344afc8c276fe60c2c6f5cb143fb61a0908067a15c976ea875bae25 SHA512 778f32e95f0de35aa98b1c82a77264c3fc623c6f03d3c0494ae0da880dd533ad9e9660a5b448326de95c89920996b4b209e920416e11e6958d117fcb66dd0614
 EBUILD electrum-3.3.4.ebuild 4638 BLAKE2B 6c7e2c95d7be76e496d49aea1e2b6ac691c2b72336f155cda5643824ccdb51ee27f7c5c8a15d90fc1d464de0e8e504ffe0efbe1c3c652101efc611bf3fa520ab SHA512 60c252dbb9ac4c8f2f31713c1c4ff7086c6c62193fc59f000ab4a0e7b7ea7523b30587bf78318d80e950d28fd07574f414211e0b126cf0ecb8fc97aaab8d4ee3
 EBUILD electrum-3.3.6-r2.ebuild 4483 BLAKE2B e091135eb705c26e15822a0368d8523464ca973e4822c531c1ac7c1f023b97c365808a685610239add5b6365c4e8ea13664e2451c6f23a4e85be8128bfd9dc5d SHA512 1a2ef4689c4e786e20a56f288778ea6eef9557cdbc4955ca029782cfa67951b0eef8bc1cf9528b60cf23c5a1a9cd802c36f19ed001545deb93a05d1f5624b77d
 EBUILD electrum-3.3.6-r3.ebuild 1985 BLAKE2B 0c7ce770601e51f7acd6486ace1b16391db55837f37bec1efccc5ce9790afa5ef5cf6a4262c3b0775cd5dda6de9f335d44c8e16e27109dff74a59416219955e1 SHA512 e01f79da37cf2050992a21e4ed5c215c2d2bd7cc4074f50e70293fe6c174f0c34816ac2758d7bf2b3554d6fb5c76d779b2cf8b359320d8a1439565455a8ff14c
diff --git a/net-misc/electrum/electrum-3.1.3-r1.ebuild b/net-misc/electrum/electrum-3.1.3-r1.ebuild
deleted file mode 100644
index 25eee433cc44..000000000000
--- a/net-misc/electrum/electrum-3.1.3-r1.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_{5,6} )
-PYTHON_REQ_USE="ncurses?"
-
-inherit desktop distutils-r1 gnome2-utils xdg-utils
-
-MY_P="Electrum-${PV}"
-DESCRIPTION="User friendly Bitcoin client"
-HOMEPAGE="https://electrum.org/"
-SRC_URI="https://download.electrum.org/${PV}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-MY_LANGS="ar_SA bg_BG cs_CZ da_DK de_DE el_GR eo_UY es_ES fa_IR fr_FR hu_HU hy_AM id_ID it_IT ja_JP ko_KR ky_KG lv_LV nb_NO nl_NL pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK sl_SI ta_IN th_TH tr_TR uk_UA vi_VN zh_CN zh_TW"
-
-my_langs_to_l10n() {
-	# Map all except pt_* and zh_* to their generic codes
-	case $1 in
-		pt_*|zh_*) echo ${1/_/-} ;;
-		*) echo ${1%%_*} ;;
-	esac
-}
-
-IUSE="audio_modem cli cosign digitalbitbox email greenaddress_it ncurses qrcode +qt5 sync trustedcoin_com vkb"
-
-for lang in ${MY_LANGS}; do
-	IUSE+=" l10n_$(my_langs_to_l10n ${lang})"
-done
-unset lang
-
-REQUIRED_USE="
-	|| ( cli ncurses qt5 )
-	audio_modem? ( qt5 )
-	cosign? ( qt5 )
-	digitalbitbox? ( qt5 )
-	email? ( qt5 )
-	greenaddress_it? ( qt5 )
-	qrcode? ( qt5 )
-	sync? ( qt5 )
-	trustedcoin_com? ( qt5 )
-	vkb? ( qt5 )
-"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/dnspython[${PYTHON_USEDEP}]
-	dev-python/ecdsa[${PYTHON_USEDEP}]
-	dev-python/jsonrpclib[${PYTHON_USEDEP}]
-	dev-python/pbkdf2[${PYTHON_USEDEP}]
-	dev-python/pyaes[${PYTHON_USEDEP}]
-	dev-python/PySocks[${PYTHON_USEDEP}]
-	dev-python/qrcode[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/tlslite[${PYTHON_USEDEP}]
-	dev-python/protobuf-python[${PYTHON_USEDEP}]
-	qrcode? ( media-gfx/zbar[v4l] )
-	qt5? (
-		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-	)
-	ncurses? ( dev-lang/python )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS="RELEASE-NOTES"
-
-src_prepare() {
-	eapply "${FILESDIR}/3.1.2-no-user-root.patch"
-	eapply "${FILESDIR}/3.1.2-pip-optional-pkgs.patch"
-	eapply "${FILESDIR}/3.1.3-desktop.patch"
-
-	# Prevent icon from being installed in the wrong location
-	sed -i '/icons/d' setup.py || die
-
-	# Remove unrequested localization files:
-	local lang
-	for lang in ${MY_LANGS}; do
-		use l10n_$(my_langs_to_l10n ${lang}) && continue
-		rm -r "lib/locale/${lang}" || die
-	done
-
-	local wordlist=
-	for wordlist in  \
-		$(usex l10n_ja    '' japanese) \
-		$(usex l10n_pt-BR '' $(usex l10n_pt-PT '' portuguese)) \
-		$(usex l10n_es    '' spanish) \
-		$(usex l10n_zh-CN '' chinese_simplified) \
-	; do
-		rm -f "lib/wordlist/${wordlist}.txt" || die
-		sed -i "/${wordlist}\\.txt/d" lib/mnemonic.py || die
-	done
-
-	# Remove unrequested GUI implementations:
-	local gui setup_py_gui
-	for gui in  \
-		$(usex cli      '' stdio)  \
-		kivy \
-		$(usex qt5      '' qt   )  \
-		$(usex ncurses  '' text )  \
-	; do
-		rm gui/"${gui}"* -r || die
-	done
-
-	# And install requested ones...
-	for gui in  \
-		$(usex qt5      qt   '')  \
-	; do
-		setup_py_gui="${setup_py_gui}'electrum_gui.${gui}',"
-	done
-
-	sed -i "s/'electrum_gui\\.qt',/${setup_py_gui}/" setup.py || die
-
-	local bestgui
-	if use qt5; then
-		bestgui=qt
-	elif use ncurses; then
-		bestgui=text
-	else
-		bestgui=stdio
-	fi
-	sed -i 's/^\([[:space:]]*\)\(config_options\['\''cwd'\''\] = .*\)$/\1\2\n\1config_options.setdefault("gui", "'"${bestgui}"'")\n/' electrum || die
-
-	local plugin
-	# trezor requires python trezorlib module
-	# keepkey requires trezor
-	for plugin in  \
-		$(usex audio_modem     '' audio_modem          ) \
-		$(usex cosign          '' cosigner_pool        ) \
-		$(usex digitalbitbox   '' digitalbitbox        ) \
-		$(usex email           '' email_requests       ) \
-		$(usex greenaddress_it '' greenaddress_instant ) \
-		hw_wallet \
-		ledger \
-		keepkey \
-		$(usex sync            '' labels               ) \
-		trezor  \
-		$(usex trustedcoin_com '' trustedcoin          ) \
-		$(usex vkb             '' virtualkeyboard      ) \
-	; do
-		rm -r plugins/"${plugin}"* || die
-		sed -i "/${plugin}/d" setup.py || die
-	done
-
-	eapply_user
-
-	xdg_environment_reset
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	doicon -s 128 icons/${PN}.png
-	distutils-r1_src_install
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/net-misc/electrum/files/3.1.2-pip-optional-pkgs.patch b/net-misc/electrum/files/3.1.2-pip-optional-pkgs.patch
deleted file mode 100644
index f5e0015a7dff..000000000000
--- a/net-misc/electrum/files/3.1.2-pip-optional-pkgs.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Naur Electrum-3.1.2.orig/setup.py Electrum-3.1.2/setup.py
---- Electrum-3.1.2.orig/setup.py	2018-03-31 15:08:48.919694817 -0400
-+++ Electrum-3.1.2/setup.py	2018-03-31 15:09:28.738594744 -0400
-@@ -37,9 +37,6 @@
-     name="Electrum",
-     version=version.ELECTRUM_VERSION,
-     install_requires=requirements,
--    extras_require={
--        'full': requirements_hw + ['pycryptodomex'],
--    },
-     packages=[
-         'electrum',
-         'electrum_gui',
diff --git a/net-misc/electrum/files/3.1.3-desktop.patch b/net-misc/electrum/files/3.1.3-desktop.patch
deleted file mode 100644
index beb4d598e45d..000000000000
--- a/net-misc/electrum/files/3.1.3-desktop.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Naur Electrum-3.1.3.orig/electrum.desktop Electrum-3.1.3/electrum.desktop
---- Electrum-3.1.3.orig/electrum.desktop	2018-04-16 12:17:11.000000000 -0400
-+++ Electrum-3.1.3/electrum.desktop	2018-05-19 03:56:35.437735879 -0400
-@@ -3,7 +3,7 @@
- 
- [Desktop Entry]
- Comment=Lightweight Bitcoin Client
--Exec=sh -c "PATH=\"\\$HOME/.local/bin:\\$PATH\" electrum %u"
-+Exec=electrum %u
- GenericName[en_US]=Bitcoin Wallet
- GenericName=Bitcoin Wallet
- Icon=electrum
-@@ -14,8 +14,4 @@
- Terminal=false
- Type=Application
- MimeType=x-scheme-handler/bitcoin;
--Actions=Testnet;
- 
--[Desktop Action Testnet]
--Exec=sh -c "PATH=\"\\$HOME/.local/bin:\\$PATH\" electrum --testnet %u"
--Name=Testnet mode
diff --git a/net-misc/endlessh/files/endlessh.initd-r1 b/net-misc/endlessh/files/endlessh.initd-r1
index ea8d830af439..ea8d830af439 100755..100644
--- a/net-misc/endlessh/files/endlessh.initd-r1
+++ b/net-misc/endlessh/files/endlessh.initd-r1
diff --git a/net-misc/geoipupdate/Manifest b/net-misc/geoipupdate/Manifest
index a7e96a6aa3b5..c68bc17e70a0 100644
--- a/net-misc/geoipupdate/Manifest
+++ b/net-misc/geoipupdate/Manifest
@@ -6,5 +6,5 @@ DIST geoipupdate-vendor-4.0.3.tar 532480 BLAKE2B c619098fa40d6a92743a2847900e7ce
 EBUILD geoipupdate-2.3.1.ebuild 573 BLAKE2B 1a4e9421d90bed8da5b4ddb282b53a9bb2cd9d7123007a8c7a207ed807480abf95ec3c2e7cea6a987d399fd73c7148778f6b28b9c66ea0f48f2c1cb4d9ae4435 SHA512 add023538fe12026667cf0feba8c1ebf1157609ba2ac9622466920d2ed7c128bec10ba7ac1a12acb358067e0ec757996ad0eec63c91c7b4a7c9d75984b06bcff
 EBUILD geoipupdate-3.1.0.ebuild 582 BLAKE2B 106db9ba7a0f95104f0728fd820da17c03ed7c1fa79481d3fe09e666594b707b64ec4522b5095c1f19b0afecc0cfa9f5dd6e60829d12cb0887910ddc82e66053 SHA512 b6fddee463197592d4bff439b9ba4e407725895544af9875c9157fad695cc700ce2d3ab293da271fa6d3826b458a1a20c477c1df51daef6367d59798b4ad1392
 EBUILD geoipupdate-3.1.1.ebuild 582 BLAKE2B 106db9ba7a0f95104f0728fd820da17c03ed7c1fa79481d3fe09e666594b707b64ec4522b5095c1f19b0afecc0cfa9f5dd6e60829d12cb0887910ddc82e66053 SHA512 b6fddee463197592d4bff439b9ba4e407725895544af9875c9157fad695cc700ce2d3ab293da271fa6d3826b458a1a20c477c1df51daef6367d59798b4ad1392
-EBUILD geoipupdate-4.0.3.ebuild 1180 BLAKE2B 745d8e001574a0cdc506bf1be797dbfc9a2355b58d3edd47a2c6e986bf4e6fb068e929374db65941250a2c852e4838d5a298c277d474ce410853ca3a4a48778d SHA512 a62e3169aae94068c87d7f776a4b7a60862de2c8f3d2a9ae909b5259d12d0abc3d6a0aeee933ff479990bb02ceec19e05a6e1152d663a63b2517bb8c0ccd7421
+EBUILD geoipupdate-4.0.3-r1.ebuild 1268 BLAKE2B 39d26909a70acfdddbeb9f823e4babac6af48077af154f15f1228d7d50a40fe73b2c4de5842ce8d6b87ea6d39a25d998e553ec0cbf42904a9efa45302d9f7eee SHA512 194465588a84cd045cb0694c5dfbfd1e9e14cd07d49d3a77d68ec6e0df4a872766d8a5bcb2a9094f72853cfe3e28a350969cbd4bec99bce35edaa2786cb4d52d
 MISC metadata.xml 364 BLAKE2B f11ecee4030939844eddfd97da927e39bc333cd90a489176fdd1ae86fdce4da2793a984f6bbb7a2947585c7cba2f4f94789c342e37cca9c95c69777d6f6ad8e5 SHA512 0969b8629e162f85c16b9dd67dd0e5d1a980197e627cc47056a7e1bdece5d5e9816e0a00bace7cfb9b683e5ccfccc898791a2dfb9f274f46cc594708074a82cc
diff --git a/net-misc/geoipupdate/geoipupdate-4.0.3.ebuild b/net-misc/geoipupdate/geoipupdate-4.0.3-r1.ebuild
index 9e2b124631e5..f8f05abf74d5 100644
--- a/net-misc/geoipupdate/geoipupdate-4.0.3.ebuild
+++ b/net-misc/geoipupdate/geoipupdate-4.0.3-r1.ebuild
@@ -32,6 +32,9 @@ src_compile() {
 	# the horror, the horror ... but it's all automagic
 	export GO111MODULE=on
 	export GOFLAGS=-mod=vendor
+	export CONFFILE=/etc/GeoIP.conf
+	export DATADIR=/usr/share/GeoIP
+	export VERSION=${PV}
 	default
 }
 
diff --git a/net-misc/gnome-online-miners/Manifest b/net-misc/gnome-online-miners/Manifest
index 4a6592bf5442..65666ec4b83e 100644
--- a/net-misc/gnome-online-miners/Manifest
+++ b/net-misc/gnome-online-miners/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-online-miners-3.30.0.tar.xz 273700 BLAKE2B 146777d6fcdbb2e17ca360e515de6f373bf74063240c579a1e39c0083aad9b0d908754c78046713b027b1b062cf279e0dbe58d211d0341a0179b1d179aa77a2b SHA512 de1d9281978b985d777c1b4900128c6a3b83ef9d0c905b4441f9683a6a03de992ce921e8094d43b903e8547436db51aced91d93bd0cf74f7a385a1d5a5e8b726
-EBUILD gnome-online-miners-3.30.0.ebuild 890 BLAKE2B 332268c34efc89e625d3585979720050ff6a7f6e315dd862f57a15947bf3cae11341f6f43197b7a5bbe315874d31f793b63b2531e7cfec94b4de0fedf4a10dbc SHA512 ab77d6dbaeba6a2e9405d22f339da291710ad9bddf46b7b9f224c00ee66a16b5d8c38179d2b968b48e4f6f1e96182a84c472a4e23c27003e4df37283e98b664b
+EBUILD gnome-online-miners-3.30.0.ebuild 897 BLAKE2B 0d9cf3a45e2401db5562ef0a6ded32827b94a2dae4e536f66404f8c3b8424ca2bfa5e5ae2ab94ac1a5fc3e92faa9ef7abdd0112eccce2564d1c8b8d2a4b03565 SHA512 ed9665197a123f060c7647772f099f64aa997711abe82e86a8e018fbcbc87895df2f6ec6349d8317fda112fd9b96b5a7ab8c5c083390cedc37bcf6800ac793c5
 MISC metadata.xml 312 BLAKE2B 4529eb2ea76ee2c88700e8d551c726424ce4338361eb87c39599d1ee263914d9861cc8f93e1d8e667bdba186c40afbf1376bd9b530edbdab32ec4f961a60f00b SHA512 483189736c04729c1497b3bd6321a1d86241835c22df7c06658fda2af4f06d56f614499bcb8ab7eac76a3619fbaac81cfb430aedf3d4f78592ef3c8fd73746dd
diff --git a/net-misc/gnome-online-miners/gnome-online-miners-3.30.0.ebuild b/net-misc/gnome-online-miners/gnome-online-miners-3.30.0.ebuild
index ffbf58bb9240..9b40c6e51a53 100644
--- a/net-misc/gnome-online-miners/gnome-online-miners-3.30.0.ebuild
+++ b/net-misc/gnome-online-miners/gnome-online-miners-3.30.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GnomeOnlineMiners"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="flickr"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 # libgdata[gnome] needed for goa support
 RDEPEND="
diff --git a/net-misc/gnome-remote-desktop/Manifest b/net-misc/gnome-remote-desktop/Manifest
new file mode 100644
index 000000000000..2df4bf3de141
--- /dev/null
+++ b/net-misc/gnome-remote-desktop/Manifest
@@ -0,0 +1,3 @@
+DIST gnome-remote-desktop-0.1.7.tar.xz 25636 BLAKE2B 00e389bc8887c3d43f9221a45c6c7154e4140fab560c5c568fe92f06794b736efcf2265c763d0d9d57d5343dd2f71b7a3a2c45b0466cdae608f0a609af53175d SHA512 dd20e5e6fd724ff03d8a32319c7145f1fef4331439e52921b812f087e6b83185bf318bb2fb9758fe083ec3cfea30448b601da4ed1aba85fa892ef7fbb794b9ed
+EBUILD gnome-remote-desktop-0.1.7.ebuild 957 BLAKE2B ec9d93ae7954028f8a9ae96ea530418845e4a8ad8b9c8357bd70ae47ce092d18cb35ee7af6dcf3ac45bf90e3c70540b8780fd2219e71257baa59650ef1c8bf57 SHA512 04bd0aab7298411081b13fe1ee96cc3b27543472776cacee50a65d94e90acbbbe5198478ad023062a6733f2fc00437dec1bc17c3512fdcfd3559ce8a8df3f27c
+MISC metadata.xml 374 BLAKE2B c0f9acff6a466db222a95c747860814b3c67c438b4c4f85f1fc7f30539b1174422edc25dc0a7eb18886cb96c8cf4b568a710193e657e3d1d1a0e874120d7f1fd SHA512 0946f2a5c4c088c068e88e498beca837cd3a2923311b746c2c0ce22fe8dcfa07893ca027b720901b00a90d3e386a308fe0b438e7c64ea28b506109b9eef5c2e0
diff --git a/net-misc/gnome-remote-desktop/gnome-remote-desktop-0.1.7.ebuild b/net-misc/gnome-remote-desktop/gnome-remote-desktop-0.1.7.ebuild
new file mode 100644
index 000000000000..5bd5fbadeeeb
--- /dev/null
+++ b/net-misc/gnome-remote-desktop/gnome-remote-desktop-0.1.7.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome2-utils meson systemd xdg
+
+DESCRIPTION="Remote desktop daemon for GNOME using pipewire"
+HOMEPAGE="https://gitlab.gnome.org/jadahl/gnome-remote-desktop"
+SRC_URI="https://gitlab.gnome.org/jadahl/gnome-remote-desktop/uploads/ed3e8b8ebc1a74b6f4ed7260a2739f40/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE=""
+
+DEPEND="
+	dev-libs/glib:2
+	>=media-video/pipewire-0.2.5:0/0.2
+	sys-apps/systemd
+	net-libs/libvncserver
+	app-crypt/libsecret
+	x11-libs/libnotify
+"
+RDEPEND="${DEPEND}
+	x11-wm/mutter[screencast]
+"
+BDEPEND="
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local emesonargs=(
+		-Dsystemd_user_unit_dir="$(systemd_get_userunitdir)"
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/net-misc/gnome-remote-desktop/metadata.xml b/net-misc/gnome-remote-desktop/metadata.xml
new file mode 100644
index 000000000000..e291cfc64914
--- /dev/null
+++ b/net-misc/gnome-remote-desktop/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+	<longdescription>GNOME Remote Desktop implements remote desktop functionality for
+the GNOME platform.</longdescription>
+</pkgmetadata>
diff --git a/net-misc/iputils/Manifest b/net-misc/iputils/Manifest
index 279db04ffcc4..64317d59a195 100644
--- a/net-misc/iputils/Manifest
+++ b/net-misc/iputils/Manifest
@@ -11,7 +11,7 @@ DIST iputils-manpages-20180629.tar.xz 29804 BLAKE2B 15983cc97bc6b6853c193f046687
 DIST iputils-manpages-20190515.tar.xz 27556 BLAKE2B adf3eb5c7f3fd71fa24ff48daffd367ba6abc0377bca45ddc439803d177bf668f7dfc7bd3da7a06e89d9ffdd68f2bb0dbb9aa0ac150c98cd1f2b207a68d4fb46 SHA512 4013fe05c592ccc09d6b947ee59d56515bfe49e9a9d5610225d4a2b8c5034a7f1e8dc41c214cf03ce909d36bc5a8438541ad302cddeb1f0b4359a9b9c85ad4b2
 DIST iputils-manpages-20190709.tar.xz 27588 BLAKE2B 9780a96dfde077625a7a499182511066ede63ca364d2de729403354af7cea6b25629da1408ee2081f9da1b21756ee956d04642ea36d05ee02ef7ef05b66c1ad5 SHA512 4de796666426574bd134f4c4ea4d560d8e3eae8bd8ac19b89793fe252a1ef9eebd1833cafb72a2987118f3061eaf00da8a2468e8bced1568611f9391a1203066
 EBUILD iputils-20180629.ebuild 3968 BLAKE2B 34a3f150c222ae7e39771337309a79db140b83f04c6c363a19111c1698ea136e7afcd3c348793e2b51fe0e3d353268cf7bc46a53815568c0bbf8b45ce200b1d9 SHA512 701b6b4fa3fcce5fe59ca72011143bd36744658ed94f15b6cad411115029701efe63798e6e61191d8819daa624a603807509299b9b54e9e46e67dc2c01f1574c
-EBUILD iputils-20190515.ebuild 4916 BLAKE2B c432eba2ed92debe453da5433a91c471cc4efda6ce8540820658421f07fde827a11f9f4efe281c60e9e83741a2823eda1a2bf6354c9d8c3b4be2f75a6e442e66 SHA512 2235ff71f13c2b8be707d2f14f7077adc315b080b6d38dc09d9299f7a398aaf0e7b9f72b7e44a207654619adc9fbf8ac590d2bdcba74c37d3bb1d0273a4e9ac2
+EBUILD iputils-20190515.ebuild 4923 BLAKE2B e7c4bb2ac6393f93e3294559091b4a339a76a2e21e0b787b92cf631b9799486a701ca5e5e5f1b77910a9edecc00b68661f5e789f336fce9c9321ec3656e4faa9 SHA512 48037b05394e88e60ee399d9560f59529e3b195e10b8a5137b11377a6e4240a11aa2409f0e5d74ac753a72fd42c414edff975fff78d77c20de6e46a9c7c116a5
 EBUILD iputils-20190709.ebuild 4846 BLAKE2B ccd0487139bcc3dc40c2922191e10053fd5248f0bb3419ab7c40b21f3599467754ade3d844803087b7a9b477c5d1c1823d13ae14f7285c3a2814cfed21b6d8a0 SHA512 6e11a646108a6fb73a124ad00d569db2fbb3c6193264a9677ced0a8405bb815fbf442bb13d08a53580ec258857c494d39a50144faa967f4d923fc0b55a7fd3ff
 EBUILD iputils-99999999.ebuild 4853 BLAKE2B acda2cfa73d94e1f5c2e34f716ce27911a26df3acef3138f462af53e2ad230f02ec39b6186b64f5bada03bdb40efa494f6a33eb09350b2dc638375263406ce72 SHA512 a218a45c72883e6fe3165f9b7ac2438b06582d6470ef116c67d9e4e6a2cafe276ca4f05f58938a22e5f5267373fd6670c5456b28a9d6c4f4ff5fd83e2b346cea
 MISC metadata.xml 1625 BLAKE2B c29d113e691929f035c7dffbe52e043c1552941565a51021efe401a299aebb5d818ff33a1c99ae086bdc5ecd5a1063db5180b8bd1107dc103e45a8c9450913d2 SHA512 86d64befb808172b14c5e5c53fdc901d51f380045dcc5f42cf770ec03c1722a78677824c2a4823357bdce438edc92cf3d3340436968935c615fa49c4173cc17e
diff --git a/net-misc/iputils/iputils-20190515.ebuild b/net-misc/iputils/iputils-20190515.ebuild
index fab32c416ff0..4e88cd742043 100644
--- a/net-misc/iputils/iputils-20190515.ebuild
+++ b/net-misc/iputils/iputils-20190515.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == "99999999" ]] ; then
 else
 	SRC_URI="https://github.com/iputils/iputils/archive/s${PV}.tar.gz -> ${P}.tar.gz
 		https://dev.gentoo.org/~whissi/dist/iputils/${PN}-manpages-${PV}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="Network monitoring tools including ping and ping6"
diff --git a/net-misc/knemo/Manifest b/net-misc/knemo/Manifest
index c5123b2e5bd3..8056a2f1ecfb 100644
--- a/net-misc/knemo/Manifest
+++ b/net-misc/knemo/Manifest
@@ -1,3 +1,3 @@
 DIST knemo-0.8.0_pre20161211.tar.xz 408160 BLAKE2B 17653ff28e97596871d823180aa4cf108dea9e782ff1f1ed47290420ebabfa8ec22a9d4ef70194126679ed91e4267185b470b04e09088dcd013f416d166c6669 SHA512 5d035e8a48c528ddec9fa0e288cf65df2810516a9d545b1ca4e56b1e2e4369fe82baab355a4950791a515395275931f04db743f82d4e570ea012dab83e6ae22c
-EBUILD knemo-0.8.0_pre20161211.ebuild 1348 BLAKE2B e20f87367d97473378525d94531253150941b5204682552019632d64171eb94ce2449a6c8629a51657261846ff9a5564f5d08d0b052bb7df91610e533ba2cd6f SHA512 715ee9032436d854577eaa6aa7483c6910290b697254003adbae8ed74fe535da4a5172820e84242ad690aac6ac39ff957238ff1df8ac33b8f713517fc45039d9
+EBUILD knemo-0.8.0_pre20161211.ebuild 1442 BLAKE2B 41e001277f96060baabec3723946447d561d053e8c6a2a78e54a63eb51596d4dc052132c767d93042266024e30da0bacadb06dcb3609007373fccaa854253156 SHA512 df8ead32758fb06d90095f9f6bd0fa713c40a13290e51986b885edb614e600b9ec4c9cc12c8326d1375f34d3df2a0cd870f72b98bb26b64e8c9d729e860b9b8c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-misc/knemo/knemo-0.8.0_pre20161211.ebuild b/net-misc/knemo/knemo-0.8.0_pre20161211.ebuild
index 81f12a35fb5b..e7d9995f840f 100644
--- a/net-misc/knemo/knemo-0.8.0_pre20161211.ebuild
+++ b/net-misc/knemo/knemo-0.8.0_pre20161211.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 EGIT_BRANCH="frameworks"
 inherit kde5
@@ -46,7 +46,12 @@ RDEPEND="${DEPEND}
 	!net-misc/knemo:4
 "
 
-DOCS=( AUTHORS ChangeLog README )
+src_prepare() {
+	kde5_src_prepare
+
+	# unused dependency
+	sed -e "/KCMUtils/d" -i CMakeLists.txt -i src/kcm/CMakeLists.txt || die
+}
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/net-misc/libteam/Manifest b/net-misc/libteam/Manifest
index b20a934f2258..414e84d17ee3 100644
--- a/net-misc/libteam/Manifest
+++ b/net-misc/libteam/Manifest
@@ -1,3 +1,6 @@
 DIST libteam-1.22.tar.gz 544302 BLAKE2B 8c20471506546de6f45989513ed22fe79f694febacbf1a0caeda872e6e8b815f9813cff682eb11060c3bb1b2ef12149f34d15c201a6b50fe438bf9776abda987 SHA512 7f54b7e87c1d3a5150e598052126e1c2f5396096450a68a923c9cfb7bcc48b724cddc61f55e34d1b5df103f5473367eb268877100f10c58d53fc3eaf24749d5b
+DIST libteam-1.29.tar.gz 175970 BLAKE2B 8fa4192fc90b3a7ebe7ba9330191ad81e9c27dbec8e6cb657cf287cc66e4d3cc072ff032ea48311368401d7ba89b31015a9ca0c285a262336d6babfcb6457833 SHA512 adcf3706abd7fd2641388606dc2f39584607ec1f455bc52409c3905961cea446baecc5af80b6605ebb7167aef6f539b99f641cb39d97d396f32cea2aeb676561
 EBUILD libteam-1.22.ebuild 1280 BLAKE2B dcf5b6dac0742ce5f77534a2f0fc4f135efdc759616491fb82532d00c260f6beeb6476a27e4e15d91e73393b71a800e9f958d76d104494d70dde17d565ba5703 SHA512 5cce151ef7ddcbdc97f85963e633147bfac5cfe1f37cc580fb329a11b5d1179ca76833eadbc29ce9b70ae5b7ac97af0065a0e3e23056b91c90f570e171c9efe6
+EBUILD libteam-1.29.ebuild 1373 BLAKE2B 4b4ef0e895ef437b1a4ec01e6bff9964f9f3ec96d98345cd9b5b2a9c9f389c793d2005c2932be7fce0414f9cc0418a03cbb1b4660d3e37834496a2e26fb664f5 SHA512 060d16f4e5120b6325aee0eafda90d5b48d2af6bb3d1ec9887f570e4b748eea1d074750646fe6785850466318df0bffcfc9df83a9ac7395128606c1dac2d2da9
+EBUILD libteam-9999.ebuild 1358 BLAKE2B 82baa62b2b443b492034359f4fa469d0fc7ed7f6cfa75d45c13281d6ec6be0222c4119a3f6c23024a4f52dbb6bea1b8b8342c4edf545592bb7406d8e23c03714 SHA512 beb5dafa39a3671e3bb91d45f524e4a25c1fe0e0a0c4999701f5fc23dbb7c8c51fcaabc49f4bf172b309d7e23ecbefe084113d73c04eba11e58813de3529e5aa
 MISC metadata.xml 334 BLAKE2B c4d7a143b2617bc5896b42db67b45115231eef0177c1bd6d4878fcce85b1db00085153aff0a51b7e4b877b2bc68aeeb7769f8360042a6e6e21d5c9371bcc2e03 SHA512 0cdfae73365dfd53d676ae7ab8e9a0689f0a117542d5fb99e1c5987ae41388f8f8c54b37829915035f417b7e9ac30b6f2abccf95b8a3202c7a6731530201d2d4
diff --git a/net-misc/libteam/libteam-1.29.ebuild b/net-misc/libteam/libteam-1.29.ebuild
new file mode 100644
index 000000000000..d02ffcdc084e
--- /dev/null
+++ b/net-misc/libteam/libteam-1.29.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools linux-info
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/pirko/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/jpirko/libteam/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Library and tools set for controlling team network device"
+HOMEPAGE="http://libteam.org"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+IUSE="dbus debug examples static-libs +syslog zmq"
+
+DEPEND=">=dev-libs/jansson-2.4
+	dev-libs/libdaemon
+	>=dev-libs/libnl-3.2.19[utils]
+	dbus? ( sys-apps/dbus )
+	zmq? ( >=net-libs/zeromq-3.2.0 )
+	"
+
+RDEPEND="${DEPEND}
+	syslog? ( virtual/logger )"
+
+CONFIG_CHECK="~NET_TEAM ~NET_TEAM_MODE_ROUNDROBIN ~NET_TEAM_MODE_ACTIVEBACKUP ~NET_TEAM_MODE_BROADCAST ~NET_TEAM_MODE_RANDOM ~NET_TEAM_MODE_LOADBALANCE"
+ERROR_NET_TEAM="NET_TEAM is not enabled in this kernel!
+Only >=3.3.0 kernel version support in team mode"
+
+DOCS=( README )
+
+src_prepare(){
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable debug) \
+		$(use_enable syslog logging) \
+		$(use_enable dbus) \
+		$(use_enable zmq)
+}
+
+src_install() {
+	default
+
+	insinto /etc/dbus-1/system.d
+	doins teamd/dbus/teamd.conf
+
+	if use examples; then
+		docinto examples
+		dodoc teamd/example_configs/*
+	fi
+}
diff --git a/net-misc/libteam/libteam-9999.ebuild b/net-misc/libteam/libteam-9999.ebuild
new file mode 100644
index 000000000000..44894e0e9a66
--- /dev/null
+++ b/net-misc/libteam/libteam-9999.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools linux-info
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/pirko/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/jpirko/libteam/archive/v${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Library and tools set for controlling team network device"
+HOMEPAGE="http://libteam.org"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+IUSE="dbus debug examples static-libs +syslog zmq"
+
+DEPEND=">=dev-libs/jansson-2.4
+	dev-libs/libdaemon
+	>=dev-libs/libnl-3.2.19[utils]
+	dbus? ( sys-apps/dbus )
+	zmq? ( >=net-libs/zeromq-3.2.0 )
+	"
+
+RDEPEND="${DEPEND}
+	syslog? ( virtual/logger )"
+
+CONFIG_CHECK="~NET_TEAM ~NET_TEAM_MODE_ROUNDROBIN ~NET_TEAM_MODE_ACTIVEBACKUP ~NET_TEAM_MODE_BROADCAST ~NET_TEAM_MODE_RANDOM ~NET_TEAM_MODE_LOADBALANCE"
+ERROR_NET_TEAM="NET_TEAM is not enabled in this kernel!
+Only >=3.3.0 kernel version support in team mode"
+
+DOCS=( README )
+
+src_prepare(){
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable debug) \
+		$(use_enable syslog logging) \
+		$(use_enable dbus) \
+		$(use_enable zmq)
+}
+
+src_install() {
+	default
+
+	insinto /etc/dbus-1/system.d
+	doins teamd/dbus/teamd.conf
+
+	if use examples; then
+		docinto examples
+		dodoc teamd/example_configs/*
+	fi
+}
diff --git a/net-misc/liveice/Manifest b/net-misc/liveice/Manifest
index 8c25e720553f..0fa6e1972150 100644
--- a/net-misc/liveice/Manifest
+++ b/net-misc/liveice/Manifest
@@ -1,3 +1,3 @@
-DIST liveice.tar.gz 85171 BLAKE2B c804a4f64432cba3181e633b9edb4e67f39c18805290bfae290ae78bcb80d865a3106af8cfab40e214a043609d837bc887d0eb50adbaad3f1d2838dd44e4de58 SHA512 6b6b7ed7f4aa2b27e2b97db407554955e332002c059bbf3fbb5c5fe60c1d6aa5cd594d2698524a9b447fc3a81de96fb46945c2386467f1773ff0ba2b10da78e4
-EBUILD liveice-2000530-r2.ebuild 787 BLAKE2B 6e1c557a66a66847718a013d53b85783497797c8731b59d69c6d6c1f1410d51dc7c81332482ee60e2912731ca86105d48bdb99329cb8c62bde8b7760fe7748e1 SHA512 0a18dfce846156b290059b7a5b3223027220c51c3cd312df2774a52634c9cce70a284487c24e7cf1247a79639b2068160fad410045f4e0b39584fbc7980d2e7b
+DIST liveice-2000530.tar.gz 85171 BLAKE2B c804a4f64432cba3181e633b9edb4e67f39c18805290bfae290ae78bcb80d865a3106af8cfab40e214a043609d837bc887d0eb50adbaad3f1d2838dd44e4de58 SHA512 6b6b7ed7f4aa2b27e2b97db407554955e332002c059bbf3fbb5c5fe60c1d6aa5cd594d2698524a9b447fc3a81de96fb46945c2386467f1773ff0ba2b10da78e4
+EBUILD liveice-2000530-r2.ebuild 782 BLAKE2B 2594334e408ef50ec436935deedb41dfc8c77ed139405fe1ca49dd10360681b54c286299eb948b5bbc609ddc82a230456f8900b9984800d099031e17746bc6d7 SHA512 59b3bc5a8b7b872f798980e8b4ab70b9c728dc694ce589d81df8aa97f0141eb3271751b2304aa9c3ec349bf640e08e00d59560e2d3d70709618a5fc4294a3bd6
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-misc/liveice/liveice-2000530-r2.ebuild b/net-misc/liveice/liveice-2000530-r2.ebuild
index 5efefe357e32..e2581dbcb103 100644
--- a/net-misc/liveice/liveice-2000530-r2.ebuild
+++ b/net-misc/liveice/liveice-2000530-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,7 @@ inherit toolchain-funcs
 
 DESCRIPTION="Live Source Client For IceCast"
 HOMEPAGE="http://star.arm.ac.uk/~spm/software/liveice.html"
-SRC_URI="http://star.arm.ac.uk/~spm/software/liveice.tar.gz"
+SRC_URI="mirror://gentoo/liveice.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
diff --git a/net-misc/ncp/Manifest b/net-misc/ncp/Manifest
index 477f60a421eb..3a2bafce5cf5 100644
--- a/net-misc/ncp/Manifest
+++ b/net-misc/ncp/Manifest
@@ -1,3 +1,3 @@
 DIST ncp-1.2.4.tar.bz2 6172 BLAKE2B f1daea93f56013bff8bcf3fa58155b4cce3451a834bfc7c066d1accc0cdb4c874f09761e2b1eaf70c2034aede41bfb89598659e0d083fc21d75fd7e25e71f038 SHA512 7332cffef56ec8dd8afefbb3f3dda455bc4465a61476cb7a751f9fa0b9cc1c125e22f1d89b9cab36e059f3f686c8dcc847015c4a44c23dd5bca8290b5666bdc8
 EBUILD ncp-1.2.4-r1.ebuild 843 BLAKE2B d42afa30ebcb9b390ff02b964f66353cd00ece303168645ccb4dd2ab85339e66b968b496fa8fd230b38da87c877a2e0f39085a333f7371686cc9ae6a861cbaad SHA512 3cb657dd0c5eba849d352eccb6b880df6660c854e98883b7ba1f9c054d677fcbd1ff812001cbc138893369dc5f5b57a352ad17d0fcd6ae1a9295291665af4186
-MISC metadata.xml 698 BLAKE2B 4e878fa6c8542b522a34bd256345a93060d5b64fc539f59dc5db207680dab597fba92beb7361bd002afca64dd291c2ba1053a435cc2b1ad35bba878a81d00bec SHA512 deb18945b820f2332812f851dd4d1a40dddca5fd04541987746d2c3a9d75a25792ce8fb1931e8c87010a73f820165155172d2aeb2d2d702cc95a3a1b8e34b169
+MISC metadata.xml 706 BLAKE2B 89f943a8462b4e25cdf30ec304a96cc2b9d33385c9f89a0050c901f57676dc05fd84a6003dd858f553cdb52be40868d048eba826aa32c2aadedbebd7b6aee341 SHA512 9601721bdaeb89191afd88187fbc2a1bf0295225c17b89aa6da0599ff5fffdf895d3b74f83f971857d6b208ce180dc36051e100b236d46257f84e8a2c50b6631
diff --git a/net-misc/ncp/metadata.xml b/net-misc/ncp/metadata.xml
index da384e181f0e..cbd3e6302489 100644
--- a/net-misc/ncp/metadata.xml
+++ b/net-misc/ncp/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>bu9zilla@gmail.com</email>
+		<email>m.mairkeimberger@gmail.com</email>
 		<name>Michael Mair-Keimberger</name>
 	</maintainer>
 	<maintainer type="project">
diff --git a/net-misc/netpipe/Manifest b/net-misc/netpipe/Manifest
index a305cd2c3bf0..18db9b28e2db 100644
--- a/net-misc/netpipe/Manifest
+++ b/net-misc/netpipe/Manifest
@@ -1,3 +1,3 @@
-DIST netpipe.tar.gz 30593 BLAKE2B 862f2a104a1d195d1a5244b1ed4183f8cff70807e22de60b13631b7c3653eb628e6c4736c9d8b1e755bf0ab6f31b813f99f1700427ec9e62cd333e7195736014 SHA512 ce21a8bd298db990b7981a5501e70bbf8d6eac9d802d1f01c41d47f02ee9afb6fb095478496590f470318463491ec36da920047d668d2a8abe1e7559f53b1a37
-EBUILD netpipe-1.0.0_beta2-r2.ebuild 639 BLAKE2B 1fb81593ecb72fe2e87da94dcdc528fb9328753f974ca84537f60d9d2b76dc486ad6e680abfacb0a26c6403027199bfa9acf5ac770f415736a6f9b60c20d7687 SHA512 4bdc64185c612498e8f0229d2648126d27431bf3d51ac10df631212303fb790258993af5c5faceed269786a2d597d08d5a65a31146ba8b72fc76df58598bbceb
+DIST netpipe-1.0.0_beta2.tar.gz 30593 BLAKE2B 862f2a104a1d195d1a5244b1ed4183f8cff70807e22de60b13631b7c3653eb628e6c4736c9d8b1e755bf0ab6f31b813f99f1700427ec9e62cd333e7195736014 SHA512 ce21a8bd298db990b7981a5501e70bbf8d6eac9d802d1f01c41d47f02ee9afb6fb095478496590f470318463491ec36da920047d668d2a8abe1e7559f53b1a37
+EBUILD netpipe-1.0.0_beta2-r2.ebuild 651 BLAKE2B 3659cabb524d9f7c0c52250572c69ac33d596bccb6f350a4e116ac45086eeed2a7282bad0fac850f4b4c320572388d3dc8a78f298ce88d3f037bcdcb6620facb SHA512 5a5eca89d93808a13d7447ebf3ea2d988846fe5e6de8cf7b86fa48152e66ede3b29b2a4623e324db81e954b667f0f739288819c12d0defb11565c3d56832cf60
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-misc/netpipe/netpipe-1.0.0_beta2-r2.ebuild b/net-misc/netpipe/netpipe-1.0.0_beta2-r2.ebuild
index 77d037cede44..21048b7642dc 100644
--- a/net-misc/netpipe/netpipe-1.0.0_beta2-r2.ebuild
+++ b/net-misc/netpipe/netpipe-1.0.0_beta2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,7 @@ inherit toolchain-funcs
 
 DESCRIPTION="tool to reliably distribute binary data using UDP broadcasting techniques"
 HOMEPAGE="https://www.wudika.de/~jan/netpipe/"
-SRC_URI="https://www.wudika.de/~jan/${PN}/${PN}.tar.gz"
+SRC_URI="https://www.wudika.de/~jan/${PN}/${PN}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-misc/netsed/Manifest b/net-misc/netsed/Manifest
index d082b725741e..88327d330e41 100644
--- a/net-misc/netsed/Manifest
+++ b/net-misc/netsed/Manifest
@@ -1,4 +1,6 @@
+DIST netsed-0.01b.tgz 6352 BLAKE2B 0aa8ed9f282f32d139e50af1a1c8d1aae118ff6e892475774125b45c229707c40544199ea70708827636a50e43b8f652138b244cb2f3857c854d49018b996fb7 SHA512 edef6ef6e39a17a46a3b4d8019ba2e742b2b5852f804df5e952461a792e3ba7a49fcc33353abf7e532e51586927f28f4b7c6da4f4fbd34a32cdf093f26163dd7
 DIST netsed.tgz 6352 BLAKE2B 0aa8ed9f282f32d139e50af1a1c8d1aae118ff6e892475774125b45c229707c40544199ea70708827636a50e43b8f652138b244cb2f3857c854d49018b996fb7 SHA512 edef6ef6e39a17a46a3b4d8019ba2e742b2b5852f804df5e952461a792e3ba7a49fcc33353abf7e532e51586927f28f4b7c6da4f4fbd34a32cdf093f26163dd7
 DIST netsed_0.01c-2.diff.gz 3140 BLAKE2B 211c7f71a76b74fc47cc32dbd5e9ad05a2c7c67bd95de73b0bdb09249f245ab8b0190ee79b51cf1d2f2bc99cc0b7fdf8d358851fddafb2815adc640260122c77 SHA512 5a729e9800051449f7f52989cb65232e262ac6023f21b8ec688f3ce33ed4be79f9d00993aed7773d83dbe109927a5fc6c64e4775d4958136e5c891b6b82e6b83
+EBUILD netsed-0.01b-r1.ebuild 543 BLAKE2B e3188985cf509cd621ffef839525a1a7d92f54b0dff06eb31c901401a6301d9ed1e70e4d9e2c3949c66d2beecbaafff9e00d5489bda76621e02cbfc3b65a5fb7 SHA512 a8ff862ff7314cf6a3316b9f85f8c0b634e62557a879e91d08b3f1ce0277cd01d24c42ef61a230c194deb064134d1dd5079d6889b558cd7dd1c6da469bc21817
 EBUILD netsed-0.01b.ebuild 662 BLAKE2B c2cb326d7eaeac16c23eed475a6c0169582d5ae537dbcd7e7d1ce3166a3b03186d0c2adff2b643579c8629fbe88a7f5132a6498be1128058e46daf95d31aa1cc SHA512 dfbbfe4d6b5f25c9b05ca1f0bded9650a7eb60db74ab7906732a52e25eb0b4204d2a0cd5abe4dd42b94726bd92512ad383072c3052ccfe61c228395ffe3c8d6c
 MISC metadata.xml 246 BLAKE2B 51e0781372b853df95595d4124ba0f81cb5fab4dfb78745aeeebcc0728617634384d5f9a90f02b50c13330b29651450eb18dd782e1c485bea5bdcb5017fd1d63 SHA512 68010e77c1c73aa0f8b81bd63ec9734de511e7b3fef0edd156df2584f25b6d485656a4d11f200af89e53a1b3ece9d6d15e93a2d1ba63f83adf944841183cdf00
diff --git a/net-misc/netsed/netsed-0.01b-r1.ebuild b/net-misc/netsed/netsed-0.01b-r1.ebuild
new file mode 100644
index 000000000000..d1c95a069071
--- /dev/null
+++ b/net-misc/netsed/netsed-0.01b-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Small tool for altering forwarded network data in real time"
+HOMEPAGE="http://freshmeat.net/projects/netsed"
+SRC_URI="mirror://gentoo/${PN}.tgz -> ${P}.tgz
+	mirror://gentoo/${PN}_0.01c-2.diff.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S=${WORKDIR}
+
+PATCHES=(
+	netsed_0.01c-2.diff
+)
+
+src_compile() {
+	emake CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	dobin netsed
+	doman debian/netsed.1
+	dodoc README
+}
diff --git a/net-misc/ntpsec/Manifest b/net-misc/ntpsec/Manifest
index c6cf6f3c0ace..5b37fff3a8e9 100644
--- a/net-misc/ntpsec/Manifest
+++ b/net-misc/ntpsec/Manifest
@@ -2,9 +2,10 @@ AUX ntp.conf 727 BLAKE2B 1b37cee807c41593ffc44994e390c98406c49154477bc2a603ba403
 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
-DIST ntpsec-1.1.3.tar.gz 2462330 BLAKE2B 903e569ad72939def9df31d7b51b2623b140754de67362213f39e39ad770d903d70c45a10a18e98ae35927792666ae27de40b41a5c0bfe6fd8cfa6a37102d4e8 SHA512 df60c5fa63d4c94529ba1e8b21c7d6b5d0c9fb810ed7546a621b072725a6ff03edbd2dcbc3baf19ac3b3a9b82d7aff3ddee4ab8c93559b7065ed06a211b538c4
+AUX ntpsec-no-bsd.patch 1538 BLAKE2B 6abb7acf23149a5a47f8e479bff090966e7e6161fc0d5bca1f9e5b9396d90898a783e7d309d6cdbdf689ea12314c804aa7a39f05b3f11d75a95eb337cea95b55 SHA512 7ddb346c7f0c9b30ea08ac28eaa39cf86e3d6cee7eaeba3bc7fe0883acd5087966e4e7beb298cee02607dfa3198a8c1dfcd9ce43ead820de3bb7014cefe75302
+DIST ntpsec-1.1.4.tar.gz 2536268 BLAKE2B 320e7afee1b776e0327f8bf34bc0b8cd3a2c67fd9fd16564323ce825cb9e36d7d5fb48a38b734600286cbd039f41f296d9e488e25d2680f08412aa983101987b SHA512 1b74e7cb87e189137e1b66b52ce89498e0061a10abf017c36bfdecb4aefe9c3fb6e8fd7819a9f822fb946dca6ae20ee724b2aed35e03d73f8e3015d8818d02db
 DIST ntpsec-1.1.6.tar.gz 2600632 BLAKE2B 1ee3e266f9a0ff45fc8f001a2b5a1722c6acf75a2151ee3724812acef3409eccbb865b321a3a346c7ced1770aa24190281a94593b881b4bbb0a2b2e6df5629cc SHA512 f57fde6f329a858313968798d64df5e93d7eba43edf4752cd0eb45ff1a2237ce2731b4603ec997c493dea85edb42976f96eb1508beae087a8c2ae8a76c0a6941
-EBUILD ntpsec-1.1.3.ebuild 4068 BLAKE2B a0dc5a6733d392982c0c6a55760974b3ff22b055a220c0841a5e0aa1d1e01291495c115d8751317eaf83e8aad1556cfb48962dec7b5c19d788aee0dc16de51ca SHA512 fc551143326b61f2039e747ccae7d7d82409768d4a447eb51858207aa6c7f3656121e4d7e89a75b94b4b0e5f04bb20cbf19f67a78ea454d4204bbbe25f962f5a
-EBUILD ntpsec-1.1.6.ebuild 4004 BLAKE2B 935bc24d6acd6d181c1049af4cb0e3af9fd8f09e922bc480fe0dc7f48fd32d6b0434f2c1074e4939fce93e2223afc1a924707d6ce55ca0f05858ee3b5af67ff0 SHA512 3ab05594f166700869fd2ad699f91fe24c828d7e9ac7aaf2fd678feb58a8a397032d434f9aaa77330875ef216dd5ff44bb26fa8727bf0789cf24c4d9c558497e
-EBUILD ntpsec-9999.ebuild 4004 BLAKE2B 935bc24d6acd6d181c1049af4cb0e3af9fd8f09e922bc480fe0dc7f48fd32d6b0434f2c1074e4939fce93e2223afc1a924707d6ce55ca0f05858ee3b5af67ff0 SHA512 3ab05594f166700869fd2ad699f91fe24c828d7e9ac7aaf2fd678feb58a8a397032d434f9aaa77330875ef216dd5ff44bb26fa8727bf0789cf24c4d9c558497e
-MISC metadata.xml 2008 BLAKE2B e4f1a7e79fbaf5011ba2b26143c138f39663be73664ec9f1270e9b6cbcb553c245201c9a5bd0771435a24e1f342907861e8a2b6808cc2e3f6d6a7a10ad6ed021 SHA512 5c8fc24233d577ebc254a6d92d93734bfb10ef287217ef61f4f6e8b28f059ee7e92bc5e18326d61a9e80fa7504f79c820d831cdad489321a9f45bae0a4d54a16
+EBUILD ntpsec-1.1.4.ebuild 4191 BLAKE2B f43c33f670711770c6dcca60c87710b56c37c901471563ba35d247e68ad155c2d8e9f56c30a25ea6f38e993d34fd564f6a08ee65877a55ada50fe25adc93c04d SHA512 ac148c1504ba5bd06e5d805000b93a550a7cdf3795acc84121bb9b5fbaed131d1a956d9abb6ffd0996911a973d1c2f8b7f5663d09ef853bad551b01772d5d42f
+EBUILD ntpsec-1.1.6.ebuild 4148 BLAKE2B 576f7c59c43afffb32920db2726aeae99b723c071ffa2cf2a567718896a1c65b8bba6d7aba8df2f9e60e53500ed8e9e1e589bc5b144d2ea40d8dac86a4cb9f66 SHA512 276f3cc96dcc1be5f85477860b139fe8b7e663cda04eeb3dbfa2aeb75124ef9b263fdeec88db1090b8547b65a4e0a83a98944df761754f88c07ce76281330c3e
+EBUILD ntpsec-9999.ebuild 4148 BLAKE2B 576f7c59c43afffb32920db2726aeae99b723c071ffa2cf2a567718896a1c65b8bba6d7aba8df2f9e60e53500ed8e9e1e589bc5b144d2ea40d8dac86a4cb9f66 SHA512 276f3cc96dcc1be5f85477860b139fe8b7e663cda04eeb3dbfa2aeb75124ef9b263fdeec88db1090b8547b65a4e0a83a98944df761754f88c07ce76281330c3e
+MISC metadata.xml 2078 BLAKE2B c15f3c9143653044f1da8fdf1e36298df819a6266ca369c511a9d4247cf32d93377b26f4898070c60d59b4737581b22b27a1097de38c314ec03cc908a18a31d3 SHA512 691f4b463d437616d897d979538e20726eda0a4835f3209639ef0ae7ecbcea6fd01c7bfd1849b91bfdd37e71b8306daa07cf6223a08848c7e45f8128135fa6fc
diff --git a/net-misc/ntpsec/files/ntpsec-no-bsd.patch b/net-misc/ntpsec/files/ntpsec-no-bsd.patch
new file mode 100644
index 000000000000..66dc9d34d2ef
--- /dev/null
+++ b/net-misc/ntpsec/files/ntpsec-no-bsd.patch
@@ -0,0 +1,35 @@
+--- a/wscript   2019-05-25 07:41:24.783651700 -0700
++++ b/wscript   2019-06-22 12:47:02.288170100 -0700
+@@ -305,12 +305,6 @@
+     ctx.check_cc(lib="m", comment="Math library")
+     ctx.check_cc(lib="rt", mandatory=False, comment="realtime library")
+     ctx.check_cc(lib="pthread", mandatory=False, comment="threads library")
+-    ctx.check_cc(lib="execinfo", mandatory=False,
+-                 comment="BSD backtrace library")
+-    ret = ctx.check_cc(lib="bsd", mandatory=False,
+-                       comment="BSD compatibility library")
+-    if ret:
+-        ctx.env.LDFLAGS += ["-lbsd"]
+
+     # -lssp and -lssp_nonshared may be needed by older gcc to
+     # support "-fstack-protector-all"
+@@ -682,19 +676,6 @@
+                        prerequisites=ft[1], use=ft[2],
+                        mandatory=ft[3])
+
+-    # check for BSD versions outside of libc
+-    if not ctx.get_define("HAVE_STRLCAT"):
+-        ret = probe_function(ctx, function='strlcat',
+-                             prerequisites=['bsd/string.h'])
+-        if ret:
+-            ctx.define("HAVE_STRLCAT", 1, comment="Using bsd/strlcat")
+-
+-    if not ctx.get_define("HAVE_STRLCPY"):
+-        ret = probe_function(ctx, function='strlcpy',
+-                             prerequisites=['bsd/string.h'])
+-        if ret:
+-            ctx.define("HAVE_STRLCPY", 1, comment="Using bsd/strlcpy")
+-
+     # Nobody uses the symbol, but this seems like a good sanity check.
+     ctx.check_cc(header_name="stdbool.h", mandatory=True,
+                  comment="Sanity check.")
diff --git a/net-misc/ntpsec/metadata.xml b/net-misc/ntpsec/metadata.xml
index 018f5f40f71b..cba4511bd709 100644
--- a/net-misc/ntpsec/metadata.xml
+++ b/net-misc/ntpsec/metadata.xml
@@ -16,7 +16,8 @@ NTPsec project - a secure, hardened, and improved implementation of Network Time
 		<flag name="early">Drop root privileges early</flag>
 		<flag name="gdb">Enable debugging with gdb</flag>
 		<flag name="heat">Install contrib heat generating scripts</flag>
-		<flag name="nist">Enable lockclock</flag>
+		<flag name="libbsd">Use libbsd instead of internal funcs</flag>
+		<flag name="nist">Set local clock deps</flag>
 		<flag name="ntpviz">Make visualizations of offsets, jiffies, etc.</flag>
 		<flag name="rclock_oncore">Oncore driver</flag>
 		<flag name="rclock_trimble">Trimble driver</flag>
diff --git a/net-misc/ntpsec/ntpsec-1.1.3.ebuild b/net-misc/ntpsec/ntpsec-1.1.4.ebuild
index 320a55e35a49..eb5900a5e1e1 100644
--- a/net-misc/ntpsec/ntpsec-1.1.3.ebuild
+++ b/net-misc/ntpsec/ntpsec-1.1.4.ebuild
@@ -12,12 +12,12 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://gitlab.com/NTPsec/ntpsec.git"
 	BDEPEND=""
-	KEYWORDS="amd64"
+	KEYWORDS=""
 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"
@@ -32,7 +32,7 @@ IUSE_NTPSEC_REFCLOCK=${NTPSEC_REFCLOCK[@]/#/rclock_}
 
 LICENSE="HPND MIT BSD-2 BSD CC-BY-SA-4.0"
 SLOT="0"
-IUSE="${IUSE_NTPSEC_REFCLOCK} debug doc early gdb heat libressl nist ntpviz samba seccomp smear tests" #ionice
+IUSE="${IUSE_NTPSEC_REFCLOCK} debug doc early gdb heat libbsd libressl nist ntpviz samba seccomp smear tests" #ionice
 REQUIRED_USE="${PYTHON_REQUIRED_USE} nist? ( rclock_local )"
 
 # net-misc/pps-tools oncore,pps
@@ -40,6 +40,7 @@ CDEPEND="${PYTHON_DEPS}
 	${BDEPEND}
 	sys-libs/libcap
 	dev-python/psutil[${PYTHON_USEDEP}]
+	libbsd? ( dev-libs/libbsd:0= )
 	libressl? ( dev-libs/libressl:0= )
 	!libressl? ( dev-libs/openssl:0= )
 	seccomp? ( sys-libs/libseccomp )
@@ -51,6 +52,7 @@ RDEPEND="${CDEPEND}
 "
 DEPEND="${CDEPEND}
 	app-text/asciidoc
+	dev-libs/libxslt
 	app-text/docbook-xsl-stylesheets
 	sys-devel/bison
 	rclock_oncore? ( net-misc/pps-tools )
@@ -68,6 +70,9 @@ src_prepare() {
 	default
 	# Remove autostripping of binaries
 	sed -i -e '/Strip binaries/d' wscript
+	if ! use libbsd ; then
+		epatch "${FILESDIR}/${PN}-no-bsd.patch"
+	fi
 	python_copy_sources
 }
 
diff --git a/net-misc/ntpsec/ntpsec-1.1.6.ebuild b/net-misc/ntpsec/ntpsec-1.1.6.ebuild
index d8f848a621db..cbf16e45b9f8 100644
--- a/net-misc/ntpsec/ntpsec-1.1.6.ebuild
+++ b/net-misc/ntpsec/ntpsec-1.1.6.ebuild
@@ -32,15 +32,17 @@ IUSE_NTPSEC_REFCLOCK=${NTPSEC_REFCLOCK[@]/#/rclock_}
 
 LICENSE="HPND MIT BSD-2 BSD CC-BY-SA-4.0"
 SLOT="0"
-IUSE="${IUSE_NTPSEC_REFCLOCK} debug doc early gdb heat nist ntpviz samba seccomp smear tests" #ionice
+IUSE="${IUSE_NTPSEC_REFCLOCK} debug doc early gdb heat libbsd libressl nist ntpviz samba seccomp smear tests" #ionice
 REQUIRED_USE="${PYTHON_REQUIRED_USE} nist? ( rclock_local )"
 
 # net-misc/pps-tools oncore,pps
 CDEPEND="${PYTHON_DEPS}
 	${BDEPEND}
 	sys-libs/libcap
-	dev-libs/openssl:0=
 	dev-python/psutil[${PYTHON_USEDEP}]
+	libbsd? ( dev-libs/libbsd:0= )
+	libressl? ( dev-libs/libressl:0= )
+	!libressl? ( dev-libs/openssl:0= )
 	seccomp? ( sys-libs/libseccomp )
 "
 RDEPEND="${CDEPEND}
@@ -50,6 +52,7 @@ RDEPEND="${CDEPEND}
 "
 DEPEND="${CDEPEND}
 	app-text/asciidoc
+	dev-libs/libxslt
 	app-text/docbook-xsl-stylesheets
 	sys-devel/bison
 	rclock_oncore? ( net-misc/pps-tools )
@@ -67,6 +70,9 @@ src_prepare() {
 	default
 	# Remove autostripping of binaries
 	sed -i -e '/Strip binaries/d' wscript
+	if ! use libbsd ; then
+		epatch "${FILESDIR}/${PN}-no-bsd.patch"
+	fi
 	python_copy_sources
 }
 
@@ -91,7 +97,6 @@ src_configure() {
 		$(use doc	&& echo "--enable-doc")
 		$(use early	&& echo "--enable-early-droproot")
 		$(use gdb	&& echo "--enable-debug-gdb")
-		$(use nist	&& echo "--enable-lockclock")
 		$(use samba	&& echo "--enable-mssntp")
 		$(use seccomp	&& echo "--enable-seccomp")
 		$(use smear	&& echo "--enable-leap-smear")
diff --git a/net-misc/ntpsec/ntpsec-9999.ebuild b/net-misc/ntpsec/ntpsec-9999.ebuild
index d8f848a621db..cbf16e45b9f8 100644
--- a/net-misc/ntpsec/ntpsec-9999.ebuild
+++ b/net-misc/ntpsec/ntpsec-9999.ebuild
@@ -32,15 +32,17 @@ IUSE_NTPSEC_REFCLOCK=${NTPSEC_REFCLOCK[@]/#/rclock_}
 
 LICENSE="HPND MIT BSD-2 BSD CC-BY-SA-4.0"
 SLOT="0"
-IUSE="${IUSE_NTPSEC_REFCLOCK} debug doc early gdb heat nist ntpviz samba seccomp smear tests" #ionice
+IUSE="${IUSE_NTPSEC_REFCLOCK} debug doc early gdb heat libbsd libressl nist ntpviz samba seccomp smear tests" #ionice
 REQUIRED_USE="${PYTHON_REQUIRED_USE} nist? ( rclock_local )"
 
 # net-misc/pps-tools oncore,pps
 CDEPEND="${PYTHON_DEPS}
 	${BDEPEND}
 	sys-libs/libcap
-	dev-libs/openssl:0=
 	dev-python/psutil[${PYTHON_USEDEP}]
+	libbsd? ( dev-libs/libbsd:0= )
+	libressl? ( dev-libs/libressl:0= )
+	!libressl? ( dev-libs/openssl:0= )
 	seccomp? ( sys-libs/libseccomp )
 "
 RDEPEND="${CDEPEND}
@@ -50,6 +52,7 @@ RDEPEND="${CDEPEND}
 "
 DEPEND="${CDEPEND}
 	app-text/asciidoc
+	dev-libs/libxslt
 	app-text/docbook-xsl-stylesheets
 	sys-devel/bison
 	rclock_oncore? ( net-misc/pps-tools )
@@ -67,6 +70,9 @@ src_prepare() {
 	default
 	# Remove autostripping of binaries
 	sed -i -e '/Strip binaries/d' wscript
+	if ! use libbsd ; then
+		epatch "${FILESDIR}/${PN}-no-bsd.patch"
+	fi
 	python_copy_sources
 }
 
@@ -91,7 +97,6 @@ src_configure() {
 		$(use doc	&& echo "--enable-doc")
 		$(use early	&& echo "--enable-early-droproot")
 		$(use gdb	&& echo "--enable-debug-gdb")
-		$(use nist	&& echo "--enable-lockclock")
 		$(use samba	&& echo "--enable-mssntp")
 		$(use seccomp	&& echo "--enable-seccomp")
 		$(use smear	&& echo "--enable-leap-smear")
diff --git a/net-misc/olsrd/Manifest b/net-misc/olsrd/Manifest
index 94726e6365da..b6493ba6bfb0 100644
--- a/net-misc/olsrd/Manifest
+++ b/net-misc/olsrd/Manifest
@@ -3,7 +3,9 @@ AUX olsrd-0.9.0.2-gtk.patch 926 BLAKE2B af444d476ed31190454fc89bd6802a6c41f33625
 AUX olsrd-0.9.6-gpsd.patch 537 BLAKE2B 841d0d92106a620aec47d781cf0a79e669e4aa3e6ba304c023a98c7776fc1df53e6bee5c080deb784106b05273a702d093617c9dc33bfa427a6f3b20c444234e SHA512 d3f89ead360acb8d1c26884ec7559c21dd1b7fbc40eb17d7d3fc2313e17d4f160b507d4b6271ed458d7b74fc7a7f1d9482fcb953d2762734fc963a1fb0e94f88
 DIST olsrd-0.9.6.1.tar.bz2 908871 BLAKE2B 180a30039607fd5c16676c62d0d1045bc5ce2a13675b34ca192f1f19127facb12428f6ba631e45fc42b191693a6ef987271745d769a74062ce682e1796b83dc9 SHA512 06e97c3fef6e2f24885fc96f9e68582523926188e4bbe9283c3add997c20f8cec1e691063d5cf6392e4e56dfa250c2cd8ac00035b47f56dbd2069b12b430255a
 DIST olsrd-0.9.7.tar.gz 15761465 BLAKE2B f272bf9358b4beb1157ff0e2098413de3b81a9598453f76b27c101e370d23280928efbf7399901efd48a319437ac6717ee3496d19a7213eb6d22f50adeb7b319 SHA512 a4abe3e6ddc624725f42c8a80df880a2763d1985d3583cb010d6a01c2866fbeef4e6870cf4e4d1e4403c49bea262a2c967d64040bd36c70ed2f4fc3f4ec988dd
+DIST olsrd-0.9.8.tar.gz 14416300 BLAKE2B 67477d9359686cb163221f5f354f330b38811e9e77bd71379e359bbfba2b55e917009ac537b845420a5bb73284ac83e0b91495e011c810f8169e4edb6bea940f SHA512 cf3066310c4ea644ba1f482e847aa073ad006000308bfa993cecda4ccf4e9919a9005680b3c1d98e34f0c13818213f208e8dc93c8b060eeaaac160fc3df4ce8c
 EBUILD olsrd-0.9.6.1-r1.ebuild 2337 BLAKE2B c7c96b2ce368d1245b5faab05686eb24ef8e3aae650a94939664ed0d50fa0a8c86011b0187c654dea359d6fe0fc40ad0928d89d094fdbed4ed260705a64e1f85 SHA512 bda205c6ada5a043a624e1a82385d4079258128698ae2acfc516bc74ae06ff8ef6ca8f30d1372a9645d1ea939e77b3c5792a408e5dbd2aaa373d128a19b60e73
 EBUILD olsrd-0.9.6.1.ebuild 2237 BLAKE2B bf4718bcc51719389fa7ed9beadf69134336304b719f5a289c615bea47aa5d22305bb79b2e1860edf9a9e358e409fd6bd456d36958f43d633d4517e1a0ab1f6c SHA512 8bb1a1917fe2472222ffb5c8f7dc8303894d813b6708cef05436636e4ca378170e45f635752babae7a47510bfeb8dc1fc3f5bf888062f0ff34317f8a31e6ce68
 EBUILD olsrd-0.9.7.ebuild 2319 BLAKE2B 74c634ed30350f0f5b51c571898c5b66637b3368d62a530651a81d87bc257d6e2793b1b3280ad595f06d8591ad18bdb7f86edc248db97e639174632373338df5 SHA512 4f052ee565b3b99d47838a7707f61a21be38bcaa049c04a6046cb1c2ab9b70c6742268bb765971977f0bce76bfb649156f94a6f33ecc1da8214ecfd81261571a
+EBUILD olsrd-0.9.8.ebuild 2389 BLAKE2B 14afe2ec5484a85a4481a10681d42adeb69e8477b42d8893afff3ccc2391eef2a3a0211d59561c9235f4bfb6bb2047a193da689f4c310128899d4b3f3c7635fd SHA512 920a3a84c4f10b37838bfa3f56097577556475a62d95f3b7f6bb88a5f8a485bb31f20838819474f564281ddbe952d33edbbc045c2c6c2adc938bea67e7882583
 MISC metadata.xml 289 BLAKE2B c88d8f719ab7ee520a042f4a45a60a8e797eeede9823b1d21ec5e12700805666e81e96be90b9d961cdbde662ee813a7f68949cc477c40f17ace6902abfc9627e SHA512 11297ae766f53af46dd2eb5ddc9458cb3b7c4d6edb6f47030373e3e251a282ca7f0ceaa9e99bb2847c15ccba9cbd5ace0313c248a69ad6975c3bc6dbc6056520
diff --git a/net-misc/olsrd/olsrd-0.9.8.ebuild b/net-misc/olsrd/olsrd-0.9.8.ebuild
new file mode 100644
index 000000000000..410f7525a7cc
--- /dev/null
+++ b/net-misc/olsrd/olsrd-0.9.8.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit multilib toolchain-funcs
+
+DESCRIPTION="An implementation of the Optimized Link State Routing protocol"
+HOMEPAGE="http://www.olsr.org/"
+SRC_URI="https://github.com/OLSR/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD LGPL-2.1"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk pud"
+DEPEND="
+	gtk? (
+		dev-libs/glib:2
+		x11-libs/gdk-pixbuf:2
+		x11-libs/gtk+:2
+	)
+	pud? ( sci-geosciences/gpsd )
+"
+RDEPEND="
+	${DEPEND}
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.9.0.2-gtk.patch
+	"${FILESDIR}"/${PN}-0.9.6-gpsd.patch
+)
+src_prepare() {
+	default
+
+	# fix parallel make
+	# respect AR
+	# verbose build
+	# fix default prefix, bug #453440
+	sed -i \
+		-e '/@echo "\[/d' \
+		-e 's|$(MAKECMD)|$(MAKE)|g' \
+		-e 's|@$(CC)|$(CC)|g' \
+		-e 's|@ar |$(AR) |g' \
+		-e '/^prefix/s:/usr/local:/usr:' \
+		$( find -name 'Makefile*' ) || die
+
+	# respect LDFLAGS
+	sed -i \
+		-e 's|$(CC)|& $(OLSRD_LDFLAGS)|g' \
+		lib/pud/nmealib/Makefile lib/pud/wireformat/Makefile || die
+}
+
+src_configure() {
+	if ! use pud; then
+		sed -i -e '/^SUBDIRS/ s|pud||g' Makefile || die
+	fi
+}
+
+src_compile() {
+	tc-export PKG_CONFIG
+	emake \
+		CC="$(tc-getCC)" \
+		LIBDIR="/usr/$(get_libdir)/${PN}" \
+		OLSRD_LDFLAGS="${LDFLAGS}" \
+		OS=linux \
+		VERBOSE=1 \
+		build_all
+	if use gtk; then
+		emake -C gui/linux-gtk LIBDIR="/usr/$(get_libdir)/${PN}" CC="$(tc-getCC)"
+	fi
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		DOCDIR_OLSRD="${D}/usr/share/doc/${PF}" \
+		LIBDIR="${D}/usr/$(get_libdir)/${PN}" \
+		OS=linux \
+		STRIP=true \
+		install_all
+	if use gtk; then
+		emake -C gui/linux-gtk \
+			DESTDIR="${D}" \
+			LIBDIR="${D}/usr/$(get_libdir)/${PN}" \
+			install
+	fi
+
+	doinitd "${FILESDIR}"/${PN}
+
+	gzip -d \
+		"${ED%/}"/usr/share/man/man5/olsrd.conf.5.gz \
+		"${ED%/}"/usr/share/man/man8/olsrd.8.gz \
+		|| die
+
+	dodoc CHANGELOG \
+		valgrind-howto.txt files/olsrd.conf.default.rfc \
+		files/olsrd.conf.default.lq \
+		lib/arprefresh/README_ARPREFRESH \
+		lib/bmf/README_BMF \
+		lib/dot_draw/README_DOT_DRAW \
+		lib/dyn_gw/README_DYN_GW \
+		lib/dyn_gw_plain/README_DYN_GW_PLAIN \
+		lib/httpinfo/README_HTTPINFO \
+		lib/mini/README_MINI \
+		lib/nameservice/README_NAMESERVICE \
+		lib/pgraph/README_PGRAPH \
+		lib/quagga/README_QUAGGA \
+		lib/secure/README_SECURE \
+		lib/txtinfo/README_TXTINFO \
+		lib/watchdog/README_WATCHDOG
+}
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index 2733f12db3ce..907ebe662dd5 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -62,6 +62,6 @@ DIST openssh-lpk-7.5p1-0.3.14.patch.xz 17040 BLAKE2B 5b2204316dd244bb8dd11db50d5
 EBUILD openssh-7.5_p1-r4.ebuild 11161 BLAKE2B e6276f34a75fbce06ebefa246786db15aff3bd9a59c77c41d96576b6aeb77c5e6fa17aceb573d4d1f0518aa703d298eb292d0d157fb843a702cbede1f42c0296 SHA512 446414c8961458b812b768d18afe46d60ef4dd54111d95b99654cfb3dfef592812b30527fdda352a595bba815e0ffea4a813e3291bcc96bacb368267ff837bdd
 EBUILD openssh-7.7_p1-r9.ebuild 15943 BLAKE2B 459a0f5920b3d5b4da2835e7f3c9f1edd185e48c509e5150a1306dbca3c2f17d0d9d3f41166c4263dd60c0218c11b278a4eaa6f53ae1429710fc749994f70d11 SHA512 3aa9018173cc53de22b1e4693daf4ca2716cd0bc0066f797b6b66926481aaabb3e82942beb305a95523ba64dc9ff95f54232c7538c1d30834f38d88dd94f18a2
 EBUILD openssh-7.9_p1-r4.ebuild 16314 BLAKE2B 4b78ac7c56c7aa5ab0225b07cc8d4f4739408221372064d17bd095dd440af3a9541713ab55de5bdb2347a373b9e267c0e3f38bb992f4ea3da893ff8a808970e0 SHA512 2f9ab98645c6d2ab67ee2e715719cdb868d02e8df19de85bc2556dfa62c26f946125a9fcdbbbdd34a596961272655947d6c6657dc1b477b646d4e42e8ad931af
-EBUILD openssh-8.0_p1-r2.ebuild 16187 BLAKE2B 5890324e2cabf83c0371bb1cea9903e1ef6db950351d3a56c0bee1747f498dc950babf514eb50169e43e1bb18c6a8164c3f8654e6034e9cca39ce3cc74ebbddc SHA512 15844c5db3136bea3d8a49a574e00d83e2cc6ee8864d291449752d41e3f4a4ff477b708aa070d87b08bd4dce6b6aa4daceac542eb03fcd3e44935bec02712572
+EBUILD openssh-8.0_p1-r2.ebuild 16177 BLAKE2B cb304f65c09073bfb0a75580254ae1b365267195a97a95e9921102182ac7ac33117e3e2e13b884e78134b0824555cfb34f428dc84d69aab228b822cab22aa7b2 SHA512 39225c3be9f69c90dd8d3a7e5b7470841802c413226f180b57615d33f291bbc4d57d67babb568309029591c48df33303d06b8d41e79cb2933993643c89b6dc7d
 EBUILD openssh-8.0_p1.ebuild 16146 BLAKE2B 613b780cdde9d39e9f1f67267c773dded920c511c6e8d1241c92c72d9957b39e870517c868d17c72db2ae68bfc2b2d64ba85b777331082d4011057ca87cdb59e SHA512 9358116310155833391140a586d4c375292a9eb68fe40bf7453e9ee547c74bbcb750e360fd43c7c585a222cb053804a413023c0dcc06ab824df964826476853e
 MISC metadata.xml 2212 BLAKE2B 889550b17d2ba8072686ca5f398c64946fc04721fd7093c88fd7c1c5c7e4610fb01964f8e3d78e20cd0e9b9343895439772fee43b5635db893f3fc13ae9437cb SHA512 958845fbdfb4f1d267fdbc3a005c6338da54c6a0715180a1982416a841ab4865c536de5f10bb8493d07830e182786d0c3f2ac710c9168434b3d077a59ed2ddd5
diff --git a/net-misc/openssh/openssh-8.0_p1-r2.ebuild b/net-misc/openssh/openssh-8.0_p1-r2.ebuild
index ef7bd3481fd2..a0936dbd331d 100644
--- a/net-misc/openssh/openssh-8.0_p1-r2.ebuild
+++ b/net-misc/openssh/openssh-8.0_p1-r2.ebuild
@@ -32,7 +32,7 @@ SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 # Probably want to drop ssl defaulting to on in a future version.
 IUSE="abi_mips_n32 audit bindist debug hpn kerberos kernel_linux ldns libedit libressl livecd pam +pie sctp selinux +ssl static test X X509"
 RESTRICT="!test? ( test )"
diff --git a/net-misc/rclone/Manifest b/net-misc/rclone/Manifest
index 08d95d9d9ce9..d9738a42a224 100644
--- a/net-misc/rclone/Manifest
+++ b/net-misc/rclone/Manifest
@@ -1,6 +1,6 @@
 DIST rclone-1.45.tar.gz 16494131 BLAKE2B 17ca4182af4efe23a367fc38226dc7fe146da55fea47a5f76773f1dcc3d3b629cca7964ffe41aa1e4dbd2fe36bd80545f336d2823a25ebb6b3effc768d4b46d2 SHA512 348dbd6a069f736219b7f925b6aa5234a4d70724ee5bfdb56067241063be36c44a091a37acb3285627803fa013329a6ef804aab4c0070ddaf322c5324b9e2a5a
 DIST rclone-1.47.0.tar.gz 17282254 BLAKE2B 57c4f3576427778db0fdc523d8b95b33db5cebfb0081d927abc8925eeaf90c0d2079f1d9572e81faac41e98cfee3028f39c9aed89e6db17188efb3541e3daa6a SHA512 90e68021f589bfad95989b45d91c47da63066e9bc60040052e866d1c7e420bc2784335cc5dbab0e4372c4f8686acb0a65853877c41081c8406eddada42550125
 EBUILD rclone-1.45.ebuild 855 BLAKE2B 6fa5fed6fa510426c7b0e9fc071628567d2dfd3656d42eec32e4ee53421a0d2e4a0d3a76985b659b07dc92dd781d3ee64d09237bec89f4f6cced00cf4bce213b SHA512 3ebe305dd275b7514361c8e83c66ebcf670cf1e403a5e0bfac65d8ebd97dca2314c8d9a5c89cfac968f0c8db35c68fce49b13e436dc3fe6b81a816d25360dc8a
-EBUILD rclone-1.47.0.ebuild 857 BLAKE2B 23908780bf153eabb1e45e3a011d5cf3c8a262ac040a24c272e8a9c05dda5e1332accb190b133141d96562ea812459e91595b7f53e0dda63d9a5ce7dd1e49293 SHA512 55a50a88e62179f4a665b45b3da697284b1a1117af190adb0a8eb8c57586f1bb5a23455e625a51d95f0525b274eee20c2d4d05318f88d333145e0f3fcf437356
+EBUILD rclone-1.47.0.ebuild 855 BLAKE2B 6fa5fed6fa510426c7b0e9fc071628567d2dfd3656d42eec32e4ee53421a0d2e4a0d3a76985b659b07dc92dd781d3ee64d09237bec89f4f6cced00cf4bce213b SHA512 3ebe305dd275b7514361c8e83c66ebcf670cf1e403a5e0bfac65d8ebd97dca2314c8d9a5c89cfac968f0c8db35c68fce49b13e436dc3fe6b81a816d25360dc8a
 EBUILD rclone-9999.ebuild 857 BLAKE2B 23908780bf153eabb1e45e3a011d5cf3c8a262ac040a24c272e8a9c05dda5e1332accb190b133141d96562ea812459e91595b7f53e0dda63d9a5ce7dd1e49293 SHA512 55a50a88e62179f4a665b45b3da697284b1a1117af190adb0a8eb8c57586f1bb5a23455e625a51d95f0525b274eee20c2d4d05318f88d333145e0f3fcf437356
 MISC metadata.xml 247 BLAKE2B fad006bd63156a3ffcdfe9e4c216b806d3b341fa5b7e8de2608ad51674b482493f7d0fabdeb6010ce0c41aef65a55abe404b8ba5ba7d72f36822b7d96d58182b SHA512 189f876175728dfb474cf2ccb122ebfe48b068cc5fd65a3cfed7dad947dd9ce0fc7c89ce5c0982fdee5262025236b7d5cccf48b55c67c5cd33e84910c28e0b46
diff --git a/net-misc/rclone/rclone-1.47.0.ebuild b/net-misc/rclone/rclone-1.47.0.ebuild
index e1f64b65bde7..e7c1175ae163 100644
--- a/net-misc/rclone/rclone-1.47.0.ebuild
+++ b/net-misc/rclone/rclone-1.47.0.ebuild
@@ -8,7 +8,7 @@ EGO_PN="github.com/ncw/${PN}"
 if [[ ${PV} == *9999* ]]; then
 	inherit golang-vcs
 else
-	KEYWORDS="~amd64 ~arm ~x86"
+	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
diff --git a/net-misc/remmina/Manifest b/net-misc/remmina/Manifest
index 62351c94c260..8c39afbd7d95 100644
--- a/net-misc/remmina/Manifest
+++ b/net-misc/remmina/Manifest
@@ -6,6 +6,6 @@ DIST remmina-1.3.5_p20190731.tar.gz 1475593 BLAKE2B 0a2ddb9c45474e65de9a5be28155
 EBUILD remmina-1.2.0_rc24.ebuild 2035 BLAKE2B 7490ba779c88bf0caf7f1de2398dec1484acf428f3f1ddd06b021965d3ef255927d9637e24c56a71a3737707ef6a2df0257dc1a486c60e665e99721aaa5c1092 SHA512 058740deb4f072b8677fcb5bcedf2c870dccf748c166594cdf24cc09574b1fd1b8fb0157b89c82e43bd3dabcc892e72f561ed4db816ea269c40b2da9b73ce3cf
 EBUILD remmina-1.2.31.3.ebuild 2239 BLAKE2B 65e7720bc587f060e1014ea7c35832a4eb3a7c3a618913b35803c56103f814e0d82e65756471cef1e55da3f5d6a2044660b8adb33e7fa82618dba3c376e5fa6d SHA512 f038e0f8242aee5eb86403dc0e4758278f91407b9382b837d248de914037d88f7fac489ce326f5499c4cc548215f924b17ae10e8792955efec868b9e4c00f3f6
 EBUILD remmina-1.3.3.ebuild 2247 BLAKE2B 99065b1b37f957f07f0a16487f2dd4c9dc3f7c60cf9657584b6c0f1ed06b41602f8763d3e88f02234a42ad424080818e35df676e61dde7a6042d4934526ce65b SHA512 f80bf47e941b0c505610f757647c3260c7182d230e2f8067c3ed3781bd37c1ebcdab52aba279e9a51bda2f6faec78a7c0eb4e75c8c85f6fadb965ab0ff9910b3
-EBUILD remmina-1.3.4.ebuild 2247 BLAKE2B 99065b1b37f957f07f0a16487f2dd4c9dc3f7c60cf9657584b6c0f1ed06b41602f8763d3e88f02234a42ad424080818e35df676e61dde7a6042d4934526ce65b SHA512 f80bf47e941b0c505610f757647c3260c7182d230e2f8067c3ed3781bd37c1ebcdab52aba279e9a51bda2f6faec78a7c0eb4e75c8c85f6fadb965ab0ff9910b3
+EBUILD remmina-1.3.4.ebuild 2245 BLAKE2B 256d9073a83f692a70c9db223a0d201f30100a5ff80d411f1990a53afd4954e6b96b8be0e9ef47600c4d3f2039b9250daf33fb9dc5ff6d6d74d451d860e52d49 SHA512 d2181e7130c47df3b0849936bea4cef88444ecbd2873a45b5f2f46e3269d310dc27d958138ecf7f0ed3d6929a82a8a9b0a3999838eb9dfb1646b137a481772d1
 EBUILD remmina-1.3.5_p20190731.ebuild 2530 BLAKE2B 88ee3101aa2954144e0e633a3a0f3e099b66eeb5451546dae5605176f8a8ae08a6619f51aca1f149ba23f33358eb63d7d958d9da189172183982d9a56ef384ab SHA512 ec5265dcf6489f7d0edd6eb48f2733cfc2b70ff208fb63d39af0e9e5a6b1908f646cfc431f039a53ee4df114265c98b458dc066dcc80e87131f10e5e9735800b
 MISC metadata.xml 1310 BLAKE2B bcf7c45908f6d13c26cbb7564e78d925c34000ed1ba20f793ada10d34e0f5f8b7ca380cb2688029eb4bac52b8afa3ed06cf5e635d8789d64f4cb420d23167cd5 SHA512 8bc4313586204ce7d2e386815599ef8694b8e39816612b0bdc7984676fd17f0a78f94f96677c1a51b5bd8876402c0cfef58a629c60c091ebfed14912e4ca9bff
diff --git a/net-misc/remmina/remmina-1.3.4.ebuild b/net-misc/remmina/remmina-1.3.4.ebuild
index 834591991fa1..d3095524c755 100644
--- a/net-misc/remmina/remmina-1.3.4.ebuild
+++ b/net-misc/remmina/remmina-1.3.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://gitlab.com/Remmina/Remmina/-/archive/v${PV}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2+-with-openssl-exception"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="ayatana crypt examples gnome-keyring libressl nls spice ssh rdp telepathy vnc zeroconf"
 
 CDEPEND="
diff --git a/net-misc/rinetd/Manifest b/net-misc/rinetd/Manifest
index d05a95f2074c..d50eaf8dee26 100644
--- a/net-misc/rinetd/Manifest
+++ b/net-misc/rinetd/Manifest
@@ -1,4 +1,4 @@
 AUX rinetd.rc 368 BLAKE2B 2da7950dd5275dd6de5203e5dea73ddb817903ce9313dae9bdc0121d11798b5c51fc3ce3a9672e7552664d8f1127ed541c9244a69cd8ee8b78a2459cf7adb742 SHA512 ee8ba6827b7d53a388a72f1fecdf38c0c6efd5b1cc54219c8c764e5cd073cfb5a3c1ba284520973aa2f219267a38b604162fde612f47b28f949d07fc84ddfdae
-DIST rinetd.tar.gz 115541 BLAKE2B 11a6db6955181ba6c823c3b8d9697e4efac10962364b4e993e9057b3500b09161826d325ac0dc3f6756c5cc91b29885c493ba5f053dffd28da97ecae25d2346f SHA512 b6ddb496b4542ad46aacaef4b2241b16b9ee43f2f6761a18a4813d83a0a9db23fbd73a554393dcf01ae7350e8b6662571414ca6f93a949ce4effbbeddc198606
-EBUILD rinetd-0.62-r2.ebuild 689 BLAKE2B 975bffcffa4bff91c6f350e4e9424df24473658b1a66cd8cca9d3aee4d7566f42131ef476618663f0fa358b75a4921a3f4ac8e1a46dd1b9d23707a4a4c27a55b SHA512 1560b667fdd382e08474db6b5eb6a51186e18bc4f343c85c491e9472fc3d9abf3ed275cccddd5bce6aaec39cbdf94bb6e33f968893065c18fe60177b077101ae
+DIST rinetd-0.62.tar.gz 115541 BLAKE2B 11a6db6955181ba6c823c3b8d9697e4efac10962364b4e993e9057b3500b09161826d325ac0dc3f6756c5cc91b29885c493ba5f053dffd28da97ecae25d2346f SHA512 b6ddb496b4542ad46aacaef4b2241b16b9ee43f2f6761a18a4813d83a0a9db23fbd73a554393dcf01ae7350e8b6662571414ca6f93a949ce4effbbeddc198606
+EBUILD rinetd-0.62-r2.ebuild 701 BLAKE2B 6c6d5f79ee7790f35ce054731fabb817275b7a13eaf6fd7563d2cb9314b32e4b3c1f269bf0cbb3a30f3c7dafa3bb3ad10e7db09fa427457799200a2534f4a0b3 SHA512 1e09b258e1323d8b9328fd1c0abfcfb92197711d672d3c779fbc9087afec22276c68a371df408d76c27b64040782cb9fd71702828be924f9ed9433bff486641a
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-misc/rinetd/rinetd-0.62-r2.ebuild b/net-misc/rinetd/rinetd-0.62-r2.ebuild
index 7a1cac341228..527f67d7834f 100644
--- a/net-misc/rinetd/rinetd-0.62-r2.ebuild
+++ b/net-misc/rinetd/rinetd-0.62-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -7,7 +7,7 @@ inherit toolchain-funcs
 
 DESCRIPTION="redirects TCP connections from one IP address and port to another"
 HOMEPAGE="http://www.boutell.com/rinetd/"
-SRC_URI="http://www.boutell.com/rinetd/http/rinetd.tar.gz"
+SRC_URI="http://www.boutell.com/rinetd/http/rinetd.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-misc/smb4k/Manifest b/net-misc/smb4k/Manifest
index 2fc99785faf4..2a4a1a688248 100644
--- a/net-misc/smb4k/Manifest
+++ b/net-misc/smb4k/Manifest
@@ -1,3 +1,5 @@
 DIST smb4k-3.0.1.tar.xz 3826160 BLAKE2B e42d761d67ae6b25e75fc673eb18838607dc36d5c76d4cba63257d09c2e138fcc3b1e3600163188117a020327645b7fe320d4a25f7455f2585cdbcf567e3d941 SHA512 de61d7dc2f63657056d721ac5ef5c12e8c8393b674163c2888a63a58f5779b0efcc47c2acaee782979c4bd9abc008eb457b6fce31d085b3e80c0970a195528b9
+DIST smb4k-3.0.2.tar.xz 3824972 BLAKE2B 6f15bac77840669b9f9a6640e35f5b36b76653946bcef9d268452fd813c796480594b40744cf86ec5d79307294fb2f9592dc71013576efcb6c8fc607599778b9 SHA512 b60d50732ba84bae9e58f90ec18bb0fe59185814ec92e4f8adc1e699cfce61019f919fbdac2555b365c495ab1720f62b35b95c063f0c7c9466dc31487b8cb564
 EBUILD smb4k-3.0.1.ebuild 1642 BLAKE2B 341972b4680fffb18aae1a8c8d20bb62d7a8ad1e7f8c81322249c4bba068fe20cf96594106b5dd1e21b41f8bc0b265bad45039fe0d9ffb40fad5c585979669e3 SHA512 93ff90d6a354248e89b8beb07f30971245f32a55f444f8643bd6252650ff39cecd16e999763fe1b4b0c9a0aebff65e780db5441067e01e1e9349cc71789c3cc9
+EBUILD smb4k-3.0.2.ebuild 1644 BLAKE2B fe0d65dd81cfab6055d8c1cb207b03de7234c4695482a9039b3d91f30c1c3fd99f30a1a9e86f728d348763913cf3068f2c498e1d44c0757a9ef07e43d30a6bab SHA512 87055383be22379b6d774ab815a61d60a9e5187556d3e15056179cc3aaa3eed8b951b7eba06d1a697d7bc2a62977537eb4fb9db18d5a914feba89c56ccf4d967
 MISC metadata.xml 324 BLAKE2B 9e05620c3d07398233f8ac54e9d9d3267e21835594d8bae1c14a68d3650be7a7e904b57281823e6886efcd56a33e4e9d576c8cbfe0d9b148641fae8a7ce01ce4 SHA512 48a26e2c744b920776e2d7a8a33ce6188a785f34ce783e59f9f4898947320b2ce6b0205e0848aff7c03151349d8fd6dd4dda705b695e1c4ed3c46a17347d8711
diff --git a/net-misc/smb4k/smb4k-3.0.2.ebuild b/net-misc/smb4k/smb4k-3.0.2.ebuild
new file mode 100644
index 000000000000..896232bad470
--- /dev/null
+++ b/net-misc/smb4k/smb4k-3.0.2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Advanced network neighborhood browser"
+HOMEPAGE="https://sourceforge.net/p/smb4k/home/Home/"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+IUSE="plasma"
+
+DEPEND="
+	$(add_frameworks_dep kauth)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep solid)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qttest)
+	$(add_qt_dep qtwidgets)
+	net-fs/samba[cups]
+"
+RDEPEND="${DEPEND}
+	plasma? (
+		$(add_frameworks_dep plasma)
+		$(add_qt_dep qtquickcontrols2)
+	)
+"
+
+src_configure(){
+	local mycmakeargs=(
+		-DINSTALL_PLASMOID=$(usex plasma)
+	)
+	kde5_src_configure
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+	elog "Users of Samba 4.7 and above please note that for the time being,"
+	elog "the following setting has to be added to or changed in the [global]"
+	elog "section of the smb.conf file:"
+	elog
+	elog "[global]"
+	elog "client max protocol = NT1"
+}
diff --git a/net-misc/spice-gtk/Manifest b/net-misc/spice-gtk/Manifest
index 5eca703b7535..db41b35628df 100644
--- a/net-misc/spice-gtk/Manifest
+++ b/net-misc/spice-gtk/Manifest
@@ -5,6 +5,6 @@ DIST spice-gtk-0.35.tar.bz2 1437231 BLAKE2B f2731a794cf22b491bf858fff44506288af7
 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 3665 BLAKE2B 8b6b1c74a0b552e4bb8952ba9c5b3d3045b732734adfdc47fcc3dd55e6681c9153606160eb7339a0cc9bcc08c7b339a05b1ddc36ca151a2093e5bc9401688a8c SHA512 6b13b8eb98855f431e6b0a871bb16c04e5b9d887c6d6b7454f69c42bbe264b66d7b63ee191fcbda3cad3e9383a36cf6186de6acc08a6df5b771fa26dc691554f
+EBUILD spice-gtk-0.37-r2.ebuild 3672 BLAKE2B 60e5a10d61c571185ce7abb56b9d8e6449338f87d09604c7ee8485360ed5945c02a02003797ae3edb1e7ca5edec35f0c4d3e6c7159232b6b3a96edd930806b53 SHA512 ce882723b5a1f445fca3332a54225b24d362a27dea6554153c5a96c19b807f945ed87f8952c1ba8956bc3b5b8675cd606ee10c5e979921475c357568b6534954
 EBUILD spice-gtk-9999.ebuild 3637 BLAKE2B 6a95666f309c1d29779b33a225d8a429caf6954f6a4ba5ee993ea7e0db539b6341d2e3d85f66ae5d4fe2e05a7b61a69e80a578ff2ea8de1c8de3ca44f1529de9 SHA512 39f419bc6188c40e25332111ae4953f3eeccfbb6880fd7b22d20be90ce534f9267e6e6f094e36e8cb76d3677cccbea50895f53039acd46b934d24dd3b2e3c9c2
 MISC metadata.xml 1166 BLAKE2B 37cf826a7a49dc48170fb99e05b191964810eacbf8b13db383a37e70faed6a2b4b70acfd724eeffbbe10d97fab27bfec7d56cfb2cbc2537ac4df7612afdbe8d2 SHA512 5229ddeaf19765abee5b0120b066ac2049f77878b1b8886e2b552f2c56d6049df297b227f0bee36bbe6be7041b9d8e1c1d3d868c34b1e39b49a5c0bc16b2c947
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 51d40d99df46..146bbc7608c1 100644
--- a/net-misc/spice-gtk/spice-gtk-0.37-r2.ebuild
+++ b/net-misc/spice-gtk/spice-gtk-0.37-r2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://www.spice-space.org https://cgit.freedesktop.org/spice/spice-g
 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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="+gtk3 +introspection lz4 mjpeg policykit pulseaudio sasl smartcard static-libs usbredir vala webdav libressl"
 
 # TODO:
diff --git a/net-misc/sslh/Manifest b/net-misc/sslh/Manifest
index a3d2f62fd162..19642c1f69a0 100644
--- a/net-misc/sslh/Manifest
+++ b/net-misc/sslh/Manifest
@@ -1,5 +1,5 @@
 AUX sslh.conf.d-2 621 BLAKE2B 095522c582be245f1e49018848be738a33eb722cd9be4bd8a0830bbfaa1c2e4018ff480b625349372cc35ec47a1b10069cb5fd6a3c22d7e957e782c888c70b55 SHA512 31d482af0b3626f4b2f669f74a08fa6b6dfc310a40ab332cc3907306bd2fa5321f92e0e76af72c2ea185142f0d485578817e738737917b9c1764079070297e67
-AUX sslh.init.d-3 273 BLAKE2B 01ba7f4347989a6bcf829139ce3a51e7b14265eaae2e32617933c29c5d195a6a3bbe0674a13d52f02e2c418787ed3976987dc79d9c9045b0c7ca6285aa86fb55 SHA512 1508a137c5bc962e1dfa780334c015fb63701867261fc335920fa1847e2ed2093cd02657fc9d2f633382db15bbfd87bfb65f698f5f76aa777aa947ddf39ca10a
+AUX sslh.init.d-3 270 BLAKE2B 98cc6c6ccc37a6e8af6d0e84356779e0f304e3d6f45f9fff53c3d1c870ff6b03ac780c04c29e4dce7d6aa3e4cdce365fb54228600e7ce70d9d32691202a5ffb5 SHA512 b919ae318c789ba3e5dd0f5df665a7421be791e89074b07ee00c47b3fe12475562eb5675bbb168c86388902bf50069e0d6f3e804a14666563de07a0a71075ee0
 DIST sslh-v1.20.tar.gz 60459 BLAKE2B fafb1876df54edce99473db9305eaad77e2b726904724c9c74b3eb2fe8666c219c48b49888b05cc52f993104b69a263ba3c8a271efd1217ba6f73258caa83249 SHA512 eccaddd5a4299206f195c2f7a78840b2f76f8a0cf10a715b5c72f959ed5d3259fc5ea3db8d398b33f0d556d71268b15c870999d742f83383a9d49120e476770a
 EBUILD sslh-1.20.ebuild 1931 BLAKE2B c407cde3ec222bdea752ff518b3ebddfdf86406dc75d5d600f919652c9f1e237d630f1a14fe172468dfbea59e028ef033e1e52fe820720e688ebf6758ed79893 SHA512 f619a6d09f5a9633c97fcebc2c795286ed2ea01cec26a4b8f155fcc390090485ac13322469c93a5bcf22acfe6e5c138b3e3a259e67cc86b38999990f545d8d8f
 EBUILD sslh-9999.ebuild 1955 BLAKE2B 347f4f693aa85bf620213b7b6ebd03034f00d25304202d952b44f7c492cd3a1a5afed4e01e994c842e36c3920f33b926589c09c8115877761556b92845519269 SHA512 4145223faf1e3141cf80784709c7283f237c06d8d848ba415259ca29511c5b28df8ba015b315ca7b4b4f3df11303aac5519e01f8706b9a755982ba6a25c6d55b
diff --git a/net-misc/sslh/files/sslh.init.d-3 b/net-misc/sslh/files/sslh.init.d-3
index 7f9d61795b73..0124ae84c317 100755..100644
--- a/net-misc/sslh/files/sslh.init.d-3
+++ b/net-misc/sslh/files/sslh.init.d-3
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 description="Port multiplexer for ssh/ssl/etc..."
diff --git a/net-misc/sstp-client/Manifest b/net-misc/sstp-client/Manifest
index 23148f8efe0b..abd330d3265f 100644
--- a/net-misc/sstp-client/Manifest
+++ b/net-misc/sstp-client/Manifest
@@ -1,7 +1,7 @@
-AUX sstp-client-1.0.11-fix-example.patch 417 BLAKE2B 5f91dd2ee3e3ccc089712a2efd26dd05c91aed7a787e4240a7e10a8e81f1f74d732299731500033551331e23d8927fa9519f52214c6e8949bbd3f8f6c558dfa7 SHA512 a7bef85e7be5a90a0820317d6aa87ab6e26f97caea9e47c6e678fdc8cd1c25b1a8f11c9e2ccb93f99950da39076253b435156edd4b7dfbb606db2fe58eef66e2
-AUX sstp-client-1.0.11-remove-network-test.patch 313 BLAKE2B 80857c01cfdb8a4b919729d5316ec78a9d6d4de4092afb615bbd731557e033b55d400a3fa8c0fac83a2732e3cc8212c0c16a067bfb01041d2ab2f0fc3c233847 SHA512 00d1b0ad75aa75417cf87210802c48164a715eddd7a1f53e8956e524387eb170078471d67fab32e3b25990b1b44fa415b153bf22fdf8b3c90385627c8f0075e4
+AUX sstp-client-1.0.12-fix-example.patch 417 BLAKE2B 5f91dd2ee3e3ccc089712a2efd26dd05c91aed7a787e4240a7e10a8e81f1f74d732299731500033551331e23d8927fa9519f52214c6e8949bbd3f8f6c558dfa7 SHA512 a7bef85e7be5a90a0820317d6aa87ab6e26f97caea9e47c6e678fdc8cd1c25b1a8f11c9e2ccb93f99950da39076253b435156edd4b7dfbb606db2fe58eef66e2
+AUX sstp-client-1.0.12-remove-network-test.patch 313 BLAKE2B 80857c01cfdb8a4b919729d5316ec78a9d6d4de4092afb615bbd731557e033b55d400a3fa8c0fac83a2732e3cc8212c0c16a067bfb01041d2ab2f0fc3c233847 SHA512 00d1b0ad75aa75417cf87210802c48164a715eddd7a1f53e8956e524387eb170078471d67fab32e3b25990b1b44fa415b153bf22fdf8b3c90385627c8f0075e4
 DIST sstp-client-1.0.10.tar.gz 3012713 BLAKE2B 6b924c9fef4df26a9aa93dd5670cae4dbfe020f2c1bfc955f88f229414b5295864c25637bddf3b80d522dd514a4f3042522f9615fe660165b4417d6ea832e4bf SHA512 8f3e4b1b4d795015230b3a1b8aabf7d5fddd89be511bd6a59c22e5414520a392ba430f66f30aa2b982f084955e0085b0ea66d5acf5fd00414dc37c2c52a78cb7
-DIST sstp-client-1.0.11.tar.gz 3035707 BLAKE2B f534060bc47599a372b95b25400e7cb09911eb0216b11faa5bdcf0241d7c5caabd7df6065e58dff2b6b1f6c4e416499f58f92900da024d0ad0684aa3cc4d9abd SHA512 d22b03f1bc2d5215def6ce198d6e81b08a5cebc4db9de269bc2e66785845521f0606a96af5d9d257dcf78addafee8ad3d942de0075f47038fbfe0b5051002487
+DIST sstp-client-1.0.12.tar.gz 468683 BLAKE2B 4bb97465ee29eb6dd816a69b45c53e58e9de2cd5d7b5c9e39ea4ebbb3c3de0c21b3d95317114ae8c93bc3be359300bd6a55fa0512540bf25405fb47f8fb4e736 SHA512 d29128e59977fa844b0f2b02580284bb4e909994e5616c4dfa150b7a9807d0f34219355abe8c315c60c5f2482e3255824ce7e05566dbea9a7f13a1739d46468f
 EBUILD sstp-client-1.0.10-r1.ebuild 1420 BLAKE2B cb9b8c161923f4ff3d193788b4e520a739f30bb37a01ede3d31ae2ece04c06f7b59bd9956bec6cb998854d544b3baca226c62d970eff750f42c8327fb9bdbf3f SHA512 009fe28e314d9450e2b6b4f44671396cd9edbd219c04281d960a4387f3669f530106a32f31311512f68fd8f6713be0695b542c84f1f46e28c9df86fe24901844
-EBUILD sstp-client-1.0.11.ebuild 1326 BLAKE2B babb1432e91e05b8ffe8bd175546550058e84e76cb5e109a5d2bc177b97d82b04695fa7040088bc71b505a3b238aeeb4bccae9b0b17ac1728dbe8ce73d964b4b SHA512 20956d3dee0cb8ec22e4775e6017e6aeb7a6d70bfccb266948d98f81425d15eee7ae6d83b85f2214d2f16d13b31c81a4f2de1b8008cb1ff4068594e6aed294a1
-MISC metadata.xml 558 BLAKE2B 8829147e89c293128b556f27f0b34015dec0adee29092f8938d41fd82cc6fec31346aed532fb5dcfa68df9af4a017582093243fe00c38b7f8815a0b75b91f34d SHA512 e223985a2f14609b55afee8fba99fe539ad003f02aab653c11dda2754e791676fb7638a5b14df5f62815f2dac9321cc91ca597eb686fc62e53c6ae791a7c402f
+EBUILD sstp-client-1.0.12.ebuild 1323 BLAKE2B 523d5bb199731c93af80ba3392a838c81884f059c8aac60e206159c94fe07f5dca9a52f25a8da64731a14368e36eed500b8425f290758eadd03fbf2702793bc6 SHA512 b9b48275716bb750d07b652ab8f02f3544965d2787ecc96fadcd2bd02b621d042bc5f129b62095b8bf9e703ae3c831d4f46465d8c06b2284dfae03cfe6860409
+MISC metadata.xml 330 BLAKE2B beffc0ba9de0664f0b9bd76ba88b417616d2ec9a493776b3ea477bf82972c6fafe29b08d8db40e711ef26c52b115d60f20dc01ebb57a01404888a818bb183311 SHA512 8d4b705f3bb0f8b6b4ec9f51e828c4739b092827cb32cae70782ce062eaf8363f8b6de36b17ec5e14e6715cf1a8373dae94828ff74c2975b96e2947c5fb657b4
diff --git a/net-misc/sstp-client/files/sstp-client-1.0.11-fix-example.patch b/net-misc/sstp-client/files/sstp-client-1.0.12-fix-example.patch
index f2b81174fc1a..f2b81174fc1a 100644
--- a/net-misc/sstp-client/files/sstp-client-1.0.11-fix-example.patch
+++ b/net-misc/sstp-client/files/sstp-client-1.0.12-fix-example.patch
diff --git a/net-misc/sstp-client/files/sstp-client-1.0.11-remove-network-test.patch b/net-misc/sstp-client/files/sstp-client-1.0.12-remove-network-test.patch
index d6868f3e26bd..d6868f3e26bd 100644
--- a/net-misc/sstp-client/files/sstp-client-1.0.11-remove-network-test.patch
+++ b/net-misc/sstp-client/files/sstp-client-1.0.12-remove-network-test.patch
diff --git a/net-misc/sstp-client/metadata.xml b/net-misc/sstp-client/metadata.xml
index 0829a0755cd7..c5411f6a2824 100644
--- a/net-misc/sstp-client/metadata.xml
+++ b/net-misc/sstp-client/metadata.xml
@@ -2,17 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>m.j.everitt@iee.org</email>
-		<name>Michael Everitt</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>maksbotan@gentoo.org</email>
 		<name>Maxim Koltsov</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">sstp-client</remote-id>
 	</upstream>
diff --git a/net-misc/sstp-client/sstp-client-1.0.11.ebuild b/net-misc/sstp-client/sstp-client-1.0.12.ebuild
index 07ce4377c768..767cbdd4709c 100644
--- a/net-misc/sstp-client/sstp-client-1.0.11.ebuild
+++ b/net-misc/sstp-client/sstp-client-1.0.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/net-misc/teamviewer/Manifest b/net-misc/teamviewer/Manifest
index 3d3afd4a95f9..a07238905f70 100644
--- a/net-misc/teamviewer/Manifest
+++ b/net-misc/teamviewer/Manifest
@@ -1,17 +1,11 @@
 AUX teamviewerd14.init 282 BLAKE2B af900eacf64f57d6c3a404cde9b42d4e45037c7bf8d5466422ebfddbce4fc1eb27c3982dd81d4bb918479b8da00104cd1b761e64738d00e70efb3b1d7fe2134e SHA512 0905da2033afbf2f4464fae31f7d22b87469c584b912d2f8b652d05a1f2a63709e87d0e70cb981cb87803e9d66f25c399f13eea0ecd0e665bd0a9c1f6994c3f1
-DIST teamviewer_14.1.18533_amd64.tar.xz 11364156 BLAKE2B 2af6407209dccadc66c96f54673de2ef200e224ca585583c263049169f54dae9ad32b245f630007f231d63903198bc1494ffc2848c45b1e93b0c8eee2df26c17 SHA512 b71b5b52c73fda8de357b2aaab667fe9950fad150518fc18c864bdcee388aaa05f550e373bdf782880826f0598d3879aebc79a447ec9cefd0b89d994383645c5
-DIST teamviewer_14.1.18533_i386.tar.xz 11365948 BLAKE2B b57de67131f7ee28823973007ebe34802e9a6b544829452c15e9bdab4eaae5a151c395c75ae6540acdd745fc81a5afd8674af50f2943c822ef5ce339b80766f7 SHA512 f05c285859031bc45dd313e47b28662fb6873fcb01d0c5aab72dcc0ab0d728361d335e1dbeddc8f0eacb88f9d3f1edaff69a93b88149ca3de6367e86a938998c
-DIST teamviewer_14.1.3399_amd64.tar.xz 11311600 BLAKE2B 082b23322b4a24add2f7a1235810a3fb3cfd6572ccfe2a54942bd93902d3adc170a175d32653375c406de7a54949fd0904dfae8b8cf98da58ef492ac63d0e576 SHA512 9417fca34d2b4b3e53d173ed31f85ca6d3f2488dceb7bf2321082631b425d7c3404549ff4bfe615e6f8f82354df5c43ab61e8cd4ec99ae9c42b28807ea0db365
-DIST teamviewer_14.1.3399_i386.tar.xz 11305576 BLAKE2B 1a40cd6dd5e1554b44d210fb0ca78a3570185e046b12eba52d0e089cd317ab6c8828f774d6b786ab7232ad663785bd9fb2e9137eb0ea7364347ea5513ab5e6ef SHA512 0fef5c5794ea06d9a729cd5be0b2e7c28add1fca9bbf9e77ca69fe569a08fc1efb6dc007040d8a8d3608061469dc2e2d364584130316d58e2d8195b2389deb0f
-DIST teamviewer_14.1.9025_amd64.tar.xz 11357456 BLAKE2B d3401b4465341533e0e3e7d57515566b1833689cb55d3d2b2b4ca95ed706ebd5609698b128033737dc1532e10fd15837241f11e327d3345ef266b90d2837075c SHA512 2a6fcfd3bb74a9e0f97bd94cf92ba5c8500c17436887e186c6b65d1c02b984799a41003e0cb58af503ece6c9c4f8205c907ba179b491efd3b765ef34b1ec9f76
-DIST teamviewer_14.1.9025_i386.tar.xz 11357824 BLAKE2B 6eb496549e39a1f66a5e14af3d69f8f11dda1549e4af51d354fa8cdfd027dec58240dc6ddacbaf0b1c0ccecf918873d9307f6d75a09abf180a1be5aff65f2613 SHA512 b5ff7e417ffa59725656611348dd717141fa010460f2d872ef555471f22af24d7dde02b0356eece69eb2a7e8fb0d94024646b74e9c8d5c00577eeda1e8c9a713
 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
-EBUILD teamviewer-14.1.18533.ebuild 3701 BLAKE2B 2413ca30f73a54cf75f69600d9928d8803b0d6c66a4ef0e40c37703573845984ab15f00dfdba33b9359676a1412828df84dafeb5649d68e71d4f8ce3e8331dd8 SHA512 871ded4d964787d875a4731fa6e44590df92746c855ec1e5d471ed8cea8b7d464c591b308df4ebfd9dcf29cfa5e6cedcc53a98d40547ee3725a54536f83fe65a
-EBUILD teamviewer-14.1.3399.ebuild 3701 BLAKE2B 4f022ce30f521cdac93245040fc1963960fbd83eb5349c8febb1e17019ab990036d6de02a250384b0f2fa332913feca4fa7bb18c0c46812d5e9f64834f17cf29 SHA512 b97758ece045326b9096538393fba63215690996ca5c0ac56b95d4e235b6c9ba182c5909846ba48bad2819dbc3d880f34ca67dfbd083c8770db4962a9150e8db
-EBUILD teamviewer-14.1.9025.ebuild 3701 BLAKE2B 2413ca30f73a54cf75f69600d9928d8803b0d6c66a4ef0e40c37703573845984ab15f00dfdba33b9359676a1412828df84dafeb5649d68e71d4f8ce3e8331dd8 SHA512 871ded4d964787d875a4731fa6e44590df92746c855ec1e5d471ed8cea8b7d464c591b308df4ebfd9dcf29cfa5e6cedcc53a98d40547ee3725a54536f83fe65a
+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
 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
 MISC metadata.xml 353 BLAKE2B 6b23f0ea5f9e3bc076641d6991535e7069dab3abd3f30e1d1052580223ec1f2ad94a8b0f6dfc6ee0019cdb3f1b3ea31edc5bbd04579da77f866291922f4c675a SHA512 bb21752978f1cf4c9cabf6b5fad33e0dbb820d27a5dd3ef40fd54f4a86893b77cd994dfe77395ff8fdd69f4e0f805bca622486538a4781b0f30b55ffdcf1540d
diff --git a/net-misc/teamviewer/teamviewer-14.1.18533.ebuild b/net-misc/teamviewer/teamviewer-14.1.18533.ebuild
deleted file mode 100644
index 2887c5d78191..000000000000
--- a/net-misc/teamviewer/teamviewer-14.1.18533.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.1.3399.ebuild b/net-misc/teamviewer/teamviewer-14.1.3399.ebuild
deleted file mode 100644
index 66f0313ab868..000000000000
--- a/net-misc/teamviewer/teamviewer-14.1.3399.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2018 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.1.9025.ebuild b/net-misc/teamviewer/teamviewer-14.4.2669.ebuild
index 2887c5d78191..6650185440e6 100644
--- a/net-misc/teamviewer/teamviewer-14.1.9025.ebuild
+++ b/net-misc/teamviewer/teamviewer-14.4.2669.ebuild
@@ -28,8 +28,11 @@ RDEPEND="
 	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
@@ -122,6 +125,10 @@ pkg_postinst() {
 	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() {
diff --git a/net-misc/vinagre/Manifest b/net-misc/vinagre/Manifest
index e00d22e561dc..9a9d5dfad050 100644
--- a/net-misc/vinagre/Manifest
+++ b/net-misc/vinagre/Manifest
@@ -1,5 +1,5 @@
 AUX vinagre-3.20.2-freerdp2.patch 1355 BLAKE2B 6d9655bcb8bf778d6c9a9a4336d08d6e9d29a999845be18eaa611d3162125ba4b8b7e3743406c1381c191edde2fbfb29967cf427823ce74e445ddc29b93c10ed SHA512 9fbe2c45bdda85226410020154441f25f1010e331c30a6d64eabd302c59408d2097238412f4b75407b0bb65163b3ed7258c280b411f17e4b071c95c27b0b2095
 AUX vinagre-3.22.0-freerdp2-2.patch 3671 BLAKE2B 62d1307fc79adbe7d2949c005fcb133f2a75ed39572dcceb85348a60bdd0a1d432b21ad3bb9689866d644cc48e764f5c7b42b12e2b614805b3b4b82c5b7ba41d SHA512 167d92664001ee35ba8d2b0e262b7f45ec9488eca604e4a63979c51065c9d1e97701fab9377fb7cd623dd87ed9db8be3361ad306a1f55cce8da234ac13e2a312
 DIST vinagre-3.22.0.tar.xz 1574984 BLAKE2B a8e6c7be07816b49f7194ece223a3ee35608736e69c0390e5f67691135706f1e993df53b3e4cb5b1f3d6850ff546444efc477419ca1b5f5ca2fa490124f6c373 SHA512 6a84b353d75b48649af507cb747688115b35268bc0303554afc9684bbfec4f9c3b2d93d89fa64480ede07bb4fb1eabe360b6eccd11e58691ce9f955f329c615f
-EBUILD vinagre-3.22.0-r3.ebuild 1645 BLAKE2B 8adf6013a17f11c8ad98c958240b999d63a7b3a29495b851f734c9817b6631d2daab5569dd34b1868b0470a84466fe8d4342c2cbf123ffd0c5fffed523faf6d8 SHA512 ee85bc7f32f3942be6dc86a9d4ad3230e6216ddf14350bddbfbd7cd8d32f69c7ccabd3a5c1a4bb9e921042df8f97992ae0ce4acc066ea89d66b11fb73a432d1e
+EBUILD vinagre-3.22.0-r3.ebuild 1649 BLAKE2B 879c8af71284485da26297599f484fcf84395a3836b6c0409ed39144bc98f1b02abdf5b6758f91b2241647a6eee23c0ab4c86bb92b6988e81bb6fbe56abb0440 SHA512 90ecf342cd46f26ee8d655f4a77877711547e841b8a37b94bfe17b2256f184dac30b18cda90789a0e6569c9eec92298c5039e8cb65599347bf7ec931645b3eea
 MISC metadata.xml 550 BLAKE2B 6f81c1e289dfcf1839030e45752fb4970ea84b3f8f8d187ae476f4fdbbce15739b8a5857b87bd4b426936f90554a9346f7abf3b9c60624fb39af4f6e2fab1b98 SHA512 3dbf3930996cc2cd2fd0ced60858094f3628eb08688fbec8d0bbf59880727e18f23402de48e04ef086924543d3d0085c9f75e4b070a5b3f6a4877774ade98840
diff --git a/net-misc/vinagre/vinagre-3.22.0-r3.ebuild b/net-misc/vinagre/vinagre-3.22.0-r3.ebuild
index c35cb1fa332a..681c6aac3fd8 100644
--- a/net-misc/vinagre/vinagre-3.22.0-r3.ebuild
+++ b/net-misc/vinagre/vinagre-3.22.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Vinagre"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86"
 IUSE="rdp +ssh spice +telepathy zeroconf"
 
 # cairo used in vinagre-tab
diff --git a/net-misc/vino/Manifest b/net-misc/vino/Manifest
index 705c11f73431..4bcb38852f67 100644
--- a/net-misc/vino/Manifest
+++ b/net-misc/vino/Manifest
@@ -1,6 +1,6 @@
 AUX vino-return-error-if-X11-is-no-detected.patch 1102 BLAKE2B 145b468e06bfa8b7abb18c1209761a2ca2314ffc92f04fe419ef0722eaed6a30b5a2e8cbeb8923e1b0cf072ba988ea9c3031fe2816df8632c3e123f643c70221 SHA512 6342507c051d81fbcbf8d2f8ce5005b60da0ba6a1f725c3aabb164c310b7c17a92f1aaeedc69873b47ba35041ff5ab7d75b762d5f9bfa70d967864e3cafb2596
 AUX vino-segfaults-on-wayland.patch 1172 BLAKE2B c8e3b9316309f78975123cd3ac87fd53d8fd498be5927a2188dfbddf5ac5316febf71ff5297466e95d079e9dfe8bf4a034c1b45320000c683f5e264527a870dd SHA512 e1d9a489643ce46259ebd830ccd906dbe65675ff57cb2d405b584acbf6c67e3a3f34f051c6ab5bd5fb5d40bd873225b36801b87030c30c0c764d3d5a72095f23
 DIST vino-3.22.0.tar.xz 768716 BLAKE2B 5c3f6df059f129009bbc97527d1767bc8a29d8cbff5e6f9e89dabc4583ffdae2cf235eec66cbcb5f9e73c9a0a7c05a504e4e90221bf5adfc2ecbbbd518fdc84a SHA512 29b88e151b0b8c69bce1565ae3ec2e788f48c7645429984329fb2d3daaf03cc5ac100abbf70247bf0516c6d03a3b9aeb78d018c8f1bf35fd241919117fd1105f
-EBUILD vino-3.22.0-r1.ebuild 1826 BLAKE2B 85fb2ff4fd4fb836446af3f811d2935d3d2e27bf218add0123f3088c2813166fde1cd8e5497a1dd7496daa64da262c1f353d019c0d3944a9d861cba11eae01bc SHA512 06302279add1afa2b9f8ce1f2cc3dddba599c8aee7bbdd5874b0149ee2a2e03aae19d015abf001019599514077d4acd99b3415e41ee04b454eeb2f837c588d1c
+EBUILD vino-3.22.0-r1.ebuild 1833 BLAKE2B d9ebd597e4818b24017e3fb74579b30b82eaf06190fe2942748f30517d67d157e039de4910ddf964216a51f13ca5769c1d7ca14bcd8f41be032e602a2a53bdee SHA512 7adab9c71ee1bf5a4b064732008c54935c6565cdff3ad8a0fbf3da4914f5d60b0b154f28867b39a2a5bfbd136312b9ea9b8e28c119d89100a7c6d9c7c772ad93
 EBUILD vino-3.22.0.ebuild 1651 BLAKE2B 345994ec32582e2fd99fba1dd860557119976ab09dd34aff5ea8aa01c9cf6658181522178cc8818f39114452016c172331fe0055edebbf333d80732d8e9145e3 SHA512 5d2e83be516cde4164c4c5a5067ab789ebd95fcc0133680cf2714db10677728fca0ce70d2d3790e236315399098df532610a0a0f74b3ca7585b9daec09b4c1ae
 MISC metadata.xml 343 BLAKE2B 92816370ecc7d4e3b9d3f4513ee7c437b98ea3ca798107beb1b4885ab778768e19a20dbf8a3c19dd1c6d2b812a2498a9d1e2b4f4211dad0f350f620420a523e2 SHA512 dc33b648174ba60a62212dd252f1d358ee7a05ddbd41ae2b31dbdf362f4f780207c5183c0b180d68c8df5a613e91c1336231f2d75100076a01517e4d70d8252d
diff --git a/net-misc/vino/vino-3.22.0-r1.ebuild b/net-misc/vino/vino-3.22.0-r1.ebuild
index 9f17a92230a7..a5f2d4aab9be 100644
--- a/net-misc/vino/vino-3.22.0-r1.ebuild
+++ b/net-misc/vino/vino-3.22.0-r1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vino"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="crypt debug gnome-keyring ipv6 jpeg ssl systemd +telepathy zeroconf +zlib"
 # bug #394611; tight encoding requires zlib encoding
 REQUIRED_USE="jpeg? ( zlib )"
diff --git a/net-misc/wol/Manifest b/net-misc/wol/Manifest
index f8d85c7dbc89..18477ab1aa24 100644
--- a/net-misc/wol/Manifest
+++ b/net-misc/wol/Manifest
@@ -1,3 +1,4 @@
 DIST wol-0.7.1.tar.gz 445648 BLAKE2B 80e34ee5a588f7caec92c17d3455abec8227789c30dcde46ecbb75d2f5d7f2a852f6a8c11dea54c036e63db73e28f6d2aaa32bbf7b5708f23c9005f163a17f5f SHA512 233cbd038633c4b04a22710c04a8349d7706c6b4ff0554b6899ee3309349502a318f6fb05a4ad4c80cd373c362b2ad8818cb52a432d768f569e80f05658615a3
 EBUILD wol-0.7.1-r1.ebuild 401 BLAKE2B 6ff91aaa835637c8d15ca4dece6ce25b3572720a60bac41551a106c95091b212be200c693269c94762952ec9dcf6097a6a58121b6d45f6af27ce5b78316bbdf8 SHA512 cb1396eb681e2bd3b09ea4b3c5327995c12e58f608e8685de7507a393feba86011ab31b2564e8a660c60834691720e54d7293810a4b14703a8cfbab57e18e78c
-MISC metadata.xml 561 BLAKE2B 344241901a3c2bcf8e8ade94b85a82c7583c8d9cc6c29b4ebf98b65bea8b0bc8f31e9c52bd57d2a7333dd2822919072cd2c7321c5fcef15e148a3f3d2439eb48 SHA512 8aa78cfbac54569a85944717b43010ce99e69bc9e7af00132bae751d821a5239ca6a09f5640e38dc142c3758edfc6a58a9ba758a5f67cdb8d4a853a36ae5b163
+EBUILD wol-0.7.1-r2.ebuild 484 BLAKE2B 9adcd4458a21f78c7a97180cbca000bcefb96f1ade4b50fdddaf1b01d745aa576d76429c142e463ed5b9bb0731877dfcb03031f938cd89d8fd4024fbbca1e5b1 SHA512 0bd4f65e476f23f3f4c0e4733e99ec1f4ff7cf3ef30a099ca65682d087f7b5e7ce02de3191f12afe184e8430fe7dc2fda8b01d6b4daacc8649f697f1970f3550
+MISC metadata.xml 735 BLAKE2B 6c3b6199ccb776a5ad5b817d70e72da0416207f98fd3b7bcf082f98088e592535da06571fe4f77c82d40b456e55271f3084ccff2f64e4c5cd610c31cd24c44e8 SHA512 0cff2c4127942f5dc455beeb78c63a271451a7ae38e03e53dace85c64353fc9214e803f67d39996289096b19e60ec2ae5ff3a4be61dd7a2570d9c9864182fcb7
diff --git a/net-misc/wol/metadata.xml b/net-misc/wol/metadata.xml
index 86ddb1d0fd53..b00b64532dec 100644
--- a/net-misc/wol/metadata.xml
+++ b/net-misc/wol/metadata.xml
@@ -1,13 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <longdescription>
-wol implements Wake On LAN functionality in a small program. It wakes up hardware that is Magic Packet compliant.
-Consider you have a sleeping or turned-off computer and you want to remotely wake him up. Just type
-"wol MAC-ADDRESS" and the host wakes up (OK, it will boot ;-).
-</longdescription>
-  <upstream>
-    <remote-id type="sourceforge">ahh</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>ck+gentoo@bl4ckb0x.de</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>
+		This is wol, the Wake On Lan client.
+		It wakes up magic packet compliant machines such as boxes
+		with wake-on-lan ethernet-cards.
+		Some workstations provide SecureON which extends
+		wake-on-lan with a password. This feature is also provided by wol.
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">ahh</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/wol/wol-0.7.1-r2.ebuild b/net-misc/wol/wol-0.7.1-r2.ebuild
new file mode 100644
index 000000000000..7879c04f3c20
--- /dev/null
+++ b/net-misc/wol/wol-0.7.1-r2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Implements Wake On LAN (Magic Paket) functionality in a small program"
+HOMEPAGE="http://ahh.sourceforge.net/wol/"
+SRC_URI="mirror://sourceforge/ahh/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="nls"
+
+src_configure() {
+	local myeconfargs=(
+		--disable-rpath
+		$(use_enable nls)
+	)
+
+	econf ${myeconfargs[@]}
+}
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index 78ff399eafd8..eda1125f620b 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,6 +1,4 @@
-DIST youtube-dl-2019.07.16.tar.gz 3168500 BLAKE2B b88eb21c246b021b036822461a55b4c0fe1b0b4cc462a32c55f022c67a586fbbb98d8a943558c3b08289ff3cfaebd12adf558ef8a31cbf47b6679da5ed771417 SHA512 7dc71913210669521684ac0484ef02d20d7ce500d8fb72581d4f8c2978b369582ee003ea4e908e262cf1f7cd734b4e989d667a1fa36d6cf19e9fc0723c55d411
-DIST youtube-dl-2019.07.27.tar.gz 3173039 BLAKE2B 8dfab65d0f30f01905fb19cdbcccb61aca955ce11fe9751bcad38542b879b97b5707bdcd9efd23c6769c9c76a6f78d6c074ddbc4ff3fa6fb52941e07a014a4db SHA512 f5d6d79097f5937d0ad0d491d922573d8fb288179d58475041783a7d245e9c200038856705e19cd74b156578594cff4cd09f9925c4fb915ff34ef4072be62ed5
-EBUILD youtube-dl-2019.07.16.ebuild 2119 BLAKE2B 82163aa22bf146600523fbb31e67d22af5a7a591e6b0c3900ca992f89fb45ec4536000872934b8a2d3beeb0a2d25ead1e8a500878c4db5dc70611d7609e00a0f SHA512 93ba6d18d95c861af5a8224e7ca8ee9947198e3e0b3a66e0bb70e5beb12a2b0bdbd004c5f619a97e6b30985ef3581ebaf163ca69a2dc1d2345de0ebb3c01f81c
-EBUILD youtube-dl-2019.07.27.ebuild 2125 BLAKE2B 50e06196444aee277e8bc2a72c762b76b7de6a9616f3ec6ccd76cfff696c4fcbb6e2c64022fcd5536708441a9009fb06b424fd7cbd86b7a58cee8108f908c6f0 SHA512 ee93e8557d67c11a7ead1bc1f0fefaec1f331aeea30a2fe93efd913d5a866380b62ba8a02d1115fb257d1989818a06eeea4e00d9acc35fe8feee147b8d6ed5b5
-EBUILD youtube-dl-99999999.ebuild 2014 BLAKE2B 55abeec62089210469af6edf2cde4f8764eb1a5d20a3cd96985dce8a833023e5dd2e44cc893a7db99d9002fc671601fabd1c26cdbfa0fc0411a9ba11e1715b78 SHA512 bbbfb4e6e8319e383eaf4db4dd4056f34374eb6f1527c6cc1c6ee0d9f61199a913bc99f929bd91ef80aa744ba9a865833395460d8b94125c362c59372f738346
+DIST youtube-dl-2019.08.13.tar.gz 3177273 BLAKE2B 927b7bfe128738efbb5023817ccbcf635b6f7f3741f3f794bd8af377cd7c203ae4466818d03ee717f5196124c3a46c5bf9c1e1a92438a295a453786bd8ec3ee5 SHA512 0b5066f3ce93bc0ffa3f9c3aefe4154daae38e78449a8b5825ecf032252f8fafde893f1325809b3d9fecf28ca1c2539d941b90acf204c5bf68783e79fcd28c61
+EBUILD youtube-dl-2019.08.13.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.07.27.ebuild b/net-misc/youtube-dl/youtube-dl-2019.07.27.ebuild
deleted file mode 100644
index a8b1afbfc11a..000000000000
--- a/net-misc/youtube-dl/youtube-dl-2019.07.27.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"
-PYTHON_COMPAT=(python{2_7,3_5,3_6,3_7})
-inherit bash-completion-r1 distutils-r1 readme.gentoo-r1
-
-DESCRIPTION="Download videos from YouTube.com (and more sites...)"
-HOMEPAGE="https://rg3.github.com/youtube-dl/"
-SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
-LICENSE="public-domain"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-RESTRICT="test"
-SLOT="0"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	${DEPEND}
-	|| (
-		dev-python/pycryptodome[${PYTHON_USEDEP}]
-		dev-python/pycrypto[${PYTHON_USEDEP}]
-	)
-"
-S="${WORKDIR}/${PN}"
-
-src_compile() {
-	distutils-r1_src_compile
-}
-
-python_install_all() {
-	dodoc README.txt
-	doman ${PN}.1
-
-	newbashcomp ${PN}.bash-completion ${PN}
-
-	insinto /usr/share/zsh/site-functions
-	newins ${PN}.zsh _${PN}
-
-	insinto /usr/share/fish/vendor_completions.d
-	doins ${PN}.fish
-
-	distutils-r1_python_install_all
-
-	rm -r "${ED}"/usr/etc || die
-	rm -r "${ED}"/usr/share/doc/youtube_dl || die
-}
-
-pkg_postinst() {
-	elog "${PN}(1) / https://bugs.gentoo.org/355661 /"
-	elog "https://github.com/rg3/${PN}/blob/master/README.md#faq :"
-	elog
-	elog "${PN} works fine on its own on most sites. However, if you want"
-	elog "to convert video/audio, you'll need avconf (media-video/libav) or"
-	elog "ffmpeg (media-video/ffmpeg). On some sites - most notably YouTube -"
-	elog "videos can be retrieved in a higher quality format without sound."
-	elog "${PN} will detect whether avconv/ffmpeg is present and"
-	elog "automatically pick the best option."
-	elog
-	elog "Videos or video formats streamed via RTMP protocol can only be"
-	elog "downloaded when rtmpdump (media-video/rtmpdump) is installed."
-	elog
-	elog "Downloading MMS and RTSP videos requires either mplayer"
-	elog "(media-video/mplayer) or mpv (media-video/mpv) to be installed."
-	elog
-	elog "If you want ${PN} to embed thumbnails from the metadata into the"
-	elog "resulting MP4 files, consider installing media-video/atomicparsley"
-}
diff --git a/net-misc/youtube-dl/youtube-dl-2019.07.16.ebuild b/net-misc/youtube-dl/youtube-dl-2019.08.13.ebuild
index 4d80cb2b49ed..8b7913f66a7d 100644
--- a/net-misc/youtube-dl/youtube-dl-2019.07.16.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2019.08.13.ebuild
@@ -6,7 +6,7 @@ PYTHON_COMPAT=(python{2_7,3_5,3_6,3_7})
 inherit bash-completion-r1 distutils-r1 readme.gentoo-r1
 
 DESCRIPTION="Download videos from YouTube.com (and more sites...)"
-HOMEPAGE="https://rg3.github.com/youtube-dl/"
+HOMEPAGE="https://github.com/ytdl-org/youtube-dl/"
 SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
 LICENSE="public-domain"
 
diff --git a/net-misc/youtube-dl/youtube-dl-99999999.ebuild b/net-misc/youtube-dl/youtube-dl-99999999.ebuild
index 9bfa589db4fa..f30b1cfa0a04 100644
--- a/net-misc/youtube-dl/youtube-dl-99999999.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-99999999.ebuild
@@ -6,8 +6,8 @@ PYTHON_COMPAT=(python{2_7,3_5,3_6,3_7})
 inherit bash-completion-r1 distutils-r1 git-r3 readme.gentoo-r1
 
 DESCRIPTION="Download videos from YouTube.com (and more sites...)"
-HOMEPAGE="https://rg3.github.com/youtube-dl/"
-EGIT_REPO_URI="https://github.com/rg3/youtube-dl"
+HOMEPAGE="https://github.com/ytdl-org/youtube-dl/"
+EGIT_REPO_URI="${HOMEPAGE}"
 LICENSE="public-domain"
 
 KEYWORDS=""
diff --git a/net-misc/youtube-viewer/Manifest b/net-misc/youtube-viewer/Manifest
index ffd3435d4eba..f610218dc397 100644
--- a/net-misc/youtube-viewer/Manifest
+++ b/net-misc/youtube-viewer/Manifest
@@ -1,8 +1,8 @@
 DIST youtube-viewer-3.3.3.tar.gz 232856 BLAKE2B 68f3529edeaeb443203f1c6bf4a9967346a5015d05d40ffeca65a1deeacb73cb9bd7fbc79ed2c70f161c82a03df8461b3d39b071ccbe480b10d4259eba08d430 SHA512 ca624c456d33aa804398f71f1dd4a095f7b9ca5ae5a1cb255b9e8a3dea671a8b0f986977428e797f1fc1f96d69087a66c71185e37cc521d668c036c4e7a5825f
-DIST youtube-viewer-3.3.4.tar.gz 232892 BLAKE2B d39d6406a664ea911ee6db76311b6526c5a962a10be45222613a54f5b11a34c81681389f9e6c9569076161444212a75d0a1053a2939b899a4935f391cc100300 SHA512 fc8a1c7ebda5efc7d1e32b211c3fe301e84db393fd6be06c026dd12903ad7a3dea7bc5b24e3125d55e0b56140a2d0fb2bf2ce001d3cde7792b8e4a3590496c7e
 DIST youtube-viewer-3.5.4.tar.gz 237736 BLAKE2B 900cd48025d28a1077f909a740d94824c07cc9d0c0fb0954c16fc79dd5bb7db53431fdadf4fca2ebb89b3fabc61801bd64bf8f042bbd70d53f1616d9fd74fcbd SHA512 60da8bd6017eeedb299ac5b226fc3094823a5dab8db938b603f4630724590dae5acc03c6ad609b8b3f3b0f2149bb37398d018893da7b2fde762f9f795bdaf618
+DIST youtube-viewer-3.5.5.tar.gz 238922 BLAKE2B 8e5b57f5e83ce53b3249e948e141042a4dff019e201718c5a75d5577a349707add5f2d4a6e5a53ff4968394b0b54df43bdee4933e9d4fe9ef62b6ed489a54678 SHA512 6e73565e7b8ba415e0f056a402804510af2d2d3e833daf3254330f75b404a21042318441d52b9b7ecb6659a693189c43a9b9148be4d3e154d4a1d23b402e8a63
 EBUILD youtube-viewer-3.3.3.ebuild 2025 BLAKE2B 390f88f32c0c4bfaca84c8265ac73dc1b712868b481d949f15f0c96bd83b780e42039d2d422faaaeeea557c5794164abe40694d4dd74c36e9e2519ef42661933 SHA512 2fa5e47ed3c5dca68f1176c26a468862c4e9f31782a8dc7328aca3754791114fb0f4090cd4936468c8b04f485919701eaa6c4a56301866dc7ddbe6eb97a0f726
-EBUILD youtube-viewer-3.3.4.ebuild 2027 BLAKE2B d090963e37b0a6198e6aaea0c358c860b36c59c8201cef648c42acb59d970aa28283eb63d1dc1173be74624e7161d4a284f0a2757416bce826a1cd68ba9c47a1 SHA512 a62061be86dfe9a526790673f3c47ce60146537956cbc2d1f1b0c64cdfec6954044662d770ac74ad8e3b8245f4da9e6c194d5175631a81e82deb89494f2f97b8
-EBUILD youtube-viewer-3.5.4.ebuild 2079 BLAKE2B 7757729231aff1136e15af651df558b62f015d0da273111ead2085461e52b65e3f5fb70df8fe132231ae4f1e80d99ac48e5f64191d9695c85985b58b23d16648 SHA512 72ac6fe280939c42eeaf44c6e2d2827db79eda151d88dd212ac6d378f70607e1e816e74429acd2d241a967fbb9d4e2376b3706965df8bb5bfda471a02d976d5c
-EBUILD youtube-viewer-9999.ebuild 2252 BLAKE2B 5cb27656f5f6ff899760f9f200ea3ddaae1f3a721bbeff90b8b7c3fe4b0c38f09b2ce7cc9be2a19cbd7b41c03d54426cc1e2e1d62dab1038d866b27e876e6875 SHA512 15f2acb1b4346ada4d71913569ef91852657ac52861ff89b6b7952903ef20c6a9bcb438f89a024aaab030c9e0a4820c2f0cab08a7ce4fbe92884a5d3e4044f04
+EBUILD youtube-viewer-3.5.4.ebuild 2077 BLAKE2B aeccdf3f4c52ef9c7c1d87fcf73abbaae60ed073379e8d49296555cefa04a8a4a35377a5813701de4434473efd9b7f93122b4432aab38f713b5840a16c28533e SHA512 e643fd7e4b39e992619b4c16acc4fbd23ff5227348a3d0379a67cb4608164c7115bcd5737db3e3be4075182ed963aa646e194715ea19162ad3698a4701e55181
+EBUILD youtube-viewer-3.5.5.ebuild 2079 BLAKE2B 7757729231aff1136e15af651df558b62f015d0da273111ead2085461e52b65e3f5fb70df8fe132231ae4f1e80d99ac48e5f64191d9695c85985b58b23d16648 SHA512 72ac6fe280939c42eeaf44c6e2d2827db79eda151d88dd212ac6d378f70607e1e816e74429acd2d241a967fbb9d4e2376b3706965df8bb5bfda471a02d976d5c
+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.4.ebuild b/net-misc/youtube-viewer/youtube-viewer-3.5.4.ebuild
index b41e4a52107c..c3fb66845352 100644
--- a/net-misc/youtube-viewer/youtube-viewer-3.5.4.ebuild
+++ b/net-misc/youtube-viewer/youtube-viewer-3.5.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/trizen/youtube-viewer/archive/${PV}.tar.gz -> ${P}.t
 
 LICENSE="|| ( Artistic GPL-1+ )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="gtk"
 
 RDEPEND="
diff --git a/net-misc/youtube-viewer/youtube-viewer-3.3.4.ebuild b/net-misc/youtube-viewer/youtube-viewer-3.5.5.ebuild
index 0a797691ff7f..b41e4a52107c 100644
--- a/net-misc/youtube-viewer/youtube-viewer-3.3.4.ebuild
+++ b/net-misc/youtube-viewer/youtube-viewer-3.5.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -63,6 +63,7 @@ pkg_postinst() {
 	optfeature "faster JSON to HASH conversion" dev-perl/JSON-XS
 	optfeature "the case if there are SSL problems" dev-perl/Mozilla-CA
 	optfeature "printing results in a fixed-width format (--fixed-width, -W)" dev-perl/Text-CharWidth
+	optfeature "live streams support" net-misc/youtube-dl
 	optfeature "threads support" virtual/perl-threads
 	elog
 	elog "Check the configuration file in ~/.config/youtube-viewer/"
diff --git a/net-misc/youtube-viewer/youtube-viewer-9999.ebuild b/net-misc/youtube-viewer/youtube-viewer-9999.ebuild
index 94ebef6a27a5..42baf31b22b6 100644
--- a/net-misc/youtube-viewer/youtube-viewer-9999.ebuild
+++ b/net-misc/youtube-viewer/youtube-viewer-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,12 +16,11 @@ KEYWORDS=""
 IUSE="gtk"
 
 RDEPEND="
-	>=dev-lang/perl-5.16.0
 	dev-perl/Data-Dump
 	dev-perl/JSON
 	dev-perl/libwww-perl[ssl]
 	dev-perl/Term-ReadLine-Gnu
-	media-video/ffmpeg[openssl]
+	dev-perl/LWP-Protocol-https
 	virtual/perl-Encode
 	virtual/perl-File-Path
 	virtual/perl-File-Spec
@@ -37,26 +36,21 @@ RDEPEND="
 		virtual/freedesktop-icon-theme
 		x11-libs/gdk-pixbuf:2[X,jpeg]
 	)
-	|| ( media-video/mpv media-video/mplayer media-video/smplayer media-video/vlc )"
+	|| ( media-video/ffmpeg[openssl] media-video/ffmpeg[gnutls] )
+	|| ( media-video/mpv media-video/mplayer media-video/vlc gtk? ( media-video/smplayer ) )"
 DEPEND="dev-perl/Module-Build"
 
 SRC_TEST="do"
 
-src_prepare() {
-	perl-module_src_prepare
-}
-
-# build system installs files on "perl Build.PL" too
-# do all the work in src_install
-src_configure() { :; }
-src_compile() { :; }
-
-src_install() {
+src_configure() {
 	local myconf
 	if use gtk ; then
 		myconf="--gtk-youtube-viewer"
 	fi
 	perl-module_src_configure
+}
+
+src_install() {
 	perl-module_src_install
 
 	if use gtk ; then
@@ -65,19 +59,14 @@ src_install() {
 	fi
 }
 
-pkg_preinst() {
-	use gtk && gnome2_icon_savelist
-	perl_set_version
-}
-
 pkg_postinst() {
 	use gtk && gnome2_icon_cache_update
 	elog "Optional dependencies:"
 	optfeature "cache support" dev-perl/LWP-UserAgent-Cached
-	optfeature "better STDIN support" dev-perl/Term-ReadLine-Gnu
 	optfeature "faster JSON to HASH conversion" dev-perl/JSON-XS
 	optfeature "the case if there are SSL problems" dev-perl/Mozilla-CA
 	optfeature "printing results in a fixed-width format (--fixed-width, -W)" dev-perl/Text-CharWidth
+	optfeature "live streams support" net-misc/youtube-dl
 	optfeature "threads support" virtual/perl-threads
 	elog
 	elog "Check the configuration file in ~/.config/youtube-viewer/"
author	V3n3RiX <venerix@redcorelinux.org>	2019-08-18 18:16:17 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-08-18 18:16:17 +0100
commit	fc637fb28da700da71ec2064d65ca5a7a31b9c6c (patch)
tree	326613a08f25851c388715e205576a2e7d25dc4f /net-misc
parent	b24bd25253fe093f722ab576d29fdc41d04cb1ee (diff)