gentoo resync : 07.01.2022

5 files changed, 12 insertions, 110 deletions

diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index 5b2957288f7a..e58da6f3e627 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -1,16 +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
 AUX django-4.0-bashcomp.patch 2021 BLAKE2B f04c83b500a92ea8ef9609225191e38a41b3349a295beca8f8575ab05395d0cf37e1aefe295004b11c1bcf34cce9074ac7d274034cb50e1ae43e2fcb5d6952b2 SHA512 2215dca4120023b0fd839738bd602443c49e9adaa98d182bc74081ebe70613649c2dc11e2b5f6242701dceac25755adb8605774895091360b56ed1195a7e629e
-DIST Django-2.2.25.checksum.txt 2556 BLAKE2B 81743dc51043d12af7dce1f70190a1e53a6be7a8ae6f34fe10fa713321f8d432119f6e4e58679866a8d61dbe640c8c18d97dfa9a3767bbafb5732b9619ecb475 SHA512 1cc2982c3ab83c4af47adad14a07badc301f1b03640c34ac043ca663ac0e8c3c0a9c4de8ebd01e29f2e2c8441ae29826c91faa8f1d4e6f6824e7c849a868ddf7
-DIST Django-2.2.25.tar.gz 9185326 BLAKE2B 54df79f3ee75d588cdf46c931a53331894bc113563d2e472cf5472ba66eac1ed62f9e54798dd726837be2ef9598ed20936dbe5e3ff395249e7011af3d551e672 SHA512 c3d377c8d1ce54c93477615cff1cc74fc21791bc9db6b059787e07d0bc25b4d0c1a5804bf781d45ebba1f5f5c280957cff2bba063fea4fc005a1e945b9a7fa8f
-DIST Django-3.1.14.checksum.txt 2556 BLAKE2B bb17e596d076489ac00b6b3eb98ab2949692a82fbc542537f3758c2a53ea4aaeca15bf00c49b363e00d32c2d6face05e6b6e07000219cb8e5ceea2f9d9918ec2 SHA512 a0dd1e9dd739e6891435a02ce4711560c7f0c869a04d540fdb1b90d2cedfdd7d9892e442fb991c4f4cb8ca1862fd8f3a55d88a10645ecf0178d1ea63e17e8e89
-DIST Django-3.1.14.tar.gz 9659386 BLAKE2B 5e9317e777e3879f2cea3eea98018884c073eed47c3da9aab09858bc0869f4f34f48d20860c32344446498879b6c9b5cb9d5ba12f0528b703436a2c37325d286 SHA512 5356f453e23a33092221137769a594608771c5832c0dc00453e571fee056438b5366eba720b1fefa33099356980ee56a9665fc6ed7c86f5412e45d6432940e64
-DIST Django-3.2.10.checksum.txt 2556 BLAKE2B cdc1b28f213e43b27b0534587b8475bd68979f3c179357a7978109fa85ee0a4bbd5d0bba4625e6850aca603f688483dbdcb102a7411e74394079d2b0c0ef767e SHA512 852f867a5a11f11f98710cf27fdba2774de537dbe1e5edc402214acb65a6e00bf05a7b4fe5eb663cc21aa6ee9da890d7c74172a17c1b084db89ada1ff1db3745
-DIST Django-3.2.10.tar.gz 9811341 BLAKE2B a2ed3dda0d88a884443cc07446921fcd9cc9f302b5f578910f2e4027f8d87b92717bb22a7bf73cdb44fb7ddf4c178349e31eee6b796a45727356cde24e41d318 SHA512 6b793a1e544ab988d909d9fc5152d9dbba864c4916bb1f703a07c72f1a945ba93ba53b2f8843b67a16d0e68a736c43faf2f3d8aaa0867de1668c3845c24da7da
-DIST Django-4.0.checksum.txt 2529 BLAKE2B 0488acaf4fe37c99e3bd2370d47c47db81ffcad961212a88e7d53349299fdb3cbdc4a10fea3729d6d2353405216b8073abe8fcb2596b845760f16f2539ba4417 SHA512 26ac6ce6118d60d7bd0f0ef4c24c590eef7a102f546c3163000ad392d8f64b1c24648b8a4110df81170d60e3528466ceae974d408a700cf238dfdb8f9386d1ce
-DIST Django-4.0.tar.gz 9980403 BLAKE2B fb3cdaa8beae6983930d1e2760d617f1a96e52d7f538269709b07cc31ef049511b0517c1538934cf9ede5e374cd466df05ebabe29f1f8fb8c4c3928e8a08a1fc SHA512 6fec0521ee7da209f3b0fb1487ef4e8ef16bf3bf4ea108efc7a2ee3a9d28c7c33e5e3b2bd92e231641b0be902b45d1fd8b712c48a33496ae2c865a3698b25e14
-EBUILD django-2.2.25.ebuild 2676 BLAKE2B 0c278d54063d1fef974e72611a50fc3973c8dffff93c3d2b62d72f78dd686c100ff19cf8768487177de46f66a17b39c40d2ef7e92afc960f363af19c1c55d259 SHA512 5771facbf2515fe895a28e4efbf1b7e95b6b7f98835aae5defc4c7a04dfdaaa60de4f37dfef69c90a33e292802f85eb89ff57b16978cca6db202748e44307792
-EBUILD django-3.1.14.ebuild 2771 BLAKE2B cb8c69f33caeab2452657c4354120dd5b662557291a223a6a260da8db1b82d0a57ba8a4f9cafe17de0a91d4433f07c314c5730763a149246c699f177214755ff SHA512 af2ff5a64329854b87edc3509bc5fd681ba8bbb7d0db9fd0ab13844d42b2e5d3eb0101a277e0dace6b15aff651713b9060ea2e6dc5fcb24350020316e3feeaf3
-EBUILD django-3.2.10.ebuild 2896 BLAKE2B 10e46ab3e1c6443c7ac115c505fa6e0dc4fdf2fe78feec35c5050ef4751fbcc87159758b36855506a354eef1eb1c4e58f8c8398dfc65b8f3fde2b025eb5c159a SHA512 5fde5a41a754164b72282e18376bb1043ffeff4df808a80c2dcdd225ef91caad57937b70831290fa13c4f7d2306f62e93c1c6df37faf0551a5bb30fe328614f3
-EBUILD django-4.0.ebuild 2960 BLAKE2B 0188adcaf76b4197443e36fba4797a853da2b3f0df773bb47745b9dc90735a8834eab59b2a30ba59db25518c8d9786cf140ef22efdf98c51e3eeea1d003237c8 SHA512 b3f11eec2f4a8e25e017ab6cdb3de8d4850943c7b88a8d75a02e88f49cf4affcb48b0e990925daf34b98794b3088de9caadd08aa963aeffbadaee367458d7b89
+DIST Django-2.2.26.checksum.txt 2561 BLAKE2B a974c7d5c8cef76e781e4fa1559725cc7d77de3d16b08ec20d034b38cb39a986b62397532bbc81d4414b3eae8a5487a9fef9615eed73946a54a2b43cdf34a6ad SHA512 7c1d3e04913237ed0dc9955eedd02cfb5113b9536ed0b471d873269ec82099561714a061b74bf212c2e99bbe47e6cf72e639358a2f9134f751fdd7cd53e6ce17
+DIST Django-2.2.26.tar.gz 9207984 BLAKE2B abd520bc5681b8450e51c4248eb97558daa6a87f74915bea8857843a5ea9be6bf3a04c9f5871c35d2076adb644da266c7b88ac39bb2837ff1eaa71f885bd08bf SHA512 2005b081e7347f6f8fd4837219043bd1728cd85aca00c62a16432f63272abec7d30b7461675708fa0f55e3273af5bbd67c26d31934f8a4a38f48e65ea721916f
+DIST Django-3.2.11.checksum.txt 2561 BLAKE2B ece4f40d4d368e2e5ad3cc3ed6072aa8d1693b47d68b76020059508bfc10a30f6291f5e84c68bb959fa973c4e060bf4fd408beefaedc13b68e81b721cb78aab3 SHA512 4f2c12088cfb69f547ba687e9cac34b68a9bd28c793482430bda078f51e780b1272de7ec7816dc31d2fa93bf1c68973f847d67c01414fc8bf07fa6f6ea09dc39
+DIST Django-3.2.11.tar.gz 9821958 BLAKE2B 8f83db578e31c3cbeca67bd826b4c639b346e449de83aba6ddf6bf4eef1fc58ebcbbddf91227012e592516d7796d9f3cc468ae4ce51d684b4aa0a417bb39ddb1 SHA512 ea1ca9a76afcd7e20d0ce518efc0497bbd11f4ab7ed20bd4490561bfcfc6c80db8922a22d8aca94c1dc2743e7366b28a0ae76c3d64f55afc142c38a744dd5120
+DIST Django-4.0.1.checksum.txt 2552 BLAKE2B 123a613af7ff1ccb423c11086501a4419d86cf07c0ae7a4751f12d32f1592916e72e3e47cee13192944a3fc05ce5ee7ac81038118e346545536f313a10783de6 SHA512 979a7c5efafd4d8923d6c769ddd7d73c67482c33fd1a76c64d75aee0a03399e35703e7cbde9f5ad25baab969c33ab53690400e39c879e54066a146944e5d0ee1
+DIST Django-4.0.1.tar.gz 9995484 BLAKE2B af05ec1ec1d079e383efc590de78413b7fd769e7f03c5d4bdcfd26f193a46f783b4c3428558f5d3281cab9a7fa8be4cfecdc4edaf1bea72f37e8e983b3c061f1 SHA512 7753c516b080c10673c3a95e8ec4af00984aeed5f288e4d6e7ab1efd461222a343701b21cfd27bc61ee4e63df5ce3f3be49398490a995f6839e63b40c3fe306c
+EBUILD django-2.2.26.ebuild 2676 BLAKE2B fac142da15bc8f27726191808b107e7e49be0d68d779259ce4a1730aba104d3fc978292dd8c5ce7fbe9020a802eedad02d5cf1c50e6cbb314e540a254f78e2d9 SHA512 a7cb898618b31a624561389e19fd318bfa9afaf7609e9fedf1d049b7f3dd99b45c39d619d0db3c895f305dac09ac39c33c947cb60422908c394a2a31690d8a8c
+EBUILD django-3.2.11.ebuild 2896 BLAKE2B e152a21beddeb46f0b5ca0210bf362fb4eafbd8ac1152964bab008d4fe47d7c250e6f8d082055797a89c0ef34a9fe1137d9f9fe46a45376c53ba433d78fd5e60 SHA512 9a0788fb8f1c916d79871eeb24b67e8f9fe803db707533994e3087c641e430f6eba308f95775b4006f06b7576bb5b9a19c9bf906c4f50cba1f54fd281331532b
+EBUILD django-4.0.1.ebuild 2960 BLAKE2B d04166c92cbcd1fbd20884f198d3dedc26215f31501d17d10dabd240302a96be117a4b793af6161aefdffe82d2a23de9c2f5d445d00519fbf9bfcee5d7d39dbc SHA512 6dce1aa3cf814809d01b6c69a02d6f2c979d4755c709b606106b62ed4f71e0883203f50bd1ef0b12d0d8a135ca89d57da2ee27855a068b0b427e753f1be36bec
 MISC metadata.xml 400 BLAKE2B 6b3414ac734f078d90c82b44edd2f9f70e494e98da8a3d874d18006ae5e0eb5f7060b98b402094d6045e800bf525586f2566e6f554a8b2999cce37bdcc5472a0 SHA512 1cf0bb6ef93da3abbd1a66878462b1b8672a9b8fccd7f968b427e429caa6ecf30cb703a6060d621ccad1ba77b927d2b0e632b04b0a47975918ccbfcc5f2b85f7
diff --git a/dev-python/django/django-2.2.25.ebuild b/dev-python/django/django-2.2.26.ebuild
index 3736087882ce..6f0e46e6ba74 100644
--- a/dev-python/django/django-2.2.25.ebuild
+++ b/dev-python/django/django-2.2.26.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-python/django/django-3.1.14.ebuild b/dev-python/django/django-3.1.14.ebuild
deleted file mode 100644
index 1acd30dd125e..000000000000
--- a/dev-python/django/django-3.1.14.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_{8..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? ( >=sec-keys/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.10.ebuild b/dev-python/django/django-3.2.11.ebuild
index f3ebf76cca94..497bdd348c2e 100644
--- a/dev-python/django/django-3.2.10.ebuild
+++ b/dev-python/django/django-3.2.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/dev-python/django/django-4.0.ebuild b/dev-python/django/django-4.0.1.ebuild
index e75b65ed859d..69f33e23fb87 100644
--- a/dev-python/django/django-4.0.ebuild
+++ b/dev-python/django/django-4.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8