Version bump.

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

48 files changed, 1512 insertions, 279 deletions

diff --git a/dev-qt/qt3support/ChangeLog b/dev-qt/qt3support/ChangeLog
index f09efac0b520..ac7a7c86bba0 100644
--- a/dev-qt/qt3support/ChangeLog
+++ b/dev-qt/qt3support/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-qt/qt3support
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt3support/ChangeLog,v 1.2 2013/04/08 15:17:16 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt3support/ChangeLog,v 1.3 2013/07/09 10:48:57 pesa Exp $
+
+*qt3support-4.8.5 (09 Jul 2013)
+
+  09 Jul 2013; Davide Pesavento <pesa@gentoo.org> +qt3support-4.8.5.ebuild:
+  Version bump.
 
   08 Apr 2013; Davide Pesavento <pesa@gentoo.org> qt3support-4.8.4.ebuild:
   Fix description.
diff --git a/dev-qt/qt3support/Manifest b/dev-qt/qt3support/Manifest
index f1b0d72404da..a4e10d196bcd 100644
--- a/dev-qt/qt3support/Manifest
+++ b/dev-qt/qt3support/Manifest
@@ -2,23 +2,25 @@
 Hash: SHA256
 
 DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79
+DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357
 EBUILD qt3support-4.8.4.ebuild 1059 SHA256 8ef082b38a847bcc1b75b3ed394e983da130dffd7708fbb55601f1fa6fa2ce40 SHA512 154a112daba5f896e19be2595ef82eb6f7e92b0677e692dcc0511e247372543e030a5bd2d1698f2d83ee332395bcdd892789f129115f8e972641af667af736bc WHIRLPOOL 907900071ff3025794bf8d44d350a7747367f270efc6609418e64f87ad690a4ee75e25ace68d5cc5494f5ca03688f7e485e7da4b0200259b89a996c608028d82
-MISC ChangeLog 18202 SHA256 a3abe141ba4f53a6cf7ad96d7c4af0e1ac316c2a50c369f61df6ee4cfed49efe SHA512 445c959f9b0a366311d8be3181893a2484faaf3038b8d1b42d9acbd823fecd47ab4fdbe23dd5ea52349135592b2183b2b78bf3792e5494fb0bedf62ee06dd4ac WHIRLPOOL c79ba58817da7226b7aaa56d404fa76b53b882654f1545e72773dd89648748247426b5fcdbb75ac855fd9e5bc1b72871123d725fba0f1102fa1ce15aac6d935d
+EBUILD qt3support-4.8.5.ebuild 1031 SHA256 312d1ae5de0f24f2dbe6beb1ec85271dc7b8c43a5665b2ef35de2d1647b86bf9 SHA512 f8f1616cc0a1f683b059a05f04495b314d65921ac264c4b917f1dd292192231c9921937da22fab5792e608b5dcb64b6747d42a75458fe641a2e8d9ffc01cf8d5 WHIRLPOOL 8f400ea767334552a79fa039e4e10de7e62c7ca521ab3a9d35d003f066675870e51a145992e707932eaba9c08ac45cfae45187fd2c47ee5bf9eef04463b60fc5
+MISC ChangeLog 18328 SHA256 b2f71a0ec4e17512c095899705c40d8dc4ff74811276db812ad7cad67d627112 SHA512 24acfb4c0e89b682e5af2b6e79b8efb98106721886f1a3ad996fecf0c634744a867c10d6f30402189b0c2a52eb1f099416a86e566721199c93378e68df198566 WHIRLPOOL fefbe45c97ce30695a130c77998f7cc5a542a6487f09b168aecc886ee8abf8917857bf0374956f9dffbd70f7a7afb21bb819e5c3b4c966ecfaf1ff7482bc765c
 MISC metadata.xml 483 SHA256 4cdc431ac69278742df18f422ec6b633b37fad1698b3e12a08f5255ae239ebd0 SHA512 595ab201600424b6e7de1a4940999cb2c738a5c66375c1e3e2e28df6b5bf0279e746d73dd140538ac38b2119c8503710626704f7243e1d42aaddba9efc10b3ca WHIRLPOOL 1dd68aa55a41d2b3b576a73b047a0cd3fc1fc2a300f39d845ca0feb354b99e8396dfb461926dd5a79f80ded3ada42b46b7de28ed9b1dd667c9f2b92235f2077a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRYt+FAAoJENXLsxwXqFxy/5AQALUUqHETxRxChDu5rR2yZ53q
-+65vfIyU4IanN/VGlD0XeC+UqWcFN7qwrCcsDxB6/SUl2qRasiGyqFn+05tOSQuO
-EOTnF0XGr3DPoRRcScrc5XBNRLZk4difIREzYW8V9bO/fulpx/CUs8PIkN0VRAZB
-GQmJxoei+BJjAKveCGtv4ICiVAGQ33D2KNfPaIvouqvSycy1XuBZYNtOmqUxvLN+
-sZBKcmDKpRxe6TIxWcgMZUaD5x6qyK8kjfbKWt6mIaMKWzKQTHucwMwOfBq1T4Dw
-xUNwwRbdwJcXMv2Qbh5TddA5VkjC6ZXsZoP5pB8Ka3ebPhtLUyhp0bigeDgfZ6OH
-o4NXbGJQGgZtnn3ePlbnGjbtbmwQ+FJAmAhda4aykZcRces2JOEJHn0wsxwx5IG2
-X9UpxHvd6Wc8r/for6a9VrqL2KWegfip7JHZoRWMs1XMGiOYGfInRa+nGzgfF9Nu
-afAGyGd6W+se0RNMiE/XIZgtgpCB+DJVe2A66cKhbJsZE/ck9/S8dJ4X9R4BuKjH
-YQFXf/CQNBPWU+aiuZ7YY4HJUDOLISCigJQ+Yp3uS9E3pV0s/FPhF7zq5Ot2greD
-3VeersIh/+vS0hT5uQZdFXn1psAKqKh9ffvvNbLrBQDDRYm9tMnpyMgfQOLWkJ3n
-huMkQLJp7IBjuF3Rw6le
-=s2Zc
+iQIcBAEBCAAGBQJR2+q6AAoJENXLsxwXqFxy03gQALuSgYtSbxStMok6dbS3c+wi
+yEWEbtyMLgTHdiBf1PfkD3ZQU8PMIUF70GRigur7V+1X+khPTLqyEr+QKyYTZ6oI
+4SrT3/YeRlsiadA+YR8cDFbFZoVwvdpaeJ2JkvjMNjFHjQVAJ7cMAx0IXVx5sdm3
+J663p2hfg0ZftbM7mECVR5/jbGnOW/Kc5pAaHah2Prr6NTEPi4l47IKsSufW77q2
+ndCdkavzlvR5wnZJiBfNbeGyQcRx8u+qqKBJNBV3nK/1DQaUwJQXfxF/GN9Qfz6w
+YJaSEZV7Dr112ThJ0D+yZhrXvRokdFgz9I3xsPiaJbJ3uxDkNCU14/BrV5xd6oDi
+UPqqDZ3VlAHsgsIgFzMtNEBMChLupLR08znrkffxUDYeNCzQtJbA6vzjnA10ejqb
+8R6+nYeiQ5m7cyBObexRdjIfFAwXR+bjiKJDx+3WlSUxQcdu7Q5bmDIPM1f7MBX1
+h9QKLNF504KCPgcU8WeXtXx+54fLZ9FxFbNiYH5ZfLXssbxw0fIX1mqvJbt33gL1
+XL7wMO7i2TRQCgEry4s4rb86bWR6vZkJjtekJ8U7Snru5h28th/SdHn7DGOVUrM8
+TzVp5yEbOSNZxWh6tFJ5aTYg/KPHnnhI2bhLa3eaBD8N70inLd69vcYOw10asqEy
+m98gJPuAID3zcpFmapR0
+=m4T6
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qt3support/qt3support-4.8.5.ebuild b/dev-qt/qt3support/qt3support-4.8.5.ebuild
new file mode 100644
index 000000000000..87acedf5ab2c
--- /dev/null
+++ b/dev-qt/qt3support/qt3support-4.8.5.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt3support/qt3support-4.8.5.ebuild,v 1.1 2013/07/09 10:48:57 pesa Exp $
+
+EAPI=4
+
+inherit qt4-build
+
+DESCRIPTION="The Qt3Support module for the Qt toolkit"
+SLOT="4"
+if [[ ${QT4_BUILD_TYPE} == live ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+fi
+IUSE="+accessibility"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support]
+	~dev-qt/qtgui-${PV}[accessibility=,aqua=,debug=,qt3support]
+	~dev-qt/qtsql-${PV}[aqua=,debug=,qt3support]
+"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	QT4_TARGET_DIRECTORIES="
+		src/qt3support
+		src/tools/uic3
+		tools/porting"
+
+	QT4_EXTRACT_DIRECTORIES="
+		src
+		include
+		tools"
+
+	qt4-build_pkg_setup
+}
+
+src_configure() {
+	myconf+="
+		-qt3support
+		$(qt_use accessibility)"
+
+	qt4-build_src_configure
+}
diff --git a/dev-qt/qtbearer/ChangeLog b/dev-qt/qtbearer/ChangeLog
index cd9d7b0cf9fe..4553967a7978 100644
--- a/dev-qt/qtbearer/ChangeLog
+++ b/dev-qt/qtbearer/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-qt/qtbearer
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtbearer/ChangeLog,v 1.1 2013/03/02 15:25:37 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtbearer/ChangeLog,v 1.2 2013/07/09 10:49:12 pesa Exp $
+
+*qtbearer-4.8.5 (09 Jul 2013)
+
+  09 Jul 2013; Davide Pesavento <pesa@gentoo.org> +qtbearer-4.8.5.ebuild:
+  Version bump.
 
   31 Dec 2012; Davide Pesavento <pesa@gentoo.org> metadata.xml:
   Cleanup metadata.
diff --git a/dev-qt/qtbearer/Manifest b/dev-qt/qtbearer/Manifest
index 45217589fcd7..1a994de2e63a 100644
--- a/dev-qt/qtbearer/Manifest
+++ b/dev-qt/qtbearer/Manifest
@@ -2,25 +2,25 @@
 Hash: SHA256
 
 DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79
+DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357
 EBUILD qtbearer-4.8.4.ebuild 1670 SHA256 febcb630d265821fa7e21f818ed3877cb98bc87e755e874f83369ba9c642af10 SHA512 692c8a6fb523f09bf513000c3508b1e84805dffec80b3a0cc0edef02b94aa9aade0f08dc77f22e004d0add6d901a229b318c9379147387e37b2c77256e2f8eec WHIRLPOOL 6b7471aa28a1bbab41d7bf03d402c0adfcc5b119056808a514fe1c074f20768b584722fbad12b2999be7b8c235cfb68470803cb741b776eac9bc6241151efe77
-MISC ChangeLog 3481 SHA256 d3e390600208e5644fd15a437cbad852e8c41de41e26ff27776fb44ebf273b42 SHA512 1580e529c86b4872af19445170d81f29bb547be00b05327ef1bb99c62a936fa874fbc01cfc9c830a1f6c4a5322bbee41ede6cdc7c656a4d42a553952f84b583a WHIRLPOOL 749840f358ff325bf360de50fcdf185deda41e1b7780a4d7e7fed0ce5cb789589af2b8f8bb5f5a945975047b6530073e08b9158d50cd20ed28d312dc12c9cfe1
+EBUILD qtbearer-4.8.5.ebuild 1673 SHA256 0a135fd725a4de3b28af494f64d3724dc16de3e26b880ce02e76b42f559179c1 SHA512 5addec588591fdf177ac8ccac97808a616f4b41cca3f08282cf8e9d6fc3adba044e4b6fb3eb365de403d9e8492f1f91b08f3051b2a35acc4b0f4ebfeda47ab4a WHIRLPOOL 9a7358ac08dfce719d2fb9ce9d625f5f2d23a24ac558720b98204d404417be7ef4af97dd992d2941e729742cfda087d88cd8c056b57ee494b8127eded0f25b79
+MISC ChangeLog 3601 SHA256 3958f4797aeecb43e8f10f15a41bde94ebdfe97effd4514a41382ee6b51448c5 SHA512 b16f94ed83463832db38112c2bb4c910a356643038735cae9e38126dc316b57639ea61b46878fbd09952648fad79020332390eeea5e98daa318d950d5ad7fc2f WHIRLPOOL 43aa48aaa61e3e329669a6a9d76f36e359cde12b47e1cc2ea5e5a58996d8b703995dbf07416ca31f39cebd715a66f7a1d89f8d8cea7290fc1d9e3d881ae80919
 MISC metadata.xml 628 SHA256 c3bdb267f2a939b8d2c864f1d4192d988b0f36e39b70ed635f3d1f23d0a22bb5 SHA512 e039632dfc9ca2ed871566a3e57de9ead2a1a3e1b9bb2573b481cab761c92e855f41f9a32de645b99c7318a95cda0de954d7ae80e76828857f07fae2db512c3f WHIRLPOOL 748ec8193c09ba9c82132b48a6e45402acd2fe68244b6f0bce6da9a543c95bcf42094b52cb0a662bca21d1ee04f633cb2e1625ca315e0308e8328cfc65c2ab0a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQJ8BAEBCABmBQJRMhn2XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRGODRENkQ2QkI1MzlEMURGNTkyNjYxNjUy
-QjI0NzRBRDQzQ0UyOTZFAAoJECskdK1DziluwiEP/RC53o/XCwqekGxVV8TIWm/m
-YStnS7wEQBFeI64VzXyT4P9Df1cM5F+v3E3c31a+UmfPzCQPezs4qoHnpQ2nRBgX
-LTy5/zXJCwRXpAWmNTcTF0PwEhNM1FGXfcgajGwSFjFhLr2lAwjawMEX1fZef5D5
-+EOmuzJyUhJ2AIsBncQcXYkqPQpqukbSEbHbA7PeEc4WSZDWJS7AyHM3V9iqYfBT
-QGeMUNTByzcs/vkh3sAmsMfTnFSDbzy3zZBNdll/Y4BbDUjyy2Ry7UdeRnZfPKDf
-SDt30Fs+Fb+Vb5tlblpHbh3UIh/7vOc7CGlVkGsw2f96HpbPNL7NEbtd05EqaMCo
-/c+QSHwfUFbUsYBTsqAZsT8t9Yq4ixPDu7LiITa+BrX6pFwrMxbmL/QzeUbktld/
-9NX7Q7U3P1f1h/Ofp7oSbrCi19RlcxEGI8oEFqcJtaIidp1CxuHueYndr1srv1Wv
-y99RieuwtE8749ZzpKoBp6szCxRRPUp/+WKFf15Z5cWFRgh892bMkBkeW8p5XwvF
-aakOxt3BtwrMQFIjA0L++8fb/wLbInpGsufE6ubWVyleow+Xx83SjfZtQHMDBOPf
-vd5UfAxTdaVNRzNGzi96qV8QhOFVHIeCAMC3QuPBg36d0iDOCVmUiOBDXhy8LQMm
-j2GUZ2frerczm7iRTRWE
-=doHK
+iQIcBAEBCAAGBQJR2+rJAAoJENXLsxwXqFxyfuwP/3YVQIKc5EQxoqQE/hVYuXtq
+KucD7nnoIde2oc1wOXZvhxSj2jCzNr6/UXfCir7T1MJLmjeYa20T2l1BA0Jni0rB
+rngpw79RSrOn1UXyVTpjZeMCcJt5BJQHm5t5FKGr65omqNREj8/p4Vv/gxK1CQxR
+wBOs9C0s8B9fZLiq3w+DCPsjbSh4Kpttuxx92B1v4H0KnNWYXJEFRmwyTbS5TuCf
+ba+2ta26lgx1cwt+Ucj4LvAtT/SpkaYMmzPpG/R8f6U0jDclbgGe1ZYIAxC7Uux0
+EoRLIRMZThn4F2bPrT7RJ3lYySnOeTBc/qgNP3G56T/UcWvB21ghf6/hErLRiQ3K
+FRH0whCBVJoUjnAIubvt/709LSu6vP+jl2W/ZFVkRi5lc0hrnHK8C2ZnXUfBAcii
+6vhlgy5dS80NuZYL3VRrXp19T9scuvs1AQJX4gKmnKwIjvnYj840tzfZFnAzCbta
+opUxoNE3hrhL6V9HulKa2M1G7yQZR8UFZ3c5/wQKeZamuhYeaLi3eCRA8ta3Hr7E
+0Qqma92TlliT6jRwF++uRHaeishARWNcJtTrX3LWEsb5x8SVlFxcJ93XRslKmNBY
+vZr7gEO5pp7ZFkYvsm6zFIJLjrAdgS1JO3uwsfoqDLGc5vs4aBI5lrj8orrD7FWZ
+V4JbdBf1nQmzsPTc5MTe
+=4R74
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtbearer/qtbearer-4.8.5.ebuild b/dev-qt/qtbearer/qtbearer-4.8.5.ebuild
new file mode 100644
index 000000000000..407da5530ec2
--- /dev/null
+++ b/dev-qt/qtbearer/qtbearer-4.8.5.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtbearer/qtbearer-4.8.5.ebuild,v 1.1 2013/07/09 10:49:12 pesa Exp $
+
+EAPI=4
+
+inherit qt4-build
+
+DESCRIPTION="The network bearer plugins for the Qt toolkit"
+SLOT="4"
+if [[ ${QT4_BUILD_TYPE} == live ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
+fi
+IUSE="connman networkmanager"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}[aqua=,debug=]
+	connman? ( ~dev-qt/qtdbus-${PV}[aqua=,debug=] )
+	networkmanager? ( ~dev-qt/qtdbus-${PV}[aqua=,debug=] )
+"
+RDEPEND="${DEPEND}
+	connman? ( net-misc/connman )
+	networkmanager? ( net-misc/networkmanager )
+"
+
+pkg_setup() {
+	QT4_EXTRACT_DIRECTORIES="
+		include/QtCore
+		include/QtDBus
+		include/QtNetwork
+		src/corelib
+		src/dbus
+		src/network
+		src/plugins/bearer
+		src/plugins/qpluginbase.pri"
+
+	QT4_TARGET_DIRECTORIES="
+		src/plugins/bearer/generic
+		$(use connman && echo src/plugins/bearer/connman)
+		$(use networkmanager && echo src/plugins/bearer/networkmanager)"
+
+	qt4-build_pkg_setup
+}
+
+src_configure() {
+	myconf+="
+		$(use connman || use networkmanager || echo -no-dbus)
+		-no-accessibility -no-xmlpatterns -no-multimedia -no-audio-backend -no-phonon
+		-no-phonon-backend -no-svg -no-webkit -no-script -no-scripttools -no-declarative
+		-system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg
+		-no-cups -no-gtkstyle -no-nas-sound -no-opengl
+		-no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes
+		-no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb"
+
+	qt4-build_src_configure
+}
diff --git a/dev-qt/qtcore/ChangeLog b/dev-qt/qtcore/ChangeLog
index b018c00b11e7..18158b2e1a0a 100644
--- a/dev-qt/qtcore/ChangeLog
+++ b/dev-qt/qtcore/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-qt/qtcore
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtcore/ChangeLog,v 1.15 2013/05/27 09:49:57 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtcore/ChangeLog,v 1.16 2013/07/09 10:47:48 pesa Exp $
+
+*qtcore-4.8.5 (09 Jul 2013)
+
+  09 Jul 2013; Davide Pesavento <pesa@gentoo.org> +qtcore-4.8.5.ebuild:
+  Version bump.
 
   27 May 2013; Davide Pesavento <pesa@gentoo.org>
   +files/rename-qAbs-function-for-timeval.patch, qtcore-4.8.4-r5.ebuild:
diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
index 8f263264282d..f20129fc56a1 100644
--- a/dev-qt/qtcore/Manifest
+++ b/dev-qt/qtcore/Manifest
@@ -8,25 +8,27 @@ AUX moc-workaround-for-BOOST_JOIN.patch 728 SHA256 4e39ec7fe8084c42ee09d14d2fe87
 AUX rename-qAbs-function-for-timeval.patch 1679 SHA256 0a8cc8677fffba64cca24a9810d3c7afe6137d4888de33ebf2ff5bea3a33d487 SHA512 14e818316c62a41851b8c3e80ef2b059eb830672e88cedb1b73c797ee137fc0fc056879db1262285c68c93e0e8c37d7fd16339530a8783f9697b4ce2e6c65054 WHIRLPOOL 106adacf22078e5032591a7c864e28d0ff081dbfb265d7087a37064ed3a0055804e935e31479ee22fddd722e17d234c8060e409409a41fc057f01efa0d9f8bb9
 AUX set-pkg-config-locations-directly-to-install-dir.patch 2048 SHA256 862b2be51a7bff1e97be70f1bcdc9b6bbbfbea3f7b7de5805e7320c401103cc5 SHA512 0cdc8ff580ee2b291764615dc9f05f0d8078e0baeedc8e5869f843c11db2755a2c2f2c757dca1ffccb8a3dc07cbdb9c46c1a2e9f6791edb4f1e20675c9bbd9d0 WHIRLPOOL 93da7613c1cc5004bee55dbe4decccebf1c10db2be695ddc80bc5407a097b7a18f58ec31d481d76d7f1ca71f4f7a8dbeeea5108aecea06d50f625896e1a742c6
 DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79
+DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357
 DIST qtcore-4.8.4-update-defaultNumberingSystem.patch.gz 7719 SHA256 69e4be2ad4d08067a6bc8708a164822128a8fa8226d90a0be02e89ba537d90fb SHA512 a8d1501223ffbeeb9898afd5ce7fc4839a6155ae2612d796eed674a01bf8d53241d627a60a179bf93cf3e0d338de5468b1495c97843166245f295df559c52b12 WHIRLPOOL f8027c78f1691d1a50b30bcfe53c8750727a1d49dc45233ebeab5a1d7388a4291fe74a9b35bff5417b48fcfbdeadab3dc130fade17012c95ca751d73b2814b4f
 EBUILD qtcore-4.8.4-r4.ebuild 5218 SHA256 44f7a0a6c7bb22b838b7e5ff0ddd8da8bf70c891e914fa454d6f198751de9ded SHA512 af3015e641f8eeab5e48e949cffec9fa9b97691b3de20dd5bfc3c6a6d480d874da85168cb2f17a04a953cc275669aae0523fcc61f3c57a9b8bb1897e6dd277a3 WHIRLPOOL e3a8bea441ca667e0c6c100b1b3b37559d7fe47a628450586bdf102e0a0d507c09ed61210de86df378d55277731cd863406206af8306013abd5d5c54acd019ba
 EBUILD qtcore-4.8.4-r5.ebuild 5521 SHA256 674fe93fd32a5363cb5056727c0938f3cfd974cafd3a9249f82802a0cd941424 SHA512 46e5a42bf16a7c652656d7ca5e45c5f469c7b38fc14d3707f867069ec85b6f815704726ba019c47fe1d02e67d6a6becca7e6e1d8fb5a195d63558b832b270709 WHIRLPOOL 7fd26608385ddcbbfd9e5faa247c881de5b783f43f89072f37ba5c6ed4457f172b60cc8e6fadac22dd52b7f663c824b9a9196396d5449a21331d5e4bf97247a7
-MISC ChangeLog 31021 SHA256 ce40b34309e5f879c6d8820df55d332bc39f99a6259185879a3c468b355f38b1 SHA512 677b09a2088f5e7fed094da98d937a9076c90a37747c53f255f75204a6386facba1a07ddc5f60fb66a434f0dcaedc48aae2f95ba225ffb6806392fd48cff82e1 WHIRLPOOL 678795bda2058518fa58c205dcb1ca7134d207e9680d73d6b5ec7de3d4f1c7c461e5268ef4d9fc36b8463c38c76970a267f6a1c034a26341f26e072dfeb03028
+EBUILD qtcore-4.8.5.ebuild 4986 SHA256 978ee898397821b1d267e81c395254a7da29375ea09bc698db4018efa1f1cb55 SHA512 3029881fad6ada4d29250a4b72510d85a99e8472138e1389cd74e9fa5059eb5b742bbf0a514764064313f9e35f0bd311b36b3219ee3cd80292fea70322c05f68 WHIRLPOOL f1f57f979781b2409706ba17961b3853d4d874110f53b9acc801d9c57c96d474a101a129050aac8928591e4373d45d680bc5021a8dd90e483842ce6429bc55ee
+MISC ChangeLog 31139 SHA256 a66f435d87b358935a4d29159d4480d512515b42a39ff9fefb8a3d9a834c2f2a SHA512 ab7662dabeeae87fc1b302d315d8997329c0bbc45e1e1ccac95726f7c917e34858b4e2f02d7d3a411f8e36b611c0de40f7183b8b93e890d0ab991ea1b28578e6 WHIRLPOOL a66a7068e445c54756c5bf662383e42e0134f776c38ca60f721f7aa688645fbea152294acfa2c680985ed4a931fdcaa4ec6e3f447a562b996ac5c46d5a82cd77
 MISC metadata.xml 711 SHA256 999402a925dbe1f9d510372e9e03e5527e94e95e1cededaa01b2a8f7d89e2a61 SHA512 ac9f28c9efb0aeebb145c1cfc22d1a3c7ba25b141f5640249c914921138eb309c522392e750614a531bdedf0f4385738a840ea4591785d54cadeb2f1c74a4d5f WHIRLPOOL e2ac4864fcc8b665251fdce4203156f0bba2636d2a170a225c13005c656fce29f49e51dd6b8c6639fa48a11307522887ff26bc02603b676ec20aa826b2198824
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRoyxmAAoJENXLsxwXqFxyF1YP/3rmovPyr+9owErHTMByCnmj
-LOrfuILtCl2b0FdPxwcydEDUtUi358OBRQtWexCN3ls0ojjK4dIPSW4NNJU1SsFH
-NkYWFgz8V+zbJZxUZxFqHU+aK+Py7/AtsSA+QH1Ea780wYBzMH+EwOr8ZymwWxPP
-yCv4SL1vwHO4l8XakN7VzCBpboU3mfuLK1JJk4BUIcHm6eexnb5OF+wzJ9F4vdMP
-bAAmFNAuY22OPZhQ9oU5PSF5GPSO8rncvBfEQoVuFD2XjBC3vwNND12PQW5slaIG
-eoD/YP5hdBPdXnU1hbihXtw7Sew7kQBSCEnnRElVWlcOjudHJFGQwUN2lUINgPfb
-Y40liy08erQ4Wb2MxwuOElMax/svP+jRWJGo3+5/ROg8ndFZdVBE9fvqymN6oySO
-wuNnrNDIVR1YRtOTp66PTubHK4WyW9NrysGRcL/X4s3XFE/e6ez4bHFoEGBy+vPN
-WOUkak6yrWwMef+g9KtYbwSnGIOOK99gcS7vYyxBQIYtVbae2fLWuRjtf7AIZFdN
-LNk1NtMTrYC6ysFUdfYB2pnjVi3Mdf6KeS3PGLbplaZPY366SUyv9jKxQchWskFY
-wplvit8zTq6mH4+Wii7r7H59v5a5BayOO9HeWR0e/KwNwVWsnEhlG2UTb7S4h/B9
-ajmADaeukKG9LR6flf+R
-=Gr7a
+iQIcBAEBCAAGBQJR2+p1AAoJENXLsxwXqFxyiI4P+gKm+2HUoCxeZY983mDKbNa3
+QVSzHV8CRVAqELOSkjWjc/uv3Cm8vXswHbIWjJ3IgwCz4iaBM0d4hvk/Nh7r9Mij
+QNxJ0LmzzpU6bWxx2opgBKft5bMmdkVeixhM7d1+FsDZ+rSAr+2s7YIo86GR+5vt
+n57aLI/LYSvpqxJtKszpfQK2PV4PGvZO2GuVnbKQCk8Rha2OAAMGSxEvz8uG3Xod
+ckFuH0UoZhsrher6ByTbrqr6q0CKLYCUDSlF/Q/hjYBj79CNWPycpWbOziUfB1H5
+DEk+wxpsgu5oasOjYi/KvxTM8txauUP3SIJXJ7CaDxx7IADq+wG4Sl9Kw2MeoRel
+SAIqBcthn6mzzX6Bm+YDnGah8boAVRtNk3qo6Nd/5OpHccZgS7tbbd80xnQueV5i
+B0On+3dY0Bnwi5/pKwZc5YsMMcovl52olT3z0PdtulLSYZQuGsmzEe0c+W/JjKYO
+2cq6JF4nuPreko/IoPAy+eITFv2Hb0GWHMv7fpVkPgmjv8wsCqE6y3mzAYBbPjQ9
++fy6puQSRObhmCfHe51wq9BooT1Z5jVACEOcr9GXttotQG/g4s04ZS2/EeKzJN60
+tZlsLmiBKx9th4yRCvrs82twZRyhCWwR5r+dWSZRHXU8dsD9VQjzHeUIKPUBvIdD
+GRQBTOJkXUg/GnhOM008
+=/h4e
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtcore/qtcore-4.8.5.ebuild b/dev-qt/qtcore/qtcore-4.8.5.ebuild
new file mode 100644
index 000000000000..c42b39ea6226
--- /dev/null
+++ b/dev-qt/qtcore/qtcore-4.8.5.ebuild
@@ -0,0 +1,179 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtcore/qtcore-4.8.5.ebuild,v 1.1 2013/07/09 10:47:48 pesa Exp $
+
+EAPI=5
+
+inherit qt4-build
+
+DESCRIPTION="Cross-platform application development framework"
+SLOT="4"
+if [[ ${QT4_BUILD_TYPE} == live ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+fi
+IUSE="+glib iconv icu qt3support ssl"
+
+DEPEND="
+	sys-libs/zlib
+	glib? ( dev-libs/glib:2 )
+	icu? ( >=dev-libs/icu-49:= )
+	ssl? ( dev-libs/openssl )
+	!<x11-libs/cairo-1.10.2-r2
+"
+RDEPEND="${DEPEND}"
+PDEPEND="
+	qt3support? ( ~dev-qt/qtgui-${PV}[aqua=,debug=,glib=,qt3support] )
+"
+
+PATCHES=(
+	"${FILESDIR}/moc-workaround-for-BOOST_JOIN.patch"
+)
+
+pkg_setup() {
+	QT4_TARGET_DIRECTORIES="
+		src/tools/bootstrap
+		src/tools/moc
+		src/tools/rcc
+		src/tools/uic
+		src/corelib
+		src/xml
+		src/network
+		src/plugins/codecs
+		tools/linguist/lconvert
+		tools/linguist/lrelease
+		tools/linguist/lupdate"
+
+	QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
+		include/Qt
+		include/QtCore
+		include/QtDeclarative
+		include/QtGui
+		include/QtNetwork
+		include/QtScript
+		include/QtXml
+		src/plugins/plugins.pro
+		src/plugins/qpluginbase.pri
+		src/src.pro
+		src/3rdparty/des
+		src/3rdparty/harfbuzz
+		src/3rdparty/md4
+		src/3rdparty/md5
+		src/3rdparty/sha1
+		src/3rdparty/easing
+		src/3rdparty/zlib_dependency.pri
+		src/declarative
+		src/gui
+		src/script
+		tools/shared
+		tools/linguist/shared
+		translations"
+
+	qt4-build_pkg_setup
+}
+
+src_prepare() {
+	# Don't pre-strip, bug 235026
+	for i in kr jp cn tw; do
+		echo "CONFIG+=nostrip" >> "${S}"/src/plugins/codecs/${i}/${i}.pro
+	done
+
+	qt4-build_src_prepare
+
+	# bug 172219
+	sed -i -e "s:CXXFLAGS.*=:CXXFLAGS=${CXXFLAGS} :" \
+		"${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix CXXFLAGS failed"
+	sed -i -e "s:LFLAGS.*=:LFLAGS=${LDFLAGS} :" \
+		"${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix LDFLAGS failed"
+
+	# bug 427782
+	sed -i -e "/^CPPFLAGS/s/-g//" \
+		"${S}/qmake/Makefile.unix" || die "sed qmake/Makefile.unix CPPFLAGS failed"
+	sed -i -e "s/setBootstrapVariable QMAKE_CFLAGS_RELEASE/QMakeVar set QMAKE_CFLAGS_RELEASE/" \
+		-e "s/setBootstrapVariable QMAKE_CXXFLAGS_RELEASE/QMakeVar set QMAKE_CXXFLAGS_RELEASE/" \
+		"${S}/configure" || die "sed configure setBootstrapVariable failed"
+}
+
+src_configure() {
+	myconf+="
+		-no-accessibility -no-xmlpatterns -no-multimedia -no-audio-backend -no-phonon
+		-no-phonon-backend -no-svg -no-webkit -no-script -no-scripttools -no-declarative
+		-system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg
+		-no-cups -no-dbus -no-gtkstyle -no-nas-sound -no-opengl -no-openvg
+		-no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes
+		-no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb
+		$(qt_use glib)
+		$(qt_use iconv)
+		$(qt_use icu)
+		$(use ssl && echo -openssl-linked || echo -no-openssl)
+		$(qt_use qt3support)"
+
+	qt4-build_src_configure
+}
+
+src_install() {
+	dobin bin/{qmake,moc,rcc,uic,lconvert,lrelease,lupdate}
+
+	install_directories src/{corelib,xml,network,plugins/codecs}
+
+	emake INSTALL_ROOT="${D}" install_mkspecs
+
+	# install private headers
+	insinto "${QTHEADERDIR#${EPREFIX}}"/QtCore/private
+	find "${S}"/src/corelib -type f -name "*_p.h" -exec doins {} +
+
+	# use freshly built libraries
+	local DYLD_FPATH=
+	[[ -d "${S}"/lib/QtCore.framework ]] \
+		&& DYLD_FPATH=$(for x in "${S}"/lib/*.framework; do echo -n ":$x"; done)
+	DYLD_LIBRARY_PATH="${S}/lib${DYLD_FPATH}" \
+		LD_LIBRARY_PATH="${S}/lib" \
+		"${S}"/bin/lrelease translations/*.ts \
+		|| die "generating translations failed"
+	insinto "${QTTRANSDIR#${EPREFIX}}"
+	doins translations/*.qm
+
+	setqtenv
+	fix_library_files
+
+	# List all the multilib libdirs
+	local libdirs=
+	for libdir in $(get_all_libdirs); do
+		libdirs+=":${EPREFIX}/usr/${libdir}/qt4"
+	done
+
+	cat <<-EOF > "${T}"/44qt4
+	LDPATH="${libdirs:1}"
+	EOF
+	doenvd "${T}"/44qt4
+
+	dodir "${QTDATADIR#${EPREFIX}}"/mkspecs/gentoo
+	mv "${D}/${QTDATADIR}"/mkspecs/qconfig.pri "${D}${QTDATADIR}"/mkspecs/gentoo \
+		|| die "failed to move qconfig.pri"
+
+	# Framework hacking
+	if use aqua && [[ ${CHOST#*-darwin} -ge 9 ]]; then
+		# TODO: do this better
+		sed -i -e '2a#include <QtCore/Gentoo/gentoo-qconfig.h>\n' \
+				"${D}${QTLIBDIR}"/QtCore.framework/Headers/qconfig.h \
+			|| die "sed for qconfig.h failed."
+		dosym "${QTHEADERDIR#${EPREFIX}}"/Gentoo "${QTLIBDIR#${EPREFIX}}"/QtCore.framework/Headers/Gentoo
+	else
+		sed -i -e '2a#include <Gentoo/gentoo-qconfig.h>\n' \
+				"${D}${QTHEADERDIR}"/QtCore/qconfig.h \
+				"${D}${QTHEADERDIR}"/Qt/qconfig.h \
+			|| die "sed for qconfig.h failed"
+	fi
+
+	QCONFIG_DEFINE="QT_ZLIB"
+	install_qconfigs
+
+	# remove .la files
+	prune_libtool_files
+
+	keepdir "${QTSYSCONFDIR#${EPREFIX}}"
+
+	# Framework magic
+	fix_includes
+}
diff --git a/dev-qt/qtdbus/ChangeLog b/dev-qt/qtdbus/ChangeLog
index 4fbb21a77a62..f39288e2d3aa 100644
--- a/dev-qt/qtdbus/ChangeLog
+++ b/dev-qt/qtdbus/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-qt/qtdbus
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdbus/ChangeLog,v 1.1 2013/03/02 15:26:24 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdbus/ChangeLog,v 1.2 2013/07/09 10:48:06 pesa Exp $
+
+*qtdbus-4.8.5 (09 Jul 2013)
+
+  09 Jul 2013; Davide Pesavento <pesa@gentoo.org> +qtdbus-4.8.5.ebuild:
+  Version bump.
 
   15 Feb 2013; Davide Pesavento <pesa@gentoo.org>
   +files/qt-dbus-4.8.4-qdbusconnection-silence-warning.patch,
diff --git a/dev-qt/qtdbus/Manifest b/dev-qt/qtdbus/Manifest
index e80304c4313e..9d56e24e5ee7 100644
--- a/dev-qt/qtdbus/Manifest
+++ b/dev-qt/qtdbus/Manifest
@@ -4,25 +4,25 @@ Hash: SHA256
 AUX qtdbus-4.7-qdbusintegrator-no-const.patch 543 SHA256 a05de8d906be14160e5c951856fae2796b6f6eed91ed4781e8197433e94ce922 SHA512 1967f1b3f1a834eecf140df39c6e4826acf80fc2f8de85770252949910de357a4303d1c1b3202e2df164e8b1cd74b0ab4928a3b333df0a222bdf21e71696824f WHIRLPOOL c5d72b6fc8a9e55cfdacdd2a514e1acbd1c4f864f92596b3c3b9d013a24425619c04048063afb9aef267ade2b5fcf6b3921b90cddb2f9a3ee7d8721ae7d8eeeb
 AUX qtdbus-4.8.4-qdbusconnection-silence-warning.patch 997 SHA256 648a06278bd4cbe98c61543475cf75b0251722d0f562e9ff8a3b8a89d3838811 SHA512 b3135450bcd7ab50e5b559b0e8619606053845852159853498756e50777cfbe8b5871bd7b0c178b3de038dc9229f3564c4827b35fcb67b354f0814ca1b2c58e3 WHIRLPOOL c28d79d56c284dc17489c31449b20d774021a0a9dac385c327e6b42997dabc0d92aeca4f5fae3020926f6c16053b30f82913800019e5419e3a82f58481fa30db
 DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79
+DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357
 EBUILD qtdbus-4.8.4.ebuild 1186 SHA256 5e192084b00d47949c98e159a9d7fd93eb355e78650c961eb4ce917b99476bfe SHA512 dbbf0d432e862bbc81ef3aaa6551eb56024446a7a9092b97063c06121c41ed05675a93a1d720ef8185fb77b68b470dbfc8d826e14ce54993bbd142b5b6d353ed WHIRLPOOL f241422975521969a8fd3c7cf07ece6091ed49c88f8eb1471d143eab311997179d9ab24e4a94004c1e34713b5fe19c63573f4558c6b92505ed69a2a7b29334bb
-MISC ChangeLog 16999 SHA256 59abb3256c53ea92f3f61602ace68ded402ecea295f2f772aad6b8e72f679bf0 SHA512 b0712e5c9cb274df93a34d166b9dac88dda6c07af9f1daae97ee7ee4fbb688d1e8248e7ced0b068a494944d8d7f52d06933171865e64077f5a182f8645a72d59 WHIRLPOOL 80e84084071f62672ac288a7618bb2d13b9fffa03353df6f7729aabc40f842092d594f4c0020bcd93eca9b7af5cd44176097e9a792d93e65da369894dd854bd9
+EBUILD qtdbus-4.8.5.ebuild 1193 SHA256 9c021e32115d80d86431b0e66170710878b5d1f875ace19fbe56d254b04c10b6 SHA512 07f49dd762e4c0931daedfef20169e7a47afb356b094dbbd31163a2e5d711c7b1d1585a53509025e466dae69b9d18e7d5d88fa607400cf043ea403c01837311c WHIRLPOOL 1d23d7dc48d3b8a6822047b2509c41987bd69607fe78c651074d271609cd37003b7d3517f76528ac538b239ecfc576fadddaadbfdddc8adb8d4fde21f12bdfa6
+MISC ChangeLog 17115 SHA256 2217b2fcbd351f2fcfe83ae86eebbc444d3ee8b281f975a03917d6cdf8a711fc SHA512 0d7bd42708900a20a7ab5960f8a4c49ddf3c745147f07af00136b963ff33b7a281694c3644d7d28cb2caf6a16eec5207d882eac6f70f06331e02bddebe3298c4 WHIRLPOOL 544e6f697d23852c27edc8e829c25b826d210f279443bf567e7b3a4095542872b1dba1e721503bf76627d3df9112b9206972dc52d6f742cbd8ccce780caca2bd
 MISC metadata.xml 484 SHA256 e4f3a32784240897cd44c3c645b61cc8a6ff19bd821be35a00e5e8bc02085cda SHA512 ef88ccf92f3d370f7c70c18eb2727b279ddbcd04ce734014b02915b8ba32bee8a8ab2a3608b58b0305c48fe8073af99184b69940413ed2101be64bc50ee7ec11 WHIRLPOOL d68e07f14ea07c308a25487c89f382ac47ca9adfc43a6d1e641cb057b36537eb9ce860bc5cc7bfc702bc75d4ff49ffdee016a6f4ef70df27670f5fbd9753390f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQJ8BAEBCABmBQJRMhorXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRGODRENkQ2QkI1MzlEMURGNTkyNjYxNjUy
-QjI0NzRBRDQzQ0UyOTZFAAoJECskdK1Dzilu1fkQALCLP8rGJatTI+sJ9pWlgAjh
-rMFKsSA8IFPyTsKrfgEN48dV71/RxOTacE9O2kpsUiBA0BNaz8KuS2QPZf1ndUTu
-ZPNw/zlgmWmpdt8E/zsTM2GliOLf/hjfO+Y2qCbxYma6dOq+izKGEHvXyVNNyBKI
-AKW50zXBEH5Lq5LsYu8WjwepUFG1wFlokxeYWjU6rnRd7/OdVZJwowTzwp7nxUIS
-uAVmdxZZ1TTk09IRRYdy8XyyGAnlATT/ZUUBGWHLag30hztIuSO5Lnydbbnb2jRE
-EymKHM0Aw/bJyQ1ppcasEebTFXtxo9GrCDGF7zbhMlj7+F+pcmESHaG7P5fPPGxM
-AWfy5zUEwMFh5s/x4Q/YirHKtMFviEzw2/QhYSNcdPa37xCXuuOqN3vnhNztH1yW
-rARVXobyYXOLpK70NyCin3S6uttGsqKaWaQR8rjZRZtk9gOtsMISVtI2u/VK2GG4
-O+NH6e2ax/Rx/dCiyM2iXo4s5Rjmjuu2QqAhhyUJrrCbkeR0IckkNMQ/QYyJD56r
-IPoapwBDbSt43LO+HcAWgbGoTgb2lI6GB18V4wVgpnG6d9f3NcgJKYseR/zBJWEZ
-vJ/H2XGYJKPCIiJ6BvJLtWlKwGKm2HlFYTnvzbEsclR3vc+Dy0b/1gViza5/a9k7
-dFx0xJ2LcTi27zICgE+6
-=zgaP
+iQIcBAEBCAAGBQJR2+qGAAoJENXLsxwXqFxy76cP/1QgFQvjAIkddBIx7trQvYWJ
+3co151v6M+O8TvLOAPsjICNDy49TCt3Sjlilc0NnpCjbYoyUaeOEVtnwfW229A6a
+N+K362KAFt1SGkMHwEnuYmJu9gb0XbLOP0voow1LLY0BTu0ZWZTDgUqbio/FY9E3
+cLhEfeahLTuS/rZNQK+v3QczGvVrRAzwFQXmtILEVVe8sWXgF8v623I+ITSfkQTg
+mstkpSwaVurZVWfZDl3jKn9ZJSgALUmjnOmi6Xf1mFHRVK0nhGQGRUUW97sGHxdo
+Q+0iLJbs8QzQxCx8o70+xO3VZXsu92PkkWyE5BK16ro0KXFz0/HGUip9ZY6OMSy6
+vC+6ENDvAmnV5bgdLkHuFM0y/Jq+5rJLFIs+CaXZT476HuCByW8UbmOM1MWihLYh
+oWpkbN0yWipykIa38q3WsqRWqYbakgF7SqIDakUvIi4byxmsSetYBwU0gzHh9QKM
+rr94SYkpG+zMQAc1FyU8TQaLuV7qCrt0A91+turt8K0jNh8bwjWkPAh39XxG8ya7
+s4hZVuvu8wrtmp1VeebFMTIOOyxpjZwtdYYEfeNrqtWn2Asj0k4NSt54NIiborSq
+bF4chxltn2ljcEB6LrqliQ6guEQivGI+Z7yaqa3PZsSH2UZHyd4f12R5rmDrZlZN
+UZ3YwMEpbZd19iyvFU5J
+=0uYL
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtdbus/qtdbus-4.8.5.ebuild b/dev-qt/qtdbus/qtdbus-4.8.5.ebuild
new file mode 100644
index 000000000000..53679dc58b92
--- /dev/null
+++ b/dev-qt/qtdbus/qtdbus-4.8.5.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdbus/qtdbus-4.8.5.ebuild,v 1.1 2013/07/09 10:48:06 pesa Exp $
+
+EAPI=4
+
+inherit qt4-build
+
+DESCRIPTION="The DBus module for the Qt toolkit"
+SLOT="4"
+if [[ ${QT4_BUILD_TYPE} == live ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+fi
+IUSE=""
+
+DEPEND="
+	~dev-qt/qtcore-${PV}[aqua=,debug=]
+	>=sys-apps/dbus-1.2
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.7-qdbusintegrator-no-const.patch"
+	"${FILESDIR}/${PN}-4.8.4-qdbusconnection-silence-warning.patch"
+)
+
+pkg_setup() {
+	QT4_TARGET_DIRECTORIES="
+		src/dbus
+		tools/qdbus/qdbus
+		tools/qdbus/qdbusxml2cpp
+		tools/qdbus/qdbuscpp2xml"
+
+	QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
+		include/QtCore
+		include/QtDBus
+		include/QtXml
+		src/corelib
+		src/xml"
+
+	QCONFIG_ADD="dbus dbus-linked"
+	QCONFIG_DEFINE="QT_DBUS"
+
+	qt4-build_pkg_setup
+}
+
+src_configure() {
+	myconf+=" -dbus-linked"
+
+	qt4-build_src_configure
+}
diff --git a/dev-qt/qtdeclarative/ChangeLog b/dev-qt/qtdeclarative/ChangeLog
index 092eff681c1c..b1f74d6dc038 100644
--- a/dev-qt/qtdeclarative/ChangeLog
+++ b/dev-qt/qtdeclarative/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-qt/qtdeclarative
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdeclarative/ChangeLog,v 1.1 2013/03/02 15:26:48 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdeclarative/ChangeLog,v 1.2 2013/07/09 10:53:03 pesa Exp $
+
+*qtdeclarative-4.8.5 (09 Jul 2013)
+
+  09 Jul 2013; Davide Pesavento <pesa@gentoo.org> +qtdeclarative-4.8.5.ebuild:
+  Version bump.
 
   06 Feb 2013; Naohiro Aota <naota@gentoo.org> qt-declarative-4.8.4.ebuild:
   Add ~x86-fbsd wrt bug #430072
diff --git a/dev-qt/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest
index fda8d6ffdbfc..d7a807aecc4f 100644
--- a/dev-qt/qtdeclarative/Manifest
+++ b/dev-qt/qtdeclarative/Manifest
@@ -2,25 +2,25 @@
 Hash: SHA256
 
 DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79
+DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357
 EBUILD qtdeclarative-4.8.4.ebuild 2025 SHA256 d58ec93e76453f904b5f16d98e6e07c2395ae2f2b715924aa772a346433d352e SHA512 d5281b9da6f0d88365eb7ce9196f055078b81a066b51521c58836672501e532c6958656c01f3927e79606ec12d75f1108a554d43f2410abf35d6af17e3e29afa WHIRLPOOL 67d58d0cc0314c5df69953f70a8fe5b59ee3c8086831c273816905081519dd32da7c8e157ad1d867d13bfc2e5a8710b5ba0a3fc9ac34d99fb53c9a5eef061352
-MISC ChangeLog 8593 SHA256 f7c589a3b2c24e7159d90f321a4d0be8177e1511d03a47667f768f3a36cf7ca2 SHA512 81d7fcb19f55549a86f12f8e33f9cfcb277531ea96a13fc388c0c3ef49e670c6d4a4d43bb1cbe2bfcbe4b6b0b2c94fe9b1df5039c5f81c45dba78af9a9899a3d WHIRLPOOL 66babd9c512c6c26c22d3b5292f544ecfae5607ca5c76f0e92af6e8111523f97fb7a19115a142d196205dc1a931f9b1372e36105d4b24ff9b641a6eb187cb0cc
+EBUILD qtdeclarative-4.8.5.ebuild 1985 SHA256 49654b8af2cc13ab06f32007ca6d4ab4325dc48e64f27b79fc53989fe336e146 SHA512 26b1595469055a7b7f8a8beeacd3f5388d1184f00fcd56f3aae35955a26daf4102b4ba5c5c197af37740cf8fe7b7e15f44772a4ba4784fa5dde67820332eecec WHIRLPOOL 1e2e1fc9ef0f09dbfa5ff7bcc6a5fc024e03ab56ad56c9ba5a11d1152ab0c9f31aed2e9718c693649b1b5c601f804d01cef6dc1e35d948671151ebed6fa37679
+MISC ChangeLog 8723 SHA256 bed16fc950b6cb655f63512c567c4071e57ad69956e79d391c0bb623a3f60ab9 SHA512 21f9538125e5a7e3c2aa781ddd86ee501fd11a6a9fa7d73a58944649f38eef5301e8aaa7e185fc7f4719bd2eb3ed7909b9a5b97208d634c7c61aa1b29607f5ef WHIRLPOOL 4b0f0f34ec70dc85c6bd6a7ade3fe40f1d26987582b1abac5649b9662db23f6e4d370b4169383752a9d12cee992d970777f1b953297e9a5b94a49643b5344379
 MISC metadata.xml 694 SHA256 3d234b538acdba36e5c2ac95cc44a7e58538d51bfc3ac1bdc04331ea4cf7bf4f SHA512 b9a8dc2d22bca30d1ad6207f51ba29c4d527a9de75e4671b4bbef04085ca5cbea47f72bd72298d3d24b9a0335fbfb2dd2828ac74ddfe8af9648ee781ffa0559d WHIRLPOOL e3a2c6e770a50e9b94ef8efa3fa2dfb4ba61d4417ac5854a5e3308d07a7cb9abc74be8bec10e456544170ead1739280bd5d9060d57b1a3bf4a7a7cfb7f870710
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQJ8BAEBCABmBQJRMho/XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRGODRENkQ2QkI1MzlEMURGNTkyNjYxNjUy
-QjI0NzRBRDQzQ0UyOTZFAAoJECskdK1DzilunrgP/RKtMe+tfIticQ36ckqC+++B
-5mwvkCrAwlG23rv56CiKzaPPBB9vXSfHSYmXG/3jPxNkk7IyRhLsvVIX7vhqWPSk
-Fl6Zu2+EV06tHB7dL4UKNdWY1nKGFjwmwh0wumzZEZQN9XnS3C8y5hrVvVSRbwTm
-t/mR81QdVpCBWRlSb/9NI8yPO2JiROdofCUJhjC/wQL4hrCMz43xIfWmDZ8iaYHt
-a4y96UU4gmXc5Wj7quSvQ4hwzBuodWUyHzJeugn0ChyMEoON05r3e1H8j4scoMEu
-9yBw6Wab51oZyjN01kH65aoGcN9g9i+X5QOXBS/v6jBnz9hgJidXf2kiErwuiH50
-Mz+e3Pp8w3tiYZbLtMZpO2Wozh5370UZ2V1rpbMYQ7B+wRb4gBM9sOeOHZiEzGOO
-O0sn9YUcKbjaLg9nIeQ0+29pLis9410Sz229kScf/tqnNvsY0gtRQRmnMUs+3oDD
-0x2UD4dmTQoA4aJvqt+ET5vr5nM3EEjqqgTgq8muD27aHtLOuFbidtD7x9QAYxPS
-dbwe2nZ6HiRjxgx7feIeDkk8vFwCA7WxA5ms94C2PHMl4YrRN/DtJxPaYPKRNNFt
-D1uphDZJTkMkjs7rRlfwG1FngcH1ZN5UpByCvDOMhd9tbQKuTrXjykarat1zcVgW
-wLzNPSBtRu2HBmDhcR1q
-=Ms5b
+iQIcBAEBCAAGBQJR2+uwAAoJENXLsxwXqFxyXCYQALbx+wnEFJVdU+737xm5u/i/
+Vj2AlXv87CP4D+60w/iXTMJ0Pk4VEXqZwX8llHC41ynHh2AVzlE3CSfA29VbuMYf
+ib/z0hiZ7SmUZabrEPFYgr7xFrN+pHy9dGch3ctHGdYmGFQajRXB6yXyiLRCz6QV
+4zi9dsItVoQrBTPZwhKmJehDGzY+s2x/Vz52JbOpav788kP+Jxwpv1TIXtF0uXhC
+SgRk7xHC+cmGMKkxML+Aeq74INlhaa4YQ2yvrAbTb5JXGWmmxYoPGjlhCfzzfgr4
+GYIQekTnEwYcNCgZ7m/3i+qibzSRG0bo1W9XvYg75VHfm7tw0CN6BwQ4ogxsXXmR
+s4nr4moXaStkU2Fi4pqFP0bM7NW2uiiQDz/4LeC3XM20I+V+46jCnOhnxjjcVGMQ
+Z+M26SV1ucj7R1D0ghFntqkVH2U6idleWP57g8aZ1RjtBireEyRQJIRN8GPySh+O
+3lr1dfXNAhokBLVG7WkpeFU69d6mdEssj2dXkxBhW+EJLCAro/bhBfNVlvYbCb3r
+99UQubv0rQT7fRG+MMD7eUUo+BzZ444LihjOJkyXn8YO0yWo9Cow6qRSG6fl2J0q
+cw9UZgAsHTppVK0xK5O+gg7AZQ6DUCgKyG0QnsCYzYxiMCGyxWeMIW6JREFjcFw0
+1iJx9iWbRyQ2BZbM+fAJ
+=k4N9
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtdeclarative/qtdeclarative-4.8.5.ebuild b/dev-qt/qtdeclarative/qtdeclarative-4.8.5.ebuild
new file mode 100644
index 000000000000..b16add97dc5b
--- /dev/null
+++ b/dev-qt/qtdeclarative/qtdeclarative-4.8.5.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdeclarative/qtdeclarative-4.8.5.ebuild,v 1.1 2013/07/09 10:53:03 pesa Exp $
+
+EAPI=4
+
+inherit qt4-build
+
+DESCRIPTION="The Declarative module for the Qt toolkit"
+SLOT="4"
+if [[ ${QT4_BUILD_TYPE} == live ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+fi
+IUSE="+accessibility qt3support webkit"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=]
+	~dev-qt/qtgui-${PV}[accessibility=,aqua=,debug=,qt3support=]
+	~dev-qt/qtopengl-${PV}[aqua=,debug=,qt3support=]
+	~dev-qt/qtscript-${PV}[aqua=,debug=]
+	~dev-qt/qtsql-${PV}[aqua=,debug=,qt3support=]
+	~dev-qt/qtsvg-${PV}[accessibility=,aqua=,debug=]
+	~dev-qt/qtxmlpatterns-${PV}[aqua=,debug=]
+	qt3support? ( ~dev-qt/qt3support-${PV}[accessibility=,aqua=,debug=] )
+	webkit? ( ~dev-qt/qtwebkit-${PV}[aqua=,debug=] )
+"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	QT4_TARGET_DIRECTORIES="
+		src/declarative
+		src/imports
+		src/plugins/qmltooling
+		tools/qml
+		tools/qmlplugindump"
+
+	if use webkit; then
+		QT4_TARGET_DIRECTORIES+=" src/3rdparty/webkit/Source/WebKit/qt/declarative"
+	fi
+
+	QT4_EXTRACT_DIRECTORIES="
+		include
+		src
+		tools
+		translations"
+
+	QCONFIG_ADD="declarative"
+	QCONFIG_DEFINE="QT_DECLARATIVE"
+
+	qt4-build_pkg_setup
+}
+
+src_configure() {
+	myconf+="
+		-declarative -no-gtkstyle
+		$(qt_use accessibility)
+		$(qt_use qt3support)
+		$(qt_use webkit)"
+	qt4-build_src_configure
+}
+
+src_install() {
+	qt4-build_src_install
+
+	# install private headers
+	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 {} +
+}
diff --git a/dev-qt/qtdemo/ChangeLog b/dev-qt/qtdemo/ChangeLog
index 7736c455b3cf..c59f47d212f5 100644
--- a/dev-qt/qtdemo/ChangeLog
+++ b/dev-qt/qtdemo/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-qt/qtdemo
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdemo/ChangeLog,v 1.3 2013/04/08 16:56:00 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdemo/ChangeLog,v 1.4 2013/07/09 10:47:30 pesa Exp $
+
+*qtdemo-4.8.5 (09 Jul 2013)
+
+  09 Jul 2013; Davide Pesavento <pesa@gentoo.org> +qtdemo-4.8.5.ebuild:
+  Version bump.
 
   08 Apr 2013; Sergey Popov <pinkbyte@gentoo.org> qtdemo-4.8.4.ebuild:
   Add ~arm keyword, wrt bug #454916
diff --git a/dev-qt/qtdemo/Manifest b/dev-qt/qtdemo/Manifest
index cea2f387b5cd..75c8a434310c 100644
--- a/dev-qt/qtdemo/Manifest
+++ b/dev-qt/qtdemo/Manifest
@@ -3,17 +3,25 @@ Hash: SHA256
 
 AUX qtdemo-4.6-plugandpaint.patch 609 SHA256 e7c8fccf933dfee061b2960b5754e4835e7cb87c0e36166d3b11d69632732215 SHA512 e547e34d501bf29e0c5f17765f7355b330ab7533fef25ae97e55469d700ee929b36f885e5596b34e2406e63d7fb9fa200e509d4e517473597d3ceffccb7b94b2 WHIRLPOOL 4ea022a82d5580613fdf47b4eb3f0a174c7ce542e79df5b191403c6120195018f136bcd1c325a7718f810d847b40b14b511eb718e8902528fb5694177385ddff
 DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79
+DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357
 EBUILD qtdemo-4.8.4.ebuild 2820 SHA256 78b2416dcfa2440424c94083f7aab9cb5586553d6177fb99a68cb933250092ef SHA512 914c48eb9cea03bc74e4564bc8bdb3359b5eafb5a46d0544acd65ce044dd69bfb5381f6003b55483d0276d60d6c965c5f9fb6030812b7ef20b6b654fde005b9d WHIRLPOOL 1160c59e520fbb3c795e0dda59194535e961d4b865b4698fec21a9e98c1d38529d29d40cbf4b9b4cf6e431bb4c19286ac1cd19c9bb6c4e5f946ba35b55310f08
-MISC ChangeLog 13201 SHA256 55a0ff8a125f7a24d0141f34583d2f8ec3355d809c10ebf2beaea97f13aa9258 SHA512 cda93e50c90f1bcc8c6e4506ebc9d682c8cb69248c3a5a207cd6b376122d12ed00067f4014751e714fde8f131db4e63c59ae3da64991a6837c856953458dc13e WHIRLPOOL 23c33051149cb1ce7a45749865cca6ee5377852aec0d00adaf9b3317129f58b40f5a080e2f925472406265c364a9c5a0e3a6c6d295fd3f08d8e80920b60bbb87
+EBUILD qtdemo-4.8.5.ebuild 2820 SHA256 ac2e61443983719c3491d3e6185b39cf0715f97f830a9d9771b3e1ee7cabb2ff SHA512 026a92f957680a97dde7d2c96da8df252cb8079b07e91c40315bb70331f50e158edf91a032ecdc75db781e7339f07ce9697c544789fba016fc3cc4505d2c0b8b WHIRLPOOL c010ce390b9b65c679b3d6e81b81763b70397771f087e99046d9f8f6595267360521018f372c4120d9a08e803af95dfe240dfc900a329595737048157a5de4d9
+MISC ChangeLog 13315 SHA256 6d20d00147c018bd94873f2c893d285ac063ef66a182d20a27e7bf76d60e8ce8 SHA512 ba9871771252848fd79896f185bb9b321b1d82c45e026f7f4a4cb18ab43fddc0e2ccd353a9bebc4abce67f5f792f567e5be6af5ce5aa23d9c17f416ce98f8bbf WHIRLPOOL 5819e6d73eae3188443713ee987151506e08e59cc9dbeab4673448b4b9d22f6c1b2b301febe975defa4262062fad3be9240b56d17e0291517fd8cd2b47aca6ba
 MISC metadata.xml 1018 SHA256 1121d70cccd79f423d3d88174adcb27f932fdafc02875c925981808bd16e94b6 SHA512 526c1c7991244ef801666633bcf5960e6f0dab2b5cab08dccbb0ba5281aae608938656acb1178d341d8b66ea8f2428294ad0995b8a13ded337e68b0e52c75f6a WHIRLPOOL 9f164eef97700630d6bb4ee3958dd7491d2954416d88366aaf980de6d78f9733b7058becdddc58bfe1a4fec4992bd5fc9e0ebfe461cb87f58c8657cc7f73b105
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRYvalAAoJECo/aRed9267K44H/2ZaN2vgTrmysKj4c3R1vdRG
-qfK7+sa6p9FHbimce0zKxhQIsrlogNWLrEGwM7vxb6m18Q7OCOjyAagbeCHfIjLU
-mTmmaHxyw0mdLNUkwJUoI/B+o5x4PhONXEAmXXWCznKJW4DR6C2P9BzrrOMS5yKf
-AZcYNf74DsYxnqF4jz4ODiCzegjCPEBteitNP7qiJmexD2loZTTTEpFpcdq7UtJi
-umu2LqQ5lb4yU6e28Ryz5nAAZALZjM/q+hhOcEIXv+M6x1B3O0FyPWxQ9lbC7zuO
-BBb2ZtSw+ierIFlKAiXSUsNVdCMRbUx6heYu25YwuoqVwRQ6kTZERDpTY2O8HWw=
-=hXCo
+iQIcBAEBCAAGBQJR2+pjAAoJENXLsxwXqFxy6pAP/16O/86Fn+hnesxlZgOwx8dU
+xFdfYMBa37UYgFzBKzVqByCyvupi96NTe9uvOzHJLijzYo9bv8pViugFosN2nMgn
+dAtUdMN+JSfIo4c7JZDR0BOknT4p9EE+0Qgik9OE5gHEEYlX+FYchnmwEoS8fBRe
+b0CJI3qqM6ITDp7Vfq0IK5sAB5MzcTuXbZ4qOazuOegqQY9wHYk8HAzghvo7YY20
+KVCHy40AKo/NKswtec/4NevlkxewkX8H1C92T563NZqsOHjMPp70OaMMzGU9lPEp
+zX4G20Q+17zccLg2VK2YDFfrdSaEAesacKezXhh4GyXe6hlBDyVrljvNfs34HzLE
+R4MkZ2/hXS0rjSBdbxF0+mWJ+L3Y8aegbNoqhhSgGiR04YNJFevAItbr72us4d2N
+v+Ovy+SaYjTL74fgD1wGoxel+zhNweHmmtbi4k/76ryzWubbneT6MJSZuGiX4P68
+HKIclfXZVcGcXXj2LrKLe4qHL3yW0ztgRBW9ErM/pknk7VI3NbKHrcGKa3L21b9i
+snyMICnpUnNDZIvqPsBH+nK405Igf4wFQ5HXWLLordCLMJktuBiKg32KacwIZcQp
+TzjmFQBnwBT+OD2ML7deEA3JkzNE5n1J9pgDgYQMkeYhmzruf3XXOX+JDnCDa2+F
+1B28I9jXWMDNC1fPr1ci
+=qQwI
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtdemo/qtdemo-4.8.5.ebuild b/dev-qt/qtdemo/qtdemo-4.8.5.ebuild
new file mode 100644
index 000000000000..393f63272fb7
--- /dev/null
+++ b/dev-qt/qtdemo/qtdemo-4.8.5.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdemo/qtdemo-4.8.5.ebuild,v 1.1 2013/07/09 10:47:30 pesa Exp $
+
+EAPI=4
+
+inherit qt4-build
+
+DESCRIPTION="Demonstration module and examples for the Qt toolkit"
+SLOT="4"
+if [[ ${QT4_BUILD_TYPE} == live ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x64-macos"
+fi
+IUSE="dbus declarative kde multimedia opengl openvg qt3support webkit xmlpatterns"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}:4[aqua=,debug=,qt3support?]
+	~dev-qt/qtgui-${PV}:4[aqua=,debug=,qt3support?]
+	~dev-qt/qthelp-${PV}:4[aqua=,debug=]
+	~dev-qt/qtscript-${PV}:4[aqua=,debug=]
+	~dev-qt/qtsql-${PV}:4[aqua=,debug=,qt3support?]
+	~dev-qt/qtsvg-${PV}:4[aqua=,debug=]
+	~dev-qt/qttest-${PV}:4[aqua=,debug=]
+	dbus? ( ~dev-qt/qtdbus-${PV}:4[aqua=,debug=] )
+	declarative? ( ~dev-qt/qtdeclarative-${PV}:4[aqua=,debug=,webkit?] )
+	kde? ( media-libs/phonon[aqua=] )
+	!kde? ( || (
+		~dev-qt/qtphonon-${PV}:4[aqua=,debug=]
+		media-libs/phonon[aqua=]
+	) )
+	multimedia? ( ~dev-qt/qtmultimedia-${PV}:4[aqua=,debug=] )
+	opengl? ( ~dev-qt/qtopengl-${PV}:4[aqua=,debug=,qt3support?] )
+	openvg? ( ~dev-qt/qtopenvg-${PV}:4[aqua=,debug=,qt3support?] )
+	qt3support? ( ~dev-qt/qt3support-${PV}:4[aqua=,debug=] )
+	webkit? ( ~dev-qt/qtwebkit-${PV}:4[aqua=,debug=] )
+	xmlpatterns? ( ~dev-qt/qtxmlpatterns-${PV}:4[aqua=,debug=] )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.6-plugandpaint.patch"
+)
+
+pkg_setup() {
+	QT4_TARGET_DIRECTORIES="
+		demos
+		examples"
+	QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
+		doc/src/images
+		src
+		include
+		tools"
+
+	qt4-build_pkg_setup
+}
+
+src_prepare() {
+	qt4-build_src_prepare
+
+	# Array mapping USE flags to subdirs
+	local flags_subdirs_map=(
+		'dbus'
+		'declarative:declarative'
+		'multimedia:spectrum'
+		'opengl:boxes|glhypnotizer'
+		'openvg'
+		'webkit:browser'
+		'xmlpatterns'
+	)
+
+	# Disable unwanted examples/demos
+	for flag in "${flags_subdirs_map[@]}"; do
+		if ! use ${flag%:*}; then
+			einfo "Disabling ${flag%:*} examples"
+			sed -i -e "/SUBDIRS += ${flag%:*}/d" \
+				examples/examples.pro || die
+
+			if [[ ${flag} == *:* ]]; then
+				einfo "Disabling ${flag%:*} demos"
+				sed -i -re "/SUBDIRS \+= demos_(${flag#*:})/d" \
+					demos/demos.pro || die
+			fi
+		fi
+	done
+
+	if ! use qt3support; then
+		einfo "Disabling qt3support examples"
+		sed -i -e '/QT_CONFIG, qt3support/d' \
+			examples/graphicsview/graphicsview.pro || die
+	fi
+}
+
+src_configure() {
+	myconf+="
+		$(qt_use dbus)
+		$(qt_use declarative)
+		$(qt_use multimedia)
+		$(qt_use opengl)
+		$(qt_use openvg)
+		$(qt_use qt3support)
+		$(qt_use webkit)
+		$(qt_use xmlpatterns)"
+
+	qt4-build_src_configure
+}
+
+src_install() {
+	insinto "${QTDOCDIR#${EPREFIX}}"/src
+	doins -r doc/src/images
+
+	qt4-build_src_install
+}
diff --git a/dev-qt/qtmultimedia/ChangeLog b/dev-qt/qtmultimedia/ChangeLog
index 052b47ad517d..b8b7798a80fd 100644
--- a/dev-qt/qtmultimedia/ChangeLog
+++ b/dev-qt/qtmultimedia/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-qt/qtmultimedia
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtmultimedia/ChangeLog,v 1.2 2013/03/03 04:16:52 yngwin Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtmultimedia/ChangeLog,v 1.3 2013/07/09 10:49:58 pesa Exp $
+
+*qtmultimedia-4.8.5 (09 Jul 2013)
+
+  09 Jul 2013; Davide Pesavento <pesa@gentoo.org> +qtmultimedia-4.8.5.ebuild:
+  Version bump.
 
   31 Dec 2012; Davide Pesavento <pesa@gentoo.org> metadata.xml:
   Cleanup metadata.
diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest
index 834265dd642c..13b74def6def 100644
--- a/dev-qt/qtmultimedia/Manifest
+++ b/dev-qt/qtmultimedia/Manifest
@@ -3,25 +3,25 @@ Hash: SHA256
 
 AUX qtmultimedia-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
+DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357
 EBUILD qtmultimedia-4.8.4.ebuild 1518 SHA256 19fa410e7e7dc77d5666d3b2ac855746563d9f22513e8b0a176fcc06d4a51b04 SHA512 0effbb560524ccca50dc61ff16e93e5690fb3233c3cf1e432a42b5b0bf2674471b4e4fb1054dd69fa45c8afae59f8ff0ec5bd320f8d99911d4097384a421c73c WHIRLPOOL 4dfdb99842d7f70779c4f9860e8cf3d020817c6299b15979bbd6cf8cd72881448fd0e7a8d9394f5b9726cf8575a866f629a9ff73feda0ccef0dfeaf1921347df
-MISC ChangeLog 9776 SHA256 3cdf3b03e31dcf5d7d8f0f8722f0468673f6143fb10acf81b421c10559c3aaf2 SHA512 fefa47e83a2accd3f9893948c2248fc98534ec8107658f9fd7ffb2e78522230e4bb9dc8df8af1d753b1daf65b70b0f984e49577a3c145576f1a2b51ce0699417 WHIRLPOOL 64bba35e46f0738bc00b1eeae6d8b3432c1ccfecd7e8237653f90fa77606807220fb354992e4e77c227c3ab6854cce343f9c08f6d2c14eb634d1cd7157a6e4c4
+EBUILD qtmultimedia-4.8.5.ebuild 1521 SHA256 22fcb74be3aefc20e9e6e5b4eaa3b8417e59758bda6cdf09eee26dd4e852584d SHA512 2979182cb0d642e21fdb419fc573579fe36741dd0c9008671dfdf5443ad9dd90520e95a20d08654802d402ee8b50ece7e1fac588945c805d99df8a330fffe343 WHIRLPOOL 33db46ef710c6073a6f811c369183601682f7cf98d9493200798c96c6f88963a4286a0104d9db74cb6dc02fd66b29533b9263d4ecfa80a7fc7aeeb832171a4e1
+MISC ChangeLog 9904 SHA256 dcc4b163f09fbed878d6502a46ab23f9644aab84225c4c886cfd6f2ba47468bc SHA512 3129aa971480f3854c54f0892b00d70e334da6a4ee2001cfd680081f8424b3bb0cf5c019d720cba37293518785b1c7669a676cc17ba71f4298a36f60b5b1df6f WHIRLPOOL b720aa7f0daf85048ecf26ecca593d7cfe721a7aea3b2c172087319aec325a487ef00d2a6509f30ee9c8e70413bdaf640b3b7947eda403ad1577e7c28d980361
 MISC metadata.xml 484 SHA256 e4f3a32784240897cd44c3c645b61cc8a6ff19bd821be35a00e5e8bc02085cda SHA512 ef88ccf92f3d370f7c70c18eb2727b279ddbcd04ce734014b02915b8ba32bee8a8ab2a3608b58b0305c48fe8073af99184b69940413ed2101be64bc50ee7ec11 WHIRLPOOL d68e07f14ea07c308a25487c89f382ac47ca9adfc43a6d1e641cb057b36537eb9ce860bc5cc7bfc702bc75d4ff49ffdee016a6f4ef70df27670f5fbd9753390f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQJ8BAEBCABmBQJRMs62XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRGODRENkQ2QkI1MzlEMURGNTkyNjYxNjUy
-QjI0NzRBRDQzQ0UyOTZFAAoJECskdK1Dziluj6oP+wevQk0DuzoWKUaxXFxWjVPt
-wggASiBlArsENH9Ca2Jcpwcd1GxhKQmwzpZJ9dqhPJys6pB3jSexwzFpnLoHteeY
-cEeFvt3MnzO0HfSLd2owZc+rYVap/MZ3B2BG/XMNDC5bLKav4CedRXjdWIf0ePtN
-k57dWlhncRmyLjoK0vwAL/VB0PTx97Ipqfnnl6szzJrLYzvYVUowm08NbP4bO65z
-/Xg7ouMuDRAvChKVaSja/hbl5AuHfTJuTUGDEikwKb7CSajJGfjpYSyeInSvFkr2
-l9fy8W248X8nThlOKMzg3Sus9RrmShHhVxXfcaTjgG5ATrYEmTTFbXxUptvcmHen
-jFeVyCAEaa0DoQ+mSQ203hpalr8J5tZZ3VGrCjwFFVPBG91nMsxaK3wuwPQvD3s/
-VZVOuO6O1As5pECPei/aV9HITFiar77UECjjN1xwqONJYgQSrz2ylEti3Avb6Nxz
-fuuaJ6DFhKjdQQsSIML624nlzUBsh8P2WzEqH5XyEhqqRO9xO9AYPgEotciLS7Hh
-4laZkWC6bNKCpXAJHP4S1Uh0/IdRChSVtvCjTbHnIpg+iMPv/jJeIvegLObSx42w
-//j7AfR0x50Sk6mOdi9nk+DXxZVkJOv48U0U2YDOIT9BOPtMGvajmM38dOXGcEOC
-IIskf1xbI99WIb0dKKIc
-=Y/su
+iQIcBAEBCAAGBQJR2+r3AAoJENXLsxwXqFxyMAoQAKL7lcMbCe7vtSRmZaHClMhR
+j1liY6W8UOzpmEEgE2RhyXPWg9arQEdOB6allIFsyjgK87JoJFBINtgMl3XYuBTH
+isTDDp1ah/XF0TZIDVyHvq0iFLd9sNovWPLBfFm9FEcAiYFUprb/Mlh/LODx4Fvq
+b65Lx5e/p/XceGzdYJMypEiDGTuy2l2Z8dc+MNgJvRSY3zPIrTz46/1DGg0fWRNH
+t+8dEh0qVUd1zihGyGJuwquvhf0TnFEC9Nya7/o1llyv7Fd/Jf9WnKXNWHT86uQV
+sMTKiDFBh0u7gQcnzPTT24g0D2oMKURk9cfgBjt3C8BSOZcoqzk1aic/qcyNE1KB
+ISmWWVs7lDnFkFi18sSCcJv1T3FyMR5xiXQ77hr6LbYbRIctVWfxYB8csgn0WzY7
+R/44/kTKsi+QJV4WY3Vu3tzys3tezuDUa1BjhE8LU0E3jXF5MdZPO/x4KBmYD2M/
+cC+pXD+f/eojosyPpA07NO7ouI1d/OmPjUIM09dGGZzD8Bj3Z1FB3BQIloEP2bu8
+8UQJRxr1F9fZN+917vXDjkgxE42HgT1xnyA/lhUt3OX/kD8XZs570AnUIX4N1NiX
+gmAnM9UV5baI63nis4I/y7iM/UVtnvcIu0krSHiC6TsGAZblRUO+DCifpnuUZoBj
+Fa3YMdJBNofbE7qYxC/U
+=m8vo
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtmultimedia/qtmultimedia-4.8.5.ebuild b/dev-qt/qtmultimedia/qtmultimedia-4.8.5.ebuild
new file mode 100644
index 000000000000..b611af4c0596
--- /dev/null
+++ b/dev-qt/qtmultimedia/qtmultimedia-4.8.5.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtmultimedia/qtmultimedia-4.8.5.ebuild,v 1.1 2013/07/09 10:49:58 pesa Exp $
+
+EAPI=4
+
+inherit qt4-build
+
+DESCRIPTION="The Multimedia module for the Qt toolkit"
+SLOT="4"
+if [[ ${QT4_BUILD_TYPE} == live ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+fi
+IUSE="alsa"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}[aqua=,debug=]
+	~dev-qt/qtgui-${PV}[aqua=,debug=]
+	alsa? ( media-libs/alsa-lib )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.8.0-alsa.patch"
+)
+
+pkg_setup() {
+	QT4_TARGET_DIRECTORIES="
+		src/multimedia"
+
+	QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
+		include/Qt
+		include/QtCore
+		include/QtGui
+		include/QtMultimedia
+		src/src.pro
+		src/corelib
+		src/gui"
+
+	QCONFIG_ADD="multimedia"
+	QCONFIG_DEFINE="QT_MULTIMEDIA"
+
+	qt4-build_pkg_setup
+}
+
+src_configure() {
+	myconf+="
+		-multimedia -audio-backend
+		$(qt_use alsa)
+		-no-accessibility -no-qt3support -no-xmlpatterns -no-phonon -no-phonon-backend
+		-no-svg -no-webkit -no-script -no-scripttools -no-declarative
+		-system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg -no-openssl
+		-no-cups -no-dbus -no-gtkstyle -no-nas-sound -no-opengl
+		-no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes
+		-no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb"
+
+	qt4-build_src_configure
+}
diff --git a/dev-qt/qtopengl/ChangeLog b/dev-qt/qtopengl/ChangeLog
index d68520397105..d9dd855802e2 100644
--- a/dev-qt/qtopengl/ChangeLog
+++ b/dev-qt/qtopengl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-qt/qtopengl
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtopengl/ChangeLog,v 1.1 2013/03/02 15:31:52 yngwin Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtopengl/ChangeLog,v 1.2 2013/07/09 10:49:34 pesa Exp $
+
+*qtopengl-4.8.5 (09 Jul 2013)
+
+  09 Jul 2013; Davide Pesavento <pesa@gentoo.org> +qtopengl-4.8.5.ebuild:
+  Version bump.
 
   31 Dec 2012; Davide Pesavento <pesa@gentoo.org> metadata.xml:
   Cleanup metadata.
diff --git a/dev-qt/qtopengl/Manifest b/dev-qt/qtopengl/Manifest
index bcdb95f7072d..7a83c8874b83 100644
--- a/dev-qt/qtopengl/Manifest
+++ b/dev-qt/qtopengl/Manifest
@@ -2,25 +2,25 @@
 Hash: SHA256
 
 DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79
+DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357
 EBUILD qtopengl-4.8.4.ebuild 1435 SHA256 aecb13b6b598a93e3ddc42722b9ef470f23e37870b5244a52c9ae2c22e5d01a6 SHA512 95db1cc3f8b0cede3fda810a1f308b45b0a5836b78d6e310b8b485f5e0864997690aadf04928f3436e36504f739bfab5b8ee3cc2acc56fb24e94966279178583 WHIRLPOOL 3ca29cf71215519bc2c7c500d8f385fa6ce4675fdf3a12c5371a6d276e80c2cc741b70f4de0ef70f31e677447772e4e01bd1d9ee447acf8ec452c6a6f5c4cb43
-MISC ChangeLog 17360 SHA256 05fb26e1470841f93531f776bbfddc036cf1a7f5badfe992535aabc482417166 SHA512 26d17752541fe60eb6309e63ccbf1747931a6e83fd0932dc139d27992561515d5a0f4f14c5c1e98bffa20189ae1817b94fa44e5c1bf0b415d84bd3d38a21b633 WHIRLPOOL 162568278a7cf87724ace8725ee9e61a27ccd8ecc17bdb709c6e3ca87929bc6e51bea371037a5ebd34cdc950f68eb1689009c2c1c8e80f2189efe30cb916fe52
+EBUILD qtopengl-4.8.5.ebuild 1442 SHA256 364a6a163b3edfc8fee256330ad043f33bd85de7445427cce771403b3e4bbb17 SHA512 be796ac52a2268ea320154e03b2a44ad4d30e90a51df31885dcbf2ee3596b621a9ee188cdaa73c3a34683a0373b0487a254b20037129fec25cb316ea6f829b7e WHIRLPOOL a922a384d9ca551c3b09b79317679ae06ad6fce4f14fa36dbc10254ea8c191dd3988ca3ad8cd748161ea35c99e76f2681ef1837a2dd4e25126be8244017debac
+MISC ChangeLog 17480 SHA256 f2e8ecf9c58749375d11635502592f4e42d2e1dc841f0c43fdf8b34193e80f62 SHA512 12d814774afc51c6838deb8b1ca1413e9da1631cec91342737d78848778980b0866e7ab65ead15c24e5488bb2761bb5f31acabe034f45882acbe70d4aa62d748 WHIRLPOOL 8998e170d8c925e35a27872a137b83c5a549f7d4e758a0b3de67105769e3e1ae2da52f3259098510bceae2c88c8f592400742b403d402afb3ed02781e62b0ca9
 MISC metadata.xml 658 SHA256 7fdec67782aa5420b8fa978bceb6a109ef6e2f0cc0b466489536f8eb7ef329a7 SHA512 69d59057bb9873e6a7d99269346c2d3d4f1cccbe0f3b1dc08ff7abb1bb6196aebf9d2c763a4b0c07401cb0a8c8103784fa9c79254551c70a210a1df61b35069c WHIRLPOOL 81d2b4d2b324f87f25f1b4042efbe532900eccf5313f1fc5ab4649293a560e55660d2afbada1a5d066483b548b658edc2f8e86fbd1767c66e3aba7867173d62a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQJ8BAEBCABmBQJRMhtxXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRGODRENkQ2QkI1MzlEMURGNTkyNjYxNjUy
-QjI0NzRBRDQzQ0UyOTZFAAoJECskdK1DziluX+UP+wYFmBGoLk8yeTHeR9IEAh14
-HWAioH7UQhT3asrN00x3jwB47dcAyxzyrWnJ1np6Yy/aFsjjD0GbvQ9TZ4NDFY2w
-TrzAbMexCULnarSl0BRsvUQuzw9mssG8ZROKpSm3ENY2f+BiEMltvYqvhiFgeHkM
-EOC4lqIOiv07vvVpH8FrvNAuCmRLYe0PEQXq3LR44iQY+oNOhadSOrfxqtrXe1l/
-1x+T+P3UnJjz9XuaI3rT05ADU+pGvjPK6yHvVsJAVk/myaNVQ/d9SWn/0BO1BZez
-dvPsk3nNWYQjjUGjyGahr0lteEQY8dPZFINfsNsWystKKY57fJe27Nsjx7d9uVl8
-kdoweDOg2bTBW+BKrCRbClcUUFJzM6xRRIg3xdzhsqJtB14q2dNSvlVBGSjIV5er
-svQ447OoyDnUt6j9dHPhi9p+kOovlZGCAgKbAVkf77+KKIBRhwxMYrYwlH/DnCCr
-YyXvlqeoRwW5wmVK8nXMYPR1gmU1giEUf5qVrxwxu/TfMkAQnu7MQB8+BArEWF99
-3fXbCfj6ikbwrj/MoASIqElN8cXslm7vt/rF2bFwwOu8eeN6kyu352DfzANL+fwk
-iE2ha22CNGnn3vmjIXsQX3m6uvajl7B8WI0lqyXd+z/VIQibNMFoffmE1zl/YRHn
-n79cSr6taM8DvAmbal9+
-=thyt
+iQIcBAEBCAAGBQJR2+rfAAoJENXLsxwXqFxyM7EP/2ld5FfE/N1ZQCvoihNiFP4f
+IqRUPi5wJeNdQjd3R3ZgYbqgd8osW/cP5t0hhqP0MCbbCK+ihLzUKUF+ANJiCsn4
+Bo0HufC9WaZXfq4i+ruWtKISqdpvwaZFRHkDBUhIDqPHmnWSyeNg+wROqupltG7b
+RxR4iyQpnnVdcuHSA0+owKbFhNtXP5f854P9eBUJWJ1RkJ8pwoT4iwHGT6r3d7gF
+ZVTNZTUvIUp+Ob1NVktZYEtb9caydFliEtOKVKbJXFoF2k3lTPZtuNq2KrZP2miz
+n889Te3MqBXG1p753h7+5H/T6BARaK8GlnR4PcjzqsC1B7SfM8c0BmdouPaxIuC9
++a6OON9e5VMlvg3cQDCfUvxXDCghCE14Eh4Hh4irLsfWAViNaQ+7HUtaU8ujrZm9
+ZTjBZSl4YoqRqQysQGEor5kl3aSmlKdtJIHqV0JldbgbBSlQtwn0eQm+5HQHX9lN
+YSKOLOb3mBdGNSyH8lTEJ8EpxaCdC+uU0D5Q8uMRAhwEXQ+Um9kqXrLKOmTf9hSX
+0rz6fHNHjJWfGd/yLedxysPbGj37BRTjJBGV17wb4azPdU8oKT912lqC/45Ocp4y
+/3kk91zrW/y7qt5iwedeVPrhhapOouak/+vSyau09rQnE24HG7QM50GI4pyIfSSL
+5cGbw/TXfqB6Bl8neDU9
+=t8xp
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtopengl/qtopengl-4.8.5.ebuild b/dev-qt/qtopengl/qtopengl-4.8.5.ebuild
new file mode 100644
index 000000000000..f0b7ef797ebc
--- /dev/null
+++ b/dev-qt/qtopengl/qtopengl-4.8.5.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtopengl/qtopengl-4.8.5.ebuild,v 1.1 2013/07/09 10:49:34 pesa Exp $
+
+EAPI=4
+
+inherit qt4-build
+
+DESCRIPTION="The OpenGL module for the Qt toolkit"
+SLOT="4"
+if [[ ${QT4_BUILD_TYPE} == live ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+fi
+IUSE="egl qt3support"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=]
+	~dev-qt/qtgui-${PV}[aqua=,debug=,egl=,qt3support=]
+	virtual/opengl
+"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	QT4_TARGET_DIRECTORIES="
+		src/opengl
+		src/plugins/graphicssystems/opengl"
+
+	QT4_EXTRACT_DIRECTORIES="
+		include/QtCore
+		include/QtGui
+		include/QtOpenGL
+		src/corelib
+		src/gui
+		src/opengl
+		src/plugins
+		src/3rdparty"
+
+	QCONFIG_ADD="opengl"
+	QCONFIG_DEFINE="QT_OPENGL"
+
+	qt4-build_pkg_setup
+}
+
+src_configure() {
+	myconf+="
+		-opengl
+		$(qt_use qt3support)
+		$(qt_use egl)"
+
+	qt4-build_src_configure
+
+	# Not building tools/designer/src/plugins/tools/view3d as it's
+	# commented out of the build in the source
+}
+
+src_install() {
+	qt4-build_src_install
+
+	# touch the available graphics systems
+	dodir /usr/share/qt4/graphicssystems
+	echo "experimental" > "${ED}"/usr/share/qt4/graphicssystems/opengl || die
+}
diff --git a/dev-qt/qtopenvg/ChangeLog b/dev-qt/qtopenvg/ChangeLog
index c5158b4071e3..667885378438 100644
--- a/dev-qt/qtopenvg/ChangeLog
+++ b/dev-qt/qtopenvg/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-qt/qtopenvg
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtopenvg/ChangeLog,v 1.2 2013/03/03 04:18:28 yngwin Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtopenvg/ChangeLog,v 1.3 2013/07/09 10:50:53 pesa Exp $
+
+*qtopenvg-4.8.5 (09 Jul 2013)
+
+  09 Jul 2013; Davide Pesavento <pesa@gentoo.org> +qtopenvg-4.8.5.ebuild:
+  Version bump.
 
   31 Dec 2012; Davide Pesavento <pesa@gentoo.org> metadata.xml:
   Cleanup metadata.
diff --git a/dev-qt/qtopenvg/Manifest b/dev-qt/qtopenvg/Manifest
index 0ede79b5402e..aa85a15c7d02 100644
--- a/dev-qt/qtopenvg/Manifest
+++ b/dev-qt/qtopenvg/Manifest
@@ -2,25 +2,25 @@
 Hash: SHA256
 
 DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79
+DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357
 EBUILD qtopenvg-4.8.4.ebuild 1310 SHA256 667badc130abd36fb3e1170fa23d4f48af93b372df7860d956a889fd17e2ec00 SHA512 f2a96e04936c91bb4bef412d35488beffd61e3641d79ea9d6a794826839a5ddcc4bef88730cd3de2ea526b64fd67603fd88c0c6bab80c4c82c917b1a2d35bd38 WHIRLPOOL ef7e5355dda7311293eb8cb9fa07e6085d4e5e6fe14d06c2584b0355bdf58b6d605f4cbd0f9e02a4a388989e5a0a88999c780965c280d1ab489222bdc997bafa
-MISC ChangeLog 2911 SHA256 fb13ee4146d0a6920550292e5476d9cc57a091fd5b987b26c9ebaf4a5b6a1148 SHA512 d9b7cd2f8b594d32228c840e3b05a19ed00c716e4d3d1c0ebea937346e194f16b10a801fa919c7bed54911cc429da7f0ad6dc0c50964acc0d6889425b4f8e881 WHIRLPOOL e9718b785e25818886ece3ac67af978c1e63cafa31448b7678616b5c728e9064144b38e5f821ffe5dfb5c5dfb8ab9e8fb4cea9dd0d5fdc21c9d5d0e075ae4740
+EBUILD qtopenvg-4.8.5.ebuild 1311 SHA256 29e641722f985d10ade58f70761099eb7811468d845b10fba3ca3f11935ee36d SHA512 899d3721c80752cb44cbfa37f05651fee34304a9ee834588ffa25dc29f8b22e9f5d4942e0ceb87e351efb02cd36b64e4ca4d6370fc21d1acd37ee08a7733700f WHIRLPOOL c6ce3adbc0d259f5b365fdc9874e223bdd3e1fbe3c6e10c788818fcc57f7b3852e29d43b63bd486348ee309de61f04de6639eb37d6b436b41059a3f0b7d26101
+MISC ChangeLog 3031 SHA256 78ebadfe33f47380ebe0650da8a99833c8fbd6b9f0cfc4ef98b72696ed6ed9c2 SHA512 c8e84e83c0149afc15387827501c96b48fcf7b6fed4949b51323be87983128efbc672b793119520d8ae17bb83eb7c49878affd7c8b6f32cb2af329f2285d94e1 WHIRLPOOL 7047afcda35917be23e7ef757cfffb5ba84c3fb39bfc0f0bc5ea3f25d332c863ca9bf0f64b8354aaa4160d560a608d89e6cd775042a4fcf9d60bf97de6b927d9
 MISC metadata.xml 494 SHA256 167240e11d6a37600d1b71d53e3d7fefd67700ab1ad10c7b4d3bc04adde84431 SHA512 30c3c4b8bc1e898934caf7de5528b6088130fd094386f5e0804c45cb7d9b85a06fc50fd9b4c0ac584ac26167d380525ed3382a61bf02043efdf3fa4dbbd14757 WHIRLPOOL 9b5c7ad3f0e08e3d680592550d0431fc942bbd06b142779494dbcb65b449bc5b8db5aebe709ca208fc748ae5c506a2d9c673bdad0a132902a692d9f6822dfbc2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQJ8BAEBCABmBQJRMs8WXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRGODRENkQ2QkI1MzlEMURGNTkyNjYxNjUy
-QjI0NzRBRDQzQ0UyOTZFAAoJECskdK1Dzilu4NcP+QHw7M1U66UMQiAsU2OZfPU7
-s08QoRbqxpf5qRU0T3ElfHrseX4lnaxbR67wEysdBHjWg9N4gnqy7LnERNCjE/dF
-djjCVjov5KjlOecyQL+D5Uv23XNHX9ljUtf0OHAbzR2hQalmUk6RNfQzKnBcZLjY
-fod+XLL3szA6C/VM+ysF482x3th2VWNLKvNtJj8RrkyMnTJl1eejaxBJvr0mtdw5
-pQZMn1D0lW/gfOB3PFG4D8TrAVd7Bo1Weh99yrl0yufsIIXvld/lYzm8gvW/IiLP
-x1Tc5po+fuynhOE0/sjWOjKEsYll0W7KJBt0qaq/Q9w/LOTo7kaLqnjfxh01y7QJ
-HhMM1rUSqu9iYqw8EIx1Qd80I/LvWV4SRY6rEm3HqRBf7nQjhInebDrS2MoqQJdj
-gBaExRQ6PpT+1uTmiu1ZnQAXZ0e7+XjM98scGk2Tag7+dV0i6NrXCm3Psyv8XGnL
-bv7AY+zNqNlsxl05kPgCJLoZba5BlKMjv6NysekQ5aeWHaz3vtT74y6/Do6zI6Ew
-fMWXBH/U/XtZWnx+yFfoJcoyNCqhh0tDJYOQDHJHiIeMdCBaE2V9VBhsMU68+n1Q
-uTKJ4I51ERTgjOISPSM7pdDi/FWZ15Ork5DYMLqpBZjWZJUEuEh1V8gsFTWU+IQP
-/xDDs+G/Hz/3HzYxnlO2
-=BE6b
+iQIcBAEBCAAGBQJR2+stAAoJENXLsxwXqFxyE/AQAJCQ+O80+GAhEhknM86rIaSK
+EnjoXaCKgPqYOZRGlN63vyyv15GgJ045ur1GADjn3pvIXZ7ukbaZ8NOT+i9OV69b
+vdZjzYAcK5Lew3A6PdXBnv43zyFXkX5qj6eURmRSDw2QW1tpMPEAageHMXKfu4xA
+Ydnx8ufRAm/PgtOiCY5qv3HQmCyY2xrNiwWR4l92m/A2OTOzwBjX/tzbg/ar/IyC
+mZ9JuDj2O+Z3flmc8WHL9ggyRwfcHOJBASJZnecoIpxRrKowPrZ8xZdelplLI8DP
+QBT1sg/NTddu1+3gh0LahQ8iIxr9aTEWK5/U++iXgS+Vg8WwUxdOqGYIIprXohyD
+m6aq1XEKStoBGY0atewaMMosquZT1mzAJPKOyXMoszOxcnqhH6a1QcNQt3RXQi7i
+Yl9zz0O3d8jjaty2UsaehbcmPnovemeI5GM0InGW6yTjQr6WdN/9eJLl1K+EJPh3
+RZIhzm3jyaVLLZG2LsfBdDfaG7hp8OH9rSUlvCjsyBpMDCPkgWj8Y6brW0GCnwoj
+pg1P5zMc7lp3k6lVRVfAjnqn/5PlWeJ7tc+HmDgjEtgf0TJMO48BTHb7fUU2NdRS
+FG+cb0knhxidzdrsk3jPfJGSdKHX9B38W1tTXZMOr7n4rcaUuJ/yjENdvCYws+rB
+EBoHfquHKUarLf/imFYz
+=nG9g
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtopenvg/qtopenvg-4.8.5.ebuild b/dev-qt/qtopenvg/qtopenvg-4.8.5.ebuild
new file mode 100644
index 000000000000..8b6653418731
--- /dev/null
+++ b/dev-qt/qtopenvg/qtopenvg-4.8.5.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtopenvg/qtopenvg-4.8.5.ebuild,v 1.1 2013/07/09 10:50:53 pesa Exp $
+
+EAPI=4
+
+inherit qt4-build
+
+DESCRIPTION="The OpenVG module for the Qt toolkit"
+SLOT="4"
+if [[ ${QT4_BUILD_TYPE} == live ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+fi
+IUSE="qt3support"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=]
+	~dev-qt/qtgui-${PV}[aqua=,debug=,egl,qt3support=]
+	media-libs/mesa[egl,openvg]
+"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	QT4_TARGET_DIRECTORIES="
+		src/openvg
+		src/plugins/graphicssystems/openvg"
+
+	QT4_EXTRACT_DIRECTORIES="
+		include/QtCore
+		include/QtGui
+		include/QtOpenVG
+		src/corelib
+		src/gui
+		src/openvg
+		src/plugins
+		src/3rdparty"
+
+	QCONFIG_ADD="openvg"
+	QCONFIG_DEFINE="QT_OPENVG"
+
+	qt4-build_pkg_setup
+}
+
+src_configure() {
+	gltype="desktop"
+
+	myconf+="
+		-openvg -egl
+		$(qt_use qt3support)"
+
+	qt4-build_src_configure
+}
+
+src_install() {
+	qt4-build_src_install
+
+	# touch the available graphics systems
+	dodir /usr/share/qt4/graphicssystems
+	echo "experimental" > "${ED}"/usr/share/qt4/graphicssystems/openvg || die
+}
diff --git a/dev-qt/qtphonon/ChangeLog b/dev-qt/qtphonon/ChangeLog
index 4b1deacf40ec..ef81e04f2fb2 100644
--- a/dev-qt/qtphonon/ChangeLog
+++ b/dev-qt/qtphonon/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-qt/qtphonon
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtphonon/ChangeLog,v 1.1 2013/03/02 15:32:28 yngwin Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtphonon/ChangeLog,v 1.2 2013/07/09 10:50:25 pesa Exp $
+
+*qtphonon-4.8.5 (09 Jul 2013)
+
+  09 Jul 2013; Davide Pesavento <pesa@gentoo.org> +qtphonon-4.8.5.ebuild:
+  Version bump.
 
   31 Dec 2012; Davide Pesavento <pesa@gentoo.org> metadata.xml:
   Cleanup metadata.
diff --git a/dev-qt/qtphonon/Manifest b/dev-qt/qtphonon/Manifest
index 0f57257a4784..b6114b28dd90 100644
--- a/dev-qt/qtphonon/Manifest
+++ b/dev-qt/qtphonon/Manifest
@@ -2,25 +2,25 @@
 Hash: SHA256
 
 DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79
+DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357
 EBUILD qtphonon-4.8.4.ebuild 1351 SHA256 5ac1e778b83b1cd7443aab1ab442c902c210c9e0f09be793b57f56b81ec7c554 SHA512 e6b7770cf693b8b11d358dc48521b57692092d3e44bdf776e8c56af537bcbe0f70345a629ada2d7506f29391c772c85be77d7b810492658b6790dedee9edba2e WHIRLPOOL d0aaf6de1e1d1679420b2ecb2c146b8c4d8d0133af4c79b4e96f8ea01fe831d7351f61bdee95315d3f5efd5da316a2c0c42b775b38ddbe1abe3b488c8d7606af
-MISC ChangeLog 16539 SHA256 6f4ef87c67844c501c59d370e1158b8c9de26b9ffbf47fbd05f4e291b20c0feb SHA512 3a356e3f934de0dfc86606e9816527ec5874f3e27543aa91c4a0c46136115c54c93239bc8da69766b3cbef9c1f09c5760c70867b4e1565ba89b6769c81fff72d WHIRLPOOL 8a1bc3c1681b643d2f368d0307cee30fa98e9a74743a1f3e83094bcb2e1756359f94a555e44208968f0aea16a10d3a2379e81f5424f1abd967c02645603c76d3
+EBUILD qtphonon-4.8.5.ebuild 1279 SHA256 25854bea6692f4f252b8ab25b59747f662776827fe1a0809f1d141b55d16c88b SHA512 9b8316fe7a1da42b48ad50cbf7b16d3eda76d5f30be7398a191dcff3a6bff5d1c361fc36653b427a1725bc2b98f48b8051de853d75bda71a6ef331273ad59ae1 WHIRLPOOL 369668c87525e024288474e3fbdc97ef8fb55563ab11c5862b97f90db5633d4ba6c1f475a36f2b0d9d1013c4030f68ddc1d0bca8c5b3b12986d85f41ff9d7616
+MISC ChangeLog 16659 SHA256 c4f5611db01a7d23b4c15b383fb6bf2baa7017b980617ea6ecf041aa1640e94f SHA512 4891eba3f35787e2a9cf3b4d4fbc621ba0f68409aec549f63fd38091acb156efa01fb93a2a3c1bb7d0d2c3a8a2e5dbd91cf1a07ffaa4650149f2c4a82301b7c5 WHIRLPOOL 4eadeeb7c9c2c22ef77a0be436b05dddcd62a121fb96c631d49bba02e6129f3297c50562f8e377a13617822dbc79db6d5cc22d01d397eb0e2706ebeed30e7c6f
 MISC metadata.xml 634 SHA256 b64e3e0518a5a597e682e29cb6e92e2bae0c8eed16c5b2de657bfae7be13decf SHA512 3a3387ebc1321f15311743a403a8df431f4655d1fc045284967fc9b2f354e4b313110f4f45f351509eb637c7640dc86bcdf0d06397b0319e1c795415f956bd6c WHIRLPOOL f9ce9ae051f3b08814d3ef34157fbec3402577dbcadc50b04d95c7c700da74ed78e6fdccd638a37b185ee667e0cfa9f2c66cdde130d32f753799f417177d2a49
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQJ8BAEBCABmBQJRMhuTXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRGODRENkQ2QkI1MzlEMURGNTkyNjYxNjUy
-QjI0NzRBRDQzQ0UyOTZFAAoJECskdK1DziluuxUP/3xcQicUmkSGWbYShraFkeT8
-YJV21gAqRkgrZTFwqTztDu4eFHebnk7jcWpo3weF45UCpedKTzVsHDhFG8vXAkQJ
-fmKceyiO9mlqb6DH2sQe1/k+JUSzMRjASvALwxnViDb0BEgHQMkG3laZ0r/Kz6/6
-5z4AMm7ZTp/PJtXq1bYSIZ3ti1bY315Yv2kz7ztHpuApYEGMHOWlKiA+4XvSDT+G
-HLuSd3+t5L4+SSYwOkCtFs4+kvJkGD5/RTmHh4ERoA5aHNOb5l/Zp4009r0KpA1C
-m46qmDBeTQnlJk4Ag5CkQ64YV/Gn2CoB0lxNOp8R/PZ5bMRYT4p3RddPZdZ9J0Uc
-coKlX+A2GeytxTnknvNG1RExqJKECKI6U2E0YzWylXZADsn+E6rpZUsNVlmOwiRC
-QLx6Qkyw4yWmpa0B5lEFQIx3wBiowL12k4ELvb8kLXJxFZRRK3nvbZGPnFE7F2Pg
-17EHSazMm+GMDN/rMGDqEFlKAdLZSzowi9heon+WuZAzIcwcaHi/8C4Vt0UwD7DB
-s6JSd/A5OEs3eyKl4f0VngCj8jIbhaND3/KWvdeZK+fxaMVQTmR6yKLqzPYMcYTD
-odS4oHcd12DFVhtEY8U4Ok4t1gukP0QJbc2zLg/EIfhmSvRleQ2QnhtKFGB37HGL
-OOhfUIdjKRntQjQpXj3M
-=0yBS
+iQIcBAEBCAAGBQJR2+sSAAoJENXLsxwXqFxyFu8P/0YMbAghgaAjtxFqcP6Ce7B8
+okxjjDWX88g9LDFTEkZWv1oZuWtOcHWLDabuJTWqre2/kaBsiKhjNwmT1P5lVkzd
+LUOGA4kXR2NqsJQI0XJoc9ehZ96axXT7ZqXcvLmUcJ3+nc1USCi+ycUsbI/neOAI
+MT7QWgPb+5GbEOsJ9Rqs/MK0Px//iZSwoGbVpJaYNWSoePKG/eSNvw2TnUAJYCaU
+A58e23b93ueEizEmrawD4CLlDYbnC/eGKLWCjxNpZbvs1ndXe2ShZGSQYiUUMCF8
+y+PuYnAd/ndVqs7HQcwOFRMs/ut3GSzIAcJ14FEh98Qxh2umfAKs0Bp/0YyHVrC1
+7B7+R22qEqg78rriK3Spictj4mwfihHqf1EgbAY3gpPKG68/6T84XwNRUUTGQ55H
+OHRce4aa/dCUiozb48OoUYf/YVW1GRLXhJk15gchdSWNf/cR5DJIug/qztCbr62L
+jjVOPJtZ2FjvvCVSI7TJBvkpusydADlLGlqhk9kN93oC/rhusPzEIpM19gITNwGK
+yV42fVkiOkpEOzoThw9GDZ9whY94+3aXRNSvX/VI5cOZL5drq3iPdGXwC2QKjuwv
+0AHtjkw27d/pTohuIMacK0dMaXFRtWBDzNc8ryidZC4QjahAky7ohQtpj4PyuD9d
+T7eFhN1TtAR3gDjc8CIG
+=thMI
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtphonon/qtphonon-4.8.5.ebuild b/dev-qt/qtphonon/qtphonon-4.8.5.ebuild
new file mode 100644
index 000000000000..0992fd27f08b
--- /dev/null
+++ b/dev-qt/qtphonon/qtphonon-4.8.5.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtphonon/qtphonon-4.8.5.ebuild,v 1.1 2013/07/09 10:50:25 pesa Exp $
+
+EAPI=4
+
+inherit qt4-build
+
+DESCRIPTION="The Phonon module for the Qt toolkit"
+SLOT="4"
+if [[ ${QT4_BUILD_TYPE} == live ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+fi
+IUSE="dbus qt3support"
+
+DEPEND="
+	~dev-qt/qtgui-${PV}[aqua=,debug=,qt3support=]
+	!kde-base/phonon-kde
+	!kde-base/phonon-xine
+	!media-libs/phonon
+	!media-sound/phonon
+	!aqua? ( media-libs/gstreamer:0.10
+		 media-plugins/gst-plugins-meta:0.10 )
+	aqua? ( ~dev-qt/qtopengl-${PV}[aqua,debug=,qt3support=] )
+	dbus? ( ~dev-qt/qtdbus-${PV}[aqua=,debug=] )
+"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	QT4_TARGET_DIRECTORIES="
+		src/phonon
+		src/plugins/phonon"
+
+	QT4_EXTRACT_DIRECTORIES="
+		include
+		src"
+
+	QCONFIG_ADD="phonon"
+	QCONFIG_DEFINE="QT_PHONON
+			$(use !aqua && echo QT_GSTREAMER)"
+
+	qt4-build_pkg_setup
+}
+
+src_configure() {
+	myconf+="
+		-phonon -phonon-backend -no-opengl -no-svg
+		$(qt_use dbus qdbus)
+		$(qt_use qt3support)"
+
+	qt4-build_src_configure
+}
diff --git a/dev-qt/qtscript/ChangeLog b/dev-qt/qtscript/ChangeLog
index 6cfed4e4d163..d22dc633d3e9 100644
--- a/dev-qt/qtscript/ChangeLog
+++ b/dev-qt/qtscript/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-qt/qtscript
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtscript/ChangeLog,v 1.3 2013/04/08 15:18:21 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtscript/ChangeLog,v 1.4 2013/07/09 10:47:15 pesa Exp $
+
+*qtscript-4.8.5 (09 Jul 2013)
+
+  09 Jul 2013; Davide Pesavento <pesa@gentoo.org> +qtscript-4.8.5.ebuild:
+  Version bump.
 
   08 Apr 2013; Davide Pesavento <pesa@gentoo.org> qtscript-4.8.4.ebuild:
   Improve description.
diff --git a/dev-qt/qtscript/Manifest b/dev-qt/qtscript/Manifest
index 035e343e2abb..8dd9b7d2e6c6 100644
--- a/dev-qt/qtscript/Manifest
+++ b/dev-qt/qtscript/Manifest
@@ -3,23 +3,25 @@ Hash: SHA256
 
 AUX 4.8.2-javascriptcore-x32.patch 1011 SHA256 7a20c0e70285f9506b2d1316ff7d034943e5a6885ed50c5364f276bc8e648d36 SHA512 d24778a440daf1bb9d3fd97c2fc0d55de3e80485054b26128a9050e8b940ccfe6fb694bc6ec94e1673e35c7ee50d1425945093268f7a642e71fefa354524868a WHIRLPOOL f4d475b353619a0c0c8cddfa506ea8f9d166230512540b84bdf4acbcbb046e155ae1bb2dd4d0e0a26f4c0c07011b430bafe8750230d7804e8a46e63135c674c5
 DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79
+DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357
 EBUILD qtscript-4.8.4.ebuild 1649 SHA256 a2d70cc93e2e8c4d4d5335c1f675fc87cbe0fb123fed68cb7a0f95dba7ae82c9 SHA512 86d5769dd7ad2c28584650bd7b39e6611c10141f8943ee1a15068612f429880e8bffde059bd232928606d0b973727a0f536a51b6eeec72d79e48e27ca92798c6 WHIRLPOOL ee8cb3adcf258a1408669d2fb88cf5ef797b25fb976d40b4b5512f602b36b80550f5c9c576ab821d7941bc9adcea7e3163397a0c704d4939b0a747fbefee379c
-MISC ChangeLog 18465 SHA256 990a817069518e67bbb52a6ce649f53291ca82a3ab1326bf232f411265b209a6 SHA512 ed77916c8dd9acc56e36494c8199b76847455505f8c9c4b9631fe204ba07c1d1da788466c24f5701ae222c800ddc98d2f6e8a578e378d2af974f464b1ec6a3b2 WHIRLPOOL a0dced9fd5ab0a87115253e3a320a5a1aa7c05f3f87915fb680dd683510317e12d758d162b5075dd6772dbfca9d9248d59a9089541a404cf13587cf2885f4b2f
+EBUILD qtscript-4.8.5.ebuild 1658 SHA256 9390fd9f0630610c603c94cdb33feeb9649ddabf7ba580bfeb999a453e5d89bc SHA512 a9eb772380ad44fb5bb02cbf542f6be704d79248951210e650b4f0c422cc31b539a8577e040bdfe412a54590674b8d87e811f17b50408027ca495b0fe4d9b1ae WHIRLPOOL bdc4a2ce1a9e135359ace3b88336a1fc3c235c2cfaa55529a39f025946d390361bdf60e9018cac4f3a45310ca0294e529f1b2757868ffb4fbbbe5ba36e1e3d3d
+MISC ChangeLog 18587 SHA256 06f86f1a8c18b75ef6d6a121a2ab0bcfe458a90d3682cc21b11bbd6aaa607762 SHA512 b0fc27a98e0e41786cc1a363b5c08b62eeadb56ad7d87c88ead472f97a89c8dd0882bd035615d32b649da63ba60ac103a2942e12bbd4595dc8e14964dcb2900d WHIRLPOOL 83cb56207f7a2c6129f56fb5fb42d92b55ca1ea1c792686ea62670041098abab8017b55ba5414519c1942f30031525e48902d307910f6e33b782c4ecabeca8d9
 MISC metadata.xml 484 SHA256 e4f3a32784240897cd44c3c645b61cc8a6ff19bd821be35a00e5e8bc02085cda SHA512 ef88ccf92f3d370f7c70c18eb2727b279ddbcd04ce734014b02915b8ba32bee8a8ab2a3608b58b0305c48fe8073af99184b69940413ed2101be64bc50ee7ec11 WHIRLPOOL d68e07f14ea07c308a25487c89f382ac47ca9adfc43a6d1e641cb057b36537eb9ce860bc5cc7bfc702bc75d4ff49ffdee016a6f4ef70df27670f5fbd9753390f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRYt/HAAoJENXLsxwXqFxyduIP/3Ht/KoGsCS6ObSNNBHn1rNL
-/hxygcC13yF3nRca274A+ET3I8SwTDU1kME3qwBbf8zXmHdr8cDRoHKMbZVprqgu
-ggILNfMSKoJOIsjVbhFgumXEA95Jm8eSR2qAGG76X01hoe4F0a4eQYoNJXbRZU1f
-Hf0L5cqptZQ+XihDGgHFf3PLXPdgZptIPBEKwv2Rvzy3aWy+/inDicQ8huU+t5Al
-c6bXGlf38wQWSQ4jYEYIca8Dw+CO8zOooRDSfytriw044cidQrv6x1WIX60YpEXR
-mmpGcY/HTrLId2H3hHRYIiy2TOo04KEdGBbiR6JBGDYBmrqXp09yBeL2P7LvC8dw
-ufMCAT+3f3rPVXpuEXcIBv2dC4jXXt4azFg37DyRp32YXeARFNX1Hcsby5OOhEk2
-OVSn1Fr4BcWQ5d2G4mmgR1xgfg43MqSznjGEUlfpQfoWHhANcrOHkvNC5+GD5vmR
-vyXstaeM38plUrmP2tD6tQW6QpUm3GkkM9KrdTxv2kS6GyLYKFIOf/KeN/R3UyUO
-gvZIjOs4rQSFYGIPF6AlOemIud68PdCxfpwZhqOeB0DBbbsLZS50tTyCsVFKxl5V
-18M6LIzQNZv2VSHY6zmjto0XUEYpow61eVOZ6RaQPMU2ZG7ghxeFBeI8UllqEYkS
-hGpC1KJFD4XAc7uwc5aZ
-=KovJ
+iQIcBAEBCAAGBQJR2+pUAAoJENXLsxwXqFxy0EgP/2af+qJxjfXpw7bfgE7AFcGK
+aLmYF8Z2I4UyeGYLqnu70X3aVNo9FKgq0XVBPHsIJgq/697HYgjZCGal+AiYl0C8
+nDU9dZzZ7nNesbOF0Ex3N4cU4SAjfs1BVOjeBsZzBybBNVjj2ogBhEqHITHXEW3m
+8Aqlwim5bns0CoAJojjIiku7sbM8GPAItHbx+cIYxHZMUNqFGRmNo86WbvWk3Kzz
+djHkF2eJp8LvJfyzmgZVvEuUVUMQoTj3JYwIJOI+aPz1wqzYC7UNGo8va3m8HHie
+EdJcepLIwP7N5pTjvRs6et/YeIgyps/Yx4VAGt+oXrfxBUQ+w7ZulSdKFDqdCYDE
+GT3LpwM3fKYeJBGviJXdNxga+4JeLmSPT1U/6ungfHqw/iWpUKxtyikPZjwbIlB2
+k4c7nKnkFnn8a1By42JJiMiKG/vOSI/9zXkpiOblQx7JBzeYu/jhsBH6xgKlZKV0
+R8kxhEgU5ko8mHbXKgU5QFwwnB4F6zjELDPMSmSbnaylx/+ITSMKJkUWr+dWAl0B
+0dkYqsZodgVKkTvUitCA1FwJzktnDdXTuMiOome2Y31ByWwtWBu0S29knszwqM0x
++zqldSxyIOPxHvfJLHOj/ora6h0Tnso9v6rwz8jqh7klznO8Hfrv/stzLPkmXLvT
+7rHrV2Uki/LpUm3DpsDZ
+=vAZI
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtscript/qtscript-4.8.5.ebuild b/dev-qt/qtscript/qtscript-4.8.5.ebuild
new file mode 100644
index 000000000000..37b6e683ed5c
--- /dev/null
+++ b/dev-qt/qtscript/qtscript-4.8.5.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtscript/qtscript-4.8.5.ebuild,v 1.1 2013/07/09 10:47:15 pesa Exp $
+
+EAPI=4
+
+inherit qt4-build
+
+DESCRIPTION="The QtScript module for the Qt toolkit"
+SLOT="4"
+if [[ ${QT4_BUILD_TYPE} == live ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+fi
+IUSE="iconv +jit"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}[aqua=,debug=]
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/4.8.2-javascriptcore-x32.patch" )
+
+pkg_setup() {
+	QT4_TARGET_DIRECTORIES="
+		src/script"
+
+	QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
+		include/Qt
+		include/QtCore
+		include/QtScript
+		src/3rdparty/javascriptcore
+		src/corelib"
+
+	QCONFIG_ADD="script"
+	QCONFIG_DEFINE="QT_SCRIPT"
+
+	qt4-build_pkg_setup
+}
+
+src_configure() {
+	myconf+="
+		$(qt_use iconv)
+		$(qt_use jit javascript-jit)
+		-no-xkb -no-fontconfig -no-xrender -no-xrandr -no-xfixes -no-xcursor -no-xinerama
+		-no-xshape -no-sm -no-opengl -no-nas-sound -no-dbus -no-cups -no-nis -no-gif
+		-no-libpng -no-libmng -no-libjpeg -no-openssl -system-zlib -no-webkit -no-phonon
+		-no-qt3support -no-xmlpatterns -no-freetype -no-libtiff
+		-no-accessibility -no-fontconfig -no-glib -no-opengl -no-svg
+		-no-gtkstyle"
+
+	qt4-build_src_configure
+}
+
+src_install() {
+	qt4-build_src_install
+
+	# install private headers
+	insinto "${QTHEADERDIR#${EPREFIX}}"/QtScript/private
+	find "${S}"/src/script -type f -name "*_p.h" -exec doins {} +
+}
diff --git a/dev-qt/qtsql/ChangeLog b/dev-qt/qtsql/ChangeLog
index ae2df858004d..36eff27a5278 100644
--- a/dev-qt/qtsql/ChangeLog
+++ b/dev-qt/qtsql/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-qt/qtsql
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtsql/ChangeLog,v 1.2 2013/03/03 04:20:47 yngwin Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtsql/ChangeLog,v 1.3 2013/07/09 10:52:28 pesa Exp $
+
+*qtsql-4.8.5 (09 Jul 2013)
+
+  09 Jul 2013; Davide Pesavento <pesa@gentoo.org> +qtsql-4.8.5.ebuild:
+  Version bump.
 
   31 Dec 2012; Davide Pesavento <pesa@gentoo.org> metadata.xml:
   Cleanup metadata.
diff --git a/dev-qt/qtsql/Manifest b/dev-qt/qtsql/Manifest
index 8668eb7a37e0..01059ca6912b 100644
--- a/dev-qt/qtsql/Manifest
+++ b/dev-qt/qtsql/Manifest
@@ -2,25 +2,25 @@
 Hash: SHA256
 
 DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79
+DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357
 EBUILD qtsql-4.8.4.ebuild 2491 SHA256 4dd62ade7813d080e94bef6783eff012239b37170205996d10c9d4870d0dbfb5 SHA512 1cf89734f4323bde026921ea82fb7a86e0fffde761fedab44a72c6acd2f664c9395be638554ebde044b207b8e4d33d102a4904b122ad1a3a5057dc99fc61cc71 WHIRLPOOL 493d3118c0c1775121083f6ad351d40d7856c6572732c6683bd8061d2883b6e91113074e9be58e49070b920edeb6f3d83b6612429ad188f48900b6eeef9be189
-MISC ChangeLog 19754 SHA256 16042e15ab0628e8e381f35c5047abbeb47678d8fd005cd2a6533722d7186c40 SHA512 5b48711a1f5e6618166eb002e53f38954ab64f7869ec7df73a26f5c651b540be869c2d80ac16c60167d10eb7e72ff12c64f57b19d2f1b63ebe515ee9b11975b7 WHIRLPOOL 5ca90374c79df344d0ed6aa098b6e6856f83ff464662eeac0f6a13a7dd5ac78876b8fa9b21d5d848e2625a9ae586c59096d38dfd058080e1a184e6459c9ecf67
+EBUILD qtsql-4.8.5.ebuild 2498 SHA256 25f7b56f7d7f2df748e927dac53cd3e27f2497d1da1196884bab4fb2802237c9 SHA512 bf5da2f3782a04fd33199a770d1cb62c031be6396a60b42c738fe0a30c16309d22759cfa33b5181f1678f53e23d9f79ccff1fcd3c6dac897034131cb8272aabe WHIRLPOOL 46dd08384406640ee2e080b3bbcbb2d90b26d4cadd3c3bcc0f62b24c765534a86429719143dbfe02098dab46b41f4eb14c875d4700f3cfae150bdbed1a531613
+MISC ChangeLog 19868 SHA256 89c3176792dfaaa368d8b89ce939c28a69d16a63327c0bfda6fe821aade4ff9a SHA512 9b7bea39e32788bcae8dd7289d14975251349bd57644989060e5d6b50711ae55073fa83ff358136fc4b70a4b56007dfb43649e40bc06699c35b25c8039137862 WHIRLPOOL 1e272e2cd0f90f52b368ceabca9d7c0ffdfbf466eb565c21e32be5f48161ab3be9bcd3d0a3c1f951d91c1cc78ed636e6a9918547fb032efe19752d45c406f6f3
 MISC metadata.xml 557 SHA256 c5a26c7fba2094066fe31576bf73427ff216fd6b7f85421101e5466424dfff4a SHA512 8b78c0325ccf4439d87f9de6e6bb032e20caef10d5cd126d266c928f0deeac2fb9fc77fcce7c763fb3133a8cce907fe8f9462fab74fe8509a85f4edf49769960 WHIRLPOOL 9b15e75ae1e15f7a140e49c85efea8ebbda065cffd09588f391fa2e4d801ca36e965e9fd04f5e91d53f9a88bab5e1cc0153a0319c6fb5cf0483fcd671296b79e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQJ8BAEBCABmBQJRMs+iXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRGODRENkQ2QkI1MzlEMURGNTkyNjYxNjUy
-QjI0NzRBRDQzQ0UyOTZFAAoJECskdK1DziluPmEP/RmPELmJvpjzct2ZVqcpQczg
-37uXRF1S3Cr+R0JPvwhq77s+qyv5zSrH37G1IxyOdBhI3H07lQcMnT5MluaiO2f2
-7POnkTmjorM9RwXwrH+3wiAhIFOQs2rz4myGu5Dmgru/ZHFRYr3Sv1Q09dBDPLDJ
-8BtNatM8rgmjHY2oOdQd4geMp4gdN/9sj45r2xZQgVXgV26LP/j0W/lvKx43Mhdl
-4fq+cCSdUNWze5c3hizl323l9JW4dc/vkSvHajpzal9bpK4JONrn1sqxXBta5ATz
-xEEgzPhOuj2unZtF0hqi4KHisPycPV8n6QY1y9KEVjCVHkt4bjhT1dWJNO79VetW
-yI9YfnX9IDg4v/floJU0RvQg4Ouw7UD7lsTnUDotOjw5LZLhTmMBaOsWJbKR/lhj
-UecI+xAfYLyioEUZSV0mS64WtFNgmtBKPcvTXslh0T+elqIuH5Eo1ztdzxQHVarI
-0R4Ir9hY5vv+5gwKTP4oBtIplcGTGnxC3jzvOvu9IMWWFhSTl8jcNdjr18ZDl8KB
-4ZPHP6gjzDUoFXrfRuH0P2R7aFPCJQsYDhQQxS2fxKlqJhNYl5PTjRhXLkchtJ9I
-5RHJWcwz45xKNrRpLqFUXu1AlMnvm4Pi8wiHq5o/4puxD2RMCqDvWwdO6CIBBMx+
-vXtOucBhLIALGtoxbAVx
-=3otO
+iQIcBAEBCAAGBQJR2+uNAAoJENXLsxwXqFxyl1gQAI0MU7XfZ0Eg8DnXAiwGUalH
+NGhGVHDg4i94M+uh3PH+0RTLgT9BRvePZsUjUTZfpKh9JWnI7qtQ08GnXD7jNL4X
+/zAUXEkYOYMCX+yG3YbgfmUIJLzf9OO44GUjnPSzZbqhOoYifGwzeGQ65kgdzMyH
+Tv07RxluOgj94s+/48tYgYkl7EYCqB+aPUxVRnquNVeEs2H8i+rac2s2uSA5Qb8h
+h7sNot5VBySQux15WEsTVRYXlEbFvwFGR5ZFs7WplUDSIuiVCOyG3xd62MzC4GIV
+bMin84nO1+vH3Z7OZ1AtGkLef6EVMIsTDFJNrnbr0S+sHpiWOYM0txnt3UlqVWDS
+SKfokVJ+SwOnW0BjiT1yVgh3VtkBZ0uvpB6mTuzWV+4jTjqB5+c6yIj9PWsZhRz/
+BUraNcUM2YFxJ6PJM61NgTYQ7mkX05H+avFuQEbkCUudPAiB8tI8pY4Loe2SkL5u
+qngButwZpB0rEsmJEvXj1Shg6D3udZWKXThITGRPZSFr/Jko+3P3N6z4hlcb5VjQ
+58oG7facrjdMbusZf/PAOQYDOSPpJoAWClraqqU7kN0sz9lcy9hxJHswaH6P8P2O
+VdwWlaqqvry1lKgaqzvUOe0mBomzLdiZeo6LFgPJoQ8AWpIvHi63Ys6B+qxzHaUb
+dqqDubd1CgHBRKSs3TvG
+=j35N
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtsql/qtsql-4.8.5.ebuild b/dev-qt/qtsql/qtsql-4.8.5.ebuild
new file mode 100644
index 000000000000..898343c104c1
--- /dev/null
+++ b/dev-qt/qtsql/qtsql-4.8.5.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtsql/qtsql-4.8.5.ebuild,v 1.1 2013/07/09 10:52:28 pesa Exp $
+
+EAPI=4
+
+inherit multilib qt4-build
+
+DESCRIPTION="The SQL module for the Qt toolkit"
+SLOT="4"
+if [[ ${QT4_BUILD_TYPE} == live ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+fi
+IUSE="firebird freetds mysql oci8 odbc postgres qt3support +sqlite"
+
+REQUIRED_USE="
+	|| ( firebird freetds mysql oci8 odbc postgres sqlite )
+"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}[aqua=,debug=,qt3support=]
+	firebird? ( dev-db/firebird )
+	freetds? ( dev-db/freetds )
+	mysql? ( virtual/mysql )
+	oci8? ( dev-db/oracle-instantclient-basic )
+	odbc? ( || ( dev-db/unixODBC dev-db/libiodbc ) )
+	postgres? ( dev-db/postgresql-base )
+	sqlite? ( dev-db/sqlite:3 )
+"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	QT4_TARGET_DIRECTORIES="
+		src/sql
+		src/plugins/sqldrivers"
+
+	QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
+		include/Qt
+		include/QtCore
+		include/QtSql
+		src/src.pro
+		src/corelib
+		src/plugins
+		src/tools/tools.pro"
+
+	qt4-build_pkg_setup
+}
+
+src_configure() {
+	myconf+="
+		$(qt_use firebird sql-ibase  plugin)
+		$(qt_use freetds  sql-tds    plugin)
+		$(qt_use mysql    sql-mysql  plugin) $(use mysql && echo "-I${EPREFIX}/usr/include/mysql -L${EPREFIX}/usr/$(get_libdir)/mysql")
+		$(qt_use oci8     sql-oci    plugin) $(use oci8 && echo "-I${ORACLE_HOME}/include -L${ORACLE_HOME}/$(get_libdir)")
+		$(qt_use odbc     sql-odbc   plugin) $(use odbc && echo "-I${EPREFIX}/usr/include/iodbc")
+		$(qt_use postgres sql-psql   plugin) $(use postgres && echo "-I${EPREFIX}/usr/include/postgresql/pgsql")
+		$(qt_use sqlite   sql-sqlite plugin) $(use sqlite && echo -system-sqlite)
+		-no-sql-db2
+		-no-sql-sqlite2
+		-no-sql-symsql
+		$(qt_use qt3support)
+		-no-accessibility -no-xmlpatterns -no-multimedia -no-audio-backend -no-phonon
+		-no-phonon-backend -no-svg -no-webkit -no-script -no-scripttools -no-declarative
+		-system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg -no-openssl
+		-no-cups -no-dbus -no-gtkstyle -no-nas-sound -no-opengl
+		-no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes
+		-no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb
+		-no-glib"
+
+	qt4-build_src_configure
+}
diff --git a/dev-qt/qtsvg/ChangeLog b/dev-qt/qtsvg/ChangeLog
index baf2c3f1aa5c..39fbaa7e9461 100644
--- a/dev-qt/qtsvg/ChangeLog
+++ b/dev-qt/qtsvg/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-qt/qtsvg
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtsvg/ChangeLog,v 1.2 2013/03/03 04:21:38 yngwin Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtsvg/ChangeLog,v 1.3 2013/07/09 10:51:55 pesa Exp $
+
+*qtsvg-4.8.5 (09 Jul 2013)
+
+  09 Jul 2013; Davide Pesavento <pesa@gentoo.org> +qtsvg-4.8.5.ebuild:
+  Version bump.
 
   31 Dec 2012; Davide Pesavento <pesa@gentoo.org> metadata.xml:
   Cleanup metadata.
diff --git a/dev-qt/qtsvg/Manifest b/dev-qt/qtsvg/Manifest
index 6e3df97ef259..80738adad95c 100644
--- a/dev-qt/qtsvg/Manifest
+++ b/dev-qt/qtsvg/Manifest
@@ -2,25 +2,25 @@
 Hash: SHA256
 
 DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79
+DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357
 EBUILD qtsvg-4.8.4.ebuild 1494 SHA256 525ddff38425239a826416843fba84c1e25b40ca5375a02e0bba6dc61b705848 SHA512 230031e7652435cb4afac622f6f0cc8d838d9245b58f4278b354af4def1295f07e01df5570fd974bf014dfdcff24656215b79104dc826459c3e3d7c94e7a274b WHIRLPOOL b995aa493eb5c9d0fbd6f3c9e74f1ed616612f50148c37386a97f4564e1b1eb763089e7e6420b5cb414fdba9b0e1a6bc2865b23c3c63f1db90903bf58c5083bd
-MISC ChangeLog 16052 SHA256 66f39cc69234fa208dfc125dd9befbb764c93b7dd116f2d576a598c417f7cd91 SHA512 6014b399d5c6f89c03418ea23f675a16eae01dee24237590a3be0943ffdf5b057c5c3f6a894e72242a303618b30b868327175f733f50f63fb423aac09cb66c59 WHIRLPOOL a185a886b8149499242ecc3fc6cc9c769be4808085c231a360cd981170d3f2707f5b9895f57ac5bd11b83e4c38871502da940d035dad1dace107b2fe24b063fc
+EBUILD qtsvg-4.8.5.ebuild 1501 SHA256 a704ab2035583c07125fb8720d2e078fb1c2996c3d1fa983e362e885109b2b91 SHA512 004a42755d26df100775bafbed028a648a4355a5119e546c51a0d7119e61294ea3eb0be12237a7cd330f8af99149d5f79d170529e464d382339505950845558c WHIRLPOOL 30ad0eb8f19aa297a4a82afb2532c32153dcbadb036e950b567cf7c8bd48e91877aa69ae36431e4b13ae6d8235fdf08c1e6a3a33fd51742059ac9fb6a1a8c0b0
+MISC ChangeLog 16166 SHA256 850327f39fc751a6fd70b5d0944fb469fe7a246e314cf31652a84bf3233a8d85 SHA512 b87093dc3b9c28a52a3ef5f57729797085836eaa3032d6e8d5efac129621b34deda5fef3cc1bd5a582eb52cf89668d41e942abaf98391c35e14c8517ca85affd WHIRLPOOL bf9afa5aa986335837e1efbeb9ebe70ea9ba369f0980ae2f0d63a6e35472fec4081a19471e491ce8cab857e6b54254ca25b3388d7557ea33feffd92bed83399a
 MISC metadata.xml 484 SHA256 e4f3a32784240897cd44c3c645b61cc8a6ff19bd821be35a00e5e8bc02085cda SHA512 ef88ccf92f3d370f7c70c18eb2727b279ddbcd04ce734014b02915b8ba32bee8a8ab2a3608b58b0305c48fe8073af99184b69940413ed2101be64bc50ee7ec11 WHIRLPOOL d68e07f14ea07c308a25487c89f382ac47ca9adfc43a6d1e641cb057b36537eb9ce860bc5cc7bfc702bc75d4ff49ffdee016a6f4ef70df27670f5fbd9753390f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQJ8BAEBCABmBQJRMs/UXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRGODRENkQ2QkI1MzlEMURGNTkyNjYxNjUy
-QjI0NzRBRDQzQ0UyOTZFAAoJECskdK1Dzilu9R0QAJx7oDs4HF+1hcBvEmayhgjJ
-JDOPy3mFlet1thoKm5ci9kPBUXby5qOOFYbW8mdeo+TsFd0S699wo2lFVtEHzfAR
-xnBrYH1g0miw4LU1T3+fibtFusG5qIjXtz986dWJvBx3urf8/6i0pyKDVhB44AQd
-SGpnfqQ9FNmz1vWOALKI676BVX0fshRchI95wG1DZ09l3vh1IyuvFzyZylGpm7i4
-2DTfxF8Xy8GLghEMwykHejsfIj43KTqFruXTlxEHsLihGr0PRwtqIrl9fin1tTPx
-TtWuGbMT3NFVwFCWkxvb/GGcs98cfy76IJqRa9hXEkc7BKcX7JDfg+mWIdUfeZkt
-wPsyDOtVC8NGW8lk7r3f/v40ER8sRH0eeUR7tcTcVH+wrz89zhZDcMaY6pObm4l3
-2M48/wWZ6AEj/pBZHVyY+MsY5mGfcnFKxUGP2vUYsdF4EX4Sc2HYcq/k5yL1twsq
-YH4EVxDTHRg3oeKC7hADA5R6HI3WrlPxfW+Pynx/05dPYGfYgNPGx6qP0Iyu+RH6
-cxKnyODLud+qdPsBkLkxYFFzaql7ZN5+k7b3QYcPwlIDwClv/VLFUEAGCdy2HGPU
-r9DDaYiKObYlqAMQEGlE8NkuAdKaSo1h3pNeWku8sEXpw+oODyoWcMmZKLWjnwox
-eahjGJHoi7sV8P8eayfz
-=vUac
+iQIcBAEBCAAGBQJR2+tsAAoJENXLsxwXqFxyZU4QAJdNtf0DiU0jox8ARrGFy6ll
+Q5KhD61wk7CiRiGhqKNz2CbcsFem1KYPXvms9ehuisuWwdG2Nmpn1WcOLzi6nXoU
+1rlQD2Mlhnov7xS9Gtro0fMP/GokaGQsW644d9dLwAIGpz931w+ESvW1kXDDE6rg
+Jn5SMHBRO9fEFQsyHjkIudy+x3AjWTRIH8f4ZWFVqbdaruLB1T9Xbxm1y/zk3yLW
+1xE2HRweEmhELhVhWxjvT7d3S8w79PNMHBFea3bwTX0SPJA9ideOMJDhbhBo+8Rg
++3uT9A83tN8TC+V047RtT7PMQYco3N/GX6/WnRyy3yvbc8x3gwQpzECHMppYixn8
+vggOJVdaaR5VXp8fkC1XdqdzHvM3n2Mw37gJUCFGe8WrEkyskLC3eYbJTMtzBRVq
+KAiQt8KOPP74Wk67mbeIBx1yu4b5WjHXxatj74PBdPqfHCpEI+9pE5QrF+srSAgn
+U2DkWB99v65ot4a1daGBvxZLy6okizob/C0fJQutoZ03yPjfsMEf28G/jXBDx4uG
+GkZyfVs7CD71TncTsudtlIBq2CxIupnRSYh0Ey+0QJxDUZU6Ud1VtiGcBscCDTnR
+gGY62C7gCb4M5OwrNysfl5T9lQrcsHkikitzUEFOdlqS5bYGmQKvrE+n5yjYwrxX
+LTJRp9EWKg20qH9a+Vt/
+=Hht4
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtsvg/qtsvg-4.8.5.ebuild b/dev-qt/qtsvg/qtsvg-4.8.5.ebuild
new file mode 100644
index 000000000000..b634e55b715a
--- /dev/null
+++ b/dev-qt/qtsvg/qtsvg-4.8.5.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtsvg/qtsvg-4.8.5.ebuild,v 1.1 2013/07/09 10:51:55 pesa Exp $
+
+EAPI=4
+
+inherit qt4-build
+
+DESCRIPTION="The SVG module for the Qt toolkit"
+SLOT="4"
+if [[ ${QT4_BUILD_TYPE} == live ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+fi
+IUSE="+accessibility"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}[aqua=,debug=]
+	~dev-qt/qtgui-${PV}[accessibility=,aqua=,debug=]
+	sys-libs/zlib
+"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	QT4_TARGET_DIRECTORIES="
+		src/svg
+		src/plugins/imageformats/svg
+		src/plugins/iconengines/svgiconengine"
+
+	QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
+		include/QtSvg
+		include/Qt
+		include/QtGui
+		include/QtCore
+		include/QtXml
+		src/corelib
+		src/gui
+		src/plugins
+		src/xml
+		src/3rdparty"
+
+	QCONFIG_ADD="svg"
+	QCONFIG_DEFINE="QT_SVG"
+
+	qt4-build_pkg_setup
+}
+
+src_configure() {
+	myconf+="
+		-svg
+		$(qt_use accessibility)
+		-no-xkb  -no-xrender
+		-no-xrandr -no-xfixes -no-xcursor -no-xinerama -no-xshape -no-sm
+		-no-opengl -no-nas-sound -no-dbus -no-cups -no-nis -no-gif -no-libpng
+		-no-libmng -no-libjpeg -no-openssl -system-zlib -no-webkit -no-phonon
+		-no-qt3support -no-xmlpatterns -no-freetype -no-libtiff
+		-no-fontconfig -no-glib -no-gtkstyle"
+
+	qt4-build_src_configure
+}
diff --git a/dev-qt/qttest/ChangeLog b/dev-qt/qttest/ChangeLog
index 805f38b8fc85..2f26b45e04d4 100644
--- a/dev-qt/qttest/ChangeLog
+++ b/dev-qt/qttest/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-qt/qttest
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qttest/ChangeLog,v 1.2 2013/04/08 15:24:42 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qttest/ChangeLog,v 1.3 2013/07/09 10:48:23 pesa Exp $
+
+*qttest-4.8.5 (09 Jul 2013)
+
+  09 Jul 2013; Davide Pesavento <pesa@gentoo.org> +qttest-4.8.5.ebuild:
+  Version bump.
 
   08 Apr 2013; Davide Pesavento <pesa@gentoo.org> qttest-4.8.4.ebuild:
   Improve description.
diff --git a/dev-qt/qttest/Manifest b/dev-qt/qttest/Manifest
index d83cd5828499..5822b0a8ca87 100644
--- a/dev-qt/qttest/Manifest
+++ b/dev-qt/qttest/Manifest
@@ -2,23 +2,25 @@
 Hash: SHA256
 
 DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79
+DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357
 EBUILD qttest-4.8.4.ebuild 1235 SHA256 ced6461feb1d20ceec0f5995be1d80a553b0478a5120bf6a9fd58266d452f4ad SHA512 a4a7bc57dbacd7bf8d18aa5a2d153eb4a74640adac216688f0b50edc94b9ccb1bd16a2e13ba6d098cd3bda4e0890db2fd0f82fdf7769ed64c3073ae8f2a72a55 WHIRLPOOL 661a7dde32cabcd7bdf21cf38be3fbce4d1bfbe926b1574843a7a219cc5e811b256897d1226e3aca70664c048bc12ed07ed19af03ecc6634cee7bbca2bae3310
-MISC ChangeLog 16122 SHA256 d134f7222c6bd55111cd485498d451ee916b9bcb8b60d0d49b35691f2452d70c SHA512 bc305156bae00a1d850d700d1f49335416545a11d516dbc6e204795fd504012890e016ee43812208a56af697bb06972c5dae35d36599e5647bffc3db52a2f34e WHIRLPOOL d40a2706caa9af2be0984fb372ab95f52dcbb1be4906c590d8ab6732d49cf3fb2c7c3c71eed1bf3f15977045cb0e55cbd093bf0db845e6c549f569bae7bfc169
+EBUILD qttest-4.8.5.ebuild 1244 SHA256 0b708bbbc71f52bcddfc20d24ffbfbfa742cc95ddc7383e114b30fee08de9fed SHA512 e79596a3ab4f98a0b6fb46784dabd1152307de6ec169902a9c7dc61390da4b372563b04d616c500ba1a1f90e535414c040d3d95eb4a702637ce704d01b3b6965 WHIRLPOOL 3b79fdd32e34488cd22f7cb8411edd3f0b0bed321b9d26ee7e844eed5e073f52ee2f9f084734042a9b1ea46682a4889b8b469700be810b05f51344609ace3693
+MISC ChangeLog 16240 SHA256 a1ee6f460d4882047d6a43d56d98e8aaf2f67c9b5c2729d1bc56c793d283e6f5 SHA512 3741853a57a5b77600dceb4f1abe2c24a158bb10971a27bcc82a1f751061c005ac502c4929bc3e98fa0c0c7eac3cfef7ccb479cf0b21407bb6a875908cb41a47 WHIRLPOOL b5757302ad10ed6af375a548605daa6a3b82f929b005af507e316ca68afad890995cd6fb20beb6690a363eee474dbdc5755729a8c96faa52b1c2c5078a82a00c
 MISC metadata.xml 484 SHA256 e4f3a32784240897cd44c3c645b61cc8a6ff19bd821be35a00e5e8bc02085cda SHA512 ef88ccf92f3d370f7c70c18eb2727b279ddbcd04ce734014b02915b8ba32bee8a8ab2a3608b58b0305c48fe8073af99184b69940413ed2101be64bc50ee7ec11 WHIRLPOOL d68e07f14ea07c308a25487c89f382ac47ca9adfc43a6d1e641cb057b36537eb9ce860bc5cc7bfc702bc75d4ff49ffdee016a6f4ef70df27670f5fbd9753390f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRYuFDAAoJENXLsxwXqFxygWUQAKKI+/0uAM97EVYtj4ccGuaz
-WTQCExxU5oQEQd29c20F3BGw/jA7l1J83VXkGmpGSQ/a/ZeNCXF1968jAeP507Qg
-+OHrqSrIdBcJOnQTPwnISSKjvg+j1ZIIVssW7Oe8Zk6QNuO7EF2++FbNALp6GFGk
-EMJnhlW1La/+EK9Mc8OT6ZqsPcc40maFc64LaOu7IM2b94oRTxtVG3ft89Yr0I5f
-w19LJFciPukBIdIpxKvPj7D4KNyQrjo1DR6kdrIW0sTSWy7MN0RNpVfKouj8/3d2
-WfaIiV53q8cuZZ/sxjNJqBEzdL3mI8D+wYk5J2pnIgQo419hNM1CfQxsmVpXxJg4
-WXIIYgAjVGYk0op+/5E7iKVIiFFe/HFzi0M09LpQFFwrB9FytzwDt9b0wYvUIvIm
-8Ls29ULCmCW/65DkRWkvxqgLd8mSLnM6qlthnsu3X6gMOQfOvTf6IDQuvYlAG+Ne
-vyD0i6mqu37cFQUbFKVbRbYhuhTjdO0fFBgvBzsgTTYU9BLv4jg6/POKVDmUjeL0
-Y/uwktnildSf/n29EykdQE5o8XauLnO0U1XHiT98C0PbornWDSLMw47WWhj0uJSs
-Wd0AwIZBa10+lX4t6zzNoxJw7SDPN1eknk81xViMJSWj5Pul1NimSblseebt2QIA
-UfhvXywz4S2csClQQX9X
-=qc0v
+iQIcBAEBCAAGBQJR2+qXAAoJENXLsxwXqFxyoUcQAK33loinLZX7U0s1fDawagTy
+Ya6unlE54lYvZR9T2Qnnx2P/2EjsOqDap3znl8mjOSvFue2s5yrPV+X1E26OF5bS
+vkYHiBgyd3Ck6tdvSImOLz1rBu0qjkiPCW1AKoI+RGqRAbA5uwMPKJjYdLzqx+d/
+dnsOQMX5CckdIa9sQJlz32DXxG5mZO4W0BZBmjChpJrI7cMyxxoc8mnCDuntskcA
+BYZRxvVFXaMBDBWVmnz0s3Me/6QtQ4NsckoLCvjMmKmivYFl5/oYjK7fuKvDfuRP
+HLfh/PUp9deLgWp2qbuYIui+3rDhkClg7i7XBLOZjst7svkI3mUbW0v0F5W+gsh7
+tmj6wGFRR/7WbmxxXZj/KuQBmDubhtX/ZSwZiVQ3Jq61Tiudn2LXVNT/BT/y8zxQ
+e8H1GDK43r8YtJoReBc7sJL60onFkAz/Unz/+PSkXD0AR8w1YB3hjlz3SNaA4Kjk
+UEIStDUA/uU8Ta6RKMVQb1NbkbFqRcCH30tJDgBl7REBFtQ0RSFg9qndXLDWQqEE
+KYnUgZASJvkOQ9X+wF18mBIK3oSSvLWTVguID7022HGjGRdbzjrPgf1oip9Qa/2q
+dXDZ3+ajnrS7BjWWAPpLyRV6+k9H3R9q3P0PBpkO4+wIqa7x6Abcvsecmi+X2GKY
+4ImeGFrJSFAbWoJUTTFU
+=cNDt
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qttest/qttest-4.8.5.ebuild b/dev-qt/qttest/qttest-4.8.5.ebuild
new file mode 100644
index 000000000000..84705fd3d54d
--- /dev/null
+++ b/dev-qt/qttest/qttest-4.8.5.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qttest/qttest-4.8.5.ebuild,v 1.1 2013/07/09 10:48:23 pesa Exp $
+
+EAPI=4
+
+inherit qt4-build
+
+DESCRIPTION="The QtTest module for unit testing Qt applications and libraries"
+SLOT="4"
+if [[ ${QT4_BUILD_TYPE} == live ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+fi
+IUSE=""
+
+DEPEND="
+	~dev-qt/qtcore-${PV}[aqua=,debug=]
+"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	QT4_TARGET_DIRECTORIES="
+		src/testlib"
+
+	QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
+		include/QtTest
+		include/QtCore
+		src/corelib"
+
+	qt4-build_pkg_setup
+}
+
+src_configure() {
+	myconf+="
+		-no-xkb -no-fontconfig -no-xrender -no-xrandr -no-xfixes -no-xcursor
+		-no-xinerama -no-xshape -no-sm -no-opengl
+		-no-nas-sound -no-dbus -no-cups -no-nis -no-gif -no-libpng
+		-no-libmng -no-libjpeg -no-openssl -system-zlib -no-webkit -no-phonon
+		-no-qt3support -no-xmlpatterns -no-freetype -no-libtiff
+		-no-accessibility -no-fontconfig -no-glib -no-svg"
+
+	qt4-build_src_configure
+}
diff --git a/dev-qt/qtwebkit/ChangeLog b/dev-qt/qtwebkit/ChangeLog
index e6f759079d23..ca40eeddd6da 100644
--- a/dev-qt/qtwebkit/ChangeLog
+++ b/dev-qt/qtwebkit/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-qt/qtwebkit
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwebkit/ChangeLog,v 1.2 2013/03/03 04:22:26 yngwin Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwebkit/ChangeLog,v 1.3 2013/07/09 10:51:22 pesa Exp $
+
+*qtwebkit-4.8.5 (09 Jul 2013)
+
+  09 Jul 2013; Davide Pesavento <pesa@gentoo.org> +qtwebkit-4.8.5.ebuild:
+  Version bump.
 
   31 Dec 2012; Davide Pesavento <pesa@gentoo.org> metadata.xml:
   Cleanup metadata.
diff --git a/dev-qt/qtwebkit/Manifest b/dev-qt/qtwebkit/Manifest
index 5b1e2cd8cd39..5a66458ac546 100644
--- a/dev-qt/qtwebkit/Manifest
+++ b/dev-qt/qtwebkit/Manifest
@@ -4,25 +4,25 @@ 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
 DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79
+DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357
 EBUILD qtwebkit-4.8.4.ebuild 2080 SHA256 df540adb4c72bb47ca3486ca43f78a62a183d53989ec2d24c5fa4a4835152572 SHA512 ff15e071870b92e7a7117521e797e80333f788d65ed22879175872f4961e841c6f33205225479ce9d5ea024007d329afe4021c2ac2629fd809275e01255b848b WHIRLPOOL 8e2838fdc7464bcb3ab20b19097fefa3adadc96a947c06b7e64f8347dd406314343ad00001658984e458bb34b8985a91ae458029fb71ecc2e740d1a221127f79
-MISC ChangeLog 26047 SHA256 08ff0acea704c68084139c1e091e5edbc107c3afd645cc93f2c2495dc3c98a2c SHA512 7cfda564fe30528b35a25a54b01193f12a0971795c516cbc406ace5330437f74ffe96108a014ee42cabf4b70c9aad60f33fcc9de2792ddace29641d6636baa04 WHIRLPOOL 6569d9b7896f7969f603a45aff946add5ff8e9ddbf830e2d5b14e5a59323cad5a3a3e12e1690d98e90a97a903945dc488a2d3a4c1d4123edb514185649161427
+EBUILD qtwebkit-4.8.5.ebuild 2040 SHA256 ba0afabb7b022f6a66dd4aa11501e5bd0e634c5e53696c34daf30580e9811a60 SHA512 3e520915002e73434583574934b482f894cbef974ef690d9a2befe7d262c240b3d694848ab97f09368eb78026c5116281120757772ca47ef5335997979654e4a WHIRLPOOL 9e73e55ef0c76e1e288a06cba985e96c22c7755841c2f0e28598c7bc8d6b151ac9848ef7225d282bfd495197d64a9d34013eef492ea1b3c304d16e2c9fd2a84f
+MISC ChangeLog 26167 SHA256 24e1774c22e836ac9bbbd669db301baf480be5a6bdc40df3ad3ed7ab4219aaf8 SHA512 e32a4d248d471b6632b59866ad10305115f342c25713078c01d3f52a62c332ee341d6dd11688b746441531a77c57fa89a662c3d6ff4dde21b0af04142384184f WHIRLPOOL a3b08b7087d34b50495576dad6d5ab44121e801d6dd3bea42556da901469be603e8ed215e6a66b0a6769a989bb55d58d0f1c24e8bc221439545577f0e3a16444
 MISC metadata.xml 522 SHA256 6f4c021a3440a17b85509b316089ef738dfad8ed92297c2f5c652be44f4c17cf SHA512 79883d12a8eb849f3657fd6df06df92bc78b30bc845cedcb69255bf6b5dab58ef3029581a03a251bc7afcf3574391c92907118242b1f9afa75f0cc5ebfc92754 WHIRLPOOL bd2a4c8981de43707177e6cfb56942d19ca3c3351ff03e535468fcf1063ea48280aae36edb04d307f6d870ad5e3c6d4245e6cfab3c632f81ba58c909f9346130
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQJ8BAEBCABmBQJRMtAEXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRGODRENkQ2QkI1MzlEMURGNTkyNjYxNjUy
-QjI0NzRBRDQzQ0UyOTZFAAoJECskdK1Dzilu8BQQAK+ZT5ukj73faK/rn4BVSvLh
-1Xfw8dTtr8nElg/Rvum2pu6mTf16/SQm7eQegz+p/E3odDiJRI4f7Kq2w8KspWv+
-FoSnSrtWhk/wMAd20KDwbOFsDOkiw+5m7c07ASiOs4Ag0+/xeJLukqKkbXPZfFU9
-DB9OKQfmb/jojawAWF6ZyPh+UUn7/w1wLz6BAnjsvvSUQTAzQ6lr+X8NeyqHOBKr
-6podXR0ISDS6xNSYOd029i3eMx7kYKm3I0gXquzIRGxVIttxAazwm7zSBBPUBSGN
-GK+TbtJiTX7r+tb5oK3VtHruczanCpa1XJiC1qAM+vXLVE9hYbeghvLK0yq6qp2i
-SMMgf78x6UwhMnzEDeT0D9SSmi3fgUrAXzKAluDeNKsS/X7s0PkBKIj4j8k6OyuB
-6wLV1ofKLO5TvjwFEbAiJx8R3pIMr6nuYesWcgneE/PoxQ+tFLUUyRdD+/7jCS0s
-2tB/T3/OLb0+7C+B0LxJmsV1lcJAwQ2xVKTyACFciBFxzOYyzdYjuAcNOnA7+WN3
-UsR/TWskba2ZAcnAVJJOjEyxy2O55MkYD1PGrvBabTVn36lkUvLkL7zjEuC+Kwmi
-nnc9PIohSfga9P1DzTdi1/GSQ9HA4J8v/FF+11x4GT7abKTm4iYEIBXcL1URVE3t
-XJWsseQjDlFcSfH4Y9c+
-=XCqH
+iQIcBAEBCAAGBQJR2+tLAAoJENXLsxwXqFxyneoQAKK3ZU8HxA8+kFdphGxrB+QV
+rH+SqXy+4u+DPDB+FNgfEHkeYuJxACyqNNd8L9j6a8X5c8olr1g7mcoA5TuCsp07
+vXrevs6B4VjZLQhzb4430krzt4+JsB82uKHzAyyhdGjL2PGghdUmQ7zc7J+BaXZK
+U32tzDf9j2WJQtJEReU1/yP89Zdgiq/no8zMmgyE8Swvjw06cqbkGlRp0mo6Q/W6
+tfUD/3zuFNa0JZCrE8YQjwZZLq0OUmmOimgDUmFkTm2JbR4np1fGR+qvIMhyhwxX
+ksRex8h1O3QPPqyfjKmw6VX8EUe52Xhok0lJGsAl9Q7wE/ZExYN+vy6nLFGXWoFx
+p0G3DY8Ze4gvC7q6kR+H4PVenZd98QllCx0+rTg6op39JGxs5O4UovmBVurDE+FK
+mIBlAwv5jXQwwliLHI2APh5Ec8D/lkUHWSNmLUIPTx9C1DunrokCEvQSGNHpWhPS
+u97rtal6jzc7dLdE47jvSdfGdaMs2xWnV7LYmf5ru3fNHu9/G5aoTA0Yjds51jba
+ZWnD3WVm1Vb5U+sjCcxJvEikPyNjW7AhAaWhwRMb2/o8AOR4r+uBgsH/X/c6vXEI
+zCXASLQdpFC2OXLL9TXHIXU5TzxjqYReYSdTZAIy8iwljXQRVNtVXh4ghiP6v7Vp
+ZC5ws175Jv/172FaUBmn
+=4/yT
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtwebkit/qtwebkit-4.8.5.ebuild b/dev-qt/qtwebkit/qtwebkit-4.8.5.ebuild
new file mode 100644
index 000000000000..b895f6a56529
--- /dev/null
+++ b/dev-qt/qtwebkit/qtwebkit-4.8.5.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwebkit/qtwebkit-4.8.5.ebuild,v 1.1 2013/07/09 10:51:22 pesa Exp $
+
+EAPI=5
+
+inherit qt4-build flag-o-matic
+
+DESCRIPTION="The WebKit module for the Qt toolkit"
+SLOT="4"
+if [[ ${QT4_BUILD_TYPE} == live ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+fi
+IUSE="+gstreamer icu +jit"
+
+# libxml2[!icu?] is needed for bugs 407315 and 411091
+DEPEND="
+	dev-db/sqlite:3
+	~dev-qt/qtcore-${PV}[aqua=,debug=,ssl]
+	~dev-qt/qtgui-${PV}[aqua=,debug=]
+	~dev-qt/qtxmlpatterns-${PV}[aqua=,debug=]
+	x11-libs/libX11
+	x11-libs/libXrender
+	gstreamer? (
+		dev-libs/glib:2
+		dev-libs/libxml2:2[!icu?]
+		media-libs/gstreamer:0.10
+		media-libs/gst-plugins-base:0.10
+	)
+	icu? ( dev-libs/icu:= )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.8.1-no-use-ld-gold.patch"
+	"${FILESDIR}/4.8.2-javascriptcore-x32.patch"
+)
+
+pkg_setup() {
+	QT4_TARGET_DIRECTORIES="
+		src/3rdparty/webkit/Source/JavaScriptCore
+		src/3rdparty/webkit/Source/WebCore
+		src/3rdparty/webkit/Source/WebKit/qt"
+
+	QT4_EXTRACT_DIRECTORIES="
+		include
+		src"
+
+	QCONFIG_ADD="webkit"
+	QCONFIG_DEFINE="QT_WEBKIT"
+
+	qt4-build_pkg_setup
+}
+
+src_prepare() {
+	# Fix version number in generated pkgconfig file, bug 406443
+	sed -i -e 's/^isEmpty(QT_BUILD_TREE)://' \
+		src/3rdparty/webkit/Source/WebKit/qt/QtWebKit.pro || die
+
+	# Remove -Werror from CXXFLAGS
+	sed -i -e '/QMAKE_CXXFLAGS\s*+=/ s:-Werror::g' \
+		src/3rdparty/webkit/Source/WebKit.pri || die
+
+	if use icu; then
+		sed -i -e '/CONFIG\s*+=\s*text_breaking_with_icu/ s:^#\s*::' \
+			src/3rdparty/webkit/Source/JavaScriptCore/JavaScriptCore.pri || die
+	fi
+
+	qt4-build_src_prepare
+}
+
+src_configure() {
+	myconf+="
+		-webkit
+		-system-sqlite
+		$(qt_use icu)
+		$(qt_use jit javascript-jit)
+		$(use gstreamer || echo -DENABLE_VIDEO=0)"
+
+	qt4-build_src_configure
+}
diff --git a/dev-qt/qtxmlpatterns/ChangeLog b/dev-qt/qtxmlpatterns/ChangeLog
index a34bfd8bc4c6..1312f6edce94 100644
--- a/dev-qt/qtxmlpatterns/ChangeLog
+++ b/dev-qt/qtxmlpatterns/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-qt/qtxmlpatterns
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtxmlpatterns/ChangeLog,v 1.2 2013/03/03 04:24:08 yngwin Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtxmlpatterns/ChangeLog,v 1.3 2013/07/09 10:48:40 pesa Exp $
+
+*qtxmlpatterns-4.8.5 (09 Jul 2013)
+
+  09 Jul 2013; Davide Pesavento <pesa@gentoo.org> +qtxmlpatterns-4.8.5.ebuild:
+  Version bump.
 
   31 Dec 2012; Davide Pesavento <pesa@gentoo.org> metadata.xml:
   Cleanup metadata.
diff --git a/dev-qt/qtxmlpatterns/Manifest b/dev-qt/qtxmlpatterns/Manifest
index a81e1ad6fd91..b3edfd25e974 100644
--- a/dev-qt/qtxmlpatterns/Manifest
+++ b/dev-qt/qtxmlpatterns/Manifest
@@ -2,25 +2,25 @@
 Hash: SHA256
 
 DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79
+DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357
 EBUILD qtxmlpatterns-4.8.4.ebuild 1077 SHA256 4b6e0c9dc61b324a5e7a15167f7654ee41431ab2b009df0736fb0deed73d0765 SHA512 d54125c1a337fa0da3c752a777c76ba1190f5b18df4af299dfef4903a0c718191bb22d966dc74207bd12763a3cd7ac2affd12dd7ae771259bf6bad03548b0444 WHIRLPOOL db6580c33c7fe5aaff793cd4041b509130540a320bd7bb325bf70176a71aa826f7df0fb6d3a433e33f197113c04105bf0d677e9ac049e46dfd584540d464b70b
-MISC ChangeLog 17742 SHA256 fd3109ef669228ed4bfccab27348bb12f8a23b551d12cb5b903c1f9e52cf80ae SHA512 280f74b97551ca9e0da8e87fa8679c19029d4e9e1a38197f890ad3bcd7f929304029ef0d2ba48891c116261322311fd192ceefb5e81a9ec3f2be83ff2ecb95c8 WHIRLPOOL 43bdcbab96e19da4c66b426e7376d8804d3f7829fd77c16c775b16440c463bac48038d0504956a161ec03b7ce336697ffaeaba68f4dbbf788756ba3112049224
+EBUILD qtxmlpatterns-4.8.5.ebuild 1084 SHA256 509a1656441e45f939a273494d6a2352527ae6e3b4d83c92a84c1b58453fb5eb SHA512 9bd8a10ca10e683ab0fd5cebecce52bd048086c3268ffb995beca8d12eeb41815f0d9dad068fdf3693c35f075933e03dbb2040dff4df0c4400fb9227c270065b WHIRLPOOL 076336506fcb0e0b9e287d54a1755103c1fb7e09e7f3684eddd463b62478ff4c9f0c63337e5e7f3469c0521e4dafd275c5333a0cc5c8d99263fee1878810c584
+MISC ChangeLog 17872 SHA256 f39160d7f5331d9248414f2404efd5c728db1e6888d0d2069f8944292568125a SHA512 16651d1f81f05e02cd9ccfa9e821e07fee0f665fdf07547a1a422ba4eddf77650a515dc19772febd31151381d7599c40b20046d91a24b86b4eebd24482fb984a WHIRLPOOL 74cf06cbb19b647147632acd26caef0bd13eea9fddf0d47a034848b1f6eb5e86d6ce7d1f4cbe656735e3bcdbe44400084815ebecf3df23bdf277cf67ba66ff00
 MISC metadata.xml 355 SHA256 606f8fd49a8b418a4de318e62c5d44040136a2c0a4ebbb1eafa8395795d49255 SHA512 95241a16bde7d1487f04aba1043a79983deedc6aa9dcde317be2752f17fd9ec130a30caf32d9dd53f8b5ede7cc992af793fee90786ce7de9233d40e0d93741d1 WHIRLPOOL cbec0d7c8d7a68a3cf9c4020e601ceff9d5fed7211274269af68d0ecc6c3a7f286a192f31b00fd2a36dd4eeef38732a673c66f6bdb6fa4f8fd55e08c0f55a89f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQJ8BAEBCABmBQJRMtBpXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRGODRENkQ2QkI1MzlEMURGNTkyNjYxNjUy
-QjI0NzRBRDQzQ0UyOTZFAAoJECskdK1DziluUhEQAIQQuIoqgFUbZ/BuFVGV1bjs
-0C7C/kSw2Gz1vTd0mHHhoqfNtIREp6s7UkvMbWgz0xca698UsLIPMCWCoPwITjHK
-kSgvMMP9Njybgpw+PkYDbGpCwSdL7ozJbO7ghntxEV5EqVqeWzSsQIYHzy+Fwud/
-XnCYp5hrrB4DWegqTMFa1rhLbmZx1Y4nFIHDe33MmF/x0t8DRH5cCq7PeTpi5uqt
-jChoZ399OLb7cWNjzWzsNnmu7YEIhB+6Bv8VjtUHpFQWhrhdldVNZ6Yq9SmoNWDD
-Cd06mRRYoACRMEkmvJMoQRfeCZs5KWWEIgSmnkwWVbSB+iVV3hgTwY40y+fkjMJB
-oPrGdGdl4Li3UPPQDTaEI+CZ+OIUFXoti/MgQsJ40dX66fPV1pLOUq1CM1IjRBvn
-8uHHXMJ9SRtHY/ulPsDP/enjI256dH34QUWxMgYNBG+wZA1qF0/omBkVOWjDuK0Y
-varaibp5YO5njAeqWDIBZVJOYgF2aE1YxA7EwnVZ2/t9uKfwTuf+dlT3lZyxx64n
-zfuC77B0E7j1sIdUqUwkV81ecPjii841DxBagQRptjAIS8z0q6SVZuSGl3mpAmF+
-GRURVJSixk/JGk8CFJ1LDeqlIu7H16pd4kg47dIFgxnMLBeenx9Q+Bx/XI+1MBfl
-zVd0fd0A3JllZ1iCFoVW
-=ekKj
+iQIcBAEBCAAGBQJR2+qoAAoJENXLsxwXqFxygY8QAJRPrCUJXzE1AFqdhunwM179
+z4gTx63G/f0lskuovoGsXV+RsP+/Ds5qlZwLcNE28g0AktWUjoJ99RQDhyrozD2X
+5XKX2E0gsieCXpAuoiT51QCsJlg6+bwcqR7XGT+eyFCdhKY9eNkoNck+kKzJahiq
+ylvw31J6Nzcmx/FZRB/Mibje7rKSFoDef/dK9tUGHM4o97NVm3l6O8rUa0y9GmNw
+XdwJ7ZAhXjLUe7y0tb4Xg4gZGdGBKgBL16/aik9FjZkQimIjeUYFZYQgN49fWJ0O
+w3e3cQLHUK7mP1fietbTdKynriwG6gu7EW99HIHIBnnAXHKrwy0NzoDMyp6cQbpK
+jyouf6RubZPFS+TRWs5xexDWAWJ0y5cVyFxtm5X4NLsLJSnu5MtWIqm1Es8HGvQG
+ncNGO7+9+PdnSNNpxWlrmN3licRIJl+Bc2RRc20xS/mnrW/lY2X8hfsqshCZOxcM
+1/u6q/E+uYoWfRgsiNFD9OS3jQbYQPmm2PS2e9rlk/jm1ATZIHlIsgy2FZxR4yA+
+0ndXWMMx2djypHIHYIDh4fvgDqOjOqtSw2qv3KB8z0BauaR0KGZUemMPPAYFmfh5
+VeYj6B/Q6FJUWhfdSHLnObpZgrVo5D5+si1PveEV4PWbfFDNwIcHQ1upv9ot/wUN
+5r+GPpjv7OHjhNFgmbag
+=FgCq
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.5.ebuild b/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.5.ebuild
new file mode 100644
index 000000000000..7acca2502345
--- /dev/null
+++ b/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.5.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtxmlpatterns/qtxmlpatterns-4.8.5.ebuild,v 1.1 2013/07/09 10:48:39 pesa Exp $
+
+EAPI=4
+
+inherit qt4-build
+
+DESCRIPTION="The XmlPatterns module for the Qt toolkit"
+SLOT="4"
+if [[ ${QT4_BUILD_TYPE} == live ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+fi
+IUSE=""
+
+DEPEND="
+	~dev-qt/qtcore-${PV}[aqua=,debug=]
+"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	QT4_TARGET_DIRECTORIES="
+		src/xmlpatterns
+		tools/xmlpatterns
+		tools/xmlpatternsvalidator"
+
+	QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES}
+		include/QtCore
+		include/QtNetwork
+		include/QtXml
+		include/QtXmlPatterns
+		src/network
+		src/xml
+		src/corelib"
+
+	QCONFIG_ADD="xmlpatterns"
+	QCONFIG_DEFINE="QT_XMLPATTERNS"
+
+	qt4-build_pkg_setup
+}
+
+src_configure() {
+	myconf+=" -xmlpatterns"
+
+	qt4-build_src_configure
+}