[gentoo-commits] repo/gentoo:master commit in: dev-libs/link-grammar/, dev-libs/link-grammar/files/

[David Seifert]

commit:     f895567e762f8f068a525b9294446f14938eab0e
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 16 11:46:33 2020 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Aug 16 11:46:33 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f895567e

dev-libs/link-grammar: Version bump to 5.8.0

* EAPI 7
* Supports Python 3.6/3.7/3.8/3.9

Bug: https://bugs.gentoo.org/718282
Package-Manager: Portage-3.0.2, Repoman-2.3.23
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 dev-libs/link-grammar/Manifest                     |   1 +
 .../files/link-grammar-5.8.0-dont-inject-O3.patch  |  23 ++++
 .../link-grammar-5.8.0-out-of-source-build.patch   |  33 ++++++
 dev-libs/link-grammar/link-grammar-5.8.0.ebuild    | 125 +++++++++++++++++++++
 4 files changed, 182 insertions(+)

diff --git a/dev-libs/link-grammar/Manifest b/dev-libs/link-grammar/Manifest
index 97d340e7ab7..8e5e8d34970 100644
--- a/dev-libs/link-grammar/Manifest
+++ b/dev-libs/link-grammar/Manifest
@@ -1 +1,2 @@
 DIST link-grammar-5.3.11.tar.gz 3632617 BLAKE2B 07fe951743096a0d6b906c9b7174b58fcc54b0e2c54805d15731de783888327799fd77f64a2ae7f4e09327feb08d91cb95471e9c0c3c2fe00fca3553f40b1905 SHA512 09671d187deac3b9530dd63eb4497de9c2c9db32d79da06c677bdbccac015adef06813819692a92d15499c7cb347071c58b73c52505af154bdc8a8fcd409ddd2
+DIST link-grammar-5.8.0.tar.gz 3782125 BLAKE2B 8027e91212d3269b8e3ceaa5c837ad961cd2dfd92849d3989094ab771d97d30f4b228cfc1e32e9e843676aa439d790fb444823f7db69004538ad068c7bf28a45 SHA512 1262e2faf1de6f05a62f9d622f43c02253b4c241342df9b443a70ae04bd328d1fc49cd2f91c881e694f67215005833fec8b1fa9d395b1e547985b376c7415d2e

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
new file mode 100644
index 00000000000..2d97b7cc762
--- /dev/null
+++ b/dev-libs/link-grammar/files/link-grammar-5.8.0-dont-inject-O3.patch
@@ -0,0 +1,23 @@
+--- 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
new file mode 100644
index 00000000000..1616e933664
--- /dev/null
+++ b/dev-libs/link-grammar/files/link-grammar-5.8.0-out-of-source-build.patch
@@ -0,0 +1,33 @@
+--- 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.8.0.ebuild b/dev-libs/link-grammar/link-grammar-5.8.0.ebuild
new file mode 100644
index 00000000000..6434d2d8be2
--- /dev/null
+++ b/dev-libs/link-grammar/link-grammar-5.8.0.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit autotools java-pkg-opt-2 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 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="aspell +hunspell java python" # pcre
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# XXX: sqlite is automagic
+# Does not build with >=sci-mathematics/minisat-2, bug #593662
+# add pcre support: pcre? ( dev-libs/libpcre )
+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}"
+BDEPEND="
+	dev-lang/swig:0
+	sys-devel/autoconf-archive
+	virtual/pkgconfig"
+
+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
+
+	eautoreconf
+}
+
+my_src_configure() {
+	local myconf=(
+		--disable-maintainer-mode
+		--disable-editline
+		--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)
+		# $(use_enable pcre regex-tokenizer)
+		# $(use_with pcre)
+	)
+
+	econf \
+		--disable-python-bindings \
+		"${myconf[@]}"
+
+	if use python; then
+		python_configure() {
+			econf \
+				--enable-python-bindings \
+				"${myconf[@]}"
+		}
+		python_foreach_impl run_in_build_dir python_configure
+	fi
+}
+
+my_src_compile() {
+	local -x MAIN_BUILD_DIR="${BUILD_DIR}"
+	default
+
+	if use python; then
+		python_compile() {
+			emake -C bindings/python \
+				VPATH="${S}:${MAIN_BUILD_DIR}" \
+				_clinkgrammar_la_DEPENDENCIES="${MAIN_BUILD_DIR}"/link-grammar/liblink-grammar.la \
+				_clinkgrammar_la_LIBADD="${MAIN_BUILD_DIR}"/link-grammar/liblink-grammar.la
+		}
+		python_foreach_impl run_in_build_dir python_compile
+	fi
+}
+
+my_src_install() {
+	local -x MAIN_BUILD_DIR="${BUILD_DIR}"
+	default
+
+	if use python; then
+		python_install() {
+			emake -C bindings/python \
+				VPATH="${S}:${MAIN_BUILD_DIR}" \
+				_clinkgrammar_la_DEPENDENCIES="${MAIN_BUILD_DIR}"/link-grammar/liblink-grammar.la \
+				_clinkgrammar_la_LIBADD="${MAIN_BUILD_DIR}"/link-grammar/liblink-grammar.la \
+				DESTDIR="${D}" \
+				install
+		}
+		python_foreach_impl run_in_build_dir python_install
+	fi
+
+	# no static archives
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_preinst() {
+	use java && java-pkg-opt-2_pkg_preinst
+}