Sync with portage [Fri Sep 1 13:05:00 MSK 2023].

8 months ago · 6d6b24b54c
parent dd0d1ba0fa
commit 6d6b24b54c
416 changed files with 6867 additions and 4345 deletions
--- a/30
+++ b/30
@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512

-MANIFEST Manifest.files.gz 29313 BLAKE2B 186dd3541a743997977cf13d0848b66290672e74f8f75d0147781eef73ff49bd356e8cfa3b90b54b99c64bc43f875da354843d5baea032179fce4de87936dbd1 SHA512 ac2e6ad8ad6e0c145f4a9b42ab5d7e6a9a1ff40dc8a224a08167fe856f8b2f500fbec080681cfccfb7e60222adbfe48f20e9a37c6fdd6bf3e944220e22fabaaf
-TIMESTAMP 2023-08-31T09:10:02Z
+MANIFEST Manifest.files.gz 29301 BLAKE2B 67a729016500e461daac039a9382b8b3bd308c7160686db68a904ce5e2030b9205bec3fbb0219335efccd41cf6dd2c6e206230a674f7d0c229ff87c075500335 SHA512 903310c1b50688b7bd7c95d09d9067ac993aa5f0783be9e509431061b54f71f21e0a861874e40c6a2891e3f5f0dc5823398dea4d435be1d99d7d16cf4804eb51
+TIMESTAMP 2023-09-01T09:40:01Z
 -----BEGIN PGP SIGNATURE-----

-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmTwWOpfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmTxsXFfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCkfg/9FytFNDVXQtDV2zgiYcdgffBt5XHYNtfBkFwkQTjcCAUc6zDgdQON60gc
-Cl9ypxKMLBPpSIcRvdZrT/m1yDh7KdQ+r52Is7cM/q7vvgLc5Pqs/l5nv4pGDqvm
-5IM7fLzxa5lIqIG5cLUCTgM+paD0D80BzVz2WXd7HJqQhJNIDSnmJynTJ0pgeXOH
-skZaemsK0q40uToTICphhXYGmG6k0Z/V1w40C96NGNXr32nVEpHTf5GU5NxoEyBE
-+3+cxNhUAkZDM85Wo0Sey/C7w6ftyVbzQCKKq+z5vuQDOU83iyuaVFxo+Ht0tw2d
-JmF5M2UUNijna4oJXr4qhgKDqGt14TbXE4813U3DZqRf2Ldc1ORDQLYx+c4m/1aD
-+Fn2Bhg+xVUQ+OauhI+4tfWx/GtKhE6RtW/xdFgpKJwreW4uUs0KabtSs3Sum5OQ
-Q07bzpI9YmwRzIkKAYjpbk25YKs04sQz/FfvdGLUa0Prmzs1UwMPENbitjzVLNTp
-BNlx4XN/K5iAqezRVndrplRCadThmQRTNQ1fi1m+odlqFmyvfbP7MA+X87trU1lx
-PNN9a1vn5E1dpaypD7su8r2tctNEjQDL8A37inzzrNHN82AGUUOBvpCwVqVCCuNg
-5pkp0IlY/YdRUQkuuWADlgENNUkwu1U5zpWyZi8/JiTIHbseC6o=
-=yuSZ
+klAOMQ/9FiSjMQZKwmMyop1VrNrDAMW2zuVxPv1NDjO0I/R2tX9dJZeEPPEeZnYx
+YPxcuzZi8mqCiFnDdZkR2Snkk8H/QpbQOZ1ETGVE2/967cLL63tS3oLVt/h4tCrN
+EodYISDxWL1SG4PVTzM9TQ0O2ndnOC94ItJGgoU1/Gn3kC8/VyT8ypKQOJLpjYUP
+f3XZUG2zW+ts+6jUmVA+bsrH8C4Y5fE7H53fvln1ygfzaaVJTM/RTZYm6bm24SGs
+EIyvfCcpCGpMMMaNn7SlDvzk9bVM+oI+GT3DWYEKMpCmi47F+IgAlSlzj70/fxbj
+AGxGVEk2+Q3RQ4G+a+M65+RPhFX5yMs6//TrohmcBJFBqjGcpaetS4ReJxqX/Pb3
+f+2S9kTCn7TvZ4J2TjRleKzAKojMwHI6wOwfGQsu1FKwcNyRPMoVE0LHppiwFlw+
+NBqd7zK5Pz9xcYzAHL7GWvt9pt3ymviBIDd1NX6bxAdcQlcbDIODCXW47xrnqbx6
+5WjUTTJCjtBlQQOOJg2LfiiJWegT6c0TRF/9t63qmcNTDVh25PsQXActwsTfmTva
+DVSHriBVK4mM/Efrc9oMG4585oS39n8e0UoonNoQb2WLst1R/5M4FZVHJOJQjuOx
+CyKvrhVz9SKwX8DkQZcX+mes9dadQGePcEh1roLqQaWC6e6RG9s=
+=HiQo
 -----END PGP SIGNATURE-----
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@ -1,33 +1,9 @@
-DIST aws-cli-1.29.15.gh.tar.gz 2496511 BLAKE2B 4fbee2b4f5eda0367437b840dc1cd6ce2505692b9c0ae8dae99f013dc6b8c1f18416851284d75be8d7d7b6ea4854114fd6c2755356321c0cf8ce43886eb86778 SHA512 03b0039bf9fbc2f2e032840e5236901fb5512c80922248f9444c150630f4cb12cab67053f15443a591a80f1eec9218444bff2e29a10889fa2b32a50bae9f1598
-DIST aws-cli-1.29.20.gh.tar.gz 2499798 BLAKE2B e9a8d4a8f804132a5c6ea2c5d8ef99f49c09939b0d0492adce5cfdbf0f85d9c6c2010d17d45a3905bff3888c5984c8f5d81e28dafe3ea9b8629f96dda9f1df2b SHA512 14e2dc38f5373c648973d927e549e53bf722c0b4184fb210d732ebb2af37436ede84eb6037e520f5c543b4f90eb00afca8e506fe3aca3e28dd196fd664bc8f0c
-DIST aws-cli-1.29.25.gh.tar.gz 2502999 BLAKE2B 065a694d1079267676256dc125316993e6276466987a0c773786593d7f8dd0382d4e1dbf64531c81b33ea4c1b5deb59f7c1d22fea0560aef898fa1bdede58414 SHA512 3344650a4a1fd499d707f60d3922e64ade852488bb58ee999d13971c47f42904f8e464c99cd3dfc4d44b9d2c6c138f2b6f6c661303542f0b8d0bc8b7b50932c1
-DIST aws-cli-1.29.26.gh.tar.gz 2503354 BLAKE2B 46997ff0759ddd267fcfc227410d25c1a6810edae67faacd246025339975343e248669bc7dadca8454e36da0ec956c0cf279238274790cca3dea5fd11ab270a6 SHA512 5f528bc7b260b4a998aadf3418a282c68a963cca1f8f5929b74640fe7623d54472e8ae45d8b99bc8f294d1b046f72f181daabad6c01d49afe98edb91429e775b
-DIST aws-cli-1.29.27.gh.tar.gz 2509252 BLAKE2B 693184fd4c1886ecba870df6c9e2cf843c3e9f2dcadba0e0de657abd751ca19044267edf7899704c8f9a9ccb0dcab0af70f4d771b9def9760cede26c70686905 SHA512 1fc8bca504262395a5eb49106198c4ddd602a083a565c0d74853c3dd67bd797ec3a48c01951243e677a84670a0f2b2c2a79a46d5237cc3e1c5f1edd8f6066bc6
-DIST aws-cli-1.29.28.gh.tar.gz 2509294 BLAKE2B c3fbeebaead71029ce882cf7a88d72146127df063d48d02ba134c3dfe5e446d8d5ba8034caaa43615cf4d28f713a45ddc489f3be4ce60cf06c364b48e23f594b SHA512 bf0f73137025110c3de2cd88ac9b03aef4ad245795ca37a0b8fdc93de900686c6eddd63f20d160f211fd0fe9b7de106a82a537162337338cd5285fac47003c08
-DIST aws-cli-1.29.29.gh.tar.gz 2509694 BLAKE2B fb303b103ac2f6f74ac557b136c23d40f3da00b26c0bc03ed07e31c04fad5c868c7ac2141072fd8a8f7ea80ccdfff5e55fb89dd25c67b91f518aed6441650761 SHA512 606a9c4c510e51ba1ad39722abd4c7666f2fc184470f7ef17b61863135cb43baf6117eb777ac1e1d143c71507ef7f2bea9a6192675d93e282eb15d13e2d8c6cc
 DIST aws-cli-1.29.30.gh.tar.gz 2509672 BLAKE2B 4c81e02da68497cbf91ca407389707e21244147ec740344394b5a8dac9e3cf95d3f48487069371bea607ea823a6c7c169c9d6ed77dc5ba92cd3545e5b9510c69 SHA512 69120b9bf222257eab809cb345a3aa0515d6f9b06b64b1233fc82bd3d26341b549e43dc301e0c70876ccac2ebc7a19f68f4f7c3872ea63add1e797e49fd156d9
-DIST aws-cli-1.29.31.gh.tar.gz 2510291 BLAKE2B 9b28bd5b22cbcde62f1375920f97a53a152a89d67b68788cbcecc3534932e037f94f6427324431c6f063a5cbf2fd4903a43a6129cb052198baefefed38b6e763 SHA512 3f56edd418556e4575f44ef08d631e1b36a4d1f77e6d189ed5d9e46acde0c02e561d22df9d7063efc3011561816b99ad8faaf12855d7eaef76b16f47d77f8c65
-DIST aws-cli-1.29.32.gh.tar.gz 2510913 BLAKE2B bd22cc1fc38963f97a51c6c881986a48de072c9a4b5e4d59cee0b3df04f3f006660a194968d0114d803532572c7b229633802f0875fb891f7c58732894f97f92 SHA512 7951fe240f39f72fe3ddc03f350515ac441a836c6b943c6347672a228d7dfb4fbb3ab8a6a765e3346f2ff59a71620ee0cff146525057757e64ca1265f011332d
-DIST aws-cli-1.29.33.gh.tar.gz 2511146 BLAKE2B bd719f8789fd0861ecab4d2ac7def020c90d3f990e8465ce910904ea21f174fef764467374e98537f102658bc3e79b383b8cc12b595874bfa3331cae10880788 SHA512 3d0d55507c9b2cf6a0e088b0338d1a32d3f5377c24833db6001ddc6e0c92d91b5849a66038dd82238a9a98b2d20f8da78daa08ca82c475fa9f0a5190d89e0b60
-DIST aws-cli-1.29.34.gh.tar.gz 2513018 BLAKE2B 74eaa3b94f28d995f8a789421d5a0e8be3dc21359aaf70c932c610239c941361aa62ff0fb43dc4a848a225f42d8d6d88a0a17df793f600ed7db95dfe81f5b917 SHA512 115f82078770c27e1a2e5754505f1712cce7a8ebd83e87e7a3f7fbeac7f552005e7c5a0471914fa584ff4bf6f8394dc9df0779270d162abc4c1a9464d06d9c31
 DIST aws-cli-1.29.35.gh.tar.gz 2513024 BLAKE2B 7802c0eda498235938c5f409076b7706fd3e20e5f337d81366a25bacff9564326acb3edd0d8b1fd36518623a1e6d48d7ee2ee897c8669a3c1b41b8ff202fe9ba SHA512 63a4c20c494dd935dc8f52ddc1d610dfd9fb513f0d262acdb0c85265558d103962c42c757e1e4fd18a70af725186fda7b3caececef574ffa71e89f4c7164d01b
-DIST aws-cli-1.29.36.gh.tar.gz 2513729 BLAKE2B 570f1adaffce44e45006133d6fd6e3ac3a370af0869f59d4123624370d00534e1ee8232916ecf49d50293ba539da3302eab18121006f26bda206725d843a5a06 SHA512 fabfa2e682944cbe7ebf49a9de0779c51543aea9a19f7eb94de6e4b6392a12ade02394d608884dc735eefa536ecfdc37f7699be3a66760932de18b043ee06896
-DIST aws-cli-1.29.37.gh.tar.gz 2514072 BLAKE2B 2a7ccb07da9038fbc10410577c1528b743017ece84611ce890d5d30e3a96e6e19b0952d14fe5e5e264837fdb3c46e757ab86a45fbe959b43ab754ecbfc7182c9 SHA512 cc1774a0d6cfbb6994a653045e27e3fed7e9a6544fe77a80c353b5e71956c189e6adad503c3c1840185570cf85446bacbba6270e21c234ec887fe2dce206cee8
 DIST aws-cli-1.29.38.gh.tar.gz 2514130 BLAKE2B 520d86ecc116ac106b480eea03e71ac89a236f4ddacd04a0cc6ad053d5b893df27cd7a9ab11a9902cdabeaf344ccf452c5d87bfe91694e756851a0af77ec25d5 SHA512 3dba9699066fe1d886801f0d68ea426f76904dd6a147c1e23f816dd06c677ba2675881fb677b71426833f0f0c364ae003e19dcab1490ceabb9a593bd153897e3
-EBUILD awscli-1.29.15.ebuild 2278 BLAKE2B a074ad11e996c7c4e5c0366e5e5d3856cb1bdd7984b8eaf9ac959108e0c5737b064be5d7a579f46669403efb0c3111e8814570f041106e920102cf2a6ddf3687 SHA512 060c06ae5d2295b74940bc86eabf279eeb7a81f7cafa4a9d89e9af8076feff5a23cc3f9bad5a631e75155af64b948abe4c0de7283883a53d4b1ee5791765176b
-EBUILD awscli-1.29.20.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
-EBUILD awscli-1.29.25.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
-EBUILD awscli-1.29.26.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
-EBUILD awscli-1.29.27.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
-EBUILD awscli-1.29.28.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
-EBUILD awscli-1.29.29.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
+DIST aws-cli-1.29.39.gh.tar.gz 2515251 BLAKE2B 64324482a795d1d537953da21717faf952cd59b1473186cead596577f7089efb77a5803e5c57183ea5223ab10bc77910d0a13b6e94597e389ff09088e4df72b6 SHA512 aa1092cd35e4cb71cc7568bdde1bc3dbae5999b07f977bda0ade6fab00f87d825f8fe8165e241b3185d149d652684c725c1ad43260bf848d94cb61e8a46d16bd
 EBUILD awscli-1.29.30.ebuild 2278 BLAKE2B a074ad11e996c7c4e5c0366e5e5d3856cb1bdd7984b8eaf9ac959108e0c5737b064be5d7a579f46669403efb0c3111e8814570f041106e920102cf2a6ddf3687 SHA512 060c06ae5d2295b74940bc86eabf279eeb7a81f7cafa4a9d89e9af8076feff5a23cc3f9bad5a631e75155af64b948abe4c0de7283883a53d4b1ee5791765176b
-EBUILD awscli-1.29.31.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
-EBUILD awscli-1.29.32.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
-EBUILD awscli-1.29.33.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
-EBUILD awscli-1.29.34.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
 EBUILD awscli-1.29.35.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
-EBUILD awscli-1.29.36.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
-EBUILD awscli-1.29.37.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
 EBUILD awscli-1.29.38.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
+EBUILD awscli-1.29.39.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
 MISC metadata.xml 385 BLAKE2B 5accfb180a91179cc6df539d42d1de06be3ebfec73f3edb719f5d59576103b9a8cb0c7c524c1042630e0cf99f068939a19f04c7b1b4a2acf9e072369df80d913 SHA512 ccb3d516326c5dbdf53068372ce25baecc137d21a04516374362212b969cc928dacbf743b4953da33f28482905798f069d09d19c88d9913f2b32648db25115ab
--- a/app-admin/awscli/awscli-1.29.15.ebuild
+++ b/app-admin/awscli/awscli-1.29.15.ebuild
@ -1,80 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit bash-completion-r1 distutils-r1 multiprocessing
-
-MY_P=aws-cli-${PV}
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="
-	https://github.com/aws/aws-cli/
-	https://pypi.org/project/awscli/
-"
-SRC_URI="
-	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86"
-
-# botocore is x.(y+2).z
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	!app-admin/awscli-bin
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-	# strip overzealous upper bounds on requirements
-	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		tests/functional/eks/test_kubeconfig.py::TestKubeconfigLoader::test_load_simple
-		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_env_only
-		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_existing
-		tests/unit/customizations/eks/test_kubeconfig.py::TestKubeconfigValidator::test_valid
-	)
-
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-
-	insinto /usr/share/zsh/site-functions
-	newins bin/aws_zsh_completer.sh _aws
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
--- a/app-admin/awscli/awscli-1.29.25.ebuild
+++ b/app-admin/awscli/awscli-1.29.25.ebuild
@ -1,80 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit bash-completion-r1 distutils-r1 multiprocessing
-
-MY_P=aws-cli-${PV}
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="
-	https://github.com/aws/aws-cli/
-	https://pypi.org/project/awscli/
-"
-SRC_URI="
-	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-# botocore is x.(y+2).z
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	!app-admin/awscli-bin
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-	# strip overzealous upper bounds on requirements
-	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		tests/functional/eks/test_kubeconfig.py::TestKubeconfigLoader::test_load_simple
-		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_env_only
-		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_existing
-		tests/unit/customizations/eks/test_kubeconfig.py::TestKubeconfigValidator::test_valid
-	)
-
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-
-	insinto /usr/share/zsh/site-functions
-	newins bin/aws_zsh_completer.sh _aws
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
--- a/app-admin/awscli/awscli-1.29.26.ebuild
+++ b/app-admin/awscli/awscli-1.29.26.ebuild
@ -1,80 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit bash-completion-r1 distutils-r1 multiprocessing
-
-MY_P=aws-cli-${PV}
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="
-	https://github.com/aws/aws-cli/
-	https://pypi.org/project/awscli/
-"
-SRC_URI="
-	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-# botocore is x.(y+2).z
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	!app-admin/awscli-bin
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-	# strip overzealous upper bounds on requirements
-	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		tests/functional/eks/test_kubeconfig.py::TestKubeconfigLoader::test_load_simple
-		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_env_only
-		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_existing
-		tests/unit/customizations/eks/test_kubeconfig.py::TestKubeconfigValidator::test_valid
-	)
-
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-
-	insinto /usr/share/zsh/site-functions
-	newins bin/aws_zsh_completer.sh _aws
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
--- a/app-admin/awscli/awscli-1.29.27.ebuild
+++ b/app-admin/awscli/awscli-1.29.27.ebuild
@ -1,80 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit bash-completion-r1 distutils-r1 multiprocessing
-
-MY_P=aws-cli-${PV}
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="
-	https://github.com/aws/aws-cli/
-	https://pypi.org/project/awscli/
-"
-SRC_URI="
-	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-# botocore is x.(y+2).z
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	!app-admin/awscli-bin
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-	# strip overzealous upper bounds on requirements
-	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		tests/functional/eks/test_kubeconfig.py::TestKubeconfigLoader::test_load_simple
-		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_env_only
-		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_existing
-		tests/unit/customizations/eks/test_kubeconfig.py::TestKubeconfigValidator::test_valid
-	)
-
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-
-	insinto /usr/share/zsh/site-functions
-	newins bin/aws_zsh_completer.sh _aws
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
--- a/app-admin/awscli/awscli-1.29.28.ebuild
+++ b/app-admin/awscli/awscli-1.29.28.ebuild
@ -1,80 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit bash-completion-r1 distutils-r1 multiprocessing
-
-MY_P=aws-cli-${PV}
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="
-	https://github.com/aws/aws-cli/
-	https://pypi.org/project/awscli/
-"
-SRC_URI="
-	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-# botocore is x.(y+2).z
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	!app-admin/awscli-bin
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-	# strip overzealous upper bounds on requirements
-	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		tests/functional/eks/test_kubeconfig.py::TestKubeconfigLoader::test_load_simple
-		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_env_only
-		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_existing
-		tests/unit/customizations/eks/test_kubeconfig.py::TestKubeconfigValidator::test_valid
-	)
-
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-
-	insinto /usr/share/zsh/site-functions
-	newins bin/aws_zsh_completer.sh _aws
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
--- a/app-admin/awscli/awscli-1.29.29.ebuild
+++ b/app-admin/awscli/awscli-1.29.29.ebuild
@ -1,80 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit bash-completion-r1 distutils-r1 multiprocessing
-
-MY_P=aws-cli-${PV}
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="
-	https://github.com/aws/aws-cli/
-	https://pypi.org/project/awscli/
-"
-SRC_URI="
-	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-# botocore is x.(y+2).z
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	!app-admin/awscli-bin
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-	# strip overzealous upper bounds on requirements
-	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		tests/functional/eks/test_kubeconfig.py::TestKubeconfigLoader::test_load_simple
-		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_env_only
-		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_existing
-		tests/unit/customizations/eks/test_kubeconfig.py::TestKubeconfigValidator::test_valid
-	)
-
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-
-	insinto /usr/share/zsh/site-functions
-	newins bin/aws_zsh_completer.sh _aws
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
--- a/app-admin/awscli/awscli-1.29.31.ebuild
+++ b/app-admin/awscli/awscli-1.29.31.ebuild
@ -1,80 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit bash-completion-r1 distutils-r1 multiprocessing
-
-MY_P=aws-cli-${PV}
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="
-	https://github.com/aws/aws-cli/
-	https://pypi.org/project/awscli/
-"
-SRC_URI="
-	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-# botocore is x.(y+2).z
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	!app-admin/awscli-bin
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-	# strip overzealous upper bounds on requirements
-	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		tests/functional/eks/test_kubeconfig.py::TestKubeconfigLoader::test_load_simple
-		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_env_only
-		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_existing
-		tests/unit/customizations/eks/test_kubeconfig.py::TestKubeconfigValidator::test_valid
-	)
-
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-
-	insinto /usr/share/zsh/site-functions
-	newins bin/aws_zsh_completer.sh _aws
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
--- a/app-admin/awscli/awscli-1.29.32.ebuild
+++ b/app-admin/awscli/awscli-1.29.32.ebuild
@ -1,80 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit bash-completion-r1 distutils-r1 multiprocessing
-
-MY_P=aws-cli-${PV}
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="
-	https://github.com/aws/aws-cli/
-	https://pypi.org/project/awscli/
-"
-SRC_URI="
-	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-# botocore is x.(y+2).z
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	!app-admin/awscli-bin
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-	# strip overzealous upper bounds on requirements
-	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		tests/functional/eks/test_kubeconfig.py::TestKubeconfigLoader::test_load_simple
-		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_env_only
-		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_existing
-		tests/unit/customizations/eks/test_kubeconfig.py::TestKubeconfigValidator::test_valid
-	)
-
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-
-	insinto /usr/share/zsh/site-functions
-	newins bin/aws_zsh_completer.sh _aws
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
--- a/app-admin/awscli/awscli-1.29.33.ebuild
+++ b/app-admin/awscli/awscli-1.29.33.ebuild
@ -1,80 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit bash-completion-r1 distutils-r1 multiprocessing
-
-MY_P=aws-cli-${PV}
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="
-	https://github.com/aws/aws-cli/
-	https://pypi.org/project/awscli/
-"
-SRC_URI="
-	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-# botocore is x.(y+2).z
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	!app-admin/awscli-bin
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-	# strip overzealous upper bounds on requirements
-	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		tests/functional/eks/test_kubeconfig.py::TestKubeconfigLoader::test_load_simple
-		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_env_only
-		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_existing
-		tests/unit/customizations/eks/test_kubeconfig.py::TestKubeconfigValidator::test_valid
-	)
-
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-
-	insinto /usr/share/zsh/site-functions
-	newins bin/aws_zsh_completer.sh _aws
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
--- a/app-admin/awscli/awscli-1.29.34.ebuild
+++ b/app-admin/awscli/awscli-1.29.34.ebuild
@ -1,80 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit bash-completion-r1 distutils-r1 multiprocessing
-
-MY_P=aws-cli-${PV}
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="
-	https://github.com/aws/aws-cli/
-	https://pypi.org/project/awscli/
-"
-SRC_URI="
-	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-# botocore is x.(y+2).z
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	!app-admin/awscli-bin
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-	# strip overzealous upper bounds on requirements
-	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		tests/functional/eks/test_kubeconfig.py::TestKubeconfigLoader::test_load_simple
-		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_env_only
-		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_existing
-		tests/unit/customizations/eks/test_kubeconfig.py::TestKubeconfigValidator::test_valid
-	)
-
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-
-	insinto /usr/share/zsh/site-functions
-	newins bin/aws_zsh_completer.sh _aws
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
--- a/app-admin/awscli/awscli-1.29.36.ebuild
+++ b/app-admin/awscli/awscli-1.29.36.ebuild
@ -1,80 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit bash-completion-r1 distutils-r1 multiprocessing
-
-MY_P=aws-cli-${PV}
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="
-	https://github.com/aws/aws-cli/
-	https://pypi.org/project/awscli/
-"
-SRC_URI="
-	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-# botocore is x.(y+2).z
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	!app-admin/awscli-bin
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-	# strip overzealous upper bounds on requirements
-	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		tests/functional/eks/test_kubeconfig.py::TestKubeconfigLoader::test_load_simple
-		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_env_only
-		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_existing
-		tests/unit/customizations/eks/test_kubeconfig.py::TestKubeconfigValidator::test_valid
-	)
-
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-
-	insinto /usr/share/zsh/site-functions
-	newins bin/aws_zsh_completer.sh _aws
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
--- a/app-admin/awscli/awscli-1.29.37.ebuild
+++ b/app-admin/awscli/awscli-1.29.37.ebuild
@ -1,80 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit bash-completion-r1 distutils-r1 multiprocessing
-
-MY_P=aws-cli-${PV}
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="
-	https://github.com/aws/aws-cli/
-	https://pypi.org/project/awscli/
-"
-SRC_URI="
-	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-# botocore is x.(y+2).z
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	!app-admin/awscli-bin
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-	# strip overzealous upper bounds on requirements
-	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# TODO
-		tests/functional/eks/test_kubeconfig.py::TestKubeconfigLoader::test_load_simple
-		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_env_only
-		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_existing
-		tests/unit/customizations/eks/test_kubeconfig.py::TestKubeconfigValidator::test_valid
-	)
-
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-
-	insinto /usr/share/zsh/site-functions
-	newins bin/aws_zsh_completer.sh _aws
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
--- a/app-admin/awscli/awscli-1.29.39.ebuild
+++ b/app-admin/awscli/awscli-1.29.39.ebuild
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
--- a/app-arch/brotli/Manifest
+++ b/app-arch/brotli/Manifest
@ -1,8 +1,10 @@
 AUX 1.0.9-linker.patch 1799 BLAKE2B b082af9af7eb8df80bf86717e9b9511952e77afd649de9bfe9cbf445216d4e9d6a6e34dc065008d0129892240c98bcb6e7beb5443d4c459a1bb77eff664f7245 SHA512 04d5505074e042eca46a8dfd9d9a3a2c9af901d9bf7d98c219e8e1f8c9b9071bccbddfa3e17e86800de2606a10b26dc05d69948cd84ddd3075d6c1c51991bcc2
 DIST brotli-1.0.9.tar.gz 486984 BLAKE2B 8b9939d5224396ef33b43e019250ba4bc8949903583615e8dc02c85340fc0a1e2d1632161e00b0ee7355d77f05529ac772f482e05d2089afd71a0bf71e803904 SHA512 b8e2df955e8796ac1f022eb4ebad29532cb7e3aa6a4b6aee91dbd2c7d637eee84d9a144d3e878895bb5e62800875c2c01c8f737a1261020c54feacf9f676b5f5
 DIST brotli-1.0.9.testdata.tar.xz 3771536 BLAKE2B e22a7e926a68b64cf3ddcf90d2381201d0bac6486f28c3a675c83a2a685108491011195faf48df9abd478a011e874df560ae81988348f7605197805cc3be20dd SHA512 d98c48dbc7772959a9cf276b638cf773a05a896c9daf4f6235f7d7fd625490b3f538e0690afcd6968ff81ad3745c7d78419850c2518048c44d73b470bcd08c97
+DIST brotli-1.1.0.tar.gz 511969 BLAKE2B 7ac767fd6dafaabfb4e3834d690f71abceb4d4e7f131849d6c328a04f3a16c54d0a9463a37f03663a4158c35e970a089512c8a5bc43eda79fb43c1f61223379e SHA512 6eb280d10d8e1b43d22d00fa535435923c22ce8448709419d676ff47d4a644102ea04f488fc65a179c6c09fee12380992e9335bad8dfebd5d1f20908d10849d9
 EBUILD brotli-1.0.9-r3.ebuild 1780 BLAKE2B e66fa84dbe7cd5baa3d4438484ca2c09bbd2cbdbd0a5b1f64ef30f2ed3e899f41f97d7651655057d4c0c7a152b045b16cee31197a26827173c447700657feffb SHA512 4dcd91910425916f594e0e3b99e7edfd401823dc43d836857ffe4c1dfd5f689b777d4faffc8ee1d491a5eb6f2c078f51d8cf53099baab2190745fc13f7f9718d
 EBUILD brotli-1.0.9-r5.ebuild 2079 BLAKE2B 4f8b2c3b1b69a5ca78f1a727fc150f6339413b865d07c0ad487e4ad597785fbcdfee12e849caef006690fc7e8a9a28e08f68379c84335824234357409b2337c6 SHA512 52a60700208ef0a3f560274a43a08d67aa98dce8dd5430264a86c6c5d82f4b9011863203ed5b9b3cd293ae18c6a42ab628e4efdbacf7bae66ce66fc56da3f9f5
 EBUILD brotli-1.0.9-r6.ebuild 2111 BLAKE2B f3fe3750c8034115a85745c1dbfc07813fffa14d047d92b6311cb6329e125034aaabfe36595f02c6fde949066bf86758b430d766dee73a5d387b8a175fb93bed SHA512 52497bb1830cdb278fcaa51cb6ad6a714393ecc7e142d1dc37b6bfa9276fb38dfd80a8fd05a9fada6e6e633567f45b5700e9b206420f991579776a5490350ff0
-EBUILD brotli-9999.ebuild 1987 BLAKE2B 8ba86aab185c8b25adf8a39dbd983d3fba980841cecd1a37ad191efece0ba82666c1fd6b378f934a49c833fb62c370c9641259a980566a74c91eba20cd1f6f80 SHA512 7f41b0a2e2c2a18292e0b04e63849c7a6f024fcd8ad8fa31830c07a573a75ab25fc3d12d93109bf996e3802ebd3dd035cfacba20b85e263555091ba43f4506d1
+EBUILD brotli-1.1.0.ebuild 1913 BLAKE2B 0ce1d5cc6fbd3ac4ffe54862a7d4f9a1173c85749a05b23ec47b5dbe8720f721450bdd076f460fade5a331f2b97b4feac6b9533ab99407711a380305fc0bfa8b SHA512 0d1068868b900102d8864d8269bdf7f674825fb14019310b37ec10eedefeb6cced4e88cbd09d473f669b3304268121c266ee299fe1303d6a202212508bbafc1f
+EBUILD brotli-9999.ebuild 1913 BLAKE2B 0ce1d5cc6fbd3ac4ffe54862a7d4f9a1173c85749a05b23ec47b5dbe8720f721450bdd076f460fade5a331f2b97b4feac6b9533ab99407711a380305fc0bfa8b SHA512 0d1068868b900102d8864d8269bdf7f674825fb14019310b37ec10eedefeb6cced4e88cbd09d473f669b3304268121c266ee299fe1303d6a202212508bbafc1f
 MISC metadata.xml 829 BLAKE2B 31c7c9adc087001ef6feb8937752317fe46ab500de9c686cf450a9184574b6e4483214e12791b8a81f9dd591a6a5d1ab9fc6f3997831f1e7805d475ff54ac5ed SHA512 c49f2027ce150e20d76f50268940d0ed231419ad57904d1cfcfa76cd4dd281c89e1c16be907c3140026781ae74266b8f37b9a6455893f8e8d824e8e57281573d
--- a/app-arch/brotli/brotli-1.1.0.ebuild
+++ b/app-arch/brotli/brotli-1.1.0.ebuild
@ -0,0 +1,98 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_OPTIONAL="1"
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} pypy3 )
+
+inherit cmake-multilib distutils-r1 flag-o-matic
+
+if [[ ${PV} == *9999* ]] ; then
+	EGIT_REPO_URI="https://github.com/google/${PN}.git"
+	inherit git-r3
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	SRC_URI="
+		https://github.com/google/${PN}/archive/v${PV}.tar.gz
+			-> ${P}.tar.gz
+	"
+fi
+
+DESCRIPTION="Generic-purpose lossless compression algorithm"
+HOMEPAGE="https://github.com/google/brotli/"
+
+LICENSE="MIT python? ( Apache-2.0 )"
+SLOT="0/$(ver_cut 1)"
+IUSE="python test"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	python? ( ${PYTHON_DEPS} )
+"
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	python? (
+		${DISTUTILS_DEPS}
+		test? (
+			$(python_gen_cond_dep '
+				dev-python/unittest-or-fail[${PYTHON_USEDEP}]
+			' 3.{9..11})
+		)
+	)
+"
+
+DOCS=( README.md CONTRIBUTING.md )
+
+src_prepare() {
+	cmake_src_prepare
+	use python && distutils-r1_src_prepare
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING="$(usex test)"
+	)
+	cmake_src_configure
+}
+
+src_configure() {
+	append-lfs-flags
+
+	cmake-multilib_src_configure
+	use python && distutils-r1_src_configure
+}
+
+src_compile() {
+	cmake-multilib_src_compile
+	use python && distutils-r1_src_compile
+}
+
+python_test() {
+	eunittest -s python -p "*_test.py"
+}
+
+src_test() {
+	cmake-multilib_src_test
+	use python && distutils-r1_src_test
+}
+
+multilib_src_install() {
+	cmake_src_install
+}
+
+multilib_src_install_all() {
+	use python && distutils-r1_src_install
+
+	doman docs/brotli.1
+
+	local page
+	for page in constants decode encode types ; do
+		newman docs/${page}.h.3 ${PN}_${page}.h.3
+	done
+}
--- a/app-arch/brotli/brotli-9999.ebuild
+++ b/app-arch/brotli/brotli-9999.ebuild
@ -18,9 +18,6 @@ else
 	SRC_URI="
 		https://github.com/google/${PN}/archive/v${PV}.tar.gz
 			-> ${P}.tar.gz
-		test? (
-			https://dev.gentoo.org/~mgorny/dist/${P}.testdata.tar.xz
-		)
 	"
 fi

--- a/app-containers/Manifest.gz
+++ b/app-containers/Manifest.gz
--- a/app-containers/earthly/Manifest
+++ b/app-containers/earthly/Manifest
@ -1,7 +1,7 @@
-DIST earthly-0.7.14-deps.tar.xz 152887572 BLAKE2B a5cb8940b863d1f0ef6caf976a59b03cc6cbb422c66ed30eff3597631073caeeb09397a81116ff5d0c70d7c10c98d8016379b079c95a83ef0e06557e08b7e166 SHA512 8d7014b67cdf55311fad0be48c068b2338136d21ab1b98df571c38b74cd1f8b5711b5c3d9e52fc2d2365bfb1cd3fe4a5a39c4955a176f1cce07d6d59f7f7da24
-DIST earthly-0.7.14.tar.gz 7750445 BLAKE2B 7333342c85fe2c7efb0bd5222e2ce1e820886b851f43945098bff0f0326ac1f881305fe5b909bcc1c14f427dfdcb3ace2e32aa299cd38d94c9b0a7c8bd95e82f SHA512 a739bb1d2eb46285a545e831f9f40ebc6d3954e791687bb79bef8ff02a719ec72d970860de9319bb825a917a83b621e7745eb34dbe11bd66239c819a9fc46840
 DIST earthly-0.7.15-deps.tar.xz 152884116 BLAKE2B 69f937981605da5db306cdd7f06cdeb106bf907e85ea83f29a77c719d662003b562e7263a5eeb9e478682c019a3d7a265d4cf4ab1c5bcf2f37efbaa42e9ae326 SHA512 368700ce71c8791069d8c14abc6e1d4bf7c356d770641c4172e3e8910c176f0ba8cd5c5738e639da2905385d5d4a961f52b84d8e228fc3e323876f1cda16265e
 DIST earthly-0.7.15.tar.gz 7750609 BLAKE2B b727c6cde93abb3b3e39addc9e79c07fb21232902bca61b5a2b843d1c92b4b6628a1122eced0141b6be6c6678d80a7e473efc6513af07a416b3d6972e210defb SHA512 975d1c1c0055ed6e2884102f4d785833aea4c9257ba3f34e70eeea95c1215eb1dc769a036bdf036682d95dfa6bb30c35b897ff337b2af8b5d9d459f14ecc7cc4
-EBUILD earthly-0.7.14.ebuild 1805 BLAKE2B 64610bd4ef3d051089ad7afe27c08ac50ea7277f08a5293b6787b37fd0a06eccf1f1faff8c5a80df779568ad98f9788be35a76e3131249c45cede2c68843e3a3 SHA512 6ee12bd99611e2d064af628f122d630df28ec3088cad6916979c072473e36cf368306879e4ade774bb8300321c3ca616b4d973ff74210e4a23ae342fd8045773
+DIST earthly-0.7.17-deps.tar.xz 152916336 BLAKE2B c54a1b6166cd55ac8417004c50c742c854a90bfd642f893d24b1a626498bbdfb02ef9e6b62ef79adac65db313b7819a000a673720a816159595c92d791d9c9d2 SHA512 df5db663b716cd8104b118cc421096b4ae1ccaf72a211a72c6a56812b8e0c8c890f4607dfa99dc3e240afca123793f6378adfb38a83c53facab5f39761e53ec1
+DIST earthly-0.7.17.tar.gz 7755932 BLAKE2B e08d380673698e085cc5eb645337a709bf0ff3429f4565d15750e6f1d8aa82dc83d1f5c7aa155da163eb6b6376f275b171b88117b9a7903b23c1d7aba60fa38e SHA512 b495c5abf90397e044da3e394d859e02280c11b16f4c32f742624f7c97a51c597d32bdcc527cf5a99d4c5b09d1a238b7a6128d57e4be7cb0858e0f361fd0c597
 EBUILD earthly-0.7.15.ebuild 1805 BLAKE2B f3ec5c9ecefe0adc831aff49bf7e816ead47a4d7311f01fe4765183079312a44348a45b529f923b9f3403d477c721a5c273c9ef83320817ccaa4b0239019a586 SHA512 26ca0cdeb4135174915b201d6c2f60cbdfc9d017f5daf0c63642238d004e676282637a85007890b034967f43168ee429151bcf07d1a6bfa423a902eeeec2c720
+EBUILD earthly-0.7.17.ebuild 1805 BLAKE2B d41f480a5ed08e5418e87640d4cabe0ba1d04679a1a1c245e02776255cdb0c6b1a6bd992cb574a4495ae3f19a835f19def26dc6ef32967e66cb5359d20db4598 SHA512 77ee4d4c7ff2b9e035b71e6ddd2bd7f5e52ab32e62ca68a3eae827383c340ed2ffbce147c257c9e8897c10baac4329d654e095b44ffd468e41fb2998959e697c
 MISC metadata.xml 927 BLAKE2B b7d5184df16f39603bf6df8b503e701d737fec188d1d97673e4ca59babd990c1b872784c91db04c74d9a08dbffa76f4e7530d8b021cbbe9ae51fd9966f709522 SHA512 f7f49eb583b2b5a9939c26e9eaff3917392525c3a94e5f8274c89b69e172547ad02fa4ed1b078e7d778f765659e1b9a7cf99d88042034cfbfbef54e685c8b6dd
--- a/app-containers/earthly/earthly-0.7.17.ebuild
+++ b/app-containers/earthly/earthly-0.7.17.ebuild
@ -32,8 +32,8 @@ src_compile() {

 	# Git SHA is needed at runtime by earthly to pull and bootstrap images.
 	local git_sha
-	if [[ ${PV} == 0.7.14 ]] ; then
-		git_sha=e665c11fdfbe594cc23a1df09e2d6249e4c02241
+	if [[ ${PV} == 0.7.17 ]] ; then
+		git_sha=7b7d8f4abbc7a35034fcd29cfada52d3d25fcff2
 	else
 		die 'Could not detect "git_sha", please update the ebuild.'
 	fi
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
--- a/app-emacs/ebuild-mode/Manifest
+++ b/app-emacs/ebuild-mode/Manifest
@ -1,4 +1,4 @@
-AUX 50ebuild-mode-gentoo-1.54.el 1509 BLAKE2B 98cf2a1672723ffaa3f4d2f57b4b67b897df56cc2d7352366b79df0578b927faae53c3cc703fa70cf23bd0b1006d8c49dd8e59fcaffa3a231fd7ec5e26c7dce5 SHA512 91c59e85ea79733c195985e4a33dfb1aec8ac13457c0dc3fe7353fb2616787ebde4393b671a2943b752725593929070b658c24955d5e2132b6e9b76daa749850
+AUX 50ebuild-mode-gentoo-1.54.el 1508 BLAKE2B 535c2ac95088e54bebf8979af0020145b364357747650c9afef1ceb671e465543ce8b6b5932a4e3b991897ace3b03f8cb2ae9104e273bc988e21080252419a38 SHA512 15082fbc7fb339c6e591601a0fd0ff3cd39e6b6d2549d7a89d264143d7144261114aa753287c76354d6562a8fe181d5eac84ef505286218423e54e6335db86cf
 DIST ebuild-mode-1.65.tar.xz 39952 BLAKE2B fba1a751e417d39e1d4ce6f9fbc9b5e3465bdddef5fd9a675f6649a3fddb56a8009ebf4c9b22bde349c2faf0009dc6f29ae1acb78632144fbf1b4b5b9e5fa4ca SHA512 fa8b16d68f3afd1ba3557e13d83a809d723bf0f0adf4741ee6897381835c96970a43c28191e9a90a0f096a164c183604caaee2e5ddb0769ed77fca34633cc0e3
 DIST ebuild-mode-1.66.tar.xz 40208 BLAKE2B 6db4cae77c736457adb707c54a3adb800a07a42f9bec8ee6f69c5995297665b2fecb8208c23be8cdfbf9383046a14db2a94bdaa14756ed4aee96c086067d8563 SHA512 70e7b7e071a74fa54aab6e3d5ca0d9e91406f10634a23ef084e95f7bf0d1900927196023d44f6e3fb7bc6e3f6a27221e171e3f4216342d7aafadea16ec56eef0
 EBUILD ebuild-mode-1.65.ebuild 874 BLAKE2B 1c65faf2ee32a4c4a094ab9eef56342d61ec272000c15e3cef4c0a604a91af8e1157971e173919f95278375511c81393987de8677f713857cfc4400ebbe85b72 SHA512 e704314cd41d61debba4be29f21746501bc7893f55782f3933e276dfd5a3c198f56b7ce18fa7c04468d6ed3a43c573dad69591d5eff590f74f0af40a75ec39b7
--- a/app-emacs/ebuild-mode/files/50ebuild-mode-gentoo-1.54.el
+++ b/app-emacs/ebuild-mode/files/50ebuild-mode-gentoo-1.54.el
@ -1,6 +1,6 @@
 (add-to-list 'load-path "@SITELISP@")
 (autoload 'ebuild-mode "ebuild-mode"
-  "Major mode for Portage .ebuild and .eclass files." t)
+  "Major mode for Gentoo .ebuild and .eclass files." t)
 (autoload 'ebuild-repo-mode "ebuild-mode"
  "Minor mode for files in an ebuild repository." t)
 (autoload 'ebuild-repo-mode-maybe-enable "ebuild-mode")
--- a/app-emacs/markdown-mode/Manifest
+++ b/app-emacs/markdown-mode/Manifest
@ -1,9 +1,9 @@
 AUX 50markdown-mode-gentoo.el 252 BLAKE2B 1b718b5fb40ac043f74647d1bbf344bf07a63e530bd4ab3a52231c148b3bf824815a5e15482481ef4a9a183acc8894b9edcf3726af270dcbcfd9b42d502105b2 SHA512 403f80133fddcd2647d1e0c077628bb984e33b89dd68fdee05f87a13aa6b89e344c76944d3885789789884e7298dc9c1ced716fe721b1b2ed6dcf9bbb0f24f91
-AUX markdown-mode-2.4-markdown-command.patch 728 BLAKE2B 4ad9e86528da9cda91871fe2fb4f94d753ef348c35384bc30305cb369197d4c038d0e76c904da6da38887562fbfbda2c78ba1869d9e34f12f7bac77ff0468304 SHA512 a99f6e91e58570e8141c7ca2f90fa4e5009cf57a2fc3e6c7e5b4a916932e1838e1a46ecca40e36de87f0c33115f024ae1fb2d50eca6031374bd18bfce7c7ee33
 AUX markdown-mode-2.5-markdown-command.patch 680 BLAKE2B 16e8c8f8225ee197aee2d112b4a6c26a22435d5f167140234afc78b5ba4a1f581270da293b6602a22c90f01f08ac710739b7d0df4632b71976129d0548c8c95c SHA512 25a9e93eee6692f7ad55dc494c2a8b3400062ae6ffebafa21b091e32dfc877c2d39974282f4f3b64dd5e1e5376e449cec1fe204ce3948316457736d8a546c032
 AUX markdown-mode-2.5-test.patch 1314 BLAKE2B f238a3bf1426845c83d7882fd745350166cd5cf3721a4f7611619b73c720ae2e4435e7c14b379d3399d3fe21f258ec0368be44ccee87d0da0391d3401496b14f SHA512 87c7a633d9f0fea730d29f240824224a8569fbc4dd9337e40838000b4aad7a056fc0779965b5c2b6b436d6b7fafdf221dac1374df9fccfb807fdc53a453e2f38
-DIST markdown-mode-2.4.tar.gz 211229 BLAKE2B 49a369d1b418634449cdac3103e1b107b5dd839edba6a3329539b80cf21bfb0f01aa436ec6deb256bfb5f03ef73b716943730adc4a87b52262dfccbd7923556e SHA512 8bf2acd7f402c036c57521340d26cea150935964f04f1343c2e17147d63226c815150be62c0b79a2ba48e55b3155d94f38caf1ec43c21d4f32dee6e73cc261a0
+AUX markdown-mode-2.6-remove-failing-tests.patch 3583 BLAKE2B 124dd5cef93dd507e3c90718c1c03d8834c5012dabd75d9391be8b918cb7b230ce5f9797236b91f79dbcb09d8cb1bc7d049fd5778d81590d792b24be0c1b5344 SHA512 5edefbd4109e485a0e91fdbd10287ec6bc8c0353aec427b22feae84fc6a1475b60a53226e30d1529ed2ecf9353ad26af5e8cda532943e08d1d3332b00e5236ac
 DIST markdown-mode-2.5.tar.gz 218329 BLAKE2B ea4f3e316383951c00e6a68e388db228567b7a06ac87bb268f28c026a8518e9a8516f27d137c79c24727bd71c785a6e9f1217d160e472abc7bdba2c5bda17f16 SHA512 6bb4d79a5a4c3d3891fc8be4d357fa6dccae9f3eeb8f6c04f840da6cfe6875090ebcc0b1a74961e2a4ac1a59389781fa37ef2420383019983705c2cc66db5b8e
-EBUILD markdown-mode-2.4-r1.ebuild 694 BLAKE2B 51fad8b8a0aff638419404ec87303cd9d1d1feae82a15d4112e1133a61d747bb64c59302491010a8d20370471f6d69deb14d729f056cd81d4fce45a9ca330e05 SHA512 bf1669c8608c707f3e4ccce9ef8ab67469b012b2375919513df011e067b6aaec3fdf23c4a4b85ca27fdc4fb1a276474022f186aa8f1da1e16435c91d1c111206
+DIST markdown-mode-2.6.tar.gz 222181 BLAKE2B 173ba3e152bc4fa45548833bbf87e4e00a56fa2150874b8c3ef395e8364cabeebbe7ab1e582dd55bd531b2a130191b3e79db410b126b6edc8f0573f742b47a33 SHA512 fbfb7a98bb0c562d501d6b1c40987751233ccf386864db43296e02bcaf7d2b8c8d634f1411b91662947e90f33466728101ec0018d2abf46df936f7b19a79b371
 EBUILD markdown-mode-2.5-r1.ebuild 938 BLAKE2B 14e002ddccd8e50ebd69a8ff0dd624ce9c4f3b624c483d844eb26318199085907f056c384e7990d37cfca27160cd2896f31ac3bc637dcca72905a6cb7bd17eb3 SHA512 c80a615a239651364f825648dd3158da7da9c5e572620ab5edeff0765b1d1a46d973bb1723681a52507ee44a014a7d759852dd789679e300d5d13f4290f4f651
-MISC metadata.xml 477 BLAKE2B 4bb74aa04027605e0346a684271091a4d5f11929eab118dd7f5ed0f4292de563903cfae69242a459c8ba51f99135ffa09e021238478e9c6b38bee2e6cf52f882 SHA512 b3be952d7a6e47c5957ee6c7342eef5cfd8ad39d0d9dd0920797fccca36525b4f60dd621bcb4587e0ab63e64c067c7a8e97f498d84b3b8370595ec817fc07903
+EBUILD markdown-mode-2.6.ebuild 1106 BLAKE2B 1b3da6022d821ee389e8ef873349a86d98c321cbd16cfedb8f969e02e4b4d4b0cd5c890c25d008d846329c64a5d8085bcf1e407aa898c7f2ae475032e28723bf SHA512 8ad57f16088b440a84cc97e6ec9da37a522603c95e2811b4e0b2a3cd7bdaac9dbaf2a351a2a89629ecfc9818f518a9a6ce2e1e30a156f4b37127655e52de484a
+MISC metadata.xml 570 BLAKE2B 75359fd9f3254df7c71f76bd6c83b469eb57488c0b0aa9ea4fe582699354f75e05b3499d9ea977ba7438caa234358a564c22a060945aac7a6a1c05ae119e7720 SHA512 18954ffedc2e688bd7eb61e407c685220a002564c4376e24a390ed7eddd8385f285e3b8b49edac7702b8fde5d884ea1c92da4275ec8ff091423c7ae691f86327
--- a/app-emacs/markdown-mode/files/markdown-mode-2.4-markdown-command.patch
+++ b/app-emacs/markdown-mode/files/markdown-mode-2.4-markdown-command.patch
@ -1,14 +0,0 @@
-dev-python/markdown2 and dev-python/markdown install their commands
-as markdown2 and markdown_py, respectively.
-
--- markdown-mode-2.4-orig/markdown-mode.el
-+++ markdown-mode-2.4/markdown-mode.el
-@@ -90,7 +90,7 @@
-   :group 'text
-   :link '(url-link "https://jblevins.org/projects/markdown-mode/"))
- 
-(defcustom markdown-command (let ((command (cl-loop for cmd in '("markdown" "pandoc")
-+(defcustom markdown-command (let ((command (cl-loop for cmd in '("markdown" "pandoc" "markdown2" "markdown_py")
-                                                     when (executable-find cmd)
-                                                     return (file-name-nondirectory it))))
-                               (or command "markdown"))
--- a/app-emacs/markdown-mode/files/markdown-mode-2.6-remove-failing-tests.patch
+++ b/app-emacs/markdown-mode/files/markdown-mode-2.6-remove-failing-tests.patch
@ -0,0 +1,91 @@
+--- a/tests/markdown-test.el
+++ b/tests/markdown-test.el
+@@ -6756,46 +6756,6 @@ x|"
+     (markdown-indent-region (line-beginning-position) (line-end-position) nil)
+     (should (string-equal (buffer-string) " #. abc\n    def\n"))))
+ 
+-(ert-deftest test-markdown-ext/wiki-link-rules ()
+-  "Test wiki link search rules and font lock for missing pages."
+-  (let ((markdown-enable-wiki-links t)
+-        (markdown-wiki-link-fontify-missing t)
+-        (markdown-wiki-link-search-type '(project)))
+-    (progn
+-      (find-file (expand-file-name "wiki/root" markdown-test-dir))
+-      (unwind-protect
+-          (progn
+-            (markdown-mode)
+-            ;; search rules
+-            (should (string-match-p
+-                     "/sub/foo$"
+-                     (markdown-convert-wiki-link-to-filename "foo")))
+-            (should (string-equal
+-                     (markdown-convert-wiki-link-to-filename "doesnotexist")
+-                     "doesnotexist"))
+-            ;; font lock
+-            (markdown-test-range-has-property 1 11 'font-lock-face 'markdown-link-face)
+-            (markdown-test-range-has-property 14 33 'font-lock-face 'markdown-missing-link-face)
+-            (markdown-test-range-has-property 36 42 'font-lock-face 'markdown-link-face)
+-            (markdown-test-range-has-property 45 60 'font-lock-face 'markdown-missing-link-face))
+-        (kill-buffer)))
+-    (progn
+-      (find-file (expand-file-name "wiki/sub/foo" markdown-test-dir))
+-      (unwind-protect
+-          (progn
+-            (markdown-mode)
+-            ;; search rules
+-            (should (string-match-p
+-                     "/wiki/root$"
+-                     (markdown-convert-wiki-link-to-filename "root")))
+-            (should (string-equal
+-                     (markdown-convert-wiki-link-to-filename "doesnotexist")
+-                     "doesnotexist"))
+-            ;; font lock
+-            (markdown-test-range-has-property 1 16 'font-lock-face 'markdown-missing-link-face)
+-            (markdown-test-range-has-property 19 26 'font-lock-face 'markdown-link-face))
+-        (kill-buffer)))))
+-
+ (ert-deftest test-markdown-ext/wiki-link-keep-match-data ()
+   "Test that markdown-wiki-link-p keeps expected match data.
+ Detail: https://github.com/jrblevin/markdown-mode/pull/590"
+@@ -7185,41 +7145,6 @@ foo(bar=None)
+     (cl-loop for ov in (overlays-in (car bounds) (cdr bounds))
+              thereis (overlay-get ov 'flyspell-overlay))))
+ 
+-(ert-deftest test-markdown-flyspell/check-word-p ()
+-  "Test for `flyspell'."
+-  (skip-unless (executable-find ispell-program-name))
+-  (markdown-test-string "aaa
+-
+-```
+-bbb
+-```
+-
+-ccc
+-
+-`ddd`
+-
+-eee
+-
+-<!-- fff -->
+-
+-@ref9999
+-"
+-    (flyspell-buffer)
+-    (search-forward "aaa")
+-    (should (markdown-test-flyspell-incorrect-word-p))
+-    (search-forward "bbb") ;; in code block
+-    (should-not (markdown-test-flyspell-incorrect-word-p))
+-    (search-forward "ccc")
+-    (should (markdown-test-flyspell-incorrect-word-p))
+-    (search-forward "ddd") ;; in inline code
+-    (should-not (markdown-test-flyspell-incorrect-word-p))
+-    (search-forward "eee")
+-    (should (markdown-test-flyspell-incorrect-word-p))
+-    (search-forward "fff") ;; in comment
+-    (should-not (markdown-test-flyspell-incorrect-word-p))
+-    (search-forward "@ref") ;; pandoc reference
+-    (should-not (markdown-test-flyspell-incorrect-word-p))))
+-
+ (ert-deftest test-markdown-flyspell/remove-overlay ()
+   "Test non-dictionary word in code block with `flyspell-mode'.
+ Details: https://github.com/jrblevin/markdown-mode/issues/311"
--- a/app-emacs/markdown-mode/markdown-mode-2.4-r1.ebuild
+++ b/app-emacs/markdown-mode/markdown-mode-2.4-r1.ebuild
@ -1,27 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit elisp
-
-DESCRIPTION="Major mode for editing Markdown-formatted text files"
-HOMEPAGE="https://jblevins.org/projects/markdown-mode/"
-SRC_URI="https://github.com/jrblevin/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="|| (
-		dev-python/markdown2
-		dev-python/markdown
-		virtual/pandoc
-	)"
-BDEPEND="test? ( virtual/pandoc )"
-
-PATCHES=( "${FILESDIR}"/${PN}-2.4-markdown-command.patch )
-SITEFILE="50${PN}-gentoo.el"
-DOCS="CHANGES.md CONTRIBUTING.md README.md"
--- a/app-emacs/markdown-mode/markdown-mode-2.6.ebuild
+++ b/app-emacs/markdown-mode/markdown-mode-2.6.ebuild
@ -0,0 +1,55 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp optfeature
+
+DESCRIPTION="Major mode for editing Markdown-formatted text files"
+HOMEPAGE="https://jblevins.org/projects/markdown-mode/"
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/jrblevin/${PN}.git"
+else
+	SRC_URI="https://github.com/jrblevin/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	|| (
+		dev-python/markdown2
+		dev-python/markdown
+		virtual/pandoc
+	)
+"
+BDEPEND="
+	test? (
+		virtual/pandoc
+		|| (
+			app-text/aspell[l10n_en]
+			app-text/hunspell[l10n_en]
+		)
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.5-markdown-command.patch
+	"${FILESDIR}"/${PN}-2.5-test.patch
+	"${FILESDIR}"/${PN}-2.6-remove-failing-tests.patch
+)
+
+DOCS=( CHANGES.md CONTRIBUTING.md README.md )
+SITEFILE="50${PN}-gentoo.el"
+
+pkg_postinst() {
+	elisp_pkg_postinst
+
+	optfeature "editing Markdown source code blocks" app-emacs/edit-indirect
+}
--- a/app-emacs/markdown-mode/metadata.xml
+++ b/app-emacs/markdown-mode/metadata.xml
@ -1,16 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
 <pkgmetadata>
-	<maintainer type="person">
-		<email>naota@gentoo.org</email>
-		<name>Naohiro Aota</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>gnu-emacs@gentoo.org</email>
-		<name>Gentoo GNU Emacs project</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<upstream>
-		<remote-id type="github">rblevin/markdown-mode</remote-id>
-	</upstream>
+  <maintainer type="person">
+    <email>naota@gentoo.org</email>
+    <name>Naohiro Aota</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>gnu-emacs@gentoo.org</email>
+    <name>Gentoo GNU Emacs project</name>
+  </maintainer>
+  <stabilize-allarches />
+  <upstream>
+    <bugs-to>https://github.com/jrblevin/markdown-mode/issues/</bugs-to>
+    <remote-id type="github">jrblevin/markdown-mode</remote-id>
+  </upstream>
 </pkgmetadata>
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
--- a/app-misc/ca-certificates/Manifest
+++ b/app-misc/ca-certificates/Manifest
@ -7,9 +7,11 @@ DIST nss-3.88.1.tar.gz 71607211 BLAKE2B ff84d3153a01519a52e83be5327453d8e6a81e1f
 DIST nss-3.89.1.tar.gz 71624456 BLAKE2B fca6e09375ba2ce4a6f0bf189cabb9cdb1ba7cb5ebc1a49d47a2d6b509936a60d7f1867f71cdcfa6a81c0cbbf298513981a9b16ac23bbc464c7004bb40b830b4 SHA512 aeece4e8bc28113fc53997b29c89d40b4be74fee4f5d27c4e065d2fa6701038442f4eeeb1fcf98befedb03537a5a48a4701fe270f56197da57946529f9fa02dd
 DIST nss-3.89.tar.gz 71617802 BLAKE2B 92428a635167f311b258411420c8073fafdbadef5b1fc4ff8400e41834fc67a03f2151265d5bbfb64ae53b9a8acb29750352f6c2c83d1cd9a2f89a2139ad34c9 SHA512 1db06d4575f2c16d2a0629007981211e714f99c014c0a6256dd33d0caf8c809ba8d5be204d018f9d1cc99b9fcd055ac1fb99b399486ed43c9cf3f55f2747de82
 DIST nss-3.90.tar.gz 72211928 BLAKE2B 9518bed4f8ca5f9dd1c3d15e255f9954fabc30762ff6db7e45ab54fd0d7d7a34e2c021ecc76b5dcac97c571914e9af116a8c1361a5f2f055a31db168518a99a7 SHA512 e41f4de73f4971c8f35dffe3926b6845ef12a1ce7e8f3fe682e643ddb791a009d079c1706f66d065333af884726840dbc96d4e44762f9c3e48b8d919c09ae625
+DIST nss-3.93.tar.gz 72281331 BLAKE2B 99e50f450a451f2b0bc0aad9b0fba405c987d88546d4aad6c490cb43dc274f23eb99d03d5fa8cf7ef16585abebfdae942fe1092d3f1c86816ba35e16ed3d490f SHA512 d96f13a70e825b39efadfe7c973c24c1e5ad43319bd813599010383e2b8434181f53489672f68fe79e2cb0c4d4ea0088499e588c3524eccf9298aafc57b94951
 DIST nss-cacert-class1-class3-r2.patch 21925 BLAKE2B 7627ff9a09f084c19d72d0490676865e3cab3ca7c920ae1ce4bea2db664f37fd0aa84fcda919809a516891ab2a62e2e7a43a9d6ada4c231adfe4c216525fac7d SHA512 1ce6ff9ab310aaca9005eafb461338b291df8523cc7044e096cd75774ce746c26eed19ec6bb2643c6c67f94650f2f309463492d80a90568f38ce2557f8ada2f4
 EBUILD ca-certificates-20211016.3.88.1.ebuild 5952 BLAKE2B 9ad44b0d6c3c48946dfe0224c392d7a677ef45ce9deef466fdba0aab1e968db1a1769cbab752ce635d4c31f6860dd27ebf16e3270b7cb7446e70611a2dd16a3c SHA512 9e9f16f035d53eb8929cd8b38938d5f4ec7929aa2734ba97fc171b1f419bc6b3c3f41661590e09166a12a8a310be32e3e0f4aa694608173c0e415c8d2ed2b89b
 EBUILD ca-certificates-20230311.3.89.1.ebuild 6065 BLAKE2B 7389e6ac75c98d5fb28c62aec4e32240ac18e3e9292ca81777d749b884fb2d4598f9fec40bc7368dcf5c8297c60194440d0747f7a8c685bac1e6b6bbe7cbaae9 SHA512 661160c5e537890c06a3aece40afb4f2a94ccbb6b027355fc5321559c4817d609243621b60e2b6a5905801cd86fb3c44a56db20c2a50abd5f87567b9afb0076b
 EBUILD ca-certificates-20230311.3.89.ebuild 6073 BLAKE2B b772b6570e10763fc27f4512b2ee0ed0ad778ea36589456ef1c40e144323eae9d343e79f86c3761f469ff63d6939b670e413e4e3fa39bc428e87ad048a61ff06 SHA512 27d460c5706435be13d7172e3aee9d4ec604eab73488a12439fd97710fbd1ffba9824146518d7060c7c527b68f71ed6b400c11b2f978b4ff1f8f1483bf448263
 EBUILD ca-certificates-20230311.3.90.ebuild 6066 BLAKE2B 2bd3dee64cdacfb636f630434fe521b2c9091b6c7a8d8ea3c0795e2b1b304e60f97627939f853cccd94237a5fc3447240b1606c07b7b22f345605cefdb8ff377 SHA512 05c6875fa088cc338aebecfa2c545f6913629a412dc70b8dc4153a739894ebe0a026803d0db40f5a2d7316a1ad866c2bc53cac90c3e29e6e75be4c01048a2ef5
+EBUILD ca-certificates-20230311.3.93.ebuild 6074 BLAKE2B 840d23c0068a409658cd59bfa15aa5d7be6d34985db9f4bd26d600b498dc019347461d767ad657f04702579165134522fb894d6dc7b4c68df9149cfca729ee5c SHA512 896a5ff982485d6cd3fa41b8e14a98622f09faa2aaa3f466a803e98fd756201f3a24ce2ae00f2f20e791fc8303b571a62dea5ea60409b92396a8fffb114ce283
 MISC metadata.xml 373 BLAKE2B 578ac9cb9ac73fc04e06667e896227927d5438e5c1ef3eae1966e8d01a8dd915669b8c81418f6558b4b5d561473111e50f9d94d4b50f1f03355130c9d9be61f0 SHA512 56216f969a510a4c054109ca6fab651cfb0aaf4768d43f70a21aeea6778ced6793957d9bd39bede89e9fc8577aa6c27bf1ca0402aa1e9aa49ec5981a3230b954
--- a/app-misc/ca-certificates/ca-certificates-20230311.3.93.ebuild
+++ b/app-misc/ca-certificates/ca-certificates-20230311.3.93.ebuild
@ -0,0 +1,206 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# The Debian ca-certificates package merely takes the CA database as it exists
+# in the nss package and repackages it for use by openssl.
+#
+# The issue with using the compiled debs directly is two fold:
+# - they do not update frequently enough for us to rely on them
+# - they pull the CA database from nss tip of tree rather than the release
+#
+# So we take the Debian source tools and combine them with the latest nss
+# release to produce (largely) the same end result.  The difference is that
+# now we know our cert database is kept in sync with nss and, if need be,
+# can be sync with nss tip of tree more frequently to respond to bugs.
+
+# Where possible, bump to stable/LTS releases of NSS for the last part
+# of the version (when not using a pure Debian release).
+
+# When triaging user reports, refer to our wiki for tips:
+# https://wiki.gentoo.org/wiki/Certificates#Debugging_certificate_issues
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit python-any-r1
+
+if [[ ${PV} == *.* ]] ; then
+	# Compile from source ourselves.
+	PRECOMPILED=false
+
+	DEB_VER=$(ver_cut 1)
+	NSS_VER=$(ver_cut 2-)
+	RTM_NAME="NSS_${NSS_VER//./_}_RTM"
+else
+	# Debian precompiled version.
+	PRECOMPILED=true
+	inherit unpacker
+fi
+
+DESCRIPTION="Common CA Certificates PEM files"
+HOMEPAGE="https://packages.debian.org/sid/ca-certificates"
+NMU_PR=""
+if ${PRECOMPILED} ; then
+	SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${PV}${NMU_PR:++nmu}${NMU_PR}_all.deb"
+else
+	SRC_URI="
+		mirror://debian/pool/main/c/${PN}/${PN}_${DEB_VER}${NMU_PR:++nmu}${NMU_PR}.tar.xz
+		https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/nss-${NSS_VER}.tar.gz
+		cacert? (
+			https://dev.gentoo.org/~whissi/dist/ca-certificates/nss-cacert-class1-class3-r2.patch
+		)
+	"
+fi
+
+LICENSE="MPL-1.1"
+SLOT="0"
+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"
+IUSE=""
+${PRECOMPILED} || IUSE+=" cacert"
+
+# c_rehash: we run `c_rehash`
+# debianutils: we run `run-parts`
+CDEPEND="
+	sys-apps/debianutils"
+
+BDEPEND="${CDEPEND}"
+if ! ${PRECOMPILED} ; then
+	BDEPEND+=" ${PYTHON_DEPS}"
+fi
+
+DEPEND=""
+if ${PRECOMPILED} ; then
+	DEPEND+=" !<sys-apps/portage-2.1.10.41"
+fi
+
+RDEPEND="${CDEPEND}
+	${DEPEND}"
+
+S="${WORKDIR}"
+
+pkg_setup() {
+	# For the conversion to having it in CONFIG_PROTECT_MASK,
+	# we need to tell users about it once manually first.
+	[[ -f "${EPREFIX}"/etc/env.d/98ca-certificates ]] \
+		|| ewarn "You should run update-ca-certificates manually after etc-update"
+
+	if ! ${PRECOMPILED} ; then
+		python-any-r1_pkg_setup
+	fi
+}
+
+src_unpack() {
+	if ! ${PRECOMPILED} ; then
+		default
+		# Initial 20200601 deb release had bad naming inside the debian source tarball.
+		DEB_S="${WORKDIR}/${PN}-${DEB_VER}"
+		DEB_BAD_S="${WORKDIR}/work"
+		if [[ -d "${DEB_BAD_S}" ]] && [[ ! -d "${DEB_S}" ]] ; then
+			mv "${DEB_BAD_S}" "${DEB_S}"
+		fi
+	fi
+
+	# Do all the work in the image subdir to avoid conflicting with source
+	# dirs in ${WORKDIR}.  Need to perform everything in the offset #381937
+	mkdir -p "image/${EPREFIX}" || die
+	cd "image/${EPREFIX}" || die
+
+	${PRECOMPILED} && unpacker_src_unpack
+}
+
+src_prepare() {
+	cd "image/${EPREFIX}" || die
+
+	if ! ${PRECOMPILED} ; then
+		mkdir -p usr/sbin || die
+		cp -p "${S}"/${PN}/sbin/update-ca-certificates \
+			usr/sbin/ || die
+
+		if use cacert ; then
+			pushd "${S}"/nss-${NSS_VER} >/dev/null || die
+			eapply "${DISTDIR}"/nss-cacert-class1-class3-r2.patch
+			popd >/dev/null || die
+		fi
+	fi
+
+	default
+	eapply -p2 "${FILESDIR}"/${PN}-20150426-root.patch
+
+	pushd "${S}/${PN}" >/dev/null || die
+	# We patch out the dep on cryptography as it's not particularly useful
+	# for us. Please see the discussion in bug #821706. Not to be removed lightly!
+	eapply "${FILESDIR}"/${PN}-20230311.3.89-no-cryptography.patch
+	popd >/dev/null || die
+
+	local relp=$(echo "${EPREFIX}" | sed -e 's:[^/]\+:..:g')
+	sed -i \
+		-e '/="$ROOT/s:ROOT:ROOT'"${EPREFIX}"':' \
+		-e '/RELPATH="\.\./s:"$:'"${relp}"'":' \
+		usr/sbin/update-ca-certificates || die
+}
+
+src_compile() {
+	cd "image/${EPREFIX}" || die
+
+	if ! ${PRECOMPILED} ; then
+		local d="${S}/${PN}/mozilla" c="usr/share/${PN}"
+
+		# Grab the database from the nss sources.
+		cp "${S}"/nss-${NSS_VER}/nss/lib/ckfw/builtins/{certdata.txt,nssckbi.h} "${d}" || die
+		emake -C "${d}"
+
+		# Now move the files to the same places that the precompiled would.
+		mkdir -p etc/ssl/certs \
+			etc/ca-certificates/update.d \
+			"${c}"/mozilla \
+			|| die
+		if use cacert ; then
+			mkdir -p "${c}"/cacert.org || die
+			mv "${d}"/CA_Cert_Signing_Authority.crt \
+				"${c}"/cacert.org/cacert.org_class1.crt || die
+			mv "${d}"/CAcert_Class_3_Root.crt \
+				"${c}"/cacert.org/cacert.org_class3.crt || die
+		fi
+		mv "${d}"/*.crt "${c}"/mozilla/ || die
+	else
+		mv usr/share/doc/{ca-certificates,${PF}} || die
+	fi
+
+	(
+		echo "# Automatically generated by ${CATEGORY}/${PF}"
+		echo "# $(date -u)"
+		echo "# Do not edit."
+		cd "${c}" || die
+		find * -name '*.crt' | LC_ALL=C sort
+	) > etc/ca-certificates.conf
+
+	sh usr/sbin/update-ca-certificates --root "${S}/image" || die
+}
+
+src_install() {
+	cp -pPR image/* "${D}"/ || die
+	if ! ${PRECOMPILED} ; then
+		cd ${PN} || die
+		doman sbin/*.8
+		dodoc debian/README.* examples/ca-certificates-local/README
+	fi
+
+	echo 'CONFIG_PROTECT_MASK="/etc/ca-certificates.conf"' > 98ca-certificates || die
+	doenvd 98ca-certificates
+}
+
+pkg_postinst() {
+	if [[ -d "${EROOT}/usr/local/share/ca-certificates" ]] ; then
+		# If the user has local certs, we need to rebuild again
+		# to include their stuff in the db.
+		# However it's too overzealous when the user has custom certs in place.
+		# --fresh is to clean up dangling symlinks
+		"${EROOT}"/usr/sbin/update-ca-certificates --root "${ROOT}"
+	fi
+
+	if [[ -n "$(find -L "${EROOT}"/etc/ssl/certs/ -type l)" ]] ; then
+		ewarn "Removing the following broken symlinks:"
+		ewarn "$(find -L "${EROOT}"/etc/ssl/certs/ -type l -printf '%p -> %l\n' -delete)"
+	fi
+}
--- a/app-misc/zellij/Manifest
+++ b/app-misc/zellij/Manifest
@ -453,7 +453,7 @@ DIST xflags-macros-0.3.1.crate 12229 BLAKE2B 2fc485e328529a3220ecccbc0e7de6a2052
 DIST xshell-0.2.2.crate 23846 BLAKE2B 7dec5f7268e52b02a5df8aa9a9e206984e291d21c2d4357f6c0c21fec3f9e65bcfa6d4a315f591703e7977fecaa25b0e2bb7af2f05e3cadc79ad513aa3ce0dc9 SHA512 b260b101b189e8e4f2238759ba005d776ac0026b705a2fe2ea3f99b5117b758cb3beb362deb637275f183680f95f7f442b963823b6bf97910ccfe269e23c2af8
 DIST xshell-macros-0.2.2.crate 2848 BLAKE2B 1adedea7dff653a2f781e0300582eb088545a794d0f94729c630f54e3ca25e293af76913851d44c4d7c7da02882610527a2479e4abc87c138f3c37869fc7f2b5 SHA512 a477f18810d2b647c78cbc06d59b8b84817ee5e54cc8785897ecae743d263c6d0fab3563f66aed6a5e81b790bab317871162513c8ff14364d936afaa082f1ff4
 DIST yaml-rust-0.4.5.crate 47783 BLAKE2B 3e888c5cc7afb43eaf3aaab2b6f47b86df164a66eb54d4e166b965cc84b1e06cd17bd992a0d6ee175d9a73a76e2b44a13167246383ed054afcf3cc1710b309cb SHA512 7621dc8dfd5e7d4a7a8805b2a7e8319b63b852367655f2359d4e3e8fec6c4fad52d75c46ce1161e4c674eac0780b757ce9d34e664e304d8d2beec7afa0363ea0
-DIST zellij-0.38.0.gh.tar.gz 8687268 BLAKE2B 6ecc317e31f5cfdc3743307a25810c2b44e88e2c93d74b43e0c8f81879060118da089089f84f368d86b9fb630e13f531187837fa64060a24faf361445eb1555a SHA512 23792850ae7a4e50fce0e6ce0a901704c43501caceae8afe260bec0f777f0167746561d600a49876006d29d8b293aed91041ba667e272521fdbffe9636f915f5
+DIST zellij-0.38.1.gh.tar.gz 8688271 BLAKE2B 34147dd3354af9407a79d95d7d66427b5ac0684c2bea5b6aae01328041093d3e327a8d7e4443f428fdb3d2fa4a5115f514255e7afc454c81880ec741a116bb5c SHA512 08a7151d26249ef746022a04f2163942ec5acdc7840623a450ee2e2ab32297afc5b2fcc52450438211f8d39785c6bfbf2c6dcd84ea1753c5771f1d9e62f99847
 DIST zeroize-1.5.5.crate 18550 BLAKE2B c55736939d4da7a9e5d89c3d550ad739475013b585c9a0e7be87f03a168b2cf0841b3fa8f2520b009c9f03a4b9f185ea73db6159ddb24fb0745d7732865c8d8c SHA512 2f38a6382968c7d98f232a840b5e75800f8f48df49338196cab3af2c0ec1c3d4c0c8dba89f9ca79597551844f405c63317e72a56597c611eddc405ca5f6daf0c
-EBUILD zellij-0.38.0.ebuild 10526 BLAKE2B 21d4f97c95ac83bbc50e7eab54667dfd54125b69118667b347acbf46b4cc6e65116802cf650e084409f21a402d9562cb374b69ac8062e64250b7dbb2871fe00a SHA512 d3733877914497def8545ac5e2c85bc75de317264fbe24cc03a9deb53a5c78c87901f1d3a01ebccce1e2986b55582d6fe57b6e82daa74cd7b5d88bf5904df716
+EBUILD zellij-0.38.1.ebuild 10526 BLAKE2B 21d4f97c95ac83bbc50e7eab54667dfd54125b69118667b347acbf46b4cc6e65116802cf650e084409f21a402d9562cb374b69ac8062e64250b7dbb2871fe00a SHA512 d3733877914497def8545ac5e2c85bc75de317264fbe24cc03a9deb53a5c78c87901f1d3a01ebccce1e2986b55582d6fe57b6e82daa74cd7b5d88bf5904df716
 MISC metadata.xml 332 BLAKE2B d449dff7b11d9719d68a3bacc8ce55e3fe8251e9507bd068bde71a32d946ccab20d24590a2abb7f71b8528053d4ccd29f91ca3553dbcfd40328f65a3fc5f8936 SHA512 bfbc8351f5815a5a99620d65c55d4579710502be35090227bfde70e5ef1dd225d8207ad0243cb64388b66eb78ceab07d3302574df2a8389f41f4db51cc863f6e
--- a/app-misc/zellij/zellij-0.38.1.ebuild
+++ b/app-misc/zellij/zellij-0.38.1.ebuild
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
--- a/app-office/kraft/Manifest
+++ b/app-office/kraft/Manifest
@ -1,3 +1,7 @@
+AUX kraft-1.0-akonadi-23.08.patch 6335 BLAKE2B ccadc29e44a31f1cf0b5e78b4ab21182dc7b375b1462f0b540719f58b34e29bccadaf03448e5fe92e07c4ea64aa8604a2905d18807eeb27af003e434b9dae272 SHA512 530fedaf9579749e0f5448137fcb3fdafa511cac8989e9c9bf27c2b85569b5bb42f5faa824e41cd21bf3377720ab0812942b713234462811eee6516ffd2700c6
+AUX kraft-1.0-cmake.patch 6400 BLAKE2B 1cb7420ad87f02247a0dba95a2d3d3fd2a8936926c92e96bfedfee3c39995a495ef6408096e2ef014619ab777a0209fc2588319dab3fe2675024bd672638fc20 SHA512 f08278ad167cd99a0515a86ec61f3fa4e2ead3495ef9f25eb61dad1ad3cf85000413161899eb40f6e20a2d49faed8be9a0ad2107db44d4892c427244e104f00d
 DIST kraft-0.98.tar.gz 968081 BLAKE2B 01221ea11e3d4793b2158f1742a2629759405aed22cc4e2c33e0c2d54862c34eb51f435af11738b383671b254e984a92a3362e9465ebb899054401156f535cba SHA512 f8241ac00d80d45224fdc1d4847724d08ac138ea4c6a95a598b001c977002b2c3e8a9f054a1ac2ac4e86de6de8eff304b11b653a3dc3225ad757c5f5ca501850
+DIST kraft-1.0.tar.gz 3629908 BLAKE2B b40dc2d647e2985b01d9ee241fbd8cf1eb551621c4635a79c248d69538d2ac034889828461f11e6eefc5258bafe160f421c2960ad80de2a264a8978a4687ad56 SHA512 c45b41ed6eb3eae1f29d158506ea59d55a636974bfb655b307e3045edefcbee84fd833e16cf06b7317e8f634e1efef83841a7361af86007973ab2ef234c32585
 EBUILD kraft-0.98.ebuild 1093 BLAKE2B a5ab376f8add697ab5f5b4d14053c64812370cd7e09b7ee729c7949914d3bc9ed08ce5319f5ace72ae8c2ea828ef333abeb566f3f652f8bfc8b89ee94a8f7432 SHA512 2c8a39fc0d9fcbffcaa28f6dfe9838d28adbd89e768c86ae60003155bba438c01fb88b28ffe3c22bbaefd65e31c1927935388ea21d57759eb64ace4c211c919b
+EBUILD kraft-1.0.ebuild 1181 BLAKE2B 5634160ba8d8f53414f30167bed89b0207531979b673a4856dec57edeb389014ea4451f2e4a964ecb3a3a40fa70d26d7e5a2700e5ba234a1495b1a424df219c6 SHA512 615160f07becf7fc3749bcd4c842a29f290f9619ec183b55e2b691085b53e60eb0f2c0f6a960e1d0ed61c0dd0162d3846aa8fe2177e556f3ee460a69a50bbfe6
 MISC metadata.xml 419 BLAKE2B a83ba460958da64af5f23a396d9d8b164c79e12b38c110f8090b6863a66f602420b1c81e4565a50cc2bd4f415efed5054c7248421e73b4c01df202073ff36f53 SHA512 e76650515ec1782b8108f5923a661f028e951e2fb8b745ac6714107c6601dc0050e9e18812b1a9a29f3fc14aba6e81a4bfc4a27f4738ea8060c2296aced3040a
--- a/app-office/kraft/files/kraft-1.0-akonadi-23.08.patch
+++ b/app-office/kraft/files/kraft-1.0-akonadi-23.08.patch
@ -0,0 +1,161 @@
+From ba3a0e4c1d232b05daddd9ded110e15e0a3c9005 Mon Sep 17 00:00:00 2001
+From: Klaas Freitag <freitag@owncloud.com>
+Date: Tue, 29 Aug 2023 20:29:23 +0200
+Subject: [PATCH] Added Akonadi version check for some renamed components
+
+Akonadi renamed the contact viewer and editors namespace.
+---
+ CMakeLists.txt                | 10 +++++++++-
+ src/CMakeLists.txt            |  1 +
+ src/addressselectorwidget.cpp | 16 +++++++++++-----
+ src/addressselectorwidget.h   | 15 +++++++++++++--
+ 4 files changed, 34 insertions(+), 8 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0f5541da..0cd73f99 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -109,7 +109,15 @@ set_package_properties(${AKO_PREFIX}AkonadiContact PROPERTIES
+     TYPE OPTIONAL
+ )
+ 
+-if(${AKO_PREFIX}Akonadi_FOUND AND ${AKO_PREFIX}AkonadiContact_FOUND)
+find_package(${AKO_PREFIX}ContactEditor)
+set_package_properties(${AKO_PREFIX}ContactEditor PROPERTIES
+    DESCRIPTION "Library for editing contacts stored in Akonadi"
+    URL "https://www.kde.org/"
+    PURPOSE "Optionally used for addressbook integration"
+    TYPE OPTIONAL
+)
+
+if(${AKO_PREFIX}Akonadi_FOUND AND ${AKO_PREFIX}AkonadiContact_FOUND AND ${AKO_PREFIX}ContactEditor_FOUND)
+    add_definitions(-DHAVE_AKONADI)
+ endif()
+ 
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index a2bc5dcf..eac624d4 100644
+--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
+@@ -173,6 +173,7 @@ if(${AKO_PREFIX}Akonadi_FOUND)
+   list(APPEND KRAFT_LINK_LIBS
+     ${AKO_PREFIX}::AkonadiCore
+     ${AKO_PREFIX}::AkonadiContact
+    ${AKO_PREFIX}::ContactEditor
+     ${AKO_PREFIX}::AkonadiAgentBase
+     ${AKO_PREFIX}::AkonadiWidgets
+     ${AKO_PREFIX}::AkonadiXml
+diff --git a/src/addressselectorwidget.cpp b/src/addressselectorwidget.cpp
+index fd083634..504d5a6b 100644
+--- a/src/addressselectorwidget.cpp
+++ b/src/addressselectorwidget.cpp
+@@ -235,7 +235,11 @@ KraftContactViewer::KraftContactViewer(QWidget *parent)
+     lay->setMargin(0);
+     setLayout(lay);
+ #ifdef HAVE_AKONADI
+#if AKONADICONTACT_VERSION >= QT_VERSION_CHECK(5, 24, 0)
+    _contactViewer = new ContactEditor::ContactViewer;
+#else
+     _contactViewer = new Akonadi::ContactViewer;
+#endif
+     _contactViewer->setShowQRCode(false);
+ 
+     lay->addWidget(_contactViewer);
+@@ -372,9 +376,12 @@ bool AddressSelectorWidget::backendUp() const
+ void AddressSelectorWidget::slotCreateNewContact()
+ {
+ #ifdef HAVE_AKONADI
+-    // FIXME
+-_addressEditor.reset(new Akonadi::ContactEditorDialog( Akonadi::ContactEditorDialog::CreateMode, this ));
+-_addressEditor->show();
+#if AKONADICONTACT_VERSION >= QT_VERSION_CHECK(5, 24, 0)
+    _addressEditor = new ContactEditor::ContactEditorDialog(ContactEditor::ContactEditorDialog::EditMode, this );
+#else
+    _addressEditor = new Akonadi::ContactEditorDialog(Akonadi::ContactEditorDialog::CreateMode, this );
+#endif
+    _addressEditor->show();
+ #endif
+ }
+ 
+@@ -398,13 +405,12 @@ void AddressSelectorWidget::slotAddresseeSelected(QModelIndex index)
+ void AddressSelectorWidget::slotEditContact()
+ {
+ #ifdef HAVE_AKONADI
+-
+   if( _addressTreeView->selectionModel()->hasSelection() ) {
+       QModelIndex index = _addressTreeView->selectionModel()->currentIndex();
+     if ( index.isValid() ) {
+       const Akonadi::Item item = index.data( Akonadi::EntityTreeModel::ItemRole ).value<Akonadi::Item>();
+       if ( item.isValid() && item.hasPayload<KContacts::Addressee>() ) {
+-        _addressEditor.reset(new Akonadi::ContactEditorDialog( Akonadi::ContactEditorDialog::EditMode, this ));
+        _addressEditor = new Akonadi::ContactEditorDialog(Akonadi::ContactEditorDialog::EditMode, this);
+         _addressEditor->setContact( item );
+         _addressEditor->show();
+       }
+diff --git a/src/addressselectorwidget.h b/src/addressselectorwidget.h
+index 4c5ec3e2..70d97590 100644
+--- a/src/addressselectorwidget.h
+++ b/src/addressselectorwidget.h
+@@ -30,7 +30,10 @@
+ #else
+ #define AKONADICONTACT_VERSION AKONADI_VERSION
+ #endif
+-#if AKONADICONTACT_VERSION >= QT_VERSION_CHECK(5, 20, 0)
+#if AKONADICONTACT_VERSION >= QT_VERSION_CHECK(5, 24, 0)
+#include <AkonadiContactEditor/Akonadi/ContactViewer>
+#include <AkonadiContactEditor/Akonadi/ContactEditorDialog>
+#elif AKONADICONTACT_VERSION >= QT_VERSION_CHECK(5, 20, 0)
+ #include <AkonadiContact/Akonadi/ContactViewer>
+ #include <AkonadiContact/Akonadi/ContactEditorDialog>
+ #else
+@@ -66,8 +69,12 @@ class KraftContactViewer : public QWidget
+ 
+ private:
+ #ifdef HAVE_AKONADI
+#if AKONADICONTACT_VERSION >= QT_VERSION_CHECK(5, 24, 0)
+    ContactEditor::ContactViewer *_contactViewer;
+#else
+     Akonadi::ContactViewer *_contactViewer;
+ #endif
+#endif
+ };
+ 
+ class AddressSortProxyModel : public QSortFilterProxyModel
+@@ -124,7 +131,11 @@ private slots:
+   QTreeView *_addressTreeView;
+   KraftContactViewer *_contactViewer;
+ #ifdef HAVE_AKONADI
+-  QScopedPointer<Akonadi::ContactEditorDialog> _addressEditor;
+#if AKONADICONTACT_VERSION >= QT_VERSION_CHECK(5, 24, 0)
+    ContactEditor::ContactEditorDialog *_addressEditor;
+#else
+    Akonadi::ContactEditorDialog *_addressEditor;
+#endif
+ #endif
+ };
+ 
+From 052bfe5903cc1f33a27b0dc77512458ff39cfdb5 Mon Sep 17 00:00:00 2001
+From: Klaas Freitag <freitag@owncloud.com>
+Date: Tue, 29 Aug 2023 20:54:08 +0200
+Subject: [PATCH] more version checks added
+
+---
+ src/addressselectorwidget.cpp | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/src/addressselectorwidget.cpp b/src/addressselectorwidget.cpp
+index 504d5a6..1cf2317 100644
+--- a/src/addressselectorwidget.cpp
+++ b/src/addressselectorwidget.cpp
+@@ -410,7 +410,11 @@ void AddressSelectorWidget::slotEditContact()
+     if ( index.isValid() ) {
+       const Akonadi::Item item = index.data( Akonadi::EntityTreeModel::ItemRole ).value<Akonadi::Item>();
+       if ( item.isValid() && item.hasPayload<KContacts::Addressee>() ) {
+-        _addressEditor = new Akonadi::ContactEditorDialog(Akonadi::ContactEditorDialog::EditMode, this);
+#if AKONADICONTACT_VERSION >= QT_VERSION_CHECK(5, 24, 0)
+        _addressEditor = new ContactEditor::ContactEditorDialog(ContactEditor::ContactEditorDialog::EditMode, this );
+#else
+        _addressEditor = new Akonadi::ContactEditorDialog(Akonadi::ContactEditorDialog::CreateMode, this );
+#endif
+         _addressEditor->setContact( item );
+         _addressEditor->show();
+       }
--- a/app-office/kraft/files/kraft-1.0-cmake.patch
+++ b/app-office/kraft/files/kraft-1.0-cmake.patch
@ -0,0 +1,197 @@
+From 938f9796d7c84b86cde3778513941055f350ee0e Mon Sep 17 00:00:00 2001
+From: Klaas Freitag <kraft@freisturz.de>
+Date: Sat, 29 Apr 2023 10:37:55 +0200
+Subject: [PATCH 1/3] Adopt CMake files to Akonadi prefix KPim5
+
+(cherry picked from commit f54b317f5cd894e4063b6d4c4c3a96012c1bcb28)
+---
+ CMakeLists.txt       | 16 ++++++++++------
+ src/CMakeLists.txt   | 13 ++++++-------
+ tools/CMakeLists.txt |  6 +++---
+ 3 files changed, 19 insertions(+), 16 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 07e15dd..8b5374c 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -8,6 +8,9 @@ find_package(ECM REQUIRED NO_MODULE)
+ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)
+ set(CMAKE_AUTOMOC TRUE)
+ 
+# Akonadi Prefix: Set this to KF5 for builds with Akonadi Libs before 5.23
+set(AKO_PREFIX "KPim5")
+
+ include(KDEInstallDirs)
+ include(KDECMakeSettings)
+ include(ECMInstallIcons)
+@@ -47,23 +50,23 @@ set_package_properties(Grantlee5 PROPERTIES
+     TYPE OPTIONAL
+ )
+ 
+-find_package(KF5Akonadi)
+-set_package_properties(KF5Akonadi PROPERTIES
+find_package(${AKO_PREFIX}Akonadi)
+set_package_properties(${AKO_PREFIX}Akonadi PROPERTIES
+     DESCRIPTION "Library for general Access to Akonadi"
+     URL "https://www.kde.org/"
+     PURPOSE "Optionally used for addressbook integration"
+     TYPE OPTIONAL
+ )
+ 
+-find_package(KF5AkonadiContact)
+-set_package_properties(KF5AkonadiContact PROPERTIES
+find_package(${AKO_PREFIX}AkonadiContact)
+set_package_properties(${AKO_PREFIX}AkonadiContact PROPERTIES
+     DESCRIPTION "Library for Accessing Contacts stored in Akonadi"
+     URL "https://www.kde.org/"
+     PURPOSE "Optionally used for addressbook integration"
+     TYPE OPTIONAL
+ )
+ 
+-if(KF5Akonadi_FOUND AND KF5AkonadiContact_FOUND)
+if(${AKO_PREFIX}Akonadi_FOUND AND ${AKO_PREFIX}AkonadiContact_FOUND)
+    add_definitions(-DHAVE_AKONADI)
+ endif()
+ 
+@@ -80,7 +83,8 @@ set(QT_DEFINITIONS "${Qt5Core_DEFINITIONS} ${Qt5Gui_DEFINITIONS} ${Qt5Widgets_DE
+ add_definitions(${QT_DEFINITIONS} )
+ 
+ include_directories(${QT_INCLUDES} src)
+-include_directories( /usr/include/KF5/AkonadiCore )
+include_directories( /usr/include/${AKO_PREFIX}/AkonadiCore )
+include_directories(/usr/include/${AKO_PREFIX}/)
+ 
+ if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po")
+         ki18n_install(po)
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 6eaa557..8e9b069 100644
+--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
+@@ -1,4 +1,3 @@
+-# include_directories(${KDE4_INCLUDES} ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR} ${KDEPIMLIBS_INCLUDE_DIRS} external)
+ 
+ include_directories(${QT_INCLUDES} src)
+ add_subdirectory(pics)
+@@ -167,13 +166,13 @@ set(KRAFT_LINK_LIBS
+     ${CTEMPLATE_LIBRARIES} pthread
+     Grantlee5::Templates
+ )
+-if(KF5Akonadi_FOUND)
+if(${AKO_PREFIX}Akonadi_FOUND)
+   list(APPEND KRAFT_LINK_LIBS
+-    KF5::AkonadiCore
+-    KF5::AkonadiContact
+-    KF5::AkonadiAgentBase
+-    KF5::AkonadiWidgets
+-    KF5::AkonadiXml
+    ${AKO_PREFIX}::AkonadiCore
+    ${AKO_PREFIX}::AkonadiContact
+    ${AKO_PREFIX}::AkonadiAgentBase
+    ${AKO_PREFIX}::AkonadiWidgets
+    ${AKO_PREFIX}::AkonadiXml
+   )
+ endif()
+ 
+diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
+index 0c58c75..f005cfe 100644
+--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
+@@ -8,15 +8,15 @@ set(AUTOMOC ON)
+ # For now there is only the Akonadi based address backend, and thus
+ # the findcontact tool is only built if akonadi is there.
+ # If there are other backends, this must be FIXED.
+-if(KF5Akonadi_FOUND)
+if(${AKO_PREFIX}Akonadi_FOUND)
+     add_executable(${findcontact_NAME} ${FINDCONTACT_SRC})
+ 
+     target_link_libraries( ${findcontact_NAME}
+         Qt5::Core
+         Qt5::Widgets
+         KF5::Contacts
+-        KF5::AkonadiCore
+-        KF5::AkonadiContact
+        ${AKO_PREFIX}::AkonadiCore
+        ${AKO_PREFIX}::AkonadiContact
+     )
+ 
+     ########### install files ###############
+-- 
+2.42.0
+
+
+From 5a95547fe375d55f1bb690be14268b8a26b48204 Mon Sep 17 00:00:00 2001
+From: Klaas Freitag <kraft@freisturz.de>
+Date: Sat, 29 Apr 2023 22:23:27 +0200
+Subject: [PATCH 2/3] use option to set AKO_PREFIX rather than an internal
+ variable
+
+(cherry picked from commit 50e090059365ddbacfd219325095f4f6c5f4aa7b)
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8b5374c..f5ecc41 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -9,7 +9,7 @@ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modul
+ set(CMAKE_AUTOMOC TRUE)
+ 
+ # Akonadi Prefix: Set this to KF5 for builds with Akonadi Libs before 5.23
+-set(AKO_PREFIX "KPim5")
+option(AKO_PREFIX "Akonadi Prefix, either KF5 or KPim5, can be set by -DAKO_PREFIX=KF5" "KPim5")
+ 
+ include(KDEInstallDirs)
+ include(KDECMakeSettings)
+-- 
+2.42.0
+
+
+From e34c8b73ccd4d0142c7c16f8d4d4756cbacadd4d Mon Sep 17 00:00:00 2001
+From: Klaas Freitag <kraft@freisturz.de>
+Date: Mon, 1 May 2023 14:09:09 +0200
+Subject: [PATCH 3/3] Fix Akonadi legacy detection
+
+(cherry picked from commit 66b64505bbfbc3285ba34ccacdf454720c8e0abc)
+---
+ CMakeLists.txt | 8 +++++++-
+ INSTALL.md     | 3 +++
+ 2 files changed, 10 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f5ecc41..82b4e07 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -8,8 +8,14 @@ find_package(ECM REQUIRED NO_MODULE)
+ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)
+ set(CMAKE_AUTOMOC TRUE)
+ 
+option(AKONADI_LEGACY_BUILD "Build with older versions of Akonadi (KF5 Prefix)" OFF)
+ # Akonadi Prefix: Set this to KF5 for builds with Akonadi Libs before 5.23
+-option(AKO_PREFIX "Akonadi Prefix, either KF5 or KPim5, can be set by -DAKO_PREFIX=KF5" "KPim5")
+set(AKO_PREFIX "KPim5")
+
+if (AKONADI_LEGACY_BUILD)
+  set(AKO_PREFIX "KF5")
+endif()
+message("Akonadi Prefix is ${AKO_PREFIX}")
+ 
+ include(KDEInstallDirs)
+ include(KDECMakeSettings)
+diff --git a/INSTALL.md b/INSTALL.md
+index 1edd0ae..77d559c 100644
+--- a/INSTALL.md
+++ b/INSTALL.md
+@@ -59,6 +59,9 @@ These are optional to build with Akonadi Support:
+ - akonadi-contact-devel
+ - akonadi-devel
+ 
+To build with Akonadi versions before 23.04, cmake has to run wtih the
+build option `-DAKONADI_LEGACY_BUILD=ON` to use the old prefix KF5.
+
+ ### Build Kraft
+ 
+ cmake is designed so that the build process can be done in a separate
+-- 
+2.42.0
+
--- a/app-office/kraft/kraft-1.0.ebuild
+++ b/app-office/kraft/kraft-1.0.ebuild
@ -0,0 +1,54 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VIRTUALX_REQUIRED="test"
+inherit ecm
+
+DESCRIPTION="Software to manage quotes and invoices in small enterprises"
+HOMEPAGE="https://www.volle-kraft-voraus.de/"
+SRC_URI="https://github.com/dragotin/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="5"
+KEYWORDS="~amd64 ~x86"
+IUSE="pim"
+
+RESTRICT="test" # requires package installed, bug 745408
+
+DEPEND="
+	dev-cpp/ctemplate
+	dev-libs/grantlee:5
+	dev-qt/qtgui:5
+	dev-qt/qtsql:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	kde-frameworks/kconfig:5
+	kde-frameworks/kcontacts:5
+	kde-frameworks/ki18n:5
+	pim? (
+		>=kde-apps/akonadi-23.08.0:5
+		>=kde-apps/akonadi-contacts-23.08.0:5
+		kde-frameworks/kcoreaddons:5
+	)
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS Changes.txt README.md Releasenotes.txt TODO )
+
+PATCHES=(
+	"${FILESDIR}/${P}-cmake.patch"
+	"${FILESDIR}/${P}-akonadi-23.08.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_Asciidoctor=ON
+		$(cmake_use_find_package pim KPim5Akonadi)
+		$(cmake_use_find_package pim KPim5AkonadiContact)
+	)
+
+	ecm_src_configure
+}
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
--- a/app-portage/getuto/Manifest
+++ b/app-portage/getuto/Manifest
@ -1,9 +1,7 @@
-DIST getuto-1.1.tar.gz 9394 BLAKE2B 50a129826a98d1a43e1bee68f4d12707334de6e7dd0408685e4e5b727affe86560199745a65bc810d857afc972ef0e2aab6b712c67061e1379add1b48494c4b5 SHA512 94f88b6562d763aa2b5cea407409e617d9c1bc89db5779fe12cebabf3db22873d60f36e98ca90ce8bbbc4a1f06bb734a1ee059b5735f54cdba24db9f041cc13c
-DIST getuto-1.2.tar.gz 9412 BLAKE2B 0d207ecb83ca0739640a0c7587579b6c4d0437db5b84725dd14a31adee2f10ef1294dac9c159b8757dde42dd2693f82231aed720b7d1db63fa043bd20a5436bc SHA512 2d6ee97461fef1000f3616627c6e9899f5a348f6421e801ded37e96874340260ebb25a6e20138dda073278b8465ed8cebce8537da0e91fa4fc7e661c11f623d9
 DIST getuto-1.3.tar.gz 9589 BLAKE2B 79f95e263d3a18e58122bb418a3f7e4fe2f28b9e1c0e1cdd21c02df6cb1d0daec233c496ad0191ee4808ccad751b0e76212168454202da03d35bb74a100b24c4 SHA512 c7be7c992da2d3817240e20e47ee195a88eeb63a9a8a886e3b526b7a464fa6b2fe932b056aa0140960a9f104c34a6d4bafe483d10bf02da3c8ce9b7e3e4c3b26
+DIST getuto-1.4.tar.gz 9702 BLAKE2B a81f474cc9202cdeffa90280c4dd3fa0710dafcad7c70f5887d61f10cd3f2f0a4bf0dda60b4e2eaa7299677b33bb73191066968ca0775d887ceb64ab1c1926d4 SHA512 c4f8089986b65056250404242eb31acd8db03a2cf5215d26167d8396befdd96a3d625b3b88958f397dff03b5f5d78c9b1437ff9be58b3502ba9446753473252e
 DIST libc-1-r1-1.gpkg.tar 20480 BLAKE2B b2c184e20c1a29ff66240e992f9f81219285f525eb63cea081372685cf03a2e231a2edb528259617e74c655fbe61b6e0d8fc0bbdbd8452b6098de58432f019d7 SHA512 ce52f398ea8979ec16161381803740d49a4294c77303880f54090c379ba5eb8e545a3d3550f229cacc18c7763dc3adf7936561ba1c64b43c87692ec66084e4e6
-EBUILD getuto-1.1.ebuild 1089 BLAKE2B f320038ea4725fa226cfc76fae10128f1389dbcd328d87433d69ab9b26444779a228a81dc19765d2efe8ea22b6e21f1c60dc8869b6ad4c6cc63130e841f1dbe5 SHA512 d1c0ecb4d6721606420c8ff35af2824c6b74b99431a8cffa40d6154d03af15b88fb8045c89841359d5324d4c20b03e7bfeb3b190e08aace041850408e93117b5
-EBUILD getuto-1.2.ebuild 1089 BLAKE2B f320038ea4725fa226cfc76fae10128f1389dbcd328d87433d69ab9b26444779a228a81dc19765d2efe8ea22b6e21f1c60dc8869b6ad4c6cc63130e841f1dbe5 SHA512 d1c0ecb4d6721606420c8ff35af2824c6b74b99431a8cffa40d6154d03af15b88fb8045c89841359d5324d4c20b03e7bfeb3b190e08aace041850408e93117b5
 EBUILD getuto-1.3.ebuild 1089 BLAKE2B f320038ea4725fa226cfc76fae10128f1389dbcd328d87433d69ab9b26444779a228a81dc19765d2efe8ea22b6e21f1c60dc8869b6ad4c6cc63130e841f1dbe5 SHA512 d1c0ecb4d6721606420c8ff35af2824c6b74b99431a8cffa40d6154d03af15b88fb8045c89841359d5324d4c20b03e7bfeb3b190e08aace041850408e93117b5
+EBUILD getuto-1.4.ebuild 1089 BLAKE2B f320038ea4725fa226cfc76fae10128f1389dbcd328d87433d69ab9b26444779a228a81dc19765d2efe8ea22b6e21f1c60dc8869b6ad4c6cc63130e841f1dbe5 SHA512 d1c0ecb4d6721606420c8ff35af2824c6b74b99431a8cffa40d6154d03af15b88fb8045c89841359d5324d4c20b03e7bfeb3b190e08aace041850408e93117b5
 EBUILD getuto-9999.ebuild 1089 BLAKE2B f320038ea4725fa226cfc76fae10128f1389dbcd328d87433d69ab9b26444779a228a81dc19765d2efe8ea22b6e21f1c60dc8869b6ad4c6cc63130e841f1dbe5 SHA512 d1c0ecb4d6721606420c8ff35af2824c6b74b99431a8cffa40d6154d03af15b88fb8045c89841359d5324d4c20b03e7bfeb3b190e08aace041850408e93117b5
 MISC metadata.xml 419 BLAKE2B ec9ec3a23044c8f9970dfb818fb5d5d16498249723f4ffb3bda0c53f19d68e46d0b7c482fcf8c2cac8f31269546a4a600750d57fce84508e4d8307a02d779977 SHA512 6822f2b326b5783deae399912ac479e1e6d18a61fb5d28db9ba9f62d2405abcab51081a499be30b854e16c3b94cf43f7330dc62ca424c40d923eefdaba5a7c9e
--- a/app-portage/getuto/getuto-1.2.ebuild
+++ b/app-portage/getuto/getuto-1.2.ebuild
@ -1,49 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Stand-alone gentoo install trust anchor generation tool"
-HOMEPAGE="https://github.com/projg2/getuto"
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/projg2/getuto"
-	inherit git-r3
-else
-	SRC_URI="
-		https://github.com/projg2/getuto/archive/refs/tags/${P}.tar.gz
-	"
-	S=${WORKDIR}/${PN}-${P}
-
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-SRC_URI+=" test? ( https://mirror.bytemark.co.uk/gentoo/releases/amd64/binpackages/17.1/x86-64/virtual/libc/libc-1-r1-1.gpkg.tar )"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	app-crypt/gnupg
-	dev-libs/openssl
-	sec-keys/openpgp-keys-gentoo-release
-"
-
-src_unpack() {
-	if [[ ${PV} == 9999 ]] ; then
-		git-r3_src_unpack
-	else
-		# Don't mangle test data
-		unpack ${P}.tar.gz
-	fi
-
-	if use test ; then
-		cp "${DISTDIR}"/libc-1-r1-1.gpkg.tar "${S}" || die
-	fi
-}
-
-src_install() {
-	dobin getuto
-}
--- a/app-portage/getuto/getuto-1.4.ebuild
+++ b/app-portage/getuto/getuto-1.4.ebuild
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
--- a/app-text/ansifilter/Manifest
+++ b/app-text/ansifilter/Manifest
@ -5,5 +5,5 @@ DIST ansifilter-2.20.tar.bz2.asc 488 BLAKE2B 2f2bb56e3cd81e79cd3b5b34e0f5224a79e
 DIST ansifilter2_logo_256.png 54539 BLAKE2B f8b98e22b08c62769bc679f17b3f9d2faeee806d95af3b4a4876e4938813694a4924ed4684163e962d94d3f1efdd31facdae4c3eb75c98322da228bdf0a130be SHA512 ff6f76a91a4809289f90db2bcefc01e772e043a478d7f84b33b4313ed163692e7d2f87880e5fdb64f0e419f6c1ef6ec85240f5a9984223e9059f0803be313de5
 EBUILD ansifilter-2.18.ebuild 1118 BLAKE2B 4bfcd5f4416e17802292fc13fed87ced72b30dea5e0b92774be4c8c7bd3789dcee38ed8836411dc4d98f33b4ddf6d4683f0a1ea73850cec33ec3ca5caebc54a3 SHA512 d14974a54e90b96547827af226bd3421c0ef978a3e7e17e28661a01783240108d8c49f9cf334876b15f3c824c6225686e2490761c56620b7643145dd92d67179
 EBUILD ansifilter-2.19.ebuild 1294 BLAKE2B 38051860ee300f5387db7324dce7d2910a9943b7aaad2d30ada32bb1511c965a89150126da872b993b05f68af3a162e0d8f949382e17401a80928aebf1378bde SHA512 6dda219ac2678a620047ea88006d8671252ffaa0d8469db19822611a85962dcb95af31d30d9fabf6ed5ac0f1892635304de6e968767e1406a57b0c11561bd1b0
-EBUILD ansifilter-2.20.ebuild 1760 BLAKE2B 2b4fcfc31e4b07c7bc2d95678db77a3f4b049bd8d9fc32a88f60caff4d7ca9ca2f785a5d1ebfd5a39db576afdcd2baa8ff8df34b5acea8586a5a4130395c118e SHA512 8487cfee51834e65eea7b8fb2320c24adf4682262044eff6eb776ad08d4f6ba485b9049afd3e06f9eef7a9e5d8ff0407de92e835098cc5faccf270ad2784ed38
+EBUILD ansifilter-2.20.ebuild 1880 BLAKE2B 712e73c07550e5ba2762a313dc9a50227a789c1a647a0011989c5ce459fdbdfe74438fef99b0f1108ad2ec31fb5a2ee7970c1b6c88bb85be1b6651f1bec301c0 SHA512 756ed72403bc5f639f0147b02074f2bb4e8f37ecc098968b419e3694c52b3ace1179413fe3952e9e044119e11bc7d73479b17edd318479fd02298c220c2893f3
 MISC metadata.xml 336 BLAKE2B abbe2be16083114dab5fe1f2f7bc8a269bf44680dedd69c741275d7328120dadabe3007cc9e49705c044916cfdcc17227d96b7950b05662684140264b869e397 SHA512 5c08736995589d34cc3f37ce20abdaa402c56986506a4bb88a63f8326ccf4f233a059705815d9cdbd1b07a156d82a155bca70cb70f9b4b4273ef8f6be29dc4e3
--- a/app-text/ansifilter/ansifilter-2.20.ebuild
+++ b/app-text/ansifilter/ansifilter-2.20.ebuild
@ -31,6 +31,14 @@ BDEPEND="verify-sig? ( sec-keys/openpgp-keys-andresimon )"

 DOCS=( ChangeLog.adoc README.adoc  )

+src_unpack() {
+	if use verify-sig ; then
+		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.bz2{,.asc}
+	fi
+
+	default
+}
+
 src_prepare() {
 	default

--- a/app-text/pandoc-bin/Manifest
+++ b/app-text/pandoc-bin/Manifest
@ -1,13 +1,13 @@
-DIST pandoc-3.1.3-linux-amd64.tar.gz 28685814 BLAKE2B ecbc685d45ced12f69223ceff4914a876fa631866eb304ea58ab1623a9569de708cc8b85c403881e1f53dfc559885409329dd13cbadc88afb52c490d9c61fb0e SHA512 f97e62154ceeaf47c6bc2b8c28008ff4a30392b9162b387e4181097c359d0244b8c6435c88fcd587eb210612fb274d639bb2058bc565a8400c2fb6cdeda45b8a
-DIST pandoc-3.1.3-linux-arm64.tar.gz 30811766 BLAKE2B 5d5807ea6de49fe87b31f51754d70f781fbd27111980bb14eaafd985a53f7e4fa1c7c0dd66d041184194d5b6a74a429e78b8a0913532645d29b47dbc82e154fb SHA512 6bb8b658e2ea3c96e5781754618104086268dbad45bd95ed7474842993c57cbd18ef1bb909556a1aef118589624d431b17454cd76e8b44dbe441e463e6332a1b
 DIST pandoc-3.1.6-linux-amd64.tar.gz 19664028 BLAKE2B be9dc7651001bd4f59639cd6a8a809f57b0a58e52259c568a1044808269002bb930fc76661b7da4ac5a8617181ad57818b04ebecce49da6626b6eb579822199f SHA512 202ba9dee38c0c074584513064dbb4f44165342751fa4295b3a19dcba5e37c77f3eec89bc77bbecb0b9797103af2ca1fd22a60ae9b4115657e24258a05bad2fa
 DIST pandoc-3.1.6-linux-arm64.tar.gz 21780669 BLAKE2B a3715890a8139f8631f8c7c7170d10e262f044e70b1383317fab063cf9dba2455090c30913617d93710e0054f0133afbec5980abd36b6c729c6b99bd7375521e SHA512 615a403070aae7722e2b939a940602ce01f37cd00f6621925b59939fe7ceae73031ac23ee94bcb1e6f6ab12a2b570b81cf5baa55808d503677511f238e30f880
 DIST pandoc-3.1.6.1-linux-amd64.tar.gz 31085424 BLAKE2B 35cdd4e9671720d9f77133791a197ba85dfcdb137ab7d3d9247eb5dabdc287729059633f43f1f42f6636799f3d7379e6bb8b81b4b2a9773520fff819c363bb88 SHA512 cbfeb7444aaac22fcc75e31c09888da4e67cc20acb1a75e4d24c07ddbcd9ea516cdcf19088c9e4f308e2325a76591e20322a9264ca641a2f80dd7a385d5c8c06
 DIST pandoc-3.1.6.1-linux-arm64.tar.gz 33743040 BLAKE2B d6e70616ce8e61e31d2da6aeb6097e464d1b410f9caae8550846ee238a39c3f1fee93d4c18501cdebfc7b3142be9a691fdf2bf15b38b6184ad491df6cee17d22 SHA512 552bfb504d2e03ffbb3e46c67fef8056d073821b141e97b32248d77b569c752a13f69cba4c0e3a4fdf340a14ff3a1b1e2337e8545ac41fcf4f8a76c6e2e10bb7
 DIST pandoc-3.1.6.2-linux-amd64.tar.gz 31164360 BLAKE2B cdd787a2c6b2bac3a9a1a3d6a216e5279d83385a61fd0c61d643744214564f81274dd380402c46ab2938f7bb0a11aabb9a6c99b31b63962c8a2fe043fba41e5c SHA512 b81c708d60cb46a98377af374de0f9b7b5eef38f9cdd8e5490d1072627f34c226e8e2f03f172c4c87e5f2164794cef1b3e39598f86de3e45cb0396ae9416359d
 DIST pandoc-3.1.6.2-linux-arm64.tar.gz 33827200 BLAKE2B 710829bbef6764a3a373a75d29dc39b843de225bf71d25da2875cb4e85dc4baa30be5879e0af5d3d8810efb92bad95f2595d04c6cb0135fb96c600bf7031f352 SHA512 d4bf649d8a055ed3df52e19caf2424dc7e57d48182e9784bba2f9c7d6ebdd08b329c36fb26a28e6362bb5b24a39ea71f2604a64af471ce6245f464cafb6657cd
-EBUILD pandoc-bin-3.1.3.ebuild 1399 BLAKE2B a6716e82b27390fb9a81b0116aa39330c11812ba180679e38bd1ff34003b2332f79a888f9828c610a2e29e95e67ca6f3592fab9cc743ae8f7e43294d4adc135d SHA512 ec789ef8addcbbb01777b2e49b4ada887ca614dc437e173e165fe1dbc7542c215597b784aa10687dd6c088441c990c264e9be189e3b479aecb642bd5e190a631
+DIST pandoc-3.1.7-linux-amd64.tar.gz 31182797 BLAKE2B 5d474dd9dadd37b561c70deb8a944a51bf30917dbbdd5778c8b0d543af08ff2621b033825b7128021020fd0c6b5c35163a42c301e75fdf4c68621deb900dc90f SHA512 72a84ee2ad5e3052d46150ac67b7fa7fc5e9ccb11ee86b9a819707dd319ac38b2a31fe069df4b2f548d239b7989bae660250e1666c7f90d83d8027587d8b5e08
+DIST pandoc-3.1.7-linux-arm64.tar.gz 33851504 BLAKE2B 3ef6121e1c51b0ce1cdca4b8665085072d1143f6ceb985ce2baff9e2bd9bcd2d797c231154a4960d8ddd578bc13311b20e505a2513e90a69b7dd37c0d298cafe SHA512 cbfff5666be1dcc62046d108754daaaef93c91f1d3e3eb28ee1e5f564e6b200919582448e0eca5cafa7db092bda82091b0a152c331b8b642e27191f393816835
 EBUILD pandoc-bin-3.1.6.1.ebuild 1401 BLAKE2B df6b6d864fd5ac799f59a73380db8452421212fc5dd7848dc2c1b5f2f98b3cfbf5b161f51e31c9e98e76fa8ca3bd61465e0bc5154ffdd103a4a3caf0e708076d SHA512 5366c4d00711f395dda02ee7dfebd6e259b8e62e339441304f081cc2f711d15e93380f2df690c6be4bf78d0f126458b4b8a633f690aafc594146c4efa801ebdf
 EBUILD pandoc-bin-3.1.6.2.ebuild 1401 BLAKE2B df6b6d864fd5ac799f59a73380db8452421212fc5dd7848dc2c1b5f2f98b3cfbf5b161f51e31c9e98e76fa8ca3bd61465e0bc5154ffdd103a4a3caf0e708076d SHA512 5366c4d00711f395dda02ee7dfebd6e259b8e62e339441304f081cc2f711d15e93380f2df690c6be4bf78d0f126458b4b8a633f690aafc594146c4efa801ebdf
 EBUILD pandoc-bin-3.1.6.ebuild 1399 BLAKE2B a6716e82b27390fb9a81b0116aa39330c11812ba180679e38bd1ff34003b2332f79a888f9828c610a2e29e95e67ca6f3592fab9cc743ae8f7e43294d4adc135d SHA512 ec789ef8addcbbb01777b2e49b4ada887ca614dc437e173e165fe1dbc7542c215597b784aa10687dd6c088441c990c264e9be189e3b479aecb642bd5e190a631
+EBUILD pandoc-bin-3.1.7.ebuild 1401 BLAKE2B df6b6d864fd5ac799f59a73380db8452421212fc5dd7848dc2c1b5f2f98b3cfbf5b161f51e31c9e98e76fa8ca3bd61465e0bc5154ffdd103a4a3caf0e708076d SHA512 5366c4d00711f395dda02ee7dfebd6e259b8e62e339441304f081cc2f711d15e93380f2df690c6be4bf78d0f126458b4b8a633f690aafc594146c4efa801ebdf
 MISC metadata.xml 986 BLAKE2B 10ab442c2f7892545054ba2747c0cde115d9d875673c077d2cefcd035e2ecd6d04f2aef05ef9ca58a2150a983079ad8fbdc6910ca93fc14977409041e5f20201 SHA512 c8e241d4d7bba0a6f36320517d18fbb99922e32970d7771d5bbc80a8ecf5086f8f7d1eadd0188d457412a66db898d044074b4d4f0301aab1e19cd1213e562375
--- a/app-text/pandoc-bin/pandoc-bin-3.1.7.ebuild
+++ b/app-text/pandoc-bin/pandoc-bin-3.1.7.ebuild
@ -19,7 +19,7 @@ S="${WORKDIR}"/${MY_P}

 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="-* amd64 arm64"
+KEYWORDS="-* ~amd64 ~arm64"
 IUSE="+pandoc-symlink"

 RDEPEND="pandoc-symlink? ( !${CATEGORY}/${MY_PN} )"
--- a/app-text/tree/Manifest
+++ b/app-text/tree/Manifest
@ -1,6 +1,6 @@
 AUX tree.bashcomp 847 BLAKE2B de05dacd7b54426e89e4afbbb6fba74376212a8f02995ff9babec369244bdb57fcb46989a437a100bf1415f7ecb8b0e142d729bae27f7fef6319de9e4cb06d54 SHA512 8df777721a7974015b5e717d89a4ff8701a2598e227d6cf71077fe498a5bb2a578c96c4667ab80e34b1064e109d38665fb6a4de8f52bb6401445088d5cdca922
-DIST unix-tree-2.0.4.tar.gz 59497 BLAKE2B c55f8f64f2dfc6364ce3ab5ec26e59860f958eacbf681d1d53848172d474605f71864c1eb7db27be15f3df2fc2979787685e80de76ff817c5cdfafb9c52af203 SHA512 59f391de5792ce9990153c2de06bc545813f9e7aea635c574ef21f1603203146cdad4dbed821266715d716241d7153276aa220626ce8354446dd85df47e75fa6
 DIST unix-tree-2.1.0.tar.bz2 51401 BLAKE2B 89b15df0268c03ba66827c7e6d234d1f5c4f6a5d9788e30bf6859d477b340393acbeec9ad7afc1909fdc7beb81ef7934917206066e0875d9f1662fca170f4127 SHA512 0f3a6ecb450bb3d683804667d4f15aecf9c9765578d47a62e39a8ff69cbe1c2a0a4a922fef3728359060338f4f9cd2de7ab8eb0f992a4c32949278bb47d17edc
-EBUILD tree-2.0.4.ebuild 917 BLAKE2B fc02cb6fbcaaca6481e2d761423df38318dda65bf11ac6576f246c64d0ebc9ea53e51166add1c89be9aaedaf99a7489d6758aec3f7606cda4cdeecb1c5d4b7e9 SHA512 500075a1d58a9ce4634893d7610fb92a8192c7967aa4a022778773cdbfa157eec0806e4a68b3b6c44c7bd99d0c9b78604bd4dfc1688bebbc60383cb137413ac8
+DIST unix-tree-2.1.1.tar.bz2 52550 BLAKE2B 0f20009a6c64b07a0742637bf32366b038f5c9bb025755a0aa45edb8c92741dfbff1486179caeeb73cfa8f10de3ed8678b948c7416ee0463e785cf153e808ff0 SHA512 ed34b1d0df049986295e7f5539491acd6134fbe69050ac2634037d700a878b4937700bed777ef0624e2bb0fc8c2815bb5139272ffe575ecc9362b84e0fafc9c2
 EBUILD tree-2.1.0.ebuild 879 BLAKE2B 93681c560e45820bf4adbe9dec23a5ca8d424b57e0798c00b9da99ada76c5f560ec89edd0db8f4842681d4d20f56d71292d13b7c582699a9762ef2c06d43f501 SHA512 1fc2d90b49985458e13a0c9036a88bab3130d61a9a6f9e065d24d8224265d6a4382f09f1c9ebeb1ca61db92b07ba524518e6e0e147081c7ccf0a4640c6325e6b
+EBUILD tree-2.1.1.ebuild 887 BLAKE2B 5c862c36ce1a1c455186f430bc2bbf9296aef252bcbe28488a5e574d4c31dd790321fc2d857073652ca0b3dc4dfb6d76a3ffe91a24e427e69d98a512051dcdda SHA512 1791bd223f24afac368afa5a9aaf73ab7bbe8b23d0f2969e73afbe07b7214246d25f1200cfb9f9d37579d4ffa55340154eb6a94307552d4e2df43ab5f4baab7e
 MISC metadata.xml 726 BLAKE2B d4e2e3176f82eb4577dbac312756eaee7e50da883c80b0e22a2cf86e75493eb4791ffdef9387a48d5a486cf968526aa483e05b213dc172839f04c528701be69f SHA512 ff609ba8c9839744088c1d77159d039ff46aae920f570842d4dbda9b4b4b4a6956f49815571d5e2d837deac2128bf71fb42316d5520c5a0dfe74f9bec798b56c
--- a/app-text/tree/tree-2.1.1.ebuild
+++ b/app-text/tree/tree-2.1.1.ebuild
@ -2,21 +2,19 @@
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8
+
 inherit toolchain-funcs flag-o-matic bash-completion-r1

 DESCRIPTION="Lists directories recursively, and produces an indented listing of files"
 HOMEPAGE="https://mama.indstate.edu/users/ice/tree/ https://gitlab.com/OldManProgrammer/unix-tree"
-SRC_URI="https://gitlab.com/OldManProgrammer/unix-${PN}/-/archive/${PV}/unix-${P}.tar.gz"
+SRC_URI="https://gitlab.com/OldManProgrammer/unix-${PN}/-/archive/${PV}/unix-${P}.tar.bz2"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE=""
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"

 S=${WORKDIR}/unix-${P}

-RDEPEND="!app-i18n/man-pages-l10n[l10n_fr]"
-
 src_compile() {
 	append-lfs-flags
 	emake \
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
--- a/dev-lang/spidermonkey/Manifest
+++ b/dev-lang/spidermonkey/Manifest
@ -28,7 +28,7 @@ EBUILD spidermonkey-102.14.0.ebuild 15189 BLAKE2B af2ad36bc7f08fcde97a2955a1a59e
 EBUILD spidermonkey-102.15.0.ebuild 15188 BLAKE2B a943049fa7ff323996d20660a5e29a8a7337b982a7480ce03c9b023dc41ab7c07dc898da514466088914f97600922da6d7f5ca0f7391652149dadb69ca292d25 SHA512 3f7de2d2a7605bbeb34408a728c34005d8d18a6d3f0de1ccaf88aa3f28b09c3cb30a2132e97200ebf3198b08379d91bea07a39054807e59cb54524023ca62fc0
 EBUILD spidermonkey-102.6.0.ebuild 11283 BLAKE2B da31d238e722a0bad508850769b1cfae02e1f4303e59e6311725fee0c274f9d7a6a20ecd6e76ea347c05118a228f1486206f66b655a29b406177df26c49b93d9 SHA512 f616a8ec7b6c9d68c676a716cfc0da73f6b3e63fd657ba998c21de73cabdc5ef53913a7e13c800ba2e703adc584b29d7b9a5f640ed137c2a095ce352cd9bcf12
 EBUILD spidermonkey-115.1.0.ebuild 12490 BLAKE2B 5b0213bfec430c89b14e4ee7a560dcd7471beabe66af63c38934d0efce20596380347274882a1ecdfeef2786e30030dccdfba527e8114b9c3d29df98585ef20d SHA512 0fb45024198fc2df0f4617f1d695603641201efbc6b6b0c426c15371f1bced02b90fc98e25953999647b031c4a0da5c2f612bd0396bb0ffe7728a5bbdf003a93
-EBUILD spidermonkey-115.2.0.ebuild 12474 BLAKE2B 9a143c2ba99399d500c4f4983663cf72589cb4e55c6c0d8d61858db851d6d3dc7306b57db55e26bc0ba17fe435a2010279cfdd8a0b00aa09c989d332ee1eab89 SHA512 dd37a9c2546a303fd252b1109155d2b733b81d5c8d0e7a745bdbe02dff3fdbe92ef53d965680cd621332e51e03be7c59bda587891889b6d7d442feca4402eeb5
+EBUILD spidermonkey-115.2.0.ebuild 12482 BLAKE2B f1752b302a59def7b00668f2fd414ca6e5b3e203984048c0fe0b399e7afad9ff1bf5edabd242302c1341ee641b69a35ec0cfc64735e1453f4eb5b84accfdb533 SHA512 ded61f9495eafbf98aaca5cce8f9ffa5ca6c46a2578b3aa180bbe0edcbbf23de86d6ac207975d5e7243e0c616de03ce7532b667358333a3ae0d5fdf789b9449c
 EBUILD spidermonkey-78.15.0.ebuild 13101 BLAKE2B ce591b28ecc7cecb8a4eac26f385674ae577d79a29e7abaf90be3278bde23ff803186a6fa65e5da6cbad548584122521da71785b6c064edb52c5c52b291a46f2 SHA512 9084f7290eba68bf5f750a1902290fabfe886fde39716c67a1eacd62010ce61ab7090539a08f9de62ce9f637d33d66761b1edf6245ad2176306c364211377b9c
 EBUILD spidermonkey-91.13.0-r1.ebuild 15281 BLAKE2B 889e1a07b8e9c42b55d0863c34fdae803ea391d8069e076f5957355e2a0f397bdbcb4c6b98cdf53187fae4394afb2ab636771964216df002bb6bce11a588a3d3 SHA512 b2690dc8f98fc02a6ab5ba929e96b528afd94a92101cb1982f3170da25886f3d52064e94804890c3595ceca46b54b086e678ed59a8195a5c53406e23fdbb2ccb
 MISC metadata.xml 575 BLAKE2B e7f3717d36ba723ed41a6dc5adc798390ec98cbd018447b52b4b59a692cea93a4430524a3d545649e08057210e3d5427943d15e97aa5e33da859d8b8e352274d SHA512 9fc1545caf99002b574a675fdf8b8ee0cfa2791129109dcb40e01e658d3de283848d63958876208ff1c384ca6041b20d4e6d34b84a445521df3e240c9ea9dfe2
--- a/dev-lang/spidermonkey/spidermonkey-115.2.0.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-115.2.0.ebuild
@ -10,7 +10,7 @@ SPIDERMONKEY_PATCHSET="spidermonkey-115-patches-01.tar.xz"
 LLVM_MAX_SLOT=16

 PYTHON_COMPAT=( python3_{10..11} )
-PYTHON_REQ_USE="ssl,xml(+)"
+PYTHON_REQ_USE="ncurses,ssl,xml(+)"

 WANT_AUTOCONF="2.1"

--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
--- a/dev-libs/gjs/Manifest
+++ b/dev-libs/gjs/Manifest
@ -1,6 +1,8 @@
 AUX gjs-1.76.0-move_have_gtk4_to_the_appropriate_place.patch 1417 BLAKE2B 203701b5535b338283b99aad63e3577d3abb295c005d2e2ac908e2f8abdb24e8f7b9ef311bcf35889a93804583f13ac65f1d9453111b5195320aab9442237b2e SHA512 e2f7ed4c5f15cec6a6a7d3303779a217716ca3d8fa5d3128f4e7e685c47284fd95b9e416d50b28ca34bd06a9c469ebb3f317db88526cdc2ba1088381871da9a4
 DIST gjs-1.76.2.tar.xz 646232 BLAKE2B 66466eeb5f956d5041f4e63ba977dc9a688455770c39bcedd63576f56fde9821ed3c827c470f7e3befbbf7828fbd197706637da458876ec129d6c16323e414e8 SHA512 26b024874ce69a6f58b5fabe006b8d5417971db9de00e21ecd352715b4535f405d162bb81c0cf6b20313f0f78833962080ac1cb9bd42cfff9cf6a74340458540
 DIST gjs-1.77.1.tar.xz 650292 BLAKE2B dde0f9073ef6f87e4f76002d69e6397ac94ae6a9c711b4a35378a8e56191c1a06ae1ee14db5a3078d3f1ec443c6eeb245bdcec7c8702c8e4a581e08530c81ce5 SHA512 2a94406725a59e05485ebfcc6ba6b2a0c26f40833a46d6520caff576dd8495a14eb733cf0788af1ea4b5c9c11edd692637db41f6350fb4a3bf2e1c01267130cc
+DIST gjs-1.77.2.tar.xz 651784 BLAKE2B 9734fa9c0f4662c1bb233aef9398690295168c5758fe33a27bff5eebb0edee3dad6da28ebeb555337928278c99b5eb7fa1651445bdb8e212d9b672eb9ae08616 SHA512 2b804e6b039801b55e9d700794e390c927b00e2dd738dcada95867b3ba957e1a193367c2babb4a941b8aead301ca68e5b8ece655a13a3989708072a96600eba4
 EBUILD gjs-1.76.2.ebuild 2054 BLAKE2B dfa49fe0e2831e150bb43428b12c7475464a98fd305cc0151318125e0cdd2d0e32c2cf303e3efbdc65ad88c80969c2cd2cbb67ee53a274f069dac5397dc04383 SHA512 18f55663e333ef183fafee8eb9e3e201e258a7caa06e1714035c0cfafbfba42faf2b33db861940d4329f69ddbcbfce831419ef6548044325add84d624124ee7b
 EBUILD gjs-1.77.1.ebuild 1966 BLAKE2B 1783a96ee082e74ca58cb4f7292969a4c0374c8da4af3020d96163eff29585b0bc470ab275304928ed361c66a2554ec0f046e536eeecdf25940582ca510fcecc SHA512 2e3a9f5c5d42e76a96dfe533a9142ec1b332486bd16007d42b66d52bf8635a289b493122f92195b3a614cde78a084bb20be5a72b72e6965e98dd4c86c1326ea6
+EBUILD gjs-1.77.2.ebuild 1956 BLAKE2B d564cd46ecfac794e8c2f251f8feae5787aa7ad3ab2e3903a05fa17d1f7e013c1d58080788006f39c73a21d49d833c4a9354d4877126f75b593a0372062d7bf3 SHA512 01955c0b0a5a563759495e41e9f61c3eee182d829cabe870e26a76256c626fc395c3e9e80ed1049b429afa6feea19d78d39491d23faf82d67bf5a437974e93e8
 MISC metadata.xml 473 BLAKE2B 0d57ec402b3daaa00af170335374e711150ecccd019aea100484079a055015f36119c4564ae2d95e82e4ac8d6de6d84b83379aedfdcbfb7aaabaa752b51d8203 SHA512 a4f99ef450b30c381845a774865b4e82b2a554cc7f0a2edba7002096563943b58b290f704210cc00ca0508cf6e81a11be2fa0c6402117d2b05f0e4eb2e03a0c2
--- a/dev-libs/gjs/gjs-1.77.2.ebuild
+++ b/dev-libs/gjs/gjs-1.77.2.ebuild
@ -0,0 +1,68 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic gnome.org meson virtualx
+
+DESCRIPTION="Javascript bindings for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Projects/Gjs https://gitlab.gnome.org/GNOME/gjs"
+
+LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
+SLOT="0"
+IUSE="+cairo examples readline sysprof test"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/glib-2.66.0:2
+	dev-libs/libffi:=
+	>=dev-libs/gobject-introspection-1.71.1:=
+	dev-lang/spidermonkey:115
+	cairo? ( x11-libs/cairo[X,glib] )
+	readline? ( sys-libs/readline:0= )
+"
+DEPEND="${RDEPEND}
+	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 )
+	test? (
+		sys-apps/dbus
+		>=x11-libs/gtk+-3.20:3[introspection]
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+src_configure() {
+	append-cppflags -DG_DISABLE_CAST_CHECKS
+
+	# On musl, it's required that either gjs, pixman or gnome-shell to be built
+	# with a larger stack otherwise librsvg fails to render a particular SVG, as
+	# a result we fail to get gdm or gnome-shell running (greeted with a fail
+	# whale screen). The bug has been reported to librsvg. This is ideally just
+	# a temporary workaround until we understand what exactly needs a larger
+	# stack size, as it's not sufficient to do just librsvg.
+	#
+	# Please refer to:
+	# https://gitlab.gnome.org/GNOME/librsvg/-/issues/686
+	# https://gitlab.gnome.org/GNOME/librsvg/-/issues/874
+	#
+	# TODO: Find an actual fix instead of increasing the stack
+	use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152
+
+	# FIXME: add systemtap/dtrace support, like in glib:2
+	local emesonargs=(
+		$(meson_feature cairo)
+		$(meson_feature readline)
+		$(meson_feature sysprof profiler)
+		-Dinstalled_tests=false
+		$(meson_use !test skip_dbus_tests)
+		$(meson_use !test skip_gtk_tests)
+		-Db_pch=True # TODO this has to go
+	)
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test
+}
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@ -2,7 +2,9 @@ AUX glib-2.64.1-mark-gdbus-server-auth-test-flaky.patch 842 BLAKE2B 6b2eb57b8923
 DIST glib-2.76.3.tar.xz 5273460 BLAKE2B 894635281d1a3eb60d274b8db91cd59069b6d0abe61295175c794ad44e8669d869009fac44c7d6f416a93adcea5b9aeb90b944047d013fa1f2d9b1a8ded3de1e SHA512 291b8913918d411b679442b888f56893a857a77decfe428086c8bd1da1949498938ddb0bf254ed99d192e4a09b5e8cee1905fd6932ee642463fb229cac7c226e
 DIST glib-2.76.4.tar.xz 5274356 BLAKE2B c9ceb514ea81e1e6ab2d0efc82c48c0d8ae6c997fd0e3c56d47a5174b027f785b58266fff73b1d1132e272305126fbff22e3c65d47de46224cd12fa49796d5bc SHA512 f76932dc5090a44880373228e2b162f338415d06f7c90f2950eab1a43bb191c56a1797da4d377594f6a999197fef4defb848039259cfa4105bb68288a928f5b7
 DIST glib-2.77.1.tar.xz 5305568 BLAKE2B bca94b2884e4d4ef3246a398c785a83d814986ca5dc49dbbfed471b0303b2ef1aaa194728b580cc12155a0791b75d217e978ca6b9eb7b7ee5314799b7570059f SHA512 0f32eb7dcc652a727331226324225864212e14d0b1adac4493eb92f34c562cabd50cf8a602dae1b877e7adb73e038d2cc1e8d641e71eab77497990af4afb4906
+DIST glib-2.77.3.tar.xz 5316816 BLAKE2B 94d28c1526a19cb679a85f32bda159ee07862ce6aa0e2bb2e953c748d8cc790454603d3db8c748638754fef60e74a6e3584952804ff438b49fcfc009803a07b5 SHA512 d9727d67e63d7f8ce710bff497c183799b0192ac10900da87887bd76812aad9603e7f132d7eb4e8626787c427048aeafb4a28654ab808c676bcfc2b897e005d9
 EBUILD glib-2.76.3.ebuild 10850 BLAKE2B f5d35696cb3fd1820b41511da9df32433b3c86063fd295497a296065ac47789955bc2ff45d336bfce6a2e5941e57363a52edb11be03151f7d610462ae97e9690 SHA512 d4954b98d44b8a0a4ade75d12a172b0a15c8ea56e00092410dd3de5d816ff8d9fd04c8b9e35a9639674d1384dfc676133ff9cd9882a40d6b2b9eac1e7a36f9dd
 EBUILD glib-2.76.4.ebuild 10852 BLAKE2B dc68aba7b20a7c07c775d316c00bb0b4462c95ab0acb53a8495e183cd4a4ba9dd4e8f5c8e8530c019237217f88ea2929f65253f2fc6850b72fbb81e6b6435259 SHA512 c4f86cf04aa497cf67fd33dfa44a9b636f3c56fd943b6589d3b91597de47db729468d8296db9b9099d21734f684069a582184f42e37058c8e6d008c410002923
 EBUILD glib-2.77.1.ebuild 10858 BLAKE2B 88f05da75fd50a37ab9de061349bb5f943492089fe3314ab823a183c36be3c211642bcddf710d710a7204d564b49ae2e8fa6286388834861ef0d49a029b4f771 SHA512 5c33b8fc0282b4525e2918410c3b71343f3d2e5270075cbcaf5c1876aa8d1cd3b92f41750d4646b20cf89dd849f4a2dc288a09708270fb4e82560ffbb0f47e94
+EBUILD glib-2.77.3.ebuild 10858 BLAKE2B 88f05da75fd50a37ab9de061349bb5f943492089fe3314ab823a183c36be3c211642bcddf710d710a7204d564b49ae2e8fa6286388834861ef0d49a029b4f771 SHA512 5c33b8fc0282b4525e2918410c3b71343f3d2e5270075cbcaf5c1876aa8d1cd3b92f41750d4646b20cf89dd849f4a2dc288a09708270fb4e82560ffbb0f47e94
 MISC metadata.xml 1357 BLAKE2B c9236f5cdb72931175f757cd7b713d924655cbbdbba9a45479564a2fb8f73b490923d62b69e84568dcd8cd47df32f9fa1dd51481c332a85713c17ce6f6af5109 SHA512 6fc9c503e81c78e21904f74cedb9dbce10194b7acaecf3f17098749e33ca2513a96a53142bc8c1d9d196e48d62b8752956c30d4813ac34d0616cdf13de37b33b
--- a/dev-libs/glib/glib-2.77.3.ebuild
+++ b/dev-libs/glib/glib-2.77.3.ebuild
@ -0,0 +1,312 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_REQ_USE="xml(+)"
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit gnome.org gnome2-utils linux-info meson-multilib multilib python-any-r1 toolchain-funcs xdg
+
+DESCRIPTION="The GLib library of C routines"
+HOMEPAGE="https://www.gtk.org/"
+
+LICENSE="LGPL-2.1+"
+SLOT="2"
+IUSE="dbus debug +elf gtk-doc +mime selinux static-libs sysprof systemtap test utils xattr"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="gtk-doc? ( test )" # Bug #777636
+
+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"
+
+# * elfutils (via libelf) does not build on Windows. gresources are not embedded
+# within ELF binaries on that platform anyway and inspecting ELF binaries from
+# other platforms is not that useful so exclude the dependency in this case.
+# * Technically static-libs is needed on zlib, util-linux and perhaps more, but
+# these are used by GIO, which glib[static-libs] consumers don't really seem
+# to need at all, thus not imposing the deps for now and once some consumers
+# are actually found to static link libgio-2.0.a, we can revisit and either add
+# them or just put the (build) deps in that rare consumer instead of recursive
+# RDEPEND here (due to lack of recursive DEPEND).
+RDEPEND="
+	!<dev-util/gdbus-codegen-${PV}
+	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
+	>=dev-libs/libpcre2-10.32:0=[${MULTILIB_USEDEP},unicode(+),static-libs?]
+	>=dev-libs/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	>=virtual/libintl-0-r2[${MULTILIB_USEDEP}]
+	kernel_linux? ( >=sys-apps/util-linux-2.23[${MULTILIB_USEDEP}] )
+	selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] )
+	xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] ) )
+	elf? ( virtual/libelf:0= )
+	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+# libxml2 used for optional tests that get automatically skipped
+BDEPEND="
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	>=sys-devel/gettext-0.19.8
+	gtk-doc? ( >=dev-util/gtk-doc-1.33
+		app-text/docbook-xml-dtd:4.2
+		app-text/docbook-xml-dtd:4.5 )
+	systemtap? ( >=dev-util/systemtap-1.3 )
+	${PYTHON_DEPS}
+	test? ( >=sys-apps/dbus-1.2.14 )
+	virtual/pkgconfig
+"
+# TODO: >=dev-util/gdbus-codegen-${PV} test dep once we modify gio/tests/meson.build to use external gdbus-codegen
+
+PDEPEND="
+	dbus? ( gnome-base/dconf )
+	mime? ( x11-misc/shared-mime-info )
+"
+# shared-mime-info needed for gio/xdgmime, bug #409481
+# dconf is needed to be able to save settings, bug #498436
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/gio-querymodules$(get_exeext)
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.64.1-mark-gdbus-server-auth-test-flaky.patch
+)
+
+pkg_setup() {
+	if use kernel_linux ; then
+		CONFIG_CHECK="~INOTIFY_USER"
+		if use test ; then
+			CONFIG_CHECK="~IPV6"
+			WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them."
+		fi
+		linux-info_pkg_setup
+	fi
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	if use test; then
+		# TODO: Review the test exclusions, especially now with meson
+		# Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163
+		if ! has_version dev-util/desktop-file-utils ; then
+			ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system,"
+			ewarn "think on installing it to get these tests run."
+			sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die
+			sed -i -e "/g_test_add_func/d" gio/tests/desktop-app-info.c || die
+		fi
+
+		# gdesktopappinfo requires existing terminal (gnome-terminal or any
+		# other), falling back to xterm if one doesn't exist
+		#if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then
+		#	ewarn "Some tests will be skipped due to missing terminal program"
+		# These tests seem to sometimes fail even with a terminal; skip for now and reevulate with meson
+		# Also try https://gitlab.gnome.org/GNOME/glib/issues/1601 once ready
+		# for backport (or in a bump) and file new issue if still fails
+		sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die
+		# desktop-app-info/launch* might fail similarly
+		sed -i -e "/desktop-app-info\/launch-as-manager/d" gio/tests/desktop-app-info.c || die
+		#fi
+
+		# https://bugzilla.gnome.org/show_bug.cgi?id=722604
+		sed -i -e "/timer\/stop/d" glib/tests/timer.c || die
+		sed -i -e "/timer\/basic/d" glib/tests/timer.c || die
+
+		ewarn "Tests for search-utils have been skipped"
+		sed -i -e "/search-utils/d" glib/tests/meson.build || die
+
+		# Play nice with network-sandbox, but this approach would defeat the purpose of the test
+		#sed -i -e "s/localhost/127.0.0.1/g" gio/tests/gsocketclient-slow.c || die
+	else
+		# Don't build tests, also prevents extra deps, bug #512022
+		sed -i -e '/subdir.*tests/d' {.,gio,glib}/meson.build || die
+	fi
+
+	# Don't build fuzzing binaries - not used
+	sed -i -e '/subdir.*fuzzing/d' meson.build || die
+
+	# gdbus-codegen is a separate package
+	sed -i -e '/install_dir/d' gio/gdbus-2.0/codegen/meson.build || die
+
+	# Same kind of meson-0.50 issue with some installed-tests files; will likely be fixed upstream soon
+	sed -i -e '/install_dir/d' gio/tests/meson.build || die
+
+	cat > "${T}/glib-test-ld-wrapper" <<-EOF
+		#!/usr/bin/env sh
+		exec \${LD:-ld} "\$@"
+	EOF
+	chmod a+x "${T}/glib-test-ld-wrapper" || die
+	sed -i -e "s|'ld'|'${T}/glib-test-ld-wrapper'|g" gio/tests/meson.build || die
+
+	# make default sane for us
+	if use prefix ; then
+		sed -i -e "s:/usr/local:${EPREFIX}/usr:" gio/xdgmime/xdgmime.c || die
+		# bug #308609, without path, bug #314057
+		export PERL=perl
+	fi
+
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		# fix standards conflicts
+		sed -i \
+			-e 's/\<\(_XOPEN_SOURCE_EXTENDED\)\>/_POSIX_PTHREAD_SEMANTICS/' \
+			-e '/\<_XOPEN_SOURCE\>/s/\<2\>/600/' \
+			meson.build || die
+		sed -i -e '/#define\s\+_POSIX_SOURCE/d' \
+			glib/giounix.c || die
+	fi
+
+	# disable native macOS integrations
+	sed -i -e '/glib_conf.set(.HAVE_\(CARBON\|COCOA\).,/s/true/false/' \
+		meson.build || die
+	sed -i \
+		-e '/AvailabilityMacros.h/d' \
+		gio/giomodule.c || die
+
+	default
+	gnome2_environment_reset
+	# TODO: python_name sedding for correct python shebang? Might be relevant mainly for glib-utils only
+}
+
+multilib_src_configure() {
+	# TODO: figure a way to pass appropriate values for all cross properties
+	# that glib uses (search for get_cross_property)
+	#if tc-is-cross-compiler ; then
+		# https://bugzilla.gnome.org/show_bug.cgi?id=756473
+		# TODO-meson: This should be in meson cross file as 'growing_stack'
+		# property; and more, look at get_cross_property
+		#case ${CHOST} in
+		#hppa*|metag*) export glib_cv_stack_grows=yes ;;
+		#*)            export glib_cv_stack_grows=no ;;
+		#esac
+	#fi
+
+	local emesonargs=(
+		--buildtype $(usex debug debug plain)
+		-Ddefault_library=$(usex static-libs both shared)
+		-Druntime_dir="${EPREFIX}"/run
+		$(meson_feature selinux)
+		$(meson_use xattr)
+		-Dlibmount=enabled # only used if host_system == 'linux'
+		-Dman=true
+		$(meson_use systemtap dtrace)
+		$(meson_use systemtap)
+		$(meson_feature sysprof)
+		$(meson_native_use_bool gtk-doc gtk_doc)
+		$(meson_use test tests)
+		-Dinstalled_tests=false
+		-Dnls=enabled
+		-Doss_fuzz=disabled
+		$(meson_native_use_feature elf libelf)
+		-Dmultiarch=false
+	)
+	meson_src_configure
+}
+
+multilib_src_test() {
+	export XDG_CONFIG_DIRS=/etc/xdg
+	export XDG_DATA_DIRS=/usr/local/share:/usr/share
+	export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp"
+	export LC_TIME=C # bug #411967
+	export TZ=UTC
+	unset GSETTINGS_BACKEND # bug #596380
+	python_setup
+
+	# https://bugs.gentoo.org/839807
+	local -x SANDBOX_PREDICT=${SANDBOX_PREDICT}
+	addpredict /usr/b
+
+	# Related test is a bit nitpicking
+	mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
+	chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
+
+	meson_src_test --timeout-multiplier 2 --no-suite flaky
+}
+
+multilib_src_install() {
+	meson_src_install
+	keepdir /usr/$(get_libdir)/gio/modules
+}
+
+multilib_src_install_all() {
+	# These are installed by dev-util/glib-utils
+	# TODO: With patching we might be able to get rid of the python-any deps
+	# and removals, and test depend on glib-utils instead; revisit now with
+	# meson
+	rm "${ED}/usr/bin/glib-genmarshal" || die
+	rm "${ED}/usr/share/man/man1/glib-genmarshal.1" || die
+	rm "${ED}/usr/bin/glib-mkenums" || die
+	rm "${ED}/usr/share/man/man1/glib-mkenums.1" || die
+	rm "${ED}/usr/bin/gtester-report" || die
+	rm "${ED}/usr/share/man/man1/gtester-report.1" || die
+	# gdbus-codegen manpage installed by dev-util/gdbus-codegen
+	rm "${ED}/usr/share/man/man1/gdbus-codegen.1" || die
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+
+	# Make gschemas.compiled belong to glib alone
+	local cache="/usr/share/glib-2.0/schemas/gschemas.compiled"
+
+	if [[ -e ${EROOT}${cache} ]]; then
+		cp "${EROOT}"${cache} "${ED}"/${cache} || die
+	else
+		touch "${ED}"${cache} || die
+	fi
+
+	multilib_pkg_preinst() {
+		# Make giomodule.cache belong to glib alone
+		local cache="/usr/$(get_libdir)/gio/modules/giomodule.cache"
+
+		if [[ -e ${EROOT}${cache} ]]; then
+			cp "${EROOT}"${cache} "${ED}"${cache} || die
+		else
+			touch "${ED}"${cache} || die
+		fi
+	}
+
+	# Don't run the cache ownership when cross-compiling, as it would end up with an empty cache
+	# file due to inability to create it and GIO might not look at any of the modules there
+	if ! tc-is-cross-compiler ; then
+		multilib_foreach_abi multilib_pkg_preinst
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	# glib installs no schemas itself, but we force update for fresh install in case
+	# something has dropped in a schemas file without direct glib dep; and for upgrades
+	# in case the compiled schema format could have changed
+	gnome2_schemas_update
+
+	multilib_pkg_postinst() {
+		gnome2_giomodule_cache_update \
+			|| die "Update GIO modules cache failed (for ${ABI})"
+	}
+	if ! tc-is-cross-compiler ; then
+		multilib_foreach_abi multilib_pkg_postinst
+	else
+		ewarn "Updating of GIO modules cache skipped due to cross-compilation."
+		ewarn "You might want to run gio-querymodules manually on the target for"
+		ewarn "your final image for performance reasons and re-run it when packages"
+		ewarn "installing GIO modules get upgraded or added to the image."
+	fi
+
+	for v in ${REPLACING_VERSIONS}; do
+		if ver_test "$v" "-lt" "2.63.6"; then
+			ewarn "glib no longer installs the gio-launch-desktop binary. You may need"
+			ewarn "to restart your session for \"Open With\" dialogs to work."
+		fi
+	done
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+
+	if [[ -z ${REPLACED_BY_VERSION} ]]; then
+		multilib_pkg_postrm() {
+			rm -f "${EROOT}"/usr/$(get_libdir)/gio/modules/giomodule.cache
+		}
+		multilib_foreach_abi multilib_pkg_postrm
+		rm -f "${EROOT}"/usr/share/glib-2.0/schemas/gschemas.compiled
+	fi
+}
--- a/dev-libs/libnl/Manifest
+++ b/dev-libs/libnl/Manifest
@ -3,6 +3,6 @@ AUX libnl-3.8.0-python-decorator-syntax.patch 798 BLAKE2B 364c3eff7873ae791c5ff2
 DIST libnl-3.7.0.tar.gz 1000913 BLAKE2B 22c418ea520416d79ee4552ab6bc5ba99239b29e074c840d31b0ec4171a0403ea9d2c1afcbf1b3428564dd371cadd99bc062ae7540e7496f970c4fb98f967e84 SHA512 80fbbc079299c90afd2a5eda62e4d4f98bf4ef23958c3ce5101f4ed4d81d783af733213bb3bab15f218555d8460bc2394898f909f4ac024fc27281faec86a041
 DIST libnl-3.8.0.tar.gz 1071113 BLAKE2B ff90d52e9b617ad8a53e4d42f43bee065b331ed919a3effc4a0f38c8e15b46f86c1eb153816499ed77dd99063500b1dc52951891034475a5bb81da1ad8004594 SHA512 a8da7e8464c5cab2807cd86f83fca53bc77f7c3bdefe43880db7be9caf5ba6bfca1b7e778b906c12fda1cf7e6f413f88cc7ad1dcc42fe8c050a8d28a6e656c02
 EBUILD libnl-3.7.0.ebuild 2639 BLAKE2B 9f93d4b6028347d62b49758d015b1dafd1627f87ae84259fd8d5a68f20ed1355db80d0defc0f3fb4a1d55180c20927fb024d9e1bbb30a78e528543e1004d4fac SHA512 c3eda33ee4c7a322c36f658c3cda16b97ff560aee28362db5c288d2f60d6562e739aa523f4db164984bf8c29777e49e124989715a09f189f8f978d188928fa95
-EBUILD libnl-3.8.0.ebuild 2763 BLAKE2B d6421cfd9df3cc01f83633bebdc447d2e68ee752de6e80dc553e090b740aeb51b9aa0c4d01bf4a2462f8228dba495f3b831edcb891b22da24783f3e096f793c2 SHA512 421684ab9a05b8d9acd86c57451fa679f89f145274931a0b29d44e735cf9a6e57e1936d0ba44f7173fb3bf951ce1a0568720d113504e4f34a090d58c95c6a491
-EBUILD libnl-9999.ebuild 2713 BLAKE2B 4dd197363e5b9904e8cc6dd2750659c007bd5b2388f8ca09d2617ece4630d2d1ecf94d1400f28b0006a9a80cb79689793d1a8fb3ee297913d3232e30a5aacd8b SHA512 b8771eb81cf727d516e5add7467ca70322f6a06ba8602d1894f89e4f013eba6e68d29d9f05a5b4324d9ab24b06af56a1bbedc3c373aafc932d9e0b997056cced
+EBUILD libnl-3.8.0.ebuild 2903 BLAKE2B 0bd157a95ce57bcf09ddf0b5ad8ddb0aba86bbf875885c905fbd5489d17fff3ff32ce9858e98a7af1d453b74d794bcf2eb105cc540bae9f826a1a934286ead6f SHA512 3f15826a67fec5d6f353c928854762f228f977f835eeb4f8954623e31d8dd8c7a662817dd32631666d7b9aa76c89f6325387ad35de3e0b114a0c7d978d21ffbb
+EBUILD libnl-9999.ebuild 2853 BLAKE2B 829d33a9c34d47b13ef0ea06e37a10e84b11a22adcfa5080a5d2a3fbb8032d75d64ca8be74e0ad82ba77e3062054a5ad33d697366c99680438f57c981592a657 SHA512 be904d8c4efd0edf5b6a963455c377eac041b697d9ce9ecdd40a8b785f9de7e176fb3193de7904fa05d44a91603ef7213634fd2cef10a643b7299d4c8cfbe19a
 MISC metadata.xml 525 BLAKE2B 62918f4b184a0636f9dbe24a31978ceccf354610b2b8d6db040440f5b519f5a7d710861b94671fd1c684da40e2a9df8563093509e7de9318c891e7c93567b7bf SHA512 076a06cff6803de3775cb295688cbe61831e79e3fa2d7a7e53b376a2c0a5137b349db153692b4cfa22ce6121d9e0579253dee06056076e9aec6f09aaf7a41387
--- a/dev-libs/libnl/libnl-3.8.0.ebuild
+++ b/dev-libs/libnl/libnl-3.8.0.ebuild
@ -3,6 +3,9 @@

 EAPI=8

+# Make sure to test USE=utils on bumps and update MULTILIB_WRAPPED_HEADERS if needed
+
+DISTUTILS_EXT=1
 DISTUTILS_OPTIONAL=1
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{10..11} )
@ -52,6 +55,7 @@ MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/libnl3/netlink/cli/exp.h
 	/usr/include/libnl3/netlink/cli/link.h
 	/usr/include/libnl3/netlink/cli/mdb.h
+	/usr/include/libnl3/netlink/cli/nh.h
 	/usr/include/libnl3/netlink/cli/neigh.h
 	/usr/include/libnl3/netlink/cli/qdisc.h
 	/usr/include/libnl3/netlink/cli/route.h
--- a/dev-libs/libnl/libnl-9999.ebuild
+++ b/dev-libs/libnl/libnl-9999.ebuild
@ -3,6 +3,9 @@

 EAPI=8

+# Make sure to test USE=utils on bumps and update MULTILIB_WRAPPED_HEADERS if needed
+
+DISTUTILS_EXT=1
 DISTUTILS_OPTIONAL=1
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{10..11} )
@ -52,6 +55,7 @@ MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/libnl3/netlink/cli/exp.h
 	/usr/include/libnl3/netlink/cli/link.h
 	/usr/include/libnl3/netlink/cli/mdb.h
+	/usr/include/libnl3/netlink/cli/nh.h
 	/usr/include/libnl3/netlink/cli/neigh.h
 	/usr/include/libnl3/netlink/cli/qdisc.h
 	/usr/include/libnl3/netlink/cli/route.h
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@ -7,8 +7,10 @@ AUX nss-3.87-use-clang-as-bgo892686.patch 2693 BLAKE2B fe8a25c9c8599e0f3e630202c
 DIST nss-3.79.4.tar.gz 84826326 BLAKE2B c34b1ba2c24891bd316af27828dbcc6b193b7298fe6a965cfd42d6a37aa3c25ecb80c9b8c2195ba89d2ea395739def47ff5269f7964235c2883e5b33d67889e9 SHA512 194c7595871ada65c03dcea8f2ec75ea9d6da3ce270c956e8abb2d72b6465e14c7be7892532548b9ca6f319f557353b98facb6f3d620a3a3825d889170b02fa2
 DIST nss-3.91.tar.gz 72267945 BLAKE2B 7dcd680311a5503007c0bb738ec24b50e40841470592c2d8dd542b3bdf085a6e4816f1fab4cb6b86220ff3e39a828f57a0a9172e3d1c2c82537eab6558a50226 SHA512 65258a4ea0b8c06ec49dd411eabe860ad5d7c3873beb27f8f43e10ef6be020b1522112df9deaeed27f23fd72f13cc7554e9c1854cd97e4716de419f722aff020
 DIST nss-3.92.tar.gz 72133646 BLAKE2B 251daae56ccf8b8f4fd0b4287fea2049b6e72d1fc57fe02fb3d4f0b8a083aaf00046844145721a1e7620ecfbdbbb93206591e47386c12662765c09cf99db42bc SHA512 dc317ec909433c9026f108b466bc436110b3c77edc3f73aef3d6dc6782f584c205053a368e4a134715bfdf63d2c1ae2185fc23238e5c2dca8f88ec185b1fec2a
+DIST nss-3.93.tar.gz 72281331 BLAKE2B 99e50f450a451f2b0bc0aad9b0fba405c987d88546d4aad6c490cb43dc274f23eb99d03d5fa8cf7ef16585abebfdae942fe1092d3f1c86816ba35e16ed3d490f SHA512 d96f13a70e825b39efadfe7c973c24c1e5ad43319bd813599010383e2b8434181f53489672f68fe79e2cb0c4d4ea0088499e588c3524eccf9298aafc57b94951
 DIST nss-cacert-class1-class3-r2.patch 21925 BLAKE2B 7627ff9a09f084c19d72d0490676865e3cab3ca7c920ae1ce4bea2db664f37fd0aa84fcda919809a516891ab2a62e2e7a43a9d6ada4c231adfe4c216525fac7d SHA512 1ce6ff9ab310aaca9005eafb461338b291df8523cc7044e096cd75774ce746c26eed19ec6bb2643c6c67f94650f2f309463492d80a90568f38ce2557f8ada2f4
 EBUILD nss-3.79.4.ebuild 10715 BLAKE2B 0b5947e1a5f4f0e4bc3d037a92116c25d3995b8e3c3a912e23e17b96136564b89946013dca40351b698af2a974b698cca0fd4832fff9e07d78ae628744a8c0eb SHA512 f519e6c3a17ef0bd51291ed8f210ae2b20c8faa9fe5f3cb0b5466a37b63bd7606420e1f90e46fa05632cda31f0482230a7aba6ce48006e5cf846bf42f9d6bc86
 EBUILD nss-3.91.ebuild 11383 BLAKE2B 04ddb43b318f7e9dd2f9239681a24be1db5ce550a3c0f6c6fc9825822a31f28a175fd3bdabfd0a6640b87c859c0508d5328811c136e5dab10e0daf6780fd5cff SHA512 349022ff589b29663c880992e5225935a2bf9705dcd7551b4579cf571003df6fae2f4819bc91dff19269bab41bd68f746626ee8df295cd5e281c2fdd786666ed
 EBUILD nss-3.92.ebuild 11335 BLAKE2B 5f94b4d9687ab37207861670a97d856f91e30f0ea57f0f67c4e3c18066939db2dc3c79cbbddacca53515fd49f3211fda4c84be2cf37e16967e7fd1e7c9d56344 SHA512 313d21c4ea9f4c009b828ee2c3bea5a9b5999822e0a7890950f0952a3c95f59313dba9bff7c18926539b8c2673b295de1dda3f4f678efbe83403180e65454c92
+EBUILD nss-3.93.ebuild 11335 BLAKE2B 5f94b4d9687ab37207861670a97d856f91e30f0ea57f0f67c4e3c18066939db2dc3c79cbbddacca53515fd49f3211fda4c84be2cf37e16967e7fd1e7c9d56344 SHA512 313d21c4ea9f4c009b828ee2c3bea5a9b5999822e0a7890950f0952a3c95f59313dba9bff7c18926539b8c2673b295de1dda3f4f678efbe83403180e65454c92
 MISC metadata.xml 603 BLAKE2B 74c5a84f8a860b6a43731ed83cd40373187236de7add14ca33f3417eb0cfc165aa5df5308dca14b4664bcfe453e0f328988df4459af5781da4cbcb7bfc00e93d SHA512 9d7fb0be71d18ad1da440de047f4430bd3b50a8584d8dccd43e5e4cdf050f5c5cfeb34cd82ea617f2419ff092908becd1508eb7efcf54f3cca8c7f36af9517bb
--- a/dev-libs/nss/nss-3.93.ebuild
+++ b/dev-libs/nss/nss-3.93.ebuild
@ -0,0 +1,413 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic multilib toolchain-funcs multilib-minimal
+
+NSPR_VER="4.35"
+RTM_NAME="NSS_${PV//./_}_RTM"
+
+DESCRIPTION="Mozilla's Network Security Services library that implements PKI support"
+HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"
+SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz
+	cacert? ( https://dev.gentoo.org/~whissi/dist/ca-certificates/nss-cacert-class1-class3-r2.patch )"
+
+LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+IUSE="cacert test +utils cpu_flags_ppc_altivec cpu_flags_x86_avx2 cpu_flags_x86_sse3 cpu_flags_ppc_vsx"
+RESTRICT="!test? ( test )"
+# pkg-config called by nss-config -> virtual/pkgconfig in RDEPEND
+RDEPEND="
+	>=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
+	>=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
+"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-lang/perl"
+
+S="${WORKDIR}/${P}/${PN}"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/nss-config
+)
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.53-gentoo-fixups.patch"
+	"${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch"
+	"${FILESDIR}"/nss-3.87-use-clang-as-bgo892686.patch
+)
+
+src_prepare() {
+	default
+
+	if use cacert ; then
+		eapply -p2 "${DISTDIR}"/nss-cacert-class1-class3-r2.patch
+	fi
+
+	pushd coreconf >/dev/null || die
+	# hack nspr paths
+	echo 'INCLUDES += -I$(DIST)/include/dbm' \
+		>> headers.mk || die "failed to append include"
+
+	# modify install path
+	sed -e '/CORE_DEPTH/s:SOURCE_PREFIX.*$:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \
+		-i source.mk || die
+
+	# Respect LDFLAGS
+	sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk
+
+	# Workaround make-4.4's change to sub-make, bmo#1800237, bgo#882069
+	sed -i -e "s/^CPU_TAG = _.*/CPU_TAG = _$(nssarch)/" Linux.mk || die
+
+	popd >/dev/null || die
+
+	# Fix pkgconfig file for Prefix
+	sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \
+		config/Makefile || die
+
+	# use host shlibsign if need be #436216
+	if tc-is-cross-compiler ; then
+		sed -i \
+			-e 's:"${2}"/shlibsign:shlibsign:' \
+			cmd/shlibsign/sign.sh || die
+	fi
+
+	# dirty hack
+	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \
+		lib/ssl/config.mk || die
+	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../../lib/freebl/\$(OBJDIR):" \
+		cmd/platlibs.mk || die
+
+	multilib_copy_sources
+
+	strip-flags
+}
+
+multilib_src_configure() {
+	# Ensure we stay multilib aware
+	sed -i -e "/@libdir@/ s:lib64:$(get_libdir):" config/Makefile || die
+}
+
+nssarch() {
+	# Most of the arches are the same as $ARCH
+	local t=${1:-${CHOST}}
+	case ${t} in
+		*86*-pc-solaris2*) echo "i86pc"   ;;
+		aarch64*)          echo "aarch64" ;;
+		hppa*)             echo "parisc"  ;;
+		i?86*)             echo "i686"    ;;
+		x86_64*)           echo "x86_64"  ;;
+		*)                 tc-arch ${t}   ;;
+	esac
+}
+
+nssbits() {
+	local cc cppflags="${1}CPPFLAGS" cflags="${1}CFLAGS"
+	if [[ ${1} == BUILD_ ]]; then
+		cc=$(tc-getBUILD_CC)
+	else
+		cc=$(tc-getCC)
+	fi
+	echo > "${T}"/test.c || die
+	${cc} ${!cppflags} ${!cflags} -c "${T}"/test.c -o "${T}/${1}test.o" || die
+	case $(file "${T}/${1}test.o") in
+		*32-bit*x86-64*) echo USE_X32=1;;
+		*64-bit*|*ppc64*|*x86_64*) echo USE_64=1;;
+		*32-bit*|*ppc*|*i386*) ;;
+		*) die "Failed to detect whether ${cc} builds 64bits or 32bits, disable distcc if you're using it, please";;
+	esac
+}
+
+multilib_src_compile() {
+	# use ABI to determine bit'ness, or fallback if unset
+	local buildbits mybits
+	case "${ABI}" in
+		n32) mybits="USE_N32=1";;
+		x32) mybits="USE_X32=1";;
+		s390x|*64) mybits="USE_64=1";;
+		${DEFAULT_ABI})
+			einfo "Running compilation test to determine bit'ness"
+			mybits=$(nssbits)
+			;;
+	esac
+	# bitness of host may differ from target
+	if tc-is-cross-compiler; then
+		buildbits=$(nssbits BUILD_)
+	fi
+
+	local makeargs=(
+		CC="$(tc-getCC)"
+		CCC="$(tc-getCXX)"
+		AR="$(tc-getAR) rc \$@"
+		RANLIB="$(tc-getRANLIB)"
+		OPTIMIZER=
+		${mybits}
+		disable_ckbi=0
+	)
+
+	# Take care of nspr settings #436216
+	local myCPPFLAGS="${CPPFLAGS} $($(tc-getPKG_CONFIG) nspr --cflags)"
+	unset NSPR_INCLUDE_DIR
+
+	export NSS_ALLOW_SSLKEYLOGFILE=1
+	export NSS_ENABLE_WERROR=0 #567158
+	export BUILD_OPT=1
+	export NSS_USE_SYSTEM_SQLITE=1
+	export NSDISTMODE=copy
+	export FREEBL_NO_DEPEND=1
+	export FREEBL_LOWHASH=1
+	export NSS_SEED_ONLY_DEV_URANDOM=1
+	export USE_SYSTEM_ZLIB=1
+	export ZLIB_LIBS=-lz
+	export ASFLAGS=""
+	# Fix build failure on arm64
+	export NS_USE_GCC=1
+	# Detect compiler type and set proper environment value
+	if tc-is-gcc; then
+		export CC_IS_GCC=1
+	elif tc-is-clang; then
+		export CC_IS_CLANG=1
+	fi
+
+	export NSS_DISABLE_GTESTS=$(usex !test 1 0)
+
+	# Include exportable custom settings defined by users, #900915
+	# Two examples uses:
+	#   EXTRA_NSSCONF="MYONESWITCH=1"
+	#   EXTRA_NSSCONF="MYVALUE=0 MYOTHERVALUE=1 MYTHIRDVALUE=1"
+	# e.g.
+	#   EXTRA_NSSCONF="NSS_ALLOW_SSLKEYLOGFILE=0"
+	# or
+	#   EXTRA_NSSCONF="NSS_ALLOW_SSLKEYLOGFILE=0 NSS_ENABLE_WERROR=1"
+	# etc.
+	if [[ -n "${EXTRA_NSSCONF}" ]]; then
+		ewarn "EXTRA_NSSCONF applied, please disable custom settings before reporting bugs."
+		read -a myextranssconf <<< "${EXTRA_NSSCONF}"
+
+		for (( i=0; i<${#myextranssconf[@]}; i++ )); do
+			export "${myextranssconf[$i]}"
+			echo "exported ${myextranssconf[$i]}"
+		done
+	fi
+
+	# explicitly disable altivec/vsx if not requested
+	# https://bugs.gentoo.org/789114
+	case ${ARCH} in
+		ppc*)
+			use cpu_flags_ppc_altivec || export NSS_DISABLE_ALTIVEC=1
+			use cpu_flags_ppc_vsx || export NSS_DISABLE_CRYPTO_VSX=1
+			;;
+	esac
+
+	use cpu_flags_x86_avx2 || export NSS_DISABLE_AVX2=1
+	use cpu_flags_x86_sse3 || export NSS_DISABLE_SSE3=1
+
+	local d
+
+	# Build the host tools first.
+	LDFLAGS="${BUILD_LDFLAGS}" \
+	XCFLAGS="${BUILD_CFLAGS}" \
+	NSPR_LIB_DIR="${T}/fakedir" \
+	emake -C coreconf \
+		CC="$(tc-getBUILD_CC)" \
+			${buildbits-${mybits}}
+	makeargs+=( NSINSTALL="${PWD}/$(find -type f -name nsinstall)" )
+
+	# Then build the target tools.
+	for d in . lib/dbm ; do
+		CPPFLAGS="${myCPPFLAGS}" \
+		XCFLAGS="${CFLAGS} ${CPPFLAGS}" \
+		NSPR_LIB_DIR="${T}/fakedir" \
+		emake "${makeargs[@]}" -C ${d} OS_TEST="$(nssarch)"
+	done
+}
+
+multilib_src_test() {
+	einfo "Tests can take a *long* time, especially on a multilib system."
+	einfo "30-45+ minutes per lib configuration. Bug #852755"
+
+	# https://www.linuxfromscratch.org/blfs/view/svn/postlfs/nss.html
+	# https://firefox-source-docs.mozilla.org/security/nss/legacy/nss_sources_building_testing/index.html#running_the_nss_test_suite
+	# https://www-archive.mozilla.org/projects/security/pki/nss/testnss_32.html (older)
+	export BUILD_OPT=1
+	export HOST="localhost"
+	export DOMSUF="localdomain"
+	export USE_IP=TRUE
+	export IP_ADDRESS="127.0.0.1"
+
+	NSINSTALL="${PWD}/$(find -type f -name nsinstall)"
+
+	cd "${BUILD_DIR}"/tests || die
+	# Hack to get current objdir (prefixed dir where built binaries are)
+	# Without this, at least multilib tests go wrong when building the amd64 variant
+	# after x86.
+	local objdir=$(find "${BUILD_DIR}"/dist -maxdepth 1 -iname Linux* | rev | cut -d/ -f1 | rev)
+
+	# Can tweak to a subset of tests in future if we need to, but would prefer not
+	OBJDIR="${objdir}" DIST="${BUILD_DIR}/dist" MOZILLA_ROOT="${BUILD_DIR}" ./all.sh || die
+}
+
+# Altering these 3 libraries breaks the CHK verification.
+# All of the following cause it to break:
+# - stripping
+# - prelink
+# - ELF signing
+# http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn6.html
+# Either we have to NOT strip them, or we have to forcibly resign after
+# stripping.
+#local_libdir="$(get_libdir)"
+#export STRIP_MASK="
+#	*/${local_libdir}/libfreebl3.so*
+#	*/${local_libdir}/libnssdbm3.so*
+#	*/${local_libdir}/libsoftokn3.so*"
+
+export NSS_CHK_SIGN_LIBS="freebl3 nssdbm3 softokn3"
+
+generate_chk() {
+	local shlibsign="$1"
+	local libdir="$2"
+	einfo "Resigning core NSS libraries for FIPS validation"
+	shift 2
+	local i
+	for i in ${NSS_CHK_SIGN_LIBS} ; do
+		local libname=lib${i}.so
+		local chkname=lib${i}.chk
+		"${shlibsign}" \
+			-i "${libdir}"/${libname} \
+			-o "${libdir}"/${chkname}.tmp \
+		&& mv -f \
+			"${libdir}"/${chkname}.tmp \
+			"${libdir}"/${chkname} \
+		|| die "Failed to sign ${libname}"
+	done
+}
+
+cleanup_chk() {
+	local libdir="$1"
+	shift 1
+	local i
+	for i in ${NSS_CHK_SIGN_LIBS} ; do
+		local libfname="${libdir}/lib${i}.so"
+		# If the major version has changed, then we have old chk files.
+		[ ! -f "${libfname}" -a -f "${libfname}.chk" ] \
+			&& rm -f "${libfname}.chk"
+	done
+}
+
+multilib_src_install() {
+	pushd dist >/dev/null || die
+
+	dodir /usr/$(get_libdir)
+	cp -L */lib/*$(get_libname) "${ED}"/usr/$(get_libdir) || die "copying shared libs failed"
+	local i
+	for i in crmf freebl nssb nssckfw ; do
+		cp -L */lib/lib${i}.a "${ED}"/usr/$(get_libdir) || die "copying libs failed"
+	done
+
+	# Install nss-config and pkgconfig file
+	dodir /usr/bin
+	cp -L */bin/nss-config "${ED}"/usr/bin || die
+	dodir /usr/$(get_libdir)/pkgconfig
+	cp -L */lib/pkgconfig/nss.pc "${ED}"/usr/$(get_libdir)/pkgconfig || die
+
+	# create an nss-softokn.pc from nss.pc for libfreebl and some private headers
+	# bug 517266
+	sed 	-e 's#Libs:#Libs: -lfreebl#' \
+		-e 's#Cflags:#Cflags: -I${includedir}/private#' \
+		*/lib/pkgconfig/nss.pc >"${ED}"/usr/$(get_libdir)/pkgconfig/nss-softokn.pc \
+		|| die "could not create nss-softokn.pc"
+
+	# all the include files
+	insinto /usr/include/nss
+	doins public/nss/*.{h,api}
+	insinto /usr/include/nss/private
+	doins private/nss/{blapi,alghmac,cmac}.h
+
+	popd >/dev/null || die
+
+	local f nssutils
+	# Always enabled because we need it for chk generation.
+	nssutils=( shlibsign )
+
+	if multilib_is_native_abi ; then
+		if use utils; then
+			# The tests we do not need to install.
+			#nssutils_test="bltest crmftest dbtest dertimetest
+			#fipstest remtest sdrtest"
+			# checkcert utils has been removed in nss-3.22:
+			# https://bugzilla.mozilla.org/show_bug.cgi?id=1187545
+			# https://hg.mozilla.org/projects/nss/rev/df1729d37870
+			# certcgi has been removed in nss-3.36:
+			# https://bugzilla.mozilla.org/show_bug.cgi?id=1426602
+			nssutils+=(
+				addbuiltin
+				atob
+				baddbdir
+				btoa
+				certutil
+				cmsutil
+				conflict
+				crlutil
+				derdump
+				digest
+				makepqg
+				mangle
+				modutil
+				multinit
+				nonspr10
+				ocspclnt
+				oidcalc
+				p7content
+				p7env
+				p7sign
+				p7verify
+				pk11mode
+				pk12util
+				pp
+				rsaperf
+				selfserv
+				signtool
+				signver
+				ssltap
+				strsclnt
+				symkeyutil
+				tstclnt
+				vfychain
+				vfyserv
+			)
+			# install man-pages for utils (bug #516810)
+			doman doc/nroff/*.1
+		fi
+		pushd dist/*/bin >/dev/null || die
+		for f in ${nssutils[@]}; do
+			dobin ${f}
+		done
+		popd >/dev/null || die
+	fi
+}
+
+pkg_postinst() {
+	multilib_pkg_postinst() {
+		# We must re-sign the libraries AFTER they are stripped.
+		local shlibsign="${EROOT}/usr/bin/shlibsign"
+		# See if we can execute it (cross-compiling & such). #436216
+		"${shlibsign}" -h >&/dev/null
+		if [[ $? -gt 1 ]] ; then
+			shlibsign="shlibsign"
+		fi
+		generate_chk "${shlibsign}" "${EROOT}"/usr/$(get_libdir)
+	}
+
+	multilib_foreach_abi multilib_pkg_postinst
+}
+
+pkg_postrm() {
+	multilib_pkg_postrm() {
+		cleanup_chk "${EROOT}"/usr/$(get_libdir)
+	}
+
+	multilib_foreach_abi multilib_pkg_postrm
+}
--- a/dev-libs/wayland-protocols/Manifest
+++ b/dev-libs/wayland-protocols/Manifest
@ -1,6 +1,6 @@
 DIST wayland-protocols-1.31.tar.xz 85524 BLAKE2B c3c21eb44f31fda1901b7aa87b15420f246893184f114d1776ef54224d4d05255b7691349ba546ba782df8fcbd64e39446caa11e2f96125cad9acb1cefad5f3d SHA512 402ce1915300e29afe554d77965ee0a28a5f22fdb5b901c4c640e59b9f3a9c11094e1edae87eea1e76eea557f6faf0c34a0c28ee7f6babb4dc3719329c4e25bf
 DIST wayland-protocols-1.32.tar.xz 90452 BLAKE2B 80e38270526c9da13c39263a60e7d2c330a1a4b1dfecec03fadda747f1a2e3dff95b30373aa19e133ae999fa15bdcdd64aa9ebbb54acf571f980a3f6088ea9be SHA512 90bbd52daf342b98823ddeed04e349ae242d2eaf925ab8d603cceb36c980c83b5681bb890961e0d49584cb5c2e60a33abf8821770c6ab87956383630bd5b7966
 EBUILD wayland-protocols-1.31.ebuild 786 BLAKE2B 23913655ebe3f53ebf368a48d90e2bc63cd7cd46609aa04257132b8d0da7cc9253e40b76fbd2feecfc159b70e6493d6e38d5cdeb3987fb7ca750a4610df174dc SHA512 de6bb6e6c77f5017140dfd7fe4c8ed9ab9dcf0e2006c91e8ea084c0bfe5ff6f0286e2419a23efed4abcb8989d7ea4427bc92c8c259b9fbedac96b14ca6b301af
-EBUILD wayland-protocols-1.32.ebuild 789 BLAKE2B 2e0886a0e5de99d4a968094d6774857cf601f2e5e11335f7e1c7ddf30b8707cdcb1939b8c5c0752241622396384868fdb6b0cf4e1e9c96bd56473aa0da11d002 SHA512 da9c30eaf8ae1ca61922e4d5235a3924639e0670f6eaa0780c5d1d0d67a7d0f4b8b33c45422d11131fda2c3912b0a0113a864985a59b22c826fed8e96b424a99
+EBUILD wayland-protocols-1.32.ebuild 786 BLAKE2B 23913655ebe3f53ebf368a48d90e2bc63cd7cd46609aa04257132b8d0da7cc9253e40b76fbd2feecfc159b70e6493d6e38d5cdeb3987fb7ca750a4610df174dc SHA512 de6bb6e6c77f5017140dfd7fe4c8ed9ab9dcf0e2006c91e8ea084c0bfe5ff6f0286e2419a23efed4abcb8989d7ea4427bc92c8c259b9fbedac96b14ca6b301af
 EBUILD wayland-protocols-9999.ebuild 793 BLAKE2B 3988e887ac66b0b91eab437d03c0ef24ba50d88d96241bd9e8d746c67a71ab49a65f63bf36be45b8f94d49e92d122cf9dbc7eb941b630ddc4afbf4ac8e3081de SHA512 c4c856228ccdb277168dae9d53a24928ce6515a20e7a4a7849b895125393bef4f0c188843fe992d08e70a8d7f27ea5a3a9d6d6150e78a4ea07f22a3f5a68dda3
 MISC metadata.xml 347 BLAKE2B e4265a94e0261094355613ac8617c362f90dc7207188658bf37d7d3d0ea87f598d0a5367d44c95cd3688cd68aeaad6be95ca1707430d06ad8b34bfaed9395f29 SHA512 4db809b42f57946d21f5c0ece2ccba39684da283ddfb72ed2bd6c1ace305c18381904dafa2abce56950cfb2bd1ead0839124c59302b1bb71c0fd8fc8f4a52846
--- a/dev-libs/wayland-protocols/wayland-protocols-1.32.ebuild
+++ b/dev-libs/wayland-protocols/wayland-protocols-1.32.ebuild
@ -13,7 +13,7 @@ if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gitlab.freedesktop.org/wayland/${PN}/-/releases/${PV}/downloads/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi

 LICENSE="MIT"
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
--- a/dev-python/alembic/Manifest
+++ b/dev-python/alembic/Manifest
@ -1,7 +1,9 @@
 DIST alembic-1.11.1.tar.gz 1176522 BLAKE2B 5a4185cb59b48301d350db3c44487408ca6c8d88b47ddd22e4c19fad57d0961cb3968652ba15986cf42adb9bb38542a79b11ddd980c9841a071844d26fed56fd SHA512 d068d581df952c2d304534218bd8f948407e288005514501816e60600b186bf03bcc60f485c4c6d5c80caf718210c2bf619f1758327bc592663f160c3bd21e65
 DIST alembic-1.11.2.tar.gz 1192900 BLAKE2B 47919a02bfabc51caf13b70d7598bd54c63e2f3deea0a6547677433cb4dfab2fea7b199ad5288109c970386a3f318bf29ac2d931d2299dfed63883c3c4dde179 SHA512 7a3c2c723134d7d3048596dc7a98993edf737e09cea0b7df5cf5a05fbc37b9c7eb7fa28e4f1ce2adbb9c4683f838227b760feae148fbc617bc9fdd8e52c667c1
 DIST alembic-1.11.3.tar.gz 1192079 BLAKE2B 40608e1a98aee47128ddebfbb05527cebe8d7799c65da84333bfccb92c0cf314f12646b5be61bd489fe7084197e7918cc992a6edde57baf2afaa741452110135 SHA512 66939932ab0e07595a0d97ae1591c73b90d193e9a392489e2e6059e702c7471c12ac6408e6425413a89dccd5f54ba00f1a50cede0fadbbd808caca864c5101fa
+DIST alembic-1.12.0.tar.gz 1196597 BLAKE2B ff4bc1b94a32ab510b617befb039cb373f266fc891d355a1166a5559d4c053c57a834d9509a05bd5fbcb53a6ac0348038b2314907249ea9139a00c378b293bcb SHA512 170031efe7864835234f55123bff7496337ed1ce666fdaaa8a5040353dc23f98a0e2e6eaf95791f8be052b675015acb7e59b58436a470df9b4ce803c1ac5296b
 EBUILD alembic-1.11.1.ebuild 998 BLAKE2B 69697924982fa2b17d0d5d3c6ae9d0c6003476b0237e4c41baeeff185a12dc073b4bac03c77d4ea73c838a9c28d26351873c00dd4962e45677bb8afda0d993ff SHA512 a9d83e9b1cebc916f06f8fc32820c5bfc315b2de915f5f7e4af21c5ef6180430be357672ec01ee89bf3eaa76e2a37bcc067fd6d19721b8776737eb45dd4ddbde
 EBUILD alembic-1.11.2.ebuild 1000 BLAKE2B 6137d44f26f5620e1af375b3370935f943a547e62c5cbf7e142975db2754498afc968718ab6acdac542bd1569f79ee8ba088e24db05dd655d278bb6588257d0a SHA512 3bd4650599df3ea40b8b15deffef4f7bc5682863f0e716eb40e32f8bbd44638d788b8819bf7cea640f1390e4164f3bc9d32aadbe4c365640ba2ed9222c48103d
 EBUILD alembic-1.11.3.ebuild 1000 BLAKE2B 6137d44f26f5620e1af375b3370935f943a547e62c5cbf7e142975db2754498afc968718ab6acdac542bd1569f79ee8ba088e24db05dd655d278bb6588257d0a SHA512 3bd4650599df3ea40b8b15deffef4f7bc5682863f0e716eb40e32f8bbd44638d788b8819bf7cea640f1390e4164f3bc9d32aadbe4c365640ba2ed9222c48103d
+EBUILD alembic-1.12.0.ebuild 1000 BLAKE2B 6137d44f26f5620e1af375b3370935f943a547e62c5cbf7e142975db2754498afc968718ab6acdac542bd1569f79ee8ba088e24db05dd655d278bb6588257d0a SHA512 3bd4650599df3ea40b8b15deffef4f7bc5682863f0e716eb40e32f8bbd44638d788b8819bf7cea640f1390e4164f3bc9d32aadbe4c365640ba2ed9222c48103d
 MISC metadata.xml 516 BLAKE2B 08b11ebed2913b00e0a8c0044a50e3ca7bc0e51fcad180725c90445227fed1aed58ed89b4bed58ef5c050c3eee3c19da33aabce5cd1f7835f4b560e67ccc7744 SHA512 b4afb6af57562e6065f03db71da0dbdfc9c4337e54cbaddfa257ee7bad48dbeecfaccd765901bf65279e34cf96be3975f983017858904716a36bf8c18f33db79
--- a/dev-python/alembic/alembic-1.12.0.ebuild
+++ b/dev-python/alembic/alembic-1.12.0.ebuild
@ -0,0 +1,41 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{10..12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Database migrations tool, written by the author of SQLAlchemy"
+HOMEPAGE="
+	https://github.com/sqlalchemy/alembic/
+	https://pypi.org/project/alembic/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE="doc"
+
+RDEPEND="
+	>=dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+	dev-python/mako[${PYTHON_USEDEP}]
+	>=dev-python/python-editor-0.3[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/typing-extensions-4[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	# setup.cfg contains -p no:warnings in addopts which triggers
+	# datetime.utcfromtimestamp() deprecation warning as an error in py3.12
+	epytest -o addopts=
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/. )
+	distutils-r1_python_install_all
+}
--- a/dev-python/ansible-compat/Manifest
+++ b/dev-python/ansible-compat/Manifest
@ -1,5 +1,7 @@
 DIST ansible-compat-4.1.5.tar.gz 68562 BLAKE2B b28b6e5185b29a55d452e9c72636b31a1a35c68f207cc07376fafd0a70335966d06f927a803582b715b29c090a80aa5aa2663cba54221cb4d2dbcd9a11ec5a7a SHA512 6da0bab56237a6447462ed9ef528711eb4c998de2732ec021e8257d2baf6cbb1e1435707440b4c0d122fb4f938c855693bcd555e147613f230105e3af74c00a6
 DIST ansible-compat-4.1.7.tar.gz 69900 BLAKE2B c8549573d4a4325579b6026b6b5fad5fe0abb0fdcf07a4c8e0699c040a97409632202f0a38703a113f9a86f68328642d8d5c4b897e3601a13737bc2a4deb4d88 SHA512 b3175573113a3df37923e582c191dd5f4522c3a2171cc93b186e49d5ca6baa2fd8b2e7af2e9457bb21b5bd6df6c9f82fccc10b5e2bfeda84c890c4cbc37fafb4
+DIST ansible-compat-4.1.8.tar.gz 71895 BLAKE2B 19a3cdc953e678a82f6b187ca224c9f10eccf36f57aba2305bf00bc7b3606dfc2caddef7331cd920ae67731b904bc21b1af19fb0945625b050162e0edc8ab652 SHA512 0b9157fd60e1ae9b26c103118fad3e8e28f872c7093d0c6238b047072ac3232e7f9a4c50001125850f4bdd0ba06a1efd8df44a994b1dfaaf7d3f3cb2cb888524
 EBUILD ansible-compat-4.1.5.ebuild 1527 BLAKE2B a0f1e3760eb39c5f93aa65d3f3bf11496cbfdfff9e0a269f156ac3c62bee4a2b655cf23e1fd73e658fd3c488d1c487b76cd53cc666b1eefade2a699b39862cb6 SHA512 ac5f475f95a4c9df1a6d57ef2045254f5ad99e2a3f6dbd9cfc5fcac4f65b0e1519cf6531cc2851aa90074cf10d321596030a0585410323f3a1e6c54367d56b4c
 EBUILD ansible-compat-4.1.7.ebuild 1528 BLAKE2B 6cfa80b2ad48686524e0709e6407d9cb2c4fba7e9ff813f75ebb2a74e37968b6a5078c411b54325950741ea2674e159a264175b92a255db544985985bf27bedc SHA512 bceccbf47fd58b40f00baecb358e55dee173d28ef21f8245c1d281674243c3e8ebca13a655321827d73a0c60e494992aace3f53129263b9d1713f482221e570b
+EBUILD ansible-compat-4.1.8.ebuild 1613 BLAKE2B d3359b099f7f2b6b358b741c257f0f64b66b46428110b6234a4e4525f7193edf9b55d9886ab4374ed9cd0b7dfabd5f35457801bd6b94f85fcbf4bd2135c147d8 SHA512 3bb568c1335db812c4ef09cdf191712e33309d9baf940dc89cf74bdcdcf402f9f7dc72fcb1ae2276852f2a96d0af8c905fe9c45f28c5707edcb565a6377768db
 MISC metadata.xml 510 BLAKE2B 3f47270866cb9acc5944b71547640b69003891268ffc07b5cd10e6ba8842b6f644ab4dea3b3da2d20b17f34d90e565b6f03a4dbb8ea38fa282fed283ac22fac1 SHA512 65d8604e46581bf9ecb3d8e358f3a211b18c51beea22c92a1cd3668ba86140e3bd8d91a38c221e73fe13a3e0da1cbfc2030b3f7733ee55e045530b49cd77d46d
--- a/dev-python/ansible-compat/ansible-compat-4.1.8.ebuild
+++ b/dev-python/ansible-compat/ansible-compat-4.1.8.ebuild
@ -0,0 +1,54 @@
+# Copyright 1999-2023 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..11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Contains functions that facilitate working with various versions of Ansible"
+HOMEPAGE="
+	https://pypi.org/project/ansible-compat/
+	https://github.com/ansible/ansible-compat/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
+
+RDEPEND="
+	>=app-admin/ansible-core-2.12[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-4.6.0[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	>=dev-python/subprocess-tee-0.4.1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/setuptools-scm-7.0.5[${PYTHON_USEDEP}]
+	test? (
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytest-plus[${PYTHON_USEDEP}]
+	)
+"
+
+# All these tests attempt to connect to galaxy.ansible.com
+EPYTEST_DESELECT=(
+	test/test_runtime.py::test_install_collection
+	test/test_runtime.py::test_install_collection_dest
+	test/test_runtime.py::test_prepare_environment_with_collections
+	test/test_runtime.py::test_prerun_reqs_v1
+	test/test_runtime.py::test_prerun_reqs_v2
+	test/test_runtime.py::test_require_collection_no_cache_dir
+	test/test_runtime.py::test_require_collection_wrong_version
+	test/test_runtime.py::test_require_collection
+	test/test_runtime.py::test_upgrade_collection
+	test/test_runtime_example.py::test_runtime
+	# pip, failing due to internets
+	test/test_runtime_scan_path.py::test_scan_sys_path
+)
+
+distutils_enable_tests pytest
--- a/dev-python/anyio/Manifest
+++ b/dev-python/anyio/Manifest
@ -1,3 +1,5 @@
 DIST anyio-3.7.1.tar.gz 142927 BLAKE2B 80a093943fbd23069e9511a83b3eb1e27f2863b11e184709f92cab2dfebc05ea3c291d22be4b1e79d00ae52e10009d5fb2c664730009b40e2b666587538d0ca5 SHA512 067bbffa9e0d6ce339a4999a677c857e839aa3bf5a056d841fec8cbd3be17023c9158df907ff66b9a5437a78158bc9bbb3b9ebe30c57ef98660642bc057d7d10
+DIST anyio-4.0.0.tar.gz 153297 BLAKE2B 680c3472525a777dc2af63241ef1b6f90bcc2224d944fc04aef519d0d97bb5845c7b3faddb116b20cfb1a61303bcf91290b1f2544a3cfcb08f3488a70b275c8a SHA512 b0ec5aa912c973206d8677a6aba25957cd669dfe890ee7d39af064f1620f9a5103a39bd6d35f4ea680b86d13964daf1e982ac6873bf5903eeaaa6e74ea974948
 EBUILD anyio-3.7.1.ebuild 2031 BLAKE2B 92d72a3c4833070582501bd18646c41c8d1a8551adae6dda13ea3fd7de20d199a3e3bcf5d8326d6c998c7ad9bf1d38291b05ad970c2c74b0698b66d9ca9c3c8b SHA512 233f500a7a0e2b2b7c371ee7a2ecbaa3ee5e52d1c557c5d9d94e6098590175a305a45960036a9106a2b56c8ec1cb84ba500221d473224ee30519f47119d7fc94
+EBUILD anyio-4.0.0.ebuild 1638 BLAKE2B 1d0aadb783179511b7e72175d50a5b785c874967558de6b0a5f35ef0127b215a0fac2cbe44c60e0b8decbaddd4ddc5a877a6c848feea7ba6be4097a3ca63d152 SHA512 dd0ffc4625dcde7634af793ab330b1af45f7ff1c083d53a5cbe86008a0f4371b971584f6dccb5dd39dac7e49c79d36ba30e8f150fb76d8297b97f3c38e260293
 MISC metadata.xml 1422 BLAKE2B 63acae587e7088e33ee5eb93a2a222899e54a5eb511118794f88e7c5a012d10983eb925427688a0b509b094e30a9cc9acc5f0c1765ea73e569161e0c30722000 SHA512 e0b540d5d739b7673a5a8682477f209f8b3648aad06a1c0610543a2e9dcbeca1cb1e52212d8088a5987a1c3bc3152cc5984ad5b5d0706fcdb5866b22de07b1eb
--- a/dev-python/anyio/anyio-4.0.0.ebuild
+++ b/dev-python/anyio/anyio-4.0.0.ebuild
@ -0,0 +1,60 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{10..12} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Compatibility layer for multiple asynchronous event loop implementations"
+HOMEPAGE="
+	https://github.com/agronholm/anyio/
+	https://pypi.org/project/anyio/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		>=dev-python/exceptiongroup-1.0.2[${PYTHON_USEDEP}]
+	' 3.10)
+	>=dev-python/idna-2.8[${PYTHON_USEDEP}]
+	>=dev-python/sniffio-1.1[${PYTHON_USEDEP}]
+"
+# On amd64, let's get more test coverage by dragging in uvloop, but let's
+# not bother on other arches where uvloop may not be supported.
+BDEPEND="
+	>=dev-python/setuptools-scm-6.4[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/hypothesis-4.0[${PYTHON_USEDEP}]
+		>=dev-python/psutil-5.9[${PYTHON_USEDEP}]
+		>=dev-python/pytest-mock-3.6.1[${PYTHON_USEDEP}]
+		>=dev-python/trio-0.22[${PYTHON_USEDEP}]
+		dev-python/trustme[${PYTHON_USEDEP}]
+		amd64? (
+			$(python_gen_cond_dep '
+				>=dev-python/uvloop-0.17[${PYTHON_USEDEP}]
+			' python3_{10..11})
+		)
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+	'>=dev-python/sphinx-rtd-theme-1.2.2' \
+	dev-python/sphinxcontrib-jquery \
+	dev-python/sphinx-autodoc-typehints
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# requires link-local IPv6 interface
+		tests/test_sockets.py::TestTCPListener::test_bind_link_local
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -m 'not network'
+}
--- a/dev-python/apsw/Manifest
+++ b/dev-python/apsw/Manifest
@ -1,5 +1,7 @@
 DIST apsw-3.42.0.0.gh.tar.gz 863081 BLAKE2B 5eee11867e41c396be7cc9bbde1c4bb82a1e294ddd05613d6fbd50ac95c2d5e374632fde3215a838779253ad0f2eb97a4550771767a9f9f7a53c062c7eee5f7e SHA512 e0afa56d1a1d4e8627fe721c36098182efad23128cb053c7c25fc6412d6fe63a50beb66e0bc8dce527c17ff7bd9adb9e71a35fbc4ee769b5231d4dd941b21572
 DIST apsw-3.42.0.1.gh.tar.gz 881270 BLAKE2B a983aebe53f6baf419fb0fec6d87797d11c1e1f0fadd546139c9b9c3cec6f8848e79af46a928597e6cf33937bb2b2e2157cf908cf18152c7f956864e3d09fe2c SHA512 78a02c8e987df90838923b2a2d4838a184e7e8d9be70a09a4a27eb43e9f06546f831895ab519b681f628e5432b3e5b71d56ecc2f3e45a89765dc13667ca6e844
+DIST apsw-3.43.0.0.gh.tar.gz 887997 BLAKE2B ce74eaed990cdf4742ce39743abf0dc112ee3f588bfa0ccca102829d4e29fd38194ac42a85dee25e18f666bdbb2137c99440583996513ea27977374de945ffd7 SHA512 013ef8a45b556498192673c77d8de50136680d061087a80d7ce880137f1ca469812e9237b7336fbb8aacd8d3a775e819a42dc5e70e2d907cf6fea56b80534755
 EBUILD apsw-3.42.0.0.ebuild 937 BLAKE2B eb06b97299c588bcd508f66c2b28cf041018e02475c8c1f98ef57162200c73581a5a6c2b597939a1a58cbb6f414d50d39ae6c23f635bcfff59bdb656f8987ee0 SHA512 aa74f1cbbce56f667a266fcdcb1177deb973592b1bf50d19a752497b760e378c9cf14c62da5189f52618584e09612a70b50395ba832d285deb866950313742ab
 EBUILD apsw-3.42.0.1.ebuild 939 BLAKE2B ee016cfe238d13b36e179fe3e9d989010d0100884b9b8c1edb88be9408f43d2a6e20631461aa7e6aa53f356f260f5f6ae2877c8ef0c329206866c17d8c785200 SHA512 eee244a037366858c9b6ff3b5a25b2fe1e3518d02f6c45bab843f43923ee44ad0e84ac6dcf89d0fa56886d0b5fbffe9228b375591bfffa64be3dd85f68455dab
+EBUILD apsw-3.43.0.0.ebuild 939 BLAKE2B ee016cfe238d13b36e179fe3e9d989010d0100884b9b8c1edb88be9408f43d2a6e20631461aa7e6aa53f356f260f5f6ae2877c8ef0c329206866c17d8c785200 SHA512 eee244a037366858c9b6ff3b5a25b2fe1e3518d02f6c45bab843f43923ee44ad0e84ac6dcf89d0fa56886d0b5fbffe9228b375591bfffa64be3dd85f68455dab
 MISC metadata.xml 700 BLAKE2B 258344a1602daf3e081fdb4c94eda8af6e231def3f02fb80d63691b47d0a503c9caad80893386ce7ef42d6be2985906f3fc5cfedfe5a1044aee04c493f3d0683 SHA512 de73b4eb06d0bcf4c81e544a98ad15231b006d62fe22f6bce7e38740b941b98297fa1a38b00060ff83ae9f3259c5020c7071469f2a3f0d9e4f8f0301cb942081
--- a/dev-python/apsw/apsw-3.43.0.0.ebuild
+++ b/dev-python/apsw/apsw-3.43.0.0.ebuild
@ -0,0 +1,51 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1
+
+DESCRIPTION="APSW - Another Python SQLite Wrapper"
+HOMEPAGE="
+	https://github.com/rogerbinns/apsw/
+	https://pypi.org/project/apsw/
+"
+SRC_URI="
+	https://github.com/rogerbinns/apsw/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+IUSE="doc"
+
+DEPEND="
+	>=dev-db/sqlite-${PV%.*}:3
+"
+RDEPEND="
+	${DEPEND}
+"
+
+src_configure() {
+	cat >> setup.cfg <<-EOF || die
+		[build_ext]
+		enable=load_extension
+		use_system_sqlite_config=True
+	EOF
+}
+
+python_test() {
+	esetup.py build_test_extension
+	cd "${T}" || die
+	"${EPYTHON}" -m apsw.tests -v || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/. )
+	distutils-r1_python_install_all
+}
--- a/dev-python/aws-sam-translator/Manifest
+++ b/dev-python/aws-sam-translator/Manifest
@ -1,5 +1,7 @@
 DIST serverless-application-model-1.72.0.gh.tar.gz 5074171 BLAKE2B b69fd51e59a223b7003b82f4a27c1724a6be0c16958664ce567b4c5ce57084aca2259c0d92f4f019f0b44fa6a7c8fe06622109c5447b7905029652c548fd20d4 SHA512 e267fc255923c2ab469f1d95723927392453e84ac95d04bddc202e895824410a80eff40bb6900aa2cdfbe6f5ab06d89a24003848e19f9f16423c98a1df951d64
 DIST serverless-application-model-1.73.0.gh.tar.gz 5079379 BLAKE2B e7220e4d0e25a725d3dc0828297bcab9c174e067f927b6aab7f6bdd0c9c8de8333464d7783f0ae9965b00a1323ace8f63a51aed92e459f578a2d2e15a34bed52 SHA512 1487b3815f62dc4a5081316b09d469359126fa76d4b4f3ee397b581e5491cea20ebafeeb96d261652eb552e501666de3d90f6bd5a52517474e170420abaeea92
+DIST serverless-application-model-1.74.0.gh.tar.gz 5082475 BLAKE2B 4eea6df8caefd8face0115300739d74dee96f5b303cd2f86e7ffd58535c36567c830c9a0b55f59c712b166376b66ae23d7cc5e9c79445a1a9e4f3e23f0c4b94d SHA512 f34af17d0d2ec540c9ef65c1419812e0ec24da331b527e843f3da88149721a4dbec7130f1ac452c19b8462461ed09e3e6b607a80756aaa5f01fc3abc04740938
 EBUILD aws-sam-translator-1.72.0.ebuild 1544 BLAKE2B 9572110682a5bfaeee90d69c6026a0130cacda3efb2d2da2952d675f5764745fb8fa7e7b1e586b2b029f5d8b955d9934228210734b060af23abdde9b2e18c487 SHA512 48956aabc1cd71db9d3cddb180c37387c8e5e4e314411a41f3ad791bbe6b2435208c9e045dead45d6e10944271b7f9954e2d1ae9290a3078d1e35391c0f52512
-EBUILD aws-sam-translator-1.73.0.ebuild 1546 BLAKE2B ad6e5889df4bcddb45b7c19b46a2d29b4e58be32c5e2e7642713309a6962b870af65dad07437b2b5167481b4cbde6638c235a1928b930a8a50c1943e33364ccb SHA512 5b80e19e8592c98a0121af922addf5c0904d21164d1411459a5a96cf2ce54c3b728f6a7eaeb3a3629f24eac9f805d34548f9aeddb8d552d8a185599b23f0e124
+EBUILD aws-sam-translator-1.73.0.ebuild 1544 BLAKE2B 9572110682a5bfaeee90d69c6026a0130cacda3efb2d2da2952d675f5764745fb8fa7e7b1e586b2b029f5d8b955d9934228210734b060af23abdde9b2e18c487 SHA512 48956aabc1cd71db9d3cddb180c37387c8e5e4e314411a41f3ad791bbe6b2435208c9e045dead45d6e10944271b7f9954e2d1ae9290a3078d1e35391c0f52512
+EBUILD aws-sam-translator-1.74.0.ebuild 1546 BLAKE2B ad6e5889df4bcddb45b7c19b46a2d29b4e58be32c5e2e7642713309a6962b870af65dad07437b2b5167481b4cbde6638c235a1928b930a8a50c1943e33364ccb SHA512 5b80e19e8592c98a0121af922addf5c0904d21164d1411459a5a96cf2ce54c3b728f6a7eaeb3a3629f24eac9f805d34548f9aeddb8d552d8a185599b23f0e124
 MISC metadata.xml 603 BLAKE2B 89556267393186cf69a585c58efeb6fa599bfb42ef221bea955ea807a28edee89036a2ee0d0ca81ae55d96702a01b171b837754dabf38047ecc2789157bb7116 SHA512 106b6d241eadf7807dadf03329073703f8b51e7443eddc4db8752878b6dd84cc4357689cd4b796b3a083192e9d98eacbe9e7b8af0273160c7b89846e78230a88
--- a/dev-python/aws-sam-translator/aws-sam-translator-1.73.0.ebuild
+++ b/dev-python/aws-sam-translator/aws-sam-translator-1.73.0.ebuild
@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}

 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"

 RDEPEND="
 	<dev-python/boto3-2[${PYTHON_USEDEP}]
--- a/dev-python/aws-sam-translator/aws-sam-translator-1.74.0.ebuild
+++ b/dev-python/aws-sam-translator/aws-sam-translator-1.74.0.ebuild
@ -0,0 +1,60 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1
+
+MY_P=serverless-application-model-${PV}
+DESCRIPTION="A library that transform SAM templates into AWS CloudFormation templates"
+HOMEPAGE="
+	https://github.com/aws/serverless-application-model/
+	https://pypi.org/project/aws-sam-translator/
+"
+SRC_URI="
+	https://github.com/aws/serverless-application-model/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	<dev-python/boto3-2[${PYTHON_USEDEP}]
+	>=dev-python/boto3-1.19.5[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.2[${PYTHON_USEDEP}]
+	<dev-python/pydantic-2[${PYTHON_USEDEP}]
+	>=dev-python/pydantic-1.8[${PYTHON_USEDEP}]
+	<dev-python/typing-extensions-5[${PYTHON_USEDEP}]
+	>=dev-python/typing-extensions-4.4[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# so much noise...
+	sed -i -e '/log_cli/d' pytest.ini || die
+
+	# deps are installed by ebuild, don't try to reinstall them via pip
+	truncate --size=0 requirements/*.txt || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x AWS_DEFAULT_REGION=us-east-1
+	epytest -o addopts=
+}
--- a/dev-python/backrefs/Manifest
+++ b/dev-python/backrefs/Manifest
@ -1,3 +1,5 @@
+DIST backrefs-5.5.1.gh.tar.gz 5401854 BLAKE2B 5aab7fa4d2b74ca250e93aa6085dfa7302525c2b0201a807c687807264dddae7a02c7e6c51fe9353cb43cb46f0ea38ac36ec3a5958b45e96e7c00088d33f8c6f SHA512 09381b300afff26f8139eb36433b22fea0c909b6c68615b17821fb373afa168e1432eb93728a0189d89b04268c3e57fe237f7b52b1fa1f3aa7f92eadf411b98a
 DIST backrefs-5.5.gh.tar.gz 5401839 BLAKE2B e8674de4b1f9a068bf7439e56fd14de8afed0635b0f6fe3c99c64b678890939186c7aa2d660bee73d51e01cc982186bddeaf2e4bea5754c1a234992d518f8004 SHA512 00074d30a96da6bd0aedcd3cec02f533a264514832d91ff466a50937fae28566fe95db7fbedc7ffd185300b9529adf7f89bd4366e09f2bd864fa4f0f13963475
+EBUILD backrefs-5.5.1.ebuild 664 BLAKE2B 2dca4a6dced9713939bc255f420ceb969c8112cc8afff01e6594d8d08a9a1930040fda6de79125f366d68f47dc1a17ed29c04f5ee9203aa121de6b74b575b02a SHA512 a4831c326414044229584cbf939cfea161e8d2746b5ddf13329ed78d602f9ef00e9d93a8d135df94d852d54e6665e79f289726c5e09764ef62f5b67417b01a98
 EBUILD backrefs-5.5.ebuild 662 BLAKE2B b6a86db7aa186dc33acf6971f0a25162b22eea0e8412e905fdcca3ef194991ada4c21852be6662d1a41b81b6f68de1e4fa909489976e83771d2a295637316a37 SHA512 836b581becf5683d8bebfdccf3ed4c9b4de2ec8eea467a0b3e6c2d2d9c0f63ed2ea303ac4fe15ffb91ffe30cd966dcea6b4e70d2be6efc7eb5e3dbe9f8ddcc89
 MISC metadata.xml 1110 BLAKE2B 03f6ad86a49f8a87915cf78b5d345e8ddd7dff8312ade18f18610e0970b3995de61feffad710b02826ee7e4ea57b91c90d31fb97db8aa9c46a653d9e7385bf35 SHA512 d2fdf037ba920c922c5fbaf02c5060c1e0dfd6daf410a602c0d6870a0926c1aa87e139f00517df53b643365e8f681d6104b770d704799ad1b193e3d935b86ade
--- a/dev-python/backrefs/backrefs-5.5.1.ebuild
+++ b/dev-python/backrefs/backrefs-5.5.1.ebuild
@ -0,0 +1,33 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit distutils-r1
+
+DESCRIPTION="Wrapper around re or regex that adds additional back references"
+HOMEPAGE="
+	https://github.com/facelessuser/backrefs/
+	https://pypi.org/project/backrefs/
+"
+SRC_URI="
+	https://github.com/facelessuser/backrefs/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/regex[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)
+"
+
+distutils_enable_tests pytest
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@ -1,34 +1,10 @@
-DIST boto3-1.28.15.gh.tar.gz 681894 BLAKE2B b2fbe18f000d76e2c5be2ec0038756768608364a983c7e10acf197afc5fd610c3bcbab77aa23caae2ca52f92062823b4f0cc32383161cfcd7934060c8a091634 SHA512 a55db28e91bdf4b8b84e52b4329640b68e88661b0c659e6b77ffb677c4fd3b0c948136b90e73aa34fc5f424f01735a0d4d3a09a057a15f68fa6c84e6e6eb5001
-DIST boto3-1.28.20.gh.tar.gz 684832 BLAKE2B dc8dee3e001e26fa5e9f1355ef40cb03a860fdba2585abb230213f04d443f047aeed3c8fc866c34e546d9dd74e373311172aa5a9ad235dd3f99d3c6d81dac8c2 SHA512 7409ebf4fe84b549ec701cff8f5c8373f360d1855e3834f2ff1c1882ee6c34ad5b5bed0ac8f133ae3412026c4f69ed626858c019e6338e03e4ebcbc2cbb761f1
-DIST boto3-1.28.25.gh.tar.gz 687791 BLAKE2B 641dacd5076e51e64991c0bb97fda6f5b8d705b253ab902a5598daf23eca65ad586348f38e6dce0dfd90526a49ff56320dc99972d375e61d5fab3692f5948674 SHA512 2e47027c035338a9d70027b32c93db04ac859a8cfe6c9f962df33c1139df5ba1562e9e0bb32670825a93c29fa2b231779221c6b54c5b2bb498c5e19667763306
-DIST boto3-1.28.26.gh.tar.gz 687954 BLAKE2B 04e87223eac560264ef55c80d5d258b028b9fb99a52a9ee03feda818909aafb43dfe16e887593e3dfb51525c78c8cd92a1e6e97b96136795b51a69839bb84580 SHA512 1cf5c2cc795a7712abff17aa075d30054973bf2cb583bdf4ad5e3057309cc76dd6a50b2ad806cb720c7528b4e3087f6b84b5b7a8d3d365df14e582e626168768
-DIST boto3-1.28.27.gh.tar.gz 689084 BLAKE2B 5e6c824aedd92f429a5e932a8839d2f855624d4e821a3b9e8e434d6d47c9dfbc44fd5f93df451fe19be089513dad56f5291186f734b696914ce867f5e4a436e2 SHA512 6233f4da3fcb84b24bdc5c3aa3914de0cdd31212b1927eafb82972a4c751556699cd653be014d7d838836a92a5a35368d6874e19f6fb04a730606868a656c53e
-DIST boto3-1.28.28.gh.tar.gz 689176 BLAKE2B 21a951604fb2c5f6435d6c27dfbab5a4d16071fc9a4260374529902dd3715bd9ae8b724e75ad1c550696b8f781b54fc31f8ede6e489f950c263be44fbb387dcf SHA512 3b6a736de618ef094203c04b8c5408b20d3ca006514266423c20d3716269bad70532a90fec66a2a8bc168830ceb128b4dd314d23132656ab8c45d19bdaca345f
-DIST boto3-1.28.29.gh.tar.gz 689353 BLAKE2B 6d8816cd1857b2c9b968730488ccc6822a721e65275a247284a85702f16462a7075e72a53d575ab5ecf450666a80b7d750503a315c5205b09a5850ff37cae684 SHA512 624060c702af72ab083f2bbbf9d406485db2df953f3fde1f9c32bfeff4c9bd4ef1498052c8cb7356ab1aec51132cb77f4af34da15af0aa92da67724646643cd8
 DIST boto3-1.28.30.gh.tar.gz 689629 BLAKE2B 03081369f995ae470717c32ffd0e80c1bac6677467cd4af57b4a7e19d5c0249c825a2db787d5e6d7319b1af808936043e07b1d5ff13eb413125478710a18a416 SHA512 ace77ea7898cd7baa47c256affe553bbec2410f0143caf3b06311d66c306dfe2d4ce8b47820d6c8ceb3f4a7a195d94610b46db2bb0ed2e3716dcee99b8841468
-DIST boto3-1.28.31.gh.tar.gz 690064 BLAKE2B 409dcdb3c4a0ee2bb32d8a68ba2779d347b0686076c9bc922320b370def9faa6cde964279d8fb2d885f547299e1358c05db80688fdf953ddf70030eb282ebed9 SHA512 6a1de5568c5663a9f37ae991ae072fbfa7fcafbfa5786bfcd4335c6dcdb1eadee8050ead64251cc687b8f954b6d3a79fd3bef0b1fedd4cd4fcb2d63f405a0323
-DIST boto3-1.28.32.gh.tar.gz 690385 BLAKE2B 2d5ff74dc8f27d43329796910c6810257f997780afae1fdaaa9934853735244512464dbe7eb882376720e4c76bb2ec2fd9e56673f7677dc9a88d6a838fe2d2a9 SHA512 e7faa2e40b8fbb5e69070277fa9ee50000ab94f2540f9ca6e781c61e99d674e3039bc7b16dd3e196dc2876dc8149b6513a0d8c8c888c96aeef13abb3e7617f1e
-DIST boto3-1.28.33.gh.tar.gz 690686 BLAKE2B 572f5aa0b9a71e39a62fccdce84fa359e0b96d196d983965d335de2299e734239586bfde43c5f48463afddace7d7a91139cabc2737a5b4f3b40684c13112f267 SHA512 2bb4375f5c3d85283a10ff9325b8688ab1e2aceb7be8cd255bc2d054c75eda54df320a85eb4910e0119633e8977158f216df2fdb373c9bb5df8eb7cb4389a4fd
-DIST boto3-1.28.34.gh.tar.gz 692262 BLAKE2B e6382326f74f05c045a3ecacedbef2917dc297343637a70d4947b20b37a33e303bbf751b1f55d7deae581788a0ac2a627b3fdd58629b3ad961030e6095c1eb90 SHA512 340352632d1058d7ed50ce011d2697ed01680d6ee0443fe6fa08813924deffc642d6ec0b076bf9669a98e926fb5467a546ff3c4febe43eec602ab1f2cd51e8d3
 DIST boto3-1.28.35.gh.tar.gz 692481 BLAKE2B fe5c5906598be2aaef8524a0333751bc2368aa33a3c212d45d95b1010f15d228b4b617ad7e855d668f38b9278c32bafc7c5da4395582a053ae3350d4c5453c7b SHA512 790fcb6a0aac9ae37d3d04c707b05d44249b7e265e47ad8fd9195ec338f70297b018f4d3ef34cd704fc3d82564794ea7fb4e5e9057cbae4a969d220eb911981f
-DIST boto3-1.28.36.gh.tar.gz 693285 BLAKE2B 9d25f49ecb213c8f273fff908a125373d6558244dbf03cf716bf871a565ec0a71aa7330af0f64111f4a6191654cacb1c2c60566fb9fd2540aa8df3e4c442e0b9 SHA512 b2ee0a647d9863d251dc613550d10a83f60b0513407d7507b4ef4c9db0aa13e6feb9a24c4f93200553b61d756fb3cef417f43203cb71f3839ed66aae6183af91
-DIST boto3-1.28.37.gh.tar.gz 693670 BLAKE2B 1ab40cf17ba9694fdb1a95c08b8821a8842fb4c9da13d1457722a5fc0ea09f2acbe0301edc419207481c5560f2881557bd434f0e4921c9e9752bdf41ad541ff9 SHA512 705c100c3b38dd45edc30fc532a83f9f9065d7f7a41a0fa4a3b54cf16a04c369bc609eda0e353c59599fcfc9fe6588ed45112f026100305f0adb1f92d9bdcd21
 DIST boto3-1.28.38.gh.tar.gz 694902 BLAKE2B 2f33b0e1015c3fa15d16c990f709a782ddc0c9903fca8fd6d489e45fd7e2c3a939082f22f8c8c090a1ec6acdf96a6a71e5689bd3317c8f984e83bb36534df814 SHA512 a734d1a5a7532d09dcec1f36d9fcc9e1e03d388cfb5a86a97318c88bdeb2fb3fec6d1770e0e6b9ac7e801ec862d5e42ae48a315f4b01b398712be1f64c651273
-EBUILD boto3-1.28.15.ebuild 1508 BLAKE2B 42be8b915da646a7afe6dfc988542d3d79b5dbdc565d2e738d210e3f77b7c5ba6dfbac45e46b9cc3cc4770611cbc0c155abc7f1807ff0cb8e6033f927bea4048 SHA512 06404c0363c0c7c0d378d1c2b91073c137a1685d2d846d98c655e6d001df5cde0eb51bf6e160879af2b56321a02e84146ce634855f70c7c3fbbd1adbb9b8ef8e
-EBUILD boto3-1.28.20.ebuild 1515 BLAKE2B 611fec92e11c2c75d95e39043931611ad3396698f6868ff4b60391eb8353e71a824613ab8a1dc96c9640cc2f933ba761c47628acf7be917abe0039628b38a071 SHA512 475e2648fea04db00eb4fd70e48a7599c758cf8e225caa6250b222293bd9aa662d962c6d6db730040680256e61131301571675f3e1470735217f950abf2c3497
-EBUILD boto3-1.28.25.ebuild 1515 BLAKE2B 611fec92e11c2c75d95e39043931611ad3396698f6868ff4b60391eb8353e71a824613ab8a1dc96c9640cc2f933ba761c47628acf7be917abe0039628b38a071 SHA512 475e2648fea04db00eb4fd70e48a7599c758cf8e225caa6250b222293bd9aa662d962c6d6db730040680256e61131301571675f3e1470735217f950abf2c3497
-EBUILD boto3-1.28.26.ebuild 1515 BLAKE2B 611fec92e11c2c75d95e39043931611ad3396698f6868ff4b60391eb8353e71a824613ab8a1dc96c9640cc2f933ba761c47628acf7be917abe0039628b38a071 SHA512 475e2648fea04db00eb4fd70e48a7599c758cf8e225caa6250b222293bd9aa662d962c6d6db730040680256e61131301571675f3e1470735217f950abf2c3497
-EBUILD boto3-1.28.27.ebuild 1515 BLAKE2B d408009dbb888b12a75b69f45cea71908534a86adb79e2d77b83b5b80a0b1270d9e1a3d604a82bf09d89653a6f431609efd0307b9b97824cf5207ee2d89f3b8b SHA512 febd31bdc88e4fa694e8c4406923dcd5ee3791e6f350d9fdf8059786d7e1d6cf6efda5b5c3dc7c0a082bafa65dd5ff0ae297a60b449099550f9e5da7f2b88f54
-EBUILD boto3-1.28.28.ebuild 1515 BLAKE2B d408009dbb888b12a75b69f45cea71908534a86adb79e2d77b83b5b80a0b1270d9e1a3d604a82bf09d89653a6f431609efd0307b9b97824cf5207ee2d89f3b8b SHA512 febd31bdc88e4fa694e8c4406923dcd5ee3791e6f350d9fdf8059786d7e1d6cf6efda5b5c3dc7c0a082bafa65dd5ff0ae297a60b449099550f9e5da7f2b88f54
-EBUILD boto3-1.28.29.ebuild 1515 BLAKE2B d408009dbb888b12a75b69f45cea71908534a86adb79e2d77b83b5b80a0b1270d9e1a3d604a82bf09d89653a6f431609efd0307b9b97824cf5207ee2d89f3b8b SHA512 febd31bdc88e4fa694e8c4406923dcd5ee3791e6f350d9fdf8059786d7e1d6cf6efda5b5c3dc7c0a082bafa65dd5ff0ae297a60b449099550f9e5da7f2b88f54
+DIST boto3-1.28.39.gh.tar.gz 696213 BLAKE2B 2a71b9ca5416d6eb1fbd2b21c67c2eca95409acced1c67b8345355d61eece063f589c2cb81ee4c81fd2dda54e66268d8269a8bb2f251a6d95c51a18366b5d861 SHA512 cd62663568aabc87de3d0c669b7cf131072aa596d9a341a19a357d8a289458ebb1e18b6618ab454753d0d385b53d450aaf836b5fb1bf04d30b40b6b314308908
 EBUILD boto3-1.28.30.ebuild 1508 BLAKE2B d38a9300c2cfd40239efbe4b7bad251a3fa5e723b438fbfafbaea76fbfb252832aba45f875aa0afb984a9ae2f4e8a4e64499d9ddff4ea1e3d1ddb0ea3fac5f65 SHA512 9c1ce9d3f807344d2040fa6200070589fbbc6f0ac0eea1146255c18412faa70a90632836ad2f0450c902ef57bd274ed537ec1633438c91b27fc76af981c7b895
-EBUILD boto3-1.28.31.ebuild 1515 BLAKE2B d408009dbb888b12a75b69f45cea71908534a86adb79e2d77b83b5b80a0b1270d9e1a3d604a82bf09d89653a6f431609efd0307b9b97824cf5207ee2d89f3b8b SHA512 febd31bdc88e4fa694e8c4406923dcd5ee3791e6f350d9fdf8059786d7e1d6cf6efda5b5c3dc7c0a082bafa65dd5ff0ae297a60b449099550f9e5da7f2b88f54
-EBUILD boto3-1.28.32.ebuild 1532 BLAKE2B d9c16eb4938ac7488765eca7dc3d5d55402c5aeed4b4e380c9d0433a4e18a94cd11938b43fbe3584b95bc36fec90557a1cfb6017a41fa70807bc06b941e3eca6 SHA512 2d6bd178dd4b7b9b30ed092f69ffdf01e4450eae8e5ee86bd5dcced4370f6f49a440067ae598e126d7ca0f50f9c1212e734ccbd5073fb4fcdef8850327b57763
-EBUILD boto3-1.28.33.ebuild 1532 BLAKE2B d9c16eb4938ac7488765eca7dc3d5d55402c5aeed4b4e380c9d0433a4e18a94cd11938b43fbe3584b95bc36fec90557a1cfb6017a41fa70807bc06b941e3eca6 SHA512 2d6bd178dd4b7b9b30ed092f69ffdf01e4450eae8e5ee86bd5dcced4370f6f49a440067ae598e126d7ca0f50f9c1212e734ccbd5073fb4fcdef8850327b57763
-EBUILD boto3-1.28.34.ebuild 1532 BLAKE2B d9c16eb4938ac7488765eca7dc3d5d55402c5aeed4b4e380c9d0433a4e18a94cd11938b43fbe3584b95bc36fec90557a1cfb6017a41fa70807bc06b941e3eca6 SHA512 2d6bd178dd4b7b9b30ed092f69ffdf01e4450eae8e5ee86bd5dcced4370f6f49a440067ae598e126d7ca0f50f9c1212e734ccbd5073fb4fcdef8850327b57763
 EBUILD boto3-1.28.35.ebuild 1532 BLAKE2B d9c16eb4938ac7488765eca7dc3d5d55402c5aeed4b4e380c9d0433a4e18a94cd11938b43fbe3584b95bc36fec90557a1cfb6017a41fa70807bc06b941e3eca6 SHA512 2d6bd178dd4b7b9b30ed092f69ffdf01e4450eae8e5ee86bd5dcced4370f6f49a440067ae598e126d7ca0f50f9c1212e734ccbd5073fb4fcdef8850327b57763
-EBUILD boto3-1.28.36.ebuild 1532 BLAKE2B d9c16eb4938ac7488765eca7dc3d5d55402c5aeed4b4e380c9d0433a4e18a94cd11938b43fbe3584b95bc36fec90557a1cfb6017a41fa70807bc06b941e3eca6 SHA512 2d6bd178dd4b7b9b30ed092f69ffdf01e4450eae8e5ee86bd5dcced4370f6f49a440067ae598e126d7ca0f50f9c1212e734ccbd5073fb4fcdef8850327b57763
-EBUILD boto3-1.28.37.ebuild 1532 BLAKE2B d9c16eb4938ac7488765eca7dc3d5d55402c5aeed4b4e380c9d0433a4e18a94cd11938b43fbe3584b95bc36fec90557a1cfb6017a41fa70807bc06b941e3eca6 SHA512 2d6bd178dd4b7b9b30ed092f69ffdf01e4450eae8e5ee86bd5dcced4370f6f49a440067ae598e126d7ca0f50f9c1212e734ccbd5073fb4fcdef8850327b57763
 EBUILD boto3-1.28.38.ebuild 1532 BLAKE2B d9c16eb4938ac7488765eca7dc3d5d55402c5aeed4b4e380c9d0433a4e18a94cd11938b43fbe3584b95bc36fec90557a1cfb6017a41fa70807bc06b941e3eca6 SHA512 2d6bd178dd4b7b9b30ed092f69ffdf01e4450eae8e5ee86bd5dcced4370f6f49a440067ae598e126d7ca0f50f9c1212e734ccbd5073fb4fcdef8850327b57763
+EBUILD boto3-1.28.39.ebuild 1532 BLAKE2B d9c16eb4938ac7488765eca7dc3d5d55402c5aeed4b4e380c9d0433a4e18a94cd11938b43fbe3584b95bc36fec90557a1cfb6017a41fa70807bc06b941e3eca6 SHA512 2d6bd178dd4b7b9b30ed092f69ffdf01e4450eae8e5ee86bd5dcced4370f6f49a440067ae598e126d7ca0f50f9c1212e734ccbd5073fb4fcdef8850327b57763
 EBUILD boto3-9999.ebuild 1532 BLAKE2B d9c16eb4938ac7488765eca7dc3d5d55402c5aeed4b4e380c9d0433a4e18a94cd11938b43fbe3584b95bc36fec90557a1cfb6017a41fa70807bc06b941e3eca6 SHA512 2d6bd178dd4b7b9b30ed092f69ffdf01e4450eae8e5ee86bd5dcced4370f6f49a440067ae598e126d7ca0f50f9c1212e734ccbd5073fb4fcdef8850327b57763
 MISC metadata.xml 493 BLAKE2B 7d6324fc877ffe1d20c5369c2af0b09a7028f94d28f1841188913d0d8be7ea699c9d3f92c624992c4c96bd69615d3a1211a2483c76c56b7d3082492e43512523 SHA512 44420d8c03d5986f990b76369edfa8dfd7659b4952db3ad946fd05392ec594628a28745ad888d055d4f074d5214f61fcffafe6c04c4ab54109d45ac0371582bd
--- a/dev-python/boto3/boto3-1.28.15.ebuild
+++ b/dev-python/boto3/boto3-1.28.15.ebuild
@ -1,66 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="
-		https://github.com/boto/boto3/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
--- a/dev-python/boto3/boto3-1.28.20.ebuild
+++ b/dev-python/boto3/boto3-1.28.20.ebuild
@ -1,66 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="
-		https://github.com/boto/boto3/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
--- a/dev-python/boto3/boto3-1.28.25.ebuild
+++ b/dev-python/boto3/boto3-1.28.25.ebuild
@ -1,66 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="
-		https://github.com/boto/boto3/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
--- a/dev-python/boto3/boto3-1.28.26.ebuild
+++ b/dev-python/boto3/boto3-1.28.26.ebuild
@ -1,66 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="
-		https://github.com/boto/boto3/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
--- a/dev-python/boto3/boto3-1.28.27.ebuild
+++ b/dev-python/boto3/boto3-1.28.27.ebuild
@ -1,66 +0,0 @@
-# Copyright 1999-2023 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 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="
-		https://github.com/boto/boto3/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
--- a/dev-python/boto3/boto3-1.28.28.ebuild
+++ b/dev-python/boto3/boto3-1.28.28.ebuild
@ -1,66 +0,0 @@
-# Copyright 1999-2023 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 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="
-		https://github.com/boto/boto3/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
--- a/dev-python/boto3/boto3-1.28.29.ebuild
+++ b/dev-python/boto3/boto3-1.28.29.ebuild
@ -1,66 +0,0 @@
-# Copyright 1999-2023 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 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="
-		https://github.com/boto/boto3/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
--- a/dev-python/boto3/boto3-1.28.31.ebuild
+++ b/dev-python/boto3/boto3-1.28.31.ebuild
@ -1,66 +0,0 @@
-# Copyright 1999-2023 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 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="
-		https://github.com/boto/boto3/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
--- a/dev-python/boto3/boto3-1.28.33.ebuild
+++ b/dev-python/boto3/boto3-1.28.33.ebuild
@ -1,66 +0,0 @@
-# Copyright 1999-2023 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 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="
-		https://github.com/boto/boto3/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)" --dist=worksteal
-}
--- a/dev-python/boto3/boto3-1.28.34.ebuild
+++ b/dev-python/boto3/boto3-1.28.34.ebuild
@ -1,66 +0,0 @@
-# Copyright 1999-2023 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 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="
-		https://github.com/boto/boto3/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)" --dist=worksteal
-}
--- a/dev-python/boto3/boto3-1.28.36.ebuild
+++ b/dev-python/boto3/boto3-1.28.36.ebuild
@ -1,66 +0,0 @@
-# Copyright 1999-2023 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 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="
-		https://github.com/boto/boto3/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)" --dist=worksteal
-}
--- a/dev-python/boto3/boto3-1.28.37.ebuild
+++ b/dev-python/boto3/boto3-1.28.37.ebuild
@ -1,66 +0,0 @@
-# Copyright 1999-2023 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 multiprocessing
-
-DESCRIPTION="The AWS SDK for Python"
-HOMEPAGE="
-	https://github.com/boto/boto3/
-	https://pypi.org/project/boto3/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/boto3"
-	inherit git-r3
-	BOTOCORE_PV=${PV}
-else
-	SRC_URI="
-		https://github.com/boto/boto3/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-	# botocore is x.(y+3).z
-	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
-fi
-
-RDEPEND="
-	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# don't lock versions to narrow ranges
-	sed -e '/botocore/ d' \
-		-e '/jmespath/ d' \
-		-e '/s3transfer/ d' \
-		-i setup.py || die
-
-	# do not rely on bundled deps in botocore (sic!)
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)" --dist=worksteal
-}
--- a/dev-python/boto3/boto3-1.28.39.ebuild
+++ b/dev-python/boto3/boto3-1.28.39.ebuild
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@ -1,34 +1,10 @@
-DIST botocore-1.31.15.gh.tar.gz 11823446 BLAKE2B 13a7eace7e9dcff6fa54c8e725b8221bb5304f97e3b4d422ebf5dd9a0bc905bebe83c67033a11360a00ed51a63742c9b990511681a147b9880a096760d022a9c SHA512 42dd123576407da8b4b3281aed72441d1f57a03b5fa444154096253052ddd88d297f54f497d7ae0af03831b1dac50399a412cd2fee5358a0984053c4de39bd20
-DIST botocore-1.31.20.gh.tar.gz 11852972 BLAKE2B f4c4cf244de902fa4debeeb69c1981dc850751d8750c5c0af109d3f594991ed23a405688d864ac1237df39e8ac96b9d49f4cc83a973dea91ea6539eeaf2458a0 SHA512 e3f4960279c895eec503420bc1b42574fcfb53e5f1cdc6a26207ca1dbd34b36ecfc52c1dcd7b1e9918a5c3c91569baf1df524ca4269a7279fb2d0ef751355fff
-DIST botocore-1.31.25.gh.tar.gz 11863108 BLAKE2B 2fb9bfc01ec93e1dff3459e89f7b20984efe39572320c437af3eae8becc2a871651528fd732f26524c978c5cb032f3675b313ba9b9c6e5acf76f5c5ab07fba9e SHA512 ff360e15051c958b8f9b6e04bb27e2f728bd210c6c7bfc07525d91d54b1ba8be5738e3434c651b61c5774c0b9b4252abaac788274bd56ff10e782efea32b6dd6
-DIST botocore-1.31.26.gh.tar.gz 11865968 BLAKE2B ead40328750793f1cb6e4b533d3cced2eb5a33a6ee7fd81f96853b8ccbf7f3b15977eb2b6c8e218e898d06b0ed087ab1a1919860e45c7afa1b93989b01992b71 SHA512 a0949446d371a34552134903aa5d3ecb8d2fd77a128610c28152d365ffd882cccf8ae419c87b649d48fe732c6b3de04620f4ab7915199f014d9368f0a446abd5
-DIST botocore-1.31.27.gh.tar.gz 11871182 BLAKE2B 818464a312ebf32eb38956fe6d58a1c784e9f2c746e8a03070ceaba89f3a3aee6fd5ff190f6001d32c46a92c12958c5655b5f07c9545b7f8ab6c8b060f1f3656 SHA512 9a175150ada4b21c3c2992671c69bea8717a934009fbf1fa30955735bf732285301e1a7013c631d6422c911b5e62f2980c191e41b9af4479bbe3a0ee8c44e71a
-DIST botocore-1.31.28.gh.tar.gz 11872151 BLAKE2B 97541606ddc488cc1b07f02a1ab55939596f6fcf8515b19579e7c836b4b5fb7cb41c04b1b15e4836b8bf33982044db93694371a8c966682ad4f22ab973041f30 SHA512 88956b9537e6db15c0a5976b25a63d01a0fbe12f8220a5ee3028b6ab6118a3384db3749a8cd2ff2ad32393a419145f9c8027842d290e7bf655b063adf50fd984
-DIST botocore-1.31.29.gh.tar.gz 11874948 BLAKE2B a4a2dabdfdb574814878009a29cee4dfd2014a45b40e10f4769b49d487de1f58e75f27ac897cc140590b03922dd1c2bfc6e28ad211d45743f5358b80fef238c4 SHA512 5796b5b985b68ebde998133c6b33ef2bcc3b7f64615198e0e73f6e24fd2782b796a3acd8a3603cce0890ad820d00c2021da5bdf408ea89154ad21bfafb71c738
 DIST botocore-1.31.30.gh.tar.gz 11873788 BLAKE2B 0e0f7500c838c1dc1978956a1b191b30f217ff55ae17a3f601956362b0be2058bf895477db486f532dbb334d925da2ebe7c24c5a8e08585e2c817bb2539b4f3c SHA512 310d5c23ad1ca38550032b9810106fefd5f6431b717c8296bf6e7d208d5c7d1a6b4a97684f2386f4dac27463e1005e08fd67b0e6be07a5c625fa3c8c3a383378
-DIST botocore-1.31.31.gh.tar.gz 11877393 BLAKE2B 6f1d09ce68815ad9a97bf7df9a4153d76898dc2814ab39f2406812ec6e1075f70e0fe10c33f258c1af0855e2b5f429d2862fae67a8a4deac2aa907a239b1f98e SHA512 00ff060d1dfc7d810d654afea8e75bf69693d0205621ef66eb8003dcd81def3215e55e8e7e643cf9401e39f5cab82edb025aefe5a78d100ca651bcc82564c7e4
-DIST botocore-1.31.32.gh.tar.gz 11878306 BLAKE2B 19292e0456f66e4d2b60efb6a6b176fd1e6c81ec77fa14fc7af61549c31abb8d3045aa778b2f279e66457255b8ee33a8e911b5e981e788b056aabd6af4465b48 SHA512 f94b820f74c88e7bac6b4b8b3f7de66eee8406df6f3bb9f3a97673c65664dd598f92eb82f78487d6bcb1431c5001c98b007ebd0edb11abd35e7bbe0243a7ce69
-DIST botocore-1.31.33.gh.tar.gz 11877895 BLAKE2B feec0dc8b6d7db2630ee381a41e74434baa18c86ef966fc70db2fc8c1edd6d42eb48aeb952cdd1aabd929235747da4ea845dfc8379f9b9841bf5daef9932bc82 SHA512 bb44a0ecc907594f899e64ff04feab3f1ac603902d3ba49ac36100f8cd2e7befe9845c6fabfe2571b32d36d4c370e6f46e164ba5355e0a1fe3d6e249d24b2724
-DIST botocore-1.31.34.gh.tar.gz 11877457 BLAKE2B 1d92e2b3cbddad824d78e374bec5625b946bb3eb2c262a7eff79ed25e40066bdb17408d9f659ecc8923d544583c21335d8f4032f893eddf4c653064c1bc8c0b3 SHA512 b9fbfb0234cd7fcfd196c1bfa07a01b8583bdf0af425c9f4f27d1bdcc1ca0323c9b78444957f839b6d9c3597c1c60dcb3f32c9263598e555375dd1871d734b8c
 DIST botocore-1.31.35.gh.tar.gz 11877715 BLAKE2B 64c90cb764ab47fdf9f644b4819c9fc1486c07ea2b72b8f2b35fc8adbead5efa7fb43140a2008ca21b63e0981017b366588c6f77e8cb5f5e4acef359f0b0e959 SHA512 63f044f7ac2419d2682a838a35a17d9a1a6a56fa7321e181e959923dbeaf41b5396c96a02eaace7421775c25e4ab63822a5fd57e02d618d4644ecbece72286c2
-DIST botocore-1.31.36.gh.tar.gz 11879082 BLAKE2B 61f41aef704321e77a7670a4580a1bb18527a953018c87150826990e557658a4d05d47aca4b464a556dd5866cb6cb8a43c033f87a6cb99812ce3cc3dffad2fbd SHA512 b8bf028993c63026b015cbf5248df25055b5d8a52ff153d16c24bddcf957f3abc1c83610da61e5664fe74cf2e7108193a6038339c8b4beb2bacb4686f806aa8c
-DIST botocore-1.31.37.gh.tar.gz 11882688 BLAKE2B af7ff26dc7d1ebe2be86334ec642e89af6069a484834a2b02a4d06fc8d05073421401cc962911b41f859d1f2fa00d38803e2100952af7e4925998c1471fae3c4 SHA512 33982ffb855967b6caf58f9eccb37a9e4857a67b9bd5973339aadc092dd23e82c920759ea8e8df9ce0b3b14ebb10f49aa3f58f5ee666bf61f852c8eb07e72b58
 DIST botocore-1.31.38.gh.tar.gz 11926426 BLAKE2B 1f668a23e52f3033f3b12e6dfeb086d21eb6fd3e163ab12e5c07ccbf4a4a11df9504bac99d6b68a3001f7f1c5849a4d5340ddf5b838b349fc3aed580f6733a03 SHA512 800301dfca0a284d53e252bfbeff9e705120e087c45167bfee8ad343e7873a1eb69d2be725ef8a81bbd7c31fa2016908bfb3729d560d44b36f2ca160aac4663e
-EBUILD botocore-1.31.15.ebuild 1827 BLAKE2B d9e353ffebf3b77bdb5b034da339f9f3cf95937e288fa522fcc40f88a4752c58ae085406bfefa595c3738ec118712cdb4ee0509c1dee7a00e2c76cd2a657009c SHA512 f0d3e81726bd65bf4c097b63e8673881949970e29d976de53c1facbccf8cd1d214fea9153f4820a5889f1892979342a0255e110b243ba613d4e803a940d46602
-EBUILD botocore-1.31.20.ebuild 1834 BLAKE2B 50305f707e533627ed4b906b3c5845a931f825049d40d8e9d9eedf1323d130634b578f68adb046db30e3e9a4168361da69d99471a7b744407dc103130a114994 SHA512 45952178574e99269d9767374818d867bfcc47ebf0f4c37dbab6cf50089577badb69967bd06b0b2d10b15dcd1c3e8b82adac88404d7c3b7d7784292b4005e797
-EBUILD botocore-1.31.25.ebuild 1834 BLAKE2B 50305f707e533627ed4b906b3c5845a931f825049d40d8e9d9eedf1323d130634b578f68adb046db30e3e9a4168361da69d99471a7b744407dc103130a114994 SHA512 45952178574e99269d9767374818d867bfcc47ebf0f4c37dbab6cf50089577badb69967bd06b0b2d10b15dcd1c3e8b82adac88404d7c3b7d7784292b4005e797
-EBUILD botocore-1.31.26.ebuild 1834 BLAKE2B 50305f707e533627ed4b906b3c5845a931f825049d40d8e9d9eedf1323d130634b578f68adb046db30e3e9a4168361da69d99471a7b744407dc103130a114994 SHA512 45952178574e99269d9767374818d867bfcc47ebf0f4c37dbab6cf50089577badb69967bd06b0b2d10b15dcd1c3e8b82adac88404d7c3b7d7784292b4005e797
-EBUILD botocore-1.31.27.ebuild 1834 BLAKE2B 8209ad43b9caa70c98744edf36645c8a660c86e61d2640787b8fd452c6ead5ebaad53ab332d74bb242a32ed673577231abd7a39b60b1122c9c30a6e1c46e9eff SHA512 8f2ff2d43225813fbba24106ed6df42810fe25cb3012288d3922dd57717e2608df205c7e2e6a6687f4089448ad7f8eb6b6e1575b4b51b76727351d4bcbea9155
-EBUILD botocore-1.31.28.ebuild 1834 BLAKE2B 8209ad43b9caa70c98744edf36645c8a660c86e61d2640787b8fd452c6ead5ebaad53ab332d74bb242a32ed673577231abd7a39b60b1122c9c30a6e1c46e9eff SHA512 8f2ff2d43225813fbba24106ed6df42810fe25cb3012288d3922dd57717e2608df205c7e2e6a6687f4089448ad7f8eb6b6e1575b4b51b76727351d4bcbea9155
-EBUILD botocore-1.31.29.ebuild 1834 BLAKE2B 8209ad43b9caa70c98744edf36645c8a660c86e61d2640787b8fd452c6ead5ebaad53ab332d74bb242a32ed673577231abd7a39b60b1122c9c30a6e1c46e9eff SHA512 8f2ff2d43225813fbba24106ed6df42810fe25cb3012288d3922dd57717e2608df205c7e2e6a6687f4089448ad7f8eb6b6e1575b4b51b76727351d4bcbea9155
+DIST botocore-1.31.39.gh.tar.gz 11927900 BLAKE2B 28b1fe5beea5b586b3bf6434ad3ab32b8f781ae79ddc39a142a53f5e87d136bcad4e1d1baaeee2afc4b09c3e4b02f583817d6471d09dd145b881fafdf71c73e1 SHA512 2dc271ace551ff4c9a25d6ed4c3a31dbdd90cb0f1c4088e1c71b220e20f4b7008fd41b2682c838c5e3fe911c35758a99502fe874c45c51092a83150a14d25edc
 EBUILD botocore-1.31.30.ebuild 1827 BLAKE2B 52ad52588a26e5f1af6dc5f75059fc5d4821e7b7cbb583b07713f3f6af6d6076593df2f22c957ea39813f70b9c0b00eab67b9a9dc174baafa3594326debc3540 SHA512 e4e23357c944e848d0d638977e7053de952e90c6b8d74ca16a25b0ff37a70b0f5bcb6e60022dfdee7c81d8d792d0a28c6acc6f37eac69c2274e36f9a7c808750
-EBUILD botocore-1.31.31.ebuild 1834 BLAKE2B 8209ad43b9caa70c98744edf36645c8a660c86e61d2640787b8fd452c6ead5ebaad53ab332d74bb242a32ed673577231abd7a39b60b1122c9c30a6e1c46e9eff SHA512 8f2ff2d43225813fbba24106ed6df42810fe25cb3012288d3922dd57717e2608df205c7e2e6a6687f4089448ad7f8eb6b6e1575b4b51b76727351d4bcbea9155
-EBUILD botocore-1.31.32.ebuild 1834 BLAKE2B 8209ad43b9caa70c98744edf36645c8a660c86e61d2640787b8fd452c6ead5ebaad53ab332d74bb242a32ed673577231abd7a39b60b1122c9c30a6e1c46e9eff SHA512 8f2ff2d43225813fbba24106ed6df42810fe25cb3012288d3922dd57717e2608df205c7e2e6a6687f4089448ad7f8eb6b6e1575b4b51b76727351d4bcbea9155
-EBUILD botocore-1.31.33.ebuild 1834 BLAKE2B 8209ad43b9caa70c98744edf36645c8a660c86e61d2640787b8fd452c6ead5ebaad53ab332d74bb242a32ed673577231abd7a39b60b1122c9c30a6e1c46e9eff SHA512 8f2ff2d43225813fbba24106ed6df42810fe25cb3012288d3922dd57717e2608df205c7e2e6a6687f4089448ad7f8eb6b6e1575b4b51b76727351d4bcbea9155
-EBUILD botocore-1.31.34.ebuild 1834 BLAKE2B 8209ad43b9caa70c98744edf36645c8a660c86e61d2640787b8fd452c6ead5ebaad53ab332d74bb242a32ed673577231abd7a39b60b1122c9c30a6e1c46e9eff SHA512 8f2ff2d43225813fbba24106ed6df42810fe25cb3012288d3922dd57717e2608df205c7e2e6a6687f4089448ad7f8eb6b6e1575b4b51b76727351d4bcbea9155
 EBUILD botocore-1.31.35.ebuild 1834 BLAKE2B 8209ad43b9caa70c98744edf36645c8a660c86e61d2640787b8fd452c6ead5ebaad53ab332d74bb242a32ed673577231abd7a39b60b1122c9c30a6e1c46e9eff SHA512 8f2ff2d43225813fbba24106ed6df42810fe25cb3012288d3922dd57717e2608df205c7e2e6a6687f4089448ad7f8eb6b6e1575b4b51b76727351d4bcbea9155
-EBUILD botocore-1.31.36.ebuild 1834 BLAKE2B 8209ad43b9caa70c98744edf36645c8a660c86e61d2640787b8fd452c6ead5ebaad53ab332d74bb242a32ed673577231abd7a39b60b1122c9c30a6e1c46e9eff SHA512 8f2ff2d43225813fbba24106ed6df42810fe25cb3012288d3922dd57717e2608df205c7e2e6a6687f4089448ad7f8eb6b6e1575b4b51b76727351d4bcbea9155
-EBUILD botocore-1.31.37.ebuild 1834 BLAKE2B 8209ad43b9caa70c98744edf36645c8a660c86e61d2640787b8fd452c6ead5ebaad53ab332d74bb242a32ed673577231abd7a39b60b1122c9c30a6e1c46e9eff SHA512 8f2ff2d43225813fbba24106ed6df42810fe25cb3012288d3922dd57717e2608df205c7e2e6a6687f4089448ad7f8eb6b6e1575b4b51b76727351d4bcbea9155
 EBUILD botocore-1.31.38.ebuild 1834 BLAKE2B 8209ad43b9caa70c98744edf36645c8a660c86e61d2640787b8fd452c6ead5ebaad53ab332d74bb242a32ed673577231abd7a39b60b1122c9c30a6e1c46e9eff SHA512 8f2ff2d43225813fbba24106ed6df42810fe25cb3012288d3922dd57717e2608df205c7e2e6a6687f4089448ad7f8eb6b6e1575b4b51b76727351d4bcbea9155
+EBUILD botocore-1.31.39.ebuild 1834 BLAKE2B 8209ad43b9caa70c98744edf36645c8a660c86e61d2640787b8fd452c6ead5ebaad53ab332d74bb242a32ed673577231abd7a39b60b1122c9c30a6e1c46e9eff SHA512 8f2ff2d43225813fbba24106ed6df42810fe25cb3012288d3922dd57717e2608df205c7e2e6a6687f4089448ad7f8eb6b6e1575b4b51b76727351d4bcbea9155
 EBUILD botocore-9999.ebuild 1834 BLAKE2B 8209ad43b9caa70c98744edf36645c8a660c86e61d2640787b8fd452c6ead5ebaad53ab332d74bb242a32ed673577231abd7a39b60b1122c9c30a6e1c46e9eff SHA512 8f2ff2d43225813fbba24106ed6df42810fe25cb3012288d3922dd57717e2608df205c7e2e6a6687f4089448ad7f8eb6b6e1575b4b51b76727351d4bcbea9155
 MISC metadata.xml 499 BLAKE2B e5aaa7da26f200c09adfdf38b68f656bbccbec627cb5d966b280ac2165334e7eec659c89075bcace748f58e2ec3e7d2998e54a688d56ecea2d30653c67dfd35a SHA512 103c554d5dbd967bf9b6e418b3913d9235e7e910d012160909ce0715134ed2e37b06e6a345395f9d16ce08d1cf51f3ce458bce93c6a978fd3dca6610f2acdbd0
--- a/dev-python/botocore/botocore-1.31.15.ebuild
+++ b/dev-python/botocore/botocore-1.31.15.ebuild
@ -1,72 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="
-		https://github.com/boto/botocore/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-		# fails on unrelated warnings
-		tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME
-		tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
-		# TODO
-		tests/functional/test_credentials.py::SSOSessionTest::test_token_chosen_from_provider
-	)
-
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
--- a/dev-python/botocore/botocore-1.31.20.ebuild
+++ b/dev-python/botocore/botocore-1.31.20.ebuild
@ -1,72 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Low-level, data-driven core of boto 3"
-HOMEPAGE="
-	https://github.com/boto/botocore/
-	https://pypi.org/project/botocore/
-"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/boto/botocore"
-	inherit git-r3
-else
-	SRC_URI="
-		https://github.com/boto/botocore/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	<dev-python/jmespath-2[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unpin deps
-	sed -i -e "s:>=.*':':" setup.py || die
-
-	# unbundle deps
-	rm -r botocore/vendored || die
-	find -name '*.py' -exec sed -i \
-		-e 's:from botocore[.]vendored import:import:' \
-		-e 's:from botocore[.]vendored[.]:from :' \
-		{} + || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# rely on bundled six
-		tests/functional/test_six_imports.py::test_no_bare_six_imports
-		tests/functional/test_six_threading.py::test_six_thread_safety
-		# fails on unrelated warnings
-		tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME
-		tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
-		# TODO
-		tests/functional/test_credentials.py::SSOSessionTest::test_token_chosen_from_provider
-	)
-
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
-}
--- a/Show More
+++ b/Show More