gentoo resync : 25.08.2020

10 files changed, 76 insertions, 178 deletions

diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index a3999ebd481e..8cda7d051e22 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -1,17 +1,14 @@
 AUX django-2.0.7-bashcomp.patch 1507 BLAKE2B 8aeb494087dbccffc69ad43f370e791d9fbfb1908d45f55d5f8be01ec0f3af6b2aff591da84a06c0858fecd44180579a4647d622ef57d8235ccb4b3b80fd3a2a SHA512 5a3867b8e4f2fafe4c53a741d41e8c6e8e28a55463f7d8007afd669a04daa8b93f911e4ef8d5ad38ba300558f21ac8090b00337d0c0bfb93b2aea73a179334a4
 AUX django-3.0.6-bashcomp.patch 2060 BLAKE2B 6bff228193b4cfe4f0f4c3d727146dffdb43c1decf1231edf6ab15d9de4a0b504ad4ec9f00f8f6030562a50584e0445ed8d671c6af84926d7b1d23380258a35d SHA512 f9a962ff61ba8fba490b2b8c233cbf2770751c7a184c64915039a4b476b2f2d235896aa3af514ace72d0fe0a4fbb8858534196d163a44edfa0a043e3b9fe178a
-DIST Django-2.2.11.tar.gz 9010479 BLAKE2B 9df126f62368c43a64fcdbf9d3831c78dd37e41eb88670517eeec84043083cc437d95301d86798b5945313b515d63bd12cba8484e74b6da2311af2e86ce87adc SHA512 b33ece4606e5a23626caee121018522166a0e1f32bd41ea4eb3d4c1f624943990a07e04c5a4f5d52958e733790178474e9314d346ce1e4d5d6e49ac2a700c857
-DIST Django-2.2.12.tar.gz 8877061 BLAKE2B 7d92e7f871606aaacc82528f3d7c26d134a7b1216ae983a8da93cde20eac65729eaea1de8d3a7a598df8f9f228c3d20a5da9cb53a149d1064c58824626fd8aaf SHA512 3c01b606e34dd0abe5a03bc55bf7d9328a0da370c22bac4d15c3468512b26ad57fd07d942a2a34129ce18bcc5e86c67e163d0f4d5b7ea47e3e899ba7617ab28c
+AUX django-3.1-bashcomp.patch 2085 BLAKE2B 36a0aa4d3413f13089ac104f5d3f98ecbb152a9a5a35f8c1ff2e5ffc9824153b0ac89f1cbca76c31a1afefde471e4d6ed801e405551b25cb31da89c20f3019cc SHA512 82dceede4292bad6e3e4966a6dba01bd2bbc7db494fce592e25dc4a64236485d88d8ad67b247239a80f8fe96dff054d20afea6f48a5518b67cf88404d399e61c
 DIST Django-2.2.13.tar.gz 8879757 BLAKE2B 4a7986805c6a3674d47aa82b97f31ae63968dd7c0f12db672207cd1d97076acb681fe44e730147122911684b36d7f1e9d5ea18c054d4c40c68b460300fd9294b SHA512 6daf3486d2f19eb159193df77a7525e5173ba5889ad5c587a6ec6bbf02c4ea94fa90b9a30a5310932fc9353a22c413208ab724c05740f844eccfe610da3ca68a
-DIST Django-2.2.14.tar.gz 9022051 BLAKE2B 397f1de35f645da9964581d494d933ce2327915315049997aaed238f27214e4fead8c50e779052eafb3d237e065ef47f2d3f151552f712b6348ed23b75d25e52 SHA512 48ad065df161300920abe0c28c3f79cebe536de00fe60c8a7633caee149e0632aa564a848172bad0f254f2a98194cb625a5c169e51a89f3cab95c1213cfe485d
-DIST Django-3.0.6.tar.gz 9070990 BLAKE2B 9f918f64baecc5fe18ec08293da0f81a5e6ba9dc034b7e43f11ac9e67fa8d16c155878342babad9fca8ed30caf5ec3335756e2e0312c463b46a23b4db92fd4a0 SHA512 4c92c51386919c389037d6c6d1de3cb6ec443bd1f216f20797fb20fb24ea8d021701a03805ba693deadfa82b1aee38ae0d7fc03cae94cd744b1d1fa47ddc46ad
-DIST Django-3.0.7.tar.gz 8947502 BLAKE2B c26752f41f04f23ea1db9863d0919c17ed27b75133e22cc342e453e40077f05f6458f8edd290bfdcf828a181e38d89a1b4faeaa9cb44176ff0f7d67910d6b9df SHA512 566a78c3686baaea2ea8f2db2c1762a78ec5e5ae44f0be43f49c83899c2a0a9d1b2297a05ce8f4bc6bc580c494dde66bb2be47a8269cce3e1b007fedd857e5d3
+DIST Django-2.2.15.tar.gz 9023679 BLAKE2B 9619d0ac45a8256a1e605f447b89df6266d67d98969baffd41a9184165e14d57d4edfb898f64a6633cc0f4c23b24a35b16cb446c920d8baf58f771c69d8697ee SHA512 bb91e5b621be54570f8c7676f820ff93fbf0546dea79e035eebd60b70c5c872b0de65395a4606f07af7b9c77de2cf218aaef8ff489fcfabaf5c9b75d28e42dc2
 DIST Django-3.0.8.tar.gz 9080731 BLAKE2B b3276527c9c5eba18b380204c498ebd5724e5211640ead9e05284eb013f907ce6799125b29e2030bc37ecd5a1022e6eb3f193eca5e2c6520adef630d6d2114a9 SHA512 92d169fb37883355f1898fc13b54b6732ec14d71f77e4b91db30dd9bfb5df8b34c1c9566af6ddc37e00a9e3eadd38b6a51ff604a4da4285167f66b55215be301
-EBUILD django-2.2.11.ebuild 2344 BLAKE2B 124f5e9dd4fe7c19439ffa3f5586525499a1e02ebea738f2a515f2ee9c6a11efc909c56d556418a5a0a0f491c6c37d07c406576a69d012aea686c6d16047155f SHA512 629706bd162f4c45f80e4d37abe32d7ad99fb37ae34a25e76ea89776e7d3b76fc7ce80eaffbda2c48688d2f69f453ffef1c0a59e63ae4fb154b1f87709d8aeeb
-EBUILD django-2.2.12.ebuild 2357 BLAKE2B 42d33daa2c3ebf5c776f79617fb943a085f3f1965daf40033add0689634d25f16972cb5efb545416a3add02e7d13bc337e6a9de43a830a3670124dad93a4a8c5 SHA512 8627be383807f5820991ee57fca3aa3c213b13c751f57313e5148ab8eac1fed002b46bfdf5523b1e907f468202390b9854373e2522cba6be71f58b3be493ea56
-EBUILD django-2.2.13.ebuild 2357 BLAKE2B 42d33daa2c3ebf5c776f79617fb943a085f3f1965daf40033add0689634d25f16972cb5efb545416a3add02e7d13bc337e6a9de43a830a3670124dad93a4a8c5 SHA512 8627be383807f5820991ee57fca3aa3c213b13c751f57313e5148ab8eac1fed002b46bfdf5523b1e907f468202390b9854373e2522cba6be71f58b3be493ea56
-EBUILD django-2.2.14.ebuild 2366 BLAKE2B 8796ccc566d580e69f6c12c663a7a34311f9cb11c3d9a9045c32396523c1c33e2a5c73aedf52e177bbf09526c0435533dc7ea8b85b6c3ab2cc5d41afd65b6023 SHA512 2733ecb9d91cba09b97a223c049d9f84b6bd228da4936177abc5dc3e0a50b97074071e120ac357c4c87f7d8893cd123d164f010d7a453ca18c96f253ccd56f2f
-EBUILD django-3.0.6.ebuild 2347 BLAKE2B fe755453ac26d0338267614611745d956bbd65f0d4128152be72ba38b708fa5fe905610fd2003cf8f3c8d578a29e5bf708cd72f3d5067244ca7d70c0b67a66d6 SHA512 b272418b4f2f349d41896408a257e55805f5d0cdfe427ac5a517314bda81828e15c53f10e1eb72fba83f7b4265b26d1cc779d38b737fcc44d94fbbf5b9f6e20e
-EBUILD django-3.0.7.ebuild 2347 BLAKE2B dc296dee8bdb25be233fd02b686e1b3e34d46055ef9194ec2a0c3cadb751fcbe05e17cdd2793233b7657b0cd01a593f3770b805c6fbb4af3514212bfb853ef7b SHA512 c2a32dc0e7c29d6eda9e106d1a1444034a7fe826a5e8dabe96e39d6c818ea28416fe88f73dbfb8d8738d9f1745339ed92fa967b91e5eb5b19fc0d753160d304b
-EBUILD django-3.0.8.ebuild 2347 BLAKE2B dc296dee8bdb25be233fd02b686e1b3e34d46055ef9194ec2a0c3cadb751fcbe05e17cdd2793233b7657b0cd01a593f3770b805c6fbb4af3514212bfb853ef7b SHA512 c2a32dc0e7c29d6eda9e106d1a1444034a7fe826a5e8dabe96e39d6c818ea28416fe88f73dbfb8d8738d9f1745339ed92fa967b91e5eb5b19fc0d753160d304b
-MISC metadata.xml 374 BLAKE2B 79d646d66b955dfbc419783bcfe7677f92472872292dbe726e55bf873d066be9365664e14ff1d190578b0294fe14dcee1c43e648bf2508cb2ceff4000b6002b8 SHA512 9aa0b388987c115e18e0aaa8747605e67fc8c8b5125d2a634dfae2ba8c6627963029fe913401a0647026adaa4d0037d91075a46d20f924f4d4f8d45bff195cff
+DIST Django-3.0.9.tar.gz 9081099 BLAKE2B 502f9cf1fafff50d92c771e845319f5406722cdb8ca0570688bb96e7fbc765cee319325b0340b722afeb0a304316d30408ca92154623ad4934877cbdc8ee9259 SHA512 1244b9cff26b9e8d9a3d611e0a39981bd1a46d68fa734a58ba12fd51eeb023fb053605372d7b41b51027e4e609f1870d25f7e0584d0449ceeb8d877f674e49b4
+DIST Django-3.1.tar.gz 9382872 BLAKE2B 31f2a45cf31f87401ac1834be81cf207ca48f720bf6d6885b774fb51f42616be1346b8ab71d6c0b605d99bc7422f27b21665729b78e00c9cc0ba9cf3e4d788f3 SHA512 31f0821966f4ebc6b2a719b69f1137a32a7228414221e8938a66c9b940465c008761bd380ba9ea603e3693d38c233d6f23afe0cbe5647eb2478844ce2d0e7fd4
+EBUILD django-2.2.13.ebuild 2329 BLAKE2B 318f88cb8e0817dcefd31d0a43ce2b1067c187ecb27deb948df7c12633e76fad8f1298b3769bda49082a2887f42ca6088387bf0c9816fbed899b0207c9e452e3 SHA512 3f5f6c0e3576f74a1f0d0483e3f9640ea38d228e54f9a302ce33c2cf4805a56405c33777295cbfd6eba3ce86128a0acaca10445839b2de2918225420aa4b2b0e
+EBUILD django-2.2.15.ebuild 2338 BLAKE2B 021702600dc058b29f671f64f165985528d5fe93357d9577b9dc0c6bbf8ae69483bae62d820483ba976873ccbbac8fda0e5bf66e480369f18cc30051a6c07328 SHA512 04cddd1785450b0e02b0d838e653a616f7f76a396a769901d6100c518e94dff438dd79cc4972bf59f65c57943d1601fc5de07609e54598adc7297a17d85c62fd
+EBUILD django-3.0.8.ebuild 2317 BLAKE2B 8855c8a746876f491588b1dae108ca528f8e90be8a75acddc50559f3e9ad7e11e9b7580adddbdb391a7c2dd9f98f04f6a9696cb73da28d1c5331fac6759c114b SHA512 ed16f2d2ac738b0e404ee2c0cbc5c3877e751fd8ed160366f6b3717f48ef46a9ac4a072e56d691f73cf7d4386f25278edb49e55d825f32a462f1ffe2f763b265
+EBUILD django-3.0.9.ebuild 2319 BLAKE2B 0c243aff451ef7259ef835dc60a3d57c6d8f4a1727d29891fadc491cf45b5ef5f561e3d6b5cc9762fc16a8a107076df330492f3044c4896d69c0136144ade43b SHA512 1ce2b6f417296abf924eb75943fd5bb7eef7b0fd4bb66fc0a6e5891433958666394c44b982d9bf56218ae60fc2b70763b0cebdc4050a20f8b075ea8c778bd18c
+EBUILD django-3.1.ebuild 2317 BLAKE2B 70a8b128b5a8c21c25119559de5681402e964148185fe33bf6511e3b5b676fceb55a83e6065dc7c2e12820f6180fa0e8ba5532947c1e3dabeeb4d98874a06c1a SHA512 5bf6d53b6c4ac0cf1321071aae536fb95ca8d90366a920def8b455fa8ad256453903555b68b5acfe2bf41fd0484d87501e2604e3ce7e1ee5e1bc5b2a89065141
+MISC metadata.xml 399 BLAKE2B f49845f5a6476a0b43cbe47ab11b298f53703d850d145a31967f512d9402048fc1b1891606ddba7342ea9613c27ace3986f6b508ed83f0c5eccb26a13fd49f85 SHA512 92470f2930b1c940ccf3478b11157adcc4b84924b0cab4e1fd8aae98c7bba14e995491ce44810223eeb3802967be68c867d0ee4ac0df9f49b4234efd1a7ecfa7
diff --git a/dev-python/django/django-2.2.11.ebuild b/dev-python/django/django-2.2.11.ebuild
deleted file mode 100644
index 04943ce0049c..000000000000
--- a/dev-python/django/django-2.2.11.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8} )
-PYTHON_REQ_USE='sqlite?,threads(+)'
-
-inherit bash-completion-r1 distutils-r1 eutils
-
-MY_PN="Django"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="High-level Python web framework"
-HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
-SRC_URI="https://www.djangoproject.com/m/releases/$(ver_cut 1-2)/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-# admin fonts: Roboto (media-fonts/roboto)
-LICENSE+=" Apache-2.0"
-# admin icons, jquery, xregexp.js
-LICENSE+=" MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc sqlite test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/sqlparse[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		$(python_gen_impl_dep sqlite)
-		dev-python/docutils[${PYTHON_USEDEP}]
-		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pillow[webp,${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/selenium[${PYTHON_USEDEP}]
-		dev-python/tblib[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.0.7-bashcomp.patch
-)
-
-distutils_enable_sphinx docs
-
-python_test() {
-	# Tests have non-standard assumptions about PYTHONPATH,
-	# and don't work with ${BUILD_DIR}/lib.
-	PYTHONPATH=. "${EPYTHON}" tests/runtests.py --settings=test_sqlite -v2 ||
-		die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	newbashcomp extras/django_bash_completion ${PN}-admin
-	bashcomp_alias ${PN}-admin django-admin.py
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	elog "Additional Backend support can be enabled via"
-	optfeature "MySQL backend support" dev-python/mysqlclient
-	optfeature "PostgreSQL backend support" dev-python/psycopg:2
-	echo ""
-	elog "Other features can be enhanced by"
-	optfeature "GEO Django" "sci-libs/gdal[geos]"
-	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
-	optfeature "ImageField Support" dev-python/pillow
-	optfeature "Password encryption" dev-python/bcrypt
-	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
-}
diff --git a/dev-python/django/django-2.2.12.ebuild b/dev-python/django/django-2.2.12.ebuild
deleted file mode 100644
index 5b85d6f488d8..000000000000
--- a/dev-python/django/django-2.2.12.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8} )
-PYTHON_REQ_USE='sqlite?,threads(+)'
-
-inherit bash-completion-r1 distutils-r1 eutils
-
-MY_PN="Django"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="High-level Python web framework"
-HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
-SRC_URI="https://www.djangoproject.com/m/releases/$(ver_cut 1-2)/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-# admin fonts: Roboto (media-fonts/roboto)
-LICENSE+=" Apache-2.0"
-# admin icons, jquery, xregexp.js
-LICENSE+=" MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc sqlite test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/sqlparse[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		$(python_gen_impl_dep sqlite)
-		dev-python/docutils[${PYTHON_USEDEP}]
-		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pillow[webp,${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/selenium[${PYTHON_USEDEP}]
-		dev-python/tblib[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.0.7-bashcomp.patch
-)
-
-distutils_enable_sphinx docs --no-autodoc
-
-python_test() {
-	# Tests have non-standard assumptions about PYTHONPATH,
-	# and don't work with ${BUILD_DIR}/lib.
-	PYTHONPATH=. "${EPYTHON}" tests/runtests.py --settings=test_sqlite -v2 ||
-		die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	newbashcomp extras/django_bash_completion ${PN}-admin
-	bashcomp_alias ${PN}-admin django-admin.py
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	elog "Additional Backend support can be enabled via"
-	optfeature "MySQL backend support" dev-python/mysqlclient
-	optfeature "PostgreSQL backend support" dev-python/psycopg:2
-	echo ""
-	elog "Other features can be enhanced by"
-	optfeature "GEO Django" "sci-libs/gdal[geos]"
-	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
-	optfeature "ImageField Support" dev-python/pillow
-	optfeature "Password encryption" dev-python/bcrypt
-	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
-}
diff --git a/dev-python/django/django-2.2.13.ebuild b/dev-python/django/django-2.2.13.ebuild
index 5b85d6f488d8..734a55d6bdf3 100644
--- a/dev-python/django/django-2.2.13.ebuild
+++ b/dev-python/django/django-2.2.13.ebuild
@@ -31,10 +31,10 @@ RDEPEND="
 	dev-python/pytz[${PYTHON_USEDEP}]
 	dev-python/sqlparse[${PYTHON_USEDEP}]"
 BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
 	test? (
 		$(python_gen_impl_dep sqlite)
+		${RDEPEND}
 		dev-python/docutils[${PYTHON_USEDEP}]
 		dev-python/jinja[${PYTHON_USEDEP}]
 		dev-python/numpy[${PYTHON_USEDEP}]
diff --git a/dev-python/django/django-2.2.14.ebuild b/dev-python/django/django-2.2.15.ebuild
index f2f8b34c1441..2d48305066b2 100644
--- a/dev-python/django/django-2.2.14.ebuild
+++ b/dev-python/django/django-2.2.15.ebuild
@@ -31,10 +31,10 @@ RDEPEND="
 	dev-python/pytz[${PYTHON_USEDEP}]
 	>=dev-python/sqlparse-0.2.2[${PYTHON_USEDEP}]"
 BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
 	test? (
 		$(python_gen_impl_dep sqlite)
+		${RDEPEND}
 		dev-python/docutils[${PYTHON_USEDEP}]
 		dev-python/jinja[${PYTHON_USEDEP}]
 		dev-python/numpy[${PYTHON_USEDEP}]
diff --git a/dev-python/django/django-3.0.8.ebuild b/dev-python/django/django-3.0.8.ebuild
index fbc688b75cbc..5bc565ca8f8a 100644
--- a/dev-python/django/django-3.0.8.ebuild
+++ b/dev-python/django/django-3.0.8.ebuild
@@ -23,7 +23,7 @@ LICENSE+=" Apache-2.0"
 # admin icons, jquery, xregexp.js
 LICENSE+=" MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86"
 IUSE="doc sqlite test"
 RESTRICT="!test? ( test )"
 
@@ -32,10 +32,10 @@ RDEPEND="
 	dev-python/pytz[${PYTHON_USEDEP}]
 	>=dev-python/sqlparse-0.2.2[${PYTHON_USEDEP}]"
 BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
 	test? (
 		$(python_gen_impl_dep sqlite)
+		${RDEPEND}
 		dev-python/docutils[${PYTHON_USEDEP}]
 		dev-python/jinja[${PYTHON_USEDEP}]
 		dev-python/numpy[${PYTHON_USEDEP}]
diff --git a/dev-python/django/django-3.0.7.ebuild b/dev-python/django/django-3.0.9.ebuild
index fbc688b75cbc..b48404f115e9 100644
--- a/dev-python/django/django-3.0.7.ebuild
+++ b/dev-python/django/django-3.0.9.ebuild
@@ -32,10 +32,10 @@ RDEPEND="
 	dev-python/pytz[${PYTHON_USEDEP}]
 	>=dev-python/sqlparse-0.2.2[${PYTHON_USEDEP}]"
 BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
 	test? (
 		$(python_gen_impl_dep sqlite)
+		${RDEPEND}
 		dev-python/docutils[${PYTHON_USEDEP}]
 		dev-python/jinja[${PYTHON_USEDEP}]
 		dev-python/numpy[${PYTHON_USEDEP}]
diff --git a/dev-python/django/django-3.0.6.ebuild b/dev-python/django/django-3.1.ebuild
index 7e80304959ab..04d8f1897c18 100644
--- a/dev-python/django/django-3.0.6.ebuild
+++ b/dev-python/django/django-3.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 PYTHON_REQ_USE='sqlite?,threads(+)'
 
 inherit bash-completion-r1 distutils-r1 eutils
@@ -23,7 +23,7 @@ LICENSE+=" Apache-2.0"
 # admin icons, jquery, xregexp.js
 LICENSE+=" MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="doc sqlite test"
 RESTRICT="!test? ( test )"
 
@@ -32,10 +32,10 @@ RDEPEND="
 	dev-python/pytz[${PYTHON_USEDEP}]
 	>=dev-python/sqlparse-0.2.2[${PYTHON_USEDEP}]"
 BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
 	test? (
 		$(python_gen_impl_dep sqlite)
+		${RDEPEND}
 		dev-python/docutils[${PYTHON_USEDEP}]
 		dev-python/jinja[${PYTHON_USEDEP}]
 		dev-python/numpy[${PYTHON_USEDEP}]
@@ -46,7 +46,7 @@ BDEPEND="
 	)"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-3.0.6-bashcomp.patch
+	"${FILESDIR}"/${PN}-3.1-bashcomp.patch
 )
 
 distutils_enable_sphinx docs --no-autodoc
diff --git a/dev-python/django/files/django-3.1-bashcomp.patch b/dev-python/django/files/django-3.1-bashcomp.patch
new file mode 100644
index 000000000000..1652842aaa38
--- /dev/null
+++ b/dev-python/django/files/django-3.1-bashcomp.patch
@@ -0,0 +1,56 @@
+From e0a8c0663debeb222bf78b97678f60929313b60a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Wed, 6 May 2020 07:24:05 +0200
+Subject: [PATCH] Remove completions unsuitable for autoloading
+
+The override of 'python*' completions, as well as the attempt
+to './manage.py' completion are not going to work with autoloader.
+Strip them.
+---
+ extras/django_bash_completion | 33 +--------------------------------
+ 1 file changed, 1 insertion(+), 32 deletions(-)
+
+diff --git a/extras/django_bash_completion b/extras/django_bash_completion
+index fa77d59aff..dfeb439a2e 100755
+--- a/extras/django_bash_completion
++++ b/extras/django_bash_completion
+@@ -37,35 +37,4 @@ _django_completion()
+                    DJANGO_AUTO_COMPLETE=1 $1 ) )
+ }
+ # When the django-admin.py deprecation ends, remove django-admin.py.
+-complete -F _django_completion -o default django-admin.py manage.py django-admin
+-
+-_python_django_completion()
+-{
+-    if [[ ${COMP_CWORD} -ge 2 ]]; then
+-        local PYTHON_EXE=${COMP_WORDS[0]##*/}
+-        if echo "$PYTHON_EXE" | grep -qE "python([3-9]\.[0-9])?"; then
+-            local PYTHON_SCRIPT=${COMP_WORDS[1]##*/}
+-            if echo "$PYTHON_SCRIPT" | grep -qE "manage\.py|django-admin(\.py)?"; then
+-                COMPREPLY=( $( COMP_WORDS=( "${COMP_WORDS[*]:1}" )
+-                               COMP_CWORD=$(( COMP_CWORD-1 ))
+-                               DJANGO_AUTO_COMPLETE=1 ${COMP_WORDS[*]} ) )
+-            fi
+-        fi
+-    fi
+-}
+-
+-# Support for multiple interpreters.
+-unset pythons
+-if command -v whereis &>/dev/null; then
+-    python_interpreters=$(whereis python | cut -d " " -f 2-)
+-    for python in $python_interpreters; do
+-        [[ $python != *-config ]] && pythons="${pythons} ${python##*/}"
+-    done
+-    unset python_interpreters
+-    pythons=$(echo "$pythons" | tr " " "\n" | sort -u | tr "\n" " ")
+-else
+-    pythons=python
+-fi
+-
+-complete -F _python_django_completion -o default $pythons
+-unset pythons
++complete -F _django_completion -o default django-admin.py django-admin
+-- 
+2.28.0
+
diff --git a/dev-python/django/metadata.xml b/dev-python/django/metadata.xml
index ca9edb307f40..11e4ec4f152e 100644
--- a/dev-python/django/metadata.xml
+++ b/dev-python/django/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">Django</remote-id>
     <remote-id type="github">django/django</remote-id>