diff options
| author |   Ben de Groot <yngwin@gentoo.org> | 2009-06-03 22:02:57 +0000 |
|---|---|---|
| committer | Ben de Groot <yngwin@gentoo.org> | 2009-06-03 22:02:57 +0000 |
| commit | 6c2aa9add5fa30577f351b3de6a3f53a9955ab6f (patch) | |
| tree | 57be290e7aac347a1b982ffe5f674546c4c7601d /x11-libs/qt-webkit | |
| parent | Stable on amd64 (bug #267768) (diff) | |
| download | gentoo-2-6c2aa9add5fa30577f351b3de6a3f53a9955ab6f.tar.gz gentoo-2-6c2aa9add5fa30577f351b3de6a3f53a9955ab6f.tar.bz2 gentoo-2-6c2aa9add5fa30577f351b3de6a3f53a9955ab6f.zip | |
Add kde useflag again, for selecting media-sound/phonon, now that that package is stable on the needed arches. Fixes bug 270188.
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Diffstat (limited to 'x11-libs/qt-webkit')
| -rw-r--r-- | x11-libs/qt-webkit/ChangeLog | 7 | ||||
| -rw-r--r-- | x11-libs/qt-webkit/metadata.xml | 7 | ||||
| -rw-r--r-- | x11-libs/qt-webkit/qt-webkit-4.5.1.ebuild | 8 |
3 files changed, 16 insertions, 6 deletions
diff --git a/x11-libs/qt-webkit/ChangeLog b/x11-libs/qt-webkit/ChangeLog index 1023d89ee433..99bc7998a543 100644 --- a/x11-libs/qt-webkit/ChangeLog +++ b/x11-libs/qt-webkit/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-libs/qt-webkit # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/ChangeLog,v 1.40 2009/06/02 18:05:06 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/ChangeLog,v 1.41 2009/06/03 22:02:57 yngwin Exp $ + + 03 Jun 2009; Ben de Groot <yngwin@gentoo.org> qt-webkit-4.5.1.ebuild, + metadata.xml: + Add kde useflag again, for selecting media-sound/phonon, now that that + package is stable on the needed arches 02 Jun 2009; Christian Faulhammer <fauli@gentoo.org> qt-webkit-4.5.1.ebuild: diff --git a/x11-libs/qt-webkit/metadata.xml b/x11-libs/qt-webkit/metadata.xml index 01a5c2875e0d..048f15543632 100644 --- a/x11-libs/qt-webkit/metadata.xml +++ b/x11-libs/qt-webkit/metadata.xml @@ -1,5 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<herd>qt</herd> + <herd>qt</herd> + <use> + <flag name='kde'> + Select <pkg>media-sound/phonon</pkg> as phonon variant needed for kde + </flag> + </use> </pkgmetadata> diff --git a/x11-libs/qt-webkit/qt-webkit-4.5.1.ebuild b/x11-libs/qt-webkit/qt-webkit-4.5.1.ebuild index 2e64aa712489..32311402d574 100644 --- a/x11-libs/qt-webkit/qt-webkit-4.5.1.ebuild +++ b/x11-libs/qt-webkit/qt-webkit-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-webkit/qt-webkit-4.5.1.ebuild,v 1.8 2009/06/02 18:05:06 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.5.1.ebuild,v 1.9 2009/06/03 22:02:57 yngwin Exp $ EAPI="2" inherit qt4-build flag-o-matic @@ -8,12 +8,12 @@ inherit qt4-build flag-o-matic DESCRIPTION="The Webkit module for the Qt toolkit" SLOT="4" KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~mips ppc ~ppc64 -sparc x86 ~x86-fbsd" -IUSE="" +IUSE="kde" DEPEND="~x11-libs/qt-core-${PV}[debug=,ssl] ~x11-libs/qt-gui-${PV}[debug=] - || ( ~x11-libs/qt-phonon-${PV}:${SLOT}[debug=] media-sound/phonon )" -# kde? ( media-sound/phonon )" + || ( ~x11-libs/qt-phonon-${PV}:${SLOT}[debug=] media-sound/phonon ) + kde? ( media-sound/phonon )" RDEPEND="${DEPEND}" QT4_TARGET_DIRECTORIES="src/3rdparty/webkit/WebCore tools/designer/src/plugins/qwebview" |