reinit the tree, so we can have metadata

10 files changed, 446 insertions, 0 deletions

diff --git a/app-i18n/kinput2/Manifest b/app-i18n/kinput2/Manifest
new file mode 100644
index 000000000000..9944c6960255
--- /dev/null
+++ b/app-i18n/kinput2/Manifest
@@ -0,0 +1,12 @@
+AUX kinput2-gentoo.patch 2900 SHA256 93fb4f1e9501de306b40cb9d9c5d878ad903b6c0c09669496643e2f2730807ca SHA512 22c38c2b344b18f545501e5e351f0952d2b317d05e87ba0630a9fba235e5111e3e269c42388a7495153f6a36a0277798039a35c1968889697b8e97e4e4e5bd4e WHIRLPOOL 13f3f23a52ba4452b4b3999e564d3a240d7150fa6c42a7e595bb7c4672b65010ee9e7d1b61db390b042f22965346ca895f153d35ac0f3000acbb3cfe141a5b69
+AUX kinput2-headers.patch 2090 SHA256 c3d2fde3a375b1968c1aee4047bdc12929454f8ec2a612e727c1b7a3d41695e5 SHA512 5f4839155d7d11784716c4c786b09184b04d68deaebd99fa2f446258017a893ad52e23f3df91a8827bfc8d4c238494ffdef9135c0959e7a2377947b96e5b4f7c WHIRLPOOL 16538cae395a4cabdb03f05c08cae98db55ccfff1aa34fe765019f07fba66d1dc7071c10ef691264a86e030d68cce1db85db295045aae662e6e0f44cf5955bc9
+AUX kinput2-ppc.patch 181 SHA256 4e0d6519545f5b9b2a607f33b17eb2d3519b8677c1bbb0645fa97c7ff8972100 SHA512 e5b5e851792668a8f4f15e45dcbf24336310f36c2be5a565dfffd25b58fadef04b92124fc2955342ed05ab467e8bff8fbf9d561a3553d7059155007df877dcde WHIRLPOOL 4a5b0089ef249c18330465e094ad243610c2bd3d87a04613ac096b10e7212e5ae277fbe363b868051710c12da7732b98a4b14404809a2eddb0473b5700df411d
+AUX kinput2-segfault.patch 240 SHA256 b25da7de97f07631764be5a5da4e3ffb6a8220505feb22b42439b0a604b94a43 SHA512 c3441925e867edcc5060e79e0f999c0cfe60930d87ad8d51cb4120253dd9ab6ccfac7de0c04e3d7043100026bc67962bba81a507b037901c115a7559916eb1c5 WHIRLPOOL 4e750025fa9c1f1d26c0f4e081ddb9f693de7ca66f4ea36bda28a26bc0b82da1f165a504900ac3320139ad897025e858f5a7b7f775957bfedb3a16890eb08ec4
+AUX kinput2-wnn.patch 1726 SHA256 6d2baf5cbc36226369c74be52dee8ffafdfd4f5529233704291668119f54724c SHA512 a8ea7756ca893b0bdd7d491c8e2a4187c5d34b084c567449597b8fa1d9fb9ae4437bedba9d771a7b88a3e621573ce6650243dfa5ff396bebb653cbf4b6f5712b WHIRLPOOL 5b3e78168445200e7fd3f8914084c24941d29f71943837b2cac85d840f250e548261a7baa9186dc5505d4438545287b127d1146c348b35ecb9adbb9d99b77973
+AUX xinput-kinput2 121 SHA256 7ca2277ec979ef93b6d3d5b93530592e5e035fea45bacbda559523770cf98a51 SHA512 09aaae3bebb062db82e8440977f58b9324e53262c6a9c95a276d305e87a2f9c0f9775077bd05c6ea069cceb6e45cb4efc4a6c412da7501b2b01825bc26799ec5 WHIRLPOOL 1e0cb1663d92e1484de3b547f8b95ae6f8c243f773e319c7645decb67e0780fda168915b70d67640d4734b146d7c9f3d148a550d6f9487a690bbee43c4e8f550
+DIST kinput2-v3.1.tar.gz 512177 SHA256 2815c35181f9e9b866fb6e7f3d9bb8814b98312aad703ce5c7560d449eb60a9a SHA512 5950f7294fa2bf915e6591290a3deb2c95f27706f3a180a084d14fbc008f3cf363b155b29c8103a8b999e44ae98182ff35bcfda85725b2c565f3e37f54788731 WHIRLPOOL 620c7d619c9f2c9ba0b51b6a544f59be357598687d79888da30ff75ff9a85288cff08d208764d2918852f0233e6dabf26ad37bfa5a5db3b225fae8a0c72b9add
+EBUILD kinput2-3.1-r1.ebuild 1405 SHA256 61b0108f7b1f05f58c23140a77e7c51d68d0276c689a7b71e66a839680be9871 SHA512 5707754a89ed1f48c287ccfcdb9694b159211c9c62f4b31cab3dd1d7d8c17fd8e2bbb8d7f6a9325c9edff8734cb418fd61622e1b46769a1a7db13fdccc364854 WHIRLPOOL 5d71d1d04ada8aa32101f475942047669ae28484beda4c2886e82aa128009cfe3938fa4490a8887cfeaaf4da9103cfc2dc52d67c0d8c958836560a827c4ce23d
+EBUILD kinput2-3.1-r2.ebuild 1605 SHA256 bbca64f528a0dfce25acca3fda280b37d59df66843b2f3dbbf02b31d820a28f1 SHA512 fdd20973f2b6d6023688f69711079a7e12e03629f1e187df40631bd4bfdc79a4a70f07866dd398bb4a6643476baab2b0acfa813d2d1711e156f0246590c33194 WHIRLPOOL 577a1b8469e0fed4aff7d83253d4717c9f4049cfbed47a8b0131cbc95700f968b94db397c625685ef6a3a315e58686ffe005a7ecf3e8dee6b6d678997e479226
+MISC ChangeLog 2543 SHA256 f4acc6c72f1e2a08c6845c05d8346a17f79c872e1a9837698d890983486f3c7b SHA512 5e08a303b183fa4c61d9a8e51efaed87936385d66070d314781afdfad697930d4168bdc872735ae4d57036f78b318cc7e16e87cafc51e46afdb4d2db562ed3f0 WHIRLPOOL 5d1490d54350b6b451ca61e2c70d97f4939c3c343485a7225a11105233593ae643fcc5ed8e4edeeb2975833fe305d5c45e33c2cc2cd02539fd5819a435357766
+MISC ChangeLog-2015 3448 SHA256 d0a9f4d4b3f2bda23aa2f62eaa391c6152e8f934914fd0498c757be19ae67e9d SHA512 44ff2470092f196683b84dff24a138dfa74db3956f168485e11423e623cf71f94680d36f2af14e41b7ce90e08e04520d9e10847c78098944d4bf13438cb8be4c WHIRLPOOL 16ee52cf8cad2248494685ca9e16be4cf1e96d874948076ba09807b1da5cd7f87c8ca065b00650e0a509177c3eb41755ddcc96f00e32733a87b3aa1aca6fdf61
+MISC metadata.xml 240 SHA256 4351b96b5a18595fae67161f1207f22bbf99e9a2235b95b68975cfc9f5baff54 SHA512 12aaa73d9b690de68a5c7b20e214ceb099efa87884b784eafd994f26032b44dcb66e7feac8a5b1df7f349ac05c5a198a7593dff2cc686de158cb21e4c54f38dd WHIRLPOOL d279940dd88c4b1caa478907576d5732c8376e3f99830950c6c18c63dca78c7d0ec1983660e5cbd4da0133b961ef38dc8460650cb48467298542e04005cffc2c
diff --git a/app-i18n/kinput2/files/kinput2-gentoo.patch b/app-i18n/kinput2/files/kinput2-gentoo.patch
new file mode 100644
index 000000000000..2c22723b3851
--- /dev/null
+++ b/app-i18n/kinput2/files/kinput2-gentoo.patch
@@ -0,0 +1,99 @@
+--- 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
new file mode 100644
index 000000000000..0075f710e9b6
--- /dev/null
+++ b/app-i18n/kinput2/files/kinput2-headers.patch
@@ -0,0 +1,101 @@
+--- 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
new file mode 100644
index 000000000000..897b154eb5ac
--- /dev/null
+++ b/app-i18n/kinput2/files/kinput2-ppc.patch
@@ -0,0 +1,11 @@
+--- 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
new file mode 100644
index 000000000000..9b3a83163b4f
--- /dev/null
+++ b/app-i18n/kinput2/files/kinput2-segfault.patch
@@ -0,0 +1,12 @@
+--- 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
new file mode 100644
index 000000000000..4e7001938fb2
--- /dev/null
+++ b/app-i18n/kinput2/files/kinput2-wnn.patch
@@ -0,0 +1,51 @@
+--- 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
new file mode 100644
index 000000000000..dcb3b63330ac
--- /dev/null
+++ b/app-i18n/kinput2/files/xinput-kinput2
@@ -0,0 +1,5 @@
+XIM=kinput2
+XIM_PROGRAM="@EPREFIX@/usr/bin/kinput2"
+XIM_ARGS="-@SERVER@ +kinput -xim"
+GTK_IM_MODULE=xim
+QT_IM_MODULE=xim
diff --git a/app-i18n/kinput2/kinput2-3.1-r1.ebuild b/app-i18n/kinput2/kinput2-3.1-r1.ebuild
new file mode 100644
index 000000000000..d18b1cdc75d1
--- /dev/null
+++ b/app-i18n/kinput2/kinput2-3.1-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit toolchain-funcs
+
+MY_P="${PN}-v${PV}"
+
+DESCRIPTION="A Japanese input server which supports the XIM protocol"
+HOMEPAGE="http://www.nec.co.jp/canna"
+SRC_URI="ftp://ftp.sra.co.jp/pub/x11/${PN}/${MY_P}.tar.gz"
+
+LICENSE="HPND"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
+IUSE="freewnn"
+
+RDEPEND="x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXaw
+	x11-libs/libXext
+	x11-libs/libXmu
+	x11-libs/libXpm
+	x11-libs/libXt
+	!freewnn? ( app-i18n/canna )
+	freewnn? ( app-i18n/freewnn )"
+DEPEND="${RDEPEND}
+	x11-misc/gccmakedep
+	x11-misc/imake"
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-gentoo.patch
+	"${FILESDIR}"/${PN}-headers.patch
+	"${FILESDIR}"/${PN}-ppc.patch
+	"${FILESDIR}"/${PN}-segfault.patch
+	"${FILESDIR}"/${PN}-wnn.patch
+)
+DOCS=( README NEWS doc/. )
+
+src_prepare() {
+	default
+
+	sed -i "s|^/\* \(#define Use$(usex freewnn Wnn Canna)\) \*/|\1|" ${PN^k}.conf
+}
+
+src_configure() {
+	xmkmf -a || die
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		CDEBUGFLAGS="${CFLAGS}" \
+		LOCAL_LDFLAGS="${LDFLAGS}" \
+		XAPPLOADDIR="${EPREFIX}/usr/share/X11/app-defaults"
+}
+
+src_install() {
+	emake \
+		XAPPLOADDIR="${EPREFIX}/usr/share/X11/app-defaults" \
+		DESTDIR="${D}" \
+		install
+	einstalldocs
+	newman cmd/${PN}.man ${PN}.1
+
+	rm -rf "${ED}"/usr/$(get_libdir)/X11
+}
diff --git a/app-i18n/kinput2/kinput2-3.1-r2.ebuild b/app-i18n/kinput2/kinput2-3.1-r2.ebuild
new file mode 100644
index 000000000000..864011015526
--- /dev/null
+++ b/app-i18n/kinput2/kinput2-3.1-r2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit toolchain-funcs
+
+MY_P="${PN}-v${PV}"
+
+DESCRIPTION="A Japanese input server which supports the XIM protocol"
+HOMEPAGE="http://www.nec.co.jp/canna"
+SRC_URI="ftp://ftp.sra.co.jp/pub/x11/${PN}/${MY_P}.tar.gz"
+
+LICENSE="HPND"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86"
+IUSE="freewnn"
+
+RDEPEND="x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXaw
+	x11-libs/libXext
+	x11-libs/libXmu
+	x11-libs/libXpm
+	x11-libs/libXt
+	!freewnn? ( app-i18n/canna )
+	freewnn? ( app-i18n/freewnn )"
+DEPEND="${RDEPEND}
+	x11-misc/gccmakedep
+	x11-misc/imake"
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-gentoo.patch
+	"${FILESDIR}"/${PN}-headers.patch
+	"${FILESDIR}"/${PN}-ppc.patch
+	"${FILESDIR}"/${PN}-segfault.patch
+	"${FILESDIR}"/${PN}-wnn.patch
+)
+DOCS=( README NEWS doc/. )
+
+src_prepare() {
+	default
+
+	sed -i "s|^/\* \(#define Use$(usex freewnn Wnn Canna)\) \*/|\1|" ${PN^k}.conf
+}
+
+src_configure() {
+	xmkmf -a || die
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		CDEBUGFLAGS="${CFLAGS}" \
+		LOCAL_LDFLAGS="${LDFLAGS}" \
+		XAPPLOADDIR="${EPREFIX}/usr/share/X11/app-defaults"
+}
+
+src_install() {
+	emake \
+		XAPPLOADDIR="${EPREFIX}/usr/share/X11/app-defaults" \
+		DESTDIR="${D}" \
+		install
+	einstalldocs
+	newman cmd/${PN}.man ${PN}.1
+
+	rm -rf "${ED}"/usr/$(get_libdir)/X11
+
+	insinto /etc/X11/xinit/xinput.d
+	sed \
+		-e "s:@EPREFIX@:${EPREFIX}:g" \
+		-e "s:@SERVER@:$(usex freewnn wnn canna):g" \
+		"${FILESDIR}"/xinput-${PN} > "${T}"/${PN}.conf
+	doins "${T}"/${PN}.conf
+}
diff --git a/app-i18n/kinput2/metadata.xml b/app-i18n/kinput2/metadata.xml
new file mode 100644
index 000000000000..e1a49f498885
--- /dev/null
+++ b/app-i18n/kinput2/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
+</pkgmetadata>