[gentoo-commits] repo/gentoo:master commit in: dev-python/django/

["Michał Górny" <mgorny@gentoo.org>]

commit:     06951754eb127fa619ba6dc6b09eb5ed8d90aed3
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Nov  5 15:22:53 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Nov  8 00:15:32 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06951754

dev-python/django: Use verify-sig.eclass

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/django/Manifest             |  3 +++
 dev-python/django/django-2.2.17.ebuild | 27 +++++++++++++++++++++------
 dev-python/django/django-3.0.11.ebuild | 27 +++++++++++++++++++++------
 dev-python/django/django-3.1.3.ebuild  | 27 +++++++++++++++++++++------
 4 files changed, 66 insertions(+), 18 deletions(-)

diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index b65e6a77099..4f6f6a1cc9a 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -1,7 +1,10 @@
 DIST Django-2.2.16.tar.gz 8884774 BLAKE2B e65074c44e35921f6c40ca9e2a5fee53ce9a956a7503b96a33c8dbb4588bb0928d2e2b605f1117c3c75cdc84d6c7d1bfe52f4e7888fbe300adb5411a55b0ac27 SHA512 eabcdfc17e27c579001e4739268abd13bebbb018db1a7dbe4fb8482d32320b85bd16b3b18428084c0df947094f23f7cb4b12a3a55bc370748d7d8746af22bc3b
+DIST Django-2.2.17.checksum.txt 2438 BLAKE2B 5d9454884110f1debec7fa1644b13be43b9b6b8d3f333a05df823332c94a6f4a220791bf0cc7d139baf5aac856443a4b211dd8e98d23d4cc62d1d6ce7ebd69c8 SHA512 0dc71edfe3264d3353238124dc5374aac07fb73ede167a52f16bf3b147bf351651f4197a1fe5027dca23ad144755fff6447f06d8cdf11126184cf5e291c90402
 DIST Django-2.2.17.tar.gz 8885492 BLAKE2B 30046adc54c31e0e8dac3c573da58e8536246ba6fc5675ec5ad5efc4b170331b893ffe766e7eb404b445d5b37e018e1ac9e2b8e659a5f10c4c165ec9ef5c00d1 SHA512 4ba1e12332cafaa49a087494f9e85e992a414ad153ef935fcf50f1a533ac9c7049a421140552f77b3dbf41c51a4f42aca13dc5f8f479049c21037c541a34320b
 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

diff --git a/dev-python/django/django-2.2.17.ebuild b/dev-python/django/django-2.2.17.ebuild
index c9d03c703ed..2e3f2e2d14b 100644
--- a/dev-python/django/django-2.2.17.ebuild
+++ b/dev-python/django/django-2.2.17.ebuild
@@ -7,14 +7,14 @@ DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{6..8} )
 PYTHON_REQ_USE='sqlite?,threads(+)'
 
-inherit bash-completion-r1 distutils-r1 optfeature
-
-MY_PN="Django"
-MY_P="${MY_PN}-${PV}"
+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://www.djangoproject.com/m/releases/$(ver_cut 1-2)/${MY_P}.tar.gz"
+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"
@@ -43,7 +43,9 @@ BDEPEND="
 		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
@@ -52,6 +54,19 @@ PATCHES=(
 
 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.

diff --git a/dev-python/django/django-3.0.11.ebuild b/dev-python/django/django-3.0.11.ebuild
index 3c2681dec2e..262364a004f 100644
--- a/dev-python/django/django-3.0.11.ebuild
+++ b/dev-python/django/django-3.0.11.ebuild
@@ -7,14 +7,14 @@ 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}"
+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://www.djangoproject.com/m/releases/$(ver_cut 1-2)/${MY_P}.tar.gz"
+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"
@@ -44,7 +44,9 @@ BDEPEND="
 		dev-python/selenium[${PYTHON_USEDEP}]
 		dev-python/tblib[${PYTHON_USEDEP}]
 		sys-devel/gettext
-	)"
+	)
+	verify-sig? ( app-crypt/openpgp-keys-django )
+"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.0.6-bashcomp.patch
@@ -53,6 +55,19 @@ PATCHES=(
 
 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
+}
+
 src_prepare() {
 	# do not bind to a specific version
 	# https://bugs.gentoo.org/750695

diff --git a/dev-python/django/django-3.1.3.ebuild b/dev-python/django/django-3.1.3.ebuild
index 2c544a79688..b064fd138ee 100644
--- a/dev-python/django/django-3.1.3.ebuild
+++ b/dev-python/django/django-3.1.3.ebuild
@@ -7,14 +7,14 @@ 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}"
+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://www.djangoproject.com/m/releases/$(ver_cut 1-2)/${MY_P}.tar.gz"
+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"
@@ -44,7 +44,9 @@ BDEPEND="
 		dev-python/selenium[${PYTHON_USEDEP}]
 		dev-python/tblib[${PYTHON_USEDEP}]
 		sys-devel/gettext
-	)"
+	)
+	verify-sig? ( app-crypt/openpgp-keys-django )
+"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.1-bashcomp.patch
@@ -53,6 +55,19 @@ PATCHES=(
 
 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
+}
+
 src_prepare() {
 	# do not bind to a specific version
 	# https://bugs.gentoo.org/750695