commit: ae78e6a0f92cf78bf94df2348c34df5ed6435c6b
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat Feb 20 13:00:51 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Feb 23 14:20:36 2016 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=ae78e6a0
kde-apps/kdepim: Add back (R)DEPENDs
gpgmepp: plugins/kaddressbook/editorpages
libkleo: plugins/messageviewer/bodypartformatter/calendar
libktnef: plugins/messageviewer/bodypartformatter/ms-tnef
Improve kleopatra handbook removal.
Package-Manager: portage-2.2.27
.../{kdepim-15.12.2.ebuild => kdepim-15.12.2-r1.ebuild} | 12 ++++++++++--
kde-apps/kdepim/kdepim-15.12.49.9999.ebuild | 12 ++++++++++--
kde-apps/kdepim/kdepim-9999.ebuild | 2 ++
3 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/kde-apps/kdepim/kdepim-15.12.2.ebuild
b/kde-apps/kdepim/kdepim-15.12.2-r1.ebuild
similarity index 94%
rename from kde-apps/kdepim/kdepim-15.12.2.ebuild
rename to kde-apps/kdepim/kdepim-15.12.2-r1.ebuild
index 73e4131..5d6f8a4 100644
--- a/kde-apps/kdepim/kdepim-15.12.2.ebuild
+++ b/kde-apps/kdepim/kdepim-15.12.2-r1.ebuild
@@ -85,7 +85,9 @@ COMMON_DEPEND="
$(add_kdeapps_dep libgravatar)
$(add_kdeapps_dep libkdepim)
$(add_kdeapps_dep libkdepimdbusinterfaces)
+ $(add_kdeapps_dep libkleo)
$(add_kdeapps_dep libksieve)
+ $(add_kdeapps_dep libktnef)
$(add_kdeapps_dep libsendlater)
$(add_kdeapps_dep mailcommon)
$(add_kdeapps_dep mailimporter)
@@ -113,13 +115,13 @@ COMMON_DEPEND="
media-libs/phonon[qt5]
kdepim_features_kleopatra? (
$(add_kdeapps_dep gpgmepp)
- $(add_kdeapps_dep libkleo)
>=app-crypt/gpgme-1.3.2
dev-libs/libassuan
dev-libs/libgpg-error
)
"
DEPEND="${COMMON_DEPEND}
+ $(add_kdeapps_dep gpgmepp)
sys-devel/gettext
test? (
$(add_kdeapps_dep akonadi sqlite)
@@ -158,12 +160,18 @@ src_prepare() {
sed -i \
-e "/akregator/ s/^/#DONT/" \
-e "/blogilo/ s/^/#DONT/" \
- -e "/kleopatra/ s/^/#DONT/" \
-e "/knotes/ s/^/#DONT/" \
-e "/konsolekalendar/ s/^/#DONT/" \
-e "/ktnef/ s/^/#DONT/" \
doc/CMakeLists.txt || die "Failed to disable split docs"
+ if ! use kdepim_features_kleopatra ; then
+ sed -i \
+ -e "/kleopatra/ s/^/#DONT/" \
+ -e "/kwatchgnupg/ s/^/#DONT/" \
+ doc/CMakeLists.txt || die "Failed to disable kleopatra
docs"
+ fi
+
# applications
for pim_ft in ${PIM_FTS}; do
use kdepim_features_${pim_ft} || cmake_comment_add_subdirectory
${pim_ft}
diff --git a/kde-apps/kdepim/kdepim-15.12.49.9999.ebuild
b/kde-apps/kdepim/kdepim-15.12.49.9999.ebuild
index 16b4f32..1c6d3f3 100644
--- a/kde-apps/kdepim/kdepim-15.12.49.9999.ebuild
+++ b/kde-apps/kdepim/kdepim-15.12.49.9999.ebuild
@@ -85,7 +85,9 @@ COMMON_DEPEND="
$(add_kdeapps_dep libgravatar)
$(add_kdeapps_dep libkdepim)
$(add_kdeapps_dep libkdepimdbusinterfaces)
+ $(add_kdeapps_dep libkleo)
$(add_kdeapps_dep libksieve)
+ $(add_kdeapps_dep libktnef)
$(add_kdeapps_dep libsendlater)
$(add_kdeapps_dep mailcommon)
$(add_kdeapps_dep mailimporter)
@@ -113,13 +115,13 @@ COMMON_DEPEND="
media-libs/phonon[qt5]
kdepim_features_kleopatra? (
$(add_kdeapps_dep gpgmepp)
- $(add_kdeapps_dep libkleo)
>=app-crypt/gpgme-1.3.2
dev-libs/libassuan
dev-libs/libgpg-error
)
"
DEPEND="${COMMON_DEPEND}
+ $(add_kdeapps_dep gpgmepp)
sys-devel/gettext
test? (
$(add_kdeapps_dep akonadi sqlite)
@@ -158,12 +160,18 @@ src_prepare() {
sed -i \
-e "/akregator/ s/^/#DONT/" \
-e "/blogilo/ s/^/#DONT/" \
- -e "/kleopatra/ s/^/#DONT/" \
-e "/knotes/ s/^/#DONT/" \
-e "/konsolekalendar/ s/^/#DONT/" \
-e "/ktnef/ s/^/#DONT/" \
doc/CMakeLists.txt || die "Failed to disable split docs"
+ if ! use kdepim_features_kleopatra ; then
+ sed -i \
+ -e "/kleopatra/ s/^/#DONT/" \
+ -e "/kwatchgnupg/ s/^/#DONT/" \
+ doc/CMakeLists.txt || die "Failed to disable kleopatra
docs"
+ fi
+
# applications
for pim_ft in ${PIM_FTS}; do
use kdepim_features_${pim_ft} || cmake_comment_add_subdirectory
${pim_ft}
diff --git a/kde-apps/kdepim/kdepim-9999.ebuild
b/kde-apps/kdepim/kdepim-9999.ebuild
index b511cb0..e0f4e45 100644
--- a/kde-apps/kdepim/kdepim-9999.ebuild
+++ b/kde-apps/kdepim/kdepim-9999.ebuild
@@ -82,6 +82,7 @@ COMMON_DEPEND="
$(add_kdeapps_dep kpimtextedit)
$(add_kdeapps_dep libgravatar)
$(add_kdeapps_dep libkdepim)
+ $(add_kdeapps_dep libkleo)
$(add_kdeapps_dep libksieve)
$(add_kdeapps_dep mailcommon)
$(add_kdeapps_dep mailimporter)
@@ -140,6 +141,7 @@ src_prepare() {
-e "/knotes/ s/^/#DONT/" \
-e "/konsolekalendar/ s/^/#DONT/" \
-e "/ktnef/ s/^/#DONT/" \
+ -e "/kwatchgnupg/ s/^/#DONT/" \
doc/CMakeLists.txt || die "Failed to disable split docs"
# applications
