public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Davide Pesavento" <pesa@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebsockets/
Date: Tue,  3 May 2016 17:42:30 +0000 (UTC)	[thread overview]
Message-ID: <1462297331.97788447844911542b77805ec0f8303cfddad1a0.pesa@gentoo> (raw)

commit:     97788447844911542b77805ec0f8303cfddad1a0
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Tue May  3 17:42:01 2016 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue May  3 17:42:11 2016 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=97788447

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

 dev-qt/qtwebsockets/qtwebsockets-5.6.9999.ebuild   | 7 +------
 dev-qt/qtwebsockets/qtwebsockets-5.7.0_beta.ebuild | 7 +------
 dev-qt/qtwebsockets/qtwebsockets-5.7.9999.ebuild   | 7 +------
 dev-qt/qtwebsockets/qtwebsockets-5.9999.ebuild     | 7 +------
 4 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/dev-qt/qtwebsockets/qtwebsockets-5.6.9999.ebuild b/dev-qt/qtwebsockets/qtwebsockets-5.6.9999.ebuild
index 26a4d92..c62170c 100644
--- a/dev-qt/qtwebsockets/qtwebsockets-5.6.9999.ebuild
+++ b/dev-qt/qtwebsockets/qtwebsockets-5.6.9999.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.7.0_beta.ebuild b/dev-qt/qtwebsockets/qtwebsockets-5.7.0_beta.ebuild
index 26a4d92..c62170c 100644
--- a/dev-qt/qtwebsockets/qtwebsockets-5.7.0_beta.ebuild
+++ b/dev-qt/qtwebsockets/qtwebsockets-5.7.0_beta.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.7.9999.ebuild b/dev-qt/qtwebsockets/qtwebsockets-5.7.9999.ebuild
index 26a4d92..c62170c 100644
--- a/dev-qt/qtwebsockets/qtwebsockets-5.7.9999.ebuild
+++ b/dev-qt/qtwebsockets/qtwebsockets-5.7.9999.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.9999.ebuild b/dev-qt/qtwebsockets/qtwebsockets-5.9999.ebuild
index 26a4d92..c62170c 100644
--- a/dev-qt/qtwebsockets/qtwebsockets-5.9999.ebuild
+++ b/dev-qt/qtwebsockets/qtwebsockets-5.9999.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
 }


             reply	other threads:[~2016-05-03 17:42 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-05-03 17:42 Davide Pesavento [this message]
  -- strict thread matches above, loose matches on Subject: below --
2023-12-30 14:03 [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebsockets/ Andreas Sturmlechner
2023-06-13 11:40 Andreas Sturmlechner
2022-11-05 16:39 Andreas Sturmlechner
2022-09-24 21:24 Andreas Sturmlechner
2022-09-24 17:03 Andreas Sturmlechner
2022-06-20 18:03 Jimi Huotari
2022-05-14 21:15 Andreas Sturmlechner
2022-04-12 12:43 Jimi Huotari
2022-03-04  9:51 Andreas Sturmlechner
2021-08-20 12:36 Andreas Sturmlechner
2016-05-02 15:12 Davide Pesavento
2014-06-26  0:20 Davide Pesavento
2014-05-15 17:24 Michael Palimaka

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1462297331.97788447844911542b77805ec0f8303cfddad1a0.pesa@gentoo \
    --to=pesa@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox