Import Qt5 from qt overlay.

(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key 0xDADED6B2671CB57D!)

3 files changed, 60 insertions, 4 deletions

diff --git a/dev-qt/qtdeclarative/ChangeLog b/dev-qt/qtdeclarative/ChangeLog
index 747d08909d9c..ef09d15c3aa6 100644
--- a/dev-qt/qtdeclarative/ChangeLog
+++ b/dev-qt/qtdeclarative/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-qt/qtdeclarative
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdeclarative/ChangeLog,v 1.15 2014/04/23 10:29:44 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdeclarative/ChangeLog,v 1.16 2014/09/11 01:44:35 pesa Exp $
+
+*qtdeclarative-5.3.1-r3 (11 Sep 2014)
+
+  11 Sep 2014; Davide Pesavento <pesa@gentoo.org>
+  +qtdeclarative-5.3.1-r3.ebuild, metadata.xml:
+  Import Qt5 from qt overlay.
 
   23 Apr 2014; Mikle Kolyada <zlogene@gentoo.org> -qtdeclarative-5.2.1.ebuild:
   Drop qt5 ebuild.
diff --git a/dev-qt/qtdeclarative/metadata.xml b/dev-qt/qtdeclarative/metadata.xml
index b5054806bc39..9bfb6a424225 100644
--- a/dev-qt/qtdeclarative/metadata.xml
+++ b/dev-qt/qtdeclarative/metadata.xml
@@ -5,12 +5,13 @@
 	<use>
 		<flag name="exceptions">Add support for exceptions - like catching them
 			inside the event loop (recommended by upstream)</flag>
-                <flag name="localstorage">Build the LocalStorage import for
-                        QtQuick (requires QtSql)</flag>
+		<flag name="gles2">Use OpenGL ES instead of desktop OpenGL</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="widgets">Enable QtWidgets support</flag>
 		<flag name="webkit">Build the WebView QML component</flag>
+		<flag name="widgets">Enable QtWidgets support</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.3.1-r3.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.3.1-r3.ebuild
new file mode 100644
index 000000000000..bcb585bc3857
--- /dev/null
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.3.1-r3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdeclarative/qtdeclarative-5.3.1-r3.ebuild,v 1.1 2014/09/11 01:44:35 pesa Exp $
+
+EAPI=5
+
+inherit qt5-build
+
+DESCRIPTION="The QML and Quick modules for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == live ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~x86"
+fi
+
+IUSE="gles2 localstorage +widgets xml"
+
+# qtgui[gles2=] is needed because of bug 504322
+DEPEND="
+	>=dev-qt/qtcore-${PV}:5[debug=]
+	>=dev-qt/qtgui-${PV}:5[debug=,gles2=,opengl]
+	>=dev-qt/qtnetwork-${PV}:5[debug=]
+	>=dev-qt/qttest-${PV}:5[debug=]
+	localstorage? ( >=dev-qt/qtsql-${PV}:5[debug=] )
+	widgets? ( >=dev-qt/qtwidgets-${PV}:5[debug=] )
+	xml? ( >=dev-qt/qtxmlpatterns-${PV}:5[debug=] )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	use localstorage || sed -i -e '/localstorage/d' \
+		src/imports/imports.pro || die
+
+	use widgets || sed -i -e 's/contains(QT_CONFIG, no-widgets)/true/' \
+		src/qmltest/qmltest.pro || die
+
+	qt_use_disable_mod widgets widgets \
+		src/src.pro \
+		tools/tools.pro \
+		tools/qmlscene/qmlscene.pro \
+		tools/qml/qml.pro
+
+	qt_use_disable_mod xml xmlpatterns \
+		src/imports/imports.pro \
+		tests/auto/quick/quick.pro
+
+	qt5-build_src_prepare
+}