Version bumped. Marked _p1 stable on x86 ,ppc and alpha.

6 files changed, 152 insertions, 7 deletions

diff --git a/app-i18n/canna/ChangeLog b/app-i18n/canna/ChangeLog
index 3fdc0a0e8c47..70722466f110 100644
--- a/app-i18n/canna/ChangeLog
+++ b/app-i18n/canna/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-i18n/canna
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/canna/ChangeLog,v 1.36 2004/05/06 11:31:57 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/canna/ChangeLog,v 1.37 2004/05/18 22:32:04 usata Exp $
+
+*canna-3.7_p2 (19 May 2004)
+
+  19 May 2004; Mamoru KOMACHI <usata@gentoo.org> canna-3.7.ebuild,
+  canna-3.7_p1.ebuild, canna-3.7_p2.ebuild:
+  Version bumped. Marked _p1 stable on x86, ppc and alpha.
 
   06 May 2004; Mamoru KOMACHI,c10344,, <usata@gentoo.org> canna-3.6_p4.ebuild,
   canna-3.7.ebuild, canna-3.7_p1.ebuild:
diff --git a/app-i18n/canna/Manifest b/app-i18n/canna/Manifest
index 340632609952..169fea832c63 100644
--- a/app-i18n/canna/Manifest
+++ b/app-i18n/canna/Manifest
@@ -1,15 +1,17 @@
-MD5 6114924239c0ca0fed3e859754dda276 canna-3.7_p1.ebuild 3475
 MD5 076a81c8943da48e353e3efe1804d4f8 canna-3.6_p4.ebuild 2917
 MD5 ea6c379232862c506673aca19f976b21 canna-3.7.ebuild 3457
 MD5 4db04eb7f18d95f6cf12464c6671e556 ChangeLog 6256
 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
+MD5 6114924239c0ca0fed3e859754dda276 canna-3.7_p1.ebuild 3475
+MD5 3e06cef92db5143ac54783dbe6f8f499 canna-3.7_p2.ebuild 3401
 MD5 248b68ec823c14f763cc3f62221fb7d7 files/canna.confd 306
 MD5 d60168a33fd321ad1a29382cafcb60d3 files/canna.hosts 5
 MD5 67ba430259be85b8791dac27115538b0 files/canna.initd 1005
 MD5 d77588a06485914d6bab3aab2a1985fb files/canna-3.6_p4-gentoo.diff 5587
+MD5 300a4fe937c6c06bda8fe832906b672c files/digest-canna-3.7_p2 63
 MD5 0d09a45d1074f9f4801a48bf8ec3208a files/update-canna-dics_dir 1101
 MD5 2b13f6b61d303f6bf273a325ff3bc411 files/canna-3.7-gentoo.diff.in 5263
 MD5 167b6b59b36ffe7d7ebda5ddd85c930a files/digest-canna-3.7 61
 MD5 c48de658742361ca5549edaddebb3e94 files/digest-canna-3.6_p4 62
-MD5 928c920864a62989dc12b294fa01aac5 files/digest-canna-3.7_p1 63
 MD5 d817072e9bb7181804fdde1b52427a3f files/canna-kpdef-gentoo.diff 255
+MD5 928c920864a62989dc12b294fa01aac5 files/digest-canna-3.7_p1 63
diff --git a/app-i18n/canna/canna-3.7.ebuild b/app-i18n/canna/canna-3.7.ebuild
index 99de25764690..c898aa6a1bc2 100644
--- a/app-i18n/canna/canna-3.7.ebuild
+++ b/app-i18n/canna/canna-3.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/canna/canna-3.7.ebuild,v 1.8 2004/05/06 11:31:57 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/canna/canna-3.7.ebuild,v 1.9 2004/05/18 22:32:04 usata Exp $
 
 inherit cannadic eutils
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge.jp/canna/7240/${MY_P}.tar.bz2"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="x86 ~ppc ~sparc alpha amd64"
+KEYWORDS="x86 ppc ~sparc alpha amd64"
 
 DEPEND="virtual/glibc
 	virtual/x11
diff --git a/app-i18n/canna/canna-3.7_p1.ebuild b/app-i18n/canna/canna-3.7_p1.ebuild
index 96d26c6168ee..6a48df267b23 100644
--- a/app-i18n/canna/canna-3.7_p1.ebuild
+++ b/app-i18n/canna/canna-3.7_p1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/canna/canna-3.7_p1.ebuild,v 1.2 2004/05/06 11:31:57 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/canna/canna-3.7_p1.ebuild,v 1.3 2004/05/18 22:32:04 usata Exp $
 
 inherit cannadic eutils
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge.jp/canna/7449/${MY_P/_/}.tar.bz2"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64"
+KEYWORDS="x86 ppc ~sparc alpha ~amd64"
 
 DEPEND="virtual/glibc
 	virtual/x11
diff --git a/app-i18n/canna/canna-3.7_p2.ebuild b/app-i18n/canna/canna-3.7_p2.ebuild
new file mode 100644
index 000000000000..debc5bfb1ac2
--- /dev/null
+++ b/app-i18n/canna/canna-3.7_p2.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/canna/canna-3.7_p2.ebuild,v 1.1 2004/05/18 22:32:04 usata Exp $
+
+inherit cannadic eutils
+
+IUSE="doc"
+
+MY_P="Canna${PV//./}"
+
+DESCRIPTION="A client-server based Kana-Kanji conversion system"
+HOMEPAGE="http://canna.sourceforge.jp/"
+SRC_URI="mirror://sourceforge.jp/canna/9558/${MY_P/_/}.tar.bz2"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64"
+
+DEPEND="virtual/glibc
+	virtual/x11
+	>=sys-apps/sed-4
+	doc? ( app-text/ptex )"
+RDEPEND="virtual/glibc"
+
+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'
+	sed -e "s%@cannapkgver@%${PF}%" \
+		${FILESDIR}/${P/_*/}-gentoo.diff.in > ${T}/${PF}-gentoo.diff
+	epatch ${T}/${PF}-gentoo.diff
+	cd dic/phono
+	epatch ${FILESDIR}/${PN}-kpdef-gentoo.diff
+}
+
+src_compile() {
+
+	xmkmf || die
+
+	#make libCannaDir=../lib/canna canna || die
+	make canna || die
+
+	if [ -n "`use doc`" ] ; then
+		einfo "Compiling DVI, PS (and PDF) document"
+		cd doc/man/guide/tex
+		xmkmf || die
+		make 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
+			make JLATEXCMD=platex \
+				DVI2PSCMD="dvips -f" \
+				canna.pdf || die
+		fi
+	fi
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+	make 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 [ -n "`use doc`" ] ; then
+		insinto /usr/share/doc/${PF}
+		doins doc/man/guide/tex/canna.{dvi,ps,pdf}
+	fi
+
+	exeinto /etc/init.d ; newexe ${FILESDIR}/canna.initd canna || die
+	insinto /etc/conf.d ; newins ${FILESDIR}/canna.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
+	einfo
+	einfo "Canna dictionary format has been changed."
+	einfo "You should rebuild app-dict/canna-* after emerge."
+	einfo
+}
+
+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
+}
diff --git a/app-i18n/canna/files/digest-canna-3.7_p2 b/app-i18n/canna/files/digest-canna-3.7_p2
new file mode 100644
index 000000000000..f97e8ff12f09
--- /dev/null
+++ b/app-i18n/canna/files/digest-canna-3.7_p2
@@ -0,0 +1 @@
+MD5 8c978ccfd636af68ac4da5ac711e654f Canna37p2.tar.bz2 1263325