[gentoo-commits] proj/kde:master commit in: kde-misc/zanshin/

["Johannes Huber" <johu@gentoo.org>]

commit:     0a153dd2b6875b48e8558081e9efe0c387c5c78a
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Tue Apr 26 18:10:38 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Apr 27 07:45:06 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=0a153dd2

kde-misc/zanshin: Version bump to 0.4.0, fix deps

Package-Manager: portage-2.2.28

Signed-off-by: Johannes Huber <johu <AT> gentoo.org>

 .../zanshin/{zanshin-9999.ebuild => zanshin-0.4.0.ebuild}     | 11 ++++++++---
 kde-misc/zanshin/zanshin-9999.ebuild                          |  9 +++++++--
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/kde-misc/zanshin/zanshin-9999.ebuild b/kde-misc/zanshin/zanshin-0.4.0.ebuild
similarity index 83%
copy from kde-misc/zanshin/zanshin-9999.ebuild
copy to kde-misc/zanshin/zanshin-0.4.0.ebuild
index 959946c..e9be325 100644
--- a/kde-misc/zanshin/zanshin-9999.ebuild
+++ b/kde-misc/zanshin/zanshin-0.4.0.ebuild
@@ -11,13 +11,14 @@ inherit kde5
 
 DESCRIPTION="Getting things done application by KDE"
 HOMEPAGE="https://zanshin.kde.org/"
+[[ ${KDE_BUILD_TYPE} != live ]] && SRC_URI="http://files.kde.org/zanshin/${P}.tar.bz2"
 
 LICENSE="|| ( GPL-2 GPL-3 )"
-KEYWORDS=""
+KEYWORDS="~amd64"
 IUSE=""
 
 # FIXME: bundles libkdepim
-RDEPEND="
+COMMON_DEPEND="
 	$(add_frameworks_dep kcodecs)
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
@@ -42,6 +43,7 @@ RDEPEND="
 	$(add_kdeapps_dep kidentitymanagement)
 	$(add_kdeapps_dep kldap)
 	$(add_kdeapps_dep kmime)
+	$(add_kdeapps_dep kontactinterface)
 	$(add_qt_dep qtdbus)
 	$(add_qt_dep qtdeclarative)
 	$(add_qt_dep qtgui)
@@ -49,6 +51,9 @@ RDEPEND="
 	$(add_qt_dep qtwidgets)
 	dev-libs/boost
 "
-DEPEND="${RDEPEND}
+DEPEND="${COMMON_DEPEND}
+	test? ( $(add_kdeapps_dep akonadi 'tools') )
+"
+RDEPEND="${COMMON_DEPEND}
 	!kde-misc/zanshin:4
 "

diff --git a/kde-misc/zanshin/zanshin-9999.ebuild b/kde-misc/zanshin/zanshin-9999.ebuild
index 959946c..4fb9039 100644
--- a/kde-misc/zanshin/zanshin-9999.ebuild
+++ b/kde-misc/zanshin/zanshin-9999.ebuild
@@ -11,13 +11,14 @@ inherit kde5
 
 DESCRIPTION="Getting things done application by KDE"
 HOMEPAGE="https://zanshin.kde.org/"
+[[ ${KDE_BUILD_TYPE} != live ]] && SRC_URI="http://files.kde.org/zanshin/${P}.tar.bz2"
 
 LICENSE="|| ( GPL-2 GPL-3 )"
 KEYWORDS=""
 IUSE=""
 
 # FIXME: bundles libkdepim
-RDEPEND="
+COMMON_DEPEND="
 	$(add_frameworks_dep kcodecs)
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
@@ -42,6 +43,7 @@ RDEPEND="
 	$(add_kdeapps_dep kidentitymanagement)
 	$(add_kdeapps_dep kldap)
 	$(add_kdeapps_dep kmime)
+	$(add_kdeapps_dep kontactinterface)
 	$(add_qt_dep qtdbus)
 	$(add_qt_dep qtdeclarative)
 	$(add_qt_dep qtgui)
@@ -49,6 +51,9 @@ RDEPEND="
 	$(add_qt_dep qtwidgets)
 	dev-libs/boost
 "
-DEPEND="${RDEPEND}
+DEPEND="${COMMON_DEPEND}
+	test? ( $(add_kdeapps_dep akonadi 'tools') )
+"
+RDEPEND="${COMMON_DEPEND}
 	!kde-misc/zanshin:4
 "