Add kde useflag again, for selecting media-sound/phonon, now that that package is stable on the needed arches. Fixes bug 270188.

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

4 files changed, 14 insertions, 16 deletions

diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index 0381f4292cdd..b0fed3377ee5 100644
--- a/x11-libs/qt/ChangeLog
+++ b/x11-libs/qt/ChangeLog
@@ -1,6 +1,11 @@
 # 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.580 2009/06/02 18:06:58 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.581 2009/06/03 21:46:47 yngwin Exp $
+
+  03 Jun 2009; Ben de Groot <yngwin@gentoo.org> qt-4.5.1.ebuild,
+  metadata.xml:
+  Add kde useflag again, for selecting media-sound/phonon, now that that
+  package is stable on the needed arches
 
   02 Jun 2009; Christian Faulhammer <fauli@gentoo.org> qt-4.5.1.ebuild:
   stable x86, bug 266201
diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest
index 0ae99c291d94..41c26082ec76 100644
--- a/x11-libs/qt/Manifest
+++ b/x11-libs/qt/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 0001-dnd_optimization.patch 5623 RMD160 b62b5868086b4d352be66989cc23cd3bb963e283 SHA1 4f3416c3a7e44d52c1088c52256decb384e4b1bc SHA256 8e138a2fdd053ec81522df19ce30f7e4c05838dfd8e0c8069ffb793ba45d7439
 AUX 0002-dnd_active_window_fix.patch 7289 RMD160 b355f5fd028d35d88ca15bf9ce8da41bd365f12d SHA1 5b16995f072cbde80f000967aa11d8a88ed34e23 SHA256 e36383b43a53b815f3958608275c60299a0638b6b3201c3a3d9318ee2ead26d1
 AUX 0037-dnd-timestamp-fix.patch 2138 RMD160 c11fffd7801fb357beb2d489e6e7cc4edefc3030 SHA1 cda25e150541c3a2ba56ec6974e2771b8aaad0de SHA256 490eb5c21dc30e0beac0aac8a4b6159d56a5e3e7fe40daad39f0c0823648917d
@@ -37,13 +34,6 @@ DIST qt-x11-free-3.3.8b.tar.gz 17313883 RMD160 4e3cbd9c5d4719b5d33e961e6595d7b21
 DIST qt-x11-immodule-unified-qt3.3.8-20070321-gentoo.diff.bz2 137387 RMD160 7f4f79c95faa2b8e71a78308af8feae5f6a6b06a SHA1 230cc532f1a3023967c5aee4cce87d1b9351b73d SHA256 06994304d2b7c699c4b6ea4183877652e261170f74282e89a3700ce6d4a98918
 EBUILD qt-3.3.8b-r1.ebuild 10827 RMD160 ae7bb6928438b1412c1398ffdd7a9f634e8be613 SHA1 e2f74ce93b42735f2eddf64db38299d7a8e6a811 SHA256 c5e342439f6d7da84fbaf9ea06cbedd5a07fb6fec3a42e8fae6fd0f995ab3da6
 EBUILD qt-4.4.2.ebuild 868 RMD160 6cc9b0ab5112df2148f0e001cc9a6161d78e71f3 SHA1 88c8cabbdb62a3650a0e2cb7494aba9245523090 SHA256 90fb353b51bcd036e0dc2df6b68538ca1656abf10c045ca2ac1c707f23f0d288
-EBUILD qt-4.5.1.ebuild 1321 RMD160 5ff11a118f41d155e2d8e41eb959978cb7cbc582 SHA1 5c523a4aa889e538167c2fb4aff05f8ca967d6f6 SHA256 eeed818d0c35cedee0ebbe00aadbaf04ee5deeb004ac9b6f5197a70ac35079ba
-MISC ChangeLog 46466 RMD160 e11906623a8ec661094971a45f7feb165246433f SHA1 6c6c9306207ea2d964429bc739230e20ff28a941 SHA256 1853344c5e2f94b92201991b7a7c23147169c6348bc6842ba1117d1377e44c80
-MISC metadata.xml 407 RMD160 bfda8fdbc5ea472d99e31e9c5c83e67a5e0b9ae1 SHA1 9bf8db20b71bd9e189872922eae678fff40eeb8d SHA256 8598cd7af79529ba00ebb8a0d2b32b6e8a03cb5b90ae700f16dd3bcce71dac79
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkolak4ACgkQNQqtfCuFneMIwwCeJeqwdJyWm5fwOQrP9ktoUjwx
-GKgAn19uPjhIMzq4TnCV9gyDrtjzw2VN
-=FAvg
------END PGP SIGNATURE-----
+EBUILD qt-4.5.1.ebuild 1355 RMD160 5749252500e5a6f0e511a4ac69a8b15fe98647c8 SHA1 51bc4d0ad9e12175e8e16e2dc6612d1340f64fe3 SHA256 b9ab359cf56f0e96673b16cf46f80e0475a7776cedd8f3fa653d0672d9423736
+MISC ChangeLog 46663 RMD160 1ff38ee4cd829eea078b7f4d239a00c6b7495541 SHA1 b7594d51c2e9be3dc9a927df916bfe404b2151f9 SHA256 4cb081af511b1b41d15f3405a64a363a9a0de35071870a2667b19d2297331c16
+MISC metadata.xml 504 RMD160 1c964085340a6c32da556e0dddba675aa599ca0c SHA1 eb798d83a888e31c15db0affca952dbdaf99ba28 SHA256 b3441d2b0fedef04315e978acea237525c7ef6899b5721174f55e82dc50bbb1d
diff --git a/x11-libs/qt/metadata.xml b/x11-libs/qt/metadata.xml
index a331f4c6ba63..4f92b85bd49e 100644
--- a/x11-libs/qt/metadata.xml
+++ b/x11-libs/qt/metadata.xml
@@ -7,6 +7,8 @@
 		Qt</flag>
 	<flag name='immqt'>Enable binary incompatible version of immodule for
 		Qt</flag>
+	<flag name='kde'>Select <pkg>media-sound/phonon</pkg> as phonon variant
+		needed for kde</flag>
 	<flag name='qt3support'>Enable the Qt3Support libraries for Qt4</flag>
 </use>
 </pkgmetadata>
diff --git a/x11-libs/qt/qt-4.5.1.ebuild b/x11-libs/qt/qt-4.5.1.ebuild
index 0d23bd1add0f..3ede23cc4558 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.8 2009/06/02 18:06:58 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.5.1.ebuild,v 1.9 2009/06/03 21:46:47 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 opengl +qt3support"
+IUSE="+dbus kde opengl +qt3support"
 
 DEPEND=""
 RDEPEND="~x11-libs/qt-core-${PV}
@@ -21,6 +21,7 @@ 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}