[gentoo-commits] proj/kde:master commit in: eclass/

[Johannes Huber]

commit:     a976c8e79c6eb6f95009ffbb10e76f0215edf622
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Thu May 12 22:37:31 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Fri May 13 16:55:03 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=a976c8e7

kde5.eclass: Drop KDE_PIM_KONTACTPLUGIN handling

Signed-off-by: Johannes Huber <johu <AT> gentoo.org>

 eclass/kde5.eclass | 27 +--------------------------
 1 file changed, 1 insertion(+), 26 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 54c3e3d..0731fd8 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -114,13 +114,6 @@ fi
 # subdirectories that need to be present for a successful build.
 : ${KDE_PIM_KEEP_SUBDIR:=}
 
-# @ECLASS-VARIABLE: KDE_PIM_KONTACTPLUGIN
-# @DESCRIPTION:
-# This variable is used when building a split package from KMNAME="kdepim".
-# If set to "true", add "+kontact" to IUSE and add the appropriate dependency.
-# If set to "false", find plugin subdir and remove it from build.
-: ${KDE_PIM_KONTACTPLUGIN:=false}
-
 # @ECLASS-VARIABLE: KDE_PUNT_BOGUS_DEPS
 # @DESCRIPTION:
 # If set to "false", do nothing.
@@ -230,14 +223,6 @@ case ${KDE_HANDBOOK} in
                ;;
 esac
 
-case ${KDE_PIM_KONTACTPLUGIN} in
-       true)
-               IUSE+=" +kontact"
-               DEPEND+=" $(add_kdeapps_dep kontactinterface)"
-               ;;
-       *)      ;;
-esac
-
 case ${KDE_TEST} in
        false)  ;;
        *)
@@ -566,7 +551,7 @@ kde5_src_prepare() {
                sed -e "/find_package(KF5/ s/ REQUIRED//" \
                        -e "/find_package(Qt5 / s/ REQUIRED/ 
OPTIONAL_COMPONENTS/" \
                        -i CMakeLists.txt || die "Failed to make dependencies 
optional"
-               # FIXME: try to push these down into subdirs @upstream
+
                # AkonadiSearch:        kaddressbook, knotes, kdepim (kmail, 
korganizer)
                # Grantlee:                     akregator, kaddressbook, 
knotes, kdepim (grantleeeditor, kmail, kontact)
                sed -e "/set_package_properties(KF5AkonadiSearch/ s/ REQUIRED/ 
OPTIONAL/" \
@@ -607,16 +592,6 @@ kde5_src_prepare() {
                        fi
                done
                popd > /dev/null || die
-
-               # disable build of kontactplugin in split kdepim packages
-               if ! use_if_iuse kontact ; then
-                       for x in $(find ./ -name CMakeLists.txt -exec grep -l 
"add_subdirectory.*kontactplugin" "{}" ";"); do
-                               einfo "Disabling kontactplugin in: ${x}"
-                               pushd $(dirname "${x}") > /dev/null || die
-                               cmake_comment_add_subdirectory kontactplugin
-                               popd > /dev/null || die
-                       done
-               fi
        fi
 }