5 files changed, 39 insertions, 37 deletions
diff --git a/app-i18n/kinput2/files/kinput2-3.1-r1-gentoo.diff b/app-i18n/kinput2/files/kinput2-gentoo.patch
index d4c03d527c4d..2c22723b3851 100644
--- a/app-i18n/kinput2/files/kinput2-3.1-r1-gentoo.diff
+++ b/app-i18n/kinput2/files/kinput2-gentoo.patch
@@ -1,6 +1,5 @@
-diff -Naur kinput2-v3.1.orig/Kinput2.conf kinput2-v3.1/Kinput2.conf
---- kinput2-v3.1.orig/Kinput2.conf	2002-10-03 18:35:26.000000000 +0900
-+++ kinput2-v3.1/Kinput2.conf	2003-08-13 15:51:21.000000000 +0900
+--- a/Kinput2.conf
++++ b/Kinput2.conf
 @@ -17,8 +17,8 @@
  
  /* #define UseWnn */	/* define if you are going to use Wnn (v4, v6 or v7) */
@@ -17,7 +16,7 @@ diff -Naur kinput2-v3.1.orig/Kinput2.conf kinput2-v3.1/Kinput2.conf
   * are not installed in /usr/local/lib/wnn (which is the default).
   */
 -/* #define WnnLibDir /some/peculiar/directory/wnn */
-+#define WnnLibDir /usr/lib/wnn 
++#define WnnLibDir $(EPREFIX)/usr/lib/wnn 
  
  /* for convenience.. */
  #if defined(UseWnn6) && !defined(UseWnn)
@@ -26,7 +25,7 @@ diff -Naur kinput2-v3.1.orig/Kinput2.conf kinput2-v3.1/Kinput2.conf
   */
  XCOMM use installed header files
 -XCOMM WNNINCDIR = /usr/X11R6/include/wnn
-+WNNINCDIR = /usr/include/wnn
++WNNINCDIR = $(EPREFIX)/usr/include/wnn
  XCOMM use installed library
 -XCOMM WNNLIB = -lwnn
 +WNNLIB = -lwnn
@@ -51,7 +50,7 @@ diff -Naur kinput2-v3.1.orig/Kinput2.conf kinput2-v3.1/Kinput2.conf
 -XCOMM CANNAINSTDIR = /usr/local/canna
 -XCOMM CANNASRC = $(CANNAINSTDIR)/include
 -XCOMM CANNALIB = -lcanna16
-+CANNAINSTDIR = /usr
++CANNAINSTDIR = $(EPREFIX)/usr
 +CANNASRC = $(CANNAINSTDIR)/include
 +CANNALIB = -lcanna16
  
@@ -98,28 +97,3 @@ diff -Naur kinput2-v3.1.orig/Kinput2.conf kinput2-v3.1/Kinput2.conf
  
  
  /**
-diff -Naur kinput2-v3.1.orig/cmd/kinput2.c kinput2-v3.1/cmd/kinput2.c
---- kinput2-v3.1.orig/cmd/kinput2.c	2002-10-03 18:35:26.000000000 +0900
-+++ kinput2-v3.1/cmd/kinput2.c	2003-08-13 15:51:21.000000000 +0900
-@@ -644,3 +644,8 @@
-     return n;
- }
- #endif
-+
-+#if defined(linux) && defined(PPC)
-+/* avoid nusty gcc bug */
-+void _XtInherit() {}
-+#endif
-diff -Naur kinput2-v3.1.orig/lib/imlib/imconv.c kinput2-v3.1/lib/imlib/imconv.c
---- kinput2-v3.1.orig/lib/imlib/imconv.c	2002-10-03 18:35:30.000000000 +0900
-+++ kinput2-v3.1/lib/imlib/imconv.c	2003-08-13 15:55:54.000000000 +0900
-@@ -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-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/kinput2-3.1-r1.ebuild b/app-i18n/kinput2/kinput2-3.1-r1.ebuild
index 7badd093e352..7d264fb834e1 100644
--- a/app-i18n/kinput2/kinput2-3.1-r1.ebuild
+++ b/app-i18n/kinput2/kinput2-3.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 inherit eutils
@@ -32,12 +32,15 @@ src_unpack() {
 	local mysed=""
 
 	unpack ${A}
-	epatch "${FILESDIR}/${PF}-gentoo.diff"
+	cd "${S}"
+	epatch "${FILESDIR}/${PN}-gentoo.patch"
+	epatch "${FILESDIR}/${PN}-ppc.patch"
+	epatch "${FILESDIR}/${PN}-segfault.patch"
 
 	if use freewnn; then
-		sed -i -e '/\/\* #define UseWnn/s:^:#define UseWnn\n:' "${S}/Kinput2.conf"
+		sed -i -e '/\/\* #define UseWnn/s:^:#define UseWnn\n:' Kinput2.conf
 	else
-		sed -i -e '/\/\* #define UseCanna/s:^:#define UseCanna\n:' "${S}/Kinput2.conf"
+		sed -i -e '/\/\* #define UseCanna/s:^:#define UseCanna\n:' Kinput2.conf
 	fi
 }
 
diff --git a/app-i18n/kinput2/kinput2-3.1-r2.ebuild b/app-i18n/kinput2/kinput2-3.1-r2.ebuild
index ccdfc9770d1e..d04128071894 100644
--- a/app-i18n/kinput2/kinput2-3.1-r2.ebuild
+++ b/app-i18n/kinput2/kinput2-3.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="3"
@@ -30,7 +30,9 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
-	epatch "${FILESDIR}/${P}-r1-gentoo.diff"
+	epatch "${FILESDIR}/${PN}-gentoo.patch"
+	epatch "${FILESDIR}/${PN}-ppc.patch"
+	epatch "${FILESDIR}/${PN}-segfault.patch"
 
 	if use freewnn; then
 		sed -i -e '/\/\* #define UseWnn/s:^:#define UseWnn\n:' Kinput2.conf || die