summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen de Groot <yngwin@gentoo.org>2009-06-05 10:41:17 +0000
committerBen de Groot <yngwin@gentoo.org>2009-06-05 10:41:17 +0000
commit08c147b7b15253fd4afe277b353a81e34d20ea2f (patch)
tree519a6ae2895477f743f2eac05706bce295b4f7ae /dev-python
parentSpecify !kde for qt-phonon dep (diff)
downloadgentoo-2-08c147b7b15253fd4afe277b353a81e34d20ea2f.tar.gz
gentoo-2-08c147b7b15253fd4afe277b353a81e34d20ea2f.tar.bz2
gentoo-2-08c147b7b15253fd4afe277b353a81e34d20ea2f.zip
Specify !kde for qt-phonon dep
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Diffstat (limited to 'dev-python')
-rw-r--r--dev-python/PyQt4/ChangeLog5
-rw-r--r--dev-python/PyQt4/PyQt4-4.4.4-r5.ebuild4
2 files changed, 6 insertions, 3 deletions
diff --git a/dev-python/PyQt4/ChangeLog b/dev-python/PyQt4/ChangeLog
index d94adb9b292d..97bad941293e 100644
--- a/dev-python/PyQt4/ChangeLog
+++ b/dev-python/PyQt4/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-python/PyQt4
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.60 2009/06/03 22:53:24 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/ChangeLog,v 1.61 2009/06/05 10:41:17 yngwin Exp $
+
+ 05 Jun 2009; Ben de Groot <yngwin@gentoo.org> PyQt4-4.4.4-r5.ebuild:
+ Specify !kde for qt-phonon dep
03 Jun 2009; Ben de Groot <yngwin@gentoo.org> PyQt4-4.4.4-r5.ebuild,
metadata.xml:
diff --git a/dev-python/PyQt4/PyQt4-4.4.4-r5.ebuild b/dev-python/PyQt4/PyQt4-4.4.4-r5.ebuild
index 2162e241bc2d..4b82faa0e1a6 100644
--- a/dev-python/PyQt4/PyQt4-4.4.4-r5.ebuild
+++ b/dev-python/PyQt4/PyQt4-4.4.4-r5.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-python/PyQt4/PyQt4-4.4.4-r5.ebuild,v 1.3 2009/06/03 22:53:24 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.4.4-r5.ebuild,v 1.4 2009/06/05 10:41:17 yngwin Exp $
EAPI="2"
@@ -30,7 +30,7 @@ DEPEND=">=dev-python/sip-4.7.8
)
opengl? ( >=x11-libs/qt-opengl-${QTVER}:4[qt3support?] )
phonon? (
- || ( >=x11-libs/qt-phonon-${QTVER}:4 media-sound/phonon )
+ !kde? ( || ( >=x11-libs/qt-phonon-${QTVER}:4 media-sound/phonon ) )
kde? ( media-sound/phonon )
)
qt3support? ( >=x11-libs/qt-qt3support-${QTVER}:4 )