gentoo resync : 25.03.2022

9 files changed, 72 insertions, 12 deletions

diff --git a/sec-keys/Manifest.gz b/sec-keys/Manifest.gz
index 816900fcfe9d..20497facb069 100644
--- a/sec-keys/Manifest.gz
+++ b/sec-keys/Manifest.gz
diff --git a/sec-keys/openpgp-keys-gnutls/Manifest b/sec-keys/openpgp-keys-gnutls/Manifest
index 1fbf0c4b353e..7d92b5e855f1 100644
--- a/sec-keys/openpgp-keys-gnutls/Manifest
+++ b/sec-keys/openpgp-keys-gnutls/Manifest
@@ -1,5 +1,3 @@
-DIST openpgp-keys-gnutls-20200318-dmitry.asc 26383 BLAKE2B bb65bf8bee696dd9e8adbd64dcd121474844c5ca161c911341fedf3f77db9f2fb2fc81b200bce622e0b2e206f9753fd7c6938aa6e878cdd1a0598acd6158116e SHA512 98598048ca79fc4f5579aa0194c953fd593b82efa87924d59c0b97145ea8beaad8afe0d4fca8bd1b396154825829639d33599f94e2e4b578be1d9da664e4872b
-DIST openpgp-keys-gnutls-20200318-tim.asc 12486 BLAKE2B da116923d0dc0071fc9279f7637f8b78aa710f63dbdc42487319d913031f945766c73560a8f1fbda17b4a509a2f32c7623ec0a7f011c68dc48c7ea0464daffb6 SHA512 493a269f4d65694910dd3c2fdd3924baba81d8de42ba36525f09d1e430f329b1ef428400f2b021096694fdf3013763dfe605a151c35a03341a7aa0c931cedfd7
-DIST openpgp-keys-gnutls-20200318-ueno.asc 15322 BLAKE2B 9a0ea5e95ffb89ab6889b76241f687863fafd7d9f30e4b1fa743b3e5bd3f766aab2ff836a75641af2cd957a0ab08b8a4914225e34679a3c577d21fa80d13f46d SHA512 b32ad8da818a5b524ea196f87ca00dd081a306583fc36e7876c98c301b18628aa7954c24d0d11f99ce22ef0ae9d296cc0a8198e7a31fdc3d158042d738d5aa52
-EBUILD openpgp-keys-gnutls-20200318.ebuild 724 BLAKE2B fab55cbb8aeed6d31d06c2c4cb768c55e6c340a3897af6b454ff1c23ed124016d8be68b539a011810ea02c49b05b97e336bfafea1fc149b664bf8bbc2b6803fe SHA512 0d3e872cb192b8077ab31f6facc4fcf0a413522276f2acd61343138b913427ed07448fdc518e0ae6421716f83bd38c80823aacf0d0fbced4c4e6db53525c4427
+DIST openpgp-keys-gnutls-20220320-release-keyring.gpg 20850 BLAKE2B 06865e4ac4e69237f7c52f551ce902281f6699bd144cb16c97e81aa1323c99187637c3b62730e700bc1c7f9de4608da55d3a80c8ffc240ee533e42b4707e4fbe SHA512 ebf592298142c7f05d8298a9e42aa4e5579eda54bf3c16f5a97cd22c22f3904a635a20cb1af6587d03b1a58545b925bddb769b098c664a336abce8ec9f10b9d5
+EBUILD openpgp-keys-gnutls-20220320.ebuild 565 BLAKE2B 01443ae4031166737a3fc78971a986e5d2ea8298c07eae198214aac1b6c321caf825af60e4d40bb4e51f605530cedfe1ea0e6dd40ff731be4b1ff3fa5b446590 SHA512 308b3a47e58c7c298bcf4e8f663ab347162205118c23276a0bef5d48a9461ab269299094ddcbe2a8c58135f3f58b8431d75360825cfc21f09b284b0c6b3fc17c
 MISC metadata.xml 248 BLAKE2B 4d2533691da4a661545bc76aae55b72077dd0f54a21c67450fad5565393db92779160e268c4ac7e1557cef6ac13e9476b32c6ff6e516c3afd404ab40a28164b3 SHA512 5c660412e95fdb471f41390d1d2fe96c549f2a00c932b2ce5832a56d3ce49df6b08991bfdcabcb296434d0d6599bdb3fb1ec4dbf7373fe2effaa6655ab411184
diff --git a/sec-keys/openpgp-keys-gnutls/openpgp-keys-gnutls-20200318.ebuild b/sec-keys/openpgp-keys-gnutls/openpgp-keys-gnutls-20220320.ebuild
index 4b28aa3faf26..01c608c423ec 100644
--- a/sec-keys/openpgp-keys-gnutls/openpgp-keys-gnutls-20200318.ebuild
+++ b/sec-keys/openpgp-keys-gnutls/openpgp-keys-gnutls-20220320.ebuild
@@ -5,19 +5,13 @@ EAPI=8
 
 DESCRIPTION="OpenPGP keys used by GnuTLS"
 HOMEPAGE="https://www.gnutls.org/download.html"
-# Mirrored Dmitry's key b/c only on keyservers
-SRC_URI="
-	https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-dmitry.asc
-	https://www.gnutls.org/pgpkey-tim.txt -> ${P}-tim.asc
-	https://www.gnutls.org/pgpkey-ueno.txt -> ${P}-ueno.asc
-"
+SRC_URI="https://gnutls.org/gnutls-release-keyring.gpg -> ${P}-release-keyring.gpg"
+S="${WORKDIR}"
 
 LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
-S=${WORKDIR}
-
 src_install() {
 	local files=( ${A} )
 	insinto /usr/share/openpgp-keys
diff --git a/sec-keys/openpgp-keys-libarchive/Manifest b/sec-keys/openpgp-keys-libarchive/Manifest
new file mode 100644
index 000000000000..5af4344044c1
--- /dev/null
+++ b/sec-keys/openpgp-keys-libarchive/Manifest
@@ -0,0 +1,3 @@
+DIST libarchive-A5A45B12AD92D964B89EEE2DEC560C81CEC2276E.asc 4008 BLAKE2B f1456f8161182520d472864d4c51effef8c8ec354cba636ed7d13b06bed0dae9cc557ef4faba1e09eb773240cda8eba854fd7de36be1662f1c967d61bda3c155 SHA512 ea97ab1992ee0862e7bc65bacde3b7175de361c49574ac836abd8b59e304cbd4e25b6e4354a49e3c77300b0f82d9b5430eb38f1db3d1fd6c8d41b9327f8504fa
+EBUILD openpgp-keys-libarchive-20220324.ebuild 656 BLAKE2B c23f8c9fd4c0c4409d040dca10c0b7ff634123137acc86a6dd6dc169e875991fcdd88abc8e040720e4006e9ba9b96589f24eea851d23e3e0ad90d0107b55561b SHA512 321f1ce6bbe846245107f9f7bbb2b013bf42597faa012076f181e88fc49ab20104162aea04e609233e1560928935b5859ce753fcd8b6bf0fa9dfd4880901a64a
+MISC metadata.xml 242 BLAKE2B a9f678a0ec297263ba15bb2b541b77b25b59694ea4b435e8664df1b6ac61f529c78c73b4807df37ecb3fd963b6465f24edec15986e351f2181feba121df1bcf6 SHA512 1ba4084c07efe559af9cce6a21e81ffcad9c445381f0107e3a0c40a73c264ee7b798ba7fd7bcafa1bd2351853a399dd1453d0df64c63f4383f13fc88cf36360d
diff --git a/sec-keys/openpgp-keys-libarchive/metadata.xml b/sec-keys/openpgp-keys-libarchive/metadata.xml
new file mode 100644
index 000000000000..5a9372a753a9
--- /dev/null
+++ b/sec-keys/openpgp-keys-libarchive/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+	</maintainer>
+	<stabilize-allarches/>
+</pkgmetadata>
diff --git a/sec-keys/openpgp-keys-libarchive/openpgp-keys-libarchive-20220324.ebuild b/sec-keys/openpgp-keys-libarchive/openpgp-keys-libarchive-20220324.ebuild
new file mode 100644
index 000000000000..94c060c5fc85
--- /dev/null
+++ b/sec-keys/openpgp-keys-libarchive/openpgp-keys-libarchive-20220324.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="OpenPGP keys used by the libarchive project"
+HOMEPAGE="https://www.libarchive.org/"
+SRC_URI="
+	https://keys.openpgp.org/vks/v1/by-fingerprint/A5A45B12AD92D964B89EEE2DEC560C81CEC2276E
+		-> libarchive-A5A45B12AD92D964B89EEE2DEC560C81CEC2276E.asc
+"
+S=${WORKDIR}
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+
+src_install() {
+	local files=( ${A} )
+	insinto /usr/share/openpgp-keys
+	newins - libarchive.org.asc < <(cat "${files[@]/#/${DISTDIR}/}" || die)
+}
diff --git a/sec-keys/openpgp-keys-processone/Manifest b/sec-keys/openpgp-keys-processone/Manifest
new file mode 100644
index 000000000000..570fc8ed04a5
--- /dev/null
+++ b/sec-keys/openpgp-keys-processone/Manifest
@@ -0,0 +1,3 @@
+DIST processone-31468D18DF9841242B90D7328ECA469419C09311.asc 1336 BLAKE2B 6a639d7c2e2e3a11857a9eaddb4df03f2aca9f9f42c99bab9a8f224477349e66daab71f61e0288579514e40a94823abaa7fe8ff3883da815ee789bb883f80ab6 SHA512 f51cfff4dc568e859d973ca1738210a63796ad6ba0a75def8d9dc16ba7b0e0eb8e50ef49e62c7aacf7922cfb642f53c5baacbfea36d5a86433c073b253d70d42
+EBUILD openpgp-keys-processone-20220316.ebuild 694 BLAKE2B ecb4ecacfdafe08dfc954088c8c8d2f3b94d0c4e107f3a7574d0799688b9399fd3969e7195fe06b22a62ca3d2723c5d2dc73816684f6068298592261a29cc8f9 SHA512 ca1f1d826c9b875139925bbf749084d9295d4ae7fc15ca8e6a830ffd66ee130c69e9822e349975d55ee8cb13e8c283c5ce86556453dcd24d76e18b9fd2c10b33
+MISC metadata.xml 245 BLAKE2B 45b9278c10dafba8c2071712cc299114ffedd6f1eb8fe31dccdef5dfc5cc2d8107e4eccd25aeeec728baece2ed4881c5612af2ac589d3dfc8066ffcef7e41125 SHA512 7e8fedeefe0f59989925805c592d183a3f72b8ccd911b1b7409b3fe1d060f9f7d06f4863377eb0e871ef4428c1bc66fd5a53420f0577026305cc12c56fe4cf22
diff --git a/sec-keys/openpgp-keys-processone/metadata.xml b/sec-keys/openpgp-keys-processone/metadata.xml
new file mode 100644
index 000000000000..945e33db69cd
--- /dev/null
+++ b/sec-keys/openpgp-keys-processone/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>ejabberd@gentoo.org</email>
+	</maintainer>
+	<stabilize-allarches/>
+</pkgmetadata>
diff --git a/sec-keys/openpgp-keys-processone/openpgp-keys-processone-20220316.ebuild b/sec-keys/openpgp-keys-processone/openpgp-keys-processone-20220316.ebuild
new file mode 100644
index 000000000000..d5d2ef3b0d64
--- /dev/null
+++ b/sec-keys/openpgp-keys-processone/openpgp-keys-processone-20220316.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="OpenPGP keys used by processone/ejabberd"
+HOMEPAGE="https://www.process-one.net/"
+# See https://www.process-one.net/blog/verifying_process_one_downloads_integrity/
+SRC_URI="
+	https://www.process-one.net/downloads/KEYS
+		-> processone-31468D18DF9841242B90D7328ECA469419C09311.asc
+"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+
+S=${WORKDIR}
+
+src_install() {
+	local files=( ${A} )
+	insinto /usr/share/openpgp-keys
+	newins - process-one.net.asc < <(cat "${files[@]/#/${DISTDIR}/}" || die)
+}