gentoo resync : 15.01.2020

4 files changed, 6 insertions, 94 deletions

diff --git a/dev-python/rdflib/Manifest b/dev-python/rdflib/Manifest
index 5ca3570b8963..ebd3f133be29 100644
--- a/dev-python/rdflib/Manifest
+++ b/dev-python/rdflib/Manifest
@@ -1,7 +1,5 @@
 AUX rdflib-4.2.2-python3.7-StopIteration.patch 2064 BLAKE2B f9a646703c9f3a0e0767739d171c0649c855354484699f46d4f5a3d9a73979b54d2953ccff3a9d5f85ce1a26f5af2cab87fc24fb25af10a952eccba0d076a0db SHA512 99d28c46f8b857074d111ba09db3f5afe1f7ef1e5970d7c539e9c0f309ab6781ab432a3315a3a2cfe473e0eb38a4df9e81b8185bde1541de74dcc0a739871364
-DIST rdflib-4.2.1.tar.gz 889467 BLAKE2B cc5f675646ca7a55ff40d4d98eb138953d8763d8b44b5b495cdc9bb83df16d425214bb681f8f841e053a3cb4d52edd30988afcf2c301a96f699a70d9c129cca5 SHA512 49145f80a9e027847523faed059c16ec1de358bb9d8fc3ab4fd3bf95a88dd181986b1785deedf6e837cf0b064bd74ab8e27fbb5581e33310353da3546ae7b016
 DIST rdflib-4.2.2.tar.gz 905094 BLAKE2B fe17b5752f67c745bfdf4a160c2f5d49da19f0d85b6eddc4a65fa0ddb660de8bcc19c3ccecf893fb67f725b973cb94481374d9ee0c82072416a93e44952dba9b SHA512 efc24d8ce1080e59950cecc9c779ae0d63673c8690f74db1772f6c2dbf24d6f4de5214d5870a074bffe549b42d8d5f5d131df29bbfd174b763ae1f843aec7d5c
-EBUILD rdflib-4.2.1.ebuild 2704 BLAKE2B 946b757dad1c44007504df4402631fc4eb3dd49b451f6b3396ca6554ca3129949c0bcb0cf20311c0a692f957de829a5e0491de7ae616036ddb9f44cb8670c90a SHA512 08d1a8c2a33c6fabfae421f8aebcc35addec3f7b90f38c3b5614e1516286199cb4cc1f50faee471fce52a4574232f63938925a572db082612a4682729d10b607
-EBUILD rdflib-4.2.2-r1.ebuild 2928 BLAKE2B c0f0f610ba6e9ea9b0e1f14e26c3bf5083d18b97ab0a0e191b449f937626d7afe4b518fd3b0f33347fba43e6b8c35ff08bc0a601d3ccd9d1eb70cbe431351ccb SHA512 50f12dfde99d0b42ccb08feb3d59ca89f6368d57abc830a32b1399759a70f233f676572bfed2c8c0af41d6fd79bbea1964fa45475c956387c7bc8c22ac067392
-EBUILD rdflib-4.2.2.ebuild 2742 BLAKE2B b27f77ac4338c4c6889425f4f433690447443830e064c600deb7bf1e83ece4a3bace0c3b4448b67a0918e1303bc2f6eafaae2f46717c2207ff6a131628dfefd9 SHA512 1f2847db3988678f06691915f57e3a8e7f325cee22086d262c1fdd52b827f68e351a358167fe1b190a926ac7ec23757150bbf1bd3cf79eb4217a2ecef6156dbc
+EBUILD rdflib-4.2.2-r1.ebuild 2926 BLAKE2B 36fd9a9f9050f90980c4404510d81d6c55ce4ba5fea94ff3323247a2f2062810bf0221c47fcdff1d7febf5dfe224d310d01a484cd7b4e9b0d91ca1d270b35f6e SHA512 e95b0d50573b3c5beb4e5a18a31808315e8e5f86807032b781c406c19b9cbfab3433abe756c1a3bd03e972f4a7e86894c52f35e1bb9db85e1a09d85a318fc993
+EBUILD rdflib-4.2.2.ebuild 2738 BLAKE2B d9d30ba77a826fc1f90e6f3fad749b9d610d1f1729fd6a9aa53d75bc6c35244213cccebe7a53eaa3af987e69177f083d585d661003832a017f1f65971485d299 SHA512 55abb2a4b0a466ab0ebec68a1db0d31731b8ead16ae37eb544cdec3929e922e796feee1f4851ff05a39de481b4c10cef028407a9c02328dea784ff7013291892
 MISC metadata.xml 462 BLAKE2B a2b02fb03f0966423a2354b593cee26c55aca5d28df913d6bbe9ba0731b093c5499568829736b86d8440c173f40059041905fe49e0a7de3cc5df32ae186241ff SHA512 d9b717e12472862a9071d3d2ad3efffcc053f6890a9a307f882040f77e7304addf30fdceaf94b9a752de5daaf7eae21a68d39311f9997bc1e99c598b5093fd78
diff --git a/dev-python/rdflib/rdflib-4.2.1.ebuild b/dev-python/rdflib/rdflib-4.2.1.ebuild
deleted file mode 100644
index eb48466e8ea6..000000000000
--- a/dev-python/rdflib/rdflib-4.2.1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_5} )
-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 ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="doc berkdb examples mysql 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}] )
-	mysql? ( dev-python/mysql-python[$(python_gen_usedep python2_7)] )
-	redland? ( dev-libs/redland-bindings[python,$(python_gen_usedep python2_7)] )"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/sparql-wrapper[${PYTHON_USEDEP}]
-		>=dev-python/nose-1.3.1-r1[${PYTHON_USEDEP}] )"
-
-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
-	fi
-}
-
-python_test() {
-	# the default; nose with: --where=./ does not work for python3
-	if python_is_python3; then
-		pushd "${BUILD_DIR}/src/" > /dev/null
-		"${PYTHON}" ./run_tests.py || die "Tests failed under ${EPYTHON}"
-		popd > /dev/null
-	else
-		"${PYTHON}" ./run_tests.py || die "Tests failed under ${EPYTHON}"
-	fi
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	use examples && local EXAMPLES=( examples/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/rdflib/rdflib-4.2.2-r1.ebuild b/dev-python/rdflib/rdflib-4.2.2-r1.ebuild
index e933d39cedfa..46e365c58b22 100644
--- a/dev-python/rdflib/rdflib-4.2.2-r1.ebuild
+++ b/dev-python/rdflib/rdflib-4.2.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 PYTHON_REQ_USE="sqlite?,threads(+)"
 
 # The usual required for tests
diff --git a/dev-python/rdflib/rdflib-4.2.2.ebuild b/dev-python/rdflib/rdflib-4.2.2.ebuild
index 53e245c83d46..a76252e0beca 100644
--- a/dev-python/rdflib/rdflib-4.2.2.ebuild
+++ b/dev-python/rdflib/rdflib-4.2.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 PYTHON_REQ_USE="sqlite?,threads(+)"
 
 # The usual required for tests