[gentoo-commits] repo/gentoo:master commit in: app-crypt/ubuntu-keyring/

[Sebastian Pipping]

commit:     117966ac9eb18d0c121f80d6cf5ee3faabdfdfd7
Author:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
AuthorDate: Thu Mar  1 20:06:34 2018 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Thu Mar  1 20:07:31 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=117966ac

app-crypt/ubuntu-keyring: 2018.02.28, remove old

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 app-crypt/ubuntu-keyring/Manifest                  |  7 +------
 .../ubuntu-keyring-2012.05.19.ebuild               | 20 --------------------
 .../ubuntu-keyring-2016.09.01.ebuild               | 20 --------------------
 .../ubuntu-keyring-2016.09.19.ebuild               | 22 ----------------------
 .../ubuntu-keyring-2016.10.27.ebuild               | 20 --------------------
 .../ubuntu-keyring-2018.02.05.ebuild               | 22 ----------------------
 ....06.ebuild => ubuntu-keyring-2018.02.28.ebuild} |  2 --
 7 files changed, 1 insertion(+), 112 deletions(-)

diff --git a/app-crypt/ubuntu-keyring/Manifest b/app-crypt/ubuntu-keyring/Manifest
index 55ef957b617..d3ce0cda5e6 100644
--- a/app-crypt/ubuntu-keyring/Manifest
+++ b/app-crypt/ubuntu-keyring/Manifest
@@ -1,6 +1 @@
-DIST ubuntu-keyring_2012.05.19.tar.gz 18495 BLAKE2B 8bc9e0c8a112e50b686db7224b88aafd3bf7336071d404ef70f5007ea2be8c9b1e6fe07dc0744e540f948c42e9730ed3accd49dbd9a9a324d43bf4b8012b1a9f SHA512 3f33099255af9aad1ae8ae845074e714dc846134f49934b221a74c21ef35af5172dc1d845d3819cb28f353abd23df690b15fa0e7f74f8e2a882ddef1ab150f54
-DIST ubuntu-keyring_2016.09.01.tar.gz 18251 BLAKE2B 223982d494c7f455e834b8ed1763bd84fe0929af3a556143b7a166160ac056fc07bad5c52dafb170df0ab232bed6816479e2dad549bc90becdf7d847345523ae SHA512 ae48fb7a57c95140abb38fa3ed0484acf5374ecc562b54ca321a1c33e76178c3f9e5869ceca1f529686135d601f5738d4426589e558f65923271ca5d2f16ebe2
-DIST ubuntu-keyring_2016.09.19.tar.gz 20282 BLAKE2B bfe9af3dd25b2f35f27bd421b5b03d94f018fc02af0f3dfb95441260b31ec48ea406c869305f99a1599661bc4862e40c9258d5fe39c2b84e8a3534f3ae807e1c SHA512 2dec94d99502730f455ca9832a0f20a027fbcbd896124b93f79dbf0b2c15e73641719626c08caaf9d35922d569929097f2e2189bad855d12bf4cddd2e4379d19
-DIST ubuntu-keyring_2016.10.27.tar.gz 19182 BLAKE2B 2a3f67be4f2e14e15747f497ffb6a5d784010ae4532b4b3990103cc461f7e2af8a00957fb173ab98e7e44e3fab843c611c33a88cd68c462e09b70a54acfe3cce SHA512 ac4b4353a89bd15f8511ba1cecccb6597c407b67b4642c24ae1e461b2be2a5b2989bf5bc033cb2a265217688a366d2c2907b52bc1e484061348cb218ee5cb6a2
-DIST ubuntu-keyring_2018.02.05.tar.gz 27788 BLAKE2B 6d11ad002063eb0663316a157058fe4733bae42af4bb6620c20f0230b0f3f0c7a7760b90401c7fe711f0177de9302f13814245dff4476e8781912e08fa35a8d3 SHA512 cbed6d444f9d83c46f9d4a3351dec7da2ae9746fc56fa66f74c95719fa0ecdb84edb90c74acec26ffecae3741c9c460c84208bdbd3a1ec006b735acf90a7fe99
-DIST ubuntu-keyring_2018.02.06.tar.gz 29977 BLAKE2B 0ea4fc1ab191ee1c04eb1df1675ce3b1a432415c726e2778d9dd7e2bf7eb6b122d39438d07217279172ad19c3618e95b378516cd8bca63fe860b0e721678db07 SHA512 bd87412686dbdc5ca25bad5d810a7410f3d9472cc254d8dc8936d45fd65b559ed5b4f103058192afd8db8b9fc01adb9a71125e998bbeb939b01c732e5c1f03b6
+DIST ubuntu-keyring_2018.02.28.tar.gz 30181 BLAKE2B 1dc1232aa3ddbbb4a908e2b0deb035fd2ae61ddad4ebba99cce43c636af30760a09bf46f05c35c8205ccfaf526ed8b0a3b9daa308ae5d7272da078903ee15557 SHA512 60f3a792d095206466f4c39672affb261b4520fb7b5b9df47487741e0d6613cd1076fde0e30120bcbe161b170c41f7ec1bbb2c36cddf13ee69a457df00c36fa8

diff --git a/app-crypt/ubuntu-keyring/ubuntu-keyring-2012.05.19.ebuild b/app-crypt/ubuntu-keyring/ubuntu-keyring-2012.05.19.ebuild
deleted file mode 100644
index a42086dffbd..00000000000
--- a/app-crypt/ubuntu-keyring/ubuntu-keyring-2012.05.19.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="GnuPG archive keys of the Ubuntu archive"
-HOMEPAGE="http://packages.ubuntu.com/vivid/ubuntu-keyring"
-SRC_URI="mirror://ubuntu/pool/main/${PN:0:1}/${PN}/${PN}_${PV}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-src_install() {
-	insinto /usr/share/keyrings/
-	doins keyrings/*.gpg
-
-	dodoc changelog README
-}

diff --git a/app-crypt/ubuntu-keyring/ubuntu-keyring-2016.09.01.ebuild b/app-crypt/ubuntu-keyring/ubuntu-keyring-2016.09.01.ebuild
deleted file mode 100644
index 6444b352747..00000000000
--- a/app-crypt/ubuntu-keyring/ubuntu-keyring-2016.09.01.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="GnuPG archive keys of the Ubuntu archive"
-HOMEPAGE="http://packages.ubuntu.com/yakkety/ubuntu-keyring"
-SRC_URI="mirror://ubuntu/pool/main/${PN:0:1}/${PN}/${PN}_${PV}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-src_install() {
-	insinto /usr/share/keyrings/
-	doins keyrings/*.gpg
-
-	dodoc changelog README
-}

diff --git a/app-crypt/ubuntu-keyring/ubuntu-keyring-2016.09.19.ebuild b/app-crypt/ubuntu-keyring/ubuntu-keyring-2016.09.19.ebuild
deleted file mode 100644
index f6c8e5dc7fb..00000000000
--- a/app-crypt/ubuntu-keyring/ubuntu-keyring-2016.09.19.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="GnuPG archive keys of the Ubuntu archive"
-HOMEPAGE="http://packages.ubuntu.com/yakkety/ubuntu-keyring"
-SRC_URI="mirror://ubuntu/pool/main/${PN:0:1}/${PN}/${PN}_${PV}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-S="${WORKDIR}"/${PN}-2016.09.01
-
-src_install() {
-	insinto /usr/share/keyrings/
-	doins keyrings/*.gpg
-
-	dodoc changelog README
-}

diff --git a/app-crypt/ubuntu-keyring/ubuntu-keyring-2016.10.27.ebuild b/app-crypt/ubuntu-keyring/ubuntu-keyring-2016.10.27.ebuild
deleted file mode 100644
index fe1e09ffed5..00000000000
--- a/app-crypt/ubuntu-keyring/ubuntu-keyring-2016.10.27.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="GnuPG archive keys of the Ubuntu archive"
-HOMEPAGE="http://packages.ubuntu.com/zesty/ubuntu-keyring"
-SRC_URI="mirror://ubuntu/pool/main/${PN:0:1}/${PN}/${PN}_${PV}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-src_install() {
-	insinto /usr/share/keyrings/
-	doins keyrings/*.gpg
-
-	dodoc changelog README
-}

diff --git a/app-crypt/ubuntu-keyring/ubuntu-keyring-2018.02.05.ebuild b/app-crypt/ubuntu-keyring/ubuntu-keyring-2018.02.05.ebuild
deleted file mode 100644
index 2189efd914c..00000000000
--- a/app-crypt/ubuntu-keyring/ubuntu-keyring-2018.02.05.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="GnuPG archive keys of the Ubuntu archive"
-HOMEPAGE="http://packages.ubuntu.com/zesty/ubuntu-keyring"
-SRC_URI="mirror://ubuntu/pool/main/${PN:0:1}/${PN}/${PN}_${PV}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-S="${WORKDIR}"/${PN}-2018.01.17
-
-src_install() {
-	insinto /usr/share/keyrings/
-	doins keyrings/*.gpg
-
-	dodoc changelog README
-}

diff --git a/app-crypt/ubuntu-keyring/ubuntu-keyring-2018.02.06.ebuild b/app-crypt/ubuntu-keyring/ubuntu-keyring-2018.02.28.ebuild
similarity index 93%
rename from app-crypt/ubuntu-keyring/ubuntu-keyring-2018.02.06.ebuild
rename to app-crypt/ubuntu-keyring/ubuntu-keyring-2018.02.28.ebuild
index 2189efd914c..4b624c322c1 100644
--- a/app-crypt/ubuntu-keyring/ubuntu-keyring-2018.02.06.ebuild
+++ b/app-crypt/ubuntu-keyring/ubuntu-keyring-2018.02.28.ebuild
@@ -12,8 +12,6 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-S="${WORKDIR}"/${PN}-2018.01.17
-
 src_install() {
 	insinto /usr/share/keyrings/
 	doins keyrings/*.gpg