Add nls USE flag and activate configure option (thanks Flameeyes).

Package-Manager: portage-2.1.1_rc1-r1

4 files changed, 105 insertions, 9 deletions

diff --git a/app-text/hunspell/ChangeLog b/app-text/hunspell/ChangeLog
index f1b07fcf9546..830255464485 100644
--- a/app-text/hunspell/ChangeLog
+++ b/app-text/hunspell/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/hunspell
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/hunspell/ChangeLog,v 1.19 2006/08/08 02:07:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/hunspell/ChangeLog,v 1.20 2006/08/30 21:38:11 kevquinn Exp $
+
+*hunspell-1.1.4-r2 (30 Aug 2006)
+
+  30 Aug 2006; Kevin F. Quinn <kevquinn@gentoo.org>
+  +hunspell-1.1.4-r2.ebuild:
+  Add nls USE flag and activate configure option (thanks Flameeyes).  Also skip
+  installation of internal header files.
 
   08 Aug 2006; Mike Frysinger <vapier@gentoo.org>
   +files/hunspell-1.1.4-gettext.patch, hunspell-1.1.4-r1.ebuild:
diff --git a/app-text/hunspell/Manifest b/app-text/hunspell/Manifest
index 826cf1fadd6a..6476aad3d4c0 100644
--- a/app-text/hunspell/Manifest
+++ b/app-text/hunspell/Manifest
@@ -27,14 +27,18 @@ EBUILD hunspell-1.1.4-r1.ebuild 2327 RMD160 387cac38e62dbc9899a015f2610b5ce481bb
 MD5 2fdbdc060a8ae4acf956540ca7d448fe hunspell-1.1.4-r1.ebuild 2327
 RMD160 387cac38e62dbc9899a015f2610b5ce481bb9ff8 hunspell-1.1.4-r1.ebuild 2327
 SHA256 50cd1999dd2877f00f44994ab36957da6da7717dc7120f24ded0121e86dbef9e hunspell-1.1.4-r1.ebuild 2327
+EBUILD hunspell-1.1.4-r2.ebuild 2586 RMD160 f201af2697459ff3b9b8a8961f40d9777c0e7938 SHA1 062100c95e1ce1bb54bce3789693e8469559b1ab SHA256 1b868510ef0e27e176957a48987ca3daf7a6df45205a605a8ea8907716697fdc
+MD5 95bc4cdf2fb149fc84cf1c09b5371208 hunspell-1.1.4-r2.ebuild 2586
+RMD160 f201af2697459ff3b9b8a8961f40d9777c0e7938 hunspell-1.1.4-r2.ebuild 2586
+SHA256 1b868510ef0e27e176957a48987ca3daf7a6df45205a605a8ea8907716697fdc hunspell-1.1.4-r2.ebuild 2586
 EBUILD hunspell-1.1.4.ebuild 1889 RMD160 02aa24fc15a9bd5ef259f69ccf8abf0cadf7aa74 SHA1 402daa8b13dd392b7f28b5d71e3bd9ad2e25f059 SHA256 a4e2a46380f410d90cfe29fc66f98b2afcffc0ad4dbaadd795245d1b0c67ff1d
 MD5 cdfb2bd272e3ea9f73d637c488e0bd27 hunspell-1.1.4.ebuild 1889
 RMD160 02aa24fc15a9bd5ef259f69ccf8abf0cadf7aa74 hunspell-1.1.4.ebuild 1889
 SHA256 a4e2a46380f410d90cfe29fc66f98b2afcffc0ad4dbaadd795245d1b0c67ff1d hunspell-1.1.4.ebuild 1889
-MISC ChangeLog 2861 RMD160 6012cfddbb0d2ab789a199b722d2b3984bbb6e5e SHA1 6e36709ce640b3ff7576860f48abaf37cfe1738f SHA256 a3f5d1e380faf9a3a891116234c43aa7f05653061c8c1a56df2ad693900173e1
-MD5 5fb94384a6255dcad3ced9d6b1508c39 ChangeLog 2861
-RMD160 6012cfddbb0d2ab789a199b722d2b3984bbb6e5e ChangeLog 2861
-SHA256 a3f5d1e380faf9a3a891116234c43aa7f05653061c8c1a56df2ad693900173e1 ChangeLog 2861
+MISC ChangeLog 3100 RMD160 f7181ba182e3b0c41bcbe2cc8c98b4635995b2c1 SHA1 17f9bba564ad7501bfbf92298d4c6fdbac62ce7d SHA256 de73cca68bbb6f40942f9f3ca466c0ea08fcc32f60cdb06eafbb65c8d1500b29
+MD5 0897ff2a569f941854bd4700cdd2660c ChangeLog 3100
+RMD160 f7181ba182e3b0c41bcbe2cc8c98b4635995b2c1 ChangeLog 3100
+SHA256 de73cca68bbb6f40942f9f3ca466c0ea08fcc32f60cdb06eafbb65c8d1500b29 ChangeLog 3100
 MISC metadata.xml 222 RMD160 a74fc306077c440fea351793a03168651fb28f13 SHA1 45da96e6af3a3e7898ca55691d0e07583b6c75bf SHA256 5e7b34981ea08b001bd6eac085d6876fbeef6a4fdd91575e4e9f988cadf4f03f
 MD5 b86e3c93f969dbb4f433611cb0f6b0b0 metadata.xml 222
 RMD160 a74fc306077c440fea351793a03168651fb28f13 metadata.xml 222
@@ -48,10 +52,13 @@ SHA256 79ec82c9c39e4a5050b2167c57df3360dd2ce8108230df591025f2974c981300 files/di
 MD5 2acdba27673f2a9db779932d38020c9b files/digest-hunspell-1.1.4-r1 244
 RMD160 ed8fcd1f97b2840c563fa8aeebadf1f943a42249 files/digest-hunspell-1.1.4-r1 244
 SHA256 79ec82c9c39e4a5050b2167c57df3360dd2ce8108230df591025f2974c981300 files/digest-hunspell-1.1.4-r1 244
+MD5 2acdba27673f2a9db779932d38020c9b files/digest-hunspell-1.1.4-r2 244
+RMD160 ed8fcd1f97b2840c563fa8aeebadf1f943a42249 files/digest-hunspell-1.1.4-r2 244
+SHA256 79ec82c9c39e4a5050b2167c57df3360dd2ce8108230df591025f2974c981300 files/digest-hunspell-1.1.4-r2 244
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFE1/HramhnQswr0vIRAjv4AKCEKUk9FU4AgKmFQRh0MlSTFMJipQCgs/Kk
-fivi5AkZlW5JmJ5mZEpmPKs=
-=MwdI
+iD8DBQFE9gVWZfNLSOUrp0sRAl80AJ49QP8gXBr6OC6rFgmXGDPg4W7AbACdGvBW
+Cwv1BFnK7FZ//DH7pibgFUY=
+=bRkL
 -----END PGP SIGNATURE-----
diff --git a/app-text/hunspell/files/digest-hunspell-1.1.4-r2 b/app-text/hunspell/files/digest-hunspell-1.1.4-r2
new file mode 100644
index 000000000000..1bd701b1a28f
--- /dev/null
+++ b/app-text/hunspell/files/digest-hunspell-1.1.4-r2
@@ -0,0 +1,3 @@
+MD5 4cf2dfb89dd58392ad5a1183c69eb628 hunspell-1.1.4.tar.gz 438667
+RMD160 a90ded6b996d8b2d575268e8a4b025e92b85f378 hunspell-1.1.4.tar.gz 438667
+SHA256 8d39c03beb71ec1482d2fdbfc2d5b7690c8a70fb6da4885369752ee0d2e3a635 hunspell-1.1.4.tar.gz 438667
diff --git a/app-text/hunspell/hunspell-1.1.4-r2.ebuild b/app-text/hunspell/hunspell-1.1.4-r2.ebuild
new file mode 100644
index 000000000000..594b68ba4cc8
--- /dev/null
+++ b/app-text/hunspell/hunspell-1.1.4-r2.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/hunspell/hunspell-1.1.4-r2.ebuild,v 1.1 2006/08/30 21:38:11 kevquinn Exp $
+
+inherit fixheadtails eutils multilib autotools
+
+DESCRIPTION="Hunspell spell checker - an improved replacement for myspell in OOo"
+HOMEPAGE="http://hunspell.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
+SLOT="0"
+LICENSE="MPL-1.1 GPL-2 LGPL-2.1"
+IUSE="ncurses nls readline"
+
+RDEPEND="readline? ( sys-libs/readline )
+	ncurses? ( sys-libs/ncurses )
+	nls? ( virtual/libintl )"
+
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	ht_fix_file tests/test.sh
+	# Rework to use libtool, so as to get shared libraries
+	# where appropriate, instead of the archive-only approach
+	# taken upstream.
+	epatch "${FILESDIR}"/${P}-libtool.patch
+	# Upstream package creates executables 'example', 'munch'
+	# and 'unmunch' which are too generic to be placed in
+	# /usr/bin - this patch prefixes them with 'hunspell-'.
+	# Also includes a small change for libtool.
+	epatch "${FILESDIR}"/${P}-renameexes.patch
+	# Don't install the munch.h and unmunch.h files, they are not
+	# descriptions of exported functions.
+	sed -i -e 's:include_HEADERS:noinst_HEADERS:' "${S}"/src/tools/Makefile.am
+
+	# Recalculate the mkinstalldirs stuff (see bug #142565)
+	epatch "${FILESDIR}"/${P}-gettext.patch
+	# Set AT_M4DIR to workaround eautoreconf limitation (see bug #142565)
+	export AT_M4DIR="${S}/m4"
+	# Makefile.am modified, libtool added, hence autoreconf
+	WANT_AUTOMAKE="1.9" eautoreconf
+}
+
+src_compile() {
+	# I wanted to put the include files in /usr/include/hunspell
+	# but this means the openoffice build won't find them.
+	econf \
+		--includedir=/usr/include/hunspell \
+		$(use_enable readline) \
+		$(use_with ncurses ui) \
+		$(use_enable nls) \
+		|| die "econf failed"
+
+	emake || die "emake failed"
+}
+
+src_test() {
+	# One of the tests doesn't like LC_ALL being set to encodings
+	# capable of expressing beta-S, so we simply clear it.
+	# bug #125375
+	LC_ALL="C" make check
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
+	# hunspell is derived from myspell
+	dodoc AUTHORS.myspell README.myspell license.myspell
+}
+
+pkg_postinst() {
+	einfo "To use this package you will also need a dictionary."
+	einfo "Hunspell uses myspell format dictionaries; find them"
+	einfo "in the app-dicts category as myspell-<LANG>."
+}