Moved updated kdm ebuild from kde-testing overlay to the tree - thanks to Maciej Mrozowski (reavertm).

Added patch to supposedly fix LDAP crashes introduced in 4.3.1.
(Portage version: 2.2_rc42/cvs/Linux x86_64)

3 files changed, 71 insertions, 1 deletions

diff --git a/kde-base/libkdepim/ChangeLog b/kde-base/libkdepim/ChangeLog
index 7bc9724af464..f6905c2f59ee 100644
--- a/kde-base/libkdepim/ChangeLog
+++ b/kde-base/libkdepim/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-base/libkdepim
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdepim/ChangeLog,v 1.129 2009/09/01 16:14:14 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdepim/ChangeLog,v 1.130 2009/10/02 23:18:15 jmbsvicetto Exp $
+
+*libkdepim-4.3.1-r1 (02 Oct 2009)
+
+  02 Oct 2009; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +libkdepim-4.3.1-r1.ebuild, +files/libkdepim-4.3.1-ldap_crash.diff:
+  Moved updated kdm ebuild from kde-testing overlay to the tree - thanks to
+  Maciej Mrozowski (reavertm).
+  Added patch to supposedly fix LDAP crashes introduced in 4.3.1.
 
 *libkdepim-4.3.1 (01 Sep 2009)
 
diff --git a/kde-base/libkdepim/files/libkdepim-4.3.1-ldap_crash.diff b/kde-base/libkdepim/files/libkdepim-4.3.1-ldap_crash.diff
new file mode 100644
index 000000000000..a3092f058762
--- /dev/null
+++ b/kde-base/libkdepim/files/libkdepim-4.3.1-ldap_crash.diff
@@ -0,0 +1,22 @@
+diff -u libkdepim/addresseelineedit.cpp libkdepim/addresseelineedit.cpp
+--- libkdepim/addresseelineedit.cpp	(revision 1019119)
++++ libkdepim/addresseelineedit.cpp	(revision 1019358)
+@@ -800,7 +800,7 @@
+ 
+ void AddresseeLineEdit::slotLDAPSearchData( const KPIM::LdapResultList &adrs )
+ {
+-  if ( s_LDAPLineEdit != this ) {
++  if ( adrs.isEmpty() || s_LDAPLineEdit != this ) {
+     return;
+   }
+ 
+@@ -817,7 +817,8 @@
+     setText( m_previousAddresses + m_searchString );
+     // only complete again if the user didn't change the selection while
+     // we were waiting; otherwise the completion box will be closed
+-    if ( m_searchString.trimmed() != completionBox()->currentItem()->text().trimmed() ) {
++    QListWidgetItem *current = completionBox()->currentItem();
++    if ( !current || m_searchString.trimmed() != current->text().trimmed() ) {
+       doCompletion( m_lastSearchMode );
+     }
+   }
diff --git a/kde-base/libkdepim/libkdepim-4.3.1-r1.ebuild b/kde-base/libkdepim/libkdepim-4.3.1-r1.ebuild
new file mode 100644
index 000000000000..6727a56f4e49
--- /dev/null
+++ b/kde-base/libkdepim/libkdepim-4.3.1-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdepim/libkdepim-4.3.1-r1.ebuild,v 1.1 2009/10/02 23:18:15 jmbsvicetto Exp $
+
+EAPI="2"
+
+KMNAME="kdepim"
+inherit kde4-meta
+
+DESCRIPTION="Common library for KDE PIM apps"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="debug"
+
+# @Since >4.2.65 kode removed from kdepim
+RDEPEND="
+	!kdeprefix? ( !>=kde-base/kode-4.1.0[-kdeprefix] )
+	kdeprefix? ( !kde-base/kode:${SLOT} )
+"
+
+KMEXTRACTONLY="
+	kaddressbook/org.kde.KAddressbook.Core.xml
+	korganizer/korgac/org.kde.korganizer.KOrgac.xml
+"
+
+KMSAVELIBS="true"
+
+PATCHES=(
+	"${FILESDIR}/${P}-ldap_crash.diff"
+)
+
+src_install() {
+	kde4-meta_src_install
+
+	# install additional generated headers that are needed by other packages that
+	# are derived from kdepim. e.g. kmail.
+	pushd "${CMAKE_BUILD_DIR}/libkdepim/" 2>/dev/null || die "pushd libkdepim failed"
+	insinto "${PREFIX}/include"
+	doins ui_addresspicker.h ui_categoryselectdialog_base.h || die "Failed to install extra header files."
+	popd 2>/dev/null
+}