From de49812990871e1705b64051c35161d5e6400269 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 24 Dec 2018 14:11:38 +0000 Subject: gentoo resync : 24.12.2018 --- app-text/hunspell/Manifest | 5 +- .../hunspell/files/hunspell-1.6.0-renameexes.patch | 124 --------------------- app-text/hunspell/hunspell-1.6.1-r1.ebuild | 84 -------------- app-text/hunspell/hunspell-1.6.2-r1.ebuild | 2 +- 4 files changed, 2 insertions(+), 213 deletions(-) delete mode 100644 app-text/hunspell/files/hunspell-1.6.0-renameexes.patch delete mode 100644 app-text/hunspell/hunspell-1.6.1-r1.ebuild (limited to 'app-text/hunspell') diff --git a/app-text/hunspell/Manifest b/app-text/hunspell/Manifest index b1c888b24fd4..bd30655f7282 100644 --- a/app-text/hunspell/Manifest +++ b/app-text/hunspell/Manifest @@ -1,10 +1,7 @@ -AUX hunspell-1.6.0-renameexes.patch 5005 BLAKE2B 1bce704276c65e67077312d3a056072a52370d5465d2ea9e91046dd21f1368579950ecdbc37c403641cace770873865464cef855c836a54e95d1d5f2496c5b6a SHA512 a39225e25c76c6a6f3b92cc932efcc952c8559de2967d7a1c962b3f8a6ab39430fa82cf17ae51f15490f58297ecdfb9154c3ce7a8b058a717bfd1d694cf83245 AUX hunspell-1.6.2-renameexes.patch 5104 BLAKE2B 83ea0ec81fdd5e8934c954bb2f2d07e9c47f725f8b63360aca7cd611348106a1e3f13ab08609ff4877272ec6b116927c382c5b47731945656ddb7927aca22c50 SHA512 0d1871eda31b83851bf153746e0f4957599e889a536e9c0994d1cb988bc4a887788c1fafe4dccccaa94e68a69e6fa4ff1e201678fa8d1afdcb9608b83211b0ae AUX hunspell-1.7.0-renameexes.patch 6399 BLAKE2B d852305da0dc0330e293a028a1e178d7887a3567a35bc6feebe48e7a4bf205103155ec31b5a483a1002c505ae89bdf47ae80c1b6ccd866eb62cc7e6851c1a1b9 SHA512 3703b49728e8ce92637a602478995d38deb64c1b3281a06447f66c352ca0e2adb7d8aa9167debd9cb15e4009ee4efeb7618065bf16dda47155245c0266d97eaa -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 -EBUILD hunspell-1.6.1-r1.ebuild 2366 BLAKE2B d566bfed5c322566fdb30ff31f266020b1eb4ce9a0dd6920c5e340b2b922cb5bb3eba4a44dc458c0516c425b4c309cd13b6bf3225ef24b604b5c6d72245a2bc6 SHA512 c4e793a89c9ec4aad6bc2f7fb2036f5c251b329ec597976d07d607364df0de3c22a80903bbca5bfe03416b84bf3416a16691f78524cfc8f90c4519ecc3a89bb9 -EBUILD hunspell-1.6.2-r1.ebuild 2389 BLAKE2B d3e57f6f649c1457b4c9c74731a7ae05a71f5c1bfe634774b8fa0cf5f77d58cfc5cc69b9a903dc54fb74faf75502bfef594d992b30a205f46983623105aea14b SHA512 fbf2ddb1146f0dd83d26e60abb45816ba21d04db313f3d5913c26cc88e662cc685741d30a729e01d7cea0dc9720b43aaa998e22f24e391627593211271f02b7d +EBUILD hunspell-1.6.2-r1.ebuild 2383 BLAKE2B 7ef52fd2c661ce65496350ebf7f33e550b9e2645183cea6a3801e7bea81045da4b9846dbedc6b933cb30a3876df87d434785ee4a39292aa2fb3093310b565b59 SHA512 41e296e4a093edc5ef757cec31fd93fcd9a6b08ea18e5b5086477f4f4b351a93fa9ff03a7cb6884da17236985c0d3e5ece154da8aba8557f56cff37c73efc3b7 EBUILD hunspell-1.7.0.ebuild 2293 BLAKE2B 6a2053dd8f5cf3211521236ae7e027d99349b7864655b81c65a2f3614070b53818b3932c70ffa25cc09ed8c9b935c78243cfaf8923e4975d0e8ddef2621dcf64 SHA512 4dc99a1b623fbd8da6492bedea1d2d80c9c93fcae334ac1fee70769aaba17581ced12e3097a930324344d20d5a7e72f19df31364c665add74802163efe941d3d MISC metadata.xml 274 BLAKE2B 6631c0f576279afaf4cd444df14acd118e393977058e957bd3e41103554a756c43860f75f7550346815f6d8a4320d3d86fb069c9451fbad268bedbde18ed5ec0 SHA512 09ac7c3282788aae9fe48dc86a3bec7d2a5b651b22d6ea06108f9ca5a86e96dddf9ab80433d0f16549649665d9a582d6c44217b73a000ee83995aad922f3caa8 diff --git a/app-text/hunspell/files/hunspell-1.6.0-renameexes.patch b/app-text/hunspell/files/hunspell-1.6.0-renameexes.patch deleted file mode 100644 index 6a75ce3fb8c0..000000000000 --- a/app-text/hunspell/files/hunspell-1.6.0-renameexes.patch +++ /dev/null @@ -1,124 +0,0 @@ ---- 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.6.1-r1.ebuild b/app-text/hunspell/hunspell-1.6.1-r1.ebuild deleted file mode 100644 index 2788a1246fa9..000000000000 --- a/app-text/hunspell/hunspell-1.6.1-r1.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="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-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.1,.so} - popd >/dev/null -} diff --git a/app-text/hunspell/hunspell-1.6.2-r1.ebuild b/app-text/hunspell/hunspell-1.6.2-r1.ebuild index 142389ea0fad..d4a295cdf9af 100644 --- a/app-text/hunspell/hunspell-1.6.2-r1.ebuild +++ b/app-text/hunspell/hunspell-1.6.2-r1.ebuild @@ -13,7 +13,7 @@ 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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +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= ) -- cgit v1.2.3