[gentoo-commits] proj/kde:master commit in: kde-base/kdepimlibs/

["Chris Reffett" <geekboy72@gmail.com>]

commit:     26f44c82a25cb159ddf5cf694df9ddaf70548437
Author:     Chris Reffett <creffett <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 23 04:40:59 2012 +0000
Commit:     Chris Reffett <geekboy72 <AT> gmail <DOT> 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
 }