gentoo resync : 29.10.2017

author: V3n3RiX <venerix@redcorelinux.org> 2017-10-29 11:22:34 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2017-10-29 11:22:34 +0000
commit: bd7908c6630f38067350d396ac5d18c3cc2434a0 (patch)
tree: 3559b3e11424f5529527f2474d8a977a91ee3389 /net-misc
parent: 8b2628ad8526c806375e7b157889e4274b70248b (diff)
41 files changed, 1361 insertions, 75 deletions
diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index fd932557f74b..cf655ecbbab1 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -18,7 +18,7 @@ DIST asterisk-13.17.2.tar.gz 32899368 SHA256 19ae0565687b85bde382b2cc274dd5a27ac
 DIST gentoo-asterisk-patchset-3.17.tar.bz2 5074 SHA256 2af864f0b40b42c55f3c3ac737856942c9393adddd47ebf6d982d9214b85a2ad SHA512 37f86f3c699b2643afd8080391e817a282571694bb56e00efd0734918dbc33d6c12a2463dbc24667597420863b4f506870140fbb8ef3f1700124ef790ae7252d WHIRLPOOL 79017eeb3737953515286db6386bfd848f7501b6f2abbc1ba6b6865a75495ce999d555e3112336abae23371a21a2d64a10f1d173e285314bb5bab22bfe2d4c1a
 DIST gentoo-asterisk-patchset-4.05.tar.bz2 2889 SHA256 2d5d90777c896065d1f1ab7e44c7040ec2b143ee816080791a1c357efe6a0a60 SHA512 6fdb245e37074f124f4725c25a1547c872f6216eb1d37faeda8ed7c5e4dc87424e9c1ba20bb34722165027692916bde4c8bfc816ac5c89710972bb3f51bd1b75 WHIRLPOOL 5d89902c3863027780d67f9aa6428a2788f191582d03e905642fc817bbb7aa7991c04423a09e06d95e92c5ba15b6ca193c47a146379ef5c120f07b9fa6419126
 EBUILD asterisk-11.25.1.ebuild 9618 SHA256 c36cb43c5dc9918bb400363b1db4358a9c80897400cfb08c7907dc6150e97cba SHA512 2408972c5322735a4f4ea8ad7ea09bd7813e1618935f2f6f8655eeeddea7bc7e7a85fc37f1ee6084661dcc04d73279ac71e7a0ef029908e45d5844223fa4e7b0 WHIRLPOOL 4d0da52291605b3f4fa9cf42619f5b7ed40054b6e677723287f4c21b1e92004327e78c53a31b6e912ab3f2b88d8cbacd38fad6cde2b884f9e9187c9b08f06d1d
-EBUILD asterisk-11.25.3.ebuild 9619 SHA256 2cd85a29897525cc1e259b2e1aa94daee07f74b086552592e36d6be86b94a5cf SHA512 fe13a2ffb8fffa30eb08c50498d4c40ee405779a251249edf80990b9fc1f6a6a5fdf5ed72ce6bf1becf55ef83ddb1b40684ef0f6d9614f379e707aa6921139f0 WHIRLPOOL d1bbad206cfb8dad5008ce01b419fed48ecce3a105c32085deb6a317257b9f0f93c7794befb54f7a3810f53f02f15c287f4bc31f9ebcc22949d7821f21e187a5
+EBUILD asterisk-11.25.3.ebuild 9618 SHA256 c36cb43c5dc9918bb400363b1db4358a9c80897400cfb08c7907dc6150e97cba SHA512 2408972c5322735a4f4ea8ad7ea09bd7813e1618935f2f6f8655eeeddea7bc7e7a85fc37f1ee6084661dcc04d73279ac71e7a0ef029908e45d5844223fa4e7b0 WHIRLPOOL 4d0da52291605b3f4fa9cf42619f5b7ed40054b6e677723287f4c21b1e92004327e78c53a31b6e912ab3f2b88d8cbacd38fad6cde2b884f9e9187c9b08f06d1d
 EBUILD asterisk-13.17.2.ebuild 9724 SHA256 b48a4c39c998641495d22c16d5591dba2184160577681bfb367ce501bcce553a SHA512 a3f8b96be8dab1b8a28177dcef963463122c1fc459419550d2329c8e054b08c9ea27bc5147c60cd6ac47ebacaa8b040691bb2a401de342b31a3073a79ba9043e WHIRLPOOL 8f6a0453196da182014a9209f62b56d59b7b9355992bda09ac327e427ec712466860e88658f15845394a4d680a325fcd547fcb7706c1027a857c66114dca5bc4
 MISC ChangeLog 9607 SHA256 db6299ba91496cb960e55aef762d7f9302a773908d501fda6550d52f412b0e0b SHA512 1994f299ab6f31a02df2aac6ac566373eaa04b7b4049a2e5d3bc04b3eb56bbf1bcce1d3553a931011c5d8105c55e8691f1991fafc67e21924848d3a43083d7ea WHIRLPOOL 44249abc5d6cac9f19cdd8eed42dec2e845d1031ca690297ba856f8d670b7b0488be1e675eecb2554291caa972b29b8d2ddc88951f64764cd986f95867f6c61d
 MISC ChangeLog-2012 113409 SHA256 6beb419f0c2e63641c73f2c14bd0c3a6a319c65bca8be526aa441fac2104fc9c SHA512 08c037acd578b9c3c387a80e45e80a68c4da84e63fced30215f22ec14eb6e223348d8e7d68f4decdf8a2d8cd0933b3f7fa3adddf7cd80bb407498b3e2868d917 WHIRLPOOL be0f2192531f7477545ccc0f10d9a50f36228e8d8d0e2773ccce3799c2d1b5e1b7be70d96502f759c7c878f88efd83122fc9230374c40c8963fe0bc7ff014b87
diff --git a/net-misc/asterisk/asterisk-11.25.3.ebuild b/net-misc/asterisk/asterisk-11.25.3.ebuild
index 3d1accfa89ce..5733b5cc4eab 100644
--- a/net-misc/asterisk/asterisk-11.25.3.ebuild
+++ b/net-misc/asterisk/asterisk-11.25.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://downloads.asterisk.org/pub/telephony/asterisk/releases/${MY_P}.t
 	 mirror://gentoo/gentoo-asterisk-patchset-3.17.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 
 IUSE_VOICEMAIL_STORAGE="
 	+voicemail_storage_file
diff --git a/net-misc/axel/Manifest b/net-misc/axel/Manifest
index 1dc3cba80865..0a2b81b1c7cc 100644
--- a/net-misc/axel/Manifest
+++ b/net-misc/axel/Manifest
@@ -3,11 +3,13 @@ AUX axel-2.4-buildsystem.patch 566 SHA256 da7ccc2dc5969eb4c4f5cc8631c1f75823cb3f
 AUX axel-2.4-max-redir.patch 412 SHA256 0007c9c2f61ec39769d13ef93e4820f0f819d598bcd40aca7382fe098071b55c SHA512 81aa9e566798959af38ff9f59f493462acfdff7e817c2285717456463505149a00970a39cf7f14cc4f5c79c159e5a57b83b76eff690d454921ecb80efabd7491 WHIRLPOOL 3e01fa52c69a4c28d552faf326405ee89eb523f3c1ff4069f440466c939d6426fc15d08f8f468a6379caa57a9b1b95343d29a0c29c87ab4f40401323716cba2d
 DIST axel-2.12.tar.gz 82995 SHA256 28e7bb26b7be3f56a61b60ef07e15e05ea9a41850b0ed45a0c56d6d2202f4a8b SHA512 5e163c319366f7efd16f8b35dbcf901300c884ab303696dabe87ad47511f56cc3f1e399af738dc79ca717ca70fd529b6dd1adf30f5162cfb530105ce34e2eaf2 WHIRLPOOL dece4ad9eae5441e0b24952a96189417e75eb155ad46b199ce531b35fa6d027ffb75a16c016044a37dd4e76601865e51c0310b69b7fc70b974f9b67a6b2b1fe5
 DIST axel-2.14.1.tar.gz 89356 SHA256 acf6820d98a792faf309fc9acf22f7caf4b8a4b7001072c8f546b3c4fc755e39 SHA512 72c37fc6def0c765ed8220c27efe22255073b1e3cf1c8f6bda5ee2ce9cd36ac46263ac602a185efd40ca8f197a268612f2dcda69bcb49891c2538b910d971e8b WHIRLPOOL 1384ab65a689200f68d2549deb2f22526ae82a25f1b580ce5a270babc33d577513c2732a57676ea1e51b99eb09267960a5e24b6507ebca64a61d6ab4070eb374
+DIST axel-2.15.tar.gz 96474 SHA256 0e223f18954e4c6c34b882a474c526b9c7d107168220c2f3892598248236a172 SHA512 b0a516850b56b74fe763df3320b98e47f9977dda208cff9a98a87bdc63e37f5e0fd31d30c240a375f9d992320674983ced8201ee631187149e62b42804c48eb6 WHIRLPOOL 64b0d6f071ddd66fefc5d980b34797feece8fbba2bab173c3fe6627c9b6fdcb213e30b84e26d1d6699d9cdf514bda1fb39985ef820fae0c31f3533a7c8e756eb
 DIST axel-2.4.tar.bz2 44995 SHA256 ebc7d40e989c680d2afa632a17e5208101608924cf446da20814a6f3c3338612 SHA512 34d73cea19f2bf393aa8d3e4b6c24296f8b1d4e6177da6f4728763e013d5d9d073aa5dae31d0ff175126e8fcbd973daf94674a70f100afc9e7d00b92b78b8ec9 WHIRLPOOL 373af984738008572847ae0ed84a518d0b61323e3612f48affa96175792b0856c2bd13601ddcdd0c81ead5059ee41130759bf9b0ada2a2654f767ec69d992a0f
 EBUILD axel-2.12.ebuild 1155 SHA256 989c636775a189e4ba72c9054bc0b8c1a0fc70e6168115184eca34af2ed3dea2 SHA512 5070aeaefbc1649011db1791fd3594adc79f39aa530207324e73fafbffb3496da83302dfe3c994dae87d90bf28c7ecebd327458882629061f0255d61ac6bb1f2 WHIRLPOOL c317ec66f89658047214f4db1d13ba45e67179a0f18276f668e7c02e7935f70b2b401e8982ff382fd6b4f8b894d057bdd706ada27404877e0e6abe196552a469
-EBUILD axel-2.14.1.ebuild 1358 SHA256 2dff4ac46259acc893742f994e9d529958fd5228fcfeaaf2235392f760a14ab2 SHA512 d5e22c787ca992239a5d7cf3064cb1cc074fcc3d3d95635ed9fa5b7f2f6243ba1ca024d4e3b17ab4a7fe3af72c115fcf6b487698503543a4d39ebdb6ecde548b WHIRLPOOL 3473f00f6c7e8ed74b5e0550fbffa9b0ebf226f39523052630177acd9727b52b63a12ab289d5267ef932427f6f89a009e7db4840a678c28b2dac216c7614f538
+EBUILD axel-2.14.1.ebuild 1353 SHA256 da687dbca7356076af719084130989404809c6658a029d4a6df1f9752046a4ac SHA512 9a112722dea3a9c143dcf30dd761ded084193f26df326353533f51b3100746a7a3a8e7bd9144bd057344b725806c639e15889947133b90b690d31dc8a23633e1 WHIRLPOOL 75ca32c8dc83cba2552a6d268432018d0937dee343968f285526be8285c6a305719fd64dbfd1096c7fa5d3ac22a8f9e7fe89f3c044c495af355b556e31f6be31
+EBUILD axel-2.15.ebuild 1353 SHA256 da687dbca7356076af719084130989404809c6658a029d4a6df1f9752046a4ac SHA512 9a112722dea3a9c143dcf30dd761ded084193f26df326353533f51b3100746a7a3a8e7bd9144bd057344b725806c639e15889947133b90b690d31dc8a23633e1 WHIRLPOOL 75ca32c8dc83cba2552a6d268432018d0937dee343968f285526be8285c6a305719fd64dbfd1096c7fa5d3ac22a8f9e7fe89f3c044c495af355b556e31f6be31
 EBUILD axel-2.4-r3.ebuild 1247 SHA256 60e4e41abe8d92a8c3052d870e9db0ccaaae9ca18319c42025feb1afcfaf6c22 SHA512 faa5ee4628df473cef38395d5e458743697ee03cca323a690796d21ea26427e052b25a42b3362fa289a716fb12b600eeb19ef2fa833448aa150d9afe41221b08 WHIRLPOOL 3795796d1a229df4333c243c22cb442419a2524c36c8e29f1960726729194e3be7be8de7459106ccfc042fcc7dbc2099fa9aefc26aa6b8c17d01552ab05782fc
-EBUILD axel-9999.ebuild 1027 SHA256 72ea1aa89eed76250fabe357198536e6e61bbd1dbedad3c2681f9223d0ef72ce SHA512 86dc06242516228d50eef795f79124dc085660fa6f1b6eee9fa62a404fd1762683de8c242a08feea7ffa4dcfa1552cbc0f91d6d0d967223a4ef3864f887b5bc5 WHIRLPOOL f79ce7e7554a0f7a5d8b2f56897e41d14a2e2aa037153b08a1ae1b702ab57d31dded65eb44ac301705d5bf553315c5c7da82ec14900ecb40ac45c8ec519ea018
+EBUILD axel-9999.ebuild 1224 SHA256 4e79789a4cf31621cc40c45c92523484da9f969ee18994a18804a4a45b848ab9 SHA512 0b08a3fdbce4297c749d35a3e490bc2f2581058fe385a6e326d10fb052af93af1c7646fef76d133b14c5f67b828f0de973c385a49a55dd65fec50fd50e50f0e7 WHIRLPOOL bc40e0263f47dde19a1a9118315f9faeb35adb912caf54177517c66ea22ec6fd67aeb2f9349f4ec5807f5bf6a32312d012d28f38c72de59dec1e9bfb399be077
 MISC ChangeLog 4030 SHA256 9d962ecf6ad498532e81f70f07ce29ce08a68cccc01a69afe9a1ba323b60d98e SHA512 3cfcb2b934827c5c62718148eef092a02d5701fcda79eea1b98a9cdfe69284a1f58b522115271ea470f0ff039de3b937f93a3c2ac0ff4286dc5650f11ea63530 WHIRLPOOL b2f9256f8245dc5ad5788ed0dc661b82a9266afbe8bccbc1d56303db297b57b341ca91505c3dab188c435c8a820e67902cd8e211acceb8683e78e12f3a2f18d3
 MISC ChangeLog-2015 7608 SHA256 579fc6aa7f68ef2c3554329a481c9bd7008ce2844e61207b69398d83b5c55831 SHA512 904527bdfd9f6ad80eb103a811cf162d1a0781067063b3b4171e3ecf3af380e22d23ce5a3b041611ed6e7dde2e79384664a115fba8c36d0c509102248640254f WHIRLPOOL 50cf0a4a76766fa482212e44549392d9d952d4c02f2e29dd2b975fcd6db30858add12ff4794c0e285f9886371ac70bd21fd6ed7173f0dc874cf803ade371aae4
 MISC metadata.xml 297 SHA256 2f8bb0e67e181f88997e57eee8f05aef14fe9d99261a632031f1a0504feb0aef SHA512 8d005244ca7b5f8dd30f9a158e4a53880d8a395bf11c73f8a3c7a3c668153a4c126b0a88942d3bd895a0e5ddc1f672eb770858356d0e12af75a098d36a80d56d WHIRLPOOL f08be791e102bbce96877f9e1e97ae9a0c53ea595739388e5a4ee25e27d13baf90594d80b0513622ccfe997f17fd0bf48749bd682908f9d6b7d4b4959306f1a8
diff --git a/net-misc/axel/axel-2.14.1.ebuild b/net-misc/axel/axel-2.14.1.ebuild
index 4bd7ad89659d..778e289857a0 100644
--- a/net-misc/axel/axel-2.14.1.ebuild
+++ b/net-misc/axel/axel-2.14.1.ebuild
@@ -50,6 +50,6 @@ pkg_postinst() {
 	einfo ' mv "$1.axel" "$1"'
 	einfo
 	einfo 'and then add the following to your make.conf:'
-	einfo ' FETCHCOMMAND='\''/usr/local/bin/fetchwrapper.sh "\${DISTDIR}/\${FILE}.axel" "\${URI}"'\'
+	einfo ' FETCHCOMMAND='\''/usr/local/bin/fetchwrapper.sh "\${DISTDIR}/\${FILE}" "\${URI}"'\'
 	einfo ' RESUMECOMMAND="${FETCHCOMMAND}"'
 }
diff --git a/net-misc/axel/axel-2.15.ebuild b/net-misc/axel/axel-2.15.ebuild
new file mode 100644
index 000000000000..778e289857a0
--- /dev/null
+++ b/net-misc/axel/axel-2.15.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="Light Unix download accelerator"
+HOMEPAGE="https://github.com/axel-download-accelerator/axel"
+SRC_URI="https://github.com/axel-download-accelerator/axel/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris"
+IUSE="debug libressl nls ssl"
+
+REQUIRED_USE="libressl? ( ssl )"
+
+CDEPEND="
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+"
+DEPEND="${CDEPEND}
+	nls? ( sys-devel/gettext )"
+RDEPEND="${CDEPEND}
+	nls? ( virtual/libintl virtual/libiconv )"
+
+DOCS=( doc/. )
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_with ssl)
+}
+
+pkg_postinst() {
+	einfo 'To use axel with portage, create a script in'
+	einfo '/usr/local/bin/fetchwrapper.sh with the following content:'
+	einfo
+	einfo ' #!/bin/bash'
+	einfo ' set -e'
+	einfo ' /usr/bin/axel -o "$1.axel" "$2"'
+	einfo ' mv "$1.axel" "$1"'
+	einfo
+	einfo 'and then add the following to your make.conf:'
+	einfo ' FETCHCOMMAND='\''/usr/local/bin/fetchwrapper.sh "\${DISTDIR}/\${FILE}" "\${URI}"'\'
+	einfo ' RESUMECOMMAND="${FETCHCOMMAND}"'
+}
diff --git a/net-misc/axel/axel-9999.ebuild b/net-misc/axel/axel-9999.ebuild
index 70eda56e3f0d..d4a43d0094fd 100644
--- a/net-misc/axel/axel-9999.ebuild
+++ b/net-misc/axel/axel-9999.ebuild
@@ -6,9 +6,9 @@ EAPI=6
 inherit autotools git-r3
 
 DESCRIPTION="Light Unix download accelerator"
-HOMEPAGE="https://github.com/eribertomota/axel"
+HOMEPAGE="https://github.com/axel-download-accelerator/axel"
 SRC_URI=""
-EGIT_REPO_URI="https://github.com/eribertomota/axel.git"
+EGIT_REPO_URI="https://github.com/axel-download-accelerator/axel.git"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -38,12 +38,19 @@ src_prepare() {
 src_configure() {
 	econf \
 		$(use_enable nls) \
-		$(use_with ssl openssl)
+		$(use_with ssl)
 }
 
 pkg_postinst() {
-	einfo 'To use axel with portage, try these settings in your make.conf'
+	einfo 'To use axel with portage, create a script in'
+	einfo '/usr/local/bin/fetchwrapper.sh with the following content:'
 	einfo
-	einfo ' FETCHCOMMAND='\''axel -a -o "\${DISTDIR}/\${FILE}.axel" "\${URI}" && mv "\${DISTDIR}/\${FILE}.axel" "\${DISTDIR}/\${FILE}"'\'
+	einfo ' #!/bin/bash'
+	einfo ' set -e'
+	einfo ' /usr/bin/axel -o "$1.axel" "$2"'
+	einfo ' mv "$1.axel" "$1"'
+	einfo
+	einfo 'and then add the following to your make.conf:'
+	einfo ' FETCHCOMMAND='\''/usr/local/bin/fetchwrapper.sh "\${DISTDIR}/\${FILE}" "\${URI}"'\'
 	einfo ' RESUMECOMMAND="${FETCHCOMMAND}"'
 }
diff --git a/net-misc/buka/Manifest b/net-misc/buka/Manifest
index d74bea4ecb72..07bf4a73ad99 100644
--- a/net-misc/buka/Manifest
+++ b/net-misc/buka/Manifest
@@ -1,4 +1,4 @@
-DIST buka-2.0.tar.gz 14088 SHA256 b7d33f15687198a78b7114251038e54ef70f3ef1a74dd84a36176874ca699793 SHA512 809c35fa0caed30c11f438fc5d68a446a2c8a6ffa6b233f5e65bb522d8de8db095ad3ef8c0811a3670a49e3994d4956f917d3d2dfda3ff488ca8793d7389e4a6 WHIRLPOOL 761a9614b41cecc821bc1279d863b620512fd7788a1ec3cbd8ad3d75e89a47ffd8e485b45b323964970ae90c5852becc10fdb61672b19e4d26bae76b67ff0135
-EBUILD buka-2.0.ebuild 537 SHA256 dd92b1d620abeba736272ab4000e3b9d07a14be4068fa6aa4aaabbd425fd5ae1 SHA512 cabf5066540c8f7297a27c5fda9e8c430e01538114c6a3a4d608a7c17c1b3c9b2a173261fbe76b1a97fcdca496eec4f21d7a656abd80d2799a345ccb2fbc0182 WHIRLPOOL 163b38fc55b3ce58d0b95f6c07a1f36dde11ff53734d4145e5fc89aea5f085d6697b822c7f0bb7c9a00aea3c9780265972c7a476074a9dfe318ad809bad20d69
+DIST buka-3.0.1.tar.gz 14697 SHA256 9ceb9605a7d9c2b05b2058665a7351dd4cd0c23672c921fd279abcc20bc6f9df SHA512 6893f1ad63130c55d2023abc0839e20f02ae4cede2162ec1d6e52d43f6b49cfc734b569776172b38bf2c208c2b41d123cb7bba9398ad689a22ce6703fa47eb22 WHIRLPOOL 403ecd8f816f28dac18bedb5925991f151f2362981b6bbcdfd191956e2d751f014f8f2e71e0fe898222605c7f3ac27107751f1028fe09419948bbde05567ea80
+EBUILD buka-3.0.1.ebuild 739 SHA256 6cb656091be75f12ad7bcf172315f42bf4ed5a86fd7cb25f152480a408b61e5b SHA512 eea2e21d435febb0e57f87d4b4dafdbd062a54af2f51d468810c78d0fff0ece75e8374eb1aea6840e2b18e074b6c75d8b175ae66c737fc0bc1a7cd02b6b698e7 WHIRLPOOL 04c9365f710c83bd55ed890a0a12b33b8bb799de4ace3f3672b1b5627fecd89162a163685cddd98797007fd4d2b1fe63541fb35e682c05f11e4484ee2f36643a
 MISC ChangeLog 745 SHA256 d0d7cb1cdb8b6405f30f6c3aa7c8ddc0241ce1ec4b7d254743e9f89f36b090ce SHA512 164eab5085a2e972868af640a3c6a387cadf12d63022388f0d3aed4148483c0e6907dfefc32592f97c86487d1c37cc4d4d44349f7dbdb9e01c3d834cbb96b0fa WHIRLPOOL ea32823a368172c09c76ed0758b113ea719499b7e72a581f467a64fd23ce4ebeb1725dd036090416eb7eb5d75a4dfe3d012cee913fd45c25ff11636a0a2dd992
 MISC metadata.xml 384 SHA256 19f8daf79678a832958b2f485c94fa7f56c5ae6607ba54ad4aad0af98949360f SHA512 2887c3fdb384617067e693c4ef66e74353127b9e95f756c510d928ae0bc2423f6812b0be1d5d0ff49af8d7b57d13c6c5cadb21d86fc74516172ce05d1a570e65 WHIRLPOOL 1ada4800acf890782a22c011c4af59acc2b1e85097486f73471534e620843bdbc5d29bc8076d58fe0d1320fdf1971d54a07cf8a9e98bde991382056acd481ac2
diff --git a/net-misc/buka/buka-2.0.ebuild b/net-misc/buka/buka-2.0.ebuild
deleted file mode 100644
index ad08fbeb3b37..000000000000
--- a/net-misc/buka/buka-2.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils
-
-DESCRIPTION="Download manga from buka.cn"
-HOMEPAGE="https://gitgud.io/drylemon/buka"
-SRC_URI="http://lick.moe/buka/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="sys-process/parallel
-	net-misc/curl
-	dev-util/dialog"
-
-src_install()
-{
-	default
-	doman ${PN}.1
-	dobin ${PN}
-}
-
-pkg_postinst()
-{
-	optfeature "pdf support" media-gfx/imagemagick
-	optfeature "cbz support" app-arch/zip
-}
diff --git a/net-misc/buka/buka-3.0.1.ebuild b/net-misc/buka/buka-3.0.1.ebuild
new file mode 100644
index 000000000000..1aa8b0d6554b
--- /dev/null
+++ b/net-misc/buka/buka-3.0.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils
+
+COMMIT="45e6b32de708759a4e15181a8e2ad5de55cc78ef"
+S=${WORKDIR}/${P}-${COMMIT}
+
+DESCRIPTION="Download manga from buka.cn"
+HOMEPAGE="https://gitlab.com/drylemon/buka"
+SRC_URI="https://gitlab.com/drylemon/buka/repository/${PV}/archive.tar.gz?ref=${PV} -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/beautifulsoup
+	dev-python/requests
+	sys-process/parallel
+	net-misc/curl
+	dev-util/dialog"
+
+src_install() {
+	default
+	doman "${PN}.1"
+	dobin "${PN}" "${PN}-parse"
+}
+
+pkg_postinst() {
+	optfeature "pdf support" media-gfx/imagemagick
+	optfeature "cbz support" app-arch/zip
+}
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 39c78e9b28aa..b386936959e7 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -4,8 +4,10 @@ AUX curl-fix-gnutls-nettle.patch 1186 SHA256 d7a0f1ae6dcd50adddc9d7cd6dfcdb6b5ba
 AUX curl-respect-cflags-3.patch 406 SHA256 b87bf2c491b057bc5af5258fffcf72d7c5e86b03218f497f097eeca845c0bc0d SHA512 3219e4e67d534e35012909243fc8d69d58989462db44dd507c502e7aaa299f1d9a01392e2c83797cc2bdb53d503470c5d6e7bf94572a6ccc6e5eafcc0466bc54 WHIRLPOOL 5d61ec7f36376bd9712e0fc7984006462ab27a7e2003dd92a8d9e78e97a2e620a5cbf6a62855ebff45b2fbf9f0bca821ffdf6ce8ff81cf2a047af9e168fb61bd
 DIST curl-7.55.1.tar.bz2 2786830 SHA256 e5b1a92ed3b0c11f149886458fa063419500819f1610c020d62f25b8e4b16cfb SHA512 bfeb39e94b8378519b2efba0a476636b80dbee3434104b98464ee81ce3871eb134e065f52abe8bedb69681b43576cb30655c8be0be6115386859d0cb426d745b WHIRLPOOL 287f6f4f5464a780c338755e4e9870381937768c9f4c9545436856ea690ae6bf4d3f886dd816cf080d2ee84e2a3fbf1a0a5a78e5fbc9d9d18bde428458819a8e
 DIST curl-7.56.0.tar.bz2 2838517 SHA256 de60a4725a3d461c70aa571d7d69c788f1816d9d1a8a2ef05f864ce8f01279df SHA512 ba17a9fdc4b540d6053fa542bd875f321d009b9ba0cb56b16fe6c217f3856ab061f2a6c735771a0eadc28338889d071884680b4d4c243b4179872abb29915e3b WHIRLPOOL 89bdd5fdf4c99fd30bd7a63ad19d2285591b19134911160c94bf46bb4cdf6156544142b47e29d7c0c9cf06536215604cfc6bc59a5ba570dc16b23626fd1b44b2
+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 6961 SHA256 ed6ec03e9a087bb894879fabbf22894dc6193c337710c71b4b5b0f7e9de55db9 SHA512 0f5fdaa7b5a2ad9d192e99127f5484fab0a4e2098ba04316469ab74c68234375bc9e554a77656fc4ddedff27c2b1e5a34de5000905b467b8ef01951732bf8687 WHIRLPOOL 035d615c9632e4e887fa9d18074ac64a4e7a2b1a7f8c59c7afe90217182a453c96c0b3ce8a8f5f0a2fa557618931e0c966e24f5d44466dd92655ea66766fcc4b
 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
new file mode 100644
index 000000000000..8c26d7e77fa4
--- /dev/null
+++ b/net-misc/curl/curl-7.56.1.ebuild
@@ -0,0 +1,241 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools eutils prefix multilib-minimal
+
+DESCRIPTION="A Client that groks URLs"
+HOMEPAGE="https://curl.haxx.se/"
+SRC_URI="https://curl.haxx.se/download/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="adns http2 idn ipv6 kerberos ldap metalink rtmp samba ssh ssl static-libs test threads"
+IUSE+=" curl_ssl_axtls curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl"
+IUSE+=" elibc_Winnt"
+
+#lead to lots of false negatives, bug #285669
+RESTRICT="test"
+
+RDEPEND="ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
+	ssl? (
+		curl_ssl_axtls? (
+			net-libs/axtls:0=[${MULTILIB_USEDEP}]
+			app-misc/ca-certificates
+		)
+		curl_ssl_gnutls? (
+			net-libs/gnutls:0=[static-libs?,${MULTILIB_USEDEP}]
+			dev-libs/nettle:0=[${MULTILIB_USEDEP}]
+			app-misc/ca-certificates
+		)
+		curl_ssl_libressl? (
+			dev-libs/libressl:0=[static-libs?,${MULTILIB_USEDEP}]
+		)
+		curl_ssl_mbedtls? (
+			net-libs/mbedtls:0=[${MULTILIB_USEDEP}]
+			app-misc/ca-certificates
+		)
+		curl_ssl_openssl? (
+			dev-libs/openssl:0=[static-libs?,${MULTILIB_USEDEP}]
+		)
+		curl_ssl_nss? (
+			dev-libs/nss:0[${MULTILIB_USEDEP}]
+			app-misc/ca-certificates
+		)
+	)
+	http2? ( net-libs/nghttp2[${MULTILIB_USEDEP}] )
+	idn? ( net-dns/libidn2:0[static-libs?,${MULTILIB_USEDEP}] )
+	adns? ( net-dns/c-ares:0[${MULTILIB_USEDEP}] )
+	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+	metalink? ( >=media-libs/libmetalink-0.1.1[${MULTILIB_USEDEP}] )
+	rtmp? ( media-video/rtmpdump[${MULTILIB_USEDEP}] )
+	ssh? ( net-libs/libssh2[static-libs?,${MULTILIB_USEDEP}] )
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20140508-r13
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)"
+
+# Do we need to enforce the same ssl backend for curl and rtmpdump? Bug #423303
+#	rtmp? (
+#		media-video/rtmpdump
+#		curl_ssl_gnutls? ( media-video/rtmpdump[gnutls] )
+#		curl_ssl_openssl? ( media-video/rtmpdump[-gnutls,ssl] )
+#	)
+
+# ssl providers to be added:
+# fbopenssl  $(use_with spnego)
+
+DEPEND="${RDEPEND}
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	test? (
+		sys-apps/diffutils
+		dev-lang/perl
+	)"
+
+# c-ares must be disabled for threads
+# only one ssl provider can be enabled
+REQUIRED_USE="
+	curl_ssl_winssl? ( elibc_Winnt )
+	threads? ( !adns )
+	ssl? (
+		^^ (
+			curl_ssl_axtls
+			curl_ssl_gnutls
+			curl_ssl_libressl
+			curl_ssl_mbedtls
+			curl_ssl_nss
+			curl_ssl_openssl
+			curl_ssl_winssl
+		)
+	)"
+
+DOCS=( CHANGES README docs/FEATURES docs/INTERNALS.md \
+	docs/MANUAL docs/FAQ docs/BUGS docs/CONTRIBUTE.md )
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/curl/curlbuild.h
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/curl-config
+)
+
+src_prepare() {
+	eapply "${FILESDIR}"/${PN}-7.30.0-prefix.patch
+	eapply "${FILESDIR}"/${PN}-respect-cflags-3.patch
+	eapply "${FILESDIR}"/${PN}-fix-gnutls-nettle.patch
+
+	sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241
+
+	eapply_user
+	eprefixify curl-config.in
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# We make use of the fact that later flags override earlier ones
+	# So start with all ssl providers off until proven otherwise
+	local myconf=()
+	myconf+=( --without-axtls --without-gnutls --without-mbedtls --without-nss --without-polarssl --without-ssl --without-winssl )
+	myconf+=( --without-ca-fallback --with-ca-bundle="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt  )
+	if use ssl ; then
+		if use curl_ssl_axtls; then
+			einfo "SSL provided by axtls"
+			myconf+=( --with-axtls )
+		elif use curl_ssl_gnutls; then
+			einfo "SSL provided by gnutls"
+			myconf+=( --with-gnutls --with-nettle )
+		elif use curl_ssl_libressl; then
+			einfo "SSL provided by LibreSSL"
+			myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
+		elif use curl_ssl_mbedtls; then
+			einfo "SSL provided by mbedtls"
+			myconf+=( --with-mbedtls )
+		elif use curl_ssl_nss; then
+			einfo "SSL provided by nss"
+			myconf+=( --with-nss )
+		elif use curl_ssl_openssl; then
+			einfo "SSL provided by openssl"
+			myconf+=( --with-ssl --with-ca-path="${EPREFIX}"/etc/ssl/certs )
+		elif use curl_ssl_winssl; then
+			einfo "SSL provided by Windows"
+			myconf+=( --with-winssl )
+		else
+			eerror "We can't be here because of REQUIRED_USE."
+		fi
+	else
+		einfo "SSL disabled"
+	fi
+
+	# These configuration options are organized alphabetically
+	# within each category.  This should make it easier if we
+	# ever decide to make any of them contingent on USE flags:
+	# 1) protocols first.  To see them all do
+	# 'grep SUPPORT_PROTOCOLS configure.ac'
+	# 2) --enable/disable options second.
+	# 'grep -- --enable configure | grep Check | awk '{ print $4 }' | sort
+	# 3) --with/without options third.
+	# grep -- --with configure | grep Check | awk '{ print $4 }' | sort
+	ECONF_SOURCE="${S}" \
+	econf \
+		--enable-crypto-auth \
+		--enable-dict \
+		--enable-file \
+		--enable-ftp \
+		--enable-gopher \
+		--enable-http \
+		--enable-imap \
+		$(use_enable ldap) \
+		$(use_enable ldap ldaps) \
+		--disable-ntlm-wb \
+		--enable-pop3 \
+		--enable-rt  \
+		--enable-rtsp \
+		$(use_enable samba smb) \
+		$(use_with ssh libssh2) \
+		--enable-smtp \
+		--enable-telnet \
+		--enable-tftp \
+		--enable-tls-srp \
+		$(use_enable adns ares) \
+		--enable-cookies \
+		--enable-hidden-symbols \
+		$(use_enable ipv6) \
+		--enable-largefile \
+		--without-libpsl \
+		--enable-manual \
+		--enable-proxy \
+		--disable-sspi \
+		$(use_enable static-libs static) \
+		$(use_enable threads threaded-resolver) \
+		$(use_enable threads pthreads) \
+		--disable-versioned-symbols \
+		--without-cyassl \
+		--without-darwinssl \
+		$(use_with idn libidn2) \
+		$(use_with kerberos gssapi "${EPREFIX}"/usr) \
+		$(use_with metalink libmetalink) \
+		$(use_with http2 nghttp2) \
+		$(use_with rtmp librtmp) \
+		--without-spnego \
+		--without-winidn \
+		--with-zlib \
+		"${myconf[@]}"
+
+	if ! multilib_is_native_abi; then
+		# avoid building the client
+		sed -i -e '/SUBDIRS/s:src::' Makefile || die
+		sed -i -e '/SUBDIRS/s:scripts::' Makefile || die
+	fi
+
+	# Fix up the pkg-config file to be more robust.
+	# https://github.com/curl/curl/issues/864
+	local priv=() libs=()
+	# We always enable zlib.
+	libs+=( "-lz" )
+	priv+=( "zlib" )
+	if use http2; then
+		libs+=( "-lnghttp2" )
+		priv+=( "libnghttp2" )
+	fi
+	if use curl_ssl_openssl; then
+		libs+=( "-lssl" "-lcrypto" )
+		priv+=( "openssl" )
+	fi
+	grep -q Requires.private libcurl.pc && die "need to update ebuild"
+	libs=$(printf '|%s' "${libs[@]}")
+	sed -i -r \
+		-e "/^Libs.private/s:(${libs#|})( |$)::g" \
+		libcurl.pc || die
+	echo "Requires.private: ${priv[*]}" >> libcurl.pc
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files --all
+
+	rm -rf "${ED}"/etc/
+}
diff --git a/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest
index 70b8f7cf06b1..cc9c45a5024d 100644
--- a/net-misc/freerdp/Manifest
+++ b/net-misc/freerdp/Manifest
@@ -11,7 +11,7 @@ DIST freerdp-2.0.0_pre20161219.tar.gz 6425913 SHA256 b71aa5e99624f7bd4c28e69cb2b
 EBUILD freerdp-1.2.1_pre20150326-r1.ebuild 2786 SHA256 a7d5d3266839d0064003a7af8d56f2be0edb386da45c96267e6cbef2ccc54732 SHA512 57788c008c8d32a69ae90ce741cca7b12d7b8d0808fd4e151bd99febb70b7d7d016dc6d586eaf9dfc3ef888cec0b752c0eb9805610ac6910dbd0808914bb5900 WHIRLPOOL 80c393052b9d482dd5ecd94460b416110abdb4a62a44044594fc4c18c93fc489de7f3d7aacc4f4468e788a51ec81f7cb1ba064ddd2ecf0de866b2860756738d9
 EBUILD freerdp-2.0.0_pre20160722.ebuild 2618 SHA256 f8c2359f54efa6ba9b33210ce67be89268dcc7872113d897a2f307e6f7cec6a3 SHA512 0b287c9c0aa5cc661077aba27d19b66e7df14286b026e096a8bc6caf29089130af8e8a8c07972157698ed6e2718d7c4ec2e98771688c49084d4ae9157913df25 WHIRLPOOL e11a14ae7d10cc1ff1b8b9915956c98333017d73e533dfe67d1d4f9ccdf22d03cb30f417b7d99e919140f3b4156b73e08ff25c686f9eb3ab4374406ff5c203a1
 EBUILD freerdp-2.0.0_pre20161219.ebuild 2717 SHA256 79f4ed394816e0d62cd3577519e973a89b61e4bfa0ee464d83a60e13c41ce7be SHA512 9b9c7c9183248983953e9dd654c804809f9c0be94eff4738d2d302e139e54aebdc76cadec90cd5fe0f54d3f687b1c68eb129316eb16e50df513fd343136570c2 WHIRLPOOL 73bc2054bf69a909accb11e58da82ecd47dbcd6b39d4cdc6612149bce93b4466d88cec2252019a0793ce798582437e1c90213841721c8ddbfaa5cfdef04f9219
-EBUILD freerdp-2.0.0_rc0.ebuild 2859 SHA256 2056d92fbebc2a1b6d5de98a27cc1da7fb2c28dfc7f3b17cd181ac947a282b05 SHA512 0e04d79ddd6dafec57f013f454f0cbff07c13ad906c9956c968e23ae84d61c0ffc4c1cdfd1ae821e05c29657a84967ee8f0942488e5840f8613376e5fc83e347 WHIRLPOOL 5039f73774ca3b423f219b3ef5f4ecda16410482fae0cc265ffc54d8b354eb84bfef70ad323cd5e9e9908f971897747e1f3043828fa011f3ec88c24e41fe71a3
+EBUILD freerdp-2.0.0_rc0.ebuild 2858 SHA256 ea9f428a5f81f427a66e8d0cf0d75d84f1fdd0e036772e4ae2c8b793f55d7a6f SHA512 7615ad8cefa50ef9120d7f0121736cb8fda6668cec404391c45c4c843715863df745d762dbbd2f01cb0239933e76aea0a192b11f054c68b6f44200f71517c61b WHIRLPOOL 56f3957d6157a63357064c3d944f18d2c6f0178ae9e714908df67eee32f1d607c1af0a57ad8e78d4e69c8fd6611378dd330e62dbe2db4ec152dafb9e2a689e88
 EBUILD freerdp-9999.ebuild 2750 SHA256 920ece2f9682ee7f2596683a2a066582a0a1d13e438349b1523d227bfa7cb3de SHA512 67262976d2f1e4b990aa02347c81bd91f916425ba3ef1963800ee98632c5f9cb54121f1548125d83b0c83222508fdf8788f566d37cfbcdf9fc8d58543cb2ade4 WHIRLPOOL 906978a8f4303c093134f8126de0391d412e11065ec5b06c352d72e443b81dd884cb9bb843e9ad5171a4b7460d8141f3dcdd9275461e85cdf310dbdbf05f41d6
 MISC ChangeLog 6836 SHA256 3c7bef6d4b666b0d2a39418b1b3782a2f08bcc3dfdd844251cbd4af9552581d6 SHA512 67939aa2da6a6846b44cd211c85536bed311e43ea3177bc13599fffacccf7de0559ea3c01b2f7ea0477542bc33a265c8631060286770385132bc09f9c647d763 WHIRLPOOL a79bc36cf9dca2cee4f7a3eb0bef7f41c8357d8c5ebfe01c4dbbe601f8451ac713e8aa983d17c25c5557ad76a21b1bc89a42fdaeb60d97cd0c4ed6e05b027927
 MISC ChangeLog-2015 15438 SHA256 441eb5b5de512e3a69e2d6534e6df2887eac0dc47442bbae9d9d38da4c8e6418 SHA512 860511c1522ab39ac87790071dcf3d184b482747c95c26262a0dda8e169c27ea543132f342e24f706acd4149e2e974070313244a900b457c6b9c8b083a7a34bf WHIRLPOOL a66bd0559152bb47bec372a8e90e5877d863f3fcf25ed22a04bf5bc87a45bdbb5b909dea6e3fcc25b11b301ee3857c609d6c15749c955cfd80da65cef532b01b
diff --git a/net-misc/freerdp/freerdp-2.0.0_rc0.ebuild b/net-misc/freerdp/freerdp-2.0.0_rc0.ebuild
index eef56aa415d3..7d33504d37ca 100644
--- a/net-misc/freerdp/freerdp-2.0.0_rc0.ebuild
+++ b/net-misc/freerdp/freerdp-2.0.0_rc0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} != 9999 ]]; then
 	MY_P="FreeRDP-${MY_PV}"
 	S="${WORKDIR}/${MY_P}"
 	SRC_URI="https://github.com/FreeRDP/FreeRDP/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86"
+	KEYWORDS="~alpha amd64 ~arm ~ppc ~ppc64 ~x86"
 else
 	inherit git-r3
 	SRC_URI=""
diff --git a/net-misc/grive/Manifest b/net-misc/grive/Manifest
index f13b11d64928..11feecb81777 100644
--- a/net-misc/grive/Manifest
+++ b/net-misc/grive/Manifest
@@ -3,12 +3,14 @@ DIST grive-0.4.0_pre20151011.tar.gz 160502 SHA256 0e480a0f5aa1ba008d8e7e3f8cb019
 DIST grive-0.5.1_pre20160114.tar.gz 162888 SHA256 20c15d84894a2943c50e6a9c1c95d1d29b5ca7240427dcd32e96113e5246a420 SHA512 8d10a9c1f36149def23326f3edd4350b156c59d6c2caa3d9ea262d9f61e174f0af2264a0c8d57592625c0e7cd5f9e7e171d01ff0c6a879a5605e44bb4c9a62d7 WHIRLPOOL 782fd3160f8970b837b989129993cfdb4e12327df46806c66aa8a5417ef9295373fe7e6acebfe7c30a00c936be67d127d8b886cb7cd3b4bfd79c8b71437bc91c
 DIST grive-0.5.1_pre20160706.tar.gz 163646 SHA256 299257850a482a08f556992c5cc895e1335206a13f94c40eb6afeb203f3e9cd1 SHA512 05496c9d38b13804b5839cf6a5d64a588e670b0e6d2796fe7f7a66267ade34f22bde28cf34210a4f2d36f12671ba38c963b3fc3fa6f8f80ff8b143aace648b52 WHIRLPOOL 44f0d778dd7e8240f6dec2ce437016cef1cd2fc824fd2e0c1d406758facea46e356e0716d438dcd07992c35f722e807db531c639385ff03e38a5653ffd0567ea
 DIST grive-0.5.1_pre20161004.tar.gz 163085 SHA256 d3ca4b728ba38ff735afbd308effaf18a6c1586487e9e15c8b4854144eb916f7 SHA512 1de5c2956d898d0a67e28469d7cf054e83b63f6dca736a60f875fbaac3197bc425432c43db2472e87113df2fa5da49eff9e17cd33610ccda7ba5bf0c2d4966c0 WHIRLPOOL 76148f8fe94cb0f5846e178d3bc9f35d61bded9181cc2835ae78040ee1b37fedeca6e1d7e8db7a55ed6e9390aca4135fda4e7f1aaa40621d618aab908c33e075
+DIST grive-0.5.1_pre20171005.tar.gz 164450 SHA256 b30f7c91cb93690ca263615a407e10bbff369c39b627d9b58cbdbd5d70761cde SHA512 d1f2b3bb5206aef3afeebd48f198a287f97a016f5da00f954fbdcf366ea7178c0e2c6e48250cdb0869bc850380ed09790b5bbdc1ecf3cdd7b484fcf9b85c793c WHIRLPOOL ef51324264a332af4d17510cabe7573d944d43d4f55fca681c3523b77b551bf1469389535377898244ea80b8d8a67969eefb69ddfa9493c308b46c6208a95f36
 EBUILD grive-0.4.0_pre20150905-r1.ebuild 756 SHA256 652d5d74c6a50c64d405a6d90dbc70ac2486f8adbd6db86f4baae0d473387abc SHA512 42f1338b6ff0290c6f2c3ff2c415790dbef5200edfdf11e349a1a4113375c1a59aa270a22d86c449c6fecccf5ca2b066557c733b418816a79ec3a78e59ba34d6 WHIRLPOOL 22b54e1e4c68e37eef4c2c2c8de469eca5c0a7e174137129fa9d03e4e6f59b2da1244688398b8c24d7695f967fe532eb82387b66ebffcf623e0d18b41000a2b5
 EBUILD grive-0.4.0_pre20150905.ebuild 729 SHA256 d782a0d72f9948e332a778e7248637a0f621804ee9d04db54eb8e2ef1e2ff54f SHA512 2bb48709a5ef707789bb8ee82eb146c467b11569b55fb420ee5fb6bb1227e306ad8a443c8ba69065e6e645d81b7457d61cf1ba4d0f8c7b55965db962a095854f WHIRLPOOL f3d2a01ca521c118395e8e4454a7a25e9e2a83f7202036803366336a22d6bff5298124cc6b25f8b12f20248c05b861a4ed377d644ab591a9f2811e0ce5e3cba2
 EBUILD grive-0.4.0_pre20151011.ebuild 756 SHA256 ffa8d273aba4693c4c28f0c59d0b902f4f79e8085b3ad3b32bb596cb1d4b33c2 SHA512 e5a8a365d6df018fb8d17b86becf6a00816518a81ead442148d49b6f937b3fac96f9dc5865846dba788b662f104142278312f88e4e4be72084700150451223ab WHIRLPOOL acc9620211567c2e271ccdae79d6b253ed5d159c1b0f5ceb0489045fd0c8a5043eaddb59ce242217cf9729e9e4ded41f36337553c1c41e85ff09d7920f014e36
 EBUILD grive-0.5.1_pre20160114.ebuild 756 SHA256 c50948d668c8cd1499134e5ec10055f9aa74f4339d769e5d19ab59686732bab1 SHA512 93784b777dfbd9614856b9ead55cedf7dc3ef216cdf6533a22b82b9b9e28d634a173f33482a929e42c303d13e1390c9468007110a5dc7aa5c51dd30308a396c6 WHIRLPOOL 7df0c934382bf4987fbe9f60f84b62ea3f2a1b0fd3a835444f3dd17f97e67e1b31301b23e9ab3dd30d89f38878e8275c0adc13bd631475339308a6344f6799bd
 EBUILD grive-0.5.1_pre20160706.ebuild 812 SHA256 dc312b5c170bec979c7723f4d2d06bd58e5096fef8f115c251e43031900e574c SHA512 c352c56b885251e3e7d0243ebfa23dd5945dd57b010e277c595f9ac93657cde1ccddcc3cddabf9356433cedc47b47b861906133fea3a3b5985c8d6125cffd161 WHIRLPOOL 972a7b77949744cec9a72455f4f9c3b4e3e07ed4d9a45c1a57fe720c8c366fc2d45863bf1a29208ea571a34e426de0b640db620962c1668b1d6a4f25205503b8
 EBUILD grive-0.5.1_pre20161004.ebuild 812 SHA256 51e5d1862675264a5f1ce296b194822172ac3f3a3ee27c0fa57401a61543349f SHA512 7b0dab16186ed93f95dfedf9f9ab04aef9bb0a259843e178fc8d83f47f8cbae0d45fa98d246cd39394a4612ce9a47b7e6e53de5cef31209d67feb144eb1496cf WHIRLPOOL 617c69cdc9e54b1a63651cc7d2f52184210aa04ca93f65170fe2519366defcdd32fc020910ccb56101d416d21f54c4fbec52f9b7b1f98501c81b5bc9b4e61560
+EBUILD grive-0.5.1_pre20171005.ebuild 813 SHA256 2939afa688a41b06cdcdd1a4a6b557a20bb0152d87210a79e2d1f2be840a21e6 SHA512 8efff2dace77362f70f1c5c1ff9d51ac23da448301bca844b670183982f733c599a2ff9e1f09f2f0be0f86894e8458f3efa05c9e49a1843031153cde8e01bb7d WHIRLPOOL 7d858b3ef430a09e610a86ab8f28b2a72789d775d6321b52b76018ccced3d22523e43f2f64e31b1460675b326d4c1d25b763ef2d30a8b3012ed0af2527e3d454
 MISC ChangeLog 3904 SHA256 152780d525509d11d620c516e27b258fde8156a3be3458f349ef1ea879fa8573 SHA512 a7c3593311b7578a4688831fb06672927d1fde04accacc9365e0588f3a87e5ccfd9b279c05377295e7aa0283c0886bdf861288dab3bae525d9cc91db542c6f05 WHIRLPOOL 09c80fc8310eac2982ff25c6f5b777e11810b067afe21beaa4c4ea9251c141b10edeecfb3a217374ff078755f6a7327a6d8be16fee3d95872e7fdf8064aa1f9c
 MISC ChangeLog-2015 2321 SHA256 fea33186e53950e1acef7faba8a4d0fa18509bc0097d0cfa9568e1112f5a88f8 SHA512 258d4f0aad33ac7b1f98902f429db9d82d0428213fc89dcb2240e059537b804e8f02cbae6ed07c60ddf94063247a07bd734627a8dfb172dd692cc4ce7f805406 WHIRLPOOL f1310de874f525e28bb1d4d8f3108e4e1508f8bd1d189e130167db9bda42a8a8e521101a6b50aee3d1c55dfb9bb51b172e2dcb409fedb47f6ce3bd516076f00a
 MISC metadata.xml 329 SHA256 e495e865f6ff660bfee1d79d7b97a0b44ac2d5c611cb84432fb9e3f3a15471d6 SHA512 532fad0c5d87182dc633286d564f01cfe82a455b8514e2147de1bcc366d3d6655917936bedfb5ef8182266cd9a270efbe0e77fcab654b1472c244b260d2b3997 WHIRLPOOL 6409be4dd1e38bc73d484cc42be69ee79e3a44dcc4521b55ed62ef05d2a20bed03539882bea05c7ad3e99d964338d8a6ac47b29054a64afad0aa83bc2a2b29e9
diff --git a/net-misc/grive/grive-0.5.1_pre20171005.ebuild b/net-misc/grive/grive-0.5.1_pre20171005.ebuild
new file mode 100644
index 000000000000..744cc461a623
--- /dev/null
+++ b/net-misc/grive/grive-0.5.1_pre20171005.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit cmake-utils
+
+if [[ ${PV} = *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/vitalif/${PN}2.git"
+else
+	inherit vcs-snapshot
+	COMMIT="3c90425b8f46b62365ec3d84de628163865dbb1e"
+	SRC_URI="https://github.com/vitalif/${PN}2/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+fi
+
+DESCRIPTION="An open source Linux client for Google Drive"
+HOMEPAGE="https://github.com/vitalif/grive2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-libs/boost:=
+	dev-libs/expat
+	>=dev-libs/json-c-0.11-r1:=
+	dev-libs/libgcrypt:0=
+	|| ( net-misc/curl[curl_ssl_openssl] net-misc/curl[curl_ssl_gnutls] )
+	sys-libs/binutils-libs:0=
+	sys-libs/glibc
+	dev-libs/yajl
+"
+DEPEND="${RDEPEND}"
diff --git a/net-misc/iputils/Manifest b/net-misc/iputils/Manifest
index 5ca0d28c7f1a..98544fe1b5cd 100644
--- a/net-misc/iputils/Manifest
+++ b/net-misc/iputils/Manifest
@@ -13,10 +13,13 @@ AUX iputils-20121221-tftpd-syslog.patch 1075 SHA256 8502f11dd440a9df42da52e3426f
 AUX iputils-20150815-nonroot-floodping.patch 406 SHA256 0a2409e1dd040620adc88720f1bb3955d2121762dc600865167332f9b90f3f57 SHA512 4f63d788d4aeccd66c410b6cc3352934a9b7d9b1222dedbcd7688c2b884b620a308b44e2dc777421cef20365a6ae371d59ad349f76bc5fcc751f90169a8f0d34 WHIRLPOOL 56d86953105832e589e2b75ea6a806c09ae21d8b9f82e6734cd0b5522b7dfb0291c6f65fdd4baffa120281dc176dd6a5d0bf6f730bd35147a6e654feb02eb5cf
 AUX iputils-99999999-openssl.patch 2532 SHA256 0ffcce81badea00e84bdaf49929bc657ab574e98824a65ea3cd9015421372644 SHA512 2f782d93466d2db7d01295c7ec7c24fdb529e28f76c703c112d5dc8b4600402a68d4caf3c1df4f8879149e6fa52bb208dd14879cb01741544ccd49552e017afb WHIRLPOOL f51c56cbf23076f3db504a008e1eb732c9f961c86f815af57dfde96627fd2f15cc9fccae26481bb39a4365d3333e9080984f46bbd9370b9cfbfaf52625b5dfe3
 AUX iputils-99999999-tftpd-syslog.patch 1075 SHA256 8502f11dd440a9df42da52e3426fa93aa4e4d879093be723601a4adf52c62d2b SHA512 43fa506475f138e92d04bd6a4417511caa3ed1636f6dea5d3930b6dca164a809338ab1f24b4bf084581ff849189a8240929182fa24897e252994851a6aae5188 WHIRLPOOL b32d3eeb0dd48012e8e5ed6ad14d603c1280e7203ce5ba6f465bfc005bb44b5fcac23eced9a6b7353966749541ab75380b347c98e46805e3e542562474f024df
+AUX iputils-99999999-tracepath46.patch 824 SHA256 883504e64394506473e48943fdafa60c2d90e267ff61b89cf78a824f62b7084f SHA512 65638246a73334640b02a136aa55a4a709d7c4639c57b7634d5595ec40d4bc9c41068a1469a76d22d0a216e9a2c8a52f7840432c435f40ee7035981494d0a443 WHIRLPOOL dabc88ec500a54418b999697e21ca9d0b570c05df8f289b8f518af81e0c547588c406741e78f0a1a6d6384f01121d28d90b69413d5cae7d68361d551af1a641e
 AUX rarpd.conf.d 250 SHA256 86e79f5a4be44f8b15a8743b4b3128f2bcc40a553f81ebfd902c590f82d12a60 SHA512 8ff4c38b4f51f92ec6d66a446272e0cd9d958c3075162c5a4aa47eb54bb69f27045b888f8a547394ab3de51bdb69f14b8df528785a8c967fa33ab0c4db329338 WHIRLPOOL bf9e8b6d15dfaa4e76e0af91781cfa675b6db547e9293ea67f0ced50ed2e7ccd880bcbdffac12a197f85f1d643148cb806a10ce9d586c89be1f26248c1fc6aaf
 AUX rarpd.init.d 583 SHA256 4b3efb6723a0c0b9ef7988ed9d3100ece49180483aa51fb69cf055e5d1565391 SHA512 926feed1792799ba63afd9a67111c7c3bf8157b758190a5f1587c25b016aa82cdeb4fbffa41ffa5012f2c3dae05fb8f4c0f0bf0ae2b3048c1299d9489ce1bada WHIRLPOOL aa25eb5ca849825842d9968ff0928552bb6070b1e8435e74b1af579c6382332941ae4f99c02c3a3eedd34474814e74733d9f15e4c88583aeb06003d508338e48
 DIST iputils-20160308.tar.gz 195348 SHA256 803d11b14af1bd3852c83111cc29e904bc3ca936c093dbb419d0671d3c9d964b SHA512 6b4d6e58ab8f1218f3ab52da695f252bd3e0004ffce755f2378b44fc3b4fbf9beb9beef51ff12f14348a07f6fe8525e64dba7f5d7b70997423d2c98c5ff7dde2 WHIRLPOOL 8a5691fdb70c6a9741adfc09206a4fac041616c6e81e9ef918435fed09c6085a35592eb72055dfbe2a237ab8ed1a018aa824968ff15ad842b923e28743f5cdbf
 DIST iputils-20161105.tar.gz 195879 SHA256 f813092f03d17294fd23544b129b95cdb87fe19f7970a51908a6b88509acad8a SHA512 1593077b6eff1e57eb8a32897dd9624a745d0c87db1501a96436b168b109ef22d41ee69406a4a2154d8d72c823c1df723b4c52eeec8d82ba2762fb01dc0d4797 WHIRLPOOL c5c693cca2dbe24c41e6cda123565bd4638641ddf7c69919d17d0ba9f45e1f289b9e5dd5819b24a9a1968f7f89a18d4ff295e963c299d3988aff71460677976c
+DIST iputils-20171016_pre.tar.gz 195254 SHA256 2f1870633baeb999fe214a8958353f291caf3cedac242862930d41c760bf1748 SHA512 570896fc58d945e08032134701ab6ea02bbf6fff420437bc5f89687cdcce6f3c1c64418a4c5ff54ca3cdc582bae2c95e196b2c8368eba2b163ebf88490aabf99 WHIRLPOOL 76600ed31bfa10535c7aa6e33ab5019db8814c55ca9941a3857300bccb89650cdc8edea9d654103151bc5f54643f5618c9261d7ba5fa5c14e8f6293bca340db7
+DIST iputils-manpages-20171016_pre.tar.xz 29764 SHA256 f23e5bee1d59c5b8cabc47faab5d175de1c5b663379108ec70e75d2a74888883 SHA512 31b4b0b4e46d7c98530577392c636e4397917cbe415762145a119e68e3223bc85b9d5afcfe61ae01584a35f6a1a772adffc52deeedc722c474179fa1d208d8d9 WHIRLPOOL a80cfa73dd326dedff76de06b3939f631ff017e3bd5cbeb0f988eb27ad997c62c2be1dc645f3e415b7081942a0cbf9139729c998c77b47c989ccd61ad272cf6e
 DIST iputils-s20121221-manpages.tar.bz2 23778 SHA256 6fc7ed7d281b7a2ee00e4f75e5465c90498c685bcc988afdff74db4eaa736d1c SHA512 006be62e61bf1555c99dbd5aac270cbd8d1074a3016fdde3aeed47e5c9b1acd326aa30a596c532d6688827f7f61966a6e3141eaa3b6f4f943eb21ac227282d8c WHIRLPOOL da0ccb577c4b2189553419df2c093404752fb2865eb3e0bfececfc242d930ceb44f96b32d945cfdd0c9ca060359651b2ec8479db5cc9220cda412dfeee5e910d
 DIST iputils-s20121221.tar.bz2 155344 SHA256 450f549fc5b620c23c5929aa6d54b7ddfc7ee1cb1e8efdc5e8bb21d8d0c5319f SHA512 693d240becd766c345c3af2053fc0699b9358e54d667d40738c21d731b70e779112d81476a220d8300ca54250120385414a13610d445996f95a90571047389f4 WHIRLPOOL 64529180eb4b8e2f7a60c18df7cac49e10a4b7702514252d418b16dcdc10a85ccb0a7f8beb51274cc9d708be2026c4c136e720986795fd39d314e4f9d5590ec9
 DIST iputils-s20151218-manpages.tar.xz 22336 SHA256 ae60dcf7a5a83d02008c03888935fd2dcff56c9f86734d4656b6284a7631a28d SHA512 964b9e22b18b67215ea48e046c45768cd86076b53db2131b00ac721be9e7de4edadefb74855d81861f12b4e10dcecd90d29f0098c2c4568d7601d97e756be0a3 WHIRLPOOL 82e3c9930861ed2df00c3b40488212dc36d5d65d62e1e7245d778ff77c6660a93bdd1dd8931cdddba4a631a9321741c0c2246d0cf48b22fc562ee7a066ac75fd
@@ -28,7 +31,8 @@ EBUILD iputils-20121221-r2.ebuild 4051 SHA256 0a64b2b06d19398aeb897343331a6726c1
 EBUILD iputils-20151218.ebuild 3977 SHA256 9624dd416733b58c1a9815304144fbcb0de07940dc6e471ea9e8f26555660752 SHA512 b07ffea44d85ea3aa0a92ab606386d7d1a917eed700c421aabb4af6ae4b46b1fc5e9ef1f942a441441ec4171548b9dc04f7bd73b75804568579ec044b297dbc0 WHIRLPOOL 7b34b8d257060570c7d837c6ed055e7e2c5a56c312b3e9ff00254268ec52bdf77511dd7fee0501f2a39dd11d3c12df67331c901655491165c9bd8104fa36a701
 EBUILD iputils-20160308.ebuild 3838 SHA256 7d5e1ea302cb909cad75f3caae438cec9c7b9d98170a13972d9d284da363fb5b SHA512 596ab450370cb8883d3480e8e0a21cc27ecaa19ba7499296a0c67e84fa8bce3c085f66d87eea03be19d54b780a8933f752999196b13d2b3d0a66faec2f756d08 WHIRLPOOL 39f3b25e0ebbde84a1935aced624b3c4004c40d992bb84542cd214003fdd2d6169a0c5374a11e8116177d4fd9b27ac0437547b3fc1ab9fcf2b2b9a411730bc20
 EBUILD iputils-20161105.ebuild 3870 SHA256 2a735d03e5d5e68917eff814f785ece65814b796ad7c82fb995bb0510fb05fd2 SHA512 64f9077c8e69b02db0560a1213293d27cfebbd5a02d62f75b53f6ee3d76b46c64ce2995ca1c6e7b3fb22185f33fd40a0da4a1796307883adcbbb47ed123b9611 WHIRLPOOL 0ce5472affdeec7294d315f446bb4ea44cb645c11af82a6e2b9278d4b5cbe41162eb2c98d36bf8e325153c8c390b17f7fc65f9cec2a54e11b3d95d8458c071a1
-EBUILD iputils-99999999.ebuild 3782 SHA256 587d4ab16e53b0956626bcfee225c4f8d56fce7fc7b343038c18979eaeb06305 SHA512 ddb3c5f8c70bd80011b876773a77ef825913a1b21840d68c511eb5015e52aebc8860c6fc65e81618ec6b247fcf90416cf3593fab60e6cef7d3a9867332435bad WHIRLPOOL b0ac4f70d18ce2c24e61620488b9fc88b253ef2ad21cc408de30d5fb6dca0d1bd2ef488c2774bee84adc26cd2e0bf61711c15e29e4db2b5a1d5863d36c537cc6
+EBUILD iputils-20171016_pre.ebuild 4047 SHA256 f59e918116747eb88f5302d8114cdda78298ea6b871aa4a30d533c9ca40abba3 SHA512 3880b66f83d0fd16264d33bdf921a20dbfeb36aba0e0bfb4f66edf7263f2073d1b11b640c767fff7e2b942e579b169a84635fc39d663b7dfc23391e7a9fbb3dd WHIRLPOOL 4e82c0eda67cf89c736f90e91404cb7ea131ab6e15bd1911a65883adc737c0a2ca1d3ade2772fbedeb2693d91358f8b2ce182cb198456b24202e1fde6bdef930
+EBUILD iputils-99999999.ebuild 3952 SHA256 83b873e1928ceeb5395b548036eb45fe69bcc32408f30b2e6dbc036a6d35fe5f SHA512 6a8b9785e417e02b7bc197971e83a7f548e5881a13308ffdb91dbb0f57931eb602761d9282323700272e03ff1f622af2fca4cda8553fc65b4f864bad81af91de WHIRLPOOL 682db8620f2543227d73c87c3c8800f4c46cdfaec91275e16af1bb777e9042af5c6686b460b30b1d04498b7ef20c11667ba1b128fac7fc34d0f88fc293c9ff41
 MISC ChangeLog 9602 SHA256 b860b10f98c5ce47173ef3e78599cc524579114a8fcfb2a0ea4e3938cc42244e SHA512 7824d23cb1249c0008aa507cea0d30be9d2dcce0053bf1a20a12df3527357530120c9559c7f4ac353e880ca1c3d07c4c56a29301e59ed43ca3a5362e552f7015 WHIRLPOOL 63cde37c69f443e03196145b99456ebf254d766988272002c38484e1139bf42efd57b7d976ce2064a41398346fe67d3a27b275ec84a998f300422b528782d2a9
 MISC ChangeLog-2015 22418 SHA256 9558c8a0c5143189ef51deae9371d71bd200f5f08a8aff2de94786c42a06b400 SHA512 01a5bbc5d9f4cadd403c4a455d029792278e23c5d78c830fcc685e5706bc19ec240e3807e48da80d0ed84e103e7ddf465f7b9500af42b31bd6fb8d22465e76cb WHIRLPOOL 3aa152858f0cca507036021355ce50823635655e932d51c3f4e7915b1239385931f07385d19a0e04e6795b628f356cdf8a7e6b39b20280c9de7eaf7e4cf6fade
 MISC metadata.xml 1698 SHA256 f42c67ff65e69eecd35829e42ad6f7ecddc6a92c79996557146f1c2099eaedf4 SHA512 f1d211dbe4212072614039c5aea1996270560a24dfa3734af86c4f1f4254cc3abf8440c03d8894b925b71b970e70fb60e79682753655a68b82203cdc401f6ebc WHIRLPOOL 745fa143c468727485be53de43f4748f170588a9d2f36a2d5aff4681c1e1a484866b7e59e91db724fb5948d383f61ff232791966fe112bd6a2e34d4d671d521e
diff --git a/net-misc/iputils/files/iputils-99999999-tracepath46.patch b/net-misc/iputils/files/iputils-99999999-tracepath46.patch
new file mode 100644
index 000000000000..20d017b34ee9
--- /dev/null
+++ b/net-misc/iputils/files/iputils-99999999-tracepath46.patch
@@ -0,0 +1,30 @@
+From 2c4d0838dda90515d4971881d86e8b969baebe01 Mon Sep 17 00:00:00 2001
+From: Thomas Deutschmann <whissi@gentoo.org>
+Date: Thu, 19 Oct 2017 17:38:20 +0200
+Subject: [PATCH] tracepath: Support calling `tracepath` as `tracepath4` or
+ `tracepath6`
+
+---
+ tracepath.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/tracepath.c b/tracepath.c
+index b0eb911..d2a6edf 100644
+--- a/tracepath.c
++++ b/tracepath.c
+@@ -394,6 +394,12 @@ int main(int argc, char **argv)
+ 	setlocale(LC_ALL, "");
+ #endif
+ 
++	/* Support being called using `tracepath4` or `tracepath6` symlinks */
++	if (argv[0][strlen(argv[0])-1] == '4')
++		hints.ai_family = AF_INET;
++	else if (argv[0][strlen(argv[0])-1] == '6')
++		hints.ai_family = AF_INET6;
++
+ 	while ((ch = getopt(argc, argv, "46nbh?l:m:p:")) != EOF) {
+ 		switch(ch) {
+ 		case '4':
+-- 
+2.14.3
+
diff --git a/net-misc/iputils/iputils-20171016_pre.ebuild b/net-misc/iputils/iputils-20171016_pre.ebuild
new file mode 100644
index 000000000000..691040d27e10
--- /dev/null
+++ b/net-misc/iputils/iputils-20171016_pre.ebuild
@@ -0,0 +1,175 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# For released versions, we precompile the man/html pages and store
+# them in a tarball on our mirrors.  This avoids ugly issues while
+# building stages, and reduces depedencies.
+# To regenerate man/html pages emerge iputils-99999999[doc] with
+# EGIT_COMMIT set to release tag and tar ${S}/doc folder.
+
+EAPI="6"
+
+inherit flag-o-matic toolchain-funcs fcaps
+
+MY_COMMIT="67e7d0daf1f231cc708217e6aec2f8d5ce7aeacf"
+
+PATCHES=( "${FILESDIR}"/${PN}-99999999-tracepath46.patch )
+
+if [[ ${PV} == "99999999" ]] ; then
+	EGIT_REPO_URI="https://github.com/iputils/iputils.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/iputils/iputils/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz
+		https://dev.gentoo.org/~whissi/dist/iputils/${PN}-manpages-${PV}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="Network monitoring tools including ping and ping6"
+HOMEPAGE="https://wiki.linuxfoundation.org/networking/iputils"
+
+LICENSE="BSD GPL-2+ rdisc"
+SLOT="0"
+IUSE="+arping caps clockdiff doc gcrypt idn ipv6 libressl nettle +openssl rarpd rdisc SECURITY_HAZARD ssl static tftpd tracepath traceroute"
+
+LIB_DEPEND="caps? ( sys-libs/libcap[static-libs(+)] )
+	idn? ( net-dns/libidn[static-libs(+)] )
+	ipv6? ( ssl? (
+		gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] )
+		nettle? ( dev-libs/nettle[static-libs(+)] )
+		openssl? (
+			!libressl? ( dev-libs/openssl:0[static-libs(+)] )
+			libressl? ( dev-libs/libressl[static-libs(+)] )
+		)
+	) )"
+RDEPEND="arping? ( !net-misc/arping )
+	rarpd? ( !net-misc/rarpd )
+	traceroute? ( !net-analyzer/traceroute )
+	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )
+	virtual/os-headers
+"
+if [[ ${PV} == "99999999" ]] ; then
+	DEPEND+="app-text/docbook-xml-dtd:4.2
+		app-text/docbook-xml-dtd:4.5
+		app-text/docbook-xsl-stylesheets
+		dev-libs/libxslt:0
+	"
+fi
+
+REQUIRED_USE="ipv6? ( ssl? ( ^^ ( gcrypt nettle openssl ) ) )"
+
+[ "${PV}" = "99999999" ] || S="${WORKDIR}/${PN}-s${PV}"
+
+S="${WORKDIR}/${PN}-${MY_COMMIT}"
+
+src_prepare() {
+	use SECURITY_HAZARD && PATCHES+=( "${FILESDIR}"/${PN}-20150815-nonroot-floodping.patch )
+
+	default
+}
+
+src_configure() {
+	use static && append-ldflags -static
+
+	TARGETS=(
+		ping
+		$(for v in arping clockdiff rarpd rdisc tftpd tracepath ; do usev ${v} ; done)
+	)
+	if use ipv6 ; then
+		TARGETS+=(
+			$(usex traceroute 'traceroute6' '')
+		)
+	fi
+
+	myconf=(
+		USE_CRYPTO=no
+		USE_GCRYPT=no
+		USE_NETTLE=no
+	)
+
+	if use ipv6 && use ssl ; then
+		myconf=(
+			USE_CRYPTO=$(usex openssl)
+			USE_GCRYPT=$(usex gcrypt)
+			USE_NETTLE=$(usex nettle)
+		)
+	fi
+}
+
+src_compile() {
+	tc-export CC
+	emake \
+		USE_CAP=$(usex caps) \
+		USE_IDN=$(usex idn) \
+		IPV4_DEFAULT=$(usex ipv6 'no' 'yes') \
+		TARGETS="${TARGETS[*]}" \
+		${myconf[@]}
+
+	if [[ ${PV} == "99999999" ]] ; then
+		emake man
+
+		use doc && emake html
+	fi
+}
+
+src_install() {
+	into /
+	dobin ping
+	dosym ping /bin/ping4
+	if use ipv6 ; then
+		dosym ping /bin/ping6
+		dosym ping.8 /usr/share/man/man8/ping6.8
+	fi
+	doman doc/ping.8
+
+	if use arping ; then
+		dobin arping
+		doman doc/arping.8
+	fi
+
+	into /usr
+
+	if use tracepath ; then
+		dosbin tracepath
+		doman doc/tracepath.8
+		dosym tracepath /usr/sbin/tracepath4
+	fi
+
+	local u
+	for u in clockdiff rarpd rdisc tftpd ; do
+		if use ${u} ; then
+			case ${u} in
+			clockdiff) dobin ${u};;
+			*) dosbin ${u};;
+			esac
+			doman doc/${u}.8
+		fi
+	done
+
+	if use tracepath && use ipv6 ; then
+		dosym tracepath /usr/sbin/tracepath6
+		dosym tracepath.8 /usr/share/man/man8/tracepath6.8
+	fi
+
+	if use traceroute && use ipv6 ; then
+		dosbin traceroute6
+		doman doc/traceroute6.8
+	fi
+
+	if use rarpd ; then
+		newinitd "${FILESDIR}"/rarpd.init.d rarpd
+		newconfd "${FILESDIR}"/rarpd.conf.d rarpd
+	fi
+
+	dodoc INSTALL.md
+
+	use doc && dodoc doc/*.html
+}
+
+pkg_postinst() {
+	fcaps cap_net_raw \
+		bin/ping \
+		$(usex arping 'bin/arping' '') \
+		$(usex clockdiff 'usr/bin/clockdiff' '')
+}
diff --git a/net-misc/iputils/iputils-99999999.ebuild b/net-misc/iputils/iputils-99999999.ebuild
index ce003cbf4fee..9731575e02e3 100644
--- a/net-misc/iputils/iputils-99999999.ebuild
+++ b/net-misc/iputils/iputils-99999999.ebuild
@@ -3,20 +3,22 @@
 
 # For released versions, we precompile the man/html pages and store
 # them in a tarball on our mirrors.  This avoids ugly issues while
-# building stages, and when the jade/sgml packages are broken (which
-# seems to be more common than would be nice).
-# Required packages for doc generation:
-# app-text/docbook-sgml-utils
+# building stages, and reduces depedencies.
+# To regenerate man/html pages emerge iputils-99999999[doc] with
+# EGIT_COMMIT set to release tag and tar ${S}/doc folder.
 
-EAPI=5
+EAPI="6"
+
+inherit flag-o-matic toolchain-funcs fcaps
+
+PATCHES=( "${FILESDIR}"/${PN}-99999999-tracepath46.patch )
 
-inherit flag-o-matic eutils toolchain-funcs fcaps
 if [[ ${PV} == "99999999" ]] ; then
 	EGIT_REPO_URI="https://github.com/iputils/iputils.git"
 	inherit git-r3
 else
 	SRC_URI="https://github.com/iputils/iputils/archive/s${PV}.tar.gz -> ${P}.tar.gz
-		https://dev.gentoo.org/~polynomial-c/iputils-s${PV}-manpages.tar.xz"
+		https://dev.gentoo.org/~whissi/dist/iputils/${PN}-manpages-${PV}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux"
 fi
 
@@ -43,13 +45,13 @@ RDEPEND="arping? ( !net-misc/arping )
 	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
 DEPEND="${RDEPEND}
 	static? ( ${LIB_DEPEND} )
-	virtual/os-headers"
+	virtual/os-headers
+"
 if [[ ${PV} == "99999999" ]] ; then
-	DEPEND+="
-		app-text/openjade
-		dev-perl/SGMLSpm
-		app-text/docbook-sgml-dtd
-		app-text/docbook-sgml-utils
+	DEPEND+="app-text/docbook-xml-dtd:4.2
+		app-text/docbook-xml-dtd:4.5
+		app-text/docbook-xsl-stylesheets
+		dev-libs/libxslt:0
 	"
 fi
 
@@ -58,7 +60,9 @@ REQUIRED_USE="ipv6? ( ssl? ( ^^ ( gcrypt nettle openssl ) ) )"
 [ "${PV}" = "99999999" ] || S="${WORKDIR}/${PN}-s${PV}"
 
 src_prepare() {
-	use SECURITY_HAZARD && epatch "${FILESDIR}"/${PN}-20150815-nonroot-floodping.patch
+	use SECURITY_HAZARD && PATCHES+=( "${FILESDIR}"/${PN}-20150815-nonroot-floodping.patch )
+
+	default
 }
 
 src_configure() {
@@ -70,7 +74,6 @@ src_configure() {
 	)
 	if use ipv6 ; then
 		TARGETS+=(
-			$(usex tracepath 'tracepath6' '')
 			$(usex traceroute 'traceroute6' '')
 		)
 	fi
@@ -100,7 +103,9 @@ src_compile() {
 		${myconf[@]}
 
 	if [[ ${PV} == "99999999" ]] ; then
-		emake html man
+		emake man
+
+		use doc && emake html
 	fi
 }
 
@@ -121,8 +126,14 @@ src_install() {
 
 	into /usr
 
+	if use tracepath ; then
+		dosbin tracepath
+		doman doc/tracepath.8
+		dosym tracepath /usr/sbin/tracepath4
+	fi
+
 	local u
-	for u in clockdiff rarpd rdisc tftpd tracepath ; do
+	for u in clockdiff rarpd rdisc tftpd ; do
 		if use ${u} ; then
 			case ${u} in
 			clockdiff) dobin ${u};;
@@ -133,7 +144,7 @@ src_install() {
 	done
 
 	if use tracepath && use ipv6 ; then
-		dosbin tracepath6
+		dosym tracepath /usr/sbin/tracepath6
 		dosym tracepath.8 /usr/share/man/man8/tracepath6.8
 	fi
 
@@ -147,9 +158,9 @@ src_install() {
 		newconfd "${FILESDIR}"/rarpd.conf.d rarpd
 	fi
 
-	dodoc INSTALL.md RELNOTES
+	dodoc INSTALL.md
 
-	use doc && dohtml doc/*.html
+	use doc && dodoc doc/*.html
 }
 
 pkg_postinst() {
diff --git a/net-misc/rclone/Manifest b/net-misc/rclone/Manifest
index 6000e66779a4..a6bacf69e096 100644
--- a/net-misc/rclone/Manifest
+++ b/net-misc/rclone/Manifest
@@ -1,6 +1,8 @@
 DIST rclone-1.36.tar.gz 14013564 SHA256 a573b70e3aeb355b943dddd6ae9375386fc21bf12dfba601d8d7280f97c4c884 SHA512 589b5e2370244b5609d1ec8245f9f5f5cf58d6a2d507768db2cfc5a5b882f7d277d797fd0068b904538f3700e1751df03a21697d5295c83a2bf01a78d0ac6b13 WHIRLPOOL aa75c6c32cdcebd79ecf79abd03b4dc0205517808eb232a9655e8ae3da327cd62ad7183f4e0b0f6b7b52649c0c5058fdc2b57bc7b31b7dffb05e8a1508307d5c
 DIST rclone-1.37.tar.gz 37684683 SHA256 a74e284d2368f6fb8e4ac654a31b9b1328ac6078acd3446c9a892cd4bcbe8660 SHA512 683c88c04aa3d6f7057937c431bc56b20c9218c3a01f8baa4fb63ed716a0a3397855c1a9bf485041354bc6696f54f670b5cd9945c0465b4dc65595a9f606427b WHIRLPOOL c43709f66f0de6e66f073e34e4896707db0b91cf556cc225bdc22b7195c92e5777fbf7dc6983d57bcb11cab825ec7c222e0f75c6e52949a68fe5a7b4e43da1ff
+DIST rclone-1.38.tar.gz 36890082 SHA256 d4806a55b64ab54923b55b230f2b2679406d5de995884433d3d60516bb8ebcc0 SHA512 8dba3af1d576aac2b4b230eb6cb3072f0178e420f017dd715744ae2d8061f830b8079b7cc1cc09e7395ab3639b600b47768300d5f9da80a2f9626c26002a604e WHIRLPOOL 4b5ed7e1eea99dda55f05ad4dfc7922db1733eecd2f4b4df5f3cd50928209842222632b9735e27c6c6aad56d111160086f08bd681461efcc665cb501399cd1f4
 EBUILD rclone-1.36.ebuild 649 SHA256 5030efbfd59058359c1817c80328c6be92c5977f59933e0231be948154b6bd68 SHA512 a1e84507ede33b5c53cce142c3f01b3ec8e907c1d5f54757734d0bc4bdf56ff8fb7510dd1ab8ae3f142e2f9851ee34cbcce1d1ea3433d0a4c13d51b4ab2e8845 WHIRLPOOL 2f09593d98d60d3ad5b29c3f5f99af61218648fa1ef45d2f85b2e5f0e0ffc1eb934d0f3650ed6851e06b281f7b19783db1d9688ea3a15db9edc976283fa2ef29
 EBUILD rclone-1.37.ebuild 649 SHA256 5030efbfd59058359c1817c80328c6be92c5977f59933e0231be948154b6bd68 SHA512 a1e84507ede33b5c53cce142c3f01b3ec8e907c1d5f54757734d0bc4bdf56ff8fb7510dd1ab8ae3f142e2f9851ee34cbcce1d1ea3433d0a4c13d51b4ab2e8845 WHIRLPOOL 2f09593d98d60d3ad5b29c3f5f99af61218648fa1ef45d2f85b2e5f0e0ffc1eb934d0f3650ed6851e06b281f7b19783db1d9688ea3a15db9edc976283fa2ef29
+EBUILD rclone-1.38.ebuild 612 SHA256 b1986773c37df7dbfdc87f5107c72b9777d0605a42570d71e0344410066b0ba6 SHA512 ff5ef20f5ca7fcbf6988576a9b32fc51ef18deceb7bb35cbb0b63d555ad426fa49c920dfe67bfa91e2f660642f008fef6652bb31ddd25f65dbf1644f610556cf WHIRLPOOL dbd1afc58796e72db94f016d14de706ec0e31fcb14221d59c347ba8417c5e7c307d50f651b4196e4276a7b4a441a8834d8fa246eade5e41b7bafeafd40ddd090
 EBUILD rclone-9999.ebuild 649 SHA256 5030efbfd59058359c1817c80328c6be92c5977f59933e0231be948154b6bd68 SHA512 a1e84507ede33b5c53cce142c3f01b3ec8e907c1d5f54757734d0bc4bdf56ff8fb7510dd1ab8ae3f142e2f9851ee34cbcce1d1ea3433d0a4c13d51b4ab2e8845 WHIRLPOOL 2f09593d98d60d3ad5b29c3f5f99af61218648fa1ef45d2f85b2e5f0e0ffc1eb934d0f3650ed6851e06b281f7b19783db1d9688ea3a15db9edc976283fa2ef29
 MISC metadata.xml 247 SHA256 476881b53a1d153f1c3c21b5e7b81ca4d704b7b868aa58eef6a2faa531aabb5d SHA512 189f876175728dfb474cf2ccb122ebfe48b068cc5fd65a3cfed7dad947dd9ce0fc7c89ce5c0982fdee5262025236b7d5cccf48b55c67c5cd33e84910c28e0b46 WHIRLPOOL 2225cc6e12a88d99aca5e7b1a986bc808e64840a95fa9cfba2b21f841eb1619c8c86170d0701c3088bc9acac4cdb86467dd85f36e5315b635dcfed348b289bc8
diff --git a/net-misc/rclone/rclone-1.38.ebuild b/net-misc/rclone/rclone-1.38.ebuild
new file mode 100644
index 000000000000..ab1b0c69b3d5
--- /dev/null
+++ b/net-misc/rclone/rclone-1.38.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit golang-build
+
+EGO_PN="github.com/ncw/${PN}"
+
+if [[ ${PV} == *9999* ]]; then
+	inherit golang-vcs
+else
+	KEYWORDS="~amd64 ~arm ~x86"
+	EGIT_COMMIT="v${PV}"
+	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	inherit golang-vcs-snapshot
+fi
+
+DESCRIPTION="A program to sync files to and from various cloud storage providers"
+HOMEPAGE="https://rclone.org/"
+
+LICENSE="MIT"
+SLOT="0"
+
+src_install() {
+	dobin ${PN}
+	doman src/${EGO_PN}/${PN}.1
+	dodoc src/${EGO_PN}/README.md
+}
diff --git a/net-misc/remmina/Manifest b/net-misc/remmina/Manifest
index 28cf32402d9a..a6190bab2be8 100644
--- a/net-misc/remmina/Manifest
+++ b/net-misc/remmina/Manifest
@@ -1,9 +1,11 @@
 DIST remmina-1.2.0_rc16.tar.gz 1008438 SHA256 edb347f9e4d0a2e682f7ffd22caa364b477653a1aca31d1c1922a86d81df4995 SHA512 a6d2fb95a3fc68ee7ce4c8205c775cbc7bb83fa2f90b68d04f355b4ca8b4d0956a29ecbc028260c432b55c582802e9f243ad62426212d9fd0f02f7e50a56856f WHIRLPOOL a5d136e1abaeafcc1ad070c400a0c7456e29d1406ea3542add5eb36c4cb1e32cedf0a2bac855298a5e1e703e19774d007ec70c822c49ec13a9f565123b33181d
 DIST remmina-1.2.0_rc20.tar.gz 1016674 SHA256 5663105735600cfe5dbbcd62e64ffb27bb6587e1035b04b2b63a32a98d25ef30 SHA512 096cbb9cf45e911466a6123eead727d45365ee434bf371603733de4e7ab9b445ce67019f2a66d45fe33aecab4d163f6f31ca38811adadc125494f8575fa3a64a WHIRLPOOL b3b218c32e46516f80f637dd8fefc59c16ed437b24b0d7a20336ee90b5364e29e618dfb1705de31341b3dfd0220df3ff38021f782e57127b193f6b58193b761e
 DIST remmina-1.2.0_rc21.tar.gz 1028685 SHA256 9b4ac39a4ca40fffc9ce52e4a504839626eb4e0b3d1cdddf54217beef1fcd535 SHA512 5b3f0bab14c57ae91375373b0181bdb4e6d933332ef1b5c590988b29d6afccfd77cece371e3bbf98bedc6c35a9ee8eefa37201ec09fb44d62de83a1cdaf706b0 WHIRLPOOL 560779b36f2efe830f69121ac532f4558acf3e6c82fe826308d4402d8710b1976b3f773ba3873387d9e0b2575c2be63531cecd272305ebdde47046ce342bef71
+DIST remmina-1.2.0_rc24.tar.gz 1052140 SHA256 7d959485469b8e99d4d950e6e916b22e28a6855d58955a1be7f49b3a5650e82c SHA512 aab421c580e434ca673be063f3662f1d9128cc83aaee6f9bc6acf6996af0379af6fb99cc63273941c40c6b989653b972de6c43b575ca06bf56ec7c266590c17e WHIRLPOOL 9bbe41519b782d9ddd641e1d00ac1697e7965a553e1827c73152f73964b0db0c1eb7046d6f33d7b596af1669464b7b5adffb5fc8c73716ae433438692746a966
 EBUILD remmina-1.2.0_rc16-r1.ebuild 1987 SHA256 30f663885a1b1445d73bcf2eddf4d85b7849a6133cef5a48b55acd4a2e4c114a SHA512 8301d870a34688124dafbd9199c5364ab9fe7d3b4439e0d3fd62258bb64d89544b212ecd73dcb194ddbee17d8aa7308e09182f127bc74319c5ee27ac7c7627ce WHIRLPOOL 78a68b2640c79b49b550ae0350e399a831c8b5296b4df75ce0ebbc68fb13ccdd345ecb154b1e5b1321b0a1d4043da741ae13eb2e9d7364849fe8b2ba7d23b4a7
 EBUILD remmina-1.2.0_rc20.ebuild 1917 SHA256 13c1105f0bd4d23be4cca821ae81f16a32f86af93bd47683729f25e807fa35fd SHA512 3312e56870c95d24962805d2fa7bc6bab8d31b52f69650501ba7c25deec47ddddfd93aa8fffb4dfcad931744c1a48b63f361286a89235286044645e79660688c WHIRLPOOL 7b40e3cef3d7bc85e2d2ebad679107308814f0cd1c06509c6101247226ab2cb1d43c1306b52d3c7f6e3cf7d363796b70b1771dc05e6ae5cf9e2d1cf08f90ccc2
 EBUILD remmina-1.2.0_rc21.ebuild 2009 SHA256 61d372997400ed98e827d0ce926cdfad57e6b9931e8c50b1bf41a1fe127141dc SHA512 e3da5aa9cdbe94bc3bc61f2540495879d6ee1b69931f673ed126dfcf071379c5ee96d18a0c9e3e2a076029172e94333ebd81dbfe816d5b28bc35ca48d6eb5fe7 WHIRLPOOL 1cd9cb78054c71b5ff79f931dbd086f0c9c9853d28f39db19a8469e3df2d810fbc742e4367904e42a7ca3704d864971d37cf7563adf901445bc053d88da2e27a
+EBUILD remmina-1.2.0_rc24.ebuild 2009 SHA256 61d372997400ed98e827d0ce926cdfad57e6b9931e8c50b1bf41a1fe127141dc SHA512 e3da5aa9cdbe94bc3bc61f2540495879d6ee1b69931f673ed126dfcf071379c5ee96d18a0c9e3e2a076029172e94333ebd81dbfe816d5b28bc35ca48d6eb5fe7 WHIRLPOOL 1cd9cb78054c71b5ff79f931dbd086f0c9c9853d28f39db19a8469e3df2d810fbc742e4367904e42a7ca3704d864971d37cf7563adf901445bc053d88da2e27a
 MISC ChangeLog 7914 SHA256 4cd426f03bede791325c1b418f3cd0f0741aa13290cbbc7b43b6e9eec8c8aa6c SHA512 432595f86ba602b39daa9fb421c4113a534e3f04e1de6cf2c0c36f2dde817e68e655c74d5485c16861593c1adcb616065b96d881715fd4abb7b4c02f4c3c1b40 WHIRLPOOL 77f28921d4bcafd53a7e34020f6c08246d372b066696ad7fddcf96eda25a9eba3a0eab444e509ae3b2a81c54fbe8b4a9c016e989f418632b0e3af673757c893c
 MISC ChangeLog-2015 9985 SHA256 eab7fd33caffb1587ad50d8e4b5045d3ae8838d43c3bcab12d6a501889ae878b SHA512 9f8975961cbcf0d454e866619682c5443921db015ad5df0869666c379a558f4e241555a4d75be93fcaaad9e7a9c27cca833db4e870640e84d466d7fc7ff52776 WHIRLPOOL 2b8d6b906e127ebe13bbd3c308a0704d96ea3cc481ccab62366565656a4c434171daddb85a18e0e38abdebc311a327d2374123cda2ed8456a1a3514facca5552
 MISC metadata.xml 1246 SHA256 a3dcd2337b18f953e5f388ae9b80611ac0f78be5fbeec90b08a7cfcbea16c2d9 SHA512 4116cdb618584c5b95ff0330fb9c9efad2736cafcf4e3622fd074d5026f1adc5b7ab8e420188bc3a689b31cc285318db953bfa66c54b7fe91de242136787a5d8 WHIRLPOOL ea28c105a203978b44ea8aad120ca0f3754f1fe3a21d0ec414808dbfd1d63ba57b39c7f6409539114c6072a79303bf5f9d2cc9fe6754e891675a7995dce6dd26
diff --git a/net-misc/remmina/remmina-1.2.0_rc24.ebuild b/net-misc/remmina/remmina-1.2.0_rc24.ebuild
new file mode 100644
index 000000000000..e0491b743f19
--- /dev/null
+++ b/net-misc/remmina/remmina-1.2.0_rc24.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils eutils gnome2-utils
+
+MY_PV="${PV//_rc/-rcgit.}"
+
+DESCRIPTION="A GTK+ RDP, SPICE, VNC, XDMCP and SSH client"
+HOMEPAGE="https://remmina.org/"
+SRC_URI="https://github.com/FreeRDP/Remmina/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ayatana crypt rdp gnome-keyring nls spice ssh telepathy vnc zeroconf"
+
+CDEPEND="
+	dev-libs/glib:2
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	x11-libs/libxkbfile
+	ayatana? ( dev-libs/libappindicator:3 )
+	crypt? ( dev-libs/libgcrypt:0= )
+	rdp? ( >=net-misc/freerdp-2.0.0_rc0 )
+	gnome-keyring? ( app-crypt/libsecret )
+	spice? ( net-misc/spice-gtk[gtk3] )
+	ssh? ( net-libs/libssh[sftp]
+		x11-libs/vte:2.91 )
+	telepathy? ( net-libs/telepathy-glib )
+	vnc? ( net-libs/libvncserver )
+	zeroconf? ( net-dns/avahi[gtk3] )
+"
+DEPEND="${CDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+RDEPEND="${CDEPEND}
+	virtual/freedesktop-icon-theme
+"
+
+DOCS=( AUTHORS CHANGELOG.md README.md THANKS.md )
+
+S="${WORKDIR}/Remmina-${MY_PV}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_APPINDICATOR=$(usex ayatana)
+		-DWITH_GCRYPT=$(usex crypt)
+		-DWITH_LIBSECRET=$(usex gnome-keyring)
+		-DWITH_GETTEXT=$(usex nls)
+		-DWITH_TRANSLATIONS=$(usex nls)
+		-DWITH_FREERDP=$(usex rdp)
+		-DWITH_SPICE=$(usex spice)
+		-DWITH_LIBSSH=$(usex ssh)
+		-DWITH_VTE=$(usex ssh)
+		-DWITH_TELEPATHY=$(usex telepathy)
+		-DWITH_LIBVNCSERVER=$(usex vnc)
+		-DWITH_AVAHI=$(usex zeroconf)
+		-DGTK_VERSION=3
+	)
+	cmake-utils_src_configure
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+
+	elog "To get additional features, some optional runtime dependencies"
+	elog "may be installed:"
+	elog ""
+	optfeature "encrypted VNC connections" net-libs/libvncserver[gcrypt]
+	optfeature "XDMCP support" x11-base/xorg-server[xephyr]
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/net-misc/unison/Manifest b/net-misc/unison/Manifest
index 53b26a8092eb..c4ce69b9d7fb 100644
--- a/net-misc/unison/Manifest
+++ b/net-misc/unison/Manifest
@@ -1,3 +1,4 @@
+AUX unison-2.48.4-Makefile-dep.patch 542 SHA256 4e3a9a38a7c3deb3a7d1331a3d41a4dd08f19332df9474237e19135a8da0ff8e SHA512 e36704c7ac0fee66a308364ad72443a36ac14c1aacca0728b50f1770df91bf77347b58d218e93943a91cf2e99672840a6c322a5a4a5f238797d440ae16aa2394 WHIRLPOOL 8205385cf29fb013d75e94e62d9541ea4105a73de1a403cc2cb7d5752dc872de4e32b9897fd6344ac142362a17be51592fd5b9272cba78fba117ae368e7cf950
 DIST unison-2.48.3-manual.html 278156 SHA256 500d8f83770fc3b07cf443dfb1579281d4379002d51523aa73451e03f6cdbe1a SHA512 50924c624abd86f231ad8cbcfd4e383322a55733108685255df21df6da26d9ad1ac7d4f7d7dcd82faf4696f3f0136c0ff3c8cf5ffda4042f63451f2b7c8e9502 WHIRLPOOL 9a48a23049cd8753ebfd71e2f396107039b1fdc76877a8dc4f229ef8dda6a9481b80156e66c27015c96e7a752dedb2ca7781f42c01a8839ec0361f150910dfcd
 DIST unison-2.48.3-manual.pdf 516703 SHA256 cba2946656e04b856d98184b539e382ed85d987d24458a39e156946125f7b578 SHA512 3a16d6e0df6370784f960d37749f56a223c5eaab24ded299f6a61058f7692139239d0d64436d93268b4cbd8031de6139e187aca0beb54345a615e71253bce977 WHIRLPOOL fd57fec2e5a2605bca216bc4ae441ecd122faa26cd5abdfb39ea19ca4f44961691d266e86b702536dd7326b4072718d9c67739d7a264f9b4127330a41aff6823
 DIST unison-2.48.3.tar.gz 1172646 SHA256 f40d3cfbe82078d79328b51acab3e5179f844135260c2f4710525b9b45b15483 SHA512 169b272119b33146e4f770d1fc9a45d8278502a85a4ae02fd5cb94bade667bdd0ee31bef9acf6cf5170368ecfff948ee668ee195ff7e956c4eeaeed6f83d8d0d WHIRLPOOL a903f1f5e996655e3e001f33b959d839d2540d0a5c0584fded7aa483a774d8b07b3e7997357f03426f41ef6505cf3d40dec18616252c02add4a417dfef4c8df4
@@ -5,7 +6,7 @@ DIST unison-2.48.4-manual.html 278110 SHA256 2b5674e2fd7751148784a716ce5a03f8cd0
 DIST unison-2.48.4-manual.pdf 516093 SHA256 eaf9bf89967eb17c59b98f0a7ba6b6ff260b6c6de73277a633d954ceb42f5f93 SHA512 514da1eda0405416e53b1c8e027d39a803f9030824deccfaf5630aec21c52c6c9ea0d1006461faa8fb26738f4a33eecfe1ae24126fdb7a53ada6b90db270e6c9 WHIRLPOOL a2fd465e13c7d5832684e2ddf194c24d5e4e278ed5c8b53f2e7acac8f4ae2810bf74a3db0674ef73e2a686cf3a66db5b28dbf1320f78b8dc7568ee3cec4cd152
 DIST unison-2.48.4.tar.gz 1200861 SHA256 30aa53cd671d673580104f04be3cf81ac1e20a2e8baaf7274498739d59e99de8 SHA512 c8e7bd2b14edae31e7d08154cdc2dce8173546b6163b9e5f4f2b1c8255792a7645d8449da88d7acfcbf498746481d24d0a3936978969920530a15a16bcbc6024 WHIRLPOOL 73d8637106cf43ab945a026310276f3636867f609e7d4491a80ff4b7dc98d5d737ee56d00987253e98200e13d971d09e41164b40283530df19f681000bf4733e
 EBUILD unison-2.48.3.ebuild 2194 SHA256 a6555a1aabf065cfce0101802d7385f8a76589682994e8caa846f60a0c8339f0 SHA512 602cfa6731ff3844c5abdd03b8b4e4e327fc80ac9c1aee7fd8a8292c81f880472748741f09e4ec43ddab71e739036a4f494c0eafd38073a535cd160eb3ef09d7 WHIRLPOOL 6df006c0a6a76bd3551ca6a153cfdb29a512fb9ec5d47623163927638965abb7f0f46395a146cb3412fd776aa356d59d6d8fee3fa893406bf2ad15444d772aaa
-EBUILD unison-2.48.4.ebuild 2248 SHA256 809a036f8a3e1383f197d10a1978e21f025f49eeccdacd75822cea0498b63dc9 SHA512 effb9b4e782b8c168d2a5e4002db1cdddf99335d68f75c17e55d54384e41687b48b851f51a2f89b0f14bff2e6d920925a4a3f5670f0a5da6f530cea2560bceaf WHIRLPOOL 38e1308509091672b01e046d335a84b5af389c6e285eb2ec00b9a2a985bc9efedc054a18979444a9edbf60d3e6ddbcf46c784816855c1b13cde6e763e772bf8e
+EBUILD unison-2.48.4.ebuild 2330 SHA256 95f208e6ddf5c31ff8d324fbdb83b667c2e4c2bd3a963bcc2900f8b10c807266 SHA512 22857d074ba34c63342927e21b5774d6bbe4da10ff23b63e55784d056477a1c21b9b9c92a422c4623977c67e3989b072927b171cee00802797844bc03e79e2e9 WHIRLPOOL aee3d461a532ec55d4d2ad614f0fd4a39c0947db99c31f2967f41fdda84013144e926d3e5474954c5766da8a24e72e938f917fa99035c2ed3a0caee3bdaf3948
 MISC ChangeLog 3687 SHA256 1f9c193957af831b7449b5ae18693fc3c77b1649b40f3c68cfec96bf0d5d27bb SHA512 33f8b1bfe50e5985ea2eb55954f67c87f480838b90440733add0bcfc8a78c7aeb654b0064084c99ea75529acb830c21558c47f752f4370cae85a5d78c7617d15 WHIRLPOOL 1a68015e6b2bdfbe155654bb2df94865778eed82a09a10fd2a7878dc77d4b1582d75058807069d7d925d5b581a21b37aad7c2f602c736dff986da6f892b563a1
 MISC ChangeLog-2015 11268 SHA256 d7c0324a2251676c6453a0713a9e00536bc2be8ea0ef0f99cbf392cb03e96de6 SHA512 58044c03a0d728fb0a85b87c2e2b2794151e00699c52d51661b967b52b0b47ad281fcef717af19ade76fd63c80ffc642d3bb54a24665fbbcc72153c46dfe5d16 WHIRLPOOL 069d779860f2d062bf1ec186a9eee52fa77daa17145a7e0715baf6433663d6828c46919d50ad93ad42613a8783173d6fc854459d3b46e7d089182b9dd72d1c2f
 MISC metadata.xml 243 SHA256 5e9b58b0b795266f973d066675839499e3a56d7d932d702404a4b91ded8eb26c SHA512 1c5b4b2163017e496999d1f87e5c9c5ac6c11b2e9187450ccfb3df258f34e54d278972f04ee0e8429476c6f87e091a869ac2a28c6e8c8e6d20678c3e74061449 WHIRLPOOL 085df2e84901cbe563c7c1d30d04c229547f15f8ee26ac61d44d07c3f6999f2bbfa4cf309963172fb507cce5450d27598b762c3ccab92351601965c3afc05e3a
diff --git a/net-misc/unison/files/unison-2.48.4-Makefile-dep.patch b/net-misc/unison/files/unison-2.48.4-Makefile-dep.patch
new file mode 100644
index 000000000000..f65959dfb4ac
--- /dev/null
+++ b/net-misc/unison/files/unison-2.48.4-Makefile-dep.patch
@@ -0,0 +1,20 @@
+Makefile.OCaml: fswatch.cmi depends on ubase/prefs.cmi.
+
+  The dependency is needed to compile unison
+  in parallel.
+
+Reference: https://github.com/bcpierce00/unison/pull/100
+
+diff --git a/Makefile.OCaml b/Makefile.OCaml
+index 21610ce..84fe7ad 100644
+--- a/Makefile.OCaml
++++ b/Makefile.OCaml
+@@ -426,6 +426,8 @@ win32rc/unison.res.lib: win32rc/unison.res
+ 	@echo "$(CAMLC): $< ---> $@"
+ 	$(CAMLC) $(CAMLFLAGS) -c $(CWD)/$<
+ 
++fswatch.cmi : ubase/prefs.cmi
++
+ %.cmo: %.ml
+ 	@echo "$(OCAMLC): $< ---> $@"
+ 	$(OCAMLC) $(CAMLFLAGS) -c $(CWD)/$<
diff --git a/net-misc/unison/unison-2.48.4.ebuild b/net-misc/unison/unison-2.48.4.ebuild
index a1f428de517b..951e84771c95 100644
--- a/net-misc/unison/unison-2.48.4.ebuild
+++ b/net-misc/unison/unison-2.48.4.ebuild
@@ -30,6 +30,11 @@ SRC_URI="https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}
 		https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}-manual.html )"
 S="${WORKDIR}"/src
 
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.48.4-Makefile-dep.patch
+	default
+}
+
 src_compile() {
 	local myconf
 
diff --git a/net-misc/wget/Manifest b/net-misc/wget/Manifest
index 4775ef27454f..aeeda043c571 100644
--- a/net-misc/wget/Manifest
+++ b/net-misc/wget/Manifest
@@ -1,6 +1,13 @@
 AUX wget-1.19.1-CRLF_injection.patch 1051 SHA256 4eb2932d33f79b59af345b6ad075893f0a146547d8a7266edfea0d3e7c612093 SHA512 fd36c9225c567e9958f030449f40cb747c0a23b7023fd4eee4e982c867d96be1562377a2d9b80150d9dc714bdbdc2bd509a8a244c4969c731002bdf6434d9cf8 WHIRLPOOL 90cf4613f9e65fabc6d228d361e8ef31a72dc00f5a165ce922fd4ee34568ccabf43954f900a94f13ab51b0d81d1a7272c10c646472066e373ceadd3e4bc4efe1
+AUX wget-1.19.1-CVE-2017-13089.patch 1093 SHA256 06631755cbd42eb092d4f158a348c0bcd94fbdba357595a5fd7336d2f10aba97 SHA512 c3f44138aa105fa6572b3083671a95f4c819a65667d3d0ba1489a043390a184c5b442f5c134ab868360b01c6662b4bfb52588242273af5012d76099cb5511c77 WHIRLPOOL 20958618a92e0333a849a5e01fc9dd40a0354e665e9159c89f735f2edb717c921d2d330499114d29818cfd3d07cbe9178c90abbebe37265e49475d8829c5b593
+AUX wget-1.19.1-CVE-2017-13090.patch 1167 SHA256 25b6fcff6ff926b21d4ced14463521cebaba9e51de28269d69e8761676aeeb81 SHA512 b9aa7972ff6523bf32810d3fca46ba1bb0c65b0075945c61d8009f39dc87202432ae1e0b9e4a861652001203ec8935078f0db171eda518cc01b72863c8c5ac36 WHIRLPOOL 6b40cd713357a4ebf47b6012ed23c5049718e572a51ec06ac4d9b941defd494c06aab916d3aa2947f718ca4bee316ff2475a4830b1f02e4af2f8204ad16d45ab
+AUX wget-1.19.1-fix-Perl-warnings-in-tests.patch 3666 SHA256 d351ada0a6ba3db96c71aee5372b2d21d56a2035192cf46562c28d78f4a4fab5 SHA512 9f1b7ffded3422c995a51e346e3957024f4b5435cf51d491f3d4816620376539bffe2d3a7d7dcd03ca99828f06a21ebaa846b3a1755cd020a29f166c0fa2f7d9 WHIRLPOOL e2708491ec1ed57a010b15eccc76c754745c939fde5eb282a7eb0fb322723c8f7cfa79aa06bc882207ded54f8902b5fe71cea018d9719ba2e667d561d9d63cac
+AUX wget-1.19.1-fix-Python-test-suite.patch 8721 SHA256 d9549cc04352b5efdd8a44c36644fd86054527394fff965800a7977d9c3d899e SHA512 e7905dc70c59e9c6b2fcc6c1a058fe98e8681492f034f2cd00aac5f1674d7dca0520bcf30d8b2563983bcb4388c6e35f66e772f833a364810f523784f8de3b19 WHIRLPOOL aed5cdf47deffcff06acad56e8700ed74a210951a0e412f1822c2daabeb78bd43aa689f2a6743b3b519172241319d1b209c46207e614a755852ec0de71aeb9f0
 DIST wget-1.19.1.tar.xz 2111756 SHA256 0c950b9671881222a4d385b013c9604e98a8025d1988529dfca0e93617744cd2 SHA512 00864d225439bcb7c5af01d7ef19efa615427812d3320ab3f4c8f62c38191e837b1392397843f935d7dc5860a4d0ce89ee31f2730c4a729402f1f2bf3e5f64e5 WHIRLPOOL 2a4bd80f1e7134637227609f532ee3385472a6895ff22efeface42d082072a09abaa5dd2d8653bfdab015de801d31426b01d73ab5dd1a6864b84c29dc8e72462
+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 3380 SHA256 8f5b2d642003f0ea147b370634579e605c59b775747192181776e52e91d7f016 SHA512 82f4a4baf6755a056cbdc0f43ca6a226f069b51f2ab1a6f7dc5dc9976437011f54fd32261ed6b6c6d972b8bc9be704271b1c1a560fbc37f4b170d81da0702e07 WHIRLPOOL 4690671f26ed2a1b0df20b58119b70850e736f5ddc347d514b5ac9f07ba0bf9d56b3c4fa7abc452f7e5a7018adae2d467b003601b06b8bd00c8c3660a69589b0
+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
 MISC metadata.xml 570 SHA256 82fb121ee11ecf4d5b5a20e885a9773b301061d7a2b19755c01322aef615e1ae SHA512 add9378a31ae7abc66d8dc6bfc3d355af3eb683ce177e68fbcbedb4b69435d7254b4cac1897d3b8267bddb23467e8f4bb16e439c09a4f91be16845b1113e055c WHIRLPOOL 08ddfe93af78d6f213e2a08f2414e2ae7e1442ec0eddf34ea29e1383a694f342c1dc72df8370b61828e7ef7914f2863519afc83e83a3cbd783a1be015703bcfb
diff --git a/net-misc/wget/files/wget-1.19.1-CVE-2017-13089.patch b/net-misc/wget/files/wget-1.19.1-CVE-2017-13089.patch
new file mode 100644
index 000000000000..f961741aa288
--- /dev/null
+++ b/net-misc/wget/files/wget-1.19.1-CVE-2017-13089.patch
@@ -0,0 +1,34 @@
+From 3dbc2e06ad487862c2fcc64d4891ff8aeb254bad Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Tim=20R=C3=BChsen?= <tim.ruehsen@gmx.de>
+Date: Fri, 20 Oct 2017 10:59:38 +0200
+Subject: [PATCH 1/2] Fix stack overflow in HTTP protocol handling
+ (CVE-2017-13089)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+* src/http.c (skip_short_body): Return error on negative chunk size
+
+Reported-by: Antti Levomäki, Christian Jalio, Joonas Pihlaja from Forcepoint
+Reported-by: Juhani Eronen from Finnish National Cyber Security Centre
+---
+ src/http.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/http.c b/src/http.c
+index 55367688..dc318231 100644
+--- a/src/http.c
++++ b/src/http.c
+@@ -973,6 +973,9 @@ skip_short_body (int fd, wgint contlen, bool chunked)
+               remaining_chunk_size = strtol (line, &endl, 16);
+               xfree (line);
+ 
++              if (remaining_chunk_size < 0)
++                return false;
++
+               if (remaining_chunk_size == 0)
+                 {
+                   line = fd_read_line (fd);
+-- 
+2.15.0.rc1
+
diff --git a/net-misc/wget/files/wget-1.19.1-CVE-2017-13090.patch b/net-misc/wget/files/wget-1.19.1-CVE-2017-13090.patch
new file mode 100644
index 000000000000..4e600fe784ff
--- /dev/null
+++ b/net-misc/wget/files/wget-1.19.1-CVE-2017-13090.patch
@@ -0,0 +1,37 @@
+From 28925c37b72867c0819799c6f35caf9439080f83 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Tim=20R=C3=BChsen?= <tim.ruehsen@gmx.de>
+Date: Fri, 20 Oct 2017 15:15:47 +0200
+Subject: [PATCH 2/2] Fix heap overflow in HTTP protocol handling
+ (CVE-2017-13090)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+* src/retr.c (fd_read_body): Stop processing on negative chunk size
+
+Reported-by: Antti Levomäki, Christian Jalio, Joonas Pihlaja from Forcepoint
+Reported-by: Juhani Eronen from Finnish National Cyber Security Centre
+---
+ src/retr.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/retr.c b/src/retr.c
+index a27d58af..723ac725 100644
+--- a/src/retr.c
++++ b/src/retr.c
+@@ -378,6 +378,12 @@ fd_read_body (const char *downloaded_filename, int fd, FILE *out, wgint toread,
+               remaining_chunk_size = strtol (line, &endl, 16);
+               xfree (line);
+ 
++              if (remaining_chunk_size < 0)
++                {
++                  ret = -1;
++                  break;
++                }
++
+               if (remaining_chunk_size == 0)
+                 {
+                   ret = 0;
+-- 
+2.15.0.rc1
+
diff --git a/net-misc/wget/files/wget-1.19.1-fix-Perl-warnings-in-tests.patch b/net-misc/wget/files/wget-1.19.1-fix-Perl-warnings-in-tests.patch
new file mode 100644
index 000000000000..334bcef8659b
--- /dev/null
+++ b/net-misc/wget/files/wget-1.19.1-fix-Perl-warnings-in-tests.patch
@@ -0,0 +1,104 @@
+From 7ffe93cabb181f39ad5091c31ab9f61bd940a55f Mon Sep 17 00:00:00 2001
+From: Anton Yuzhaninov <citrin+github@citrin.ru>
+Date: Wed, 5 Apr 2017 19:06:42 +0300
+Subject: [PATCH] Fix perl warnings in tests
+
+* tests/FTPServer.pm: Escape '{' in RE to fix warnings
+* tests/FTPTest.pm: Likewise
+* tests/HTTPServer.pm: Likewise
+* tests/HTTPTest.pm: Likewise
+* tests/Test-proxied-https-auth-keepalive.px: Likewise
+* tests/Test-proxied-https-auth.px: Likewise
+Escape '{' in RE to fix warnings:
+Unescaped left brace in regex is deprecated, passed through in regex;
+marked by <-- HERE in m/{{ <-- HERE port}}/
+---
+ tests/FTPServer.pm                         | 2 +-
+ tests/FTPTest.pm                           | 2 +-
+ tests/HTTPServer.pm                        | 2 +-
+ tests/HTTPTest.pm                          | 2 +-
+ tests/Test-proxied-https-auth-keepalive.px | 2 +-
+ tests/Test-proxied-https-auth.px           | 2 +-
+ 6 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/tests/FTPServer.pm b/tests/FTPServer.pm
+index a5185d66..cac80942 100644
+--- a/tests/FTPServer.pm
++++ b/tests/FTPServer.pm
+@@ -589,7 +589,7 @@ sub new
+     foreach my $file (keys %{$self->{_input}})
+     {
+         my $ref = \$self->{_input}{$file}{content};
+-        $$ref =~ s/{{port}}/$self->sockport/eg;
++        $$ref =~ s/\Q{{port}}/$self->sockport/eg;
+     }
+ 
+     return $self;
+diff --git a/tests/FTPTest.pm b/tests/FTPTest.pm
+index 50385ad0..0a1c768c 100644
+--- a/tests/FTPTest.pm
++++ b/tests/FTPTest.pm
+@@ -53,7 +53,7 @@ sub _substitute_port
+ {
+     my $self = shift;
+     my $ret  = shift;
+-    $ret =~ s/{{port}}/$self->{_server}->sockport/eg;
++    $ret =~ s/\Q{{port}}/$self->{_server}->sockport/eg;
+     return $ret;
+ }
+ 
+diff --git a/tests/HTTPServer.pm b/tests/HTTPServer.pm
+index dd8ec043..78609f65 100644
+--- a/tests/HTTPServer.pm
++++ b/tests/HTTPServer.pm
+@@ -310,7 +310,7 @@ sub _substitute_port
+ {
+     my $self = shift;
+     my $ret  = shift;
+-    $ret =~ s/{{port}}/$self->sockport/eg;
++    $ret =~ s/\Q{{port}}/$self->sockport/eg;
+     return $ret;
+ }
+ 
+diff --git a/tests/HTTPTest.pm b/tests/HTTPTest.pm
+index 00f079f8..6225c7f1 100644
+--- a/tests/HTTPTest.pm
++++ b/tests/HTTPTest.pm
+@@ -47,7 +47,7 @@ sub _substitute_port
+ {
+     my $self = shift;
+     my $ret  = shift;
+-    $ret =~ s/{{port}}/$self->{_server}->sockport/eg;
++    $ret =~ s/\Q{{port}}/$self->{_server}->sockport/eg;
+     return $ret;
+ }
+ 
+diff --git a/tests/Test-proxied-https-auth-keepalive.px b/tests/Test-proxied-https-auth-keepalive.px
+index 049bebec..2a18ccfd 100755
+--- a/tests/Test-proxied-https-auth-keepalive.px
++++ b/tests/Test-proxied-https-auth-keepalive.px
+@@ -153,7 +153,7 @@ my $cmdline = $WgetTest::WGETPATH . " --user=fiddle-dee-dee"
+     . " --password=Dodgson -e https_proxy=localhost:{{port}}"
+     . " --no-check-certificate"
+     . " https://no.such.domain/needs-auth.txt";
+-$cmdline =~ s/{{port}}/$SOCKET->sockport()/e;
++$cmdline =~ s/\Q{{port}}/$SOCKET->sockport()/e;
+ 
+ if (defined $srcdir) {
+     $VALGRIND_SUPP_FILE = $srcdir . '/valgrind-suppressions-ssl';
+diff --git a/tests/Test-proxied-https-auth.px b/tests/Test-proxied-https-auth.px
+index ce4e736c..878114e7 100755
+--- a/tests/Test-proxied-https-auth.px
++++ b/tests/Test-proxied-https-auth.px
+@@ -152,7 +152,7 @@ my $cmdline = $WgetTest::WGETPATH . " --user=fiddle-dee-dee"
+     . " --password=Dodgson -e https_proxy=localhost:{{port}}"
+     . " --no-check-certificate"
+     . " https://no.such.domain/needs-auth.txt";
+-$cmdline =~ s/{{port}}/$SOCKET->sockport()/e;
++$cmdline =~ s/\Q{{port}}/$SOCKET->sockport()/e;
+ 
+ if (defined $srcdir) {
+     $VALGRIND_SUPP_FILE = $srcdir . '/valgrind-suppressions-ssl';
+-- 
+2.14.3
+
diff --git a/net-misc/wget/files/wget-1.19.1-fix-Python-test-suite.patch b/net-misc/wget/files/wget-1.19.1-fix-Python-test-suite.patch
new file mode 100644
index 000000000000..11736675dcc8
--- /dev/null
+++ b/net-misc/wget/files/wget-1.19.1-fix-Python-test-suite.patch
@@ -0,0 +1,172 @@
+Fix python test suite for GnuTLS 3.5.12+
+
+Backport of f42229b1fdf30ee30c6e13b01eb0c4ebd9ea9169
+
+--- a/testenv/Test--rejected-log.py
++++ b/testenv/Test--rejected-log.py
+@@ -14,7 +14,7 @@ mainpage = """
+ </head>
+ <body>
+   <p>
+-    Recurse to a <a href="http://127.0.0.1:{{port}}/secondpage.html">second page</a>.
++    Recurse to a <a href="http://localhost:{{port}}/secondpage.html">second page</a>.
+   </p>
+ </body>
+ </html>
+@@ -27,8 +27,8 @@ secondpage = """
+ </head>
+ <body>
+   <p>
+-    Recurse to a <a href="http://127.0.0.1:{{port}}/thirdpage.html">third page</a>.
+-    Try the blacklisted <a href="http://127.0.0.1:{{port}}/index.html">main page</a>.
++    Recurse to a <a href="http://localhost:{{port}}/thirdpage.html">third page</a>.
++    Try the blacklisted <a href="http://localhost:{{port}}/index.html">main page</a>.
+   </p>
+ </body>
+ </html>
+@@ -41,7 +41,7 @@ thirdpage = """
+ </head>
+ <body>
+   <p>
+-    Try a hidden <a href="http://127.0.0.1:{{port}}/dummy.txt">dummy file</a>.
++    Try a hidden <a href="http://localhost:{{port}}/dummy.txt">dummy file</a>.
+     Try to leave to <a href="http://no.such.domain/">another domain</a>.
+   </p>
+ </body>
+@@ -55,9 +55,9 @@ Disallow: /dummy.txt
+ 
+ log = """\
+ REASON\tU_URL\tU_SCHEME\tU_HOST\tU_PORT\tU_PATH\tU_PARAMS\tU_QUERY\tU_FRAGMENT\tP_URL\tP_SCHEME\tP_HOST\tP_PORT\tP_PATH\tP_PARAMS\tP_QUERY\tP_FRAGMENT
+-BLACKLIST\thttp%3A//127.0.0.1%3A{{port}}/index.html\tSCHEME_HTTP\t127.0.0.1\t{{port}}\tindex.html\t\t\t\thttp%3A//127.0.0.1%3A{{port}}/secondpage.html\tSCHEME_HTTP\t127.0.0.1\t{{port}}\tsecondpage.html\t\t\t
+-ROBOTS\thttp%3A//127.0.0.1%3A{{port}}/dummy.txt\tSCHEME_HTTP\t127.0.0.1\t{{port}}\tdummy.txt\t\t\t\thttp%3A//127.0.0.1%3A{{port}}/thirdpage.html\tSCHEME_HTTP\t127.0.0.1\t{{port}}\tthirdpage.html\t\t\t
+-SPANNEDHOST\thttp%3A//no.such.domain/\tSCHEME_HTTP\tno.such.domain\t80\t\t\t\t\thttp%3A//127.0.0.1%3A{{port}}/thirdpage.html\tSCHEME_HTTP\t127.0.0.1\t{{port}}\tthirdpage.html\t\t\t
++BLACKLIST\thttp%3A//localhost%3A{{port}}/index.html\tSCHEME_HTTP\tlocalhost\t{{port}}\tindex.html\t\t\t\thttp%3A//localhost%3A{{port}}/secondpage.html\tSCHEME_HTTP\tlocalhost\t{{port}}\tsecondpage.html\t\t\t
++ROBOTS\thttp%3A//localhost%3A{{port}}/dummy.txt\tSCHEME_HTTP\tlocalhost\t{{port}}\tdummy.txt\t\t\t\thttp%3A//localhost%3A{{port}}/thirdpage.html\tSCHEME_HTTP\tlocalhost\t{{port}}\tthirdpage.html\t\t\t
++SPANNEDHOST\thttp%3A//no.such.domain/\tSCHEME_HTTP\tno.such.domain\t80\t\t\t\t\thttp%3A//localhost%3A{{port}}/thirdpage.html\tSCHEME_HTTP\tlocalhost\t{{port}}\tthirdpage.html\t\t\t
+ """
+ 
+ dummyfile = "Don't care."
+--- a/testenv/Test--spider-r.py
++++ b/testenv/Test--spider-r.py
+@@ -14,8 +14,8 @@ mainpage = """
+ </head>
+ <body>
+   <p>
+-    Some text and a link to a <a href="http://127.0.0.1:{{port}}/secondpage.html">second page</a>.
+-    Also, a <a href="http://127.0.0.1:{{port}}/nonexistent">broken link</a>.
++    Some text and a link to a <a href="http://localhost:{{port}}/secondpage.html">second page</a>.
++    Also, a <a href="http://localhost:{{port}}/nonexistent">broken link</a>.
+   </p>
+ </body>
+ </html>
+@@ -29,8 +29,8 @@ secondpage = """
+ </head>
+ <body>
+   <p>
+-    Some text and a link to a <a href="http://127.0.0.1:{{port}}/thirdpage.html">third page</a>.
+-    Also, a <a href="http://127.0.0.1:{{port}}/nonexistent">broken link</a>.
++    Some text and a link to a <a href="http://localhost:{{port}}/thirdpage.html">third page</a>.
++    Also, a <a href="http://localhost:{{port}}/nonexistent">broken link</a>.
+   </p>
+ </body>
+ </html>
+@@ -43,8 +43,8 @@ thirdpage = """
+ </head>
+ <body>
+   <p>
+-    Some text and a link to a <a href="http://127.0.0.1:{{port}}/dummy.txt">text file</a>.
+-    Also, another <a href="http://127.0.0.1:{{port}}/againnonexistent">broken link</a>.
++    Some text and a link to a <a href="http://localhost:{{port}}/dummy.txt">text file</a>.
++    Also, another <a href="http://localhost:{{port}}/againnonexistent">broken link</a>.
+   </p>
+ </body>
+ </html>
+--- a/testenv/certs/server-cert.pem
++++ b/testenv/certs/server-cert.pem
+@@ -1,21 +1,21 @@
+ -----BEGIN CERTIFICATE-----
+-MIIDgDCCAmigAwIBAgIIVGI73zrIeeMwDQYJKoZIhvcNAQELBQAwMDERMA8GA1UE
+-AxMIR05VIFdnZXQxDTALBgNVBAsTBFdnZXQxDDAKBgNVBAoTA0dOVTAiGA8yMDE0
+-MTExMTE2NDAwMFoYDzk5OTkxMjMxMjM1OTU5WjAxMRIwEAYDVQQDEwkxMjcuMC4w
+-LjExDTALBgNVBAsTBFdnZXQxDDAKBgNVBAoTA0dOVTCCASIwDQYJKoZIhvcNAQEB
+-BQADggEPADCCAQoCggEBAMjC3Gt55EfStl6mE371+pD3/cpR5MLxkdbBss5MlIP2
+-TDhiPOItLXml8oxs4BjUm3wfn3GV9iJLmbzbIWL+0kbRkQ2LCPKUf+Cln3z2ZE+r
+-XwdWlT8gVfv51Opfkp2lLDVUqLfNKRGQgivjSCmLqY2LqeB0SaVNvuaD3EpqZyIH
+-0E5SZgjqBHgRRtvGkcy0rOmp5SI2NASLugUioXa9OLWjpYDwodsd3ERlL0DJ1aJW
+-8TC8Tqix4i0osWzar+LXBIin0Qvar9/uRHN0p1kq3p0XgNHKqWpiTT54+WYx7Pem
+-v4qRXz11swiJzUL+Pw1DurQ9smbzDgAsz7V2FJnUeCcCAwEAAaOBmDCBlTAMBgNV
+-HRMBAf8EAjAAMB8GA1UdEQQYMBaCCTEyNy4wLjAuMYIJbG9jYWxob3N0MBMGA1Ud
+-JQQMMAoGCCsGAQUFBwMBMA8GA1UdDwEB/wQFAwMHoAAwHQYDVR0OBBYEFJfm323L
+-JbKTM/tMKSt0qlUqewbnMB8GA1UdIwQYMBaAFPM+TjiESqm+wW/HYaNQ2m4pi+tU
+-MA0GCSqGSIb3DQEBCwUAA4IBAQCDmuSD4IGmn0UQ5jhGQquh92Iu59j64Rrg7EIM
+-zoppciyYR8gDUutOI9CEisxJz6umvAdOo5L981gcFaBv6hHWaE/krAZccR+ZXZP6
+-fI9btO8My8O63fYcd2KkLEFqvKDF43i01S2LrqXdPo3uELbFZwxCmUKsexFGsoW1
+-CbXbRjnS7w/f72myRmvBeDiNMuGfe1lb4IflybH3DMlKC7i0AN1JKglp+IKn5XAE
+-neWR03i3UaYJsibIxj0DkTS+hVPu5MXQ9RlF5CkRdFKjGinLE/u70XyAyx0/IeAN
+-e7c2MJvpdfRmTXm2ew4sNyK9RXo7Bv0Yqkl65iMscF8LNnxL
++MIIDdzCCAl+gAwIBAgIMWWD1GB1UFkEICdQvMA0GCSqGSIb3DQEBCwUAMDAxETAP
++BgNVBAMTCEdOVSBXZ2V0MQ0wCwYDVQQLEwRXZ2V0MQwwCgYDVQQKEwNHTlUwIBcN
++MTcwNzA4MTUwNzA0WhgPOTk5OTEyMzEyMzU5NTlaMDExEjAQBgNVBAMTCTEyNy4w
++LjAuMTENMAsGA1UECxMEV2dldDEMMAoGA1UEChMDR05VMIIBIjANBgkqhkiG9w0B
++AQEFAAOCAQ8AMIIBCgKCAQEAyMLca3nkR9K2XqYTfvX6kPf9ylHkwvGR1sGyzkyU
++g/ZMOGI84i0teaXyjGzgGNSbfB+fcZX2IkuZvNshYv7SRtGRDYsI8pR/4KWffPZk
++T6tfB1aVPyBV+/nU6l+SnaUsNVSot80pEZCCK+NIKYupjYup4HRJpU2+5oPcSmpn
++IgfQTlJmCOoEeBFG28aRzLSs6anlIjY0BIu6BSKhdr04taOlgPCh2x3cRGUvQMnV
++olbxMLxOqLHiLSixbNqv4tcEiKfRC9qv3+5Ec3SnWSrenReA0cqpamJNPnj5ZjHs
++96a/ipFfPXWzCInNQv4/DUO6tD2yZvMOACzPtXYUmdR4JwIDAQABo4GNMIGKMAwG
++A1UdEwEB/wQCMAAwFAYDVR0RBA0wC4IJbG9jYWxob3N0MBMGA1UdJQQMMAoGCCsG
++AQUFBwMBMA8GA1UdDwEB/wQFAwMHoAAwHQYDVR0OBBYEFJfm323LJbKTM/tMKSt0
++qlUqewbnMB8GA1UdIwQYMBaAFPM+TjiESqm+wW/HYaNQ2m4pi+tUMA0GCSqGSIb3
++DQEBCwUAA4IBAQC1a0NQfmqT8Ky/BFo5H+G+GoQTlqi3J83ujAMdLUD57zYCEyDL
++XzAhMPfrOSLPDcQb0ooD1Ie+Rz8Xs1h00cD2OGKwH479+nisF5ksqJVJ4fn/aNFE
++6W2Xb3MCB+4FRdmy0UeDDA6N2OpVskCM30s9tmovlBLVK46HogdLvy/O1o7z/gbx
++vV8luevxobnevZ3NdWLyVE3BJZiThBHmZUvL1XNy4KAR4wDAkbCwoTN/JkehTu0i
++WR6DaG7N7M6psc7rctfzRqimlAkxnoAUwc8LwNLTB3v613xXX8iSUsLKsh6pQfZR
++e5wnYQIS4MzowvDx8WevTPMRKlN72d8HHuv9
+ -----END CERTIFICATE-----
+--- a/testenv/certs/server-crl.pem
++++ b/testenv/certs/server-crl.pem
+@@ -1,12 +1,12 @@
+ -----BEGIN X509 CRL-----
+-MIIB1DCBvQIBATANBgkqhkiG9w0BAQsFADAwMREwDwYDVQQDEwhHTlUgV2dldDEN
+-MAsGA1UECxMEV2dldDEMMAoGA1UEChMDR05VGA8yMDE0MTExMTE2NDU1NFoYDzk5
+-OTkxMjMxMjM1OTU5WjAdMBsCCFRiO986yHnjGA8yMDE0MTExMTE2NDU1NFqgNjA0
+-MB8GA1UdIwQYMBaAFPM+TjiESqm+wW/HYaNQ2m4pi+tUMBEGA1UdFAQKAghUYj1E
+-KHs9ijANBgkqhkiG9w0BAQsFAAOCAQEAZgwqs1VOFG39dFHHMXvBr4eJfhwiG4bC
+-cL6IvLhvl9ikcyQMHrpOBtNjkCtgclSbJjjTDdera1+zuCWE0WBOJ4mojYdAIOhR
+-QvSwp4NwAtibu2F/fjeXoo+LEpcRKtLvAotB30eCZ1OPrijsa/HxFILOLlayjns8
+-wM4RmQC4o43y1G/1jqM8hGDg4Wz0j1URVuyP+pU55JpubV5LlExy3gIRwevD2lam
+-q3hiighenJYFO3HGZkYT2SIoSpXZnQqKPJ4HwRBSg/cjOpc1y1lIIvKhmk+Cut6M
+-+S5HL4pIk8vGYg57nTfOOkj1goqFkfU0DBqvVAZj02ay/VIDu61T1g==
++MIIB1jCBvwIBATANBgkqhkiG9w0BAQsFADAwMREwDwYDVQQDEwhHTlUgV2dldDEN
++MAsGA1UECxMEV2dldDEMMAoGA1UEChMDR05VFw0xNzA3MDgxNTA3MDRaFw0xODA3
++MDgxNTA3MDRaMB8wHQIMWWD1GB1UFkEICdQvFw0xNzA3MDgxNTA3MDRaoDowODAf
++BgNVHSMEGDAWgBTzPk44hEqpvsFvx2GjUNpuKYvrVDAVBgNVHRQEDgIMWWD1GB4C
++YfERSnyEMA0GCSqGSIb3DQEBCwUAA4IBAQAAKu+Lum1l/XtcCJ43WveouPK97iOE
++bjUZWaGYx8Ys/iBdhTa1GXG+E+JuyqgyHTW0HrWJi1D+GiYmsjPJXoEgVgtxXEQ7
++8b3NyIQ8OCsSTTlVCmLECN9R0xlsitzH+HXOaIEs5sbmIxCnxu+brqno9gQocmCv
++LHYvoSxsSsOCkkmodbYtKssl2dBonvQPSijN/z3NhZ259e2U3Yv4V7/MrEoTvOxg
++M0GC0u0Nx86EWbq0sWeiUu270Qk9En5YGNtRhkeq0bXerJswmMAmvrtuKdyfouny
++4WMvtn30xsO3WwWSV2oyrDSN/IQdDbcmul/bg8ewqlnN77cVf2m70c/W
+ -----END X509 CRL-----
+--- a/testenv/certs/server-template.cfg
++++ b/testenv/certs/server-template.cfg
+@@ -68,7 +68,6 @@ expiration_days = -1
+ # X.509 v3 extensions
+ 
+ # A dnsname in case of a WWW server.
+-dns_name = "127.0.0.1"
+ dns_name = "localhost"
+ 
+ # A subject alternative name URI
+--- a/testenv/test/base_test.py
++++ b/testenv/test/base_test.py
+@@ -90,7 +90,7 @@ class BaseTest:
+             # ports and etc.
+             # so we should record different domains respect to servers.
+             domain = self.get_domain_addr(instance.server_address)
+-            self.domains.append(domain[0])
++            self.domains.append('localhost')
+             self.ports.append(domain[1])
+ 
+     def exec_wget(self):
diff --git a/net-misc/wget/wget-1.19.1-r2.ebuild b/net-misc/wget/wget-1.19.1-r2.ebuild
new file mode 100644
index 000000000000..8d84a93dfa73
--- /dev/null
+++ b/net-misc/wget/wget-1.19.1-r2.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit flag-o-matic python-any-r1 toolchain-funcs
+
+DESCRIPTION="Network utility to retrieve files from the WWW"
+HOMEPAGE="https://www.gnu.org/software/wget/"
+SRC_URI="mirror://gnu/wget/${P}.tar.xz"
+
+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"
+IUSE="debug gnutls idn ipv6 libressl nls ntlm pcre +ssl static test uuid zlib"
+REQUIRED_USE=" ntlm? ( !gnutls ssl ) gnutls? ( ssl )"
+
+# Force a newer libidn2 to avoid libunistring deps. #612498
+LIB_DEPEND="idn? ( >=net-dns/libidn2-0.14[static-libs(+)] )
+	pcre? ( dev-libs/libpcre[static-libs(+)] )
+	ssl? (
+		gnutls? ( net-libs/gnutls:0=[static-libs(+)] )
+		!gnutls? (
+			!libressl? ( dev-libs/openssl:0=[static-libs(+)] )
+			libressl? ( dev-libs/libressl[static-libs(+)] )
+		)
+	)
+	uuid? ( sys-apps/util-linux[static-libs(+)] )
+	zlib? ( sys-libs/zlib[static-libs(+)] )"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig
+	static? ( ${LIB_DEPEND} )
+	test? (
+		${PYTHON_DEPS}
+		dev-lang/perl
+		dev-perl/HTTP-Daemon
+		dev-perl/HTTP-Message
+		dev-perl/IO-Socket-SSL
+	)
+	nls? ( sys-devel/gettext )"
+
+DOCS=( AUTHORS MAILING-LIST NEWS README doc/sample.wgetrc )
+
+PATCHES=(
+	"${FILESDIR}"/${P}-CRLF_injection.patch
+	"${FILESDIR}"/${PN}-1.19.1-fix-Perl-warnings-in-tests.patch
+	"${FILESDIR}"/${PN}-1.19.1-fix-Python-test-suite.patch
+	"${FILESDIR}"/${PN}-1.19.1-CVE-2017-13089.patch
+	"${FILESDIR}"/${PN}-1.19.1-CVE-2017-13090.patch
+)
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# revert some hack that breaks linking, bug #585924
+	if [[ ${CHOST} == *-darwin* ]] || [[ ${CHOST} == *-solaris* ]] || [[ ${CHOST} == *-uclibc* ]]; then
+		sed -i \
+			-e 's/^  LIBICONV=$/:/' \
+			configure || die
+	fi
+}
+
+src_configure() {
+	# fix compilation on Solaris, we need filio.h for FIONBIO as used in
+	# the included gnutls -- force ioctl.h to include this header
+	[[ ${CHOST} == *-solaris* ]] && append-cppflags -DBSD_COMP=1
+
+	if use static ; then
+		append-ldflags -static
+		tc-export PKG_CONFIG
+		PKG_CONFIG+=" --static"
+	fi
+
+	# There is no flag that controls this.  libunistring-prefix only
+	# controls the search path (which is why we turn it off below).
+	# Further, libunistring is only needed w/older libidn2 installs,
+	# and since we force the latest, we can force off libunistring. #612498
+	ac_cv_libunistring=no \
+	econf \
+		--disable-assert \
+		--disable-rpath \
+		--without-included-libunistring \
+		--without-libunistring-prefix \
+		$(use_enable debug) \
+		$(use_enable idn iri) \
+		$(use_enable ipv6) \
+		$(use_enable nls) \
+		$(use_enable ntlm) \
+		$(use_enable pcre) \
+		$(use_enable ssl digest) \
+		$(use_enable ssl opie) \
+		$(use_with idn libidn) \
+		$(use_with ssl ssl $(usex gnutls gnutls openssl)) \
+		$(use_with uuid libuuid) \
+		$(use_with zlib)
+}
+
+src_install() {
+	default
+
+	sed -i \
+		-e "s:/usr/local/etc:${EPREFIX}/etc:g" \
+		"${ED}"/etc/wgetrc \
+		"${ED}"/usr/share/man/man1/wget.1 \
+		"${ED}"/usr/share/info/wget.info \
+		|| die
+}
diff --git a/net-misc/wget/wget-1.19.2.ebuild b/net-misc/wget/wget-1.19.2.ebuild
new file mode 100644
index 000000000000..454b396597e1
--- /dev/null
+++ b/net-misc/wget/wget-1.19.2.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit flag-o-matic python-any-r1 toolchain-funcs
+
+DESCRIPTION="Network utility to retrieve files from the WWW"
+HOMEPAGE="https://www.gnu.org/software/wget/"
+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"
+IUSE="debug gnutls idn ipv6 libressl nls ntlm pcre +ssl static test uuid zlib"
+REQUIRED_USE=" ntlm? ( !gnutls ssl ) gnutls? ( ssl )"
+
+# Force a newer libidn2 to avoid libunistring deps. #612498
+LIB_DEPEND="idn? ( >=net-dns/libidn2-0.14[static-libs(+)] )
+	pcre? ( dev-libs/libpcre[static-libs(+)] )
+	ssl? (
+		gnutls? ( net-libs/gnutls:0=[static-libs(+)] )
+		!gnutls? (
+			!libressl? ( dev-libs/openssl:0=[static-libs(+)] )
+			libressl? ( dev-libs/libressl[static-libs(+)] )
+		)
+	)
+	uuid? ( sys-apps/util-linux[static-libs(+)] )
+	zlib? ( sys-libs/zlib[static-libs(+)] )"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig
+	static? ( ${LIB_DEPEND} )
+	test? (
+		${PYTHON_DEPS}
+		dev-lang/perl
+		dev-perl/HTTP-Daemon
+		dev-perl/HTTP-Message
+		dev-perl/IO-Socket-SSL
+	)
+	nls? ( sys-devel/gettext )"
+
+DOCS=( AUTHORS MAILING-LIST NEWS README doc/sample.wgetrc )
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# revert some hack that breaks linking, bug #585924
+	if [[ ${CHOST} == *-darwin* ]] || [[ ${CHOST} == *-solaris* ]] || [[ ${CHOST} == *-uclibc* ]]; then
+		sed -i \
+			-e 's/^  LIBICONV=$/:/' \
+			configure || die
+	fi
+}
+
+src_configure() {
+	# fix compilation on Solaris, we need filio.h for FIONBIO as used in
+	# the included gnutls -- force ioctl.h to include this header
+	[[ ${CHOST} == *-solaris* ]] && append-cppflags -DBSD_COMP=1
+
+	if use static ; then
+		append-ldflags -static
+		tc-export PKG_CONFIG
+		PKG_CONFIG+=" --static"
+	fi
+
+	# There is no flag that controls this.  libunistring-prefix only
+	# controls the search path (which is why we turn it off below).
+	# Further, libunistring is only needed w/older libidn2 installs,
+	# and since we force the latest, we can force off libunistring. #612498
+	ac_cv_libunistring=no \
+	econf \
+		--disable-assert \
+		--disable-rpath \
+		--without-included-libunistring \
+		--without-libunistring-prefix \
+		$(use_enable debug) \
+		$(use_enable idn iri) \
+		$(use_enable ipv6) \
+		$(use_enable nls) \
+		$(use_enable ntlm) \
+		$(use_enable pcre) \
+		$(use_enable ssl digest) \
+		$(use_enable ssl opie) \
+		$(use_with idn libidn) \
+		$(use_with ssl ssl $(usex gnutls gnutls openssl)) \
+		$(use_with uuid libuuid) \
+		$(use_with zlib)
+}
+
+src_install() {
+	default
+
+	sed -i \
+		-e "s:/usr/local/etc:${EPREFIX}/etc:g" \
+		"${ED}"/etc/wgetrc \
+		"${ED}"/usr/share/man/man1/wget.1 \
+		"${ED}"/usr/share/info/wget.info \
+		|| die
+}
diff --git a/net-misc/wicd/Manifest b/net-misc/wicd/Manifest
index 7be8165d0bf5..7d359ff1eedc 100644
--- a/net-misc/wicd/Manifest
+++ b/net-misc/wicd/Manifest
@@ -7,7 +7,7 @@ AUX wicd-init-sve-start.patch 317 SHA256 20d7ada99465da5b50d03e5ef117226910bc202
 DIST Icone-Wicd-Lucid.tar.gz 9015 SHA256 6e4e3483c6cff7398e6871dd3e4360e361e5c6e64007e8e1240fd1c259ac707e SHA512 0df0dbdf05b462264dca2dd9955454a82f688b0fbfa7c2ad70a424df57eb27b35561d37819fc88b5746cff8a54de5b7b43ec325d2f98a4a1a30e4d500e86d2f8 WHIRLPOOL 336f363092c9bac7523047b6052a856a699820147967820418c6ac1ca528c472d371c6c211c505c325b5eb001812042c01425b05e1dfdf2d4a528f96686c530a
 DIST wicd-1.7.4.tar.gz 547393 SHA256 67989614004773db349791c37675efb914d084bdb221356a05e4369c35e7eb62 SHA512 1e99a45daa858eba634e60e50c22aa2fab3fc4d643979a6741b6164bf500bd6db285d11c12ccd164ab6cf0792284e319e3c3447804088e74b4fc67bb6f431959 WHIRLPOOL 680c79380ea645a286889c737c7b478a933e4243ad20c5c0f8cf53d37747a1d98780e21a4aeb98bed6da37f93f61d5dd4a42b22466f2feceae08e87d853b80fd
 DIST wicd-mac4lin-icons.tar.xz 53136 SHA256 4c48c769c71f962415e3bd3573557e9288351afb867347f9a6f652883ae31011 SHA512 98ed3f92ec361aa8651c64efdb5128b8f73068f1cf2423640dafc4b46889ae32c1d1f56f509ad609b2bf98f634f8ada4c501f2294e3a64affd1befd4400498a8 WHIRLPOOL 84c097432ebb6ca66c0fa48d4226c8da5f6342b6fdeeb9546c98952b8f6e52a1f87d0ba23c1b409f3008432e5c6346bf65949dad99070804b1dcc2c1055eb9ea
-EBUILD wicd-1.7.4-r2.ebuild 5090 SHA256 655787b6e96bcfbe6d65262917855c966b642006cd664e7e00ba1a4a8a8bd123 SHA512 70de74c229f32ef67472b5e4bb90e11aa6db3c964cb2e584128c73217ede9e7b01d307e5d488ae7808fd33c8d2eea753e7e7938c70012d1fce5f861454da5248 WHIRLPOOL b201cb9f889760a5fbe5430be55cc014881762310215a4ff580ec161ca407c89d522032c8dc85dedf665ddefbac7c7131930f100e1827d64c5a6a4f1888c780e
+EBUILD wicd-1.7.4-r3.ebuild 5090 SHA256 655787b6e96bcfbe6d65262917855c966b642006cd664e7e00ba1a4a8a8bd123 SHA512 70de74c229f32ef67472b5e4bb90e11aa6db3c964cb2e584128c73217ede9e7b01d307e5d488ae7808fd33c8d2eea753e7e7938c70012d1fce5f861454da5248 WHIRLPOOL b201cb9f889760a5fbe5430be55cc014881762310215a4ff580ec161ca407c89d522032c8dc85dedf665ddefbac7c7131930f100e1827d64c5a6a4f1888c780e
 MISC ChangeLog 6589 SHA256 40c4d124de33cac3e06ca57c7739fd18fdfbd7b3404920e2b112171732227043 SHA512 52583ce554757db55effec9b9282ef15886034edb85e009ebd838c71f14fee3975706dec7352211ae3b47ab9fa1d91f47d042f3fc1f254e128415d4f41ce5b4a WHIRLPOOL de6f7117fc6178cf45c8994eb8a04ef472fb5332acf03493fe05b9212dfc57dfa20b3494473365650cf5f901b55f64779726334ddf5001e179b698f5bba6b6e0
 MISC ChangeLog-2015 26387 SHA256 a7f737451ae142fbf394d86d0ea0b45aa0569a783ab741b0fb625949d82dd6a8 SHA512 9116e57c3808bf057848c154f8d7db97c2d4d8a5cb550755b7c153cddcf00172624cb2144dd97507d8477634b60593b9888e50457c5c5d9b2d7e8be1ea440b80 WHIRLPOOL 665ea3e24b5e4ff25340bde9e96babea90437a320cb9d593bb7996b0b8796556c4c55ca087a297b16815d387f22d41cc0685b4acf8a93a777184cc17750244bc
 MISC metadata.xml 913 SHA256 093b6929d3794e81c15c1ceb1c2460d998f3a4c32e78e8459c1255d982c57054 SHA512 2cc53e7e0f14169b88d26324b071b2078012cc57bd9ddae0b14f18efbe2d1bc1ef0b66122c178b0e3019a48bec2ba87fc09186b4d8a96e8e7d8e51a997c09d69 WHIRLPOOL ec17032c4cfb7e9046a4ea13cb5fd7763c2ec4534e3d58c4c2ae846e108acadf72ad7c2a6b90132d94a17a56a98c866415af54fdbf144e9f534e5d4a07da8d60
diff --git a/net-misc/wicd/wicd-1.7.4-r2.ebuild b/net-misc/wicd/wicd-1.7.4-r3.ebuild
index c06f9fd6f0ff..c06f9fd6f0ff 100644
--- a/net-misc/wicd/wicd-1.7.4-r2.ebuild
+++ b/net-misc/wicd/wicd-1.7.4-r3.ebuild
diff --git a/net-misc/x2goclient/Manifest b/net-misc/x2goclient/Manifest
index dda31b8337d9..fbb71ab45ef3 100644
--- a/net-misc/x2goclient/Manifest
+++ b/net-misc/x2goclient/Manifest
@@ -2,7 +2,7 @@ DIST x2goclient-4.0.3.2.tar.gz 1560536 SHA256 f65a70463eae3d6d9fe6e4379f4ffacda5
 DIST x2goclient-4.1.0.0.tar.gz 1889861 SHA256 4b5915bc3666228910342810a34f7a03fb6967c6b9c796633d9cdf8b89cc2b6a SHA512 cb7023b0b9de6d83ee8206bc0a36be0306cea19a3a8fc081ffe704691ae8744848bc3c329b3bf475e838b93c2ee4b9c96af20fae34e6d4822fcf7feb9c3cf6d0 WHIRLPOOL c2f3de5f164ae6794f439c8b59e72782f54ca802ee7ce5f3f52e0cd79625b372d61e8f5d8a6b2127fa3520545922150fc761a1874640ad1e3fbf7b5066ce3ade
 DIST x2goclient-4.1.0.1.tar.gz 1891484 SHA256 0681b8a11b02652643cf1451a75d812c3ce9f3ee33c348b34178c130dcf77484 SHA512 6cbfb70fb7f522f0a5557ab36b6e15b6cae9ad184bd1d51b6c2f2acfa7b22d8fd9344bbfee141f2d5bd71f5adf9d3bd6d2c7db7b774cd8f8af5bcd25144de98d WHIRLPOOL cb4510229b20fcb5574ba8cdaf7e313ab9d37db99fb39a16d6088f545f39c7587f844f890c02c941674f8021fd5f5425d51aaaee34704f7c66c0addad98cf4ea
 EBUILD x2goclient-4.0.3.2.ebuild 1533 SHA256 70e9d824501daf0e092ac668d03c7378d0beae26de39ecd46857295f40a5d7f0 SHA512 e33ee793ed8d269fad7b98328096cc713224635d6218122cbf9303e7a4aa0463cd0baf725089d0b17bfb08deb4c96a3610c3a6a3175c5d09fcb52ff5f2a029e7 WHIRLPOOL f2bdc8c30e94fd12a522c1a94a178a30a8d6ec5e49847f186c059b9e184a6cd649edd577f2f5975493a6fb2946a43a9784f1756d6638654c799c7e4db3efe51a
-EBUILD x2goclient-4.1.0.0-r1.ebuild 2011 SHA256 d22f1389bf9c766ff7bb5864cc6c42425c878e6873c577cb05db01a3106b8df6 SHA512 d21c351bc31138aea429131051428b574ebd3aa79558f3fd432f71f35d41196d5a172bd7579cdbba84a6d3edb956c9a3e1397d9afb09a37cf26c586e253d9cf9 WHIRLPOOL b6e20db4750c32ee9e121cf377fbf0aaf3114e0e59b72c256af6760728474f846ea74d723b2c8d46f454e617edad0aaeb61af3eaf4642d65b9775e46006c7d7b
+EBUILD x2goclient-4.1.0.0-r1.ebuild 2010 SHA256 58a713e4dfa5db8ccab3e2866c4d0937e080380047bf4243b8df501b7e766139 SHA512 d0c42256d725c6eab22bb0aee1614910e85c8dd73d4914c83bdace2ba9328fce783d75e9b8f9ec0b14ee3c336a91a6edd21a92e32ef5fe74aedf4243c124b883 WHIRLPOOL 9cf9cdc7e28d6b62577399d9e2cf4ea69cf87cc10d97095fd912a8a30744528eb005e3228eb35f4e0ae74bab7aca5d1d3885539a9c9128c5c4fd0811e2574284
 EBUILD x2goclient-4.1.0.1-r1.ebuild 1212 SHA256 0775c1aefddd9271478abcc772754d3bd12cb60b315be869f4fd35a1bd61625c SHA512 6828dde23894609af104231e8e3f86e473bb9491caafe9016ffa2da2415813f785525169b288a23439d26926528bb8a2b26a1e77bf0fbd46ccc803c09527cef3 WHIRLPOOL 3eb1b7454e853c2abd4845cabc95a8073d93a126743df1715d9204b91f806475b33a0c2ea01fc3261644833efa17789e1adefdac2f722d30ec91ea19893321e4
 EBUILD x2goclient-4.1.0.1.ebuild 2011 SHA256 d22f1389bf9c766ff7bb5864cc6c42425c878e6873c577cb05db01a3106b8df6 SHA512 d21c351bc31138aea429131051428b574ebd3aa79558f3fd432f71f35d41196d5a172bd7579cdbba84a6d3edb956c9a3e1397d9afb09a37cf26c586e253d9cf9 WHIRLPOOL b6e20db4750c32ee9e121cf377fbf0aaf3114e0e59b72c256af6760728474f846ea74d723b2c8d46f454e617edad0aaeb61af3eaf4642d65b9775e46006c7d7b
 MISC ChangeLog 4293 SHA256 ef5abb9965123178b0268a9bbd672ae0dfc491060e04df60cf11814fda3fc811 SHA512 57fbd4efda2682b9a9b8b95eed298d99ade59cc24134c0e15170c469c9eb25fcd08f8fd15274b36c4cdefe75aea0f383d60f2decd3c381a2538c7001c7318682 WHIRLPOOL 3bc0cd004550fb82aae2fa0ed12b5191191538418d6eed4e94a94cf626080e95bc0128f0fb959bbee806e436e41446b9e36c4dad76eafd0473296ae41e40a50c
diff --git a/net-misc/x2goclient/x2goclient-4.1.0.0-r1.ebuild b/net-misc/x2goclient/x2goclient-4.1.0.0-r1.ebuild
index 4774046e76f9..c5c50ad7ccc5 100644
--- a/net-misc/x2goclient/x2goclient-4.1.0.0-r1.ebuild
+++ b/net-misc/x2goclient/x2goclient-4.1.0.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="ldap nsplugin qt5"
 
 REQUIRED_USE="nsplugin? ( !qt5 )"
diff --git a/net-misc/x2goserver/Manifest b/net-misc/x2goserver/Manifest
index 388cac47c61d..df1f8650b884 100644
--- a/net-misc/x2goserver/Manifest
+++ b/net-misc/x2goserver/Manifest
@@ -7,7 +7,7 @@ DIST x2goserver-4.0.1.20.tar.gz 96412 SHA256 f8bf48e1c8995bd5a7cde6de1c006fdb77f
 EBUILD x2goserver-4.0.1.19-r2.ebuild 2589 SHA256 a39bbbf33fe3476890ad3f0aa631202b587455e7b8f54a3ea63a802514022bd1 SHA512 48b8e813b688ae3195bb16bcbacc7f025ca6fb83574300854be69e443c98663835b8854534d4f5295dc8dacfb60727aea78409d362617c4ded76204e77c4affe WHIRLPOOL 001e9d6ea95f3cb167e049c5dee1068dad77114247e0e9bce751100d30c03aaa385e482807c42b5eefccf2dee555a7a9e1a0ccc8185e47917266bc86c85fad9d
 EBUILD x2goserver-4.0.1.19-r3.ebuild 2638 SHA256 721107c845f2f5177ae2348a9fbe4a6c7037267e5a2fc0e611b93398be1918e3 SHA512 f911bb6de40573af208611ef5fada2b29b6e3e92120e228500a27144f6c8309a104cbaf0a972f53b9d5421c55f8a4f8c97458d7fe9802eb11cf9b0b25f7bca58 WHIRLPOOL 407251c7774ca0bd81ee3bda3b1fec4e636c6b0762eafd9979abf79a6442f972b974ad505f724f11202d8e111dde6ecb9b13a8ed76be57eea5f9a8b0056e4a71
 EBUILD x2goserver-4.0.1.19.ebuild 2499 SHA256 82523c984842bc75e1c012083299d49e2adb4eb98b14f6990456d6dec076fb53 SHA512 f6883747893843fd472344c1bbd578982e878866f60e3fb5fdd4a313a9009bca2498d7ac286dfe96fc16c5002240d4fae3c2972393c248f3d6d034d59b2d3b65 WHIRLPOOL 4e6eea122b607a8b09838eff5d21e8d640fdad341c8394773d0dac919c030bd3b8df7c0aae92cd47614744cf5a6bb28d0a88a8761bf51131a07b5c59bd7e1336
-EBUILD x2goserver-4.0.1.20.ebuild 2545 SHA256 53bd88ef5f0ac8b0a4fa5adcc022558829c23094193292f9d9cbc81863af9726 SHA512 f84fdbaadafaeadc058f573d394f2dd7e60fd965c7970bdcb3ad43e6a6e3fbd3d9fc374cd364fa9761079145c3aedcfc2ea1730c7b8e7b7546ec4570da607533 WHIRLPOOL 638b473e6a0a7e5f864883fbd01b25685fb9d3c411a9f49c950a2b50c8ba4ce66bb68b5bc279e3d6442913294b27ecee376c84c290e6e2ffe4f55f7ced382a9f
+EBUILD x2goserver-4.0.1.20.ebuild 2544 SHA256 76fed816c4230129c427be207eae126c229be67ce306c6d69ed3e881ebffbfc3 SHA512 e67ed7fe6fe116bb9d29912ed71b0be31229662add077d3aef350299303849088e77dbabb5a7a53c511f9f5384e435ab03a4be35fbc3745b84bd47f5bfc39884 WHIRLPOOL 742c74d7942bdf98100645fe8d9f0237052b3abe0f3a02a25e2064f78cfddbc8d6a11073f602a45fe9e98990d8d3190495bbb2c571284ff566c6e73678e88759
 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.20.ebuild b/net-misc/x2goserver/x2goserver-4.0.1.20.ebuild
index edd8b54c43bc..8ec714bca8f1 100644
--- a/net-misc/x2goserver/x2goserver-4.0.1.20.ebuild
+++ b/net-misc/x2goserver/x2goserver-4.0.1.20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="+fuse postgres +sqlite"
 
 REQUIRED_USE="|| ( postgres sqlite )"
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index 7bd537ee94e3..cb6534b33b79 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,9 +1,9 @@
 DIST youtube-dl-2017.03.16.tar.gz 2631620 SHA256 55df3cbda9cf86e49baf54040340ec74c692bb3d6da3d2f5a1bc1238017dd492 SHA512 f3b8942f6b2be3b1cfd4bddfb74c17bad48c8ef4bea34114970ecb9d65b5a3dcbe71beba6d7c2dbda168371bbb2e8bbaddce58039bd9d158bf23950a2a88123c WHIRLPOOL 8345da00074e62ec9a9c244cb9ef64930fbd0e5e9e5bc1709bfcf56517cc6312031a09523c3016db2a1542c16a0297bea9d6883a201ae94e347e358307e92422
-DIST youtube-dl-2017.10.07.tar.gz 2816312 SHA256 d9a8935087c1e2fa3307594ae15f1e9ea0f8676e825fa676a50a3a3d471bba83 SHA512 4842c8b324a10a4eff398226749ff8394ca60cf1e47873c1dfb5cf9828b77772670ea30891f32b26bab421aa0e7ca95e2815e062061a2cbaf22e6c5f76e1d87d WHIRLPOOL 525eb2eb3f18bf5ed1776f1a4d43dd010793b3b1681f27b3ed4ed4afdbd0c3dcd2c18b8e532de1fa3c318ac6a5f186c0bdf60fa4c7c69fe939335a7235679c3c
 DIST youtube-dl-2017.10.15.1.tar.gz 2820437 SHA256 da6ae68b2fbe81da7cf4ac6b989fa7bf27b3beb214eed551d466cc6e41d7297f SHA512 6093747f732dac4eda4c71d334ed01fc24ba70d29e5660c38ff795861f06c4029441c3a4576e6a5463974488aeb7732687e5634481c8b04127f77499a2405a1c WHIRLPOOL cc8fca27f2a110fde556e6c6506a88715d4e4a03c971b7e74e77a91a5b28916c66146afd6e476a19aca2fff3270719da102d254a05f62dbabb5dc2a10040d839
+DIST youtube-dl-2017.10.20.tar.gz 2824647 SHA256 3e920a573218328a0864ffda5084093ec03108a7d4cd13cea7be85d7c342f95a SHA512 973465ad7d04f9d790fb9d36ca1c2c89c13f64b599ac3ef61f7720cd9d618d01619f76b419044eb716123e8300c1e2b4d881972a8240e0421f396dddd7affef1 WHIRLPOOL 2292bb5bdde62bc94b83d01da7b9a251fa88feaf95d2df703b40db36297cee75e76e776db4e0ca2959873f30655ee93cc52c76731230957a3bbbff0e5e736b0a
 EBUILD youtube-dl-2017.03.16.ebuild 2381 SHA256 9503230e2716a18498b74f5047095216fa36cdf4801cc6446e6f2075fa5cde50 SHA512 b47b7f8c00e04879aaac6bc70621d28f9e6e153b618bd246f95a2b11f8f09bf77cfefc5f0869b379759edf68a8f5d4afded6425032a9efdb8a1cbf44a23e9862 WHIRLPOOL ded7fa74a8649db1cc5c16eb98ab557853d264bcc458429374b0bbb29773f993a8621285bcfcbe243cf3892d982f91ff5278c45cb0e50b824b156a0a57786911
-EBUILD youtube-dl-2017.10.07.ebuild 2382 SHA256 6bcc95505bb69e73c3cbf3c7824a96e42e651b0461a44a27dda5549e8bf7e625 SHA512 ab1e5bfe8a287cf5ad8f74efeaa95469b66d62f28f45e65c0aa41e352661de8e3fac99a1d60f15c33b312985794ce6b08fd8e08340f2adce1d46391065be4e20 WHIRLPOOL 41f2c088f6bf4a0692e76a67a70c01f8d07ec381690316544b2d6267a8ef6ff3480800d5ff387cad24c306413b778abba3aa43da0aa67a561de70b5b6072b280
 EBUILD youtube-dl-2017.10.15.1.ebuild 2382 SHA256 6bcc95505bb69e73c3cbf3c7824a96e42e651b0461a44a27dda5549e8bf7e625 SHA512 ab1e5bfe8a287cf5ad8f74efeaa95469b66d62f28f45e65c0aa41e352661de8e3fac99a1d60f15c33b312985794ce6b08fd8e08340f2adce1d46391065be4e20 WHIRLPOOL 41f2c088f6bf4a0692e76a67a70c01f8d07ec381690316544b2d6267a8ef6ff3480800d5ff387cad24c306413b778abba3aa43da0aa67a561de70b5b6072b280
+EBUILD youtube-dl-2017.10.20.ebuild 2382 SHA256 6bcc95505bb69e73c3cbf3c7824a96e42e651b0461a44a27dda5549e8bf7e625 SHA512 ab1e5bfe8a287cf5ad8f74efeaa95469b66d62f28f45e65c0aa41e352661de8e3fac99a1d60f15c33b312985794ce6b08fd8e08340f2adce1d46391065be4e20 WHIRLPOOL 41f2c088f6bf4a0692e76a67a70c01f8d07ec381690316544b2d6267a8ef6ff3480800d5ff387cad24c306413b778abba3aa43da0aa67a561de70b5b6072b280
 EBUILD youtube-dl-99999999.ebuild 2089 SHA256 a46031a2c229d820634b16d31efc904c44bafe1d04c3367b9e40e5e0c8b1c953 SHA512 a390ee79a77aa98603ca01a702df6621ac4630e62e7afd089e065bd4468fc38bfd13bba365e28916024f0eb9e92627133281985f57692432522aeb4671a0cf11 WHIRLPOOL a358657c660c533e1b506339c615e781998aa5465408629c51722f6999fc3e5d3fd11b617b89314ada35df0d93aeaa514837ac1a2e3b7573c43657394f6ef4ae
 MISC ChangeLog 32089 SHA256 377c688fd528de367a40230423162256199da2c475ef85d3dc986b622e322fd6 SHA512 955715fa5304b1ee5ab4436e232b4ac5c882e28f4755d2edcd23cc4c760575518dc8c349c20b2e1b41145ca55bbd8df292d12a1b34768acf55ae1d6b80e2f2ca WHIRLPOOL a925103ccb1de53ada47dd94f927a42eff5f97e14b47c607ddfaeda4e719a2eb8be78be8e008e4b3036ab48acb946e283876d646388745288ad5b992e2574104
 MISC ChangeLog-2015 75434 SHA256 71ef7accb3e09eadb601b4541ead4ed3019cbd1e86b56df23130cc0e49572dd5 SHA512 3517da9014199375d7bb8d4841b52ad12eb3a25ca7a225e767dd9b60f8b81848cf7f6763066fb7c7bb7826602711e22f56d710fa319cb8172843a31eb69228e6 WHIRLPOOL 32aee6516cd3e7848eeb08ccd47cb60bc04da646b2e448970ce40fa5d0e8dc591ae5d7c8e1dfe99229b6ee70805e070d8dee2353a41515377083bd7d2f02b073
diff --git a/net-misc/youtube-dl/youtube-dl-2017.10.07.ebuild b/net-misc/youtube-dl/youtube-dl-2017.10.20.ebuild
index 975ce26c347e..975ce26c347e 100644
--- a/net-misc/youtube-dl/youtube-dl-2017.10.07.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2017.10.20.ebuild
author	V3n3RiX <venerix@redcorelinux.org>	2017-10-29 11:22:34 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2017-10-29 11:22:34 +0000
commit	bd7908c6630f38067350d396ac5d18c3cc2434a0 (patch)
tree	3559b3e11424f5529527f2474d8a977a91ee3389 /net-misc
parent	8b2628ad8526c806375e7b157889e4274b70248b (diff)