8 files changed, 112 insertions, 300 deletions
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index ef4f7c10aba0..c3457eada3b0 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -1,21 +1,13 @@
 AUX django-2.0.7-bashcomp.patch 1507 BLAKE2B 8aeb494087dbccffc69ad43f370e791d9fbfb1908d45f55d5f8be01ec0f3af6b2aff591da84a06c0858fecd44180579a4647d622ef57d8235ccb4b3b80fd3a2a SHA512 5a3867b8e4f2fafe4c53a741d41e8c6e8e28a55463f7d8007afd669a04daa8b93f911e4ef8d5ad38ba300558f21ac8090b00337d0c0bfb93b2aea73a179334a4
 AUX django-3.1-bashcomp.patch 2085 BLAKE2B 36a0aa4d3413f13089ac104f5d3f98ecbb152a9a5a35f8c1ff2e5ffc9824153b0ac89f1cbca76c31a1afefde471e4d6ed801e405551b25cb31da89c20f3019cc SHA512 82dceede4292bad6e3e4966a6dba01bd2bbc7db494fce592e25dc4a64236485d88d8ad67b247239a80f8fe96dff054d20afea6f48a5518b67cf88404d399e61c
-DIST Django-2.2.22.checksum.txt 2551 BLAKE2B b08f1d904caedfad04eceb57a704cec9dc660e59d2ceeddbd98f16b8bf4f578a030f1baaef7e8eb7ffb022bcf11957642d08b972eec12aed12e51d41bacea07a SHA512 20adea9a59fad6974679836f044bd4a1089faa881a7efbf15fc6a17e3a674ff9b638708bdfa7724b82d80db73c64b478eed08cec6eb5d040100aec20078dc1df
-DIST Django-2.2.22.tar.gz 9182392 BLAKE2B f68141772ec101332a2a0c7b1b2216a14535404e814d80a6a350effcd4ee07eb6a4271f997a43d24e4a083fef690492714858b2c92d982fb113352f6fd062545 SHA512 215497034224dbbbffb3e70f9c50e51a149c9962074d2ae7152a664d21f7e762a7f62baebad2387037feff02e880e1dfdfa04ad797907ba5daf65276c2b99fd7
-DIST Django-2.2.23.checksum.txt 2552 BLAKE2B 25763dad7ee67cbbf64a182998b53277d24866030c1fba5b1f53f0d944321dbf104b9b03fa714212a8051e44b3b56c2ecfad140999ab88ed563b854aa7b7eee2 SHA512 5479b7f8c6918cd7363851038e49b2e0f23e25e6f6e56b049372209db901c0caa621d1b6acf46983c5a887b78a47e801364cbcec3b996ea474472f9ca2304bbe
-DIST Django-2.2.23.tar.gz 9182567 BLAKE2B 97ba0f098fdc8f187489e7b25fe17e7258396e758ba0d566b9d17012612a2693f675b1049cc939c88dc5f5d2af783934369f9b6672e92e1420189852ebbd7ad6 SHA512 0f9b8705ce150f7c291452551933135a521b2d22cad00928bddbd6cac8ccb44da2c6c9a4302dc49b6f5188f6d72e148bd3c9806001e50972acefcb6ef853777b
-DIST Django-3.1.10.checksum.txt 2551 BLAKE2B 811e820ef036301ee1a6aafb2f74e5809baee591b37a04e5726bff4086f58d29e13ef7b0fd5f95fe9316232cff45ebd2d7c69fbdcd9a3d1322ede118c4577a65 SHA512 b1eb565dfb978cd4819817b1f0fbb9685c1a7d9d9863ea4a0da137056add6af98d6051eae1b81f37bfb0e673993a4af7dd760811e343bb2fd7a0d98a3ee1663a
-DIST Django-3.1.10.tar.gz 9654073 BLAKE2B c3729b7007b0b8309fda111f7bd988c861fb1002da3683e972a01bcd2aecfc6b42e896f91297239cba2061106096226552c26eb50325ea5b50f5a5df3a191bfd SHA512 6dd3c7a5cd1b5cbeb6e62f72fa56fce260bd407a3ac659ddee893489efae7a6bea862ecc113da342a2ed4cffa39e564c55dd20792b5435f9f00fef5488579aad
-DIST Django-3.1.11.checksum.txt 2552 BLAKE2B 11c8f9c26491dce2897e302e2ff92cfb8e481dcf93c46e91f1005a9ad92bfdc60e4e69682c94999f2e1fe37cf57ba452e03748862919d2f6afdb9c77c9ae1049 SHA512 8cee919d2a4d6b55dd1c6d91ad999caff0e7efe9a0d8c2a92e70d1fb51a534d924ac47fffd1a28b92e8060225c1fd7fda2bd693b977b29bed8f4ffe8a7f18041
-DIST Django-3.1.11.tar.gz 9654094 BLAKE2B 00e4ba95127d49b410cf0811e54fee5e5d17647a782ac6ffd30339ec81455479d913f62a29d83e7c87773cc81635393202a3065d3d0262cd17a033c7637fda76 SHA512 8da05ea46e4fdf20a90aadc954a9cf9e7e830e3822ff9095bd973628e74fa14e5397365740fcb5d76d393f2e5b39fdc578b3d7f12601feb9a3b3e057e6bbe086
-DIST Django-3.2.2.checksum.txt 2542 BLAKE2B 1a61ea4e8415d77b50d0dc227905596941a9cfed019c3442be1d7529d0b82204b08e15befdcccccd3a7a4625b762e99526b762053e9ec7c29068caa2dfe055a1 SHA512 eebb6e7172d85af3d6f65296d816f40cacd78c8270bd198d275c3c2844e9106ec517265490e7371d5df803d044ee1534a4eb836d2a279d395884c1ec7b9cb0f5
-DIST Django-3.2.2.tar.gz 9796920 BLAKE2B 09a720d169702f1d80b592e8a4c8e136b9b3c4539db44f8bcf3ef7d0e6bb678892b7ad4bbeac89fc887c9938cb35d8a9d3fee9a58e692f99c37e81f01615a6b4 SHA512 28d1d56cdf883f8fb5e438124be53dbefaa0045d1acf0b4b8b455a482422e2b88ffc5a3c8be2ee1b7d3c39fe29cfa854b44b438c3d43323483bd35e0d05f9e49
-DIST Django-3.2.3.checksum.txt 2543 BLAKE2B e15fd98b887e3e416d6636a84cfe08e23d920c3044c0382ff0821b47dced378fb89d05bd0e128b1237423be72ccdd1454f4a092b543f2325e1d3d1072e508ccf SHA512 7c898155e085f003dd9872cf266484d4d533d869df18aa5c431ca6bf9dee2682ef61921e3f31e43392c0539d2175a8000a37f371519ae485b38bda0eede54c67
-DIST Django-3.2.3.tar.gz 9798957 BLAKE2B b3b72fc405d13c63d6b12819390ee281319275350b38cbd7f8a2657f8ad39b7c4168b560d0c8db4a2f26231f6dccf5855bfa1259d6fb3d51fd1decc5e406d837 SHA512 a1f9f9661f1a851a00387007f5079615e70ad2357a3a99a1b4a77da6a31419b22fd9d321b8d9737092a02a3055df76cee2aa69404b804b392d94d3423d54b0f8
-EBUILD django-2.2.22.ebuild 2677 BLAKE2B 51325e634c8aa029d70de52fb128e4b168ca170d5bebee7763d55f3a924b7edf758031a9720ded7ee7e1f1a0f283e183a0cfe6d8bbe83629ba1cc5c1819b3457 SHA512 44812712ca209b8af0c14ee92d3db98d428feda28a8a16be9ec928e6c32c0dc9833a84f058f59d934181f57b658e2a6be2212eabd59f84eff17ee674a9bc19e1
-EBUILD django-2.2.23.ebuild 2681 BLAKE2B 118d4965e158c05702bd26488d3855f50cde2b711ea38fd010f4e251bec26420c760ae76be5532a9652e0b1e89b0f2553666f832834258050ef384622fdc5b60 SHA512 57e4675a6c154733b85a04e2d385efb2655aa0132e3207a798a659b269102e1fe5a2d3a0853c6d471538fe8bf17aff4e340e1709e12d286722ce29873eb44a53
-EBUILD django-3.1.10.ebuild 2772 BLAKE2B acad8972236a8f97952aa470f5cbe676f388e57302fce5fa9b6112ea77e9371e3bae3ef71034290a3f8d7ee814786b3c3228c4fcfd3cb71f739de69582745158 SHA512 1f062305576242f513303b6f3b2e9ba14a50c60200142429bb2a55ca6566233c4ab4bd5e19597cc52d5e9bf53a02d89f90ee0c72100aeeb5cc35314bef6c5890
-EBUILD django-3.1.11.ebuild 2776 BLAKE2B fecf7ec0e2d0f1e26b0f56dfea5f92f3b199334af5ea111e3a6c7508f8cdef3f49784ee4991a9fd439b735ab1b08bb75078b65009e3e1ec30055980cee005c9e SHA512 f48f07320ed0279783b5d9b4c221d28a83dec30916c4ae5ee7b1efa3adbc0a69c8e00fe4c3b864c8400603cd6f02eba78628bd5c6fb2fbb0f7d5091996304acb
-EBUILD django-3.2.2.ebuild 2726 BLAKE2B 921ef5276d36f224848cc7565b8d4134ae3e7fee9e9a191b38e9705396cd23f012d44512863861ef13cf86b48bd27c7ffb2337ead11f976bd1dacf0c18380cfe SHA512 ace7005c4d6127b9880a5b1eeb1639209fd6eed94ad02c53bfcffa7cf7fe2cfb612c73a1749b774c3517561189a05811689af31e35270d3da4c519ccc8d96ada
-EBUILD django-3.2.3.ebuild 2730 BLAKE2B 8250ca487a6f061f5b619b03f2885045c86a3b9db28a7d5487509ab2950fef155c76c4961321b71a8e58ddcdb11e4670682db561124c19422a86d31177600dc8 SHA512 9a49c009da2bb5ffa5f982a2c95e7869da105f755fce65d7a2926c9788332da897afc27a2ef6870a4ed5e835dacc56264d9eaa379b459f27407a64c322ee0f02
+AUX django-3.2.3-py310-repr.patch 3827 BLAKE2B 42f68fecf8fba65ffc23d19f95b5232ed020005d347fce1b30bd6a18755e649bc00ebd6aa7235810564e8954726dda4f541c58c599a9433d3ecd539717b97284 SHA512 6cfc9ee5f8c5c9a59bfeb5311e853604a6f77c7c747deb48780122f06e7634ea783f5ae82c4935a2a25f1cac358175cb8cbaa6285bd26da5e6fd35d3e3958e1c
+DIST Django-2.2.24.checksum.txt 2558 BLAKE2B 8a4b1759f0c52f9dfe6eafc2b54d2d6db8c1204be837ef0df362e02afb41faa3fcfef3ee1b5bc10482a200db58c21c3a7a9650b6ed8103c69f196b655af5b239 SHA512 e26d71ed2cded2521837c82ee896b68d765da224a42f34457cb67a0105a72b2b0223655208400baddf7bb70dd51c4902b9ae80d8cb2bc8963c16b23d37bb2d53
+DIST Django-2.2.24.tar.gz 9211396 BLAKE2B 7422019ad8849ae543d7b2ca7f5624b5379c832b5d19511f52df77d95acaa0a45cc61579b0e3a74671c295ffab5e1dfecd1c044e9ec042c46606f888c257e1d0 SHA512 5a3ee79500ad458bfc5220b9b68248bec59bf6d2304d58ca280111854d6a5f7e25784680e949487e8b59c1de0b329a53cf0676d2ee4bb2b88463918c4b0b6085
+DIST Django-3.1.12.checksum.txt 2558 BLAKE2B fe31c76517811b5a69bbab6a44966059b40e26e81134682a56753fb886abb1081ad998628fb45eb9959fa1b625c1ffc7128ed0153aadde23319ca28daedf71ca SHA512 6b5a243eee10a33721725be4f09b34395f0d7b34775c72b387d47445947de25f927b2b6d3bc6d76896096b8d06080ebd66ad3a667984087b7c3505a705ec8f76
+DIST Django-3.1.12.tar.gz 9676259 BLAKE2B 91781b77b63591a9fc1dffbe341b5400898ccce6267b18236f8680e86f02bb70cc4ab3297fb504e5a809947bd7e68795286b875f319a60ad501d38f4af1f17a7 SHA512 7b58d0bd6ccd6a3222bd58e87ee26646e75b807f284cb259baa5442514c249b3d7695ed0c61e5cc544e121d06a102c5ea1b40694d17e7d4dd3a8437891284c0a
+DIST Django-3.2.4.checksum.txt 2549 BLAKE2B d7f9e0fb88d9913c611ab3e5c0c276e135d2f2dbf2ad27043a46a9c57ecfd7e7f774b1d60630f47a53fdf455e63b2deb32b4f9caed77f33732cf85c92dc03108 SHA512 67e67719eb24fdf47da9611eb18184283657dca398eaf52963e17b2ff29a2687921171b1c68853fb7e17307d03c01be0d2554931c8bff38e2252c371f81e40b9
+DIST Django-3.2.4.tar.gz 9824343 BLAKE2B 25123c228171953e057fe6ba75afadc49c49567e167045c292606e914538f58f9628e48485f611afaacd7e173f36c720391c06662f8dcd796e966f7557f60216 SHA512 5891f77c884cb4bc74f4c9759e2e7be463fc0c661b8dd4d889be0ec46919e59b81f5ce1585c28075b15f03355e66d4b8e7b09001f0c2bea15f8c8aac77d1ea16
+EBUILD django-2.2.24.ebuild 2677 BLAKE2B 51325e634c8aa029d70de52fb128e4b168ca170d5bebee7763d55f3a924b7edf758031a9720ded7ee7e1f1a0f283e183a0cfe6d8bbe83629ba1cc5c1819b3457 SHA512 44812712ca209b8af0c14ee92d3db98d428feda28a8a16be9ec928e6c32c0dc9833a84f058f59d934181f57b658e2a6be2212eabd59f84eff17ee674a9bc19e1
+EBUILD django-3.1.12.ebuild 2772 BLAKE2B acad8972236a8f97952aa470f5cbe676f388e57302fce5fa9b6112ea77e9371e3bae3ef71034290a3f8d7ee814786b3c3228c4fcfd3cb71f739de69582745158 SHA512 1f062305576242f513303b6f3b2e9ba14a50c60200142429bb2a55ca6566233c4ab4bd5e19597cc52d5e9bf53a02d89f90ee0c72100aeeb5cc35314bef6c5890
+EBUILD django-3.2.4.ebuild 2986 BLAKE2B 4a9aadf48261a39c8d4edc24b5fda7d6317c1f0391e34c67c14054e93f77530c8ccd481d465e08015fe03adaa6d230f93177390d357de94e0b9d3aeb9c2210be SHA512 d801e4069fbf1f7a3b55ea456fe50f97c5980132e75e9d83023e7423983d65cf9f923abfcf1e0d498f0682fec5315c219012fcb179aa5deb177e8541c75983a3
 MISC metadata.xml 399 BLAKE2B f49845f5a6476a0b43cbe47ab11b298f53703d850d145a31967f512d9402048fc1b1891606ddba7342ea9613c27ace3986f6b508ed83f0c5eccb26a13fd49f85 SHA512 92470f2930b1c940ccf3478b11157adcc4b84924b0cab4e1fd8aae98c7bba14e995491ce44810223eeb3802967be68c867d0ee4ac0df9f49b4234efd1a7ecfa7
diff --git a/dev-python/django/django-2.2.23.ebuild b/dev-python/django/django-2.2.23.ebuild
deleted file mode 100644
index e49bcb28c32e..000000000000
--- a/dev-python/django/django-2.2.23.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE='sqlite?,threads(+)'
-
-inherit bash-completion-r1 distutils-r1 optfeature verify-sig
-
-MY_P=${P^}
-DESCRIPTION="High-level Python web framework"
-HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
-SRC_URI="
-	https://media.djangoproject.com/releases/$(ver_cut 1-2)/${MY_P}.tar.gz
-	verify-sig? ( https://media.djangoproject.com/pgp/${MY_P}.checksum.txt )"
-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 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="doc sqlite test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/pytz[${PYTHON_USEDEP}]
-	>=dev-python/sqlparse-0.2.2[${PYTHON_USEDEP}]"
-BDEPEND="
-	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}]
-		dev-python/pillow[webp,${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/selenium[${PYTHON_USEDEP}]
-		dev-python/tblib[${PYTHON_USEDEP}]
-		sys-devel/gettext
-	)
-	verify-sig? ( app-crypt/openpgp-keys-django )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.0.7-bashcomp.patch
-)
-
-distutils_enable_sphinx docs --no-autodoc
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/django.asc
-
-src_unpack() {
-	if use verify-sig; then
-		cd "${DISTDIR}" || die
-		verify-sig_verify_signed_checksums \
-			"${MY_P}.checksum.txt" sha256 "${MY_P}.tar.gz"
-		cd "${WORKDIR}" || die
-	fi
-
-	default
-}
-
-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() {
-	optfeature_header "Additional Backend support can be enabled via:"
-	optfeature "MySQL backend support" dev-python/mysqlclient
-	optfeature "PostgreSQL backend support" dev-python/psycopg:2
-	optfeature_header
-	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.22.ebuild b/dev-python/django/django-2.2.24.ebuild
index bc3377ea66e2..bc3377ea66e2 100644
--- a/dev-python/django/django-2.2.22.ebuild
+++ b/dev-python/django/django-2.2.24.ebuild
diff --git a/dev-python/django/django-3.1.11.ebuild b/dev-python/django/django-3.1.11.ebuild
deleted file mode 100644
index e41026d47720..000000000000
--- a/dev-python/django/django-3.1.11.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE='sqlite?,threads(+)'
-
-inherit bash-completion-r1 distutils-r1 optfeature verify-sig
-
-MY_P=${P^}
-DESCRIPTION="High-level Python web framework"
-HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
-SRC_URI="
-	https://media.djangoproject.com/releases/$(ver_cut 1-2)/${MY_P}.tar.gz
-	verify-sig? ( https://media.djangoproject.com/pgp/${MY_P}.checksum.txt )"
-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 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
-IUSE="doc sqlite test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/asgiref-3.3.4[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	>=dev-python/sqlparse-0.2.2[${PYTHON_USEDEP}]"
-BDEPEND="
-	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}]
-		dev-python/pillow[webp,${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/selenium[${PYTHON_USEDEP}]
-		dev-python/tblib[${PYTHON_USEDEP}]
-		sys-devel/gettext
-		!!<dev-python/ipython-7.21.0-r1
-		!!=dev-python/ipython-7.22.0-r0
-	)
-	verify-sig? ( >=app-crypt/openpgp-keys-django-20201201 )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.1-bashcomp.patch
-)
-
-distutils_enable_sphinx docs --no-autodoc
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/django.asc
-
-src_unpack() {
-	if use verify-sig; then
-		cd "${DISTDIR}" || die
-		verify-sig_verify_signed_checksums \
-			"${MY_P}.checksum.txt" sha256 "${MY_P}.tar.gz"
-		cd "${WORKDIR}" || die
-	fi
-
-	default
-}
-
-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() {
-	optfeature_header "Additional Backend support can be enabled via:"
-	optfeature "MySQL backend support" dev-python/mysqlclient
-	optfeature "PostgreSQL backend support" dev-python/psycopg:2
-	optfeature_header
-	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-3.1.10.ebuild b/dev-python/django/django-3.1.12.ebuild
index 16ea57edc020..16ea57edc020 100644
--- a/dev-python/django/django-3.1.10.ebuild
+++ b/dev-python/django/django-3.1.12.ebuild
diff --git a/dev-python/django/django-3.2.3.ebuild b/dev-python/django/django-3.2.3.ebuild
deleted file mode 100644
index 87dacd55b40f..000000000000
--- a/dev-python/django/django-3.2.3.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE='sqlite?,threads(+)'
-
-inherit bash-completion-r1 distutils-r1 optfeature verify-sig
-
-MY_P=${P^}
-DESCRIPTION="High-level Python web framework"
-HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
-SRC_URI="
-	https://media.djangoproject.com/releases/$(ver_cut 1-2)/${MY_P}.tar.gz
-	verify-sig? ( https://media.djangoproject.com/pgp/${MY_P}.checksum.txt )"
-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 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
-IUSE="doc sqlite test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/asgiref-3.3.4[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	>=dev-python/sqlparse-0.2.2[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		$(python_gen_impl_dep sqlite)
-		${RDEPEND}
-		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}]
-		sys-devel/gettext
-		!!<dev-python/ipython-7.21.0-r1
-		!!=dev-python/ipython-7.22.0-r0
-	)
-	verify-sig? ( >=app-crypt/openpgp-keys-django-20201201 )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.1-bashcomp.patch
-)
-
-distutils_enable_sphinx docs --no-autodoc
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/django.asc
-
-src_unpack() {
-	if use verify-sig; then
-		cd "${DISTDIR}" || die
-		verify-sig_verify_signed_checksums \
-			"${MY_P}.checksum.txt" sha256 "${MY_P}.tar.gz"
-		cd "${WORKDIR}" || die
-	fi
-
-	default
-}
-
-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() {
-	optfeature_header "Additional Backend support can be enabled via:"
-	optfeature "MySQL backend support" dev-python/mysqlclient
-	optfeature "PostgreSQL backend support" dev-python/psycopg:2
-	optfeature_header
-	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-3.2.2.ebuild b/dev-python/django/django-3.2.4.ebuild
index b0bed67e8146..6c6a565edfbb 100644
--- a/dev-python/django/django-3.2.2.ebuild
+++ b/dev-python/django/django-3.2.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 PYTHON_REQ_USE='sqlite?,threads(+)'
 
 inherit bash-completion-r1 distutils-r1 optfeature verify-sig
@@ -50,6 +50,8 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.1-bashcomp.patch
+	# From https://github.com/django/django/pull/14228
+	"${FILESDIR}"/${PN}-3.2.3-py310-repr.patch
 )
 
 distutils_enable_sphinx docs --no-autodoc
@@ -67,6 +69,13 @@ src_unpack() {
 	default
 }
 
+python_prepare_all() {
+	# Fails because of warnings
+	sed -i 's/test_dumpdata_proxy_with_concrete/_&/' tests/fixtures/tests.py
+
+	distutils-r1_python_prepare_all
+}
+
 python_test() {
 	# Tests have non-standard assumptions about PYTHONPATH,
 	# and don't work with ${BUILD_DIR}/lib.
diff --git a/dev-python/django/files/django-3.2.3-py310-repr.patch b/dev-python/django/files/django-3.2.3-py310-repr.patch
new file mode 100644
index 000000000000..9bc32ecf176d
--- /dev/null
+++ b/dev-python/django/files/django-3.2.3-py310-repr.patch
@@ -0,0 +1,92 @@
+diff --git a/django/db/models/constraints.py b/django/db/models/constraints.py
+index b073df17636a..6dfc42942f79 100644
+--- a/django/db/models/constraints.py
++++ b/django/db/models/constraints.py
+@@ -4,6 +4,7 @@
+ from django.db.models.indexes import IndexExpression
+ from django.db.models.query_utils import Q
+ from django.db.models.sql.query import Query
++from django.utils.version import PY310
+ 
+ __all__ = ['CheckConstraint', 'Deferrable', 'UniqueConstraint']
+ 
+@@ -85,6 +86,11 @@ class Deferrable(Enum):
+     DEFERRED = 'deferred'
+     IMMEDIATE = 'immediate'
+ 
++    # A similar format is used in Python 3.10+.
++    if not PY310:
++        def __repr__(self):
++            return '%s.%s' % (self.__class__.__qualname__, self._name_)
++
+ 
+ class UniqueConstraint(BaseConstraint):
+     def __init__(
+@@ -218,7 +224,7 @@ def __repr__(self):
+             '' if not self.expressions else ' expressions=%s' % repr(self.expressions),
+             ' name=%s' % repr(self.name),
+             '' if self.condition is None else ' condition=%s' % self.condition,
+-            '' if self.deferrable is None else ' deferrable=%s' % self.deferrable,
++            '' if self.deferrable is None else ' deferrable=%r' % self.deferrable,
+             '' if not self.include else ' include=%s' % repr(self.include),
+             '' if not self.opclasses else ' opclasses=%s' % repr(self.opclasses),
+         )
+diff --git a/django/db/models/enums.py b/django/db/models/enums.py
+index 7082a397c237..dd9088597d4d 100644
+--- a/django/db/models/enums.py
++++ b/django/db/models/enums.py
+@@ -2,6 +2,7 @@
+ from types import DynamicClassAttribute
+ 
+ from django.utils.functional import Promise
++from django.utils.version import PY310
+ 
+ __all__ = ['Choices', 'IntegerChoices', 'TextChoices']
+ 
+@@ -74,6 +75,11 @@ def __str__(self):
+         """
+         return str(self.value)
+ 
++    # A similar format is used in Python 3.10+.
++    if not PY310:
++        def __repr__(self):
++            return '%s.%s' % (self.__class__.__qualname__, self._name_)
++
+ 
+ class IntegerChoices(int, Choices):
+     """Class for creating enumerated integer choices."""
+diff --git a/tests/model_enums/tests.py b/tests/model_enums/tests.py
+index 78f8b146be92..cda835010d7e 100644
+--- a/tests/model_enums/tests.py
++++ b/tests/model_enums/tests.py
+@@ -48,7 +48,7 @@ def test_integerchoices(self):
+         self.assertEqual(Suit.values, [1, 2, 3, 4])
+         self.assertEqual(Suit.names, ['DIAMOND', 'SPADE', 'HEART', 'CLUB'])
+ 
+-        self.assertEqual(repr(Suit.DIAMOND), '<Suit.DIAMOND: 1>')
++        self.assertEqual(repr(Suit.DIAMOND), 'Suit.DIAMOND')
+         self.assertEqual(Suit.DIAMOND.label, 'Diamond')
+         self.assertEqual(Suit.DIAMOND.value, 1)
+         self.assertEqual(Suit['DIAMOND'], Suit.DIAMOND)
+@@ -89,7 +89,7 @@ def test_textchoices(self):
+         self.assertEqual(YearInSchool.values, ['FR', 'SO', 'JR', 'SR', 'GR'])
+         self.assertEqual(YearInSchool.names, ['FRESHMAN', 'SOPHOMORE', 'JUNIOR', 'SENIOR', 'GRADUATE'])
+ 
+-        self.assertEqual(repr(YearInSchool.FRESHMAN), "<YearInSchool.FRESHMAN: 'FR'>")
++        self.assertEqual(repr(YearInSchool.FRESHMAN), 'YearInSchool.FRESHMAN')
+         self.assertEqual(YearInSchool.FRESHMAN.label, 'Freshman')
+         self.assertEqual(YearInSchool.FRESHMAN.value, 'FR')
+         self.assertEqual(YearInSchool['FRESHMAN'], YearInSchool.FRESHMAN)
+diff --git a/django/utils/version.py b/django/utils/version.py
+index 4b26586b36..b84ca7db27 100644
+--- a/django/utils/version.py
++++ b/django/utils/version.py
+@@ -13,7 +13,7 @@ PY36 = sys.version_info >= (3, 6)
+ PY37 = sys.version_info >= (3, 7)
+ PY38 = sys.version_info >= (3, 8)
+ PY39 = sys.version_info >= (3, 9)
+-
++PY310 = sys.version_info >= (3, 10)
+ 
+ def get_version(version=None):
+     """Return a PEP 440-compliant version number from VERSION."""