CXXFLAGS support, bug #240138.

(Portage version: 2.2_rc11/cvs/Linux 2.6.26-gentoo-r1 x86_64)

4 files changed, 25 insertions, 74 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/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() {