gentoo resync : 15.11.2017

23 files changed, 632 insertions, 12 deletions

diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 86cc66182476..6e7717975bdc 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -7,7 +7,7 @@ DIST curl-7.56.0.tar.bz2 2838517 SHA256 de60a4725a3d461c70aa571d7d69c788f1816d9d
 DIST curl-7.56.1.tar.bz2 2824548 SHA256 2594670367875e7d87b0f129b5e4690150780884d90244ba0fe3e74a778b5f90 SHA512 f8a602e6890b2791ea9199c80801ffd027980de3733d4ab001ee80b5167f840cc821c6fe7852087c88a471edc9d3f328cf660af3e2c6f7139d6c8de62b0ade68 WHIRLPOOL 428a2f90657cbe3fdc8a837b28f7ad7d80a1c1321a6976e885f79bc3a428c187e1fbc2c6ec48ffa99773aecb27647a46867c35b2fc0c29dbb6fb7f4e7d13f442
 EBUILD curl-7.55.1.ebuild 7028 SHA256 74a04321cd4ea3deb75fb08cd7c822ba28f4dac5add2eff3797c33e849bb5606 SHA512 84861e9e5edb6622c58c1a68f44365026ce328fbf26cab05948fdb7e6b7975328b0f46cbf18a2f749dfdb93727981d1147680d5235af0a36aebd6be74da666c6 WHIRLPOOL 6fecd0fee9c91312cff60846ccdff16038ace4de168d5b20d6005f5f1f5f2c2f3df15e83dd3f00a565b9d3a61cae983554c98034d44a52fce43f478e0c76c182
 EBUILD curl-7.56.0.ebuild 6968 SHA256 ace2b5c63d00b56f37f2469cd49daccef912b81a8e7fe0df52a81ca78ab59637 SHA512 a5d04df77ee897e1f516a9ae885dc76a5a575ab29afa6d5396d6667e5a081399c3dd6f2961464eb0a50dfa1cfdc72f4ae4eaf30b9fa9d85e152516aed39f2df5 WHIRLPOOL 622377aa37b18a90f5e32a82cbf910c2c16ec39e4e969f6171d962677d1dd80374a3589ef42038d9bad613c733c633f129afd169d32427ff847807537080582a
-EBUILD curl-7.56.1.ebuild 6960 SHA256 a527d1a6d5bf0d6302c02a3eb244090254587cbccd7ae0a493464a53291c5fe8 SHA512 0174f30e9d3357417d0dd9648d82bd8027282c0e9cd8be8dd46ef610fdecee1526728d0a82bf04c1399e803f54bfb86163985f7fc2d48fc0e959a02e8b6188a7 WHIRLPOOL 5b6db10ce3b6fe48101100c41cf252760aea1dd891c2860a085df22c2d20e1439a4075b9fc9e34a28a2df2dc3ffa04d71c4e19f5ac33f98cc9a8177228d6b9d5
+EBUILD curl-7.56.1.ebuild 7143 SHA256 9732810b151060cc0ebf82f51c2b7baac06a3b99b10e85dff4466d5a62cb9c6c SHA512 2088f8a01a06648fbf01492170582919b30792d46354683726b3a0a8d172f15f30102e84f7dffdaaa12be07cb0571a7773ef10df1de207fe2c39363e0d2f1885 WHIRLPOOL 2ae7ccec587e5b90a6cc027722c24c5dd0a325dd244e658a725dce731a60738ee7f6913c97bacd621f3c57f60075100537c9c0ba618edb9e048c841ca9da3159
 MISC ChangeLog 16015 SHA256 d7818e6e555538c789a1e06565284ef0aa229a2eb019fa2f4b667f961c919853 SHA512 76b6eb67198e504b72b2367929edcbb90cf252c0b26cf0526a3145a99d3a6004aed57761770675558a9f1445ee796d80cab12d647aea2676b21eb5acae8a9f97 WHIRLPOOL ac33e39317b19015bc478210a9ceaac3d8fd6497bc6217cd3c11b60e442e7f58e693690b8d22498b0862d703174ce72487f879639a7298459945cb680ba1a566
 MISC ChangeLog-2015 61885 SHA256 8589ecee2da6b3ef8823e053b3522234733a2273e7a6b18f0b47aaa9e678a1cd SHA512 d44de33943e2a8ed1eabc0bece3203f1794ffcc4d0a19898b67f82c2dfb54906ea3c09053421e13610218619577fd2b67e726a9cc5895e162a1ebf0a58038124 WHIRLPOOL 73c5089f0bdb1ca427591584ee4253e40418ed8a967f5e9f60775ec4d652868925c599f36f1708d39f8663fb734b74a301e4ea82050805639ed5a45cf45e6fd7
 MISC metadata.xml 837 SHA256 950e71139d4fc99ff18c0ec34b2ced72e933c6e311f0bbdb599fbc944db509e2 SHA512 27e75529e492f897705e249135c7ed661de04eef216fe62669fce544b8c318e44c5435b884fb8f206433293be894bbe1b6214b6cf1a394c9cb907dad48db00a0 WHIRLPOOL 93920381ae926c74157e2a0486cee5630789ce66b1aec25ead41a45f911ac7b2f87ad604f249c4ef03f2b7f19dfe567628140d34e753ea0fca10d2a3af3151e7
diff --git a/net-misc/curl/curl-7.56.1.ebuild b/net-misc/curl/curl-7.56.1.ebuild
index 8f1181532c05..c3aa96c58c0b 100644
--- a/net-misc/curl/curl-7.56.1.ebuild
+++ b/net-misc/curl/curl-7.56.1.ebuild
@@ -113,6 +113,12 @@ src_prepare() {
 	eapply_user
 	eprefixify curl-config.in
 	eautoreconf
+
+	if [[ ${CHOST} == *-darwin17 ]] ; then
+		# https://bugs.gentoo.org/show_bug.cgi?id=637252
+		sed -i -e '/-Werror=partial-availability/s/Werror/Wno-error/g' \
+			configure || die
+	fi
 }
 
 multilib_src_configure() {
diff --git a/net-misc/gns3-server/Manifest b/net-misc/gns3-server/Manifest
index 72740b905a04..49e4e961e5b5 100644
--- a/net-misc/gns3-server/Manifest
+++ b/net-misc/gns3-server/Manifest
@@ -3,7 +3,7 @@ DIST gns3-server-1.5.3.1.tar.gz 847598 SHA256 dca731d13c0d2d3e8a92b6a0a820f48562
 DIST gns3-server-2.0.3.tar.gz 1468528 SHA256 aba345436f3d7302ca6b1f39faf12e0124eaae25fb97d25783da44b516232200 SHA512 a9927e414f6fc6558cecabd006f9d123752b0b6e5b88408a53a6d1f195d22047ffdc3e4ccc6e132d04135c434174aa4b58f29deae9e952f83ccc678037f25b8a WHIRLPOOL 31b253d00f5857798c9cb867ec8260e832aaeda72840779184934ec7ec0d288b5331621e7ec58d9d15fc5006b50d375bef48f13526e2ad31b7a9bdb656773386
 EBUILD gns3-server-1.5.2-r1.ebuild 1400 SHA256 6bf92ec57fb35ed6ff3e24b9105656df1fee96bdcad83522dfcf0821489b727e SHA512 6c2ced2fea04bedbe512fbbf070c91007609d28220afb5d50530a3a7a065b21e8d61a4c217ab645c18cf866279d5f748032bded910a03356fe62206f0ce49ccb WHIRLPOOL f209b44ebbcc52eda21c42cac06fd514b5ad9eb4119b480868d0ea7eb76129adc5002a4f6185601262744b00c4bea76b3636708d5ed4609109523027d3ca85b6
 EBUILD gns3-server-1.5.3.1.ebuild 1589 SHA256 e7e38369dd94b1d89097808fe07140317180221f68ca27b1d69bfb71f71a486b SHA512 55cc83a0f392f71f72b65e97654dd54d986c91fcf92c713ba4e1795c5a9d19969942d80346a015ad2b342a9e9fcbbe386a5905311c3a3c4282b321aed0303c3c WHIRLPOOL ad9034121de32e6ca163a4b475533d8535121d6f44f81cef4469a8859b9b38581245aeff337104c478b73fb9a53a5b1967f7f96b11476027cfdfa50624b2ed18
-EBUILD gns3-server-2.0.3-r1.ebuild 1650 SHA256 aca9d60c8f6809bbef8add4fa350901cdad22b8afae30e2a3c6edccf2e0eafdf SHA512 bc606ebbe9c3019571af53a85b129b820314e2a11931b70d85110180697b8fb3b402bfae075e227f94a744a045f063e40d1f523e0983568b5b33ce9f52382c7d WHIRLPOOL 40dc2cb4139545c6c80ebf31daec04a44739ab0e2802fd43683c6d7e64ffba6a5159786f9bcb4a6b7513c82835114a36fcd52afd0b055c10bdc10aee1d90cd99
+EBUILD gns3-server-2.0.3-r1.ebuild 1650 SHA256 6a3d9d8a15c2a2a00c850428325eb65190f7656fe99671c32b3fde6d6e0e325f SHA512 db2473bef2d12c9bb9ee5db48dcf73f14a8919d3eeab23b4d2071034df3426c2a73ea155452aa8faa9ad98d446820cb689b09a0180c6e7f53172f25ca701dd19 WHIRLPOOL 8cb64df521cf6515edb79ba4ab8b02d12b77826dcd5eb83f160a8d0eae0e25ac37dcfbbfa2bf483a31435355a9ca7f1f293e4e32756f0870cc3e6435294a751b
 MISC ChangeLog 4853 SHA256 812cde4c8f0d67bf3d90d94bd4b9fac13159b975c26b63fcc5896defa7c6b64d SHA512 278a6d8a04ff41e12768b883568d7a91c5ef5e0d01a38e7d74bf4e3fedb53de186667956da151997d90a2053443f8345219d5887f715db2498fa4f9227abacf8 WHIRLPOOL 234a3d9c5004cbf9a8b8d4788293c1b028105e02f83b8ba646503b18723171af26c4e2d45507d897f41c0e3188b176db69abe6f729ae2d5912409567dc320e9b
 MISC ChangeLog-2015 1677 SHA256 be354caad1517ef6043426c755b3a2913419f21af3684a3897f9416b9f382cf3 SHA512 75b4cb38f31d3af199db662be124838980cf5e77224e809672b12dd5bdc83872b718c4e8800f274c05285155e22112dc73929ce3bb5b63c9739a48dfa3331707 WHIRLPOOL a1a54309236c9503d7e5ae06a1bb955015094b76e89d43d21344ba468ffc42fa13488020b1cd18d213b39c18b050ac24c848e501dc2e6b0116fdab4b7bf1b542
 MISC metadata.xml 318 SHA256 74c4b0a8f6d130f3957bfedd2a028e415e81383f87e88fa81a5c12bdb1c8f7e9 SHA512 dc536a1fe5c3823df1695330539be342f516f572adbee086dffc8d3d8b55141c0b081043b6aa673bd8d150e4a6211f82dd27119a5835bd0a87a33b6457c4a3cc WHIRLPOOL c8dddd0e37770c53c80ba07f7aa81fdad20f7c039402e63f1938e8af30d7ed1e640c0886238bc988d51136fbe50592c0329d135dd7f68b44cf2c6068dd88f309
diff --git a/net-misc/gns3-server/gns3-server-2.0.3-r1.ebuild b/net-misc/gns3-server/gns3-server-2.0.3-r1.ebuild
index 3b205da4bc24..667fc7a119c9 100644
--- a/net-misc/gns3-server/gns3-server-2.0.3-r1.ebuild
+++ b/net-misc/gns3-server/gns3-server-2.0.3-r1.ebuild
@@ -30,7 +30,7 @@ RDEPEND=">=app-emulation/dynamips-0.2.12
 		>=dev-python/python-zipstream-1.1.4[${PYTHON_USEDEP}]
 		>=www-servers/tornado-3.1.1[${PYTHON_USEDEP}]
 		>=dev-python/typing-3.5.3.0[${PYTHON_USEDEP}]
-		=dev-python/yarl-0.9.8[${PYTHON_USEDEP}]"
+		~dev-python/yarl-0.9.8[${PYTHON_USEDEP}]"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
 src_prepare() {
diff --git a/net-misc/memcached/Manifest b/net-misc/memcached/Manifest
index 772fd06a2624..791092e8b164 100644
--- a/net-misc/memcached/Manifest
+++ b/net-misc/memcached/Manifest
@@ -14,7 +14,7 @@ EBUILD memcached-1.4.33.ebuild 2624 SHA256 5e8fa07f214704a05ef63385ae8a2b78920ca
 EBUILD memcached-1.4.39.ebuild 2887 SHA256 0557ddb98d86c07429a5a5b01af5eba2ea3330b5fe779917ee641157235cdaf2 SHA512 0726d795ffbaa17ed04b3b307146742bd647ab6c2084a1e0f22b333b293ac6e15a7488d69fd166f2480c49c87b236f14e7d7d7642c40fe853097347e9199e706 WHIRLPOOL 2062c9871526025fdb86633dc211f25901aefa72f9d806e58ce667274e13464bf9145cf7c172a4a4f112241363bc824586be16419d946f51411869081c5908c9
 EBUILD memcached-1.5.1.ebuild 2903 SHA256 90149ac9457d7b15126a8ddd6295977c0f68ac387094fe06eaec9d0e520d1b91 SHA512 3d20f3405b30234652ea9fd75f6ae4842aac4153f4062703b6090cfb2f4691781e5a2e474cfd9b971a7ea2b2cef12cb1d12b3c9fcf18d2b5e7ba2955112085c6 WHIRLPOOL 2f346ce0fbbc02230fc854eee1d92cfc53cded2d5c3ce3aa14aeaff7c528b96583b7a3c7c69e84f7646a4db68d1c8ef21604738d2f4fa765eb2e7e213593d5d9
 EBUILD memcached-1.5.2.ebuild 2898 SHA256 84a6ecdb19a1aa2718a67ea4c9a2ffe99f112e4fec55fb555fe5e30e07879565 SHA512 6f77d52dd72cc12be893c36df6b1953bef5980e97d2fca15288b9fc5c826c1178ed6d780dfc7bca95606733c63320830a819f05b61f6d034131a42bb4ca98595 WHIRLPOOL beada655542fdcc41e7da95050315dfe3cebe4d19b74263ae5fef0ce89862fb4bc7b90915b4b87f283a63344406fb10c5e603604d6e9af50866df74837d7fd38
-EBUILD memcached-1.5.3.ebuild 2903 SHA256 90149ac9457d7b15126a8ddd6295977c0f68ac387094fe06eaec9d0e520d1b91 SHA512 3d20f3405b30234652ea9fd75f6ae4842aac4153f4062703b6090cfb2f4691781e5a2e474cfd9b971a7ea2b2cef12cb1d12b3c9fcf18d2b5e7ba2955112085c6 WHIRLPOOL 2f346ce0fbbc02230fc854eee1d92cfc53cded2d5c3ce3aa14aeaff7c528b96583b7a3c7c69e84f7646a4db68d1c8ef21604738d2f4fa765eb2e7e213593d5d9
+EBUILD memcached-1.5.3-r1.ebuild 2947 SHA256 b15f3f1ccd16070f1b052216cf30d6eb73288eb73a180a5b2f30e60062181dd7 SHA512 c34042999c6efe39d94a11175f4050b0ff83aa0b0a8d67f3cc50f0b21fd0590c0120134d22d87e0b28e858ebf4962d88c9c02c919ac4ba3130db25cda2a6a929 WHIRLPOOL b69d3363b134176fdb2281658efcdcf7552aa1c98aed8e8d5e765de992be0c797a75cca38a51b59f6aae7e269e3fb49048aaea9be3b0642800c2a12cff78e05b
 MISC ChangeLog 9513 SHA256 2f72df675f6c2041cda3cdb32f7a4f1314fda9417e8873fc24ab60950767e527 SHA512 9962bb124817964f19dceee258da39a00d1f95ab6929efc27d012920f1e2bdc290e5619603cceeb53d080ecf79c22ab9bc3628c923895002220e17cec357e22b WHIRLPOOL 828f0916052f66539e8b37f6c46e14064a2bab23d5066205dfed3049f695ac712d1029d401c85b68954a24f3a971369d05751d17c50564f97c71d7153966f692
 MISC ChangeLog-2015 29003 SHA256 a8e02533be3dc8071b69388e8c927edc33d54ce26b596a775f99a30698847eb4 SHA512 55fa88fdce9ff266070e8b5eab890a2418165bc6ab5c093f071acd0c3d218059d47a255281fc789c98869ac67b81aae4ae81111131d2dc5feb0457b54b6301a6 WHIRLPOOL e5fda7152db66bb75db44574d2c68f1272a4323498d25755b5a8f4b01cc684e6fd362c68c143df09b29dcbbdfb3f6fcf4b4291ac252fe28da60ebc705f194e82
 MISC metadata.xml 1134 SHA256 e189a8b1f9310663b1921d6279b993ea689153406a9058fbc977927c65e05068 SHA512 c3ce23016f9ea9067f6628f246866e3fcee6624f1a21360e448c7eebc3babd8fa3717966e58eeb0b6fd9885730609fa732a3e10b0a4dfaa57b0f0acc85c20bb4 WHIRLPOOL 9e1b630893ccee95aedb117e40d03de15605fb5085eea1bf687ca445b9972e8fc900dbed7bcf0d45bb351e3801e1849210d6517e8891bae7bf2fd004a207dc53
diff --git a/net-misc/memcached/memcached-1.5.3.ebuild b/net-misc/memcached/memcached-1.5.3-r1.ebuild
index 9e386070af56..ec97582ffbf3 100644
--- a/net-misc/memcached/memcached-1.5.3.ebuild
+++ b/net-misc/memcached/memcached-1.5.3-r1.ebuild
@@ -15,11 +15,12 @@ SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="test slabs-reassign debug sasl selinux" # hugetlbfs later
+IUSE="debug sasl seccomp selinux slabs-reassign test" # hugetlbfs later
 
 RDEPEND=">=dev-libs/libevent-1.4:=
 		 dev-lang/perl
 		 sasl? ( dev-libs/cyrus-sasl )
+		 seccomp? ( sys-libs/libseccomp )
 		 selinux? ( sec-policy/selinux-memcached )"
 DEPEND="${RDEPEND}
 		test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 )"
diff --git a/net-misc/networkmanager-openvpn/Manifest b/net-misc/networkmanager-openvpn/Manifest
index 35b75bbd614c..a8d2ec73f6f5 100644
--- a/net-misc/networkmanager-openvpn/Manifest
+++ b/net-misc/networkmanager-openvpn/Manifest
@@ -5,7 +5,7 @@ DIST NetworkManager-openvpn-1.8.0.tar.xz 530112 SHA256 166e1123ade1b322162b83876
 EBUILD networkmanager-openvpn-1.2.10.ebuild 1243 SHA256 5d13cba073020830242f5fad22dc1dcc10ff645abbb21117c4783620a1a5aaf6 SHA512 955a3cd12fff958a92408723971c478a3ff170171975cee1eec74c0c13bc551603286f96c5c0005705f563f56e28fa3a7c9b4d866ff3f9dbb9474b62d1f7dc33 WHIRLPOOL 8d5df4f8a45b19a133651d59b00070b771fc690b6f16d20c402969b72c6af57d346204d41072861668ab11ff91193b67cbe5d33522048bd67ee76464a312f832
 EBUILD networkmanager-openvpn-1.2.6.ebuild 1243 SHA256 5d13cba073020830242f5fad22dc1dcc10ff645abbb21117c4783620a1a5aaf6 SHA512 955a3cd12fff958a92408723971c478a3ff170171975cee1eec74c0c13bc551603286f96c5c0005705f563f56e28fa3a7c9b4d866ff3f9dbb9474b62d1f7dc33 WHIRLPOOL 8d5df4f8a45b19a133651d59b00070b771fc690b6f16d20c402969b72c6af57d346204d41072861668ab11ff91193b67cbe5d33522048bd67ee76464a312f832
 EBUILD networkmanager-openvpn-1.2.8.ebuild 1245 SHA256 234a539a6cc0ebf77faa1ec4f97124f0bf6a6b43128a9ce25cdc3d8d9c1d0bbe SHA512 caa8db384290d9bf0700e3b3c827a70283c8ddae7fe83b37736bae29010a542f075f8ce06337f3cbd7eb5bcb9cb56990f797fffd812e61be8bff3b51d3d44d27 WHIRLPOOL 7796beba48b6b4b74807184642ff41179367e5f1f91da5588be844f7ba2ff9821178bf3095fef99a21aad07d442c3217d8703cf6e2d48495ce6b058451041fd8
-EBUILD networkmanager-openvpn-1.8.0.ebuild 1240 SHA256 274b0fba78635dacd3e77aeb08fc2f99ab08ffc9fa0a26f2767bb52688d1d39c SHA512 8695481c9e4bc7f580ca24cdc8ecfdab688322d38019043b6fd03851484790561c689764d3063aa52b5d14e425ce1172691c914f50655ce55ed07fa05c84535c WHIRLPOOL fdcf4ad73767a492215515b21b9b8de6332f543aa20e97d4e57076487b7a140e9efcdc5bbc5be078cf8f715a8e6216e2c74607f817ff4c32483f54d34460feb6
+EBUILD networkmanager-openvpn-1.8.0.ebuild 1239 SHA256 492f5e3549e8ac564450a8251dcf826a8753f2690db7d2970e75b9ccff4f16f0 SHA512 68094ec0ee4d0094560a49e8c6abc41675f78edcdb72cf1f88b4945ef0a6a32c81f42560952b83b19e9e5106c9d7f366b0c3162e8ebadca2694f1351b4ad30a8 WHIRLPOOL cc8910ed116fa7ad4c92b362f0060fae31c1c8b48eb4f74d58e774a0a137f1e9ca4ea4696a1559aaa1bb3eb8c0d1d741c01260a9b4eabf6078958dd9f72aef01
 MISC ChangeLog 6211 SHA256 f2380c9cff2bf554d42c7e59f6f110bba3e5538d10c59519e7dedfb550038a13 SHA512 d67c67ef8813695dc23432e047d51be81322f8143377a7261ead6811f33b03c2b24fea5e5895613ce9d9ff3ba6396b07c244adaa4560f37c15c0e1f9c6f5a98c WHIRLPOOL f807fecc1858b4ad433fb7c002c518dff5db7772f01b282edf3447490ae6c2ae4cbdf21c9465d071237105511f7b67aed6cc5b797bc7b874561122d0eea6d12d
 MISC ChangeLog-2015 10215 SHA256 8a2dc9e16a52b5984d2662f79bd4d0e29019afdee312eac6071214c9104ddde5 SHA512 4141295a2b577c691a404e81350fff792628fc3a9a4dd9f968a1514ef178b1fcd3d941fabbc5acfb3f9c77e3cea3d5f4485c0c1be591aec63e1d6563b2456353 WHIRLPOOL ed7aa3cd25fd7dab23bcad9edc8bf065527d3feb0f63ff48a87227a4652e1f0aa83f632c5746c2e40c7f16086b57cc2619c48886e0f3baf2fc118303c255346b
 MISC metadata.xml 364 SHA256 e6a633c44ccc4f899313669263d9153e6d3166aa5652abd5b41d4620f73bd3cc SHA512 cb3d4cc4abb57bb9c1d0a0ecc8089999004059711de27d9457e4dd022d4f5f1a32c5115ee557395286e4c3d7c84f2ef7765c737ebd929524fd8ccb5e2b39c1e6 WHIRLPOOL a5e20ea714cf2b258d3384e537c7a51c63a9831e2305e57f13d0544fd2250dc684ad7471054f2b4a1660e61088bb9006488d69c36fc3539d73b2daf6bda907a9
diff --git a/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.8.0.ebuild b/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.8.0.ebuild
index a346930d477f..0f52e0906d8e 100644
--- a/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.8.0.ebuild
+++ b/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.8.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="gtk test"
 
 RDEPEND="
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index 5a198ea283bd..2878e2f255cd 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -9,7 +9,7 @@ DIST NetworkManager-1.8.4.tar.xz 3821500 SHA256 625e2eb36386dcae599075226200140d
 EBUILD networkmanager-1.4.4-r1.ebuild 11420 SHA256 5065691e58dd0e77431fefd34bab4bd7f0b7a20469d9e609bb4c2e08ba6dbecf SHA512 35e42a8b58ebbf86980c15807c010246a2e7b90ae537a039c481266393bc1975ce2f7576dfb8bebd65fed2eb090d053bb8accdc09732549ff586b0ac1a04a956 WHIRLPOOL 44bffe10d76e1bf2f8d3e782d1c911dffa8529acabba125e926228289756b39382011102cf9ae9496f6940b874f1c5bdcddee73f8fd24dded68b170454439ce1
 EBUILD networkmanager-1.8.0.ebuild 10634 SHA256 84ce9dcb011ab3c0b52f5ba389eaf91e07a0c76ee6c759469ff2aed49f72ee5d SHA512 540491cac8d661c19e36b425261b4c595045577f3194cac666e5d2aa7d8dfff09500ceb84f87532a2570637243412ec7f4240545e7180c3415e487e19618455d WHIRLPOOL c3343f6b90cebcd3db6283b293b70a6cbf66cf5342db6373d761ca3e0be71db6e6b4e76ecd4035b5896535808f50bd22812ff5bb2af2d0c96eb7054074722d14
 EBUILD networkmanager-1.8.2.ebuild 10688 SHA256 42f88c40ee6bce09ab611616e59943ae6fc29090113c39c53bb4dde006c6af81 SHA512 373537eb5ec7a6f002f4ba46d87a8e0b774700622a9155bd0eb5e712b65a98ab8f514c4f820abf8dce245677af53d203d7290afb8b8d25fdc8fecdb02e9d281e WHIRLPOOL 14beb42d478c0bc1c24ecbe269acafe03a104debde86038f670bd1a47875f0c1eaebab1312b97c5c5b9003bcda106a1d183f0f67c022981a5207438c9d68eb1f
-EBUILD networkmanager-1.8.4.ebuild 10687 SHA256 9ad0347f49e6466268c5f106fa965c5d72809d149480256f596bc78fc601cab9 SHA512 bae680cfe3a3f0f04d0d22e2bb31c1953cd95c2741929c6f612a052861a5fdc269ff0db3e21336f4fbe864212ddc5de002a165408bd4cfa60f7a02369b67f3c5 WHIRLPOOL 9a4be2e7ce096114bde0a583a5e9ec769c0c76e5373d30d2f49c9f6926919e4c237c85b905714bf630ff2a153bb75cfb67627aecb52a9f637e403a49675246a4
+EBUILD networkmanager-1.8.4.ebuild 10685 SHA256 93c2a6dcc23fe5b89d95b9898b42b1afee9f53db73fededdf01192c940e3ff22 SHA512 cb50f90af639e06e95ae4a531ae71202f1ae4f8d9ea763f83ff72a4573ea88f3ea50573e28283eb1fe2547f8ae0a676e1416482fce5127a83503e86a703f2d8f WHIRLPOOL a9c293ecc1217620de6dc1f64893840216a6b9bff5b13e771f247dff7ae2f1b623b34c56399e283bb5baa9d366c808387e2a44220c4abdc1743fcdfb82781f3c
 MISC ChangeLog 18350 SHA256 32926898bf2db151a74ce32b9a06757fca3ce9b0e46f0624ba42e2edd5f0f037 SHA512 1cda8910d73db5325233f3488dc7bbec5ef3ded472303da3cff4dac6dd11ae8ca37457c7cfd2469ab1f1f71baf27961b14de8f074f6c1cef90c167afb65c355a WHIRLPOOL 93f37ff54debe1d790388a18da90586781d0430d9daf7a42b7d6cc1140f7e13ae29ed532f8fdf7046a2e7fdecf9db42dae7ff49c05e0ad9fdf44775eb65582bd
 MISC ChangeLog-2015 56894 SHA256 2eecf2475336ee9b6c9f11e12711781286b88c0129dce40eed8a9d93401672e8 SHA512 bd721e9a4545fd7b66773665a111a33c9bff257a920ad06305c53dbb1b350b88b5f61ddbd6b11b2cd434cccfe558a37443fd413ac2570eb74009280f0f32a543 WHIRLPOOL 546065bc1c6f13b0b75d8019e144ccedcf76a07b62406f34098717d49eb4076c9aea1185d07e28fde7f1a133184de4fd71bd8c28fd458f5ff8b84fbb52db9aed
 MISC metadata.xml 1771 SHA256 ee2f0f65eaf3effc914d94105b1b44113cccd50ef09de57d6f37319406ed0a9f SHA512 4a61288c3e91ab8eb040053c706fe147e53fd1e9000b9597dc5b2f0920e08efd0e896f308e32758b4af6371b8fb9737f495355d0a9e2e95a9fd883bd10a8c535 WHIRLPOOL 2c91ccec729d06338d05ec4f3641607b4ac29e1228f9407964426db94c44b21d0fc473413395c9356e486b5c680cdd27a2468bf75ce164923aa874df83e9e1da
diff --git a/net-misc/networkmanager/networkmanager-1.8.4.ebuild b/net-misc/networkmanager/networkmanager-1.8.4.ebuild
index db737998cd47..65b1abaa6862 100644
--- a/net-misc/networkmanager/networkmanager-1.8.4.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.8.4.ebuild
@@ -26,7 +26,7 @@ REQUIRED_USE="
 	?? ( consolekit elogind systemd )
 "
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ppc64 ~sparc x86"
 
 # gobject-introspection-0.10.3 is needed due to gnome bug 642300
 # wpa_supplicant-0.7.3-r3 is needed due to bug 359271
diff --git a/net-misc/nyx/Manifest b/net-misc/nyx/Manifest
new file mode 100644
index 000000000000..e4b482e8f2e2
--- /dev/null
+++ b/net-misc/nyx/Manifest
@@ -0,0 +1,3 @@
+DIST nyx-2.0.4.tar.gz 4074259 SHA256 38db634789c2d72e485522a490397eb5f77c0bd7c689453efe57808c99dba75e SHA512 bb64b6c38bbfc9837215503a69b4a6b7a11b8a1e230f42c51a405472689a3d46d74dd06b2417c90512b63e9605b33198c5132b660f9eca037016a39c5e4f0ecf WHIRLPOOL 7984eb45f3c22f217c1bf6b42402be978eabe128416e9dd2351f47117afd308258be2385705f2eeea6a703348c5872b748b0ffa8f8a47fa2f8c92e8d220631e2
+EBUILD nyx-2.0.4.ebuild 532 SHA256 25af94cead2d834e7ad8f2b7a749541057da794c025e07a3326b53a3b60df2a4 SHA512 d1929d6236954df74741a5bd2398a1caded9134a708c9db8ebf3b3aa27df82b905ca6af8634094d0a7c3bafdb4414347f114788470df86680bb29767d2a68786 WHIRLPOOL 2a1f0c08e69febe8449d234d165604863fa465135527312b448d3bfdcde86e66922a2be6f783702e6a70860b0877a491dd22bd4d49ae0c0dd294a582d3257020
+MISC metadata.xml 328 SHA256 189efb0481d36278e19460d530c9656f85557dbf899bfe3d9cbc4e3f8332272a SHA512 65455e32f59242a36f241e854624f0c38bcbe69cc70eafe39e8df6fbd6e000faf58d04a0310d018377d3440ad55a282f1bc8dbf83fa411221f13068675944737 WHIRLPOOL 80bd46bbbad981ff7035ef3fd6208088fee6f60d7c51e2b48a9c97a21af5cbd918e02bd91da7b4a1df9f572a32867a4a2138d85ed05324832aa5cf5b95bc5e85
diff --git a/net-misc/nyx/metadata.xml b/net-misc/nyx/metadata.xml
new file mode 100644
index 000000000000..7407400b590a
--- /dev/null
+++ b/net-misc/nyx/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>blueness@gentoo.org</email>
+    <name>Anthony G. Basile</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">nyx</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-misc/nyx/nyx-2.0.4.ebuild b/net-misc/nyx/nyx-2.0.4.ebuild
new file mode 100644
index 000000000000..93d2f04eb224
--- /dev/null
+++ b/net-misc/nyx/nyx-2.0.4.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
+
+inherit vcs-snapshot distutils-r1
+
+DESCRIPTION="Utility to monitor real time Tor status information"
+HOMEPAGE="https://nyx.torproject.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="
+	net-libs/stem
+	net-vpn/tor"
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index 75ba7332c235..d1e79044d73e 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -1,5 +1,6 @@
 AUX openssh-6.7_p1-openssl-ignore-status.patch 765 SHA256 b068cc30d4bce5c457cea78233396c9793864ec909f810dd0be87d913673433a SHA512 ab15d6dfdb8d59946684501f6f30ac0eb82676855b7b57f19f2027a7ada072f9062fcb96911111a50cfc3838492faddd282db381ec83d22462644ccddccf0ae7 WHIRLPOOL c0a4ff69d65eeb40c1ace8d5be6f8e59044a8f16dc6b37e87393e79ab80935abf30a9d2a6babc043aba0477f5f79412e1ae5d373daba580178fd85ca1f60e60b
 AUX openssh-7.3-mips-seccomp-n32.patch 634 SHA256 a3d63f394e9ea692a5a515983f1ce85d2ba79ea6e6b0fd5659e05a18b753316a SHA512 eba3e843d3714501a1df3161d02134c54c8ce584db3af698b87d303fc17c16635bd06db4d7c2d9bb47f461c3b211d870b480fd927f4563207e11c9ed2c446770 WHIRLPOOL d1f87fbfd24694617ef1a03a55ba8f32ac6ac8c62541208f754df41bb30065a9f1bba640a645d9ef184aae2f7b35759b84d2564f38f9ab130cc2d282be203f75
+AUX openssh-7.5_p1-CVE-2017-15906.patch 1180 SHA256 5780648a3d24bb9b6e333d0d5e6278ace43a53d05cfd8b5b0c56e05ad17ba1a6 SHA512 dfba25e9962e4398688d5e6f9311de44931ea5292d7d50c69d8056838ceb41ce099c44f849c204f7b421515c3aa40bde6e9b98b80b9e99aa113c222841daecd4 WHIRLPOOL 85b2e553803c4fb82de6849dfbf3e153d11411723d6cb707199f18ee3fb9ab37eef35b612f10df7b672e0213d3a3bc149dbb1cc96bcfa4ac6de320c9f415018c
 AUX openssh-7.5_p1-GSSAPI-dns.patch 11137 SHA256 e0b256646651edd7a4bf60ebe4cf2021d85a5f8f3d30393bd499655c0b0c64c1 SHA512 f84e1d3fdda7a534d9351884caaefc136be7599e735200f0393db0acad03a57abe6585f9402018b50e3454e6842c3281d630120d479ff819f591c4693252dd0e WHIRLPOOL 000276fe1e0cc9ac33da8974cc6e24803a69b3d63c20096a92d6d10206c6e27110bdcaa26c0dbd2e0d0feb501681a738d5adb9d57ae21c7c55f67396f8b26c0e
 AUX openssh-7.5_p1-cross-cache.patch 1220 SHA256 693c6e28d4c1da71c67b64ef25d286f0d5128f9aebb3450283fa9ce6887186a7 SHA512 03cf3b5556fcf43c7053d1550c8aa35189759a0a2274a67427b28176ba7938b8d0019992de25fb614dc556c5f45a67649bb5d2d82889ac2c37edd986fc632550 WHIRLPOOL f7a04e19816cadce138a0beec4f1ad5f975773a1802fd1db245846ce8d5d6ec5ddfdcfa099e391172457a29eedb30c416dfa7bf4a56e99cfe507be00d2e1e718
 AUX openssh-7.5_p1-hpn-x509-10.1-glue.patch 2741 SHA256 77901da67a2bfdffbe426074bbb0416c82e99a8693103cd0e7738ed8e46c6aed SHA512 940dd448f6768bb3e94987eb86b6002d17d918310ad5c1f38f1b3fd9df263439e0fecb9c8f09c05649bfd03cb507c31ef9320522e946850e954ffdd44fdd4b73 WHIRLPOOL fcd828f9f8b1dee78308b663bbacf17ca4741c94df5e469cdd529dddc3ba266713413e035bb81c8a49d6df4ab67a865634e466b0b4e1fbad766833dbf2776e80
@@ -28,6 +29,7 @@ DIST openssh-lpk-7.5p1-0.3.14.patch.xz 17040 SHA256 11060be996b291b8d78de698c68a
 DIST openssh-lpk-7.6p1-0.3.14.patch.xz 17044 SHA256 fd877cf084d4eb682c503b6e5f363b0564da2b50561367558a50ab239adf4017 SHA512 e9a2b18fd6a58354198b6e48199059d055451a5f09c99bf7293d0d54137a59c581a9cb3bd906f31589e03d8450fb017b9015e18c67b7b6ae840e336039436974 WHIRLPOOL 8410dc9dad24d8b3065ba85e7a7a66322b4d37eac0ef68e72143afa3aba2706e91c324798236b9d3e320e6903d27a7e426621bde92ded89ce26a16535e8c3d3c
 EBUILD openssh-7.5_p1-r1.ebuild 11026 SHA256 4454081691292f2bc218292e09724693fb1b9fc54e65d31042a93bf329728a96 SHA512 2441bff83bba61ead49ce69f7682d6ff9e6629eebc7dd9208da86043c07519a4ee1b9639b5ab22b04298b214ef8ccf94149269d3980d5d48ed01bfde409e015d WHIRLPOOL a0e20cbbe1899a18697e64f33c2bf8d4f9ae51c777032d2f994eda31dc70ac6c0a66c65a9fc46783419656554ac6098b32bb27132becb284c8ccfbdc36e44aff
 EBUILD openssh-7.5_p1-r2.ebuild 10966 SHA256 9aa4c233f5832ae36ea3c793828d240577f37ae96b28d3cf60c62df51623e15d SHA512 a461598a75ecb04c04c1c7e7bac216bb8a0e47ea493e8ce95d1545e96f9d0109cfd63b8be3845f31ba53b6d54e2ca99a9416c94ac9428c51666475a0ae65d3ef WHIRLPOOL a97c29508e3359d1d26d7c6f470fd96194e55fa4564e6692153385d839c5f64d37788026ba6123d8350615a515246404ef691ab6bcf079fe1e3ac8d6b05bfde3
+EBUILD openssh-7.5_p1-r3.ebuild 11022 SHA256 0377e9cf87ee89b99246d7339e52bd760bd305e554dae2da10d4cb084ecc1b55 SHA512 a95a787f1922cf48fb886544f3d650162953c985664dc7d8547648e0cda662b323e5e672061d73ed657e1753fa354dabeaec8d79f2fb061adc76a2d3da8a451b WHIRLPOOL 66ef1acfdffae324d0bca063a82d8e11eac12ef02025a58f7d61d10702d3ae9cd54852d53fa8531c8c49564baeaabca218c4bbde7568399c49c2342657cb0ce7
 EBUILD openssh-7.6_p1-r1.ebuild 11178 SHA256 1ad539dbf506ce51952326cd2856475caf99ff3fdfca391925f260a8f637d3f8 SHA512 104338ec2dc27e632a47117684805abc0a65c549bed4d7cc45e33a3f3875b7650b241b8c92956498e4d2e2ec170f96e731c392bcf4c67a35810daa691b00f70f WHIRLPOOL 77c184f0803ba6b5b44f8b9b28573b1374fdeddc0a02e46b6ef612529d3fad1e8e205b33f45788820bf8cb03e5558da432c657b001d945d30ddac00da63d1f90
 EBUILD openssh-7.6_p1.ebuild 11177 SHA256 3df0b2d33d7d4b672edf0e2d681b7796709b2731ba6d7b757e34d725ca9b20b7 SHA512 1c8703088b8c16db32f46f6794d182cb37e7da86fa4baa5a2f74cf4ed8240fbac8710be08086f8ada096d4cfa831910205b64c5dd502b7a3edd98784f6fe1aad WHIRLPOOL b04012a4430e2ab1a58947edf2ad23cfbf91fcbea0233d8a501d0286b65aa53b58586487747b859ec37b6c993539e416ffb8bbe5ea73e6f5e78a932b7ca8c5ad
 MISC ChangeLog 25370 SHA256 ad091426a190d89906e9f866e3f9545599b156b39e4b0feeb4f862997faab147 SHA512 cff2020279e7738e82fd0202b0e6de74c837d64a95f931c5ba159a8cc557f596d4b750c1527b96b9a74a8ec16bdaf0ed51457d074046f8049fdf262599394644 WHIRLPOOL ddb4f6ea4aa8051dac3da94bd4ffd94168d4e2cf2030de7841f10384c17f2e803847ccb6777c92ea5e48ce9b65d0bb5d9c77d04aa8e34fcc8fd5cfce04d8e304
diff --git a/net-misc/openssh/files/openssh-7.5_p1-CVE-2017-15906.patch b/net-misc/openssh/files/openssh-7.5_p1-CVE-2017-15906.patch
new file mode 100644
index 000000000000..b97ceb4b2789
--- /dev/null
+++ b/net-misc/openssh/files/openssh-7.5_p1-CVE-2017-15906.patch
@@ -0,0 +1,31 @@
+From a6981567e8e215acc1ef690c8dbb30f2d9b00a19 Mon Sep 17 00:00:00 2001
+From: djm <djm@openbsd.org>
+Date: Tue, 4 Apr 2017 00:24:56 +0000
+Subject: [PATCH] disallow creation (of empty files) in read-only mode;
+ reported by Michal Zalewski, feedback & ok deraadt@
+
+---
+ usr.bin/ssh/sftp-server.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/usr.bin/ssh/sftp-server.c b/usr.bin/ssh/sftp-server.c
+index 2510d234a3a..42249ebd60d 100644
+--- a/usr.bin/ssh/sftp-server.c
++++ b/usr.bin/ssh/sftp-server.c
+@@ -1,4 +1,4 @@
+-/* $OpenBSD: sftp-server.c,v 1.110 2016/09/12 01:22:38 deraadt Exp $ */
++/* $OpenBSD: sftp-server.c,v 1.111 2017/04/04 00:24:56 djm Exp $ */
+ /*
+  * Copyright (c) 2000-2004 Markus Friedl.  All rights reserved.
+  *
+@@ -683,8 +683,8 @@ process_open(u_int32_t id)
+ 	logit("open \"%s\" flags %s mode 0%o",
+ 	    name, string_from_portable(pflags), mode);
+ 	if (readonly &&
+-	    ((flags & O_ACCMODE) == O_WRONLY ||
+-	    (flags & O_ACCMODE) == O_RDWR)) {
++	    ((flags & O_ACCMODE) != O_RDONLY ||
++	    (flags & (O_CREAT|O_TRUNC)) != 0)) {
+ 		verbose("Refusing open request in read-only mode");
+ 		status = SSH2_FX_PERMISSION_DENIED;
+ 	} else {
diff --git a/net-misc/openssh/openssh-7.5_p1-r3.ebuild b/net-misc/openssh/openssh-7.5_p1-r3.ebuild
new file mode 100644
index 000000000000..d9cb2ffe89b8
--- /dev/null
+++ b/net-misc/openssh/openssh-7.5_p1-r3.ebuild
@@ -0,0 +1,332 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils user flag-o-matic multilib autotools pam systemd versionator
+
+# Make it more portable between straight releases
+# and _p? releases.
+PARCH=${P/_}
+
+HPN_PATCH="${PARCH}-hpnssh14v12.tar.xz"
+SCTP_PATCH="${PN}-7.4_p1-sctp.patch.xz"
+LDAP_PATCH="${PN}-lpk-7.5p1-0.3.14.patch.xz"
+X509_VER="10.2" X509_PATCH="${PN}-${PV/_}+x509-${X509_VER}.diff.gz"
+
+DESCRIPTION="Port of OpenBSD's free SSH release"
+HOMEPAGE="http://www.openssh.org/"
+SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
+	${SCTP_PATCH:+mirror://gentoo/${SCTP_PATCH}}
+	${HPN_PATCH:+hpn? ( mirror://gentoo/${HPN_PATCH} )}
+	${LDAP_PATCH:+ldap? ( mirror://gentoo/${LDAP_PATCH} )}
+	${X509_PATCH:+X509? ( http://roumenpetrov.info/openssh/x509-${X509_VER}/${X509_PATCH} )}
+	"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-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"
+# Probably want to drop ssl defaulting to on in a future version.
+IUSE="abi_mips_n32 audit bindist debug ${HPN_PATCH:++}hpn kerberos kernel_linux ldap ldns libedit libressl livecd pam +pie sctp selinux skey ssh1 +ssl static test X X509"
+REQUIRED_USE="ldns? ( ssl )
+	pie? ( !static )
+	ssh1? ( ssl )
+	static? ( !kerberos !pam )
+	X509? ( !ldap !sctp ssl )
+	test? ( ssl )"
+
+LIB_DEPEND="
+	audit? ( sys-process/audit[static-libs(+)] )
+	ldns? (
+		net-libs/ldns[static-libs(+)]
+		!bindist? ( net-libs/ldns[ecdsa,ssl] )
+		bindist? ( net-libs/ldns[-ecdsa,ssl] )
+	)
+	libedit? ( dev-libs/libedit:=[static-libs(+)] )
+	sctp? ( net-misc/lksctp-tools[static-libs(+)] )
+	selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] )
+	skey? ( >=sys-auth/skey-1.1.5-r1[static-libs(+)] )
+	ssl? (
+		!libressl? (
+			>=dev-libs/openssl-1.0.1:0=[bindist=]
+			dev-libs/openssl:0=[static-libs(+)]
+		)
+		libressl? ( dev-libs/libressl:0=[static-libs(+)] )
+	)
+	>=sys-libs/zlib-1.2.3:=[static-libs(+)]"
+RDEPEND="
+	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	pam? ( virtual/pam )
+	kerberos? ( virtual/krb5 )
+	ldap? ( net-nds/openldap )"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )
+	virtual/pkgconfig
+	virtual/os-headers
+	sys-devel/autoconf"
+RDEPEND="${RDEPEND}
+	pam? ( >=sys-auth/pambase-20081028 )
+	userland_GNU? ( virtual/shadow )
+	X? ( x11-apps/xauth )"
+
+S=${WORKDIR}/${PARCH}
+
+pkg_pretend() {
+	# this sucks, but i'd rather have people unable to `emerge -u openssh`
+	# than not be able to log in to their server any more
+	maybe_fail() { [[ -z ${!2} ]] && echo "$1" ; }
+	local fail="
+		$(use X509 && maybe_fail X509 X509_PATCH)
+		$(use ldap && maybe_fail ldap LDAP_PATCH)
+		$(use hpn && maybe_fail hpn HPN_PATCH)
+	"
+	fail=$(echo ${fail})
+	if [[ -n ${fail} ]] ; then
+		eerror "Sorry, but this version does not yet support features"
+		eerror "that you requested:	 ${fail}"
+		eerror "Please mask ${PF} for now and check back later:"
+		eerror " # echo '=${CATEGORY}/${PF}' >> /etc/portage/package.mask"
+		die "booooo"
+	fi
+
+	# Make sure people who are using tcp wrappers are notified of its removal. #531156
+	if grep -qs '^ *sshd *:' "${EROOT}"/etc/hosts.{allow,deny} ; then
+		ewarn "Sorry, but openssh no longer supports tcp-wrappers, and it seems like"
+		ewarn "you're trying to use it.  Update your ${EROOT}etc/hosts.{allow,deny} please."
+	fi
+}
+
+save_version() {
+	# version.h patch conflict avoidence
+	mv version.h version.h.$1
+	cp -f version.h.pristine version.h
+}
+
+src_prepare() {
+	sed -i \
+		-e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX}/usr/bin/xauth:" \
+		pathnames.h || die
+	# keep this as we need it to avoid the conflict between LPK and HPN changing
+	# this file.
+	cp version.h version.h.pristine
+
+	# don't break .ssh/authorized_keys2 for fun
+	sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die
+
+	if use X509 ; then
+		if use hpn ; then
+			pushd "${WORKDIR}"/${HPN_PATCH%.*.*} >/dev/null
+			epatch "${FILESDIR}"/${P}-hpn-x509-${X509_VER}-glue.patch
+			popd >/dev/null
+		fi
+		save_version X509
+		epatch "${WORKDIR}"/${X509_PATCH%.*}
+	fi
+
+	if use ldap ; then
+		epatch "${WORKDIR}"/${LDAP_PATCH%.*}
+		save_version LPK
+	fi
+
+	epatch "${FILESDIR}"/${PN}-7.5_p1-GSSAPI-dns.patch #165444 integrated into gsskex
+	epatch "${FILESDIR}"/${PN}-6.7_p1-openssl-ignore-status.patch
+	epatch "${FILESDIR}"/${PN}-7.5_p1-cross-cache.patch
+	epatch "${FILESDIR}"/${PN}-7.5_p1-CVE-2017-15906.patch
+	use X509 || epatch "${WORKDIR}"/${SCTP_PATCH%.*}
+	use X509 || epatch "${FILESDIR}"/${PN}-7.5_p1-x32-typo.patch
+	use abi_mips_n32 && epatch "${FILESDIR}"/${PN}-7.3-mips-seccomp-n32.patch
+
+	if use hpn ; then
+		EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \
+			EPATCH_MULTI_MSG="Applying HPN patchset ..." \
+			epatch "${WORKDIR}"/${HPN_PATCH%.*.*}
+		save_version HPN
+	fi
+
+	tc-export PKG_CONFIG
+	local sed_args=(
+		-e "s:-lcrypto:$(${PKG_CONFIG} --libs openssl):"
+		# Disable PATH reset, trust what portage gives us #254615
+		-e 's:^PATH=/:#PATH=/:'
+		# Disable fortify flags ... our gcc does this for us
+		-e 's:-D_FORTIFY_SOURCE=2::'
+	)
+	# The -ftrapv flag ICEs on hppa #505182
+	use hppa && sed_args+=(
+		-e '/CFLAGS/s:-ftrapv:-fdisable-this-test:'
+		-e '/OSSH_CHECK_CFLAG_LINK.*-ftrapv/d'
+	)
+	# _XOPEN_SOURCE causes header conflicts on Solaris
+	[[ ${CHOST} == *-solaris* ]] && sed_args+=(
+		-e 's/-D_XOPEN_SOURCE//'
+	)
+	sed -i "${sed_args[@]}" configure{.ac,} || die
+
+	epatch_user #473004
+
+	# Now we can build a sane merged version.h
+	(
+		sed '/^#define SSH_RELEASE/d' version.h.* | sort -u
+		macros=()
+		for p in HPN LPK X509; do [[ -e version.h.${p} ]] && macros+=( SSH_${p} ) ; done
+		printf '#define SSH_RELEASE SSH_VERSION SSH_PORTABLE %s\n' "${macros[*]}"
+	) > version.h
+
+	eautoreconf
+}
+
+src_configure() {
+	addwrite /dev/ptmx
+
+	use debug && append-cppflags -DSANDBOX_SECCOMP_FILTER_DEBUG
+	use static && append-ldflags -static
+
+	local myconf=(
+		--with-ldflags="${LDFLAGS}"
+		--disable-strip
+		--with-pid-dir="${EPREFIX}"$(usex kernel_linux '' '/var')/run
+		--sysconfdir="${EPREFIX}"/etc/ssh
+		--libexecdir="${EPREFIX}"/usr/$(get_libdir)/misc
+		--datadir="${EPREFIX}"/usr/share/openssh
+		--with-privsep-path="${EPREFIX}"/var/empty
+		--with-privsep-user=sshd
+		$(use_with audit audit linux)
+		$(use_with kerberos kerberos5 "${EPREFIX}"/usr)
+		# We apply the ldap patch conditionally, so can't pass --without-ldap
+		# unconditionally else we get unknown flag warnings.
+		$(use ldap && use_with ldap)
+		$(use_with ldns)
+		$(use_with libedit)
+		$(use_with pam)
+		$(use_with pie)
+		$(use X509 || use_with sctp)
+		$(use_with selinux)
+		$(use_with skey)
+		$(use_with ssh1)
+		$(use_with ssl openssl)
+		$(use_with ssl md5-passwords)
+		$(use_with ssl ssl-engine)
+	)
+
+	# The seccomp sandbox is broken on x32, so use the older method for now. #553748
+	use amd64 && [[ ${ABI} == "x32" ]] && myconf+=( --with-sandbox=rlimit )
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	emake install-nokeys DESTDIR="${D}"
+	fperms 600 /etc/ssh/sshd_config
+	dobin contrib/ssh-copy-id
+	newinitd "${FILESDIR}"/sshd.rc6.4 sshd
+	newconfd "${FILESDIR}"/sshd.confd sshd
+
+	newpamd "${FILESDIR}"/sshd.pam_include.2 sshd
+	if use pam ; then
+		sed -i \
+			-e "/^#UsePAM /s:.*:UsePAM yes:" \
+			-e "/^#PasswordAuthentication /s:.*:PasswordAuthentication no:" \
+			-e "/^#PrintMotd /s:.*:PrintMotd no:" \
+			-e "/^#PrintLastLog /s:.*:PrintLastLog no:" \
+			"${ED}"/etc/ssh/sshd_config || die
+	fi
+
+	# Gentoo tweaks to default config files
+	cat <<-EOF >> "${ED}"/etc/ssh/sshd_config
+
+	# Allow client to pass locale environment variables #367017
+	AcceptEnv LANG LC_*
+	EOF
+	cat <<-EOF >> "${ED}"/etc/ssh/ssh_config
+
+	# Send locale environment variables #367017
+	SendEnv LANG LC_*
+	EOF
+
+	if use livecd ; then
+		sed -i \
+			-e '/^#PermitRootLogin/c# Allow root login with password on livecds.\nPermitRootLogin Yes' \
+			"${ED}"/etc/ssh/sshd_config || die
+	fi
+
+	if ! use X509 && [[ -n ${LDAP_PATCH} ]] && use ldap ; then
+		insinto /etc/openldap/schema/
+		newins openssh-lpk_openldap.schema openssh-lpk.schema
+	fi
+
+	doman contrib/ssh-copy-id.1
+	dodoc CREDITS OVERVIEW README* TODO sshd_config
+	use X509 || dodoc ChangeLog
+
+	diropts -m 0700
+	dodir /etc/skel/.ssh
+
+	systemd_dounit "${FILESDIR}"/sshd.{service,socket}
+	systemd_newunit "${FILESDIR}"/sshd_at.service 'sshd@.service'
+}
+
+src_test() {
+	local t skipped=() failed=() passed=()
+	local tests=( interop-tests compat-tests )
+
+	local shell=$(egetshell "${UID}")
+	if [[ ${shell} == */nologin ]] || [[ ${shell} == */false ]] ; then
+		elog "Running the full OpenSSH testsuite requires a usable shell for the 'portage'"
+		elog "user, so we will run a subset only."
+		skipped+=( tests )
+	else
+		tests+=( tests )
+	fi
+
+	# It will also attempt to write to the homedir .ssh.
+	local sshhome=${T}/homedir
+	mkdir -p "${sshhome}"/.ssh
+	for t in "${tests[@]}" ; do
+		# Some tests read from stdin ...
+		HOMEDIR="${sshhome}" HOME="${sshhome}" \
+		emake -k -j1 ${t} </dev/null \
+			&& passed+=( "${t}" ) \
+			|| failed+=( "${t}" )
+	done
+
+	einfo "Passed tests: ${passed[*]}"
+	[[ ${#skipped[@]} -gt 0 ]] && ewarn "Skipped tests: ${skipped[*]}"
+	[[ ${#failed[@]}  -gt 0 ]] && die "Some tests failed: ${failed[*]}"
+}
+
+pkg_preinst() {
+	enewgroup sshd 22
+	enewuser sshd 22 -1 /var/empty sshd
+}
+
+pkg_postinst() {
+	if has_version "<${CATEGORY}/${PN}-5.8_p1" ; then
+		elog "Starting with openssh-5.8p1, the server will default to a newer key"
+		elog "algorithm (ECDSA).  You are encouraged to manually update your stored"
+		elog "keys list as servers update theirs.  See ssh-keyscan(1) for more info."
+	fi
+	if has_version "<${CATEGORY}/${PN}-6.9_p1" ; then
+		elog "Starting with openssh-6.9p1, ssh1 support is disabled by default."
+	fi
+	if has_version "<${CATEGORY}/${PN}-7.0_p1" ; then
+		elog "Starting with openssh-6.7, support for USE=tcpd has been dropped by upstream."
+		elog "Make sure to update any configs that you might have.  Note that xinetd might"
+		elog "be an alternative for you as it supports USE=tcpd."
+	fi
+	if has_version "<${CATEGORY}/${PN}-7.1_p1" ; then #557388 #555518
+		elog "Starting with openssh-7.0, support for ssh-dss keys were disabled due to their"
+		elog "weak sizes.  If you rely on these key types, you can re-enable the key types by"
+		elog "adding to your sshd_config or ~/.ssh/config files:"
+		elog "	PubkeyAcceptedKeyTypes=+ssh-dss"
+		elog "You should however generate new keys using rsa or ed25519."
+
+		elog "Starting with openssh-7.0, the default for PermitRootLogin changed from 'yes'"
+		elog "to 'prohibit-password'.  That means password auth for root users no longer works"
+		elog "out of the box.  If you need this, please update your sshd_config explicitly."
+	fi
+	if ! use ssl && has_version "${CATEGORY}/${PN}[ssl]" ; then
+		elog "Be aware that by disabling openssl support in openssh, the server and clients"
+		elog "no longer support dss/rsa/ecdsa keys.  You will need to generate ed25519 keys"
+		elog "and update all clients/servers that utilize them."
+	fi
+}
diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest
index ea0ac194f420..f5d72601ddff 100644
--- a/net-misc/rsync/Manifest
+++ b/net-misc/rsync/Manifest
@@ -1,3 +1,4 @@
+AUX rsync-3.1.2-CVE-2017-16548.patch 770 SHA256 ea290d26365670f1f641e3c43e352340e3fdb337795472b03a24d38c9dd8017c SHA512 6b000e1e13f48050e0cea2ff3741d48d73694601911d961baf41d4a2d8571c2385e90dde2054e4f400767cfc3488d805d19d239c30e1049783efce1151a8a0aa WHIRLPOOL 48437e9d94cb7d43cd2eae08c7be594b848d1548629a1ed25bac512aa5d64e62becd5cdfec9ec3b4845c778e4b75a95ae74804ebe9d5b0c5753d15424c8b5580
 AUX rsyncd.conf-3.0.9-r1 449 SHA256 e3da1a057081b9089dede95873d6f413d63870fea67246081a6a90725cfd098b SHA512 8d51b452be88820c38639aa833490a001abc2edba03133441000634c2ec090d243598b0932fc11abdf1286afdab02eb6532df2b28a48bfde781c3a8b61fe8c6f WHIRLPOOL ae2b5dc507362ebc10a27973ac8e74b9983da50abbcb3ab33324da76ec70fe30c1cb49d1f7103c7b752d7cf6732a4bf8112c1763f2e9b9da669178925198716c
 AUX rsyncd.conf.d 149 SHA256 de758791b16b89a648c01867af7f51bc9bd44e40cbe868e439b753ff5d9572e5 SHA512 8ea9a2f1fea508fa132313fa16513eac84a9ed3ce75741c42769b56bbcd3f1bd2eb8bfdfe40a6c7f619e4281e8fc8d95d1bd84096d0b64aaacf606cd614ae5b3 WHIRLPOOL ac5098df8772c66d4d8070fbefe0194d8c44345d14a547f2cd59737f2dcb2023b59285117b07bbc2d711302f7736dd761d5e5498913c1878c3512d9fb5d5e36e
 AUX rsyncd.init.d-r1 247 SHA256 fc6240c77448d36cf3255e6c264737a6ce69424b5b62d0986eb322c4d8a1a85b SHA512 df2ef4d9e65fa72daa9a7d91d69a06027d0e0fbc48f9ebd485e2d51990c8d00985b7ccf41314f984975e8073e2075bbdfe5543754718381497c334dc7d96451a WHIRLPOOL cd5186d0754f51c1f0298cba332c571d0dbcfea1840a7dfef7139bfb835694bd550362c57ec2be19b15fa30f554303b65eae09a7a709cd3800648d53156d927c
@@ -5,6 +6,7 @@ AUX rsyncd.logrotate 105 SHA256 eb54100686a253d4d14c9c67fcc20f92d88c0616692bffea
 AUX rsyncd.service 206 SHA256 e4396236f554cb57eed133370dd74ff79ea495f5d7535734bc736b716931fb00 SHA512 b848a13856027e4fe1fd206a2aeb32854abd73beb31ebad7ac62c36b433e65507bbb5eef3901a42f46e70a4e887c7f9013617f19712e160ce155f3cb83bfc625 WHIRLPOOL 7ea8a774c4b22cc631b86f54ca6bf5e1dabe5d837072b491eb2638e44afd67dc57e7372fbbf26a6214417c7da32521a48c0fddfafb4c9a4249fc35d1271c8651
 AUX rsyncd.xinetd-3.0.9-r1 194 SHA256 17162f014242c9d5003578bed44b89cd2dc4f0ce2a200ac1facaa10a9aac8692 SHA512 fc053fc4748950343e866cc95284d037156a953454e4294d775f01f059e96e805582688bf1de5c965836889192ce4a663ec740e6ec2265406e509c5c6d6c3215 WHIRLPOOL 733f734e70d0c74ab6e472e656b8c83ddf816dca7e6c1130b999c2579713740db9362e5d517d0a8cf792b6859fd16d363f43ea8b531388f7abe93dcc1380ae42
 DIST rsync-3.1.2.tar.gz 892724 SHA256 ecfa62a7fa3c4c18b9eccd8c16eaddee4bd308a76ea50b5c02a5840f09c0a1c2 SHA512 4c55fd69f436ead0cb5a0b7c6fdfef9bb28ddb9c63534eb619e756b118d5b08cfc5e696498650932c86e865b37e06633da947e6720ca0c27ed5c034313ae208b WHIRLPOOL ba793bfc7f0bdd70dba812a4a782c6ed703c7e83e2d04ca714e67e6153b31f6fc49e224ef7622bf5abb1e0ba0f633bc88b2640548028944b5dfa0443ae8c585e
+EBUILD rsync-3.1.2-r1.ebuild 2880 SHA256 c8fd0b8d79d0ee3a0629f6398c76a2a412eec3142729bd13b2b1d73ea5989da0 SHA512 b3996ad7f1eb1680152edac83a43a414a3121dab21270a7dc1d9c9648cb58e9ac502ed00b9ec4ead0cfe55e3b89d83f0a5678639dc1f361aef0a294f3d6a27eb WHIRLPOOL 897e566f449c9447db90b41d9c2efc5b21d75b34c342c13f4c790e4700c9d6707027abaceed6a0755a81b6f912ad2c763f66786a6ba4a29afbd54c74d1be60aa
 EBUILD rsync-3.1.2.ebuild 2840 SHA256 c451d5a2ab8edf560c8dec38ca4e0ae8ca50ffc4a7778063865c7319c9c4db06 SHA512 2f0998787e96cfbb29398923998905fc029520a1352ae4420561471f8342e3876e0ed9dec935d4d5677bed2693aa6aa810b7f713914633ba97676a2dfa1edcb1 WHIRLPOOL b79f5f27f437e08510015467e53cca343fd9f1a5b14ca486961e0bd5ecac42e7615a3ba7ec46e39222725c36e0c6493dd270ac2be348c2215a044e045686c6d5
 MISC ChangeLog 5878 SHA256 f0322d72d76c1694bf9cedea6aa1974632fa923e96796866105f4675f4807814 SHA512 2867072a12b3ccbaac4541752f35b6377f42e981d5ae683da10c94107b58440787a28a593d81e8c6b3c4f77620d1c28ffe2888a98ec6753cf606d9a4cdd4d836 WHIRLPOOL 54c25e67f2f3dea9bbbacd805a9078e604ec5576bd690554a1b162a2315deeb5efdb2453d98efc5a073424df736be193cbaaba268aa7467172a2afe5fecc2f33
 MISC ChangeLog-2015 33945 SHA256 e9e1a4a05400f058f5bb7f33eee548ab322dff34570082ac63f0c32f349aada8 SHA512 57cd87723516841f3e87f0d88a9b73d0920e7a65f7a35816cfa568a9f54844224664c94acfb27faa7295c0aacda9a6a1d7131372918c40cead089c28290339b9 WHIRLPOOL 1cb3950f7deb2ff2c9c86968922ce6852ad0f75a36d2a284090bc82f1f014b01b9813e5bc3e93c1f1e55848e2de1ffa251b6f1cafb2bb03242678d6fbb1fb673
diff --git a/net-misc/rsync/files/rsync-3.1.2-CVE-2017-16548.patch b/net-misc/rsync/files/rsync-3.1.2-CVE-2017-16548.patch
new file mode 100644
index 000000000000..d06607cf772c
--- /dev/null
+++ b/net-misc/rsync/files/rsync-3.1.2-CVE-2017-16548.patch
@@ -0,0 +1,17 @@
+X-Git-Url: https://git.samba.org/rsync.git/?p=rsync.git;a=blobdiff_plain;f=xattrs.c;h=4867e6f5b8ad2934d43b06f3b99b7b3690a6dc7a;hp=68305d7559b34f5cc2f196b74429b82fa6ff49dd;hb=47a63d90e71d3e19e0e96052bb8c6b9cb140ecc1;hpb=bc112b0e7feece62ce98708092306639a8a53cce
+
+diff --git a/xattrs.c b/xattrs.c
+index 68305d7..4867e6f 100644
+--- a/xattrs.c
++++ b/xattrs.c
+@@ -824,6 +824,10 @@ void receive_xattr(int f, struct file_struct *file)
+ 			out_of_memory("receive_xattr");
+ 		name = ptr + dget_len + extra_len;
+ 		read_buf(f, name, name_len);
++		if (name_len < 1 || name[name_len-1] != '\0') {
++			rprintf(FERROR, "Invalid xattr name received (missing trailing \\0).\n");
++			exit_cleanup(RERR_FILEIO);
++		}
+ 		if (dget_len == datum_len)
+ 			read_buf(f, ptr, dget_len);
+ 		else {
diff --git a/net-misc/rsync/rsync-3.1.2-r1.ebuild b/net-misc/rsync/rsync-3.1.2-r1.ebuild
new file mode 100644
index 000000000000..e3aff09422a0
--- /dev/null
+++ b/net-misc/rsync/rsync-3.1.2-r1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eutils flag-o-matic prefix systemd
+
+DESCRIPTION="File transfer program to keep remote files into sync"
+HOMEPAGE="https://rsync.samba.org/"
+SRC_URI="https://rsync.samba.org/ftp/rsync/src/${P}.tar.gz"
+[[ "${PV}" = *_pre* ]] && SRC_URI="https://rsync.samba.org/ftp/rsync/src-previews/${P/_/}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+if [[ ${PV} != *_pre ]] ; then
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-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"
+fi
+IUSE="acl examples iconv ipv6 static stunnel xattr"
+
+LIB_DEPEND="acl? ( virtual/acl[static-libs(+)] )
+	xattr? ( kernel_linux? ( sys-apps/attr[static-libs(+)] ) )
+	>=dev-libs/popt-1.5[static-libs(+)]"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	iconv? ( virtual/libiconv )"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )"
+
+PATCHES=( "${FILESDIR}"/${PN}-3.1.2-CVE-2017-16548.patch )
+
+S=${WORKDIR}/${P/_/}
+
+src_configure() {
+	use static && append-ldflags -static
+	econf \
+		--without-included-popt \
+		$(use_enable acl acl-support) \
+		$(use_enable xattr xattr-support) \
+		$(use_enable ipv6) \
+		$(use_enable iconv) \
+		--with-rsyncd-conf="${EPREFIX}"/etc/rsyncd.conf
+	touch proto.h-tstamp #421625
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	newconfd "${FILESDIR}"/rsyncd.conf.d rsyncd
+	newinitd "${FILESDIR}"/rsyncd.init.d-r1 rsyncd
+	dodoc NEWS OLDNEWS README TODO tech_report.tex
+	insinto /etc
+	newins "${FILESDIR}"/rsyncd.conf-3.0.9-r1 rsyncd.conf
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/rsyncd.logrotate rsyncd
+
+	insinto /etc/xinetd.d
+	newins "${FILESDIR}"/rsyncd.xinetd-3.0.9-r1 rsyncd
+
+	# Install stunnel helpers
+	if use stunnel ; then
+		emake DESTDIR="${D}" install-ssl-client
+		emake DESTDIR="${D}" install-ssl-daemon
+	fi
+
+	# Install the useful contrib scripts
+	if use examples ; then
+		exeinto /usr/share/rsync
+		doexe support/*
+		rm -f "${ED}"/usr/share/rsync/{Makefile*,*.c}
+	fi
+
+	eprefixify "${ED}"/etc/{,xinetd.d}/rsyncd*
+
+	systemd_dounit "${FILESDIR}/rsyncd.service"
+}
+
+pkg_postinst() {
+	if egrep -qis '^[[:space:]]use chroot[[:space:]]*=[[:space:]]*(no|0|false)' \
+		"${EROOT}"/etc/rsyncd.conf "${EROOT}"/etc/rsync/rsyncd.conf ; then
+		ewarn "You have disabled chroot support in your rsyncd.conf.  This"
+		ewarn "is a security risk which you should fix.  Please check your"
+		ewarn "/etc/rsyncd.conf file and fix the setting 'use chroot'."
+	fi
+	if use stunnel ; then
+		einfo "Please install \">=net-misc/stunnel-4\" in order to use stunnel feature."
+		einfo
+		einfo "You maybe have to update the certificates configured in"
+		einfo "${EROOT}/etc/stunnel/rsync.conf"
+	fi
+}
diff --git a/net-misc/wget/Manifest b/net-misc/wget/Manifest
index 283d390db753..e2d66fc90375 100644
--- a/net-misc/wget/Manifest
+++ b/net-misc/wget/Manifest
@@ -8,7 +8,7 @@ DIST wget-1.19.1.tar.xz 2111756 SHA256 0c950b9671881222a4d385b013c9604e98a8025d1
 DIST wget-1.19.2.tar.gz 4349267 SHA256 4f4a673b6d466efa50fbfba796bd84a46ae24e370fa562ede5b21ab53c11a920 SHA512 a0f8afcc0767a8fd1acd64b1b1b27d177bc938e70cc3709c1b3faa6c1426ec926642cd8e49d292cec0268ee507683539b5152072110106de5a728a03efd8cedd WHIRLPOOL 64398a8fc132a21d81d6fd7c97335739525fb8b31eca4aa4aa7048f251691c05ad1f004c36d6e633abf02d174ffefcb2176213e68fefb76bce505d247940af3a
 EBUILD wget-1.19.1-r1.ebuild 3197 SHA256 29fc6002b0afa09b6b8718ba1e1a77e1329d4b8b58cd9d95644d7f2c09e968f2 SHA512 bf0b1c2275c6252f8f17c630aa9bb89e9276097f1fa74cf9d56d67c3ea099851ae64cd08996653493dadc39e31737fbeed88f5fc8cc0cbf1313b0b23e824befc WHIRLPOOL 4a989f7804950fa9b4bf1890f717e46a3dd64591df82b9627349b8a4bab9dbba4c9b83ade854effd5e8fd445a5f4223aa807dd3134583e831fde890f71e36926
 EBUILD wget-1.19.1-r2.ebuild 3376 SHA256 da536cd4ba7ee36f4499a4b42dbd7124a35db9b08fb49a67db9d526b9a54e862 SHA512 6832a9e562f4a25ea4bd2917643efc5f34e9e7cd9906e6e64a87c7ab45e11573850f5833c0c98c108c3d6f192659b8c56fbcfc969be2d0b53f04249796fd9191 WHIRLPOOL 670249ea0ae38986c189ed33eef0fcca7b4ef893adc2277c1b72198c36eaa40c4c11819faeb71c30fa5a6aeaa09d5f2c997ab4c6d94c6f0f87725169d9d891dd
-EBUILD wget-1.19.2-r1.ebuild 3205 SHA256 eab39a71a01150bd353bc8562ecd6f08bbd07526fc62cf8375b899518dcb2dce SHA512 8f0558e0c3316febfcbc5b8200ebc03ae50582fe129589de98af6d93fe21b251b92b5cfdc587ae173d03e7dadf96227167407d655097e97c9178ba746e349537 WHIRLPOOL 1476c9bb0f88b755bd11be75bf774db00a250b4768b6931709644e9d50fea32356c78d18a0cd7a032a9973baeb7e4507a93a2295ca5d7168408ea27d656c329e
+EBUILD wget-1.19.2-r1.ebuild 3261 SHA256 ba3e8b6fc8d967218ae55556657450d3aa193591c0851c5f737f62ed7e720ceb SHA512 d073c5925ca2c947702a493d27affae2fd58ff69d70cf95056f011c02e305ee9e4e2829eb65353c059f677b252d379cac2a97f34d5614b8a2ddefecc4fda49b6 WHIRLPOOL 59d4f1adba15353ced0fab1b662e9b6c283dcaaa06cb62629c996dbf2a160182e424ef0115b4a8f1db4a89223156a9a8c9c5a4a485720bddce38cb5dbfc039d3
 EBUILD wget-1.19.2.ebuild 3118 SHA256 084c69c9ae1e1a242e85fb6d21d8e8c8643fe047162797500cd268b4b91d37fa SHA512 e4a6f74d9e7feddab9d9849e32f75f8a383e648b592ec0beb79c20a560c9e0156e4494059a3f95afe3135538e460abc0f5966b4002549e2c94ae572f2ef71738 WHIRLPOOL eadbe036d1a37bd4a0cc92d15282728d37a9cfd3d01d280a6782df59b714659c27f9b97c5f266f5b922934cae62bc5aa83fc0e2919d64781028db59be5585c09
 MISC ChangeLog 11759 SHA256 b0200db8aa9205aa6cf590936f1758619e1b56fdb17c76314175d6031c287ccf SHA512 eb9e6c7b1d5cb9f3e550b3c7d89493da0026492b629d3b76c5f096b9ef7de499addb31fcf43dd4cfd01eaf73253ddd10ceef5937a9a1a8d18142f9e5c22b764b WHIRLPOOL 679e53afbcbdadd297e78cfbbbbbb4406d23f993f44d38388c0f55b74ec888ea1f81b29be95e36b19dcc92fe6f350861d59549b28a77eb884eba6bee3d0844a2
 MISC ChangeLog-2015 29939 SHA256 902a2f6576d8c8dd01ee76cad7a689cb260d153139adc04b8d76abe91860d86d SHA512 55c752f56737ab6116057f3c158fcd4ba9b0405d43796e4114076c6fe849f7bdf3f771606c69551d5a1bd8a408ff5099158d461b26c840c6a4fe05824d8ae11e WHIRLPOOL 4b1c46b1c0c25428559442be8e2aef443686e00fd1889c908bf7d28291a5064e2dbe9879f0bd2025a8e0f49e42ed89334198f5dc9ee1122c91e1ba7c317678c7
diff --git a/net-misc/wget/wget-1.19.2-r1.ebuild b/net-misc/wget/wget-1.19.2-r1.ebuild
index 112e811986a8..fb5c54b33014 100644
--- a/net-misc/wget/wget-1.19.2-r1.ebuild
+++ b/net-misc/wget/wget-1.19.2-r1.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 ~amd64-fbsd ~sparc-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 ~sparc-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 )"
 
@@ -55,7 +55,11 @@ src_prepare() {
 	default
 
 	# revert some hack that breaks linking, bug #585924
-	if [[ ${CHOST} == *-darwin* ]] || [[ ${CHOST} == *-solaris* ]] || [[ ${CHOST} == *-uclibc* ]]; then
+	if [[ ${CHOST} == *-darwin* ]] \
+	|| [[ ${CHOST} == *-solaris* ]] \
+	|| [[ ${CHOST} == *-uclibc* ]] \
+	|| [[ ${CHOST} == *-cygwin* ]] \
+	; then
 		sed -i \
 			-e 's/^  LIBICONV=$/:/' \
 			configure || die
diff --git a/net-misc/x2goserver/Manifest b/net-misc/x2goserver/Manifest
index 11ddb5aa58a0..bba5a48080fd 100644
--- a/net-misc/x2goserver/Manifest
+++ b/net-misc/x2goserver/Manifest
@@ -3,9 +3,11 @@ AUX x2goserver.init 442 SHA256 d85e7ed5e548a23c2e808279eabad976bab4da1bf32ae755a
 DIST x2goserver-4.0.1.19.tar.gz 89434 SHA256 3dd5c1464a7992a38760fd6b08f5f8d37646f939f4f7834a7cd96bf4950623cc SHA512 dbd054a6bf781d843a48fcea3449037b991aaa38a52705d48dd5fa8d7fe85c56d4ff31b9a10189a9043a3e5cc0c69475947aea5a5fb78e3c076c0e56079b747d WHIRLPOOL f44fadfda6e1ff165ff989f0c10116c8318f5915764b9bfc663e4658190934eb5155e17e072f131842a98cc02908366b0f91c7b0b9b9e73d4e2a729f00ba0d31
 DIST x2goserver-4.0.1.20.tar.gz 96412 SHA256 f8bf48e1c8995bd5a7cde6de1c006fdb77f2bae6c4b82e6b7b985a8f00a3dad9 SHA512 21f3a415c50bf78e4c044c5b77f8478a307e4b3cef990edd415d9e7479f48fbc1c051e9f7c16a5d1f30726f4f2a812fb367eecb0a073bfba1ea2c6173c71fe54 WHIRLPOOL f3ed9160cfbde7ccfa1e367d8ca19afef2e0673103e183e517fb845cf8bf93b487e40ad34a16b85d127446b38bcb10cf9a5a2d467f6fa38b937cb0d30545905d
 DIST x2goserver-4.0.1.21.tar.gz 101441 SHA256 a3ebba69a4b640541d811453457454f324ab6deeac7da13ec0c159e8f060b7af SHA512 641421b309baab0941416ccd60dd8b66b0a968a4031252c2d8066fb570c1985787848ad368d731fbdb4737c00ea722a26682fb8cd2820ea19da271c4ecffafa4 WHIRLPOOL b9b4be822e0d155bf3318fa346a2dd2973cc47168845f99beba7935d0c1453f75aeb948bed17c01f54c931cf4f80aba6c89186b88959a296f433e83f48cd730d
+DIST x2goserver-4.0.1.22.tar.gz 101286 SHA256 bb7bd9abadfb6201f39068731a955df5183f4d447c42fc0720777f32acafbfbc SHA512 ba726663f4fdedaa13cd1496a693cc9b0d7c1a815563ef8abdfe9e53b69c83379d0ed6c5569e6e7d77ac792a18a4dfed8c9b12c0a356664a66fe3be917fb7a67 WHIRLPOOL 08222a1a91531dc013f6bb8a3df7727f02bad77a113e56f34619b3fcba1513907e4ed39d683a108cb3c05856e8e941f430ffced72ba230eb92481c3f4b044701
 EBUILD x2goserver-4.0.1.19.ebuild 2499 SHA256 82523c984842bc75e1c012083299d49e2adb4eb98b14f6990456d6dec076fb53 SHA512 f6883747893843fd472344c1bbd578982e878866f60e3fb5fdd4a313a9009bca2498d7ac286dfe96fc16c5002240d4fae3c2972393c248f3d6d034d59b2d3b65 WHIRLPOOL 4e6eea122b607a8b09838eff5d21e8d640fdad341c8394773d0dac919c030bd3b8df7c0aae92cd47614744cf5a6bb28d0a88a8761bf51131a07b5c59bd7e1336
 EBUILD x2goserver-4.0.1.20.ebuild 2544 SHA256 76fed816c4230129c427be207eae126c229be67ce306c6d69ed3e881ebffbfc3 SHA512 e67ed7fe6fe116bb9d29912ed71b0be31229662add077d3aef350299303849088e77dbabb5a7a53c511f9f5384e435ab03a4be35fbc3745b84bd47f5bfc39884 WHIRLPOOL 742c74d7942bdf98100645fe8d9f0237052b3abe0f3a02a25e2064f78cfddbc8d6a11073f602a45fe9e98990d8d3190495bbb2c571284ff566c6e73678e88759
 EBUILD x2goserver-4.0.1.21.ebuild 2697 SHA256 52ca2ae068406670f6fc48e98509616b759bfa4ab23fd2996658e2aecd66c476 SHA512 eaf3f000a8f4f5a442ae5d9d7bacb470942fcae54a34a75e3a88b939405d0e9b765160821d27ea1239ee2254dfb57cf0502873822cf54dac75dac8ad0526b1bd WHIRLPOOL 727e320bcffc8ed70bfd855de8c9f9448cee343d1b731ebdfec57285d9342edd3f8b26c1791086aa0b63bb0efd75b881cde87fb16275bec67c22875d8c833d91
+EBUILD x2goserver-4.0.1.22.ebuild 2697 SHA256 52ca2ae068406670f6fc48e98509616b759bfa4ab23fd2996658e2aecd66c476 SHA512 eaf3f000a8f4f5a442ae5d9d7bacb470942fcae54a34a75e3a88b939405d0e9b765160821d27ea1239ee2254dfb57cf0502873822cf54dac75dac8ad0526b1bd WHIRLPOOL 727e320bcffc8ed70bfd855de8c9f9448cee343d1b731ebdfec57285d9342edd3f8b26c1791086aa0b63bb0efd75b881cde87fb16275bec67c22875d8c833d91
 MISC ChangeLog 6358 SHA256 7198ac7c75a68c2db074471238263afed1f53cfceb1e3807a524ec685cd2d228 SHA512 cea547af5c82dc689ea3b820fc1177d4ea66a5f3fe31d125a5968409e905fa6507b0dfb27b0bef7d6472937ba961c625b87eb74903c65cc2d136232961b5d2d8 WHIRLPOOL c90284259476f7e92da3f318ee8c34eef6108522d5a234f6d144f1cae2d381e4e7f0cb5f53bf2ec6bc67240f51fd26d11fe712836ac706b3f1bfb8fa4d723a9a
 MISC ChangeLog-2015 10694 SHA256 280d067f8ea15916b3cdc56ab84c2661fd563272720a933bc10c0250c5378479 SHA512 2588cebd5262b439ab73f00ed6dbaa34d025766b89d47e6e8129401dc56016fb90a100ed1893b185c77a0f197c7e1445ff484c1d617084b7564b02aa8e7a0ec9 WHIRLPOOL de650169bdee0fc545d93e0462ef94e163cde7d4c47f0b4170360b68d3d5452b7e8912acd5be11a73ef1419b10f99b8416db834566311daed5c713963f5d9f9b
 MISC metadata.xml 398 SHA256 232f483c766fd0dac22180147361f9fcbbd69b6ba3d3e2ea4b660ad99787266f SHA512 f0c209499689338c77517afd3c49153e822ba45d29bf575dd6d3e8266bcbe4cb87d9a0a1744178a0392a7358b7164c765157831710ff85cb38dea5b76fd7b65f WHIRLPOOL 6db594132a762989765659193a778362327e9b467d8a9973dbb3e3fe77810798e306901ba5a603bef4c71ee2e90458d500174879fe295c44278caa45d66afbdd
diff --git a/net-misc/x2goserver/x2goserver-4.0.1.22.ebuild b/net-misc/x2goserver/x2goserver-4.0.1.22.ebuild
new file mode 100644
index 000000000000..d64c4f2f058c
--- /dev/null
+++ b/net-misc/x2goserver/x2goserver-4.0.1.22.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit multilib systemd toolchain-funcs user xdg-utils
+
+DESCRIPTION="The X2Go server"
+HOMEPAGE="http://www.x2go.org"
+SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+fuse postgres +sqlite"
+
+REQUIRED_USE="|| ( postgres sqlite )"
+
+DEPEND=""
+RDEPEND="dev-perl/Capture-Tiny
+	dev-perl/Config-Simple
+	dev-perl/File-BaseDir
+	dev-perl/File-ReadBackwards
+	dev-perl/File-Which
+	media-fonts/font-cursor-misc
+	media-fonts/font-misc-misc[nls]
+	>=net-misc/nx-3.5.0.25
+	net-misc/openssh
+	>=sys-apps/iproute2-4.3.0
+	x11-apps/xauth
+	x11-apps/xhost
+	x11-apps/xwininfo
+	fuse? ( net-fs/sshfs )
+	postgres? ( dev-perl/DBD-Pg )
+	sqlite? ( dev-perl/DBD-SQLite )"
+
+PATCHES=(
+	)
+
+pkg_setup() {
+	# Force the group creation, #479650
+	enewgroup x2gouser
+	enewgroup x2goprint
+	enewuser x2gouser -1 -1 /var/lib/x2go x2gouser
+	enewuser x2goprint -1 -1 /var/spool/x2goprint x2goprint
+}
+
+src_prepare() {
+	# Do not install Xresources symlink (#521126)
+	sed -e '\#$(INSTALL_SYMLINK) /etc/X11/Xresources# s/^/#/' -i x2goserver-xsession/Makefile || die "Xresources symlink sed failed"
+	# Multilib clean
+	sed -e "/^LIBDIR=/s/lib/$(get_libdir)/" -i Makefile */Makefile || die "multilib sed failed"
+	# Skip man2html build
+	sed -e "s/build-indep: build_man2html/build-indep:/" -i Makefile */Makefile || die "man2html sed failed"
+	# Use nxagent directly
+	sed -i -e "/NX_TEMP=/s/x2goagent/nxagent/" x2goserver/bin/x2gostartagent || die "sed failed"
+
+	default
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" PREFIX=/usr
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX=/usr install
+
+	fowners root:x2goprint /usr/bin/x2goprint
+	fperms 2755 /usr/bin/x2goprint
+	fperms 0750 /etc/sudoers.d
+	fperms 0440 /etc/sudoers.d/x2goserver
+	dosym ../../usr/share/applications /etc/x2go/applications
+
+	newinitd "${FILESDIR}"/${PN}.init x2gocleansessions
+	systemd_dounit "${FILESDIR}"/x2gocleansessions.service
+}
+
+pkg_postinst() {
+	if use sqlite ; then
+		elog "To use sqlite and create the initial database, run:"
+		elog " # x2godbadmin --createdb"
+	fi
+	if use postgres ; then
+		elog "To use a PostgreSQL database, more information is availabe here:"
+		elog "http://www.x2go.org/doku.php/wiki:advanced:multi-node:x2goserver-pgsql"
+	fi
+
+	elog "For password authentication, you need to enable PasswordAuthentication"
+	elog "in /etc/ssh/sshd_config (disabled by default in Gentoo)"
+	elog "An init script was installed for x2gocleansessions"
+
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}