From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 764E8138216 for ; Mon, 2 May 2016 15:10:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1813DE0802; Mon, 2 May 2016 15:10:18 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8E7ABE0802 for ; Mon, 2 May 2016 15:10:17 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2DACC33BE44 for ; Mon, 2 May 2016 15:10:16 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4566715F for ; Mon, 2 May 2016 15:10:10 +0000 (UTC) From: "Davide Pesavento" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Davide Pesavento" Message-ID: <1462201804.af3eca38517b6fce72eb01850b1791323f8a8e24.pesa@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebsockets/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-qt/qtwebsockets/qtwebsockets-5.5.1-r1.ebuild dev-qt/qtwebsockets/qtwebsockets-5.5.1-r2.ebuild dev-qt/qtwebsockets/qtwebsockets-5.6.0-r1.ebuild dev-qt/qtwebsockets/qtwebsockets-5.6.0.ebuild X-VCS-Directories: dev-qt/qtwebsockets/ X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: af3eca38517b6fce72eb01850b1791323f8a8e24 X-VCS-Branch: master Date: Mon, 2 May 2016 15:10:10 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 322a1878-866f-43e6-95a4-6fa01bc089d4 X-Archives-Hash: c2a9f350c2f65ec4694b80e55fda3d0e commit: af3eca38517b6fce72eb01850b1791323f8a8e24 Author: Davide Pesavento gentoo org> AuthorDate: Mon May 2 15:09:40 2016 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Mon May 2 15:10:04 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af3eca38 dev-qt/qtwebsockets: fix automagic dependency on qtnetwork[ssl] Package-Manager: portage-2.2.28 ...ebsockets-5.5.1-r1.ebuild => qtwebsockets-5.5.1-r2.ebuild} | 11 ++++++++--- ...qtwebsockets-5.6.0.ebuild => qtwebsockets-5.6.0-r1.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 similarity index 68% rename from dev-qt/qtwebsockets/qtwebsockets-5.5.1-r1.ebuild rename to dev-qt/qtwebsockets/qtwebsockets-5.5.1-r2.ebuild index 5dc250a..e9a9241 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 similarity index 74% rename from dev-qt/qtwebsockets/qtwebsockets-5.6.0.ebuild rename to dev-qt/qtwebsockets/qtwebsockets-5.6.0-r1.ebuild index 75687e8..26a4d92 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 }