gentoo resync : 20.03.2022

3 files changed, 14 insertions, 49 deletions

diff --git a/dev-python/djangorestframework/Manifest b/dev-python/djangorestframework/Manifest
index 83b2147b651d..862a38932c94 100644
--- a/dev-python/djangorestframework/Manifest
+++ b/dev-python/djangorestframework/Manifest
@@ -1,7 +1,4 @@
-DIST django-rest-framework-3.12.4.gh.tar.gz 8856507 BLAKE2B 48150e8d966ddd169a2b58d90656efa8f9f549c9d2fdee6025254fba2a6221704fe6bcb246567c8acb963f76ea56046935d3190c7c391daf4773b100a641ba02 SHA512 406b5354809b94e371a2c7d4b62ce66c18a1f60bd02574cba603ad4c44faa4297bdbbd6ee50de63fe21d2aae18386e05d46983a506bddd17f06ce610d5b727c9
-DIST django-rest-framework-3.13.0.gh.tar.gz 8880253 BLAKE2B 8acd6bf386ef20302c8fe52b3a5f1926c03701b32b8c409d13771d632a62e0e01bd8c2efde079e923342a08e6a3d21b3ab13a66817567fe2372f7b8e63eee61a SHA512 2368f382e6dd01490366443ad944f4a48ebbc4928ed45ff58c77a63deb251b148b9e4b13d89b0d2e27a8e257239d75f58f91a11604402683c1c36fac8ce27acc
 DIST django-rest-framework-3.13.1.gh.tar.gz 8868916 BLAKE2B 01a2e1c2459f99b1d3b38b62b305a57f3a3358d34a352ef2bbeb6b130c98f19fbbb83325d1013c28107f267a0a0227215646975de54542ab9ca6dfcf2bd88404 SHA512 a272cccf1f19b2cd09ef456a9588fb17ddc56ac3bd735cf7e130d85bb667ca87361d7de26c95b58a05d8cf693ab19c09d913b457f17ad63053ff9b516c13ec9b
-EBUILD djangorestframework-3.12.4.ebuild 1027 BLAKE2B e6debb796823873ef111093e755925a66361dc665eedfe7b5b77a08694cdca9f7d3f91e8fe2ec2df103360d1819b2728d63af0cf2daf22a1b3774bf9b103c8de SHA512 ea50d726eb11ad1e90022ab2fc4e931a99252d8ff0a6b2069595c4dbe590b3b12bc29d8d8a25947552d912b13e76ca4134dd8f4c6e9cb613b867b05c894c3740
-EBUILD djangorestframework-3.13.0.ebuild 772 BLAKE2B 3437023900cbea6debb8d214596323e9033acdb2abf32a4a361e8e802e5c344c93eb075fa58c926e48da1bb52ea5f1220c0a1d95ce5f80e9ffc895920853f4a8 SHA512 48c95669eb06abb16537a9b2c7aa1d0f31670610d0f2150a7748a70953c0f8b7778c1b52fddf31eec80b32f16a58a218a6eb609da0b30a892599626eed35ef3a
+EBUILD djangorestframework-3.13.1-r1.ebuild 902 BLAKE2B 4d6a1fa55336b4100c2736a78756925bec9041181cd54557fcfacc90a7ec34910581a9f7d83564acd6fba8c7b9c896978b071edc2f8fde8002b7e7dcce8e12e7 SHA512 fc89045dc7a9555d386d9f9f7ee76e0d75e1d5b032f65eba8a5b869185e909138b77eb732825e1a684fd24bc01f516a01801e79f7cb74970ae6c911da0e04400
 EBUILD djangorestframework-3.13.1.ebuild 772 BLAKE2B 3437023900cbea6debb8d214596323e9033acdb2abf32a4a361e8e802e5c344c93eb075fa58c926e48da1bb52ea5f1220c0a1d95ce5f80e9ffc895920853f4a8 SHA512 48c95669eb06abb16537a9b2c7aa1d0f31670610d0f2150a7748a70953c0f8b7778c1b52fddf31eec80b32f16a58a218a6eb609da0b30a892599626eed35ef3a
 MISC metadata.xml 323 BLAKE2B 12b83c18a646ca1be9acf46d5d356ea87104edaca0a199c971fb44a26f385bea834603c9f5a8a4115e8239c3591cd9c5cb001fe365e19287fc00b2ebb07489b6 SHA512 d18e5df8d405716c16ed5d021d41d621b6f1f33c5c4fcda542a44f6a14544531709d7e0a093d40ec10802d2e3bf5ea534ce706d444af2a43b8845068bb1438cd
diff --git a/dev-python/djangorestframework/djangorestframework-3.12.4.ebuild b/dev-python/djangorestframework/djangorestframework-3.12.4.ebuild
deleted file mode 100644
index 8b6cfef95bea..000000000000
--- a/dev-python/djangorestframework/djangorestframework-3.12.4.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-MY_P=django-rest-framework-${PV}
-DESCRIPTION="Web APIs with django made easy"
-HOMEPAGE="https://www.django-rest-framework.org/"
-SRC_URI="
-	https://github.com/encode/django-rest-framework/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND=">=dev-python/django-1.11[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/coreapi[${PYTHON_USEDEP}]
-		dev-python/coreschema[${PYTHON_USEDEP}]
-		dev-python/pytest-django[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local deselect=(
-		# TODO
-		tests/test_description.py::TestViewNamesAndDescriptions::test_markdown
-		# django version incompatibility?
-		tests/test_fields.py::TestNaiveDayLightSavingTimeTimeZoneDateTimeField::test_invalid_inputs
-	)
-
-	epytest ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/djangorestframework/djangorestframework-3.13.0.ebuild b/dev-python/djangorestframework/djangorestframework-3.13.1-r1.ebuild
index db2bbeb43bbe..c5a6e18e9304 100644
--- a/dev-python/djangorestframework/djangorestframework-3.13.0.ebuild
+++ b/dev-python/djangorestframework/djangorestframework-3.13.1-r1.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
+DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{8..10} )
+
 inherit distutils-r1
 
 MY_P=django-rest-framework-${PV}
@@ -11,7 +13,8 @@ DESCRIPTION="Web APIs with django made easy"
 HOMEPAGE="https://www.django-rest-framework.org/"
 SRC_URI="
 	https://github.com/encode/django-rest-framework/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz"
+		-> ${MY_P}.gh.tar.gz
+"
 S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
@@ -20,13 +23,19 @@ KEYWORDS="~amd64"
 
 RDEPEND="
 	>=dev-python/django-2.2[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]"
+	dev-python/pytz[${PYTHON_USEDEP}]
+"
 BDEPEND="
 	test? (
 		dev-python/coreapi[${PYTHON_USEDEP}]
 		dev-python/coreschema[${PYTHON_USEDEP}]
 		dev-python/pytest-django[${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
-	)"
+	)
+"
 
 distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	tests/test_description.py::TestViewNamesAndDescriptions::test_markdown
+)