revise the patch slightly per bug #157049 (and the KDE bug referenced therein

Package-Manager: portage-2.1.2_rc2-r5

diff --git a/kde-base/kdepim/Manifest b/kde-base/kdepim/Manifest
index 980f3c143166435a88a3c786efb54549062619ca..9172e7d0c707b3a6f5c8b98611bd337a33517d2a 100644 (file)
--- a/kde-base/kdepim/Manifest
+++ b/kde-base/kdepim/Manifest
@@ -42,10 +42,10 @@ AUX kmail-3.5.2-misc-fixes-2.diff 13036 RMD160 8b193b7892b6ba4f30e35e16ff783600c
 MD5 e752e166fd636a23e5e89559f2f99d57 files/kmail-3.5.2-misc-fixes-2.diff 13036
 RMD160 8b193b7892b6ba4f30e35e16ff783600c5feeae0 files/kmail-3.5.2-misc-fixes-2.diff 13036
 SHA256 69f4fbff3eee6a2a8f7028b782430b6863c5cbd7ca5087460bd98d80c45e7ab2 files/kmail-3.5.2-misc-fixes-2.diff 13036
-AUX kmail-3.5.5-dimap-mail-loss.patch 10075 RMD160 7de6fd6e28d4a1a4ecbffe174d7b1d3f96fb7155 SHA1 1957b99aaa114f647d24c5943ecb3d3fae3382e6 SHA256 411e984a2b0eb079351b1f3c28ae0c72b4360449b743b559fecad074bf869fb2
-MD5 defcf09940f42413c805da114fa06dd4 files/kmail-3.5.5-dimap-mail-loss.patch 10075
-RMD160 7de6fd6e28d4a1a4ecbffe174d7b1d3f96fb7155 files/kmail-3.5.5-dimap-mail-loss.patch 10075
-SHA256 411e984a2b0eb079351b1f3c28ae0c72b4360449b743b559fecad074bf869fb2 files/kmail-3.5.5-dimap-mail-loss.patch 10075
+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
+SHA256 30992bb319dff9ef45c3b44873284346e7727f5982835d97af44030511e3a636 files/kmail-3.5.5-dimap-mail-loss.patch 9870
 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
@@ -78,10 +78,10 @@ EBUILD kdepim-3.5.5-r2.ebuild 1317 RMD160 3e3cd6d9754df3a87141f8b577fcdf4c77eac9
 MD5 91764e0bc990afa64ad1ec929f440809 kdepim-3.5.5-r2.ebuild 1317
 RMD160 3e3cd6d9754df3a87141f8b577fcdf4c77eac9fd kdepim-3.5.5-r2.ebuild 1317
 SHA256 a4e809922920a6f7693a8a24a0193b2bf593e482d3da10e9baf27746a5642591 kdepim-3.5.5-r2.ebuild 1317
-MISC ChangeLog 31275 RMD160 55f1e3544b0eaa7f7df160ac7f40a75c3823c37d SHA1 b06bea5053b488fcbd345314b9b1885fb34a1ceb SHA256 82701a071d0eb153dec00b930f13e140d0e493f9caf40072b976ca16b249eb61
-MD5 d555eef71a077e9daf2009def21d4434 ChangeLog 31275
-RMD160 55f1e3544b0eaa7f7df160ac7f40a75c3823c37d ChangeLog 31275
-SHA256 82701a071d0eb153dec00b930f13e140d0e493f9caf40072b976ca16b249eb61 ChangeLog 31275
+MISC ChangeLog 31444 RMD160 828e755a41fac1beb6a5f23076b4403f86d2b9c2 SHA1 6f55640f8d54a21c94c1e1c48e8744d76293ee25 SHA256 ce99eb662cab78df29edc93bfbe311c06154422718a941fa333380420fff5bdd
+MD5 ef9cb8ffc41a080e50a3a370da7c02df ChangeLog 31444
+RMD160 828e755a41fac1beb6a5f23076b4403f86d2b9c2 ChangeLog 31444
+SHA256 ce99eb662cab78df29edc93bfbe311c06154422718a941fa333380420fff5bdd ChangeLog 31444
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156

diff --git a/kde-base/kmail/Manifest b/kde-base/kmail/Manifest
index 7b3d72251ee94e5cd0a4326e0a27a5d158798232..2745e267f5c5406358a21b234d7002eda93bad08 100644 (file)
--- a/kde-base/kmail/Manifest
+++ b/kde-base/kmail/Manifest
@@ -26,10 +26,10 @@ AUX kmail-3.5.2-misc-fixes.diff 10293 RMD160 855c29e1d3462c9d2a7b21e3a0840e577de
 MD5 bd9633fbc0739b499ce331936cca5d47 files/kmail-3.5.2-misc-fixes.diff 10293
 RMD160 855c29e1d3462c9d2a7b21e3a0840e577de8ea76 files/kmail-3.5.2-misc-fixes.diff 10293
 SHA256 8401d02668a03f8e20baf92304383ea445c6483fc637014f9a4bd888e86fe252 files/kmail-3.5.2-misc-fixes.diff 10293
-AUX kmail-3.5.5-dimap-mail-loss.patch 10075 RMD160 7de6fd6e28d4a1a4ecbffe174d7b1d3f96fb7155 SHA1 1957b99aaa114f647d24c5943ecb3d3fae3382e6 SHA256 411e984a2b0eb079351b1f3c28ae0c72b4360449b743b559fecad074bf869fb2
-MD5 defcf09940f42413c805da114fa06dd4 files/kmail-3.5.5-dimap-mail-loss.patch 10075
-RMD160 7de6fd6e28d4a1a4ecbffe174d7b1d3f96fb7155 files/kmail-3.5.5-dimap-mail-loss.patch 10075
-SHA256 411e984a2b0eb079351b1f3c28ae0c72b4360449b743b559fecad074bf869fb2 files/kmail-3.5.5-dimap-mail-loss.patch 10075
+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
+SHA256 30992bb319dff9ef45c3b44873284346e7727f5982835d97af44030511e3a636 files/kmail-3.5.5-dimap-mail-loss.patch 9870
 DIST kdepim-3.5.2.tar.bz2 12887336 RMD160 8e6571d14bbf6b3370c4fdb108a1a79625e87365 SHA1 1907bc219d2dd51a376a99d0f7e6b9af97d5adf7 SHA256 9c038a80912894b3ec132b2c7219ec5549ca80dcdeec88555928d2e038966539
 DIST kdepim-3.5.5.tar.bz2 12908968 RMD160 5bdcf98909f450ce3839fa72a404571f6cde22f6 SHA1 612f34307c5fac9279c85a4efb1488db4b438f12 SHA256 82887df2c2ff00cb60dcfb8aa04527988123b9a4ed70f4c9082a7a0eb9f1f047
 EBUILD kmail-3.5.2-r4.ebuild 2096 RMD160 5c59461768bf297f3f6533b2537836d166bcb306 SHA1 e02c05ced8ebd7b5343d14ea83d02781dd5b2ece SHA256 581e68dcaa963590de6714841c4b6c71b66f248f53792fda664281ec0d6c14eb
@@ -40,10 +40,10 @@ EBUILD kmail-3.5.5-r1.ebuild 2006 RMD160 871f15adba0dae39137219331ff389d85a6a134
 MD5 0b9c1716bbeef6a6f6cb79dc642977f5 kmail-3.5.5-r1.ebuild 2006
 RMD160 871f15adba0dae39137219331ff389d85a6a134f kmail-3.5.5-r1.ebuild 2006
 SHA256 1f64be8f3a11ad187192f5fb036e310529bc6c5eca8ce2211e303f741bd87e87 kmail-3.5.5-r1.ebuild 2006
-MISC ChangeLog 12099 RMD160 4b8e678710b56ad31d6bae5e86aa223964d3a9c0 SHA1 007caeff742ad5b5c25a8369b340d3610c1079e6 SHA256 475aeefba1b06d35cb70bf6fdccee7deaa4b6988cb49a124a84b4188a13fb799
-MD5 5c28f06acfe194c71bd464256924ccc9 ChangeLog 12099
-RMD160 4b8e678710b56ad31d6bae5e86aa223964d3a9c0 ChangeLog 12099
-SHA256 475aeefba1b06d35cb70bf6fdccee7deaa4b6988cb49a124a84b4188a13fb799 ChangeLog 12099
+MISC ChangeLog 12268 RMD160 ca25e0fea75a7cc81f97be468d57f2f387bee2e5 SHA1 573b3ef22d79f20c621b89923e3e53c1e45d6051 SHA256 639594b4f681eb80d814f5fcb886158a45c548e666433dddb2172a93e4341789
+MD5 87fe5794c2f6b52f9e4346e923420a9f ChangeLog 12268
+RMD160 ca25e0fea75a7cc81f97be468d57f2f387bee2e5 ChangeLog 12268
+SHA256 639594b4f681eb80d814f5fcb886158a45c548e666433dddb2172a93e4341789 ChangeLog 12268
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156