gentoo resync : 08.05.2018

13 files changed, 42 insertions, 247 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 2153cfc2f401..e633fc1ebbcf 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/mikutter/Manifest b/net-misc/mikutter/Manifest
index 518a34df2332..3ad3ac0fe40f 100644
--- a/net-misc/mikutter/Manifest
+++ b/net-misc/mikutter/Manifest
@@ -2,6 +2,6 @@ AUX mikutter 136 BLAKE2B ba1a252d63dc3a190f61ad3f0489ac7222a90d48dc01cdaadb24f02
 DIST mikutter.3.4.2.tar.gz 3684733 BLAKE2B 37bf96e06fd22af2979ba7e3cb76fa8267a051d93e5e143111ef1107596a84533435d2ff596322c246601fc4de46a066c131f8a1e0a881bc35e2c7f19c02469f SHA512 bbdde61324825e9c7d4ffa6b6dc004f74c512391c1b1a538d7c72672f6aa68c3b68c579d1a2a3db13d25b909dc497195fcd7f0d66c88c8d1b2856508e965418d
 DIST mikutter.3.5.4.tar.gz 3743674 BLAKE2B af166219af2a36e84c4e13209830d12be6e085e6c76fa101c265c40bc85d465f50f56311783b647f10ec0021450fd45ca411643e7612e8225df6c9e75ac83be1 SHA512 adb7a1902026ee01737840d0b7f9004ab363e874e01f7c497bd9252fccb3cc16f86f1959bb2eff3d309cb7ba1fa93376d9a1e46d5226859a1279069de7f2ba8e
 EBUILD mikutter-3.4.2-r1.ebuild 1629 BLAKE2B fb2035377a631b85ff4a946a1ad2f93e518878209bc6a6a3077b3128321985b2c8b049e07acf5d4a35d650dc657232a665e1540521a3c24c6339463af780b920 SHA512 2f2edc68199ae0a8a8c5a359ed556cda531296f1583a8df7f58600aeaa6f37c780bc4186642733de8a95dd0826e8b7b718d85f8f1cbc9c06c62ed35fe58a2a97
-EBUILD mikutter-3.5.4-r1.ebuild 1629 BLAKE2B 4419b8cebc1d9dad6dea497b4c56d45b0bceb93a45d82fab76f6d2ea8c95592a1bcb531f1627e3cc1193777e9b7d8999d17f32a039337e90b8945986c294f40f SHA512 02c66c4ca66fe2626adccf2d87c7b8f6722f21f8f63e3ba1bcddf9c66390dabade1fd3f45a141e7d03136ee896dfd84bfe726e9973c54023725f6239364cfe33
+EBUILD mikutter-3.5.4-r1.ebuild 1629 BLAKE2B 1fefca3c2d9e10e7e6df2e8bb557a3aa1df3bf2834a0ba9658a93f09409a636d5c6b778e8dff230e79134f17e019dd4931c2cc42de313ef3cac5545a77595a9b SHA512 99bf96b72853df0af06cc3fcb445fe12d7cc836764dcbac960ee0ab992f6a772378c791ce5d6f7baf0d7a595365b2cbbc0c949d632a0bc13ad528b3259a84403
 EBUILD mikutter-9999.ebuild 1623 BLAKE2B b458e44c51fa3b1cd1ea153702d06b0d3a8349c8449f2cce01aae953331066920e31cda48238d402b2914054da0f4794f4bc5ca45bc7ab226f542cb573334348 SHA512 fd7f856bab0e839fdaefba6ed4ff74d42c7d823fb71af3a9ffd8cd25a1c7790764049fff77002a16f91eab1537662bd0b19b3cc95cc1d62109483ac3879c099d
 MISC metadata.xml 214 BLAKE2B 8c736c7fcedf2d2c712e43cb3a7850254057fca17f9ec3647598d76e726cd4eea542ce40b339abb3f96a56b17a3f355d9508a5980dd7c7e243bbc19b68a6a5b7 SHA512 3950e95b95a325c58612d9c601ee4c59714d0387574f31bc8ac8eb35305082413aebe00435aeca391fe8dc72a0901aef3ee68ee0da10a14e88908ae766d637c3
diff --git a/net-misc/mikutter/mikutter-3.5.4-r1.ebuild b/net-misc/mikutter/mikutter-3.5.4-r1.ebuild
index 141beca0bbbd..3e15d01d0712 100644
--- a/net-misc/mikutter/mikutter-3.5.4-r1.ebuild
+++ b/net-misc/mikutter/mikutter-3.5.4-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-USE_RUBY="ruby22 ruby23"
+USE_RUBY="ruby23 ruby24"
 
 inherit eutils ruby-ng
 
diff --git a/net-misc/networkmanager-fortisslvpn/Manifest b/net-misc/networkmanager-fortisslvpn/Manifest
index 020cc198cf28..9d5c14c21be4 100644
--- a/net-misc/networkmanager-fortisslvpn/Manifest
+++ b/net-misc/networkmanager-fortisslvpn/Manifest
@@ -1,8 +1,8 @@
 AUX networkmanager-fortisslvpn-1.2.2-location-fix.diff 776 BLAKE2B f99aadbccb50dba28a1e7921cce2353ee0f3b20639de2cce9ca12c997e4d6a8165df7a18a8ec85766b48a9b620176efc08439d74bab516df6a9edcb52a712b85 SHA512 a233657d82b1f60dd154e211991f3ec2ef1fea34d447690d8a864bcafe3451853bc3de56457b4185838c79d4337669902f9dd9a9067a15aaa6fb24404c1304d0
 AUX networkmanager-fortisslvpn-1.2.6-location-fix.diff 1257 BLAKE2B 1ea633c11ec59a634c570873cac3f6c9203cfeb66a60d1056613e794b7dfa9d21331a0abca7ef1f1aff4f8c1317808431a318042963153ee93c92d596fb5440c SHA512 586e408a65cc83cc3e0e8238eab673b484188eb7e7d62c8bc14abaf05a82acff24f9281a904624fe45aae08b0804e7516c393d7ef52f1c2dcbb4949f23873bca
 AUX networkmanager-fortisslvpn-1.2.6-nm-utils-dependency-fix.diff 747 BLAKE2B c12251887128e21f7025f6a111aa9d022899ace86000ba84e8e139ca02500e60c584b21d101f74c4326a422a299badd62647e1779059fe0425652eebb4b973b2 SHA512 a1701ddb5fcc49ceafd8d87c4a5e50dd7aeebfe32ba589f28c931dc93274531a16a0414db6e79fecfa4c03c182c7824cd3504d76234d544d488a5fdb3b34b9c4
-DIST NetworkManager-fortisslvpn-1.2.2.tar.xz 294576 BLAKE2B 2cf672ad8b523cbfa42da5cda9ec3b56cd257f0993e4177aa9f0b285714e46241068df011cb2dca94b89a3950b4ac551040210c12717f59bd8753cb07fb77a38 SHA512 db9660107e3ce9dec436ad0aeaba922b1a883a016ad19bb1946b310f2b97168451c72803f5f6fceec68ca766fd30720dc8b6d5fcdcd8f52543bc707341c30737
 DIST NetworkManager-fortisslvpn-1.2.6.tar.xz 324048 BLAKE2B 1e3aeab2df0b91b09fba1678861215f164251dc1f51c12c0cdbb4c53c939849d75c5f70552e608a11a0c9c7890a15d5dd4b218c7c440c92bfa8df157ff20babf SHA512 5f1bd180a810ca778bfc4d58522e827281a941f6a9b63bcbcadf42f94edadbe556db6693d77a55f42422fa657b37fc64df9480f4ae691151fa65688247bce69d
-EBUILD networkmanager-fortisslvpn-1.2.2.ebuild 980 BLAKE2B 77e826b700471b91a62658fbbe2b77e1eba31b490367111fa7ff8eafa72fec620188571a932ec9d3fe52fb178cb0079f6ea7c7a002177360772eb552f203bd30 SHA512 2cafbc99f5cbc3111249a1a5a55bd633f5111507186079b46f90685f0db317fcb5db85bbd7de0d70daeccbec1b6a0102b3255f098d45a453971373f0aaa578e5
+DIST NetworkManager-fortisslvpn-1.2.8.tar.xz 325100 BLAKE2B 9449bbec99ee50c2c0b9cc1a74d8714e71995c17d2c1fa206134b71a1ea448be8fd86711ce0743f38e86ccd330eb7bc7e4cb57c2093001ac1b301b00e5c8f25e SHA512 5a602b872b1efbd8d9ed2f32d05ec8560f0a923dfdf58e7a775010ee2182790b8cbe7c2a6c8d1198eba47c66fddecf178e1c454d1ac74c10a63c75c603eeafc8
 EBUILD networkmanager-fortisslvpn-1.2.6.ebuild 1062 BLAKE2B 0dd5ce66bb75b9bc0924b3c61574fe74f28456c1f4b400fb99cc67f95352c5531c6fb3ce9119353b6d7140a5e1a352e33fb0bf3d15b6d61d3b4cba888c5a6c85 SHA512 90842eecb134600932468239e539350849c5c024021fc10b77a06f557fb71e6eecad349403d4b64185e7045d3f1944027641ab3a882984e1e3f07463e1fe8360
+EBUILD networkmanager-fortisslvpn-1.2.8.ebuild 844 BLAKE2B 649a06b13be09e83275f5d8aa08482253c33f1264936194115bf0afc9eaf30e6838de233507e834dbb33cbdecbaccf07f5e3d2ddbb783535289c21d96bdfb2db SHA512 eff8d97e20af7e5bee68dd1b5322d9e16afd7fdc12d78cbb9b285b9758010c1fcd9c0aebdd1fe5e3b3b5adb7e250106fed60517e889a804eaeadfd5321535dd4
 MISC metadata.xml 380 BLAKE2B 68402a902953176bf28ebc6521a06c109cbf2a448c184665cef3ab42ec6b1f7f426a31b7714275e215ae742ff79b2fc7b5c4d80046f8a15b5a73fa5d6a05ebf1 SHA512 ebbe00af25885a8178a56f6b8341a75125c506dd8e374cb061acaefb8f0bddd0678d7231cc2eb13a319b1fb8a080f6c2d66fdbdd8aa022a7dc1216dac6c53c89
diff --git a/net-misc/networkmanager-fortisslvpn/networkmanager-fortisslvpn-1.2.2.ebuild b/net-misc/networkmanager-fortisslvpn/networkmanager-fortisslvpn-1.2.8.ebuild
index 8cae2a63466a..83207b80082a 100644
--- a/net-misc/networkmanager-fortisslvpn/networkmanager-fortisslvpn-1.2.2.ebuild
+++ b/net-misc/networkmanager-fortisslvpn/networkmanager-fortisslvpn-1.2.8.ebuild
@@ -1,10 +1,12 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
+GNOME2_LA_PUNT="yes"
+GNOME2_EAUTORECONF="yes"
 
-inherit gnome2 autotools
+inherit gnome2
 
 DESCRIPTION="NetworkManager Fortinet SSLVPN compatible plugin"
 HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
@@ -15,7 +17,7 @@ KEYWORDS="~amd64"
 IUSE="gtk"
 
 RDEPEND="
-	>=net-misc/networkmanager-1.1:=
+	>=net-misc/networkmanager-1.2:=
 	>=dev-libs/glib-2.32:2
 	net-dialup/ppp:=
 	>=net-vpn/openfortivpn-1.2.0
@@ -31,17 +33,6 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 "
 
-src_prepare() {
-	# Upstream patch 377ba9ca7fb33f3fb2ba5258a5af666869947597
-	eapply "${FILESDIR}/${P}-location-fix.diff"
-
-	eapply_user
-
-	eautoreconf
-
-	gnome2_src_prepare
-}
-
 src_configure() {
 	gnome2_src_configure \
 		--disable-static \
diff --git a/net-misc/pipes/Manifest b/net-misc/pipes/Manifest
index 3a3595ce9463..3b0aeb29ba26 100644
--- a/net-misc/pipes/Manifest
+++ b/net-misc/pipes/Manifest
@@ -1,5 +1,5 @@
 AUX pipes-1.16.1-execlp.patch 603 BLAKE2B fb36b8f00c05b8f0fef930757da458d1f571ecda4487cf5641417d9a79548e28212c1a12599b69a068d55a2e5cb991de0c37b787e13516965122e949bac5db40 SHA512 ad28dab392c962fc476ca6596a0609dbee2a3f6300b27daaaae5b5e44c3c94154b682bc749697be20373b530b228d45170193e085e96bbcbfeff7190746767d7
 DIST pipes-1.16.1.tar.bz2 21642 BLAKE2B c5725244f7ac0b77ff3ac3d753ff96ac7d853cd1e7cb0ab82a14decc6ad6ec94503426be712e1b9117a6e95a95939c5d9e91d9f31eb397c96182fac8f7148100 SHA512 ff8f6cf7934149c3d8a6e0443a06840863313acccd31791913fa25b086173e834d8f357212811e5e1ddb62148d3e687858e8956065734f11d7fc729f2a64b0a3
-EBUILD pipes-1.16.1-r1.ebuild 655 BLAKE2B 57c0bdf1fdf4fd7b9ee871d0cda6af5ebc8e985b8658a1ff8167482d618884ee7dcd008d158f665b0c2123f46100242df67abc0450aa5411f4f45e75ed6bd22e SHA512 be0218f5426382ba7ac4aab51361fdb8670de2638e0dc99b50e6d8f955d2fd8eed00be4e0fcb27b1accab661f174155821995f0859ff5438cb53aafa077555c5
-EBUILD pipes-1.16.1.ebuild 649 BLAKE2B 3444b2bb041d4f8384f0416839352f1ada2936ff73cc8085756f7e241bd46c38a3074d622ffc37f97a492740b72aedb69c4199268cfa1b4dc22d03ae54bd21ac SHA512 1e8aa77ed31a3d7028e57825eee3853c5bfd40e8bd497219f68366574a78fa5c1b9eba34764d957ba370e17f23f0f29dff8aa68e0c28307257dadfd26a30c3d1
+EBUILD pipes-1.16.1-r1.ebuild 657 BLAKE2B 64845e9d87e9b791720bb3c857f9341c760aca6fa4de58c94dbb3dc6369390d168cc8e5ea21f3a4f345aa38109fae1ccab5c81b246d0b69acdda4a3ff6504920 SHA512 0016c7a59f8369c60a9eb21bb48f1233acc6718bd2a8344d1afa0dbaefdd493e66e9952e26df75a39423a2917405e518984b098c92fa69f2dbc3d6fc2fd7c436
+EBUILD pipes-1.16.1.ebuild 651 BLAKE2B 1d3813f820580d35973a0e894fe5292f8f306e8290ed46b76b43abbfb09b4e258250d658d6daa28f5c8814c867830f9d99834d0cce1b0d2a643c5847c36ae5c6 SHA512 4bcb6448d66a00fc8fc2148100dd08608faef613208036272eb8e412592496da13887a15251694d9626a9149b0b7820f08a9a1d5cdbaa41e6c207a02422032f0
 MISC metadata.xml 1243 BLAKE2B 018079999961b4720d9f6999852b0c6d90ed32d08ac9a2084659d35ccccfd9db602a5ea6540928e1dbf0f942ea06f9cc9358231a0d041eea5aa8620f6a61079b SHA512 64f85cdfbd01bc948cc78a5b0a7816d45583c861cc45144ff0b4547b704516a5151d18b19a99be58ad666f3dcbcd866c215e5a24c237c7b97a35e689841316e0
diff --git a/net-misc/pipes/pipes-1.16.1-r1.ebuild b/net-misc/pipes/pipes-1.16.1-r1.ebuild
index 7d8cc7dd125f..7f0bb0e9c86f 100644
--- a/net-misc/pipes/pipes-1.16.1-r1.ebuild
+++ b/net-misc/pipes/pipes-1.16.1-r1.ebuild
@@ -5,8 +5,8 @@ EAPI=6
 inherit toolchain-funcs
 
 DESCRIPTION="Very versatile TCP pipes"
-HOMEPAGE="http://bisqwit.iki.fi/source/pipes.html"
-SRC_URI="http://bisqwit.iki.fi/src/arch/${P}.tar.bz2"
+HOMEPAGE="https://bisqwit.iki.fi/source/pipes.html"
+SRC_URI="https://bisqwit.iki.fi/src/arch/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-misc/pipes/pipes-1.16.1.ebuild b/net-misc/pipes/pipes-1.16.1.ebuild
index b27bf4a83e1b..99191300b44d 100644
--- a/net-misc/pipes/pipes-1.16.1.ebuild
+++ b/net-misc/pipes/pipes-1.16.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,8 +6,8 @@ EAPI=5
 inherit eutils toolchain-funcs
 
 DESCRIPTION="Very versatile TCP pipes"
-HOMEPAGE="http://bisqwit.iki.fi/source/pipes.html"
-SRC_URI="http://bisqwit.iki.fi/src/arch/${P}.tar.bz2"
+HOMEPAGE="https://bisqwit.iki.fi/source/pipes.html"
+SRC_URI="https://bisqwit.iki.fi/src/arch/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
index 45b8bb0451c6..a4dbc24083ea 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -6,7 +6,6 @@ DIST tigervnc-1.4.2-patches-0.1.tar.bz2 7361 BLAKE2B 5e4aed97f3b1e88488f1f080b11
 DIST tigervnc-1.8.0.tar.gz 1433830 BLAKE2B bdbe0e11a1459dc6328c7c54e8062f0628b952e33fcbe6ffe93c1b2148b52a17fd99fcae333b2eddf5256ffd0376a83634521473c2cd8937ba95b69bf133c796 SHA512 c066e9781622e342667bf03fd6bbb94ed17b412b07c46764b7b73b2eb308c285e865cf1e901f7d218db05a0486fb3f8877e75da3c939ef0d020247713779327a
 DIST xorg-server-1.19.1.tar.bz2 6041792 BLAKE2B 1c67fe74812af15cb77d2e128c92466e11b3da7c984f585cdf58aa5f157a4b254ab2a58ce2f74e87d454ef1e0bf665f2b34a189c98b194c4c5e801b31f006d8c SHA512 37d413fdd96ce6b15ae20ca5028331498586044cfc7a6ab0acb99201b04063c69bcd06867f2dc33237b244ce2870a1c5a4be3cbe4560f2461894f46f8d5dbdd7
 DIST xorg-server-1.19.5.tar.bz2 5965044 BLAKE2B 23375793ea4459a962f412440e307081ce2acd3c646e5db4d1bfac20e267bcbb1752ba8f6de66df06d25eaf92d1b55082a80eced0d44c257a757d5926ca6a7f3 SHA512 928dea5850b98cd815004cfa133eca23cfa9521920c934c68a92787f2cae13cca1534eee772a4fb74b8ae8cb92662b5d68b95b834c8aa8ec57cd57cb4e5dd45c
-EBUILD tigervnc-1.8.0-r1.ebuild 4579 BLAKE2B 2100ceaed621bf414fa0a906ce425a30be56a8f946f82b8dd10b94b314a575670c88fa95902d5182cb7fb253b6399cd8e26441526b31b13f5fe34a9c08ce712a SHA512 57e1233a4e19d556bd86886dd62fcfc53b966a3fa45cfbc311618db3d31ca01d3216cd6af03c52293c277856e271a09a337a68207ec2d5b5e0e25b800453995b
-EBUILD tigervnc-1.8.0-r2.ebuild 4665 BLAKE2B 60d2397a6c90a09c58a92af26f92ba4c81b0d01cac9c64506d85b0c2fcaf5ad9d294795508c5e4dcc76920c4357228a5f87cdb8ff11ae9918034c21da5c6f1ae SHA512 57ab001805e332b202bbfcba8aa7466d405ea62273eed49ef3d00b2e2e5b547c471426989a39e8f74c14080d8b72ed2edd4d509f575aa15dc0c74fd219993220
+EBUILD tigervnc-1.8.0-r3.ebuild 4320 BLAKE2B f20dd6c1c9e408e1f3d72c86f5075c360cb2f026222b21337734587d0ff3c2bccecbf34964fcd9308b998cf6f44cbc7b2a9b8e0416cf80aeaae83aad6501946e SHA512 6e46a65f89214ed204f96e674ac7a12eb20fd2a9f3f76c601cd4f9e998d9aa36e3d10cd5dce1cef46fee068bf6fa0fdca449fb7635331aca0e5f9f1c8fce0276
 EBUILD tigervnc-1.8.0.ebuild 4541 BLAKE2B 69e2048ec440910bf941f0d60826243d1ee3c156d614c2abb1a0bb32b62887119fad4d02e6babd0888f339864bf1ca054cb93f4f5bd034ce958e752b48eb770d SHA512 24fc22d60a36d37c5c62df2cf2e20f0852c4797285baf4ab50d5a97395ee7129cfde1758fe280101f3664320e14aceb7548d4265cefbb48351ac3cd0526a8d45
 MISC metadata.xml 725 BLAKE2B 9ea0092828f41c3ef3617f10918436795dd5af0397288f0b0c20debc5aded651c5fa6d2afc5c7b011b5480ea820d42c567cd6b22c822dd16895ce9445310981d SHA512 65f32dbbc20c53f154f87a01bf88bc0e73493921ff73c2b3b482e1c9fc7a3159cf6a94d1d7cb830bb60fd8da2b8ef77cbdd2a3cad329634ea82dd4f288f69deb
diff --git a/net-misc/tigervnc/tigervnc-1.8.0-r1.ebuild b/net-misc/tigervnc/tigervnc-1.8.0-r1.ebuild
deleted file mode 100644
index 745ac50ae663..000000000000
--- a/net-misc/tigervnc/tigervnc-1.8.0-r1.ebuild
+++ /dev/null
@@ -1,190 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_IN_SOURCE_BUILD=1
-
-inherit autotools cmake-utils eutils flag-o-matic java-pkg-opt-2 systemd
-
-XSERVER_VERSION="1.19.5"
-
-DESCRIPTION="Remote desktop viewer display system"
-HOMEPAGE="http://www.tigervnc.org"
-SRC_URI="https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~armin76/dist/tigervnc-1.4.2-patches-0.1.tar.bz2
-	server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.bz2	)"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE="+drm gnutls nls java +opengl pam server systemd +xorgmodule"
-
-CDEPEND="virtual/jpeg:0
-	sys-libs/zlib
-	>=x11-libs/libXtst-1.0.99.2
-	>=x11-libs/fltk-1.3.1
-	gnutls? ( net-libs/gnutls:= )
-	nls? ( virtual/libiconv )
-	pam? ( virtual/pam )
-	server? (
-		dev-lang/perl
-		>=x11-libs/libXi-1.2.99.1
-		>=x11-libs/libXfont-1.4.2
-		>=x11-libs/libxkbfile-1.0.4
-		x11-libs/libXrender
-		>=x11-libs/pixman-0.27.2
-		>=x11-apps/xauth-1.0.3
-		x11-apps/xsetroot
-		>=x11-misc/xkeyboard-config-2.4.1-r3
-		opengl? ( >=app-eselect/eselect-opengl-1.3.1-r1 )
-		xorgmodule? ( =x11-base/xorg-server-${XSERVER_VERSION%.*}* )
-		drm? ( x11-libs/libdrm )
-	)"
-
-RDEPEND="${CDEPEND}
-	!net-misc/tightvnc
-	!net-misc/vnc
-	!net-misc/xf4vnc
-	java? ( >=virtual/jre-1.5:* )"
-
-DEPEND="${CDEPEND}
-	amd64? ( dev-lang/nasm )
-	x86? ( dev-lang/nasm )
-	>=x11-proto/inputproto-2.2.99.1
-	>=x11-proto/xextproto-7.2.99.901
-	>=x11-proto/xproto-7.0.31
-	x11-libs/libXfont2
-	nls? ( sys-devel/gettext )
-	java? ( >=virtual/jdk-1.5 )
-	server?	(
-		virtual/pkgconfig
-		media-fonts/font-util
-		x11-misc/util-macros
-		>=x11-proto/bigreqsproto-1.1.0
-		>=x11-proto/compositeproto-0.4
-		>=x11-proto/damageproto-1.1
-		>=x11-proto/fixesproto-5.0
-		>=x11-proto/fontsproto-2.1.3
-		>=x11-proto/glproto-1.4.17
-		>=x11-proto/randrproto-1.4.0
-		>=x11-proto/renderproto-0.11
-		>=x11-proto/resourceproto-1.2.0
-		>=x11-proto/scrnsaverproto-1.1
-		>=x11-proto/videoproto-2.2.2
-		>=x11-proto/xcmiscproto-1.2.0
-		>=x11-proto/xineramaproto-1.1.3
-		>=x11-libs/xtrans-1.3.3
-		>=x11-proto/dri2proto-2.8
-		opengl? ( >=media-libs/mesa-10.3.4-r1 )
-	)"
-
-PATCHES=(
-	"${WORKDIR}"/patches/030_manpages.patch
-	"${WORKDIR}"/patches/055_xstartup.patch
-	"${FILESDIR}"/java-utf8.patch
-)
-
-src_prepare() {
-	if use server ; then
-		cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/. unix/xserver || die
-	fi
-
-	cmake-utils_src_prepare
-
-	if use server; then
-		cd unix/xserver || die
-		eapply "${FILESDIR}/xserver119.patch"
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	use arm || use hppa && append-flags "-fPIC"
-
-	local mycmakeargs=(
-		-DENABLE_GNUTLS=$(usex gnutls)
-		-DENABLE_NLS=$(usex nls)
-		-DENABLE_PAM=$(usex pam)
-		-DBUILD_JAVA=$(usex java)
-	)
-
-	cmake-utils_src_configure
-
-	if use server; then
-		cd unix/xserver || die
-		econf \
-			$(use_enable opengl glx) \
-			$(use_enable drm libdrm) \
-			--disable-config-hal \
-			--disable-config-udev \
-			--disable-devel-docs \
-			--disable-dmx \
-			--disable-dri \
-			--disable-dri3 \
-			--disable-glamor \
-			--disable-kdrive \
-			--disable-libunwind \
-			--disable-linux-acpi \
-			--disable-record \
-			--disable-selective-werror \
-			--disable-silent-rules \
-			--disable-static \
-			--disable-tslib \
-			--disable-unit-tests \
-			--disable-xephyr \
-			--disable-xinerama \
-			--disable-xnest \
-			--disable-xorg \
-			--disable-xvfb \
-			--disable-xwin \
-			--disable-xwayland \
-			--enable-dri2 \
-			--with-pic \
-			--without-dtrace \
-			--disable-present \
-			--disable-unit-tests
-	fi
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	if use server; then
-		# deps of the vnc module and the module itself
-		local d subdirs=(
-			fb xfixes Xext dbe $(usex opengl glx "") randr render damageext miext Xi xkb
-			composite dix mi os hw/vnc
-		)
-		for d in "${subdirs[@]}"; do
-			emake -C unix/xserver/"${d}"
-		done
-	fi
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use server; then
-		emake -C unix/xserver/hw/vnc DESTDIR="${D}" install
-		if ! use xorgmodule; then
-			rm -rv "${ED%/}"/usr/$(get_libdir)/xorg || die
-		else
-			rm -v "${ED%/}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la || die
-		fi
-
-		newconfd "${FILESDIR}"/${PN}.confd ${PN}
-		if use systemd; then
-			systemd_douserunit contrib/systemd/user/vncserver@.service
-		else
-			newinitd "${FILESDIR}"/${PN}.initd ${PN}
-		fi
-	else
-		local f
-		cd "${ED}" || die
-		for f in vncserver x0vncserver vncconfig; do
-			rm usr/bin/$f || die
-			rm usr/share/man/man1/$f.1 || die
-		done
-	fi
-}
diff --git a/net-misc/tigervnc/tigervnc-1.8.0-r2.ebuild b/net-misc/tigervnc/tigervnc-1.8.0-r3.ebuild
index 7c2bb8fa5d0b..8455670a3d6b 100644
--- a/net-misc/tigervnc/tigervnc-1.8.0-r2.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.8.0-r3.ebuild
@@ -22,17 +22,19 @@ IUSE="+drm gnutls nls java +opengl pam server +xorgmodule xinerama dri3"
 
 CDEPEND="virtual/jpeg:0
 	sys-libs/zlib:=
-	>=x11-libs/libXtst-1.0.99.2
 	>=x11-libs/fltk-1.3.1
 	gnutls? ( net-libs/gnutls:= )
 	nls? ( virtual/libiconv )
 	pam? ( virtual/pam )
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrender
 	server? (
-		dev-lang/perl
-		>=x11-libs/libXi-1.2.99.1
-		>=x11-libs/libXfont-1.4.2
-		>=x11-libs/libxkbfile-1.0.4
-		x11-libs/libXrender
+		x11-libs/libXau
+		x11-libs/libXdamage
+		x11-libs/libXdmcp
+		x11-libs/libXfont2
+		x11-libs/libXtst
 		>=x11-libs/pixman-0.27.2
 		>=x11-apps/xauth-1.0.3
 		x11-apps/xsetroot
@@ -42,7 +44,6 @@ CDEPEND="virtual/jpeg:0
 		drm? ( x11-libs/libdrm )
 	)
 	xinerama? ( x11-libs/libXinerama )
-	dri3? ( x11-proto/dri3proto )
 	"
 
 RDEPEND="${CDEPEND}
@@ -54,31 +55,25 @@ RDEPEND="${CDEPEND}
 DEPEND="${CDEPEND}
 	amd64? ( dev-lang/nasm )
 	x86? ( dev-lang/nasm )
-	>=x11-proto/inputproto-2.2.99.1
-	>=x11-proto/xextproto-7.2.99.901
-	>=x11-proto/xproto-7.0.31
-	x11-libs/libXfont2
 	nls? ( sys-devel/gettext )
 	java? ( >=virtual/jdk-1.5 )
-	server?	(
+	x11-base/xorg-proto
+	media-libs/fontconfig
+	x11-base/xorg-proto
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libXcursor
+	x11-libs/libXfixes
+	x11-libs/libXft
+	x11-libs/libXi
+	server? (
+		dev-libs/libbsd
+		x11-libs/libxkbfile
+		x11-libs/libxshmfence
 		virtual/pkgconfig
 		media-fonts/font-util
 		x11-misc/util-macros
-		>=x11-proto/bigreqsproto-1.1.0
-		>=x11-proto/compositeproto-0.4
-		>=x11-proto/damageproto-1.1
-		>=x11-proto/fixesproto-5.0
-		>=x11-proto/fontsproto-2.1.3
-		>=x11-proto/glproto-1.4.17
-		>=x11-proto/randrproto-1.4.0
-		>=x11-proto/renderproto-0.11
-		>=x11-proto/resourceproto-1.2.0
-		>=x11-proto/scrnsaverproto-1.1
-		>=x11-proto/videoproto-2.2.2
-		>=x11-proto/xcmiscproto-1.2.0
-		>=x11-proto/xineramaproto-1.1.3
 		>=x11-libs/xtrans-1.3.3
-		>=x11-proto/dri2proto-2.8
 		opengl? ( >=media-libs/mesa-10.3.4-r1 )
 	)"
 
diff --git a/net-misc/wget/Manifest b/net-misc/wget/Manifest
index 7e3a21ddf34f..a398a9b8a9bf 100644
--- a/net-misc/wget/Manifest
+++ b/net-misc/wget/Manifest
@@ -4,9 +4,9 @@ AUX wget-1.19.1-CVE-2017-13090.patch 1167 BLAKE2B 384c34c1999d564cf769998eaaef7a
 AUX wget-1.19.1-fix-Perl-warnings-in-tests.patch 3666 BLAKE2B ac176a5172f000ab32f62bfb8b6ff9c661b23b4d7525aaa37cf4018a7c1d9fe6b25359d1e46e9d83774a9b27dbf398f4040b9bf0fe0bb89438006a88158541bd SHA512 9f1b7ffded3422c995a51e346e3957024f4b5435cf51d491f3d4816620376539bffe2d3a7d7dcd03ca99828f06a21ebaa846b3a1755cd020a29f166c0fa2f7d9
 AUX wget-1.19.1-fix-Python-test-suite.patch 8721 BLAKE2B 7109cd205ae2ef07da8954093f8a3b7583944ba1dc965529b702e4db7c11df6c7d0765b8e22e231432f38d04f1d4c6a9b7521b65c050cabf0cff71f44130527d SHA512 e7905dc70c59e9c6b2fcc6c1a058fe98e8681492f034f2cd00aac5f1674d7dca0520bcf30d8b2563983bcb4388c6e35f66e772f833a364810f523784f8de3b19
 DIST wget-1.19.1.tar.xz 2111756 BLAKE2B e5dcaa791f78bb2d7de19a6f689430cd692e1232b7392102936e5f3b4e3592861bcfc78e27df0c4b02a9002ce4c755e765a0a51749670464789fc9f07f8787f7 SHA512 00864d225439bcb7c5af01d7ef19efa615427812d3320ab3f4c8f62c38191e837b1392397843f935d7dc5860a4d0ce89ee31f2730c4a729402f1f2bf3e5f64e5
-DIST wget-1.19.3.tar.gz 4311432 BLAKE2B 7c636465b1fe575531ec6616d27a07d3c4b398dda002eb4199d4c72906f233067a420f1c3a0878b3fe3cb9fae47a12cd50a83098f20f59ca6dd35bc37b1468a6 SHA512 8e1cbad2a31880befaf2c079bb17a357a135f6f2402048d27ac367430dbd932ef1b8197fb1002a64474e5480a8d9e41146b5cfd591d204b2f8b0bb240ecddb2c
 DIST wget-1.19.4.tar.gz 4310657 BLAKE2B 3f2e5a32e897101761d449f079bf9df38e60b68284230553b03280a6262e60b3d0b5af3bd9fdd334d09cac5ed3417c3a7e8736b1710f3a7402a123b4633b95e4 SHA512 e84b0c40235b160ade69e18f2f139c782eb2387edc97a847c11dbb906c0273daf6d0ef5afe20360ba965c7da8b5e109f5a45e39ea93d20ec945575203235943a
+DIST wget-1.19.5.tar.gz 4455797 BLAKE2B 988b80090ff1f62cb527afb33c03b7c6a68bbc1649d42f62061e05e416bebf5b2e9546ebafad3c9cdbf1199a8d2b84f4427c921f23338b02631da357da9b3d61 SHA512 0d4964e0f5adb0c023edc831bde9c9f13f3222f6efc1ce93250d234ab937e92b53921624532fb0e6586151ddfdee6df9a7ca91a2a99b3d16e2e68401c625301b
 EBUILD wget-1.19.1-r2.ebuild 3365 BLAKE2B b0fb802be67226322409b35fa6c99814e2747ae85fbfdd95344a49b1aacd8b8c0208848b24cffdd663d4bf0475b41474aa151d4f4bffd3caf1d937cd3e8d144a SHA512 ae46574e6e5bf12161278346fc32eb93c7dd4fc2e776ddebaed9bd857639d9a3c234a818000ba6361a82262d5ee3b05c390efeebd4ec1bf2b7a219e06449ff26
-EBUILD wget-1.19.3.ebuild 3187 BLAKE2B fdd1edc8d6721bfadedd62c3afe979dc111e8950242dd77aa314aa207f012452d6dde1cb9dca2d8366b6a58d3184657034deaf4faf1367127bf638d31753712d SHA512 12ea494dabd74b3f2532952fe07cc6c00753f0ea91b1606c9d4e6b96a7f6595da60be2bb4f8f8e227af4129c736fb72c62fedcbecb56a8ee0c3cc9c1c6a25a32
 EBUILD wget-1.19.4.ebuild 3187 BLAKE2B fdd1edc8d6721bfadedd62c3afe979dc111e8950242dd77aa314aa207f012452d6dde1cb9dca2d8366b6a58d3184657034deaf4faf1367127bf638d31753712d SHA512 12ea494dabd74b3f2532952fe07cc6c00753f0ea91b1606c9d4e6b96a7f6595da60be2bb4f8f8e227af4129c736fb72c62fedcbecb56a8ee0c3cc9c1c6a25a32
+EBUILD wget-1.19.5.ebuild 3184 BLAKE2B eb58bbb3d53028be59618c6bfd440f163212fa383b8bf1b804840c758bfb436d267973ea82e6496df4fc4cbbf0579910169a1e76a67bd01d60bb880f99098231 SHA512 7071883b57b6706466d733e1fd70b1bc1f7fb63bf80e5ad101dc7d1afde87cdb77f9e53d93cf38045ab300d8f77ab6b3e3405f445597ae782e5dcc25080e3965
 MISC metadata.xml 570 BLAKE2B 00d529ba0b6bcee7b6fc3937de69ead007ac57458c1afecf12cdd84a09637055d55725498e3c648311a494566eab32acc8d2e3de622086a4b599b5b40d0a2d1b SHA512 add9378a31ae7abc66d8dc6bfc3d355af3eb683ce177e68fbcbedb4b69435d7254b4cac1897d3b8267bddb23467e8f4bb16e439c09a4f91be16845b1113e055c
diff --git a/net-misc/wget/wget-1.19.3.ebuild b/net-misc/wget/wget-1.19.5.ebuild
index a4cc423b95ac..5de649dedc6c 100644
--- a/net-misc/wget/wget-1.19.3.ebuild
+++ b/net-misc/wget/wget-1.19.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/wget/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug gnutls idn ipv6 libressl nls ntlm pcre +ssl static test uuid zlib"
 REQUIRED_USE=" ntlm? ( !gnutls ssl ) gnutls? ( ssl )"