commit: 91bbc5a1bf73ce57d8a792b3e62e9db3ece1839e Author: Sebastian Pipping <sping <AT> gentoo <DOT> org> AuthorDate: Wed Feb 3 20:34:09 2021 +0000 Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org> CommitDate: Wed Feb 3 20:34:50 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91bbc5a1
app-crypt/ubuntu-keyring: 2020.06.17.1 + QA + drop old Signed-off-by: Sebastian Pipping <sping <AT> gentoo.org> Package-Manager: Portage-3.0.14, Repoman-3.0.2 app-crypt/ubuntu-keyring/Manifest | 3 +-- .../ubuntu-keyring/ubuntu-keyring-2018.02.28.ebuild | 20 -------------------- ...8.1.ebuild => ubuntu-keyring-2020.06.17.1.ebuild} | 9 ++++----- 3 files changed, 5 insertions(+), 27 deletions(-) diff --git a/app-crypt/ubuntu-keyring/Manifest b/app-crypt/ubuntu-keyring/Manifest index 5c9cdd5217b..29a60a24580 100644 --- a/app-crypt/ubuntu-keyring/Manifest +++ b/app-crypt/ubuntu-keyring/Manifest @@ -1,3 +1,2 @@ -DIST ubuntu-keyring_2018.02.28.tar.gz 30181 BLAKE2B 1dc1232aa3ddbbb4a908e2b0deb035fd2ae61ddad4ebba99cce43c636af30760a09bf46f05c35c8205ccfaf526ed8b0a3b9daa308ae5d7272da078903ee15557 SHA512 60f3a792d095206466f4c39672affb261b4520fb7b5b9df47487741e0d6613cd1076fde0e30120bcbe161b170c41f7ec1bbb2c36cddf13ee69a457df00c36fa8 -DIST ubuntu-keyring_2018.09.18.1.tar.gz 34263 BLAKE2B fa08e98d27875f1120b3a99127f7df38b6f5d1659d087d52bef23f29619a6cc2b5217302e8e4b1b5efefe7b946bab65a72b5a84a281dc1a6e18eafa5a1e9f8a0 SHA512 562221fc2cf4ff843e9fb16c40673e379ebaa82f12d092cff2454527a6e58ba5067abc5ef5950a82d089cad975de14cdaf01c9e29f98126da8e96a97168102f6 DIST ubuntu-keyring_2020.02.11.2.tar.gz 39180 BLAKE2B e87e491bb7e22217fa9085edf77f833a3ee59cc7defe5690d343fe418795e4ca494d5db5df97684444906f4417f89b2730268599f3115c01fe8bcbc49e540558 SHA512 e717699a6f85a07e87cb3362550ce8a0db1271d2efd85f97405c0e9139516fdf8ca473a37035b5e6e38aca9e1a29e92f4a948d51def076f9c25961c5a1d91ce1 +DIST ubuntu-keyring_2020.06.17.1.tar.gz 36420 BLAKE2B bf3d7fa685df28db74d97c3b22c4fcd1cfe39f4a19b6ab8eb9bbb894b891cd0483ffa746c2f7c7b268582ad6e5420b1cfe40dd40bc9baa684eed5b42012bb248 SHA512 33009928eeeadbe1627b77f7db1aba32cf1e59d2fd6767bcd0d441d3521cb2b07c5bf06be86e8426c96b9661786a958b2e978f12d8f0941d1ac79289d977eeaf diff --git a/app-crypt/ubuntu-keyring/ubuntu-keyring-2018.02.28.ebuild b/app-crypt/ubuntu-keyring/ubuntu-keyring-2018.02.28.ebuild deleted file mode 100644 index 102c69fe7fe..00000000000 --- a/app-crypt/ubuntu-keyring/ubuntu-keyring-2018.02.28.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="GnuPG archive keys of the Ubuntu archive" -HOMEPAGE="https://packages.ubuntu.com/bionic/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.09.18.1.ebuild b/app-crypt/ubuntu-keyring/ubuntu-keyring-2020.06.17.1.ebuild similarity index 68% rename from app-crypt/ubuntu-keyring/ubuntu-keyring-2018.09.18.1.ebuild rename to app-crypt/ubuntu-keyring/ubuntu-keyring-2020.06.17.1.ebuild index 61fde153e31..3e1179815e3 100644 --- a/app-crypt/ubuntu-keyring/ubuntu-keyring-2018.09.18.1.ebuild +++ b/app-crypt/ubuntu-keyring/ubuntu-keyring-2020.06.17.1.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 DESCRIPTION="GnuPG archive keys of the Ubuntu archive" -HOMEPAGE="https://packages.ubuntu.com/cosmic/ubuntu-keyring"; +HOMEPAGE="https://packages.ubuntu.com/hirsute/ubuntu-keyring"; SRC_URI="mirror://ubuntu/pool/main/${PN:0:1}/${PN}/${PN}_${PV}.tar.gz" LICENSE="GPL-2+" @@ -12,11 +12,10 @@ SLOT="0" KEYWORDS="~amd64 ~ppc64 ~x86" IUSE="" -S="${WORKDIR}"/${P%%.1}ubuntu1 +DOCS=( changelog README ) src_install() { + default insinto /usr/share/keyrings/ doins keyrings/*.gpg - - dodoc changelog README }
