summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexey Shvetsov <alexxy@gentoo.org>2009-05-04 11:37:49 +0400
committerAlexey Shvetsov <alexxy@gentoo.org>2009-05-04 11:37:49 +0400
commit26feb0d716bf9d1b231d233892bbbc72d6126793 (patch)
treefd1c2106ff952fc391cac66c3d6163c303a9e456
parentce620e6332fa0c63a10d1199ebab3d3b127c7aa1 (diff)
downloadkde-26feb0d716bf9d1b231d233892bbbc72d6126793.tar.gz
kde-26feb0d716bf9d1b231d233892bbbc72d6126793.tar.bz2
kde-26feb0d716bf9d1b231d233892bbbc72d6126793.zip
fix akonadi
-rw-r--r--kde-base/akonadi/Manifest2
-rw-r--r--kde-base/akonadi/akonadi-4.2.71.ebuild7
2 files changed, 8 insertions, 1 deletions
diff --git a/kde-base/akonadi/Manifest b/kde-base/akonadi/Manifest
index 48a37b2401a..c008847b17c 100644
--- a/kde-base/akonadi/Manifest
+++ b/kde-base/akonadi/Manifest
@@ -1,5 +1,5 @@
DIST kdepim-4.2.71.tar.lzma 10992809 RMD160 2a61f3a0fcc7619b7c0635be238e7c7425df9784 SHA1 2f26b10f7e549e9d070026bb7fa3a37f12c290da SHA256 85fbbb1931c7286edcdbfa2afc1adb9f69cdbf94638bdcbb70db5c8a086c90ba
-EBUILD akonadi-4.2.71.ebuild 1974 RMD160 95143c2347d1421f0a72943b6534890495b2bb17 SHA1 32dd1a0e9d8c8af2bd7296ec06bc08826fc42324 SHA256 63b9d1272d7e44fce6d1a60c9a18d6c991a2b22c8bf612f37ba5c314cfee04c4
+EBUILD akonadi-4.2.71.ebuild 2196 RMD160 f4603ccc4add7913862a3a6c89242109600ba051 SHA1 eddb3fbc90036ac3829d498ac7f08bef1223322c SHA256 6cd959c93c1ed06ebcb9ddb497d42485cee76fcc4071983fa63b14b229301fae
EBUILD akonadi-4.2.9999.ebuild 1970 RMD160 7e19e948a8f9b4978422ad0fc794273c58f001da SHA1 ccef11bcc1a8245f977f3e5506b9c237103b56ee SHA256 14e12997fd571c27a66b1e7c678299adf40a777aa03f10fc93421e3f63f2927f
EBUILD akonadi-9999.ebuild 2185 RMD160 6637ef5eaca52ed5945fc9ae1e0f7f2375981ddc SHA1 90581e2cff422dba28e6a4eb87080af136d1731d SHA256 004c4bb527bad18b886bca3affb0a6bb8050ee700d6ce9faff1050290cb76ff4
MISC ChangeLog 8238 RMD160 0a2a60442493ddeb3d739984f4ee23a3ee52b682 SHA1 c64b8d7e70a0db5850c396e292a689008514f8f6 SHA256 bd2ccc470ec56e3c3484264a19fd888301d1ddf3c8a2641987bca8c1a4c5191c
diff --git a/kde-base/akonadi/akonadi-4.2.71.ebuild b/kde-base/akonadi/akonadi-4.2.71.ebuild
index 091018d415c..9a2418ef7df 100644
--- a/kde-base/akonadi/akonadi-4.2.71.ebuild
+++ b/kde-base/akonadi/akonadi-4.2.71.ebuild
@@ -60,6 +60,13 @@ src_configure() {
kde4-meta_src_configure
}
+src_install() {
+ kde4-meta_src_install
+ # colliding files with nepomuk
+ rm -rf "${D}"/${KDEDIR}/share/apps/nepomuk/ontologies/nmo.{desktop,trig}
+ rm -rf "${D}"/${KDEDIR}/share/apps/nepomuk/ontologies/nco.{desktop,trig}
+}
+
src_test() {
# disable broken test
sed -i -e '/mailserializerplugintest/ s/^/#DO_NOT_RUN_TEST /' \