gentoo auto-resync : 05:11:2024 - 03:03:37

16 files changed, 250 insertions, 112 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index f358e3bab550..d685a65c9003 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/bcmail/Manifest b/dev-java/bcmail/Manifest
index 231d0b13a705..4e8607e09d0e 100644
--- a/dev-java/bcmail/Manifest
+++ b/dev-java/bcmail/Manifest
@@ -1,5 +1,5 @@
-DIST bc-java-r1rv77.tar.gz 31402744 BLAKE2B 1ca1e1dac1ed3d613ae66f08cd8a954e63d43a49ed402f5bd7c30cf1f0830ad29104aa91a9a0a3cbbb5ea750392bc285172a1ab38f2aba1600fa3ca4c469b4f5 SHA512 d75a0ce94bd006499eef9393491347ae70544643c93c2f7591df3ff0179bd477a5066891c7c3bdeb09bd693093c9dc7d29c48462a1d539e464cbf2ee9c1dfce4
 DIST bc-java-r1rv78v1.tar.gz 47211344 BLAKE2B 6d28e69db8ad0043a5cd6c0a4f6901ff40884be4baf60ee40d4cb5487d799e6ac5ef4282b5d6e7f873e45607394890dd26e3150c9c1729bd5346d9cc8f30f240 SHA512 87e6ecd6fea47877d9d7a196f58c5b45a7f026f18f17b71d4155061fad024194c30ce0fc44ea3e879b17f310a6626407f345a8e8970781afec4551f2aa688223
-EBUILD bcmail-1.77-r1.ebuild 1453 BLAKE2B 35690df556a57423caa93001e7a4b2a7c17f9beb43f6bf2e852a4048006d58ea96892ce1c915a290b48a0e59f510bd93a8890e7abc979e8074775cf585cd0ce3 SHA512 9c87653d5a8e1503908c847ed0b630fa6fad0e645523d4930a58df3301950d879f62df900d81fb1e56c1bc0d26077915ebc5da28f7f93423d5aab7dc614eccca
+DIST bc-java-r1rv79.tar.gz 47563177 BLAKE2B 7ca8b64ab004fb70399e950e8c588b19d110596790525ce30aeec3f2c6501bffd1bab6854c6bf1499f101e33e0ac8127c2cdaa34e5531c430e4f00fb145202f3 SHA512 294241371f536e8a9be8ff2307eaad433620c9becb26a00f6b225ea31488bc40dd8b01d20c18e47c105c7a8f1b2415136608d82811581fad4718db02e9c882a3
 EBUILD bcmail-1.78.1.ebuild 1472 BLAKE2B 5929815e17fdecee0c7a2d9f93868b62ac52c0c31151ec29ee58193c02adfe2c8e812ace94404268075fc980b5f2e9fbdcc7d49e373cf82b18f45a171124dbd8 SHA512 b499e8f67ae82bfa76c8f2d7cae96b4939b85be127e0d10b30af9bccdfb7b1de2ca55ad1195898cf3a05df9476ec18f57e4feaa0ca1ace52b82b42d6784af2d4
+EBUILD bcmail-1.79.ebuild 1475 BLAKE2B d6f4523b9442b4cec64d7571f3e366f42c3a3af2ab38f564ccc5377169b2e749c59d6faa5141a97ed296e1aaa076748836f30c2123e7fff8cb1d1730f7698876 SHA512 a1c23e627badb93e582bf12550b43d05353429d4646accea841e6f8fc220654d9fa563f32a4395179e1cd9cf4ef6f28e4410014780a84afd67e6e85314deb499
 MISC metadata.xml 671 BLAKE2B 9bc7968fa569c698c7ac0f7af9a5301f55075db2ff416e55654ddca268b9ae1e63f4270d3fa7a99b06737b998c223db592f5fb570cee172a17cd3f7034b7d431 SHA512 b555d8d679fd4685aef9660023a12036d6459d8e88dfa4e5d7f84f47939574c2ded1bbf487c876435370382e2c06502d61189e79e61be49fa65aef9bb39f8ab9
diff --git a/dev-java/bcmail/bcmail-1.77-r1.ebuild b/dev-java/bcmail/bcmail-1.79.ebuild
index f45590868d1c..24f9e19773c5 100644
--- a/dev-java/bcmail/bcmail-1.77-r1.ebuild
+++ b/dev-java/bcmail/bcmail-1.79.ebuild
@@ -11,25 +11,31 @@ inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="The Bouncy Castle Java S/MIME APIs for handling S/MIME protocols"
 HOMEPAGE="https://www.bouncycastle.org/java.html"
-MY_PV="r${PV/./rv}"
+MY_PV="r$(ver_rs 1 'rv' 2 'v')"
 SRC_URI="https://github.com/bcgit/bc-java/archive/${MY_PV}.tar.gz -> bc-java-${MY_PV}.tar.gz"
 S="${WORKDIR}/bc-java-${MY_PV}/mail"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm64 ppc64"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
 
 CP_DEPEND="
 	~dev-java/bcpkix-${PV}:0
 	~dev-java/bcprov-${PV}:0
 	~dev-java/bcutil-${PV}:0
 	dev-java/javax-mail:0
-	"
-DEPEND="${CP_DEPEND}
+"
+
+DEPEND="
+	${CP_DEPEND}
 	dev-java/jakarta-activation:1
-	>=virtual/jdk-11:*"
-RDEPEND="${CP_DEPEND}
-	>=virtual/jre-1.8:*"
+	>=virtual/jdk-11:*
+"
+
+RDEPEND="
+	${CP_DEPEND}
+	>=virtual/jre-1.8:*
+"
 
 DOCS=( ../{README,SECURITY}.md )
 HTML_DOCS=( ../{CONTRIBUTORS,index}.html )
diff --git a/dev-java/bcpg/Manifest b/dev-java/bcpg/Manifest
index 1e5942fcc21b..e526b68d5eff 100644
--- a/dev-java/bcpg/Manifest
+++ b/dev-java/bcpg/Manifest
@@ -1,5 +1,5 @@
-DIST bc-java-r1rv77.tar.gz 31402744 BLAKE2B 1ca1e1dac1ed3d613ae66f08cd8a954e63d43a49ed402f5bd7c30cf1f0830ad29104aa91a9a0a3cbbb5ea750392bc285172a1ab38f2aba1600fa3ca4c469b4f5 SHA512 d75a0ce94bd006499eef9393491347ae70544643c93c2f7591df3ff0179bd477a5066891c7c3bdeb09bd693093c9dc7d29c48462a1d539e464cbf2ee9c1dfce4
 DIST bc-java-r1rv78v1.tar.gz 47211344 BLAKE2B 6d28e69db8ad0043a5cd6c0a4f6901ff40884be4baf60ee40d4cb5487d799e6ac5ef4282b5d6e7f873e45607394890dd26e3150c9c1729bd5346d9cc8f30f240 SHA512 87e6ecd6fea47877d9d7a196f58c5b45a7f026f18f17b71d4155061fad024194c30ce0fc44ea3e879b17f310a6626407f345a8e8970781afec4551f2aa688223
-EBUILD bcpg-1.77.ebuild 1364 BLAKE2B d70af01a1ac7ffefaba602e421fae845eec83cf605a0521db4b6bb74c1d1443960d4d2c09078038315fafb0c778b230895593c243b4aa2efd6c4348b30e0b43f SHA512 3072643dbce7faa05982e6164f801125feba18398e14ecdde01b4bc38145ff156ec3f00c50316ba0191ee82535c9399e06e761e9a51a6f56fa84d42a850d9fa6
+DIST bc-java-r1rv79.tar.gz 47563177 BLAKE2B 7ca8b64ab004fb70399e950e8c588b19d110596790525ce30aeec3f2c6501bffd1bab6854c6bf1499f101e33e0ac8127c2cdaa34e5531c430e4f00fb145202f3 SHA512 294241371f536e8a9be8ff2307eaad433620c9becb26a00f6b225ea31488bc40dd8b01d20c18e47c105c7a8f1b2415136608d82811581fad4718db02e9c882a3
 EBUILD bcpg-1.78.1.ebuild 1413 BLAKE2B 53ec7571a7d5261880dc41cd7f506572f7a01fe4a05d9fa336bf9b31de1e4eff3adbbad3e74eb684db05ca6ec8ae080d50012a1779d705b5029fda3f3b8588db SHA512 1853c4592f581d79883d4113c7064443d9daf668d6b4697544859a0cd8509f1481dd189188818db1ae18c3675dc6b6d5d601607df93b11eb38721b021f463ebf
+EBUILD bcpg-1.79.ebuild 1416 BLAKE2B 08ee14bd7932bb2f1aa02c1788cd53ff693adcca341dd174a96383f745de4e16b3d168afbc6739ea33248b2890180570150771027e98f9faf30c53531971e445 SHA512 7f0aaefaffa113396b495996c2d4745454b8061788ea31eb7398014b4fabf469591a450b54e4004ca34dba5a294ec98125c6681afc4e82fc28c81faf5c1941da
 MISC metadata.xml 599 BLAKE2B 08d5304a26fb1a93dde104bbde8a26dd8850f9ed914f241baebc20c98a944c8d055f36071d114a07676c89fa87be261a4cfbf3fdc23d45d0e313a2e68f5723ac SHA512 f36347e51f6574d1feac4af8e18bdebfb536820305c3d136db51047c5799d767a84cf6885ac0982a6c4d61ce4aab76ccf00ca975f92f4150127b8fd57c781282
diff --git a/dev-java/bcpg/bcpg-1.77.ebuild b/dev-java/bcpg/bcpg-1.79.ebuild
index 37b677eed2f3..757092168ce3 100644
--- a/dev-java/bcpg/bcpg-1.77.ebuild
+++ b/dev-java/bcpg/bcpg-1.79.ebuild
@@ -11,19 +11,28 @@ inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Java cryptography APIs"
 HOMEPAGE="https://www.bouncycastle.org/java.html"
-MY_PV="r${PV/./rv}"
+MY_PV="r$(ver_rs 1 'rv' 2 'v')"
 SRC_URI="https://github.com/bcgit/bc-java/archive/${MY_PV}.tar.gz -> bc-java-${MY_PV}.tar.gz"
 S="${WORKDIR}/bc-java-${MY_PV}/pg"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm64 ppc64"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
 
-CP_DEPEND="~dev-java/bcprov-${PV}:0"
-DEPEND="${CP_DEPEND}
-	>=virtual/jdk-11:*"
-RDEPEND="${CP_DEPEND}
-	>=virtual/jre-1.8:*"
+CP_DEPEND="
+	~dev-java/bcprov-${PV}:0
+	~dev-java/bcutil-${PV}:0
+"
+
+DEPEND="
+	${CP_DEPEND}
+	>=virtual/jdk-11:*
+"
+
+RDEPEND="
+	${CP_DEPEND}
+	>=virtual/jre-1.8:*
+"
 
 DOCS=( ../{README,SECURITY}.md )
 HTML_DOCS=( ../{CONTRIBUTORS,index}.html )
diff --git a/dev-java/bcpkix/Manifest b/dev-java/bcpkix/Manifest
index b14b36feedd9..3d656892e917 100644
--- a/dev-java/bcpkix/Manifest
+++ b/dev-java/bcpkix/Manifest
@@ -1,7 +1,7 @@
-DIST bc-java-r1rv77.tar.gz 31402744 BLAKE2B 1ca1e1dac1ed3d613ae66f08cd8a954e63d43a49ed402f5bd7c30cf1f0830ad29104aa91a9a0a3cbbb5ea750392bc285172a1ab38f2aba1600fa3ca4c469b4f5 SHA512 d75a0ce94bd006499eef9393491347ae70544643c93c2f7591df3ff0179bd477a5066891c7c3bdeb09bd693093c9dc7d29c48462a1d539e464cbf2ee9c1dfce4
 DIST bc-java-r1rv78v1.tar.gz 47211344 BLAKE2B 6d28e69db8ad0043a5cd6c0a4f6901ff40884be4baf60ee40d4cb5487d799e6ac5ef4282b5d6e7f873e45607394890dd26e3150c9c1729bd5346d9cc8f30f240 SHA512 87e6ecd6fea47877d9d7a196f58c5b45a7f026f18f17b71d4155061fad024194c30ce0fc44ea3e879b17f310a6626407f345a8e8970781afec4551f2aa688223
-DIST bc-test-data-r1rv77.tar.gz 2074825965 BLAKE2B b797821719ba0dcdd091e0fd4f14c79058a15702973978a055bcc998ff541a8c5e96feb757647a9696e4bbfa28bf80a317066a51fd4daac7b2508111d0d217b1 SHA512 c8701a270ddcfde353b480caa62e2237776b50b0937ac015ee3e5221a74d0817de9bc67f1fa9f53f5e48d861dbf94339cb45a08cb4dad37f1340f754cb1d910e
+DIST bc-java-r1rv79.tar.gz 47563177 BLAKE2B 7ca8b64ab004fb70399e950e8c588b19d110596790525ce30aeec3f2c6501bffd1bab6854c6bf1499f101e33e0ac8127c2cdaa34e5531c430e4f00fb145202f3 SHA512 294241371f536e8a9be8ff2307eaad433620c9becb26a00f6b225ea31488bc40dd8b01d20c18e47c105c7a8f1b2415136608d82811581fad4718db02e9c882a3
 DIST bc-test-data-r1rv78v1.tar.gz 2084599485 BLAKE2B a4f67d4ab35321aba52696345cf1ac605866fede41d3b99aa42194f37b587fe7bdebd3ac264379b37416bf5f5c456cd78126126799257c28183e4b71a98b4225 SHA512 cc35260189f2100eb883c30f7a15b7c10f564e7e44e02c61373e7f56a03ab9971350c6798bcbb7a4c4508f5022a0a986fdcd8862449b937765dbf567e2f370ed
-EBUILD bcpkix-1.77.ebuild 2492 BLAKE2B f56a6e2dd57ed6ce99c6ec7e038ca0553931ad1dc553bc4aa92d6ca7624085ea649c67912f52345dd35450957d4f034af862fb34c4f95cbee55cf151d7c5958d SHA512 c398bc7ffbd902ddb505545f98953c54129f39212820d0cc3dce2aef92948dad2d16fe02b3c2fbc49c0ccf88d3271295ea491c786837edc0fbedef807ef2c5ea
+DIST bc-test-data-r1rv79.tar.gz 2101723062 BLAKE2B 1fa25babfbcaa855dfcf2ae8727f6a7a5221837127cc295a4c15dce515908418c9e052af101d6fc984c4b5ce204286b7361da29dbefad1b95603d6b1571603a0 SHA512 e14c1bf96a6010447cd13a680a87249a4e6d0661cc46b437e8b2e1098f3e80482dc9038446aad495ba72e1254e9c07e49b1ac848177b02ac36e10710fcd06413
 EBUILD bcpkix-1.78.1.ebuild 2511 BLAKE2B abec94df702ec9b007dcd674c2f7cf2d05ed457c079a96142d8bc3816025c4e57ceb8fdabea67c9a224beddb44cacfb328fc2763421944fcf25fd2e6a1071c36 SHA512 9dde9eb8179fb9c7d4fd521b08d939cbd9a5798980876c6e18db050f682c4d19ab5d20742da2e126e781bc8295a062b88aa94bea5a8fa67bfb38676356a550fe
+EBUILD bcpkix-1.79.ebuild 2523 BLAKE2B 739e86f1a33e50a9e22f0336fc3180432c9d2756346ac0e7d4b1cf57303f3736efee5fb91c2ba97d30c07001fa07376ebd5227c4f1d104ee04bfd45151f8738a SHA512 71c9ed0d5db2923d91e8ff693ebbd2d38cb2fd83f67a3fabb6b74aba180237a48f6d6f5244e20ec31bf6b4a2b0118aeb4d4e2b41532c768b3b63bd057235dc0f
 MISC metadata.xml 624 BLAKE2B cda1cc55ddf61bb2da753103b4cf95c8a7ab69d0f452195ff07439c7d0929c4ccbcd5fa55ca4dd5f66d3ddb6b1a9c3967fd0fa5fb9f494044f774435b98d49dc SHA512 714978225f45f67740cca5bcacac5b7089ae12bd074ef3d1392f9c48fc680e2db344f3ca70b9f1b83d16d9c85ea72f9869e4cf0e750889fc0164fa5c504d804b
diff --git a/dev-java/bcpkix/bcpkix-1.77.ebuild b/dev-java/bcpkix/bcpkix-1.79.ebuild
index 9330aa3ed7f6..3521eb702031 100644
--- a/dev-java/bcpkix/bcpkix-1.77.ebuild
+++ b/dev-java/bcpkix/bcpkix-1.79.ebuild
@@ -11,14 +11,14 @@ inherit java-pkg-2 java-pkg-simple check-reqs
 
 DESCRIPTION="Java APIs for CMS, PKCS, EAC, TSP, CMP, CRMF, OCSP, and certificate generation"
 HOMEPAGE="https://www.bouncycastle.org/java.html"
-MY_PV="r${PV/./rv}"
+MY_PV="r$(ver_rs 1 'rv' 2 'v')"
 SRC_URI="https://github.com/bcgit/bc-java/archive/${MY_PV}.tar.gz -> bc-java-${MY_PV}.tar.gz
 	test? ( https://github.com/bcgit/bc-test-data/archive/${MY_PV}.tar.gz -> bc-test-data-${MY_PV}.tar.gz )"
 S="${WORKDIR}/bc-java-${MY_PV}/pkix"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm64 ppc64"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
 
 # 1) testSANMismatchIP(org.bouncycastle.est.test.TestHostNameAuthorizer)
 # org.bouncycastle.est.ESTException: localhost.me: Temporary failure in name resolution HTTP Status Code: 0
@@ -28,11 +28,17 @@ RESTRICT="test"
 CDEPEND="
 	~dev-java/bcprov-${PV}:0
 	~dev-java/bcutil-${PV}:0
-	"
-DEPEND="${CDEPEND}
-	>=virtual/jdk-11:*"
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.8:*"
+"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-11:*
+"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.8:*
+"
 
 DOCS=( ../{README,SECURITY}.md )
 HTML_DOCS=( ../{CONTRIBUTORS,index}.html )
@@ -46,7 +52,7 @@ JAVA_SRC_DIR=(
 
 JAVA_TEST_EXTRA_ARGS="-Dbc.test.data.home=${S}/../core/src/test/data"
 JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+JAVA_TEST_RESOURCE_DIRS=( src/{main,test}/resources )
 JAVA_TEST_SRC_DIR="src/test/java"
 
 # https://bugs.gentoo.org/823347
diff --git a/dev-java/bcprov/Manifest b/dev-java/bcprov/Manifest
index d6404eaf527a..2218bc7e2084 100644
--- a/dev-java/bcprov/Manifest
+++ b/dev-java/bcprov/Manifest
@@ -1,7 +1,8 @@
-DIST bc-java-r1rv77.tar.gz 31402744 BLAKE2B 1ca1e1dac1ed3d613ae66f08cd8a954e63d43a49ed402f5bd7c30cf1f0830ad29104aa91a9a0a3cbbb5ea750392bc285172a1ab38f2aba1600fa3ca4c469b4f5 SHA512 d75a0ce94bd006499eef9393491347ae70544643c93c2f7591df3ff0179bd477a5066891c7c3bdeb09bd693093c9dc7d29c48462a1d539e464cbf2ee9c1dfce4
+AUX bcprov-1.79-PKCS12StoreTest.patch 1066 BLAKE2B 7eb5d1ef9a1852260e7653c64aa7c14df62a6bdb0d72c2954cb365d7f52f8734596f06041969f905780e4227983b44a120aeecd8a4c9d31e068796a80f68bb41 SHA512 7d5d7bd8512ecc564214c3325fc56ac26a05f442d6f8ac19ded52145976bf3f7cba82cf1bce27cd50e7eba4aa4c4537c257805aa4a8aed0192bec9cee2931a88
 DIST bc-java-r1rv78v1.tar.gz 47211344 BLAKE2B 6d28e69db8ad0043a5cd6c0a4f6901ff40884be4baf60ee40d4cb5487d799e6ac5ef4282b5d6e7f873e45607394890dd26e3150c9c1729bd5346d9cc8f30f240 SHA512 87e6ecd6fea47877d9d7a196f58c5b45a7f026f18f17b71d4155061fad024194c30ce0fc44ea3e879b17f310a6626407f345a8e8970781afec4551f2aa688223
-DIST bc-test-data-r1rv77.tar.gz 2074825965 BLAKE2B b797821719ba0dcdd091e0fd4f14c79058a15702973978a055bcc998ff541a8c5e96feb757647a9696e4bbfa28bf80a317066a51fd4daac7b2508111d0d217b1 SHA512 c8701a270ddcfde353b480caa62e2237776b50b0937ac015ee3e5221a74d0817de9bc67f1fa9f53f5e48d861dbf94339cb45a08cb4dad37f1340f754cb1d910e
+DIST bc-java-r1rv79.tar.gz 47563177 BLAKE2B 7ca8b64ab004fb70399e950e8c588b19d110596790525ce30aeec3f2c6501bffd1bab6854c6bf1499f101e33e0ac8127c2cdaa34e5531c430e4f00fb145202f3 SHA512 294241371f536e8a9be8ff2307eaad433620c9becb26a00f6b225ea31488bc40dd8b01d20c18e47c105c7a8f1b2415136608d82811581fad4718db02e9c882a3
 DIST bc-test-data-r1rv78v1.tar.gz 2084599485 BLAKE2B a4f67d4ab35321aba52696345cf1ac605866fede41d3b99aa42194f37b587fe7bdebd3ac264379b37416bf5f5c456cd78126126799257c28183e4b71a98b4225 SHA512 cc35260189f2100eb883c30f7a15b7c10f564e7e44e02c61373e7f56a03ab9971350c6798bcbb7a4c4508f5022a0a986fdcd8862449b937765dbf567e2f370ed
-EBUILD bcprov-1.77.ebuild 2616 BLAKE2B 69bafad791b11a2dc02322e8893727cffd391e390e317cb99991a4f8af174aae0db01d854368e3e4e183d50cf0f5eba4d95ce866321cabbbebfc7b013d300665 SHA512 8850b476a7c818491303df4bbc6f136d8cf49e577550260a1fc68c09197461215c662fd6cdeb309d9c57409e94d5fd117068011da120e47193c32c4b92fd8df3
+DIST bc-test-data-r1rv79.tar.gz 2101723062 BLAKE2B 1fa25babfbcaa855dfcf2ae8727f6a7a5221837127cc295a4c15dce515908418c9e052af101d6fc984c4b5ce204286b7361da29dbefad1b95603d6b1571603a0 SHA512 e14c1bf96a6010447cd13a680a87249a4e6d0661cc46b437e8b2e1098f3e80482dc9038446aad495ba72e1254e9c07e49b1ac848177b02ac36e10710fcd06413
 EBUILD bcprov-1.78.1.ebuild 2693 BLAKE2B 30d2040947d5a496618052f979db667f47350f3ffa581ad257ef902de305c54a006aed2c1aa81a2a089bf9dfadfb20d8685e3a66d1246a68b3efe19a38c7ab41 SHA512 7e7fdfe72b80204973702c4d0ce05e62bd6cda8f4e1a43f5feaa47dbf8638d6227a92901864545311eab3dfeefb05bc4e5eb8e546ef3d78b47dcdd118af910a5
+EBUILD bcprov-1.79.ebuild 2774 BLAKE2B 7766a679318f82134068f981301396780f0c1af8b25ea33f97070afeb9b5a68df790794d45c28c7fa2de8e48cf6adb275c2fb16e9be30fbf3006a3ed2ca7db27 SHA512 7b22df59e8a16cb979dd886883a8e342b03d0427d1e98d1ad35f51a7db4912cc12972fc24d3a69774bbeda84ee889c0b2d0d20ff61e5abebc878b60a330ac76c
 MISC metadata.xml 554 BLAKE2B 585fb4da68796af220ac254cdd97d2ac988824c58b1eadde6cf59a50ca197fe8729418c948dd550e544eeb50702d0c96b8ff6f580368dc21a28a66f5d898bf4c SHA512 f78848b4c65b3d1373931bb00971c60688ea86b5bb7555f4a9889c4d560bfb505bffa3671dceb7dfb66f40ea21723d88e7c36191c91a203abf47c500fc0866df
diff --git a/dev-java/bcprov/bcprov-1.77.ebuild b/dev-java/bcprov/bcprov-1.79.ebuild
index 8e3dc1486d63..f203619a0823 100644
--- a/dev-java/bcprov/bcprov-1.77.ebuild
+++ b/dev-java/bcprov/bcprov-1.79.ebuild
@@ -11,22 +11,23 @@ inherit java-pkg-2 java-pkg-simple check-reqs
 
 DESCRIPTION="Java cryptography APIs"
 HOMEPAGE="https://www.bouncycastle.org/java.html"
-MY_PV="r${PV/./rv}"
+MY_PV="r$(ver_rs 1 'rv' 2 'v')"
 SRC_URI="https://github.com/bcgit/bc-java/archive/${MY_PV}.tar.gz -> bc-java-${MY_PV}.tar.gz
 	test? ( https://github.com/bcgit/bc-test-data/archive/${MY_PV}.tar.gz -> bc-test-data-${MY_PV}.tar.gz )"
 S="${WORKDIR}/bc-java-${MY_PV}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm64 ppc64"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
 
 DEPEND=">=virtual/jdk-11:*"
 RDEPEND=">=virtual/jre-1.8:*"
-BDEPEND="app-arch/zip"
 
 DOCS=( {README,SECURITY}.md )
 HTML_DOCS=( {CONTRIBUTORS,index}.html )
 
+PATCHES=( "${FILESDIR}/bcprov-1.79-PKCS12StoreTest.patch" )
+
 check_env() {
 	if use test; then
 		# this is needed only for tests
@@ -50,6 +51,7 @@ src_unpack() {
 }
 
 src_prepare() {
+	default #780585
 	java-pkg-2_src_prepare
 	# TBD: unboundid-ldapsdk should be packaged from source.
 	java-pkg_clean ! -path "./libs/unboundid-ldapsdk-6.0.8.jar"
@@ -71,7 +73,8 @@ src_compile() {
 src_test() {
 	mv ../bc-test-data-${MY_PV} bc-test-data || die "cannot move bc-test-data"
 
-	JAVA_TEST_EXTRA_ARGS="-Dbc.test.data.home=${S}/core/src/test/data"
+	JAVA_TEST_EXTRA_ARGS="-Dtest.java.version.prefix=$(java-config -g PROVIDES_VERSION)"
+	JAVA_TEST_EXTRA_ARGS+=" -Dbc.test.data.home=${S}/core/src/test/data"
 	JAVA_TEST_EXTRA_ARGS+=" -Xmx${CHECKREQS_MEMORY}"
 	JAVA_TEST_GENTOO_CLASSPATH="junit-4"
 
diff --git a/dev-java/bcprov/files/bcprov-1.79-PKCS12StoreTest.patch b/dev-java/bcprov/files/bcprov-1.79-PKCS12StoreTest.patch
new file mode 100644
index 000000000000..b644fa927034
--- /dev/null
+++ b/dev-java/bcprov/files/bcprov-1.79-PKCS12StoreTest.patch
@@ -0,0 +1,21 @@
+There was 1 failure:
+1) testJCE(org.bouncycastle.jce.provider.test.SimpleTestTest)
+junit.framework.AssertionFailedError: index 30 PKCS12Store: Exception: java.io.FileNotFoundException: /tmp/PKCS12-AES256-AES128.p12 (Permission denied)
+	at junit.framework.Assert.fail(Assert.java:57)
+	at junit.framework.TestCase.fail(TestCase.java:223)
+	at org.bouncycastle.jce.provider.test.SimpleTestTest.testJCE(SimpleTestTest.java:33)
+
+FAILURES!!!
+Tests run: 1,  Failures: 1
+
+--- a/prov/src/test/java/org/bouncycastle/jce/provider/test/PKCS12StoreTest.java
++++ b/prov/src/test/java/org/bouncycastle/jce/provider/test/PKCS12StoreTest.java
+@@ -2153,7 +2153,7 @@ public class PKCS12StoreTest
+ 
+         inStore.load(new ByteArrayInputStream(bOut.toByteArray()), passwd);
+ 
+-        FileOutputStream fOut = new FileOutputStream("/tmp/" + storeType + ".p12");
++        FileOutputStream fOut = new FileOutputStream(System.getProperty("java.io.tmpdir") + storeType + ".p12");
+         fOut.write(bOut.toByteArray());
+         fOut.close();
+         Key k = inStore.getKey("key", null);
diff --git a/dev-java/bcutil/Manifest b/dev-java/bcutil/Manifest
index 6603bb51286f..9a9b079c21b5 100644
--- a/dev-java/bcutil/Manifest
+++ b/dev-java/bcutil/Manifest
@@ -1,5 +1,5 @@
-DIST bc-java-r1rv77.tar.gz 31402744 BLAKE2B 1ca1e1dac1ed3d613ae66f08cd8a954e63d43a49ed402f5bd7c30cf1f0830ad29104aa91a9a0a3cbbb5ea750392bc285172a1ab38f2aba1600fa3ca4c469b4f5 SHA512 d75a0ce94bd006499eef9393491347ae70544643c93c2f7591df3ff0179bd477a5066891c7c3bdeb09bd693093c9dc7d29c48462a1d539e464cbf2ee9c1dfce4
 DIST bc-java-r1rv78v1.tar.gz 47211344 BLAKE2B 6d28e69db8ad0043a5cd6c0a4f6901ff40884be4baf60ee40d4cb5487d799e6ac5ef4282b5d6e7f873e45607394890dd26e3150c9c1729bd5346d9cc8f30f240 SHA512 87e6ecd6fea47877d9d7a196f58c5b45a7f026f18f17b71d4155061fad024194c30ce0fc44ea3e879b17f310a6626407f345a8e8970781afec4551f2aa688223
-EBUILD bcutil-1.77.ebuild 1308 BLAKE2B 8d863146b7d2e8cd10b32def5347dfffa1cb41858f6b700872605c2a37d3e3da1c84a7cc2363ff9c83f1329433dc884b4240a93b39c949f271273b098d673273 SHA512 460fe01e3571895980fae0fe1845df2dae5c542a146a7411f07ea966cf2742fc5cf221a31579ac10dfd115a5228564fd3ccbf05a5dd4fd75822368e9a0596d0e
+DIST bc-java-r1rv79.tar.gz 47563177 BLAKE2B 7ca8b64ab004fb70399e950e8c588b19d110596790525ce30aeec3f2c6501bffd1bab6854c6bf1499f101e33e0ac8127c2cdaa34e5531c430e4f00fb145202f3 SHA512 294241371f536e8a9be8ff2307eaad433620c9becb26a00f6b225ea31488bc40dd8b01d20c18e47c105c7a8f1b2415136608d82811581fad4718db02e9c882a3
 EBUILD bcutil-1.78.1.ebuild 1328 BLAKE2B 9ae46e17a92cd4ed01067dfb3da918920b4635d293628682d9ee7c5d9277c73399dcad1fccc62a0a5cd250af62cefbb9a4bd87d347ccf04eb3f229203a4c2044 SHA512 b188811c958f5b42c114985ae62ebd847cf79e8fc91be92d398377760bda8059b2d7a3665893ef4c1ae34636acc4d4751d199a6cd8242c6834d3dbe86bb61b24
+EBUILD bcutil-1.79.ebuild 1331 BLAKE2B eb7f152919c7ca596808d57fa9e39a8bd2150186ea7a7a320f6bd031475ea847eaf58beb6f1c11052c996864b0af47eeb15214c89b9946d8c881e5b29138c107 SHA512 bc603654b834bad2c47873f3e09a7f2544dc3e4fda0bf18fef1e3fd8d008800ed424a60af43270eefa7aaf24e313ce8612c118d84706964dfb8f7534b3bb747c
 MISC metadata.xml 478 BLAKE2B 877e4909a1a5f6903a5832348ba2cbbfd071eec425a576b8eb7af8b5c28b9a7d0efbc603e0a8b281607351a52ba130b3121f658b5beea1d7a618d5f0921f9a64 SHA512 12a308175f5b05b9b42f5ffcc03221615609d67670abfe211ee4b3b0c6f178516dab89a13f6539d26c4c4d15b1a83fc3ecd6b6872be14f1d3a30176404c43f12
diff --git a/dev-java/bcutil/bcutil-1.77.ebuild b/dev-java/bcutil/bcutil-1.79.ebuild
index ba24ca10e630..10aa78040652 100644
--- a/dev-java/bcutil/bcutil-1.77.ebuild
+++ b/dev-java/bcutil/bcutil-1.79.ebuild
@@ -11,19 +11,25 @@ inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Java APIs for ASN.1 extension and utility APIs used to support bcpkix and bctls"
 HOMEPAGE="https://www.bouncycastle.org/java.html"
-MY_PV="r${PV/./rv}"
+MY_PV="r$(ver_rs 1 'rv' 2 'v')"
 SRC_URI="https://github.com/bcgit/bc-java/archive/${MY_PV}.tar.gz -> bc-java-${MY_PV}.tar.gz"
 S="${WORKDIR}/bc-java-${MY_PV}/util"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm64 ppc64"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
 
 CDEPEND="~dev-java/bcprov-${PV}:0"
-DEPEND="${CDEPEND}
-	>=virtual/jdk-11:*"
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.8:*"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-11:*
+"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.8:*
+"
 
 DOCS=( ../{README,SECURITY}.md )
 HTML_DOCS=( ../{CONTRIBUTORS,index}.html )
diff --git a/dev-java/mvel/Manifest b/dev-java/mvel/Manifest
index 15b37a337631..de8eb6ce1c41 100644
--- a/dev-java/mvel/Manifest
+++ b/dev-java/mvel/Manifest
@@ -1,5 +1,3 @@
-DIST mvel2-2.5.0.Final.tar.gz 2182715 BLAKE2B 1e8dbde4b75e36ea4d285ab45c0040957b9af7b5819786daf6469ae509c9c1e16ba2b201a05f9f9cf1c694bac816afd2d613226a8eb3b06f9049a898c6586b85 SHA512 29ca1ef8fdc4cbb97b5847f59e7c3118e837022d7292b507869208da1798b55d0445c40214d72c159e610d7094df7002c091296b2b31775a1ad0606f622d12b5
 DIST mvel2-2.5.2.Final.tar.gz 2184489 BLAKE2B 4e7b79f096a2a87a1d60b5edc0909fbadc754aa3927d5d439ebf8f2df2b05b6a85248d31d720b3a4f13e5890c45079388f8745baba32cffe5a2c998748cfb1a6 SHA512 ff1c0ee2b3cbce9d5f996e16df72cd1620087543b74c65c52632951a4842a7dc17d764303eac48c2df6a94feda0bbfffae7573b44409647db16ef2066930b4f1
-EBUILD mvel-2.5.0-r1.ebuild 1785 BLAKE2B 4b6ca8f5f3a1947935f72966735abd1ab02229f2f524fa8f9ec0f4087ed54743f9087703d91007ad6c085a772105a4e95a5846aaff9b7a7c6c0d4f9fe376374c SHA512 b0607b501dcecc0cf18741587a827cd2c734409ca097e0750bb799ba02b68a55632748f17029592a0dfe8d9bbe8503759abadb2c7d6ca1cb05ec95175440adb1
 EBUILD mvel-2.5.2.ebuild 1819 BLAKE2B 43c73e63e0309534d7d85f6e285a8011dc83c6846941c0a91dec28f024339a87da740bb4bf692ad71257fa69394214e53beeafeda972a332df8369a844f8bd12 SHA512 db0c9fbab5a1546beec2b6c332dac6f0d3bcfc3e8f69be681f45e42ecf3760ccf7b85ac7138a667f7dab467e697cc3be22b04ddb7a1bc6a7ebaf1db1fad67ab5
 MISC metadata.xml 311 BLAKE2B fd4a83fa02a7d87a3b03c3b99b99f0e87b2dbe54b45eb00172999f629712e499aca3dfa631000d92ba51c1303dacea1499cf0394af8aab8ac53610b6bb7c31d7 SHA512 6ecb610dd945d4cba9764e55ffe05e896536d1deec4cdaa18949943fdb2e7e953f167f87599b4d6ebb16ee85c19e23da63217c4063b8553fa45ecf0680589ed1
diff --git a/dev-java/mvel/mvel-2.5.0-r1.ebuild b/dev-java/mvel/mvel-2.5.0-r1.ebuild
deleted file mode 100644
index 3a49e8935721..000000000000
--- a/dev-java/mvel/mvel-2.5.0-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.mvel:mvel2:${PV}.Final"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="MVFLEX Expression Language"
-HOMEPAGE="https://github.com/mvel/mvel"
-SRC_URI="https://github.com/mvel/mvel/archive/mvel2-${PV}.Final.tar.gz"
-S="${WORKDIR}/${PN}-${PN}2-${PV}.Final"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc64"
-
-DEPEND="
-	dev-java/asm:9
-	>=virtual/jdk-1.8:*
-"
-RDEPEND=">=virtual/jre-1.8:*"
-
-# Required due to use of '_' as identifiers in source files
-JAVADOC_ARGS="-source 8"
-JAVA_CLASSPATH_EXTRA="asm-9"
-JAVA_MAIN_CLASS="org.mvel2.sh.Main"
-JAVA_SRC_DIR="src/main/java"
-
-# Significantly speed up test execution
-# https://github.com/mvel/mvel/blob/mvel2-2.3.2.Final/pom.xml#L158-L171
-JAVA_TEST_EXTRA_ARGS=(
-	-Dfile.encoding=UTF-8
-	-Dmvel.disable.jit=true
-	-Dmvel.tests.quick=true
-)
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_RESOURCE_DIRS=( "src/test/resources" )
-JAVA_TEST_SRC_DIR="src/test/java"
-
-src_test() {
-	# ${S}/pom.xml#201-214
-	pushd src/test/java || die
-		local JAVA_TEST_RUN_ONLY=$(find * \
-			\( -name "*Test.java" \
-			-o -name '*Tests.java' \
-			-o -name 'UsageDemos.java' \)\
-			! -name "AbstractTest.java*" \
-			! -name "CompiledUnitTestEx.java" \
-			! -name "PerfTest.java" \
-			! -name "DroolsTest.java" \
-			! -name "FailureTests.java" \
-			! -name "PerformanceTest.java" \
-			! -name "CompiledPerformanceTests.java" \
-			! -name "MVELThreadTest.java*" \
-			! -name "SimpleTests.java*" \
-			! -name "BaseOperatorsTest.java*" \
-			)
-	popd
-	JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
-	JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
-	java-pkg-simple_src_test
-}
diff --git a/dev-java/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest
index 26bd3dfef1b6..77a36629352b 100644
--- a/dev-java/protobuf-java/Manifest
+++ b/dev-java/protobuf-java/Manifest
@@ -1,6 +1,8 @@
 DIST protobuf-27.2.tar.gz 6282174 BLAKE2B 86d12e9f87e8e1c2961ad517115c8689a8dd984722513816d8d626e59a76f5e7a698a90cbf6007daacf66c6053c9ff28108ff113579a442ce61cd221178bda44 SHA512 664c66b62cf1ed0c65d9b910d8e67d4d5d471113697f1b8edf1573cd5c0fc8e850ac53ce984e48e6c6b9cbbefa12f8530058384e7388e65a59c1e46d03772397
 DIST protobuf-28.1.tar.gz 9258233 BLAKE2B 908dd074cc4ef632efdf123fdc76e6d78fd0db13d580584f00fd6afd3b5e1b6d3b6b52e49c528d4095905c802dcf0f391b01d2edf872738ed11a70c1123258a9 SHA512 769ef61206e39336d93df786a25c08cdf1acb12f2f5818ae31afb268aad8b02076eeba15c41c68aadbf140c6e1653c0aaefc2a637278c7695ded1b5d72888d81
+DIST protobuf-28.3.tar.gz 9256608 BLAKE2B 05162124676abe18300481e9f985fd2cfb09b052d06670a993e79ef02f3daf0d5380b521977ebc2362d4094486151ea285fe1c98a1d2f3799b18a1fa422fdc13 SHA512 a91e175fed7eb01c4240842a5af73a7d3cefccbb10885434bceeb7bc89ab6c56a74912cee290bf46e81d4026f3c9c2b10faad5545816064e215c4bae7908263d
 DIST truth-1.1.3.jar 243021 BLAKE2B a59149038c62ef5dd352b13d4b393e1b7715fbafe5ed86ec2d16d722c738a31dcdca10132fc73b17b367ac4309e5407ba2e489f8d4c8fbca60ce5f35ae75d1e3 SHA512 f29a9fb070aff8a32358a7b6c8998c0095de5d8d68afa7f7bac759c7050309deff929e767657ecbbefd96163460f10255ca01bc567ab30df4834b9d916a4fae8
 EBUILD protobuf-java-4.27.2.ebuild 5026 BLAKE2B f4774dbbca752dcd18aeeb07cf05013b8b26d8dbc70b3f3cbef4543475564ce7fb16582d443cd0c326fe94835e965d459d48416ea63e10518c20347e2b751a94 SHA512 c5a11192867bc6f485df0abee48f3c31921c3ee9fbe335bb5c3c462a6e7ab6c77de0bc06499b364dc939ed27724ca0d79a186f19643d593033815d7a11ce1b20
 EBUILD protobuf-java-4.28.1.ebuild 5014 BLAKE2B 32d898d794c63ce5f952cfa05e724e8593bf47dabc65ef517e698e6797bb5815f7af37a417d819e65b3c404ceb3288896a81f2eddb1043efae0e56e70050e94d SHA512 7fe133439358e83602623a022b31084a19215993f6796c7380f3da98fa38d8830f8ba5503f54cf15a8b78edb6021180bd723cf65c084a6da574966342357ce85
+EBUILD protobuf-java-4.28.3.ebuild 4754 BLAKE2B 8e2e954261c880bc887a273415bc24b86795c3e660edd519e30894ea5b3f8dc5fa0a4b54c67fbca73a8fb1ddb9c849cb1a5686496fa5af60941b3f49acd3d9c1 SHA512 004531eae421213a14c839671a93fd8b4bccdc317f79db1c607697cf6469a70ad40cf00576b4d1a8fb1353e13f59100c784fb44365feae17f4f03bcc4a81616e
 MISC metadata.xml 534 BLAKE2B aa3ede54aa4e1479f977cecb9dace36fa5db7025a5d45d142cde5ea2ede794f721abf0ced139b24d4c2c1aac3631ee43f15b4d74850abc56c1fbafb8736adebc SHA512 11f7b1fca223910cd42be952760e32d98a553fd660e1da66542a722eb1e3296c79e702f899dc36ab0e794a19014ede3738fc0959b04a9d44910e9e0068f3feb7
diff --git a/dev-java/protobuf-java/protobuf-java-4.28.3.ebuild b/dev-java/protobuf-java/protobuf-java-4.28.3.ebuild
new file mode 100644
index 000000000000..dc60b98c3ad4
--- /dev/null
+++ b/dev-java/protobuf-java/protobuf-java-4.28.3.ebuild
@@ -0,0 +1,152 @@
+# Copyright 2008-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.google.protobuf:protobuf-java:${PV}"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple cmake
+
+DESCRIPTION="Core Protocol Buffers library"
+HOMEPAGE="https://protobuf.dev"
+# Currently we bundle the binary version of truth.jar used only for tests, we don't install it.
+# And we build artifact 4.28.3 from the 28.3 tarball in order to allow sharing the tarball with
+# dev-libs/protobuf.
+MY_PV4="${PV#4.}"
+MY_PV="${MY_PV4/_rc/-rc}"
+MY_P="protobuf-${MY_PV}.tar.gz"
+TV="1.1.3"
+SRC_URI="https://github.com/protocolbuffers/protobuf/releases/download/v${MY_PV}/${MY_P}
+	test? ( https://repo1.maven.org/maven2/com/google/truth/truth/${TV}/truth-${TV}.jar )"
+S="${WORKDIR}/protobuf-${MY_PV}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="system-protoc"
+
+BDEPEND="
+	system-protoc? ( ~dev-libs/protobuf-${MY_PV4}:0[protoc] )
+	!system-protoc? ( >=dev-cpp/abseil-cpp-20230802.0 )
+"
+DEPEND="
+	>=virtual/jdk-1.8:*
+	test? (
+		dev-java/guava:0
+		dev-java/mockito:4
+	)
+"
+RDEPEND=">=virtual/jre-1.8:*"
+
+JAVA_AUTOMATIC_MODULE_NAME="com.google.protobuf"
+JAVA_JAR_FILENAME="protobuf.jar"
+JAVA_RESOURCE_DIRS="java/core/src/main/resources"
+JAVA_SRC_DIR="java/core/src/main/java"
+
+JAVA_TEST_GENTOO_CLASSPATH="guava,junit-4,mockito-4"
+JAVA_TEST_SRC_DIR="java/core/src/test/java"
+
+run-protoc() {
+	if use system-protoc; then
+		protoc $1
+	else
+		"${BUILD_DIR}"/protoc $1
+	fi
+}
+
+src_prepare() {
+	# If the corrsponding version of system-protoc is not available we build protoc locally
+	if ! use system-protoc; then
+		cmake_src_prepare
+	fi
+	java-pkg-2_src_prepare
+
+	# https://github.com/protocolbuffers/protobuf/blob/v28.3/java/core/generate-sources-build.xml
+	einfo "Replace variables in generate-sources-build.xml"
+	sed \
+		-e 's:${generated.sources.dir}:java/core/src/main/java:' \
+		-e 's:${protobuf.java_source.dir}:java/core/src/main/resources:' \
+		-e 's:${protobuf.source.dir}:src:' \
+		-e 's:^.*value="::' -e 's:\"/>::' \
+		-e '/project\|echo\|mkdir\|exec/d' \
+		-i java/core/generate-sources-build.xml || die "sed to sources failed"
+
+	# https://github.com/protocolbuffers/protobuf/blob/v28.3/java/core/generate-test-sources-build.xml
+	einfo "Replace variables in generate-test-sources-build.xml"
+	sed \
+		-e 's:${generated.testsources.dir}:java/core/src/test/java:' \
+		-e 's:${protobuf.source.dir}:src:' \
+		-e 's:${test.proto.dir}:java/core/src/test/proto:' \
+		-e 's:^.*value="::' -e 's:\"/>::' \
+		-e '/project\|mkdir\|exec\|Also generate/d' \
+		-i java/core/generate-test-sources-build.xml || die "sed to test sources failed"
+
+	# Split the file in two parts, one for each run-protoc call
+	awk '/--java_out/{x="test-sources-build-"++i;}{print > x;}' \
+		java/core/generate-test-sources-build.xml || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-Dprotobuf_BUILD_TESTS=OFF
+		-Dprotobuf_ABSL_PROVIDER=package
+	)
+	if ! use system-protoc; then
+		cmake_src_configure
+	fi
+}
+
+src_compile() {
+	if ! use system-protoc; then
+		cmake_src_compile
+	fi
+
+	einfo "Run protoc to generate sources"
+	run-protoc \
+		@java/core/generate-sources-build.xml \
+		|| die "protoc sources failed"
+
+	java-pkg-simple_src_compile
+}
+
+src_test() {
+	JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/truth-${TV}.jar"
+
+	# google/protobuf/java_features.proto: File not found.
+	cp {java/core/src/main/resources,src}/google/protobuf/java_features.proto || die
+
+	einfo "Running protoc on first part of generate-test-sources-build.xml"
+	run-protoc @test-sources-build-1 \
+		|| die "run-protoc test-sources-build-1 failed"
+
+	einfo "Running protoc on second part of generate-test-sources-build.xml"
+	run-protoc @test-sources-build-2 \
+		|| die "run-protoc test-sources-build-2 failed"
+
+	# java/core/src/test/java/editions_unittest/TestDelimited.java:2867:
+	# error: package editions_unittest.MessageImport does not exist
+	rm java/core/src/test/java/com/google/protobuf/TextFormatTest.java || die
+
+	einfo "Running tests"
+	# Invalid test class 'map_test.MapInitializationOrderTest':
+	# 1. Test class should have exactly one public constructor
+	# Invalid test class 'protobuf_unittest.CachedFieldSizeTest':
+	# 1. Test class should have exactly one public constructor
+	pushd "${JAVA_TEST_SRC_DIR}" || die
+		local JAVA_TEST_RUN_ONLY=$(find * \
+			-path "**/*Test.java" \
+			! -path "**/Abstract*Test.java" \
+			! -name "MapInitializationOrderTest.java" \
+			! -path '*protobuf_unittest/CachedFieldSizeTest.java'
+			)
+	popd
+	JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}"
+	JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}"
+	java-pkg-simple_src_test
+}
+
+src_install() {
+	java-pkg-simple_src_install
+}