summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Seifert <soap@gentoo.org>2021-06-20 15:40:58 +0200
committerDavid Seifert <soap@gentoo.org>2021-06-20 15:40:58 +0200
commitd83fbe3b01bfdfc99782c562611a31b2dc24650f (patch)
tree2d530371e0a3101b2cbf44bdbdaf55bcd46d5498 /app-i18n/kinput2
parentnet-libs/libgfbgraph: Keyword 0.2.4 arm, #794955 (diff)
downloadgentoo-d83fbe3b01bfdfc99782c562611a31b2dc24650f.tar.gz
gentoo-d83fbe3b01bfdfc99782c562611a31b2dc24650f.tar.bz2
gentoo-d83fbe3b01bfdfc99782c562611a31b2dc24650f.zip
app-i18n/kinput2: Remove USE="canna"
Signed-off-by: David Seifert <soap@gentoo.org>
Diffstat (limited to 'app-i18n/kinput2')
-rw-r--r--app-i18n/kinput2/kinput2-3.1-r3.ebuild (renamed from app-i18n/kinput2/kinput2-3.1-r2.ebuild)28
1 files changed, 14 insertions, 14 deletions
diff --git a/app-i18n/kinput2/kinput2-3.1-r2.ebuild b/app-i18n/kinput2/kinput2-3.1-r3.ebuild
index 2354479f0fd5..98694463da46 100644
--- a/app-i18n/kinput2/kinput2-3.1-r2.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="6"
+EAPI=7
inherit toolchain-funcs
@@ -10,26 +10,26 @@ 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="freewnn"
-RDEPEND="x11-libs/libICE
+RDEPEND="
+ app-i18n/freewnn
+ 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-libs/libXt"
+DEPEND="${RDEPEND}"
+BDEPEND="
x11-misc/gccmakedep
>=x11-misc/imake-1.0.8-r1"
-S="${WORKDIR}/${MY_P}"
PATCHES=(
"${FILESDIR}"/${PN}-gentoo.patch
@@ -38,12 +38,10 @@ PATCHES=(
"${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
+ sed -i "s|^/\* \(#define UseWnn\) \*/|\1|" ${PN^k}.conf || die
}
src_configure() {
@@ -66,15 +64,17 @@ 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
+ rm -rf "${ED}"/usr/$(get_libdir)/X11 || die
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
+ -e "s:@SERVER@:wnn:g" \
+ "${FILESDIR}"/xinput-${PN} > "${T}"/${PN}.conf || die
doins "${T}"/${PN}.conf
}