Revert kde useflag addition, as it breaks stable

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

6 files changed, 22 insertions, 14 deletions

diff --git a/x11-libs/qt-qt3support/ChangeLog b/x11-libs/qt-qt3support/ChangeLog
index c4f9f360e057..6a2178578e49 100644
--- a/x11-libs/qt-qt3support/ChangeLog
+++ b/x11-libs/qt-qt3support/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-libs/qt-qt3support
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-qt3support/ChangeLog,v 1.32 2009/05/29 23:10:54 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-qt3support/ChangeLog,v 1.33 2009/05/30 19:29:08 yngwin Exp $
+
+  30 May 2009; Ben de Groot <yngwin@gentoo.org> qt-qt3support-4.5.1.ebuild:
+  Revert kde useflag addition, as it breaks stable
 
   29 May 2009; Ben de Groot <yngwin@gentoo.org> qt-qt3support-4.5.1.ebuild:
   Add kde useflag to make dependency calculation easier, bug 270188
diff --git a/x11-libs/qt-qt3support/qt-qt3support-4.5.1.ebuild b/x11-libs/qt-qt3support/qt-qt3support-4.5.1.ebuild
index 11aca274dcaf..b3821d2f65fd 100644
--- a/x11-libs/qt-qt3support/qt-qt3support-4.5.1.ebuild
+++ b/x11-libs/qt-qt3support/qt-qt3support-4.5.1.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-qt3support/qt-qt3support-4.5.1.ebuild,v 1.6 2009/05/29 23:10:54 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-qt3support/qt-qt3support-4.5.1.ebuild,v 1.7 2009/05/30 19:29:08 yngwin Exp $
 
 EAPI="2"
 inherit qt4-build
@@ -8,14 +8,14 @@ inherit qt4-build
 DESCRIPTION="The Qt3 support module for the Qt toolkit"
 SLOT="4"
 KEYWORDS="alpha ~amd64 arm ~hppa ~ia64 ~mips ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="+accessibility kde phonon"
+IUSE="+accessibility phonon"
 
 DEPEND="~x11-libs/qt-core-${PV}[debug=,qt3support]
 	~x11-libs/qt-gui-${PV}[accessibility=,debug=,qt3support]
 	~x11-libs/qt-sql-${PV}[debug=,qt3support]
 	phonon? ( || ( ~x11-libs/qt-phonon-${PV}[debug=]
-		media-sound/phonon[gstreamer] )
-		kde? ( media-sound/phonon ) )"
+		media-sound/phonon[gstreamer] ) )"
+#		kde? ( media-sound/phonon ) )"
 RDEPEND="${DEPEND}"
 
 QT4_TARGET_DIRECTORIES="
diff --git a/x11-libs/qt-webkit/ChangeLog b/x11-libs/qt-webkit/ChangeLog
index 783931ddf87c..ee72f84ac52a 100644
--- a/x11-libs/qt-webkit/ChangeLog
+++ b/x11-libs/qt-webkit/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-libs/qt-webkit
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/ChangeLog,v 1.38 2009/05/29 23:18:42 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/ChangeLog,v 1.39 2009/05/30 19:32:06 yngwin Exp $
+
+  30 May 2009; Ben de Groot <yngwin@gentoo.org> qt-webkit-4.5.1.ebuild:
+  Revert kde useflag addition, as it breaks stable
 
   29 May 2009; Ben de Groot <yngwin@gentoo.org> qt-webkit-4.5.1.ebuild:
   Add kde useflag to make dependency calculation easier, bug 270188
diff --git a/x11-libs/qt-webkit/qt-webkit-4.5.1.ebuild b/x11-libs/qt-webkit/qt-webkit-4.5.1.ebuild
index 49f1521db394..777c689eee3f 100644
--- a/x11-libs/qt-webkit/qt-webkit-4.5.1.ebuild
+++ b/x11-libs/qt-webkit/qt-webkit-4.5.1.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-webkit/qt-webkit-4.5.1.ebuild,v 1.6 2009/05/29 23:18:42 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.5.1.ebuild,v 1.7 2009/05/30 19:32:06 yngwin Exp $
 
 EAPI="2"
 inherit qt4-build flag-o-matic
@@ -8,12 +8,12 @@ inherit qt4-build flag-o-matic
 DESCRIPTION="The Webkit module for the Qt toolkit"
 SLOT="4"
 KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~mips ppc ~ppc64 -sparc ~x86 ~x86-fbsd"
-IUSE="kde"
+IUSE=""
 
 DEPEND="~x11-libs/qt-core-${PV}[debug=,ssl]
 	~x11-libs/qt-gui-${PV}[debug=]
-	|| ( ~x11-libs/qt-phonon-${PV}:${SLOT}[debug=] media-sound/phonon )
-	kde? ( media-sound/phonon )"
+	|| ( ~x11-libs/qt-phonon-${PV}:${SLOT}[debug=] media-sound/phonon )"
+#	kde? ( media-sound/phonon )"
 RDEPEND="${DEPEND}"
 
 QT4_TARGET_DIRECTORIES="src/3rdparty/webkit/WebCore tools/designer/src/plugins/qwebview"
diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index a3fcca37f294..7c0893e1ba8a 100644
--- a/x11-libs/qt/ChangeLog
+++ b/x11-libs/qt/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-libs/qt
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.578 2009/05/29 23:25:42 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.579 2009/05/30 19:26:45 yngwin Exp $
+
+  30 May 2009; Ben de Groot <yngwin@gentoo.org> qt-4.5.1.ebuild:
+  Revert kde useflag addition, as it breaks stable
 
   29 May 2009; Ben de Groot <yngwin@gentoo.org> qt-4.5.1.ebuild:
   Add kde useflag to make dependency calculation easier, bug 270188
diff --git a/x11-libs/qt/qt-4.5.1.ebuild b/x11-libs/qt/qt-4.5.1.ebuild
index 9d6107725f3d..db7690d875a5 100644
--- a/x11-libs/qt/qt-4.5.1.ebuild
+++ b/x11-libs/qt/qt-4.5.1.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/qt-4.5.1.ebuild,v 1.6 2009/05/29 23:25:42 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.5.1.ebuild,v 1.7 2009/05/30 19:26:45 yngwin Exp $
 
 EAPI=2
 DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework"
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.qtsoftware.com/"
 LICENSE="|| ( LGPL-2.1 GPL-3 )"
 SLOT="4"
 KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~mips ppc ~ppc64 -sparc ~x86"
-IUSE="+dbus kde opengl +qt3support"
+IUSE="+dbus opengl +qt3support"
 
 DEPEND=""
 RDEPEND="~x11-libs/qt-core-${PV}
@@ -21,7 +21,6 @@ RDEPEND="~x11-libs/qt-core-${PV}
 	dbus? ( ~x11-libs/qt-dbus-${PV} )
 	opengl? ( ~x11-libs/qt-opengl-${PV} )
 	|| ( ~x11-libs/qt-phonon-${PV} media-sound/phonon )
-	kde? ( media-sound/phonon )
 	qt3support? ( ~x11-libs/qt-qt3support-${PV} )
 	~x11-libs/qt-webkit-${PV}
 	~x11-libs/qt-test-${PV}