Version bump to 1.2.2_beta as per bug 200185.

(Portage version: 2.1.4.2)

3 files changed, 193 insertions, 2 deletions

diff --git a/app-text/hunspell/ChangeLog b/app-text/hunspell/ChangeLog
index d4b57bfc89d9..2b57246153f9 100644
--- a/app-text/hunspell/ChangeLog
+++ b/app-text/hunspell/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/hunspell
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/hunspell/ChangeLog,v 1.34 2007/12/25 20:29:53 jer Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/hunspell/ChangeLog,v 1.35 2008/02/10 19:17:26 philantrop Exp $
+
+*hunspell-1.2.2_beta (10 Feb 2008)
+
+  10 Feb 2008; Wulf C. Krueger <philantrop@gentoo.org>
+  +files/hunspell-1.2.2b-renameexes.patch, +hunspell-1.2.2_beta.ebuild:
+  Version bump to 1.2.2_beta as per bug 200185.
 
   25 Dec 2007; Jeroen Roovers <jer@gentoo.org> hunspell-1.1.9.ebuild:
   Marked ~hppa for armin76. Fixed quoting issues.
diff --git a/app-text/hunspell/files/hunspell-1.2.2b-renameexes.patch b/app-text/hunspell/files/hunspell-1.2.2b-renameexes.patch
new file mode 100644
index 000000000000..db70de00e29b
--- /dev/null
+++ b/app-text/hunspell/files/hunspell-1.2.2b-renameexes.patch
@@ -0,0 +1,105 @@
+diff -Naur hunspell-1.2.2b.orig/src/tools/example.cxx hunspell-1.2.2b/src/tools/example.cxx
+--- hunspell-1.2.2b.orig/src/tools/example.cxx	2008-01-16 11:33:31.000000000 +0100
++++ hunspell-1.2.2b/src/tools/example.cxx	2008-02-10 19:20:39.000000000 +0100
+@@ -17,8 +17,8 @@
+     /* first parse the command line options */
+ 
+     if (argc < 4) {
+-        fprintf(stderr,"example (multiple dictionary version.:\n"); 
+-        fprintf(stderr,"example affix_file dictionary_file(s) file_of_words_to_check\n");
++        fprintf(stderr,"hunspell-example (multiple dictionary version.:\n"); 
++        fprintf(stderr,"hunspell-example affix_file dictionary_file(s) file_of_words_to_check\n");
+         exit(1);
+     }
+   
+diff -Naur hunspell-1.2.2b.orig/src/tools/Makefile.am hunspell-1.2.2b/src/tools/Makefile.am
+--- hunspell-1.2.2b.orig/src/tools/Makefile.am	2008-01-09 12:27:42.000000000 +0100
++++ hunspell-1.2.2b/src/tools/Makefile.am	2008-02-10 19:17:47.000000000 +0100
+@@ -1,4 +1,4 @@
+-bin_PROGRAMS=analyze chmorph example hunspell munch unmunch hzip hunzip
++bin_PROGRAMS=hunspell-analyze hunspell-chmorph hunspell-example hunspell hunspell-munch hunspell-unmunch hzip hunzip
+ 
+ INCLUDES=-I${top_srcdir}/src/hunspell -I${top_srcdir}/src/parsers
+ 
+@@ -6,21 +6,21 @@
+ hunzip_SOURCES=hunzip.cxx
+ hunzip_LDADD = ../hunspell/libhunspell-1.2.la
+ 
+-munch_SOURCES=munch.c
+-unmunch_SOURCES=unmunch.c
++hunspell_munch_SOURCES=munch.c
++hunspell_unmunch_SOURCES=unmunch.c
+ include_HEADERS=munch.h unmunch.h
+ 
+-example_SOURCES=example.cxx
+-example_LDADD = ../hunspell/libhunspell-1.2.la
++hunspell_example_SOURCES=example.cxx
++hunspell_example_LDADD = ../hunspell/libhunspell-1.2.la
+ 
+ hunspell_SOURCES=hunspell.cxx
+ hunspell_LDADD = @LIBINTL@ ../hunspell/libhunspell-1.2.la \
+ 	../parsers/libparsers.a @CURSESLIB@ @READLINELIB@
+ 
+-analyze_SOURCES=analyze.cxx
+-analyze_LDADD = ../hunspell/libhunspell-1.2.la
++hunspell_analyze_SOURCES=analyze.cxx
++hunspell_analyze_LDADD = ../hunspell/libhunspell-1.2.la
+ 
+-chmorph_SOURCES=chmorph.cxx
+-chmorph_LDADD = ../hunspell/libhunspell-1.2.la ../parsers/libparsers.a
++hunspell_chmorph_SOURCES=chmorph.cxx
++hunspell_chmorph_LDADD = ../hunspell/libhunspell-1.2.la ../parsers/libparsers.a
+ 
+ EXTRA_DIST=makealias affixcompress
+diff -Naur hunspell-1.2.2b.orig/src/tools/munch.c hunspell-1.2.2b/src/tools/munch.c
+--- hunspell-1.2.2b.orig/src/tools/munch.c	2007-04-06 10:05:28.000000000 +0200
++++ hunspell-1.2.2b/src/tools/munch.c	2008-02-10 19:24:19.000000000 +0100
+@@ -42,14 +42,14 @@
+        wf = mystrdup(argv[1]);
+   } else {
+     fprintf(stderr,"correct syntax is:\n"); 
+-    fprintf(stderr,"munch word_list_file affix_file\n");
++    fprintf(stderr,"hunspell-munch word_list_file affix_file\n");
+     exit(1);
+   }
+   if (argv[2]) {
+        af = mystrdup(argv[2]);
+   } else {
+     fprintf(stderr,"correct syntax is:\n"); 
+-    fprintf(stderr,"munch word_list_file affix_file\n");
++    fprintf(stderr,"hunspell-munch word_list_file affix_file\n");
+     exit(1);
+   }
+ 
+diff -Naur hunspell-1.2.2b.orig/src/tools/unmunch.c hunspell-1.2.2b/src/tools/unmunch.c
+--- hunspell-1.2.2b.orig/src/tools/unmunch.c	2007-04-06 10:05:28.000000000 +0200
++++ hunspell-1.2.2b/src/tools/unmunch.c	2008-02-10 19:24:57.000000000 +0100
+@@ -39,14 +39,14 @@
+        wf = mystrdup(argv[1]);
+   } else {
+     fprintf(stderr,"correct syntax is:\n"); 
+-    fprintf(stderr,"unmunch dic_file affix_file\n");
++    fprintf(stderr,"hunspell-unmunch dic_file affix_file\n");
+     exit(1);
+   }
+   if (argv[2]) {
+        af = mystrdup(argv[2]);
+   } else {
+     fprintf(stderr,"correct syntax is:\n"); 
+-    fprintf(stderr,"unmunch dic_file affix_file\n");
++    fprintf(stderr,"hunspell-unmunch dic_file affix_file\n");
+     exit(1);
+   }
+ 
+diff -Naur hunspell-1.2.2b.orig/tests/test.sh hunspell-1.2.2b/tests/test.sh
+--- hunspell-1.2.2b.orig/tests/test.sh	2008-02-10 19:29:21.000000000 +0100
++++ hunspell-1.2.2b/tests/test.sh	2008-02-10 19:34:13.000000000 +0100
+@@ -34,7 +34,7 @@
+ shopt -s expand_aliases
+ 
+ alias hunspell='../src/tools/hunspell'
+-alias analyze='../src/tools/analyze'
++alias analyze='../src/tools/hunspell-analyze'
+ 
+ if [ "$VALGRIND" != "" ]; then
+   rm -f $TEMPDIR/test.pid*
diff --git a/app-text/hunspell/hunspell-1.2.2_beta.ebuild b/app-text/hunspell/hunspell-1.2.2_beta.ebuild
new file mode 100644
index 000000000000..35d2b123fa72
--- /dev/null
+++ b/app-text/hunspell/hunspell-1.2.2_beta.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/hunspell/hunspell-1.2.2_beta.ebuild,v 1.1 2008/02/10 19:17:26 philantrop Exp $
+
+inherit eutils multilib autotools
+
+MY_P=${PN}-${PV/_beta/b}
+
+DESCRIPTION="Hunspell spell checker - an improved replacement for myspell in OOo."
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+HOMEPAGE="http://hunspell.sourceforge.net/"
+
+SLOT="0"
+LICENSE="MPL-1.1 GPL-2 LGPL-2.1"
+IUSE="ncurses readline"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+DEPEND="readline? ( sys-libs/readline )
+	ncurses? ( sys-libs/ncurses )
+	sys-devel/gettext"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	sed -i -e 's:tail +:tail -n +:' "${S}"/tests/test.sh ||\
+		die "Failed to fix-up tail for POSIX compliance"
+
+	# Upstream package creates some executables which names are too generic
+	# to be placed in /usr/bin - this patch prefixes them with 'hunspell-'.
+	# It modifies a Makefile.am file, hence eautoreconf.
+	epatch "${FILESDIR}"/${MY_P}-renameexes.patch
+
+	# Would still be nice to get bug 142787 fixed...
+	AT_M4DIR="m4" 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 \
+		$(use_with readline readline) \
+		$(use_with ncurses ui) \
+		|| die "econf failed"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS ChangeLog NEWS README THANKS TODO license.hunspell || die "installing docs failed"
+	# hunspell is derived from myspell
+	dodoc AUTHORS.myspell README.myspell license.myspell || die "installing myspell docs failed"
+
+	# Upstream install has a few problems - rather than try to figure out
+	# what's broken in the build system, just fix things up manually.
+
+	# These are included by hunspell.hxx, but aren't installed by the install
+	# script.
+	insinto /usr/include/hunspell/
+	doins license.myspell license.hunspell config.h
+
+	# These are in the wrong place.
+	mv "${D}"/usr/include/munch.h "${D}"/usr/include/hunspell/munch.h
+	mv "${D}"/usr/include/unmunch.h "${D}"/usr/include/hunspell/unmunch.h
+
+	# Libraries include the version in their name, so make a sensible
+	# default symlink.  They should probably be libhunspell.so.1.1 etc.
+	dodir /usr/$(get_libdir)
+	cd "${D}"/usr/$(get_libdir)
+	ln -s libhunspell-1.2.so.0.0.0 libhunspell.so
+}
+
+pkg_postinst() {
+	elog "To use this package you will also need a dictionary."
+	elog "Hunspell uses myspell format dictionaries; find them"
+	elog "in the app-dicts category as myspell-<LANG>."
+}