diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2017-09-02 16:20:59 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2017-09-02 16:24:43 +0200 |
| commit | a3cad5267a342385ba5993199d981609c9f78f46 (patch) | |
| tree | da0bf8cc8a04d2e61367b25434ad954f2c4206e0 | |
| parent | dev-python/configshell-fb: version bump to 1.1.23 (diff) | |
| download | gentoo-a3cad526.tar.gz gentoo-a3cad526.tar.bz2 gentoo-a3cad526.zip | |
dev-qt/qtwebkit: Drop USE=gstreamer depending on deprecated slot 0.10
Gentoo-bug: 629172, 522880
Acked-by: kensington
Package-Manager: Portage-2.3.8, Repoman-2.3.3
| -rw-r--r-- | dev-qt/qtwebkit/qtwebkit-4.8.6-r1.ebuild | 12 | ||||
| -rw-r--r-- | dev-qt/qtwebkit/qtwebkit-4.8.7.ebuild | 10 |
2 files changed, 5 insertions, 17 deletions
diff --git a/dev-qt/qtwebkit/qtwebkit-4.8.6-r1.ebuild b/dev-qt/qtwebkit/qtwebkit-4.8.6-r1.ebuild index b0c28352a728..eb73229ec7df 100644 --- a/dev-qt/qtwebkit/qtwebkit-4.8.6-r1.ebuild +++ b/dev-qt/qtwebkit/qtwebkit-4.8.6-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -13,7 +13,7 @@ else KEYWORDS="amd64 arm ia64 ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd" fi -IUSE="+gstreamer icu +jit" +IUSE="icu +jit" # libxml2[!icu?] is needed for bugs 407315 and 411091 DEPEND=" @@ -23,12 +23,6 @@ DEPEND=" ~dev-qt/qtxmlpatterns-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] >=x11-libs/libX11-1.5.0-r1[${MULTILIB_USEDEP}] >=x11-libs/libXrender-0.9.7-r1[${MULTILIB_USEDEP}] - gstreamer? ( - dev-libs/glib:2[${MULTILIB_USEDEP}] - dev-libs/libxml2:2[!icu?,${MULTILIB_USEDEP}] - >=media-libs/gstreamer-0.10.36-r1:0.10[${MULTILIB_USEDEP}] - >=media-libs/gst-plugins-base-0.10.36-r1:0.10[${MULTILIB_USEDEP}] - ) icu? ( dev-libs/icu:=[${MULTILIB_USEDEP}] ) " RDEPEND="${DEPEND}" @@ -72,7 +66,7 @@ multilib_src_configure() { -system-sqlite $(qt_use icu) $(qt_use jit javascript-jit) - $(use gstreamer || echo -DENABLE_VIDEO=0) + -DENABLE_VIDEO=0 ) qt4_multilib_src_configure } diff --git a/dev-qt/qtwebkit/qtwebkit-4.8.7.ebuild b/dev-qt/qtwebkit/qtwebkit-4.8.7.ebuild index 0eba2efb1006..9af397014440 100644 --- a/dev-qt/qtwebkit/qtwebkit-4.8.7.ebuild +++ b/dev-qt/qtwebkit/qtwebkit-4.8.7.ebuild @@ -10,7 +10,7 @@ if [[ ${QT4_BUILD_TYPE} == release ]]; then KEYWORDS="amd64 arm ia64 ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd" fi -IUSE="+gstreamer icu +jit" +IUSE="icu +jit" # libxml2[!icu?] is needed for bugs 407315 and 411091 DEPEND=" @@ -20,12 +20,6 @@ DEPEND=" ~dev-qt/qtxmlpatterns-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] >=x11-libs/libX11-1.5.0-r1[${MULTILIB_USEDEP}] >=x11-libs/libXrender-0.9.7-r1[${MULTILIB_USEDEP}] - gstreamer? ( - dev-libs/glib:2[${MULTILIB_USEDEP}] - dev-libs/libxml2:2[!icu?,${MULTILIB_USEDEP}] - >=media-libs/gstreamer-0.10.36-r1:0.10[${MULTILIB_USEDEP}] - >=media-libs/gst-plugins-base-0.10.36-r1:0.10[${MULTILIB_USEDEP}] - ) icu? ( dev-libs/icu:=[${MULTILIB_USEDEP}] ) " RDEPEND="${DEPEND}" @@ -69,7 +63,7 @@ multilib_src_configure() { -system-sqlite $(qt_use icu) $(qt_use jit javascript-jit) - $(use gstreamer || echo -DENABLE_VIDEO=0) + -DENABLE_VIDEO=0 ) qt4_multilib_src_configure } |