[gentoo-commits] repo/gentoo:master commit in: app-text/hunspell/files/, app-text/hunspell/

[gentoo-commits] repo/gentoo:master commit in: app-text/hunspell/files/, app-text/hunspell/

[Lars Wendler]

commit:     07d233f3ea4e359807d0df6f483bd1f818937f58
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu May 19 08:43:20 2016 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu May 19 08:43:20 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07d233f3

app-text/hunspell: Bump to versions 1.3.4 and 1.4.1 (bug #582038).

Package-Manager: portage-2.2.28
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 app-text/hunspell/Manifest                         |   2 +
 .../hunspell/files/hunspell-1.3.4-renameexes.patch | 124 +++++++++++++++++++++
 .../hunspell/files/hunspell-1.4.0-renameexes.patch | 124 +++++++++++++++++++++
 app-text/hunspell/hunspell-1.3.4.ebuild            |  82 ++++++++++++++
 app-text/hunspell/hunspell-1.4.1.ebuild            |  82 ++++++++++++++
 5 files changed, 414 insertions(+)

diff --git a/app-text/hunspell/Manifest b/app-text/hunspell/Manifest
index 6086c5a..d4412af 100644
--- a/app-text/hunspell/Manifest
+++ b/app-text/hunspell/Manifest
@@ -1 +1,3 @@
 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.1.tar.gz 1000647 SHA256 c4476aff0ced52eec334eae1e8d3fdaaebdd90f5ecd0b57cf2a92a6fd220d1bb SHA512 6edc1120a08d46f1c3a590f9964486240eee46ef7f1c2d072c228d26dd1cb3bee1f283d007fcda994cdf0482c065cd5375c9706570a7c5be9aff423e19c03b6b WHIRLPOOL 7f250ba58369ca12282bf23d85396e66385197d3d1d268e3bae39d197029438543ba9377abe224a9b2dea860fe816c627e10adf27f1d2198793a18ded95534cf

diff --git a/app-text/hunspell/files/hunspell-1.3.4-renameexes.patch b/app-text/hunspell/files/hunspell-1.3.4-renameexes.patch
new file mode 100644
index 0000000..642a024
--- /dev/null
+++ b/app-text/hunspell/files/hunspell-1.3.4-renameexes.patch
@@ -0,0 +1,124 @@
+--- 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
new file mode 100644
index 0000000..621794a
--- /dev/null
+++ b/app-text/hunspell/files/hunspell-1.4.0-renameexes.patch
@@ -0,0 +1,124 @@
+--- 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/hunspell-1.3.4.ebuild b/app-text/hunspell/hunspell-1.3.4.ebuild
new file mode 100644
index 0000000..5a53f60
--- /dev/null
+++ b/app-text/hunspell/hunspell-1.3.4.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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"
+
+# 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 km ku lt lv mk ms nb nl nn pl pt pt_BR ro ru sk sl sq sv sw tn uk zu"
+
+DICT_DEP="app-dicts/myspell-en"
+for lang in ${LANGS}; do
+	DICT_DEP+=" linguas_${lang}? ( app-dicts/myspell-${lang/pt_BR/pt-br} )"
+	IUSE+=" linguas_${lang}"
+done
+PDEPEND="${DICT_DEP}"
+
+unset lang LANGS DICT_DEP
+
+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.1.ebuild b/app-text/hunspell/hunspell-1.4.1.ebuild
new file mode 100644
index 0000000..e4713f8
--- /dev/null
+++ b/app-text/hunspell/hunspell-1.4.1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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"
+
+# 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 km ku lt lv mk ms nb nl nn pl pt pt_BR ro ru sk sl sq sv sw tn uk zu"
+
+DICT_DEP="app-dicts/myspell-en"
+for lang in ${LANGS}; do
+	DICT_DEP+=" linguas_${lang}? ( app-dicts/myspell-${lang/pt_BR/pt-br} )"
+	IUSE+=" linguas_${lang}"
+done
+PDEPEND="${DICT_DEP}"
+
+unset lang LANGS DICT_DEP
+
+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
+}

[gentoo-commits] repo/gentoo:master commit in: app-text/hunspell/files/, app-text/hunspell/

[Lars Wendler]

commit:     01a0b82c685522c6792834f6934431ec83ce336a
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 22 12:06:24 2016 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Dec 22 12:06:52 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01a0b82c

app-text/hunspell: Bump to versions 1.5.4 and 1.6.0

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 app-text/hunspell/Manifest                         |   2 +
 .../hunspell/files/hunspell-1.6.0-renameexes.patch | 124 +++++++++++++++++++++
 app-text/hunspell/hunspell-1.5.4.ebuild            |  84 ++++++++++++++
 app-text/hunspell/hunspell-1.6.0.ebuild            |  84 ++++++++++++++
 4 files changed, 294 insertions(+)

diff --git a/app-text/hunspell/Manifest b/app-text/hunspell/Manifest
index 5317e90..c1c78e5 100644
--- a/app-text/hunspell/Manifest
+++ b/app-text/hunspell/Manifest
@@ -2,3 +2,5 @@ DIST hunspell-1.3.3.tar.gz 986081 SHA256 a7b2c0de0e2ce17426821dc1ac8eb115029959b
 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.3.tar.gz 1110837 SHA256 1175666ec79b37fa6d3e6fda454414cecafeb537f078dda40eed96031e6fd5cc SHA512 1f3d7639ec5995bb0fa21a4c728145673fcf412b11323176e02d84a08f49f3ad29660253a6bd55856a358c8df75cb05a2465ad00034575490e3c618ffe937ba6 WHIRLPOOL 0a2d59fa1e421127e2ed7e6edc94868a9838d72cfce54a21053b2e53a64e29ffd0a2d31b22d2daef6047df78a92d7e55664797b0c1cba6e068f7249225e11ef2
+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

diff --git a/app-text/hunspell/files/hunspell-1.6.0-renameexes.patch b/app-text/hunspell/files/hunspell-1.6.0-renameexes.patch
new file mode 100644
index 00000000..6a75ce3
--- /dev/null
+++ b/app-text/hunspell/files/hunspell-1.6.0-renameexes.patch
@@ -0,0 +1,124 @@
+--- hunspell-1.6.0/src/tools/chmorph.cxx
++++ hunspell-1.6.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.6.0/src/tools/example.cxx
++++ hunspell-1.6.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.6.0/src/tools/Makefile.am
++++ hunspell-1.6.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.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,11 +16,11 @@
+ 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
+ 
+-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
+ 
+--- hunspell-1.6.0/src/tools/munch.cxx
++++ hunspell-1.6.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.6.0/src/tools/unmunch.cxx
++++ hunspell-1.6.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.6.0/tests/test.sh
++++ hunspell-1.6.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.5.4.ebuild b/app-text/hunspell/hunspell-1.5.4.ebuild
new file mode 100644
index 00000000..f81062c
--- /dev/null
+++ b/app-text/hunspell/hunspell-1.5.4.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 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
new file mode 100644
index 00000000..c6d147e
--- /dev/null
+++ b/app-text/hunspell/hunspell-1.6.0.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 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
+}

[gentoo-commits] repo/gentoo:master commit in: app-text/hunspell/files/, app-text/hunspell/

[Lars Wendler]

commit:     e5db456b114266e7b78b8877a2ae87a19883e625
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  3 20:53:52 2017 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sun Sep  3 20:54:16 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5db456b

app-text/hunspell: Removed old.

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 app-text/hunspell/Manifest                         |   5 -
 .../hunspell/files/hunspell-1.3-renameexes.patch   | 135 ---------------------
 .../files/hunspell-1.3.3-multibyte-chars.patch     |  59 ---------
 .../hunspell/files/hunspell-1.3.4-renameexes.patch | 124 -------------------
 .../hunspell/files/hunspell-1.4.0-renameexes.patch | 124 -------------------
 .../hunspell/files/hunspell-1.5.0-renameexes.patch | 124 -------------------
 app-text/hunspell/hunspell-1.3.3.ebuild            |  79 ------------
 app-text/hunspell/hunspell-1.3.4.ebuild            |  84 -------------
 app-text/hunspell/hunspell-1.4.2.ebuild            |  84 -------------
 app-text/hunspell/hunspell-1.5.4.ebuild            |  84 -------------
 app-text/hunspell/hunspell-1.6.0.ebuild            |  84 -------------
 11 files changed, 986 deletions(-)

diff --git a/app-text/hunspell/Manifest b/app-text/hunspell/Manifest
index 0a84964aba6..e85e874fe30 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 70c5b748edb..00000000000
--- 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 848bc8fe895..00000000000
--- 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 642a0246277..00000000000
--- 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 621794a46a6..00000000000
--- 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 f2a555e3406..00000000000
--- 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 a385894c5c8..00000000000
--- 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 cfcb4f36e91..00000000000
--- 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 1f59e292507..00000000000
--- 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 36dab57f4a5..00000000000
--- 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 22e54d672b2..00000000000
--- 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
-}

[gentoo-commits] repo/gentoo:master commit in: app-text/hunspell/files/, app-text/hunspell/

[Lars Wendler]

commit:     16c9531c5c48e6b0fbf0c6ae4b48d0af309335b1
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  3 20:52:30 2017 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sun Sep  3 20:54:14 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16c9531c

app-text/hunspell: Bump to version 1.6.2

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 app-text/hunspell/Manifest                         |   1 +
 .../hunspell/files/hunspell-1.6.2-renameexes.patch | 127 +++++++++++++++++++++
 app-text/hunspell/hunspell-1.6.2.ebuild            |  86 ++++++++++++++
 3 files changed, 214 insertions(+)

diff --git a/app-text/hunspell/Manifest b/app-text/hunspell/Manifest
index 08a52f65e06..0a84964aba6 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 00000000000..be56cabc50b
--- /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 00000000000..43b31239687
--- /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
+}

[gentoo-commits] repo/gentoo:master commit in: app-text/hunspell/files/, app-text/hunspell/

[Lars Wendler]

commit:     9ad11d7feeeb7efc31a11a611035307af367e85c
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 13 10:25:01 2018 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Nov 13 10:25:16 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ad11d7f

app-text/hunspell: Bump to version 1.7.0

Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 app-text/hunspell/Manifest                         |   1 +
 .../hunspell/files/hunspell-1.7.0-renameexes.patch | 166 +++++++++++++++++++++
 app-text/hunspell/hunspell-1.7.0.ebuild            |  86 +++++++++++
 3 files changed, 253 insertions(+)

diff --git a/app-text/hunspell/Manifest b/app-text/hunspell/Manifest
index be5fdf7c401..e82c9c07968 100644
--- a/app-text/hunspell/Manifest
+++ b/app-text/hunspell/Manifest
@@ -1,2 +1,3 @@
 DIST hunspell-1.6.1.tar.gz 706893 BLAKE2B 5e5047aceb7510c2cfaa05d540f8faad2fb844b51bf2d8e48793d588e3b9d31628ddac5d7f9c87078a3b2b8aadf64cd8d93fd4ef881b13451d52f10a1960e2fb SHA512 39b096ec1f5226f13eaf241647fc9b49a6dad04945ae0bcdc61ba845d66d67d64a72ba4287b6f376b5ad053b5d0e1d42a42415c30521c50693f0544718029458
 DIST hunspell-1.6.2.tar.gz 721165 BLAKE2B f377596d2031e89ad902a0f5da85e77948bd5d582bb4c558cc7c379d803a00787237d2feed9d26e037cebb77958709f41fb01d5f8bfed6ae21047a2da83c8f51 SHA512 a23127f1271da95ac06a1fb2f57b659485e959567b61da05b2bb350684003a0fb7e882b5e524c465fd890f79f513ed03174f38611989a1c09081147c47d6da11
+DIST hunspell-1.7.0.tar.gz 482156 BLAKE2B daf689ab44872c78d27bd035d996c61da9b01b7bbe5ced120034b2d64bbead573ad3807dfe5a06ecdbd96c610f42e4ea015be4b2046ebafad13347c08e60913a SHA512 8149b2e8b703a0610c9ca5160c2dfad3cf3b85b16b3f0f5cfcb7ebb802473b2d499e8e2d0a637a97a37a24d62424e82d3880809210d3f043fa17a4970d47c903

diff --git a/app-text/hunspell/files/hunspell-1.7.0-renameexes.patch b/app-text/hunspell/files/hunspell-1.7.0-renameexes.patch
new file mode 100644
index 00000000000..c45b9cc8a15
--- /dev/null
+++ b/app-text/hunspell/files/hunspell-1.7.0-renameexes.patch
@@ -0,0 +1,166 @@
+From d3e2d1d29615f4861fd3354353d426bd8701389d Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Tue, 13 Nov 2018 10:37:42 +0100
+Subject: [PATCH] Rename some executables which have too generic names
+
+to be placed in /usr/bin - this patch prefixes them with 'hunspell-'
+
+Real authorship is a bit unclear as Gentoo is using this kind of patch since
+hunspell-1.1.3 which was added to Gentoo back in 2006-01-29 and the
+corresponding bug report didn't mention the patch at all:
+
+https://bugs.gentoo.org/114482
+https://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/app-text/hunspell/files/hunspell-1.1.3-renameexes.patch?hideattic=0&view=log
+---
+ src/tools/Makefile.am | 14 +++++++-------
+ src/tools/chmorph.cxx |  6 +++---
+ src/tools/example.cxx |  4 ++--
+ src/tools/munch.cxx   |  4 ++--
+ src/tools/unmunch.cxx |  4 ++--
+ tests/Makefile.am     |  2 +-
+ tests/test.sh         |  2 +-
+ 7 files changed, 18 insertions(+), 18 deletions(-)
+
+diff --git a/src/tools/Makefile.am b/src/tools/Makefile.am
+index 1786e8e..190bffe 100644
+--- a/src/tools/Makefile.am
++++ b/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 @@ hzip_SOURCES=hzip.cxx
+ hunzip_SOURCES=hunzip.cxx
+ hunzip_LDADD = ../hunspell/libhunspell-1.7.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.7.la
+@@ -17,11 +17,11 @@ nodist_hunspell_SOURCES= ../../config.h
+ hunspell_LDADD = @LIBINTL@ @LIBICONV@ ../parsers/libparsers.a \
+ 	../hunspell/libhunspell-1.7.la @CURSESLIB@ @READLINELIB@
+ 
+-analyze_SOURCES=analyze.cxx
+-analyze_LDADD = ../hunspell/libhunspell-1.7.la
++hunspell_analyze_SOURCES=analyze.cxx
++hunspell_analyze_LDADD = ../hunspell/libhunspell-1.7.la
+ 
+-chmorph_SOURCES=chmorph.cxx
+-chmorph_LDADD = ../parsers/libparsers.a ../hunspell/libhunspell-1.7.la
++hunspell_chmorph_SOURCES=chmorph.cxx
++hunspell_chmorph_LDADD = ../parsers/libparsers.a ../hunspell/libhunspell-1.7.la
+ 
+ noinst_PROGRAMS=example 
+ 
+diff --git a/src/tools/chmorph.cxx b/src/tools/chmorph.cxx
+index 6e5add6..163186d 100644
+--- a/src/tools/chmorph.cxx
++++ b/src/tools/chmorph.cxx
+@@ -55,11 +55,11 @@ int main(int, char** argv) {
+     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);
+diff --git a/src/tools/example.cxx b/src/tools/example.cxx
+index 8213a5f..c3cc76a 100644
+--- a/src/tools/example.cxx
++++ b/src/tools/example.cxx
+@@ -48,9 +48,9 @@ int main(int argc, char** argv) {
+   /* 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);
+   }
+ 
+diff --git a/src/tools/munch.cxx b/src/tools/munch.cxx
+index 5f51fc6..c8f8beb 100644
+--- a/src/tools/munch.cxx
++++ b/src/tools/munch.cxx
+@@ -78,14 +78,14 @@ int main(int argc, char** argv) {
+     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 --git a/src/tools/unmunch.cxx b/src/tools/unmunch.cxx
+index 82c2f9d..663e8ea 100644
+--- a/src/tools/unmunch.cxx
++++ b/src/tools/unmunch.cxx
+@@ -73,14 +73,14 @@ int main(int argc, char** argv) {
+     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/tests/Makefile.am b/tests/Makefile.am
+index 6dc3e93..88d882c 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -4,7 +4,7 @@ SUBDIRS = suggestiontest
+ 
+ TEST_EXTENSIONS = .dic
+ AM_TESTS_ENVIRONMENT = export HUNSPELL=$(top_builddir)/src/tools/hunspell; \
+-                       export ANALYZE=$(top_builddir)/src/tools/analyze; \
++                       export ANALYZE=$(top_builddir)/src/tools/hunspell-analyze; \
+                        export LIBTOOL=$(top_builddir)/libtool;
+ DIC_LOG_COMPILER = $(top_srcdir)/tests/test.sh
+ 
+diff --git a/tests/test.sh b/tests/test.sh
+index 3fcf42c..8580d09 100755
+--- a/tests/test.sh
++++ b/tests/test.sh
+@@ -64,7 +64,7 @@ fi
+ shopt -s expand_aliases
+ 
+ [[ "$HUNSPELL" = "" ]] && HUNSPELL="$(dirname $0)"/../src/tools/hunspell
+-[[ "$ANALYZE" = "" ]] && ANALYZE="$(dirname $0)"/../src/tools/analyze
++[[ "$ANALYZE" = "" ]] && ANALYZE="$(dirname $0)"/../src/tools/hunspell-analyze
+ [[ "$LIBTOOL" = "" ]] && LIBTOOL="$(dirname $0)"/../libtool
+ alias hunspell='"$LIBTOOL" --mode=execute "$HUNSPELL"'
+ alias analyze='"$LIBTOOL" --mode=execute "$ANALYZE"'
+-- 
+2.19.1
+

diff --git a/app-text/hunspell/hunspell-1.7.0.ebuild b/app-text/hunspell/hunspell-1.7.0.ebuild
new file mode 100644
index 00000000000..f21f176c90c
--- /dev/null
+++ b/app-text/hunspell/hunspell-1.7.0.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools flag-o-matic
+
+MY_P="${PN}-${PV/_beta/b}"
+
+DESCRIPTION="Hunspell spell checker - an improved replacement for myspell in OOo"
+SRC_URI="https://github.com/hunspell/hunspell/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/hunspell"
+
+SLOT="0/$(ver_cut 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=""
+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 THANKS license.hunspell
+	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.7.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
+	local myeconfargs=(
+		$(use_enable nls)
+		$(use_with ncurses ui)
+		$(use_with readline readline)
+		$(use_enable static-libs static)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	einstalldocs
+	find "${D}" -name '*.la' -delete || die
+
+	#342449
+	pushd "${ED}"/usr/$(get_libdir)/ >/dev/null
+	ln -s lib${PN}{-$(ver_cut 1).$(ver_cut 2).so.0.0.1,.so}
+	popd >/dev/null
+}

[gentoo-commits] repo/gentoo:master commit in: app-text/hunspell/files/, app-text/hunspell/

[Lars Wendler]

commit:     4b94328cd41359aa9a120a34b758e468f39849b8
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Sep  2 10:54:25 2019 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Sep  2 10:55:47 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b94328c

app-text/hunspell: Revbump fix build against sys-libs/ncurses[tinfo]

Thanks-to: zimous <zimous <AT> matfyz.cz>
Bug: https://bugs.gentoo.org/692614
Package-Manager: Portage-2.3.75, Repoman-2.3.17
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 app-text/hunspell/files/hunspell-1.7.0-tinfo.patch | 61 +++++++++++++++
 app-text/hunspell/hunspell-1.7.0-r1.ebuild         | 88 ++++++++++++++++++++++
 2 files changed, 149 insertions(+)

diff --git a/app-text/hunspell/files/hunspell-1.7.0-tinfo.patch b/app-text/hunspell/files/hunspell-1.7.0-tinfo.patch
new file mode 100644
index 00000000000..1fb992b0c9d
--- /dev/null
+++ b/app-text/hunspell/files/hunspell-1.7.0-tinfo.patch
@@ -0,0 +1,61 @@
+From ce41cfc39129ee2be67667f2d9b78cc7f7d24dca Mon Sep 17 00:00:00 2001
+From: zimous <zimous@matfyz.cz>
+Date: Mon, 2 Sep 2019 12:46:53 +0200
+Subject: [PATCH] Fix build against ncurses with separate tinfo lib
+
+Gentoo-bug: https://bugs.gentoo.org/692614
+---
+ configure.ac | 22 ++++++++++++++++++----
+ 1 file changed, 18 insertions(+), 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 9426a94..bc5e39d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -52,11 +52,23 @@ AC_ARG_WITH(
+ AS_IF([test "x$with_ui" != xno], [
+ 	AC_CHECK_LIB([ncursesw],[tparm],[
+ 		CURSESLIB=-lncursesw
++        AC_CHECK_LIB([tinfow],[tgetent], [
++            CURSESLIB="$CURSESLIB -ltinfow"
++        ])
+ 	],[AC_CHECK_LIB([curses],[tparm],[
+ 		CURSESLIB=-lcurses
++        AC_CHECK_LIB([tinfow],[tgetent], [
++            CURSESLIB="$CURSESLIB -ltinfo"
++        ])
+ 	],[AC_CHECK_LIB([ncurses],[tparm],[
+ 		CURSESLIB=-lncurses
+-	])])])
++        AC_CHECK_LIB([tinfow],[tgetent], [
++            CURSESLIB="$CURSESLIB -ltinfo"
++        ])
++	],
++    [-ltinfo])],
++    [-ltinfo])],
++    [-ltinfow])
+    if test "$CURSESLIB" != "" ; then
+ 	echo Compiling with curses user interface.
+ 	AC_CHECK_HEADERS([curses.h])
+@@ -78,13 +90,15 @@ AC_ARG_WITH(
+ )
+ READLINELIB=""
+ AS_IF([test "x$with_readline" != xno],
+-	[AC_CHECK_LIB([tinfo],[tgetent], [
++	[AC_CHECK_LIB([tinfow],[tgetent], [
++		TERMLIB=-ltinfow
++    ],[AC_CHECK_LIB([tinfo],[tgetent], [
+ 		TERMLIB=-ltinfo
+-        ],[AC_CHECK_LIB([curses],[tparm],[
++    ],[AC_CHECK_LIB([curses],[tparm],[
+ 		TERMLIB=-lncurses
+ 	],[AC_CHECK_LIB([termcap],[tgetent],[
+ 		TERMLIB=-ltermcap
+-	])])])
++	])])])])
+ 	LDSAVE=$LDFLAGS
+ 	LDFLAGS="$LDFLAGS $TERMLIB"
+ 	AC_CHECK_LIB([readline],[readline],[
+-- 
+2.23.0
+

diff --git a/app-text/hunspell/hunspell-1.7.0-r1.ebuild b/app-text/hunspell/hunspell-1.7.0-r1.ebuild
new file mode 100644
index 00000000000..343a7fbce81
--- /dev/null
+++ b/app-text/hunspell/hunspell-1.7.0-r1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools flag-o-matic
+
+MY_P="${PN}-${PV/_beta/b}"
+
+DESCRIPTION="Hunspell spell checker - an improved replacement for myspell in OOo"
+SRC_URI="https://github.com/hunspell/hunspell/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/hunspell"
+
+SLOT="0/$(ver_cut 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=""
+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 THANKS license.hunspell
+	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.7.0-renameexes.patch"
+
+	"${FILESDIR}/${PN}-1.7.0-tinfo.patch" #692614
+)
+
+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
+	find "${ED}" -type f -name '*.la' -delete || die
+
+	#342449
+	pushd "${ED}"/usr/$(get_libdir)/ >/dev/null
+	ln -s lib${PN}{-$(ver_cut 1).$(ver_cut 2).so.0.0.1,.so}
+	popd >/dev/null
+}

[gentoo-commits] repo/gentoo:master commit in: app-text/hunspell/files/, app-text/hunspell/

[Andreas Sturmlechner]

commit:     a5958d1464ab22d78894e04ee5c5791c9ba20363
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 26 00:39:29 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jan 26 11:39:31 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5958d14

app-text/hunspell: Drop 1.6.2-r1

Package-Manager: Portage-2.3.85, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 app-text/hunspell/Manifest                         |   1 -
 .../hunspell/files/hunspell-1.6.2-renameexes.patch | 127 ---------------------
 app-text/hunspell/hunspell-1.6.2-r1.ebuild         |  86 --------------
 3 files changed, 214 deletions(-)

diff --git a/app-text/hunspell/Manifest b/app-text/hunspell/Manifest
index f27735636f4..eeaae2baf2d 100644
--- a/app-text/hunspell/Manifest
+++ b/app-text/hunspell/Manifest
@@ -1,2 +1 @@
-DIST hunspell-1.6.2.tar.gz 721165 BLAKE2B f377596d2031e89ad902a0f5da85e77948bd5d582bb4c558cc7c379d803a00787237d2feed9d26e037cebb77958709f41fb01d5f8bfed6ae21047a2da83c8f51 SHA512 a23127f1271da95ac06a1fb2f57b659485e959567b61da05b2bb350684003a0fb7e882b5e524c465fd890f79f513ed03174f38611989a1c09081147c47d6da11
 DIST hunspell-1.7.0.tar.gz 482156 BLAKE2B daf689ab44872c78d27bd035d996c61da9b01b7bbe5ced120034b2d64bbead573ad3807dfe5a06ecdbd96c610f42e4ea015be4b2046ebafad13347c08e60913a SHA512 8149b2e8b703a0610c9ca5160c2dfad3cf3b85b16b3f0f5cfcb7ebb802473b2d499e8e2d0a637a97a37a24d62424e82d3880809210d3f043fa17a4970d47c903

diff --git a/app-text/hunspell/files/hunspell-1.6.2-renameexes.patch b/app-text/hunspell/files/hunspell-1.6.2-renameexes.patch
deleted file mode 100644
index be56cabc50b..00000000000
--- a/app-text/hunspell/files/hunspell-1.6.2-renameexes.patch
+++ /dev/null
@@ -1,127 +0,0 @@
---- 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-r1.ebuild b/app-text/hunspell/hunspell-1.6.2-r1.ebuild
deleted file mode 100644
index c4daba06d9c..00000000000
--- a/app-text/hunspell/hunspell-1.6.2-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit 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="https://github.com/hunspell"
-
-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-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=""
-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
-	find "${D}" -name '*.la' -delete || die
-
-	#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
-}

[gentoo-commits] repo/gentoo:master commit in: app-text/hunspell/files/, app-text/hunspell/

[Sam James]

commit:     94b4423c4dbe01c25a6ed30c7fc23d127a2c58fb
Author:     BalkanMadman <zurabid2016 <AT> gmail <DOT> com>
AuthorDate: Sun Jul  9 19:52:55 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jul 16 17:58:28 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94b4423c

app-text/hunspell: revbump, clean up ebuild, add DEPEND on libiconv

The dependency on libiconv was already satisfied on most if not all
machines (because a lot of other packages depend on it), so KEYWORDS
were not dropped.
Fix two bugs (one depends on other) about having a symlink pointing to
nonexisting /usr/share/myspell directory.

Closes: https://bugs.gentoo.org/908872
Closes: https://bugs.gentoo.org/734516
Signed-off-by: BalkanMadman <zurabid2016 <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/31787
Signed-off-by: Sam James <sam <AT> gentoo.org>

 ...eexes.patch => hunspell-1.7.2-renameexes.patch} | 17 ------------
 ...spell-1.7.2.ebuild => hunspell-1.7.2-r1.ebuild} | 31 +++++++++++-----------
 app-text/hunspell/hunspell-1.7.2.ebuild            |  6 ++---
 3 files changed, 18 insertions(+), 36 deletions(-)

diff --git a/app-text/hunspell/files/hunspell-1.7.0-renameexes.patch b/app-text/hunspell/files/hunspell-1.7.2-renameexes.patch
similarity index 89%
rename from app-text/hunspell/files/hunspell-1.7.0-renameexes.patch
rename to app-text/hunspell/files/hunspell-1.7.2-renameexes.patch
index c45b9cc8a154..52696b968608 100644
--- a/app-text/hunspell/files/hunspell-1.7.0-renameexes.patch
+++ b/app-text/hunspell/files/hunspell-1.7.2-renameexes.patch
@@ -14,7 +14,6 @@ https://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/app-text/hunspell/files
 ---
  src/tools/Makefile.am | 14 +++++++-------
  src/tools/chmorph.cxx |  6 +++---
- src/tools/example.cxx |  4 ++--
  src/tools/munch.cxx   |  4 ++--
  src/tools/unmunch.cxx |  4 ++--
  tests/Makefile.am     |  2 +-
@@ -77,22 +76,6 @@ index 6e5add6..163186d 100644
            " (convert informal Hungarian second person texts to formal third "
            "person texts)\n");
        exit(1);
-diff --git a/src/tools/example.cxx b/src/tools/example.cxx
-index 8213a5f..c3cc76a 100644
---- a/src/tools/example.cxx
-+++ b/src/tools/example.cxx
-@@ -48,9 +48,9 @@ int main(int argc, char** argv) {
-   /* 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);
-   }
- 
 diff --git a/src/tools/munch.cxx b/src/tools/munch.cxx
 index 5f51fc6..c8f8beb 100644
 --- a/src/tools/munch.cxx

diff --git a/app-text/hunspell/hunspell-1.7.2.ebuild b/app-text/hunspell/hunspell-1.7.2-r1.ebuild
similarity index 74%
copy from app-text/hunspell/hunspell-1.7.2.ebuild
copy to app-text/hunspell/hunspell-1.7.2-r1.ebuild
index e2a26ff8f926..97635c6a1145 100644
--- a/app-text/hunspell/hunspell-1.7.2.ebuild
+++ b/app-text/hunspell/hunspell-1.7.2-r1.ebuild
@@ -11,17 +11,20 @@ DESCRIPTION="Spell checker, morphological analyzer library and command-line tool
 HOMEPAGE="https://hunspell.github.io/"
 SRC_URI="https://github.com/hunspell/hunspell/releases/download/v${PV}/${P}.tar.gz"
 
-LICENSE="MPL-1.1 GPL-2 LGPL-2.1"
+LICENSE="|| ( MPL-1.1 GPL-2+ LGPL-2.1+ )"
 SLOT="0/$(ver_cut 1-2)"
 IUSE="ncurses nls readline static-libs"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 RDEPEND="
+	virtual/libiconv
 	ncurses? ( sys-libs/ncurses:= )
 	readline? ( sys-libs/readline:= )
 "
 DEPEND="${RDEPEND}"
-BDEPEND="sys-devel/gettext"
+BDEPEND="
+	>=sys-devel/gettext-0.18
+"
 
 PDEPEND=""
 for lang in ${LANGS}; do
@@ -41,9 +44,9 @@ 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.7.0-renameexes.patch"
+	"${FILESDIR}/hunspell-1.7.2-renameexes.patch"
 
-	"${FILESDIR}/${PN}-1.7.0-tinfo.patch" # bug #692614
+	"${FILESDIR}/hunspell-1.7.0-tinfo.patch" # bug #692614
 )
 
 src_prepare() {
@@ -60,23 +63,19 @@ src_configure() {
 	# 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)
+		"$(use_enable nls)"
+		"$(use_with ncurses ui)"
+		"$(use_with readline readline)"
+		"$(use_enable static-libs static)"
 	)
 	econf "${myeconfargs[@]}"
 }
 
 src_install() {
 	default
-
-	einstalldocs
-
 	find "${ED}" -type f -name '*.la' -delete || die
+	einstalldocs
 
-	# bug #342449
-	pushd "${ED}"/usr/$(get_libdir)/ >/dev/null || die
-	ln -s lib${PN}{-$(ver_cut 1).$(ver_cut 2).so.0.0.1,.so} || die
-	popd >/dev/null || die
+	# Bug #908872
+	keepdir "/usr/share/myspell"
 }

diff --git a/app-text/hunspell/hunspell-1.7.2.ebuild b/app-text/hunspell/hunspell-1.7.2.ebuild
index e2a26ff8f926..2b5009ebd494 100644
--- a/app-text/hunspell/hunspell-1.7.2.ebuild
+++ b/app-text/hunspell/hunspell-1.7.2.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Spell checker, morphological analyzer library and command-line tool
 HOMEPAGE="https://hunspell.github.io/"
 SRC_URI="https://github.com/hunspell/hunspell/releases/download/v${PV}/${P}.tar.gz"
 
-LICENSE="MPL-1.1 GPL-2 LGPL-2.1"
+LICENSE="|| ( MPL-1.1 GPL-2+ LGPL-2.1+ )"
 SLOT="0/$(ver_cut 1-2)"
 IUSE="ncurses nls readline static-libs"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
@@ -41,9 +41,9 @@ 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.7.0-renameexes.patch"
+	"${FILESDIR}/hunspell-1.7.2-renameexes.patch"
 
-	"${FILESDIR}/${PN}-1.7.0-tinfo.patch" # bug #692614
+	"${FILESDIR}/hunspell-1.7.0-tinfo.patch" # bug #692614
 )
 
 src_prepare() {