gentoo auto-resync : 06:04:2025 - 01:34:40

19 files changed, 301 insertions, 105 deletions

diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 1d41dae81906..45a235b6d738 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/md4c/Manifest b/dev-libs/md4c/Manifest
index 654db2014b21..7c7ab5eac6c8 100644
--- a/dev-libs/md4c/Manifest
+++ b/dev-libs/md4c/Manifest
@@ -1,3 +1,3 @@
 DIST md4c-0.5.2.tar.gz 237973 BLAKE2B 7f3f80c1bcfa3040b4458876abc8eabbad387242fbdcde08b34d9a279da56e4c2264a591deb6ad3061c951b4ca547f896589682aa5c6b50febfc03b89c61be3e SHA512 30607ba39d6c59329f5a56a90cd816ff60b82ea752ac2b9df356d756529cfc49170019fae5df32fa94afc0e2a186c66eaf56fa6373d18436c06ace670675ba85
-EBUILD md4c-0.5.2.ebuild 1057 BLAKE2B 4a5ceb8110ba2f1e277d1213abb69f36d6821263bd14bd52cf5dc42fd624ee19005b9be6154ff70911c91dda2b32156dd6e4c656ac2a19e7760ab88f398ebb32 SHA512 c6fd2f17438b13b1196c57292ebbdedcd53483fc8a1025f9325d3e6fa5eb57ade8aaad61ac40ab53365511c1f4cf748c02d7f887572c6b404643fb5a2d31b669
+EBUILD md4c-0.5.2.ebuild 1069 BLAKE2B e26e669a4463f097e7f51ad25fdb6ad85c93762e79cc8e266b411bc9c332a20367e0fc43835f097ee920bae2df97969d8b79d255a234c01ca60564a74c0ab41a SHA512 d14ceb6684a118dacd671d75e2675a0c69c23094dc378e8d8375d6f15a23938212db874168ae2855216f2f4daf6a6b24d89137ad482494932354b610e753b311
 MISC metadata.xml 509 BLAKE2B db9ae9ddca31114df90af0f83900b6b1de7351b984a85166e05821fbb69c1b308a238f942620e8cc219a18bb2b27b8217b5075517a98eb8987f8928d681bcc41 SHA512 20eafa3bacd5ba8b494143195d916a89ca51ba0634c2ef7c1cd710ca34a7ed33e5bb7629a795bafbcd243c2cc34a0fc243d931b92b7270546be12d7a4c7c836d
diff --git a/dev-libs/md4c/md4c-0.5.2.ebuild b/dev-libs/md4c/md4c-0.5.2.ebuild
index 002381590ba4..cf7039fb98a5 100644
--- a/dev-libs/md4c/md4c-0.5.2.ebuild
+++ b/dev-libs/md4c/md4c-0.5.2.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	SRC_URI="https://github.com/mity/md4c/archive/refs/tags/release-${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/md4c-release-${PV}"
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~riscv ~x86"
 fi
 
 LICENSE="MIT test? ( CC-BY-SA-4.0 )"
diff --git a/dev-libs/protobuf-c/Manifest b/dev-libs/protobuf-c/Manifest
index 74c26b024b6a..f9e22022ae16 100644
--- a/dev-libs/protobuf-c/Manifest
+++ b/dev-libs/protobuf-c/Manifest
@@ -5,9 +5,10 @@ AUX protobuf-c-1.5.0-Clean-CMake.patch 4287 BLAKE2B b51be01e919ffdd3a5f5feef2c0c
 AUX protobuf-c-1.5.0-free-corruption.patch 1609 BLAKE2B c90b244dcea5f5534a4e4a49d2998ffbcfea734583c73bca2d3064f843749cdb2f9d511bcfd6f30b09c575f2467f6278968fe9fb8b61d58c21ecf8e5685e848e SHA512 87a280b09497fb12a0ef9862c880412751c087ebdac482ac94b34bc654bab8cbea388cb5bc047c0c2abb1c1c144a06f175956137565d9ddc87f64227e0d76462
 DIST protobuf-c-1.4.1.tar.gz 513596 BLAKE2B b5e87a3154863581b81790a26b6b522c2b3ad138e966053f20c6264b4a7677d6c5bff8e27faa7c6cfa9e982b72b06e2f518a3def9f6db13241c3cb3ee9afc8f6 SHA512 190a4aa5c607853e6bf860b0974deb21e4f7f6209e810251eaca9612b59ea676779b0ca217fb1572914ffb8de3315a7d24f162b14d447ee671a9adc5b1271e41
 DIST protobuf-c-1.5.0.tar.gz 507251 BLAKE2B 7b428655901f4fd74b67b75419552e7c02065a5291aed4dcc1d55b98c986caa9ccf846eb5e98e0954420c3e5bea559b0078843e00daa7b5c63465eec21e28204 SHA512 175c9fc901cab88308730eea982dd62b1e0decdceb80aa53be163f17a440b4acecb834a784beab5cd71186413a322a323f4539758a8727ca51801cf92f9bd3da
+DIST protobuf-c-1.5.1-protobuf-30.patch 57952 BLAKE2B abd28312d438cacbc056751e265e74e8a987f8f4dceab28b6ef2b628696eed7624bc9d0ac0a67b58cb87383519212541f3e119dd4bb28553c2bd2c5e663ed5a8 SHA512 ae6e2cc0a8141d8143451a87a84ae9140d5e82817f2312025dd426d892c7aa3b5fc363e44f76486608322712eabccaa75afa06ff4bfb7829bb265ab27e11c611
 DIST protobuf-c-1.5.1.tar.gz 531693 BLAKE2B f3c8688e6d88999b24c1192a91fd96855233c811c9c87534983cca14d06158cf48f729775c529a182326c97c41184ef86fcc26e9ed706e49cf1e7994ed573b61 SHA512 35d4de5562b79056f46320552a27b8e476b92466d0a2f5c697f41b0e1c437bb0b0819c39f71accf942b74ecfcea64e42e0a1e67792eeff4a7e01fbafd84488b5
 EBUILD protobuf-c-1.4.1-r2.ebuild 1342 BLAKE2B eacc99926c4effa44ba0d6da73cee4aa7e121e49a17c45bf2876708243352faacb337ad4975fbff309a64acfcba1f99afc472c1cf66c5a13b59bfec17df97ed0 SHA512 8df2975d411150e53356424b274826565f10c8abc5dfbe57ea037024b1095c4241133b971c3496a57bbc44137c09554fa0f2a4431cc4f30bc72031299ff980a9
 EBUILD protobuf-c-1.5.0-r3.ebuild 1389 BLAKE2B 2b0d754cad2c9203320567425dd459b1c5a855629e2f5d05e1d26ad234599c9290dd79ceea3f86ab27463edf5ad36b710527f3a52feec11a10b1c3ea607b6def SHA512 831e38453d77606e2005718ae2831bcfab8fec5dd8838823a0399c897c6122743d683d130538beccefec9d3995fd20536e8161791ce90fe1242b150aa7adecb2
 EBUILD protobuf-c-1.5.0-r4.ebuild 1479 BLAKE2B 11e9a99a01536ae7fedde0f827c09db1623ef07cd08f47e3349f72ce81f94a40c0bb6d2588c0b9370f778d27cb8e9a14eca54cf8a56f5595e48d963081d9bff9 SHA512 36393635b60b7f4a66b60ee819787aafc209a9fbbbcf0b9d7d17693a9538d12b91ee034ab5c663a1a350d40fe387d10dda5a5502e7f294638002d1d501d2956d
-EBUILD protobuf-c-1.5.1.ebuild 1224 BLAKE2B dffc490541fb27db20a04ffdc8bfb7b1fd6cdfd99f8bb5efe45a9d7a3b8890d51e01c0f9f57e0665732e2aac42c971fd722e1fd8d9dc7e08686cf282d02fd2eb SHA512 0af4a27c836e3efc436c6a515bcdad5db32f64ea7f27273c93807c413f59dce78053096981a7e165b32784bcdcc1d3f97fc692073191f6df48e0349750d8fa03
+EBUILD protobuf-c-1.5.1.ebuild 1462 BLAKE2B be5d8499d715742abf6dfe5f2d19559979a3f0fd21d5a92747e86a29a347b8651c22fda9b5f0f9fb4b76eda8b636996854704b14e27efd0d04b439c5fb819308 SHA512 5e598a38843abb78c9330c1eef6d7116f35454be65d65e0c989d7a7ae37a9ae9ae082ea38ae9cd14ed66e98deb65264548affd24949136be4c3d1c4d05dadc64
 MISC metadata.xml 334 BLAKE2B faf0bb965591d515842465979c2c5224d21f7cc820d529ffc6dd8081b9c6d9bb80118f7c9767844b3c855f324054463a65880bd8851a95835c70246dfa8ae1c9 SHA512 6ba2fd30a13dca3180099c390f5b715062b0b082eb977ffa9b582f29693ea1b9c00870ebf4f5783261e5f05358a9b1ccf8ed5c9b35325432721099db4676a9aa
diff --git a/dev-libs/protobuf-c/protobuf-c-1.5.1.ebuild b/dev-libs/protobuf-c/protobuf-c-1.5.1.ebuild
index 627008fb260e..96330ef4c6c8 100644
--- a/dev-libs/protobuf-c/protobuf-c-1.5.1.ebuild
+++ b/dev-libs/protobuf-c/protobuf-c-1.5.1.ebuild
@@ -12,7 +12,11 @@ MY_P="${PN}-${MY_PV}"
 
 DESCRIPTION="Protocol Buffers implementation in C"
 HOMEPAGE="https://github.com/protobuf-c/protobuf-c"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${MY_PV}/${MY_P}.tar.gz"
+SRC_URI="
+	https://github.com/${PN}/${PN}/releases/download/v${MY_PV}/${MY_P}.tar.gz
+	https://github.com/protobuf-c/protobuf-c/commit/25174818178d4761f971dab1c47083b892297dc2.patch
+		-> ${PN}-1.5.1-protobuf-30.patch
+"
 S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD-2"
@@ -35,6 +39,10 @@ RDEPEND="${DEPEND}
 "
 
 src_prepare() {
+	if has_version ">=dev-libs/protobuf-30"; then
+		eapply "${DISTDIR}/${PN}-1.5.1-protobuf-30.patch"
+	fi
+
 	default
 	eautoreconf
 }
diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest
index 16769098c828..6fc5310658da 100644
--- a/dev-libs/protobuf/Manifest
+++ b/dev-libs/protobuf/Manifest
@@ -13,6 +13,7 @@ AUX protobuf-28.0-disable-test_upb-lto.patch 747 BLAKE2B 7312584dfd1efef28e41c02
 AUX protobuf-3.19.0-disable_no-warning-test.patch 1620 BLAKE2B e4f324ed59b2c31662cc625e9d3f1fdb20ee2a25769dbf86093e5000f73a01e11f05459989aaefeaf0414648cd52f1f1025b9d4f1423cdca4844e42e96f54836 SHA512 8c4bc72976a7eb3418b51e7a1c45b49d7ffaeb91a86f440008e6f162773b1db7afed4a6ae1d0b3510d49361c369b6552a9ba4976d104d804d825227aa7113d95
 AUX protobuf-3.19.0-system_libraries.patch 7514 BLAKE2B 1ff5c226232c325ed48cf16e2c47652615c4bd1503f1be8560e7f2e8658ffefeffeef72a6baf4368f758e30a4a81d582769b61dd0b3e383c8188cd03bf409c01 SHA512 b6a58e483dbb1f6151c2f7c735fbd55f34bcf98d6370eabb425dbd96e10cb87e8dfbf5024ad8f888cb80a095bc26598aceb55d576d37166550ee62db41c51a44
 AUX protobuf-3.20.2-protoc_input_output_files.patch 10080 BLAKE2B f52ea613b1104aa703e5e10eb5f968e33e46f05523e13fe84369a24ccbc16cecbcce3221b64b1acd624500864d224ccb59d1ce626157a0d0d77870f79ea64bd8 SHA512 dcf5dbd7be4a025d9ee96ed9be4566452ae4f946d0e1ae4c411a0dc3b7071fc156aca796497c0f2b67563a8ee884bded1a931d712cd7a3727301bbe37ec646f0
+AUX protobuf-30.0-findJsonCpp.patch 1400 BLAKE2B f72974f31659cceab78a404a03eaeb2a902cb0412ac90c10aae50b0052f42c862dd95756d22543efe6295be6cefe9f04342704a16fde21b055b597c9bc03002f SHA512 e3212111ada7f0a9dba717c70a9257b366a9cb6dfecfbcb67cf76645dcecf653cfb23b99ac394be16fa9c3baa8439be59ef5fa64631f31263da6c82c875665a5
 DIST protobuf-21.12.tar.gz 5141166 BLAKE2B 33500612d103afb817062486a741e8e5503f82c42c70054d47d1899e6bb79f3fdde2666cad5b8eff6e1bc539c3b0cdf9f2b125ce7e5d3a459a69e84d67ab535e SHA512 2dc8f552388438268d8b9f7a9e84c6abf1736be3d5031438c789c317410c9f4b5cedd25bf7da6d67b3ba32ca890869f9ddaab2284d6ac0e734a5b135ffbb1346
 DIST protobuf-21.9.tar.gz 5110670 BLAKE2B a4f5b7f58e1c5904ca990b100a72992f6f56177b28773f8de8c99e4158391d33cfb8aa8575915887fc9ae4294faf81d4ff6b470bc07b394bfd5885a09ba0fafe SHA512 6954b42d21921e630173b7848c056ab95635627d8eddec960f3db2ddda13eedde00520a9b350722e76e2998649eb8ebe10758e1db938b6a91e38ff3295b1b7c1
 DIST protobuf-22.5.tar.gz 4924661 BLAKE2B d69c73f4ebfddf45fd94b4f5f898faf00256fe674f2cbc0443c60a88d7a0f47fb96f2f6262879927c6da88095b4ea3ee7fd4c471c100bf42a2bae9edf48c07f1 SHA512 058ab2fec5b11007972e6043071056d1944c3b6fe1d31246cddba8eb57686e3b5280f6ad3d58e78940ca63005e74a8de3c72237f9f7c5066548c5a2513ddc584
@@ -31,24 +32,26 @@ DIST protobuf-28.0.tar.gz 9259114 BLAKE2B 328e09ebffb296d838557ea72a4fc4da8e0ad5
 DIST protobuf-28.3.tar.gz 9256608 BLAKE2B 05162124676abe18300481e9f985fd2cfb09b052d06670a993e79ef02f3daf0d5380b521977ebc2362d4094486151ea285fe1c98a1d2f3799b18a1fa422fdc13 SHA512 a91e175fed7eb01c4240842a5af73a7d3cefccbb10885434bceeb7bc89ab6c56a74912cee290bf46e81d4026f3c9c2b10faad5545816064e215c4bae7908263d
 DIST protobuf-29.2.tar.gz 9348408 BLAKE2B 847798474bc6a76b9badfdbf605e118dece5e321e81242d7fa1bf5f5d17ee05a3d365ec112dc6d861cade97efff8be1d5d04006a5144f613bdb3ff5eacc63b99 SHA512 aeb21773edc3dd92a6c1ba6ccd721cc8a20d61230a5309c75ee3ef19baa554c228a6d1095f191ccc18f10183b646f3140dfe6526f5812bcaa64b7d5260572643
 DIST protobuf-29.4.tar.gz 9350942 BLAKE2B fd3b81905e26db2ec3b54eaf30cf250db2894f91d5da73130106f6778f4e2f13b690961eecb8f5b8c23ac72428753611cd9bf719da986083e09ab32160e25314 SHA512 c888cb9961d58b7fb11a3363ff4d2684605cdd79756712f407ffe5f275569bf69b4370f1d2a0e20775646745cddd41a9b510f1c1981be4e969c9acf0dc2ba734
-EBUILD protobuf-21.12.ebuild 2504 BLAKE2B b90c7eb65835f98825faf41fb70b7edcd40030c5c430be7faf13308a74cbc3576a910b83a73dcf593ebb248392900536b96152ba18d05f532b0632ad637b2ad8 SHA512 454f7104106edd5cbc9c1897cdc57fcef337fef51239d5e8832064a9a049b238bb3d4d549df88369098b26a350b4828131ecda74a65c832cf4aa9b1128445d7b
+DIST protobuf-30.2.tar.gz 9506934 BLAKE2B 3a7d6bfa38500b16b1ce52b244fd9448fe7be2933a77224a1423a67e3ae3155846c0974ee1b6c579f6050f60b7784ace21b149b3cbdff2ef1e6bf954acbb1b51 SHA512 555d1b18d175eeaf17f3879f124d33080f490367840d35b34bfc4e4a5b383bf6a1d09f1570acb6af9c53ac4940a14572d46423b6e3dd0c712e7802c986fb6be6
+EBUILD protobuf-21.12.ebuild 2329 BLAKE2B a4ba0a0368efb86f7837b17a0cddc2d9c4957a6d6bf14b1ffe32399c8a5eb0494ad4e8f12881064de7307b9f32e8576765e641c632f3fb7a24ecad09ee82e175 SHA512 3a372b98d1452bfec1f118b593bf164db8cae0eb79e707a6a713733d2fc24cd5d170f0d86c166abb597157f49db8cd44344cded80355cfd84ce4b69cf0803187
 EBUILD protobuf-21.9.ebuild 4163 BLAKE2B 8c4897218ecde9eab2ab95d68c613d4e0990de5570f51f2d3d8e5367f83887be37d3aff6412f961aeb8db27d08380dd5df8845cd144afe841524150a38c8c23f SHA512 160efd25da58ca8dc6cfa68f8a50e8ca98b682d4e21b1e38bdaf4a6ebb3bd7810c657fe7f06bf931358d30a2f2c524658628200444e89f2bf6a6532e51e05d86
 EBUILD protobuf-22.5-r1.ebuild 3094 BLAKE2B 6bcee931b6cd9a85365b59fd5f3ce58378918c248d12e5c6793c2a5afacc2596c8f3985a59bb790d17449085f9581b908db26025bc120676df65ce6a34c90453 SHA512 5b09aa886dcc68070f77bb836a271580bd88ea8c8945700bc57e19c814a38cb33db87aa0f233aa6537a70a0b92071eb546d68f745c05dc1eae8d16a1e70f8487
 EBUILD protobuf-22.5-r2.ebuild 3159 BLAKE2B 493ce3e4e49606d2b7dfcb0e4f5aab4868cbf9d4f82b37f3e2aae8fc690358537b37dabf45ae4af3da00e262badc75403931ecc453a762d7f330a50c6aa425b4 SHA512 7596d14f23989b3c07fb1a260d73003163b57b98e875631d7bb9c2375e0530ae9d1a989cc124cb1ee47dad07505577ce68bbaf2c7224832b00dde3b8119a2f7b
 EBUILD protobuf-23.3-r4.ebuild 2893 BLAKE2B 14f3335d3a99930174c543665e49c042fe18e0bfce21871aef3e036f8ddee4217412c0636d98922398e89b5f27104ba1c0d892c56415d4a1edf6abfc9e857eaf SHA512 c4d0e6bda73bd7934680030d67b3d07e1e3b35d48d05b358c22d43f6363b6947c09c0e2b690fef81420b1c9173c3be65f78a4d5d444d8a8b1289de48c1942a51
 EBUILD protobuf-23.4.ebuild 2980 BLAKE2B ffd3be624f60c7b8a9f0780a4b5d3fc55a05ef2dd30ddaa627d407efeaf898f4cbba219640123afe4a6faf17bc8da8f641792fdac648342c5a3d53fada16921c SHA512 b3cfac2b3fedc6aff77735cc70b09081d4c70484079dbeeb374676a6ba8ea0f7c65ccff69d407536f953f3f442000a8e0f9c86590d05985c78d310e1e1589ecb
 EBUILD protobuf-24.4.ebuild 2915 BLAKE2B 2fd3f84bf7e86b64393fd39962080809ef4d65b9b06928abe03d3755360ac5768ffad5bb132c205e25f5bd3829b09b1b14e7e3e1840895edd99229d5dafa4807 SHA512 91ddec809ffb71f23f5884d37e46dcb3a98c48423712ffe6e45607a114b6054c959dc59990c9c1c5a3b709b21653eb38f05b767bb3fe040740905f29a28bedcb
-EBUILD protobuf-25.3.ebuild 2914 BLAKE2B 4ddc5b0263ce920a014c805cd0bbb5c7f2e436c7e0185e1aa80e58f47610ae83ed55f64183d7ced81badc1e002ab3d60bd236df8da8d8111f19a03d3b236f451 SHA512 9e401d708de3865310db104d8a61ea763a24997b36e31e3770a1cf038772f12d3b8d956f11e62330ba2bb6ace0abc38576312015d16dadcad1966d3528c9b0db
+EBUILD protobuf-25.3.ebuild 2739 BLAKE2B b1c7c44a668be46458731a3f8bab2b13ec8e035379198b066497994dfbe4e67c84d72de0c52b0d16f1cac78e3d99f9e1e5559fdeacfcdb08366f82a93e57416f SHA512 330a5d0af403fd5fa300ec721373406193f79ce521555fc1b3876fb89576fcf8ca1585b32579716ceb745a76e8288656b48ad53b572903084edee314d02ab764
 EBUILD protobuf-25.4.ebuild 3888 BLAKE2B 92e102f7dc8925101f54bc8bc9b51d57f0f4881f5acfa32940370889949526001ffc613d292e5960ac3f0fc3cd20bb6fef03cd64f29eae01108a59860dfb9c5d SHA512 683bd2e998acb32705d7c120503ed9d7b09559eb2267e238dac9284ad920de2bf4c17fc487906e5a1eca88a4ed44e0ade46e5aff44fab3b55ec8727aec8dc266
-EBUILD protobuf-25.5.ebuild 4045 BLAKE2B c98840d788637334043b704f2dc75c460df66df7666ab2e9d07a51fe9dd2e33241110a108c268d40cf5541d8f391917114e7c7594dd2b639fef84c7bc7b0d434 SHA512 0920ba6ddb6846a1045f2db1b9381ef52c58fbc4f5cf140b6531824913b5e6f806dfea9b62dfae74bcfebf75dbffe1e49b9e4a17709e767404bb15e58f7e079c
-EBUILD protobuf-25.6.ebuild 4045 BLAKE2B c98840d788637334043b704f2dc75c460df66df7666ab2e9d07a51fe9dd2e33241110a108c268d40cf5541d8f391917114e7c7594dd2b639fef84c7bc7b0d434 SHA512 0920ba6ddb6846a1045f2db1b9381ef52c58fbc4f5cf140b6531824913b5e6f806dfea9b62dfae74bcfebf75dbffe1e49b9e4a17709e767404bb15e58f7e079c
+EBUILD protobuf-25.5.ebuild 3946 BLAKE2B 1f5a1cb8c75a4ed610d63b8efbb37704841e3c228c513858ab3c6604642b93cf05d48307218cacc6548c15acf00110224ea409a67ac7e282f3e836c2bce60ae4 SHA512 e2a6e5e5878622686a83fbccbf7089d9f0bcd70158d2e3b963d103f5339b140d29120b00f279d5c7f8b4609dd4ab36402d8a57d8d08eace1b890a1bbfffaf108
+EBUILD protobuf-25.6.ebuild 3946 BLAKE2B 1f5a1cb8c75a4ed610d63b8efbb37704841e3c228c513858ab3c6604642b93cf05d48307218cacc6548c15acf00110224ea409a67ac7e282f3e836c2bce60ae4 SHA512 e2a6e5e5878622686a83fbccbf7089d9f0bcd70158d2e3b963d103f5339b140d29120b00f279d5c7f8b4609dd4ab36402d8a57d8d08eace1b890a1bbfffaf108
 EBUILD protobuf-26.1-r2.ebuild 2915 BLAKE2B 75df59e6ca105a529cf582cda4371c26f0b9bf1df94fb11c3b409e1b01fcde43e0705e05212ea630839446aba819c4b8132514383f94fa2aa455b232a3f64eae SHA512 8daaf04ef736d389f634f2366e833e7c6ce40a9e60b022a31df31868b01a282f948d583270827b1714cc7cfacac4cdd0e9971944dc5b3dd823afa4696c4cf1c7
 EBUILD protobuf-27.2.ebuild 3739 BLAKE2B f93b87963a5c0e5d78c21817ac657e02b1869a36679eb0501d06ce3523518260e6a55e65de5f2b251ebff3a36e4006cf9eaa8fd18f186dbf7a46c4fb416e4bd9 SHA512 f801b662ce4a47c137f061ca17010481cfe40f87bca22f7c895fe42e85c7e33a7a865092aa2db21aaf5e78177a7127902cfdabfd969bca6c567045790a8fcb0f
 EBUILD protobuf-27.4.ebuild 3942 BLAKE2B 6f5050e4120d890fdf88c743c8fb214862f8ea23c6105094242a41f9146acb325bb815d6edc0ce877b0bb4d866ebfdb14b24d9321e213fb90480a1af805cea37 SHA512 23cc67686171e88490bc604236fe8d5b204a0ad6583b01cf9fd4c86a35e6503f1e53db90d02d86759f7ef67bd221aa255b086badc02d89979d8f3100d58b0490
 EBUILD protobuf-27.5.ebuild 4098 BLAKE2B ebac46fe3198ada4f12aa5965c74a143a0526d363fda32497d2b22ca86913a43fc1b3553a71f0108b292587bfe460e9c41173b4a023cf5b838cff0502b290ff8 SHA512 3615721bc15433ff52439d64b512feedb04f43cc17aac76779d91a4c2a735af50b72fd654b8ed3ae8479fd20df4d140b62951fd5a5ed5c7c862ccda40d6dedee
-EBUILD protobuf-28.0.ebuild 4116 BLAKE2B bbf35a188a559c2ce720d502befb96c85ffb44a889d70d09c959bb292eb7ee6d1516f07389554ebc1ae2fa37a2d990a7be3275332d7ff388429e54d10aefa5e7 SHA512 7dbe1d3a031cee32ef793c1a535ac47bc12d108029b451394446b7fe9d62b9b83bc88c1dc8d8094d4698a6942ef7573119b4a5423a49c6ac8663cc1778d05626
-EBUILD protobuf-28.3-r1.ebuild 4278 BLAKE2B bb02aee6792a9773ae311add71bc8492cf33f3e38a30fc4799b7e0a462d82668c5ce5a62f299e778321b8a5f704b25cd51b97fee660bd879f8a6fc6505ce30c6 SHA512 c47411af0a205592f5cb42f62322525e4ae0ee70d523dd5d9f4d78e223288829949b3c2642d5e7b8e4380a1da12945258cc6fc3946f3cd2f49ce8a9ee6b01e64
-EBUILD protobuf-29.2.ebuild 4231 BLAKE2B ab642a2831834f9b42b1e63950c749966d0f863d1b091ef055f8d46970393f9fbc4b0f6d5341887df2ae30e7d61505c4c3cc0701bc468f73184b7381049f6f0c SHA512 a4fc31009bf9061fbc1c20eeffe6f49a702b7c8b0900e5899b03c229b372786e41caa63646a3ffb2a78db4b6da387e18c9e9045ca16e8b14eb8b731f75688018
-EBUILD protobuf-29.4.ebuild 4236 BLAKE2B 3096af820c8b24efac366b6487b5ea5996adc20995e697b71cf258e9411f595b272d18d457b2eebbdbe9cfb18225ab254f829f409c9897b5e7d984f6a9533444 SHA512 a46e6129a84e4f09503adc21abe4b62435c9193003984e0ad5f2747e8faefdddc3d2f9655a685e72ed21afe052c3a2501edccd5981ec46cc4c4f798f5e15ed11
-EBUILD protobuf-9999.ebuild 4211 BLAKE2B b6d9e27a8be5aa00ce1d2fd41be35c81b8f4e96128fc5b7eb8c6a8d36457331b265d6af411cff046d7704c0c7b0d65616feeda7f1dc98b38d1630fc1026e1666 SHA512 59c71d4607ef0818ca51683b6b8b4ccee4cc731427615fe2e06397645e1ea692432dc0f346240b2cf54f3d1b029606ba6f1b505daab0499a6303714d794a9ac7
+EBUILD protobuf-28.0.ebuild 4187 BLAKE2B f0705363f0ee70ae61cc62cdb5a2a6ab03876bbe72ca8ec675a7cc8be17564775fe76ac0e55dec22c9519210b7823bde5810da52fbf0579b64ab720e0f4c9063 SHA512 a011684d1aed2de1cec78be38ceff69dd08d04325c016d7080dd3f26e24fe857a3948e42148e29f75859ec45e72a88af2167cde8b12257f66d5e88facffe6613
+EBUILD protobuf-28.3-r1.ebuild 4251 BLAKE2B bbf52b1b09b95d08d9e72056edc72e117d5b321d9bb590365552346229d588e83c92212465b2b06c2ccca76e163f8784a6713ada3c8834d32a71d8f465f450e6 SHA512 5b551d3ddb58c82af027f0678da9b3e4957f22f13abd1ea0a7cf3c616873bc3189142e8c308b769ec95fbcd71002f925d3147e6964c06cabc7e05d152ecbf53b
+EBUILD protobuf-29.2.ebuild 4204 BLAKE2B 42d0f4957e5fd60e0b83e0b4a14e14be494e9b1100834e99a4c8497b0847d6aad28af74baac8e90abb862be7d49e2e7f5292ba8167b9539f8d6e3867a4f76a35 SHA512 60d9c06f8cc7d43b52f32bad90c1dcd9d77e7935d59a767d9e2025dc8c5003f2d7b7f437fe9036bd436fdc7549f9dd44ff601f18d5a6c2e46ef025168f5b89af
+EBUILD protobuf-29.4.ebuild 4209 BLAKE2B c1a8bca85553ea1b285d25ef369f3a95785ead7bbd618fadd977581a22865c7116383accf4be65438d8bd1bd0332f8197f1c4b7b873f9e4a3076ee27afea2293 SHA512 76628dc15c4dd7513a22aa491c59361c9a08afae253125751bd9eb46e3276438f29883a8de954186ea9b91a15cacb3dbfa7c8102b033a70fad4116042c09e2fe
+EBUILD protobuf-30.2.ebuild 4234 BLAKE2B 06cab79817ee1ad33755c88c88524436594bed8436b6d1805581499a81c61e31271163896bb3e107525df9b2aeda5bc5c7963d11328871ea444c272334212cc2 SHA512 76e8273ee721db9075f61fc0509f5fbe84e96bd55fdf98b65d98a8e7e17c3413497c42af622fb7aaf1e175bb3df6d7f9bf03e3e1da65906f87547f23014d68fd
+EBUILD protobuf-9999.ebuild 4234 BLAKE2B 06cab79817ee1ad33755c88c88524436594bed8436b6d1805581499a81c61e31271163896bb3e107525df9b2aeda5bc5c7963d11328871ea444c272334212cc2 SHA512 76e8273ee721db9075f61fc0509f5fbe84e96bd55fdf98b65d98a8e7e17c3413497c42af622fb7aaf1e175bb3df6d7f9bf03e3e1da65906f87547f23014d68fd
 MISC metadata.xml 917 BLAKE2B c25c810e47e764843ad71be5eb5ebe617d881e7363ce3206401eb59c6df12969bc22bbedc34f08b0a2fbcf955de5b85aa8e4d3a964c1349f07ed1d0eb344a915 SHA512 baa5737981669f1b28ce32884698a4d91e0f1fbdde6056779307e1a6c85dde8ca36ee47ca3ce8794b996934dfafc5482afbe9532a7f3e17c833c3aef0a330376
diff --git a/dev-libs/protobuf/files/protobuf-30.0-findJsonCpp.patch b/dev-libs/protobuf/files/protobuf-30.0-findJsonCpp.patch
new file mode 100644
index 000000000000..9848a6101349
--- /dev/null
+++ b/dev-libs/protobuf/files/protobuf-30.0-findJsonCpp.patch
@@ -0,0 +1,44 @@
+From 2fe6cac5797bead74c473c795fdc5f9d50703894 Mon Sep 17 00:00:00 2001
+From: Paul Zander <negril.nx+gentoo@gmail.com>
+Date: Thu, 6 Mar 2025 13:19:01 +0100
+Subject: [PATCH] fix JsonCPP name
+
+Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
+
+diff --git a/cmake/conformance.cmake b/cmake/conformance.cmake
+index 7377841..dba05aa 100644
+--- a/cmake/conformance.cmake
++++ b/cmake/conformance.cmake
+@@ -1,9 +1,9 @@
+ # Don't run jsoncpp tests.
+ set(JSONCPP_WITH_TESTS OFF)
+ 
+-if (NOT TARGET jsoncpp_lib)
++if (NOT TARGET JsonCpp::JsonCpp)
+   if (NOT protobuf_FORCE_FETCH_DEPENDENCIES)
+-    find_package(jsoncpp)
++    find_package(JsonCpp)
+   endif()
+ 
+   # Fallback to fetching Googletest from github if it's not found locally.
+@@ -21,7 +21,7 @@ if (NOT TARGET jsoncpp_lib)
+   endif()
+ endif()
+ 
+-if (NOT TARGET jsoncpp_lib)
++if (NOT TARGET JsonCpp::JsonCpp)
+   message(FATAL_ERROR
+           "Cannot find jsoncpp dependency that's needed to build conformance tests.\n"
+           "If instead you want to skip these tests, run cmake with:\n"
+@@ -151,7 +151,7 @@ add_test(NAME conformance_cpp_test
+ set(JSONCPP_WITH_TESTS OFF CACHE BOOL "Disable tests")
+ 
+ if(BUILD_SHARED_LIBS)
+-  target_link_libraries(conformance_test_runner jsoncpp_lib)
++  target_link_libraries(conformance_test_runner JsonCpp::JsonCpp)
+ else()
+   target_link_libraries(conformance_test_runner jsoncpp_static)
+ endif()
+-- 
+2.48.1
+
diff --git a/dev-libs/protobuf/protobuf-21.12.ebuild b/dev-libs/protobuf/protobuf-21.12.ebuild
index 3672570cf101..7c343d581c79 100644
--- a/dev-libs/protobuf/protobuf-21.12.ebuild
+++ b/dev-libs/protobuf/protobuf-21.12.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2008-2023 Gentoo Authors
+# Copyright 2008-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit cmake-multilib elisp-common toolchain-funcs
+inherit cmake-multilib elisp-common
 
 if [[ "${PV}" == *9999 ]]; then
 	inherit git-r3
@@ -40,15 +40,6 @@ PATCHES=(
 
 DOCS=( CONTRIBUTORS.txt README.md )
 
-src_configure() {
-	if tc-ld-is-gold; then
-		# https://sourceware.org/bugzilla/show_bug.cgi?id=24527
-		tc-ld-disable-gold
-	fi
-
-	cmake-multilib_src_configure
-}
-
 multilib_src_configure() {
 	local mycmakeargs=(
 		-Dprotobuf_DISABLE_RTTI=ON
diff --git a/dev-libs/protobuf/protobuf-25.3.ebuild b/dev-libs/protobuf/protobuf-25.3.ebuild
index d878a5ea4e79..cf1d9198d96e 100644
--- a/dev-libs/protobuf/protobuf-25.3.ebuild
+++ b/dev-libs/protobuf/protobuf-25.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2008-2024 Gentoo Authors
+# Copyright 2008-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit cmake-multilib elisp-common toolchain-funcs
+inherit cmake-multilib elisp-common
 
 ABSEIL_BRANCH="lts_2023_08_02" # NOTE from https://github.com/protocolbuffers/protobuf/blob/main/.gitmodules
 
@@ -54,15 +54,6 @@ PATCHES=(
 
 DOCS=( CONTRIBUTORS.txt README.md )
 
-src_configure() {
-	if tc-ld-is-gold; then
-		# https://sourceware.org/bugzilla/show_bug.cgi?id=24527
-		tc-ld-disable-gold
-	fi
-
-	cmake-multilib_src_configure
-}
-
 multilib_src_configure() {
 	local mycmakeargs=(
 		-Dprotobuf_DISABLE_RTTI="yes" # TODO why?
diff --git a/dev-libs/protobuf/protobuf-25.5.ebuild b/dev-libs/protobuf/protobuf-25.5.ebuild
index 6a9820f1a034..e947731a59ef 100644
--- a/dev-libs/protobuf/protobuf-25.5.ebuild
+++ b/dev-libs/protobuf/protobuf-25.5.ebuild
@@ -14,29 +14,27 @@ ABSEIL_MIN_VER="${ABSEIL_MIN_VER//_/}"
 if [[ "${PV}" == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf.git"
 	EGIT_SUBMODULES=( '-*' )
-	MY_SLOT="28.0"
+	SLOT="0/9999"
 
 	inherit git-r3
 else
 	SRC_URI="https://github.com/protocolbuffers/protobuf/releases/download/v${PV}/${P}.tar.gz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
-	MY_SLOT=$(ver_cut 1-2)
+	SLOT="0/$(ver_cut 1-2).0"
 fi
 
 DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data"
 HOMEPAGE="https://protobuf.dev/"
 
 LICENSE="BSD"
-SLOT="0/${MY_SLOT}.0"
-IUSE="conformance debug emacs examples +libprotoc libupb +protobuf +protoc test zlib"
+IUSE="conformance debug emacs examples +libprotoc +protobuf +protoc test zlib"
 
 # Require protobuf for the time being
 REQUIRED_USE="
 	protobuf
-	examples? ( protobuf protoc )
+	protobuf? ( protoc )
+	examples? ( protobuf )
 	libprotoc? ( protobuf )
-	libupb? (	protobuf )
-	protoc? ( protobuf )
 "
 
 RESTRICT="!test? ( test )"
@@ -81,7 +79,6 @@ multilib_src_configure() {
 
 		-Dprotobuf_BUILD_CONFORMANCE="$(usex test "$(usex conformance)")"
 		-Dprotobuf_BUILD_LIBPROTOC="$(usex libprotoc)"
-		-Dprotobuf_BUILD_LIBUPB="$(usex libupb)"
 		-Dprotobuf_BUILD_PROTOBUF_BINARIES="$(usex protobuf)"
 		-Dprotobuf_BUILD_PROTOC_BINARIES="$(usex protoc)"
 		-Dprotobuf_BUILD_SHARED_LIBS="yes"
diff --git a/dev-libs/protobuf/protobuf-25.6.ebuild b/dev-libs/protobuf/protobuf-25.6.ebuild
index 6a9820f1a034..e947731a59ef 100644
--- a/dev-libs/protobuf/protobuf-25.6.ebuild
+++ b/dev-libs/protobuf/protobuf-25.6.ebuild
@@ -14,29 +14,27 @@ ABSEIL_MIN_VER="${ABSEIL_MIN_VER//_/}"
 if [[ "${PV}" == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf.git"
 	EGIT_SUBMODULES=( '-*' )
-	MY_SLOT="28.0"
+	SLOT="0/9999"
 
 	inherit git-r3
 else
 	SRC_URI="https://github.com/protocolbuffers/protobuf/releases/download/v${PV}/${P}.tar.gz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
-	MY_SLOT=$(ver_cut 1-2)
+	SLOT="0/$(ver_cut 1-2).0"
 fi
 
 DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data"
 HOMEPAGE="https://protobuf.dev/"
 
 LICENSE="BSD"
-SLOT="0/${MY_SLOT}.0"
-IUSE="conformance debug emacs examples +libprotoc libupb +protobuf +protoc test zlib"
+IUSE="conformance debug emacs examples +libprotoc +protobuf +protoc test zlib"
 
 # Require protobuf for the time being
 REQUIRED_USE="
 	protobuf
-	examples? ( protobuf protoc )
+	protobuf? ( protoc )
+	examples? ( protobuf )
 	libprotoc? ( protobuf )
-	libupb? (	protobuf )
-	protoc? ( protobuf )
 "
 
 RESTRICT="!test? ( test )"
@@ -81,7 +79,6 @@ multilib_src_configure() {
 
 		-Dprotobuf_BUILD_CONFORMANCE="$(usex test "$(usex conformance)")"
 		-Dprotobuf_BUILD_LIBPROTOC="$(usex libprotoc)"
-		-Dprotobuf_BUILD_LIBUPB="$(usex libupb)"
 		-Dprotobuf_BUILD_PROTOBUF_BINARIES="$(usex protobuf)"
 		-Dprotobuf_BUILD_PROTOC_BINARIES="$(usex protoc)"
 		-Dprotobuf_BUILD_SHARED_LIBS="yes"
diff --git a/dev-libs/protobuf/protobuf-28.0.ebuild b/dev-libs/protobuf/protobuf-28.0.ebuild
index 08a9d6fd464f..2621d4f7ba83 100644
--- a/dev-libs/protobuf/protobuf-28.0.ebuild
+++ b/dev-libs/protobuf/protobuf-28.0.ebuild
@@ -14,29 +14,28 @@ ABSEIL_MIN_VER="${ABSEIL_MIN_VER//_/}"
 if [[ "${PV}" == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf.git"
 	EGIT_SUBMODULES=( '-*' )
-	MY_SLOT="28.0"
+	SLOT="0/9999"
 
 	inherit git-r3
 else
 	SRC_URI="https://github.com/protocolbuffers/protobuf/releases/download/v${PV}/${P}.tar.gz"
 	KEYWORDS="~alpha amd64 arm arm64 ~loong ~mips ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
-	MY_SLOT=$(ver_cut 1-2)
+	SLOT="0/$(ver_cut 1-2).0"
 fi
 
 DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data"
 HOMEPAGE="https://protobuf.dev/"
 
 LICENSE="BSD"
-SLOT="0/${MY_SLOT}.0"
 IUSE="conformance debug emacs examples +libprotoc libupb +protobuf +protoc test zlib"
 
+# Require protobuf for the time being
 REQUIRED_USE="
-	|| (
-		libprotoc
-		libupb
-		protobuf
-		protoc
-	)
+	protobuf
+	protobuf? ( protoc )
+	examples? ( protobuf )
+	libprotoc? ( protobuf )
+	libupb? ( protobuf )
 "
 
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/protobuf/protobuf-28.3-r1.ebuild b/dev-libs/protobuf/protobuf-28.3-r1.ebuild
index ed7af8070753..e53658010cb3 100644
--- a/dev-libs/protobuf/protobuf-28.3-r1.ebuild
+++ b/dev-libs/protobuf/protobuf-28.3-r1.ebuild
@@ -14,29 +14,28 @@ ABSEIL_MIN_VER="${ABSEIL_MIN_VER//_/}"
 if [[ "${PV}" == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf.git"
 	EGIT_SUBMODULES=( '-*' )
-	MY_SLOT="28.0"
+	SLOT="0/9999"
 
 	inherit git-r3
 else
 	SRC_URI="https://github.com/protocolbuffers/protobuf/releases/download/v${PV}/${P}.tar.gz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
-	MY_SLOT=$(ver_cut 1-2)
+	SLOT="0/$(ver_cut 1-2).0"
 fi
 
 DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data"
 HOMEPAGE="https://protobuf.dev/"
 
 LICENSE="BSD"
-SLOT="0/${MY_SLOT}.0"
 IUSE="conformance debug emacs examples +libprotoc libupb +protobuf +protoc test zlib"
 
 # Require protobuf for the time being
 REQUIRED_USE="
 	protobuf
-	examples? ( protobuf protoc )
+	protobuf? ( protoc )
+	examples? ( protobuf )
 	libprotoc? ( protobuf )
-	libupb? (	protobuf )
-	protoc? ( protobuf )
+	libupb? ( protobuf )
 "
 
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/protobuf/protobuf-29.2.ebuild b/dev-libs/protobuf/protobuf-29.2.ebuild
index 90c31cdfe7a2..d1c1fc5e9516 100644
--- a/dev-libs/protobuf/protobuf-29.2.ebuild
+++ b/dev-libs/protobuf/protobuf-29.2.ebuild
@@ -14,29 +14,28 @@ ABSEIL_MIN_VER="${ABSEIL_MIN_VER//_/}"
 if [[ "${PV}" == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf.git"
 	EGIT_SUBMODULES=( '-*' )
-	MY_SLOT="28.0"
+	SLOT="0/9999"
 
 	inherit git-r3
 else
 	SRC_URI="https://github.com/protocolbuffers/protobuf/releases/download/v${PV}/${P}.tar.gz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
-	MY_SLOT=$(ver_cut 1-2)
+	SLOT="0/$(ver_cut 1-2).0"
 fi
 
 DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data"
 HOMEPAGE="https://protobuf.dev/"
 
 LICENSE="BSD"
-SLOT="0/${MY_SLOT}.0"
 IUSE="conformance debug emacs examples +libprotoc libupb +protobuf +protoc test zlib"
 
 # Require protobuf for the time being
 REQUIRED_USE="
 	protobuf
-	examples? ( protobuf protoc )
+	protobuf? ( protoc )
+	examples? ( protobuf )
 	libprotoc? ( protobuf )
-	libupb? (	protobuf )
-	protoc? ( protobuf )
+	libupb? ( protobuf )
 "
 
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/protobuf/protobuf-29.4.ebuild b/dev-libs/protobuf/protobuf-29.4.ebuild
index 92bb4f6121b5..8ce1e903d955 100644
--- a/dev-libs/protobuf/protobuf-29.4.ebuild
+++ b/dev-libs/protobuf/protobuf-29.4.ebuild
@@ -14,29 +14,28 @@ ABSEIL_MIN_VER="${ABSEIL_MIN_VER//_/}"
 if [[ "${PV}" == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf.git"
 	EGIT_SUBMODULES=( '-*' )
-	MY_SLOT="28.0"
+	SLOT="0/9999"
 
 	inherit git-r3
 else
 	SRC_URI="https://github.com/protocolbuffers/protobuf/releases/download/v${PV}/${P}.tar.gz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
-	MY_SLOT=$(ver_cut 1-2)
+	SLOT="0/$(ver_cut 1-2).0"
 fi
 
 DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data"
 HOMEPAGE="https://protobuf.dev/"
 
 LICENSE="BSD"
-SLOT="0/${MY_SLOT}.0"
 IUSE="conformance debug emacs examples +libprotoc libupb +protobuf +protoc test zlib"
 
 # Require protobuf for the time being
 REQUIRED_USE="
 	protobuf
-	examples? ( protobuf protoc )
+	protobuf? ( protoc )
+	examples? ( protobuf )
 	libprotoc? ( protobuf )
-	libupb? (	protobuf )
-	protoc? ( protobuf )
+	libupb? ( protobuf )
 "
 
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/protobuf/protobuf-30.2.ebuild b/dev-libs/protobuf/protobuf-30.2.ebuild
new file mode 100644
index 000000000000..b100f58a75c6
--- /dev/null
+++ b/dev-libs/protobuf/protobuf-30.2.ebuild
@@ -0,0 +1,172 @@
+# Copyright 2008-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib elisp-common multilib
+
+# NOTE from https://github.com/protocolbuffers/protobuf/blob/main/cmake/dependencies.cmake
+ABSEIL_MIN_VER="20250127.0"
+
+if [[ "${PV}" == *9999 ]]; then
+	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf.git"
+	EGIT_SUBMODULES=( '-*' )
+	SLOT="0/9999"
+
+	inherit git-r3
+else
+	SRC_URI="https://github.com/protocolbuffers/protobuf/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+	SLOT="0/$(ver_cut 1-2).0"
+fi
+
+DESCRIPTION="Google's Protocol Buffers - Extensible mechanism for serializing structured data"
+HOMEPAGE="https://protobuf.dev/"
+
+LICENSE="BSD"
+IUSE="conformance debug emacs examples +libprotoc libupb +protobuf +protoc test zlib"
+
+# Require protobuf for the time being
+REQUIRED_USE="
+	protobuf
+	protobuf? ( protoc )
+	examples? ( protobuf )
+	libprotoc? ( protobuf )
+	libupb? ( protobuf )
+"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	emacs? ( app-editors/emacs:* )
+"
+
+COMMON_DEPEND="
+	>=dev-cpp/abseil-cpp-${ABSEIL_MIN_VER}:=[${MULTILIB_USEDEP}]
+	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+	conformance? ( dev-libs/jsoncpp[${MULTILIB_USEDEP}] )
+	test? ( dev-cpp/gtest[${MULTILIB_USEDEP}] )
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	${BDEPEND}
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-23.3-static_assert-failure.patch"
+	"${FILESDIR}/${PN}-28.0-disable-test_upb-lto.patch"
+	"${FILESDIR}/${PN}-30.0-findJsonCpp.patch"
+)
+
+DOCS=( CONTRIBUTORS.txt README.md )
+
+src_prepare() {
+	cmake_src_prepare
+
+	cp "${FILESDIR}/FindJsonCpp.cmake" "${S}/cmake" || die
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-Dprotobuf_BUILD_CONFORMANCE="$(usex test "$(usex conformance)")"
+		-Dprotobuf_BUILD_LIBPROTOC="$(usex libprotoc)"
+		-Dprotobuf_BUILD_LIBUPB="$(usex libupb)"
+		-Dprotobuf_BUILD_PROTOBUF_BINARIES="$(usex protobuf)"
+		-Dprotobuf_BUILD_PROTOC_BINARIES="$(usex protoc)"
+		-Dprotobuf_BUILD_SHARED_LIBS="yes"
+		-Dprotobuf_BUILD_TESTS="$(usex test)"
+
+		-Dprotobuf_DISABLE_RTTI="no"
+
+		-Dprotobuf_INSTALL="yes"
+		-Dprotobuf_TEST_XML_OUTDIR="$(usex test)"
+
+		-Dprotobuf_WITH_ZLIB="$(usex zlib)"
+		-Dprotobuf_VERBOSE="$(usex debug)"
+		-DCMAKE_MODULE_PATH="${S}/cmake"
+
+		-Dprotobuf_LOCAL_DEPENDENCIES_ONLY="yes"
+		# -Dprotobuf_FORCE_FETCH_DEPENDENCIES="no"
+	)
+	if use protobuf ; then
+		if use examples ; then
+			mycmakeargs+=(
+				-Dprotobuf_BUILD_EXAMPLES="$(usex examples)"
+				-Dprotobuf_INSTALL_EXAMPLES="$(usex examples)"
+			)
+		fi
+	fi
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake-multilib_src_compile
+
+	if use emacs; then
+		elisp-compile editors/protobuf-mode.el
+	fi
+}
+
+src_test() {
+	local -x srcdir="${S}/src"
+
+	# we override here to inject env vars
+	multilib_src_test() {
+		local -x TEST_TMPDIR="${T%/}/TEST_TMPDIR_${ABI}"
+		mkdir -p -m 770 "${TEST_TMPDIR}" || die
+
+		ln -srf "${S}/src" "${BUILD_DIR}/include" || die
+
+		cmake_src_test "${_cmake_args[@]}"
+	}
+
+	# Do headstands for LTO # 942985
+	local -x GTEST_FILTER
+	GTEST_FILTER="-FileDescriptorSetSource/EncodeDecodeTest*:LazilyBuildDependenciesTest.GeneratedFile:PythonGeneratorTest/PythonGeneratorTest.PythonWithCppFeatures/*"
+
+	cmake-multilib_src_test
+
+	GTEST_FILTER="${GTEST_FILTER//-/}"
+
+	cmake-multilib_src_test
+}
+
+multilib_src_install_all() {
+	find "${ED}" -name "*.la" -delete || die
+
+	if [[ ! -f "${ED}/usr/$(get_libdir)/libprotobuf$(get_libname "${SLOT#*/}")" ]]; then
+		eerror "No matching library found with SLOT variable, currently set: ${SLOT}\n" \
+			"Expected value: ${ED}/usr/$(get_libdir)/libprotobuf$(get_libname "${SLOT#*/}")"
+		die "Please update SLOT variable"
+	fi
+
+	insinto /usr/share/vim/vimfiles/syntax
+	doins editors/proto.vim
+	insinto /usr/share/vim/vimfiles/ftdetect
+	doins "${FILESDIR}/proto.vim"
+
+	if use emacs; then
+		elisp-install "${PN}" editors/protobuf-mode.el*
+		elisp-site-file-install "${FILESDIR}/70${PN}-gentoo.el"
+	fi
+
+	if use examples; then
+		DOCS+=(examples)
+		docompress -x "/usr/share/doc/${PF}/examples"
+	fi
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-libs/protobuf/protobuf-9999.ebuild b/dev-libs/protobuf/protobuf-9999.ebuild
index 42712e4699f4..b100f58a75c6 100644
--- a/dev-libs/protobuf/protobuf-9999.ebuild
+++ b/dev-libs/protobuf/protobuf-9999.ebuild
@@ -5,11 +5,8 @@ EAPI=8
 
 inherit cmake-multilib elisp-common multilib
 
-# NOTE from https://github.com/protocolbuffers/protobuf/blob/main/.gitmodules
-ABSEIL_BRANCH="lts_2023_08_02"
-
-ABSEIL_MIN_VER="${ABSEIL_BRANCH//lts_}"
-ABSEIL_MIN_VER="${ABSEIL_MIN_VER//_/}"
+# NOTE from https://github.com/protocolbuffers/protobuf/blob/main/cmake/dependencies.cmake
+ABSEIL_MIN_VER="20250127.0"
 
 if [[ "${PV}" == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf.git"
@@ -19,7 +16,7 @@ if [[ "${PV}" == *9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/protocolbuffers/protobuf/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
 	SLOT="0/$(ver_cut 1-2).0"
 fi
 
@@ -32,10 +29,10 @@ IUSE="conformance debug emacs examples +libprotoc libupb +protobuf +protoc test
 # Require protobuf for the time being
 REQUIRED_USE="
 	protobuf
-	examples? ( protobuf protoc )
+	protobuf? ( protoc )
+	examples? ( protobuf )
 	libprotoc? ( protobuf )
-	libupb? (	protobuf )
-	protoc? ( protobuf )
+	libupb? ( protobuf )
 "
 
 RESTRICT="!test? ( test )"
@@ -52,7 +49,7 @@ COMMON_DEPEND="
 DEPEND="
 	${COMMON_DEPEND}
 	conformance? ( dev-libs/jsoncpp[${MULTILIB_USEDEP}] )
-	test? ( >=dev-cpp/gtest-1.11[${MULTILIB_USEDEP}] )
+	test? ( dev-cpp/gtest[${MULTILIB_USEDEP}] )
 "
 RDEPEND="
 	${COMMON_DEPEND}
@@ -61,8 +58,8 @@ RDEPEND="
 
 PATCHES=(
 	"${FILESDIR}/${PN}-23.3-static_assert-failure.patch"
-	"${FILESDIR}/${PN}-27.4-findJsonCpp.patch"
 	"${FILESDIR}/${PN}-28.0-disable-test_upb-lto.patch"
+	"${FILESDIR}/${PN}-30.0-findJsonCpp.patch"
 )
 
 DOCS=( CONTRIBUTORS.txt README.md )
@@ -75,9 +72,6 @@ src_prepare() {
 
 multilib_src_configure() {
 	local mycmakeargs=(
-		-Dprotobuf_ABSL_PROVIDER="package"
-		-Dprotobuf_JSONCPP_PROVIDER="package"
-
 		-Dprotobuf_BUILD_CONFORMANCE="$(usex test "$(usex conformance)")"
 		-Dprotobuf_BUILD_LIBPROTOC="$(usex libprotoc)"
 		-Dprotobuf_BUILD_LIBUPB="$(usex libupb)"
@@ -94,6 +88,9 @@ multilib_src_configure() {
 		-Dprotobuf_WITH_ZLIB="$(usex zlib)"
 		-Dprotobuf_VERBOSE="$(usex debug)"
 		-DCMAKE_MODULE_PATH="${S}/cmake"
+
+		-Dprotobuf_LOCAL_DEPENDENCIES_ONLY="yes"
+		# -Dprotobuf_FORCE_FETCH_DEPENDENCIES="no"
 	)
 	if use protobuf ; then
 		if use examples ; then
@@ -104,8 +101,6 @@ multilib_src_configure() {
 		fi
 	fi
 
-	use test && mycmakeargs+=( -Dprotobuf_USE_EXTERNAL_GTEST="yes" )
-
 	cmake_src_configure
 }
 
@@ -120,18 +115,19 @@ src_compile() {
 src_test() {
 	local -x srcdir="${S}/src"
 
-	local -x TEST_TMPDIR="${T%/}/TEST_TMPDIR_${ABI}"
-	mkdir -m 777 "${TEST_TMPDIR}" || die
+	# we override here to inject env vars
+	multilib_src_test() {
+		local -x TEST_TMPDIR="${T%/}/TEST_TMPDIR_${ABI}"
+		mkdir -p -m 770 "${TEST_TMPDIR}" || die
 
-	setup_test_env() {
-		ln -sr "${S}/src" "${BUILD_DIR}/include" || die
-	}
+		ln -srf "${S}/src" "${BUILD_DIR}/include" || die
 
-	multilib_foreach_abi setup_test_env
+		cmake_src_test "${_cmake_args[@]}"
+	}
 
 	# Do headstands for LTO # 942985
 	local -x GTEST_FILTER
-	GTEST_FILTER="-FileDescriptorSetSource/EncodeDecodeTest*"
+	GTEST_FILTER="-FileDescriptorSetSource/EncodeDecodeTest*:LazilyBuildDependenciesTest.GeneratedFile:PythonGeneratorTest/PythonGeneratorTest.PythonWithCppFeatures/*"
 
 	cmake-multilib_src_test
 
@@ -143,9 +139,9 @@ src_test() {
 multilib_src_install_all() {
 	find "${ED}" -name "*.la" -delete || die
 
-	if [[ ! -f "${ED}/usr/$(get_libdir)/libprotobuf$(get_libname ${SLOT#*/})" ]]; then
+	if [[ ! -f "${ED}/usr/$(get_libdir)/libprotobuf$(get_libname "${SLOT#*/}")" ]]; then
 		eerror "No matching library found with SLOT variable, currently set: ${SLOT}\n" \
-			"Expected value: ${ED}/usr/$(get_libdir)/libprotobuf$(get_libname ${SLOT#*/})"
+			"Expected value: ${ED}/usr/$(get_libdir)/libprotobuf$(get_libname "${SLOT#*/}")"
 		die "Please update SLOT variable"
 	fi
 
diff --git a/dev-libs/rocksdb/Manifest b/dev-libs/rocksdb/Manifest
index 9deede707c5c..6248004e1984 100644
--- a/dev-libs/rocksdb/Manifest
+++ b/dev-libs/rocksdb/Manifest
@@ -7,4 +7,4 @@ EBUILD rocksdb-10.0.1.ebuild 2139 BLAKE2B d6cd173d75b5c58541b65e7b70ecd2190eb60b
 EBUILD rocksdb-7.9.2-r1.ebuild 2142 BLAKE2B 470eb95922565c835d01586258fdad773700da61e7289b36aa6f02e16a980075f75527c2be6bbe50f8b0925d37eb97aa7f7a49976da9496fc993e8b21faa26fe SHA512 0504b766fde17977952d68ccb0635ca9349f7bc79f59ff7e8ea758e627dbd67918f8944da4636e2476d4d509c90d9d5bc0c47c4adbf138b22a971d4014715c48
 EBUILD rocksdb-8.11.3.ebuild 2104 BLAKE2B 1ff427c5e4f75dbeaf1dd9fc90ef5ac39532d67d5bec118dc51e4a110dd485c0a7d65cccb63c7afa81e24c766847ad794eb7398194b994b3ef2284931406934b SHA512 e5c2f5ccb6bd41af0505305acd3f0e9534f6707299dbe35498276ba7344e542c56ecb87ecff113e9547cb13771eb445ed5816634a6eb0a38a37d313b86f85966
 EBUILD rocksdb-9.10.0.ebuild 2105 BLAKE2B 606f52e47e4f02efb00143d61364a9082b706c1e5cbbade2b205b2971f550a5a9c40b001cee8447a30d21a3ac20183684c54fb46d629c7f7195739aa2cfe1ade SHA512 bd677ca896a7dd3889151d8f61c8b8bf250d1dee74270c789d74e604095d4c1192a13227472078f84c2b27370114c3e47fc8f6c88a8643cf786d0473f2bfc7be
-MISC metadata.xml 571 BLAKE2B dda52edb83d688eab22b45adbff12c9a2a146d5db3e80e68c0a46326f4d15f9bf92f08a7e1add3aedda292cbea432aef07b5a7da329394c05465b5fb5d0b714b SHA512 f9abd15ca612b1558af72075cf2077bd225231b53d36d79dc7ea4f0012d2d000fbda5849a95f1bbf719f851c0bf25b959a44655c1b7c4050e0f3c9f4e19acc88
+MISC metadata.xml 647 BLAKE2B 3f140355fcab62176e1729ef6a74ae38fcdfca0b811322aeb97e5eec9b021ed358b6bef269c7d8a073a4bf08a236783c7afd3f57c6707866d1acb35d4cd66fe4 SHA512 05704081c924dae281781450cd15ed345d9fc83e47beaa935410b261ea07f3abece6fdea577a8816dc958765a19dfcf55a37a47426876aa9733032463b1cd779
diff --git a/dev-libs/rocksdb/metadata.xml b/dev-libs/rocksdb/metadata.xml
index 544fab1e8b1f..9cdc6b248652 100644
--- a/dev-libs/rocksdb/metadata.xml
+++ b/dev-libs/rocksdb/metadata.xml
@@ -13,7 +13,7 @@
 		<remote-id type="github">facebook/rocksdb</remote-id>
 	</upstream>
 	<use>
-		<flag name="numa">Enable NUMA support</flag>
+		<flag name="numa">Enable NUMA support using <pkg>sys-process/numactl</pkg> (NUMA kernel support is also required)</flag>
 		<flag name="tbb">Enable support for <pkg>dev-cpp/tbb</pkg></flag>
 	</use>
 </pkgmetadata>