Move blocker for qt-phonon from eclass to kdelibs. Yngwin requested :]

(Portage version: 2.2_rc23/cvs/Linux x86_64)

4 files changed, 16 insertions, 9 deletions

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index fe5772eb871c..11d3111213c5 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdelibs
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.554 2009/01/31 13:39:42 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.555 2009/01/31 13:58:08 scarabeus Exp $
+
+  31 Jan 2009; Tomas Chvatal <scarabeus@gentoo.org> kdelibs-4.1.4.ebuild,
+  kdelibs-4.2.0.ebuild, kdelibs-4.2.0-r1.ebuild:
+  Move blocker for qt-phonon from eclass to kdelibs. Yngwin requested :]
 
 *kdelibs-4.2.0-r1 (31 Jan 2009)
 
diff --git a/kde-base/kdelibs/kdelibs-4.1.4.ebuild b/kde-base/kdelibs/kdelibs-4.1.4.ebuild
index aa4a78993864..18b09473634b 100644
--- a/kde-base/kdelibs/kdelibs-4.1.4.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.1.4.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/kde-base/kdelibs/kdelibs-4.1.4.ebuild,v 1.1 2009/01/13 21:41:04 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.1.4.ebuild,v 1.2 2009/01/31 13:58:08 scarabeus Exp $
 
 EAPI="2"
 
@@ -25,6 +25,7 @@ COMMONDEPEND="
 	!=kde-base/kdebase-3.5.8-r2
 	!=kde-base/kdebase-startkde-3.5.8
 	!kdeprefix? ( !<=kde-misc/kdnssd-avahi-0.1.2:0 )
+	!x11-libs/qt-phonon
 	>=app-misc/strigi-0.5.9
 	>=dev-libs/libxml2-2.6.6
 	>=dev-libs/libxslt-1.1.17
diff --git a/kde-base/kdelibs/kdelibs-4.2.0-r1.ebuild b/kde-base/kdelibs/kdelibs-4.2.0-r1.ebuild
index bbcd1e318a54..45dc57feb9ab 100644
--- a/kde-base/kdelibs/kdelibs-4.2.0-r1.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.2.0-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/kde-base/kdelibs/kdelibs-4.2.0-r1.ebuild,v 1.1 2009/01/31 13:39:42 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.2.0-r1.ebuild,v 1.2 2009/01/31 13:58:08 scarabeus Exp $
 
 EAPI="2"
 
@@ -26,12 +26,13 @@ RESTRICT="test"
 COMMONDEPEND="
 	!<=kde-base/kdebase-3.5.9-r4
 	!<=kde-base/kdebase-startkde-3.5.10
+	!x11-libs/qt-phonon
 	!kdeprefix? (
-		!kde-base/kitchensync:4.1[kdeprefix=]
-		!kde-base/knewsticker:4.1[kdeprefix=]
-		!kde-base/kpercentage:4.1[kdeprefix=]
-		!kde-base/ktnef:4.1[kdeprefix=]
-		!kde-base/libplasma[kdeprefix=]
+		!kde-base/kitchensync:4.1[-kdeprefix]
+		!kde-base/knewsticker:4.1[-kdeprefix]
+		!kde-base/kpercentage:4.1[-kdeprefix]
+		!kde-base/ktnef:4.1[-kdeprefix]
+		!kde-base/libplasma[-kdeprefix]
 		!<=kde-misc/kdnssd-avahi-0.1.2:0
 	)
 	>=app-misc/strigi-0.6.3[qt4,dbus]
diff --git a/kde-base/kdelibs/kdelibs-4.2.0.ebuild b/kde-base/kdelibs/kdelibs-4.2.0.ebuild
index 0dc27963aedd..1003ea6c8c42 100644
--- a/kde-base/kdelibs/kdelibs-4.2.0.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.2.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/kde-base/kdelibs/kdelibs-4.2.0.ebuild,v 1.1 2009/01/27 16:55:32 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.2.0.ebuild,v 1.2 2009/01/31 13:58:08 scarabeus Exp $
 
 EAPI="2"
 
@@ -26,6 +26,7 @@ RESTRICT="test"
 COMMONDEPEND="
 	!<=kde-base/kdebase-3.5.9-r4
 	!<=kde-base/kdebase-startkde-3.5.10
+	!x11-libs/qt-phonon
 	!kdeprefix? (
 		!kde-base/kitchensync:4.1[kdeprefix=]
 		!kde-base/knewsticker:4.1[kdeprefix=]