Add blocker to fix qttracereplay file collision, bug 486060 by Arfrever.

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

4 files changed, 25 insertions, 13 deletions

diff --git a/dev-qt/qtgui/ChangeLog b/dev-qt/qtgui/ChangeLog
index cfe716dc56f3..539f5717eb2b 100644
--- a/dev-qt/qtgui/ChangeLog
+++ b/dev-qt/qtgui/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-qt/qtgui
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtgui/ChangeLog,v 1.7 2013/09/23 14:39:21 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtgui/ChangeLog,v 1.8 2013/09/29 10:45:42 pesa Exp $
+
+  29 Sep 2013; Davide Pesavento <pesa@gentoo.org> qtgui-4.8.5-r1.ebuild,
+  qtgui-4.8.5.ebuild:
+  Add blocker to fix qttracereplay file collision, bug 486060 by Arfrever.
 
 *qtgui-4.8.5-r1 (23 Sep 2013)
 
diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest
index b16c82463c1a..0bcb47d27626 100644
--- a/dev-qt/qtgui/Manifest
+++ b/dev-qt/qtgui/Manifest
@@ -7,18 +7,24 @@ AUX qtgui-4.8.5-keyboard-shortcuts.patch 1706 SHA256 597fe8717279af4db6bc074588e
 DIST qt-everywhere-opensource-src-4.8.4.tar.gz 236593028 SHA256 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270 SHA512 472972b63b5cad83b4c4656b23e95b6d4923cc31a518138e25d5921982b14abc835883356c2b779a7972cb77cf73fe25b46630be7c6a86a917b364186aa17496 WHIRLPOOL 9d250ee9ddd0431eeabc22ea598eda2bc74ee7ee6c5329522c479143d6c38fa17ae545541b4e3220b05d493c1a5d407c70980d0d1ffa49d2f83dedc1774cfa79
 DIST qt-everywhere-opensource-src-4.8.5.tar.gz 241491467 SHA256 eb728f8268831dc4373be6403b7dd5d5dde03c169ad6882f9a8cb560df6aa138 SHA512 47118d1aa30c59a1eb74e805023cd060edcb35bb0944fe6651889254b75acbd4b83700ba92a9bc215663474d26330cb44f084098c380fac9270742659e5864eb WHIRLPOOL a18f47fd91b522d1543e415aff4f5056202e0cab03da9cfcae9fe2d4118cb1dd1d5fd6a5e2edb9c1e4a68563188d44440e234d268d9c0aef6e3ca3f0988dd357
 EBUILD qtgui-4.8.4-r1.ebuild 7213 SHA256 acd016b867ab1a37a4ea62e156277e2cbb618e22bf658a7f82ce2f3f1d2b6684 SHA512 67125c1bc35aa87f7f2806b4d4c4ffb1ba5f9cb5c553f29597298c6dc68244da5b9a8bbb3fce687bdb811bfa8dfcd6e2154b291a9edfc62dac65745b4bb6e585 WHIRLPOOL 710dfdecb00d9fa23df82e8efc8170ccd65dad81e5f5f7c34230ced2ed9ffdff0df580a80629f616c10a3ecbc36d79afe868f9800a5c187780e66ee4faff7812
-EBUILD qtgui-4.8.5-r1.ebuild 5651 SHA256 1e7436b30a461e3307b112315d889f0c3c58b30d23a24d5872f76340df044922 SHA512 562301304541ad6bc2e8e2af8d823b676d393130e05848fee0664debe7483da531c2beb39713d5eb51e195b172076ed0b262466d6cdd9678f43910d2b6d4d6b7 WHIRLPOOL 1c46a4b355360a3d3b8088092aa438b92e0a87f20375636305c757d25431dd1d670114b1fc509d34a773a8a15f4aeae511eede7bd3236ecff353e93ad1323b06
-EBUILD qtgui-4.8.5.ebuild 5603 SHA256 40758d9ede7d643f9480fd049c0b9030d805802a4ca48f95574858581aae656e SHA512 a7e90d7f0a584130f99184ad3ec51799add926003c20e994e18c24cb09fac67ff7a6119221c937327aa72db25ac389f956eceff67e445f84cb58e653f60fe181 WHIRLPOOL 2ec24f3432629463047f0bb1989193f3ca0348127fffd4f4796605af2a6101c5781b82917a5768d8ab9f9fda2ac3f84686b8181f897a6e8581bd1330e4a14fee
-MISC ChangeLog 34508 SHA256 2427bed3f3fda49cd41a2f85fc9122405b9262ae2d72c1a8fa8935c3f0f91523 SHA512 76f98c0f667a8b67778cda37be73f7f5b85aedcc36a4d3cdd52c62ed9b1c015a6330f8b1b147201c8045c3a48a9d2fa0d02249af19f79cd348b7c9e3e9556c3d WHIRLPOOL 92337776b17d78342a751648756d7ccd4f5ed4a010d3a9935aa7e91eccf1717ff9c1a1f4ea291f6280ece6c23d7c1440d2d0571684413bec8efc2fa668c5a853
+EBUILD qtgui-4.8.5-r1.ebuild 5670 SHA256 73941a14f4b0776786ef1a35d201c3ca69bad4b04818a7b99041225bf0876a42 SHA512 e3f128480b80e19970c52b26d30a0a8fd5e75d11466e45fc2019d913b4a2d6f74d015c6886630ff319523ab67c5a9b713afbefafa74d3f0158c8cd63be77cb42 WHIRLPOOL a6c12f75e6b33b001d7f07aea39166104b4a6732df3b804b6b825acdeaddb5f997195efa97bd83c1179bc5213fb1242ddc0631ec923c382d4fed143b5ffb044a
+EBUILD qtgui-4.8.5.ebuild 5622 SHA256 b5b38e03b6f049d0e0cc7ac660a147ca6f860740b5cb526a122d55377ffe5b9c SHA512 0a1ffd43c0251d01a29b3787c4b72968d4960c0a5aa1a03d262f186582bb218c5cbd40dc116a669fcc7fc102b620d89739cb176e486e1355c38769a96a68bc07 WHIRLPOOL 8cf6320fc1c19d9a3bb70ae5a2e6db5eedb9717b0bd8e20c3e2208f69751aa6b2bfc78c88490ae7e1f781d190cc9aa6ecb941b055cb7759c217e1812504fce1a
+MISC ChangeLog 34673 SHA256 3c00214e12bc1125effd3b08eaae57f8fd676dd7572be9796c18ac0201f185dd SHA512 bdcd6d1273a674989d8c93037f578cefd5265ce899dcfaa3e4dac8e87bc7f7678117a74c188beba24942fedfadccc43df5b10928b2ee882c79d8b267b35e505f WHIRLPOOL 8e0311dd23a2f7f9e02fc5058ffd3d08c15d9455e372ed4c79398e683f9d16980ed0d401dfc8b2fa7b5babf9b3cc194344a73075e05e101fec6c12bf1312e208
 MISC metadata.xml 1117 SHA256 fe5f2ec8d0a91fd48b7fb30f9d146c315812647477608bf303a13ee8ef91290e SHA512 18357a2905d6fed98173361c8b574bca5501844d11f3887f913fb9ce0d3dfce1e181188b93d2a21c9a4e24229afe4037a0c3a7877d521d2f43464d94dae1b7d0 WHIRLPOOL 76c441e8ba23e2067e76ed06ad3db061ab9e99647ad124b1f5ebcf14d6ebf6cd82cd11651a5a207ba97f39a00aee44b840deeae1e098e631fac99378008376fb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.21 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSQFH1AAoJEMbwO6tnXQ0sdQgIAI+e1xJYvxWRwwDvpVgY7ndI
-thROJu8YYTQJgrqiwtkOx2A4I8pmtYHNPJU3MyDRMPY7M0ypKgN3HnVM/p3BqH/A
-97moeH7BNtQRNJsih9HH00hkBjcfRHm0a2Pc9vJVpYJM/F18yCy1xfxfYm04p0ox
-TRFGfAu7VbR/iULODWI5pMzg+qH20OEavDOdhDrbO3vS3Ne63xSZJZKHkV7nlQBb
-YxA55yrjYuwN8LBz5DgbYbD5rVlG5ZlAcx/R9PU+/RHAuF9zn9J2LdxTt+4A4Dl2
-S1+vOPyiCCmv6C0jIpQ468slMmy6WDG4l5+qNFK56kS27qCqy9a5smfPsdv7DS8=
-=uAmq
+iQIcBAEBCAAGBQJSSATaAAoJENXLsxwXqFxyO+UP/0R3RYP55/MRi6g7wM/0sj5j
+R6Yyq5JDpSTuL/WnAh9m1BO3bbeT8KQ3l+8xe6HBXJmTBZm+hJLrClanULIpOI6V
+x+ZW3eMS8J65gdoVLF5C44uLLTkYHvvGjwkwaVD4u7XuCDUWFHUmW78wsqDeDB4/
+z8LelAn2ckXfPZg9crNes6XMd2QLpdFxiWIpiI0Yj4dtlldfSGD6fEY/Z/dnDW9a
+Oax01vmd7mMFTS22vgkw5myjIOqxQ6MdBMBGfvQBfdzpw63xZ37C08X6tzjSLkRq
+ANfgqrNk2TDfpvjeheDQMLJZ6v3LewIjMU/L+n+KaTzpdJvEBiucTf0SPnJONViT
+GT/M3IZmT/uYV37h/wckgcAkCDG3u8LcLjHOAYgeeF4jBdmybrU5z/iaAzPFR7r4
+i7/UsNgBm7ZIQrbXTtmcYGUJQyzVAfTKQrYa+u+ct4iuyKUmZpiWr2e3lkYyQUzS
+Y5Y0EDQR3BLm+qnYHmjOXr1By0k62x8896PHFbCq3HFjFKR4B9cq74VoKFjcDyih
+t1PHAs8FF+AMoGs+Lc0PC8hKK5sobnhy4T4DTgL2lQhem1PfQU/JXaoZLGMfTbIr
+AHJpHrKfUNZ3w216DnprdTCFmuy6MFyc6Z7SPDqOT0xC5j3NOSRN9EqffoBhHuHy
+VjLDL5wXILmuzY0oYB/g
+=db/a
 -----END PGP SIGNATURE-----
diff --git a/dev-qt/qtgui/qtgui-4.8.5-r1.ebuild b/dev-qt/qtgui/qtgui-4.8.5-r1.ebuild
index 0fad825c978e..f17da797909a 100644
--- a/dev-qt/qtgui/qtgui-4.8.5-r1.ebuild
+++ b/dev-qt/qtgui/qtgui-4.8.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtgui/qtgui-4.8.5-r1.ebuild,v 1.1 2013/09/23 14:39:21 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtgui/qtgui-4.8.5-r1.ebuild,v 1.2 2013/09/29 10:45:42 pesa Exp $
 
 EAPI=5
 
@@ -51,6 +51,7 @@ RDEPEND="
 	mng? ( >=media-libs/libmng-1.0.9 )
 	nas? ( >=media-libs/nas-1.5 )
 	tiff? ( media-libs/tiff:0 )
+	!<dev-qt/qthelp-4.8.5:4
 "
 DEPEND="${RDEPEND}
 	!aqua? (
diff --git a/dev-qt/qtgui/qtgui-4.8.5.ebuild b/dev-qt/qtgui/qtgui-4.8.5.ebuild
index 8ec6045496ba..c9f624000fc4 100644
--- a/dev-qt/qtgui/qtgui-4.8.5.ebuild
+++ b/dev-qt/qtgui/qtgui-4.8.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtgui/qtgui-4.8.5.ebuild,v 1.2 2013/08/27 15:52:30 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtgui/qtgui-4.8.5.ebuild,v 1.3 2013/09/29 10:45:42 pesa Exp $
 
 EAPI=5
 
@@ -51,6 +51,7 @@ RDEPEND="
 	mng? ( >=media-libs/libmng-1.0.9 )
 	nas? ( >=media-libs/nas-1.5 )
 	tiff? ( media-libs/tiff:0 )
+	!<dev-qt/qthelp-4.8.5:4
 "
 DEPEND="${RDEPEND}
 	!aqua? (