Revert "[kde-base] Rename kde-base/akonadi to kde-base/kdepim-runtime for KDE"

This reverts commit 5ec2ce341d367129a911b4058f188fb305ed6db9.

7 files changed, 11 insertions, 28 deletions

diff --git a/kde-base/kdepim-runtime/kdepim-runtime-4.2.95.ebuild b/kde-base/akonadi/akonadi-4.2.95.ebuild
index cec9bf495a0..e83bc86c38a 100644
--- a/kde-base/kdepim-runtime/kdepim-runtime-4.2.95.ebuild
+++ b/kde-base/akonadi/akonadi-4.2.95.ebuild
@@ -4,8 +4,8 @@
 
 EAPI="2"
 
-KMNAME="kdebase-runtime"
-inherit kde4-base
+KMNAME="kdepim"
+inherit kde4-meta
 
 DESCRIPTION="An extensible cross-desktop storage service for PIM data and meta data"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
@@ -26,14 +26,8 @@ DEPEND="
 "
 # @since 4.3 - blocks kdemaildir - no longer provided (it's in akonadi now)
 RDEPEND="${DEPEND}
-	!kdeprefix? (
-					!kde-base/kdemaildir[-kdeprefix]
-					!kde-base/akonadi[-kdeprefix]	
-				)
-	kdeprefix? (
-					!kde-base/kdemaildir:${SLOT}
-					!kde-base/akonadi:${SLOT}
-				)
+	!kdeprefix? ( !kde-base/kdemaildir[-kdeprefix] )
+	kdeprefix? ( !kde-base/kdemaildir:${SLOT} )
 	>=app-office/akonadi-server-1.1.95[mysql]
 "
 
@@ -48,7 +42,7 @@ src_prepare() {
 			|| die "Failed to disable nepomuktag"
 	fi
 
-	kde4-base_src_prepare
+	kde4-meta_src_prepare
 }
 
 src_configure() {
@@ -66,11 +60,11 @@ src_configure() {
 		$(cmake-utils_use_with semantic-desktop Nepomuk)
 		$(cmake-utils_use_with semantic-desktop Soprano)"
 
-	kde4-base_src_configure
+	kde4-meta_src_configure
 }
 
 src_install() {
-	kde4-base_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}
diff --git a/kde-base/kcontactmanager/Manifest b/kde-base/kcontactmanager/Manifest
index 193fa9e3047..1d863489ef3 100644
--- a/kde-base/kcontactmanager/Manifest
+++ b/kde-base/kcontactmanager/Manifest
@@ -3,7 +3,7 @@ DIST kdepim-4.2.91.tar.lzma 10648817 RMD160 c76e8612401e6862342bffbea532f2b46892
 DIST kdepim-4.2.95.tar.bz2 11380445 RMD160 716f70f09c7f80026678000aaac4d3a149c0c403 SHA1 14b189430410d0d557411d0817435ab1b5abf69e SHA256 8c0e134280e61bc92c6e6fbfa29403ab3e8a9f8cfd528f62e42b5c1fda6254d4
 EBUILD kcontactmanager-4.2.90.ebuild 721 RMD160 d25a6bf89a5c8c41ecba00a2697aa74363fbd042 SHA1 cc6a6b7b9749eeade6ca7cf00ef93c55cd8db30e SHA256 8a342bdc3d96f9ed6877c45ac9e3dbafe9e574fddd9f19237d38d7e31297ec3e
 EBUILD kcontactmanager-4.2.91.ebuild 721 RMD160 d25a6bf89a5c8c41ecba00a2697aa74363fbd042 SHA1 cc6a6b7b9749eeade6ca7cf00ef93c55cd8db30e SHA256 8a342bdc3d96f9ed6877c45ac9e3dbafe9e574fddd9f19237d38d7e31297ec3e
-EBUILD kcontactmanager-4.2.95.ebuild 728 RMD160 1cd093f5f85e9ae82d5dd9f495ee4514d2ae4527 SHA1 38a275daf18514719f9c98ef72f7fbae02d26717 SHA256 d62b05f74287d0c4aa29c63e6876f8a478c83d7845587b6304a245e54247a4bb
+EBUILD kcontactmanager-4.2.95.ebuild 721 RMD160 d25a6bf89a5c8c41ecba00a2697aa74363fbd042 SHA1 cc6a6b7b9749eeade6ca7cf00ef93c55cd8db30e SHA256 8a342bdc3d96f9ed6877c45ac9e3dbafe9e574fddd9f19237d38d7e31297ec3e
 EBUILD kcontactmanager-4.3.9999.ebuild 710 RMD160 1577116b2e1909e905c7dac70e049da2f07251f0 SHA1 89873c18f779c09d3ca9bea79fae4d62769a3047 SHA256 484dcde61a06f79ff1900a26714bbe932f6869365c22328856a49edb8c4f6a9b
 EBUILD kcontactmanager-9999.ebuild 710 RMD160 1577116b2e1909e905c7dac70e049da2f07251f0 SHA1 89873c18f779c09d3ca9bea79fae4d62769a3047 SHA256 484dcde61a06f79ff1900a26714bbe932f6869365c22328856a49edb8c4f6a9b
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-base/kcontactmanager/kcontactmanager-4.2.95.ebuild b/kde-base/kcontactmanager/kcontactmanager-4.2.95.ebuild
index 854d909af4b..589c74d47be 100644
--- a/kde-base/kcontactmanager/kcontactmanager-4.2.95.ebuild
+++ b/kde-base/kcontactmanager/kcontactmanager-4.2.95.ebuild
@@ -12,7 +12,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="debug"
 
 DEPEND="
-	>=kde-base/kdepim-runtime-${PV}:${SLOT}[kdeprefix=]
+	>=kde-base/akonadi-${PV}:${SLOT}[kdeprefix=]
 "
 RDEPEND="${DEPEND}"
 
diff --git a/kde-base/kdepim-kresources/Manifest b/kde-base/kdepim-kresources/Manifest
index 1c74aa54ed4..6a0fa25b848 100644
--- a/kde-base/kdepim-kresources/Manifest
+++ b/kde-base/kdepim-kresources/Manifest
@@ -3,7 +3,7 @@ DIST kdepim-4.2.91.tar.lzma 10648817 RMD160 c76e8612401e6862342bffbea532f2b46892
 DIST kdepim-4.2.95.tar.bz2 11380445 RMD160 716f70f09c7f80026678000aaac4d3a149c0c403 SHA1 14b189430410d0d557411d0817435ab1b5abf69e SHA256 8c0e134280e61bc92c6e6fbfa29403ab3e8a9f8cfd528f62e42b5c1fda6254d4
 EBUILD kdepim-kresources-4.2.90.ebuild 1074 RMD160 5fa8a2bea42de4ec425a5351b7fd3460859dd570 SHA1 0b90f2c5c64d8125d51f47642c593f1e4c2d99dc SHA256 f77066db3eac8c757080b36439bae319c701061ccc5d07217301c0eb4a937ff3
 EBUILD kdepim-kresources-4.2.91.ebuild 1074 RMD160 5fa8a2bea42de4ec425a5351b7fd3460859dd570 SHA1 0b90f2c5c64d8125d51f47642c593f1e4c2d99dc SHA256 f77066db3eac8c757080b36439bae319c701061ccc5d07217301c0eb4a937ff3
-EBUILD kdepim-kresources-4.2.95.ebuild 1081 RMD160 bcc000bffeb18aeefc87b41910a49ff2ed0cba78 SHA1 e2f34d0fdd9075f5f98cf30e7aefe8cb6057e989 SHA256 46d6e07d95a197077e002ef0b4d5f3c9efcee38807cbc38d0cbeef6be9bcae55
+EBUILD kdepim-kresources-4.2.95.ebuild 1074 RMD160 5fa8a2bea42de4ec425a5351b7fd3460859dd570 SHA1 0b90f2c5c64d8125d51f47642c593f1e4c2d99dc SHA256 f77066db3eac8c757080b36439bae319c701061ccc5d07217301c0eb4a937ff3
 EBUILD kdepim-kresources-4.3.9999.ebuild 1032 RMD160 740430ae81b0a57edb13056f2801c7a37d068447 SHA1 f0e7e90aeb0317c3537b6d8d9850c7413f4c1793 SHA256 5c599d7435a6c20ca2fcadecee98f4d335fb7f8f05c1278e1c88773a35b5a368
 EBUILD kdepim-kresources-9999.ebuild 1032 RMD160 740430ae81b0a57edb13056f2801c7a37d068447 SHA1 f0e7e90aeb0317c3537b6d8d9850c7413f4c1793 SHA256 5c599d7435a6c20ca2fcadecee98f4d335fb7f8f05c1278e1c88773a35b5a368
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-base/kdepim-kresources/kdepim-kresources-4.2.95.ebuild b/kde-base/kdepim-kresources/kdepim-kresources-4.2.95.ebuild
index fb6be764a31..b59b310b5da 100644
--- a/kde-base/kdepim-kresources/kdepim-kresources-4.2.95.ebuild
+++ b/kde-base/kdepim-kresources/kdepim-kresources-4.2.95.ebuild
@@ -13,7 +13,7 @@ IUSE="debug"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
 
 DEPEND="
-	>=kde-base/kdepim-runtime-${PV}:${SLOT}[kdeprefix=]
+	>=kde-base/akonadi-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/libkdepim-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/kaddressbook-${PV}:${SLOT}[kdeprefix=]
 "
diff --git a/kde-base/kdepim-runtime/Manifest b/kde-base/kdepim-runtime/Manifest
deleted file mode 100644
index 7109cdfc8f8..00000000000
--- a/kde-base/kdepim-runtime/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST kdebase-runtime-4.2.95.tar.bz2 7233433 RMD160 800329bd4611d218d675c70f33052ea35f660a8b SHA1 54f5e13d947db00304610715e846992b3e6b08f7 SHA256 95c9fa25d7e3026ddc201c3f7ab0e6c0bb38bc0f3fcf9b9c690004388b7ab56c
-EBUILD kdepim-runtime-4.2.95.ebuild 2132 RMD160 7e389852dc27cac636f03fae2acfc32a869c0bf1 SHA1 3e7e76ea795d4a62f60400173498ad2c2e724fda SHA256 b6295bf546df475ee131a23291a47079f86eace7ae7549a0c571b2e8d49ef93e
-MISC metadata.xml 255 RMD160 cc252d52dc3af272430aacb18e2295e5a8a6bc87 SHA1 02a4002e7da00834fc32c8bf89b9e9079ec39b17 SHA256 288a61d69488cb1a8cbeeb07e32f0b3b9910197e7179599fb4c90ca557b432ab
diff --git a/kde-base/kdepim-runtime/metadata.xml b/kde-base/kdepim-runtime/metadata.xml
deleted file mode 100644
index 278ead40b1a..00000000000
--- a/kde-base/kdepim-runtime/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>kde</herd>
-<use>
-	<flag name="opensync">Enables OpenSync data synchronization protocol support.</flag>
-</use>
-</pkgmetadata>