From af3eca38517b6fce72eb01850b1791323f8a8e24 Mon Sep 17 00:00:00 2001
From: Davide Pesavento <pesa@gentoo.org>
Date: Mon, 2 May 2016 17:09:40 +0200
Subject: dev-qt/qtwebsockets: fix automagic dependency on qtnetwork[ssl]

Package-Manager: portage-2.2.28
---
 dev-qt/qtwebsockets/qtwebsockets-5.5.1-r1.ebuild | 28 --------------------
 dev-qt/qtwebsockets/qtwebsockets-5.5.1-r2.ebuild | 33 ++++++++++++++++++++++++
 dev-qt/qtwebsockets/qtwebsockets-5.6.0-r1.ebuild | 33 ++++++++++++++++++++++++
 dev-qt/qtwebsockets/qtwebsockets-5.6.0.ebuild    | 28 --------------------
 4 files changed, 66 insertions(+), 56 deletions(-)
 delete mode 100644 dev-qt/qtwebsockets/qtwebsockets-5.5.1-r1.ebuild
 create mode 100644 dev-qt/qtwebsockets/qtwebsockets-5.5.1-r2.ebuild
 create mode 100644 dev-qt/qtwebsockets/qtwebsockets-5.6.0-r1.ebuild
 delete mode 100644 dev-qt/qtwebsockets/qtwebsockets-5.6.0.ebuild

diff --git a/dev-qt/qtwebsockets/qtwebsockets-5.5.1-r1.ebuild b/dev-qt/qtwebsockets/qtwebsockets-5.5.1-r1.ebuild
deleted file mode 100644
index 5dc250ac5df9..000000000000
--- a/dev-qt/qtwebsockets/qtwebsockets-5.5.1-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit qt5-build
-
-DESCRIPTION="Implementation of the WebSocket protocol for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
-fi
-
-IUSE="qml"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtnetwork-${PV}
-	qml? ( ~dev-qt/qtdeclarative-${PV} )
-
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	qt_use_disable_mod qml quick src/src.pro
-
-	qt5-build_src_prepare
-}
diff --git a/dev-qt/qtwebsockets/qtwebsockets-5.5.1-r2.ebuild b/dev-qt/qtwebsockets/qtwebsockets-5.5.1-r2.ebuild
new file mode 100644
index 000000000000..e9a9241ed257
--- /dev/null
+++ b/dev-qt/qtwebsockets/qtwebsockets-5.5.1-r2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit qt5-build
+
+DESCRIPTION="Implementation of the WebSocket protocol for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
+fi
+
+IUSE="qml +ssl"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtnetwork-${PV}[ssl?]
+	qml? ( ~dev-qt/qtdeclarative-${PV} )
+
+"
+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-r1.ebuild
new file mode 100644
index 000000000000..26a4d9278f12
--- /dev/null
+++ b/dev-qt/qtwebsockets/qtwebsockets-5.6.0-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit qt5-build
+
+DESCRIPTION="Implementation of the WebSocket protocol for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
+fi
+
+IUSE="qml +ssl"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtnetwork-${PV}[ssl?]
+	qml? ( ~dev-qt/qtdeclarative-${PV} )
+
+"
+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.ebuild b/dev-qt/qtwebsockets/qtwebsockets-5.6.0.ebuild
deleted file mode 100644
index 75687e8f8a0a..000000000000
--- a/dev-qt/qtwebsockets/qtwebsockets-5.6.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-inherit qt5-build
-
-DESCRIPTION="Implementation of the WebSocket protocol for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
-fi
-
-IUSE="qml"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtnetwork-${PV}
-	qml? ( ~dev-qt/qtdeclarative-${PV} )
-
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	qt_use_disable_mod qml quick src/src.pro
-
-	qt5-build_src_prepare
-}
-- 
cgit v1.2.3-65-gdbad