gentoo resync : 21.06.2020

3 files changed, 56 insertions, 16 deletions

diff --git a/dev-python/rdflib/Manifest b/dev-python/rdflib/Manifest
index 3362ff722365..8e25086630d8 100644
--- a/dev-python/rdflib/Manifest
+++ b/dev-python/rdflib/Manifest
@@ -1,4 +1,6 @@
 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
-EBUILD rdflib-4.2.2-r1.ebuild 2920 BLAKE2B cff4677952fae3d1e7e0535e5678c6700ba3c98b5e8f586880c16de853f392cf2e75037dcbbb2107636ba4b9cffa04c4cb83ebb7615cafd910fc89a0a4c59c57 SHA512 d8a57097c36f2d6a37e5c6a4885cdb3f74955cf6822af87528f2a52ea4ee0ae5fc65f397c8fc32a288071adb4be14cb8d66d8a97b7291d12da11e2fe2ab73be8
+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
diff --git a/dev-python/rdflib/rdflib-4.2.2-r1.ebuild b/dev-python/rdflib/rdflib-4.2.2-r1.ebuild
index 6306fc0eacc7..a6eb50c7d38a 100644
--- a/dev-python/rdflib/rdflib-4.2.2-r1.ebuild
+++ b/dev-python/rdflib/rdflib-4.2.2-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6..9} )
 PYTHON_REQ_USE="sqlite?,threads(+)"
 
 # The usual required for tests
@@ -19,7 +19,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"
-IUSE="doc berkdb examples mysql redland sqlite test"
+IUSE="doc berkdb examples redland sqlite test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -27,11 +27,6 @@ RDEPEND="
 	dev-python/html5lib[${PYTHON_USEDEP}]
 	dev-python/pyparsing[${PYTHON_USEDEP}]
 	berkdb? ( dev-python/bsddb3[${PYTHON_USEDEP}] )
-	mysql? (
-		$(python_gen_cond_dep '
-			dev-python/mysql-python[${PYTHON_USEDEP}]
-		' -2)
-	)
 	redland? ( dev-libs/redland-bindings[python,${PYTHON_USEDEP}] )"
 DEPEND="${RDEPEND}
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
@@ -83,14 +78,9 @@ python_compile_all() {
 }
 
 python_test() {
-	# the default; nose with: --where=./ does not work for python3
-	if python_is_python3; then
-		pushd "${BUILD_DIR}/src/" >/dev/null || die
-		"${EPYTHON}" ./run_tests.py || die "Tests failed under ${EPYTHON}"
-		popd >/dev/null || die
-	else
-		"${EPYTHON}" ./run_tests.py || die "Tests failed under ${EPYTHON}"
-	fi
+	pushd "${BUILD_DIR}/src/" >/dev/null || die
+	"${EPYTHON}" ./run_tests.py -v || die "Tests failed under ${EPYTHON}"
+	popd >/dev/null || die
 }
 
 python_install_all() {
diff --git a/dev-python/rdflib/rdflib-5.0.0.ebuild b/dev-python/rdflib/rdflib-5.0.0.ebuild
new file mode 100644
index 000000000000..ee3a9c338a1e
--- /dev/null
+++ b/dev-python/rdflib/rdflib-5.0.0.ebuild
@@ -0,0 +1,48 @@
+# 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(+)"
+
+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="berkdb examples sqlite"
+
+RDEPEND="
+	dev-python/isodate[${PYTHON_USEDEP}]
+	dev-python/html5lib[${PYTHON_USEDEP}]
+	dev-python/pyparsing[${PYTHON_USEDEP}]
+	berkdb? ( dev-python/bsddb3[${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/requests[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# these tests require internet access
+	sed -i -e '/doctest/d' setup.cfg || die
+	rm test/test_sparql_service.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}