gentoo Easter resync : 12.04.2020

4 files changed, 56 insertions, 8 deletions

diff --git a/dev-python/vcrpy/Manifest b/dev-python/vcrpy/Manifest
index 1e045d17d3b1..3974dbedac2d 100644
--- a/dev-python/vcrpy/Manifest
+++ b/dev-python/vcrpy/Manifest
@@ -1,6 +1,8 @@
 AUX vcrpy-skip-network-tests.patch 772 BLAKE2B d98c50fde4e3df3d4e62285e9136061b877e632153c6a6ed35fc84734c3f2d744ee030930253655954bd25d334f87c1e9518fa1fd86a56b7c7b606b7ef7aa11c SHA512 90cd2cc3a89a7019b88687a54016deea9dd60cd1d80f0511f58d25efa7ad24ecaedf8e1187e3455bd7cdd88a4506787867fb04027e638ab66672cfd809ba6787
 DIST vcrpy-1.11.1.tar.gz 63122 BLAKE2B da0fabb1eb342eb268923bcf433ac108d06fc111714834e99d9364358064ad0814bff1463f49bea60c59fe901c46fc8b78c4129e9bb4ab6736266f18b3bdf272 SHA512 d883b87d5b3017843dfc2e33241953ada27d50ffda4936ba4326a392acb9c7667474abd054d6e44b0208096cd96b68e87ec9780c0d6fab77369cc4e517617395
 DIST vcrpy-1.12.0.tar.gz 326731 BLAKE2B a0fd5aa3fea1bef336f0864a6d89e7025d2394f89af23ac9a3ed61430c85b9a46584c528398a03debcce646767bd85328360513476bc89ca067e705767fe85fd SHA512 c47d50cd399fa11eb6fd1d210b056ef9768e501799a9774f7338370177754e35b9a9ee43ff5cb7f1f43073624f9011cc1ca230dbdf317c1bccd0ec6b506c61e0
-EBUILD vcrpy-1.11.1.ebuild 1264 BLAKE2B 532418fddc8df8eed6b405cb6a67a4ccdcb7a86d9c463b06607e05bddfe90ad71c5312b2a7090531ba4efd2597c811cc5007aa6ea4b3e1c6f54d46131a396563 SHA512 cdb7670a116db3f925551958b4edf6f1b06b489df1d61cdd6b52297346f84bb198b144f88fa5d839c2c2a8ff4b7bd047573342ae7e098ecda503f97344c6e6f9
-EBUILD vcrpy-1.12.0.ebuild 1268 BLAKE2B 64c78ce41b75151ff4ca9ece01f7be8595fa33227a36350691b39e2efcba2bd6f81ef235c5e2ad4f43e4fb20e4e4f36fbf5c3dc5c17999cb8c294c5a1c3795f4 SHA512 e5d8cde610aea9e079afe5593c38502ad838f3ea627c30dc4350a995dc450a1b049e063252be21046006b47a0fbc1d0900d918020d805ce8f4bac345f851745b
+DIST vcrpy-4.0.2.tar.gz 324196 BLAKE2B 8910ba40bd56c7836a92c120c480e633063c78beb1d7c4dcfffb6180135cf0e28586410307ba3e19b3fa484a72a176dbf877f781ade7bae7c81110fde2eedd32 SHA512 17eebc9574ff14f97ad200b99c50b0440a93fbf38afe8ad95f443370d84c43177ac55ab655ffea7e7985b0cd76124eff3c394898e71a0ba0c434014f07e526f9
+EBUILD vcrpy-1.11.1.ebuild 1083 BLAKE2B 4940a8e1dd2bc5de7e43b6e955e18c45a200726e663d8e4a6e1f0aea63ef6ec28f2dd1adcb7375dae244b35031023ec58355dc1c88b63da58de92ef7240934b0 SHA512 b6877466d1e2fbf37e197bee79e907f1c43b885346756b010f0835e91a8efac45dbda0114b9614510ef0c695933ba8c22658b14fe05654bc7bc3c116749fe9dd
+EBUILD vcrpy-1.12.0.ebuild 1085 BLAKE2B d719679652d355f5226fa61a94101145d68d118afb8cac26b33596028101cb5baedbce76b69b8bc5a95a9ce13b124e1d3e969a5b3b845a5e63379538b2b5b0dc SHA512 912e325a5da3b02a833f1a7f47c7d57fd77666bccf9884cbf28e350ada0219a38636d3ad9a8b7db279bb4d90c7d8e8323d6134a3c2d17f0e29fbaf45cc1a473f
+EBUILD vcrpy-4.0.2.ebuild 1368 BLAKE2B ceb77e3f1c80af49b226300fe2211d286f6be52f6ca94b2e7a3c27e6cb036feb0bb24645814c1d76310b6fb6a82f218ca02cf41f19e815ef6a886fce1025936e SHA512 47b6dce5a8ed61c5eb467f1ee7c05cf0bed0c36f0be236ea7e061c9f426544791b1566da102bb3721215e8e984e9697e8c764a858873509bcd85426a62eb05e2
 MISC metadata.xml 363 BLAKE2B e447766d191bb1c155e27a7b892fd38df143e2bb0f45be8b635df6bcef92f6f292db010b22659d0e699f3f333f84d0be24d3c9a293e1a2f00f641e21a356daa3 SHA512 7cb4c7132da46b1a34425492476204519a02b71643cdb6dffbda39281ada4a55b45577707076783add52639ff5993f0c90c48713b94ca1230eb3559ad1207804
diff --git a/dev-python/vcrpy/vcrpy-1.11.1.ebuild b/dev-python/vcrpy/vcrpy-1.11.1.ebuild
index f182ecabe7bc..dd4a33310f3f 100644
--- a/dev-python/vcrpy/vcrpy-1.11.1.ebuild
+++ b/dev-python/vcrpy/vcrpy-1.11.1.ebuild
@@ -25,9 +25,7 @@ RDEPEND="
 	>=dev-python/six-1.5[${PYTHON_USEDEP}]
 	dev-python/urllib3[${PYTHON_USEDEP}]
 	dev-python/wrapt[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
-	$(python_gen_cond_dep 'dev-python/contextlib2[${PYTHON_USEDEP}]' python2_7)
-	$(python_gen_cond_dep 'dev-python/yarl[${PYTHON_USEDEP}]' python3*)
+	dev-python/yarl[${PYTHON_USEDEP}]
 	"
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/vcrpy/vcrpy-1.12.0.ebuild b/dev-python/vcrpy/vcrpy-1.12.0.ebuild
index bcb7fd86c25a..3c66980bdd30 100644
--- a/dev-python/vcrpy/vcrpy-1.12.0.ebuild
+++ b/dev-python/vcrpy/vcrpy-1.12.0.ebuild
@@ -25,9 +25,7 @@ RDEPEND="
 	>=dev-python/six-1.5[${PYTHON_USEDEP}]
 	dev-python/urllib3[${PYTHON_USEDEP}]
 	dev-python/wrapt[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
-	$(python_gen_cond_dep 'dev-python/contextlib2[${PYTHON_USEDEP}]' python2_7)
-	$(python_gen_cond_dep 'dev-python/yarl[${PYTHON_USEDEP}]' 'python3*')
+	dev-python/yarl[${PYTHON_USEDEP}]
 	"
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/vcrpy/vcrpy-4.0.2.ebuild b/dev-python/vcrpy/vcrpy-4.0.2.ebuild
new file mode 100644
index 000000000000..fb8450ac4bb6
--- /dev/null
+++ b/dev-python/vcrpy/vcrpy-4.0.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Automatically mock your HTTP interactions to simplify and speed up testing"
+HOMEPAGE="https://github.com/kevin1024/vcrpy"
+#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/kevin1024/vcrpy/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	>=dev-python/six-1.5[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]
+	dev-python/wrapt[${PYTHON_USEDEP}]
+	dev-python/yarl[${PYTHON_USEDEP}]
+	"
+BDEPEND="
+	test? (
+		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# tests requiring Internet
+	rm tests/integration/test_aiohttp.py || die
+	sed -e 's:test_flickr_should_respond_with_200:_&:' \
+		-e 's:test_amazon_doctype:_&:' \
+		-i tests/integration/test_wild.py || die
+	sed -e 's:testing_connect:_&:' \
+		-i tests/unit/test_stubs.py || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local -x REQUESTS_CA_BUNDLE=$("${EPYTHON}" -m pytest_httpbin.certs)
+	pytest -vv || die "Tests fail with ${EPYTHON}"
+}