Several KMail crash fixes from the KDE 3.5 branch, including the one for bug #147986. Fix a crash condition, timezone detection and minor issues within KOrganizer. Readd Qt designer fix, this time as sed statement.

Package-Manager: portage-2.1.1

3 files changed, 50 insertions, 1 deletions

diff --git a/kde-base/kdepim/ChangeLog b/kde-base/kdepim/ChangeLog
index 208b5f8b3a57..c3664f5c62fe 100644
--- a/kde-base/kdepim/ChangeLog
+++ b/kde-base/kdepim/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdepim
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/ChangeLog,v 1.221 2006/09/17 22:53:02 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/ChangeLog,v 1.222 2006/09/18 15:22:56 carlo Exp $
+
+*kdepim-3.5.4-r2 (18 Sep 2006)
+
+  18 Sep 2006; Carsten Lohrke <carlo@gentoo.org> +kdepim-3.5.4-r2.ebuild:
+  Several KMail crash fixes from the KDE 3.5 branch, including the one for bug
+  #147986. Fix a crash condition, timezone detection and minor issues within
+  KOrganizer. Readd Qt designer fix, this time as sed statement.
 
   17 Sep 2006; Carsten Lohrke <carlo@gentoo.org> -kdepim-3.4.3.ebuild:
   Drop KDE 3.4.
diff --git a/kde-base/kdepim/files/digest-kdepim-3.5.4-r2 b/kde-base/kdepim/files/digest-kdepim-3.5.4-r2
new file mode 100644
index 000000000000..4692b1b0a6cb
--- /dev/null
+++ b/kde-base/kdepim/files/digest-kdepim-3.5.4-r2
@@ -0,0 +1,6 @@
+MD5 7c13008b1ca98351b461cac5dd183d9a kdepim-3.5-patchset-02.tar.bz2 4208
+RMD160 93e1e0c760278b233ff3d7096154168f6fbcf65a kdepim-3.5-patchset-02.tar.bz2 4208
+SHA256 8c91e5359e58710b5bc8e51b30058f41870a93bbda8b1a5fffc1af91a82128dd kdepim-3.5-patchset-02.tar.bz2 4208
+MD5 4a01ceaeb6067d03003edb77b104f559 kdepim-3.5.4.tar.bz2 12925075
+RMD160 d3ecf9353dc578c392e1b82c72c7b8a2a88fdcdc kdepim-3.5.4.tar.bz2 12925075
+SHA256 b31dee9c2d7ebdeb1841c22dbdeaf1c88ee1f0d3b11897592305ec076d02edfa kdepim-3.5.4.tar.bz2 12925075
diff --git a/kde-base/kdepim/kdepim-3.5.4-r2.ebuild b/kde-base/kdepim/kdepim-3.5.4-r2.ebuild
new file mode 100644
index 000000000000..dc0b0e68d16e
--- /dev/null
+++ b/kde-base/kdepim/kdepim-3.5.4-r2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/kdepim-3.5.4-r2.ebuild,v 1.1 2006/09/18 15:22:56 carlo Exp $
+
+inherit kde-dist
+
+SRC_URI="${SRC_URI}
+	mirror://gentoo/kdepim-3.5-patchset-02.tar.bz2"
+
+DESCRIPTION="KDE PIM (Personal Information Management) apps: korganizer, kmail, knode..."
+
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="crypt gnokii pda"
+
+DEPEND="~kde-base/kdebase-${PV}
+	>=dev-libs/cyrus-sasl-2
+	pda? ( app-pda/pilot-link dev-libs/libmal )
+	gnokii? ( app-mobilephone/gnokii )
+	crypt? ( >=app-crypt/gpgme-1.1.2-r1
+		 <app-crypt/gnupg-1.9 )"
+	# We use GnuPG 1.4.x for OpenPGP and 1.9 (via gpgme) for s/mime as upstream advises.
+RDEPEND="${DEPEND}
+	crypt? ( app-crypt/pinentry )"
+
+src_unpack() {
+	kde_src_unpack
+	# Call Qt 3 designer
+	sed -i -e "s:\"designer\":\"${QTDIR}/bin/designer\":g" ${S}/libkdepim/kcmdesignerfields.cpp || die "sed failed"
+}
+
+src_compile() {
+	local myconf="--with-sasl $(use_with gnokii)"
+	use crypt && myconf="${myconf} --with-gpg=${ROOT}/usr/bin/gpg"
+
+	kde_src_compile
+}