[gentoo-commits] proj/qt:master commit in: dev-qt/qtdeclarative/

[Davide Pesavento]

commit:     d653f9735313e278533bee00a5b6ce14801c99b8
Author:     Davide Pesavento <davidepesa <AT> gmail <DOT> com>
AuthorDate: Tue Oct  1 22:46:21 2013 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> 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 @@
 		<flag name="c++11">Build Qt using the C++11 standard</flag>
 		<flag name="exceptions">Add support for exceptions - like catching them
 			inside the event loop (recommended by Nokia)</flag>
-		<flag name="localstorage">Build the QtQuick.LocalStorage module (requires QtSql)</flag>
+		<flag name="localstorage">Build the LocalStorage import for
+			QtQuick (requires QtSql)</flag>
 		<flag name="qt3support">Enable the Qt3Support libraries for Qt4. Note that
 			this does not mean you can compile pure Qt3 programs with Qt4.</flag>
 		<flag name="webkit">Build the WebView QML component</flag>
+		<flag name="xml">Build the XmlListModel import for QtQuick
+			(requires QtXmlPatterns)</flag>
 	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt-project.org/</bugs-to>

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
 }