gentoo resync : 14.12.2020

3 files changed, 100 insertions, 2 deletions

diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index 3ef7ff7072b2..3d2639eae5ac 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -12,11 +12,14 @@ DIST Django-3.1.1.tar.gz 9250616 BLAKE2B 220c53873a70bb30f0ea9b48a70ba71b2de517c
 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
+DIST Django-3.1.4.tar.gz 9392125 BLAKE2B b583442de50c358e70a49b9ef557d43211e6faee17933a44012dbb9f0dac3ccbf0a91e01a2b8b798fff7ae05100199e9e9c94a81748b41ea13e49d12bb510617 SHA512 02cfaabb25e5f932dcbf659faba2f0afe298e4bee4f510f7adebfff181bdd13c3a0b08e8ce379bcc59326d904be8699db4ce31065d93566b93cad758365207f5
 EBUILD django-2.2.16.ebuild 2398 BLAKE2B 50de7688181404a9dac497283f011fa96e4963b4e3081531ad0adf47fc32d3878902055447d073163bd948cc349594f9a51289ee98546c957576d2a2ff8ab47c SHA512 603d21991b904244584703729896554b91f71e49e5c3220cfcc5b577e8047afbf49d6c64e273b8b44ceea0dff9d1a21dc945730d746d2eb7c163ad08aa64e193
 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 2935 BLAKE2B c793c11f4ac5c57831a19ff8d096333d63cf110aa6664971abad2b4f7e2e0e07fb224894219f46d794c0e55a1b4c1c531999977b42974e2bb1cfe534b1359e8b SHA512 e6960435112e622ad0e2803abaa2acf2497fe706ba341dbc8ff47a54422c8ceeb1aec405305d23574c753ca7cabf7affaff700eb75f36004389fc404d1c520c4
+EBUILD django-3.1.3.ebuild 2946 BLAKE2B cd3728de4bbb6d9cbd2a8087a44c17c63db16ed53cf03b5dfd48396ddd471c863ab34338bd2ed9b5c85e9d070cd12ed690607cb8dbb005bc831059090888a15b SHA512 35009a53a06693be34cdf0f020fe793297a0a63dab1fedc8d3f54acf9ffb0866523f75f9218ea450437e44d7732d6fbf3926966430245edaab0651c4ae85a741
+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.3.ebuild b/dev-python/django/django-3.1.3.ebuild
index b064fd138ee4..a1cdaba2e63f 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"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x64-macos"
 IUSE="doc sqlite test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/django/django-3.1.4.ebuild b/dev-python/django/django-3.1.4.ebuild
new file mode 100644
index 000000000000..6e2cded2dbc8
--- /dev/null
+++ b/dev-python/django/django-3.1.4.ebuild
@@ -0,0 +1,95 @@
+# 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 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 ~x64-macos"
+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
+	)
+	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() {
+	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
+}