| 1 |
pesa 12/06/09 20:49:03 |
| 2 |
|
| 3 |
Modified: qt-webkit-4.8.2.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Turn the libxml2[icu] blocker into a USE dep because portage displays better error messages for unsatisfied USE deps than for blockers. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha110/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.3 x11-libs/qt-webkit/qt-webkit-4.8.2.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.8.2.ebuild?rev=1.3&view=markup |
| 13 |
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 |
| 14 |
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 |
| 15 |
|
| 16 |
Index: qt-webkit-4.8.2.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/qt-webkit-4.8.2.ebuild,v |
| 19 |
retrieving revision 1.2 |
| 20 |
retrieving revision 1.3 |
| 21 |
diff -u -r1.2 -r1.3 |
| 22 |
--- qt-webkit-4.8.2.ebuild 22 May 2012 19:47:43 -0000 1.2 |
| 23 |
+++ qt-webkit-4.8.2.ebuild 9 Jun 2012 20:49:03 -0000 1.3 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2012 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $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 $ |
| 28 |
+# $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 $ |
| 29 |
|
| 30 |
EAPI=4 |
| 31 |
|
| 32 |
@@ -15,7 +15,7 @@ |
| 33 |
fi |
| 34 |
IUSE="+gstreamer icu +jit" |
| 35 |
|
| 36 |
-# For the libxml2[icu] blocker see bugs 407315 and 411091 |
| 37 |
+# libxml2[!icu?] is needed for bugs 407315 and 411091 |
| 38 |
DEPEND=" |
| 39 |
dev-db/sqlite:3 |
| 40 |
x11-libs/libX11 |
| 41 |
@@ -25,9 +25,9 @@ |
| 42 |
~x11-libs/qt-xmlpatterns-${PV}[aqua=,c++0x=,debug=,qpa=] |
| 43 |
gstreamer? ( |
| 44 |
dev-libs/glib:2 |
| 45 |
+ dev-libs/libxml2:2[!icu?] |
| 46 |
media-libs/gstreamer:0.10 |
| 47 |
media-libs/gst-plugins-base:0.10 |
| 48 |
- !icu? ( !!dev-libs/libxml2[icu] ) |
| 49 |
) |
| 50 |
icu? ( dev-libs/icu ) |
| 51 |
" |
| 52 |
|
| 53 |
|
| 54 |
|
| 55 |
1.154 x11-libs/qt-webkit/ChangeLog |
| 56 |
|
| 57 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-webkit/ChangeLog?rev=1.154&view=markup |
| 58 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-webkit/ChangeLog?rev=1.154&content-type=text/plain |
| 59 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/qt-webkit/ChangeLog?r1=1.153&r2=1.154 |
| 60 |
|
| 61 |
Index: ChangeLog |
| 62 |
=================================================================== |
| 63 |
RCS file: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/ChangeLog,v |
| 64 |
retrieving revision 1.153 |
| 65 |
retrieving revision 1.154 |
| 66 |
diff -u -r1.153 -r1.154 |
| 67 |
--- ChangeLog 22 May 2012 19:47:43 -0000 1.153 |
| 68 |
+++ ChangeLog 9 Jun 2012 20:49:03 -0000 1.154 |
| 69 |
@@ -1,6 +1,10 @@ |
| 70 |
# ChangeLog for x11-libs/qt-webkit |
| 71 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 72 |
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/ChangeLog,v 1.153 2012/05/22 19:47:43 kensington Exp $ |
| 73 |
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-webkit/ChangeLog,v 1.154 2012/06/09 20:49:03 pesa Exp $ |
| 74 |
+ |
| 75 |
+ 09 Jun 2012; Davide Pesavento <pesa@g.o> qt-webkit-4.8.2.ebuild: |
| 76 |
+ Turn the libxml2[icu] blocker into a USE dep because portage displays better |
| 77 |
+ error messages for unsatisfied USE deps than for blockers. |
| 78 |
|
| 79 |
22 May 2012; Michael Palimaka <kensington@g.o> qt-webkit-4.8.2.ebuild: |
| 80 |
Fix build with GCC 4.7, wrt bug #417147 by Joe Kappus <joecool1029@×××××.com>. |
Archives