Version bump.

Package-Manager: portage-2.2.20/cvs/Linux x86_64 Manifest-Sign-Key: 0xDADED6B2671CB57D!
author: Davide Pesavento <pesa@gentoo.org> 2015-06-17 15:24:45 +0000
committer: Davide Pesavento <pesa@gentoo.org> 2015-06-17 15:24:45 +0000
commit: 0050b6126b64b61a7931108aad40ec3a4c2ea43e (patch)
tree: 855dfa877a02d3a4d31b46caae2d46646988a573 /dev-qt
parent: Set EGIT_BRANCH=devel. (diff)
download: historical-0050b6126b64b61a7931108aad40ec3a4c2ea43e.tar.gz
historical-0050b6126b64b61a7931108aad40ec3a4c2ea43e.tar.bz2
historical-0050b6126b64b61a7931108aad40ec3a4c2ea43e.zip
162 files changed, 1397 insertions, 1004 deletions
diff --git a/dev-qt/assistant/ChangeLog b/dev-qt/assistant/ChangeLog
index 29055d8cef1e..d9a2aad51512 100644
--- a/dev-qt/assistant/ChangeLog
+++ b/dev-qt/assistant/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-qt/assistant
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/assistant/ChangeLog,v 1.30 2015/05/30 10:57:07 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/assistant/ChangeLog,v 1.31 2015/06/17 15:18:12 pesa Exp $
+
+*assistant-5.4.2 (17 Jun 2015)
+
+  17 Jun 2015; Davide Pesavento <pesa@gentoo.org> +assistant-5.4.2.ebuild,
+  -assistant-5.4.1.ebuild, metadata.xml:
+  Version bump.
 
   30 May 2015; Markus Meier <maekke@gentoo.org> assistant-4.8.6-r1.ebuild:
   arm stable, bug #530238
diff --git a/dev-qt/assistant/Manifest b/dev-qt/assistant/Manifest
index 2743c7894cb9..e86db4e2ca98 100644
--- a/dev-qt/assistant/Manifest
+++ b/dev-qt/assistant/Manifest
@@ -6,17 +6,29 @@ AUX disable-webkit.patch 872 SHA256 b6fd53493f8f663d8d23a174d20fceb5a5258275ce77
 DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357
 DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2
-DIST qttools-opensource-src-5.4.1.tar.xz 9262024 SHA256 11de0f8573843194b134e32af49594514498fadc4fc0b3b0333540fe1f671f72 SHA512 1e1dce0d6d587bdfa8d3ed20db0dbf3c1db3c1ffea4ea34741a9069ca08f3ab478e39245b26bf9f1c97c28650beb396e433e8b54a7f0b6cc5e93e3000e39e7d8 WHIRLPOOL bb8672cb64d39d3786f3db64f5d215d122ee62144406d970a2e37b019fd64ed08f2109e8dd64f23b6926e1bb9f21839805149bec3e5fff200b465e59ecceb286
+DIST qttools-opensource-src-5.4.2.tar.xz 9333100 SHA256 edf3d7e00227f9989101da84b2fdf8eaf1a5b7863dc5e0d26bb0f39303e8b6b4 SHA512 55aa04eae16b71e78d4432e7d59b2052392d13652a3e9beff15a6503f2e88e77a9b48279121d8eee943a898799155c05b167d986bf01fae84b5db0a9a1759148 WHIRLPOOL 9123ff33a35c03adaa6d3374e86b539e9481ec78467bd72ad6f2d832e76e7aafd9b2f2da0420111e1aa8a66c4950b0478d8a6ae4c0f0e05a20c8334196b077e8
 EBUILD assistant-4.8.5.ebuild 1598 SHA256 1cdda8bdbb8211fa9b12dae0ba56233e5f21e2f2c8b8d10eede7146d6ab10777 SHA512 aed691160820937386f7d2cf9416ebdd89bdfccef555ef92ce0d6fd82af56dcb9ce11d20be3058ee3cd8317a5fded84dd3d35cb3fa33dbef9bd043a31ad3e8e4 WHIRLPOOL 8e896db7d39b62bfb2a5a8794535c9a0385a117a8355462f83c5f9242d3738fcd3ab9bcd513aa188654d73806e802881f6341e7d98ce0c1e073d380c68157e6b
 EBUILD assistant-4.8.6-r1.ebuild 1672 SHA256 b4c7fa449e552649677483034d5348dc09ae63974bfca565748c56a34e5e7b55 SHA512 f5f2006682d591a256d4091c646b85285413432bcb01480709edd10f1579d75ff28b8799bb2027897558c01725e646050d2538486d08d6516913e17c68e38eef WHIRLPOOL a80f7d841adf2f5880060bfd0a80520178f9b0e83946db8185e2045998ba4e47594c1eef4adea3f83524122de1ed27487e4ac912bc7355a18ae45babf818b218
 EBUILD assistant-4.8.7.ebuild 1643 SHA256 ffad2775a6476802bc6501762db76704e00034565238ad1fea12ef2070d6d47a SHA512 df8dba6c60a7d066ea022ab89ee4186e65ed20a4b80d41f7bb6af2c5e8cfafc42e86b660f38112e49c79100c181c993e21b07fbd83eac9a823fcf869a78ac8d6 WHIRLPOOL d54b150c0ed5c681741de268ffeec30f500d41f9e368b32d530b5c8dc3a9d09d393e2f7b128d44ca616df9accce6440a24d1db1452c02ad7ea5ae89661295ac4
-EBUILD assistant-5.4.1.ebuild 974 SHA256 84798ca9d998c2bd1790304b6d43986b8b20bcbc91c9357ae4964ba78b5d1cac SHA512 e355f40e1e7257dd696d89d8a97fd55786147657b77720d7cedfdf8338c3902eb99d5734a02f31b791d99e693721184e235db7ec6ec711475a4db055ef840387 WHIRLPOOL 52b831948325c9678fb311a1088b23371d1dcca3d39881eca5bd7831a7be814610401eda43b21655030b3fcab7f4a7fd4a1c8089852ef145a1cef5072d51feac
-MISC ChangeLog 3789 SHA256 1bb0fa1c85c59be549c4ec1b0632f60b1c5e0a6b7d96d804949a9bf84e9a7e38 SHA512 a7418143fc1ac289e8a64b31392f0c20d146646aa827c846d9370710b683ad3488babfbabd5b1908a74abcc4cc720590194c654752de71d27ad38497cfba8dd6 WHIRLPOOL 6a4c90cc0874ca36fe9a44eb4ef99be810689d3702fd4a8037c3e5a28aa92645cc62cddeb4337dec400ffa08620ea45c03fc95f049e038df59f3188894531b9e
-MISC metadata.xml 415 SHA256 fec2eeff3a64eeaa82d79ad5efa721bb975f8073c182f9dcacd2c72009e9f8b9 SHA512 9aa9a89b39c3acffbd34f25beca742c89ff7f1b6a06e1fe95d800369e6ea2a4629eaad1884c6a601b39b9ae12230580cec2f44ceb51c0fad93a512153a302d3e WHIRLPOOL a64dfbcbc44161555ff6a6461189abc47cf4e34b705a6376d3937c26099eecc9f7228812e1fe3514afbcb3cbe1ec24e5abcc941f13b48053ea57aeb0429a18ba
+EBUILD assistant-5.4.2.ebuild 889 SHA256 6092c63a386a52655423b86f3fe6196e4a2d4036a7ca78f4cbb0f516e8fdf96a SHA512 0d1503d7faeb30358ece44e9db7a9f137fe2249aa24a81cf7428673067405f48745cc1cf0cb39f2a2ae58a0e71f034b81e39e63d8dc27d3f6c02a81e15613235 WHIRLPOOL d35570ebf8447f7f6ec965460a23f5d4be0652a3c4c0c1f37701d80cb5df8e51da2dc68305ba2d272768db914e11c67a10b2575dad73150894037b3a787d0cbb
+MISC ChangeLog 3952 SHA256 7f03cfe35c85d7339c7289251e2319484d2a254178c4b7f38ac4744e8b4cd9f4 SHA512 fd15bf35eedcd34cef3b1ac12e816230b31c91dc6585ddf22768ef7e21a508956d28fc9462a10495f9b6dcd15ead821c2a07066a72e43f8754db68c5235cdde7 WHIRLPOOL 15f3f65ab0329da43c883aa0421f0dccff37f5b7a7bd5d8a0e2084fc3fae422ba05dcaf684d9f8ea1661f7c91636797972d13bfd9b3fff927325b91b4b206958
+MISC metadata.xml 406 SHA256 9b69df2d1422470da7bc919a570303d186cc74e404c94471789765cb6a7f60a2 SHA512 6793c43be90e7d93c0971597a4fedba2fc26fbbe7718c0944ab655ce22cb9bd93e96481b3f758b471dcd705666abbdf3e1a75faf756ae90b283172c1e15d2682 WHIRLPOOL 1ea46d494c20389eb3db0a8ba6d9abd6cf2fbd94657e7ca33527ad3be966d043957bcee9e8f6c141fd4c42aeb2a708a4c8c791df812d799809f9819373d7e55b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlVpl4QACgkQkKaRLQcq0GIcUACcCPjlI6OPnedRHA7f0hj4ibsa
-VVUAmgLdiMX9I1ZxhP7Yic67wWZ/h8bt
-=iWfA
+iQJ8BAEBCABmBQJVgY+1XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9GpkP/jF582xXuTK45UkMRQ3cfSmW
+OweXnwP70yPX8/L2JTfFFHXfk1BqKw9bNLlLLKkAPt89yNc4l/3Tlx54sx+21XPq
+Xkb1HdwHRwXRiagDp9FyCxZPgwk9Khi6jieJv/FEGKkefnYmqGi7wkXV6E67nldy
+sMO6+aF56DqR5K3qIOBFs9oEFPIT0KOGTIsW9XVINLaeQnLSdN8EtpK8M+Y/4+UZ
+XIHN0ZuSzBAMSILaXoEBHlRhlWQWSgdd+iHsBxY4Qeti38kDzM5r1q1bucFcggRQ
+ImvgxZk64d+JxVUaah+lzXUWZQkNyKJZye7Vrm3r4zZwB8ygdOqPzg8c061KXQgh
+QeR0J1n/1LW2g1JjUdRpZ2crtIfHeije6U5zD+0o2vmNsdnyB04gGwnlUBei1jpj
+WSYhlDwOSgaoqdRIOeUPddc6t4tTcIlH+EXIMTswX+TAV4+GcefDCZ0EBwQQBrqB
+0e+QAhiRtJ6WP7BVEco9x0Qi2LfHJF7+RpZ9cP9NlHYzwpRRQmxZ3GMeFXcG7GwP
+XEA+rujeoRyl0HJ2qOeWt4pNV4PoXqFQDgdmDGrUX145+347g6xRh+S107DG+Qo0
+iKxq3d74U59PflU/LO7o6wCZLjoVAV95VIDw4EDaiSjFykutxDewEqxvwx+zYuzp
+pOyBF2ilwG1QtXIGk46x
+=mZqO
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/assistant/assistant-5.4.1.ebuild b/dev-qt/assistant/assistant-5.4.2.ebuild
index 8a2caa8781d2..027018b72754 100644
--- a/dev-qt/assistant/assistant-5.4.1.ebuild
+++ b/dev-qt/assistant/assistant-5.4.2.ebuild
@@ -1,32 +1,28 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/assistant/assistant-5.4.1.ebuild,v 1.3 2015/05/16 10:41:11 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/assistant/assistant-5.4.2.ebuild,v 1.1 2015/06/17 15:18:12 pesa Exp $
 
 EAPI=5
-
 QT5_MODULE="qttools"
-
 inherit qt5-build
 
 DESCRIPTION="Tool for viewing on-line documentation in Qt help file format"
 
-if [[ ${QT5_BUILD_TYPE} == live ]]; then
-	KEYWORDS="~ppc64"
-else
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
 fi
 
 IUSE="webkit"
 
 DEPEND="
-	>=dev-qt/qtcore-${PV}:5[debug=]
-	>=dev-qt/qtgui-${PV}:5[debug=]
-	>=dev-qt/qthelp-${PV}:5[debug=]
-	>=dev-qt/qtnetwork-${PV}:5[debug=]
-	>=dev-qt/qtprintsupport-${PV}:5[debug=]
-	>=dev-qt/qtsql-${PV}:5[debug=,sqlite]
-	>=dev-qt/qtwidgets-${PV}:5[debug=]
-	webkit? ( >=dev-qt/qtwebkit-${PV}:5[debug=] )
+	>=dev-qt/qtcore-${PV}:5
+	>=dev-qt/qtgui-${PV}:5
+	>=dev-qt/qthelp-${PV}:5
+	>=dev-qt/qtnetwork-${PV}:5
+	>=dev-qt/qtprintsupport-${PV}:5
+	>=dev-qt/qtsql-${PV}:5[sqlite]
+	>=dev-qt/qtwidgets-${PV}:5
+	webkit? ( >=dev-qt/qtwebkit-${PV}:5 )
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-qt/assistant/metadata.xml b/dev-qt/assistant/metadata.xml
index d05859990036..258aee1d6e0d 100644
--- a/dev-qt/assistant/metadata.xml
+++ b/dev-qt/assistant/metadata.xml
@@ -8,6 +8,6 @@
 	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
-		<doc>http://qt-project.org/doc/</doc>
+		<doc>http://doc.qt.io/</doc>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-qt/designer/ChangeLog b/dev-qt/designer/ChangeLog
index cc85b1df8920..907c6a1a167d 100644
--- a/dev-qt/designer/ChangeLog
+++ b/dev-qt/designer/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-qt/designer
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/designer/ChangeLog,v 1.36 2015/05/30 11:03:08 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/designer/ChangeLog,v 1.37 2015/06/17 15:18:46 pesa Exp $
+
+*designer-5.4.2 (17 Jun 2015)
+
+  17 Jun 2015; Davide Pesavento <pesa@gentoo.org> +designer-5.4.2.ebuild,
+  -designer-5.4.1.ebuild, metadata.xml:
+  Version bump.
 
   30 May 2015; Markus Meier <maekke@gentoo.org> designer-4.8.6-r1.ebuild:
   arm stable, bug #530238
diff --git a/dev-qt/designer/Manifest b/dev-qt/designer/Manifest
index 4521355cd2fc..6110110e236c 100644
--- a/dev-qt/designer/Manifest
+++ b/dev-qt/designer/Manifest
@@ -4,17 +4,29 @@ Hash: SHA256
 DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357
 DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2
-DIST qttools-opensource-src-5.4.1.tar.xz 9262024 SHA256 11de0f8573843194b134e32af49594514498fadc4fc0b3b0333540fe1f671f72 SHA512 1e1dce0d6d587bdfa8d3ed20db0dbf3c1db3c1ffea4ea34741a9069ca08f3ab478e39245b26bf9f1c97c28650beb396e433e8b54a7f0b6cc5e93e3000e39e7d8 WHIRLPOOL bb8672cb64d39d3786f3db64f5d215d122ee62144406d970a2e37b019fd64ed08f2109e8dd64f23b6926e1bb9f21839805149bec3e5fff200b465e59ecceb286
+DIST qttools-opensource-src-5.4.2.tar.xz 9333100 SHA256 edf3d7e00227f9989101da84b2fdf8eaf1a5b7863dc5e0d26bb0f39303e8b6b4 SHA512 55aa04eae16b71e78d4432e7d59b2052392d13652a3e9beff15a6503f2e88e77a9b48279121d8eee943a898799155c05b167d986bf01fae84b5db0a9a1759148 WHIRLPOOL 9123ff33a35c03adaa6d3374e86b539e9481ec78467bd72ad6f2d832e76e7aafd9b2f2da0420111e1aa8a66c4950b0478d8a6ae4c0f0e05a20c8334196b077e8
 EBUILD designer-4.8.5.ebuild 2590 SHA256 3bc27bcfd2b26dc87ebaf878415151b1030d21d9790a1275a22dee82b8c2e6f7 SHA512 d7f4e4d8d61fee02235b97efb4d09eaaecedd82d1a854e7ffeee2b72d72f961ecc6801c6ff8a88bd12dce2286499565c48d9e414d154efef840887a0dca80bc0 WHIRLPOOL 3a6353e438a8d0ca73f2fce27b078f3a11d88de39a8bfa224f680062b0624e4893bd41288142d3937047188d0481fde1b0c0376e22b55bf120587c6cb698e396
 EBUILD designer-4.8.6-r1.ebuild 2106 SHA256 daffb50122e0d89d1691673b7b9bee28193c6cbba370ce9c359ac08dd413202b SHA512 304c1b9cd1ec282ff00f03e174b52f51de93dc4cc085b92083788855891313810ce39757e0f6d8dd4cf4d5ee162570122890fe1d5b75ff41aafc42b15c429130 WHIRLPOOL a548e369d6a69a84c8e389d15de2a2bcf3d3a678ab969f99757d797c7d5304b8824a4badd028c9811a4b7b14c2410abd06bad499221afc6a595b0b404aee0bb1
 EBUILD designer-4.8.7.ebuild 2073 SHA256 6f531cd6509127776f63156a276e81b5ae3d7338e68208fdb017d944ccb78c6b SHA512 0a63269927ef0cbb639efcf675559f6e8f77413575f70ec6879820e990839970e03c7d9255cf2677dde4178221da4c638332e50c33310817476ac24eed51aa3a WHIRLPOOL bd929d9a71da8b4f04a62f2bcbe64e72246b5f68a5374ed8aa0a3fed26e9217fb00c6fc8b4a216b3aca393c7e542465501cbe8cf865473697c5dadb8af80b231
-EBUILD designer-5.4.1.ebuild 1083 SHA256 6684ace22f460d436b4dc7173bf84eeacb8d962fb9e3979fed86e5b96d26a6ab SHA512 0926c3ba9d1be030d5e5c958d07c928eeeca90a82b55b3408d12c54610bc3925ab585a7e43b88385e3b956c324272587861f253d42dc87e9e03358c4fedf2e34 WHIRLPOOL 7aad1d2edd02012e77c6b2bf415f25241c2ea7d3c3ddd5bed1af1ef7d476361fef9e8843a271fcda5a17d7a5704f9953c1cabc6b01a05facbf31d52148838031
-MISC ChangeLog 4534 SHA256 2ed4c7edfd7324c01c54103cfa36fbef0e7066db84021a954b738b66af8718df SHA512 67fe56c05d9dfeaa913874512f599639bea4889442e42a36e3286ed465d646c1bf1ca175ae4f36ae62c0ca3dd9bc42a403de00c30972007b1b2df474f4997077 WHIRLPOOL 1c9e462cb17ac554f54475245264a0ae229d23f872659df53fa5b15df73e9b95d09b5ed41f13c0aa3657f5f5ee17028203c9d17fc7d31e78b8dac3396f4b2198
-MISC metadata.xml 666 SHA256 988fcc19ac163521a9d07a9959e0f62f9e6810014d5936319ebd2286481b65fa SHA512 cee05b3ad88861732b1311c60f7bd8a57ba39cf1108933793cd8bb209e25db022e5073d15703e78f5a4fb8b646904c20fc40b97b6eead3a83fd829f1922a949a WHIRLPOOL 4786bd6029829a2c088d36892ed56084a0ea659445b17efe38923af33e5e45849730c39af4edc7ab38bcd32346912150cc73a18dc2c0bca05331a51d64f5fc4d
+EBUILD designer-5.4.2.ebuild 998 SHA256 152cd81781644f139f8bdcccfb60b5796697199aa710403195ca625b526859d0 SHA512 8b063eec0872567f7ac45636eec345ae3f0770cc381ff3587f998fb0e370b3d1253b7eda779cc2aaff342d528db2a83ec8ec97cd1058483b13395e010d688c7e WHIRLPOOL 0ad76935a66ae57c08f3ba7b02f3117b089ff993a46f024cb8a412ee967c6296de5fcd3e9b00f9694de6c2ad3b15768f47f95deec4d62f0fb5af68e59eae9938
+MISC ChangeLog 4694 SHA256 5f3149da7af0ada4fc74bc425504ea6ea88dbc9b99c038a5f20c528081bb1ffb SHA512 913e35b825dc3cc95a2e63076b4f3c49bb1135eba7e473131aa77f635982dfe3de5fc26d9531b1c939c46b565baaef1eaf3d81a1ce564988d9933f018f167382 WHIRLPOOL a42e01ded76f3975972eab6c9d774f49f3735859da1c605040a8b8d56afe6a0775a2fbe1e592070eb3a9e597019ffed25d04118084e44b4411bd4469f78bb553
+MISC metadata.xml 657 SHA256 0d82d0747cc33e0f8e757be58331aede459e422d9c4f21290bee0b778235bd3b SHA512 98085e9d42a2ddaa392fbe23b1f02b55a17ae71198afd84a56d984eeb5a15edd7c6cc74ed597375d60f0701610e76e2edcfd862092ac1672d053b748d7436570 WHIRLPOOL 781bdcea4d51b1b71dee9f5c90b3ff4a7d3ad6bea030dfaaaba26da5f783170deedeb750d9f57cb837a7f26c57e661c46bad3481316591d1d5ba7fc10e89179d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlVpmO0ACgkQkKaRLQcq0GJdBACfdofBh4a2aEN+hKDmIFXs9Vy2
-sHcAn0k5OpivA3WECOUI2xqzhZJfEnqN
-=awXy
+iQJ8BAEBCABmBQJVgY/YXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9TnEQAILewVuovgLVqyqJuiVATHy4
+6Lo0oekO/Pa7XaClSoiHrSNi1hK0KYmJZHliUAbPdt7M0BZOeeLpidW0iXBQYxHm
+WODCI64BwSVBTUPpBAdyW9yJ8BWVoAC+LZJLMwnVr8zHuGNseNLXo/Zk5JThnBRn
+vmQ6+zQN2LUNwOOlnREDkEsUNRWbi+BcF4bdjZAFvOijkC7Lv5L9GrGDcdD6pgLO
+Xl9+delHmsYxmLnn26oPZRkP85hdOc4bNOQ9rF6a5COHr6jerEdfnVi2BUYTEfhw
+R+W55McQdP+Or+b4IPTlhr9Gwu7U4Kc+rDTgyCL8fOIiCcSZR5gn7WNvSjmFCNfr
+ASekfKHqG1BmuYFpA3SA9Q698VvvkIb9hmC/7MGn/0aZV7kSlIk+IsjLF0FA4OlC
+ihKw3XPuDhtuuCI89YMWhPNkEB0ba5Bc60SDPvblDF5INeIUXGlMjLhlL/m7bVOX
+6xvkGW8J4zCFwhMSmd/ol51FhumOl4Ofalntv/dxnR429+ORPJhmneqyeSPWZaMd
+oJRseveTvgZErwb9OUnG7X3K0WhFLWGhqAExzfjc4vnhOs/o7OVhpLqMgZ+/pZpc
+KQV9ynU10p7tftwtMYZcCNb87QdXzX8ZkJGO5dpQMYVe1nYDa5YdhrNncw4jvsPY
+usC4jeyzCr9mXvwNUbOU
+=Y7UF
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/designer/designer-5.4.1.ebuild b/dev-qt/designer/designer-5.4.2.ebuild
index 55c96fe1c437..4594e5234ae2 100644
--- a/dev-qt/designer/designer-5.4.1.ebuild
+++ b/dev-qt/designer/designer-5.4.2.ebuild
@@ -1,32 +1,28 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/designer/designer-5.4.1.ebuild,v 1.4 2015/05/16 10:42:26 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/designer/designer-5.4.2.ebuild,v 1.1 2015/06/17 15:18:46 pesa Exp $
 
 EAPI=5
-
 QT5_MODULE="qttools"
-
 inherit qt5-build
 
 DESCRIPTION="WYSIWYG tool for designing and building Qt-based GUIs"
 
-if [[ ${QT5_BUILD_TYPE} == live ]]; then
-	KEYWORDS="~ppc64"
-else
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
 fi
 
 IUSE="declarative webkit"
 
 DEPEND="
-	>=dev-qt/qtcore-${PV}:5[debug=]
-	>=dev-qt/qtgui-${PV}:5[debug=]
-	>=dev-qt/qtnetwork-${PV}:5[debug=]
-	>=dev-qt/qtprintsupport-${PV}:5[debug=]
-	>=dev-qt/qtwidgets-${PV}:5[debug=]
-	>=dev-qt/qtxml-${PV}:5[debug=]
-	declarative? ( >=dev-qt/qtdeclarative-${PV}:5[debug=,widgets] )
-	webkit? ( >=dev-qt/qtwebkit-${PV}:5[debug=] )
+	>=dev-qt/qtcore-${PV}:5
+	>=dev-qt/qtgui-${PV}:5
+	>=dev-qt/qtnetwork-${PV}:5
+	>=dev-qt/qtprintsupport-${PV}:5
+	>=dev-qt/qtwidgets-${PV}:5
+	>=dev-qt/qtxml-${PV}:5
+	declarative? ( >=dev-qt/qtdeclarative-${PV}:5[widgets] )
+	webkit? ( >=dev-qt/qtwebkit-${PV}:5 )
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-qt/designer/metadata.xml b/dev-qt/designer/metadata.xml
index 273867d523df..d5e349c54759 100644
--- a/dev-qt/designer/metadata.xml
+++ b/dev-qt/designer/metadata.xml
@@ -12,6 +12,6 @@
 	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
-		<doc>http://qt-project.org/doc/</doc>
+		<doc>http://doc.qt.io/</doc>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-qt/linguist-tools/ChangeLog b/dev-qt/linguist-tools/ChangeLog
index bcb9fb01ad91..36aff541630b 100644
--- a/dev-qt/linguist-tools/ChangeLog
+++ b/dev-qt/linguist-tools/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-qt/linguist-tools
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/linguist-tools/ChangeLog,v 1.13 2015/05/16 10:59:08 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/linguist-tools/ChangeLog,v 1.14 2015/06/17 15:19:07 pesa Exp $
+
+*linguist-tools-5.4.2 (17 Jun 2015)
+
+  17 Jun 2015; Davide Pesavento <pesa@gentoo.org> +linguist-tools-5.4.2.ebuild,
+  -linguist-tools-5.4.1.ebuild, metadata.xml:
+  Version bump.
 
   16 May 2015; Jeroen Roovers <jer@gentoo.org> linguist-tools-5.4.1.ebuild:
   Mark ~ppc64 too.
diff --git a/dev-qt/linguist-tools/Manifest b/dev-qt/linguist-tools/Manifest
index 76244d30014b..1e91df61c6ab 100644
--- a/dev-qt/linguist-tools/Manifest
+++ b/dev-qt/linguist-tools/Manifest
@@ -1,14 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST qttools-opensource-src-5.4.1.tar.xz 9262024 SHA256 11de0f8573843194b134e32af49594514498fadc4fc0b3b0333540fe1f671f72 SHA512 1e1dce0d6d587bdfa8d3ed20db0dbf3c1db3c1ffea4ea34741a9069ca08f3ab478e39245b26bf9f1c97c28650beb396e433e8b54a7f0b6cc5e93e3000e39e7d8 WHIRLPOOL bb8672cb64d39d3786f3db64f5d215d122ee62144406d970a2e37b019fd64ed08f2109e8dd64f23b6926e1bb9f21839805149bec3e5fff200b465e59ecceb286
-EBUILD linguist-tools-5.4.1.ebuild 853 SHA256 4403ee71c903fde7b86efa93d709e74b30b2d546c2aaf849652baabbc57179f1 SHA512 e92d0bb6cb2a300aa5df13df3930cef23fc615e2ea8e498be6127a61122d24d835a0d99b2ba33628cb4f16a48b4ce674519905e664cff20692b65fde80e1d1ef WHIRLPOOL 759807aaa008b64e7dcde2edb09134121df2598fe9933cab25c61c145ce4e3a21e0807c4cab6006cc73fdc765277e9d1a6ae0d29c73e38fdaf2683b9bb123188
-MISC ChangeLog 1596 SHA256 9a5b99e29a727634df3786570240617c26782219c18baebc8d36bd155bc2044d SHA512 76972a6aa2e7a29368ec93ad8af11dfe6a3723b59ee2bc8e1dfa88c3c3ec30ee83990552925b6f672bff5b0920543554bebd040e31d7deab3e5a99a3c46dffcf WHIRLPOOL 0fa4b1b1e90fc9dd27cc23e6de6a53d89ee1078c8adc6765baad49bcf694ef94c05214777930686c657ba838ba5176e3565fb0f6a30f7e572d04b9aa88f3f294
-MISC metadata.xml 339 SHA256 3b98372c3fd90377ac1d83355d02aa52592ef233e306f6152f7b95c89e7bce65 SHA512 4e5ef90e7454ee0fa6b9b1234f9872da7698a5c8c35e70bf76cbf4a595d642eb9ea07a372d8cc68509e9bc54e968cb297b260eddf43147ef12d4ab25fe981ac5 WHIRLPOOL 0082e04b9fc4a106823ff1abac5f2fca007865ba02759de8c457000394635d084712f3da67d278abd0d510f76514424402ee8a604cc780a1d76a3c0545279408
+DIST qttools-opensource-src-5.4.2.tar.xz 9333100 SHA256 edf3d7e00227f9989101da84b2fdf8eaf1a5b7863dc5e0d26bb0f39303e8b6b4 SHA512 55aa04eae16b71e78d4432e7d59b2052392d13652a3e9beff15a6503f2e88e77a9b48279121d8eee943a898799155c05b167d986bf01fae84b5db0a9a1759148 WHIRLPOOL 9123ff33a35c03adaa6d3374e86b539e9481ec78467bd72ad6f2d832e76e7aafd9b2f2da0420111e1aa8a66c4950b0478d8a6ae4c0f0e05a20c8334196b077e8
+EBUILD linguist-tools-5.4.2.ebuild 807 SHA256 51518aa015124e8352c7f6702ac1f488948cf3fafbbd16ca4bd1af315739929a SHA512 57ac21efe0358b28c1f5ab8d7aa1fa3603f8d77c9ffb768029ebc6c77069be9cc2fdaef63db7871da40f12f967a9ce7f9779113c8fbb33d2d61522ae24f2d679 WHIRLPOOL ff5e54bc936d2de7f4f8c22e0b57336224071865a82890ac700acd20e241c3233dcc3c89fcb8d202440fa4e97cde2580621bcbfcb907382ad2a3aef3dd9b9990
+MISC ChangeLog 1777 SHA256 6b29095283d8e39323a1752f5801be81a25e680073f86455ded2de7a0e9e9c86 SHA512 0867639b8583e05b8a2f3b3dcbf6a9b039de4f20142fa26d50eb6b75e04ddda49c7f02bc28626204a49b01656e34f326857deab72333c8f4c6493da3f8cb232d WHIRLPOOL 8d75d3018904a9412e50a47a9fbb827d096e40e2e595bf6bcf1d3357a72a48d9136eb4e9759f266f70db1923c5c293127c93d72f2aed124ffdb258b4102f3e40
+MISC metadata.xml 330 SHA256 e2b4cc71a1862b72b009b37ad816331faec93109932045ab799d63c04faa2977 SHA512 508a165179c0f12a0fb295853a9395c898ddf4ec2036d9554e9df0783ed5c586b1cdea75b91e3bd97be7aaa9514668bae295b3a4ec9ed8a09c194edf488f48ba WHIRLPOOL 286938f0cfc64654276d64bac093a8799b9db0854b826e15ffe80ea5f69ac866130cddf30e1c9d2f61a71bb8276963892afdd5e9b838914370407fe743ae2ef1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlVXIv4ACgkQVWmRsqeSphPaPACfYvmeXlpn1GFujmQBFjBoGzu4
-PIIAn2yG5/3lm+oKSK2Oo9gp4ld7YdRy
-=t2T1
+iQJ8BAEBCABmBQJVgY/sXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9nngQAJj61PlUA1zGKxuO0/T3GXZY
++wMJZWKe41A+DQS3SoE1ZCPA2PjatqIHSETMqfykcXZHPnab5EiJoPa/ktLnWBKD
+1f47zjo7xp/jBWI56IhY8bT0X1h7eHkXpAjIMgrLQZc4TJUzz1KnFhXVkn1m2dcB
+qVTuEg7+bILE8yJK84yCRjKSFlLxsDO2ycSyqM6KUnBE8a8r90c9a1ZWawY4autc
+GNxrob3wWQ6C7YdwS7Z3k1tTQo5F6qptAyNu6CbDTFUDz2ym2xCKsmfVPMcZUM0U
+KstM7FVIjXJqCnCTySAWm+2Nr3UAh5WmeSR5Bs3yqpOvCgOdRlZoM01/NIgLrX96
+w6BHz8lQK99K72TD8nJF3GOS1PBpjyoTanIHR9KByqys1R8yXxj/g28s4fiY76AW
+4ea0QmU8/L1aojgV7PMbUBUPsenoL0Plu3YPPSH4RESNnhDQ2skeY8aCiIs11TDO
+36E1VS7WBf6VEmK+9w7RGU193pA3durC6SGNrJw7rpNJw/887YCPhQsXFyJA0tCh
+M/XO1t00XoRfJOYsbUzM4sZUO3K89FY7Djh2tVWfcM82A9tntZnM4cv6AbRLSQoD
+PneHMOmvCi1i/fmnDhMgzoMTTOZNt7rxdRj0kIYynycqz7i/h8PdeISGipvFA2o4
+M3SaO/FqjLOTAoMh+feP
+=vgP9
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/linguist-tools/linguist-tools-5.4.1.ebuild b/dev-qt/linguist-tools/linguist-tools-5.4.2.ebuild
index 9d408020c6f8..90ea40b5fb14 100644
--- a/dev-qt/linguist-tools/linguist-tools-5.4.1.ebuild
+++ b/dev-qt/linguist-tools/linguist-tools-5.4.2.ebuild
@@ -1,27 +1,23 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/linguist-tools/linguist-tools-5.4.1.ebuild,v 1.4 2015/05/16 10:59:08 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/linguist-tools/linguist-tools-5.4.2.ebuild,v 1.1 2015/06/17 15:19:07 pesa Exp $
 
 EAPI=5
-
 QT5_MODULE="qttools"
-
 inherit qt5-build
 
 DESCRIPTION="Tools for working with Qt translation data files"
 
-if [[ ${QT5_BUILD_TYPE} == live ]]; then
-	KEYWORDS="~ppc64"
-else
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
 fi
 
 IUSE="qml"
 
 DEPEND="
-	>=dev-qt/qtcore-${PV}:5[debug=]
-	>=dev-qt/qtxml-${PV}:5[debug=]
-	qml? ( >=dev-qt/qtdeclarative-${PV}:5[debug=] )
+	>=dev-qt/qtcore-${PV}:5
+	>=dev-qt/qtxml-${PV}:5
+	qml? ( >=dev-qt/qtdeclarative-${PV}:5 )
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-qt/linguist-tools/metadata.xml b/dev-qt/linguist-tools/metadata.xml
index a0aaf4ffcd45..7fd11f84adca 100644
--- a/dev-qt/linguist-tools/metadata.xml
+++ b/dev-qt/linguist-tools/metadata.xml
@@ -7,6 +7,6 @@
 	<herd>qt</herd>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
-		<doc>http://qt-project.org/doc/</doc>
+		<doc>http://doc.qt.io/</doc>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-qt/linguist/ChangeLog b/dev-qt/linguist/ChangeLog
index d35d83cba71b..84f5c3fcb1d0 100644
--- a/dev-qt/linguist/ChangeLog
+++ b/dev-qt/linguist/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-qt/linguist
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/linguist/ChangeLog,v 1.31 2015/05/30 11:03:36 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/linguist/ChangeLog,v 1.32 2015/06/17 15:19:00 pesa Exp $
+
+*linguist-5.4.2 (17 Jun 2015)
+
+  17 Jun 2015; Davide Pesavento <pesa@gentoo.org> +linguist-5.4.2.ebuild,
+  -linguist-5.4.1.ebuild, metadata.xml:
+  Version bump.
 
   30 May 2015; Markus Meier <maekke@gentoo.org> linguist-4.8.6-r1.ebuild:
   arm stable, bug #530238
diff --git a/dev-qt/linguist/Manifest b/dev-qt/linguist/Manifest
index 14edc8adfca4..55c31255b83a 100644
--- a/dev-qt/linguist/Manifest
+++ b/dev-qt/linguist/Manifest
@@ -4,17 +4,29 @@ Hash: SHA256
 DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357
 DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2
-DIST qttools-opensource-src-5.4.1.tar.xz 9262024 SHA256 11de0f8573843194b134e32af49594514498fadc4fc0b3b0333540fe1f671f72 SHA512 1e1dce0d6d587bdfa8d3ed20db0dbf3c1db3c1ffea4ea34741a9069ca08f3ab478e39245b26bf9f1c97c28650beb396e433e8b54a7f0b6cc5e93e3000e39e7d8 WHIRLPOOL bb8672cb64d39d3786f3db64f5d215d122ee62144406d970a2e37b019fd64ed08f2109e8dd64f23b6926e1bb9f21839805149bec3e5fff200b465e59ecceb286
+DIST qttools-opensource-src-5.4.2.tar.xz 9333100 SHA256 edf3d7e00227f9989101da84b2fdf8eaf1a5b7863dc5e0d26bb0f39303e8b6b4 SHA512 55aa04eae16b71e78d4432e7d59b2052392d13652a3e9beff15a6503f2e88e77a9b48279121d8eee943a898799155c05b167d986bf01fae84b5db0a9a1759148 WHIRLPOOL 9123ff33a35c03adaa6d3374e86b539e9481ec78467bd72ad6f2d832e76e7aafd9b2f2da0420111e1aa8a66c4950b0478d8a6ae4c0f0e05a20c8334196b077e8
 EBUILD linguist-4.8.5.ebuild 1378 SHA256 3e7e2ccd9397161b9342ae2c1aced92810ae2e3d642dd7fbc0add076d1f1d044 SHA512 677085c8d6ced6f107945e38c42f1f1fee1d7d50490e2b8e3214570c12a29a4a69512c47ce1f21c720eb46ac4ca15f7435398101442674c9432fedaf67d11f13 WHIRLPOOL 35d656ae9a51c3ce1045070c5d3c72d494da89c06f497b1b4ce79b7c2d5f0eb01d48e6563e6184a47ee5f0059bd11b44d94ff8e2571bd96265e1c31cdd495bd8
 EBUILD linguist-4.8.6-r1.ebuild 1409 SHA256 92ecd6d378c3c1f3d05ca3760aae94ca1b244055d1d27be43667548dfd536501 SHA512 d3afc8c739006690461f438a80a60eb85e20685fad2fb08a50d60a3e45d2d3d9ae4d984decb67cededceca8bf4e4d9324aa02996e3a84bfda8ef869860683721 WHIRLPOOL f206dbe916efcde66dbc676c66f02e83a83b44176506da8c94c88c4a672e7efc6df9daa80afc4969bc99e058b76ec42d681bafba0c90503a8c0380915adfa0c7
 EBUILD linguist-4.8.7.ebuild 1376 SHA256 f67b54313c8fcc89785c6df9ac628d7697076b122a175706746e04e0aad5da53 SHA512 b79bbc0e3bd2b0e9c89afb3ccb01948874b430cd988a76d9e29bb20e84f13e9378fa8336871f82ea8df85535e8101b589c35eaca9f868e9b90204d7a319082e9 WHIRLPOOL 09b031cf6b6243fd053ea08b2f8c58d6fafc1e14a5ed8cde84e9927e3753907dccfef2d308a85bb1b8b7723a2fcc85d1e2b0c7d9716795fcd2e5c5342804ebbb
-EBUILD linguist-5.4.1.ebuild 741 SHA256 2986be02f352ba1929f454e88b61a13b6c8fb032e4d95a58b830a7848e4b1c72 SHA512 cc892298159c30443884a3f09d3fa6cceb971c346334f5c1cd7040e015ce04ad623dcb8195c6e4a79568edc8651555d20816c484a857003021cb880413b6fdbe WHIRLPOOL bfaac5cc74bca3b5c341427a584e00e125eb32b19d31b901e3821414eddd9ab3cca62dab943a1129b3d254315b51a382e9181345ee5c840734917843bfbdff43
-MISC ChangeLog 3811 SHA256 a066d3b3f83668fefa6afd24ec9dd0490545b6b477a104eb507b6db51a29cc54 SHA512 e7958a81c5d93a46d5940ad3639906af5dc7bdbd0fb19329a69a1061b172e414f96805fa2a165daeb995a36b57bb68652062ed42f5438a46739d532c91d81471 WHIRLPOOL 74c7bdae1692580ba78de109a39279ab8bd70b5713318ca6787b7052a77973f2851ab1326fc6c330b4df4890ee4ae79c7b48b5322259fa9d723224a81d41f655
-MISC metadata.xml 415 SHA256 fec2eeff3a64eeaa82d79ad5efa721bb975f8073c182f9dcacd2c72009e9f8b9 SHA512 9aa9a89b39c3acffbd34f25beca742c89ff7f1b6a06e1fe95d800369e6ea2a4629eaad1884c6a601b39b9ae12230580cec2f44ceb51c0fad93a512153a302d3e WHIRLPOOL a64dfbcbc44161555ff6a6461189abc47cf4e34b705a6376d3937c26099eecc9f7228812e1fe3514afbcb3cbe1ec24e5abcc941f13b48053ea57aeb0429a18ba
+EBUILD linguist-5.4.2.ebuild 665 SHA256 f20b8bd3ed73f2fd126e425090a5beb4a3bfb129dceec36d314e5551e67dba78 SHA512 9f04ee2bcd228917ce4642f714428eb8df17cc6c86e4af62af71a7067ec03e934b3c9e4f3f9bec3cfcb3edebc6e505be50cbe9dc4a70645e2a9448b5262eadd2 WHIRLPOOL 490fd81bdc475ecf7c30bdc4926906de00cd25e9b275c495362317fbe9c81255961ba8a63da6ecd4ffe3340a26ac1a2ba8f7fef17efad6ed888b48d63d2340f9
+MISC ChangeLog 3971 SHA256 d68b3e98ed544415a1a3515f17ce7c2c142e36d2559b654c5b0fa58cd7e33521 SHA512 84efe8f47c24f347c762c764ca59312347a04461499839223e8a6b2f5887d2e79e1c98efc1a4f36b784dff77d560c3a380f5345f6b180aca262b717c22b43638 WHIRLPOOL 429e6c7859d51a1cb8e3f92d6e11c5a212b81211598b3b99f496429ecde58846ce63111e02b9275d694d28009ecbd430724191c9703568c06fe0c3dbd6d189f6
+MISC metadata.xml 406 SHA256 9b69df2d1422470da7bc919a570303d186cc74e404c94471789765cb6a7f60a2 SHA512 6793c43be90e7d93c0971597a4fedba2fc26fbbe7718c0944ab655ce22cb9bd93e96481b3f758b471dcd705666abbdf3e1a75faf756ae90b283172c1e15d2682 WHIRLPOOL 1ea46d494c20389eb3db0a8ba6d9abd6cf2fbd94657e7ca33527ad3be966d043957bcee9e8f6c141fd4c42aeb2a708a4c8c791df812d799809f9819373d7e55b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlVpmQkACgkQkKaRLQcq0GJ+EgCeMVH3cIqzN0ACq9GzjZRuMh91
-kdwAn1VjzmpxS8nBSGJSp/q9kFsiiPwu
-=q7hK
+iQJ8BAEBCABmBQJVgY/lXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9IkQP/1oAJImXqVIq9saEwY6tCsQs
+pdc+fIsEc9LcIdxgZueWy8Y6mcmKMknFxIY/zqFbIurI9I80teCbeNeLEADEmQHR
+SUuRxPWWotBwlFAJJpV/F72iVA/30RN7c7l5+MzUY/gW/pIEHWmg4fK9DO+/QCVe
+nlHisIs9nUwq/8Yb92q/bEoGxk7BoioDCwFkIKljxxBbEb8k9wbbpDgcEPRVDtun
+NL6F3SN4TAnqIKHrF2uTwbW02157jvaPJbXeJViRvdnQTiio6fmXR/nsJ1GDh4Db
+Jmweq5NF83CyhlffguSp6/gU2KbRJx+24p8i/ySMSpsTNoIIvgNbCjApawMReUED
+tvxFdq6L4qCtRs3oUsKeCderN9TOmp/9O5S8X8ZyZ2QWuhrevWZGTXaLtsp6ZGJ9
+E3/pjzIwmYHxgWTAtla2yQhZflPf0qwwuqM+0js3TySxNW4K6Nbe6Q6J8t7gs8aU
+uNJ4pXeHFAJOww5eYoyEyOCKp3UOxinPyyoqIrE+zgRG5uhwce6LqFtoWIpQlqcu
+G+oOg8Oj6v8lP7/gQA3qtXItkWNE+i9aJ7Qqk0kKoArCFYfaJgyztG56/iLhWDD6
+/wWGuSAYZ0A23cTsbhPKLLeZvBlrMuWipMmT2NNe03jkOPiH0vS9cyjpNOsODBfT
+guya1oz0zC4Gbe8IXr/7
+=y2Qo
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/linguist/linguist-5.4.1.ebuild b/dev-qt/linguist/linguist-5.4.2.ebuild
index f15598b99cc9..8c2f9a0105c9 100644
--- a/dev-qt/linguist/linguist-5.4.1.ebuild
+++ b/dev-qt/linguist/linguist-5.4.2.ebuild
@@ -1,30 +1,26 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/linguist/linguist-5.4.1.ebuild,v 1.2 2015/05/16 10:44:46 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/linguist/linguist-5.4.2.ebuild,v 1.1 2015/06/17 15:19:00 pesa Exp $
 
 EAPI=5
-
 QT5_MODULE="qttools"
-
 inherit qt5-build
 
 DESCRIPTION="Graphical tool for translating Qt applications"
 
-if [[ ${QT5_BUILD_TYPE} == live ]]; then
-	KEYWORDS="~hppa ~ppc64"
-else
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
 fi
 
 IUSE=""
 
 DEPEND="
-	>=dev-qt/designer-${PV}:5[debug=]
-	>=dev-qt/qtcore-${PV}:5[debug=]
-	>=dev-qt/qtgui-${PV}:5[debug=]
-	>=dev-qt/qtprintsupport-${PV}:5[debug=]
-	>=dev-qt/qtwidgets-${PV}:5[debug=]
-	>=dev-qt/qtxml-${PV}:5[debug=]
+	>=dev-qt/designer-${PV}:5
+	>=dev-qt/qtcore-${PV}:5
+	>=dev-qt/qtgui-${PV}:5
+	>=dev-qt/qtprintsupport-${PV}:5
+	>=dev-qt/qtwidgets-${PV}:5
+	>=dev-qt/qtxml-${PV}:5
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-qt/linguist/metadata.xml b/dev-qt/linguist/metadata.xml
index d05859990036..258aee1d6e0d 100644
--- a/dev-qt/linguist/metadata.xml
+++ b/dev-qt/linguist/metadata.xml
@@ -8,6 +8,6 @@
 	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
-		<doc>http://qt-project.org/doc/</doc>
+		<doc>http://doc.qt.io/</doc>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-qt/pixeltool/ChangeLog b/dev-qt/pixeltool/ChangeLog
index ec2df49736eb..de5b3a73df6b 100644
--- a/dev-qt/pixeltool/ChangeLog
+++ b/dev-qt/pixeltool/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-qt/pixeltool
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/pixeltool/ChangeLog,v 1.32 2015/05/30 11:04:04 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/pixeltool/ChangeLog,v 1.33 2015/06/17 15:19:19 pesa Exp $
+
+*pixeltool-5.4.2 (17 Jun 2015)
+
+  17 Jun 2015; Davide Pesavento <pesa@gentoo.org> +pixeltool-5.4.2.ebuild,
+  -pixeltool-5.4.1.ebuild, metadata.xml:
+  Version bump.
 
   30 May 2015; Markus Meier <maekke@gentoo.org> pixeltool-4.8.6-r1.ebuild:
   arm stable, bug #530238
diff --git a/dev-qt/pixeltool/Manifest b/dev-qt/pixeltool/Manifest
index ff6c5c70b7ab..c9d25906a611 100644
--- a/dev-qt/pixeltool/Manifest
+++ b/dev-qt/pixeltool/Manifest
@@ -4,17 +4,29 @@ Hash: SHA256
 DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357
 DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2
-DIST qttools-opensource-src-5.4.1.tar.xz 9262024 SHA256 11de0f8573843194b134e32af49594514498fadc4fc0b3b0333540fe1f671f72 SHA512 1e1dce0d6d587bdfa8d3ed20db0dbf3c1db3c1ffea4ea34741a9069ca08f3ab478e39245b26bf9f1c97c28650beb396e433e8b54a7f0b6cc5e93e3000e39e7d8 WHIRLPOOL bb8672cb64d39d3786f3db64f5d215d122ee62144406d970a2e37b019fd64ed08f2109e8dd64f23b6926e1bb9f21839805149bec3e5fff200b465e59ecceb286
+DIST qttools-opensource-src-5.4.2.tar.xz 9333100 SHA256 edf3d7e00227f9989101da84b2fdf8eaf1a5b7863dc5e0d26bb0f39303e8b6b4 SHA512 55aa04eae16b71e78d4432e7d59b2052392d13652a3e9beff15a6503f2e88e77a9b48279121d8eee943a898799155c05b167d986bf01fae84b5db0a9a1759148 WHIRLPOOL 9123ff33a35c03adaa6d3374e86b539e9481ec78467bd72ad6f2d832e76e7aafd9b2f2da0420111e1aa8a66c4950b0478d8a6ae4c0f0e05a20c8334196b077e8
 EBUILD pixeltool-4.8.5.ebuild 1072 SHA256 4855e8f7e33ad0d2a1f106e64adaf7cface096370ae8bdb0b54c800434e2cc61 SHA512 02c2ae6fa0a8bce609bea34e4dc0b9eb85785d7f440320dcab1548b7f704c4a875d2a798311d2d30792d049bcf22261f37bc8aa81325bc2fe1e5609927dc9dc8 WHIRLPOOL 0ad7a582a40ded0671c3674adbd2e383150b63ab182c631dc948144ac4e23699c54416ad0f168be3e35dc2bb9ef904a9d8e50d3789d236eabfb8535eaa19cd9a
 EBUILD pixeltool-4.8.6-r1.ebuild 1031 SHA256 3fefce3003068edd1434650046b35189bbd7b39fbc1be58362832ba1a8b38271 SHA512 b5a8ed36973a769edd163cb218f52f1816919573fda06e0f6b4d5982dd5cbc32fe08779917a775d6ab2f3699c88c6614873e85bf21b5ff061cd9c67d6e9525ad WHIRLPOOL 88edff5a0c26e1d46b62220042a672fbef88fa28c5097727f3f13817ed81ffc9fc96e037424549658248070f02ab735d9dc7459befeacf8410519ad881202cd8
 EBUILD pixeltool-4.8.7.ebuild 1002 SHA256 b519ded389a5ea37b79c7a21026a4000ca9c54db15069403d4e46d337d693dcc SHA512 7d68b6f8bccdcae4812919344168394279ca721e1be2c7a1fe828019fdec503ef81ad52fbeaa40d0056370c7886a2cf61487a0f9b0cc98a9424bbd9168649798 WHIRLPOOL 4758acd0776297ebddb3e69a705bf9ec9158e456cea5a88b3f31c252b1fef22b90f3fb03c6fae4edc66e988ab43a24f95edf0c6524d64a3820943963ed93ef67
-EBUILD pixeltool-5.4.1.ebuild 630 SHA256 0c0995831a4bfc0566e521fa29b22e90b759d5a6f812304495422fd227de13bc SHA512 216d8b042f6978fe3b200816f9565536bab93de5eed554872bc9812d4bf1c539e2341d7afff17e6b1b7c71578f6b21a6fba430e6310479343494d6816f874f24 WHIRLPOOL 65bc459604bdac141bcc92e99bad65925aa312b2db9dae62238895b95c1f7bfe43482980a752e75233571c6911d81bd7fa0e8bd34fa4ce96c29afd6732594a00
-MISC ChangeLog 3929 SHA256 8aa272fedc065cfe908d936a0667a795bd557e7c7c013b141890fa89fdf25c9e SHA512 55d88b877ed123e2f24db0151993d7dc5447eee20f638d84ac3fc94fb169f489b0d4567c75907a83de8f2c49de5df72c06323d5892e7efd16fbcc608c00219d6 WHIRLPOOL 5a950cfb8d083e0f68f8a662f6667c31a7d97f30e1dc7dfb6db40a64f14e540e04e2ca3831241c935eb3bc7141874c2953dcc3c30a3b57b1c8e4d7ce2876aa00
-MISC metadata.xml 415 SHA256 fec2eeff3a64eeaa82d79ad5efa721bb975f8073c182f9dcacd2c72009e9f8b9 SHA512 9aa9a89b39c3acffbd34f25beca742c89ff7f1b6a06e1fe95d800369e6ea2a4629eaad1884c6a601b39b9ae12230580cec2f44ceb51c0fad93a512153a302d3e WHIRLPOOL a64dfbcbc44161555ff6a6461189abc47cf4e34b705a6376d3937c26099eecc9f7228812e1fe3514afbcb3cbe1ec24e5abcc941f13b48053ea57aeb0429a18ba
+EBUILD pixeltool-5.4.2.ebuild 576 SHA256 b2d4c6164eec89de1f80b63f054beab6e215c86ce4b5350f6554642fd182f424 SHA512 43ab9b5ce71ea978d4eb228bcc6e17af621d5befe84940a15983412a984f1da908943d8b0b71258d589c8832365f271a8683e525f4ecd10d1e7cbbce01f8c6e2 WHIRLPOOL d199bfe9132a60dade13955108e2e7202f8c17854c3dcc619f89ea53293f4fdeb4a739150546ecd0306a5de437c96101e7ed7b983c8501e25035d1e08026dd83
+MISC ChangeLog 4092 SHA256 492303ad93c4f315d3745e270ae29e1b7365fe86099e98bfbdf1f02af52989da SHA512 c2f24eb73fabda76ef82c3dbd6d4db21d2d263f4a86578301c54c4ab520448efaa65f597b7416a22aa2040bb043aa160ef8c49ba8c5f4b7f187df5cf7888c8e0 WHIRLPOOL 95932c189f174ff08141660709eb180258fe07c1367374135d1450bf0b44ead491a84ea3a4782f86d35e0e966610bb77516556e9491e2246268d8c590546f12f
+MISC metadata.xml 406 SHA256 9b69df2d1422470da7bc919a570303d186cc74e404c94471789765cb6a7f60a2 SHA512 6793c43be90e7d93c0971597a4fedba2fc26fbbe7718c0944ab655ce22cb9bd93e96481b3f758b471dcd705666abbdf3e1a75faf756ae90b283172c1e15d2682 WHIRLPOOL 1ea46d494c20389eb3db0a8ba6d9abd6cf2fbd94657e7ca33527ad3be966d043957bcee9e8f6c141fd4c42aeb2a708a4c8c791df812d799809f9819373d7e55b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlVpmSUACgkQkKaRLQcq0GJevgCgkmRtrVKdKwDzixXr0BYJOggW
-NJgAnRA/x3byUlPjFiNGRwKdU9B3gIkC
-=19BS
+iQJ8BAEBCABmBQJVgY/5XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9LNoP/i6qLxiezYI5UbqPGbOIx8d/
+3TFNcKMPOaLzLQz+GS77nTNoHxbvGIC1sI+GPkQk6LN6LIpgL/qBJUzFcNIAIUuH
+Yv3K3AktymQx30NoOtDZUKKPPoHmlKAy7x9rvIppiCwZjSp+rqS6WeAGlzWuUwJL
++4aoPciX03UVdMlHlm58EEAtbBalsVCpLuZhdFroeB+6MpuomIAXgiM4DC2SrRDs
+446ZdGHW0v3W1yQFsNISc/9IuWaD4I1cPPgYHBRc7n0eLrqwZP+b7c2WJEmQyx0s
+FGVpZI8DBL/J2PBibI3wGgnT9o0wfVVCmA6rgOPPzJUil1Mx9v0qEzqzjOxR0Waa
+Xqny4I9UO4tIVJsWEew1KQbfUkfpw9obG9gjFoMgcuIA8MXHOCj45n/nl7gY7g0t
+qtNlE3ZXg/KUmScNuGd8NjIltjCCGkqjATdtnaQLXgQwFXrSriur7dt18/fykFw0
+uWctOMZXgVOThNCp/kxZtr4h4Yuij5tih6AoEZFAEfxmYCYoUf1ibkGGPgOpbaci
+6B63N0Ft/tUuUHzVbk2Oj2lGR/xbKKv4obT/5ehoIRhGhmAL0R102XxCn+FLrv9R
+tsnC8HiImoDb1EUs95EXT+ZAqlrp2dESd6UKtV23XcopdtReX3+ZrKddIa7JiI5y
+w1alP4Lj4snCMBOwhPR7
+=8sKp
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/pixeltool/metadata.xml b/dev-qt/pixeltool/metadata.xml
index d05859990036..258aee1d6e0d 100644
--- a/dev-qt/pixeltool/metadata.xml
+++ b/dev-qt/pixeltool/metadata.xml
@@ -8,6 +8,6 @@
 	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
-		<doc>http://qt-project.org/doc/</doc>
+		<doc>http://doc.qt.io/</doc>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-qt/pixeltool/pixeltool-5.4.1.ebuild b/dev-qt/pixeltool/pixeltool-5.4.2.ebuild
index 58026b4e1603..eab8413788c4 100644
--- a/dev-qt/pixeltool/pixeltool-5.4.1.ebuild
+++ b/dev-qt/pixeltool/pixeltool-5.4.2.ebuild
@@ -1,28 +1,24 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/pixeltool/pixeltool-5.4.1.ebuild,v 1.3 2015/05/16 10:45:46 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/pixeltool/pixeltool-5.4.2.ebuild,v 1.1 2015/06/17 15:19:19 pesa Exp $
 
 EAPI=5
-
 QT5_MODULE="qttools"
-
 inherit qt5-build
 
 DESCRIPTION="Qt screen magnifier"
 
-if [[ ${QT5_BUILD_TYPE} == live ]]; then
-	KEYWORDS="~ppc64"
-else
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
 fi
 
 IUSE=""
 
 DEPEND="
-	>=dev-qt/qtcore-${PV}:5[debug=]
-	>=dev-qt/qtgui-${PV}:5[debug=]
-	>=dev-qt/qtnetwork-${PV}:5[debug=]
-	>=dev-qt/qtwidgets-${PV}:5[debug=]
+	>=dev-qt/qtcore-${PV}:5
+	>=dev-qt/qtgui-${PV}:5
+	>=dev-qt/qtnetwork-${PV}:5
+	>=dev-qt/qtwidgets-${PV}:5
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-qt/qdbus/ChangeLog b/dev-qt/qdbus/ChangeLog
index 2d922a54e1c1..32f49da8a131 100644
--- a/dev-qt/qdbus/ChangeLog
+++ b/dev-qt/qdbus/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-qt/qdbus
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qdbus/ChangeLog,v 1.12 2015/05/16 10:46:30 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qdbus/ChangeLog,v 1.13 2015/06/17 15:19:27 pesa Exp $
+
+*qdbus-5.4.2 (17 Jun 2015)
+
+  17 Jun 2015; Davide Pesavento <pesa@gentoo.org> +qdbus-5.4.2.ebuild,
+  -qdbus-5.4.1.ebuild, metadata.xml:
+  Version bump.
 
   16 May 2015; Jeroen Roovers <jer@gentoo.org> qdbus-5.4.1.ebuild:
   Mark ~ppc64 too.
diff --git a/dev-qt/qdbus/Manifest b/dev-qt/qdbus/Manifest
index 2d9653aff60e..c39a1ad1c277 100644
--- a/dev-qt/qdbus/Manifest
+++ b/dev-qt/qdbus/Manifest
@@ -1,14 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST qttools-opensource-src-5.4.1.tar.xz 9262024 SHA256 11de0f8573843194b134e32af49594514498fadc4fc0b3b0333540fe1f671f72 SHA512 1e1dce0d6d587bdfa8d3ed20db0dbf3c1db3c1ffea4ea34741a9069ca08f3ab478e39245b26bf9f1c97c28650beb396e433e8b54a7f0b6cc5e93e3000e39e7d8 WHIRLPOOL bb8672cb64d39d3786f3db64f5d215d122ee62144406d970a2e37b019fd64ed08f2109e8dd64f23b6926e1bb9f21839805149bec3e5fff200b465e59ecceb286
-EBUILD qdbus-5.4.1.ebuild 619 SHA256 aff504a08f8af37310cff87a1fb810d13c6a942ca3c9afde7cd9f7c4bffd9661 SHA512 8c8881269980ab60211e81d434dacdb2fa7e74f04345b59bf938ae13f5d2c8a0dedca4854705ff77a79305ce6f49a03181fe5a7b2597af5fa0124152a86bc755 WHIRLPOOL ff93ef8ddc0472a88fd5d280dee75f2cec117714aeb9c60a72fd563ffaaea10fb83b3030fbc2e2459d31f5d3edb11622191fb2c82fc69f82e6ea81c24b85cb72
-MISC ChangeLog 1319 SHA256 c73713484c2f373d5733b3dc7dbae220554fdf7265f162c016f7d1d54278348d SHA512 d263c780fed2b40248a66f411f7020613128a187aa6ef4c3aecf7edadcb409db57dc9682233fe58f9f9fc17c5b27b18c251f5d4ce27b5659f5c8c6fdf7cb2556 WHIRLPOOL c3570bb70b24cc5619a36ff39a8a2a32c7469d6bd6740dfa83fbd8294f0a53eff6f5daa212e0e40d20a177a9179dcd6b68f4e3695a5f742a80f1d9bc996aaa36
-MISC metadata.xml 268 SHA256 0976b0efa573f782c96382e8f40ec82944c66ed52a89ebe6b0e905050f01395d SHA512 73ef5d7a382915e844a0cf7f1f05ae64c88500ecffe13265d156960b498ae61a62f29c9789330e5f24c82ddbf3a9ebb98aeff5c4cb0e69af1e8f07099791b806 WHIRLPOOL 19922570bea256c44d78d6f92ef9781be4c177580bb4235d8620139c6cfd759df64fc82f053a685d70fa1378b0fd6f49bb818d393b19105e6069730e9cf44e52
+DIST qttools-opensource-src-5.4.2.tar.xz 9333100 SHA256 edf3d7e00227f9989101da84b2fdf8eaf1a5b7863dc5e0d26bb0f39303e8b6b4 SHA512 55aa04eae16b71e78d4432e7d59b2052392d13652a3e9beff15a6503f2e88e77a9b48279121d8eee943a898799155c05b167d986bf01fae84b5db0a9a1759148 WHIRLPOOL 9123ff33a35c03adaa6d3374e86b539e9481ec78467bd72ad6f2d832e76e7aafd9b2f2da0420111e1aa8a66c4950b0478d8a6ae4c0f0e05a20c8334196b077e8
+EBUILD qdbus-5.4.2.ebuild 573 SHA256 ac60b1882a3ce870440bb72097e4a2777a870696799235ce31e1ac4af385cdee SHA512 e85d0c4cb8da173834289eacc2ac360ef56f0935addeb9db8b5d4e2fb1c73a956668a6611b9e7a3af5732dd1c40449a2975ff54b92b96a2933d4ee51e9be908e WHIRLPOOL f132a005fc3d5394bc3ce7fd8e941876617b91ef739f771416b887afeb27c41bd5bcb34dd028c1aae588fb0f3946a627e052465bcd68dc9547b55668fedcf646
+MISC ChangeLog 1473 SHA256 78ab5c009ad7adf3c6824de9100e928f675c7cce10493df844591159cbda9cf7 SHA512 855d8e756ab0fd601baf13005085a254d22a78363fd20c5816b61baedcd09bbc1f71c82fd3c4902c6c581d2e27f0b433896539817c6c660570cd1fc62ccff74d WHIRLPOOL a0f1f50e229b7aac9d573ec36f886f50c8b2a1a225fa9ede894642b9e73c6fb322557035796278663e1a2101deb8ecdf94ed878139a6233e4ed88c93d8b0257a
+MISC metadata.xml 259 SHA256 da0ed92b6766281315367c03378c1935b4e9fa82f840641d9c72b00a1b038646 SHA512 1fca930f71c109412ead8932e0910f6c2b1991a454b03ddef6dda7101358db65b3c6da5eb7f71c918673fd3b9b0ac0397cef0dd24c85f84f2043e3ca8e21dda1 WHIRLPOOL 484f50be685ae8a8a65889a66edf2a6d544e0c6758a8f384bafd7e8f1cc23c4e788613d39febc67f1fc6f99e9e7541881f6224e07497ab0ca031449053b5e13b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlVXIAgACgkQVWmRsqeSphM3vACbBxb7EIojm/OlKTxeJ/qQlK6H
-8z8An1ubgBp4BSsVojDAMbZ49gf0/MH0
-=kcCV
+iQJ8BAEBCABmBQJVgZAAXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9fgQP/RZja50S0JQgLukRQRZslrFf
+6HkuVeIYFUzM/SsSdfc0RAvwfj1DSbKZWEZOaxmBBcq2/nAykOS3NNF3QMYyQscA
+oIbDSlhxWKqMLfLkbo8w3K2CM824NLdSqIHPhWbcx1SbY0BdhpoMqDBIE1RDatNf
+JVu2l4P6Wz6FpvhVJmdvahld22W8RekMny/z/fOn5nR75Fg+7r+rvN6KRldXHXBv
+0E70tItjI2D5iHDRC0M5vnkCO3Tgm5P2uhVGdjGJU7R1V7ptUWvYzoMTwrOWJuql
+aScL2AWc91manHQFCDwEQHz23y2/snpjq7qVaKMK+/PrpXHnTfiDZX3XCWnyC1HU
+qGLDFd4q9O3wpFkELYn1oe7ceUwR3YFEcScW15+vnqPAkqN2nfMdrVIdQEIMFr4+
+aKiHaxjPK1L+nmVZjrw/uB3NnEfwBSGznB4JQSP4a9HirPVaEDm5H85uKkUvAbID
+ZWuFgvtNW+V6JeVNE7cI+tHIdwveQ5PtnN2cApcLa22+qYe5PCW9kSvvayic0ijM
+fvQiwPJJN2lvd1YRIdzGQwSfMnBLPnlgASXkawLQBPIm1vjscMpesMb0RuiZE9PD
+hEhYeTNkSi5i+cGI8oRrBXxcG4cCSk5MSAKvASaVssQTr63VjyrkMMmUVmMC9AxL
+snj/5XVa487NjKYZqGxe
+=rd/6
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qdbus/metadata.xml b/dev-qt/qdbus/metadata.xml
index 39c63597e531..afb3b434585b 100644
--- a/dev-qt/qdbus/metadata.xml
+++ b/dev-qt/qdbus/metadata.xml
@@ -4,6 +4,6 @@
 	<herd>qt</herd>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
-		<doc>http://qt-project.org/doc/</doc>
+		<doc>http://doc.qt.io/</doc>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-qt/qdbus/qdbus-5.4.1.ebuild b/dev-qt/qdbus/qdbus-5.4.2.ebuild
index 0b0345e38c5d..b88b39d4403f 100644
--- a/dev-qt/qdbus/qdbus-5.4.1.ebuild
+++ b/dev-qt/qdbus/qdbus-5.4.2.ebuild
@@ -1,27 +1,23 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qdbus/qdbus-5.4.1.ebuild,v 1.3 2015/05/16 10:46:30 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qdbus/qdbus-5.4.2.ebuild,v 1.1 2015/06/17 15:19:27 pesa Exp $
 
 EAPI=5
-
 QT5_MODULE="qttools"
-
 inherit qt5-build
 
 DESCRIPTION="Interface to Qt applications communicating over D-Bus"
 
-if [[ ${QT5_BUILD_TYPE} == live ]]; then
-	KEYWORDS="~ppc64"
-else
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
 fi
 
 IUSE=""
 
 DEPEND="
-	>=dev-qt/qtcore-${PV}:5[debug=]
-	>=dev-qt/qtdbus-${PV}:5[debug=]
-	>=dev-qt/qtxml-${PV}:5[debug=]
+	>=dev-qt/qtcore-${PV}:5
+	>=dev-qt/qtdbus-${PV}:5
+	>=dev-qt/qtxml-${PV}:5
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-qt/qdbusviewer/ChangeLog b/dev-qt/qdbusviewer/ChangeLog
index c85522830d4f..e1e3037f813f 100644
--- a/dev-qt/qdbusviewer/ChangeLog
+++ b/dev-qt/qdbusviewer/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-qt/qdbusviewer
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qdbusviewer/ChangeLog,v 1.31 2015/05/30 11:04:33 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qdbusviewer/ChangeLog,v 1.32 2015/06/17 15:19:39 pesa Exp $
+
+*qdbusviewer-5.4.2 (17 Jun 2015)
+
+  17 Jun 2015; Davide Pesavento <pesa@gentoo.org> +qdbusviewer-5.4.2.ebuild,
+  -qdbusviewer-5.4.1.ebuild, metadata.xml:
+  Version bump.
 
   30 May 2015; Markus Meier <maekke@gentoo.org> qdbusviewer-4.8.6-r1.ebuild:
   arm stable, bug #530238
diff --git a/dev-qt/qdbusviewer/Manifest b/dev-qt/qdbusviewer/Manifest
index 8f0399437fe1..9a9afc188f6a 100644
--- a/dev-qt/qdbusviewer/Manifest
+++ b/dev-qt/qdbusviewer/Manifest
@@ -4,17 +4,29 @@ Hash: SHA256
 DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357
 DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2
-DIST qttools-opensource-src-5.4.1.tar.xz 9262024 SHA256 11de0f8573843194b134e32af49594514498fadc4fc0b3b0333540fe1f671f72 SHA512 1e1dce0d6d587bdfa8d3ed20db0dbf3c1db3c1ffea4ea34741a9069ca08f3ab478e39245b26bf9f1c97c28650beb396e433e8b54a7f0b6cc5e93e3000e39e7d8 WHIRLPOOL bb8672cb64d39d3786f3db64f5d215d122ee62144406d970a2e37b019fd64ed08f2109e8dd64f23b6926e1bb9f21839805149bec3e5fff200b465e59ecceb286
+DIST qttools-opensource-src-5.4.2.tar.xz 9333100 SHA256 edf3d7e00227f9989101da84b2fdf8eaf1a5b7863dc5e0d26bb0f39303e8b6b4 SHA512 55aa04eae16b71e78d4432e7d59b2052392d13652a3e9beff15a6503f2e88e77a9b48279121d8eee943a898799155c05b167d986bf01fae84b5db0a9a1759148 WHIRLPOOL 9123ff33a35c03adaa6d3374e86b539e9481ec78467bd72ad6f2d832e76e7aafd9b2f2da0420111e1aa8a66c4950b0478d8a6ae4c0f0e05a20c8334196b077e8
 EBUILD qdbusviewer-4.8.5.ebuild 1402 SHA256 4e05fa791850b270b4f497912e99475f51a042c0a203ad4e31ba77008e2a4abb SHA512 48b57fe7d146cf091cc990f82768da744b6bdb4064796b6075fd3ef9753efa8f157161ebb00cb9b5841c3ef00dceae665223945fcb9185050833f3b6c2ed38ed WHIRLPOOL 85a101a1392214be9f1d93a138812d826795bb8c81ec2ed320894b664b1b89f51ec543157c30e6faf492e3d1af13610b7e8bc7a5b3618dd234b640145ef04892
 EBUILD qdbusviewer-4.8.6-r1.ebuild 1427 SHA256 3be5bfad900f50dcecba349775e7a75cad4df3235dd6a374fe0ae2b35fb287fb SHA512 402bd3fa9128cfc0234189e30cd0b1e4c59fb5f868c7a566ea8f99399781404337599f3e4694d5afb6d64f92a20779e9f802e45e36ab9f8acff00ece018821ff WHIRLPOOL 19cfec150bcf7b11f1a6824be0250bc24af2a343f4f6a2e2e6cd4e3cd36e946a43155d4be465eb2ce14c6b5c2992c85a3b8f393982c6fc1c843292e5a2594269
 EBUILD qdbusviewer-4.8.7.ebuild 1394 SHA256 7962209f9a086125d4050c357ca4672c07a777663bee43140fdc7df415e5fcae SHA512 9ecc5f7645fa180005e3ecdbf535f3767c52c6e719ac9f5e9feb5bbef8e7d883adf6b3b73f741194589866168a036b764874afac80053a5d36b3599cd3ffa23e WHIRLPOOL 2da1dc063e9a7a2bf483e1e482dbdb1935ccda8624954f7c92a5f4789db83aec45c7665c3c7c0acf06c659bcfe6afa033a124be927f6799e7c2e81dab3dde1b8
-EBUILD qdbusviewer-5.4.1.ebuild 718 SHA256 556b1c5ad402b782661834c699d8a107feae9d55b0b2659bc4eae0744c39692a SHA512 3bb61621d9db1651157938aa1d2e5a58debfea5d79610bd0d431babe99943f979f3cc1e6fe5069e3313c7928f6e4fcf7023bbc50077fba05611a0fbfd9f48680 WHIRLPOOL 5ef3f2cfec5976184cca7b38b6cf1d59693dd3d1fa11f72e548bfcf4fdde92decb55cedb9f0271339f63a23f654ebd8c43cd35b587fad4fdd703871d0b6c7aa7
-MISC ChangeLog 3918 SHA256 b93b885f969c4a6b621165e9c3933bc348a27b3781c59988aedece9219b510e1 SHA512 add9a59dfc565faca7faea7c7ba8819670b7bce446bc1e9b9b3eb166d4c78c3a7388f9c779dfda7c1e1e30e149382db288e272768cee26396c0e2aeadac37a68 WHIRLPOOL 9bb82fb816adc17718b00d55f952551f75bd081b05ec1638beaa30575ab9c6aa83cde4626e78bcd6be586643c82a9b5e8b02e614db56e767ae2a5ad41a3dbe1c
-MISC metadata.xml 415 SHA256 fec2eeff3a64eeaa82d79ad5efa721bb975f8073c182f9dcacd2c72009e9f8b9 SHA512 9aa9a89b39c3acffbd34f25beca742c89ff7f1b6a06e1fe95d800369e6ea2a4629eaad1884c6a601b39b9ae12230580cec2f44ceb51c0fad93a512153a302d3e WHIRLPOOL a64dfbcbc44161555ff6a6461189abc47cf4e34b705a6376d3937c26099eecc9f7228812e1fe3514afbcb3cbe1ec24e5abcc941f13b48053ea57aeb0429a18ba
+EBUILD qdbusviewer-5.4.2.ebuild 656 SHA256 79eda5dd9ec9cb09eb2aeaaedccc4eb58755fc89a026ed08ca52d053acad718a SHA512 6462deed1357347ee0d0de3ea2cea682ce4bcb4d8b47970dff4b41ba5d0caae108fb810326ff54ef61927d35ab94f7291967fc6a381a66a24210ac37a9e1de82 WHIRLPOOL 2c7db1da01c78370c66571a0c4c57087493db9be3736e1e63d98a893d530cae49f27311956e17bb7756702cfc07cbbf938a23c87cf8fde872c10f0fa878f7d85
+MISC ChangeLog 4087 SHA256 864e5990a9ee74c9b0ae7b262641db573c9d85c159822fe2cfbb667d69daad77 SHA512 71a334ddb0f67245418ee20947aeb2d41321ba744c3371e77f88e1c182f0e06b342bbc8674ceac9fb83e160b26fdeb5a77c5175da2eea11f82355e4bcc310398 WHIRLPOOL 9f11f0b85396196f16f43ccd39a337b217d58527399b41998d88f0c53a976dd2e2c21febe4bed484920186dfe02f725cbe4c4418f6229e51143d977bb1b75cbc
+MISC metadata.xml 406 SHA256 9b69df2d1422470da7bc919a570303d186cc74e404c94471789765cb6a7f60a2 SHA512 6793c43be90e7d93c0971597a4fedba2fc26fbbe7718c0944ab655ce22cb9bd93e96481b3f758b471dcd705666abbdf3e1a75faf756ae90b283172c1e15d2682 WHIRLPOOL 1ea46d494c20389eb3db0a8ba6d9abd6cf2fbd94657e7ca33527ad3be966d043957bcee9e8f6c141fd4c42aeb2a708a4c8c791df812d799809f9819373d7e55b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlVpmUIACgkQkKaRLQcq0GIEaACfeMB5iOeHPaRXjvrZ+w6CjujE
-Em0An0JBwZF0e6ZqzFpTVeNIdUufGFGp
-=CYEO
+iQJ7BAEBCABmBQJVgZAMXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9htMP8gJagHaSQ4QmtqStd37Samq5
+GXBJW9yFQWElqfk6SDBM4fKyeajMxGJp+W3enyPDyLEDwmEqcr/Tk1+1Eacickxm
+X6UY8MBWPVcmB3GlyPWhvuR856gomlMhKrvA405cdx1xCTNPEJ4ZqrkbKZvBxoIk
+qNYRj+uIN0BeiXRJEbNz2HuaWn17RlSl6MJ9fe1HNYdaDVhl41cKJiEkzFJ6tEob
+tmNUkP117queciJ2LsR2J1YgMxq1WsuUATIYHDolWpnLLCHp6lu0I7NE8SeIMv0X
+R9IlRJVVdHZfCvYjxBCC8e5YdNoVKDXCZ3FZeUyPfbelraUE81VjxbnokeGVtAwo
+mlzXM0/1AZ7phfqrOjfPuAj+IAbvSYNnRwTCAasQeTqiQijwkl7DcHh2QkUhoq50
+gJlARl33Vp3RUW4/OJx3gcZi5SX5+BjTSPGNWCAfJHeztJEgxdHF+32prBmKTAF0
+wqCCJKxRKQxhyjYsPiMHXG6hi7f1OefUPGjaTJmudnyjBTj+JKYbtEEo58wCI6oA
+eY4T11TmKsgAJzcJHaad7Onje/u7fFvRodxiUsfxhApUm4SWSJxhE23FsxQ3WF3a
+yZK7B1pdrpi5jaU5Yb0D3BEgM6VXiwkRD+aUrmTV4XoIzdRlfV/DwcRRzZ4pgbQ3
+Lorm6ysficGX+8Jtd9Y=
+=vZDN
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qdbusviewer/metadata.xml b/dev-qt/qdbusviewer/metadata.xml
index d05859990036..258aee1d6e0d 100644
--- a/dev-qt/qdbusviewer/metadata.xml
+++ b/dev-qt/qdbusviewer/metadata.xml
@@ -8,6 +8,6 @@
 	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
-		<doc>http://qt-project.org/doc/</doc>
+		<doc>http://doc.qt.io/</doc>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-qt/qdbusviewer/qdbusviewer-5.4.1.ebuild b/dev-qt/qdbusviewer/qdbusviewer-5.4.2.ebuild
index 626036bc995d..cd073a26fd35 100644
--- a/dev-qt/qdbusviewer/qdbusviewer-5.4.1.ebuild
+++ b/dev-qt/qdbusviewer/qdbusviewer-5.4.2.ebuild
@@ -1,29 +1,25 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qdbusviewer/qdbusviewer-5.4.1.ebuild,v 1.3 2015/05/16 10:47:22 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qdbusviewer/qdbusviewer-5.4.2.ebuild,v 1.1 2015/06/17 15:19:39 pesa Exp $
 
 EAPI=5
-
 QT5_MODULE="qttools"
-
 inherit qt5-build
 
 DESCRIPTION="Graphical tool that lets you introspect D-Bus objects and messages"
 
-if [[ ${QT5_BUILD_TYPE} == live ]]; then
-	KEYWORDS="~ppc64"
-else
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
 fi
 
 IUSE=""
 
 DEPEND="
-	>=dev-qt/qtcore-${PV}:5[debug=]
-	>=dev-qt/qtdbus-${PV}:5[debug=]
-	>=dev-qt/qtgui-${PV}:5[debug=]
-	>=dev-qt/qtwidgets-${PV}:5[debug=]
-	>=dev-qt/qtxml-${PV}:5[debug=]
+	>=dev-qt/qtcore-${PV}:5
+	>=dev-qt/qtdbus-${PV}:5
+	>=dev-qt/qtgui-${PV}:5
+	>=dev-qt/qtwidgets-${PV}:5
+	>=dev-qt/qtxml-${PV}:5
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-qt/qdoc/ChangeLog b/dev-qt/qdoc/ChangeLog
index 656ea8daa60f..b7d664fb4f69 100644
--- a/dev-qt/qdoc/ChangeLog
+++ b/dev-qt/qdoc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-qt/qdoc
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qdoc/ChangeLog,v 1.10 2015/05/16 10:48:02 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qdoc/ChangeLog,v 1.11 2015/06/17 15:19:46 pesa Exp $
+
+*qdoc-5.4.2 (17 Jun 2015)
+
+  17 Jun 2015; Davide Pesavento <pesa@gentoo.org> +qdoc-5.4.2.ebuild,
+  -qdoc-5.4.1.ebuild, metadata.xml:
+  Version bump.
 
   16 May 2015; Jeroen Roovers <jer@gentoo.org> qdoc-5.4.1.ebuild:
   Mark ~ppc64 too.
diff --git a/dev-qt/qdoc/Manifest b/dev-qt/qdoc/Manifest
index cdd183dc825d..b34d21a79374 100644
--- a/dev-qt/qdoc/Manifest
+++ b/dev-qt/qdoc/Manifest
@@ -1,14 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST qtbase-opensource-src-5.4.1.tar.xz 46132220 SHA256 8574a593830959c0f7e5430fe77a43832ea7f5299e14a397a74576b3df7fb1b7 SHA512 75d2c16bc47e6403e15c4094f50757157960cff4434de29f199b015795ba772b62125f01c09aceb2a06f8dfcfc4df8e35330259c76959239f276e2f5bd5221b5 WHIRLPOOL 48d9a583ba9d0bbfffdbfeaa2412e77a0bf4011e7bba525129ba4572faa6a55713a89cb00f4ed7f24e6782e3f7b8b48cb192e2c082b7dcb3c35a85109f2eb340
-EBUILD qdoc-5.4.1.ebuild 549 SHA256 1849e11c830439dc75ed21d8dd00935b5b20542c1f26473a7e3eb83e6521288a SHA512 4efbd7ea0ced9fc92431e370e266caafd1f96125d1b2d1d0f41ab5ed8683893c9d4762bf6b45a825b6f3b304749c124d912a3ac680734031432a2f9c9b7c2ab4 WHIRLPOOL 3a33d9f64ce44e7fddcedf3e0a4343fc0c1363ceb9a25b7b9d3c4fb956232c5dcd508e3f7826e7cb59d64830bb5c4db7a0cd74dba49264b0607b3911db91bb5c
-MISC ChangeLog 1302 SHA256 94200e78ca45b478fb5437fbd014eca18557e386fc5f7be1b5d1535e3ae3ebcb SHA512 012ec840af6bcb91e876adca758354b6c7c273fa2293c7e7e0026bf694c488c3defd0cad0f5d8b0a66509e798fdbb7cae1eaeb347568c1c71879dbcaac1f228f WHIRLPOOL 96c6bbd64e9c01be2dba722e469f5a93c1a3515321434c1182b0ef50a67b7dca22a712aaa3a82bc258a525be18995b87669a2bb25869dca733f416553b4fbfb1
-MISC metadata.xml 268 SHA256 0976b0efa573f782c96382e8f40ec82944c66ed52a89ebe6b0e905050f01395d SHA512 73ef5d7a382915e844a0cf7f1f05ae64c88500ecffe13265d156960b498ae61a62f29c9789330e5f24c82ddbf3a9ebb98aeff5c4cb0e69af1e8f07099791b806 WHIRLPOOL 19922570bea256c44d78d6f92ef9781be4c177580bb4235d8620139c6cfd759df64fc82f053a685d70fa1378b0fd6f49bb818d393b19105e6069730e9cf44e52
+DIST qtbase-opensource-src-5.4.2.tar.xz 46354192 SHA256 9fc4f720b8b5a8b8e4a7d45e13ce4d5b86756ad46fb406386637eb2de5fd5a74 SHA512 029da83969614bc9b3803c76242af62911e3c6de171b116b5cb8e2823cad0514ab705cc3fa331e042c679caeb099de4e9cd7ddea92959f675dda82533e3ad7fe WHIRLPOOL 5f352f78a779c5d042f04966a010b10af706c4db94976870721a550e3ab7eaf2695b3582c86cdcc3a11de36283e11fe65797f96e59df96fa367b16b72b5f9213
+EBUILD qdoc-5.4.2.ebuild 511 SHA256 d33ac93c11ef3b1bf6fd48ef43089d787aebb15f30e1245efd6d3ce830d46287 SHA512 5f48a1c8b6ef140da8b1880b04bcad5d80c932a494b15bbe7c306dfc432d3839b06ca9acefcdf081b4dda5cb3cef6b2a83e6a87f25c563a2db750821fa401628 WHIRLPOOL 796f74ef69b3a4eeb508880f2e1d5fe1641be8b6e5eff446ceef2537754fcc5030eb4c791831790e693b2d570c8d616681ff696ba534c8af908afb465e11d7ff
+MISC ChangeLog 1453 SHA256 8f27e4d9ebd2e7afce4fb50565a52e1cc3be3d3db8e4db24015065049e260c03 SHA512 614e2dd80ed96d61921df4540a6365783274c7f1e26f532075b628adc256c01e788debb7fe294756a45f33b100b1c1a7362f92c9ef31954fc2ee70620d26f112 WHIRLPOOL 378699f2ee17ed63828ff6bd48866faa3c10aad7692347021f6675d10be28f6184beb78d271400f2f66263756e5c992072372805841846a40bc5c5a6766b6ae1
+MISC metadata.xml 259 SHA256 da0ed92b6766281315367c03378c1935b4e9fa82f840641d9c72b00a1b038646 SHA512 1fca930f71c109412ead8932e0910f6c2b1991a454b03ddef6dda7101358db65b3c6da5eb7f71c918673fd3b9b0ac0397cef0dd24c85f84f2043e3ca8e21dda1 WHIRLPOOL 484f50be685ae8a8a65889a66edf2a6d544e0c6758a8f384bafd7e8f1cc23c4e788613d39febc67f1fc6f99e9e7541881f6224e07497ab0ca031449053b5e13b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlVXIGMACgkQVWmRsqeSphMGeACfRLN3nSEPpOaa76Dzt24VNyMa
-FBMAn0HsdyozgKeUB60aJPEcDoWx6U6k
-=T61X
+iQJ8BAEBCABmBQJVgZATXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9XXAP/i0JdkGmzk2b3YFGywyt5RBM
+qAj5LyQ4c0fxv+UQwNh/fGv5Js78i+emZS6aijRGzApwByxSEYRgjteRodMqn28E
+wmeIQoSWBzPWyVBgyloQt3bS8/Y0r9Th6b7+357xCMs33etgVX+Xf20WySsor9gi
+aLLnb6h5FNBtckcODb2lEQKqqKKp+7XogZrEmVoUdrtjmQU3eqh6YCIHQXisB/Ak
+6yCvxJCTL5qlvD4XuN4LR282eKTc253W8m6pgMnJ+iccObvP7FCXarBcLr9AktGB
+HO1pHO0fFNX8Wry2sBfmUKLwXkTc9ywUtUjmxxGNkr5InF1PCDR+h0v/03GiSZVf
+BhrVCQScjcYAKTc9x7mSNNhvNgzeonHku7kpbqpRcI055m4bMLKYTAOZo6LCkGG9
+6zcExPxqR+cp5b4f+dCYKMHSQMLAfNg8yqsXBCjYljXrVEyT5OI6OZLeFbTsKijc
+GA6iV6zJowEL3N7cAGhfc7mrb6ZbqRpa5XV7b2J1WAFwLpXLHdhjkYYqhOLuGcSf
+0dxZHUIkCX/NZi9h943Y87oPlIMo/qm4IzOIP/n4ipwRmhqgPj3kNC5kgfrhsdUq
+079lt7kza0gjpZJws5kfzj784A17SgsGYcEclzCelnhylgrptB9lBUeWVpaY+Ret
+4kF9u3f5vihtS7qnnL4Z
+=e8mK
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qdoc/metadata.xml b/dev-qt/qdoc/metadata.xml
index 39c63597e531..afb3b434585b 100644
--- a/dev-qt/qdoc/metadata.xml
+++ b/dev-qt/qdoc/metadata.xml
@@ -4,6 +4,6 @@
 	<herd>qt</herd>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
-		<doc>http://qt-project.org/doc/</doc>
+		<doc>http://doc.qt.io/</doc>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-qt/qdoc/qdoc-5.4.1.ebuild b/dev-qt/qdoc/qdoc-5.4.2.ebuild
index 9043465ba69e..811b632083c5 100644
--- a/dev-qt/qdoc/qdoc-5.4.1.ebuild
+++ b/dev-qt/qdoc/qdoc-5.4.2.ebuild
@@ -1,26 +1,22 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qdoc/qdoc-5.4.1.ebuild,v 1.3 2015/05/16 10:48:02 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qdoc/qdoc-5.4.2.ebuild,v 1.1 2015/06/17 15:19:46 pesa Exp $
 
 EAPI=5
-
 QT5_MODULE="qtbase"
-
 inherit qt5-build
 
 DESCRIPTION="Qt documentation generator"
 
-if [[ ${QT5_BUILD_TYPE} == live ]]; then
-	KEYWORDS="~ppc64"
-else
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
 fi
 
 IUSE=""
 
 DEPEND="
-	~dev-qt/qtcore-${PV}[debug=]
-	~dev-qt/qtxml-${PV}[debug=]
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtxml-${PV}
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-qt/qtconcurrent/ChangeLog b/dev-qt/qtconcurrent/ChangeLog
index ef055642ae0a..2218ad52261e 100644
--- a/dev-qt/qtconcurrent/ChangeLog
+++ b/dev-qt/qtconcurrent/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-qt/qtconcurrent
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtconcurrent/ChangeLog,v 1.13 2015/05/16 11:07:45 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtconcurrent/ChangeLog,v 1.14 2015/06/17 15:19:53 pesa Exp $
+
+*qtconcurrent-5.4.2 (17 Jun 2015)
+
+  17 Jun 2015; Davide Pesavento <pesa@gentoo.org> +qtconcurrent-5.4.2.ebuild,
+  -qtconcurrent-5.4.1.ebuild, metadata.xml:
+  Version bump.
 
   16 May 2015; Jeroen Roovers <jer@gentoo.org> qtconcurrent-5.4.1.ebuild:
   Mark ~ppc64 too.
diff --git a/dev-qt/qtconcurrent/Manifest b/dev-qt/qtconcurrent/Manifest
index 2202663735d2..c6c3a2c3af5b 100644
--- a/dev-qt/qtconcurrent/Manifest
+++ b/dev-qt/qtconcurrent/Manifest
@@ -1,14 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST qtbase-opensource-src-5.4.1.tar.xz 46132220 SHA256 8574a593830959c0f7e5430fe77a43832ea7f5299e14a397a74576b3df7fb1b7 SHA512 75d2c16bc47e6403e15c4094f50757157960cff4434de29f199b015795ba772b62125f01c09aceb2a06f8dfcfc4df8e35330259c76959239f276e2f5bd5221b5 WHIRLPOOL 48d9a583ba9d0bbfffdbfeaa2412e77a0bf4011e7bba525129ba4572faa6a55713a89cb00f4ed7f24e6782e3f7b8b48cb192e2c082b7dcb3c35a85109f2eb340
-EBUILD qtconcurrent-5.4.1.ebuild 582 SHA256 c92c7d8daf5440d94275f8b5b138544e0b641c50a1aff0618c233a829af918da SHA512 5c4f0ddf5db6c80b4c860d7f319957458edee8f5f8bf9626cbace2056c29d07905ffc67c085f6b7de3810386455e870025f3b1fe19b22513ee644e193ba210c8 WHIRLPOOL d4a2577b1236f2efe8bf0a3a98e3fc4121e3e05d591178fc22d5e84b358b142defc57d3ce87f5ed365e772d5fdf4c4c812c13b14489a6d980fdfad240fc7cb1e
-MISC ChangeLog 1560 SHA256 3aa916260372a6c52c82da5761675f681870b1d12285aa41725c66e9982f44a1 SHA512 552e3bd5e1d337d9b408b900e1466b74598a9f1d31425b6d366a77ac3f992a478d0ae5ece599422e9ba9ddae127d692ca98add0872437554b4ca613157f015ef WHIRLPOOL b1c4c632c185c98ac7e0ee7229f1846f3384f58fde1b5829d98d7b76426061c86eb65456cd9e5beff33348fb9948051ed076b25ce29b5d2c64d889bbf5ca838f
-MISC metadata.xml 268 SHA256 0976b0efa573f782c96382e8f40ec82944c66ed52a89ebe6b0e905050f01395d SHA512 73ef5d7a382915e844a0cf7f1f05ae64c88500ecffe13265d156960b498ae61a62f29c9789330e5f24c82ddbf3a9ebb98aeff5c4cb0e69af1e8f07099791b806 WHIRLPOOL 19922570bea256c44d78d6f92ef9781be4c177580bb4235d8620139c6cfd759df64fc82f053a685d70fa1378b0fd6f49bb818d393b19105e6069730e9cf44e52
+DIST qtbase-opensource-src-5.4.2.tar.xz 46354192 SHA256 9fc4f720b8b5a8b8e4a7d45e13ce4d5b86756ad46fb406386637eb2de5fd5a74 SHA512 029da83969614bc9b3803c76242af62911e3c6de171b116b5cb8e2823cad0514ab705cc3fa331e042c679caeb099de4e9cd7ddea92959f675dda82533e3ad7fe WHIRLPOOL 5f352f78a779c5d042f04966a010b10af706c4db94976870721a550e3ab7eaf2695b3582c86cdcc3a11de36283e11fe65797f96e59df96fa367b16b72b5f9213
+EBUILD qtconcurrent-5.4.2.ebuild 552 SHA256 afb1ad2a0117f976c3cc80f6b690633c09378d9a3f877c6d06a45a40acd50167 SHA512 c59dde8ddc09ccd8c26371af5a60ceafe30118b58ed3596d93995ad8a762fde1130db5e45489d6f4d7683f09c919816db624b2afee089ce7d5584707f4317823 WHIRLPOOL 006b4afb2fffd46e2015fca4bb26870482c7de788f92936b9c371442634e1ea19ea601884ad702298bfd4592906f5fd954b69ed96fdd17e37ee0416d4b2fc8b2
+MISC ChangeLog 1735 SHA256 fab68427316588fe5b6059c47a22890c7fc90db961eff65a613cf826705b975f SHA512 ad6f5b7f51cc5663fac34c11a6d0d29ab2806a9b201d8200dc9db37913d659c43f651325ddb972db08e76db76ebe1d9e6145fc835849fa928f44d9c082dcbfb4 WHIRLPOOL b4bf500900f46c68407506a14fedcc00018c2bfddde1f767d62a5c74ee4448a7d23abac9239a4e85fcd0acc472062190554b67d198305d46055ea5004b667987
+MISC metadata.xml 259 SHA256 da0ed92b6766281315367c03378c1935b4e9fa82f840641d9c72b00a1b038646 SHA512 1fca930f71c109412ead8932e0910f6c2b1991a454b03ddef6dda7101358db65b3c6da5eb7f71c918673fd3b9b0ac0397cef0dd24c85f84f2043e3ca8e21dda1 WHIRLPOOL 484f50be685ae8a8a65889a66edf2a6d544e0c6758a8f384bafd7e8f1cc23c4e788613d39febc67f1fc6f99e9e7541881f6224e07497ab0ca031449053b5e13b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlVXJQIACgkQVWmRsqeSphONpQCfebMxMolJQYlRpB3BjQ4laURB
-KjgAnAlAEqsDRv72DgewH/VvpqlEiSqp
-=UFZS
+iQJ8BAEBCABmBQJVgZAaXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9hPQP/jS7qsrBGuDCwROM7IK8kxst
+fWnlSCN0W6bEn22kWejdxHzs7wpdNwe1Rx89LCj4hzqdGIavPJhs4wA6ab1byxdp
+1x3gcZ49RJOj415A9S87PGVeTlilPJhZfrNWD4oN0dX24JDlK5ti7wSLlT+mjcjO
+BrSjqxfmrDHtLKnTTMBniiuS1ePhcBY5ryewERCi6AcwT/hd893JZLwyD6X3qwT2
+rVqun6lRSmjaVNZNHNR4daAVQQG9h0VKayPB6ur/sisVwHMh45ErZn6MjMOA6vK2
+R1rNmmI+c+u+vlSpwI3MV8XAJoITglE3QvEQ2519tLVyC8fuXGe3txbUlsWQA08P
+y487/ueWhvUFvK6ElmlxnS3wP4PkXfNdtZvrfEYvgwhGTACCeX13JkhaPEMrHQGs
+YpIvZaHpyff2qHGYum1b3AFiEb+Y/L6Vz3ZpU4dhn+34KgjYeqDjrvuNSLm/NdEI
+0p3G09ELzK1APvF5M6XDxn4qeRCTqm2zcMvcGr3m+Wa8PZ24MabY/UvbY1AeKrON
+N2m/WIjJST8tLXtclSGylRDeO4difRjGLevZUx53FTSup5aewTTvNIcYQxPTergB
+l774fQyaLye88euHx6pYBi9n1QTCMXhr1OLu/lHqLX7BiICK0btPmoCajp0efeTb
+r8TTQO4Dg8J/Nr/Mxmkh
+=cxh4
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtconcurrent/metadata.xml b/dev-qt/qtconcurrent/metadata.xml
index 39c63597e531..afb3b434585b 100644
--- a/dev-qt/qtconcurrent/metadata.xml
+++ b/dev-qt/qtconcurrent/metadata.xml
@@ -4,6 +4,6 @@
 	<herd>qt</herd>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
-		<doc>http://qt-project.org/doc/</doc>
+		<doc>http://doc.qt.io/</doc>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-qt/qtconcurrent/qtconcurrent-5.4.1.ebuild b/dev-qt/qtconcurrent/qtconcurrent-5.4.2.ebuild
index a3ede7c1ebe2..a69683c9b6a0 100644
--- a/dev-qt/qtconcurrent/qtconcurrent-5.4.1.ebuild
+++ b/dev-qt/qtconcurrent/qtconcurrent-5.4.2.ebuild
@@ -1,25 +1,21 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtconcurrent/qtconcurrent-5.4.1.ebuild,v 1.4 2015/05/16 11:07:45 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtconcurrent/qtconcurrent-5.4.2.ebuild,v 1.1 2015/06/17 15:19:53 pesa Exp $
 
 EAPI=5
-
 QT5_MODULE="qtbase"
-
 inherit qt5-build
 
 DESCRIPTION="Multi-threading concurrence support library for the Qt5 framework"
 
-if [[ ${QT5_BUILD_TYPE} == live ]]; then
-	KEYWORDS="~ppc64"
-else
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
 fi
 
 IUSE=""
 
 DEPEND="
-	~dev-qt/qtcore-${PV}[debug=]
+	~dev-qt/qtcore-${PV}
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-qt/qtcore/ChangeLog b/dev-qt/qtcore/ChangeLog
index 62d282ad0191..f0697cd99c56 100644
--- a/dev-qt/qtcore/ChangeLog
+++ b/dev-qt/qtcore/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-qt/qtcore
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtcore/ChangeLog,v 1.80 2015/05/30 10:52:45 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtcore/ChangeLog,v 1.81 2015/06/17 15:20:06 pesa Exp $
+
+*qtcore-5.4.2 (17 Jun 2015)
+
+  17 Jun 2015; Davide Pesavento <pesa@gentoo.org> +qtcore-5.4.2.ebuild,
+  -qtcore-5.4.1.ebuild, metadata.xml:
+  Version bump.
 
   30 May 2015; Markus Meier <maekke@gentoo.org> qtcore-4.8.6-r2.ebuild:
   arm stable, bug #530238
diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
index 491d93a32248..4e959df5e210 100644
--- a/dev-qt/qtcore/Manifest
+++ b/dev-qt/qtcore/Manifest
@@ -10,17 +10,29 @@ AUX qtcore-4.8.6-QNAM-corruptions-fix.patch 17586 SHA256 5309c0f1ed0fc54799537b6
 DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357
 DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2
-DIST qtbase-opensource-src-5.4.1.tar.xz 46132220 SHA256 8574a593830959c0f7e5430fe77a43832ea7f5299e14a397a74576b3df7fb1b7 SHA512 75d2c16bc47e6403e15c4094f50757157960cff4434de29f199b015795ba772b62125f01c09aceb2a06f8dfcfc4df8e35330259c76959239f276e2f5bd5221b5 WHIRLPOOL 48d9a583ba9d0bbfffdbfeaa2412e77a0bf4011e7bba525129ba4572faa6a55713a89cb00f4ed7f24e6782e3f7b8b48cb192e2c082b7dcb3c35a85109f2eb340
+DIST qtbase-opensource-src-5.4.2.tar.xz 46354192 SHA256 9fc4f720b8b5a8b8e4a7d45e13ce4d5b86756ad46fb406386637eb2de5fd5a74 SHA512 029da83969614bc9b3803c76242af62911e3c6de171b116b5cb8e2823cad0514ab705cc3fa331e042c679caeb099de4e9cd7ddea92959f675dda82533e3ad7fe WHIRLPOOL 5f352f78a779c5d042f04966a010b10af706c4db94976870721a550e3ab7eaf2695b3582c86cdcc3a11de36283e11fe65797f96e59df96fa367b16b72b5f9213
 EBUILD qtcore-4.8.5-r2.ebuild 5207 SHA256 166ffd4d2357025ce9eef8ca0db78184915219b8f3e2e19b8543ef35a7d20094 SHA512 3434d8243745241b55a10ea92a7c24012c1062584fd441d1805119d673c2a55d38caceb65442e168b4a4f0ca93982bf8b052c79ce0db1fbc75ce28d7e3f2c188 WHIRLPOOL 5ccf583d46b52e221d867eea97284d673fb786510a8f73f2cfa9050884a158958e9563895ed125e49492cb5e3f0593d32b2e088e9b15b8d2aaaeddcd333f2310
 EBUILD qtcore-4.8.6-r2.ebuild 2949 SHA256 b576d432d9ea71bb09fb78e2d7028acf86afb434df9f0bfb35069aebecdee2fc SHA512 7c1476bcd8245ff455ce50b2ca173b9fcd9b260c67f90875cc999d81178ad5c27798a72179161a0d67be8a920611c0dfb442e636af235c4dc1105f0e3c1400ca WHIRLPOOL 0e4650c0b582eccf4b8ef5c2f747a494f9cc017c0019440fa4cd5af434202d2c689a6d0d421ff19613a7abc036922a4e91ad88895136c4e1f81355a9716f6835
 EBUILD qtcore-4.8.7.ebuild 2932 SHA256 594ef11b1b6706a155944dbdbfccda1d0efdc2d62b3fb5123074402a95174584 SHA512 67c91a50be1aa800ae65e909f07dc997a997bf4b8ab97c09f53a7411094d52d12c14926be97242564e4ff928236fb03ffe2165139400eaa9d195fcf069c0da15 WHIRLPOOL 225da3d16d70e52e06c914f614c1c50690f4f313a2ada934f314818fe18ccf1b5febf3666918136241234b9b05001b2c4e50f494cde9d8036eafeb60c9f2e8cc
-EBUILD qtcore-5.4.1.ebuild 781 SHA256 a14451f1b4b7929096de3556b70f341c8ece705bf6780b7c25f7291ceb503ab0 SHA512 3d7abbb993df30779f8f1858d3bdfbbdea5c5f4cd283a28e50cdad2ed4874b63ef54063af05025bd14ef43e3209cd7137f06916c2f1865886464b7cfaf7dd8bd WHIRLPOOL 8468e1b8a7a6894df88dfd7932c92b10dcdb1731b0bc817535ab9f39f50221b830c9805748170c2c2559fb4f2695adc89afb8d8b27cfa9e2c5f05ba02faaef99
-MISC ChangeLog 39304 SHA256 90424af259d19bfd274520a8df1ac942f656af599a0093315f1ca5260d7a287f SHA512 a2a6a6f7a7b853da1febae23656b27f3fa0eda80dd3b3c0c10434a2315c0f6e0df32f056a48cbba1ba70f2043bddc2ade11f9ffd468698414df146c475f333b3 WHIRLPOOL 33fe32e76d13daf432947b0867114f9f0dfcb8016d5c65fe600e1dc26192be7115bbbad99c63d0a5214fb77926321ef0db6251b6710e8485a9e9148d95568a5c
-MISC metadata.xml 642 SHA256 7fc084d5cbde663884ed35e9733591c8b33c30bc0baf091960e9bf791a49840e SHA512 394414c48c95a7eab1cdefbd8dab7df4049e18daf1d8f5c1cf9dd13c6d79fbaffa5f30d83358cab8de81ef715bf6826095a7e3b3a40e0ac4556a662a8f292093 WHIRLPOOL bda8ef8538520b6e4bdc25adb88ce73225dffa2139f0c3dce768bc924167986a0fc137173003cb923a5ab3f52a44f67cf668f0c85c0c7858f5a9e1b16f9586ef
+EBUILD qtcore-5.4.2.ebuild 834 SHA256 1adc03caaf75ab10545fce7268bdb27bcb2544372cd45f6b723e1d98821a66bf SHA512 62a1d5c910a5b79111e2df06c9fe47c3bbc55b1d8dad9f55e0fa4b5ee1c52a4f441a6383bebd7c0643c233ef41fbab80e57b2c64df26205bd129a72a1e450c25 WHIRLPOOL 571da6013e2288063bfdfd83877a0aca5b2a3730e81f2ccb6fc598a7915de39a1d7e11c334efcb7e679b47d9c32afbb62a51a293d46b8f0f89a2629b255c9fa4
+MISC ChangeLog 39458 SHA256 538ab612e6a4236bdc8c54ead41013e9900532150871c00704179a997ebb102f SHA512 858615bf43caf12eeca50b45c1b61696291762f43bd96cd8949ba6d263a6c52e6e527289c4abc22d988e2f41420de52a919ab28bb889f6cc7c21c4e2a82a6a68 WHIRLPOOL 7355b16095460360dba36c8cfd0d917c34192013d1f43136d70f3f7547f406eab125815bc4cfc0b4d459eda70dc8fc275afcdaee642b1834b5f4461bca6ba543
+MISC metadata.xml 633 SHA256 b8a9342f8b5306a23b156316bb8f6cbf6efc162d678d41a8e13e46916f12cf7d SHA512 3adcde8bf745bf21b85c8dd7b4b9d420d427053ed7fcbc110057aed87ce3a786e72d942c11d81de87bda04c5e2484ff410641ea147a2748867e969da828e6957 WHIRLPOOL 30fce13f3de4d40391ca081df75d94b6e88e352d0c0b0c10b2e2942462e0df6491b1bd15074dce27bf6cebf7f9d0381ca17cf22cfc982e06bfae4e2d278fc1ef
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlVpln4ACgkQkKaRLQcq0GJexACgsOsT+4jKwKUyMQ2fep+AbQDT
-uR4AnjGG635oIqKGro9iksbJ9LWhJHdn
-=ljcW
+iQJ8BAEBCABmBQJVgZAnXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9SxwP/3XiwQBcg/vgwsC102cLmFmL
+aFW21hpJs0WHZrqAqDwBRfolBuDvX1OQ2Sjt217Zn6ifX3WbZL5HCIKacBpJ06yn
+x0HMlhpTWQbQC8xZj+CthhhXA1iwsGkUXhFdIyQvHxlmrqFdFfqwxpm/Upi/c6Mi
+6WSaaWUG0Pd7XzdJDsABw2rv/o5jfTpniF1yrb3QKz++VKEhXEU3tZ1y3HRkMGvf
+mVeyc9KvbPqY/UEhsUnO3+o7PbGFCsErmMVGhDN8VdjHIv+N5GbPWlwgO9EcntM+
+rL0X6gEk45EJ6D/yhl+HFa1My/I6b+vEaJyrtG4nAPQSP7TlFBLPxQhdLmTHFULP
+OgIkChIdJZrPas2Nduj5DxVe7BRHH1TSU5xvz6FSIVsuOq6Ax52CJHPk3sxoNC11
+KZjx6kQtnxP53o6whzWFFplK//jTI6zKN1m3sFazO3bRTT7lxRrE3oJXkfufkUaF
+q2aH5QDrpdSaQKfJEDvsK21B6YWKzwXk8UR5jeqs7obwo4kEd/Gsqn5lLxpHGwxH
+ABJip9zNtUR4mQLe0Xpb5XJhjWHl4fHT76bdZOZUZQEqrgEVs9d3dYifcU/k6GYU
+CUJ6htxttf9Sv75RLbhNxSf1bTf0RE8fvMxjQ0W7qdRguc+wTHO8qkAmn/UYjLIC
+EQjwj+CJCbx5aVaPWgba
+=5J7T
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtcore/metadata.xml b/dev-qt/qtcore/metadata.xml
index 828be903f2c8..9b129875cee4 100644
--- a/dev-qt/qtcore/metadata.xml
+++ b/dev-qt/qtcore/metadata.xml
@@ -11,6 +11,6 @@
 	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
-		<doc>http://qt-project.org/doc/</doc>
+		<doc>http://doc.qt.io/</doc>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-qt/qtcore/qtcore-5.4.1.ebuild b/dev-qt/qtcore/qtcore-5.4.2.ebuild
index 356c9b3e5419..daa352334404 100644
--- a/dev-qt/qtcore/qtcore-5.4.1.ebuild
+++ b/dev-qt/qtcore/qtcore-5.4.2.ebuild
@@ -1,21 +1,23 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtcore/qtcore-5.4.1.ebuild,v 1.5 2015/05/17 01:49:50 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtcore/qtcore-5.4.2.ebuild,v 1.1 2015/06/17 15:20:06 pesa Exp $
 
 EAPI=5
-
 QT5_MODULE="qtbase"
-
 inherit qt5-build
 
 DESCRIPTION="Cross-platform application development framework"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+fi
+
 IUSE="icu systemd"
 
 DEPEND="
 	dev-libs/glib:2
-	>=dev-libs/libpcre-8.30[pcre16]
-	sys-libs/zlib
+	>=dev-libs/libpcre-8.35[pcre16]
+	>=sys-libs/zlib-1.2.5
 	virtual/libiconv
 	icu? ( dev-libs/icu:= )
 	systemd? ( sys-apps/systemd )
diff --git a/dev-qt/qtdbus/ChangeLog b/dev-qt/qtdbus/ChangeLog
index f29ca1221c8b..1cbbccc2ab42 100644
--- a/dev-qt/qtdbus/ChangeLog
+++ b/dev-qt/qtdbus/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-qt/qtdbus
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdbus/ChangeLog,v 1.32 2015/05/30 10:54:12 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdbus/ChangeLog,v 1.33 2015/06/17 15:20:18 pesa Exp $
+
+*qtdbus-5.4.2 (17 Jun 2015)
+
+  17 Jun 2015; Davide Pesavento <pesa@gentoo.org> +qtdbus-5.4.2.ebuild,
+  -qtdbus-5.4.1.ebuild, metadata.xml:
+  Version bump.
 
   30 May 2015; Markus Meier <maekke@gentoo.org> qtdbus-4.8.6-r1.ebuild:
   arm stable, bug #530238
diff --git a/dev-qt/qtdbus/Manifest b/dev-qt/qtdbus/Manifest
index 1ed6fd502107..0b5c2155ffac 100644
--- a/dev-qt/qtdbus/Manifest
+++ b/dev-qt/qtdbus/Manifest
@@ -6,17 +6,29 @@ AUX qtdbus-4.8.4-qdbusconnection-silence-warning.patch 997 SHA256 648a06278bd4cb
 DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357
 DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2
-DIST qtbase-opensource-src-5.4.1.tar.xz 46132220 SHA256 8574a593830959c0f7e5430fe77a43832ea7f5299e14a397a74576b3df7fb1b7 SHA512 75d2c16bc47e6403e15c4094f50757157960cff4434de29f199b015795ba772b62125f01c09aceb2a06f8dfcfc4df8e35330259c76959239f276e2f5bd5221b5 WHIRLPOOL 48d9a583ba9d0bbfffdbfeaa2412e77a0bf4011e7bba525129ba4572faa6a55713a89cb00f4ed7f24e6782e3f7b8b48cb192e2c082b7dcb3c35a85109f2eb340
+DIST qtbase-opensource-src-5.4.2.tar.xz 46354192 SHA256 9fc4f720b8b5a8b8e4a7d45e13ce4d5b86756ad46fb406386637eb2de5fd5a74 SHA512 029da83969614bc9b3803c76242af62911e3c6de171b116b5cb8e2823cad0514ab705cc3fa331e042c679caeb099de4e9cd7ddea92959f675dda82533e3ad7fe WHIRLPOOL 5f352f78a779c5d042f04966a010b10af706c4db94976870721a550e3ab7eaf2695b3582c86cdcc3a11de36283e11fe65797f96e59df96fa367b16b72b5f9213
 EBUILD qtdbus-4.8.5.ebuild 1184 SHA256 2f9ac94d2d32deb1798a98425b288ea6ffb900bbe9dfbfd24b156cf869249476 SHA512 4defc49eb7de95e21e12a07ee919fe0a3aad462e3f75b46e763a0822d7c28df103b6fc4c2173a50e3e8df6eb30f3585f28417283b6b1d2023fe3e0f6a055ebed WHIRLPOOL 56ae1d167972bc7540d4195e3bb6660a0e58f0e50ece0d897fa679af196d404d9156e0cd48fa94fdd00fb404e2139aee5861482b1c33ed0e2fcb0ba7e4b81fee
 EBUILD qtdbus-4.8.6-r1.ebuild 1099 SHA256 b0e5be2f2443b46226934cbd2e35d0ae14a09f3d6bdba6f7eac3638a5d26a5b6 SHA512 45ab5bbdeec41a28b74dd8e3edc2cbf071d30b3da7e19bd8c3a01f808449d916d5783c04fb17cb4bc80a028697c8b14e7b900de6bd900230c6cd89054bc011e3 WHIRLPOOL 654e53f0201449608cf215122d650b6716c733798bb1a53001873225db1ef7d369a6e46fcb0a9f0b141662cf25a898eeaced0dce162e36eb7a22fe7bdfe7e40e
 EBUILD qtdbus-4.8.7.ebuild 1066 SHA256 85a89539ba3c7f079e04fcd7e1deb37f29a482b770ba51713d17d3b6bf56571f SHA512 f544c36baeb399ee2e70d9c9045f230a3c219271daa53e9eb13c10c485b046efbee572fad1be4f7fbb2cf399bc53fbe1eaf3fc1b0531c1bfd8a67756bc60315c WHIRLPOOL d12196a53f4e0d90a893caa5f192ccd91f95d7de72f15b2a88b4e4e7cf4954fd0b3f497706b247f275b25e49d76a4b76eb8e8ac622c08cc83628df60549c06c8
-EBUILD qtdbus-5.4.1.ebuild 749 SHA256 55a7e7f113d6e3edd466e4e10b79cf8a37d948b57ec30d6f6d69e3b57a972e44 SHA512 7fb2340002b4d9ab3f5455578619b1a7f82f585e535a45a0e3c95e4696b47a721cb8d0cf7c21895a884d3011a09625a1bed73a1079dfb6a0851b93b051476af6 WHIRLPOOL dea1f8d277b27274d0ece601646f2f3193dd5211a48ac47f20695e2ebf7500ab347ba16a3c7eb032923b62aed0fa1c219ca5028c36f63a5d9c50bccc5cd4212d
-MISC ChangeLog 20495 SHA256 d34f63a549337165dd40e4abc1a8c94804213d906f6a6c5befaddee9d10cc6f9 SHA512 d2412bda2e535d420c28f6e70385eb89cb12d2e277db229c9d413efd7c56cd6aa5f082b20d258f8485f84be6d7709815598d2073f351b15be77caac69970586a WHIRLPOOL c2589769c9756215c296711cd8f78e91d1be361054f90f272e1549bf34d8a417052160ef959689ccdfe3e941131a146f6f24581008840a8627cf7a01643d6b99
-MISC metadata.xml 415 SHA256 fec2eeff3a64eeaa82d79ad5efa721bb975f8073c182f9dcacd2c72009e9f8b9 SHA512 9aa9a89b39c3acffbd34f25beca742c89ff7f1b6a06e1fe95d800369e6ea2a4629eaad1884c6a601b39b9ae12230580cec2f44ceb51c0fad93a512153a302d3e WHIRLPOOL a64dfbcbc44161555ff6a6461189abc47cf4e34b705a6376d3937c26099eecc9f7228812e1fe3514afbcb3cbe1ec24e5abcc941f13b48053ea57aeb0429a18ba
+EBUILD qtdbus-5.4.2.ebuild 727 SHA256 8abe117d86e7b483a5149a84bceda634b4a87d0dbb8a220445eb9cdf9eb7a7d0 SHA512 ef841a840d3ffc26448e5f768a749657fc79056c269e0af3ed4181d0ca7241adb5c01c70727c6a8a41ff10ec692b83de611886de48e19acd0b7e3c71217ce9ab WHIRLPOOL a713bd88fabf191a4db2a889d4939ad21e27717d453982c4fcd3cf680ca218c2fd333ddaec5aeb5b93a3c55ae9c84126880153b2b882339d6eb0b9244e39f43b
+MISC ChangeLog 20649 SHA256 1fa7c92ec34f7c0d1339f7aa500087d272c8ca7f5df1bff0e49efce75fb46935 SHA512 b603a69a4a3e1266de771cf3bf9e8a143dbbf74f72a6494d7a19df2a270398b851dd1aaf42226520eb4f9b1e74e58c75273c6945e9930765e2995bf61cb9126f WHIRLPOOL ef93c7a8f91b389a090b05849ae7e8b342ed27b479566db997bfd03778f5910055f17c1f8f30f6d19e7f3116a5bb0a7afc0d3051ddc918beabc5bb812932ccd0
+MISC metadata.xml 406 SHA256 9b69df2d1422470da7bc919a570303d186cc74e404c94471789765cb6a7f60a2 SHA512 6793c43be90e7d93c0971597a4fedba2fc26fbbe7718c0944ab655ce22cb9bd93e96481b3f758b471dcd705666abbdf3e1a75faf756ae90b283172c1e15d2682 WHIRLPOOL 1ea46d494c20389eb3db0a8ba6d9abd6cf2fbd94657e7ca33527ad3be966d043957bcee9e8f6c141fd4c42aeb2a708a4c8c791df812d799809f9819373d7e55b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlVpltUACgkQkKaRLQcq0GKyuQCfb9cfwB8qktKAKQdvbtJl/E+q
-mrwAoLZBOUF8Syaculb4p79qs45LSDfV
-=Y3cs
+iQJ8BAEBCABmBQJVgZAzXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9RRQP/3VhSe81ZhlKcTjrrg5Ja5DV
+a/CqsNH8vcfHCBly2pmRz6FeP3+1uE1ECvT7Uu0ZhGzHRZcz7MThlGHbNsTKfr5u
+0dFk9/l0WnjjdYgEIMupDgqqcNVQO2P44JlJ6sdYucabkY8muqrzBNultgaIB2g0
+AyMPx7KBYOvXbjIrz9FkMKZAldxYr/rerrozX4nVvuXVVVGsRnzf1N6e4nHkOf4i
+1eCyRfY+qBybD208RVKTNZjFFvE1tpalmY99t/ui8NViGO3AJk2/vx/FVWYprmxP
+oTwFLDzFYYutshwkqPmaq4zhAMWYSZXXoRaUR5FtFSMKwiIx5/sbXAp3nC4EI8do
+WLNNpGbzZY8d9fHUXyLH5HP5PqRND9cZiji5opL8wFw5HxlUlDta3wAnAJgTckaH
+4N97ClGncEYmi2nPNggS+ubbgi8cmUcUcasOe0EBu05s9m/vis0teB6VNSumh7RW
+AnifbvkosryudfGZZMz2AwtnMdjxe/HniJ62vx+djrDJMf8qZgCxCsRrmbmpek0b
+u9Z9qdoDTlPS4yIhS7/lC22Gi20E21/rRAJls2SG/fW5Tog5TW71EIusNcyj4/Uu
+6zvo7ZDhW5XvV5q3wDnjdKnhgwwKpuD730/dJyjgwE9uiOKJ22tIwBSWoEzX7ymZ
+LGJ3pWul1Unei5npBWIa
+=KcKx
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtdbus/metadata.xml b/dev-qt/qtdbus/metadata.xml
index d05859990036..258aee1d6e0d 100644
--- a/dev-qt/qtdbus/metadata.xml
+++ b/dev-qt/qtdbus/metadata.xml
@@ -8,6 +8,6 @@
 	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
-		<doc>http://qt-project.org/doc/</doc>
+		<doc>http://doc.qt.io/</doc>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-qt/qtdbus/qtdbus-5.4.1.ebuild b/dev-qt/qtdbus/qtdbus-5.4.2.ebuild
index 4060cf846d7b..4756c4e491f9 100644
--- a/dev-qt/qtdbus/qtdbus-5.4.1.ebuild
+++ b/dev-qt/qtdbus/qtdbus-5.4.2.ebuild
@@ -1,27 +1,23 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdbus/qtdbus-5.4.1.ebuild,v 1.4 2015/05/16 10:19:38 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdbus/qtdbus-5.4.2.ebuild,v 1.1 2015/06/17 15:20:18 pesa Exp $
 
 EAPI=5
-
 QT5_MODULE="qtbase"
-
 inherit qt5-build
 
 DESCRIPTION="The D-Bus module for the Qt5 framework"
 
-if [[ ${QT5_BUILD_TYPE} == live ]]; then
-	KEYWORDS="~ppc64"
-else
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
 fi
 
 IUSE=""
 
 DEPEND="
-	~dev-qt/qtcore-${PV}[debug=]
+	~dev-qt/qtcore-${PV}
 	>=sys-apps/dbus-1.4.20
-	sys-libs/zlib
+	>=sys-libs/zlib-1.2.5
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-qt/qtdeclarative/ChangeLog b/dev-qt/qtdeclarative/ChangeLog
index f48a054f31f0..f30b9b9dcd15 100644
--- a/dev-qt/qtdeclarative/ChangeLog
+++ b/dev-qt/qtdeclarative/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-qt/qtdeclarative
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdeclarative/ChangeLog,v 1.35 2015/05/30 11:00:56 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdeclarative/ChangeLog,v 1.36 2015/06/17 15:20:32 pesa Exp $
+
+*qtdeclarative-5.4.2 (17 Jun 2015)
+
+  17 Jun 2015; Davide Pesavento <pesa@gentoo.org> +qtdeclarative-5.4.2.ebuild,
+  -files/qtdeclarative-5.4.0-stack-direction.patch, -qtdeclarative-5.4.1.ebuild,
+  metadata.xml:
+  Version bump.
 
   30 May 2015; Markus Meier <maekke@gentoo.org> qtdeclarative-4.8.6-r1.ebuild:
   arm stable, bug #530238
diff --git a/dev-qt/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest
index cc3ec12a3f2a..6b20875b1ca4 100644
--- a/dev-qt/qtdeclarative/Manifest
+++ b/dev-qt/qtdeclarative/Manifest
@@ -1,21 +1,32 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX qtdeclarative-5.4.0-stack-direction.patch 1866 SHA256 c5767459f2b75c9ffef1c17638c15f96de48efb9a4e44719ee6ced325ebbf8ed SHA512 518c9ea14280fd2b2d1ae8ad4026a217e800c1e1b6081c05f9f226f0b6c0ad53d89fcf897b09f9d2b84432b64741c27db964fbd7ee548872c67d3e85ffc20749 WHIRLPOOL b4e512dd913c6b3b9f0e996dca2539343a257710c4b20977f466ccb2e8586c068aef331bf497b8cdb17630a2e40f5a3f02ab29cca6d7f63eebfadce63ad9cda1
 DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357
 DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2
-DIST qtdeclarative-opensource-src-5.4.1.tar.xz 18406948 SHA256 15124e242a8a4a8fc5bedd32910b3b0b372b6c2b63f99572c4a2427e668d4417 SHA512 58a688eb5b6ad1d9e56ca75c8b62708df773674425d9f86b8fb8cbce46f88d3c84b62936ad96fb8634ea20969eb8abaa3947e06b8e23d2a12ce340b78d4fc548 WHIRLPOOL 96507dbc7fcea2efc8ec1c1e82bbaa9e610b3b5a5f6632cf2571a8dd035078c6b3d948ec3fa4dd7533c740b5cbd941e1a31a053ee3387c2868ebb14d9c9e8228
+DIST qtdeclarative-opensource-src-5.4.2.tar.xz 18497092 SHA256 b73021d78fffe7894c5fde998a767a866b09811c7e210f8e46f252a32be741ae SHA512 be8b28dfafc20364e0056739f94432750493372b423f2351715d1ec0942cee71b36f6a86db5d6f450c291b147a07632dd1573b76601c0d5eb4c2fdaed717bb93 WHIRLPOOL f8666b6b95a386363d1217c1e9ed70fd127340741ff9b9d177f8694945775b41b7db224a5a401fca721311290c1b0f9a5ccf8521433fb11a72c8dbf5dc1c0d47
 EBUILD qtdeclarative-4.8.5.ebuild 1982 SHA256 ef04c159545997c13d866af405727d598073d07dd51a0be315b1d47343f5cc42 SHA512 f3235d4cef1ffc732be9034e12da9ce3217ba8c4532336a0d116bba9902d645c4c5ef93fde1ea94724ea50ab3e5431cb5e7fc072400e7dbcf972935f4ebe6f3f WHIRLPOOL b4fc1afe86e01206ce909154d55d5cc50f90d48fae6c96b2d501c8b589994e88a5e3f8600c31cca541c21e689e8441208063a5188bb36d392e8f5e8888947ea2
 EBUILD qtdeclarative-4.8.6-r1.ebuild 1689 SHA256 043480f91b6a092c75355b24cd78833962f62f655326ecf471ac4c56093e0424 SHA512 7ec00ebda2a191485dded7c0f8d7fd598ad4cb4dc7685eb5f3d6853e0e660b1a00c84f287182211118b6137a4307eb34c0e6084b12326371ca947081fc2b5870 WHIRLPOOL aae93644fa9a7424ded768ea7018b50c366a88a72fc0b5ea193c5102df6d2479d93a1bd11c3d94975189227c1537394cb1399016e798349e4ea90010c040d344
 EBUILD qtdeclarative-4.8.7.ebuild 1656 SHA256 1293c4ceacd8590a22e44df19111945e6f3246af31baae383666e9bd9eeeb94d SHA512 454db0a445c5c5a47bada1fd9dddfaa0ec5740342db55f4eacbf88244d3d48649a119f72de289703b3f2d093faa52f926345ed8c2d7f5450a1150e51977a34bc WHIRLPOOL c39b384f386a76636410e672c79e2317c2876c9d9f6a38420e6022e01e32c26797aadd4f9eb26931b14bad49a2be09bb01056725ba6a9d3780b564be002cf561
-EBUILD qtdeclarative-5.4.1.ebuild 1366 SHA256 21eec701fc3b06ff1bbc0c189bece4a9d1c8f76c47cb5d390fd86e2000381167 SHA512 4eb8ddd147c9d06b344c10f0bbbd536c2498aaefda9230df97dfd454b2555848fd148bf1be11c00a67d78d60e00a40cf5006e413ca1640ee2743ec3f5691731d WHIRLPOOL 624b01f8ef27a436540e03145cdfd1b34dedbc747d0427753b3f2508d4ebdfc365c48821b4eaa8fb245d00413ae6c5ae3fba7e6ea84d47b16654f7720277ff9b
-MISC ChangeLog 12780 SHA256 91052afcb4a4e9cc7b87fa041a03925f8b6aac28181d2246e4393b8f56e025d4 SHA512 7aac45997afcc12653c4700edb645bda5d365a2d1354eeb3b2f221f5933668a9df4d32119309704702dcfd10fdf9fe4bf724c5120a130b4fa6da8da078c8dd63 WHIRLPOOL 63e122d0cab16b207dc13c1fdc7ae24934e2272b5b2cafac6c68d40849a7ae4b0b461ddb74f9a2e2c07ddb972e271cdaeb1cb45a0f083a4307418e8f8dba1872
-MISC metadata.xml 936 SHA256 0b7fe39080ec6de4fb909be67c20d791410d24a512dbc805e779c86f6bec6127 SHA512 9fd8fdb6dec2fb0a47ed86a3f74827246147e439551421185b25bfe279e49a9f93d374529041546e9647c0321555dd94f25c690598ae05bb36350b29a8195ca5 WHIRLPOOL cd591d5cf83bcfacc2ef8a9a8dc0d25acb6d38b778a25e4ebc4ba551554b70ee97d90f6341436e8ac97cdec13e9ef21d174fad11a499e4d9cf6c5c4921a16370
+EBUILD qtdeclarative-5.4.2.ebuild 1229 SHA256 342069ba649f0d4aaccd856b7a15d93cbcd70620bfc5b9027aec30453968abb5 SHA512 8deea72a236b33110780b0a3670fc39b13e0c8af0a874d15a6afd9ca3eecd0deb00dcf1efe831d6c5bcda941d473172231c4c8c240ddccb4e652fb4ac2ceabae WHIRLPOOL 6165383153df9e6b2e1b35a0a3d70b9cd960c0b33e878c646824097e07c2f6d08ba3e5fa65887b65a1c41c2744ee1a707581b534039b242b2d58bc848b8acac3
+MISC ChangeLog 13007 SHA256 9ef05cc1a676895ea89473f1b908ed0fe40064631b4fdc27370b6679a206bb6f SHA512 c7265154098c219d6f892cd34a79cd7f4df5ac471cd98f8f3313db34035ecdaa7cccbfbed5dfb9ebc73ed0b3ac702821d9873a2d33ae22cc2cfc0e7dcfd87e6a WHIRLPOOL ac60061fdcec358f831050b80b285ff54b317bb8838098ee73dc3472e4a2606d81083d8a0033117706a532c456ebd853a1141200783b95bce7bf1db0faa52257
+MISC metadata.xml 932 SHA256 0dd30a412c34ea4f8e3d700858373a803f566163f14e86b97cce77a46554b2f5 SHA512 6877384f9b6619ae04e1bbd59f309a1b1f795304d8ad53dd8927e410f8925a66bce9d3fe19855f51f383d1b6cfa25efb83495eb1eeae40b5196cbd6618ee8238 WHIRLPOOL 929e1385d1688b6961354c4b14e84b82caf8289373ebb1bd4e4c5f4b5d02af808144711411f3d058d9649c0aa267c5cbdaab8980f7c388e58988b6f14ab13fd0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlVpmGkACgkQkKaRLQcq0GJkQwCgqXDWWL+0nBrbLOMB9BsRJeLt
-+AYAn1SnJVHh9jRh0zRplVpOHDXGtbJC
-=7NRc
+iQJ8BAEBCABmBQJVgZBBXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV99EoP/3XU8nIDFUw0Fd7+JWUqbsmD
+ymeRy/plPuajupv+/OyvaIftE4hneEQFCaggAq223KgGGmNmBqZJ4+y209W6s68J
+YlQfmuYJeDABw+dvYSsPxrTNjnIWKOaqXyjZ7xPc3/Wv+AWJGtcJZ2xgp3+BhycI
+hNgFPKtMeypYaPlE/Ck9ihV1jTea1ckJF0dBYsLVrnzM07JPU1U19x/Bp+9STWQy
+ezlZNyF9amcGRkHNblDlCZ/mkDC6e4Ko6h76dEGuBjwveTAXRXEt6wBpOKja8oVa
+rev/TQBLdpnr5/QP3bsdhCeJmCnesmCRkTsyO/t8CMxElcH5YUWDN1+pQBCqTfbB
+sJT5u5SoTe8htzCmutEGVy0TamYLwfTqorzZ99oc9Djbys1Vp5IsmS1vFIHzUwvY
+p0Hx5BLOvfeV1NRa7yfi+9m3wsNSkvRN0Q4C6ZUIbLNcgvhpDnP66bFUQnu31vmF
+qFWxsK3Or7rADJO0ycmrKn7gdmu9KrBRSdO5vzWT488DkNDer/bnqYCCidmoAicS
+Cm78I0LBO/fQVjNocH/5gDZTM6Xzc36Hzfh9Lo3nMYGN9KdCvSsSvueGxJPZndi0
+FeGR+eEDSzRT4inWG1Fh3/oikO1Fv7AZOmFpWZG2kdGnQE5cmKkC3L4BTuZElFJr
+9tbwrKCMhGc7NdquIBVn
+=/yYR
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtdeclarative/files/qtdeclarative-5.4.0-stack-direction.patch b/dev-qt/qtdeclarative/files/qtdeclarative-5.4.0-stack-direction.patch
deleted file mode 100644
index 1889fa80c70d..000000000000
--- a/dev-qt/qtdeclarative/files/qtdeclarative-5.4.0-stack-direction.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-commit a4152c29b6f98c32a30a824bc50a760ce6bad6c7
-Author: Rolf Eike Beer <eb@emlix.com>
-Date:   Wed Feb 4 13:24:53 2015 +0100
-
-    QML: do not check stack size if stack grows up
-    
-    On architectures where the stack grows upwards (i.e. HP PA-RISC) the
-    stack limit calculation fails because the variables used to check the
-    offset are usually close to the bottom of the stack, which is in this
-    case the origin of the stack grows. Since these machines are a rare
-    obscurity simply simply assume that everything is fine on these
-    machines. The few people that are indeed running QML on such machines
-    will probably be able configure their stack size properly by default.
-    
-    Task-number: QTBUG-44268
-    Change-Id: Ia83a39179a0f6e0602ba7a5032d386e12d8d1ba3
-
-diff --git a/src/qml/jsruntime/qv4engine.cpp b/src/qml/jsruntime/qv4engine.cpp
-index 5bba745..6156e5c 100644
---- a/src/qml/jsruntime/qv4engine.cpp
-+++ b/src/qml/jsruntime/qv4engine.cpp
-@@ -108,8 +108,14 @@ quintptr getStackLimit()
-     } else
-         size = pthread_get_stacksize_np(thread_self);
-     stackLimit -= size;
-+#  elif defined(__hppa)
-+    // On some architectures the stack grows upwards. All of these are rather exotic, so simply assume
-+    // everything is fine there.
-+    // Known examples:
-+    // -HP PA-RISC
-+    stackLimit = 0;
-+
- #  else
--    void* stackBottom = 0;
-     pthread_attr_t attr;
- #if HAVE(PTHREAD_NP_H) && OS(FREEBSD)
-     // on FreeBSD pthread_attr_init() must be called otherwise getting the attrs crashes
-@@ -117,7 +123,9 @@ quintptr getStackLimit()
- #else
-     if (pthread_getattr_np(pthread_self(), &attr) == 0) {
- #endif
-+        void *stackBottom = Q_NULLPTR;
-         size_t stackSize = 0;
-+
-         pthread_attr_getstack(&attr, &stackBottom, &stackSize);
-         pthread_attr_destroy(&attr);
-\ No newline at end of file
diff --git a/dev-qt/qtdeclarative/metadata.xml b/dev-qt/qtdeclarative/metadata.xml
index af680b595c34..f96540a49918 100644
--- a/dev-qt/qtdeclarative/metadata.xml
+++ b/dev-qt/qtdeclarative/metadata.xml
@@ -5,7 +5,7 @@
 	<use>
 		<flag name="exceptions">Add support for exceptions - like catching them
 			inside the event loop (recommended by upstream)</flag>
-		<flag name="gles2">Use OpenGL ES instead of desktop OpenGL</flag>
+		<flag name="gles2">Use GLES 2.0 or later instead of full OpenGL</flag>
 		<flag name="localstorage">Build the LocalStorage import for QtQuick (requires QtSql)</flag>
 		<flag name="qt3support">Enable the Qt3Support libraries for Qt4. Note that
 			this does not mean you can compile pure Qt3 programs with Qt4.</flag>
@@ -15,6 +15,6 @@
 	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
-		<doc>http://qt-project.org/doc/</doc>
+		<doc>http://doc.qt.io/</doc>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.4.1.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.4.2.ebuild
index b87e940d79cd..f5361db361fb 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-5.4.1.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.4.2.ebuild
@@ -1,16 +1,13 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdeclarative/qtdeclarative-5.4.1.ebuild,v 1.5 2015/05/16 10:36:40 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdeclarative/qtdeclarative-5.4.2.ebuild,v 1.1 2015/06/17 15:20:32 pesa Exp $
 
 EAPI=5
-
 inherit qt5-build
 
 DESCRIPTION="The QML and Quick modules for the Qt5 framework"
 
-if [[ ${QT5_BUILD_TYPE} == live ]]; then
-	KEYWORDS="~ppc64"
-else
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
 fi
 
@@ -18,20 +15,16 @@ IUSE="gles2 localstorage +widgets xml"
 
 # qtgui[gles2=] is needed because of bug 504322
 DEPEND="
-	>=dev-qt/qtcore-${PV}:5[debug=]
-	>=dev-qt/qtgui-${PV}:5[debug=,gles2=,opengl]
-	>=dev-qt/qtnetwork-${PV}:5[debug=]
-	>=dev-qt/qttest-${PV}:5[debug=]
-	localstorage? ( >=dev-qt/qtsql-${PV}:5[debug=] )
-	widgets? ( >=dev-qt/qtwidgets-${PV}:5[debug=] )
-	xml? ( >=dev-qt/qtxmlpatterns-${PV}:5[debug=] )
+	>=dev-qt/qtcore-${PV}:5
+	>=dev-qt/qtgui-${PV}:5[gles2=]
+	>=dev-qt/qtnetwork-${PV}:5
+	>=dev-qt/qttest-${PV}:5
+	localstorage? ( >=dev-qt/qtsql-${PV}:5 )
+	widgets? ( >=dev-qt/qtwidgets-${PV}:5[gles2=] )
+	xml? ( >=dev-qt/qtxmlpatterns-${PV}:5 )
 "
 RDEPEND="${DEPEND}"
 
-PATCHES=(
-	"${FILESDIR}/${PN}-5.4.0-stack-direction.patch"
-)
-
 src_prepare() {
 	use localstorage || sed -i -e '/localstorage/d' \
 		src/imports/imports.pro || die
diff --git a/dev-qt/qtdiag/ChangeLog b/dev-qt/qtdiag/ChangeLog
index d9fcffe06faf..180f5d44472f 100644
--- a/dev-qt/qtdiag/ChangeLog
+++ b/dev-qt/qtdiag/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-qt/qtdiag
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdiag/ChangeLog,v 1.10 2015/05/16 11:07:05 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdiag/ChangeLog,v 1.11 2015/06/17 15:20:39 pesa Exp $
+
+*qtdiag-5.4.2 (17 Jun 2015)
+
+  17 Jun 2015; Davide Pesavento <pesa@gentoo.org> +qtdiag-5.4.2.ebuild,
+  -qtdiag-5.4.1.ebuild, metadata.xml:
+  Version bump.
 
   16 May 2015; Jeroen Roovers <jer@gentoo.org> qtdiag-5.4.1.ebuild:
   Mark ~ppc64 too.
diff --git a/dev-qt/qtdiag/Manifest b/dev-qt/qtdiag/Manifest
index 083eb4a9425c..b5d40af91e97 100644
--- a/dev-qt/qtdiag/Manifest
+++ b/dev-qt/qtdiag/Manifest
@@ -1,14 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST qttools-opensource-src-5.4.1.tar.xz 9262024 SHA256 11de0f8573843194b134e32af49594514498fadc4fc0b3b0333540fe1f671f72 SHA512 1e1dce0d6d587bdfa8d3ed20db0dbf3c1db3c1ffea4ea34741a9069ca08f3ab478e39245b26bf9f1c97c28650beb396e433e8b54a7f0b6cc5e93e3000e39e7d8 WHIRLPOOL bb8672cb64d39d3786f3db64f5d215d122ee62144406d970a2e37b019fd64ed08f2109e8dd64f23b6926e1bb9f21839805149bec3e5fff200b465e59ecceb286
-EBUILD qtdiag-5.4.1.ebuild 661 SHA256 42e92dbce782bb7b33c2632146867cdcb1d55a22b01135a2a8c79cafbd57736a SHA512 32b93e221a12d38195d5e9a0518fd336adac9f4770d75403f66bd81346f1a7828d2b33f10587585dd1f15b1fca22f75700d903105e886e9e1f99a47cab393ce1 WHIRLPOOL 43c0297e65fc011004ff97a9e145a282d70396a8088b903cdf8e6054af1e63a7b6a506f645b2ab38539ca2431748f21fb2fec4af5087d10991023bbe28d27c1c
-MISC ChangeLog 1336 SHA256 b367b5157d4bfbad5db07e092c905bef816c75df905486798c4bf478ca09a5ba SHA512 0ff802b96ba656e958abb4a517145bba1604a3bfe760ea7366f06fcb54fc6b0a028fa23ee34f5682af59a27d660f15c99e59aec71717713b38b70801a6381241 WHIRLPOOL 9fa4690245f97d3829c28ff05e917b06adc9abdaa130c25fffc05417996d0128088e7897c900a5c575c9bba7c38f14d45f21b73ce34da6b028eff4ad033a8aa3
-MISC metadata.xml 268 SHA256 0976b0efa573f782c96382e8f40ec82944c66ed52a89ebe6b0e905050f01395d SHA512 73ef5d7a382915e844a0cf7f1f05ae64c88500ecffe13265d156960b498ae61a62f29c9789330e5f24c82ddbf3a9ebb98aeff5c4cb0e69af1e8f07099791b806 WHIRLPOOL 19922570bea256c44d78d6f92ef9781be4c177580bb4235d8620139c6cfd759df64fc82f053a685d70fa1378b0fd6f49bb818d393b19105e6069730e9cf44e52
+DIST qttools-opensource-src-5.4.2.tar.xz 9333100 SHA256 edf3d7e00227f9989101da84b2fdf8eaf1a5b7863dc5e0d26bb0f39303e8b6b4 SHA512 55aa04eae16b71e78d4432e7d59b2052392d13652a3e9beff15a6503f2e88e77a9b48279121d8eee943a898799155c05b167d986bf01fae84b5db0a9a1759148 WHIRLPOOL 9123ff33a35c03adaa6d3374e86b539e9481ec78467bd72ad6f2d832e76e7aafd9b2f2da0420111e1aa8a66c4950b0478d8a6ae4c0f0e05a20c8334196b077e8
+EBUILD qtdiag-5.4.2.ebuild 600 SHA256 0310597418a90844a545198f2ee66ea6aa93a20511f53e163607639409e3c942 SHA512 476897c9766e2f081f108879b9aa7c4217689f673371ee23fef595ece0d63ca89696364cbebdff5aaa1d9f8ea0c48b0a70dae8d0514c3cc2fad48847e856818a WHIRLPOOL 7ead18897118c0f408cd9d5f8b0589f97b0a0857183a39ae123849e01c9e5a76501e3edc28eb4e88886df820c3247b3e1f3c4a3ba77e2d20379b11fc584c8b73
+MISC ChangeLog 1493 SHA256 bf9481c3451279c8202c0b55b21be254bc2371515bc7d1a7532908225f1f2a4f SHA512 9de4543852efa09fa2d05bc546e22f00210ec5319b0eece6072545cd97d92edd29a902c8e8cf4a7477d05988266e3df140aa3c1e82f12bbba2d82e26c0562c26 WHIRLPOOL 25ed1e5f3fc8e529f12d4286ba7908025de3d521727f6deef2d6789b374b16c78adcc0e481a7cebaa6eff09889a21621408671a3444ec618fd918d7a85f99881
+MISC metadata.xml 259 SHA256 da0ed92b6766281315367c03378c1935b4e9fa82f840641d9c72b00a1b038646 SHA512 1fca930f71c109412ead8932e0910f6c2b1991a454b03ddef6dda7101358db65b3c6da5eb7f71c918673fd3b9b0ac0397cef0dd24c85f84f2043e3ca8e21dda1 WHIRLPOOL 484f50be685ae8a8a65889a66edf2a6d544e0c6758a8f384bafd7e8f1cc23c4e788613d39febc67f1fc6f99e9e7541881f6224e07497ab0ca031449053b5e13b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlVXJNoACgkQVWmRsqeSphNWfQCdEiQGa3KMJonv+431an7xG0Sf
-S/EAn30RR5urkmcnaeO0y6Cy/sw4olHJ
-=drHX
+iQJ8BAEBCABmBQJVgZBIXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9XDsP/iXsjwrjkNQiF90MsvYeAbwo
+O/PSI7FemzlcM6nxrUVjw7CCLpS69Ks/pZjvQyjeo0uW5oNDypRjpYkOUXjL2sMO
+ibKusi0s08xZ+FvWnL8YZb9Ae3WIO1chCv1jZkYakbjzuexqvK42uKd/ap2+/lEU
+1qTS1xlGbQI1/V2jdRQ3Zs40H32BVhVMOrlthBbAM8rMRSK9XYLTqLP91TafziaQ
+FQ7/h9YrADR7/pZNjR3TGrn9JotcUQv72Qww/XPUWqzaWoMGPZXIpuxgvFT675P7
+hx229siA5EKOyH3zZLzLrz+z/M5cLQQBgkMsFYidWOPJ5ETsyTislV2HSQncjjtK
+w2G6FVZeSe/86omirEXm6ikTNsx293ApRrl2o3NXIqE9YKPRdGlTo/xi8iyDdrwr
+7QmXdx9glIGdCpoQAsm3wTE1cqkpMY5dbZ1YrG53V6mLUpFvNc/hs4uFNkzls879
+6DXM4h13JPICiUzZ1x5ldooyd1tb9ojXoXzkSAFd9NYN4ralxvLdzoO0ypTj8TCe
+2GN2odhmEbvud7YX+6oyl/k7IPVWqiln/Ddg5gZIwjsLa1RkQ5ckjf+NeMY/UXCJ
+QrYq/FSEYl0nLaP7RFYR66Mh9ry5KbKDQOGXZHms7fhbq/T+TbgYW6PKME2gxYzn
+g1xnQUm3z0m45iREwAFr
+=5Myh
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtdiag/metadata.xml b/dev-qt/qtdiag/metadata.xml
index 39c63597e531..afb3b434585b 100644
--- a/dev-qt/qtdiag/metadata.xml
+++ b/dev-qt/qtdiag/metadata.xml
@@ -4,6 +4,6 @@
 	<herd>qt</herd>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
-		<doc>http://qt-project.org/doc/</doc>
+		<doc>http://doc.qt.io/</doc>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-qt/qtdiag/qtdiag-5.4.1.ebuild b/dev-qt/qtdiag/qtdiag-5.4.2.ebuild
index f114d8981e58..caa848d2f24c 100644
--- a/dev-qt/qtdiag/qtdiag-5.4.1.ebuild
+++ b/dev-qt/qtdiag/qtdiag-5.4.2.ebuild
@@ -1,27 +1,23 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdiag/qtdiag-5.4.1.ebuild,v 1.3 2015/05/16 11:07:05 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdiag/qtdiag-5.4.2.ebuild,v 1.1 2015/06/17 15:20:39 pesa Exp $
 
 EAPI=5
-
 QT5_MODULE="qttools"
-
 inherit qt5-build
 
 DESCRIPTION="Tool for reporting diagnostic information about Qt and its environment"
 
-if [[ ${QT5_BUILD_TYPE} == live ]]; then
-	KEYWORDS="~ppc64"
-else
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
 fi
 
-IUSE="+opengl +ssl"
+IUSE="+ssl"
 
 DEPEND="
-	>=dev-qt/qtcore-${PV}:5[debug=]
-	>=dev-qt/qtgui-${PV}:5[debug=,opengl=]
-	>=dev-qt/qtnetwork-${PV}:5[debug=,ssl=]
+	>=dev-qt/qtcore-${PV}:5
+	>=dev-qt/qtgui-${PV}:5
+	>=dev-qt/qtnetwork-${PV}:5[ssl=]
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-qt/qtgraphicaleffects/ChangeLog b/dev-qt/qtgraphicaleffects/ChangeLog
index 233d86bd0ed2..e82680327310 100644
--- a/dev-qt/qtgraphicaleffects/ChangeLog
+++ b/dev-qt/qtgraphicaleffects/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-qt/qtgraphicaleffects
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtgraphicaleffects/ChangeLog,v 1.13 2015/05/16 11:05:18 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtgraphicaleffects/ChangeLog,v 1.14 2015/06/17 15:20:46 pesa Exp $
+
+*qtgraphicaleffects-5.4.2 (17 Jun 2015)
+
+  17 Jun 2015; Davide Pesavento <pesa@gentoo.org>
+  +qtgraphicaleffects-5.4.2.ebuild, -qtgraphicaleffects-5.4.1.ebuild,
+  metadata.xml:
+  Version bump.
 
   16 May 2015; Jeroen Roovers <jer@gentoo.org> qtgraphicaleffects-5.4.1.ebuild:
   Mark ~ppc64 too.
diff --git a/dev-qt/qtgraphicaleffects/Manifest b/dev-qt/qtgraphicaleffects/Manifest
index bf7d2f244e99..4b851eac46e0 100644
--- a/dev-qt/qtgraphicaleffects/Manifest
+++ b/dev-qt/qtgraphicaleffects/Manifest
@@ -1,14 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST qtgraphicaleffects-opensource-src-5.4.1.tar.xz 14323700 SHA256 bae2f0e8120f0b4e6e1b56a486713821615d0af7c69fb4ecdcbabc22b8f8351c SHA512 0f2b0c42692a89e68f98718e259c732f72837f510a7e3eb95d81c6271c852d7a0e8de1bb17ba181be48b0159c4381995a230ad6f9d4ec45311b59c315207c9c5 WHIRLPOOL f551b16efd43341e55e65d0d19a33be47b2af8bf7d743f9b5203578277a71b8b0c350aee395fa24e4d86645e61a6c29db2eab0c535c65278a8ba2aa3a9bb5943
-EBUILD qtgraphicaleffects-5.4.1.ebuild 732 SHA256 4032a76cb34dde6dc6b9d739775ab3f4b5c97113b6589ec77d172ab16db2e649 SHA512 09357c22b25dfe0e02c2a0565227132c58e676b4ff1f739d85aa05f265e9d7788aaad0ca8f107e3b1d0db17628c3d339e487c83ca941da56bf078930a3405441 WHIRLPOOL c74ddaf5ac30c9932b63934bc5a7523d7481211072adc021284c6add9aa68cf6d2c40318f45c1287475b176644a4c4404fcbefd95d156da78d15cf957e8c274c
-MISC ChangeLog 1548 SHA256 77413ee4c3caa4b8f908d14715502f2c5dd9d985b8d48a33517612bf5392e002 SHA512 decc3c1a00218fb8b73bacfec102b0ee0d39f44d9c72b17b9aa0e7c2bd3b5255acca2bae57784e501f2ddd20dd91af78008599d0ac3948b9416a2f6871c7bb84 WHIRLPOOL bd228c015a39de79687cfd6ee5bd95d089c1f765b1cc91a7538baad77d3ecdfa1319714db3fbb8fdb352af3d3950eb599d1f82e227b364fd40026b0afa6cb948
-MISC metadata.xml 268 SHA256 0976b0efa573f782c96382e8f40ec82944c66ed52a89ebe6b0e905050f01395d SHA512 73ef5d7a382915e844a0cf7f1f05ae64c88500ecffe13265d156960b498ae61a62f29c9789330e5f24c82ddbf3a9ebb98aeff5c4cb0e69af1e8f07099791b806 WHIRLPOOL 19922570bea256c44d78d6f92ef9781be4c177580bb4235d8620139c6cfd759df64fc82f053a685d70fa1378b0fd6f49bb818d393b19105e6069730e9cf44e52
+DIST qtgraphicaleffects-opensource-src-5.4.2.tar.xz 14324140 SHA256 ba8f477be1b0675ce36f48530db050d2922b2a0d6ff80c46559245a94aede80a SHA512 205896a2551a2be99b015c4254ec5195f97ff99d266e377caaffe02033d5c0aa9d7509b781f5316074ebe5e2d8e768b90db81d19a2233f98c887c57a25046c38 WHIRLPOOL 4424a57f760cc8d7bbf71b890bf3eea50b01eb2f4a1b36e88c945a47adb05a6a7badca0066552f523c4807dc7ee40ea70dd5f79cc33d45a4a5f3d334152f150d
+EBUILD qtgraphicaleffects-5.4.2.ebuild 679 SHA256 e58e98b3455d37cab9a818060a9f307f119ab26b7c82e596118e027186074d46 SHA512 ec1419c22c221d8e37e394893490e46cde52e509de8b099b9c7bac1bcbdf33eab6b6db3200375f242a55223fe0147a90c008ca4e3615fbbea3fc0a7ac255d057 WHIRLPOOL beedcfb71e5f1b386f13613a1e6c9e051134f26d68259e0abd48a5528dd7108164783dc85dd0dcc962b51c1ca87cb39e1cf164334ac9563a10929d5534b7f209
+MISC ChangeLog 1743 SHA256 4a1e8019454bd305c93ea5956b6744c69ee7609dc22d306aa6c19e8399d768a1 SHA512 b874d6656386ae006f4b5e1a1d0e736de762da662837c1b988708c93ecf623ed1c593d18e076692e4a34df044da4967081872d4258c7c956c59a528f7153d2ea WHIRLPOOL 79c7c225292618dd4c4ba4077a5a4f5313b06ef01fa9652409011887b130304cb89f2fdf4ee0170e337801188cc96d61f5eeec3cb726da97d02591fb0d015cc6
+MISC metadata.xml 259 SHA256 da0ed92b6766281315367c03378c1935b4e9fa82f840641d9c72b00a1b038646 SHA512 1fca930f71c109412ead8932e0910f6c2b1991a454b03ddef6dda7101358db65b3c6da5eb7f71c918673fd3b9b0ac0397cef0dd24c85f84f2043e3ca8e21dda1 WHIRLPOOL 484f50be685ae8a8a65889a66edf2a6d544e0c6758a8f384bafd7e8f1cc23c4e788613d39febc67f1fc6f99e9e7541881f6224e07497ab0ca031449053b5e13b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlVXJG8ACgkQVWmRsqeSphONNQCdENqfwPOip4PgcfFsCHud1Cjh
-fbAAn2kT3/Nu+A7xrbeQvilaQjzywsoq
-=3VhO
+iQJ8BAEBCABmBQJVgZBPXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9IXIP/i4vd09fRVJlmzt4/0koDXQW
+ZB/du+bM5jTuEEn4fpFwBQv1/L8+jqpLjtcaGKKuP9E1uc9Ak07fLD1SeG7EHYXh
+0MsMbk5lKSAuHO99xj/qAlcyQ1X6cP8EF4gJiCS80eR6FE3RVmUPYWxfCQ31YrKT
+zvsTR8p2j6g3BryFEx0d50vdm3BYvvoPgVxXKBHeiKcN+den+Jhbo5A8vp+sFJQ/
+QTqSTP6Nt4457HucnGQ0DEAUhimmx78Quoir01bcazTKLueoLa3CM8AQuEhenCaR
+WkXTFhXUtAWtrYDYuxMQAmiurO87K/JZMDqPqA3Pj+fQ0HRfmzSF2WwyL8UBuKy0
+yMtH61idlBCBT+NDpa0kx9lNLQqN0y2PfkcZtOySLyFz+2i+lb4drNj67ND9Q3hJ
+RfTPN8mqjfzZ7OHRum4B1eNUd9F9BkIsr23spXHLR8WEij7RfK93vp5iPXCugNq4
+k/AFIyEKx0XdQu0GxHplrYR0Cet3SStRk5sKMVqO9yVy7NgIcNUTIiFOLx16Xc3W
+84+nJ2AlNjVtlbS3981/Y/acYrMQUSDZrcG2TJv6MtWffjeC//hDqkk2N8mK/aRU
+yAtGL19d+BXMVnql9R16+f3CXgUZftq3m/RO2j3mmgaEKlKapLnKPXX9z6jv3rin
+UF149W35FK0DrOd7qrX+
+=O+r4
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtgraphicaleffects/metadata.xml b/dev-qt/qtgraphicaleffects/metadata.xml
index 39c63597e531..afb3b434585b 100644
--- a/dev-qt/qtgraphicaleffects/metadata.xml
+++ b/dev-qt/qtgraphicaleffects/metadata.xml
@@ -4,6 +4,6 @@
 	<herd>qt</herd>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
-		<doc>http://qt-project.org/doc/</doc>
+		<doc>http://doc.qt.io/</doc>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.4.1.ebuild b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.4.2.ebuild
index c3753b619608..2951f2661edd 100644
--- a/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.4.1.ebuild
+++ b/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.4.2.ebuild
@@ -1,28 +1,25 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.4.1.ebuild,v 1.3 2015/05/16 11:05:18 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.4.2.ebuild,v 1.1 2015/06/17 15:20:46 pesa Exp $
 
 EAPI=5
-
 inherit qt5-build virtualx
 
 DESCRIPTION="Set of QML types for adding visual effects to user interfaces"
 
-if [[ ${QT5_BUILD_TYPE} == live ]]; then
-	KEYWORDS="~ppc64"
-else
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
 fi
 
 IUSE=""
 
 RDEPEND="
-	>=dev-qt/qtcore-${PV}:5[debug=]
-	>=dev-qt/qtdeclarative-${PV}:5[debug=]
-	>=dev-qt/qtxmlpatterns-${PV}:5[debug=]
+	>=dev-qt/qtcore-${PV}:5
+	>=dev-qt/qtdeclarative-${PV}:5
+	>=dev-qt/qtxmlpatterns-${PV}:5
 "
 DEPEND="${RDEPEND}
-	test? ( >=dev-qt/qtgui-${PV}:5[debug=] )
+	test? ( >=dev-qt/qtgui-${PV}:5 )
 "
 
 src_test() {
diff --git a/dev-qt/qtgui/ChangeLog b/dev-qt/qtgui/ChangeLog
index 6c4ca0980f9c..d865657c8e81 100644
--- a/dev-qt/qtgui/ChangeLog
+++ b/dev-qt/qtgui/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-qt/qtgui
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtgui/ChangeLog,v 1.89 2015/05/30 10:52:14 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtgui/ChangeLog,v 1.90 2015/06/17 15:21:03 pesa Exp $
+
+*qtgui-5.4.2 (17 Jun 2015)
+
+  17 Jun 2015; Davide Pesavento <pesa@gentoo.org> +qtgui-5.4.2.ebuild,
+  -files/qtgui-5.4.1-CVE-2015-0295.patch,
+  -files/qtgui-5.4.1-CVE-2015-1858-1859.patch,
+  -files/qtgui-5.4.1-CVE-2015-1860.patch, -qtgui-5.4.1-r2.ebuild, metadata.xml:
+  Version bump.
 
   30 May 2015; Markus Meier <maekke@gentoo.org> qtgui-4.8.6-r4.ebuild:
   arm stable, bug #530238
diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest
index 775c50bbe02a..9838304aa7d9 100644
--- a/dev-qt/qtgui/Manifest
+++ b/dev-qt/qtgui/Manifest
@@ -11,24 +11,33 @@ AUX qtgui-4.8.5-libjpeg-9.patch 2852 SHA256 4b692de233f1cd9bf13a48166610af9f7b12
 AUX qtgui-4.8.5-qclipboard-delay.patch 1135 SHA256 7119cdc3450e1e36e01ce3273c5131b89c6e4a03f08652f5fa4eb0919d3b4bd0 SHA512 00c901fc9b9bd5b8ce45e8bb4dd4eda8832df7eda104ae1614d7cdac681d23f0daad543d0480f1d9366e2644833db680e0526660472a6cf1a907b803acf76517 WHIRLPOOL a45f6cfda0fd6f137c091eb82039900ac6f39d2b277ab9125b74e0828e2bb809561f1ef11328af1c5c1c20f5ca06e39e66881219c6101b1134126ca482d2aac9
 AUX qtgui-4.8.6-CVE-2015-1858.patch 2849 SHA256 bf7b77a1b311d2b0f647c4efb72cf42edb66f3085750784388fc7ffaf6a73fb0 SHA512 b7be8cf6bc9706df4f491fb5134a76ade03e1fd1d127d5d9bf228a787ee0f32496da04c937a1d44adcb698eadfe969f0026d626e9c5d9ec623e24541184b8246 WHIRLPOOL 01da12595a31eb323d5c96d85b8d3315a17929f916661eda209f5e2d13b9f7c187423d2620fedac33856ca132a5ac66d22ffb52bc437490ebe55c6d8a4366cb1
 AUX qtgui-4.8.6-CVE-2015-1860.patch 1009 SHA256 4afd0b1ef272774dfa845c2dc1340ce7d468f159646e92d6669e9d8f38f14171 SHA512 e2da2a04ab4d1180f855571aa39356ed74d173e95e7c0561021709256c7cfc85d2b99fd485d724357a2947379de52fad4c9ac7d52c61dd04373b00494de58e15 WHIRLPOOL 821a7552963412cba0294bbe3a7c3d7604c09f466d3cb9b22c7eb10a359359fa32748ad5ae45f86972de7edb1cb676197e082bb715e08c9c0391bbc6ec8f78f0
-AUX qtgui-5.4.1-CVE-2015-0295.patch 1828 SHA256 fba8ea41b0252174c42e4403f9be8b6e275a6a312228b5b37e336242be618e15 SHA512 6101c81d9931af24d48ef0b49ee38c2c912fc28401096b981438eab1d9e16f4bc04ed4153e5a5b9cc10187b3d230ba99c0452b08e90592487d8c7c13b2459119 WHIRLPOOL 3b0e66184e83dcda0711703af500ea8cd6437e5d668a559fc7524d006e1d50d02cb9955123f8ce1da6b2306ca448e614d364c50cbe5d8b771b2aaa4daccbb509
-AUX qtgui-5.4.1-CVE-2015-1858-1859.patch 2782 SHA256 0eebcb1bacb5de3bf249feb77ce95453066a3a958e1673fe3bb1e7c9fb6d862a SHA512 580d53eeaf489d51cc09d26a2bb5596562e1da4a1064909613adb4091d22fdd9814be6bbb860098be1ddac651e827283a59605c0d668d352ba0052cab7f48bd4 WHIRLPOOL dc3c76da488fdd7efc396126b5cbad0f4e63c2a3ba6144e3d11fd770ee8d6b887b2ba388dfe1b82b8fa2f1568ea5a3854b50c49da2f0439f141d7d622be4560c
-AUX qtgui-5.4.1-CVE-2015-1860.patch 940 SHA256 a0664c41b847cb00eb3f87feb89a105b70f65eb1719c58cb72c98e0459b89dcd SHA512 2731430202fad4ff6b117cc0188e5c448ce8cc6f8305b81209a8171fe1f2a3b1c96c935ebc50adaef4a815ead9498cfa4eaaf05083a2271619eb77c0e8aaa35a WHIRLPOOL 4d1cb5a92b33b82d4d03cf31492cdeaa80f5899d5e15cc36bc406ab96971c6e54ce1599807d974ab0d3f5848566073b03e059820bba2bf4ee703d5906f6435ca
 DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357
 DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2
-DIST qtbase-opensource-src-5.4.1.tar.xz 46132220 SHA256 8574a593830959c0f7e5430fe77a43832ea7f5299e14a397a74576b3df7fb1b7 SHA512 75d2c16bc47e6403e15c4094f50757157960cff4434de29f199b015795ba772b62125f01c09aceb2a06f8dfcfc4df8e35330259c76959239f276e2f5bd5221b5 WHIRLPOOL 48d9a583ba9d0bbfffdbfeaa2412e77a0bf4011e7bba525129ba4572faa6a55713a89cb00f4ed7f24e6782e3f7b8b48cb192e2c082b7dcb3c35a85109f2eb340
+DIST qtbase-opensource-src-5.4.2.tar.xz 46354192 SHA256 9fc4f720b8b5a8b8e4a7d45e13ce4d5b86756ad46fb406386637eb2de5fd5a74 SHA512 029da83969614bc9b3803c76242af62911e3c6de171b116b5cb8e2823cad0514ab705cc3fa331e042c679caeb099de4e9cd7ddea92959f675dda82533e3ad7fe WHIRLPOOL 5f352f78a779c5d042f04966a010b10af706c4db94976870721a550e3ab7eaf2695b3582c86cdcc3a11de36283e11fe65797f96e59df96fa367b16b72b5f9213
 DIST qtgui-systemtrayicon-plugin-system.patch 51377 SHA256 e8582ebb2a5db99bf85789585516459ace42fc2b57fc7d5ff6156a2819bda282 SHA512 0d74b61e23af2e8ef0619ee616c4b775761514f53ba79bcb25b32b7e55beab3575c0d279ba1b016498804023bb78f8cff61964ce56f80642f648406f7c303679 WHIRLPOOL 03cc247a2a0e3b77fc541fa0b47abb125c8f7b304037f2067488861f12fdab25d3b3b3a7cf90626c229aa85a2d43ae4319c0f838b6eeb5ecdfe838a365ed8a58
 EBUILD qtgui-4.8.5-r4.ebuild 6395 SHA256 b2a5932337fe01247baca27756d6690edb43323d3d2bff29dfc53e52907da122 SHA512 7c3877a1b89068ca36860b71d994da890405aa467bea5b2e4f6fb209e415ff4934496ad4afd0539b6432024fb8b9b2f5a1e70e4910af958a1944a91bd41048ae WHIRLPOOL 5d4a50ba58d147f97a979195e30f01238342bd617679448fe633b970cc15356eee33221ad776817290aab9a1871c77511c2abce76e96dd2937c88b6ace5e8256
 EBUILD qtgui-4.8.6-r4.ebuild 6264 SHA256 697da660cf27666eeb2b77c9f979751dd7282ee7edcc24dd37ed27259a4aa6d7 SHA512 1c7e5d9a2614ad716989ff8917e216d2ebd7b76a0e717d8f066c826f7b69388d8b5124c7cf279154eb8131b2ef02ad9ad43f065cc334e9de374c5d15c5c64874 WHIRLPOOL cec58713c816734e625e1be0d97dfdcf09cc8c825a8c96f346e43d81e3aa9b3a534d9b57b665d5070d301c11f54e0db475246a456084e0329c42c35fe4ae8d66
 EBUILD qtgui-4.8.7.ebuild 5863 SHA256 9206283348fefbf5539959d2920a31a4d248780c194c86f4f5c8dbeea3b7a3d6 SHA512 8ad343509819f41d4dccf45c3bee06c4b9796f148756b77afeaa5f7aa6403e8ff5c193dce2960f8d5c3d95a1f467b27fbd3e99b74211f3701a2652790752a4f0 WHIRLPOOL 4b77a12dbe556cd78d2d23be411b14fd2ee200bbc2109a3f968b10c3d2f749030a005786d3901929941ace373db2904565c14e890dc37bc5aa7d63c7e9e1b217
-EBUILD qtgui-5.4.1-r2.ebuild 3778 SHA256 41a5e4258e21ab636ad606536139f147dd09b096100add130be726d1e0a0b9ab SHA512 3dee01ac29eb3e7ab3a29629ff1c0b6eb442aba126e070af8c3ec2f6cad98603dace5a12e3e5d0f307090be9075909a8588612db942d2a90765f41a463ae64b6 WHIRLPOOL 168c9f7d1bbb12be82d2a3a6131f9ac2a3f71fe3ee9449c130fc83d043331d54959271914f87eccb8ce85c6c123b4b59e51823c0757fe8488af590452880b371
-MISC ChangeLog 45028 SHA256 ab5cf464b3f21e8049728dfc0c2f46e1b03f2e9c8eea4e004f02e32cd2ecd6d1 SHA512 e4313c903aab263f6c3621afe80ec0ac7e09f74943efc948abbb24ba79e6eb5e4099b903816a76c9ade15f3235f0667f8b121f51cce1b16f411bf727a81e8cd1 WHIRLPOOL abcd9cffca37f8a5deb4b1efb5a88bebb9a6cdcc9b10726ccdd94d594363b7c71310785d2b86896d174ff5493fe8a1353210e8327e6d76328dc8ebe1d7510850
-MISC metadata.xml 1431 SHA256 40799d067d2838a90818644ba38a4af47880194285c0627658b6d6798219ca17 SHA512 51e5b41ecc5584a3bda4f595bc5dd43ab89070ce356d2c03406479ed36490d46fa235eefd07707e30e9cdd952cd77bcf626423c5453725d442e769eb14c0e130 WHIRLPOOL 56c82cccefe2dd43b577456fcc90ed99ceb020b78d24f93f0c7a7618274f2025837c4142d75569f5894a2cacb45ca42c34e5e74d73e03aa6a9f9e2fb84b9c149
+EBUILD qtgui-5.4.2.ebuild 3383 SHA256 0b9b890e1b341c0f459676aff2f262f804e7dcaa680543e7943dd71a43063909 SHA512 5edae517ba6a83d4141196212e173c7d3a933e1f0ee52f10aa56e2667676451a19d938026b2f3c1d5c4b0f69f0fb2b7fae03c82743be419cc6604dc9d3ea53b5 WHIRLPOOL 4e2428b4813c883581e969836f21b4f9797302e413b5cdd311b0fc6c7c3f34d0ce7d9e51cea9476cc980c34683654ba5256972f9edb06de8dca0a19f9a254a27
+MISC ChangeLog 45311 SHA256 f67c793ca61e2d0c6292e021080cc61de7c7340c84fb73b5101c98d4423ff9f1 SHA512 6c5eac753ddd7e01fba27cbd595bf2b7e9707e6252f99b578a557a13b6cf9c265e8c25d733dd3e866b85732b6ab4642f2344f5121414326f611ffb99914ae309 WHIRLPOOL ecf7ac62a0bb3e1c2e2bf66ed2269b530ae68f060b8272c905901b668f9c7dd837e01b95540e0ca1448dd465f14c8104620d30661423741fc461b4e594c29d44
+MISC metadata.xml 1423 SHA256 e4b1b2dd0f615c80e227a4c0d85cc633006264906ec24ede10d4580644029acc SHA512 e86a3f92c6df0d0de971ba70cd84a8751ec7b5df07eaaa46ac87b87f0292c334712e2263b06a5daaddfebb4bb07aabf7b85661ec5a6ed17c07ade5d424dc5181 WHIRLPOOL af2a48984b17c492b6c7cfe1d1021064457a80ba787a2942d207654ad73cb24c20f0164df184aec2852e9b58bfbb030d9380567f196f59061d1dbbedf98dc432
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlVplmAACgkQkKaRLQcq0GINRgCcC1UMtvPiFcXQyTbfNMsGTLxW
-WfoAn3P1M7Poj0wrfs9wke2Ahs/gHc5+
-=noKt
+iQJ8BAEBCABmBQJVgZBgXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9w5YQAKFF6dnHq+0ySiFm2u3oAU8c
+ABXmhcEAt7gcl3s5a5/6xL1HbSuW0dLeK5cgr3ETvx74QomV9fXyV1sSHgcgb2yt
+CixWyrE29v96o+AZUfcMCVIO3jWbJmHW/BB0HVrw9ESeq5NRIEkzyt74WcKfntKq
+IjoLA7ILcv7vJxVsGxRbm8Fc/+IZGw1LNWuAI9YCVtN0xxBquIZUrkOMMYqAMO2U
+dYSjkbPw/uSzbIB3YBxvgf5KT5tZUwXIsUtHQsbc/WEKobpDduZXGQDAr/uZ95C0
+DwMTf+hneoCXcG7yRXDDS2srF3i0C6IuGy8K/E1aBMJGn74rElS+XjsXCs9fCucN
+7SC4t2afvJmPx/vY8ueU3naWQuMPzN/bvnr6Cr1tFGFVirusd2wsOp8E9LDpLFZB
+ckjP0WXgrUSkbS74dMBj6Ft6EPxoUjSP8kyOVzWsjwur6AdIxcDqrAJjmi33W38g
+audSwkiM5S8U7lvIF7ujYn3tQ4jqKAq1lTWZpvlllcOUMZw0CSYBEqYk8FWCCXXE
+A3CqnarwNjBRrJgglX4c4ML8NEJsxUQ1yOM+iAWhMxeOoP6By6wEVEBuxCsl7edT
+etgy8fhnpF/BiUxolZjtdQtv1xNzwiN7uum5GfG1z7x84N1+HMmGRNr+no+xY/wM
+0or307wd9l5ceYuMPInJ
+=Py3N
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtgui/files/qtgui-5.4.1-CVE-2015-0295.patch b/dev-qt/qtgui/files/qtgui-5.4.1-CVE-2015-0295.patch
deleted file mode 100644
index 35c453873d6a..000000000000
--- a/dev-qt/qtgui/files/qtgui-5.4.1-CVE-2015-0295.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 661f6bfd032dacc62841037732816a583640e187 Mon Sep 17 00:00:00 2001
-From: "Richard J. Moore" <rich@kde.org>
-Date: Sat, 21 Feb 2015 17:43:21 +0000
-Subject: [PATCH] Fix a division by zero when processing malformed BMP files.
-
-This fixes a division by 0 when processing a maliciously crafted BMP
-file. No impact beyond DoS.
-
-Task-number: QTBUG-44547
-Change-Id: Ifcded2c0aa712e90d23e6b3969af0ec3add53973
-Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
-Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
----
- src/gui/image/qbmphandler.cpp | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/src/gui/image/qbmphandler.cpp b/src/gui/image/qbmphandler.cpp
-index 21c1a2f..df66499 100644
---- a/src/gui/image/qbmphandler.cpp
-+++ b/src/gui/image/qbmphandler.cpp
-@@ -314,12 +314,20 @@ static bool read_dib_body(QDataStream &s, const BMP_INFOHDR &bi, int offset, int
-         }
-     } else if (comp == BMP_BITFIELDS && (nbits == 16 || nbits == 32)) {
-         red_shift = calc_shift(red_mask);
-+        if (((red_mask >> red_shift) + 1) == 0)
-+            return false;
-         red_scale = 256 / ((red_mask >> red_shift) + 1);
-         green_shift = calc_shift(green_mask);
-+        if (((green_mask >> green_shift) + 1) == 0)
-+            return false;
-         green_scale = 256 / ((green_mask >> green_shift) + 1);
-         blue_shift = calc_shift(blue_mask);
-+        if (((blue_mask >> blue_shift) + 1) == 0)
-+            return false;
-         blue_scale = 256 / ((blue_mask >> blue_shift) + 1);
-         alpha_shift = calc_shift(alpha_mask);
-+        if (((alpha_mask >> alpha_shift) + 1) == 0)
-+            return false;
-         alpha_scale = 256 / ((alpha_mask >> alpha_shift) + 1);
-     } else if (comp == BMP_RGB && (nbits == 24 || nbits == 32)) {
-         blue_mask = 0x000000ff;
--- 
-2.0.5
-\ No newline at end of file
diff --git a/dev-qt/qtgui/files/qtgui-5.4.1-CVE-2015-1858-1859.patch b/dev-qt/qtgui/files/qtgui-5.4.1-CVE-2015-1858-1859.patch
deleted file mode 100644
index c0ea6c2ee76f..000000000000
--- a/dev-qt/qtgui/files/qtgui-5.4.1-CVE-2015-1858-1859.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 51ec7ebfe5f45d1c0a03d992e97053cac66e25fe Mon Sep 17 00:00:00 2001
-From: Eirik Aavitsland <eirik.aavitsland@theqtcompany.com>
-Date: Wed, 11 Mar 2015 13:34:01 +0100
-Subject: Fixes crash in bmp and ico image decoding
-
-Fuzzing test revealed that for certain malformed bmp and ico files,
-the handler would segfault.
-
-Change-Id: I19d45145f31e7f808f7f6a1a1610270ea4159cbe
-Reviewed-by: Lars Knoll <lars.knoll@digia.com>
----
- src/gui/image/qbmphandler.cpp                | 13 +++++++------
- src/plugins/imageformats/ico/qicohandler.cpp |  2 +-
- 2 files changed, 8 insertions(+), 7 deletions(-)
-
-diff --git a/src/gui/image/qbmphandler.cpp b/src/gui/image/qbmphandler.cpp
-index df66499..8acc593 100644
---- a/src/gui/image/qbmphandler.cpp
-+++ b/src/gui/image/qbmphandler.cpp
-@@ -484,12 +484,6 @@ static bool read_dib_body(QDataStream &s, const BMP_INFOHDR &bi, int offset, int
-                             p = data + (h-y-1)*bpl;
-                             break;
-                         case 2:                        // delta (jump)
--                            // Protection
--                            if ((uint)x >= (uint)w)
--                                x = w-1;
--                            if ((uint)y >= (uint)h)
--                                y = h-1;
--
-                             {
-                                 quint8 tmp;
-                                 d->getChar((char *)&tmp);
-@@ -497,6 +491,13 @@ static bool read_dib_body(QDataStream &s, const BMP_INFOHDR &bi, int offset, int
-                                 d->getChar((char *)&tmp);
-                                 y += tmp;
-                             }
-+
-+                            // Protection
-+                            if ((uint)x >= (uint)w)
-+                                x = w-1;
-+                            if ((uint)y >= (uint)h)
-+                                y = h-1;
-+
-                             p = data + (h-y-1)*bpl + x;
-                             break;
-                         default:                // absolute mode
-diff --git a/src/plugins/imageformats/ico/qicohandler.cpp b/src/plugins/imageformats/ico/qicohandler.cpp
-index 00de0c8..ec1654e 100644
---- a/src/plugins/imageformats/ico/qicohandler.cpp
-+++ b/src/plugins/imageformats/ico/qicohandler.cpp
-@@ -567,7 +567,7 @@ QImage ICOReader::iconAt(int index)
-                 QImage::Format format = QImage::Format_ARGB32;
-                 if (icoAttrib.nbits == 24)
-                     format = QImage::Format_RGB32;
--                else if (icoAttrib.ncolors == 2)
-+                else if (icoAttrib.ncolors == 2 && icoAttrib.depth == 1)
-                     format = QImage::Format_Mono;
-                 else if (icoAttrib.ncolors > 0)
-                     format = QImage::Format_Indexed8;
--- 
-cgit v0.11.0
-
diff --git a/dev-qt/qtgui/files/qtgui-5.4.1-CVE-2015-1860.patch b/dev-qt/qtgui/files/qtgui-5.4.1-CVE-2015-1860.patch
deleted file mode 100644
index 3b9daa56b66b..000000000000
--- a/dev-qt/qtgui/files/qtgui-5.4.1-CVE-2015-1860.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From d3048a29797ee2d80d84bbda26bb3c954584f332 Mon Sep 17 00:00:00 2001
-From: Eirik Aavitsland <eirik.aavitsland@theqtcompany.com>
-Date: Wed, 11 Mar 2015 09:00:41 +0100
-Subject: Fixes crash in gif image decoder
-
-Fuzzing test revealed that for certain malformed gif files,
-qgifhandler would segfault.
-
-Change-Id: I5bb6f60e1c61849e0d8c735edc3869945e5331c1
-Reviewed-by: Richard J. Moore <rich@kde.org>
----
- src/gui/image/qgifhandler.cpp | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/gui/image/qgifhandler.cpp b/src/gui/image/qgifhandler.cpp
-index 03e46ab..8d8c4ae 100644
---- a/src/gui/image/qgifhandler.cpp
-+++ b/src/gui/image/qgifhandler.cpp
-@@ -936,6 +936,8 @@ void QGIFFormat::fillRect(QImage *image, int col, int row, int w, int h, QRgb co
- 
- void QGIFFormat::nextY(unsigned char *bits, int bpl)
- {
-+    if (out_of_bounds)
-+        return;
-     int my;
-     switch (interlace) {
-     case 0: // Non-interlaced
--- 
-cgit v0.11.0
-
diff --git a/dev-qt/qtgui/metadata.xml b/dev-qt/qtgui/metadata.xml
index 2800cc4a9dd8..ce6b0b5326d1 100644
--- a/dev-qt/qtgui/metadata.xml
+++ b/dev-qt/qtgui/metadata.xml
@@ -8,7 +8,7 @@
 		<flag name="evdev">Enable evdev input support</flag>
 		<flag name="exceptions">Add support for exceptions - like catching them
 			inside the event loop (recommended by upstream)</flag>
-		<flag name="gles2">Use OpenGL ES 2.0 instead of desktop OpenGL</flag>
+		<flag name="gles2">Use GLES 2.0 or later instead of full OpenGL</flag>
 		<flag name="glib">Enable <pkg>dev-libs/glib</pkg> eventloop support</flag>
 		<flag name="gtkstyle">Build a Qt style called GTK+ that mimics the active
 			GTK+ theme</flag>
@@ -24,6 +24,6 @@
 	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
-		<doc>http://qt-project.org/doc/</doc>
+		<doc>http://doc.qt.io/</doc>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-qt/qtgui/qtgui-5.4.1-r2.ebuild b/dev-qt/qtgui/qtgui-5.4.2.ebuild
index e6ea648c50cc..bc349afba193 100644
--- a/dev-qt/qtgui/qtgui-5.4.1-r2.ebuild
+++ b/dev-qt/qtgui/qtgui-5.4.2.ebuild
@@ -1,37 +1,33 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtgui/qtgui-5.4.1-r2.ebuild,v 1.1 2015/05/16 18:51:53 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtgui/qtgui-5.4.2.ebuild,v 1.1 2015/06/17 15:21:03 pesa Exp $
 
 EAPI=5
-
 QT5_MODULE="qtbase"
-
 inherit qt5-build
 
 DESCRIPTION="The GUI module and platform plugins for the Qt5 framework"
 
-if [[ ${QT5_BUILD_TYPE} == live ]]; then
-	KEYWORDS="~ppc64"
-else
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
 fi
 
 # TODO: directfb, linuxfb, offscreen (auto-depends on X11)
 
-IUSE="accessibility egl eglfs evdev +gif gles2 gtkstyle +harfbuzz ibus jpeg kms +opengl +png udev +xcb"
+IUSE="accessibility egl eglfs evdev +gif gles2 gtkstyle +harfbuzz ibus jpeg kms +png udev +xcb"
 REQUIRED_USE="
-	egl? ( evdev opengl )
+	egl? ( evdev )
 	eglfs? ( egl )
-	gles2? ( opengl )
 	kms? ( egl gles2 )
 "
 
 RDEPEND="
 	dev-libs/glib:2
-	~dev-qt/qtcore-${PV}[debug=]
+	~dev-qt/qtcore-${PV}
 	media-libs/fontconfig
 	media-libs/freetype:2
-	sys-libs/zlib
+	>=sys-libs/zlib-1.2.5
+	virtual/opengl
 	egl? ( media-libs/mesa[egl] )
 	evdev? ( sys-libs/mtdev )
 	gtkstyle? (
@@ -41,14 +37,13 @@ RDEPEND="
 	)
 	gles2? ( media-libs/mesa[gles2] )
 	harfbuzz? ( >=media-libs/harfbuzz-0.9.32:= )
-	ibus? ( ~dev-qt/qtdbus-${PV}[debug=] )
+	ibus? ( ~dev-qt/qtdbus-${PV} )
 	jpeg? ( virtual/jpeg:0 )
 	kms? (
 		media-libs/mesa[gbm]
 		virtual/libudev:=
 		x11-libs/libdrm
 	)
-	opengl? ( virtual/opengl )
 	png? ( media-libs/libpng:0= )
 	udev? ( virtual/libudev:= )
 	xcb? (
@@ -63,25 +58,20 @@ RDEPEND="
 		x11-libs/xcb-util-keysyms
 		x11-libs/xcb-util-renderutil
 		x11-libs/xcb-util-wm
-		accessibility? ( ~dev-qt/qtdbus-${PV}[debug=] )
+		accessibility? ( ~dev-qt/qtdbus-${PV} )
 	)
 "
 DEPEND="${RDEPEND}
 	evdev? ( sys-kernel/linux-headers )
-	test? ( ~dev-qt/qtnetwork-${PV}[debug=] )
+	test? ( ~dev-qt/qtnetwork-${PV} )
 "
 PDEPEND="
 	ibus? ( app-i18n/ibus )
 "
 
-PATCHES=(
-	"${FILESDIR}/${PN}-5.4.1-CVE-2015-0295.patch"
-	"${FILESDIR}/${PN}-5.4.1-CVE-2015-1858-1859.patch"
-	"${FILESDIR}/${PN}-5.4.1-CVE-2015-1860.patch"
-)
-
 QT5_TARGET_SUBDIRS=(
 	src/gui
+	src/openglextensions
 	src/platformheaders
 	src/platformsupport
 	src/plugins/generic
@@ -109,7 +99,7 @@ QT5_GENTOO_CONFIG=(
 	jpeg:system-jpeg:IMAGEFORMAT_JPEG
 	!jpeg:no-jpeg:
 	kms:kms:
-	opengl
+	:opengl
 	png:png:
 	png:system-png:IMAGEFORMAT_PNG
 	!png:no-png:
@@ -125,7 +115,6 @@ QT5_GENTOO_CONFIG=(
 )
 
 pkg_setup() {
-	use opengl   && QT5_TARGET_SUBDIRS+=(src/openglextensions)
 	use gtkstyle && QT5_TARGET_SUBDIRS+=(src/plugins/platformthemes/gtk2)
 	use ibus     && QT5_TARGET_SUBDIRS+=(src/plugins/platforminputcontexts/ibus)
 	use xcb	     && QT5_TARGET_SUBDIRS+=(src/plugins/platforminputcontexts/compose)
@@ -135,28 +124,21 @@ pkg_setup() {
 }
 
 src_configure() {
-	local gl="-no-opengl"
-	if use gles2; then
-		gl="-opengl es2"
-	elif use opengl; then
-		gl="-opengl desktop"
-	fi
-
 	local myconf=(
-		$(use accessibility && use xcb && echo -dbus-linked)
-		$(use ibus && echo -dbus-linked)
+		$(use accessibility && usex xcb -dbus-linked '')
+		$(usex ibus -dbus-linked '')
 		$(qt_use egl)
 		$(qt_use eglfs)
 		$(qt_use evdev)
 		$(qt_use evdev mtdev)
 		-fontconfig
 		-system-freetype
-		$(use gif || echo -no-gif)
-		${gl}
+		$(usex gif '' -no-gif)
 		$(qt_use gtkstyle)
 		$(qt_use harfbuzz harfbuzz system)
 		$(qt_use jpeg libjpeg system)
 		$(qt_use kms)
+		-opengl $(usex gles2 es2 desktop)
 		$(qt_use png libpng system)
 		$(qt_use udev libudev)
 		$(qt_use xcb xcb system)
diff --git a/dev-qt/qthelp/ChangeLog b/dev-qt/qthelp/ChangeLog
index d9cbcbdbcab0..90b4468046c6 100644
--- a/dev-qt/qthelp/ChangeLog
+++ b/dev-qt/qthelp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-qt/qthelp
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qthelp/ChangeLog,v 1.46 2015/05/30 10:54:40 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qthelp/ChangeLog,v 1.47 2015/06/17 15:21:16 pesa Exp $
+
+*qthelp-5.4.2 (17 Jun 2015)
+
+  17 Jun 2015; Davide Pesavento <pesa@gentoo.org> +qthelp-5.4.2.ebuild,
+  -qthelp-5.4.1.ebuild, metadata.xml:
+  Version bump.
 
   30 May 2015; Markus Meier <maekke@gentoo.org> qthelp-4.8.6-r3.ebuild:
   arm stable, bug #530238
diff --git a/dev-qt/qthelp/Manifest b/dev-qt/qthelp/Manifest
index 900926682861..3021d20a91dd 100644
--- a/dev-qt/qthelp/Manifest
+++ b/dev-qt/qthelp/Manifest
@@ -9,17 +9,29 @@ DIST qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz 329896 SHA256
 DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357
 DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2
-DIST qttools-opensource-src-5.4.1.tar.xz 9262024 SHA256 11de0f8573843194b134e32af49594514498fadc4fc0b3b0333540fe1f671f72 SHA512 1e1dce0d6d587bdfa8d3ed20db0dbf3c1db3c1ffea4ea34741a9069ca08f3ab478e39245b26bf9f1c97c28650beb396e433e8b54a7f0b6cc5e93e3000e39e7d8 WHIRLPOOL bb8672cb64d39d3786f3db64f5d215d122ee62144406d970a2e37b019fd64ed08f2109e8dd64f23b6926e1bb9f21839805149bec3e5fff200b465e59ecceb286
+DIST qttools-opensource-src-5.4.2.tar.xz 9333100 SHA256 edf3d7e00227f9989101da84b2fdf8eaf1a5b7863dc5e0d26bb0f39303e8b6b4 SHA512 55aa04eae16b71e78d4432e7d59b2052392d13652a3e9beff15a6503f2e88e77a9b48279121d8eee943a898799155c05b167d986bf01fae84b5db0a9a1759148 WHIRLPOOL 9123ff33a35c03adaa6d3374e86b539e9481ec78467bd72ad6f2d832e76e7aafd9b2f2da0420111e1aa8a66c4950b0478d8a6ae4c0f0e05a20c8334196b077e8
 EBUILD qthelp-4.8.5-r2.ebuild 3226 SHA256 ce6d555b4ac668f9091ba77018041a998b25fdb0420c9f18bf7619d07e992e96 SHA512 1adba91e6c3cfc9bc5f668f3bb777c31f725a3f9960159c3b0843a6336c5ae29feb74afedab6c783793213fe870a0ce4e46ef137e20de1c5a89d7fbe2ebe6806 WHIRLPOOL e2635722fa8a4aea7ae970dfc5bbf9ef4d31753366136c144a700e38c4ee3d94dfe001bc95d737bec2a27039659d04ceef1b19690c762dd7ba5fed0c2bcb6e72
 EBUILD qthelp-4.8.6-r3.ebuild 3303 SHA256 73a38c4b1f4f1140fe9bb1884b440260aafa18605f4809b19e48d2041da3f8be SHA512 7707df6ce231abb09924c7aa36829fa4a3af70a7e75c60a332ff2c64e49ebaadbf416606e7d98e4f7099d453baa1dc422a9fe8743c401147f5e2dcfaadfe1a05 WHIRLPOOL aec4bc466cbb58c004391c23652f4f1dda2dd67d43f99b0db63d82f07ccebfd1e587c66f527b1c5fdc826f3ec7ea35fc0d8a474bd23b2e7a405b44f38677f3d7
 EBUILD qthelp-4.8.7.ebuild 3274 SHA256 8f2da17516a69796d30676736a938683282dac7036cfe16e68c784fa6545b9e5 SHA512 43dafe80eb90a3e20df8d874c3cb3a2407460a00f6bd7e6810d795bab3d1fd657d4b97824d17dd75080bde3b98232f7da5017e116ad87bf46637665328cc0375 WHIRLPOOL 50a2424d3d09f3cd99e542a20edc254c726cd63bf54a8032e293631a3857e43aacad91d751976c3a365b0a6bd8f3a807efc393788fe6338d844a0e559d50de3b
-EBUILD qthelp-5.4.1.ebuild 805 SHA256 491748fc349f9363cd57656e52654c9358a7de84f45c10c2c7a4588be96ed6ed SHA512 b4fef70b78c6474dea5014660f9b06e700b9a075d1d05e0fa17b7ba41e573d15d75bb8ef241a51e11104fe8b1ebc1f7ab7a08f5a017b98e135b6eefa425b9d54 WHIRLPOOL 417b77354e2b72164d79133913c0c6e281bd0ac8e3bdb8bb620230fe189974fcfdf4cc2fd6ec286884cb60f55e06b33ba638f409a8af0906de7d87017010f8c8
-MISC ChangeLog 28141 SHA256 4af1c75d4fdcbdaf04d0ac3b35155c0a7512f11e3c800c83f5a637690a759551 SHA512 b9f1ab0d64a5eb2bfe3832d8ee085387048fc9c2ecdffb00d82dc196192351d58011cd8bcb079ce011c93b07a9762de6d4a2890b10f9f4d39a3bd189c5a40d82 WHIRLPOOL a2239c04a51f77daf24901693bacf4126fa5213da64bb651a8aabd1038994c8854bec52f99d97beb21ce3e756a1515e7d27f3de4c899387e796729969f130b0b
-MISC metadata.xml 619 SHA256 a0279b54456f15f87f3ab0eab4f541e2273a76eeb25219e7810cc0a3a379953c SHA512 c5fbfbe51cc9ccc483f3472fa616ba62c50ab83d731e7f91917cef5fc56cd3d6afd13e250e8b4ecc3f2faff68053cbed79290363c5ac16c9a17caba1c98cad30 WHIRLPOOL 5d509445f34c0cef9ecc5ac0dc3b2f1e54c725682ab1bf0d465b988de71c6c52a30b561c0923f2885de375385b9be42e8c4288cdeb5f1bde088851d317768c03
+EBUILD qthelp-5.4.2.ebuild 744 SHA256 d1796fc8cc7fd8ad40a85208aeac772365e9cfad5f3b764ee59fddf4a6e6d61c SHA512 59ca11dfbbea04d227f3cf63d2ba90a0950b27a18006c6cbdda2ec2fc1bce3160ad23e423f6b431084518160202f50f2663296292ad0f385a7b12802f0d2a889 WHIRLPOOL 1e1dc77e203a0088d18c070aa6a14f1e16922fccbbe61ddcc1dd4bb9d2de0b2ee94f921d335bfbce381698d1facfa8ad473a467d50c117f8ee91247bc6149205
+MISC ChangeLog 28295 SHA256 85b92c3314fc98e53aa262df50dcd0f5486e003cd360fdd9aea03eedc235855c SHA512 007c92a05259e5489d623d3799280292c9ec8438682b25045b3413347ed29ebe59879a2c8c86937aefffc934360d7b7ab2fd0f73c30ce9a5c056fd70dcbe63be WHIRLPOOL 966d224bb208b44b91038ed3e302add05d109df83140d320e3acb195a2850c9172cbf8c5d3adc5f7bac3b12f9b364a72dca2f770aab9019cf5cf14e9e48f09ee
+MISC metadata.xml 610 SHA256 6c1d02293bdea4976334fadaf6736c6aece43cb4c286b1f0350e38a5de533837 SHA512 b4e6b38841f86587ae7c3450b9993bc80f65470846bca9024badf7f0672f2827e1c02980c29958018aa6afb606542af1bc2567da7fe78c644cec08d27b7881af WHIRLPOOL edda7d4ada17570f9f7eda461c8de1de8c3b8b12f315ce7198a18f4cd2f3ca530d3fac2bd6ebac579b48ed96a94c60b5818579a0f3b6f861c170517c9933f6e1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlVplvEACgkQkKaRLQcq0GKX6QCgmKEt9NuXTTzSfyg6Lb9MT1IC
-mMYAnAm2UETL5MV+kV5/K8dTOLMNb7L2
-=ICVy
+iQJ8BAEBCABmBQJVgZBtXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9GGsP/AjyImCrWF4/FP42t8j8dgYC
+nXpUbo+AsWO5yoLf471cEhu1Mc1bkZmqPhixbKzVHuLrum7UDgxednRBlaRVy1ZH
+hRvPe+IGYxChA3DubSuqZhWcoNYPTrFUGr+Exg+mXiwvXlCy5KRcwhVtHUpf83Ry
+J9Pi4bKYkFsW9+HbxYK9b9TdiqOw6tNPtG9x7rFJSxAjrrwjjm/l9ca3nBxHe9tS
+rBhlPlyHBWl1ZZ9eGAbF4/0Di/FHHYHUY2U5Nb4pkrDCMKh6GgxWScahRbWSfhna
+5zJsy0vEw9TS04xakVasQI0dCeMz3Cbcp+7fIDnFfpLQ0hlzIh6ssm9KkC0wSt8a
+nZTqQmzT8rxlLxTz1rWPQ+GGKv0+oGL9S90XjJguRkugCUeO5dkG4CNQUZzwKnLh
+sTknShzBgpDNXDiQJL3Qpwhf/tg21eeiY4MLHPUEUu1dmZGrZNYmDi44R0O5vU1G
+ur3Hj+5Hw5yNe4iPDHUZUGzfEGYBqu729o3PA3I3LcFKZzAOVIlx/lGJIwSa6kQJ
+1a4lgbC+llNlDgFZq1cBoZby6/nz0Wgst0VbsH3n63gYOV7uR26RlGujJqdkdXMX
+hk5dcu+BIrxn9M9GDQaCnYB69pq7Jk3TWs4a6DgFb8mdpuiheVvJhCW8CCf+3DsJ
+hwuZwAKpUWGvbkWWsDqn
+=g84p
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qthelp/metadata.xml b/dev-qt/qthelp/metadata.xml
index 3f6401cf4223..3c78bba70f89 100644
--- a/dev-qt/qthelp/metadata.xml
+++ b/dev-qt/qthelp/metadata.xml
@@ -10,6 +10,6 @@
 	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
-		<doc>http://qt-project.org/doc/</doc>
+		<doc>http://doc.qt.io/</doc>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-qt/qthelp/qthelp-5.4.1.ebuild b/dev-qt/qthelp/qthelp-5.4.2.ebuild
index 2ac7d032d883..db370eb717d9 100644
--- a/dev-qt/qthelp/qthelp-5.4.1.ebuild
+++ b/dev-qt/qthelp/qthelp-5.4.2.ebuild
@@ -1,29 +1,25 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qthelp/qthelp-5.4.1.ebuild,v 1.3 2015/05/16 10:30:22 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qthelp/qthelp-5.4.2.ebuild,v 1.1 2015/06/17 15:21:16 pesa Exp $
 
 EAPI=5
-
 QT5_MODULE="qttools"
-
 inherit qt5-build
 
 DESCRIPTION="The Help module for the Qt5 framework"
 
-if [[ ${QT5_BUILD_TYPE} == live ]]; then
-	KEYWORDS="~ppc64"
-else
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
 fi
 
 IUSE=""
 
 DEPEND="
-	>=dev-qt/qtcore-${PV}:5[debug=]
-	>=dev-qt/qtgui-${PV}:5[debug=]
-	>=dev-qt/qtnetwork-${PV}:5[debug=]
-	>=dev-qt/qtsql-${PV}:5[debug=,sqlite]
-	>=dev-qt/qtwidgets-${PV}:5[debug=]
+	>=dev-qt/qtcore-${PV}:5
+	>=dev-qt/qtgui-${PV}:5
+	>=dev-qt/qtnetwork-${PV}:5
+	>=dev-qt/qtsql-${PV}:5[sqlite]
+	>=dev-qt/qtwidgets-${PV}:5
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-qt/qtimageformats/ChangeLog b/dev-qt/qtimageformats/ChangeLog
index 0c7dc75bde4a..3d8b0421674e 100644
--- a/dev-qt/qtimageformats/ChangeLog
+++ b/dev-qt/qtimageformats/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-qt/qtimageformats
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtimageformats/ChangeLog,v 1.11 2015/05/16 10:49:31 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtimageformats/ChangeLog,v 1.12 2015/06/17 15:21:23 pesa Exp $
+
+*qtimageformats-5.4.2 (17 Jun 2015)
+
+  17 Jun 2015; Davide Pesavento <pesa@gentoo.org> +qtimageformats-5.4.2.ebuild,
+  -qtimageformats-5.4.1.ebuild, metadata.xml:
+  Version bump.
 
   16 May 2015; Jeroen Roovers <jer@gentoo.org> qtimageformats-5.4.1.ebuild:
   Mark ~ppc64 too.
diff --git a/dev-qt/qtimageformats/Manifest b/dev-qt/qtimageformats/Manifest
index d87011e675a2..9bd65725feac 100644
--- a/dev-qt/qtimageformats/Manifest
+++ b/dev-qt/qtimageformats/Manifest
@@ -1,14 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST qtimageformats-opensource-src-5.4.1.tar.xz 2108976 SHA256 3f6c5bb568ebbee24700c439a60b2e512026dfee5be896c846e4f289cc5b846f SHA512 5feef279c6c9683a55fe401e7221f1fc91557028751b603c2051f08757f758a48f3f8294847e473d20599bf9bcdad355eecbd9fa7a2bb7fd5cdf79f4fee49120 WHIRLPOOL 2d78fc5c4b345fa4e7cd559feae50a6e73bf536ef42f0269511ceb7fc3a0c83cc49b19f1dedd8abf03a7378a33de0b7dc2af759cf6369b8322ed973a030cc31c
-EBUILD qtimageformats-5.4.1.ebuild 622 SHA256 0351c34fd244593dd8cfe33534347c6398a981e1ab74da1ce341a9a9498e6bde SHA512 354c1f76325654bcb852b0696911abca811256f974500b6c11f585e4b1b63abb46a4e41eef8063d37c56bb65c8a55297f2936346ef718cc2c95d71e666baec50 WHIRLPOOL f54bb0fcbfd2077f4780d715ff563a2407664a86688e7a0f79a55b9d670b3c50e7641bbba65f0f0c5e5e4b56c7237f8a4eba9a03b86d8562423782810802a1da
-MISC ChangeLog 1568 SHA256 f183066b81a17c2eae4901f161ddcc2c0961fc039b11865670e50f8dd66ac367 SHA512 3615a39a43e9bf674793d54c2abcbd9ffbb04dd326377fdd56bc6807cbf45178702ef30c9b6946d2313a6ebd15d90e2d5070d3674120098efc55f08e35a62062 WHIRLPOOL bc90b1c41b7f66c73e2a2081cac64ae0570678da75ec450ebcd99a14bbc824bce1c07ccbb2f52fcf0514ad46eb078ba4f27aac07a5503831f132cffe3163b27f
-MISC metadata.xml 268 SHA256 0976b0efa573f782c96382e8f40ec82944c66ed52a89ebe6b0e905050f01395d SHA512 73ef5d7a382915e844a0cf7f1f05ae64c88500ecffe13265d156960b498ae61a62f29c9789330e5f24c82ddbf3a9ebb98aeff5c4cb0e69af1e8f07099791b806 WHIRLPOOL 19922570bea256c44d78d6f92ef9781be4c177580bb4235d8620139c6cfd759df64fc82f053a685d70fa1378b0fd6f49bb818d393b19105e6069730e9cf44e52
+DIST qtimageformats-opensource-src-5.4.2.tar.xz 2108112 SHA256 8b2b25a29259bc991351fc88d07340d481dfb2cbb450be831d31977a9334deda SHA512 8c0531cc981dc36c88cc420ae5ea9e069ffc217fd3ea3745e6956cf547e17ec8fb244ce2df1735b8b6b750da1f70925956dbded457f8c7f820db53837efbaff0 WHIRLPOOL e183c8c83d66bded1b884a005f4297e665e827512430a0681f615f0fa31abaffa216903be9afb21a6a792317b8a4f1635f332d821a667b6d2092870ea5fde67c
+EBUILD qtimageformats-5.4.2.ebuild 585 SHA256 4ec14521a7d61867b5b441312cc975f4ceaa3451f6a6b56d4c3483f6f886d87b SHA512 8fad89514a773665904749b16a53c4aadb29a3934b9e8eac19f300e26df95d43a7b698605ee5c310281365d204e0d923935a903f1eb390d88c119ebef10e5a4e WHIRLPOOL 355ad6155f8f73abf836e9753a4dc70c73bcb2385225ba1b0261d9e716cb31585fa05f08a4afa21960994396d2a8e609fe2f3bacd6576af9e43738ac3e8221bb
+MISC ChangeLog 1749 SHA256 4e55dbf10e8820237f665b0d64ef54dbfba3f5b191e0be6a5531e6778eca9b7f SHA512 a6f41a38717dc743cbfb29dd6805b9a66e6edb7b0da89d9f5027bd311377d664080b5a638fc7a2d5b95ca635b70cce084fef9f8e329f6319a95202c5c1f17f26 WHIRLPOOL 40509410409b1f455bbd2c201449a5cac9edcbf734de1ce1b1f57a9f734571731881db365d7da6e8febcfcaab34ae2539bfac2c37c0f3d0077dc117dad5993fa
+MISC metadata.xml 259 SHA256 da0ed92b6766281315367c03378c1935b4e9fa82f840641d9c72b00a1b038646 SHA512 1fca930f71c109412ead8932e0910f6c2b1991a454b03ddef6dda7101358db65b3c6da5eb7f71c918673fd3b9b0ac0397cef0dd24c85f84f2043e3ca8e21dda1 WHIRLPOOL 484f50be685ae8a8a65889a66edf2a6d544e0c6758a8f384bafd7e8f1cc23c4e788613d39febc67f1fc6f99e9e7541881f6224e07497ab0ca031449053b5e13b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlVXILwACgkQVWmRsqeSphOA7ACdHokRy18H3jH+z09Wdpkpk59t
-b+8AnipvjV77r5NiX9KCrDAAPdJIDOlY
-=yyfj
+iQJ8BAEBCABmBQJVgZB0XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9O8AP/0NiEdtX1l6KwNRSSIprp+5q
+4Qo1NiSXKJ6RiwpccMly9e/IthIP7/6x1HTT5ytIAbRXwraR93A4jSI3FVQZ+ZS3
+IFn+FaXMDMqv/nDe8EKducflVP17i9wI8i5W9anzwoD9Q4vWR0gvFdGwf2EEcCiN
+LQSPCA8QzaJnUBAmz26b1gOsUDZmV0kHrNhhqBmqJqbohLhppdAVvuJ0/e0YOUfp
+AAttY8B9wQoVjPNFKf3J4fxqRVsbRPUUYFzoj1J60ptC4W03NAIgMTF4MWf/ALVX
+n/1f6BUf6eFwUF9IpkYQDXe0D513pkJ1HMKFBt19Hv2o7s/gP9GFVb+HFmdIEZi5
+fVJ4UvPz2YBg1G5TRXYuITk5i4Ga3nEU1Yb11XJysgWr7Lrrv0pMeh4gZSXuhPpY
+r/8uNz2wOY/Xpk4P4BFuVz6Wuegbl2C4QLqxV7WpPLRSgZwXEWUdplwrpT03p4WY
+xNi74Zbs/3z3A/LT3p06BZiUnuwOdERgTo6TWz+JBFG12kwTrqq8owmxsAj5PysF
+iB3LgfuVvKaNbTNTBQRZg69W6IP9w6cezedbi7qwr2aBY0KO1VS/RCdAYRQIs2Eg
+Vs7VrKPLXf81cETFjc9V35WpZQHCfS47aBu1sohG5bUk5nfhyX1TvfQnUUchqSBe
+QhvMD5otQ1GPTufVSzBV
+=bwvz
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtimageformats/metadata.xml b/dev-qt/qtimageformats/metadata.xml
index 39c63597e531..afb3b434585b 100644
--- a/dev-qt/qtimageformats/metadata.xml
+++ b/dev-qt/qtimageformats/metadata.xml
@@ -4,6 +4,6 @@
 	<herd>qt</herd>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
-		<doc>http://qt-project.org/doc/</doc>
+		<doc>http://doc.qt.io/</doc>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-qt/qtimageformats/qtimageformats-5.4.1.ebuild b/dev-qt/qtimageformats/qtimageformats-5.4.2.ebuild
index bfa9c17b8124..b6ffafd53a16 100644
--- a/dev-qt/qtimageformats/qtimageformats-5.4.1.ebuild
+++ b/dev-qt/qtimageformats/qtimageformats-5.4.2.ebuild
@@ -1,24 +1,21 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtimageformats/qtimageformats-5.4.1.ebuild,v 1.3 2015/05/16 10:49:31 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtimageformats/qtimageformats-5.4.2.ebuild,v 1.1 2015/06/17 15:21:23 pesa Exp $
 
 EAPI=5
-
 inherit qt5-build
 
 DESCRIPTION="Additional format plugins for the Qt image I/O system"
 
-if [[ ${QT5_BUILD_TYPE} == live ]]; then
-	KEYWORDS="~ppc64"
-else
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
 fi
 
 IUSE=""
 
 DEPEND="
-	>=dev-qt/qtcore-${PV}:5[debug=]
-	>=dev-qt/qtgui-${PV}:5[debug=]
+	>=dev-qt/qtcore-${PV}:5
+	>=dev-qt/qtgui-${PV}:5
 	media-libs/jasper
 	media-libs/libmng:=
 	media-libs/libwebp:=
diff --git a/dev-qt/qtmultimedia/ChangeLog b/dev-qt/qtmultimedia/ChangeLog
index 4657b7aeff0b..2efabfdf7613 100644
--- a/dev-qt/qtmultimedia/ChangeLog
+++ b/dev-qt/qtmultimedia/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-qt/qtmultimedia
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtmultimedia/ChangeLog,v 1.30 2015/05/30 11:06:09 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtmultimedia/ChangeLog,v 1.31 2015/06/17 15:21:33 pesa Exp $
+
+*qtmultimedia-5.4.2 (17 Jun 2015)
+
+  17 Jun 2015; Davide Pesavento <pesa@gentoo.org> +qtmultimedia-5.4.2.ebuild,
+  -qtmultimedia-5.4.1.ebuild, metadata.xml:
+  Version bump.
 
   30 May 2015; Markus Meier <maekke@gentoo.org> qtmultimedia-4.8.6-r1.ebuild:
   arm stable, bug #530238
diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest
index e1f08fd69136..82b3c1255f4a 100644
--- a/dev-qt/qtmultimedia/Manifest
+++ b/dev-qt/qtmultimedia/Manifest
@@ -5,17 +5,29 @@ AUX qtmultimedia-4.8.0-alsa.patch 2155 SHA256 49a54bd39627b1070b106519cdff1fe33a
 DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357
 DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2
-DIST qtmultimedia-opensource-src-5.4.1.tar.xz 3184784 SHA256 3830dd4a11727cc4a3ab32dc10e4cd016739d0b1b0c59685512853e10f1e534e SHA512 b4a71c86c6a4978509c04bd733fb7c911f3bf309765b726462f9d00ca7a6e3304e80c53b3beb4ffe4c53f53691121e092408142618cac80e1abd6b0106552d28 WHIRLPOOL a462f57827f45cb7078207826ddc0f7fefedc151f47865691129a759b970729a9fd61582212a9211b01583c0c3b94a03afdecc3aae39c59fa6bb51ae4adfa814
+DIST qtmultimedia-opensource-src-5.4.2.tar.xz 3407336 SHA256 d2668c7922412344384482239d34bee66d8ebb6d9fa9d025cc4a5aa990664940 SHA512 8d8757ff9d9d736618cc57e0872722668b6f2455ec194a700dc03a352a9bfbe90135f06fe05f3aeed2981d837b6c9cc338a8d6cc25f5f253016499244ca873d2 WHIRLPOOL 8bcda95d8aba5760a8270d90a46482cb023ec15d7bfcaf4c33591037a5353b8f3d3d3177aa2e794163c48ee571ac98679c3c3e166e91d14eecb0f28a267d529f
 EBUILD qtmultimedia-4.8.5.ebuild 1515 SHA256 a1386a7472171b861981f04e7c484cce090a87efd5c08d73557135bb03e50067 SHA512 6f5d7ac5d7f90c1eac874b286d4fee243caf5456b8ca1b989c4e2ba77fb4816cc85d7dc28f6071eb2cebc651ef3f708dd8b918dc5346d24944cdd0a98230703e WHIRLPOOL 3be8a10021a17b8022e446409f6022e27d47b6edd0e765871f5b9e5c194fb2c9ae6ba3c26262beb82f553c37a908346ee255fc121db026b1eaaa7e59b319364f
 EBUILD qtmultimedia-4.8.6-r1.ebuild 1407 SHA256 74d6158b08e335da2c911973f59739b428300e047f3f6024bf7928ba7ae56b8e SHA512 6f373507dc528abd7b9b075d6b39ef0250a70e58f4f769d1138bf6f3f4466b688cecbc253e11ff1ee3e2497a6ef46dfcc911c7568bdd4ceae06df7d0f1474f8f WHIRLPOOL f72e6b2cd9cd4e0849f1b0d5d58f9aaca463f9c0379800e4cef1a4ed709503dc947a4384ebc9c002a46197ae01a471e25a19bb42bc647ba7626db93c295845c5
 EBUILD qtmultimedia-4.8.7.ebuild 1378 SHA256 2115ddbb3d4d1af765df1ca19416d0bfde1be6beac2d430e675aa0acb7fddf76 SHA512 2e46c6a4ae6269e639c9dfd59248d0b3c8cbc8d3f734880bc3e12c6b09d0d127bb6f083db14b2e4a6597cb4ccfa793d28c09403d7b1876d5e6614672d66e6c6c WHIRLPOOL 851678e341dd070ac78933aa192564b2ed2fab3c3fd0d99bc2bf52069d30c593c2774d4fdb620f84124e14fda3165504967fe3426505e0402cdeb3e05ce6778b
-EBUILD qtmultimedia-5.4.1.ebuild 1532 SHA256 93ce3da5534f1ff0611b3e00a305ad1551abe13bfc67f2a83989d6cfab9f1c65 SHA512 4b3a9791b3757b05f59ce737ceb68b4edffd791fb8722cac89cf973918778f0b90bdf7b95d50c5cb6a9d91951dad5fe141a7a3ed035ee600d25643c8546940ac WHIRLPOOL bd6d2e4aedc51d20b2943c20b69702a5e29e03950b92544841733a1527491ee6f1ee0ae2598aad6793a2486dd0e347f299b333360156db37559c00e6c2cf4922
-MISC ChangeLog 13119 SHA256 5a873c4e056a7a13eeaa648ac8a3a2584c18928c85c44807132e1a733b210ee4 SHA512 567ce2772934b0c0f5169e2180018665e0834c8d2b6a0216a1fdb55b156631fd75caa9b48e6509cdb832345f2c834ed1e9392285849dec73ec12d3d77e69d393 WHIRLPOOL 837a5a306e03cc4737e3c1e528fd70fc0ce7194631ac6737b1edd786137a91cb3acd9ddef0084dedb7b05a86ded6b5327bb7bd0b0d2cf781f8d15b23a903c0dd
-MISC metadata.xml 547 SHA256 18ec86464a544c7e119b97d7ef40c216998e2f7ee3dbac9ccbfadd5bec801d75 SHA512 c657463a3ac93b9c57d403ca68a71fbd8aedaaa81a3da7a685018aef0d39b6780f7755c3af4b82a2d7c68280ded66510b728d29ce10ca1e83119d3314f22422c WHIRLPOOL bdeb48c61775aa2aaf8e0baf3cafd0765b7e656e6b4058b3ec23bd559c32582776c4c5920e312e30e2be1257c25fc75b4c6aebb797bc0802c3c9087fd72c7f8a
+EBUILD qtmultimedia-5.4.2.ebuild 1350 SHA256 041be5ce862c9130aa167818bd44f48589119884e6608a279594b96b31f9e6bd SHA512 55aa8123d48283bc7a623c631ab81a5e2dca5003de63615f0a3b662933adc9a58d613fbff588ff0dd77744858691c42abc03c785aaf92170f268f74419594a46 WHIRLPOOL ccd7805b490c5ab282bcc5fa14ea2172bd66936c9789839066bab4c4b9a73b64c7d4e5c3f615703ef70e344456101191d59654e6b461c036659c48ebb4f5c7e5
+MISC ChangeLog 13291 SHA256 27aa48a63f59015a4fd3ac3b49866e28bf9a4091e44163fbb32013b2fe587b19 SHA512 660f05a9603f12a250cca7252d19b87189635cc638d9c6d16c14383f682edf76f53bc238560040d473b5bdca639f471990cb4df388c296ac56f1e3cac1ebacdd WHIRLPOOL 46a8d4d0abcb4c6a39f2dd02019d06db9e06a5681cc812f908ad27cc02d2a583e91b7aff2f71e5cec0719f51b9fdb86ba255ba0cc68ec2d18cd56d1fa8a32575
+MISC metadata.xml 538 SHA256 ab99738a6b9fe51b40ade897728d65e25832b1c23cc1fa1487bb5a52ae31a6c7 SHA512 3184aff34804858095b809dc1b5f75fdd5af0909cf28d9a2892e7158cb0c0c8b582932c3048304b52303e8cc81e105123d4eb0cabf37894a53ce9eb39d57f5e3 WHIRLPOOL 0f85bae3f7af461e16dee4a7b4ad9996cf3bdf3fe6723277554020ae340b288a1bad9d6766606869f658f75270ff9cf168a0c4149d471eacf4dcf8ecc2ebce7f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlVpmaIACgkQkKaRLQcq0GJgFACgmon1hSbbpLTiLLCfMgGGShYr
-cO0An0WUkrW7FB3Z5n1D7Y0F1BiVzIH0
-=5IRv
+iQJ8BAEBCABmBQJVgZB/XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9mOcQAI5PtbBcAPSvWd8kCi5XlVx0
+d4l8T4Iz61cnQjDfBxao02AtkcYyInPw4VEyWxO5SPdpalD8t7YNWFxk0jRzT8fi
+nCRunM8SEhDE00VeSsP12bM0M8ezfai5vLkAUD3qZKOS8IzdhVrOfjIxdgkcCLHY
+4rqzHf0Iol7D7lLFpH3++VcuV6OQN/Lnmzx3hftSA8jLrbzdJEckCI3Td3LeANgg
+eUpt6uHsiFe1vo823KOfoJzcJFoXulRnkCDFZJcUutGqY5mTc37w1swWsEi1S2sS
+x+OItgMqdFWwg0fSeE+H6VqWEYzQd5e/eiBt7z+ujwGIENqH9uwUulchNjPwe0rG
+KBJumfiWjPY7MhYlHpBBnOPS4iYC8jX56i42uyaCKpq+Q9verhBd7675M+LaboZE
+XmbYr9q5yrtReoDRFNZ9GHAOsj3HTGPTTYDEAgI/DzZNr+JuT7Ji3n2Xm9Tm3MoK
+c6uVFmb2gc4rR3EXyvhRdASA3FoO60b6/RLfiRQpCGswwoMsyg7nywyNXNRqe/uO
+jk16+TizoVrG8/z6UtePRKEDq01GGBeOo88kNma6RUXIzY6LYkNCstdFppDNXgaY
+248EpiJyKlG1hdi4itBIdM2Wpws494jY4ysS7z1ugCzLgNxO1fW3bNh/t0gZ+RWW
+DlicY7crjzOCi5FAt6MS
+=LvQ4
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtmultimedia/metadata.xml b/dev-qt/qtmultimedia/metadata.xml
index 0f8335216376..b408e5c69af4 100644
--- a/dev-qt/qtmultimedia/metadata.xml
+++ b/dev-qt/qtmultimedia/metadata.xml
@@ -10,6 +10,6 @@
 	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
-		<doc>http://qt-project.org/doc/</doc>
+		<doc>http://doc.qt.io/</doc>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.4.1.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.4.2.ebuild
index 3847a9b3a543..12524c806962 100644
--- a/dev-qt/qtmultimedia/qtmultimedia-5.4.1.ebuild
+++ b/dev-qt/qtmultimedia/qtmultimedia-5.4.2.ebuild
@@ -1,26 +1,22 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtmultimedia/qtmultimedia-5.4.1.ebuild,v 1.3 2015/05/16 10:38:55 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtmultimedia/qtmultimedia-5.4.2.ebuild,v 1.1 2015/06/17 15:21:33 pesa Exp $
 
 EAPI=5
-
 inherit qt5-build
 
 DESCRIPTION="The Multimedia module for the Qt5 framework"
 
-if [[ ${QT5_BUILD_TYPE} == live ]]; then
-	KEYWORDS="~ppc64"
-else
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
 fi
 
 IUSE="alsa +gstreamer openal +opengl pulseaudio qml widgets"
 
-# "widgets? ( qtgui[opengl=] )" because of bug 518542 comment 2
 RDEPEND="
-	>=dev-qt/qtcore-${PV}:5[debug=]
-	>=dev-qt/qtgui-${PV}:5[debug=]
-	>=dev-qt/qtnetwork-${PV}:5[debug=]
+	>=dev-qt/qtcore-${PV}:5
+	>=dev-qt/qtgui-${PV}:5
+	>=dev-qt/qtnetwork-${PV}:5
 	alsa? ( media-libs/alsa-lib )
 	gstreamer? (
 		media-libs/gstreamer:0.10
@@ -29,13 +25,12 @@ RDEPEND="
 	)
 	pulseaudio? ( media-sound/pulseaudio )
 	qml? (
-		>=dev-qt/qtdeclarative-${PV}:5[debug=]
+		>=dev-qt/qtdeclarative-${PV}:5
 		openal? ( media-libs/openal )
 	)
 	widgets? (
-		>=dev-qt/qtgui-${PV}:5[debug=,opengl=]
-		>=dev-qt/qtwidgets-${PV}:5[debug=,opengl=]
-		opengl? ( >=dev-qt/qtopengl-${PV}:5[debug=] )
+		>=dev-qt/qtwidgets-${PV}:5
+		opengl? ( >=dev-qt/qtopengl-${PV}:5 )
 	)
 "
 DEPEND="${RDEPEND}
diff --git a/dev-qt/qtnetwork/ChangeLog b/dev-qt/qtnetwork/ChangeLog
index c2737088d1a1..25f1a14baed8 100644
--- a/dev-qt/qtnetwork/ChangeLog
+++ b/dev-qt/qtnetwork/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-qt/qtnetwork
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtnetwork/ChangeLog,v 1.17 2015/05/16 10:20:07 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtnetwork/ChangeLog,v 1.18 2015/06/17 15:21:41 pesa Exp $
+
+*qtnetwork-5.4.2 (17 Jun 2015)
+
+  17 Jun 2015; Davide Pesavento <pesa@gentoo.org> +qtnetwork-5.4.2.ebuild,
+  -qtnetwork-5.4.1.ebuild, metadata.xml:
+  Version bump.
 
   16 May 2015; Jeroen Roovers <jer@gentoo.org> qtnetwork-5.4.1.ebuild:
   Mark ~ppc64 too.
diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest
index e2a1f219f13a..536e23a14da9 100644
--- a/dev-qt/qtnetwork/Manifest
+++ b/dev-qt/qtnetwork/Manifest
@@ -1,14 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST qtbase-opensource-src-5.4.1.tar.xz 46132220 SHA256 8574a593830959c0f7e5430fe77a43832ea7f5299e14a397a74576b3df7fb1b7 SHA512 75d2c16bc47e6403e15c4094f50757157960cff4434de29f199b015795ba772b62125f01c09aceb2a06f8dfcfc4df8e35330259c76959239f276e2f5bd5221b5 WHIRLPOOL 48d9a583ba9d0bbfffdbfeaa2412e77a0bf4011e7bba525129ba4572faa6a55713a89cb00f4ed7f24e6782e3f7b8b48cb192e2c082b7dcb3c35a85109f2eb340
-EBUILD qtnetwork-5.4.1.ebuild 1249 SHA256 e626a74fec5580fbb821619ab841a68cff05189a4fd9c8f54646b5f5653c25c5 SHA512 cd0a5a19f7dea439113e0ddb4f6620ca12f741fa47151d0e2b4c57ad4a0551fef231c464d87ca7aea0c9d8e6f460d649fb30675d32cc98a447ca78c552783bd9 WHIRLPOOL 4623b7b8cadb7a4c1bc5b24d8e7b05cd9ae4f81e0094161e0ef7eb0aa58c97d45f9bdf6b3508d55bdc7231ef0081b41bb44b3ac4b9ead4cec7ee6fd5108a69ea
-MISC ChangeLog 1978 SHA256 b36e169e6df14a737f8938c2248b107165b13071f04a51455fa1442654fc4358 SHA512 78791aee8adb96a60ccc05608f14a540b9d2059fca6cfffbe29908eb48ff29343200c1d8d5e7bc160c42029e21c8daebb5c7a96af1f46620306d5abc56ba207d WHIRLPOOL 06f4dfbe3eab04f1b8a3863d308ce099918bd96e86e808144b61283c6160542f640af02eb51178d7601028ea5211a79d3dff7d0516b1f92960278f84a9d2fa76
-MISC metadata.xml 551 SHA256 9c7cbd328665053dbaa7413c7f88115de6f8470243e1dbfdf9ae39b5ac3b5df4 SHA512 e7a1721db202c7ec0b7dee7e3f2e49719fe89fc9bd3c85a4586cbec9dd6823e4344e64a3ef40c7203f1bbc1e67e8e881857f44edcb1880d5a3c970c84bd96c16 WHIRLPOOL 54af70162a44b6f3e7fab09b01d88d83c17c77e977b3592944d2bdb0335a03fbdaf35ec19697fe014456cc6e4de0db09310456338ac8f7d5e5890029f8ed99d8
+DIST qtbase-opensource-src-5.4.2.tar.xz 46354192 SHA256 9fc4f720b8b5a8b8e4a7d45e13ce4d5b86756ad46fb406386637eb2de5fd5a74 SHA512 029da83969614bc9b3803c76242af62911e3c6de171b116b5cb8e2823cad0514ab705cc3fa331e042c679caeb099de4e9cd7ddea92959f675dda82533e3ad7fe WHIRLPOOL 5f352f78a779c5d042f04966a010b10af706c4db94976870721a550e3ab7eaf2695b3582c86cdcc3a11de36283e11fe65797f96e59df96fa367b16b72b5f9213
+EBUILD qtnetwork-5.4.2.ebuild 1211 SHA256 7f1d6188f7593737ccafe99a13efbe5e1641f95ed98040b393dd848ed86b8cd3 SHA512 03c43bc57c5327758211701ee461af61eb4ed1eed15432900a0d4ce380e6a8bf28e9b0205202adda09b2615893f48971cffb0db883fe300083608c8449e94311 WHIRLPOOL 41a49c8769801a33dfb445e4b9083f242af8828421c13866cbd38f09e65cb22ca30e72f965b8d83356d8307b636e5f0f0ff23e77be71fb885b2f26d3c30af6ad
+MISC ChangeLog 2144 SHA256 7a645f7bc2fc60d96d9cb8eaa99415f2f52424b237962f31aab15211fea0694f SHA512 e5d35035b9fed93fe83ba7cc585d5a95b61958e5bd5351d7c67c952a392594e2bb21720e15cd1d2b43753fff339d74b248c550891ff82c3a506f2653a49d6c02 WHIRLPOOL 44554447b65fb2176788457da63400d64ada180bc9bcc554fef317a1740eb86824db2dce58e7690a4c4095daf914146869107a043607de3a6b099102ff96d4ed
+MISC metadata.xml 542 SHA256 723cc03b47e56637470d231ad01831a12e9cdafc4bef0d58483bc2d0159fe9ab SHA512 23df9ca49ca18f1df7b91be0a99530121df34cc2c13989f2b05cbd490c88843e52fc7b50b4949c5aae25a9242585d8b4fb3f9535c24163c76229c1a19f591055 WHIRLPOOL ec2d4a4c2ad96a917e5f585b0aebce651fa1d6b2ebdb6e77cdc1a08a64dfbbf3ea80422108dd73801cceb88df7a1a56d6bd54ed73c08fa2ddf0fdfbdce9599aa
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlVXGdgACgkQVWmRsqeSphNDewCfcfwcQH79ZIQ9I+GMkye+V1n7
-+mMAnjB64eJU0yl8rtvxsyhzUApbSPWc
-=aE7G
+iQJ8BAEBCABmBQJVgZCGXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV949MQAJR4eeQiLlqiDBQ4Ndat/Muq
+BihDHuDpjp4N2CYmzjfDCXwvUR2399o4nLEqhtFSJiBmvEDrVSwVMNliA8BxpqDI
+ojsqu3cOJQr3EiNKWbIiI/cPk95d5KTFtt9a7Wkdf9mlYzlzxFNwSVkQqi0YfeZR
+HfQ380pWe+blV3WH5+QdLV2G4bGEn9ba+yghtRtHFu2gg6yxHTWUttKy+QO/ba3q
+V1CmpGL5ie+tU1sV+t2D05iREQGHEZqVEOoJUrQH0ObT6/jsNbtFW+zLGVN/ilJ4
+840/bEZI/2zU8sxpw+3ovDXkDNrirGLbYu1J6x3DVGUIJRDhwHNPa5LLohVkp9wz
+VHv8PDEyM5Ki7OiUkr9nLRjcXk3WIlYdfHxN0iD9P3JPV94PY4VFEvYamxe8viTH
+UlLsTpSoz+7aesRhJhcWteePXfGSBeQ9WXgax3ICWJ4aSlvlFlfsuwditAlFSIRJ
+oiZIWXHTBD7RIXHd9NMr7Fj+ndv37LPyG6E0uO5vMURE28X2Y8dYKyzK69Vr2lNb
+lX2M3RbbIV8UywN1Stesl4tWztFKg50lmqCdlIBTUEoYDJTetwQTfpmsCJXsv0I6
+Ffxd+dg1khu5u3PQ1a0t/LlY+Jlqi0KGZRwfWjMoQEV6xieVp5ZPBfzJUuqhoMpZ
+C3h4Hxwrja41kPfeqxdE
+=NuEq
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtnetwork/metadata.xml b/dev-qt/qtnetwork/metadata.xml
index fb2f58fe451b..371b3c0d935a 100644
--- a/dev-qt/qtnetwork/metadata.xml
+++ b/dev-qt/qtnetwork/metadata.xml
@@ -10,6 +10,6 @@
 	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
-		<doc>http://qt-project.org/doc/</doc>
+		<doc>http://doc.qt.io/</doc>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-qt/qtnetwork/qtnetwork-5.4.1.ebuild b/dev-qt/qtnetwork/qtnetwork-5.4.2.ebuild
index 6cc0fe4473b3..091183e3d6fe 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.4.1.ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.4.2.ebuild
@@ -1,28 +1,24 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtnetwork/qtnetwork-5.4.1.ebuild,v 1.5 2015/05/16 10:20:07 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtnetwork/qtnetwork-5.4.2.ebuild,v 1.1 2015/06/17 15:21:41 pesa Exp $
 
 EAPI=5
-
 QT5_MODULE="qtbase"
-
 inherit qt5-build
 
 DESCRIPTION="Network abstraction library for the Qt5 framework"
 
-if [[ ${QT5_BUILD_TYPE} == live ]]; then
-	KEYWORDS="~ppc64"
-else
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
 fi
 
 IUSE="bindist connman networkmanager +ssl"
 
 DEPEND="
-	~dev-qt/qtcore-${PV}[debug=]
-	sys-libs/zlib
-	connman? ( ~dev-qt/qtdbus-${PV}[debug=] )
-	networkmanager? ( ~dev-qt/qtdbus-${PV}[debug=] )
+	~dev-qt/qtcore-${PV}
+	>=sys-libs/zlib-1.2.5
+	connman? ( ~dev-qt/qtdbus-${PV} )
+	networkmanager? ( ~dev-qt/qtdbus-${PV} )
 	ssl? ( dev-libs/openssl:0[bindist=] )
 "
 RDEPEND="${DEPEND}
diff --git a/dev-qt/qtopengl/ChangeLog b/dev-qt/qtopengl/ChangeLog
index 4fbbc95380a9..edf65d83c733 100644
--- a/dev-qt/qtopengl/ChangeLog
+++ b/dev-qt/qtopengl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-qt/qtopengl
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtopengl/ChangeLog,v 1.33 2015/05/30 10:59:39 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtopengl/ChangeLog,v 1.34 2015/06/17 15:21:54 pesa Exp $
+
+*qtopengl-5.4.2 (17 Jun 2015)
+
+  17 Jun 2015; Davide Pesavento <pesa@gentoo.org> +qtopengl-5.4.2.ebuild,
+  -qtopengl-5.4.1.ebuild, metadata.xml:
+  Version bump.
 
   30 May 2015; Markus Meier <maekke@gentoo.org> qtopengl-4.8.6-r1.ebuild:
   arm stable, bug #530238
diff --git a/dev-qt/qtopengl/Manifest b/dev-qt/qtopengl/Manifest
index 672c62862e85..937c2893fd86 100644
--- a/dev-qt/qtopengl/Manifest
+++ b/dev-qt/qtopengl/Manifest
@@ -4,17 +4,29 @@ Hash: SHA256
 DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357
 DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2
-DIST qtbase-opensource-src-5.4.1.tar.xz 46132220 SHA256 8574a593830959c0f7e5430fe77a43832ea7f5299e14a397a74576b3df7fb1b7 SHA512 75d2c16bc47e6403e15c4094f50757157960cff4434de29f199b015795ba772b62125f01c09aceb2a06f8dfcfc4df8e35330259c76959239f276e2f5bd5221b5 WHIRLPOOL 48d9a583ba9d0bbfffdbfeaa2412e77a0bf4011e7bba525129ba4572faa6a55713a89cb00f4ed7f24e6782e3f7b8b48cb192e2c082b7dcb3c35a85109f2eb340
+DIST qtbase-opensource-src-5.4.2.tar.xz 46354192 SHA256 9fc4f720b8b5a8b8e4a7d45e13ce4d5b86756ad46fb406386637eb2de5fd5a74 SHA512 029da83969614bc9b3803c76242af62911e3c6de171b116b5cb8e2823cad0514ab705cc3fa331e042c679caeb099de4e9cd7ddea92959f675dda82533e3ad7fe WHIRLPOOL 5f352f78a779c5d042f04966a010b10af706c4db94976870721a550e3ab7eaf2695b3582c86cdcc3a11de36283e11fe65797f96e59df96fa367b16b72b5f9213
 EBUILD qtopengl-4.8.5.ebuild 1433 SHA256 75d5b483dfe2fe09532a61ffe907760f9e7bdeb56750a852bded1135f88f185c SHA512 7e99694d0c783e70e9bbc001a6ce9703a6cc838c1960f7ec9eea0966347778061770db091556e7100326653062d1846fb9b31b3e352ada1bedee6814b6aa5fa2 WHIRLPOOL 71211727da94a51a8ce3a3c06b70ed23a1b92ee21d52c6a13f4368083dd052479f07c420a620b4e5d5e9e58f037438f720c8a6f55631b781cc82104c5560808c
 EBUILD qtopengl-4.8.6-r1.ebuild 1334 SHA256 b1503a00439e23ad897eb3b709d7b4776c8da6a1a3c774298316a58af771c21b SHA512 e823fbd9ece2eed9aba4914712e3cd50883861070682ca214710ae67c27898fd2ac0b7a9a8ace2da428b3ae52889ad5983b86e8e8247d2bc66f9c8ac237e636f WHIRLPOOL 5c77b565430f674951c5c96d2ca6aab6c37e451e1676a27f116abfe1e79c55e6751a6d75ad75ec9632f4192b81eac03ff65661971188d50ae4d450f6f554f642
 EBUILD qtopengl-4.8.7.ebuild 1301 SHA256 4b6c672e7c46644f4d5e47f0a2d37475abb902e2a27baba53426bd1bce77e490 SHA512 754dfd4130258b1cfc59efe2d2b28cc077426471961842c85410a43ca5d84c255fac33fab1fd1286034efe5bbbeffe5eced7a61e714bc0f0d85f5f0b5a03a731 WHIRLPOOL b2c06beb3b1b428d915d8d335942313a121d49808b59fcb64dd1d76ca8f153a5d058b778370161a542724a9af91398c02c5955bbd42c3f5c55468bc2b29662fe
-EBUILD qtopengl-5.4.1.ebuild 799 SHA256 b4efb47e1f064dcfe39f513a46356f6cf334e73a99c097a3266f45a4f7d07b29 SHA512 17f5e0b56739a86589c3d1cba5288e1090217b97026258939094d291c165b195f17ace91c70a18a890c37fedfa090fa135763ad2f65117e2102cfb4ed4e517de WHIRLPOOL 8cbef80fb661b0e66c600b385f6cb4a3f1cf20ab9542f11c63cf5c5cee3c85b54960f222594d48631c51de595654a6803255ba1e9016055335ce088e06f81ce8
-MISC ChangeLog 21121 SHA256 669ba31db814c49c23514dc48100be926e034392add06b8724b7e473ea7d1fa5 SHA512 ef5999fb0e9578cd1dd564cc990ec9e7d960d80d7cf7e655bcff25e3c561f09fef2d308dd8784150a4269309f4ff16de72ce3246952b549f3e9eafede5e3ae07 WHIRLPOOL 05a06350f4efecf6c1a27e013ba140ea2459b20407f32863e9ef85c7ee75ca2fd06627d6a8bdde26ec6044573acfbb5a7dc7d9c95c0c86f9d5d711f55d486067
-MISC metadata.xml 661 SHA256 993865bb2e2970778cc706a28213060d97355cd675bddb08b2f6b7adf5a8e47b SHA512 0dc90d83be6dc63b1fbcb3f3244078367dc85fab5a682161b109c9868d459f066f21f8ef299a8deb16aea5756ba8e3de3304cbb358b7b797ff38aca8b6476415 WHIRLPOOL 94de2980e75c6c8aafae96105efb44eab9331c4b1281f04b4de541bad06f0b1e4e1327eab948f797095954cd1076eda6ea5cddb7b2ca2c4eac4e4ea263aaa60d
+EBUILD qtopengl-5.4.2.ebuild 741 SHA256 1752ea9f599a3f7c07710a45f769e8032f57c12ff3b4f701ae801ffbb01129d0 SHA512 67aa4c2f00bbb964174171dd8799e05b4ccdff942e583adee88574fc78c55d6ff9e5b7ec135ecaa700d3bf2b59ffb23aa37d41779beae9d4ecc23f437bfac9f4 WHIRLPOOL 119b0a0e948ed9efc50ad914758d3714c8443e8f72e883c71f7b93b8f2f8a7799074bc45ca8740597f5c9a28c3ffe3059bfa1a38e220971b248f13266fb0cb9d
+MISC ChangeLog 21281 SHA256 57a6c9e284ca6620aa11a9904e34dbc28ad83f2379843b2a05832b7f5c3e3636 SHA512 e03b0a9105535db8e88f677593b06cb811e252e9b49db944e4d4d23add5395c853b85be8b5e600ff539e66b557c09dc2a9e5c916d798ee343ffc0c6efbf4708d WHIRLPOOL 3ab3c8b276129687c76c478b3564a7185d05d2206c99f0a6ad9fe883d072f1ad5b2fb89143488dc52fb165885a888fc8ff97e24dbab99966855b6eb9dd45d1cd
+MISC metadata.xml 653 SHA256 be617084e2d00cc605dc3b9d077f4935d2a28a2db8e0183a946de097b4d20f7e SHA512 4da6e8e1eb9041f0e13836562f30ad741ecc70eb2bf61c09eb5b2d8bafa73044bea33e4ed8a432372c2eb4dc613b15077170e2203cd4b9de587771859ba96235 WHIRLPOOL 6ddd93e9435381a208bae5195239e6f85c73652d799318d75ad8e1cc617392d36b3239e3f554f111de82ecd3d078369204a50124e37627bdcafd1f8f1c539bea
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlVpmBwACgkQkKaRLQcq0GI+/QCfcduzRQDr+S2TPcljmmHzUMKU
-vlcAn0rRA2jO34+lf/PaCvcZDZKzn+Fv
-=F/s0
+iQJ8BAEBCABmBQJVgZCTXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9bj4P/jpJyjgHJyOSPQeBxf8jcS0z
+NxjODrVWnqfZPGK7+QV3MfYqdgfZvflw/fY+LEVRUyKjCMYsgXuWRzmzB1XS7YUA
+9dL0I9tb2UfW1G1/TZng+Hv1BI3s5Byw/8cLCOwy8hTe3rIf1C8ZggyjJHvvBbu2
+R/nOLm1aWp1uwN+Fpw/AczcNm9kfH1C3VoWF0jdnpzCk+r6pHB0nKYwAgNtl1ZSc
+IsleY6aF21THOWLJUaMwJx6yIbfdXAg6rVsWkC/eKwfVpEwbBGJLDn399FKrPxGl
+MsYZoepQMsyceRtVATktoNIKMp2bYEarTVAUHkXGAX1OigcilMX8iv23sbob7Url
+7VRBofwrkvWEXHlYizMG/HB6Smp89SoYS6lQSWQnRGj/jmSQRayKQyG6wTfU36Sl
+1hf80D34M4JKhpKWuTgnM7vnkxLPNIqXjaC7V++ikYgjO5R8FfSEq+uEqqfwQ+F6
+xuNtr2tem7lyrZVHEZoVyewPgmuvDifOcfqoHjo0f5+Phsh0f24d+SmtezMGVoA8
+p4LsNXPtk71TW4YxWcxtNSncr1/hzCDuZegvhAyIBnF4LVYtG/Mv6u32YWPNGSy5
+o3vLDTRuHpBqavSxhgDfbuGzS99BijRYFYvcb7UwxbMez0wdXmb8sH+t2YUwUwwH
++o59SGBPtXKsDEq/ffyW
+=SOt8
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtopengl/metadata.xml b/dev-qt/qtopengl/metadata.xml
index 8ca6c7a62878..34cefc306941 100644
--- a/dev-qt/qtopengl/metadata.xml
+++ b/dev-qt/qtopengl/metadata.xml
@@ -7,11 +7,11 @@
 			contexts on the desktop</flag>
 		<flag name="exceptions">Add support for exceptions - like catching them
 			inside the event loop (recommended by upstream)</flag>
-		<flag name="gles2">Use OpenGL ES 2.0 instead of desktop OpenGL</flag>
+		<flag name="gles2">Use GLES 2.0 or later instead of full OpenGL</flag>
 		<flag name="qt3support">Enable the Qt3Support libraries for Qt4</flag>
 	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
-		<doc>http://qt-project.org/doc/</doc>
+		<doc>http://doc.qt.io/</doc>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-qt/qtopengl/qtopengl-5.4.1.ebuild b/dev-qt/qtopengl/qtopengl-5.4.2.ebuild
index 7057f16319fb..161ef18cd198 100644
--- a/dev-qt/qtopengl/qtopengl-5.4.1.ebuild
+++ b/dev-qt/qtopengl/qtopengl-5.4.2.ebuild
@@ -1,28 +1,24 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtopengl/qtopengl-5.4.1.ebuild,v 1.4 2015/05/16 10:38:12 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtopengl/qtopengl-5.4.2.ebuild,v 1.1 2015/06/17 15:21:54 pesa Exp $
 
 EAPI=5
-
 QT5_MODULE="qtbase"
 VIRTUALX_REQUIRED="test"
-
 inherit qt5-build
 
 DESCRIPTION="OpenGL support library for the Qt5 framework (deprecated)"
 
-if [[ ${QT5_BUILD_TYPE} == live ]]; then
-	KEYWORDS="~ppc64"
-else
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
 fi
 
 IUSE="gles2"
 
 DEPEND="
-	~dev-qt/qtcore-${PV}[debug=]
-	~dev-qt/qtgui-${PV}[debug=,gles2=,opengl]
-	~dev-qt/qtwidgets-${PV}[debug=,gles2=,opengl]
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}[gles2=]
+	~dev-qt/qtwidgets-${PV}[gles2=]
 	virtual/opengl
 "
 RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtpaths/ChangeLog b/dev-qt/qtpaths/ChangeLog
index 61b8d48fff72..43ed6d9575bc 100644
--- a/dev-qt/qtpaths/ChangeLog
+++ b/dev-qt/qtpaths/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-qt/qtpaths
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtpaths/ChangeLog,v 1.10 2015/05/16 10:50:55 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtpaths/ChangeLog,v 1.11 2015/06/17 15:22:01 pesa Exp $
+
+*qtpaths-5.4.2 (17 Jun 2015)
+
+  17 Jun 2015; Davide Pesavento <pesa@gentoo.org> +qtpaths-5.4.2.ebuild,
+  -qtpaths-5.4.1.ebuild, metadata.xml:
+  Version bump.
 
   16 May 2015; Jeroen Roovers <jer@gentoo.org> qtpaths-5.4.1.ebuild:
   Mark ~ppc64 too.
diff --git a/dev-qt/qtpaths/Manifest b/dev-qt/qtpaths/Manifest
index a40d01b2dc53..08925e30f115 100644
--- a/dev-qt/qtpaths/Manifest
+++ b/dev-qt/qtpaths/Manifest
@@ -1,14 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST qttools-opensource-src-5.4.1.tar.xz 9262024 SHA256 11de0f8573843194b134e32af49594514498fadc4fc0b3b0333540fe1f671f72 SHA512 1e1dce0d6d587bdfa8d3ed20db0dbf3c1db3c1ffea4ea34741a9069ca08f3ab478e39245b26bf9f1c97c28650beb396e433e8b54a7f0b6cc5e93e3000e39e7d8 WHIRLPOOL bb8672cb64d39d3786f3db64f5d215d122ee62144406d970a2e37b019fd64ed08f2109e8dd64f23b6926e1bb9f21839805149bec3e5fff200b465e59ecceb286
-EBUILD qtpaths-5.4.1.ebuild 534 SHA256 8038a2a09bdf8cdbe0320007405759ea6cd00624db54d8b8a2eac64637bff28e SHA512 148fbd64e9e6ac82752f233fdbcb3deb8be080f7f28d4492f67b16cb278bc2f69ff3738d7ddf67439c08c7c66dc5a3be0a268c0c906654cd73dbfd971562d1eb WHIRLPOOL 9fd3f8ebf31edae5c7041a6be95cd17b3f046729c506d65a28e31d1ecbbcdab779da3a59199947338939eae6b09fbb6b9a14f410cd919ec889cc28cdf46068fe
-MISC ChangeLog 1353 SHA256 7233e2a86e146068a70269cd4d3f49c24c4a532ab82b80850bb59f8cbdb9f7e8 SHA512 4b5cf9c3179a025fc4b073b13a83bb47e6471438f56750c48542cc54c5f99c2872db3f57f92f88b173bbba09b159f709299bdff82f4cf12946ba3910b19a76ae WHIRLPOOL 3de0bf1eb1b40f508eb85d5ffea37be4e07bc848322f5acfa1158d554f1c9a62fd64d1a64bca1470ee1df3815419def05bba317644a5e0a04bdddc6699577131
-MISC metadata.xml 268 SHA256 0976b0efa573f782c96382e8f40ec82944c66ed52a89ebe6b0e905050f01395d SHA512 73ef5d7a382915e844a0cf7f1f05ae64c88500ecffe13265d156960b498ae61a62f29c9789330e5f24c82ddbf3a9ebb98aeff5c4cb0e69af1e8f07099791b806 WHIRLPOOL 19922570bea256c44d78d6f92ef9781be4c177580bb4235d8620139c6cfd759df64fc82f053a685d70fa1378b0fd6f49bb818d393b19105e6069730e9cf44e52
+DIST qttools-opensource-src-5.4.2.tar.xz 9333100 SHA256 edf3d7e00227f9989101da84b2fdf8eaf1a5b7863dc5e0d26bb0f39303e8b6b4 SHA512 55aa04eae16b71e78d4432e7d59b2052392d13652a3e9beff15a6503f2e88e77a9b48279121d8eee943a898799155c05b167d986bf01fae84b5db0a9a1759148 WHIRLPOOL 9123ff33a35c03adaa6d3374e86b539e9481ec78467bd72ad6f2d832e76e7aafd9b2f2da0420111e1aa8a66c4950b0478d8a6ae4c0f0e05a20c8334196b077e8
+EBUILD qtpaths-5.4.2.ebuild 504 SHA256 a0ad977fc60f1ae2a0ade58e5216bab53b1273a91f515f45ec427be3267af926 SHA512 f631952a5bcf7af0c4c471a04b4e2b69666d1ce742ea810713e0bdd37d64ce6e24f87e8c06f7df1f6fc619e30a0639360d23466497f423df82257b36d3ee423c WHIRLPOOL 1a480ff29406affacb6bf1fe4221003af5deef4b793c6b75050363156794aff7d31f78d7a48ad956ae4650a1228f4653b9eaf4583e77f416935d6308b55ad61d
+MISC ChangeLog 1513 SHA256 239f00343be91d5b588c37ce9a8a8113c58a7052d54c37cab68ec1d6afe5b3c4 SHA512 8a9c6af9155acc2f82f81cb38ba5379b14d173d6cfd0cbc398f62a35f7abdbd152889b1207037c52e697c44db460c318d775a38562ea5e8072f747ce5163d5dc WHIRLPOOL 12a137822802c9cf8cc106a2653156a34afaa7763ce111c08a7922bbaa21dd8a98db6a9bf82c2916c13a8a21fe41840df9e26f93bb0e7d94dfd9da6c74b2e796
+MISC metadata.xml 259 SHA256 da0ed92b6766281315367c03378c1935b4e9fa82f840641d9c72b00a1b038646 SHA512 1fca930f71c109412ead8932e0910f6c2b1991a454b03ddef6dda7101358db65b3c6da5eb7f71c918673fd3b9b0ac0397cef0dd24c85f84f2043e3ca8e21dda1 WHIRLPOOL 484f50be685ae8a8a65889a66edf2a6d544e0c6758a8f384bafd7e8f1cc23c4e788613d39febc67f1fc6f99e9e7541881f6224e07497ab0ca031449053b5e13b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlVXIRAACgkQVWmRsqeSphMPtgCfT6VJJj7X11ma7gqbfhHEGMNy
-Qu0An2cXYp7XGSn/QNVlPlvYRdmiC2y/
-=tf25
+iQJ8BAEBCABmBQJVgZCaXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9LwsQAKNsS7GnQ1mcJ4XXDO+MEFyg
+IvqIUb7TwlbV5swrgoWxPZp9H6szRlfPW0fN5LVwcdhmYFRFl5GEIkz9eiYvQafl
+dFkh0DPsGm+Ct3za/EEQw4egsXnSIjBBoAMDqyEN8b2dMD2dgUv7JBFhglYSqUSg
+6znduq6T8uEF31zaQt9B5vh7ne9ZrSnEdUpTQ7IVacZkrZWgJTYnNHO3gBDoYoD6
+PNo2gFh1bGpFiCPPbxusz+WUsW1g4L6i2pgTwDxdK084nLy94UikRsp0tUwvOplU
+9M0FOrHqX6IAhBgoNQq6VzP0+uwvwBnSy4ymOig4ijGwyknlT8BduOPWP6iN+1Ln
+B2WwJsZZQsKRs9i+NGWCYi5kD7zR+g8xpYMLNyHUZLv+OyMw3iQfIw5CjDUO4ppk
+gz3aFbi75AYokC5c0aIB9Dml7D4RatK578Gdl92vrYd3F40sPCJQRe1xhA9D60jp
+4sh9qZUQ0IlDpkRrrT4r/wR31oO20EX8HNDW59Nlc41vMr3brcwVz3bD8Wwzcmyh
+Io72lZDiTV+lvnA23i4nfVMUfskCZOuUrkXSOhs5a7OSFj6Iml1jlnyWJHl15eea
+dd1TNqJnwXWrGKBl4dTlfbolDD9uuC5RH6hLko0GXN1fiwIx+6gcP7ISkUDUuKhu
+JdgJurxVVLuvLj5idEGA
+=QI0S
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtpaths/metadata.xml b/dev-qt/qtpaths/metadata.xml
index 39c63597e531..afb3b434585b 100644
--- a/dev-qt/qtpaths/metadata.xml
+++ b/dev-qt/qtpaths/metadata.xml
@@ -4,6 +4,6 @@
 	<herd>qt</herd>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
-		<doc>http://qt-project.org/doc/</doc>
+		<doc>http://doc.qt.io/</doc>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-qt/qtpaths/qtpaths-5.4.1.ebuild b/dev-qt/qtpaths/qtpaths-5.4.2.ebuild
index a07a03bbf2b2..0d55e2c3b815 100644
--- a/dev-qt/qtpaths/qtpaths-5.4.1.ebuild
+++ b/dev-qt/qtpaths/qtpaths-5.4.2.ebuild
@@ -1,25 +1,21 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtpaths/qtpaths-5.4.1.ebuild,v 1.3 2015/05/16 10:50:55 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtpaths/qtpaths-5.4.2.ebuild,v 1.1 2015/06/17 15:22:01 pesa Exp $
 
 EAPI=5
-
 QT5_MODULE="qttools"
-
 inherit qt5-build
 
 DESCRIPTION="Tool to query Qt path information"
 
-if [[ ${QT5_BUILD_TYPE} == live ]]; then
-	KEYWORDS="~ppc64"
-else
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
 fi
 
 IUSE=""
 
 DEPEND="
-	>=dev-qt/qtcore-${PV}:5[debug=]
+	>=dev-qt/qtcore-${PV}:5
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-qt/qtpositioning/ChangeLog b/dev-qt/qtpositioning/ChangeLog
index 49a7a8b36550..0be37b3c731d 100644
--- a/dev-qt/qtpositioning/ChangeLog
+++ b/dev-qt/qtpositioning/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-qt/qtpositioning
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtpositioning/ChangeLog,v 1.9 2015/05/16 11:04:04 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtpositioning/ChangeLog,v 1.10 2015/06/17 15:22:08 pesa Exp $
+
+*qtpositioning-5.4.2 (17 Jun 2015)
+
+  17 Jun 2015; Davide Pesavento <pesa@gentoo.org> +qtpositioning-5.4.2.ebuild,
+  -qtpositioning-5.4.1.ebuild, metadata.xml:
+  Version bump.
 
   16 May 2015; Jeroen Roovers <jer@gentoo.org> qtpositioning-5.4.1.ebuild:
   Mark ~ppc64 too.
diff --git a/dev-qt/qtpositioning/Manifest b/dev-qt/qtpositioning/Manifest
index 792d714c1d86..71b1db3708b7 100644
--- a/dev-qt/qtpositioning/Manifest
+++ b/dev-qt/qtpositioning/Manifest
@@ -1,14 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST qtlocation-opensource-src-5.4.1.tar.xz 3297260 SHA256 889f0c832159a804be6a730366dd76db53f32333efc1cc88f5c7253206e97984 SHA512 9a88d62af7bdbd10b06baab388a7f2a9730f077e46e95c230c070652b4e79a3a040504559da5f8eb7645f7b13234bb79d7be06bd03cb7e885e71f656784b4a1e WHIRLPOOL 46f2f17f294c1d6424396b91bb5c3a8808efe2a5814d645bef4aa69c79c81b76810dc3b62d11c863c5ac61b547e39a3b011818ebc4f43a5d81e10c05d64bb104
-EBUILD qtpositioning-5.4.1.ebuild 908 SHA256 a46c304879090ca9abf1e1fcf64d6467c88844a60e514465825a5d38309d8413 SHA512 6c8aa2ddda06f928866330ed6e5b8f4e293cfeca3be93c7cfdeee6d04b6889e1fa180162e1f54d04cb964e90e90abf9cf36b3433aa81670a088b6ed99a9dbc4c WHIRLPOOL 71eb1ab38862d52f3a28ba73a5da9cc51f00fed5a954f3d439f3d44b91ee174698858b3a62e0cdbea5aeafbc241b9b2581a906630c2fd3f29e98bbd52162bf69
-MISC ChangeLog 1282 SHA256 d4a6a905bca08949f41eac22006e75169ef1b263c0412e71e480fe4c965fa73e SHA512 2dd02174a69cf1b77d83ff8952f0577cc75e8109669a5baccaaa83dc74427384536e1c36c5dca082036e14dab2091518f45cfc8ed62862ac47641e4563f4bc00 WHIRLPOOL 560ab15aa0500dcc3c33b5e7109aca2a8d28fae02b13d068d93dd87b454ac4ff61541a70fef7fdd0128fe39d7f4bbb0f72071b8658c6cdc8d0f6b95e78f241c4
-MISC metadata.xml 425 SHA256 cb37e85b25f8343425e3886ace756a6d6b1b71a9422d870168cf1b6602bea88c SHA512 ef6554d203c7116e97264ce699bd34e3ac93c3f05835ec49e24a9014f624e0d24a75d5d7f8cc53af11e0bee8d42d8eec77e000e0b8539fb474d55d2850d37ffd WHIRLPOOL 83355318d8dfe938220f5035c2d575c92accca7abca7ecf4bf18f6c7cc86519162e7c294e590a0e15a5808688572a9e80a7115ccb7b5972e027dc2a1a32e39af
+DIST qtlocation-opensource-src-5.4.2.tar.xz 3325280 SHA256 dc4af26e5398222aade1f7e405b6c8c0caaca7de0df910b8da20c5ff058583ec SHA512 89b9983a8dca4948602f62a6fa1447479a84c140b56d452599c77c641107bf495a3ef52b3a80fcf37839e918f90cac0381d4f5dfbb57d97b7a5a08033d57cf85 WHIRLPOOL ec7607f236ac66de959ba01b2132683d94a5fd74d11f6a511691e745c1358654da6cda1f201ebb7e7d0a46a9d4858c386bf254319539817e69e1991f5bfca95f
+EBUILD qtpositioning-5.4.2.ebuild 870 SHA256 2f182a29774d17ba1ab28f417ea078a1f83f13f0a9eb2b1cc1e5f9e15cc41cd6 SHA512 9c88043323913364fced6c4e69d9747473fac757e15a9dd24d892a1f622cd8dcf1ad29309587fdec3aabf048ff4a7ead286803c19f6dd1f0dfbaad80bfd6afe6 WHIRLPOOL 74dcafe1877dc6272d594dba3327152182a8f07d8203784c9604b4390879270e85f45aa4ec73ed2dbbf96d4930481b04bc8b6612724c48667425a9d85bd871db
+MISC ChangeLog 1461 SHA256 da2eb27ad4f07186590ea3a73ad0ec093cc698b79720c452a0b238c9e90709f7 SHA512 bcd30e5d212035b963306e0da6763f589c45808439d919c14e912657747408b2a8e9d4532a2f61bda9299a9525dc6602671d1c3f3ea757fde83dcdaa4d852c33 WHIRLPOOL b40781456f0edb5d4179c057e3281f23d5929b5f6161faa9f63c08c81c2f451b52dcd29a9e822d73d7edfa3c80b30bc53243cce06efa2b9ae8488f74e133f0dc
+MISC metadata.xml 416 SHA256 6914cc2d180d4ff4105c16763cec34054d5d746fe23ea0f6fe54a638b61df503 SHA512 369352e891cc25af466278d32f2820517762fdddfc17d6dfd8d4c3b1f238ee4fd44ff4cc988ae99db2d7c4d2a840cb6860085f525fcdb2e079651f39c84a5a4b WHIRLPOOL a550dc892b84026b2242e16e564cfdd281a40f8578239b96f91cd140cfa8962132bcda0e24e82274bd593cc80203d190d00ab0a7571a30ceb527e7d8d8a39582
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEUEAREIAAYFAlVXJCYACgkQVWmRsqeSphNvAQCY9AdrIGoLy8JSSAvKNIrKHFOl
-rACfc+WzF+4EuOorEaNZ+EaWl48xhpw=
-=BfMs
+iQJ8BAEBCABmBQJVgZChXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9c68P/0zYeRXcWPpFkxfzGrLKVBTh
+owf59vLZx5ReGfTykXJdC6x+WDYJHqdvLv1ZaaDwneQB74KEgvhk63QR6bKIbKC2
+muneL5pQuWzKc9i6eBUyLyBiZYtOgyubdthetT1cUz11R729I7QotsMM+/5vgK+7
+chDUBjnSKIgkUitrMwWZMMwZ3CS8Uz33bt3cw4zUNYQO1YPpWxDlwSlNNfxkFY62
+/OZ3Uzffw+hMDnvaoup7eQQvgSJ5Y/xmRvauY6IhLGAuMT1wwqwXVSEgAwzeYh1f
+jqzcBS7jhE7vm5UtaREjbIuGQwwzo0/BvRh9ZF66aNZfqlP0g6DrgQc5eB0E5pnZ
+H5/UCeRLEvp2VmH6FJAA+2RksTXud7FPfZLz9lrCha/AbZPQqL8qehsUiVawbdcu
+N9Qzy0ddoY9jZ8zpxXVhY/QhSBIFmd1p2cDTwzmdLzmL0aO1+n7D+Kw/r10ydNMD
+S9i7ALTCk+4amEO0fmygXfEJRkAkKj0wAiFABHKJPm8AKK5IbSIND/rKpKXT+EG8
+59rIHusBozbm+7yTJ17G7YcU6xyh6UE2RUEp9XKD+2P8rlQ2cu+S8rmbARffyvjP
+I+/BPiFtEktf/tnE6CwbpQE603+wDvGWvDtB5AEzRWN5T+9slFV3oEQH+MnfCxh1
+OjRYHg0tHrv7HZP2TdO9
+=N9rf
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtpositioning/metadata.xml b/dev-qt/qtpositioning/metadata.xml
index 85e7bf75e75c..0d64dfddc921 100644
--- a/dev-qt/qtpositioning/metadata.xml
+++ b/dev-qt/qtpositioning/metadata.xml
@@ -8,6 +8,6 @@
 	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
-		<doc>http://qt-project.org/doc/</doc>
+		<doc>http://doc.qt.io/</doc>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-qt/qtpositioning/qtpositioning-5.4.1.ebuild b/dev-qt/qtpositioning/qtpositioning-5.4.2.ebuild
index 2a5b3b53d6ee..ad890d0b395a 100644
--- a/dev-qt/qtpositioning/qtpositioning-5.4.1.ebuild
+++ b/dev-qt/qtpositioning/qtpositioning-5.4.2.ebuild
@@ -1,18 +1,14 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtpositioning/qtpositioning-5.4.1.ebuild,v 1.3 2015/05/16 11:04:04 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtpositioning/qtpositioning-5.4.2.ebuild,v 1.1 2015/06/17 15:22:08 pesa Exp $
 
 EAPI=5
-
 QT5_MODULE="qtlocation"
-
 inherit qt5-build
 
 DESCRIPTION="Physical position determination library for the Qt5 framework"
 
-if [[ ${QT5_BUILD_TYPE} == live ]]; then
-	KEYWORDS="~ppc64"
-else
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
 fi
 
@@ -20,12 +16,12 @@ fi
 IUSE="geoclue qml"
 
 RDEPEND="
-	>=dev-qt/qtcore-${PV}:5[debug=]
+	>=dev-qt/qtcore-${PV}:5
 	geoclue? (
 		app-misc/geoclue:0
 		dev-libs/glib:2
 	)
-	qml? ( >=dev-qt/qtdeclarative-${PV}:5[debug=] )
+	qml? ( >=dev-qt/qtdeclarative-${PV}:5 )
 "
 DEPEND="${RDEPEND}"
 
diff --git a/dev-qt/qtprintsupport/ChangeLog b/dev-qt/qtprintsupport/ChangeLog
index 15405561e430..2e3588c6b9ed 100644
--- a/dev-qt/qtprintsupport/ChangeLog
+++ b/dev-qt/qtprintsupport/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-qt/qtprintsupport
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtprintsupport/ChangeLog,v 1.15 2015/05/16 10:30:58 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtprintsupport/ChangeLog,v 1.16 2015/06/17 15:22:15 pesa Exp $
+
+*qtprintsupport-5.4.2 (17 Jun 2015)
+
+  17 Jun 2015; Davide Pesavento <pesa@gentoo.org> +qtprintsupport-5.4.2.ebuild,
+  -qtprintsupport-5.4.1.ebuild, metadata.xml:
+  Version bump.
 
   16 May 2015; Jeroen Roovers <jer@gentoo.org> qtprintsupport-5.4.1.ebuild:
   Mark ~ppc64 too.
diff --git a/dev-qt/qtprintsupport/Manifest b/dev-qt/qtprintsupport/Manifest
index b05bcd7d90f1..232d64fbb43c 100644
--- a/dev-qt/qtprintsupport/Manifest
+++ b/dev-qt/qtprintsupport/Manifest
@@ -1,14 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST qtbase-opensource-src-5.4.1.tar.xz 46132220 SHA256 8574a593830959c0f7e5430fe77a43832ea7f5299e14a397a74576b3df7fb1b7 SHA512 75d2c16bc47e6403e15c4094f50757157960cff4434de29f199b015795ba772b62125f01c09aceb2a06f8dfcfc4df8e35330259c76959239f276e2f5bd5221b5 WHIRLPOOL 48d9a583ba9d0bbfffdbfeaa2412e77a0bf4011e7bba525129ba4572faa6a55713a89cb00f4ed7f24e6782e3f7b8b48cb192e2c082b7dcb3c35a85109f2eb340
-EBUILD qtprintsupport-5.4.1.ebuild 938 SHA256 8714b6e6a2dd184a7647581bb0251f94cac539a5b69117f30de10ae1fc67c2ba SHA512 5e4c0b6f36a0417b72b2dcaf48e635c97486f26001d9eeecb6e0e2ad87e0f82853edda92070b6956e89448ea0518bc3e0e0b968c436ac24f96236aaf3726b1fa WHIRLPOOL 25d306debb7bb23a9a52e773d86ea70b33669d0bc6cc1f1b1f7dfd975ed2f53d7cc50e016fd646ce26947de6954e95e7227c98e65ccaa56e57935dfcf2713bf9
-MISC ChangeLog 1903 SHA256 3c6864255bcf75aa3292049623f9259f10ab3eef3ded810fd81c2056e50632a0 SHA512 5d9ee04473c4d476ce14db1f6f23aba669765e317e66a93ee428b6f528345c9a520f6ae173722360b6d2ba9ac5b4c969c5dbcee48dfb6e841bf85d12716bfaac WHIRLPOOL 3ab6c6f10d57ba1106bff818a9677758098f403bd078bd7337bf17a46ca039e5cd4e861935a599caa1a0cacea39d402c359576f4766093399bf6dba767f80f37
-MISC metadata.xml 268 SHA256 0976b0efa573f782c96382e8f40ec82944c66ed52a89ebe6b0e905050f01395d SHA512 73ef5d7a382915e844a0cf7f1f05ae64c88500ecffe13265d156960b498ae61a62f29c9789330e5f24c82ddbf3a9ebb98aeff5c4cb0e69af1e8f07099791b806 WHIRLPOOL 19922570bea256c44d78d6f92ef9781be4c177580bb4235d8620139c6cfd759df64fc82f053a685d70fa1378b0fd6f49bb818d393b19105e6069730e9cf44e52
+DIST qtbase-opensource-src-5.4.2.tar.xz 46354192 SHA256 9fc4f720b8b5a8b8e4a7d45e13ce4d5b86756ad46fb406386637eb2de5fd5a74 SHA512 029da83969614bc9b3803c76242af62911e3c6de171b116b5cb8e2823cad0514ab705cc3fa331e042c679caeb099de4e9cd7ddea92959f675dda82533e3ad7fe WHIRLPOOL 5f352f78a779c5d042f04966a010b10af706c4db94976870721a550e3ab7eaf2695b3582c86cdcc3a11de36283e11fe65797f96e59df96fa367b16b72b5f9213
+EBUILD qtprintsupport-5.4.2.ebuild 878 SHA256 cdd97ff374733b7f31e4625bcce9bd10adc876226c8c6bf039f277acfc5ee775 SHA512 07e45ff3a703973298527bf6b4bc1f6ac531e85c04d922100aba415602c8bd1654b16cbf464a2c5fae12bc569f3b28e63786464f863398531932805d26e70527 WHIRLPOOL e50897f4325128ce100a0ce47d8cb7c7b40d22a9eb064e10ebb1b2b300cbb5355f55b42f86acfc432438dd7f2c088d0a9a23663fd3f70e9a7324d6b8a9de7f1e
+MISC ChangeLog 2084 SHA256 e6eb7c01b214ce6b6bcde664bcc62971681be2a3a3aff15be1d7554abf1482d6 SHA512 9a77ec49e312fa31ec63a2031a999df01ec35b5deb600a2c0675bbf2279f270193424eeef08fd5ae8931089d2b59298c85444ad04d4ef0fdf527b0e7dd7b8a23 WHIRLPOOL fa1878d33c231fad7d9c9b2b4bc6205c3dbc79e3c801d1beb90147ab9c95c22d2fef96eef217dd4e73f90167723ecf995ee2976203c5fd80e72eb0630c364bac
+MISC metadata.xml 347 SHA256 2daca71e420a638e048e92c0a71720984c84951eb4b08a305812a03907d3c4b4 SHA512 54c14f38ec21dd4600ae9b056c4fbf6e72abda0985f456b6033018d6d392cdd20a69b42b2f709e96db0551aa5a29443dfe3a9b6d45724243df14ef9e1c45f115 WHIRLPOOL 1d49eab844d3be970c4c00040bd9fdd1aaee2fa58f13fceeadf89a6583a717f03ef8d2f601b8947fa604d241f859d8a64799636e32bdaccc77a490c756629149
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlVXHGMACgkQVWmRsqeSphM9IgCfQcptg2cSSOGHGUHe0Ni556Ya
-Nz4An19EJrgn41QpmJXWY7aOudAVb6yI
-=ytrL
+iQJ8BAEBCABmBQJVgZCoXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9Q3IP/R3Ka/TRSA7ooku7w555snF6
+oI40rS77SvNPVYrHtKrVhLDbLVTL+kN8H6ZQF+RPL1D8rKPU5fHp3HUCsOQLKers
+Bc3uY4Pwb4vavvNuqXHCkpatdDYJKQNN/3JhF3poKVJXX5UmovuTHsGnB4U4cl9X
+VG08biw7T0x10sygB2Ug9QeZFt+1DV+rKI6krtxkBR2SBSjDrXiBiCKtJ7DldCit
+PTZhJklOJXC011xjaxh25FpH40qcrgW+cnyN3iyHrMdmgFZA6VekHpLgasKn1rnm
+5+yRDBCH/FNcvq+WjWITlnywWOEl9ijkTnpeA+0hlBobNg8dhVoDY15dV5wpN40X
+heUwsalXpq8mTCTFJNqRsY8cVWPQXMt38GNYV9T7tuPIRO/YLGGJSaw1j0E66H11
++K71BMLRia56R5QciddQK1+d1y1auAwooXadSFLK0TNykFFqBFZxAvI+zGyIbyP8
+IKYnGSUzciQPFSCiuzZI13y8rcMGT4NfZGv4tz4KTT5yh/MPNejNTABFaCqaX7Sc
+mhm7ipb42kRSeufFCsi5haSt6tuT9nOp5pRNZ8Otz2+qa/qWJBBa1PAmEeO3lIfL
+z/RMCSbTdbrIp34Nq4bGJMut1ihFcCr3WGZBIFrO2IwqESXMK05MfACEEhUp3WkJ
+jNdKT0/W38Uvnp7FavjJ
+=TNH9
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtprintsupport/metadata.xml b/dev-qt/qtprintsupport/metadata.xml
index 39c63597e531..8090c86ce18c 100644
--- a/dev-qt/qtprintsupport/metadata.xml
+++ b/dev-qt/qtprintsupport/metadata.xml
@@ -2,8 +2,11 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>qt</herd>
+	<use>
+		<flag name="gles2">Use GLES 2.0 or later instead of full OpenGL</flag>
+	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
-		<doc>http://qt-project.org/doc/</doc>
+		<doc>http://doc.qt.io/</doc>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-qt/qtprintsupport/qtprintsupport-5.4.1.ebuild b/dev-qt/qtprintsupport/qtprintsupport-5.4.2.ebuild
index f52f2c0bc740..545d82e3fe9f 100644
--- a/dev-qt/qtprintsupport/qtprintsupport-5.4.1.ebuild
+++ b/dev-qt/qtprintsupport/qtprintsupport-5.4.2.ebuild
@@ -1,33 +1,28 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtprintsupport/qtprintsupport-5.4.1.ebuild,v 1.4 2015/05/16 10:30:58 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtprintsupport/qtprintsupport-5.4.2.ebuild,v 1.1 2015/06/17 15:22:15 pesa Exp $
 
 EAPI=5
-
 QT5_MODULE="qtbase"
 VIRTUALX_REQUIRED="test"
-
 inherit qt5-build
 
 DESCRIPTION="Printing support library for the Qt5 framework"
 
-if [[ ${QT5_BUILD_TYPE} == live ]]; then
-	KEYWORDS="~ppc64"
-else
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
 fi
 
-# keep IUSE defaults in sync with qtgui
-IUSE="cups +opengl"
+IUSE="cups gles2"
 
 RDEPEND="
-	~dev-qt/qtcore-${PV}[debug=]
-	~dev-qt/qtgui-${PV}[debug=,opengl=]
-	~dev-qt/qtwidgets-${PV}[debug=,opengl=]
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}[gles2=]
+	~dev-qt/qtwidgets-${PV}[gles2=]
 	cups? ( >=net-print/cups-1.4 )
 "
 DEPEND="${RDEPEND}
-	test? ( ~dev-qt/qtnetwork-${PV}[debug=] )
+	test? ( ~dev-qt/qtnetwork-${PV} )
 "
 
 QT5_TARGET_SUBDIRS=(
@@ -42,6 +37,7 @@ QT5_GENTOO_CONFIG=(
 src_configure() {
 	local myconf=(
 		$(qt_use cups)
+		-opengl $(usex gles2 es2 desktop)
 	)
 	qt5-build_src_configure
 }
diff --git a/dev-qt/qtquick1/ChangeLog b/dev-qt/qtquick1/ChangeLog
index d31e74eb9f80..ebe4bbe65a37 100644
--- a/dev-qt/qtquick1/ChangeLog
+++ b/dev-qt/qtquick1/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-qt/qtquick1
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtquick1/ChangeLog,v 1.17 2015/05/16 10:52:36 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtquick1/ChangeLog,v 1.18 2015/06/17 15:22:22 pesa Exp $
+
+*qtquick1-5.4.2 (17 Jun 2015)
+
+  17 Jun 2015; Davide Pesavento <pesa@gentoo.org> +qtquick1-5.4.2.ebuild,
+  -qtquick1-5.4.1-r1.ebuild, metadata.xml:
+  Version bump.
 
   16 May 2015; Jeroen Roovers <jer@gentoo.org> qtquick1-5.4.1-r1.ebuild:
   Mark ~ppc64 too.
diff --git a/dev-qt/qtquick1/Manifest b/dev-qt/qtquick1/Manifest
index 4abbde38fa78..27926d180a9a 100644
--- a/dev-qt/qtquick1/Manifest
+++ b/dev-qt/qtquick1/Manifest
@@ -1,14 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST qtquick1-opensource-src-5.4.1.tar.xz 15983524 SHA256 eb5324c784eef15b3d0f7e2fc2265b0f2e823a31330e88e09379972313ca432d SHA512 365a57c0b3e4df090471cccdd025224212781730fe791ad258697334df540407cf53efe86ca26d40d8ff6c807860dfb2eacc4e4f7d3745048ed409498d428028 WHIRLPOOL 7a987fe9f61a18fcec5d7f904d28908b9c2785d89308d499eff9578905be682d3152bbc25c888d34a124fd7faf630d578aa3344fb56baed9b7077e94f793dc35
-EBUILD qtquick1-5.4.1-r1.ebuild 1398 SHA256 b2a7c31b96719e47e16f6fe1b4dd5a0261a06ea0a19c0be425af13d0ef55d80c SHA512 0c2518b97e9f9a6ea5ab396e1fdb396ba1930929572dd78cce736fa19518838a95ecb868ca5edc4cf661a83bdc126457ea953d94adfc5bf6ec4173bbdcdcd646 WHIRLPOOL 0461222c5d7fa5441703c1c49fbc8fbddad13be99658f0bdd544c08c010055b9af20c8c8dfe08813913246dbf92d86e39cd7867cd98abf306e6640420974d57f
-MISC ChangeLog 1917 SHA256 00f43ab79c5d40beeee5f91c5128340004f5a7866bcabe5161dcdba68098b998 SHA512 b8fe846f36f9a56a2d386bfce755b2c3299ddc5a76b339b3e8b54888eda51749050ad89aab042b68c6f3914e2585940949db199c9b335b9b03a6493dc1b13a2f WHIRLPOOL 05b2503d390e40f3bfdfa9ca88b2e23247e019e59c9873f5ece94524990562724f33ed672c7ad80f5640cddb5337e8761eb0dedd1c8e2d069e118409a79d0fb8
-MISC metadata.xml 539 SHA256 45394be80debfe5b224d597a6b2a71b4238cf42cfe3923cf9ae289356837ba38 SHA512 644b4bdeda1313daa3444f855364c4be96eaf1f04c1003a1584874e5fb47fd3c477dd16e3abc780a29745fa5f60368edaa41be6c942f5f26f164157078d5459f WHIRLPOOL 9a819121464a7e4bacb7d2c023b8d12926c9d6b3de8d4a09ee040ae60ab974aaabe451e4a7880d6767c95319ef0896648f93ecf88dcb9e13cd1eae9beabe9979
+DIST qtquick1-opensource-src-5.4.2.tar.xz 16021692 SHA256 7773275c796e588bf3b8cd4fc6af8b9a81a98feedc8d910c1ddc85a14af8e804 SHA512 9e2ba69506f948f222a5049a0b8ec4d4f2d48aade7ed2fe27d22cde63e0b40fc286f358b5e81a3d1ce20f8fdb3b14e903442adf6f73283cf2c81cff10c293a4f WHIRLPOOL ca332f20d0d5412a1d06ff41c3ae96febb95a734227c8911279d5eb41e451a27916b3cf1da4e91793c93f9800e9c7633477ef93582f67df052c9693eac9487ed
+EBUILD qtquick1-5.4.2.ebuild 1249 SHA256 ddd1e59edb86b70e6d6d3f2799ccc657fcce82243a07ff5d388c603c087b8fe3 SHA512 4efb204913f4c44ced5fcea081dc0e88193748b44d489c6fabdc27eb7b1da20ba38173f0385553ec1e5341d74903e7b63d48ea8af9796b6ae2fabde5e563cccb WHIRLPOOL c5bbe0e1804a359d30ca7ec933dc9d9cbfc85002e6c227ae8c83ed94f7b295f089e8dfd1c4d6d26d0897f8a5d1e2ec684e10896c2aed68961809d2d78beac1ce
+MISC ChangeLog 2083 SHA256 17d0f91897fd1e7f5d16bba531e25d178853100c2d80f557e3672c7f7cc53590 SHA512 5b87535c6349b4adfffd9e1a70f5810d9a734204e8c6d94e3f15dafe22d4b1671a21fb1b1ef2cf634dc8814216eba3e8a1de531b69b83f4e004fd946f1bf9556 WHIRLPOOL 8022409e18a8b391efc16aef5d4320e9603fe8e0fc4ad7b2d562e2ce0ee22c8512bccef28f4ca9e83d6c20574a322b59fdd66bd929e0cfe25116594b9547a1a3
+MISC metadata.xml 530 SHA256 2407562d316772e0814522c5a4d7349aafc7017c12d93dfc39e49a9f4f08aa7e SHA512 bb37db0c3082c1d12c500c092aab76db15fed020e4782a8bf801bb1e222f3f294a50146443ca306c1774641b74973f103944902c34157b2f8f339df3d47d182c WHIRLPOOL 7ba51df7b0c27e2260119cc2fa7aafa0eed5b5e85c332d95f0c505817c1c64eb83fb11e263eeee78aca27c86796e8707652f0d1036b34f78a2d470997104ee97
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlVXIXUACgkQVWmRsqeSphMPdACfTP90MAl44gNy95G7a3PMxJvD
-g8UAniXzFT6qYunF9TPWaDEah9YbnfJ5
-=bkOH
+iQJ8BAEBCABmBQJVgZCvXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9/nkQAK32Y08OuS1XOxewIRzTZo2Y
+VfXQSZCdXq+hBEE1Q8KDSbdyslLWFx8w3MGHjU7am14N+q16hSjzm8GhcxPc8sfd
+WSwIT1FQidjQVjCDYlFmCRYJzY3Bmz8Cv30uNIdy77k7hJgMtlqN5fA9tVkGZ0Ar
+TAbIiW3w1pJlDUVlRyNpg3S4R735zXJsTJZgGVYzuYKGwMAwAZiDqijD6GAXZJSA
+khCmgs1DHv2QRbeUIodvPKmf+bFnUfeoG0lSQLkbeciUh166ourPQb2izDgkfKXF
+Xe/eN0glf4ELcoIkaSFwLKgrtpt3SbCAgedHS4Da6tRcTtK9PRmumXi1xIGHoajS
+hk7gjfSv/drKQR9B4iqute1s8jjhvTFPqSH5Uos+KYFvyVbUWAQYVRnaBZK8i7X8
+oWspjF+YOLx1ICJWe+f4n+u9z3SakDSye0H1HA8FJc783xCdKX9yPd8wAtEMYkW0
+ctnUKax3NHGtTx6CvwQ5e8JOhfEHYwH2gP82kya/YhkgEd2MMlGiHzkWT3xPeK7m
+vJjfTnse2yEBnL/oGDDOZbnaBIRwp4L+n2KGIzbEHYD8rOD7QaN9II1+jsjTW3nC
+sfJpGqsSSr6iOmvfB0k94L93gh3OCsjO+OFz+t5YfBdD4oZIoeJl5Ubpo71CyeRB
+h8Jnjc91OPB8rGAMpp1N
+=Mrv5
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtquick1/metadata.xml b/dev-qt/qtquick1/metadata.xml
index b827ecb1aab4..ff6648b7ae99 100644
--- a/dev-qt/qtquick1/metadata.xml
+++ b/dev-qt/qtquick1/metadata.xml
@@ -9,6 +9,6 @@
 	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
-		<doc>http://qt-project.org/doc/</doc>
+		<doc>http://doc.qt.io/</doc>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-qt/qtquick1/qtquick1-5.4.1-r1.ebuild b/dev-qt/qtquick1/qtquick1-5.4.2.ebuild
index 410ec83009f6..632916060540 100644
--- a/dev-qt/qtquick1/qtquick1-5.4.1-r1.ebuild
+++ b/dev-qt/qtquick1/qtquick1-5.4.2.ebuild
@@ -1,16 +1,13 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtquick1/qtquick1-5.4.1-r1.ebuild,v 1.4 2015/05/16 10:52:36 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtquick1/qtquick1-5.4.2.ebuild,v 1.1 2015/06/17 15:22:22 pesa Exp $
 
 EAPI=5
-
 inherit qt5-build
 
-DESCRIPTION="Legacy declarative framework for Qt4 compatibility for building dynamic user interfaces"
+DESCRIPTION="Legacy declarative UI module for the Qt5 framework"
 
-if [[ ${QT5_BUILD_TYPE} == live ]]; then
-	KEYWORDS="~ppc64"
-else
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
 fi
 
@@ -18,19 +15,19 @@ IUSE="designer +opengl webkit xml"
 
 # see bug 542698 for pinned dev-qt/designer dependency
 DEPEND="
-	>=dev-qt/qtcore-${PV}:5[debug=]
-	>=dev-qt/qtgui-${PV}:5[debug=]
-	>=dev-qt/qtnetwork-${PV}:5[debug=]
-	>=dev-qt/qtscript-${PV}:5[debug=]
-	>=dev-qt/qtsql-${PV}:5[debug=]
-	>=dev-qt/qtwidgets-${PV}:5[debug=]
+	>=dev-qt/qtcore-${PV}:5
+	>=dev-qt/qtgui-${PV}:5
+	>=dev-qt/qtnetwork-${PV}:5
+	>=dev-qt/qtscript-${PV}:5
+	>=dev-qt/qtsql-${PV}:5
+	>=dev-qt/qtwidgets-${PV}:5
 	designer? (
-		~dev-qt/designer-${PV}[debug=]
-		>=dev-qt/qtdeclarative-${PV}:5[debug=]
+		~dev-qt/designer-${PV}
+		>=dev-qt/qtdeclarative-${PV}:5
 	)
-	opengl? ( >=dev-qt/qtopengl-${PV}:5[debug=] )
-	webkit? ( >=dev-qt/qtwebkit-${PV}:5[debug=] )
-	xml? ( >=dev-qt/qtxmlpatterns-${PV}:5[debug=] )
+	opengl? ( >=dev-qt/qtopengl-${PV}:5 )
+	webkit? ( >=dev-qt/qtwebkit-${PV}:5 )
+	xml? ( >=dev-qt/qtxmlpatterns-${PV}:5 )
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-qt/qtquickcontrols/ChangeLog b/dev-qt/qtquickcontrols/ChangeLog
index f2bf3838865d..28c8d5a558b8 100644
--- a/dev-qt/qtquickcontrols/ChangeLog
+++ b/dev-qt/qtquickcontrols/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-qt/qtquickcontrols
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtquickcontrols/ChangeLog,v 1.13 2015/05/16 10:53:11 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtquickcontrols/ChangeLog,v 1.14 2015/06/17 15:22:29 pesa Exp $
+
+*qtquickcontrols-5.4.2 (17 Jun 2015)
+
+  17 Jun 2015; Davide Pesavento <pesa@gentoo.org> +qtquickcontrols-5.4.2.ebuild,
+  -qtquickcontrols-5.4.1.ebuild, metadata.xml:
+  Version bump.
 
   16 May 2015; Jeroen Roovers <jer@gentoo.org> qtquickcontrols-5.4.1.ebuild:
   Mark ~ppc64 too.
diff --git a/dev-qt/qtquickcontrols/Manifest b/dev-qt/qtquickcontrols/Manifest
index d78d260a1b9b..c97f167b6624 100644
--- a/dev-qt/qtquickcontrols/Manifest
+++ b/dev-qt/qtquickcontrols/Manifest
@@ -1,14 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST qtquickcontrols-opensource-src-5.4.1.tar.xz 945324 SHA256 fe0852c510b7ab9111310d6880d1b1f34908274099aefa5a14316173b25cfbc2 SHA512 906efc43614bb5117d65b361e1a1b9eeef40f430fbc96220ac6e161cc65e3996e6d942ea675bf2a4fc25eff8a064bd45c4e23bec36915c8c3b5b49a312a30eba WHIRLPOOL f408453d2f1847cb76d311707c5eb68920991a4fcefc87da91c6a27ccf3af2ec991ae635abd229c1003424154a8184ab54c4d5eb09194dc0245079446e3f4aa6
-EBUILD qtquickcontrols-5.4.1.ebuild 934 SHA256 d7e1626f9a0b17af096ce7f7f1321d5d32d308a9b3c002254b097a16d4ddc98f SHA512 d6866d3c9ad2a4d975415a00ad20db036fdfe4e0b4a5d5fb68966ce6f63967193fa02920481e59c79e455b67d23cb558e558a9362cb6833c16c9ca88849624e5 WHIRLPOOL c78511f64bebbfea708d2bafe6a96c9f5a54a7a203708396b1f4ee309a91e232aad325ab45046adedaabfdd8d3971f78f8fe3df40c11cf11d84781f4dafee018
-MISC ChangeLog 1614 SHA256 ef21c9659f3576d995d4a9356940a8d787f2d94d6dd2462aba68ee7f5e13894f SHA512 155e3a113c8bcf36714d2548c8daa6e0f37afc4405343622a310fa4a43e9054fb3a9c21cd62b29e6a511ef30c6971036ffac3cfa0683c3aff78d8d5236726967 WHIRLPOOL 452466429df022fa8ef615827e9c09ea40a8c17ecb55829a5d888a79072ec403831d59e913de17a694380a4823cd7ba55c9641c05f9f9ebd9bc50606973d6d63
-MISC metadata.xml 338 SHA256 daec0476a109b676192bfe6020ecb7f6ed88a23894cf94e6bf387bb4dd88f155 SHA512 64eccd85eef45577c51dada14afbf7f770d13cd4f104c853b8b2da1c826bd126dad27e7c454617eed95864dd872ba6be5e07b9c73fac54e4612ff0fcad709340 WHIRLPOOL b1b9f224ed44d0bad21adbc57d36dcdb19d48d84778703003cb8b68703c4ad8c27f2624ca12aea0a453155c1c197022e751a32778815a014909919c1c63eb3bc
+DIST qtquickcontrols-opensource-src-5.4.2.tar.xz 950732 SHA256 e720d6b029078682d788c0e3df14057cab8a3ba0ecfdc35c9b9bf6dc061bff8c SHA512 0fdcdee97552f4eec0b2d103794984a3c03393eb3f824c7717265f3e74cee5f4d6c4172dc91462f34ba51daec5efd9ffaf31721b693a33bd3c1048d36abe28de WHIRLPOOL 0dcc6fe6cbd884b1f0331331dd9e6d8ffef4ce03d6e6fe14e3657b20518d6c1f3413477593217d910ed76e2a21926dc36f37377bb32f59cbba40bb8f3238b917
+EBUILD qtquickcontrols-5.4.2.ebuild 881 SHA256 066caab128d3aecb1a734728da0b66cf3c6cea96b99c1930943d4b7cf9c20d3e SHA512 4e43c793180c8d00a3337efb480af4ac800594c17ff8d3fba038bf204833504f372530dba8cad7a5ffde09fe656d30b181b2af4c2dcd2d783b94aaef28508a69 WHIRLPOOL a403e2a9671aba13b10bb620ccaabca3bd316aece9a7c321c2e96e8f52505ff483bf7f850392e58fcebf9ef6806ef039b19013758489472c7087eb66d2b5da9f
+MISC ChangeLog 1798 SHA256 d4bb718d045b90beb20a63085ddaf70f122327fe4b7392b97f3a307507182ab4 SHA512 414df915b0ffa426963a1ec739d6ec6a8297cb5d8eb8d6a5dd962593e142ff95f1459902913d802cc206b263a5c9db4f15fd594be2708ac1f0bae9e6d1b39b2c WHIRLPOOL a9921c5083541dccca3e18249a572cf303d18911affdbbce8eddec34172ff24c6145efcdf50b7cc601fe335a285f9db575e8dcbeb3f389e7ecc236e2012674b4
+MISC metadata.xml 329 SHA256 14cfb07306ded1231f78efec966b3c2c304b25fea7b7c2889cbaeeffbd46a9d6 SHA512 d9cc69dacfadc04a625515f9aad4c0fd2f4130bad5cd53d989f56719c366dadabeefe4e054c997717455b8d5d835da69f9dc539261d3fdf8adc2b582459be69a WHIRLPOOL 48b04170e1fa6828b89694b85223138d8cc75e5c5d0ea67b58e06935e57f320deafac82867e810dbf866884ff7125e560ea6024bda798ad894872f571974da9b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlVXIZkACgkQVWmRsqeSphNUngCfXqiBRL4K5FoS4RlxzxOYrcg2
-Uf0AnjkJblkcNKnyOUpVltfedoyhsGhS
-=pTtu
+iQJ8BAEBCABmBQJVgZC2XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9Oi8P/1qcoaEz8wcmrikVSFAiQ8qr
+v2MIV3DwZKmeoSmQRgR06mDuSh3OZEHutw9HzrcB7XD5g71xo1Xltd9OvaUeQmsw
+FQT3Goadc7txN9sj4q/g9+cAGbqhdOrltRejpeoMddtugJFfV+sxkNe+6Vm1bBZ1
+ETY6WVKnctHTLGCawnZgV+oN6nmuuIwh67KGYVmb0Ea1lrMOMCPTjUuuJUNp92N+
+6s/vQ9QJ9UbjYi6ZrCO7wwN8542BXMOCScVgtSlK31pEHr34Hrm2Oj8uz+/STqbo
+CoT2AceLu6HsTnJ3ET4LwksdIX3COe9ZRPRPNH21TFnyGWYU8dJ5NYWmEkKUqVqX
+3kIGNhteBZ6/XLJW+rENhFSRdUA4jTRz5KwfZAIiVsybRmyOy1OQRE2u4wpxuAvL
+i+gYYAiglNzi6zqqpiq+x8N/t5SBRnLWMymg+TVCwYtyFoKaUfXzUXxq5JHS7yEr
+9VzN8BB1R9JOk0iR1zEhylCIJLpILOz7cipNEBKT2ptWGLfv+s1dq9MIPWWvUmW+
+pMsuGhlGK42xaPD4caC33YwiF3ALli5diQb7P3F7JQhJLmAORNvih+O559NMTYaL
+4NvNAkEofLM3rY3qdAbeScgDaMKA7Ef6WP4EEb4U6JeDPpQeVA1co6k+B81uTUrm
+78f4/pecZV7xQnUVgkut
+=PfAI
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtquickcontrols/metadata.xml b/dev-qt/qtquickcontrols/metadata.xml
index 2ce5ce322842..728463d459e8 100644
--- a/dev-qt/qtquickcontrols/metadata.xml
+++ b/dev-qt/qtquickcontrols/metadata.xml
@@ -7,6 +7,6 @@
 	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
-		<doc>http://qt-project.org/doc/</doc>
+		<doc>http://doc.qt.io/</doc>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-qt/qtquickcontrols/qtquickcontrols-5.4.1.ebuild b/dev-qt/qtquickcontrols/qtquickcontrols-5.4.2.ebuild
index 5e7a3a4f16d5..96dd9c6e9aec 100644
--- a/dev-qt/qtquickcontrols/qtquickcontrols-5.4.1.ebuild
+++ b/dev-qt/qtquickcontrols/qtquickcontrols-5.4.2.ebuild
@@ -1,26 +1,23 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtquickcontrols/qtquickcontrols-5.4.1.ebuild,v 1.4 2015/05/16 10:53:11 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtquickcontrols/qtquickcontrols-5.4.2.ebuild,v 1.1 2015/06/17 15:22:29 pesa Exp $
 
 EAPI=5
-
 inherit qt5-build
 
 DESCRIPTION="Set of controls used in conjunction with Qt Quick to build complete interfaces"
 
-if [[ ${QT5_BUILD_TYPE} == live ]]; then
-	KEYWORDS="~ppc64"
-else
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
 fi
 
 IUSE="widgets"
 
 DEPEND="
-	>=dev-qt/qtcore-${PV}:5[debug=]
-	>=dev-qt/qtdeclarative-${PV}:5[debug=]
-	>=dev-qt/qtgui-${PV}:5[debug=]
-	widgets? ( >=dev-qt/qtwidgets-${PV}:5[debug=] )
+	>=dev-qt/qtcore-${PV}:5
+	>=dev-qt/qtdeclarative-${PV}:5
+	>=dev-qt/qtgui-${PV}:5
+	widgets? ( >=dev-qt/qtwidgets-${PV}:5 )
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-qt/qtscript/ChangeLog b/dev-qt/qtscript/ChangeLog
index 671df28688f4..1264a543d359 100644
--- a/dev-qt/qtscript/ChangeLog
+++ b/dev-qt/qtscript/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-qt/qtscript
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtscript/ChangeLog,v 1.36 2015/05/30 10:51:44 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtscript/ChangeLog,v 1.37 2015/06/17 15:22:41 pesa Exp $
+
+*qtscript-5.4.2 (17 Jun 2015)
+
+  17 Jun 2015; Davide Pesavento <pesa@gentoo.org> +qtscript-5.4.2.ebuild,
+  -qtscript-5.4.1.ebuild, metadata.xml:
+  Version bump.
 
   30 May 2015; Markus Meier <maekke@gentoo.org> qtscript-4.8.6-r2.ebuild:
   arm stable, bug #530238
diff --git a/dev-qt/qtscript/Manifest b/dev-qt/qtscript/Manifest
index 26e8b2612858..869889050526 100644
--- a/dev-qt/qtscript/Manifest
+++ b/dev-qt/qtscript/Manifest
@@ -5,17 +5,29 @@ AUX 4.8.2-javascriptcore-x32.patch 1011 SHA256 7a20c0e70285f9506b2d1316ff7d03494
 DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357
 DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2
-DIST qtscript-opensource-src-5.4.1.tar.xz 2581684 SHA256 f432acc8376b86279faee273ff4e26226059d0cffbaced35e05a559d2efbcbaf SHA512 e52e27fca2e094fb0367fb7684da194ae185e748b3e8083b123353ca2c0d18442f1028fca3246f3e9532bf6224f2034ccd2f6db15041f2d1887c614ef932f41b WHIRLPOOL 0a0a8b2fbf309dd53d37e4b8a7915e778c3e1a42caecc1e6acc50f7ace73ca57deabb188a5df6e2f0e7ab84555a143d2edeada5f88c9c908f871ff988f7a7e7e
+DIST qtscript-opensource-src-5.4.2.tar.xz 2591672 SHA256 e042e444de4c759b562f6e8097a668b84bea5b9ccd8290d18931a2cc80affa47 SHA512 b04afc3f55291925d9239cd5cf4ea9a3e0b47709f77c757efed13c32530b324be294930c58dd610d4a477e5fe757e325c4daf5890512e63a4c7eaa13912ba1f4 WHIRLPOOL 0df41017c279828556caeda18fac13eba2a667fb8de3bb24d7bf3609eb77e17767c2e4096d3a507d6f3e17ade8746feb309d237630aa82eacab6ab9504d68256
 EBUILD qtscript-4.8.5.ebuild 1649 SHA256 4dc17c15645a319de258d59b57e7c05423fe27bb4588384f55454a8d393b59c4 SHA512 9d472ac6f93b7daa2a0e1fe5d435f808d5016de7223696bb1bedc7f78f2ccb153a2acf1347b55a756e54c01cb74c7d257eb74c8920672ff4894f9f158e77513d WHIRLPOOL cd1d0f805f45da2b84f5223fd909125ec9f14f129ca72f7c843787ae96c987f078f4e7e2bb55c64142eeb5cf8eeadbb371aac4307809871c88e35ead603aa711
 EBUILD qtscript-4.8.6-r2.ebuild 1261 SHA256 986fa052cb65125b8e9b73c3bc435cb7c5bea8dcb37817a87ed882d0cd5dc3c4 SHA512 cc9be56b4be4641c123b65f8b2f0c7d99e16e05d687682de44852c7c03c0a2ab05f2834ea33d46e9e1bd282a1f0c4c3e84556dde6dfeb0462fd83a1986d96c18 WHIRLPOOL 88c2549ce88f8844a5d5aca476b8e600f6b939ce5eb15940508f84f0ba96503bc36df9306835668d5d293ec5386c910fcbe378d3588ef47d33649e169f8cc9e6
 EBUILD qtscript-4.8.7.ebuild 1228 SHA256 daf04d8686ccac496af953aa30afb86d4eef8b3177b6fb97ea2a4877260fecfc SHA512 b6a65d689ccf80ac73fbf717fc6a8b9206bc5cf8f3ed3024af744502a5379bed68219efbcfdb7da2370529b6a04592484ab222a6d22eff9d0089b637240ed5d2 WHIRLPOOL 33fc524b858aa674815966ae693c6f14aa1da9664daa6a2f1cca5afe2f86bf1669e485981e72b91d76c480023e4c6984ab08919e6dd5ab34f8cc1caaa35fd169
-EBUILD qtscript-5.4.1.ebuild 701 SHA256 ad71650bb7c8caba373ae0ee895a866ae5d0dd7b2505f2da8e785775f5487b1b SHA512 fd5c9035096a947c0ff4c81e3fb282a6a0f47f822a1fc617ed17888be54d1219519292a7ffa6ad59ab8e2f460678f4c3c597f16d055643001cd63fc33ffd4d68 WHIRLPOOL 5efa499ed719e099b4dafdd70e2131b60dc38f0ac47bbf02d685eabadc3a41144272ee1cb5a354cddb3f7082654e290480e37d18e20d54408ea2ad91430871e2
-MISC ChangeLog 22300 SHA256 41749a1a1d0eb14e90e6d94c803c44931ad8f12a63d82ff5a56bebc5ceb4bed0 SHA512 98cc704af818570da006a9842c6bcc80bfe0728e4fd67f2aef9128f27698449b6b54ba7cedf1785363561dbde4dcfecb6bf6a6b23f42b4eb4a17c97c10500bbf WHIRLPOOL 6d6f9958199f17731fc6c593dd9af62ede78e2957a6da7042b8ff33886c909d9eed2c8301c8197675db6f57c3332b66e18665e4ef1c5f4750dd0f1284e3274f9
-MISC metadata.xml 501 SHA256 817b4bd1e1634c643c124807e1a49f13e6c45e479020298ea05b0ac0c14ef5e7 SHA512 f9b397c9714b5f42f29e3a3c99a65c0d667ecd72b6ba6cd23f227d504c2bfbf47d26ddc2d3e90a1b54bd7ee4435534de152dff5c43a82a42f324e49fa898b9f8 WHIRLPOOL ea181c97b69c90de23b5e541f476630b4e7e0d5d0e5d880542206607a180bbce132f9a5024de2dff982fc6bf2bd12ef80d0a7d8d843a3cfba411bf1ff8c60e8b
+EBUILD qtscript-5.4.2.ebuild 656 SHA256 a08f9ce723632a9b167fdc451c03a5d82a1fe8e7708b7f775c5a7f7ddc84c401 SHA512 63dea175431a275a7055e0c11e078deb9d4f32cfe037fe7a29fa60d273dabf7841ac48adb0f334ce6b0703a4adc077fec03590eef5772df5332bedc1a2ab7aa6 WHIRLPOOL b9ce8bf7ab99ff18998bd180c8d93a3414f42ef8c9712268ca35b6a4c5d85fd820296419112154265ad3e0bf4f6d6d2dc7b8d20fc60ed6e84cf69df5ce271799
+MISC ChangeLog 22460 SHA256 8bcb6e4ffcf6f26c884ff6d4793a880b2490e6e33a6401d2ae8ae1c359b4eaf0 SHA512 e3e8bf167716636b1cba5ed7b7b171586876c234ee7638a24d928a66bef3d5c7ef54f7e61eeaf381061afd6cdfd43acfeff34395ff4e220df1a454d3239b9230 WHIRLPOOL c62be57f21efc2b3f1018517791f1784fdaa19b2c80ea6aa1990d6a81a0fc4b5ea802cdefb612a3f5768d10453edd425b3268387eeec928e55762dbdca683d71
+MISC metadata.xml 492 SHA256 e949d6d8b6a2ee5654c411cc3e2a7c4b84d304613992ff6f0b7cff1699c06a89 SHA512 96be8ed0e33c9f4c64c8c50e6ab23f3797fcd3733f743823b82708a2b483cd586d07161a3b2e2652599ca5bc02e40ba1937c783d43aa5abc8cd47b40a137aecb WHIRLPOOL bf2b62d6d274f9f0cd35c844b9d053f4e3fbac7ae32911aa254499543da4399f11503e8331b2a2bcd21f5f7812546339fa95d3d539db7674b2d22b01f115d884
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlVplkEACgkQkKaRLQcq0GLl5QCglhveLkDCJJSMzpieBA7bDu9g
-Y4cAn2IxTP8O4Mn8uW5p+DEgpXRUsn+f
-=Gqvn
+iQJ8BAEBCABmBQJVgZDCXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9KpwP/33IDhZtW49+giVeuTwdakE/
+ttCYs06I7KhmotS/7EpduC2IjKsAyth2Wfn9FGRq9pET8A1tHxpC9vrWOXbpXoFF
+5P0/ooOMXKK7NGgQhIQ0R6mDdsIzixkoyPpdchwUngje3oLPatNSHOErKyTwqLmQ
+CvvE5W6JJJbu0X+GmvDRowfvJIaGShp2ruCDQSnH4tzlTa5XyaBve2ivzuBx+9d8
+0Ysm9OLvgx4DTF0sYToMNnXktFpFRch8ouJyeU+GXtvV9jrdcTguicG0d4RSHhLH
+DaL3kTybxAPZzJQcGaSf6kkZNGphuVr8HvpnQNKaRu9n/JcWRHbf55Mi+UY0QcI+
+y3x7+9snUr22azxEpFhPc2UYIQF0I3+D+QO0K/VtyvytPmzF7umsNocLjZNKWpKT
+2hxDy/aH0Xo0cq76V9Cp4QhEMrkXrJXBbYtMfcPzy5w2gJKOqYu4qf3nvzNnRQr1
+NfQOXNDKx7bn2vb/7cs09NBxnSTEwGQImgWGbNOY3Sw96yKrckTqNmb7DIuI2Zmf
+fRVHT61+YjhuoO3X2cKWa8yyeh9/oLvlZ7vIwvQhAf9hgdupeRHQT8Zaj4SA/HGx
+tDWMRdFuE5Ap5TMmJgF0Pu4rl8z8XENxyarH3R4+Rq/TcOh0MV429zNLMpsZ0ekb
+mw3B5vAbXojPquogcUpL
+=Ebzn
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtscript/metadata.xml b/dev-qt/qtscript/metadata.xml
index 85c8348d0277..9b505e691d02 100644
--- a/dev-qt/qtscript/metadata.xml
+++ b/dev-qt/qtscript/metadata.xml
@@ -9,6 +9,6 @@
 	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
-		<doc>http://qt-project.org/doc/</doc>
+		<doc>http://doc.qt.io/</doc>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-qt/qtscript/qtscript-5.4.1.ebuild b/dev-qt/qtscript/qtscript-5.4.2.ebuild
index 2503e319e91b..633856b2de86 100644
--- a/dev-qt/qtscript/qtscript-5.4.1.ebuild
+++ b/dev-qt/qtscript/qtscript-5.4.2.ebuild
@@ -1,26 +1,23 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtscript/qtscript-5.4.1.ebuild,v 1.4 2015/05/16 10:52:05 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtscript/qtscript-5.4.2.ebuild,v 1.1 2015/06/17 15:22:41 pesa Exp $
 
 EAPI=5
-
 inherit qt5-build
 
 DESCRIPTION="Application scripting library for the Qt5 framework"
 
-if [[ ${QT5_BUILD_TYPE} == live ]]; then
-	KEYWORDS="~ppc64"
-else
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
 fi
 
 IUSE="scripttools"
 
 DEPEND="
-	>=dev-qt/qtcore-${PV}:5[debug=]
+	>=dev-qt/qtcore-${PV}:5
 	scripttools? (
-		>=dev-qt/qtgui-${PV}:5[debug=]
-		>=dev-qt/qtwidgets-${PV}:5[debug=]
+		>=dev-qt/qtgui-${PV}:5
+		>=dev-qt/qtwidgets-${PV}:5
 	)
 "
 RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtsensors/ChangeLog b/dev-qt/qtsensors/ChangeLog
index 6e4c7913a1c0..beb45892d970 100644
--- a/dev-qt/qtsensors/ChangeLog
+++ b/dev-qt/qtsensors/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-qt/qtsensors
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtsensors/ChangeLog,v 1.10 2015/05/16 10:54:02 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtsensors/ChangeLog,v 1.11 2015/06/17 15:22:48 pesa Exp $
+
+*qtsensors-5.4.2 (17 Jun 2015)
+
+  17 Jun 2015; Davide Pesavento <pesa@gentoo.org> +qtsensors-5.4.2.ebuild,
+  -qtsensors-5.4.1.ebuild, metadata.xml:
+  Version bump.
 
   16 May 2015; Jeroen Roovers <jer@gentoo.org> qtsensors-5.4.1.ebuild:
   Mark ~ppc64 too.
diff --git a/dev-qt/qtsensors/Manifest b/dev-qt/qtsensors/Manifest
index 2ef3d296b9e9..3c25ea28add6 100644
--- a/dev-qt/qtsensors/Manifest
+++ b/dev-qt/qtsensors/Manifest
@@ -1,14 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST qtsensors-opensource-src-5.4.1.tar.xz 2068680 SHA256 ac4b8e2ef7520e674eb53848ec3d459d8ae92735093106b93104dec7f65edbf8 SHA512 89e7101da70c67a3a3394d2e22c741c59dcb1ba5dba930ab72e7b1890cd8fc83620f9617138f968a9f350e5b2137caa458f3135e112842c67f2c313853891210 WHIRLPOOL 41df97ddc5fd7d02744645d38cc51908d5969e2fbb80dad8bed9ce9def76695c11d8efbd6391220a8c5e421903516b017605876f677cb75f398f5de27f3ae1c6
-EBUILD qtsensors-5.4.1.ebuild 640 SHA256 b0929ff153b95ebc429328e16f8a96310a57e788ba4b543b5541f886b82171d2 SHA512 5d1319e722b34e474f52841a212d414841e7381002206963a785351be37458acdf35286e03f16f1be1b2d2823228b09078895a5c650332d514c1d4ce21be9673 WHIRLPOOL 63dbf76d3b2cc60cb0314c568717d5fe437970d991b96988ca067397fddce5827847c5070b9257c988827908eaea9c559e9afa378fc80e5dfacbc6dd33360e84
-MISC ChangeLog 1347 SHA256 62a81f4154886ec0669755436af6c0e609f23f126fe9b60f9ef6781728c5d1e9 SHA512 d687a386a67ba4411837363705d17f4eed5a1b775b793595556d4efc7ef5c43d9ea300384060065add67f0e6277fe3d2793f76ac1c1a4053382cac63426b5f16 WHIRLPOOL 7e4bda47da94bdd48c7aae063a1247c9e2dea47b381c91d1cd443ebd547a34fbeeeffeaaec2a0dca1d308dfe3cce6617d024c9ad74ce1ca63add97a0a2d57021
-MISC metadata.xml 328 SHA256 23497fbb9a498c0d9631987427e939a7b05721e8de06d0767461cd70f7b3cb52 SHA512 0709500b4784b39054809b60d281d267009185804ef971e899d5cc2917ca4bf67a4bbf06270df5ea177e71f6785da69cc22e68e907f801cfa0a3ee1289947106 WHIRLPOOL 753a593d48db3ce884180a3c440bf3c3d800d23df14732850c8252d705f6e2639cd8ba43f180c7b033ac15befd0245ed1f3e679b7b94b865a96d43187ceb5123
+DIST qtsensors-opensource-src-5.4.2.tar.xz 1982708 SHA256 8e6d961df033733a08b3d050515b9aacf7846c643fe5789c42fc55df96dc5cf9 SHA512 6f415bef4fd70aad0be00a097cf6330a1c501a072dc21459a8e7d70c732e7bdf381409eb9b868c46b5ebd7d5285d1f49e5a84dcf86c64f3e06dc553685f73466 WHIRLPOOL 79847c6b8c5dc4353888ea8a345a26a6f1a8490a6a701719e6330ee01562781fd01f544caa18af19927ffd9c1444dfaa2b54295ec344b7d828bc7094ac3eee66
+EBUILD qtsensors-5.4.2.ebuild 603 SHA256 7b0516b3e5896887a3f9ff2628f229a8d10bccaa420b4f2035c06c57da1abc03 SHA512 8b5fbfe4658f221cbe15274c116bb3f09d468bbd31d03096fd82eaff48bc10a13b4a15356c828014d1d37ff19c7589b5e9702479d08248ed7dc0492d23fad476 WHIRLPOOL dd52f6375ae4068479bd58fcb7f1b087cdea3bb70d44cf768f4e6572157d4e15ecc92a2240bc67b68e322dcb1be97b2179a322677549bf40920ee2c7e05fd5dc
+MISC ChangeLog 1513 SHA256 a1997515a81eca23fef5246b6ed9fecf10449f4f9bddf7a253f2b5fbac7ca1fc SHA512 14b52e2b78df0e5144e6470d61cf77b64319b670ce795005b37882f8093bc8f0da825102bb02ecdb7e94ef2f8f14d051d8c374fdbe9dd22cbefe12009373bd9b WHIRLPOOL 967a24201599f86f82ef14d1fb86aeba409ec7578f18d937c6d6f88629326dac928a3772f9e156189bcf12459051f12d299eef6d4a70759b58e44bb85cca53ee
+MISC metadata.xml 319 SHA256 212681205c716b9e41697e65bc084ee49dd4b55ceac610e0f12ec6164fcc9c19 SHA512 b06096e5b6e9aedeff92ae2115250a39da6fd760f512b6be24641d16f2f7c4add35a0fa79a9c7a9ff0ebe0b1b19f41e55b95f46414b06bf6eff0509e164e9174 WHIRLPOOL a271807ee212c50de6df2e8f7ec3c48b9f55cadf37f2b5fcb815ec1d6aeb2faeb1e723c729588bb058e86b13bfb7f82d0a250a5d1758155bc56c44cbd5663da6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlVXIcsACgkQVWmRsqeSphNeiACeLCvnroIKyysCiWpePuWix7qA
-qSIAnjmDoi3c5maHOnr31d7L/k2IlAjA
-=ks9X
+iQJ8BAEBCABmBQJVgZDJXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9p4EQAKLXIoBekL2qDvpUnMstfmwb
+vFDzSQbn6YFAbCbNO2BydW9HdVN1RkKcpvh2hOTQthVYWmuj4q7MqBBSNqg+BiuH
+8MMbdtKg+dBGHCzPjqxHNO6Utl2foqzCqM+s7LW6S71n5m5tQS0UbdZk+CKk0Mjz
+Ek8+kphwotoNNQN+2s9HZSNzk82Nv3xx+vwkZm31Oo7VBjt4B7KNaWc5WGCYD0Nq
+6P+MU9ID45XGEVlpFXf8+4yMs8f1B2A459aHEcVFtLZ27W3W5YtgF85Dep6sxlKp
+OEDAuWoZFzv4gwPxWyGXQ8SOoWJz2TuosHvy6dnRTxcQ7rCA667aivkvxpSeNiG4
+HpSXewQbG5oWzIuu/J5F9FjliQRtakwDqF9vVKyX1lwgzo/dPTdleej1LadcNaa/
+aCi7Zj17g4f+xnvRv0FcJcKjJWvzK7n960DEjVUZyJopP5KborkmNK3WJyUC9Pbw
+zWSzPxLjGgSbWOQ0ciDoVbvtXccfJlBfESRPD/l7zZSbxAGIIMxTJ2iGMA4urBO6
+1N0B21kzhb3t4q2qLXNhEn/DfA17cWcYFcXmLf8wgwl0q7cMf+4tIn60sJkYnC6b
+deXAI77c9nqLQUUfYAhaBU1nOvt6G4yYKBhfP67X+EHDVlt1tn0LFh0PeWlU8/dJ
+Lga7hz3vThfdz8t2jcwr
+=0bBO
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtsensors/metadata.xml b/dev-qt/qtsensors/metadata.xml
index add78519aadd..bee66c84d291 100644
--- a/dev-qt/qtsensors/metadata.xml
+++ b/dev-qt/qtsensors/metadata.xml
@@ -7,6 +7,6 @@
 	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
-		<doc>http://qt-project.org/doc/</doc>
+		<doc>http://doc.qt.io/</doc>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-qt/qtsensors/qtsensors-5.4.1.ebuild b/dev-qt/qtsensors/qtsensors-5.4.2.ebuild
index 0316238e17b4..689325ce4f05 100644
--- a/dev-qt/qtsensors/qtsensors-5.4.1.ebuild
+++ b/dev-qt/qtsensors/qtsensors-5.4.2.ebuild
@@ -1,24 +1,21 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtsensors/qtsensors-5.4.1.ebuild,v 1.3 2015/05/16 10:54:02 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtsensors/qtsensors-5.4.2.ebuild,v 1.1 2015/06/17 15:22:48 pesa Exp $
 
 EAPI=5
-
 inherit qt5-build
 
 DESCRIPTION="Hardware sensor access library for the Qt5 framework"
 
-if [[ ${QT5_BUILD_TYPE} == live ]]; then
-	KEYWORDS="~ppc64"
-else
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
 fi
 
 IUSE="qml"
 
 RDEPEND="
-	>=dev-qt/qtcore-${PV}:5[debug=]
-	qml? ( >=dev-qt/qtdeclarative-${PV}:5[debug=] )
+	>=dev-qt/qtcore-${PV}:5
+	qml? ( >=dev-qt/qtdeclarative-${PV}:5 )
 "
 DEPEND="${RDEPEND}"
 
diff --git a/dev-qt/qtserialport/ChangeLog b/dev-qt/qtserialport/ChangeLog
index f175a1714633..7f2951776976 100644
--- a/dev-qt/qtserialport/ChangeLog
+++ b/dev-qt/qtserialport/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-qt/qtserialport
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtserialport/ChangeLog,v 1.12 2015/05/16 10:54:41 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtserialport/ChangeLog,v 1.13 2015/06/17 15:22:55 pesa Exp $
+
+*qtserialport-5.4.2 (17 Jun 2015)
+
+  17 Jun 2015; Davide Pesavento <pesa@gentoo.org> +qtserialport-5.4.2.ebuild,
+  -qtserialport-5.4.1.ebuild, metadata.xml:
+  Version bump.
 
   16 May 2015; Jeroen Roovers <jer@gentoo.org> qtserialport-5.4.1.ebuild:
   Mark ~ppc64 too.
diff --git a/dev-qt/qtserialport/Manifest b/dev-qt/qtserialport/Manifest
index fbaaa1ba690e..8959c4d70da1 100644
--- a/dev-qt/qtserialport/Manifest
+++ b/dev-qt/qtserialport/Manifest
@@ -1,14 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST qtserialport-opensource-src-5.4.1.tar.xz 255120 SHA256 79d99e826bf49e469a651cdc2d499d8b54e52bb8aaa279719a3afa03eba5d0ff SHA512 18badeec1a412a692cab4b07da49892597dcdac855c5ef0760f27eb509a4889c69eec1b534778300c1b741a387df3afcb6875c8ab9e371f7c5c69c652dea29dc WHIRLPOOL 2f63357cd48e8ae946dbf8511adc4a86e5ff99e9a60d095a6e1373ae30424a5915138758eb9d15139e55a7e1879d70f291a8ce17b33c7c001281e9d5c458ec69
-EBUILD qtserialport-5.4.1.ebuild 519 SHA256 908b239b646d01ba2ad0d580366f602f71a353dbc86373fbdc8cefa8ee6744cf SHA512 ef89b610f8182a1bf0c5450e96ff8f48c276498bac71f1c81fa28b96cb36981c895b9baeb991f736e0a5c8d44ed3121b70dcd4e3b00fd074fc65bc50c9a3a68a WHIRLPOOL b3696916106481bd3b51ac824c871fb44bb9b0755faa3e7869fe524694572f54f36f987d4e00478b9aaddd141778ca66be3e30f000aea870acb273f0bf02ed2c
-MISC ChangeLog 1442 SHA256 888e959cba5ea5616ae3aa9b0a41020079b50ea0e37aec70843fc43fa247de0e SHA512 6bff92495531e1140c7460debaa50433e9990170f0ec305111dbcccae397e4308ee8bf79cb1656dd03c68256f71ece33e53e2c7574eb6ef09cf01257599b0fb3 WHIRLPOOL 51ca7d55487d95babae1b15ba539b22183ce4b187efdb66b0975bdb34ac9c0f2a8ff3a4416c3c2849e689f3c65f054b53e6a4bd303e3216397136fc8a41c775d
-MISC metadata.xml 268 SHA256 0976b0efa573f782c96382e8f40ec82944c66ed52a89ebe6b0e905050f01395d SHA512 73ef5d7a382915e844a0cf7f1f05ae64c88500ecffe13265d156960b498ae61a62f29c9789330e5f24c82ddbf3a9ebb98aeff5c4cb0e69af1e8f07099791b806 WHIRLPOOL 19922570bea256c44d78d6f92ef9781be4c177580bb4235d8620139c6cfd759df64fc82f053a685d70fa1378b0fd6f49bb818d393b19105e6069730e9cf44e52
+DIST qtserialport-opensource-src-5.4.2.tar.xz 262316 SHA256 93cd414e809beed424eee018338e84742509fc4bc78e5649fbaf370a562ed7c0 SHA512 e52c0d10f51af7546a77372276c20c008c647d1d43c4a267f13e484d88d0cbbb565fd1b93a9526b721357f6c6caaedb458d888c87d6826346d417eafdf5c4166 WHIRLPOOL 567e30cd8f3ea47ef401b7564f595b4b8359d4b1278bd3648c0b1dcaad5859e0594092176cd31bd314093cd39c35e6978a5b98e5916345b38edeed96c5e69cbb
+EBUILD qtserialport-5.4.2.ebuild 490 SHA256 6c95d5a63992545cd343d58cbecd77174bb3913470ac3404b04b760203341317 SHA512 f1cf59ea0ee64fbac2328dcc64e0b4d40f3a987ed213c4685155dfc5cc8b16b1557bf51da9b45902b3531b8112b13aae00ab17475ffae551aaf49f51d9a5baf2 WHIRLPOOL 8771810bbfdfa8fd84c56303cc892a6975831e3e46ec6394ba7841614515fba2b4ad4b6b7188ac30c9c1d1e7b0dfa7db5474c7f100ae2719fe01f73f885ab540
+MISC ChangeLog 1617 SHA256 6fb7e7e280317d043692a0112cfb4146e81b289971bab080bc38b7c0a9f4d899 SHA512 18d6243661825c0ebddf8cea18b382bb78afed2d43d479cc47003cc250e3a7afcaa9e35bc8a8558cb2a1c406114813872b62ab82d5993e1d8f0a67c095b183e4 WHIRLPOOL 87df8e2d2a6f30f5aa9a3e0b6b18f7b1bb42ac0299b9bc2ec7141ff21a0a5d78e3e99925e674d5c81d7455702740bf4723e2f7452c339ffe0b87328c3a07f276
+MISC metadata.xml 259 SHA256 da0ed92b6766281315367c03378c1935b4e9fa82f840641d9c72b00a1b038646 SHA512 1fca930f71c109412ead8932e0910f6c2b1991a454b03ddef6dda7101358db65b3c6da5eb7f71c918673fd3b9b0ac0397cef0dd24c85f84f2043e3ca8e21dda1 WHIRLPOOL 484f50be685ae8a8a65889a66edf2a6d544e0c6758a8f384bafd7e8f1cc23c4e788613d39febc67f1fc6f99e9e7541881f6224e07497ab0ca031449053b5e13b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlVXIfIACgkQVWmRsqeSphMCdACfZzRvbXsCQ/PPZePlAc/EE3Zt
-cB0AniUAkG7rJalR8jgPs6950euw4GCv
-=T1iU
+iQJ8BAEBCABmBQJVgZDQXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9RWcQAJfY7F7uuCZOsLI7FHkuLrSu
+iP09cBCY00kuC6jMrkQxKoDD2XUcdbgZb3SKx5tImcYDRUBbWVKQFDScfdP4W2Ca
+nmgoltm5uzmq3dc/iKkdATjEWtL6ATacBT2LyQ3tteOeflzwEXJx6GWtTTMsL6QA
+3bsxcIF0DifQ5322fM+BqGLczCeZMQO1tYDXQCB6NvMKJ6wAsTpY4kZDvve3NeUV
+SFawGgK94Il9iv5EkvN5ZU5ffOn6wvwsnxkfLlR2I+1+L5uBVWpOSyHomvn6qp/7
+0QPIXTdKw6tmQEsswJzxm8/Sw9aDAMKhxgk9RYx1llNpWZv3rVJNqCnQqs0Obpus
+4QZCRw8SbyMAzdECQ4VnLt+o0DX9RQGMoVFyM9sTAWv3PeZXVR1UKQcXvR11DD00
++bIs+HCMd5C/UDtSLlhevrxizBf7WOPPGyK6oSd7yGeolhFxeBjyojz9n2nnvQQ5
+1+dZdMYYfhgaG4LUdQbNyV550QOJuyvN4tHb/Tz3XwIaa/Dr1faGznDZAMoCoke9
+jnGDudcej55jcGTGUEnfjQniqtCJMCObJMzhdoXjUtAJ/ogPfORqRZ7E4k3YrmDs
+/qZ2BFT1SIOWMuDTK+wikybO6D0EHqsGGrqw9iZXbKewljuzKwJeWhRgR5L5rVa3
+ENnOo13z15jrmbrF9Qv4
+=2QWM
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtserialport/metadata.xml b/dev-qt/qtserialport/metadata.xml
index 39c63597e531..afb3b434585b 100644
--- a/dev-qt/qtserialport/metadata.xml
+++ b/dev-qt/qtserialport/metadata.xml
@@ -4,6 +4,6 @@
 	<herd>qt</herd>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
-		<doc>http://qt-project.org/doc/</doc>
+		<doc>http://doc.qt.io/</doc>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-qt/qtserialport/qtserialport-5.4.1.ebuild b/dev-qt/qtserialport/qtserialport-5.4.2.ebuild
index 49c3b31c3d7f..3b5e86644bed 100644
--- a/dev-qt/qtserialport/qtserialport-5.4.1.ebuild
+++ b/dev-qt/qtserialport/qtserialport-5.4.2.ebuild
@@ -1,23 +1,20 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtserialport/qtserialport-5.4.1.ebuild,v 1.3 2015/05/16 10:54:41 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtserialport/qtserialport-5.4.2.ebuild,v 1.1 2015/06/17 15:22:55 pesa Exp $
 
 EAPI=5
-
 inherit qt5-build
 
 DESCRIPTION="Serial port abstraction library for the Qt5 framework"
 
-if [[ ${QT5_BUILD_TYPE} == live ]]; then
-	KEYWORDS="~ppc64"
-else
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
 fi
 
 IUSE=""
 
 DEPEND="
-	>=dev-qt/qtcore-${PV}:5[debug=]
+	>=dev-qt/qtcore-${PV}:5
 	virtual/udev
 "
 RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtsql/ChangeLog b/dev-qt/qtsql/ChangeLog
index cf70e86a1b38..d467fa38e89b 100644
--- a/dev-qt/qtsql/ChangeLog
+++ b/dev-qt/qtsql/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-qt/qtsql
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtsql/ChangeLog,v 1.38 2015/05/30 10:50:50 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtsql/ChangeLog,v 1.39 2015/06/17 15:23:08 pesa Exp $
+
+*qtsql-5.4.2 (17 Jun 2015)
+
+  17 Jun 2015; Davide Pesavento <pesa@gentoo.org> +qtsql-5.4.2.ebuild,
+  -qtsql-5.4.1.ebuild, metadata.xml:
+  Version bump.
 
   30 May 2015; Markus Meier <maekke@gentoo.org> qtsql-4.8.6-r1.ebuild:
   arm stable, bug #530238
diff --git a/dev-qt/qtsql/Manifest b/dev-qt/qtsql/Manifest
index d92edb1603d2..331361a248d0 100644
--- a/dev-qt/qtsql/Manifest
+++ b/dev-qt/qtsql/Manifest
@@ -4,17 +4,29 @@ Hash: SHA256
 DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357
 DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2
-DIST qtbase-opensource-src-5.4.1.tar.xz 46132220 SHA256 8574a593830959c0f7e5430fe77a43832ea7f5299e14a397a74576b3df7fb1b7 SHA512 75d2c16bc47e6403e15c4094f50757157960cff4434de29f199b015795ba772b62125f01c09aceb2a06f8dfcfc4df8e35330259c76959239f276e2f5bd5221b5 WHIRLPOOL 48d9a583ba9d0bbfffdbfeaa2412e77a0bf4011e7bba525129ba4572faa6a55713a89cb00f4ed7f24e6782e3f7b8b48cb192e2c082b7dcb3c35a85109f2eb340
+DIST qtbase-opensource-src-5.4.2.tar.xz 46354192 SHA256 9fc4f720b8b5a8b8e4a7d45e13ce4d5b86756ad46fb406386637eb2de5fd5a74 SHA512 029da83969614bc9b3803c76242af62911e3c6de171b116b5cb8e2823cad0514ab705cc3fa331e042c679caeb099de4e9cd7ddea92959f675dda82533e3ad7fe WHIRLPOOL 5f352f78a779c5d042f04966a010b10af706c4db94976870721a550e3ab7eaf2695b3582c86cdcc3a11de36283e11fe65797f96e59df96fa367b16b72b5f9213
 EBUILD qtsql-4.8.5.ebuild 2491 SHA256 4b025b64c2efa0a0c68013336770a70bc50c176cba79c2bd846592bb14e3d29b SHA512 31e89c38831796cb66beca7c07e0359f2523be923eb6a05ec91ddd82452b5b6d6b8efe66863c21a02b4a84e14f3486f9b0d2eff970d2b1995a747d80260a5924 WHIRLPOOL d85c1715c7cce491637873aed8aa6f60d8d5682d7f881721279d21800710f8b5580aa8abc862769b270a102669904e5ba22614bbebc21953e6c5c0f80105fc51
 EBUILD qtsql-4.8.6-r1.ebuild 2507 SHA256 7389ac5935762fe354b9f25229236bb7e5a423a8a355797cc617528804728900 SHA512 72bbf3158a75f22a19e74adacfdf2c2cdb040ee88fbd7118680b75ffbd13eb6a47165e58d7080a388200911c20d26d8593aad742a45b719903f0b43d47e177c7 WHIRLPOOL 5a4cb4de4c6d62a53ba89d96eab7ff82692ec136371aef1cac4d4c3a56ea9d153e841d6dbd7cbb480423cd046525d64a05c985c56205e72014128544d32dd657
 EBUILD qtsql-4.8.7.ebuild 2474 SHA256 2ba93cd91f0846aa4cc43c2a9b0cb543fd0594fe7c1a9f012de41086333ccc00 SHA512 9a2ac2c749137bd6f01a25ec9501f217fdaee55291cd5b745617e81b2753fac8e2e4921da5fc8549d379cf976e05276517f6b8f0e8779568fa29507373dea52d WHIRLPOOL 35e537a438b95eda7790651fed63bb4c294c280696f38a169c8622c7c4c75db073b941b8cb9ccf139d294eb3f2a347f410649ea14e56f7f85d620fcd87cbcfc8
-EBUILD qtsql-5.4.1.ebuild 1541 SHA256 e5b82f390f8e29e1219c53e02dd1a766f210b7604d93d9dc89a7be114ae0fc99 SHA512 9474a802fdbcfcc4cf1eef9d6529c151f6132e919f0d65cef88fa6045600b22bf21b60cde1378e3bf721e8e5a5033e41327d574c18c2fc89d979fd7922241023 WHIRLPOOL 83c99d87cb58c64986a9eae29023e992b41dab10d0f360fc5c3e7071fbda9e755e869aa0326235f0d3171e234cb62dcda21349da0c8634ea75b9640501d69477
-MISC ChangeLog 23936 SHA256 71c0441710c1f0cbb058f8951eb9535eec034b7ce907f2856f1e05bef2abc1da SHA512 f0b7ea7586c36b409c8b8883049d9a62d8feec8e1c50b61d1e25746698b048e34f26c18002e43861f4f20610448d36bc1f49df9ae7262cc6cc816768f1b77576 WHIRLPOOL 68c6d5723b8a816559672bbaf04a2be127bfad5185da7bc34c6550273ca0f7a7f18fdacbe1e4fd558f64d773a8cdde3d9448e0eeca063d22d2f8332d3fb3a64f
-MISC metadata.xml 488 SHA256 91e75b5ca67976cb4116b41198d28f71ea32ba3de262c4b08f2af5fe5e415ae3 SHA512 510ad3b092b9bd46d6b6af1eead24b565fc690ec3b8bf9082327973dc163003711a4d954de0aec43ad91703ba20e85248f49b0e0e4a73a43fab81ca4c2945038 WHIRLPOOL b02a637b20859aee4f7a0d6d78a8250f5b616d6a1d7b35e121f9bfbd6237383393cbec6adb4de07c7a9327fdd9681c6700df3db0dd3920ece0dbd90a12ac999c
+EBUILD qtsql-5.4.2.ebuild 1511 SHA256 cb3985980c828819889fd4b7634a2764ef7b957cbfb86e64e699d3df59eb3165 SHA512 55f25a42e984264881f044a601d00e81508d8f45f845c6bfef1be64d115d4e290793bb9b4472dba3015de99f5dab7032d61fb6f4891b5c0fa3e8e9cd45cc94c0 WHIRLPOOL fb5f4d666883e6046a2d0bf10e39fe7509258f5adca7af1f5dc6659b1136c840b9ca6736ffd5aa40bbd5734162a3578fc6380cfd7448155ac847d475c0c7b327
+MISC ChangeLog 24087 SHA256 557250c3f8dc740187262dd970bd3749617daefafa8ef58e269f92438013ec48 SHA512 38558e829622e3c45fd65e812ba4b0bec8d1fc48d699b7d6afd0d59f95c5dce7a7d1f7d3f4a446c1502931c49cd8eb7f68697d3dbe3c614999d6e2b8d6a380f8 WHIRLPOOL c3112f02b7d0512e1b0f40a38e35e57d9b6cf4445e995d4f6d3fc48603fd52c60f9faee05b70b4a1df4cacde43f0e84af2edce1587841483378ba9d5b5f30ca4
+MISC metadata.xml 479 SHA256 253d93b73ed501e979dbd9f79eee8c8acafce7babb1ff659a3a1d1400ac41d6b SHA512 21540866b06984ecc1a59ec68f67cf0ee63fcd2692481cd4f79b6830f060a477a9ddb5abc3b169ae796dad3f738e3c1d3f36779bb65983149ca84fd71f49b2a3 WHIRLPOOL ad924e4aaeed7ad91078211bc95a2c08f080fd55a757e6287fedb14a30daf3d3c0ea38d0a936ae723a760305663ea0d424fd9fe4d84a5ebd841068d66495e392
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlVplgsACgkQkKaRLQcq0GJsJQCePgdVTSUg+LeZgBYc6XzJObBk
-ulIAoKvNTyI8WDEQ6jN+nW31sAk6uAa3
-=6VFV
+iQJ8BAEBCABmBQJVgZDdXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV93BQP/2Y4WhaWvul221zRIJwU5siU
+awGfEKS5h0PbNeYu70re36YQ4KAlHfAMFkqrueZsVhOpKh2dpQIOvjqZ8VnSAZEC
+6nwpe4XBIquI9sZ8qMR26rgGZDa7W34doYy5XPFuGD+eNpK3ikwdUaUinE/NxWIs
+Q3akicAFG8YyV73hUXEWfO2MuAFInBaySwg/zxvfaHk2LefJ+RFnrIEDpdkCBlEi
+K9Nwu+xXMOaZyAB581zNYrrEbbiR3SHkSBs4IwxVToq9v8gxMan4LVE/KKIsYdco
+2LEo6CCF0iLtMAzZSciNr1GWdLfVFdoCHvKjRU1CLZiLMAmwb49gtDB4MMImHp5t
+s9EJHMFsqmmfCyrAAlYurzE7kYZV0EoikOSVP/tCQJdgvYYDt14f7kBrmUg8mgWB
+Y4QagDSw68IlZ2a4WAqW6KwdRucdtFjwEg0PVX2tLqRGPkmNfAMCCtOEC/QuQiBU
+fzPil4DQYIfhvbwjFUMmJmF7ePcFQ8A3shKMnPq2nrLwki+2z7u/5tHtRH7pG2ur
+3N+JYrAhD+mRebGoji5SBfQ6/0BDhEZidGQnbVLYwRpcj/PcDwYJcm9XYwJz8vGi
+hB2fN50aJVloVK5zhOx6OMobDybmvdkqlCEYi5p+P5shHb1qvuccjlD52FZFJTxh
+xKDzddm8B+z9l73NaWjh
+=/P9T
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtsql/metadata.xml b/dev-qt/qtsql/metadata.xml
index 1aeb285a697e..dc8562cfec93 100644
--- a/dev-qt/qtsql/metadata.xml
+++ b/dev-qt/qtsql/metadata.xml
@@ -9,6 +9,6 @@
 	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
-		<doc>http://qt-project.org/doc/</doc>
+		<doc>http://doc.qt.io/</doc>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-qt/qtsql/qtsql-5.4.1.ebuild b/dev-qt/qtsql/qtsql-5.4.2.ebuild
index 149948debace..8e4afa138e1c 100644
--- a/dev-qt/qtsql/qtsql-5.4.1.ebuild
+++ b/dev-qt/qtsql/qtsql-5.4.2.ebuild
@@ -1,18 +1,14 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtsql/qtsql-5.4.1.ebuild,v 1.4 2015/05/16 10:28:21 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtsql/qtsql-5.4.2.ebuild,v 1.1 2015/06/17 15:23:08 pesa Exp $
 
 EAPI=5
-
 QT5_MODULE="qtbase"
-
 inherit multilib qt5-build
 
 DESCRIPTION="SQL abstraction library for the Qt5 tooolkit"
 
-if [[ ${QT5_BUILD_TYPE} == live ]]; then
-	KEYWORDS="~ppc64"
-else
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
 fi
 
@@ -23,7 +19,7 @@ REQUIRED_USE="
 "
 
 DEPEND="
-	~dev-qt/qtcore-${PV}[debug=]
+	~dev-qt/qtcore-${PV}
 	freetds? ( dev-db/freetds )
 	mysql? ( virtual/mysql:= )
 	oci8? ( dev-db/oracle-instantclient-basic )
diff --git a/dev-qt/qtsvg/ChangeLog b/dev-qt/qtsvg/ChangeLog
index 588750c3dc74..b841d8297090 100644
--- a/dev-qt/qtsvg/ChangeLog
+++ b/dev-qt/qtsvg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-qt/qtsvg
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtsvg/ChangeLog,v 1.33 2015/05/30 11:00:28 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtsvg/ChangeLog,v 1.34 2015/06/17 15:23:20 pesa Exp $
+
+*qtsvg-5.4.2 (17 Jun 2015)
+
+  17 Jun 2015; Davide Pesavento <pesa@gentoo.org> +qtsvg-5.4.2.ebuild,
+  -qtsvg-5.4.1.ebuild, metadata.xml:
+  Version bump.
 
   30 May 2015; Markus Meier <maekke@gentoo.org> qtsvg-4.8.6-r1.ebuild:
   arm stable, bug #530238
diff --git a/dev-qt/qtsvg/Manifest b/dev-qt/qtsvg/Manifest
index ebf7362d614c..74629281056d 100644
--- a/dev-qt/qtsvg/Manifest
+++ b/dev-qt/qtsvg/Manifest
@@ -4,17 +4,29 @@ Hash: SHA256
 DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357
 DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2
-DIST qtsvg-opensource-src-5.4.1.tar.xz 1758812 SHA256 be8a90ccce2e873d3489a416d1748089f46e329519acb990cf851d6c9f9de12c SHA512 c3fe482f774c1b8d1dafadf22fd731d4d0c8b6c06bd4479e08219cb9333236ea70558e59448657bc2f960d7084dc88a83b09184647de6981f702f4d42157660b WHIRLPOOL f79ee7d7496b03a9b377fe0d8c94e820cb1f582d1b5774e0eb96e3395192c2dc00f70990f0ff6af8adcda955ed457051d762e4a9aece467ea165cda4c3fa7ced
+DIST qtsvg-opensource-src-5.4.2.tar.xz 1793936 SHA256 7f2a66a9bc55eace254505475a31b4d53f0baa74b65a81da59bb93122eb35eb7 SHA512 78d389a02b8f713b34b34b464f4b7886545baa01c6eeb99dc03a7c467cb1ec72a16dc1eeb03e1b1b622354eeb873aa6a4aba2f2c9b603c2910ba84949a5311f7 WHIRLPOOL 4a61d94cf9ea118bc51562e3cbb0a783f515d80ae81092e98fcf17c6d76b6f94376c7313271e937b145f057be99438fb16a66bc62109641437a96154316f5705
 EBUILD qtsvg-4.8.5.ebuild 1492 SHA256 2a63796f92c2320f51f5981618079b3e1e34baecba2a65230f35695e4743138b SHA512 b1642d376047ebe9b640a2d2ecb4886b69afab0465700f1d38885f7951e547825f8f55d2cf25e8a14544151fb1990d4968719a9ba00311be1287184927e3e0f4 WHIRLPOOL 4606c6934b0e858e1107821216318da23787e3d9d2ca71414f33fe975907deaf8109b53b5d0f6d163c6194ad4147bbffbfc6f54f4c1cc95fad79cf48b54c2572
 EBUILD qtsvg-4.8.6-r1.ebuild 1375 SHA256 6256bd45fef2ce561e380cd9ea07f818e0c3882aa8309f89a8ee36050706f70e SHA512 364b6a24b3150bd2f3a527ec51b21a01ce10d7fd7f74782468e46ee381d95878350a6f4cf8d480b48386ec41ab97bb0c54e063181fb02bbc349fa8bb53a09237 WHIRLPOOL bcd203bd1c62a5d4797be0b54b449a6a9efa945a90ac58af5b3925e16c594a8412a173832f736c0f12e0b9709270440e0017096152a16a9098759c7a18fe0c44
 EBUILD qtsvg-4.8.7.ebuild 1342 SHA256 5f19682311a3befc33eb06bfed1a6ae5d1d97b693fe0820937cb02777ec14ca6 SHA512 b65be88b224da07bca465e2ebcdc466842c5fec43daeaadab7a73705566fccc1028c058b281be6acb35a17f58437ed9c3896dbf06c1000d198aae774ee269eb4 WHIRLPOOL 4828a6a7f0d0ecba473fc0af5428f598be3370ef71b6bcb1dd273f49b9becfa012fab579763f56480569d07b0401e3d22d4bf322198746ec1aa64fab483f639d
-EBUILD qtsvg-5.4.1.ebuild 615 SHA256 0745548995ae5b4cc7d41c04cf1a17b6ca72c1428e30f9ddcb36d279e11e3fde SHA512 4e19e22655e78c22fc1d4848de781abbbe9a2d529b7dde2a8af49068655856ba5b27cabc14e235b57ee709ac434859b5d6c3b940260669c43052a807df41d521 WHIRLPOOL 7eb0b75a40232cdbd7cdcee340320556105168d281cc4b6623f89049f583150127e174d8565b79dcff60aa6bae410722f263df44606f1570d01ad5d132fd3729
-MISC ChangeLog 19491 SHA256 aa4ba50fbc8f53b115054d82f0bf7f911a970cee592ac6800863d7343676b36d SHA512 5f7a6b3a74a405db6bca3b2c4b82f1275cbf3fd2d6ab85c2bbcfc9dd28164c5177a316ce621d446e69664f96df486e580a5f1b9577672f76ab17d5de6ed9dde2 WHIRLPOOL db7825d41e64086375fcffdfb35a9637f12681c790928c3671d7db844a444d20172b1608e574a5b729e47de950c42f3277a98c134d41c2d3c8b29eb89cbf1c36
-MISC metadata.xml 415 SHA256 fec2eeff3a64eeaa82d79ad5efa721bb975f8073c182f9dcacd2c72009e9f8b9 SHA512 9aa9a89b39c3acffbd34f25beca742c89ff7f1b6a06e1fe95d800369e6ea2a4629eaad1884c6a601b39b9ae12230580cec2f44ceb51c0fad93a512153a302d3e WHIRLPOOL a64dfbcbc44161555ff6a6461189abc47cf4e34b705a6376d3937c26099eecc9f7228812e1fe3514afbcb3cbe1ec24e5abcc941f13b48053ea57aeb0429a18ba
+EBUILD qtsvg-5.4.2.ebuild 570 SHA256 ab0660aba77b0373640c7d61a9205bb81426810c5dc4c011e4dc814d3874a691 SHA512 021c936e96e96f40a1c3fa1d992d16a972c13d85837135b7088921dd61e35f4983d5d59723e4ec95b5e049d29364cabbc5f83f1ce5986c45e4d4da7ac8e897da WHIRLPOOL e357ceca5dfe4922f9efb54325a1eef474db943f992dc614ea8f83f32df45c213abbb5f96a29c30281b318f0e9961ae35a9a5b0f95c04887b15c5a3389890b54
+MISC ChangeLog 19642 SHA256 1d186c3f6552a200434164aefbcdb12fd220895e1cb4cd2164f41cf92d01c51e SHA512 c53c8800fad8a3d5b3fcb57a8061f49ec162c2a097a6f70bb95f23ba0a9aa73b62954e592135921be09ad24da979452bbbd9b91e57ddfa2f0c21d9f6f09e05fd WHIRLPOOL 26e8ad7090abed43e35a15b36bd6db7dcff2d1490a8be91c27028838df0c94aacb406369f3d1af48202dc13ad0f6bcb10c5fa57bc3c378da7de50cc49658639a
+MISC metadata.xml 406 SHA256 9b69df2d1422470da7bc919a570303d186cc74e404c94471789765cb6a7f60a2 SHA512 6793c43be90e7d93c0971597a4fedba2fc26fbbe7718c0944ab655ce22cb9bd93e96481b3f758b471dcd705666abbdf3e1a75faf756ae90b283172c1e15d2682 WHIRLPOOL 1ea46d494c20389eb3db0a8ba6d9abd6cf2fbd94657e7ca33527ad3be966d043957bcee9e8f6c141fd4c42aeb2a708a4c8c791df812d799809f9819373d7e55b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlVpmE0ACgkQkKaRLQcq0GIUCwCfYwKmrgcTZ287uWoDjZ6MP7nm
-8Y8AoJU883p8NM6CsBBJr4D80lyiEyrY
-=WHtv
+iQJ8BAEBCABmBQJVgZDqXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9+mIP/jjaORDhTwlcX6G8GFkTEJtu
+AmZt5P7MqPFaKJDMimfg0QafVHn+Uu+W22q7RmI5TgPdXg9meN6T6CHsUd6uKHuF
+UuLR+t5x4Qdi3oAlPGOaVMYpo4cbUB9pQeeuh8t03kcC/o1T1SwmOvQfVa95qYy5
+BoyQNwHM6lRIu4J+8MizRgLY9rYHbpI4uUE2WxiZFkbJLBG9FvX8JV8g0dyM3AZM
+7NqZLRhN2XgEanUtNc5tiHA5U4k5R1AfM09SI9aX583YvrJEtoIL4oZzim/Uspn4
+p/xEWHfrlTdwAlXkyQz4LRh9qw8SAlXJT7b71TP/rLnETj5nVeUcQ0ugQFJYXN6v
+5oVODy9J+yZgHlThJ/LePfM5Re90F8j5xnJOZstLXGYojBEPq61cnUVAdajsuM9A
+fS0sQkySIaJGPc2MG9QVfajUBWX9v0iK/kx0c7yttmN+KQqLqIYW8GF1+VfJboZz
+VsA+K2eyAlAy6nHcWftPf3Uq/PLV1hr7a7qkJKfafTFC3oFfgUX52U8klqw94IJo
+Vn+voESDIFPQpDumKZ7+IkGStUtIiixpaxjDFh5vJmoaUWPYJNtZkarREWCY9qAC
+kwM6vLPxhAnIDATckIlsoY6pXh4QdRlln/GUFFXrwUOsIprk7lthVW1+mYbzm6n1
+TQtvErzcBtFWB1wjPnds
+=87Yk
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtsvg/metadata.xml b/dev-qt/qtsvg/metadata.xml
index d05859990036..258aee1d6e0d 100644
--- a/dev-qt/qtsvg/metadata.xml
+++ b/dev-qt/qtsvg/metadata.xml
@@ -8,6 +8,6 @@
 	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
-		<doc>http://qt-project.org/doc/</doc>
+		<doc>http://doc.qt.io/</doc>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-qt/qtsvg/qtsvg-5.4.1.ebuild b/dev-qt/qtsvg/qtsvg-5.4.1.ebuild
deleted file mode 100644
index 136886c4e809..000000000000
--- a/dev-qt/qtsvg/qtsvg-5.4.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtsvg/qtsvg-5.4.1.ebuild,v 1.4 2015/05/16 10:57:14 jer Exp $
-
-EAPI=5
-
-inherit qt5-build
-
-DESCRIPTION="SVG rendering library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == live ]]; then
-	KEYWORDS="~ppc64"
-else
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
-fi
-
-IUSE=""
-
-RDEPEND="
-	>=dev-qt/qtcore-${PV}:5[debug=]
-	>=dev-qt/qtgui-${PV}:5[debug=]
-	>=dev-qt/qtwidgets-${PV}:5[debug=]
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}
-	test? ( >=dev-qt/qtxml-${PV}:5[debug=] )
-"
diff --git a/dev-qt/qtsvg/qtsvg-5.4.2.ebuild b/dev-qt/qtsvg/qtsvg-5.4.2.ebuild
new file mode 100644
index 000000000000..922b1ca14c60
--- /dev/null
+++ b/dev-qt/qtsvg/qtsvg-5.4.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtsvg/qtsvg-5.4.2.ebuild,v 1.1 2015/06/17 15:23:20 pesa Exp $
+
+EAPI=5
+inherit qt5-build
+
+DESCRIPTION="SVG rendering library for the Qt5 framework"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+fi
+
+IUSE=""
+
+RDEPEND="
+	>=dev-qt/qtcore-${PV}:5
+	>=dev-qt/qtgui-${PV}:5
+	>=dev-qt/qtwidgets-${PV}:5
+	>=sys-libs/zlib-1.2.5
+"
+DEPEND="${RDEPEND}
+	test? ( >=dev-qt/qtxml-${PV}:5 )
+"
diff --git a/dev-qt/qttest/ChangeLog b/dev-qt/qttest/ChangeLog
index 98d3dda47719..24602fa7fac3 100644
--- a/dev-qt/qttest/ChangeLog
+++ b/dev-qt/qttest/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-qt/qttest
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qttest/ChangeLog,v 1.33 2015/05/30 11:07:02 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qttest/ChangeLog,v 1.34 2015/06/17 15:23:33 pesa Exp $
+
+*qttest-5.4.2 (17 Jun 2015)
+
+  17 Jun 2015; Davide Pesavento <pesa@gentoo.org> +qttest-5.4.2.ebuild,
+  -qttest-5.4.1.ebuild, metadata.xml:
+  Version bump.
 
   30 May 2015; Markus Meier <maekke@gentoo.org> qttest-4.8.6-r1.ebuild:
   arm stable, bug #530238
diff --git a/dev-qt/qttest/Manifest b/dev-qt/qttest/Manifest
index 89f4ca2fff5a..a7804c8c7530 100644
--- a/dev-qt/qttest/Manifest
+++ b/dev-qt/qttest/Manifest
@@ -4,17 +4,29 @@ Hash: SHA256
 DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357
 DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2
-DIST qtbase-opensource-src-5.4.1.tar.xz 46132220 SHA256 8574a593830959c0f7e5430fe77a43832ea7f5299e14a397a74576b3df7fb1b7 SHA512 75d2c16bc47e6403e15c4094f50757157960cff4434de29f199b015795ba772b62125f01c09aceb2a06f8dfcfc4df8e35330259c76959239f276e2f5bd5221b5 WHIRLPOOL 48d9a583ba9d0bbfffdbfeaa2412e77a0bf4011e7bba525129ba4572faa6a55713a89cb00f4ed7f24e6782e3f7b8b48cb192e2c082b7dcb3c35a85109f2eb340
+DIST qtbase-opensource-src-5.4.2.tar.xz 46354192 SHA256 9fc4f720b8b5a8b8e4a7d45e13ce4d5b86756ad46fb406386637eb2de5fd5a74 SHA512 029da83969614bc9b3803c76242af62911e3c6de171b116b5cb8e2823cad0514ab705cc3fa331e042c679caeb099de4e9cd7ddea92959f675dda82533e3ad7fe WHIRLPOOL 5f352f78a779c5d042f04966a010b10af706c4db94976870721a550e3ab7eaf2695b3582c86cdcc3a11de36283e11fe65797f96e59df96fa367b16b72b5f9213
 EBUILD qttest-4.8.5.ebuild 1235 SHA256 9af9796bbe211556c571dfbbd5df2345537f8256d14575e4f744129c0584f518 SHA512 06fd671a287d1ed6be3ea851900b7fa8a33e322f6a174191d7129dc617e389c38f9802960ad54b589561c05c244afff5f1aa70a8cd654038c0341238b70113a6 WHIRLPOOL 65b770349dc32825c820385f0eab705a0e5b4115633487e03b92fa3ae9f31f6355719624a5f41b402b0acc404c6e48d20e9f51eb2ae49fb86f82a0e98bef11a3
 EBUILD qttest-4.8.6-r1.ebuild 1156 SHA256 122b72ca383e3abf01f53962e5ce0532cf46780a873ef35fd79e104012f30c7a SHA512 3394a7297348bd6efca64a680d303061ce9eb4fb686b7a9e3b71c26f3bdedacd28a7fc5edfdcf97dc106aee70bde272f1433f59879bc5f4a6348181621c35d5e WHIRLPOOL 96af4ce6f6fafae572db0fd94c77332c142ffdbb1ce1eb48723facefd0cd53fe1a5963068b0315503153220bb9b9a062a126b553bb1180e31913e2fa0c2402f3
 EBUILD qttest-4.8.7.ebuild 1123 SHA256 20121c56fbd8fc959eed875a8032db35f36c67e0849781fc938c8b13d2bced75 SHA512 566991355441953df17cb51ec57248e143498c307cf7baadfa4e8535ab5aeb7b638cfa9ef63609727b78d737ea68c906760684d1c0f29d113f80a6fadadb6b87 WHIRLPOOL f9f344d36cd37b51ca6a1d7f89bd0caa82f6f7cecb9da8df3b4787b836ef327d5cbe9390d9dc39e5a9d6d942b87e315ad4a6c123c5c602525d04b8cfa1138872
-EBUILD qttest-5.4.1.ebuild 643 SHA256 ea77b476e421500761a207ed81bc340c2bdb92f55b5279e843dcb8894f002c23 SHA512 767ec2ecde59b401b21ccfc678c0bf720e059b79de909d664ba66afdd86e7643b4afde7517cd0a28ab991bfe4a0b4f5706d0f544b0cf87805566093174072a6c WHIRLPOOL 623ac3b5556a6cf1100b78b90925ad03058b4ebbf1f4711ce24b759e573f5bb292dcfa1d45e79827b7da68f7e20b19185d76adba18cd7b215b9dae7d06f0587c
-MISC ChangeLog 19578 SHA256 cf5f51d1ff53c93dd038d05e1ee54ef0373ffdda53667b12f0356ad0c7e7f50e SHA512 1dbdd9b2f712bb79568dc85d55ac84958a8b232c8f9f82852776dd5927cd01976f5796ce4eb0a601c5ff82aee202bf0a450e53970e8b404697bb19a271cdd1c2 WHIRLPOOL 4bd909ba06921bdfd057778c400ef94c66b548537de466768a6c76f8a97519f6d217ebe4b388ac7edf8e32ff5b9515232ca0f7a15b53790167a4df450f0d30c4
-MISC metadata.xml 415 SHA256 fec2eeff3a64eeaa82d79ad5efa721bb975f8073c182f9dcacd2c72009e9f8b9 SHA512 9aa9a89b39c3acffbd34f25beca742c89ff7f1b6a06e1fe95d800369e6ea2a4629eaad1884c6a601b39b9ae12230580cec2f44ceb51c0fad93a512153a302d3e WHIRLPOOL a64dfbcbc44161555ff6a6461189abc47cf4e34b705a6376d3937c26099eecc9f7228812e1fe3514afbcb3cbe1ec24e5abcc941f13b48053ea57aeb0429a18ba
+EBUILD qttest-5.4.2.ebuild 597 SHA256 c8f35a8045c7d1583687cd83618858657934c4aefbfc8d9c54505b2c5cedf8f5 SHA512 50ac38329e2a3c0bc6026867f61534de3592e4fd72c9cd2c4b78f8d66809b9b9972facadee61dcf9343c662676cc37f88b2ae3d16bd3885edff2ce5576e529dd WHIRLPOOL 7310b3f6af2e065a70d06e01df2827408c4bf7ecab0a52e99b9eb39492519b936223174cd4fba1abeaa594a7f6221610d274702f0ea0c9a029afa24e52b994d4
+MISC ChangeLog 19732 SHA256 534ff616380a301a967cf4e483ae96d1be92f50efae8da9b63194cee280e1e09 SHA512 3000aa7fe3a94dd449a47142d0faf4cb7968a6368a6ff69d6e1f39d0e9ebc6f0ef3da174bc23b009e887cd92fd2a5076df272f63001af93dc925e9454ca2f215 WHIRLPOOL cb79bd14d6a99cb4cc56aaec368efe15fe85ef61632e859a9a236b29ab1552f20834ccbcf931a37c003e5d93927e2ad601786f0a2335c36764fc2f200dc71d71
+MISC metadata.xml 406 SHA256 9b69df2d1422470da7bc919a570303d186cc74e404c94471789765cb6a7f60a2 SHA512 6793c43be90e7d93c0971597a4fedba2fc26fbbe7718c0944ab655ce22cb9bd93e96481b3f758b471dcd705666abbdf3e1a75faf756ae90b283172c1e15d2682 WHIRLPOOL 1ea46d494c20389eb3db0a8ba6d9abd6cf2fbd94657e7ca33527ad3be966d043957bcee9e8f6c141fd4c42aeb2a708a4c8c791df812d799809f9819373d7e55b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlVpmdcACgkQkKaRLQcq0GLhwgCfZ99tnUDTvOnWW6QJxBAB9K8D
-xcEAoI0hDiETiqrFGEvEmV2ajdIWKq/y
-=C+7g
+iQJ8BAEBCABmBQJVgZD2XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9EOQQAIsTvcPPAemLk/r3QDqlw2uo
+MwkJeS/hspbA1VNL9rx9bw1u5W8DEF66psejOM9q2bCAZ1N4CqRNkYbFT9v2QFAe
+ub5PBDgb+zb955/KALbZvhpJVoH9TXo+1cipMcOZON/0FDb1aZ3M90IMqeuFS2Eu
+vt53XDJ8XtowWfwJCH3UuVDnutMVcQWti7aJc01LXtmF1BbXQGUl6I8h+lQAXw9I
+IIv2aQA6HsZwmAtLa+CWQZV9UP+sCgE70AlvdVTbxmY8j/k0VnB3G3m8v6/XvawP
++xicUW12i5rOPUi/OqnZjLaF/s0wZoirbTeFIKqZur9TcYZFPWPU21DTE0a2LbeO
+25cydE8wjAkzLIxWcWi6DWx3hSM+bxOCX7wEXFmB++/ueRI/4mnT5Ywh6+UTxYAJ
+yvnEDOnkdleiYjc+Hoc4jLTKlJbsFs+xpgt9jP53JR0YifL7kvWrqOgdbCu1Wn1A
+fM4fqZWMg/36gsQy925zWCKAmrWShywfWGEHUbjlb4I8b02yqESZvY6tzi0xIQsS
+vixTENfWjZc8RPK+RaXMP/ccFFzj1+O9Y/dZSyibnLhPmd2I5gbSnrVkiTB/7F96
+Ys4JpNmHUweKZ8M72kbHlmvMCA5DaRMwYkposB3Ov/DQ53Dko6VVw2yZAs2e6Nx4
+g+SDWBboAAcBZjxXS0dB
+=Usig
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qttest/metadata.xml b/dev-qt/qttest/metadata.xml
index d05859990036..258aee1d6e0d 100644
--- a/dev-qt/qttest/metadata.xml
+++ b/dev-qt/qttest/metadata.xml
@@ -8,6 +8,6 @@
 	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
-		<doc>http://qt-project.org/doc/</doc>
+		<doc>http://doc.qt.io/</doc>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-qt/qttest/qttest-5.4.1.ebuild b/dev-qt/qttest/qttest-5.4.2.ebuild
index f58b26e3e4f4..0ca0d6d589b7 100644
--- a/dev-qt/qttest/qttest-5.4.1.ebuild
+++ b/dev-qt/qttest/qttest-5.4.2.ebuild
@@ -1,31 +1,27 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qttest/qttest-5.4.1.ebuild,v 1.4 2015/05/16 10:22:15 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qttest/qttest-5.4.2.ebuild,v 1.1 2015/06/17 15:23:33 pesa Exp $
 
 EAPI=5
-
 QT5_MODULE="qtbase"
 VIRTUALX_REQUIRED="test"
-
 inherit qt5-build
 
 DESCRIPTION="Unit testing library for the Qt5 framework"
 
-if [[ ${QT5_BUILD_TYPE} == live ]]; then
-	KEYWORDS="~ppc64"
-else
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
 fi
 
 IUSE=""
 
 RDEPEND="
-	~dev-qt/qtcore-${PV}[debug=]
+	~dev-qt/qtcore-${PV}
 "
 DEPEND="${RDEPEND}
 	test? (
-		~dev-qt/qtgui-${PV}[debug=]
-		~dev-qt/qtxml-${PV}[debug=]
+		~dev-qt/qtgui-${PV}
+		~dev-qt/qtxml-${PV}
 	)
 "
 
diff --git a/dev-qt/qttranslations/ChangeLog b/dev-qt/qttranslations/ChangeLog
index 109e9001b151..ff70342eebff 100644
--- a/dev-qt/qttranslations/ChangeLog
+++ b/dev-qt/qttranslations/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-qt/qttranslations
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qttranslations/ChangeLog,v 1.23 2015/05/30 10:47:28 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qttranslations/ChangeLog,v 1.24 2015/06/17 15:23:44 pesa Exp $
+
+*qttranslations-5.4.2 (17 Jun 2015)
+
+  17 Jun 2015; Davide Pesavento <pesa@gentoo.org> +qttranslations-5.4.2.ebuild,
+  -qttranslations-5.4.1.ebuild, metadata.xml:
+  Version bump.
 
   30 May 2015; Markus Meier <maekke@gentoo.org> qttranslations-4.8.6-r1.ebuild:
   arm stable, bug #530238
diff --git a/dev-qt/qttranslations/Manifest b/dev-qt/qttranslations/Manifest
index c217b9382d3e..b6f500ce1c94 100644
--- a/dev-qt/qttranslations/Manifest
+++ b/dev-qt/qttranslations/Manifest
@@ -3,16 +3,28 @@ Hash: SHA256
 
 DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2
-DIST qttranslations-opensource-src-5.4.1.tar.xz 1071784 SHA256 3c4d045f974bc9ee76bb85d319737cf182b8697c4ba72d2c075d3609cfaf9041 SHA512 901d4d146f97852755806b098331a7893ac5847a95d3a1c6eea518cf8d9b64369a073a5179ce52f61921c443897f2b6eb942312fd834c381b1a5fe1d209c3ccc WHIRLPOOL 875d2e6960e0d2dd4ae2a514f1682e8b941e0901c484b2c93df0cd8564395f6e1930d66ab228c0ba65515da5ec673231d47602357f3f4adea0bef9b1482cad6d
+DIST qttranslations-opensource-src-5.4.2.tar.xz 1104996 SHA256 9ab6ddb730b1862781991b4ccf53ceaa3f21e9f8bf1c5c49930f7d135832942c SHA512 550e0fcea83155fd4e7e483c92c53f18c733f2fa6c5f179957e0c9f25692acb08975be63fd70974bfe3db7c2efd069e5e915410a8bc34870a26628ce4f99f021 WHIRLPOOL ad9bc0f0bce2e2a41308020ca41d6a7e8c3c22240bb22a1e3187a12645eb36ea4403f98bcf6bb2af6a68c37233d8c38828bad11b831cbde7aa60f0a3b8994711
 EBUILD qttranslations-4.8.6-r1.ebuild 1025 SHA256 a95260081247cf7c6985036ba24a949f588749ce355b96076ed90955dad64448 SHA512 54d096eae531d3c55a6e9e6d45d1f262540d0236c7b47be5b20902a0316d285a257cfde210fd6d9c736aea8a42eade089d22872ec971d4655a792d8706c2e95f WHIRLPOOL 61851bd392bcb4d3fac315998e53963e85eed1c31ef9dda0427fc62c44d7d42c541a6821aaab36075e6c2c33e696f4745bb7c95ad78dcf29408442c50e56baa4
 EBUILD qttranslations-4.8.7.ebuild 992 SHA256 cc582e09de0be0f68a1fdabdde13940dada3b36696d9eba97519eba621dc2059 SHA512 7de358fc9722d4bceb4c371eaac0e00747aa02895529da526ad1a7349c7cda588a320088aca913064af2f0e616843798dc49366aa707396fd234a7510f004a52 WHIRLPOOL 717cb414b43841cfc3514d9d0f034ebb0bb7e4f4b306a53543869529d420efa410067c51b4d952546c1c607a4422caefbc1325be66777b70af9a2c85fd328910
-EBUILD qttranslations-5.4.1.ebuild 511 SHA256 eb34a16d34817aa4374cf5c7e2cc1479dbda44cbd0617d0b3c95e101dda42826 SHA512 4f35d695e233ee288133a24b2f9935ba74dd1e7fc2d31f783eae03f2d563cf3d8ead5672dff37c87e00669626b5cc27f894ef76b037ac67afdf44cb969cc2df3 WHIRLPOOL 6b7cd2333cf6c4475deed210524982e83133b6a104f67aa58339a5709ba3f9aabd850c476e068545cce3a14c842025de3aa04034385a080e64462e636e91a435
-MISC ChangeLog 2818 SHA256 06ec1b85dc1bf1ab3feee0750c09aa0501b9cec624bf5f3ed3ff2bd088435f76 SHA512 716754ca537cc6e117dd72f9800d428f7ae96f9a3dbfeeec87088e6aef5e2c6d130760ec1e5e29eb64b40b3d6bb7155b9cc06c0cf895a72b5099c487a488f4ae WHIRLPOOL e33a4b23e9a475e4f6790713e871fbaa087e866b438befb4cdda284621634e23c1bd69a2b93a5ae53340ba0799df3a46d421b14bb4c5c79f1e8d5eded85e6b56
-MISC metadata.xml 268 SHA256 0976b0efa573f782c96382e8f40ec82944c66ed52a89ebe6b0e905050f01395d SHA512 73ef5d7a382915e844a0cf7f1f05ae64c88500ecffe13265d156960b498ae61a62f29c9789330e5f24c82ddbf3a9ebb98aeff5c4cb0e69af1e8f07099791b806 WHIRLPOOL 19922570bea256c44d78d6f92ef9781be4c177580bb4235d8620139c6cfd759df64fc82f053a685d70fa1378b0fd6f49bb818d393b19105e6069730e9cf44e52
+EBUILD qttranslations-5.4.2.ebuild 490 SHA256 f90690785adcba76c86eb295e33d021077928aa059095d0d2d63bfae439838de SHA512 fc21a4bf47e5fbd54d940af6eb944a85415f5557db7d7fcb71d7995575673732638f99f6196afb40d5247f34296e0ed715808387f98d1923e18e0c86a5e6990f WHIRLPOOL e4ab20a36be0629e9aada0851391f2239da4a8ddc84df3be4ca5f00f2f886b4a01d4c43dbe3e0d7800e26f67d86c237fa92a6983f26649c29d186e80733b2ebb
+MISC ChangeLog 2996 SHA256 55d86bcb0196fa9d07b9106c3cda9d6d724d96e34b1552be2347d8d5a4b38735 SHA512 742b1440a870a9e327cdfb4a55ad1b10ddbffc34b239a875ee24c62b085f8c2831be3039bfc943bd74b6498840978e7876fad97d30c77f7565b4b9361fba39be WHIRLPOOL 6afa8302cef85c55ad6208e78e3f60d3a6697e821c4007bc78db1c3459af87fa21624c7b3c5ecbc98f4b4cd59368324d6d8dcd7b51c2923af57ef1deb4c9e5ef
+MISC metadata.xml 259 SHA256 da0ed92b6766281315367c03378c1935b4e9fa82f840641d9c72b00a1b038646 SHA512 1fca930f71c109412ead8932e0910f6c2b1991a454b03ddef6dda7101358db65b3c6da5eb7f71c918673fd3b9b0ac0397cef0dd24c85f84f2043e3ca8e21dda1 WHIRLPOOL 484f50be685ae8a8a65889a66edf2a6d544e0c6758a8f384bafd7e8f1cc23c4e788613d39febc67f1fc6f99e9e7541881f6224e07497ab0ca031449053b5e13b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlVplUEACgkQkKaRLQcq0GKo1ACfQ3UgbvG207xKpXr3ZL5X9mGu
-zVUAnRV1IAtLoS8zFztVrLLgx8CcIYoQ
-=9XOX
+iQJ8BAEBCABmBQJVgZECXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV95pwP/3U1Et67xagxU4/NFove4g/l
+aOYv8Zj+vrlEJOmxEzinjNQ1WJZ5ugoeQDroRoEv1Hcl8saMYOHaxGPESez9UlAA
+Heav5hnWkEyfb1uv7JtoMMZDcEd5+KQqR0SoAeXTVYyyOxK2rQNfBn0QJYz2QzLd
+/X9pyJKjdeJKBdYZdZyt6B3O/lTS4pkzogq/uucLv5dLlpF8mngCqYXoOytyMyH7
+srPN6C3yMZuNqHlc2/9xuK5fX0rWA6DtLKKra6cNy3djTSBvND+EP0wWwanRs/SJ
+TGi/g9ZquslHg1Kfu5A3L5nGzj1594gnQcpxw8Ofa2wEfdeHxYPGSQvOFbs+G5DP
+snpUsWMgHmB2063lNZdAnctDCN5tgbLKpHQUAYcbQRfrM5SlXJPIa7GqeGsW7Zdy
+f+YFDu4AGjq007tytnw5AQN6KmhzrQIv07YbpmAhcjyH7XiUIKs1srTG2MS96/1+
+AWzuMALb+HwDYzNX/xl7g0xLn81PyDIwu8yE1JqWRKfse67aBw0rJAJELlBuxhK6
+ilAiZjxMQ00kUMr+8eSxrndzfvprpWnnT4LRFLLO+RJ0qr7HP7bPD1Ma7rYs2oZS
+4dLisVRAgM8hwbOc0WixrDrtdBkMcOlAO/cj+fm5n9cv0lPvXca30w9VNUuN/cBu
+pUBJgTkoxnYRtaupEkaf
+=XeE5
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qttranslations/metadata.xml b/dev-qt/qttranslations/metadata.xml
index 39c63597e531..afb3b434585b 100644
--- a/dev-qt/qttranslations/metadata.xml
+++ b/dev-qt/qttranslations/metadata.xml
@@ -4,6 +4,6 @@
 	<herd>qt</herd>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
-		<doc>http://qt-project.org/doc/</doc>
+		<doc>http://doc.qt.io/</doc>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-qt/qttranslations/qttranslations-5.4.1.ebuild b/dev-qt/qttranslations/qttranslations-5.4.2.ebuild
index 6ad219ad83dc..9fe93fbfa360 100644
--- a/dev-qt/qttranslations/qttranslations-5.4.1.ebuild
+++ b/dev-qt/qttranslations/qttranslations-5.4.2.ebuild
@@ -1,16 +1,13 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qttranslations/qttranslations-5.4.1.ebuild,v 1.4 2015/05/16 10:59:42 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qttranslations/qttranslations-5.4.2.ebuild,v 1.1 2015/06/17 15:23:44 pesa Exp $
 
 EAPI=5
-
 inherit qt5-build
 
 DESCRIPTION="Translation files for the Qt5 framework"
 
-if [[ ${QT5_BUILD_TYPE} == live ]]; then
-	KEYWORDS="~ppc64"
-else
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
 fi
 
diff --git a/dev-qt/qtwayland/ChangeLog b/dev-qt/qtwayland/ChangeLog
index 5ae93797ec72..b313761caef0 100644
--- a/dev-qt/qtwayland/ChangeLog
+++ b/dev-qt/qtwayland/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-qt/qtwayland
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwayland/ChangeLog,v 1.8 2015/05/16 10:57:55 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwayland/ChangeLog,v 1.9 2015/06/17 15:23:52 pesa Exp $
+
+*qtwayland-5.4.2 (17 Jun 2015)
+
+  17 Jun 2015; Davide Pesavento <pesa@gentoo.org> +qtwayland-5.4.2.ebuild,
+  -qtwayland-5.4.1.ebuild, metadata.xml:
+  Version bump.
 
   16 May 2015; Jeroen Roovers <jer@gentoo.org> qtwayland-5.4.1.ebuild:
   Mark ~ppc64 too.
diff --git a/dev-qt/qtwayland/Manifest b/dev-qt/qtwayland/Manifest
index 3de08929855f..02c7e452ce4f 100644
--- a/dev-qt/qtwayland/Manifest
+++ b/dev-qt/qtwayland/Manifest
@@ -1,14 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST qtwayland-opensource-src-5.4.1.tar.xz 247724 SHA256 653b5e600b1cbf3275d0858415570d2a2611823a4651ee911e684dcae870d792 SHA512 c9802a3eaa4a8a7beaa0da3c3356b8f94b4daec5d35462f3b3575a7988b065d3a9265651595e557903779e93d4fc70f4e15665f80e482d1ef26687e648cc1263 WHIRLPOOL c3176fab22c20a9b5d954fc4a6b4c8c56a5853fe80b7dd3a0f7da02bf999faf4d8a3e926e7c15c9dc9527bf52fb5eba45531fd925de3f7ad27f260149a25309b
-EBUILD qtwayland-5.4.1.ebuild 937 SHA256 29b0a307c3b0b00ae6344c93e50cb4100d59576b7a3dcfad1d6b6259ea382827 SHA512 b0aff65b90ad26cc91167b806b37a2c92dfb7b807f8bbbb466385f8a5eb941be971871cfa07314bcd54a1f7198afaf34ef5b20b4f63b2da19022c4c4bf8c0629 WHIRLPOOL 541c2f85ed5c399e6177b8222f9b4b1413e037ce2741a61ccd8f232af4174dd5e523cd58f94379b58255a19cb9196c5c9ba54ae509579d8753e6cbc174854d45
-MISC ChangeLog 1104 SHA256 40f62136162ee0c23749857f0c25f9a7edf9e69e8c3967bb1ec28d0c0924379c SHA512 bb6a7c6f208774157907e3862c9fea7c16b35b1a5d31248713f001693b7e29159424399458cca42d9cc0eb0de9d46a6e15e01cf4429e2627842a9707faee3c71 WHIRLPOOL 85a433571fcd722dfca02564e04e4d670fa168c6cddd9456582bcfba161769d1ee6b10af8fd6b86125557c5f2c8d687a84a59ba84e342d764d2d7f5649801c7d
-MISC metadata.xml 484 SHA256 bc7ed5fe28813b845b1899cff01313f13aeb5d1359dc09f4f20cb629b7be224e SHA512 bbc154accf5b09b7abdef9ae4c08e8e1b191297a997ddc306262d269bcea5d8930d2fb89c0815aa1b5b7220a22ef081cdd446e0b048a3fbb915acb8d80543487 WHIRLPOOL e9f35de7ca87385fa09ded63961178c9d0c04012751d01ef4509fb4ee3689dd1e45b050a5de96550c275832ee3e1188fe356f326cc85179b582efd7aa9342252
+DIST qtwayland-opensource-src-5.4.2.tar.xz 248468 SHA256 e04dbeced39186ea39078bfe78de2c4fda4da28c4af6170fe0f48283ddbcf592 SHA512 45f41a3d02c26bb26136303e1b6155397e65eb0e2a630aa68e53fe4d772a7f4e5c96f4d567a62fd84f681becd64e462fbc128d72b9f6403a505455656e5db9f6 WHIRLPOOL 79abad30df883922414b8cedcf3b34ac17e5ff2f5717edac23f0938f78d8dc93d599a1fa265871313ed2f82498f8d389c618eed2cdff560daeaa215c8eb2ae42
+EBUILD qtwayland-5.4.2.ebuild 886 SHA256 751285379f13d0e832cfd5f2f9cbe2b201cd1005f51200e48fe3e14f18cf46f8 SHA512 b707dcc6430739d57938a7d1440d4ed516068190fe6268760b9b6f54a6a33d40d6182714255498583bdb1cb48ec195794b8e915a54cf67ef292bd9b1305f5139 WHIRLPOOL e4c389559c46614424bd4655e24a57b9f493e1884d3cc0fa8b8aef333dd547ebc20e708deebd31b6084ca3b8721f051578040eb13860f4d6bbec3a77676b2f0b
+MISC ChangeLog 1270 SHA256 7050817fd20620c2cba03a17449307a031d7b446e17855eb4093e1be7cf2f330 SHA512 120f419e9e672d2402e890a503d21df0445d6514deffb907d08cefc4f7792f59d9c3f382a1181989241532eb9a4bda314bbfd5db1e57be79a2c91a245fe06028 WHIRLPOOL 16142dcabd8cbe9e7481b1f5c2018975d4a3de36361d2ebee76d8cde860260d7591b93a2d61358760d9d7f994e4946d5fa20dfe70e728092031f0cd5cb0e5f0e
+MISC metadata.xml 475 SHA256 1832136d04f1aac5236cafe785a97d19c110adb5f1c2fa1118ecf1ab7f460548 SHA512 7042a087ac2c0989091fc1a2b37a362ac4217caa6e610094c32e25b03de2e419236b6a2b6adfb9bd6f8d4e071b115df22e56b7a6f6cc56a035653ef116756502 WHIRLPOOL 2e6690349fe1baa613c956c8942a9569b49ae9bf3307485b17fc00d230a02bcc2295ab282499bd3f93d9d16c0d4b59ab0657942376d1abcbeffb7f945fddecaf
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlVXIrQACgkQVWmRsqeSphP/KACeNItXb5XJLOwJh1Zw4aryUIT2
-BL8AnA0pMZdFGduayP7ujdNhhqCzypZ8
-=GkuW
+iQJ8BAEBCABmBQJVgZEJXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9PEcQAI9ZfNFO1VTjrxGadEPvvHs9
+B22yrCjb0sbv8gqVYgr8QWFJQ6QL3W/3udE7kraKiRfHGHNltkT7nVbfVfr/b2dE
+OQmYSGjdJ6Ajj/4PjOVhvKONh1+2DPPcDIaL0OpZZAUJf3KtUOyqXgJYAMBRWvXP
+JzvmiezYCAAeevmByHK1Y8s7mvmldrU31tSK0+7ix9pDxwrZS09Npo6MYhWCXmbx
+/j49IPaACtHTTYuOQ3z9xbokb9mtK3THggNnpHEyqsoylnndcA24TJHIbYScE55C
+Jb4lhMPBVRKs+ML8o+omskprV2b1H9V3U0lhS2a/RKRqK89JLNTPPaTPNYfuns8O
+x/g/RmT0VJJEPmfLdG+4Owl7HPGMqpJET4NHNfXloLQcQHuc03RRzDzj3bwbF9vJ
+36dy0rwybXFKjCrf7g/qXUBaz3R1GGL9RjpX0I5/rJtKp1n/N3NGB/ndrlPgPy36
+47wYK7XNtljLPblmNutgCm/4FaMZW+BdmdO4Fz19Xy/tprBEMaTIGztq2P6nHWCl
+3IBU5YAHsk0ZA9NM/Jz+4YycXDnLn6xV2KMz5OrnYYhCNmB3CJoR4gm4d8mFqOtK
+AsU/rlfxOlDmc67uioj023qv0XA0xE2M6siZLfcfsYpR7Ni0d7jfoyHEfb9XTWSj
+CHPE0OqiBnLTJ76IoFvd
+=FmrD
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtwayland/metadata.xml b/dev-qt/qtwayland/metadata.xml
index d4273c871c2c..0f135c2d9872 100644
--- a/dev-qt/qtwayland/metadata.xml
+++ b/dev-qt/qtwayland/metadata.xml
@@ -9,6 +9,6 @@
 	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
-		<doc>http://qt-project.org/doc/</doc>
+		<doc>http://doc.qt.io/</doc>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-qt/qtwayland/qtwayland-5.4.1.ebuild b/dev-qt/qtwayland/qtwayland-5.4.2.ebuild
index 88b47a281275..6366cb99d5e5 100644
--- a/dev-qt/qtwayland/qtwayland-5.4.1.ebuild
+++ b/dev-qt/qtwayland/qtwayland-5.4.2.ebuild
@@ -1,16 +1,13 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwayland/qtwayland-5.4.1.ebuild,v 1.3 2015/05/16 10:57:55 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwayland/qtwayland-5.4.2.ebuild,v 1.1 2015/06/17 15:23:52 pesa Exp $
 
 EAPI=5
-
 inherit qt5-build
 
 DESCRIPTION="Wayland platform plugin for Qt"
 
-if [[ ${QT5_BUILD_TYPE} == live ]]; then
-	KEYWORDS="~ppc64"
-else
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
 fi
 
@@ -18,11 +15,11 @@ IUSE="egl qml wayland-compositor xcomposite"
 
 DEPEND="
 	>=dev-libs/wayland-1.3.0
-	>=dev-qt/qtcore-${PV}:5[debug=]
-	>=dev-qt/qtgui-${PV}:5[debug=,egl=,opengl]
+	>=dev-qt/qtcore-${PV}:5
+	>=dev-qt/qtgui-${PV}:5[egl=]
 	media-libs/mesa[egl?]
 	>=x11-libs/libxkbcommon-0.2.0
-	qml? ( >=dev-qt/qtdeclarative-${PV}:5[debug=] )
+	qml? ( >=dev-qt/qtdeclarative-${PV}:5 )
 	xcomposite? (
 		x11-libs/libX11
 		x11-libs/libXcomposite
diff --git a/dev-qt/qtwebkit/ChangeLog b/dev-qt/qtwebkit/ChangeLog
index 3ca098eff673..e0fcddf0aad6 100644
--- a/dev-qt/qtwebkit/ChangeLog
+++ b/dev-qt/qtwebkit/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-qt/qtwebkit
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwebkit/ChangeLog,v 1.37 2015/05/30 10:56:39 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwebkit/ChangeLog,v 1.38 2015/06/17 15:24:04 pesa Exp $
+
+*qtwebkit-5.4.2 (17 Jun 2015)
+
+  17 Jun 2015; Davide Pesavento <pesa@gentoo.org>
+  +files/qtwebkit-5.4.2-system-leveldb.patch, +qtwebkit-5.4.2.ebuild,
+  -qtwebkit-5.4.1.ebuild, metadata.xml:
+  Version bump.
 
   30 May 2015; Markus Meier <maekke@gentoo.org> qtwebkit-4.8.6-r1.ebuild:
   arm stable, bug #530238
diff --git a/dev-qt/qtwebkit/Manifest b/dev-qt/qtwebkit/Manifest
index 47d239ef95d1..864e77a0f8bb 100644
--- a/dev-qt/qtwebkit/Manifest
+++ b/dev-qt/qtwebkit/Manifest
@@ -5,20 +5,33 @@ AUX 4.8.2-javascriptcore-x32.patch 500 SHA256 16c68e343f4bb416b870ae46bcaf80e6c2
 AUX qtwebkit-4.8.1-no-use-ld-gold.patch 789 SHA256 034234a8aabb6ec94966b50beac7c17adbebe20d4c3f2100000152c943da15a4 SHA512 da89a02e257576f67928107ffa34da3b69dbd3ed5ac1059ff63e8e181d7b9abfc97f1f1dbe3804b954192dbe604bc880c6e2c1453ad8a6e97430602a5e5f8cd4 WHIRLPOOL c0b67913410a43823e0049c9d57d694a78418b11a885abd85fe7be671c5e7690e8720798859db67cbf65c8839a57a77182a6bb152fe1f339abcc5b70f5b3524e
 AUX qtwebkit-5.2.1-disable-gstreamer.patch 766 SHA256 06b0aa301aadc5fb601beb67583dfe416bf840a1266ccef794981a7610218508 SHA512 cfe59ff3307769ddee1dc0de00097349f6392f605d3ebd2ed1e41e450685d9ce6fa99323d20331a4a25af6cb40cb49d12ee5a5883f5d5219316ac3068aa76353 WHIRLPOOL 71062b0c17dd2bde216a01517d1a890958359cdcd9a355f9f7d9b9c8f670ffad74284c4a07346197527d893802d94ef65a1d0e98fb98b4560306449f8d26bf71
 AUX qtwebkit-5.3.2-use-gstreamer010.patch 926 SHA256 444964b7af1ace629efb160efb434ca15e44ccd2c44ed8643019449b42268d3d SHA512 bc88474a7b3c8b4f86748e6913a302a5d7cc0b7837233aeb27904ccbcb8e25adef6f6e4ee039b0b161eda43c6504bb7cbf053d272884e9ab869279e962942dac WHIRLPOOL d3fc6a3dd0504cd9efb738fc39780a47b0d3c4875c54cb0c585a2b7f76da9083b3856ae5b74f0f3e4290471ff19e99bc24c1d6932aee7bf38a96636b12c68274
+AUX qtwebkit-5.4.2-system-leveldb.patch 703 SHA256 e0c5a2eda2b75e8c426752cf49dca55a89301edbcc2ce29d2e1f09690889e959 SHA512 c617d5e98fb2f2b2fa47a56af2b2daf1d37eec31054e69d36aa7fac00cc1a51dacaea3c4836564b63a9b881f843d543c74eeab3e9c272f90a8cd1330db3a0bf6 WHIRLPOOL 4c904c4506332eed4ee94c3c848be4751930ed1d33937afc913717cd4c568f170439cbc3e188a38034a603b76a72e533e657d92dbbe3a71a9bc75b6f8f9001d7
 DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357
 DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2
-DIST qtwebkit-opensource-src-5.4.1.tar.xz 33457544 SHA256 6607211ef8a913dc778617bf4ba0970e34cc71e1da3abb477eabe0035e7119bf SHA512 592a3ebccb4578eb0183d1ecd5aae69c7f03482aa09594fc06f58e2c2b82b5e916e1e951012fc1c8e0cea803c4d3e6db64fad41bbca70eb18b8d9d3ff2eab828 WHIRLPOOL 8a42720dd53ce583d48a3b7db1268c092dce11dfbbcf7524f50350145569c2b24b62b82a4715229294321ae7ce719ec56bb448eb7a7be9b2f7792ad1d8d9d7d0
+DIST qtwebkit-opensource-src-5.4.2.tar.xz 33460988 SHA256 3e4243e14001f47b8842f72287728b731f8b62b480bd72a1b0e2a9cfe25dce6d SHA512 edb0a8ad63f70d85324af08f46070cc386fd27ff858f590a592f71583cddade897b305527ec3bb8d7a4d491c9d141af04d783ea101e6c40f683df16297652ff3 WHIRLPOOL 49490e7633e8e95abf4d3f0f17b173e40b7df0ce658d56f87dfd4bc73ab9700823e7ea7d5e9c61edb5a06552df5ead701b059d14a8074afa4bad22f77b622fea
 EBUILD qtwebkit-4.8.5.ebuild 2053 SHA256 04be7ac80d16a4f2b9f12039d86ab9de9d645256f11ae9eebe5d0544ebb62253 SHA512 1bec3aec1bbc90f3148d798bd57cb4d92cd638048905e33d3aac8e3844b341839ceb4f50b41b54532dcbd87a3454e9a464c4e47953202e03519e5bd16cd9275a WHIRLPOOL 08d7e1948d1aff0806a4ade799effd42ae462d859d59321e10610020c4f038468735843e7d042a9a64970a8eae756adfb7b0927cd59b816de160dbeccbd05109
 EBUILD qtwebkit-4.8.6-r1.ebuild 2381 SHA256 732ab6ee9b3d8cd853f263490979e113b3d2174344c5c6f5d18b37871cbe73eb SHA512 502b63e892f578e0361804ec8d717587afabaceda0499fe1dd7c09a6457ac72e6b1d708dcf719bf3452ae15b33a948590094054a29a47607231fad4433b7773e WHIRLPOOL 723fc3198093afe0c3e96c4d37aab84b5f075b00275a4674082554a8977de96af0b2b2d07a82ad44a4170bd962535c84f6a13d10b6f7d7688d0e80b6b03dfbd1
 EBUILD qtwebkit-4.8.7.ebuild 2352 SHA256 a705d3bf6a7ea7827bcb2f7f36cc54e78a0dd0f2366bf64c0effc07a1eb234d2 SHA512 430d003f3ce6ca9132af7715423591aa92b0cb684d47c7c9ce63c7c817cd16fcdc89029dd0572a1c033a58a576fa13a4d840cd9c4b36c188f7945a5264e1add2 WHIRLPOOL 53adb551d9bdc4d3197fd10e74b23737a6847129cfcc2afd9aa3eb63e567414ae3cfec736d37c997c8941a4ed10e94d2ce4f922ff65bde0e8dd307ec24894fc4
-EBUILD qtwebkit-5.4.1.ebuild 2713 SHA256 b7892c4bc0922572c1775c5b5cb46921b11843c2be9d70bfbd64f65e0012fb77 SHA512 b0f3031ac45e005f870d4fabad17661552206d08fb04960000cea8d0d6d4e3b491164915e2046239ba033894d235f9fa2c25c72858d42277a1b51b55db3c381c WHIRLPOOL 96411955972cfe4ab29039e81a37596cba752d1a85a55a0e13a55e9aaf3299cfc8e14da92635eb058f1eb29f67b761b52580c176e7cdd4dd8c059e003b46b02f
-MISC ChangeLog 30607 SHA256 c6e82fb2e16de023067dba327568587425cf6b978e3e47b056f806997b0df9bc SHA512 6221674d9d9c627060a64b3ccdff047c2d49b7cf43a8fa713cd316ae52028baba0dc912363bf462a79ee1904e564683dadc9b9482f1f716b0e74a16ed88990b8 WHIRLPOOL 72b70a222f9268643a83917c6a0a1e9f0926dc7f79a186665d921d760bd02f0735f9ea30975581a6bb862fa582110ce549c386d8bd7d1e2f680d6545f5eac86a
-MISC metadata.xml 932 SHA256 56460390f89a7b9896afa2d2410733c2a618bdd2331fb08eb950e403a36b8959 SHA512 999056b09f39b7bd7fd798d3296d7945af1f4bd8ca397c3a085a7fc2af32daebb7be75df4d322fb406051b2025e97a8b2fcca242ce13aed065d6647bc10c49fe WHIRLPOOL 1741a97d3b1bbff53c7e48df2e634237ef81375362151f20403856992e84727d3be6b62612a159ac0888c2c278bb1d6904b66435ee5a3171058da07d3ccb5cdc
+EBUILD qtwebkit-5.4.2.ebuild 2800 SHA256 a0b1db959a60111c9d90c8d3f7f021180dbebe00d81d5c33a9d2cabcc098014f SHA512 c96b58c9e9c01889350689026af29ad173d2f59bc11d4c6b379f79e157c8d86072a0fb63a6aad0b33ae5ad1205ad15f8227ae18fc795acb97ca6699bad02f0a5 WHIRLPOOL bb7916321604d1428f7f2f1dec8f57cb715193ebe95251f3a03481f6ecad99c71558173b938242da62275f2f77e4f7307d5ce5d3038eff7c89b071a039104b0e
+MISC ChangeLog 30813 SHA256 dfa147da3b4bb4b50017b3e50c98aa40dfa52b4308e16e1e51c5532e04b7223e SHA512 12ff0c38d685b1400e063ae9abe7d94dfde2f934c000dfee6a268dceb98694cff5448e7d4555dff4f9c3eb76016bdca86f5e13d92a97f22f9c0d70cbe55c5491 WHIRLPOOL b81fbda07d1adaf1f86abd1a8f5ae1f41560c686457f8dcd3d4f1c9545b97b0accf1e4522755c21bcc6450e1d29ba5100507156f58ad8c21c531bf35a38750f0
+MISC metadata.xml 923 SHA256 f43643c520efe9e8b82c6a88223d296f0262a98eaa3dd6c87e4a8feac64c42e8 SHA512 6ac6e707a39e61540595d0522ca8e2d453e57a8c68071f8ce5b957389786b47f4b5c67b1572c5a8e36a54399e8cf4eed594280c3e6d60b02db52906b02d982f7 WHIRLPOOL 6eebe81091163c3ef908b0ebb6af86d6f5e6614e3f649e25f2dfff2a816e660ca660cb60767e3138251e22488326bdf9fa555db0b559e1bd1da033b99f2789b9
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlVpl2gACgkQkKaRLQcq0GI2/QCgtGgb+2JfOBXN23cD2qfJUfuH
-FyMAnja5HN8V9x/e06NIgDJeCqbOsa/m
-=L+jL
+iQJ8BAEBCABmBQJVgZEVXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV9eMAQALPa4oKSIjW9nz400auUMUUU
+HxUaUPvMkVjbG7l0Qv4oDYIP3EYaU94vxmvLDjD3nwC/pjdxXdd1f0GaktoJfJ24
+R6NOST2e4ddss7itAYjyDqe7Va0oh8Gn6SCax1CSz4J7epC89iSSOpk9STx7JvKJ
+s4uvDZf0att4vHjQ3bzVmP7c8weYb48A71XyVXJCY0goYd1usPFfndTTBVJQ+h7o
+T6qNBkwsWh5/+RDFKIn9scEdI0uloVxSFU6P759ShMroUNpO/QaPpP1P+CtklQma
+2qkeBlp3lDe2zqdeNhto+CSKp25o6TNNg+Zi92aXdDBXyJ5b6Xf2edE9uSABJEug
+AtMIhAbehVsbhg0ofsB6TliqSpIclxbgdeiQQqsL2T0A8qii0UOA/uTsS1m2ZlxZ
++tKC933qIojzX/MPJbYgXtIH/szr8zgRYTCxkq6M9NvfTJoesrGYxX/WDloSSR0p
+lRC+nexlxLzV3xmLeE7nZ+qraAOB5gLI0BOPg1C5RMTOrQDSVGLrPiuggHC8oSK1
+ovObFT6/EM9bYYAZXEBbJb8AlxBQBJqbqb2bNmTCIT6nTzf97DxzwzjxJKN3rrY+
+7U0j1tidbTbZJLjvHf8h5i9VDntCnFWMcrX8lB10zT5658uDAwgrgMxbvh6qaUU1
+wBh9mAtFDvfAonRguWMD
+=mJAb
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.4.2-system-leveldb.patch b/dev-qt/qtwebkit/files/qtwebkit-5.4.2-system-leveldb.patch
new file mode 100644
index 000000000000..0a476c646c52
--- /dev/null
+++ b/dev-qt/qtwebkit/files/qtwebkit-5.4.2-system-leveldb.patch
@@ -0,0 +1,25 @@
+Correct header location so system dev-libs/leveldb can be detected.
+
+--- Tools/qmake/config.tests/leveldb/leveldb.cpp
++++ Tools/qmake/config.tests/leveldb/leveldb.cpp
+@@ -19,7 +19,7 @@
+ 
+ #include <leveldb/db.h>
+ #include <leveldb/env.h>
+-#include <helpers/memenv/memenv.h>
++#include <leveldb/helpers/memenv.h>
+ 
+ int main(int, char**)
+ {
+
+--- Source/WebCore/platform/leveldb/LevelDBDatabase.cpp
++++ Source/WebCore/platform/leveldb/LevelDBDatabase.cpp
+@@ -38,7 +38,7 @@
+ #include <leveldb/comparator.h>
+ #include <leveldb/db.h>
+ #include <leveldb/env.h>
+-#include <helpers/memenv/memenv.h>
++#include <leveldb/helpers/memenv.h>
+ #include <leveldb/slice.h>
+ #include <string>
+ #include <wtf/PassOwnPtr.h>
diff --git a/dev-qt/qtwebkit/metadata.xml b/dev-qt/qtwebkit/metadata.xml
index 06b10e2ec97b..0ca02a93e967 100644
--- a/dev-qt/qtwebkit/metadata.xml
+++ b/dev-qt/qtwebkit/metadata.xml
@@ -14,6 +14,6 @@
 	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
-		<doc>http://qt-project.org/doc/</doc>
+		<doc>http://doc.qt.io/</doc>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-qt/qtwebkit/qtwebkit-5.4.1.ebuild b/dev-qt/qtwebkit/qtwebkit-5.4.2.ebuild
index a7b64c34316d..429c9c21562f 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.4.1.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.4.2.ebuild
@@ -1,18 +1,14 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwebkit/qtwebkit-5.4.1.ebuild,v 1.4 2015/05/16 10:39:38 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwebkit/qtwebkit-5.4.2.ebuild,v 1.1 2015/06/17 15:24:04 pesa Exp $
 
 EAPI=5
-
 PYTHON_COMPAT=( python2_7 )
-
 inherit python-any-r1 qt5-build
 
 DESCRIPTION="WebKit rendering library for the Qt5 framework"
 
-if [[ ${QT5_BUILD_TYPE} == live ]]; then
-	KEYWORDS="~ppc64"
-else
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 fi
 
@@ -24,16 +20,17 @@ REQUIRED_USE="?? ( gstreamer gstreamer010 multimedia )"
 RDEPEND="
 	dev-db/sqlite:3
 	dev-libs/icu:=
+	>=dev-libs/leveldb-1.18-r1
 	dev-libs/libxml2:2
 	dev-libs/libxslt
-	>=dev-qt/qtcore-${PV}:5[debug=,icu]
-	>=dev-qt/qtgui-${PV}:5[debug=]
-	>=dev-qt/qtnetwork-${PV}:5[debug=]
-	>=dev-qt/qtsql-${PV}:5[debug=]
-	>=dev-qt/qtwidgets-${PV}:5[debug=]
+	>=dev-qt/qtcore-${PV}:5[icu]
+	>=dev-qt/qtgui-${PV}:5
+	>=dev-qt/qtnetwork-${PV}:5
+	>=dev-qt/qtsql-${PV}:5
+	>=dev-qt/qtwidgets-${PV}:5
 	media-libs/fontconfig:1.0
 	media-libs/libpng:0=
-	sys-libs/zlib
+	>=sys-libs/zlib-1.2.5
 	virtual/jpeg:0
 	virtual/opengl
 	x11-libs/libX11
@@ -49,10 +46,10 @@ RDEPEND="
 		media-libs/gstreamer:0.10
 		media-libs/gst-plugins-base:0.10
 	)
-	multimedia? ( >=dev-qt/qtmultimedia-${PV}:5[debug=,widgets] )
-	opengl? ( >=dev-qt/qtopengl-${PV}:5[debug=] )
-	printsupport? ( >=dev-qt/qtprintsupport-${PV}:5[debug=] )
-	qml? ( >=dev-qt/qtdeclarative-${PV}:5[debug=] )
+	multimedia? ( >=dev-qt/qtmultimedia-${PV}:5[widgets] )
+	opengl? ( >=dev-qt/qtopengl-${PV}:5 )
+	printsupport? ( >=dev-qt/qtprintsupport-${PV}:5 )
+	qml? ( >=dev-qt/qtdeclarative-${PV}:5 )
 	udev? ( virtual/udev )
 	webp? ( media-libs/libwebp:0= )
 "
@@ -65,7 +62,14 @@ DEPEND="${RDEPEND}
 	virtual/rubygems
 "
 
+PATCHES=(
+	"${FILESDIR}/${PN}-5.4.2-system-leveldb.patch"
+)
+
 src_prepare() {
+	# ensure bundled library cannot be used
+	rm -r Source/ThirdParty/leveldb || die
+
 	if use gstreamer010; then
 		epatch "${FILESDIR}/${PN}-5.3.2-use-gstreamer010.patch"
 	elif ! use gstreamer; then
diff --git a/dev-qt/qtwebsockets/ChangeLog b/dev-qt/qtwebsockets/ChangeLog
index 8dd5be4f05d9..1ac18f04ea63 100644
--- a/dev-qt/qtwebsockets/ChangeLog
+++ b/dev-qt/qtwebsockets/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-qt/qtwebsockets
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwebsockets/ChangeLog,v 1.12 2015/05/16 10:58:47 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwebsockets/ChangeLog,v 1.13 2015/06/17 15:24:11 pesa Exp $
+
+*qtwebsockets-5.4.2 (17 Jun 2015)
+
+  17 Jun 2015; Davide Pesavento <pesa@gentoo.org> +qtwebsockets-5.4.2.ebuild,
+  -qtwebsockets-5.4.1.ebuild, metadata.xml:
+  Version bump.
 
   16 May 2015; Jeroen Roovers <jer@gentoo.org> qtwebsockets-5.4.1.ebuild:
   Mark ~ppc64 too.
diff --git a/dev-qt/qtwebsockets/Manifest b/dev-qt/qtwebsockets/Manifest
index ecfabf262e2a..8bbff8339607 100644
--- a/dev-qt/qtwebsockets/Manifest
+++ b/dev-qt/qtwebsockets/Manifest
@@ -1,14 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST qtwebsockets-opensource-src-5.4.1.tar.xz 74784 SHA256 daf56f98c5e267253bd2d2e421472fc02faa1703a9063cc14cf8afce6967ab44 SHA512 f9dae7833033338c6f46fa11b5f9fc032e34a8febcdf9b1281ee080d65e0a92a10b15ac9b4de138e85444091cda917ca47defbd124601ebd197b54119d141bbc WHIRLPOOL e6dfbda86f26cc3b9c65414984061465ea2aae713716af64c618b63f03ce22e8f6baccb20709efb52d41161cde72116969097cd257f884769ff7a7f5f8ca89a4
-EBUILD qtwebsockets-5.4.1.ebuild 688 SHA256 0a3ef0ec33fbd473b310e3932910832961c7b745be04f827916948282ff63d18 SHA512 b18ec2707f6f7f40b523742d2bf93ccd7db7b35c430bc2382eb7ef324fdc99d28157fc65cb15c4229add3ff8ba4d178f57307f8215f20b63305a268f26583508 WHIRLPOOL a4cf532428cf466cf9f5abb4cec8d377a36a4a0bd2e3d94324990b059f0a1dafb8c1ef2d22bc16e568bf70802c4c93fc627d3a2c8ff672a84abc58870d6aeb13
-MISC ChangeLog 1713 SHA256 37ab29db873f266179995b90e5c5c6054e15561f8d4b8e832770eb702624910e SHA512 a90473e2eaaffceb1da3778d2c669ac0c4eef492331125c38f8f3123054ad67322838c0de6e85a6887fd0d38f7f69211e81313ce53a200010fc738aa22eaf62c WHIRLPOOL bb577d89df4b58af989dfa73b97849005fc0911b8aa34c6bbb7acdd0b4e7cc1cf17a9b8ebce500dcef893037c4e71cc6a681ee479d0fe68b2ad50d2c5d128f82
-MISC metadata.xml 328 SHA256 23497fbb9a498c0d9631987427e939a7b05721e8de06d0767461cd70f7b3cb52 SHA512 0709500b4784b39054809b60d281d267009185804ef971e899d5cc2917ca4bf67a4bbf06270df5ea177e71f6785da69cc22e68e907f801cfa0a3ee1289947106 WHIRLPOOL 753a593d48db3ce884180a3c440bf3c3d800d23df14732850c8252d705f6e2639cd8ba43f180c7b033ac15befd0245ed1f3e679b7b94b865a96d43187ceb5123
+DIST qtwebsockets-opensource-src-5.4.2.tar.xz 120636 SHA256 44a61a8576190697fb1a112ef982cf1da86c6d1744335d7b8e168f3190a26153 SHA512 e1d81269122f1d80f09ad4bfb8724ce26f172100e5e644e36841c71ca75b48277ae2191a49256dddf48ab8520bf1e0461f0eccdd3ffbd050785983a0c33899a5 WHIRLPOOL ed21e667e725481be8423e9f5727ae1eaaaca7079f9e7c67e33afc62fbb12caa84c2327bf4f6fdde2ced4c05e2327312639fc8344a421e9bfb13c7c5d324887d
+EBUILD qtwebsockets-5.4.2.ebuild 643 SHA256 467db51ef3d1d92b18031a99ed11241754d761f3fc2ee973a98cb5b2c32ad23b SHA512 aff46aa4e6d14beb0f49e8a1d9a0cb0fc621af7fc5840ecefcd80bb0fa793fc467a4cf75de1616ea9340f012f6a9bb584df7ea8bedd970bfeef76201491dd03b WHIRLPOOL 12d9e986e4bfb82487e194e88ba9bc544794000dccfebf8c6952c2cac51a4994860e7df0b2b8e095578217ca857e9bb2b267375d3bcdde9895b748b3aa62d012
+MISC ChangeLog 1888 SHA256 b067019c5acc903d2d9146c938600b272ec184f34a557ffb2a66dcb6b127ac14 SHA512 6371d43e51e96137226e6c023b8c12b28274d5a0efd2a08002057bcb52aaa05f4ce2eae7c82c83f3a0605db1ffbd8c4ce4d51574a647ba4338fac8fcb4149401 WHIRLPOOL 0809c595aaab5c29fa1ab697134226d6b608273d361e4e5840d40745aca5c656889635d0120c2a1800c4c50b9fac000bcdb5a0ba7fafa8dc7419263f09917bfa
+MISC metadata.xml 319 SHA256 212681205c716b9e41697e65bc084ee49dd4b55ceac610e0f12ec6164fcc9c19 SHA512 b06096e5b6e9aedeff92ae2115250a39da6fd760f512b6be24641d16f2f7c4add35a0fa79a9c7a9ff0ebe0b1b19f41e55b95f46414b06bf6eff0509e164e9174 WHIRLPOOL a271807ee212c50de6df2e8f7ec3c48b9f55cadf37f2b5fcb815ec1d6aeb2faeb1e723c729588bb058e86b13bfb7f82d0a250a5d1758155bc56c44cbd5663da6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlVXIugACgkQVWmRsqeSphOCxACeMZtGP6pj4EGE3SdSFtTlEH6/
-YcEAni55MXxl7sRdFkJH0dO8XYa4cwj5
-=/JaS
+iQJ8BAEBCABmBQJVgZEcXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV93X8P/2JmTmG0iqMZjDuyU5dzXYq9
+y+tENOTTfHl34100oxZNKqifPp1htCpOOTYAVYZ8MDy8h9jo7Qv5rzbf42PEfLND
+uvxQO8CwntugS5aJ+ipek4vGVpy2XKmizT9zEs6fS09W149jHW7qrua3Q4iz7xJw
+HmJJ0TW1rAaTTYOMwx9WikJB7nqGbzoJIigrQyXh4e50aKB5u7rj0astkCVfUBRP
+rGbpE5JskBEQ8DkyPGMWF8lEJHj3iPKlp4j9JKt7Ido7R0GL4CEYsPuqZskQ24rq
++dZ5eZo0oP8Uk5McmXaXwoodKfDnHaCqY11hfjLZHoyWkHTA/cMMiuLxYUOo/AW1
+icQNYxf3bZ9BKni1urLbQJxUw3F4hDX1VnH6x3Z7cfFwd5Y0EOL4j0NAbssqfU4V
+IDcf3dnxHjmJUnwUsV2gDFXo+TY+6onNNrOeHj1X9/Yi5jH/8mqmnLwixycrLQWL
+IovZwCtGooL4wy3yiS1YLu58Pb/ck/KESamkdebUbsBjlWCai6SdAL0jQOi5184k
+O4N9vxeBLnvQ50Bt0i/OYhxe9nrjSgcrEsEh1nf3AXekh48u2pypIFqeJhSnE2sn
+lRiqlxS6a3v+Ol4Q3kpHDoxDffMWaxAbkcFThChOWRbw8qBf1SSaHeDu+4bMAi6T
+hZdE3szYxaOTxnyYyShY
+=Em7E
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtwebsockets/metadata.xml b/dev-qt/qtwebsockets/metadata.xml
index add78519aadd..bee66c84d291 100644
--- a/dev-qt/qtwebsockets/metadata.xml
+++ b/dev-qt/qtwebsockets/metadata.xml
@@ -7,6 +7,6 @@
 	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
-		<doc>http://qt-project.org/doc/</doc>
+		<doc>http://doc.qt.io/</doc>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-qt/qtwebsockets/qtwebsockets-5.4.1.ebuild b/dev-qt/qtwebsockets/qtwebsockets-5.4.2.ebuild
index edb0bdb0252b..086b9f18301a 100644
--- a/dev-qt/qtwebsockets/qtwebsockets-5.4.1.ebuild
+++ b/dev-qt/qtwebsockets/qtwebsockets-5.4.2.ebuild
@@ -1,25 +1,22 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwebsockets/qtwebsockets-5.4.1.ebuild,v 1.3 2015/05/16 10:58:47 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwebsockets/qtwebsockets-5.4.2.ebuild,v 1.1 2015/06/17 15:24:11 pesa Exp $
 
 EAPI=5
-
 inherit qt5-build
 
 DESCRIPTION="Implementation of the WebSocket protocol for the Qt5 framework"
 
-if [[ ${QT5_BUILD_TYPE} == live ]]; then
-	KEYWORDS="~ppc64"
-else
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
 fi
 
 IUSE="qml"
 
 DEPEND="
-	>=dev-qt/qtcore-${PV}:5[debug=]
-	>=dev-qt/qtnetwork-${PV}:5[debug=]
-	qml? ( >=dev-qt/qtdeclarative-${PV}:5[debug=] )
+	>=dev-qt/qtcore-${PV}:5
+	>=dev-qt/qtnetwork-${PV}:5
+	qml? ( >=dev-qt/qtdeclarative-${PV}:5 )
 
 "
 RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtwidgets/ChangeLog b/dev-qt/qtwidgets/ChangeLog
index 8a6d31ac51aa..d1798386f001 100644
--- a/dev-qt/qtwidgets/ChangeLog
+++ b/dev-qt/qtwidgets/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-qt/qtwidgets
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwidgets/ChangeLog,v 1.16 2015/05/16 10:26:06 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwidgets/ChangeLog,v 1.17 2015/06/17 15:24:18 pesa Exp $
+
+*qtwidgets-5.4.2 (17 Jun 2015)
+
+  17 Jun 2015; Davide Pesavento <pesa@gentoo.org> +qtwidgets-5.4.2.ebuild,
+  -qtwidgets-5.4.1.ebuild, metadata.xml:
+  Version bump.
 
   16 May 2015; Jeroen Roovers <jer@gentoo.org> qtwidgets-5.4.1.ebuild:
   Mark ~ppc64 too.
diff --git a/dev-qt/qtwidgets/Manifest b/dev-qt/qtwidgets/Manifest
index eea6650cfc1d..8355cb53fd93 100644
--- a/dev-qt/qtwidgets/Manifest
+++ b/dev-qt/qtwidgets/Manifest
@@ -1,14 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST qtbase-opensource-src-5.4.1.tar.xz 46132220 SHA256 8574a593830959c0f7e5430fe77a43832ea7f5299e14a397a74576b3df7fb1b7 SHA512 75d2c16bc47e6403e15c4094f50757157960cff4434de29f199b015795ba772b62125f01c09aceb2a06f8dfcfc4df8e35330259c76959239f276e2f5bd5221b5 WHIRLPOOL 48d9a583ba9d0bbfffdbfeaa2412e77a0bf4011e7bba525129ba4572faa6a55713a89cb00f4ed7f24e6782e3f7b8b48cb192e2c082b7dcb3c35a85109f2eb340
-EBUILD qtwidgets-5.4.1.ebuild 1197 SHA256 6c0a6db047570e41a1cc690cde0a131ac6ff585d57552720a2cbc62b4ba31f49 SHA512 f4cec1fc2be11d2af616912bf911ff969548231f022ecbeb9426e86b6cfe655171f2dbdeaa53fb80f91ee5dcc4308656cde21f0cd0a0e9cfd7be01ec002a5227 WHIRLPOOL 1f17b29145c6b6ae08f91e39be9f2162e43120420e6f77774fcb8124d02c62868e094c5ae9cd6e37f121be1c8d2cc5038d1cbca7120aabf4dc49d4d953704166
-MISC ChangeLog 1875 SHA256 9a4c47d7d95ee12b8d3593d81abf4440dff00246aacb4faa6888f2bd0395f0f0 SHA512 7034c02fed3b63db386ebfa0d9abf1ecda89b696f46740d6f823f073100b9f81e144d5fc63ac57221ff24610317c6dd43eafde3346c51eb89be9800236ef26fb WHIRLPOOL fc6d7ccdaa9a5ce0bbaaefc108aa3928a43e163b50e49195b390e44bb7f9acc5db7bd7c2aa073c6d83b02e6e2314a340c1ad1bf38300fe40ea8ee5b9ed7492ce
-MISC metadata.xml 452 SHA256 5d837e121d6ab379e09a64c79985530ced8d9a8b655845ba34d60bdc0a9173f7 SHA512 548266812ee648eab15e24b302341a430833dada123c05324f57c240e18ed2e1f840e0597bb17270592459492d67d9ad5b7b774553e5525a3105e02292734fe8 WHIRLPOOL 1fb249049750f49e35f9b98db921cd9ba65051bfc5364e594761278109da33081432e251c7666361aba0509621fb7d5bdaff8ba8410a631abe3ce66343717943
+DIST qtbase-opensource-src-5.4.2.tar.xz 46354192 SHA256 9fc4f720b8b5a8b8e4a7d45e13ce4d5b86756ad46fb406386637eb2de5fd5a74 SHA512 029da83969614bc9b3803c76242af62911e3c6de171b116b5cb8e2823cad0514ab705cc3fa331e042c679caeb099de4e9cd7ddea92959f675dda82533e3ad7fe WHIRLPOOL 5f352f78a779c5d042f04966a010b10af706c4db94976870721a550e3ab7eaf2695b3582c86cdcc3a11de36283e11fe65797f96e59df96fa367b16b72b5f9213
+EBUILD qtwidgets-5.4.2.ebuild 1001 SHA256 1e956494c0e7a881a0fd35320583c54ace28a985922396aa76814e5395e60b5d SHA512 359d11da7c51d80420ced85574f0cce6012e347111d49ee683cf42f60127b8030f100a369bd6a580ad38a098557bcd576f2a4da63ed8f03bcdf780e7733e2b11 WHIRLPOOL 6841fefeb5414bc219dd6b672e082b2e3c1a82289ffb3c2ac42a868c1ec7b819b887484e4b72586d4cd8f731bb535a27c2e69aaf7521d0984934a51c8426d8ff
+MISC ChangeLog 2041 SHA256 b54b9c3395759d344d133797b698a20b719cd3f5cc6d68b571bb105ea1473aff SHA512 7d4a16e8871728f2ed4e32b9ec4020f10a0ebc6c70b098bb05905acc1aff774ddefe5f3c63f4a8f8bfe1b65ccaace4533c33b7e4bdadff2920477f487af8accd WHIRLPOOL a9d530e97e5e593050711e1166ecb1f361471089a35621f10067b77db97bd1cd9be5aed77f8537e2a67ff2f91cc4e8939cf8fdda6e17941f890eb265cc822dd7
+MISC metadata.xml 444 SHA256 e33c8c020f218081d739663be5c92f6131ced627b97de83938805f3b9acbc4f7 SHA512 cb74078fcbfa4faf00b462005def18549bd69e58f4c58d88e9e5269f04f5b6122b971ba5144f158b91dd28802d592818c3b618e11002ed185341a83a7864a46a WHIRLPOOL 24e9a630e196ecd3ff389682cb498a9eba37c68ab8d4f997b7d7ac977e8c998bf5f4b445330ee44428c292e52bb4f5b94176fdcd90c244f5f642a0ff2c6bbbf0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlVXGz8ACgkQVWmRsqeSphOOVACeIkuxawuGhkbVNvHLrwYWplZp
-h10An3kkvKsUi0brXot2jKwcQ2QQ5XyC
-=ChNi
+iQJ8BAEBCABmBQJVgZEjXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV92moP/3E1P6ilIqgW23aMTIaPAOl6
+wKFUesAvx6Y1Lf3Mja9ggNFfakZoANwOBeuI7+AxnJTFzN3SLLwLCcVpweFZtn7q
+s4TlgK4wtOJk6Pu91sEWzqrKRJ8+bo6Njgjr1loVCDgE9SYU2PzgMcf8xrPjKIPq
+iWAI9FSRmGIaeRJf/DTgkB0SvgNd91tosp47VEGeosOllDsLDjfy6lxV60BnnM10
+RmROAYOTW0ceHGkZBEPgo+AfrFhhtK6jMo1v7t5o6c9EL/mBEwG8L/lI0avvQ8Lo
+wtYYMPx+NMc0f5kvNiE6bzUwW9HeCrxge57gYgjTPUg4MypVamMhuBUsilXJm2LP
+iBgQH2kmTQ0lNOxM6JSATjX7Y1aGjY4VeLTb5bIdQYTnXCnErhQPkGSaf0tZCP4Y
+SXxssabbrHp1Tj2ye33o8Cw+yqeqt+bMbtGKqWzXAItrCe6MgTUmYxJAlS3jZGwg
+4Vh+KQfTK/nVlN1/oqrXM+8dUbDmWXqgQ2DOpgMB9ExNTdi0ymqUm3P9+Jdu5WUK
+jF4oWI7qwxYcSsgmbYmDqnuiY8Y27iIERktfn4cdnC/VZsgMNTAdMtZ9oNYxWCEh
+mjETd8rhXQuspROS5sLInKyKydPmUn98nH3Gv2oqdni6s0CnCA+ub4g7G6ipKQRd
+ktzZ6t2fcxtvs/OnOZiZ
+=XKPY
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtwidgets/metadata.xml b/dev-qt/qtwidgets/metadata.xml
index 1fed4b142e53..4727795ad761 100644
--- a/dev-qt/qtwidgets/metadata.xml
+++ b/dev-qt/qtwidgets/metadata.xml
@@ -3,12 +3,12 @@
 <pkgmetadata>
 	<herd>qt</herd>
 	<use>
-		<flag name="gles2">Use OpenGL ES 2.0 instead of desktop OpenGL</flag>
+		<flag name="gles2">Use GLES 2.0 or later instead of full OpenGL</flag>
 		<flag name="gtkstyle">Build a Qt style called GTK+ that mimics the active
 			GTK+ theme</flag>
 	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
-		<doc>http://qt-project.org/doc/</doc>
+		<doc>http://doc.qt.io/</doc>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-qt/qtwidgets/qtwidgets-5.4.1.ebuild b/dev-qt/qtwidgets/qtwidgets-5.4.2.ebuild
index c034198e5fc3..f640aa9c8c95 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.4.1.ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.4.2.ebuild
@@ -1,30 +1,23 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwidgets/qtwidgets-5.4.1.ebuild,v 1.5 2015/05/16 10:26:06 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwidgets/qtwidgets-5.4.2.ebuild,v 1.1 2015/06/17 15:24:18 pesa Exp $
 
 EAPI=5
-
 QT5_MODULE="qtbase"
-
 inherit qt5-build
 
 DESCRIPTION="Set of UI elements for creating classic desktop-style user interfaces for the Qt5 framework"
 
-if [[ ${QT5_BUILD_TYPE} == live ]]; then
-	KEYWORDS="~ppc64"
-else
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
 fi
 
 # keep IUSE defaults in sync with qtgui
-IUSE="gles2 gtkstyle +opengl +png +xcb"
-REQUIRED_USE="
-	gles2? ( opengl )
-"
+IUSE="gles2 gtkstyle +png +xcb"
 
 DEPEND="
-	~dev-qt/qtcore-${PV}[debug=]
-	~dev-qt/qtgui-${PV}[debug=,gles2=,gtkstyle=,opengl=,png=,xcb?]
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}[gles2=,gtkstyle=,png=,xcb?]
 "
 RDEPEND="${DEPEND}"
 
@@ -38,17 +31,9 @@ QT5_GENTOO_CONFIG=(
 )
 
 src_configure() {
-	local gl="-no-opengl"
-	if use gles2; then
-		gl="-opengl es2"
-	elif use opengl; then
-		gl="-opengl desktop"
-	fi
-
 	local myconf=(
-		# copied from qtgui
-		${gl}
 		$(qt_use gtkstyle)
+		-opengl $(usex gles2 es2 desktop)
 		$(qt_use png libpng system)
 		$(qt_use xcb xcb system)
 		$(qt_use xcb xkbcommon system)
diff --git a/dev-qt/qtx11extras/ChangeLog b/dev-qt/qtx11extras/ChangeLog
index 2993830930a4..51d2b0f7a2dc 100644
--- a/dev-qt/qtx11extras/ChangeLog
+++ b/dev-qt/qtx11extras/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-qt/qtx11extras
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtx11extras/ChangeLog,v 1.13 2015/05/16 11:00:01 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtx11extras/ChangeLog,v 1.14 2015/06/17 15:24:25 pesa Exp $
+
+*qtx11extras-5.4.2 (17 Jun 2015)
+
+  17 Jun 2015; Davide Pesavento <pesa@gentoo.org> +qtx11extras-5.4.2.ebuild,
+  -qtx11extras-5.4.1.ebuild, metadata.xml:
+  Version bump.
 
   16 May 2015; Jeroen Roovers <jer@gentoo.org> qtx11extras-5.4.1.ebuild:
   Mark ~ppc64 too.
diff --git a/dev-qt/qtx11extras/Manifest b/dev-qt/qtx11extras/Manifest
index 70f81b825987..66f11e708759 100644
--- a/dev-qt/qtx11extras/Manifest
+++ b/dev-qt/qtx11extras/Manifest
@@ -1,14 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST qtx11extras-opensource-src-5.4.1.tar.xz 25460 SHA256 20a61cdb9f925e9ab959bed1e7aeb1855b721619d5dc5f3691b8c1ce186e8c2e SHA512 7133c5ddbc6403c4d88ce162a840d8d8ee022efcd9b06a0bf495ab1554449c3194258a588d8f3b6aa3ca83ec42835ec9cac6056ab7a8c3d1d59e7222962b83e2 WHIRLPOOL 8fc9aef74fc174fd1cf7abfdb5767db16bf6553d5b2cdd3767fe3edd0f2a13fe40c74feea8594abc901a5d63a113d6abc2b68564e2b339d7c33da6b942ecc57d
-EBUILD qtx11extras-5.4.1.ebuild 577 SHA256 8058935261653c8ee1dcb6265a29134abb3076f40c222cef93740f3ac785d4a9 SHA512 c9e055e6468dc9f194d1f1e97d1e22f9c3756efe166c78b365e56fa31158bad3c9a8754a114e50c8301588903228a2c0ef25750be59f80f27dbec78ae1267b47 WHIRLPOOL 73c5a3a484cb48edc103d880ff3d5650172e8ff272d63d5bc80d4b26b26f23c11a30537cd9b78ac4785f67b51c57aa209431773ab1908c08db766f94654ccd7c
-MISC ChangeLog 1542 SHA256 797d0b25e5db5c111b8e4358ffc1f302163da6c7bf7bea0df2711304a7402fdd SHA512 06866a7cf6cd797559b5e87e775fb72b34d5f2d403ff78a04b8e361237ac620917fe524b5e2881aa3430af99fad45267635165ea985f37912b0aaed6bf48b244 WHIRLPOOL 2671ce261b19bd973186a4364acb6cde0630a32aa272a408724f9fa07c4df346bb3c88a957ecb684213dfca4427975f6ba64cb640d41488b2edc216c3e187cf2
-MISC metadata.xml 268 SHA256 0976b0efa573f782c96382e8f40ec82944c66ed52a89ebe6b0e905050f01395d SHA512 73ef5d7a382915e844a0cf7f1f05ae64c88500ecffe13265d156960b498ae61a62f29c9789330e5f24c82ddbf3a9ebb98aeff5c4cb0e69af1e8f07099791b806 WHIRLPOOL 19922570bea256c44d78d6f92ef9781be4c177580bb4235d8620139c6cfd759df64fc82f053a685d70fa1378b0fd6f49bb818d393b19105e6069730e9cf44e52
+DIST qtx11extras-opensource-src-5.4.2.tar.xz 25484 SHA256 f6ff62df88810304937664aa5a0b0ad4fd981ed0e30920d08fd76dd525f7fe49 SHA512 c309d6d2c5a3a802656b2414b676ba3d105f4f0e2ceba1d7e9a5e0d2f64e2e50306252b132e38b6801a6db597f33e27a1682f6db24a4167b127d17afa7ad4d4c WHIRLPOOL edf5eb006f5fd84e95acfd504337334ef16af4b5f181197d88e9247b74882866a74810609e6e3089d32f9057a1e50b427c205c2e33f63edc4dfaa3d518769dee
+EBUILD qtx11extras-5.4.2.ebuild 533 SHA256 6148198570ba18e948d8a14f0902def3e4c70643ff8001695350143e9416fa42 SHA512 e73ae77c195dc2813e967f9e77874285c0db77e243b3e348137b661d99fcb918fc6d53609e15c8c2a5299bdf937256e42a79dc2e8b935395a442920fca601946 WHIRLPOOL cf1ff4895a403b049ab7c44a3d16da019a36cac5c8ecc357d3046943ea50c671f5b54beb0442647ad17a24d88aaa5fabfcaa8d7eb69ebab63337b9f654c94f40
+MISC ChangeLog 1714 SHA256 bce5dbfc3b42970ea6e600010bf1065dadee71dfb6bcc3bc689d3ac30658c0a4 SHA512 424d8eb6577c02514cf0b7fac20f018047fd02bf71122dd10c93116b52ec1c7383b40d87044c25ef3e055ce36c5decabb9049f8cb75bcb619bc31b9712b9f3de WHIRLPOOL d6d2704441026a82085aba8fa267e8cd5f21daf3276fce9791bf2640e42aaf262cfef9f9c57ab4099a9165b6c3b1f8a570c587f27edcc9e9d1bb7727f284b58f
+MISC metadata.xml 259 SHA256 da0ed92b6766281315367c03378c1935b4e9fa82f840641d9c72b00a1b038646 SHA512 1fca930f71c109412ead8932e0910f6c2b1991a454b03ddef6dda7101358db65b3c6da5eb7f71c918673fd3b9b0ac0397cef0dd24c85f84f2043e3ca8e21dda1 WHIRLPOOL 484f50be685ae8a8a65889a66edf2a6d544e0c6758a8f384bafd7e8f1cc23c4e788613d39febc67f1fc6f99e9e7541881f6224e07497ab0ca031449053b5e13b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlVXIzIACgkQVWmRsqeSphN/rACff1wlsNF5+oYMaMEkemzvVBm3
-4O0AnRet2tnyztUHgfPM85yqwDPrEw9N
-=TvaS
+iQJ8BAEBCABmBQJVgZEqXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV98+MQAIsLYJWu7FP2m+v9bNQLUT6X
+lMrcl/3QI7SPc6bNVZeOcgiXBHWZd+UC7KFOkiP6aBkspGy0wb+qF+ovvznTZcJC
+YmBPXp1AnGODgOmSXAj82nXkHgnM60n1qB5HIcn/jTx94MpsHtBndt/BqxkjBP/l
+6EiZ36+XuNca6T27wPMAAA5vLVAe6Nyd7CH6sCSSHnUVJQ9z8tSpfpCafsnnT/IE
+gTEvrjolss1Vlr6MoJGoJzHRbg7NAwb/cIhODJD8zCkhLENgtvhfUSmRxsdUI+Y6
+Xlm47vZBagyZ5r8iY+My5ug5nTp9w7M9Q/wZSUmgUyTu4KEUjlxvdqIuIA/buZYs
+o2SRCPbob8nCFshjghoW2uJi8O3Hpov2pOy+irUIlFu2qlotOVlGMUF5hN4YRKAm
+9+42+dBVTNbvyhuPi4AUoI6gFBJc14J5p4/vu/Qfl+wEjReoknXUhA9QFXSjLjcg
+d0pjhRo9fec31Kwm2TrLnkt8Pb+G0iqPTlj9cCVQdcJfUazUgE0OrumZcv2lnSqj
+Uij1pLIJPlV8uYc/ieggTLAJk6wQS0k3IqEoV+J8YBtzSqkd6YkUuoDn8teSaiP0
+Re48SHHJ4tJ/LnBalq+gpLUCdyx3Shsws9wjMww1FEot5PrO/AuKimvg4l/wtgPY
+qb5nNa75pA/jHj9xEL4F
+=vovS
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtx11extras/metadata.xml b/dev-qt/qtx11extras/metadata.xml
index 39c63597e531..afb3b434585b 100644
--- a/dev-qt/qtx11extras/metadata.xml
+++ b/dev-qt/qtx11extras/metadata.xml
@@ -4,6 +4,6 @@
 	<herd>qt</herd>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
-		<doc>http://qt-project.org/doc/</doc>
+		<doc>http://doc.qt.io/</doc>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-qt/qtx11extras/qtx11extras-5.4.1.ebuild b/dev-qt/qtx11extras/qtx11extras-5.4.2.ebuild
index 1e87b2ecef47..15dc01d2f31a 100644
--- a/dev-qt/qtx11extras/qtx11extras-5.4.1.ebuild
+++ b/dev-qt/qtx11extras/qtx11extras-5.4.2.ebuild
@@ -1,24 +1,21 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtx11extras/qtx11extras-5.4.1.ebuild,v 1.4 2015/05/16 11:00:01 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtx11extras/qtx11extras-5.4.2.ebuild,v 1.1 2015/06/17 15:24:25 pesa Exp $
 
 EAPI=5
-
 inherit qt5-build
 
 DESCRIPTION="Linux/X11-specific support library for the Qt5 framework"
 
-if [[ ${QT5_BUILD_TYPE} == live ]]; then
-	KEYWORDS="~ppc64"
-else
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
 fi
 
 IUSE=""
 
 RDEPEND="
-	~dev-qt/qtcore-${PV}[debug=]
-	~dev-qt/qtgui-${PV}[debug=,xcb]
-	~dev-qt/qtwidgets-${PV}[debug=]
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtgui-${PV}[xcb]
+	~dev-qt/qtwidgets-${PV}
 "
 DEPEND="${RDEPEND}"
diff --git a/dev-qt/qtxml/ChangeLog b/dev-qt/qtxml/ChangeLog
index 6bd66957b851..d075cc59a663 100644
--- a/dev-qt/qtxml/ChangeLog
+++ b/dev-qt/qtxml/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-qt/qtxml
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtxml/ChangeLog,v 1.14 2015/05/16 10:20:36 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtxml/ChangeLog,v 1.15 2015/06/17 15:24:32 pesa Exp $
+
+*qtxml-5.4.2 (17 Jun 2015)
+
+  17 Jun 2015; Davide Pesavento <pesa@gentoo.org> +qtxml-5.4.2.ebuild,
+  -qtxml-5.4.1.ebuild, metadata.xml:
+  Version bump.
 
   16 May 2015; Jeroen Roovers <jer@gentoo.org> qtxml-5.4.1.ebuild:
   Mark ~ppc64 too.
diff --git a/dev-qt/qtxml/Manifest b/dev-qt/qtxml/Manifest
index f309f1c2eb9b..30da4327ba15 100644
--- a/dev-qt/qtxml/Manifest
+++ b/dev-qt/qtxml/Manifest
@@ -1,14 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST qtbase-opensource-src-5.4.1.tar.xz 46132220 SHA256 8574a593830959c0f7e5430fe77a43832ea7f5299e14a397a74576b3df7fb1b7 SHA512 75d2c16bc47e6403e15c4094f50757157960cff4434de29f199b015795ba772b62125f01c09aceb2a06f8dfcfc4df8e35330259c76959239f276e2f5bd5221b5 WHIRLPOOL 48d9a583ba9d0bbfffdbfeaa2412e77a0bf4011e7bba525129ba4572faa6a55713a89cb00f4ed7f24e6782e3f7b8b48cb192e2c082b7dcb3c35a85109f2eb340
-EBUILD qtxml-5.4.1.ebuild 597 SHA256 ebda851375d10e4980173c3e9ae4874d4bf21e4bb28537ea6a30cc1c56faea61 SHA512 43324979ccfcb8fcfb0ebb2c1359488d4411c805ffe4a8333e6236515c310d2227833805a5428ff216ea4ecb7ffa4e1ba63f8347723d597a62895e2dfa6e29b3 WHIRLPOOL 3dd05be3bba7aa890b70b2ec49c6021d59b39c2ef48eeae3a06b311e0fb3ce4e701543430ff65f82a1fb79f4da624af593dec6bd70d0c9d5f008bbf660046380
-MISC ChangeLog 1430 SHA256 c01fa17edae56b6f217e0d63d7e09981109a101f56e39015a573519d6e4efe36 SHA512 621221f44ce0073902f5e286757037603e64a0e0389e4ac8f9178719520137b98fabf4e317b2fb61c33af7552a87a8dbe48e0bf4fcec868698f10dd23000076c WHIRLPOOL 06ababba492d211358322a038026a8e880caddba14d52ca0ab8ead3b9f09264650e08ea0901b0ae83b0ec57baaa55b81ad6ae2cc3f816e6c384cce5958279cfe
-MISC metadata.xml 268 SHA256 0976b0efa573f782c96382e8f40ec82944c66ed52a89ebe6b0e905050f01395d SHA512 73ef5d7a382915e844a0cf7f1f05ae64c88500ecffe13265d156960b498ae61a62f29c9789330e5f24c82ddbf3a9ebb98aeff5c4cb0e69af1e8f07099791b806 WHIRLPOOL 19922570bea256c44d78d6f92ef9781be4c177580bb4235d8620139c6cfd759df64fc82f053a685d70fa1378b0fd6f49bb818d393b19105e6069730e9cf44e52
+DIST qtbase-opensource-src-5.4.2.tar.xz 46354192 SHA256 9fc4f720b8b5a8b8e4a7d45e13ce4d5b86756ad46fb406386637eb2de5fd5a74 SHA512 029da83969614bc9b3803c76242af62911e3c6de171b116b5cb8e2823cad0514ab705cc3fa331e042c679caeb099de4e9cd7ddea92959f675dda82533e3ad7fe WHIRLPOOL 5f352f78a779c5d042f04966a010b10af706c4db94976870721a550e3ab7eaf2695b3582c86cdcc3a11de36283e11fe65797f96e59df96fa367b16b72b5f9213
+EBUILD qtxml-5.4.2.ebuild 559 SHA256 a9359e2082ccaf7b943313a5cf7d746735570ca206be2cfec1dc72a11cdf7257 SHA512 510485636518db6e9855441cb3dad02eef88c90a8671e60f7a0ed5d920e596418780af81d1369979ef959e326d9dae5f372f97c7da64d1c6998a881e76d434c0 WHIRLPOOL b58b7d3c713859a94c4925af663125429f326ac6385381f3db26ecac7c425016c2c8b9fa0c589574ebcc264a070932ae7aa93ea76719b5bd321c1c799cd948d0
+MISC ChangeLog 1584 SHA256 18868bce2993dc5d1d6df89daa2afdb7f6d6b52d97531ec2c9a0fba03c341f7b SHA512 e411c3f2577debd72f00467c4d3d2d463702078112ff68e3ee3cee0803ef7d59fa07999b37dbd3356227f462cdd40022f85d6dcbe0b11d6cd4028ffdf42771ce WHIRLPOOL 0d386c3c9cec7f43f47e2d431824ad0fb1d5f0d92489229870adab652ea216b649d138a985de74c47425ee71352e3e2ef9cb1a112078f9f8c5471a2dc047574f
+MISC metadata.xml 259 SHA256 da0ed92b6766281315367c03378c1935b4e9fa82f840641d9c72b00a1b038646 SHA512 1fca930f71c109412ead8932e0910f6c2b1991a454b03ddef6dda7101358db65b3c6da5eb7f71c918673fd3b9b0ac0397cef0dd24c85f84f2043e3ca8e21dda1 WHIRLPOOL 484f50be685ae8a8a65889a66edf2a6d544e0c6758a8f384bafd7e8f1cc23c4e788613d39febc67f1fc6f99e9e7541881f6224e07497ab0ca031449053b5e13b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlVXGfYACgkQVWmRsqeSphMLxACdHVcH4LERadPhNJGPy09VY+aL
-K0AAniV7A7Za5179fySkm2yc1eSub0p8
-=XBIY
+iQJ8BAEBCABmBQJVgZExXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV952gP/0vmu100GYIiSnOFM4xsXr3K
+1rlFsySRgC6szekztSlxtMaK+9+7dBjM+vNkxjancUArxNqxgsx6vPBFQFLNw764
+OzKyxmUce7fD1wX05f9RsGwDzWGV3Ewq+Rmm5iTGcvBZf35rrwmpjTEuhJGG1gL4
+HyYg9s32Azx+RVGlN3dpd64Q7wspSMkoCYD3nveOLV0Fc6Fo5yZP1/I2t9/7TSE7
+0FPXsihEVZiLqyYJHGAMtyacfNZNev3tNbPBNNMjMw+kfvARgdb1qojB3Oeemu1X
+SAFbE17ah4oIR9Uc7PcvmGiY92xefstDi7T3O1p0kS6UZcp3EsdI3uTcDo4F57L1
+T+91sZCCBDidIVbMyALlZ2lGHicnPoELVaSoiDDEArWWgIyBKys9pNevtILI/3X7
+x2qFbhgI0m2GDWxr4c1zK5uTOiRGV7pqS/X/OVmix4szzAAbklLdQC5WpwcFdUs/
+mIDYQdr2ZiJmCSPcfTju0+wa6TpPnlbSMjq9pC8ixV4dijv5HPfZICO/vnN9/ZEG
+7QP9hkAc2smz1gZUZ8zzNmGc2ufTckWLUXXaZ9wBkNgMtive0PQJ1AuLxGAIlMHw
+JfpRrFbXxMIDTLf/bTk//+hQY3dDCMGyp6WwXebbbrWVa4g2bauQRgjBgziKd9V0
+bW2IFGcsC6nroWofj9RJ
+=rsq6
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtxml/metadata.xml b/dev-qt/qtxml/metadata.xml
index 39c63597e531..afb3b434585b 100644
--- a/dev-qt/qtxml/metadata.xml
+++ b/dev-qt/qtxml/metadata.xml
@@ -4,6 +4,6 @@
 	<herd>qt</herd>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
-		<doc>http://qt-project.org/doc/</doc>
+		<doc>http://doc.qt.io/</doc>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-qt/qtxml/qtxml-5.4.1.ebuild b/dev-qt/qtxml/qtxml-5.4.2.ebuild
index ef8ca6f41ed5..ec20ba95c827 100644
--- a/dev-qt/qtxml/qtxml-5.4.1.ebuild
+++ b/dev-qt/qtxml/qtxml-5.4.2.ebuild
@@ -1,28 +1,24 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtxml/qtxml-5.4.1.ebuild,v 1.4 2015/05/16 10:20:36 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtxml/qtxml-5.4.2.ebuild,v 1.1 2015/06/17 15:24:32 pesa Exp $
 
 EAPI=5
-
 QT5_MODULE="qtbase"
-
 inherit qt5-build
 
 DESCRIPTION="SAX and DOM implementation library for the Qt5 framework"
 
-if [[ ${QT5_BUILD_TYPE} == live ]]; then
-	KEYWORDS="~ppc64"
-else
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
 fi
 
 IUSE=""
 
 RDEPEND="
-	~dev-qt/qtcore-${PV}[debug=]
+	~dev-qt/qtcore-${PV}
 "
 DEPEND="${RDEPEND}
-	test? ( ~dev-qt/qtnetwork-${PV}[debug=] )
+	test? ( ~dev-qt/qtnetwork-${PV} )
 "
 
 QT5_TARGET_SUBDIRS=(
diff --git a/dev-qt/qtxmlpatterns/ChangeLog b/dev-qt/qtxmlpatterns/ChangeLog
index 53327e78f4be..ebef238e6843 100644
--- a/dev-qt/qtxmlpatterns/ChangeLog
+++ b/dev-qt/qtxmlpatterns/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-qt/qtxmlpatterns
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtxmlpatterns/ChangeLog,v 1.33 2015/05/30 10:56:10 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtxmlpatterns/ChangeLog,v 1.34 2015/06/17 15:24:44 pesa Exp $
+
+*qtxmlpatterns-5.4.2 (17 Jun 2015)
+
+  17 Jun 2015; Davide Pesavento <pesa@gentoo.org> +qtxmlpatterns-5.4.2.ebuild,
+  -qtxmlpatterns-5.4.1.ebuild, metadata.xml:
+  Version bump.
 
   30 May 2015; Markus Meier <maekke@gentoo.org> qtxmlpatterns-4.8.6-r1.ebuild:
   arm stable, bug #530238
diff --git a/dev-qt/qtxmlpatterns/Manifest b/dev-qt/qtxmlpatterns/Manifest
index 09fa11a120b1..083e55ced3ec 100644
--- a/dev-qt/qtxmlpatterns/Manifest
+++ b/dev-qt/qtxmlpatterns/Manifest
@@ -4,17 +4,29 @@ Hash: SHA256
 DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357
 DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2
-DIST qtxmlpatterns-opensource-src-5.4.1.tar.xz 1307228 SHA256 f5142ff4d3f1154550530eddf310d2ff149c6f0055d3d028ad48cb5491c65318 SHA512 c6728cd780ce583c7fbf6be32b7c2359ae82d3f81b948863442cde94368488e2650c97e8580327d6980f7f7858e61408b0eaddf5a35262a64688627b4a6d1f9a WHIRLPOOL 4f2b2db66cca7d1c627e0f26bbe08200a1c3edc96177851d9ed3b8d86959d2f5aa609cb177726b6caa7cc2f3a5b989ec73d49a9c21e8870471f1d4d10edb39bf
+DIST qtxmlpatterns-opensource-src-5.4.2.tar.xz 1315912 SHA256 aa7fd8aae6f53f74a69048756197746a3e0ac7fc53f8678b8202c470b1fd272b SHA512 7909c395807395e6635e857d99ecbc39d8b0d253b93947398a72899a2434ecd4fa99e229aba404c94667690a0407b76eb651723b0a1dc0b1fb4a47707b44707e WHIRLPOOL a72813a70aee52c0ff9d700c43abaa27d5aba0d8e8b9cc541c3e9794dcabd7458e8253eae90369fd86e4cc50f0a5b08ec490e35e333a1b954af5dad2eb65452b
 EBUILD qtxmlpatterns-4.8.5.ebuild 1075 SHA256 c33c5f8360d91c36f8ec9d97c00ccfbd5dc5e605d21da27de47a538fda7f614d SHA512 e5cfa8cd414fc6056a32a73c0d45355ec649023a4a7660dc21b59148e75c35cddf65f31b290d052f4686d0f5f3c6dad1f4b0ea26f8ae3bbeb25b56d42af33dc1 WHIRLPOOL fe19f8437802a8617f088c2eed8d554cc127e68151eda0fa3ade53b36a760b55fa593f0eb8811ea1dd58894f7a1747c66d01acdaa17389b678d7005026f36813
 EBUILD qtxmlpatterns-4.8.6-r1.ebuild 936 SHA256 c5ec54d075029fc3f65639d65d4c6cecec1aed4fecb67508a3673a8aab1977fe SHA512 c49b714c46473a2b19187b91321ba8712a0407162082375ab53452a04009f16c5be60101b2ea4b2ed2a73f148d48054b43b97fefeaac451c6c64bb15f57d8e86 WHIRLPOOL 587152976267babab90e14a5dde8db1cba653a8d7977b81022bba011f58924552d3970cf1348f5d7c5f8a3772bbebf4b2d56d9d2ddad98f72d1f18e0676c5a4c
 EBUILD qtxmlpatterns-4.8.7.ebuild 903 SHA256 82915224f77c3ddedc1364ff11fefd41f0216764be0b61e016737130a1311573 SHA512 c1fd5ec844766bc1076c73dc09caacf0ef56f564a75503dac5560563f5d4ef284f38e5909cb01cd2f54822cf7e4ad9d92bd20d65736cd580e3d275a65ae92e27 WHIRLPOOL 8dc903f0eae18342e89d790abf76505862a4a7c14861b54e30fdd1b0db6dc350c2fa59a5f693db057c9ad46144522acca9a123e98fee2a6ba1d2211f1c9ca417
-EBUILD qtxmlpatterns-5.4.1.ebuild 558 SHA256 f14314e091ba563ca8a366d026756b9f6ecf274ca72ac74bb116a47f8381f23e SHA512 c13888d9e52ec83510e47dbb0c3433847349334f07a8e5a8895d930e5d6dc7b3e21038f64c32305183c08996cac88d72b18352eaaa6204a9a074d67f2dfa91e0 WHIRLPOOL f5d8c562296f7c59c7d91e653026758b0c681eae5c1bc7398358627c0c473bbfd5870c694cb3d437a329b1692c293dd94ace38b42d5dff1756bf35a29ea6ca1c
-MISC ChangeLog 21515 SHA256 4f5a61ca336d66ba99fc8daa4fb9c3e81f76e6b52a889aac4e906fd0b5a6bff8 SHA512 c19544be4a5467fafc491587c6e899bbb3401917611348ac5a239446cdfbc7357539443d0b42ba3d1eaa514208a5fce6fc31bd3392e9a05b71d02543ec5d0470 WHIRLPOOL 7ce97108be7e1de827906d32c512be3f5f74502ab5cdf60d1e608d2a2bfea470df017a8282fe8751066546fe774dcb6f9b0ca35efe18ae64f08a3202564c50b1
-MISC metadata.xml 268 SHA256 0976b0efa573f782c96382e8f40ec82944c66ed52a89ebe6b0e905050f01395d SHA512 73ef5d7a382915e844a0cf7f1f05ae64c88500ecffe13265d156960b498ae61a62f29c9789330e5f24c82ddbf3a9ebb98aeff5c4cb0e69af1e8f07099791b806 WHIRLPOOL 19922570bea256c44d78d6f92ef9781be4c177580bb4235d8620139c6cfd759df64fc82f053a685d70fa1378b0fd6f49bb818d393b19105e6069730e9cf44e52
+EBUILD qtxmlpatterns-5.4.2.ebuild 521 SHA256 f9aca8874d1fd6fc8db6a71bda0cd04eee0cecc2728e3145f9ca53e118548ad3 SHA512 28292f11794b1bc2e9cecd01cfa20f5eec0864678009451b51829d3440310c89fb384f784ab0a573cfd97a9d2992673897013e94a36ae920d25b68f85172285c WHIRLPOOL d91f29a4132c802e0b8fcbb88d0cfeb4b8d20843dca3dd1894cc10f73bf93a120cb40899e5462ddf5ad24c0a65908f9c3ba7ca02934ea0ff35fa23c114c16841
+MISC ChangeLog 21690 SHA256 cf02594e0dbc8ec84e1abf2bb830bbe8f5e9ed4fe552f43d0b10f6bd9475d003 SHA512 71cdfb3a7e94343632ff2b021320c7f2aa8b6d96c6f6d446b08d2e4e8f5ff1517327dbc18094a30fa5618135bc02a4351c8c8d2a71d794c50fbf2f5a1beb80ce WHIRLPOOL 5cc2fe85b7260988a31e8c44e129d7d7fc93eed7ede5f6024778e7274baf6d19fe52bc4718cdb05bc8d590de908c88588a8417e92f8a13309781a94e34d0047c
+MISC metadata.xml 259 SHA256 da0ed92b6766281315367c03378c1935b4e9fa82f840641d9c72b00a1b038646 SHA512 1fca930f71c109412ead8932e0910f6c2b1991a454b03ddef6dda7101358db65b3c6da5eb7f71c918673fd3b9b0ac0397cef0dd24c85f84f2043e3ca8e21dda1 WHIRLPOOL 484f50be685ae8a8a65889a66edf2a6d544e0c6758a8f384bafd7e8f1cc23c4e788613d39febc67f1fc6f99e9e7541881f6224e07497ab0ca031449053b5e13b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iEYEAREIAAYFAlVpl0sACgkQkKaRLQcq0GKgYwCfULTYmEbtk2qYP9hRR+9LxEh+
-SCkAn3mEzjemaSBht4oXUxIHPFIZdVUj
-=9MBJ
+iQJ8BAEBCABmBQJVgZE9XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ4N0Y5QkIzRDgwM0JERkYzMTc5RTI1MjhE
+QURFRDZCMjY3MUNCNTdEAAoJENre1rJnHLV991cP/0uc6vgvCoXV5RwWgUHfDvtZ
+9kAKZJ8AwBHbdSSn7K7Spfb0FGHj1p/YvqsNon/sz5P2h2hMjU0CgkSh1a36f+9w
+38/HTq74nHwqmBsOxAinQeV8FPKdQhb+ZsH3CFJQJlNhiZUvsOKOMv+erwbAa0tD
+9Ws8TNZmQUkKVt6BIWF4HbYYa1o2ApKxYBZVYJyiOTV0JMoUBHmgz1PJUNT8JdZX
+LFmeQdHauCP+/ZTqeJNjWiPLenvVISk4MZ2GzN3xn5nsb5MtqEx2TONlWAexnI/r
+A1FlH3GZnV5R9S5b5+BdR2XYESSA246Mqbig1NGdgwLTRiTh/prc3rNF3JuRqHKn
+9Ir3mFM2i6fevfTz2LqfcxJygeMc606DeG9tMx8+RLscDgiByAsbYQJB9296Vla9
+MkrdxVJGwHGhfqdRpg8OXWyhHXjNc72CqPrnpcQNeDyJKOtru/jlHlpIekdKWwiL
+lrsPDS4hA280lNtRpembL1jaAVktUM+JxlD3nKxtUiKSexZVAwJQ+HWCZJFiMcK3
+F2KIEZy9m1MxHUeaz5v+kpJZIPDOekZMc+HTLdgrb/4jmXgo6lX8+8nTycV3ZzJ5
+bxoO8zvb9oIu9QSZaYRrDyDrjrFDSEWWT4tChckfUCzVnaOXjUSk14x7gQ9DQDcl
+f1eN+2alVSBYJCTzH0OL
+=q4oX
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtxmlpatterns/metadata.xml b/dev-qt/qtxmlpatterns/metadata.xml
index 39c63597e531..afb3b434585b 100644
--- a/dev-qt/qtxmlpatterns/metadata.xml
+++ b/dev-qt/qtxmlpatterns/metadata.xml
@@ -4,6 +4,6 @@
 	<herd>qt</herd>
 	<upstream>
 		<bugs-to>https://bugreports.qt.io/</bugs-to>
-		<doc>http://qt-project.org/doc/</doc>
+		<doc>http://doc.qt.io/</doc>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.4.1.ebuild b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.4.2.ebuild
index 45653da0a56f..b9f1d58b6bba 100644
--- a/dev-qt/qtxmlpatterns/qtxmlpatterns-5.4.1.ebuild
+++ b/dev-qt/qtxmlpatterns/qtxmlpatterns-5.4.2.ebuild
@@ -1,23 +1,20 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtxmlpatterns/qtxmlpatterns-5.4.1.ebuild,v 1.4 2015/05/16 10:35:55 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtxmlpatterns/qtxmlpatterns-5.4.2.ebuild,v 1.1 2015/06/17 15:24:44 pesa Exp $
 
 EAPI=5
-
 inherit qt5-build
 
 DESCRIPTION="XPath, XQuery, and XSLT support library for the Qt5 framework"
 
-if [[ ${QT5_BUILD_TYPE} == live ]]; then
-	KEYWORDS="~ppc64"
-else
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
 fi
 
 IUSE=""
 
 DEPEND="
-	>=dev-qt/qtcore-${PV}:5[debug=]
-	>=dev-qt/qtnetwork-${PV}:5[debug=]
+	>=dev-qt/qtcore-${PV}:5
+	>=dev-qt/qtnetwork-${PV}:5
 "
 RDEPEND="${DEPEND}"
author	Davide Pesavento <pesa@gentoo.org>	2015-06-17 15:24:45 +0000
committer	Davide Pesavento <pesa@gentoo.org>	2015-06-17 15:24:45 +0000
commit	0050b6126b64b61a7931108aad40ec3a4c2ea43e (patch)
tree	855dfa877a02d3a4d31b46caae2d46646988a573 /dev-qt
parent	Set EGIT_BRANCH=devel. (diff)
download	historical-0050b6126b64b61a7931108aad40ec3a4c2ea43e.tar.gz historical-0050b6126b64b61a7931108aad40ec3a4c2ea43e.tar.bz2 historical-0050b6126b64b61a7931108aad40ec3a4c2ea43e.zip