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 C48CB1381F3 for ; Tue, 1 Oct 2013 22:46:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A9DB6E09A4; Tue, 1 Oct 2013 22:46:39 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 34D55E09A4 for ; Tue, 1 Oct 2013 22:46:39 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C471633ED24 for ; Tue, 1 Oct 2013 22:46:37 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 6FAC2E5308 for ; Tue, 1 Oct 2013 22:46:35 +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: <1380667581.d653f9735313e278533bee00a5b6ce14801c99b8.pesa@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtdeclarative/ X-VCS-Repository: proj/qt X-VCS-Files: dev-qt/qtdeclarative/metadata.xml dev-qt/qtdeclarative/qtdeclarative-5.2.9999.ebuild dev-qt/qtdeclarative/qtdeclarative-5.9999.ebuild X-VCS-Directories: dev-qt/qtdeclarative/ X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: d653f9735313e278533bee00a5b6ce14801c99b8 X-VCS-Branch: master Date: Tue, 1 Oct 2013 22:46:35 +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: 2e7793bf-467a-4d41-91b8-687e56186b25 X-Archives-Hash: c09c781aaea355093e4ff61616bf757a commit: d653f9735313e278533bee00a5b6ce14801c99b8 Author: Davide Pesavento gmail com> AuthorDate: Tue Oct 1 22:46:21 2013 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Tue Oct 1 22:46:21 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=d653f973 [dev-qt/qtdeclarative:5] Add USE=xml to enable XmlListModel (bug 483714). Package-Manager: portage-2.2.7 --- dev-qt/qtdeclarative/metadata.xml | 5 ++++- dev-qt/qtdeclarative/qtdeclarative-5.2.9999.ebuild | 13 +++++++------ dev-qt/qtdeclarative/qtdeclarative-5.9999.ebuild | 13 +++++++------ 3 files changed, 18 insertions(+), 13 deletions(-) diff --git a/dev-qt/qtdeclarative/metadata.xml b/dev-qt/qtdeclarative/metadata.xml index 98bfa1c..cca1ff5 100644 --- a/dev-qt/qtdeclarative/metadata.xml +++ b/dev-qt/qtdeclarative/metadata.xml @@ -7,10 +7,13 @@ Build Qt using the C++11 standard Add support for exceptions - like catching them inside the event loop (recommended by Nokia) - Build the QtQuick.LocalStorage module (requires QtSql) + Build the LocalStorage import for + QtQuick (requires QtSql) Enable the Qt3Support libraries for Qt4. Note that this does not mean you can compile pure Qt3 programs with Qt4. Build the WebView QML component + Build the XmlListModel import for QtQuick + (requires QtXmlPatterns) https://bugreports.qt-project.org/ diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.2.9999.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.2.9999.ebuild index c374c6c..815a2f4 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5.2.9999.ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5.2.9999.ebuild @@ -14,10 +14,7 @@ else KEYWORDS="~amd64" fi -IUSE="localstorage" - -# TODO: easingcurveeditor|qmlscene? ( qt-widgets ) -# TODO: xml? ( qt-xmlpatterns ) +IUSE="+localstorage +xml" DEPEND=" >=dev-qt/qtcore-${PV}:5[debug=] @@ -26,12 +23,16 @@ DEPEND=" >=dev-qt/qttest-${PV}:5[debug=] >=dev-qt/qtwidgets-${PV}:5[debug=] localstorage? ( >=dev-qt/qtsql-${PV}:5[debug=] ) + xml? ( >=dev-qt/qtxmlpatterns-${PV}:5[debug=] ) " RDEPEND="${DEPEND}" src_prepare() { - qt5-build_src_prepare - use localstorage || sed -i -e '/localstorage/d' \ src/imports/imports.pro || die + + use xml || sed -i -e '/xmllistmodel/d' \ + src/imports/imports.pro || die + + qt5-build_src_prepare } diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.9999.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.9999.ebuild index c374c6c..815a2f4 100644 --- a/dev-qt/qtdeclarative/qtdeclarative-5.9999.ebuild +++ b/dev-qt/qtdeclarative/qtdeclarative-5.9999.ebuild @@ -14,10 +14,7 @@ else KEYWORDS="~amd64" fi -IUSE="localstorage" - -# TODO: easingcurveeditor|qmlscene? ( qt-widgets ) -# TODO: xml? ( qt-xmlpatterns ) +IUSE="+localstorage +xml" DEPEND=" >=dev-qt/qtcore-${PV}:5[debug=] @@ -26,12 +23,16 @@ DEPEND=" >=dev-qt/qttest-${PV}:5[debug=] >=dev-qt/qtwidgets-${PV}:5[debug=] localstorage? ( >=dev-qt/qtsql-${PV}:5[debug=] ) + xml? ( >=dev-qt/qtxmlpatterns-${PV}:5[debug=] ) " RDEPEND="${DEPEND}" src_prepare() { - qt5-build_src_prepare - use localstorage || sed -i -e '/localstorage/d' \ src/imports/imports.pro || die + + use xml || sed -i -e '/xmllistmodel/d' \ + src/imports/imports.pro || die + + qt5-build_src_prepare }