From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id EF25013825D for ; Fri, 13 May 2016 16:55:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D3363E07C7; Fri, 13 May 2016 16:55:24 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6E3CFE07B3 for ; Fri, 13 May 2016 16:55:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A84CD3409B7 for ; Fri, 13 May 2016 16:55:22 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8029196A for ; Fri, 13 May 2016 16:55:19 +0000 (UTC) From: "Johannes Huber" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Johannes Huber" Message-ID: <1463158503.a976c8e79c6eb6f95009ffbb10e76f0215edf622.johu@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: eclass/ X-VCS-Repository: proj/kde X-VCS-Files: eclass/kde5.eclass X-VCS-Directories: eclass/ X-VCS-Committer: johu X-VCS-Committer-Name: Johannes Huber X-VCS-Revision: a976c8e79c6eb6f95009ffbb10e76f0215edf622 X-VCS-Branch: master Date: Fri, 13 May 2016 16:55:19 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: e195b433-867a-4f6e-9a4d-b2a5a16bfd69 X-Archives-Hash: a264f7fc0d50b003df31180607316fa5 commit: a976c8e79c6eb6f95009ffbb10e76f0215edf622 Author: Andreas Sturmlechner gmail com> AuthorDate: Thu May 12 22:37:31 2016 +0000 Commit: Johannes Huber gentoo 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 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 }