app-text/hunspell: Bump to version 1.6.2

Package-Manager: Portage-2.3.8, Repoman-2.3.3

3 files changed, 214 insertions, 0 deletions

diff --git a/app-text/hunspell/Manifest b/app-text/hunspell/Manifest
index 08a52f65e06c..0a84964aba63 100644
--- a/app-text/hunspell/Manifest
+++ b/app-text/hunspell/Manifest
@@ -4,3 +4,4 @@ DIST hunspell-1.4.2.tar.gz 1000676 SHA256 b6a0b23d083e0130f8c561cca8c980814ba657
 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.6.2-renameexes.patch b/app-text/hunspell/files/hunspell-1.6.2-renameexes.patch
new file mode 100644
index 000000000000..be56cabc50bc
--- /dev/null
+++ b/app-text/hunspell/files/hunspell-1.6.2-renameexes.patch
@@ -0,0 +1,127 @@
+--- hunspell-1.6.2/src/tools/chmorph.cxx
++++ hunspell-1.6.2/src/tools/chmorph.cxx
+@@ -55,11 +55,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.6.2/src/tools/example.cxx
++++ hunspell-1.6.2/src/tools/example.cxx
+@@ -48,9 +48,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.6.2/src/tools/Makefile.am
++++ hunspell-1.6.2/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
+ 
+ AM_CPPFLAGS=-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.6.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.6.la
+@@ -16,14 +16,14 @@
+ hunspell_LDADD = @LIBINTL@ @LIBICONV@ ../parsers/libparsers.a \
+ 	../hunspell/libhunspell-1.6.la @CURSESLIB@ @READLINELIB@
+ 
+-analyze_SOURCES=analyze.cxx
+-analyze_LDADD = ../hunspell/libhunspell-1.6.la
++hunspell_analyze_SOURCES=analyze.cxx
++hunspell_analyze_LDADD = ../hunspell/libhunspell-1.6.la
+ 
+ bulkcheck_SOURCES=bulkcheck.cxx
+ bulkcheck_LDADD = ../hunspell/libhunspell-1.6.la
+ 
+-chmorph_SOURCES=chmorph.cxx
+-chmorph_LDADD = ../parsers/libparsers.a ../hunspell/libhunspell-1.6.la
++hunspell_chmorph_SOURCES=chmorph.cxx
++hunspell_chmorph_LDADD = ../parsers/libparsers.a ../hunspell/libhunspell-1.6.la
+ 
+ noinst_PROGRAMS=example bulkcheck 
+ 
+--- hunspell-1.6.2/src/tools/munch.cxx
++++ hunspell-1.6.2/src/tools/munch.cxx
+@@ -78,14 +78,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.6.2/src/tools/unmunch.cxx
++++ hunspell-1.6.2/src/tools/unmunch.cxx
+@@ -73,14 +73,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.6.2/tests/test.sh
++++ hunspell-1.6.2/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.6.2.ebuild b/app-text/hunspell/hunspell-1.6.2.ebuild
new file mode 100644
index 000000000000..43b312396878
--- /dev/null
+++ b/app-text/hunspell/hunspell-1.6.2.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit ltprune 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.2-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
+	local myeconfargs=(
+		$(use_enable nls)
+		$(use_with ncurses ui)
+		$(use_with readline readline)
+		$(use_enable static-libs static)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+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.1,.so}
+	popd >/dev/null
+}