[gentoo-commits] repo/gentoo:master commit in: app-crypt/openpgp-keys-gentoo-mirror/, profiles/

[gentoo-commits] repo/gentoo:master commit in: app-crypt/openpgp-keys-gentoo-mirror/, profiles/

[Michał Górny]

commit:     578d7b15842c7403bb6ad15086e1ce29618ac65e
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 28 11:39:52 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Jul 28 11:40:29 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=578d7b15

app-crypt/openpgp-keys-gentoo-mirror: Remove last-rited pkg

 app-crypt/openpgp-keys-gentoo-mirror/Manifest        |  2 --
 app-crypt/openpgp-keys-gentoo-mirror/metadata.xml    |  8 --------
 .../openpgp-keys-gentoo-mirror-20180203.ebuild       | 20 --------------------
 .../openpgp-keys-gentoo-mirror-20180528.ebuild       | 20 --------------------
 profiles/package.mask                                |  9 ---------
 5 files changed, 59 deletions(-)

diff --git a/app-crypt/openpgp-keys-gentoo-mirror/Manifest b/app-crypt/openpgp-keys-gentoo-mirror/Manifest
deleted file mode 100644
index 02a488c55e6..00000000000
--- a/app-crypt/openpgp-keys-gentoo-mirror/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST gentoo-mirror.asc.20180203.gz 3054 BLAKE2B 4904aee11e80aaab7113356eba5aa8fcaced960b253bf5ba40addc6e4026fa7342319517af3549e902c547d42775fffd8713f1873ac9685d5dfe0207655bbfa5 SHA512 429e1226c535b1c3e0a87b471bf03a6c216086a5d801f77b5061b8f00b44a597e5569b5be58ca3a01aaa2d18c1e323532587e7403ab5ef51d718690d0bad2059
-DIST gentoo-mirror.asc.20180528.gz 5954 BLAKE2B 4942ac019249a6fe0c03a4cd33b472b2df82faabb8df1bba9af61dd12d52a5059a5c3ffc20f8c3cd8c5b20d24fd110f4dc0d9f11aaaa439cf07985842c993f40 SHA512 b0856f7ee62798e7b259bba17d7ee63a3bc5c78bbe901d0a45d951f47c1cc435a6b21812bf4287cb45520061713ec1885bfc07e5c2baf76c17a2d3f2584f1685

diff --git a/app-crypt/openpgp-keys-gentoo-mirror/metadata.xml b/app-crypt/openpgp-keys-gentoo-mirror/metadata.xml
deleted file mode 100644
index 0319eec4c8b..00000000000
--- a/app-crypt/openpgp-keys-gentoo-mirror/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>mgorny@gentoo.org</email>
-		<name>Michał Górny</name>
-	</maintainer>
-</pkgmetadata>

diff --git a/app-crypt/openpgp-keys-gentoo-mirror/openpgp-keys-gentoo-mirror-20180203.ebuild b/app-crypt/openpgp-keys-gentoo-mirror/openpgp-keys-gentoo-mirror-20180203.ebuild
deleted file mode 100644
index fc597b55ac3..00000000000
--- a/app-crypt/openpgp-keys-gentoo-mirror/openpgp-keys-gentoo-mirror-20180203.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="OpenPGP key used to sign gentoo-mirror commits"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Repository_mirror_and_CI"
-SRC_URI="https://dev.gentoo.org/~mgorny/dist/openpgp-keys/gentoo-mirror.asc.${PV}.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=""
-
-S=${WORKDIR}
-
-src_install() {
-	insinto /usr/share/openpgp-keys
-	newins "gentoo-mirror.asc.${PV}" gentoo-mirror.asc
-}

diff --git a/app-crypt/openpgp-keys-gentoo-mirror/openpgp-keys-gentoo-mirror-20180528.ebuild b/app-crypt/openpgp-keys-gentoo-mirror/openpgp-keys-gentoo-mirror-20180528.ebuild
deleted file mode 100644
index fc597b55ac3..00000000000
--- a/app-crypt/openpgp-keys-gentoo-mirror/openpgp-keys-gentoo-mirror-20180528.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="OpenPGP key used to sign gentoo-mirror commits"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Repository_mirror_and_CI"
-SRC_URI="https://dev.gentoo.org/~mgorny/dist/openpgp-keys/gentoo-mirror.asc.${PV}.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=""
-
-S=${WORKDIR}
-
-src_install() {
-	insinto /usr/share/openpgp-keys
-	newins "gentoo-mirror.asc.${PV}" gentoo-mirror.asc
-}

diff --git a/profiles/package.mask b/profiles/package.mask
index e45d1998405..568f4b95173 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -380,15 +380,6 @@ virtual/httpd-php:7.3
 =sys-kernel/vanilla-sources-4.9.104
 =sys-kernel/vanilla-sources-4.4.134
 
-# Michał Górny <mgorny@gentoo.org> (30 May 2018)
-# Gentoo repository mirrors are now running on Gentoo Infastructure,
-# and the key used to sign commits is appropriately part of the regular
-# keyring (>=app-crypt/openpgp-keys-gentoo-release-20180530).  Please
-# upgrade this keyring, and remove the custom sync-openpgp-key-path from
-# your repos.conf to make Portage use the release keys.
-# Removal in 30 days.
-app-crypt/openpgp-keys-gentoo-mirror
-
 # Kent Fredric <kentnl@gentoo.org> (27 May 2018)
 # Subject to Man-in-the-middle security bypass vulnerability.
 # Retained in tree only for users who need older versions