diff options
| author |   Davide Pesavento <pesa@gentoo.org> | 2016-05-02 17:09:40 +0200 |
|---|---|---|
| committer | Davide Pesavento <pesa@gentoo.org> | 2016-05-02 17:10:04 +0200 |
| commit | af3eca38517b6fce72eb01850b1791323f8a8e24 (patch) | |
| tree | 5845088c727098ac7d8e0fe2fb5ff0776f5c82e0 | |
| parent | dev-lang/rakudo: Bump (diff) | |
| download | gentoo-af3eca38517b6fce72eb01850b1791323f8a8e24.tar.gz gentoo-af3eca38517b6fce72eb01850b1791323f8a8e24.tar.bz2 gentoo-af3eca38517b6fce72eb01850b1791323f8a8e24.zip | |
dev-qt/qtwebsockets: fix automagic dependency on qtnetwork[ssl]
Package-Manager: portage-2.2.28
| -rw-r--r-- | dev-qt/qtwebsockets/qtwebsockets-5.5.1-r2.ebuild (renamed from dev-qt/qtwebsockets/qtwebsockets-5.5.1-r1.ebuild) | 11 | ||||
| -rw-r--r-- | dev-qt/qtwebsockets/qtwebsockets-5.6.0-r1.ebuild (renamed from dev-qt/qtwebsockets/qtwebsockets-5.6.0.ebuild) | 9 |
2 files changed, 15 insertions, 5 deletions
diff --git a/dev-qt/qtwebsockets/qtwebsockets-5.5.1-r1.ebuild b/dev-qt/qtwebsockets/qtwebsockets-5.5.1-r2.ebuild index 5dc250ac5df9..e9a9241ed257 100644 --- a/dev-qt/qtwebsockets/qtwebsockets-5.5.1-r1.ebuild +++ b/dev-qt/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/dev-qt/qtwebsockets/qtwebsockets-5.6.0.ebuild b/dev-qt/qtwebsockets/qtwebsockets-5.6.0-r1.ebuild index 75687e8f8a0a..26a4d9278f12 100644 --- a/dev-qt/qtwebsockets/qtwebsockets-5.6.0.ebuild +++ b/dev-qt/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 } |