From f1af93971b7490792d8541bc790e0d8c6d787059 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 6 Sep 2019 10:28:05 +0100 Subject: gentoo resync : 06.08.2019 --- app-text/hunspell/Manifest | 2 + app-text/hunspell/files/hunspell-1.7.0-tinfo.patch | 61 +++++++++++++++ app-text/hunspell/hunspell-1.7.0-r1.ebuild | 88 ++++++++++++++++++++++ 3 files changed, 151 insertions(+) create mode 100644 app-text/hunspell/files/hunspell-1.7.0-tinfo.patch create mode 100644 app-text/hunspell/hunspell-1.7.0-r1.ebuild (limited to 'app-text/hunspell') diff --git a/app-text/hunspell/Manifest b/app-text/hunspell/Manifest index 2ca929a1166a..789a8410a371 100644 --- a/app-text/hunspell/Manifest +++ b/app-text/hunspell/Manifest @@ -1,7 +1,9 @@ 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 1721 BLAKE2B 1278f50da7577556710a8e481f46ca03ea40147149d2419343aadd2e08afcc3e1865efb9fc13beca9d4d2d7b1e027f72931415120524458843f85c86528e82da SHA512 3161ccc03a7c1af9b3a421515385d95866d306bf7639a24e4e4fc0d762a30e7195a517315ce489472fb18edc3594cd0f621ef5c42e17847d0b76563315426864 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 2383 BLAKE2B 7ef52fd2c661ce65496350ebf7f33e550b9e2645183cea6a3801e7bea81045da4b9846dbedc6b933cb30a3876df87d434785ee4a39292aa2fb3093310b565b59 SHA512 41e296e4a093edc5ef757cec31fd93fcd9a6b08ea18e5b5086477f4f4b351a93fa9ff03a7cb6884da17236985c0d3e5ece154da8aba8557f56cff37c73efc3b7 +EBUILD hunspell-1.7.0-r1.ebuild 2350 BLAKE2B 549d5faa02b30a9c05f0ce88d0d25aa432ea80a0a94643c819676afbf241d4e376f483cceb97073d93396e11bbaa3d944204abb91c430b23933710b6bb5252c9 SHA512 6828c0da75f5e652df23d1d14985fd0e73e00a4bf0acd407650f5973f2fd19d1ec0d98fb3ba246d3ea7ed74f5fdf1a1eed602c260c01d0a44257feceaa68581a EBUILD hunspell-1.7.0.ebuild 2292 BLAKE2B ffcdf02a09d0bac21a950177962e6ee769802c3c8656d847c3c59faf21925a153bf51d7d933a06a3ec14ee88bb9178398e56b8ab1efde0992e562ab1e0540628 SHA512 aa8b250d91da765cd2e86ae0233947a5722e135f38a5f5c7ae54f1a50723b66d3aa618fda42931ea65e36d5e306de00e9983c305716d613e3d4ecf7e50a7e5b1 MISC metadata.xml 300 BLAKE2B 03418bffa5dab48a3d9f5f7de46a79b8b5de44296b7c39d8d75d021f3c5693eea63148fbed02c8a77b1a0846e1d39d8e11caeb003297839fda0c5dc679aaca08 SHA512 b541c90d84ee8c1541d588948286428f065ebf0bb393108e7521ba8d45ab3fb235eaba61ca61eebc61f371e399e7d98ccf3c2994d8df97d1b6a7972e92cffa71 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 000000000000..1fb992b0c9d5 --- /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 +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 000000000000..343a7fbce81c --- /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 +} -- cgit v1.2.3