gentoo (leap year) resync : 29.02.2020

4 files changed, 48 insertions, 44 deletions

diff --git a/dev-python/requests-mock/Manifest b/dev-python/requests-mock/Manifest
index e101ca8b3c8b..a10b5a9adfa4 100644
--- a/dev-python/requests-mock/Manifest
+++ b/dev-python/requests-mock/Manifest
@@ -1,7 +1,7 @@
-DIST requests-mock-1.2.0.tar.gz 40219 BLAKE2B b5ded6c97d920bab0c610c1be1c80f299e56cccd393c824b5c9ab3e0c298491b8be0b285c440bc8ba32eb1eec2eca14ec363d0f188c5b095192a56d01383c322 SHA512 ed24d1809aef597219ae2b0b376156a0760040795ccd660ee38f84cd1ceed58cbc5009764d7a365d31f941ee16e2b537b92ddcff92bcd8d47b7e95c67dc8d82c
 DIST requests-mock-1.5.0.tar.gz 47824 BLAKE2B 90d540e2372430c70b0ada0bc48a3a8085452e062e9ab57a232d080df8312c2a722c01d61fb399fe2a6bc31a2d6d61914d8d0e2c912a2e439062b27bb31914cf SHA512 21838017ac4d3066e2240b40b27bbe16f3bd989f37eba90f0a0d0cdb997e7e65c6d9dc63b31f64daaa6146cc3c6bccbba86382eda3f2ca72eb7cc8381969af36
 DIST requests-mock-1.5.2.tar.gz 47581 BLAKE2B 46beefc45e01355939a76b85e43a5b57cb1a870666eab7f610cad3e8a04a17da6a0864f9776a0f09028c847e8a4f7d0d2389a36f9a0431ed733a364d0f712c0b SHA512 206c91e892df84e38dcdf1264559128cfece76be2ce43b9c98238dfd438795d8c4ce3fcd43feb30246fbfca2d78832a23430ce1c9d3a7dc6e4417df5d65a8d3c
-EBUILD requests-mock-1.2.0.ebuild 1011 BLAKE2B d91a71608fa41fc0349486cd010fe7668c637f9e63b2bb83e6be592e5fe6d62c847ede85cc8764cacba970ef2a38168f19be8a7f2b8a275b2c3bbd2f67f0ad52 SHA512 9b3650afa9e8b6ca36e8a07d6d8da39ac9d8b788ff0f6cacdf34989109e34cbe4d03c39d60c3d4e36b973675b632ee2ed4799d72416d43268871108adae8d086
+DIST requests-mock-1.7.0.tar.gz 51705 BLAKE2B 1104422ab28678ee9e964fd853e7d61c23bc2f0dfb3861c2829578d1f91d533d195ce687fbc8596aba32da4b369050398d891125dc894e55fcb73ca81268b30c SHA512 6ad71fb87519f93812e8ae0d058a4b65a4492e86f05cacc37f95be1a6f0239a2c3f3d20a7e6f44bcc21f009574e4e78c2149394c2570d305efbdd68ec07b24a2
 EBUILD requests-mock-1.5.0.ebuild 1670 BLAKE2B bed4d761f1c37209818483fd670b512e1f128d571bc74f06fa013daf3c87733497b0c8d250b7d131d7e0436a9ea4b9ffed88cb622e9a753c83f3d6fa8657c6b0 SHA512 7d10c71598a1603a0d7bc910429f4c64c0acec8ed98a983d3943f59ff33d1811dd7c67193d1a03525d6a33b4162520d498622c830f641324d857f4546c37a86d
-EBUILD requests-mock-1.5.2.ebuild 1672 BLAKE2B 5dd50358a45d9af532454f3e8668fd2ee9187d7a352a9e8f8fb843626047f535459a5c3d3eec4b1ca73edaf14539c782f988c6eba5d221e491155f4a9cffc694 SHA512 3c9acc866bcec797347ef9c01373eaeafb1028f43da5c4d90125df56fa346d6d1dc4e5ba6e89c41f1f039cb7976afa6fe0154dc1e75a96e6b7d3fe30d488dfea
+EBUILD requests-mock-1.5.2.ebuild 1679 BLAKE2B 173e105d21ec53273dcb07cda38a23dd214903687440a4164e041e94c2cbf96c6e213bad399ca8f4bc655db58e217bdf92347c75b75a14cfc460ead42059d249 SHA512 642a4bee85b971086436841a53b170c4d965c3d74eb62eb62752b34fdf4d72aaf30ece942014f7ea403cf96d8212a2344168a29c9f3b17d9c6cb4cd0cf1eee97
+EBUILD requests-mock-1.7.0.ebuild 1240 BLAKE2B fa413f9527a15fd4b432b81d062c6eba6ba5ca399aaf2af5307e3f1ff328ac7987df5ed3da856df5c2502be6a58d145795f779f89e81eb8c25c900321ec1ab02 SHA512 f8460225e6316cfcba55b886694f1e33db89e390c2e238bf9e3dcd52d7db8521b0bbd17bcb057606c4ff9065f45af84168a35c89c768e21ecce13bf65fecb4fb
 MISC metadata.xml 454 BLAKE2B bcadca6cd81b333dff341a15c22e548336cf6cf8fc342ec147783d516d72c1168991b61b9038979923e92cc3304c86021b2a38b39e5d55469b9cdfe95170a23a SHA512 9eb41db434308c8b293b881364482e08da91881266ae4d5b45dc79fa12b0187e5aabbd82d771ad7c5fe4e2840d581f9a8ce63658f0f3124a19e26a35c5f25119
diff --git a/dev-python/requests-mock/requests-mock-1.2.0.ebuild b/dev-python/requests-mock/requests-mock-1.2.0.ebuild
deleted file mode 100644
index cd6180ff47cd..000000000000
--- a/dev-python/requests-mock/requests-mock-1.2.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Mock out responses from the requests package"
-HOMEPAGE="https://github.com/jamielennox/requests-mock"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-	test? (
-		dev-python/fixtures[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		dev-python/testtools[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	>=dev-python/requests-1.1[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-
-python_test() {
-	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPYTHON}"
-
-	testr init || die "testr init failed under ${EPYTHON}"
-	testr run || die "testr run failed under ${EPYTHON}"
-}
diff --git a/dev-python/requests-mock/requests-mock-1.5.2.ebuild b/dev-python/requests-mock/requests-mock-1.5.2.ebuild
index 668faaec8646..73c0133756ad 100644
--- a/dev-python/requests-mock/requests-mock-1.5.2.ebuild
+++ b/dev-python/requests-mock/requests-mock-1.5.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/requests-mock/requests-mock-1.7.0.ebuild b/dev-python/requests-mock/requests-mock-1.7.0.ebuild
new file mode 100644
index 000000000000..7c051fe73391
--- /dev/null
+++ b/dev-python/requests-mock/requests-mock-1.7.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Mock out responses from the requests package"
+HOMEPAGE="https://github.com/jamielennox/requests-mock"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	>=dev-python/requests-1.1[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
+	test? (
+		dev-python/fixtures[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/testtools[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx doc/source
+distutils_enable_tests unittest
+
+python_prepare_all() {
+	# Disable reno which only works inside a git repository
+	sed -i "s/'reno.sphinxext',//" doc/source/conf.py || die
+	# Remove the release notes section which requires reno
+	rm doc/source/release-notes.rst || die
+	sed -i '/^=============$/,/release-notes/d' doc/source/index.rst || die
+	# Disable a test which requires purl (not in the tree)
+	sed -i -e "/^import purl$/d" -e "s/test_with_purl/_&/" \
+		tests/test_adapter.py || die
+	distutils-r1_python_prepare_all
+}