commit: 290951188f0e3abd163d561860508bdacf982160
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 19 22:54:30 2021 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Jun 19 22:54:30 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29095118
app-i18n/canna: Port to EAPI 7
Signed-off-by: David Seifert <soap <AT> gentoo.org>
...nna-3.7_p3-r3.ebuild => canna-3.7_p3-r4.ebuild} | 58 +++++++++++-----------
1 file changed, 29 insertions(+), 29 deletions(-)
diff --git a/app-i18n/canna/canna-3.7_p3-r3.ebuild
b/app-i18n/canna/canna-3.7_p3-r4.ebuild
similarity index 74%
rename from app-i18n/canna/canna-3.7_p3-r3.ebuild
rename to app-i18n/canna/canna-3.7_p3-r4.ebuild
index 9540c471791..998ca0d1f7f 100644
--- a/app-i18n/canna/canna-3.7_p3-r3.ebuild
+++ b/app-i18n/canna/canna-3.7_p3-r4.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 autotools cannadic toolchain-funcs
@@ -10,17 +10,20 @@ MY_P="Canna${PV//[._]/}"
DESCRIPTION="A client-server based Kana-Kanji conversion system"
HOMEPAGE="http://canna.osdn.jp/";
SRC_URI="mirror://sourceforge.jp/${PN}/9565/${MY_P}.tar.bz2"
+S="${WORKDIR}/${MY_P}"
LICENSE="MIT GPL-2"
SLOT="0"
KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
IUSE="canuum doc ipv6"
-RDEPEND="canuum? (
+RDEPEND="
+ canuum? (
dev-libs/libspt
sys-libs/ncurses:=
)"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
x11-misc/gccmakedep
x11-misc/imake
canuum? ( virtual/pkgconfig )
@@ -29,7 +32,6 @@ DEPEND="${RDEPEND}
dev-texlive/texlive-langjapanese
dev-texlive/texlive-latexrecommended
)"
-S="${WORKDIR}/${MY_P}"
PATCHES=(
"${FILESDIR}"/${PN}-gentoo.patch
@@ -41,21 +43,18 @@ PATCHES=(
"${FILESDIR}"/${PN}-Wformat-security.patch
)
-DOCS="*CHANGES* ChangeLog INSTALL* README* RKCCONF* WHATIS*"
-
src_prepare() {
default
sed -i \
-e "/DefLibCannaDir/s:/lib$:/$(get_libdir):" \
-e "/UseInet6/s:0:$(usex ipv6 1 0):" \
- ${PN^c}.conf
+ ${PN^c}.conf || die
if use canuum; then
- cd canuum
- mv configure.{in,ac}
+ cd canuum || die
+ mv configure.{in,ac} || die
eautoreconf
- cd - > /dev/null
fi
}
@@ -63,17 +62,17 @@ src_configure() {
xmkmf -a || die
if use canuum; then
- cd canuum
+ pushd canuum >/dev/null || die
xmkmf -a || die
# workaround for sys-libs/ncurses[tinfo]
- sed -i "/^TERMCAP_LIB/s:=.*:=$($(tc-getPKG_CONFIG) --libs
ncurses):" Makefile
- cd - > /dev/null
+ sed -i "/^TERMCAP_LIB/s:=.*:=$($(tc-getPKG_CONFIG) --libs
ncurses):" Makefile || die
+ popd >/dev/null || die
fi
if use doc; then
- cd doc/man/guide/tex
+ pushd doc/man/guide/tex >/dev/null || die
xmkmf -a || die
- cd - > /dev/null
+ popd >/dev/null || die
fi
}
@@ -84,7 +83,7 @@ src_compile() {
CDEBUGFLAGS="${CFLAGS}" \
LOCAL_LDFLAGS="${LDFLAGS}" \
SHLIBGLOBALSFLAGS="${LDFLAGS}" \
- ${PN}
+ canna
if use canuum; then
einfo "Compiling canuum"
@@ -103,14 +102,15 @@ src_compile() {
JLATEXCMD="platex -kanji=euc" \
DVI2PSCMD="dvips" \
VARTEXFONTS="${T}"/fonts \
- ${PN}.ps \
- ${PN}.pdf
+ canna.ps \
+ canna.pdf
fi
}
src_install() {
emake DESTDIR="${D}" install install.man
einstalldocs
+ dodoc *CHANGES* INSTALL* RKCCONF* WHATIS*
if use canuum; then
emake -C canuum DESTDIR="${D}" install install.man
@@ -120,26 +120,26 @@ src_install() {
if use doc; then
insinto /usr/share/doc/${PF}
- doins doc/man/guide/tex/${PN}.{dvi,ps,pdf}
+ doins doc/man/guide/tex/canna.{dvi,ps,pdf}
fi
# for backward compatibility
dosbin "${FILESDIR}"/update-canna-dics_dir
- keepdir /var/lib/${PN}/dic/{user,group}
- fowners bin:bin /var/lib/${PN}/dic/{user,group}
- fperms 0775 /var/lib/${PN}/dic/{user,group}
+ keepdir /var/lib/canna/dic/{user,group}
+ fowners bin:bin /var/lib/canna/dic/{user,group}
+ fperms 0775 /var/lib/canna/dic/{user,group}
- insinto /var/lib/${PN}/dic/dics.d
- newins "${ED}"/var/lib/${PN}/dic/${PN}/dics.dir 00${PN}.dics.dir
+ insinto /var/lib/canna/dic/dics.d
+ newins "${ED}"/var/lib/canna/dic/canna/dics.dir 00canna.dics.dir
- keepdir /var/log/${PN}
+ keepdir /var/log/canna
- newconfd "${FILESDIR}"/${PN}.confd ${PN}
- newinitd "${FILESDIR}"/${PN}.initd ${PN}
+ newconfd "${FILESDIR}"/canna.confd canna
+ newinitd "${FILESDIR}"/canna.initd canna
insinto /etc
- newins "${FILESDIR}"/${PN}.hosts hosts.${PN}
+ newins "${FILESDIR}"/canna.hosts hosts.canna
}
pkg_postinst() {
@@ -148,7 +148,7 @@ pkg_postinst() {
if ! locale -a | grep -iq "ja_JP.eucjp"; then
elog "Some dictionary tools in this package require
ja_JP.EUC-JP locale."
elog
- elog "# echo 'ja_JP.EUC-JP EUC-JP' >> /etc/locale.gen"
+ elog "# echo 'ja_JP.EUC-JP EUC-JP' >> ${EROOT}/etc/locale.gen"
elog "# locale-gen"
elog
fi
