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 2BFC759CB5 for ; Wed, 20 Apr 2016 19:09:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9547321C01D; Wed, 20 Apr 2016 19:09:29 +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 23B9121C01D for ; Wed, 20 Apr 2016 19:09:27 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 D75163408C7 for ; Wed, 20 Apr 2016 19:09:26 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B0F57188 for ; Wed, 20 Apr 2016 19:09:22 +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: <1461179350.4d3c84cdf22a099a8f3eeaab7ac4e649ceb6aa2f.johu@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/kdepim/ X-VCS-Repository: proj/kde X-VCS-Files: kde-apps/kdepim/kdepim-16.04.0.ebuild kde-apps/kdepim/kdepim-16.04.49.9999.ebuild kde-apps/kdepim/kdepim-9999.ebuild X-VCS-Directories: kde-apps/kdepim/ X-VCS-Committer: johu X-VCS-Committer-Name: Johannes Huber X-VCS-Revision: 4d3c84cdf22a099a8f3eeaab7ac4e649ceb6aa2f X-VCS-Branch: master Date: Wed, 20 Apr 2016 19:09:22 +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: 7b57686d-be27-4ae4-b305-9b5d8035707b X-Archives-Hash: 46092e3cb96adf8b836b65e553173fdc commit: 4d3c84cdf22a099a8f3eeaab7ac4e649ceb6aa2f Author: Andreas Sturmlechner gmail com> AuthorDate: Tue Apr 19 07:53:33 2016 +0000 Commit: Johannes Huber gentoo org> CommitDate: Wed Apr 20 19:09:10 2016 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=4d3c84cd kde-apps/kdepim: Remove ambiguity IUSE vs. KDEPIM_FEATURES wrt kontact Package-Manager: portage-2.2.27 Signed-off-by: Johannes Huber gentoo.org> kde-apps/kdepim/kdepim-16.04.0.ebuild | 12 +++++++++--- kde-apps/kdepim/kdepim-16.04.49.9999.ebuild | 12 +++++++++--- kde-apps/kdepim/kdepim-9999.ebuild | 12 +++++++++--- 3 files changed, 27 insertions(+), 9 deletions(-) diff --git a/kde-apps/kdepim/kdepim-16.04.0.ebuild b/kde-apps/kdepim/kdepim-16.04.0.ebuild index 0fd9a88..e999920 100644 --- a/kde-apps/kdepim/kdepim-16.04.0.ebuild +++ b/kde-apps/kdepim/kdepim-16.04.0.ebuild @@ -4,7 +4,7 @@ EAPI=6 -PIM_FTS="kalarm kmail kontact korganizer" +PIM_FTS="kalarm kmail korganizer" FRAMEWORKS_MINIMAL="5.19.0" KDE_HANDBOOK="true" @@ -127,12 +127,16 @@ RDEPEND="${COMMON_DEPEND} " # kontact: summary plugin; kalarm: email scheduler REQUIRED_USE=" - kdepim_features_kontact? ( kdepim_features_kmail ) + kontact? ( kdepim_features_kmail ) kdepim_features_kalarm? ( kdepim_features_kmail ) " src_prepare() { - kde5_src_prepare + if use kontact ; then + KDE_PIM_KEEP_SUBDIR="${KDE_PIM_KEEP_SUBDIR} kontact" + else + cmake_comment_add_subdirectory kontact + fi sed -i \ -e "/akregator/ s/^/#DONT/" \ @@ -146,6 +150,8 @@ src_prepare() { for pim_ft in ${PIM_FTS}; do use kdepim_features_${pim_ft} || cmake_comment_add_subdirectory ${pim_ft} done + + kde5_src_prepare } src_configure() { diff --git a/kde-apps/kdepim/kdepim-16.04.49.9999.ebuild b/kde-apps/kdepim/kdepim-16.04.49.9999.ebuild index bb97118..31bd21b 100644 --- a/kde-apps/kdepim/kdepim-16.04.49.9999.ebuild +++ b/kde-apps/kdepim/kdepim-16.04.49.9999.ebuild @@ -4,7 +4,7 @@ EAPI=6 -PIM_FTS="kalarm kmail kontact korganizer" +PIM_FTS="kalarm kmail korganizer" FRAMEWORKS_MINIMAL="5.19.0" KDE_HANDBOOK="true" @@ -127,12 +127,16 @@ RDEPEND="${COMMON_DEPEND} " # kontact: summary plugin; kalarm: email scheduler REQUIRED_USE=" - kdepim_features_kontact? ( kdepim_features_kmail ) + kontact? ( kdepim_features_kmail ) kdepim_features_kalarm? ( kdepim_features_kmail ) " src_prepare() { - kde5_src_prepare + if use kontact ; then + KDE_PIM_KEEP_SUBDIR="${KDE_PIM_KEEP_SUBDIR} kontact" + else + cmake_comment_add_subdirectory kontact + fi sed -i \ -e "/akregator/ s/^/#DONT/" \ @@ -146,6 +150,8 @@ src_prepare() { for pim_ft in ${PIM_FTS}; do use kdepim_features_${pim_ft} || cmake_comment_add_subdirectory ${pim_ft} done + + kde5_src_prepare } src_configure() { diff --git a/kde-apps/kdepim/kdepim-9999.ebuild b/kde-apps/kdepim/kdepim-9999.ebuild index 9d050c1..1766c5e 100644 --- a/kde-apps/kdepim/kdepim-9999.ebuild +++ b/kde-apps/kdepim/kdepim-9999.ebuild @@ -4,7 +4,7 @@ EAPI=6 -PIM_FTS="kalarm kmail kontact korganizer" +PIM_FTS="kalarm kmail korganizer" FRAMEWORKS_MINIMAL="5.19.0" KDE_HANDBOOK="true" @@ -125,12 +125,16 @@ RDEPEND="${COMMON_DEPEND} " # kontact: summary plugin; kalarm: email scheduler REQUIRED_USE=" - kdepim_features_kontact? ( kdepim_features_kmail ) + kontact? ( kdepim_features_kmail ) kdepim_features_kalarm? ( kdepim_features_kmail ) " src_prepare() { - kde5_src_prepare + if use kontact ; then + KDE_PIM_KEEP_SUBDIR="${KDE_PIM_KEEP_SUBDIR} kontact" + else + cmake_comment_add_subdirectory kontact + fi sed -i \ -e "/akregator/ s/^/#DONT/" \ @@ -144,6 +148,8 @@ src_prepare() { for pim_ft in ${PIM_FTS}; do use kdepim_features_${pim_ft} || cmake_comment_add_subdirectory ${pim_ft} done + + kde5_src_prepare } src_configure() {