commit:     31af9306facbd6479b847a391ff4eb5363b458ac
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 20 03:28:39 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Mar 20 03:32:17 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31af9306

sec-keys/openpgp-keys-gnutls: add 20220318, drop 20220318

Upstream have migrated to a keyring which includes
the needed keys too.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sec-keys/openpgp-keys-gnutls/Manifest                          |  4 +---
 ...tls-20220318.ebuild => openpgp-keys-gnutls-20220320.ebuild} | 10 ++--------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/sec-keys/openpgp-keys-gnutls/Manifest 
b/sec-keys/openpgp-keys-gnutls/Manifest
index 3038a9c861e6..b261c3cf48d6 100644
--- a/sec-keys/openpgp-keys-gnutls/Manifest
+++ b/sec-keys/openpgp-keys-gnutls/Manifest
@@ -1,3 +1 @@
-DIST openpgp-keys-gnutls-20220318-dmitry.asc 26383 BLAKE2B 
bb65bf8bee696dd9e8adbd64dcd121474844c5ca161c911341fedf3f77db9f2fb2fc81b200bce622e0b2e206f9753fd7c6938aa6e878cdd1a0598acd6158116e
 SHA512 
98598048ca79fc4f5579aa0194c953fd593b82efa87924d59c0b97145ea8beaad8afe0d4fca8bd1b396154825829639d33599f94e2e4b578be1d9da664e4872b
-DIST openpgp-keys-gnutls-20220318-tim.asc 12486 BLAKE2B 
da116923d0dc0071fc9279f7637f8b78aa710f63dbdc42487319d913031f945766c73560a8f1fbda17b4a509a2f32c7623ec0a7f011c68dc48c7ea0464daffb6
 SHA512 
493a269f4d65694910dd3c2fdd3924baba81d8de42ba36525f09d1e430f329b1ef428400f2b021096694fdf3013763dfe605a151c35a03341a7aa0c931cedfd7
-DIST openpgp-keys-gnutls-20220318-ueno.asc 15322 BLAKE2B 
9a0ea5e95ffb89ab6889b76241f687863fafd7d9f30e4b1fa743b3e5bd3f766aab2ff836a75641af2cd957a0ab08b8a4914225e34679a3c577d21fa80d13f46d
 SHA512 
b32ad8da818a5b524ea196f87ca00dd081a306583fc36e7876c98c301b18628aa7954c24d0d11f99ce22ef0ae9d296cc0a8198e7a31fdc3d158042d738d5aa52
+DIST openpgp-keys-gnutls-20220320-release-keyring.gpg 20850 BLAKE2B 
06865e4ac4e69237f7c52f551ce902281f6699bd144cb16c97e81aa1323c99187637c3b62730e700bc1c7f9de4608da55d3a80c8ffc240ee533e42b4707e4fbe
 SHA512 
ebf592298142c7f05d8298a9e42aa4e5579eda54bf3c16f5a97cd22c22f3904a635a20cb1af6587d03b1a58545b925bddb769b098c664a336abce8ec9f10b9d5

diff --git a/sec-keys/openpgp-keys-gnutls/openpgp-keys-gnutls-20220318.ebuild 
b/sec-keys/openpgp-keys-gnutls/openpgp-keys-gnutls-20220320.ebuild
similarity index 64%
rename from sec-keys/openpgp-keys-gnutls/openpgp-keys-gnutls-20220318.ebuild
rename to sec-keys/openpgp-keys-gnutls/openpgp-keys-gnutls-20220320.ebuild
index 4b28aa3faf26..01c608c423ec 100644
--- a/sec-keys/openpgp-keys-gnutls/openpgp-keys-gnutls-20220318.ebuild
+++ b/sec-keys/openpgp-keys-gnutls/openpgp-keys-gnutls-20220320.ebuild
@@ -5,19 +5,13 @@ EAPI=8
 
 DESCRIPTION="OpenPGP keys used by GnuTLS"
 HOMEPAGE="https://www.gnutls.org/download.html";
-# Mirrored Dmitry's key b/c only on keyservers
-SRC_URI="
-       https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-dmitry.asc
-       https://www.gnutls.org/pgpkey-tim.txt -> ${P}-tim.asc
-       https://www.gnutls.org/pgpkey-ueno.txt -> ${P}-ueno.asc
-"
+SRC_URI="https://gnutls.org/gnutls-release-keyring.gpg -> 
${P}-release-keyring.gpg"
+S="${WORKDIR}"
 
 LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 
sparc x86"
 
-S=${WORKDIR}
-
 src_install() {
        local files=( ${A} )
        insinto /usr/share/openpgp-keys

Reply via email to