summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkos Chandras <hwoarang@gentoo.org>2009-06-23 10:07:16 +0000
committerMarkos Chandras <hwoarang@gentoo.org>2009-06-23 10:07:16 +0000
commit0bac95cf0f217e55f6b42cd39d98dddebf701dc0 (patch)
tree3a416eb54793044694cc6cbfd8c7055205cdfa30 /dev-util
parentadd latest media-libs/tiff revbump to p.mask (diff)
downloadgentoo-2-0bac95cf0f217e55f6b42cd39d98dddebf701dc0.tar.gz
gentoo-2-0bac95cf0f217e55f6b42cd39d98dddebf701dc0.tar.bz2
gentoo-2-0bac95cf0f217e55f6b42cd39d98dddebf701dc0.zip
Fix phonon dependencies. Bug 270188
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Diffstat (limited to 'dev-util')
-rw-r--r--dev-util/qt-creator/ChangeLog6
-rw-r--r--dev-util/qt-creator/qt-creator-1.1.0.ebuild4
2 files changed, 7 insertions, 3 deletions
diff --git a/dev-util/qt-creator/ChangeLog b/dev-util/qt-creator/ChangeLog
index ef61966d14bf..7eeb2696752d 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.15 2009/06/07 17:53:30 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/ChangeLog,v 1.16 2009/06/23 10:07:16 hwoarang Exp $
+
+ 23 Jun 2009; Markos Chandras <hwoarang@gentoo.org>
+ qt-creator-1.1.0.ebuild:
+ Fix phonon dependencies. Bug 270188
07 Jun 2009; Markos Chandras <hwoarang@gentoo.org>
-qt-creator-1.0.0.ebuild, -qt-creator-1.0.0-r1.ebuild:
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 62510198662b..419a5aec799c 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.4 2009/06/03 22:46:32 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/qt-creator/qt-creator-1.1.0.ebuild,v 1.5 2009/06/23 10:07:16 hwoarang Exp $
EAPI="2"
@@ -34,7 +34,7 @@ DEPEND=">=x11-libs/qt-assistant-4.5.0_rc1
subversion? ( dev-util/subversion )"
RDEPEND="${DEPEND}
- || ( >=x11-libs/qt-phonon-4.5.0_rc1 media-sound/phonon )
+ !kde? ( || ( >=x11-libs/qt-phonon-4.5.0_rc1 media-sound/phonon ) )
kde? ( media-sound/phonon )"
PLUGINS="cmake debugger designer fakevim git perforce subversion"