Add patch for duplicated inbox/sent-mail folders after kmail 1->2 migration, kde...

Package-Manager: portage-2.2.0_alpha61/cvs/Linux x86_64

diff --git a/kde-base/kdepim-runtime/ChangeLog b/kde-base/kdepim-runtime/ChangeLog
index d848ddb806156071e4368eb0cd6954563658c4be..d7c16db23f4df7248292cf1d4bc68e12e086aef8 100644 (file)
--- a/kde-base/kdepim-runtime/ChangeLog
+++ b/kde-base/kdepim-runtime/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-base/kdepim-runtime
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-runtime/ChangeLog,v 1.49 2011/10/06 18:10:58 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-runtime/ChangeLog,v 1.50 2011/10/07 22:05:28 reavertm Exp $
+
+*kdepim-runtime-4.7.2-r1 (07 Oct 2011)
+
+  07 Oct 2011; Maciej Mrozowski <reavertm@gentoo.org>
+  +kdepim-runtime-4.7.2-r1.ebuild,
+  +files/kdepim-runtime-4.7.2-duplicated-folders.patch:
+  Add patch for duplicated inbox/sent-mail folders after kmail 1->2 migration,
+  kde bug 283467.
 
 *kdepim-runtime-4.7.2 (06 Oct 2011)
 

diff --git a/kde-base/kdepim-runtime/Manifest b/kde-base/kdepim-runtime/Manifest
index ca77fc81a4cfe5779fbbb4bbc8e929807460fbea..56e2596798060e03f1d4deb98669452398bef435 100644 (file)
--- a/kde-base/kdepim-runtime/Manifest
+++ b/kde-base/kdepim-runtime/Manifest
@@ -1,9 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX kdepim-runtime-4.4.10-enablefinal-1.patch 466 RMD160 fcae6d97bfba91cdec2048919dfaf57bd402a12e SHA1 e1a303f6aa2571a5be8772882f56fdb4d61c50e9 SHA256 f148773485cc411c93f063d48783d0e05af5f9d6fca4b8d6f211c2875665ffe9
 AUX kdepim-runtime-4.4.10-enablefinal-2.patch 738 RMD160 7b6568a912e800baa790e38a1a50b45aac848295 SHA1 ac9d85a87e37969b70c4ed039a83916dd97a6469 SHA256 f4816dabb601946a9e1ffbadddd11e433ce64233cef79daa59db420428f24120
 AUX kdepim-runtime-4.7.1-emptyids.patch 1569 RMD160 594984248bc54bcdf274bd4b133dc52fa94a4e00 SHA1 68b78e8427d61dd29e37590c2e92a170353401e5 SHA256 d0402328564c9aa2997065a9c0b8c5af094b9ebdf92ac2d8a4e84075bc106544
+AUX kdepim-runtime-4.7.2-duplicated-folders.patch 4290 RMD160 f8aa29ab5659893fa7e2b11a20a0bec859aaeccb SHA1 1b311e3bf921d5bbc60c7b15975e904da9bb31bc SHA256 92a55fb76f7c17410fc94ed6c2aa2088835b4ec66135cdc3815c5970f12a7755
 DIST kdepim-runtime-4.4.11.1.tar.bz2 619924 RMD160 dbc1120ab3f70c0073f6e9f389edba89bf80bee6 SHA1 e3105eb99ab0de47c617f8491774b2e3ee4cdd4a SHA256 0b2bbf59e5d8184bb1f1fc02ed442808cee6bf36f097dc84789089c6bd46c5f6
 DIST kdepim-runtime-4.6.1.tar.bz2 2138207 RMD160 260bc10287004deb1951d53678d9954c7c62f5da SHA1 e416ffd0142c720a779b4eb2e4a841ca751efdce SHA256 bd523fe7e2134179dad3f0f9a2a0ad8ab27d46ba0770a45b58b50ca8afac6bc5
 DIST kdepim-runtime-4.7.0.tar.bz2 1200018 RMD160 9920ea2345b6c43a2e4bb638675b2b5d95a6f987 SHA1 00286df86a64eecee64e6cf9199b69d87f62135e SHA256 4f6878ad3950ce2933ebb446d8f5e4d82f18b83533866bbaf648791da1404d85
@@ -14,23 +15,14 @@ EBUILD kdepim-runtime-4.6.1.ebuild 1002 RMD160 e71604985c859df222fca5d6dd7095ee3
 EBUILD kdepim-runtime-4.7.0.ebuild 869 RMD160 b2cfcd3d9d947ac66a60792ed0b68efb8f740db7 SHA1 163bfe60ff84d4359cc3016a566cb2bce4c2bb5b SHA256 7a1ff4aa7f95a14764569a3c928e3aa26b99c4a5e5e0dd2faaa7485fd5f48919
 EBUILD kdepim-runtime-4.7.1-r1.ebuild 922 RMD160 a6c85d080454fd3d9f0a3748b0e3ac5128875a65 SHA1 8f745242d391d6605fea81144f34bb026861cdc3 SHA256 c387a9087d6dfce505032a9a6677ba16c986e1a7af81b53b1ea4fc19c89e429e
 EBUILD kdepim-runtime-4.7.1.ebuild 869 RMD160 f30e0906d8ad7109dc75d731002e5af4527028e9 SHA1 f7d972a3233155fbafdc6e1a3776a39ccf06a28c SHA256 6f83fcd44378ede8e59cdac5643dcbb2ced1c8a6e4c7ff19c5b5d22a480309b4
+EBUILD kdepim-runtime-4.7.2-r1.ebuild 869 RMD160 62e163fd480fcbafe5c314444fa7debef2f5ffae SHA1 a9975177f313b020546065025be6a7813ed50ef7 SHA256 b0faee231580d2f64b73349208c5dffd1313358cf25fecd8991571a8afb6cdf7
 EBUILD kdepim-runtime-4.7.2.ebuild 806 RMD160 2efd97aef029cdd211f33c05779349c31f4dd9c3 SHA1 e074fd5bf35055becc10eab465b715f0de4f86b8 SHA256 bc1345c47ea4151d34240e83fa765819a273a996f7d66018e671fe12187b9332
-MISC ChangeLog 7160 RMD160 981261e30edfea63f5fcdf8783b5f11a322385fa SHA1 3d02d1b74d72c3b5acd41e1ca4bc45a2772f4af6 SHA256 22962d7db1a7c2f88cd850bb73b1c227ab5941e15c44eef81c628fcfac8513ca
+MISC ChangeLog 7445 RMD160 4d12e734f122646a4a21db540ede392023cc3f6e SHA1 e041acbc80cda2d7b2ef63d36132dddb4b242415 SHA256 ec7403dd96051a062b0abc788ab77e5bef0dc190420e876f3eddcbf6a373a747
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCAAGBQJOjfFvAAoJEOf+E+/4L5LmxV8P/3FjrxDN3lbt0CP7umF4vZqg
-JpAvHbfceCEFvtI36r+SGYVvJrBUTloEKyBleToJ/v2iq46tJI/aJBoOCNPZRgK+
-TIJJGFB6rrTMoIYigATSjCuUpj+6BYAmqspTmRMwpMS9NiwxyaIa5gL9oJ3rQE9E
-oKHv3NWOzMmrnfpOIh1LeX5wV4MNOlESqIUHbRsVbhWNf7jo+QrjB8e4uEHXD+gL
-hVm/28ErLVe22Ti97qE1rhCcpVCFkej9hX7ZC34yjo57uEH9P1lIM/d7fgbZANmU
-eSBwtFx/xUv8qgcP31zhkDZEttv7mVEyh0Nw3H5tnBiH6Y2AHPulO0pD9ZfXRu+f
-cKDbLmPbOx3j5d6lCnOcRF64KAcGK+UpgrYoY/WiSfkXrfh0jI+1kRyG9gPGxth5
-YAv/eq2FYfbKiSKDej3Gc0PN25RwyaVaVokd6F9kaJkj/Swq0PsTpUjcYwXfDwz3
-U8TH60jdOV7BLuGUfKGYrNy1CRuz/cd+IpJzyOw2gZqiWGyCiTjGc2BLVC3ATex7
-UWie0238y4QGHv7FI2MXKiNnvmIYGkDDo1DVwd5et6KD5LWDz6C62h4V2/KdCydd
-g7d8DuPX7k9CEsMSp9bbZ09ehxM0c4wF/kPnwczfpvfnDOZzGVK6u3ndblaKWy/p
-bJNy5bkq6QgTXphKWdD1
-=+2rT
+iEYEARECAAYFAk6Pd6wACgkQFuHa/bHpVdtOiQCfcci1CNedvqJzBlbwrCxteikJ
+7X4AnA03wl8k3IUSzCt/Y9u8VAGEveED
+=Abmw
 -----END PGP SIGNATURE-----

diff --git a/kde-base/kdepim-runtime/files/kdepim-runtime-4.7.2-duplicated-folders.patch b/kde-base/kdepim-runtime/files/kdepim-runtime-4.7.2-duplicated-folders.patch
new file mode 100644 (file)
index 0000000..d85d813
--- /dev/null
+++ b/kde-base/kdepim-runtime/files/kdepim-runtime-4.7.2-duplicated-folders.patch
@@ -0,0 +1,75 @@
+commit 6bdc6290632be5fc6c103064463d7421b5e3b60d
+Author: Montel Laurent <montel@kde.org>
+Date:   Fri Oct 7 17:14:06 2011 +0200
+
+    Fix Bug 283467 - Kmail has duplicated folders after migration from previous version.
+    
+    By default in config we don't translate config name.
+    We use "inbox" "sent-mail" etc.
+    
+    BUG: 283467
+    FIXED-IN: 4.7.3
+
+diff --git a/migration/kmail/localfolderscollectionmigrator.cpp b/migration/kmail/localfolderscollectionmigrator.cpp
+index 3edc59e..ea9f163 100644
+--- a/migration/kmail/localfolderscollectionmigrator.cpp
++++ b/migration/kmail/localfolderscollectionmigrator.cpp
+@@ -64,23 +64,41 @@ void LocalFoldersCollectionMigrator::setKMailConfig( const KSharedConfigPtr &con
+ 
+   const KConfigGroup group( config, QLatin1String( "General" ) );
+ 
+-  QString name = group.readEntry( QLatin1String( "inboxFolder" ), i18nc( "mail folder name for role inbox",  "inbox" ) );
+-  d->mSystemFolders.insert( name, SpecialMailCollections::Inbox );
+-
+-  name = group.readEntry( QLatin1String( "outboxFolder" ), i18nc( "mail folder name for role outbox",  "outbox" ) );
+-  d->mSystemFolders.insert( name, SpecialMailCollections::Outbox );
+-
+-  name = group.readEntry( QLatin1String( "sentFolder" ), i18nc( "mail folder name for role sent-mail",  "sent-mail" ) );
+-  d->mSystemFolders.insert( name, SpecialMailCollections::SentMail );
+-
+-  name = group.readEntry( QLatin1String( "trashFolder" ), i18nc( "mail folder name for role trash",  "trash" ) );
+-  d->mSystemFolders.insert( name, SpecialMailCollections::Trash );
+-
+-  name = group.readEntry( QLatin1String( "draftsFolder" ), i18nc( "mail folder name for role drafts",  "drafts" ) );
+-  d->mSystemFolders.insert( name, SpecialMailCollections::Drafts );
+-
+-  name = group.readEntry( QLatin1String( "templatesFolder" ), i18nc( "mail folder name for role templates",  "templates" ) );
+-  d->mSystemFolders.insert( name, SpecialMailCollections::Templates );
++  if ( group.hasKey( QLatin1String( "inboxFolder" ) ) ) {
++    const QString name = group.readEntry( QLatin1String( "inboxFolder" ), i18nc( "mail folder name for role inbox",  "inbox" ) );
++    d->mSystemFolders.insert( name, SpecialMailCollections::Inbox );
++  } else 
++    d->mSystemFolders.insert( QLatin1String( "inbox" ), SpecialMailCollections::Inbox );
++
++  if ( group.hasKey( QLatin1String( "outboxFolder" ) ) ) {
++    const QString name = group.readEntry( QLatin1String( "outboxFolder" ), i18nc( "mail folder name for role outbox",  "outbox" ) );
++    d->mSystemFolders.insert( name, SpecialMailCollections::Outbox );
++  } else 
++    d->mSystemFolders.insert( QLatin1String( "outbox" ), SpecialMailCollections::Outbox );
++
++  if ( group.hasKey( QLatin1String( "sentFolder" ) ) ) {
++    const QString name = group.readEntry( QLatin1String( "sentFolder" ), i18nc( "mail folder name for role sent-mail",  "sent-mail" ) );
++    d->mSystemFolders.insert( name, SpecialMailCollections::SentMail );
++  } else 
++    d->mSystemFolders.insert( QLatin1String( "sent-mail" ), SpecialMailCollections::SentMail );
++
++  if ( group.hasKey( QLatin1String( "trashFolder" ) ) ) {
++    const QString name = group.readEntry( QLatin1String( "trashFolder" ), i18nc( "mail folder name for role trash",  "trash" ) );
++    d->mSystemFolders.insert( name, SpecialMailCollections::Trash );
++  } else 
++    d->mSystemFolders.insert( QLatin1String( "trash" ), SpecialMailCollections::Trash );
++
++  if ( group.hasKey( QLatin1String( "draftsFolder" ) ) ) {
++    const QString name = group.readEntry( QLatin1String( "draftsFolder" ), i18nc( "mail folder name for role drafts",  "drafts" ) );
++    d->mSystemFolders.insert( name, SpecialMailCollections::Drafts );
++  } else 
++    d->mSystemFolders.insert( QLatin1String( "drafts" ), SpecialMailCollections::Drafts );
++
++  if ( group.hasKey( QLatin1String( "templatesFolder" ) ) ) {
++    const QString name = group.readEntry( QLatin1String( "templatesFolder" ), i18nc( "mail folder name for role templates",  "templates" ) );
++    d->mSystemFolders.insert( name, SpecialMailCollections::Templates );
++  } else
++    d->mSystemFolders.insert( QLatin1String( "templates" ), SpecialMailCollections::Templates );
+ }
+ 
+ void LocalFoldersCollectionMigrator::migrateCollection( const Collection &collection, const QString &folderId )

diff --git a/kde-base/kdepim-runtime/kdepim-runtime-4.7.2-r1.ebuild b/kde-base/kdepim-runtime/kdepim-runtime-4.7.2-r1.ebuild
new file mode 100644 (file)
index 0000000..64b403e
--- /dev/null
+++ b/kde-base/kdepim-runtime/kdepim-runtime-4.7.2-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-runtime/kdepim-runtime-4.7.2-r1.ebuild,v 1.1 2011/10/07 22:05:28 reavertm Exp $
+
+EAPI=4
+
+KMNAME="kdepim-runtime"
+KDE_SCM="git"
+inherit kde4-base
+
+DESCRIPTION="KDE PIM runtime plugin collection"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+RESTRICT="test"
+# Would need test programs _testrunner and akonaditest from kdepimlibs, see bug 313233
+
+DEPEND="
+       app-misc/strigi
+       >=app-office/akonadi-server-1.3.60
+       dev-libs/boost
+       dev-libs/libxml2:2
+       dev-libs/libxslt
+       >=dev-libs/shared-desktop-ontologies-0.6.51
+       $(add_kdebase_dep kdepimlibs 'semantic-desktop')
+       x11-misc/shared-mime-info
+"
+RDEPEND="${DEPEND}
+       $(add_kdebase_dep kdepim-icons)
+"
+
+PATCHES=(
+       "${FILESDIR}/${P}-duplicated-folders.patch"
+)