Drop "c++0x=" USE deps, sync metadata with overlay.

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

5 files changed, 34 insertions, 27 deletions

diff --git a/x11-libs/qt-webkit/ChangeLog b/x11-libs/qt-webkit/ChangeLog
index ad12612201a3..a1f93703f1f7 100644
--- a/x11-libs/qt-webkit/ChangeLog
+++ b/x11-libs/qt-webkit/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/qt-webkit
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/ChangeLog,v 1.155 2012/06/09 20:53:45 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/ChangeLog,v 1.156 2012/06/18 22:38:38 pesa Exp $
+
+  18 Jun 2012; Davide Pesavento <pesa@gentoo.org> metadata.xml,
+  qt-webkit-4.8.1.ebuild, qt-webkit-4.8.2.ebuild:
+  Drop "c++0x=" USE deps, sync metadata with overlay.
 
   09 Jun 2012; Davide Pesavento <pesa@gentoo.org> qt-webkit-4.6.3-r1.ebuild,
   qt-webkit-4.6.3-r2.ebuild, qt-webkit-4.7.4.ebuild:
diff --git a/x11-libs/qt-webkit/Manifest b/x11-libs/qt-webkit/Manifest
index 3c6a6b086b55..7d9e3293e87c 100644
--- a/x11-libs/qt-webkit/Manifest
+++ b/x11-libs/qt-webkit/Manifest
@@ -13,24 +13,24 @@ DIST qt-everywhere-opensource-src-4.8.2.tar.gz 239108331 RMD160 6a15077aee1e8407
 EBUILD qt-webkit-4.6.3-r1.ebuild 1345 RMD160 1c852fe970bf0c35ba59c29ff4b95f24ef444d26 SHA1 35a3d32c1efe8005c4497e03f22827aec4e629bc SHA256 65a3f00355261e56ea23aa5a698679a603c8570ddff984d939769d3438ae2344
 EBUILD qt-webkit-4.6.3-r2.ebuild 1385 RMD160 ca6b48fd14f8dc1370d7fc5bfd4a7f6cfbddf2b7 SHA1 4df853c08273e05d5e600f98012c39798514bf9d SHA256 f9d39f0e974dccf8769beece53f0a1e26d383123c827d6c8c041ed2570558925
 EBUILD qt-webkit-4.7.4.ebuild 1322 RMD160 d9a7fedf6882c76ca6d8d39bfe0009ed15d3a4f3 SHA1 7a86b2c3ebce5468dd9cd364161beba75ebfe01a SHA256 d7734c432e36fea6555575104216279c56709c96d689c62ac0d8cb6f5a0f995a
-EBUILD qt-webkit-4.8.1.ebuild 2098 RMD160 95608e0efb9925a27442ccbd4d8b9deca3b3d932 SHA1 e0a45c5593675302c5c86d6360242d1d53efb129 SHA256 3ebb8e35dac8c3a04fe16b48a3636ad0c83ac93d99fe19ab9941a5b8239c4654
-EBUILD qt-webkit-4.8.2.ebuild 2217 RMD160 79065707f8ef3f502545070ccc00cd9d2a69d944 SHA1 ba28ab12410e3ea002cc53eb1a7d3ff5d3e1f932 SHA256 6f8d0a47b90589aee84df826dce2b2bda3fa149b90354492638f67e616fbcaa0
-MISC ChangeLog 22907 RMD160 6dedf2358a7c2bb8f4ff870ba3c0eb25a1190b98 SHA1 0e79c0d1c2f69346cb55f5fc6cb443e6478fb004 SHA256 b643f43160a15fbc9cd5234979581740bc5cba671b08198665842367757fe34f
-MISC metadata.xml 638 RMD160 4f2ab87626c5c0c9bf277c300dc79d5a00062bdb SHA1 8646425a166bf11f9e70df630cffb9c3822ec587 SHA256 756228140492bee4b9918aa0e947ff5b0a91f11980b4c8fce666b4bcdd5f1536
+EBUILD qt-webkit-4.8.1.ebuild 2078 RMD160 675336831ba75918e3e0488a0589cd63aa03cbca SHA1 7913b6f1e6cc00ab5e6a37bece0fc3d0e0841e22 SHA256 dd14794b60cef02465affe37bddea0b9c51f9cf227e3dfa0298937277957c510
+EBUILD qt-webkit-4.8.2.ebuild 2196 RMD160 0be2a1d223e2dc6f849126a0d1a3dbf0937fce2a SHA1 35e6ea05f10955a27d3f4cf954518ba83e0c8087 SHA256 ce99c32be7ea5d0b0e27c12540b6e157efb1d8ba788e56cde81ce31f83cccb63
+MISC ChangeLog 23076 RMD160 c05851a487d7385b76be359d887cce5b21bcff20 SHA1 25127106d31d9de9ec2ca734b79a2605aa3930bd SHA256 2fc57392ffa96d6bb5d6f2dfd11440b2eaaf3b8cbdff93f6e583994f41ec5e18
+MISC metadata.xml 697 RMD160 a5aeb67d933123e4034486420f753864b5c5a8a1 SHA1 f2fc500b17dec121f0cce41434787372695f3d15 SHA256 d05df9270865e0fef2c2f2ff57cd6e76e081da7201d231b471d4499eba0a3b8d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJP07ffAAoJENXLsxwXqFxyBfEP/ik7nWZTxk9Eip8L7CAxreWk
-RT43zTLBK2toHEy+rbOMH4drl1eXZyxl7QlBXaW35nmaddOAmYnB8uHwkuy1bpsZ
-XD4YTB7zhkkRUppjGNspFrZoL+EIVk9GajQGqLT6p59AvcvzHPp5rxylK6dQvbzt
-jyMC7fTadpMaTFU1f+eQRjTdLmnHnoW21TwaiLygrdRmfapcKdjbYGR/zykQ97nM
-6emuki11vwMZCKlFsDxKSihKWJZ6q05prsdilcCJ1a1k6/iM+jE3fzprff1y2zzL
-HZnbIfHtsFSSexOI4M2KMeWz/20en/vgfdzG3I3Ngs85vgHUqYyxOVAEQvKJAol6
-Ly3OomIYLs6IXC4O+UEBGXiMpvR+f7gHdOzojzd/hsnDQKOs/Sh2OzdtH/fpNAGh
-KYy3uQRxuCPfJ8efFS7ViAH+3Y45Y2p3gcMm1C6ebZ0hJi5qSsV0M8cQakpXACdj
-IdDLyd+Z7P5nDTGQCc8k1MClyYPRO3IADK7AG19LA6bmX4ZKXS/12QHcxdLSZgki
-GYiKC6oMBlH6lZ9MZMDdDJtPUHLomr3kfbEnHxh37YnDBECGZwfgjYnl6kQIqm+L
-jt8oLtyVHI56EDntCJSW7bhbB3o7MxDo00IM+Fta935PLQr9qq/+eBAnyeR7Eebj
-OH8YqoJdskbw/QEKJBUv
-=oVsH
+iQIcBAEBCgAGBQJP363zAAoJENXLsxwXqFxyZf0P/A93JZ7jiQo/LRSygPFLYa0Y
+E87vPRIlp62hS3tL4XIBag8HuH1JoFOhWTQXmMOyo4pD/PcvaI+fCvYd6Yiv4zUf
+orgI1n+Ied5zDdmrH6Bvf7bm4wn4OjzC4DqDP7bDt1ASBe54bGIxOrzHgj475hW9
++AUpAzQ8ZKM6EHE3tTVJG9Iwb9ARQ8RnumlJaVSUK737FLjHMnVx//nrpIP1XTFr
+erFTqn+hlXRWKRz9/P6zlpPfbG9ZityFqH2BqMsRa1KGmz9bKxrP4DXEUQrkEurE
+6o8M+JKFFlP9KV+HLuQh2/OxKnKpS1+c6wZrsv+A/DLpqARrkEsO04+GQqlX37gJ
+PL+jjJZWVvbVm4DGcebzbbUdranFiN0kLTI0FEuh+lTjJBN2tSCBePfwmvw+jkxK
+HR84qOMCFOAlCrPeLNJVncibipjngElp/zvNvU7e0njOMII9/XQ/Pr3fZHe82Cr0
+2DCaNFoS5AjffXMpDQ14EoMwf8VCSGh6V2jW63Q8yaJ/LlpMjcBr8dGn0TdJ1XZi
+ZO5UCh4xKKXuBN3SWf6tClvvIIoBe4qvLSq2ESylO7UZ4+QpQhMykH3KwTy0vnd0
+wx1Nkw4Xvt8IIvcoLg3ftHfiIXH0owkyMFf+Xtn3dvLG+wJT4LciTwLJgOomjtA0
+p3TWyLG2DoWkPYkoCr6c
+=1J5Q
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/qt-webkit/metadata.xml b/x11-libs/qt-webkit/metadata.xml
index b14a84f99745..526b2de4f052 100644
--- a/x11-libs/qt-webkit/metadata.xml
+++ b/x11-libs/qt-webkit/metadata.xml
@@ -3,11 +3,14 @@
 <pkgmetadata>
 	<herd>qt</herd>
 	<use>
-		<flag name="c++0x">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="gstreamer">Enable HTML5 audio/video support via <pkg>media-libs/gstreamer</pkg></flag>
 		<flag name="kde">Select <pkg>media-libs/phonon</pkg> as Phonon variant (needed for KDE)</flag>
 		<flag name="qpa">Build a window system agnostic implementation of Qt</flag>
 	</use>
+	<upstream>
+		<bugs-to>https://bugreports.qt-project.org/</bugs-to>
+		<doc>http://qt-project.org/doc/</doc>
+	</upstream>
 </pkgmetadata>
diff --git a/x11-libs/qt-webkit/qt-webkit-4.8.1.ebuild b/x11-libs/qt-webkit/qt-webkit-4.8.1.ebuild
index b05ba26f09c2..9240eb1cce2e 100644
--- a/x11-libs/qt-webkit/qt-webkit-4.8.1.ebuild
+++ b/x11-libs/qt-webkit/qt-webkit-4.8.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.8.1.ebuild,v 1.8 2012/05/20 13:19:43 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.8.1.ebuild,v 1.9 2012/06/18 22:38:38 pesa Exp $
 
 EAPI=4
 
@@ -17,9 +17,9 @@ DEPEND="
 	dev-db/sqlite:3
 	x11-libs/libX11
 	x11-libs/libXrender
-	~x11-libs/qt-core-${PV}[aqua=,c++0x=,debug=,ssl,qpa=]
-	~x11-libs/qt-gui-${PV}[aqua=,c++0x=,debug=,qpa=]
-	~x11-libs/qt-xmlpatterns-${PV}[aqua=,c++0x=,debug=,qpa=]
+	~x11-libs/qt-core-${PV}[aqua=,debug=,ssl,qpa=]
+	~x11-libs/qt-gui-${PV}[aqua=,debug=,qpa=]
+	~x11-libs/qt-xmlpatterns-${PV}[aqua=,debug=,qpa=]
 	gstreamer? (
 		dev-libs/glib:2
 		media-libs/gstreamer:0.10
diff --git a/x11-libs/qt-webkit/qt-webkit-4.8.2.ebuild b/x11-libs/qt-webkit/qt-webkit-4.8.2.ebuild
index a3df6033f92d..f7626df9e0f6 100644
--- a/x11-libs/qt-webkit/qt-webkit-4.8.2.ebuild
+++ b/x11-libs/qt-webkit/qt-webkit-4.8.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.8.2.ebuild,v 1.3 2012/06/09 20:49:03 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.8.2.ebuild,v 1.4 2012/06/18 22:38:38 pesa Exp $
 
 EAPI=4
 
@@ -20,9 +20,9 @@ DEPEND="
 	dev-db/sqlite:3
 	x11-libs/libX11
 	x11-libs/libXrender
-	~x11-libs/qt-core-${PV}[aqua=,c++0x=,debug=,ssl,qpa=]
-	~x11-libs/qt-gui-${PV}[aqua=,c++0x=,debug=,qpa=]
-	~x11-libs/qt-xmlpatterns-${PV}[aqua=,c++0x=,debug=,qpa=]
+	~x11-libs/qt-core-${PV}[aqua=,debug=,ssl,qpa=]
+	~x11-libs/qt-gui-${PV}[aqua=,debug=,qpa=]
+	~x11-libs/qt-xmlpatterns-${PV}[aqua=,debug=,qpa=]
 	gstreamer? (
 		dev-libs/glib:2
 		dev-libs/libxml2:2[!icu?]