diff options
Diffstat (limited to 'dev-libs/link-grammar')
| -rw-r--r-- | dev-libs/link-grammar/Manifest | 8 | ||||
| -rw-r--r-- | dev-libs/link-grammar/files/link-grammar-5.8.0-dont-inject-O3.patch | 23 | ||||
| -rw-r--r-- | dev-libs/link-grammar/files/link-grammar-5.8.0-out-of-source-build.patch | 33 | ||||
| -rw-r--r-- | dev-libs/link-grammar/link-grammar-5.10.2.ebuild | 2 | ||||
| -rw-r--r-- | dev-libs/link-grammar/link-grammar-5.10.4.ebuild (renamed from dev-libs/link-grammar/link-grammar-5.8.0.ebuild) | 38 |
5 files changed, 17 insertions, 87 deletions
diff --git a/dev-libs/link-grammar/Manifest b/dev-libs/link-grammar/Manifest index 06c92adebfdc..7733e105f339 100644 --- a/dev-libs/link-grammar/Manifest +++ b/dev-libs/link-grammar/Manifest @@ -1,9 +1,7 @@ AUX link-grammar-5.10.2-musl.patch 371 BLAKE2B 989e27593b2780401a4df5ef292f8487a32f4fe0287e4745143bed6f72a7d0af71b20a1d8e06144bc116fe12f1778a3cf8f3e8f86922f3049d99d82a82b7076a SHA512 d2eb12fc12cdd1129420d976facb7f652bd475336c71d683b9d561dcb4a9001c60d127d27446f3c1f93757ad6715214a53d3170e03ee1952cb3c37ea03368a05 -AUX link-grammar-5.8.0-dont-inject-O3.patch 621 BLAKE2B becccc08314e45416ee96ec52a5b03b3cf5b1fc141a427a774c7d2b816cff985abba54a99b8bc308e9e75759045b335380a186031d647cc8df00582669615ebd SHA512 71e05d722d24a4647af9f879c14d74d2875ee5435f1b70acb8f962f9e7e602e044e8ed98e118e3ad9ebf725a9701a302ca1e5ea75aa8662326f29251c1317138 -AUX link-grammar-5.8.0-out-of-source-build.patch 1189 BLAKE2B ba89966a0744b39f0f24fa3359a031041cae61f3ec26aaad42eb6e05cbc5c33e54f927c460b33f8d1d37b3987e149f1c88da1ebaab408d322954eefa755b38cb SHA512 e2f094f341bf943a57ce04f10f49a1aac8345ced88a63c54fdfceda946ab575ff088c597d61847d9a9bbebf10af9ad1c284239f29004fc7917deddcd79ddce69 AUX link-grammar-5.8.1-lld.patch 531 BLAKE2B e7a64032d8e8394205d4529e270bee1ec121a6b29b6a779e885cae825678679e521b2f4eb2bec6b6b6c8f1c5f311337c7b2e205a5cb1966538741e72b7e7cb37 SHA512 03dd3164c7626d70019851189fd35d7ecfcbc112b594dafc0c3390f0d533b67611838cd9207a486139f4e4c8ac78f81da87d0c00a0238ad417c90942bcaa2c6b DIST link-grammar-5.10.2.tar.gz 3853934 BLAKE2B d2cb64a6b0146f40ce5b197c21ded94f1256360615c2332a1c546f6b6c71c98d2500e97b0fcabae964377a04143fa13ba3af324f2de729cfccd280e53f6fb7c3 SHA512 71bc881cb628fe1898403024d8e949b2fbf44f5d20445f6fff7bb6038646840556d734434beb7eb43b63f661e18333657deaeb1b8c96b50d5fe3b6ef727565c2 -DIST link-grammar-5.8.0.tar.gz 3782125 BLAKE2B 8027e91212d3269b8e3ceaa5c837ad961cd2dfd92849d3989094ab771d97d30f4b228cfc1e32e9e843676aa439d790fb444823f7db69004538ad068c7bf28a45 SHA512 1262e2faf1de6f05a62f9d622f43c02253b4c241342df9b443a70ae04bd328d1fc49cd2f91c881e694f67215005833fec8b1fa9d395b1e547985b376c7415d2e -EBUILD link-grammar-5.10.2.ebuild 2955 BLAKE2B 9110a507c8574d8fcd73441275831e59b35b28d824ffbb0dd3b21143241faad23e4d906f08abcad9fbfd44ab4b0ee47a4d154c380dac6b2f58dab6813fa2f13c SHA512 2f2fc15e568326559ca3f65db137ee0a0948c63e4c99f7c0daffe5d949c66818be1eaf4e2df561b7e6656a5b4193e9560cd2155e37a6de4a61fd9ed33d87f057 -EBUILD link-grammar-5.8.0.ebuild 3187 BLAKE2B c571f8e5efd48157f76551eadef5de79f6d1092ee98299b4d0fd0d7059dd7971140445913dbab7236dcebef7e113a469eeba70b2a4d5c6d0b7a5c072f2235177 SHA512 2971f78f62d10407e12764b930c2f63ce25b2ff152ff9d8cf399163463461c029b83d14db4b5069b41e476509ccbb8c23dc5b0b0b354aa86f43c0471a24d0ebc +DIST link-grammar-5.10.4.tar.gz 4593602 BLAKE2B 0515aed27ae8df85ceddb9685ce90db2b6e7671235b9b445b6728b1ac417d6d43b3705566066ff9735fc98c32746342c224f2399bb0f2573784f20b5f998e7be SHA512 a215694f76e15286c478884ea8a13b32976d06ea45d10897dc1b303f256a2c0af94c9f90da26b314ce5e03009b494ab526c729b66f2b1ed46ff3e8b02cb6fd08 +EBUILD link-grammar-5.10.2.ebuild 2953 BLAKE2B 48c814085ec491e5a806bf83d9005435ef02c2fb4f9bfbd58737c6abd1773b7a84a5a3777d4d7f4f171cc831c9bc0c005c22ada79ad6812da0e78d02a1a1c981 SHA512 f2ea6cb09dd955b6ec32a4b8e65688667465abdc3cb8a28af9f1143508a7ecfed9d91bc86e81ade810d612a9734c056f066f8c9cef9a0c25f7cca70e73437a8b +EBUILD link-grammar-5.10.4.ebuild 2923 BLAKE2B 8559d949ea26e420c97628d02f9f9ce5b467cc9339fdd59ab60c406af6807177ec2cb4f046d039d8e2d3fdb124320a7e6b53b121caef5524b7c0f719c97a5bb6 SHA512 635ebd792e697ac282ab9451c8e95dfe2e46064aa7f5919c5ee62927c347c77a1dc6739d2f09be266dbb39307aa7e955461250e215581e999ad3a8e40a971951 MISC metadata.xml 1069 BLAKE2B e657e7727730c54d4aee903c585378978a2adf7a3a6851e6995445afe64e966e48bc4bfab6e930449c288b3ffca3436b9fbe67e88f9e790739ff0c8a079a79e2 SHA512 ba898591c96b8d05601389837891f6cda7eece200c10e014e86e0189aeeb5a0d0c04327d348ce2d77fa3d72dbbe3eec5b96953ff6903bd9670f305886f869229 diff --git a/dev-libs/link-grammar/files/link-grammar-5.8.0-dont-inject-O3.patch b/dev-libs/link-grammar/files/link-grammar-5.8.0-dont-inject-O3.patch deleted file mode 100644 index 2d97b7cc7627..000000000000 --- a/dev-libs/link-grammar/files/link-grammar-5.8.0-dont-inject-O3.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -137,8 +137,7 @@ - AC_SUBST(HOST_OS) - # ==================================================================== - --CFLAGS="${CFLAGS} -O3" --CXXFLAGS="${CXXFLAGS} -O3 -Wall" -+CXXFLAGS="${CXXFLAGS} -Wall" - - # The std=c11 flag provides the proper float-pt math decls working, - # e.g. fmax However, it also undefined _BSD_SOURCE, etc. which is -@@ -908,10 +907,6 @@ - - AC_FUNC_STRERROR_R - --AC_SUBST(CFLAGS) --AC_SUBST(CPPFLAGS) --AC_SUBST(CXXFLAGS) -- - dnl Save the compilation definitions for an extended version printout - AC_OUTPUT_MAKE_DEFS() - LG_DEFS=`$ECHO "$DEFS" | $SED 's/\\\\//g'` diff --git a/dev-libs/link-grammar/files/link-grammar-5.8.0-out-of-source-build.patch b/dev-libs/link-grammar/files/link-grammar-5.8.0-out-of-source-build.patch deleted file mode 100644 index 1616e933664e..000000000000 --- a/dev-libs/link-grammar/files/link-grammar-5.8.0-out-of-source-build.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- a/bindings/python/Makefile.am -+++ b/bindings/python/Makefile.am -@@ -4,8 +4,8 @@ - # Created by Linas Vepstas February 2014 - # - # --SWIG_SOURCES = ../swig/link_grammar.i --SWIG_INCLUDES = ../../link-grammar/link-includes.h -+SWIG_SOURCES = $(top_srcdir)/bindings/swig/link_grammar.i -+SWIG_INCLUDES = $(top_srcdir)/link-grammar/link-includes.h - built_c_sources = lg_python_wrap.cc - built_py_sources = $(top_builddir)/bindings/python/clinkgrammar.py - -@@ -18,16 +18,16 @@ - - # Files that get installed in $pkgpythondir - pkgpython_PYTHON = \ -- linkgrammar.py \ -+ $(srcdir)/linkgrammar.py \ - $(top_builddir)/bindings/python/__init__.py \ -- $(top_builddir)/bindings/python/clinkgrammar.py -+ $(built_py_sources) - - # Apparently, anaconda does not work without this!? - # This seems wrong and lame to me, but see issue #298 - # https://github.com/opencog/link-grammar/issues/298 - pkgpypathdir=$(pythondir) - pkgpypath_PYTHON = \ -- linkgrammar.pth -+ $(srcdir)/linkgrammar.pth - - # The make uninstall target should remove directories we created. - uninstall-hook: diff --git a/dev-libs/link-grammar/link-grammar-5.10.2.ebuild b/dev-libs/link-grammar/link-grammar-5.10.2.ebuild index 16ede02d89b8..2d703fde38ff 100644 --- a/dev-libs/link-grammar/link-grammar-5.10.2.ebuild +++ b/dev-libs/link-grammar/link-grammar-5.10.2.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://www.abisource.com/downloads/${PN}/${PV}/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0/5" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc ~x86" IUSE="aspell +hunspell python" # pcre REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" diff --git a/dev-libs/link-grammar/link-grammar-5.8.0.ebuild b/dev-libs/link-grammar/link-grammar-5.10.4.ebuild index 0b97d446d773..9cd72d301f29 100644 --- a/dev-libs/link-grammar/link-grammar-5.8.0.ebuild +++ b/dev-libs/link-grammar/link-grammar-5.10.4.ebuild @@ -1,20 +1,20 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_COMPAT=( python3_{8..10} ) -inherit autotools java-pkg-opt-2 python-r1 out-of-source +inherit autotools python-r1 out-of-source DESCRIPTION="A Syntactic English parser" HOMEPAGE="https://www.abisource.com/projects/link-grammar/ https://www.link.cs.cmu.edu/link/" SRC_URI="https://www.abisource.com/downloads/${PN}/${PV}/${P}.tar.gz" LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86" -IUSE="aspell +hunspell java python" # pcre +SLOT="0/5" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="aspell +hunspell python" # pcre REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" # XXX: sqlite is automagic @@ -24,10 +24,6 @@ RDEPEND=" dev-db/sqlite:3 aspell? ( app-text/aspell ) hunspell? ( app-text/hunspell ) - java? ( - >=virtual/jdk-1.6:* - dev-java/ant-core - ) python? ( ${PYTHON_DEPS} ) !sci-mathematics/minisat" DEPEND="${RDEPEND}" @@ -36,23 +32,18 @@ BDEPEND=" sys-devel/autoconf-archive virtual/pkgconfig" +PATCHES=( "${FILESDIR}"/${PN}-5.8.1-lld.patch ) + pkg_setup() { if use aspell && use hunspell; then ewarn "You have enabled 'aspell' and 'hunspell' support, but both cannot coexist," ewarn "only hunspell will be built. Press Ctrl+C and set only 'aspell' USE flag if" ewarn "you want aspell support." fi - use java && java-pkg-opt-2_pkg_setup } src_prepare() { - use java && java-pkg-opt-2_src_prepare - - # http://bugzilla.abisource.com/show_bug.cgi?id=13806 - eapply "${FILESDIR}"/${PN}-5.8.0-out-of-source-build.patch - eapply "${FILESDIR}"/${PN}-5.8.0-dont-inject-O3.patch - eapply_user - + default eautoreconf } @@ -60,13 +51,14 @@ my_src_configure() { local myconf=( --disable-maintainer-mode --disable-editline + # java is hopelessly broken, invokes maven at build time (bug #806157) + --disable-java-bindings --disable-perl-bindings --disable-static --enable-sat-solver=bundled $(use_enable aspell) $(use_enable hunspell) - $(usex hunspell --with-hunspell-dictdir="${EPREFIX}"/usr/share/myspell '') - $(use_enable java java-bindings) + $(usev hunspell --with-hunspell-dictdir="${EPREFIX}"/usr/share/myspell) # $(use_enable pcre regex-tokenizer) # $(use_with pcre) ) @@ -119,7 +111,3 @@ my_src_install() { # no static archives find "${ED}" -name '*.la' -delete || die } - -pkg_preinst() { - use java && java-pkg-opt-2_pkg_preinst -} |