From: Thomas Deutschmann <whissi@gentoo.org>
Date: Tue, 8 Oct 2019 15:56:59 +0000 (+0200)
Subject: dev-libs/openssl: block incompatible net-misc/openssh versions
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=3e5450cea62dc5bc913d68a05f9de96c76eb8fb9;p=gentoo.git

dev-libs/openssl: block incompatible net-misc/openssh versions

Bug: https://bugs.gentoo.org/696950
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
---

diff --git a/dev-libs/openssl/openssl-1.1.1d-r1.ebuild b/dev-libs/openssl/openssl-1.1.1d-r2.ebuild
similarity index 99%
rename from dev-libs/openssl/openssl-1.1.1d-r1.ebuild
rename to dev-libs/openssl/openssl-1.1.1d-r2.ebuild
index 2b1894650b9c..3ff2f47bbdeb 100644
--- a/dev-libs/openssl/openssl-1.1.1d-r1.ebuild
+++ b/dev-libs/openssl/openssl-1.1.1d-r2.ebuild
@@ -51,6 +51,9 @@ PATCHES=(
 
 S="${WORKDIR}/${MY_P}"
 
+# force upgrade to prevent broken login, bug 696950
+RDEPEND+=" !<net-misc/openssh-8.0_p1-r3"
+
 MULTILIB_WRAPPED_HEADERS=(
 	usr/include/openssl/opensslconf.h
 )