app-text/hunspell: Removed old.

Package-Manager: Portage-2.3.8, Repoman-2.3.3

11 files changed, 0 insertions, 986 deletions

diff --git a/app-text/hunspell/Manifest b/app-text/hunspell/Manifest
index 0a84964aba63..e85e874fe303 100644
--- a/app-text/hunspell/Manifest
+++ b/app-text/hunspell/Manifest
@@ -1,7 +1,2 @@
-DIST hunspell-1.3.3.tar.gz 986081 SHA256 a7b2c0de0e2ce17426821dc1ac8eb115029959b3ada9d80a81739fa19373246c SHA512 7599981d002a4a032c41c83f6287243a4942b0e25c408049a3ba86c16f63ce964800a3ac325ace0402b0d7256690c4a4151a66f19a8f58cc455af0498bb1af04 WHIRLPOOL c10f7f7b326ce886bd031da29e9e04a1f4a5914f24cbe75061ed539958e7a8efaa4d4ea16f2b17437c63d97d6f558a27c092bc43c9f56c75078667d5344402f8
-DIST hunspell-1.3.4.tar.gz 1004935 SHA256 55918522cb0041748507dd4f5aa92d043cef337aa589b9367c2221da084281ac SHA512 092818570f5eb152b2bf8d0964068510185304f41e1eb0946bf7589c640d21bff67d2b79b49f770e8c0baa9031ab449eefb9e3b0bce8a28e2fc4809007fefa99 WHIRLPOOL 0e7c1941d31824e3a8f93200b6b228f56b0e35f14498a138425b177bc5a47274d422cd7b1d4836ebdb74b449bf777129381382e7b66211f5e8d1507cc3becdf7
-DIST hunspell-1.4.2.tar.gz 1000676 SHA256 b6a0b23d083e0130f8c561cca8c980814ba65740ccfa52f47159f9141089946d SHA512 b4528e9cc926456809b6a0c0c95ed95b297ca564c219bb229f8daefcc7aa4d50e77c99778f8eba867106d284a6ed6320e6966a7b304c7af873908cf55118f8f3 WHIRLPOOL 0343c7e507c6eae0d9df38a3c9bcf1ec847c3afc5497ac9dd729df1418cb0a398d25ee47da8fe498230ef7589d6735abb6a5eee6f2d5125e418437eaa9500ddc
-DIST hunspell-1.5.4.tar.gz 1110858 SHA256 852c01a2e3b87eb1f2adb5261466608ba79f1f950202e18a2a1735de5098fc59 SHA512 cda1612af2984bb28f7cf42ed2c81aac0e8ff0d0f740b3607a75f076d3478960f0c1d6b52a06fb0afbacfc1fce103da1ca2438dbe62e7abb46f70231347357bd WHIRLPOOL fe350cc0a22606c036e300ce8da0b1af36950778548d44bc6075ceb8da3aad0d682e2e12795bb1d52bba784910947ea9ed5c0ce07fdbb19524309b01b8898e9a
-DIST hunspell-1.6.0.tar.gz 699377 SHA256 512e7d2ee69dad0b35ca011076405e56e0f10963a02d4859dbcc4faf53ca68e2 SHA512 d13e0384654f98f87de61d3d6ec03fe4a0e972b49b7e220083c72c2dd99d169a4854160f7068baa34fe4d4bd85fa5c24b56587827b946fb072a2085173801ca9 WHIRLPOOL 9ab935e0a94e3f7ae02a9cf27b65c7f74b4eb13a2a447d05f94b3864d88b6d7c5bf93756433cc459506721e2327e83bb7151a638a9c2d2bc46a59a16889494cf
 DIST hunspell-1.6.1.tar.gz 706893 SHA256 30f593733c50b794016bb03d31fd2a2071e4610c6fa4708e33edad2335102c49 SHA512 39b096ec1f5226f13eaf241647fc9b49a6dad04945ae0bcdc61ba845d66d67d64a72ba4287b6f376b5ad053b5d0e1d42a42415c30521c50693f0544718029458 WHIRLPOOL 3013fc1538d01650ffc233f53f000cab7c797be7c712d7609598f0c5807eacf5a13215bce7176da6578e5e78825525864f833db56dbe64362431d3680fbd6b00
 DIST hunspell-1.6.2.tar.gz 721165 SHA256 3cd9ceb062fe5814f668e4f22b2fa6e3ba0b339b921739541ce180cac4d6f4c4 SHA512 a23127f1271da95ac06a1fb2f57b659485e959567b61da05b2bb350684003a0fb7e882b5e524c465fd890f79f513ed03174f38611989a1c09081147c47d6da11 WHIRLPOOL 04b83cbe0bb83fce42fd61a4585ffa03619c4cb5e7cf49f1e432dee34150ef63dd45074cfe820b7efc8965d2be1c8aefaae1d43424161d31494fbb4a72afb173
diff --git a/app-text/hunspell/files/hunspell-1.3-renameexes.patch b/app-text/hunspell/files/hunspell-1.3-renameexes.patch
deleted file mode 100644
index 70c5b748edba..000000000000
--- a/app-text/hunspell/files/hunspell-1.3-renameexes.patch
+++ /dev/null
@@ -1,135 +0,0 @@
-=== modified file 'src/tools/Makefile.am'
---- src/tools/Makefile.am	2011-05-24 15:55:29 +0000
-+++ src/tools/Makefile.am	2011-05-24 15:58:36 +0000
-@@ -1,4 +1,4 @@
--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 +6,8 @@
- hunzip_SOURCES=hunzip.cxx
- hunzip_LDADD = ../hunspell/libhunspell-1.3.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.3.la
-@@ -16,11 +16,11 @@
- hunspell_LDADD = @LIBINTL@ @LIBICONV@ ../parsers/libparsers.a \
- 	../hunspell/libhunspell-1.3.la @CURSESLIB@ @READLINELIB@
- 
--analyze_SOURCES=analyze.cxx
--analyze_LDADD = ../hunspell/libhunspell-1.3.la
-+hunspell_analyze_SOURCES=analyze.cxx
-+hunspell_analyze_LDADD = ../hunspell/libhunspell-1.3.la
- 
--chmorph_SOURCES=chmorph.cxx
--chmorph_LDADD = ../parsers/libparsers.a ../hunspell/libhunspell-1.3.la
-+hunspell_chmorph_SOURCES=chmorph.cxx
-+hunspell_chmorph_LDADD = ../parsers/libparsers.a ../hunspell/libhunspell-1.3.la
- 
- noinst_PROGRAMS=example
- 
-
-=== modified file 'src/tools/chmorph.cxx'
---- src/tools/chmorph.cxx	2011-05-24 15:55:29 +0000
-+++ src/tools/chmorph.cxx	2011-05-24 16:00:54 +0000
-@@ -19,11 +19,11 @@
-     for (int i = 1; i < 6; i++)
- 	if (!argv[i]) {
- 	    fprintf(stderr, 
--	    "chmorph - change affixes by morphological analysis and generation\n" 
--	    "correct syntax is:\nchmorph affix_file "
-+	    "hunspell-chmorph - change affixes by morphological analysis and generation\n" 
-+	    "correct syntax is:\nhunspell-chmorph affix_file "
-             "dictionary_file file_to_convert STRING1 STRING2\n"
-             "STRINGS may be arbitrary parts of the morphological descriptions\n"
--	    "example: chmorph hu.aff hu.dic hu.txt SG_2 SG_3 "
-+	    "example: hunspell-chmorph hu.aff hu.dic hu.txt SG_2 SG_3 "
- 	    " (convert informal Hungarian second person texts to formal third person texts)\n");
- 	    exit(1);
- 	}
-
-=== modified file 'src/tools/example.cxx'
---- src/tools/example.cxx	2011-05-24 15:55:29 +0000
-+++ src/tools/example.cxx	2011-05-24 15:55:37 +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	2011-05-24 15:55:29 +0000
-+++ src/tools/munch.c	2011-05-24 15:55:37 +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	2011-05-24 15:55:29 +0000
-+++ src/tools/unmunch.c	2011-05-24 15:55:37 +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	2011-05-24 15:55:29 +0000
-+++ tests/test.sh	2011-05-24 15:55:37 +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.3.3-multibyte-chars.patch b/app-text/hunspell/files/hunspell-1.3.3-multibyte-chars.patch
deleted file mode 100644
index 848bc8fe8950..000000000000
--- a/app-text/hunspell/files/hunspell-1.3.3-multibyte-chars.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7781#31
-https://bugs.gentoo.org/518740
-
---- src/tools/hunspell.cxx
-+++ src/tools/hunspell.cxx
-@@ -710,13 +748,22 @@ if (pos >= 0) {
- 			fflush(stdout);
- 		} else {
- 			char ** wlst = NULL;
--			int ns = pMS[d]->suggest(&wlst, token);
-+			int byte_offset = parser->get_tokenpos() + pos;
-+			int char_offset = 0;
-+			if (strcmp(io_enc, "UTF-8") == 0) {
-+				for (int i = 0; i < byte_offset; i++) {
-+					if ((buf[i] & 0xc0) != 0x80)
-+						char_offset++;
-+				}
-+			} else {
-+				char_offset = byte_offset;
-+			}
-+			int ns = pMS[d]->suggest(&wlst, chenc(token, io_enc, dic_enc[d]));
- 			if (ns == 0) {
--		    		fprintf(stdout,"# %s %d", token,
--		    		    parser->get_tokenpos() + pos);
-+		    		fprintf(stdout,"# %s %d", token, char_offset);
- 			} else {
- 				fprintf(stdout,"& %s %d %d: ", token, ns,
--				    parser->get_tokenpos() + pos);
-+					char_offset);
- 				fprintf(stdout,"%s", chenc(wlst[0], dic_enc[d], io_enc));
- 			}
- 			for (int j = 1; j < ns; j++) {
-@@ -745,13 +792,23 @@ if (pos >= 0) {
- 			if (root) free(root);
- 		} else {
- 			char ** wlst = NULL;
-+			int byte_offset = parser->get_tokenpos() + pos;
-+			int char_offset = 0;
-+			if (strcmp(io_enc, "UTF-8") == 0) {
-+				for (int i = 0; i < byte_offset; i++) {
-+					if ((buf[i] & 0xc0) != 0x80)
-+						char_offset++;
-+				}
-+			} else {
-+				char_offset = byte_offset;
-+			}
- 			int ns = pMS[d]->suggest(&wlst, chenc(token, io_enc, dic_enc[d]));
- 			if (ns == 0) {
- 		    		fprintf(stdout,"# %s %d", chenc(token, io_enc, ui_enc),
--		    		    parser->get_tokenpos() + pos);
-+		    		    char_offset);
- 			} else {
- 				fprintf(stdout,"& %s %d %d: ", chenc(token, io_enc, ui_enc), ns,
--				    parser->get_tokenpos() + pos);
-+				    char_offset);
- 				fprintf(stdout,"%s", chenc(wlst[0], dic_enc[d], ui_enc));
- 			}
- 			for (int j = 1; j < ns; j++) {
-
diff --git a/app-text/hunspell/files/hunspell-1.3.4-renameexes.patch b/app-text/hunspell/files/hunspell-1.3.4-renameexes.patch
deleted file mode 100644
index 642a0246277f..000000000000
--- a/app-text/hunspell/files/hunspell-1.3.4-renameexes.patch
+++ /dev/null
@@ -1,124 +0,0 @@
---- hunspell-1.3.4/src/tools/chmorph.cxx
-+++ hunspell-1.3.4/src/tools/chmorph.cxx
-@@ -58,11 +58,11 @@
-     if (!argv[i]) {
-       fprintf(
-           stderr,
--          "chmorph - change affixes by morphological analysis and generation\n"
--          "correct syntax is:\nchmorph affix_file "
-+          "hunspell-chmorph - change affixes by morphological analysis and generation\n"
-+          "correct syntax is:\nhunspell-chmorph affix_file "
-           "dictionary_file file_to_convert STRING1 STRING2\n"
-           "STRINGS may be arbitrary parts of the morphological descriptions\n"
--          "example: chmorph hu.aff hu.dic hu.txt SG_2 SG_3 "
-+          "example: hunspell-chmorph hu.aff hu.dic hu.txt SG_2 SG_3 "
-           " (convert informal Hungarian second person texts to formal third "
-           "person texts)\n");
-       exit(1);
---- hunspell-1.3.4/src/tools/example.cxx
-+++ hunspell-1.3.4/src/tools/example.cxx
-@@ -54,9 +54,9 @@
-   /* first parse the command line options */
- 
-   if (argc < 4) {
--    fprintf(stderr, "example (now it works with more dictionary files):\n");
-+    fprintf(stderr, "hunspell-example (now it works with more dictionary files):\n");
-     fprintf(stderr,
--            "example affix_file dictionary_file(s) file_of_words_to_check\n");
-+            "hunspell-example affix_file dictionary_file(s) file_of_words_to_check\n");
-     exit(1);
-   }
- 
---- hunspell-1.3.4/src/tools/Makefile.am
-+++ hunspell-1.3.4/src/tools/Makefile.am
-@@ -1,4 +1,4 @@
--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 +6,8 @@
- hunzip_SOURCES=hunzip.cxx
- hunzip_LDADD = ../hunspell/libhunspell-1.3.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.3.la
-@@ -16,11 +16,11 @@
- hunspell_LDADD = @LIBINTL@ @LIBICONV@ ../parsers/libparsers.a \
- 	../hunspell/libhunspell-1.3.la @CURSESLIB@ @READLINELIB@
- 
--analyze_SOURCES=analyze.cxx
--analyze_LDADD = ../hunspell/libhunspell-1.3.la
-+hunspell_analyze_SOURCES=analyze.cxx
-+hunspell_analyze_LDADD = ../hunspell/libhunspell-1.3.la
- 
--chmorph_SOURCES=chmorph.cxx
--chmorph_LDADD = ../parsers/libparsers.a ../hunspell/libhunspell-1.3.la
-+hunspell_chmorph_SOURCES=chmorph.cxx
-+hunspell_chmorph_LDADD = ../parsers/libparsers.a ../hunspell/libhunspell-1.3.la
- 
- noinst_PROGRAMS=example
- 
---- hunspell-1.3.4/src/tools/munch.c
-+++ hunspell-1.3.4/src/tools/munch.c
-@@ -79,14 +79,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);
-   }
- 
---- hunspell-1.3.4/src/tools/unmunch.c
-+++ hunspell-1.3.4/src/tools/unmunch.c
-@@ -74,14 +74,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);
-   }
- 
---- hunspell-1.3.4/tests/test.sh
-+++ hunspell-1.3.4/tests/test.sh
-@@ -74,7 +74,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/hunespell-analyze'
- 
- if [ "$VALGRIND" != "" ]; then
-   rm -f $TEMPDIR/test.pid*
-@@ -83,7 +83,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.4.0-renameexes.patch b/app-text/hunspell/files/hunspell-1.4.0-renameexes.patch
deleted file mode 100644
index 621794a46a66..000000000000
--- a/app-text/hunspell/files/hunspell-1.4.0-renameexes.patch
+++ /dev/null
@@ -1,124 +0,0 @@
---- hunspell-1.4.0/src/tools/chmorph.cxx
-+++ hunspell-1.4.0/src/tools/chmorph.cxx
-@@ -58,11 +58,11 @@
-     if (!argv[i]) {
-       fprintf(
-           stderr,
--          "chmorph - change affixes by morphological analysis and generation\n"
--          "correct syntax is:\nchmorph affix_file "
-+          "hunspell-chmorph - change affixes by morphological analysis and generation\n"
-+          "correct syntax is:\nhunspell-chmorph affix_file "
-           "dictionary_file file_to_convert STRING1 STRING2\n"
-           "STRINGS may be arbitrary parts of the morphological descriptions\n"
--          "example: chmorph hu.aff hu.dic hu.txt SG_2 SG_3 "
-+          "example: hunspell-chmorph hu.aff hu.dic hu.txt SG_2 SG_3 "
-           " (convert informal Hungarian second person texts to formal third "
-           "person texts)\n");
-       exit(1);
---- hunspell-1.4.0/src/tools/example.cxx
-+++ hunspell-1.4.0/src/tools/example.cxx
-@@ -54,9 +54,9 @@
-   /* first parse the command line options */
- 
-   if (argc < 4) {
--    fprintf(stderr, "example (now it works with more dictionary files):\n");
-+    fprintf(stderr, "hunspell-example (now it works with more dictionary files):\n");
-     fprintf(stderr,
--            "example affix_file dictionary_file(s) file_of_words_to_check\n");
-+            "hunspell-example affix_file dictionary_file(s) file_of_words_to_check\n");
-     exit(1);
-   }
- 
---- hunspell-1.4.0/src/tools/Makefile.am
-+++ hunspell-1.4.0/src/tools/Makefile.am
-@@ -1,4 +1,4 @@
--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 +6,8 @@
- hunzip_SOURCES=hunzip.cxx
- hunzip_LDADD = ../hunspell/libhunspell-1.4.la
- 
--munch_SOURCES=munch.cxx munch.h
--unmunch_SOURCES=unmunch.cxx unmunch.h
-+hunspell_munch_SOURCES=munch.cxx munch.h
-+hunspell_unmunch_SOURCES=unmunch.cxx unmunch.h
- 
- example_SOURCES=example.cxx
- example_LDADD = ../hunspell/libhunspell-1.4.la
-@@ -16,11 +16,11 @@
- hunspell_LDADD = @LIBINTL@ @LIBICONV@ ../parsers/libparsers.a \
- 	../hunspell/libhunspell-1.4.la @CURSESLIB@ @READLINELIB@
- 
--analyze_SOURCES=analyze.cxx
--analyze_LDADD = ../hunspell/libhunspell-1.4.la
-+hunspell_analyze_SOURCES=analyze.cxx
-+hunspell_analyze_LDADD = ../hunspell/libhunspell-1.4.la
- 
--chmorph_SOURCES=chmorph.cxx
--chmorph_LDADD = ../parsers/libparsers.a ../hunspell/libhunspell-1.4.la
-+hunspell_chmorph_SOURCES=chmorph.cxx
-+hunspell_chmorph_LDADD = ../parsers/libparsers.a ../hunspell/libhunspell-1.4.la
- 
- noinst_PROGRAMS=example
- 
---- hunspell-1.4.0/src/tools/munch.cxx
-+++ hunspell-1.4.0/src/tools/munch.cxx
-@@ -80,14 +80,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);
-   }
- 
---- hunspell-1.4.0/src/tools/unmunch.cxx
-+++ hunspell-1.4.0/src/tools/unmunch.cxx
-@@ -76,14 +76,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);
-   }
- 
---- hunspell-1.4.0/tests/test.sh
-+++ hunspell-1.4.0/tests/test.sh
-@@ -74,7 +74,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*
-@@ -83,7 +83,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.5.0-renameexes.patch b/app-text/hunspell/files/hunspell-1.5.0-renameexes.patch
deleted file mode 100644
index f2a555e34065..000000000000
--- a/app-text/hunspell/files/hunspell-1.5.0-renameexes.patch
+++ /dev/null
@@ -1,124 +0,0 @@
---- hunspell-1.5.0/src/tools/chmorph.cxx
-+++ hunspell-1.5.0/src/tools/chmorph.cxx
-@@ -58,11 +58,11 @@
-     if (!argv[i]) {
-       fprintf(
-           stderr,
--          "chmorph - change affixes by morphological analysis and generation\n"
--          "correct syntax is:\nchmorph affix_file "
-+          "hunspell-chmorph - change affixes by morphological analysis and generation\n"
-+          "correct syntax is:\nhunspell-chmorph affix_file "
-           "dictionary_file file_to_convert STRING1 STRING2\n"
-           "STRINGS may be arbitrary parts of the morphological descriptions\n"
--          "example: chmorph hu.aff hu.dic hu.txt SG_2 SG_3 "
-+          "example: hunspell-chmorph hu.aff hu.dic hu.txt SG_2 SG_3 "
-           " (convert informal Hungarian second person texts to formal third "
-           "person texts)\n");
-       exit(1);
---- hunspell-1.5.0/src/tools/example.cxx
-+++ hunspell-1.5.0/src/tools/example.cxx
-@@ -53,9 +53,9 @@
-   /* first parse the command line options */
- 
-   if (argc < 4) {
--    fprintf(stderr, "example (now it works with more dictionary files):\n");
-+    fprintf(stderr, "hunspell-example (now it works with more dictionary files):\n");
-     fprintf(stderr,
--            "example affix_file dictionary_file(s) file_of_words_to_check\n");
-+            "hunspell-example affix_file dictionary_file(s) file_of_words_to_check\n");
-     exit(1);
-   }
- 
---- hunspell-1.5.0/src/tools/Makefile.am
-+++ hunspell-1.5.0/src/tools/Makefile.am
-@@ -1,4 +1,4 @@
--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_builddir}/src/hunspell -I${top_srcdir}/src/hunspell -I${top_srcdir}/src/parsers
- 
-@@ -6,8 +6,8 @@
- hunzip_SOURCES=hunzip.cxx
- hunzip_LDADD = ../hunspell/libhunspell-1.5.la
- 
--munch_SOURCES=munch.cxx munch.h
--unmunch_SOURCES=unmunch.cxx unmunch.h
-+hunspell_munch_SOURCES=munch.cxx munch.h
-+hunspell_unmunch_SOURCES=unmunch.cxx unmunch.h
- 
- example_SOURCES=example.cxx
- example_LDADD = ../hunspell/libhunspell-1.5.la
-@@ -16,11 +16,11 @@
- hunspell_LDADD = @LIBINTL@ @LIBICONV@ ../parsers/libparsers.a \
- 	../hunspell/libhunspell-1.5.la @CURSESLIB@ @READLINELIB@
- 
--analyze_SOURCES=analyze.cxx
--analyze_LDADD = ../hunspell/libhunspell-1.5.la
-+hunspell_analyze_SOURCES=analyze.cxx
-+hunspell_analyze_LDADD = ../hunspell/libhunspell-1.5.la
- 
--chmorph_SOURCES=chmorph.cxx
--chmorph_LDADD = ../parsers/libparsers.a ../hunspell/libhunspell-1.5.la
-+hunspell_chmorph_SOURCES=chmorph.cxx
-+hunspell_chmorph_LDADD = ../parsers/libparsers.a ../hunspell/libhunspell-1.5.la
- 
- noinst_PROGRAMS=example
- 
---- hunspell-1.5.0/src/tools/munch.cxx
-+++ hunspell-1.5.0/src/tools/munch.cxx
-@@ -81,14 +81,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);
-   }
- 
---- hunspell-1.5.0/src/tools/unmunch.cxx
-+++ hunspell-1.5.0/src/tools/unmunch.cxx
-@@ -76,14 +76,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);
-   }
- 
---- hunspell-1.5.0/tests/test.sh
-+++ hunspell-1.5.0/tests/test.sh
-@@ -74,7 +74,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*
-@@ -83,7 +83,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/hunspell-1.3.3.ebuild b/app-text/hunspell/hunspell-1.3.3.ebuild
deleted file mode 100644
index a385894c5c83..000000000000
--- a/app-text/hunspell/hunspell-1.3.3.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils multilib autotools flag-o-matic versionator
-
-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 static-libs"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	ncurses? ( sys-libs/ncurses:0= )
-	readline? ( sys-libs/readline:= )"
-DEPEND="${RDEPEND}
-	sys-devel/gettext"
-
-# describe properly mi
-LANGS="af bg ca cs cy da de de-1901 el en eo es et fo fr ga gl he hr hu ia id
-is it kk km ku lt lv mk ms nb nl nn pl pt pt-BR ro ru sk sl sq sv sw tn uk zu"
-
-PDEPEND="app-dicts/myspell-en"
-for lang in ${LANGS}; do
-	IUSE+=" l10n_${lang}"
-	case ${lang} in
-		de-1901) dict="de_1901" ;;
-		pt-BR)   dict="pt-br"   ;;
-		*)       dict="${lang}" ;;
-	esac
-	PDEPEND+=" l10n_${lang}? ( app-dicts/myspell-${dict} )"
-done
-unset dict lang LANGS
-
-S=${WORKDIR}/${MY_P}
-
-DOCS=(
-	AUTHORS ChangeLog NEWS README THANKS TODO license.hunspell
-	AUTHORS.myspell README.myspell license.myspell
-)
-
-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.3-renameexes.patch \
-		"${FILESDIR}"/${PN}-1.3.3-multibyte-chars.patch
-	eautoreconf
-}
-
-src_configure() {
-	# missing somehow, and I am too lazy to fix it properly
-	[[ ${CHOST} == *-darwin* ]] && append-libs -liconv
-
-	# I wanted to put the include files in /usr/include/hunspell.
-	# You can do that, libreoffice can find them anywhere, just
-	# ping me when you do so ; -- scarabeus
-	econf \
-		$(use_enable nls) \
-		$(use_with ncurses ui) \
-		$(use_with readline readline) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-
-	prune_libtool_files --all
-
-	#342449
-	pushd "${ED}"/usr/$(get_libdir)/ >/dev/null
-	ln -s lib${PN}{-$(get_major_version).$(get_version_component_range 2).so.0.0.0,.so}
-	popd >/dev/null
-}
diff --git a/app-text/hunspell/hunspell-1.3.4.ebuild b/app-text/hunspell/hunspell-1.3.4.ebuild
deleted file mode 100644
index cfcb4f36e91d..000000000000
--- a/app-text/hunspell/hunspell-1.3.4.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils multilib autotools flag-o-matic versionator
-
-MY_P=${PN}-${PV/_beta/b}
-
-DESCRIPTION="Hunspell spell checker - an improved replacement for myspell in OOo"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-HOMEPAGE="http://hunspell.sourceforge.net/"
-
-SLOT="0"
-LICENSE="MPL-1.1 GPL-2 LGPL-2.1"
-IUSE="ncurses nls readline static-libs"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	ncurses? ( sys-libs/ncurses:0= )
-	readline? ( sys-libs/readline:= )"
-DEPEND="${RDEPEND}
-	sys-devel/gettext"
-
-LANGS="af bg ca cs cy da de de-1901 el en eo es et fo fr ga gl he hr hu ia id
-is it kk km ku lt lv mi mk ms nb nl nn pl pt pt-BR ro ru sk sl sq sv sw tn uk
-zu"
-
-PDEPEND="app-dicts/myspell-en"
-for lang in ${LANGS}; do
-	IUSE+=" l10n_${lang}"
-	case ${lang} in
-		de-1901) dict="de_1901" ;;
-		pt-BR)   dict="pt-br"   ;;
-		*)       dict="${lang}" ;;
-	esac
-	PDEPEND+=" l10n_${lang}? ( app-dicts/myspell-${dict} )"
-done
-unset dict lang LANGS
-
-S=${WORKDIR}/${MY_P}
-
-DOCS=(
-	AUTHORS ChangeLog NEWS README THANKS TODO license.hunspell
-	AUTHORS.myspell README.myspell license.myspell
-)
-
-PATCHES=(
-	# 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.
-	"${FILESDIR}/${PN}-1.3.4-renameexes.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# missing somehow, and I am too lazy to fix it properly
-	[[ ${CHOST} == *-darwin* ]] && append-libs -liconv
-
-	# I wanted to put the include files in /usr/include/hunspell.
-	# You can do that, libreoffice can find them anywhere, just
-	# ping me when you do so ; -- scarabeus
-	econf \
-		$(use_enable nls) \
-		$(use_with ncurses ui) \
-		$(use_with readline readline) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-
-	einstalldocs
-
-	prune_libtool_files --all
-
-	#342449
-	pushd "${ED}"/usr/$(get_libdir)/ >/dev/null
-	ln -s lib${PN}{-$(get_major_version).$(get_version_component_range 2).so.0.0.0,.so}
-	popd >/dev/null
-}
diff --git a/app-text/hunspell/hunspell-1.4.2.ebuild b/app-text/hunspell/hunspell-1.4.2.ebuild
deleted file mode 100644
index 1f59e292507b..000000000000
--- a/app-text/hunspell/hunspell-1.4.2.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils multilib autotools flag-o-matic versionator
-
-MY_P=${PN}-${PV/_beta/b}
-
-DESCRIPTION="Hunspell spell checker - an improved replacement for myspell in OOo"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-HOMEPAGE="http://hunspell.sourceforge.net/"
-
-SLOT="0/1.4"
-LICENSE="MPL-1.1 GPL-2 LGPL-2.1"
-IUSE="ncurses nls readline static-libs"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	ncurses? ( sys-libs/ncurses:0= )
-	readline? ( sys-libs/readline:= )"
-DEPEND="${RDEPEND}
-	sys-devel/gettext"
-
-LANGS="af bg ca cs cy da de de-1901 el en eo es et fo fr ga gl he hr hu ia id
-is it kk km ku lt lv mi mk ms nb nl nn pl pt pt-BR ro ru sk sl sq sv sw tn uk
-zu"
-
-PDEPEND="app-dicts/myspell-en"
-for lang in ${LANGS}; do
-	IUSE+=" l10n_${lang}"
-	case ${lang} in
-		de-1901) dict="de_1901" ;;
-		pt-BR)   dict="pt-br"   ;;
-		*)       dict="${lang}" ;;
-	esac
-	PDEPEND+=" l10n_${lang}? ( app-dicts/myspell-${dict} )"
-done
-unset dict lang LANGS
-
-S=${WORKDIR}/${MY_P}
-
-DOCS=(
-	AUTHORS ChangeLog NEWS README THANKS TODO license.hunspell
-	AUTHORS.myspell README.myspell license.myspell
-)
-
-PATCHES=(
-	# 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.
-	"${FILESDIR}/${PN}-1.4.0-renameexes.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# missing somehow, and I am too lazy to fix it properly
-	[[ ${CHOST} == *-darwin* ]] && append-libs -liconv
-
-	# I wanted to put the include files in /usr/include/hunspell.
-	# You can do that, libreoffice can find them anywhere, just
-	# ping me when you do so ; -- scarabeus
-	econf \
-		$(use_enable nls) \
-		$(use_with ncurses ui) \
-		$(use_with readline readline) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-
-	einstalldocs
-
-	prune_libtool_files --all
-
-	#342449
-	pushd "${ED}"/usr/$(get_libdir)/ >/dev/null
-	ln -s lib${PN}{-$(get_major_version).$(get_version_component_range 2).so.0.0.0,.so}
-	popd >/dev/null
-}
diff --git a/app-text/hunspell/hunspell-1.5.4.ebuild b/app-text/hunspell/hunspell-1.5.4.ebuild
deleted file mode 100644
index 36dab57f4a53..000000000000
--- a/app-text/hunspell/hunspell-1.5.4.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils multilib autotools flag-o-matic versionator
-
-MY_P=${PN}-${PV/_beta/b}
-
-DESCRIPTION="Hunspell spell checker - an improved replacement for myspell in OOo"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-HOMEPAGE="http://hunspell.sourceforge.net/"
-
-SLOT="0/$(get_version_component_range 1-2)"
-LICENSE="MPL-1.1 GPL-2 LGPL-2.1"
-IUSE="ncurses nls readline static-libs"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	ncurses? ( sys-libs/ncurses:0= )
-	readline? ( sys-libs/readline:= )"
-DEPEND="${RDEPEND}
-	sys-devel/gettext"
-
-LANGS="af bg ca cs cy da de de-1901 el en eo es et fo fr ga gl he hr hu ia id
-is it kk km ku lt lv mi mk ms nb nl nn pl pt pt-BR ro ru sk sl sq sv sw tn uk
-zu"
-
-PDEPEND="app-dicts/myspell-en"
-for lang in ${LANGS}; do
-	IUSE+=" l10n_${lang}"
-	case ${lang} in
-		de-1901) dict="de_1901" ;;
-		pt-BR)   dict="pt-br"   ;;
-		*)       dict="${lang}" ;;
-	esac
-	PDEPEND+=" l10n_${lang}? ( app-dicts/myspell-${dict} )"
-done
-unset dict lang LANGS
-
-S=${WORKDIR}/${MY_P}
-
-DOCS=(
-	AUTHORS ChangeLog NEWS README THANKS TODO license.hunspell
-	AUTHORS.myspell README.myspell license.myspell
-)
-
-PATCHES=(
-	# 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.
-	"${FILESDIR}/${PN}-1.5.0-renameexes.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# missing somehow, and I am too lazy to fix it properly
-	[[ ${CHOST} == *-darwin* ]] && append-libs -liconv
-
-	# I wanted to put the include files in /usr/include/hunspell.
-	# You can do that, libreoffice can find them anywhere, just
-	# ping me when you do so ; -- scarabeus
-	econf \
-		$(use_enable nls) \
-		$(use_with ncurses ui) \
-		$(use_with readline readline) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-
-	einstalldocs
-
-	prune_libtool_files --all
-
-	#342449
-	pushd "${ED}"/usr/$(get_libdir)/ >/dev/null
-	ln -s lib${PN}{-$(get_major_version).$(get_version_component_range 2).so.0.0.0,.so}
-	popd >/dev/null
-}
diff --git a/app-text/hunspell/hunspell-1.6.0.ebuild b/app-text/hunspell/hunspell-1.6.0.ebuild
deleted file mode 100644
index 22e54d672b21..000000000000
--- a/app-text/hunspell/hunspell-1.6.0.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils multilib autotools flag-o-matic versionator
-
-MY_P=${PN}-${PV/_beta/b}
-
-DESCRIPTION="Hunspell spell checker - an improved replacement for myspell in OOo"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-HOMEPAGE="http://hunspell.sourceforge.net/"
-
-SLOT="0/$(get_version_component_range 1-2)"
-LICENSE="MPL-1.1 GPL-2 LGPL-2.1"
-IUSE="ncurses nls readline static-libs"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	ncurses? ( sys-libs/ncurses:0= )
-	readline? ( sys-libs/readline:= )"
-DEPEND="${RDEPEND}
-	sys-devel/gettext"
-
-LANGS="af bg ca cs cy da de de-1901 el en eo es et fo fr ga gl he hr hu ia id
-is it kk km ku lt lv mi mk ms nb nl nn pl pt pt-BR ro ru sk sl sq sv sw tn uk
-zu"
-
-PDEPEND="app-dicts/myspell-en"
-for lang in ${LANGS}; do
-	IUSE+=" l10n_${lang}"
-	case ${lang} in
-		de-1901) dict="de_1901" ;;
-		pt-BR)   dict="pt-br"   ;;
-		*)       dict="${lang}" ;;
-	esac
-	PDEPEND+=" l10n_${lang}? ( app-dicts/myspell-${dict} )"
-done
-unset dict lang LANGS
-
-S=${WORKDIR}/${MY_P}
-
-DOCS=(
-	AUTHORS ChangeLog NEWS README THANKS TODO license.hunspell
-	AUTHORS.myspell README.myspell license.myspell README.md
-)
-
-PATCHES=(
-	# 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.
-	"${FILESDIR}/${PN}-1.6.0-renameexes.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# missing somehow, and I am too lazy to fix it properly
-	[[ ${CHOST} == *-darwin* ]] && append-libs -liconv
-
-	# I wanted to put the include files in /usr/include/hunspell.
-	# You can do that, libreoffice can find them anywhere, just
-	# ping me when you do so ; -- scarabeus
-	econf \
-		$(use_enable nls) \
-		$(use_with ncurses ui) \
-		$(use_with readline readline) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-
-	einstalldocs
-
-	prune_libtool_files --all
-
-	#342449
-	pushd "${ED}"/usr/$(get_libdir)/ >/dev/null
-	ln -s lib${PN}{-$(get_major_version).$(get_version_component_range 2).so.0.0.0,.so}
-	popd >/dev/null
-}