gentoo resync : 02.08.2019

4 files changed, 42 insertions, 36 deletions

diff --git a/dev-python/jsonrpclib/Manifest b/dev-python/jsonrpclib/Manifest
index 25675f0d122f..cf46ed621f8e 100644
--- a/dev-python/jsonrpclib/Manifest
+++ b/dev-python/jsonrpclib/Manifest
@@ -1,6 +1,6 @@
 DIST jsonrpclib-0.3.1.tar.gz 42704 BLAKE2B e3c83bb25ec83a93fdde8f6f4b8b18de0d0ddd0cc35c04f9f83b1f0e75803211a6f6b85768b0c7f9de4bcac18df721df8057148aa7aa0628dd1d345c2e4d90e1 SHA512 7cd44d44f3952ee7ac4006904427ddd3a69b60e6a0a4eaff4b75d03b1c30f7a65debd69552035a4ee375a33c80ec428fc1ef10979f55316bcfd015603c62304f
-DIST jsonrpclib-0_pre20110820.tar.bz2 14608 BLAKE2B 1cc7fea4984009c1c21d9dfd9cabec10d48406294262b973dcf5f3d3148fc74be5f201ee11c91600e7b6679dbd5716d197d727c89da738d2dc54aa9a0e1dec82 SHA512 80864890982c4a11996cd9fae21029cdf40b089eb6c2d265c645f52fe0a6e858b3405c5d899d2a5908527da04263d93064f365c5308adda1791105bf32329b71
+DIST jsonrpclib-0.4.0.tar.gz 57944 BLAKE2B 3458aee2dc27980ef93d7ae650f7d7485983598c8276f08b104a5b44d5dfb8f6225ba649dc7f6537fa66f6ba86d7082e11e23c7ca051c876a96d1b25efa4fa0e SHA512 357743e34447cd6dbe330c5adfa5541134a0ff8d82549ec47ed741ddf54a7aabb8cd417c501cb9ab814ce2cb90e1c2d4d4f21daac3b379f38be03c38a7ed198b
 EBUILD jsonrpclib-0.3.1.ebuild 702 BLAKE2B c9e86bac9f0c65a7b8cd5a9f248ccd4bb727cf704a8659c80a3a28efd99d81725ac0c1d46f893b5488f705fef4607f05f99b55aa1e0e83deaf2f988fb06a115c SHA512 631ab17f22389cf551882021db4cd20ced366f7d21e28b06d370f2e677cb17af2163a29d7c063e39269726e734d152b6ae58071fa1f2b1edb0cc403da78420fc
-EBUILD jsonrpclib-0_pre20110820-r1.ebuild 573 BLAKE2B d78437cbefdcc6f269bcc1139deeb82a7ad2c96bd4313851d57aca21635a7fd784545f9487ccfa1eacf74f093e80d76294b697a85004e7e6f0ce094b045d6995 SHA512 10a9c32643d393ff9f857eb2d48d708d1635cc52d3369bac0abe05d0cb29b67295d49126380f5c880dd61d83e0676a1934a9610e95c8a0217e1e920964b1b800
-EBUILD jsonrpclib-9999.ebuild 705 BLAKE2B c0c7f0bf81c8bfee7054e19c338ffecea958330eed764674db09289d46d8ee6f3c64fa5ebe219185a10d7a8c941c13fd79798d9eda080566af9315dd9629eb1d SHA512 fd2beba3a9c92c509a3b3451b95a56da3949361d0452ccaa832027507f671678e2c32a7025ca061a58730edd3b6e1ab82cdde9b37360da2951d536d3084f432e
+EBUILD jsonrpclib-0.4.0.ebuild 766 BLAKE2B a2a5bf75799f123d6eed077e2e11a86dea6c284ec32b4a6a213a58dee0c494687bbbb24b950bac2b9e54ac0465d5aeaf3926e17cd0ca81b46263c9d4d6800cc9 SHA512 c9707058624093b11e8c8b4f9e1d9153da6301d0af4842f57a0c9d107796e7c4c5ef571f31b560cd5fe294c2d01d8bf5073b09f2abb5d22d294e70db5301dbef
+EBUILD jsonrpclib-9999.ebuild 766 BLAKE2B a2a5bf75799f123d6eed077e2e11a86dea6c284ec32b4a6a213a58dee0c494687bbbb24b950bac2b9e54ac0465d5aeaf3926e17cd0ca81b46263c9d4d6800cc9 SHA512 c9707058624093b11e8c8b4f9e1d9153da6301d0af4842f57a0c9d107796e7c4c5ef571f31b560cd5fe294c2d01d8bf5073b09f2abb5d22d294e70db5301dbef
 MISC metadata.xml 453 BLAKE2B 852b07f16a1773b07d2efebb8bb338c972a807fe2c7cb99fdfe62a2c6cdcb63098b9b76a2e9173af8f397ab5aea724732296882689fa42dd66381543d84246b8 SHA512 5ecbc0cc593546cfc7bb86cb789df99aa25e38c215971c35e0dab83d6134348f591db126f62f4a578728922b2aaad0d664b797edd85324b51c6b9e6ec0cd264e
diff --git a/dev-python/jsonrpclib/jsonrpclib-0.4.0.ebuild b/dev-python/jsonrpclib/jsonrpclib-0.4.0.ebuild
new file mode 100644
index 000000000000..c7b359ea5372
--- /dev/null
+++ b/dev-python/jsonrpclib/jsonrpclib-0.4.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit distutils-r1
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/tcalmant/jsonrpclib.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/tcalmant/jsonrpclib/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~mips ~x86"
+fi
+
+DESCRIPTION="python implementation of the JSON-RPC spec (1.0 and 2.0)"
+HOMEPAGE="https://github.com/tcalmant/jsonrpclib"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-python/simplejson[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND} )"
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/jsonrpclib/jsonrpclib-0_pre20110820-r1.ebuild b/dev-python/jsonrpclib/jsonrpclib-0_pre20110820-r1.ebuild
deleted file mode 100644
index 1d9c9ecb9b6a..000000000000
--- a/dev-python/jsonrpclib/jsonrpclib-0_pre20110820-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/joshmarshall/jsonrpclib.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://gentoo/${P}.tar.bz2"
-	KEYWORDS="amd64 arm x86"
-fi
-
-DESCRIPTION="python implementation of the JSON-RPC spec (1.0 and 2.0)"
-HOMEPAGE="https://github.com/joshmarshall/jsonrpclib"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	dev-python/simplejson"
diff --git a/dev-python/jsonrpclib/jsonrpclib-9999.ebuild b/dev-python/jsonrpclib/jsonrpclib-9999.ebuild
index 8744005ec438..c7b359ea5372 100644
--- a/dev-python/jsonrpclib/jsonrpclib-9999.ebuild
+++ b/dev-python/jsonrpclib/jsonrpclib-9999.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 
 inherit distutils-r1
 
@@ -19,12 +19,13 @@ HOMEPAGE="https://github.com/tcalmant/jsonrpclib"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE=""
+IUSE="test"
+RESTRICT="!test? ( test )"
 
-DEPEND=""
-RDEPEND="${DEPEND}
-	dev-python/simplejson"
+RDEPEND="dev-python/simplejson[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND} )"
 
 python_test() {
-	esetup.py test || die "tests failed with ${EPYTHON}"
+	esetup.py test
 }