commit: 89f342721be920c796ac7323454746fd4f661c8f
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 24 08:05:47 2014 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Sep 24 08:05:47 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=89f34272
[dev-qt/qtwebkit] Remove widgets USE flag wrt bug #448178.
It can cause build failure and it's not currently possible to easily make
it properly optional.
---
dev-qt/assistant/assistant-5.3.9999.ebuild | 2 +-
dev-qt/assistant/assistant-5.4.0_alpha.ebuild | 2 +-
dev-qt/assistant/assistant-5.4.9999.ebuild | 2 +-
dev-qt/assistant/assistant-5.9999.ebuild | 2 +-
dev-qt/designer/designer-5.3.9999.ebuild | 2 +-
dev-qt/designer/designer-5.4.0_alpha.ebuild | 2 +-
dev-qt/designer/designer-5.4.9999.ebuild | 2 +-
dev-qt/designer/designer-5.9999.ebuild | 2 +-
dev-qt/qtquick1/qtquick1-5.3.9999.ebuild | 2 +-
dev-qt/qtquick1/qtquick1-5.4.0_alpha.ebuild | 2 +-
dev-qt/qtquick1/qtquick1-5.4.9999.ebuild | 2 +-
dev-qt/qtquick1/qtquick1-5.9999.ebuild | 2 +-
dev-qt/qtwebkit/qtwebkit-5.3.9999.ebuild | 6 ++----
dev-qt/qtwebkit/qtwebkit-5.4.0_alpha.ebuild | 6 ++----
dev-qt/qtwebkit/qtwebkit-5.4.9999.ebuild | 6 ++----
dev-qt/qtwebkit/qtwebkit-5.9999.ebuild | 6 ++----
16 files changed, 20 insertions(+), 28 deletions(-)
diff --git a/dev-qt/assistant/assistant-5.3.9999.ebuild
b/dev-qt/assistant/assistant-5.3.9999.ebuild
index b26acbc..43473b7 100644
--- a/dev-qt/assistant/assistant-5.3.9999.ebuild
+++ b/dev-qt/assistant/assistant-5.3.9999.ebuild
@@ -26,7 +26,7 @@ DEPEND="
>=dev-qt/qtprintsupport-${PV}:5[debug=]
>=dev-qt/qtsql-${PV}:5[debug=,sqlite]
>=dev-qt/qtwidgets-${PV}:5[debug=]
- webkit? ( >=dev-qt/qtwebkit-${PV}:5[debug=,widgets] )
+ webkit? ( >=dev-qt/qtwebkit-${PV}:5[debug=] )
"
RDEPEND="${DEPEND}"
diff --git a/dev-qt/assistant/assistant-5.4.0_alpha.ebuild
b/dev-qt/assistant/assistant-5.4.0_alpha.ebuild
index b26acbc..43473b7 100644
--- a/dev-qt/assistant/assistant-5.4.0_alpha.ebuild
+++ b/dev-qt/assistant/assistant-5.4.0_alpha.ebuild
@@ -26,7 +26,7 @@ DEPEND="
>=dev-qt/qtprintsupport-${PV}:5[debug=]
>=dev-qt/qtsql-${PV}:5[debug=,sqlite]
>=dev-qt/qtwidgets-${PV}:5[debug=]
- webkit? ( >=dev-qt/qtwebkit-${PV}:5[debug=,widgets] )
+ webkit? ( >=dev-qt/qtwebkit-${PV}:5[debug=] )
"
RDEPEND="${DEPEND}"
diff --git a/dev-qt/assistant/assistant-5.4.9999.ebuild
b/dev-qt/assistant/assistant-5.4.9999.ebuild
index b26acbc..43473b7 100644
--- a/dev-qt/assistant/assistant-5.4.9999.ebuild
+++ b/dev-qt/assistant/assistant-5.4.9999.ebuild
@@ -26,7 +26,7 @@ DEPEND="
>=dev-qt/qtprintsupport-${PV}:5[debug=]
>=dev-qt/qtsql-${PV}:5[debug=,sqlite]
>=dev-qt/qtwidgets-${PV}:5[debug=]
- webkit? ( >=dev-qt/qtwebkit-${PV}:5[debug=,widgets] )
+ webkit? ( >=dev-qt/qtwebkit-${PV}:5[debug=] )
"
RDEPEND="${DEPEND}"
diff --git a/dev-qt/assistant/assistant-5.9999.ebuild
b/dev-qt/assistant/assistant-5.9999.ebuild
index b26acbc..43473b7 100644
--- a/dev-qt/assistant/assistant-5.9999.ebuild
+++ b/dev-qt/assistant/assistant-5.9999.ebuild
@@ -26,7 +26,7 @@ DEPEND="
>=dev-qt/qtprintsupport-${PV}:5[debug=]
>=dev-qt/qtsql-${PV}:5[debug=,sqlite]
>=dev-qt/qtwidgets-${PV}:5[debug=]
- webkit? ( >=dev-qt/qtwebkit-${PV}:5[debug=,widgets] )
+ webkit? ( >=dev-qt/qtwebkit-${PV}:5[debug=] )
"
RDEPEND="${DEPEND}"
diff --git a/dev-qt/designer/designer-5.3.9999.ebuild
b/dev-qt/designer/designer-5.3.9999.ebuild
index 06dfb0e..02fbb0e 100644
--- a/dev-qt/designer/designer-5.3.9999.ebuild
+++ b/dev-qt/designer/designer-5.3.9999.ebuild
@@ -25,7 +25,7 @@ DEPEND="
>=dev-qt/qtprintsupport-${PV}:5[debug=]
>=dev-qt/qtwidgets-${PV}:5[debug=]
>=dev-qt/qtxml-${PV}:5[debug=]
- webkit? ( >=dev-qt/qtwebkit-${PV}:5[debug=,widgets] )
+ webkit? ( >=dev-qt/qtwebkit-${PV}:5[debug=] )
"
RDEPEND="${DEPEND}"
diff --git a/dev-qt/designer/designer-5.4.0_alpha.ebuild
b/dev-qt/designer/designer-5.4.0_alpha.ebuild
index 06dfb0e..02fbb0e 100644
--- a/dev-qt/designer/designer-5.4.0_alpha.ebuild
+++ b/dev-qt/designer/designer-5.4.0_alpha.ebuild
@@ -25,7 +25,7 @@ DEPEND="
>=dev-qt/qtprintsupport-${PV}:5[debug=]
>=dev-qt/qtwidgets-${PV}:5[debug=]
>=dev-qt/qtxml-${PV}:5[debug=]
- webkit? ( >=dev-qt/qtwebkit-${PV}:5[debug=,widgets] )
+ webkit? ( >=dev-qt/qtwebkit-${PV}:5[debug=] )
"
RDEPEND="${DEPEND}"
diff --git a/dev-qt/designer/designer-5.4.9999.ebuild
b/dev-qt/designer/designer-5.4.9999.ebuild
index 06dfb0e..02fbb0e 100644
--- a/dev-qt/designer/designer-5.4.9999.ebuild
+++ b/dev-qt/designer/designer-5.4.9999.ebuild
@@ -25,7 +25,7 @@ DEPEND="
>=dev-qt/qtprintsupport-${PV}:5[debug=]
>=dev-qt/qtwidgets-${PV}:5[debug=]
>=dev-qt/qtxml-${PV}:5[debug=]
- webkit? ( >=dev-qt/qtwebkit-${PV}:5[debug=,widgets] )
+ webkit? ( >=dev-qt/qtwebkit-${PV}:5[debug=] )
"
RDEPEND="${DEPEND}"
diff --git a/dev-qt/designer/designer-5.9999.ebuild
b/dev-qt/designer/designer-5.9999.ebuild
index 06dfb0e..02fbb0e 100644
--- a/dev-qt/designer/designer-5.9999.ebuild
+++ b/dev-qt/designer/designer-5.9999.ebuild
@@ -25,7 +25,7 @@ DEPEND="
>=dev-qt/qtprintsupport-${PV}:5[debug=]
>=dev-qt/qtwidgets-${PV}:5[debug=]
>=dev-qt/qtxml-${PV}:5[debug=]
- webkit? ( >=dev-qt/qtwebkit-${PV}:5[debug=,widgets] )
+ webkit? ( >=dev-qt/qtwebkit-${PV}:5[debug=] )
"
RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtquick1/qtquick1-5.3.9999.ebuild
b/dev-qt/qtquick1/qtquick1-5.3.9999.ebuild
index 36b0bcf..7ad38fc 100644
--- a/dev-qt/qtquick1/qtquick1-5.3.9999.ebuild
+++ b/dev-qt/qtquick1/qtquick1-5.3.9999.ebuild
@@ -28,7 +28,7 @@ DEPEND="
>=dev-qt/qtdeclarative-${PV}:5[debug=]
)
opengl? ( >=dev-qt/qtopengl-${PV}:5[debug=] )
- webkit? ( >=dev-qt/qtwebkit-${PV}:5[debug=,widgets] )
+ webkit? ( >=dev-qt/qtwebkit-${PV}:5[debug=] )
xml? ( >=dev-qt/qtxmlpatterns-${PV}:5[debug=] )
"
RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtquick1/qtquick1-5.4.0_alpha.ebuild
b/dev-qt/qtquick1/qtquick1-5.4.0_alpha.ebuild
index 36b0bcf..7ad38fc 100644
--- a/dev-qt/qtquick1/qtquick1-5.4.0_alpha.ebuild
+++ b/dev-qt/qtquick1/qtquick1-5.4.0_alpha.ebuild
@@ -28,7 +28,7 @@ DEPEND="
>=dev-qt/qtdeclarative-${PV}:5[debug=]
)
opengl? ( >=dev-qt/qtopengl-${PV}:5[debug=] )
- webkit? ( >=dev-qt/qtwebkit-${PV}:5[debug=,widgets] )
+ webkit? ( >=dev-qt/qtwebkit-${PV}:5[debug=] )
xml? ( >=dev-qt/qtxmlpatterns-${PV}:5[debug=] )
"
RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtquick1/qtquick1-5.4.9999.ebuild
b/dev-qt/qtquick1/qtquick1-5.4.9999.ebuild
index 36b0bcf..7ad38fc 100644
--- a/dev-qt/qtquick1/qtquick1-5.4.9999.ebuild
+++ b/dev-qt/qtquick1/qtquick1-5.4.9999.ebuild
@@ -28,7 +28,7 @@ DEPEND="
>=dev-qt/qtdeclarative-${PV}:5[debug=]
)
opengl? ( >=dev-qt/qtopengl-${PV}:5[debug=] )
- webkit? ( >=dev-qt/qtwebkit-${PV}:5[debug=,widgets] )
+ webkit? ( >=dev-qt/qtwebkit-${PV}:5[debug=] )
xml? ( >=dev-qt/qtxmlpatterns-${PV}:5[debug=] )
"
RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtquick1/qtquick1-5.9999.ebuild
b/dev-qt/qtquick1/qtquick1-5.9999.ebuild
index 36b0bcf..7ad38fc 100644
--- a/dev-qt/qtquick1/qtquick1-5.9999.ebuild
+++ b/dev-qt/qtquick1/qtquick1-5.9999.ebuild
@@ -28,7 +28,7 @@ DEPEND="
>=dev-qt/qtdeclarative-${PV}:5[debug=]
)
opengl? ( >=dev-qt/qtopengl-${PV}:5[debug=] )
- webkit? ( >=dev-qt/qtwebkit-${PV}:5[debug=,widgets] )
+ webkit? ( >=dev-qt/qtwebkit-${PV}:5[debug=] )
xml? ( >=dev-qt/qtxmlpatterns-${PV}:5[debug=] )
"
RDEPEND="${DEPEND}"
diff --git a/dev-qt/qtwebkit/qtwebkit-5.3.9999.ebuild
b/dev-qt/qtwebkit/qtwebkit-5.3.9999.ebuild
index 49d482e..0238091 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.3.9999.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.3.9999.ebuild
@@ -18,7 +18,7 @@ fi
# TODO: qttestlib, geolocation, orientation/sensors
-IUSE="gstreamer libxml2 multimedia opengl printsupport qml udev webp widgets
xslt"
+IUSE="gstreamer libxml2 multimedia opengl printsupport qml udev webp xslt"
RDEPEND="
dev-db/sqlite:3
@@ -27,6 +27,7 @@ RDEPEND="
>=dev-qt/qtgui-${PV}:5[debug=]
>=dev-qt/qtnetwork-${PV}:5[debug=]
>=dev-qt/qtsql-${PV}:5[debug=]
+ >=dev-qt/qtwidgets-${PV}:5[debug=]
media-libs/fontconfig:1.0
media-libs/libpng:0=
sys-libs/zlib
@@ -47,7 +48,6 @@ RDEPEND="
qml? ( >=dev-qt/qtdeclarative-${PV}:5[debug=] )
udev? ( virtual/udev )
webp? ( media-libs/libwebp:0= )
- widgets? ( >=dev-qt/qtwidgets-${PV}:5[debug=] )
xslt? (
libxml2? ( dev-libs/libxslt )
!libxml2? ( >=dev-qt/qtxmlpatterns-${PV}:5[debug=] )
@@ -76,8 +76,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 widgets || sed -i -e '/SUBDIRS += webkitwidgets/d' \
- Source/QtWebKit.pro || die
use xslt || sed -i -e '/config_libxslt: WEBKIT_CONFIG +=
xslt/d' \
Tools/qmake/mkspecs/features/features.prf || die
diff --git a/dev-qt/qtwebkit/qtwebkit-5.4.0_alpha.ebuild
b/dev-qt/qtwebkit/qtwebkit-5.4.0_alpha.ebuild
index 49d482e..0238091 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.4.0_alpha.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.4.0_alpha.ebuild
@@ -18,7 +18,7 @@ fi
# TODO: qttestlib, geolocation, orientation/sensors
-IUSE="gstreamer libxml2 multimedia opengl printsupport qml udev webp widgets
xslt"
+IUSE="gstreamer libxml2 multimedia opengl printsupport qml udev webp xslt"
RDEPEND="
dev-db/sqlite:3
@@ -27,6 +27,7 @@ RDEPEND="
>=dev-qt/qtgui-${PV}:5[debug=]
>=dev-qt/qtnetwork-${PV}:5[debug=]
>=dev-qt/qtsql-${PV}:5[debug=]
+ >=dev-qt/qtwidgets-${PV}:5[debug=]
media-libs/fontconfig:1.0
media-libs/libpng:0=
sys-libs/zlib
@@ -47,7 +48,6 @@ RDEPEND="
qml? ( >=dev-qt/qtdeclarative-${PV}:5[debug=] )
udev? ( virtual/udev )
webp? ( media-libs/libwebp:0= )
- widgets? ( >=dev-qt/qtwidgets-${PV}:5[debug=] )
xslt? (
libxml2? ( dev-libs/libxslt )
!libxml2? ( >=dev-qt/qtxmlpatterns-${PV}:5[debug=] )
@@ -76,8 +76,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 widgets || sed -i -e '/SUBDIRS += webkitwidgets/d' \
- Source/QtWebKit.pro || die
use xslt || sed -i -e '/config_libxslt: WEBKIT_CONFIG +=
xslt/d' \
Tools/qmake/mkspecs/features/features.prf || die
diff --git a/dev-qt/qtwebkit/qtwebkit-5.4.9999.ebuild
b/dev-qt/qtwebkit/qtwebkit-5.4.9999.ebuild
index 49d482e..0238091 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.4.9999.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.4.9999.ebuild
@@ -18,7 +18,7 @@ fi
# TODO: qttestlib, geolocation, orientation/sensors
-IUSE="gstreamer libxml2 multimedia opengl printsupport qml udev webp widgets
xslt"
+IUSE="gstreamer libxml2 multimedia opengl printsupport qml udev webp xslt"
RDEPEND="
dev-db/sqlite:3
@@ -27,6 +27,7 @@ RDEPEND="
>=dev-qt/qtgui-${PV}:5[debug=]
>=dev-qt/qtnetwork-${PV}:5[debug=]
>=dev-qt/qtsql-${PV}:5[debug=]
+ >=dev-qt/qtwidgets-${PV}:5[debug=]
media-libs/fontconfig:1.0
media-libs/libpng:0=
sys-libs/zlib
@@ -47,7 +48,6 @@ RDEPEND="
qml? ( >=dev-qt/qtdeclarative-${PV}:5[debug=] )
udev? ( virtual/udev )
webp? ( media-libs/libwebp:0= )
- widgets? ( >=dev-qt/qtwidgets-${PV}:5[debug=] )
xslt? (
libxml2? ( dev-libs/libxslt )
!libxml2? ( >=dev-qt/qtxmlpatterns-${PV}:5[debug=] )
@@ -76,8 +76,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 widgets || sed -i -e '/SUBDIRS += webkitwidgets/d' \
- Source/QtWebKit.pro || die
use xslt || sed -i -e '/config_libxslt: WEBKIT_CONFIG +=
xslt/d' \
Tools/qmake/mkspecs/features/features.prf || die
diff --git a/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild
b/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild
index 49d482e..0238091 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild
@@ -18,7 +18,7 @@ fi
# TODO: qttestlib, geolocation, orientation/sensors
-IUSE="gstreamer libxml2 multimedia opengl printsupport qml udev webp widgets
xslt"
+IUSE="gstreamer libxml2 multimedia opengl printsupport qml udev webp xslt"
RDEPEND="
dev-db/sqlite:3
@@ -27,6 +27,7 @@ RDEPEND="
>=dev-qt/qtgui-${PV}:5[debug=]
>=dev-qt/qtnetwork-${PV}:5[debug=]
>=dev-qt/qtsql-${PV}:5[debug=]
+ >=dev-qt/qtwidgets-${PV}:5[debug=]
media-libs/fontconfig:1.0
media-libs/libpng:0=
sys-libs/zlib
@@ -47,7 +48,6 @@ RDEPEND="
qml? ( >=dev-qt/qtdeclarative-${PV}:5[debug=] )
udev? ( virtual/udev )
webp? ( media-libs/libwebp:0= )
- widgets? ( >=dev-qt/qtwidgets-${PV}:5[debug=] )
xslt? (
libxml2? ( dev-libs/libxslt )
!libxml2? ( >=dev-qt/qtxmlpatterns-${PV}:5[debug=] )
@@ -76,8 +76,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 widgets || sed -i -e '/SUBDIRS += webkitwidgets/d' \
- Source/QtWebKit.pro || die
use xslt || sed -i -e '/config_libxslt: WEBKIT_CONFIG +=
xslt/d' \
Tools/qmake/mkspecs/features/features.prf || die
