From 13436cdb737c2327a683b52079aefe5269b5d62b Mon Sep 17 00:00:00 2001 From: Gilles Dartiguelongue Date: Sun, 11 Sep 2016 13:25:33 +0200 Subject: [PATCH] =?utf8?q?dev-libs/link-grammar:=20version=20bump=205.3.7?= =?utf8?q?=20=E2=86=92=205.3.9?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Fix python handling. Add autoconf-archive to DEPEND, bug #574888. Package-Manager: portage-2.3.0 --- dev-libs/link-grammar/Manifest | 1 + ...nk-grammar-5.3.9-out-of-source-build.patch | 61 +++++++ .../link-grammar/link-grammar-5.3.9.ebuild | 155 ++++++++++++++++++ 3 files changed, 217 insertions(+) create mode 100644 dev-libs/link-grammar/files/link-grammar-5.3.9-out-of-source-build.patch create mode 100644 dev-libs/link-grammar/link-grammar-5.3.9.ebuild diff --git a/dev-libs/link-grammar/Manifest b/dev-libs/link-grammar/Manifest index 222054cb665e..a1f745c3d705 100644 --- a/dev-libs/link-grammar/Manifest +++ b/dev-libs/link-grammar/Manifest @@ -1,3 +1,4 @@ DIST link-grammar-4.8.6.tar.gz 2879287 SHA256 6a63bf84e487876bc15311844fdb4d482b2f9d01f3c1d52d45cc7ff6beacc893 SHA512 70e1a605b295f6f49e707c701a2fd1bb1905b7d34b950bbf9b3f6fa70c289f1d40c7791ba755b50cfeb847a5dc634239fd58c7933f716f378fce2bfda62b0535 WHIRLPOOL 75ed2446f4243e3623eecf9fcfb22146d48e0df260aea5fb77a7035f7eeab0ee9a214110dfd15be4858bf04a7a83b129066197e32949acfba6e726d4eddf8762 DIST link-grammar-5.3.3.tar.gz 4093300 SHA256 99bdec507a84079cd1d26b0f94dbca0bab7c0888073fe68d682febaf67746a79 SHA512 da4c3ac4fb3e0baf2c3d4654aad91ae92d4759c4ea66fe01c9ca84107d171e542a42c4bd508e7cc6be293116c02528042e79b2aefa5a80b253f6ac792110f714 WHIRLPOOL 073319778e8876c0ea97ab8c68923f543b95c8fdf58ae4b0a42126fe589396414ad1f279c49903f2bb70f0a7fdfddb382f256e49b00036ec3795cfb62683652d DIST link-grammar-5.3.7.tar.gz 3555475 SHA256 d0cf0061cccccfdc7c539e1f402da11b5fe2783940546560cd11a05382263a6a SHA512 f1a1e03841f847d427acb24cfb7a7a552ade6731253cf5f2ce6fcb82be387426d7cb5b47a82523f01fc56771c0667881ae663380dbc644e775694029c7fef740 WHIRLPOOL 86bf7f2e26a6e3e5c560c85719d2a8823846ad1d4a273641104111bff2523c431f459a38415c22c12db61dc344ac99e8dd33dcb7210ee42d5517f39c1e0ff90f +DIST link-grammar-5.3.9.tar.gz 3597250 SHA256 fa0a9957607705a42dbfa6bddae6567fdd11c0f648157dc824bb6facf873156a SHA512 1fa7c36c53c0525e774239fd3d9c6159ae6416b0ca3d1a4d6883c77443132fed22d13d367f26dc335b75e40ecdb163e0057d1cd1f76ffa92c7f7cbd18f31266f WHIRLPOOL 8954f0d285e9b1b045781a2cf40d401dfafb51a3f7506251d4542509d260f7f501375f9a9b036359717e7b3d0a90d5a78cd02df947bc7d9027eff274caacf61b diff --git a/dev-libs/link-grammar/files/link-grammar-5.3.9-out-of-source-build.patch b/dev-libs/link-grammar/files/link-grammar-5.3.9-out-of-source-build.patch new file mode 100644 index 000000000000..6eacc6610f90 --- /dev/null +++ b/dev-libs/link-grammar/files/link-grammar-5.3.9-out-of-source-build.patch @@ -0,0 +1,61 @@ +--- a/bindings/python/Makefile.am 2016-08-26 04:28:48.000000000 +0200 ++++ b/bindings/python/Makefile.am 2016-09-10 16:13:33.554781694 +0200 +@@ -4,9 +4,8 @@ + # Created by Linas Vepstas February 2014 + # + +-SWIG_SOURCES = ../swig/link_grammar.i +-# BUILT_C_SOURCES = $(top_builddir)/bindings/python/lg_python_wrap.cc +-BUILT_C_SOURCES = ../../bindings/python/lg_python_wrap.cc ++SWIG_SOURCES = $(top_srcdir)/bindings/swig/link_grammar.i ++BUILT_C_SOURCES = $(top_builddir)/bindings/python/lg_python_wrap.cc + BUILT_PY_SOURCES = $(top_builddir)/bindings/python/clinkgrammar.py + + # Over-ride the install location, so as to remove the dash in the +@@ -20,7 +19,7 @@ + pkgpython_PYTHON = \ +- linkgrammar.py \ ++ $(srcdir)/linkgrammar.py \ + $(top_builddir)/bindings/python/__init__.py \ +- $(top_builddir)/bindings/python/clinkgrammar.py ++ $(BUILT_PY_SOURCES) + + + # These are packaged in the tarball; make clean should not remove them. +--- a/bindings/python3/Makefile.am 2016-08-26 04:28:48.000000000 +0200 ++++ b/bindings/python3/Makefile.am 2016-09-11 01:30:35.700926275 +0200 +@@ -4,9 +4,8 @@ + # Created by Linas Vepstas February 2014 + # + +-SWIG_SOURCES = ../swig/link_grammar.i +-# BUILT_C_SOURCES = $(top_builddir)/bindings/python3/lg_python_wrap.cc +-BUILT_C_SOURCES = ../../bindings/python3/lg_python_wrap.cc ++SWIG_SOURCES = $(top_srcdir)/bindings/swig/link_grammar.i ++BUILT_C_SOURCES = $(top_builddir)/bindings/python3/lg_python_wrap.cc + BUILT_PY_SOURCES = $(top_builddir)/bindings/python3/clinkgrammar.py + + # Over-ride the install location, so as to remove the dash in the +@@ -18,9 +17,9 @@ + + # Files that get installed in $pkgpythondir + pkgpython3_PYTHON = \ +- ../../bindings/python/linkgrammar.py \ ++ $(top_srcdir)/bindings/python/linkgrammar.py \ + $(top_builddir)/bindings/python3/__init__.py \ +- $(top_builddir)/bindings/python3/clinkgrammar.py ++ $(BUILT_PY_SOURCES) + + + # Apparently, anaconda does not work without this!? +--- a/bindings/python3/Makefile.am 2016-09-11 12:44:01.466971878 +0200 ++++ b/bindings/python3/Makefile.am 2016-09-11 12:44:22.385788941 +0200 +@@ -26,7 +26,7 @@ + # This seems wrong and lme to me, but see issue #298 + pkgpypathdir=$(pythondir) + pkgpypath_PYTHON = \ +- linkgrammar.pth ++ $(srcdir)/linkgrammar.pth + + # These are packaged in the tarball; make clean should not remove them. + maintainer-clean-local: diff --git a/dev-libs/link-grammar/link-grammar-5.3.9.ebuild b/dev-libs/link-grammar/link-grammar-5.3.9.ebuild new file mode 100644 index 000000000000..96fadd6e4bce --- /dev/null +++ b/dev-libs/link-grammar/link-grammar-5.3.9.ebuild @@ -0,0 +1,155 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 +GNOME2_LA_PUNT="yes" +PYTHON_COMPAT=( python{2_7,3_4,3_5} ) + +inherit autotools eutils gnome2 java-pkg-opt-2 python-r1 + +DESCRIPTION="A Syntactic English parser" +HOMEPAGE="http://www.abisource.com/projects/link-grammar/ http://www.link.cs.cmu.edu/link/" +SRC_URI="http://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 static-libs threads" + +RDEPEND=" + aspell? ( app-text/aspell ) + hunspell? ( app-text/hunspell ) + java? ( + >=virtual/jdk-1.6:* + dev-java/ant-core ) + python? ( ${PYTHON_DEPS} ) +" +DEPEND="${RDEPEND} + dev-lang/swig:0 + sys-devel/autoconf-archive + virtual/pkgconfig +" + +NORMAL_BUILD_DIR="${WORKDIR}/${P}-normal" + +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 + + eapply "${FILESDIR}"/${P}-out-of-source-build.patch + eautoreconf + + if use python ; then + prepare_python() { + mkdir -p "${BUILD_DIR}" || die + } + python_foreach_impl prepare_python + fi + + mkdir -p "${NORMAL_BUILD_DIR}" || die + gnome2_src_prepare +} + +src_configure() { + local myconf=( + --disable-editline + --disable-perl-bindings + --enable-shared + $(use_enable aspell) + $(use_enable hunspell) + $(usex hunspell --with-hunspell-dictdir=/usr/share/myspell) + $(use_enable java java-bindings) + $(use_enable static-libs static) + $(use_enable threads pthreads) + ) + + cd "${NORMAL_BUILD_DIR}" || die + ECONF_SOURCE="${S}" gnome2_src_configure \ + --disable-python-bindings \ + --disable-python3-bindings \ + ${myconf[@]} + + if use python ; then + prepare_python() { + if python_is_python3; then + ECONF_SOURCE="${S}" gnome2_src_configure \ + --disable-python-bindings \ + --enable-python3-bindings \ + ${myconf[@]} + else + ECONF_SOURCE="${S}" gnome2_src_configure \ + --enable-python-bindings \ + --disable-python3-bindings \ + ${myconf[@]} + fi + } + python_foreach_impl run_in_build_dir prepare_python + fi +} + +src_compile() { + cd "${NORMAL_BUILD_DIR}" || die + gnome2_src_compile + + if use python ; then + compile_binding() { + local pysuffix + if python_is_python3; then + pysuffix=3 + else + pysuffix= + fi + + emake -C bindings/python$pysuffix \ + VPATH="${S}:${NORMAL_BUILD_DIR}" \ + _clinkgrammar_la_DEPENDENCIES="${NORMAL_BUILD_DIR}"/link-grammar/liblink-grammar.la \ + _clinkgrammar_la_LIBADD="${NORMAL_BUILD_DIR}"/link-grammar/liblink-grammar.la + } + python_foreach_impl run_in_build_dir compile_binding + fi +} + +src_test() { + cd "${NORMAL_BUILD_DIR}" || die + ln -s "${S}"/data tests/data || die + emake check +} + +src_install() { + cd "${NORMAL_BUILD_DIR}" || die + gnome2_src_install + + if use python ; then + install_binding() { + local pysuffix + if python_is_python3; then + pysuffix=3 + else + pysuffix= + fi + + emake -C bindings/python$pysuffix \ + VPATH="${S}:${NORMAL_BUILD_DIR}" \ + _clinkgrammar_la_DEPENDENCIES="${NORMAL_BUILD_DIR}"/link-grammar/liblink-grammar.la \ + _clinkgrammar_la_LIBADD="${NORMAL_BUILD_DIR}"/link-grammar/liblink-grammar.la \ + DESTDIR="${D}" \ + install + } + python_foreach_impl run_in_build_dir install_binding + fi +} + +pkg_preinst() { + use java && java-pkg-opt-2_pkg_preinst + gnome2_pkg_preinst +} -- 2.26.2