commit: 1add981fc151795bcd45fd7b3d138429b4fa28f9 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Tue May 21 18:38:24 2019 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Tue May 21 18:40:54 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1add981f
x11-misc/x11vnc: USE !ssl is broken, drop it Closes: https://bugs.gentoo.org/686494 Package-Manager: Portage-2.3.66, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> x11-misc/x11vnc/x11vnc-0.9.16-r2.ebuild | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/x11-misc/x11vnc/x11vnc-0.9.16-r2.ebuild b/x11-misc/x11vnc/x11vnc-0.9.16-r2.ebuild index f78d4c9f6ab..5eed4727039 100644 --- a/x11-misc/x11vnc/x11vnc-0.9.16-r2.ebuild +++ b/x11-misc/x11vnc/x11vnc-0.9.16-r2.ebuild @@ -12,18 +12,16 @@ SRC_URI="https://github.com/LibVNC/x11vnc/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="crypt fbcon libressl ssl +xcomposite +xdamage +xfixes xinerama +xrandr zeroconf" +IUSE="crypt fbcon libressl +xcomposite +xdamage +xfixes xinerama +xrandr zeroconf" COMMON_DEPEND=" - >=net-libs/libvncserver-0.9.8[ssl?] + >=net-libs/libvncserver-0.9.8[ssl] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext >=x11-libs/libXtst-1.1.0 - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:= ) - ) + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:= ) xcomposite? ( x11-libs/libXcomposite ) xdamage? ( x11-libs/libXdamage ) xfixes? ( x11-libs/libXfixes ) @@ -52,15 +50,16 @@ src_prepare() { src_configure() { # --without-v4l because of missing video4linux 2.x support wrt #389079 + # --with-crypto --with-ssl because USE=-ssl is broken (bug #686494) econf \ + --with-crypto \ + --with-ssl \ --without-v4l \ --without-xkeyboard \ --without-fbpm \ --without-dpms \ $(use_with crypt) \ $(use_with fbcon fbdev) \ - $(use_with ssl) \ - $(use_with ssl crypto) \ $(use_with xcomposite) \ $(use_with xdamage) \ $(use_with xfixes) \
