From: Davide Pesavento <pesa@gentoo.org>
Date: Tue, 3 May 2016 17:43:13 +0000 (+0200)
Subject: dev-qt/qtwebsockets: USE=ssl must be in sync with the same flag in qtnetwork
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=d7ad55281220025b3373707ef4f3d19a1a764d8e;p=gentoo.git

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
---

diff --git a/dev-qt/qtwebsockets/qtwebsockets-5.5.1-r2.ebuild b/dev-qt/qtwebsockets/qtwebsockets-5.5.1-r3.ebuild
similarity index 77%
rename from dev-qt/qtwebsockets/qtwebsockets-5.5.1-r2.ebuild
rename to dev-qt/qtwebsockets/qtwebsockets-5.5.1-r3.ebuild
index e9a9241ed257..13c3264394fb 100644
--- a/dev-qt/qtwebsockets/qtwebsockets-5.5.1-r2.ebuild
+++ b/dev-qt/qtwebsockets/qtwebsockets-5.5.1-r3.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.6.0-r1.ebuild b/dev-qt/qtwebsockets/qtwebsockets-5.6.0-r2.ebuild
similarity index 77%
rename from dev-qt/qtwebsockets/qtwebsockets-5.6.0-r1.ebuild
rename to dev-qt/qtwebsockets/qtwebsockets-5.6.0-r2.ebuild
index 26a4d9278f12..c62170c62c5c 100644
--- a/dev-qt/qtwebsockets/qtwebsockets-5.6.0-r1.ebuild
+++ b/dev-qt/qtwebsockets/qtwebsockets-5.6.0-r2.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
 }