Cleanup metadata.

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0x17A85C72

36 files changed, 228 insertions, 144 deletions

diff --git a/x11-libs/qt-bearer/ChangeLog b/x11-libs/qt-bearer/ChangeLog
index dc2419748320..955e7807518c 100644
--- a/x11-libs/qt-bearer/ChangeLog
+++ b/x11-libs/qt-bearer/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-libs/qt-bearer
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-bearer/ChangeLog,v 1.27 2012/12/29 13:35:38 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-bearer/ChangeLog,v 1.28 2012/12/31 05:45:24 pesa Exp $
+
+  31 Dec 2012; Davide Pesavento <pesa@gentoo.org> metadata.xml:
+  Cleanup metadata.
 
   29 Dec 2012; Michael Palimaka <kensington@gentoo.org>
   -files/4.8.2-qatomic-x32.patch, -qt-bearer-4.8.1.ebuild,
diff --git a/x11-libs/qt-bearer/Manifest b/x11-libs/qt-bearer/Manifest
index af1362db35f1..2b4743a899dc 100644
--- a/x11-libs/qt-bearer/Manifest
+++ b/x11-libs/qt-bearer/Manifest
@@ -3,16 +3,22 @@ Hash: SHA256
 
 DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79
 EBUILD qt-bearer-4.8.4.ebuild 1680 SHA256 06a3c933b46663b2aa4a8f686fa5f7c44bb78d94393afe0b9429e89cbcc061c8 SHA512 ea52a59def732f49097095803c7cc493863f5528bc298b75e36d24477c034a7a66e9af1efc6802b86947f92064141a1ff4b27306b4fa8dc6422b11d6ea20a188 WHIRLPOOL d73a8c1e164582369b42df08359a20c415605ecf7d1366d058e9304bf1bf20b507fab02667a972064cd59e9934cef7161ef21c23ea7a2cb9ba09d37f59ab680a
-MISC ChangeLog 3407 SHA256 0084130bcd34b525f28de28321243f40a0b5d306c9fc1282132f2a8f531a3c6e SHA512 24ebb4cf60d1b5833f7148afcb61f1b62ea04261b1ef44cdcd76c74d7e64a2c4a9737f2c9163e84d62f3433e44f04d100a0fbf0b01a004ff6bc861d88cd549ba WHIRLPOOL 81af3a3a78920032a123634dad98a01fcc75512f86acee9fb94c2b34e4104b04643df79d290ec4f82279e5147b64ec9723de738e506b624c2da2703fddf90cd4
-MISC metadata.xml 706 SHA256 8e5d92ecd07a02c456ae1b752241fa209a40584099c9e88c392750a8cbe059ed SHA512 b698d38c6880cc4b9d3d632bfa294f143b54d13bc1000f8ce7530ffd96d6c813a2cba9bd5fcdcda995d9c8f14a49f9f9c17c9af5161fccf6b889325faa249bd0 WHIRLPOOL ddab76d1c521c0f15ef449a71d8c6f5774c6cc4cd2e4730f92275836fd0cf2f0bf62aa08b1855f28fcdd94e7001988429cabf87ccbf0c34678bf3379303846d0
+MISC ChangeLog 3486 SHA256 f2b88032101eda973eddcb3eb269783017da1b0d34e8008d599e2de26c678481 SHA512 be48e0dacd0d4a3346881709cc5274335e2e12b4ae5e2fc42794b86a91f9b07640a7bab783f64f0c87952d51ed5b0f867710a9570747dcdcfc1ecf4dd60a2b5e WHIRLPOOL feb655537d4482144ee70252021208e601f63e11605bc7f30f44e0089e6fb458969bd94bdff6bc676d5fd1b30e523eab6df61fb4a40ef502103bae4a1e7de7f5
+MISC metadata.xml 628 SHA256 c3bdb267f2a939b8d2c864f1d4192d988b0f36e39b70ed635f3d1f23d0a22bb5 SHA512 e039632dfc9ca2ed871566a3e57de9ead2a1a3e1b9bb2573b481cab761c92e855f41f9a32de645b99c7318a95cda0de954d7ae80e76828857f07fae2db512c3f WHIRLPOOL 748ec8193c09ba9c82132b48a6e45402acd2fe68244b6f0bce6da9a543c95bcf42094b52cb0a662bca21d1ee04f633cb2e1625ca315e0308e8328cfc65c2ab0a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQ3vDwAAoJEMbwO6tnXQ0sNOYH/iGyLvJU2buIPxPNzp9fFZs9
-hNdc/rg8erjmLz0juMaY7UUuKWznhwrfWa81oXwFRa3buhvY+P3my31wk00uaHjG
-g1pSfqnsIgecydOmBn9wiwJ+5tUiaZazYV5N5gPyGHbUYizgkL9cZ7TQc6jE5zLK
-1F6X3tTbJpBoCPDOCf13KbHobH1EHFSmWwR2yh0FgfujtnBvvMpaVNDyYci0nR8b
-o+H8QNmEmjI3oXFOwR97y6XSCcXYbj2f9TGbYNBp5meMevnRE3D3N22Lj+kLGRaI
-Mm8sdKR+9tC9D5nUXDFdi8PmBTJTStR8/o7Lv3H84bMU982IKFNy26s7yKetoTs=
-=IMBy
+iQIcBAEBCAAGBQJQ4SaIAAoJENXLsxwXqFxyIIoP/AiKGu8N8Y8kT4nCxSZJsZJ6
+UD155Unho4N/d19JtsOz3MWWJgIxwi0O3VkyL6xFkqN2woHz33crj9dyi8aaDZ+8
+jdjjTcPpFdRkT3cc9ZIltmRW+0051MBg3s4AIXGhIj6bwAb7F3dA/rzLkTMS8wb6
+ppHtat/4pk9Pl9KwHZlGgpaBozTDmInRz04pfCx8PTEr0UD/rc6x6buHz5qtRfz1
+Ax9FG/PwRB3+lwfMpQ5Kq7AMFqvpkDf3QdY1BYO5c0abEYyzK9+8fVSwJIRkrqX6
+gsOFupOWsIiS9Z7xM8/wOavu757fx1slm3/DhekgPtLO1jy3flG2iHOBv4USUoF7
+YMyQxjkNpbRgY0BFNH+AIBQ1ZMIkaY2KgGiIOnTeX6keZ5IOCgKrIs1aEcMxnV39
+wwMYCztPB+OE/Kg7p8QQxL7sC2HW9rHTrvXBObozTFthUfNoQJ5tPtxZ2+PsedZ7
+Gg3P4sjMR609cGaGjEBM2uMRynShn7OEkkGq8AhjshRilo28fRIaWJjV9cLrQ7WG
+pxRjya9hq65g/x9KUPeMNonOdwZqy/tuEAkSW5Ali7IZON9pkEakdV1GL6rlicHR
+aL2JGx2pLU4Al1CGeWQGJwmLTXTawJItNfHMKneOC1g9Y/vVB2GqWArlyNwF/P2q
+wOO+5jjwOu7VoD9618WA
+=nGNO
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/qt-bearer/metadata.xml b/x11-libs/qt-bearer/metadata.xml
index 69f9a825250c..d86f5eb1fec4 100644
--- a/x11-libs/qt-bearer/metadata.xml
+++ b/x11-libs/qt-bearer/metadata.xml
@@ -8,7 +8,6 @@
 		<flag name="exceptions">Add support for exceptions - like catching them
 			inside the event loop (recommended by Nokia)</flag>
 		<flag name="networkmanager">Enable NetworkManager-based bearer plugin</flag>
-		<flag name="qpa">Build a window system agnostic implementation of Qt</flag>
 	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt-project.org/</bugs-to>
diff --git a/x11-libs/qt-core/ChangeLog b/x11-libs/qt-core/ChangeLog
index 98c09de734cc..3bc3bafe2795 100644
--- a/x11-libs/qt-core/ChangeLog
+++ b/x11-libs/qt-core/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-libs/qt-core
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v 1.201 2012/12/29 13:36:37 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v 1.202 2012/12/31 05:50:06 pesa Exp $
+
+  31 Dec 2012; Davide Pesavento <pesa@gentoo.org> metadata.xml:
+  Cleanup metadata.
 
   29 Dec 2012; Michael Palimaka <kensington@gentoo.org>
   -files/4.8.2-qatomic-x32.patch, -files/blacklist-diginotar-certs.diff,
diff --git a/x11-libs/qt-core/Manifest b/x11-libs/qt-core/Manifest
index 0701d8b9ae18..80fe5fac7a59 100644
--- a/x11-libs/qt-core/Manifest
+++ b/x11-libs/qt-core/Manifest
@@ -4,16 +4,22 @@ Hash: SHA256
 AUX moc-workaround-for-boost-1.48.patch 571 SHA256 f8c10e753515cf77a606c88bc97e1536526b1b15431fd1c7c8eb78f28aa49771 SHA512 b192108be3328637bd30279e61104abbdaec8bcc66962a1081abde1188d4d2f67c0674ed12280bad630849d8d748cb9bbc4178878b96e87ae67d8531aae13701 WHIRLPOOL 5e9df8db26a2e4fe60cd8c0483ec39825deb520f9a370a3ccc2723bf6f017c23e8c3d86295f1e5d7fba44ea1d7f0465e6d039066622ebdb39f5d8524b0016cba
 DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79
 EBUILD qt-core-4.8.4.ebuild 5021 SHA256 9044faf0d72c578556cc5da5888a62ed27be3b7218e41c69fc71d4d44320d1f7 SHA512 0d6477648c101316c367be1f02112186b0d903ee3f8ecd181f18beab30225f72b064fff545f70d6e71a60e4b6484fdc8d10dad5ffc289eb0ec7efd793b8ac1d5 WHIRLPOOL 8a789b414716edfd718e1c6a71a54b7273532a99fdebbe0089dfbe8f495d37489a3a611a8b9a2068e078c886277eb6c837c5f3450ac4ac37101ea179da33a0bf
-MISC ChangeLog 27001 SHA256 74d39261418bd878263dc45924a698a4eb03ce05785fa66e883965807224c24c SHA512 9eafd287b390b416265c6d4a7b604ca3ee57618e707e7ad4f69f245237394dd5dcd311a82f455906faf8a1ca6ce13bacc75060167d244050a17196cd6e0cc1ab WHIRLPOOL b917fb38c61a867a4b23d153677b4a889a12167052f842b3badd4310bd6047d3a63c5bddb3d807c8a4668549e5fea3c70a689f16c61195333804144e0d3cb5e6
-MISC metadata.xml 962 SHA256 5e48f820fb8a186626c8816f7f143667495a43bdc5e2765f628c2134c0034638 SHA512 c1598a11c993175dcc9fbb6c3af19bafca74a39122c1d769b6f0cfb73a168e729d14edc46adcb2ccb638c3eecb10dad5a58f9070c178b86447a6ccdd2eba5fa0 WHIRLPOOL f10d5b7a5f20535d3d7e410d9a923afb34e2fc8151c45aab8035a326127a3cd511f2ff843f0094495a53c200b2242635e8d8f52e9dd08d7850014957b872e812
+MISC ChangeLog 27080 SHA256 3ca93d1cbaa78cc49023c3329335207d0f5a9e7a4ba948b1fd66858f9eaa298a SHA512 55c7547a34b576fc3d1a550dfb4cbc583bb71fb3da6fd68972116e8ca8cf258e61585cae1d5f4297d7dd8f251cb0756a7213453fd917825eca01172ed8bdf027 WHIRLPOOL 1a7136c9f80c8ccd31543f553a311d5c5d189be43d0cb605f6f4c9bf71b7a554013cecb0fc2a31046fd377a08080533547928c2171f19b0645dda38879dd13ce
+MISC metadata.xml 711 SHA256 999402a925dbe1f9d510372e9e03e5527e94e95e1cededaa01b2a8f7d89e2a61 SHA512 ac9f28c9efb0aeebb145c1cfc22d1a3c7ba25b141f5640249c914921138eb309c522392e750614a531bdedf0f4385738a840ea4591785d54cadeb2f1c74a4d5f WHIRLPOOL e2ac4864fcc8b665251fdce4203156f0bba2636d2a170a225c13005c656fce29f49e51dd6b8c6639fa48a11307522887ff26bc02603b676ec20aa826b2198824
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQ3vErAAoJEMbwO6tnXQ0s2iwH+wY+VJIWSpGVWGh3Ivl84jVL
-gQAPAs69utGszJc55ZrAtoE1Tr2c1fOvnmJXYXnCz0TB7i7oGbC1pHaZ8WX+EGKR
-VD9M48/FuJjTzuI/LqyRL6/qJN+D3xwFj3IPntcb8auNgeM4idtVqKpYx9mplP5T
-ORSf76F5W4YWn8gsCxGeQ2ewd7lyhyl7eHpqzapm/lp7bpbLN0pSVdkLXiw7QvD8
-X8m33pcGzUj2t+to3nFQ/VsXSB/D1UHv8CHYqThl+B6C3DUCwYUVuenV+q6kHR6U
-pAU/HUGseCEzO9irbQgbo9QEmmFEOrZ1g23yqUmuoDO20+F1Y/3Ov1x6e+cxdzc=
-=wCmT
+iQIcBAEBCAAGBQJQ4SeNAAoJENXLsxwXqFxyq4AP/AvuIO/EIKjlqgqpJRg2TfUP
+/8SYlgI3QpJuLK+rSUQW0ipv7Yff5hzbV27X6jxwXtYoIy9uDVH0bnoPsYqurpWP
+NQ2rirIXyvLYQasuFc6JwB3EqHzBB+rJkGPwka9iSBYQAZbafg+d8uCkd5uE4SLA
+5GUkIXaZ/Vo1VpLpe5AkQIZLr1EqqXwAIS6J51zbqMsdA0x5JHnKGwGBH73ZURJC
+w45UAZEfw1+D8rW5B/gbofWTnc7v8vIc8dLBhRsuJG5x0dVCiEbuFCrrmq+0g8zO
+K5RZuYFMRr7qF08qPeQfk+0ECw0iMbD3O6XgI+Wb/+0rgXWkEJOaTux4zvP9f5E1
+MmqWCGoR8CHPRPU2aAI0rIjnTrVjDLpDvjc8sdJk33nU+DyPrmvQexu3RDd8wzer
+fWEEP/Fui+hCZ2xt7jC8J20/hL37Fx7+rHv7dr5hiu3+b2w+MjuotyHHVVwKlNxL
+se4PNi0MveM8u9LONObvVCb7zVLOWmuKBwkYsPK7qNhKN3Cs6BKV4RA8XIORXtPl
+sUBHrjOw9etpkunONfcIRhwUPQ94nl1ahnKOeXH1OAH8bwkw8bgnDqJzaxwGGJkQ
+XycxPPx1qvC+DMHIHxN7w+X3+V8ZyjjNrNeEZCn27NhtU7RcqTn3PGA/nCCaF1aM
+n48Z0bol9/OBDeKEyLpN
+=OQEF
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/qt-core/metadata.xml b/x11-libs/qt-core/metadata.xml
index 1f5cff9c51a4..5e30afebf876 100644
--- a/x11-libs/qt-core/metadata.xml
+++ b/x11-libs/qt-core/metadata.xml
@@ -7,10 +7,6 @@
 		<flag name="exceptions">Add support for exceptions - like catching them
 			inside the event loop (recommended by Nokia)</flag>
 		<flag name="glib">Enable <pkg>dev-libs/glib</pkg> eventloop support</flag>
-		<flag name="optimized-qmake">Enable qmake optimization</flag>
-		<flag name="private-headers">Install the private header files required
-			by some QtCreator plugins</flag>
-		<flag name="qpa">Build a window system agnostic implementation of Qt</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>
 	</use>
diff --git a/x11-libs/qt-dbus/ChangeLog b/x11-libs/qt-dbus/ChangeLog
index 32a3f68ed991..29deba8da265 100644
--- a/x11-libs/qt-dbus/ChangeLog
+++ b/x11-libs/qt-dbus/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-libs/qt-dbus
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-dbus/ChangeLog,v 1.140 2012/12/29 13:37:34 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-dbus/ChangeLog,v 1.141 2012/12/31 06:03:20 pesa Exp $
+
+  31 Dec 2012; Davide Pesavento <pesa@gentoo.org> metadata.xml:
+  Cleanup metadata.
 
   29 Dec 2012; Michael Palimaka <kensington@gentoo.org>
   -files/4.8.2-qatomic-x32.patch, -qt-dbus-4.7.4.ebuild, -qt-dbus-4.8.1.ebuild,
diff --git a/x11-libs/qt-dbus/Manifest b/x11-libs/qt-dbus/Manifest
index 640ecba457c4..fce746f1f13b 100644
--- a/x11-libs/qt-dbus/Manifest
+++ b/x11-libs/qt-dbus/Manifest
@@ -4,16 +4,22 @@ Hash: SHA256
 AUX qt-dbus-4.7-qdbusintegrator-no-const.patch 543 SHA256 a05de8d906be14160e5c951856fae2796b6f6eed91ed4781e8197433e94ce922 SHA512 1967f1b3f1a834eecf140df39c6e4826acf80fc2f8de85770252949910de357a4303d1c1b3202e2df164e8b1cd74b0ab4928a3b333df0a222bdf21e71696824f WHIRLPOOL c5d72b6fc8a9e55cfdacdd2a514e1acbd1c4f864f92596b3c3b9d013a24425619c04048063afb9aef267ade2b5fcf6b3921b90cddb2f9a3ee7d8721ae7d8eeeb
 DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79
 EBUILD qt-dbus-4.8.4.ebuild 1126 SHA256 1c3f903347e48c17d179ec0c2e00678a6402998db21ac4087a1be714f341c83b SHA512 c1684336960846b42a0b179a12e87f0c82b5855a3ca1d480b8e75b5d54938878846ebead6b19577e2c7223da12c35c9a593f862ef6fe1655ae0224169c9de72a WHIRLPOOL b929910f863a1c0af8f66551700c075f5e93eb2b2b872a5d70ed6e00a520110e08a96165c420ecb3ca7dc8c9a5af230cbcb182d0db50a90324dc4fd53811990c
-MISC ChangeLog 16731 SHA256 c16c1ca949675f5aca9ce53f5834d8bb660e638a8ebc50ad7efa1332e79eaee3 SHA512 740ebb1c472c3673e447fd1794cb3136228eb36a6924e2c18700722b00c0d741b8f6573ff3c6e7dabbf0edf5137fc2e4f9e4797a49fa6fdff7964497200ce35f WHIRLPOOL 4021cada847d5b6e83db0fa012648178f48ec116d1dc7d239f65005b2ea4eb36d4f259780acd696fb658027f90692b86c5555f7aa741491dceacfe3d82d9d1d8
-MISC metadata.xml 562 SHA256 b723cf2b12dab4eee959da9b8de3db6adb6a87431e2e83c1a825e891670c7938 SHA512 d2dc00c1248bb83d0f60d1423865d21aca4fd2a308956578f9382c7ba0e95a311a6b1b019fefbea56112100da647d7c361240c6aa959150ba03b440cb3fd443e WHIRLPOOL 7833ae095cc6a0ff83342cde8c116adacfb024f53b9339f8f97fd0c62f231c9be83205e3ddb22838095341d428d130a30f6a899ab52d4cf9358b56e0be99ae66
+MISC ChangeLog 16810 SHA256 7876e78752b011b3f93df83ee0f5fc851b10988d9c38a5715d4e16e45eb90a25 SHA512 6d1f1efb6ab7979c4f631c2d344c7d4c83c908cfd7bc741506745ebb49429475ab420c92f4281980be0d9eba4cb7f1bb19979fc55bb84d63f15663f6a2720ada WHIRLPOOL c1b918faced37098a26bf8593e0fa77ecbda6d933cd53bdec1b400d651df1f6d7d727ac77f484ff9e56912af8303840b64e61e34ba2808afbe63383509b53e38
+MISC metadata.xml 484 SHA256 e4f3a32784240897cd44c3c645b61cc8a6ff19bd821be35a00e5e8bc02085cda SHA512 ef88ccf92f3d370f7c70c18eb2727b279ddbcd04ce734014b02915b8ba32bee8a8ab2a3608b58b0305c48fe8073af99184b69940413ed2101be64bc50ee7ec11 WHIRLPOOL d68e07f14ea07c308a25487c89f382ac47ca9adfc43a6d1e641cb057b36537eb9ce860bc5cc7bfc702bc75d4ff49ffdee016a6f4ef70df27670f5fbd9753390f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQ3vFjAAoJEMbwO6tnXQ0s+pQIAJwUw2F2mRd8wbxg6Ps2MSL8
-2qNng3cFHfNIV1x8/USTrsyR1LWZM43ZDf6oS1fPt1+Khzq5FCIehaFL8ERn4tZm
-iYKB3v0S/rr2t+j1lKBErB99pa9/3y8l0+pirvLwDyxswGQxwgo4sbAdVMVUig0M
-5t3sqxFVP1Fk8E6LGkCq+Js7DCOBvtfLxd+CaQ0+VHS6GlGJMScxXDc5codRPewq
-w8WjDYuT7SWaQlax9PLD7YZ28uWWobma7HR9wDjBCX96Yz2OlrK0TOo9NY1JaLSq
-eyn9bexda+uwxKG6ogb6PnVYWuywY45m2VW23FMfSABZX5ZeOIRChnGbmi1rBcU=
-=P8ds
+iQIcBAEBCAAGBQJQ4SqnAAoJENXLsxwXqFxypw4P/1HBEEzbreLNJ+EGY+62QuBg
+VyN57gEEDfYzNtgQHRxsgCh/UD7bInKGJmtYLYXbZxWoFB0S1rr4mG6dsqpU6vla
+n15xd9TtwzWUJD+1yX8E8uQUJ4WCC9UROxtMHVXcUhKrVvwDa326+1P+3ESsIEvu
+NevivRzEgGSN6Go3+lJ+loWTJgHFNIgVO/CQ82trZ6VEqnCdWsm83kpC3ypFqCZy
+jwz7Go+kEboVkRfpVIADZoAJolUVPTM10C+zkj3k7c6vc/ybwbA8c1Vf/d9n045E
+SgAjlYqZCev63NSwAY5inkwD8p9l43geRgUGnEczmcU1m6jYT7jnvgmjdDef5Vbc
+J7QNRAmHQz9fkD49ITfUaFI7h665yLiqzs6f9P7IYCy1+8qdEZyd4S1Fcc7IuSij
+6hLgOKcO4dini7E8NPUoPUoRUo/QClfMFXvKWnUViVyQG1VZcKkuhNUxmMhSV2+o
+9BLN+iXqunkYGoLp3VEbdGEG8h/Lku58I/VTpORm4dda+OP83nMfI/RaBrbzUmCN
+v0Y/N5T/Pb/GddPyw8s5mfv2LinHjedV+Zqmi6wes/CG1Sp7fI6nn+sZoEt/ijkl
+aKply3nZiew1svFVPiSa7n1lb600Orn4nD7t9M9uPGWF6gUWUicixMs4lR1fUoMp
+BvI/6jCtEg9KUiI/R5ib
+=z/aw
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/qt-dbus/metadata.xml b/x11-libs/qt-dbus/metadata.xml
index 1698ebe6b82e..93e5fd3f1e69 100644
--- a/x11-libs/qt-dbus/metadata.xml
+++ b/x11-libs/qt-dbus/metadata.xml
@@ -6,7 +6,6 @@
 		<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="qpa">Build a window system agnostic implementation of Qt</flag>
 	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt-project.org/</bugs-to>
diff --git a/x11-libs/qt-declarative/ChangeLog b/x11-libs/qt-declarative/ChangeLog
index 6f460dec3749..21e36c95f8cc 100644
--- a/x11-libs/qt-declarative/ChangeLog
+++ b/x11-libs/qt-declarative/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-libs/qt-declarative
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-declarative/ChangeLog,v 1.66 2012/12/29 13:38:32 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-declarative/ChangeLog,v 1.67 2012/12/31 05:58:04 pesa Exp $
+
+  31 Dec 2012; Davide Pesavento <pesa@gentoo.org> metadata.xml:
+  Cleanup metadata.
 
   29 Dec 2012; Michael Palimaka <kensington@gentoo.org>
   -files/4.8.2-qatomic-x32.patch, -qt-declarative-4.7.4.ebuild,
diff --git a/x11-libs/qt-declarative/Manifest b/x11-libs/qt-declarative/Manifest
index 92ada734c2a6..977f8efe1344 100644
--- a/x11-libs/qt-declarative/Manifest
+++ b/x11-libs/qt-declarative/Manifest
@@ -3,16 +3,22 @@ Hash: SHA256
 
 DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79
 EBUILD qt-declarative-4.8.4.ebuild 2045 SHA256 197d20ebf8171335ec338dca781d58aa8e911cfe48a5f47ab35c9152d3be0fad SHA512 1b0f3e750c6abf7188cb4458233333da8f074cb8f6b208b16734999ecf6c4861044e7338fb394e76ab24f3756bb9bf9a2df2e859e9de2a94f48f6b1091c79195 WHIRLPOOL 533182daaff677c999fddf1c1d97f4f38d2895b18843cfe64f2e9f51c2e5ccdbe2d2b7edab825e97c71a7818d736e2295a903d006b692c98a573f74118442bb2
-MISC ChangeLog 8410 SHA256 1002727e63966de6e9f234ea1204cc2748342084eef3f4e86b4cbc57f41ccd9a SHA512 256f6fad93b7b0b826eaf6566f1ddd13f4feabd34170c060ef93a38c2addfd20125469afa39585c8f2721ff3b18b01a458c4561ba618f6c3e6e627222eb6a56f WHIRLPOOL 0c872cbc7376ef832585a9e311bc1add798ef10b5eeca6c3af9c68d7ecbac15929aa7939628449a74b04cccd51bc5f6eb4916fa900d0744da47be3bb0e0cee6b
-MISC metadata.xml 881 SHA256 80127318b4d86e6f503d28de2820f95e4b52fdadeed1786ecfadc82410442053 SHA512 62049bff4508f9ee58ca413d5f13f4a6f804a9f9af3459edea058e124232044c0638efc177fbbbec3d6a840de46b210ae4f1c2155db52329d0707f25459515cc WHIRLPOOL 528f49f12561e1dc5bf257ea667cd35e43b713620c9f5c2e429cc630316df9ad9e9b6063d4a194e2932d0967cde413b189fdc95896ccd9237fd655a653e84f1b
+MISC ChangeLog 8489 SHA256 e425ae35a75f894c38b025333b4d5c2ebd7837d4238ec3ae3701adcee19974f7 SHA512 a7b9c7fc6cc0db0f3a74152bbc4cb2489b3a9fac18c9355d78315b167f7575f443e08ec3fb6b556d528caae7693e3d358942a58ec5337daac381987caa6fdbb8 WHIRLPOOL a12c7f458dc8bc8590980f9d832da6170643dd770e4f6472438fd909630f881d372d39addaa4c158419cbe12d92d361afd04cd436067af928359b56c297662f1
+MISC metadata.xml 694 SHA256 3d234b538acdba36e5c2ac95cc44a7e58538d51bfc3ac1bdc04331ea4cf7bf4f SHA512 b9a8dc2d22bca30d1ad6207f51ba29c4d527a9de75e4671b4bbef04085ca5cbea47f72bd72298d3d24b9a0335fbfb2dd2828ac74ddfe8af9648ee781ffa0559d WHIRLPOOL e3a2c6e770a50e9b94ef8efa3fa2dfb4ba61d4417ac5854a5e3308d07a7cb9abc74be8bec10e456544170ead1739280bd5d9060d57b1a3bf4a7a7cfb7f870710
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQ3vGdAAoJEMbwO6tnXQ0sFcoH/0DUD8tEV/TA0FfjnEciiehJ
-7IEnkgOkd+3jsOFtxsqIO2vPfMP/Bgwp8C14QneO1/veS7HvHLDhaSegXMNa+cQO
-k4uw1uS+LZzz1nh86y2jauuVLChBYfgW9qdafQlbQeeYlr4CXby0sB4+MuSenbRk
-3cYaACk//c3jLf+ocw+HUK7nHycV5ObVweuQI7gbfXvovGnHUFfpErsoAfGBLA/O
-rg7CEHTDiyLrvhIE4XwM4tahoX6fUQf+h9cuJgkETFDZamz/XR+wBI5kQBMd2WGT
-xhJlzLi5T9bi3Lf3oG3ciWMwRSMLfljG0pgdnwBo7GnIGKpHdqUpY3fKiFSvrMk=
-=wsC1
+iQIcBAEBCAAGBQJQ4SlrAAoJENXLsxwXqFxyvm4P/i+j5x+BeJahpckojg0uPzUi
+d7YAks8ono67UIbuIaNhiARP3ua7p74X6K/VTpOWj0MBbL3MT0HPWNqrXzJzNRv0
+m0dC7pMBCdkCCO/8NZiVwCXAtHCEBLE+G3J9fkeYSy3rZ4cANhpfI5AoaVkfQFpC
+d/H3F27rPvzFN5BnyevNYp0IN7hp2qQmgg7nEqodzpPtyfCe34pYSWvhnCBSrejD
+XceU/5KUCgvOTngTgIBM43tPeqdjGDLW1Q1Wgl9zrfiz5XbAK86Bs2/uvX7sDNKt
+SJk5029R5HnfwG1LDJHwotSVYtDKYDTTGgfc9POsI/5ZkpsM0c+ITk9kGR+u+bLX
+HuxAb8Wes27M1R0egsb19kbmRzlYEx78mE9/jA/wKuskUEyjJaF+5SyOx3gmUcow
+0ByT9up3nMmQ8wsDCttCTHLnK1xDxAZ6WEjhlOAussp8Vy3KCnFY2r3gOqGLAe/j
+jej/tKoYmJxkfmXYId+wc/gBWaAui0B40zB69XiHArl06kirk2oLwb5+TxJ7DPzk
+mL/WZdeSAQtVXUkcknc4nxQkpTGqXrP8WmVxf/34vdJR9rqZgkO84PzycSoQSZw9
+S6NTi0WnpJqeXDXaCSrB+Qn0njYnPPtMxeeUFvKb/TGKGVHtjs7Y4PgOrGkkyo9x
+NRNYL/OOStgGXy83MJsm
+=9Olo
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/qt-declarative/metadata.xml b/x11-libs/qt-declarative/metadata.xml
index d9102fa554c7..da493d03e67c 100644
--- a/x11-libs/qt-declarative/metadata.xml
+++ b/x11-libs/qt-declarative/metadata.xml
@@ -6,9 +6,6 @@
 		<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="private-headers">Install the private header files required
-			by some QtCreator plugins</flag>
-		<flag name="qpa">Build a window system agnostic implementation of Qt</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="webkit">Build the WebView QML component</flag>
diff --git a/x11-libs/qt-gui/ChangeLog b/x11-libs/qt-gui/ChangeLog
index 3719cd87db6f..1f3bc2e14b6c 100644
--- a/x11-libs/qt-gui/ChangeLog
+++ b/x11-libs/qt-gui/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-libs/qt-gui
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.215 2012/12/29 13:40:26 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-gui/ChangeLog,v 1.216 2012/12/31 05:53:06 pesa Exp $
+
+  31 Dec 2012; Davide Pesavento <pesa@gentoo.org> metadata.xml:
+  Cleanup metadata.
 
   29 Dec 2012; Michael Palimaka <kensington@gentoo.org>
   -files/4.8.2-qatomic-x32.patch, -files/44qt4-gtkstyle,
diff --git a/x11-libs/qt-gui/Manifest b/x11-libs/qt-gui/Manifest
index 3681a60c5c88..3b0fe79d490d 100644
--- a/x11-libs/qt-gui/Manifest
+++ b/x11-libs/qt-gui/Manifest
@@ -4,16 +4,22 @@ Hash: SHA256
 AUX qt-gui-4.7.3-cups.patch 3297 SHA256 3ccfefb432015e4a4ea967b030c51b10dcdfb1f63445557908ddae5e75012d33 SHA512 4a8f828c79bde81ab1e39c9eaba4ef553582d85b62d6d182dda02820c4c8e046de6a25cc77d228955ed37fbc5b55f697a0a464af0bb3e171849851639e9ef4ee WHIRLPOOL 41d82843f91533a5cbb0c9945c9013d9c8f07be3f06fef1b52cf8d18483d9cdfd24fe1d53c18a2f1eebd7a504f1665f1859616ae460d6471dc1599cea63a7bda
 DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79
 EBUILD qt-gui-4.8.4.ebuild 8186 SHA256 26127e7fde2b9b741f41cfb20c87438192cae39a277cbc9b0417ad8b82f9a42c SHA512 cd482356437f3477014739fb6299b996eabc75684263666d48b47d2fcd516ee5fe0c1a8071f82b9f540497e9f58f4d4c4e9d9bde25c9a0ebf3a3b761be4c75cb WHIRLPOOL d3843fba891eea004e361ccf20f275e3809444d284484b231b75f93eaada2a726dffa5dc9f129aa6d71a4bb4359a8b3ffb51bba850dd084b9fb04bc823178ab3
-MISC ChangeLog 31798 SHA256 75220ee7f3eac448b91fe5bdef3164c9fb34a7824c016e36c5c41c52163f54a7 SHA512 0351970d29f8265d3ceaf92aa803f96032da9f6c15e52be71ad2e845052f98d5cb1c2fe897591efa0ff4ea857cbb4163731cb62eaacd9170a3e2a3338636f4aa WHIRLPOOL 76f7e9f41ecc124f1034659d5f7452af00890f5c37ac0990d1f14e8a1727105cb98761ab001d9175e10ee2245da50a1c6aef4788cdbecd04ac880ddff4fdbd46
-MISC metadata.xml 1408 SHA256 3c6009d441bc2d4b414c5fbf0e804fb3afe40e510bd7801fed237feb15fefa28 SHA512 7cdc018a47e690332784ac9d99b749f12a82b882b3d43b94bebe829be371b83f816c0d91ed98cd04c866ec9dd0745e83ff416056593b77d7845545041d599548 WHIRLPOOL 2f11be380287ed99becebb3a26ad03fbc266edcbdeef6bd1a25a58c7229fb6574f00f857fe53393466aac979c7ec7153f56b2ffe1b2b9a6c3c13539e6395e8c4
+MISC ChangeLog 31877 SHA256 f0cb0fe87333c5285cbc3748967313cc250d10f866ad290cbe2c9e2192ed07e6 SHA512 0e5cc895bb8d39e8003ee3f903810b4b54fdd600f5d01f7aa47dc22d4f50c9c5a1e9b1273e2bd670d8350bc506ec3ba4cd2c85589087f4806220fdd7c831bf53 WHIRLPOOL 420574ef3019db24b1f38e128483d3a973d2226a8cf6e26a3a0342669b5975157de4d972d7fade4b190ac85945e67b56f8637af51d8588b4929bbb9943501f8f
+MISC metadata.xml 1117 SHA256 fe5f2ec8d0a91fd48b7fb30f9d146c315812647477608bf303a13ee8ef91290e SHA512 18357a2905d6fed98173361c8b574bca5501844d11f3887f913fb9ce0d3dfce1e181188b93d2a21c9a4e24229afe4037a0c3a7877d521d2f43464d94dae1b7d0 WHIRLPOOL 76c441e8ba23e2067e76ed06ad3db061ab9e99647ad124b1f5ebcf14d6ebf6cd82cd11651a5a207ba97f39a00aee44b840deeae1e098e631fac99378008376fb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQ3vIRAAoJEMbwO6tnXQ0sKl8IANg4K69QeyZdvViuZjLIMRnK
-EcUJPVEwgK6a4dC8bsvtJANghgaP5R5cr2HThbpv4wx13GViVajkCxKxzy9t0FC6
-br2DvitdiI/1BBRRZx7benY0J3w1fS95HPRd7/CTpBn1xBejl5yFKPGFE2zVjpt+
-xgaB8B4uNA1QFWYXcB7R7ANqQfSihTdMuJfXM9GuicNudsy9ACgdNySOMs9Qkq5I
-0WmwtKiG2kBAmbWwxwMIB1gMhOfe4fToyNyd+/45wMLDzkkecuqd7a1wA7RyK4V7
-+B3PqqnB2/JIOGKvE9T8GR4a3rUPN5z4xgHLQoJikiETRlkb9Djs4LCWo2sLnMI=
-=Kv9C
+iQIcBAEBCAAGBQJQ4ShBAAoJENXLsxwXqFxyhLQP/2qCC2viVm3Xs1Yrv1HXZYLg
+SHFRPTyFjHJLKzrLbKfcTZ8GriYmUl+Nw/Wk7bS+ENaCJfBEYAhu8+2Ko+vEmN+a
+Lu1W8SmbsKXrruSVzmEh40OVgG8kSXn10xkbTwNAtoUxXACP4P5zq5K3t9A4qGbC
+Vjp4JvZ5bnCC7QIpdjXc1hIde1RP+HREMVcSEjjik1ZK4k87NaOEL6/krvKBuItS
+z8MErsMzX1LWDHAGsQOgRC8jueUE9UwDULLTRhyWnmXo46VI81mrIF+5ILMfUw7G
+DV6Caq0bOFYaYQMHm82EvsJ3gsldcIoDdsBMZe9yPlD38pGQsllEbWs2G66wtQiZ
++pIBMhGTuH3U4K3be1BAmGkLk4YOGxah8/8jJ4t73JOrjIkWR3BrT1yYcJu5l7yD
+1lRZAJDpFBU+TG7DwnfLbE1ZJlr80jZb3nAuYUP8QCqOiS9N8lUI8xBDUsXo4LFJ
+DpsDZIQh39wJcj9HIpHFCzl4jWWKJ/WyvPEeSJ1QxJPd6vSmUJA0rgrwrmcUIasN
+TGJxXPt/4wf/7RpxspLOeHNOTdwaNinQhAL5St4gkfduzB6EeqO7kLFxsPGNMY/K
+sw2fK629fMot+WzdjOPRgBjQkE1EbY5bp6uDcZ5hvBuQQ+QnB01l997FxF2S+ir3
+OzAtVWD/DrLE+CRKI91x
+=nwhM
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/qt-gui/metadata.xml b/x11-libs/qt-gui/metadata.xml
index 3bc889dacf06..66d14b70e816 100644
--- a/x11-libs/qt-gui/metadata.xml
+++ b/x11-libs/qt-gui/metadata.xml
@@ -11,13 +11,8 @@
 		<flag name="glib">Enable <pkg>dev-libs/glib</pkg> eventloop support</flag>
 		<flag name="gtkstyle">Build a Qt style called GTK+ that mimics the active
 			GTK+ theme</flag>
-		<flag name="private-headers">Install the private header files required
-			by some QtCreator plugins</flag>
-		<flag name="qpa">Build a window system agnostic implementation of Qt</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="raster">Use the alternative 'raster' graphicssystem as default
-			rendering engine</flag>
 		<flag name="trace">
 			Build the 'trace' graphicssystem engine which allows to record
 			all drawing operations into a trace buffer. Later it can be replayed
diff --git a/x11-libs/qt-multimedia/ChangeLog b/x11-libs/qt-multimedia/ChangeLog
index d0864d3efde0..6d87040e4de4 100644
--- a/x11-libs/qt-multimedia/ChangeLog
+++ b/x11-libs/qt-multimedia/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-libs/qt-multimedia
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-multimedia/ChangeLog,v 1.74 2012/12/29 13:42:19 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-multimedia/ChangeLog,v 1.75 2012/12/31 05:54:05 pesa Exp $
+
+  31 Dec 2012; Davide Pesavento <pesa@gentoo.org> metadata.xml:
+  Cleanup metadata.
 
   29 Dec 2012; Michael Palimaka <kensington@gentoo.org>
   -files/4.8.2-qatomic-x32.patch, -qt-multimedia-4.7.4.ebuild,
diff --git a/x11-libs/qt-multimedia/Manifest b/x11-libs/qt-multimedia/Manifest
index 25b7900cc772..c31d42dced84 100644
--- a/x11-libs/qt-multimedia/Manifest
+++ b/x11-libs/qt-multimedia/Manifest
@@ -4,16 +4,22 @@ Hash: SHA256
 AUX qt-multimedia-4.8.0-alsa.patch 2155 SHA256 49a54bd39627b1070b106519cdff1fe33aec6a5755658c20270204b2ba850f7a SHA512 725dc78b861c82393ecd97ce293f9c165067ca940332fab22ecc252880e1c08aae301d54ddcdf38df9d32907c57bc70d772891a6dc9fdacf740de32b363f4aa4 WHIRLPOOL c5359f79a53b4d488c346e2d58924e21df3deabbb87e59762185afe43b05543578a1bc2d2bdafa31b1a345adf7a287851bde3a963c56ed1cc686beb14cedc321
 DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79
 EBUILD qt-multimedia-4.8.4.ebuild 1525 SHA256 8f94c52515a32ce4d3eba07db8fd76b5ada98bf146703a5c321b862e7bb8d65d SHA512 082491fcc98a2f0236461b1a227189e6820fec6029631796e8885bbbd6177564b56d18187b8edd53aa7355d9582a1d29f67b04d058ece2eef8e8919dfd4eeb1a WHIRLPOOL ab7b3c83c68409057e4bba58362a5935e616f543fdabb3cd4df4f24f1e9d99972b837e5b6ee0121e4fe3b8c3bdf17823e092c51c9be1678d456d411fc660a512
-MISC ChangeLog 9702 SHA256 111d36d2b2d3a85aaa21e64cde031c5323ca87ec2e0a2663901f9a14fb31e5e1 SHA512 97049ce8f9c021d8ad0620e6f1385477f467a1cfcb2cb928400a77673bb2f8ef2cfc879cbbc1743f824c5689d0576921b54b62131d6de8aeaa91cbb12947f5f1 WHIRLPOOL cbd78bc1a5711222db4176d6e8c0ff0a3a2fceaef50e1578901064e3be22152378deb859aa88ff97d351743c01bde3e24081e8ce105bcd9b28759e16fb1de6de
-MISC metadata.xml 562 SHA256 b723cf2b12dab4eee959da9b8de3db6adb6a87431e2e83c1a825e891670c7938 SHA512 d2dc00c1248bb83d0f60d1423865d21aca4fd2a308956578f9382c7ba0e95a311a6b1b019fefbea56112100da647d7c361240c6aa959150ba03b440cb3fd443e WHIRLPOOL 7833ae095cc6a0ff83342cde8c116adacfb024f53b9339f8f97fd0c62f231c9be83205e3ddb22838095341d428d130a30f6a899ab52d4cf9358b56e0be99ae66
+MISC ChangeLog 9781 SHA256 a8b9089ce6d681842b10baae5f20c9af547d0efe06cfe7fbca5d5f3a0ac891fd SHA512 ffecededc62697baea605277ed2283fb0dad39f6172422b2faddb9a110483c936645f2069832a588e5e62153a01eecaf77ddf30d545934bd7acbe75179bdb801 WHIRLPOOL 193c386fea5b48bbf5fbf48a104091e4174120500c22f6a5c46a97e15b2cdea7134fe4a4534655428ac70dbfa24c00ff19d2272719ad2821680f3f4c38a6dcae
+MISC metadata.xml 484 SHA256 e4f3a32784240897cd44c3c645b61cc8a6ff19bd821be35a00e5e8bc02085cda SHA512 ef88ccf92f3d370f7c70c18eb2727b279ddbcd04ce734014b02915b8ba32bee8a8ab2a3608b58b0305c48fe8073af99184b69940413ed2101be64bc50ee7ec11 WHIRLPOOL d68e07f14ea07c308a25487c89f382ac47ca9adfc43a6d1e641cb057b36537eb9ce860bc5cc7bfc702bc75d4ff49ffdee016a6f4ef70df27670f5fbd9753390f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQ3vKBAAoJEMbwO6tnXQ0srsQH/3ubp1j1F+pzxh1Etu1L2G49
-beS2sb1qD/O/4JQfc9jXGZ8Q4UeRy2BkIMKzmZTkafX1weJ5ISmo7Wl9GNotwzZH
-AFInDoxI6VQkY4+n3xorHif0w1DBAH+wbjstdy6+xI1/+0hWx0AVXx/3FwaBTkAy
-HJcwscntpA10Dyq89+rW+lXwcfCNtTlAI5+p/yvTVmTls1z6XeQ0vWIxzp11uBoA
-VwXCtWZ31uQkYD7iwWGgo+P2TSuaLAyfRT6yJf2uDvVQ5O8GHHPeSKMfv9UqCk+s
-ztZMWG43LLI8HfZ8GTFOqmdPkE+6xfdnYntyuWA5b8r2AlWXbgov3RlB97KEHAs=
-=SPIT
+iQIcBAEBCAAGBQJQ4Sh9AAoJENXLsxwXqFxyG3kP/jjh69OjK2zp0yQrPHznKeVZ
+HE3UcvdM6L4fSBSsuXeo/bNk0YM17gVMF6+4O0qop/i5UT2YrR4SCcE6EOqPrabY
+eXFh1IvkIjpQSEVPlvlFbVLa9Vk2YH0XBD9m6gXsBQCguRvv28DLKA2ACCiE+FD9
+OQcutYr0cLXZN0oq04rM0e1qYp4isi1PBejW99dzGpjSqfreTzIDBSTk6vKyqChI
+K3ZXvfgnZuDNoW+ukLBaKhzmaTQLM8Qasg1+A/XrqlUk4Zsv/g/YKot4dIyZaYk5
+GCZPSQRrsamC3nk7B9anDNF2fHLdPQwMMcjmSyU5Iimig7Liwf3LasMQEPcUoU5d
+Myaeve16tlNZ0iD0rR6H0nTBeSUlSILh5yH+HZa3zLBfnBBDHJe9+WyzAu9w0RIc
+wFghvam2liwIW0MS3UxIlFUxXuW4tFxSw0z56FGpQBAmj78AeVpdz4nRCoQ0x05e
+/g8iqsYzFd5nk9M2GPu1P90110NHb+KiJb7N9LSvyzM+VFYbh3qmNfnz11xeunpc
+4e2NPBQGvyPBvYMla1MO5JhGVMXapFV40aR9IpPrWDgSPIE2At2OajHTsVMk6Z6u
+2PuxaWE8OLVVsiXooppjguyciqWqRIKR95hq5KxCRb3AEvZkng/wXvizVi67SUxp
+NU5bQmStE2FiQ3KjoV1m
+=uWtd
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/qt-multimedia/metadata.xml b/x11-libs/qt-multimedia/metadata.xml
index 1698ebe6b82e..93e5fd3f1e69 100644
--- a/x11-libs/qt-multimedia/metadata.xml
+++ b/x11-libs/qt-multimedia/metadata.xml
@@ -6,7 +6,6 @@
 		<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="qpa">Build a window system agnostic implementation of Qt</flag>
 	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt-project.org/</bugs-to>
diff --git a/x11-libs/qt-opengl/ChangeLog b/x11-libs/qt-opengl/ChangeLog
index a1f3180221aa..5e9edcc3d5cb 100644
--- a/x11-libs/qt-opengl/ChangeLog
+++ b/x11-libs/qt-opengl/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-libs/qt-opengl
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-opengl/ChangeLog,v 1.139 2012/12/29 13:43:19 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-opengl/ChangeLog,v 1.140 2012/12/31 05:51:41 pesa Exp $
+
+  31 Dec 2012; Davide Pesavento <pesa@gentoo.org> metadata.xml:
+  Cleanup metadata.
 
   29 Dec 2012; Michael Palimaka <kensington@gentoo.org>
   -files/4.8.2-qatomic-x32.patch, -qt-opengl-4.7.4.ebuild,
diff --git a/x11-libs/qt-opengl/Manifest b/x11-libs/qt-opengl/Manifest
index 6bd49c8ae2bf..c677d87f3f4f 100644
--- a/x11-libs/qt-opengl/Manifest
+++ b/x11-libs/qt-opengl/Manifest
@@ -3,16 +3,22 @@ Hash: SHA256
 
 DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79
 EBUILD qt-opengl-4.8.4.ebuild 1443 SHA256 42b6e0079511d7698c92cce7a4225b7026fdf09625f5f872961fb41ef944ec06 SHA512 4ec4f1f8bd64363e6d823fa4586bd61e01e7c7fcc4fcbf1bdad411d9cfb03c967982315030382e67caab4e335d720cf3717ea53de35c45aeba195b36f2065983 WHIRLPOOL 2050a441001c08ceb230a8496b784aaf091a9258e63fc418705134061a8ac182cf8000475969112186f02ec707eb2a3c90f2cbc171a8e2a2f4a0073bf15c73d9
-MISC ChangeLog 17287 SHA256 e2f599cc6405765572b8e7cb91d6881c1c90a5ca51a2860da323b01fe9dc88f0 SHA512 35cbfb1b0e694a29649868527bdb907ac173eba3bbc3f1c61fb255e6310447933c6480fc1b4a1df1d314a551c2e482e0c50853089142c1bbc9fd5d335a141eac WHIRLPOOL b2fcd05e934cdcb32d7ae6d096656a8842b57a24bbf24672868095e66f0004b95d3130d6f9c88d507221c56c7b92af707b209a06c514a37044dc5206c6bfcb63
-MISC metadata.xml 736 SHA256 b68835642f5cf4fd222d5b9e29240b32184a8c1f04c4aed05d6a394bfa3887d1 SHA512 45b3e12ceda217a3b1994225b0916a8b912cb472eba078f1f22dfcef50a54b85261101b046c03dc7cd3657bf37c5735385ddcde39cf1edb3b980f55e72c90542 WHIRLPOOL 8af6b1062637fea0e5976069f5d8ad2eddd85583d338a0557d71fe5c307dea3a49ca2175c1146409db2add833857d2e7515ef4e790c3179298fff6ed0a9f76e8
+MISC ChangeLog 17366 SHA256 0496901bdddba6697297934474d4cc80f2037126c9d586a24322c604ed8feba4 SHA512 b247ca57ed0c510a8fe5d91c3fbde6d7b9c83f18c0929c6a34da684e0f39b3754fe8659f90f8f2dcaeba8feb5c2f236d12abf5204fdb92136d9e448f552cd12a WHIRLPOOL ea25e41437494fdd894ba738a6f510dafd4c43642b4f5eff6681a97f1382be75a40dcb90351492f1c4763ba42c647921a0cd8ed182cfb8e4c4c404034557ac05
+MISC metadata.xml 658 SHA256 7fdec67782aa5420b8fa978bceb6a109ef6e2f0cc0b466489536f8eb7ef329a7 SHA512 69d59057bb9873e6a7d99269346c2d3d4f1cccbe0f3b1dc08ff7abb1bb6196aebf9d2c763a4b0c07401cb0a8c8103784fa9c79254551c70a210a1df61b35069c WHIRLPOOL 81d2b4d2b324f87f25f1b4042efbe532900eccf5313f1fc5ab4649293a560e55660d2afbada1a5d066483b548b658edc2f8e86fbd1767c66e3aba7867173d62a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQ3vK9AAoJEMbwO6tnXQ0sOYsIAMiXYOvJznuVNp85s6L8MCpF
-wJ2N7cPfSKVlEJgqnl6lAyJGcNyLrEYRZ/ETNzlGPKr1wUexYE751y7WhGyc4I06
-jKHBQBuONrCaENic3ZP+28s5WwpI6iEnWBuHhd6NJkbhhQQR8dNUln34IgeZH6BX
-0UlpKjxgm8/3dor7TIqZG4Pa8TUPeZ2xHvXwbV16jivfKZRLG3+Q2oI8Mvg15Ti7
-7t95bCYoJm+PVfCRdcY4biXwJZKQm8jPk6DV8u97WI4o6LdoizXDAW54uAN6A7kL
-g+cjR/VQLaYL0QUj6WxM2rrWpkKPE8NmgsY65WVn8D6gUzLbZONBQc0w+PulfOs=
-=GB2o
+iQIcBAEBCAAGBQJQ4SfsAAoJENXLsxwXqFxyO68QAJzeEKXz/ovHgdqmEPk5NB4z
+Gr5AlKUpYPOBaJhv+f50fu5hXBwelUE1Mahp6Ci+xTZEfiVdO3LAJd8ny5l0MzX/
+e6Mu0Y1WvdNHI9N/XNOBLNbd2Q/vE5l30moatZG3qNRpAGqhzo7Wtzsuil4t0tav
+ewgC+SS99vzMfSxTzpMECxsVsw4o/gQf9p7o8tDl+Ay46ixcBvujfZE1JtXwz1Zb
+JQB7754AcGEqUPFmu3VmgLPMJeCJS82g8pKONP43q8iIlHMpcDthx4L9yRnK5Yvn
+lSJXvPFdDVy+XQfJQxUOgN4vwLgT4+tKyumUKICJeJqqNRuv5LNm2M/X7WnEwZ0P
+3y8MKIa8emkcheVXD96fNjMbUf4Fp/FAVhngzHJ+j0medLf6evSP1leqaCubVdZA
++52C4K4Ugem8o28H/ZEJp2JgZlDDQaw577/E6tHDzKGTp5Ei3Q0bAntdDBdDT/4O
+O0hWdQu7upANopTIPgTri8aqlMgzWgENSCxBOaeHeyc1Lhw3FyDnp6hwYMPwaxU1
+Z/XsvzxioVbc3H7nM5DYYsb1Qz+yfJyS0+kVfoW6VUeeAWy40nLJUyOUcIq7AiRq
+qINzcf7kgkujrR3qhRr+5cAdChVnfEUEhwzIHx0IXDOOdBnDCac5dP+p2G6X6ctm
+gHF91nPQ+Ct9zy/cgkuf
+=ZAv1
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/qt-opengl/metadata.xml b/x11-libs/qt-opengl/metadata.xml
index e6b34068d7df..6fb8805f1644 100644
--- a/x11-libs/qt-opengl/metadata.xml
+++ b/x11-libs/qt-opengl/metadata.xml
@@ -8,7 +8,6 @@
 			contexts on the desktop</flag>
 		<flag name="exceptions">Add support for exceptions - like catching them
 			inside the event loop (recommended by Nokia)</flag>
-		<flag name="qpa">Build a window system agnostic implementation of Qt</flag>
 		<flag name="qt3support">Enable the Qt3Support libraries for Qt4</flag>
 	</use>
 	<upstream>
diff --git a/x11-libs/qt-openvg/ChangeLog b/x11-libs/qt-openvg/ChangeLog
index aaec3ace4096..e4a028b6a92b 100644
--- a/x11-libs/qt-openvg/ChangeLog
+++ b/x11-libs/qt-openvg/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-libs/qt-openvg
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-openvg/ChangeLog,v 1.20 2012/12/29 13:44:16 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-openvg/ChangeLog,v 1.21 2012/12/31 05:59:38 pesa Exp $
+
+  31 Dec 2012; Davide Pesavento <pesa@gentoo.org> metadata.xml:
+  Cleanup metadata.
 
   29 Dec 2012; Michael Palimaka <kensington@gentoo.org>
   -files/4.8.2-qatomic-x32.patch, -qt-openvg-4.8.1.ebuild,
diff --git a/x11-libs/qt-openvg/Manifest b/x11-libs/qt-openvg/Manifest
index 6b19cbc0e8ed..2f7379e01de5 100644
--- a/x11-libs/qt-openvg/Manifest
+++ b/x11-libs/qt-openvg/Manifest
@@ -3,16 +3,22 @@ Hash: SHA256
 
 DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79
 EBUILD qt-openvg-4.8.4.ebuild 1317 SHA256 827a91d42562ba75088c215633f9b101214a9c234c692c9126a79e716ac4d0a8 SHA512 8fa8c4236c36279002ab29a728e46e8d31880e020268b7d2e882639753f89647b79f2ab43eab7fd9a274668839fea605f7fc4221ab99816b5a3fdf2f7af538ae WHIRLPOOL 306cb3adac89739eab89e4b95d80c69d9560f418b71582001132d806b3d2bb9ae3531a439a3ba7c727ff9237f77a6a547d19cf9bf4a0a7d3350b4a9488037338
-MISC ChangeLog 2837 SHA256 02b6d64fa56d47e3967f48d528f437a468b6ca56f1022b36a695e4bf1544c4d6 SHA512 8ed1a637726732e40d5a9742a898572032d4d175f3754f5b0b9859bb02dcb761928aaee2c49bd4a78e87a9b2c53f35a703d95a701f9ebcdb3aa21a375baa91fa WHIRLPOOL 56829ac330a7492d5f4460f0e8fa29b4da30cfe86045fd4ec7004271dc9ccb9786c607f4f06ae591c0e89e8ff63d55e9518888ada90f00844cbbb2f4c4d5983e
-MISC metadata.xml 572 SHA256 e846922bfc3cf62f90b17602766f59a04abe218e1c139cf61408e56052a83d28 SHA512 f903529cfb430b5e8dcc134d5dc3a90c9f668f41b9e63d83229b2400a1be3e548212b981c0d6f67c2129236e9de10a0a7f011a4c144da571dd6725606fe1a03f WHIRLPOOL 728e8e91e0cdaa9d16bf332b382a1eef9cee1226cb78be8d79b225c21f6a516272f882f50146a205b44bd4820f6ca933b64c3486014476f722a4d5e6290627e3
+MISC ChangeLog 2916 SHA256 c36a49c97f09f83c139682122f4d9e4b2b2da7c6cc247d98eea044dbe04ecbad SHA512 2b9fc2f579844c446517fbdb8d36febdb828767aa9ca0dcccc717e1232ae2e21ab2a084c87657e7a0697c574f607ca2f541b24e1ccb5b707eac75904485f7aa8 WHIRLPOOL d8cdb65e2d0aa035c14b103a7cad70c3a470de160bff79b2ed46d977dfdd9772959a2c440a757d8531c6291f7c7a3e1d4baef025d5af8cfa876264a6043aade7
+MISC metadata.xml 494 SHA256 167240e11d6a37600d1b71d53e3d7fefd67700ab1ad10c7b4d3bc04adde84431 SHA512 30c3c4b8bc1e898934caf7de5528b6088130fd094386f5e0804c45cb7d9b85a06fc50fd9b4c0ac584ac26167d380525ed3382a61bf02043efdf3fa4dbbd14757 WHIRLPOOL 9b5c7ad3f0e08e3d680592550d0431fc942bbd06b142779494dbcb65b449bc5b8db5aebe709ca208fc748ae5c506a2d9c673bdad0a132902a692d9f6822dfbc2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQ3vL1AAoJEMbwO6tnXQ0swVkH/Rm00iUjxXBMQsJZkc9CE/7Z
-qGQLYY1hfN55Yzl02ifrSUn/I5fqFku0hWOsl+KEwDLyeO0nGoGPB6jcsQeXGrJc
-y1HlMEjAU1gSq0/P3A+yw6yqiNyhEFy2/ETAhN3vX6BFRWqUpyFBdRlCwT403aHK
-DMsfI0wYso84MRcPvsAH3y/EogUGr0RhjdCopWkGvySHU8ZsOgyRWEHMpzISQWUV
-rxQJloQT6O4ShGVTKDLIuvOltwJmshKMh19fcXIxZMenQt3pRIN7BVzXTNcwt3j5
-W+CXkTkFwD/FvOR+tRBKQu1wkNcfYknGYaQu9vB+R6g2NxkeqPBH/nGKIwnQnK0=
-=pNYA
+iQIcBAEBCAAGBQJQ4SnJAAoJENXLsxwXqFxy5qEQAJEnD/WWVN9IeuO72P9trzLU
+DCvvnObU3sqxns9sqnOaL8mVfDSyNzWiNp11XZz9ZQQTQFZO99PsChWLgfb5RGQO
+BCBo7hXBIBijtIIdqc+4dPgWdS25eoJYjzmeR4hy6Qh10eLVagzY/qbRXwPz3tMT
+zbbBtPkBDqgMB7H9KqHRrV67w109WrJc9y1gXaWQq0g7hxACx6b2Md2I+iSqwXaY
+IklmL6XfTGKQBAa5MEhvmyU03piEejR89XNQC/KqvQkgK1RLqPxs10sl+CdliizA
+Bi3S6OijHhJP0VBe/wZrjPFZMpgpycuhvkar+vv+Oq7vaW2SqdvACU0KUA8Ezq5s
+lnh5wCnJGLu6s55T7M7dUSvncS+Ax4uYZq/6xiReX8qdfEa4NCww9Y6VJ1/juDd0
+9TTvwrUY4W4MFBAfhoXfhAnL6TbwlsEIqJgJOHGeywFtSO4jHpddmlcV6OCkFMCp
+Ehu17jaBGvvjRy6mQTPakIkeDV9Y/Z9lo8nf78h7io8/5Te30Gehm1jxauTf28Co
+fUuGWa7u8N/r+mn2HCFBmUgGlUYLC4MG9LB6a/U1rPzVnW7kVKxMR1mkP4MIPN3d
+5rt1+IkYELnjyVF6xK9gjHfTvfC2ZCWcnCXBeJ7V273ApuxlKN7uNtVvNxPtT8tX
+y0vJ47+58Qx78GIQzOSB
+=qs2q
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/qt-openvg/metadata.xml b/x11-libs/qt-openvg/metadata.xml
index 13460111165d..472a8cbc7148 100644
--- a/x11-libs/qt-openvg/metadata.xml
+++ b/x11-libs/qt-openvg/metadata.xml
@@ -5,7 +5,6 @@
 	<use>
 		<flag name="c++0x">Build Qt using the C++11 standard</flag>
 		<flag name="exceptions">Build with support for exceptions</flag>
-		<flag name="qpa">Build a window system agnostic implementation of Qt</flag>
 		<flag name="qt3support">Enable the Qt3Support libraries for Qt4</flag>
 	</use>
 	<upstream>
diff --git a/x11-libs/qt-script/ChangeLog b/x11-libs/qt-script/ChangeLog
index ae3772435017..5f651e629778 100644
--- a/x11-libs/qt-script/ChangeLog
+++ b/x11-libs/qt-script/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-libs/qt-script
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-script/ChangeLog,v 1.145 2012/12/29 13:47:10 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-script/ChangeLog,v 1.146 2012/12/31 06:01:11 pesa Exp $
+
+  31 Dec 2012; Davide Pesavento <pesa@gentoo.org> metadata.xml:
+  Cleanup metadata.
 
   29 Dec 2012; Michael Palimaka <kensington@gentoo.org>
   -files/4.8.2-javascriptcore-x32.patch, -files/4.8.2-qatomic-x32.patch,
diff --git a/x11-libs/qt-script/Manifest b/x11-libs/qt-script/Manifest
index 5cc175641da5..833d6da959bc 100644
--- a/x11-libs/qt-script/Manifest
+++ b/x11-libs/qt-script/Manifest
@@ -3,16 +3,22 @@ Hash: SHA256
 
 DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79
 EBUILD qt-script-4.8.4.ebuild 1600 SHA256 35d120aeeb4338cf1aad6d2b12764d97da7ba7db0ff95454fdde3e0479fd0f1b SHA512 289b2dd0f502742c55c25d2e4070b44b365f79bf67f17d363e0a0984cb489dd6552f3382df841eed89974ff501b936b6148100b4dd81d9bd9bf8e6bc80a118fc WHIRLPOOL 4ca06d4ae9f283362b3221bfb252484a19e8508d6ba6379f01bd8aa3cd34660b1d0c1b7fb9e2b216a34b77ce7d01fee28dcce3e309d3656e95a61957f9256a52
-MISC ChangeLog 17989 SHA256 ef14609c3c923a2add74edb0e3cca4765d28223421d8e1ab3b94d580826fc61f SHA512 1ceabc6774d8a598e6c89206004b01e903f201cc3d004912e098fd67a295fbf3ee3576273e52b009059a34bc0fcebd36497c6b392a9c9b84595e00f45f91a776 WHIRLPOOL 3e9473c388bfe1776e35a13f8aae3a0b0f4ef005cd86c66201dd5e80957df501324aa058bfcd08e90b6d69b1cb2478129d19c9c0cbe26647d8c1a6a95b3a9b22
-MISC metadata.xml 671 SHA256 d2ab44d3d87cd5c33d716634746a780afb4b647d3c6277282d744f2086e0651b SHA512 3b7d40b520a1d7aacf89ee559abe463ff4f44cc41c5ada3c7c9d2c497147ec52a40fee1645339fea6150df46a651f8d636f83450ce5700f20c84d110df8585f3 WHIRLPOOL 32ea7e0b446afed92eff185db405fb426ae3852090a905d5374dcd4ec319faa7c5c86a0febd63e576a614d84c7de37e92526d127c195eac73c9c5c73c5e0b59e
+MISC ChangeLog 18068 SHA256 d047af29df39f624d768067ab04c72fe3df10f2d15fa99ea53ae457c8b4c4418 SHA512 4a0741dc41153eebf2d04c8ba4fca2616b2b906de428a3bd66aa4b40d2cb84fb50d66a0a875aaf23f5809793114ba742f407e1f250eb16c15e98b1d8c9119152 WHIRLPOOL e6dc7a598cba0b64fd4875f4d6c11f7064150985c5088db0403ac9e159e15d512272df295dfd97305b1836c10adfdad1141b9d5c669b30e48128f62f40444a80
+MISC metadata.xml 484 SHA256 e4f3a32784240897cd44c3c645b61cc8a6ff19bd821be35a00e5e8bc02085cda SHA512 ef88ccf92f3d370f7c70c18eb2727b279ddbcd04ce734014b02915b8ba32bee8a8ab2a3608b58b0305c48fe8073af99184b69940413ed2101be64bc50ee7ec11 WHIRLPOOL d68e07f14ea07c308a25487c89f382ac47ca9adfc43a6d1e641cb057b36537eb9ce860bc5cc7bfc702bc75d4ff49ffdee016a6f4ef70df27670f5fbd9753390f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQ3vOjAAoJEMbwO6tnXQ0syUEIALUO4KdKa1F7pHMgc84IUGpu
-yBqoQKhnwUs7KI8cyK6QxDb5JLxLrjfPDc+sXV+eJVZQbuq/jd17wwTLeVARtyR0
-Q6z3k9CckjM1OZIA/3ITC4WcoVj0eGuyJ4tx5OeXolNxYrgqz0xLCgX32O17u6Di
-o3QGMQJY4WE38eJtrBi9UvHNEdy97icy5CTC92nKN2am78Glsl/01EUxe5UbjiYL
-UkpQ3F7i/KyWxR7+gRt2d85YZbyfYwSevWxVS/WKwP5rxRF0s7HkvxTFl0E53648
-Ac2S6xQ+fi5NoJM0lWDRXuh2Pee8pWIUPU1WdSQ3+FKoZkVe1bP9Af4/gfBj454=
-=f842
+iQIcBAEBCAAGBQJQ4SonAAoJENXLsxwXqFxyk7YQAKjOO14gAcjjAQIij2wCCZzE
+l01pIAJzxc6xV/HS9leQP7rfO+L/GXVaiQgt+hzDVEjrJ6nNsiMWm4LbQcBYhU4d
+qvAbT7x4CkeVq/3nQNhsRxmrDU6nduAxVQ0yMmBGvrSqUlc3lEeyFWOfb+i9ZmbT
+xivgDmJnwa56TLaaKKA6yQUSXypGq+J8weVPET5PJIbiO9Cc6xzc3cNvNGk1dEYK
+FUrIkntZIg2bzl3GNdHFiml64CN2Iz6sngD5DKI9IMpxXT+YcG7TcStkkAMnBhvv
+Dhj5l765gbXNh/yEsYzoh53u5WJllpvfGWYVq1uVFy28iKV70p8DSDN1qVcGrfUB
+cu3Eo2adrZ4GXjKUez7im/AD1n/g3jEcc2FAVsI3SEIIukyk6yEHo7D5jiTG1blv
+iT2KP8jgyeg+P7dkXDjHTT0dRVUBNBmzrOdCf+eh9c+GsgC/E10G4H4GWytOTrgn
+aS8Ske0UI+IXL8+pPwO+zOfQgEDNBP1xnXo4zqY4klpqAL2MRmn98kn1F9plIIMb
+vpwRYudu8kg2LwzRXw+PRWTgi27flwbGfaOCZ9omRpEW8V1uUd7ZRwehCQ/y9uKj
+8jATLziy5hOF7LA39nXRROOF4pMHetMFrvm7TZRsmfghvnCjfcIdlTen1cwWUK4f
+CRWYUlCfMTadWYa5jG7F
+=A5dy
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/qt-script/metadata.xml b/x11-libs/qt-script/metadata.xml
index 5bc573cc1298..93e5fd3f1e69 100644
--- a/x11-libs/qt-script/metadata.xml
+++ b/x11-libs/qt-script/metadata.xml
@@ -6,9 +6,6 @@
 		<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="private-headers">Install the private header files required
-			by some QtCreator plugins</flag>
-		<flag name="qpa">Build a window system agnostic implementation of Qt</flag>
 	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt-project.org/</bugs-to>
diff --git a/x11-libs/qt-svg/ChangeLog b/x11-libs/qt-svg/ChangeLog
index cbd4bbe8cd59..332f9ce9c5cf 100644
--- a/x11-libs/qt-svg/ChangeLog
+++ b/x11-libs/qt-svg/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-libs/qt-svg
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-svg/ChangeLog,v 1.135 2012/12/29 13:49:19 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-svg/ChangeLog,v 1.136 2012/12/31 05:48:00 pesa Exp $
+
+  31 Dec 2012; Davide Pesavento <pesa@gentoo.org> metadata.xml:
+  Cleanup metadata.
 
   29 Dec 2012; Michael Palimaka <kensington@gentoo.org>
   -files/4.8.2-qatomic-x32.patch, -qt-svg-4.7.4.ebuild, -qt-svg-4.8.1.ebuild,
diff --git a/x11-libs/qt-svg/Manifest b/x11-libs/qt-svg/Manifest
index c67f8f0f0111..399c60fbe055 100644
--- a/x11-libs/qt-svg/Manifest
+++ b/x11-libs/qt-svg/Manifest
@@ -3,16 +3,22 @@ Hash: SHA256
 
 DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79
 EBUILD qt-svg-4.8.4.ebuild 1502 SHA256 4b06ec0d3774403fab1b245d4ae61e47bad34448d95496a88daf85e06b5cddb3 SHA512 ccafbe319e90d750bf04c3d055650df07b9cc7868bcf167f479f0f535dcbff515ab501fd8ffed014aa28814bff431b4687895ef9e55c4ec62a1571b1e87824b7 WHIRLPOOL dbe9bee9405bf78e3250938f2bdcb067ce29a836f94410ef0c33f746cb957df4d862558dda877b4b2ef1a621e8747828d6beabf450705b18c17a2ce92073b701
-MISC ChangeLog 15979 SHA256 7792ff00245e3afb1ba48538222dcb968da3ccd70d97be38ccebf251f67d5373 SHA512 bdec37ed5f2aaec77cdbc00be2d94b26aeb7c974bfdc9b74dc6f92eddaf4ade4d3ae957f45819d3ef3cacfe0fd3148c4d28f8d2a718405d754a559c81fabdc71 WHIRLPOOL b29c44c8ba58c3056cdc5ec9d707badb07d8087036ddf7a7f5152540d624534afb938331a4835fc363daf3c685c7f2a777eafa951b4b16d45e7a5d5009733629
-MISC metadata.xml 562 SHA256 b723cf2b12dab4eee959da9b8de3db6adb6a87431e2e83c1a825e891670c7938 SHA512 d2dc00c1248bb83d0f60d1423865d21aca4fd2a308956578f9382c7ba0e95a311a6b1b019fefbea56112100da647d7c361240c6aa959150ba03b440cb3fd443e WHIRLPOOL 7833ae095cc6a0ff83342cde8c116adacfb024f53b9339f8f97fd0c62f231c9be83205e3ddb22838095341d428d130a30f6a899ab52d4cf9358b56e0be99ae66
+MISC ChangeLog 16058 SHA256 bfa073d410ba0880c7c35514b62f988533e90b3b624c07cec3c7822602667c57 SHA512 e193e9a76c5d6f4ed59d3bd2bd76c1d85d828e3b82103b42f6a65768d9012d68ea15bbd6d11bdf3beb25337365dbde8978214d1bd9b06c9bf7b668db9ec51786 WHIRLPOOL eec754895b05c6db74365fec1173661766871c20b2a5206070f0bff15de55960730b393ac8960e837d8cfc420adbe453430fe50c01cbce936569bbad78ce6fd2
+MISC metadata.xml 484 SHA256 e4f3a32784240897cd44c3c645b61cc8a6ff19bd821be35a00e5e8bc02085cda SHA512 ef88ccf92f3d370f7c70c18eb2727b279ddbcd04ce734014b02915b8ba32bee8a8ab2a3608b58b0305c48fe8073af99184b69940413ed2101be64bc50ee7ec11 WHIRLPOOL d68e07f14ea07c308a25487c89f382ac47ca9adfc43a6d1e641cb057b36537eb9ce860bc5cc7bfc702bc75d4ff49ffdee016a6f4ef70df27670f5fbd9753390f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQ3vQlAAoJEMbwO6tnXQ0sb7EH/37zArNXsiFcLTGBLZmAKc48
-h9XhOGpDbW/1HjHhEl6oa5kJhu/6molCQDXNkHS7SptdSyTe1GrhXLXDzU4fAoGh
-uCOwrnSe/XMsJulKGXlVZwCD+d/lrEKtk6/Z7YOFSRZagaDFSamGWpc4ySL+0aIG
-UIXSMff0qnT2CEH7n5HZzvXU3/G6m9j1bXJL8tzokHpfVdS1ukl4szv6C7jp9oBz
-UTmUQMgS2iRoLtLr7LhyTIH1IKsZYz180e8ttzJX70hp/GxbUaDnjxT+6F/yEF8/
-Vh/Wyrwh0a2kKoi+6Qmq6nqnaje+l6pXA+Or3I0yyt3wsBs7YjeTCGEIc3ZlM40=
-=1OeF
+iQIcBAEBCAAGBQJQ4ScPAAoJENXLsxwXqFxyMH0P/0CB1v6Nv+61Ml+e7VAqeleS
+7dbDiLFBtOiW5YekP76Jjly8JiqFGBXklXPQrjdjLa4THsNnhHgDFDAYUKGflHKL
+o6inLNt5RFrLJybi/wGQij9SM0qumYSSwpyjRThcfTChPVgpwBySXU2XiF4lDvVr
+ldK2o/5wb5aAfeVY+X2EdBpBMpm22JS0RM94h/Wk+BksDgTB8yVMSk9SXEpYVmdt
+vNIvVN5FBK7P/zzUt/f7p/JYfTttX/Z0IZ+pRVLC2eIrhj65t86nk06SG8g49ZBZ
+aa+Zf6kz3p1NXtbHbGCCG88nCAaVnMbQahBaA2k8V800lJI2JwqXqsIa0IE42NQE
+n6qUnLwML1OvMU7fEGnpPLHNmKcZodbQwhi07kMR1HLnX2X38Ccxm4noQNUUi9LJ
+hui8DjroRNqmA2L78yLkDRCnrm/HrIf1bXVSj2EbmdR5TZMKkUwMZP6nqShuj4bJ
+00dcf9TdXmp8xfoBGK8fMohTpFSEkUefUx13ekreAj6wXd44zJkcHQ5wxZjZXrK5
+BCM8WnIXaBwLAPfVECnqE9ZxIEDm2MpNkfNqsTNtVv4wvLbyzuFgwTBeggSB9ckf
+QjaaSveikCj6p4H2qGf9GrTu0ybrc2H357ebL/HVIOdmO8f6kaSc23fmCvkvpV8H
+nOYW1AQ+7V5HbENG3MbC
+=BcI2
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/qt-svg/metadata.xml b/x11-libs/qt-svg/metadata.xml
index 1698ebe6b82e..93e5fd3f1e69 100644
--- a/x11-libs/qt-svg/metadata.xml
+++ b/x11-libs/qt-svg/metadata.xml
@@ -6,7 +6,6 @@
 		<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="qpa">Build a window system agnostic implementation of Qt</flag>
 	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt-project.org/</bugs-to>
diff --git a/x11-libs/qt-webkit/ChangeLog b/x11-libs/qt-webkit/ChangeLog
index 78e851bf502d..981f059af294 100644
--- a/x11-libs/qt-webkit/ChangeLog
+++ b/x11-libs/qt-webkit/ChangeLog
@@ -1,6 +1,9 @@
 # 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.178 2012/12/29 13:51:17 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/ChangeLog,v 1.179 2012/12/31 06:02:22 pesa Exp $
+
+  31 Dec 2012; Davide Pesavento <pesa@gentoo.org> metadata.xml:
+  Cleanup metadata.
 
   29 Dec 2012; Michael Palimaka <kensington@gentoo.org>
   -files/4.8.2-qatomic-x32.patch, -files/qt-webkit-4.8.0-c++0x-fix.patch,
diff --git a/x11-libs/qt-webkit/Manifest b/x11-libs/qt-webkit/Manifest
index afe48342969e..cdae6395a0db 100644
--- a/x11-libs/qt-webkit/Manifest
+++ b/x11-libs/qt-webkit/Manifest
@@ -5,16 +5,22 @@ AUX 4.8.2-javascriptcore-x32.patch 500 SHA256 16c68e343f4bb416b870ae46bcaf80e6c2
 AUX qt-webkit-4.8.1-no-use-ld-gold.patch 789 SHA256 034234a8aabb6ec94966b50beac7c17adbebe20d4c3f2100000152c943da15a4 SHA512 da89a02e257576f67928107ffa34da3b69dbd3ed5ac1059ff63e8e181d7b9abfc97f1f1dbe3804b954192dbe604bc880c6e2c1453ad8a6e97430602a5e5f8cd4 WHIRLPOOL c0b67913410a43823e0049c9d57d694a78418b11a885abd85fe7be671c5e7690e8720798859db67cbf65c8839a57a77182a6bb152fe1f339abcc5b70f5b3524e
 DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79
 EBUILD qt-webkit-4.8.4.ebuild 2090 SHA256 8232e588c846fdc863b4700850f4b7ad86838b2fbcba7354e1b0980bf507dff3 SHA512 64e84c1ba9ff6106e4851618545db7b473db9ab6b444486925cf7e43f07553fb4b120f8920aa01179862f353f85e524dc456c9919307b93a343e71ca33bfa768 WHIRLPOOL b4830b63769192501b233ed01adc0988a0415e117a7ddc249ee0499671e026c7aa388ca1e728c0561c240353b7cb62365d5874a62ef04f3baef00e1a80b0ee3e
-MISC ChangeLog 25974 SHA256 6ef08bb10b80d13bf38f50811c8014474535ae5154a2d90b764fce8eb6e6775d SHA512 81e9e289d3546e1cf8bd5fdadfc38005c37ea85a23fe67e52747e99bb957f941ac6f67e80d0d4a5fe8d33b3fd603f0b6abcf3cb226633b1ef427120eac31286b WHIRLPOOL f150a08ecc494e1bc1969f040cee59854f88b98206a5230bd6b5030ff2a070b4c19f38240e836a154396fb123a69a1a5151982ebbb12e59d78ef8875985e406e
-MISC metadata.xml 697 SHA256 d05df9270865e0fef2c2f2ff57cd6e76e081da7201d231b471d4499eba0a3b8d SHA512 da3c6929d7aaaff373a2076d4f87a65910a01cd78ac9f89ca27c2220a48541dfca8f7268b030a6b6637bbcf8af8e013923740885a60a39b7ce064a66a921d851 WHIRLPOOL eee1d122228f97c71e70ab032f62983981fa456d86a6e8f85d7906bb6ea91451c534b5164028c0593898fdfd3525c4008f642fc9d4ec5a80e84b0baff3529dfa
+MISC ChangeLog 26053 SHA256 cfe5f2afc9792f2476018d38ab21b04ab4c962aed706b60410fcb03a25683a1a SHA512 89a22f0955390ddc873e437d951feefe5664c7cf64319790c285d8366759c698823a00437a419e44a19ef19864b63e7edd77ab46304c241a0e3b7c9dee76b6b4 WHIRLPOOL 880758f0147b15b7d0397f1a7f998bbc21d8c2dbea0c337dd9a277a54a4087674b2598702ca3ea7a60ded32d8ab86680543e8af78269f1823556a0e290d09fe9
+MISC metadata.xml 522 SHA256 6f4c021a3440a17b85509b316089ef738dfad8ed92297c2f5c652be44f4c17cf SHA512 79883d12a8eb849f3657fd6df06df92bc78b30bc845cedcb69255bf6b5dab58ef3029581a03a251bc7afcf3574391c92907118242b1f9afa75f0cc5ebfc92754 WHIRLPOOL bd2a4c8981de43707177e6cfb56942d19ca3c3351ff03e535468fcf1063ea48280aae36edb04d307f6d870ad5e3c6d4245e6cfab3c632f81ba58c909f9346130
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQ3vSbAAoJEMbwO6tnXQ0sG70IAND6vUuBnxkpTLrLh+fnLeQe
-8p758DNNy+ewwH8wHpptpsnOh0yI/wpIAm1vs8bL+VT8f1O6sHQh/ijtkkQ+y9IX
-As2+Hf16GC9E478JEQNpzfmg35OkDqyiwLzioNnRnkTOerHHn0ThN/VgcdykG+/B
-reTBauGN3Qp0utK2KBG7IhSmP2D11ov1poZBRwOOANlpXa/ut/oOGtan8OZHnPWD
-JI/0FCV0IIEeHiO/EU+FMk+wwa1InaI7C1wz1/fpfyxnBdjLoGWQM4n+hH9ppFvX
-BHZRU/1s97lrVylnFcOVKuLUegY36oR7Uf1Xw8PSLL1sdQwpQUm8x6+Jd2h3aVE=
-=T7cp
+iQIcBAEBCAAGBQJQ4SptAAoJENXLsxwXqFxyPOEP/RPZMM+f7gk0sDJA031fPQaR
+F/yWEuczqiwV1GoQx6gnXEDmBhZKofenGvCtC9Ej0aIp512XgSrI/954fauUhR60
+LorVmbri8cl93lmW3csy9S6QJ3dZIL2/Kui0RWSVGEr2wn0YiTk8GJBzVqilYrUI
+vENaqI6NPrpKHvCinlmkhjO5zy+U0frZ5TOKETbc4DNIYgqSxj6zSORAsHmx09Xw
+3auMQn/S2jyedrUc3AAgmy8H8FfRkA6irl6h3U5WzMXOkH6TQhIFe8BRfc1mRG/K
+ikree1ovytvxu1IUrZDLOS/IoyJduaHPPLlTv3YRKeRjZtPRIwPUu7rD5M5PBy43
+LRSebxRpsE9rC48TP4CoDKgk+vobiz/YVzlBuBflripO5nBqrlGzluN2DWJCF3KR
+EArP9Yc9ku5SdHxItAQihXZHpbPUUnnmmnotqnZCMKwv+tr0GFR1Xx6xRiZ/zxV8
+iDMQ6JuPMaM0yRoJhD9w0LyNAaHWlViMWXTPLwkdKdOVEwDiSGoFgQXFi8Vpn71C
+PI/arURKHHezpgV0J5FsS8HOAJkpiFXucbBmw+aYRewZU0PGMEmLOm3QAQThHCq6
+3kp7yDqMP5vqQEaA8HsZz5JzdwKyuy9KHQOZTq6u9C/QmE8Eg7fgoNHOdZQ8GacN
+/oSeWCij7R5s/Bmt9i+9
+=3Dmx
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/qt-webkit/metadata.xml b/x11-libs/qt-webkit/metadata.xml
index 526b2de4f052..62d0753a9cf2 100644
--- a/x11-libs/qt-webkit/metadata.xml
+++ b/x11-libs/qt-webkit/metadata.xml
@@ -6,8 +6,6 @@
 		<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>
diff --git a/x11-libs/qt-xmlpatterns/ChangeLog b/x11-libs/qt-xmlpatterns/ChangeLog
index 8359849937aa..1cdfd829404e 100644
--- a/x11-libs/qt-xmlpatterns/ChangeLog
+++ b/x11-libs/qt-xmlpatterns/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-libs/qt-xmlpatterns
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-xmlpatterns/ChangeLog,v 1.136 2012/12/29 13:52:15 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-xmlpatterns/ChangeLog,v 1.137 2012/12/31 05:55:32 pesa Exp $
+
+  31 Dec 2012; Davide Pesavento <pesa@gentoo.org> metadata.xml:
+  Cleanup metadata.
 
   29 Dec 2012; Michael Palimaka <kensington@gentoo.org>
   -files/4.8.2-qatomic-x32.patch, -qt-xmlpatterns-4.7.4.ebuild,
diff --git a/x11-libs/qt-xmlpatterns/Manifest b/x11-libs/qt-xmlpatterns/Manifest
index d0dc214c1065..032cde80715c 100644
--- a/x11-libs/qt-xmlpatterns/Manifest
+++ b/x11-libs/qt-xmlpatterns/Manifest
@@ -3,16 +3,22 @@ Hash: SHA256
 
 DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79
 EBUILD qt-xmlpatterns-4.8.4.ebuild 1082 SHA256 0d61c6fce76c699c340fe6b57593a8b7ef956bd9710030b527272565b19185f8 SHA512 bb95371ebb7c4f27e5f387f7683ee591d34fe1e7b70cb4f8859a48926c58a0cca6a85d7c7d75d393fb8fc0c8af214b6462569ce55c49a52e1c959491409df510 WHIRLPOOL 01d24d4db798f4b3cf12787eabb3faa8659ab28abec5ef40d4f0a19b57cddffd658b61a85e6bc81676e00fd8c3ae351ff5b694391dae39f4d5220ed480956b70
-MISC ChangeLog 17669 SHA256 c68c3c8061b98cbdeaa4f7c1931f2da73c8dc496672264ad16a1e1c8bf297538 SHA512 1a81439b8172c5912619182d40cab9fb80d3e2b3aeddbc1cdbcea0e9e1a2b0e3b76db2cecf4084f191d77878592a3fba094edc08ff4e76817b6b4b111d34032b WHIRLPOOL 87d18420bc23d3f3d8d492e3a6fea7b00c101393399514fffe20c038f2755eab9e18112334bf78a43dd4a1dba5cb7177c0eb98bc6d03f71a916dd70cd7a21d17
-MISC metadata.xml 433 SHA256 879cb15afc1d1d73fc02463bcddc5e9333d2c3c9a234b0d10d76e825833534be SHA512 6f2f191b69d9777043fc75628a14a4ffea0ad72aa8445fa5909ff3e7cb7945c18f8524cc552fcc40fe48b534995610641ee961fb4d59248970d395a7e1bb75c9 WHIRLPOOL 4e2c13a17786cade138a83e9188e4aa0dabbfe96084bdc3101f6e4829c14d760dd36d30b925aa5ce052cbd04ab70a152bf5a223ea1f390d8f0ffffdfeddb60aa
+MISC ChangeLog 17748 SHA256 c0a607568abdf833000d8b5100168799a99047468bcd7385102f7d07b2e379c0 SHA512 192bc9e3e7b631d062177a971231f4c92dc3eb57c947e689eaac1b19e5a9bb2d245052412e3529c05561f0628e3c0b0799680cd635b2c69baf04bdff6b4cc8fb WHIRLPOOL fd244d5946e9db2b2f45c0286c08f148fae385f1b25ff090e9c333a3e19fc53d2f138dd818e358c17d9ed2c5ed42bdbd5f2fe7361e727acdb79d8444a4816683
+MISC metadata.xml 355 SHA256 606f8fd49a8b418a4de318e62c5d44040136a2c0a4ebbb1eafa8395795d49255 SHA512 95241a16bde7d1487f04aba1043a79983deedc6aa9dcde317be2752f17fd9ec130a30caf32d9dd53f8b5ede7cc992af793fee90786ce7de9233d40e0d93741d1 WHIRLPOOL cbec0d7c8d7a68a3cf9c4020e601ceff9d5fed7211274269af68d0ecc6c3a7f286a192f31b00fd2a36dd4eeef38732a673c66f6bdb6fa4f8fd55e08c0f55a89f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQ3vTVAAoJEMbwO6tnXQ0sSZ4H/0mE0NONqKC6WC2gEZCFIOoX
-AuPJKG388PpPU5FAufd1tXZOx/7yChyi1T2RxN1HATj+o/0YBSUTSqjkeP6zIKbj
-mipHnD3GXeX0aRHtLHpQzQZdFt4Bl1uhw3omTWUIO1PzvGS2Kttp+P44FsIvnmFi
-gXWD0kFILMhuQvCsjg5RB+6IBiaBlK2RLaDwknYBb7kv0zIeWubTaczaisqEvdPM
-h0LOwqZsa9dvN2yrpsRvbTwnKHcyJvvKx++1QfjnrL9WhGP/8ATkcTF9J/j8pmVS
-stlrFnqqJRwqC3dypSwPjqzW/XDKYSqARgx67uCacR2H/eBuWQlEyBSt2ylBoUY=
-=NFRR
+iQIcBAEBCAAGBQJQ4SjTAAoJENXLsxwXqFxyZ4cP/3SVbYVyTlKOPwTS03wC0kvf
+atjwuifGRM5Hcz7qXTBPQKV2s6NjC1/kLvPhkmHZY6a022aPA3I70rbO8c5QeGqx
+5CRZbG2I66Q+inK3pRTasDhK34D9J6ezRWUA5mEgLVS7axRnnuyTp7w4Yas6b7sF
+a30fBmQQtVXGbsxUnmmBnoyHmCz+H9+m4R9lONkNLHVw7w0LgNX0xZUPh2D88IoI
+8YRHnD3C58zneU+4irQWTVe9VVnYiUpE9PbiK9o3RSL1PISzQlJQ+mTiFRs8c1tV
+ngpsX7vjNAM4at5a9pPNwHpgk6qrSBwXOw8RSxqMsmOdKeKpaHzEAWsaOGe8bZ+S
+Dca8oAao+Q268f8Oue6Am5brWFEygBQIBO+o7T5OPsJTephV69v7Se6eBfpY5Omw
+f9eC7tCHuLl8HX4aKMq1NCwAanL5c6B19nOLMfRXWey3bVnO8/sh8grHmgsHYzJK
+stD5ESFg6RsCcHHSin2N06wB+1Rcw4FV+fgR3jMIF00Qd+X82ywcuvzE94TcuHGa
+8u6dG8GVLTXfzIyIrT2fenuKVdV6oX2iWsOaSEPdFB3PQsuv7bT8Pgvq2z7cqVxz
+rBnt74lv0p9slwL3vKuJIflTBrxWu/R/ECMpTb0mISrx+VmRcrA6/6kfqEmBY12f
+ABXebwxstSv7cnLEK71s
+=YT+t
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/qt-xmlpatterns/metadata.xml b/x11-libs/qt-xmlpatterns/metadata.xml
index bcfbe03ac142..ea23dae891b1 100644
--- a/x11-libs/qt-xmlpatterns/metadata.xml
+++ b/x11-libs/qt-xmlpatterns/metadata.xml
@@ -4,7 +4,6 @@
 	<herd>qt</herd> 
 	<use>
 		<flag name="c++0x">Build Qt using the C++11 standard</flag>
-		<flag name="qpa">Build a window system agnostic implementation of Qt</flag>
 	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt-project.org/</bugs-to>