commit:     51a569068ae0610f1699c416258f6c4cb20af81a
Author:     Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Mon Nov  6 01:46:17 2023 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Nov  6 15:53:48 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51a56906

dev-util/meson: update SRC_URI; add verify-sig support

The canonical download location for meson is, and has always, been
github releases. PyPI is provided for convenience of `pip install`
users, but it is not a very good hosting site. In particular, it does
not support PGP signatures anymore (and campaigned to hide them from
user awareness for quite some time beforehand, which lack of awareness
was then used as grounds for "nobody uses them, let's remove the hidden
support").

The tarball remains the same either way. No revbump needed.

Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com>
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 dev-util/meson/Manifest               |  5 +++++
 dev-util/meson/meson-1.1.1.ebuild     | 10 +++++++++-
 dev-util/meson/meson-1.2.1-r1.ebuild  | 10 +++++++++-
 dev-util/meson/meson-1.2.1-r2.ebuild  | 10 +++++++++-
 dev-util/meson/meson-1.2.2-r1.ebuild  | 10 +++++++++-
 dev-util/meson/meson-1.2.2.ebuild     | 10 +++++++++-
 dev-util/meson/meson-1.2.3.ebuild     | 10 +++++++++-
 dev-util/meson/meson-1.3.0_rc1.ebuild | 10 +++++++++-
 dev-util/meson/meson-9999.ebuild      | 10 +++++++++-
 9 files changed, 77 insertions(+), 8 deletions(-)

diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index 42c59d0a9505..92d79a427290 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -1,5 +1,10 @@
 DIST meson-1.1.1.tar.gz 2125503 BLAKE2B 
295b46d19c8a1d64d326a6c826e2abe11d9768902ed2f8816df18677e7f3f58decc0c660925821825ecd9a4955a65bda8b2aa66a7bb1961810d8f78f92a3fd8a
 SHA512 
c6259d73566d2532b87e8a23951363103f7be2aacdf120e50946273a2fed6b1602104a3ffbfda159138ac8f780d2c3e67a6fe2c8c228b73c1266775491797adb
+DIST meson-1.1.1.tar.gz.asc 833 BLAKE2B 
165f3a0e8093995e82efcdea78b8cf0d2479505aeec145cf0c4bf3448dd74f0b5d1631e574e7d945d5b5976e11c065043ab0a6efe5646484a5bcd6386050a073
 SHA512 
004ec7e530ad21b012e461c8d50322295e4ec96a1a3197dbcbeb24b8bd6465a34008541e6fc547e451a50dce53f7ce170ec1bfd8c465ded56a5924e880aa0539
 DIST meson-1.2.1.tar.gz 2182126 BLAKE2B 
b79fa78618cbebfb26ea40e698c495e63d722ba3204d4fed92d087e4a588b49666b476c55916f1435b7ca62f24843c683f1da09751754e928c838c1bf138ce58
 SHA512 
6221a14a6046aaba2c6eb601a9a5b928308bbd9da813ccec16b8f7578296b27d741e30e9343723770c3c7825c86b53193b41b9672dd17468d06d3b8d743bf52e
+DIST meson-1.2.1.tar.gz.asc 833 BLAKE2B 
e4c1ee16f65631815ce5c1be49df77b7eab91e9f256ffcbf3555d257cf468bbcca49ee79ce6ddb701f35b9be0ce6c315809094b87ccfeff8f4de2d1995dbf6ff
 SHA512 
c41b4a6686016cddc407497b003590939760c4f19d1f4481c315024f76f1ecd055dd6f8c7ba3647549c7ff192ab10097b9d0ad64e449ab83f623ea62d0ae4703
 DIST meson-1.2.2.tar.gz 2190455 BLAKE2B 
b355c8e5ab7508fca51dbe5c95eea68f91b995a670ad20eb9b7e93d3c97ad5363afe3fbd39cd554d1a6953a07166851257d16706acc9db6d5265e6452e40a857
 SHA512 
8dde3235f31862953e2f4db2527e441dfa9413b5f7545c85949ebc0f3b58819307ca124bf04d481d6f1425d6a4c93051239a659554322af893c97b651379fa86
+DIST meson-1.2.2.tar.gz.asc 833 BLAKE2B 
21c12a94ea5803b8a608d522988f9da63826bff9ce4a74c8c2cf9721d87504b930135532697e9a18710f732446dde2dc70f1c972f825542d043ae20bb76ed9f5
 SHA512 
9d4117a09f6852bcad7c91c0084bf6f37c05295b134d297a77b8ca5958edb93f030d05e216206c42cf2739e5a6ccdf680fb612056f3a21da9ec3ee80922236df
 DIST meson-1.2.3.tar.gz 2184484 BLAKE2B 
7d76c54bddba249ab97ebd5dd0afc448177ff9fa70812a8ca0cc9fe308c9b145b3fbc3ee068acae0fdc73edff42134b7a0b618cd80a05347a424aca7bc8bbef8
 SHA512 
cdcadc731effc1ffb2de98b795ba37955f934ed9b54b9f7f3ac5fe96ab33268d4de4fce734a4c2ef7d2ecc5051616df127e1f8665e197ff954310bf1483b81fc
+DIST meson-1.2.3.tar.gz.asc 833 BLAKE2B 
1416c49302aab80b5f647cc1d6cd18c36f6199e79c7d13ea284143b2423267b5823850218578626937c14589ebcdf19069b310394c63bc762ab8f59d7ebe3780
 SHA512 
852c031ecfe032cb48d284bb270597d114294b7d1be5dd0df6ec2f78a62e1a5ba82711bc14ae410e47ced54f99a639055a1628b0acf7aa07a3a80034fce5ebc9
 DIST meson-1.3.0rc1.tar.gz 2139141 BLAKE2B 
b45bb81e630a8d25421c266953116837580aad0c2d577e575922aef1f2611f3f6b78e5ab346846991251f2409683f74b07f369f49608bf4f12a043cf0c3d0f81
 SHA512 
196b2e37124328f74bde7aae9d41774bb0b036a8be6f7fee5496eebc83a278222d0ad17efab8baaae421aeeaadda89efeff29e55e88aa4448d3690fc938ab8d8
+DIST meson-1.3.0rc1.tar.gz.asc 833 BLAKE2B 
08409567887443e841b7fddbac18d62c31e9d97bc9c380d2b2579de5a52c313fae955e9c9e3d1f27086103017608a5bcbffaef5f672eb4c97bc80f760dad520b
 SHA512 
5d5d44e6ed10f564b7e5452fb665121c9793d8ae044073b0315db8beba7b00540ebf1d25f20d3d94e17d5e9964bf9d618026d5b3abe6fc31ef8c434bcc275e42

diff --git a/dev-util/meson/meson-1.1.1.ebuild 
b/dev-util/meson/meson-1.1.1.ebuild
index af3261000a64..affad54f237d 100644
--- a/dev-util/meson/meson-1.1.1.ebuild
+++ b/dev-util/meson/meson-1.1.1.ebuild
@@ -10,11 +10,19 @@ if [[ ${PV} = *9999* ]]; then
        EGIT_REPO_URI="https://github.com/mesonbuild/meson";
        inherit git-r3
 else
-       inherit pypi
+       inherit verify-sig
 
+       MY_PV=${PV/_/}
        MY_P=${P/_/}
        S=${WORKDIR}/${MY_P}
 
+       SRC_URI="
+               
https://github.com/mesonbuild/meson/releases/download/${MY_PV}/${MY_P}.tar.gz
+               verify-sig? ( 
https://github.com/mesonbuild/meson/releases/download/${MY_PV}/${MY_P}.tar.gz.asc
 )
+       "
+       BDEPEND="verify-sig? ( sec-keys/openpgp-keys-jpakkane )"
+       VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/jpakkane.gpg
+
        if [[ ${PV} != *_rc* ]] ; then
                KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips 
ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~x64-solaris"
        fi

diff --git a/dev-util/meson/meson-1.2.1-r1.ebuild 
b/dev-util/meson/meson-1.2.1-r1.ebuild
index bf7bd1160440..016c524354aa 100644
--- a/dev-util/meson/meson-1.2.1-r1.ebuild
+++ b/dev-util/meson/meson-1.2.1-r1.ebuild
@@ -10,11 +10,19 @@ if [[ ${PV} = *9999* ]]; then
        EGIT_REPO_URI="https://github.com/mesonbuild/meson";
        inherit git-r3
 else
-       inherit pypi
+       inherit verify-sig
 
+       MY_PV=${PV/_/}
        MY_P=${P/_/}
        S=${WORKDIR}/${MY_P}
 
+       SRC_URI="
+               
https://github.com/mesonbuild/meson/releases/download/${MY_PV}/${MY_P}.tar.gz
+               verify-sig? ( 
https://github.com/mesonbuild/meson/releases/download/${MY_PV}/${MY_P}.tar.gz.asc
 )
+       "
+       BDEPEND="verify-sig? ( sec-keys/openpgp-keys-jpakkane )"
+       VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/jpakkane.gpg
+
        if [[ ${PV} != *_rc* ]] ; then
                KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips 
ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~x64-solaris"
        fi

diff --git a/dev-util/meson/meson-1.2.1-r2.ebuild 
b/dev-util/meson/meson-1.2.1-r2.ebuild
index 48e351394586..280175c18c6a 100644
--- a/dev-util/meson/meson-1.2.1-r2.ebuild
+++ b/dev-util/meson/meson-1.2.1-r2.ebuild
@@ -10,11 +10,19 @@ if [[ ${PV} = *9999* ]]; then
        EGIT_REPO_URI="https://github.com/mesonbuild/meson";
        inherit git-r3
 else
-       inherit pypi
+       inherit verify-sig
 
+       MY_PV=${PV/_/}
        MY_P=${P/_/}
        S=${WORKDIR}/${MY_P}
 
+       SRC_URI="
+               
https://github.com/mesonbuild/meson/releases/download/${MY_PV}/${MY_P}.tar.gz
+               verify-sig? ( 
https://github.com/mesonbuild/meson/releases/download/${MY_PV}/${MY_P}.tar.gz.asc
 )
+       "
+       BDEPEND="verify-sig? ( sec-keys/openpgp-keys-jpakkane )"
+       VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/jpakkane.gpg
+
        if [[ ${PV} != *_rc* ]] ; then
                KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k 
~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~x64-solaris"
        fi

diff --git a/dev-util/meson/meson-1.2.2-r1.ebuild 
b/dev-util/meson/meson-1.2.2-r1.ebuild
index 300aa26142b1..8a8299941051 100644
--- a/dev-util/meson/meson-1.2.2-r1.ebuild
+++ b/dev-util/meson/meson-1.2.2-r1.ebuild
@@ -10,11 +10,19 @@ if [[ ${PV} = *9999* ]]; then
        EGIT_REPO_URI="https://github.com/mesonbuild/meson";
        inherit git-r3
 else
-       inherit pypi
+       inherit verify-sig
 
+       MY_PV=${PV/_/}
        MY_P=${P/_/}
        S=${WORKDIR}/${MY_P}
 
+       SRC_URI="
+               
https://github.com/mesonbuild/meson/releases/download/${MY_PV}/${MY_P}.tar.gz
+               verify-sig? ( 
https://github.com/mesonbuild/meson/releases/download/${MY_PV}/${MY_P}.tar.gz.asc
 )
+       "
+       BDEPEND="verify-sig? ( sec-keys/openpgp-keys-jpakkane )"
+       VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/jpakkane.gpg
+
        if [[ ${PV} != *_rc* ]] ; then
                KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k 
~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~x64-solaris"
        fi

diff --git a/dev-util/meson/meson-1.2.2.ebuild 
b/dev-util/meson/meson-1.2.2.ebuild
index b2dcaf1c2b6b..429bfd5ba7d3 100644
--- a/dev-util/meson/meson-1.2.2.ebuild
+++ b/dev-util/meson/meson-1.2.2.ebuild
@@ -10,11 +10,19 @@ if [[ ${PV} = *9999* ]]; then
        EGIT_REPO_URI="https://github.com/mesonbuild/meson";
        inherit git-r3
 else
-       inherit pypi
+       inherit verify-sig
 
+       MY_PV=${PV/_/}
        MY_P=${P/_/}
        S=${WORKDIR}/${MY_P}
 
+       SRC_URI="
+               
https://github.com/mesonbuild/meson/releases/download/${MY_PV}/${MY_P}.tar.gz
+               verify-sig? ( 
https://github.com/mesonbuild/meson/releases/download/${MY_PV}/${MY_P}.tar.gz.asc
 )
+       "
+       BDEPEND="verify-sig? ( sec-keys/openpgp-keys-jpakkane )"
+       VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/jpakkane.gpg
+
        if [[ ${PV} != *_rc* ]] ; then
                KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k 
~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~x64-solaris"
        fi

diff --git a/dev-util/meson/meson-1.2.3.ebuild 
b/dev-util/meson/meson-1.2.3.ebuild
index b2dcaf1c2b6b..429bfd5ba7d3 100644
--- a/dev-util/meson/meson-1.2.3.ebuild
+++ b/dev-util/meson/meson-1.2.3.ebuild
@@ -10,11 +10,19 @@ if [[ ${PV} = *9999* ]]; then
        EGIT_REPO_URI="https://github.com/mesonbuild/meson";
        inherit git-r3
 else
-       inherit pypi
+       inherit verify-sig
 
+       MY_PV=${PV/_/}
        MY_P=${P/_/}
        S=${WORKDIR}/${MY_P}
 
+       SRC_URI="
+               
https://github.com/mesonbuild/meson/releases/download/${MY_PV}/${MY_P}.tar.gz
+               verify-sig? ( 
https://github.com/mesonbuild/meson/releases/download/${MY_PV}/${MY_P}.tar.gz.asc
 )
+       "
+       BDEPEND="verify-sig? ( sec-keys/openpgp-keys-jpakkane )"
+       VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/jpakkane.gpg
+
        if [[ ${PV} != *_rc* ]] ; then
                KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k 
~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~x64-solaris"
        fi

diff --git a/dev-util/meson/meson-1.3.0_rc1.ebuild 
b/dev-util/meson/meson-1.3.0_rc1.ebuild
index b2dcaf1c2b6b..429bfd5ba7d3 100644
--- a/dev-util/meson/meson-1.3.0_rc1.ebuild
+++ b/dev-util/meson/meson-1.3.0_rc1.ebuild
@@ -10,11 +10,19 @@ if [[ ${PV} = *9999* ]]; then
        EGIT_REPO_URI="https://github.com/mesonbuild/meson";
        inherit git-r3
 else
-       inherit pypi
+       inherit verify-sig
 
+       MY_PV=${PV/_/}
        MY_P=${P/_/}
        S=${WORKDIR}/${MY_P}
 
+       SRC_URI="
+               
https://github.com/mesonbuild/meson/releases/download/${MY_PV}/${MY_P}.tar.gz
+               verify-sig? ( 
https://github.com/mesonbuild/meson/releases/download/${MY_PV}/${MY_P}.tar.gz.asc
 )
+       "
+       BDEPEND="verify-sig? ( sec-keys/openpgp-keys-jpakkane )"
+       VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/jpakkane.gpg
+
        if [[ ${PV} != *_rc* ]] ; then
                KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k 
~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~x64-solaris"
        fi

diff --git a/dev-util/meson/meson-9999.ebuild b/dev-util/meson/meson-9999.ebuild
index fefd68d177e5..58946549b0ad 100644
--- a/dev-util/meson/meson-9999.ebuild
+++ b/dev-util/meson/meson-9999.ebuild
@@ -10,11 +10,19 @@ if [[ ${PV} = *9999* ]]; then
        EGIT_REPO_URI="https://github.com/mesonbuild/meson";
        inherit git-r3
 else
-       inherit pypi
+       inherit verify-sig
 
+       MY_PV=${PV/_/}
        MY_P=${P/_/}
        S=${WORKDIR}/${MY_P}
 
+       SRC_URI="
+               
https://github.com/mesonbuild/meson/releases/download/${MY_PV}/${MY_P}.tar.gz
+               verify-sig? ( 
https://github.com/mesonbuild/meson/releases/download/${MY_PV}/${MY_P}.tar.gz.asc
 )
+       "
+       BDEPEND="verify-sig? ( sec-keys/openpgp-keys-jpakkane )"
+       VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/jpakkane.gpg
+
        if [[ ${PV} != *_rc* ]] ; then
                KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k 
~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~x64-solaris"
        fi

Reply via email to