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 e9a9241ed257d1bc97b3fde6827f97ad0001d372..13c3264394fbdc44c4bd395c0302d2bbef27ff78 100644 (file)
--- 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 26a4d9278f121d80ed5ef1fb5b964b62e2f56c90..c62170c62c5ca1ca451b27229d6e188e5720cb49 100644 (file)
--- 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
 }