From 04b851f1d74d82a6f518c410c7b42511864cc77a Mon Sep 17 00:00:00 2001
From: Akinori Hattori <hattya@gentoo.org>
Date: Thu, 18 Nov 2021 21:55:23 +0900
Subject: app-i18n/kinput2: update to EAPI 8

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Akinori Hattori <hattya@gentoo.org>
---
 app-i18n/kinput2/kinput2-3.1-r3.ebuild | 21 +++++++++------------
 app-i18n/kinput2/metadata.xml          |  8 ++++----
 2 files changed, 13 insertions(+), 16 deletions(-)

(limited to 'app-i18n/kinput2')

diff --git a/app-i18n/kinput2/kinput2-3.1-r3.ebuild b/app-i18n/kinput2/kinput2-3.1-r3.ebuild
index 98694463da46..87035d98354a 100644
--- a/app-i18n/kinput2/kinput2-3.1-r3.ebuild
+++ b/app-i18n/kinput2/kinput2-3.1-r3.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI="8"
 
 inherit toolchain-funcs
 
@@ -10,14 +10,13 @@ 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"
-S="${WORKDIR}/${MY_P}"
 
 LICENSE="HPND"
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 sparc x86"
+IUSE=""
 
-RDEPEND="
-	app-i18n/freewnn
+RDEPEND="app-i18n/freewnn
 	x11-libs/libICE
 	x11-libs/libSM
 	x11-libs/libX11
@@ -27,9 +26,9 @@ RDEPEND="
 	x11-libs/libXpm
 	x11-libs/libXt"
 DEPEND="${RDEPEND}"
-BDEPEND="
-	x11-misc/gccmakedep
+BDEPEND="x11-misc/gccmakedep
 	>=x11-misc/imake-1.0.8-r1"
+S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-gentoo.patch
@@ -38,6 +37,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-segfault.patch
 	"${FILESDIR}"/${PN}-wnn.patch
 )
+DOCS=( README NEWS doc/. )
 
 src_prepare() {
 	default
@@ -45,8 +45,7 @@ src_prepare() {
 }
 
 src_configure() {
-	CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
-		IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf -a || die
+	CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf -a || die
 }
 
 src_compile() {
@@ -64,17 +63,15 @@ src_install() {
 		XAPPLOADDIR="${EPREFIX}/usr/share/X11/app-defaults" \
 		DESTDIR="${D}" \
 		install
-
 	einstalldocs
-	dodoc -r doc/.
 	newman cmd/${PN}.man ${PN}.1
 
-	rm -rf "${ED}"/usr/$(get_libdir)/X11 || die
+	rm -rf "${ED}"/usr/$(get_libdir)/X11
 
 	insinto /etc/X11/xinit/xinput.d
 	sed \
 		-e "s:@EPREFIX@:${EPREFIX}:g" \
 		-e "s:@SERVER@:wnn:g" \
-		"${FILESDIR}"/xinput-${PN} > "${T}"/${PN}.conf || die
+		"${FILESDIR}"/xinput-${PN} >"${T}"/${PN}.conf || die
 	doins "${T}"/${PN}.conf
 }
diff --git a/app-i18n/kinput2/metadata.xml b/app-i18n/kinput2/metadata.xml
index 491c88b3a31f..a94766977fa6 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 "https://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>
-- 
cgit v1.2.3-65-gdbad