[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebsockets/

[Davide Pesavento]

commit:     af3eca38517b6fce72eb01850b1791323f8a8e24
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Mon May  2 15:09:40 2016 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon May  2 15:10:04 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af3eca38

dev-qt/qtwebsockets: fix automagic dependency on qtnetwork[ssl]

Package-Manager: portage-2.2.28

 ...ebsockets-5.5.1-r1.ebuild => qtwebsockets-5.5.1-r2.ebuild} | 11 ++++++++---
 ...qtwebsockets-5.6.0.ebuild => qtwebsockets-5.6.0-r1.ebuild} |  9 +++++++--
 2 files changed, 15 insertions(+), 5 deletions(-)

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 5dc250a..e9a9241 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 75687e8..26a4d92 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
 }