From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (unknown [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id D47501381FA for ; Thu, 15 May 2014 18:27:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8695CE0B6C; Thu, 15 May 2014 18:27:20 +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 D4FF5E0B6B for ; Thu, 15 May 2014 18:27:19 +0000 (UTC) Received: from spoonbill.gentoo.org (unknown [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BDA2033FE2B for ; Thu, 15 May 2014 18:27:18 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 50D571818D for ; Thu, 15 May 2014 18:27:17 +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: <1400178300.85d63e66827e8b2e8565304954979a92c6dfb848.kensington@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtquickcontrols/ X-VCS-Repository: proj/qt X-VCS-Files: dev-qt/qtquickcontrols/metadata.xml dev-qt/qtquickcontrols/qtquickcontrols-5.3.0_rc.ebuild dev-qt/qtquickcontrols/qtquickcontrols-5.3.9999.ebuild dev-qt/qtquickcontrols/qtquickcontrols-5.9999.ebuild X-VCS-Directories: dev-qt/qtquickcontrols/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: 85d63e66827e8b2e8565304954979a92c6dfb848 X-VCS-Branch: master Date: Thu, 15 May 2014 18:27:17 +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: 312824f0-970f-42af-bc14-1cf39da67f28 X-Archives-Hash: 59302b863c1b7b0919e949d0cd132d6e commit: 85d63e66827e8b2e8565304954979a92c6dfb848 Author: Michael Palimaka gentoo org> AuthorDate: Thu May 15 18:25:00 2014 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Thu May 15 18:25:00 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=85d63e66 [dev-qt/qtquickcontrols] Handle widgets automagic. Package-Manager: portage-2.2.8-r1 --- dev-qt/qtquickcontrols/metadata.xml | 3 +++ dev-qt/qtquickcontrols/qtquickcontrols-5.3.0_rc.ebuild | 16 +++++++++++++--- dev-qt/qtquickcontrols/qtquickcontrols-5.3.9999.ebuild | 16 +++++++++++++--- dev-qt/qtquickcontrols/qtquickcontrols-5.9999.ebuild | 16 +++++++++++++--- 4 files changed, 42 insertions(+), 9 deletions(-) diff --git a/dev-qt/qtquickcontrols/metadata.xml b/dev-qt/qtquickcontrols/metadata.xml index 9d5bff1..a373189 100644 --- a/dev-qt/qtquickcontrols/metadata.xml +++ b/dev-qt/qtquickcontrols/metadata.xml @@ -2,6 +2,9 @@ qt + + Enable QtWidgets support + https://bugreports.qt-project.org/ http://qt-project.org/doc/ diff --git a/dev-qt/qtquickcontrols/qtquickcontrols-5.3.0_rc.ebuild b/dev-qt/qtquickcontrols/qtquickcontrols-5.3.0_rc.ebuild index b55b3d5..0c00bd7 100644 --- a/dev-qt/qtquickcontrols/qtquickcontrols-5.3.0_rc.ebuild +++ b/dev-qt/qtquickcontrols/qtquickcontrols-5.3.0_rc.ebuild @@ -14,13 +14,23 @@ else KEYWORDS="~amd64" fi -# FIXME: widgets is automagic in src/private/private.pri - -IUSE="" +IUSE="widgets" DEPEND=" >=dev-qt/qtcore-${PV}:5[debug=] >=dev-qt/qtdeclarative-${PV}:5[debug=] >=dev-qt/qtgui-${PV}:5[debug=] + widgets? ( >=dev-qt/qtwidgets-${PV}:5[debug=] ) " RDEPEND="${DEPEND}" + +src_prepare() { + qt_use_disable_mod widgets widgets \ + src/src.pro \ + src/controls/Private/private.pri \ + tests/auto/activeFocusOnTab/activeFocusOnTab.pro \ + tests/auto/controls/controls.pro \ + tests/auto/testplugin/testplugin.pro + + qt5-build_src_prepare +} diff --git a/dev-qt/qtquickcontrols/qtquickcontrols-5.3.9999.ebuild b/dev-qt/qtquickcontrols/qtquickcontrols-5.3.9999.ebuild index b55b3d5..0c00bd7 100644 --- a/dev-qt/qtquickcontrols/qtquickcontrols-5.3.9999.ebuild +++ b/dev-qt/qtquickcontrols/qtquickcontrols-5.3.9999.ebuild @@ -14,13 +14,23 @@ else KEYWORDS="~amd64" fi -# FIXME: widgets is automagic in src/private/private.pri - -IUSE="" +IUSE="widgets" DEPEND=" >=dev-qt/qtcore-${PV}:5[debug=] >=dev-qt/qtdeclarative-${PV}:5[debug=] >=dev-qt/qtgui-${PV}:5[debug=] + widgets? ( >=dev-qt/qtwidgets-${PV}:5[debug=] ) " RDEPEND="${DEPEND}" + +src_prepare() { + qt_use_disable_mod widgets widgets \ + src/src.pro \ + src/controls/Private/private.pri \ + tests/auto/activeFocusOnTab/activeFocusOnTab.pro \ + tests/auto/controls/controls.pro \ + tests/auto/testplugin/testplugin.pro + + qt5-build_src_prepare +} diff --git a/dev-qt/qtquickcontrols/qtquickcontrols-5.9999.ebuild b/dev-qt/qtquickcontrols/qtquickcontrols-5.9999.ebuild index b55b3d5..0c00bd7 100644 --- a/dev-qt/qtquickcontrols/qtquickcontrols-5.9999.ebuild +++ b/dev-qt/qtquickcontrols/qtquickcontrols-5.9999.ebuild @@ -14,13 +14,23 @@ else KEYWORDS="~amd64" fi -# FIXME: widgets is automagic in src/private/private.pri - -IUSE="" +IUSE="widgets" DEPEND=" >=dev-qt/qtcore-${PV}:5[debug=] >=dev-qt/qtdeclarative-${PV}:5[debug=] >=dev-qt/qtgui-${PV}:5[debug=] + widgets? ( >=dev-qt/qtwidgets-${PV}:5[debug=] ) " RDEPEND="${DEPEND}" + +src_prepare() { + qt_use_disable_mod widgets widgets \ + src/src.pro \ + src/controls/Private/private.pri \ + tests/auto/activeFocusOnTab/activeFocusOnTab.pro \ + tests/auto/controls/controls.pro \ + tests/auto/testplugin/testplugin.pro + + qt5-build_src_prepare +}