[gentoo-commits] repo/gentoo:master commit in: x11-misc/x11vnc/

["Mikle Kolyada" <zlogene@gentoo.org>]

commit:     14ff796614ca5380c85e54e591ddc8c900d34dfa
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 30 16:57:31 2021 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Fri Apr 30 16:58:05 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14ff7966

x11-misc/x11vnc: remove libressl support

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>

 x11-misc/x11vnc/x11vnc-0.9.16-r4.ebuild | 9 +++------
 x11-misc/x11vnc/x11vnc-0.9.16-r5.ebuild | 7 ++-----
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/x11-misc/x11vnc/x11vnc-0.9.16-r4.ebuild b/x11-misc/x11vnc/x11vnc-0.9.16-r4.ebuild
index 85403ad5c8b..9d0ae573e93 100644
--- a/x11-misc/x11vnc/x11vnc-0.9.16-r4.ebuild
+++ b/x11-misc/x11vnc/x11vnc-0.9.16-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/LibVNC/x11vnc/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2+-with-openssl-exception"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="crypt fbcon libressl ssl +xcomposite +xdamage +xfixes xinerama +xrandr zeroconf"
+IUSE="crypt fbcon ssl +xcomposite +xdamage +xfixes xinerama +xrandr zeroconf"
 
 COMMON_DEPEND="
 	>=net-libs/libvncserver-0.9.8[ssl=]
@@ -20,10 +20,7 @@ COMMON_DEPEND="
 	x11-libs/libXcursor
 	x11-libs/libXext
 	>=x11-libs/libXtst-1.1.0
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
+	ssl? ( dev-libs/openssl:0= )
 	xcomposite? ( x11-libs/libXcomposite )
 	xdamage? ( x11-libs/libXdamage )
 	xfixes? ( x11-libs/libXfixes )

diff --git a/x11-misc/x11vnc/x11vnc-0.9.16-r5.ebuild b/x11-misc/x11vnc/x11vnc-0.9.16-r5.ebuild
index cf172b51fea..67620fb825d 100644
--- a/x11-misc/x11vnc/x11vnc-0.9.16-r5.ebuild
+++ b/x11-misc/x11vnc/x11vnc-0.9.16-r5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/LibVNC/x11vnc/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2+-with-openssl-exception"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="crypt fbcon libressl ssl +xcomposite +xdamage +xfixes xinerama +xrandr zeroconf"
+IUSE="crypt fbcon ssl +xcomposite +xdamage +xfixes xinerama +xrandr zeroconf"
 
 COMMON_DEPEND="
 	>=net-libs/libvncserver-0.9.8[ssl=]
@@ -20,10 +20,7 @@ COMMON_DEPEND="
 	x11-libs/libXcursor
 	x11-libs/libXext
 	>=x11-libs/libXtst-1.1.0
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
+	ssl? ( dev-libs/openssl:0= )
 	xcomposite? ( x11-libs/libXcomposite )
 	xdamage? ( x11-libs/libXdamage )
 	xfixes? ( x11-libs/libXfixes )