| 1 |
commit: a3cad5267a342385ba5993199d981609c9f78f46 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Sep 2 14:20:59 2017 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Sep 2 14:24:43 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3cad526 |
| 7 |
|
| 8 |
dev-qt/qtwebkit: Drop USE=gstreamer depending on deprecated slot 0.10 |
| 9 |
|
| 10 |
Gentoo-bug: 629172, 522880 |
| 11 |
Acked-by: kensington |
| 12 |
Package-Manager: Portage-2.3.8, Repoman-2.3.3 |
| 13 |
|
| 14 |
dev-qt/qtwebkit/qtwebkit-4.8.6-r1.ebuild | 12 +++--------- |
| 15 |
dev-qt/qtwebkit/qtwebkit-4.8.7.ebuild | 10 ++-------- |
| 16 |
2 files changed, 5 insertions(+), 17 deletions(-) |
| 17 |
|
| 18 |
diff --git a/dev-qt/qtwebkit/qtwebkit-4.8.6-r1.ebuild b/dev-qt/qtwebkit/qtwebkit-4.8.6-r1.ebuild |
| 19 |
index b0c28352a72..eb73229ec7d 100644 |
| 20 |
--- a/dev-qt/qtwebkit/qtwebkit-4.8.6-r1.ebuild |
| 21 |
+++ b/dev-qt/qtwebkit/qtwebkit-4.8.6-r1.ebuild |
| 22 |
@@ -1,4 +1,4 @@ |
| 23 |
-# Copyright 1999-2015 Gentoo Foundation |
| 24 |
+# Copyright 1999-2017 Gentoo Foundation |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
|
| 27 |
EAPI=5 |
| 28 |
@@ -13,7 +13,7 @@ else |
| 29 |
KEYWORDS="amd64 arm ia64 ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd" |
| 30 |
fi |
| 31 |
|
| 32 |
-IUSE="+gstreamer icu +jit" |
| 33 |
+IUSE="icu +jit" |
| 34 |
|
| 35 |
# libxml2[!icu?] is needed for bugs 407315 and 411091 |
| 36 |
DEPEND=" |
| 37 |
@@ -23,12 +23,6 @@ DEPEND=" |
| 38 |
~dev-qt/qtxmlpatterns-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] |
| 39 |
>=x11-libs/libX11-1.5.0-r1[${MULTILIB_USEDEP}] |
| 40 |
>=x11-libs/libXrender-0.9.7-r1[${MULTILIB_USEDEP}] |
| 41 |
- gstreamer? ( |
| 42 |
- dev-libs/glib:2[${MULTILIB_USEDEP}] |
| 43 |
- dev-libs/libxml2:2[!icu?,${MULTILIB_USEDEP}] |
| 44 |
- >=media-libs/gstreamer-0.10.36-r1:0.10[${MULTILIB_USEDEP}] |
| 45 |
- >=media-libs/gst-plugins-base-0.10.36-r1:0.10[${MULTILIB_USEDEP}] |
| 46 |
- ) |
| 47 |
icu? ( dev-libs/icu:=[${MULTILIB_USEDEP}] ) |
| 48 |
" |
| 49 |
RDEPEND="${DEPEND}" |
| 50 |
@@ -72,7 +66,7 @@ multilib_src_configure() { |
| 51 |
-system-sqlite |
| 52 |
$(qt_use icu) |
| 53 |
$(qt_use jit javascript-jit) |
| 54 |
- $(use gstreamer || echo -DENABLE_VIDEO=0) |
| 55 |
+ -DENABLE_VIDEO=0 |
| 56 |
) |
| 57 |
qt4_multilib_src_configure |
| 58 |
} |
| 59 |
|
| 60 |
diff --git a/dev-qt/qtwebkit/qtwebkit-4.8.7.ebuild b/dev-qt/qtwebkit/qtwebkit-4.8.7.ebuild |
| 61 |
index 0eba2efb100..9af39701444 100644 |
| 62 |
--- a/dev-qt/qtwebkit/qtwebkit-4.8.7.ebuild |
| 63 |
+++ b/dev-qt/qtwebkit/qtwebkit-4.8.7.ebuild |
| 64 |
@@ -10,7 +10,7 @@ if [[ ${QT4_BUILD_TYPE} == release ]]; then |
| 65 |
KEYWORDS="amd64 arm ia64 ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd" |
| 66 |
fi |
| 67 |
|
| 68 |
-IUSE="+gstreamer icu +jit" |
| 69 |
+IUSE="icu +jit" |
| 70 |
|
| 71 |
# libxml2[!icu?] is needed for bugs 407315 and 411091 |
| 72 |
DEPEND=" |
| 73 |
@@ -20,12 +20,6 @@ DEPEND=" |
| 74 |
~dev-qt/qtxmlpatterns-${PV}[aqua=,debug=,${MULTILIB_USEDEP}] |
| 75 |
>=x11-libs/libX11-1.5.0-r1[${MULTILIB_USEDEP}] |
| 76 |
>=x11-libs/libXrender-0.9.7-r1[${MULTILIB_USEDEP}] |
| 77 |
- gstreamer? ( |
| 78 |
- dev-libs/glib:2[${MULTILIB_USEDEP}] |
| 79 |
- dev-libs/libxml2:2[!icu?,${MULTILIB_USEDEP}] |
| 80 |
- >=media-libs/gstreamer-0.10.36-r1:0.10[${MULTILIB_USEDEP}] |
| 81 |
- >=media-libs/gst-plugins-base-0.10.36-r1:0.10[${MULTILIB_USEDEP}] |
| 82 |
- ) |
| 83 |
icu? ( dev-libs/icu:=[${MULTILIB_USEDEP}] ) |
| 84 |
" |
| 85 |
RDEPEND="${DEPEND}" |
| 86 |
@@ -69,7 +63,7 @@ multilib_src_configure() { |
| 87 |
-system-sqlite |
| 88 |
$(qt_use icu) |
| 89 |
$(qt_use jit javascript-jit) |
| 90 |
- $(use gstreamer || echo -DENABLE_VIDEO=0) |
| 91 |
+ -DENABLE_VIDEO=0 |
| 92 |
) |
| 93 |
qt4_multilib_src_configure |
| 94 |
} |
Archives