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

Package-Manager: portage-2.2.28
johu · May 2, 2016 · af3eca3 · af3eca3
1 parent ff342d8
commit af3eca3
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/...qtwebsockets/qtwebsockets-5.5.1-r1.ebuild → ...qtwebsockets/qtwebsockets-5.5.1-r2.ebuild b/...qtwebsockets/qtwebsockets-5.5.1-r1.ebuild → ...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/...qt/qtwebsockets/qtwebsockets-5.6.0.ebuild → ...qtwebsockets/qtwebsockets-5.6.0-r1.ebuild b/...qt/qtwebsockets/qtwebsockets-5.6.0.ebuild → ...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
 }