version bump. Fixed deprecated sort invocation (#142818)

Package-Manager: portage-2.1-r1

7 files changed, 224 insertions, 11 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/Manifest b/app-i18n/canna/Manifest
index 2ff0a35a33e2..9182f99f0657 100644
--- a/app-i18n/canna/Manifest
+++ b/app-i18n/canna/Manifest
@@ -1,13 +1,70 @@
-MD5 5d0cb1f5c87df77ad6976d10e1250d51 ChangeLog 7648
-MD5 7cd8950ba0ed57a188100540f5d07be9 canna-3.6_p4.ebuild 2884
-MD5 0c6e92739dc57d7825523e1c87b8fe21 canna-3.7_p2.ebuild 3549
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX canna-3.6_p4-gentoo.diff 5587 RMD160 910bee940fbf38904c83044668643f7c345a0f1e SHA1 64f1eeed55c10bff3e3f95a93ab1c5c9529a6836 SHA256 751e38a6c3da0d2c0ae9ae9e85556e2e62c994c3cc418d49dcfe8f5d760c3160
 MD5 d77588a06485914d6bab3aab2a1985fb files/canna-3.6_p4-gentoo.diff 5587
+RMD160 910bee940fbf38904c83044668643f7c345a0f1e files/canna-3.6_p4-gentoo.diff 5587
+SHA256 751e38a6c3da0d2c0ae9ae9e85556e2e62c994c3cc418d49dcfe8f5d760c3160 files/canna-3.6_p4-gentoo.diff 5587
+AUX canna-3.7-gentoo.diff.in 5263 RMD160 ea831d20398acbb041c7eeab40da7cca9f5219e6 SHA1 14df72ddd7ff7d75a544551e5c858b2c468f8989 SHA256 f28461116339136aab7e8f48b5de00d747cc60a8a5c55d23011e2513f63d51ae
 MD5 2b13f6b61d303f6bf273a325ff3bc411 files/canna-3.7-gentoo.diff.in 5263
+RMD160 ea831d20398acbb041c7eeab40da7cca9f5219e6 files/canna-3.7-gentoo.diff.in 5263
+SHA256 f28461116339136aab7e8f48b5de00d747cc60a8a5c55d23011e2513f63d51ae files/canna-3.7-gentoo.diff.in 5263
+AUX canna-kpdef-gentoo.diff 255 RMD160 48cf3687a8ec5122d6590bbc2a0625db5760e69b SHA1 92add4da962d9f8f5adcd85da25e26881caee36f SHA256 01084734a7a9d208325608e5e81888610de8d8a8af2e75a576e6a506c9523c90
 MD5 d817072e9bb7181804fdde1b52427a3f files/canna-kpdef-gentoo.diff 255
+RMD160 48cf3687a8ec5122d6590bbc2a0625db5760e69b files/canna-kpdef-gentoo.diff 255
+SHA256 01084734a7a9d208325608e5e81888610de8d8a8af2e75a576e6a506c9523c90 files/canna-kpdef-gentoo.diff 255
+AUX canna.confd 299 RMD160 3b0cc3e962fd9ad6cc88bf5b750bfaeffe148070 SHA1 a438df286288573c7039a080323521b6bc482f49 SHA256 a234a1206826aa51b512d2074cf48b6fe80ac2d29d6dbcb5718c54eb04a3eb96
 MD5 c7949e9a4baa711a7088b00df56327fa files/canna.confd 299
+RMD160 3b0cc3e962fd9ad6cc88bf5b750bfaeffe148070 files/canna.confd 299
+SHA256 a234a1206826aa51b512d2074cf48b6fe80ac2d29d6dbcb5718c54eb04a3eb96 files/canna.confd 299
+AUX canna.hosts 5 RMD160 6521c5adf71cc0ba51dedb4857c9c1734193eee0 SHA1 7911eab418cfd117a977527655bdb7990a1b7fc8 SHA256 d66f691617a7b447171b7586b8f16741a023a810f1307542c254053318f19ca0
 MD5 d60168a33fd321ad1a29382cafcb60d3 files/canna.hosts 5
+RMD160 6521c5adf71cc0ba51dedb4857c9c1734193eee0 files/canna.hosts 5
+SHA256 d66f691617a7b447171b7586b8f16741a023a810f1307542c254053318f19ca0 files/canna.hosts 5
+AUX canna.initd 999 RMD160 52031c9fff687e3f8411e757d01fd049ed03e080 SHA1 536aebd960fc0d6a62d532f5a00f4cfe6de5a97f SHA256 8b5b168c3bf6d17eafb467f64c3b76811cf26effd91ad87da3dc5bb7de8c8468
 MD5 1bddc843aac5df610cf99b180a83352c files/canna.initd 999
-MD5 c48de658742361ca5549edaddebb3e94 files/digest-canna-3.6_p4 62
-MD5 300a4fe937c6c06bda8fe832906b672c files/digest-canna-3.7_p2 63
+RMD160 52031c9fff687e3f8411e757d01fd049ed03e080 files/canna.initd 999
+SHA256 8b5b168c3bf6d17eafb467f64c3b76811cf26effd91ad87da3dc5bb7de8c8468 files/canna.initd 999
+AUX update-canna-dics_dir 1101 RMD160 8c73fa6c6814a4032eea45bab19321f579715f3d SHA1 389b96aa9ba069af43c56283f584ce4a84eecf02 SHA256 d1114dce288e815f897b20eabd177bb5b77e0d479bcb4b7eff9afb0d65607f11
 MD5 0d09a45d1074f9f4801a48bf8ec3208a files/update-canna-dics_dir 1101
+RMD160 8c73fa6c6814a4032eea45bab19321f579715f3d files/update-canna-dics_dir 1101
+SHA256 d1114dce288e815f897b20eabd177bb5b77e0d479bcb4b7eff9afb0d65607f11 files/update-canna-dics_dir 1101
+DIST Canna36p4.tar.gz 1455672
+DIST Canna37p2.tar.bz2 1263325 RMD160 21ed7e026cc55f1b8c76a41e7f8cdd4058380a32 SHA1 2bfbd119e4a470463fc68ae36f70cf4ed39dba83 SHA256 ab163cb90acb33ce2c3a2293329ac3cd1ce2a25e0a8e337518e7fab5b28b52c3
+DIST Canna37p3.tar.bz2 1263065 RMD160 33e5eb9e2dc144835db838612897e652acbc60ed SHA1 e39eece7c70c669dd46dd74b26121a60a2496fde SHA256 7d98d925043d3af24f99a8a2a09e3b4d6dfe881efc1303ef4a7f495a0f4542a7
+EBUILD canna-3.6_p4.ebuild 2879 RMD160 a9faefaf1981c8ea830d4e40d622d3f2e93aa790 SHA1 4376b1f42acb216ea18c7f0d1b218bd92dce9095 SHA256 b2b46c0064e8de9e44f6905d8bf425144de75d900dc4828f94277a0490dc2880
+MD5 64cfba0af4b826dd10e4da4e4d582b3a canna-3.6_p4.ebuild 2879
+RMD160 a9faefaf1981c8ea830d4e40d622d3f2e93aa790 canna-3.6_p4.ebuild 2879
+SHA256 b2b46c0064e8de9e44f6905d8bf425144de75d900dc4828f94277a0490dc2880 canna-3.6_p4.ebuild 2879
+EBUILD canna-3.7_p2.ebuild 3657 RMD160 f9f73f3b8886d7134f526044479bf2f812e3ecea SHA1 1d876e94d5f6378e33bad31a029243c03350f1be SHA256 e46b1677bb151b2415f5dc09a19adac1cee9806979cb474d6c33415c83e1baff
+MD5 6594e84b72db4c023bafeb804e674a52 canna-3.7_p2.ebuild 3657
+RMD160 f9f73f3b8886d7134f526044479bf2f812e3ecea canna-3.7_p2.ebuild 3657
+SHA256 e46b1677bb151b2415f5dc09a19adac1cee9806979cb474d6c33415c83e1baff canna-3.7_p2.ebuild 3657
+EBUILD canna-3.7_p3.ebuild 3663 RMD160 b039227354eed4687cb3a66f61ac413897451c5a SHA1 bdc32a05739e92d6178abb2d41d870b5100b7228 SHA256 afb13e89ef262b9c467ce1f76bc6bc763e076d3b48458c716f17f76c4b29d577
+MD5 aec94e6d7eb78f3f1a4b809319e1d860 canna-3.7_p3.ebuild 3663
+RMD160 b039227354eed4687cb3a66f61ac413897451c5a canna-3.7_p3.ebuild 3663
+SHA256 afb13e89ef262b9c467ce1f76bc6bc763e076d3b48458c716f17f76c4b29d577 canna-3.7_p3.ebuild 3663
+MISC ChangeLog 7850 RMD160 e02d7366660e423ec444e1961245c7dbf22f50e2 SHA1 9ed586a23d00ba0f8d69115232b7ab22559e0d6f SHA256 7da09a7645b71d7d69bf06fcbc3edc04d1fb4d3bdd28f67a328da83f0577993d
+MD5 0620fc17ee43817ddff3f445c3e6b7ae ChangeLog 7850
+RMD160 e02d7366660e423ec444e1961245c7dbf22f50e2 ChangeLog 7850
+SHA256 7da09a7645b71d7d69bf06fcbc3edc04d1fb4d3bdd28f67a328da83f0577993d ChangeLog 7850
+MISC metadata.xml 156 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad SHA1 8ccc2b0f20743002b783b1f7b5162c71f7f54c2e SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215
 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
+RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad metadata.xml 156
+SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215 metadata.xml 156
+MD5 c48de658742361ca5549edaddebb3e94 files/digest-canna-3.6_p4 62
+RMD160 f2406c816d4bdf204786d9246c6faabdc0ac60bc files/digest-canna-3.6_p4 62
+SHA256 8804594f1e76beda80aada56ac812f06e2a88aad731947e12daf1559bf1c3d65 files/digest-canna-3.6_p4 62
+MD5 36c9b4db84d35c80cd0379698d557562 files/digest-canna-3.7_p2 235
+RMD160 740983c62b04a79ca8d21667980a200d2a3ecfc5 files/digest-canna-3.7_p2 235
+SHA256 92d90efaa5f07897ef7ae41ce231396839f9d57ac64434cd1a2c069a772e91de files/digest-canna-3.7_p2 235
+MD5 c0222ed748903a926730f1be5364a640 files/digest-canna-3.7_p3 235
+RMD160 816a6ed3ac03ac67a8843bdbe0834e70c042b5a2 files/digest-canna-3.7_p3 235
+SHA256 6381f104319efd3b1e613d414c0b73a42da78506b1e7f8e4a0d17047423d3e0d files/digest-canna-3.7_p3 235
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.4 (GNU/Linux)
+
+iD8DBQFE6G5PuB6ZT1m7QRERAqlfAJ9bIGQjcQ5tJebDHz/4mG/SrnDD+ACeJ1jT
+9gtshB2DftQlqV9S77QgpK8=
+=d64F
+-----END PGP SIGNATURE-----
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