[kde-base/kaddressbook,kalarm,kdepim-libs,kjots,kleopatra] Fix some kdepim:4.5 ebuilds, kjots still have unresolved file collision issue

15 files changed, 73 insertions, 51 deletions

diff --git a/kde-base/kaddressbook/Manifest b/kde-base/kaddressbook/Manifest
index 6177b9de7f5..903cacb2cc7 100644
--- a/kde-base/kaddressbook/Manifest
+++ b/kde-base/kaddressbook/Manifest
@@ -1,5 +1,5 @@
 DIST kdepim-4.4.75.tar.xz 7990416 RMD160 4072b0ab954c5869323bc1b26f37070600b709fe SHA1 8dd940989e16d5ca1c8c72fa239e0c4e39639355 SHA256 1f726105cf596343a8c29634f1f587a40dc31aa725717808acf1eb5152326422
-EBUILD kaddressbook-4.4.75.ebuild 791 RMD160 315712f15e35f41401aadb785724d0a14ac6a24c SHA1 23432ffb56690beb6674605220b9cd9bbd66fdf3 SHA256 baa4928789707c946c9eea42d008644448b57831601efadc3c7cba28847fa35a
+EBUILD kaddressbook-4.4.75.ebuild 793 RMD160 a789303eeed7fae8481e29d7809513399a7e2c64 SHA1 c74fb2b9bbee94b8c1d0ab04492128da52d6db5e SHA256 802dadd09577af63386fc7607ee3b8247643753748ee9edb7f423efae2e3f1ed
 EBUILD kaddressbook-4.4.9999.ebuild 770 RMD160 369e76994fc80093af3f7e3de30fc3de9907a350 SHA1 a69036d04be6968e2cc677bafd419826d456f1d4 SHA256 5d25d0d5af61a65e9f19b3bd76e62f5c13c6d9853084c10982510cd7be1d840d
-EBUILD kaddressbook-9999.ebuild 718 RMD160 de44654c92e74a832647d190154d676622a72362 SHA1 219eac0f3269ad316eb45e6c403add3912972559 SHA256 aa1de9a690565884e9a1ad75e9926bfb0b46d053b3ab10fb5e180d9fb8d19fa3
+EBUILD kaddressbook-9999.ebuild 720 RMD160 9fcc56e63d0b35a7ed1e5d2df7114d1c9d7238cf SHA1 364e38af1d9b9d9908274e15bf0eb973066e08be SHA256 43f4ade0a1327188ade93d508cfda66f815e7303ede83cc367deac8f3b356a2c
 MISC metadata.xml 267 RMD160 d8062a20042efd5c1c8471fe72d395d5f233172a SHA1 7dc839167883c5f3dca58dd101f28d4e3d74f20c SHA256 767eee971926a02fe48e50c4d2373b94d993857d993026a537011b62d0ad4e49
diff --git a/kde-base/kaddressbook/kaddressbook-4.4.75.ebuild b/kde-base/kaddressbook/kaddressbook-4.4.75.ebuild
index 888cb71bf6d..7e82b08502a 100644
--- a/kde-base/kaddressbook/kaddressbook-4.4.75.ebuild
+++ b/kde-base/kaddressbook/kaddressbook-4.4.75.ebuild
@@ -16,14 +16,16 @@ DEPEND="
 	$(add_kdebase_dep kdepimlibs 'akonadi')
 	$(add_kdebase_dep kdepim-libs)
 "
-RDEPEND="${DEPEND}
-	$(add_kdebase_dep kdepim-runtime)
-"
+RDEPEND="${DEPEND}"
 
 KMEXTRA="
 	plugins/kaddressbook/
 	plugins/ktexteditor/
 "
+KMEXTRACTONLY="
+	akonadi/
+	libkleo/
+"
 
 KMLOADLIBS="kdepim-libs"
 
diff --git a/kde-base/kaddressbook/kaddressbook-9999.ebuild b/kde-base/kaddressbook/kaddressbook-9999.ebuild
index f62d8f5c8cf..6050ebf7f79 100644
--- a/kde-base/kaddressbook/kaddressbook-9999.ebuild
+++ b/kde-base/kaddressbook/kaddressbook-9999.ebuild
@@ -16,14 +16,16 @@ DEPEND="
 	$(add_kdebase_dep kdepimlibs 'akonadi')
 	$(add_kdebase_dep kdepim-libs)
 "
-RDEPEND="${DEPEND}
-	$(add_kdebase_dep kdepim-runtime)
-"
+RDEPEND="${DEPEND}"
 
 KMEXTRA="
 	plugins/kaddressbook/
 	plugins/ktexteditor/
 "
+KMEXTRACTONLY="
+	akonadi/
+	libkleo/
+"
 
 KMLOADLIBS="kdepim-libs"
 
diff --git a/kde-base/kalarm/Manifest b/kde-base/kalarm/Manifest
index 06675565da1..603fecaae66 100644
--- a/kde-base/kalarm/Manifest
+++ b/kde-base/kalarm/Manifest
@@ -1,5 +1,5 @@
 DIST kdepim-4.4.75.tar.xz 7990416 RMD160 4072b0ab954c5869323bc1b26f37070600b709fe SHA1 8dd940989e16d5ca1c8c72fa239e0c4e39639355 SHA256 1f726105cf596343a8c29634f1f587a40dc31aa725717808acf1eb5152326422
-EBUILD kalarm-4.4.75.ebuild 656 RMD160 5fba07adf39f7494a70eed9748c15fa94ff4c8a6 SHA1 6138efb597ba5fc0eee871f5f6c0e2f85c433599 SHA256 1ee7f6ce9815cbad9f6a9042b571869eba6f324968b66e93e16799b0fb11a944
+EBUILD kalarm-4.4.75.ebuild 588 RMD160 c4a45fb789b8511e4639e8511d3db4ac575c419e SHA1 d0e79d5ff90e1a7dce86d8e3518eee9cf81384d5 SHA256 3a9932f33eb549d070f12ef54b1d343fc97802d69ec22dbb6c022c6d69ae0469
 EBUILD kalarm-4.4.9999.ebuild 581 RMD160 0dd6de3455392c4ad673e6db7024cf3e928bd9f4 SHA1 cc68314c92173db261e79fc42a7288a3de1c81da SHA256 61cc5a9aca508012232339772eccff59e2706ee8e7af06669618f678884331a7
-EBUILD kalarm-9999.ebuild 583 RMD160 e54c2a80a20226997e22ab124146d0b505d71b53 SHA1 db5375ae32a0424ba9b6942c7941eea089994c59 SHA256 51066e70feabd0ca395645d0265000ad4fb7e04fa7f2fd9ef8ec92f0cf7550cf
+EBUILD kalarm-9999.ebuild 515 RMD160 0f33dbaa685b23668705129d7c0153d0a71e98c2 SHA1 e8d8476a8d8079acc0d9c4e5570e58eb64a06229 SHA256 70050fb9a2b501c695c6e9fc75cf79a4edc88f01787fbc65e6be052bf5e5fb7b
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-base/kalarm/kalarm-4.4.75.ebuild b/kde-base/kalarm/kalarm-4.4.75.ebuild
index 0ee66d579ad..5121169f458 100644
--- a/kde-base/kalarm/kalarm-4.4.75.ebuild
+++ b/kde-base/kalarm/kalarm-4.4.75.ebuild
@@ -14,11 +14,9 @@ IUSE="debug +handbook"
 RDEPEND="
 	$(add_kdebase_dep kdepimlibs 'akonadi')
 	$(add_kdebase_dep kdepim-libs)
+	media-sound/phonon
 "
-DEPEND="${RDEPEND}
-	dev-libs/boost
-	dev-libs/libxslt
-"
+DEPEND="${RDEPEND}"
 
 KMEXTRACTONLY="
 	kmail/
@@ -27,7 +25,7 @@ KMEXTRACTONLY="
 src_configure() {
 	mycmakeargs=(
 		-DBUILD_akonadi=OFF
-		-DXSLTPROC_EXECUTABLE="${EPREFIX}"/usr/bin/xsltproc
 	)
+
 	kde4-meta_src_configure
 }
diff --git a/kde-base/kalarm/kalarm-9999.ebuild b/kde-base/kalarm/kalarm-9999.ebuild
index 7e14197d509..b9bbcb5d642 100644
--- a/kde-base/kalarm/kalarm-9999.ebuild
+++ b/kde-base/kalarm/kalarm-9999.ebuild
@@ -14,11 +14,9 @@ IUSE="debug +handbook"
 RDEPEND="
 	$(add_kdebase_dep kdepimlibs 'akonadi')
 	$(add_kdebase_dep kdepim-libs)
+	media-sound/phonon
 "
-DEPEND="${RDEPEND}
-	dev-libs/boost
-	dev-libs/libxslt
-"
+DEPEND="${RDEPEND}"
 
 KMEXTRACTONLY="
 	kmail/
@@ -27,7 +25,7 @@ KMEXTRACTONLY="
 src_configure() {
 	mycmakeargs=(
 		-DBUILD_akonadi=OFF
-		-DXSLTPROC_EXECUTABLE="${EPREFIX}"/usr/bin/xsltproc
 	)
+
 	kde4-meta_src_configure
 }
diff --git a/kde-base/kdepim-libs/Manifest b/kde-base/kdepim-libs/Manifest
index d451afff89e..88e41c7b384 100644
--- a/kde-base/kdepim-libs/Manifest
+++ b/kde-base/kdepim-libs/Manifest
@@ -1,4 +1,4 @@
 DIST kdepim-4.4.75.tar.xz 7990416 RMD160 4072b0ab954c5869323bc1b26f37070600b709fe SHA1 8dd940989e16d5ca1c8c72fa239e0c4e39639355 SHA256 1f726105cf596343a8c29634f1f587a40dc31aa725717808acf1eb5152326422
-EBUILD kdepim-libs-4.4.75.ebuild 1267 RMD160 bf57d16f7b4a579f52372124d19bf023a214ef06 SHA1 2e1ae9151c52576dafcc1d0a4bb718f5fe1959e8 SHA256 8dbba1b805dca177b1728d66716c9c98202603423bc9899a6890e0e0dacd405f
-EBUILD kdepim-libs-9999.ebuild 1631 RMD160 45f2ecedf5423b20ddb0f37bacb53ca1d7800c5d SHA1 a06ac8807659d0f6208827637d5f12a54327dce3 SHA256 889e7e97749111c55dfa5cdcf5e0063bd809140868664a9a8e84074e52f5958f
+EBUILD kdepim-libs-4.4.75.ebuild 1730 RMD160 4bcb075372cca2f6814484af6274dbd1f2872f6d SHA1 f237f53c172a439b4c0770a61beb2f3f2226a0c7 SHA256 e42d2d4ae2e135abfddac6b35a3f21485ddeedf0902b9287c2b2c7a7bcd546f5
+EBUILD kdepim-libs-9999.ebuild 1664 RMD160 959eeeeff9d29d705210bf736f49657d61d2762c SHA1 27070f8c7602f4937d2f5cba83d69b7fd60e8c37 SHA256 4d0821dc9d01d1a4e30a279ea981e227992d033289c4c819a01036d44e90a098
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-base/kdepim-libs/kdepim-libs-4.4.75.ebuild b/kde-base/kdepim-libs/kdepim-libs-4.4.75.ebuild
index 145a6a53ce6..b0f375cd081 100644
--- a/kde-base/kdepim-libs/kdepim-libs-4.4.75.ebuild
+++ b/kde-base/kdepim-libs/kdepim-libs-4.4.75.ebuild
@@ -14,13 +14,17 @@ IUSE="debug"
 
 DEPEND="
 	app-crypt/gpgme
+	>=app-office/akonadi-server-1.3.60
+	$(add_kdebase_dep kdelibs 'semantic-desktop')
 	$(add_kdebase_dep kdepimlibs 'akonadi')
 "
 RDEPEND="${DEPEND}
 	app-crypt/gnupg
+	$(add_kdebase_dep kdepim-runtime)
 "
 
 # @Since >4.4.76 merged here
+add_blocker akonadi
 add_blocker libkdepim
 add_blocker libkleo
 add_blocker libkpgp
@@ -31,33 +35,47 @@ add_blocker messageviewer
 add_blocker templateparser
 
 KMEXTRA="
+	akonadi/
+	calendarviews/
 	incidenceeditors/
 	libkdepim/
 	libkdepimdbusinterfaces/
 	libkleo/
 	libkpgp/
+	libstickynotes/
 	messagecomposer/
 	messagecore/
 	messagelist/
 	messageviewer/
+	ontologies/
 	templateparser/
 "
 
 KMEXTRACTONLY="
+	kdgantt1/
 	kleopatra/
 	kmail/
 	knode/org.kde.knode.xml
 	korganizer/korgac/org.kde.korganizer.KOrgac.xml
 	korganizer/org.kde.korganizer.Korganizer.xml
-	ontologies/
 "
 
 KMSAVELIBS="true"
 
-#src_prepare() {
-#	kde4-meta_src_prepare
-#
-#	sed -n -e '/qt4_generate_dbus_interface(.*org\.kde\.kmail\.\(kmail\|mailcomposer\)\.xml/p' \
-#		-e '/add_custom_target(kmail_xml /,/)/p' \
-#		-i kmail/CMakeLists.txt || die "uncommenting xml failed"
-#}
+src_prepare() {
+	kde4-meta_src_prepare
+
+	sed -n -e '/qt4_generate_dbus_interface(.*org\.kde\.kmail\.\(kmail\|mailcomposer\)\.xml/p' \
+		-e '/add_custom_target(kmail_xml /,/)/p' \
+		-i kmail/CMakeLists.txt || die "uncommenting xml failed"
+}
+
+src_configure() {
+	mycmakeargs=(
+		# Set the dbus dirs, otherwise it searches in KDEDIR
+		-DAKONADI_DBUS_INTERFACES_INSTALL_DIR="${EPREFIX}/usr/share/dbus-1/interfaces"
+		-DAKONADI_DBUS_SERVICES_INSTALL_DIR="${EPREFIX}/usr/share/dbus-1/services"
+	)
+
+	kde4-meta_src_configure
+}
diff --git a/kde-base/kdepim-libs/kdepim-libs-9999.ebuild b/kde-base/kdepim-libs/kdepim-libs-9999.ebuild
index 44f6238b153..a388958340e 100644
--- a/kde-base/kdepim-libs/kdepim-libs-9999.ebuild
+++ b/kde-base/kdepim-libs/kdepim-libs-9999.ebuild
@@ -36,15 +36,18 @@ add_blocker templateparser
 
 KMEXTRA="
 	akonadi/
+	calendarviews/
 	incidenceeditors/
 	libkdepim/
 	libkdepimdbusinterfaces/
 	libkleo/
 	libkpgp/
+	libstickynotes/
 	messagecomposer/
 	messagecore/
 	messagelist/
 	messageviewer/
+	ontologies/
 	templateparser/
 "
 
@@ -55,7 +58,6 @@ KMEXTRACTONLY="
 	knode/org.kde.knode.xml
 	korganizer/korgac/org.kde.korganizer.KOrgac.xml
 	korganizer/org.kde.korganizer.Korganizer.xml
-	ontologies/
 "
 
 KMSAVELIBS="true"
diff --git a/kde-base/kjots/Manifest b/kde-base/kjots/Manifest
index e744fd9ecc6..a8844dddc07 100644
--- a/kde-base/kjots/Manifest
+++ b/kde-base/kjots/Manifest
@@ -1,5 +1,5 @@
 DIST kdepim-4.4.75.tar.xz 7990416 RMD160 4072b0ab954c5869323bc1b26f37070600b709fe SHA1 8dd940989e16d5ca1c8c72fa239e0c4e39639355 SHA256 1f726105cf596343a8c29634f1f587a40dc31aa725717808acf1eb5152326422
-EBUILD kjots-4.4.75.ebuild 442 RMD160 cc3f23697fbd5e11260880255d401cb6e249ff29 SHA1 5bdab3ecba212a313e46bf8793128e080a8e9f06 SHA256 ecbe7214c453df5dcd2cc6b2cd14485e443a241518e9d39d5cce0ef7a3210609
+EBUILD kjots-4.4.75.ebuild 484 RMD160 6a57d2f7e5d34aeeb326a5dc2c36bd95d26d2887 SHA1 ee87e86c94bfdb97b80d7e629e41b5fffbae8bbc SHA256 0938ae61715f0467cf73ebf1c5c23fec572a5d98b6ad42f3bc9a988760567cc0
 EBUILD kjots-4.4.9999.ebuild 302 RMD160 014a1199f8bd6bd6d155b71100a958be80687227 SHA1 360e3af9f04f7f47c36d1979a27c018f8d58f53c SHA256 eb19cca7f05ff7433d382287feeafc29778c3806285bde0ca1bf232922338918
-EBUILD kjots-9999.ebuild 369 RMD160 7b9c9851872ae52857dffb4a75047f990ebdf0bb SHA1 8a89e8222a7da32460675cce9d306c7470e67ed9 SHA256 789bee0c1ff3db91b699593a194327aa31b73617bcdd8ba93713195c4cd6f708
+EBUILD kjots-9999.ebuild 411 RMD160 6195b4d5f7b6e1acc24acd7946c2fb8f9bb32f95 SHA1 d9341f01af772c94d77139bb8e1f7d40a45aad9d SHA256 e1999efd9064bec2cbc86aed642a48274cd200dda79c973a18c4b19ecc0dec86
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-base/kjots/kjots-4.4.75.ebuild b/kde-base/kjots/kjots-4.4.75.ebuild
index 8110ff6bdfa..677e67fd92c 100644
--- a/kde-base/kjots/kjots-4.4.75.ebuild
+++ b/kde-base/kjots/kjots-4.4.75.ebuild
@@ -17,3 +17,7 @@ DEPEND="
 	$(add_kdebase_dep kdepim-libs)
 "
 RDEPEND="${DEPEND}"
+
+KMEXTRACTONLY="
+	akonadi/akonadi_next/
+"
diff --git a/kde-base/kjots/kjots-9999.ebuild b/kde-base/kjots/kjots-9999.ebuild
index 77b6b0028df..d737ef60171 100644
--- a/kde-base/kjots/kjots-9999.ebuild
+++ b/kde-base/kjots/kjots-9999.ebuild
@@ -17,3 +17,7 @@ DEPEND="
 	$(add_kdebase_dep kdepim-libs)
 "
 RDEPEND="${DEPEND}"
+
+KMEXTRACTONLY="
+	akonadi/akonadi_next/
+"
diff --git a/kde-base/kleopatra/Manifest b/kde-base/kleopatra/Manifest
index ba7789de1ac..48d2c2622a0 100644
--- a/kde-base/kleopatra/Manifest
+++ b/kde-base/kleopatra/Manifest
@@ -1,5 +1,5 @@
 DIST kdepim-4.4.75.tar.xz 7990416 RMD160 4072b0ab954c5869323bc1b26f37070600b709fe SHA1 8dd940989e16d5ca1c8c72fa239e0c4e39639355 SHA256 1f726105cf596343a8c29634f1f587a40dc31aa725717808acf1eb5152326422
-EBUILD kleopatra-4.4.75.ebuild 682 RMD160 7ad6a326e758891663411c01485c6985fd4af22b SHA1 766ab9f9aa1c1e9c909d4b619a1b1836cf0526f4 SHA256 dff588c43bc231fa436107abb9a82f635d901ef0d2301fc2b37ae53868931789
+EBUILD kleopatra-4.4.75.ebuild 643 RMD160 797f8509dcaacbb936eb39d6225a87093dbc415a SHA1 f01feaeb59eae75321924f46a306948bf899d3d9 SHA256 f424659d85ca1bb217e82ea00780bbcfa2afd7d3a0198e58c6ae57950c9f8ddb
 EBUILD kleopatra-4.4.9999.ebuild 684 RMD160 f3a76f102cf115d481cb1673b52a496fa1c4f8f5 SHA1 2ab13cf0bf4e47d98b6a861cdd8776fbfc0360e0 SHA256 6a50eef1bc70f74dd42e48509dd83e24266303288e271c712bea7afe21e5229a
-EBUILD kleopatra-9999.ebuild 609 RMD160 250fdd3bdaab459098ad231ec7f7bce52ef87177 SHA1 db17d9966084bde1dfbcde5806e71d76ea2c4807 SHA256 918f3a64498367baee47f6d865375343260ed6a546a6744a1e34d05d3fb04259
+EBUILD kleopatra-9999.ebuild 570 RMD160 99fd80ef1f1da114357030931f881f28a55f228e SHA1 f6b2a6fafd63f608b9aa57b4ff580e035826b451 SHA256 3458dee2102ab91faedb95c1d381659f95a5634cf05d51027a008df3ebfc50ec
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-base/kleopatra/kleopatra-4.4.75.ebuild b/kde-base/kleopatra/kleopatra-4.4.75.ebuild
index 79c9b2e2114..c8a1e5942f9 100644
--- a/kde-base/kleopatra/kleopatra-4.4.75.ebuild
+++ b/kde-base/kleopatra/kleopatra-4.4.75.ebuild
@@ -13,6 +13,7 @@ IUSE="debug +handbook"
 
 DEPEND="
 	app-crypt/gpgme
+	dev-libs/boost
 	dev-libs/libassuan
 	dev-libs/libgpg-error
 	$(add_kdebase_dep kdepimlibs)
@@ -22,6 +23,10 @@ RDEPEND="${DEPEND}
 	app-crypt/gnupg
 "
 
+KMEXTRACTONLY="
+	libkleo/
+"
+
 src_unpack() {
 	if use handbook; then
 		KMEXTRA="
@@ -31,11 +36,3 @@ src_unpack() {
 
 	kde4-meta_src_unpack
 }
-
-src_configure() {
-	mycmakeargs=(
-		-DWITH_QGPGME=ON
-	)
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/kleopatra/kleopatra-9999.ebuild b/kde-base/kleopatra/kleopatra-9999.ebuild
index e992dcdc27a..f9f14ca286a 100644
--- a/kde-base/kleopatra/kleopatra-9999.ebuild
+++ b/kde-base/kleopatra/kleopatra-9999.ebuild
@@ -13,6 +13,7 @@ IUSE="debug +handbook"
 
 DEPEND="
 	app-crypt/gpgme
+	dev-libs/boost
 	dev-libs/libassuan
 	dev-libs/libgpg-error
 	$(add_kdebase_dep kdepimlibs)
@@ -22,6 +23,10 @@ RDEPEND="${DEPEND}
 	app-crypt/gnupg
 "
 
+KMEXTRACTONLY="
+	libkleo/
+"
+
 src_unpack() {
 	if use handbook; then
 		KMEXTRA="
@@ -31,11 +36,3 @@ src_unpack() {
 
 	kde4-meta_src_unpack
 }
-
-src_configure() {
-	mycmakeargs=(
-		-DWITH_QGPGME=ON
-	)
-
-	kde4-meta_src_configure
-}