gentoo resync : 03.11.2018

10 files changed, 47 insertions, 401 deletions

diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest
index 0883d3fbcb78..893901602d0b 100644
--- a/net-libs/libssh/Manifest
+++ b/net-libs/libssh/Manifest
@@ -1,15 +1,8 @@
-AUX libssh-0.5.0-tests.patch 446 BLAKE2B dab1ad97c37e43f25ca6acb3aef57542f4f0e3059618240da0f600ed0aa364dc9c0eee92dc1f6ac848b11da2f69fcbb4b75b0393727774b928202f7f3685853f SHA512 e751ac1c3749ecbd8ee2f960ad09e861763cbdb9bccc7c95ae27ca4768e8c9ae5ab55342151a2799f8f937e63a8729bff6f04cec166bb9830b99f8f690da4825
-AUX libssh-0.7.5-add-macro-for-MAX.patch 916 BLAKE2B bc24cd008159c9c20ff75dc17842921ac1aa920d359aede3bc933c54024790ad9869ae44f9a81392cb73f967b6af69848d5e1c6ee2ea17c81edb8cb798c89b8a SHA512 9a9fd719cdbe42f0b2520104af4bd31d24721cb356d40a70870d2f95166c16e2c58c4a9568958a051214fa813fcadc55477c6a743d65c301ee27a83fc8abc119
-AUX libssh-0.7.5-fix-config-buffer-underflow.patch 742 BLAKE2B 5db1e2be05b45914bd832d1c3ecfa850ab2dfa88baba5566c41e8acf783a8dd0cf118851344dc8ddba39393532bede4d8a6134aa81d121da18bff9c1b4ffd27c SHA512 0e6ed4f39637b5bc3476225b1cbd28891e668609e681b4b55343c37d6a7f0c5be0f71ce684b6a83ab5e5f14cca3206d0752a17cab1138fdf274656ba36a764e5
-AUX libssh-0.7.5-fix-config-parsing.patch 1076 BLAKE2B f710d58d36ec529c9390647b1a53506defe4a480463e899f8d7aeb8fe7d0d463b80f87ab6ec35fd89afadadb5f7698ac3e33a6f5693092494bfb1cf43886a9e6 SHA512 45d21c11ce242d6f2a86fe1fe96ed934a06d0dd54b9e2af6ad873bbec1b0db91cb884879205f42c1006740a4cfc1c16723180f447640e96e8373b39be8828aa5
-AUX libssh-0.7.5-fix-internal-algo-selection.patch 4711 BLAKE2B 04d61ee7ab3eba651342ac2b3dba52ef191271de37e741b2cb82da11c2f9cfb19d64a6befe9ebbab8d8525bd75c9213dee56c32023340db92e046827835df7ae SHA512 29bf9b43c8ee2f65c65040163fc9f250f35d5ca77ace5db2782eb8478dc14d9d16c0cf0e991025443a701d3d60124f83134a35e7cde6fae20932e3d2ff4b6732
 AUX libssh-0.8.0-tests.patch 503 BLAKE2B 22c3527e4b06ab9a00936e84c66ed14c7163a285aa5c88cfec5543e7c7aada8ffb716e20f3d3a0fef9425e244629f0d1c35250bdb9ce454b6cb247a3537cd411 SHA512 43145c2c202510ebe5cf64b47a6963b9335a844997f986938eacb0171a129863cdbd2676b8016941c85ec8c820d0543b8ab20f6aca5af86b3506e78aa29cf7e8
 AUX libssh-0.8.3-strict-overflow.patch 627 BLAKE2B 81d29d56f91bb5c649f8f2e3706034de59834b859725bddd9243a934335fc20d13dbc2fcb0e8627ba23856072958e1bf06224403ed24a871a38a909af09d38d8 SHA512 06529a3a6145ac4123f48b307b45376441b09c368a6cc89d514180e6a0e7fb5be46c3a1ed118bb2f8aec61a389fadbb7c8b2649d35dfa03bbdfc01befad56fc6
-DIST libssh-0.7.4.tar.xz 351892 BLAKE2B 5427faa04eac7b57f73909f113d933daf667f8311c30364bbf06d4f01121a58f5b560e0a1d9071655ce9b310fa3f3f801e11e880ca3eacde66efa0f49dc51b2b SHA512 94b8183e5c83e339303c1a160c92ccff6159471ac7d189ab66cf6d606d2e803fd616519f079aef1577c947d3a14e315332b05ea08e44d0ab550edbcb768dbea7
-DIST libssh-0.7.5.tar.xz 351632 BLAKE2B b41cccb6215c5b7e66742171d91e1081d3c1bf44455b65a5992093d31b28db7a6375e815303e115e02b2458c734d9c61e4b1528ba905bf8a421ca2bbb7221ce6 SHA512 6c7f539899caaedf13d66fa2e0fac1a475ecdfe389131abcbdf908bdebc50a0b9e6b0d43e67e52aea85c32f6aa68e46ca2f50695992f82ded83489f445a8e775
 DIST libssh-0.8.4.tar.xz 425848 BLAKE2B 8ca913e4c9e2ffa231bb437ac6a4de695bbdf8720a7619f3fc310a3d724cb7e85bcf81d31761c3fe4e3c29010b67d3fc81cf391d5c2f7e051cb8cc2400763248 SHA512 73d685bab2e88ff6b03c95cc13f1bd341bce4c527353c7e4870865d236cfbe23dfd2d198a1ec1531aed1afd700ce8e5b738ec68ca9152a4b6ae63dd6cbbf0d51
-EBUILD libssh-0.7.4.ebuild 2510 BLAKE2B f644104dcf0707121f141a2b75bdb57935daf4a01d897b5ffb96d6875e681aecfd9730cd02d6330acdf96256f012643659951ca4cd97e2126bf6991fa88ab14e SHA512 1a7bf07e67bb6caf4a183095347fc512dcfcb98a729db2cc1416f39a3bb201ad3046eec7c82c3aa07c7a9f3c5e6b3d3e908a4d32252b0697bdc76173f287a8df
-EBUILD libssh-0.7.5-r2.ebuild 2720 BLAKE2B 76d98f803d58cdea91439451e4842c3079bc19c052845d4f18d27fbd94faf4f3028c244b9ccacbfc27edf87490cbad7af73c3f540f012b3c597ca3596f65c20e SHA512 80148669a5bdb2b0a1cdfdd295ef833ccd51270cfdc2986109b2a6b1bad5da3908642c89e929fed5dc2fda20d8104b3dace60c0d87c7c6450bace22d091efc82
-EBUILD libssh-0.8.4.ebuild 2959 BLAKE2B 57816055c70eba2227d28b3fda732b8dea5e9a6051264148e5e9f799bf28c7056d5f814abf3cae9359072cb3c39a54c589a79832741ca7ba9e4ea07daeef36c9 SHA512 27cd551e09bab6ad5551f9c0c11fe6501d6ed638762bf59d1d3728b042a21d63bf09f6ebacdd2ab9fc2afafe1b74b05e9c4c9f43ab11ba369c4d77ac2f410439
+DIST libssh-0.8.5.tar.xz 427372 BLAKE2B d1cd94a50f09b1562f7267ff435b2d180b84d4132a589e053f43f5de64bb764d9263910837a53be594e64595483ed9516dcbf20abc5071e9a8154b8bb75f6f4c SHA512 f1e90a5046e006d44a48ab36675167761d8e308ada7a1d7a1f7ba2825d222a2fab7e19dbc78b1371fee9ba74d9c55d9856a623f97842c9b9ad4c79215e344124
+EBUILD libssh-0.8.4.ebuild 2957 BLAKE2B dd4df344d463601b948ac65ee55b23f5586384eb43941614fac7b77c16c2c20c0feac5e3ab78c98e8566f07cf6ab6a06e1a32476183838950adf39a3be2ab6ff SHA512 3aa65824678b47784712a1b50fd8c2a78e1ee069150bfb9221896a599704d732b40541492d5a26a9b5049d271a34a958a5fde0d8338e820c3f63bfedab46a7f0
+EBUILD libssh-0.8.5.ebuild 2966 BLAKE2B 9eed97687ac93fa78c65d9f6d0c939fd91ffeec0452ff76f5efd5ee64b21eb62075f09d52f674cba7d6b3e1acbf39e53311657530ea54202da7914afd365ed94 SHA512 af0724b5943b3c11f667508c8a232c5cf2dba642d6d72b0f4e307f5d93a26545ede0ce3dc1546d675c37b91c9367e1c6f45341d2ce42e32a907781fd324715d9
 EBUILD libssh-9999.ebuild 2916 BLAKE2B 93e0101f64f7a11d8a2a83295057cecc7a4cc8cfb9ef0acf49bf00cb6a89bfda5d0e83518d28d60ffddddb069e841b3575e69194373687b77794198ddadfe0d7 SHA512 04d6693527a5d9b97fac07acc487a2bea86b968dd7dafbd3607b5811bd1e1de2edea1e63c28d23e93ea87dd7f841b8e2bdbcb8aaa210378e5f2f90817cd61481
-MISC metadata.xml 687 BLAKE2B 788f87388b4ab449521ab57684fa2c52393697e4e9826640473a1bc08bd886d384354362424c64a01a8d091c157610dbb4cebf80243bb4b73d125f47996f4f5f SHA512 95ca85fe4d9070acfeeb6a81505236e004d1e93464f9ba17d6d45968a4ab855121d67b4e09a54812063e924aa8b3a8e7ca3f13b68dc243b4fc0d062fb600fea8
+MISC metadata.xml 628 BLAKE2B d00b92769be46eda265251a9ed4f6193901325d1acbe7431322a8e8703bab28bee8cf37356e258fea14477afe1de039328e71d85f05d997ebbecbe632cd5f6c2 SHA512 a583a03a4c8daeaca89d51aa100b257d82b3a5483c66a81d8c5d5d9a93434fef2bc8f8cb8bd417e4593426a463cdf6d13272305e2296cc5bef37a02a9ef6a474
diff --git a/net-libs/libssh/files/libssh-0.5.0-tests.patch b/net-libs/libssh/files/libssh-0.5.0-tests.patch
deleted file mode 100644
index dde770ce5b2a..000000000000
--- a/net-libs/libssh/files/libssh-0.5.0-tests.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/tests/unittests/torture_misc.c
-+++ b/tests/unittests/torture_misc.c
-@@ -195,7 +195,7 @@
- #ifdef _WIN32
-         unit_test(torture_path_expand_tilde_win),
- #else
--        unit_test(torture_path_expand_tilde_unix),
-+        //unit_test(torture_path_expand_tilde_unix),
- #endif
-         unit_test_setup_teardown(torture_path_expand_escape, setup, teardown),
-         unit_test_setup_teardown(torture_path_expand_known_hosts, setup, teardown),
diff --git a/net-libs/libssh/files/libssh-0.7.5-add-macro-for-MAX.patch b/net-libs/libssh/files/libssh-0.7.5-add-macro-for-MAX.patch
deleted file mode 100644
index d9226d697000..000000000000
--- a/net-libs/libssh/files/libssh-0.7.5-add-macro-for-MAX.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 310d423d36ae7bb6dac5a2ae2fb7b57bda72dcb5 Mon Sep 17 00:00:00 2001
-From: Andreas Schneider <asn@cryptomilk.org>
-Date: Thu, 24 Aug 2017 17:27:08 +0200
-Subject: [PATCH 1/2] priv: Add macro for MAX
-
-Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
-(cherry picked from commit de35212789d11086621e176a11399de0d75ab3a6)
-Signed-off-by: Mihai Moldovan <ionic@ionic.de>
----
- include/libssh/priv.h | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/include/libssh/priv.h b/include/libssh/priv.h
-index 5a74915e..c3373c00 100644
---- a/include/libssh/priv.h
-+++ b/include/libssh/priv.h
-@@ -263,6 +263,10 @@ int match_hostname(const char *host, const char *pattern, unsigned int len);
- #define MIN(a,b) ((a) < (b) ? (a) : (b))
- #endif
- 
-+#ifndef MAX
-+#define MAX(a,b) ((a) > (b) ? (a) : (b))
-+#endif
-+
- /** Free memory space */
- #define SAFE_FREE(x) do { if ((x) != NULL) {free(x); x=NULL;} } while(0)
- 
--- 
-2.15.1
-
diff --git a/net-libs/libssh/files/libssh-0.7.5-fix-config-buffer-underflow.patch b/net-libs/libssh/files/libssh-0.7.5-fix-config-buffer-underflow.patch
deleted file mode 100644
index 7ff03263d198..000000000000
--- a/net-libs/libssh/files/libssh-0.7.5-fix-config-buffer-underflow.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 0cffb88b80b1e8b7e292646b955e9b9ca02315c4 Mon Sep 17 00:00:00 2001
-From: Aris Adamantiadis <aris@0xbadc0de.be>
-Date: Thu, 8 Jun 2017 00:22:02 +0200
-Subject: config: fix buffer underflow with unrecognized opcodes
-
----
- src/config.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/config.c b/src/config.c
-index 519926e7..6187c90f 100644
---- a/src/config.c
-+++ b/src/config.c
-@@ -218,7 +218,7 @@ static int ssh_config_parse_line(ssh_session session, const char *line,
-   }
- 
-   opcode = ssh_config_get_opcode(keyword);
--  if (*parsing == 1 && opcode != SOC_HOST) {
-+  if (*parsing == 1 && opcode != SOC_HOST && opcode != SOC_UNSUPPORTED) {
-       if (seen[opcode] != 0) {
-           return 0;
-       }
--- 
-cgit v1.1
-
diff --git a/net-libs/libssh/files/libssh-0.7.5-fix-config-parsing.patch b/net-libs/libssh/files/libssh-0.7.5-fix-config-parsing.patch
deleted file mode 100644
index 3596cf02105d..000000000000
--- a/net-libs/libssh/files/libssh-0.7.5-fix-config-parsing.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 5333be5988c3789e7011598995f4df90d50d84d0 Mon Sep 17 00:00:00 2001
-From: "Artyom V. Poptsov" <poptsov.artyom@gmail.com>
-Date: Sun, 4 Jun 2017 11:54:55 +0300
-Subject: config: Bugfix: Don't skip unseen opcodes
-
-libssh fails to read the configuration from a config file due to a
-wrong check in 'ssh_config_parse_line' procedure in 'config.c'; it's
-effectively skipping every opcode (and therefore every option) from
-the file.  The change fixes that behaviour.
-
-Signed-off-by: Artyom V. Poptsov <poptsov.artyom@gmail.com>
-Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
----
- src/config.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/config.c b/src/config.c
-index 6478fc5f..519926e7 100644
---- a/src/config.c
-+++ b/src/config.c
-@@ -219,7 +219,7 @@ static int ssh_config_parse_line(ssh_session session, const char *line,
- 
-   opcode = ssh_config_get_opcode(keyword);
-   if (*parsing == 1 && opcode != SOC_HOST) {
--      if (seen[opcode] == 0) {
-+      if (seen[opcode] != 0) {
-           return 0;
-       }
-       seen[opcode] = 1;
--- 
-cgit v1.1
-
diff --git a/net-libs/libssh/files/libssh-0.7.5-fix-internal-algo-selection.patch b/net-libs/libssh/files/libssh-0.7.5-fix-internal-algo-selection.patch
deleted file mode 100644
index 931d63360a12..000000000000
--- a/net-libs/libssh/files/libssh-0.7.5-fix-internal-algo-selection.patch
+++ /dev/null
@@ -1,156 +0,0 @@
-From 4893f9515da2696490e6bbe9aaf51f2ef9678b0f Mon Sep 17 00:00:00 2001
-From: Nikos Mavrogiannopoulos <nmav@redhat.com>
-Date: Thu, 24 Aug 2017 16:28:39 +0200
-Subject: [PATCH 2/2] ssh_options_set_algo: ensure we only set known algorithms
- internally
-
-That way, we will not fail later on key exchange phase when something
-unknown is negotiated.
-
-Fixes T37
-
-Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>
-Reviewed-by: Andreas Schneider <asn@samba.org>
-(cherry picked from commit 895055ab38e7716390019aae5e11771a88b99d26)
-Signed-off-by: Mihai Moldovan <ionic@ionic.de>
----
- include/libssh/kex.h |  1 +
- src/kex.c            | 75 ++++++++++++++++++++++++++++++++++++++++++++++++++++
- src/options.c        | 11 ++++----
- 3 files changed, 81 insertions(+), 6 deletions(-)
-
-diff --git a/include/libssh/kex.h b/include/libssh/kex.h
-index 1a5b6d41..23594985 100644
---- a/include/libssh/kex.h
-+++ b/include/libssh/kex.h
-@@ -41,6 +41,7 @@ void ssh_list_kex(struct ssh_kex_struct *kex);
- int set_client_kex(ssh_session session);
- int ssh_kex_select_methods(ssh_session session);
- int verify_existing_algo(int algo, const char *name);
-+char *keep_known_algos(int algo, const char *list);
- char **space_tokenize(const char *chain);
- int ssh_get_kex1(ssh_session session);
- char *ssh_find_matching(const char *in_d, const char *what_d);
-diff --git a/src/kex.c b/src/kex.c
-index 519d79ce..f0c9d067 100644
---- a/src/kex.c
-+++ b/src/kex.c
-@@ -281,6 +281,71 @@ char *ssh_find_matching(const char *available_d, const char *preferred_d){
-     return NULL;
- }
- 
-+static char *ssh_find_all_matching(const char *available_d,
-+                                   const char *preferred_d)
-+{
-+    char **tok_available, **tok_preferred;
-+    int i_avail, i_pref;
-+    char *ret;
-+    unsigned max, len, pos = 0;
-+
-+    if ((available_d == NULL) || (preferred_d == NULL)) {
-+        return NULL; /* don't deal with null args */
-+    }
-+
-+    max = MAX(strlen(available_d), strlen(preferred_d));
-+
-+    ret = malloc(max+1);
-+    if (ret == NULL) {
-+      return NULL;
-+    }
-+    ret[0] = 0;
-+
-+    tok_available = tokenize(available_d);
-+    if (tok_available == NULL) {
-+        SAFE_FREE(ret);
-+        return NULL;
-+    }
-+
-+    tok_preferred = tokenize(preferred_d);
-+    if (tok_preferred == NULL) {
-+        SAFE_FREE(ret);
-+        SAFE_FREE(tok_available[0]);
-+        SAFE_FREE(tok_available);
-+        return NULL;
-+    }
-+
-+    for (i_pref = 0; tok_preferred[i_pref] ; ++i_pref) {
-+        for (i_avail = 0; tok_available[i_avail]; ++i_avail) {
-+            int cmp = strcmp(tok_available[i_avail],tok_preferred[i_pref]);
-+            if (cmp == 0) {
-+                /* match */
-+                if (pos != 0) {
-+                    ret[pos] = ',';
-+                    pos++;
-+                }
-+
-+                len = strlen(tok_available[i_avail]);
-+                memcpy(&ret[pos], tok_available[i_avail], len);
-+                pos += len;
-+                ret[pos] = '\0';
-+            }
-+        }
-+    }
-+
-+    if (ret[0] == '\0') {
-+        SAFE_FREE(ret);
-+        ret = NULL;
-+    }
-+
-+    SAFE_FREE(tok_available[0]);
-+    SAFE_FREE(tok_preferred[0]);
-+    SAFE_FREE(tok_available);
-+    SAFE_FREE(tok_preferred);
-+
-+    return ret;
-+}
-+
- /**
-  * @internal
-  * @brief returns whether the first client key exchange algorithm or
-@@ -668,4 +733,14 @@ int verify_existing_algo(int algo, const char *name){
-     return 0;
- }
- 
-+/* returns a copy of the provided list if everything is supported,
-+ * otherwise a new list of the supported algorithms */
-+char *keep_known_algos(int algo, const char *list)
-+{
-+    if ((algo > 9) || (algo < 0)) {
-+        return NULL;
-+    }
-+
-+    return ssh_find_all_matching(supported_methods[algo], list);
-+}
- /* vim: set ts=2 sw=2 et cindent: */
-diff --git a/src/options.c b/src/options.c
-index aed2dda5..34fe9cc7 100644
---- a/src/options.c
-+++ b/src/options.c
-@@ -164,7 +164,10 @@ int ssh_options_copy(ssh_session src, ssh_session *dest) {
- 
- int ssh_options_set_algo(ssh_session session, int algo,
-     const char *list) {
--  if (!verify_existing_algo(algo, list)) {
-+  char *p = NULL;
-+
-+  p = keep_known_algos(algo, list);
-+  if (p == NULL) {
-     ssh_set_error(session, SSH_REQUEST_DENIED,
-         "Setting method: no algorithm for method \"%s\" (%s)\n",
-         ssh_kex_get_description(algo), list);
-@@ -172,11 +175,7 @@ int ssh_options_set_algo(ssh_session session, int algo,
-   }
- 
-   SAFE_FREE(session->opts.wanted_methods[algo]);
--  session->opts.wanted_methods[algo] = strdup(list);
--  if (session->opts.wanted_methods[algo] == NULL) {
--    ssh_set_error_oom(session);
--    return -1;
--  }
-+  session->opts.wanted_methods[algo] = p;
- 
-   return 0;
- }
--- 
-2.15.1
-
diff --git a/net-libs/libssh/libssh-0.7.4.ebuild b/net-libs/libssh/libssh-0.7.4.ebuild
deleted file mode 100644
index f33086923326..000000000000
--- a/net-libs/libssh/libssh-0.7.4.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P=${PN}-${PV/_rc/rc}
-inherit eutils cmake-multilib multilib
-
-DESCRIPTION="Access a working SSH implementation by means of a library"
-HOMEPAGE="http://www.libssh.org/"
-SRC_URI="https://red.libssh.org/attachments/download/210/${MY_P}.tar.xz -> ${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-SLOT="0/4" # subslot = soname major version
-IUSE="debug doc examples gcrypt gssapi libressl pcap +sftp ssh1 server static-libs test zlib"
-# Maintainer: check IUSE-defaults at DefineOptions.cmake
-
-RDEPEND="
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-	!gcrypt? (
-		!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
-		libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
-	)
-	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
-	gssapi? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-"
-DEPEND="
-	${RDEPEND}
-	doc? ( app-doc/doxygen )
-	test? ( >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}] )
-"
-
-DOCS=( AUTHORS README ChangeLog )
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.5.0-tests.patch
-)
-
-src_prepare() {
-	# just install the examples do not compile them
-	sed -i \
-		-e '/add_subdirectory(examples)/s/^/#DONOTWANT/' \
-		CMakeLists.txt || die
-
-	# keyfile torture test is currently broken
-	sed \
-		-e '/torture_keyfiles/d' \
-		-i tests/unittests/CMakeLists.txt || die
-
-	cmake-utils_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DWITH_DEBUG_CALLTRACE="$(usex debug)"
-		-DWITH_DEBUG_CRYPTO="$(usex debug)"
-		-DWITH_GCRYPT="$(usex gcrypt)"
-		-DWITH_GSSAPI="$(usex gssapi)"
-		-DWITH_NACL=no
-		-DWITH_PCAP="$(usex pcap)"
-		-DWITH_SERVER="$(usex server)"
-		-DWITH_SFTP="$(usex sftp)"
-		-DWITH_SSH1="$(usex ssh1)"
-		-DWITH_STACK_PROTECTOR=OFF
-		-DWITH_STATIC_LIB="$(usex static-libs)"
-		-DWITH_STATIC_LIB="$(usex test)"
-		-DWITH_TESTING="$(usex test)"
-		-DWITH_ZLIB="$(usex zlib)"
-	)
-
-	cmake-utils_src_configure
-}
-
-multilib_src_compile() {
-	cmake-utils_src_compile
-	multilib_is_native_abi && use doc && cmake-utils_src_compile doc
-}
-
-multilib_src_install() {
-	cmake-utils_src_install
-
-	if multilib_is_native_abi && use doc ; then
-		docinto html
-		dodoc -r doc/html/.
-	fi
-
-	use static-libs || rm -f "${D}"/usr/$(get_libdir)/libssh{,_threads}.a
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	if use examples; then
-		docinto examples
-		dodoc examples/*.{c,h,cpp}
-	fi
-}
diff --git a/net-libs/libssh/libssh-0.8.4.ebuild b/net-libs/libssh/libssh-0.8.4.ebuild
index 9d50b41535eb..407643de5b53 100644
--- a/net-libs/libssh/libssh-0.8.4.ebuild
+++ b/net-libs/libssh/libssh-0.8.4.ebuild
@@ -15,7 +15,7 @@ if [[ "${PV}" == *9999 ]] ; then
 else
 	inherit eapi7-ver
 	SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${MY_P}.tar.xz"
-	KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="LGPL-2.1"
diff --git a/net-libs/libssh/libssh-0.7.5-r2.ebuild b/net-libs/libssh/libssh-0.8.5.ebuild
index 95aba9f77ea6..7b660604f3aa 100644
--- a/net-libs/libssh/libssh-0.7.5-r2.ebuild
+++ b/net-libs/libssh/libssh-0.8.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,25 +8,37 @@ inherit cmake-multilib
 
 DESCRIPTION="Access a working SSH implementation by means of a library"
 HOMEPAGE="https://www.libssh.org/"
-SRC_URI="https://red.libssh.org/attachments/download/218/${MY_P}.tar.xz -> ${P}.tar.xz"
+
+if [[ "${PV}" == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git"
+else
+	inherit eapi7-ver
+	SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+fi
 
 LICENSE="LGPL-2.1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 SLOT="0/4" # subslot = soname major version
-IUSE="debug doc examples gcrypt gssapi libressl pcap server +sftp ssh1 static-libs test zlib"
+IUSE="debug doc examples gcrypt gssapi libressl mbedtls pcap server +sftp static-libs test zlib"
 # Maintainer: check IUSE-defaults at DefineOptions.cmake
 
+REQUIRED_USE="?? ( gcrypt mbedtls ) test? ( static-libs )"
+
 RDEPEND="
 	!gcrypt? (
-		!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
-		libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
+		!mbedtls? (
+			!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
+			libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
+		)
 	)
 	gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
 	gssapi? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+	mbedtls? ( net-libs/mbedtls[${MULTILIB_USEDEP}] )
 	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
 "
 DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
+	doc? ( app-doc/doxygen[dot] )
 	test? ( >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}] )
 "
 
@@ -35,20 +47,15 @@ DOCS=( AUTHORS README ChangeLog )
 S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-0.5.0-tests.patch
-	"${FILESDIR}"/${P}-fix-config-parsing.patch
-	"${FILESDIR}"/${P}-fix-config-buffer-underflow.patch
-	"${FILESDIR}"/${P}-add-macro-for-MAX.patch
-	"${FILESDIR}"/${P}-fix-internal-algo-selection.patch
+	"${FILESDIR}/${PN}-0.8.0-tests.patch"
+	"${FILESDIR}/${PN}-0.8.3-strict-overflow.patch"
 )
 
 src_prepare() {
 	cmake-utils_src_prepare
 
-	# just install the examples do not compile them
-	sed -i \
-		-e '/add_subdirectory(examples)/s/^/#DONOTWANT/' \
-		CMakeLists.txt || die
+	# just install the examples, do not compile them
+	cmake_comment_add_subdirectory examples
 
 	# keyfile torture test is currently broken
 	sed -i \
@@ -58,42 +65,43 @@ src_prepare() {
 
 multilib_src_configure() {
 	local mycmakeargs=(
+		-DUNIT_TESTING="$(usex test)"
 		-DWITH_DEBUG_CALLTRACE="$(usex debug)"
 		-DWITH_DEBUG_CRYPTO="$(usex debug)"
 		-DWITH_GCRYPT="$(usex gcrypt)"
 		-DWITH_GSSAPI="$(usex gssapi)"
+		-DWITH_MBEDTLS="$(usex mbedtls)"
 		-DWITH_NACL=no
 		-DWITH_PCAP="$(usex pcap)"
 		-DWITH_SERVER="$(usex server)"
 		-DWITH_SFTP="$(usex sftp)"
-		-DWITH_SSH1="$(usex ssh1)"
 		-DWITH_STACK_PROTECTOR=OFF
+		-DWITH_STACK_PROTECTOR_STRONG=OFF
 		-DWITH_STATIC_LIB="$(usex static-libs)"
-		-DWITH_STATIC_LIB="$(usex test)"
-		-DWITH_TESTING="$(usex test)"
 		-DWITH_ZLIB="$(usex zlib)"
 	)
 
+	multilib_is_native_abi || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON )
+
 	cmake-utils_src_configure
 }
 
 multilib_src_compile() {
 	cmake-utils_src_compile
-	multilib_is_native_abi && use doc && cmake-utils_src_compile doc
+	multilib_is_native_abi && use doc && cmake-utils_src_compile docs
 }
 
 multilib_src_install() {
 	cmake-utils_src_install
+	use doc && HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
 
-	if multilib_is_native_abi && use doc ; then
-		docinto html
-		dodoc -r doc/html/.
-	fi
-
-	use static-libs || rm -f "${D}"/usr/$(get_libdir)/libssh{,_threads}.a
+	# compatibility symlink until all consumers have been updated
+	# to no longer use libssh_threads.so
+	dosym libssh.so /usr/$(get_libdir)/libssh_threads.so
 }
 
 multilib_src_install_all() {
+	use mbedtls && DOCS+=( README.mbedtls )
 	einstalldocs
 
 	if use examples; then
diff --git a/net-libs/libssh/metadata.xml b/net-libs/libssh/metadata.xml
index fa9ac337d5e8..d18691367b0f 100644
--- a/net-libs/libssh/metadata.xml
+++ b/net-libs/libssh/metadata.xml
@@ -2,16 +2,15 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
-  <email>kde@gentoo.org</email>
-  <name>Gentoo KDE Project</name>
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
 </maintainer>
 <use>
-  <flag name="gcrypt">Use <pkg>dev-libs/libgcrypt</pkg> as TLS provider</flag>
-  <flag name="gssapi">Enable gssapi support</flag>
-  <flag name="mbedtls">Use <pkg>net-libs/mbedtls</pkg> as TLS provider</flag>
-  <flag name="pcap">Build with PCAP output support</flag>
-  <flag name="sftp">Build with SFTP support</flag>
-  <flag name="ssh1">Build with SSH1 support</flag>
-  <flag name="server">Build with SSH server support</flag>
+	<flag name="gcrypt">Use <pkg>dev-libs/libgcrypt</pkg> as TLS provider</flag>
+	<flag name="gssapi">Enable gssapi support</flag>
+	<flag name="mbedtls">Use <pkg>net-libs/mbedtls</pkg> as TLS provider</flag>
+	<flag name="pcap">Build with PCAP output support</flag>
+	<flag name="server">Build with SSH server support</flag>
+	<flag name="sftp">Build with SFTP support</flag>
 </use>
 </pkgmetadata>