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 96FE4138CD3 for ; Sat, 6 Jun 2015 18:18:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3C8C6E0848; Sat, 6 Jun 2015 18:18:54 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D74B6E0848 for ; Sat, 6 Jun 2015 18:18:53 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 15EBB33FD3F for ; Sat, 6 Jun 2015 18:18:53 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 46BF9A14 for ; Sat, 6 Jun 2015 18:18:50 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1433614708.5d16b7dd6dba1d77f55d7c336a5002fad873d457.kensington@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-base/kdepim-common-libs/ X-VCS-Repository: proj/kde X-VCS-Files: kde-base/kdepim-common-libs/kdepim-common-libs-4.9999.ebuild kde-base/kdepim-common-libs/metadata.xml X-VCS-Directories: kde-base/kdepim-common-libs/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: 5d16b7dd6dba1d77f55d7c336a5002fad873d457 X-VCS-Branch: master Date: Sat, 6 Jun 2015 18:18:50 +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: 5ed81207-a4e6-4e0d-b0d9-85b87e456274 X-Archives-Hash: e961766b565c7088b0dfff9f3c01c191 commit: 5d16b7dd6dba1d77f55d7c336a5002fad873d457 Author: Michael Palimaka gentoo org> AuthorDate: Sat Jun 6 18:18:28 2015 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Sat Jun 6 18:18:28 2015 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=5d16b7dd [kde-base/kdepim-common-libs] Introduce google USE flag to avoid automagic dependency wrt bug #550888. Package-Manager: portage-2.2.20 kde-base/kdepim-common-libs/kdepim-common-libs-4.9999.ebuild | 11 ++++++++++- kde-base/kdepim-common-libs/metadata.xml | 3 +++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/kde-base/kdepim-common-libs/kdepim-common-libs-4.9999.ebuild b/kde-base/kdepim-common-libs/kdepim-common-libs-4.9999.ebuild index 45ddf2a..ee74c39 100644 --- a/kde-base/kdepim-common-libs/kdepim-common-libs-4.9999.ebuild +++ b/kde-base/kdepim-common-libs/kdepim-common-libs-4.9999.ebuild @@ -11,7 +11,7 @@ inherit kde4-meta DESCRIPTION="Common libraries for KDE PIM apps" KEYWORDS="" -IUSE="debug" +IUSE="debug google" DEPEND=" app-crypt/gpgme @@ -19,6 +19,7 @@ DEPEND=" dev-libs/grantlee:0 $(add_kdebase_dep baloo '' 4.14.3) $(add_kdebase_dep kdepimlibs) + google? ( net-libs/libkgapi:4 ) " RDEPEND="${DEPEND} !kde-base/akonadi:4 @@ -82,3 +83,11 @@ src_prepare() { sed -e '/folderarchiveagent.desktop/d' \ -i agents/CMakeLists.txt || die } + +src_configure() { + local mycmakeargs=( + $(cmake-utils_use_find_package google LibKGAPI2) + ) + + kde4-meta_src_configure +} diff --git a/kde-base/kdepim-common-libs/metadata.xml b/kde-base/kdepim-common-libs/metadata.xml index a23f444..5d980cd 100644 --- a/kde-base/kdepim-common-libs/metadata.xml +++ b/kde-base/kdepim-common-libs/metadata.xml @@ -2,4 +2,7 @@ kde + + Google service integration via net-libs/libkgapi +