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

[Davide Pesavento]

commit:     14c89fac8716dba293f194616131a32b5acf9fec
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Mon May  2 15:12:11 2016 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon May  2 15:12:11 2016 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=14c89fac

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

Package-Manager: portage-2.2.28

 dev-qt/qtwebsockets/qtwebsockets-5.6.9999.ebuild   | 9 +++++++--
 dev-qt/qtwebsockets/qtwebsockets-5.7.0_beta.ebuild | 9 +++++++--
 dev-qt/qtwebsockets/qtwebsockets-5.7.9999.ebuild   | 9 +++++++--
 dev-qt/qtwebsockets/qtwebsockets-5.9999.ebuild     | 9 +++++++--
 4 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/dev-qt/qtwebsockets/qtwebsockets-5.6.9999.ebuild b/dev-qt/qtwebsockets/qtwebsockets-5.6.9999.ebuild
index 75687e8..26a4d92 100644
--- a/dev-qt/qtwebsockets/qtwebsockets-5.6.9999.ebuild
+++ b/dev-qt/qtwebsockets/qtwebsockets-5.6.9999.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
 }

diff --git a/dev-qt/qtwebsockets/qtwebsockets-5.7.0_beta.ebuild b/dev-qt/qtwebsockets/qtwebsockets-5.7.0_beta.ebuild
index 75687e8..26a4d92 100644
--- a/dev-qt/qtwebsockets/qtwebsockets-5.7.0_beta.ebuild
+++ b/dev-qt/qtwebsockets/qtwebsockets-5.7.0_beta.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
 }

diff --git a/dev-qt/qtwebsockets/qtwebsockets-5.7.9999.ebuild b/dev-qt/qtwebsockets/qtwebsockets-5.7.9999.ebuild
index 75687e8..26a4d92 100644
--- a/dev-qt/qtwebsockets/qtwebsockets-5.7.9999.ebuild
+++ b/dev-qt/qtwebsockets/qtwebsockets-5.7.9999.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
 }

diff --git a/dev-qt/qtwebsockets/qtwebsockets-5.9999.ebuild b/dev-qt/qtwebsockets/qtwebsockets-5.9999.ebuild
index 75687e8..26a4d92 100644
--- a/dev-qt/qtwebsockets/qtwebsockets-5.9999.ebuild
+++ b/dev-qt/qtwebsockets/qtwebsockets-5.9999.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
 }