diff options
| author |   Davide Pesavento <pesa@gentoo.org> | 2012-06-09 20:49:03 +0000 |
|---|---|---|
| committer | Davide Pesavento <pesa@gentoo.org> | 2012-06-09 20:49:03 +0000 |
| commit | 145b6403027b6c777949510d672b5604e106540f (patch) | |
| tree | 3801bb5fc307be98e19e205965d410910e07d0d9 /x11-libs | |
| parent | Drop vulnerable versions. (diff) | |
| download | gentoo-2-145b6403027b6c777949510d672b5604e106540f.tar.gz gentoo-2-145b6403027b6c777949510d672b5604e106540f.tar.bz2 gentoo-2-145b6403027b6c777949510d672b5604e106540f.zip | |
Turn the libxml2[icu] blocker into a USE dep because portage displays better error messages for unsatisfied USE deps than for blockers.
(Portage version: 2.2.0_alpha110/cvs/Linux x86_64)
Diffstat (limited to 'x11-libs')
| -rw-r--r-- | x11-libs/qt-webkit/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-libs/qt-webkit/qt-webkit-4.8.2.ebuild | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/x11-libs/qt-webkit/ChangeLog b/x11-libs/qt-webkit/ChangeLog index cc40e8124a90..08ba685ad1fd 100644 --- a/x11-libs/qt-webkit/ChangeLog +++ b/x11-libs/qt-webkit/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/qt-webkit # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/ChangeLog,v 1.153 2012/05/22 19:47:43 kensington Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/ChangeLog,v 1.154 2012/06/09 20:49:03 pesa Exp $ + + 09 Jun 2012; Davide Pesavento <pesa@gentoo.org> qt-webkit-4.8.2.ebuild: + Turn the libxml2[icu] blocker into a USE dep because portage displays better + error messages for unsatisfied USE deps than for blockers. 22 May 2012; Michael Palimaka <kensington@gentoo.org> qt-webkit-4.8.2.ebuild: Fix build with GCC 4.7, wrt bug #417147 by Joe Kappus <joecool1029@gmail.com>. diff --git a/x11-libs/qt-webkit/qt-webkit-4.8.2.ebuild b/x11-libs/qt-webkit/qt-webkit-4.8.2.ebuild index 9f3a72686435..a3df6033f92d 100644 --- a/x11-libs/qt-webkit/qt-webkit-4.8.2.ebuild +++ b/x11-libs/qt-webkit/qt-webkit-4.8.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 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.8.2.ebuild,v 1.2 2012/05/22 19:47:43 kensington Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.8.2.ebuild,v 1.3 2012/06/09 20:49:03 pesa Exp $ EAPI=4 @@ -15,7 +15,7 @@ else fi IUSE="+gstreamer icu +jit" -# For the libxml2[icu] blocker see bugs 407315 and 411091 +# libxml2[!icu?] is needed for bugs 407315 and 411091 DEPEND=" dev-db/sqlite:3 x11-libs/libX11 @@ -25,9 +25,9 @@ DEPEND=" ~x11-libs/qt-xmlpatterns-${PV}[aqua=,c++0x=,debug=,qpa=] gstreamer? ( dev-libs/glib:2 + dev-libs/libxml2:2[!icu?] media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 - !icu? ( !!dev-libs/libxml2[icu] ) ) icu? ( dev-libs/icu ) " |