diff options
| author |   Ben de Groot <yngwin@gentoo.org> | 2009-06-05 10:37:26 +0000 |
|---|---|---|
| committer | Ben de Groot <yngwin@gentoo.org> | 2009-06-05 10:37:26 +0000 |
| commit | 98145d1461c70567980689be68f099a11f2d87b1 (patch) | |
| tree | 54a991a1a3379ec86ab4b5bb880b82bd34c5c0bb | |
| parent | Fix repoman warnings (diff) | |
| download | historical-98145d1461c70567980689be68f099a11f2d87b1.tar.gz historical-98145d1461c70567980689be68f099a11f2d87b1.tar.bz2 historical-98145d1461c70567980689be68f099a11f2d87b1.zip | |
Specify !kde for qt-phonon dep
Package-Manager: portage-2.2_rc33/cvs/Linux x86_64
| -rw-r--r-- | x11-libs/qt/ChangeLog | 5 | ||||
| -rw-r--r-- | x11-libs/qt/qt-4.5.1.ebuild | 4 | ||||
| -rw-r--r-- | x11-libs/qtscriptgenerator/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-libs/qtscriptgenerator/qtscriptgenerator-0.1.0.ebuild | 6 |
4 files changed, 14 insertions, 7 deletions
diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog index b0fed3377ee5..31e88144ca95 100644 --- a/x11-libs/qt/ChangeLog +++ b/x11-libs/qt/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for x11-libs/qt # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.581 2009/06/03 21:46:47 yngwin Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.582 2009/06/05 10:32:43 yngwin Exp $ + + 05 Jun 2009; Ben de Groot <yngwin@gentoo.org> qt-4.5.1.ebuild: + Specify !kde for qt-phonon dep 03 Jun 2009; Ben de Groot <yngwin@gentoo.org> qt-4.5.1.ebuild, metadata.xml: diff --git a/x11-libs/qt/qt-4.5.1.ebuild b/x11-libs/qt/qt-4.5.1.ebuild index 3ede23cc4558..dd750d6d53a6 100644 --- a/x11-libs/qt/qt-4.5.1.ebuild +++ b/x11-libs/qt/qt-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/qt-4.5.1.ebuild,v 1.9 2009/06/03 21:46:47 yngwin Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.5.1.ebuild,v 1.10 2009/06/05 10:32:43 yngwin Exp $ EAPI=2 DESCRIPTION="The Qt toolkit is a comprehensive C++ application development framework" @@ -20,7 +20,7 @@ RDEPEND="~x11-libs/qt-core-${PV} ~x11-libs/qt-xmlpatterns-${PV} dbus? ( ~x11-libs/qt-dbus-${PV} ) opengl? ( ~x11-libs/qt-opengl-${PV} ) - || ( ~x11-libs/qt-phonon-${PV} media-sound/phonon ) + !kde? ( || ( ~x11-libs/qt-phonon-${PV} media-sound/phonon ) ) kde? ( media-sound/phonon ) qt3support? ( ~x11-libs/qt-qt3support-${PV} ) ~x11-libs/qt-webkit-${PV} diff --git a/x11-libs/qtscriptgenerator/ChangeLog b/x11-libs/qtscriptgenerator/ChangeLog index 19c8de853539..5a90833c1c96 100644 --- a/x11-libs/qtscriptgenerator/ChangeLog +++ b/x11-libs/qtscriptgenerator/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/qtscriptgenerator # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qtscriptgenerator/ChangeLog,v 1.3 2009/05/29 23:29:50 yngwin Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qtscriptgenerator/ChangeLog,v 1.4 2009/06/05 10:37:26 yngwin Exp $ + + 05 Jun 2009; Ben de Groot <yngwin@gentoo.org> + qtscriptgenerator-0.1.0.ebuild: + Specify !kde for qt-phonon dep 29 May 2009; Ben de Groot <yngwin@gentoo.org> qtscriptgenerator-0.1.0.ebuild: diff --git a/x11-libs/qtscriptgenerator/qtscriptgenerator-0.1.0.ebuild b/x11-libs/qtscriptgenerator/qtscriptgenerator-0.1.0.ebuild index c5b83c024129..f207a64206c7 100644 --- a/x11-libs/qtscriptgenerator/qtscriptgenerator-0.1.0.ebuild +++ b/x11-libs/qtscriptgenerator/qtscriptgenerator-0.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/x11-libs/qtscriptgenerator/qtscriptgenerator-0.1.0.ebuild,v 1.3 2009/05/29 23:29:50 yngwin Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qtscriptgenerator/qtscriptgenerator-0.1.0.ebuild,v 1.4 2009/06/05 10:37:26 yngwin Exp $ EAPI="2" @@ -22,10 +22,10 @@ DEPEND=" x11-libs/qt-dbus:4 x11-libs/qt-gui:4 x11-libs/qt-opengl:4 - || ( + !kde? ( || ( x11-libs/qt-phonon:4 media-sound/phonon - ) + ) ) kde? ( media-sound/phonon ) x11-libs/qt-script:4 x11-libs/qt-sql:4 |