version bump. Fixed deprecated sort invocation (#142818)

(Portage version: 2.1-r1)

6 files changed, 162 insertions, 6 deletions

diff --git a/app-i18n/canna/ChangeLog b/app-i18n/canna/ChangeLog
index 54c1f0f99bbd..3629df46b415 100644
--- a/app-i18n/canna/ChangeLog
+++ b/app-i18n/canna/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-i18n/canna
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/canna/ChangeLog,v 1.50 2006/01/25 07:24:58 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/canna/ChangeLog,v 1.51 2006/08/20 14:14:09 liquidx Exp $
+
+*canna-3.7_p3 (20 Aug 2006)
+
+  20 Aug 2006; Alastair Tse <liquidx@gentoo.org> canna-3.6_p4.ebuild,
+  canna-3.7_p2.ebuild, +canna-3.7_p3.ebuild:
+  version bump. Fixed deprecated sort invocation (#142818)
 
   25 Jan 2006; Donnie Berkholz <spyderous@gentoo.org>; canna-3.7_p2.ebuild:
   (#118603) Add modular X deps.
diff --git a/app-i18n/canna/canna-3.6_p4.ebuild b/app-i18n/canna/canna-3.6_p4.ebuild
index 5744d67d7b43..e5381794b3d5 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-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # 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.18 2005/01/01 14:26:12 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/canna/canna-3.6_p4.ebuild,v 1.19 2006/08/20 14:14:09 liquidx Exp $
 
 inherit cannadic eutils
 
@@ -10,7 +10,7 @@ DESCRIPTION="A client-server based Kana-Kanji conversion system"
 HOMEPAGE="http://canna.sourceforge.jp/"
 SRC_URI="mirror://sourceforge.jp/canna/6059/${MY_P}.tar.gz"
 
-LICENSE="as-is"
+LICENSE="MIT"
 SLOT="0"
 KEYWORDS="x86 ppc sparc alpha"
 IUSE="doc"
diff --git a/app-i18n/canna/canna-3.7_p2.ebuild b/app-i18n/canna/canna-3.7_p2.ebuild
index 1ea5bf272714..d580ec986835 100644
--- a/app-i18n/canna/canna-3.7_p2.ebuild
+++ b/app-i18n/canna/canna-3.7_p2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # 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.14 2006/01/25 07:24:58 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/canna/canna-3.7_p2.ebuild,v 1.15 2006/08/20 14:14:09 liquidx Exp $
 
 inherit cannadic eutils multilib
 
@@ -10,7 +10,7 @@ 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"
+LICENSE="MIT"
 SLOT="0"
 KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
 IUSE="doc"
@@ -40,6 +40,9 @@ src_unpack() {
 	cd ${S}
 	# Multilib-strict fix for amd64
 	sed -i -e "s:\(DefLibCannaDir.*\)/lib:\1/$(get_libdir):g" Canna.conf*
+	# fix deprecated sort syntax
+	sed -e 's:^\(sortcmd=\".* -s\).*$:\1 -k 1,1\":' \
+		-i cmd/mkbindic/mkbindic.cpp
 }
 
 src_compile() {
diff --git a/app-i18n/canna/canna-3.7_p3.ebuild b/app-i18n/canna/canna-3.7_p3.ebuild
new file mode 100644
index 000000000000..b8023b5f1d62
--- /dev/null
+++ b/app-i18n/canna/canna-3.7_p3.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2006 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.ebuild,v 1.1 2006/08/20 14:14:09 liquidx Exp $
+
+inherit cannadic eutils multilib
+
+MY_P="Canna${PV//./}"
+
+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="virtual/libc
+	>=sys-apps/sed-4
+	|| ( ( x11-misc/gccmakedep
+			x11-misc/imake
+		)
+		virtual/x11
+	)
+	doc? ( app-text/ptex )"
+RDEPEND="virtual/libc"
+
+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
+
+	cd ${S}
+	# Multilib-strict fix for amd64
+	sed -i -e "s:\(DefLibCannaDir.*\)/lib:\1/$(get_libdir):g" Canna.conf*
+	# fix deprecated sort syntax
+	sed -e 's:^\(sortcmd=\".* -s\).*$:\1 -k 1,1\":' \
+		-i cmd/mkbindic/mkbindic.cpp
+}
+
+src_compile() {
+	xmkmf || die
+
+	#make libCannaDir=../lib/canna canna || die
+	make canna || die
+
+	if 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 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
index f97e8ff12f09..88ca675cdde1 100644
--- a/app-i18n/canna/files/digest-canna-3.7_p2
+++ b/app-i18n/canna/files/digest-canna-3.7_p2
@@ -1 +1,3 @@
 MD5 8c978ccfd636af68ac4da5ac711e654f Canna37p2.tar.bz2 1263325
+RMD160 21ed7e026cc55f1b8c76a41e7f8cdd4058380a32 Canna37p2.tar.bz2 1263325
+SHA256 ab163cb90acb33ce2c3a2293329ac3cd1ce2a25e0a8e337518e7fab5b28b52c3 Canna37p2.tar.bz2 1263325
diff --git a/app-i18n/canna/files/digest-canna-3.7_p3 b/app-i18n/canna/files/digest-canna-3.7_p3
new file mode 100644
index 000000000000..376c99d60c6a
--- /dev/null
+++ b/app-i18n/canna/files/digest-canna-3.7_p3
@@ -0,0 +1,3 @@
+MD5 0b8c241f63ab4cd3c0b9be569456dc33 Canna37p3.tar.bz2 1263065
+RMD160 33e5eb9e2dc144835db838612897e652acbc60ed Canna37p3.tar.bz2 1263065
+SHA256 7d98d925043d3af24f99a8a2a09e3b4d6dfe881efc1303ef4a7f495a0f4542a7 Canna37p3.tar.bz2 1263065