From 623ee73d661e5ed8475cb264511f683407d87365 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 12 Apr 2020 03:41:30 +0100 Subject: gentoo Easter resync : 12.04.2020 --- dev-python/rdflib/Manifest | 5 +- dev-python/rdflib/metadata.xml | 1 + dev-python/rdflib/rdflib-4.2.2-r1.ebuild | 12 +++-- dev-python/rdflib/rdflib-4.2.2.ebuild | 89 -------------------------------- 4 files changed, 11 insertions(+), 96 deletions(-) delete mode 100644 dev-python/rdflib/rdflib-4.2.2.ebuild (limited to 'dev-python/rdflib') diff --git a/dev-python/rdflib/Manifest b/dev-python/rdflib/Manifest index 53417134342e..e6d08aee59f3 100644 --- a/dev-python/rdflib/Manifest +++ b/dev-python/rdflib/Manifest @@ -1,5 +1,4 @@ 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 2926 BLAKE2B 36fd9a9f9050f90980c4404510d81d6c55ce4ba5fea94ff3323247a2f2062810bf0221c47fcdff1d7febf5dfe224d310d01a484cd7b4e9b0d91ca1d270b35f6e SHA512 e95b0d50573b3c5beb4e5a18a31808315e8e5f86807032b781c406c19b9cbfab3433abe756c1a3bd03e972f4a7e86894c52f35e1bb9db85e1a09d85a318fc993 -EBUILD rdflib-4.2.2.ebuild 2739 BLAKE2B d348c421d5a1e424aeb1f772dd0967a2eec60eb990060ccb55effa23ec656ffd4b275bd54012c5293835b117176123ba761e300a856c0c5c372e671c996fca80 SHA512 41ba10ea7872faa6ef7881558bea587f0bb7caf4d47dd00c25fbf6a9dcf28768908dda4748a4365cbf9a2701bd1515d280f8a1df6c6e0d0f5915cbb12ec400df -MISC metadata.xml 462 BLAKE2B a2b02fb03f0966423a2354b593cee26c55aca5d28df913d6bbe9ba0731b093c5499568829736b86d8440c173f40059041905fe49e0a7de3cc5df32ae186241ff SHA512 d9b717e12472862a9071d3d2ad3efffcc053f6890a9a307f882040f77e7304addf30fdceaf94b9a752de5daaf7eae21a68d39311f9997bc1e99c598b5093fd78 +EBUILD rdflib-4.2.2-r1.ebuild 2919 BLAKE2B 4cf1660182b69818657ee0748a5a47c747a298dd786c92cdc812d2b206e08d0a62a0a185dcd013ca30238ca5e9453c7ce0c6024a822fc6c5332a0cd5f1041022 SHA512 a11e6da10b70462b8f02482f971bb61911f2b155281420339ae5e925c8534f08bdafff747fd9cb998dde024ce60455b11e58709d9bf706907ef8d74e85688442 +MISC metadata.xml 487 BLAKE2B 6ea6370e51bf11be515d0f860bd4ebdd0ed57b3975a3e2bbd0912a91da824378b84d67cafd3bef185178aa88eb29aa6c389d99c87b5cca469b7b04ac91b2d10c SHA512 3e2ac7fdca434ecc3dc2e53323af84f0f272b402bff973a04c78c04c02dd3fcb9bc4ebfe586c0d2e72e565ce3bc948a2bfd0c876acfd76b11c5dba3bb34a3ab0 diff --git a/dev-python/rdflib/metadata.xml b/dev-python/rdflib/metadata.xml index 0f9dc9bd02e5..c27203b015b9 100644 --- a/dev-python/rdflib/metadata.xml +++ b/dev-python/rdflib/metadata.xml @@ -5,6 +5,7 @@ python@gentoo.org Python + enable support for Redland triplestore diff --git a/dev-python/rdflib/rdflib-4.2.2-r1.ebuild b/dev-python/rdflib/rdflib-4.2.2-r1.ebuild index 46e365c58b22..0419b92a0ab8 100644 --- a/dev-python/rdflib/rdflib-4.2.2-r1.ebuild +++ b/dev-python/rdflib/rdflib-4.2.2-r1.ebuild @@ -3,6 +3,7 @@ EAPI=7 +DISTUTILS_USE_SETUPTOOLS=rdepend PYTHON_COMPAT=( python{2_7,3_{6,7}} ) PYTHON_REQ_USE="sqlite?,threads(+)" @@ -17,7 +18,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="doc berkdb examples mysql redland sqlite test" RESTRICT="!test? ( test )" @@ -26,10 +27,13 @@ RDEPEND=" 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*')] ) - redland? ( dev-libs/redland-bindings[python,$(python_gen_usedep 'python2*')] )" + mysql? ( + $(python_gen_cond_dep ' + dev-python/mysql-python[${PYTHON_USEDEP}] + ' -2) + ) + redland? ( dev-libs/redland-bindings[python,${PYTHON_USEDEP}] )" DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}] doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) test? ( dev-python/sparql-wrapper[${PYTHON_USEDEP}] diff --git a/dev-python/rdflib/rdflib-4.2.2.ebuild b/dev-python/rdflib/rdflib-4.2.2.ebuild deleted file mode 100644 index ed7ae1aa7467..000000000000 --- a/dev-python/rdflib/rdflib-4.2.2.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python{2_7,3_6} ) -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 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/. ) - if use examples ; then - docinto examples - dodoc -r examples/. - fi - - distutils-r1_python_install_all -} -- cgit v1.2.3