* [gentoo-commits] repo/gentoo:master commit in: dev-libs/link-grammar/files/, dev-libs/link-grammar/
@ 2016-09-11 11:28 Gilles Dartiguelongue
0 siblings, 0 replies; 4+ messages in thread
From: Gilles Dartiguelongue @ 2016-09-11 11:28 UTC (permalink / raw
To: gentoo-commits
commit: 13436cdb737c2327a683b52079aefe5269b5d62b
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 11 11:25:33 2016 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Sep 11 11:27:48 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13436cdb
dev-libs/link-grammar: version bump 5.3.7 → 5.3.9
Fix python handling. Add autoconf-archive to DEPEND, bug #574888.
Package-Manager: portage-2.3.0
dev-libs/link-grammar/Manifest | 1 +
.../link-grammar-5.3.9-out-of-source-build.patch | 61 ++++++++
dev-libs/link-grammar/link-grammar-5.3.9.ebuild | 155 +++++++++++++++++++++
3 files changed, 217 insertions(+)
diff --git a/dev-libs/link-grammar/Manifest b/dev-libs/link-grammar/Manifest
index 222054c..a1f745c 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 00000000..6eacc66
--- /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 00000000..96fadd6
--- /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
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/link-grammar/files/, dev-libs/link-grammar/
@ 2022-01-22 18:35 David Seifert
0 siblings, 0 replies; 4+ messages in thread
From: David Seifert @ 2022-01-22 18:35 UTC (permalink / raw
To: gentoo-commits
commit: ef3f9998e23f18f261fa67f425e9da1d12c718e6
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 22 18:35:51 2022 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Jan 22 18:35:51 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef3f9998
dev-libs/link-grammar: remove #include <fpu_control.h>
Closes: https://bugs.gentoo.org/717404
Signed-off-by: David Seifert <soap <AT> gentoo.org>
dev-libs/link-grammar/files/link-grammar-5.10.2-musl.patch | 13 +++++++++++++
dev-libs/link-grammar/link-grammar-5.10.2.ebuild | 5 ++++-
2 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/dev-libs/link-grammar/files/link-grammar-5.10.2-musl.patch b/dev-libs/link-grammar/files/link-grammar-5.10.2-musl.patch
new file mode 100644
index 000000000000..8015e3ceb1e4
--- /dev/null
+++ b/dev-libs/link-grammar/files/link-grammar-5.10.2-musl.patch
@@ -0,0 +1,13 @@
+--- a/link-grammar/minisat/minisat/utils/System.h
++++ b/link-grammar/minisat/minisat/utils/System.h
+@@ -21,10 +21,6 @@
+ #ifndef Minisat_System_h
+ #define Minisat_System_h
+
+-#if defined(__linux__)
+-#include <fpu_control.h>
+-#endif
+-
+ #include "minisat/mtl/IntTypes.h"
+
+ //-------------------------------------------------------------------------------------------------
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 9cd72d301f29..16ede02d89b8 100644
--- a/dev-libs/link-grammar/link-grammar-5.10.2.ebuild
+++ b/dev-libs/link-grammar/link-grammar-5.10.2.ebuild
@@ -32,7 +32,10 @@ BDEPEND="
sys-devel/autoconf-archive
virtual/pkgconfig"
-PATCHES=( "${FILESDIR}"/${PN}-5.8.1-lld.patch )
+PATCHES=(
+ "${FILESDIR}"/${PN}-5.8.1-lld.patch
+ "${FILESDIR}"/${P}-musl.patch
+)
pkg_setup() {
if use aspell && use hunspell; then
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/link-grammar/files/, dev-libs/link-grammar/
@ 2022-05-02 21:47 David Seifert
0 siblings, 0 replies; 4+ messages in thread
From: David Seifert @ 2022-05-02 21:47 UTC (permalink / raw
To: gentoo-commits
commit: d14634fca4bcffb64c6f3ba227df9ee35505c20c
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Mon May 2 21:47:16 2022 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon May 2 21:47:16 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d14634fc
dev-libs/link-grammar: drop 5.10.2
Signed-off-by: David Seifert <soap <AT> gentoo.org>
dev-libs/link-grammar/Manifest | 1 -
.../files/link-grammar-5.10.2-musl.patch | 13 ---
dev-libs/link-grammar/link-grammar-5.10.2.ebuild | 116 ---------------------
3 files changed, 130 deletions(-)
diff --git a/dev-libs/link-grammar/Manifest b/dev-libs/link-grammar/Manifest
index 3a97a6932144..a09777eb5c2c 100644
--- a/dev-libs/link-grammar/Manifest
+++ b/dev-libs/link-grammar/Manifest
@@ -1,2 +1 @@
-DIST link-grammar-5.10.2.tar.gz 3853934 BLAKE2B d2cb64a6b0146f40ce5b197c21ded94f1256360615c2332a1c546f6b6c71c98d2500e97b0fcabae964377a04143fa13ba3af324f2de729cfccd280e53f6fb7c3 SHA512 71bc881cb628fe1898403024d8e949b2fbf44f5d20445f6fff7bb6038646840556d734434beb7eb43b63f661e18333657deaeb1b8c96b50d5fe3b6ef727565c2
DIST link-grammar-5.10.4.tar.gz 4593602 BLAKE2B 0515aed27ae8df85ceddb9685ce90db2b6e7671235b9b445b6728b1ac417d6d43b3705566066ff9735fc98c32746342c224f2399bb0f2573784f20b5f998e7be SHA512 a215694f76e15286c478884ea8a13b32976d06ea45d10897dc1b303f256a2c0af94c9f90da26b314ce5e03009b494ab526c729b66f2b1ed46ff3e8b02cb6fd08
diff --git a/dev-libs/link-grammar/files/link-grammar-5.10.2-musl.patch b/dev-libs/link-grammar/files/link-grammar-5.10.2-musl.patch
deleted file mode 100644
index 8015e3ceb1e4..000000000000
--- a/dev-libs/link-grammar/files/link-grammar-5.10.2-musl.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/link-grammar/minisat/minisat/utils/System.h
-+++ b/link-grammar/minisat/minisat/utils/System.h
-@@ -21,10 +21,6 @@
- #ifndef Minisat_System_h
- #define Minisat_System_h
-
--#if defined(__linux__)
--#include <fpu_control.h>
--#endif
--
- #include "minisat/mtl/IntTypes.h"
-
- //-------------------------------------------------------------------------------------------------
diff --git a/dev-libs/link-grammar/link-grammar-5.10.2.ebuild b/dev-libs/link-grammar/link-grammar-5.10.2.ebuild
deleted file mode 100644
index 2d703fde38ff..000000000000
--- a/dev-libs/link-grammar/link-grammar-5.10.2.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-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/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
-# 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 )
- python? ( ${PYTHON_DEPS} )
- !sci-mathematics/minisat"
-DEPEND="${RDEPEND}"
-BDEPEND="
- dev-lang/swig:0
- sys-devel/autoconf-archive
- virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-5.8.1-lld.patch
- "${FILESDIR}"/${P}-musl.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
-}
-
-src_prepare() {
- default
- eautoreconf
-}
-
-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)
- $(usev hunspell --with-hunspell-dictdir="${EPREFIX}"/usr/share/myspell)
- # $(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
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/link-grammar/files/, dev-libs/link-grammar/
@ 2024-06-03 7:51 David Seifert
0 siblings, 0 replies; 4+ messages in thread
From: David Seifert @ 2024-06-03 7:51 UTC (permalink / raw
To: gentoo-commits
commit: deb74f8ef889a482fb8f061977636bedd45d615c
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 3 07:50:58 2024 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon Jun 3 07:50:58 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=deb74f8e
dev-libs/link-grammar: drop 5.12.3
Signed-off-by: David Seifert <soap <AT> gentoo.org>
dev-libs/link-grammar/Manifest | 1 -
...mar-5.12.3-Wimplicit-function-declaration.patch | 35 ------
dev-libs/link-grammar/link-grammar-5.12.3.ebuild | 118 ---------------------
3 files changed, 154 deletions(-)
diff --git a/dev-libs/link-grammar/Manifest b/dev-libs/link-grammar/Manifest
index eff4c9094f3c..75d64829e040 100644
--- a/dev-libs/link-grammar/Manifest
+++ b/dev-libs/link-grammar/Manifest
@@ -1,2 +1 @@
-DIST link-grammar-5.12.3.tar.gz 4704751 BLAKE2B a7f0fe39c51ed26ea764d583b38b21cfce6e596c6cd94db6ba47b3606a2b6cd9e56bd6fedeb104dbb345baedae3e144af96999739dda9daa9a9e5886bd98d2f4 SHA512 e0fdb78ec03042119011afea005a62829317fd0bc20afcd94e3f234c9c5252ed9c57d717b75368ac4a63dd8493bd86f551870299925f3b9b95b11915f48d8abe
DIST link-grammar-5.12.4.tar.gz 4720724 BLAKE2B 6573895298128165d7f840a13aad124418dbd1b9c70436dbe2bd65b3fd1883777e72da13f5196031696edb7cdc6c9d86acd5fdd4d1aa8fb295a136b2ba0568cf SHA512 fd5318c21202c17902de996882fd8630c7e95622b8ebe6877a334df22ff678a6040e0519bdabfa1138aaefdf3a7c20cbfe9e65bdce4dfe568729c9ba5a2d6fe5
diff --git a/dev-libs/link-grammar/files/link-grammar-5.12.3-Wimplicit-function-declaration.patch b/dev-libs/link-grammar/files/link-grammar-5.12.3-Wimplicit-function-declaration.patch
deleted file mode 100644
index 55ca89c09b94..000000000000
--- a/dev-libs/link-grammar/files/link-grammar-5.12.3-Wimplicit-function-declaration.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 3cbc9ddfd4c3a3e407338619fa383d24da05b23d Mon Sep 17 00:00:00 2001
-From: David Seifert <soap@gentoo.org>
-Date: Sun, 7 May 2023 16:02:23 +0200
-Subject: [PATCH] Use correct guard macro for glibc heap functions
-
-* `__GNUC__` == Compiling with `-std=gnu*`
-* `__GLIBC__` == Compiling against glibc
-
-Bug: https://bugs.gentoo.org/903749
----
- link-grammar/parse/extract-links.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/link-grammar/parse/extract-links.c b/link-grammar/parse/extract-links.c
-index a6129ac7a..e2ce266bc 100644
---- a/link-grammar/parse/extract-links.c
-+++ b/link-grammar/parse/extract-links.c
-@@ -278,7 +278,7 @@ void free_extractor(extractor_t * pex)
- pex->x_table_size = 0;
- pex->x_table = NULL;
-
--#if defined __GNUC__
-+#if defined __GLIBC__
- // MST parsing can result in pathological cases, with almost a
- // billion elts in the Parse_choice_pool. This blows up the
- // resident-set size (RSS) over time. Avoid this issue by trimming.
-@@ -294,7 +294,7 @@ void free_extractor(extractor_t * pex)
-
- xfree((void *) pex, sizeof(extractor_t));
-
--#if defined __GNUC__
-+#if defined __GLIBC__
- // malloc_trim() is a gnu extension. An alternative would be
- // to call madvise(MADV_DONTNEED) but this is more complicated.
- if (trim) malloc_trim(0);
diff --git a/dev-libs/link-grammar/link-grammar-5.12.3.ebuild b/dev-libs/link-grammar/link-grammar-5.12.3.ebuild
deleted file mode 100644
index 9b58401971bf..000000000000
--- a/dev-libs/link-grammar/link-grammar-5.12.3.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-
-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/5"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc ~x86"
-IUSE="aspell +hunspell python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# XXX: sqlite is automagic
-# Does not build with >=sci-mathematics/minisat-2, bug #593662
-RDEPEND="
- dev-db/sqlite:3
- dev-libs/libpcre2:=
- aspell? ( app-text/aspell )
- hunspell? ( app-text/hunspell )
- python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}"
-BDEPEND="
- dev-lang/swig:0
- dev-build/autoconf-archive
- virtual/pkgconfig"
-
-PATCHES=(
- # upstreamed (https://github.com/opencog/link-grammar/pull/1471)
- "${FILESDIR}"/${P}-Wimplicit-function-declaration.patch
-)
-
-QA_CONFIG_IMPL_DECL_SKIP=(
- # _AC_UNDECLARED_BUILTIN false positive
- strchr
-)
-
-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
-}
-
-src_prepare() {
- default
- eautoreconf
-}
-
-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-sat-solver
- --with-regexlib=pcre2
- $(use_enable aspell)
- $(use_enable hunspell)
- $(usev hunspell --with-hunspell-dictdir="${EPREFIX}"/usr/share/myspell)
- )
-
- 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
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-06-03 7:51 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-01-22 18:35 [gentoo-commits] repo/gentoo:master commit in: dev-libs/link-grammar/files/, dev-libs/link-grammar/ David Seifert
-- strict thread matches above, loose matches on Subject: below --
2024-06-03 7:51 David Seifert
2022-05-02 21:47 David Seifert
2016-09-11 11:28 Gilles Dartiguelongue
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox