gentoo resync : 30.09.2020

4 files changed, 2 insertions, 209 deletions

diff --git a/dev-libs/link-grammar/Manifest b/dev-libs/link-grammar/Manifest
index 82750533cf7c..f53df10c9fa1 100644
--- a/dev-libs/link-grammar/Manifest
+++ b/dev-libs/link-grammar/Manifest
@@ -1,8 +1,5 @@
-AUX link-grammar-5.3.9-out-of-source-build.patch 2541 BLAKE2B 6b60a65bb39e628f8c555dce20410872a4dd56d27402e7bc939d49483053cf84199f3f5bab495c16f734b4b6662b467b0369cda4dc852a39568f27b68c0f14da SHA512 340a03c31ed94f53b00622bf7f925d8f47c658ec81843f0139deb5b38074f346ad4d65dc49653cccf1b7b49966c77029ab64e993d113e709e75ebb930448b8f6
 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
-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
-EBUILD link-grammar-5.3.11.ebuild 3632 BLAKE2B d0e14eb500342a137661236b1c4ed9ab67623a854b994cabe70ed3c3cf6e15e6aa0035380461c99ae4cc665f0921e92bcb995c264dc4d2547a1bd37c5ffdeec6 SHA512 b0e9264782da3b7bfc6aea75870fc7c789591eca23c442f29051dec5f28e0b8d5100f971e6eba143be14dfb27d06042952b469af5f6337d3c89020eea3112d76
-EBUILD link-grammar-5.8.0.ebuild 3181 BLAKE2B 18941b1f0bd78512702cd4fb5cd213e1a93a4b911b341e8b1ab36fc7d5a14c935577bc2d07c12c38f56c5c9c539927c3793e00f51be95539b60a5741966883d5 SHA512 f6f44ee826cab91f012f18eb8a863955caf074ffe3fbf7b0d58211391f5d4b7ac651424083cdee342e26a7ea1ae9b8cc3f734fd7335ebc5610e799f91df0d91d
+EBUILD link-grammar-5.8.0.ebuild 3180 BLAKE2B e431e616920aeef3b86a82ded5ae20c72de2d74e63ee074d258cbf4340c4e9fec348375dfad2d513cb78f6f0f23ecf83ece841db6a76d469e3f0b1feb924dcb5 SHA512 8ac6a02816241df0be5c89fce69926b8daad1f8c321653efd737fd8efbc6abb3d10c4086eb086dfe0d54af5776ab7483e43d40c425402b16cd716bfcde821ce9
 MISC metadata.xml 963 BLAKE2B ebe0a68ad3a8fee0aa3d112f152e306d691b73e6969bf1fb7026edbdfb814fa1476c2e7d9e8ff9051e5920f9279acea871fab85da58ff8642ec819b5a4fbb57f SHA512 d53e9c7867629e8caf488cef531e258bb2cad3fcbe458e80024b0292fe90148656a77069c45f42e782ba473daafec5cf1fa93e9be00571ceefd21bf59b0ea5a2
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
deleted file mode 100644
index 6eacc6610f90..000000000000
--- a/dev-libs/link-grammar/files/link-grammar-5.3.9-out-of-source-build.patch
+++ /dev/null
@@ -1,61 +0,0 @@
---- 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.11.ebuild b/dev-libs/link-grammar/link-grammar-5.3.11.ebuild
deleted file mode 100644
index ddab5316ca13..000000000000
--- a/dev-libs/link-grammar/link-grammar-5.3.11.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python3_6 )
-
-inherit autotools eutils gnome2 java-pkg-opt-2 python-r1
-
-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 static-libs threads" # 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}
-	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
-
-	# http://bugzilla.abisource.com/show_bug.cgi?id=13806
-	eapply "${FILESDIR}"/${PN}-5.3.9-out-of-source-build.patch
-	eapply_user
-	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
-		--enable-sat-solver=bundled
-		$(use_enable aspell)
-		$(use_enable hunspell)
-		$(usex hunspell --with-hunspell-dictdir=/usr/share/myspell)
-		$(use_enable java java-bindings)
-		# $(use_enable pcre regex-tokenizer)
-		# $(use_with pcre)
-		$(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() {
-			ECONF_SOURCE="${S}" gnome2_src_configure \
-				--disable-python-bindings \
-				--enable-python3-bindings \
-				${myconf[@]}
-		}
-		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() {
-			emake -C bindings/python3 \
-				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() {
-			emake -C bindings/python3 \
-				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
-}
diff --git a/dev-libs/link-grammar/link-grammar-5.8.0.ebuild b/dev-libs/link-grammar/link-grammar-5.8.0.ebuild
index 1ef3c88c3730..d37b96f28aa0 100644
--- a/dev-libs/link-grammar/link-grammar-5.8.0.ebuild
+++ b/dev-libs/link-grammar/link-grammar-5.8.0.ebuild
@@ -13,7 +13,7 @@ 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"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
 IUSE="aspell +hunspell java python" # pcre
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"