Fixed bug #191941, #248723 and #279706.

(Portage version: 2.1.6.13/cvs/Linux x86_64)

5 files changed, 346 insertions, 1 deletions

diff --git a/app-i18n/canna/ChangeLog b/app-i18n/canna/ChangeLog
index 936134a379e5..8203ca4ceba9 100644
--- a/app-i18n/canna/ChangeLog
+++ b/app-i18n/canna/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-i18n/canna
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/canna/ChangeLog,v 1.57 2009/07/30 16:52:47 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/canna/ChangeLog,v 1.58 2009/09/21 02:55:21 matsuu Exp $
+
+*canna-3.7_p3-r1 (21 Sep 2009)
+
+  21 Sep 2009; MATSUU Takuto <matsuu@gentoo.org> +canna-3.7_p3-r1.ebuild,
+  +files/canna-3.7_p3-strip.patch, +files/canna-3.7_p3.confd,
+  +files/canna-3.7_p3.initd:
+  Fixed initscript bashisms, bug #191941.
+  Fixed pre-stripped files, bug #248723.
+  Added -j1 to emake, bug #279706.
 
   30 Jul 2009; Diego E. Pettenò <flameeyes@gentoo.org> canna-3.7_p3.ebuild:
   Use -j1 for install bug #279706.
diff --git a/app-i18n/canna/canna-3.7_p3-r1.ebuild b/app-i18n/canna/canna-3.7_p3-r1.ebuild
new file mode 100644
index 000000000000..144ab7015677
--- /dev/null
+++ b/app-i18n/canna/canna-3.7_p3-r1.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2009 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-r1.ebuild,v 1.1 2009/09/21 02:55:21 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 CDEBUGFLAGS="${CFLAGS}" canna || die
+
+	if use doc ; then
+		einfo "Compiling DVI, PS (and PDF) document"
+		cd doc/man/guide/tex
+		xmkmf || die
+		emake -j1 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 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
+}
+
+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.7_p3-strip.patch b/app-i18n/canna/files/canna-3.7_p3-strip.patch
new file mode 100644
index 000000000000..ebcde1ef733a
--- /dev/null
+++ b/app-i18n/canna/files/canna-3.7_p3-strip.patch
@@ -0,0 +1,142 @@
+diff -Naur Canna37p3.orig/config.log Canna37p3/config.log
+--- Canna37p3.orig/config.log	1970-01-01 09:00:00.000000000 +0900
++++ Canna37p3/config.log	2009-09-21 10:25:33.000000000 +0900
+@@ -0,0 +1,126 @@
++This file contains any messages produced by compilers while
++running configure, to aid debugging if configure makes a mistake.
++
++It was created by canna configure 3.7p3, which was
++generated by GNU Autoconf 2.59.  Invocation command line was
++
++  $ ./configure 
++
++## --------- ##
++## Platform. ##
++## --------- ##
++
++hostname = lets
++uname -m = x86_64
++uname -r = 2.6.31-gentoo
++uname -s = Linux
++uname -v = #1 SMP PREEMPT Fri Sep 11 17:39:06 JST 2009
++
++/usr/bin/uname -p = Intel(R) Core(TM)2 Duo CPU L7300 @ 1.40GHz
++/bin/uname -X     = unknown
++
++/bin/arch              = unknown
++/usr/bin/arch -k       = unknown
++/usr/convex/getsysinfo = unknown
++hostinfo               = unknown
++/bin/machine           = unknown
++/usr/bin/oslevel       = unknown
++/bin/universe          = unknown
++
++PATH: /usr/local/bin
++PATH: /usr/bin
++PATH: /bin
++PATH: /opt/bin
++PATH: /usr/x86_64-pc-linux-gnu/i686-pc-linux-gnu/gcc-bin/4.3.3
++PATH: /usr/x86_64-pc-linux-gnu/gcc-bin/4.4.1
++PATH: /usr/kde/3.5/bin
++PATH: /usr/qt/3/bin
++PATH: /opt/android-sdk-1.5/tools
++PATH: /opt/android-sdk-1.5/platforms/android-1.5/tools
++PATH: /usr/games/bin
++
++
++## ----------- ##
++## Core tests. ##
++## ----------- ##
++
++configure:1307: error: You cannot invloke configure directly.
++
++## ---------------- ##
++## Cache variables. ##
++## ---------------- ##
++
++ac_cv_env_CC_set=
++ac_cv_env_CC_value=
++ac_cv_env_CFLAGS_set=
++ac_cv_env_CFLAGS_value=
++ac_cv_env_CPPFLAGS_set=
++ac_cv_env_CPPFLAGS_value=
++ac_cv_env_CPP_set=
++ac_cv_env_CPP_value=
++ac_cv_env_LDFLAGS_set=
++ac_cv_env_LDFLAGS_value=
++ac_cv_env_build_alias_set=
++ac_cv_env_build_alias_value=
++ac_cv_env_host_alias_set=
++ac_cv_env_host_alias_value=
++ac_cv_env_target_alias_set=
++ac_cv_env_target_alias_value=
++
++## ----------------- ##
++## Output variables. ##
++## ----------------- ##
++
++CC=''
++CFLAGS=''
++CPP=''
++CPPFLAGS=''
++DEFS=''
++ECHO_C=''
++ECHO_N='-n'
++ECHO_T=''
++EGREP=''
++EXEEXT=''
++LDFLAGS=''
++LIBOBJS=''
++LIBS=''
++LTLIBOBJS=''
++OBJEXT=''
++PACKAGE_BUGREPORT='canna-dev@lists.sourceforge.jp'
++PACKAGE_NAME='canna'
++PACKAGE_STRING='canna 3.7p3'
++PACKAGE_TARNAME='canna'
++PACKAGE_VERSION='3.7p3'
++PATH_SEPARATOR=':'
++SHELL='/bin/sh'
++ac_ct_CC=''
++bindir='${exec_prefix}/bin'
++build_alias=''
++datadir='${prefix}/share'
++exec_prefix='NONE'
++host_alias=''
++includedir='${prefix}/include'
++infodir='${prefix}/info'
++libdir='${exec_prefix}/lib'
++libexecdir='${exec_prefix}/libexec'
++localstatedir='${prefix}/var'
++mandir='${prefix}/man'
++oldincludedir='/usr/include'
++prefix='NONE'
++program_transform_name='s,x,x,'
++sbindir='${exec_prefix}/sbin'
++sharedstatedir='${prefix}/com'
++sysconfdir='${prefix}/etc'
++target_alias=''
++
++## ----------- ##
++## confdefs.h. ##
++## ----------- ##
++
++#define PACKAGE_BUGREPORT "canna-dev@lists.sourceforge.jp"
++#define PACKAGE_NAME "canna"
++#define PACKAGE_STRING "canna 3.7p3"
++#define PACKAGE_TARNAME "canna"
++#define PACKAGE_VERSION "3.7p3"
++
++configure: exit 1
+diff -Naur Canna37p3.orig/server/Imakefile Canna37p3/server/Imakefile
+--- Canna37p3.orig/server/Imakefile	2004-04-27 06:48:37.000000000 +0900
++++ Canna37p3/server/Imakefile	2009-09-21 10:28:48.000000000 +0900
+@@ -6,7 +6,7 @@
+ #ifdef __EMX__
+          INSTFLAGS = $(INSTUGIDFLAGS)
+ #else
+-         INSTFLAGS = -s $(INSTUGIDFLAGS)
++         INSTFLAGS = $(INSTUGIDFLAGS)
+ #endif
+            DEFINES = $(CANNASERVER_DEFINES) $(SIGNAL_DEFINES) ConnectionFlags
+           INCLUDES = -I$(CANNAROOT)/include
diff --git a/app-i18n/canna/files/canna-3.7_p3.confd b/app-i18n/canna/files/canna-3.7_p3.confd
new file mode 100644
index 000000000000..d3fdce5425a2
--- /dev/null
+++ b/app-i18n/canna/files/canna-3.7_p3.confd
@@ -0,0 +1,7 @@
+CANNASERVER_ENABLE_SYSLOG="yes"
+
+# Specify user to run as
+CANNASERVER_OWNER="bin"
+
+# Options for cannaserver
+CANNASERVER_OPTS=""
diff --git a/app-i18n/canna/files/canna-3.7_p3.initd b/app-i18n/canna/files/canna-3.7_p3.initd
new file mode 100644
index 000000000000..12d4a950715b
--- /dev/null
+++ b/app-i18n/canna/files/canna-3.7_p3.initd
@@ -0,0 +1,42 @@
+#!/sbin/runscript
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/canna/files/canna-3.7_p3.initd,v 1.1 2009/09/21 02:55:22 matsuu Exp $
+
+# CANNASERVER_OPTS and CANNASERVER_OWNER is defined in /etc/conf.d/canna
+CANNASERVER_LOGFILE="/var/log/canna/CANNA0msgs"
+
+depend() {
+	after logger
+}
+
+start() {
+	if [ -S /tmp/.iroha_unix/IROHA ] ; then
+		/usr/sbin/cannakill >/dev/null 2>&1
+	fi
+	rm -f /tmp/.iroha_unix/IROHA
+
+	if [ "${CANNASERVER_ENABLE_SYSLOG}" = "yes" ] ; then
+		CANNASERVER_OPTS="${CANNASERVER_OPTS} -syslog"
+	else
+		touch "${CANNASERVER_LOGFILE}"
+		chmod u+w "${CANNASERVER_LOGFILEj}"
+	fi
+
+	if [ ! -z "${CANNASERVER_OWNER}" ] ; then
+		if [ -f "${CANNASERVER_LOGFILE}" ] ; then
+			chown "${CANNASERVER_OWNER}" "${CANNASERVER_LOGFILE}"
+		fi
+		CANNASERVER_OPTS="${CANNASERVER_OPTS} -u ${CANNASERVER_OWNER}"
+	fi
+
+	ebegin "Starting canna"
+	/usr/sbin/cannaserver ${CANNASERVER_OPTS}
+	eend $? "Failed to start canna"
+}
+
+stop() {
+	ebegin "Stopping canna"
+	/usr/sbin/cannakill
+	eend $? "Failed to stop canna"
+}