Version bump; thanks to Andra's (bug #179192)

(Portage version: 2.1.2.7)

4 files changed, 190 insertions, 3 deletions

diff --git a/app-text/hunspell/ChangeLog b/app-text/hunspell/ChangeLog
index 0ccf520b6cda..a7d67ebcafcc 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.22 2007/03/04 07:37:50 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/hunspell/ChangeLog,v 1.23 2007/05/20 12:13:19 kevquinn Exp $
+
+*hunspell-1.1.5 (20 May 2007)
+
+  20 May 2007; Kevin F. Quinn <kevquinn@gentoo.org>
+  +files/hunspell-1.1.5-renameexes.patch, +hunspell-1.1.5.ebuild:
+  Version bump; thanks to Andra's (bug #179192)
 
   04 Mar 2007; Marius Mauch <genone@gentoo.org> hunspell-1.1.3.ebuild,
   hunspell-1.1.4.ebuild, hunspell-1.1.4-r1.ebuild, hunspell-1.1.4-r2.ebuild:
@@ -46,11 +52,11 @@
   05 Jul 2006; Lars Weiler <pylon@gentoo.org> hunspell-1.1.4.ebuild:
   Stable on ppc.
 
-  18 May 2006; Diego Pettenò <flameeyes@gentoo.org>
+  18 May 2006; Diego Pettenò <flameeyes@gentoo.org>
   hunspell-1.1.4-r1.ebuild:
   Add ~x86-fbsd keyword.
 
-  18 May 2006; Diego Pettenò <flameeyes@gentoo.org>
+  18 May 2006; Diego Pettenò <flameeyes@gentoo.org>
   hunspell-1.1.4-r1.ebuild:
   Add ~amd64 keyword.
 
diff --git a/app-text/hunspell/files/digest-hunspell-1.1.5 b/app-text/hunspell/files/digest-hunspell-1.1.5
new file mode 100644
index 000000000000..2b9902f22cdc
--- /dev/null
+++ b/app-text/hunspell/files/digest-hunspell-1.1.5
@@ -0,0 +1,3 @@
+MD5 9497cfb94c583c6717a2497c2495c561 hunspell-1.1.5-3.tar.gz 651729
+RMD160 f41f69569239faa031d16f26f7684f703243eed6 hunspell-1.1.5-3.tar.gz 651729
+SHA256 9d153295722e64fbf4da650c679f4e0884d11d66b7809382193118c0a6ef021e hunspell-1.1.5-3.tar.gz 651729
diff --git a/app-text/hunspell/files/hunspell-1.1.5-renameexes.patch b/app-text/hunspell/files/hunspell-1.1.5-renameexes.patch
new file mode 100644
index 000000000000..ad2e94a55d2d
--- /dev/null
+++ b/app-text/hunspell/files/hunspell-1.1.5-renameexes.patch
@@ -0,0 +1,116 @@
+diff -u -ur hunspell-1.1.5.orig/src/tools/Makefile.am hunspell-1.1.5/src/tools/Makefile.am
+--- hunspell-1.1.5.orig/src/tools/Makefile.am	2007-03-21 08:36:31.000000000 +0100
++++ hunspell-1.1.5/src/tools/Makefile.am	2007-05-20 13:31:26.000000000 +0200
+@@ -1,14 +1,14 @@
+-bin_PROGRAMS=munch unmunch example hunspell @EXPERIMENTAL@
++bin_PROGRAMS=hunspell-munch hunspell-unmunch hunspell-example hunspell @EXPERIMENTAL@
+ EXTRA_PROGRAMS=hunstem hunmorph
+ 
+ INCLUDES=-I${top_srcdir}/src/hunspell -I${top_srcdir}/src/parsers
+ 
+-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.1.la
++hunspell_example_SOURCES=example.cxx
++hunspell_example_LDADD = ../hunspell/libhunspell-1.1.la
+ 
+ hunspell_SOURCES=hunspell.cxx
+ hunspell_LDADD = @LIBINTL@ ../hunspell/libhunspell-1.1.la \
+Only in hunspell-1.1.5/src/tools: Makefile.am.rej
+diff -u -ur hunspell-1.1.5.orig/src/tools/example.cxx hunspell-1.1.5/src/tools/example.cxx
+--- hunspell-1.1.5.orig/src/tools/example.cxx	2005-08-20 22:25:22.000000000 +0200
++++ hunspell-1.1.5/src/tools/example.cxx	2007-05-20 13:29:27.000000000 +0200
+@@ -24,21 +24,21 @@
+        af = mystrdup(argv[1]);
+   } else {
+     fprintf(stderr,"correct syntax is:\n"); 
+-    fprintf(stderr,"example affix_file dictionary_file file_of_words_to_check\n");
++    fprintf(stderr,"hunspell-example affix_file dictionary_file file_of_words_to_check\n");
+     exit(1);
+   }
+   if (argv[2]) {
+        df = mystrdup(argv[2]);
+   } else {
+     fprintf(stderr,"correct syntax is:\n"); 
+-    fprintf(stderr,"example affix_file dictionary_file file_of_words_to_check\n");
++    fprintf(stderr,"hunspell-example affix_file dictionary_file file_of_words_to_check\n");
+     exit(1);
+   }
+   if (argv[3]) {
+        wtc = mystrdup(argv[3]);
+   } else {
+     fprintf(stderr,"correct syntax is:\n"); 
+-    fprintf(stderr,"example affix_file dictionary_file file_of_words_to_check\n");
++    fprintf(stderr,"hunspell-example affix_file dictionary_file file_of_words_to_check\n");
+     exit(1);
+   }
+ 
+diff -u -ur hunspell-1.1.5.orig/src/tools/hunmorph.cxx hunspell-1.1.5/src/tools/hunmorph.cxx
+--- hunspell-1.1.5.orig/src/tools/hunmorph.cxx	2005-09-16 11:25:17.000000000 +0200
++++ hunspell-1.1.5/src/tools/hunmorph.cxx	2007-05-20 13:29:27.000000000 +0200
+@@ -26,7 +26,7 @@
+ 
+     for (i = 1; i < 3; i++)
+ 	if (!argv[i]) {
+-	    fprintf(stderr, "correct syntax is:\nexample affix_file");
++	    fprintf(stderr, "correct syntax is:\nhunmorph affix_file");
+ 	    fprintf(stderr, " dictionary_file file_of_words_to_check\n");
+ 	    exit(1);
+ 	}
+diff -u -ur hunspell-1.1.5.orig/src/tools/hunstem.cxx hunspell-1.1.5/src/tools/hunstem.cxx
+--- hunspell-1.1.5.orig/src/tools/hunstem.cxx	2006-05-12 16:16:58.000000000 +0200
++++ hunspell-1.1.5/src/tools/hunstem.cxx	2007-05-20 13:29:27.000000000 +0200
+@@ -26,7 +26,7 @@
+ 
+     for (i = 1; i < 3; i++)
+ 	if (!argv[i]) {
+-	    fprintf(stderr, "correct syntax is:\nexample affix_file");
++	    fprintf(stderr, "correct syntax is:\nhunstem affix_file");
+ 	    fprintf(stderr, " dictionary_file file_of_words_to_check\n");
+ 	    exit(1);
+ 	}
+diff -u -ur hunspell-1.1.5.orig/src/tools/munch.c hunspell-1.1.5/src/tools/munch.c
+--- hunspell-1.1.5.orig/src/tools/munch.c	2006-03-29 23:16:34.000000000 +0200
++++ hunspell-1.1.5/src/tools/munch.c	2007-05-20 13:29:27.000000000 +0200
+@@ -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 -u -ur hunspell-1.1.5.orig/src/tools/unmunch.c hunspell-1.1.5/src/tools/unmunch.c
+--- hunspell-1.1.5.orig/src/tools/unmunch.c	2006-10-02 12:12:00.000000000 +0200
++++ hunspell-1.1.5/src/tools/unmunch.c	2007-05-20 13:29:27.000000000 +0200
+@@ -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 --git a/app-text/hunspell/hunspell-1.1.5.ebuild b/app-text/hunspell/hunspell-1.1.5.ebuild
new file mode 100644
index 000000000000..5638cd54b7d4
--- /dev/null
+++ b/app-text/hunspell/hunspell-1.1.5.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/hunspell/hunspell-1.1.5.ebuild,v 1.1 2007/05/20 12:13:19 kevquinn Exp $
+
+WANT_AUTOCONF="2.5"
+WANT_AUTOMAKE="1.9"
+
+inherit eutils multilib autotools
+
+DESCRIPTION="Hunspell spell checker - an improved replacement for myspell in OOo."
+SUBREL="-3"
+SRC_URI="mirror://sourceforge/${PN}/${P}${SUBREL}.tar.gz"
+HOMEPAGE="http://hunspell.sourceforge.net/"
+
+SLOT="0"
+LICENSE="MPL-1.1 GPL-2 LGPL-2.1"
+IUSE="ncurses readline"
+KEYWORDS="~ppc ~sparc ~x86"
+
+DEPEND="readline? ( sys-libs/readline )
+	ncurses? ( sys-libs/ncurses )
+	sys-devel/gettext"
+
+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 executables 'example', 'munch'
+	# and 'unmunch' which are too generic to be placed in
+	# /usr/bin - this patch prefixes them with 'hunspell-'.
+	# It modifies a Makefile.am file, hence autoreconf.
+	epatch ${FILESDIR}/hunspell-1.1.5-renameexes.patch
+	# Would do eautoreconf - but until bug #142787 is fixed, eautoreconf
+	# isn't enough.
+	libtoolize --copy --force
+	autoreconf -f
+}
+
+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
+	# hunspell is derived from myspell
+	dodoc AUTHORS.myspell README.myspell license.myspell
+}
+
+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>."
+}