Bug #262457 - Add !<x11-libs/qt-4.4.0:4 blockers due to file collisions.

Package-Manager: portage-2.2_rc25_p13109/cvs/Linux i686

5 files changed, 25 insertions, 11 deletions

diff --git a/x11-libs/qt-assistant/ChangeLog b/x11-libs/qt-assistant/ChangeLog
index dadb90a29181..67da24b663f7 100644
--- a/x11-libs/qt-assistant/ChangeLog
+++ b/x11-libs/qt-assistant/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/qt-assistant
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/ChangeLog,v 1.28 2009/03/04 21:07:23 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/ChangeLog,v 1.29 2009/03/16 00:48:06 zmedico Exp $
+
+  16 Mar 2009; Zac Medico <zmedico@gentoo.org> qt-assistant-4.4.2-r1.ebuild,
+  qt-assistant-4.5.0_rc1.ebuild, qt-assistant-4.5.0.ebuild:
+  Bug #262457 - Add !<x11-libs/qt-4.4.0:4 blockers due to file collisions.
 
 *qt-assistant-4.5.0 (04 Mar 2009)
 
diff --git a/x11-libs/qt-assistant/Manifest b/x11-libs/qt-assistant/Manifest
index 30c0826a09ee..6352b3d16842 100644
--- a/x11-libs/qt-assistant/Manifest
+++ b/x11-libs/qt-assistant/Manifest
@@ -1,10 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX Assistant.desktop 368 RMD160 dd28aea43bc8e013e6631d0ee91449b8a2e9594d SHA1 515684005a50bfa19ed84fb4105fbb9317ad5d99 SHA256 77b0852193675857141e0ce9ac521cfdab1506a822436a0dec4c4221a680cc4b
 DIST qt-x11-opensource-src-4.4.2-headers.tar.bz2 2509611 RMD160 3424d4049f1c06959bd57a98e3933636515c60fa SHA1 f0945230b8856b446f03473c18474e9224b30fcf SHA256 aa02d9e2c017ff92d91ef73781d4d1a28be53136886ac99275df053fe31d1fff
 DIST qt-x11-opensource-src-4.4.2.tar.bz2 102816706 RMD160 5719ab5800ca181417e0dff7f961af7b371ddd97 SHA1 0bc56934565f529a2708533a4f160fbc87b9d9e0 SHA256 0530fefc452e5029877739164e133de7df5faa519b0fb3d9fcf40b467350c675
 DIST qt-x11-opensource-src-4.5.0-rc1.tar.bz2 110889586 RMD160 60b410f1776d5f55863543fcd4dd3a8105864ec1 SHA1 1dffebc52543ee8dd486ec69fc51d02e216323bd SHA256 94aa6268662a24cec1a20e2fb88fcac418101719c0e1ab2729289fd8b7d475d7
 DIST qt-x11-opensource-src-4.5.0.tar.bz2 113335010 RMD160 5714f2772ce358e6528ec13121aebc8e63e848cf SHA1 db136bbed1715c155ceb610309d33f943c1df8fd SHA256 e1b356a54e65781ed94f19d785356a88daa8d38b9dbbca35439b80ca8c4a5be9
-EBUILD qt-assistant-4.4.2-r1.ebuild 2138 RMD160 638ca7ca12207c0a2e13b44047245a666b286d14 SHA1 c9f2655d9f08b7aa12bc80d07051964c29f078c7 SHA256 deaae89463268f0ea2ac75475c178f6f11282b52ce7ffe786cbff5a8f2e6c6d8
-EBUILD qt-assistant-4.5.0.ebuild 1510 RMD160 3bec752aefe9e3918d6ae2557a8d25d663669239 SHA1 3fb3520399db0ebb08f36f0a1e66418ed5e902a5 SHA256 ed62b3be583d930a9e70abd98b0303c9d83cf0119b2545fe29f2bc912b62cd9f
-EBUILD qt-assistant-4.5.0_rc1.ebuild 1543 RMD160 8894ec0b7a5da22a75e5a4836524f9ac00c19f51 SHA1 17e1e2ac9d0b2bd1d85aa4a9421f19cc3eba4182 SHA256 859f0614b380703576bcc901da29c6a0bc06519f9c59c268cb14a1abeb49ac27
-MISC ChangeLog 4313 RMD160 fd4818c21c8e26a596c265eb68da9d6696fc4ac9 SHA1 92c24a9016a8c39d5b37f15211ff49d2977337d8 SHA256 2597855b1825e7a5b47442975f950ae758d9afc0b12531de3c0dd31e9b417d96
+EBUILD qt-assistant-4.4.2-r1.ebuild 2165 RMD160 afa0580b0d8537a778f20f9da6e642328cd237fb SHA1 028cd563f91f779cca6d1d4bbf9733a1da10ccaf SHA256 1a38fe6b498ebc81c2e568483edd409888fb7ed6f2ef6b2643b81042a02bb893
+EBUILD qt-assistant-4.5.0.ebuild 1533 RMD160 0fe6e14dbc1bb5037a7c445feb463a8fc584dc2f SHA1 a319921f0ae869105b1594b0355d70f4039f9f40 SHA256 2f78d10e3e9d682972efc03edcd87f09ccb7ef5c374b7649aee022428966ac44
+EBUILD qt-assistant-4.5.0_rc1.ebuild 1566 RMD160 607a50d187d33394db5b4d70f83576c8a5d8701f SHA1 c74e6b597fd4c21a71671ecb3ccdd31d6714e976 SHA256 7dac0c80704bc962152ab93acc9ca4ce3adf6d2d0ed2d7ba20e3a6d8c0245a4d
+MISC ChangeLog 4527 RMD160 e0a0f54089edeb1357c2637ea2a6d7066a6f15ba SHA1 e97e7b7024ed57ab2cfdf5130be924c308ede492 SHA256 4d04a204ba8f6b3d1d9883f40ef683423e43d37387ec007c465968b462a8fed7
 MISC metadata.xml 342 RMD160 39caad45b183f242fcd2bb217ec6c8b743aca822 SHA1 459e60db07dbed8f1aa5b3b66194abfd5db74625 SHA256 e91ea92bd61f65a4a215796c172d0689b71910b336c70d039d9e8c1d3e66e549
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.10 (GNU/Linux)
+
+iEYEARECAAYFAkm9oe4ACgkQ/ejvha5XGaMV0wCgtDXVlBG8ZcRUcKfPvPbkWGWc
+GDgAoLRpsbmw9TJc+AqM768/X5JH7mn3
+=nG3L
+-----END PGP SIGNATURE-----
diff --git a/x11-libs/qt-assistant/qt-assistant-4.4.2-r1.ebuild b/x11-libs/qt-assistant/qt-assistant-4.4.2-r1.ebuild
index 64382ff63006..31765ab263d7 100644
--- a/x11-libs/qt-assistant/qt-assistant-4.4.2-r1.ebuild
+++ b/x11-libs/qt-assistant/qt-assistant-4.4.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/qt-assistant-4.4.2-r1.ebuild,v 1.9 2009/02/18 20:16:38 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/qt-assistant-4.4.2-r1.ebuild,v 1.10 2009/03/16 00:48:06 zmedico Exp $
 
 EAPI="1"
 inherit qt4-build
@@ -16,7 +16,7 @@ IUSE="+webkit"
 DEPEND="~x11-libs/qt-gui-${PV}
 	~x11-libs/qt-sql-${PV}
 	webkit? ( ~x11-libs/qt-webkit-${PV} )"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND} !<x11-libs/qt-4.4.0:4"
 
 # Pixeltool isn't really assistant related, but it relies on
 # the assistant libraries.
diff --git a/x11-libs/qt-assistant/qt-assistant-4.5.0.ebuild b/x11-libs/qt-assistant/qt-assistant-4.5.0.ebuild
index c0acdd945b92..1c95d5f07b31 100644
--- a/x11-libs/qt-assistant/qt-assistant-4.5.0.ebuild
+++ b/x11-libs/qt-assistant/qt-assistant-4.5.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/qt-assistant-4.5.0.ebuild,v 1.1 2009/03/04 21:07:23 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/qt-assistant-4.5.0.ebuild,v 1.2 2009/03/16 00:48:06 zmedico Exp $
 
 EAPI="2"
 inherit qt4-build
@@ -13,7 +13,7 @@ IUSE=""
 DEPEND="~x11-libs/qt-gui-${PV}[debug=]
 	~x11-libs/qt-sql-${PV}[debug=,sqlite]
 	~x11-libs/qt-webkit-${PV}[debug=]"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND} !<x11-libs/qt-4.4.0:4"
 
 # Pixeltool isn't really assistant related, but it relies on
 # the assistant libraries. And qdoc3 is needed by qt-creator...
diff --git a/x11-libs/qt-assistant/qt-assistant-4.5.0_rc1.ebuild b/x11-libs/qt-assistant/qt-assistant-4.5.0_rc1.ebuild
index 3da0f063ada7..d907896bbecb 100644
--- a/x11-libs/qt-assistant/qt-assistant-4.5.0_rc1.ebuild
+++ b/x11-libs/qt-assistant/qt-assistant-4.5.0_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/qt-assistant-4.5.0_rc1.ebuild,v 1.1 2009/02/11 23:15:09 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-assistant/qt-assistant-4.5.0_rc1.ebuild,v 1.2 2009/03/16 00:48:06 zmedico Exp $
 
 EAPI="2"
 inherit qt4-build
@@ -14,7 +14,7 @@ IUSE=""
 DEPEND="~x11-libs/qt-gui-${PV}[debug=]
 	~x11-libs/qt-sql-${PV}[debug=,sqlite]
 	~x11-libs/qt-webkit-${PV}[debug=]"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND} !<x11-libs/qt-4.4.0:4"
 
 # Pixeltool isn't really assistant related, but it relies on
 # the assistant libraries. And qdoc3 is needed by qt-creator...