From af3eca38517b6fce72eb01850b1791323f8a8e24 Mon Sep 17 00:00:00 2001 From: Davide Pesavento Date: Mon, 2 May 2016 17:09:40 +0200 Subject: [PATCH] dev-qt/qtwebsockets: fix automagic dependency on qtnetwork[ssl] Package-Manager: portage-2.2.28 --- ...s-5.5.1-r1.ebuild => qtwebsockets-5.5.1-r2.ebuild} | 11 ++++++++--- ...kets-5.6.0.ebuild => qtwebsockets-5.6.0-r1.ebuild} | 9 +++++++-- 2 files changed, 15 insertions(+), 5 deletions(-) rename dev-qt/qtwebsockets/{qtwebsockets-5.5.1-r1.ebuild => qtwebsockets-5.5.1-r2.ebuild} (68%) rename dev-qt/qtwebsockets/{qtwebsockets-5.6.0.ebuild => qtwebsockets-5.6.0-r1.ebuild} (74%) diff --git a/dev-qt/qtwebsockets/qtwebsockets-5.5.1-r1.ebuild b/dev-qt/qtwebsockets/qtwebsockets-5.5.1-r2.ebuild similarity index 68% rename from dev-qt/qtwebsockets/qtwebsockets-5.5.1-r1.ebuild rename to dev-qt/qtwebsockets/qtwebsockets-5.5.1-r2.ebuild index 5dc250ac5df9..e9a9241ed257 100644 --- a/dev-qt/qtwebsockets/qtwebsockets-5.5.1-r1.ebuild +++ b/dev-qt/qtwebsockets/qtwebsockets-5.5.1-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -11,11 +11,11 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86" fi -IUSE="qml" +IUSE="qml +ssl" DEPEND=" ~dev-qt/qtcore-${PV} - ~dev-qt/qtnetwork-${PV} + ~dev-qt/qtnetwork-${PV}[ssl?] qml? ( ~dev-qt/qtdeclarative-${PV} ) " @@ -24,5 +24,10 @@ RDEPEND="${DEPEND}" src_prepare() { qt_use_disable_mod qml quick src/src.pro + if ! use ssl; then + sed -i -e '/contains(QT_CONFIG.*ssl)/ c\false{' \ + src/websockets/websockets.pro || die + fi + qt5-build_src_prepare } diff --git a/dev-qt/qtwebsockets/qtwebsockets-5.6.0.ebuild b/dev-qt/qtwebsockets/qtwebsockets-5.6.0-r1.ebuild similarity index 74% rename from dev-qt/qtwebsockets/qtwebsockets-5.6.0.ebuild rename to dev-qt/qtwebsockets/qtwebsockets-5.6.0-r1.ebuild index 75687e8f8a0a..26a4d9278f12 100644 --- a/dev-qt/qtwebsockets/qtwebsockets-5.6.0.ebuild +++ b/dev-qt/qtwebsockets/qtwebsockets-5.6.0-r1.ebuild @@ -11,11 +11,11 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86" fi -IUSE="qml" +IUSE="qml +ssl" DEPEND=" ~dev-qt/qtcore-${PV} - ~dev-qt/qtnetwork-${PV} + ~dev-qt/qtnetwork-${PV}[ssl?] qml? ( ~dev-qt/qtdeclarative-${PV} ) " @@ -24,5 +24,10 @@ RDEPEND="${DEPEND}" src_prepare() { qt_use_disable_mod qml quick src/src.pro + if ! use ssl; then + sed -i -e '/contains(QT_CONFIG.*ssl)/ c\false{' \ + src/websockets/websockets.pro || die + fi + qt5-build_src_prepare } -- 2.26.2