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() {
