Grab several bugfixes from the 3.5 branch, for reference see the KDE bugs #66740...

Package-Manager: portage-2.1.2.3

diff --git a/kde-base/kmail/ChangeLog b/kde-base/kmail/ChangeLog
index ff8aada097c5987db15591c71ecc8876b5d9bb77..e70bdd4e2d07e8e4e55ce9b6743012cf9eb95f53 100644 (file)
--- a/kde-base/kmail/ChangeLog
+++ b/kde-base/kmail/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-base/kmail
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/ChangeLog,v 1.99 2007/02/05 11:54:33 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/ChangeLog,v 1.100 2007/04/11 20:51:25 carlo Exp $
+
+*kmail-3.5.6-r2 (11 Apr 2007)
+
+  11 Apr 2007; Carsten Lohrke <carlo@gentoo.org> +kmail-3.5.6-r2.ebuild:
+  Grab several bugfixes from the 3.5 branch, for reference see the KDE bugs
+  #66740, #71549, #79685, #96498, #102001, #113329, #113580, #113885, #115713,
+  #117785, #117935, #118060, #121863, #126715, #132487, #137302, #138514,
+  #140195 and #140660.
 
   05 Feb 2007; Diego Pettenò <flameeyes@gentoo.org>
   -files/kmail-3.5.2-imap-fixes-2.diff, -files/kmail-3.5.2-misc-fixes.diff,

diff --git a/kde-base/kmail/files/digest-kmail-3.5.6-r2 b/kde-base/kmail/files/digest-kmail-3.5.6-r2
new file mode 100644 (file)
index 0000000..e27a001
--- /dev/null
+++ b/kde-base/kmail/files/digest-kmail-3.5.6-r2
@@ -0,0 +1,6 @@
+MD5 48f1592b07f784df47280baa0c8356b0 kdepim-3.5-patchset-03.tar.bz2 121475
+RMD160 e8aa4e812a3be3d4e13429d487e1e4d466e058b1 kdepim-3.5-patchset-03.tar.bz2 121475
+SHA256 30d4e8d7ac4e11f1a8209bbcb5b39beb044998d4b0d3fa810743a017b38b904b kdepim-3.5-patchset-03.tar.bz2 121475
+MD5 e37e6173fe9fd7f242c9502a4ae1d7de kdepim-3.5.6.tar.bz2 13643798
+RMD160 85f64349d8eedb531895a3591f6fee07c68bf1eb kdepim-3.5.6.tar.bz2 13643798
+SHA256 0b3a04f72fa640d804df1c4cf2c66ac3ccc5033c98e90a7ae9c62611ea8e3a55 kdepim-3.5.6.tar.bz2 13643798

diff --git a/kde-base/kmail/kmail-3.5.6-r2.ebuild b/kde-base/kmail/kmail-3.5.6-r2.ebuild
new file mode 100644 (file)
index 0000000..74dca74
--- /dev/null
+++ b/kde-base/kmail/kmail-3.5.6-r2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/kmail-3.5.6-r2.ebuild,v 1.1 2007/04/11 20:51:25 carlo Exp $
+
+KMNAME=kdepim
+MAXKDEVER=$PV
+KM_DEPRANGE="$PV $MAXKDEVER"
+inherit kde-meta eutils
+
+SRC_URI="${SRC_URI}
+       mirror://gentoo/kdepim-3.5-patchset-03.tar.bz2"
+
+DESCRIPTION="KMail is the email component of Kontact, the integrated personal information manager of KDE."
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="crypt"
+DEPEND="$(deprange 3.5.4 $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)
+       $(deprange 3.5.4 $MAXKDEVER kde-base/libkpgp)
+       $(deprange $PV $MAXKDEVER kde-base/libkmime)"
+RDEPEND="${DEPEND}
+       crypt? ( app-crypt/pinentry )
+       $(deprange $PV $MAXKDEVER kde-base/kdepim-kioslaves)
+       $(deprange 3.5.5 $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.
+
+
+src_install() {
+       kde-meta_src_install
+       # Install KMail icons with libkdepim to work around bug #136810.
+       #find ${D}/${KDEDIR}/share/icons/hicolor/ -name "kmail\.png" -exec rm '{}' \;
+       rm ${D}/${KDEDIR}/share/icons/hicolor/{16x16,22x22,32x32,48x48,64x64,128x128}/apps/kmail.png || die "bääh"
+}
\ No newline at end of file

diff --git a/kde-base/libkcal/Manifest b/kde-base/libkcal/Manifest
index f85df581e2c1bf4e4af3700f0163c9d97e5a6edf..1d7a087f508599842e9158dd53bfb467f182cde9 100644 (file)
--- a/kde-base/libkcal/Manifest
+++ b/kde-base/libkcal/Manifest
@@ -1,20 +1,26 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+DIST kdepim-3.5-patchset-03.tar.bz2 121475 RMD160 e8aa4e812a3be3d4e13429d487e1e4d466e058b1 SHA1 2c924af34a5bb3562b17b861b63df59c0341298f SHA256 30d4e8d7ac4e11f1a8209bbcb5b39beb044998d4b0d3fa810743a017b38b904b
 DIST kdepim-3.5.5.tar.bz2 12908968 RMD160 5bdcf98909f450ce3839fa72a404571f6cde22f6 SHA1 612f34307c5fac9279c85a4efb1488db4b438f12 SHA256 82887df2c2ff00cb60dcfb8aa04527988123b9a4ed70f4c9082a7a0eb9f1f047
 DIST kdepim-3.5.6.tar.bz2 13643798 RMD160 85f64349d8eedb531895a3591f6fee07c68bf1eb SHA1 a84ad8dd9f84eb3f33070e07ed56f6d694db2cb4 SHA256 0b3a04f72fa640d804df1c4cf2c66ac3ccc5033c98e90a7ae9c62611ea8e3a55
+EBUILD libkcal-3.5.5-r1.ebuild 800 RMD160 2c0d8454b8a0ba024877bec61e06381f08e97e8f SHA1 c89a7e68ef1ed17ac04d4984d5375ab8739a83f3 SHA256 86a9d1ff71399f8fa27e1325571d4d9d32cc71fd7758b5f96fde28161dce5ec8
+MD5 9bea8ec2fe8af312f206b6fecc335a10 libkcal-3.5.5-r1.ebuild 800
+RMD160 2c0d8454b8a0ba024877bec61e06381f08e97e8f libkcal-3.5.5-r1.ebuild 800
+SHA256 86a9d1ff71399f8fa27e1325571d4d9d32cc71fd7758b5f96fde28161dce5ec8 libkcal-3.5.5-r1.ebuild 800
 EBUILD libkcal-3.5.5.ebuild 591 RMD160 badc4c9b9760af5e1b82403b6a1c3f93dabf3cfe SHA1 4e8c76927f57889867d7c5b047c6a48d55788394 SHA256 92d5d4d3db24214d278157ec68f03d822fa59e801c6458b4d519ebf12a3315f5
 MD5 e0187967f53bb2912535d36fc5e524bd libkcal-3.5.5.ebuild 591
 RMD160 badc4c9b9760af5e1b82403b6a1c3f93dabf3cfe libkcal-3.5.5.ebuild 591
 SHA256 92d5d4d3db24214d278157ec68f03d822fa59e801c6458b4d519ebf12a3315f5 libkcal-3.5.5.ebuild 591
+EBUILD libkcal-3.5.6-r1.ebuild 800 RMD160 4a9392efdd541a2ae9325faeabcffdea39d2124c SHA1 010583a9bb1e244303f72066f214a4a87a78cb7d SHA256 8c33512bc078d976b58aa8043beed3ad73fe43d8cc5c60fd372a51952cd13eda
+MD5 7f347cbbe7ad308e9a57f108fe053bee libkcal-3.5.6-r1.ebuild 800
+RMD160 4a9392efdd541a2ae9325faeabcffdea39d2124c libkcal-3.5.6-r1.ebuild 800
+SHA256 8c33512bc078d976b58aa8043beed3ad73fe43d8cc5c60fd372a51952cd13eda libkcal-3.5.6-r1.ebuild 800
 EBUILD libkcal-3.5.6.ebuild 601 RMD160 beabda4fcab7eeb7f018388826dc059420a7950e SHA1 2b3bbb38aee08ceaba8c2faa72dd355a16b66860 SHA256 88ef55c01b227e091fc5dee10df368b5292f801a3a46d7a0d76542dbdd7fe66e
 MD5 8c960b9691db3088a8adc2323528f955 libkcal-3.5.6.ebuild 601
 RMD160 beabda4fcab7eeb7f018388826dc059420a7950e libkcal-3.5.6.ebuild 601
 SHA256 88ef55c01b227e091fc5dee10df368b5292f801a3a46d7a0d76542dbdd7fe66e libkcal-3.5.6.ebuild 601
-MISC ChangeLog 8452 RMD160 2dcfd3736c16ac3c8b3659eadb4ea0b66d8afc49 SHA1 fb298cd7f1beb85e7310a78edd18da36e5474252 SHA256 8a07e8105a07bce0f8b83408f93b80814ae267e2950e499a02c0e2846ad68bb3
-MD5 27ca69509f7eda3986046f41ecfac81f ChangeLog 8452
-RMD160 2dcfd3736c16ac3c8b3659eadb4ea0b66d8afc49 ChangeLog 8452
-SHA256 8a07e8105a07bce0f8b83408f93b80814ae267e2950e499a02c0e2846ad68bb3 ChangeLog 8452
+MISC ChangeLog 8796 RMD160 f45ec4e2e3dc181dfe683e31c98d7be172b3ba75 SHA1 5edfa92cdc9c1efc23552a68c77595b23cf63eac SHA256 8f77f6a7cbeb6f2d3ce020b61601b4255569c6db0812f94aeaafff8e6aa0e01a
+MD5 6ab9d0b302683161d41a37c9c66fbc0e ChangeLog 8796
+RMD160 f45ec4e2e3dc181dfe683e31c98d7be172b3ba75 ChangeLog 8796
+SHA256 8f77f6a7cbeb6f2d3ce020b61601b4255569c6db0812f94aeaafff8e6aa0e01a ChangeLog 8796
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -22,13 +28,12 @@ SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a metadata
 MD5 805592bb13fc869af5c4ae1670b84edd files/digest-libkcal-3.5.5 247
 RMD160 431fdb9163eb9f1552e68f14b4f4c1deb467c7bf files/digest-libkcal-3.5.5 247
 SHA256 79f3b37a9c00197e5c3d06173ef9526420d44109e12c7b0e69e1b3e5efce6daf files/digest-libkcal-3.5.5 247
+MD5 a03ff9f965e3ecf739528bfa25b1d0ce files/digest-libkcal-3.5.5-r1 518
+RMD160 cb3d7f30954922ea16073756b3a34d3ff34aebae files/digest-libkcal-3.5.5-r1 518
+SHA256 d7398d31a2fdc87e4fef7674d8d800e7962df250f169df3478e2848672e31e9c files/digest-libkcal-3.5.5-r1 518
 MD5 6ac4692a541313065650af3440af9b13 files/digest-libkcal-3.5.6 247
 RMD160 49c4a076540b9741e20b46db58bae9e823591569 files/digest-libkcal-3.5.6 247
 SHA256 b49ff16e93bead7c5c584b17baa06f51b5bd735636b3ca58e3ed733104c15227 files/digest-libkcal-3.5.6 247
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
-
-iD8DBQFFxx35AiZjviIA2XgRAknTAKC/KtH4fbDPY8JwcqQt93OrFLoFCQCgvcfk
-8Pwq7RyRPuT+BZ4547PM0LM=
-=1V73
------END PGP SIGNATURE-----
+MD5 9e89f9e68c945f54b3690c2fa918fb4b files/digest-libkcal-3.5.6-r1 518
+RMD160 02256b1ccb6c5f03141f9f3b5a75ec12766493b1 files/digest-libkcal-3.5.6-r1 518
+SHA256 28cf961d85e40bd6eda1a8cb0f3f60d54b6201566257887380ef112ab5866552 files/digest-libkcal-3.5.6-r1 518