commit: 4d3c84cdf22a099a8f3eeaab7ac4e649ceb6aa2f
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Tue Apr 19 07:53:33 2016 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> 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 <johu <AT> 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() {
