gentoo auto-resync : 01:04:2024 - 08:13:46

author: V3n3RiX <venerix@koprulu.sector> 2024-04-01 08:13:46 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2024-04-01 08:13:46 +0100
commit: 48e7f15d37baf7167041b2ab0e2a19a703e5c99f (patch)
tree: a4ae631f4b109859ab021cfc9d048e9a81a252ce
parent: de6c40224da664deb650b25efd11f41044602c76 (diff)
139 files changed, 843 insertions, 1027 deletions
diff --git a/Manifest b/Manifest
index be19c59e53eb..71cf21afe602 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29752 BLAKE2B 988b9f762eaf25a60b343d9e32b3e4fe42ec63969137f4ec8b6dea4058a576b2a44fb9ec1144956d4598065d968c52d3e7f80e00db9f69a92d52e1eacf44cea9 SHA512 160069499d4e1ebe50ae4ce0cb4e0c8399495cd1f4cda1f48aa6b98a01f257b53a4bef8509b6ba776c280ca968ca464224aed7900ce3a58cf7bae839a5f98ae4
-TIMESTAMP 2024-04-01T00:40:34Z
+MANIFEST Manifest.files.gz 29754 BLAKE2B ba6ebe260097877798f3da82bc1045953f5a79b380398674a262af5e294a6a798931c7d826fb71091c3990143d0ff118ab0f916e180140c52a85cba59d52853d SHA512 2b38e4c4169d5ca7de5f20ac3d60c78dc3e6eba9474d5e70a0f99d3f56bd9d2584981a9172baf293288492bea38d1b3287516bde605911d39260f819aa4954da
+TIMESTAMP 2024-04-01T06:40:40Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKSBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmYKAoJfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmYKVuhfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klB3Hg/4wERt13bcN4nCGDQr/aEk4Yfy17AUY6UHPV0sKXqqdOFF5RXPQbFDbcOn
-m2r1P3U/zGIsT+VQFQGtN849j3MKi49FkwmnY0Qrqj2KAOaTVHunHhtcJok5syPO
-wN7ZVQfZlIvoG0nvGRA5lx6+DGaxe3pxh8JhBREGbWiH2JKEUoAu/XKWYlx47d1U
-3oWIfDF7pUiaDty/IYxKBUiGlVnyBCuTT7b4iRjeE/qd6SsPmbsBFYalD+7pgxvH
-3FDbeUXTuekJshylNgHy0nrB7AocTsOONOD/glaL42pHt1k80JoXTaSYKabjJlEG
-CrTcMmPui1inbbdYo8B8Q/wqbPp9S/+Aoa26n2qyrAv6nPQektvFcsfjClsrf8YL
-g6QmyZ+wTBdA4qGhw/2vi7n0zMj472dJ/qbrUhGtnPL3RUD7gfA8NTS8HbeCP2Yu
-bN//UdaYBXydBFOI9NuhJsjR6qqOSRSLir6Il/YHqNyGJaTVf1biypseCOfMbcAa
-bkurlgKKDSke5BrhFUT+3rMPl2n1DmPyRG+tjCJh2erMk4rKK6BkfXA5jsu7uiX+
-mtTlZ+OLANT5le0m8YOXTwTN2hWs9Yj9ZNvYqSvIL0VXwxC6+6+jvaFbCt4nFjMh
-ZWE1rcZR6V3rNJ6mrEh6FwIc1sPts+oDD0geMVLm6s8I91oNDA==
-=+5/8
+klC5YxAAoRJA0pYaH5kFo4T6ZmhNOPf2Si/t5ZcrDCZueFAdbUeKq5x7ohsgqUid
+YYS4joi72CYOoONKq1aHI+U80ncjzuB8iNvk23lmYikUo/w2tyOAKD/b/yF8X4a7
+3MR+KQaDz2zNOfFr9rKi+Ln9WDfaRfBYuUcVDj52LndaooSvigv1esEBGVJLir7z
+efu2eW4o7d9vYxCXCIFgPRbUStooY+RRXCu3J9y93u6TTPUE3UWDtSA/m8U3qzsW
+/bZbY8I/g4ZflQd+Nufe/+2smo0XvAMXlTRMbLhpVmAMM8tfSna7/vGCzdOt0GcL
+x2rtmjaf4/NMZRvf/LBx6d7TGyaZwXV+2jC8brRfIPujBHNRLO9HBRy+QWFyILWx
+tv3QoRJVkSRMyEOAfTSm7M4ysGJHI2smaziFXbtxYuPxqKBzP9T8M97OydA7Xvgz
+vqI+XceteyOzgem479OKp2y7EAO58RaBdFg3gSSpYcTtgVGWyFyfHY7gE/DvZpDH
+4j2CHWYUdJKHllfTcSQjH4Ypgzf73bYjosuh5Q9WG8ZWU6lOqFFHEX3S02Vif/pH
+bXd6o7P0dhwDSMroaxU3GkW6JqCtWWhv63d01kUHwkKD3vBDDPiir2DfQBFvkyt/
+iAinxpkWeduJzVxe6KrKNTEuRbrl6bM8WDE5LWYm7MoPL9vGiY0=
+=sBvC
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 39fd92fb53d9..ceedc87c1aaa 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 6193973dff06..fc8423248f7c 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/consul/Manifest b/app-admin/consul/Manifest
index 40d4794e5eca..e8ada4914885 100644
--- a/app-admin/consul/Manifest
+++ b/app-admin/consul/Manifest
@@ -6,9 +6,10 @@ AUX consul.service 359 BLAKE2B 04a42a1546d2e4dbf57b9d75b32feddd4d0f4f8b6f750b1b4
 AUX data-dir.json.example 36 BLAKE2B dadf9d7350346db73e4db0d98aaa569fe7caa5d695e25606fb97b252be16f2d3f50630092be39be378821f7e17e4914557a55c620156e7d07ced151d1f977689 SHA512 cca94745ddfdcfedcc612da4a14965d4f51f0eaf519d8395e95b8b6cbe7bcb9987b8fdbffd66fb13edda7164a7b0f26e93e5aeab9e631cbf5e0a3a5c05b84b0b
 AUX ui.json.example 17 BLAKE2B ecb48d228ee02df0a96b46cd87001742924ee907d7fe05b54c900b6e37e14b8bd7278e5adeaadd164b09129275a804f1014b7fdf64068ba9d9ad957325f9d5fd SHA512 9aebf80a0dd2bc5345285b63c894af8c0d5864f352d97fc3ba7cd6bf22b905ace3bd221cf23092080e9f7d60832384632c2f069d580eef789eb3f81011e9869d
 DIST consul-1.15.10-vendor.tar.gz 46702348 BLAKE2B a04d6f5a4d2f6f8885207f9f72537d4ea1a3adc5aab64873edf7f710984d3b25a602fb93cecc44ed82249280b51bbe1131701ab09f7ebb1b444c80e013fe271d SHA512 7aade3f90ee689ddca3058f12e7c9f2a691c4eba966993d770d8dc7b171cad54c3c8b6c3f52e03128a8d1b159dd66b6c8b284050c5475d77b51f9a22c4a6af8a
+DIST consul-1.15.11-deps.tar.xz 9566892 BLAKE2B 9459a93d78d3e4b991d0cdcfac22603c628c8f9fdacd8d50524a4c826cca66a575f6cd0bdf5fa9033e32b50336c53192567610ed73386f89c3c4e810c1412144 SHA512 d3876433b4ad3e7a062e059ef250bcfba23ede0595d8491f4b39c73c427e28c677b9f6e41317cf853ab8b3b2ce25151a4adf1a13b13a6a73c6e16de7382d2d05
+DIST consul-1.15.11.tar.gz 28951114 BLAKE2B 02378088d1bbc4313ec62d644b583c328bc9cc40ccc18516a1a14ae0d7f8d12007f1a5fa7c5e455ec2e782ba986ce60d37b92369b1f89f7dd69871702cd97b31 SHA512 1c5c8f9a3ad79aa34fd82a49e92ef5a21fb0470d60e3f3413901305121cbb677c75f72ffd5405554424b336d4e5ec426b7c35f458c04b1d5ab9350c2649cd688
 DIST consul-1.15.3-vendor.tar.gz 43434721 BLAKE2B 7595c98cdecf67e9fb412d8fea1d790dc6b1c29f7bc427e1d0872045a05f8873dc6107f196cea04fe0a2f2553d4fbb1f8d501e5e107b2bea3ae841e5d94eda64 SHA512 b69e3a7c1ebb01c7a64f2c6167e63e8a530b81be9aad8b591d0a71f512f5157ba9a564b46f9effe52a5abd3ae61732e7af10c5ba002110f745eb3d94ebcec256
-DIST consul-1.15.7-vendor.tar.gz 46252048 BLAKE2B c63d69fb206895c535ffd60ada3589d99ec6aec81d7abe6b27169d4638bcc272f5d7c0b37d0bbe6be54f5e2d32f1e40fa1f4088da7fb4931f0c5c10007838197 SHA512 1e52f133f822cf11ee8498b7e92a7460c74d3ed4736c02e0957e3d950608f4aeaec8e8df7e9eb72ae7d4c31c4dcf5d827c9c42bdc7c4b991be53df22c150658a
 EBUILD consul-1.15.10.ebuild 1529 BLAKE2B 1ff7af8d282ef96ffe4db4216c50c5442901a2ef318fa364206f92ab8289b399937bb72f543d799de8533bf8a010cd889c96920f8cc0f3218a01eb69a8d807da SHA512 548bdc401ee0cee8b5a5dfe377c92972d1d7741b94dc4692685ccb393d9cf7a783cfd89ab2254a60d9a09c954d572056d22c91e86473b112e8eafceea7c4531e
+EBUILD consul-1.15.11.ebuild 1597 BLAKE2B 6a26764cca85d90f50286430840ad5cd75ed6e10681e892f90d2d8fadda1a82802be1eb672e02d026eed0d024fd7744ddf15ebcf9736f7659740053be997b513 SHA512 3cdd17959cd48b93a18091a782170c8cc5c1b89bc1f20852ab1e95d2ab54bc5f351a260c1ca50727ff6f1c98b11d1700ac17e0739eb1849674d3917b82345f5f
 EBUILD consul-1.15.3.ebuild 1528 BLAKE2B 2891bd50fc5724c581c1a22744facad77fad5245448e9e23452cefc0107093732917c35c608fadbe305f100e04b363d85160de181b479b38195dce3b4dbedc0c SHA512 d2b62e8516431314efd38428eafa50bd6a7048db64684b89c1f16073b1f5871dc66d27c3d8d78750b38f3248a6814112ea98e4a434384159df92948fd6b2083d
-EBUILD consul-1.15.7.ebuild 1529 BLAKE2B 83e65bf30039b8611e99c0fa8aab0a39b0b774035e84a990762d66e2e88cca4048caacf7bea8130206138d5e2905330389714a68af9f718d438ed356c1aadab9 SHA512 48e65f342998cb81e4a6a7113c0aa523bc557b2d9aa6e58f44c8a3f2afc9c9fcccc88270e47f3e7d9a38ae70b7be54b530986321c148270b157e3c94e43a8b33
 MISC metadata.xml 392 BLAKE2B 4995d973307987bb70802d4328dbb1d5e052683a2e1900912b40be5e345969740b1df9e8e1b3bcbf76fb90066ed43ac5ce91e8e11a0ad19c9d587c7204f45419 SHA512 92d4589b5294df0ddcee6fbafa5db5288b3e892dbec6d84bf0e53beb2b0a30e385f9166c536462e51aeaa9ee8799dd1ae3634b7b13e452e3059ba2853c5b77f1
diff --git a/app-admin/consul/consul-1.15.7.ebuild b/app-admin/consul/consul-1.15.11.ebuild
index 2b693c361655..d5549a6d2665 100644
--- a/app-admin/consul/consul-1.15.7.ebuild
+++ b/app-admin/consul/consul-1.15.11.ebuild
@@ -6,11 +6,12 @@ inherit go-module systemd
 
 DESCRIPTION="A tool for service discovery, monitoring and configuration"
 HOMEPAGE="https://www.consul.io"
-GIT_COMMIT="8e803db6b98d10b2d310800f2aef7e20d3add03c"
+GIT_COMMIT="4fc94919996f7b7e5d16145f8d89cc5ee644b094"
 
-SRC_URI="https://github.com/zmedico/consul/archive/v${PV}-vendor.tar.gz -> ${P}-vendor.tar.gz"
-
-LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT"
+SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~zmedico/dist/${P}-deps.tar.xz"
+LICENSE="BUSL-1.1 MPL-2.0"
+LICENSE=+=" Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT"
 RESTRICT="test"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
@@ -22,11 +23,11 @@ COMMON_DEPEND="
 	DEPEND="${COMMON_DEPEND}"
 	RDEPEND="${COMMON_DEPEND}"
 
-S=${WORKDIR}/${P}-vendor
+S=${WORKDIR}/${P}
 
 src_prepare() {
 	default
-	sed -e 's|^GIT_DATE=.*|GIT_DATE=2023-10-31T14:10:44Z|' -i GNUmakefile || die
+	sed -e 's|^GIT_DATE=.*|GIT_DATE=2024-03-26T21:43:41Z|' -i GNUmakefile || die
 }
 
 src_compile() {
diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz
index 88d38bcceb9f..ae0e751d3c34 100644
--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
diff --git a/app-containers/buildah/Manifest b/app-containers/buildah/Manifest
index 93af86afb89d..fea54e34218d 100644
--- a/app-containers/buildah/Manifest
+++ b/app-containers/buildah/Manifest
@@ -1,17 +1,10 @@
 AUX dont-call-as-directly-upstream-pr-5436.patch 1230 BLAKE2B 991ffcf879c2cb6dbce7ff33805d4fe89e9e40d846a4b2a03a5252833f0cd5f17f32f1e605645d6eedd0fcc1a4a2034588644dbe9dd18c97c0fb501fb8df7cf2 SHA512 9dbb9b91fb367ff59b78dd5c2ac86f47b7db0ced6d6bb2c84761c6d919bb4d86743dd5c9150336e961ec71c61c3aef5350a82a9c84d204cd101c09ca72a5b2b5
-DIST buildah-1.33.5.tar.gz 18579521 BLAKE2B a59bfda3dea1f588a2f77a26b942da6ae02a00f1169008f776a2d7699b6b14f38ab29b46b7d0651e9fff3f007e5f95caed99952cc7585c25ea2a3153402958e9 SHA512 82ddfacd69918fb4ca8110d7d5279f4075385e5db5b64b58cf41a90c47e16093f1e65d8ef20136a4cd8f5c23ea8da7f35fb72581cec6472497b9c5b458023e9c
-DIST buildah-1.33.6.tar.gz 18585405 BLAKE2B 4a6f6ebfce7799a45b0984b6f9a319becfed87d5acf5f1f784249ff6e5397495ac72c00a22ff0bcc68fd94f1d0a591fa4ac5f0f88bcc9c0a6cdefe117166b4ec SHA512 86eab18af459b0b92361d6e9f56ebe9dab65527d829e7771c13b6c574ef45746a7f53520783ff52978b14aac0d6ee8de32cdabf807666a96dcf46e07e36157e2
+AUX softcode-strip-upstream-pr-5446.patch 924 BLAKE2B 7c558438b633182e8fb5a0a5a22a2acc0b122bddde6787a12c7c79cbc99f6e4301463153d3d32b336826b26c3146ede5762d57cc98fbe509bee898c7a7ee958d SHA512 26cb7e87b4fd88db5590d3b3376d9c8e6e81edf48e754a6462b85ce654d25a69f612d7b6a1e7edd2cd8f62d1366bd304b04e50920a4592a7e0a95d66858bf9ac
 DIST buildah-1.33.7.tar.gz 18604354 BLAKE2B d2788096d8d6fd6cc528e8f33edc577778a2775a561ea3c4a983eb4a6fa1d5b570f6d8dc0f77e464d0c242add5d641e20afce83c9f5157021fbc82a009ea47c9 SHA512 1248ad1dcf0d10608674543caf4d78f5052db7932102226e23b73add5e129bd8c614672f3d06aa8052675dd83fa83ef2742ef08fe1a883037b41df8fde893ea1
-DIST buildah-1.34.0.tar.gz 18751419 BLAKE2B 6584c5234e849f9b8cde5e4188791024c8ac5c0ba85859e289f3eb2ec32f97f722ebf25f1291f29e14edf4adc14e19d6a6a76630c820085e9f345736aeb3d4eb SHA512 a3836ce540058f418131969e157d548864727398535e4e99a693d883419b8d764da7166f9b9376c2b9686d8beac101687843c2e93198b16328ef333ad96d55db
 DIST buildah-1.34.3.tar.gz 18856476 BLAKE2B c91c995a2ff4be8b4e84a70c581a817cb2f1333b08ca297163d218f80d538905c41718cfc267c03173330234c3476344be44df799eaaac891395a22bc7a020b3 SHA512 26d5c48cb5b056a274c1a9c6820a6076337f625fc6dd6683000db871f3de9d37907bd962ced3400334bfc230718219cda2108e2e984be5f8c76ecfa4a2f1e1ac
-DIST buildah-1.35.1.tar.gz 19349661 BLAKE2B 31b633f35f937364816dac65e7a801676043630bc3c00ac445ad67afea04142748f76c4aed16690aa990e2c15ed220bdb42b96c6dd9bb0dac9c9d16fc2a27ddc SHA512 3e5af28b3d45e51674d08bef9a92cd64589026d9c6ebee51156738151681395860e372bba2667815e0f90e37984eb9dfdc9b8ad0675b62c8751582b29485d159
 DIST buildah-1.35.3.tar.gz 19372597 BLAKE2B 014bea80b3a8c4482bbe098a0c5293892cf9f4f0d4d74ecaba8f155e49fab326689b95b690b413d64f6b576c7269bdb9d0f446244b832afe311e909b3f96856d SHA512 ca325ce1a878eb9e9a6caedf236add16702d8dcd83f15a1995b8215998821218104ea8cb7a5d11fc354ee01d9805c339578975d35db859f1d53b08e0a2139fe3
-EBUILD buildah-1.33.5.ebuild 2909 BLAKE2B 661fe0713bc3359843c53397d1b5b0cf4fb90e953699c302d3dd00aa0fc3ea4e6885e31d076f91924d47f99fad87e5b309f450be1e04f9c37a2b5b22bc562ea7 SHA512 2728c95830caea275f18063fd2ff3b41b958a8b3b6b94bc7db6a488ae9c0e0a5f57d65c332740efb29afd31e91c934250e8c8b9953a95891ffb6ce34e3cafdba
-EBUILD buildah-1.33.6.ebuild 2909 BLAKE2B 028314b5c62013ce5ebd147a45944e5e27f2150ad51f2fc566c5ebe45a64ad78ea068962b41dbb5fb657312bf5a48f06e75a920b0f9a4190a06c0b96f7ce02c8 SHA512 48e37433580225f5dbaccbdb2748d7e9715793692c5a2a570ef7cfafcb1994d72583b1bba46c17d81bc5e53603f9ea8f2ac5d8fdcde7377641dd58d08d1040ac
-EBUILD buildah-1.33.7.ebuild 3892 BLAKE2B 9eec9455730d71ee3fbb95c6533502c3c08fa71d12ed8118025f801fe9617afa81a8db997a84398bbf395ee5a5ce2df1964be91899c69c1a60ff223aab490a0a SHA512 1c4a000d06f31a3b44539e901cb5a942049bddcb2558b63e1ad805060adf7c8fe53674c3f0561f177939c65864101dbd93edc76c9bb175be2ded760d06feae27
-EBUILD buildah-1.34.0.ebuild 2910 BLAKE2B 005d1365c73b062d304f8cc729af70d27cb7ab8d74d94799ec7d4a5d293bf3cc2a436ec6d05de539f72c8c1af019ed3cc67312d67276ae5e611cb0e9893e1da8 SHA512 f7f3594f3c75db2fe2ea40645d398b64662d804a22510b22f3cc386b9827e3ce51fc4ee89230495454bc7783ae43185ddd576b85bf3433f29db345d04766c7b5
-EBUILD buildah-1.34.3.ebuild 3854 BLAKE2B ba3db2a4288bf268198dc4e0ae75be770c09a2c6356febf71d4f1793156c36643024bb32ac42f63b337d42fe8a067cf2483dc11d198fcaa3277c51365a994fc4 SHA512 f8aa9aa58274c5cb2d5722f880ac4c454445aa266eab10150719bc27f1b5a7c0c443020670bdf9c8c8730d7245c3d9b757dd77b9aca3250fdd23b5cff96d5386
-EBUILD buildah-1.35.1.ebuild 3125 BLAKE2B 9cb901ba5987b92a18782d56acd919c16242c63e32f808c42a4f686aed9792ffbd67a26dac8709cf9cf3944cb473f5f29ea1ed719574a7158af5a5d89fc51db9 SHA512 d4f1031204887124a05b4077ae150fbc78716c3a1f8b767eff16f5291d28051396933fd1363048f3d61e6ca587fe7d79988581c1d22c72bb167bd43f3edfe24b
-EBUILD buildah-1.35.3.ebuild 3125 BLAKE2B 9cb901ba5987b92a18782d56acd919c16242c63e32f808c42a4f686aed9792ffbd67a26dac8709cf9cf3944cb473f5f29ea1ed719574a7158af5a5d89fc51db9 SHA512 d4f1031204887124a05b4077ae150fbc78716c3a1f8b767eff16f5291d28051396933fd1363048f3d61e6ca587fe7d79988581c1d22c72bb167bd43f3edfe24b
-EBUILD buildah-9999.ebuild 3125 BLAKE2B 9cb901ba5987b92a18782d56acd919c16242c63e32f808c42a4f686aed9792ffbd67a26dac8709cf9cf3944cb473f5f29ea1ed719574a7158af5a5d89fc51db9 SHA512 d4f1031204887124a05b4077ae150fbc78716c3a1f8b767eff16f5291d28051396933fd1363048f3d61e6ca587fe7d79988581c1d22c72bb167bd43f3edfe24b
+EBUILD buildah-1.33.7.ebuild 3994 BLAKE2B 7c60e479bdc171ee817d8d703e05aa2c422911a2e623d4eeabcd4226bc1d7dfdd619ab6fa98323f98c964e36d8e0f567dc4a82ed7609b1c764b56b6d7038cbce SHA512 506340b81a1338870fd1b6c83f5048cfe5ddaa72bd9a320823e5e5a5fed0edc5933a8d66afe00b83a4bec0c09fe01386815d5bc0ae32ff325f3280bb2dd7aef2
+EBUILD buildah-1.34.3.ebuild 4061 BLAKE2B 225b32e4528504ce67423827af079494f43a4101967bd2751b37fba3eafde7c35a81ce60f41949713c57fcaa971e5605542b8682bbf66e42a039ec7586f3d0b1 SHA512 c18b4ba32a6a0114662d4157bfd78cb14c0a7b084fd879f15f77b1a315e4a0ecb6cd3fd64c3e07881cd983b0e76c9b6106ccfd22f6e5e552286586bf86008afb
+EBUILD buildah-1.35.3.ebuild 3184 BLAKE2B c4921b642a814ab645fce1c7e36bccfcc0714564f6e915582b9ccf061a366103f5f962f8cbd05c4e644f2445400266b1ff74ac1b26286fefe7057348c30c3579 SHA512 defa4e45ba7c327732ce5422803a056e93b3ec2a69631596d1c41eee4606e23bd9d115492b5dec398f00bca6c27dde7a1c06c08087b3ac7eb2aec27c997982d0
+EBUILD buildah-9999.ebuild 3124 BLAKE2B 329e87ab012af334b5c59edd87dc9be3de2d99d732112ccad276e3250fc8f03046bbc0088d5de0f4cfc958a398582410ce1a23cc69d8242f9eef82edbe82e00d SHA512 685ed84503d4d745d73fe549b271735762dc9bebfa8f1bd5fe5d87ddd26b9a5487900aa1ec77e09f7b95d0da23040861fb1eecd5367547eaff20b7ba5534f858
 MISC metadata.xml 716 BLAKE2B 8d1868e48306b5ded8700bcfde93d2a0d1a4afedc5440781355f0645b5f71e5a80569be4b14ab459033c5ec7cf5f02eb49e3948154274ad09b088e09d8ac5069 SHA512 b8a7e951a5342ad1a32f650ab21d373c3afa86d482463d87dad5db0e6e715e3d4bde7642b75f68da7f5b4a7e935953ce2ac41affb66724e7882f75f97dfde023
diff --git a/app-containers/buildah/buildah-1.33.5.ebuild b/app-containers/buildah/buildah-1.33.5.ebuild
deleted file mode 100644
index d258b206eb6a..000000000000
--- a/app-containers/buildah/buildah-1.33.5.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module linux-info
-
-DESCRIPTION="A tool that facilitates building OCI images"
-HOMEPAGE="https://github.com/containers/buildah"
-
-# main pkg
-LICENSE="Apache-2.0"
-# deps
-LICENSE+=" BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
-
-SLOT="0"
-IUSE="apparmor btrfs +seccomp systemd doc test"
-RESTRICT="test"
-EXTRA_DOCS=(
-	"CHANGELOG.md"
-	"CONTRIBUTING.md"
-	"install.md"
-	"troubleshooting.md"
-	"docs/tutorials"
-)
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/containers/buildah.git"
-else
-	SRC_URI="https://github.com/containers/buildah/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64"
-fi
-
-RDEPEND="
-	systemd? ( sys-apps/systemd )
-	btrfs? ( sys-fs/btrfs-progs )
-	seccomp? ( sys-libs/libseccomp:= )
-	apparmor? ( sys-libs/libapparmor:= )
-	app-containers/containers-common
-	app-crypt/gpgme:=
-	dev-libs/libgpg-error:=
-	dev-libs/libassuan:=
-	sys-apps/shadow:=
-"
-DEPEND="${RDEPEND}"
-
-pkg_pretend() {
-	local CONFIG_CHECK=""
-	use btrfs && CONFIG_CHECK+=" ~BTRFS_FS"
-	check_extra_config
-
-	linux_config_exists || ewarn "Cannot determine configuration of your kernel."
-}
-
-src_prepare() {
-	default
-
-	# ensure all  necessary files are there
-	local file
-	for file in docs/Makefile hack/libsubid_tag.sh hack/apparmor_tag.sh \
-		hack/systemd_tag.sh btrfs_installed_tag.sh btrfs_tag.sh; do
-		[[ -f "${file}" ]] || die
-	done
-
-	sed -i -e "s|/usr/local|/usr|g" Makefile docs/Makefile || die
-	echo -e '#!/usr/bin/env bash\necho libsubid' > hack/libsubid_tag.sh || die
-
-	cat <<-EOF > hack/apparmor_tag.sh || die
-	#!/usr/bin/env bash
-	$(usex apparmor 'echo apparmor' echo)
-	EOF
-
-	use seccomp || {
-		cat <<-'EOF' > "${T}/disable_seccomp.patch"
-		 --- a/Makefile
-		 +++ b/Makefile
-		 @@ -5 +5 @@
-		 -SECURITYTAGS ?= seccomp $(APPARMORTAG)
-		 +SECURITYTAGS ?= $(APPARMORTAG)
-		EOF
-		eapply "${T}/disable_seccomp.patch" || die
-	}
-
-	cat <<-EOF > hack/systemd_tag.sh || die
-	#!/usr/bin/env bash
-	$(usex systemd 'echo systemd' echo)
-	EOF
-
-	echo -e "#!/usr/bin/env bash\n echo" > btrfs_installed_tag.sh || die
-	cat <<-EOF > btrfs_tag.sh || die
-	#!/usr/bin/env bash
-	$(usex btrfs echo 'echo exclude_graphdriver_btrfs btrfs_noversion')
-	EOF
-
-	use test || {
-		cat <<-'EOF' > "${T}/disable_tests.patch"
-		--- a/Makefile
-		+++ b/Makefile
-		@@ -54 +54 @@
-		-all: bin/buildah bin/imgtype bin/copy bin/tutorial docs
-		+all: bin/buildah docs
-		EOF
-		eapply "${T}/disable_tests.patch" || die
-	}
-
-}
-
-src_compile() {
-	# For non-live versions, prevent git operations which causes sandbox violations
-	# https://github.com/gentoo/gentoo/pull/33531#issuecomment-1786107493
-	[[ ${PV} != 9999* ]] && export COMMIT_NO="" GIT_COMMIT=""
-
-	default
-}
-
-src_test() {
-	emake test-unit
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install install.completions
-	einstalldocs
-	use doc && dodoc -r "${EXTRA_DOCS[@]}"
-}
diff --git a/app-containers/buildah/buildah-1.33.6.ebuild b/app-containers/buildah/buildah-1.33.6.ebuild
deleted file mode 100644
index 0a54ae957f04..000000000000
--- a/app-containers/buildah/buildah-1.33.6.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module linux-info
-
-DESCRIPTION="A tool that facilitates building OCI images"
-HOMEPAGE="https://github.com/containers/buildah"
-
-# main pkg
-LICENSE="Apache-2.0"
-# deps
-LICENSE+=" BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
-
-SLOT="0"
-IUSE="apparmor btrfs +seccomp systemd doc test"
-RESTRICT="test"
-EXTRA_DOCS=(
-	"CHANGELOG.md"
-	"CONTRIBUTING.md"
-	"install.md"
-	"troubleshooting.md"
-	"docs/tutorials"
-)
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/containers/buildah.git"
-else
-	SRC_URI="https://github.com/containers/buildah/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 arm64"
-fi
-
-RDEPEND="
-	systemd? ( sys-apps/systemd )
-	btrfs? ( sys-fs/btrfs-progs )
-	seccomp? ( sys-libs/libseccomp:= )
-	apparmor? ( sys-libs/libapparmor:= )
-	app-containers/containers-common
-	app-crypt/gpgme:=
-	dev-libs/libgpg-error:=
-	dev-libs/libassuan:=
-	sys-apps/shadow:=
-"
-DEPEND="${RDEPEND}"
-
-pkg_pretend() {
-	local CONFIG_CHECK=""
-	use btrfs && CONFIG_CHECK+=" ~BTRFS_FS"
-	check_extra_config
-
-	linux_config_exists || ewarn "Cannot determine configuration of your kernel."
-}
-
-src_prepare() {
-	default
-
-	# ensure all  necessary files are there
-	local file
-	for file in docs/Makefile hack/libsubid_tag.sh hack/apparmor_tag.sh \
-		hack/systemd_tag.sh btrfs_installed_tag.sh btrfs_tag.sh; do
-		[[ -f "${file}" ]] || die
-	done
-
-	sed -i -e "s|/usr/local|/usr|g" Makefile docs/Makefile || die
-	echo -e '#!/usr/bin/env bash\necho libsubid' > hack/libsubid_tag.sh || die
-
-	cat <<-EOF > hack/apparmor_tag.sh || die
-	#!/usr/bin/env bash
-	$(usex apparmor 'echo apparmor' echo)
-	EOF
-
-	use seccomp || {
-		cat <<-'EOF' > "${T}/disable_seccomp.patch"
-		 --- a/Makefile
-		 +++ b/Makefile
-		 @@ -5 +5 @@
-		 -SECURITYTAGS ?= seccomp $(APPARMORTAG)
-		 +SECURITYTAGS ?= $(APPARMORTAG)
-		EOF
-		eapply "${T}/disable_seccomp.patch" || die
-	}
-
-	cat <<-EOF > hack/systemd_tag.sh || die
-	#!/usr/bin/env bash
-	$(usex systemd 'echo systemd' echo)
-	EOF
-
-	echo -e "#!/usr/bin/env bash\n echo" > btrfs_installed_tag.sh || die
-	cat <<-EOF > btrfs_tag.sh || die
-	#!/usr/bin/env bash
-	$(usex btrfs echo 'echo exclude_graphdriver_btrfs btrfs_noversion')
-	EOF
-
-	use test || {
-		cat <<-'EOF' > "${T}/disable_tests.patch"
-		--- a/Makefile
-		+++ b/Makefile
-		@@ -54 +54 @@
-		-all: bin/buildah bin/imgtype bin/copy bin/tutorial docs
-		+all: bin/buildah docs
-		EOF
-		eapply "${T}/disable_tests.patch" || die
-	}
-
-}
-
-src_compile() {
-	# For non-live versions, prevent git operations which causes sandbox violations
-	# https://github.com/gentoo/gentoo/pull/33531#issuecomment-1786107493
-	[[ ${PV} != 9999* ]] && export COMMIT_NO="" GIT_COMMIT=""
-
-	default
-}
-
-src_test() {
-	emake test-unit
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install install.completions
-	einstalldocs
-	use doc && dodoc -r "${EXTRA_DOCS[@]}"
-}
diff --git a/app-containers/buildah/buildah-1.33.7.ebuild b/app-containers/buildah/buildah-1.33.7.ebuild
index 60b99c3a6057..a24bd18a767c 100644
--- a/app-containers/buildah/buildah-1.33.7.ebuild
+++ b/app-containers/buildah/buildah-1.33.7.ebuild
@@ -60,15 +60,16 @@ src_prepare() {
 	cat <<'EOF' > "${T}/dont-call-as-directly-upstream-pr-5436.patch"
 --- a/Makefile
 +++ b/Makefile
-@@ -10,6 +10,7 @@
+@@ -10,6 +10,8 @@
  BASHINSTALLDIR = $(PREFIX)/share/bash-completion/completions
  BUILDFLAGS := -tags "$(BUILDTAGS)"
  BUILDAH := buildah
 +AS ?= as
++STRIP ?= strip
 
  GO := go
  GO_LDFLAGS := $(shell if $(GO) version|grep -q gccgo; then echo "-gccgoflags"; else echo "-ldflags"; fi)
-@@ -72,7 +73,7 @@
+@@ -72,11 +74,11 @@
  bin/buildah: $(SOURCES) cmd/buildah/*.go internal/mkcw/embed/entrypoint.gz
 	$(GO_BUILD) $(BUILDAH_LDFLAGS) $(GO_GCFLAGS) "$(GOGCFLAGS)" -o $@ $(BUILDFLAGS) ./cmd/buildah
 
@@ -77,6 +78,11 @@ src_prepare() {
  internal/mkcw/embed/entrypoint: internal/mkcw/embed/entrypoint.s
 	$(AS) -o $(patsubst %.s,%.o,$^) $^
 	$(LD) -o $@ $(patsubst %.s,%.o,$^)
+-	strip $@
++	$(STRIP) $@
+ else
+ .PHONY: internal/mkcw/embed/entrypoint
+ endif
 EOF
 
 	default
@@ -139,7 +145,7 @@ src_compile() {
 	# https://github.com/gentoo/gentoo/pull/33531#issuecomment-1786107493
 	[[ ${PV} != 9999* ]] && export COMMIT_NO="" GIT_COMMIT=""
 
-	tc-export AS LD
+	tc-export AS LD STRIP
 	export GOMD2MAN="$(command -v go-md2man)"
 	default
 }
diff --git a/app-containers/buildah/buildah-1.34.0.ebuild b/app-containers/buildah/buildah-1.34.0.ebuild
deleted file mode 100644
index 6237903cb5cc..000000000000
--- a/app-containers/buildah/buildah-1.34.0.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module linux-info
-
-DESCRIPTION="A tool that facilitates building OCI images"
-HOMEPAGE="https://github.com/containers/buildah"
-
-# main pkg
-LICENSE="Apache-2.0"
-# deps
-LICENSE+=" BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
-
-SLOT="0"
-IUSE="apparmor btrfs +seccomp systemd doc test"
-RESTRICT="test"
-EXTRA_DOCS=(
-	"CHANGELOG.md"
-	"CONTRIBUTING.md"
-	"install.md"
-	"troubleshooting.md"
-	"docs/tutorials"
-)
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/containers/buildah.git"
-else
-	SRC_URI="https://github.com/containers/buildah/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	# KEYWORDS="amd64 arm64"
-fi
-
-RDEPEND="
-	systemd? ( sys-apps/systemd )
-	btrfs? ( sys-fs/btrfs-progs )
-	seccomp? ( sys-libs/libseccomp:= )
-	apparmor? ( sys-libs/libapparmor:= )
-	app-containers/containers-common
-	app-crypt/gpgme:=
-	dev-libs/libgpg-error:=
-	dev-libs/libassuan:=
-	sys-apps/shadow:=
-"
-DEPEND="${RDEPEND}"
-
-pkg_pretend() {
-	local CONFIG_CHECK=""
-	use btrfs && CONFIG_CHECK+=" ~BTRFS_FS"
-	check_extra_config
-
-	linux_config_exists || ewarn "Cannot determine configuration of your kernel."
-}
-
-src_prepare() {
-	default
-
-	# ensure all  necessary files are there
-	local file
-	for file in docs/Makefile hack/libsubid_tag.sh hack/apparmor_tag.sh \
-		hack/systemd_tag.sh btrfs_installed_tag.sh btrfs_tag.sh; do
-		[[ -f "${file}" ]] || die
-	done
-
-	sed -i -e "s|/usr/local|/usr|g" Makefile docs/Makefile || die
-	echo -e '#!/usr/bin/env bash\necho libsubid' > hack/libsubid_tag.sh || die
-
-	cat <<-EOF > hack/apparmor_tag.sh || die
-	#!/usr/bin/env bash
-	$(usex apparmor 'echo apparmor' echo)
-	EOF
-
-	use seccomp || {
-		cat <<-'EOF' > "${T}/disable_seccomp.patch"
-		 --- a/Makefile
-		 +++ b/Makefile
-		 @@ -5 +5 @@
-		 -SECURITYTAGS ?= seccomp $(APPARMORTAG)
-		 +SECURITYTAGS ?= $(APPARMORTAG)
-		EOF
-		eapply "${T}/disable_seccomp.patch" || die
-	}
-
-	cat <<-EOF > hack/systemd_tag.sh || die
-	#!/usr/bin/env bash
-	$(usex systemd 'echo systemd' echo)
-	EOF
-
-	echo -e "#!/usr/bin/env bash\n echo" > btrfs_installed_tag.sh || die
-	cat <<-EOF > btrfs_tag.sh || die
-	#!/usr/bin/env bash
-	$(usex btrfs echo 'echo exclude_graphdriver_btrfs btrfs_noversion')
-	EOF
-
-	use test || {
-		cat <<-'EOF' > "${T}/disable_tests.patch"
-		--- a/Makefile
-		+++ b/Makefile
-		@@ -54 +54 @@
-		-all: bin/buildah bin/imgtype bin/copy bin/tutorial docs
-		+all: bin/buildah docs
-		EOF
-		eapply "${T}/disable_tests.patch" || die
-	}
-
-}
-
-src_compile() {
-	# For non-live versions, prevent git operations which causes sandbox violations
-	# https://github.com/gentoo/gentoo/pull/33531#issuecomment-1786107493
-	[[ ${PV} != 9999* ]] && export COMMIT_NO="" GIT_COMMIT=""
-
-	default
-}
-
-src_test() {
-	emake test-unit
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install install.completions
-	einstalldocs
-	use doc && dodoc -r "${EXTRA_DOCS[@]}"
-}
diff --git a/app-containers/buildah/buildah-1.34.3.ebuild b/app-containers/buildah/buildah-1.34.3.ebuild
index 4b82e782d4f3..cc06bf2ff42d 100644
--- a/app-containers/buildah/buildah-1.34.3.ebuild
+++ b/app-containers/buildah/buildah-1.34.3.ebuild
@@ -60,15 +60,16 @@ src_prepare() {
 	cat <<'EOF' > "${T}/dont-call-as-directly-upstream-pr-5436.patch"
 --- a/Makefile
 +++ b/Makefile
-@@ -10,6 +10,7 @@
+@@ -14,6 +14,8 @@
  BASHINSTALLDIR = $(PREFIX)/share/bash-completion/completions
  BUILDFLAGS := -tags "$(BUILDTAGS)"
  BUILDAH := buildah
 +AS ?= as
++STRIP ?= strip
 
  GO := go
  GO_LDFLAGS := $(shell if $(GO) version|grep -q gccgo; then echo "-gccgoflags"; else echo "-ldflags"; fi)
-@@ -77,7 +77,7 @@
+@@ -76,14 +78,14 @@
  bin/buildah: $(SOURCES) cmd/buildah/*.go internal/mkcw/embed/entrypoint_amd64.gz
 	$(GO_BUILD) $(BUILDAH_LDFLAGS) $(GO_GCFLAGS) "$(GOGCFLAGS)" -o $@ $(BUILDFLAGS) ./cmd/buildah
 
@@ -76,6 +77,13 @@ src_prepare() {
 +ifneq ($(shell $(AS) --version | grep x86_64),)
  internal/mkcw/embed/entrypoint_amd64.gz: internal/mkcw/embed/entrypoint_amd64
 	gzip -k9nf $^
+
+ internal/mkcw/embed/entrypoint_amd64: internal/mkcw/embed/entrypoint_amd64.s
+	$(AS) -o $(patsubst %.s,%.o,$^) $^
+	$(LD) -o $@ $(patsubst %.s,%.o,$^)
+-	strip $@
++	$(STRIP) $@
+ endif
 EOF
 
 	default
@@ -138,7 +146,7 @@ src_compile() {
 	# https://github.com/gentoo/gentoo/pull/33531#issuecomment-1786107493
 	[[ ${PV} != 9999* ]] && export COMMIT_NO="" GIT_COMMIT=""
 
-	tc-export AS LD
+	tc-export AS LD STRIP
 	export GOMD2MAN="$(command -v go-md2man)"
 	default
 }
diff --git a/app-containers/buildah/buildah-1.35.1.ebuild b/app-containers/buildah/buildah-1.35.1.ebuild
deleted file mode 100644
index b0b39faf03cb..000000000000
--- a/app-containers/buildah/buildah-1.35.1.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module linux-info toolchain-funcs
-
-DESCRIPTION="A tool that facilitates building OCI images"
-HOMEPAGE="https://github.com/containers/buildah"
-
-# main pkg
-LICENSE="Apache-2.0"
-# deps
-LICENSE+=" BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0"
-
-SLOT="0"
-IUSE="apparmor btrfs +seccomp systemd test"
-RESTRICT="test"
-DOCS=(
-	"CHANGELOG.md"
-	"troubleshooting.md"
-	"docs/tutorials"
-)
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/containers/buildah.git"
-else
-	SRC_URI="https://github.com/containers/buildah/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64"
-fi
-
-RDEPEND="
-	systemd? ( sys-apps/systemd )
-	btrfs? ( sys-fs/btrfs-progs )
-	seccomp? ( sys-libs/libseccomp:= )
-	apparmor? ( sys-libs/libapparmor:= )
-	>=app-containers/containers-common-0.58.0-r1
-	app-crypt/gpgme:=
-	dev-libs/libgpg-error:=
-	dev-libs/libassuan:=
-	sys-apps/shadow:=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-go/go-md2man"
-
-PATCHES=(
-	"${FILESDIR}"/dont-call-as-directly-upstream-pr-5436.patch
-)
-
-pkg_pretend() {
-	local CONFIG_CHECK=""
-	use btrfs && CONFIG_CHECK+=" ~BTRFS_FS"
-	check_extra_config
-
-	linux_config_exists || ewarn "Cannot determine configuration of your kernel."
-}
-
-src_prepare() {
-	default
-
-	# ensure all  necessary files are there
-	local file
-	for file in docs/Makefile hack/libsubid_tag.sh hack/apparmor_tag.sh \
-		hack/systemd_tag.sh btrfs_installed_tag.sh btrfs_tag.sh; do
-		[[ -f "${file}" ]] || die
-	done
-
-	sed -i -e "s|/usr/local|/usr|g" Makefile docs/Makefile || die
-	echo -e '#!/usr/bin/env bash\necho libsubid' > hack/libsubid_tag.sh || die
-
-	cat <<-EOF > hack/apparmor_tag.sh || die
-	#!/usr/bin/env bash
-	$(usex apparmor 'echo apparmor' echo)
-	EOF
-
-	use seccomp || {
-		cat <<-'EOF' > "${T}/disable_seccomp.patch"
-		 --- a/Makefile
-		 +++ b/Makefile
-		 @@ -5 +5 @@
-		 -SECURITYTAGS ?= seccomp $(APPARMORTAG)
-		 +SECURITYTAGS ?= $(APPARMORTAG)
-		EOF
-		eapply "${T}/disable_seccomp.patch" || die
-	}
-
-	cat <<-EOF > hack/systemd_tag.sh || die
-	#!/usr/bin/env bash
-	$(usex systemd 'echo systemd' echo)
-	EOF
-
-	echo -e "#!/usr/bin/env bash\n echo" > btrfs_installed_tag.sh || die
-	cat <<-EOF > btrfs_tag.sh || die
-	#!/usr/bin/env bash
-	$(usex btrfs echo 'echo exclude_graphdriver_btrfs btrfs_noversion')
-	EOF
-
-	use test || {
-		cat <<-'EOF' > "${T}/disable_tests.patch"
-		--- a/Makefile
-		+++ b/Makefile
-		@@ -54 +54 @@
-		-all: bin/buildah bin/imgtype bin/copy bin/tutorial docs
-		+all: bin/buildah docs
-		@@ -123 +123 @@
-		-docs: install.tools ## build the docs on the host
-		+docs: ## build the docs on the host
-		EOF
-		eapply "${T}/disable_tests.patch" || die
-	}
-
-}
-
-src_compile() {
-	# For non-live versions, prevent git operations which causes sandbox violations
-	# https://github.com/gentoo/gentoo/pull/33531#issuecomment-1786107493
-	[[ ${PV} != 9999* ]] && export COMMIT_NO="" GIT_COMMIT=""
-
-	tc-export AS LD
-	export GOMD2MAN="$(command -v go-md2man)"
-	default
-}
-
-src_test() {
-	emake test-unit
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install install.completions
-	einstalldocs
-}
diff --git a/app-containers/buildah/buildah-1.35.3.ebuild b/app-containers/buildah/buildah-1.35.3.ebuild
index b0b39faf03cb..e1c7e23390e5 100644
--- a/app-containers/buildah/buildah-1.35.3.ebuild
+++ b/app-containers/buildah/buildah-1.35.3.ebuild
@@ -46,6 +46,7 @@ BDEPEND="dev-go/go-md2man"
 
 PATCHES=(
 	"${FILESDIR}"/dont-call-as-directly-upstream-pr-5436.patch
+	"${FILESDIR}"/softcode-strip-upstream-pr-5446.patch
 )
 
 pkg_pretend() {
@@ -117,7 +118,7 @@ src_compile() {
 	# https://github.com/gentoo/gentoo/pull/33531#issuecomment-1786107493
 	[[ ${PV} != 9999* ]] && export COMMIT_NO="" GIT_COMMIT=""
 
-	tc-export AS LD
+	tc-export AS LD STRIP
 	export GOMD2MAN="$(command -v go-md2man)"
 	default
 }
diff --git a/app-containers/buildah/buildah-9999.ebuild b/app-containers/buildah/buildah-9999.ebuild
index b0b39faf03cb..987715de5560 100644
--- a/app-containers/buildah/buildah-9999.ebuild
+++ b/app-containers/buildah/buildah-9999.ebuild
@@ -45,7 +45,7 @@ DEPEND="${RDEPEND}"
 BDEPEND="dev-go/go-md2man"
 
 PATCHES=(
-	"${FILESDIR}"/dont-call-as-directly-upstream-pr-5436.patch
+	"${FILESDIR}"/softcode-strip-upstream-pr-5446.patch
 )
 
 pkg_pretend() {
@@ -117,7 +117,7 @@ src_compile() {
 	# https://github.com/gentoo/gentoo/pull/33531#issuecomment-1786107493
 	[[ ${PV} != 9999* ]] && export COMMIT_NO="" GIT_COMMIT=""
 
-	tc-export AS LD
+	tc-export AS LD STRIP
 	export GOMD2MAN="$(command -v go-md2man)"
 	default
 }
diff --git a/app-containers/buildah/files/softcode-strip-upstream-pr-5446.patch b/app-containers/buildah/files/softcode-strip-upstream-pr-5446.patch
new file mode 100644
index 000000000000..0ca0a6602a7d
--- /dev/null
+++ b/app-containers/buildah/files/softcode-strip-upstream-pr-5446.patch
@@ -0,0 +1,29 @@
+commit 2cd31a0698bea846366e8e153619a108484a1a2a
+Author: Rahil Bhimjiani <me@rahil.rocks>
+Date:   Mon Apr 1 09:25:21 2024 +0530
+
+    Makefile: softcode `strip`, use it from env var
+    
+    Signed-off-by: Rahil Bhimjiani <me@rahil.rocks>
+
+diff --git a/Makefile b/Makefile
+index 7d27a4153..3a955c85a 100644
+--- a/Makefile
++++ b/Makefile
+@@ -17,6 +17,7 @@ BUILDAH := buildah
+ SELINUXOPT ?= $(shell test -x /usr/sbin/selinuxenabled && selinuxenabled && echo -Z)
+ SELINUXTYPE=container_runtime_exec_t
+ AS ?= as
++STRIP ?= strip
+ 
+ GO := go
+ GO_LDFLAGS := $(shell if $(GO) version|grep -q gccgo; then echo "-gccgoflags"; else echo "-ldflags"; fi)
+@@ -87,7 +88,7 @@ internal/mkcw/embed/entrypoint_amd64.gz: internal/mkcw/embed/entrypoint_amd64
+ internal/mkcw/embed/entrypoint_amd64: internal/mkcw/embed/entrypoint_amd64.s
+ 	$(AS) -o $(patsubst %.s,%.o,$^) $^
+ 	$(LD) -o $@ $(patsubst %.s,%.o,$^)
+-	strip $@
++	$(STRIP) $@
+ endif
+ 
+ 
diff --git a/app-containers/podman/Manifest b/app-containers/podman/Manifest
index e86a925b0157..8a86768eca75 100644
--- a/app-containers/podman/Manifest
+++ b/app-containers/podman/Manifest
@@ -5,8 +5,6 @@ AUX podman-clean-transient-5.0.0_rc6.confd 235 BLAKE2B 25100f79c09c4ea388be27ed5
 AUX podman-clean-transient-5.0.0_rc6.initd 669 BLAKE2B db5f35d6918ea12afd2bc6ef1eb9b855faa259a7abe9a49895892e40576558996317ae0189b80d1d2fea978848e35bfbadf1635cef112bd96bfeb75ecf34cdb3 SHA512 95c07cd6bc1bba7ce9bb0e111d74d9625c7f7e88667f709852056206e9483d96283ad2f13710e99bc5c3573bdb1b0c7585a7254760b91b7eec5b5a868d849e61
 AUX podman-restart-5.0.0_rc4.confd 284 BLAKE2B e2e5394428d95e9fa480f32ef3efcddc870394e8f5158fbcfe80434aca6c0a48bc1a4a5b7bdcf91e5313121be7f50f5e924a3a2084767e84d6bf045819121711 SHA512 99818e90a04ebdfa2ca8fbf8b4971025cae27807a0f2288f267c60e875f38cac4d189a72248861507189aa3a1e05f7c81d663f96ddac6a7e11edebf5f18baea1
 AUX podman-restart-5.0.0_rc4.initd 641 BLAKE2B c62aa18fe0da2d00032f09bc2e23debfc916c12a9ebdd22666c000c09242140b592fb08f1e961cf2dc66eb9eeb6ddaf7336713574fb2708620588904168ded51 SHA512 b947c3f6e3dc4d58008c16c7bc77306877b7375334eeb96a714541c8534bcb4ca25d85e2204af96a3d14471b966c0b59542694777b907dddeff15f8995889a2c
-AUX podman.confd 328 BLAKE2B e03a1f7f5cec555f195bd1ca9bea050a67ccac7866bd68f0c74dcbd3a6629b2da6f368274b4b664eaaa410773337a1f352c3144c3682ea0ea56b8c958b9d00a6 SHA512 58b05b7ff574f2153d7eeb3f726808e22ebe0821afc4d86dc3dea189944cdd6f2d6e1b051046456e149505b4b558a7957a278c1dba21db2fec65f2efbb3e1d84
-AUX podman.initd 704 BLAKE2B 2fc4ffaa3b971774957ea244e05d851fa2797ec074529ea7c23bc6d7a3f597c04268d7f5580852dae4ab412629a513fed152f6a20a7ed432ef00cb96848c290c SHA512 bcf3e74a4a77bac82fc4679b3161091692b301426ecf81af7c5ea7e23ba66d15602d0cf1284f160d4179e52ae78f309ad826d9f3698dfcb78c2be2c6ac51417c
 AUX podman.logrotated 85 BLAKE2B 730899f93ee354e476629276b69224cfeaaa1603b6690cac3c0cd905cd75add19179f99e26f29edbd963d5f44c38a3a2db0b5a3613dc665ab801654eac13dc2e SHA512 0136d063b15b07c41a9370ba1845c4f368ec46a7a30683b7ff7cbb0b12e5b2711c9a45329f5102af6a969e562edcec006a8de9055e43e1caf9395847d0c5ec45
 AUX seccomp-toggle-4.7.0.patch 400 BLAKE2B 9f02e58c06b507a294207c66bd5ea218f87803a9b9f0ddafc86a8b21df912589357adf054302e5a69d300155bdf8dcd8b77c18c1ddf8a4042ae1f05de5faf46d SHA512 e507e3a52d2f5f48b65fdb77ceaa095f13fda3e834dafc976bcd291cb35755da879c9c99b7950b2905399dedf4ac3370bd70462343648613a7c6aedc141d7ef7
 DIST podman-4.9.4.tar.gz 21733620 BLAKE2B 17d099c0a13fbbb77556742313c39995127fc97b4086ef3c2d74a92cc0a4f825a6c729dd099c6d4f4cd3d2ebfd470494babdeaa85a5653b327ea1a16fb5ea993 SHA512 7b52555789a1c214fcf26b0826bdda6cf0ccca588f87c0f15ac5e8358ddac625e17cafbe6a43de07cad964e1418b5ee0d2e38a5cb5dc6f6d4e638399749a7f7b
diff --git a/app-containers/podman/files/podman.confd b/app-containers/podman/files/podman.confd
deleted file mode 100644
index e997d3b4000e..000000000000
--- a/app-containers/podman/files/podman.confd
+++ /dev/null
@@ -1,11 +0,0 @@
-# Config file for /etc/init.d/podman
-
-# Sets the API service daemon log level
-# valid levels: debug, info, warn, error, fatal or panic
-#LOG_LEVEL="error"
-
-# Sets the API service daemon socket
-#SOCKET="unix:/run/${RC_SVCNAME}/podman.sock"
-
-# Configure the user[:group] the API service daemon will run as
-#RUN_AS_USER="root:root"
diff --git a/app-containers/podman/files/podman.initd b/app-containers/podman/files/podman.initd
deleted file mode 100644
index 7adcdab40ea3..000000000000
--- a/app-containers/podman/files/podman.initd
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 2015-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-description="Podman Remote API Service"
-LOG_PATH="/var/log/${RC_SVCNAME}"
-RUN_PATH="/run/${RC_SVCNAME}"
-: ${LOG_LEVEL:=error}
-: ${RUN_AS_USER:=root:root}
-: ${SOCKET:=unix:/run/${RC_SVCNAME}/podman.sock}
-pidfile="${RUN_PATH}/${RC_SVCNAME}.pid"
-command="/usr/bin/podman"
-command_args="--log-level ${LOG_LEVEL} system service -t 0 ${SOCKET}"
-command_background="true"
-start_stop_daemon_args="--stdout ${LOG_PATH}/${RC_SVCNAME}.log --stderr ${LOG_PATH}/${RC_SVCNAME}.log --user ${RUN_AS_USER}"
-
-start() {
-	checkpath -o "${RUN_AS_USER}" -d "${RUN_PATH}" "${LOG_PATH}"
-	default_start
-}
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index fefe48400059..9ce32ba829ca 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 4835b30e2fbf..30081b95aef6 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -21,7 +21,7 @@ EBUILD emacs-27.2-r15.ebuild 14571 BLAKE2B 7845f109d6a7d5b57d23122b7d71995d76fe2
 EBUILD emacs-28.2-r10.ebuild 17448 BLAKE2B 2a7c5398eb3cecdea919a0b749fbdde75d6b446dd244f65678294900771b6c9e56c65e1f3b4f34716fe43aa4551f1a64b5fc721b2941ea7d4e296d84748f535b SHA512 cfac978dbd2cbd38175359c7815858a79093e3b5535ceb559485cff2b4bc63089f7c0ae16f8f2ba4555ab44ed38eaad68e5813c7f5a91f3cf4054bca60ca3187
 EBUILD emacs-28.2-r11.ebuild 17453 BLAKE2B ce3e23123d5a27cdb3a6d7027e1bc3b360bcba9139f1a5861edcc7f3584dbde5ce14cc40d44885e877f80aa4e81d7e5682fb9fc7200063edc2a082c118845693 SHA512 8a018c16799e3886981d1168f1746e92a9661542a087b9f32ae74828dd4b5931267e6b1b0c3be030132d025ea0ec430ade3963fa3b96ce84e9ce8a9e34981384
 EBUILD emacs-29.2-r1.ebuild 19929 BLAKE2B c013480b13805fedc680bd0ecd66bfbfca0173409519ead8c4ef5e9805bc7316f856940f0ce07a0931973f5ec50eec5f3cac9e1b2cbe6f1ce885a34305b1c723 SHA512 169a8c83195e34bbc634d3caa0dbbfe752f6af2a62b6a0e1e51f476e992ec34333725b89826e55be4f008c8e1399b4bb66a960d4a58bff98474cfd629aefe636
-EBUILD emacs-29.3.9999.ebuild 19516 BLAKE2B 2bcc3a37fdded6cac5b1bf7c3a1f7692acfdf9258236da9ac82d093736afb6b444cd1aa0fa7ff57eb97ed2b8471c469cc3d7490d8d667d5748f704e29d6f930c SHA512 e1f0d6332abc41096c06da8d5105b617080cfedfb19c0079150f7ac5e1ad8458bcf339aa012bcb6be382831931813b0f32a18f63a266b059d0bb9db21ce9b7e0
-EBUILD emacs-29.3.ebuild 19930 BLAKE2B 8b3b08a8938963c6652433ec475bb988c241fb415c86f25e35726a389b7628e543bcb65a301832656acfe0d36d7f8a05a67131553a3b0e6e3fcedbde42cf8dfe SHA512 4f53a627aa4523e56784d0d24c1b7ddfab6c790a729d6e946abc2b206c1ddcbc751058eb28d584235fcc9e1becc3f7f19c735e40ef586561ad0d421652a597fc
-EBUILD emacs-30.0.9999.ebuild 19582 BLAKE2B a61b9ccd90902461ce120be9fc8630af4cf7f862221fb0fd70c0be2797b5e895e11a4d10302367748269372c32ea7fcf13e929b21dab6ab06ead25dd15074fd9 SHA512 dfdad43ba13bf9e59be15ed7147278982f6c75e3c51c10893ce6b3b41dc72b2cf2c358f44823892913ed44257092e26565d7dcd83169c0f011f5f6aec6a2c57a
+EBUILD emacs-29.3.9999.ebuild 19945 BLAKE2B fb593e5e5e2a11b44b60f627f278f38c005f0bfb5fd3aa97034097a963270bca0832b26abdeaaa9e245e039e8370b4eb60cf5e6b73c32c423f7e286815e9f713 SHA512 cc76d3d973ca04dac441904f99e39cd252ace69d2c1af94d3c988e06489ca9ae782cf88a5962b3e05547a36b6f98da0d52dab16eb2ca5e7da28409f40f20b579
+EBUILD emacs-29.3.ebuild 20359 BLAKE2B ca2d2d5b2a9b2914093ff683225996f5fb302fb524f33d3adf4a43d7c07917d2a78aab7c65c2fa8441f8a8674bb6f3d0903ad72cbabd2ef04b2f29dfde66de94 SHA512 387a47491d04c6f817a3b25b7ef56545bf559aed478f953b11242611e9ad4895931b78efa45250e7fd37d0f18761cca83803bbbb78a9bc1bd107fcf4c000575f
+EBUILD emacs-30.0.9999.ebuild 20011 BLAKE2B 1a7ddfa346782aa3e7e30529f5ca227663546f546728540526d069e13e36ea5b6774e25c90d868d7cf0b530bb5d739ceaae5fe179137a75f95b780702f95cb63 SHA512 bf79e939b4d625782e382d61a96be0678b7d14a10d872f8bf605396a1361914ef6a50cf09627ae08fcb004cee681171f856a233f93e077d0444f3d60cad6a95c
 MISC metadata.xml 3265 BLAKE2B e4f61b7e8859672fe9798ebaae20d8fb490d4677db7be8a856f313f4dfd5f02b38623250ddc45cdab1f0d0b64b941b4874b95252c796e893d5a28e5a318277bc SHA512 4b79a448076ddee7de95dc2f1a999fb86295d04a20d016a9bb2fe8a038ee5424517ca8f1991a884a08ca52847191c83becb06fb7cb8d4bb2a609cf4b2e25d020
diff --git a/app-editors/emacs/emacs-29.3.9999.ebuild b/app-editors/emacs/emacs-29.3.9999.ebuild
index 61a66215f0bc..1aab6b584222 100644
--- a/app-editors/emacs/emacs-29.3.9999.ebuild
+++ b/app-editors/emacs/emacs-29.3.9999.ebuild
@@ -573,6 +573,14 @@ src_install() {
 			\"${EPREFIX}/Applications/Gentoo\". You may want to copy or
 			symlink it into /Applications by yourself."
 	fi
+	if ! use mailutils; then
+		DOC_CONTENTS+="\\n\\nThe mailutils USE flag is disabled. If Emacs'
+		own e-mail features are going to be used as an e-mail client
+		(e.g. Rmail), you are strongly encouraged to enable it. If not,
+		Emacs will use its own implementation of movemail; which has
+		fewer features and is less secure. For more information see:
+		https://www.gnu.org/software/emacs/manual/html_node/emacs/Movemail.html"
+	fi
 	tc-is-cross-compiler && DOC_CONTENTS+="\\n\\nEmacs did not write
 		a portable dump file due to being cross-compiled.
 		To create this file at run time, execute the following command:
diff --git a/app-editors/emacs/emacs-29.3.ebuild b/app-editors/emacs/emacs-29.3.ebuild
index 8260e939b153..c3b4ffc30b6b 100644
--- a/app-editors/emacs/emacs-29.3.ebuild
+++ b/app-editors/emacs/emacs-29.3.ebuild
@@ -586,6 +586,14 @@ src_install() {
 			\"${EPREFIX}/Applications/Gentoo\". You may want to copy or
 			symlink it into /Applications by yourself."
 	fi
+	if ! use mailutils; then
+		DOC_CONTENTS+="\\n\\nThe mailutils USE flag is disabled. If Emacs'
+		own e-mail features are going to be used as an e-mail client
+		(e.g. Rmail), you are strongly encouraged to enable it. If not,
+		Emacs will use its own implementation of movemail; which has
+		fewer features and is less secure. For more information see:
+		https://www.gnu.org/software/emacs/manual/html_node/emacs/Movemail.html"
+	fi
 	tc-is-cross-compiler && DOC_CONTENTS+="\\n\\nEmacs did not write
 		a portable dump file due to being cross-compiled.
 		To create this file at run time, execute the following command:
diff --git a/app-editors/emacs/emacs-30.0.9999.ebuild b/app-editors/emacs/emacs-30.0.9999.ebuild
index 89bb695cbae2..c6a0edb9e9b8 100644
--- a/app-editors/emacs/emacs-30.0.9999.ebuild
+++ b/app-editors/emacs/emacs-30.0.9999.ebuild
@@ -575,6 +575,14 @@ src_install() {
 			\"${EPREFIX}/Applications/Gentoo\". You may want to copy or
 			symlink it into /Applications by yourself."
 	fi
+	if ! use mailutils; then
+		DOC_CONTENTS+="\\n\\nThe mailutils USE flag is disabled. If Emacs'
+		own e-mail features are going to be used as an e-mail client
+		(e.g. Rmail), you are strongly encouraged to enable it. If not,
+		Emacs will use its own implementation of movemail; which has
+		fewer features and is less secure. For more information see:
+		https://www.gnu.org/software/emacs/manual/html_node/emacs/Movemail.html"
+	fi
 	tc-is-cross-compiler && DOC_CONTENTS+="\\n\\nEmacs did not write
 		a portable dump file due to being cross-compiled.
 		To create this file at run time, execute the following command:
diff --git a/dev-python/GitPython/GitPython-3.1.43.ebuild b/dev-python/GitPython/GitPython-3.1.43.ebuild
new file mode 100644
index 000000000000..68edb93079a7
--- /dev/null
+++ b/dev-python/GitPython/GitPython-3.1.43.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 pypi
+
+TEST_P=GitPython-${PV}
+GITDB_P=gitdb-4.0.11
+SMMAP_P=smmap-5.0.1
+
+DESCRIPTION="Library used to interact with Git repositories"
+HOMEPAGE="
+	https://github.com/gitpython-developers/GitPython/
+	https://pypi.org/project/GitPython/
+"
+SRC_URI+="
+	test? (
+		https://dev.gentoo.org/~mgorny/dist/${TEST_P}.gitbundle
+		https://dev.gentoo.org/~mgorny/dist/${GITDB_P}.gitbundle
+		https://dev.gentoo.org/~mgorny/dist/${SMMAP_P}.gitbundle
+	)
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-vcs/git
+	>=dev-python/gitdb-4.0.1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/ddt-1.1.1[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_test() {
+	git config --global user.email "travis@ci.com" || die
+	git config --global user.name "Travis Runner" || die
+
+	git clone "${DISTDIR}/${TEST_P}.gitbundle" "${T}"/test || die
+	git clone "${DISTDIR}/${GITDB_P}.gitbundle" \
+		"${T}"/test/git/ext/gitdb || die
+	git clone "${DISTDIR}/${SMMAP_P}.gitbundle" \
+		"${T}"/test/git/ext/gitdb/gitdb/ext/smmap || die
+
+	cd "${T}"/test || die
+	git rev-parse HEAD > .git/refs/remotes/origin/master || die
+	TRAVIS=1 ./init-tests-after-clone.sh || die
+	cat test/fixtures/.gitconfig >> ~/.gitconfig || die
+
+	distutils-r1_src_test
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# performance tests are unreliable by design
+		test/performance
+		# unimportant and problematic
+		test/test_installation.py
+		# Internet
+		test/test_quick_doc.py::QuickDoc::test_cloned_repo_object
+		# TODO
+		test/test_submodule.py::TestSubmodule::test_base_rw
+		test/test_submodule.py::TestSubmodule::test_root_module
+	)
+
+	epytest -o addopts= test
+}
diff --git a/dev-python/GitPython/Manifest b/dev-python/GitPython/Manifest
index 666d5b391fa3..bfd82c4c360f 100644
--- a/dev-python/GitPython/Manifest
+++ b/dev-python/GitPython/Manifest
@@ -1,6 +1,9 @@
 DIST GitPython-3.1.42.gitbundle 10271846 BLAKE2B 72023a523c0bf888d1fa356a303feff19e142018d7d21722510b7fff69174794feed8fdda84c6fc4c8738c551634924331e48eb82dac71d8c5ebcf145296f6bd SHA512 c7b5ce6bf4500f6350bd1b260317e235fb16d4b8d3dfce9849a845a96d466f61eba9d40f18a0c7d302718f856d08f9c50bde811cadedb78d1dd2ebddaf9cfe48
 DIST GitPython-3.1.42.tar.gz 203449 BLAKE2B 7c18cb6cf0cc10b3269889bd7f4b0c3b61fd0ed765b3723c5bdf331a6e030bdc76587ce1c8e3d8ca5d7cb003968b74c6079b466a6afd3326c418f16e81ed9291 SHA512 f83d5fadc5fbd4d7837d42bc78bc07a9609bb0a10f5938de8d6c88da91de5638fafd6df23e468f7c23c19e11b4fbf273c19858336791ff199997dbe4e1aec91e
+DIST GitPython-3.1.43.gitbundle 10674326 BLAKE2B c430e6fec138077502dce16a1a100459c30134af7865a2e228646791465a7176ee3ef4db5cc83081f56b5e9877aeb4ba7e54b0526d6c2f594520335db4b48e9e SHA512 8c4b2fdf2e382393420bee1cb19929171d72e72669ac3ef96ff112119d803775aae92a14908b9bd51873f102ab85dfadd940b0789da6179b0f99354ae4b6d469
+DIST GitPython-3.1.43.tar.gz 214149 BLAKE2B bc95520b839a43b88571678d7dadd3998a613a4e4f5b0e59f8740add7794767db2820e2d68a98940976ed27fa57b6e487895b1f3d2894b55f1d7f4e06757a461 SHA512 c193418bbb6ebb4f202c4f6aa95b731acf319d6560db176aa7126cf848a1f11eea9f432c4ff6812e8ddb5f8386b1fa5e10335fbf170f3ec3ac5fd2dcde783415
 DIST gitdb-4.0.11.gitbundle 1620355 BLAKE2B 8095193318d4262b8ebb04f35a0500eda8757057ed472dbaaece53e6afa6227e2b2c02a2be5daa5e4c0cc43dcbb5046555407d3d7c8dbed0bc5c415515032b8d SHA512 17e404b335a3c081f4058aeba5c57e5697a580f8ad7a280fde868968cf48f5a0852bfa45019eab730279582c0c536f8204e973d93af09da05908477329d73360
 DIST smmap-5.0.1.gitbundle 362567 BLAKE2B 72c8b48ad3250a33b94218c145c02033dee84c1da5f1eea57983a58699262d51844be675330d95c7d64924b6aeaacd4b0a57e9a5acad3be184aaad62102202e7 SHA512 9ca8386bfec25d1562cdf1c2ee85f7edb15fd3f44ecd1abbef738979f12b82f0b0f39a06589203a39f89518d981d7129e35f64f2d855cd162cd964bdd87c8d18
 EBUILD GitPython-3.1.42.ebuild 1982 BLAKE2B ed254e162832216e053463ce2098ab9f293b38cd8889842f06b75a3805728971dac5c878b83be6d0d48084f44fbf5eedc76cd764be5b76db4f8e0a52c55c8260 SHA512 f54bfaa505c67018a456192ffc594e27f3d4f38339af028c2746a95c254d594ca1199194238711651d45c6d8afa2f1225d79964135d4c6dcf6f068726d6589ff
+EBUILD GitPython-3.1.43.ebuild 1990 BLAKE2B 28e779bd4479ece31e983d54cfd26e4a214d8cb1490c73592306e530254aaabdba02588954b5ba8baf34c3fb3776c06799f82eb9c002de5ca8d4a0fa39c8f219 SHA512 327e67ba9088ed470a35e17f7d8c7cf988a1623d789101fee0d437155f4d9886e4e5f169e55e8dcf895615475c1619845d980906d1217a04e787de60d2db8648
 MISC metadata.xml 407 BLAKE2B 49fd8d520d575be1489c299f22595120fad882f055b9cf2d02b87382c6d8f0ff38af694e5584b4da579aa84b82c2f1032e4afb64cafd9f4fe9212a6d67b4a752 SHA512 1bebe1e134eb86a4745cf7e297d45118a2bdd3d8a71d0034294b5c799a9cee763c63b61b34c6707c52f61058f727f4b827dd020d285fc297712b29eb7c1129ef
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 821638f6c744..6066efdc5f06 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 1688f4e30210..f2b941b2a5f7 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -1,5 +1,7 @@
+DIST hypothesis-6.100.0.gh.tar.gz 9450559 BLAKE2B c26324339dfc770feb51de103227b58ea1be3deb0dc6c54a7ba6a7be6a719ab33503358978da2cc040a93af7c169238e7401ec9567d08c6b51889e42f29b7c7b SHA512 697ff894d1e1033f3f6f8d9d7a301d8874c61d340cac2746ede4a4c8a6b77d7b95044edc3a467c39e5d570f554f07eb7321eb5cfb9de4b648ce31b914ec491c4
 DIST hypothesis-6.98.18.gh.tar.gz 9434436 BLAKE2B 45861775caa1657d06469fc8cd0062aee1b408c3b02a58ff4d50b9de9ce62d8fd351c6b8f4b1b7f543fe70d6b8f2c663ad8e9252b833d5c567d3c28449fc3eaf SHA512 cff5cad9308e7b030e38f09a9544ed84f468bc4bd6391a2347777bb7781b116bd64f41338ad32535d427ebda507ce3f0f5bafc0af5a8179976c17d36762679e9
 DIST hypothesis-6.99.13.gh.tar.gz 9450425 BLAKE2B cb8d559d95c60a931640c978ad3ed4c9898cc048254f105f9cb79cd8e36c8b28712d48304b17f5a837a1fd69b88102461a057d5d9ea3786a846d61362137d426 SHA512 0d74dcb6c5d8015c8c660b66298a3053fce1ad04191f81b216a05b08f24fdaaccc7470937459614b95810dad4e37c4712da67eeff414ca50af1d1e5fa81b4d64
+EBUILD hypothesis-6.100.0.ebuild 2511 BLAKE2B ddc6dc2ecc80c134566b183ff0d4082338c658a96207732a22ea7a7bfa5bcd1d45d652688248896a8ee028e04350282f361423103e44202e36097d0fedab18fb SHA512 94bc6c8e3f80d6e2b6c8d89f124ac1ded58de4e18bd1dd405c9ca419e0a894b7684615fcbb645e430f44772588e12bebac012224a03df2bd2ab081dbc4eba936
 EBUILD hypothesis-6.98.18.ebuild 2735 BLAKE2B 6e20ed69d463f380603138fe5aa189f11e44a4891a1b4a8284b8af6f77c01e9b575ec9637c0696ceecef6e7d088709eb9a2bf8b627de3ca6767669673fc0eb69 SHA512 7fcbd5263774922c918f0d9778ab1cf702f4d5ddd6009237a73926c57aeed35fcef06eaf6775922a6119cb524343179350d5a5df6d1436faff8e8c5ac4d4cd20
 EBUILD hypothesis-6.99.13.ebuild 2511 BLAKE2B ddc6dc2ecc80c134566b183ff0d4082338c658a96207732a22ea7a7bfa5bcd1d45d652688248896a8ee028e04350282f361423103e44202e36097d0fedab18fb SHA512 94bc6c8e3f80d6e2b6c8d89f124ac1ded58de4e18bd1dd405c9ca419e0a894b7684615fcbb645e430f44772588e12bebac012224a03df2bd2ab081dbc4eba936
 MISC metadata.xml 492 BLAKE2B c9e9bbd59af55d1f47e5b7a86933c02b47f832122d03eaca56bd3ec9476cf260d91d4fd2da5068845d4525b7cc9f702b515e8d6a0dffa7923f5898cfd44e12a1 SHA512 166b33d6ac887f52d54fb9d556102038c00650a597d2de1c3aad3f8b5e136e9b6b7db31f05f3379435e4c5f943156d5839d78fc95461af411037a3162ea6705e
diff --git a/dev-python/hypothesis/hypothesis-6.100.0.ebuild b/dev-python/hypothesis/hypothesis-6.100.0.ebuild
new file mode 100644
index 000000000000..13d62b8d6bd1
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.100.0.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+CLI_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( "${CLI_COMPAT[@]}" pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 multiprocessing optfeature
+
+TAG=hypothesis-python-${PV}
+MY_P=hypothesis-${TAG}
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="
+	https://github.com/HypothesisWorks/hypothesis/
+	https://pypi.org/project/hypothesis/
+"
+SRC_URI="
+	https://github.com/HypothesisWorks/hypothesis/archive/${TAG}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/${MY_P}/hypothesis-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="cli"
+
+RDEPEND="
+	>=dev-python/attrs-22.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
+	' 3.9 3.10)
+	cli? (
+		$(python_gen_cond_dep '
+			dev-python/black[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+		' "${CLI_COMPAT[@]}")
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		>=dev-python/pytest-8[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		!!<dev-python/requests-toolbelt-0.10.1
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	# subtests are broken by warnings from random plugins
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=xdist.plugin,_hypothesis_pytestplugin
+	local -x HYPOTHESIS_NO_PLUGINS=1
+
+	# NB: paths need to be relative to pytest.ini,
+	# i.e. start with hypothesis-python/
+	local EPYTEST_DESELECT=()
+	case ${EPYTHON} in
+		pypy3)
+			EPYTEST_DESELECT+=(
+				# failing due to warnings from numpy/cython
+				hypothesis-python/tests/pytest/test_fixtures.py::test_given_plus_overridden_fixture
+			)
+			;;
+	esac
+
+	epytest -o filterwarnings= -n "$(makeopts_jobs)" --dist=worksteal \
+		tests/cover tests/pytest tests/quality
+}
+
+python_install() {
+	distutils-r1_python_install
+	if ! use cli || ! has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
+		rm -r "${ED}/usr/bin" "${D}$(python_get_scriptdir)" || die
+	fi
+}
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "dateutil support" dev-python/python-dateutil
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pandas support" dev-python/pandas
+	optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/trimesh/Manifest b/dev-python/trimesh/Manifest
index 16d9308873a7..80a557038733 100644
--- a/dev-python/trimesh/Manifest
+++ b/dev-python/trimesh/Manifest
@@ -2,8 +2,10 @@ DIST trimesh-4.1.8.gh.tar.gz 13440336 BLAKE2B aa4bddc3d613144a0e304ec320a2b38df2
 DIST trimesh-4.2.0.gh.tar.gz 13553809 BLAKE2B 141aec46cb8bf2342251a72e5e4c1fbee1e33e4ff63d420cfa4db1758fc324d572d54932ce1526ba2df75d9770f001d9dbe41a79835837931c4c46221fbb6871 SHA512 75efd00ef5ff8f9c25bdfb06ab92fa09db154771356b18ebcf457cba4c2f366645084eb078e5e324cfb41fe101797694aa6b00005f7ccd1290ba4d2d6c088ebd
 DIST trimesh-4.2.1.gh.tar.gz 13554447 BLAKE2B 02b75d8768963c250bbc1ebb75815567736a74b288da2a781b83fc3d31934059ebb85115c2e556a29da6c0e3034714226addba062d776acca4953414d1ed3492 SHA512 bdcd8436869849e8e8897732e0b9f8390d0771ea8dcadabb108ee8245d75c4d0ac915456473b6b0ed4f2f27fad48e123511e0bcfc79d485119376290c6f6d311
 DIST trimesh-4.2.3.gh.tar.gz 13554586 BLAKE2B 2c82690a17d8c62c80c99e87d9347ab85c14b2170fbdccc7967f893f6d83bed9aa2e38ef3f024567893d926511b34b20109bb94c8e976ced9d7a77190a653f14 SHA512 541438e5f5bd577af693bb238b308c7094b334530d7a962881e05db81331e1c896c82f76b0dcd4bfa17abcfec9eadf869bb0cad01e1402e99852c3ff2d184e5f
+DIST trimesh-4.2.4.gh.tar.gz 13554819 BLAKE2B 233f4d5404793ed1b5dc475da2dd371ca3a792239ae9ffea95ef3609a19b2701f66ad7aeb72b7b078b7a58d812ebe59b3bc12fedc6b9c34213c60378a2959d1c SHA512 3d37a429a21250a26f0a46c29c432b97158849bc0fbba7dec441bdd2453c4ef6a917483604f1c7ecb0e2415b9a270a80e36225cb951e59af1db54d20ebf60902
 EBUILD trimesh-4.1.8.ebuild 1950 BLAKE2B 3a3263575955b65379e291313fda8e2cf49086d52db45133bea9f23a1294a486230331577776cd88205d131c745db82b20a8426b7bae94c4bc28fc2cb2bf1fd4 SHA512 223dcdb5a6b9bd2cbeeafb6d4dcfdcb8edce16ddd08406f194799772427340fc167a227649ea9c6c28e5a72097a7d1bf7d8013d3bc4cb80abebdd13a55898de3
 EBUILD trimesh-4.2.0.ebuild 1952 BLAKE2B dfc4f8a737b468861e4a18b4d28a91a299b869bb2f236c1214230543b4f4f83ad773494a808eb63b2aca57bd82ec28a6ed7241c22bdca1b0ddf0ed5f8f4d0a4c SHA512 2c0531123d157cd0f3ddf4ee4da438ad06677d9549291ef0af0b08ff21819239ee152ee77651f8d770adca1f8dcf03b2070d63a6e844649ebe44c93b930abe13
 EBUILD trimesh-4.2.1.ebuild 1959 BLAKE2B b78d508c3f0691e454c7e93b6d7413f2ef9ebf86d2dc224cd1b1ecfeb710da08dfb2ade3f008ed0f11efc6e1e80e191239ea1ef2dd5a855155a5ecf65a995c2c SHA512 ceb7a80f34c3320198559c8d0637e5d38e56bb565a5a08fce6b2f267de558c23861a78ed54adfa5021f467e124ea759396b3a5317187379b8c1786793732b5ea
 EBUILD trimesh-4.2.3.ebuild 1959 BLAKE2B b78d508c3f0691e454c7e93b6d7413f2ef9ebf86d2dc224cd1b1ecfeb710da08dfb2ade3f008ed0f11efc6e1e80e191239ea1ef2dd5a855155a5ecf65a995c2c SHA512 ceb7a80f34c3320198559c8d0637e5d38e56bb565a5a08fce6b2f267de558c23861a78ed54adfa5021f467e124ea759396b3a5317187379b8c1786793732b5ea
+EBUILD trimesh-4.2.4.ebuild 1959 BLAKE2B b78d508c3f0691e454c7e93b6d7413f2ef9ebf86d2dc224cd1b1ecfeb710da08dfb2ade3f008ed0f11efc6e1e80e191239ea1ef2dd5a855155a5ecf65a995c2c SHA512 ceb7a80f34c3320198559c8d0637e5d38e56bb565a5a08fce6b2f267de558c23861a78ed54adfa5021f467e124ea759396b3a5317187379b8c1786793732b5ea
 MISC metadata.xml 495 BLAKE2B b8b403f7bfbac53ed234c2ba50324041502a28465d70e9406867f05741e0313845307491fcfd85f05e2993b21daf14117a4b6863b45422fd4c62c6e28902e3ff SHA512 3deec8ab4b513536a7fe182be8f1b96e06fd06b2480d3e516c2b3462cc26fcbdeb1d165b4d0297465e93c0cce584ab40a8f905b81a59dcb4040a39655028783d
diff --git a/dev-python/trimesh/trimesh-4.2.4.ebuild b/dev-python/trimesh/trimesh-4.2.4.ebuild
new file mode 100644
index 000000000000..1efbb5f219c0
--- /dev/null
+++ b/dev-python/trimesh/trimesh-4.2.4.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Python library for loading and using triangular meshes"
+HOMEPAGE="
+	https://trimesh.org/
+	https://github.com/mikedh/trimesh/
+	https://pypi.org/project/trimesh/
+"
+SRC_URI="
+	https://github.com/mikedh/${PN}/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/colorlog[${PYTHON_USEDEP}]
+	dev-python/httpx[${PYTHON_USEDEP}]
+	dev-python/jsonschema[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/networkx[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.20[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/pycollada[${PYTHON_USEDEP}]
+	dev-python/pyglet[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/shapely-1.8.2[${PYTHON_USEDEP}]
+	dev-python/svg-path[${PYTHON_USEDEP}]
+	dev-python/sympy[${PYTHON_USEDEP}]
+	dev-python/xxhash[${PYTHON_USEDEP}]
+	sci-libs/rtree[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mapbox_earcut[${PYTHON_USEDEP}]
+		dev-python/pillow[webp,${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_TIMEOUT=1800
+EPYTEST_XDIST=1
+distutils_enable_tests pytest
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
+
+pkg_postinst() {
+	optfeature_header "${PN} functionality can be extended by installing the following packages:"
+	optfeature "making GUI applications with 3D stuff" dev-python/glooey
+	optfeature "2D triangulations of polygons" dev-python/mapbox_earcut
+	optfeature "loading a number of additional mesh formats" dev-python/meshio
+	optfeature "figuring out how much memory we have" dev-python/psutil
+	optfeature "marching cubes and other nice stuff" dev-python/scikit-image
+}
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 078bfcf2d60a..0c543c396558 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/bindgen/Manifest b/dev-util/bindgen/Manifest
index 2cc6f972bb96..60b1d4d64824 100644
--- a/dev-util/bindgen/Manifest
+++ b/dev-util/bindgen/Manifest
@@ -93,5 +93,5 @@ DIST windows_x86_64_gnullvm-0.48.0.crate 366536 BLAKE2B 295dc3aef18c604d15799780
 DIST windows_x86_64_msvc-0.42.2.crate 666936 BLAKE2B bc3a456e7f8bc272f8978ec69506ec9d89f97b7582ebbe05d8bd57bdf8156ef62d0d2dc6137a97e81d54059d70db97a24af9a038adff357f5dfd28805d6193b5 SHA512 53a35f438903fceb59e36bd2ac331773fb8e6c8c5a6d984e79021761f91b3b4a23efe49d219667a4d0d23dcdbf906da9c24e74fb1cff93395b5c55ff524e3788
 DIST windows_x86_64_msvc-0.48.0.crate 671422 BLAKE2B abb063610dcc38581657133182b7d9efeed5553df67bd2bd6f30f1668a645186e4824f9ef556a5abc84ace10b1b437b6325bbda6df5a64ce880d7dcb743ac786 SHA512 6e598b8e3ac54912a8ebac01b0dd2c58fd282072527d7fedc7f6ebecdfb7dcb09ae46c22293bc0117849437f8b053db5e90406e7a38276f0f0afd06be3966795
 DIST yansi-term-0.1.2.crate 14342 BLAKE2B 31a1651bb43644cf880d591a22fe9d899ab0acbc744ced2952f120b4abfa0c42f6513089e34deaff1a453f3a26f9fb78442f016baa9524ccac9b21e4a7ed6ad6 SHA512 ba720e36487871427aaa7139e8aeaf5b2b3f2d1df4798d7e238e323dc3d3220f12202e223f74339201be3466848c372dc1712e1842e5cd6bd51c3dedf76c9ff6
-EBUILD bindgen-0.68.1.ebuild 2737 BLAKE2B 98a64d6511c11b5d1157dac5ad66e55504eff91cbf8f6dc74d16ec3f928ba96e9f319661da3da29fc57c982772ade798196a3f5d68f06ec2c696b7b031b95cd2 SHA512 7632ef3251faead158a2da670f0becaeec0781aa0c137e4bc3bb6ad8784b06fbe574bab37d479300011826c4ad13e8c2bf5cc14bc43a70d6c0c6b85c8a5d790a
+EBUILD bindgen-0.68.1.ebuild 2741 BLAKE2B 4b96861a1f99907ac4f6878e0cb875ba748124a85c96f01c95f1559c9b593c2261199e119a0f651cc68dd735d3b5715bde2d2037bdbfcb05093e54f3efaf56b5 SHA512 d127e3e0c73b463191f31424d30cd3aa25c8c0e6d6d1f88da13a69320619ee6189c63faa238c0a6b5975eb874d4645885efac22541b8979929aa6a0067706daf
 MISC metadata.xml 593 BLAKE2B e84dad03374ab90f8d3ea1248e3a4e44799aa63408505ab117b2f6e7064bfe1ca388c32f0cf2c52fb13d91ebde7d0677a22d1ac5bfc166fa6b86d9a781e26355 SHA512 820e8d517c9adc773061903ea62daaf2af28c9861498d6bdb8117866bf34d00276d87f0d17c17d5c75b9e3746c6dca871800341f75ab52ed34fef28bf2a7f207
diff --git a/dev-util/bindgen/bindgen-0.68.1.ebuild b/dev-util/bindgen/bindgen-0.68.1.ebuild
index 2994b1726701..3038e2d54da7 100644
--- a/dev-util/bindgen/bindgen-0.68.1.ebuild
+++ b/dev-util/bindgen/bindgen-0.68.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2023 Gentoo Authors
+# Copyright 2023-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Autogenerated by pycargoebuild 0.10
@@ -114,7 +114,7 @@ LICENSE="BSD"
 # Dependent crate licenses
 LICENSE+=" Apache-2.0 BSD ISC MIT Unicode-DFS-2016"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv"
 
 DEPEND="virtual/rust"
 RDEPEND="${DEPEND}
diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index 107196a726af..f041af0568cd 100644
--- a/games-strategy/Manifest.gz
+++ b/games-strategy/Manifest.gz
diff --git a/games-strategy/freeciv/Manifest b/games-strategy/freeciv/Manifest
index a49cf5f8d655..cf9feb381029 100644
--- a/games-strategy/freeciv/Manifest
+++ b/games-strategy/freeciv/Manifest
@@ -1,7 +1,5 @@
 AUX freeciv-3.1.0_beta4-fix-manpage-install-location.patch 882 BLAKE2B 7cbe60cf4753af0331541786679b80d8d14a95a8fb99d57b1c17c0e9690001aac2b8bc205a9225c755ca5c3ffc577af992a7bd6aaf2f37d6aa37be6d5b8460ed SHA512 e2f652a05368a885531e47421dfde993fac54850092db07834399d91c393c51e35f6662c9cd79d55bd470dbc81f211a2b393cd96768a6874c3b7b680de2ac366
-DIST freeciv-3.0.10.tar.xz 43433812 BLAKE2B c529b2039e38070fef4758f4d316cfe952dcce4d4a773e70da22f2a3948f0506be493b4af20529d80749b47954bdd87a7aca8efb72c5502fefb2c103977f4e12 SHA512 4082e94deeda8d9b90f04137d6e7dfd39ff7232225a910f47519a464db553891e42289c1d7738f9ee0d9a16db143669bf8c4c5ce9492a4455ccd99906c956192
-DIST freeciv-3.1.0_beta4.tar.gz 127725084 BLAKE2B f92c0aa75a47c165f808c761dc8e0a7cc76cafa722ef8d968ad69f379f2945774c811407f234df7ef22327c93dc2ec7b7765d0666bda249c573f57be3d03891a SHA512 b6864730583fe6dc17818813080132d6fa44c2adf8033a827b9a209f309c69e58bda41b8263a86006042a2e5f8bf99037e9d1d813a15ff1b9d48ec69b395f139
-EBUILD freeciv-3.0.10.ebuild 4969 BLAKE2B 4dd1aea15cbb2c636cc9d231e4ef50005a289f9f204aeff6fb3ac892f5f132e03ad72de00040285cb98f0cc65c85b515183f4de54ac1ae36a3737dc19f2372f3 SHA512 0d02f019e777bc8d1838e2bb0ae638e9e7d9ff6e34c0b332ea4b4156fe65bd9e71b518c3a210259e94e07a6a3c6c6a66c7a4ebbac0faebe55ad8483919af22db
-EBUILD freeciv-3.1.0_beta4.ebuild 5920 BLAKE2B a097b6afc92267c174981f2efca3c2525700f17d8267b412d66ec7c0ebd4b0a1888ba2f9d3d0ae38badde732ae884d4927c3e1a188d0ede052a02b85aa501199 SHA512 842200f491bbba8a9721e2eba8192f45d8d6a559000782c98a8bb16d5b0fd16ba5ee9a465be6974835c7ed153f3768a3bb681a502ee7bed8c0659daa49d5ae68
+DIST freeciv-3.1.0.tar.gz 127748997 BLAKE2B 75b3d1341d8ab09af244f07f3df5b1817571c4958a4296f37f35a105fe5a8e3d2e8d2e0dc7eb1d1aaf3d4a4c6574ba75355595134dc5a255535bc14c604bb99f SHA512 514d796a54466790a5ce0f2abb6fd8cb9c124a2f19ab33d48ce7a7f0d8d92096b54352a5d3655da852cdbd807baf4969467e04b82f687347bdff92e09f7aad86
+EBUILD freeciv-3.1.0.ebuild 5920 BLAKE2B a097b6afc92267c174981f2efca3c2525700f17d8267b412d66ec7c0ebd4b0a1888ba2f9d3d0ae38badde732ae884d4927c3e1a188d0ede052a02b85aa501199 SHA512 842200f491bbba8a9721e2eba8192f45d8d6a559000782c98a8bb16d5b0fd16ba5ee9a465be6974835c7ed153f3768a3bb681a502ee7bed8c0659daa49d5ae68
 EBUILD freeciv-9999.ebuild 5920 BLAKE2B a097b6afc92267c174981f2efca3c2525700f17d8267b412d66ec7c0ebd4b0a1888ba2f9d3d0ae38badde732ae884d4927c3e1a188d0ede052a02b85aa501199 SHA512 842200f491bbba8a9721e2eba8192f45d8d6a559000782c98a8bb16d5b0fd16ba5ee9a465be6974835c7ed153f3768a3bb681a502ee7bed8c0659daa49d5ae68
-MISC metadata.xml 1483 BLAKE2B 461882e444ee7c79299eb07a6d3ae55e48c2fa6589cc63fe9b6b0695a9c636c29a59f9da0e4bb904327b8ab31e12d67fcbd154a87d7b48c5aacf0ce89974e37d SHA512 24ea301ae8a7bc4aa54bb2d453406a76c220b5de51d6921e1fa71aa47e95a2194c1081c78c5daa5430e8ac2e18da2c21511c64a438c929c996cf12f17c705dae
+MISC metadata.xml 1298 BLAKE2B c744a6fa5ab5345aeafa4bea7edc493beee1ded63cc2d9d26fe7e883dd81d4de6cec288a8ceb49567f2bdfe2fcd647ab9231055429244c14d8b05978dc13ad7a SHA512 767b482284030363aeaf521b13511fe10f69db940b411fe637a4f9d00324172b3b3e1426e74fa575cb414eb1a038fca87ab473237804699879975448f9ca0f1f
diff --git a/games-strategy/freeciv/freeciv-3.0.10.ebuild b/games-strategy/freeciv/freeciv-3.0.10.ebuild
deleted file mode 100644
index 624a5bb44ac6..000000000000
--- a/games-strategy/freeciv/freeciv-3.0.10.ebuild
+++ /dev/null
@@ -1,193 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-3 )
-
-inherit desktop lua-single qmake-utils xdg
-
-MY_PV="${PV/_beta/-beta}"
-MY_PV="${MY_PV/_rc/-RC}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Multiplayer strategy game (Civilization Clone)"
-HOMEPAGE="https://www.freeciv.org/"
-
-if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
-	SRC_URI="mirror://sourceforge/freeciv/${MY_P}.tar.xz"
-	KEYWORDS="~amd64 ~ppc64 ~x86"
-fi
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="aimodules auth dedicated +gtk mapimg modpack mysql nls qt5 readline sdl +server +sound sqlite +system-lua"
-
-REQUIRED_USE="
-	system-lua? ( ${LUA_REQUIRED_USE} )
-	dedicated? ( !gtk !mapimg !modpack !nls !qt5 !sdl !sound )
-	!dedicated? ( || ( gtk qt5 sdl ) )
-"
-
-# postgres isn't yet really supported by upstream
-RDEPEND="
-	app-arch/bzip2
-	app-arch/xz-utils
-	dev-libs/icu:=
-	net-misc/curl
-	sys-libs/zlib
-	auth? (
-		app-arch/zstd:=
-		dev-libs/openssl:=
-		!mysql? ( ( !sqlite? ( dev-db/mysql-connector-c:= ) ) )
-		mysql? ( dev-db/mysql-connector-c:= )
-		sqlite? ( dev-db/sqlite:3 )
-	)
-	aimodules? ( dev-libs/libltdl )
-	!dedicated? (
-		media-libs/libpng
-		gtk? ( x11-libs/gtk+:3 )
-		mapimg? ( media-gfx/imagemagick:= )
-		modpack? ( x11-libs/gtk+:3 )
-		nls? ( virtual/libintl )
-		qt5? (
-			dev-qt/qtcore:5
-			dev-qt/qtgui:5
-			dev-qt/qtwidgets:5
-		)
-		!sdl? ( !gtk? ( x11-libs/gtk+:3 ) )
-		sdl? (
-			media-libs/libsdl2[video]
-			media-libs/sdl2-gfx
-			media-libs/sdl2-image[png]
-			media-libs/sdl2-ttf
-		)
-		server? ( aimodules? ( dev-build/libtool ) )
-		sound? (
-			media-libs/libsdl2[sound]
-			media-libs/sdl2-mixer[vorbis]
-		)
-	)
-	readline? ( sys-libs/readline:= )
-	system-lua? ( ${LUA_DEPS} )
-"
-DEPEND="${RDEPEND}
-	!dedicated? ( x11-base/xorg-proto )
-"
-# Calls gzip during build
-BDEPEND="
-	app-arch/gzip
-	virtual/pkgconfig
-	!dedicated? ( nls? ( sys-devel/gettext ) )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	if ! use dedicated && ! use server ; then
-		ewarn "Disabling server USE flag will make it impossible to start local"
-		ewarn "games, but you will still be able to join multiplayer games."
-	fi
-
-	use system-lua && lua-single_pkg_setup
-}
-
-src_configure() {
-	local myclient=() mydatabase=() myeconfargs=()
-
-	if use auth ; then
-		if ! use mysql && ! use sqlite ; then
-			einfo "No database backend chosen, defaulting"
-			einfo "to mysql!"
-			mydatabase=( mysql )
-		else
-			use mysql && mydatabase+=( mysql )
-			use sqlite && mydatabase+=( sqlite3 )
-		fi
-	else
-		mydatabase=( no )
-	fi
-
-	if use dedicated ; then
-		myclient=( no )
-		myeconfargs+=(
-			--enable-server
-			--enable-freeciv-manual=html
-		)
-	else
-		if use !sdl && use !gtk && ! use qt5 ; then
-			einfo "No client backend given, defaulting to gtk3 client!"
-			myclient=( gtk3 )
-		else
-			use sdl && myclient+=( sdl2 )
-			# Since all gtk3 in gentoo is >= 3.22 we can use the better client
-			use gtk && myclient+=( gtk3.22 )
-			if use qt5 ; then
-				local -x MOCCMD=$(qt5_get_bindir)/moc
-				myclient+=( qt )
-			fi
-		fi
-		myeconfargs+=(
-			$(use_enable server)
-			$(use_enable server freeciv-manual html )
-		)
-	fi
-
-	myeconfargs+=(
-		--enable-aimodules="$(usex aimodules "yes" "no")"
-		--enable-client="${myclient[*]}"
-		--enable-fcdb="${mydatabase[*]}"
-		--enable-fcmp="$(usex modpack "gtk3" "no")"
-		--enable-ipv6
-		# disabling shared libs will break aimodules USE flag
-		--enable-shared
-		--localedir=/usr/share/locale
-		--with-appdatadir="${EPREFIX}"/usr/share/metainfo
-		$(use_enable mapimg)
-		$(use_enable nls)
-		$(use_enable sound sdl-mixer)
-		$(use_enable system-lua sys-lua)
-		$(use_with readline)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	if use server ; then
-		# Create and install the html manual. It can't be done for dedicated
-		# servers, because the 'freeciv-manual' tool is then not built. Also
-		# delete freeciv-manual from the GAMES_BINDIR, because it's useless.
-		# Note: to have it localized, it should be ran from _postinst, or
-		# something like that, but then it's a PITA to avoid orphan files...
-		# freeciv-manual only supports one ruleset argument at a time.
-		elog "Generating html manual..."
-		for RULESET in alien civ1 civ2 civ2civ3 classic experimental multiplayer sandbox
-		do
-			./tools/freeciv-manual -r ${RULESET} || die
-			docinto html/rulesets/${RULESET}
-			dodoc ${RULESET}*.html
-		done
-	fi
-
-	find "${ED}" -name "freeciv-manual*" -delete || die
-
-	if use dedicated ; then
-		elog "Tidying up dedicated server installation..."
-		find "${ED}"/usr/share/man/man6/ \
-			-not \( -name 'freeciv.6' -o -name 'freeciv-ruledit.6' \
-			-o -name 'freeciv-ruleup.6' -o -name 'freeciv-server.6' \) -mindepth 1 -delete || die
-	else
-		# sdl client needs some special handling
-		if use sdl ; then
-			make_desktop_entry freeciv-sdl "Freeciv (SDL)" freeciv-client
-		else
-			rm "${ED}"/usr/share/man/man6/freeciv-sdl2.6 || die
-		fi
-
-		rm -f "${ED}"/usr/share/man/man6/freeciv-xaw.6 || die
-	fi
-
-	find "${ED}" -type f -name "*.la" -delete || die
-}
diff --git a/games-strategy/freeciv/freeciv-3.1.0_beta4.ebuild b/games-strategy/freeciv/freeciv-3.1.0.ebuild
index 0b5e2c809016..0b5e2c809016 100644
--- a/games-strategy/freeciv/freeciv-3.1.0_beta4.ebuild
+++ b/games-strategy/freeciv/freeciv-3.1.0.ebuild
diff --git a/games-strategy/freeciv/metadata.xml b/games-strategy/freeciv/metadata.xml
index 2131b4947957..9a51d4a95eeb 100644
--- a/games-strategy/freeciv/metadata.xml
+++ b/games-strategy/freeciv/metadata.xml
@@ -6,10 +6,6 @@
 		<name>Gentoo Games Project</name>
 	</maintainer>
 	<use>
-		<flag name="aimodules">Support for dynamically loadable AI
-			modules (server-side)</flag>
-		<flag name="auth">Add authentication capability via
-			mysql, postgres, or sqlite3</flag>
 		<flag name="gtk3">Build the gtk3 client</flag>
 		<flag name="gtk4">Build the gtk4 client</flag>
 		<flag name="json">Add support for JSON via
diff --git a/mate-base/Manifest.gz b/mate-base/Manifest.gz
index 514479e0dcfa..bf664c9737bc 100644
--- a/mate-base/Manifest.gz
+++ b/mate-base/Manifest.gz
diff --git a/mate-base/caja/Manifest b/mate-base/caja/Manifest
index 42ddf8e8d5f9..d202126e09d9 100644
--- a/mate-base/caja/Manifest
+++ b/mate-base/caja/Manifest
@@ -1,5 +1,5 @@
 DIST caja-1.26.3.tar.xz 5276276 BLAKE2B d9347986939433bf3b28b58ab8412579caa5cafddc72880a45dcffef75a5431cc81741a4f7006f1183c2b74cbae673db69ed8191616bd85c262bd07204601efd SHA512 6f17d46de77c552f68c77e0b6a0c388a7fe353ddd5ea5376685aec209f301b5a74a76b1af4c2324f41838ff7251acffa3bd119cf2462a8b8b45ef1b88df4c83c
 DIST caja-1.27.2.tar.xz 5321212 BLAKE2B d2dca7b90afb5c81d7c25f4eb4acf79007f5134f9ad5924fcbb63490d5c3cf303892dd2e43b4a7c3a6f7181cade24cd785c8f7cae93e3fed121553e3993874f2 SHA512 ca36533e0dfb583aaf8bdc6f1d3e5235a4e0b67e6c3d6180d76cd8c52ba72b224a73ccbe4868310cc318b083fe96ac62002422d967849eba88da20e0ad3a1a4c
-EBUILD caja-1.26.3.ebuild 1998 BLAKE2B c9ff1e262d889708f5df6180a471fd3fc1695798db7f502c9fea0d7c81cc495062c0c9d482f57bac9db7004d5b6fdf3868d627acafbeb27d3a69eb27ece87ace SHA512 896bd454b877ec95d48d336f11458838a3a2714b332d2d780e389e4393d800fb073cfe54606f487a64aea0991388adbdeba3fbf0b914d8014a602605b334bde9
-EBUILD caja-1.27.2.ebuild 2028 BLAKE2B 020188efb7b7bdda8fcebdea6f785e0a03028fb901a2e1bba1ad2655e49dd3bebbebe3379d54026cd283a80ff235ecf0c683aa6cc75b0ce448ffcee3055e0d71 SHA512 c62521c21d7658deef3481eb0682a21ebffb4cbe950d5dbc1885da13669e136fe2f85a4a188f0cce2d36387b49d5617f41455b7a8683a01f0d4236a5c16f4be6
+EBUILD caja-1.26.3.ebuild 2145 BLAKE2B 86a319e54245d638fce8f09103be8059b4d0bb0ee3f20c1c4b6f663e3a1b151078d264404a06ad1ebed3d99583e99a07835ba1758d1ffeaf327795f84f1c1223 SHA512 3c64e7935a3617931e3329ec2d63bb6b7227b2fbe6f775a5037e4710ab5a512d87fae3e11a2bb05a71c44b5b7fd4dcefcf7335273d4e6ac86cef38b122383db5
+EBUILD caja-1.27.2.ebuild 2175 BLAKE2B 4a86a5d4a3f1921ed91395e107ebaf590548b3f2c746d575eac88dcdf7aa087927c291b689957b1a88721835f6eeaef6803d98c3b954d0f0ca2a1d69bc05b17c SHA512 e63171e14325c2a4f7d8108aefd3b89d8dd581b4a1341da0dc129ef8f96456c832e674f600bf3eebec8320562b1057e199bd0c5726f53db21bcc43e74e5d8a73
 MISC metadata.xml 652 BLAKE2B fb77ff86375152d0c63270bf38d6e08fe1f690e0eb7a28f682b3fea5c43ed65d5a9b0164f975464a06e4116e3625a9614021f06466ab31a5febea5bcd448de99 SHA512 1f460fa105d93d4a82178584f69335c24fb14b5c818d0021a4e9a82a2193f37cd9304fea13c0ecd697e08f5780544886132a1eee55b7b425bc76e1dd9bede494
diff --git a/mate-base/caja/caja-1.26.3.ebuild b/mate-base/caja/caja-1.26.3.ebuild
index d5d38fb07637..ac48b892bf78 100644
--- a/mate-base/caja/caja-1.26.3.ebuild
+++ b/mate-base/caja/caja-1.26.3.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 MATE_LA_PUNT="yes"
 
-inherit mate
+inherit flag-o-matic mate
 
 MINOR=$(($(ver_cut 2) % 2))
 if [[ ${MINOR} -eq 0 ]]; then
@@ -67,6 +67,11 @@ src_prepare() {
 }
 
 src_configure() {
+	# https://bugs.gentoo.org/926751
+	# https://github.com/mate-desktop/caja/issues/1774
+	append-flags -fno-strict-aliasing
+	filter-lto
+
 	mate_src_configure \
 		--disable-update-mimedb \
 		$(use_enable introspection) \
diff --git a/mate-base/caja/caja-1.27.2.ebuild b/mate-base/caja/caja-1.27.2.ebuild
index d610e6043e96..139ea62e6bbd 100644
--- a/mate-base/caja/caja-1.27.2.ebuild
+++ b/mate-base/caja/caja-1.27.2.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 MATE_LA_PUNT="yes"
 
-inherit mate
+inherit flag-o-matic mate
 
 MINOR=$(($(ver_cut 2) % 2))
 if [[ ${MINOR} -eq 0 ]]; then
@@ -69,6 +69,11 @@ src_prepare() {
 }
 
 src_configure() {
+	# https://bugs.gentoo.org/926751
+	# https://github.com/mate-desktop/caja/issues/1774
+	append-flags -fno-strict-aliasing
+	filter-lto
+
 	mate_src_configure \
 		--disable-update-mimedb \
 		$(use_enable introspection) \
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index db05f33a9425..65dd7801ee98 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/ctl/Manifest b/media-libs/ctl/Manifest
index 23eec6fb100b..b4ba59ddb15f 100644
--- a/media-libs/ctl/Manifest
+++ b/media-libs/ctl/Manifest
@@ -1,4 +1,6 @@
 AUX ctl-1.5.2-fix-installation-directories.patch 1815 BLAKE2B 245a002e30d705c992f610e3543e8a1a1f34c67e3dbdacec3f9592c9b5be23f050dcc288bb16336b35591c6d218933d5ef98a77e5919f4bb498dc91276903062 SHA512 f7347e89a37e017ac8d238df7a8f7fbc7ec1c1439da6dd9a9a4a5c71ad92ea5546d5fa665762170399280c42a858f15416a39f45695b829c8ab01b74f4df22f2
 DIST ctl-1.5.2_p20221224.tar.gz 1418659 BLAKE2B 6798439b270b785974cfd45381f927f2005884b6a00878fa845cc1c36cd912eb6f3acb913f896389a67bff52103d3d52032e3f1f9f53e1a3d98b545428c1580b SHA512 9cc132100d3ea622d954e783fbab43c07cfa72e1930f4b9c55cb01709e88f09f956ac02e973a09bfc2842e769060e6f50f082d5491be03c1499a58e79b0f1ca3
-EBUILD ctl-1.5.2_p20221224.ebuild 875 BLAKE2B 87e216001b93460965c6a8f7f2908fafe30fb165c8f7d344e13a27bcdc3cae7395fa3af4ec2d6f1d5346c75353c0a5ec76661ec37fcf9abeff05a14eed2a8676 SHA512 6e7c36eedbfcb89d834f291354ee35973d2d83c782879e802ccaa190f0b948f24181c1c9d0b7375d1a5be1b2d2cdc023c945e22f529e898371ba32d9d763e0dd
+DIST ctl-1.5.3.tar.gz 3073036 BLAKE2B cc22c998ccd649b9bcb4ea995811720edaad8a8091028254fa9c7b84755819441f55331e677a4436f9116ea33bef9b4c65a2e36522723686dfd60cb8b12e8583 SHA512 f7bb487d9064b95bf6276e2944033e9c5123619540db8113408970838d70f42b9cbdeae86b743f17b0b47497721a877a0621a3983112af9e4b8aa4c1b8e01254
+EBUILD ctl-1.5.2_p20221224.ebuild 1040 BLAKE2B e9bff12e7191c2ea7fd27728efe9972a8fccbf6bdb4e85013a96dd64f1d85d06a9f379a6901a50102a234cdc0f77c345a98daffb301234e773a35b4f8d253384 SHA512 ef8c657d82e4c4a477386064e4c4b183bee1fdff51364e85a39ca4a36109fa637f26b16119b36911a19a278c18c9c52e40568015157e809f1f57e134f60e4a04
+EBUILD ctl-1.5.3.ebuild 937 BLAKE2B 3fd71acf3a5b0bd074330537fdd2cd6a521ca52bd60d77a1e8311fc2daba2856e190e1d093a466e33eb3abd34842e170de933f9a0ca6947f6b3f929a2a5de634 SHA512 c7aef193f4c5a8ca8e6fc3a3e64d588e4c99799e54a4c0a6a45b93076efe17e2e48b029844945737c08393748a92f624494f76c1748c6f94579c85dac3724d10
 MISC metadata.xml 298 BLAKE2B 6e4266628d090b71081fd7756e6e725250f41a8a670fa745eef96503c01915a93d41e82b84bca8f81b173b846f5437a40a1974491cb261adeb3e692e4750a40c SHA512 318801a89aef840e0aa9e823bc50bad3c95aa4f993a2a67097fe1ebe397d3702ad18165074e7887c090921f2e3330965b45114375ddb1ac60b40161a8acda8de
diff --git a/media-libs/ctl/ctl-1.5.2_p20221224.ebuild b/media-libs/ctl/ctl-1.5.2_p20221224.ebuild
index 900fd7d7d2a3..bf3bc0cec141 100644
--- a/media-libs/ctl/ctl-1.5.2_p20221224.ebuild
+++ b/media-libs/ctl/ctl-1.5.2_p20221224.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cmake
+inherit cmake flag-o-matic
 
 MY_COMMIT=3fc4ae7a8af35d380654e573d895216fd5ba407e
 
@@ -30,6 +30,12 @@ BDEPEND="virtual/pkgconfig"
 PATCHES=( "${FILESDIR}"/${PN}-1.5.2-fix-installation-directories.patch )
 
 src_configure() {
+	# -Werror=strict-aliasing
+	# https://bugs.gentoo.org/926823
+	# https://github.com/ampas/CTL/issues/146
+	append-flags -fno-strict-aliasing
+	filter-lto
+
 	local mycmakeargs=(
 		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
 		-DCTL_BUILD_TESTS=$(usex test)
diff --git a/media-libs/ctl/ctl-1.5.3.ebuild b/media-libs/ctl/ctl-1.5.3.ebuild
new file mode 100644
index 000000000000..11e4fd2a2845
--- /dev/null
+++ b/media-libs/ctl/ctl-1.5.3.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic
+
+MY_COMMIT=3fc4ae7a8af35d380654e573d895216fd5ba407e
+
+DESCRIPTION="AMPAS' Color Transformation Language"
+HOMEPAGE="https://github.com/ampas/CTL"
+SRC_URI="https://github.com/ampas/CTL/archive/${P}.tar.gz"
+S="${WORKDIR}/CTL-${P}"
+
+LICENSE="AMPAS"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/imath:=
+	>=media-libs/openexr-3:=[threads]
+	media-libs/tiff:=
+	!media-libs/openexr_ctl"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_configure() {
+	# -Werror=strict-aliasing
+	# https://bugs.gentoo.org/926823
+	# https://github.com/ampas/CTL/issues/146
+	append-flags -fno-strict-aliasing
+	filter-lto
+
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
+		-DCTL_BUILD_TESTS=$(usex test)
+		-DCTL_BUILD_TOOLS=ON
+	)
+	cmake_src_configure
+}
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 76933eeff623..a7fd24bfb401 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 8171365535e7..ca2d03051d2d 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Mon, 01 Apr 2024 00:40:30 +0000
+Mon, 01 Apr 2024 06:40:34 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index b954ccfee895..77b7017207bb 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 569494 BLAKE2B 475196fd0ff28d6023f45e6c22284bded2028bbe891778e3828fb75c3727438168bcd5ab63fe48683bb5874710c096e12470eee93163ae90c07d1f9d79810710 SHA512 94822c7f83b3b68b28e1885c442c2d9b5794eb5f861b8a0862162601a2c2b03cdc2bb6144d8b4a1d61befedf2ff1952e540c518e34c7f15ff5af14b7dc567fcb
-TIMESTAMP 2024-04-01T00:40:34Z
+TIMESTAMP 2024-04-01T06:40:39Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmYKAoJfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmYKVudfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCbkw//XgrKzi5TfwXTUDBoN+p9j2RUqMbb6AKPDbENFEs6r12F6z/Kzvg7Nrdc
-STcHBqsfqLZYGj8enTTqTSUdrg6uKMu20gna5VFL4V46zxY3y+vPcEX+EHlxoiKE
-ThIK6wOLgziyPHOxQVYdKWgurXauNQHeUgzAwHsOj8u6IR57FuHiuWYDGe7kyCX+
-kAjfy5ON54b7JRWBDS9sXO4M+5XIh82/9RNYL6eq+UNujh4NaQV7bNPpoazCk8G7
-bswITR0CwGdLiZHDtbleoP4OUKj7CBn2zo00xA0woLjnLQdnIDwPMwiKAOTpHYl8
-YccQsvhU/VJLG08Y6/9Y5+eYGVq/EQtQICRfsRP0iYsgOUWdUBkbnf4vgiwcXlUP
-lH84LUhX0P+qFyixYA7Ug5am9UQreS3Eoyi046JXjmER+K/GcL1gxKAmfNhkG6qV
-f+VYwtSn8DzO/osr3p7rgwAlrqkNsB/cUQbUQF7HWGLJAhWp5ZFftuJskLNVBq6Z
-7r2PWN4Au9nF+nSEL3hucwC3pxoVwbeHN4NwNAPXRtOMGfbjZETS+Z+iqtp7WiBD
-MAnO73F7mVw7C7akUdFCsFcY1i+DA/HTdF1M4bCGBoeVbKuY23lVohuoUoG/lRR4
-jhLpg/efRg5hkFAsunGCAX0Nmt5VothNDDj0Pku2fNppE9xVST0=
-=awb8
+klBWrg//cxk8dWFEYLuuzfXLVmmEZmb3IPhBpMDKhQkoNbb4yGkCNuZUP42QdZzt
+f9qKIN4MD71/C9n5pt3UQBYH2fw2BBPDi2mpIVAdSQxydQCOimOF1BVTGDBBvNXd
+W64uDqqLnLAUVikdexeTCfHFvoOrqI8xALviM7U+EaXq+9a5s0CjvCFvYWkCKR0B
+ytl9J6eD0u7MWWQoNa5wrolHgRidVFtKfIbiOwAOmkWeXrcZ5s5h5eJg+UF9+UxS
+i7+sh9NZ4OAoTXszcf9x4L4RGkqWbTHpG6MBqhATI8N6jVsxXtJv3TlvS/OKi9Yn
+Dj+GUuok7WdbFGARfAASDGwolspDCacYXj618kioIySnaQrKuUTwFWPveAkfNLWc
+k79bwmBbmc6ILRhaYCpuN4hAC14gkL6xxrwGfuY7VxtjRockWTSUTLm9ACnjI7SY
+7r4dVvgQQqqu7F5+mpN8gV9yfu7hXvhAaZU8ptzJV6stjEpK/MW0h1BDimMArowI
+sGVSPMVkp80BNSHIPwiVM4sQTK1tDsdx9AjHz9hn/UV4uHSobiYvKE5/TUzhJoUO
+ERD9VRcyvpat+jNkmQD8a3ZBSbnK8rRee3sC5LhbOh/YeeZwCCBo3ai6LoeFkH4W
+c7yTtKfDg7Vb7tODZRG4DdVIHMxDUIT7v8Qi65Rntj6IxFlnMhQ=
+=BHZC
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 8171365535e7..ca2d03051d2d 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Mon, 01 Apr 2024 00:40:30 +0000
+Mon, 01 Apr 2024 06:40:34 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index cc7349195e98..4310438514b0 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index 026d1f769cda..c09105f715a9 100644
--- a/metadata/md5-cache/app-admin/Manifest.gz
+++ b/metadata/md5-cache/app-admin/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/consul-1.15.7 b/metadata/md5-cache/app-admin/consul-1.15.11
index 2f28109d1265..62281b98c8ba 100644
--- a/metadata/md5-cache/app-admin/consul-1.15.7
+++ b/metadata/md5-cache/app-admin/consul-1.15.11
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.consul.io
 INHERIT=go-module systemd
 KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT
+LICENSE=+= Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT
 RDEPEND=acct-group/consul acct-user/consul
 RESTRICT=test strip
 SLOT=0
-SRC_URI=https://github.com/zmedico/consul/archive/v1.15.7-vendor.tar.gz -> consul-1.15.7-vendor.tar.gz
+SRC_URI=https://github.com/hashicorp/consul/archive/v1.15.11.tar.gz -> consul-1.15.11.tar.gz https://dev.gentoo.org/~zmedico/dist/consul-1.15.11-deps.tar.xz
 _eclasses_=flag-o-matic	288c54efeb5e2aa70775e39032695ad4	go-env	14f8f70fe58c14d7ab44fff15a05ac47	go-module	83fd3ed1657cfc316c93d6a37018290d	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	systemd	c8b03e8df84486aa991d4396686e8942	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=18d1c25b098151d525b4ae32d0e9737a
+_md5_=49d9fe4d27256f90a42ca58566f0a0fe
diff --git a/metadata/md5-cache/app-containers/Manifest.gz b/metadata/md5-cache/app-containers/Manifest.gz
index 6ced4f0de02e..500f1c988139 100644
--- a/metadata/md5-cache/app-containers/Manifest.gz
+++ b/metadata/md5-cache/app-containers/Manifest.gz
diff --git a/metadata/md5-cache/app-containers/buildah-1.33.5 b/metadata/md5-cache/app-containers/buildah-1.33.5
deleted file mode 100644
index 718d3b7a366c..000000000000
--- a/metadata/md5-cache/app-containers/buildah-1.33.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-lang/go-1.20:= app-arch/unzip
-DEFINED_PHASES=compile install prepare pretend setup test unpack
-DEPEND=systemd? ( sys-apps/systemd ) btrfs? ( sys-fs/btrfs-progs ) seccomp? ( sys-libs/libseccomp:= ) apparmor? ( sys-libs/libapparmor:= ) app-containers/containers-common app-crypt/gpgme:= dev-libs/libgpg-error:= dev-libs/libassuan:= sys-apps/shadow:=
-DESCRIPTION=A tool that facilitates building OCI images
-EAPI=8
-HOMEPAGE=https://github.com/containers/buildah
-INHERIT=go-module linux-info
-IUSE=apparmor btrfs +seccomp systemd doc test
-KEYWORDS=amd64 ~arm64
-LICENSE=Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0
-RDEPEND=systemd? ( sys-apps/systemd ) btrfs? ( sys-fs/btrfs-progs ) seccomp? ( sys-libs/libseccomp:= ) apparmor? ( sys-libs/libapparmor:= ) app-containers/containers-common app-crypt/gpgme:= dev-libs/libgpg-error:= dev-libs/libassuan:= sys-apps/shadow:=
-RESTRICT=test strip
-SLOT=0
-SRC_URI=https://github.com/containers/buildah/archive/v1.33.5.tar.gz -> buildah-1.33.5.tar.gz
-_eclasses_=flag-o-matic	288c54efeb5e2aa70775e39032695ad4	go-env	14f8f70fe58c14d7ab44fff15a05ac47	go-module	83fd3ed1657cfc316c93d6a37018290d	linux-info	7ca3057b277f1e5978947b4cc289ce62	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=75ff9b6922e0907bb76bf151befbdbd4
diff --git a/metadata/md5-cache/app-containers/buildah-1.33.6 b/metadata/md5-cache/app-containers/buildah-1.33.6
deleted file mode 100644
index 4878698b7415..000000000000
--- a/metadata/md5-cache/app-containers/buildah-1.33.6
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-lang/go-1.20:= app-arch/unzip
-DEFINED_PHASES=compile install prepare pretend setup test unpack
-DEPEND=systemd? ( sys-apps/systemd ) btrfs? ( sys-fs/btrfs-progs ) seccomp? ( sys-libs/libseccomp:= ) apparmor? ( sys-libs/libapparmor:= ) app-containers/containers-common app-crypt/gpgme:= dev-libs/libgpg-error:= dev-libs/libassuan:= sys-apps/shadow:=
-DESCRIPTION=A tool that facilitates building OCI images
-EAPI=8
-HOMEPAGE=https://github.com/containers/buildah
-INHERIT=go-module linux-info
-IUSE=apparmor btrfs +seccomp systemd doc test
-KEYWORDS=~amd64 arm64
-LICENSE=Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0
-RDEPEND=systemd? ( sys-apps/systemd ) btrfs? ( sys-fs/btrfs-progs ) seccomp? ( sys-libs/libseccomp:= ) apparmor? ( sys-libs/libapparmor:= ) app-containers/containers-common app-crypt/gpgme:= dev-libs/libgpg-error:= dev-libs/libassuan:= sys-apps/shadow:=
-RESTRICT=test strip
-SLOT=0
-SRC_URI=https://github.com/containers/buildah/archive/v1.33.6.tar.gz -> buildah-1.33.6.tar.gz
-_eclasses_=flag-o-matic	288c54efeb5e2aa70775e39032695ad4	go-env	14f8f70fe58c14d7ab44fff15a05ac47	go-module	83fd3ed1657cfc316c93d6a37018290d	linux-info	7ca3057b277f1e5978947b4cc289ce62	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=9f1fe85c7d0593c9cda0ffc9c3fe19bd
diff --git a/metadata/md5-cache/app-containers/buildah-1.33.7 b/metadata/md5-cache/app-containers/buildah-1.33.7
index 97e1071ef302..c4aa8a0d0b99 100644
--- a/metadata/md5-cache/app-containers/buildah-1.33.7
+++ b/metadata/md5-cache/app-containers/buildah-1.33.7
@@ -13,4 +13,4 @@ RESTRICT=test strip
 SLOT=0
 SRC_URI=https://github.com/containers/buildah/archive/v1.33.7.tar.gz -> buildah-1.33.7.tar.gz
 _eclasses_=flag-o-matic	288c54efeb5e2aa70775e39032695ad4	go-env	14f8f70fe58c14d7ab44fff15a05ac47	go-module	83fd3ed1657cfc316c93d6a37018290d	linux-info	7ca3057b277f1e5978947b4cc289ce62	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=99cc55cd735b3e48e3da19b7ba44444b
+_md5_=188352f9ad4f35c07c38c03db906a685
diff --git a/metadata/md5-cache/app-containers/buildah-1.34.0 b/metadata/md5-cache/app-containers/buildah-1.34.0
deleted file mode 100644
index 6247e97b1bb7..000000000000
--- a/metadata/md5-cache/app-containers/buildah-1.34.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-lang/go-1.20:= app-arch/unzip
-DEFINED_PHASES=compile install prepare pretend setup test unpack
-DEPEND=systemd? ( sys-apps/systemd ) btrfs? ( sys-fs/btrfs-progs ) seccomp? ( sys-libs/libseccomp:= ) apparmor? ( sys-libs/libapparmor:= ) app-containers/containers-common app-crypt/gpgme:= dev-libs/libgpg-error:= dev-libs/libassuan:= sys-apps/shadow:=
-DESCRIPTION=A tool that facilitates building OCI images
-EAPI=8
-HOMEPAGE=https://github.com/containers/buildah
-INHERIT=go-module linux-info
-IUSE=apparmor btrfs +seccomp systemd doc test
-LICENSE=Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0
-RDEPEND=systemd? ( sys-apps/systemd ) btrfs? ( sys-fs/btrfs-progs ) seccomp? ( sys-libs/libseccomp:= ) apparmor? ( sys-libs/libapparmor:= ) app-containers/containers-common app-crypt/gpgme:= dev-libs/libgpg-error:= dev-libs/libassuan:= sys-apps/shadow:=
-RESTRICT=test strip
-SLOT=0
-SRC_URI=https://github.com/containers/buildah/archive/v1.34.0.tar.gz -> buildah-1.34.0.tar.gz
-_eclasses_=flag-o-matic	288c54efeb5e2aa70775e39032695ad4	go-env	14f8f70fe58c14d7ab44fff15a05ac47	go-module	83fd3ed1657cfc316c93d6a37018290d	linux-info	7ca3057b277f1e5978947b4cc289ce62	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=9aff5b5e45d7f3e0ff9799fb6f786b31
diff --git a/metadata/md5-cache/app-containers/buildah-1.34.3 b/metadata/md5-cache/app-containers/buildah-1.34.3
index 1b04cae101ab..555bd617a282 100644
--- a/metadata/md5-cache/app-containers/buildah-1.34.3
+++ b/metadata/md5-cache/app-containers/buildah-1.34.3
@@ -13,4 +13,4 @@ RESTRICT=test strip
 SLOT=0
 SRC_URI=https://github.com/containers/buildah/archive/v1.34.3.tar.gz -> buildah-1.34.3.tar.gz
 _eclasses_=flag-o-matic	288c54efeb5e2aa70775e39032695ad4	go-env	14f8f70fe58c14d7ab44fff15a05ac47	go-module	83fd3ed1657cfc316c93d6a37018290d	linux-info	7ca3057b277f1e5978947b4cc289ce62	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=b5ec8160d7b34fa115146d431fae7b0d
+_md5_=4bc7fa0f6f7d99e73f30c48a70b4ba33
diff --git a/metadata/md5-cache/app-containers/buildah-1.35.1 b/metadata/md5-cache/app-containers/buildah-1.35.1
deleted file mode 100644
index 7b1e7f9cc2d8..000000000000
--- a/metadata/md5-cache/app-containers/buildah-1.35.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-go/go-md2man >=dev-lang/go-1.20:= app-arch/unzip
-DEFINED_PHASES=compile install prepare pretend setup test unpack
-DEPEND=systemd? ( sys-apps/systemd ) btrfs? ( sys-fs/btrfs-progs ) seccomp? ( sys-libs/libseccomp:= ) apparmor? ( sys-libs/libapparmor:= ) >=app-containers/containers-common-0.58.0-r1 app-crypt/gpgme:= dev-libs/libgpg-error:= dev-libs/libassuan:= sys-apps/shadow:=
-DESCRIPTION=A tool that facilitates building OCI images
-EAPI=8
-HOMEPAGE=https://github.com/containers/buildah
-INHERIT=go-module linux-info toolchain-funcs
-IUSE=apparmor btrfs +seccomp systemd test
-KEYWORDS=~amd64 ~arm64
-LICENSE=Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 ISC MIT MPL-2.0
-RDEPEND=systemd? ( sys-apps/systemd ) btrfs? ( sys-fs/btrfs-progs ) seccomp? ( sys-libs/libseccomp:= ) apparmor? ( sys-libs/libapparmor:= ) >=app-containers/containers-common-0.58.0-r1 app-crypt/gpgme:= dev-libs/libgpg-error:= dev-libs/libassuan:= sys-apps/shadow:=
-RESTRICT=test strip
-SLOT=0
-SRC_URI=https://github.com/containers/buildah/archive/v1.35.1.tar.gz -> buildah-1.35.1.tar.gz
-_eclasses_=flag-o-matic	288c54efeb5e2aa70775e39032695ad4	go-env	14f8f70fe58c14d7ab44fff15a05ac47	go-module	83fd3ed1657cfc316c93d6a37018290d	linux-info	7ca3057b277f1e5978947b4cc289ce62	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=432680c258958b07b583aeb887d779e7
diff --git a/metadata/md5-cache/app-containers/buildah-1.35.3 b/metadata/md5-cache/app-containers/buildah-1.35.3
index 13e791287954..6307e89b2b79 100644
--- a/metadata/md5-cache/app-containers/buildah-1.35.3
+++ b/metadata/md5-cache/app-containers/buildah-1.35.3
@@ -13,4 +13,4 @@ RESTRICT=test strip
 SLOT=0
 SRC_URI=https://github.com/containers/buildah/archive/v1.35.3.tar.gz -> buildah-1.35.3.tar.gz
 _eclasses_=flag-o-matic	288c54efeb5e2aa70775e39032695ad4	go-env	14f8f70fe58c14d7ab44fff15a05ac47	go-module	83fd3ed1657cfc316c93d6a37018290d	linux-info	7ca3057b277f1e5978947b4cc289ce62	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=432680c258958b07b583aeb887d779e7
+_md5_=8bcf6ac57c7824d7531b11f67b8ff3cb
diff --git a/metadata/md5-cache/app-containers/buildah-9999 b/metadata/md5-cache/app-containers/buildah-9999
index 7ee08e3fa1b4..8ea664dbda9d 100644
--- a/metadata/md5-cache/app-containers/buildah-9999
+++ b/metadata/md5-cache/app-containers/buildah-9999
@@ -12,4 +12,4 @@ RDEPEND=systemd? ( sys-apps/systemd ) btrfs? ( sys-fs/btrfs-progs ) seccomp? ( s
 RESTRICT=test strip
 SLOT=0
 _eclasses_=flag-o-matic	288c54efeb5e2aa70775e39032695ad4	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	go-env	14f8f70fe58c14d7ab44fff15a05ac47	go-module	83fd3ed1657cfc316c93d6a37018290d	linux-info	7ca3057b277f1e5978947b4cc289ce62	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=432680c258958b07b583aeb887d779e7
+_md5_=ff752d3b850b379cdc9ef27a28adb5e7
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index 78b7aadd6383..ff7681bd93ef 100644
--- a/metadata/md5-cache/app-editors/Manifest.gz
+++ b/metadata/md5-cache/app-editors/Manifest.gz
diff --git a/metadata/md5-cache/app-editors/emacs-29.3 b/metadata/md5-cache/app-editors/emacs-29.3
index 3bcbfc094dd2..767bb5e240fc 100644
--- a/metadata/md5-cache/app-editors/emacs-29.3
+++ b/metadata/md5-cache/app-editors/emacs-29.3
@@ -13,4 +13,4 @@ RDEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtua
 SLOT=29
 SRC_URI=mirror://gnu/emacs/emacs-29.3.tar.xz https://dev.gentoo.org/~ulm/emacs/emacs-29.3-patches-1.tar.xz
 _eclasses_=autotools	3af8f60c4bdb23e738db506a630898ee	elisp-common	2a0fa407d2e6363c663ccb299503b25c	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=b721cf54880b1aa0e50f40b5e2bf050b
+_md5_=6a0143e3772447c847af10429cc98bee
diff --git a/metadata/md5-cache/app-editors/emacs-29.3.9999 b/metadata/md5-cache/app-editors/emacs-29.3.9999
index dbc5ea5a9267..cc160e88866d 100644
--- a/metadata/md5-cache/app-editors/emacs-29.3.9999
+++ b/metadata/md5-cache/app-editors/emacs-29.3.9999
@@ -12,4 +12,4 @@ PROPERTIES=live
 RDEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) jit? ( sys-devel/gcc:=[jit(-)] sys-libs/zlib ) json? ( dev-libs/jansson:= ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) sqlite? ( dev-db/sqlite:3 ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) tree-sitter? ( dev-libs/tree-sitter ) valgrind? ( dev-debug/valgrind ) zlib? ( sys-libs/zlib ) gui? ( gif? ( media-libs/giflib:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:= ) webp? ( media-libs/libwebp:0= ) imagemagick? ( media-gfx/imagemagick:0=[jpeg?,png?,svg?,tiff?] ) !aqua? ( gsettings? ( app-emacs/emacs-common[gsettings(-)] >=dev-libs/glib-2.28.6 ) gtk? ( !X? ( media-libs/fontconfig media-libs/freetype >=x11-libs/cairo-1.12.18 x11-libs/gtk+:3 harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) xwidgets? ( net-libs/webkit-gtk:4.1= ) ) ) !gtk? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-libs/xcb-util x11-misc/xbitmaps xpm? ( x11-libs/libXpm ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18[X] ) !cairo? ( x11-libs/libXft ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4.1= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-libs/xcb-util x11-misc/xbitmaps xpm? ( x11-libs/libXpm ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18[X] ) !cairo? ( x11-libs/libXft ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4.1= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) ) app-eselect/eselect-emacs
 SLOT=29-vcs
 _eclasses_=autotools	3af8f60c4bdb23e738db506a630898ee	elisp-common	2a0fa407d2e6363c663ccb299503b25c	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=0302b473b9b204c16343427c9275286f
+_md5_=757fda643180e368cb14e33085ba47e6
diff --git a/metadata/md5-cache/app-editors/emacs-30.0.9999 b/metadata/md5-cache/app-editors/emacs-30.0.9999
index 5f8c5e9412d3..42b2012e419f 100644
--- a/metadata/md5-cache/app-editors/emacs-30.0.9999
+++ b/metadata/md5-cache/app-editors/emacs-30.0.9999
@@ -12,4 +12,4 @@ PROPERTIES=live
 RDEPEND=app-emacs/emacs-common[games?,gui(-)?] sys-libs/ncurses:0= acl? ( virtual/acl ) alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) games? ( acct-group/gamestat ) gmp? ( dev-libs/gmp:0= ) gpm? ( sys-libs/gpm ) !inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) ) jit? ( sys-devel/gcc:=[jit(-)] sys-libs/zlib ) json? ( dev-libs/jansson:= ) kerberos? ( virtual/krb5 ) lcms? ( media-libs/lcms:2 ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) mailutils? ( net-mail/mailutils[clients] ) !mailutils? ( acct-group/mail net-libs/liblockfile ) selinux? ( sys-libs/libselinux ) sqlite? ( dev-db/sqlite:3 ) ssl? ( net-libs/gnutls:0= ) systemd? ( sys-apps/systemd ) tree-sitter? ( dev-libs/tree-sitter ) valgrind? ( dev-debug/valgrind ) xattr? ( sys-apps/attr ) zlib? ( sys-libs/zlib ) gui? ( gif? ( media-libs/giflib:0= ) jpeg? ( media-libs/libjpeg-turbo:0= ) png? ( >=media-libs/libpng-1.4:0= ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff:= ) webp? ( media-libs/libwebp:0= ) imagemagick? ( media-gfx/imagemagick:0=[jpeg?,png?,svg?,tiff?] ) !aqua? ( gsettings? ( app-emacs/emacs-common[gsettings(-)] >=dev-libs/glib-2.28.6 ) gtk? ( !X? ( media-libs/fontconfig media-libs/freetype >=x11-libs/cairo-1.12.18 x11-libs/gtk+:3 harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) xwidgets? ( net-libs/webkit-gtk:4.1= ) ) ) !gtk? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-libs/xcb-util x11-misc/xbitmaps xpm? ( x11-libs/libXpm ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18[X] ) !cairo? ( x11-libs/libXft ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4.1= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libxcb x11-libs/xcb-util x11-misc/xbitmaps xpm? ( x11-libs/libXpm ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXrender cairo? ( >=x11-libs/cairo-1.12.18[X] ) !cairo? ( x11-libs/libXft ) harfbuzz? ( media-libs/harfbuzz:0= ) m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( x11-libs/gtk+:3 xwidgets? ( net-libs/webkit-gtk:4.1= x11-libs/libXcomposite ) ) !gtk? ( motif? ( >=x11-libs/motif-2.3:0 x11-libs/libXpm x11-libs/libXmu x11-libs/libXt ) !motif? ( Xaw3d? ( x11-libs/libXaw3d x11-libs/libXmu x11-libs/libXt ) !Xaw3d? ( athena? ( x11-libs/libXaw x11-libs/libXmu x11-libs/libXt ) ) ) ) ) ) ) app-eselect/eselect-emacs
 SLOT=30-vcs
 _eclasses_=autotools	3af8f60c4bdb23e738db506a630898ee	elisp-common	2a0fa407d2e6363c663ccb299503b25c	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=fe8e353bf92d2b2aae22fc623f48d690
+_md5_=6aebdeebc593b23738b1fd1971e92878
diff --git a/metadata/md5-cache/dev-python/GitPython-3.1.43 b/metadata/md5-cache/dev-python/GitPython-3.1.43
new file mode 100644
index 000000000000..4cb82cb4adb4
--- /dev/null
+++ b/metadata/md5-cache/dev-python/GitPython-3.1.43
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/ddt-1.1.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-mock[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( dev-vcs/git >=dev-python/gitdb-4.0.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[threads(+)] ) python_targets_python3_12? ( dev-lang/python:3.12[threads(+)] ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Library used to interact with Git repositories
+EAPI=8
+HOMEPAGE=https://github.com/gitpython-developers/GitPython/ https://pypi.org/project/GitPython/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=dev-vcs/git >=dev-python/gitdb-4.0.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) python_targets_python3_11? ( dev-lang/python:3.11[threads(+)] ) python_targets_python3_12? ( dev-lang/python:3.12[threads(+)] )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/G/GitPython/GitPython-3.1.43.tar.gz test? ( https://dev.gentoo.org/~mgorny/dist/GitPython-3.1.43.gitbundle https://dev.gentoo.org/~mgorny/dist/gitdb-4.0.11.gitbundle https://dev.gentoo.org/~mgorny/dist/smmap-5.0.1.gitbundle )
+_eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	2eecb475512bc76e5ea9192a681b9e6b	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=645a366e9fb354cbde455c9e7dee7d39
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 338d9f3be453..b6e12a0171a5 100644
--- a/metadata/md5-cache/dev-python/Manifest.gz
+++ b/metadata/md5-cache/dev-python/Manifest.gz
diff --git a/metadata/md5-cache/dev-python/hypothesis-6.100.0 b/metadata/md5-cache/dev-python/hypothesis-6.100.0
new file mode 100644
index 000000000000..60bf2eb9b7e9
--- /dev/null
+++ b/metadata/md5-cache/dev-python/hypothesis-6.100.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pexpect[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-8[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] !!<dev-python/requests-toolbelt-0.10.1 ) test? ( >=dev-python/attrs-22.2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) cli? ( python_targets_python3_10? ( dev-python/black[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/click[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_11? ( dev-python/black[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/click[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_12? ( dev-python/black[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/click[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) ) >=dev-python/pytest-7.3.1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_pypy3? ( dev-python/pypy3:=[threads(+),sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+),sqlite] ) python_targets_python3_11? ( dev-lang/python:3.11[threads(+),sqlite] ) python_targets_python3_12? ( dev-lang/python:3.12[threads(+),sqlite] ) >=dev-python/gpep517-15[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=A library for property based testing
+EAPI=8
+HOMEPAGE=https://github.com/HypothesisWorks/hypothesis/ https://pypi.org/project/hypothesis/
+INHERIT=distutils-r1 multiprocessing optfeature
+IUSE=cli test python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MPL-2.0
+RDEPEND=>=dev-python/attrs-22.2.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_pypy3? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_10(-)?] ) cli? ( python_targets_python3_10? ( dev-python/black[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/click[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_11? ( dev-python/black[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/click[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_12? ( dev-python/black[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/click[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) ) python_targets_pypy3? ( dev-python/pypy3:=[threads(+),sqlite] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+),sqlite] ) python_targets_python3_11? ( dev-lang/python:3.11[threads(+),sqlite] ) python_targets_python3_12? ( dev-lang/python:3.12[threads(+),sqlite] )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-6.100.0.tar.gz -> hypothesis-6.100.0.gh.tar.gz
+_eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=8eb7f059079159ce2a10544a299aac8b
diff --git a/metadata/md5-cache/dev-python/trimesh-4.2.4 b/metadata/md5-cache/dev-python/trimesh-4.2.4
new file mode 100644
index 000000000000..542ace885bf1
--- /dev/null
+++ b/metadata/md5-cache/dev-python/trimesh-4.2.4
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/mapbox_earcut[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pillow[webp,python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) test? ( dev-python/chardet[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/colorlog[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/httpx[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/jsonschema[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/lxml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/networkx[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/numpy-1.20[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pillow[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pycollada[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pyglet[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/requests[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/scipy[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/setuptools[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/shapely-1.8.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/svg-path[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/sympy[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/xxhash[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] sci-libs/rtree[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/pytest-7.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-timeout[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] ) python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 ) >=dev-python/gpep517-15[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/setuptools-67.8.0-r1[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=Python library for loading and using triangular meshes
+EAPI=8
+HOMEPAGE=https://trimesh.org/ https://github.com/mikedh/trimesh/ https://pypi.org/project/trimesh/
+INHERIT=distutils-r1 optfeature
+IUSE=test python_targets_python3_10 python_targets_python3_11 python_targets_python3_12
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/chardet[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/colorlog[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/httpx[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/jsonschema[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/lxml[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/networkx[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/numpy-1.20[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pillow[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pycollada[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/pyglet[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/requests[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/scipy[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/setuptools[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] >=dev-python/shapely-1.8.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/svg-path[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/sympy[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] dev-python/xxhash[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] sci-libs/rtree[python_targets_python3_10(-)?,python_targets_python3_11(-)?,python_targets_python3_12(-)?] python_targets_python3_10? ( dev-lang/python:3.10 ) python_targets_python3_11? ( dev-lang/python:3.11 ) python_targets_python3_12? ( dev-lang/python:3.12 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 python_targets_python3_12 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/mikedh/trimesh/archive/4.2.4.tar.gz -> trimesh-4.2.4.gh.tar.gz
+_eclasses_=distutils-r1	8262de2e5a28df8624b96e031d8d0f2b	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	8a28fa6d3e3bc96ff8a7eff2badbe71f	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=c085d5d4e4b8ade0590f4155a3413df3
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index d106fa30c2b1..eb8122a535e1 100644
--- a/metadata/md5-cache/dev-util/Manifest.gz
+++ b/metadata/md5-cache/dev-util/Manifest.gz
diff --git a/metadata/md5-cache/dev-util/bindgen-0.68.1 b/metadata/md5-cache/dev-util/bindgen-0.68.1
index 9742956048c2..7f38d5c93299 100644
--- a/metadata/md5-cache/dev-util/bindgen-0.68.1
+++ b/metadata/md5-cache/dev-util/bindgen-0.68.1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://rust-lang.github.io/rust-bindgen/
 INHERIT=rust-toolchain cargo
 IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 debug
-KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv
+KEYWORDS=amd64 arm64 ~ppc64 ~riscv
 LICENSE=BSD Apache-2.0 BSD ISC MIT Unicode-DFS-2016
 RDEPEND=virtual/rust sys-devel/clang:=
 SLOT=0
 SRC_URI=https://github.com/rust-lang/rust-bindgen/archive/refs/tags/v0.68.1.tar.gz -> bindgen-0.68.1.tar.gz https://crates.io/api/v1/crates/aho-corasick/0.7.20/download -> aho-corasick-0.7.20.crate https://crates.io/api/v1/crates/annotate-snippets/0.9.1/download -> annotate-snippets-0.9.1.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/bitflags/2.2.1/download -> bitflags-2.2.1.crate https://crates.io/api/v1/crates/block/0.1.6/download -> block-0.1.6.crate https://crates.io/api/v1/crates/cc/1.0.78/download -> cc-1.0.78.crate https://crates.io/api/v1/crates/cexpr/0.6.0/download -> cexpr-0.6.0.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/clang-sys/1.4.0/download -> clang-sys-1.4.0.crate https://crates.io/api/v1/crates/clap/4.1.4/download -> clap-4.1.4.crate https://crates.io/api/v1/crates/clap_complete/4.2.0/download -> clap_complete-4.2.0.crate https://crates.io/api/v1/crates/clap_derive/4.1.0/download -> clap_derive-4.1.0.crate https://crates.io/api/v1/crates/clap_lex/0.3.1/download -> clap_lex-0.3.1.crate https://crates.io/api/v1/crates/either/1.8.1/download -> either-1.8.1.crate https://crates.io/api/v1/crates/env_logger/0.10.0/download -> env_logger-0.10.0.crate https://crates.io/api/v1/crates/env_logger/0.8.4/download -> env_logger-0.8.4.crate https://crates.io/api/v1/crates/errno-dragonfly/0.1.2/download -> errno-dragonfly-0.1.2.crate https://crates.io/api/v1/crates/errno/0.2.8/download -> errno-0.2.8.crate https://crates.io/api/v1/crates/errno/0.3.1/download -> errno-0.3.1.crate https://crates.io/api/v1/crates/fastrand/1.8.0/download -> fastrand-1.8.0.crate https://crates.io/api/v1/crates/getrandom/0.2.8/download -> getrandom-0.2.8.crate https://crates.io/api/v1/crates/glob/0.3.1/download -> glob-0.3.1.crate https://crates.io/api/v1/crates/heck/0.4.0/download -> heck-0.4.0.crate https://crates.io/api/v1/crates/hermit-abi/0.3.2/download -> hermit-abi-0.3.2.crate https://crates.io/api/v1/crates/humantime/2.1.0/download -> humantime-2.1.0.crate https://crates.io/api/v1/crates/instant/0.1.12/download -> instant-0.1.12.crate https://crates.io/api/v1/crates/io-lifetimes/1.0.4/download -> io-lifetimes-1.0.4.crate https://crates.io/api/v1/crates/is-terminal/0.4.7/download -> is-terminal-0.4.7.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/lazycell/1.3.0/download -> lazycell-1.3.0.crate https://crates.io/api/v1/crates/libc/0.2.139/download -> libc-0.2.139.crate https://crates.io/api/v1/crates/libloading/0.7.4/download -> libloading-0.7.4.crate https://crates.io/api/v1/crates/linux-raw-sys/0.1.4/download -> linux-raw-sys-0.1.4.crate https://crates.io/api/v1/crates/linux-raw-sys/0.3.8/download -> linux-raw-sys-0.3.8.crate https://crates.io/api/v1/crates/log/0.4.17/download -> log-0.4.17.crate https://crates.io/api/v1/crates/malloc_buf/0.0.6/download -> malloc_buf-0.0.6.crate https://crates.io/api/v1/crates/memchr/2.5.0/download -> memchr-2.5.0.crate https://crates.io/api/v1/crates/minimal-lexical/0.2.1/download -> minimal-lexical-0.2.1.crate https://crates.io/api/v1/crates/nom/7.1.3/download -> nom-7.1.3.crate https://crates.io/api/v1/crates/objc/0.2.7/download -> objc-0.2.7.crate https://crates.io/api/v1/crates/once_cell/1.17.0/download -> once_cell-1.17.0.crate https://crates.io/api/v1/crates/os_str_bytes/6.4.1/download -> os_str_bytes-6.4.1.crate https://crates.io/api/v1/crates/owo-colors/3.5.0/download -> owo-colors-3.5.0.crate https://crates.io/api/v1/crates/peeking_take_while/0.1.2/download -> peeking_take_while-0.1.2.crate https://crates.io/api/v1/crates/prettyplease/0.2.7/download -> prettyplease-0.2.7.crate https://crates.io/api/v1/crates/proc-macro-error-attr/1.0.4/download -> proc-macro-error-attr-1.0.4.crate https://crates.io/api/v1/crates/proc-macro-error/1.0.4/download -> proc-macro-error-1.0.4.crate https://crates.io/api/v1/crates/proc-macro2/1.0.60/download -> proc-macro2-1.0.60.crate https://crates.io/api/v1/crates/quickcheck/1.0.3/download -> quickcheck-1.0.3.crate https://crates.io/api/v1/crates/quote/1.0.28/download -> quote-1.0.28.crate https://crates.io/api/v1/crates/rand/0.8.5/download -> rand-0.8.5.crate https://crates.io/api/v1/crates/rand_core/0.6.4/download -> rand_core-0.6.4.crate https://crates.io/api/v1/crates/redox_syscall/0.2.16/download -> redox_syscall-0.2.16.crate https://crates.io/api/v1/crates/regex-syntax/0.6.28/download -> regex-syntax-0.6.28.crate https://crates.io/api/v1/crates/regex/1.7.1/download -> regex-1.7.1.crate https://crates.io/api/v1/crates/rustc-hash/1.1.0/download -> rustc-hash-1.1.0.crate https://crates.io/api/v1/crates/rustix/0.36.7/download -> rustix-0.36.7.crate https://crates.io/api/v1/crates/rustix/0.37.3/download -> rustix-0.37.3.crate https://crates.io/api/v1/crates/shlex/1.1.0/download -> shlex-1.1.0.crate https://crates.io/api/v1/crates/similar/2.2.1/download -> similar-2.2.1.crate https://crates.io/api/v1/crates/strsim/0.10.0/download -> strsim-0.10.0.crate https://crates.io/api/v1/crates/syn/1.0.107/download -> syn-1.0.107.crate https://crates.io/api/v1/crates/syn/2.0.18/download -> syn-2.0.18.crate https://crates.io/api/v1/crates/tempfile/3.4.0/download -> tempfile-3.4.0.crate https://crates.io/api/v1/crates/termcolor/1.2.0/download -> termcolor-1.2.0.crate https://crates.io/api/v1/crates/unicode-ident/1.0.6/download -> unicode-ident-1.0.6.crate https://crates.io/api/v1/crates/unicode-width/0.1.10/download -> unicode-width-0.1.10.crate https://crates.io/api/v1/crates/version_check/0.9.4/download -> version_check-0.9.4.crate https://crates.io/api/v1/crates/wasi/0.11.0+wasi-snapshot-preview1/download -> wasi-0.11.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/which/4.4.0/download -> which-4.4.0.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-util/0.1.5/download -> winapi-util-0.1.5.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/windows-sys/0.42.0/download -> windows-sys-0.42.0.crate https://crates.io/api/v1/crates/windows-sys/0.45.0/download -> windows-sys-0.45.0.crate https://crates.io/api/v1/crates/windows-sys/0.48.0/download -> windows-sys-0.48.0.crate https://crates.io/api/v1/crates/windows-targets/0.42.2/download -> windows-targets-0.42.2.crate https://crates.io/api/v1/crates/windows-targets/0.48.1/download -> windows-targets-0.48.1.crate https://crates.io/api/v1/crates/windows_aarch64_gnullvm/0.42.2/download -> windows_aarch64_gnullvm-0.42.2.crate https://crates.io/api/v1/crates/windows_aarch64_gnullvm/0.48.0/download -> windows_aarch64_gnullvm-0.48.0.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.42.2/download -> windows_aarch64_msvc-0.42.2.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.48.0/download -> windows_aarch64_msvc-0.48.0.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.42.2/download -> windows_i686_gnu-0.42.2.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.48.0/download -> windows_i686_gnu-0.48.0.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.42.2/download -> windows_i686_msvc-0.42.2.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.48.0/download -> windows_i686_msvc-0.48.0.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.42.2/download -> windows_x86_64_gnu-0.42.2.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.48.0/download -> windows_x86_64_gnu-0.48.0.crate https://crates.io/api/v1/crates/windows_x86_64_gnullvm/0.42.2/download -> windows_x86_64_gnullvm-0.42.2.crate https://crates.io/api/v1/crates/windows_x86_64_gnullvm/0.48.0/download -> windows_x86_64_gnullvm-0.48.0.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.42.2/download -> windows_x86_64_msvc-0.42.2.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.48.0/download -> windows_x86_64_msvc-0.48.0.crate https://crates.io/api/v1/crates/yansi-term/0.1.2/download -> yansi-term-0.1.2.crate
 _eclasses_=cargo	4dede41d64d595673f6da62ab5540fa0	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	rust-toolchain	ab72acc17f5dea7b8fadd410d34b798c	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=413f91922cefae758de7807d8e077c5f
+_md5_=1a115b3ae4401df2f1986c6073d085d1
diff --git a/metadata/md5-cache/games-strategy/Manifest.gz b/metadata/md5-cache/games-strategy/Manifest.gz
index a297786c1e84..283c8e214592 100644
--- a/metadata/md5-cache/games-strategy/Manifest.gz
+++ b/metadata/md5-cache/games-strategy/Manifest.gz
diff --git a/metadata/md5-cache/games-strategy/freeciv-3.0.10 b/metadata/md5-cache/games-strategy/freeciv-3.0.10
deleted file mode 100644
index 65b7b2d78ca3..000000000000
--- a/metadata/md5-cache/games-strategy/freeciv-3.0.10
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=app-arch/gzip virtual/pkgconfig !dedicated? ( nls? ( sys-devel/gettext ) )
-DEFINED_PHASES=configure install postinst postrm preinst setup
-DEPEND=app-arch/bzip2 app-arch/xz-utils dev-libs/icu:= net-misc/curl sys-libs/zlib auth? ( app-arch/zstd:= dev-libs/openssl:= !mysql? ( ( !sqlite? ( dev-db/mysql-connector-c:= ) ) ) mysql? ( dev-db/mysql-connector-c:= ) sqlite? ( dev-db/sqlite:3 ) ) aimodules? ( dev-libs/libltdl ) !dedicated? ( media-libs/libpng gtk? ( x11-libs/gtk+:3 ) mapimg? ( media-gfx/imagemagick:= ) modpack? ( x11-libs/gtk+:3 ) nls? ( virtual/libintl ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) !sdl? ( !gtk? ( x11-libs/gtk+:3 ) ) sdl? ( media-libs/libsdl2[video] media-libs/sdl2-gfx media-libs/sdl2-image[png] media-libs/sdl2-ttf ) server? ( aimodules? ( dev-build/libtool ) ) sound? ( media-libs/libsdl2[sound] media-libs/sdl2-mixer[vorbis] ) ) readline? ( sys-libs/readline:= ) system-lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) ) !dedicated? ( x11-base/xorg-proto )
-DESCRIPTION=Multiplayer strategy game (Civilization Clone)
-EAPI=8
-HOMEPAGE=https://www.freeciv.org/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=desktop lua-single qmake-utils xdg
-IUSE=aimodules auth dedicated +gtk mapimg modpack mysql nls qt5 readline sdl +server +sound sqlite +system-lua +lua_single_target_lua5-3
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=GPL-2+
-RDEPEND=app-arch/bzip2 app-arch/xz-utils dev-libs/icu:= net-misc/curl sys-libs/zlib auth? ( app-arch/zstd:= dev-libs/openssl:= !mysql? ( ( !sqlite? ( dev-db/mysql-connector-c:= ) ) ) mysql? ( dev-db/mysql-connector-c:= ) sqlite? ( dev-db/sqlite:3 ) ) aimodules? ( dev-libs/libltdl ) !dedicated? ( media-libs/libpng gtk? ( x11-libs/gtk+:3 ) mapimg? ( media-gfx/imagemagick:= ) modpack? ( x11-libs/gtk+:3 ) nls? ( virtual/libintl ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) !sdl? ( !gtk? ( x11-libs/gtk+:3 ) ) sdl? ( media-libs/libsdl2[video] media-libs/sdl2-gfx media-libs/sdl2-image[png] media-libs/sdl2-ttf ) server? ( aimodules? ( dev-build/libtool ) ) sound? ( media-libs/libsdl2[sound] media-libs/sdl2-mixer[vorbis] ) ) readline? ( sys-libs/readline:= ) system-lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) )
-REQUIRED_USE=system-lua? ( ^^ ( lua_single_target_lua5-3 ) ) dedicated? ( !gtk !mapimg !modpack !nls !qt5 !sdl !sound ) !dedicated? ( || ( gtk qt5 sdl ) )
-SLOT=0
-SRC_URI=mirror://sourceforge/freeciv/freeciv-3.0.10.tar.xz
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	multilib	c19072c3cd7ac5cb21de013f7e9832e0	qmake-utils	a8dd17b1d94586164f5e3fc12b1c6b81	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=071c517c6b574d6a6ea1d238b6c8216c
diff --git a/metadata/md5-cache/games-strategy/freeciv-3.1.0_beta4 b/metadata/md5-cache/games-strategy/freeciv-3.1.0
index 861873e6c1c0..fd2ea68fa03f 100644
--- a/metadata/md5-cache/games-strategy/freeciv-3.1.0_beta4
+++ b/metadata/md5-cache/games-strategy/freeciv-3.1.0
@@ -7,10 +7,11 @@ HOMEPAGE=https://www.freeciv.org/ https://github.com/freeciv/freeciv/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=desktop lua-single meson xdg
 IUSE=dedicated gtk3 gtk4 json mapimg modpack mysql nls +qt5 qt6 readline rule-editor sdl +server +sound +system-lua web-server +lua_single_target_lua5-4
+KEYWORDS=~amd64 ~ppc64 ~x86
 LICENSE=GPL-2+
 RDEPEND=app-arch/bzip2 app-arch/xz-utils app-arch/zstd:= dev-build/libtool dev-db/sqlite:3 dev-libs/icu:= net-misc/curl sys-libs/zlib !dedicated? ( media-libs/libpng gtk3? ( x11-libs/gtk+:3 ) gtk4? ( gui-libs/gtk:4 ) mapimg? ( media-gfx/imagemagick:= ) nls? ( virtual/libintl ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) qt6? ( dev-qt/qtbase:6[gui,widgets] ) sdl? ( media-libs/libsdl2[video] media-libs/sdl2-gfx media-libs/sdl2-image[png] media-libs/sdl2-ttf ) sound? ( media-libs/libsdl2[sound] media-libs/sdl2-mixer[vorbis] ) ) json? ( dev-libs/jansson:= ) readline? ( sys-libs/readline:= ) system-lua? ( lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) )
 REQUIRED_USE=system-lua? ( ^^ ( lua_single_target_lua5-4 ) ) !dedicated? ( || ( gtk3 gtk4 qt5 qt6 sdl ) ) dedicated? ( !gtk3 !gtk4 !mapimg !nls !qt5 !qt6 !sdl !sound ) qt5? ( !qt6 ) qt6? ( !qt5 )
 SLOT=0
-SRC_URI=https://github.com/freeciv/freeciv/archive/refs/tags/R3_1_0_beta4.tar.gz -> freeciv-3.1.0_beta4.tar.gz
+SRC_URI=https://github.com/freeciv/freeciv/archive/refs/tags/R3_1_0.tar.gz -> freeciv-3.1.0.tar.gz
 _eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	lua-single	86d497a20c93c7ce83af442f627515c1	lua-utils	d37a16dbcc1f07f71bc48da75ed7a0cb	meson	56446e0ef4b4c9af0e2dd4cdef1a086e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
 _md5_=66867d6af7dcc3b75416fb461c179b06
diff --git a/metadata/md5-cache/mate-base/Manifest.gz b/metadata/md5-cache/mate-base/Manifest.gz
index d17cae1ef305..3eea447eae9b 100644
--- a/metadata/md5-cache/mate-base/Manifest.gz
+++ b/metadata/md5-cache/mate-base/Manifest.gz
diff --git a/metadata/md5-cache/mate-base/caja-1.26.3 b/metadata/md5-cache/mate-base/caja-1.26.3
index 209755f0a596..42106f463c38 100644
--- a/metadata/md5-cache/mate-base/caja-1.26.3
+++ b/metadata/md5-cache/mate-base/caja-1.26.3
@@ -4,7 +4,7 @@ DESCRIPTION=Caja file manager for the MATE desktop
 EAPI=8
 HOMEPAGE=https://mate-desktop.org
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=mate
+INHERIT=flag-o-matic mate
 IUSE=+introspection +mate nls xmp
 KEYWORDS=amd64 ~arm ~arm64 ~loong ~riscv x86
 LICENSE=GPL-2+ LGPL-2+
@@ -12,5 +12,5 @@ PDEPEND=mate? ( >=x11-themes/mate-icon-theme-1.26 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://pub.mate-desktop.org/releases/1.26/caja-1.26.3.tar.xz
-_eclasses_=autotools	3af8f60c4bdb23e738db506a630898ee	gnome.org	6b39404f1491c60a2d32e3c693a683fe	gnome2	fc9e598eaac41c6ac9ed1a44bc004d03	gnome2-utils	30dbce54b89e77b86f366548f94419ad	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	mate	0637ce2e7478ea114b5fd1ae437bcb69	mate-desktop.org	cce6a61620b2b79811e4c3c30f0e5c83	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=8d884ef508be91d926b357051a4bd111
+_eclasses_=autotools	3af8f60c4bdb23e738db506a630898ee	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	gnome.org	6b39404f1491c60a2d32e3c693a683fe	gnome2	fc9e598eaac41c6ac9ed1a44bc004d03	gnome2-utils	30dbce54b89e77b86f366548f94419ad	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	mate	0637ce2e7478ea114b5fd1ae437bcb69	mate-desktop.org	cce6a61620b2b79811e4c3c30f0e5c83	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=ecb4efdad54742af1ae28579633bbad1
diff --git a/metadata/md5-cache/mate-base/caja-1.27.2 b/metadata/md5-cache/mate-base/caja-1.27.2
index c4523cbd357a..bb7117da3fc5 100644
--- a/metadata/md5-cache/mate-base/caja-1.27.2
+++ b/metadata/md5-cache/mate-base/caja-1.27.2
@@ -4,7 +4,7 @@ DESCRIPTION=Caja file manager for the MATE desktop
 EAPI=8
 HOMEPAGE=https://mate-desktop.org
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=mate
+INHERIT=flag-o-matic mate
 IUSE=+introspection +mate nls xmp
 LICENSE=GPL-2+ LGPL-2+
 PDEPEND=mate? ( >=x11-themes/mate-icon-theme-1.27 )
@@ -12,5 +12,5 @@ RDEPEND=>=app-accessibility/at-spi2-core-2.46.0:2 >=dev-libs/glib-2.58.1:2 >=dev
 RESTRICT=test
 SLOT=0
 SRC_URI=https://pub.mate-desktop.org/releases/1.27/caja-1.27.2.tar.xz
-_eclasses_=autotools	3af8f60c4bdb23e738db506a630898ee	gnome.org	6b39404f1491c60a2d32e3c693a683fe	gnome2	fc9e598eaac41c6ac9ed1a44bc004d03	gnome2-utils	30dbce54b89e77b86f366548f94419ad	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	mate	0637ce2e7478ea114b5fd1ae437bcb69	mate-desktop.org	cce6a61620b2b79811e4c3c30f0e5c83	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=cc2374c717f8cd20c7500f1b1df779e5
+_eclasses_=autotools	3af8f60c4bdb23e738db506a630898ee	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	gnome.org	6b39404f1491c60a2d32e3c693a683fe	gnome2	fc9e598eaac41c6ac9ed1a44bc004d03	gnome2-utils	30dbce54b89e77b86f366548f94419ad	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	mate	0637ce2e7478ea114b5fd1ae437bcb69	mate-desktop.org	cce6a61620b2b79811e4c3c30f0e5c83	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg	4a14c5c24f121e7da66e5aab4a168c6e	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=20fbc0cb03610dc9704fd04104b1fd8c
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 2cbeaaf4ff05..1a74f6da7741 100644
--- a/metadata/md5-cache/media-libs/Manifest.gz
+++ b/metadata/md5-cache/media-libs/Manifest.gz
diff --git a/metadata/md5-cache/media-libs/ctl-1.5.2_p20221224 b/metadata/md5-cache/media-libs/ctl-1.5.2_p20221224
index dd3b61061f98..c22cc349bac2 100644
--- a/metadata/md5-cache/media-libs/ctl-1.5.2_p20221224
+++ b/metadata/md5-cache/media-libs/ctl-1.5.2_p20221224
@@ -4,7 +4,7 @@ DEPEND=dev-libs/imath:= >=media-libs/openexr-3:=[threads] media-libs/tiff:= !med
 DESCRIPTION=AMPAS' Color Transformation Language
 EAPI=8
 HOMEPAGE=https://github.com/ampas/CTL
-INHERIT=cmake
+INHERIT=cmake flag-o-matic
 IUSE=test
 KEYWORDS=amd64 ~ppc64 x86
 LICENSE=AMPAS
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ampas/CTL/archive/3fc4ae7a8af35d380654e573d895216fd5ba407e.tar.gz -> ctl-1.5.2_p20221224.tar.gz
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=5057712a7475f6b49123917b8966e075
+_md5_=d33e819d18c3cbe73dc9dc1cbbd0d304
diff --git a/metadata/md5-cache/media-libs/ctl-1.5.3 b/metadata/md5-cache/media-libs/ctl-1.5.3
new file mode 100644
index 000000000000..e647d8ceb583
--- /dev/null
+++ b/metadata/md5-cache/media-libs/ctl-1.5.3
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig app-alternatives/ninja >=dev-build/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/imath:= >=media-libs/openexr-3:=[threads] media-libs/tiff:= !media-libs/openexr_ctl
+DESCRIPTION=AMPAS' Color Transformation Language
+EAPI=8
+HOMEPAGE=https://github.com/ampas/CTL
+INHERIT=cmake flag-o-matic
+IUSE=test
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=AMPAS
+RDEPEND=dev-libs/imath:= >=media-libs/openexr-3:=[threads] media-libs/tiff:= !media-libs/openexr_ctl
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ampas/CTL/archive/ctl-1.5.3.tar.gz
+_eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=d39e913f1580b2b6231b18351f94e588
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 0e7bf8b72980..e5822d9d15e4 100644
--- a/metadata/md5-cache/net-libs/Manifest.gz
+++ b/metadata/md5-cache/net-libs/Manifest.gz
diff --git a/metadata/md5-cache/net-libs/rustls-ffi-0.12.2 b/metadata/md5-cache/net-libs/rustls-ffi-0.12.2
new file mode 100644
index 000000000000..3b889d0a4f0b
--- /dev/null
+++ b/metadata/md5-cache/net-libs/rustls-ffi-0.12.2
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/cargo-c >=virtual/rust-1.53
+DEFINED_PHASES=compile configure install prepare test unpack
+DESCRIPTION=C-to-rustls bindings
+EAPI=8
+HOMEPAGE=https://github.com/rustls/rustls-ffi
+INHERIT=cargo flag-o-matic multilib-minimal rust-toolchain
+IUSE=debug abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64
+LICENSE=|| ( Apache-2.0 MIT ISC ) BSD ISC MIT ISC openssl SSLeay MIT
+SLOT=0/0.12.2
+SRC_URI=https://github.com/rustls/rustls-ffi/archive/refs/tags/v0.12.2.tar.gz -> rustls-ffi-0.12.2.tar.gz https://crates.io/api/v1/crates/aho-corasick/1.1.1/download -> aho-corasick-1.1.1.crate https://crates.io/api/v1/crates/base64/0.21.5/download -> base64-0.21.5.crate https://crates.io/api/v1/crates/cc/1.0.83/download -> cc-1.0.83.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/getrandom/0.2.11/download -> getrandom-0.2.11.crate https://crates.io/api/v1/crates/libc/0.2.153/download -> libc-0.2.153.crate https://crates.io/api/v1/crates/log/0.4.21/download -> log-0.4.21.crate https://crates.io/api/v1/crates/memchr/2.6.4/download -> memchr-2.6.4.crate https://crates.io/api/v1/crates/regex-automata/0.3.9/download -> regex-automata-0.3.9.crate https://crates.io/api/v1/crates/regex-syntax/0.7.5/download -> regex-syntax-0.7.5.crate https://crates.io/api/v1/crates/regex/1.9.6/download -> regex-1.9.6.crate https://crates.io/api/v1/crates/ring/0.17.5/download -> ring-0.17.5.crate https://crates.io/api/v1/crates/rustls-pemfile/2.1.1/download -> rustls-pemfile-2.1.1.crate https://crates.io/api/v1/crates/rustls-pki-types/1.3.1/download -> rustls-pki-types-1.3.1.crate https://crates.io/api/v1/crates/rustls-webpki/0.102.0/download -> rustls-webpki-0.102.0.crate https://crates.io/api/v1/crates/rustls/0.22.0/download -> rustls-0.22.0.crate https://crates.io/api/v1/crates/rustversion/1.0.14/download -> rustversion-1.0.14.crate https://crates.io/api/v1/crates/spin/0.9.8/download -> spin-0.9.8.crate https://crates.io/api/v1/crates/subtle/2.5.0/download -> subtle-2.5.0.crate https://crates.io/api/v1/crates/untrusted/0.9.0/download -> untrusted-0.9.0.crate https://crates.io/api/v1/crates/wasi/0.11.0+wasi-snapshot-preview1/download -> wasi-0.11.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/windows-sys/0.48.0/download -> windows-sys-0.48.0.crate https://crates.io/api/v1/crates/windows-targets/0.48.5/download -> windows-targets-0.48.5.crate https://crates.io/api/v1/crates/windows_aarch64_gnullvm/0.48.5/download -> windows_aarch64_gnullvm-0.48.5.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.48.5/download -> windows_aarch64_msvc-0.48.5.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.48.5/download -> windows_i686_gnu-0.48.5.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.48.5/download -> windows_i686_msvc-0.48.5.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.48.5/download -> windows_x86_64_gnu-0.48.5.crate https://crates.io/api/v1/crates/windows_x86_64_gnullvm/0.48.5/download -> windows_x86_64_gnullvm-0.48.5.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.48.5/download -> windows_x86_64_msvc-0.48.5.crate https://crates.io/api/v1/crates/zeroize/1.7.0/download -> zeroize-1.7.0.crate
+_eclasses_=cargo	4dede41d64d595673f6da62ab5540fa0	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	rust-toolchain	ab72acc17f5dea7b8fadd410d34b798c	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=68a4eaecbc4e2291af848c841059541f
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index e7e9625f0b95..e093b7a26436 100644
--- a/metadata/md5-cache/net-misc/Manifest.gz
+++ b/metadata/md5-cache/net-misc/Manifest.gz
diff --git a/metadata/md5-cache/net-misc/curl-8.5.0-r3 b/metadata/md5-cache/net-misc/curl-8.5.0-r3
index 2a12bae5329a..fd2d475a767f 100644
--- a/metadata/md5-cache/net-misc/curl-8.5.0-r3
+++ b/metadata/md5-cache/net-misc/curl-8.5.0-r3
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://curl.se/download/curl-8.5.0.tar.xz verify-sig? ( https://curl.se/download/curl-8.5.0.tar.xz.asc )
 _eclasses_=autotools	3af8f60c4bdb23e738db506a630898ee	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
-_md5_=9a92714b6e7caf408f77c0c5a2692d00
+_md5_=88cdaa79234208d6fbaaa377374a0d32
diff --git a/metadata/md5-cache/net-misc/curl-8.6.0-r1 b/metadata/md5-cache/net-misc/curl-8.6.0-r2
index dd38b84f09a3..b19bf3a398ab 100644
--- a/metadata/md5-cache/net-misc/curl-8.6.0-r1
+++ b/metadata/md5-cache/net-misc/curl-8.6.0-r2
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://curl.se/download/curl-8.6.0.tar.xz verify-sig? ( https://curl.se/download/curl-8.6.0.tar.xz.asc )
 _eclasses_=autotools	3af8f60c4bdb23e738db506a630898ee	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
-_md5_=8ac4a0cd892d65addad4c96af906c81e
+_md5_=7f42d9a4bbd2a57aa81674ff012940ae
diff --git a/metadata/md5-cache/net-misc/curl-8.7.1 b/metadata/md5-cache/net-misc/curl-8.7.1-r1
index 3126bb4f6da3..3550b3002615 100644
--- a/metadata/md5-cache/net-misc/curl-8.7.1
+++ b/metadata/md5-cache/net-misc/curl-8.7.1-r1
@@ -1,6 +1,6 @@
 BDEPEND=dev-lang/perl virtual/pkgconfig test? ( sys-apps/diffutils http2? ( >=net-libs/nghttp2-1.15.0:=[utils,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nghttp3? ( net-libs/nghttp2:=[utils,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) verify-sig? ( sec-keys/openpgp-keys-danielstenberg ) sys-devel/gnuconfig >=app-portage/elt-patches-20240116 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7-r3 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-20 )
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=sys-libs/zlib-1.1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] adns? ( net-dns/c-ares:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) brotli? ( app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) http2? ( >=net-libs/nghttp2-1.12.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) idn? ( net-dns/libidn2:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( >=net-nds/openldap-2.0.0:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nghttp3? ( >=net-libs/nghttp3-0.15.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/ngtcp2-0.19.1[gnutls,ssl,-openssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) psl? ( net-libs/libpsl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rtmp? ( media-video/rtmpdump[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( >=net-libs/libssh2-1.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( gnutls? ( app-misc/ca-certificates >=net-libs/gnutls-3.1.10:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/nettle:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mbedtls? ( app-misc/ca-certificates net-libs/mbedtls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openssl? ( >=dev-libs/openssl-0.9.7:=[sslv3(-)=,static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rustls? ( ~net-libs/rustls-ffi-0.12.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DEPEND=>=sys-libs/zlib-1.1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] adns? ( net-dns/c-ares:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) brotli? ( app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) http2? ( >=net-libs/nghttp2-1.12.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) idn? ( net-dns/libidn2:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( >=net-nds/openldap-2.0.0:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nghttp3? ( >=net-libs/nghttp3-0.15.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/ngtcp2-0.19.1[gnutls,ssl,-openssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) psl? ( net-libs/libpsl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rtmp? ( media-video/rtmpdump[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( >=net-libs/libssh2-1.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( gnutls? ( app-misc/ca-certificates >=net-libs/gnutls-3.1.10:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/nettle:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mbedtls? ( app-misc/ca-certificates net-libs/mbedtls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openssl? ( >=dev-libs/openssl-0.9.7:=[sslv3(-)=,static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rustls? ( >=net-libs/rustls-ffi-0.12.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <net-libs/rustls-ffi-0.13.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 DESCRIPTION=A Client that groks URLs
 EAPI=8
 HOMEPAGE=https://curl.se/
@@ -8,10 +8,10 @@ INHERIT=autotools multilib-minimal multiprocessing prefix toolchain-funcs verify
 IUSE=+adns +alt-svc brotli +ftp gnutls gopher +hsts +http2 idn +imap kerberos ldap mbedtls nghttp3 +openssl +pop3 +psl +progress-meter rtmp rustls samba +smtp ssh ssl sslv3 static-libs test telnet +tftp websockets zstd curl_ssl_gnutls curl_ssl_mbedtls +curl_ssl_openssl curl_ssl_rustls abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=BSD curl ISC test? ( BSD-4 )
-RDEPEND=>=sys-libs/zlib-1.1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] adns? ( net-dns/c-ares:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) brotli? ( app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) http2? ( >=net-libs/nghttp2-1.12.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) idn? ( net-dns/libidn2:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( >=net-nds/openldap-2.0.0:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nghttp3? ( >=net-libs/nghttp3-0.15.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/ngtcp2-0.19.1[gnutls,ssl,-openssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) psl? ( net-libs/libpsl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rtmp? ( media-video/rtmpdump[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( >=net-libs/libssh2-1.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( gnutls? ( app-misc/ca-certificates >=net-libs/gnutls-3.1.10:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/nettle:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mbedtls? ( app-misc/ca-certificates net-libs/mbedtls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openssl? ( >=dev-libs/openssl-0.9.7:=[sslv3(-)=,static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rustls? ( ~net-libs/rustls-ffi-0.12.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RDEPEND=>=sys-libs/zlib-1.1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] adns? ( net-dns/c-ares:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) brotli? ( app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) http2? ( >=net-libs/nghttp2-1.12.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) idn? ( net-dns/libidn2:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( >=net-nds/openldap-2.0.0:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nghttp3? ( >=net-libs/nghttp3-0.15.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/ngtcp2-0.19.1[gnutls,ssl,-openssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) psl? ( net-libs/libpsl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rtmp? ( media-video/rtmpdump[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( >=net-libs/libssh2-1.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( gnutls? ( app-misc/ca-certificates >=net-libs/gnutls-3.1.10:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/nettle:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mbedtls? ( app-misc/ca-certificates net-libs/mbedtls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openssl? ( >=dev-libs/openssl-0.9.7:=[sslv3(-)=,static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rustls? ( >=net-libs/rustls-ffi-0.12.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <net-libs/rustls-ffi-0.13.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=ssl? ( ^^ ( curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_openssl curl_ssl_rustls ) ) curl_ssl_gnutls? ( gnutls ) curl_ssl_mbedtls? ( mbedtls ) curl_ssl_openssl? ( openssl ) curl_ssl_rustls? ( rustls ) nghttp3? ( !openssl alt-svc )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://curl.se/download/curl-8.7.1.tar.xz verify-sig? ( https://curl.se/download/curl-8.7.1.tar.xz.asc )
 _eclasses_=autotools	3af8f60c4bdb23e738db506a630898ee	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	multibuild	d67e78a235f541871c7dfe4cf7931489	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	verify-sig	a79ba011daaf532d71a219182474d150
-_md5_=bf71ef05c16447e88627b112117d0d70
+_md5_=761a236114dc6db2264155f3bebc917f
diff --git a/metadata/md5-cache/net-misc/passt-2024.03.26 b/metadata/md5-cache/net-misc/passt-2024.03.26
new file mode 100644
index 000000000000..b6693d875f92
--- /dev/null
+++ b/metadata/md5-cache/net-misc/passt-2024.03.26
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile prepare
+DESCRIPTION=User-mode networking daemons for VMs and namespaces, replacement for Slirp
+EAPI=8
+HOMEPAGE=https://passt.top/
+INHERIT=toolchain-funcs
+IUSE=static
+KEYWORDS=~amd64 ~arm64 ~riscv
+LICENSE=BSD GPL-2+
+SLOT=0
+SRC_URI=https://passt.top/passt/snapshot/passt-4988e2b.tar.xz -> passt-2024.03.26.tar.xz
+_eclasses_=multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=88abf0db50f8c242e59ea6537464ed44
diff --git a/metadata/md5-cache/net-misc/passt-9999 b/metadata/md5-cache/net-misc/passt-9999
index 092cd96dd475..deac0df1debc 100644
--- a/metadata/md5-cache/net-misc/passt-9999
+++ b/metadata/md5-cache/net-misc/passt-9999
@@ -9,4 +9,4 @@ LICENSE=BSD GPL-2+
 PROPERTIES=live
 SLOT=0
 _eclasses_=git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=c9197e6c198afd2e165ae1d501c3e263
+_md5_=88abf0db50f8c242e59ea6537464ed44
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index d53bbbfbd4f7..ca5184772f36 100644
--- a/metadata/md5-cache/sci-libs/Manifest.gz
+++ b/metadata/md5-cache/sci-libs/Manifest.gz
diff --git a/metadata/md5-cache/sci-libs/dcmtk-3.6.8 b/metadata/md5-cache/sci-libs/dcmtk-3.6.8
index b2b1ee38712a..13705a1e9600 100644
--- a/metadata/md5-cache/sci-libs/dcmtk-3.6.8
+++ b/metadata/md5-cache/sci-libs/dcmtk-3.6.8
@@ -12,4 +12,4 @@ RDEPEND=dev-libs/icu:= png? ( media-libs/libpng:* ) ssl? ( dev-libs/openssl:= )
 SLOT=0
 SRC_URI=https://dicom.offis.de/download/dcmtk/release/dcmtk-3.6.8.tar.gz
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=99fa68cba8643296f3073f306194b8e8
+_md5_=56344c23a8adbd3088def983c694e7c3
diff --git a/metadata/md5-cache/sci-libs/lis-2.1.3 b/metadata/md5-cache/sci-libs/lis-2.1.3
index a7f197c9c40d..958c0db962a8 100644
--- a/metadata/md5-cache/sci-libs/lis-2.1.3
+++ b/metadata/md5-cache/sci-libs/lis-2.1.3
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20240116 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7-r3 virtual/fortran
+BDEPEND=app-arch/unzip sys-devel/gnuconfig >=app-portage/elt-patches-20240116 || ( >=dev-build/automake-1.16.5:1.16 ) || ( >=dev-build/autoconf-2.72-r1:2.72 >=dev-build/autoconf-2.71-r6:2.71 ) >=dev-build/libtool-2.4.7-r3 virtual/fortran
 DEFINED_PHASES=configure install prepare pretend setup
 DEPEND=mpi? ( virtual/mpi ) virtual/fortran
 DESCRIPTION=Library of Iterative Solvers for Linear Systems
@@ -12,4 +12,4 @@ RDEPEND=mpi? ( virtual/mpi ) virtual/fortran
 SLOT=0
 SRC_URI=https://www.ssisc.org/lis/dl/lis-2.1.3.zip
 _eclasses_=autotools	3af8f60c4bdb23e738db506a630898ee	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=87482cb56984c73627170c7600afbfde
+_md5_=d24b5bc6d0ba3ea4b4d9efa6f9c682a5
diff --git a/metadata/md5-cache/sci-libs/netcdf-fortran-4.5.4 b/metadata/md5-cache/sci-libs/netcdf-fortran-4.5.4
index 41f2738bb419..00f488b2e705 100644
--- a/metadata/md5-cache/sci-libs/netcdf-fortran-4.5.4
+++ b/metadata/md5-cache/sci-libs/netcdf-fortran-4.5.4
@@ -4,12 +4,12 @@ DEPEND=sci-libs/netcdf dev-lang/cfortran virtual/fortran
 DESCRIPTION=Scientific library and interface for array oriented data access
 EAPI=8
 HOMEPAGE=https://www.unidata.ucar.edu/software/netcdf/
-INHERIT=autotools fortran-2
+INHERIT=autotools flag-o-matic fortran-2
 IUSE=doc examples static-libs
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=UCAR-Unidata
 RDEPEND=sci-libs/netcdf virtual/fortran
 SLOT=0/7
 SRC_URI=https://github.com/Unidata/netcdf-fortran/archive/v4.5.4.tar.gz -> netcdf-fortran-4.5.4.tar.gz
-_eclasses_=autotools	3af8f60c4bdb23e738db506a630898ee	fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=a6290df6ea0230cb672a24a2ffbfdd47
+_eclasses_=autotools	3af8f60c4bdb23e738db506a630898ee	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	5f49a16f67f81bdf873e3d1f10b10001	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=1cf52415e48531158149917afe7dea97
diff --git a/metadata/md5-cache/sci-libs/netcdf-fortran-4.5.4-r1 b/metadata/md5-cache/sci-libs/netcdf-fortran-4.5.4-r1
index 3a4f2508c47b..9ed9ccab429a 100644
--- a/metadata/md5-cache/sci-libs/netcdf-fortran-4.5.4-r1
+++ b/metadata/md5-cache/sci-libs/netcdf-fortran-4.5.4-r1
@@ -4,12 +4,12 @@ DEPEND=sci-libs/netcdf dev-lang/cfortran virtual/fortran
 DESCRIPTION=Scientific library and interface for array oriented data access
 EAPI=8
 HOMEPAGE=https://www.unidata.ucar.edu/software/netcdf/
-INHERIT=fortran-2
+INHERIT=flag-o-matic fortran-2
 IUSE=doc examples static-libs
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=UCAR-Unidata
 RDEPEND=sci-libs/netcdf virtual/fortran
 SLOT=0/7
 SRC_URI=https://downloads.unidata.ucar.edu/netcdf-fortran/4.5.4/netcdf-fortran-4.5.4.tar.gz -> netcdf-fortran-4.5.4.upstream.tar.gz
-_eclasses_=fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=820c0aa8d1611787caef8fd7a03624a4
+_eclasses_=flag-o-matic	288c54efeb5e2aa70775e39032695ad4	fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea	multilib	c19072c3cd7ac5cb21de013f7e9832e0	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
+_md5_=8f0ddca242a5c9f8bf71d47db1089be1
diff --git a/metadata/md5-cache/sci-libs/netcdf-fortran-4.6.1 b/metadata/md5-cache/sci-libs/netcdf-fortran-4.6.1
index a9c685501866..bd750c6c7fa5 100644
--- a/metadata/md5-cache/sci-libs/netcdf-fortran-4.6.1
+++ b/metadata/md5-cache/sci-libs/netcdf-fortran-4.6.1
@@ -4,7 +4,7 @@ DEPEND=sci-libs/netcdf dev-lang/cfortran virtual/fortran
 DESCRIPTION=Scientific library and interface for array oriented data access
 EAPI=8
 HOMEPAGE=https://www.unidata.ucar.edu/software/netcdf/
-INHERIT=cmake fortran-2
+INHERIT=cmake flag-o-matic fortran-2
 IUSE=doc examples test zstd
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=UCAR-Unidata
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/7
 SRC_URI=https://downloads.unidata.ucar.edu/netcdf-fortran/4.6.1/netcdf-fortran-4.6.1.tar.gz
 _eclasses_=cmake	c7c9a62d6232cac66d4ea32d575c3e7c	flag-o-matic	288c54efeb5e2aa70775e39032695ad4	fortran-2	40c4450f1c4ecb2ee694d96e1958d4ea	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=86ffa0cc41d256b07d42b6f1e071bf80
+_md5_=04108cd8232a8153ece8072040be97b1
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 9c5a1f8ad2df..8624922a96d8 100644
--- a/metadata/md5-cache/sys-apps/Manifest.gz
+++ b/metadata/md5-cache/sys-apps/Manifest.gz
diff --git a/metadata/md5-cache/sys-apps/openrc-9999 b/metadata/md5-cache/sys-apps/openrc-9999
index 4f6c0a137f50..fe778084695b 100644
--- a/metadata/md5-cache/sys-apps/openrc-9999
+++ b/metadata/md5-cache/sys-apps/openrc-9999
@@ -1,15 +1,15 @@
 BDEPEND=>=dev-build/meson-1.2.3 app-alternatives/ninja dev-build/meson-format-array >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst preinst test unpack
-DEPEND=ncurses? ( sys-libs/ncurses:0= ) pam? ( sys-libs/pam ) audit? ( sys-process/audit ) sys-process/psmisc selinux? ( sys-apps/policycoreutils >=sys-libs/libselinux-2.6 ) virtual/os-headers ncurses? ( virtual/pkgconfig )
+DEPEND=pam? ( sys-libs/pam ) audit? ( sys-process/audit ) sys-process/psmisc selinux? ( sys-apps/policycoreutils >=sys-libs/libselinux-2.6 ) virtual/os-headers
 DESCRIPTION=OpenRC manages the services, startup and shutdown of a host
 EAPI=8
 HOMEPAGE=https://github.com/openrc/openrc/
 INHERIT=meson pam git-r3
-IUSE=audit bash debug ncurses pam newnet +netifrc selinux s6 +sysvinit sysv-utils unicode
+IUSE=audit bash debug pam newnet +netifrc selinux s6 +sysvinit sysv-utils unicode
 LICENSE=BSD-2
 PDEPEND=netifrc? ( net-misc/netifrc )
 PROPERTIES=live
-RDEPEND=ncurses? ( sys-libs/ncurses:0= ) pam? ( sys-libs/pam ) audit? ( sys-process/audit ) sys-process/psmisc selinux? ( sys-apps/policycoreutils >=sys-libs/libselinux-2.6 ) bash? ( app-shells/bash ) sysv-utils? ( !sys-apps/systemd[sysv-utils(-)] !sys-apps/sysvinit ) !sysv-utils? ( sysvinit? ( >=sys-apps/sysvinit-2.86-r6[selinux?] ) s6? ( sys-apps/s6-linux-init[sysv-utils(-)] ) ) virtual/tmpfiles selinux? ( >=sec-policy/selinux-base-policy-2.20170204-r4 >=sec-policy/selinux-openrc-2.20170204-r4 )
+RDEPEND=pam? ( sys-libs/pam ) audit? ( sys-process/audit ) sys-process/psmisc selinux? ( sys-apps/policycoreutils >=sys-libs/libselinux-2.6 ) bash? ( app-shells/bash ) sysv-utils? ( !sys-apps/systemd[sysv-utils(-)] !sys-apps/sysvinit ) !sysv-utils? ( sysvinit? ( >=sys-apps/sysvinit-2.86-r6[selinux?] ) s6? ( sys-apps/s6-linux-init[sysv-utils(-)] ) ) virtual/tmpfiles selinux? ( >=sec-policy/selinux-base-policy-2.20170204-r4 >=sec-policy/selinux-openrc-2.20170204-r4 )
 SLOT=0
 _eclasses_=flag-o-matic	288c54efeb5e2aa70775e39032695ad4	git-r3	86fa1f157b70b9d2ff340c4633b1cf4b	meson	56446e0ef4b4c9af0e2dd4cdef1a086e	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	ninja-utils	2df4e452cea39a9ec8fb543ce059f8d6	pam	b56d0c9c20fc5b553f13c8ae165a10a5	python-utils-r1	8904b60325f22500b0c3ad4b68a42448	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=be7fab03b047cdb6ad42d27fd1fdf6ec
+_md5_=d415afd21c70b622a3f5c40bc8bf01fc
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 3f3d7c13641b..1e3e95b89452 100644
--- a/metadata/md5-cache/sys-kernel/Manifest.gz
+++ b/metadata/md5-cache/sys-kernel/Manifest.gz
diff --git a/metadata/md5-cache/sys-kernel/asahi-sources-6.6.0_p15 b/metadata/md5-cache/sys-kernel/asahi-sources-6.6.0_p16
index bf54f4eac684..79a03e250182 100644
--- a/metadata/md5-cache/sys-kernel/asahi-sources-6.6.0_p15
+++ b/metadata/md5-cache/sys-kernel/asahi-sources-6.6.0_p16
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DEPEND=rust? ( || ( dev-lang/rust[rust-src] dev-lang/rust-bin[rust-src] ) dev-util/bindgen )
+DEPEND=rust? ( || ( dev-lang/rust:stable/1.75[rust-src,rustfmt] ~dev-lang/rust-bin-1.75.0[rust-src,rustfmt] ) dev-util/bindgen )
 DESCRIPTION=Asahi Linux kernel sources
 EAPI=8
 HOMEPAGE=https://asahilinux.org
 INHERIT=kernel-2
 IUSE=rust symlink build
-KEYWORDS=~arm64
+KEYWORDS=arm64
 LICENSE=GPL-2
 RDEPEND=!build? ( app-alternatives/cpio dev-lang/perl app-alternatives/bc dev-build/make sys-devel/bison sys-devel/flex >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=6.6.0_p15
-SRC_URI=https://github.com/AsahiLinux/linux/archive/refs/tags/asahi-6.6-15.tar.gz -> asahi-sources-6.6.0_p15.tar.gz
+SLOT=6.6.0_p16
+SRC_URI=https://github.com/AsahiLinux/linux/archive/refs/tags/asahi-6.6-16.tar.gz -> asahi-sources-6.6.0_p16.tar.gz https://raw.githubusercontent.com/chadmed/asahi-overlay/main/sys-kernel/asahi-kernel/files/asahi-kernel-6.6.0_p16-rust-alloc-fix.patch -> asahi-sources-6.6.0_p16-rust-alloc-fix.patch
 _eclasses_=crossdev	f04338ff78f213a4a55c5c37b3c6563e	estack	c61c368a76fdf3a82fdf8dbaebea3804	kernel-2	d7063ec2420394c5b29ed142f15b5033	multilib	c19072c3cd7ac5cb21de013f7e9832e0	multiprocessing	30ead54fa2e2b5f9cd4e612ffc34d0fe	optfeature	222cb475c5a4f7ae7cfb0bf510a6fe54	toolchain-funcs	e56c7649b804f051623c8bc1a1c44084
-_md5_=b2460afa7634e992ad7461276eb5b63f
+_md5_=dd8de2ddf571813e63b31239c715f84d
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 51e8a6006524..eae2daf3a284 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 17308 BLAKE2B d6f0e1960300dcb206a4c928e0f5497ce5fdccacc5a0e5c2508a7af6e8f9498d7b9fb9ec3f5d3954053fc79e8414e01e57845b94cb5cd6f55794cf59ea3c0d33 SHA512 5f19269ff35bf881a2c86ab1b5ce45cd93f05493fcf48e1b653586b091edc5c0a54df7ffbf400b137990209ea574d0bf309d777111a8f29a227fc82a5ed91540
-TIMESTAMP 2024-04-01T00:40:34Z
+TIMESTAMP 2024-04-01T06:40:39Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmYKAoJfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmYKVudfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDndxAAqHoeqYmBMxhnVJk9fSdZfzzxxqU/6NLrSn02tBwc5exlGqltFnFuJ6DV
-hLE1ui4iAEJ4R/xTSJUEwEa/Tws36Gb0UmmIcvk20FN2gMT93671a4jOTrEEhmKV
-ZRsV3eTNGYnIeXRMCJI2BweeJYwb9nMnGME0jgLMuTOF1VgVBYtzD3ID+ga28+j9
-Fju9RQ/wqxtSEbP/An4lxHK7AjEWrQPbBlyKnht43sBi2psQX2OpVOFIg4CQTQHZ
-dltd/dgs6PztBY5gHIuW/ipSq4SOsj3ehXBLULd/K/wxBPMPAEH/bAU68Q6yIVmT
-joYirXihzqnXM7smtfAvSprN2QdJM8rEUjR9ea5Ftjm/ZG1ix1RNwcv06QHWml4L
-tNSVfb1AParjWCfRkM+CdVDmeVf3zLbzjqHRsoXYcv9Q3vT/uZRI/gurkpGKLfEv
-e2Vz96FFvxHXCbyH00Plgzlj91eeSy8S/rZds07z9mFbG69rLzXvbZ8dnd2Db3sd
-E0JnEiQ0gDUR+Yw14/zXyqWvP2qK6SiEUakCrAbqP4m84GDrc0nEdfEqdA6VOR2z
-7E+N5Z44Y/s/WnFuP3Amx4G8D82HWL2Lk7tqHdT1kh08X6vOe0cJrqFDraHHQS2H
-0iNfv0kmuWuLqv3/npSu46Bkr4J7Bgs1h8joSEQ3KD7RKhXnKtw=
-=cw5e
+klDrUA/+N1zyafPclZAvIy78VoD7MoXJzGhpDXE7pZduu8GLD0hAZAvYm/7MtiEN
+NjK7wOzWWqdVG5UTl3skFyO2rR0CJsPAsZ8pfGAVQvEwaaHXYbBvTOBuaouajq8g
+OtBIdcAEfk7Y2BKBja8qUXMKb5IqNC0jUepYdB8ULBwj4AP48ekzIbPz4wtOxIe5
+wMil4z9hHnZTnQ9rHhX3jmekE5kHshjR2FHbvooGiNvrAXadpuahk/NxCtjwi7a5
+xXPXflsF0LnpZ+5Nfey187YxS4KI+IWUseZgAyU6l2U2lokyPsspI1iUTLz4U1e8
+VQKO3ts1R85hzWGL6Cn/t9bcgXMfCfLQsTizAiVJB7wMQbx8SmDrWbEg5n50D/0d
+FURiBZAHAwtPjtaf7Vx8B/KsieYitwFuOmUp42YEvyncnZrHXE1A3vnbPiqnXQAr
+0bBiEfs5EJEEcjNZCiRdM4SPVZyz2IOnzfb2TrMBS781iUYXeEc+BPXRU/2NCWHX
+sBGQsFz/0bUR6fFN2IWYTUQnEDsEQGAsqTpkF+RCzHLZUeUB+6TOCWInX32gBBwh
+jyYUsV4OmTWoPG+3tGG6vVrUPlbBnwy8oufRaQRuC469wiOc4VkR5APnpdAdtK80
+BjHY30mT1mYKRPbpyWSpVyDi1A7Kdr4IOEYLP83r6S352pvwxGw=
+=/vpq
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 8171365535e7..ca2d03051d2d 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Mon, 01 Apr 2024 00:40:30 +0000
+Mon, 01 Apr 2024 06:40:34 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index c2cf072279f8..7a1ff599301d 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Mon Apr  1 12:40:30 AM UTC 2024
+Mon Apr  1 06:40:34 AM UTC 2024
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 5ebc8cf6227c..96ca56a13e98 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Mon, 01 Apr 2024 00:45:00 +0000
+Mon, 01 Apr 2024 06:45:00 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index a53789648098..d4364398ff2f 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-36ffd01c33d24951f02bd4e79f260cffcfec0eda 1711930562 2024-04-01T00:16:02+00:00
+2c56a9076789f5e7ff3e1147cb34f371ff70d68a 1711952822 2024-04-01T06:27:02+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 796284e30560..6b877a847a35 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1711932000 Mon 01 Apr 2024 12:40:00 AM UTC
+1711953600 Mon 01 Apr 2024 06:40:00 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 8171365535e7..ca2d03051d2d 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Mon, 01 Apr 2024 00:40:30 +0000
+Mon, 01 Apr 2024 06:40:34 +0000
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 0ccd0e229e3d..01c8b965785c 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/rustls-ffi/Manifest b/net-libs/rustls-ffi/Manifest
index 86354f487159..bd95f87c9d04 100644
--- a/net-libs/rustls-ffi/Manifest
+++ b/net-libs/rustls-ffi/Manifest
@@ -59,6 +59,7 @@ DIST rustls-0.21.0.crate 275213 BLAKE2B 171a60d69ac0d56ed269fdf588a42dfb64f0b8ac
 DIST rustls-0.22.0.crate 324340 BLAKE2B 5271032969b2b57fd180bacf01a4366d8634fcf1026c569fdda88b51235555414ede32abca2f1510ca32ffa28f7bc013c9c1c2487d1889de8252e1b55ee8298a SHA512 224c5ab84f647fa5416507c790bfa1c33f80219f28ba114816c3674885268f4c412fdcb00063e4253bf552c38f1e9156ea98f2f1234e0dcc16600f6dba4411a0
 DIST rustls-ffi-0.10.0.tar.gz 95815 BLAKE2B ec776649b18a0cfae1249d5824a4b043d3a3b854ee4571a11ffb4828e107d1c5afb09cb84f0f9074c80d683b083b315301958fd806dc00b549a080707f84ad14 SHA512 f9208c830f1963484e8f12f81457c7beddd0ce8679988b7ff2356240cd753c8948b6566ba603fc6cf707c5eef26cc74316bdb3f71cfa060cf3228f5cd813eeb3
 DIST rustls-ffi-0.12.1.tar.gz 107794 BLAKE2B 0fddfcb5980811a1b80db2bfb578132d627ad8b47f1abeeaf052a7135f43b2e29888aa6aaa89ccd315299b73b147126cd67be41b104b1911d06c8324dee0b0e9 SHA512 bf188492ad14e32b1c26873fe5c078a5b24067a0e00e675b7b107f616ab8e3316b7b0e4d0c5646b9407bd171c2e16e97a9bb2fb1a335212aa72fe07045da6aab
+DIST rustls-ffi-0.12.2.tar.gz 107905 BLAKE2B 8aadfd5d0e0a6372aef7646d52ab4b1690e2128ce2e7927657a631b32c5e291bcfe4fc6dba51b7ae17d700a78d1b447b50576aa09aca2e03020622f8ba72fc3e SHA512 30ff92a9faa1c7e683258c5910e726bb793d77dc1dcc14546780c36762fa6d3fbb49cb39f75258221fa01316cf6705de982edfc77c40ca8b37affd7cc64f7019
 DIST rustls-ffi-0.9.1.tar.gz 80976 BLAKE2B cf9ad6a5666be19d882e0bd3575b2f7bc1e8dec891a7c192c0fc7bcff48801cc7af1c73d005d32c5801514ce852dbee54f74ea0a16110638184bed9fd483740c SHA512 cbced119a486a28aa437da09eda841b00a8bee47d2aadf4cf39601baaa8481b2600dd554d5a6e219374690c2c9d25f0d4ed253b9401ba5ac9ecfb6947625a38d
 DIST rustls-pemfile-0.2.1.crate 14278 BLAKE2B 2cd27153a5db80581e43009c0ac21209f57341e584c8f11789bc9e9ac71d6cc456c60554bd97176c7567ad67896b74acc6372c62973a3ff1e965bd1d0dd52bfa SHA512 1c03cd74314bc0bffda4803f6e7692e53e3cf67a6bd30e6c96a861d8c118363b0e871a9e28c4e1a4d4f1fcdf98f3a5af3be5f0250f3653836429a27645a10c80
 DIST rustls-pemfile-2.1.1.crate 26161 BLAKE2B d761c8c0944b4697336ba389e379e9224471d64e61ec3499427615ba99f9eeb38a47b2bf23579bd9445c28b14811028a81fde89308d1552d805f49bda18833a0 SHA512 5acffbcfa1dc50c20f290f2546caf669334de0ade8153cdfc7f8259ec9076808d2d47ce602829ad1369d546d21347965250cd2c4e46e835f29111d11f38aafde
@@ -123,5 +124,6 @@ DIST winnow-0.4.1.crate 138177 BLAKE2B 9fb55dc5dbca2250c5921aebc42fd8dff7da6fc70
 DIST zeroize-1.7.0.crate 19039 BLAKE2B 2f94a5025f409bd2b96a456d2f78a34c6b05b5554abe7ef3fad2a55a8fcff8a6a1b971be660aa4c2954ab7d6e89bebc431036e349edef74711292f9f64b1dbae SHA512 9d31e3e76e8c861309a3579c21f6da5fd6b056c7d7a350427445a1a832e8827204804783f7f9b808acaa2148efef883d9078bf84943b1db55526bba5bf5a2756
 EBUILD rustls-ffi-0.10.0-r1.ebuild 2429 BLAKE2B 834e8ae3ba8886ee2170c8e5a62f9c882f3b60f8204397d598de3b95d4b2edd324013d4810d3d8ff4abaf5c09e8542d320f01028c48bf074425fb00edba91d06 SHA512 677d5ace039db50d3581a34eb3fc2e2c9f3b636c2993b804cda37a102cda02198bd8a45b5bf763bc3206dc4ca0ecbe4bd1900d53c1db92de9264bd92a081aa1f
 EBUILD rustls-ffi-0.12.1-r2.ebuild 2413 BLAKE2B 7c5e20bd8c82ff986eb12c3cbcdb5e64c5cd44d7007e060e30afd68723ebe4a05cc4b77a6ebcd6c31d72ce26b406992c64adffab2ea00197150d74610b4916b7 SHA512 0c6886c70a6118a9cba72d128a77951b7abe0244a17562d38918a0150bd64e9f5eb916418218dab8d9385ae99c454402db476f1140e4a7660e17212e995f6c87
+EBUILD rustls-ffi-0.12.2.ebuild 2350 BLAKE2B c687a42ed365c1ef386e9cfd83339fe03137c1bc3058718eff641fbe56b1ab52f6a83c2e89eac91dd69bd387faf266e50ac22fceac4903d853a346e3fdd4f1b1 SHA512 7a931f98a44b37667a8a1525c3135e7c9e934f38f4a54ebf3cdcbdb1f5a5d4a2fd5a2d188f747433259a7d507b0d828d40e4a6522250928bdecc16fc5bb4aab8
 EBUILD rustls-ffi-0.9.1-r1.ebuild 2747 BLAKE2B f73c676004c7a4869ada531391b2dd442bc1541259465e3171b8a2f478dbc737d91d7446b52cc6a44ce7716266c7eca0fb5f7cabab4aedab9b8771b6510aab84 SHA512 3fa80f3657fcb1ef2bb6dc8976469c87ac101f616e41626469270d750b1fd9e8fbe67522d90ba46f5ee07f3cd88854d4feff871b8024d2bea9430616b65de9b3
 MISC metadata.xml 322 BLAKE2B 8c95cd2d631dfe96e34412bbc1c12bce2f13f631840642f2bd52384b554b0c1eeb03e2b959921ff2cf0f15f9cdb2ba37acc016549f84c47ca6e7ad857cf3e7df SHA512 08c35857ba4e7e85d619e94b5e6f0a3203faced5f83fb7bdb63d8e25c793bfb8af1b5e1f252613fa8e60e45e3e1a5e092b64f96b8ac2156c9f336bab7a4d6ae1
diff --git a/net-libs/rustls-ffi/rustls-ffi-0.12.2.ebuild b/net-libs/rustls-ffi/rustls-ffi-0.12.2.ebuild
new file mode 100644
index 000000000000..a09c7412e487
--- /dev/null
+++ b/net-libs/rustls-ffi/rustls-ffi-0.12.2.ebuild
@@ -0,0 +1,110 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+	aho-corasick@1.1.1
+	base64@0.21.5
+	cc@1.0.83
+	cfg-if@1.0.0
+	getrandom@0.2.11
+	libc@0.2.153
+	log@0.4.21
+	memchr@2.6.4
+	regex-automata@0.3.9
+	regex-syntax@0.7.5
+	regex@1.9.6
+	ring@0.17.5
+	rustls-pemfile@2.1.1
+	rustls-pki-types@1.3.1
+	rustls-webpki@0.102.0
+	rustls@0.22.0
+	rustversion@1.0.14
+	spin@0.9.8
+	subtle@2.5.0
+	untrusted@0.9.0
+	wasi@0.11.0+wasi-snapshot-preview1
+	windows-sys@0.48.0
+	windows-targets@0.48.5
+	windows_aarch64_gnullvm@0.48.5
+	windows_aarch64_msvc@0.48.5
+	windows_i686_gnu@0.48.5
+	windows_i686_msvc@0.48.5
+	windows_x86_64_gnu@0.48.5
+	windows_x86_64_gnullvm@0.48.5
+	windows_x86_64_msvc@0.48.5
+	zeroize@1.7.0
+"
+
+inherit cargo flag-o-matic multilib-minimal rust-toolchain
+
+DESCRIPTION="C-to-rustls bindings"
+HOMEPAGE="https://github.com/rustls/rustls-ffi"
+SRC_URI="https://github.com/rustls/rustls-ffi/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" ${CARGO_CRATE_URIS}"
+
+LICENSE="|| ( Apache-2.0 MIT ISC )"
+# Dependent crate licenses
+LICENSE+=" BSD ISC MIT"
+# For Ring (see its LICENSE)
+LICENSE+=" ISC openssl SSLeay MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+
+BDEPEND="dev-util/cargo-c"
+
+QA_FLAGS_IGNORED="usr/lib.*/librustls.*"
+
+src_prepare() {
+	default
+
+	multilib_copy_sources
+}
+
+src_configure() {
+	# bug #927231
+	filter-lto
+
+	# textrels in ring
+	# Hopefully fixed with https://github.com/rustls/rustls-ffi/pull/389
+	export RUSTFLAGS="${RUSTFLAGS} -C link-arg=-Wl,-z,notext"
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_compile() {
+	local cargoargs=(
+		--library-type=cdylib
+		--prefix="${EPREFIX}"/usr
+		--libdir="${EPREFIX}/usr/$(get_libdir)"
+		--target="$(rust_abi)"
+		$(usev !debug '--release')
+	)
+
+	cargo cbuild "${cargoargs[@]}" || die "cargo cbuild failed"
+}
+
+multilib_src_test() {
+	local cargoargs=(
+		--prefix="${EPREFIX}"/usr
+		--libdir="${EPREFIX}/usr/$(get_libdir)"
+		--target="$(rust_abi)"
+		$(usex debug '--debug' '--release')
+	)
+
+	cargo ctest "${cargoargs[@]}" || die "cargo ctest failed"
+}
+
+multilib_src_install() {
+	local cargoargs=(
+		--library-type=cdylib
+		--prefix="${EPREFIX}"/usr
+		--libdir="${EPREFIX}/usr/$(get_libdir)"
+		--target="$(rust_abi)"
+		--destdir="${D}"
+		$(usex debug '--debug' '--release')
+	)
+
+	cargo cinstall "${cargoargs[@]}" || die "cargo cinstall failed"
+}
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index df684064bd8d..b4386465b70c 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 2b4dbb7407e7..0da7bcbf2cd0 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -1,8 +1,8 @@
 AUX curl-8.5.0-ipv6-configure-c99.patch 749 BLAKE2B b9d94d4ec5c310f8d3985eb6e4a17cd12b8aec696c015c41e94fe7eee2cced4d6ed1f192f3dbe4877a33f5102522844b63a11039fd285371472f282065cf2894 SHA512 cc04189480055a82fc264fcf3b70a3a748bccaec5f263340c41aabde600ea020fd2bce46461d4f75f5ed7708cfc5a0afcf95e6f1d098333c3968b75169a27a93
 AUX curl-8.5.0-mpd-stream-http-adjust_pollset.patch 2979 BLAKE2B da34eb58eb8b706916657279bc071ab97145e33e7e7eb553ffe924be7a97e3d784d5e2fc8270363e95e815687201b6fae1b374dc666093441c5177bfe76eb835 SHA512 11ed5f8482d985aab4e7ab07f0e8821d76a494d0147a61ce7901379cd1f36f577c544627f5ad61a38b70e9e4659fc050c5b9e0be4247ab410f55850a946872d1
-AUX curl-8.6.0-backport-rustls-detection.patch 8387 BLAKE2B 2a77c15f40807b1b19831a8bdd2401fd42297c95b6c66463d5ec8fafc95036796f2f862a258f7825f728f30e886f658fdfff796eebe0e093d7b8758ccfc360a3 SHA512 8f5de7b048f439d0d5da35abb079dfa7a2a9e1fd130ebc7c7b10f06ab66b4adc76ce0b26a80470f57caed64ee2909ef6bd155261edb1cdca037335bc67b91bfc
+AUX curl-8.6.0-rustls-fixes.patch 8210 BLAKE2B 8c25023f84ba897eca22d53937259131d8c6032d428ec2ef6f7d696a2634fbb2af298228463209a170bd7ab0ee40f0975a01a331dced24d1ea51c935a3d3b3be SHA512 8737a18d03b1f159c69864e127087bf297077c546ab5a05ff01977a9dfc9e8cf2d4ae14a4091e8f1d8aedcd4f6de894f0b5374baaaf4413bff9bd6de6165a556
 AUX curl-8.6.0-vtls-revert-receive-max-buffer-add-test-case.patch 2028 BLAKE2B b018e0fc5649b558e732a903eafe1249575829613b129ceaaaeeae3c7fc9f5c237c3688067c2370dc3ad1d67632acdfb805efa93db4e8bd8d6dd8b2f5043e2b5 SHA512 d8d4eb0b294d243f5c241e0243ca41e28b12aa8804a4f8c73e2ab70edd52de9be2b7a26b706085e10ae4a9c31545112cd4b68dcda6647571bb8d5528b7625de6
-AUX curl-8.7.1-fix-pkgconfig-macros.patch 1228 BLAKE2B c2a3db1fe29ed3023e0f3279f23426474747d44fc7f09c0fd25f2a43e02df1cd7b0f5ff9a11a5e795eb9fd2373117bd88202d79b64d8ed2c97f37251860f8812 SHA512 3a0a86dcdf3c12c2b234ac776c266d2eb4c11545e86219d3533f6e63196be9fc531d72a2d34d3bffdf5e7487bdda92a03a3ebe6910d9ab7601fd9873f4bd695c
+AUX curl-8.7.1-rustls-fixes.patch 1526 BLAKE2B c1ce730bc1d78d9655378a174b32706bc964e07b1b4fde5385212542bf0c85b2adfa8110266410b6d8766bb2ca5c46a58295d7098ab4acb71acb0a5dbd6d5d20 SHA512 7ca3004306595ead6057bbbfa6dcbb5d7b8b7782a7627e5607a916fff8626b4c3bfb2cbac48aa0e65a93b3c4fb0f87a7ee09273f1f9b1eadb9126fbcc4a72ce2
 AUX curl-prefix.patch 880 BLAKE2B 5b7552a8339014221864a585d174b02a96ec7dd7fe8762d331d1981834044f8ec4db64d527a4ded3f5f4cccc86f281576668de092439eb19f5477d5fcf8369cf SHA512 c7cd13b9ccbd12ed01ea121ffece9c23b898a5b34698bae59ae1dd23b1cf2445180b84d80c4a640981f16dba5018df944f405dd5c660addab54ca21e0e673b7f
 AUX curl-respect-cflags-3.patch 406 BLAKE2B 1b533144858aff5566150c4a2648ad2e48e8ff29849ae285592edfee4b3332d06e750395dea7190ee6a01d2b5ee2c2c42c10400c2e5defa09963a90a1a10417d SHA512 3219e4e67d534e35012909243fc8d69d58989462db44dd507c502e7aaa299f1d9a01392e2c83797cc2bdb53d503470c5d6e7bf94572a6ccc6e5eafcc0466bc54
 DIST curl-8.5.0.tar.xz 2658520 BLAKE2B cfd591f9703b9c63712dbe74494b05a80ce5a4fc4f8fc0fbf57058578eed5f33d71277f688d5d9f409bcd82e3a4cacaa5615a44f2a7c554559c6be7dd5188893 SHA512 acffa2cf61d9b8e4188575a1b40227da8d722df2e5fe8bb82a222b4eb2fd64bf8aebd90852ce050c79fb5e517d5cee2546bf7de92ede1dd394263e231cb741a3
@@ -11,8 +11,8 @@ DIST curl-8.6.0.tar.xz 2630108 BLAKE2B 1b01de396008d57e154e2b5fc1acf1dd000703fa5
 DIST curl-8.6.0.tar.xz.asc 488 BLAKE2B 18d7583a9aa6a278bea5a8a74461ff06f45ec418cd4542b015c74091c353b340afcc5dfe7e5e99f0b9fac7de9251164044a85e4f6665bf042636868a2c613d0a SHA512 2b835bb4b307e5e1c929b7136c5acfb9f6f06efa471ac27060336cabcfac40e02143f40434986c5e6817d4a9562b09efa8ff3168beed310a45453148cc1b5c8f
 DIST curl-8.7.1.tar.xz 2707016 BLAKE2B a2a9f48d0b69c0d92fcbbda535ce55082a5243abe3ab2db80d6fa3f32fb2c98b65026d69fc45c94e966398cf9ba8d9c95b6b91f4768b54749ed3275dd21838ef SHA512 5bbde9d5648e9226f5490fa951690aaf159149345f3a315df2ba58b2468f3e59ca32e8a49734338afc861803a4f81caac6d642a4699b72c6310ebfb1f618aad2
 DIST curl-8.7.1.tar.xz.asc 488 BLAKE2B 1c91d116aecc8e98d8ec3aad68b7c96f11151e6c2716f531e5d2989e9b6b1199e180603673891d7967cdcdaee1d6b5e15160ccabe9b51590e2887022db03c2ed SHA512 f98c393997c4a32f545a8982226e8cd612395210915a4576c2ce227d0f650cff341be7bf15e989d1789abf32ac4fd9c190b9250b81e650b569e8532048746b37
-EBUILD curl-8.5.0-r3.ebuild 11033 BLAKE2B 79723d0a812be90d2f758a0170ce014464ea0e6f5b4bae60508f8d4169b35132a73aeeb68c05165c471821d340fc70bdaecd196507ba54bdd6449f580f1e16ab SHA512 6c45139a87c5b48980cf533a169241657439e0a156b67a75770d3530a4984e0be0ac6bb98a560dc8e7b9436865ead3601b1c6347f5f781cf46175fc7f52f208b
-EBUILD curl-8.6.0-r1.ebuild 10895 BLAKE2B 0589f67919cc317a0704a132bc8c36960219c686ce10957fa3c437c0479e6ed000d9d5cbf2045acecc2a369207b9a5b06ecd8938609a42babffdfa8a86bac310 SHA512 29a821850b5ace4161101d6034daf248fa449498a2551a4a704df7b39fbea28d115213661bc7d831a1757e700e71dfd332463f9793eec5de723c84d2e314ad97
-EBUILD curl-8.7.1.ebuild 10826 BLAKE2B 8feea206d4a45ed3f1b72a58efe06f2390acc6998c09c78ea83624b1d87da4bbcc621a4fba78ea17d0eab34fda7e19bf14b18ffd9c49fbbd6c095422b07e07b8 SHA512 5f2560ce6acd2706c33aa00e2caa47ec3371a6e88685388dd4e354d17f4950f9a1785d5861189ad8cad378d6701630be07c1da59c537295ce8c55290ec7d67b4
+EBUILD curl-8.5.0-r3.ebuild 11079 BLAKE2B 6d975ad2d3591ea6de6a248ddd1acb049f0cd5d0a371eb487c6a4d193084a5e684673bd55860ac838a48a4c66d11f778b37a253bd325abba5ab545a65bd1bfb5 SHA512 33b5a05de99819327fac0af5ec94790be3953086b2996cb6628cbfb6be959f64a6b5a8d2015371eacd6945be768e3fe1bae67773b512599d127c298c66858c91
+EBUILD curl-8.6.0-r2.ebuild 10882 BLAKE2B 1d706f59390420fae5c19b6615aa6cf07387e0d53ef90d5dcabc9aa75c1435eb89f587f9dda1c9a179b5c71a86897a80008a847145bce2216bcb6a22e1345ad2 SHA512 5f48ab69e84695c8b25675ba5bf32072a74f12e488d30dce653447a65d21f1be0f2a2a34f77608939ed0bd2763e3a86c1ab8b57312f691815b6ce93bf424383d
+EBUILD curl-8.7.1-r1.ebuild 10869 BLAKE2B 405e8cc4d0c6ec696d7b6fa97330d3ff6cfb6420cc7239cd56df3416066f6309093f6eba23a3cca964b6ca98850b7e9de785c81a2a42a4fafc31e70a1258dfe1 SHA512 c1914cae9f108a386c39bd1def774e77acfeb617da093fd2ad48c1e47cdd75b53cf5dd20bfdd4f4201518b76f76798013d99e3e27c337d7e2f91d619018a1335
 EBUILD curl-9999.ebuild 10771 BLAKE2B 48c610c3ea379320360d48a6473b9db17f7d8ffb895fde8e602e14822f5d8d56d2a9fc499f1302a4bb941581a9b8e082b1aa799222c8aa9c9faf546776ba671a SHA512 9afd073cdbb994726349e8ffd33ab994e64b0fc1f19574343bb0f22953dbb16471b332271478bf0d016c709f82acdf633075c9b55daf286dea9ffa5a927bb6de
 MISC metadata.xml 2090 BLAKE2B 54d366aadfc25650c40081ff10eb150bcb9811a29f802c418afce166c384e2bafc999ff7e69ceeb25a96e952d4875d808e8e89240b437741cd363fab46267a25 SHA512 2103a849b67f9a14a85eb769b870e7272bf8f9c78ca579b4271150be01f26787a884614bff874d50f90be99af4a6ecb136510fca2837463e0bc91611ddbeae40
diff --git a/net-misc/curl/curl-8.5.0-r3.ebuild b/net-misc/curl/curl-8.5.0-r3.ebuild
index d9c017b22b2b..1ea9264041c8 100644
--- a/net-misc/curl/curl-8.5.0-r3.ebuild
+++ b/net-misc/curl/curl-8.5.0-r3.ebuild
@@ -132,6 +132,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-respect-cflags-3.patch
 	"${FILESDIR}"/${P}-ipv6-configure-c99.patch
 	"${FILESDIR}"/${P}-mpd-stream-http-adjust_pollset.patch
+	"${FILESDIR}"/${PN}-8.6.0-rustls-fixes.patch
 )
 
 src_prepare() {
diff --git a/net-misc/curl/curl-8.6.0-r1.ebuild b/net-misc/curl/curl-8.6.0-r2.ebuild
index f48e3df12d7c..c31bf46b91d8 100644
--- a/net-misc/curl/curl-8.6.0-r1.ebuild
+++ b/net-misc/curl/curl-8.6.0-r2.ebuild
@@ -131,7 +131,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-prefix.patch
 	"${FILESDIR}"/${PN}-respect-cflags-3.patch
 	"${FILESDIR}"/${P}-vtls-revert-receive-max-buffer-add-test-case.patch
-	"${FILESDIR}"/${P}-backport-rustls-detection.patch
+	"${FILESDIR}"/${P}-rustls-fixes.patch
 )
 
 src_prepare() {
diff --git a/net-misc/curl/curl-8.7.1.ebuild b/net-misc/curl/curl-8.7.1-r1.ebuild
index 3338a14e2bef..f81f4b76f480 100644
--- a/net-misc/curl/curl-8.7.1.ebuild
+++ b/net-misc/curl/curl-8.7.1-r1.ebuild
@@ -85,8 +85,8 @@ RDEPEND="
 		openssl? (
 			>=dev-libs/openssl-0.9.7:=[sslv3(-)=,static-libs?,${MULTILIB_USEDEP}]
 		)
-		rustls? (
-			~net-libs/rustls-ffi-0.12.1:=[${MULTILIB_USEDEP}]
+		rustls? ( >=net-libs/rustls-ffi-0.12.1:=[${MULTILIB_USEDEP}]
+			<net-libs/rustls-ffi-0.13.0:=[${MULTILIB_USEDEP}]
 		)
 	)
 	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
@@ -130,7 +130,7 @@ QA_CONFIG_IMPL_DECL_SKIP=(
 PATCHES=(
 	"${FILESDIR}"/${PN}-prefix.patch
 	"${FILESDIR}"/${PN}-respect-cflags-3.patch
-	"${FILESDIR}"/${PN}-8.7.1-fix-pkgconfig-macros.patch
+	"${FILESDIR}"/${PN}-8.7.1-rustls-fixes.patch
 )
 
 src_prepare() {
diff --git a/net-misc/curl/files/curl-8.6.0-backport-rustls-detection.patch b/net-misc/curl/files/curl-8.6.0-rustls-fixes.patch
index 5d7b3a23c2c9..4f713668fd35 100644
--- a/net-misc/curl/files/curl-8.6.0-backport-rustls-detection.patch
+++ b/net-misc/curl/files/curl-8.6.0-rustls-fixes.patch
@@ -1,28 +1,22 @@
-https://github.com/curl/curl/commit/647e86a3efe1eea7a2a456c009cfe1eb55fe48eb
-https://github.com/curl/curl/pull/13202
+From a59683a3607bc0167ff702352d15eee1c0d658a6 Mon Sep 17 00:00:00 2001
 From: Matt Jolly <Matt.Jolly@footclan.ninja>
-Date: Fri, 29 Mar 2024 09:58:14 +1000
-Subject: [PATCH] curl-rustls.m4: add pkg-config support to rustls detection
+Date: Mon, 1 Apr 2024 08:49:27 +1000
+Subject: [PATCH] m4: fix rustls builds
 
-Based on the existing openssl pkg-config detection, this commit tries to
-use pkg-config to find `rustls` then falls back to the current approach
-if that fails.
+This patch consolidates the following commits to do with rustls
+detection using pkg-config:
 
-We use the following logic:
-
-- if no path is provided, just use pkg-config, if it's not there we have
-  a problem!
-- if a path is provided, try pkg-config
-  + if pkg-config fails, try and find rustls directly
+- https://github.com/curl/curl/commit/9c4209837094781d5eef69ae6bcad0e86b64bf99
+- https://github.com/curl/curl/commit/5a50cb5a18a141a463148562dab83fa3be1a3b90
 ---
- m4/curl-rustls.m4 | 209 ++++++++++++++++++++++++++++++++--------------
- 1 file changed, 145 insertions(+), 64 deletions(-)
+ m4/curl-rustls.m4 | 210 ++++++++++++++++++++++++++++++++--------------
+ 1 file changed, 146 insertions(+), 64 deletions(-)
 
 diff --git a/m4/curl-rustls.m4 b/m4/curl-rustls.m4
-index 75542e4..902327a 100644
+index 75542e4..8082cf9 100644
 --- a/m4/curl-rustls.m4
 +++ b/m4/curl-rustls.m4
-@@ -28,84 +28,165 @@ dnl check for rustls
+@@ -28,84 +28,166 @@ dnl check for rustls
  dnl ----------------------------------------------------
  
  if test "x$OPT_RUSTLS" != xno; then
@@ -205,6 +199,7 @@ index 75542e4..902327a 100644
 +      ssl_msg="rustls"
 +      AC_DEFINE(USE_RUSTLS, 1, [if rustls is enabled])
 +      AC_SUBST(USE_RUSTLS, [1])
++      USE_RUSTLS="yes"
 +      RUSTLS_ENABLED=1
 +      test rustls != "$DEFAULT_SSL_BACKEND" || VALID_DEFAULT_SSL_BACKEND=yes
 +    else
@@ -252,5 +247,6 @@ index 75542e4..902327a 100644
 +
 +
 +RUSTLS_ENABLED
---
+-- 
 2.44.0
+
diff --git a/net-misc/curl/files/curl-8.7.1-fix-pkgconfig-macros.patch b/net-misc/curl/files/curl-8.7.1-rustls-fixes.patch
index 91aed9582521..81bcb0734339 100644
--- a/net-misc/curl/files/curl-8.7.1-fix-pkgconfig-macros.patch
+++ b/net-misc/curl/files/curl-8.7.1-rustls-fixes.patch
@@ -1,27 +1,34 @@
-https://github.com/curl/curl/pull/13202
-From: Matt Jolly <kangie@gentoo.org>
-Date: Wed, 27 Mar 2024 22:52:26 +1000
-Subject: [PATCH] m4: fix rustls pkg-config codepath
+From a866b062b17ab94b16b817ab9969c561364a4d72 Mon Sep 17 00:00:00 2001
+From: Matt Jolly <Matt.Jolly@footclan.ninja>
+Date: Mon, 1 Apr 2024 08:36:51 +1000
+Subject: [PATCH] m4: fix rustls builds
 
-The previous pkg-config code would successfully detect rustls
-but did not set all appropriate variables and call the right macros to
-properly configure cURL.
+This patch consolidates the following commits to do with rustls
+detection using pkg-config:
 
-Closes: #13200
+- https://github.com/curl/curl/commit/9c4209837094781d5eef69ae6bcad0e86b64bf99
+- https://github.com/curl/curl/commit/5a50cb5a18a141a463148562dab83fa3be1a3b90
+---
+ m4/curl-rustls.m4 | 15 +++++++++++++++
+ 1 file changed, 15 insertions(+)
+
+diff --git a/m4/curl-rustls.m4 b/m4/curl-rustls.m4
+index 7c55230..8082cf9 100644
 --- a/m4/curl-rustls.m4
 +++ b/m4/curl-rustls.m4
-@@ -142,6 +142,10 @@ if test "x$OPT_RUSTLS" != xno; then
+@@ -142,6 +142,11 @@ if test "x$OPT_RUSTLS" != xno; then
        LIBS="$SSL_LIBS $LIBS"
        USE_RUSTLS="yes"
        ssl_msg="rustls"
 +      AC_DEFINE(USE_RUSTLS, 1, [if rustls is enabled])
 +      AC_SUBST(USE_RUSTLS, [1])
++      USE_RUSTLS="yes"
 +      RUSTLS_ENABLED=1
 +      test rustls != "$DEFAULT_SSL_BACKEND" || VALID_DEFAULT_SSL_BACKEND=yes
      else
        AC_MSG_ERROR([pkg-config: Could not find rustls])
      fi
-@@ -174,5 +178,15 @@ if test "x$OPT_RUSTLS" != xno; then
+@@ -174,5 +179,15 @@ if test "x$OPT_RUSTLS" != xno; then
    fi
  
    test -z "$ssl_msg" || ssl_backends="${ssl_backends:+$ssl_backends, }$ssl_msg"
@@ -37,3 +44,6 @@ Closes: #13200
 +
 +
 +RUSTLS_ENABLED
+-- 
+2.44.0
+
diff --git a/net-misc/passt/Manifest b/net-misc/passt/Manifest
index ae702608bc0c..0e4eb1674873 100644
--- a/net-misc/passt/Manifest
+++ b/net-misc/passt/Manifest
@@ -2,8 +2,10 @@ AUX Makefile-2024.03.20.patch 433 BLAKE2B 5e64a2a449806698bc812e38bfe46860e13a3b
 DIST passt-2023.12.04.tar.xz 188136 BLAKE2B f1d72fbb4bbb25f6a11e9ff87a91cf9bac06e047b8cb9a8b40402ced1422c23b105fa7e64646698d38ad747efa449c34cfdaecf492a3e4984114cbcf60656cdc SHA512 febd9fa22363438b52b2688481183d81c22966e1775139fc559dbfa50437c9b00ba09800db867738d25fcea8ac05d4589b75dcd2d0c88eeffefc0598d4236001
 DIST passt-2023.12.30.tar.xz 188596 BLAKE2B 75712a7cb7a00fea20427979153090d938b8c7b0e3da61c83cabb3751786034df35ebbe8afbd991d582a680f55b12792547b68efa931a5576dc181040b31e5fd SHA512 4b19d191e2526bacc61bb8ab2964f5da4e0535656b094a7592f91d6b437c855a586fc772e2abd89138ff4f89aae12ade494c6e0fe7bee1502fe319215200d8f0
 DIST passt-2024.03.20.tar.xz 195332 BLAKE2B 1bed740ddd235f300a4233fb2024f155758809589f1fdd2174ab99a8a93dd16044ab41814b215d12eb1e557966a73a3754bbff2b9acd752b45b385edd88ba3c7 SHA512 3701820e539545771d0f867fe0b8977cb5967e7501413f717fed08d2d2c141f17d86ed7238177b4fb4cf4cfc01c6c9d07e3c218c34b48e0a5a1f2b2ce8a5b903
+DIST passt-2024.03.26.tar.xz 195348 BLAKE2B d91e6ac1d50aae04ceb53a34341b545ff644ceccdfcfab461907050612d9d871f61591aac02ebddef9a607a9b39ce5017a2fc47c9189f85b9b9a70a30d010e4c SHA512 da771f8f334862f81702b22688c9d3552aefc2883b5a44c39156ff7a69f301cabf52fa0fb13f8695240db5411c498806d28d847fca8caff2bedb69d1a4b4e5a7
 EBUILD passt-2023.12.04.ebuild 707 BLAKE2B fe3b6c4c697e725c51b3cefec18e7501055c3abb0d2cb74d8b5983a73a6803ff2a5fafa2502b54725e4225072a5fa2dc6e0043524c89c6019d5380df79314aeb SHA512 0845a4d1dda79af28f08b2735297cd8fc515460df24fa9cf8d5d8653ffa3c20379e3ab5167b895fcd35b7f2068531aebe7c2e51fe9b86a65aa526f9a2cbf3306
 EBUILD passt-2023.12.30.ebuild 714 BLAKE2B afabcac34eb836f21812deeb1946d657a9bb7ed3e87868a2d50641ca8a21f43f869397f6ffe8736f66f96bf890f19f3c59f8f4c43956abfc9a0f8d17fa278b17 SHA512 e75a6066c5d13053047843c2bb0be917941d97305a53138e68dd6b5f758be01a623ca66c4d7dee37e14fc8fab212248d131cc1ccec049a506bc4ca0f679f2ec7
 EBUILD passt-2024.03.20.ebuild 842 BLAKE2B bdfd388a62cee3b064e5bdfd3f3960ff19fd505365469b3e5cc0d0148139b8dfb02020af67fda5be6e313faf1294a96ad6df106b8bf8b2fa01ee234285179bf7 SHA512 0c3f1480d9a325fba24471cd97a0030047d9f78261e93fc33429d6a56cb593f27828de96ddf5fd3cce547f0cfb95d5af8d5eae5331f9b29d9b565ac38ce94b27
-EBUILD passt-9999.ebuild 835 BLAKE2B 9ebedc9984187b66967d1061ee9d0017763e7dc873f705705da3baaf35859c173caf5aa88216d208de37fa17697945828e930a82c2cd3411d7ad27820489f521 SHA512 47c610d1df6e94f658265c5c20a31d0b2c0b8df8b6a2229cb9e00910c87c372410ddd36c0a9da584c8b2dc4d6984bac468951d9cd04609d6c7763e19e582cd3c
+EBUILD passt-2024.03.26.ebuild 842 BLAKE2B 2d3a84c42100682fc7cf027c16545a8ccb811f943a43bad17d8c8f00dfcbb54c5ecd73bb8e0690165dfa896baa6a898e95aa0c57482ec878b2d5bb46c593a2ac SHA512 7155fef1d337530c70ec44bef45a6acf5dbc9f747953a77569db921324ea0e69c3d314144735af83f33feef97f148fabd96c89779c17837f7062bdb4288f3a32
+EBUILD passt-9999.ebuild 842 BLAKE2B 2d3a84c42100682fc7cf027c16545a8ccb811f943a43bad17d8c8f00dfcbb54c5ecd73bb8e0690165dfa896baa6a898e95aa0c57482ec878b2d5bb46c593a2ac SHA512 7155fef1d337530c70ec44bef45a6acf5dbc9f747953a77569db921324ea0e69c3d314144735af83f33feef97f148fabd96c89779c17837f7062bdb4288f3a32
 MISC metadata.xml 1410 BLAKE2B 415cf4ab3e0d993066251ff9e136ea4a5ef13fc50b838b5dd057784600b5fb89fecb411cc0d61d08459e34da7fe34097d22b8908240f3e46e6ff50f503aa7089 SHA512 85d756f5b8077fb0838e1881f9ef48f08ca8da1ca540d8677632c81d34765d6fb1483b3fdd0eead64467aa7872b1ca133745610736d0afc5a2b8223abacc1cb6
diff --git a/net-misc/passt/passt-2024.03.26.ebuild b/net-misc/passt/passt-2024.03.26.ebuild
new file mode 100644
index 000000000000..90df839f93d9
--- /dev/null
+++ b/net-misc/passt/passt-2024.03.26.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="User-mode networking daemons for VMs and namespaces, replacement for Slirp"
+HOMEPAGE="https://passt.top/"
+
+RELEASE_COMMIT="4988e2b"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://passt.top/passt"
+else
+	SRC_URI="https://passt.top/passt/snapshot/passt-${RELEASE_COMMIT}.tar.xz -> ${P}.tar.xz"
+	S="${WORKDIR}/${PN}-${RELEASE_COMMIT}"
+	KEYWORDS="~amd64 ~arm64 ~riscv"
+fi
+
+LICENSE="BSD GPL-2+"
+SLOT="0"
+IUSE="static"
+
+PATCHES=(
+	"${FILESDIR}"/Makefile-2024.03.20.patch
+)
+
+src_prepare() {
+	default
+	tc-export CC
+}
+
+src_compile() {
+	[[ ${PV} != 9999* ]] && export VERSION="${PV}"
+	export prefix="${EPREFIX}/usr" docdir="${EPREFIX}/usr/share/doc/${P}"
+
+	emake $(usev static)
+}
diff --git a/net-misc/passt/passt-9999.ebuild b/net-misc/passt/passt-9999.ebuild
index 267622576406..90df839f93d9 100644
--- a/net-misc/passt/passt-9999.ebuild
+++ b/net-misc/passt/passt-9999.ebuild
@@ -8,7 +8,7 @@ inherit toolchain-funcs
 DESCRIPTION="User-mode networking daemons for VMs and namespaces, replacement for Slirp"
 HOMEPAGE="https://passt.top/"
 
-RELEASE_COMMIT="71dd405"
+RELEASE_COMMIT="4988e2b"
 
 if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999* ]]; then
 else
 	SRC_URI="https://passt.top/passt/snapshot/passt-${RELEASE_COMMIT}.tar.xz -> ${P}.tar.xz"
 	S="${WORKDIR}/${PN}-${RELEASE_COMMIT}"
-	KEYWORDS="~amd64 ~riscv"
+	KEYWORDS="~amd64 ~arm64 ~riscv"
 fi
 
 LICENSE="BSD GPL-2+"
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 3c56373495e7..9df952a81d5f 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 55beffcfc98b..1dc540a4d6a3 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -3305,8 +3305,6 @@ games-strategy/0ad:nvtt - Support for some uncompressed data formats (might be n
 games-strategy/colobot:devbuild - TODO
 games-strategy/colobot:tools - Build tools
 games-strategy/colobot-data:music - Enable music support
-games-strategy/freeciv:aimodules - Support for dynamically loadable AI modules (server-side)
-games-strategy/freeciv:auth - Add authentication capability via mysql, postgres, or sqlite3
 games-strategy/freeciv:gtk3 - Build the gtk3 client
 games-strategy/freeciv:gtk4 - Build the gtk4 client
 games-strategy/freeciv:json - Add support for JSON via dev-libs/jansson
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 0ad3251fcd25..972d041053fa 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/dcmtk/Manifest b/sci-libs/dcmtk/Manifest
index 1b87d5e2f843..18dd4c33670d 100644
--- a/sci-libs/dcmtk/Manifest
+++ b/sci-libs/dcmtk/Manifest
@@ -2,5 +2,5 @@ AUX dcmtk-3.6.8-docdir.patch 754 BLAKE2B 3e2ee8a6a213015b14489f63ef002c8d2568e2c
 DIST dcmtk-3.6.7.tar.gz 6877857 BLAKE2B 242ba19ed3876b27c8eeb6917f9264911c951e91ab27d2ebd3e95ab5dcf55a0e18986cede87c8ab7e6280eafeb19fda120ccb2114d24a16f222b411b44cc28d8 SHA512 b9c227f496de65424256636fa7ad266affc6593f72c6849271da94837b68c93a5b8e056ecd09d46550b6ac0530c406ab9f71751d317a5fd4171a222f9fc9ca45
 DIST dcmtk-3.6.8.tar.gz 9628364 BLAKE2B 367885c3fda65b7b2e42555ba648800f9585cbd4c4d94e01f737110fc726ce3396df50ccd6f2c9bacc59284fc1381683b72506a3c566f795c8157da39a95fb2a SHA512 1bb2aad1aa63e0a1b79d92d7c932a969deccde03fdb484dbd44198effb58d50de44a2b0cda150ce7df63e4e986af5bc1f694c8a7988b4c049c578d83ba81184a
 EBUILD dcmtk-3.6.7-r1.ebuild 1989 BLAKE2B 47958171848d55e4e648abec64258fe3c6547f6c18daf6dc3f46e6e5e0c88afb3787d86dab6bda6c53ae13909cf1f7fd8fe956e1b4f1653a068fc6b3f06d5898 SHA512 902b2bd3dabfce90711f811eb0eafb14f3d61f9ff545046c3b223eda15aeb2985c6c7dfcd765014b179e4b177e5ca61a37561bbf5b19201fe19614ec8e7c4780
-EBUILD dcmtk-3.6.8.ebuild 2004 BLAKE2B 7d226a6ba81ea98755cc6b4a281c7cade4700c94870d5cb2efef7e67073ac322da36e47e8628b9faa8143527a177e1f6c1f6b984a62d7a88e8a7a447660ff59f SHA512 8fe802b712cec990014c6cb462df40a1d09c563df4cefbc23496277968996e33af8b4711fb51dd26b29c36aae9aeadec1fddf91ea4f0117f426b594d4b59e421
+EBUILD dcmtk-3.6.8.ebuild 1964 BLAKE2B 3ab45e0ddc8a9d1310ea6a0e447e8f5fc87b200dca2967a07df56418fa86404e616565680125a16fe45a814a555587956c117630edf8b5aca40581d5aededcf8 SHA512 7d74b24785c7c2987efc75e1550529d8fe59b7d3bcf8ba084e47f554e5a04081dbc45a642ef58e89249d552852139398e1867b32ac7c25c81f0b2d1f82fad33d
 MISC metadata.xml 308 BLAKE2B 394345b977e2dd7598cd2acdf2af966f2efecef502a4f460e4fe323c095e3de8523c4217873d18f68198996e4ee08580f46543bf7e357a227f66dcd558191615 SHA512 b8117feeab19b0128c2378d36370e907338873a177c5d8f1cfaef79bf16e877fc455cc5096bccadb99a7238c02fd01c02ae9018a81aab013e0d1a1ccc4cd650c
diff --git a/sci-libs/dcmtk/dcmtk-3.6.8.ebuild b/sci-libs/dcmtk/dcmtk-3.6.8.ebuild
index 1a375189d12c..ed291a83e208 100644
--- a/sci-libs/dcmtk/dcmtk-3.6.8.ebuild
+++ b/sci-libs/dcmtk/dcmtk-3.6.8.ebuild
@@ -50,8 +50,7 @@ src_prepare() {
 
 src_configure() {
 	# ODR violations (bug #862699). Reported upstream by email on 2024-03-11.
-	# master (>3.6.8) seems to have that original issue fixed but has another
-	# JPEG-related violation.
+	# master seems fixed, so >3.6.8 should be able to drop this.
 	filter-lto
 
 	# bug 908398
diff --git a/sci-libs/lis/Manifest b/sci-libs/lis/Manifest
index ce2e0960cf14..e19850a82642 100644
--- a/sci-libs/lis/Manifest
+++ b/sci-libs/lis/Manifest
@@ -3,5 +3,5 @@ AUX lis-2.1.3-autotools.patch 17740 BLAKE2B 71348ba5c4eb218d8dafcb75caeb5b7a6501
 DIST lis-1.6.5.tar.gz 3130045 BLAKE2B 34627d7e310000a2b3acbbc5f11bd163b682224e42dc521adea318a69587e663e59c8296806f6271e8c39062a16bd6c3c24cda5b183bec41f2aba1be09f77a47 SHA512 0cd2fc445c6464490f01def99960f33bbde53b45b453e289edbc9f31b7a20f00d70538bd3feb03324b56ddbc5993d8ba3bfbc8a0574809be08a854c05c097f13
 DIST lis-2.1.3.zip 4002188 BLAKE2B 2249b05c15f3a13db02b240f4b517a004926a8cebb8072cfff74d9ad588b5d47190249c099b5b68b7031f3a9c3614f983cb3e8a27d59a252e9fc53d52ffad6c8 SHA512 5aa873d7ed928c816da6b7da4246c41fa3b3810e97bec1a0e8c914abdd2ef940134ab25a3f044b4dd206e81e8a9f7dab2eb0b631d75e1f52528e5de29b3f7028
 EBUILD lis-1.6.5-r1.ebuild 1468 BLAKE2B e65db698e286fcb91c510d52376ce5965821d6e7095644816f5a6d25cae0d7ed3bf7e4ce1d2692ff1b86ca147e3ef6735f30e9d7117e42cccf50735eff550b12 SHA512 476a347b54c59808e40769585b61e8e10ce24f6d9c1b882a7c68f6b3ff0b425bf3be1711230a19c3e572072b41c322348998dc935e684c106b7e3752052a14a6
-EBUILD lis-2.1.3.ebuild 1465 BLAKE2B 895e9beaec8f2afcb569f6f66c9abb660109664d6a4075cc6ddb9a01e706a7220a1f526ae4931c45969423aaa25470c053860195e3c3d0ae599c5f36a0f02c44 SHA512 d3dd0f6e598abb96c052edb5d4d7bd7accfb0ddd4f8955deb2e3313729d5bd3190c1f4f812d76a496bd531cd6bec777c16bd3076249639f420adb4a470e6603f
+EBUILD lis-2.1.3.ebuild 1490 BLAKE2B e9e6975b8cdd94817ee5aa065d53ef7557bb7ea47030f663a545d4ca81d2202bce2afd7428f433e46d8671b19f64e5c6650082714e36b32a0fdedd6f8f21c850 SHA512 c019ee67b62460086ca20b741a382d4bc3ab934b63ed62b59869cf7ea93929917581a214e826f844eca50a89d5e271d54b558e37e565bb912eb45e861c0715fd
 MISC metadata.xml 696 BLAKE2B 84421b7e9c65c2054f46733ea170e2cda4d7f1d4796431096f972074aee4622ab2a566cd3ae3c4b1dce1cf072532ff793ac37472bde0e6c4604bc4e8bc875f3f SHA512 2a929f38e7a3669aef46eaf086b434c63161126a9335eb1e9b25c91b4ac465e2693bdd778a05c0731a784404e5ede7f8778dc375369ef1c2775388b1b666f75b
diff --git a/sci-libs/lis/lis-2.1.3.ebuild b/sci-libs/lis/lis-2.1.3.ebuild
index 7c4ed2947659..fb4b08bdb429 100644
--- a/sci-libs/lis/lis-2.1.3.ebuild
+++ b/sci-libs/lis/lis-2.1.3.ebuild
@@ -16,6 +16,7 @@ IUSE="cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse2 doc fortran mpi o
 
 RDEPEND="mpi? ( virtual/mpi )"
 DEPEND="${RDEPEND}"
+BDEPEND="app-arch/unzip"
 
 PATCHES=( "${FILESDIR}"/${PN}-2.1.3-autotools.patch )
 
diff --git a/sci-libs/netcdf-fortran/Manifest b/sci-libs/netcdf-fortran/Manifest
index d48cc6bf5eb6..cb9e35888268 100644
--- a/sci-libs/netcdf-fortran/Manifest
+++ b/sci-libs/netcdf-fortran/Manifest
@@ -1,7 +1,7 @@
 DIST netcdf-fortran-4.5.4.tar.gz 2011867 BLAKE2B bc98522be63c705193a22ce877c41abdc064a05afab2186891d8a0bbe9da8f0ba3f7eae6610e8b4e006b26ad8e3ea5fd8d57349054949a38f3a2fd9dfefb85c5 SHA512 a704f6483f2c8b8bf2353615a3e4b784294bd790588cfc13193c617e776e330edb17fa16da69e1a0b6c767308992321e01399ba2067c32f6ae6b3cb9ff72c3ee
 DIST netcdf-fortran-4.5.4.upstream.tar.gz 1085665 BLAKE2B 616fba5a8dfa69c4a48df72222cbc2adf24dadcbda01d95e97b64a23a76038dd75988b481eb3d73e6ae5d20c011c5dc23cf2e0f3a3ae020a12742fe93644de2c SHA512 a03a9a57476983096cdc610405869696c6c0345039da9f386e345932bf439f49aa012501d31f4ab0100688211a3abfc7487a8413cf9a0b3907dc1f8ee50d8000
 DIST netcdf-fortran-4.6.1.tar.gz 1112270 BLAKE2B 88c7550a1426fb82068dec3183d14ac0aa85eb4657cffaca7f141bfa2caa0e48ef1f395a504f06fca29ffb511b20182d6d0d71ab951b93f985a580352da3fe52 SHA512 4fb8ed0581df9157733f1331de60dc4e06274320a942db97dbc9020653ed4677bf26e84e5968ee6e5f8fc179e2db02898f339820e5b257ce8a94a5bcdc670587
-EBUILD netcdf-fortran-4.5.4-r1.ebuild 927 BLAKE2B 2e61c63cdefecbb3454593d2325ce2f26caf0d95a707986e229381b1054c207fbd5910f2852c4cd6fdcf7a981578696e6aceb129701079ec32c94076497742bd SHA512 ade819ce82c6e92b66126beb16cbc9ea2dc67ca93f1b5835bc104c4557eae985d1067722e755a8267282216f2083745335bf586412fe7311b937a0e9580ac867
-EBUILD netcdf-fortran-4.5.4.ebuild 920 BLAKE2B 08b0aa679935ffb271541ded00298e5fe0c4fa93e3837e0fb052c83e8470aaf6ca02832ab4d46c7e6340b8cba4cf196dda2d921ae0d74e34434476b733f01b41 SHA512 656ecc73d3bbb60aa645b02da82c565f392b786d9e9f4f03eb3f9ecc26814c255b52a4772bebd576dc19b262dcff9644b37f2b57f7b8911d21f057fbd02375ca
-EBUILD netcdf-fortran-4.6.1.ebuild 983 BLAKE2B 32e3b23f732118a413d7640b57deed8c96e0111ff54be42b2f5d802df8ff6991ba0451eeef9d2286928a1fb84c4486e8fdd2feb3c9bcfd8622c61e2250852077 SHA512 8ae74ac62f100dd76af105084fa31d629d949670a79f894a31ec77e503115dc6ae7a3d34e57908e887ed19f921a07a2e78347ab2ae400d5318dbfbaaf543ec78
+EBUILD netcdf-fortran-4.5.4-r1.ebuild 1072 BLAKE2B 8fcf30c3169030fad50ee56f00b22f52ee0d5de27c294ca2a517d0dc1fd226c3aea18c7eb0935be77357d129a247fa503000fd1780d2d4180614e98e12a39c32 SHA512 35570ac13abe49b674bbbe940a8998e4447d8a6fd26abca34f29c01a198847e1d168507bdb82e52a2575f716ef566f29e6f572f744031179a415cfbdfcebcac4
+EBUILD netcdf-fortran-4.5.4.ebuild 1065 BLAKE2B 8b0836b0ed176b5e55d20d85b3d417dd6a7f0b5bb2671914285bd235dcabce443e641f4ee218c97d8402f8cc509b410cf7f31dd9af89d06b8b0eb167822c5159 SHA512 8ff3ae63ecf388b4d3acef0ce128c68a48c063752925721a41fd938ef1f4b08a23976147249dca108ac0f1bc983ac185ea8d37184062cacbbe916a7533ae8ed6
+EBUILD netcdf-fortran-4.6.1.ebuild 1128 BLAKE2B b9aa0ad1c7f6546c9377fa087c463af6ae76cd8155ced6c8c06d9a828f831e791351cc8ec480ccaf46cb819cca6c6af86a36a571cdeff50b3c5e23583c0db1cb SHA512 ce9656c2533b975b18412dc18a1c747dfd6f0c10f7e7259eea0b19548a897471830f3cdbb15e3bd749813836b8daa5334dbaf7c5e7d4a4310869d6246cb92ed5
 MISC metadata.xml 839 BLAKE2B d1e207fbff3f9156dae38cf50061bcd12c6020597f015d513997c6781a111b21af791ad77536b16f6f4ba8a6caeeb69932f763cd23d3f488d362dfd46ecf3265 SHA512 9e14fb6d6eae551b58eecd88156ce33a47267e8e57dcd024b70ee31993d8026bc4a1e4a42f3d63a9f91a43dca5e80bb435f926692dcf2ec215d1f544826f40f8
diff --git a/sci-libs/netcdf-fortran/netcdf-fortran-4.5.4-r1.ebuild b/sci-libs/netcdf-fortran/netcdf-fortran-4.5.4-r1.ebuild
index 2677655adbea..011dff676f10 100644
--- a/sci-libs/netcdf-fortran/netcdf-fortran-4.5.4-r1.ebuild
+++ b/sci-libs/netcdf-fortran/netcdf-fortran-4.5.4-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 FORTRAN_STANDARD="77 90"
 
-inherit fortran-2
+inherit flag-o-matic fortran-2
 
 DESCRIPTION="Scientific library and interface for array oriented data access"
 HOMEPAGE="https://www.unidata.ucar.edu/software/netcdf/"
@@ -25,6 +25,11 @@ DEPEND="
 BDEPEND="doc? ( app-text/doxygen )"
 
 src_configure() {
+	# -Werror=lto-type-mismatch
+	# https://bugs.gentoo.org/927588
+	# https://github.com/Unidata/netcdf-fortran/issues/437
+	filter-lto
+
 	econf \
 		--disable-valgrind \
 		--with-temp-large="${T}" \
diff --git a/sci-libs/netcdf-fortran/netcdf-fortran-4.5.4.ebuild b/sci-libs/netcdf-fortran/netcdf-fortran-4.5.4.ebuild
index d89617045f7d..fc08cfb95414 100644
--- a/sci-libs/netcdf-fortran/netcdf-fortran-4.5.4.ebuild
+++ b/sci-libs/netcdf-fortran/netcdf-fortran-4.5.4.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 FORTRAN_STANDARD="77 90"
 
-inherit autotools fortran-2
+inherit autotools flag-o-matic fortran-2
 
 DESCRIPTION="Scientific library and interface for array oriented data access"
 HOMEPAGE="https://www.unidata.ucar.edu/software/netcdf/"
@@ -28,6 +28,11 @@ src_prepare() {
 }
 
 src_configure() {
+	# -Werror=lto-type-mismatch
+	# https://bugs.gentoo.org/927588
+	# https://github.com/Unidata/netcdf-fortran/issues/437
+	filter-lto
+
 	econf \
 		--disable-valgrind \
 		--with-temp-large="${T}" \
diff --git a/sci-libs/netcdf-fortran/netcdf-fortran-4.6.1.ebuild b/sci-libs/netcdf-fortran/netcdf-fortran-4.6.1.ebuild
index f9c020fa3521..9b44a0997205 100644
--- a/sci-libs/netcdf-fortran/netcdf-fortran-4.6.1.ebuild
+++ b/sci-libs/netcdf-fortran/netcdf-fortran-4.6.1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 FORTRAN_STANDARD="77 90"
 
-inherit cmake fortran-2
+inherit cmake flag-o-matic fortran-2
 
 DESCRIPTION="Scientific library and interface for array oriented data access"
 HOMEPAGE="https://www.unidata.ucar.edu/software/netcdf/"
@@ -25,6 +25,11 @@ DEPEND="
 BDEPEND="doc? ( app-text/doxygen[dot] )"
 
 src_configure() {
+	# -Werror=lto-type-mismatch
+	# https://bugs.gentoo.org/927588
+	# https://github.com/Unidata/netcdf-fortran/issues/437
+	filter-lto
+
 	local mycmakeargs=(
 		-DDISABLE_ZSTANDARD_PLUGIN=$(usex !zstd)
 		-DBUILD_EXAMPLES=$(usex examples)
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index de60817b40b5..5563fc071023 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index bc9eec0c60bd..d74641176d4b 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -4,5 +4,5 @@ DIST openrc-0.48.tar.gz 250249 BLAKE2B 4d99d0562e268ad747562ee39cae645ea9221a705
 DIST openrc-0.53.1.tar.gz 251312 BLAKE2B c44570b489621ac097f057dd25a9a7fd6274fc68c987d548a8c7ab49068bc2025375527c97b82b919ff955d27ce8e4110d6e8f0472abfd83b6911ea9e501198d SHA512 f4e53c28c62b8f184935387d3d8b30dea5953b28d7e50dc00a2b48d84fa3b0c9c19d27a9cdf0b9879b4e4b2a3f91604b893ad5178680e7af0bbbdbd00e108537
 EBUILD openrc-0.48.ebuild 4547 BLAKE2B e0fdbd7a9668d0b0cac96e67cae7c9ca05b995857a16784e9c71dc2504d9e9f546c08f5163ec9f18c93b641a1e3a8333d74df07659215bd8b11356a0d48640f7 SHA512 caca44a4aefe5fa61be9e023c14b80d65630db0fdea7e3ed76b31b33168dcfd38228c3c3599e8217cd76fdfb28f44536816efe9c2a90fb053960886c174fe044
 EBUILD openrc-0.53.1.ebuild 4543 BLAKE2B 27bbb8ff46608decda06ece2e8b73b0a1a63e81a4911dba4c89b345d3be01581798da274adbd19be16b03e2634547e660fa2ccb90994fa6b478ecd0ef07aeb3a SHA512 1c1d0c4f64e0fe9301f52283296f7089e96435f60a58a73d53b33b4381bb0ac276858b2f9155d3159ba6bb04b6c087fbaf44fe8b77eeddb0cd6a2cf59f109682
-EBUILD openrc-9999.ebuild 4551 BLAKE2B 2f9507225108ef3c1e09d48325df8716d82b3435d692a8a9318dc0a8444481a03772b3039a32c904f96b04940e3967780cb299fc77a6280b9745e5c3839b968c SHA512 f9cc1f8474e7777d88edb283ffd942c3d5243c2dbab936217566c778edbd8ea1c797d48ed0c2422c302bcf51d33fb046e6140bf5ada83b72fb1311f77cc55bc3
+EBUILD openrc-9999.ebuild 4449 BLAKE2B 2106a206c39a91c0c9af609c0027d620605838d7d3ca3b6047c6cd6402d5bc9a2934aaea8ab7c1856d6d209dba0ee2ade068822e421c63fe2915bb458b417173 SHA512 8b5076e5bbbba978a26810e1df0d25991ce91023cbf3027d72819fdca93a4c4004cdf446ccb6cdf46f015056a3bced24d95c671fc97b84db5b0e15e64b953759
 MISC metadata.xml 842 BLAKE2B 696a5ccdf7eca47ac64ee7f317817a06d93664bcbaa3e94cc4420cc9452c97781d69b6b259350a4c5caf681c2e3394019f9f208eec661c861f3f6e3f5c214542 SHA512 dee510e527b885c19b57f5831081d47a422c88d65b7d50dc5c3e74c0a439ddbd1d1d87e241734d08e35a7551b500ab25d01f7a6be73e36dccde576df59974f36
diff --git a/sys-apps/openrc/openrc-9999.ebuild b/sys-apps/openrc/openrc-9999.ebuild
index b81bd00d2247..931bff079adb 100644
--- a/sys-apps/openrc/openrc-9999.ebuild
+++ b/sys-apps/openrc/openrc-9999.ebuild
@@ -18,10 +18,9 @@ fi
 
 LICENSE="BSD-2"
 SLOT="0"
-IUSE="audit bash debug ncurses pam newnet +netifrc selinux s6 +sysvinit sysv-utils unicode"
+IUSE="audit bash debug pam newnet +netifrc selinux s6 +sysvinit sysv-utils unicode"
 
 COMMON_DEPEND="
-	ncurses? ( sys-libs/ncurses:0= )
 	pam? ( sys-libs/pam )
 	audit? ( sys-process/audit )
 	sys-process/psmisc
@@ -30,8 +29,7 @@ COMMON_DEPEND="
 		>=sys-libs/libselinux-2.6
 	)"
 DEPEND="${COMMON_DEPEND}
-	virtual/os-headers
-	ncurses? ( virtual/pkgconfig )"
+	virtual/os-headers"
 RDEPEND="${COMMON_DEPEND}
 	bash? ( app-shells/bash )
 	sysv-utils? (
@@ -62,7 +60,6 @@ src_configure() {
 		-Drootprefix="${EPREFIX}"
 		-Dshell=$(usex bash /bin/bash /bin/sh)
 		$(meson_use sysv-utils sysvinit)
-		-Dtermcap=$(usev ncurses)
 	)
 	# export DEBUG=$(usev debug)
 	meson_src_configure
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 1a51fefe4f8f..b312ecfd3e7a 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/asahi-sources/Manifest b/sys-kernel/asahi-sources/Manifest
index b7c96c61e9f4..4e0ef2078183 100644
--- a/sys-kernel/asahi-sources/Manifest
+++ b/sys-kernel/asahi-sources/Manifest
@@ -1,5 +1,6 @@
-AUX asahi-sources-6.6.0_p15-enable-speakers-stage1.patch 3053 BLAKE2B d93a2b91a526fe3db72b7308953ce3c0789d8fdb64d14cbb96efeb0923632be46350cd0e7c07163ce05ae52bc0b8825229cffd7c4b35afacb678c963dff9e050 SHA512 86d1c7f3392523039b2803fe5f4ee3b386e1284445d2072c747f1d4936a4cc5e1aa3b8b17b80ebb97b70bcf2b4bd6603df373a94fbc23ca3cc1f89c0b6ad6407
-AUX asahi-sources-6.6.0_p15-enable-speakers-stage2.patch 1609 BLAKE2B eb51b5aeca1f44589373c212aa6e8e3dd0f0c2ee5a7e78e9a6a48ad9ce3337b649a4727b801b583dc4c43857494a8c43caba061ee564c7358d3db308fde91231 SHA512 9da0942b20f0566ff4eb1e4da5ab670cce41293abaf266414ad3b93f4790ef52e8ad92830ddee26fbd1f0287238bf261d8a1edc471427b1581f5cce00880973e
-DIST asahi-sources-6.6.0_p15.tar.gz 229858421 BLAKE2B f0cdce0421bb8637d52e82d2ff0b7e07c29e828783c7cb8733f1582916be81bfd14a0b6a98f51f633ee9da3d10aa1fff6b27c5779bd9fa55c1d04615173d6d4b SHA512 b261e3813f1c0f5bae3a24e7ed0dce41470cfe2ee965ab0121d41793aa08f72d0d91be633f7ba0317f265a6e98a7a134cf86a29e7d48dbb58c5f5f7a3a13cc53
-EBUILD asahi-sources-6.6.0_p15.ebuild 1844 BLAKE2B 68b95d85619d47129b0ada1cff829f751ad6c906c6abd4ef85be4505b61ce8afba32de9580cedabf8be968b3dec3c16974f76ddb224a534c59cacde0134d606c SHA512 0189027d307a5d062e9146112bb54e5d810ab9efc3c4e98abde2b9585edab59de7e094fd11ee5d560f0a2d41bb66205367822fda27d89a71430a6bdaaedf210c
+AUX asahi-sources-6.6.0_p16-enable-speakers-stage1.patch 3053 BLAKE2B d93a2b91a526fe3db72b7308953ce3c0789d8fdb64d14cbb96efeb0923632be46350cd0e7c07163ce05ae52bc0b8825229cffd7c4b35afacb678c963dff9e050 SHA512 86d1c7f3392523039b2803fe5f4ee3b386e1284445d2072c747f1d4936a4cc5e1aa3b8b17b80ebb97b70bcf2b4bd6603df373a94fbc23ca3cc1f89c0b6ad6407
+AUX asahi-sources-6.6.0_p16-enable-speakers-stage2.patch 1609 BLAKE2B eb51b5aeca1f44589373c212aa6e8e3dd0f0c2ee5a7e78e9a6a48ad9ce3337b649a4727b801b583dc4c43857494a8c43caba061ee564c7358d3db308fde91231 SHA512 9da0942b20f0566ff4eb1e4da5ab670cce41293abaf266414ad3b93f4790ef52e8ad92830ddee26fbd1f0287238bf261d8a1edc471427b1581f5cce00880973e
+DIST asahi-sources-6.6.0_p16-rust-alloc-fix.patch 52132 BLAKE2B 3ba12bf87decb581626739786b8c0b6686c8a1d2c964ac534e2701473b117d59b084c686ba8e09bb65f27fbe57574ec2ddf8e89b544f3bdaaebc7acd4f0d2d5f SHA512 d4d1edab5a67152326a4712493a783660f68c1353e058536d19ed7a7f7d288e77b9916fc07639edd1f13f8a1948028fad3b92a90c03152522159b7f79ab54aa1
+DIST asahi-sources-6.6.0_p16.tar.gz 229861406 BLAKE2B e8f90373fe3cfb0ee8824158c59d548af05d1e68626715a65dcf086b35cfe7f4d44b184f02bbfad33474040b86f488e4fa99c8886ae329cf138933161658f94c SHA512 fc62cf346b95229aa31bc1483c9fcffaeacf94d09d13801a3e8e50ed3ba7f3d1b1d4dd8083051879955e1f99bffa61bf411cd38fcc45e176d372fc1d205b9c76
+EBUILD asahi-sources-6.6.0_p16.ebuild 2086 BLAKE2B 74baeb491d3b1fa80365144ecbdbc2d5becac1dfe7d41355ba1f04e0aed202aa3a43627854db38f114100ac1ad6602e87d24582c641e319bf392bf1a36a4b020 SHA512 e0da9422f31e4a2a09191c58f559d3c7a86abd48ef75f3f132cc85ef712a61a3cbbf75c5c7742292d2fa19674b62fdde0e357d891c472f3fd08c3766bbde4694
 MISC metadata.xml 606 BLAKE2B 81abc1eb15c66fbc4b2039b161e0bc06e8c6ce5e58727fca8ef80778db4dd04bc48486479d795c91e6181cd4e3f974b3ff7e3f6479e98e8271ccf4bdfd22b02e SHA512 c5e3349ebbbd7d04a0ac261c93df705b34882a3ed2472f28d90ef902377f5a89d3b5454e94b7f40c39c5d1745aedbd1267a607c189ff09917e77f0ed78009395
diff --git a/sys-kernel/asahi-sources/asahi-sources-6.6.0_p15.ebuild b/sys-kernel/asahi-sources/asahi-sources-6.6.0_p16.ebuild
index f462385c5aac..180c71935834 100644
--- a/sys-kernel/asahi-sources/asahi-sources-6.6.0_p15.ebuild
+++ b/sys-kernel/asahi-sources/asahi-sources-6.6.0_p16.ebuild
@@ -25,15 +25,17 @@ fi
 DESCRIPTION="Asahi Linux kernel sources"
 HOMEPAGE="https://asahilinux.org"
 KERNEL_URI="https://github.com/AsahiLinux/linux/archive/refs/tags/${MY_P}.tar.gz -> ${PN}-${PV}.tar.gz"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}
+	https://raw.githubusercontent.com/chadmed/asahi-overlay/main/sys-kernel/asahi-kernel/files/asahi-kernel-6.6.0_p16-rust-alloc-fix.patch -> ${P}-rust-alloc-fix.patch
+"
 
-KEYWORDS="~arm64"
+KEYWORDS="arm64"
 IUSE="rust"
 
 DEPEND="
 	${DEPEND}
-	rust? ( || ( dev-lang/rust[rust-src]
-				 dev-lang/rust-bin[rust-src]
+	rust? ( || ( dev-lang/rust:stable/1.75[rust-src,rustfmt]
+				 ~dev-lang/rust-bin-1.75.0[rust-src,rustfmt]
 			)
 			dev-util/bindgen
 		)
@@ -42,6 +44,7 @@ DEPEND="
 PATCHES=(
 		"${FILESDIR}/${P}-enable-speakers-stage1.patch"
 		"${FILESDIR}/${P}-enable-speakers-stage2.patch"
+		"${DISTDIR}/${P}-rust-alloc-fix.patch"
 )
 
 src_unpack() {
diff --git a/sys-kernel/asahi-sources/files/asahi-sources-6.6.0_p15-enable-speakers-stage1.patch b/sys-kernel/asahi-sources/files/asahi-sources-6.6.0_p16-enable-speakers-stage1.patch
index 1e5d9c74f1c1..1e5d9c74f1c1 100644
--- a/sys-kernel/asahi-sources/files/asahi-sources-6.6.0_p15-enable-speakers-stage1.patch
+++ b/sys-kernel/asahi-sources/files/asahi-sources-6.6.0_p16-enable-speakers-stage1.patch
diff --git a/sys-kernel/asahi-sources/files/asahi-sources-6.6.0_p15-enable-speakers-stage2.patch b/sys-kernel/asahi-sources/files/asahi-sources-6.6.0_p16-enable-speakers-stage2.patch
index 5a83346337fa..5a83346337fa 100644
--- a/sys-kernel/asahi-sources/files/asahi-sources-6.6.0_p15-enable-speakers-stage2.patch
+++ b/sys-kernel/asahi-sources/files/asahi-sources-6.6.0_p16-enable-speakers-stage2.patch
author	V3n3RiX <venerix@koprulu.sector>	2024-04-01 08:13:46 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2024-04-01 08:13:46 +0100
commit	48e7f15d37baf7167041b2ab0e2a19a703e5c99f (patch)
tree	a4ae631f4b109859ab021cfc9d048e9a81a252ce
parent	de6c40224da664deb650b25efd11f41044602c76 (diff)