Import qt5 from qt overlay

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

5 files changed, 124 insertions, 23 deletions

diff --git a/dev-qt/qtwebkit/ChangeLog b/dev-qt/qtwebkit/ChangeLog
index 2a88e81f955b..dbc806f4059e 100644
--- a/dev-qt/qtwebkit/ChangeLog
+++ b/dev-qt/qtwebkit/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-qt/qtwebkit
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwebkit/ChangeLog,v 1.11 2014/01/26 18:11:46 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwebkit/ChangeLog,v 1.12 2014/04/23 07:18:25 patrick Exp $
+
+*qtwebkit-5.2.1 (23 Apr 2014)
+
+  23 Apr 2014; Patrick Lauer <patrick@gentoo.org>
+  +files/qtwebkit-5.2.1-disable-gstreamer.patch, +qtwebkit-5.2.1.ebuild,
+  metadata.xml:
+  Import qt5 from qt overlay
 
   26 Jan 2014; Davide Pesavento <pesa@gentoo.org> -qtwebkit-4.8.4.ebuild,
   metadata.xml:
diff --git a/dev-qt/qtwebkit/Manifest b/dev-qt/qtwebkit/Manifest
index 09f8a015c00f..c61d39672baf 100644
--- a/dev-qt/qtwebkit/Manifest
+++ b/dev-qt/qtwebkit/Manifest
@@ -1,26 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX 4.8.2-javascriptcore-x32.patch 500 SHA256 16c68e343f4bb416b870ae46bcaf80e6c2bc7ab45f5dc66f10698e8a5baefa90 SHA512 4fa7e280de9364e9eb8df651075aa0a2dded58db0db44d008bad3f053146f539c82c9aa1312006cc85b8367850ec385d3e3f716d2d4b8f4f1d15cd4756957632 WHIRLPOOL bc3241264a78353b0235a7caeb099d49a5fe93677f7fe88316a24c14b35a7f3a0c19b834b3b78a3fcd14d8b265ff5021153147a40f6332b680ad2f70095afe80
 AUX qtwebkit-4.8.1-no-use-ld-gold.patch 789 SHA256 034234a8aabb6ec94966b50beac7c17adbebe20d4c3f2100000152c943da15a4 SHA512 da89a02e257576f67928107ffa34da3b69dbd3ed5ac1059ff63e8e181d7b9abfc97f1f1dbe3804b954192dbe604bc880c6e2c1453ad8a6e97430602a5e5f8cd4 WHIRLPOOL c0b67913410a43823e0049c9d57d694a78418b11a885abd85fe7be671c5e7690e8720798859db67cbf65c8839a57a77182a6bb152fe1f339abcc5b70f5b3524e
+AUX qtwebkit-5.2.1-disable-gstreamer.patch 766 SHA256 06b0aa301aadc5fb601beb67583dfe416bf840a1266ccef794981a7610218508 SHA512 cfe59ff3307769ddee1dc0de00097349f6392f605d3ebd2ed1e41e450685d9ce6fa99323d20331a4a25af6cb40cb49d12ee5a5883f5d5219316ac3068aa76353 WHIRLPOOL 71062b0c17dd2bde216a01517d1a890958359cdcd9a355f9f7d9b9c8f670ffad74284c4a07346197527d893802d94ef65a1d0e98fb98b4560306449f8d26bf71
 DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357
+DIST qtwebkit-opensource-src-5.2.1.tar.xz 32980844 SHA256 ac089723489ee9146020bd8fc715358249d8cea7f2a2e92a692e2a5595a46b5c SHA512 edfc1c9f9eb51d14cd145cac041850d3627840cb405286864c3f0966742af2bb38310c44bc476be9354f2db2b58a89fbacead2667e0a37f691ab9a87fc3ee5bf WHIRLPOOL 172ee35c08c77680447fcdfab6f67af2c06e8e86d60dd68c4dc8d4f6a3a7400bc6dfe741bf4f9b07de39d4fd261db59a5b971cd2507b7f8b2da1adf3c4a9da0e
 EBUILD qtwebkit-4.8.5.ebuild 2053 SHA256 04be7ac80d16a4f2b9f12039d86ab9de9d645256f11ae9eebe5d0544ebb62253 SHA512 1bec3aec1bbc90f3148d798bd57cb4d92cd638048905e33d3aac8e3844b341839ceb4f50b41b54532dcbd87a3454e9a464c4e47953202e03519e5bd16cd9275a WHIRLPOOL 08d7e1948d1aff0806a4ade799effd42ae462d859d59321e10610020c4f038468735843e7d042a9a64970a8eae756adfb7b0927cd59b816de160dbeccbd05109
-MISC ChangeLog 27111 SHA256 782701fdfc1c84fd11c258107705ac30bac91b6d35aaeca7c1197aeda2b0926f SHA512 c55efae3f8df93dc8dc470b2ce4be4eeeefcf2ae41d670450ff58ae55d62d595a79efb053ea718a19dd8185548d7188f2abbfbd7360891b94c1cdb075658e7c3 WHIRLPOOL 3aa277cc152d74e8f21dcf1e1e3e7d0abc39b2ed5078f54bf0db5c8749fe25ca549dc88c7a15c27b1fd4764ca59ef19670214a080310895c93e2414e2293283d
-MISC metadata.xml 525 SHA256 0c477d490dfb2ca50c83d371b239386cb816d895fe7c2affc5b566bf5101f2a1 SHA512 4feebdf4efe4dd835ad863c5fe6ceeb4348dfc3ca75714a0c5b9651f8b2e07e68bec1541a15cbf631716df101374bbeba8e93e48fd2d763f9cef2d61f3da2709 WHIRLPOOL 17d9e5ab460cbc147b35df5b2f8fc4a8ba0de29f71cfca5e606c7e79ddac7413b85688564546a642020094de8574577f0379c0598072dc530e9eb3ddddd26de3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iQIcBAEBCAAGBQJS5U/jAAoJENXLsxwXqFxyyI0P/1/e9kIh6jgXoX5abrBgBoTJ
-eeh0PumvXZK246VZKjegTcA53LmaNySP6uD++yCUuku1RYe3FJEfQwpP4AvaBJb3
-8BIoKPGGca2eLYcOAgfg2t6pV56xkYHvQVxj2lXv1d5JljI30X7P6Gy2OpOaImpL
-C3eOapLBPNAT5VxCmamJ/LRtBAbRbx0aqBxUvwaOCErpeDrir/rCIn6DLHO8di7N
-hUBLBou7KQqcKE3h1XcswPjgjDXdOFXWd0ovUAPgQobjJVYiBQviRm4gv/rTX4Bo
-RNfIpZXUIxQzzwCBG9aHo70Y5ceEYnSr/sQyixnmogWg5+pd51JfNOKyfi5/lC06
-o543PgXsnSujyBh8z3whuphKQeSQdCH/CFh5CYPE9Zjh0YFRUpOFFv93mGjMcl8V
-2URpBySi/L4Dhu23uJ/2hQ9IxBIIfZToaj2DUrT24oe2LK5p9fW0S8BAvnuecP49
-3OIgSpVH4YTA2yd7LOWL5PFrpXE+hMXE+pjxD9UlJQg6d5mjZlEiFAk6RiRGIH7X
-Z7poW8DFkZR3EhiabCiuDmp1pRQj1AmTbJE5H2iv4Eaht3y4g7e6Gc5Ikw3x7zK5
-fhAdzXQuEiwwVmLziwQBs7wl7kcSxY1WEHUNo1WleFJhDP3iuUKrhfR8zSWAHade
-Kg74zjQfvfWOyB2CbcPc
-=Z8yF
------END PGP SIGNATURE-----
+EBUILD qtwebkit-5.2.1.ebuild 2758 SHA256 5ae0de9fbac70ac26d3dc56ab9e2d3e15943acac546195468fc01bfc423444b1 SHA512 a7a9963cfa3915058e9657e0edfd79bf7ffc9f71616d25ee0368f8b326069920679b569f5248c3440721dd4162309781915bb9622e440b7c2edb63ff9c84b2fd WHIRLPOOL 14a596db83671ae663788747c139a446cf92b00ab16ec989596f4f69a01c559f807af4012b871491ccc08ce96d5329e54792f948eaf4c80832363f99c13fca51
+MISC ChangeLog 27314 SHA256 ec1ca601c76d97117dbd4d8df0fa4cbcc3bc8f740144279e1d198a1739a80112 SHA512 e9c535fcd14a99390eb55ab8598a5f5f16f3e0ff38545fa3284e83076e9beb4692c8875c04b9e53ad7a6254711f8ed131cf0bdcab5760b005fe7ee8b5dcfad27 WHIRLPOOL f0bb9cbb3de92254089516880a74341fdd2a86cb4fef16fe03cea4261127b0fe4495c55624c8e236fd097c5f62d7dcfae8be5792b99abf0cab96035df44ecaeb
+MISC metadata.xml 1099 SHA256 e501af3039e3ea01e1a1b6acd81dee21553e4f3ade77e775fb4d0b1b431af01e SHA512 335fc9e8cf82ced330b00a932b25a0975d7115658033d8e5525e65e315b20090e5fa904761573066d57b330726dd229f19c0fdb7768051e163558cf438f2600a WHIRLPOOL 59a1c2e7470a5a971249064f82c8509fb879dd2af5b6656fc6aa8814cde9e744dec7079383bd6b1a55a6a5690a0e5d2c3d037477d50285bb00499d2dda47f120
diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.2.1-disable-gstreamer.patch b/dev-qt/qtwebkit/files/qtwebkit-5.2.1-disable-gstreamer.patch
new file mode 100644
index 000000000000..05e41a17f556
--- /dev/null
+++ b/dev-qt/qtwebkit/files/qtwebkit-5.2.1-disable-gstreamer.patch
@@ -0,0 +1,15 @@
+--- Tools/qmake/mkspecs/features/features.prf	2014-03-19 18:35:47.795676444 +0000
++++ Tools/qmake/mkspecs/features/features.prf	2014-03-19 18:36:38.602433220 +0000
+@@ -99,12 +99,6 @@
+ 
+     # HTML5 Media Support for builds with GStreamer
+     unix:!mac:!contains(QT_CONFIG, no-pkg-config) {
+-        packagesExist("glib-2.0 gio-2.0 gstreamer-1.0 gstreamer-plugins-base-1.0") {
+-            WEBKIT_CONFIG += video use_gstreamer
+-        } else: packagesExist("glib-2.0 gio-2.0 \'gstreamer-0.10 >= 0.10.30\' \'gstreamer-plugins-base-0.10 >= 0.10.30\'") {
+-            WEBKIT_CONFIG += video use_gstreamer use_gstreamer010
+-        }
+-        use?(gstreamer): WEBKIT_CONFIG += use_native_fullscreen_video
+     }
+ 
+     !enable?(video):qtHaveModule(multimediawidgets) {
diff --git a/dev-qt/qtwebkit/metadata.xml b/dev-qt/qtwebkit/metadata.xml
index f27cab7392ff..c06fc009a9eb 100644
--- a/dev-qt/qtwebkit/metadata.xml
+++ b/dev-qt/qtwebkit/metadata.xml
@@ -6,6 +6,13 @@
 		<flag name="exceptions">Add support for exceptions - like catching them
 			inside the event loop (recommended by upstream)</flag>
 		<flag name="gstreamer">Enable HTML5 audio/video support via <pkg>media-libs/gstreamer</pkg></flag>
+                <flag name="libxml2">Use <pkg>dev-libs/libxml2</pkg> for XML parsing</flag>
+                <flag name="multimedia">Enable HTML5 audio/video support via <pkg>dev-qt/qtmultimedia</pkg></flag>
+                <flag name="qml">Build QML/QtQuick bindings</flag>
+                <flag name="webp">Add support for WebP image format</flag>
+                <flag name="widgets">Build various things that depend on <pkg>dev-qt/qtwidgets</pkg>,
+                        e.g. the WebKitWidgets library</flag>
+                <flag name="xslt">Enable XSLT support</flag>
 	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt-project.org/</bugs-to>
diff --git a/dev-qt/qtwebkit/qtwebkit-5.2.1.ebuild b/dev-qt/qtwebkit/qtwebkit-5.2.1.ebuild
new file mode 100644
index 000000000000..41e6f06a7b9f
--- /dev/null
+++ b/dev-qt/qtwebkit/qtwebkit-5.2.1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwebkit/qtwebkit-5.2.1.ebuild,v 1.1 2014/04/23 07:18:25 patrick Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit python-any-r1 qt5-build
+
+DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework"
+
+if [[ ${QT5_BUILD_TYPE} == live ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+
+# TODO: qtprintsupport, qttestlib, geolocation, orientation/sensors
+
+IUSE="gstreamer libxml2 multimedia opengl qml udev webp widgets xslt"
+
+RDEPEND="
+	dev-db/sqlite:3
+	>=dev-qt/qtcore-${PV}:5[debug=,icu]
+	>=dev-qt/qtgui-${PV}:5[debug=]
+	>=dev-qt/qtnetwork-${PV}:5[debug=]
+	>=dev-qt/qtsql-${PV}:5[debug=]
+	media-libs/fontconfig:1.0
+	media-libs/libpng:0=
+	sys-libs/zlib
+	virtual/jpeg:0
+	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXrender
+	gstreamer? (
+		dev-libs/glib:2
+		>=media-libs/gstreamer-0.10.30:0.10
+		>=media-libs/gst-plugins-base-0.10.30:0.10
+	)
+	libxml2? ( dev-libs/libxml2:2 )
+	multimedia? ( >=dev-qt/qtmultimedia-${PV}:5[debug=] )
+	opengl? ( >=dev-qt/qtopengl-${PV}:5[debug=] )
+	qml? ( >=dev-qt/qtdeclarative-${PV}:5[debug=] )
+	udev? ( virtual/udev )
+	webp? ( media-libs/libwebp:0= )
+	widgets? ( >=dev-qt/qtwidgets-${PV}:5[debug=] )
+	xslt? (
+		libxml2? ( dev-libs/libxslt )
+		!libxml2? ( >=dev-qt/qtxmlpatterns-${PV}:5[debug=] )
+	)
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	dev-lang/ruby
+	sys-devel/bison
+	sys-devel/flex
+"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	qt5-build_pkg_setup
+}
+
+src_prepare() {
+	use gstreamer  || epatch "${FILESDIR}/${PN}-5.2.1-disable-gstreamer.patch"
+	use libxml2    || sed -i -e '/config_libxml2: WEBKIT_CONFIG += use_libxml2/d' \
+		Tools/qmake/mkspecs/features/features.prf || die
+	use multimedia || sed -i -e '/WEBKIT_CONFIG += video use_qt_multimedia/d' \
+		Tools/qmake/mkspecs/features/features.prf || die
+	use opengl     || sed -i -e '/contains(QT_CONFIG, opengl): WEBKIT_CONFIG += use_3d_graphics/d' \
+		Tools/qmake/mkspecs/features/features.prf || die
+	use qml        || sed -i -e '/have?(QTQUICK): SUBDIRS += declarative/d' \
+		Source/QtWebKit.pro || die
+	use udev       || sed -i -e '/linux: WEBKIT_CONFIG += gamepad/d' \
+		Tools/qmake/mkspecs/features/features.prf || die
+	use webp       || sed -i -e '/config_libwebp: WEBKIT_CONFIG += use_webp/d' \
+		Tools/qmake/mkspecs/features/features.prf || die
+	use widgets    || sed -i -e '/SUBDIRS += webkitwidgets/d' \
+		Source/QtWebKit.pro || die
+	use xslt       || sed -i -e '/config_libxslt: WEBKIT_CONFIG += xslt/d' \
+		Tools/qmake/mkspecs/features/features.prf || die
+
+	# bug 458222
+	sed -i -e '/SUBDIRS += examples/d' Source/QtWebKit.pro || die
+
+	qt5-build_src_prepare
+}