Version bump, drop old.

(Portage version: 2.1.9.18/cvs/Linux x86_64)

3 files changed, 116 insertions, 231 deletions

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*
-