[gentoo-commits] repo/gentoo:master commit in: eclass/

[Michael Palimaka]

commit:     c9efa0cf2509f7c7ea6bb07474781f79bf1fdde5
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat Jul 23 18:15:21 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Jul 27 15:55:39 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9efa0cf

kde4-base.eclass: Introduce WEBKIT_REQUIRED

webkit flag is on by default to build as upstream intended.

 eclass/kde4-base.eclass | 32 ++++++++++++++++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass
index c6ce069..d1707e6 100644
--- a/eclass/kde4-base.eclass
+++ b/eclass/kde4-base.eclass
@@ -131,6 +131,12 @@ OPENGL_REQUIRED="${OPENGL_REQUIRED:-never}"
 # This variable must be set before inheriting any eclasses. Defaults to 
'never'.
 MULTIMEDIA_REQUIRED="${MULTIMEDIA_REQUIRED:-never}"
 
+# @ECLASS-VARIABLE: WEBKIT_REQUIRED
+# @DESCRIPTION:
+# Is qtwebkit required? Possible values are 'always', 'optional' and 'never'.
+# This variable must be set before inheriting any eclasses. Defaults to 
'never'.
+WEBKIT_REQUIRED="${WEBKIT_REQUIRED:-never}"
+
 # @ECLASS-VARIABLE: CPPUNIT_REQUIRED
 # @DESCRIPTION:
 # Is cppunit required for tests? Possible values are 'always', 'optional' and 
'never'.
@@ -258,6 +264,22 @@ case ${MULTIMEDIA_REQUIRED} in
 esac
 unset qtmultimediadepend
 
+# WebKit dependencies
+qtwebkitdepend="
+       >=dev-qt/qtwebkit-${QT_MINIMAL}:4
+"
+case ${WEBKIT_REQUIRED} in
+       always)
+               COMMONDEPEND+=" ${qtwebkitdepend}"
+               ;;
+       optional)
+               IUSE+=" +webkit"
+               COMMONDEPEND+=" webkit? ( ${qtwebkitdepend} )"
+               ;;
+       *) ;;
+esac
+unset qtwebkitdepend
+
 # CppUnit dependencies
 cppuintdepend="
        dev-util/cppunit
@@ -287,11 +309,17 @@ kdecommondepend="
        >=dev-qt/qtsql-${QT_MINIMAL}:4[qt3support]
        >=dev-qt/qtsvg-${QT_MINIMAL}:4
        >=dev-qt/qttest-${QT_MINIMAL}:4
-       >=dev-qt/qtwebkit-${QT_MINIMAL}:4
 "
 
 if [[ ${PN} != kdelibs ]]; then
-       kdecommondepend+=" $(add_kdebase_dep kdelibs)"
+       local _kdelibsuse
+       case ${WEBKIT_REQUIRED} in
+               always) _kdelibsuse="webkit" ;;
+               optional) _kdelibsuse="webkit?" ;;
+               *) ;;
+       esac
+       kdecommondepend+=" || ( $(add_kdebase_dep kdelibs "${_kdelibsuse}" 
4.14.22) <kde-base/kdelibs-4.14.22 )"
+       unset _kdelibsuse
        if [[ ${KDEBASE} = kdevelop ]]; then
                if [[ ${PN} != kdevplatform ]]; then
                        # @ECLASS-VARIABLE: KDEVPLATFORM_REQUIRED