Forgot to refresh the fbsd patch before copying and committing, now fixed.

Package-Manager: portage-2.1.1_pre1-r2

3 files changed, 18 insertions, 14 deletions

diff --git a/app-dicts/kasumi/ChangeLog b/app-dicts/kasumi/ChangeLog
index a67b1a85be81..52b1f62726b1 100644
--- a/app-dicts/kasumi/ChangeLog
+++ b/app-dicts/kasumi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-dicts/kasumi
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/kasumi/ChangeLog,v 1.21 2006/06/25 20:49:55 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/kasumi/ChangeLog,v 1.22 2006/06/26 10:14:59 flameeyes Exp $
+
+  26 Jun 2006; Diego Pettenò <flameeyes@gentoo.org>
+  files/kasumi-2.0-fbsd.patch:
+  Forgot to refresh the fbsd patch before copying and committing, now fixed.
 
   25 Jun 2006; Diego Pettenò <flameeyes@gentoo.org>
   +files/kasumi-2.0-fbsd.patch, +files/kasumi-2.0-format.patch,
diff --git a/app-dicts/kasumi/Manifest b/app-dicts/kasumi/Manifest
index 0992705f2ead..3ca87f5e9f46 100644
--- a/app-dicts/kasumi/Manifest
+++ b/app-dicts/kasumi/Manifest
@@ -5,10 +5,10 @@ AUX kasumi-0.10-gcc41.patch 3254 RMD160 c21f6d7b888d11c6884c891b99c33c6d862e79fc
 MD5 52430ef369183984af9ce8354ee784cc files/kasumi-0.10-gcc41.patch 3254
 RMD160 c21f6d7b888d11c6884c891b99c33c6d862e79fc files/kasumi-0.10-gcc41.patch 3254
 SHA256 48dee7376a1b4184c00d4f32eb2249e2d568df7ceab3d7b8173b445f96a005a9 files/kasumi-0.10-gcc41.patch 3254
-AUX kasumi-2.0-fbsd.patch 1824 RMD160 5166b7e606535ac6ed3dc849cb940a1fff4dcfcc SHA1 fc48e29ac324e98a9b9598b4f0814b8e8e730e57 SHA256 0d1577bf6d01b7b6db94d26efb6e4a275df81f84d8ba460f67ff58ca3721d5ee
-MD5 dc0f6886f259dba14fd91dff90aa646c files/kasumi-2.0-fbsd.patch 1824
-RMD160 5166b7e606535ac6ed3dc849cb940a1fff4dcfcc files/kasumi-2.0-fbsd.patch 1824
-SHA256 0d1577bf6d01b7b6db94d26efb6e4a275df81f84d8ba460f67ff58ca3721d5ee files/kasumi-2.0-fbsd.patch 1824
+AUX kasumi-2.0-fbsd.patch 1836 RMD160 47e4f3913223e7d636b1b3bf696971c72f301e69 SHA1 eea3a9087f7b16e625c895b54d3c694960ce759b SHA256 f40963fe8d3bf8ff31a5da138a84345aedbbe69f738eeb32c3086d931e657320
+MD5 3b68ae74c11b42da6aaa8e08d9af93c7 files/kasumi-2.0-fbsd.patch 1836
+RMD160 47e4f3913223e7d636b1b3bf696971c72f301e69 files/kasumi-2.0-fbsd.patch 1836
+SHA256 f40963fe8d3bf8ff31a5da138a84345aedbbe69f738eeb32c3086d931e657320 files/kasumi-2.0-fbsd.patch 1836
 AUX kasumi-2.0-format.patch 1068 RMD160 cb2096fd664a2ec32053423de7201ea1c491a60c SHA1 869736537e10738296172af727de8ec243d38982 SHA256 15247c11c33e90dc97be993eca2c2bb37e37db5a2b765d58b584fe5596c6195e
 MD5 b45a3d2fe50eff75103a9af5be0c01d8 files/kasumi-2.0-format.patch 1068
 RMD160 cb2096fd664a2ec32053423de7201ea1c491a60c files/kasumi-2.0-format.patch 1068
@@ -45,10 +45,10 @@ EBUILD kasumi-2.0.ebuild 1179 RMD160 aa327e21de601dca35abc127ca531eaf5e5fd5a4 SH
 MD5 1aa24899590d87fb0b9d8559c98f67a2 kasumi-2.0.ebuild 1179
 RMD160 aa327e21de601dca35abc127ca531eaf5e5fd5a4 kasumi-2.0.ebuild 1179
 SHA256 e163a66cb2246609fc685bab5ce5f329ff86f209693fca8cbe8acc53257155fd kasumi-2.0.ebuild 1179
-MISC ChangeLog 3133 RMD160 9e559adf741e52db907c54d042a4309b43190583 SHA1 aee3b42d97dd01a9390ff9d2c90385d8b9627a45 SHA256 d51e36d8c4aa6994434dcb6a89dff38e5fc61a8d0aad0ba34d17b80895f7daa2
-MD5 a30ae6aa7c4e3dc4f47980b50e166494 ChangeLog 3133
-RMD160 9e559adf741e52db907c54d042a4309b43190583 ChangeLog 3133
-SHA256 d51e36d8c4aa6994434dcb6a89dff38e5fc61a8d0aad0ba34d17b80895f7daa2 ChangeLog 3133
+MISC ChangeLog 3295 RMD160 cf2f8420937db074af9d186a0e63c1d1f2d7cce1 SHA1 0d9403d5c8775fc0c2b5bee2d4626f675cb1cb86 SHA256 f38d83ba75465e5ae58b56c5e42770a5aca603bfcfe3cb948d55bbfa599be87e
+MD5 58e83afd35d3faa8666610944e618682 ChangeLog 3295
+RMD160 cf2f8420937db074af9d186a0e63c1d1f2d7cce1 ChangeLog 3295
+SHA256 f38d83ba75465e5ae58b56c5e42770a5aca603bfcfe3cb948d55bbfa599be87e ChangeLog 3295
 MISC metadata.xml 156 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad SHA1 8ccc2b0f20743002b783b1f7b5162c71f7f54c2e SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215
 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad metadata.xml 156
@@ -68,7 +68,7 @@ SHA256 cdbfc9e124eddbb0c887f16d5d5f61a85f91044ce082b285ea9d3776b7e1e509 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEnvb6AiZjviIA2XgRAi4cAKDRoaUf8GIQJf0DY7lGiWpfQnzqHwCg2lCn
-IfzfDVx6kFfbZPPzyHgWLjo=
-=3dXQ
+iD8DBQFEn7OqAiZjviIA2XgRApjOAKDN83HWi5/JK4gq9ayu8y1nDYidvQCg5Sd4
+lS5stc26a9BNoZZIXEgeWeU=
+=dmZZ
 -----END PGP SIGNATURE-----
diff --git a/app-dicts/kasumi/files/kasumi-2.0-fbsd.patch b/app-dicts/kasumi/files/kasumi-2.0-fbsd.patch
index 762570a93f09..bb458a110eeb 100644
--- a/app-dicts/kasumi/files/kasumi-2.0-fbsd.patch
+++ b/app-dicts/kasumi/files/kasumi-2.0-fbsd.patch
@@ -36,7 +36,7 @@ Index: kasumi-2.0/KasumiWord.cxx
      char *eucjp = eucjp_buf;
  
 -    iconv(IconvUTF8_To_EUCJP, &utf8, &len, &eucjp_buf, &len_eucjp);
-+    iconv(IconvUTF8_To_EUCJP, const_cast<const char**>(&utf8), &len, &eucjp_buf, &len_eucjp);
++    iconv(IconvUTF8_To_EUCJP, const_cast<ICONV_CONST char**>(&utf8), &len, &eucjp_buf, &len_eucjp);
      return string(eucjp);
  }
  
@@ -45,7 +45,7 @@ Index: kasumi-2.0/KasumiWord.cxx
      char *utf8 = utf8_buf;
  
 -    iconv(IconvEUCJP_To_UTF8, &eucjp, &len, &utf8_buf, &len_utf8);
-+    iconv(IconvEUCJP_To_UTF8, const_cast<const char**>(&eucjp), &len, &utf8_buf, &len_utf8);
++    iconv(IconvEUCJP_To_UTF8, const_cast<ICONV_CONST char**>(&eucjp), &len, &utf8_buf, &len_utf8);
      return string(utf8);
  }