gentoo resync : 02.02.2022

5 files changed, 34 insertions, 148 deletions

diff --git a/dev-libs/link-grammar/Manifest b/dev-libs/link-grammar/Manifest
index b57e12bc4acd..06c92adebfdc 100644
--- a/dev-libs/link-grammar/Manifest
+++ b/dev-libs/link-grammar/Manifest
@@ -1,10 +1,9 @@
+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
-DIST link-grammar-5.8.1.tar.gz 3791847 BLAKE2B 8c89b95eaae87f0b576374c3f8c00529d61b62004718424d1ac1a41b694d8b56ba75d0a7068e1411376c260781f5adae8512976a6572e54f18d84abe98c1839e SHA512 0ef99d3ccb3d922a946f1f73b8b81cee9ece156886dab3367837e1e9f79944967da1391daf7f96ea5a95a0abdd346b642111a7939eb9aa079557c10b3efe8022
-DIST link-grammar-5.9.1.tar.gz 3809872 BLAKE2B fe0c407e2e4ea4201036647cbea7d4c2606fa9943653fcc2d3505963a00773006912b8af5c2762acf498220d2f48319a031736d59790c0fed616432973ea24ec SHA512 c8d8bc99ddd6f6190ebcb24fcafc79497c3eeab1deb3099691f55c735a0a607a8372a8dca5cd86ce7c20cd3a45e4f1cbf91bef39dc781a5b5a2246006b4f601e
+EBUILD link-grammar-5.10.2.ebuild 2955 BLAKE2B 9110a507c8574d8fcd73441275831e59b35b28d824ffbb0dd3b21143241faad23e4d906f08abcad9fbfd44ab4b0ee47a4d154c380dac6b2f58dab6813fa2f13c SHA512 2f2fc15e568326559ca3f65db137ee0a0948c63e4c99f7c0daffe5d949c66818be1eaf4e2df561b7e6656a5b4193e9560cd2155e37a6de4a61fd9ed33d87f057
 EBUILD link-grammar-5.8.0.ebuild 3187 BLAKE2B c571f8e5efd48157f76551eadef5de79f6d1092ee98299b4d0fd0d7059dd7971140445913dbab7236dcebef7e113a469eeba70b2a4d5c6d0b7a5c072f2235177 SHA512 2971f78f62d10407e12764b930c2f63ce25b2ff152ff9d8cf399163463461c029b83d14db4b5069b41e476509ccbb8c23dc5b0b0b354aa86f43c0471a24d0ebc
-EBUILD link-grammar-5.8.1.ebuild 3055 BLAKE2B b029a010785009c0463a272e8fa70a0166e14419292a4ea8f0c09d4d1bac7bd75ed7122ade19c4615816650dc71a0296c4ff97d0f873f756f8b6f3f9f9c61505 SHA512 7d21f89272decc806e310f961d3e40edc5fa55398aca74f71a9d80b151e18e7a27ee4d243c0fe5aee81ae5662f24ce242ccf3b0254ed9675b57aec786932a2e6
-EBUILD link-grammar-5.9.1.ebuild 3069 BLAKE2B eac0da4f591ce50f20f1483e9f4caba16ce3a510434423e2a9d48fc46e422906abd5a64208d85a057db7a751218cf3f684d3f9ee08326c7a4e0e3751b14fe6cd SHA512 fb327c449b874d86549806e367067ad5abc4ded9e22feff9df7e5700aa500f4c20f4121b497c80bd43483ec947c8bf18f0d74f5bd044698b9d51eceaa1d8eade
-MISC metadata.xml 964 BLAKE2B d5e9edeb0dc780ed561105e1834e81ad21c4d495f17cf1db4a66c0b6f862c572d2f4ade6b0a52a14f70ac73bdb58d06686d844bfe760818c7bb5e039f51eda56 SHA512 d3456442cd0a2a5b6e89e2ab3067c00c2bf0faf3f373cd3bf4f0cbf52ee37b882b9e2ed5785e2b43348c6d5e174b918e69c2e8e6bf91b1b16b1d2b692b796823
+MISC metadata.xml 1069 BLAKE2B e657e7727730c54d4aee903c585378978a2adf7a3a6851e6995445afe64e966e48bc4bfab6e930449c288b3ffca3436b9fbe67e88f9e790739ff0c8a079a79e2 SHA512 ba898591c96b8d05601389837891f6cda7eece200c10e014e86e0189aeeb5a0d0c04327d348ce2d77fa3d72dbbe3eec5b96953ff6903bd9670f305886f869229
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.9.1.ebuild b/dev-libs/link-grammar/link-grammar-5.10.2.ebuild
index 7d7c3b6289d0..16ede02d89b8 100644
--- a/dev-libs/link-grammar/link-grammar-5.9.1.ebuild
+++ b/dev-libs/link-grammar/link-grammar-5.10.2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 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/"
@@ -14,7 +14,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"
-IUSE="aspell +hunspell java python" # pcre
+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,21 +32,21 @@ BDEPEND="
 	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
-	use java && java-pkg-opt-2_pkg_setup
 }
 
 src_prepare() {
 	default
-	use java && java-pkg-opt-2_src_prepare
-
-	eapply "${FILESDIR}"/${PN}-5.8.1-lld.patch
-
 	eautoreconf
 }
 
@@ -58,13 +54,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)
 	)
@@ -117,7 +114,3 @@ my_src_install() {
 	# no static archives
 	find "${ED}" -name '*.la' -delete || die
 }
-
-pkg_preinst() {
-	use java && java-pkg-opt-2_pkg_preinst
-}
diff --git a/dev-libs/link-grammar/link-grammar-5.8.1.ebuild b/dev-libs/link-grammar/link-grammar-5.8.1.ebuild
deleted file mode 100644
index 2cdb1a11a0e9..000000000000
--- a/dev-libs/link-grammar/link-grammar-5.8.1.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..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/5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~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() {
-	default
-	use java && java-pkg-opt-2_src_prepare
-
-	eapply "${FILESDIR}"/${P}-lld.patch
-
-	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
-}
diff --git a/dev-libs/link-grammar/metadata.xml b/dev-libs/link-grammar/metadata.xml
index 8c1053e05a54..3f4b9ddbf83e 100644
--- a/dev-libs/link-grammar/metadata.xml
+++ b/dev-libs/link-grammar/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>soap@gentoo.org</email>
+		<name>David Seifert</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>gnome@gentoo.org</email>
 		<name>Gentoo GNOME Desktop</name>