net-libs/libssh2: Restore slot dependency after OpenSSL uprev.
This reverts commit 5cf9ab8ddb7f760058f1d06f1f4837953d94bf7f.
BUG=chromium:1096089
TEST=CQ
Change-Id: I54c122b1175da67445fafa84534d0b0c442bbcbf
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/overlays/portage-stable/+/2542974
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Tested-by: Mattias Nissler <mnissler@chromium.org>
Commit-Queue: Mattias Nissler <mnissler@chromium.org>
diff --git a/net-libs/libssh2/libssh2-1.8.0-r2.ebuild b/net-libs/libssh2/libssh2-1.8.0-r1.ebuild
similarity index 81%
rename from net-libs/libssh2/libssh2-1.8.0-r2.ebuild
rename to net-libs/libssh2/libssh2-1.8.0-r1.ebuild
index 2340ebf..7df6b57 100644
--- a/net-libs/libssh2/libssh2-1.8.0-r2.ebuild
+++ b/net-libs/libssh2/libssh2-1.8.0-r1.ebuild
@@ -13,12 +13,9 @@
KEYWORDS="*"
IUSE="gcrypt libressl static-libs test zlib"
-# Hack: Unslotted OpenSSL dependency to allow cargo to continue using OpenSSL
-# 1.0.2 across the OpenSSL 1.1 uprev. To be switched back to slotted dependency
-# after the OpenSSL uprev is done.
RDEPEND="
!gcrypt? (
- !libressl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
+ !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
)
gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
