app-i18n/canna: update to EAPI 6

Package-Manager: Portage-2.3.6, Repoman-2.3.1

3 files changed, 107 insertions, 127 deletions

diff --git a/app-i18n/canna/canna-3.7_p3-r1.ebuild b/app-i18n/canna/canna-3.7_p3-r1.ebuild
index 2dac49233f0b..d6727b9c2840 100644
--- a/app-i18n/canna/canna-3.7_p3-r1.ebuild
+++ b/app-i18n/canna/canna-3.7_p3-r1.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-inherit cannadic eutils multilib
+EAPI="6"
 
-MY_P="Canna${PV//./}"
-MY_P="${MY_P/_/}"
+inherit cannadic toolchain-funcs
+
+MY_P="Canna${PV//[._]/}"
 
 DESCRIPTION="A client-server based Kana-Kanji conversion system"
 HOMEPAGE="http://canna.osdn.jp/"
@@ -15,90 +16,70 @@ SLOT="0"
 KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
 IUSE=""
 
-DEPEND=">=sys-apps/sed-4
-	x11-misc/gccmakedep
+DEPEND="x11-misc/gccmakedep
 	x11-misc/imake"
 RDEPEND=""
 S="${WORKDIR}/${MY_P}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+PATCHES=(
+	"${FILESDIR}"/${PN}-gentoo.patch
+	"${FILESDIR}"/${PN}-kpdef.patch
+	"${FILESDIR}"/${PN}-posix-sort.patch
+)
+DOCS="*CHANGES* ChangeLog INSTALL* README* RKCCONF* WHATIS*"
 
-	epatch "${FILESDIR}"/${PN}-gentoo.patch \
-		"${FILESDIR}"/${PN}-kpdef.patch \
-		"${FILESDIR}"/${PN}-posix-sort.patch
+src_prepare() {
+	default
 
 	find . -name '*.man' -o -name '*.jmn' | xargs sed -i.bak -e 's/1M/8/g' || die
 
 	# Multilib-strict fix for amd64
-	sed -i -e "s:\(DefLibCannaDir.*\)/lib:\1/$(get_libdir):g" Canna.conf* || die
+	sed -i "/DefLibCannaDir/s:/lib$:/$(get_libdir):" Canna.conf
 }
 
-src_compile() {
-	xmkmf || die
+src_configure() {
+	xmkmf -a || die
+}
 
-	#make libCannaDir=../lib/canna canna || die
+src_compile() {
 	# bug #279706
-	emake -j1 CDEBUGFLAGS="${CFLAGS}" canna || die
-
-	#if use doc ; then
-	#	einfo "Compiling DVI, PS (and PDF) document"
-	#	cd doc/man/guide/tex
-	#	xmkmf || die
-	#	emake -j1 JLATEXCMD=platex \
-	#		DVI2PSCMD="dvips -f" \
-	#		canna.dvi canna.ps || die
-	#	if has_version 'app-text/dvipdfmx' && \
-	#		( has_version 'app-text/acroread' \
-	#		|| has_version 'app-text/xpdf-japanese' ); then
-	#		emake -j1 JLATEXCMD=platex \
-	#			DVI2PSCMD="dvips -f" \
-	#			canna.pdf || die
-	#	fi
-	#fi
+	emake -j1 \
+		CC="$(tc-getCC)" \
+		CDEBUGFLAGS="${CFLAGS}" \
+		LOCAL_LDFLAGS="${LDFLAGS}" \
+		SHLIBGLOBALSFLAGS="${LDFLAGS}" \
+		${PN}
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
-	emake DESTDIR="${D}" install.man || die
-
-	# install default.canna (removed from Canna36p4)
-	insinto /usr/share/canna
-	newins misc/initfiles/verbose.canna default.canna
+	emake DESTDIR="${D}" install install.man
+	einstalldocs
 
-	# cannakill should link to /usr/bin/catdic
-	dosym ../bin/catdic /usr/sbin/cannakill
-
-	dodir /usr/share/man/man8 /usr/share/man/ja/man8
+	dodir /usr/share/man{,/ja}/man8
+	local man mandir
 	for man in cannaserver cannakill ; do
 		for mandir in "${D}"/usr/share/man "${D}"/usr/share/man/ja ; do
 			mv ${mandir}/man1/${man}.1 ${mandir}/man8/${man}.8
 		done
 	done
 
-	dodoc CHANGES.jp ChangeLog INSTALL* README* WHATIS*
+	# for backward compatibility
+	dosbin "${FILESDIR}"/update-canna-dics_dir
 
-	#if use doc ; then
-	#	insinto /usr/share/doc/${PF}
-	#	doins doc/man/guide/tex/canna.{dvi,ps,pdf}
-	#fi
+	keepdir /var/lib/${PN}/dic/{user,group}
+	fowners bin:bin /var/lib/${PN}/dic/{user,group}
+	fperms 0775 /var/lib/${PN}/dic/{user,group}
 
-	newinitd "${FILESDIR}"/${PN}.initd canna || die
-	newconfd "${FILESDIR}"/${PN}.confd canna || die
-	insinto /etc/ ; newins "${FILESDIR}"/canna.hosts hosts.canna || die
-	keepdir /var/log/canna/ || die
+	insinto /var/lib/${PN}/dic/dics.d
+	newins "${ED}"/var/lib/${PN}/dic/${PN}/dics.dir 00${PN}.dics.dir
 
-	# for backward compatibility
-	dosbin "${FILESDIR}"/update-canna-dics_dir
+	keepdir /var/log/${PN}
 
-	insinto /var/lib/canna/dic/dics.d/
-	newins "${D}"/var/lib/canna/dic/canna/dics.dir 00canna.dics.dir
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
 
-	# fix permission for user dictionary
-	keepdir /var/lib/canna/dic/{user,group}
-	fowners root:bin /var/lib/canna/dic/{user,group}
-	fperms 775 /var/lib/canna/dic/{user,group}
+	insinto /etc
+	newins "${FILESDIR}"/${PN}.hosts hosts.${PN}
 }
 
 pkg_postinst() {
diff --git a/app-i18n/canna/canna-3.7_p3-r2.ebuild b/app-i18n/canna/canna-3.7_p3-r2.ebuild
index 6511e2168c8f..2a51c4b0815d 100644
--- a/app-i18n/canna/canna-3.7_p3-r2.ebuild
+++ b/app-i18n/canna/canna-3.7_p3-r2.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-inherit cannadic eutils multilib
+EAPI="6"
 
-MY_P="Canna${PV//./}"
-MY_P="${MY_P/_/}"
+inherit cannadic toolchain-funcs
+
+MY_P="Canna${PV//[._]/}"
 
 DESCRIPTION="A client-server based Kana-Kanji conversion system"
 HOMEPAGE="http://canna.osdn.jp/"
@@ -15,8 +16,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc"
 
-DEPEND=">=sys-apps/sed-4
-	x11-misc/gccmakedep
+DEPEND="x11-misc/gccmakedep
 	x11-misc/imake
 	doc? (
 		app-text/ghostscript-gpl
@@ -28,89 +28,88 @@ DEPEND=">=sys-apps/sed-4
 RDEPEND=""
 S="${WORKDIR}/${MY_P}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+PATCHES=(
+	"${FILESDIR}"/${PN}-gentoo.patch
+	"${FILESDIR}"/${PN}-kpdef.patch
+	"${FILESDIR}"/${PN}-posix-sort.patch
+)
+DOCS="*CHANGES* ChangeLog INSTALL* README* RKCCONF* WHATIS*"
 
-	epatch "${FILESDIR}"/${PN}-gentoo.patch \
-		"${FILESDIR}"/${PN}-kpdef.patch \
-		"${FILESDIR}"/${PN}-posix-sort.patch
+src_prepare() {
+	default
 
 	find . -name '*.man' -o -name '*.jmn' | xargs sed -i.bak -e 's/1M/8/g' || die
 
 	# Multilib-strict fix for amd64
-	sed -i -e "s:\(DefLibCannaDir.*\)/lib:\1/$(get_libdir):g" Canna.conf* || die
+	sed -i "/DefLibCannaDir/s:/lib$:/$(get_libdir):" Canna.conf
 }
 
-src_compile() {
-	xmkmf || die
-
-	#make libCannaDir=../lib/canna canna || die
-	# bug #279706
-	emake -j1 CC="$(tc-getCC)" CDEBUGFLAGS="${CFLAGS}" \
-		LOCAL_LDFLAGS="${LDFLAGS}" SHLIBGLOBALSFLAGS="${LDFLAGS}" canna || die
+src_configure() {
+	xmkmf -a || die
 
-	if use doc ; then
-		einfo "Compiling DVI, PS (and PDF) document"
+	if use doc; then
 		cd doc/man/guide/tex
-		xmkmf || die
-		emake -j1 CC="$(tc-getCC)" CDEBUGFLAGS="${CFLAGS}" \
-			LOCAL_LDFLAGS="${LDFLAGS}" SHLIBGLOBALSFLAGS="${LDFLAGS}" \
-			JLATEXCMD=platex \
-			DVI2PSCMD="dvips -f" VARTEXFONTS="${T}"/fonts \
-			canna.dvi canna.ps || die
-		if has_version 'app-text/dvipdfmx' && \
-			( has_version 'app-text/acroread' \
-			|| has_version 'app-text/xpdf-japanese' ); then
-			emake -j1 CC="$(tc-getCC)" CDEBUGFLAGS="${CFLAGS}" \
-				LOCAL_LDFLAGS="${LDFLAGS}" SHLIBGLOBALSFLAGS="${LDFLAGS}" \
-				JLATEXCMD=platex \
-				DVI2PSCMD="dvips -f" VARTEXFONTS="${T}"/fonts \
-				canna.pdf || die
-		fi
+		xmkmf -a || die
+		cd - > /dev/null
 	fi
 }
 
-src_install() {
-	emake DESTDIR="${D}" install || die
-	emake DESTDIR="${D}" install.man || die
-
-	# install default.canna (removed from Canna36p4)
-	insinto /usr/share/canna
-	newins misc/initfiles/verbose.canna default.canna
+src_compile() {
+	# bug #279706
+	emake -j1 \
+		CC="$(tc-getCC)" \
+		CDEBUGFLAGS="${CFLAGS}" \
+		LOCAL_LDFLAGS="${LDFLAGS}" \
+		SHLIBGLOBALSFLAGS="${LDFLAGS}" \
+		${PN}
+
+	if use doc; then
+		# NOTE: build fails if infinality enabled in fontconfig
+		einfo "Compiling DVI, PS, and PDF documents"
+		# bug #223077
+		emake -C doc/man/guide/tex -j1 \
+			JLATEXCMD="platex -kanji=euc" \
+			DVI2PSCMD="dvips" \
+			VARTEXFONTS="${T}"/fonts \
+			${PN}.ps \
+			${PN}.pdf
+	fi
+}
 
-	# cannakill should link to /usr/bin/catdic
-	dosym ../bin/catdic /usr/sbin/cannakill
+src_install() {
+	emake DESTDIR="${D}" install install.man
+	einstalldocs
 
-	dodir /usr/share/man/man8 /usr/share/man/ja/man8
+	dodir /usr/share/man{,/ja}/man8
+	local man mandir
 	for man in cannaserver cannakill ; do
 		for mandir in "${D}"/usr/share/man "${D}"/usr/share/man/ja ; do
 			mv ${mandir}/man1/${man}.1 ${mandir}/man8/${man}.8
 		done
 	done
 
-	dodoc CHANGES.jp ChangeLog INSTALL* README* WHATIS*
-
-	if use doc ; then
+	if use doc; then
 		insinto /usr/share/doc/${PF}
-		doins doc/man/guide/tex/canna.{dvi,ps,pdf}
+		doins doc/man/guide/tex/${PN}.{dvi,ps,pdf}
 	fi
 
-	newinitd "${FILESDIR}"/${PN}.initd canna || die
-	newconfd "${FILESDIR}"/${PN}.confd canna || die
-	insinto /etc/ ; newins "${FILESDIR}"/canna.hosts hosts.canna || die
-	keepdir /var/log/canna/ || die
-
 	# for backward compatibility
 	dosbin "${FILESDIR}"/update-canna-dics_dir
 
-	insinto /var/lib/canna/dic/dics.d/
-	newins "${D}"/var/lib/canna/dic/canna/dics.dir 00canna.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}
+
+	insinto /var/lib/${PN}/dic/dics.d
+	newins "${ED}"/var/lib/${PN}/dic/${PN}/dics.dir 00${PN}.dics.dir
+
+	keepdir /var/log/${PN}
+
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
 
-	# fix permission for user dictionary
-	keepdir /var/lib/canna/dic/{user,group}
-	fowners root:bin /var/lib/canna/dic/{user,group}
-	fperms 775 /var/lib/canna/dic/{user,group}
+	insinto /etc
+	newins "${FILESDIR}"/${PN}.hosts hosts.${PN}
 }
 
 pkg_postinst() {
diff --git a/app-i18n/canna/metadata.xml b/app-i18n/canna/metadata.xml
index 87548929aea6..68869af58123 100644
--- a/app-i18n/canna/metadata.xml
+++ b/app-i18n/canna/metadata.xml
@@ -1,11 +1,11 @@
 <?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>
-	<upstream>
-		<remote-id type="sourceforge-jp">canna</remote-id>
-	</upstream>
+  <maintainer type="project">
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="sourceforge-jp">canna</remote-id>
+  </upstream>
 </pkgmetadata>