gentoo auto-resync : 17:10:2023 - 10:00:35

11 files changed, 43 insertions, 53 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index e29107a922fb..ff23ce120e4e 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/felix-framework/Manifest b/dev-java/felix-framework/Manifest
index 26e36742c1d3..51fc41d960ef 100644
--- a/dev-java/felix-framework/Manifest
+++ b/dev-java/felix-framework/Manifest
@@ -1,3 +1,4 @@
-DIST felix-framework-7.0.5.tar.gz 505118 BLAKE2B 3652d46dfb4c9c5b43b159450b81ad896483fb2df40165d7e7b8bbd718c8e3297163065474bd10f3858ff7fc2646134ed470e34ede8eeb5efc05cec75f1a7aec SHA512 58fa96500fed827c348a47ac8672aeb4e5b94bfd681c4cde610b3a453fd2abfe2d631742281a192c76718ee83fc4c30980a5179926ff3bc7b8ea649ef07f34a3
-EBUILD felix-framework-7.0.5-r1.ebuild 3357 BLAKE2B 31b9508fb644e7a8dd75927dcfb8c70e6615d51f632ef8881c9bcd41ee936ab5ff7b051e9cee666f5c6e9422f2abd36d085305f2c69d0ce4a762b10d29913ffe SHA512 f0e94b8827f8e3bc6c9e4a82c1e763881b5d3cd03cec9a27529eb826645a76713d7a7c706e261220f9f945be4895dc38f2a0f3ea336a37b5c78e9d33c91731c4
+DIST org.apache.felix.framework-7.0.5-source-release.tar.gz 505118 BLAKE2B 3652d46dfb4c9c5b43b159450b81ad896483fb2df40165d7e7b8bbd718c8e3297163065474bd10f3858ff7fc2646134ed470e34ede8eeb5efc05cec75f1a7aec SHA512 58fa96500fed827c348a47ac8672aeb4e5b94bfd681c4cde610b3a453fd2abfe2d631742281a192c76718ee83fc4c30980a5179926ff3bc7b8ea649ef07f34a3
+DIST org.apache.felix.framework-7.0.5-source-release.tar.gz.asc 195 BLAKE2B 94d0afbb7f20119a3f75927e75dc10420caab1c6ce2c3cc5b2b8600a2fd6af4c9217df565cd922bd0017ec6ac54113cc2a894b60249978c87c61c7961d258dda SHA512 2b22f242b5d3ff6c38457908e801dc95abeca6c6427fe8eab4badae171692f9b8de6edf091dca78cc43c3a467a56aa85895cabdfa7eaa92faf6cb090e9fae8fa
+EBUILD felix-framework-7.0.5-r2.ebuild 3603 BLAKE2B b7695e50204af73d5f57ebf1e97b91fc5f48e7bf349cb5dbbfff76c9deee794abf305efd0aa4607fa3211ec631a5338633a6e67b9b44d18440a5264c49fbe6b0 SHA512 d9660af0ba00a9134c5303f54cb07e5f9fa765ef9f6b39447ea3bcd6d663d75ebc9af1f7cf3585243ac461de94e06137f3f35c3d3716b1b8a293db6e7c84fdd7
 MISC metadata.xml 455 BLAKE2B 69e2d92cd05dd44530363b6920e0673ac8f6d87cebf7ca931d4699378062348b83391fdfeaa4dc95d470a718d363fa7e6578f949b6f8f3510317f6d63bc7c514 SHA512 585dc4c8a3fb5c6c01940c887207346065ca9c7499abdb79ab6f6554a05fe6b27734e48101cb0dab61b8e0e32417bf28e722947864bd0ea3d48296198a3f3264
diff --git a/dev-java/felix-framework/felix-framework-7.0.5-r1.ebuild b/dev-java/felix-framework/felix-framework-7.0.5-r2.ebuild
index 8a8d9e25d1ed..ddb1eee0510a 100644
--- a/dev-java/felix-framework/felix-framework-7.0.5-r1.ebuild
+++ b/dev-java/felix-framework/felix-framework-7.0.5-r2.ebuild
@@ -7,11 +7,12 @@ JAVA_PKG_IUSE="doc source test"
 MAVEN_ID="org.apache.felix:org.apache.felix.framework:7.0.5"
 JAVA_TESTING_FRAMEWORKS="junit-4"
 
-inherit java-pkg-2 java-pkg-simple
+inherit java-pkg-2 java-pkg-simple verify-sig
 
 DESCRIPTION="Implementation of the OSGi R8 core framework specification"
 HOMEPAGE="https://felix.apache.org/documentation/subprojects/apache-felix-framework.html"
-SRC_URI="mirror://apache/felix/org.apache.${PN//-/.}-${PV}-source-release.tar.gz -> ${P}.tar.gz"
+SRC_URI="mirror://apache/felix/org.apache.${PN//-/.}-${PV}-source-release.tar.gz
+	verify-sig? ( https://downloads.apache.org/felix/org.apache.${PN//-/.}-${PV}-source-release.tar.gz.asc )"
 S="${WORKDIR}/org.apache.felix.framework-${PV}"
 
 LICENSE="Apache-2.0"
@@ -50,6 +51,9 @@ RDEPEND="
 	>=virtual/jre-1.8:*
 	${CP_DEPEND}"
 
+DEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-felix )"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/felix.apache.org.asc"
+
 JAVA_CLASSPATH_EXTRA="felix-resolver,osgi-annotation"
 JAVA_SRC_DIR="src/main/java"
 JAVA_RESOURCE_DIRS="src/main/resources"
diff --git a/dev-java/felix-main/Manifest b/dev-java/felix-main/Manifest
index 5083ff2fac9f..355b7bc49183 100644
--- a/dev-java/felix-main/Manifest
+++ b/dev-java/felix-main/Manifest
@@ -1,3 +1,4 @@
-DIST felix-main-7.0.5.tar.gz 255198 BLAKE2B 289e2305b15c28f985bee1d8687db6ecb5098a2086da6fd32a7db8572f83a1ac37e49deeb89d657d48b943a626d400caccd8185ced565e8c65aa558395aeef05 SHA512 e06f6c330a73100a739575e92a6f0af263a98643bbd6fd6661e799c2a11c8c9d9589f1f5b8802799ffcae7007e8362c629055fa8b25a50a4fa736ed2ba2955b0
-EBUILD felix-main-7.0.5-r1.ebuild 2252 BLAKE2B e4831a0bbe74081db3d5d1de98e235e229a446b5cd8bbbc29b1053c5d75c2cbad58df3af90e2bcf77b5dbb564e763a8838b27d69e1a1ebf0334dcc8b85b37770 SHA512 f816117f1ee1e8203a8c9e621d23afedb5c05d405f9d70d1352dfc5b9c6a020dc917ff5b1614ac56ee5d16effba0106d5f1d088d563df0477f0500ea7a98f217
+DIST org.apache.felix.main-7.0.5-source-release.tar.gz 255198 BLAKE2B 289e2305b15c28f985bee1d8687db6ecb5098a2086da6fd32a7db8572f83a1ac37e49deeb89d657d48b943a626d400caccd8185ced565e8c65aa558395aeef05 SHA512 e06f6c330a73100a739575e92a6f0af263a98643bbd6fd6661e799c2a11c8c9d9589f1f5b8802799ffcae7007e8362c629055fa8b25a50a4fa736ed2ba2955b0
+DIST org.apache.felix.main-7.0.5-source-release.tar.gz.asc 195 BLAKE2B 24ba68ada20056364a559fea71b1596b07e0adc669c4ddbed89e2aa14fa1937b3d21af793148c057cd2bd9817a6f2c87b5e6465ea537fe7bac69215f82d9945f SHA512 428ba861bbd51b58f8e00226ac33c186e7e91ca5469c24328b65adcfb2631b09a50847870eff483e6569a69e3e01a1c939315747f3b338462bb0e7a7d2757216
+EBUILD felix-main-7.0.5-r2.ebuild 2268 BLAKE2B 90b5f2db02fe63d7c53f2b0c1110b78f037d4adbc5c5cc36637e9b3d819bce5d6bb906665d0becfeaca785e949c2de36112c017974065037e6116f44a0f3cc3a SHA512 fbcbb2380eea494636bd2b0ba386e5a4a477384eb9c8ff87e9698f8f7bdc497a9eacc1c852b2bf0e2f2ba1ebfbe6ec1946f776cf141baea0d53eb4d172d6bbe8
 MISC metadata.xml 594 BLAKE2B 9ec3f78cd94f82740e506f44a6494d8e60894f09cd655b022886978c41bcf73a01628c9f1850a39a78bb96ed9dc57c04e7e1f6f5193b91bd8f23f1706899ef84 SHA512 1d8fab624036e9eda29d385fd042a0ca6b130dfa943c63c09e2a161ee039c695f215da1fe6135b59ece4a0fec06399dff2f80d0a12ab690805fd718d90cc05f2
diff --git a/dev-java/felix-main/felix-main-7.0.5-r1.ebuild b/dev-java/felix-main/felix-main-7.0.5-r2.ebuild
index 60e9162ace4a..83c9c09efb09 100644
--- a/dev-java/felix-main/felix-main-7.0.5-r1.ebuild
+++ b/dev-java/felix-main/felix-main-7.0.5-r2.ebuild
@@ -1,19 +1,18 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri mirror://apache/felix/org.apache.felix.main-7.0.5-source-release.tar.gz --slot 0 --keywords "~amd64" --ebuild felix-main-7.0.5.ebuild
-
 EAPI=8
 
 JAVA_PKG_IUSE="doc source"
 MAVEN_ID="org.apache.felix:org.apache.felix.main:7.0.5"
 
-inherit java-pkg-2 java-pkg-simple
+inherit java-pkg-2 java-pkg-simple verify-sig
 
 DESCRIPTION="Open source OSGi framework by Apache Software Foundation"
 HOMEPAGE="https://felix.apache.org/documentation/index.html"
-SRC_URI="mirror://apache/felix/org.apache.${PN//-/.}-${PV}-source-release.tar.gz -> ${P}.tar.gz"
+SRC_URI="mirror://apache/felix/org.apache.${PN//-/.}-${PV}-source-release.tar.gz
+	verify-sig? ( https://downloads.apache.org/felix/org.apache.${PN//-/.}-${PV}-source-release.tar.gz.asc )"
+S="${WORKDIR}/org.apache.felix.main-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
@@ -35,9 +34,10 @@ RDEPEND="
 	${CP_DEPEND}
 "
 
-DOCS=( DEPENDENCIES NOTICE )
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-felix )"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/felix.apache.org.asc"
 
-S="${WORKDIR}/org.apache.felix.main-${PV}"
+DOCS=( DEPENDENCIES NOTICE )
 
 JAVA_MAIN_CLASS="org.apache.felix.main.Main"
 JAVA_RESOURCE_DIRS="src/main/resources"
diff --git a/dev-java/felix-resolver/Manifest b/dev-java/felix-resolver/Manifest
index 7aad41cbbde4..ecc833b973fe 100644
--- a/dev-java/felix-resolver/Manifest
+++ b/dev-java/felix-resolver/Manifest
@@ -1,3 +1,4 @@
-DIST felix-resolver-2.0.4.tar.gz 164538 BLAKE2B 38d979557e484692bc6e47ce069bac5ca3c19f4b01b2d6222760708da571ca79166f4821c0b79c181a40c4228095dbe28f051e7d84d696cfddeef63f5a006ddd SHA512 bf4da4550b208dbe9e74cb4f66e9456fb0a3da66f6e60c08ebea88b68cc6f71200dcf324d22d85e6f5558e7f67335f8899e932de3b813a7fc7e9325eb8a31b61
-EBUILD felix-resolver-2.0.4.ebuild 2133 BLAKE2B f5f44d6b49aa4fd3bf4e3759449a8924d6561d8f5f0f3b632d8f9af96a52af1ef0cc5e8fc8fd3a4f2151f35c9a2b49f6f21be0f467e19b34692022a2a0677708 SHA512 fdccfc4abe67ce3149170770b53e14ea409564ea05a46fa9b72ececd285b48d3735e47158d7ef0921878f3399d2335f2f44c15cf05a4ae8f236cb532f0bfd5ff
+DIST org.apache.felix.resolver-2.0.4-source-release.tar.gz 164538 BLAKE2B 38d979557e484692bc6e47ce069bac5ca3c19f4b01b2d6222760708da571ca79166f4821c0b79c181a40c4228095dbe28f051e7d84d696cfddeef63f5a006ddd SHA512 bf4da4550b208dbe9e74cb4f66e9456fb0a3da66f6e60c08ebea88b68cc6f71200dcf324d22d85e6f5558e7f67335f8899e932de3b813a7fc7e9325eb8a31b61
+DIST org.apache.felix.resolver-2.0.4-source-release.tar.gz.asc 195 BLAKE2B feb81e5acb4a7dcc4f0b8d5e85e12739ab341f085925e3f6496a550571662b871e07c294d01f468a8cbb9e2314a2a6ec9ea1c313426dee606e70fa5bc7155be4 SHA512 dad0f1969176cbf3490a11221d37899f20e2f92e661ffa374fc4793f5064ffc8f8f9a6317b49911aafaeb96d582afe4c2660c29b3d907c092b89299b4e0720a8
+EBUILD felix-resolver-2.0.4-r1.ebuild 1714 BLAKE2B 206806b764503e0cfefb7776cc83757e501c27a38786ac434807d0754ffa76de0bb3dcf2f3a901c9111d04488b5a30befce1e08f13af615666f1338757d16671 SHA512 61bba8e2df1e351de5574eb04e77d8455bd70de8ddf852f9a62ee76d8559b5c60f2cfe0fba1cb22a68260d3ba5757103a7fa8ea022604123fcfdc2de90d8d48a
 MISC metadata.xml 369 BLAKE2B 9cd4712616cc7fbb8010c253c0f6edf4855e190f79eac831794cf53e966f2963945f5432ae3a9f12534cbb5611986247e00b7c2981c0604e7fa0c3fffa42ec4c SHA512 1b18db4dd45409a4296c24c198e5aeaad34fd8901c041f490a2c1ecaf4f692e3140c304fd76faa18644ad0f359b551443bba096445efb819503434e35636e791
diff --git a/dev-java/felix-resolver/felix-resolver-2.0.4.ebuild b/dev-java/felix-resolver/felix-resolver-2.0.4-r1.ebuild
index e70076614ec8..70b57c0f8a7e 100644
--- a/dev-java/felix-resolver/felix-resolver-2.0.4.ebuild
+++ b/dev-java/felix-resolver/felix-resolver-2.0.4-r1.ebuild
@@ -1,41 +1,28 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri mirror://apache/felix/org.apache.felix.resolver-2.0.4-source-release.tar.gz --slot 0 --keywords "~amd64" --ebuild felix-resolver-2.0.4.ebuild
-
 EAPI=8
 
 JAVA_PKG_IUSE="doc source test"
 MAVEN_ID="org.apache.felix:org.apache.felix.resolver:2.0.4"
 JAVA_TESTING_FRAMEWORKS="junit-4"
 
-inherit java-pkg-2 java-pkg-simple
+inherit java-pkg-2 java-pkg-simple verify-sig
 
 DESCRIPTION="Provide OSGi resolver service."
 HOMEPAGE="https://felix.apache.org/documentation/index.html"
-SRC_URI="mirror://apache/felix/org.apache.${PN//-/.}-${PV}-source-release.tar.gz -> ${P}.tar.gz"
+SRC_URI="mirror://apache/felix/org.apache.${PN//-/.}-${PV}-source-release.tar.gz
+	verify-sig? ( https://downloads.apache.org/felix/org.apache.${PN//-/.}-${PV}-source-release.tar.gz.asc )"
 
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
-# Common dependencies
-# POM: pom.xml
-# org.osgi:org.osgi.core:5.0.0 -> >=dev-java/osgi-core-api-5.0.0:0
-# org.osgi:osgi.annotation:6.0.1 -> >=dev-java/osgi-annotation-8.1.0:0
-
 CP_DEPEND="
 	dev-java/osgi-annotation:0
 	dev-java/osgi-core:0
 "
 
-# Compile dependencies
-# POM: pom.xml
-# test? junit:junit:4.11 -> >=dev-java/junit-4.13.2:4
-# test? org.apache.felix:org.apache.felix.utils:1.8.0 -> >=dev-java/felix-utils-1.11.8:0
-# test? org.mockito:mockito-all:1.10.19 -> !!!artifactId-not-found!!!
-
 DEPEND="
 	>=virtual/jdk-1.8:*
 	${CP_DEPEND}
@@ -49,6 +36,9 @@ RDEPEND="
 	>=virtual/jre-1.8:*
 	${CP_DEPEND}"
 
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-felix )"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/felix.apache.org.asc"
+
 DOCS=( DEPENDENCIES NOTICE doc/changelog.txt )
 
 S="${WORKDIR}/org.apache.felix.resolver-${PV}"
diff --git a/dev-java/felix-utils/Manifest b/dev-java/felix-utils/Manifest
index b0e00f3ea745..9af91bd1a886 100644
--- a/dev-java/felix-utils/Manifest
+++ b/dev-java/felix-utils/Manifest
@@ -1,4 +1,5 @@
 AUX felix-utils-1.11.8-Port-to-osgi-cmpn.patch 4717 BLAKE2B 012aa489c1f063bfa5d3f8e9504bc72176493d4bd345e1aa9027d73d560c6852589a448cd96927410220286a247e2d14f4ab0a08a2ed70f9dba34b86e6be7e0d SHA512 267b3bd025fe71992b3cc3872cabbd0d13407e1aec013c671754d3ed94bd104ffb52bb22255acb0bfc4be6428f16073e37d3e79fa4b7a45bca34f3e4a1d82637
-DIST felix-utils-1.11.8.tar.gz 90519 BLAKE2B 2fe6ce8101e8e4d9533a2decacc581d35babd3a26747598a196ade7cea787d6e379968208619dc9c4d89c8f670ccb98124223828c852347f859c4ae3a7f284c8 SHA512 cef0f05754857a5863869145b3c465a1fea0d41767637df904b0b041579af18e5b5e3c8e09dc89f0e2e3d252585e0765b6b6e34bf932df1ebdc62a7127ac8cfd
-EBUILD felix-utils-1.11.8.ebuild 1639 BLAKE2B 9e604e2bfa410b61d6aca9d838a433e979c3de885072634f2901592530d3c9d50036fd6cbfcfae98c9fea3ef3d0370e36ea4db91fcc5bf6def82da5f5046e403 SHA512 0328fac8abe67d4aec07f672db31e0bf71bd997833ddf059ef7395f562eb0baf7112639c22654e5415ad7c705abccabb74a26f7b5975304aab6d7b33bee8006c
+DIST org.apache.felix.utils-1.11.8-source-release.tar.gz 90519 BLAKE2B 2fe6ce8101e8e4d9533a2decacc581d35babd3a26747598a196ade7cea787d6e379968208619dc9c4d89c8f670ccb98124223828c852347f859c4ae3a7f284c8 SHA512 cef0f05754857a5863869145b3c465a1fea0d41767637df904b0b041579af18e5b5e3c8e09dc89f0e2e3d252585e0765b6b6e34bf932df1ebdc62a7127ac8cfd
+DIST org.apache.felix.utils-1.11.8-source-release.tar.gz.asc 833 BLAKE2B 231acada5011f33a62460d027e76630fecbe15acd5dedc76673a80b6cd4de1ec7ae13a890cd02231a6e94a5555a33154c9144e514058733827841e98ab509d18 SHA512 06755950ed4d2d943c08d76c0abcfc8846f478e8a18543f551913ec7d74d1a946dc7c9f34444b4191186e41e7bd70594db8462c1bc7c895011696c03ada06921
+EBUILD felix-utils-1.11.8-r1.ebuild 1354 BLAKE2B 06670b63331cfc93a5f3ff4dfef01ece30f9927bd20ee6df0c55da78d3cfa0141131ce840b73b3734fc5681cbf75048a97f1467ba061d84eec0427708bac5c16 SHA512 5616ddf3124015c07259b9a45a2100ddc9f4aed13f93b0965cf21613024a982bf94826b23dea9a9718c744a3f5776dcb29f66df4fa3c1fd64bcf4a331fb3f11b
 MISC metadata.xml 369 BLAKE2B 9cd4712616cc7fbb8010c253c0f6edf4855e190f79eac831794cf53e966f2963945f5432ae3a9f12534cbb5611986247e00b7c2981c0604e7fa0c3fffa42ec4c SHA512 1b18db4dd45409a4296c24c198e5aeaad34fd8901c041f490a2c1ecaf4f692e3140c304fd76faa18644ad0f359b551443bba096445efb819503434e35636e791
diff --git a/dev-java/felix-utils/felix-utils-1.11.8.ebuild b/dev-java/felix-utils/felix-utils-1.11.8-r1.ebuild
index 9c7ef0ca3fcd..470e9b8355a5 100644
--- a/dev-java/felix-utils/felix-utils-1.11.8.ebuild
+++ b/dev-java/felix-utils/felix-utils-1.11.8-r1.ebuild
@@ -1,33 +1,24 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri mirror://apache/felix/org.apache.felix.utils-1.11.8-source-release.tar.gz --slot 0 --keywords "~amd64" --ebuild felix-utils-1.11.8.ebuild
-
 EAPI=8
 
 JAVA_PKG_IUSE="doc source test"
 MAVEN_ID="org.apache.felix:org.apache.felix.utils:1.11.8"
 JAVA_TESTING_FRAMEWORKS="junit-4"
 
-inherit java-pkg-2 java-pkg-simple
+inherit java-pkg-2 java-pkg-simple verify-sig
 
 DESCRIPTION="Utility classes for OSGi"
 HOMEPAGE="https://felix.apache.org/documentation/index.html"
-SRC_URI="mirror://apache/felix/org.apache.felix.utils-${PV}-source-release.tar.gz -> ${P}.tar.gz"
+SRC_URI="mirror://apache/felix/org.apache.${PN//-/.}-${PV}-source-release.tar.gz
+	verify-sig? ( https://downloads.apache.org/felix/org.apache.${PN//-/.}-${PV}-source-release.tar.gz.asc )"
+S="${WORKDIR}/org.apache.felix.utils-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 ~arm arm64 ppc64 x86"
 
-# Compile dependencies
-# POM: pom.xml
-# org.osgi:osgi.cmpn:5.0.0 -> >=dev-java/osgi-cmpn-8.0.0:8
-# org.osgi:osgi.core:5.0.0 -> >=dev-java/osgi-core-8.0.0:0
-# POM: pom.xml
-# test? junit:junit:4.12 -> >=dev-java/junit-4.13.2:4
-# test? org.mockito:mockito-core:2.18.3 -> >=dev-java/mockito-4.7.0:4
-
 DEPEND="
 	>=virtual/jdk-1.8:*
 	dev-java/osgi-cmpn:8
@@ -39,14 +30,15 @@ DEPEND="
 
 RDEPEND=">=virtual/jre-1.8:*"
 
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-felix )"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/felix.apache.org.asc"
+
 PATCHES=(
 	"${FILESDIR}/felix-utils-1.11.8-Port-to-osgi-cmpn.patch"
 )
 
 DOCS=( DEPENDENCIES NOTICE doc/changelog.txt )
 
-S="${WORKDIR}/org.apache.felix.utils-${PV}"
-
 JAVA_CLASSPATH_EXTRA="osgi-cmpn-8,osgi-core"
 JAVA_SRC_DIR="src/main/java"
 
diff --git a/dev-java/xerces/Manifest b/dev-java/xerces/Manifest
index 26f463f0e743..b1bdd4c52b51 100644
--- a/dev-java/xerces/Manifest
+++ b/dev-java/xerces/Manifest
@@ -1,5 +1,5 @@
 DIST Xerces-J-src.2.12.2.tar.gz 1812583 BLAKE2B f1b5928abe2852acc4d554c47aa7cbd81a568e15c8a1fd5ea98dc526c52838b0a50920d2ed807e607b01c875676e54578f1493856b06de5a7ba8784591f7f06f SHA512 e71a692212a974ebfa39af5ffd023b433ece34425b12aceeffe89cebe04f28dd8fa46a131a56f30295dca36de115128a6d7e05172c82f5b85d914cd991f34056
 DIST Xerces-J-src.2.12.2.tar.gz.asc 849 BLAKE2B 58faca219413b5b13ded6bedb16acca5ffe53a6890c2ea6ec6f5b2b19b46b179bd74b225e608b936b0d6abad24b947930da24339256137a291e5bc863a11c416 SHA512 77cc480b9eff693ab7b5fe4c8a8963cbd53e895dd130bc0ef3fbaebce6d64e59c068806f10bbf650f51a4fb132a49d24c869c8a01e9922bf792bb479602b9846
-EBUILD xerces-2.12.2-r1.ebuild 2171 BLAKE2B 6a3077886897bbbf7e5213f90ebe6deffc9d6894a3764331bbcf2f6ce93fb3676cebc93f449dedb7991e90143475fdeb0acc851d4b05a8dc9691a603cae08b95 SHA512 b2197bafeca6ff6279856d5a2f48eb1b5b218b8573427bbccc4ddd752b2bc0090bbec3cf97ea26df408bf5e68dfbe13cd7fe93a78d8c5ee190da2d7d65e24c07
+EBUILD xerces-2.12.2-r1.ebuild 2168 BLAKE2B 54aba3c38e9dba1f5fd5879fb4d599c8ca9ae5db5e7c6eedc89beaf0fd5f571a66aa00256af845fbdce7f3fb31e049413acb009e4a1b63f7f3d25fb1123b6e38 SHA512 850d45347841c7c809ced90f85c8559a3593a1c54249f34d339425bf15a99467c24c3f8dd64be42eb328b8e0e0c6dadf4b577d29475612ad665a38f1ffe64e37
 EBUILD xerces-2.12.2.ebuild 1735 BLAKE2B 71ce08db857c0a816a40a10f11829c52964ff186db96783f05972997237e7b6a45cacf1aef0cb4ffe75ca4c8605f0a3ae26ee425fbd4e464acce08fc131fb866 SHA512 b889a86e6f5016aa2a27e57d964bccb2fd2cbd709806812484205387b68a636731200cf6ab876969bda340a132b5b3c5f7d0e87e697d13b26e649e9057e093d6
 MISC metadata.xml 1778 BLAKE2B 458bcbd9e8adfab1d2bd25a5fe9de0bee48292cb57e3591821fade58a987e59cb9811800273ac62b525738e7e955514b8b77c27fe97d9040bad0db203e6171a4 SHA512 ccbd7007ce2efe5b19d300ba939abe4e756d65eb1c910c74c5f3f13410de0d75e83bfd82d1e226e5dc1180982a1bfe231d30cb849f60142a177cc9aeb087c91f
diff --git a/dev-java/xerces/xerces-2.12.2-r1.ebuild b/dev-java/xerces/xerces-2.12.2-r1.ebuild
index d21f43579ee1..18cd0cf52411 100644
--- a/dev-java/xerces/xerces-2.12.2-r1.ebuild
+++ b/dev-java/xerces/xerces-2.12.2-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/xerces/j/source/Xerces-J-src.${PV}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 
 CP_DEPEND="
 	dev-java/xml-commons-external:1.4