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 7A2E913838B for ; Wed, 24 Sep 2014 15:10:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 38AE6E08AE; Wed, 24 Sep 2014 15:10:14 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D199DE08AE for ; Wed, 24 Sep 2014 15:10:13 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AEAEB33F077 for ; Wed, 24 Sep 2014 15:10:12 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 40398620A for ; Wed, 24 Sep 2014 15:10:11 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1411571393.9c2f86b48a6f51fb14f3cfa3ba6e542fb180b426.kensington@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/designer/ X-VCS-Repository: proj/qt X-VCS-Files: dev-qt/designer/designer-5.3.9999.ebuild dev-qt/designer/designer-5.4.0_alpha.ebuild dev-qt/designer/designer-5.4.9999.ebuild dev-qt/designer/designer-5.9999.ebuild X-VCS-Directories: dev-qt/designer/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: 9c2f86b48a6f51fb14f3cfa3ba6e542fb180b426 X-VCS-Branch: master Date: Wed, 24 Sep 2014 15:10:11 +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: d4373718-401e-44ea-a5c4-26b88223c259 X-Archives-Hash: fdeacbd7d137b5e977fa361761e1e9c3 commit: 9c2f86b48a6f51fb14f3cfa3ba6e542fb180b426 Author: Michael Palimaka gentoo org> AuthorDate: Wed Sep 24 15:09:53 2014 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Wed Sep 24 15:09:53 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=9c2f86b4 [dev-qt/designer] Introduce declarative USE flag to avoid automagic dependency. Package-Manager: portage-2.2.10 --- dev-qt/designer/designer-5.3.9999.ebuild | 6 +++++- dev-qt/designer/designer-5.4.0_alpha.ebuild | 6 +++++- dev-qt/designer/designer-5.4.9999.ebuild | 6 +++++- dev-qt/designer/designer-5.9999.ebuild | 6 +++++- 4 files changed, 20 insertions(+), 4 deletions(-) diff --git a/dev-qt/designer/designer-5.3.9999.ebuild b/dev-qt/designer/designer-5.3.9999.ebuild index 02fbb0e..1355ae4 100644 --- a/dev-qt/designer/designer-5.3.9999.ebuild +++ b/dev-qt/designer/designer-5.3.9999.ebuild @@ -16,7 +16,7 @@ else KEYWORDS="~amd64 ~x86" fi -IUSE="webkit" +IUSE="declarative webkit" DEPEND=" >=dev-qt/qtcore-${PV}:5[debug=] @@ -25,6 +25,7 @@ DEPEND=" >=dev-qt/qtprintsupport-${PV}:5[debug=] >=dev-qt/qtwidgets-${PV}:5[debug=] >=dev-qt/qtxml-${PV}:5[debug=] + declarative? ( >=dev-qt/qtdeclarative-${PV}:5[debug=,widgets] ) webkit? ( >=dev-qt/qtwebkit-${PV}:5[debug=] ) " RDEPEND="${DEPEND}" @@ -34,6 +35,9 @@ QT5_TARGET_SUBDIRS=( ) src_prepare() { + qt_use_disable_mod declarative quickwidgets \ + src/designer/src/plugins/plugins.pro + qt_use_disable_mod webkit webkitwidgets \ src/designer/src/plugins/plugins.pro diff --git a/dev-qt/designer/designer-5.4.0_alpha.ebuild b/dev-qt/designer/designer-5.4.0_alpha.ebuild index 02fbb0e..1355ae4 100644 --- a/dev-qt/designer/designer-5.4.0_alpha.ebuild +++ b/dev-qt/designer/designer-5.4.0_alpha.ebuild @@ -16,7 +16,7 @@ else KEYWORDS="~amd64 ~x86" fi -IUSE="webkit" +IUSE="declarative webkit" DEPEND=" >=dev-qt/qtcore-${PV}:5[debug=] @@ -25,6 +25,7 @@ DEPEND=" >=dev-qt/qtprintsupport-${PV}:5[debug=] >=dev-qt/qtwidgets-${PV}:5[debug=] >=dev-qt/qtxml-${PV}:5[debug=] + declarative? ( >=dev-qt/qtdeclarative-${PV}:5[debug=,widgets] ) webkit? ( >=dev-qt/qtwebkit-${PV}:5[debug=] ) " RDEPEND="${DEPEND}" @@ -34,6 +35,9 @@ QT5_TARGET_SUBDIRS=( ) src_prepare() { + qt_use_disable_mod declarative quickwidgets \ + src/designer/src/plugins/plugins.pro + qt_use_disable_mod webkit webkitwidgets \ src/designer/src/plugins/plugins.pro diff --git a/dev-qt/designer/designer-5.4.9999.ebuild b/dev-qt/designer/designer-5.4.9999.ebuild index 02fbb0e..1355ae4 100644 --- a/dev-qt/designer/designer-5.4.9999.ebuild +++ b/dev-qt/designer/designer-5.4.9999.ebuild @@ -16,7 +16,7 @@ else KEYWORDS="~amd64 ~x86" fi -IUSE="webkit" +IUSE="declarative webkit" DEPEND=" >=dev-qt/qtcore-${PV}:5[debug=] @@ -25,6 +25,7 @@ DEPEND=" >=dev-qt/qtprintsupport-${PV}:5[debug=] >=dev-qt/qtwidgets-${PV}:5[debug=] >=dev-qt/qtxml-${PV}:5[debug=] + declarative? ( >=dev-qt/qtdeclarative-${PV}:5[debug=,widgets] ) webkit? ( >=dev-qt/qtwebkit-${PV}:5[debug=] ) " RDEPEND="${DEPEND}" @@ -34,6 +35,9 @@ QT5_TARGET_SUBDIRS=( ) src_prepare() { + qt_use_disable_mod declarative quickwidgets \ + src/designer/src/plugins/plugins.pro + qt_use_disable_mod webkit webkitwidgets \ src/designer/src/plugins/plugins.pro diff --git a/dev-qt/designer/designer-5.9999.ebuild b/dev-qt/designer/designer-5.9999.ebuild index 02fbb0e..1355ae4 100644 --- a/dev-qt/designer/designer-5.9999.ebuild +++ b/dev-qt/designer/designer-5.9999.ebuild @@ -16,7 +16,7 @@ else KEYWORDS="~amd64 ~x86" fi -IUSE="webkit" +IUSE="declarative webkit" DEPEND=" >=dev-qt/qtcore-${PV}:5[debug=] @@ -25,6 +25,7 @@ DEPEND=" >=dev-qt/qtprintsupport-${PV}:5[debug=] >=dev-qt/qtwidgets-${PV}:5[debug=] >=dev-qt/qtxml-${PV}:5[debug=] + declarative? ( >=dev-qt/qtdeclarative-${PV}:5[debug=,widgets] ) webkit? ( >=dev-qt/qtwebkit-${PV}:5[debug=] ) " RDEPEND="${DEPEND}" @@ -34,6 +35,9 @@ QT5_TARGET_SUBDIRS=( ) src_prepare() { + qt_use_disable_mod declarative quickwidgets \ + src/designer/src/plugins/plugins.pro + qt_use_disable_mod webkit webkitwidgets \ src/designer/src/plugins/plugins.pro