summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dev-python/pyside/ChangeLog5
-rw-r--r--dev-python/pyside/pyside-0.3.2.ebuild8
2 files changed, 9 insertions, 4 deletions
diff --git a/dev-python/pyside/ChangeLog b/dev-python/pyside/ChangeLog
index 038a39dddc48..3ca6f256ae46 100644
--- a/dev-python/pyside/ChangeLog
+++ b/dev-python/pyside/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-python/pyside
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyside/ChangeLog,v 1.7 2010/06/16 18:55:17 ayoy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyside/ChangeLog,v 1.8 2010/06/23 11:49:54 hwoarang Exp $
+
+ 23 Jun 2010; Markos Chandras <hwoarang@gentoo.org> pyside-0.3.2.ebuild:
+ Introduce kde use flag to handle the phonon dependencies wrt bug #324429
*pyside-0.3.2 (16 Jun 2010)
diff --git a/dev-python/pyside/pyside-0.3.2.ebuild b/dev-python/pyside/pyside-0.3.2.ebuild
index 58ff0f154eb0..0981edd203ba 100644
--- a/dev-python/pyside/pyside-0.3.2.ebuild
+++ b/dev-python/pyside/pyside-0.3.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyside/pyside-0.3.2.ebuild,v 1.1 2010/06/16 18:55:17 ayoy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyside/pyside-0.3.2.ebuild,v 1.2 2010/06/23 11:49:54 hwoarang Exp $
EAPI="2"
@@ -15,7 +15,7 @@ SRC_URI="http://www.pyside.org/files/${MY_P}.tar.bz2"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="debug"
+IUSE="debug kde"
QT_PV="4.6.0"
@@ -26,7 +26,9 @@ DEPEND=">=dev-libs/boost-1.41.0[python]
>=x11-libs/qt-gui-${QT_PV}
>=x11-libs/qt-multimedia-${QT_PV}
>=x11-libs/qt-opengl-${QT_PV}
- >=x11-libs/qt-phonon-${QT_PV}
+ kde? ( media-sound/phonon )
+ !kde? ( || ( >=x11-libs/qt-phonon-${QT_PV}
+ media-sound/phonon ) )
>=x11-libs/qt-script-${QT_PV}
>=x11-libs/qt-sql-${QT_PV}
>=x11-libs/qt-svg-${QT_PV}