Add a few patches to fix nls handling, warnings and FreeBSD/non-Gnu support; add dependency on virtual/libiconv.

Package-Manager: portage-2.1.1_pre1-r2

7 files changed, 211 insertions, 14 deletions

diff --git a/app-dicts/kasumi/ChangeLog b/app-dicts/kasumi/ChangeLog
index 7fd5fe32fe51..a67b1a85be81 100644
--- a/app-dicts/kasumi/ChangeLog
+++ b/app-dicts/kasumi/ChangeLog
@@ -1,6 +1,13 @@
 # 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.20 2006/06/23 18:46:45 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/kasumi/ChangeLog,v 1.21 2006/06/25 20:49:55 flameeyes Exp $
+
+  25 Jun 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/kasumi-2.0-fbsd.patch, +files/kasumi-2.0-format.patch,
+  +files/kasumi-2.0-nls.patch, +files/kasumi-2.0-virtual-destructors.patch,
+  kasumi-2.0.ebuild:
+  Add a few patches to fix nls handling, warnings and FreeBSD/non-Gnu support;
+  add dependency on virtual/libiconv.
 
   23 Jun 2006; Diego Pettenò <flameeyes@gentoo.org> kasumi-2.0.ebuild:
   Fix quoting, add die messages, use emake for install, add missing dependency
diff --git a/app-dicts/kasumi/Manifest b/app-dicts/kasumi/Manifest
index 1352b03f7399..0992705f2ead 100644
--- a/app-dicts/kasumi/Manifest
+++ b/app-dicts/kasumi/Manifest
@@ -5,10 +5,26 @@ 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-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
+SHA256 15247c11c33e90dc97be993eca2c2bb37e37db5a2b765d58b584fe5596c6195e files/kasumi-2.0-format.patch 1068
 AUX kasumi-2.0-gcc41.patch 2754 RMD160 41b4475800c78dd7a532db53d7e0607af8721f0d SHA1 e65f1c06876002a1d0e308240a1491d8cbd1057c SHA256 07db517821d69aa309f916b3967a0336d450f87979b057df572a3de14e3e5aa7
 MD5 9ee070412d420a5af3c4e44144447e58 files/kasumi-2.0-gcc41.patch 2754
 RMD160 41b4475800c78dd7a532db53d7e0607af8721f0d files/kasumi-2.0-gcc41.patch 2754
 SHA256 07db517821d69aa309f916b3967a0336d450f87979b057df572a3de14e3e5aa7 files/kasumi-2.0-gcc41.patch 2754
+AUX kasumi-2.0-nls.patch 2313 RMD160 8873113c54c9b518f82fade4c322093e2a11cd96 SHA1 58487cc14497cfabfc9be49a5b5d7d8683492b49 SHA256 7aeb089ee3f77475486b9344c5c61b919c024ddb6344cd93e48b59517dda791e
+MD5 3859e9f7518b66c361e685a07109c692 files/kasumi-2.0-nls.patch 2313
+RMD160 8873113c54c9b518f82fade4c322093e2a11cd96 files/kasumi-2.0-nls.patch 2313
+SHA256 7aeb089ee3f77475486b9344c5c61b919c024ddb6344cd93e48b59517dda791e files/kasumi-2.0-nls.patch 2313
+AUX kasumi-2.0-virtual-destructors.patch 965 RMD160 8495053397c8d3334cc8e76f4cd3d75864284315 SHA1 2a0648579b0e0bdd7eec795f2abf416e25040c60 SHA256 8e767c518f5bf8f98843fda59c95a69f94beab0a9ce80f19615ff6464dda7c85
+MD5 ab82a67d2713e0eee84cbe8ac31fd821 files/kasumi-2.0-virtual-destructors.patch 965
+RMD160 8495053397c8d3334cc8e76f4cd3d75864284315 files/kasumi-2.0-virtual-destructors.patch 965
+SHA256 8e767c518f5bf8f98843fda59c95a69f94beab0a9ce80f19615ff6464dda7c85 files/kasumi-2.0-virtual-destructors.patch 965
 DIST kasumi-0.10.tar.gz 256132 RMD160 9422a36e59e51d899ab5468dac8c11896f9d9230 SHA1 86fe15e091a943b68f906b4a23dd38cb52606b42 SHA256 6567bdca3546dd2d168a6786dfcf8d4341979dbd04970ec6c0272be9fd87fa17
 DIST kasumi-0.7.tar.gz 223656 RMD160 926a0aac5517df0c7ccb875bf812787a8a3c87e1 SHA1 f3bfae86c232655f87814223cec7f1c16eb03bc2 SHA256 bd8f0d402770ec6f396c345c23f0761721c0802f5839ac5e127082146808460b
 DIST kasumi-0.8.tar.gz 266827 RMD160 d0f4cab8eda5841d710428c8348ce241446e8b88 SHA1 c5d14220b446b1c1d40e9f247625e4ce7c47f5e8 SHA256 2ec80fd23e1e46a6ca8809eaab0f2930746fd695d333c2b53a352f6110d149b0
@@ -25,14 +41,14 @@ EBUILD kasumi-0.8.ebuild 787 RMD160 da70016a2727c6ac9cd8a6dd7fbc0b0b4c1bea3a SHA
 MD5 833354dba043f65fa4eab214084bea1f kasumi-0.8.ebuild 787
 RMD160 da70016a2727c6ac9cd8a6dd7fbc0b0b4c1bea3a kasumi-0.8.ebuild 787
 SHA256 6a2743604aba441e9ecb36465b8b723122a50e46794c056dc45cc02ef5f312e0 kasumi-0.8.ebuild 787
-EBUILD kasumi-2.0.ebuild 969 RMD160 2c3ea48fa2fa02db6a98f0d5e5cdc124b1b1147e SHA1 1b2732900cff1d8c4ed32915cd148f6277b5d331 SHA256 3356acee8d2ab5ab020186852597cbceedcd7db6eada7426c225d84851c16879
-MD5 5cfeb95e44bcbccf500a1b7e0ade58c9 kasumi-2.0.ebuild 969
-RMD160 2c3ea48fa2fa02db6a98f0d5e5cdc124b1b1147e kasumi-2.0.ebuild 969
-SHA256 3356acee8d2ab5ab020186852597cbceedcd7db6eada7426c225d84851c16879 kasumi-2.0.ebuild 969
-MISC ChangeLog 2801 RMD160 1be6cc89da59cbe394f091a0147dc0bfb465f064 SHA1 c070b381d91347ed01f17929b444375679f9f0da SHA256 29acdb01b226dcf78ea63d754c7f9027638a230eb4293c40d0d3b5fed34c916e
-MD5 de788103a6aa66b07eb542d210752f90 ChangeLog 2801
-RMD160 1be6cc89da59cbe394f091a0147dc0bfb465f064 ChangeLog 2801
-SHA256 29acdb01b226dcf78ea63d754c7f9027638a230eb4293c40d0d3b5fed34c916e ChangeLog 2801
+EBUILD kasumi-2.0.ebuild 1179 RMD160 aa327e21de601dca35abc127ca531eaf5e5fd5a4 SHA1 1741c4173cd5277b984a9b9c0cadd365eadd68e5 SHA256 e163a66cb2246609fc685bab5ce5f329ff86f209693fca8cbe8acc53257155fd
+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 metadata.xml 156 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad SHA1 8ccc2b0f20743002b783b1f7b5162c71f7f54c2e SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215
 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad metadata.xml 156
@@ -52,7 +68,7 @@ SHA256 cdbfc9e124eddbb0c887f16d5d5f61a85f91044ce082b285ea9d3776b7e1e509 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEnDcoAiZjviIA2XgRAkjcAKDX+dWJ7rnmh3dqc54b9qsbRSxQPgCg0wG0
-O9Z8tDiRpQ9hWAFj+9gsmI4=
-=yJqw
+iD8DBQFEnvb6AiZjviIA2XgRAi4cAKDRoaUf8GIQJf0DY7lGiWpfQnzqHwCg2lCn
+IfzfDVx6kFfbZPPzyHgWLjo=
+=3dXQ
 -----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
new file mode 100644
index 000000000000..762570a93f09
--- /dev/null
+++ b/app-dicts/kasumi/files/kasumi-2.0-fbsd.patch
@@ -0,0 +1,51 @@
+Index: kasumi-2.0/configure.in
+===================================================================
+--- kasumi-2.0.orig/configure.in
++++ kasumi-2.0/configure.in
+@@ -10,6 +10,11 @@ AC_PROG_CXX
+ dnl Checks for gettext
+ ALL_LINGUAS="ja"
+ AM_GNU_GETTEXT
++AM_ICONV
++
++if test "x$am_cv_func_iconv" != "xyes"; then
++	AC_MSG_ERROR([Unable to find iconv(). iconv() is needed for Kasumi])
++fi
+ 
+ dnl Checks for libraries.
+ AM_PATH_GTK_2_0(2.4.0, CFLAGS="$CFLAGS $GTK_CFLAGS" CPPFLAGS="$CPPFLAGS $GTK_CFLAGS" LIBS="$LIBS $GTK_LIBS", AC_MSG_ERROR(GTK+ 2.0 not found.))
+Index: kasumi-2.0/Makefile.am
+===================================================================
+--- kasumi-2.0.orig/Makefile.am
++++ kasumi-2.0/Makefile.am
+@@ -13,7 +13,7 @@ kasumi_SOURCES = main.cxx intl.h \
+ 		 KasumiConfiguration.cxx KasumiConfiguration.hxx \
+ 		cellrendererspin.c cellrendererspin.h \
+                  kasumi.png
+-kasumi_LDADD = $(INTLLIBS)
++kasumi_LDADD = $(INTLLIBS) $(LTLIBICONV)
+ 
+ pkgdata_DATA = kasumi.png
+ 
+Index: kasumi-2.0/KasumiWord.cxx
+===================================================================
+--- kasumi-2.0.orig/KasumiWord.cxx
++++ kasumi-2.0/KasumiWord.cxx
+@@ -53,7 +53,7 @@ string KasumiWord::convertUTF8ToEUCJP(co
+     char *eucjp_buf = (char*)malloc(len_eucjp);
+     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);
+     return string(eucjp);
+ }
+ 
+@@ -65,7 +65,7 @@ string KasumiWord::convertEUCJPToUTF8(co
+     char *utf8_buf = (char*)malloc(len_utf8);
+     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);
+     return string(utf8);
+ }
+ 
diff --git a/app-dicts/kasumi/files/kasumi-2.0-format.patch b/app-dicts/kasumi/files/kasumi-2.0-format.patch
new file mode 100644
index 000000000000..87c1182b1eb4
--- /dev/null
+++ b/app-dicts/kasumi/files/kasumi-2.0-format.patch
@@ -0,0 +1,22 @@
+Index: kasumi-2.0/KasumiException.cxx
+===================================================================
+--- kasumi-2.0.orig/KasumiException.cxx
++++ kasumi-2.0/KasumiException.cxx
+@@ -47,7 +47,7 @@ void handleException(KasumiException e){
+                                     (GtkDialogFlags)0,
+                                     GTK_MESSAGE_ERROR,
+                                     GTK_BUTTONS_CLOSE,
+-                                    e.getMessage().c_str());
++                                    "%s", e.getMessage().c_str());
+     gtk_dialog_run(GTK_DIALOG (dialog));
+     gtk_widget_destroy(dialog);
+     break;
+@@ -56,7 +56,7 @@ void handleException(KasumiException e){
+                                     (GtkDialogFlags)0,
+                                     GTK_MESSAGE_WARNING,
+                                     GTK_BUTTONS_OK,
+-                                    e.getMessage().c_str());
++                                    "%s", e.getMessage().c_str());
+     gtk_dialog_run(GTK_DIALOG (dialog));
+     gtk_widget_destroy(dialog);
+     break;
diff --git a/app-dicts/kasumi/files/kasumi-2.0-nls.patch b/app-dicts/kasumi/files/kasumi-2.0-nls.patch
new file mode 100644
index 000000000000..0d28557b4b81
--- /dev/null
+++ b/app-dicts/kasumi/files/kasumi-2.0-nls.patch
@@ -0,0 +1,70 @@
+Index: kasumi-2.0/configure.in
+===================================================================
+--- kasumi-2.0.orig/configure.in
++++ kasumi-2.0/configure.in
+@@ -1,5 +1,5 @@
+ dnl Process this file with autoconf to produce a configure script.
+-AC_INIT(main.cxx)
++AC_INIT(main.cxx, 2.0)
+ AM_INIT_AUTOMAKE(kasumi, 2.0)
+ AM_CONFIG_HEADER(config.h)
+ 
+@@ -10,14 +10,6 @@ AC_PROG_CXX
+ dnl Checks for gettext
+ ALL_LINGUAS="ja"
+ AM_GNU_GETTEXT
+-LDFLAGS="$LDFLAGS $INTLLIBS"
+-localedir='${prefix}/share/locale'
+-AC_SUBST(localedir)
+-AC_DEFINE(HAVE_CATGETS, 1,Define as 1 if you have catgets and don't want to use GNU gettext.)
+-AC_DEFINE(HAVE_GETTEXT, 1, Define as 1 if you have GNU gettext.)
+-AC_DEFINE(HAVE_LC_MESSAGES, 1, Define as 1 if you have LC_MESSAGES.)
+-AC_DEFINE(HAVE_STPCPY, 1, Define as 1 if you have stpcpy() function.)
+-AC_DEFINE(ENABLE_NLS, 1, Define as 1 if you want to use NLS.)
+ 
+ dnl Checks for libraries.
+ AM_PATH_GTK_2_0(2.4.0, CFLAGS="$CFLAGS $GTK_CFLAGS" CPPFLAGS="$CPPFLAGS $GTK_CFLAGS" LIBS="$LIBS $GTK_LIBS", AC_MSG_ERROR(GTK+ 2.0 not found.))
+Index: kasumi-2.0/main.cxx
+===================================================================
+--- kasumi-2.0.orig/main.cxx
++++ kasumi-2.0/main.cxx
+@@ -185,11 +185,13 @@ int main(int argc, char *argv[])
+ {
+   gtk_init(&argc, &argv);
+ 
++#ifdef ENABLE_NLS
+   // for gettext
+   setlocale(LC_ALL, "");
+   bindtextdomain(PACKAGE, LOCALEDIR);
+   bind_textdomain_codeset(PACKAGE, "UTF-8");
+   textdomain(PACKAGE);
++#endif
+ 
+   GtkWidget *server = check_duplicated_process (argc, argv);
+   if (!server)
+Index: kasumi-2.0/Makefile.am
+===================================================================
+--- kasumi-2.0.orig/Makefile.am
++++ kasumi-2.0/Makefile.am
+@@ -13,10 +13,13 @@ kasumi_SOURCES = main.cxx intl.h \
+ 		 KasumiConfiguration.cxx KasumiConfiguration.hxx \
+ 		cellrendererspin.c cellrendererspin.h \
+                  kasumi.png
++kasumi_LDADD = $(INTLLIBS)
+ 
+ pkgdata_DATA = kasumi.png
+ 
+-AM_CPPFLAGS=-DLOCALEDIR='"$(localedir)"'
++localedir = $(datadir)/locale
++
++AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\"
+ SUBDIRS = intl m4 po
+ 
+ ACLOCAL_AMFLAGS = -I m4
+Index: kasumi-2.0/acconfig.h
+===================================================================
+--- kasumi-2.0.orig/acconfig.h
++++ /dev/null
+@@ -1,2 +0,0 @@
+-#undef PACKAGE
+-#undef VERSION
diff --git a/app-dicts/kasumi/files/kasumi-2.0-virtual-destructors.patch b/app-dicts/kasumi/files/kasumi-2.0-virtual-destructors.patch
new file mode 100644
index 000000000000..d307df901ba8
--- /dev/null
+++ b/app-dicts/kasumi/files/kasumi-2.0-virtual-destructors.patch
@@ -0,0 +1,24 @@
+Index: kasumi-2.0/KasumiDicEventListener.hxx
+===================================================================
+--- kasumi-2.0.orig/KasumiDicEventListener.hxx
++++ kasumi-2.0/KasumiDicEventListener.hxx
+@@ -35,6 +35,7 @@
+ class KasumiDicEventListener{
+ private:
+ public:
++  virtual ~KasumiDicEventListener() { };
+   virtual void removedWord(size_t id) = 0;
+   virtual void appendedWord(KasumiWord *word) = 0;
+   virtual void modifiedWord(KasumiWord *word) = 0;
+Index: kasumi-2.0/KasumiWordEventListener.hxx
+===================================================================
+--- kasumi-2.0.orig/KasumiWordEventListener.hxx
++++ kasumi-2.0/KasumiWordEventListener.hxx
+@@ -37,6 +37,7 @@ class KasumiWord;
+ class KasumiWordEventListener{
+ private:
+ public:
++    virtual ~KasumiWordEventListener() { }
+     virtual void changedFrequency(KasumiWord *word) = 0;
+     virtual void changedSpelling(KasumiWord *word) = 0;
+     virtual void changedSound(KasumiWord *word) = 0;
diff --git a/app-dicts/kasumi/kasumi-2.0.ebuild b/app-dicts/kasumi/kasumi-2.0.ebuild
index 7976557324b1..4e111904c242 100644
--- a/app-dicts/kasumi/kasumi-2.0.ebuild
+++ b/app-dicts/kasumi/kasumi-2.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/kasumi/kasumi-2.0.ebuild,v 1.2 2006/06/23 18:46:45 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/kasumi/kasumi-2.0.ebuild,v 1.3 2006/06/25 20:49:55 flameeyes Exp $
 
-inherit eutils
+inherit eutils autotools
 
 DESCRIPTION="Anthy dictionary maintenance tool"
 HOMEPAGE="http://kasumi.sourceforge.jp/"
@@ -20,6 +20,7 @@ RDEPEND=">=x11-libs/gtk+-2.2
 	>=dev-libs/expat-1.95
 	>=x11-libs/pango-1.2
 	nls? ( virtual/libintl )
+	virtual/libiconv
 	app-i18n/anthy"
 
 DEPEND="${RDEPEND}
@@ -29,6 +30,12 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}/${P}-gcc41.patch"
+	epatch "${FILESDIR}/${P}-nls.patch"
+	epatch "${FILESDIR}/${P}-virtual-destructors.patch"
+	epatch "${FILESDIR}/${P}-format.patch"
+	epatch "${FILESDIR}/${P}-fbsd.patch"
+
+	eautoreconf
 }
 
 src_compile() {