Add upstream bugfixes

Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64

21 files changed, 1036 insertions, 5 deletions

diff --git a/kde-base/kaddressbook/ChangeLog b/kde-base/kaddressbook/ChangeLog
index 3362b28f5b7d..ffefd18c39bd 100644
--- a/kde-base/kaddressbook/ChangeLog
+++ b/kde-base/kaddressbook/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-base/kaddressbook
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kaddressbook/ChangeLog,v 1.222 2012/08/01 22:16:47 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kaddressbook/ChangeLog,v 1.223 2012/08/01 22:52:26 dilfridge Exp $
+
+*kaddressbook-4.4.11.1-r1 (01 Aug 2012)
+
+  01 Aug 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kaddressbook-4.4.11.1-r1.ebuild,
+  +files/4.4/0002-kaddressbook-Only-start-akonadi-asynchronously-on-KDE-4.6.2.p
+  atch:
+  Add upstream bugfixes
 
 *kaddressbook-4.9.0 (01 Aug 2012)
 
diff --git a/kde-base/kaddressbook/files/4.4/0002-kaddressbook-Only-start-akonadi-asynchronously-on-KDE-4.6.2.patch b/kde-base/kaddressbook/files/4.4/0002-kaddressbook-Only-start-akonadi-asynchronously-on-KDE-4.6.2.patch
new file mode 100644
index 000000000000..3382706be3a8
--- /dev/null
+++ b/kde-base/kaddressbook/files/4.4/0002-kaddressbook-Only-start-akonadi-asynchronously-on-KDE-4.6.2.patch
@@ -0,0 +1,35 @@
+From 0b44b1aa3d66f974e3d255c6e027947f1375b685 Mon Sep 17 00:00:00 2001
+From: Stephen Kelly <steveire@gmail.com>
+Date: Mon, 25 Apr 2011 22:09:08 +0200
+Subject: [PATCH 2/6] Only start akonadi asynchronously on KDE 4.6.2.
+
+Revises cfa404b7188e4c26bddbc9579728f6d25f8cd214 to hopefully fix
+the bug seen on fedora.
+
+Please re-test this on 4.6.2 on fedora too. Unfortunately that's the
+best I can do because I can't reproduce the issue.
+
+BUG: 268120
+---
+ kaddressbook/main.cpp  |    2 +-
+ kmail/kmmainwidget.cpp |    2 +-
+ kmail/main.cpp         |    2 +-
+ kontact/src/main.cpp   |    2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/kaddressbook/main.cpp b/kaddressbook/main.cpp
+index 200f8ec..e4cb3f7 100644
+--- a/kaddressbook/main.cpp
++++ b/kaddressbook/main.cpp
+@@ -49,7 +49,7 @@ int main( int argc, char **argv )
+   MainWindow *window = new MainWindow;
+   window->show();
+ 
+-#if !KDE_IS_VERSION(4,6,0)
++#if !KDE_IS_VERSION(4,6,2)
+   if ( !Akonadi::Control::start( window ) ) {
+     //TODO: add message box after string freeze
+     kWarning() << "Unable to start Akonadi server, exit application";
+-- 
+1.7.9.2
+
diff --git a/kde-base/kaddressbook/kaddressbook-4.4.11.1-r1.ebuild b/kde-base/kaddressbook/kaddressbook-4.4.11.1-r1.ebuild
new file mode 100644
index 000000000000..2e213f744448
--- /dev/null
+++ b/kde-base/kaddressbook/kaddressbook-4.4.11.1-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kaddressbook/kaddressbook-4.4.11.1-r1.ebuild,v 1.1 2012/08/01 22:52:26 dilfridge Exp $
+
+EAPI=4
+
+KMNAME="kdepim"
+KDE_HANDBOOK=optional
+inherit kde4-meta
+
+DESCRIPTION="The KDE Address Book"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep kdelibs 'semantic-desktop' 4.6)
+	$(add_kdebase_dep kdepimlibs 'semantic-desktop' 4.6)
+	$(add_kdebase_dep libkdepim)
+	$(add_kdebase_dep libkleo)
+"
+RDEPEND="${DEPEND}
+	$(add_kdebase_dep kdepim-runtime)
+"
+
+KMEXTRA="
+	plugins/kaddressbook/
+	plugins/ktexteditor/
+"
+KMEXTRACTONLY="
+	libkleo/
+"
+
+KMLOADLIBS="libkdepim"
+
+PATCHES=( "${FILESDIR}/4.4/"0002-*.patch )
+
+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 14dbae47f3aa..cb9079a79ba6 100644
--- a/kde-base/kalarm/ChangeLog
+++ b/kde-base/kalarm/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for kde-base/kalarm
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kalarm/ChangeLog,v 1.215 2012/08/01 22:17:17 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kalarm/ChangeLog,v 1.216 2012/08/01 22:49:10 dilfridge Exp $
+
+*kalarm-4.4.11.1-r2 (01 Aug 2012)
+
+  01 Aug 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kalarm-4.4.11.1-r2.ebuild,
+  +files/4.4/0001-Bug-266082-highlight-alarm-when-message-window-KAlar.patch,
+  +files/4.4/0003-Bug-271580-Fix-crash-displaying-New-Alarm-dialog-fro.patch,
+  +files/4.4/0006-Bug-296383-during-startup-check-that-resources-calen.patch:
+  Add upstream bugfixes
 
 *kalarm-4.9.0 (01 Aug 2012)
 
diff --git a/kde-base/kalarm/files/4.4/0001-Bug-266082-highlight-alarm-when-message-window-KAlar.patch b/kde-base/kalarm/files/4.4/0001-Bug-266082-highlight-alarm-when-message-window-KAlar.patch
new file mode 100644
index 000000000000..932f971c116a
--- /dev/null
+++ b/kde-base/kalarm/files/4.4/0001-Bug-266082-highlight-alarm-when-message-window-KAlar.patch
@@ -0,0 +1,146 @@
+From 712e45630ccd4ec128a087cb3de396b2df9e4ffc Mon Sep 17 00:00:00 2001
+From: David Jarvie <djarvie@kde.org>
+Date: Fri, 22 Apr 2011 00:36:20 +0100
+Subject: [PATCH 1/6] Bug 266082: highlight alarm when message window KAlarm
+ button clicked
+
+Fix the KAlarm button in the alarm window not always showing the main
+window, and not highlighting the alarm in the main window.
+---
+ kalarm/Changelog         |    4 ++++
+ kalarm/eventlistview.cpp |   11 +++++++----
+ kalarm/eventlistview.h   |    6 +++---
+ kalarm/functions.cpp     |   11 +++--------
+ kalarm/kalarm.h          |    2 +-
+ kalarm/mainwindow.cpp    |    7 +------
+ 6 files changed, 19 insertions(+), 22 deletions(-)
+
+diff --git a/kalarm/Changelog b/kalarm/Changelog
+index 25569f4..fab5edf 100644
+--- a/kalarm/Changelog
++++ b/kalarm/Changelog
+@@ -1,5 +1,9 @@
+ KAlarm Change Log
+ 
++=== Version 2.4.12 --- 22 April 2011 ===
++- Fix KAlarm button in alarm window not always showing main window and not
++  highlighting the alarm in the main window.
++
+ === Version 2.4.11 (KDEPIM 4.4.11) --- 16 April 2011 ===
+ - Fix bad borders round left hand buttons of time spinboxes in Oxygen style.
+ - Fix initialisation of library global statics.
+diff --git a/kalarm/eventlistview.cpp b/kalarm/eventlistview.cpp
+index 75e8be8..0880c7f 100644
+--- a/kalarm/eventlistview.cpp
++++ b/kalarm/eventlistview.cpp
+@@ -1,7 +1,7 @@
+ /*
+  *  eventlistview.cpp  -  base class for widget showing list of alarms
+  *  Program:  kalarm
+- *  Copyright © 2007-2009 by David Jarvie <djarvie@kde.org>
++ *  Copyright © 2007-2009,2011 by David Jarvie <djarvie@kde.org>
+  *
+  *  This program is free software; you can redistribute it and/or modify
+  *  it under the terms of the GNU General Public License as published by
+@@ -62,15 +62,18 @@ KAEvent* EventListView::event(int row) const
+ 
+ /******************************************************************************
+ * Select one event and make it the current item.
++* Optionally scroll to ensure that the  event is visible.
+ */
+-void EventListView::select(const QString& eventId)
++void EventListView::select(const QString& eventId, bool scrollToEvent)
+ {
+-	select(eventModel()->eventIndex(eventId));
++	select(eventModel()->eventIndex(eventId), scrollToEvent);
+ }
+ 
+-void EventListView::select(const QModelIndex& index)
++void EventListView::select(const QModelIndex& index, bool scrollToIndex)
+ {
+ 	selectionModel()->select(index, QItemSelectionModel::SelectCurrent | QItemSelectionModel::Rows);
++	if (scrollToIndex)
++		scrollTo(index);
+ }
+ 
+ /******************************************************************************
+diff --git a/kalarm/eventlistview.h b/kalarm/eventlistview.h
+index 23b97b1..f0dc7ca 100644
+--- a/kalarm/eventlistview.h
++++ b/kalarm/eventlistview.h
+@@ -1,7 +1,7 @@
+ /*
+  *  eventlistview.h  -  base class for widget showing list of alarms
+  *  Program:  kalarm
+- *  Copyright © 2007,2008 by David Jarvie <djarvie@kde.org>
++ *  Copyright © 2007,2008,2011 by David Jarvie <djarvie@kde.org>
+  *
+  *  This program is free software; you can redistribute it and/or modify
+  *  it under the terms of the GNU General Public License as published by
+@@ -42,8 +42,8 @@ class EventListView : public QTreeView
+ 		EventListModel*   eventModel() const   { return static_cast<EventListModel*>(static_cast<QAbstractProxyModel*>(model())->sourceModel()); }
+ 		KAEvent*          event(int row) const;
+ 		KAEvent*          event(const QModelIndex&) const;
+-		void              select(const QString& eventId);
+-		void              select(const QModelIndex&);
++		void              select(const QString& eventId, bool scrollToEvent = false);
++		void              select(const QModelIndex&, bool scrollToIndex = false);
+ 		QModelIndex       selectedIndex() const;
+ 		KAEvent*          selectedEvent() const;
+ 		KAEvent::List     selectedEvents() const;
+diff --git a/kalarm/functions.cpp b/kalarm/functions.cpp
+index ab1b6f1..307539a 100644
+--- a/kalarm/functions.cpp
++++ b/kalarm/functions.cpp
+@@ -132,14 +132,9 @@ MainWindow* displayMainWindowSelected(const QString& eventID)
+ 	else
+ 	{
+ 		// There is already a main window, so make it the active window
+-		bool visible = win->isVisible();
+-		if (visible)
+-			win->hide();        // in case it's on a different desktop
+-		if (!visible  ||  win->isMinimized())
+-		{
+-			win->setWindowState(win->windowState() & ~Qt::WindowMinimized);
+-			win->show();
+-		}
++		win->hide();        // in case it's on a different desktop
++		win->setWindowState(win->windowState() & ~Qt::WindowMinimized);
++		win->show();
+ 		win->raise();
+ 		win->activateWindow();
+ 	}
+diff --git a/kalarm/kalarm.h b/kalarm/kalarm.h
+index 63333b2..e887eb3 100644
+--- a/kalarm/kalarm.h
++++ b/kalarm/kalarm.h
+@@ -23,7 +23,7 @@
+ 
+ #undef QT3_SUPPORT
+ 
+-#define KALARM_VERSION "2.4.11"
++#define KALARM_VERSION "2.4.12"
+ #define KALARM_NAME "KAlarm"
+ #define KALARM_DBUS_SERVICE  "org.kde.kalarm"  // D-Bus service name of KAlarm application
+ 
+diff --git a/kalarm/mainwindow.cpp b/kalarm/mainwindow.cpp
+index 95ce321..dd3b915 100644
+--- a/kalarm/mainwindow.cpp
++++ b/kalarm/mainwindow.cpp
+@@ -657,12 +657,7 @@ void MainWindow::updateKeepArchived(int days)
+ void MainWindow::selectEvent(const QString& eventID)
+ {
+ 	mListView->clearSelection();
+-	QModelIndex index = EventListModel::alarms()->eventIndex(eventID);
+-	if (index.isValid())
+-	{
+-		mListView->select(index);
+-		mListView->scrollTo(index);
+-	}
++	mListView->select(eventID, true);
+ }
+ 
+ /******************************************************************************
+-- 
+1.7.9.2
+
diff --git a/kde-base/kalarm/files/4.4/0003-Bug-271580-Fix-crash-displaying-New-Alarm-dialog-fro.patch b/kde-base/kalarm/files/4.4/0003-Bug-271580-Fix-crash-displaying-New-Alarm-dialog-fro.patch
new file mode 100644
index 000000000000..82fa7e3e8f6f
--- /dev/null
+++ b/kde-base/kalarm/files/4.4/0003-Bug-271580-Fix-crash-displaying-New-Alarm-dialog-fro.patch
@@ -0,0 +1,64 @@
+From 4b504e760e0c994e676b55bfaca731d74841f1f4 Mon Sep 17 00:00:00 2001
+From: David Jarvie <djarvie@kde.org>
+Date: Tue, 26 Apr 2011 23:29:19 +0100
+Subject: [PATCH 3/6] Bug 271580: Fix crash displaying New Alarm dialog from
+ system tray
+
+Fixes a crash on some systems when the New Alarm dialog is displayed
+from the system tray icon menu.
+---
+ kalarm/Changelog        |    4 +++-
+ kalarm/lib/spinbox2.cpp |    9 +++++----
+ 2 files changed, 8 insertions(+), 5 deletions(-)
+
+diff --git a/kalarm/Changelog b/kalarm/Changelog
+index fab5edf..7caf1dd 100644
+--- a/kalarm/Changelog
++++ b/kalarm/Changelog
+@@ -1,6 +1,8 @@
+ KAlarm Change Log
+ 
+-=== Version 2.4.12 --- 22 April 2011 ===
++=== Version 2.4.12 --- 26 April 2011 ===
++- Fix crash on some systems when New Alarm dialogue is displayed from system tray
++  icon menu.
+ - Fix KAlarm button in alarm window not always showing main window and not
+   highlighting the alarm in the main window.
+ 
+diff --git a/kalarm/lib/spinbox2.cpp b/kalarm/lib/spinbox2.cpp
+index cc10882..f1e8ab9 100644
+--- a/kalarm/lib/spinbox2.cpp
++++ b/kalarm/lib/spinbox2.cpp
+@@ -1,7 +1,7 @@
+ /*
+  *  spinbox2.cpp  -  spin box with extra pair of spin buttons (for Qt 3)
+  *  Program:  kalarm
+- *  Copyright © 2001-2009 by David Jarvie <djarvie@kde.org>
++ *  Copyright © 2001-2009,2011 by David Jarvie <djarvie@kde.org>
+  *
+  *  This program is free software; you can redistribute it and/or modify
+  *  it under the terms of the GNU General Public License as published by
+@@ -28,7 +28,7 @@
+ #include <QMouseEvent>
+ #include <QStyleOptionSpinBox>
+ #include <QGraphicsPixmapItem>
+-#include <QPaintEngine>
++#include <QPainter>
+ #include <QTimer>
+ #include <QFrame>
+ #include <QBrush>
+@@ -588,8 +588,9 @@ void SpinMirror::setFrame()
+ 		p = grabWidget(mMainSpinbox, QRect(x, 0, 1, height()));
+ 		// Blot out edit field stuff from the middle of the slice
+ 		QPixmap dot = grabWidget(mMainSpinbox, QRect(x, editOffsetY, 1, 1));
+-		QPaintEngine* pe = p.paintEngine();
+-		pe->drawTiledPixmap(QRectF(0, editOffsetY, 1, height() - 2*editOffsetY), dot, QPointF(0, 0));
++		QPainter painter(&p);
++		painter.drawTiledPixmap(0, editOffsetY, 1, height() - 2*editOffsetY, dot, 0, 0);
++		painter.end();
+ 		// Horizontally fill the mirror widget with the vertical slice
+ 		p = p.scaled(size());
+ 		// Grab the left hand border of the main spinbox, and draw it into the mirror widget.
+-- 
+1.7.9.2
+
diff --git a/kde-base/kalarm/files/4.4/0006-Bug-296383-during-startup-check-that-resources-calen.patch b/kde-base/kalarm/files/4.4/0006-Bug-296383-during-startup-check-that-resources-calen.patch
new file mode 100644
index 000000000000..6e75d0ca3e4e
--- /dev/null
+++ b/kde-base/kalarm/files/4.4/0006-Bug-296383-during-startup-check-that-resources-calen.patch
@@ -0,0 +1,123 @@
+From f73e082654a88617439043454b45bf950d168dfc Mon Sep 17 00:00:00 2001
+From: David Jarvie <djarvie@kde.org>
+Date: Thu, 29 Mar 2012 00:29:03 +0100
+Subject: [PATCH 6/6] Bug 296383: during startup, check that resources
+ calendar opens ok
+
+Prevent crash in program initialisation by checking that the
+resources calendar has opened successfully.
+
+BUG:296383
+
+Backport of 4a3204b75464406ab3b3505e2fe222937aac6750 (master)
+---
+ kalarm/Changelog         |    3 ++-
+ kalarm/alarmcalendar.cpp |   19 ++++++++++++++++---
+ kalarm/alarmcalendar.h   |    4 ++--
+ kalarm/kalarmapp.cpp     |    3 ++-
+ 4 files changed, 22 insertions(+), 7 deletions(-)
+
+diff --git a/kalarm/Changelog b/kalarm/Changelog
+index 7caf1dd..e2aee86 100644
+--- a/kalarm/Changelog
++++ b/kalarm/Changelog
+@@ -1,10 +1,11 @@
+ KAlarm Change Log
+ 
+-=== Version 2.4.12 --- 26 April 2011 ===
++=== Version 2.4.12 --- 29 March 2012 ===
+ - Fix crash on some systems when New Alarm dialogue is displayed from system tray
+   icon menu.
+ - Fix KAlarm button in alarm window not always showing main window and not
+   highlighting the alarm in the main window.
++- Fail cleanly if calendar resources fail to open.
+ 
+ === Version 2.4.11 (KDEPIM 4.4.11) --- 16 April 2011 ===
+ - Fix bad borders round left hand buttons of time spinboxes in Oxygen style.
+diff --git a/kalarm/alarmcalendar.cpp b/kalarm/alarmcalendar.cpp
+index 0b6eed8..281b58c 100644
+--- a/kalarm/alarmcalendar.cpp
++++ b/kalarm/alarmcalendar.cpp
+@@ -1,7 +1,7 @@
+ /*
+  *  alarmcalendar.cpp  -  KAlarm calendar file access
+  *  Program:  kalarm
+- *  Copyright © 2001-2009 by David Jarvie <djarvie@kde.org>
++ *  Copyright © 2001-2012 by David Jarvie <djarvie@kde.org>
+  *
+  *  This program is free software; you can redistribute it and/or modify
+  *  it under the terms of the GNU General Public License as published by
+@@ -187,11 +187,24 @@ AlarmCalendar::~AlarmCalendar()
+ }
+ 
+ /******************************************************************************
++* Check whether the calendar is open.
++*/
++bool AlarmCalendar::isOpen()
++{
++	if (mOpen  &&  mCalType == RESOURCES  &&  !AlarmResources::instance())
++	{
++		mCalendar = 0;
++		mOpen = false;
++	}
++	return mOpen;
++}
++
++/******************************************************************************
+ * Open the calendar if not already open, and load it into memory.
+ */
+ bool AlarmCalendar::open()
+ {
+-	if (mOpen)
++	if (isOpen())
+ 		return true;
+ 	if (mCalType == RESOURCES)
+ 	{
+@@ -233,7 +246,7 @@ bool AlarmCalendar::open()
+ 		delete mCalendar;
+ 		mCalendar = 0;
+ 	}
+-	return mOpen;
++	return isOpen();
+ }
+ 
+ /******************************************************************************
+diff --git a/kalarm/alarmcalendar.h b/kalarm/alarmcalendar.h
+index be4537d..1535dd0 100644
+--- a/kalarm/alarmcalendar.h
++++ b/kalarm/alarmcalendar.h
+@@ -1,7 +1,7 @@
+ /*
+  *  alarmcalendar.h  -  KAlarm calendar file access
+  *  Program:  kalarm
+- *  Copyright © 2001-2009 by David Jarvie <djarvie@kde.org>
++ *  Copyright © 2001-2012 by David Jarvie <djarvie@kde.org>
+  *
+  *  This program is free software; you can redistribute it and/or modify
+  *  it under the terms of the GNU General Public License as published by
+@@ -78,7 +78,7 @@ class AlarmCalendar : public QObject
+ 		KAEvent*              updateEvent(const KAEvent*);
+ 		bool                  deleteEvent(const QString& eventID, bool save = false);
+ 		void                  purgeEvents(const KAEvent::List&);
+-		bool                  isOpen() const         { return mOpen; }
++		bool                  isOpen();
+ 		QString               path() const           { return (mCalType == RESOURCES) ? QString() : mUrl.prettyUrl(); }
+ 		QString               urlString() const      { return (mCalType == RESOURCES) ? QString() : mUrl.url(); }
+ 		void                  adjustStartOfDay();
+diff --git a/kalarm/kalarmapp.cpp b/kalarm/kalarmapp.cpp
+index e472bac..f432860 100644
+--- a/kalarm/kalarmapp.cpp
++++ b/kalarm/kalarmapp.cpp
+@@ -1953,7 +1953,8 @@ bool KAlarmApp::initCheck(bool calendarOnly)
+ 		 */
+ 		AlarmCalendar::displayCalendar()->open();
+ 
+-		AlarmCalendar::resources()->open();
++		if (!AlarmCalendar::resources()->open())
++			return false;
+ 		setArchivePurgeDays();
+ 
+ 		firstTime = false;
+-- 
+1.7.9.2
+
diff --git a/kde-base/kalarm/kalarm-4.4.11.1-r2.ebuild b/kde-base/kalarm/kalarm-4.4.11.1-r2.ebuild
new file mode 100644
index 000000000000..34870066afff
--- /dev/null
+++ b/kde-base/kalarm/kalarm-4.4.11.1-r2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kalarm/kalarm-4.4.11.1-r2.ebuild,v 1.1 2012/08/01 22:49:10 dilfridge Exp $
+
+EAPI=4
+
+KMNAME="kdepim"
+KDE_HANDBOOK=optional
+inherit kde4-meta
+
+DESCRIPTION="Personal alarm message, command and email scheduler for KDE"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+RDEPEND="
+	$(add_kdebase_dep kdepimlibs 'semantic-desktop' 4.6)
+	$(add_kdebase_dep libkdepim)
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+	dev-libs/libxslt
+"
+
+KMEXTRACTONLY="
+	kmail/
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.4.11.1-underlinking.patch"
+	"${FILESDIR}/4.4/"000{1,3,6}-*.patch
+)
+
+src_configure() {
+	mycmakeargs=(
+		-DBUILD_akonadi=OFF
+		-DXSLTPROC_EXECUTABLE="${EPREFIX}"/usr/bin/xsltproc
+	)
+	kde4-meta_src_configure
+}
diff --git a/kde-base/kdepim-runtime/ChangeLog b/kde-base/kdepim-runtime/ChangeLog
index f9a03c5c6b31..6671699ea592 100644
--- a/kde-base/kdepim-runtime/ChangeLog
+++ b/kde-base/kdepim-runtime/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-base/kdepim-runtime
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-runtime/ChangeLog,v 1.83 2012/08/01 22:17:09 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-runtime/ChangeLog,v 1.84 2012/08/01 22:45:45 dilfridge Exp $
+
+*kdepim-runtime-4.4.11.1-r1 (01 Aug 2012)
+
+  01 Aug 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +files/4.4/0001-Less-warnings-when-building-against-a-new-kdepimlibs.patch,
+  +files/4.4/0002-Implement-readOnly-for-Akonadi-kresources.patch,
+  +kdepim-runtime-4.4.11.1-r1.ebuild:
+  Add upstream bugfixes
 
 *kdepim-runtime-4.9.0 (01 Aug 2012)
 
diff --git a/kde-base/kdepim-runtime/files/4.4/0001-Less-warnings-when-building-against-a-new-kdepimlibs.patch b/kde-base/kdepim-runtime/files/4.4/0001-Less-warnings-when-building-against-a-new-kdepimlibs.patch
new file mode 100644
index 000000000000..662f38f17261
--- /dev/null
+++ b/kde-base/kdepim-runtime/files/4.4/0001-Less-warnings-when-building-against-a-new-kdepimlibs.patch
@@ -0,0 +1,24 @@
+From ab29b74fe8ec830c6d4c896900939c98d22c0e96 Mon Sep 17 00:00:00 2001
+From: Thomas McGuire <mcguire@kde.org>
+Date: Mon, 25 Apr 2011 00:36:43 +0100
+Subject: [PATCH 1/2] Less warnings when building against a new kdepimlibs.
+
+---
+ kresources/CMakeLists.txt |    3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/kresources/CMakeLists.txt b/kresources/CMakeLists.txt
+index 9fd1b37..a746796 100644
+--- a/kresources/CMakeLists.txt
++++ b/kresources/CMakeLists.txt
+@@ -1,4 +1,7 @@
+ add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
++add_definitions(-DWANT_DEPRECATED_KCAL_API)
++add_definitions(-DWANT_DEPRECATED_KABC_API)
++add_definitions(-DWANT_DEPRECATED_KRESOURCE_API)
+ include_directories (${kdepim-runtime_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDES} ${QT_QTDBUS_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/shared)
+ 
+ # include (ConfigureChecks.cmake)
+-- 
+1.7.9.2
+
diff --git a/kde-base/kdepim-runtime/files/4.4/0002-Implement-readOnly-for-Akonadi-kresources.patch b/kde-base/kdepim-runtime/files/4.4/0002-Implement-readOnly-for-Akonadi-kresources.patch
new file mode 100644
index 000000000000..df3967cecf57
--- /dev/null
+++ b/kde-base/kdepim-runtime/files/4.4/0002-Implement-readOnly-for-Akonadi-kresources.patch
@@ -0,0 +1,119 @@
+From 8f85db2a32cab4bad987b2100424fbaf42f6ed26 Mon Sep 17 00:00:00 2001
+From: Thomas McGuire <mcguire@kde.org>
+Date: Mon, 25 Apr 2011 00:50:43 +0100
+Subject: [PATCH 2/2] Implement readOnly() for Akonadi kresources.
+
+Now it doesn't ask me if I want to save in my local calendar
+or in my Facebook folder anymore, since only the local calendar
+is writeable.
+
+REVIEW: 101229
+---
+ kresources/kabc/resourceakonadi.cpp       |    5 +++++
+ kresources/kabc/resourceakonadi.h         |    2 ++
+ kresources/kcal/resourceakonadi.cpp       |    5 +++++
+ kresources/kcal/resourceakonadi.h         |    2 ++
+ kresources/shared/sharedresourceprivate.h |    5 +++++
+ kresources/shared/subresourcemodel.h      |   13 +++++++++++++
+ 6 files changed, 32 insertions(+)
+
+diff --git a/kresources/kabc/resourceakonadi.cpp b/kresources/kabc/resourceakonadi.cpp
+index d2ea349..39edf6e 100644
+--- a/kresources/kabc/resourceakonadi.cpp
++++ b/kresources/kabc/resourceakonadi.cpp
+@@ -249,5 +249,10 @@ void ResourceAkonadi::setSubresourceCompletionWeight( const QString &subResource
+   }
+ }
+ 
++bool ResourceAkonadi::readOnly() const
++{
++  return d->isReadOnly();
++}
++
+ #include "resourceakonadi.moc"
+ // kate: space-indent on; indent-width 2; replace-tabs on;
+diff --git a/kresources/kabc/resourceakonadi.h b/kresources/kabc/resourceakonadi.h
+index f2075a4..747a0c1 100644
+--- a/kresources/kabc/resourceakonadi.h
++++ b/kresources/kabc/resourceakonadi.h
+@@ -73,6 +73,8 @@ class ResourceAkonadi : public ResourceABC, public SharedResourceIface
+     virtual QStringList subresources() const;
+     virtual QMap<QString, QString> uidToResourceMap() const;
+ 
++    virtual bool readOnly() const;
++
+     StoreConfigIface &storeConfig();
+ 
+   public Q_SLOTS:
+diff --git a/kresources/kcal/resourceakonadi.cpp b/kresources/kcal/resourceakonadi.cpp
+index d2c9415..9552ffa 100644
+--- a/kresources/kcal/resourceakonadi.cpp
++++ b/kresources/kcal/resourceakonadi.cpp
+@@ -432,6 +432,11 @@ void ResourceAkonadi::doClose()
+   d->doClose();
+ }
+ 
++bool ResourceAkonadi::readOnly() const
++{
++  return d->isReadOnly();
++}
++
+ #include "resourceakonadi.moc"
+ 
+ // kate: space-indent on; indent-width 2; replace-tabs on;
+diff --git a/kresources/kcal/resourceakonadi.h b/kresources/kcal/resourceakonadi.h
+index a220616..f7ee77d 100644
+--- a/kresources/kcal/resourceakonadi.h
++++ b/kresources/kcal/resourceakonadi.h
+@@ -140,6 +140,8 @@ class ResourceAkonadi : public ResourceCalendar, public SharedResourceIface
+ 
+     virtual QString infoText() const;
+ 
++    virtual bool readOnly() const;
++
+   protected:
+     virtual bool doLoad( bool syncCache );
+ 
+diff --git a/kresources/shared/sharedresourceprivate.h b/kresources/shared/sharedresourceprivate.h
+index 8019204..ea551d5 100644
+--- a/kresources/shared/sharedresourceprivate.h
++++ b/kresources/shared/sharedresourceprivate.h
+@@ -68,6 +68,11 @@ class SharedResourcePrivate : public ResourcePrivateBase
+       return mModel.subResource( id );
+     }
+ 
++    bool isReadOnly() const
++    {
++      return !mModel.hasWritableSubResource();
++    }
++
+   protected:
+      SubResourceModelClass mModel;
+ 
+diff --git a/kresources/shared/subresourcemodel.h b/kresources/shared/subresourcemodel.h
+index b6f4dc2..956a0ff 100644
+--- a/kresources/shared/subresourcemodel.h
++++ b/kresources/shared/subresourcemodel.h
+@@ -97,6 +97,19 @@ class SubResourceModel : public AbstractSubResourceModel
+       return result;
+     }
+ 
++    bool hasWritableSubResource() const
++    {
++      Akonadi::MimeTypeChecker mimeChecker;
++      mimeChecker.setWantedMimeTypes( SubResourceClass::supportedMimeTypes() );
++
++      foreach ( const SubResourceClass *subResource, mSubResourcesByColId ) {
++        if ( subResource->isWritable() && mimeChecker.isWantedCollection( subResource->collection() ) ) {
++          return true;
++        }
++      }
++      return false;
++    }
++
+     SubResourceClass *findSubResourceForMappedItem( const QString &kresId ) const
+     {
+       foreach ( SubResourceClass *subResource, mSubResourcesByColId ) {
+-- 
+1.7.9.2
+
diff --git a/kde-base/kdepim-runtime/kdepim-runtime-4.4.11.1-r1.ebuild b/kde-base/kdepim-runtime/kdepim-runtime-4.4.11.1-r1.ebuild
new file mode 100644
index 000000000000..438f418ef44d
--- /dev/null
+++ b/kde-base/kdepim-runtime/kdepim-runtime-4.4.11.1-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2012 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.4.11.1-r1.ebuild,v 1.1 2012/08/01 22:45:45 dilfridge Exp $
+
+EAPI=4
+
+if [[ ${PV} = *9999* ]]; then
+	KMNAME="kdepim"
+	KMMODULE="runtime"
+	inherit kde4-meta
+else
+	inherit kde4-base
+fi
+
+DESCRIPTION="KDE PIM runtime plugin collection"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+RESTRICT="test"
+# Would need test programs _testrunner and akonaditest from kdepimlibs
+
+COMMON_DEPEND="
+	app-misc/strigi
+	>=app-office/akonadi-server-1.3.1
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	$(add_kdebase_dep kdelibs 'semantic-desktop' 4.6)
+	$(add_kdebase_dep kdepimlibs 'semantic-desktop' 4.6)
+	$(add_kdebase_dep libkdepim)
+	x11-misc/shared-mime-info
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_kdebase_dep kdepim-icons)
+"
+
+add_blocker akonadi '<4.3.90'
+
+PATCHES=( "${FILESDIR}/4.4/"000[1-2]-*.patch )
diff --git a/kde-base/kmail/ChangeLog b/kde-base/kmail/ChangeLog
index 30bf14955005..60474c98015b 100644
--- a/kde-base/kmail/ChangeLog
+++ b/kde-base/kmail/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for kde-base/kmail
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/ChangeLog,v 1.294 2012/08/01 22:17:35 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/ChangeLog,v 1.295 2012/08/01 22:54:54 dilfridge Exp $
+
+*kmail-4.4.11.1-r1 (01 Aug 2012)
+
+  01 Aug 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kmail-4.4.11.1-r1.ebuild,
+  +files/4.4/0005-Fix-bug-276086-crash-on-exit.patch,
+  +files/4.4/0004-kmail-Make-spell-checking-work-again.patch,
+  +files/4.4/0002-kmail-Only-start-akonadi-asynchronously-on-KDE-4.6.2.patch,
+  +files/4.4/0004-libkdepim-Make-spell-checking-work-again.patch:
+  Add upstream bugfixes
 
 *kmail-4.9.0 (01 Aug 2012)
 
diff --git a/kde-base/kmail/files/4.4/0002-kmail-Only-start-akonadi-asynchronously-on-KDE-4.6.2.patch b/kde-base/kmail/files/4.4/0002-kmail-Only-start-akonadi-asynchronously-on-KDE-4.6.2.patch
new file mode 100644
index 000000000000..11bcad61d759
--- /dev/null
+++ b/kde-base/kmail/files/4.4/0002-kmail-Only-start-akonadi-asynchronously-on-KDE-4.6.2.patch
@@ -0,0 +1,48 @@
+From 0b44b1aa3d66f974e3d255c6e027947f1375b685 Mon Sep 17 00:00:00 2001
+From: Stephen Kelly <steveire@gmail.com>
+Date: Mon, 25 Apr 2011 22:09:08 +0200
+Subject: [PATCH 2/6] Only start akonadi asynchronously on KDE 4.6.2.
+
+Revises cfa404b7188e4c26bddbc9579728f6d25f8cd214 to hopefully fix
+the bug seen on fedora.
+
+Please re-test this on 4.6.2 on fedora too. Unfortunately that's the
+best I can do because I can't reproduce the issue.
+
+BUG: 268120
+---
+ kaddressbook/main.cpp  |    2 +-
+ kmail/kmmainwidget.cpp |    2 +-
+ kmail/main.cpp         |    2 +-
+ kontact/src/main.cpp   |    2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/kmail/kmmainwidget.cpp b/kmail/kmmainwidget.cpp
+index 10b14e4..f6461d9 100644
+--- a/kmail/kmmainwidget.cpp
++++ b/kmail/kmmainwidget.cpp
+@@ -189,7 +189,7 @@ KMMainWidget::KMMainWidget( QWidget *parent, KXMLGUIClient *aGUIClient,
+     mVacationIndicatorActive( false ),
+     mGoToFirstUnreadMessageInSelectedFolder( false )
+ {
+-#if KDE_IS_VERSION(4,6,0)
++#if KDE_IS_VERSION(4,6,2)
+   Akonadi::Control::widgetNeedsAkonadi(this);
+   Akonadi::ServerManager::start();
+ #endif
+diff --git a/kmail/main.cpp b/kmail/main.cpp
+index c2dd1c3..f59d5e6 100644
+--- a/kmail/main.cpp
++++ b/kmail/main.cpp
+@@ -145,7 +145,7 @@ int main(int argc, char *argv[])
+   app.setEventLoopReached();
+   app.delayedInstanceCreation();
+ 
+-#if !KDE_IS_VERSION(4,6,0)
++#if !KDE_IS_VERSION(4,6,2)
+   // Start Akonadi
+   if ( !Akonadi::Control::start( kmkernel->getKMMainWidget() ) ) {
+     //TODO: add message box after string freeze
+-- 
+1.7.9.2
+
diff --git a/kde-base/kmail/files/4.4/0004-kmail-Make-spell-checking-work-again.patch b/kde-base/kmail/files/4.4/0004-kmail-Make-spell-checking-work-again.patch
new file mode 100644
index 000000000000..0004bec69e8a
--- /dev/null
+++ b/kde-base/kmail/files/4.4/0004-kmail-Make-spell-checking-work-again.patch
@@ -0,0 +1,35 @@
+From 6f62ea1bff318d8efea42f59bdc965ee2ab187a0 Mon Sep 17 00:00:00 2001
+From: Thomas McGuire <mcguire@kde.org>
+Date: Wed, 11 May 2011 18:21:32 +0100
+Subject: [PATCH 4/6] Make spell checking work again. The text edit used the
+ wrong config file for loading spell settings. After
+ using the config file, the correct settigns get loaded
+ again, since the Loader from Sonnet is a singleton and
+ therefore shares the settings, so even the textedit
+ with the wrong settings file name gets updated.
+
+cherry-picked from d1708effbb68d6eae36ee5177a599c965973725f.
+
+BUG: 247486
+---
+ kmail/kmcomposereditor.cpp |    2 +-
+ libkdepim/kmeditor.cpp     |   12 ++++++++++++
+ libkdepim/kmeditor.h       |    6 ++++++
+ 3 files changed, 19 insertions(+), 1 deletion(-)
+
+diff --git a/kmail/kmcomposereditor.cpp b/kmail/kmcomposereditor.cpp
+index f1accab..74de65b 100644
+--- a/kmail/kmcomposereditor.cpp
++++ b/kmail/kmcomposereditor.cpp
+@@ -44,7 +44,7 @@
+ #include <QFileInfo>
+ 
+ KMComposerEditor::KMComposerEditor( KMComposeWin *win,QWidget *parent)
+- :KMeditor(parent),m_composerWin(win)
++ :KMeditor(parent, "kmailrc"),m_composerWin(win)
+ {
+ }
+ 
+-- 
+1.7.9.2
+
diff --git a/kde-base/kmail/files/4.4/0004-libkdepim-Make-spell-checking-work-again.patch b/kde-base/kmail/files/4.4/0004-libkdepim-Make-spell-checking-work-again.patch
new file mode 100644
index 000000000000..19d8c01666f6
--- /dev/null
+++ b/kde-base/kmail/files/4.4/0004-libkdepim-Make-spell-checking-work-again.patch
@@ -0,0 +1,69 @@
+From 6f62ea1bff318d8efea42f59bdc965ee2ab187a0 Mon Sep 17 00:00:00 2001
+From: Thomas McGuire <mcguire@kde.org>
+Date: Wed, 11 May 2011 18:21:32 +0100
+Subject: [PATCH 4/6] Make spell checking work again. The text edit used the
+ wrong config file for loading spell settings. After
+ using the config file, the correct settigns get loaded
+ again, since the Loader from Sonnet is a singleton and
+ therefore shares the settings, so even the textedit
+ with the wrong settings file name gets updated.
+
+cherry-picked from d1708effbb68d6eae36ee5177a599c965973725f.
+
+BUG: 247486
+---
+ kmail/kmcomposereditor.cpp |    2 +-
+ libkdepim/kmeditor.cpp     |   12 ++++++++++++
+ libkdepim/kmeditor.h       |    6 ++++++
+ 3 files changed, 19 insertions(+), 1 deletion(-)
+
+diff --git a/libkdepim/kmeditor.cpp b/libkdepim/kmeditor.cpp
+index e8f0d36..067c781 100644
+--- a/libkdepim/kmeditor.cpp
++++ b/libkdepim/kmeditor.cpp
+@@ -28,6 +28,7 @@
+ #include <KProcess>
+ #include <KPushButton>
+ #include <KTemporaryFile>
++#include <kdeversion.h>
+ 
+ #include <QApplication>
+ #include <QClipboard>
+@@ -215,6 +216,17 @@ KMeditor::KMeditor( QWidget *parent )
+   d->init();
+ }
+ 
++KMeditor::KMeditor( QWidget *parent, const QString & configFile )
++#if KDE_IS_VERSION(4,6,0)
++ : TextEdit( parent, configFile ), d( new KMeditorPrivate( this ) )
++#else
++ : TextEdit( parent ), d( new KMeditorPrivate( this ) )
++#endif
++{
++  Q_UNUSED( configFile )
++  d->init();
++}
++
+ KMeditor::~KMeditor()
+ {
+   delete d;
+diff --git a/libkdepim/kmeditor.h b/libkdepim/kmeditor.h
+index 4aab8aa..66ebb4a 100644
+--- a/libkdepim/kmeditor.h
++++ b/libkdepim/kmeditor.h
+@@ -61,6 +61,12 @@ class KDEPIM_EXPORT KMeditor : public KPIMTextEdit::TextEdit
+      */
+     explicit KMeditor( QWidget *parent = 0 );
+ 
++    /**
++     * Constructs a KMeditor object.
++     */
++    explicit KMeditor( QWidget *parent, const QString& configFile );
++
++
+     virtual ~KMeditor();
+ 
+     //Redefine it for each apps
+-- 
+1.7.9.2
+
diff --git a/kde-base/kmail/files/4.4/0005-Fix-bug-276086-crash-on-exit.patch b/kde-base/kmail/files/4.4/0005-Fix-bug-276086-crash-on-exit.patch
new file mode 100644
index 000000000000..5193c364f668
--- /dev/null
+++ b/kde-base/kmail/files/4.4/0005-Fix-bug-276086-crash-on-exit.patch
@@ -0,0 +1,26 @@
+From fb1874f8e2805f0afb3b9e848e8fd4d9ee11a97f Mon Sep 17 00:00:00 2001
+From: Montel Laurent <montel@kde.org>
+Date: Mon, 20 Jun 2011 13:27:05 +0200
+Subject: [PATCH 5/6] Fix bug #276086 crash on exit
+
+---
+ kmail/accountmanager.cpp |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/kmail/accountmanager.cpp b/kmail/accountmanager.cpp
+index 1745aa4..ca2a7c8 100644
+--- a/kmail/accountmanager.cpp
++++ b/kmail/accountmanager.cpp
+@@ -227,7 +227,8 @@ void AccountManager::processNextCheck( bool _newMail )
+ 
+   curAccount->setCheckingMail( true );
+   mAcctChecking.append( curAccount );
+-  kmkernel->filterMgr()->ref();
++  if( kmkernel->filterMgr() )
++      kmkernel->filterMgr()->ref();
+   curAccount->processNewMail( mInteractive );
+ }
+ 
+-- 
+1.7.9.2
+
diff --git a/kde-base/kmail/kmail-4.4.11.1-r1.ebuild b/kde-base/kmail/kmail-4.4.11.1-r1.ebuild
new file mode 100644
index 000000000000..f86926ce61c3
--- /dev/null
+++ b/kde-base/kmail/kmail-4.4.11.1-r1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/kmail-4.4.11.1-r1.ebuild,v 1.1 2012/08/01 22:54:54 dilfridge Exp $
+
+EAPI=4
+
+KMNAME="kdepim"
+KDE_HANDBOOK=optional
+VIRTUALX_REQUIRED=test
+inherit flag-o-matic kde4-meta
+
+DESCRIPTION="KMail is the email component of Kontact, the integrated personal information manager of KDE."
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep kdelibs 'semantic-desktop' 4.6)
+	$(add_kdebase_dep kdepimlibs 'semantic-desktop' 4.6)
+	$(add_kdebase_dep libkdepim '' 4.4.11.1-r1)
+	$(add_kdebase_dep libkleo)
+	$(add_kdebase_dep libkpgp)
+"
+RDEPEND="${DEPEND}
+	$(add_kdebase_dep kdepim-runtime)
+"
+
+add_blocker kmailcvt
+add_blocker libksieve
+add_blocker messagecore
+add_blocker messagelist
+add_blocker messageviewer
+add_blocker mimelib
+
+KMEXTRACTONLY="
+	korganizer/org.kde.Korganizer.Calendar.xml
+	libkleo/
+	libkpgp/
+"
+KMEXTRA="
+	kmailcvt/
+	ksendemail/
+	libksieve/
+	messagecore/
+	messagelist/
+	messageviewer/
+	mimelib/
+	plugins/kmail/
+"
+KMLOADLIBS="libkdepim"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.4.9-nodbus.patch"
+	"${FILESDIR}/4.4/"000{2,4,5}-*.patch
+)
+
+src_configure() {
+	# Bug 308903
+	use ppc64 && append-flags -mminimal-toc
+
+	mycmakeargs=(
+		-DWITH_IndicateQt=OFF
+	)
+
+	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/kontact/ChangeLog b/kde-base/kontact/ChangeLog
index 20d10dc34347..c15a06026e17 100644
--- a/kde-base/kontact/ChangeLog
+++ b/kde-base/kontact/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kontact
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kontact/ChangeLog,v 1.219 2012/08/01 22:16:51 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kontact/ChangeLog,v 1.220 2012/08/01 22:46:30 dilfridge Exp $
+
+*kontact-4.4.11.1-r1 (01 Aug 2012)
+
+  01 Aug 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kontact-4.4.11.1-r1.ebuild,
+  +files/4.4/0002-kontact-Only-start-akonadi-asynchronously-on-KDE-4.6.2.patch:
+  Add upstream bugfixes
 
 *kontact-4.9.0 (01 Aug 2012)
 
diff --git a/kde-base/kontact/files/4.4/0002-kontact-Only-start-akonadi-asynchronously-on-KDE-4.6.2.patch b/kde-base/kontact/files/4.4/0002-kontact-Only-start-akonadi-asynchronously-on-KDE-4.6.2.patch
new file mode 100644
index 000000000000..fe357544b108
--- /dev/null
+++ b/kde-base/kontact/files/4.4/0002-kontact-Only-start-akonadi-asynchronously-on-KDE-4.6.2.patch
@@ -0,0 +1,35 @@
+From 0b44b1aa3d66f974e3d255c6e027947f1375b685 Mon Sep 17 00:00:00 2001
+From: Stephen Kelly <steveire@gmail.com>
+Date: Mon, 25 Apr 2011 22:09:08 +0200
+Subject: [PATCH 2/6] Only start akonadi asynchronously on KDE 4.6.2.
+
+Revises cfa404b7188e4c26bddbc9579728f6d25f8cd214 to hopefully fix
+the bug seen on fedora.
+
+Please re-test this on 4.6.2 on fedora too. Unfortunately that's the
+best I can do because I can't reproduce the issue.
+
+BUG: 268120
+---
+ kaddressbook/main.cpp  |    2 +-
+ kmail/kmmainwidget.cpp |    2 +-
+ kmail/main.cpp         |    2 +-
+ kontact/src/main.cpp   |    2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/kontact/src/main.cpp b/kontact/src/main.cpp
+index cb4a235..ae460be 100644
+--- a/kontact/src/main.cpp
++++ b/kontact/src/main.cpp
+@@ -199,7 +199,7 @@ int main( int argc, char **argv )
+ 
+   KontactApp app;
+ 
+-#if !KDE_IS_VERSION(4,6,0)
++#if !KDE_IS_VERSION(4,6,2)
+   // KDE 4.4: do akonadi startup before creating any window, since creating
+   // the window loads kmail. In 4.5 we'll do this startup async instead.
+   Akonadi::Control::start( 0 );
+-- 
+1.7.9.2
+
diff --git a/kde-base/kontact/kontact-4.4.11.1-r1.ebuild b/kde-base/kontact/kontact-4.4.11.1-r1.ebuild
new file mode 100644
index 000000000000..371b3aa7259a
--- /dev/null
+++ b/kde-base/kontact/kontact-4.4.11.1-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kontact/kontact-4.4.11.1-r1.ebuild,v 1.1 2012/08/01 22:46:30 dilfridge Exp $
+
+EAPI=4
+
+KMNAME="kdepim"
+KDE_HANDBOOK=optional
+inherit kde4-meta
+
+DESCRIPTION="KDE personal information manager"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep kdepimlibs '' 4.6)
+	$(add_kdebase_dep libkdepim)
+"
+RDEPEND="${DEPEND}
+	$(add_kdebase_dep kdepim-runtime)
+"
+
+KMLOADLIBS="libkdepim"
+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
+#
+# xml targets from kmail/ are being uncommented by kde4-meta.eclass
+KMEXTRACTONLY="
+	kmail/
+	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/
+"
+
+PATCHES=( "${FILESDIR}/4.4/"0002-*.patch )
+
+src_unpack() {
+	if use handbook; then
+		KMEXTRA+="
+			doc/kontact-admin/
+		"
+	fi
+
+	kde4-meta_src_unpack
+}