gentoo resync : 25.11.2020

4 files changed, 37 insertions, 30 deletions

diff --git a/dev-python/pytest-django/Manifest b/dev-python/pytest-django/Manifest
index 342cde328957..95c35b12d6c0 100644
--- a/dev-python/pytest-django/Manifest
+++ b/dev-python/pytest-django/Manifest
@@ -1,5 +1,5 @@
 DIST pytest-django-3.10.0.gh.tar.gz 68995 BLAKE2B dcc9ddceda88c32dab559c065feb347582e72ec5fcd9929cb2bde091bd5c89bbe09879901daf5dc0adc7e38921de5b4989e0d1bbefaa5eb1cdce1dfd2ef58a11 SHA512 7f66fa9287fb80082018613ec3b15a0da3f7a13075e85f0a2eff9e13358c993e56245c441d952d13f232bf7e49a05c799b4affbb844e90abaac736d86bb0a6c9
-DIST pytest-django-3.9.0.tar.gz 70498 BLAKE2B 0f3cf7ffd528f00dd0c7dd6babcb64833ec3684c7b62dcb8757b0f90cdcdddabffdbff240774ed6fb2a294e27da2acd7f396298ff2884be6e5b4c8d9c632d008 SHA512 92985e66f47c91363d19fe2bfe8ccab14212be577692f90923dbbae4c8d406cf698796d485af2b721863392810fc07c6f11ada0c61589cd1861f0d34a732effe
-EBUILD pytest-django-3.10.0.ebuild 790 BLAKE2B 7ad01643eca2701e193d9e0f003b52608b0f57f1c599b630359a3e9010f4d92133a4861ebb0923505dddace588dc23cd1abc9eacf5280536b54bce74e0df972c SHA512 965bba2b121317b09137e22369d581fcf3d14df260dcaa1ec1001900dcf0c7f1cfabc70339574cd927c232b25a3b4c09d244b6bc8f0110115c4b5bf7ef0ac1b2
-EBUILD pytest-django-3.9.0.ebuild 694 BLAKE2B 0d03a6ed373df752439e99a4d635f5b013b5d3fef1ce8149140b864147fc5ebe893c5e56f48ae4c297662a943418c42d758aad8e0c49479f8f1e19d3d0607a81 SHA512 b5763721d399251007843f3099fc4c11a76dd48038eca4455b4860168fa9b554251cb8637c07deff6d423b391b4e3a123faffbb5220bcd1d6cacb1c1111fc9cd
+DIST pytest-django-4.1.0.gh.tar.gz 67983 BLAKE2B b7f4fe1366ce1443b19f05e8e834f0555cd8d63bf10921be1427338b7e5e737b7e04d96c9c9d2ad1b9c0f0ed6fba4ed93fb4fd9a948dc5315b4b7a35ba8adfd1 SHA512 734921f5c6f8569f6488706fbb6ca2515a5b24c6641fd260771022bd4fd72b65d062a8130f59163e8b30f4c9bceb383d154b26f8fbf46a1903339668d0a7d12b
+EBUILD pytest-django-3.10.0.ebuild 788 BLAKE2B 66b726fa8d66996a2e5723094bb0078b31476f7c0cd734791095d11a013aa4d27d6f6361cdc80f247c500049ad60df85cf22af20ee030e784eec683b4f7e816f SHA512 eb3813a93ca8966ea36b1b995eba8b36c9b42db45498bcfe255a1760aca4d4e310d5dffe307e83f1f601b10d0454eb5edc86141853b240ade55b0d31853de1a4
+EBUILD pytest-django-4.1.0.ebuild 814 BLAKE2B 7b161ddc49104130b6c54b2f03030b02c5b48dd6f7b49001bd1a5a7a7997dec4298217134c851d7bbbf551d88b7007707fddacc47bb8fbbaacbda7d01ab16d65 SHA512 c71ecfa0ff51917d7d2d50b765bdb03cadf4cac4f13678812d05e9a1526d51c17d8a32aef53e2998de1fe7ddbb43047f148b8d17156c2b90f743a9ef3a5bc5e6
 MISC metadata.xml 404 BLAKE2B 24556c59793b77f5c6de6f5c1210575d7bf7b5dc55aa7427d630d21311a77b31e3c846d5198ebf9b0407a0b1a36eae17bbd37a988c376eda666680871de30ea6 SHA512 33db1ea8ab6490e9b09daf334f48aa8db16db565e264b47b120797aee63c08c99aa27cae3c0a55a21c87552f99ad1ba9a13ba3b53e4562608209efb87a227268
diff --git a/dev-python/pytest-django/pytest-django-3.10.0.ebuild b/dev-python/pytest-django/pytest-django-3.10.0.ebuild
index a0ae7d0d04bb..2d3bafc35e34 100644
--- a/dev-python/pytest-django/pytest-django-3.10.0.ebuild
+++ b/dev-python/pytest-django/pytest-django-3.10.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 		-> ${P}.gh.tar.gz"
 
 LICENSE="BSD"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 
 RDEPEND="
diff --git a/dev-python/pytest-django/pytest-django-3.9.0.ebuild b/dev-python/pytest-django/pytest-django-3.9.0.ebuild
deleted file mode 100644
index 28a869978693..000000000000
--- a/dev-python/pytest-django/pytest-django-3.9.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A Django plugin for py.test"
-HOMEPAGE="https://pypi.org/project/pytest-django/ https://pytest-django.readthedocs.org https://github.com/pytest-dev/pytest-django"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-
-RDEPEND="
-	>=dev-python/pytest-3.6[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools_scm-1.11.1[${PYTHON_USEDEP}]
-"
-
-# not all test dependencies are packaged and this package isn't worth it.
-RESTRICT="test"
diff --git a/dev-python/pytest-django/pytest-django-4.1.0.ebuild b/dev-python/pytest-django/pytest-django-4.1.0.ebuild
new file mode 100644
index 000000000000..b51de52635ec
--- /dev/null
+++ b/dev-python/pytest-django/pytest-django-4.1.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A Django plugin for py.test"
+HOMEPAGE="
+	https://pypi.org/project/pytest-django/
+	https://pytest-django.readthedocs.org
+	https://github.com/pytest-dev/pytest-django"
+SRC_URI="
+	https://github.com/pytest-dev/pytest-django/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+
+RDEPEND="
+	>=dev-python/pytest-5.4[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools_scm-1.11.1[${PYTHON_USEDEP}]
+"
+
+# not all test dependencies are packaged and this package isn't worth it.
+RESTRICT="test"
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}