added webkit use flag, fixes bug #348423

Package-Manager: portage-2.2.0_alpha29/cvs/Linux x86_64

4 files changed, 88 insertions, 16 deletions

diff --git a/x11-libs/qt-declarative/ChangeLog b/x11-libs/qt-declarative/ChangeLog
index fb25f5c40204..22ef2025f518 100644
--- a/x11-libs/qt-declarative/ChangeLog
+++ b/x11-libs/qt-declarative/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/qt-declarative
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-declarative/ChangeLog,v 1.19 2011/04/13 21:04:54 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-declarative/ChangeLog,v 1.20 2011/04/14 22:29:03 wired Exp $
+
+*qt-declarative-4.7.2-r1 (14 Apr 2011)
+
+  14 Apr 2011; Alex Alexander <wired@gentoo.org>
+  +qt-declarative-4.7.2-r1.ebuild, metadata.xml:
+  added webkit use flag, fixes bug #348423
 
   13 Apr 2011; Alex Alexander <wired@gentoo.org> -qt-declarative-4.7.0.ebuild,
   -qt-declarative-4.7.1.ebuild, -qt-declarative-4.7.1-r1.ebuild,
diff --git a/x11-libs/qt-declarative/Manifest b/x11-libs/qt-declarative/Manifest
index 41fd2e74dec1..2831c9f1597a 100644
--- a/x11-libs/qt-declarative/Manifest
+++ b/x11-libs/qt-declarative/Manifest
@@ -2,23 +2,24 @@
 Hash: SHA256
 
 DIST qt-everywhere-opensource-src-4.7.2.tar.gz 213663032 RMD160 de3d1c172c23c33681a0945c331db179c84cb7b5 SHA1 84414f82bbc9e8d356b986d5d1ebee89d06e4f2e SHA256 d4783b524b90bcd270ccf6e7a30d5fb51696c47eb5de49ebc2d553cd3eb49336
+EBUILD qt-declarative-4.7.2-r1.ebuild 1758 RMD160 2af9d2524449385bfb791b4783e59a04ae326c3e SHA1 b2b1bfccc04b432cc2d203756aceb9ffaaa07766 SHA256 620ecdc34eafd4f53f72143a074c41faaa6ac6272518f88ba1bb587cfc44213c
 EBUILD qt-declarative-4.7.2.ebuild 1559 RMD160 47649850d607623a0f7091ef247049254f3c548c SHA1 b54870a43f7de066365eb0088566ac6e2bb6c56b SHA256 427a5ffe22247d938848dedac5ba4f640ccbc6d4ccad11c65db33ff7866ce289
-MISC ChangeLog 2432 RMD160 73cc1201b236fb4518d3d4e82ccb7b654192782f SHA1 b1c7a49b996e7029cc68f6b5c8bd65c8825e98fc SHA256 8f61da8ca63546ec4f27e791d04fbae4fc784770e21c2054ec884b6d3e7dab90
-MISC metadata.xml 630 RMD160 cfe5140728dfa21844f00a8c8b10d596c71cf13d SHA1 5a481e672b17ce670c13609e7c85abc3a4c1dee2 SHA256 878c0b4d475644a76713cc90df071083f0faf583e334983ca6d351d6e50a5439
+MISC ChangeLog 2614 RMD160 1b58d8bedcc219b77af918e969d19f7bfc3e98c3 SHA1 efe52e0fabe283e2ae29eae80de211758a968cb2 SHA256 86cadf77a6c06a46e6c5e68b2ae3e122477e3242205bc4a22362669e7766ca05
+MISC metadata.xml 688 RMD160 036c0c9a841199385cb4a65d0c0fa346329b8d19 SHA1 77df4c97a7cf789a3b65d1b2b80965966d4e425b SHA256 00c203d0797d9a236b01d953e1cdcf27686ed81c33700aaa0123557356a5661d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCAAGBQJNphBZAAoJEDZF8K7rm0r6k/AP/1dSFIZkp4vYS24ANNHmFvj4
-scfyHqEqCdDK38YuWDyzsZuMLh5FahxaSdc1AgU0SP2hbSfAFXXgN3RRElsKXwVo
-2+7sVbnS3FPVITMVo18nEcm0IeaPfWs+7WRxG736r9Q1Ioakls63/wZe8Pl7jNdA
-+RoHJvda7ydTRqLpjb1oaGqpNDOJJCyriRr2phRdcMGdh0pCbxu6OQs5DXbXRn+z
-Ggk9s9mE6Op/DFsPeLqLvik4yVzLHnvK5v9mUU6D59aoRO6xyVb1/z7eSch0ORfc
-V8iIxxSTtqjZqIly4IwygAAm5tcV9JoSpPYaHzCQVzsgxKwsgJx+H9NzmE3TvJpE
-/CodiRHyTjntmUOzoVR00XF43djpKQoSPV4pcTSDEKKwcHDNSGmU3l4JNChw6IdZ
-H9NTZvuGQzHV3mAD5XauTb8BXk0FrAROqYAQuBS4DRkOnwof1tDOMYo9gw3Bim2+
-wkVDFjiIJUIoGW3V/UYwaN4FY2OKcvh0n028MC1waHcd2OVxCPAg3PIa5lO6BRpE
-lDfnwsPeGE4kfxpPIupS15dX1b+PZs0p6vTbTHnzD3sG6S22mjBxWQtozQT/VtSg
-hNF8s1KrKvykmt85MnO/ZjPAn03i3fGJMb2oiPnexei/el8bmn/79Po2s+ZGzlTP
-G2IbxA/bt3fInqooMN19
-=GBN3
+iQIcBAEBCAAGBQJNp3WgAAoJEDZF8K7rm0r6DdMQAKpXzV+S5v0+t4qkqqlUAgSF
+1jtQoqofWdTKn59QkHhIU/dfiDMxjoFmbS+SRhgVDydhEdflT9o+zaNOgfL1zt9P
+lA4fhVQPzPStxVO/uuEQPnIFJU1CgPlN3QzIXo340Tzyd+vQZeTysuDgHRnbm2JE
+NvI0nBGvZ48YE2rgpxpiKdOnHE5XKHFw7EhC+KPqvL+bHDvADL+sqIKlbbSP3oQI
+fylH6e8XxTPZUG2eE9zEahsdEAcPnY2hEE1XvbrkyjwaYqrf1UqzUsSGivhX0AYy
+yOQfEKjsFgU5vC7lgLCb0LcPLxJ3fYdYuQWnBCpAInL4AbhfNQemoMQo0F4kkMwi
+DxDNOKWMlpslO82B9d+5hzGXcxH/UsEfuiaJyO1dI/kp+wgKAXSHzHuxCfUliZpj
+qJFjorBwSU8XtNOyAR+N9qUI0VJU0vJ1zstlmJk8no4ueuA4MqsK8qzBqJA6g9S0
+XX6BYrONKmhROmd/IBRr2Zu3xqAo9WLJ0pcA2Qa92K2weIGJXQwglaxQVaP/DUAq
+x6luIHku5aKUw616hsypEsy5zFYp8XC2hkOFJcMYH3RZ2P+Gz2x9e0D2oS26EIWh
+q2Cy5z5TdccOHsoK9mV0tPgpl4ka1XZCizEMl6BDfdGdIinsH+x9MCFRQFW3GaNp
+0edYSJSxsGHYpkiQdKJB
+=5S10
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/qt-declarative/metadata.xml b/x11-libs/qt-declarative/metadata.xml
index be567d541229..86e2b764d474 100644
--- a/x11-libs/qt-declarative/metadata.xml
+++ b/x11-libs/qt-declarative/metadata.xml
@@ -9,6 +9,7 @@
 		this does not mean you can compile pure Qt3 programs with Qt4.</flag>
 	<flag name='exceptions'>Add support for exceptions - like catching them
 		inside the event loop (recommended by Nokia)</flag>
+	<flag name='webkit'>Build the WebView QML element</flag>
 </use>
 <longdescription lang="en">
 </longdescription>
diff --git a/x11-libs/qt-declarative/qt-declarative-4.7.2-r1.ebuild b/x11-libs/qt-declarative/qt-declarative-4.7.2-r1.ebuild
new file mode 100644
index 000000000000..3f07f7cefe37
--- /dev/null
+++ b/x11-libs/qt-declarative/qt-declarative-4.7.2-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-declarative/qt-declarative-4.7.2-r1.ebuild,v 1.1 2011/04/14 22:29:03 wired Exp $
+
+EAPI="3"
+inherit qt4-build
+
+DESCRIPTION="The Declarative module for the Qt toolkit"
+SLOT="4"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="private-headers qt3support webkit"
+
+DEPEND="~x11-libs/qt-core-${PV}[aqua=,qt3support=]
+	~x11-libs/qt-gui-${PV}[aqua=,qt3support=]
+	~x11-libs/qt-opengl-${PV}[aqua=,qt3support=]
+	~x11-libs/qt-script-${PV}[aqua=]
+	~x11-libs/qt-sql-${PV}[aqua=,qt3support=]
+	~x11-libs/qt-svg-${PV}[aqua=]
+	~x11-libs/qt-xmlpatterns-${PV}[aqua=]
+	qt3support? ( ~x11-libs/qt-qt3support-${PV}[aqua=] )
+	webkit? ( ~x11-libs/qt-webkit-${PV}[aqua=] )
+	"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	QCONFIG_ADD="declarative"
+
+	QT4_TARGET_DIRECTORIES="
+		src/declarative
+		src/imports
+		tools/designer/src/plugins/qdeclarativeview
+		tools/qml"
+
+	if use webkit; then
+		QT4_TARGET_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
+			src/3rdparty/webkit/WebKit/qt/declarative"
+	fi
+
+	QT4_EXTRACT_DIRECTORIES="
+		include/
+		src/
+		tools/"
+
+	qt4-build_pkg_setup
+}
+
+src_configure() {
+	myconf="${myconf} -declarative $(qt_use qt3support) $(qt_use webkit)"
+	qt4-build_src_configure
+}
+
+src_install() {
+	qt4-build_src_install
+	if use private-headers; then
+		if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]] ; then
+			insinto "${QTLIBDIR#${EPREFIX}}"/QtDeclarative.framework/Headers/private
+			# ran for the 2nd time, need it for the updated headers
+			fix_includes
+		else
+			insinto "${QTHEADERDIR#${EPREFIX}}"/QtDeclarative/private
+		fi
+		find "${S}"/src/declarative/ -type f -name "*_p.h" -exec doins {} \;
+	fi
+}