Bump to 3.5 beta1.

Package-Manager: portage-2.0.52-r1

5 files changed, 84 insertions, 17 deletions

diff --git a/kde-base/kmail/ChangeLog b/kde-base/kmail/ChangeLog
index 1fb4578ae5bc..20152263b345 100644
--- a/kde-base/kmail/ChangeLog
+++ b/kde-base/kmail/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kmail
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/ChangeLog,v 1.25 2005/09/13 11:04:32 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/ChangeLog,v 1.26 2005/09/22 19:24:25 flameeyes Exp $
+
+*kmail-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/kmail-qt-3.3.5.patch, +kmail-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
 
   13 Sep 2005; Hanno Boeck <hanno@gentoo.org>
   +files/kmail-3.5_alpha1-kdeenablefinal-fix.diff, kmail-3.5_alpha1.ebuild:
diff --git a/kde-base/kmail/Manifest b/kde-base/kmail/Manifest
index 7924b09737a0..2c01e01852d7 100644
--- a/kde-base/kmail/Manifest
+++ b/kde-base/kmail/Manifest
@@ -1,25 +1,17 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 0517daa346612e50e60119680a33a3da kmail-3.4.2.ebuild 1629
 MD5 03cd0d1b2f5ecd1b5c9421b839e22471 ChangeLog 3605
-MD5 b9964e02eff2a443f6299bb15de581b4 kmail-3.4.1-r1.ebuild 1674
 MD5 aa82a9cf16faab980f09bd8763b742d1 kmail-3.4.1.ebuild 1610
-MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+MD5 b9964e02eff2a443f6299bb15de581b4 kmail-3.4.1-r1.ebuild 1674
+MD5 9dc7662fdefced208875f16950961b9a kmail-3.5_beta1.ebuild 1762
 MD5 393bf626aee24f4dd500ca341e1d314c kmail-3.4.2-r1.ebuild 1856
-MD5 0517daa346612e50e60119680a33a3da kmail-3.4.2.ebuild 1629
 MD5 9dc7662fdefced208875f16950961b9a kmail-3.5_alpha1.ebuild 1762
-MD5 e8e3fc943d40a2fa3260a042e8f0dcf6 files/digest-kmail-3.4.1 208
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 MD5 e8e3fc943d40a2fa3260a042e8f0dcf6 files/digest-kmail-3.4.1-r1 208
 MD5 465fb4ad98b38e7c5328429eaabb1000 files/kmail-3.4.1-shift+click-crash.diff 516
-MD5 ed5f8c08265b32641a4cc480b7414fce files/digest-kmail-3.4.2 282
 MD5 ed5f8c08265b32641a4cc480b7414fce files/digest-kmail-3.4.2-r1 282
-MD5 0dc20eebce2c8cb4475f065683ae24ff files/kdepim-3.4.2-partnode.patch 756
+MD5 e8e3fc943d40a2fa3260a042e8f0dcf6 files/digest-kmail-3.4.1 208
 MD5 2943bf542accb5d027810434e6cebe1d files/digest-kmail-3.5_alpha1 68
 MD5 5c8908dca1e2acb4ba2df3455255bdc7 files/kmail-3.5_alpha1-kdeenablefinal-fix.diff 798
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDJrKTr2QksT29OyARAiIkAJwOLFbSkCQRCsPZGqFs6B+IteZpLACdH+iN
-BWjQJDBq/SbXW8dYyDVg4hA=
-=dBCM
------END PGP SIGNATURE-----
+MD5 0dc20eebce2c8cb4475f065683ae24ff files/kdepim-3.4.2-partnode.patch 756
+MD5 e4e6543138c08f4f74d9c68aa53f6c06 files/digest-kmail-3.5_beta1 68
+MD5 ed5f8c08265b32641a4cc480b7414fce files/digest-kmail-3.4.2 282
diff --git a/kde-base/kmail/files/digest-kmail-3.5_beta1 b/kde-base/kmail/files/digest-kmail-3.5_beta1
new file mode 100644
index 000000000000..236dfa5f63ba
--- /dev/null
+++ b/kde-base/kmail/files/digest-kmail-3.5_beta1
@@ -0,0 +1 @@
+MD5 69a165ee20e7aff2807dccb939091506 kdepim-3.4.91.tar.bz2 12636089
diff --git a/kde-base/kmail/files/kmail-qt-3.3.5.patch b/kde-base/kmail/files/kmail-qt-3.3.5.patch
new file mode 100644
index 000000000000..6efeb140acff
--- /dev/null
+++ b/kde-base/kmail/files/kmail-qt-3.3.5.patch
@@ -0,0 +1,12 @@
+Index: kdepim-3.4.91/kmail/smimeconfiguration.ui
+===================================================================
+--- kdepim-3.4.91/kmail/smimeconfiguration.ui.orig
++++ kdepim-3.4.91/kmail/smimeconfiguration.ui
+@@ -410,7 +410,4 @@ The syntax is "HOST" or "HOST:PORT". If 
+     </connection>
+ </connections>
+ <layoutdefaults spacing="6" margin="11"/>
+-<includehints>
+-    <includehint>kleo::keyrequester.h</includehint>
+-</includehints>
+ </UI>
diff --git a/kde-base/kmail/kmail-3.5_beta1.ebuild b/kde-base/kmail/kmail-3.5_beta1.ebuild
new file mode 100644
index 000000000000..26892073da0b
--- /dev/null
+++ b/kde-base/kmail/kmail-3.5_beta1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/kmail-3.5_beta1.ebuild,v 1.1 2005/09/22 19:24:25 flameeyes Exp $
+
+KMNAME=kdepim
+MAXKDEVER=$PV
+KM_DEPRANGE="$PV $MAXKDEVER"
+inherit kde-meta eutils
+
+DESCRIPTION="KDE mail client"
+KEYWORDS="~amd64"
+IUSE=""
+DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdenetwork)
+$(deprange $PV $MAXKDEVER kde-base/libkdepim)
+$(deprange $PV $MAXKDEVER kde-base/libkpimidentities)
+$(deprange $PV $MAXKDEVER kde-base/mimelib)
+$(deprange $PV $MAXKDEVER kde-base/libksieve)
+$(deprange $PV $MAXKDEVER kde-base/certmanager)
+$(deprange $PV $MAXKDEVER kde-base/libkcal)
+$(deprange $PV $MAXKDEVER kde-base/kontact)"
+RDEPEND="${DEPEND}
+$(deprange $PV $MAXKDEVER kde-base/kdepim-kioslaves)
+$(deprange $PV $MAXKDEVER kde-base/kmailcvt)
+$(deprange-dual $PV $MAXKDEVER kde-base/kdebase-kioslaves)
+$(deprange-dual $PV $MAXKDEVER kde-base/kcontrol)" # for the "looknfeel" icon, and probably others.
+
+KMCOPYLIB="
+	libkdepim libkdepim/
+	libkpimidentities libkpimidentities/
+	libmimelib mimelib/
+	libksieve libksieve/
+	libkleopatra certmanager/lib/
+	libkcal libkcal
+	libkpinterfaces kontact/interfaces/
+	libkmime libkmime
+	libkpgp libkpgp"
+KMEXTRACTONLY="
+	libkdenetwork/
+	libkdepim/
+	libkpimidentities/
+	libksieve/
+	libkcal/
+	mimelib/
+	certmanager/
+	korganizer/korganizeriface.h
+	kontact/interfaces/
+	libkmime/
+	libkpgp
+	dcopidlng"
+KMCOMPILEONLY="libemailfunctions"
+# the kmail plugins are installed with kmail
+KMEXTRA="
+	plugins/kmail/
+	kontact/plugins/kmail/" # We add here the kontact's plugin instead of compiling it with kontact because it needs a lot of this programs deps.
+
+PATCHES="${FILESDIR}/${PN}-qt-3.3.5.patch"