5 files changed, 72 insertions, 59 deletions
diff --git a/app-dicts/ipadic/ChangeLog b/app-dicts/ipadic/ChangeLog
index 8da789268bab..071529710c90 100644
--- a/app-dicts/ipadic/ChangeLog
+++ b/app-dicts/ipadic/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-dicts/ipadic
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/ipadic/ChangeLog,v 1.19 2010/01/04 14:52:16 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/ipadic/ChangeLog,v 1.20 2010/03/21 00:31:52 matsuu Exp $
+
+*ipadic-2.7.0-r1 (21 Mar 2010)
+
+  21 Mar 2010; MATSUU Takuto <matsuu@gentoo.org> -ipadic-2.6.1.ebuild,
+  -ipadic-2.6.3.ebuild, +ipadic-2.7.0-r1.ebuild,
+  +files/ipadic-2.7.0-gentoo.patch:
+  Fixed parallel-make issue, bug #299613. Removed old versions.
 
   04 Jan 2010; Diego E. Pettenò <flameeyes@gentoo.org> ipadic-2.7.0.ebuild:
   Use -j1 for build (bug #299613).
diff --git a/app-dicts/ipadic/files/ipadic-2.7.0-gentoo.patch b/app-dicts/ipadic/files/ipadic-2.7.0-gentoo.patch
new file mode 100644
index 000000000000..159684a96d96
--- /dev/null
+++ b/app-dicts/ipadic/files/ipadic-2.7.0-gentoo.patch
@@ -0,0 +1,33 @@
+--- ipadic-2.7.0.orig/Makefile.am	2003-09-13 14:37:17.000000000 +0900
++++ ipadic-2.7.0/Makefile.am	2010-03-21 09:25:48.000000000 +0900
+@@ -11,18 +11,22 @@
+ EXTRA_DIST    = $(pre_data) $(lexical_dic) $(manual_files) @PACKAGE@.spec
+ CLEANFILES    = $(gen_data)
+ #
+-matrix.cha table.cha:
++matrix.cha table.cha: makemat.done
++makemat.done:
+ 	$(MKDICDIR)/makemat
++	touch makemat.done
+ 
+-chadic.da: 
++chadic.da chadic.dat chadic.lex: makeda.done
++makeda.done:
+ 	$(MKDICDIR)/makeda chadic *.dic
++	touch makeda.done
+ 
+-install-data-local:
+-	if test -f @CHASEN_CHASENRC_PATH@  ; then \
+-		echo "Please modify @CHASEN_CHASENRC_PATH@"; \
+-	else \
+-		cp chasenrc @CHASEN_CHASENRC_PATH@ ;\
+-	fi
++#install-data-local:
++#	if test -f @CHASEN_CHASENRC_PATH@  ; then \
++#		echo "Please modify @CHASEN_CHASENRC_PATH@"; \
++#	else \
++#		cp chasenrc @CHASEN_CHASENRC_PATH@ ;\
++#	fi
+ 
+ sjis-dist: dist
+ 	gtar xzvf ipadic-@VERSION@.tar.gz
diff --git a/app-dicts/ipadic/ipadic-2.6.1.ebuild b/app-dicts/ipadic/ipadic-2.6.1.ebuild
deleted file mode 100644
index a1047c9a6070..000000000000
--- a/app-dicts/ipadic/ipadic-2.6.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/ipadic/ipadic-2.6.1.ebuild,v 1.11 2009/10/17 22:57:36 halcy0n Exp $
-
-IUSE=""
-
-DESCRIPTION="Japanese dictionary for ChaSen"
-HOMEPAGE="http://chasen.aist-nara.ac.jp/chasen/distribution.html.en"
-SRC_URI="http://chasen.aist-nara.ac.jp/stable/ipadic/${P}.tar.gz"
-
-LICENSE="ipadic"
-KEYWORDS="x86 amd64 ppc"
-SLOT="0"
-
-DEPEND=">=app-text/chasen-2.3.2"
-
-src_compile() {
-	sed -i -e "/^install-data-am:/s/install-data-local//" Makefile.in
-	econf || die
-	make || die
-}
-
-src_install () {
-	make DESTDIR="${D}" install || die
-
-	insinto /etc
-	doins chasenrc
-	dodoc README NEWS || die
-}
diff --git a/app-dicts/ipadic/ipadic-2.6.3.ebuild b/app-dicts/ipadic/ipadic-2.6.3.ebuild
deleted file mode 100644
index 4a9882214398..000000000000
--- a/app-dicts/ipadic/ipadic-2.6.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/ipadic/ipadic-2.6.3.ebuild,v 1.8 2009/10/17 22:57:36 halcy0n Exp $
-
-IUSE=""
-
-DESCRIPTION="Japanese dictionary for ChaSen"
-HOMEPAGE="http://chasen.aist-nara.ac.jp/chasen/distribution.html.en"
-SRC_URI="http://chasen.aist-nara.ac.jp/stable/ipadic/${P}.tar.gz"
-
-LICENSE="ipadic"
-KEYWORDS="x86 amd64 ppc"
-SLOT="0"
-
-DEPEND=">=app-text/chasen-2.3.2"
-
-src_compile() {
-	sed -i -e "/^install-data-am:/s/install-data-local//" Makefile.in
-	econf || die
-	make || die
-}
-
-src_install () {
-	make DESTDIR="${D}" install || die
-
-	insinto /etc
-	doins chasenrc
-	dodoc README NEWS || die
-}
diff --git a/app-dicts/ipadic/ipadic-2.7.0-r1.ebuild b/app-dicts/ipadic/ipadic-2.7.0-r1.ebuild
new file mode 100644
index 000000000000..2e6b6c3a6d7b
--- /dev/null
+++ b/app-dicts/ipadic/ipadic-2.7.0-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/ipadic/ipadic-2.7.0-r1.ebuild,v 1.1 2010/03/21 00:31:52 matsuu Exp $
+
+EAPI="2"
+inherit autotools eutils
+
+DESCRIPTION="Japanese dictionary for ChaSen"
+HOMEPAGE="http://chasen.aist-nara.ac.jp/chasen/distribution.html.en"
+SRC_URI="http://chasen.aist-nara.ac.jp/stable/ipadic/${P}.tar.gz"
+
+LICENSE="ipadic"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+SLOT="0"
+IUSE=""
+
+DEPEND=">=app-text/chasen-2.3.1"
+RDEPEND=""
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-gentoo.patch"
+	eautoreconf
+}
+
+src_install () {
+	emake DESTDIR="${D}" install || die
+
+	insinto /etc
+	doins chasenrc || die
+	dodoc AUTHORS ChangeLog NEWS README || die
+}