Version bump. Also fix building without hunspell support (bug #356455 by Faustus).

Package-Manager: portage-2.1.9.41/cvs/Linux x86_64

4 files changed, 74 insertions, 10 deletions

diff --git a/dev-libs/link-grammar/ChangeLog b/dev-libs/link-grammar/ChangeLog
index bedb958fd940..7aba23fa50fe 100644
--- a/dev-libs/link-grammar/ChangeLog
+++ b/dev-libs/link-grammar/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/link-grammar
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/link-grammar/ChangeLog,v 1.31 2011/02/24 20:49:23 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/link-grammar/ChangeLog,v 1.32 2011/02/26 11:41:38 pacho Exp $
+
+*link-grammar-4.7.4 (26 Feb 2011)
+
+  26 Feb 2011; Pacho Ramos <pacho@gentoo.org> link-grammar-4.7.2.ebuild,
+  +link-grammar-4.7.4.ebuild:
+  Version bump. Also fix building without hunspell support (bug #356455 by
+  Faustus).
 
   24 Feb 2011; Thomas Kahle <tomka@gentoo.org> link-grammar-4.7.2.ebuild:
   x86 stable per bug 353436
diff --git a/dev-libs/link-grammar/Manifest b/dev-libs/link-grammar/Manifest
index 8070e111442b..c414f57c893a 100644
--- a/dev-libs/link-grammar/Manifest
+++ b/dev-libs/link-grammar/Manifest
@@ -4,14 +4,16 @@ Hash: SHA1
 AUX link-grammar-4.2.4-tokenize.patch 3066 RMD160 964f1051ac5e5c9bbc9d09e481e1fc5c09b0ebba SHA1 3de415726604a2cebe096275182e558867da5d69 SHA256 cc21de0f149c9cfb0a8c7b9516c8ce4c8c60bfd661724551ae2dc54a62e1293e
 DIST link-grammar-4.2.4.tar.gz 741007 RMD160 40cdb470201a3c935c53670534613e1fdddf7c3c SHA1 68a3308f8ebe02231094e542d509f46376ad299b SHA256 e28cf49636d83c8faf487718c913d8fc9d01a54c1c63dc9cd995f4e669a4a740
 DIST link-grammar-4.7.2.tar.gz 1214429 RMD160 a3b474c7f237821ef25f0be112b0adb3b8cf3c33 SHA1 920ae1bbeb3475e09e419ace5056dac4646ca6e5 SHA256 3342f02c23f6642f3c95fdc85c3bdfb710d7c39045ab14a895687c4147434c7f
+DIST link-grammar-4.7.4.tar.gz 1215549 RMD160 80b8fb744371b8e25f3cab22679650c5d0e6ed2d SHA1 75a3963c89950c00bb1a8a2fc557cb33ae398d11 SHA256 272eccb95a66bdaae57e6daa281c00bc9ddf615e624e94b7e6dc686ba10c242d
 EBUILD link-grammar-4.2.4-r1.ebuild 841 RMD160 01b7b614c6438652ec789aaf43e7aedc85bcc116 SHA1 207fd9af083ae3d89a154a43f1e8b3ec1d51e744 SHA256 0930f623ba314aef7bded8daa1d8cdf0f6a73ddfeb0989e21113d8aea7da39b1
-EBUILD link-grammar-4.7.2.ebuild 1443 RMD160 c177814471bd83abfdb5efccca266f859f8a3b67 SHA1 62180c565b58bc7b7892c596255cd619b3b60164 SHA256 4e24edc2d942cc4261d4060dd7bec14fef6650dd16c272a824813e520317ca2c
-MISC ChangeLog 4470 RMD160 3fa95cda39e72022027d1957f11ad3bb00e3a7e4 SHA1 b498cb3477bbbd7f4191bbd63e4b8fb6fb8ae132 SHA256 a9563774fa63047d8bf25db54e88d82b045eaa783911c2049ee24f6ebc164845
+EBUILD link-grammar-4.7.2.ebuild 1538 RMD160 9b57aa6355c83366d976c5abacbcc91c371c0a0e SHA1 62e92916962fb3e9f53ee13ee67f238d77fe508e SHA256 71669d73ce21a07436d983205581b8cd1cf44889ca7e96db86c988b538948a84
+EBUILD link-grammar-4.7.4.ebuild 1540 RMD160 6d98e66ad4545a9e4de9be300013362563de6c14 SHA1 3455a8c0d74c3801da794bced4d458cb08cbc7f0 SHA256 2a6f791b9ae4e75ae889068808feb3543472b440c67c56fbeb7fe6ed75e95719
+MISC ChangeLog 4696 RMD160 5c6f227133d68239c9a5666e2f89bdc3a822dc68 SHA1 a922c25cf78d55b92a818d243fbab8f9672b1ec8 SHA256 13a778c7e52e1a8bfcf5c31fb2295f97345cb82caca3011e88ddeec5920f1f5b
 MISC metadata.xml 618 RMD160 2340b1bd64f510ca36a4ce721d62a4e6cc0043ce SHA1 c3ffb7a97006a6b3b9a3168269fc31b20ec380f9 SHA256 cfdb69d26897959029ed42c3561c2503ccc78ffda281d68aaef6e3402d0b7565
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk1mxLwACgkQnZsgo/h8kNa2XACgnuD2juZutP3+QGIGvJ2bBZHO
-OtYAn11ca7hhh3KH7V5zwjv7EalZlDWU
-=7dkR
+iEYEARECAAYFAk1o5vgACgkQCaWpQKGI+9QusgCfYkvu76rMH83lWOhQfn4AAc6R
+Vw0AoIUJ2s+HMNnp6+o5Bx+L+um+M9wC
+=6mCC
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/link-grammar/link-grammar-4.7.2.ebuild b/dev-libs/link-grammar/link-grammar-4.7.2.ebuild
index 8d30f49e6f19..1d249f18a36c 100644
--- a/dev-libs/link-grammar/link-grammar-4.7.2.ebuild
+++ b/dev-libs/link-grammar/link-grammar-4.7.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/link-grammar/link-grammar-4.7.2.ebuild,v 1.3 2011/02/24 20:49:23 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/link-grammar/link-grammar-4.7.2.ebuild,v 1.4 2011/02/26 11:41:38 pacho Exp $
 
 EAPI="3"
 
@@ -8,7 +8,7 @@ inherit java-pkg-opt-2
 
 DESCRIPTION="Link Grammar Parser is a syntactic English parser based on
 link grammar."
-HOMEPAGE="http://www.link.cs.cmu.edu/link/"
+HOMEPAGE="http://www.abisource.com/projects/link-grammar/ http://www.link.cs.cmu.edu/link/"
 SRC_URI="http://www.abisource.com/downloads/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="as-is"
@@ -33,14 +33,17 @@ pkg_setup() {
 }
 
 src_configure() {
+	local myconf
+
+	use hunspell && myconf="${myconf} --with-hunspell-dictdir=/usr/share/myspell"
 	econf \
 		--enable-shared \
 		$(use_enable aspell) \
 		$(use_enable hunspell) \
-		$(use_with hunspell hunspell-dictdir=/usr/share/myspell) \
 		$(use_enable java java-bindings) \
 		$(use_enable static-libs static) \
-		$(use_enable threads pthreads)
+		$(use_enable threads pthreads) \
+		${myconf}
 }
 
 src_install() {
diff --git a/dev-libs/link-grammar/link-grammar-4.7.4.ebuild b/dev-libs/link-grammar/link-grammar-4.7.4.ebuild
new file mode 100644
index 000000000000..7c4195681c30
--- /dev/null
+++ b/dev-libs/link-grammar/link-grammar-4.7.4.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/link-grammar/link-grammar-4.7.4.ebuild,v 1.1 2011/02/26 11:41:38 pacho Exp $
+
+EAPI="3"
+
+inherit java-pkg-opt-2
+
+DESCRIPTION="Link Grammar Parser is a syntactic English parser based on
+link grammar."
+HOMEPAGE="http://www.abisource.com/projects/link-grammar/ http://www.link.cs.cmu.edu/link/"
+SRC_URI="http://www.abisource.com/downloads/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# Set the same default as used in app-text/enchant
+IUSE="aspell +hunspell java static-libs threads"
+
+DEPEND="aspell? ( app-text/aspell )
+	hunspell? ( app-text/hunspell )
+	java? ( >=virtual/jdk-1.5 )"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+	if use aspell && use hunspell; then
+		ewarn "You have enabled 'aspell' and 'hunspell' support, but both cannot coexist,"
+		ewarn "only aspell will be build. Press Ctrl+C and set only 'hunspell' USE flag if"
+		ewarn "you want hunspell support."
+	fi
+}
+
+src_configure() {
+	local myconf
+
+	use hunspell && myconf="${myconf} --with-hunspell-dictdir=/usr/share/myspell"
+	econf \
+		--enable-shared \
+		$(use_enable aspell) \
+		$(use_enable hunspell) \
+		$(use_enable java java-bindings) \
+		$(use_enable static-libs static) \
+		$(use_enable threads pthreads) \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "install failed"
+	dodoc AUTHORS ChangeLog README || die
+}