add a patch that fixes the utf8 decoding bug from #174678

Package-Manager: portage-2.1.2.4

diff --git a/kde-base/kdepim/Manifest b/kde-base/kdepim/Manifest
index 07d644d6be5bbcd8d7387d398f28b92c56206a90..f2660db8631f6e48f846b942da43afc1cc1c1ecd 100644 (file)
--- a/kde-base/kdepim/Manifest
+++ b/kde-base/kdepim/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX kmail-3.5.5-dimap-mail-loss.patch 9870 RMD160 8abfe56734cc94917e4ffc94029414789692e8da SHA1 d8396dcda5d2ed6c5cb2fad66c1a2cb98a1a8752 SHA256 30992bb319dff9ef45c3b44873284346e7727f5982835d97af44030511e3a636
 MD5 970d8db800a3bb39be0c7f4a41c35e06 files/kmail-3.5.5-dimap-mail-loss.patch 9870
 RMD160 8abfe56734cc94917e4ffc94029414789692e8da files/kmail-3.5.5-dimap-mail-loss.patch 9870
@@ -13,6 +10,10 @@ AUX kmail-3.5.6-templates.patch 875 RMD160 7aabcdf2e7c68ae0d90709e332a0da4afc9a2
 MD5 2921dd25ca635bd565a8e2e9ae8745d4 files/kmail-3.5.6-templates.patch 875
 RMD160 7aabcdf2e7c68ae0d90709e332a0da4afc9a24f9 files/kmail-3.5.6-templates.patch 875
 SHA256 096382a01c2e80db89b6b08a7f1959bf53b3e08f0c74b7d310b6672b630e8cbe files/kmail-3.5.6-templates.patch 875
+AUX kmail-utf8.diff 588 RMD160 d0ea21d1d794ddd2ddf382ac47176a2db4471d98 SHA1 5fcdad4ab0473a9be8a18d56060b830651112460 SHA256 cc875741040d45c7a76eeae230e7bb6270970f2df7a41ed14b0854a601f68e72
+MD5 e3c7f18014de49d1fb5b6f54ef9366a3 files/kmail-utf8.diff 588
+RMD160 d0ea21d1d794ddd2ddf382ac47176a2db4471d98 files/kmail-utf8.diff 588
+SHA256 cc875741040d45c7a76eeae230e7bb6270970f2df7a41ed14b0854a601f68e72 files/kmail-utf8.diff 588
 AUX korganizer-3.5.5-desktop.patch 7617 RMD160 7c9df08009a11bb1d4886c175754dbe99651b4ca SHA1 e2e57cae2a642adb495d4b7ab3102e34e99d6549 SHA256 e0cf3744a797f568bcbc4ae2fb9003a27fc13cf235cbd36be9212513354da82e
 MD5 167b5ec68f258ca3d8c2aab1f083ea81 files/korganizer-3.5.5-desktop.patch 7617
 RMD160 7c9df08009a11bb1d4886c175754dbe99651b4ca files/korganizer-3.5.5-desktop.patch 7617
@@ -41,10 +42,14 @@ EBUILD kdepim-3.5.6-r2.ebuild 1805 RMD160 b068b9e1d4b9ef821e428cbc117b68b704ebed
 MD5 3dc3718aa6b36b2a3f39a95569e65b00 kdepim-3.5.6-r2.ebuild 1805
 RMD160 b068b9e1d4b9ef821e428cbc117b68b704ebed69 kdepim-3.5.6-r2.ebuild 1805
 SHA256 23b42c4b8c5407e40ffd5d38f0ca53abfcdabe9b9a7d1ab31872f3841a8737c1 kdepim-3.5.6-r2.ebuild 1805
-MISC ChangeLog 35418 RMD160 88d68f686da7c0d06d4c23961ffdb19e3e7999d3 SHA1 96552bb6c36c390c695c7d68412578ccc9f843b1 SHA256 8a3d8a7d0a69da2b8b6f79d396d3c85e47bec8d7238fc299b8574f836321bee8
-MD5 787146ded80d65dc23dab1526113d9ab ChangeLog 35418
-RMD160 88d68f686da7c0d06d4c23961ffdb19e3e7999d3 ChangeLog 35418
-SHA256 8a3d8a7d0a69da2b8b6f79d396d3c85e47bec8d7238fc299b8574f836321bee8 ChangeLog 35418
+EBUILD kdepim-3.5.6-r3.ebuild 1844 RMD160 0434500c751558e7cadf575cd9b2274d87d7adc5 SHA1 aac8068a4ba8a2e0a716177a71f57e04de336190 SHA256 631c0cfe8510f3186dd5d4b271cf9bdf7784fc4040d2c7566d86c645f0a59b0c
+MD5 18ce6affeaca8251b3fb6d42740406c0 kdepim-3.5.6-r3.ebuild 1844
+RMD160 0434500c751558e7cadf575cd9b2274d87d7adc5 kdepim-3.5.6-r3.ebuild 1844
+SHA256 631c0cfe8510f3186dd5d4b271cf9bdf7784fc4040d2c7566d86c645f0a59b0c kdepim-3.5.6-r3.ebuild 1844
+MISC ChangeLog 35596 RMD160 87f730b7153c8c961984e59e4720f7625905f9f8 SHA1 d4ba8adfc679c5f67b52c543477d85808ac1f93e SHA256 8d959efe0f69e09a1a3d52470549e4e1e992bb820e6f441135465288310bd941
+MD5 d154f25dbd628fdd43215cbb22c9300e ChangeLog 35596
+RMD160 87f730b7153c8c961984e59e4720f7625905f9f8 ChangeLog 35596
+SHA256 8d959efe0f69e09a1a3d52470549e4e1e992bb820e6f441135465288310bd941 ChangeLog 35596
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -61,10 +66,6 @@ SHA256 3e201f5c33c8c0db49abffc1cc77b21375548b371d9205d58cd372bc611cb3c5 files/di
 MD5 9e89f9e68c945f54b3690c2fa918fb4b files/digest-kdepim-3.5.6-r2 518
 RMD160 02256b1ccb6c5f03141f9f3b5a75ec12766493b1 files/digest-kdepim-3.5.6-r2 518
 SHA256 28cf961d85e40bd6eda1a8cb0f3f60d54b6201566257887380ef112ab5866552 files/digest-kdepim-3.5.6-r2 518
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
-
-iD8DBQFGLeHcugEuf3OQ0akRAjtIAJ4ioH4XMQqeeFTFtMOK8iZo3uihGQCeOfqr
-BEZYXR3v5AidHg+Ck01F0Wg=
-=Vynt
------END PGP SIGNATURE-----
+MD5 9e89f9e68c945f54b3690c2fa918fb4b files/digest-kdepim-3.5.6-r3 518
+RMD160 02256b1ccb6c5f03141f9f3b5a75ec12766493b1 files/digest-kdepim-3.5.6-r3 518
+SHA256 28cf961d85e40bd6eda1a8cb0f3f60d54b6201566257887380ef112ab5866552 files/digest-kdepim-3.5.6-r3 518

diff --git a/kde-base/kmail/ChangeLog b/kde-base/kmail/ChangeLog
index e70bdd4e2d07e8e4e55ce9b6743012cf9eb95f53..f6c8e5ca107176f936ab0dbc869c92f7b24dd7eb 100644 (file)
--- a/kde-base/kmail/ChangeLog
+++ b/kde-base/kmail/ChangeLog
@@ -1,6 +1,12 @@
 # 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.100 2007/04/11 20:51:25 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/ChangeLog,v 1.101 2007/04/24 16:57:31 caleb Exp $
+
+*kmail-3.5.6-r3 (24 Apr 2007)
+
+  24 Apr 2007; Caleb Tennis <caleb@gentoo.org> +files/kmail-utf8.diff,
+  +kmail-3.5.6-r3.ebuild:
+  add a patch that fixes the utf8 decoding bug from #174678
 
 *kmail-3.5.6-r2 (11 Apr 2007)
 

diff --git a/kde-base/kmail/Manifest b/kde-base/kmail/Manifest
index 235f5d40741e787c83552b0a914ee3832d3f32cd..8da2585161cc6f4c2b54e139e52fcb2c85ed7219 100644 (file)
--- a/kde-base/kmail/Manifest
+++ b/kde-base/kmail/Manifest
@@ -10,6 +10,10 @@ AUX kmail-3.5.6-templates.patch 875 RMD160 7aabcdf2e7c68ae0d90709e332a0da4afc9a2
 MD5 2921dd25ca635bd565a8e2e9ae8745d4 files/kmail-3.5.6-templates.patch 875
 RMD160 7aabcdf2e7c68ae0d90709e332a0da4afc9a24f9 files/kmail-3.5.6-templates.patch 875
 SHA256 096382a01c2e80db89b6b08a7f1959bf53b3e08f0c74b7d310b6672b630e8cbe files/kmail-3.5.6-templates.patch 875
+AUX kmail-utf8.diff 588 RMD160 d0ea21d1d794ddd2ddf382ac47176a2db4471d98 SHA1 5fcdad4ab0473a9be8a18d56060b830651112460 SHA256 cc875741040d45c7a76eeae230e7bb6270970f2df7a41ed14b0854a601f68e72
+MD5 e3c7f18014de49d1fb5b6f54ef9366a3 files/kmail-utf8.diff 588
+RMD160 d0ea21d1d794ddd2ddf382ac47176a2db4471d98 files/kmail-utf8.diff 588
+SHA256 cc875741040d45c7a76eeae230e7bb6270970f2df7a41ed14b0854a601f68e72 files/kmail-utf8.diff 588
 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
@@ -25,10 +29,14 @@ EBUILD kmail-3.5.6-r2.ebuild 2333 RMD160 99a26cad011ca2dd870a62348cd533b414a845e
 MD5 818413f9d7194b9e27b64e015d0526c0 kmail-3.5.6-r2.ebuild 2333
 RMD160 99a26cad011ca2dd870a62348cd533b414a845e1 kmail-3.5.6-r2.ebuild 2333
 SHA256 8dc87cd22703f42d9a8f6d2cf9a74cb29d01a6e8704a69b29fcbbaefefcf0fe0 kmail-3.5.6-r2.ebuild 2333
-MISC ChangeLog 13982 RMD160 5fc694fea1d7a48a29eb616cc025456d409f9338 SHA1 1bb7e16a7bf88b8559d1bd7b1308c3c70419cb4a SHA256 1508cd86ebd27d0227b2b4b47ef4a0868d7c34e204e87714b214005e0430b279
-MD5 cf56df4d98f6a2d379db4c243cd4955e ChangeLog 13982
-RMD160 5fc694fea1d7a48a29eb616cc025456d409f9338 ChangeLog 13982
-SHA256 1508cd86ebd27d0227b2b4b47ef4a0868d7c34e204e87714b214005e0430b279 ChangeLog 13982
+EBUILD kmail-3.5.6-r3.ebuild 2367 RMD160 be2d52eae9d5c09ffbf0d3bc5a81c7deb3635e02 SHA1 4611a9c33fa9a42ac06b03d5f69b46c728de906b SHA256 8353adf05ffd87834ff36efeeca9df2a62e454f6bb9a9650e20d1848fb5f5131
+MD5 19407367b85933e93a4932e092ac20e3 kmail-3.5.6-r3.ebuild 2367
+RMD160 be2d52eae9d5c09ffbf0d3bc5a81c7deb3635e02 kmail-3.5.6-r3.ebuild 2367
+SHA256 8353adf05ffd87834ff36efeeca9df2a62e454f6bb9a9650e20d1848fb5f5131 kmail-3.5.6-r3.ebuild 2367
+MISC ChangeLog 14171 RMD160 644946da9a1a3458dff1c8ccd2abd058e630c4cb SHA1 ea7acb92ee6b1dda5196115ec459d0a64ecdaa8c SHA256 a27444aa9e79e811400b9a006735bbe235d1d3d7c10f449fbcd63bbea5647d1a
+MD5 3b25e9914e0e74f23ae929599b760cb7 ChangeLog 14171
+RMD160 644946da9a1a3458dff1c8ccd2abd058e630c4cb ChangeLog 14171
+SHA256 a27444aa9e79e811400b9a006735bbe235d1d3d7c10f449fbcd63bbea5647d1a ChangeLog 14171
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -42,3 +50,6 @@ SHA256 b49ff16e93bead7c5c584b17baa06f51b5bd735636b3ca58e3ed733104c15227 files/di
 MD5 9e89f9e68c945f54b3690c2fa918fb4b files/digest-kmail-3.5.6-r2 518
 RMD160 02256b1ccb6c5f03141f9f3b5a75ec12766493b1 files/digest-kmail-3.5.6-r2 518
 SHA256 28cf961d85e40bd6eda1a8cb0f3f60d54b6201566257887380ef112ab5866552 files/digest-kmail-3.5.6-r2 518
+MD5 9e89f9e68c945f54b3690c2fa918fb4b files/digest-kmail-3.5.6-r3 518
+RMD160 02256b1ccb6c5f03141f9f3b5a75ec12766493b1 files/digest-kmail-3.5.6-r3 518
+SHA256 28cf961d85e40bd6eda1a8cb0f3f60d54b6201566257887380ef112ab5866552 files/digest-kmail-3.5.6-r3 518

diff --git a/kde-base/kmail/files/digest-kmail-3.5.6-r3 b/kde-base/kmail/files/digest-kmail-3.5.6-r3
new file mode 100644 (file)
index 0000000..e27a001
--- /dev/null
+++ b/kde-base/kmail/files/digest-kmail-3.5.6-r3
@@ -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/files/kmail-utf8.diff b/kde-base/kmail/files/kmail-utf8.diff
new file mode 100644 (file)
index 0000000..89b2346
--- /dev/null
+++ b/kde-base/kmail/files/kmail-utf8.diff
@@ -0,0 +1,15 @@
+Index: kmaccount.cpp
+===================================================================
+--- kmail/kmaccount.cpp        (revision 656120)
++++ kmail/kmaccount.cpp        (working copy)
+@@ -399,7 +399,9 @@ QString KMAccount::encryptStr(const QStr
+ {
+   QString result;
+   for (uint i = 0; i < aStr.length(); i++)
+-    result += (aStr[i].unicode() < 0x20) ? aStr[i] :
++    /* yes, no typo. can't encode ' ' or '!' because
++       they're the unicode BOM. stupid scrambling. stupid. */
++    result += (aStr[i].unicode() <= 0x21 ) ? aStr[i] :
+       QChar(0x1001F - aStr[i].unicode());
+   return result;
+ }

diff --git a/kde-base/kmail/kmail-3.5.6-r3.ebuild b/kde-base/kmail/kmail-3.5.6-r3.ebuild
new file mode 100644 (file)
index 0000000..e59e2e7
--- /dev/null
+++ b/kde-base/kmail/kmail-3.5.6-r3.ebuild
@@ -0,0 +1,68 @@
+# 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-r3.ebuild,v 1.1 2007/04/24 16:57:31 caleb 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.
+
+PATCHES="${FILESDIR}/kmail-utf8.diff"
+
+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"
+}