| 1 |
commit: 97788447844911542b77805ec0f8303cfddad1a0 |
| 2 |
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue May 3 17:42:01 2016 +0000 |
| 4 |
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue May 3 17:42:11 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=97788447 |
| 7 |
|
| 8 |
dev-qt/qtwebsockets: USE=ssl must be in sync with the same flag in qtnetwork |
| 9 |
|
| 10 |
Amends commit af3eca38517b6fce72eb01850b1791323f8a8e24. |
| 11 |
|
| 12 |
Gentoo-Bug: 581964 |
| 13 |
Package-Manager: portage-2.2.28 |
| 14 |
|
| 15 |
dev-qt/qtwebsockets/qtwebsockets-5.6.9999.ebuild | 7 +------ |
| 16 |
dev-qt/qtwebsockets/qtwebsockets-5.7.0_beta.ebuild | 7 +------ |
| 17 |
dev-qt/qtwebsockets/qtwebsockets-5.7.9999.ebuild | 7 +------ |
| 18 |
dev-qt/qtwebsockets/qtwebsockets-5.9999.ebuild | 7 +------ |
| 19 |
4 files changed, 4 insertions(+), 24 deletions(-) |
| 20 |
|
| 21 |
diff --git a/dev-qt/qtwebsockets/qtwebsockets-5.6.9999.ebuild b/dev-qt/qtwebsockets/qtwebsockets-5.6.9999.ebuild |
| 22 |
index 26a4d92..c62170c 100644 |
| 23 |
--- a/dev-qt/qtwebsockets/qtwebsockets-5.6.9999.ebuild |
| 24 |
+++ b/dev-qt/qtwebsockets/qtwebsockets-5.6.9999.ebuild |
| 25 |
@@ -15,7 +15,7 @@ IUSE="qml +ssl" |
| 26 |
|
| 27 |
DEPEND=" |
| 28 |
~dev-qt/qtcore-${PV} |
| 29 |
- ~dev-qt/qtnetwork-${PV}[ssl?] |
| 30 |
+ ~dev-qt/qtnetwork-${PV}[ssl=] |
| 31 |
qml? ( ~dev-qt/qtdeclarative-${PV} ) |
| 32 |
|
| 33 |
" |
| 34 |
@@ -24,10 +24,5 @@ RDEPEND="${DEPEND}" |
| 35 |
src_prepare() { |
| 36 |
qt_use_disable_mod qml quick src/src.pro |
| 37 |
|
| 38 |
- if ! use ssl; then |
| 39 |
- sed -i -e '/contains(QT_CONFIG.*ssl)/ c\false{' \ |
| 40 |
- src/websockets/websockets.pro || die |
| 41 |
- fi |
| 42 |
- |
| 43 |
qt5-build_src_prepare |
| 44 |
} |
| 45 |
|
| 46 |
diff --git a/dev-qt/qtwebsockets/qtwebsockets-5.7.0_beta.ebuild b/dev-qt/qtwebsockets/qtwebsockets-5.7.0_beta.ebuild |
| 47 |
index 26a4d92..c62170c 100644 |
| 48 |
--- a/dev-qt/qtwebsockets/qtwebsockets-5.7.0_beta.ebuild |
| 49 |
+++ b/dev-qt/qtwebsockets/qtwebsockets-5.7.0_beta.ebuild |
| 50 |
@@ -15,7 +15,7 @@ IUSE="qml +ssl" |
| 51 |
|
| 52 |
DEPEND=" |
| 53 |
~dev-qt/qtcore-${PV} |
| 54 |
- ~dev-qt/qtnetwork-${PV}[ssl?] |
| 55 |
+ ~dev-qt/qtnetwork-${PV}[ssl=] |
| 56 |
qml? ( ~dev-qt/qtdeclarative-${PV} ) |
| 57 |
|
| 58 |
" |
| 59 |
@@ -24,10 +24,5 @@ RDEPEND="${DEPEND}" |
| 60 |
src_prepare() { |
| 61 |
qt_use_disable_mod qml quick src/src.pro |
| 62 |
|
| 63 |
- if ! use ssl; then |
| 64 |
- sed -i -e '/contains(QT_CONFIG.*ssl)/ c\false{' \ |
| 65 |
- src/websockets/websockets.pro || die |
| 66 |
- fi |
| 67 |
- |
| 68 |
qt5-build_src_prepare |
| 69 |
} |
| 70 |
|
| 71 |
diff --git a/dev-qt/qtwebsockets/qtwebsockets-5.7.9999.ebuild b/dev-qt/qtwebsockets/qtwebsockets-5.7.9999.ebuild |
| 72 |
index 26a4d92..c62170c 100644 |
| 73 |
--- a/dev-qt/qtwebsockets/qtwebsockets-5.7.9999.ebuild |
| 74 |
+++ b/dev-qt/qtwebsockets/qtwebsockets-5.7.9999.ebuild |
| 75 |
@@ -15,7 +15,7 @@ IUSE="qml +ssl" |
| 76 |
|
| 77 |
DEPEND=" |
| 78 |
~dev-qt/qtcore-${PV} |
| 79 |
- ~dev-qt/qtnetwork-${PV}[ssl?] |
| 80 |
+ ~dev-qt/qtnetwork-${PV}[ssl=] |
| 81 |
qml? ( ~dev-qt/qtdeclarative-${PV} ) |
| 82 |
|
| 83 |
" |
| 84 |
@@ -24,10 +24,5 @@ RDEPEND="${DEPEND}" |
| 85 |
src_prepare() { |
| 86 |
qt_use_disable_mod qml quick src/src.pro |
| 87 |
|
| 88 |
- if ! use ssl; then |
| 89 |
- sed -i -e '/contains(QT_CONFIG.*ssl)/ c\false{' \ |
| 90 |
- src/websockets/websockets.pro || die |
| 91 |
- fi |
| 92 |
- |
| 93 |
qt5-build_src_prepare |
| 94 |
} |
| 95 |
|
| 96 |
diff --git a/dev-qt/qtwebsockets/qtwebsockets-5.9999.ebuild b/dev-qt/qtwebsockets/qtwebsockets-5.9999.ebuild |
| 97 |
index 26a4d92..c62170c 100644 |
| 98 |
--- a/dev-qt/qtwebsockets/qtwebsockets-5.9999.ebuild |
| 99 |
+++ b/dev-qt/qtwebsockets/qtwebsockets-5.9999.ebuild |
| 100 |
@@ -15,7 +15,7 @@ IUSE="qml +ssl" |
| 101 |
|
| 102 |
DEPEND=" |
| 103 |
~dev-qt/qtcore-${PV} |
| 104 |
- ~dev-qt/qtnetwork-${PV}[ssl?] |
| 105 |
+ ~dev-qt/qtnetwork-${PV}[ssl=] |
| 106 |
qml? ( ~dev-qt/qtdeclarative-${PV} ) |
| 107 |
|
| 108 |
" |
| 109 |
@@ -24,10 +24,5 @@ RDEPEND="${DEPEND}" |
| 110 |
src_prepare() { |
| 111 |
qt_use_disable_mod qml quick src/src.pro |
| 112 |
|
| 113 |
- if ! use ssl; then |
| 114 |
- sed -i -e '/contains(QT_CONFIG.*ssl)/ c\false{' \ |
| 115 |
- src/websockets/websockets.pro || die |
| 116 |
- fi |
| 117 |
- |
| 118 |
qt5-build_src_prepare |
| 119 |
} |
Archives