[kde-base] Update blockers and deps to reflect move of libakonadi-contact.so from akonadi to kdepimlibs

6 files changed, 17 insertions, 18 deletions

diff --git a/kde-base/kdepimlibs/Manifest b/kde-base/kdepimlibs/Manifest
index fc6bbd83fb8..d4519ddb876 100644
--- a/kde-base/kdepimlibs/Manifest
+++ b/kde-base/kdepimlibs/Manifest
@@ -1,5 +1,5 @@
 DIST kdepimlibs-4.3.65.tar.lzma 1571894 RMD160 d41c1c07b385be4611ba15e962faee915fca1d4f SHA1 319b1e20dfc80961df35dee18744f6044df068c9 SHA256 aa38e7888a0c785340d2160237c08bbfdca064b3d339629804a8b410ad35b60c
-EBUILD kdepimlibs-4.3.65.ebuild 956 RMD160 33d2968684ee8e9f7c434c40c0d7e6a39e8c217e SHA1 d07fa020b3d002eb8123e4230025ac79ea11274c SHA256 928956b8da665e5333a341be313a9a8958022c79c6d56eef913f936fe4f34718
-EBUILD kdepimlibs-4.3.9999.ebuild 913 RMD160 2a89c311557e505739688e23738022e8036e8c80 SHA1 524ae4a77c675be0bb1613f00768b612308435ab SHA256 43b41f93f357035725d88aca64981ba4bb19f6e0fed6aa5b5f318edb6e53aac5
-EBUILD kdepimlibs-9999.ebuild 914 RMD160 70ecf111fc36294e57d8ff615356367bc8e11db6 SHA1 78b304842e333f6707fba67ba50c9d8edb53260c SHA256 5807ebb1b3e7e1a3c0cf9f8571a2266819efaa8e2db85fe4cc9e3e4859ca84be
+EBUILD kdepimlibs-4.3.65.ebuild 992 RMD160 cb5071172fbc9fb61fdf2faf94007f034a28354f SHA1 f58229e9d1af03f7e3dfd10dcc2a11c3ac791f1d SHA256 d72e5b042828ada7bb30f27dffa37c34074687b15ca6e85ebfaebb95c359de53
+EBUILD kdepimlibs-4.3.9999.ebuild 949 RMD160 754eeac05d4624f6a84e5979e76b7c598a946ee8 SHA1 1152040e41414853f15f96237eeb4946dda0210c SHA256 bf25bd2ef166bec9986c8a7b21013161a195ac5511a12442667327d2fcdd1fee
+EBUILD kdepimlibs-9999.ebuild 1110 RMD160 1b342771d6ab205b0e442cf36845de5c584f5cbb SHA1 ddef442bfd1a3343f181ae76ee06bdd7ea8b6a31 SHA256 6bd19ac1ccbf5ca2223f3855702e07a94b4fb270bc5715bd41c869eb93fe0f26
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-base/kdepimlibs/kdepimlibs-4.3.65.ebuild b/kde-base/kdepimlibs/kdepimlibs-4.3.65.ebuild
index 0566e479c32..9fc2c76b974 100644
--- a/kde-base/kdepimlibs/kdepimlibs-4.3.65.ebuild
+++ b/kde-base/kdepimlibs/kdepimlibs-4.3.65.ebuild
@@ -29,9 +29,9 @@ DEPEND="
 # @since 4.3 - libkholidays is in kdepimlibs now
 RDEPEND="${DEPEND}
 	!kdeprefix? (
-		!kde-base/akonadi:4.1
-		!kde-base/libkholidays:4.1
-		!kde-base/libkholidays:4.2
+		!kde-base/akonadi:4.1[-kdeprefix]
+		!kde-base/libkholidays:4.1[-kdeprefix]
+		!kde-base/libkholidays:4.2[-kdeprefix]
 	)
 "
 
diff --git a/kde-base/kdepimlibs/kdepimlibs-4.3.9999.ebuild b/kde-base/kdepimlibs/kdepimlibs-4.3.9999.ebuild
index aa1c4f9e8a0..9207493b2eb 100644
--- a/kde-base/kdepimlibs/kdepimlibs-4.3.9999.ebuild
+++ b/kde-base/kdepimlibs/kdepimlibs-4.3.9999.ebuild
@@ -29,9 +29,9 @@ DEPEND="
 # @since 4.3 - libkholidays is in kdepimlibs now
 RDEPEND="${DEPEND}
 	!kdeprefix? (
-		!kde-base/akonadi:4.1
-		!kde-base/libkholidays:4.1
-		!kde-base/libkholidays:4.2
+		!kde-base/akonadi:4.1[-kdeprefix]
+		!kde-base/libkholidays:4.1[-kdeprefix]
+		!kde-base/libkholidays:4.2[-kdeprefix]
 	)
 "
 
diff --git a/kde-base/kdepimlibs/kdepimlibs-9999.ebuild b/kde-base/kdepimlibs/kdepimlibs-9999.ebuild
index 9417818c551..7208f639082 100644
--- a/kde-base/kdepimlibs/kdepimlibs-9999.ebuild
+++ b/kde-base/kdepimlibs/kdepimlibs-9999.ebuild
@@ -27,12 +27,15 @@ DEPEND="
 	ldap? ( net-nds/openldap )
 "
 # @since 4.3 - libkholidays is in kdepimlibs now
+# libakonadi-contact moved here from akonadi in 4.3.66
 RDEPEND="${DEPEND}
 	!kdeprefix? (
-		!kde-base/akonadi:4.1
-		!kde-base/libkholidays:4.1
-		!kde-base/libkholidays:4.2
+		!kde-base/akonadi:4.1[-kdeprefix]
+		!kde-base/libkholidays:4.1[-kdeprefix]
+		!kde-base/libkholidays:4.2[-kdeprefix]
+		!<kde-base/akonadi-4.3.66:4.3[-kdeprefix]
 	)
+	kdeprefix? ( !<kde-base/akonadi-4.3.66:${SLOT}[kdeprefix] )
 "
 
 src_configure() {
diff --git a/kde-base/libkdepim/Manifest b/kde-base/libkdepim/Manifest
index df6d6103440..ad38e70208b 100644
--- a/kde-base/libkdepim/Manifest
+++ b/kde-base/libkdepim/Manifest
@@ -2,5 +2,5 @@ AUX libkdepim-fix-link.patch 380 RMD160 126174f177d884e4e8fd82ef82ffccb5a1fc3367
 DIST kdepim-4.3.65.tar.lzma 9426206 RMD160 c6c4c4c409eb06e3b6734617d5cac4f71541a7e7 SHA1 0c0eba44ec8815fcce1e20ee0fbab1b5359e2d98 SHA256 d6652d0ba41e4011fa576d2546cab5aeabf8a3453a49478aa4dd34f474abe103
 EBUILD libkdepim-4.3.65.ebuild 1041 RMD160 c7978242e669bbc63b0704e2d57a1941398e5ede SHA1 9aa25e27aebdd9b85faffd9c83ef62f9f6354a59 SHA256 4638ac2e4edf3166492dc3a18dadd81bea07e656a712c48e77b7c204854386bf
 EBUILD libkdepim-4.3.9999.ebuild 910 RMD160 19dc46bb4b962de4b60a7559b51438dbe2b5a4a9 SHA1 93676ae49f108aa93b5d830b13c6e0fa993bfe8f SHA256 efa453247321f2d2bb65d4e90585680d687f3ddd50a80ae9923e15c0a135a4ff
-EBUILD libkdepim-9999.ebuild 933 RMD160 fe5c6217bf8d64922dbfea277e56208e316fa5e9 SHA1 2db134b8318c2c2e6b69a86b649c76a052f14500 SHA256 6f70e7fd23460252e53d5d7a4504b9aadcdefb2411496e39b89a4791ac76e1e1
+EBUILD libkdepim-9999.ebuild 866 RMD160 b47e1226de2263c46a9a4c2450db2718cd56793d SHA1 e9deccb3c614944d693f053916f609fa2ed925c8 SHA256 1da8465fe6219a434f7aeb899a55f4f326229f0bb878455c1cbfe25e069b1d4c
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-base/libkdepim/libkdepim-9999.ebuild b/kde-base/libkdepim/libkdepim-9999.ebuild
index 2f3419adcf5..87b55435a34 100644
--- a/kde-base/libkdepim/libkdepim-9999.ebuild
+++ b/kde-base/libkdepim/libkdepim-9999.ebuild
@@ -11,12 +11,8 @@ DESCRIPTION="Common library for KDE PIM apps"
 KEYWORDS=""
 IUSE="debug"
 
-DEPEND="
-	>=kde-base/akonadi-${PV}:${SLOT}[kdeprefix=]
-"
-
 # @Since >4.2.65 kode removed from kdepim
-RDEPEND="${DEPEND}
+RDEPEND="
 	!kdeprefix? ( !>=kde-base/kode-4.1.0[-kdeprefix] )
 	kdeprefix? ( !kde-base/kode:${SLOT} )
 "