Remove kde-base/kontactinterfaces, merged into kdepimlibs

30 files changed, 31 insertions, 59 deletions

diff --git a/Documentation/package.keywords/kde-3.5.keywords b/Documentation/package.keywords/kde-3.5.keywords
index d7b1a67b242..b9e56a4308f 100644
--- a/Documentation/package.keywords/kde-3.5.keywords
+++ b/Documentation/package.keywords/kde-3.5.keywords
@@ -1,4 +1,4 @@
-# Jonathan Callen <en.ABCD@gmail.com> (16 Sep 2009)
+# Jonathan Callen <en.ABCD@gmail.com> (17 Sep 2009)
 # Autogenerated by regenerate-files, DO NOT EDIT.
 # Combined KDE 3.5 package.keywords file.
 kde-base/kde-meta:3.5
diff --git a/Documentation/package.keywords/kde-4.2.keywords b/Documentation/package.keywords/kde-4.2.keywords
index 7a0ab051f36..17d4862d91b 100644
--- a/Documentation/package.keywords/kde-4.2.keywords
+++ b/Documentation/package.keywords/kde-4.2.keywords
@@ -1,4 +1,4 @@
-# Jonathan Callen <en.ABCD@gmail.com> (16 Sep 2009)
+# Jonathan Callen <en.ABCD@gmail.com> (17 Sep 2009)
 # Autogenerated by regenerate-files, DO NOT EDIT.
 # You can use this file to keyword/unkeyword the KDE 4.2 release.
 # Edit Documentation/package.keywords/kde-4.2.d/ files instead.
diff --git a/Documentation/package.keywords/kde-4.3.9999.keywords b/Documentation/package.keywords/kde-4.3.9999.keywords
index 844c438ecf0..c139de96054 100644
--- a/Documentation/package.keywords/kde-4.3.9999.keywords
+++ b/Documentation/package.keywords/kde-4.3.9999.keywords
@@ -1,4 +1,4 @@
-# Jonathan Callen <en.ABCD@gmail.com> (16 Sep 2009)
+# Jonathan Callen <en.ABCD@gmail.com> (17 Sep 2009)
 # Autogenerated by regenerate-files, DO NOT EDIT.
 # You can use this file to keyword/unkeyword the KDE 4.3 release.
 # Edit Documentation/package.keywords/kde-4.3.d/ files instead.
diff --git a/Documentation/package.keywords/kde-4.3.keywords b/Documentation/package.keywords/kde-4.3.keywords
index 56b9ec771f1..68cb3a4819f 100644
--- a/Documentation/package.keywords/kde-4.3.keywords
+++ b/Documentation/package.keywords/kde-4.3.keywords
@@ -1,4 +1,4 @@
-# Jonathan Callen <en.ABCD@gmail.com> (16 Sep 2009)
+# Jonathan Callen <en.ABCD@gmail.com> (17 Sep 2009)
 # Autogenerated by regenerate-files, DO NOT EDIT.
 # You can use this file to keyword/unkeyword the KDE 4.3 release.
 # Edit Documentation/package.keywords/kde-4.3.d/ files instead.
diff --git a/Documentation/package.keywords/kde-4.4.keywords b/Documentation/package.keywords/kde-4.4.keywords
index 4067fff9d10..bf2ea2fc992 100644
--- a/Documentation/package.keywords/kde-4.4.keywords
+++ b/Documentation/package.keywords/kde-4.4.keywords
@@ -1,4 +1,4 @@
-# Jonathan Callen <en.ABCD@gmail.com> (16 Sep 2009)
+# Jonathan Callen <en.ABCD@gmail.com> (17 Sep 2009)
 # Autogenerated by regenerate-files, DO NOT EDIT.
 # You can use this file to keyword/unkeyword the KDE 4.4 release.
 # Edit Documentation/package.keywords/kde-4.4.d/ files instead.
diff --git a/Documentation/package.keywords/kde-extras-live.keywords b/Documentation/package.keywords/kde-extras-live.keywords
index 33bf238fbd7..7154bd3039f 100644
--- a/Documentation/package.keywords/kde-extras-live.keywords
+++ b/Documentation/package.keywords/kde-extras-live.keywords
@@ -1,4 +1,4 @@
-# Jonathan Callen <en.ABCD@gmail.com> (16 Sep 2009)
+# Jonathan Callen <en.ABCD@gmail.com> (17 Sep 2009)
 # Autogenerated by regenerate-files, DO NOT EDIT.
 ~app-cdr/k3b-9999 **
 ~app-cdr/k9copy-9999 **
diff --git a/Documentation/package.keywords/kde-live.d/kdepim-live b/Documentation/package.keywords/kde-live.d/kdepim-live
index 3d3d9b811a8..9d5194185d2 100644
--- a/Documentation/package.keywords/kde-live.d/kdepim-live
+++ b/Documentation/package.keywords/kde-live.d/kdepim-live
@@ -17,7 +17,6 @@
 ~kde-base/konsolekalendar-9999 **
 ~kde-base/kontact-9999 **
 ~kde-base/kontact-specialdates-9999 **
-~kde-base/kontactinterfaces-9999 **
 ~kde-base/korganizer-9999 **
 # kde-base/korn:live disabled for now
 ~kde-base/kpilot-9999 **
diff --git a/Documentation/package.keywords/kde-live.keywords b/Documentation/package.keywords/kde-live.keywords
index 628cb339d57..bc6b0cbb22d 100644
--- a/Documentation/package.keywords/kde-live.keywords
+++ b/Documentation/package.keywords/kde-live.keywords
@@ -1,4 +1,4 @@
-# Jonathan Callen <en.ABCD@gmail.com> (16 Sep 2009)
+# Jonathan Callen <en.ABCD@gmail.com> (17 Sep 2009)
 # Autogenerated by regenerate-files, DO NOT EDIT.
 # You can use this file to keyword/unkeyword the KDE live release.
 # Edit Documentation/package.keywords/kde-live.base/ files instead.
@@ -227,7 +227,6 @@
 ~kde-base/konsolekalendar-9999 **
 ~kde-base/kontact-9999 **
 ~kde-base/kontact-specialdates-9999 **
-~kde-base/kontactinterfaces-9999 **
 ~kde-base/korganizer-9999 **
 # kde-base/korn:live disabled for now
 ~kde-base/kpilot-9999 **
diff --git a/Documentation/package.keywords/koffice-live.keywords b/Documentation/package.keywords/koffice-live.keywords
index d47346663c1..c9f63c9c8a3 100644
--- a/Documentation/package.keywords/koffice-live.keywords
+++ b/Documentation/package.keywords/koffice-live.keywords
@@ -1,4 +1,4 @@
-# Jonathan Callen <en.ABCD@gmail.com> (16 Sep 2009)
+# Jonathan Callen <en.ABCD@gmail.com> (17 Sep 2009)
 # Autogenerated by regenerate-files, DO NOT EDIT.
 ~app-office/kword-9999 **
 ~app-office/kplato-9999 **
diff --git a/Documentation/package.unmask/kde-4.2 b/Documentation/package.unmask/kde-4.2
index 57dfa5ff670..eea132e74eb 100644
--- a/Documentation/package.unmask/kde-4.2
+++ b/Documentation/package.unmask/kde-4.2
@@ -1,4 +1,4 @@
-# Jonathan Callen <en.ABCD@gmail.com> (16 Sep 2009)
+# Jonathan Callen <en.ABCD@gmail.com> (17 Sep 2009)
 # Autogenerated by regenerate-files, DO NOT EDIT.
 # You can use this file to mask/unmask KDE 4.2 release.
 # Edit Documentation/package.unmask/kde-4.2.d/ files instead.
diff --git a/Documentation/package.unmask/kde-4.3 b/Documentation/package.unmask/kde-4.3
index d36dc0d2006..e25e0ba7ec8 100644
--- a/Documentation/package.unmask/kde-4.3
+++ b/Documentation/package.unmask/kde-4.3
@@ -1,4 +1,4 @@
-# Jonathan Callen <en.ABCD@gmail.com> (16 Sep 2009)
+# Jonathan Callen <en.ABCD@gmail.com> (17 Sep 2009)
 # Autogenerated by regenerate-files, DO NOT EDIT.
 # You can use this file to mask/unmask KDE 4.3 release.
 # Edit Documentation/package.unmask/kde-4.3.d/ files instead.
diff --git a/Documentation/package.unmask/kde-4.4 b/Documentation/package.unmask/kde-4.4
index af20ff490fd..939326f8843 100644
--- a/Documentation/package.unmask/kde-4.4
+++ b/Documentation/package.unmask/kde-4.4
@@ -1,4 +1,4 @@
-# Jonathan Callen <en.ABCD@gmail.com> (16 Sep 2009)
+# Jonathan Callen <en.ABCD@gmail.com> (17 Sep 2009)
 # Autogenerated by regenerate-files, DO NOT EDIT.
 # You can use this file to mask/unmask KDE 4.4 release.
 # Edit Documentation/package.unmask/kde-4.4.d/ files instead.
diff --git a/Documentation/package.unmask/kde-live b/Documentation/package.unmask/kde-live
index e66328cdf56..b4ee2f9f313 100644
--- a/Documentation/package.unmask/kde-live
+++ b/Documentation/package.unmask/kde-live
@@ -1,4 +1,4 @@
-# Jonathan Callen <en.ABCD@gmail.com> (16 Sep 2009)
+# Jonathan Callen <en.ABCD@gmail.com> (17 Sep 2009)
 # Autogenerated by regenerate-files, DO NOT EDIT.
 # Live packages are masked by default.
 # Edit Documentation/package.unmask/kde-live.d/ files instead.
@@ -288,7 +288,6 @@ kde-base/knotes:live
 kde-base/konsolekalendar:live
 kde-base/kontact:live
 kde-base/kontact-specialdates:live
-kde-base/kontactinterfaces:live
 kde-base/korganizer:live
 # kde-base/korn:live disabled for now
 kde-base/kpilot:live
diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass
index 27e7230898c..c9dbfe4d76c 100644
--- a/eclass/kde4-meta.eclass
+++ b/eclass/kde4-meta.eclass
@@ -41,7 +41,9 @@ case ${KMNAME} in
 		case ${PN} in
 			akregator|kaddressbook|kjots|kmail|knode|knotes|korganizer|ktimetracker)
 				IUSE+=" +kontact"
-				RDEPEND+=" kontact? ( >=kde-base/kontactinterfaces-${PV}:${SLOT}[kdeprefix=] )"
+				if ! slot_is_at_least 4.4 ${SLOT} || [[ ${SLOT} == 4.4 && ${PV} < 4.3.68 ]]; then
+					RDEPEND+=" kontact? ( >=kde-base/kontactinterfaces-${PV}:${SLOT}[kdeprefix=] )"
+				fi
 				;;
 		esac
 		;;
@@ -358,8 +360,10 @@ kde4-meta_create_extractlists() {
 			if has kontact ${IUSE//+} && use kontact; then
 				KMEXTRA+="
 					kontact/plugins/${PLUGINNAME:-${PN}}/"
-				KMEXTRACTONLY+="
-					kontactinterfaces/"
+				if ! slot_is_at_least 4.4 ${SLOT} || [[ ${SLOT} == 4.4 && ${PV} < 4.3.68 ]]; then
+					KMEXTRACTONLY+="
+						kontactinterfaces/"
+				fi
 			fi
 			;;
 		kdeutils)
diff --git a/kde-base/kdepim-meta/Manifest b/kde-base/kdepim-meta/Manifest
index d6663218c6c..ecc1316d9ec 100644
--- a/kde-base/kdepim-meta/Manifest
+++ b/kde-base/kdepim-meta/Manifest
@@ -1,5 +1,5 @@
 EBUILD kdepim-meta-4.3.0.ebuild 1824 RMD160 9bedc9e2e1b958bdab0c9071ebea7c64dde59a86 SHA1 3e81de41e0dad980b275cee56cc7d61a38b686f6 SHA256 1a1703269ac5000a9a10f123cbb98866abf1a1b505de6aab747fe741a37d52b5
 EBUILD kdepim-meta-4.3.67.ebuild 1825 RMD160 2dc3cecb01929b874277efbd33f4a7a127717e7a SHA1 f068cfb5d83bfb34cbd83fcbf36cb8e2feb748f5 SHA256 ca45bf7c8427e19865be794f214b3c20f2aa5b1903b16fe2e65722187c94f321
 EBUILD kdepim-meta-4.3.9999.ebuild 1783 RMD160 6590e21ceff3434f269a9767a259f9f63e67363b SHA1 fc746e11096eaa3fe8fc516a7e132c569f5dcd46 SHA256 7bb7938e4e4e18f54cd7b2636c66d96da1d0e682e719a8ef43dd871e8c545366
-EBUILD kdepim-meta-9999.ebuild 1834 RMD160 12620217c5abef83d5e48adea08bd5df6cdb0a0d SHA1 92156a831e4862be45d878c121347439d4eb26c2 SHA256 48ac7720c5ecb32bc3543967fc8be11bd745e7dedd580d3ea3d7b5adae7d9384
+EBUILD kdepim-meta-9999.ebuild 1778 RMD160 5d287d167bfcc745d7177014a2c8968e1466ae03 SHA1 4cae99f7b4f2f2824f829a57268f5b58ce37cf24 SHA256 3887508ac76da2c813c4bc7449681a80c61cbbcc11b44c62e6a13b979a8cda76
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-base/kdepim-meta/kdepim-meta-9999.ebuild b/kde-base/kdepim-meta/kdepim-meta-9999.ebuild
index 989e5c8460c..55ca2ca80dc 100644
--- a/kde-base/kdepim-meta/kdepim-meta-9999.ebuild
+++ b/kde-base/kdepim-meta/kdepim-meta-9999.ebuild
@@ -32,7 +32,6 @@ RDEPEND="
 	>=kde-base/konsolekalendar-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/kontact-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/kontact-specialdates-${PV}:${SLOT}[kdeprefix=]
-	>=kde-base/kontactinterfaces-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/korganizer-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/kpilot-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/ktimetracker-${PV}:${SLOT}[kdeprefix=]
diff --git a/kde-base/kdepimlibs/Manifest b/kde-base/kdepimlibs/Manifest
index d53bf09d1bf..f0a846b692a 100644
--- a/kde-base/kdepimlibs/Manifest
+++ b/kde-base/kdepimlibs/Manifest
@@ -1,5 +1,5 @@
 DIST kdepimlibs-4.3.67.tar.lzma 1652215 RMD160 ca16024862db3f86fa6e56bc332fc709d7c90791 SHA1 109fe0dc2a5f4afc36e2de989698d3ee2c7e4c0b SHA256 128b569c01fcb19de2579548a0330b3afb11261703bd8de4b36fc78aef40029b
 EBUILD kdepimlibs-4.3.67.ebuild 1243 RMD160 89f646413b00a9b855b1c63feb567638dca37c7d SHA1 405e04a56cef21fd72675cb61c5e74b0c6a76683 SHA256 869fc5afaa81dccb716b2720e8b2991d78538a620ee801c754d3cb8ab9ef84cf
 EBUILD kdepimlibs-4.3.9999.ebuild 949 RMD160 6f4de549d0b57b6e70189aea1fb3061941611061 SHA1 ac7ba763a831e73501d2e737f77be4e8a9244cca SHA256 7d5a7c6348ca7d74d9655fad76302fc6efe83c2c705838dddb54f6b38521dc15
-EBUILD kdepimlibs-9999.ebuild 1201 RMD160 788d6208eb7064a75a6cc3f7fc6e4b87e0cdab74 SHA1 5ee80d24f5b5bcff82bc2c472f3c17284f8c3ed6 SHA256 3eb6ae86fa5c147cda1a952b871cdfd6560607ba0bf23c58c59adaaae206cc01
+EBUILD kdepimlibs-9999.ebuild 1346 RMD160 a3937ff693d9fde000eb00b72b9c3db5499792e2 SHA1 e6d7bb100a964b34b9b0380681220bd4fb3d0300 SHA256 2e86823ed3742aa690f6c91ffec819f709b93059796167a7da20e4bf10410394
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-base/kdepimlibs/kdepimlibs-9999.ebuild b/kde-base/kdepimlibs/kdepimlibs-9999.ebuild
index 796e466f3ac..340059e986f 100644
--- a/kde-base/kdepimlibs/kdepimlibs-9999.ebuild
+++ b/kde-base/kdepimlibs/kdepimlibs-9999.ebuild
@@ -28,6 +28,7 @@ DEPEND="
 "
 # @since 4.3 - libkholidays is in kdepimlibs now
 # libakonadi-contact moved here from akonadi in 4.3.66
+# @since 4.4 - kontactinterfaces is in kdepimlibs now
 RDEPEND="${DEPEND}
 	!kdeprefix? (
 		!kde-base/akonadi:4.1[-kdeprefix]
@@ -35,10 +36,12 @@ RDEPEND="${DEPEND}
 		!kde-base/libkholidays:4.2[-kdeprefix]
 		!<kde-base/akonadi-4.3.66:4.4[-kdeprefix]
 		!=kde-base/akonadi-9999:live[-kdeprefix]
+		!kde-base/kontactinterfaces[-kdeprefix]
 	)
 	kdeprefix? (
 		!<kde-base/akonadi-4.3.66:${SLOT}[kdeprefix]
 		!=kde-base/akonadi-9999:${SLOT}[kdeprefix]
+		!kde-base/kontactinterfaces:${SLOT}[kdeprefix]
 	)
 "
 
diff --git a/kde-base/kontact-specialdates/Manifest b/kde-base/kontact-specialdates/Manifest
index 8a15d8b6699..8cdc053188f 100644
--- a/kde-base/kontact-specialdates/Manifest
+++ b/kde-base/kontact-specialdates/Manifest
@@ -1,5 +1,5 @@
 DIST kdepim-4.3.67.tar.lzma 9432673 RMD160 ef4ff68a5c6e2ea3c9c61dcdea27772b75398e9e SHA1 a928517285294fedd21ef66b304e113d2f2c4572 SHA256 10e19f1a001d887305356711eea77d6fcb2f841644aaf1d1e7b1028fe2f099b9
 EBUILD kontact-specialdates-4.3.67.ebuild 960 RMD160 4a78a6dc39abea1852a7ddfafe27bcbc90a2a8fb SHA1 fe0f095045a8f7713b78db0850f10d0b6485d7e4 SHA256 c8914557b76e9bd98937113157c81be10f513332164f66cf34946fcdc282310a
 EBUILD kontact-specialdates-4.3.9999.ebuild 918 RMD160 c7fd578be80ffd74fc9e75243a86f36a4563ab0f SHA1 2d5071bf773256eb1fad1ca28160126f7fc4d6db SHA256 3822d921542083d66c00a6be0ef751087023a0d26cdbcb9046a84b3de28cde94
-EBUILD kontact-specialdates-9999.ebuild 918 RMD160 c7fd578be80ffd74fc9e75243a86f36a4563ab0f SHA1 2d5071bf773256eb1fad1ca28160126f7fc4d6db SHA256 3822d921542083d66c00a6be0ef751087023a0d26cdbcb9046a84b3de28cde94
+EBUILD kontact-specialdates-9999.ebuild 898 RMD160 f2c4ab18b60b06e28e068b96ff04304eb71b11ba SHA1 9e86278633c27e363472b0c0144e8e2bde75b66c SHA256 bdf1e493d54a5cd7c6981cb21e1069552d745a31a9c2465e0062b5e78ca85e7f
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-base/kontact-specialdates/kontact-specialdates-9999.ebuild b/kde-base/kontact-specialdates/kontact-specialdates-9999.ebuild
index 1014a0efed9..f2e0bd3c16a 100644
--- a/kde-base/kontact-specialdates/kontact-specialdates-9999.ebuild
+++ b/kde-base/kontact-specialdates/kontact-specialdates-9999.ebuild
@@ -22,7 +22,6 @@ RDEPEND="${DEPEND}
 "
 
 KMEXTRACTONLY="
-	kontactinterfaces/
 	kaddressbook
 	korganizer
 "
diff --git a/kde-base/kontact/Manifest b/kde-base/kontact/Manifest
index 0971d808bf0..c8e3bb14e71 100644
--- a/kde-base/kontact/Manifest
+++ b/kde-base/kontact/Manifest
@@ -1,5 +1,5 @@
 DIST kdepim-4.3.67.tar.lzma 9432673 RMD160 ef4ff68a5c6e2ea3c9c61dcdea27772b75398e9e SHA1 a928517285294fedd21ef66b304e113d2f2c4572 SHA256 10e19f1a001d887305356711eea77d6fcb2f841644aaf1d1e7b1028fe2f099b9
 EBUILD kontact-4.3.67.ebuild 1179 RMD160 66da679993adb36b2695e823b5d5aceb1ba0770c SHA1 e03d39e2fd3b5e4827cd8d3c9d4049a1728fe9bc SHA256 0772b2eedf860a029be79d283c251447addb30cb705f893dda87241f1873dc17
 EBUILD kontact-4.3.9999.ebuild 995 RMD160 56da8f186500344620c18a4056ead02875f2801f SHA1 b54d9cf48158a1c3ccb05d47d6a7b39d3886e155 SHA256 f3496e8521afce99b9bc47c5746542afdcffe7be364fbcf10271ad1e03ca5ec2
-EBUILD kontact-9999.ebuild 1137 RMD160 77ce12bace86fd7d333ee4758fa37554f80969ac SHA1 75e29308d8b1742e9c5ac04a11423aeaada20769 SHA256 3a627a5ad16510a76f66a47527d2ef8ed9d2d2fc7b0431cb41eb76a782f0f08d
+EBUILD kontact-9999.ebuild 1061 RMD160 25c3fcf324f95b1038e752f4a315ca03f4ac4b6a SHA1 c884ce5eb2f7c677b5754423446745255ffc3793 SHA256 66a8c3fb1132a7cc757035a05ee2bcaf1eb12fa16076461bfda8e2909412a136
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-base/kontact/kontact-9999.ebuild b/kde-base/kontact/kontact-9999.ebuild
index 3069e4b0563..a36e6cba2f0 100644
--- a/kde-base/kontact/kontact-9999.ebuild
+++ b/kde-base/kontact/kontact-9999.ebuild
@@ -13,7 +13,6 @@ IUSE="debug +handbook"
 
 DEPEND="
 	app-crypt/gpgme
-	>=kde-base/kontactinterfaces-${PV}:${SLOT}[kdeprefix=]
 	>=kde-base/libkdepim-${PV}:${SLOT}[kdeprefix=]
 "
 RDEPEND="${DEPEND}
@@ -40,7 +39,6 @@ KMEXTRACTONLY="
 	kontact/plugins/ktimetracker/
 	kontact/plugins/planner/
 	kontact/plugins/specialdates/
-	kontactinterfaces/
 "
 
 src_unpack() {
diff --git a/kde-base/kontactinterfaces/Manifest b/kde-base/kontactinterfaces/Manifest
index da967d56504..7b79d66de35 100644
--- a/kde-base/kontactinterfaces/Manifest
+++ b/kde-base/kontactinterfaces/Manifest
@@ -1,5 +1,4 @@
 DIST kdepim-4.3.67.tar.lzma 9432673 RMD160 ef4ff68a5c6e2ea3c9c61dcdea27772b75398e9e SHA1 a928517285294fedd21ef66b304e113d2f2c4572 SHA256 10e19f1a001d887305356711eea77d6fcb2f841644aaf1d1e7b1028fe2f099b9
 EBUILD kontactinterfaces-4.3.67.ebuild 437 RMD160 2d00b427d52147b0eadad3bad14270be9411a057 SHA1 72fdf34bd40312d20eef5731222fee42b426b86d SHA256 898ebea534f018fc487a7eb041d4753fd6cae6f61797784f9b0c47b58775d70d
 EBUILD kontactinterfaces-4.3.9999.ebuild 439 RMD160 4cba247e56b4642ca4ae4283ad7c7f3c9ddccea0 SHA1 68149baf22ada23635939bfdfd9446f6e16b566b SHA256 f7add5b0f428ec8c1b7ba89920279fce077fea39cc1fe2ef80d8a38dc5e6f8f2
-EBUILD kontactinterfaces-9999.ebuild 395 RMD160 9d7099b103cd4aa737909880c545efcf94063ee9 SHA1 bc3dc05184a9fcb9843209454230abe472a6f182 SHA256 9228def9b3478ff89ea818bf6ad2aaa9a5556ae8406b8d4037c64b6249a8fd9d
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-base/kontactinterfaces/kontactinterfaces-9999.ebuild b/kde-base/kontactinterfaces/kontactinterfaces-9999.ebuild
deleted file mode 100644
index 180743cdcd4..00000000000
--- a/kde-base/kontactinterfaces/kontactinterfaces-9999.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-KMNAME="kdepim"
-inherit kde4-meta
-
-DESCRIPTION="Interfaces for Kontact"
-KEYWORDS=""
-IUSE="debug"
-
-DEPEND="
-	>=kde-base/libkdepim-${PV}:${SLOT}[kdeprefix=]
-"
-RDEPEND="${DEPEND}"
-
-KMEXTRACTONLY="
-	korganizer/korgac/org.kde.korganizer.KOrgac.xml
-"
-
-KMSAVELIBS="true"
diff --git a/kde-base/korganizer/Manifest b/kde-base/korganizer/Manifest
index 14131cae09b..fa33945abe5 100644
--- a/kde-base/korganizer/Manifest
+++ b/kde-base/korganizer/Manifest
@@ -1,5 +1,5 @@
 DIST kdepim-4.3.67.tar.lzma 9432673 RMD160 ef4ff68a5c6e2ea3c9c61dcdea27772b75398e9e SHA1 a928517285294fedd21ef66b304e113d2f2c4572 SHA256 10e19f1a001d887305356711eea77d6fcb2f841644aaf1d1e7b1028fe2f099b9
 EBUILD korganizer-4.3.67.ebuild 1217 RMD160 65fb5d37fc5dd007a2fd27116ac254b7e8a987cd SHA1 f6e5f6f733f694e3bd9c7bbf476ebd5b0b84fc4c SHA256 2a10072420fb7e361ebaba431d1b9b2c29b1ad5fb88b24c35bfb1cc19aff0f65
 EBUILD korganizer-4.3.9999.ebuild 1219 RMD160 538852515049ad72993bd87cd018399160c57389 SHA1 e7d0e52cb0acb8b26880327a99b5c333bfd11d22 SHA256 cbb8091d2488a022c1e04010e42f847ac6d05b66b41bbc6b155121f0a9d85d32
-EBUILD korganizer-9999.ebuild 1175 RMD160 6e739657b781f922acf7134446b08e48afac85b4 SHA1 93a314cc23072314395c80ad2e023c85a64a3641 SHA256 63659964b24c5c4adaaf802154f8f8850aa9160e90eaef76fd0e8c1ca5a9a493
+EBUILD korganizer-9999.ebuild 1128 RMD160 092f8c5e7fe4c98e94a2138475e82b5a7aacc919 SHA1 6a7ed913c3fc13dba62f21b9c3cfc307032a1570 SHA256 b1254f6007561aacca01e540e6c82d44807aa0ab02d8e083cdb5d51c96479c6d
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-base/korganizer/korganizer-9999.ebuild b/kde-base/korganizer/korganizer-9999.ebuild
index 7d4a28cd217..48ba5ad3b60 100644
--- a/kde-base/korganizer/korganizer-9999.ebuild
+++ b/kde-base/korganizer/korganizer-9999.ebuild
@@ -30,7 +30,6 @@ KMEXTRACTONLY="
 
 src_unpack() {
 	if use kontact; then
-		KMLOADLIBS="${KMLOADLIBS} kontactinterfaces"
 		KMEXTRA="${KMEXTRA} kontact/plugins/planner"
 	fi
 
diff --git a/kde-base/ktimetracker/Manifest b/kde-base/ktimetracker/Manifest
index 1e852c974e9..332e7ad2ea9 100644
--- a/kde-base/ktimetracker/Manifest
+++ b/kde-base/ktimetracker/Manifest
@@ -1,5 +1,5 @@
 DIST kdepim-4.3.67.tar.lzma 9432673 RMD160 ef4ff68a5c6e2ea3c9c61dcdea27772b75398e9e SHA1 a928517285294fedd21ef66b304e113d2f2c4572 SHA256 10e19f1a001d887305356711eea77d6fcb2f841644aaf1d1e7b1028fe2f099b9
 EBUILD ktimetracker-4.3.67.ebuild 716 RMD160 b96a87e78b7570774db7c89d17e317598ebf952e SHA1 3fc3ea2009b63415de1f4747ef9b1fa2b10261dc SHA256 e70ec4dd991b90d3fd0fc908161a981e355e2d9f5fb35fcfe73b4128b79efad5
 EBUILD ktimetracker-4.3.9999.ebuild 674 RMD160 fa79081c9e9724b1cb2cb1494956d79a8dd17c6f SHA1 ba3c8524962a634226de156d2057f3b6d73059d7 SHA256 697f5f7773c23e74b5dc43af25049ff9477e34292edc718d70cd940d382c7563
-EBUILD ktimetracker-9999.ebuild 674 RMD160 fa79081c9e9724b1cb2cb1494956d79a8dd17c6f SHA1 ba3c8524962a634226de156d2057f3b6d73059d7 SHA256 697f5f7773c23e74b5dc43af25049ff9477e34292edc718d70cd940d382c7563
+EBUILD ktimetracker-9999.ebuild 627 RMD160 b5401444a7bd69025acca967bfea3ed56efc6761 SHA1 e9acd42a519a5481e423deb83720ff0523a7311f SHA256 662652a134b8ed96b0b62fe649b8218529da0bf70249fb373e054d7d1a58145b
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/kde-base/ktimetracker/ktimetracker-9999.ebuild b/kde-base/ktimetracker/ktimetracker-9999.ebuild
index fa27334f9b8..19d1f1f968f 100644
--- a/kde-base/ktimetracker/ktimetracker-9999.ebuild
+++ b/kde-base/ktimetracker/ktimetracker-9999.ebuild
@@ -28,7 +28,6 @@ KMLOADLIBS="libkdepim"
 
 src_unpack() {
 	if use kontact; then
-		KMLOADLIBS="${KMLOADLIBS} kontactinterfaces"
 		KMEXTRA="${KMEXTRA} kontact/plugins/ktimetracker"
 	fi
 
diff --git a/profiles/package.mask b/profiles/package.mask
index 629ceec5dbb..3c9a3c1c0a9 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,4 +1,4 @@
-# Jonathan Callen <en.ABCD@gmail.com> (16 Sep 2009)
+# Jonathan Callen <en.ABCD@gmail.com> (17 Sep 2009)
 # Autogenerated by regenerate-files, DO NOT EDIT.
 # Edit profiles/package.mask.d/ files instead.
 
@@ -6,7 +6,7 @@
 # Name changed to plasma-applet-daisy.
 kde-misc/daisy
 
-# Jonathan Callen <en.ABCD@gmail.com> (16 Sep 2009)
+# Jonathan Callen <en.ABCD@gmail.com> (17 Sep 2009)
 # Autogenerated by regenerate-files, DO NOT EDIT.
 # You can use this file to mask/unmask KDE 4.4 release.
 # Edit Documentation/package.unmask/kde-4.4.d/ files instead.
@@ -291,7 +291,7 @@ kde-base/kdetoys-meta:4.4
 kde-base/kdeutils-meta:4.4
 kde-base/kdewebdev-meta:4.4
 
-# Jonathan Callen <en.ABCD@gmail.com> (16 Sep 2009)
+# Jonathan Callen <en.ABCD@gmail.com> (17 Sep 2009)
 # Autogenerated by regenerate-files, DO NOT EDIT.
 # Live packages are masked by default.
 # Edit Documentation/package.unmask/kde-live.d/ files instead.
@@ -581,7 +581,6 @@ kde-base/knotes:live
 kde-base/konsolekalendar:live
 kde-base/kontact:live
 kde-base/kontact-specialdates:live
-kde-base/kontactinterfaces:live
 kde-base/korganizer:live
 # kde-base/korn:live disabled for now
 kde-base/kpilot:live
diff --git a/sets/kdepim-live b/sets/kdepim-live
index 7486e3e1343..efed82f77ff 100644
--- a/sets/kdepim-live
+++ b/sets/kdepim-live
@@ -17,7 +17,6 @@ kde-base/knotes:live
 kde-base/konsolekalendar:live
 kde-base/kontact:live
 kde-base/kontact-specialdates:live
-kde-base/kontactinterfaces:live
 kde-base/korganizer:live
 # kde-base/korn:live disabled for now
 kde-base/kpilot:live