7 files changed, 31 insertions, 44 deletions
diff --git a/sec-keys/Manifest.gz b/sec-keys/Manifest.gz
index ff9657f37f9a..935b22f745d5 100644
--- a/sec-keys/Manifest.gz
+++ b/sec-keys/Manifest.gz
diff --git a/sec-keys/openpgp-keys-apache-felix/Manifest b/sec-keys/openpgp-keys-apache-felix/Manifest
new file mode 100644
index 000000000000..80aab822c9ee
--- /dev/null
+++ b/sec-keys/openpgp-keys-apache-felix/Manifest
@@ -0,0 +1,3 @@
+DIST openpgp-keys-apache-felix-20200125-KEYS.asc 122140 BLAKE2B afc767cb8b1de2df2f02bb3cbc208dd1b700c5431039ea232d8661b0c5d0820085ee832f49b67f8068e3d7c5f02f2a8d131c30bf077116de983cb32a41395af3 SHA512 0dabde201c81cce4aad8c4d531f739f5e25a28d6d0091fb02306150f9e931e5c0e37b6370a0b4729d1181cfea436fb136c70e39e264b16e4be09c3a5e7a5d06a
+EBUILD openpgp-keys-apache-felix-20200125.ebuild 534 BLAKE2B cf301721d1436b250ddc1b9c3ba9fefbb3d41c1fd6f67cb6e0faf7601623efb8915324e8053176b805d55ff4a56b67106d7854b41caa4f12b95bf8a74db73882 SHA512 ca5aa47810ca03bd2ff90550fd62c482ba6f1028cea9d5e8aba8b28f23524618f005d9c5d396c1e7108ee94a7d5e7db7df4530bd079583ea81fb94c9fdf9f2a3
+MISC metadata.xml 243 BLAKE2B d1937cd00ce74d225075f1cf0e2584ce3f3d04b4ab3bd4ce636326ef8ed6ccaa54535a1c126025464e48a272959a579e08ceb008b8bacb2160f8f623fea5b6b3 SHA512 5431123c80f2e11811efde927819546af19c9ca93c9810399fe784c77ad2201696a081ed146df5b59fbf78ffb39cf8633cd6805e16ca82244aa8458c2ab8c4fd
diff --git a/sec-keys/openpgp-keys-apache-felix/metadata.xml b/sec-keys/openpgp-keys-apache-felix/metadata.xml
new file mode 100644
index 000000000000..6ef2d50cf07e
--- /dev/null
+++ b/sec-keys/openpgp-keys-apache-felix/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>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/sec-keys/openpgp-keys-apache-felix/openpgp-keys-apache-felix-20200125.ebuild b/sec-keys/openpgp-keys-apache-felix/openpgp-keys-apache-felix-20200125.ebuild
new file mode 100644
index 000000000000..1a5190db8649
--- /dev/null
+++ b/sec-keys/openpgp-keys-apache-felix/openpgp-keys-apache-felix-20200125.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="OpenPGP keys used by felix.apache.org"
+HOMEPAGE="https://felix.apache.org/documentation/downloads.html"
+SRC_URI="https://downloads.apache.org/felix/KEYS -> ${P}-KEYS.asc"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+
+S="${WORKDIR}"
+
+src_install() {
+	local files=( ${A} )
+	insinto /usr/share/openpgp-keys
+	newins - felix.apache.org.asc < <(cat "${files[@]/#/${DISTDIR}/}" || die)
+}
diff --git a/sec-keys/openpgp-keys-apache-tomcat/Manifest b/sec-keys/openpgp-keys-apache-tomcat/Manifest
index e6be80817a10..89f9a56014d0 100644
--- a/sec-keys/openpgp-keys-apache-tomcat/Manifest
+++ b/sec-keys/openpgp-keys-apache-tomcat/Manifest
@@ -1,11 +1,7 @@
-DIST openpgp-keys-apache-tomcat-10.1.14-KEYS.asc 35947 BLAKE2B 034e64f5db48a3b6536e330d539c8254b6eaf13ea9b4cf0b7c29ac14b7a49d221e93cd6971606c10520194452f3a34ed71ee919bc0f6b0f3a143776106ae8d0f SHA512 46f193aaead52c1807ac719977e5583daa0fd2a96db4f0041b72f1150deaa456d3c72a2856218ffba31ec9ffd0804a2b97f7646f0d67aa1404819ebe79555c3d
 DIST openpgp-keys-apache-tomcat-10.1.15-KEYS.asc 35947 BLAKE2B 034e64f5db48a3b6536e330d539c8254b6eaf13ea9b4cf0b7c29ac14b7a49d221e93cd6971606c10520194452f3a34ed71ee919bc0f6b0f3a143776106ae8d0f SHA512 46f193aaead52c1807ac719977e5583daa0fd2a96db4f0041b72f1150deaa456d3c72a2856218ffba31ec9ffd0804a2b97f7646f0d67aa1404819ebe79555c3d
-DIST openpgp-keys-apache-tomcat-8.5.94-KEYS.asc 45686 BLAKE2B 77604cd61e33efa2df702a992bc27cdb2060da1714c00bc75ee0438e1374d7b63a9a02c7aaa917fa982c0c8112bf29974b03a46e78146c9d51c360bc6343b898 SHA512 44f3063f5ada8d7e4be644b6d9cafc79b9c4e03d58f6843da20782ea945832d3d70ed02e4ad26594f97b30d2b77bf2339fbe11e671a0772ca3bfbef7db533210
 DIST openpgp-keys-apache-tomcat-8.5.95-KEYS.asc 45686 BLAKE2B 77604cd61e33efa2df702a992bc27cdb2060da1714c00bc75ee0438e1374d7b63a9a02c7aaa917fa982c0c8112bf29974b03a46e78146c9d51c360bc6343b898 SHA512 44f3063f5ada8d7e4be644b6d9cafc79b9c4e03d58f6843da20782ea945832d3d70ed02e4ad26594f97b30d2b77bf2339fbe11e671a0772ca3bfbef7db533210
 DIST openpgp-keys-apache-tomcat-9.0.82-KEYS.asc 14008 BLAKE2B 62f0f6bf0d89a3930df668c039c69c4b2648128079a4d420f4f0c8a1b4c228ca5c631f3d2f66745a7c4d8c85e98609dc4119bc224306d972f65ab432385a1231 SHA512 51ad85d42824d22ace66ce2eeee62df598d55efe11caad7f6e5c9d09377a80431013711a0243fb0dc1f7a4bf3aa24ed77024a311aa77277743b784e3ef6a946e
-EBUILD openpgp-keys-apache-tomcat-10.1.14.ebuild 562 BLAKE2B dac6c0e71f598ddfd7daf93ecc2488430a2923e37a97cb2791fc4e640fc03e3ed842eb1ce67983f568836de9f33fd7220e9038edd89b46cb97dbd42b3e71b8c9 SHA512 d170cc16cbd38ec290c3859a546c41d082078d7c68391bfe4bdf1466485acb39472df98dc9400522d4f4c0c4ecf65d147f43911272cfaaf3ae9f346b3b84db57
 EBUILD openpgp-keys-apache-tomcat-10.1.15.ebuild 562 BLAKE2B dac6c0e71f598ddfd7daf93ecc2488430a2923e37a97cb2791fc4e640fc03e3ed842eb1ce67983f568836de9f33fd7220e9038edd89b46cb97dbd42b3e71b8c9 SHA512 d170cc16cbd38ec290c3859a546c41d082078d7c68391bfe4bdf1466485acb39472df98dc9400522d4f4c0c4ecf65d147f43911272cfaaf3ae9f346b3b84db57
-EBUILD openpgp-keys-apache-tomcat-8.5.94.ebuild 562 BLAKE2B 1fc6086cfa3bea924ab3684009e458d3f6eb177e01758a103ea6d1b907d085ac21844395996fef395d15da44c5c5936c3f85485c2fb73d7823b892ccf19e9634 SHA512 b4124756d967edea63bad9bde86c85feb1a10f37b5cff7d7c4290968bd2b77bfc608901b5b69b8365af1a18a274e2e3f05596709838f2fe063e6a39c08020215
 EBUILD openpgp-keys-apache-tomcat-8.5.95.ebuild 562 BLAKE2B 1fc6086cfa3bea924ab3684009e458d3f6eb177e01758a103ea6d1b907d085ac21844395996fef395d15da44c5c5936c3f85485c2fb73d7823b892ccf19e9634 SHA512 b4124756d967edea63bad9bde86c85feb1a10f37b5cff7d7c4290968bd2b77bfc608901b5b69b8365af1a18a274e2e3f05596709838f2fe063e6a39c08020215
 EBUILD openpgp-keys-apache-tomcat-9.0.82.ebuild 562 BLAKE2B dac6c0e71f598ddfd7daf93ecc2488430a2923e37a97cb2791fc4e640fc03e3ed842eb1ce67983f568836de9f33fd7220e9038edd89b46cb97dbd42b3e71b8c9 SHA512 d170cc16cbd38ec290c3859a546c41d082078d7c68391bfe4bdf1466485acb39472df98dc9400522d4f4c0c4ecf65d147f43911272cfaaf3ae9f346b3b84db57
 MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-10.1.14.ebuild b/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-10.1.14.ebuild
deleted file mode 100644
index 81b3505e76ec..000000000000
--- a/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-10.1.14.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="OpenPGP keys used by tomcat.apache.org"
-HOMEPAGE="https://tomcat.apache.org/download-90.cgi"
-SRC_URI="https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/KEYS -> ${P}-KEYS.asc"
-
-LICENSE="public-domain"
-SLOT="${PV}"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-S="${WORKDIR}"
-
-src_install() {
-	local files=( ${A} )
-	insinto /usr/share/openpgp-keys
-	newins - tomcat-${PV}.apache.org.asc < <(cat "${files[@]/#/${DISTDIR}/}" || die)
-}
diff --git a/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-8.5.94.ebuild b/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-8.5.94.ebuild
deleted file mode 100644
index f17ae55806f2..000000000000
--- a/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-8.5.94.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="OpenPGP keys used by tomcat.apache.org"
-HOMEPAGE="https://tomcat.apache.org/download-80.cgi"
-SRC_URI="https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/KEYS -> ${P}-KEYS.asc"
-
-LICENSE="public-domain"
-SLOT="${PV}"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-S="${WORKDIR}"
-
-src_install() {
-	local files=( ${A} )
-	insinto /usr/share/openpgp-keys
-	newins - tomcat-${PV}.apache.org.asc < <(cat "${files[@]/#/${DISTDIR}/}" || die)
-}