gentoo resync : 14.07.2018

6 files changed, 0 insertions, 279 deletions

diff --git a/app-i18n/kinput2/files/kinput2-gentoo.patch b/app-i18n/kinput2/files/kinput2-gentoo.patch
deleted file mode 100644
index 2c22723b3851..000000000000
--- a/app-i18n/kinput2/files/kinput2-gentoo.patch
+++ /dev/null
@@ -1,99 +0,0 @@
---- a/Kinput2.conf
-+++ b/Kinput2.conf
-@@ -17,8 +17,8 @@
- 
- /* #define UseWnn */	/* define if you are going to use Wnn (v4, v6 or v7) */
- /* #define UseWnn6 */	/* define if you are going to use Wnn6 or above */
--#define UseCanna	/* define if you are going to use Canna */
--#define UseSj3		/* define if you are going to use Sj3 */
-+/* #define UseCanna */	/* define if you are going to use Canna */
-+/* #define UseSj3 */	/* define if you are going to use Sj3 */
- /* #define UseAtok */	/* define if you are going to use Atok */
- 
- 
-@@ -34,7 +34,7 @@
-  * You have to define WnnLibDir if Wnn4 configuration files
-  * are not installed in /usr/local/lib/wnn (which is the default).
-  */
--/* #define WnnLibDir /some/peculiar/directory/wnn */
-+#define WnnLibDir $(EPREFIX)/usr/lib/wnn 
- 
- /* for convenience.. */
- #if defined(UseWnn6) && !defined(UseWnn)
-@@ -52,17 +52,17 @@
-  * WnnLibDir above.
-  */
- XCOMM use installed header files
--XCOMM WNNINCDIR = /usr/X11R6/include/wnn
-+WNNINCDIR = $(EPREFIX)/usr/include/wnn
- XCOMM use installed library
--XCOMM WNNLIB = -lwnn
-+WNNLIB = -lwnn
- 
- /*
-  * Or, use library in the source tree..
-  */
- XCOMM use library in the source tree
--WNNSRC = $(CONTRIBSRC)/programs/Xsi/Wnn
--WNNINCDIR = $(WNNSRC)/include
--WNNLIB = $(WNNSRC)/jlib/libwnn.a
-+XCOMM WNNSRC = $(CONTRIBSRC)/programs/Xsi/Wnn
-+XCOMM WNNINCDIR = $(WNNSRC)/include
-+XCOMM WNNLIB = $(WNNSRC)/jlib/libwnn.a
- 
- 
- XCOMM Canna configuration
-@@ -78,17 +78,17 @@
-  * If you have already installed Canna header files and libraries..
-  */
- XCOMM use installed headers/libraries
--XCOMM CANNAINSTDIR = /usr/local/canna
--XCOMM CANNASRC = $(CANNAINSTDIR)/include
--XCOMM CANNALIB = -lcanna16
-+CANNAINSTDIR = $(EPREFIX)/usr
-+CANNASRC = $(CANNAINSTDIR)/include
-+CANNALIB = -lcanna16
- 
- /*
-  * If you have compiled Canna that came with X11R6 (contrib/programs/Canna),
-  * but not installed yet..
-  */
- XCOMM use headers/libraries in the source tree
--CANNASRC = $(CONTRIBSRC)/programs/Canna32
--CANNALIB = -L$(CANNASRC)/lib/canna16 -lcanna16
-+XCOMM CANNASRC = $(CONTRIBSRC)/programs/Canna32
-+XCOMM CANNALIB = -L$(CANNASRC)/lib/canna16 -lcanna16
- 
- 
- XCOMM SJ3 configuration
-@@ -100,7 +100,7 @@
-  *		   definition files are to be installed
-  */
- 
--SJ3DEF_DIR = $(LIBDIR)/sj3def
-+XCOMM SJ3DEF_DIR = $(LIBDIR)/sj3def
- 
- /*
-  * If you have installed SJ3 library and header file,
-@@ -117,8 +117,8 @@
-  * Use compiled library in the source tree..
-  */
- XCOMM use library in the source tree
--SJ3SRC = $(CONTRIBSRC)/programs/sj3
--SJ3LIB = $(SJ3SRC)/sj3lib/libsj3lib.a
-+XCOMM SJ3SRC = $(CONTRIBSRC)/programs/sj3
-+XCOMM SJ3LIB = $(SJ3SRC)/sj3lib/libsj3lib.a
- 
- 
- XCOMM Atok configuration
-@@ -133,8 +133,8 @@
-  */
- XCOMM use installed headers/libraries
- XCOMM ATOKINCDIR = /usr/include/atok
--XCOMM ATOKLIBDIR = /usr/jp/lib
--ATOKLIB = -latok12n -latok12util
-+XCOMM ATOKLIBDIR = /var/lib/atok
-+XCOMM ATOKLIB = -latok12n -latok12util
- 
- 
- /**
diff --git a/app-i18n/kinput2/files/kinput2-headers.patch b/app-i18n/kinput2/files/kinput2-headers.patch
deleted file mode 100644
index 0075f710e9b6..000000000000
--- a/app-i18n/kinput2/files/kinput2-headers.patch
+++ /dev/null
@@ -1,101 +0,0 @@
---- a/cmd/kinput2.c
-+++ b/cmd/kinput2.c
-@@ -25,6 +25,7 @@
- #endif
- 
- #include <stdio.h>
-+#include <stdlib.h>
- #include <signal.h>
- #include <X11/Intrinsic.h>
- #include <X11/StringDefs.h>
---- a/lib/Canna.c
-+++ b/lib/Canna.c
-@@ -50,6 +50,7 @@
- static char *rcsid = "$Id: Canna.c,v 1.55 1999/05/25 08:13:03 ishisone Exp $";
- #endif
- 
-+#include <stdlib.h>
- #include <X11/IntrinsicP.h>
- #include <X11/StringDefs.h>
- #include <X11/Xmu/Atoms.h>
---- a/lib/CcWnn.c
-+++ b/lib/CcWnn.c
-@@ -2754,6 +2754,7 @@
-     wchar wbuf[1024];
-     int wlen;
-     int len;
-+    extern int convJWStoCT();
- 
-     TRACE(("CcWnn:saveYomiAndKanji()\n"));
- 
---- a/lib/ConvCtrl.c
-+++ b/lib/ConvCtrl.c
-@@ -18,6 +18,7 @@
-  * Author:  Makoto Ishisone, Software Research Associates, Inc., Japan
-  */
- 
-+#include <stdio.h>
- #include <X11/IntrinsicP.h>
- #include <X11/StringDefs.h>
- #include <X11/Xmu/CharSet.h>
---- a/lib/KIProto.c
-+++ b/lib/KIProto.c
-@@ -18,6 +18,7 @@
-  * Author:  Makoto Ishisone, Software Research Associates, Inc., Japan
-  */
- 
-+#include <stdio.h>
- #include <X11/IntrinsicP.h>
- #include <X11/StringDefs.h>
- #include <X11/Xatom.h>
---- a/lib/XimpProto.c
-+++ b/lib/XimpProto.c
-@@ -18,6 +18,7 @@
-  * Author:  Makoto Ishisone, Software Research Associates, Inc., Japan
-  */
- 
-+#include <stdio.h>
- #include <X11/Xos.h>
- #include <X11/IntrinsicP.h>
- 
---- a/lib/cconv.c
-+++ b/lib/cconv.c
-@@ -604,6 +604,7 @@
- #endif
- 
- #include	<stdio.h>
-+#include	<stdlib.h>
- #include	<X11/Xlib.h>
- #include	<X11/keysym.h>
- #include	<X11/Xutil.h>
---- a/lib/ctext.c
-+++ b/lib/ctext.c
-@@ -71,6 +71,8 @@
- static char *rcsid = "$Id: ctext.c,v 2.6 1999/03/10 08:55:15 ishisone Exp $";
- #endif
- 
-+#include <string.h>
-+
- typedef unsigned short	wchar;
- 
- #define NULL	0
---- a/lib/ioecall.c
-+++ b/lib/ioecall.c
-@@ -23,6 +23,7 @@
-  */
- 
- #include <stdio.h>
-+#include <stdlib.h>
- #include <X11/Xlib.h>
- #include <X11/Xfuncproto.h>
- #include "IOECall.h"
---- a/lib/wnnlib.c
-+++ b/lib/wnnlib.c
-@@ -578,6 +578,7 @@
- #ifdef DEBUG_WNNLIB
- #include	<stdio.h>
- #endif
-+#include	<stdlib.h>
- #include	"wnnlib.h"
- #include	"WStr.h"
- #include	<string.h>
diff --git a/app-i18n/kinput2/files/kinput2-ppc.patch b/app-i18n/kinput2/files/kinput2-ppc.patch
deleted file mode 100644
index 897b154eb5ac..000000000000
--- a/app-i18n/kinput2/files/kinput2-ppc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/cmd/kinput2.c
-+++ b/cmd/kinput2.c
-@@ -644,3 +644,8 @@
-     return n;
- }
- #endif
-+
-+#if defined(linux) && defined(PPC)
-+/* avoid nusty gcc bug */
-+void _XtInherit() {}
-+#endif
diff --git a/app-i18n/kinput2/files/kinput2-segfault.patch b/app-i18n/kinput2/files/kinput2-segfault.patch
deleted file mode 100644
index 9b3a83163b4f..000000000000
--- a/app-i18n/kinput2/files/kinput2-segfault.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/lib/imlib/imconv.c
-+++ b/lib/imlib/imconv.c
-@@ -591,6 +591,9 @@
- 	}
-     }
-     IMFinishRequest(conn, offset);
-+    #ifdef STATUS_SYNC
-+	IMFlush(conn);
-+    #endif /* STATUS_SYNC */
- }
- 
- /*- preeditCaret: do actual preedit caret -*/
diff --git a/app-i18n/kinput2/files/kinput2-wnn.patch b/app-i18n/kinput2/files/kinput2-wnn.patch
deleted file mode 100644
index 4e7001938fb2..000000000000
--- a/app-i18n/kinput2/files/kinput2-wnn.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- a/lib/cconv.c
-+++ b/lib/cconv.c
-@@ -790,7 +790,7 @@
- static int parseLine(uchar *, uchar **, int);
- static FILE *openfile(char *);
- static int doinclude(uchar *, Files *, void (*)());
--static uchar *getline(uchar *, int, Files *, void (*)());
-+static uchar *getLine(uchar *, int, Files *, void (*)());
- static int readRuleFile(ccRule, char *);
- static int registMode(ccRule, int, uchar **);
- static int newMode(ccRule, Files *, _strbufRec *, _funcbufRec *,
-@@ -1035,8 +1035,8 @@
- 	return 0;
- }
- 
--/* getline -- 1$B9TFI$_9~$`(B ($B$=$N:](B include $B$N=hM}$r9T$J$&(B) */
--static uchar *getline(line, linesize, files, efunc)
-+/* getLine -- 1$B9TFI$_9~$`(B ($B$=$N:](B include $B$N=hM}$r9T$J$&(B) */
-+static uchar *getLine(line, linesize, files, efunc)
- uchar *line;
- int linesize;
- Files *files;
-@@ -1100,7 +1100,7 @@
- 	rule->nmode = 0;
- 	rule->initialmode = -1;
- 
--	while (getline(line, sizeof(line), &files, efunc)) {
-+	while (getLine(line, sizeof(line), &files, efunc)) {
- 		(void)Strcpy(tmp, line);
- 		if ((argc = parseLine(tmp, argv, 20)) == 0)
- 			continue;
-@@ -1269,7 +1269,7 @@
- 	cdbuf.cdbuf = NULL;
- 
- 	/* $B%k!<%k$rFI$s$G%9%H%"$9$k(B */
--	while (getline(line, sizeof(line), files, efunc)) {
-+	while (getLine(line, sizeof(line), files, efunc)) {
- 		/* '#' $B$G;O$^$k9T$O%3%a%s%H(B */
- 		if (*line == '\0' || *line == '\n' || *line == '#')
- 			continue;
---- a/lib/wnnlib.c
-+++ b/lib/wnnlib.c
-@@ -1367,7 +1367,7 @@
- 
- 	/* $BJQ49J8;zNs$ND9$5$N%A%'%C%/(B */
- 	clp = buf->clauseInfo + cl;
--	len = jl_kanji_len(buf->wnn, cl);
-+	len = jl_kanji_len(buf->wnn, cl, -1);
- 	diff = len - ((clp + 1)->dispp - clp->dispp);
- 	newlen = (buf->displayEnd - buf->displayBuf) + diff;
- 	if (newlen > buf->bufferSize) {
diff --git a/app-i18n/kinput2/files/xinput-kinput2 b/app-i18n/kinput2/files/xinput-kinput2
deleted file mode 100644
index dcb3b63330ac..000000000000
--- a/app-i18n/kinput2/files/xinput-kinput2
+++ /dev/null
@@ -1,5 +0,0 @@
-XIM=kinput2
-XIM_PROGRAM="@EPREFIX@/usr/bin/kinput2"
-XIM_ARGS="-@SERVER@ +kinput -xim"
-GTK_IM_MODULE=xim
-QT_IM_MODULE=xim