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

[Michał Górny]

commit:     cae977c72a943d555f8f76fa10684f00a43b0e5e
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 21 09:05:48 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jan 21 09:12:40 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cae977c7

dev-lang/python: Backport verify-sig & BDEPEND to 3.9.1

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

 dev-lang/python/Manifest               |  1 +
 dev-lang/python/python-3.9.1-r1.ebuild | 20 +++++++++++++++++---
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 499ea8d4c5a..fdf4e0ebe60 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -8,6 +8,7 @@ DIST Python-3.8.6.tar.xz 18233864 BLAKE2B 
c8a8ef6055e344dda30eb808804cfa62016b4f
 DIST Python-3.8.7.tar.xz 18261096 BLAKE2B 
6ac20efef41e828cb796aabcb7808400d494b9b48759950c8c15ee90762394f6763163d8e37ab407c1c79ebb9cda09189eaa969a75f96c86a96ccee962443924
 SHA512 
6a27d8eab3076930df46b0cf127f9b664f8d4147349b2b98132f464deb7f69d87e0167e8ee8e6c64249125ad73760d965ecbc81c252b63a1e7aac95594c62b74
 DIST Python-3.9.0.tar.xz 18866140 BLAKE2B 
8e12b64e187a65461473ac3b281dc489f0abac586e0755f6dbeceb236b34bdc008085eeac9ee1a19d76f5ec6a2fbda623985454c9d0164c4888a97b8cd940034
 SHA512 
b141039c9701a8cb0d15cd11a279153077524af4d0599e7d2c7279d4c18d05fda06b33ef82342d875de996c7117b7dc6eb154dc3669d38a1efa99801aeec6c5e
 DIST Python-3.9.1.tar.xz 18897104 BLAKE2B 
bcbce176510e8e7c6ba6070588bedc52121c21c5271f59b3d629dfb542c51ee62622b2ca53a6e2041f1a51b2d089368cc4de9bb749e8ebad9a2c4eb4de83538e
 SHA512 
b90029d6825751685983e9dcf0e0ec9e46f18e6c7d37b0dd7a245a94316f8c0090308ad7c2b2b49ed2514b0b909177231dd5bcad03031bf4624e37136fcf8019
+DIST Python-3.9.1.tar.xz.asc 833 BLAKE2B 
dc445ed9797668c5f0777259ea83330815ee516dafc752e6a0d903bae5355e76360afa5ed318ce09bbbcfb4df6269b06b6fb6b7d9c074678b612bb1ea9e3148a
 SHA512 
400259f499820e0499290402f095ee5454168907f539de705cad4f0e5586b1c67a0ac45b89bf099701be55146a5eed73dbc9e2cb15562fef34da2813ac82f342
 DIST python-gentoo-patches-2.7.18-r4.tar.xz 21352 BLAKE2B 
d322f5afd63813d7c9280c75f942bde75ee19793e121d0406c4f229ead53324bf3996342eed9a6c1aa474894afe7f2dd70aec38aee8042993a5274abc288fd31
 SHA512 
1cb0be8e79d0c6c55fcbe3f3dabf8b760aea0e60d888ea39d3e69de03b55738c50b2cca06586c1cd2896956f5764eefd6d3f9fbf2de0d0ddfd8aab86837976b6
 DIST python-gentoo-patches-2.7.18-r6.tar.xz 22740 BLAKE2B 
1727fcab273dfe5e5739c7ce1cd7fb3c6bd13c2bda25a2e4e0609a2e727a69318a46b7c2173ea7746f8a124e778b276408adc9968ed2025b8643e660bb3d3ea3
 SHA512 
975fe72c5b2f4577563e8e972c70b7eec7203790a500e6f051fab1f66c71e5ae46fcb3c571a9e6346bf3a0d1dd48594a61bf2751007e4f5e3d19f8db6146c99d
 DIST python-gentoo-patches-3.10.0a3-r1.tar.xz 10068 BLAKE2B 
8b305a31cf0aab4da9e27e671b4fd48be6224ff8508ed1831ad4149761bb263cd9a694e90d52335390643a537dee2d6cab4e086bd521c99217e81845b4f9bcf1
 SHA512 
69c52c61dd2f1ca097fafe13c27cd1979280675bef6af8e8e300f3791d7eb50368311e3d055075f4bca01ce02d9e97a94fcd2662c78f14cfb6a37d77c39a158f

diff --git a/dev-lang/python/python-3.9.1-r1.ebuild 
b/dev-lang/python/python-3.9.1-r1.ebuild
index c3a4f7b7e19..c363f8b6e72 100644
--- a/dev-lang/python/python-3.9.1-r1.ebuild
+++ b/dev-lang/python/python-3.9.1-r1.ebuild
@@ -5,7 +5,7 @@ EAPI="7"
 WANT_LIBTOOL="none"
 
 inherit autotools check-reqs flag-o-matic multiprocessing pax-utils \
-       python-utils-r1 toolchain-funcs
+       python-utils-r1 toolchain-funcs verify-sig
 
 MY_P="Python-${PV/_/}"
 PYVER=$(ver_cut 1-2)
@@ -14,7 +14,10 @@ PATCHSET="python-gentoo-patches-3.9.1-r1"
 DESCRIPTION="An interpreted, interactive, object-oriented programming language"
 HOMEPAGE="https://www.python.org/";
 SRC_URI="https://www.python.org/ftp/python/${PV%_*}/${MY_P}.tar.xz
-       https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz";
+       https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
+       verify-sig? (
+               https://www.python.org/ftp/python/${PV%_*}/${MY_P}.tar.xz.asc
+       )"
 S="${WORKDIR}/${MY_P}"
 
 LICENSE="PSF-2"
@@ -53,11 +56,15 @@ RDEPEND="app-arch/bzip2:=
 # bluetooth requires headers from bluez
 DEPEND="${RDEPEND}
        bluetooth? ( net-wireless/bluez )
-       test? ( app-arch/xz-utils[extra-filters(+)] )
+       test? ( app-arch/xz-utils[extra-filters(+)] )"
+BDEPEND="
        virtual/pkgconfig
+       verify-sig? ( app-crypt/openpgp-keys-python )
        !sys-devel/gcc[libffi(-)]"
 RDEPEND+=" !build? ( app-misc/mime-types )"
 
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/python.org.asc
+
 # large file tests involve a 2.5G file being copied (duplicated)
 CHECKREQS_DISK_BUILD=5500M
 
@@ -69,6 +76,13 @@ pkg_setup() {
        use test && check-reqs_pkg_setup
 }
 
+src_unpack() {
+       if use verify-sig; then
+               verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
+       fi
+       default
+}
+
 src_prepare() {
        # Ensure that internal copies of expat, libffi and zlib are not used.
        rm -fr Modules/expat || die