app-crypt/openpgp-keys-gentoo-release: Drop old

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

diff --git a/app-crypt/openpgp-keys-gentoo-release/Manifest b/app-crypt/openpgp-keys-gentoo-release/Manifest
index 7d6c57b0ad5f9cd98817e79ab16139289c606854..0d6974e0e3fce4bcceabc98ae5cb8935190678f0 100644 (file)
--- a/app-crypt/openpgp-keys-gentoo-release/Manifest
+++ b/app-crypt/openpgp-keys-gentoo-release/Manifest
@@ -1,6 +1,2 @@
-DIST gentoo-release-test-sigs-20180706.tar.gz 1437 BLAKE2B 00fb0a491c84853068ea578e68e8ab0a57842f6098c14da7ec44faf20abb23deef480aca958a7e352b9c55a024681eabc0c9aaf400e5dcbf8873277a3a940e38 SHA512 2a7cc2c650693c0e1fdf7083d77bf975e05ece3ab1495ed03362d02e8411481c80a62a9f21b23861bdc602d74c656a618e9a39d2bdef7ccd253ea9f3e4c7531a
 DIST gentoo-release-test-sigs-20190224.tar.gz 3235 BLAKE2B 924c69a62d5321716f536144f0607bd3ec4a65d76be492adc729864fd9bef82df0086541ae13034a83152ea0c8dc3cbd168be6cff111a3484128a22cbc8ef1d4 SHA512 f8cc2e84bedbdf14ace6abe4aacf8f0c9810c77ff6ae0fac301829d9d4d5cf0c128a76516c773ac993879215bcdb0aab097e1e7e747d8e1a7c4cfc815bd4d3e6
-DIST gentoo-release.asc.20180706.gz 44805 BLAKE2B 1ba26b90e564738a1282c5febe426628144ab70e526397b866f97214254c73bbb517cdaa48ba0e83ca75a7d88cd622375fda0f362c43d13b66720ffb682682d2 SHA512 ba48cb6d7e72c6a720df3ff2430a4b4dd261f947c23762cd0c1255a93391d10becfb491db1bb80b295edd1f8192580315d5c7be3670b8689ef702ed228b05894
-DIST gentoo-release.asc.20190102.gz 51067 BLAKE2B ace66e603afb9a171e705992ae550439dbc51e6dd9a788e78a9e85d938b7f9841bd0dd866306b32066cab5c23995ed2278d4d22670b238227de28d08c914c142 SHA512 eea90df98e795edcc0e4cbc26f48313c0cf4593424106ff79e0dc237835e51536777840fcf54619252438515ad10930992bcfbcd32596bb203a75151cee10553
-DIST gentoo-release.asc.20190223.gz 50407 BLAKE2B 6e3788da555fbb012c76ad174ddf6d0fd034c522b466b58c12e52eef5c900824724e32c51b53c7f7b542cca43073d1ab02ebcb7fc7560f0ff8c384cb47ee2fcc SHA512 3d71a91ae889ee1d237003f017d1cb7aec9129a9bcc9aa9cf2256656a88aaf96048c308994eda0b9f6b6fc2041fdb81cf91eb31d0b1ab7b380fe692b43e70d62
 DIST gentoo-release.asc.20190224.gz 42534 BLAKE2B 9b8bc98dbd66fdf44eb1b0b5a8e83bd4d08d85a3f9a95b293ae3e900de291567f36d59cb8dfb412e3f71db453184e2eefa453cf3e340d5b3091c55919fccebc7 SHA512 4f46c303faa134fc17903859527a9fa81d1015f4f2d2908509437ee2d07a992eb181c5a05544b333c310eda8ee2c1861cb07e978d92ef3f02955ade36110da67

diff --git a/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20180706.ebuild b/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20180706.ebuild
deleted file mode 100644 (file)
index a36da1a..0000000
--- a/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20180706.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="OpenPGP keys used for Gentoo releases (snapshots, stages)"
-HOMEPAGE="https://www.gentoo.org/downloads/signatures/"
-SRC_URI="https://dev.gentoo.org/~mgorny/dist/openpgp-keys/gentoo-release.asc.${PV}.gz
-       test? ( https://dev.gentoo.org/~mgorny/dist/openpgp-keys/gentoo-release-test-sigs-${PV}.tar.gz )"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="test"
-
-DEPEND="test? ( app-crypt/gnupg )"
-
-S=${WORKDIR}
-
-src_test() {
-       local old_umask=$(umask)
-       umask 077
-
-       local -x GNUPGHOME=${T}/.gnupg
-       mkdir "${GNUPGHOME}" || die
-       einfo "Importing keys ..."
-       gpg --import "gentoo-release.asc.${PV}" || die "Key import failed"
-
-       local f
-       for f in gentoo-release-test-sigs*/*.asc; do
-               einfo "Testing ${f##*/} ..."
-               gpg -q --trust-model always --verify "${f}" || die "Verification failed on ${f}"
-       done
-
-       umask "${old_umask}"
-}
-
-src_install() {
-       insinto /usr/share/openpgp-keys
-       newins "gentoo-release.asc.${PV}" gentoo-release.asc
-}

diff --git a/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20190102.ebuild b/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20190102.ebuild
deleted file mode 100644 (file)
index b9a927f..0000000
--- a/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20190102.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="OpenPGP keys used for Gentoo releases (snapshots, stages)"
-HOMEPAGE="https://www.gentoo.org/downloads/signatures/"
-SRC_URI="https://dev.gentoo.org/~mgorny/dist/openpgp-keys/gentoo-release.asc.${PV}.gz
-       test? ( https://dev.gentoo.org/~mgorny/dist/openpgp-keys/gentoo-release-test-sigs-20180706.tar.gz )"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="test"
-
-DEPEND="test? ( app-crypt/gnupg )"
-
-S=${WORKDIR}
-
-src_test() {
-       local old_umask=$(umask)
-       umask 077
-
-       local -x GNUPGHOME=${T}/.gnupg
-       mkdir "${GNUPGHOME}" || die
-       einfo "Importing keys ..."
-       gpg --import "gentoo-release.asc.${PV}" || die "Key import failed"
-
-       local f
-       for f in gentoo-release-test-sigs*/*.asc; do
-               einfo "Testing ${f##*/} ..."
-               gpg -q --trust-model always --verify "${f}" || die "Verification failed on ${f}"
-       done
-
-       umask "${old_umask}"
-}
-
-src_install() {
-       insinto /usr/share/openpgp-keys
-       newins "gentoo-release.asc.${PV}" gentoo-release.asc
-}

diff --git a/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20190223.ebuild b/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20190223.ebuild
deleted file mode 100644 (file)
index b9a927f..0000000
--- a/app-crypt/openpgp-keys-gentoo-release/openpgp-keys-gentoo-release-20190223.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="OpenPGP keys used for Gentoo releases (snapshots, stages)"
-HOMEPAGE="https://www.gentoo.org/downloads/signatures/"
-SRC_URI="https://dev.gentoo.org/~mgorny/dist/openpgp-keys/gentoo-release.asc.${PV}.gz
-       test? ( https://dev.gentoo.org/~mgorny/dist/openpgp-keys/gentoo-release-test-sigs-20180706.tar.gz )"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="test"
-
-DEPEND="test? ( app-crypt/gnupg )"
-
-S=${WORKDIR}
-
-src_test() {
-       local old_umask=$(umask)
-       umask 077
-
-       local -x GNUPGHOME=${T}/.gnupg
-       mkdir "${GNUPGHOME}" || die
-       einfo "Importing keys ..."
-       gpg --import "gentoo-release.asc.${PV}" || die "Key import failed"
-
-       local f
-       for f in gentoo-release-test-sigs*/*.asc; do
-               einfo "Testing ${f##*/} ..."
-               gpg -q --trust-model always --verify "${f}" || die "Verification failed on ${f}"
-       done
-
-       umask "${old_umask}"
-}
-
-src_install() {
-       insinto /usr/share/openpgp-keys
-       newins "gentoo-release.asc.${PV}" gentoo-release.asc
-}

diff --git a/profiles/package.mask b/profiles/package.mask
index 46d6b23b8e5da1699df4a2b1d64df882b56d0c82..5b8af17a964cb20430de62d638affe20715830bf 100644 (file)
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -87,11 +87,6 @@ media-libs/libsub
 # Mask experimental software
 =mail-mta/postfix-3.5*
 
-# Michał Górny <mgorny@gentoo.org> (24 Feb 2019)
-# Making releng key cert-only broke validating old releases.  Mask
-# the relevant version until the key is fixed.  Bug #678660.
-=app-crypt/openpgp-keys-gentoo-release-20190223
-
 # Andreas K. Huettel <dilfridge@gentoo.org> (23 Feb 2019)
 # Fails to build with glibc-2.28, bug 669206.
 # Removal in 30 days.