| 1 |
commit: 26f44c82a25cb159ddf5cf694df9ddaf70548437 |
| 2 |
Author: Chris Reffett <creffett <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Nov 23 04:40:59 2012 +0000 |
| 4 |
Commit: Chris Reffett <geekboy72 <AT> gmail <DOT> com> |
| 5 |
CommitDate: Fri Nov 23 04:40:59 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=26f44c82 |
| 7 |
|
| 8 |
[kde-base/kdepimlibs] Also add collision fixes to live version |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.0_alpha142 |
| 11 |
|
| 12 |
--- |
| 13 |
kde-base/kdepimlibs/kdepimlibs-9999.ebuild | 2 ++ |
| 14 |
1 files changed, 2 insertions(+), 0 deletions(-) |
| 15 |
|
| 16 |
diff --git a/kde-base/kdepimlibs/kdepimlibs-9999.ebuild b/kde-base/kdepimlibs/kdepimlibs-9999.ebuild |
| 17 |
index ca29624..227c711 100644 |
| 18 |
--- a/kde-base/kdepimlibs/kdepimlibs-9999.ebuild |
| 19 |
+++ b/kde-base/kdepimlibs/kdepimlibs-9999.ebuild |
| 20 |
@@ -17,6 +17,7 @@ IUSE="debug ldap prison semantic-desktop" |
| 21 |
RESTRICT="test" |
| 22 |
|
| 23 |
DEPEND=" |
| 24 |
+ !kde-misc/akonadi-social-utils |
| 25 |
>=app-crypt/gpgme-1.1.6 |
| 26 |
>=dev-libs/boost-1.35.0-r5 |
| 27 |
dev-libs/libgpg-error |
| 28 |
@@ -72,4 +73,5 @@ src_configure() { |
| 29 |
src_install() { |
| 30 |
kde4-base_src_install |
| 31 |
rm "${D}"/usr/share/apps/cmake/modules/FindQJSON.cmake |
| 32 |
+ rm "${D}"/usr/share/apps/cmake/modules/FindQtOAuth.cmake #Collides with net-im/choqok |
| 33 |
} |
Archives