public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/kinput2/, app-i18n/kinput2/files/
@ 2017-07-18 15:32 Akinori Hattori
  0 siblings, 0 replies; 3+ messages in thread
From: Akinori Hattori @ 2017-07-18 15:32 UTC (permalink / raw
  To: gentoo-commits

commit:     9647a5ca1f865b4b5f9332be9d248a64786681ed
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 18 15:24:28 2017 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Tue Jul 18 15:24:28 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9647a5ca

app-i18n/kinput2: fix build with app-i18n/freewnn

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 app-i18n/kinput2/files/kinput2-wnn.patch | 51 ++++++++++++++++++++++++++++++++
 app-i18n/kinput2/kinput2-3.1-r1.ebuild   |  1 +
 app-i18n/kinput2/kinput2-3.1-r2.ebuild   |  1 +
 3 files changed, 53 insertions(+)

diff --git a/app-i18n/kinput2/files/kinput2-wnn.patch b/app-i18n/kinput2/files/kinput2-wnn.patch
new file mode 100644
index 00000000000..4e7001938fb
--- /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/kinput2-3.1-r1.ebuild b/app-i18n/kinput2/kinput2-3.1-r1.ebuild
index caf4b59765b..d18b1cdc75d 100644
--- a/app-i18n/kinput2/kinput2-3.1-r1.ebuild
+++ b/app-i18n/kinput2/kinput2-3.1-r1.ebuild
@@ -36,6 +36,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-headers.patch
 	"${FILESDIR}"/${PN}-ppc.patch
 	"${FILESDIR}"/${PN}-segfault.patch
+	"${FILESDIR}"/${PN}-wnn.patch
 )
 DOCS=( README NEWS doc/. )
 

diff --git a/app-i18n/kinput2/kinput2-3.1-r2.ebuild b/app-i18n/kinput2/kinput2-3.1-r2.ebuild
index 0f1fc47b2a4..86401101552 100644
--- a/app-i18n/kinput2/kinput2-3.1-r2.ebuild
+++ b/app-i18n/kinput2/kinput2-3.1-r2.ebuild
@@ -36,6 +36,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-headers.patch
 	"${FILESDIR}"/${PN}-ppc.patch
 	"${FILESDIR}"/${PN}-segfault.patch
+	"${FILESDIR}"/${PN}-wnn.patch
 )
 DOCS=( README NEWS doc/. )
 


^ permalink raw reply related	[flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/kinput2/, app-i18n/kinput2/files/
@ 2017-07-18 15:32 Akinori Hattori
  0 siblings, 0 replies; 3+ messages in thread
From: Akinori Hattori @ 2017-07-18 15:32 UTC (permalink / raw
  To: gentoo-commits

commit:     80f2fd6ce99506458d02421a9b9be4cd216116c0
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 18 15:00:19 2017 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Tue Jul 18 15:00:19 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80f2fd6c

app-i18n/kinput2: update patches

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 ...ut2-3.1-r1-gentoo.diff => kinput2-gentoo.patch} | 36 +++-------------------
 app-i18n/kinput2/files/kinput2-ppc.patch           | 11 +++++++
 app-i18n/kinput2/files/kinput2-segfault.patch      | 12 ++++++++
 app-i18n/kinput2/kinput2-3.1-r1.ebuild             | 11 ++++---
 app-i18n/kinput2/kinput2-3.1-r2.ebuild             |  6 ++--
 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
similarity index 72%
rename from app-i18n/kinput2/files/kinput2-3.1-r1-gentoo.diff
rename to app-i18n/kinput2/files/kinput2-gentoo.patch
index d4c03d527c4..2c22723b385 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 00000000000..897b154eb5a
--- /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 00000000000..9b3a83163b4
--- /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 7badd093e35..7d264fb834e 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 ccdfc9770d1..d0412807189 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


^ permalink raw reply related	[flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-i18n/kinput2/, app-i18n/kinput2/files/
@ 2017-07-18 15:32 Akinori Hattori
  0 siblings, 0 replies; 3+ messages in thread
From: Akinori Hattori @ 2017-07-18 15:32 UTC (permalink / raw
  To: gentoo-commits

commit:     1258c9e3376bc4e2c4d82cf047312892157c2233
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 18 15:18:57 2017 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Tue Jul 18 15:18:57 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1258c9e3

app-i18n/kinput2: update to EAPI 6

Gentoo-Bug: 621946

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 app-i18n/kinput2/files/xinput-kinput2  |  2 +-
 app-i18n/kinput2/kinput2-3.1-r1.ebuild | 66 +++++++++++++++++---------------
 app-i18n/kinput2/kinput2-3.1-r2.ebuild | 69 +++++++++++++++++-----------------
 app-i18n/kinput2/metadata.xml          |  8 ++--
 4 files changed, 75 insertions(+), 70 deletions(-)

diff --git a/app-i18n/kinput2/files/xinput-kinput2 b/app-i18n/kinput2/files/xinput-kinput2
index 16de07ca4f7..dcb3b63330a 100644
--- a/app-i18n/kinput2/files/xinput-kinput2
+++ b/app-i18n/kinput2/files/xinput-kinput2
@@ -1,5 +1,5 @@
 XIM=kinput2
-XIM_PROGRAM=@EPREFIX@/usr/bin/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
index 7d264fb834e..5e3579baa0d 100644
--- a/app-i18n/kinput2/kinput2-3.1-r1.ebuild
+++ b/app-i18n/kinput2/kinput2-3.1-r1.ebuild
@@ -1,62 +1,68 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-inherit eutils
+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/"
+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="x86 ppc sparc amd64 ppc64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE="freewnn"
 
-RDEPEND="freewnn? ( >=app-i18n/freewnn-1.1.1_alpha19 )
-	!freewnn? ( >=app-i18n/canna-3.5_beta2-r1 )
+RDEPEND="x11-libs/libICE
+	x11-libs/libSM
 	x11-libs/libX11
 	x11-libs/libXaw
+	x11-libs/libXext
 	x11-libs/libXmu
-	x11-libs/libXp
-	x11-libs/libXt"
-
+	x11-libs/libXpm
+	x11-libs/libXt
+	!freewnn? ( app-i18n/canna )
+	freewnn? ( app-i18n/freewnn )"
 DEPEND="${RDEPEND}
 	x11-misc/gccmakedep
-	x11-misc/imake
-	app-text/rman"
-
+	x11-misc/imake"
 S="${WORKDIR}/${MY_P}"
 
-src_unpack() {
-	local mysed=""
+PATCHES=(
+	"${FILESDIR}"/${PN}-gentoo.patch
+	"${FILESDIR}"/${PN}-ppc.patch
+	"${FILESDIR}"/${PN}-segfault.patch
+)
+DOCS=( README NEWS doc/. )
 
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${PN}-gentoo.patch"
-	epatch "${FILESDIR}/${PN}-ppc.patch"
-	epatch "${FILESDIR}/${PN}-segfault.patch"
+src_prepare() {
+	default
 
-	if use freewnn; then
-		sed -i -e '/\/\* #define UseWnn/s:^:#define UseWnn\n:' Kinput2.conf
-	else
-		sed -i -e '/\/\* #define UseCanna/s:^:#define UseCanna\n:' Kinput2.conf
-	fi
+	sed -i "s|^/\* \(#define Use$(usex freewnn Wnn Canna)\) \*/|\1|" ${PN^k}.conf
 }
 
-src_compile() {
+src_configure() {
 	xmkmf -a || die
+}
+
+src_compile() {
 	emake \
-		XAPPLOADDIR="/usr/share/X11/app-defaults/" \
+		CC="$(tc-getCC)" \
 		CDEBUGFLAGS="${CFLAGS}" \
 		LOCAL_LDFLAGS="${LDFLAGS}" \
-		|| die
+		XAPPLOADDIR="${EPREFIX}/usr/share/X11/app-defaults"
 }
 
 src_install() {
-	emake XAPPLOADDIR="/usr/share/X11/app-defaults/" DESTDIR="${D}" install || die
-	rm -rf "${D}/usr/lib/X11"
-
-	dodoc README NEWS doc/*
+	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
index d0412807189..724a233a91e 100644
--- a/app-i18n/kinput2/kinput2-3.1-r2.ebuild
+++ b/app-i18n/kinput2/kinput2-3.1-r2.ebuild
@@ -1,12 +1,14 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="3"
-inherit eutils
+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/"
+HOMEPAGE="http://www.nec.co.jp/canna"
 SRC_URI="ftp://ftp.sra.co.jp/pub/x11/${PN}/${MY_P}.tar.gz"
 
 LICENSE="HPND"
@@ -14,31 +16,32 @@ SLOT="0"
 KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86"
 IUSE="freewnn"
 
-RDEPEND="freewnn? ( >=app-i18n/freewnn-1.1.1_alpha19 )
-	!freewnn? ( >=app-i18n/canna-3.5_beta2-r1 )
+RDEPEND="x11-libs/libICE
+	x11-libs/libSM
 	x11-libs/libX11
 	x11-libs/libXaw
+	x11-libs/libXext
 	x11-libs/libXmu
-	x11-libs/libXp
-	x11-libs/libXt"
-
+	x11-libs/libXpm
+	x11-libs/libXt
+	!freewnn? ( app-i18n/canna )
+	freewnn? ( app-i18n/freewnn )"
 DEPEND="${RDEPEND}
 	x11-misc/gccmakedep
-	x11-misc/imake
-	app-text/rman"
-
+	x11-misc/imake"
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-gentoo.patch
+	"${FILESDIR}"/${PN}-ppc.patch
+	"${FILESDIR}"/${PN}-segfault.patch
+)
+DOCS=( README NEWS doc/. )
+
 src_prepare() {
-	epatch "${FILESDIR}/${PN}-gentoo.patch"
-	epatch "${FILESDIR}/${PN}-ppc.patch"
-	epatch "${FILESDIR}/${PN}-segfault.patch"
+	default
 
-	if use freewnn; then
-		sed -i -e '/\/\* #define UseWnn/s:^:#define UseWnn\n:' Kinput2.conf || die
-	else
-		sed -i -e '/\/\* #define UseCanna/s:^:#define UseCanna\n:' Kinput2.conf || die
-	fi
+	sed -i "s|^/\* \(#define Use$(usex freewnn Wnn Canna)\) \*/|\1|" ${PN^k}.conf
 }
 
 src_configure() {
@@ -47,30 +50,26 @@ src_configure() {
 
 src_compile() {
 	emake \
-		XAPPLOADDIR="${EPREFIX}/usr/share/X11/app-defaults/" \
+		CC="$(tc-getCC)" \
 		CDEBUGFLAGS="${CFLAGS}" \
 		LOCAL_LDFLAGS="${LDFLAGS}" \
-		|| die
+		XAPPLOADDIR="${EPREFIX}/usr/share/X11/app-defaults"
 }
 
 src_install() {
-	emake XAPPLOADDIR="/usr/share/X11/app-defaults/" DESTDIR="${D}" install || die
-	rm -rf "${ED}/usr/lib/X11" || die
+	emake \
+		XAPPLOADDIR="${EPREFIX}/usr/share/X11/app-defaults" \
+		DESTDIR="${D}" \
+		install
+	einstalldocs
+	newman cmd/${PN}.man ${PN}.1
 
-	local server
-	if use freewnn; then
-		server="wnn"
-	else
-		server="canna"
-	fi
+	rm -rf "${ED}"/usr/$(get_libdir)/X11
 
 	insinto /etc/X11/xinit/xinput.d
 	sed \
 		-e "s:@EPREFIX@:${EPREFIX}:g" \
-		-e "s:@SERVER@:${server}:g" \
-		"${FILESDIR}/xinput-kinput2" > "${T}/kinput2.conf" || die
-	doins "${T}/kinput2.conf" || die
-
-	dodoc README NEWS doc/* || die
-	newman cmd/${PN}.man ${PN}.1 || die
+		-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
index c921b96adf6..e1a49f49888 100644
--- a/app-i18n/kinput2/metadata.xml
+++ b/app-i18n/kinput2/metadata.xml
@@ -1,8 +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>
+  <maintainer type="project">
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-07-18 15:32 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-07-18 15:32 [gentoo-commits] repo/gentoo:master commit in: app-i18n/kinput2/, app-i18n/kinput2/files/ Akinori Hattori
  -- strict thread matches above, loose matches on Subject: below --
2017-07-18 15:32 Akinori Hattori
2017-07-18 15:32 Akinori Hattori

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox