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 3215C138206 for ; Wed, 27 Apr 2016 07:45:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7EAD821C028; Wed, 27 Apr 2016 07:45:30 +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 E301221C012 for ; Wed, 27 Apr 2016 07:45:29 +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 CAC493409EC for ; Wed, 27 Apr 2016 07:45:28 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 37B5E969 for ; Wed, 27 Apr 2016 07:45:26 +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: <1461743106.0a153dd2b6875b48e8558081e9efe0c387c5c78a.johu@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-misc/zanshin/ X-VCS-Repository: proj/kde X-VCS-Files: kde-misc/zanshin/zanshin-0.4.0.ebuild kde-misc/zanshin/zanshin-9999.ebuild X-VCS-Directories: kde-misc/zanshin/ X-VCS-Committer: johu X-VCS-Committer-Name: Johannes Huber X-VCS-Revision: 0a153dd2b6875b48e8558081e9efe0c387c5c78a X-VCS-Branch: master Date: Wed, 27 Apr 2016 07:45:26 +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: bf574881-45cf-4b39-a520-368f5b93b2c8 X-Archives-Hash: 472aac8cf8623366a6733b28b3ed877a commit: 0a153dd2b6875b48e8558081e9efe0c387c5c78a Author: Andreas Sturmlechner gmail com> AuthorDate: Tue Apr 26 18:10:38 2016 +0000 Commit: Johannes Huber gentoo 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 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 "