[kde-base/kdepimlibs:4.5] Rename akonadi USE flag to semantic-desktop (consistency), update ebuild (needs Nepomuk)

47 files changed, 126 insertions, 180 deletions

diff --git a/kde-base/kaddressbook/Manifest b/kde-base/kaddressbook/Manifest
index 9fe4c8ef372..6a59947fbf5 100644
--- a/kde-base/kaddressbook/Manifest
+++ b/kde-base/kaddressbook/Manifest
@@ -2,8 +2,8 @@ DIST kdepim-4.4.4.tar.bz2 9354818 RMD160 49a1d471149322f4156634e7e79ed53a5c42bbe
 DIST kdepim-4.4.80.tar.bz2 8709074 RMD160 1b5ef52e86bd5f8e9bee8b1d6d64b3bca4e97877 SHA1 502c23fea7dd4e739360fe7e7f3a5cf5bfd8a266 SHA256 c0375407c08eaad71e7d594d0314eaa93d53578286c55f26fd46949d8831371f
 DIST kdepim-4.4.81.tar.xz 7933116 RMD160 c0a7d403bf6c18de68743038f63e84b22a369ab6 SHA1 8b05688603aa809b9d65a553e15135bae211fa51 SHA256 1eef36a310cd1e98f7fc27e6a183a6495b6ea3d4e3c8d46110cc42e634f50ff7
 EBUILD kaddressbook-4.4.4.ebuild 843 RMD160 f5fe9d9170ae1a07f350a33f9e1a5a924679e7e2 SHA1 cb5b942b5a35871705b3cf279272cb1eab09d0fe SHA256 8b210eda0f6f5a82ccb2ae45c436bda58cacb093d35bc28e5aa079a75153e55f
-EBUILD kaddressbook-4.4.80.ebuild 807 RMD160 51370f8c27388639461dcd7a03efb8d47a4ceac2 SHA1 11b1d4b3b3bbcd0baf790249c4a86ab03469ca9d SHA256 4d6d25f528074b767a64ec270030a4ef1ffd855c977c151515e84251b9156c54
-EBUILD kaddressbook-4.4.81.ebuild 807 RMD160 51370f8c27388639461dcd7a03efb8d47a4ceac2 SHA1 11b1d4b3b3bbcd0baf790249c4a86ab03469ca9d SHA256 4d6d25f528074b767a64ec270030a4ef1ffd855c977c151515e84251b9156c54
+EBUILD kaddressbook-4.4.80.ebuild 816 RMD160 83fd1784409baf3f71d7e482d7fea94625e2db8a SHA1 cdc5bf648991250874a2660dadd986c4982a17f3 SHA256 67badea972167dd39dd400c35f50211295da5fd5996e0d2277174064f4901f73
+EBUILD kaddressbook-4.4.81.ebuild 816 RMD160 83fd1784409baf3f71d7e482d7fea94625e2db8a SHA1 cdc5bf648991250874a2660dadd986c4982a17f3 SHA256 67badea972167dd39dd400c35f50211295da5fd5996e0d2277174064f4901f73
 EBUILD kaddressbook-4.4.9999.ebuild 770 RMD160 369e76994fc80093af3f7e3de30fc3de9907a350 SHA1 a69036d04be6968e2cc677bafd419826d456f1d4 SHA256 5d25d0d5af61a65e9f19b3bd76e62f5c13c6d9853084c10982510cd7be1d840d
-EBUILD kaddressbook-9999.ebuild 734 RMD160 2ad039ce21c48ceb40927156e78b409b0e471729 SHA1 58afe9683f8612e9ffd982b2510cbafc1a84a61c SHA256 be264d6e88e7bc5be4927427c47812961f912058441c2cc0718a596d9b6c9bb2
+EBUILD kaddressbook-9999.ebuild 743 RMD160 1f1bc176458b6bb9f29b419f1872192d051a312e SHA1 90312c5d65cb7b98a0b59f62894cc8f66d93333a SHA256 f3580000e5184cf5ceaa10ee97aa6901e1d78d08ab002cdf0567156de3cade31
 MISC metadata.xml 267 RMD160 d8062a20042efd5c1c8471fe72d395d5f233172a SHA1 7dc839167883c5f3dca58dd101f28d4e3d74f20c SHA256 767eee971926a02fe48e50c4d2373b94d993857d993026a537011b62d0ad4e49
diff --git a/kde-base/kaddressbook/kaddressbook-4.4.80.ebuild b/kde-base/kaddressbook/kaddressbook-4.4.80.ebuild
index 7d90163416b..0f5306555af 100644
--- a/kde-base/kaddressbook/kaddressbook-4.4.80.ebuild
+++ b/kde-base/kaddressbook/kaddressbook-4.4.80.ebuild
@@ -13,7 +13,7 @@ IUSE="debug +handbook"
 
 DEPEND="
 	$(add_kdebase_dep kdelibs 'semantic-desktop')
-	$(add_kdebase_dep kdepimlibs 'akonadi')
+	$(add_kdebase_dep kdepimlibs 'semantic-desktop')
 	$(add_kdebase_dep kdepim-common-libs)
 "
 RDEPEND="${DEPEND}"
diff --git a/kde-base/kaddressbook/kaddressbook-4.4.81.ebuild b/kde-base/kaddressbook/kaddressbook-4.4.81.ebuild
index 7d90163416b..0f5306555af 100644
--- a/kde-base/kaddressbook/kaddressbook-4.4.81.ebuild
+++ b/kde-base/kaddressbook/kaddressbook-4.4.81.ebuild
@@ -13,7 +13,7 @@ IUSE="debug +handbook"
 
 DEPEND="
 	$(add_kdebase_dep kdelibs 'semantic-desktop')
-	$(add_kdebase_dep kdepimlibs 'akonadi')
+	$(add_kdebase_dep kdepimlibs 'semantic-desktop')
 	$(add_kdebase_dep kdepim-common-libs)
 "
 RDEPEND="${DEPEND}"
diff --git a/kde-base/kaddressbook/kaddressbook-9999.ebuild b/kde-base/kaddressbook/kaddressbook-9999.ebuild
index 851cc751884..044817f317c 100644
--- a/kde-base/kaddressbook/kaddressbook-9999.ebuild
+++ b/kde-base/kaddressbook/kaddressbook-9999.ebuild
@@ -13,7 +13,7 @@ IUSE="debug +handbook"
 
 DEPEND="
 	$(add_kdebase_dep kdelibs 'semantic-desktop')
-	$(add_kdebase_dep kdepimlibs 'akonadi')
+	$(add_kdebase_dep kdepimlibs 'semantic-desktop')
 	$(add_kdebase_dep kdepim-common-libs)
 "
 RDEPEND="${DEPEND}"
diff --git a/kde-base/kalarm/Manifest b/kde-base/kalarm/Manifest
index e3753cad221..d2086dc57cf 100644
--- a/kde-base/kalarm/Manifest
+++ b/kde-base/kalarm/Manifest
@@ -2,8 +2,8 @@ DIST kdepim-4.4.4.tar.bz2 9354818 RMD160 49a1d471149322f4156634e7e79ed53a5c42bbe
 DIST kdepim-4.4.80.tar.bz2 8709074 RMD160 1b5ef52e86bd5f8e9bee8b1d6d64b3bca4e97877 SHA1 502c23fea7dd4e739360fe7e7f3a5cf5bfd8a266 SHA256 c0375407c08eaad71e7d594d0314eaa93d53578286c55f26fd46949d8831371f
 DIST kdepim-4.4.81.tar.xz 7933116 RMD160 c0a7d403bf6c18de68743038f63e84b22a369ab6 SHA1 8b05688603aa809b9d65a553e15135bae211fa51 SHA256 1eef36a310cd1e98f7fc27e6a183a6495b6ea3d4e3c8d46110cc42e634f50ff7
 EBUILD kalarm-4.4.4.ebuild 654 RMD160 ff722ab83bbc4c8598f092240a5cb6b74a74df4a SHA1 aa75f9cb96c62f67e6a406628d9adf43cff9a8ab SHA256 a62ca0e22e29f05f40cdde79bbbb2a60efa1b7de9be00297ce954ea4964bac70
-EBUILD kalarm-4.4.80.ebuild 595 RMD160 4f5f3093a045a53a30d8db83f7a039e0b142e1ef SHA1 6e6a60b9a74f8c80ca7a076b759b40e905e7bb1a SHA256 21c6e91f5d11f7accb6dcd101d7f364c9bd8186f4ad4d140bb4ee9faa4ff3885
-EBUILD kalarm-4.4.81.ebuild 595 RMD160 4f5f3093a045a53a30d8db83f7a039e0b142e1ef SHA1 6e6a60b9a74f8c80ca7a076b759b40e905e7bb1a SHA256 21c6e91f5d11f7accb6dcd101d7f364c9bd8186f4ad4d140bb4ee9faa4ff3885
+EBUILD kalarm-4.4.80.ebuild 517 RMD160 1fea8317b57ca31b9b27b9171ba830151011f170 SHA1 4000a93c55e3bc5a3a74530afad4d41dfdff9a60 SHA256 3743c711d09c2f4a870340f13e25c5821546b16161d426b13b5dcbffc5299041
+EBUILD kalarm-4.4.81.ebuild 517 RMD160 1fea8317b57ca31b9b27b9171ba830151011f170 SHA1 4000a93c55e3bc5a3a74530afad4d41dfdff9a60 SHA256 3743c711d09c2f4a870340f13e25c5821546b16161d426b13b5dcbffc5299041
 EBUILD kalarm-4.4.9999.ebuild 581 RMD160 0dd6de3455392c4ad673e6db7024cf3e928bd9f4 SHA1 cc68314c92173db261e79fc42a7288a3de1c81da SHA256 61cc5a9aca508012232339772eccff59e2706ee8e7af06669618f678884331a7
-EBUILD kalarm-9999.ebuild 522 RMD160 8167abba44b7dbf2ab46c3124b8b8dc87ac49c48 SHA1 044e7106b4677970e23128e4b8015ded766d4856 SHA256 1b3cd92ecf06aa7e951cd8f89a41cd65a69b910f0f5c1ac6d78a58ee0938e51c
+EBUILD kalarm-9999.ebuild 444 RMD160 5bcaecefca34dda58897b81f7403780be43cfb5d SHA1 2441aec13707effa1cdfb70052369d1a97569489 SHA256 8f53aa1757496757dd9f4328da5d4bbca5c575fd3fb8cfee8d0c58b851cba2db
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-base/kalarm/kalarm-4.4.80.ebuild b/kde-base/kalarm/kalarm-4.4.80.ebuild
index 2e76691be08..1bfcca9e34c 100644
--- a/kde-base/kalarm/kalarm-4.4.80.ebuild
+++ b/kde-base/kalarm/kalarm-4.4.80.ebuild
@@ -12,7 +12,7 @@ KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-li
 IUSE="debug +handbook"
 
 RDEPEND="
-	$(add_kdebase_dep kdepimlibs 'akonadi')
+	$(add_kdebase_dep kdepimlibs 'semantic-desktop')
 	$(add_kdebase_dep kdepim-common-libs)
 	media-sound/phonon
 "
@@ -21,11 +21,3 @@ DEPEND="${RDEPEND}"
 KMEXTRACTONLY="
 	kmail/
 "
-
-src_configure() {
-	mycmakeargs=(
-		-DBUILD_akonadi=OFF
-	)
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/kalarm/kalarm-4.4.81.ebuild b/kde-base/kalarm/kalarm-4.4.81.ebuild
index 2e76691be08..1bfcca9e34c 100644
--- a/kde-base/kalarm/kalarm-4.4.81.ebuild
+++ b/kde-base/kalarm/kalarm-4.4.81.ebuild
@@ -12,7 +12,7 @@ KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-li
 IUSE="debug +handbook"
 
 RDEPEND="
-	$(add_kdebase_dep kdepimlibs 'akonadi')
+	$(add_kdebase_dep kdepimlibs 'semantic-desktop')
 	$(add_kdebase_dep kdepim-common-libs)
 	media-sound/phonon
 "
@@ -21,11 +21,3 @@ DEPEND="${RDEPEND}"
 KMEXTRACTONLY="
 	kmail/
 "
-
-src_configure() {
-	mycmakeargs=(
-		-DBUILD_akonadi=OFF
-	)
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/kalarm/kalarm-9999.ebuild b/kde-base/kalarm/kalarm-9999.ebuild
index 033270b40f0..c6113e73607 100644
--- a/kde-base/kalarm/kalarm-9999.ebuild
+++ b/kde-base/kalarm/kalarm-9999.ebuild
@@ -12,7 +12,7 @@ KEYWORDS=""
 IUSE="debug +handbook"
 
 RDEPEND="
-	$(add_kdebase_dep kdepimlibs 'akonadi')
+	$(add_kdebase_dep kdepimlibs 'semantic-desktop')
 	$(add_kdebase_dep kdepim-common-libs)
 	media-sound/phonon
 "
@@ -21,11 +21,3 @@ DEPEND="${RDEPEND}"
 KMEXTRACTONLY="
 	kmail/
 "
-
-src_configure() {
-	mycmakeargs=(
-		-DBUILD_akonadi=OFF
-	)
-
-	kde4-meta_src_configure
-}
diff --git a/kde-base/kdepim-common-libs/Manifest b/kde-base/kdepim-common-libs/Manifest
index 80c92cc823f..782ca94abc0 100644
--- a/kde-base/kdepim-common-libs/Manifest
+++ b/kde-base/kdepim-common-libs/Manifest
@@ -1,6 +1,6 @@
 DIST kdepim-4.4.80.tar.bz2 8709074 RMD160 1b5ef52e86bd5f8e9bee8b1d6d64b3bca4e97877 SHA1 502c23fea7dd4e739360fe7e7f3a5cf5bfd8a266 SHA256 c0375407c08eaad71e7d594d0314eaa93d53578286c55f26fd46949d8831371f
 DIST kdepim-4.4.81.tar.xz 7933116 RMD160 c0a7d403bf6c18de68743038f63e84b22a369ab6 SHA1 8b05688603aa809b9d65a553e15135bae211fa51 SHA256 1eef36a310cd1e98f7fc27e6a183a6495b6ea3d4e3c8d46110cc42e634f50ff7
-EBUILD kdepim-common-libs-4.4.80.ebuild 1410 RMD160 bc20c26c2fd80397948d93221726de03d1ea4162 SHA1 f48f85b53e0b834d78dbb633f18fb85c58d2fe0c SHA256 f74b1aaa602541051bbf1fd1f054570b3e284ee0c2d6ff14e6a5c4b8e71163cf
-EBUILD kdepim-common-libs-4.4.81.ebuild 1410 RMD160 bc20c26c2fd80397948d93221726de03d1ea4162 SHA1 f48f85b53e0b834d78dbb633f18fb85c58d2fe0c SHA256 f74b1aaa602541051bbf1fd1f054570b3e284ee0c2d6ff14e6a5c4b8e71163cf
-EBUILD kdepim-common-libs-9999.ebuild 1399 RMD160 deec54e63b7e0c23491687c658679dee82e26c77 SHA1 9e7da3714675d87622d659c97449ff5b4aaa0e95 SHA256 7d94a66b1a55d7da8929aca2e4c73e21c69f686c6034f80c52f5ac572901c670
+EBUILD kdepim-common-libs-4.4.80.ebuild 1372 RMD160 1bb8ea028c013240f2794007f159879fc459cf97 SHA1 5ae84dba5a87641d253809e902ac58808898949f SHA256 2c7b5fbcc007858dba96f3c853c2458a3d6e6707a46d232c82c29f86937c2c5b
+EBUILD kdepim-common-libs-4.4.81.ebuild 1372 RMD160 1bb8ea028c013240f2794007f159879fc459cf97 SHA1 5ae84dba5a87641d253809e902ac58808898949f SHA256 2c7b5fbcc007858dba96f3c853c2458a3d6e6707a46d232c82c29f86937c2c5b
+EBUILD kdepim-common-libs-9999.ebuild 1361 RMD160 7ed13e0d30a21d3590b72a3f73c295e699b4f2e0 SHA1 c02a1ba1c28d019c2921235735d66ce9a90005d2 SHA256 af0d5146aeeee114ba9576ec73d33aa1d4dc225e67bc6a714b5d6bfa5e230ed1
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-base/kdepim-common-libs/kdepim-common-libs-4.4.80.ebuild b/kde-base/kdepim-common-libs/kdepim-common-libs-4.4.80.ebuild
index 40b00c07764..182fff87272 100644
--- a/kde-base/kdepim-common-libs/kdepim-common-libs-4.4.80.ebuild
+++ b/kde-base/kdepim-common-libs/kdepim-common-libs-4.4.80.ebuild
@@ -15,8 +15,7 @@ IUSE="debug"
 DEPEND="
 	app-crypt/gpgme
 	>=app-office/akonadi-server-1.3.60
-	$(add_kdebase_dep kdelibs 'semantic-desktop')
-	$(add_kdebase_dep kdepimlibs 'akonadi')
+	$(add_kdebase_dep kdepimlibs 'semantic-desktop')
 "
 RDEPEND="${DEPEND}
 	app-crypt/gnupg
diff --git a/kde-base/kdepim-common-libs/kdepim-common-libs-4.4.81.ebuild b/kde-base/kdepim-common-libs/kdepim-common-libs-4.4.81.ebuild
index 40b00c07764..182fff87272 100644
--- a/kde-base/kdepim-common-libs/kdepim-common-libs-4.4.81.ebuild
+++ b/kde-base/kdepim-common-libs/kdepim-common-libs-4.4.81.ebuild
@@ -15,8 +15,7 @@ IUSE="debug"
 DEPEND="
 	app-crypt/gpgme
 	>=app-office/akonadi-server-1.3.60
-	$(add_kdebase_dep kdelibs 'semantic-desktop')
-	$(add_kdebase_dep kdepimlibs 'akonadi')
+	$(add_kdebase_dep kdepimlibs 'semantic-desktop')
 "
 RDEPEND="${DEPEND}
 	app-crypt/gnupg
diff --git a/kde-base/kdepim-common-libs/kdepim-common-libs-9999.ebuild b/kde-base/kdepim-common-libs/kdepim-common-libs-9999.ebuild
index 0768dca3909..bc930d3f5d4 100644
--- a/kde-base/kdepim-common-libs/kdepim-common-libs-9999.ebuild
+++ b/kde-base/kdepim-common-libs/kdepim-common-libs-9999.ebuild
@@ -15,8 +15,7 @@ IUSE="debug"
 DEPEND="
 	app-crypt/gpgme
 	>=app-office/akonadi-server-1.3.60
-	$(add_kdebase_dep kdelibs 'semantic-desktop')
-	$(add_kdebase_dep kdepimlibs 'akonadi')
+	$(add_kdebase_dep kdepimlibs 'semantic-desktop')
 "
 RDEPEND="${DEPEND}
 	app-crypt/gnupg
diff --git a/kde-base/kdepim-libs/Manifest b/kde-base/kdepim-libs/Manifest
deleted file mode 100644
index 2596974a5d4..00000000000
--- a/kde-base/kdepim-libs/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-base/kdepim-libs/metadata.xml b/kde-base/kdepim-libs/metadata.xml
deleted file mode 100644
index 8d1e86a9cef..00000000000
--- a/kde-base/kdepim-libs/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>kde</herd>
-</pkgmetadata>
diff --git a/kde-base/kdepim-runtime/Manifest b/kde-base/kdepim-runtime/Manifest
index e55f40829ec..b05586c30b9 100644
--- a/kde-base/kdepim-runtime/Manifest
+++ b/kde-base/kdepim-runtime/Manifest
@@ -2,8 +2,8 @@ DIST kdepim-runtime-4.4.4.tar.bz2 632556 RMD160 c74dcc82225e55b223b5796d19479daa
 DIST kdepim-runtime-4.4.80.tar.bz2 1102782 RMD160 e17b31a99db9c9bf2c8ca38dbff9d6248bbfa846 SHA1 c8ce1d1f06d627ee053d70444fab0e2d1d34c035 SHA256 ceb68786997493e862cc3040d15ae1beb19bdca8ef21bc59cf7048d6e590e16e
 DIST kdepim-runtime-4.4.81.tar.xz 916532 RMD160 b9a77bae1e1d0ae5a5f261ed82892c88921d954c SHA1 7ce99afe13e595384c30668af95c1e3db906318d SHA256 ee84237d8bc95fd237ad987a09dbec87a37eca38119da2c46dcd438d80c4be34
 EBUILD kdepim-runtime-4.4.4.ebuild 713 RMD160 754735052bf5f9c816315ed50095be98a29628f6 SHA1 bb452fe2acfa75ee89e0f5c97b6ab77ceb84460a SHA256 89c27d06a205aba0fb06de571b0853c2f10736d7fb65fe1ef8b79ac098a12523
-EBUILD kdepim-runtime-4.4.80.ebuild 684 RMD160 a96fab4d9a9384406ba01889af7cb1dfaf2916d5 SHA1 c3a15b355380253445d26659cf8fa5f851586b90 SHA256 b0d8c2398d6f88471ae2153e4d3fecdaf605d5a432ca125c6b5f770320042bc5
-EBUILD kdepim-runtime-4.4.81.ebuild 684 RMD160 a96fab4d9a9384406ba01889af7cb1dfaf2916d5 SHA1 c3a15b355380253445d26659cf8fa5f851586b90 SHA256 b0d8c2398d6f88471ae2153e4d3fecdaf605d5a432ca125c6b5f770320042bc5
+EBUILD kdepim-runtime-4.4.80.ebuild 646 RMD160 be0367a4eae19b2993cd056b8fe38c3dd9f259fa SHA1 43833936a107910863be93e5fc55cedc94143f53 SHA256 6b3451b433c5f37aa5c7a7d46c71931b79f1c876d89cb0975f2ef5283d17722e
+EBUILD kdepim-runtime-4.4.81.ebuild 646 RMD160 be0367a4eae19b2993cd056b8fe38c3dd9f259fa SHA1 43833936a107910863be93e5fc55cedc94143f53 SHA256 6b3451b433c5f37aa5c7a7d46c71931b79f1c876d89cb0975f2ef5283d17722e
 EBUILD kdepim-runtime-4.4.9999.ebuild 666 RMD160 0379884da63cc0c244f1368938036807c9fc82ad SHA1 72a96560077defc390099f248d4a484a65b7bab7 SHA256 5104ff7466fab0b66ca56d301205ebd65fa7ff08b1ca932acdda480622973537
-EBUILD kdepim-runtime-9999.ebuild 637 RMD160 795823845f879aa0d406e11b755f45b0cce61cb7 SHA1 2245fa3ff64e3e21049e1fc68b618cbe96a96937 SHA256 e0a8a3ef9cee30ccd44ea890c0de62a531c8bf333645278da34158a7f87758f5
+EBUILD kdepim-runtime-9999.ebuild 599 RMD160 cecd03082f05c4fb211fa6affcfe3eaa741f6832 SHA1 6b29f28c58bef2c89fc262b6dd45ec288e985696 SHA256 b8002c2853c34ffa9fdc13f2f91b938354d29192bea3f1a3ec8e51ee566bcda0
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-base/kdepim-runtime/kdepim-runtime-4.4.80.ebuild b/kde-base/kdepim-runtime/kdepim-runtime-4.4.80.ebuild
index be25b81280c..8b43eecbffa 100644
--- a/kde-base/kdepim-runtime/kdepim-runtime-4.4.80.ebuild
+++ b/kde-base/kdepim-runtime/kdepim-runtime-4.4.80.ebuild
@@ -22,8 +22,7 @@ DEPEND="
 	dev-libs/boost
 	dev-libs/libxml2:2
 	dev-libs/libxslt
-	$(add_kdebase_dep kdelibs 'semantic-desktop')
-	$(add_kdebase_dep kdepimlibs 'akonadi')
+	$(add_kdebase_dep kdepimlibs 'semantic-desktop')
 	x11-misc/shared-mime-info
 "
 RDEPEND="${DEPEND}
diff --git a/kde-base/kdepim-runtime/kdepim-runtime-4.4.81.ebuild b/kde-base/kdepim-runtime/kdepim-runtime-4.4.81.ebuild
index be25b81280c..8b43eecbffa 100644
--- a/kde-base/kdepim-runtime/kdepim-runtime-4.4.81.ebuild
+++ b/kde-base/kdepim-runtime/kdepim-runtime-4.4.81.ebuild
@@ -22,8 +22,7 @@ DEPEND="
 	dev-libs/boost
 	dev-libs/libxml2:2
 	dev-libs/libxslt
-	$(add_kdebase_dep kdelibs 'semantic-desktop')
-	$(add_kdebase_dep kdepimlibs 'akonadi')
+	$(add_kdebase_dep kdepimlibs 'semantic-desktop')
 	x11-misc/shared-mime-info
 "
 RDEPEND="${DEPEND}
diff --git a/kde-base/kdepim-runtime/kdepim-runtime-9999.ebuild b/kde-base/kdepim-runtime/kdepim-runtime-9999.ebuild
index 653400c62e5..7187341998b 100644
--- a/kde-base/kdepim-runtime/kdepim-runtime-9999.ebuild
+++ b/kde-base/kdepim-runtime/kdepim-runtime-9999.ebuild
@@ -22,8 +22,7 @@ DEPEND="
 	dev-libs/boost
 	dev-libs/libxml2:2
 	dev-libs/libxslt
-	$(add_kdebase_dep kdelibs 'semantic-desktop')
-	$(add_kdebase_dep kdepimlibs 'akonadi')
+	$(add_kdebase_dep kdepimlibs 'semantic-desktop')
 	x11-misc/shared-mime-info
 "
 RDEPEND="${DEPEND}
diff --git a/kde-base/kdepimlibs/Manifest b/kde-base/kdepimlibs/Manifest
index 9c094546452..a1b9c031987 100644
--- a/kde-base/kdepimlibs/Manifest
+++ b/kde-base/kdepimlibs/Manifest
@@ -2,8 +2,8 @@ DIST kdepimlibs-4.4.4.tar.bz2 2431546 RMD160 39f5ab2d23c0a66fd5e1477d3f4017f236a
 DIST kdepimlibs-4.4.80.tar.bz2 2603521 RMD160 717993a1d612a7932944d203d728c828d0a0f4dc SHA1 0184d7146a9ed4fd741d616e085657ffeaf06116 SHA256 1005859ea851d0686070ae37be84c3e9effbf2ca81820c2d87ca23b3cf491c31
 DIST kdepimlibs-4.4.81.tar.xz 2206592 RMD160 aca648e7264616dfdc6273b3a2ad5cf541060487 SHA1 edc2d7bdce8a2dc2b67467aa77a0b4c977a4f7f4 SHA256 b72a6a9d3cacc4c3d96a877583dad0239539990f5b53c8daf461a7e77134f806
 EBUILD kdepimlibs-4.4.4.ebuild 1454 RMD160 c74a77c04e9f91c38fbaae3a2e7f23638302489f SHA1 17c8908ad8380531ca3011a414902d50c690e5aa SHA256 63fe0f151f1d3af38a94b752143d9c85144f2a05290e97b2972f183c1a8ba57d
-EBUILD kdepimlibs-4.4.80.ebuild 1538 RMD160 b8562574ec4c3cf582739e6735a82bd5c1cad293 SHA1 4b11572aa47603090ed64ee8f537eb6175d51a82 SHA256 495f1d407840d7ea121064e1b89294e69c8600b46b15144d3ef18e27c5df27fb
-EBUILD kdepimlibs-4.4.81.ebuild 1538 RMD160 b8562574ec4c3cf582739e6735a82bd5c1cad293 SHA1 4b11572aa47603090ed64ee8f537eb6175d51a82 SHA256 495f1d407840d7ea121064e1b89294e69c8600b46b15144d3ef18e27c5df27fb
+EBUILD kdepimlibs-4.4.80.ebuild 2150 RMD160 e955902e7ecf4f6c8b39fda4cbbc465aef736f06 SHA1 1094d8d4b07ec0a958b80d39eec7addd1bcb8cb3 SHA256 03568184add2f2af9e5c278add9666eb1b02efc3707fbaf452398b72c1775c38
+EBUILD kdepimlibs-4.4.81.ebuild 2150 RMD160 e955902e7ecf4f6c8b39fda4cbbc465aef736f06 SHA1 1094d8d4b07ec0a958b80d39eec7addd1bcb8cb3 SHA256 03568184add2f2af9e5c278add9666eb1b02efc3707fbaf452398b72c1775c38
 EBUILD kdepimlibs-4.4.9999.ebuild 1376 RMD160 67cce8402dcbcda9961e051c211515d4728dceff SHA1 2f7a0ca751585646872b83d22e5d20bbdf600db6 SHA256 d9e57b7fe46e91eb001d21f297f96264176789518a36519e9cc9aa4be38ee078
-EBUILD kdepimlibs-9999.ebuild 1460 RMD160 6dd7cb4ef3e011fda67546e034c3a4e5e02cb1ef SHA1 3c0463afd09001aba841b56c8d5e10754b0b2c29 SHA256 b306c58b9c17ecabb7cc17680fec9e2f3fbaa32cf29dddb0b8c33b22115920ab
+EBUILD kdepimlibs-9999.ebuild 2072 RMD160 2bea8b422e7dd47dec08036aac26fa1fb2c03be6 SHA1 f89ccaa872e4d8cbc305dde284676a530e5a5385 SHA256 64cab06f0a1176190d7237381e42ca68232c1d7cbc5d3200029ff8c028550d2c
 MISC metadata.xml 235 RMD160 9dd88a4dadf630a6ac46d2445c974be2787f280e SHA1 dc809b0bcc00b8c9e581b56f05ae38ebd137d8c0 SHA256 dd0d1c4c7e6cc084cb9ca9b8d1c42d6a14d8282303d172b3e58c6ac2d80d540f
diff --git a/kde-base/kdepimlibs/kdepimlibs-4.4.80.ebuild b/kde-base/kdepimlibs/kdepimlibs-4.4.80.ebuild
index ce4ea6b69f4..a44872ba3af 100644
--- a/kde-base/kdepimlibs/kdepimlibs-4.4.80.ebuild
+++ b/kde-base/kdepimlibs/kdepimlibs-4.4.80.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.kde.org/"
 
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 LICENSE="LGPL-2.1"
-IUSE="+akonadi debug +handbook ldap"
+IUSE="debug +handbook ldap semantic-desktop"
 
 # some akonadi tests timeout, that probaly needs more work as its ~700 tests
 RESTRICT="test"
@@ -23,7 +23,12 @@ DEPEND="
 	dev-libs/libgpg-error
 	>=dev-libs/libical-0.43
 	dev-libs/cyrus-sasl
-	akonadi? ( >=app-office/akonadi-server-1.3.60 )
+	semantic-desktop? (
+		>=app-office/akonadi-server-1.3.60
+		$(add_kdebase_dep kdelibs 'semantic-desktop')
+		media-sound/phonon
+		x11-misc/shared-mime-info
+	)
 	ldap? ( net-nds/openldap )
 "
 RDEPEND="${DEPEND}"
@@ -40,12 +45,16 @@ add_blocker kaddressbook '<4.4.60'
 src_prepare() {
 	kde4-base_src_prepare
 
-	if ! use akonadi; then
-		sed -e '/find_package(Akonadi/s/^/# DISABLED /' \
-			-e '/macro_log_feature(Akonadi_FOUND/s/TRUE/FALSE/' \
-			-e '/add_subdirectory(akonadi)/s/^/# DISABLED /' \
-			-e '/add_subdirectory(mailtransport)/s/^/# DISABLED /' \
-			-i CMakeLists.txt || die "failed to disable akonadi"
+	# Disable hardcoded checks
+	sed -r -e '/find_package\((Akonadi|SharedDesktopOntologies|Soprano|Nepomuk)/{/macro_optional_/!s/find/macro_optional_&/}' \
+		-e '/macro_log_feature\((Akonadi|SHAREDDESKTOPONTOLOGIES|Soprano|Nepomuk)_FOUND/s/ TRUE / FALSE /' \
+		-e '/add_subdirectory\((akonadi|mailtransport)/{/macro_optional_/!s/add/macro_optional_&/}' \
+		-i CMakeLists.txt || die
+	if ! use semantic-desktop; then
+		sed -e '/include(SopranoAddOntology)/s/^/#DISABLED /' \
+			-i CMakeLists.txt || die
+		# More reliable than -DBUILD_akonadi=OFF
+		rm -r akonadi mailtransport || die
 	fi
 }
 
@@ -53,6 +62,10 @@ src_configure() {
 	mycmakeargs=(
 		$(cmake-utils_use_build handbook doc)
 		$(cmake-utils_use_with ldap)
+		$(cmake-utils_use_with semantic-desktop Akonadi)
+		$(cmake-utils_use_with semantic-desktop SharedDesktopOntologies)
+		$(cmake-utils_use_with semantic-desktop Soprano)
+		$(cmake-utils_use_with semantic-desktop Nepomuk)
 	)
 
 	kde4-base_src_configure
diff --git a/kde-base/kdepimlibs/kdepimlibs-4.4.81.ebuild b/kde-base/kdepimlibs/kdepimlibs-4.4.81.ebuild
index ce4ea6b69f4..a44872ba3af 100644
--- a/kde-base/kdepimlibs/kdepimlibs-4.4.81.ebuild
+++ b/kde-base/kdepimlibs/kdepimlibs-4.4.81.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.kde.org/"
 
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 LICENSE="LGPL-2.1"
-IUSE="+akonadi debug +handbook ldap"
+IUSE="debug +handbook ldap semantic-desktop"
 
 # some akonadi tests timeout, that probaly needs more work as its ~700 tests
 RESTRICT="test"
@@ -23,7 +23,12 @@ DEPEND="
 	dev-libs/libgpg-error
 	>=dev-libs/libical-0.43
 	dev-libs/cyrus-sasl
-	akonadi? ( >=app-office/akonadi-server-1.3.60 )
+	semantic-desktop? (
+		>=app-office/akonadi-server-1.3.60
+		$(add_kdebase_dep kdelibs 'semantic-desktop')
+		media-sound/phonon
+		x11-misc/shared-mime-info
+	)
 	ldap? ( net-nds/openldap )
 "
 RDEPEND="${DEPEND}"
@@ -40,12 +45,16 @@ add_blocker kaddressbook '<4.4.60'
 src_prepare() {
 	kde4-base_src_prepare
 
-	if ! use akonadi; then
-		sed -e '/find_package(Akonadi/s/^/# DISABLED /' \
-			-e '/macro_log_feature(Akonadi_FOUND/s/TRUE/FALSE/' \
-			-e '/add_subdirectory(akonadi)/s/^/# DISABLED /' \
-			-e '/add_subdirectory(mailtransport)/s/^/# DISABLED /' \
-			-i CMakeLists.txt || die "failed to disable akonadi"
+	# Disable hardcoded checks
+	sed -r -e '/find_package\((Akonadi|SharedDesktopOntologies|Soprano|Nepomuk)/{/macro_optional_/!s/find/macro_optional_&/}' \
+		-e '/macro_log_feature\((Akonadi|SHAREDDESKTOPONTOLOGIES|Soprano|Nepomuk)_FOUND/s/ TRUE / FALSE /' \
+		-e '/add_subdirectory\((akonadi|mailtransport)/{/macro_optional_/!s/add/macro_optional_&/}' \
+		-i CMakeLists.txt || die
+	if ! use semantic-desktop; then
+		sed -e '/include(SopranoAddOntology)/s/^/#DISABLED /' \
+			-i CMakeLists.txt || die
+		# More reliable than -DBUILD_akonadi=OFF
+		rm -r akonadi mailtransport || die
 	fi
 }
 
@@ -53,6 +62,10 @@ src_configure() {
 	mycmakeargs=(
 		$(cmake-utils_use_build handbook doc)
 		$(cmake-utils_use_with ldap)
+		$(cmake-utils_use_with semantic-desktop Akonadi)
+		$(cmake-utils_use_with semantic-desktop SharedDesktopOntologies)
+		$(cmake-utils_use_with semantic-desktop Soprano)
+		$(cmake-utils_use_with semantic-desktop Nepomuk)
 	)
 
 	kde4-base_src_configure
diff --git a/kde-base/kdepimlibs/kdepimlibs-9999.ebuild b/kde-base/kdepimlibs/kdepimlibs-9999.ebuild
index 54693e12215..ddb090fdadc 100644
--- a/kde-base/kdepimlibs/kdepimlibs-9999.ebuild
+++ b/kde-base/kdepimlibs/kdepimlibs-9999.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.kde.org/"
 
 KEYWORDS=""
 LICENSE="LGPL-2.1"
-IUSE="+akon