Version bump KDEPIM 4.6.1

(Portage version: 2.2.0_alpha43/cvs/Linux x86_64)

44 files changed, 956 insertions, 22 deletions

diff --git a/kde-base/akonadiconsole/ChangeLog b/kde-base/akonadiconsole/ChangeLog
index 742a73e2ab97..b6922a5c8607 100644
--- a/kde-base/akonadiconsole/ChangeLog
+++ b/kde-base/akonadiconsole/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/akonadiconsole
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/akonadiconsole/ChangeLog,v 1.3 2011/06/09 22:52:45 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/akonadiconsole/ChangeLog,v 1.4 2011/07/11 14:01:18 tampakrap Exp $
+
+*akonadiconsole-4.6.1 (11 Jul 2011)
+
+  11 Jul 2011; Theo Chatzimichos <tampakrap@gentoo.org>
+  +akonadiconsole-4.6.1.ebuild:
+  Version bump KDEPIM 4.6.1
 
   09 Jun 2011; Theo Chatzimichos <tampakrap@gentoo.org>
   -akonadiconsole-4.5.95.ebuild:
diff --git a/kde-base/akonadiconsole/akonadiconsole-4.6.1.ebuild b/kde-base/akonadiconsole/akonadiconsole-4.6.1.ebuild
new file mode 100644
index 000000000000..05bd75987f52
--- /dev/null
+++ b/kde-base/akonadiconsole/akonadiconsole-4.6.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/akonadiconsole/akonadiconsole-4.6.1.ebuild,v 1.1 2011/07/11 14:01:18 tampakrap Exp $
+
+EAPI=4
+
+KMNAME="kdepim"
+KDE_SCM="git"
+inherit kde4-meta
+
+DESCRIPTION="Akonadi developer console"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+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/ChangeLog b/kde-base/akregator/ChangeLog
index bc32dddc2576..cf04fafcd1e5 100644
--- a/kde-base/akregator/ChangeLog
+++ b/kde-base/akregator/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/akregator
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/akregator/ChangeLog,v 1.192 2011/06/09 22:52:45 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/akregator/ChangeLog,v 1.193 2011/07/11 14:01:18 tampakrap Exp $
+
+*akregator-4.6.1 (11 Jul 2011)
+
+  11 Jul 2011; Theo Chatzimichos <tampakrap@gentoo.org>
+  +akregator-4.6.1.ebuild:
+  Version bump KDEPIM 4.6.1
 
   09 Jun 2011; Theo Chatzimichos <tampakrap@gentoo.org>
   -akregator-4.5.95.ebuild:
diff --git a/kde-base/akregator/akregator-4.6.1.ebuild b/kde-base/akregator/akregator-4.6.1.ebuild
new file mode 100644
index 000000000000..28d056b8f1c9
--- /dev/null
+++ b/kde-base/akregator/akregator-4.6.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/akregator/akregator-4.6.1.ebuild,v 1.1 2011/07/11 14:01:18 tampakrap Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+KDE_SCM="git"
+inherit kde4-meta
+
+DESCRIPTION="KDE news feed aggregator."
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+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/ChangeLog b/kde-base/blogilo/ChangeLog
index 9cd93662de95..6f2b3bdfadb0 100644
--- a/kde-base/blogilo/ChangeLog
+++ b/kde-base/blogilo/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/blogilo
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/blogilo/ChangeLog,v 1.40 2011/06/09 22:52:46 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/blogilo/ChangeLog,v 1.41 2011/07/11 14:01:18 tampakrap Exp $
+
+*blogilo-4.6.1 (11 Jul 2011)
+
+  11 Jul 2011; Theo Chatzimichos <tampakrap@gentoo.org> +blogilo-4.6.1.ebuild:
+  Version bump KDEPIM 4.6.1
 
   09 Jun 2011; Theo Chatzimichos <tampakrap@gentoo.org> -blogilo-4.5.95.ebuild:
   Remove KDEPIM 4.5.95
diff --git a/kde-base/blogilo/blogilo-4.6.1.ebuild b/kde-base/blogilo/blogilo-4.6.1.ebuild
new file mode 100644
index 000000000000..edc0496fde52
--- /dev/null
+++ b/kde-base/blogilo/blogilo-4.6.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/blogilo/blogilo-4.6.1.ebuild,v 1.1 2011/07/11 14:01:18 tampakrap Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+KDE_SCM="git"
+inherit kde4-meta
+
+DESCRIPTION="KDE Blogging Client"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep kdepimlibs)
+"
+RDEPEND="${DEPEND}
+	!kde-misc/bilbo
+	!kde-misc/blogilo
+"
diff --git a/kde-base/kabcclient/ChangeLog b/kde-base/kabcclient/ChangeLog
index e68c58c8bb1d..7d48113064b3 100644
--- a/kde-base/kabcclient/ChangeLog
+++ b/kde-base/kabcclient/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kabcclient
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kabcclient/ChangeLog,v 1.66 2011/06/09 22:52:46 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kabcclient/ChangeLog,v 1.67 2011/07/11 14:01:18 tampakrap Exp $
+
+*kabcclient-4.6.1 (11 Jul 2011)
+
+  11 Jul 2011; Theo Chatzimichos <tampakrap@gentoo.org>
+  +kabcclient-4.6.1.ebuild:
+  Version bump KDEPIM 4.6.1
 
   09 Jun 2011; Theo Chatzimichos <tampakrap@gentoo.org>
   -kabcclient-4.5.95.ebuild:
diff --git a/kde-base/kabcclient/kabcclient-4.6.1.ebuild b/kde-base/kabcclient/kabcclient-4.6.1.ebuild
new file mode 100644
index 000000000000..148d363c5c69
--- /dev/null
+++ b/kde-base/kabcclient/kabcclient-4.6.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kabcclient/kabcclient-4.6.1.ebuild,v 1.1 2011/07/11 14:01:18 tampakrap Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+KMMODULE="console/${PN}"
+KDE_SCM="git"
+inherit kde4-meta
+
+DESCRIPTION="A command line client for accessing the KDE addressbook"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+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
+}
diff --git a/kde-base/kaddressbook/ChangeLog b/kde-base/kaddressbook/ChangeLog
index f6dc60ccbd68..a53e74cccd55 100644
--- a/kde-base/kaddressbook/ChangeLog
+++ b/kde-base/kaddressbook/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kaddressbook
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kaddressbook/ChangeLog,v 1.189 2011/06/09 22:52:45 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kaddressbook/ChangeLog,v 1.190 2011/07/11 14:01:19 tampakrap Exp $
+
+*kaddressbook-4.6.1 (11 Jul 2011)
+
+  11 Jul 2011; Theo Chatzimichos <tampakrap@gentoo.org>
+  +kaddressbook-4.6.1.ebuild:
+  Version bump KDEPIM 4.6.1
 
   09 Jun 2011; Theo Chatzimichos <tampakrap@gentoo.org>
   -kaddressbook-4.5.95.ebuild:
diff --git a/kde-base/kaddressbook/kaddressbook-4.6.1.ebuild b/kde-base/kaddressbook/kaddressbook-4.6.1.ebuild
new file mode 100644
index 000000000000..4a1918daf3dd
--- /dev/null
+++ b/kde-base/kaddressbook/kaddressbook-4.6.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kaddressbook/kaddressbook-4.6.1.ebuild,v 1.1 2011/07/11 14:01:19 tampakrap Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+KDE_SCM="git"
+inherit kde4-meta
+
+DESCRIPTION="The KDE Address Book"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+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/ChangeLog b/kde-base/kalarm/ChangeLog
index c382aec4a653..ed4b601b51a2 100644
--- a/kde-base/kalarm/ChangeLog
+++ b/kde-base/kalarm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kalarm
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kalarm/ChangeLog,v 1.180 2011/06/09 22:52:45 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kalarm/ChangeLog,v 1.181 2011/07/11 14:01:19 tampakrap Exp $
+
+*kalarm-4.6.1 (11 Jul 2011)
+
+  11 Jul 2011; Theo Chatzimichos <tampakrap@gentoo.org> +kalarm-4.6.1.ebuild:
+  Version bump KDEPIM 4.6.1
 
   09 Jun 2011; Theo Chatzimichos <tampakrap@gentoo.org> -kalarm-4.5.95.ebuild:
   Remove KDEPIM 4.5.95
diff --git a/kde-base/kalarm/kalarm-4.6.1.ebuild b/kde-base/kalarm/kalarm-4.6.1.ebuild
new file mode 100644
index 000000000000..df1bfbcff0ee
--- /dev/null
+++ b/kde-base/kalarm/kalarm-4.6.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kalarm/kalarm-4.6.1.ebuild,v 1.1 2011/07/11 14:01:19 tampakrap Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+KDE_SCM="git"
+inherit kde4-meta
+
+DESCRIPTION="Personal alarm message, command and email scheduler for KDE"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+RDEPEND="
+	$(add_kdebase_dep kdepimlibs 'semantic-desktop')
+	$(add_kdebase_dep kdepim-common-libs)
+	media-libs/phonon
+"
+DEPEND="${RDEPEND}"
+
+KMEXTRACTONLY="
+	kmail/
+"
diff --git a/kde-base/kdepim-common-libs/ChangeLog b/kde-base/kdepim-common-libs/ChangeLog
index ac22743d1f0f..845f2acaeb97 100644
--- a/kde-base/kdepim-common-libs/ChangeLog
+++ b/kde-base/kdepim-common-libs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdepim-common-libs
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-common-libs/ChangeLog,v 1.3 2011/06/09 22:52:44 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-common-libs/ChangeLog,v 1.4 2011/07/11 14:01:18 tampakrap Exp $
+
+*kdepim-common-libs-4.6.1 (11 Jul 2011)
+
+  11 Jul 2011; Theo Chatzimichos <tampakrap@gentoo.org>
+  +kdepim-common-libs-4.6.1.ebuild:
+  Version bump KDEPIM 4.6.1
 
   09 Jun 2011; Theo Chatzimichos <tampakrap@gentoo.org>
   -kdepim-common-libs-4.5.95.ebuild:
diff --git a/kde-base/kdepim-common-libs/kdepim-common-libs-4.6.1.ebuild b/kde-base/kdepim-common-libs/kdepim-common-libs-4.6.1.ebuild
new file mode 100644
index 000000000000..ee381a101a5f
--- /dev/null
+++ b/kde-base/kdepim-common-libs/kdepim-common-libs-4.6.1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-common-libs/kdepim-common-libs-4.6.1.ebuild,v 1.1 2011/07/11 14:01:18 tampakrap Exp $
+
+EAPI=4
+
+KMNAME="kdepim"
+KMNOMODULE="true"
+KDE_SCM="git"
+inherit kde4-meta
+
+DESCRIPTION="Common libraries for KDE PIM apps"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+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/
+	nepomuk_email_feeder/
+	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"
diff --git a/kde-base/kdepim-icons/ChangeLog b/kde-base/kdepim-icons/ChangeLog
index 299b311e8b3f..091ca4ae1ae8 100644
--- a/kde-base/kdepim-icons/ChangeLog
+++ b/kde-base/kdepim-icons/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdepim-icons
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-icons/ChangeLog,v 1.79 2011/06/09 22:52:45 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-icons/ChangeLog,v 1.80 2011/07/11 14:01:19 tampakrap Exp $
+
+*kdepim-icons-4.6.1 (11 Jul 2011)
+
+  11 Jul 2011; Theo Chatzimichos <tampakrap@gentoo.org>
+  +kdepim-icons-4.6.1.ebuild:
+  Version bump KDEPIM 4.6.1
 
   09 Jun 2011; Theo Chatzimichos <tampakrap@gentoo.org>
   -kdepim-icons-4.5.95.ebuild:
diff --git a/kde-base/kdepim-icons/kdepim-icons-4.6.1.ebuild b/kde-base/kdepim-icons/kdepim-icons-4.6.1.ebuild
new file mode 100644
index 000000000000..1d7b2cd7df30
--- /dev/null
+++ b/kde-base/kdepim-icons/kdepim-icons-4.6.1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-icons/kdepim-icons-4.6.1.ebuild,v 1.1 2011/07/11 14:01:19 tampakrap Exp $
+
+EAPI=4
+
+KMNAME="kdepim"
+KMMODULE="icons"
+KDE_SCM="git"
+inherit kde4-meta
+
+DESCRIPTION="KDE PIM icons"
+IUSE=""
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
diff --git a/kde-base/kdepim-kresources/ChangeLog b/kde-base/kdepim-kresources/ChangeLog
index 58b17a891818..523a47f53663 100644
--- a/kde-base/kdepim-kresources/ChangeLog
+++ b/kde-base/kdepim-kresources/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdepim-kresources
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-kresources/ChangeLog,v 1.190 2011/06/09 22:52:46 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-kresources/ChangeLog,v 1.191 2011/07/11 14:01:18 tampakrap Exp $
+
+*kdepim-kresources-4.6.1 (11 Jul 2011)
+
+  11 Jul 2011; Theo Chatzimichos <tampakrap@gentoo.org>
+  +kdepim-kresources-4.6.1.ebuild:
+  Version bump KDEPIM 4.6.1
 
   09 Jun 2011; Theo Chatzimichos <tampakrap@gentoo.org>
   -kdepim-kresources-4.5.95.ebuild:
diff --git a/kde-base/kdepim-kresources/kdepim-kresources-4.6.1.ebuild b/kde-base/kdepim-kresources/kdepim-kresources-4.6.1.ebuild
new file mode 100644
index 000000000000..965842e6f5fd
--- /dev/null
+++ b/kde-base/kdepim-kresources/kdepim-kresources-4.6.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-kresources/kdepim-kresources-4.6.1.ebuild,v 1.1 2011/07/11 14:01:18 tampakrap Exp $
+
+EAPI=4
+
+KMNAME="kdepim"
+KMMODULE="kresources"
+KDE_SCM="git"
+inherit kde4-meta
+
+DESCRIPTION="KDE PIM groupware plugin collection"
+IUSE="debug"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+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
+}
diff --git a/kde-base/kdepim-meta/ChangeLog b/kde-base/kdepim-meta/ChangeLog
index fd1ee2091f32..41e05c6a9122 100644
--- a/kde-base/kdepim-meta/ChangeLog
+++ b/kde-base/kdepim-meta/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdepim-meta
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-meta/ChangeLog,v 1.186 2011/06/16 05:02:40 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-meta/ChangeLog,v 1.187 2011/07/11 14:01:20 tampakrap Exp $
+
+*kdepim-meta-4.6.1 (11 Jul 2011)
+
+  11 Jul 2011; Theo Chatzimichos <tampakrap@gentoo.org>
+  +kdepim-meta-4.6.1.ebuild:
+  Version bump KDEPIM 4.6.1
 
   16 Jun 2011; Jonathan Callen <abcd@gentoo.org> kdepim-meta-4.4.11.1.ebuild:
   Drop block_other_slots() call, the function was removed
diff --git a/kde-base/kdepim-meta/kdepim-meta-4.6.1.ebuild b/kde-base/kdepim-meta/kdepim-meta-4.6.1.ebuild
new file mode 100644
index 000000000000..f54a2630ad45
--- /dev/null
+++ b/kde-base/kdepim-meta/kdepim-meta-4.6.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-meta/kdepim-meta-4.6.1.ebuild,v 1.1 2011/07/11 14:01:20 tampakrap Exp $
+
+EAPI=4
+inherit kde4-meta-pkg
+
+DESCRIPTION="kdepim - merge this to pull in all kdepim-derived packages"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+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)
+"
diff --git a/kde-base/kdepim-runtime/ChangeLog b/kde-base/kdepim-runtime/ChangeLog
index 34d8d66d890b..017d99e1d3d7 100644
--- a/kde-base/kdepim-runtime/ChangeLog
+++ b/kde-base/kdepim-runtime/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdepim-runtime
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-runtime/ChangeLog,v 1.42 2011/06/09 22:52:46 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-runtime/ChangeLog,v 1.43 2011/07/11 14:01:19 tampakrap Exp $
+
+*kdepim-runtime-4.6.1 (11 Jul 2011)
+
+  11 Jul 2011; Theo Chatzimichos <tampakrap@gentoo.org>
+  +kdepim-runtime-4.6.1.ebuild:
+  Version bump KDEPIM 4.6.1
 
   09 Jun 2011; Theo Chatzimichos <tampakrap@gentoo.org>
   -kdepim-runtime-4.5.95-r1.ebuild:
diff --git a/kde-base/kdepim-runtime/kdepim-runtime-4.6.1.ebuild b/kde-base/kdepim-runtime/kdepim-runtime-4.6.1.ebuild
new file mode 100644
index 000000000000..fee855d564f3
--- /dev/null
+++ b/kde-base/kdepim-runtime/kdepim-runtime-4.6.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-runtime/kdepim-runtime-4.6.1.ebuild,v 1.1 2011/07/11 14:01:19 tampakrap Exp $
+
+EAPI=4
+
+KDE_LINGUAS="ar be ca ca@valencia cs da de el en_GB eo es et fi fr ga gl hr hu
+ia it ja kk km ko lt lv mai nb nds nl nn pa pl pt pt_BR ro ru se sk sl sv th
+tr uk zh_CN zh_TW"
+KMNAME="kdepim-runtime"
+KDE_SCM="git"
+inherit kde4-base
+
+DESCRIPTION="KDE PIM runtime plugin collection"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+RESTRICT="test"
+# Would need test programs _testrunner and akonaditest from kdepimlibs, see bug 313233
+
+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')
+	x11-misc/shared-mime-info
+"
+RDEPEND="${DEPEND}
+	$(add_kdebase_dep kdepim-icons)
+"
+
+add_blocker kdemaildir '<4.3.0'
+add_blocker akonadi '<4.3.90'
diff --git a/kde-base/kdepim-strigi-analyzer/ChangeLog b/kde-base/kdepim-strigi-analyzer/ChangeLog
index 04ec3a9cc7b7..b0a69a70661a 100644
--- a/kde-base/kdepim-strigi-analyzer/ChangeLog
+++ b/kde-base/kdepim-strigi-analyzer/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdepim-strigi-analyzer
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-strigi-analyzer/ChangeLog,v 1.77 2011/06/09 22:52:45 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-strigi-analyzer/ChangeLog,v 1.78 2011/07/11 14:01:19 tampakrap Exp $
+
+*kdepim-strigi-analyzer-4.6.1 (11 Jul 2011)
+
+  11 Jul 2011; Theo Chatzimichos <tampakrap@gentoo.org>
+  +kdepim-strigi-analyzer-4.6.1.ebuild:
+  Version bump KDEPIM 4.6.1
 
   09 Jun 2011; Theo Chatzimichos <tampakrap@gentoo.org>
   -kdepim-strigi-analyzer-4.5.95.ebuild:
diff --git a/kde-base/kdepim-strigi-analyzer/kdepim-strigi-analyzer-4.6.1.ebuild b/kde-base/kdepim-strigi-analyzer/kdepim-strigi-analyzer-4.6.1.ebuild
new file mode 100644
index 000000000000..50bca0c4aa10
--- /dev/null
+++ b/kde-base/kdepim-strigi-analyzer/kdepim-strigi-analyzer-4.6.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-strigi-analyzer/kdepim-strigi-analyzer-4.6.1.ebuild,v 1.1 2011/07/11 14:01:19 tampakrap Exp $
+
+EAPI=4
+
+KMNAME="kdepim"
+KMMODULE="strigi-analyzer"
+KDE_SCM="git"
+inherit kde4-meta
+
+DESCRIPTION="kdepim: strigi plugins"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	app-misc/strigi
+	$(add_kdebase_dep kdepimlibs)
+	$(add_kdebase_dep kdepim-common-libs)
+"
+RDEPEND="${DEPEND}"
+
+KMEXTRACTONLY="
+	libkleo/
+	libkpgp/
+	messageviewer/
+"
diff --git a/kde-base/kdepim-wizards/ChangeLog b/kde-base/kdepim-wizards/ChangeLog
index 2653432c727b..40512db3002b 100644
--- a/kde-base/kdepim-wizards/ChangeLog
+++ b/kde-base/kdepim-wizards/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdepim-wizards
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-wizards/ChangeLog,v 1.175 2011/06/09 22:52:46 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-wizards/ChangeLog,v 1.176 2011/07/11 14:01:20 tampakrap Exp $
+
+*kdepim-wizards-4.6.1 (11 Jul 2011)
+
+  11 Jul 2011; Theo Chatzimichos <tampakrap@gentoo.org>
+  +kdepim-wizards-4.6.1.ebuild:
+  Version bump KDEPIM 4.6.1
 
   09 Jun 2011; Theo Chatzimichos <tampakrap@gentoo.org>
   -kdepim-wizards-4.5.95.ebuild:
diff --git a/kde-base/kdepim-wizards/kdepim-wizards-4.6.1.ebuild b/kde-base/kdepim-wizards/kdepim-wizards-4.6.1.ebuild
new file mode 100644
index 000000000000..256f7d58b771
--- /dev/null
+++ b/kde-base/kdepim-wizards/kdepim-wizards-4.6.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-wizards/kdepim-wizards-4.6.1.ebuild,v 1.1 2011/07/11 14:01:20 tampakrap Exp $
+
+EAPI=4
+
+KMNAME="kdepim"
+KMMODULE="wizards"
+KDE_SCM="git"
+inherit kde4-meta
+
+DESCRIPTION="KDE PIM wizards"
+IUSE="debug"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="
+	$(add_kdebase_dep kdepimlibs)
+	$(add_kdebase_dep kdepim-kresources)
+	$(add_kdebase_dep kdepim-common-libs)
+"
+RDEPEND="${DEPEND}"
+
+KMEXTRACTONLY="
+	kmail/
+	knotes/
+	kresources/groupwise/
+"
+
+src_prepare() {
+	ln -s "${EPREFIX}"/usr/include/kdepim-kresources/{kabc_groupwiseprefs,kcal_groupwiseprefsbase}.h \
+		kresources/groupwise/ \
+		|| die "Failed to link extra_headers."
+
+	kde4-meta_src_prepare
+}
diff --git a/kde-base/kjots/ChangeLog b/kde-base/kjots/ChangeLog
index 870612b5fb25..1fcd9155f4ff 100644
--- a/kde-base/kjots/ChangeLog
+++ b/kde-base/kjots/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kjots
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kjots/ChangeLog,v 1.178 2011/06/09 22:52:45 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kjots/ChangeLog,v 1.179 2011/07/11 14:01:18 tampakrap Exp $
+
+*kjots-4.6.1 (11 Jul 2011)
+
+  11 Jul 2011; Theo Chatzimichos <tampakrap@gentoo.org> +kjots-4.6.1.ebuild:
+  Version bump KDEPIM 4.6.1
 
   09 Jun 2011; Theo Chatzimichos <tampakrap@gentoo.org> -kjots-4.5.95.ebuild:
   Remove KDEPIM 4.5.95
diff --git a/kde-base/kjots/kjots-4.6.1.ebuild b/kde-base/kjots/kjots-4.6.1.ebuild
new file mode 100644
index 000000000000..6223709c8f3f
--- /dev/null
+++ b/kde-base/kjots/kjots-4.6.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kjots/kjots-4.6.1.ebuild,v 1.1 2011/07/11 14:01:18 tampakrap Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+KDE_SCM="git"
+inherit kde4-meta
+
+DESCRIPTION="KDE note taking utility"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	>=dev-libs/grantlee-0.1
+	$(add_kdebase_dep kdepimlibs 'semantic-desktop')
+	$(add_kdebase_dep kdepim-common-libs)
+"
+RDEPEND="${DEPEND}"
+
+KMEXTRACTONLY="
+	akonadi_next/
+"
diff --git a/kde-base/kleopatra/ChangeLog b/kde-base/kleopatra/ChangeLog
index e4797da23edf..cd0a2255b41e 100644
--- a/kde-base/kleopatra/ChangeLog
+++ b/kde-base/kleopatra/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kleopatra
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kleopatra/ChangeLog,v 1.83 2011/06/09 22:52:45 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kleopatra/ChangeLog,v 1.84 2011/07/11 14:01:19 tampakrap Exp $
+
+*kleopatra-4.6.1 (11 Jul 2011)
+
+  11 Jul 2011; Theo Chatzimichos <tampakrap@gentoo.org>
+  +kleopatra-4.6.1.ebuild:
+  Version bump KDEPIM 4.6.1
 
   09 Jun 2011; Theo Chatzimichos <tampakrap@gentoo.org>
   -kleopatra-4.5.95.ebuild:
diff --git a/kde-base/kleopatra/kleopatra-4.6.1.ebuild b/kde-base/kleopatra/kleopatra-4.6.1.ebuild
new file mode 100644
index 000000000000..289a033cffe7
--- /dev/null
+++ b/kde-base/kleopatra/kleopatra-4.6.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kleopatra/kleopatra-4.6.1.ebuild,v 1.1 2011/07/11 14:01:19 tampakrap Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+KDE_SCM="git"
+inherit kde4-meta
+
+DESCRIPTION="Kleopatra - KDE X.509 key manager"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	app-crypt/gpgme
+	dev-libs/boost
+	dev-libs/libassuan
+	dev-libs/libgpg-error
+	$(add_kdebase_dep kdepimlibs)
+	$(add_kdebase_dep kdepim-common-libs)
+"
+RDEPEND="${DEPEND}
+	app-crypt/gnupg
+"
+
+KMEXTRACTONLY="
+	libkleo/
+"
+
+src_unpack() {
+	if use handbook; then
+		KMEXTRA="
+			doc/kwatchgnupg
+		"
+	fi
+
+	kde4-meta_src_unpack
+}
diff --git a/kde-base/kmail/ChangeLog b/kde-base/kmail/ChangeLog
index 085848e421cb..56a2c14a0900 100644
--- a/kde-base/kmail/ChangeLog
+++ b/kde-base/kmail/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kmail
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/ChangeLog,v 1.253 2011/06/17 21:55:01 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/ChangeLog,v 1.254 2011/07/11 14:01:20 tampakrap Exp $
+
+*kmail-4.6.1 (11 Jul 2011)
+
+  11 Jul 2011; Theo Chatzimichos <tampakrap@gentoo.org> +kmail-4.6.1.ebuild:
+  Version bump KDEPIM 4.6.1
 
 *kmail-4.6.0-r1 (17 Jun 2011)
 
diff --git a/kde-base/kmail/kmail-4.6.1.ebuild b/kde-base/kmail/kmail-4.6.1.ebuild
new file mode 100644
index 000000000000..35b2156feeab
--- /dev/null
+++ b/kde-base/kmail/kmail-4.6.1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/kmail-4.6.1.ebuild,v 1.1 2011/07/11 14:01:20 tampakrap Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+KDE_SCM="git"
+VIRTUALX_REQUIRED=test
+inherit kde4-meta
+
+DESCRIPTION="KMail is the email component of Kontact, the integrated personal information manager of KDE."
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep kdepimlibs 'semantic-desktop')
+	$(add_kdebase_dep korganizer)
+	$(add_kdebase_dep kdepim-common-libs)
+"
+RDEPEND="${DEPEND}"
+
+add_blocker kmailcvt
+add_blocker libksieve
+add_blocker mimelib
+
+KMEXTRACTONLY="
+	akonadi_next/
+	calendarsupport/
+	korganizer/
+	kresources/
+	libkleo/
+	libkpgp/
+	libkdepimdbusinterfaces/
+	kdgantt2/
+"
+KMCOMPILEONLY="
+	messagecomposer/
+	messagecore/
+	messagelist/
+	messageviewer/
+	templateparser/
+	incidenceeditor-ng/
+	calendarsupport/
+"
+KMEXTRA="
+	kmailcvt/
+	ksendemail/
+	libksieve/
+	mailcommon/
+	ontologies/
+	plugins/messageviewer/
+"
+
+KMLOADLIBS="kdepim-common-libs"
+
+src_configure() {
+	# Bug 308903
+	use ppc64 && append-flags -mminimal-toc
+
+	kde4-meta_src_configure
+}
+
+src_compile() {
+	kde4-meta_src_compile kmail_xml
+	kde4-meta_src_compile
+}
+
+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
+	if ! has_version kde-base/kleopatra:${SLOT}; then
+		echo
+		elog "For certificate management and the gnupg log viewer, please install kde-base/kleopatra:${SLOT}"
+		echo
+	fi
+}
diff --git a/kde-base/knode/ChangeLog b/kde-base/knode/ChangeLog
index c89b35ea0d3d..afe859f8eb91 100644
--- a/kde-base/knode/ChangeLog
+++ b/kde-base/knode/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/knode
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/knode/ChangeLog,v 1.182 2011/06/09 22:52:46 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knode/ChangeLog,v 1.183 2011/07/11 14:01:19 tampakrap Exp $
+
+*knode-4.6.1 (11 Jul 2011)
+
+  11 Jul 2011; Theo Chatzimichos <tampakrap@gentoo.org> +knode-4.6.1.ebuild:
+  Version bump KDEPIM 4.6.1
 
   09 Jun 2011; Theo Chatzimichos <tampakrap@gentoo.org> -knode-4.5.95.ebuild:
   Remove KDEPIM 4.5.95
diff --git a/kde-base/knode/knode-4.6.1.ebuild b/kde-base/knode/knode-4.6.1.ebuild
new file mode 100644
index 000000000000..9bf4ed2e6d65
--- /dev/null
+++ b/kde-base/knode/knode-4.6.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knode/knode-4.6.1.ebuild,v 1.1 2011/07/11 14:01:19 tampakrap Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+KDE_SCM="git"
+inherit kde4-meta
+
+DESCRIPTION="A newsreader for KDE"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+# test fails, last checked for 4.2.96
+RESTRICT=test
+
+DEPEND="
+	$(add_kdebase_dep kdepimlibs)
+	$(add_kdebase_dep kdepim-common-libs)
+"
+RDEPEND="${DEPEND}"
+
+KMEXTRACTONLY="
+	libkleo/
+	libkpgp/
+	messagecomposer/
+	messageviewer/
+"
+
+KMLOADLIBS="kdepim-common-libs"
+
+src_unpack() {
+	if use handbook; then
+		KMEXTRA="
+			doc/kioslave/news
+		"
+	fi
+
+	kde4-meta_src_unpack
+}
diff --git a/kde-base/knotes/ChangeLog b/kde-base/knotes/ChangeLog
index 569d4f8d9ee3..b9cf46d66315 100644
--- a/kde-base/knotes/ChangeLog
+++ b/kde-base/knotes/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/knotes
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/knotes/ChangeLog,v 1.175 2011/06/09 22:52:46 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knotes/ChangeLog,v 1.176 2011/07/11 14:01:20 tampakrap Exp $
+
+*knotes-4.6.1 (11 Jul 2011)
+
+  11 Jul 2011; Theo Chatzimichos <tampakrap@gentoo.org> +knotes-4.6.1.ebuild:
+  Version bump KDEPIM 4.6.1
 
   09 Jun 2011; Theo Chatzimichos <tampakrap@gentoo.org> -knotes-4.5.95.ebuild:
   Remove KDEPIM 4.5.95
diff --git a/kde-base/knotes/knotes-4.6.1.ebuild b/kde-base/knotes/knotes-4.6.1.ebuild
new file mode 100644
index 000000000000..9938f8baa42f
--- /dev/null
+++ b/kde-base/knotes/knotes-4.6.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knotes/knotes-4.6.1.ebuild,v 1.1 2011/07/11 14:01:20 tampakrap Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+KDE_SCM="git"
+inherit kde4-meta
+
+DESCRIPTION="KDE Notes application"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep kdepimlibs)
+	$(add_kdebase_dep kdepim-common-libs)
+"
+RDEPEND="${DEPEND}"
+
+KMLOADLIBS="kdepim-common-libs"
diff --git a/kde-base/konsolekalendar/ChangeLog b/kde-base/konsolekalendar/ChangeLog
index 1c7f6991838d..400fe06ba632 100644
--- a/kde-base/konsolekalendar/ChangeLog
+++ b/kde-base/konsolekalendar/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/konsolekalendar
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/konsolekalendar/ChangeLog,v 1.164 2011/06/09 22:52:45 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konsolekalendar/ChangeLog,v 1.165 2011/07/11 14:01:19 tampakrap Exp $
+
+*konsolekalendar-4.6.1 (11 Jul 2011)
+
+  11 Jul 2011; Theo Chatzimichos <tampakrap@gentoo.org>
+  +konsolekalendar-4.6.1.ebuild:
+  Version bump KDEPIM 4.6.1
 
   09 Jun 2011; Theo Chatzimichos <tampakrap@gentoo.org>
   -konsolekalendar-4.5.95.ebuild:
diff --git a/kde-base/konsolekalendar/konsolekalendar-4.6.1.ebuild b/kde-base/konsolekalendar/konsolekalendar-4.6.1.ebuild
new file mode 100644
index 000000000000..a08d8e7a8e44
--- /dev/null
+++ b/kde-base/konsolekalendar/konsolekalendar-4.6.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konsolekalendar/konsolekalendar-4.6.1.ebuild,v 1.1 2011/07/11 14:01:19 tampakrap Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+KMMODULE="console/${PN}"
+KDE_SCM="git"
+inherit kde4-meta
+
+DESCRIPTION="A command line interface to KDE calendars"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep kdepimlibs)
+	$(add_kdebase_dep kdepim-common-libs)
+"
+RDEPEND="${DEPEND}"
+
+KMLOADLIBS="kdepim-common-libs"
diff --git a/kde-base/kontact/ChangeLog b/kde-base/kontact/ChangeLog
index 7378a1e7b7cd..fe7be520723d 100644
--- a/kde-base/kontact/ChangeLog
+++ b/kde-base/kontact/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kontact
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kontact/ChangeLog,v 1.187 2011/06/09 22:52:47 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kontact/ChangeLog,v 1.188 2011/07/11 14:01:20 tampakrap Exp $
+
+*kontact-4.6.1 (11 Jul 2011)
+
+  11 Jul 2011; Theo Chatzimichos <tampakrap@gentoo.org> +kontact-4.6.1.ebuild:
+  Version bump KDEPIM 4.6.1
 
   09 Jun 2011; Theo Chatzimichos <tampakrap@gentoo.org> -kontact-4.5.95.ebuild:
   Remove KDEPIM 4.5.95
diff --git a/kde-base/kontact/kontact-4.6.1.ebuild b/kde-base/kontact/kontact-4.6.1.ebuild
new file mode 100644
index 000000000000..c6421880f535
--- /dev/null
+++ b/kde-base/kontact/kontact-4.6.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kontact/kontact-4.6.1.ebuild,v 1.1 2011/07/11 14:01:20 tampakrap Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+KDE_SCM="git"
+inherit kde4-meta
+
+DESCRIPTION="KDE personal information manager"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep kdepimlibs)
+	$(add_kdebase_dep kdepim-common-libs)
+"
+RDEPEND="${DEPEND}"
+
+KMLOADLIBS="kdepim-common-libs"
+KMSAVELIBS="true"
+
+# We remove plugins that are related to external kdepim programs. This way
+# kontact doesn't have to depend on all programs it has plugins for.
+# kcontactmanager gone from kdesvn
+#
+KMEXTRACTONLY="
+	kontact/plugins/akregator/
+	kontact/plugins/kaddressbook/
+	kontact/plugins/kjots/
+	kontact/plugins/kmail/
+	kontact/plugins/knode/
+	kontact/plugins/knotes/
+	kontact/plugins/korganizer/
+	kontact/plugins/ktimetracker/
+	kontact/plugins/planner/
+	kontact/plugins/specialdates/
+	libkdepimdbusinterfaces/
+"
+
+src_unpack() {
+	if use handbook; then
+		KMEXTRA+="
+			doc/kontact-admin/
+		"
+	fi
+
+	kde4-meta_src_unpack
+}
diff --git a/kde-base/korganizer/ChangeLog b/kde-base/korganizer/ChangeLog
index 16260e4d39ac..07c14ad42513 100644
--- a/kde-base/korganizer/ChangeLog
+++ b/kde-base/korganizer/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/korganizer
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/korganizer/ChangeLog,v 1.196 2011/06/09 22:52:46 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/korganizer/ChangeLog,v 1.197 2011/07/11 14:01:17 tampakrap Exp $
+
+*korganizer-4.6.1 (11 Jul 2011)
+
+  11 Jul 2011; Theo Chatzimichos <tampakrap@gentoo.org>
+  +korganizer-4.6.1.ebuild:
+  Version bump KDEPIM 4.6.1
 
   09 Jun 2011; Theo Chatzimichos <tampakrap@gentoo.org>
   -korganizer-4.5.95.ebuild:
diff --git a/kde-base/korganizer/korganizer-4.6.1.ebuild b/kde-base/korganizer/korganizer-4.6.1.ebuild
new file mode 100644
index 000000000000..532f0ad857f5
--- /dev/null
+++ b/kde-base/korganizer/korganizer-4.6.1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/korganizer/korganizer-4.6.1.ebuild,v 1.1 2011/07/11 14:01:17 tampakrap Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+KDE_SCM="git"
+inherit kde4-meta
+
+DESCRIPTION="A Personal Organizer for KDE"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep kdepimlibs 'semantic-desktop')
+	$(add_kdebase_dep kdepim-common-libs)
+	sys-libs/zlib
+"
+RDEPEND="${DEPEND}"
+
+# Moved after 4.3.90
+add_blocker kontact-specialdates
+
+KMLOADLIBS="kdepim-common-libs"
+
+# xml targets from kmail are being uncommented by kde4-meta.eclass
+KMEXTRACTONLY="
+	akonadi_next/
+	calendarviews/
+	kdgantt2/
+	kmail/
+	knode/org.kde.knode.xml
+	libkdepimdbusinterfaces/
+"
+
+KMCOMPILEONLY="
+	incidenceeditor-ng/
+	calendarsupport/
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.5.64_missing_header.patch"
+)
+
+src_unpack() {
+	if use kontact; then
+		KMEXTRA="${KMEXTRA}
+			kontact/plugins/planner/
+			kontact/plugins/specialdates/
+		"
+	fi
+
+	kde4-meta_src_unpack
+}
+
+src_install() {
+	kde4-meta_src_install
+	# colliding with kdepim-common-libs
+	rm -rf "${ED}"/usr/share/kde4/servicetypes/calendarplugin.desktop
+	rm -rf "${ED}"/usr/share/kde4/servicetypes/calendardecoration.desktop
+}
+
+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/ktimetracker/ChangeLog b/kde-base/ktimetracker/ChangeLog
index 19c6175ea8ff..7d98f061130f 100644
--- a/kde-base/ktimetracker/ChangeLog
+++ b/kde-base/ktimetracker/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/ktimetracker
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktimetracker/ChangeLog,v 1.81 2011/06/09 22:52:46 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktimetracker/ChangeLog,v 1.82 2011/07/11 14:01:20 tampakrap Exp $
+
+*ktimetracker-4.6.1 (11 Jul 2011)
+
+  11 Jul 2011; Theo Chatzimichos <tampakrap@gentoo.org>
+  +ktimetracker-4.6.1.ebuild:
+  Version bump KDEPIM 4.6.1
 
   09 Jun 2011; Theo Chatzimichos <tampakrap@gentoo.org>
   -ktimetracker-4.5.95.ebuild:
diff --git a/kde-base/ktimetracker/ktimetracker-4.6.1.ebuild b/kde-base/ktimetracker/ktimetracker-4.6.1.ebuild
new file mode 100644
index 000000000000..d988cf66d6bc
--- /dev/null
+++ b/kde-base/ktimetracker/ktimetracker-4.6.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktimetracker/ktimetracker-4.6.1.ebuild,v 1.1 2011/07/11 14:01:20 tampakrap Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kdepim"
+KDE_SCM="git"
+inherit kde4-meta
+
+DESCRIPTION="KTimeTracker tracks time spent on various tasks."
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+RDEPEND="
+	$(add_kdebase_dep kdepim-kresources)
+	$(add_kdebase_dep kdepimlibs)
+	$(add_kdebase_dep kdepim-common-libs)
+	x11-libs/libXScrnSaver
+"
+DEPEND="${RDEPEND}
+	x11-proto/scrnsaverproto
+"
+
+KMEXTRACTONLY="
+	kresources/
+"
+
+KMLOADLIBS="kdepim-common-libs"
+
+src_unpack() {
+	if use kontact; then
+		KMEXTRA="${KMEXTRA} kontact/plugins/ktimetracker"
+	fi
+
+	kde4-meta_src_unpack
+}