diff options
| author | Andreas Sturmlechner <andreas.sturmlechner@gmail.com> | 2016-05-13 00:37:31 +0200 |
|---|---|---|
| committer | Johannes Huber <johu@gentoo.org> | 2016-05-13 18:55:03 +0200 |
| commit | a976c8e79c6eb6f95009ffbb10e76f0215edf622 (patch) | |
| tree | cd853fd44854238cf4811911f1a58bd992897f15 | |
| parent | e0849a96ea1507755b96367577c61768984b5568 (diff) | |
| download | kde-a976c8e79c6eb6f95009ffbb10e76f0215edf622.tar.gz kde-a976c8e79c6eb6f95009ffbb10e76f0215edf622.tar.bz2 kde-a976c8e79c6eb6f95009ffbb10e76f0215edf622.zip | |
kde5.eclass: Drop KDE_PIM_KONTACTPLUGIN handling
Signed-off-by: Johannes Huber <johu@gentoo.org>
| -rw-r--r-- | eclass/kde5.eclass | 27 |
1 files changed, 1 insertions, 26 deletions
diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass index 54c3e3de3b9..0731fd84b2f 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 } |