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

[Davide Pesavento]

commit:     97788447844911542b77805ec0f8303cfddad1a0
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Tue May  3 17:42:01 2016 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue May  3 17:42:11 2016 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=97788447

dev-qt/qtwebsockets: USE=ssl must be in sync with the same flag in qtnetwork

Amends commit af3eca38517b6fce72eb01850b1791323f8a8e24.

Gentoo-Bug: 581964
Package-Manager: portage-2.2.28

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

diff --git a/dev-qt/qtwebsockets/qtwebsockets-5.6.9999.ebuild 
b/dev-qt/qtwebsockets/qtwebsockets-5.6.9999.ebuild
index 26a4d92..c62170c 100644
--- a/dev-qt/qtwebsockets/qtwebsockets-5.6.9999.ebuild
+++ b/dev-qt/qtwebsockets/qtwebsockets-5.6.9999.ebuild
@@ -15,7 +15,7 @@ IUSE="qml +ssl"
 
 DEPEND="
        ~dev-qt/qtcore-${PV}
-       ~dev-qt/qtnetwork-${PV}[ssl?]
+       ~dev-qt/qtnetwork-${PV}[ssl=]
        qml? ( ~dev-qt/qtdeclarative-${PV} )
 
 "
@@ -24,10 +24,5 @@ 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 26a4d92..c62170c 100644
--- a/dev-qt/qtwebsockets/qtwebsockets-5.7.0_beta.ebuild
+++ b/dev-qt/qtwebsockets/qtwebsockets-5.7.0_beta.ebuild
@@ -15,7 +15,7 @@ IUSE="qml +ssl"
 
 DEPEND="
        ~dev-qt/qtcore-${PV}
-       ~dev-qt/qtnetwork-${PV}[ssl?]
+       ~dev-qt/qtnetwork-${PV}[ssl=]
        qml? ( ~dev-qt/qtdeclarative-${PV} )
 
 "
@@ -24,10 +24,5 @@ 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 26a4d92..c62170c 100644
--- a/dev-qt/qtwebsockets/qtwebsockets-5.7.9999.ebuild
+++ b/dev-qt/qtwebsockets/qtwebsockets-5.7.9999.ebuild
@@ -15,7 +15,7 @@ IUSE="qml +ssl"
 
 DEPEND="
        ~dev-qt/qtcore-${PV}
-       ~dev-qt/qtnetwork-${PV}[ssl?]
+       ~dev-qt/qtnetwork-${PV}[ssl=]
        qml? ( ~dev-qt/qtdeclarative-${PV} )
 
 "
@@ -24,10 +24,5 @@ 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 26a4d92..c62170c 100644
--- a/dev-qt/qtwebsockets/qtwebsockets-5.9999.ebuild
+++ b/dev-qt/qtwebsockets/qtwebsockets-5.9999.ebuild
@@ -15,7 +15,7 @@ IUSE="qml +ssl"
 
 DEPEND="
        ~dev-qt/qtcore-${PV}
-       ~dev-qt/qtnetwork-${PV}[ssl?]
+       ~dev-qt/qtnetwork-${PV}[ssl=]
        qml? ( ~dev-qt/qtdeclarative-${PV} )
 
 "
@@ -24,10 +24,5 @@ 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
 }