dev-qt/qtwebsockets: USE=ssl must be in sync with the same flag in qt…

…network Amends commit af3eca3. Gentoo-Bug: 581964 Package-Manager: portage-2.2.28
johu · May 3, 2016 · d7ad552 · d7ad552
1 parent 22b4d5b
commit d7ad552
Show file tree

Hide file tree

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