diff options
| author |   Markos Chandras <hwoarang@gentoo.org> | 2009-06-04 14:11:07 +0000 |
|---|---|---|
| committer | Markos Chandras <hwoarang@gentoo.org> | 2009-06-04 14:11:07 +0000 |
| commit | acf1258ca42ede86220d021aacb079e68a128d35 (patch) | |
| tree | 8c82c5dc0bd2863a0c33a74b7ee01ccde2320333 /x11-libs | |
| parent | Version bump KDE 4.2.4 (diff) | |
| download | gentoo-2-acf1258ca42ede86220d021aacb079e68a128d35.tar.gz gentoo-2-acf1258ca42ede86220d021aacb079e68a128d35.tar.bz2 gentoo-2-acf1258ca42ede86220d021aacb079e68a128d35.zip | |
Adjust correct phonon dependencies ( bug 270188 )
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Diffstat (limited to 'x11-libs')
| -rw-r--r-- | x11-libs/qt-qt3support/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-libs/qt-qt3support/qt-qt3support-4.5.1.ebuild | 7 |
2 files changed, 9 insertions, 4 deletions
diff --git a/x11-libs/qt-qt3support/ChangeLog b/x11-libs/qt-qt3support/ChangeLog index b5f404831367..d8932e81f44c 100644 --- a/x11-libs/qt-qt3support/ChangeLog +++ b/x11-libs/qt-qt3support/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/qt-qt3support # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-qt3support/ChangeLog,v 1.35 2009/06/03 21:57:48 yngwin Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-qt3support/ChangeLog,v 1.36 2009/06/04 14:11:07 hwoarang Exp $ + + 04 Jun 2009; Markos Chandras <hwoarang@gentoo.org> + qt-qt3support-4.5.1.ebuild: + Adjust correct phonon dependencies ( bug 270188 ) 03 Jun 2009; Ben de Groot <yngwin@gentoo.org> qt-qt3support-4.5.1.ebuild, metadata.xml: diff --git a/x11-libs/qt-qt3support/qt-qt3support-4.5.1.ebuild b/x11-libs/qt-qt3support/qt-qt3support-4.5.1.ebuild index 8caabf0d659a..d973226eddd3 100644 --- a/x11-libs/qt-qt3support/qt-qt3support-4.5.1.ebuild +++ b/x11-libs/qt-qt3support/qt-qt3support-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-qt3support/qt-qt3support-4.5.1.ebuild,v 1.9 2009/06/03 21:57:48 yngwin Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-qt3support/qt-qt3support-4.5.1.ebuild,v 1.10 2009/06/04 14:11:07 hwoarang Exp $ EAPI="2" inherit qt4-build @@ -13,8 +13,9 @@ IUSE="+accessibility kde phonon" DEPEND="~x11-libs/qt-core-${PV}[debug=,qt3support] ~x11-libs/qt-gui-${PV}[accessibility=,debug=,qt3support] ~x11-libs/qt-sql-${PV}[debug=,qt3support] - phonon? ( || ( ~x11-libs/qt-phonon-${PV}[debug=] - media-sound/phonon[gstreamer] ) + phonon? ( + !kde? ( || ( ~x11-libs/qt-phonon-${PV}[debug=] + media-sound/phonon[gstreamer] ) ) kde? ( media-sound/phonon ) )" RDEPEND="${DEPEND}" |