gentoo resync : 14.07.2018

4 files changed, 0 insertions, 188 deletions

diff --git a/app-i18n/im-freewnn/files/im-freewnn-0.0.2-as-needed.patch b/app-i18n/im-freewnn/files/im-freewnn-0.0.2-as-needed.patch
deleted file mode 100644
index 859ea779817a..000000000000
--- a/app-i18n/im-freewnn/files/im-freewnn-0.0.2-as-needed.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- im-freewnn-0.0.2.orig/Makefile.am	2004-08-04 07:05:06.000000000 +0200
-+++ im-freewnn-0.0.2/Makefile.am	2009-12-29 20:34:54.420539767 +0100
-@@ -10,8 +10,6 @@
- 
- DEPS =
- 
--LDADDS = @GTK_DEP_LIBS@ -lcrypt
--
- EXTRA_DIST=	\
- 	im-freewnn.spec
- 
-@@ -38,7 +36,7 @@
- 		candwin.h \
- 		candwin.c
- 
--im_freewnn_la_LIBADD = $(LDADDS) -lcrypt
-+im_freewnn_la_LIBADD = @LIBS@ @GTK_DEP_LIBS@ -lcrypt
- 
- module_LTLIBRARIES =				\
- 	im-freewnn.la
---- im-freewnn-0.0.2.orig/configure.in	2004-08-05 08:04:36.000000000 +0200
-+++ im-freewnn-0.0.2/configure.in	2009-12-29 20:36:31.562539161 +0100
-@@ -48,11 +48,8 @@
- AM_CONDITIONAL(PLATFORM_WIN32, test "$platform_win32" = "yes")
- 
- dnl FreeWnn check
--ldflags_backup="$LDFLAGS"
--LDFLAGS="$LDFLAGS -lcrypt"
- AC_CHECK_HEADER(wnn/jlib.h,,)
--AC_CHECK_LIB(wnn, jl_open_lang,,)
--LDFLAGS="$ldflags_backup"
-+AC_CHECK_LIB([wnn], [jl_open_lang], , ,[-lcrypt])
- 
- AC_OUTPUT([
- Makefile
diff --git a/app-i18n/im-freewnn/files/im-freewnn-gentoo.patch b/app-i18n/im-freewnn/files/im-freewnn-gentoo.patch
deleted file mode 100644
index 90e042fc4193..000000000000
--- a/app-i18n/im-freewnn/files/im-freewnn-gentoo.patch
+++ /dev/null
@@ -1,112 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,4 +1,4 @@
--moduledir = ${libdir}/gtk-2.0/2.4.0/immodules
-+moduledir = ${libdir}/gtk-2.0/${GTK_BINARY_VERSION}/immodules
- ## Makefile.am for gtk+/modules/input 
- if PLATFORM_WIN32
- no_undefined = -no-undefined
-@@ -6,11 +6,11 @@
- 
- SUBDIRS = po
- 
--INCLUDES = @GTK_DEP_CFLAGS@ -I/usr/include/wnn -DIM_LOCALEDIR=\"${datadir}/locale\"
-+INCLUDES = @GTK_DEP_CFLAGS@ -DIM_LOCALEDIR=\"${datadir}/locale\"
- 
- DEPS =
- 
--LDADDS = @GTK_DEP_LIBS@ -lcrypt
-+LDADDS = @GTK_DEP_LIBS@
- 
- EXTRA_DIST=	\
- 	im-freewnn.spec
-@@ -38,7 +38,7 @@
- 		candwin.h \
- 		candwin.c
- 
--im_freewnn_la_LIBADD = $(LDADDS) -lcrypt
-+im_freewnn_la_LIBADD = $(LDADDS)
- 
- module_LTLIBRARIES =				\
- 	im-freewnn.la
---- a/configure.in
-+++ b/configure.in
-@@ -21,8 +21,10 @@
- 
- GTK_DEP_CFLAGS=`pkg-config gtk+-2.0 --cflags`
- GTK_DEP_LIBS=`pkg-config gtk+-2.0 --libs`
-+GTK_BINARY_VERSION=`pkg-config gtk+-2.0 --variable=gtk_binary_version`
- AC_SUBST(GTK_DEP_CFLAGS)
- AC_SUBST(GTK_DEP_LIBS)
-+AC_SUBST(GTK_BINARY_VERSION)
- 
- LT_RELEASE=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION
- LT_CURRENT=2
-@@ -48,11 +50,9 @@
- AM_CONDITIONAL(PLATFORM_WIN32, test "$platform_win32" = "yes")
- 
- dnl FreeWnn check
--ldflags_backup="$LDFLAGS"
--LDFLAGS="$LDFLAGS -lcrypt"
- AC_CHECK_HEADER(wnn/jlib.h,,)
-+AC_CHECK_LIB(crypt, crypt,,)
- AC_CHECK_LIB(wnn, jl_open_lang,,)
--LDFLAGS="$ldflags_backup"
- 
- AC_OUTPUT([
- Makefile
---- a/freewnn-modewin.h
-+++ b/freewnn-modewin.h
-@@ -23,7 +23,7 @@
- 
- #include <gtk/gtk.h>
- 
--#include <jllib.h>
-+#include <wnn/jllib.h>
- 
- #include "freewnn-register-win.h"
- #include "freewnn-config.h"
---- a/freewnn-register-win.c
-+++ b/freewnn-register-win.c
-@@ -18,7 +18,7 @@
-  *
-  */
- 
--#include <jllib.h>
-+#include <wnn/jllib.h>
- #include <gtk/gtk.h>
- 
- #include <gdk/gdkkeysyms.h>
---- a/freewnn-register-win.h
-+++ b/freewnn-register-win.h
-@@ -22,7 +22,7 @@
- #define _FREEWNN_REGIST_WIN
- 
- #include <gtk/gtk.h>
--#include <jllib.h>
-+#include <wnn/jllib.h>
- 
- typedef struct _FreeWnnRegisterWin FreeWnnRegisterWin;
- 
---- a/freewnn-utils.h
-+++ b/freewnn-utils.h
-@@ -18,7 +18,7 @@
-  * Boston, MA 02111-1307, USA.
-  */
- 
--#include <jllib.h>
-+#include <wnn/jllib.h>
- #include <glib.h>
- 
- w_char* char2wchar(unsigned char* str);
---- a/im-freewnn.h
-+++ b/im-freewnn.h
-@@ -26,7 +26,7 @@
- 
- #include <gtk/gtk.h>
- #include <gtk/gtkimmodule.h>
--#include <jllib.h>
-+#include <wnn/jllib.h>
- 
- #include "freewnn-modewin.h"
- #include "freewnn-utils.h"
diff --git a/app-i18n/im-freewnn/files/im-freewnn-headers.patch b/app-i18n/im-freewnn/files/im-freewnn-headers.patch
deleted file mode 100644
index 290aee97bd89..000000000000
--- a/app-i18n/im-freewnn/files/im-freewnn-headers.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/freewnn-utils.c
-+++ b/freewnn-utils.c
-@@ -18,6 +18,9 @@
-  * Boston, MA 02111-1307, USA.
-  */
- 
-+#include <stdlib.h>
-+#include <string.h>
-+
- #include "freewnn-utils.h"
- #include "kata2hkata.h"
- 
---- a/im-freewnn.c
-+++ b/im-freewnn.c
-@@ -26,6 +26,7 @@
-  */
- 
- #include <stdio.h>
-+#include <stdlib.h>
- 
- #include <string.h>
- #include "keytable.h"
-@@ -33,6 +34,7 @@
- #include <gdk/gdkkeysyms.h>
- 
- #include "im-freewnn-intl.h"
-+#include "freewnn-utils-ui.h"
- #include "convtable.h"
- #include "im-freewnn.h"
- 
diff --git a/app-i18n/im-freewnn/files/im-freewnn-wnnenvrc.patch b/app-i18n/im-freewnn/files/im-freewnn-wnnenvrc.patch
deleted file mode 100644
index 6b3c70769907..000000000000
--- a/app-i18n/im-freewnn/files/im-freewnn-wnnenvrc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/im-freewnn.c
-+++ b/im-freewnn.c
-@@ -236,7 +236,7 @@
-     return;
-   }
- 
--  jl_set_env_wnnrc(wenv, "/etc/FreeWnn/ja/wnnenvrc", printConfirm, printError);
-+  jl_set_env_wnnrc(wenv, "@GENTOO_PORTAGE_EPREFIX@/usr/lib/wnn/ja_JP/wnnenvrc", printConfirm, printError);
- 
-   cf->modewin = freewnn_modewin_new(cf->wnnbuf, &cf->functable);
-   cf->candwin = candwin_new();