fixes a problem of anthy.dic generation.

Package-Manager: portage-2.0.51.22-r3

8 files changed, 29 insertions, 27 deletions

diff --git a/app-i18n/anthy-ss/ChangeLog b/app-i18n/anthy-ss/ChangeLog
index e1037f962eb0..6e4481becede 100644
--- a/app-i18n/anthy-ss/ChangeLog
+++ b/app-i18n/anthy-ss/ChangeLog
@@ -1,6 +1,12 @@
 # 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.73 2005/11/13 08:17:19 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/anthy-ss/ChangeLog,v 1.74 2005/12/18 13:22:11 hattya Exp $
+
+*anthy-ss-7029-r1 (18 Dec 2005)
+
+  18 Dec 2005; Akinori Hattori <hattya@gentoo.org> -anthy-ss-7029.ebuild,
+  +anthy-ss-7029-r1.ebuild:
+  fixes a problem of anthy.dic generation.
 
 *anthy-ss-7029 (13 Nov 2005)
 
diff --git a/app-i18n/anthy-ss/Manifest b/app-i18n/anthy-ss/Manifest
index 4bd5581c0ee9..666cb43a8cd6 100644
--- a/app-i18n/anthy-ss/Manifest
+++ b/app-i18n/anthy-ss/Manifest
@@ -1,5 +1,5 @@
-MD5 76079129ecc034c65fc27d3713113581 ChangeLog 9849
-MD5 91f8ec67de9cb1597462d89033562424 anthy-ss-7029.ebuild 1554
+MD5 a760c85cc8d73ba16cb85fb8f3e72a25 ChangeLog 10028
+MD5 83bd8873921abd7be570d812bf48e333 anthy-ss-7029-r1.ebuild 1202
 MD5 bae17b53f1633ca708e67b8762933954 metadata.xml 616
 MD5 d91fcb424ec63b588900d2d88a8bcee2 files/50anthy-gentoo.el 99
-MD5 6e2cb79ce59258d74ad7aa854afd1b8f files/digest-anthy-ss-7029 63
+MD5 6e2cb79ce59258d74ad7aa854afd1b8f files/digest-anthy-ss-7029-r1 63
diff --git a/app-i18n/anthy-ss/anthy-ss-7029.ebuild b/app-i18n/anthy-ss/anthy-ss-7029-r1.ebuild
index b4d0cb9be725..b0e5bef900a9 100644
--- a/app-i18n/anthy-ss/anthy-ss-7029.ebuild
+++ b/app-i18n/anthy-ss/anthy-ss-7029-r1.ebuild
@@ -1,6 +1,6 @@
 # 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-7029.ebuild,v 1.1 2005/11/13 08:17:19 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/anthy-ss/anthy-ss-7029-r1.ebuild,v 1.1 2005/12/18 13:22:11 hattya Exp $
 
 inherit elisp-common eutils
 
@@ -28,20 +28,15 @@ src_compile() {
 	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
+		sed -i -e /placename/a"read ${cannadicdir}/nichan.ctd" \
+			mkanthydic/dict.args.in
 	fi
 
+	unset TMPDIR
 	econf ${myconf} || die
-	emake -j1 || die
+	emake || die
 
 }
 
diff --git a/app-i18n/anthy-ss/files/digest-anthy-ss-7029 b/app-i18n/anthy-ss/files/digest-anthy-ss-7029-r1
index d7159d59ae67..d7159d59ae67 100644
--- a/app-i18n/anthy-ss/files/digest-anthy-ss-7029
+++ b/app-i18n/anthy-ss/files/digest-anthy-ss-7029-r1
diff --git a/app-i18n/anthy/ChangeLog b/app-i18n/anthy/ChangeLog
index 90c462f1c669..32ac59ab6314 100644
--- a/app-i18n/anthy/ChangeLog
+++ b/app-i18n/anthy/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-i18n/anthy
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/anthy/ChangeLog,v 1.64 2005/11/13 08:13:18 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/anthy/ChangeLog,v 1.65 2005/12/18 13:18:59 hattya Exp $
+
+*anthy-7100b-r1 (18 Dec 2005)
+
+  18 Dec 2005; Akinori Hattori <hattya@gentoo.org> -anthy-7100b.ebuild,
+  +anthy-7100b-r1.ebuild:
+  fixes a problem of anthy.dic generation.
 
 *anthy-7100b (13 Nov 2005)
 
diff --git a/app-i18n/anthy/Manifest b/app-i18n/anthy/Manifest
index 5a719811da5d..4ebc2b1dba90 100644
--- a/app-i18n/anthy/Manifest
+++ b/app-i18n/anthy/Manifest
@@ -1,8 +1,8 @@
 MD5 c96c2bde0829f51e72fbd7ef9df0c76a ChangeLog 7772
 MD5 faf1852ef3403fd62aa675b397a2b340 anthy-6700b.ebuild 1698
-MD5 e84508463215932fc09400f2d2531664 anthy-7100b.ebuild 1546
+MD5 b39dfe37bd21f74a00c58c2a1abc07db anthy-7100b-r1.ebuild 1199
 MD5 bae17b53f1633ca708e67b8762933954 metadata.xml 616
 MD5 d91fcb424ec63b588900d2d88a8bcee2 files/50anthy-gentoo.el 99
 MD5 9ad5e85186b6813cb0e7a76976ed8fd3 files/anthy-mkdic-gcc34.patch 790
 MD5 eecee82ed1c729dee6226842542ca4c5 files/digest-anthy-6700b 64
-MD5 71a8f13547736954f74d553acc29a6f1 files/digest-anthy-7100b 64
+MD5 71a8f13547736954f74d553acc29a6f1 files/digest-anthy-7100b-r1 64
diff --git a/app-i18n/anthy/anthy-7100b.ebuild b/app-i18n/anthy/anthy-7100b-r1.ebuild
index d99c4a9b9f12..2f4265b9769d 100644
--- a/app-i18n/anthy/anthy-7100b.ebuild
+++ b/app-i18n/anthy/anthy-7100b-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/anthy/anthy-7100b.ebuild,v 1.1 2005/11/13 08:13:18 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/anthy/anthy-7100b-r1.ebuild,v 1.1 2005/12/18 13:18:59 hattya Exp $
 
 inherit elisp-common eutils
 
@@ -25,20 +25,15 @@ src_compile() {
 	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
+		sed -i -e /placename/a"read ${cannadicdir}/nichan.ctd" \
+			mkanthydic/dict.args.in
 	fi
 
+	unset TMPDIR
 	econf ${myconf} || die
-	emake -j1 || die
+	emake || die
 
 }
 
diff --git a/app-i18n/anthy/files/digest-anthy-7100b b/app-i18n/anthy/files/digest-anthy-7100b-r1
index eb91940950cd..eb91940950cd 100644
--- a/app-i18n/anthy/files/digest-anthy-7100b
+++ b/app-i18n/anthy/files/digest-anthy-7100b-r1