From d28c61737ff1e0c06a58000000b73cef790c64a5 Mon Sep 17 00:00:00 2001
From: Ben de Groot <yngwin@gentoo.org>
Date: Wed, 3 Jun 2009 22:46:32 +0000
Subject: Add kde useflag, for selecting media-sound/phonon, bug 270188
 (Portage version: 2.2_rc33/cvs/Linux x86_64)

---
 dev-util/qt-creator/ChangeLog               |  6 ++++-
 dev-util/qt-creator/metadata.xml            | 37 ++++++++++++++++-------------
 dev-util/qt-creator/qt-creator-1.1.0.ebuild |  7 +++---
 3 files changed, 30 insertions(+), 20 deletions(-)

(limited to 'dev-util/qt-creator')

diff --git a/dev-util/qt-creator/ChangeLog b/dev-util/qt-creator/ChangeLog
index 869566438080..b50f7cd4f298 100644
--- a/dev-util/qt-creator/ChangeLog
+++ b/dev-util/qt-creator/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/qt-creator
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/ChangeLog,v 1.13 2009/04/23 16:03:46 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/ChangeLog,v 1.14 2009/06/03 22:46:32 yngwin Exp $
+
+  03 Jun 2009; Ben de Groot <yngwin@gentoo.org> qt-creator-1.1.0.ebuild,
+  metadata.xml:
+  Add kde useflag, for selecting media-sound/phonon, bug 270188
 
   23 Apr 2009; Markos Chandras <hwoarang@gentoo.org> qt-creator-1.1.0:
   Fix proper library installation, Unmasking
diff --git a/dev-util/qt-creator/metadata.xml b/dev-util/qt-creator/metadata.xml
index d91f35f226b3..203631487d26 100644
--- a/dev-util/qt-creator/metadata.xml
+++ b/dev-util/qt-creator/metadata.xml
@@ -1,21 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>qt</herd>
-<maintainer>
-<email>hwoarang@gentoo.org</email>
-<name>Markos Chandras</name>
-</maintainer>
-<use>
-	<flag name="cmake">enable cmake project manager plugin</flag>
-	<flag name="debugger">enable debugger plugin</flag>
-	<flag name="designer">enable designer plugin</flag>
-	<flag name="fakevim">enable vim-like key bindings plugin</flag>
-	<flag name="git">enable git plugin</flag>
-	<flag name="perforce">enable perforce software configuration manager plugin</flag>
-	<flag name="subversion">enable subersion plugin</flag>
-</use>
-<longdescription lang="en">
-</longdescription>
+  <herd>qt</herd>
+  <maintainer>
+    <email>hwoarang@gentoo.org</email>
+    <name>Markos Chandras</name>
+  </maintainer>
+  <use>
+    <flag name="cmake">enable cmake project manager plugin</flag>
+    <flag name="debugger">enable debugger plugin</flag>
+    <flag name="designer">enable designer plugin</flag>
+    <flag name="fakevim">enable vim-like key bindings plugin</flag>
+    <flag name="git">enable git plugin</flag>
+    <flag name='kde'>
+      Select <pkg>media-sound/phonon</pkg> as phonon variant needed for kde
+    </flag>
+    <flag name="perforce">
+      enable perforce software configuration manager plugin
+    </flag>
+    <flag name="subversion">enable subersion plugin</flag>
+  </use>
+  <longdescription lang="en">
+  </longdescription>
 </pkgmetadata>
 
diff --git a/dev-util/qt-creator/qt-creator-1.1.0.ebuild b/dev-util/qt-creator/qt-creator-1.1.0.ebuild
index e9a1b51315bf..62510198662b 100644
--- a/dev-util/qt-creator/qt-creator-1.1.0.ebuild
+++ b/dev-util/qt-creator/qt-creator-1.1.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/dev-util/qt-creator/qt-creator-1.1.0.ebuild,v 1.3 2009/04/23 16:03:46 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/qt-creator-1.1.0.ebuild,v 1.4 2009/06/03 22:46:32 yngwin Exp $
 
 EAPI="2"
 
@@ -16,7 +16,7 @@ SRC_URI="http://download.qtsoftware.com/${MY_PN}/${MY_P}.zip"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="+cmake debug +debugger +designer doc fakevim git perforce subversion"
+IUSE="+cmake debug +debugger +designer doc fakevim git kde perforce subversion"
 
 DEPEND=">=x11-libs/qt-assistant-4.5.0_rc1
 	>=x11-libs/qt-core-4.5.0_rc1
@@ -34,7 +34,8 @@ DEPEND=">=x11-libs/qt-assistant-4.5.0_rc1
 	subversion? ( dev-util/subversion )"
 
 RDEPEND="${DEPEND}
-	|| ( media-sound/phonon >=x11-libs/qt-phonon-4.5.0_rc1 )"
+	|| ( >=x11-libs/qt-phonon-4.5.0_rc1 media-sound/phonon )
+	kde? ( media-sound/phonon )"
 
 PLUGINS="cmake debugger designer fakevim git perforce subversion"
 
-- 
cgit v1.2.3-65-gdbad