gentoo resync : 14.05.2020

3 files changed, 23 insertions, 25 deletions

diff --git a/dev-python/jsonpickle/Manifest b/dev-python/jsonpickle/Manifest
index 62d1efd20e2c..67104b812f45 100644
--- a/dev-python/jsonpickle/Manifest
+++ b/dev-python/jsonpickle/Manifest
@@ -1,5 +1,5 @@
-DIST jsonpickle-1.2.tar.gz 74693 BLAKE2B 65f9c18b8693351995f84815d27f2d86ab65fe7a620cda0d346b88db56de45ff6aa21b7ae941e8820e16e184d9a5ac55d56caf112f3930083e63b50751fe2dd8 SHA512 0a5bfb2e77175c9174ee1783301c613e25fcfa60f07e610206d1e1e34053e90b21b12bc1b1045dd03ff2d4efe5940d85d852800037ca01397994c022f0ffb2c6
 DIST jsonpickle-1.3.tar.gz 76571 BLAKE2B 797ac90d1aacb620d9917bd2a34dbc960739b29f64d7bc003c934333fc0d836657a4907a965725248b2f9489876ae251440eab3888112f158c28f19e33efe036 SHA512 5e7faa32f4fd2da88d9cfea8c0355121ece12aa1b4434845e6bd679718f433e5c27835b405f833a31d69d09d7a6ae6c3d5e4bf1f6dc9c50c7ff1690cf82271b0
-EBUILD jsonpickle-1.2.ebuild 1464 BLAKE2B c296889e4932cb48a7e07ceb4480280c5f751eac869c0d70923a79758ca407fa0e2432212d269e692164a981c2745e40b097d32fb7042b9d86ec9f25c018fd66 SHA512 5bd82786b9e4260caa244bf9280300069b569eea5765eae0c9a381d3c804da2d4a882cc726a163f97bd8ff205e446f115e5bab896917aefb1c25e63f1a6788f2
-EBUILD jsonpickle-1.3.ebuild 1466 BLAKE2B 4e0200eda66c37038623b40b35bf711c5c768360b3c2cbb95f0624fd33af05bb15ccfc2c128d057d89b061ad3b9d445af79a3584137962a8b66612cfa5c2dd07 SHA512 9be29941dac89798b95e2afa137c2028d646cb340adf526563ea4103b6af6bc54923ac9702c471d2bf38aa183b8c1b8dd2f8513483590e6a0ef808fea135778d
+DIST jsonpickle-1.4.1.tar.gz 104564 BLAKE2B a3ad6f9c712f39153186b6ccdef515581012ad4ba1251dcb094074f2093eb4b158b9357bdf2e8668073cb21dc3bf6dd2fc3a0058c8597252c558a797432068b9 SHA512 ed6bf3472c59ba907a973c5c6f05de13dbfc75eef103796b8f8a63d388f769527f22667ca8761092d1649ff2caf5a73de0593e370df3e7fcabe06e73b265da35
+EBUILD jsonpickle-1.3.ebuild 1464 BLAKE2B c296889e4932cb48a7e07ceb4480280c5f751eac869c0d70923a79758ca407fa0e2432212d269e692164a981c2745e40b097d32fb7042b9d86ec9f25c018fd66 SHA512 5bd82786b9e4260caa244bf9280300069b569eea5765eae0c9a381d3c804da2d4a882cc726a163f97bd8ff205e446f115e5bab896917aefb1c25e63f1a6788f2
+EBUILD jsonpickle-1.4.1-r1.ebuild 1353 BLAKE2B 265b027c26fa62c42f298841d43c07d6c0c9a9cad48e0bc1b254e7a3ef34bbbae235d56c76050368df79a464e476a71ba4172dd8ba311cc7b8cf92f0747fcaec SHA512 8a603c3164544208a3c862e7664cf4f6eb7ac45947a42d896e79a786c69812ffb983f9f90df158ef459b17a1e2b46ef8acf09767760645b18ce888bc7fa19238
 MISC metadata.xml 386 BLAKE2B 486aa3823ac1ae6b816068ae775da293fedab7120df504f2bb64cbbd026e1ad4ac2041acfb48035b5816616dedd46a5f4bedf8c63daad2315727cdbaedcd15ad SHA512 12590542127c674ae6c8123b20ce5c7ed6815f9129eefb95ef3a8c064fdc25477765d397cb7d7e62772475306c0ac7389a7155655576845b936866470302b759
diff --git a/dev-python/jsonpickle/jsonpickle-1.3.ebuild b/dev-python/jsonpickle/jsonpickle-1.3.ebuild
index 5ccef6b5e321..f27e26fe6319 100644
--- a/dev-python/jsonpickle/jsonpickle-1.3.ebuild
+++ b/dev-python/jsonpickle/jsonpickle-1.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/jsonpickle/jsonpickle-1.2.ebuild b/dev-python/jsonpickle/jsonpickle-1.4.1-r1.ebuild
index f27e26fe6319..89fea2e3b88c 100644
--- a/dev-python/jsonpickle/jsonpickle-1.2.ebuild
+++ b/dev-python/jsonpickle/jsonpickle-1.4.1-r1.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
-
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit distutils-r1
 
 DESCRIPTION="Python library for serializing any arbitrary object graph into JSON"
@@ -13,37 +13,35 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
 # There are optional json backends serializer/deserializers in addition to those selected here
 # jsonlib, yajl.
-RDEPEND="dev-python/simplejson[${PYTHON_USEDEP}]
-		dev-python/feedparser[${PYTHON_USEDEP}]
-		dev-python/ujson[${PYTHON_USEDEP}]
-		"
-DEPEND="test? ( ${RDEPEND} )
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+RDEPEND="
+	dev-python/simplejson[${PYTHON_USEDEP}]
+	dev-python/feedparser[${PYTHON_USEDEP}]
+	dev-python/ujson[${PYTHON_USEDEP}]
+"
+# toml via setuptools_scm[toml]
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]"
+
+distutils_enable_sphinx "docs/source"
 
 python_prepare_all() {
-	# Prevent un-needed d'loading during doc build
-	sed -e "s/, 'sphinx.ext.intersphinx'//" -i docs/source/conf.py || die
-	distutils-r1_python_prepare_all
-}
+	# too many dependencies
+	rm tests/pandas_test.py || die
+	sed -e '/pandas/ d' -i tests/runtests.py || die
 
-python_compile_all() {
-	use doc && { python_setup python2_7 && sphinx-build -b html -c docs/source/ docs/source/ docs/source/html || die; }
+	distutils-r1_python_prepare_all
 }
 
 python_test() {
 	# An apparent regression in tests
 	# https://github.com/jsonpickle/jsonpickle/issues/124
 	einfo "testsuite has optional tests for package demjson"
-	${PYTHON} tests/runtests.py || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/source/html/. )
-	distutils-r1_python_install_all
+	"${EPYTHON}" tests/runtests.py || die "tests failed with ${EPYTHON}"
 }