1 |
commit: c9efa0cf2509f7c7ea6bb07474781f79bf1fdde5 |
2 |
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> |
3 |
AuthorDate: Sat Jul 23 18:15:21 2016 +0000 |
4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jul 27 15:55:39 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9efa0cf |
7 |
|
8 |
kde4-base.eclass: Introduce WEBKIT_REQUIRED |
9 |
|
10 |
webkit flag is on by default to build as upstream intended. |
11 |
|
12 |
eclass/kde4-base.eclass | 32 ++++++++++++++++++++++++++++++-- |
13 |
1 file changed, 30 insertions(+), 2 deletions(-) |
14 |
|
15 |
diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass |
16 |
index c6ce069..d1707e6 100644 |
17 |
--- a/eclass/kde4-base.eclass |
18 |
+++ b/eclass/kde4-base.eclass |
19 |
@@ -131,6 +131,12 @@ OPENGL_REQUIRED="${OPENGL_REQUIRED:-never}" |
20 |
# This variable must be set before inheriting any eclasses. Defaults to 'never'. |
21 |
MULTIMEDIA_REQUIRED="${MULTIMEDIA_REQUIRED:-never}" |
22 |
|
23 |
+# @ECLASS-VARIABLE: WEBKIT_REQUIRED |
24 |
+# @DESCRIPTION: |
25 |
+# Is qtwebkit required? Possible values are 'always', 'optional' and 'never'. |
26 |
+# This variable must be set before inheriting any eclasses. Defaults to 'never'. |
27 |
+WEBKIT_REQUIRED="${WEBKIT_REQUIRED:-never}" |
28 |
+ |
29 |
# @ECLASS-VARIABLE: CPPUNIT_REQUIRED |
30 |
# @DESCRIPTION: |
31 |
# Is cppunit required for tests? Possible values are 'always', 'optional' and 'never'. |
32 |
@@ -258,6 +264,22 @@ case ${MULTIMEDIA_REQUIRED} in |
33 |
esac |
34 |
unset qtmultimediadepend |
35 |
|
36 |
+# WebKit dependencies |
37 |
+qtwebkitdepend=" |
38 |
+ >=dev-qt/qtwebkit-${QT_MINIMAL}:4 |
39 |
+" |
40 |
+case ${WEBKIT_REQUIRED} in |
41 |
+ always) |
42 |
+ COMMONDEPEND+=" ${qtwebkitdepend}" |
43 |
+ ;; |
44 |
+ optional) |
45 |
+ IUSE+=" +webkit" |
46 |
+ COMMONDEPEND+=" webkit? ( ${qtwebkitdepend} )" |
47 |
+ ;; |
48 |
+ *) ;; |
49 |
+esac |
50 |
+unset qtwebkitdepend |
51 |
+ |
52 |
# CppUnit dependencies |
53 |
cppuintdepend=" |
54 |
dev-util/cppunit |
55 |
@@ -287,11 +309,17 @@ kdecommondepend=" |
56 |
>=dev-qt/qtsql-${QT_MINIMAL}:4[qt3support] |
57 |
>=dev-qt/qtsvg-${QT_MINIMAL}:4 |
58 |
>=dev-qt/qttest-${QT_MINIMAL}:4 |
59 |
- >=dev-qt/qtwebkit-${QT_MINIMAL}:4 |
60 |
" |
61 |
|
62 |
if [[ ${PN} != kdelibs ]]; then |
63 |
- kdecommondepend+=" $(add_kdebase_dep kdelibs)" |
64 |
+ local _kdelibsuse |
65 |
+ case ${WEBKIT_REQUIRED} in |
66 |
+ always) _kdelibsuse="webkit" ;; |
67 |
+ optional) _kdelibsuse="webkit?" ;; |
68 |
+ *) ;; |
69 |
+ esac |
70 |
+ kdecommondepend+=" || ( $(add_kdebase_dep kdelibs "${_kdelibsuse}" 4.14.22) <kde-base/kdelibs-4.14.22 )" |
71 |
+ unset _kdelibsuse |
72 |
if [[ ${KDEBASE} = kdevelop ]]; then |
73 |
if [[ ${PN} != kdevplatform ]]; then |
74 |
# @ECLASS-VARIABLE: KDEVPLATFORM_REQUIRED |