Version bumped (yet masked)

6 files changed, 307 insertions, 8 deletions

diff --git a/app-i18n/canna/Manifest b/app-i18n/canna/Manifest
index d6a20970e8bf..3657384f4da7 100644
--- a/app-i18n/canna/Manifest
+++ b/app-i18n/canna/Manifest
@@ -1,12 +1,11 @@
-MD5 089e5fb64457f8a11296296181c64f3a ChangeLog 4302
+MD5 e3a4936c38b2806292e6727ae7a81e33 ChangeLog 4693
 MD5 b46ea852aefb4b480a009e1d68813872 canna-3.5_beta2-r2.ebuild 1375
 MD5 683dc5258fe948d969434367a87b140f canna-3.6_p1.ebuild 1026
-MD5 aa21b5f9d5aeb421dc8427c38237ec84 canna-3.7_beta1.ebuild 2671
+MD5 ae52d3ed72daadd62d3984739fa2f494 canna-3.7_beta1.ebuild 3818
 MD5 e0fa7f2585f05d83612719a769f1264b canna-3.6_p3-r2.ebuild 1954
 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
-MD5 32643ca7fd73c9a627dff09b3cdeda2d canna-3.6_p4.ebuild 2665
-MD5 bceab4ae379c4c1466d7846170657b56 canna-3.7_beta1.ebuild.bak 2670
-MD5 13ad70b823fc2f1cb5354e178d037dc4 files/canna-3.6_p1-gentoo.diff 15416
+MD5 c30e0b9377559e0254dbadb5b8004c90 canna-3.6_p4.ebuild 2793
+MD5 2ac8e20cc8733329403bf769da8ffd0b files/canna-3.6_p1-gentoo.diff 15419
 MD5 a4f85ba6cefa983cc5fe91bc1c10f6c6 files/digest-canna-3.6_p1 62
 MD5 8a1f12154f418a916d9e59fcf5c2e78f files/digest-canna-3.7_beta1 63
 MD5 57c633d3e17e89d06bf60940411d0992 files/canna-3.6_p3-r2-gentoo.diff 9552
@@ -14,6 +13,7 @@ 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.6_p4.ebuild b/app-i18n/canna/canna-3.6_p4.ebuild
index 633735d5b26f..085d98ca160c 100644
--- a/app-i18n/canna/canna-3.6_p4.ebuild
+++ b/app-i18n/canna/canna-3.6_p4.ebuild
@@ -1,6 +1,6 @@
 # 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.4 2003/09/23 11:47:43 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/canna/canna-3.6_p4.ebuild,v 1.5 2003/09/29 17:52:02 usata Exp $
 
 inherit cannadic
 
@@ -58,6 +58,10 @@ 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
+
 	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
diff --git a/app-i18n/canna/canna-3.7_beta1.ebuild b/app-i18n/canna/canna-3.7_beta1.ebuild
new file mode 100644
index 000000000000..db7bfdf7d792
--- /dev/null
+++ b/app-i18n/canna/canna-3.7_beta1.ebuild
@@ -0,0 +1,150 @@
+# 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 $
+
+inherit cannadic
+
+IUSE="tetex"
+
+MY_P="Canna37${PV/*beta/b}"
+
+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"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc -alpha"
+
+DEPEND="virtual/glibc
+	x11-base/xfree
+	>=sys-apps/sed-4
+	tetex? ( 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}
+	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}/${P}-gentoo.diff
+	epatch ${T}/${P}-gentoo.diff
+}
+
+src_compile() {
+
+	xmkmf || die
+	make libCannaDir=../lib/canna 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 || 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 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
+	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/canna-3.6_p1-gentoo.diff b/app-i18n/canna/files/canna-3.6_p1-gentoo.diff
index 337b48f7ba7e..e602276dbc58 100644
--- a/app-i18n/canna/files/canna-3.6_p1-gentoo.diff
+++ b/app-i18n/canna/files/canna-3.6_p1-gentoo.diff
@@ -17,7 +17,7 @@ diff -Naur Canna36p1.orig/Canna.conf Canna36p1/Canna.conf
 +cannaEtcDir = /etc/canna
 +cannaManDir = $(cannaPrefix)/share/man
  cannaIncDir = $(cannaPrefix)/include/canna
-+cannaDocDir = $(cannaPrefix)/share/doc/canna-3.6
++cannaDocDir = $(cannaPrefix)/share/doc/canna-3.6_p1
 +cannaShareDir = $(cannaPrefix)/share/canna
 +
 +LockDir = /tmp/.iroha_unix
@@ -107,7 +107,7 @@ diff -Naur Canna36p1.orig/cmd/catdic/Imakefile Canna36p1/cmd/catdic/Imakefile
 --- Canna36p1.orig/cmd/catdic/Imakefile	2002-11-07 23:46:02.000000000 +0900
 +++ Canna36p1/cmd/catdic/Imakefile	2002-12-02 22:03:25.000000000 +0900
 @@ -1,6 +1,9 @@
- /* $Id: canna-3.6_p1-gentoo.diff,v 1.1 2003/09/22 21:12:03 usata Exp $ */
+ /* $Id: canna-3.6_p1-gentoo.diff,v 1.2 2003/09/29 17:52:02 usata Exp $ */
  #include "../../Canna.conf"
  
 +/* gentoo: use hard links so that the image can be merged correctly */
diff --git a/app-i18n/canna/files/canna-3.7_beta1-gentoo.diff.in b/app-i18n/canna/files/canna-3.7_beta1-gentoo.diff.in
new file mode 100644
index 000000000000..940c97f6dcaa
--- /dev/null
+++ b/app-i18n/canna/files/canna-3.7_beta1-gentoo.diff.in
@@ -0,0 +1,144 @@
+diff -urN Canna37b1.ORIG/Canna.conf Canna37b1/Canna.conf
+--- Canna37b1.ORIG/Canna.conf	2003-09-27 15:23:08.000000000 +0900
++++ Canna37b1/Canna.conf	2003-09-27 19:09:13.000000000 +0900
+@@ -114,7 +114,7 @@
+ #  define DefErrDir /usr/spool/canna
+ #  define DefLibCannaDir /usr/lib
+ # else
+-#  define DefErrDir /var/log
++#  define DefErrDir /var/log/canna
+ #  define DefLibCannaDir $(cannaExecPrefix)/lib
+ # endif
+ #endif
+@@ -140,16 +140,18 @@
+ # define ModernElfLinkAvailable NO
+ #endif
+ 
+-cannaPrefix = DefCannaPrefix
++cannaPrefix = /usr
+ cannaExecPrefix = $(cannaPrefix)
+ cannaBinDir = $(cannaExecPrefix)/bin
+ cannaSrvDir = DefCannaSrvDir
+ XCOMM cannaLibDir = /var/lib/canna
+ XCOMM cannaLibDir = /var/db/canna
+ cannaLibDir = DefCannaLibDir
+-XCOMM cannaManDir = $(cannaPrefix)/share/man
+-cannaManDir = $(cannaPrefix)/man
++cannaManDir = $(cannaPrefix)/share/man
++XCOMM cannaManDir = $(cannaPrefix)/man
+ cannaIncDir = $(cannaPrefix)/include/canna
++cannaDocDir = $(cannaPrefix)/share/doc/@cannapkgver@
++cannaShareDir = $(cannaPrefix)/share/canna
+ 
+ libCannaDir = DefLibCannaDir
+ ErrDir  = DefErrDir
+@@ -158,7 +160,7 @@
+ #define SupportOldWchar 1
+ 
+ /* IPv6を用いる場合は1と定義してください */
+-#define UseInet6 0 /* requires newer IPv6 implementation */
++/* #define UseInet6 0 /* requires newer IPv6 implementation */
+ 
+ /* 3.2系から3.6系までの形式の辞書を作る場合はこれを定義してください */
+ /* #define DIC_3_6_COMPAT */
+@@ -237,7 +239,7 @@
+ /* #define UseInstalledLibCanna YES */
+ #define UseInstalledLibCanna NO
+ 
+-DicDir   = $(cannaLibDir)/dic
++DicDir   = /var/lib/canna/dic
+ 
+ /* ここから下は変更不要です */
+ 
+diff -urN Canna37b1.ORIG/Imakefile Canna37b1/Imakefile
+--- Canna37b1.ORIG/Imakefile	2003-09-25 15:30:20.000000000 +0900
++++ Canna37b1/Imakefile	2003-09-27 19:09:00.000000000 +0900
+@@ -55,6 +55,7 @@
+ 	@echo "#define CANNAHOSTFILE '$(cannaLibDir)/cannahost'" >> junkjunk
+ 	@echo "/* for lib/canna */" >> junkjunk
+ 	@echo "#define CANNALIBDIR '$(cannaLibDir)'" >> junkjunk
++	@echo "#define CANNASHAREDIR '$(cannaShareDir)'" >> junkjunk
+ 	@echo "#define SUPPORT_OLD_WCHAR '$(supportOldWchar)'" >> junkjunk
+ 	@echo "/* for scripts */" >> junkjunk
+ 	@echo "#define CANNABINDIR $(cannaBinDir)" >> junkjunk
+@@ -83,6 +84,7 @@
+ 	 echo "#define CANNAHOSTFILE \"$(cannaLibDir)/cannahost\"";\
+ 	 echo "/* for lib/canna */";\
+ 	 echo "#define CANNALIBDIR \"$(cannaLibDir)\""; \
++	 echo "#define CANNASHAREDIR \"$(cannaShareDir)\""; \
+ 	 echo "#define SUPPORT_OLD_WCHAR $(supportOldWchar)"; \
+ 	 echo "/* for scripts */";\
+ 	 echo "#define CANNABINDIR $(cannaBinDir)"; \
+diff -urN Canna37b1.ORIG/dic/phono/Imakefile Canna37b1/dic/phono/Imakefile
+--- Canna37b1.ORIG/dic/phono/Imakefile	2002-10-19 17:27:40.000000000 +0900
++++ Canna37b1/dic/phono/Imakefile	2003-09-27 19:09:00.000000000 +0900
+@@ -27,9 +27,10 @@
+ 
+        ROMAJI_DIC_DEF = -DSHIFT
+ 
+-               DICDIR = $(cannaLibDir)/dic
+-            SAMPLEDIR = $(cannaLibDir)/sample
+-         SAMPLESRCDIR = $(cannaLibDir)/sample/src
++               DICDIR = $(DicDir)
++        CANNASHAREDIR = $(cannaShareDir)
++            SAMPLEDIR = $(cannaDocDir)/sample
++         SAMPLESRCDIR = $(cannaDocDir)/sample/src
+ 
+     KPDEF = default.kpdef jdaemon.kpdef just.kpdef kaisoku.kpdef kana.kpdef \
+             lan5.kpdef matsu.kpdef newjis.kpdef romaji.kpdef sokuon.kpdef \
+@@ -69,7 +70,7 @@
+ MakeDirectories(install,$(DICDIR))
+ MakeDirectories(install,$(SAMPLESRCDIR))
+ 
+-InstallMultiple($(ROMKANA_TABLES),$(DICDIR))
++InstallMultiple($(ROMKANA_TABLES),$(CANNASHAREDIR))
+ 
+ #ifdef USE_OBSOLETE_STYLE_FILENAME
+ InstallNonExec(default.kpdef,$(SAMPLESRCDIR))
+diff -urN Canna37b1.ORIG/lib/canna/romaji.c Canna37b1/lib/canna/romaji.c
+--- Canna37b1.ORIG/lib/canna/romaji.c	2003-09-17 17:50:53.000000000 +0900
++++ Canna37b1/lib/canna/romaji.c	2003-09-27 19:09:00.000000000 +0900
+@@ -427,7 +427,7 @@
+ 	}
+       }
+       
+-#if 0 /* currently CANNASHAREDDIR is not defined */
++#if 1 /* currently CANNASHAREDDIR is defined */
+       if (retval == (struct RkRxDic *)NULL) { /* added for Debian by ISHIKAWA Mutsumi <ishikawa@linux.or.jp> */
+         extern jrUserInfoStruct *uinfo;
+ 	
+diff -urN Canna37b1.ORIG/misc/Imakefile Canna37b1/misc/Imakefile
+--- Canna37b1.ORIG/misc/Imakefile	2003-03-05 04:23:53.000000000 +0900
++++ Canna37b1/misc/Imakefile	2003-09-27 19:09:00.000000000 +0900
+@@ -48,7 +48,7 @@
+ MakeLintLibSubdirs($(SUBDIRS))
+ MakeLintSubdirs($(SUBDIRS),install.ln,install.ln)
+ 
+-MakeDirectories(install,$(cannaLibDir)/sample/src)
++MakeDirectories(install,$(cannaDocDir)/sample/src)
+ 
+ #ifdef USE_OBSOLETE_STYLE_FILENAME
+ default.canna: default.ca
+@@ -58,8 +58,8 @@
+ 	$(CP) default.ca default.canna
+ #endif
+ 
+-InstallNonExec(default.canna,$(cannaLibDir))
+-InstallNonExec(is.c,$(cannaLibDir)/sample/src)
++InstallNonExec(default.canna,$(cannaDocDir))
++InstallNonExec(is.c,$(cannaDocDir)/sample/src)
+ 
+ clean::
+ 	$(RM) $(PROGRAMS)
+diff -urN Canna37b1.ORIG/misc/initfiles/Imakefile Canna37b1/misc/initfiles/Imakefile
+--- Canna37b1.ORIG/misc/initfiles/Imakefile	2003-02-04 05:13:01.000000000 +0900
++++ Canna37b1/misc/initfiles/Imakefile	2003-09-27 19:09:00.000000000 +0900
+@@ -6,7 +6,7 @@
+ #endif
+ 
+             CANNAROOT = ../..
+-            SAMPLEDIR = $(cannaLibDir)/sample
++            SAMPLEDIR = $(cannaShareDir)
+ 
+ all::
+ 
diff --git a/app-i18n/canna/files/digest-canna-3.7_beta1 b/app-i18n/canna/files/digest-canna-3.7_beta1
new file mode 100644
index 000000000000..cb8a895acae5
--- /dev/null
+++ b/app-i18n/canna/files/digest-canna-3.7_beta1
@@ -0,0 +1 @@
+MD5 9b9d2f2fae0f7c0f612bd344410c4dc1 Canna37b1.tar.bz2 1262303