gentoo resync : 25.08.2020

5 files changed, 3 insertions, 174 deletions

diff --git a/dev-python/rdflib/Manifest b/dev-python/rdflib/Manifest
index 8e25086630d8..53766f9324a6 100644
--- a/dev-python/rdflib/Manifest
+++ b/dev-python/rdflib/Manifest
@@ -1,6 +1,3 @@
-AUX rdflib-4.2.2-python3.7-StopIteration.patch 2064 BLAKE2B f9a646703c9f3a0e0767739d171c0649c855354484699f46d4f5a3d9a73979b54d2953ccff3a9d5f85ce1a26f5af2cab87fc24fb25af10a952eccba0d076a0db SHA512 99d28c46f8b857074d111ba09db3f5afe1f7ef1e5970d7c539e9c0f309ab6781ab432a3315a3a2cfe473e0eb38a4df9e81b8185bde1541de74dcc0a739871364
-DIST rdflib-4.2.2.tar.gz 905094 BLAKE2B fe17b5752f67c745bfdf4a160c2f5d49da19f0d85b6eddc4a65fa0ddb660de8bcc19c3ccecf893fb67f725b973cb94481374d9ee0c82072416a93e44952dba9b SHA512 efc24d8ce1080e59950cecc9c779ae0d63673c8690f74db1772f6c2dbf24d6f4de5214d5870a074bffe549b42d8d5f5d131df29bbfd174b763ae1f843aec7d5c
 DIST rdflib-5.0.0.tar.gz 818586 BLAKE2B d0046590b00211ccb4f0f586dc829c061a5f426b1cefed44a63d21d46396354b9012dbe0a63c8f9de138b25ca7d73ba624c49da6fb305ececd983c62c917fd8a SHA512 ba98ab6a7bb9d993d11c559a739761f297282eb9307f3e333db8dd1c6b365b408a59b701d823bef9be774a59b3f44f64c9444e3bb0115c0c549cb00945385dab
-EBUILD rdflib-4.2.2-r1.ebuild 2646 BLAKE2B 200438df7ee74d82c83727e877f5226970a56c20b8d4da2907089f9d7dd127e90c185497a87fab1faef8b4b563b9df5e403083890879a9566e91977f3c57b2a7 SHA512 67386d00225887ebc55275080672de3bb83830c1848dc6aa6f5e05bc774750e17683beeb45604aabf3aa32a30186b255467b9915605813ccf8ae0be52574d37c
-EBUILD rdflib-5.0.0.ebuild 1209 BLAKE2B e95dc1f09551b279076d5b2fce01df9772ec29b30a96786d04959f43cbbcd90c360409a15077f95629b49cd00cb1c6dc438ac6e7f958d4e497caeddd5124d980 SHA512 f85beda0c258d8cdbbdc672f5755436b2be2e3d50d289d1b66846cdba5bb6dbe2765e8eebbdc034b30603726a400606dc95feb1980dceb17b4ea5d837a62b6fd
-MISC metadata.xml 487 BLAKE2B 6ea6370e51bf11be515d0f860bd4ebdd0ed57b3975a3e2bbd0912a91da824378b84d67cafd3bef185178aa88eb29aa6c389d99c87b5cca469b7b04ac91b2d10c SHA512 3e2ac7fdca434ecc3dc2e53323af84f0f272b402bff973a04c78c04c02dd3fcb9bc4ebfe586c0d2e72e565ce3bc948a2bfd0c876acfd76b11c5dba3bb34a3ab0
+EBUILD rdflib-5.0.0.ebuild 1202 BLAKE2B 4726ba9a743e5b574f51778f04871ee0a3933d541435163b764ff6da9a93246a8cec62664beff938d99cd2f339a8585d2c9777f8e4762213b8e16714481d42c9 SHA512 df25ff02eae2e4bf21eb70077ed3ca363287ab1258e5f465114f485dc4fe9dbed866bdbacc48e708494c6eda788ad6c0d985f70edf54daa28751fc154d53aa2e
+MISC metadata.xml 399 BLAKE2B e2869846251c99bd7ad7811f6f3831916f230f3e19b62eb17b19b28f94b5d3422c31a6b71e1231768489ea625a52b0e0b4d145e19a02cdd57d22be2e2ece85f7 SHA512 ae939728cb382dac06c8c76ce2907bcdc53dc5ab5dd934a9278a3826d1cec5e8158cb2685c2410c808269f04019d47c40db37eb8e27d0593a2e669575ac4679e
diff --git a/dev-python/rdflib/files/rdflib-4.2.2-python3.7-StopIteration.patch b/dev-python/rdflib/files/rdflib-4.2.2-python3.7-StopIteration.patch
deleted file mode 100644
index 389d220dc1b7..000000000000
--- a/dev-python/rdflib/files/rdflib-4.2.2-python3.7-StopIteration.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-Traceback (most recent call last):
-  File "/var/tmp/portage/dev-python/rdflib-4.2.2/work/rdflib-4.2.2-python3_7/build/src/rdflib/plugins/sparql/evaluate.py", line 330, in evalSlice
-    next(res)
-StopIteration
-
-The above exception was the direct cause of the following exception:
-
-Traceback (most recent call last):
-  File "/usr/lib/python3.7/site-packages/nose/case.py", line 197, in runTest
-    self.test(*self.arg)
-  File "/var/tmp/portage/dev-python/rdflib-4.2.2/work/rdflib-4.2.2-python3_7/build/src/test/test_dawg.py", line 434, in query_test
-    set(res2)
-  File "/var/tmp/portage/dev-python/rdflib-4.2.2/work/rdflib-4.2.2-python3_7/build/src/rdflib/query.py", line 258, in __iter__
-    for b in self._genbindings:
-RuntimeError: generator raised StopIteration
-
-Patch backported from
-https://github.com/RDFLib/rdflib/commit/58c45d6f30af88a22f60edcb9a459648a885e226
-
---- a/rdflib/plugins/sparql/evaluate.py
-+++ b/rdflib/plugins/sparql/evaluate.py
-@@ -15,6 +15,7 @@
- """
- 
- import collections
-+import itertools
- 
- from rdflib import Variable, Graph, BNode, URIRef, Literal
- 
-@@ -323,22 +324,9 @@
- 
- 
- def evalSlice(ctx, slice):
--    # import pdb; pdb.set_trace()
-     res = evalPart(ctx, slice.p)
--    i = 0
--    while i < slice.start:
--        res.next()
--        i += 1
--    i = 0
--    for x in res:
--        i += 1
--        if slice.length is None:
--            yield x
--        else:
--            if i <= slice.length:
--                yield x
--            else:
--                break
-+
-+    return itertools.islice(res, slice.start, slice.start+slice.length if slice.length is not None else None)
- 
- 
- def evalReduced(ctx, part):
---- a/rdflib/query.py
-+++ b/rdflib/query.py
-@@ -1,5 +1,6 @@
- 
- import os
-+import itertools
- import shutil
- import tempfile
- import warnings
-@@ -181,7 +182,7 @@
-         return self._bindings
- 
-     def _set_bindings(self, b):
--        if isinstance(b, types.GeneratorType):
-+        if isinstance(b, (types.GeneratorType, itertools.islice)):
-             self._genbindings = b
-             self._bindings = []
-         else:
diff --git a/dev-python/rdflib/metadata.xml b/dev-python/rdflib/metadata.xml
index c27203b015b9..b6848176643d 100644
--- a/dev-python/rdflib/metadata.xml
+++ b/dev-python/rdflib/metadata.xml
@@ -6,9 +6,6 @@
     <name>Python</name>
   </maintainer>
   <stabilize-allarches/>
-  <use>
-    <flag name="redland">enable support for Redland triplestore</flag>
-  </use>
   <upstream>
     <remote-id type="pypi">rdflib</remote-id>
     <remote-id type="github">RDFLib/rdflib</remote-id>
diff --git a/dev-python/rdflib/rdflib-4.2.2-r1.ebuild b/dev-python/rdflib/rdflib-4.2.2-r1.ebuild
deleted file mode 100644
index a6eb50c7d38a..000000000000
--- a/dev-python/rdflib/rdflib-4.2.2-r1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6..9} )
-PYTHON_REQ_USE="sqlite?,threads(+)"
-
-# The usual required for tests
-DISTUTILS_IN_SOURCE_BUILD=1
-
-inherit distutils-r1
-
-DESCRIPTION="RDF library containing a triple store and parser/serializer"
-HOMEPAGE="https://github.com/RDFLib/rdflib https://pypi.org/project/rdflib/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="doc berkdb examples redland sqlite test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/isodate[${PYTHON_USEDEP}]
-	dev-python/html5lib[${PYTHON_USEDEP}]
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-	berkdb? ( dev-python/bsddb3[${PYTHON_USEDEP}] )
-	redland? ( dev-libs/redland-bindings[python,${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		dev-python/sparql-wrapper[${PYTHON_USEDEP}]
-		>=dev-python/nose-1.3.1-r1[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	# Python 3.7 StopIteration bug
-	"${FILESDIR}"/${PN}-4.2.2-python3.7-StopIteration.patch
-)
-
-python_prepare_all() {
-	# Upstream manufactured .pyc files which promptly break distutils' src_test
-	find -name "*.py[oc~]" -delete || die
-
-	# Bug 358189; take out tests that attempt to connect to the network
-	sed -e "/'--with-doctest',/d" -e "/'--doctest-extension=.doctest',/d" \
-		-e "/'--doctest-tests',/d" -i run_tests.py || die
-
-	sed -e "s: 'sphinx.ext.intersphinx',::" -i docs/conf.py || die
-
-	# doc build requires examples folder at the upper level of docs
-	if use doc; then
-		cd docs || die
-		ln -sf ../examples . || die
-		cd ../ || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	# https://github.com/RDFLib/rdflib/issues/510
-	if use doc; then
-		einfo ""
-		einfo "Several warnings and Errors present in the build"
-		einfo "For a complete build, it is required to install"
-		einfo "github.com/gjhiggins/n3_pygments_lexer and"
-		einfo "github.com/gjhiggins/sparql_pygments_lexer"
-		einfo "outside portage via pip or by cloning. These have not been"
-		einfo "given a tagged release by the author and are not in portage"
-		einfo ""
-
-		emake -C docs html
-		HTML_DOCS=( docs/_build/html/. )
-	fi
-}
-
-python_test() {
-	pushd "${BUILD_DIR}/src/" >/dev/null || die
-	"${EPYTHON}" ./run_tests.py -v || die "Tests failed under ${EPYTHON}"
-	popd >/dev/null || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-python/rdflib/rdflib-5.0.0.ebuild b/dev-python/rdflib/rdflib-5.0.0.ebuild
index ee3a9c338a1e..d7c55570274b 100644
--- a/dev-python/rdflib/rdflib-5.0.0.ebuild
+++ b/dev-python/rdflib/rdflib-5.0.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="berkdb examples sqlite"
 
 RDEPEND="