Added tetex IUSE flag. Restart cannaserver after remerge.

3 files changed, 37 insertions, 9 deletions

diff --git a/app-i18n/canna/ChangeLog b/app-i18n/canna/ChangeLog
index 3431582fc5f3..a929c46e7f91 100644
--- a/app-i18n/canna/ChangeLog
+++ b/app-i18n/canna/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for app-i18n/canna
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/canna/ChangeLog,v 1.21 2003/09/22 19:26:03 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/canna/ChangeLog,v 1.22 2003/09/22 20:47:21 usata Exp $
 
 *canna-3.6_p4 (23 Sep 2003)
 
@@ -12,7 +12,9 @@
   cannaserver and cannakill. Added prerm to stop canna before unmerge.
   (once you uninstall canna you can't stop cannaserver by /etc/init.d
   since it depends on cannakill) Changed SRC_URI to use
-  mirror://sourceforge.jp/
+  mirror://sourceforge.jp/ 
+  Installs DVI, PS and PDF if tetex USE flag is set. Stop cannaserver
+  before unmerge and restart it after remerge.
 
 *canna-3.6_p3-r2 (04 Jun 2003)
 
diff --git a/app-i18n/canna/Manifest b/app-i18n/canna/Manifest
index 6b3b87dfc229..f1147c4969a6 100644
--- a/app-i18n/canna/Manifest
+++ b/app-i18n/canna/Manifest
@@ -1,4 +1,4 @@
-MD5 b5f4568c17cec9653253a22874473489 ChangeLog 3623
+MD5 bbd267632e1c8df1d29ec30051acb802 ChangeLog 3741
 MD5 b46ea852aefb4b480a009e1d68813872 canna-3.5_beta2-r2.ebuild 1375
 MD5 7879d3f3c6ededc8a6f47cd0c770f267 canna-3.6-r1.ebuild 1027
 MD5 95178f2423fe0546797fe526c877dc7d canna-3.6.ebuild 981
@@ -6,7 +6,7 @@ MD5 e065f74ecde1b04138d704ed2e15944c canna-3.6_p3-r1.ebuild 1632
 MD5 e0fa7f2585f05d83612719a769f1264b canna-3.6_p3-r2.ebuild 1954
 MD5 9fd4a3616817f3b0eeb585398803579c canna-3.6_p3.ebuild 1068
 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
-MD5 3c77f6a4e364407ff763838b20973b7d canna-3.6_p4.ebuild 2101
+MD5 140b25416be2da893d0619e98204c28a canna-3.6_p4.ebuild 2489
 MD5 6f0f185ecaa7391115043400b8e9e7c1 files/canna-3.6-gentoo.diff 20102
 MD5 b80ead17590a825d4cbd66c29852fceb files/canna-3.6-r1-gentoo.diff 15417
 MD5 506fffb5973b7936dea383bb0265dc90 files/canna-3.6_p3-gentoo.diff 14252
diff --git a/app-i18n/canna/canna-3.6_p4.ebuild b/app-i18n/canna/canna-3.6_p4.ebuild
index 115ec4266cdb..335f9abafdfa 100644
--- a/app-i18n/canna/canna-3.6_p4.ebuild
+++ b/app-i18n/canna/canna-3.6_p4.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/canna/canna-3.6_p4.ebuild,v 1.1 2003/09/22 19:26:04 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/canna/canna-3.6_p4.ebuild,v 1.2 2003/09/22 20:47:21 usata Exp $
 
 inherit cannadic eutils
 
+IUSE="tetex"
+
 MY_P="Canna36${PV#*_}"
 
 DESCRIPTION="A client-server based Kana-Kanji conversion system"
@@ -16,7 +18,9 @@ KEYWORDS="~x86 ~ppc ~sparc ~alpha"
 
 DEPEND="virtual/glibc
 	x11-base/xfree
-	>=sys-apps/sed-4"
+	>=sys-apps/sed-4
+	tetex? ( app-text/ptex
+		app-text/dvipdfmx )"
 RDEPEND="virtual/glibc"
 
 S="${WORKDIR}/${MY_P}"
@@ -33,6 +37,15 @@ src_compile() {
 	make Makefiles || die
 	# make includes
 	make canna || die
+
+	if [ -n "`use tetex`" ] ; 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 canna.pdf || die
+	fi
 }
 
 src_install() {
@@ -47,6 +60,12 @@ src_install() {
 	done
 
 	dodoc CHANGES.jp ChangeLog INSTALL* README* WHATIS*
+	
+	if [ -n "`use tetex`" ] ; then
+		insinto /usr/share/doc/${PF}
+		doins doc/man/guide/tex/canna.{dvi,ps,pdf}
+	fi
+
 	exeinto /etc/init.d ; newexe ${FILESDIR}/canna.initd.new canna || die
 	insinto /etc/conf.d ; newins ${FILESDIR}/canna.confd canna || die
 	insinto /etc/       ; newins ${FILESDIR}/canna.hosts hosts.canna || die
@@ -72,8 +91,15 @@ pkg_prerm () {
 		einfo
 		/etc/init.d/canna stop
 	fi
-	if [ -e /var/lib/canna/dic/canna/dics.dir ] ; then
-		# no need to keep dics.dir if canna is not installed
-		rm -f /var/lib/canna/dic/canna/dics.dir
+}
+
+pkg_postrm () {
+
+	if [ -f /usr/sbin/cannaserver ] ; then
+		update-cannadic-dir
+		einfo
+		einfo "Restarting Canna"
+		einfo
+		/etc/init.d/canna start
 	fi
 }