diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-02-05 18:44:56 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-02-05 18:44:56 +0000 |
commit | 29aabba0ea759c6a2864ff5631735b67ee38e5e0 (patch) | |
tree | ab466b4dfa7abecb401b2f8039d08af4689306bb /app-text/hunspell | |
parent | d42200bec37eef2a7478d88988ff00addd0a9202 (diff) |
gentoo resync : 05.02.2020
Diffstat (limited to 'app-text/hunspell')
-rw-r--r-- | app-text/hunspell/Manifest | 5 | ||||
-rw-r--r-- | app-text/hunspell/files/hunspell-1.6.2-renameexes.patch | 127 | ||||
-rw-r--r-- | app-text/hunspell/hunspell-1.6.2-r1.ebuild | 86 | ||||
-rw-r--r-- | app-text/hunspell/hunspell-1.7.0-r1.ebuild | 4 |
4 files changed, 3 insertions, 219 deletions
diff --git a/app-text/hunspell/Manifest b/app-text/hunspell/Manifest index cb05f49b7eb6..a23eca59af99 100644 --- a/app-text/hunspell/Manifest +++ b/app-text/hunspell/Manifest @@ -1,8 +1,5 @@ -AUX hunspell-1.6.2-renameexes.patch 5104 BLAKE2B 83ea0ec81fdd5e8934c954bb2f2d07e9c47f725f8b63360aca7cd611348106a1e3f13ab08609ff4877272ec6b116927c382c5b47731945656ddb7927aca22c50 SHA512 0d1871eda31b83851bf153746e0f4957599e889a536e9c0994d1cb988bc4a887788c1fafe4dccccaa94e68a69e6fa4ff1e201678fa8d1afdcb9608b83211b0ae AUX hunspell-1.7.0-renameexes.patch 6399 BLAKE2B d852305da0dc0330e293a028a1e178d7887a3567a35bc6feebe48e7a4bf205103155ec31b5a483a1002c505ae89bdf47ae80c1b6ccd866eb62cc7e6851c1a1b9 SHA512 3703b49728e8ce92637a602478995d38deb64c1b3281a06447f66c352ca0e2adb7d8aa9167debd9cb15e4009ee4efeb7618065bf16dda47155245c0266d97eaa AUX hunspell-1.7.0-tinfo.patch 1719 BLAKE2B 1b612edd63dc04fe57a27fc94937b1cabcb32c4158009c3444d43f506d19b94d0aa79d746ba409ec429d467e29619cd32894e935b8f8c0deda7f0ed2600841c6 SHA512 297f337895f805c9ce27ae63f424c88e8f153fb8f6724aedc11dd564acee6264b8eba01b09f43d75585d6d5bf3eb245db69b3da00c349c3c1c0d04a5a99b1b48 -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.2-r1.ebuild 2361 BLAKE2B b75f02e0862a9a8be86d7fb29b663a93f483410bf5d0301bdab8487516c00f132e6268ed0bdf133f2ef746528b93c6b0d7cc71a38eb3f49b33202b125e19e04e SHA512 fa6f2089e74c17adcfeebdce2ffa7f2a56ef86e53f1b05b2a2d7fc61e4a29dc9a5f010aa305e07cf22c63208bb73fe1c795efc47e951b666aad33feccd0aeaad -EBUILD hunspell-1.7.0-r1.ebuild 2320 BLAKE2B 0847d45439cab6c110f629bc75148dc355be943d472944f4a766b026deeddd5941c6775b1afa96627eae476df3e25bcfab1ab3ef82a82fbf63dfe75f786927bd SHA512 bff1ea10fb94b6cecf2d62ce944ba05fdd1367c3a27ee7bb25a6ee44f3a9155a79198bc42e2027ccbf9a449fb9ea847ad7bdc0477a3d0c1ab840608531708d1e +EBUILD hunspell-1.7.0-r1.ebuild 2319 BLAKE2B 857da415a1f0db4ef99f5ae21bd6e8887a53b1ece545e31563961309f0bbc8770f56c14590160eb800eb3e550241560e34080b154fbced069abb6fcb49443f83 SHA512 958ac4af5756761abe98ee17336469a51b3fa7f23fcb2b715883b2abf5df34d83ffb1b4e4b8b339cd9053c126541e2dfee5e8efd6b30158a1ae4a5fffb53d309 MISC metadata.xml 300 BLAKE2B 03418bffa5dab48a3d9f5f7de46a79b8b5de44296b7c39d8d75d021f3c5693eea63148fbed02c8a77b1a0846e1d39d8e11caeb003297839fda0c5dc679aaca08 SHA512 b541c90d84ee8c1541d588948286428f065ebf0bb393108e7521ba8d45ab3fb235eaba61ca61eebc61f371e399e7d98ccf3c2994d8df97d1b6a7972e92cffa71 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 be56cabc50bc..000000000000 --- 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 b7e862c9381a..000000000000 --- 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 -} diff --git a/app-text/hunspell/hunspell-1.7.0-r1.ebuild b/app-text/hunspell/hunspell-1.7.0-r1.ebuild index 73ec87891865..272ebcc1de9e 100644 --- a/app-text/hunspell/hunspell-1.7.0-r1.ebuild +++ b/app-text/hunspell/hunspell-1.7.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,7 +13,7 @@ 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-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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" RDEPEND=" ncurses? ( sys-libs/ncurses:0= ) |