gentoo auto-resync : 04:06:2024 - 00:07:50

4 files changed, 4 insertions, 157 deletions

diff --git a/dev-libs/link-grammar/Manifest b/dev-libs/link-grammar/Manifest
index 1238cfccaea4..70de5b845dbe 100644
--- a/dev-libs/link-grammar/Manifest
+++ b/dev-libs/link-grammar/Manifest
@@ -1,6 +1,3 @@
-AUX link-grammar-5.12.3-Wimplicit-function-declaration.patch 1295 BLAKE2B 90ece06844dee100de78b45d172bc2a3bef9b2625f47dfb4f1d5a832f010defb28b9e7d8442d8c4e7f0ea01c246200b41629976891a761217624413c80ff2c41 SHA512 b878d6e64e45c40470b61aa31f3c7ceeef3946e1fd15a0f473a131c0cc11e44f1ac7bbfc602362c05659416e40c706d25f1be7e01204b5b9b7b58f71902de2e1
-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
-EBUILD link-grammar-5.12.3.ebuild 2965 BLAKE2B 038477eb61c4ad170de17f2be8ea8bd69ba64e7d594a3382de5d7861a6503fec2ac56a8e9aac345d66cf25ede71e8d6b0137fd7839fe949c254603f5ae6d439e SHA512 71dffd2543d5ad7e26059785dc78178a1c377c4ebd33eaa9c53f7cb82530ac14b136942b7c24e2098149c72646f252fe82b058f34604b4f41a7245daa04424e2
-EBUILD link-grammar-5.12.4.ebuild 2834 BLAKE2B 6c21909edb2c90edec01c9d3f49f5214652a6f04cd7036131bddcb00b815c8278b7039b5cfe259ccf7bffea11613472c759dc3d42b7584e7680f95ff790b7664 SHA512 71ed06550979f1886dbbcf07fd313ec80903cf6b1712895e069e748423afeb4a20284dd543efa0772eb36c030f7b6d2612eb9c748d39778858c2ee3dd71152ef
+EBUILD link-grammar-5.12.4.ebuild 2921 BLAKE2B effe3bf5374ecb6154bf9d3bf276df94241609e224a63c7f62d6cb5e8cff4c3da3a5857fb0dbcdba47be92cac7a61a7c1a2e35735b9667c2e4a254eff98a4bde SHA512 5cf265da8086c90a770b2bd29143606592054da867457e94c8b7758da6e9ac342ac62f40e2848bcc1af0086056e2891f529d9915a628d893bbdb74fb79c699a4
 MISC metadata.xml 1197 BLAKE2B fac6dd40856d97100ee06cdcd340e660bb2ffe527df31983165beec9d194839336dfddb54be33561560ac2c79d8bad12809eef53abd4059b7c74b7494d728354 SHA512 dcb16b8afa977639e3fe8633762fc7a26d8ab095da15d630bedc6ba65e4c82ec5f0bedbd564b6ad0490790723c0a04065a5cab536aff93cdcf8eab5f1a2d503e
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
-}
diff --git a/dev-libs/link-grammar/link-grammar-5.12.4.ebuild b/dev-libs/link-grammar/link-grammar-5.12.4.ebuild
index ce58ab8a0621..a78bbab12177 100644
--- a/dev-libs/link-grammar/link-grammar-5.12.4.ebuild
+++ b/dev-libs/link-grammar/link-grammar-5.12.4.ebuild
@@ -29,6 +29,7 @@ DEPEND="${RDEPEND}"
 BDEPEND="
 	dev-lang/swig:0
 	dev-build/autoconf-archive
+	sys-devel/flex
 	virtual/pkgconfig"
 
 QA_CONFIG_IMPL_DECL_SKIP=(
@@ -61,6 +62,8 @@ my_src_configure() {
 		$(use_enable aspell)
 		$(use_enable hunspell)
 		$(usev hunspell --with-hunspell-dictdir="${EPREFIX}"/usr/share/myspell)
+		# requires flex, since reflex support is flaky, #890158
+		LEX="flex"
 	)
 
 	econf \