CXXFLAGS support, bug #240138.

Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.26-gentoo-r1 x86_64

5 files changed, 27 insertions, 91 deletions

diff --git a/app-text/mecab/ChangeLog b/app-text/mecab/ChangeLog
index 399639429c49..b81cc84c23cd 100644
--- a/app-text/mecab/ChangeLog
+++ b/app-text/mecab/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/mecab
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/mecab/ChangeLog,v 1.51 2008/08/08 21:32:00 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mecab/ChangeLog,v 1.52 2008/10/07 00:06:21 matsuu Exp $
+
+*mecab-0.97-r1 (07 Oct 2008)
+
+  07 Oct 2008; MATSUU Takuto <matsuu@gentoo.org> -mecab-0.92.ebuild,
+  -mecab-0.93.ebuild, -mecab-0.95.ebuild, +mecab-0.97-r1.ebuild:
+  CXXFLAGS support, bug #240138. Removed old versions.
 
   08 Aug 2008; Markus Meier <maekke@gentoo.org> mecab-0.96.ebuild:
   amd64 stable, bug #228387
diff --git a/app-text/mecab/Manifest b/app-text/mecab/Manifest
index c6181f104fc5..d6ffc695757c 100644
--- a/app-text/mecab/Manifest
+++ b/app-text/mecab/Manifest
@@ -1,22 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-DIST mecab-0.92.tar.gz 1073039 RMD160 24619eaec380c04495eebd62ea620bb530c2d66f SHA1 d27e0810fdecaeefc8caad4df4d6202889206fd2 SHA256 6f61c93fbe9f6c0483edceb2d72f58e9138aad59c5414dd885d68a621f679d70
-DIST mecab-0.93.tar.gz 1072942 RMD160 ac55ce22fe3c1b90311043e505d6b6e1a2ee19f0 SHA1 aa2f1701dda9358b48acc01f230444fe251835d6 SHA256 139716223a25660121c2e8cbb3e9f2ba53d031a356b4f7ccd0a6cee0287253db
-DIST mecab-0.95.tar.gz 1385805 RMD160 bd8393ddae802fc98a999dd68f25564e8317f5c0 SHA1 676af69b652393e3fdbb58ddf99b9aae13a87c4a SHA256 005de362036b842dcf6566290103a02bffb151f9df6edc1834c4720195af8191
 DIST mecab-0.96.tar.gz 1387493 RMD160 8032ff1cea3ee8201d4f32d540e45b277e8846e8 SHA1 a9dc9b0dd25287ee81fd16dc09066c3640e2ed11 SHA256 b1330d01bdcd2efa9bab59e50820a22c282c90b4aef89ee462b97d381d95d7e0
 DIST mecab-0.97.tar.gz 1364214 RMD160 a20d86c2993e1febd98eb6969125981c759389f5 SHA1 43ceea0e7acbb760c1022abe94709bd95f1035a0 SHA256 4b7ca277e9e41532a180c07c8ce9178c02468470749437c33d4fd641b90f72dd
-EBUILD mecab-0.92.ebuild 775 RMD160 d50eefc83114e04236dab93bd6575665e626d5f7 SHA1 13f9f334c9fc8fa829f964b1fcd60fb4fb04b3b8 SHA256 b5ab85601ad3f28a09c3b364df28d78df4f80fa64a98438f06c271ed8b1ba2d6
-EBUILD mecab-0.93.ebuild 797 RMD160 86e25b612592d4f5c00a8816595ec79f7046badb SHA1 3b212f72f8f38a092b6f0e7f9a4e5b276eb9bd4f SHA256 852be38f331a3f27fb4d2c2ffd5dc429b73475dd89301b810c8a100a29d7b600
-EBUILD mecab-0.95.ebuild 809 RMD160 6e52db86ac1a54d5f8523333a52bb9f3b8c91f1f SHA1 fbc63037091d5e8b1d26eb8791b9a7bda22816f0 SHA256 b0cf506debc3ccfd777544d81e5ac0676fbdb3f4779abe6cfbf483653daa14c1
 EBUILD mecab-0.96.ebuild 790 RMD160 736a9ecbf0a3e63520834a4865086ee886a75bc5 SHA1 3bd8a1ffa2497eb15e69bca0d89f9991cb4380dc SHA256 cab295a074bb3e29c4b2e71298ed6693e2271745c09fc09c171f7f2f01753b82
+EBUILD mecab-0.97-r1.ebuild 1040 RMD160 ed7ad863ad018e49db50bb7defc5591e50170859 SHA1 13791c9bc7cd007e526a5463c737c0cd1f3642d2 SHA256 a2b9f1ebc8b21e2c62d47d520ddf366260da6c225b7203168fa450838a3e42e3
 EBUILD mecab-0.97.ebuild 812 RMD160 cf3a98bede95d8120527bbd7f8323464a3f7ef38 SHA1 28ccb7a63baf65a75f402e8de887cad53bc39290 SHA256 004228d1c835dbeb393505f010a58dfc7f8aede89ccf66ed3f1bb61886554f18
-MISC ChangeLog 5706 RMD160 f81ab19d39ae7e1ead4ca56da8aa21e8dd1e4b81 SHA1 97179aedbb2e4bcfc645d9a707da973ba8b192d6 SHA256 2a138d60b4e48ae3db6e248115baf903f2659e0801aaac0f820b567ceaaa6878
+MISC ChangeLog 5926 RMD160 ad5767ae2303fd9fe2945477cc0c91b854c3a58d SHA1 7042d6e80fa30ddfd78238944b3acf041eae1502 SHA256 e1737e831424f078b501ccf7ebb4e5dcf165bf8ca9424310b805b14356b0a091
 MISC metadata.xml 156 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad SHA1 8ccc2b0f20743002b783b1f7b5162c71f7f54c2e SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkicu6IACgkQkKaRLQcq0GKa8ACgk0nThKu9xQELsYw1gvJ0UMdN
-t9QAnial56WDV1wao7XvABrgLCANwvhq
-=RYo5
------END PGP SIGNATURE-----
diff --git a/app-text/mecab/mecab-0.92.ebuild b/app-text/mecab/mecab-0.92.ebuild
deleted file mode 100644
index 18c1d44fe4be..000000000000
--- a/app-text/mecab/mecab-0.92.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/mecab/mecab-0.92.ebuild,v 1.7 2007/03/12 14:43:09 hattya Exp $
-
-IUSE="unicode"
-
-DESCRIPTION="Yet Another Part-of-Speech and Morphological Analyzer"
-HOMEPAGE="http://mecab.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="amd64 ~ia64 ~ppc ppc64 sparc x86"
-SLOT="0"
-
-DEPEND="dev-lang/perl"
-PDEPEND=">=app-dicts/mecab-ipadic-2.7.0.20060707"
-
-src_compile() {
-
-	local myconf
-
-	use unicode && myconf="${myconf} --with-charset=utf8"
-
-	econf ${myconf} || die
-	emake || die
-
-}
-
-src_install() {
-
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS README || die
-	dohtml -r doc || die
-
-}
diff --git a/app-text/mecab/mecab-0.93.ebuild b/app-text/mecab/mecab-0.93.ebuild
deleted file mode 100644
index f7694cef2e42..000000000000
--- a/app-text/mecab/mecab-0.93.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/mecab/mecab-0.93.ebuild,v 1.5 2007/05/06 04:56:53 dertobi123 Exp $
-
-IUSE="unicode"
-
-DESCRIPTION="Yet Another Part-of-Speech and Morphological Analyzer"
-HOMEPAGE="http://mecab.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="|| ( BSD LGPL-2.1 GPL-2 )"
-KEYWORDS="~amd64 ~ia64 ppc ppc64 ~sparc x86"
-SLOT="0"
-
-DEPEND="dev-lang/perl"
-PDEPEND=">=app-dicts/mecab-ipadic-2.7.0.20060707"
-
-src_compile() {
-
-	local myconf
-
-	use unicode && myconf="${myconf} --with-charset=utf8"
-
-	econf ${myconf} || die
-	emake || die
-
-}
-
-src_install() {
-
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS README || die
-	dohtml -r doc || die
-
-}
diff --git a/app-text/mecab/mecab-0.95.ebuild b/app-text/mecab/mecab-0.97-r1.ebuild
index 2d32981b411d..31c90000c2ff 100644
--- a/app-text/mecab/mecab-0.95.ebuild
+++ b/app-text/mecab/mecab-0.97-r1.ebuild
@@ -1,20 +1,35 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/mecab/mecab-0.95.ebuild,v 1.7 2008/03/22 18:58:35 coldwind Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mecab/mecab-0.97-r1.ebuild,v 1.1 2008/10/07 00:06:21 matsuu Exp $
 
 IUSE="unicode"
 
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="latest"
+
+inherit autotools
+
 DESCRIPTION="Yet Another Part-of-Speech and Morphological Analyzer"
 HOMEPAGE="http://mecab.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( BSD LGPL-2.1 GPL-2 )"
-KEYWORDS="amd64 ia64 ~ppc ppc64 sparc x86"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 SLOT="0"
 RESTRICT="test"
 
 DEPEND="dev-lang/perl"
-PDEPEND=">=app-dicts/mecab-ipadic-2.7.0.20060707"
+PDEPEND=">=app-dicts/mecab-ipadic-2.7.0.20070610"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	sed -i \
+		-e "/CFLAGS/s/-O3/${CFLAGS}/" \
+		-e "/CXXFLAGS/s/-O3/${CXXFLAGS}/" \
+		configure.in || die
+	eautoreconf
+}
 
 src_compile() {