Version bump, drop old.

(Portage version: 2.1.9.18/cvs/Linux x86_64)

8 files changed, 152 insertions, 437 deletions

diff --git a/app-text/hunspell/ChangeLog b/app-text/hunspell/ChangeLog
index 540170ebfe89..10f8ff119727 100644
--- a/app-text/hunspell/ChangeLog
+++ b/app-text/hunspell/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-text/hunspell
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/hunspell/ChangeLog,v 1.75 2010/10/10 21:52:12 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/hunspell/ChangeLog,v 1.76 2010/10/15 13:36:00 pva Exp $
+
+*hunspell-1.2.12 (15 Oct 2010)
+
+  15 Oct 2010; Peter Volkov <pva@gentoo.org>
+  -files/hunspell-1.1.5-renameexes.patch, -hunspell-1.1.9.ebuild,
+  -files/hunspell-1.2.2-renameexes.patch, -hunspell-1.2.6.ebuild,
+  -hunspell-1.2.7.ebuild, -hunspell-1.2.8.ebuild, +hunspell-1.2.12.ebuild,
+  +files/hunspell-1.2.12-renameexes.patch:
+  Version bump, drop old.
 
   10 Oct 2010; Markus Meier <maekke@gentoo.org> hunspell-1.2.11.ebuild:
   arm stable, bug #338341
diff --git a/app-text/hunspell/files/hunspell-1.1.5-renameexes.patch b/app-text/hunspell/files/hunspell-1.1.5-renameexes.patch
deleted file mode 100644
index ad2e94a55d2d..000000000000
--- a/app-text/hunspell/files/hunspell-1.1.5-renameexes.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-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/files/hunspell-1.2.12-renameexes.patch b/app-text/hunspell/files/hunspell-1.2.12-renameexes.patch
new file mode 100644
index 000000000000..ddbbb7b25b5f
--- /dev/null
+++ b/app-text/hunspell/files/hunspell-1.2.12-renameexes.patch
@@ -0,0 +1,116 @@
+=== modified file 'src/tools/Makefile.am'
+--- src/tools/Makefile.am	2010-10-15 13:23:29 +0000
++++ src/tools/Makefile.am	2010-10-15 13:23:51 +0000
+@@ -1,4 +1,5 @@
+ bin_PROGRAMS=analyze chmorph hunspell munch unmunch hzip hunzip
++bin_PROGRAMS=hunspell-analyze hunspell-chmorph hunspell hunspell-munch hunspell-unmunch hzip hunzip
+ 
+ INCLUDES=-I${top_srcdir}/src/hunspell -I${top_srcdir}/src/parsers
+ 
+@@ -6,8 +7,8 @@
+ hunzip_SOURCES=hunzip.cxx
+ hunzip_LDADD = ../hunspell/libhunspell-1.2.la
+ 
+-munch_SOURCES=munch.c munch.h
+-unmunch_SOURCES=unmunch.c unmunch.h
++hunspell_munch_SOURCES=munch.c munch.h
++hunspell_unmunch_SOURCES=unmunch.c unmunch.h
+ 
+ example_SOURCES=example.cxx
+ example_LDADD = ../hunspell/libhunspell-1.2.la
+@@ -16,11 +17,11 @@
+ hunspell_LDADD = @LIBINTL@ @LIBICONV@ ../parsers/libparsers.a \
+ 	../hunspell/libhunspell-1.2.la @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 = ../parsers/libparsers.a ../hunspell/libhunspell-1.2.la
++hunspell_chmorph_SOURCES=chmorph.cxx
++hunspell_chmorph_LDADD = ../parsers/libparsers.a ../hunspell/libhunspell-1.2.la
+ 
+ noinst_PROGRAMS=example
+ 
+
+=== modified file 'src/tools/example.cxx'
+--- src/tools/example.cxx	2010-10-15 13:23:29 +0000
++++ src/tools/example.cxx	2010-10-15 13:23:51 +0000
+@@ -17,8 +17,8 @@
+     /* first parse the command line options */
+ 
+     if (argc < 4) {
+-        fprintf(stderr,"example (now it works with more dictionary files):\n"); 
+-        fprintf(stderr,"example affix_file dictionary_file(s) file_of_words_to_check\n");
++        fprintf(stderr,"hunspell-example (now it works with more dictionary files):\n"); 
++        fprintf(stderr,"hunspell-example affix_file dictionary_file(s) file_of_words_to_check\n");
+         exit(1);
+     }
+   
+
+=== modified file 'src/tools/munch.c'
+--- src/tools/munch.c	2010-10-15 13:23:29 +0000
++++ src/tools/munch.c	2010-10-15 13:23:51 +0000
+@@ -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);
+   }
+ 
+
+=== modified file 'src/tools/unmunch.c'
+--- src/tools/unmunch.c	2010-10-15 13:23:29 +0000
++++ src/tools/unmunch.c	2010-10-15 13:23:51 +0000
+@@ -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);
+   }
+ 
+
+=== modified file 'tests/test.sh'
+--- tests/test.sh	2010-10-15 13:23:29 +0000
++++ tests/test.sh	2010-10-15 13:25:27 +0000
+@@ -34,7 +34,7 @@
+ shopt -s expand_aliases
+ 
+ alias hunspell='../libtool --mode=execute -dlopen ../src/hunspell/.libs/libhunspell*.la ../src/tools/hunspell'
+-alias analyze='../libtool --mode=execute -dlopen ../src/hunspell/.libs/libhunspell*.la ../src/tools/analyze'
++alias analyze='../libtool --mode=execute -dlopen ../src/hunspell/.libs/libhunspell*.la ../src/tools/hunspell-analyze'
+ 
+ if [ "$VALGRIND" != "" ]; then
+   rm -f $TEMPDIR/test.pid*
+@@ -43,7 +43,7 @@
+   fi
+ 
+   alias hunspell='../libtool --mode=execute -dlopen ../src/hunspell/.libs/libhunspell*.la valgrind --tool=$VALGRIND --leak-check=yes --show-reachable=yes --log-file=$TEMPDIR/test.pid ../src/tools/hunspell'
+-  alias analyze='../libtool --mode=execute -dlopen ../src/hunspell/.libs/libhunspell*.la valgrind --tool=$VALGRIND --leak-check=yes --show-reachable=yes --log-file=$TEMPDIR/test.pid ../src/tools/analyze'
++  alias analyze='../libtool --mode=execute -dlopen ../src/hunspell/.libs/libhunspell*.la valgrind --tool=$VALGRIND --leak-check=yes --show-reachable=yes --log-file=$TEMPDIR/test.pid ../src/tools/hunspell-analyze'
+ fi
+ 
+ # Tests good words
+
diff --git a/app-text/hunspell/files/hunspell-1.2.2-renameexes.patch b/app-text/hunspell/files/hunspell-1.2.2-renameexes.patch
deleted file mode 100644
index 17d65dc14232..000000000000
--- a/app-text/hunspell/files/hunspell-1.2.2-renameexes.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-=== modified file 'src/tools/Makefile.am'
---- src/tools/Makefile.am	2008-05-04 15:53:24 +0000
-+++ src/tools/Makefile.am	2008-05-04 15:55:45 +0000
-@@ -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,23 +6,23 @@
- 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
--
--chmorph_SOURCES=chmorph.cxx
--chmorph_LDADD = ../hunspell/libhunspell-1.2.la ../parsers/libparsers.a
--
--noinst_PROGRAMS=example
-+hunspell_analyze_SOURCES=analyze.cxx
-+hunspell_analyze_LDADD = ../hunspell/libhunspell-1.2.la
-+
-+hunspell_chmorph_SOURCES=chmorph.cxx
-+hunspell_chmorph_LDADD = ../hunspell/libhunspell-1.2.la ../parsers/libparsers.a
-+
-+noinst_PROGRAMS=hunspell-example
- 
- EXTRA_DIST=makealias affixcompress
-
-=== modified file 'src/tools/example.cxx'
---- src/tools/example.cxx	2008-05-04 15:53:24 +0000
-+++ src/tools/example.cxx	2008-05-04 15:54:12 +0000
-@@ -17,8 +17,8 @@
-     /* first parse the command line options */
- 
-     if (argc < 4) {
--        fprintf(stderr,"example (now it works with more dictionary files):\n"); 
--        fprintf(stderr,"example affix_file dictionary_file(s) file_of_words_to_check\n");
-+        fprintf(stderr,"hunspell-example (now it works with more dictionary files):\n"); 
-+        fprintf(stderr,"hunspell-example affix_file dictionary_file(s) file_of_words_to_check\n");
-         exit(1);
-     }
-   
-
-=== modified file 'src/tools/munch.c'
---- src/tools/munch.c	2008-05-04 15:53:24 +0000
-+++ src/tools/munch.c	2008-05-04 15:56:18 +0000
-@@ -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);
-   }
- 
-
-=== modified file 'src/tools/unmunch.c'
---- src/tools/unmunch.c	2008-05-04 15:53:24 +0000
-+++ src/tools/unmunch.c	2008-05-04 15:56:39 +0000
-@@ -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);
-   }
- 
-
-=== modified file 'tests/test.sh'
---- tests/test.sh	2008-05-04 15:53:24 +0000
-+++ tests/test.sh	2008-05-04 15:57:07 +0000
-@@ -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.1.9.ebuild b/app-text/hunspell/hunspell-1.1.9.ebuild
deleted file mode 100644
index e84c83fbe117..000000000000
--- a/app-text/hunspell/hunspell-1.1.9.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# 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.1.9.ebuild,v 1.10 2008/07/26 10:59:17 armin76 Exp $
-
-inherit eutils multilib autotools
-
-DESCRIPTION="Hunspell spell checker - an improved replacement for myspell in OOo."
-SUBREL=""
-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="alpha amd64 ~hppa ia64 ppc ~ppc64 sparc x86"
-
-DEPEND="readline? ( sys-libs/readline )
-	ncurses? ( sys-libs/ncurses )
-	sys-devel/gettext"
-RDEPEND="${DEPEND}"
-
-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
-	eautoreconf -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 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.1.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>."
-}
diff --git a/app-text/hunspell/hunspell-1.2.8.ebuild b/app-text/hunspell/hunspell-1.2.12.ebuild
index a1b94a33c118..8d826282118c 100644
--- a/app-text/hunspell/hunspell-1.2.8.ebuild
+++ b/app-text/hunspell/hunspell-1.2.12.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/hunspell/hunspell-1.2.8.ebuild,v 1.11 2010/04/06 17:08:52 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/hunspell/hunspell-1.2.12.ebuild,v 1.1 2010/10/15 13:36:00 pva Exp $
 
+EAPI="2"
 inherit eutils multilib autotools flag-o-matic
 
 MY_P=${PN}-${PV/_beta/b}
@@ -13,27 +14,44 @@ HOMEPAGE="http://hunspell.sourceforge.net/"
 SLOT="0"
 LICENSE="MPL-1.1 GPL-2 LGPL-2.1"
 IUSE="ncurses nls readline"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND="readline? ( sys-libs/readline )
 	ncurses? ( sys-libs/ncurses )
 	sys-devel/gettext"
 RDEPEND="${DEPEND}"
 
-S=${WORKDIR}/${MY_P}
+#TODO: "ia" "mi" - check what they are and add appropriate desc...
+def="app-dicts/myspell-en"
+for l in \
+"af" "bg" "ca" "cs" "cy" "da" "de" "el" "en" "eo" "es" "et" "fo" "fr" "ga" \
+"gl" "he" "hr" "hu" "id" "it" "ku" "lt" "lv" "mk" "ms" "nb" "nl" \
+"nn" "pl" "pt" "ro" "ru" "sk" "sl" "sv" "sw" "tn" "uk" "zu" \
+; do
+	dep="linguas_${l}? ( app-dicts/myspell-${l/pt_BR/pt-br} )"
+	[[ ${l} = "de" ]] &&
+		dep="linguas_de? ( || ( app-dicts/myspell-de app-dicts/myspell-de-alt ) )"
+	[[ -z ${PDEPEND} ]] &&
+		PDEPEND="${dep}" ||
+		PDEPEND="${PDEPEND}
+${dep}"
+	def="!linguas_${l}? ( ${def} )"
+	IUSE="${IUSE} linguas_${l}"
+done
+PDEPEND="${PDEPEND}
+${def}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+S=${WORKDIR}/${MY_P}
 
+src_prepare() {
 	# 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}"/${PN}-1.2.2-renameexes.patch
+	epatch "${FILESDIR}"/${PN}-1.2.12-renameexes.patch
 	eautoreconf
 }
 
-src_compile() {
+src_configure() {
 	# missing somehow, and I am too lazy to fix it properly
 	[[ ${CHOST} == *-darwin* ]] && append-libs -liconv
 
@@ -43,8 +61,6 @@ src_compile() {
 		$(use_enable nls) \
 		$(use_with ncurses ui) \
 		$(use_with readline readline)
-
-	emake || die "emake failed"
 }
 
 src_install() {
diff --git a/app-text/hunspell/hunspell-1.2.6.ebuild b/app-text/hunspell/hunspell-1.2.6.ebuild
deleted file mode 100644
index 6fa8ffb9a34f..000000000000
--- a/app-text/hunspell/hunspell-1.2.6.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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.6.ebuild,v 1.6 2008/12/26 19:04:51 jer 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 nls readline"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-
-DEPEND="readline? ( sys-libs/readline )
-	ncurses? ( sys-libs/ncurses )
-	sys-devel/gettext"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# 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}"/${PN}-1.2.2-renameexes.patch
-
-	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_enable nls) \
-		$(use_with ncurses ui) \
-		$(use_with readline readline) \
-		|| 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"
-}
-
-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>."
-}
diff --git a/app-text/hunspell/hunspell-1.2.7.ebuild b/app-text/hunspell/hunspell-1.2.7.ebuild
deleted file mode 100644
index 330600f04c50..000000000000
--- a/app-text/hunspell/hunspell-1.2.7.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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.7.ebuild,v 1.3 2008/12/30 18:48:24 armin76 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 nls readline"
-KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-
-DEPEND="readline? ( sys-libs/readline )
-	ncurses? ( sys-libs/ncurses )
-	sys-devel/gettext"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# 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}"/${PN}-1.2.2-renameexes.patch
-
-	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_enable nls) \
-		$(use_with ncurses ui) \
-		$(use_with readline readline) \
-		|| 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"
-}
-
-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>."
-}