Version bump. Added nls flag again, bug #225753, thank Mart Raudsepp for report. Changed to use eatoreconf, bug #226541 in hunspell-1.1.9, thank Diego Pettenò for report. Removed old versions.

Package-Manager: portage-2.1.4.4

13 files changed, 44 insertions, 794 deletions

diff --git a/app-text/hunspell/ChangeLog b/app-text/hunspell/ChangeLog
index 7ad27f1c4801..81cf0bc77270 100644
--- a/app-text/hunspell/ChangeLog
+++ b/app-text/hunspell/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for app-text/hunspell
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/hunspell/ChangeLog,v 1.38 2008/05/13 20:47:15 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/hunspell/ChangeLog,v 1.39 2008/06/17 09:41:28 pva Exp $
+
+*hunspell-1.2.3 (17 Jun 2008)
+
+  17 Jun 2008; Peter Volkov <pva@gentoo.org>
+  -files/hunspell-1.1.3-renameexes.patch,
+  -files/hunspell-1.1.4-gettext.patch, -files/hunspell-1.1.4-libtool.patch,
+  -files/hunspell-1.1.4-renameexes.patch,
+  -files/hunspell-1.2.2b-renameexes.patch, -hunspell-1.1.4.ebuild,
+  -hunspell-1.1.4-r1.ebuild, -hunspell-1.1.4-r2.ebuild,
+  -hunspell-1.1.5.ebuild, hunspell-1.1.9.ebuild,
+  -hunspell-1.2.2_beta.ebuild, +hunspell-1.2.3.ebuild:
+  Version bump. Added nls flag again, bug #225753, thank Mart Raudsepp for
+  report. Changed to use eatoreconf, bug #226541 in hunspell-1.1.9, thank
+  Diego Pettenò for report. Removed old versions.
 
   13 May 2008; Alexis Ballier <aballier@gentoo.org> ChangeLog:
   keyword ~x86-fbsd
diff --git a/app-text/hunspell/Manifest b/app-text/hunspell/Manifest
index 087e2d46f3e9..d5be0d97510e 100644
--- a/app-text/hunspell/Manifest
+++ b/app-text/hunspell/Manifest
@@ -1,32 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX hunspell-1.1.3-renameexes.patch 4612 RMD160 e4dc3ab77daf10f63852aca121d07d777ed96cf6 SHA1 7ff89b2282f45434eb895be091dc46701a94460b SHA256 0386079314e941d443d57e650bd2aa84a63605ec2fadead474e576e7bb923939
-AUX hunspell-1.1.4-gettext.patch 493 RMD160 b36cc4eb95431b9c9cf5faf3cd4d8a8a2fb4bdff SHA1 c09716fa32be6762c6431a4903f8e92485fc0afb SHA256 969693d95153bc4983cf7afe812d4d4f9b03068e2cb4e76df827bf37033860e6
-AUX hunspell-1.1.4-libtool.patch 3865 RMD160 b87ea7a9a8d692313235678bd8239314c6b7e65f SHA1 cf4cb83f9a5e047c6b147155c8c765d31ee34393 SHA256 78fec5450650428c78785c405e289252473602e71848f88fa04c51e81f597b63
-AUX hunspell-1.1.4-renameexes.patch 4615 RMD160 d987d3b2b83324f5da9fc0666aa97dc75fcd2005 SHA1 c04f8ed956d6910a8c821315832cefe20d8fec8e SHA256 91bdcb9bcbffeb11ff20fd09ac780b44af79d8be42be3163469d3c1c29649583
 AUX hunspell-1.1.5-renameexes.patch 4706 RMD160 f3297e1b15b8ac53de646bac5625ca749e3b2614 SHA1 1e88a634b018ddd3a8e3dc84862b60c33e9ee05f SHA256 2878b37507245faaa486a12531fca2b6020359776e6013a9b3480e2ff69a9c0b
 AUX hunspell-1.2.2-libtool-2.22.patch 334 RMD160 4c6ef9e82fa9b95372aace0ff63dc50e9a777a01 SHA1 ecac80a8cf229a80321d85d907bed8d7aa83416e SHA256 0d6f3107ecf11ecb18c4ddf9a539c41f8b89937df301a83628a6862f742d410c
 AUX hunspell-1.2.2-renameexes.patch 3751 RMD160 2429424ecd90246c97e9414f2be7435f67705704 SHA1 a1e76bd5e6a4e21b3bf9c40bbd4ea2d51866fe43 SHA256 ff190919f954dd5314c2f5035d7a33796924316c775745df67c39d3bdfe2c5cc
-AUX hunspell-1.2.2b-renameexes.patch 4178 RMD160 8d99aef3daa09074dd367625bf72aa579f9886ad SHA1 51df548154964f90a289029f1283dde82a56fe1d SHA256 480e9066aae365abff497a9c81f92e564d193b13659ebba8506ed92299bab5cc
-DIST hunspell-1.1.4.tar.gz 438667 RMD160 a90ded6b996d8b2d575268e8a4b025e92b85f378 SHA1 04251adfb351fe809756fc24ea56cd09ef2861a1 SHA256 8d39c03beb71ec1482d2fdbfc2d5b7690c8a70fb6da4885369752ee0d2e3a635
-DIST hunspell-1.1.5-3.tar.gz 651729 RMD160 f41f69569239faa031d16f26f7684f703243eed6 SHA1 2c75f83cf0fd543b4b70f828cdb55cfc614773f5 SHA256 9d153295722e64fbf4da650c679f4e0884d11d66b7809382193118c0a6ef021e
 DIST hunspell-1.1.9.tar.gz 684426 RMD160 e49782df2ada58762036acc3c904a8ace6b19a0a SHA1 a881d9bc8bc6257c956c70c863e872514f8c44d4 SHA256 c36ed98189da373f3f24e7be97425454e6706cc3e0d07ff39f8c1bcd6689d543
 DIST hunspell-1.2.2.tar.gz 752046 RMD160 110c428f2b6734afefb8865dc3d63a4492594552 SHA1 521063ff64b2182e92e92f5355ae2cf396f39420 SHA256 8263a77b7cde9d853847ad040cf6c6857b0cf9bf4a0afebf3081935e0f58b49c
-DIST hunspell-1.2.2b.tar.gz 745643 RMD160 ec18944e259362d8b05e81c15cbfb8e1077cc293 SHA1 1ed31e328e57346d69a108e78e637780387443b3 SHA256 91a67974af4ee5cdfdcd0c0840009356aa3ce1b8d25820dc56c9a594684dad0e
-EBUILD hunspell-1.1.4-r1.ebuild 2324 RMD160 17eb80069ecc0223c468169827ecd05abe35ca4b SHA1 e96bffd308e90a9df1dce5c15a011be8ff100a8b SHA256 f0cdbbe0dab21aa64d6ff42438f358154538ea33417c9b6a6508e8991c1c9f1e
-EBUILD hunspell-1.1.4-r2.ebuild 2588 RMD160 99337418586f403b01415caf9e75478f0e575532 SHA1 b1c0dbe8d544add81f0d6394ff51c07e97f6ec36 SHA256 7947330adb215feeda1db03b0caf8fbd59acc250a424599a997d5eb428fedef6
-EBUILD hunspell-1.1.4.ebuild 1887 RMD160 335609149954c6b73d95bddb0b2c20156011b3c6 SHA1 2a3591506c15a5407ddd935a1cdae951c286322b SHA256 78dad84fdece24da538d36c8df3076ea952e6f9e2ec81719e5bd0d8f7c7dc990
-EBUILD hunspell-1.1.5.ebuild 2597 RMD160 ddcf13615863ea2af9b256cfd478287677ba37f0 SHA1 25558f3d82fbb36e4670d05986ed79e94b17af15 SHA256 653dc679342e9453f0553b2345c93b2b2debc6400a0b68be2599c806ef95c0f1
-EBUILD hunspell-1.1.9.ebuild 2724 RMD160 ab5e368026bd87703fdf7c7a9b935dc7189894c3 SHA1 17538d6268bd3111cab1e351ef4522aef3adc252 SHA256 1e9316cb01a12aa439afd1805d70982a4cc30d127e68cb27f4d2c713f7c19c61
+DIST hunspell-1.2.3.tar.gz 758929 RMD160 1094b91232c81f33d65196d885fe3ccfefe12115 SHA1 1b15d0417bf7d898436192ac0989007231fbeadd SHA256 77466ef5ed18f810ca30814b6b7e40c3b08d30f3deb56157b5a78d960b16abea
+EBUILD hunspell-1.1.9.ebuild 2611 RMD160 395520b384a949c0ed99ec54912b76a92ba294bd SHA1 b5aab750bd2d88b17d72d40b7f2eb572a3f4adbf SHA256 98dc2d8fe81b576d670b52a94a09e56f2a8a809a89a308542257f25ea01e43d3
 EBUILD hunspell-1.2.2.ebuild 2675 RMD160 b0289d3881c23b005cb5192f15dac965e6ec4455 SHA1 83af421aa7fd1ffe03ebfb802773206b01836472 SHA256 b0d1b04300b4668ae9c9fed84d9f35f522ca54f292e531d1caa12273261ad449
-EBUILD hunspell-1.2.2_beta.ebuild 2693 RMD160 4f33488d75b05e24a3b1b413d5b39ea6ee9e5173 SHA1 cbdcbd4c4fd3d0611c19000c84b318e7f7484921 SHA256 f2a01492278c3c923b5fc2d4e5ddd332c13251f3d495ab738fb27a657504ee1a
-MISC ChangeLog 5491 RMD160 d6c00ae85dad76ed9d79c0684f0b7fc753fcda12 SHA1 0a0f78d3e80bbd94a87abcf57eca179b8ab38dd2 SHA256 eda8d9b6c93ae0f1d5ab5701bea971d6019952e0fa5e5215a45567c5c2a79124
+EBUILD hunspell-1.2.3.ebuild 2736 RMD160 17aa067b49fd3ad3b9fd3c34ca8ba634ce75916a SHA1 6de894d9b767b28fe8ef5e84c852a1c15e6ec687 SHA256 f06ad6a84aa3cb8fefe5c94d2942267c6e1eadbf079e0f36cbbc2a29a69ec5ee
+MISC ChangeLog 6150 RMD160 6f6e57f5a12f955f5ec96d5afa06422778ec2d34 SHA1 6fbf31e5d965cd7daf3f3bc4a023ebbb9c8523fe SHA256 e3c0525ac1be739ce32a66c10e5b114df8a81905cfd96bc509c46ac6720a8e81
 MISC metadata.xml 163 RMD160 444608d5dce1eb9307c253140c5f6b011fcbece8 SHA1 87029f6d4a8e381a59cad5f8553f0e5163b11a7e SHA256 2a83bf864655c5acb5d551aeb9b060d57545fb7cf1dd9d7fcdc16fbca221cabb
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkgp/mQACgkQvFcC4BYPU0qZJQCePJm9pBv0ilr9y6mlYIVksxVs
-DogAniV1ImtrTAsOos3wmtyl7UTSjHOh
-=1cEm
------END PGP SIGNATURE-----
diff --git a/app-text/hunspell/files/hunspell-1.1.3-renameexes.patch b/app-text/hunspell/files/hunspell-1.1.3-renameexes.patch
deleted file mode 100644
index 4b1b3aec4372..000000000000
--- a/app-text/hunspell/files/hunspell-1.1.3-renameexes.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-diff -u -ur hunspell-1.1.3.orig/src/tools/Makefile.am hunspell-1.1.3/src/tools/Makefile.am
---- hunspell-1.1.3.orig/src/tools/Makefile.am	2006-01-27 19:32:19.000000000 +0100
-+++ hunspell-1.1.3/src/tools/Makefile.am	2006-01-27 19:33:05.000000000 +0100
-@@ -1,13 +1,13 @@
--bin_PROGRAMS=munch unmunch example hunspell hunmorph hunstem
-+bin_PROGRAMS=hunspell-munch hunspell-unmunch hunspell-example hunspell hunmorph hunstem
- 
- 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.a
-+hunspell_example_SOURCES=example.cxx
-+hunspell_example_LDADD = ../hunspell/libhunspell.a
- 
- hunspell_SOURCES=hunspell.cxx
- hunspell_LDADD = @LIBINTL@ ../hunspell/libhunspell.a \
-diff -u -ur hunspell-1.1.3.orig/src/tools/example.cxx hunspell-1.1.3/src/tools/example.cxx
---- hunspell-1.1.3.orig/src/tools/example.cxx	2006-01-27 19:32:19.000000000 +0100
-+++ hunspell-1.1.3/src/tools/example.cxx	2006-01-27 19:33:31.000000000 +0100
-@@ -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.3.orig/src/tools/hunmorph.cxx hunspell-1.1.3/src/tools/hunmorph.cxx
---- hunspell-1.1.3.orig/src/tools/hunmorph.cxx	2006-01-27 19:32:19.000000000 +0100
-+++ hunspell-1.1.3/src/tools/hunmorph.cxx	2006-01-27 19:35:18.000000000 +0100
-@@ -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.3.orig/src/tools/hunstem.cxx hunspell-1.1.3/src/tools/hunstem.cxx
---- hunspell-1.1.3.orig/src/tools/hunstem.cxx	2006-01-27 19:32:19.000000000 +0100
-+++ hunspell-1.1.3/src/tools/hunstem.cxx	2006-01-27 19:35:28.000000000 +0100
-@@ -25,7 +25,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.3.orig/src/tools/munch.c hunspell-1.1.3/src/tools/munch.c
---- hunspell-1.1.3.orig/src/tools/munch.c	2006-01-27 19:32:19.000000000 +0100
-+++ hunspell-1.1.3/src/tools/munch.c	2006-01-27 19:33:56.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 -u -ur hunspell-1.1.3.orig/src/tools/unmunch.c hunspell-1.1.3/src/tools/unmunch.c
---- hunspell-1.1.3.orig/src/tools/unmunch.c	2006-01-27 19:32:19.000000000 +0100
-+++ hunspell-1.1.3/src/tools/unmunch.c	2006-01-27 19:34:10.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 --git a/app-text/hunspell/files/hunspell-1.1.4-gettext.patch b/app-text/hunspell/files/hunspell-1.1.4-gettext.patch
deleted file mode 100644
index 2a726b8abedc..000000000000
--- a/app-text/hunspell/files/hunspell-1.1.4-gettext.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-fix Makefile.in.in rather than running `autopoint` as that requires cvs
-
-http://bugs.gentoo.org/142565
-http://bugs.gentoo.org/142997
-
---- po/Makefile.in.in
-+++ po/Makefile.in.in
-@@ -27,7 +27,7 @@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- MKINSTALLDIRS = @MKINSTALLDIRS@
--mkinstalldirs = @MKINSTALLDIRS@
-+mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac`
- 
- GMSGFMT = @GMSGFMT@
- MSGFMT = @MSGFMT@
diff --git a/app-text/hunspell/files/hunspell-1.1.4-libtool.patch b/app-text/hunspell/files/hunspell-1.1.4-libtool.patch
deleted file mode 100644
index e7915e032b11..000000000000
--- a/app-text/hunspell/files/hunspell-1.1.4-libtool.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-Index: hunspell-1.1.4/configure.ac
-===================================================================
---- hunspell-1.1.4.orig/configure.ac
-+++ hunspell-1.1.4/configure.ac
-@@ -23,7 +23,7 @@ AC_CONFIG_HEADER([config.h])
- # Checks for programs.
- AC_PROG_CXX
- AC_PROG_CC
--AC_PROG_RANLIB
-+AC_PROG_LIBTOOL
- 
- # Checks for libraries.
- 
-Index: hunspell-1.1.4/src/hunspell/Makefile.am
-===================================================================
---- hunspell-1.1.4.orig/src/hunspell/Makefile.am
-+++ hunspell-1.1.4/src/hunspell/Makefile.am
-@@ -1,5 +1,5 @@
--lib_LIBRARIES = libhunspell.a
--libhunspell_a_SOURCES=affentry.cxx affixmgr.cxx csutil.cxx \
-+lib_LTLIBRARIES = libhunspell.la
-+libhunspell_la_SOURCES=affentry.cxx affixmgr.cxx csutil.cxx \
- 		     dictmgr.cxx hashmgr.cxx hunspell.cxx \
- 	             suggestmgr.cxx utf_info.cxx license.myspell license.hunspell
- 
-Index: hunspell-1.1.4/src/hunspell/utf_info.cxx
-===================================================================
---- hunspell-1.1.4.orig/src/hunspell/utf_info.cxx
-+++ hunspell-1.1.4/src/hunspell/utf_info.cxx
-@@ -1,6 +1,6 @@
- #include "csutil.hxx"
- /* fields: Unicode letter, toupper, tolower */
--struct unicode_info utf_lst[] = {
-+static struct unicode_info utf_lst[] = {
- { 0x0041, 0x0041, 0x0061 },
- { 0x0042, 0x0042, 0x0062 },
- { 0x0043, 0x0043, 0x0063 },
-Index: hunspell-1.1.4/src/parsers/Makefile.am
-===================================================================
---- hunspell-1.1.4.orig/src/parsers/Makefile.am
-+++ hunspell-1.1.4/src/parsers/Makefile.am
-@@ -1,7 +1,8 @@
--lib_LIBRARIES=libparsers.a
--libparsers_a_SOURCES=firstparser.cxx htmlparser.cxx \
-+lib_LTLIBRARIES=libparsers.la
-+libparsers_la_SOURCES=firstparser.cxx htmlparser.cxx \
- 		      latexparser.cxx  manparser.cxx \
- 		      textparser.cxx 
-+libparsers_la_LIBADD = ../hunspell/libhunspell.la
- 
- #include_hunspelldir
- include_HEADERS = firstparser.hxx \
-@@ -11,7 +12,6 @@ include_HEADERS = firstparser.hxx \
- 		  textparser.hxx
- 
- noinst_PROGRAMS=testparser
--testparser_SOURCES=firstparser.cxx firstparser.hxx htmlparser.cxx htmlparser.hxx latexparser.cxx latexparser.hxx manparser.cxx manparser.hxx testparser.cxx textparser.cxx textparser.hxx
-+testparser_SOURCES=testparser.cxx
-+testparser_LDADD = libparsers.la
- 
--# need mystrdup()
--LDADD = ../hunspell/libhunspell.a
-Index: hunspell-1.1.4/src/tools/Makefile.am
-===================================================================
---- hunspell-1.1.4.orig/src/tools/Makefile.am
-+++ hunspell-1.1.4/src/tools/Makefile.am
-@@ -7,18 +7,18 @@ unmunch_SOURCES=unmunch.c
- include_HEADERS=munch.h unmunch.h
- 
- example_SOURCES=example.cxx
--example_LDADD = ../hunspell/libhunspell.a
-+example_LDADD = ../hunspell/libhunspell.la
- 
- hunspell_SOURCES=hunspell.cxx
--hunspell_LDADD = @LIBINTL@ ../hunspell/libhunspell.a \
--	../parsers/libparsers.a @CURSESLIB@ @READLINELIB@
-+hunspell_LDADD = @LIBINTL@ ../hunspell/libhunspell.la \
-+	../parsers/libparsers.la @CURSESLIB@ @READLINELIB@
- 
- hunmorph_SOURCES=hunmorph.cxx
--hunmorph_LDADD = ../hunspell/libhunspell.a
-+hunmorph_LDADD = ../hunspell/libhunspell.la
- #hunmorph_INCLUDES=-I${top_srcdir}/src/hunspell
- 
- hunstem_SOURCES=hunstem.cxx
--hunstem_LDADD = ../hunspell/libhunspell.a
-+hunstem_LDADD = ../hunspell/libhunspell.la
- #hunstem_INCLUDES=-I${top_srcdir}/src/hunspell
- 
- EXTRA_DIST=makealias
-Index: hunspell-1.1.4/po/Makefile.in.in
-===================================================================
---- hunspell-1.1.4.orig/po/Makefile.in.in
-+++ hunspell-1.1.4/po/Makefile.in.in
-@@ -27,7 +27,7 @@ gettextsrcdir = $(datadir)/gettext/po
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- MKINSTALLDIRS = @MKINSTALLDIRS@
--mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac`
-+mkinstalldirs = @MKINSTALLDIRS@
- 
- GMSGFMT = @GMSGFMT@
- MSGFMT = @MSGFMT@
diff --git a/app-text/hunspell/files/hunspell-1.1.4-renameexes.patch b/app-text/hunspell/files/hunspell-1.1.4-renameexes.patch
deleted file mode 100644
index 2e5c45cd7d46..000000000000
--- a/app-text/hunspell/files/hunspell-1.1.4-renameexes.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-diff -u -ur hunspell-1.1.3.orig/src/tools/Makefile.am hunspell-1.1.3/src/tools/Makefile.am
---- hunspell-1.1.3.orig/src/tools/Makefile.am	2006-01-27 19:32:19.000000000 +0100
-+++ hunspell-1.1.3/src/tools/Makefile.am	2006-01-27 19:33:05.000000000 +0100
-@@ -1,13 +1,13 @@
--bin_PROGRAMS=munch unmunch example hunspell hunmorph hunstem
-+bin_PROGRAMS=hunspell-munch hunspell-unmunch hunspell-example hunspell hunmorph hunstem
- 
- 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.la
-+hunspell_example_SOURCES=example.cxx
-+hunspell_example_LDADD = ../hunspell/libhunspell.la
- 
- hunspell_SOURCES=hunspell.cxx
- hunspell_LDADD = @LIBINTL@ ../hunspell/libhunspell.la \
-diff -u -ur hunspell-1.1.3.orig/src/tools/example.cxx hunspell-1.1.3/src/tools/example.cxx
---- hunspell-1.1.3.orig/src/tools/example.cxx	2006-01-27 19:32:19.000000000 +0100
-+++ hunspell-1.1.3/src/tools/example.cxx	2006-01-27 19:33:31.000000000 +0100
-@@ -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.3.orig/src/tools/hunmorph.cxx hunspell-1.1.3/src/tools/hunmorph.cxx
---- hunspell-1.1.3.orig/src/tools/hunmorph.cxx	2006-01-27 19:32:19.000000000 +0100
-+++ hunspell-1.1.3/src/tools/hunmorph.cxx	2006-01-27 19:35:18.000000000 +0100
-@@ -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.3.orig/src/tools/hunstem.cxx hunspell-1.1.3/src/tools/hunstem.cxx
---- hunspell-1.1.3.orig/src/tools/hunstem.cxx	2006-01-27 19:32:19.000000000 +0100
-+++ hunspell-1.1.3/src/tools/hunstem.cxx	2006-01-27 19:35:28.000000000 +0100
-@@ -25,7 +25,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.3.orig/src/tools/munch.c hunspell-1.1.3/src/tools/munch.c
---- hunspell-1.1.3.orig/src/tools/munch.c	2006-01-27 19:32:19.000000000 +0100
-+++ hunspell-1.1.3/src/tools/munch.c	2006-01-27 19:33:56.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 -u -ur hunspell-1.1.3.orig/src/tools/unmunch.c hunspell-1.1.3/src/tools/unmunch.c
---- hunspell-1.1.3.orig/src/tools/unmunch.c	2006-01-27 19:32:19.000000000 +0100
-+++ hunspell-1.1.3/src/tools/unmunch.c	2006-01-27 19:34:10.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 --git a/app-text/hunspell/files/hunspell-1.2.2b-renameexes.patch b/app-text/hunspell/files/hunspell-1.2.2b-renameexes.patch
deleted file mode 100644
index db70de00e29b..000000000000
--- a/app-text/hunspell/files/hunspell-1.2.2b-renameexes.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-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.1.4-r1.ebuild b/app-text/hunspell/hunspell-1.1.4-r1.ebuild
deleted file mode 100644
index 11bf9760dda4..000000000000
--- a/app-text/hunspell/hunspell-1.1.4-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# 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.4-r1.ebuild,v 1.13 2007/03/04 07:37:50 genone 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 readline"
-
-DEPEND="readline? ( sys-libs/readline )
-	ncurses? ( sys-libs/ncurses )
-	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
-
-	# 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_with readline readline) \
-		$(use_with ncurses ui) \
-		|| 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() {
-	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.1.4-r2.ebuild b/app-text/hunspell/hunspell-1.1.4-r2.ebuild
deleted file mode 100644
index 7992401442a7..000000000000
--- a/app-text/hunspell/hunspell-1.1.4-r2.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# 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.4-r2.ebuild,v 1.3 2007/03/04 07:37:50 genone 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 ~ppc64 ~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() {
-	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.1.4.ebuild b/app-text/hunspell/hunspell-1.1.4.ebuild
deleted file mode 100644
index 50fb2ff0f4f3..000000000000
--- a/app-text/hunspell/hunspell-1.1.4.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# 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.4.ebuild,v 1.9 2007/03/04 07:37:50 genone Exp $
-
-inherit eutils multilib
-
-DESCRIPTION="Hunspell spell checker - an improved replacement for myspell in OOo."
-SRC_URI="mirror://sourceforge/${PN}/${P}.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.3-renameexes.patch
-	autoreconf
-}
-
-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_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() {
-	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>."
-}
diff --git a/app-text/hunspell/hunspell-1.1.5.ebuild b/app-text/hunspell/hunspell-1.1.5.ebuild
deleted file mode 100644
index 2d4c9006108b..000000000000
--- a/app-text/hunspell/hunspell-1.1.5.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# 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.3 2007/05/21 21:20:57 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 license.hunspell
-	# hunspell is derived from myspell
-	dodoc AUTHORS.myspell README.myspell license.myspell
-
-	# 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.
-	cd ${D}/usr/lib
-	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.1.9.ebuild b/app-text/hunspell/hunspell-1.1.9.ebuild
index f85eb7426874..f9969e89d9a2 100644
--- a/app-text/hunspell/hunspell-1.1.9.ebuild
+++ b/app-text/hunspell/hunspell-1.1.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# 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.8 2007/12/25 20:29:53 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/hunspell/hunspell-1.1.9.ebuild,v 1.9 2008/06/17 09:41:28 pva Exp $
 
 inherit eutils multilib autotools
 
@@ -29,10 +29,7 @@ src_unpack() {
 	# /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
+	eautoreconf -f
 }
 
 src_compile() {
diff --git a/app-text/hunspell/hunspell-1.2.2_beta.ebuild b/app-text/hunspell/hunspell-1.2.3.ebuild
index 35d2b123fa72..938f4f4e4da9 100644
--- a/app-text/hunspell/hunspell-1.2.2_beta.ebuild
+++ b/app-text/hunspell/hunspell-1.2.3.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/app-text/hunspell/hunspell-1.2.3.ebuild,v 1.1 2008/06/17 09:41:28 pva Exp $
 
 inherit eutils multilib autotools
 
@@ -12,37 +12,46 @@ 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"
+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}"
+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
+	epatch "${FILESDIR}"/${PN}-1.2.2-renameexes.patch
 
-	# Would still be nice to get bug 142787 fixed...
-	AT_M4DIR="m4" eautoreconf
+	eautoreconf
+}
+
+pkg_setup() {
+	# Workaround as it's impossible to build with readline but witout ncurses.
+	# http://sourceforge.net/tracker/index.php?func=detail&aid=1995842&group_id=143754&atid=756395
+	if use ncurses; then
+		myconf=$(use_with ncurses ui)
+		use readline && myconf="${myconf} $(use_with readline readline)"
+	else
+		if use readline; then
+			ewarn "readline USE flag has no effect without ncruses."			
+		fi
+	fi
 }
 
 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) \
+	econf ${myconf} \
+		$(use_with nls) \
 		|| die "econf failed"
 
 	emake || die "emake failed"
@@ -57,17 +66,12 @@ src_install() {
 	# 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.
+	# 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