Gentoo Archives: gentoo-commits

From: Sebastian Pipping <sping@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-crypt/ubuntu-keyring/
Date: Thu, 20 Sep 2018 16:20:40
Message-Id: 1537459795.99a45f7b9718c99eff48862e098a1f6026034173.sping@gentoo
1 commit: 99a45f7b9718c99eff48862e098a1f6026034173
2 Author: Sebastian Pipping <sping <AT> gentoo <DOT> org>
3 AuthorDate: Thu Sep 20 16:08:38 2018 +0000
4 Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
5 CommitDate: Thu Sep 20 16:09:55 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99a45f7b
7
8 app-crypt/ubuntu-keyring: 2018.09.18.1 + URL fix
9
10 Package-Manager: Portage-2.3.49, Repoman-2.3.10
11
12 app-crypt/ubuntu-keyring/Manifest | 1 +
13 app-crypt/ubuntu-keyring/ubuntu-keyring-2018.02.28.ebuild | 2 +-
14 ...keyring-2018.02.28.ebuild => ubuntu-keyring-2018.09.18.1.ebuild} | 6 ++++--
15 3 files changed, 6 insertions(+), 3 deletions(-)
16
17 diff --git a/app-crypt/ubuntu-keyring/Manifest b/app-crypt/ubuntu-keyring/Manifest
18 index d3ce0cda5e6..77b519ed076 100644
19 --- a/app-crypt/ubuntu-keyring/Manifest
20 +++ b/app-crypt/ubuntu-keyring/Manifest
21 @@ -1 +1,2 @@
22 DIST ubuntu-keyring_2018.02.28.tar.gz 30181 BLAKE2B 1dc1232aa3ddbbb4a908e2b0deb035fd2ae61ddad4ebba99cce43c636af30760a09bf46f05c35c8205ccfaf526ed8b0a3b9daa308ae5d7272da078903ee15557 SHA512 60f3a792d095206466f4c39672affb261b4520fb7b5b9df47487741e0d6613cd1076fde0e30120bcbe161b170c41f7ec1bbb2c36cddf13ee69a457df00c36fa8
23 +DIST ubuntu-keyring_2018.09.18.1.tar.gz 34263 BLAKE2B fa08e98d27875f1120b3a99127f7df38b6f5d1659d087d52bef23f29619a6cc2b5217302e8e4b1b5efefe7b946bab65a72b5a84a281dc1a6e18eafa5a1e9f8a0 SHA512 562221fc2cf4ff843e9fb16c40673e379ebaa82f12d092cff2454527a6e58ba5067abc5ef5950a82d089cad975de14cdaf01c9e29f98126da8e96a97168102f6
24
25 diff --git a/app-crypt/ubuntu-keyring/ubuntu-keyring-2018.02.28.ebuild b/app-crypt/ubuntu-keyring/ubuntu-keyring-2018.02.28.ebuild
26 index 4b624c322c1..102c69fe7fe 100644
27 --- a/app-crypt/ubuntu-keyring/ubuntu-keyring-2018.02.28.ebuild
28 +++ b/app-crypt/ubuntu-keyring/ubuntu-keyring-2018.02.28.ebuild
29 @@ -4,7 +4,7 @@
30 EAPI=6
31
32 DESCRIPTION="GnuPG archive keys of the Ubuntu archive"
33 -HOMEPAGE="http://packages.ubuntu.com/zesty/ubuntu-keyring"
34 +HOMEPAGE="https://packages.ubuntu.com/bionic/ubuntu-keyring"
35 SRC_URI="mirror://ubuntu/pool/main/${PN:0:1}/${PN}/${PN}_${PV}.tar.gz"
36
37 LICENSE="GPL-2+"
38
39 diff --git a/app-crypt/ubuntu-keyring/ubuntu-keyring-2018.02.28.ebuild b/app-crypt/ubuntu-keyring/ubuntu-keyring-2018.09.18.1.ebuild
40 similarity index 79%
41 copy from app-crypt/ubuntu-keyring/ubuntu-keyring-2018.02.28.ebuild
42 copy to app-crypt/ubuntu-keyring/ubuntu-keyring-2018.09.18.1.ebuild
43 index 4b624c322c1..27144165c20 100644
44 --- a/app-crypt/ubuntu-keyring/ubuntu-keyring-2018.02.28.ebuild
45 +++ b/app-crypt/ubuntu-keyring/ubuntu-keyring-2018.09.18.1.ebuild
46 @@ -1,10 +1,10 @@
47 # Copyright 1999-2018 Gentoo Foundation
48 # Distributed under the terms of the GNU General Public License v2
49
50 -EAPI=6
51 +EAPI=7
52
53 DESCRIPTION="GnuPG archive keys of the Ubuntu archive"
54 -HOMEPAGE="http://packages.ubuntu.com/zesty/ubuntu-keyring"
55 +HOMEPAGE="https://packages.ubuntu.com/cosmic/ubuntu-keyring"
56 SRC_URI="mirror://ubuntu/pool/main/${PN:0:1}/${PN}/${PN}_${PV}.tar.gz"
57
58 LICENSE="GPL-2+"
59 @@ -12,6 +12,8 @@ SLOT="0"
60 KEYWORDS="~amd64 ~x86"
61 IUSE=""
62
63 +S="${WORKDIR}"/${P%%.1}ubuntu1
64 +
65 src_install() {
66 insinto /usr/share/keyrings/
67 doins keyrings/*.gpg