diff options
| author |   Davide Pesavento <pesa@gentoo.org> | 2016-05-03 19:43:13 +0200 |
|---|---|---|
| committer | Davide Pesavento <pesa@gentoo.org> | 2016-05-03 19:44:51 +0200 |
| commit | d7ad55281220025b3373707ef4f3d19a1a764d8e (patch) | |
| tree | 9b26c96c654210ddb003a170d06fb1d3f31749b8 | |
| parent | dev-ml/ppx_enumerate: fix build with ocaml 4.03 (diff) | |
| download | gentoo-d7ad5528.tar.gz gentoo-d7ad5528.tar.bz2 gentoo-d7ad5528.zip | |
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
| -rw-r--r-- | dev-qt/qtwebsockets/qtwebsockets-5.5.1-r3.ebuild (renamed from dev-qt/qtwebsockets/qtwebsockets-5.5.1-r2.ebuild) | 7 | ||||
| -rw-r--r-- | dev-qt/qtwebsockets/qtwebsockets-5.6.0-r2.ebuild (renamed from dev-qt/qtwebsockets/qtwebsockets-5.6.0-r1.ebuild) | 7 |
2 files changed, 2 insertions, 12 deletions
diff --git a/dev-qt/qtwebsockets/qtwebsockets-5.5.1-r2.ebuild b/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 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 } |