gentoo resync : 18.12.2020

4 files changed, 2 insertions, 182 deletions

diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index 3d2639eae5ac..32df74a87ca9 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -8,8 +8,6 @@ DIST Django-2.2.17.tar.gz 8885492 BLAKE2B 30046adc54c31e0e8dac3c573da58e8536246b
 DIST Django-3.0.10.tar.gz 8958332 BLAKE2B 0ff17da9d9175b080d81e334e46ec6daaec5e4cd48f5d9a614c84b448a6d4b93d304b3fd25bcee665d65f589a8f94cf83f002bbd7a27975d23e3516286784e01 SHA512 fcce2815f966a5eb0f7986c16d065b352c73ea2ea4fc1422d440487d84162c5a93aa45b9173ba5d62d6caee2e976a9ac818f228b47ed7f4f50deda27bac995e9
 DIST Django-3.0.11.checksum.txt 2438 BLAKE2B df936992a02e5a34b26e91654962507d973f8831c1eebada4cbdb578f83fba974532867b9f20828afc2467c2521e117b8dd543cde6f664d3c122a95207c50608 SHA512 a7b98d102775cc7854b0c242507d4ff8778984dc8b2e269352103249d6d1c5cea7e6eb8dbe08700b19ad4428e30c469e0e959a622ea4ce3198a75f72b2bb8871
 DIST Django-3.0.11.tar.gz 8958879 BLAKE2B 078ffde9ae186ae8add2136c303ba38a1b38525481b2272384b8a1bb3428dcf6a31991a86b2078aea6cf250808af399acac5461a33c8e1fda5d6bc552eac478f SHA512 d24e8167f3f871f24ea5e288557a49d71f9b5c398c84e8434d5d3dc224ef62775121a016ad89e997fabe88893adc3a83176211d5b9a9730ec23d37d256aa4fb0
-DIST Django-3.1.1.tar.gz 9250616 BLAKE2B 220c53873a70bb30f0ea9b48a70ba71b2de517c11f238e6dc2be20b0e85c99dfdb2ea3b9cfe7b164c7141e0857f19d9d8f93390d7ef36bf34e915ccdb449e8f6 SHA512 5da4282c2ae712ecb2da654a99d46cd60c99aced90f75e681d5a0765b8c08669f27b6c38287bfe7bac028f12ae0643e2be06742752bdc83c62daf82fee60281f
-DIST Django-3.1.2.tar.gz 9387482 BLAKE2B 77e330b4b42f85ef416e90a2690c6315f2a8d30b5705f64b86f62daabe3ff60b24d9fcf8a1276e7425e5cf0e03833a5ca601d15dc3e1aa32f7b5d7a9792302da SHA512 39115e942c26c9af27c4079f590e15caa86cc5c0e012873d7be23809e39de178b2dd935919dee21bbee153bccb17463abcece1db3b1f7dfa95b7b55879488876
 DIST Django-3.1.3.checksum.txt 2429 BLAKE2B 7184da75a1da2c615c78a892c8331ff4abfec86e1ae93f8a74c836988d97ecafbbadaecffd352904c01b40a840a80f4d24e8b48f2570054a2349ef6c58bb43e3 SHA512 ecb1de139b05e697253e0b09fd15b692050be647cceb30d8f1482613d0c3393a3017460aabd7ff71ad1de2a8c70cc9276525d7a2a9285540a052805c969f55d8
 DIST Django-3.1.3.tar.gz 9253273 BLAKE2B 9284b637ea39e028ebabe44de50dacfe6a89621fcc5eea73b7f470fc998faeb361da428be8f3f3e349f25b8629b5a350f3a5b7c35ea50183b285daf63d8944a7 SHA512 0f49316dc61a299a257313c27051852e948337491047bacb2221c9c753a5cf4bafb2ed686311ad5345dd3045260331afccb013c21503891538340225a469d1ad
 DIST Django-3.1.4.checksum.txt 2466 BLAKE2B 635ddd40b542890aef29f53df0fad172e48450081f57c72042a71bb5de654b1d1f5f7ce0c588b1070a203e1d4afe3a1ed19431dd23a2a67cd510d4072c79a00f SHA512 729b771008489bbf0563002e438ef88abb2a14b2c29f307cb2db9c75450f30ac8bd4920bf0493dbec06b3640fc0d4b6817e8a054af1028ad065bd321c761a6c3
@@ -18,8 +16,6 @@ EBUILD django-2.2.16.ebuild 2398 BLAKE2B 50de7688181404a9dac497283f011fa96e4963b
 EBUILD django-2.2.17.ebuild 2776 BLAKE2B e02000489e63101a17bed98c0a9efe21f78b1626f547dbc83583177ad91fd901ad1b57cefc75766065c95533be5ca8a0b6d8b79b1f9d88cfd405d63f4904403f SHA512 cd03b69e7b41762d75f7424c9e65ed06ab0e2a9ba356b5136ce1fbe1adbab25147b68ad922015960de48768554c71ca0feb3545cdbc15992949df91be5ea5e6f
 EBUILD django-3.0.10-r1.ebuild 2550 BLAKE2B 89648d1fc5de29c8a7e985763c1e167f5f97599225e42675678378e64cec83a4bc842c0c8381e511cc7f9fe6e795e45c0cee2e063e18072cfddb803d072002bf SHA512 437a6688b766a5e5fe7b9f5eb8875a174cbf0e8e9dc65b73f898abafd370763f4828b2f60841d6b5ba4de1a3f150518e4d168941890004cb8a2729046623568c
 EBUILD django-3.0.11.ebuild 2928 BLAKE2B 0c046c236971ffe1c3b7a11d44b498ea1881fb8345aa4afef63d9c70a8591c412ad7c93e31cc9494fdd76646c5eb95c2ffbe625c0ac4c3374e6ef941194f9771 SHA512 297660bcad7cbd7c4b89c395dfa84399f69563395f61be8f6d24a99ef05baef4a5c08579ff8740a959447bf649d4e22409bedc58913d2627fad2bd72635dd033
-EBUILD django-3.1.1-r1.ebuild 2557 BLAKE2B 9079e6e834e4708427a133803c2caa1496ba5151734f8ce918f35e3f68fc70e8a527e87fdda29e0772cd4abd8a8874fc284cd2aa0957ec42ee532b00927d5441 SHA512 2cd024c9b8cbba267bef2b81469a0fb4378f0cc3535043bbc3d688fe47d37ffe6d5277cbb43721de2b9d67002defce396797eb17954c36d52a3d2c979b96b05a
-EBUILD django-3.1.2-r1.ebuild 2559 BLAKE2B 4ac70317a83d02b60704f4ccab979ebbedf4c03d83aa0963eee5c9365017bccd85918b1ff9a025e6607c0d45bd81cefa3d8e53d57f40bbe3b5170b74d1d48998 SHA512 227cc4568c914ef8743433cf7a094da80fabb4de446f01ac779af8cc86725d5e5d358c69aaeab4e1a77a590a7ee69d30915a7ab15037003079ae62be064c6273
-EBUILD django-3.1.3.ebuild 2946 BLAKE2B cd3728de4bbb6d9cbd2a8087a44c17c63db16ed53cf03b5dfd48396ddd471c863ab34338bd2ed9b5c85e9d070cd12ed690607cb8dbb005bc831059090888a15b SHA512 35009a53a06693be34cdf0f020fe793297a0a63dab1fedc8d3f54acf9ffb0866523f75f9218ea450437e44d7732d6fbf3926966430245edaab0651c4ae85a741
+EBUILD django-3.1.3.ebuild 2944 BLAKE2B 1fcffa8a9a91d7e4b90d50969412660f33167c335beae74053b5700678c6c5931165d80785bd8400c85ab117608ddbc50a6cba260914638cfc0d0e41ea16ed79 SHA512 5ff06ddf13397ad320df10531bc291dca1966f2fe6b56f42d78f10cc65e3e2ae2521fb0ab528e5daf3ff9e014e2f29297ebea4f47fa2678893494d43a6ac82f4
 EBUILD django-3.1.4.ebuild 2741 BLAKE2B a162732837c1810695e69d76774684348a8f7be3a005979ee40a85c72a54c51f57708cb45293aeac699de8b46fffd7e8d7009eab02cb55b2f01617eadac05288 SHA512 74b80f16e5a1845f7d3456e7d1e5f23c15899d367c58185124e92aba0ffbdbad0d8e392b7c6e761e1e11b77cf1f25429eb279f3d26d2409acfd8d6cf7962b0a9
 MISC metadata.xml 399 BLAKE2B f49845f5a6476a0b43cbe47ab11b298f53703d850d145a31967f512d9402048fc1b1891606ddba7342ea9613c27ace3986f6b508ed83f0c5eccb26a13fd49f85 SHA512 92470f2930b1c940ccf3478b11157adcc4b84924b0cab4e1fd8aae98c7bba14e995491ce44810223eeb3802967be68c867d0ee4ac0df9f49b4234efd1a7ecfa7
diff --git a/dev-python/django/django-3.1.1-r1.ebuild b/dev-python/django/django-3.1.1-r1.ebuild
deleted file mode 100644
index 7f8d325e1fe2..000000000000
--- a/dev-python/django/django-3.1.1-r1.ebuild
+++ /dev/null
@@ -1,88 +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..9} )
-PYTHON_REQ_USE='sqlite?,threads(+)'
-
-inherit bash-completion-r1 distutils-r1 optfeature
-
-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 ~arm ~arm64 ~ppc ~ppc64 x86"
-IUSE="doc sqlite test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/asgiref[${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
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.1-bashcomp.patch
-	"${FILESDIR}"/django-gettext-0.21.patch
-)
-
-distutils_enable_sphinx docs --no-autodoc
-
-src_prepare() {
-	# do not bind to a specific version
-	# https://bugs.gentoo.org/750695
-	sed -i -e 's:asgiref ~= 3.2.10:asgiref:' setup.cfg || die
-	distutils-r1_src_prepare
-}
-
-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
-	elog
-	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-3.1.2-r1.ebuild b/dev-python/django/django-3.1.2-r1.ebuild
deleted file mode 100644
index 2c544a796884..000000000000
--- a/dev-python/django/django-3.1.2-r1.ebuild
+++ /dev/null
@@ -1,88 +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..9} )
-PYTHON_REQ_USE='sqlite?,threads(+)'
-
-inherit bash-completion-r1 distutils-r1 optfeature
-
-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 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="doc sqlite test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/asgiref[${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
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.1-bashcomp.patch
-	"${FILESDIR}"/django-gettext-0.21.patch
-)
-
-distutils_enable_sphinx docs --no-autodoc
-
-src_prepare() {
-	# do not bind to a specific version
-	# https://bugs.gentoo.org/750695
-	sed -i -e 's:asgiref ~= 3.2.10:asgiref:' setup.cfg || die
-	distutils-r1_src_prepare
-}
-
-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
-	elog
-	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-3.1.3.ebuild b/dev-python/django/django-3.1.3.ebuild
index a1cdaba2e63f..ea0a60bfffa3 100644
--- a/dev-python/django/django-3.1.3.ebuild
+++ b/dev-python/django/django-3.1.3.ebuild
@@ -23,7 +23,7 @@ LICENSE+=" Apache-2.0"
 # admin icons, jquery, xregexp.js
 LICENSE+=" MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~x64-macos"
 IUSE="doc sqlite test"
 RESTRICT="!test? ( test )"