[kde-base/kdepim:4.5] Fix remaining kdepim apps (for now)

13 files changed, 53 insertions, 54 deletions

diff --git a/kde-base/kdepim-libs/Manifest b/kde-base/kdepim-libs/Manifest
index 88e41c7b384..fbf98019243 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 1730 RMD160 4bcb075372cca2f6814484af6274dbd1f2872f6d SHA1 f237f53c172a439b4c0770a61beb2f3f2226a0c7 SHA256 e42d2d4ae2e135abfddac6b35a3f21485ddeedf0902b9287c2b2c7a7bcd546f5
-EBUILD kdepim-libs-9999.ebuild 1664 RMD160 959eeeeff9d29d705210bf736f49657d61d2762c SHA1 27070f8c7602f4937d2f5cba83d69b7fd60e8c37 SHA256 4d0821dc9d01d1a4e30a279ea981e227992d033289c4c819a01036d44e90a098
+EBUILD kdepim-libs-4.4.75.ebuild 1472 RMD160 bb7df93c21336b417e7bb3d9e6c03ae7e696135b SHA1 e5525aab4cd28141a6b6aae878a10ffb4b250701 SHA256 62ef5436994e00a34f99030fa63e6e8a17989aafc55b2ce8b5af290a832ada8c
+EBUILD kdepim-libs-9999.ebuild 1399 RMD160 deec54e63b7e0c23491687c658679dee82e26c77 SHA1 9e7da3714675d87622d659c97449ff5b4aaa0e95 SHA256 7d94a66b1a55d7da8929aca2e4c73e21c69f686c6034f80c52f5ac572901c670
 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 b0f375cd081..8a6fdbe46ee 100644
--- a/kde-base/kdepim-libs/kdepim-libs-4.4.75.ebuild
+++ b/kde-base/kdepim-libs/kdepim-libs-4.4.75.ebuild
@@ -42,7 +42,6 @@ KMEXTRA="
 	libkdepimdbusinterfaces/
 	libkleo/
 	libkpgp/
-	libstickynotes/
 	messagecomposer/
 	messagecore/
 	messagelist/
@@ -62,14 +61,6 @@ KMEXTRACTONLY="
 
 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_configure() {
 	mycmakeargs=(
 		# Set the dbus dirs, otherwise it searches in KDEDIR
diff --git a/kde-base/kdepim-libs/kdepim-libs-9999.ebuild b/kde-base/kdepim-libs/kdepim-libs-9999.ebuild
index a388958340e..0768dca3909 100644
--- a/kde-base/kdepim-libs/kdepim-libs-9999.ebuild
+++ b/kde-base/kdepim-libs/kdepim-libs-9999.ebuild
@@ -42,7 +42,6 @@ KMEXTRA="
 	libkdepimdbusinterfaces/
 	libkleo/
 	libkpgp/
-	libstickynotes/
 	messagecomposer/
 	messagecore/
 	messagelist/
@@ -62,14 +61,6 @@ KMEXTRACTONLY="
 
 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_configure() {
 	mycmakeargs=(
 		# Set the dbus dirs, otherwise it searches in KDEDIR
diff --git a/kde-base/kmail/Manifest b/kde-base/kmail/Manifest
index 403c53fcb7c..29e8ac633b5 100644
--- a/kde-base/kmail/Manifest
+++ b/kde-base/kmail/Manifest
@@ -1,6 +1,5 @@
-AUX generate-kcfg-files.patch 671 RMD160 6f78008967990f4efb521d8fcf5202977829723c SHA1 97865ca098fe10583256ea1f1f372da00e959acf SHA256 ab9c8d706dafbc632c0aa82ae6b8ce6e344a7f48a59a7657efd056d77bc3bbfe
 DIST kdepim-4.4.75.tar.xz 7990416 RMD160 4072b0ab954c5869323bc1b26f37070600b709fe SHA1 8dd940989e16d5ca1c8c72fa239e0c4e39639355 SHA256 1f726105cf596343a8c29634f1f587a40dc31aa725717808acf1eb5152326422
-EBUILD kmail-4.4.75.ebuild 1506 RMD160 9df7cebdf17cd14526f01bed09da22224c793220 SHA1 434be557c9d7f7d93bf91ca8d5b29eebc8a1eee4 SHA256 f5b50c0b02973c9717ce4d02657f5f380236dd8e5828d6db612c963d4c97cb7d
+EBUILD kmail-4.4.75.ebuild 1535 RMD160 cd962008002c5caf2ffa78f65eab5139bf42f499 SHA1 0d77dc75a4db2d855e1b43e8a0e5b23968adda79 SHA256 9e787409295984ece3661a852750cb0a60bda0825585fccbfbf0a5c755e605a3
 EBUILD kmail-4.4.9999.ebuild 1724 RMD160 fe9e338515f0072e8eb08828ad8f1f47f52342d7 SHA1 fe450c1cb09db4cafd73580cbea732ccf42f1e13 SHA256 dd7e8aa0532dc07e213b9edc16a72e09d03faa449527e1eefec7d5a1a515fdf3
-EBUILD kmail-9999.ebuild 1433 RMD160 692d921189e6194d17fc39615d6ed66386058a3b SHA1 c99889f99a6ef9798d27b0d83c1664afd8c010a6 SHA256 4b5fcdd5f79e2f7c3fe8703c158d057c440cd3734be4e90fea3f551b5f38bd23
+EBUILD kmail-9999.ebuild 1462 RMD160 a34c6e672934709251d5363c0306e974bee56b45 SHA1 f8d1f090536ee46353e8ce462b93fccfb6b76374 SHA256 ca27ab5267d07d3db8897a0d070a127d9818b55df74bcd7e078cfe9370b79602
 MISC metadata.xml 279 RMD160 8e4afc55339c16ac4ff11c986a73243696bd9940 SHA1 238511afd59478eb71e701ce58e30a7d8fde1784 SHA256 becb9880c6456e35b6099918612ce90460d9b7555c669f1a970d0e88f7dce28a
diff --git a/kde-base/kmail/files/generate-kcfg-files.patch b/kde-base/kmail/files/generate-kcfg-files.patch
deleted file mode 100644
index da1d23c513d..00000000000
--- a/kde-base/kmail/files/generate-kcfg-files.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- kmail/CMakeLists.txt.orig	2010-04-01 00:45:22.000000000 +0200
-+++ kmail/CMakeLists.txt	2010-04-01 00:45:41.000000000 +0200
-@@ -223,6 +223,13 @@
-   customtemplates_kfg.kcfgc
- )
- 
-+kde4_add_kcfg_files(kmailprivate_LIB_SRCS
-+  ../messagecomposer/messagecomposersettings_base.kcfgc USE_RELATIVE_PATH
-+  ../messageviewer/globalsettings_base.kcfgc USE_RELATIVE_PATH
-+  ../templateparser/customtemplates_kfg.kcfgc USE_RELATIVE_PATH
-+  ../templateparser/globalsettings_base.kcfgc USE_RELATIVE_PATH
-+  ../templateparser/templatesconfiguration_kfg.kcfgc USE_RELATIVE_PATH
-+)
- 
- kde4_add_library(kmailprivate SHARED ${kmailprivate_LIB_SRCS})
- target_link_libraries(kmailprivate
diff --git a/kde-base/kmail/kmail-4.4.75.ebuild b/kde-base/kmail/kmail-4.4.75.ebuild
index e8c6e53fb08..d3b212a9265 100644
--- a/kde-base/kmail/kmail-4.4.75.ebuild
+++ b/kde-base/kmail/kmail-4.4.75.ebuild
@@ -17,9 +17,7 @@ DEPEND="
 	$(add_kdebase_dep korganizer)
 	$(add_kdebase_dep kdepim-libs)
 "
-RDEPEND="${DEPEND}
-	$(add_kdebase_dep kdepim-runtime)
-"
+RDEPEND="${DEPEND}"
 
 add_blocker kmailcvt
 add_blocker libksieve
@@ -29,6 +27,15 @@ KMEXTRACTONLY="
 	akonadi/
 	korganizer/
 	kresources/
+	libkleo/
+	libkpgp/
+"
+KMCOMPILEONLY="
+	messagecomposer/
+	messagecore/
+	messagelist/
+	messageviewer/
+	templateparser/
 "
 KMEXTRA="
 	kmailcvt/
@@ -36,9 +43,8 @@ KMEXTRA="
 	libksieve/
 	ontologies/
 "
-KMLOADLIBS="kdepim-libs"
 
-PATCHES=( "${FILESDIR}/generate-kcfg-files.patch" )
+KMLOADLIBS="kdepim-libs"
 
 src_compile() {
 	# Bug #276377: kontact/ can build before kmail/, causing a dependency not to be built
diff --git a/kde-base/kmail/kmail-9999.ebuild b/kde-base/kmail/kmail-9999.ebuild
index 2800de4b0f0..f9a6f38594e 100644
--- a/kde-base/kmail/kmail-9999.ebuild
+++ b/kde-base/kmail/kmail-9999.ebuild
@@ -17,9 +17,7 @@ DEPEND="
 	$(add_kdebase_dep korganizer)
 	$(add_kdebase_dep kdepim-libs)
 "
-RDEPEND="${DEPEND}
-	$(add_kdebase_dep kdepim-runtime)
-"
+RDEPEND="${DEPEND}"
 
 add_blocker kmailcvt
 add_blocker libksieve
@@ -29,6 +27,15 @@ KMEXTRACTONLY="
 	akonadi/
 	korganizer/
 	kresources/
+	libkleo/
+	libkpgp/
+"
+KMCOMPILEONLY="
+	messagecomposer/
+	messagecore/
+	messagelist/
+	messageviewer/
+	templateparser/
 "
 KMEXTRA="
 	kmailcvt/
@@ -36,9 +43,8 @@ KMEXTRA="
 	libksieve/
 	ontologies/
 "
-KMLOADLIBS="kdepim-libs"
 
-PATCHES=( "${FILESDIR}/generate-kcfg-files.patch" )
+KMLOADLIBS="kdepim-libs"
 
 src_compile() {
 	# Bug #276377: kontact/ can build before kmail/, causing a dependency not to be built
diff --git a/kde-base/knode/Manifest b/kde-base/knode/Manifest
index 08f507a8c92..7e9da9609c3 100644
--- a/kde-base/knode/Manifest
+++ b/kde-base/knode/Manifest
@@ -1,5 +1,5 @@
 DIST kdepim-4.4.75.tar.xz 7990416 RMD160 4072b0ab954c5869323bc1b26f37070600b709fe SHA1 8dd940989e16d5ca1c8c72fa239e0c4e39639355 SHA256 1f726105cf596343a8c29634f1f587a40dc31aa725717808acf1eb5152326422
-EBUILD knode-4.4.75.ebuild 588 RMD160 19ad8c5465a6f74a0130ea78a2130ed6b7641809 SHA1 514921f789393aacea682edbd794d2bb1be0737f SHA256 1f1a9f8eedea077534e37f929caff352f9abafc495b249d55d8b227319f2c355
+EBUILD knode-4.4.75.ebuild 661 RMD160 8f947fcebd47ddfba857b0c0e440bc172abe7fbf SHA1 aa3cdbcb03f0bd8e2c2066f8098d766ce6d27d21 SHA256 bdf08141f23ef7744322288aab3752304a796a2e77792e0d1f08e0f8a82b55ec
 EBUILD knode-4.4.9999.ebuild 568 RMD160 301f4c882e2654569b855c96ef9a9d38a9389cdb SHA1 04c2e439dae228b44570ad1ca58154f1cb8b6730 SHA256 14a85135c2e7bcb0aa400e5ff1839e2911bf5629b64f4eb6428d5b73a545bf45
-EBUILD knode-9999.ebuild 515 RMD160 c2fd6c5b24cb67761a8a1a22df01126925d18b9d SHA1 2dec467726bb3d048a3d4843df43e5a1ad9b439f SHA256 46399c7a14fae4cadbb932b485dd7eaf8bbf2b4a25cdfd787d62698565adecac
+EBUILD knode-9999.ebuild 588 RMD160 9bf6b36f1f9f945ae88b78a14fd80306b03b7f2f SHA1 5cd2ee329c7f46af4a5eec6c580c4772f48db3c5 SHA256 9efcd5876122f2a65dee712a8f23f6ae2ed2e6ee31294801a925bca3c40746e1
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-base/knode/knode-4.4.75.ebuild b/kde-base/knode/knode-4.4.75.ebuild
index be64e75321a..bd91f8180de 100644
--- a/kde-base/knode/knode-4.4.75.ebuild
+++ b/kde-base/knode/knode-4.4.75.ebuild
@@ -20,6 +20,13 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+KMEXTRACTONLY="
+	libkleo/
+	libkpgp/
+	messagecomposer/
+	messageviewer/
+"
+
 KMLOADLIBS="kdepim-libs"
 
 src_unpack() {
diff --git a/kde-base/knode/knode-9999.ebuild b/kde-base/knode/knode-9999.ebuild
index eb7bd645437..a7dbcee2d52 100644
--- a/kde-base/knode/knode-9999.ebuild
+++ b/kde-base/knode/knode-9999.ebuild
@@ -20,6 +20,13 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+KMEXTRACTONLY="
+	libkleo/
+	libkpgp/
+	messagecomposer/
+	messageviewer/
+"
+
 KMLOADLIBS="kdepim-libs"
 
 src_unpack() {
diff --git a/kde-base/korganizer/Manifest b/kde-base/korganizer/Manifest
index 9d5f46f8964..16f207d12c1 100644
--- a/kde-base/korganizer/Manifest
+++ b/kde-base/korganizer/Manifest
@@ -1,6 +1,6 @@
 AUX korganizer-4.4.75_missing_header.patch 383 RMD160 93dc7b6ab8362682917264785a7dfe358149ccff SHA1 b01f22b42c5fcb31a7a77cf474e52e5093caa67d SHA256 c49a3849686f456302372d7614508e1094c21b3e2977acaabaf25a38f34c16ab
 DIST kdepim-4.4.75.tar.xz 7990416 RMD160 4072b0ab954c5869323bc1b26f37070600b709fe SHA1 8dd940989e16d5ca1c8c72fa239e0c4e39639355 SHA256 1f726105cf596343a8c29634f1f587a40dc31aa725717808acf1eb5152326422
-EBUILD korganizer-4.4.75.ebuild 1155 RMD160 a4fe42fde5d34fae6d857a8cb79bdebbf904781c SHA1 663497b6a1da46f0ed2ba76081fae0d282087ffa SHA256 8b6f7c6bd0348cb1d778273e6d11d4f1cab1c09cfa26552f12cc26bc2279ecde
+EBUILD korganizer-4.4.75.ebuild 1190 RMD160 7896ba0ce12f3e83207d5f02af1ba547ee9b4027 SHA1 6bad714c6be1b8111e487298d6cff40d0aab480b SHA256 0247f63ab55dc6a0bd44552e00fea1263f68d36e93aa8d43c64e2dc67f1a8647
 EBUILD korganizer-4.4.9999.ebuild 996 RMD160 8a0c110038e95eb0c33bd80ae82207f4ac99bafe SHA1 a4d9bceebacef5aa74ef5409b10118f799cb482d SHA256 a1e2b41fbecbaf8707ee1b5576cf4801f4b2c356ffba765a246e69a44f2f2d07
-EBUILD korganizer-9999.ebuild 1026 RMD160 a2ccb2abba8aa3c2f98dec8136340719bae57947 SHA1 2eca77add4e038913f99452a08d7ef340e533acd SHA256 c369757ad324aa852e2eae9ac85c4e572370a14c5f9bfd5f6f158af57a33e167
+EBUILD korganizer-9999.ebuild 1117 RMD160 53aa34c64eac07527a331f7fb5a1af86818336b6 SHA1 3e75f4a640778569bfb73f44aaf62a4893d9fe78 SHA256 0fcb0993793d43bc9ca16006360c402500edf0defe3f47efcc576f86633fa595
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-base/korganizer/korganizer-4.4.75.ebuild b/kde-base/korganizer/korganizer-4.4.75.ebuild
index 8af1b759a29..79e931319fc 100644
--- a/kde-base/korganizer/korganizer-4.4.75.ebuild
+++ b/kde-base/korganizer/korganizer-4.4.75.ebuild
@@ -29,13 +29,15 @@ KMEXTRA="kdgantt1"
 
 # xml targets from kmail are being uncommented by kde4-meta.eclass
 KMEXTRACTONLY="
+	akonadi/
+	incidenceeditors/
 	kmail/
 	knode/org.kde.knode.xml
 	libkdepimdbusinterfaces/
 "
 
 PATCHES=(
-			"${FILESDIR}/${P}_missing_header.patch"
+	"${FILESDIR}/${PN}-4.4.75_missing_header.patch"
 )
 
 src_unpack() {
diff --git a/kde-base/korganizer/korganizer-9999.ebuild b/kde-base/korganizer/korganizer-9999.ebuild
index b52a6a020de..025796ca3d1 100644
--- a/kde-base/korganizer/korganizer-9999.ebuild
+++ b/kde-base/korganizer/korganizer-9999.ebuild
@@ -29,11 +29,17 @@ KMEXTRA="kdgantt1"
 
 # xml targets from kmail are being uncommented by kde4-meta.eclass
 KMEXTRACTONLY="
+	akonadi/
+	incidenceeditors/
 	kmail/
 	knode/org.kde.knode.xml
 	libkdepimdbusinterfaces/
 "
 
+PATCHES=(
+	"${FILESDIR}/${PN}-4.4.75_missing_header.patch"
+)
+
 src_unpack() {
 	if use kontact; then
 		KMEXTRA="${KMEXTRA}