Remove libxml2 and xslt USE flags wrt bug #511594.

(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key 0x06B1F38DCA45A1EC!)

3 files changed, 9 insertions, 14 deletions

diff --git a/dev-qt/qtwebkit/ChangeLog b/dev-qt/qtwebkit/ChangeLog
index 7fb6e2861a5f..f9c53c27cee0 100644
--- a/dev-qt/qtwebkit/ChangeLog
+++ b/dev-qt/qtwebkit/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-qt/qtwebkit
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwebkit/ChangeLog,v 1.19 2014/09/28 18:27:38 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwebkit/ChangeLog,v 1.20 2014/10/22 17:39:37 kensington Exp $
+
+  22 Oct 2014; Michael Palimaka <kensington@gentoo.org> metadata.xml,
+  qtwebkit-5.3.2-r1.ebuild:
+  Remove libxml2 and xslt USE flags wrt bug #511594.
 
   28 Sep 2014; Davide Pesavento <pesa@gentoo.org>
   +files/qtwebkit-5.3.2-use-gstreamer010.patch:
diff --git a/dev-qt/qtwebkit/metadata.xml b/dev-qt/qtwebkit/metadata.xml
index f6e0320a2f22..8de40a787be3 100644
--- a/dev-qt/qtwebkit/metadata.xml
+++ b/dev-qt/qtwebkit/metadata.xml
@@ -8,12 +8,10 @@
 		<flag name="gstreamer">Enable HTML5 audio/video support via <pkg>media-libs/gstreamer</pkg></flag>
 		<flag name="gstreamer010">Enable HTML5 audio/video support via <pkg>media-libs/gstreamer:0.10</pkg>
 			instead of :1.0</flag>
-		<flag name="libxml2">Use <pkg>dev-libs/libxml2</pkg> for XML parsing</flag>
 		<flag name="multimedia">Enable HTML5 audio/video support via <pkg>dev-qt/qtmultimedia</pkg></flag>
 		<flag name="printsupport">Enable printing via <pkg>dev-qt/qtprintsupport</pkg></flag>
 		<flag name="qml">Build QML/QtQuick bindings</flag>
 		<flag name="webp">Add support for WebP image format</flag>
-		<flag name="xslt">Enable XSLT support</flag>
 	</use>
 	<upstream>
 		<bugs-to>https://bugreports.qt-project.org/</bugs-to>
diff --git a/dev-qt/qtwebkit/qtwebkit-5.3.2-r1.ebuild b/dev-qt/qtwebkit/qtwebkit-5.3.2-r1.ebuild
index 5466baeaa46f..0a1e266b0f8f 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.3.2-r1.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.3.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwebkit/qtwebkit-5.3.2-r1.ebuild,v 1.1 2014/09/28 18:24:38 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtwebkit/qtwebkit-5.3.2-r1.ebuild,v 1.2 2014/10/22 17:39:37 kensington Exp $
 
 EAPI=5
 
@@ -18,12 +18,14 @@ fi
 
 # TODO: qttestlib, geolocation, orientation/sensors
 
-IUSE="gstreamer gstreamer010 libxml2 multimedia opengl printsupport qml udev webp xslt"
+IUSE="gstreamer gstreamer010 multimedia opengl printsupport qml udev webp"
 REQUIRED_USE="?? ( gstreamer gstreamer010 multimedia )"
 
 RDEPEND="
 	dev-db/sqlite:3
 	dev-libs/icu:=
+	dev-libs/libxml2:2
+	dev-libs/libxslt
 	>=dev-qt/qtcore-${PV}:5[debug=,icu]
 	>=dev-qt/qtgui-${PV}:5[debug=]
 	>=dev-qt/qtnetwork-${PV}:5[debug=]
@@ -47,17 +49,12 @@ RDEPEND="
 		media-libs/gstreamer:0.10
 		media-libs/gst-plugins-base:0.10
 	)
-	libxml2? ( dev-libs/libxml2:2 )
 	multimedia? ( >=dev-qt/qtmultimedia-${PV}:5[debug=,widgets] )
 	opengl? ( >=dev-qt/qtopengl-${PV}:5[debug=] )
 	printsupport? ( >=dev-qt/qtprintsupport-${PV}:5[debug=] )
 	qml? ( >=dev-qt/qtdeclarative-${PV}:5[debug=] )
 	udev? ( virtual/udev )
 	webp? ( media-libs/libwebp:0= )
-	xslt? (
-		libxml2? ( dev-libs/libxslt )
-		!libxml2? ( >=dev-qt/qtxmlpatterns-${PV}:5[debug=] )
-	)
 "
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
@@ -72,8 +69,6 @@ src_prepare() {
 	elif ! use gstreamer; then
 		epatch "${FILESDIR}/${PN}-5.2.1-disable-gstreamer.patch"
 	fi
-	use libxml2      || sed -i -e '/config_libxml2: WEBKIT_CONFIG += use_libxml2/d' \
-		Tools/qmake/mkspecs/features/features.prf || die
 	use multimedia   || sed -i -e '/WEBKIT_CONFIG += video use_qt_multimedia/d' \
 		Tools/qmake/mkspecs/features/features.prf || die
 	use opengl       || sed -i -e '/contains(QT_CONFIG, opengl): WEBKIT_CONFIG += use_3d_graphics/d' \
@@ -86,8 +81,6 @@ src_prepare() {
 		Tools/qmake/mkspecs/features/features.prf || die
 	use webp         || sed -i -e '/config_libwebp: WEBKIT_CONFIG += use_webp/d' \
 		Tools/qmake/mkspecs/features/features.prf || die
-	use xslt         || sed -i -e '/config_libxslt: WEBKIT_CONFIG += xslt/d' \
-		Tools/qmake/mkspecs/features/features.prf || die
 
 	# bug 458222
 	sed -i -e '/SUBDIRS += examples/d' Source/QtWebKit.pro || die