fix build of kde 4.2.71

6 files changed, 12 insertions, 5 deletions

diff --git a/kde-base/libkdepim/ChangeLog b/kde-base/libkdepim/ChangeLog
index 8d5c6850678..e85ea62c978 100644
--- a/kde-base/libkdepim/ChangeLog
+++ b/kde-base/libkdepim/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  02 May 2009; Alexey Shvetsov <alexxy@gentoo.org> libkdepim-4.2.71.ebuild:
+  fix idl0r issue
+
   01 May 2009; Alexey Shvetsov <alexxy@gentoo.org> -libkdepim-4.2.70.ebuild,
   +libkdepim-4.2.71.ebuild:
   Version removed.
diff --git a/kde-base/libkdepim/Manifest b/kde-base/libkdepim/Manifest
index 063c945e2fe..1f404b388ee 100644
--- a/kde-base/libkdepim/Manifest
+++ b/kde-base/libkdepim/Manifest
@@ -1,6 +1,6 @@
 DIST kdepim-4.2.71.tar.lzma 10992809 RMD160 2a61f3a0fcc7619b7c0635be238e7c7425df9784 SHA1 2f26b10f7e549e9d070026bb7fa3a37f12c290da SHA256 85fbbb1931c7286edcdbfa2afc1adb9f69cdbf94638bdcbb70db5c8a086c90ba
-EBUILD libkdepim-4.2.71.ebuild 925 RMD160 aba62bd66b0b4859bf4026b6189acaf6632e4236 SHA1 49cb746645fa11ee392b9dc2ac2b173d4cdb26a4 SHA256 819d919b8830ede257c53175fc5bb2b5b69befd307a95f67daa3bd76135efb0c
+EBUILD libkdepim-4.2.71.ebuild 924 RMD160 640bb098581a56f5b5090f3e13ab230ed0a30da7 SHA1 7b3dd7c84e81c10a3369a7e49451de0b84f8dc6d SHA256 e24d3a0fb274ef518c07ff5694a203994248336df31659e94847d7f00e87e1de
 EBUILD libkdepim-4.2.9999.ebuild 927 RMD160 a944cafa8affc52cd3b396e2081a8eaf218723af SHA1 f39718aa6749acbc72dedc059569b6763079a095 SHA256 cfc3ec04933a15695ed33752bcc76c034dd81c8806d621486497da540e62a10c
 EBUILD libkdepim-9999.ebuild 914 RMD160 8755b43d7928d484e25f6970b292edc7786bf4fc SHA1 635c7453f18c41ada21a903a1fcd026b0f946245 SHA256 14cbba845c7764f7a0fe9949cd46789a9499187cd7ed4d89cf3ec10086c43b4b
-MISC ChangeLog 6775 RMD160 7b1395154a6fa87edf4e3eece3a46741a0e01e64 SHA1 ed32c17a5fd62fcea02b32354c95a0d6873a02ee SHA256 321b845a53e32927f250887f6db4e0a73407812a123b882060587c0ae3515713
+MISC ChangeLog 6870 RMD160 a5bf44c8f106fc4250cfdfa60185ba655608f451 SHA1 5847aa1f713c1d7e1323cf73e1c65c17afc9db5f SHA256 7c24b1710a68216a0c3c1775ae7d769d8fbbaa207499fbe4569bb8fd478304e0
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-base/libkdepim/libkdepim-4.2.71.ebuild b/kde-base/libkdepim/libkdepim-4.2.71.ebuild
index 7dce990a05e..333a447c3d7 100644
--- a/kde-base/libkdepim/libkdepim-4.2.71.ebuild
+++ b/kde-base/libkdepim/libkdepim-4.2.71.ebuild
@@ -29,7 +29,7 @@ src_install() {
 
 	# install additional generated headers that are needed by other packages that
 	# are derived from kdepim. e.g. kmail.
-	pushd "${WORKDIR}/${PN}_build/libkdepim/" 2>/dev/null || die "pushd libkdepim failed"
+	pushd "${WORKDIR}/${P}_build/libkdepim/" 2>/dev/null || die "pushd libkdepim failed"
 	insinto "${PREFIX}/include"
 	doins ui_addresspicker.h ui_categoryselectdialog_base.h || die "Failed to install extra header files."
 	popd 2>/dev/null
diff --git a/kde-base/nepomuk/ChangeLog b/kde-base/nepomuk/ChangeLog
index 21a03a61b30..4a102989265 100644
--- a/kde-base/nepomuk/ChangeLog
+++ b/kde-base/nepomuk/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  02 May 2009; Alexey Shvetsov <alexxy@gentoo.org> nepomuk-4.2.71.ebuild:
+  add block
+
   01 May 2009; Alexey Shvetsov <alexxy@gentoo.org> -nepomuk-4.2.70.ebuild,
   +nepomuk-4.2.71.ebuild:
   Version removed.
diff --git a/kde-base/nepomuk/Manifest b/kde-base/nepomuk/Manifest
index 64586b31805..f0428648a4b 100644
--- a/kde-base/nepomuk/Manifest
+++ b/kde-base/nepomuk/Manifest
@@ -1,6 +1,6 @@
 DIST kdebase-runtime-4.2.71.tar.lzma 6202342 RMD160 4fc65bc76aaf19119f1fd28e08280e31677b0aec SHA1 71c98baa229a6ccab29f081a56cc34461706760e SHA256 5c0a18616d224f7d5a8d6bdce729a98777330742779f68d5ccb7ccf46f4ccba4
-EBUILD nepomuk-4.2.71.ebuild 442 RMD160 c92290e7a6a81f6642d57927f8e629e7d68b8fca SHA1 1aa5bd431adc822ee06f00ff0698bb8a750e466f SHA256 f2789211e766de1d8a363c96d3d72e21de405bf91a7ea22783f9c708ea820f79
+EBUILD nepomuk-4.2.71.ebuild 504 RMD160 40faccf7b480dcc92aa204847e360f9df0942a06 SHA1 81f53434aa723b54dae08834efb1367ffa83ddb1 SHA256 b13c640fdd7fb7d5936725ee30c6144ad8d8c2e23171778dc0d5fa0f342b6908
 EBUILD nepomuk-4.2.9999.ebuild 507 RMD160 917f482e33b6f75ba43b2f4a03762430e7c40cf4 SHA1 b8b182f77c239dd2212aaa5d60edfb5b7cde757e SHA256 493e21da92a0083708353214e20dea67444dd9a4c0a8cdfcabc46afc5d0b36f5
 EBUILD nepomuk-9999.ebuild 431 RMD160 80e94a07805766ec145237a92ab4b7a4e2a3d660 SHA1 10910031c50c094dbbdfcad89fed416e494ef230 SHA256 fec918c6b990d16f3ebfbc4918c5dd8f3b6c4e348a3e70669edb5d0d452ba084
-MISC ChangeLog 7564 RMD160 c9f780ef75ae400d2221adddd23a7273dca852dd SHA1 2ccfa71ac151e2bb66b6fe661b7c00417c9c1e6e SHA256 234ffbb0c5eb07fec03f4e67e23cb8365517178493d22bbe7900b79e6b75eabf
+MISC ChangeLog 7651 RMD160 333e56b16cd273f4633eb2e8409e8da18f4afba5 SHA1 916befdc19766931a38af27f1078926e0cc7ca68 SHA256 c4bfe5f4b78af7541ea8fc900d20d8cff6874456ddea373e26bda0e8ccb57748
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-base/nepomuk/nepomuk-4.2.71.ebuild b/kde-base/nepomuk/nepomuk-4.2.71.ebuild
index b7f165636c8..f82861357cf 100644
--- a/kde-base/nepomuk/nepomuk-4.2.71.ebuild
+++ b/kde-base/nepomuk/nepomuk-4.2.71.ebuild
@@ -17,5 +17,6 @@ DEPEND="
 		dev-libs/soprano[clucene,dbus,raptor,java]
 	)
 	>=kde-base/kdelibs-${PV}:${SLOT}[kdeprefix=,semantic-desktop]
+	!kdeprefix ( !<=kde-base/akonadi-${PV}:${SLOT}[kdeprefix=] )
 "
 RDEPEND="${DEPEND}"