app-text/hunspell: fix <error.h> patch.

4 files changed, 47 insertions, 41 deletions

diff --git a/app-text/hunspell/Manifest b/app-text/hunspell/Manifest
index 4864b7ea..4d34476b 100644
--- a/app-text/hunspell/Manifest
+++ b/app-text/hunspell/Manifest
@@ -1,7 +1,7 @@
 AUX hunspell-1.3-renameexes.patch 5337 SHA256 4cbeae9c782a2114d09d7920b1dfe355f37711ecd895d800a6b460bb87184f89 SHA512 26cab6d31a22c33e96a118e2b0905bd26e7d224737fab9f4d02f8ed4729032202de37b0d9e42500b0ba8912109bb47eec0e47ed712e9b3a082c9f8a24db52588 WHIRLPOOL 633f1204fa824bdb0507914e13894c7bf68a07438f86bd1baddb2ae884792487816cdda94214fcfff005080ebe9dd352282f38c9e5db86daef1bd04491ad1960
 AUX hunspell-1.3.2-static-lib.patch 451 SHA256 7259ea8f23a4d2717e85f62e3276cbcc23af292f6e77daddeb23bd93dbde0528 SHA512 923ff9f5cc7d32fba73755eaed537af43b95ee8050865c623f6552bcadee4acf9d23d2fcbdba1ffefe648fff05f92c5af5e4b067e31fc306d9258d64eba45ced WHIRLPOOL 1e1dc1cd8cc65d19c215c9ed13b366d84287d29d21cfd3d0d3c2467c7e656bf91c92567d12c6ac8a77f8dd2d902e60611d34e190d53026e04034efc84069fd1b
+AUX hunspell-1.3.3-error_h.patch 1218 SHA256 bf3f74ccf7809e3d4ba454a2e8fa0a2b4048c0d718b3ce6746f490c540939583 SHA512 c8b900b92ac648a0d1be7b7b3ae2e798e5c3b1acd9770a27219d0005019dc0668c4b55c89b01229ddf19fba2346bc82a76f907c72ff2e0f51482bc9a075eed37 WHIRLPOOL f42abd45987f46393cf5a28acc0ec2ad5d7d57b0b10c2ea7000325c1f82035cf269f914e523beee41abe900680e91ded2bfdc9d2d80546090b056f4f5cc6ffa5
 AUX hunspell-1.3.3-multibyte-chars.patch 1866 SHA256 1a2f0c6fd79894fa5f556c1715bc4bd05f2409b1d778bc2f597e3d44dc64f457 SHA512 a5b3b2a7b93bf5c5cdf446ae4a85e88e6bf1244c05437df29734241507e715f18ca5967de708f20ab569b55c646f85f4277c1112c867321edfd105a946c7bf9c WHIRLPOOL df9418af8941e8cba06a6b4b63369324fbad358b4c4bface9385f720ac91881150cd832e3c0f5665bc35ae5cd02da9c978233d1254d0ff45370516db58997563
-AUX hunspell-9999-error_h.patch 881 SHA256 8755794dbe59cf8540b077866d1dd604dad950e80c19b5999d584f23cfc967bb SHA512 9ed53121f07f9735cf4383deee5bbaffce75f85cfd9b7df26e7067713da05d6fb3cf7e6dd617aa2420b2780e556fa39230d1cbf20eba833120f3cc80026e2957 WHIRLPOOL 03382d367a546d3d9649748ee3d67f4ee6d590b6f607092b3373e07a0da309abedf3c5f66ea6dba6756eda858cf208746ab91daeb3f04fb4268a65539ffad748
 DIST hunspell-1.3.3.tar.gz 986081 SHA256 a7b2c0de0e2ce17426821dc1ac8eb115029959b3ada9d80a81739fa19373246c SHA512 7599981d002a4a032c41c83f6287243a4942b0e25c408049a3ba86c16f63ce964800a3ac325ace0402b0d7256690c4a4151a66f19a8f58cc455af0498bb1af04 WHIRLPOOL c10f7f7b326ce886bd031da29e9e04a1f4a5914f24cbe75061ed539958e7a8efaa4d4ea16f2b17437c63d97d6f558a27c092bc43c9f56c75078667d5344402f8
-EBUILD hunspell-1.3.3-r99.ebuild 2568 SHA256 357771cf61f4c8c6aea9cb483c5b839d315322aadcaa98fa0a650f8872831157 SHA512 33ef80a25dc38b43d11364509241f8639ab51f0ebc3ec502f9ea89eb349b860ebfa4955ef3aaa6eb34ec6bc92cd1ff40537e5cb57caa2b5025f522651af15083 WHIRLPOOL 82c960bb1c9fb2d3fe37228df2c3af7476887beef5f504d4315ea1f9a1a18912a18c573fb4a02922363751898712afda3cb731030fe7482525aaac9194182f95
+EBUILD hunspell-1.3.3-r99.ebuild 2410 SHA256 e9280f331ab8caed264660bb6d93216136ca7cbace9bb87e7762cef040772658 SHA512 b1425bcac32a2c64b121d5125fd8bb1f9375ec655ec4b6f4a5dd5681e221635c7c3f1d8bf9f46fa61bd8d40bf6be5e72630a01abd730abc07dfdd33e01a40efb WHIRLPOOL d901ab0a5c5a8c712b69cbcfe843ae9d4b0f6411de99c6b68b6c40056fb5f7b1174ac82159e883d8d59fb5d71024116ac35c1edf5bf9f269acddd473417f253b
 MISC metadata.xml 208 SHA256 98f8aa3fb70533eeab6b09d5bc30bd8f649ec13d9b04363490082fb87bb6032e SHA512 d5a7f3cb2fe57f8d7783ba358068648b122d9f5de81a17bff61ce600e42b6487e6f7e2a62c8be95cc7021cb3ea88716824b1ad0565da922ea753bea2417b3d3d WHIRLPOOL e38a6cdef2acb3efdc182efde482593790f773ab3bb9b66cced3af47e4ab39368757e17c4352c6cacaefa338341db88c3bcc3ffcd32aabd7984c5b19051a7bb7
diff --git a/app-text/hunspell/files/hunspell-1.3.3-error_h.patch b/app-text/hunspell/files/hunspell-1.3.3-error_h.patch
new file mode 100644
index 00000000..1f6b24a5
--- /dev/null
+++ b/app-text/hunspell/files/hunspell-1.3.3-error_h.patch
@@ -0,0 +1,43 @@
+diff -Naur hunspell-1.3.3.orig/src/tools/munch.c hunspell-1.3.3/src/tools/munch.c
+--- hunspell-1.3.3.orig/src/tools/munch.c	2012-06-30 11:18:47.000000000 +0000
++++ hunspell-1.3.3/src/tools/munch.c	2015-07-17 07:53:03.364459707 +0000
+@@ -1,5 +1,7 @@
+ /* Munch a word list and generate a smaller root word list with affixes*/
+ 
++#include <config.h>
++
+ #include <ctype.h>
+ #include <string.h>
+ #include <unistd.h>
+@@ -10,7 +12,9 @@
+ #include <fcntl.h>
+ #include <limits.h>
+ #if defined(__linux__) && !defined(__ANDROID__)
++#ifdef HAVE_ERROR_H
+ #include <error.h>
++#endif
+ #include <errno.h>
+ #include <sys/mman.h>
+ #endif
+diff -Naur hunspell-1.3.3.orig/src/tools/unmunch.c hunspell-1.3.3/src/tools/unmunch.c
+--- hunspell-1.3.3.orig/src/tools/unmunch.c	2012-06-30 11:18:47.000000000 +0000
++++ hunspell-1.3.3/src/tools/unmunch.c	2015-07-17 07:53:33.660458567 +0000
+@@ -2,6 +2,8 @@
+  * to recreate the original word list 
+  */
+ 
++#include <config.h>
++
+ #include <ctype.h>
+ #include <string.h>
+ #include <unistd.h>
+@@ -11,7 +13,9 @@
+ #include <sys/stat.h>
+ #include <fcntl.h>
+ #if defined(__linux__) && !defined(__ANDROID__)
++#ifdef HAVE_ERROR_H
+ #include <error.h>
++#endif
+ #include <errno.h>
+ #include <sys/mman.h>
+ #endif
diff --git a/app-text/hunspell/files/hunspell-9999-error_h.patch b/app-text/hunspell/files/hunspell-9999-error_h.patch
deleted file mode 100644
index 9e1208f9..00000000
--- a/app-text/hunspell/files/hunspell-9999-error_h.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-http://sourceforge.net/p/hunspell/bugs/264/
-
-diff --git a/src/tools/munch.c b/src/tools/munch.c
-index 52e7c51..dd42fed 100644
---- a/src/tools/munch.c
-+++ b/src/tools/munch.c
-@@ -10,8 +10,10 @@
- #include <sys/stat.h>
- #include <fcntl.h>
- #include <limits.h>
--#if defined(__linux__) && !defined(__ANDROID__)
-+#if HAVE_ERROR_H
- #include <error.h>
-+#endif
-+#if defined(__linux__) && !defined(__ANDROID__)
- #include <errno.h>
- #include <sys/mman.h>
- #endif
-diff --git a/src/tools/unmunch.c b/src/tools/unmunch.c
-index c1d07a8..53915f5 100644
---- a/src/tools/unmunch.c
-+++ b/src/tools/unmunch.c
-@@ -11,8 +11,10 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <fcntl.h>
--#if defined(__linux__) && !defined(__ANDROID__)
-+#if HAVE_ERROR_H
- #include <error.h>
-+#endif
-+#if defined(__linux__) && !defined(__ANDROID__)
- #include <errno.h>
- #include <sys/mman.h>
- #endif
--- 
-2.0.5
-
diff --git a/app-text/hunspell/hunspell-1.3.3-r99.ebuild b/app-text/hunspell/hunspell-1.3.3-r99.ebuild
index b35bb550..960d6942 100644
--- a/app-text/hunspell/hunspell-1.3.3-r99.ebuild
+++ b/app-text/hunspell/hunspell-1.3.3-r99.ebuild
@@ -14,7 +14,7 @@ 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 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"
+KEYWORDS="amd64 arm ~mips ppc x86"
 
 RDEPEND="
 	ncurses? ( sys-libs/ncurses )
@@ -58,7 +58,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.3-renameexes.patch \
 		"${FILESDIR}"/${PN}-1.3.3-multibyte-chars.patch
 
-	epatch "${FILESDIR}"/${PN}-9999-error_h.patch
+	epatch "${FILESDIR}"/${PN}-1.3.3-error_h.patch
 
 	eautoreconf
 }