commit: a4aa2ab527a53d34537b9deaa89333e83611e365
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 22 17:19:40 2014 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Oct 22 17:27:11 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=a4aa2ab5
[dev-qt/qtwebkit] Remove libxml2 and xslt USE flags wrt bug #511594.
Package-Manager: portage-2.2.12
---
dev-qt/qtwebkit/metadata.xml | 2 --
dev-qt/qtwebkit/qtwebkit-5.3.9999.ebuild | 13 +++----------
dev-qt/qtwebkit/qtwebkit-5.4.0_beta.ebuild | 13 +++----------
dev-qt/qtwebkit/qtwebkit-5.4.9999.ebuild | 13 +++----------
dev-qt/qtwebkit/qtwebkit-5.9999.ebuild | 13 +++----------
5 files changed, 12 insertions(+), 42 deletions(-)
diff --git a/dev-qt/qtwebkit/metadata.xml b/dev-qt/qtwebkit/metadata.xml
index 0d4bcf5..b8a1666 100644
--- a/dev-qt/qtwebkit/metadata.xml
+++ b/dev-qt/qtwebkit/metadata.xml
@@ -7,12 +7,10 @@
inside the event loop (recommended by Nokia)</flag>
<flag name="gstreamer">Enable HTML5 audio/video support via
<pkg>media-libs/gstreamer:1.0</pkg></flag>
<flag name="gstreamer010">Enable HTML5 audio/video support via
<pkg>media-libs/gstreamer:0.10</pkg></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.9999.ebuild
b/dev-qt/qtwebkit/qtwebkit-5.3.9999.ebuild
index f59c599..cc1567b 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.3.9999.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.3.9999.ebuild
@@ -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
diff --git a/dev-qt/qtwebkit/qtwebkit-5.4.0_beta.ebuild
b/dev-qt/qtwebkit/qtwebkit-5.4.0_beta.ebuild
index f59c599..cc1567b 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.4.0_beta.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.4.0_beta.ebuild
@@ -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
diff --git a/dev-qt/qtwebkit/qtwebkit-5.4.9999.ebuild
b/dev-qt/qtwebkit/qtwebkit-5.4.9999.ebuild
index f59c599..cc1567b 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.4.9999.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.4.9999.ebuild
@@ -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
diff --git a/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild
b/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild
index f59c599..cc1567b 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild
@@ -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
