Fix link with libiconv for BSD; add missing dep on the virtual, keyword it ~x86-fbsd

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 36 insertions, 8 deletions

diff --git a/app-text/mecab/ChangeLog b/app-text/mecab/ChangeLog
index 073d5f0b80ff..8c004b488cb2 100644
--- a/app-text/mecab/ChangeLog
+++ b/app-text/mecab/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/mecab
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/mecab/ChangeLog,v 1.61 2010/01/14 00:18:06 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mecab/ChangeLog,v 1.62 2010/05/02 11:01:57 aballier Exp $
+
+  02 May 2010; Alexis Ballier <aballier@gentoo.org> mecab-0.98.ebuild,
+  +files/mecab-0.98-iconv.patch:
+  Fix link with libiconv for BSD; add missing dep on the virtual, keyword it
+  ~x86-fbsd
 
   14 Jan 2010; Jeroen Roovers <jer@gentoo.org> mecab-0.97-r1.ebuild:
   Stable for HPPA too.
diff --git a/app-text/mecab/Manifest b/app-text/mecab/Manifest
index 02d09fd5f0ff..0d8a9330774d 100644
--- a/app-text/mecab/Manifest
+++ b/app-text/mecab/Manifest
@@ -1,6 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX mecab-0.98-iconv.patch 396 RMD160 870633b56220dc0ba9613d67ea0d6277caa27387 SHA1 ad9653a30f2192fc04464d4a5b11325da0bf1dcd SHA256 03ca106c9c3bf1a9401dd363e017f22b14371d5f8d11e315942951be49de0d1b
 DIST mecab-0.97.tar.gz 1364214 RMD160 a20d86c2993e1febd98eb6969125981c759389f5 SHA1 43ceea0e7acbb760c1022abe94709bd95f1035a0 SHA256 4b7ca277e9e41532a180c07c8ce9178c02468470749437c33d4fd641b90f72dd
 DIST mecab-0.98.tar.gz 1424588 RMD160 d63f396b2fc1b979f98213ba1b0b86a3a5c77cbd SHA1 8977d7760638ec65132e1f9bfc66655ac761f964 SHA256 751d431422539d714a812eba9fbb8468db412221ab03feeb5e4ebd3bbb4e34a2
 EBUILD mecab-0.97-r1.ebuild 1041 RMD160 fe055f2492f00df90398ef8b248ddc279313fa01 SHA1 100b4592495ff17d0be088d5ac8f5c845a609884 SHA256 3d69986d349ca791bd80dd473e71cee0418d82bb18a85805c708cea1664092c5
-EBUILD mecab-0.98.ebuild 976 RMD160 4f198254f0fefc1250cbb9f5f05fe224856753f8 SHA1 cd2c34867e3aaef6e842d9dbe7066044788839d5 SHA256 389c33e80e6a881ebe1e75326b11f04d49bf882b92fe7e8e8252fedd6dcdb62d
-MISC ChangeLog 6887 RMD160 1eb20f2a6428464ddd29b66600ff906a043d31a6 SHA1 3db93dc8bac34958b7f1277e21ea550e08f0f4b4 SHA256 d0a9ef6d18d4e3041ec4e84166f2a2d60a946249afc7e56ac14878b883813ae3
+EBUILD mecab-0.98.ebuild 1051 RMD160 29903bca81b3156768bc597b25bf2fefc45481f2 SHA1 b259864ea372947d70efca394dc7ec98cbe4673c SHA256 0cde8834014780afec2eb4321640a1daa11c746b086247a885284d99c0abe553
+MISC ChangeLog 7086 RMD160 1d922543362cfdda383e654d0f37d088a5ec67f4 SHA1 a111852b4e31212f376cde0cb3f8123c7031a8b9 SHA256 49f5796f09512c045e9be981172d4014b4bd68397488baede3aa3d4f4cc20abf
 MISC metadata.xml 156 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad SHA1 8ccc2b0f20743002b783b1f7b5162c71f7f54c2e SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkvdW6sACgkQvFcC4BYPU0omxwCfTS6Q+pU3L4TI4tZp3Kh1ijp4
+61kAnRJDJ1NmONcVUSWMP6T7Tdc9Muqx
+=2R9W
+-----END PGP SIGNATURE-----
diff --git a/app-text/mecab/files/mecab-0.98-iconv.patch b/app-text/mecab/files/mecab-0.98-iconv.patch
new file mode 100644
index 000000000000..76ead6c38f99
--- /dev/null
+++ b/app-text/mecab/files/mecab-0.98-iconv.patch
@@ -0,0 +1,10 @@
+--- mecab-0.98/src/Makefile.am.old	2010-05-02 12:39:07.000000000 +0200
++++ mecab-0.98/src/Makefile.am	2010-05-02 12:39:28.000000000 +0200
+@@ -17,6 +17,7 @@
+ 			feature_index.cpp  feature_index.h  lbfgs.cpp \
+ 			lbfgs.h  learner_tagger.cpp  learner_tagger.h  learner.cpp  \
+ 			learner_node.h libmecab.cpp
++libmecab_la_LIBADD = $(LTLIBICONV)
+ 
+ include_HEADERS = mecab.h
+ bin_PROGRAMS    = mecab
diff --git a/app-text/mecab/mecab-0.98.ebuild b/app-text/mecab/mecab-0.98.ebuild
index 78b35f2c644c..e05c3e1ee184 100644
--- a/app-text/mecab/mecab-0.98.ebuild
+++ b/app-text/mecab/mecab-0.98.ebuild
@@ -1,22 +1,23 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/mecab/mecab-0.98.ebuild,v 1.2 2009/12/27 17:18:09 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mecab/mecab-0.98.ebuild,v 1.3 2010/05/02 11:01:57 aballier Exp $
 
 EAPI="2"
-inherit autotools
+inherit autotools eutils
 
 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 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 SLOT="0"
 IUSE="unicode"
 
 RESTRICT="test"
 
-DEPEND="dev-lang/perl"
+DEPEND="dev-lang/perl
+	virtual/libiconv"
 PDEPEND=">=app-dicts/mecab-ipadic-2.7.0.20070610"
 
 src_prepare() {
@@ -24,6 +25,7 @@ src_prepare() {
 		-e "/CFLAGS/s/-O3/${CFLAGS}/" \
 		-e "/CXXFLAGS/s/-O3/${CXXFLAGS}/" \
 		configure.in || die
+	epatch "${FILESDIR}/${P}-iconv.patch"
 	eautoreconf
 }