version bump.

(Portage version: 2.0.51.21-r1)

12 files changed, 51 insertions, 221 deletions

diff --git a/app-i18n/anthy-ss/ChangeLog b/app-i18n/anthy-ss/ChangeLog
index aee3ff9cf847..994bdc8193e1 100644
--- a/app-i18n/anthy-ss/ChangeLog
+++ b/app-i18n/anthy-ss/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-i18n/anthy-ss
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/anthy-ss/ChangeLog,v 1.65 2005/04/14 12:57:48 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/anthy-ss/ChangeLog,v 1.66 2005/05/05 14:25:31 hattya Exp $
+
+*anthy-ss-6504 (05 May 2005)
+
+  05 May 2005; Akinori Hattori <hattya@gentoo.org>
+  +files/anthy-ss-mkdic-gcc34.diff, -anthy-ss-6024.ebuild,
+  -anthy-ss-6125.ebuild, -anthy-ss-6131.ebuild, -anthy-ss-6331.ebuild,
+  +anthy-ss-6504.ebuild:
+  version bump.
 
 *anthy-ss-6331 (14 Apr 2005)
 
diff --git a/app-i18n/anthy-ss/Manifest b/app-i18n/anthy-ss/Manifest
index 1a20ac8df159..f88c361b7163 100644
--- a/app-i18n/anthy-ss/Manifest
+++ b/app-i18n/anthy-ss/Manifest
@@ -1,11 +1,6 @@
 MD5 fc1514a880b25d8db3d2b4c6ea0f5481 ChangeLog 8566
-MD5 bb9850aca38be64e684ef0a018f60976 anthy-ss-6024.ebuild 1513
-MD5 4860655fc1704d53fb7b114fbf80e882 anthy-ss-6125.ebuild 1513
-MD5 fa3d36c93c13f1b4c9bb5483ec3c7a96 anthy-ss-6131.ebuild 1513
-MD5 1f2e5665adb8b9f16325804c00c00512 anthy-ss-6331.ebuild 1513
+MD5 91447f1186a33b65aa5cac0ef7b31dc1 anthy-ss-6504.ebuild 1529
 MD5 bae17b53f1633ca708e67b8762933954 metadata.xml 616
 MD5 d91fcb424ec63b588900d2d88a8bcee2 files/50anthy-gentoo.el 99
-MD5 72302f8477a04967cb0cbc0c19fb5902 files/digest-anthy-ss-6024 63
-MD5 9600fdfa7b132c1942a74e968b209f2e files/digest-anthy-ss-6125 63
-MD5 137a4e9f5cb4f3aad8e2f03d398904a4 files/digest-anthy-ss-6131 63
-MD5 76748bfe758341f40f98f9d5dd114329 files/digest-anthy-ss-6331 63
+MD5 9ad5e85186b6813cb0e7a76976ed8fd3 files/anthy-ss-mkdic-gcc34.diff 790
+MD5 87719dd71b90587e74ea768ed9c7ed69 files/digest-anthy-ss-6504 63
diff --git a/app-i18n/anthy-ss/anthy-ss-6125.ebuild b/app-i18n/anthy-ss/anthy-ss-6125.ebuild
deleted file mode 100644
index 822568624407..000000000000
--- a/app-i18n/anthy-ss/anthy-ss-6125.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/anthy-ss/anthy-ss-6125.ebuild,v 1.2 2005/02/05 14:34:48 hattya Exp $
-
-inherit elisp-common
-
-IUSE="emacs ucs4"
-
-MY_P="${P/-ss/}"
-
-DESCRIPTION="Anthy -- free and secure Japanese input system"
-HOMEPAGE="http://anthy.sourceforge.jp/"
-SRC_URI="mirror://sourceforge.jp/anthy/13135/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
-SLOT="0"
-S="${WORKDIR}/${MY_P}"
-
-DEPEND="emacs? ( virtual/emacs )
-	!app-i18n/anthy"
-
-src_compile() {
-
-	local myconf
-	local cannadicdir=/var/lib/canna/dic/canna
-
-	use emacs || myconf="EMACS=no"
-	use ucs4 && myconf="${myconf} --enable-ucs4"
-
-	if has_version 'app-dicts/canna-zipcode'; then
-		einfo "Adding zipcode.t and jigyosyo.t to anthy.dic."
-		cp ${cannadicdir}/{zipcode,jigyosyo}.t mkanthydic
-		sed -i -e "/^EXTRA_DICS/s|$| zipcode.t jigyosyo.t|" mkanthydic/Makefile.in
-	fi
-
-	if has_version 'app-dicts/canna-2ch'; then
-		einfo "Adding nichan.ctd to anthy.dic."
-		cp ${cannadicdir}/nichan.ctd mkanthydic/2ch.t
-		sed -i -e "/^EXTRA_DICS/s|$| 2ch.t|" mkanthydic/Makefile.in
-	fi
-
-	econf ${myconf} || die
-	emake || die
-
-}
-
-src_install() {
-
-	make DESTDIR=${D} install || die
-
-	use emacs && elisp-site-file-install ${FILESDIR}/50anthy-gentoo.el
-
-	dodoc [A-Z][A-Z]* ChangeLog doc/[A-Z0-9][A-Z0-9]* doc/protocol.txt
-
-}
-
-pkg_postinst() {
-
-	use emacs && elisp-site-regen
-
-}
-
-pkg_postrm() {
-
-	has_version virtual/emacs && elisp-site-regen
-
-}
diff --git a/app-i18n/anthy-ss/anthy-ss-6131.ebuild b/app-i18n/anthy-ss/anthy-ss-6131.ebuild
deleted file mode 100644
index 478f221b8f18..000000000000
--- a/app-i18n/anthy-ss/anthy-ss-6131.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/anthy-ss/anthy-ss-6131.ebuild,v 1.2 2005/02/05 14:34:48 hattya Exp $
-
-inherit elisp-common
-
-IUSE="emacs ucs4"
-
-MY_P="${P/-ss/}"
-
-DESCRIPTION="Anthy -- free and secure Japanese input system"
-HOMEPAGE="http://anthy.sourceforge.jp/"
-SRC_URI="mirror://sourceforge.jp/anthy/13203/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
-SLOT="0"
-S="${WORKDIR}/${MY_P}"
-
-DEPEND="emacs? ( virtual/emacs )
-	!app-i18n/anthy"
-
-src_compile() {
-
-	local myconf
-	local cannadicdir=/var/lib/canna/dic/canna
-
-	use emacs || myconf="EMACS=no"
-	use ucs4 && myconf="${myconf} --enable-ucs4"
-
-	if has_version 'app-dicts/canna-zipcode'; then
-		einfo "Adding zipcode.t and jigyosyo.t to anthy.dic."
-		cp ${cannadicdir}/{zipcode,jigyosyo}.t mkanthydic
-		sed -i -e "/^EXTRA_DICS/s|$| zipcode.t jigyosyo.t|" mkanthydic/Makefile.in
-	fi
-
-	if has_version 'app-dicts/canna-2ch'; then
-		einfo "Adding nichan.ctd to anthy.dic."
-		cp ${cannadicdir}/nichan.ctd mkanthydic/2ch.t
-		sed -i -e "/^EXTRA_DICS/s|$| 2ch.t|" mkanthydic/Makefile.in
-	fi
-
-	econf ${myconf} || die
-	emake || die
-
-}
-
-src_install() {
-
-	make DESTDIR=${D} install || die
-
-	use emacs && elisp-site-file-install ${FILESDIR}/50anthy-gentoo.el
-
-	dodoc [A-Z][A-Z]* ChangeLog doc/[A-Z0-9][A-Z0-9]* doc/protocol.txt
-
-}
-
-pkg_postinst() {
-
-	use emacs && elisp-site-regen
-
-}
-
-pkg_postrm() {
-
-	has_version virtual/emacs && elisp-site-regen
-
-}
diff --git a/app-i18n/anthy-ss/anthy-ss-6331.ebuild b/app-i18n/anthy-ss/anthy-ss-6331.ebuild
deleted file mode 100644
index 58c0da630f22..000000000000
--- a/app-i18n/anthy-ss/anthy-ss-6331.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/anthy-ss/anthy-ss-6331.ebuild,v 1.1 2005/04/14 12:57:48 hattya Exp $
-
-inherit elisp-common
-
-IUSE="emacs ucs4"
-
-MY_P="${P/-ss/}"
-
-DESCRIPTION="Anthy -- free and secure Japanese input system"
-HOMEPAGE="http://anthy.sourceforge.jp/"
-SRC_URI="mirror://sourceforge.jp/anthy/14065/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
-SLOT="0"
-S="${WORKDIR}/${MY_P}"
-
-DEPEND="emacs? ( virtual/emacs )
-	!app-i18n/anthy"
-
-src_compile() {
-
-	local myconf
-	local cannadicdir=/var/lib/canna/dic/canna
-
-	use emacs || myconf="EMACS=no"
-	use ucs4 && myconf="${myconf} --enable-ucs4"
-
-	if has_version 'app-dicts/canna-zipcode'; then
-		einfo "Adding zipcode.t and jigyosyo.t to anthy.dic."
-		cp ${cannadicdir}/{zipcode,jigyosyo}.t mkanthydic
-		sed -i -e "/^EXTRA_DICS/s|$| zipcode.t jigyosyo.t|" mkanthydic/Makefile.in
-	fi
-
-	if has_version 'app-dicts/canna-2ch'; then
-		einfo "Adding nichan.ctd to anthy.dic."
-		cp ${cannadicdir}/nichan.ctd mkanthydic/2ch.t
-		sed -i -e "/^EXTRA_DICS/s|$| 2ch.t|" mkanthydic/Makefile.in
-	fi
-
-	econf ${myconf} || die
-	emake || die
-
-}
-
-src_install() {
-
-	make DESTDIR=${D} install || die
-
-	use emacs && elisp-site-file-install ${FILESDIR}/50anthy-gentoo.el
-
-	dodoc [A-Z][A-Z]* ChangeLog doc/[A-Z0-9][A-Z0-9]* doc/protocol.txt
-
-}
-
-pkg_postinst() {
-
-	use emacs && elisp-site-regen
-
-}
-
-pkg_postrm() {
-
-	has_version virtual/emacs && elisp-site-regen
-
-}
diff --git a/app-i18n/anthy-ss/anthy-ss-6024.ebuild b/app-i18n/anthy-ss/anthy-ss-6504.ebuild
index 84925f6f7801..f0f472ba7314 100644
--- a/app-i18n/anthy-ss/anthy-ss-6024.ebuild
+++ b/app-i18n/anthy-ss/anthy-ss-6504.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/anthy-ss/anthy-ss-6024.ebuild,v 1.1 2005/01/06 14:48:07 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/anthy-ss/anthy-ss-6504.ebuild,v 1.1 2005/05/05 14:25:31 hattya Exp $
 
-inherit elisp-common
+inherit elisp-common eutils
 
 IUSE="emacs ucs4"
 
@@ -10,7 +10,7 @@ MY_P="${P/-ss/}"
 
 DESCRIPTION="Anthy -- free and secure Japanese input system"
 HOMEPAGE="http://anthy.sourceforge.jp/"
-SRC_URI="mirror://sourceforge.jp/anthy/12708/${MY_P}.tar.gz"
+SRC_URI="mirror://sourceforge.jp/anthy/14562/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~ppc"
@@ -20,6 +20,15 @@ S="${WORKDIR}/${MY_P}"
 DEPEND="emacs? ( virtual/emacs )
 	!app-i18n/anthy"
 
+src_unpack() {
+
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-mkdic-gcc34.diff
+
+}
+
 src_compile() {
 
 	local myconf
@@ -51,7 +60,10 @@ src_install() {
 
 	use emacs && elisp-site-file-install ${FILESDIR}/50anthy-gentoo.el
 
-	dodoc [A-Z][A-Z]* ChangeLog doc/[A-Z0-9][A-Z0-9]* doc/protocol.txt
+	rm doc/Makefile*
+
+	dodoc AUTHORS COPYING DIARY INSTALL NEWS README ChangeLog
+	dodoc doc/*
 
 }
 
diff --git a/app-i18n/anthy-ss/files/anthy-ss-mkdic-gcc34.diff b/app-i18n/anthy-ss/files/anthy-ss-mkdic-gcc34.diff
new file mode 100644
index 000000000000..b18c86893a94
--- /dev/null
+++ b/app-i18n/anthy-ss/files/anthy-ss-mkdic-gcc34.diff
@@ -0,0 +1,22 @@
+--- mkanthydic/mkdic.c.orig	2004-08-29 04:54:48.000000000 +0900
++++ mkanthydic/mkdic.c	2004-11-27 01:06:54.930846856 +0900
+@@ -455,7 +455,8 @@
+ 	(strcmp(ye->entries[i-1].word, we->word) ||
+ 	 strcmp(ye->entries[i-1].wt, we->wt) ||
+ 	 ye->entries[i-1].freq != we->freq)) {
+-      count += fprintf(yomi_entry_out, "%s", we->wt);
++      fprintf(yomi_entry_out, "%s", we->wt);
++      count += strlen(we->wt);
+       if (we->freq > 1) {
+ 	count += fprintf(yomi_entry_out, "*%d", we->freq);
+       }
+@@ -464,7 +465,8 @@
+     /* 単語を出力する場所がこの単語のid */
+     we->offset = count + ye->offset;
+     /* 単語を出力する */
+-    count += fprintf(yomi_entry_out, "%s", we->word);
++    fprintf(yomi_entry_out, "%s", we->word);
++    count += strlen(we->word);
+   }
+ 
+   fputc(0, yomi_entry_out);
\ No newline at end of file
diff --git a/app-i18n/anthy-ss/files/digest-anthy-ss-6024 b/app-i18n/anthy-ss/files/digest-anthy-ss-6024
deleted file mode 100644
index a9afd2f77ae9..000000000000
--- a/app-i18n/anthy-ss/files/digest-anthy-ss-6024
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9cdedd9d4f384131c09a5b3fc5c097e6 anthy-6024.tar.gz 1578915
diff --git a/app-i18n/anthy-ss/files/digest-anthy-ss-6125 b/app-i18n/anthy-ss/files/digest-anthy-ss-6125
deleted file mode 100644
index 268978f8e3f9..000000000000
--- a/app-i18n/anthy-ss/files/digest-anthy-ss-6125
+++ /dev/null
@@ -1 +0,0 @@
-MD5 34de9d766d8a049ced489c482840e75d anthy-6125.tar.gz 1918633
diff --git a/app-i18n/anthy-ss/files/digest-anthy-ss-6131 b/app-i18n/anthy-ss/files/digest-anthy-ss-6131
deleted file mode 100644
index b04acc74e51b..000000000000
--- a/app-i18n/anthy-ss/files/digest-anthy-ss-6131
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ee094243b33fc75f144da56f5ebb580e anthy-6131.tar.gz 1957129
diff --git a/app-i18n/anthy-ss/files/digest-anthy-ss-6331 b/app-i18n/anthy-ss/files/digest-anthy-ss-6331
deleted file mode 100644
index 513eabc26540..000000000000
--- a/app-i18n/anthy-ss/files/digest-anthy-ss-6331
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ca52a1b3bf567dfff83e83ea9d22ddc4 anthy-6331.tar.gz 2050192
diff --git a/app-i18n/anthy-ss/files/digest-anthy-ss-6504 b/app-i18n/anthy-ss/files/digest-anthy-ss-6504
new file mode 100644
index 000000000000..e07ad21e5728
--- /dev/null
+++ b/app-i18n/anthy-ss/files/digest-anthy-ss-6504
@@ -0,0 +1 @@
+MD5 9440d830b0414ec3a683cdca730f6bd2 anthy-6504.tar.gz 2200099