Added locale elog, bug #300055. Added CC, CFLAGS and LDFLAGS.

(Portage version: 2.1.7.16/cvs/Linux x86_64)

2 files changed, 164 insertions, 1 deletions

diff --git a/app-i18n/canna/ChangeLog b/app-i18n/canna/ChangeLog
index 8416bad25f45..0b7cbc8150c9 100644
--- a/app-i18n/canna/ChangeLog
+++ b/app-i18n/canna/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-i18n/canna
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/canna/ChangeLog,v 1.64 2010/01/10 18:48:48 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/canna/ChangeLog,v 1.65 2010/01/11 17:00:46 matsuu Exp $
+
+*canna-3.7_p3-r2 (11 Jan 2010)
+
+  11 Jan 2010; MATSUU Takuto <matsuu@gentoo.org> +canna-3.7_p3-r2.ebuild:
+  Added locale elog, bug #300055. Added CC, CFLAGS and LDFLAGS.
 
   10 Jan 2010; nixnut <nixnut@gentoo.org> canna-3.7_p3-r1.ebuild:
   ppc stable #297441
diff --git a/app-i18n/canna/canna-3.7_p3-r2.ebuild b/app-i18n/canna/canna-3.7_p3-r2.ebuild
new file mode 100644
index 000000000000..327a0f28fb29
--- /dev/null
+++ b/app-i18n/canna/canna-3.7_p3-r2.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/canna/canna-3.7_p3-r2.ebuild,v 1.1 2010/01/11 17:00:46 matsuu Exp $
+
+inherit cannadic eutils multilib
+
+MY_P="Canna${PV//./}"
+MY_P="${MY_P/_/}"
+
+DESCRIPTION="A client-server based Kana-Kanji conversion system"
+HOMEPAGE="http://canna.sourceforge.jp/"
+SRC_URI="mirror://sourceforge.jp/canna/9565/${MY_P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc"
+
+DEPEND=">=sys-apps/sed-4
+	x11-misc/gccmakedep
+	x11-misc/imake
+	doc? ( app-text/ptex )"
+RDEPEND=""
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	find . -name '*.man' -o -name '*.jmn' | xargs sed -i.bak -e 's/1M/8/g' || die
+	sed -e "s%@cannapkgver@%${PF}%" \
+		"${FILESDIR}"/${PN}-3.7-gentoo.diff.in > "${T}"/${PF}-gentoo.diff || die
+	epatch "${T}"/${PF}-gentoo.diff
+
+	# bug #248723
+	epatch "${FILESDIR}"/${P}-strip.patch
+
+	# Multilib-strict fix for amd64
+	sed -i -e "s:\(DefLibCannaDir.*\)/lib:\1/$(get_libdir):g" Canna.conf* || die
+	# fix deprecated sort syntax
+	sed -e 's:^\(sortcmd=\".* -s\).*$:\1 -k 1,1\":' \
+		-i cmd/mkbindic/mkbindic.cpp || die
+
+	cd "${S}"/dic/phono
+	epatch "${FILESDIR}"/${PN}-kpdef-gentoo.diff
+
+}
+
+src_compile() {
+	xmkmf || die
+
+	#make libCannaDir=../lib/canna canna || die
+	# bug #279706
+	emake -j1 CC="$(tc-getCC)" CDEBUGFLAGS="${CFLAGS}" \
+		LOCAL_LDFLAGS="${LDFLAGS}" canna || die
+
+	if use doc ; then
+		einfo "Compiling DVI, PS (and PDF) document"
+		cd doc/man/guide/tex
+		xmkmf || die
+		emake -j1 CC="$(tc-getCC)" CDEBUGFLAGS="${CFLAGS}" \
+			LOCAL_LDFLAGS="${LDFLAGS}" 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 CC="$(tc-getCC)" CDEBUGFLAGS="${CFLAGS}" \
+				LOCAL_LDFLAGS="${LDFLAGS}" JLATEXCMD=platex \
+				DVI2PSCMD="dvips -f" \
+				canna.pdf || die
+		fi
+	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
+
+	# cannakill should link to /usr/bin/catdic
+	dosym ../bin/catdic /usr/sbin/cannakill
+
+	dodir /usr/share/man/man8 /usr/share/man/ja/man8
+	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
+		insinto /usr/share/doc/${PF}
+		doins doc/man/guide/tex/canna.{dvi,ps,pdf}
+	fi
+
+	newinitd "${FILESDIR}"/${P}.initd canna || die
+	newconfd "${FILESDIR}"/${P}.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
+
+	# 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}
+}
+
+pkg_postinst() {
+	update-cannadic-dir
+	elog
+	elog "Canna dictionary format has been changed."
+	elog "You should rebuild app-dict/canna-* after emerge."
+	elog
+
+	local localearchive="${ROOT}usr/$(get_libdir)/locale/locale-archive"
+	if [ -f "${localearchive}" -a -x /usr/bin/localedef ] && \
+		! /usr/bin/localedef --list-archive "${localearchive}" | grep -i 'ja_JP.eucjp' >/dev/null 2>&1 ; then
+		elog "Some dictionary tools in this package require ja_JP.eucJP locale."
+		elog "Please add ja_JP.eucJP locale to /etc/locale.gen:"
+		elog
+		elog "# echo 'ja_JP.EUC-JP EUC-JP' >> /etc/locale.gen"
+		elog "# locale-gen"
+		elog
+	fi
+}
+
+pkg_prerm() {
+	if [ -S /tmp/.iroha_unix/IROHA ] ; then
+		# make sure cannaserver get stopped because otherwise
+		# we cannot stop it with /etc/init.d after emerge -C canna
+		einfo
+		einfo "Stopping Canna for safe unmerge"
+		einfo
+		/etc/init.d/canna stop
+		touch "${T}"/canna.cookie
+	fi
+}
+
+pkg_postrm() {
+	if [ -f /usr/sbin/cannaserver -a -e "${T}"/canna.cookie ] ; then
+		#update-cannadic-dir
+		einfo
+		einfo "Restarting Canna"
+		einfo
+		/etc/init.d/canna start
+		rm -f "${T}"/canna.cookie
+	fi
+}