Version bumped. Backported amd64 patch.

(Portage version: 2.0.53)

6 files changed, 85 insertions, 6 deletions

diff --git a/app-text/cabocha/ChangeLog b/app-text/cabocha/ChangeLog
index 5a165bde9468..513cedb8c44f 100644
--- a/app-text/cabocha/ChangeLog
+++ b/app-text/cabocha/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/cabocha
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/cabocha/ChangeLog,v 1.1 2005/05/22 16:54:31 usata Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/cabocha/ChangeLog,v 1.2 2006/02/02 22:48:09 usata Exp $
+
+*cabocha-0.53 (02 Feb 2006)
+
+  02 Feb 2006; Mamoru KOMACHI <usata@gentoo.org>
+  +files/cabocha-0.52-amd64.patch, cabocha-0.52.ebuild,
+  +cabocha-0.53.ebuild:
+  Version bumped. Backported amd64 patch.
 
 *cabocha-0.52 (22 May 2005)
 
diff --git a/app-text/cabocha/Manifest b/app-text/cabocha/Manifest
index 0a42e6505730..055cc41cc897 100644
--- a/app-text/cabocha/Manifest
+++ b/app-text/cabocha/Manifest
@@ -1,4 +1,7 @@
-MD5 9c99d889fdcdd5ded01f3cb6aff35364 cabocha-0.52.ebuild 675
-MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
 MD5 a3741cfc29bd3c2bf2b4799edb10ecab ChangeLog 340
+MD5 df2edb2504220dffc9c81561f8f63386 cabocha-0.52.ebuild 824
+MD5 febdd485134bf41a0b3ff0653ad59af2 cabocha-0.53.ebuild 878
+MD5 a5ea63e48b88360d8ebb1a10fbc8e6de files/cabocha-0.52-amd64.patch 516
 MD5 ca7f442fc1ada22f485872048802a86d files/digest-cabocha-0.52 66
+MD5 2496a9ac70ff522617a018ae9639454c files/digest-cabocha-0.53 66
+MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
diff --git a/app-text/cabocha/cabocha-0.52.ebuild b/app-text/cabocha/cabocha-0.52.ebuild
index fc4ae89584a4..f6dcd93b70d2 100644
--- a/app-text/cabocha/cabocha-0.52.ebuild
+++ b/app-text/cabocha/cabocha-0.52.ebuild
@@ -1,6 +1,8 @@
-# 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-text/cabocha/cabocha-0.52.ebuild,v 1.1 2005/05/22 16:54:31 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/cabocha/cabocha-0.52.ebuild,v 1.2 2006/02/02 22:48:09 usata Exp $
+
+inherit eutils
 
 DESCRIPTION="Yet Another Japanese Dependency Structure Analyzer"
 HOMEPAGE="http://chasen.org/~taku/software/cabocha/"
@@ -17,6 +19,14 @@ DEPEND="app-text/yamcha
 	|| ( app-text/chasen app-text/mecab )"
 #RDEPEND=""
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# http://cl.it.okayama-u.ac.jp/study/installmemo.html
+	epatch ${FILESDIR}/${P}-amd64.patch
+}
+
 src_test() {
 	make check || die
 }
diff --git a/app-text/cabocha/cabocha-0.53.ebuild b/app-text/cabocha/cabocha-0.53.ebuild
new file mode 100644
index 000000000000..39395d317fa6
--- /dev/null
+++ b/app-text/cabocha/cabocha-0.53.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/cabocha/cabocha-0.53.ebuild,v 1.1 2006/02/02 22:48:09 usata Exp $
+
+inherit perl-module
+
+DESCRIPTION="Yet Another Japanese Dependency Structure Analyzer"
+HOMEPAGE="http://chasen.org/~taku/software/cabocha/"
+SRC_URI="http://chasen.org/~taku/software/cabocha/src/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~x86"
+
+IUSE="perl"
+#IUSE="python ruby"
+
+DEPEND="app-text/yamcha
+	|| ( app-text/chasen app-text/mecab )"
+#RDEPEND=""
+
+src_compile() {
+	econf || die
+	emake || die
+
+	if use perl ; then
+		cd perl
+		perl-module_src_compile || die
+	fi
+}
+
+src_test() {
+	make check || die
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+
+	dodoc AUTHORS README TODO
+
+	if use perl ; then
+		cd perl
+		perl-module_src_install || die
+	fi
+}
diff --git a/app-text/cabocha/files/cabocha-0.52-amd64.patch b/app-text/cabocha/files/cabocha-0.52-amd64.patch
new file mode 100644
index 000000000000..ffc5c1f95582
--- /dev/null
+++ b/app-text/cabocha/files/cabocha-0.52-amd64.patch
@@ -0,0 +1,13 @@
+diff -ru cabocha-0.52.old/src/common.h cabocha-0.52/src/common.h
+--- cabocha-0.52.old/src/common.h	2004-03-08 23:18:39.000000000 +0900
++++ cabocha-0.52/src/common.h	2005-09-20 13:08:33.000000000 +0900
+@@ -102,7 +102,7 @@
+    
+   static inline void replaceString (std::string &s, const std::string &src, const std::string &dst)
+   {
+-    unsigned int pos = s.find (src);
++    size_t pos = s.find (src);
+     if (pos != std::string::npos) s.replace (pos, src.size(), dst);
+   }
+ 
+cabocha-0.52/srcだけに発見: common.h~
diff --git a/app-text/cabocha/files/digest-cabocha-0.53 b/app-text/cabocha/files/digest-cabocha-0.53
new file mode 100644
index 000000000000..baec838f7696
--- /dev/null
+++ b/app-text/cabocha/files/digest-cabocha-0.53
@@ -0,0 +1 @@
+MD5 78fedfce32427f1e4e0bd927caa6d694 cabocha-0.53.tar.gz 11552551