gentoo resync : 21.09.2018

3 files changed, 26 insertions, 2 deletions

diff --git a/app-crypt/ubuntu-keyring/Manifest b/app-crypt/ubuntu-keyring/Manifest
index 30d219899e0d..aae80c841019 100644
--- a/app-crypt/ubuntu-keyring/Manifest
+++ b/app-crypt/ubuntu-keyring/Manifest
@@ -1,3 +1,5 @@
 DIST ubuntu-keyring_2018.02.28.tar.gz 30181 BLAKE2B 1dc1232aa3ddbbb4a908e2b0deb035fd2ae61ddad4ebba99cce43c636af30760a09bf46f05c35c8205ccfaf526ed8b0a3b9daa308ae5d7272da078903ee15557 SHA512 60f3a792d095206466f4c39672affb261b4520fb7b5b9df47487741e0d6613cd1076fde0e30120bcbe161b170c41f7ec1bbb2c36cddf13ee69a457df00c36fa8
-EBUILD ubuntu-keyring-2018.02.28.ebuild 455 BLAKE2B 34a105976cad44dd824661c9417d34c933688b808542031c2e1b8b5c40caa071d21187b8b8584bccf0eed79a43624fe585f214987d3d9b6979486ede836bf1ad SHA512 1e3a21cfecc65ea64aa5eea251ec7ee69677e4fde2c66f9499df4cf000621de8cacf44688db2f1baf466d5f7f5e07c736c4eef4c5fa7c28a602eb193903f4536
+DIST ubuntu-keyring_2018.09.18.1.tar.gz 34263 BLAKE2B fa08e98d27875f1120b3a99127f7df38b6f5d1659d087d52bef23f29619a6cc2b5217302e8e4b1b5efefe7b946bab65a72b5a84a281dc1a6e18eafa5a1e9f8a0 SHA512 562221fc2cf4ff843e9fb16c40673e379ebaa82f12d092cff2454527a6e58ba5067abc5ef5950a82d089cad975de14cdaf01c9e29f98126da8e96a97168102f6
+EBUILD ubuntu-keyring-2018.02.28.ebuild 457 BLAKE2B c63cdf7150c404853160294e4b3230b4da99a9dafb17cbfc4ee72d940bda89ec6818a675b7a050b150cca3e02a0a6f1d5e832957663b3beec4daa987556becde SHA512 3f7744413a46f63430cc115b6953258fa3d1b7aeaf91b895a8a588901e096fb9da73ff19f750f0b83bdb98a257eef73e6dee840e0d096e254601a0e8f54da73b
+EBUILD ubuntu-keyring-2018.09.18.1.ebuild 489 BLAKE2B 53c436ce217a5e5347ef852519b94654a7a5cb499e017f637938205e2ec0cee96907f9619087a6d2e1d8812d78722a636623585e599560c5e52ad4d7eb00cb38 SHA512 9f1429a550f6633ca56cc0c5ca23e0ae0f7b3536cbb2a2dbe41f5e83cab215c8b8fd5d283570fccb3ecf3f74abac0b205e1919a1be3a753442d55b79741f9f3e
 MISC metadata.xml 249 BLAKE2B 3647e2ef94ad009c86dc9d42c1396ad9420ade97042882b8d8f60f676c465cfd6ea3cea4b77caccadd99eb0cbe1ef83b18b799ec676da4ecfbff528d21bb5ffb SHA512 334ac61f9acc5c4917fd29afb3b420b1689b39be80cada419bed1db033e64130866d0995abe5f1c75eb1290f51734e9ad4c8d06fd8b49c288ecf617a0693d273
diff --git a/app-crypt/ubuntu-keyring/ubuntu-keyring-2018.02.28.ebuild b/app-crypt/ubuntu-keyring/ubuntu-keyring-2018.02.28.ebuild
index 4b624c322c14..102c69fe7fed 100644
--- a/app-crypt/ubuntu-keyring/ubuntu-keyring-2018.02.28.ebuild
+++ b/app-crypt/ubuntu-keyring/ubuntu-keyring-2018.02.28.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 DESCRIPTION="GnuPG archive keys of the Ubuntu archive"
-HOMEPAGE="http://packages.ubuntu.com/zesty/ubuntu-keyring"
+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+"
diff --git a/app-crypt/ubuntu-keyring/ubuntu-keyring-2018.09.18.1.ebuild b/app-crypt/ubuntu-keyring/ubuntu-keyring-2018.09.18.1.ebuild
new file mode 100644
index 000000000000..27144165c204
--- /dev/null
+++ b/app-crypt/ubuntu-keyring/ubuntu-keyring-2018.09.18.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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"
+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}"/${P%%.1}ubuntu1
+
+src_install() {
+	insinto /usr/share/keyrings/
+	doins keyrings/*.gpg
+
+	dodoc changelog README
+}