[kde-base/akonadi+eclass] Do the akonadi stuff in more sane way.

5 files changed, 20 insertions, 47 deletions

diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass
index 7882d64a036..3ed39543376 100644
--- a/eclass/kde4-meta.eclass
+++ b/eclass/kde4-meta.eclass
@@ -352,33 +352,6 @@ kde4-meta_create_extractlists() {
 					libkdegames/"
 			fi
 			;;
-		kdepim-runtime)
-			# this is actually the akonadi :]
-			KMEXTRACTONLY+="
-				doc/
-				kdepim-mime.xml
-				kdepim-version.h
-				akonadi-prefix.h.cmake
-				Mainpage.dox"
-			KMEXTRA+="
-				agents/
-				akonadiconsole/
-				akonadi_next/
-				clients/
-				defaultsetup/
-				kabc/
-				kcal/
-				kcm/
-				kioslave/
-				kresources/
-				libkdepim-copy/
-				migration/
-				opensync/
-				plugins/
-				resources/
-				tray/
-				xml/"
-			;;
 		kdepim)
 			if [[ ${PN} != libkdepim ]]; then
 				KMEXTRACTONLY+="
diff --git a/kde-base/akonadi/Manifest b/kde-base/akonadi/Manifest
index bc5834c10c0..037f4be2dfb 100644
--- a/kde-base/akonadi/Manifest
+++ b/kde-base/akonadi/Manifest
@@ -2,8 +2,8 @@ DIST kdepim-runtime-4.2.98.tar.bz2 741404 RMD160 512302be9816016e9e00422ea2b1f04
 DIST kdepim-runtime-4.3.0.tar.bz2 743310 RMD160 f178e4c68e33a56f7b6ca3b18e3e13ec0b2e17ab SHA1 5c629f997e9a85510c7f6dadf8c52f5b80f60105 SHA256 a7d0c6c2f71fe991a01c33ef97cb20f68eb0488a2ca068128677cb9276d08f99
 DIST kdepim-runtime-4.3.61.tar.lzma 672173 RMD160 fbc3842ace5ba6e4ee09778863035dbff6eab9b1 SHA1 f35d3095b0130fe004989dddf0a14123fa3c6b37 SHA256 68bb7f6e95f6b1e1ddbf007cf276752602453f134588af9b074e2cbfdd93bcdf
 EBUILD akonadi-4.2.98.ebuild 2641 RMD160 e7ed56ded4aaa5e7826b07ded33c197b4fb052a6 SHA1 0fce0986790ea3626b21c2fe03da4c1e05d06179 SHA256 61840a0384ec5763a5232523d9c746bf3cc20cf70ca7ba59c771131d9a2843dd
-EBUILD akonadi-4.3.0.ebuild 2641 RMD160 e7ed56ded4aaa5e7826b07ded33c197b4fb052a6 SHA1 0fce0986790ea3626b21c2fe03da4c1e05d06179 SHA256 61840a0384ec5763a5232523d9c746bf3cc20cf70ca7ba59c771131d9a2843dd
+EBUILD akonadi-4.3.0.ebuild 2565 RMD160 daa859aff95d3bbd7bc1dc03ec41fb9d9e90fc12 SHA1 8432fc904f1e40235da00281a4620a1fba1d9f9e SHA256 aaa5fe652c346a3f7131a300f357fd7f491acd2d6c983639fe729cf01bf72ce2
 EBUILD akonadi-4.3.61.ebuild 2641 RMD160 e7ed56ded4aaa5e7826b07ded33c197b4fb052a6 SHA1 0fce0986790ea3626b21c2fe03da4c1e05d06179 SHA256 61840a0384ec5763a5232523d9c746bf3cc20cf70ca7ba59c771131d9a2843dd
-EBUILD akonadi-4.3.9999.ebuild 2599 RMD160 86470c8d796c92b1b47161fab52ed3efbc72404a SHA1 ba7217c78eebc7576d15de36fc48991434d18d06 SHA256 0649a049e0760ea97677320df47d49f08ed637e6fdd7bd12d99bfaee8d39efb0
-EBUILD akonadi-9999.ebuild 2599 RMD160 86470c8d796c92b1b47161fab52ed3efbc72404a SHA1 ba7217c78eebc7576d15de36fc48991434d18d06 SHA256 0649a049e0760ea97677320df47d49f08ed637e6fdd7bd12d99bfaee8d39efb0
+EBUILD akonadi-4.3.9999.ebuild 2565 RMD160 daa859aff95d3bbd7bc1dc03ec41fb9d9e90fc12 SHA1 8432fc904f1e40235da00281a4620a1fba1d9f9e SHA256 aaa5fe652c346a3f7131a300f357fd7f491acd2d6c983639fe729cf01bf72ce2
+EBUILD akonadi-9999.ebuild 2565 RMD160 daa859aff95d3bbd7bc1dc03ec41fb9d9e90fc12 SHA1 8432fc904f1e40235da00281a4620a1fba1d9f9e SHA256 aaa5fe652c346a3f7131a300f357fd7f491acd2d6c983639fe729cf01bf72ce2
 MISC metadata.xml 264 RMD160 4d66ebe451b6634cb712a67519338b16a556b983 SHA1 272c64cf9e24ac997a3a9d4ce32249a09f4d62bd SHA256 7c3b87ecba257c3c302e5beccf9e21d858c9651ea7b6b723b79a3364f671b7e5
diff --git a/kde-base/akonadi/akonadi-4.3.0.ebuild b/kde-base/akonadi/akonadi-4.3.0.ebuild
index 8bfef777780..13c4e43fef0 100644
--- a/kde-base/akonadi/akonadi-4.3.0.ebuild
+++ b/kde-base/akonadi/akonadi-4.3.0.ebuild
@@ -6,11 +6,13 @@ EAPI="2"
 
 if [[ ${PV} = *9999* ]]; then
 	KMNAME="kdepim"
+	eclass="kde4-meta"
 else
 	KMNAME="kdepim-runtime"
 	KMNOMODULE="true"
+	eclass="kde4-base"
 fi
-inherit kde4-meta
+inherit ${eclass}
 
 DESCRIPTION="An extensible cross-desktop storage service for PIM data and meta data"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
@@ -20,7 +22,6 @@ IUSE="debug +semantic-desktop"
 
 # add when libmapi becomes available with an ebuild
 #exchange? ( net-libs/libmapi )
-# not sure about libxml2... - reavertm
 DEPEND="
 	dev-libs/boost
 	dev-libs/libxml2
@@ -39,7 +40,7 @@ RDEPEND="${DEPEND}
 		!kde-base/kdemaildir:${SLOT}
 		!<kde-base/kdepim-kresources-4.2.95:${SLOT}[kdeprefix]
 	)
-	>=app-office/akonadi-server-1.2.0[mysql]
+	>=app-office/akonadi-server-1.2.0
 "
 
 src_prepare() {
@@ -87,6 +88,5 @@ src_test() {
 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}
+	rm -rf "${D}"/${KDEDIR}/share/apps/nepomuk/ontologies/n{m,c}o.{desktop,trig}
 }
diff --git a/kde-base/akonadi/akonadi-4.3.9999.ebuild b/kde-base/akonadi/akonadi-4.3.9999.ebuild
index c1804de0ef0..13c4e43fef0 100644
--- a/kde-base/akonadi/akonadi-4.3.9999.ebuild
+++ b/kde-base/akonadi/akonadi-4.3.9999.ebuild
@@ -6,21 +6,22 @@ EAPI="2"
 
 if [[ ${PV} = *9999* ]]; then
 	KMNAME="kdepim"
+	eclass="kde4-meta"
 else
 	KMNAME="kdepim-runtime"
 	KMNOMODULE="true"
+	eclass="kde4-base"
 fi
-inherit kde4-meta
+inherit ${eclass}
 
 DESCRIPTION="An extensible cross-desktop storage service for PIM data and meta data"
-KEYWORDS=""
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
 # add when libmapi becomes available with an ebuild
 #exchange
 IUSE="debug +semantic-desktop"
 
 # add when libmapi becomes available with an ebuild
 #exchange? ( net-libs/libmapi )
-# not sure about libxml2... - reavertm
 DEPEND="
 	dev-libs/boost
 	dev-libs/libxml2
@@ -39,7 +40,7 @@ RDEPEND="${DEPEND}
 		!kde-base/kdemaildir:${SLOT}
 		!<kde-base/kdepim-kresources-4.2.95:${SLOT}[kdeprefix]
 	)
-	>=app-office/akonadi-server-1.2.0[mysql]
+	>=app-office/akonadi-server-1.2.0
 "
 
 src_prepare() {
@@ -87,6 +88,5 @@ src_test() {
 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}
+	rm -rf "${D}"/${KDEDIR}/share/apps/nepomuk/ontologies/n{m,c}o.{desktop,trig}
 }
diff --git a/kde-base/akonadi/akonadi-9999.ebuild b/kde-base/akonadi/akonadi-9999.ebuild
index c1804de0ef0..13c4e43fef0 100644
--- a/kde-base/akonadi/akonadi-9999.ebuild
+++ b/kde-base/akonadi/akonadi-9999.ebuild
@@ -6,21 +6,22 @@ EAPI="2"
 
 if [[ ${PV} = *9999* ]]; then
 	KMNAME="kdepim"
+	eclass="kde4-meta"
 else
 	KMNAME="kdepim-runtime"
 	KMNOMODULE="true"
+	eclass="kde4-base"
 fi
-inherit kde4-meta
+inherit ${eclass}
 
 DESCRIPTION="An extensible cross-desktop storage service for PIM data and meta data"
-KEYWORDS=""
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
 # add when libmapi becomes available with an ebuild
 #exchange
 IUSE="debug +semantic-desktop"
 
 # add when libmapi becomes available with an ebuild
 #exchange? ( net-libs/libmapi )
-# not sure about libxml2... - reavertm
 DEPEND="
 	dev-libs/boost
 	dev-libs/libxml2
@@ -39,7 +40,7 @@ RDEPEND="${DEPEND}
 		!kde-base/kdemaildir:${SLOT}
 		!<kde-base/kdepim-kresources-4.2.95:${SLOT}[kdeprefix]
 	)
-	>=app-office/akonadi-server-1.2.0[mysql]
+	>=app-office/akonadi-server-1.2.0
 "
 
 src_prepare() {
@@ -87,6 +88,5 @@ src_test() {
 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}
+	rm -rf "${D}"/${KDEDIR}/share/apps/nepomuk/ontologies/n{m,c}o.{desktop,trig}
 }