gentoo resync : 11.05.2021

6 files changed, 12 insertions, 101 deletions

diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index d3b18fe7e3e2..5deaab957b5e 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -1,14 +1,12 @@
 AUX django-2.0.7-bashcomp.patch 1507 BLAKE2B 8aeb494087dbccffc69ad43f370e791d9fbfb1908d45f55d5f8be01ec0f3af6b2aff591da84a06c0858fecd44180579a4647d622ef57d8235ccb4b3b80fd3a2a SHA512 5a3867b8e4f2fafe4c53a741d41e8c6e8e28a55463f7d8007afd669a04daa8b93f911e4ef8d5ad38ba300558f21ac8090b00337d0c0bfb93b2aea73a179334a4
-AUX django-2.2.21-fix-bpo43882.patch 843 BLAKE2B 9dc2f2330fba2676782775329e23684712ffb14c598ea5ed5c5f326bb4f9378c67e7187ff0d31189bc9ba690eee0fbc7e8c27119bfac55f6ca89cb5a418cf445 SHA512 c2eb24e649c82da5830eb6d82fb6eabb5d46ac1b47ce805171903a20ec4fdab06179a7e6c8e60e2dcdf3299ed397725ad1120f6d2b34de15d0a13b66b4ef18bb
-AUX django-3.0.6-bashcomp.patch 2060 BLAKE2B 6bff228193b4cfe4f0f4c3d727146dffdb43c1decf1231edf6ab15d9de4a0b504ad4ec9f00f8f6030562a50584e0445ed8d671c6af84926d7b1d23380258a35d SHA512 f9a962ff61ba8fba490b2b8c233cbf2770751c7a184c64915039a4b476b2f2d235896aa3af514ace72d0fe0a4fbb8858534196d163a44edfa0a043e3b9fe178a
 AUX django-3.1-bashcomp.patch 2085 BLAKE2B 36a0aa4d3413f13089ac104f5d3f98ecbb152a9a5a35f8c1ff2e5ffc9824153b0ac89f1cbca76c31a1afefde471e4d6ed801e405551b25cb31da89c20f3019cc SHA512 82dceede4292bad6e3e4966a6dba01bd2bbc7db494fce592e25dc4a64236485d88d8ad67b247239a80f8fe96dff054d20afea6f48a5518b67cf88404d399e61c
-DIST Django-2.2.21.checksum.txt 2557 BLAKE2B 76c1588760de34bdd4274eb12abcb60dd476ef1057dd7679ae76f8b7fe916c40c26ab19a821075523c5ae886802af7aa267efafe3d8192ad14ac18557651f5cf SHA512 83d4893e83eaf271f783c177549f8267a2d84969a6d87447f3cb9d9cb36d9acb48564867644c7d95763f9a3888dd9d8647233733b92b432c54e4472f8c34a5fd
-DIST Django-2.2.21.tar.gz 9209871 BLAKE2B 616215d43fc879bd4f01fb6fec7f3fa47c4630bcc961c8606c01a6e25c2ff27dfdf886db7dc03f8445b52957c1ad858fb8bb5e7cd25c97a927646bba436399de SHA512 37d1f58c23907792e49c827fe1efe4345fd5d74ca85b44d1f492d45c9f4f7cc9ebfbd59dc6a142bb24b666fb89e2ee62a3bc3e2242cd25d5c1e801a3f07a2589
-DIST Django-3.1.9.checksum.txt 2548 BLAKE2B 2b733f7ef48b861fd97136a4efa034420e956e506020336ffaec4de7aa7d967d88bcfc5d8574afde317a74f95703378489109334569a84e163fcc635c59378ee SHA512 4558df4393661deb44c0b0c4658aeef3757e8e16dab98b177d0f5102398530dc96d526a955e4f7c88b2d0c40af544e7f9f6deb8d2697c4626c19e16f1860fb06
-DIST Django-3.1.9.tar.gz 9673018 BLAKE2B 6212bb48b31566ed2d87f2bdf7922b6e3e93df06b4f8f7ddb1fd20a1a7465856ccc280dad6885f1d2fbf90c6c1919cbc0830416e82e4123fee1c116561d0631c SHA512 7df6afd2539407727a250a981488c80450b882772ecf0edb778182a828d4c80a47b668e64e6e2adc8d21fcab92aef5322cfae3f386369688087774708e75fa13
-DIST Django-3.2.1.checksum.txt 2548 BLAKE2B 2f5feeffd4cc664e5ef97de2ae1428a9f432f4480fee846bf8abefbecdd4e418736ca700481e3fc6f114d6c62ff083dae60cefee4e5d8481f97f013fba1e0242 SHA512 32cfa9d890059fda32bbd0062b0333bad4b1b616bd555a99870fad09e7d3c662117b4fd5fb98ac7e634daf199434c2f58fdaeb28d895cf714ae05fbf7eef1b91
-DIST Django-3.2.1.tar.gz 9820723 BLAKE2B 968104e3a42310effe8a81b46eb7e17b97aa8f92fddaeef6a1dbee49947d9711daf0c71628fb9c4384a4e7bcb63041a15151f71a368f20934db80513967f0ea2 SHA512 5f3f80047cdcb6c9a07ca0dc9d6d83d190c8c0215311f39e6e441384659c92e4fa42bf4677d297a4ba8520a0bfbd78c4b2ca13cf467c1e1220c0c6a3131ba444
-EBUILD django-2.2.21.ebuild 2725 BLAKE2B b2f3a1be09a55578bf00a92322073f2a43c021a0ad18efd1c598aea8f8ec15ea262a872e0ababc47ff61e0bb338432b49d92a1ec81384eda5943f4d0cc2825f5 SHA512 27d8d0ce2583d476c13b2953ad66633d18e078238d3876d11070c9e11c12f676422be8bfc94f39ec9b4fd0dc14ae66d22f9b0d966d1bf5e28e2e69b75b03e727
-EBUILD django-3.1.9.ebuild 2876 BLAKE2B cbb035ad8ed822f234e1343dfd1e3a76e043adf85efc2c1a939477e5c471dde5302e09d60b5b31656e13ef10f30ad63d31f995e1bfb91508371b2674a44c87b4 SHA512 4c569c1dccfcf0d0db7edf346fad7637060fc0df7837922758a48e02115ccda417cd004adfbb7bb8d13abbc0c7133a4be6a6dc7fb99ad3ffbc2ac5690bc7c4a7
-EBUILD django-3.2.1.ebuild 2778 BLAKE2B 8248c327df847bf3ea2fc0d8bb5f6de20c3e17faf55a5dbdd2ab6a625cbc150658356856f27ad580a99f12b7949be4fa9605f2b37eb13602e21f9f0ecc79425f SHA512 2f398b666a890f39f410adac77c75558eecec950db3ac784ecc4190525feb0a6986b331dfb48402628fd65c7a474176aa2211718b5b42ac4ee590c56970c0652
+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-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.2.2.checksum.txt 2542 BLAKE2B 1a61ea4e8415d77b50d0dc227905596941a9cfed019c3442be1d7529d0b82204b08e15befdcccccd3a7a4625b762e99526b762053e9ec7c29068caa2dfe055a1 SHA512 eebb6e7172d85af3d6f65296d816f40cacd78c8270bd198d275c3c2844e9106ec517265490e7371d5df803d044ee1534a4eb836d2a279d395884c1ec7b9cb0f5
+DIST Django-3.2.2.tar.gz 9796920 BLAKE2B 09a720d169702f1d80b592e8a4c8e136b9b3c4539db44f8bcf3ef7d0e6bb678892b7ad4bbeac89fc887c9938cb35d8a9d3fee9a58e692f99c37e81f01615a6b4 SHA512 28d1d56cdf883f8fb5e438124be53dbefaa0045d1acf0b4b8b455a482422e2b88ffc5a3c8be2ee1b7d3c39fe29cfa854b44b438c3d43323483bd35e0d05f9e49
+EBUILD django-2.2.22.ebuild 2677 BLAKE2B 51325e634c8aa029d70de52fb128e4b168ca170d5bebee7763d55f3a924b7edf758031a9720ded7ee7e1f1a0f283e183a0cfe6d8bbe83629ba1cc5c1819b3457 SHA512 44812712ca209b8af0c14ee92d3db98d428feda28a8a16be9ec928e6c32c0dc9833a84f058f59d934181f57b658e2a6be2212eabd59f84eff17ee674a9bc19e1
+EBUILD django-3.1.10.ebuild 2772 BLAKE2B acad8972236a8f97952aa470f5cbe676f388e57302fce5fa9b6112ea77e9371e3bae3ef71034290a3f8d7ee814786b3c3228c4fcfd3cb71f739de69582745158 SHA512 1f062305576242f513303b6f3b2e9ba14a50c60200142429bb2a55ca6566233c4ab4bd5e19597cc52d5e9bf53a02d89f90ee0c72100aeeb5cc35314bef6c5890
+EBUILD django-3.2.2.ebuild 2726 BLAKE2B 921ef5276d36f224848cc7565b8d4134ae3e7fee9e9a191b38e9705396cd23f012d44512863861ef13cf86b48bd27c7ffb2337ead11f976bd1dacf0c18380cfe SHA512 ace7005c4d6127b9880a5b1eeb1639209fd6eed94ad02c53bfcffa7cf7fe2cfb612c73a1749b774c3517561189a05811689af31e35270d3da4c519ccc8d96ada
 MISC metadata.xml 399 BLAKE2B f49845f5a6476a0b43cbe47ab11b298f53703d850d145a31967f512d9402048fc1b1891606ddba7342ea9613c27ace3986f6b508ed83f0c5eccb26a13fd49f85 SHA512 92470f2930b1c940ccf3478b11157adcc4b84924b0cab4e1fd8aae98c7bba14e995491ce44810223eeb3802967be68c867d0ee4ac0df9f49b4234efd1a7ecfa7
diff --git a/dev-python/django/django-2.2.21.ebuild b/dev-python/django/django-2.2.22.ebuild
index 0065f66f759c..bc3377ea66e2 100644
--- a/dev-python/django/django-2.2.21.ebuild
+++ b/dev-python/django/django-2.2.22.ebuild
@@ -48,7 +48,6 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.0.7-bashcomp.patch
-	"${FILESDIR}"/django-2.2.21-fix-bpo43882.patch
 )
 
 distutils_enable_sphinx docs --no-autodoc
diff --git a/dev-python/django/django-3.2.1.ebuild b/dev-python/django/django-3.1.10.ebuild
index f17bdecc6125..16ea57edc020 100644
--- a/dev-python/django/django-3.2.1.ebuild
+++ b/dev-python/django/django-3.1.10.ebuild
@@ -22,7 +22,7 @@ LICENSE+=" Apache-2.0"
 # admin icons, jquery, xregexp.js
 LICENSE+=" MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~sparc x86 ~x64-macos"
 IUSE="doc sqlite test"
 RESTRICT="!test? ( test )"
 
@@ -31,6 +31,7 @@ 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}
@@ -50,7 +51,6 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.1-bashcomp.patch
-	"${FILESDIR}"/django-2.2.21-fix-bpo43882.patch
 )
 
 distutils_enable_sphinx docs --no-autodoc
diff --git a/dev-python/django/django-3.1.9.ebuild b/dev-python/django/django-3.2.2.ebuild
index ec49662ddb4d..b0bed67e8146 100644
--- a/dev-python/django/django-3.1.9.ebuild
+++ b/dev-python/django/django-3.2.2.ebuild
@@ -27,14 +27,10 @@ IUSE="doc sqlite test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	|| (
-		>=dev-python/asgiref-3.3.4[${PYTHON_USEDEP}]
-		<dev-python/asgiref-3.3.2[${PYTHON_USEDEP}]
-	)
+	>=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}
@@ -54,7 +50,6 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.1-bashcomp.patch
-	"${FILESDIR}"/django-2.2.21-fix-bpo43882.patch
 )
 
 distutils_enable_sphinx docs --no-autodoc
diff --git a/dev-python/django/files/django-2.2.21-fix-bpo43882.patch b/dev-python/django/files/django-2.2.21-fix-bpo43882.patch
deleted file mode 100644
index dc5d333be940..000000000000
--- a/dev-python/django/files/django-2.2.21-fix-bpo43882.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From bf04b74b155f91b47ca986543348bdf644f2ffb0 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Tue, 4 May 2021 13:10:50 +0200
-Subject: [PATCH] Reject URLs containing LF, CR or HT to workaround bpo43882
-
----
- django/core/validators.py | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/django/core/validators.py b/django/core/validators.py
-index a385819510..bab034912a 100644
---- a/django/core/validators.py
-+++ b/django/core/validators.py
-@@ -110,6 +110,8 @@ class URLValidator(RegexValidator):
-         try:
-             super().__call__(value)
-         except ValidationError as e:
-+            if '\r' in value or '\n' in value or '\t' in value:
-+                raise e
-             # Trivial case failed. Try for possible IDN domain
-             if value:
-                 try:
--- 
-2.31.1
-
diff --git a/dev-python/django/files/django-3.0.6-bashcomp.patch b/dev-python/django/files/django-3.0.6-bashcomp.patch
deleted file mode 100644
index 2eca3416db68..000000000000
--- a/dev-python/django/files/django-3.0.6-bashcomp.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From d082b413b0b6edfcae52f64c8a64f16b2bf6110f 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 3c2f14c263..abe76e5903 100755
---- a/extras/django_bash_completion
-+++ b/extras/django_bash_completion
-@@ -37,35 +37,4 @@ _django_completion()
-                    COMP_CWORD=$COMP_CWORD \
-                    DJANGO_AUTO_COMPLETE=1 $1 ) )
- }
--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.26.2
-