From 9ad11d7feeeb7efc31a11a611035307af367e85c Mon Sep 17 00:00:00 2001 From: Lars Wendler Date: Tue, 13 Nov 2018 11:25:01 +0100 Subject: app-text/hunspell: Bump to version 1.7.0 Package-Manager: Portage-2.3.51, Repoman-2.3.12 Signed-off-by: Lars Wendler --- 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(+) create mode 100644 app-text/hunspell/files/hunspell-1.7.0-renameexes.patch create mode 100644 app-text/hunspell/hunspell-1.7.0.ebuild (limited to 'app-text/hunspell') diff --git a/app-text/hunspell/Manifest b/app-text/hunspell/Manifest index be5fdf7c401b..e82c9c07968a 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 000000000000..c45b9cc8a154 --- /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 +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 000000000000..f21f176c90c4 --- /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 +} -- cgit v1.2.3-65-gdbad