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 075801381F3 for ; Fri, 23 Nov 2012 04:41:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 24E9121C001; Fri, 23 Nov 2012 04:41:28 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 99A5221C001 for ; Fri, 23 Nov 2012 04:41:27 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 90EA433D777 for ; Fri, 23 Nov 2012 04:41:26 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 1143FE5436 for ; Fri, 23 Nov 2012 04:41:25 +0000 (UTC) From: "Chris Reffett" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Chris Reffett" Message-ID: <1353645659.26f44c82a25cb159ddf5cf694df9ddaf70548437.creffett@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-base/kdepimlibs/ X-VCS-Repository: proj/kde X-VCS-Files: kde-base/kdepimlibs/kdepimlibs-9999.ebuild X-VCS-Directories: kde-base/kdepimlibs/ X-VCS-Committer: creffett X-VCS-Committer-Name: Chris Reffett X-VCS-Revision: 26f44c82a25cb159ddf5cf694df9ddaf70548437 X-VCS-Branch: master Date: Fri, 23 Nov 2012 04:41:25 +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: 64e911ab-4408-4034-b96a-5a62a4725b7b X-Archives-Hash: 5ac9657cf3ed7ab5ab535efde43e1864 commit: 26f44c82a25cb159ddf5cf694df9ddaf70548437 Author: Chris Reffett gentoo org> AuthorDate: Fri Nov 23 04:40:59 2012 +0000 Commit: Chris Reffett gmail com> CommitDate: Fri Nov 23 04:40:59 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=26f44c82 [kde-base/kdepimlibs] Also add collision fixes to live version Package-Manager: portage-2.2.0_alpha142 --- kde-base/kdepimlibs/kdepimlibs-9999.ebuild | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/kde-base/kdepimlibs/kdepimlibs-9999.ebuild b/kde-base/kdepimlibs/kdepimlibs-9999.ebuild index ca29624..227c711 100644 --- a/kde-base/kdepimlibs/kdepimlibs-9999.ebuild +++ b/kde-base/kdepimlibs/kdepimlibs-9999.ebuild @@ -17,6 +17,7 @@ IUSE="debug ldap prison semantic-desktop" RESTRICT="test" DEPEND=" + !kde-misc/akonadi-social-utils >=app-crypt/gpgme-1.1.6 >=dev-libs/boost-1.35.0-r5 dev-libs/libgpg-error @@ -72,4 +73,5 @@ src_configure() { src_install() { kde4-base_src_install rm "${D}"/usr/share/apps/cmake/modules/FindQJSON.cmake + rm "${D}"/usr/share/apps/cmake/modules/FindQtOAuth.cmake #Collides with net-im/choqok }