Import qt5 from qt overlay

Package-Manager: portage-2.2.10/cvs/Linux x86_64

4 files changed, 59 insertions, 23 deletions

diff --git a/dev-qt/qtdeclarative/ChangeLog b/dev-qt/qtdeclarative/ChangeLog
index 04f4e22c87dc..5c8dd40318d2 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.13 2014/01/26 17:54:24 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdeclarative/ChangeLog,v 1.14 2014/04/23 07:06:04 patrick Exp $
+
+*qtdeclarative-5.2.1 (23 Apr 2014)
+
+  23 Apr 2014; Patrick Lauer <patrick@gentoo.org> +qtdeclarative-5.2.1.ebuild,
+  metadata.xml:
+  Import qt5 from qt overlay
 
   26 Jan 2014; Davide Pesavento <pesa@gentoo.org> -qtdeclarative-4.8.4.ebuild,
   metadata.xml:
diff --git a/dev-qt/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest
index cc4a7e1f5587..c45bee0be37c 100644
--- a/dev-qt/qtdeclarative/Manifest
+++ b/dev-qt/qtdeclarative/Manifest
@@ -1,24 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357
+DIST qtdeclarative-opensource-src-5.2.1.tar.xz 17566720 SHA256 7e32b8d6e1d64ca4bdfa92d15f9b4217a1b24239ef40e8826eeccbe918866690 SHA512 ca7bf1b66516158267216c3a3e68abf9e1b063e3eb397b92fa48aecc1c4031397ad22066a4e91c7d0c32ef3ee309d5c3ac77dacdf9a10eca1c1cbd3bf819db42 WHIRLPOOL bd47285311ba96edbd662d3a720481f8d4d6cbda078a22fdaa09e9db12a56923c7daea63f2eeb699183117f470593da7e1640b7aa1065b3034177928dd9aa328
 EBUILD qtdeclarative-4.8.5.ebuild 1982 SHA256 ef04c159545997c13d866af405727d598073d07dd51a0be315b1d47343f5cc42 SHA512 f3235d4cef1ffc732be9034e12da9ce3217ba8c4532336a0d116bba9902d645c4c5ef93fde1ea94724ea50ab3e5431cb5e7fc072400e7dbcf972935f4ebe6f3f WHIRLPOOL b4fc1afe86e01206ce909154d55d5cc50f90d48fae6c96b2d501c8b589994e88a5e3f8600c31cca541c21e689e8441208063a5188bb36d392e8f5e8888947ea2
-MISC ChangeLog 9941 SHA256 44f3772c3da427955368eeccfc3cbdc27820ea2675258b308192a443743fd51e SHA512 2b545549547010cd7b85488a87e241c3a8906c7ebf63ea5749aee5201a7f6ddd0bc8cbfb1783c62e9a5f75a61e675e3e049e39a2b92e0184b01ce99e5246ac27 WHIRLPOOL 86ab7cbe19e56605137fc98e704eb620f977013bdb6cca6554803c89a5a324fab5a59498baaa126c3106d7ddcfb239f1d2ef54b70ef9b4bc0c3a921d06ab7949
-MISC metadata.xml 635 SHA256 b79885bca4903aad3f9f3b1bdc5abbf018d69a1b276676f80079b5c2b6e72232 SHA512 8a3629eb0683d8088fcc4e4f94eaba48ba664f4be326e16fabf2d37105fa89cabfea5cd1d1093df44ae52cdbceba0622a5c5f24acbce8dcf991afe42110c0223 WHIRLPOOL 6f71e91d4710da81d6d6e02515efde6291877e5e8fe20b4ae35d9f7673f5b7ae4fdf13b4150fabc7925f50b959457ba215503aa24ffdae013e0447e995f28913
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iQIcBAEBCAAGBQJS5UvRAAoJENXLsxwXqFxyUZcP/A7DYt7lYis6HAO2m5qihFRl
-dNw6QO9zfsMOA4kKuHtvR1ERSYdqLuuFe8+MxhgvfvPCX3VdB2UckpY+/I+6DTUo
-uCT1saCVVTkl7ax0+KaJIKi9pSBJDAIpllxSk9zyW6pWO2UgFOPS9Djdxel57pg2
-eJxdc338Xfrq6/MK4WWLQxCiJIKPjXjAOwNsu+xKR7geFdCgJ65Z0+QRt9MJEa+h
-sRc09n3uOkFt9ePdAAIkPDU7x2gy86ScFkVg0CehuSQMfHj6Ny8VVODmdmn/WVUa
-tqMhmsWXDCGR4i5qJE6gmhMw4Ex1FAU9CeiVcqjTZF2/r2QRa+Vpt2dJrWPW/uLy
-1Nwg26021ys8Tju5xjJB3SSFY81GHiwJFUpcu2CZD1sWxfzsJMQyYzCUR0lJMJyX
-yxY8IRcnlNiBdMx9rSWTlrXo1krKQ5tXQ9OIV9vled5Qu5ehQTQ1K8dzRUQVTLFy
-Ual+klocw87JQSoKzhMqiwp96NVrJxao1O3vuUDw1pWICD7/sT4JCFfq4weWtj8Z
-ElmoDtEnJIfyZY2uNm4dCV1fzhEX7YKeiwq2Iy3tTgHcReWBld8LLHev8cHBfwfF
-eFLysgHHHUb3VjZIQBrVLpfyJJAV/HPBD7OZ1VyreSLCzJEr1Ph3+nyrNEcf1gTP
-uUDcLlYb3DOu5xEN3XH8
-=SyBC
------END PGP SIGNATURE-----
+EBUILD qtdeclarative-5.2.1.ebuild 1145 SHA256 bc3ede8d23cd4ada1934c57cd88a47347cf1907bcd020773ecfcb2f92f8818d6 SHA512 c21f4c7ed9c7a5245917edf97ca4fa03b266d3a2513982c2ef18e12200b7105b6acc46a3186dfa941577e08039dce14542567912b2ac545115bb4028710a2491 WHIRLPOOL e32395e4f67150e6a5254b15ae1cd96648755929b4e29fa1e019b9f763bf614e0a8045f9613e52385107c4f5bd6248ec5d8ae45b44c118c76f55184ab8a19d58
+MISC ChangeLog 10105 SHA256 34b7c6e947ecb270150d9883b2147168cb4ef935ddace119543a9ae302f3dd46 SHA512 566ea4c858194ad176bbac993f6499ab0274683911ad0c6b97e9fcb4a4da0d5d8e4eda21227612c8e2d5f4b4ccf76791ad43c8f3d10245743423daa8a2f90f90 WHIRLPOOL bed9370fd5af7a1657da3fafa53cba31029d2c24b7405d2b7a90e20041ce412dad2952ed5f68da22c857e1d282c62af09c6ec0750c84e8e4a02ef028cffd59e6
+MISC metadata.xml 822 SHA256 6000284afe112e5357b00242ae7d68577b8512aa701a813b7d5fe37388425a59 SHA512 dd7ff6dcb9225568ab98170bb6757c625b838059f8433987b81dc90c7af7f8d619681a81f78d59c5cec2629fdb0fbabd54037c5dc7e4f3b0beaeb531ca096fb7 WHIRLPOOL 66f9a021b900d648837404e42d271784451ea4845d7007896a2c093b014852b7f61baccf17e908b8bc4039ba773e8780830c0e51469ee53c34141ddb423ce895
diff --git a/dev-qt/qtdeclarative/metadata.xml b/dev-qt/qtdeclarative/metadata.xml
index 082a7f8f093f..b5054806bc39 100644
--- a/dev-qt/qtdeclarative/metadata.xml
+++ b/dev-qt/qtdeclarative/metadata.xml
@@ -5,8 +5,11 @@
 	<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="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>
 	</use>
 	<upstream>
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.2.1.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.2.1.ebuild
new file mode 100644
index 000000000000..cee9e9be7ead
--- /dev/null
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.2.1.ebuild
@@ -0,0 +1,45 @@
+# 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.2.1.ebuild,v 1.1 2014/04/23 07:06:04 patrick Exp $
+
+EAPI=5
+
+inherit qt5-build
+
+DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework"
+
+if [[ ${QT5_BUILD_TYPE} == live ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+
+IUSE="+localstorage +widgets +xml"
+
+DEPEND="
+	>=dev-qt/qtcore-${PV}:5[debug=]
+	>=dev-qt/qtgui-${PV}:5[debug=,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
+
+	qt_use_disable_mod widgets widgets \
+		src/imports/imports.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
+}