pesa 12/06/09 20:49:03
Modified: qt-webkit-4.8.2.ebuild ChangeLog
Log:
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)
Revision Changes Path
1.3 x11-libs/qt-webkit/qt-webkit-4.8.2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.8.2.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.8.2.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.8.2.ebuild?r1=1.2&r2=1.3
Index: qt-webkit-4.8.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.8.2.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- qt-webkit-4.8.2.ebuild 22 May 2012 19:47:43 -0000 1.2
+++ qt-webkit-4.8.2.ebuild 9 Jun 2012 20:49:03 -0000 1.3
@@ -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 @@
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 @@
~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 )
"
1.154 x11-libs/qt-webkit/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-webkit/ChangeLog?rev=1.154&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-webkit/ChangeLog?rev=1.154&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-webkit/ChangeLog?r1=1.153&r2=1.154
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/ChangeLog,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- ChangeLog 22 May 2012 19:47:43 -0000 1.153
+++ ChangeLog 9 Jun 2012 20:49:03 -0000 1.154
@@ -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@g.o> 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@g.o> qt-webkit-4.8.2.ebuild:
Fix build with GCC 4.7, wrt bug #417147 by Joe Kappus <joecool1029@...>.
|
