commit: 327d39015208a38c6bced9f11103d1a5b6206fb1 Author: Eli Schwartz <eschwartz <AT> gentoo <DOT> org> AuthorDate: Wed Aug 6 04:21:54 2025 +0000 Commit: Eli Schwartz <eschwartz <AT> gentoo <DOT> org> CommitDate: Thu Aug 7 16:37:23 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=327d3901
sec-keys/openpgp-keys-apache-tomcat: port to sec-keys.eclass for verification support Signed-off-by: Eli Schwartz <eschwartz <AT> gentoo.org> .../openpgp-keys-apache-tomcat-10.1.43.ebuild | 12 +++++++++--- .../openpgp-keys-apache-tomcat-11.0.9.ebuild | 13 ++++++++++--- .../openpgp-keys-apache-tomcat-9.0.107.ebuild | 13 ++++++++++--- 3 files changed, 29 insertions(+), 9 deletions(-) diff --git a/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-10.1.43.ebuild b/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-10.1.43.ebuild index cd18411af866..b93cb8446136 100644 --- a/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-10.1.43.ebuild +++ b/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-10.1.43.ebuild @@ -3,6 +3,13 @@ EAPI=8 +SEC_KEYS_VALIDPGPKEYS=( + 'A9C5DF4D22E99998D9875A5110C01C5A2F6059E7:markt:manual' + '5C3C5F3E314C866292F359A8F3AD5C94A67F707E:schultz:manual' +) + +inherit sec-keys + DESCRIPTION="OpenPGP keys used by tomcat.apache.org" HOMEPAGE="https://tomcat.apache.org/download-10.cgi"; SRC_URI="https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/KEYS -> ${P}-KEYS.asc" @@ -13,7 +20,6 @@ SLOT="${PV}" KEYWORDS="amd64 ~arm64" src_install() { - local files=( ${A} ) - insinto /usr/share/openpgp-keys - newins - tomcat-${PV}.apache.org.asc < <(cat "${files[@]/#/${DISTDIR}/}" || die) + sec-keys_src_install + mv "${ED}"/usr/share/openpgp-keys/{apache-tomcat,tomcat-${SLOT}.apache.org}.asc || die } diff --git a/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-11.0.9.ebuild b/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-11.0.9.ebuild index f713a31845c4..1ff1360990ff 100644 --- a/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-11.0.9.ebuild +++ b/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-11.0.9.ebuild @@ -3,6 +3,14 @@ EAPI=8 +SEC_KEYS_VALIDPGPKEYS=( + 'A9C5DF4D22E99998D9875A5110C01C5A2F6059E7:markt:manual' + '48F8E69F6390C9F25CFEDCD268248959359E722B:remm:manual' + '7C4498DF62F8989421BDD497A981B20F69F31D68:rjung:manual' +) + +inherit sec-keys + DESCRIPTION="OpenPGP keys used by tomcat.apache.org" HOMEPAGE="https://tomcat.apache.org/download-11.cgi"; SRC_URI="https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/KEYS -> ${P}-KEYS.asc" @@ -13,7 +21,6 @@ SLOT="${PV}" KEYWORDS="amd64 ~arm64" src_install() { - local files=( ${A} ) - insinto /usr/share/openpgp-keys - newins - tomcat-${PV}.apache.org.asc < <(cat "${files[@]/#/${DISTDIR}/}" || die) + sec-keys_src_install + mv "${ED}"/usr/share/openpgp-keys/{apache-tomcat,tomcat-${SLOT}.apache.org}.asc || die } diff --git a/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-9.0.107.ebuild b/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-9.0.107.ebuild index 02ec7f5e907d..027cf59860d5 100644 --- a/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-9.0.107.ebuild +++ b/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-9.0.107.ebuild @@ -3,6 +3,14 @@ EAPI=8 +SEC_KEYS_VALIDPGPKEYS=( + 'A9C5DF4D22E99998D9875A5110C01C5A2F6059E7:markt:manual' + 'DCFD35E0BF8CA7344752DE8B6FB21E8933C60243:markt2:manual' + '48F8E69F6390C9F25CFEDCD268248959359E722B:remm:manual' +) + +inherit sec-keys + DESCRIPTION="OpenPGP keys used by tomcat.apache.org" HOMEPAGE="https://tomcat.apache.org/download-90.cgi"; SRC_URI="https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/KEYS -> ${P}-KEYS.asc" @@ -13,7 +21,6 @@ SLOT="${PV}" KEYWORDS="amd64 ~arm64" src_install() { - local files=( ${A} ) - insinto /usr/share/openpgp-keys - newins - tomcat-${PV}.apache.org.asc < <(cat "${files[@]/#/${DISTDIR}/}" || die) + sec-keys_src_install + mv "${ED}"/usr/share/openpgp-keys/{apache-tomcat,tomcat-${SLOT}.apache.org}.asc || die }
