Add kdepim 4.6 beta 3

44 files changed, 853 insertions, 0 deletions

diff --git a/kde-base/akonadiconsole/Manifest b/kde-base/akonadiconsole/Manifest
index e5413b51b05..9aa1639dc50 100644
--- a/kde-base/akonadiconsole/Manifest
+++ b/kde-base/akonadiconsole/Manifest
@@ -1,3 +1,5 @@
+DIST kdepim-4.6beta3.tar.bz2 42287019 RMD160 09f7f8013679b1031c21f70215c7aae4bdcb04f6 SHA1 de9e1dcef1c25031dbdbad0bb68aee75852b02df SHA256 c282acbafb7a207d6b8690bcdbc2d05298b41860b55aa4932979b877487c6636
+EBUILD akonadiconsole-4.5.93.ebuild 431 RMD160 836d444eb9d942277af4a149ea68c232497b53ea SHA1 d9dd8b16ffcc727247aae2e9856ccb5204a363be SHA256 45a4cd503a35237b9ceedcfdc4805bb5dbc908f1056fe5c44ec240489c059714
 EBUILD akonadiconsole-4.5.9999.ebuild 397 RMD160 43d6af4cb0dc0fa6219223daa6a8c286bd197673 SHA1 53a4df43dbafeb9e06f42ca097f2aa2c8e15f3c0 SHA256 dee1ab6310e7d2444f994712724aacaf9233deb0ede4c8eeb43d4008e2f173af
 EBUILD akonadiconsole-4.6.9999.ebuild 420 RMD160 4f0361e6b9133942c1ff376a9cfafdb04b80e4a7 SHA1 aee17e97c20fbe36cb57329a193db63d96c61ce2 SHA256 87075bbb99b499b14dffc3023b46162d63f345a34005d5f625a21d48c25d56cf
 EBUILD akonadiconsole-9999.ebuild 420 RMD160 4f0361e6b9133942c1ff376a9cfafdb04b80e4a7 SHA1 aee17e97c20fbe36cb57329a193db63d96c61ce2 SHA256 87075bbb99b499b14dffc3023b46162d63f345a34005d5f625a21d48c25d56cf
diff --git a/kde-base/akonadiconsole/akonadiconsole-4.5.93.ebuild b/kde-base/akonadiconsole/akonadiconsole-4.5.93.ebuild
new file mode 100644
index 00000000000..8461a2d573c
--- /dev/null
+++ b/kde-base/akonadiconsole/akonadiconsole-4.5.93.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="3"
+
+KMNAME="kdepim"
+inherit kde4-meta
+
+DESCRIPTION="Akonadi developer console"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep kdepimlibs 'semantic-desktop')
+	$(add_kdebase_dep kdepim-common-libs)
+"
+RDEPEND="${DEPEND}"
+
+KMEXTRACTONLY="
+	akonadi_next/
+	calendarsupport/
+	messageviewer/
+"
diff --git a/kde-base/akregator/Manifest b/kde-base/akregator/Manifest
index 8d38f8413af..58b713d5a58 100644
--- a/kde-base/akregator/Manifest
+++ b/kde-base/akregator/Manifest
@@ -1,4 +1,6 @@
+DIST kdepim-4.6beta3.tar.bz2 42287019 RMD160 09f7f8013679b1031c21f70215c7aae4bdcb04f6 SHA1 de9e1dcef1c25031dbdbad0bb68aee75852b02df SHA256 c282acbafb7a207d6b8690bcdbc2d05298b41860b55aa4932979b877487c6636
 EBUILD akregator-4.4.9999.ebuild 358 RMD160 e1eac4f7d3eea973f0b3241954000d14072d29fc SHA1 3caad65cafc421caf80a6546ffee27e128ba15bd SHA256 ff7b73fadda837d548c3e70eeb6ed73cdc08775947f225f2405213309220d927
+EBUILD akregator-4.5.93.ebuild 401 RMD160 f0104f22887fcd68331daae9d04a1df205f2b21b SHA1 b3419b6ef94cf3c3b8f1b934c933ad5b64090ee1 SHA256 b3fde3aa8035cdef42aef7f5906c8d58f9f59f982a1fd286fd550ffa5e5dd8a7
 EBUILD akregator-4.5.9999.ebuild 390 RMD160 f25dd2b31456c70e28f9fbde05802ba3de538ecb SHA1 9317a5d3e36792943b23fc48869a50f5fd82511a SHA256 b7055b3cb41f6520b1ec9a51f548fd615ad754da7f30ec8d8d676f69081044f1
 EBUILD akregator-4.6.9999.ebuild 390 RMD160 f25dd2b31456c70e28f9fbde05802ba3de538ecb SHA1 9317a5d3e36792943b23fc48869a50f5fd82511a SHA256 b7055b3cb41f6520b1ec9a51f548fd615ad754da7f30ec8d8d676f69081044f1
 EBUILD akregator-9999.ebuild 390 RMD160 f25dd2b31456c70e28f9fbde05802ba3de538ecb SHA1 9317a5d3e36792943b23fc48869a50f5fd82511a SHA256 b7055b3cb41f6520b1ec9a51f548fd615ad754da7f30ec8d8d676f69081044f1
diff --git a/kde-base/akregator/akregator-4.5.93.ebuild b/kde-base/akregator/akregator-4.5.93.ebuild
new file mode 100644
index 00000000000..9ca319f4593
--- /dev/null
+++ b/kde-base/akregator/akregator-4.5.93.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="3"
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+inherit kde4-meta
+
+DESCRIPTION="KDE news feed aggregator."
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep kdepimlibs)
+	$(add_kdebase_dep kdepim-common-libs)
+"
+RDEPEND="${DEPEND}"
+
+KMLOADLIBS="kdepim-common-libs"
diff --git a/kde-base/blogilo/Manifest b/kde-base/blogilo/Manifest
index 00323cbae2e..fc6aadc450c 100644
--- a/kde-base/blogilo/Manifest
+++ b/kde-base/blogilo/Manifest
@@ -1,4 +1,6 @@
+DIST kdepim-4.6beta3.tar.bz2 42287019 RMD160 09f7f8013679b1031c21f70215c7aae4bdcb04f6 SHA1 de9e1dcef1c25031dbdbad0bb68aee75852b02df SHA256 c282acbafb7a207d6b8690bcdbc2d05298b41860b55aa4932979b877487c6636
 EBUILD blogilo-4.4.9999.ebuild 335 RMD160 4258c42f63256da0e7e09e77aa4af312c0ea6969 SHA1 ff59ffca5b6f3aa934f0b14358976c399ca79f3b SHA256 fdbd75fd0ad500f90f00e1bf40fcec2abb4df9054376b7d26677c538a1b19ab1
+EBUILD blogilo-4.5.93.ebuild 360 RMD160 94ae0ad54bae5f60b8bf62aeacd7ec50f57b3653 SHA1 306285b7b385ba345e15d50159d74fbc6e6d3dca SHA256 e96dbb5596faf57cc6ddb4e23aec0312bc766b71a29dbc93c056fdbaec2c0e96
 EBUILD blogilo-4.5.9999.ebuild 349 RMD160 993bf68c3867e68ac32d6466d09b8c4f33f6caac SHA1 0b2f30f9c876ad1f655784c3ac084b2b50d80313 SHA256 ffe0d9e556f91359caaa38016f51786d06cebaae2284bbb8bb163852b81a8ebd
 EBUILD blogilo-4.6.9999.ebuild 349 RMD160 993bf68c3867e68ac32d6466d09b8c4f33f6caac SHA1 0b2f30f9c876ad1f655784c3ac084b2b50d80313 SHA256 ffe0d9e556f91359caaa38016f51786d06cebaae2284bbb8bb163852b81a8ebd
 EBUILD blogilo-9999.ebuild 349 RMD160 993bf68c3867e68ac32d6466d09b8c4f33f6caac SHA1 0b2f30f9c876ad1f655784c3ac084b2b50d80313 SHA256 ffe0d9e556f91359caaa38016f51786d06cebaae2284bbb8bb163852b81a8ebd
diff --git a/kde-base/blogilo/blogilo-4.5.93.ebuild b/kde-base/blogilo/blogilo-4.5.93.ebuild
new file mode 100644
index 00000000000..559095726a0
--- /dev/null
+++ b/kde-base/blogilo/blogilo-4.5.93.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="3"
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+inherit kde4-meta
+
+DESCRIPTION="KDE Blogging Client"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep kdepimlibs)
+"
+RDEPEND="${DEPEND}
+	!kde-misc/bilbo
+	!kde-misc/blogilo
+"
diff --git a/kde-base/kabcclient/Manifest b/kde-base/kabcclient/Manifest
index 3ac402cb1df..62fd95ec788 100644
--- a/kde-base/kabcclient/Manifest
+++ b/kde-base/kabcclient/Manifest
@@ -1,4 +1,6 @@
+DIST kdepim-4.6beta3.tar.bz2 42287019 RMD160 09f7f8013679b1031c21f70215c7aae4bdcb04f6 SHA1 de9e1dcef1c25031dbdbad0bb68aee75852b02df SHA256 c282acbafb7a207d6b8690bcdbc2d05298b41860b55aa4932979b877487c6636
 EBUILD kabcclient-4.4.9999.ebuild 536 RMD160 2102755e56ebfed307fe313aaabcdb397eb0e827 SHA1 8cd244a941b62e6895662f7c41027c3cf488e56e SHA256 46315c1b10904f787b78792d8bc0f039dd79c6b4694dad84d383f8e9fdea045a
+EBUILD kabcclient-4.5.93.ebuild 561 RMD160 cd8226009fac669c72519a22e2691bae7311d8c8 SHA1 b352fd99cc6df83fddf1897977d371ea19c53621 SHA256 cf4c5df28dd71ce4658a17b25a29cacfaf3706cca918a945d517460112ff8874
 EBUILD kabcclient-4.5.9999.ebuild 550 RMD160 caa802c32f27a209802b3ea2ae2b5c2058571d3b SHA1 4e24061394b7fd8b0fdbcdd93a976198f31f0cf4 SHA256 fd5be813be33b2c23cb2e000db1256ff4398cce020426712e30ed4062b3d0c79
 EBUILD kabcclient-4.6.9999.ebuild 550 RMD160 caa802c32f27a209802b3ea2ae2b5c2058571d3b SHA1 4e24061394b7fd8b0fdbcdd93a976198f31f0cf4 SHA256 fd5be813be33b2c23cb2e000db1256ff4398cce020426712e30ed4062b3d0c79
 EBUILD kabcclient-9999.ebuild 550 RMD160 caa802c32f27a209802b3ea2ae2b5c2058571d3b SHA1 4e24061394b7fd8b0fdbcdd93a976198f31f0cf4 SHA256 fd5be813be33b2c23cb2e000db1256ff4398cce020426712e30ed4062b3d0c79
diff --git a/kde-base/kabcclient/kabcclient-4.5.93.ebuild b/kde-base/kabcclient/kabcclient-4.5.93.ebuild
new file mode 100644
index 00000000000..5b644df733b
--- /dev/null
+++ b/kde-base/kabcclient/kabcclient-4.5.93.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="3"
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+KMMODULE="console/${PN}"
+inherit kde4-meta
+
+DESCRIPTION="A command line client for accessing the KDE addressbook"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep kdepimlibs)
+"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	kde4-meta_src_install
+
+	# work around NULL DT_RPATH in kabc2mutt
+	dosym kabcclient ${PREFIX}/bin/kabc2mutt || die "couldn't symlink kabc2mutt to kabcclient"
+}
diff --git a/kde-base/kaddressbook/Manifest b/kde-base/kaddressbook/Manifest
index 37ef7b0901a..285a5a6fd16 100644
--- a/kde-base/kaddressbook/Manifest
+++ b/kde-base/kaddressbook/Manifest
@@ -1,4 +1,6 @@
+DIST kdepim-4.6beta3.tar.bz2 42287019 RMD160 09f7f8013679b1031c21f70215c7aae4bdcb04f6 SHA1 de9e1dcef1c25031dbdbad0bb68aee75852b02df SHA256 c282acbafb7a207d6b8690bcdbc2d05298b41860b55aa4932979b877487c6636
 EBUILD kaddressbook-4.4.9999.ebuild 779 RMD160 34f0aa5bdb4ae146a2519e3a4dc4300b3ae0e959 SHA1 e22baba5e7f46284d20a18e7200ec0a794ad6950 SHA256 22dd0e24243b5834afda7b6d314f4471acccf10b79033ae2bf583002807a91c3
+EBUILD kaddressbook-4.5.93.ebuild 818 RMD160 74fa735fec405a22d9863442d8b6995c41ebcffe SHA1 bfd9781f0fb86067fc4690039fee61ba7c5ac404 SHA256 b2d9f9e26a4fadee309b345102cc3246c3f77b5a195bbf7ecc92cb8edf941581
 EBUILD kaddressbook-4.5.9999.ebuild 757 RMD160 7ddb8affd09c96670c5705a52f97892efea1b595 SHA1 666e9ca1a25c648afaaf1b487c184f437eca2725 SHA256 93aadc4406c08630a8be309c6a162ffeed7178a70475a66e289351dfaff312be
 EBUILD kaddressbook-4.6.9999.ebuild 807 RMD160 8cf27f870fb2bf0c0412027f1c1bdc04b8f6eb5e SHA1 de0b597b546b5dab7a1b252a84662bb2a9a6ca19 SHA256 584c24dcde8b8db702facb222352e49bec6dcfbb881034f7a1b446880c12945f
 EBUILD kaddressbook-9999.ebuild 807 RMD160 8cf27f870fb2bf0c0412027f1c1bdc04b8f6eb5e SHA1 de0b597b546b5dab7a1b252a84662bb2a9a6ca19 SHA256 584c24dcde8b8db702facb222352e49bec6dcfbb881034f7a1b446880c12945f
diff --git a/kde-base/kaddressbook/kaddressbook-4.5.93.ebuild b/kde-base/kaddressbook/kaddressbook-4.5.93.ebuild
new file mode 100644
index 00000000000..7c75bde1034
--- /dev/null
+++ b/kde-base/kaddressbook/kaddressbook-4.5.93.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="3"
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+inherit kde4-meta
+
+DESCRIPTION="The KDE Address Book"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+DEPEND="
+	>=dev-libs/grantlee-0.1.4
+	$(add_kdebase_dep kdelibs 'semantic-desktop')
+	$(add_kdebase_dep kdepimlibs 'semantic-desktop')
+	$(add_kdebase_dep kdepim-common-libs)
+"
+RDEPEND="${DEPEND}"
+
+KMEXTRA="
+	plugins/kaddressbook/
+	plugins/ktexteditor/
+"
+KMEXTRACTONLY="
+	akonadi_next/
+	calendarsupport/
+	libkleo/
+"
+
+KMLOADLIBS="kdepim-common-libs"
+
+pkg_postinst() {
+	kde4-meta_pkg_postinst
+
+	if ! has_version kde-base/kdepim-kresources:${SLOT}; then
+		echo
+		elog "For groupware functionality, please install kde-base/kdepim-kresources:${SLOT}"
+		echo
+	fi
+}
diff --git a/kde-base/kalarm/Manifest b/kde-base/kalarm/Manifest
index f65672e208a..b7d7917b18e 100644
--- a/kde-base/kalarm/Manifest
+++ b/kde-base/kalarm/Manifest
@@ -1,5 +1,7 @@
 AUX kdepim-r1133220-fix-holidayregion.patch 537 RMD160 2e2be7ca8a7590b42036b277f1e335f796d40784 SHA1 ae5fbbaae9ad534dd7ccd2b1d96739f652824380 SHA256 a5d08df994396592b92e7b6f8c331705f2ad20d06cbe0edd70a23b909c2a4a6f
+DIST kdepim-4.6beta3.tar.bz2 42287019 RMD160 09f7f8013679b1031c21f70215c7aae4bdcb04f6 SHA1 de9e1dcef1c25031dbdbad0bb68aee75852b02df SHA256 c282acbafb7a207d6b8690bcdbc2d05298b41860b55aa4932979b877487c6636
 EBUILD kalarm-4.4.9999.ebuild 590 RMD160 38dc5aacfc2fbfa0edc5df84b42f7b75aed50177 SHA1 b7161c96b6ae240ac79b456bdbdebe8c73ff85ce SHA256 c0a3b8db557ab69d960b2a9727b36964a34211015254f6b08ed3d2c2e68c05da
+EBUILD kalarm-4.5.93.ebuild 469 RMD160 190ef550152cc0e5052be9efe6027b6b18ee9238 SHA1 4f885d7a827d4bc902c7c9aa63da4e5a465897ec SHA256 0a87bf89429c7c34653b6b5036dea44565e154213ff130fa743f1105702a0c93
 EBUILD kalarm-4.5.9999.ebuild 458 RMD160 6bb82784c69d00d0d80ab5b79f1e55b6643ae983 SHA1 da0ff0091dc5959276d7821581c513f47b903e15 SHA256 751cdd7ea4eafa5331c648420d66dc3097d66cf46eec936e9025020513da9b27
 EBUILD kalarm-4.6.9999.ebuild 458 RMD160 6bb82784c69d00d0d80ab5b79f1e55b6643ae983 SHA1 da0ff0091dc5959276d7821581c513f47b903e15 SHA256 751cdd7ea4eafa5331c648420d66dc3097d66cf46eec936e9025020513da9b27
 EBUILD kalarm-9999.ebuild 458 RMD160 6bb82784c69d00d0d80ab5b79f1e55b6643ae983 SHA1 da0ff0091dc5959276d7821581c513f47b903e15 SHA256 751cdd7ea4eafa5331c648420d66dc3097d66cf46eec936e9025020513da9b27
diff --git a/kde-base/kalarm/kalarm-4.5.93.ebuild b/kde-base/kalarm/kalarm-4.5.93.ebuild
new file mode 100644
index 00000000000..b89d947ea08
--- /dev/null
+++ b/kde-base/kalarm/kalarm-4.5.93.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="3"
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+inherit kde4-meta
+
+DESCRIPTION="Personal alarm message, command and email scheduler for KDE"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+RDEPEND="
+	$(add_kdebase_dep kdepimlibs 'semantic-desktop')
+	$(add_kdebase_dep kdepim-common-libs)
+	media-sound/phonon
+"
+DEPEND="${RDEPEND}"
+
+KMEXTRACTONLY="
+	kmail/
+"
diff --git a/kde-base/kdepim-common-libs/Manifest b/kde-base/kdepim-common-libs/Manifest
index b7b86a51923..faee2d1b680 100644
--- a/kde-base/kdepim-common-libs/Manifest
+++ b/kde-base/kdepim-common-libs/Manifest
@@ -1,3 +1,5 @@
+DIST kdepim-4.6beta3.tar.bz2 42287019 RMD160 09f7f8013679b1031c21f70215c7aae4bdcb04f6 SHA1 de9e1dcef1c25031dbdbad0bb68aee75852b02df SHA256 c282acbafb7a207d6b8690bcdbc2d05298b41860b55aa4932979b877487c6636
+EBUILD kdepim-common-libs-4.5.93.ebuild 1493 RMD160 95b5568158fd16d7068e9b99b48dd62f43379239 SHA1 096954c06696f14b7495333bac07da7707a2e114 SHA256 f056cc0f189fe4ad2c8b7cb0c5d58504ea66a3c631eb362b44c36f03c4a66457
 EBUILD kdepim-common-libs-4.5.9999.ebuild 1424 RMD160 45b9bbb7384cbbbd995647a397b63ef21c732797 SHA1 4f97ef37b4faf558a965c60adfd44715e4253fc0 SHA256 240eb0126099b827232af2b952925378f9f87b82a7cc26903416349c4b85adf8
 EBUILD kdepim-common-libs-4.6.9999.ebuild 1482 RMD160 8d35a4a88326631843e4d3b0cd950c30cc7b052d SHA1 46644aa81fd0034fa494434a53f12c7b29937643 SHA256 b2db03f31925edc46d6fa0feebccdd79dbfbf64816938565fb1d97210039bb3e
 EBUILD kdepim-common-libs-9999.ebuild 1482 RMD160 8d35a4a88326631843e4d3b0cd950c30cc7b052d SHA1 46644aa81fd0034fa494434a53f12c7b29937643 SHA256 b2db03f31925edc46d6fa0feebccdd79dbfbf64816938565fb1d97210039bb3e
diff --git a/kde-base/kdepim-common-libs/kdepim-common-libs-4.5.93.ebuild b/kde-base/kdepim-common-libs/kdepim-common-libs-4.5.93.ebuild
new file mode 100644
index 00000000000..e7566679dae
--- /dev/null
+++ b/kde-base/kdepim-common-libs/kdepim-common-libs-4.5.93.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="3"
+
+KMNAME="kdepim"
+KMNOMODULE="true"
+inherit kde4-meta
+
+DESCRIPTION="Common libraries for KDE PIM apps"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+DEPEND="
+	app-crypt/gpgme
+	>=app-office/akonadi-server-1.3.60
+	$(add_kdebase_dep kdepimlibs 'semantic-desktop')
+"
+RDEPEND="${DEPEND}
+	app-crypt/gnupg
+	$(add_kdebase_dep kdepim-runtime)
+"
+
+# @Since >4.4.76 merged here
+add_blocker akonadi
+add_blocker libkdepim
+add_blocker libkleo
+add_blocker libkpgp
+add_blocker messagecomposer
+add_blocker messagecore
+add_blocker messagelist
+add_blocker messageviewer
+add_blocker templateparser
+add_blocker kaddressbook '<4.4.90'
+add_blocker kmail '<4.4.80'
+add_blocker korganizer '<4.5.67'
+
+KMEXTRA="
+	akonadi_next/
+	calendarsupport/
+	calendarviews/
+	incidenceeditor-ng/
+	libkdepim/
+	libkdepimdbusinterfaces/
+	libkleo/
+	libkpgp/
+	kdgantt2/
+	messagecomposer/
+	messagecore/
+	messagelist/
+	messageviewer/
+	ontologies/
+	templateparser/
+"
+
+KMEXTRACTONLY="
+	kleopatra/
+	kmail/
+	knode/org.kde.knode.xml
+	korganizer/korgac/org.kde.korganizer.KOrgac.xml
+	korganizer/org.kde.korganizer.Korganizer.xml
+"
+
+KMSAVELIBS="true"
+
+src_configure() {
+	mycmakeargs=(
+		# Set the dbus dirs, otherwise it searches in KDEDIR
+		-DAKONADI_DBUS_INTERFACES_INSTALL_DIR="${EPREFIX}/usr/share/dbus-1/interfaces"
+		-DAKONADI_DBUS_SERVICES_INSTALL_DIR="${EPREFIX}/usr/share/dbus-1/services"
+	)
+
+	kde4-meta_src_configure
+}
diff --git a/kde-base/kdepim-icons/Manifest b/kde-base/kdepim-icons/Manifest
index b6306072cfe..b31e3151390 100644
--- a/kde-base/kdepim-icons/Manifest
+++ b/kde-base/kdepim-icons/Manifest
@@ -1,4 +1,6 @@
+DIST kdepim-4.6beta3.tar.bz2 42287019 RMD160 09f7f8013679b1031c21f70215c7aae4bdcb04f6 SHA1 de9e1dcef1c25031dbdbad0bb68aee75852b02df SHA256 c282acbafb7a207d6b8690bcdbc2d05298b41860b55aa4932979b877487c6636
 EBUILD kdepim-icons-4.4.9999.ebuild 384 RMD160 1324f486f037ac8ba8f6c51c3fddb7386f3990cd SHA1 b834dc3bd3ef07632cc6a9ab02bcd5ad5b2e7d37 SHA256 2b979f892c71331024212fe4ee57ec6c021eda68177f286adc82108eb7fac46b
+EBUILD kdepim-icons-4.5.93.ebuild 395 RMD160 937599e725b14243aef79b19e690c934d5e52474 SHA1 a82955958e96b6f4a9bea1a703e28ce6574e1140 SHA256 5e551b0effd2052696b9f5774f97df25d0d5456f8a7f7c5f72fba746efea9a1e
 EBUILD kdepim-icons-4.5.9999.ebuild 384 RMD160 1324f486f037ac8ba8f6c51c3fddb7386f3990cd SHA1 b834dc3bd3ef07632cc6a9ab02bcd5ad5b2e7d37 SHA256 2b979f892c71331024212fe4ee57ec6c021eda68177f286adc82108eb7fac46b
 EBUILD kdepim-icons-4.6.9999.ebuild 384 RMD160 1324f486f037ac8ba8f6c51c3fddb7386f3990cd SHA1 b834dc3bd3ef07632cc6a9ab02bcd5ad5b2e7d37 SHA256 2b979f892c71331024212fe4ee57ec6c021eda68177f286adc82108eb7fac46b
 EBUILD kdepim-icons-9999.ebuild 384 RMD160 1324f486f037ac8ba8f6c51c3fddb7386f3990cd SHA1 b834dc3bd3ef07632cc6a9ab02bcd5ad5b2e7d37 SHA256 2b979f892c71331024212fe4ee57ec6c021eda68177f286adc82108eb7fac46b
diff --git a/kde-base/kdepim-icons/kdepim-icons-4.5.93.ebuild b/kde-base/kdepim-icons/kdepim-icons-4.5.93.ebuild
new file mode 100644
index 00000000000..0f8fa6c1418
--- /dev/null
+++ b/kde-base/kdepim-icons/kdepim-icons-4.5.93.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="3"
+
+KMNAME="kdepim"
+KMMODULE="icons"
+inherit kde4-meta
+
+DESCRIPTION="KDE PIM icons"
+IUSE=""
+KEYWORDS="~amd64 ~x86"
+
+src_install() {
+	kde4-meta_src_install
+	# colliding with oxygen icons
+	rm -rf "${ED}"/${KDEDIR}/share/icons/oxygen/16x16/status/meeting-organizer.png
+}
diff --git a/kde-base/kdepim-kresources/Manifest b/kde-base/kdepim-kresources/Manifest
index 059759e4c28..6c07fb2ad21 100644
--- a/kde-base/kdepim-kresources/Manifest
+++ b/kde-base/kdepim-kresources/Manifest
@@ -1,4 +1,6 @@
+DIST kdepim-4.6beta3.tar.bz2 42287019 RMD160 09f7f8013679b1031c21f70215c7aae4bdcb04f6 SHA1 de9e1dcef1c25031dbdbad0bb68aee75852b02df SHA256 c282acbafb7a207d6b8690bcdbc2d05298b41860b55aa4932979b877487c6636
 EBUILD kdepim-kresources-4.4.9999.ebuild 695 RMD160 bcf60185648f6649c81f9fccffa8f67ebce87c8b SHA1 66e0414b1d36c04f172150e2bdd6543153b66132 SHA256 8a4042684d97d67b7ba9731c5fe33f1f557210cf42ab3f49d954a1f13eeefc5a
+EBUILD kdepim-kresources-4.5.93.ebuild 726 RMD160 c1893b3c1681ba8cd78bd5c49d0a1b3bb4b3332a SHA1 6d3d1ce074919f14c9b4d028663d2d5358e82e98 SHA256 096d8931137d6356b51674de5fb84095b45569742e1d412db7945ce498badf10
 EBUILD kdepim-kresources-4.5.9999.ebuild 715 RMD160 1709534a59f52b45e54a4c0e8e7cbf24c8e20849 SHA1 1ddc2b2c34bda0b49d8ba25fcc7d3562da679a27 SHA256 ea9edc4357a42e1a1836ccc109561ba17c8c529ad6fb285156c93c144e632c6f
 EBUILD kdepim-kresources-4.6.9999.ebuild 715 RMD160 1709534a59f52b45e54a4c0e8e7cbf24c8e20849 SHA1 1ddc2b2c34bda0b49d8ba25fcc7d3562da679a27 SHA256 ea9edc4357a42e1a1836ccc109561ba17c8c529ad6fb285156c93c144e632c6f
 EBUILD kdepim-kresources-9999.ebuild 715 RMD160 1709534a59f52b45e54a4c0e8e7cbf24c8e20849 SHA1 1ddc2b2c34bda0b49d8ba25fcc7d3562da679a27 SHA256 ea9edc4357a42e1a1836ccc109561ba17c8c529ad6fb285156c93c144e632c6f
diff --git a/kde-base/kdepim-kresources/kdepim-kresources-4.5.93.ebuild b/kde-base/kdepim-kresources/kdepim-kresources-4.5.93.ebuild
new file mode 100644
index 00000000000..fbb37644c7c
--- /dev/null
+++ b/kde-base/kdepim-kresources/kdepim-kresources-4.5.93.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="3"
+
+KMNAME="kdepim"
+KMMODULE="kresources"
+inherit kde4-meta
+
+DESCRIPTION="KDE PIM groupware plugin collection"
+IUSE="debug"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	$(add_kdebase_dep kdepimlibs)
+	$(add_kdebase_dep kdepim-common-libs)
+"
+RDEPEND="${DEPEND}"
+
+KMEXTRACTONLY="
+	kmail/
+	knotes/
+	korganizer/version.h
+"
+
+KMLOADLIBS="kdepim-common-libs"
+
+src_install() {
+	kde4-meta_src_install
+
+	# Install headers needed by kdepim-wizards, egroupware and slox stuff gone
+	insinto "${PREFIX}"/include/${PN}
+	doins "${CMAKE_BUILD_DIR}"/${KMMODULE}/groupwise/*.h || \
+			die "Failed to install extra header files"
+}
diff --git a/kde-base/kdepim-meta/Manifest b/kde-base/kdepim-meta/Manifest
index dff42d8abfc..e3e8da60d4a 100644
--- a/kde-base/kdepim-meta/Manifest
+++ b/kde-base/kdepim-meta/Manifest
@@ -1,3 +1,4 @@
+EBUILD kdepim-meta-4.5.93.ebuild 997 RMD160 fe86dee10f6713c8777c8859aefbae9c36bd30fd SHA1 bcdb56a6c8c08eb362b89b6ef9b8159810a5f3e0 SHA256 035870c1fca485b96bc0ff08fc0f3c67802137157770975af176070255f2d3eb
 EBUILD kdepim-meta-4.5.9999.ebuild 986 RMD160 5b94e84bf7f738aa025bc51ea61ec726b25e7d4a SHA1 b0f84c75f8387477cbd3c8b065b496dfce880efe SHA256 8db80a968657ab45d975d2e14a264c42ed020bb71c9d640d31d4c5bc2c1164ba
 EBUILD kdepim-meta-4.6.9999.ebuild 986 RMD160 5e4a7910c21e54b56d9025b54b19f85e2f023463 SHA1 b80f472a46263ebb7a0f39519b235e62fb289822 SHA256 f07b25b067912bac2bf9368de1c289e51ddd80440288f3cae20aff007ca85a70
 EBUILD kdepim-meta-9999.ebuild 987 RMD160 3e949fa1134c6a3bfab47aa2bf095ae40a5b077a SHA1 def68e37729a2a7a6655edeeb0c009977134ecc4 SHA256 3562127d8a227cc4d3cbb4b8eaaf873e5f67f35c6b437a5ebe733782fbcbb8fd
diff --git a/kde-base/kdepim-meta/kdepim-meta-4.5.93.ebuild b/kde-base/kdepim-meta/kdepim-meta-4.5.93.ebuild
new file mode 100644
index 00000000000..cdaaf0c95a3
--- /dev/null
+++ b/kde-base/kdepim-meta/kdepim-meta-4.5.93.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="3"
+inherit kde4-functions
+
+DESCRIPTION="kdepim - merge this to pull in all kdepim-derived packages"
+HOMEPAGE="http://www.kde.org/"
+
+LICENSE="GPL-2"
+SLOT="4.6"
+KEYWORDS="~amd64 ~x86"
+IUSE="aqua kdeprefix"
+
+RDEPEND="
+	$(add_kdebase_dep akonadiconsole)
+	$(add_kdebase_dep akregator)
+	$(add_kdebase_dep blogilo)
+	$(add_kdebase_dep kabcclient)
+	$(add_kdebase_dep kaddressbook)
+	$(add_kdebase_dep kalarm)
+	$(add_kdebase_dep kdepim-icons)
+	$(add_kdebase_dep kdepim-kresources)
+	$(add_kdebase_dep kdepim-runtime)
+	$(add_kdebase_dep kdepim-strigi-analyzer)
+	$(add_kdebase_dep kdepim-wizards)
+	$(add_kdebase_dep kjots)
+	$(add_kdebase_dep kleopatra)
+	$(add_kdebase_dep kmail)
+	$(add_kdebase_dep knode)
+	$(add_kdebase_dep knotes)
+	$(add_kdebase_dep konsolekalendar)
+	$(add_kdebase_dep kontact)
+	$(add_kdebase_dep korganizer)
+	$(add_kdebase_dep ktimetracker)
+	$(block_other_slots)
+"
diff --git a/kde-base/kdepim-runtime/Manifest b/kde-base/kdepim-runtime/Manifest
index f1df0a672f9..ec5480838cb 100644
--- a/kde-base/kdepim-runtime/Manifest
+++ b/kde-base/kdepim-runtime/Manifest
@@ -1,4 +1,6 @@
+DIST kdepim-runtime-4.6beta3.tar.bz2 1173344 RMD160 e0ffe405cea41eef13bd9c2104af4d1e2e11e53f SHA1 564dd6e0cf2afada59aefb0af6fbf057fa113ace SHA256 b1d1a2bb999e54627ef007459f652b7f0413f0ee06fa4aef9bbd53053196dff3
 EBUILD kdepim-runtime-4.4.9999.ebuild 763 RMD160 481c0f6abdfc1ea7eb3e2a44c2afaafedf27c24c SHA1 502d2b0ba126fff7fb900f4ae514f3321939a86d SHA256 8a8e79ba9286c115e56ff9cae8486f1e5b67f4b17228de2301938b210b5c4d52
+EBUILD kdepim-runtime-4.5.93.ebuild 730 RMD160 b649bd1398883e673e78b3e2afe54aca9e2bac31 SHA1 f9c6c28f189048c9eaf4e121ee1a15fa5f0a08cb SHA256 6266d53ecbb9d0b67ac1af22ca53ffa913443b9afbecb0bb2b688453685a0f57
 EBUILD kdepim-runtime-4.5.9999.ebuild 719 RMD160 eb7086bc05e3e68f8e622c5a1c0f9f5043064f33 SHA1 7c3a329a86240d5fdfa1fb836bbd79fe877ab5fd SHA256 626d743b634e84825e9cddf5baa6394d57ac8df34cc4e3bd735333284f0ae383
 EBUILD kdepim-runtime-4.6.9999.ebuild 719 RMD160 eb7086bc05e3e68f8e622c5a1c0f9f5043064f33 SHA1 7c3a329a86240d5fdfa1fb836bbd79fe877ab5fd SHA256 626d743b634e84825e9cddf5baa6394d57ac8df34cc4e3bd735333284f0ae383
 EBUILD kdepim-runtime-9999.ebuild 719 RMD160 eb7086bc05e3e68f8e622c5a1c0f9f5043064f33 SHA1 7c3a329a86240d5fdfa1fb836bbd79fe877ab5fd SHA256 626d743b634e84825e9cddf5baa6394d57ac8df34cc4e3bd735333284f0ae383
diff --git a/kde-base/kdepim-runtime/kdepim-runtime-4.5.93.ebuild b/kde-base/kdepim-runtime/kdepim-runtime-4.5.93.ebuild
new file mode 100644
index 00000000000..4b1c3184f44
--- /dev/null
+++ b/kde-base/kdepim-runtime/kdepim-runtime-4.5.93.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="3"
+
+if [[ ${PV} = *9999* ]]; then
+	KMNAME="kdepim"
+	KMMODULE="runtime"
+	inherit kde4-meta
+else
+	inherit kde4-base
+fi
+
+DESCRIPTION="KDE PIM runtime plugin collection"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+RESTRICT="test"
+# Would need test programs _testrunner and akonaditest from kdepimlibs
+
+DEPEND="
+	app-misc/strigi
+	>=app-office/akonadi-server-1.3.60
+	dev-libs/boost
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	$(add_kdebase_dep kdepimlibs 'semantic-desktop')
+