Version bumped.

7 files changed, 41 insertions, 34 deletions

diff --git a/app-i18n/canna/ChangeLog b/app-i18n/canna/ChangeLog
index 19e6f643b7ec..60eaba2e6811 100644
--- a/app-i18n/canna/ChangeLog
+++ b/app-i18n/canna/ChangeLog
@@ -1,6 +1,13 @@
 # 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.28 2003/11/18 15:01:18 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/canna/ChangeLog,v 1.29 2003/12/12 17:36:13 usata Exp $
+
+*canna-3.7 (13 Dec 2003)
+
+  13 Dec 2003; Mamoru KOMACHI <usata@gentoo.org> canna-3.7.ebuild,
+  canna-3.7_beta1.ebuild, files/canna-3.7-gentoo.diff.in,
+  files/canna-3.7_beta1-gentoo.diff.in, files/canna-kpdef-gentoo.diff:
+  Version bumped. Removed beta test version
 
   18 Nov 2003; MATSUU Takuto <matsuu@gentoo.org> canna-3.6_p4.ebuild:
   Marked ~amd64
diff --git a/app-i18n/canna/Manifest b/app-i18n/canna/Manifest
index fe685e33c45b..a4661c6af4a9 100644
--- a/app-i18n/canna/Manifest
+++ b/app-i18n/canna/Manifest
@@ -1,20 +1,17 @@
-MD5 ede2aba7d6f712c0a2355b0f2cb9ea31 ChangeLog 4918
+MD5 d5bac215ed725111515aeacf0965cb8a ChangeLog 5184
 MD5 b46ea852aefb4b480a009e1d68813872 canna-3.5_beta2-r2.ebuild 1375
-MD5 dd4d23868101a29383fa3ae02577751f canna-3.7.ebuild 3386
-MD5 ae52d3ed72daadd62d3984739fa2f494 canna-3.7_beta1.ebuild 3818
+MD5 b073f8feef2c9cdbdcb24b74bb93c101 canna-3.7.ebuild 3385
 MD5 e0fa7f2585f05d83612719a769f1264b canna-3.6_p3-r2.ebuild 1954
 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
 MD5 014292f80f745f4979566a9982b43fbb canna-3.6_p4.ebuild 2789
 MD5 2b13f6b61d303f6bf273a325ff3bc411 files/canna-3.7-gentoo.diff.in 5263
 MD5 167b6b59b36ffe7d7ebda5ddd85c930a files/digest-canna-3.7 61
-MD5 8a1f12154f418a916d9e59fcf5c2e78f files/digest-canna-3.7_beta1 63
 MD5 d817072e9bb7181804fdde1b52427a3f files/canna-kpdef-gentoo.diff 255
 MD5 57c633d3e17e89d06bf60940411d0992 files/canna-3.6_p3-r2-gentoo.diff 9552
 MD5 248b68ec823c14f763cc3f62221fb7d7 files/canna.confd 306
 MD5 d60168a33fd321ad1a29382cafcb60d3 files/canna.hosts 5
 MD5 190c04019722e776769ab0287dd9de6d files/canna.initd 692
 MD5 b662ec8c507add7b3d6550fe86ee83d6 files/digest-canna-3.5_beta2-r2 62
-MD5 2b13f6b61d303f6bf273a325ff3bc411 files/canna-3.7_beta1-gentoo.diff.in 5263
 MD5 9e27c1b8d2be61f0cd96a4b2689a3e61 files/digest-canna-3.6_p3-r2 62
 MD5 0d09a45d1074f9f4801a48bf8ec3208a files/update-canna-dics_dir 1101
 MD5 d77588a06485914d6bab3aab2a1985fb files/canna-3.6_p4-gentoo.diff 5587
diff --git a/app-i18n/canna/canna-3.7_beta1.ebuild b/app-i18n/canna/canna-3.7.ebuild
index db7bfdf7d792..11fe29dd459d 100644
--- a/app-i18n/canna/canna-3.7_beta1.ebuild
+++ b/app-i18n/canna/canna-3.7.ebuild
@@ -1,47 +1,29 @@
 # 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.7_beta1.ebuild,v 1.1 2003/09/29 17:52:02 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/canna/canna-3.7.ebuild,v 1.1 2003/12/12 17:36:13 usata Exp $
 
 inherit cannadic
 
-IUSE="tetex"
+IUSE="doc"
 
-MY_P="Canna37${PV/*beta/b}"
+MY_P="Canna${PV//./}"
 
 DESCRIPTION="A client-server based Kana-Kanji conversion system"
 HOMEPAGE="http://canna.sourceforge.jp/"
-SRC_URI="mirror://sourceforge.jp/canna/6125/${MY_P}.tar.bz2"
+SRC_URI="mirror://sourceforge.jp/canna/7240/${MY_P}.tar.bz2"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc -alpha"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64 -alpha"
 
 DEPEND="virtual/glibc
 	x11-base/xfree
 	>=sys-apps/sed-4
-	tetex? ( app-text/ptex )"
+	doc? ( app-text/ptex )"
 RDEPEND="virtual/glibc"
 
 S="${WORKDIR}/${MY_P}"
 
-pkg_setup() {
-
-	ewarn
-	ewarn "This is a development release! Beware! Vorsicht!!"
-	ewarn "Hit ^C to stop if you are not ready"
-	ewarn
-
-	echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
-	echo -ne "\a" ; sleep 1
-	echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
-	echo -ne "\a" ; sleep 1
-	echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
-	echo -ne "\a" ; sleep 1
-	echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
-	echo -ne "\a" ; sleep 1
-	sleep 8
-}
-
 src_unpack() {
 	unpack ${A}
 	cd ${S}
@@ -49,14 +31,17 @@ src_unpack() {
 	sed -e "s%@cannapkgver@%${PF}%" \
 		${FILESDIR}/${P}-gentoo.diff.in > ${T}/${P}-gentoo.diff
 	epatch ${T}/${P}-gentoo.diff
+	cd dic/phono
+	epatch ${FILESDIR}/${PN}-kpdef-gentoo.diff
 }
 
 src_compile() {
 
 	xmkmf || die
-	make libCannaDir=../lib/canna canna || die
+	#make libCannaDir=../lib/canna canna || die
+	make canna || die
 
-	if [ -n "`use tetex`" ] ; then
+	if [ -n "`use doc`" ] ; then
 		einfo "Compiling DVI, PS (and PDF) document"
 		cd doc/man/guide/tex
 		xmkmf || die
@@ -93,7 +78,7 @@ src_install() {
 
 	dodoc CHANGES.jp ChangeLog INSTALL* README* WHATIS*
 
-	if [ -n "`use tetex`" ] ; then
+	if [ -n "`use doc`" ] ; then
 		insinto /usr/share/doc/${PF}
 		doins doc/man/guide/tex/canna.{dvi,ps,pdf}
 	fi
diff --git a/app-i18n/canna/files/canna-3.7_beta1-gentoo.diff.in b/app-i18n/canna/files/canna-3.7-gentoo.diff.in
index 940c97f6dcaa..940c97f6dcaa 100644
--- a/app-i18n/canna/files/canna-3.7_beta1-gentoo.diff.in
+++ b/app-i18n/canna/files/canna-3.7-gentoo.diff.in
diff --git a/app-i18n/canna/files/canna-kpdef-gentoo.diff b/app-i18n/canna/files/canna-kpdef-gentoo.diff
new file mode 100644
index 000000000000..f458c53efdd7
--- /dev/null
+++ b/app-i18n/canna/files/canna-kpdef-gentoo.diff
@@ -0,0 +1,18 @@
+--- default.kpdef.orig	2002-10-19 17:27:40.000000000 +0900
++++ default.kpdef	2003-12-13 00:54:51.000000000 +0900
+@@ -350,3 +350,15 @@
+ _	¡²
+ /	¡¿
+ \\	¡ï
++
++# some useful romkan symbols
++z,	¡Å
++z-	¡Á
++z.	¡Ä
++z/	¡¦
++z[	¡Ø
++z]	¡Ù
++zh	¢«
++zj	¢­
++zk	¢¬
++zl	¢ª
diff --git a/app-i18n/canna/files/digest-canna-3.7 b/app-i18n/canna/files/digest-canna-3.7
new file mode 100644
index 000000000000..7541970d7145
--- /dev/null
+++ b/app-i18n/canna/files/digest-canna-3.7
@@ -0,0 +1 @@
+MD5 1c9f635c3df0901d8ec3d1e0910d694f Canna37.tar.bz2 1263120
diff --git a/app-i18n/canna/files/digest-canna-3.7_beta1 b/app-i18n/canna/files/digest-canna-3.7_beta1
deleted file mode 100644
index cb8a895acae5..000000000000
--- a/app-i18n/canna/files/digest-canna-3.7_beta1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9b9d2f2fae0f7c0f612bd344410c4dc1 Canna37b1.tar.bz2 1262303