Make x11-libs/qt-phonon block media-sound/phonon (kde-testing overlay)

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26.5 i686

5 files changed, 15 insertions, 8 deletions

diff --git a/x11-libs/qt-phonon/ChangeLog b/x11-libs/qt-phonon/ChangeLog
index 9c5fccdb1416..58e70b430eff 100644
--- a/x11-libs/qt-phonon/ChangeLog
+++ b/x11-libs/qt-phonon/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/qt-phonon
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-phonon/ChangeLog,v 1.12 2008/09/19 00:13:45 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-phonon/ChangeLog,v 1.13 2008/09/19 16:47:45 yngwin Exp $
+
+  19 Sep 2008; Ben de Groot <yngwin@gentoo.org> qt-phonon-4.4.1.ebuild,
+  qt-phonon-4.4.1-r1.ebuild, qt-phonon-4.4.2.ebuild:
+  Add block of media-sound/phonon
 
 *qt-phonon-4.4.2 (19 Sep 2008)
 
diff --git a/x11-libs/qt-phonon/Manifest b/x11-libs/qt-phonon/Manifest
index 6e1911446249..ca243a388cb6 100644
--- a/x11-libs/qt-phonon/Manifest
+++ b/x11-libs/qt-phonon/Manifest
@@ -6,8 +6,8 @@ DIST qt-x11-opensource-src-4.4.1.tar.bz2 99481677 RMD160 82526c00dd979ceda40d408
 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
 EBUILD qt-phonon-4.4.0.ebuild 969 RMD160 495bd8ea937525f6a8fd8361a20d65dcc91e1466 SHA1 6af390b41efe073fd168eb73f91c51280c451771 SHA256 2405c81e17644bb0e862e1ae27184a244ec1b766a7f711f8ea14ed10a9b4a959
-EBUILD qt-phonon-4.4.1-r1.ebuild 1066 RMD160 6c8b31354f5bfb9f7422115b551061720abcbaf4 SHA1 15e6bdc30950efe6280a210b2da3b92b18c3f4cc SHA256 87fdcb6504f3b426ca4461a0b56f552a87284f91064f15600bd542e5ff35ca59
-EBUILD qt-phonon-4.4.1.ebuild 961 RMD160 a8de5b13efcbd77ecb23b0de402c54c14bcde4aa SHA1 37e5bf2fdbe8081ffd908dc91cc8a208810aab54 SHA256 bb04df4a49100bcb8de325d928de6953e245789717ccbef74b164b9b51e9b73c
-EBUILD qt-phonon-4.4.2.ebuild 1063 RMD160 cc84d7410c8321062b18d59909316256b5d69398 SHA1 c30609e1d439acc850c7f8e226365116b8cbb8c1 SHA256 fdbac2fafbbef6ab34e17f9f476de7862516c1d2de86962b4fbf520f473910ec
-MISC ChangeLog 1926 RMD160 c1869fa3b4a6780491ee92637179b50c61914a51 SHA1 690bd8e7a10976a37b159eb9b2eeeb7c05387d5c SHA256 7fccddbacec17de2f161c062593986b0be373689bcef69261ce5a6e54f0ea776
+EBUILD qt-phonon-4.4.1-r1.ebuild 1087 RMD160 76f3dfa145cef1a5f27d8f5a93efbdca2710e8c8 SHA1 2b89abc867fe98c0a3d58af7ccfb646d4b4b9fa9 SHA256 055c452dbf5b1e81b7341f24f47343614c8102e967fbb441073dc44937efb9de
+EBUILD qt-phonon-4.4.1.ebuild 982 RMD160 3d982418ec563fdafd7a5a6914f0bccda62d6ae4 SHA1 1018d7b8fee30cd405d04df7dd25b79dcc3a8b95 SHA256 4161555f653364313026f733779bee60e883a2db7193b7530f89a691943b9e6a
+EBUILD qt-phonon-4.4.2.ebuild 1084 RMD160 a22cff174b4a6171a2563b3d7329f2d11cb36e33 SHA1 91b875b2f11763f6b212e7517a259751d83f94bb SHA256 43eaa2475c173c6aedd26a03e6c00d806e919551a02ac51a467d717132ae3973
+MISC ChangeLog 2086 RMD160 bc8de3f436973b52f5513d531babbf96b7ed4e1c SHA1 0dea2580687a264b827610a0ec9a42be11916cd2 SHA256 c0642be08ffd9024d18030714ad88281a6118942e6498654d172478ab5a3f994
 MISC metadata.xml 156 RMD160 d76590850d56864c8d99e6877ed15841b55ef1fc SHA1 e872bab086832a9db3f0fa9b1897c70577d3af21 SHA256 94c4f580c1a55f8a5e1a1dcdd6dedfea0b8bd78c1d7137c354938d73c49e4448
diff --git a/x11-libs/qt-phonon/qt-phonon-4.4.1-r1.ebuild b/x11-libs/qt-phonon/qt-phonon-4.4.1-r1.ebuild
index 35f7c8d7662e..950bb6fec39d 100644
--- a/x11-libs/qt-phonon/qt-phonon-4.4.1-r1.ebuild
+++ b/x11-libs/qt-phonon/qt-phonon-4.4.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-phonon/qt-phonon-4.4.1-r1.ebuild,v 1.1 2008/08/13 23:14:38 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-phonon/qt-phonon-4.4.1-r1.ebuild,v 1.2 2008/09/19 16:47:45 yngwin Exp $
 
 EAPI="1"
 inherit qt4-build
@@ -15,6 +15,7 @@ IUSE="dbus"
 
 DEPEND="~x11-libs/qt-gui-${PV}
 	!<=x11-libs/qt-4.4.0_alpha:${SLOT}
+	!media-sound/phonon
 	media-libs/gstreamer
 	media-libs/gst-plugins-base
 	dbus? ( =x11-libs/qt-dbus-${PV} )"
diff --git a/x11-libs/qt-phonon/qt-phonon-4.4.1.ebuild b/x11-libs/qt-phonon/qt-phonon-4.4.1.ebuild
index b10ce6df53fe..5845db677981 100644
--- a/x11-libs/qt-phonon/qt-phonon-4.4.1.ebuild
+++ b/x11-libs/qt-phonon/qt-phonon-4.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-phonon/qt-phonon-4.4.1.ebuild,v 1.1 2008/08/11 13:05:52 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-phonon/qt-phonon-4.4.1.ebuild,v 1.2 2008/09/19 16:47:45 yngwin Exp $
 
 EAPI="1"
 inherit qt4-build
@@ -15,6 +15,7 @@ IUSE="dbus"
 
 DEPEND="~x11-libs/qt-gui-${PV}
 	!<=x11-libs/qt-4.4.0_alpha:${SLOT}
+	!media-sound/phonon
 	media-libs/gstreamer
 	media-libs/gst-plugins-base
 	dbus? ( =x11-libs/qt-dbus-${PV} )"
diff --git a/x11-libs/qt-phonon/qt-phonon-4.4.2.ebuild b/x11-libs/qt-phonon/qt-phonon-4.4.2.ebuild
index 5917f20e1b00..68e4ca31f2bc 100644
--- a/x11-libs/qt-phonon/qt-phonon-4.4.2.ebuild
+++ b/x11-libs/qt-phonon/qt-phonon-4.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-phonon/qt-phonon-4.4.2.ebuild,v 1.1 2008/09/19 00:13:45 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-phonon/qt-phonon-4.4.2.ebuild,v 1.2 2008/09/19 16:47:45 yngwin Exp $
 
 EAPI="1"
 inherit qt4-build
@@ -15,6 +15,7 @@ IUSE="dbus"
 
 DEPEND="~x11-libs/qt-gui-${PV}
 	!<=x11-libs/qt-4.4.0_alpha:${SLOT}
+	!media-sound/phonon
 	media-libs/gstreamer
 	media-libs/gst-plugins-base
 	dbus? ( =x11-libs/qt-dbus-${PV} )"