33 files changed, 49 insertions, 223 deletions
diff --git a/dev-ada/Manifest.gz b/dev-ada/Manifest.gz
index 4ef1ad3e3b47..c8c3b917b945 100644
--- a/dev-ada/Manifest.gz
+++ b/dev-ada/Manifest.gz
diff --git a/dev-ada/ada_language_server/Manifest b/dev-ada/ada_language_server/Manifest
index 7f0fadfa5f96..46ffc0c10e71 100644
--- a/dev-ada/ada_language_server/Manifest
+++ b/dev-ada/ada_language_server/Manifest
@@ -1,3 +1,3 @@
 DIST ada_language_server-23.0.10.tar.gz 1224074 BLAKE2B 100a0d042a6c638b1b3eb7c9c27a638f218a66e3f52a6f9be53fc42e764aff636c4fe7c1f532f2ba7ae6a811bf4cb8a8ce4a416fd1958c460ffb7f715a7166f5 SHA512 bc062d9e4b6c37a9add7a5665a44ee0ad06fd9ef12cb854b49ed52ed060dfe3582b54a47a4764f0f5b305c2ea697d180832ee4ed87dfcde37bcbc83cb2479299
-EBUILD ada_language_server-23.0.10-r1.ebuild 2351 BLAKE2B 7568826bf22a7475ed38bb9062323eaf4677d4dd561bed7597d98e3b9425c08ab2444dcc5fe8cb222b4f1c1ceebfe2fbdd15e0428434bdfbf0913bc4b6fb8b1d SHA512 fcf74900f1de2427d4c3321cf8b5ac64db8dc6245f51624a7f371667f3f20180d656846b37f2da3329c555c6448007f2b423311d9279087120426cefb897a588
+EBUILD ada_language_server-23.0.10-r2.ebuild 2358 BLAKE2B 3a799c7ea6ab63b4d3fcb45433f42bc5b19d35a0fe72d4b7cb32ff5781905c30fbadc089104af4cd64513f4986707c482d4027a750c61aa434f441c91ee04df0 SHA512 eb45f367127bfefe5e0f1097572fbd97d1f7fddebbfe33a85abb68a666778f89372bda27d1f727a4fda02d37522a012089b3ade0159c3945c0553b07afbf3faf
 MISC metadata.xml 308 BLAKE2B 4793221c685a34d429fa0119a02d14432c984970ec5616d069cb55fa02e18757c9a8e48dc4df34507ea8c084097ff0a9bee0c317509c4f5c83fcdb318977869d SHA512 b65109a33128863f1f7b29a6645147b5064fa39be86d8d0632c703befeb00138900fed17709a752d17d4f03495af84a405306fd24d32b15b9242c839adb70db3
diff --git a/dev-ada/ada_language_server/ada_language_server-23.0.10-r1.ebuild b/dev-ada/ada_language_server/ada_language_server-23.0.10-r2.ebuild
index e77b0a69e58e..e1f8e711b7b6 100644
--- a/dev-ada/ada_language_server/ada_language_server-23.0.10-r1.ebuild
+++ b/dev-ada/ada_language_server/ada_language_server-23.0.10-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 2021-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-ADA_COMPAT=( gnat_2021 gcc_12_2_0 )
+ADA_COMPAT=( gnat_2021 gcc_12_2_0 gcc_12 )
 inherit ada multiprocessing toolchain-funcs
 
 DESCRIPTION="an implementation of the Microsoft Language Server Protocol for Ada/SPARK"
diff --git a/dev-ada/ada_libfswatch/Manifest b/dev-ada/ada_libfswatch/Manifest
index 3117b3efdcff..73c01fda7f67 100644
--- a/dev-ada/ada_libfswatch/Manifest
+++ b/dev-ada/ada_libfswatch/Manifest
@@ -1,4 +1,4 @@
 AUX ada_libfswatch-20201105-link.patch 340 BLAKE2B d83ed866777df9e0ceab5e8ce6fcd606ed784c346cba2623f444b3553c67a6314031d614d06224cf13663af5d3a1d437549465e95a6ceb9a420a4d3237b39b9a SHA512 3033f2a06314801ca7141585ba6e3b4605b68d55dfbcc446d3a6ea2008d6763fe5aca1b5ee5c808c4e50fe2ee8237ea17a2db62abbb563f6fc48bc59d3e6cbcb
 DIST ada_libfswatch-20201105.tar.gz 20473 BLAKE2B cfa200f3276da5372df83038fe7a11224a4938d750207f17769ff21ce2c0780e5ef3111a5564cdabde2155fb7579c437e34061cd8654358d04f55bd0af1f1b02 SHA512 71ec7584ad4c9d06939d4cde858c40016b629a76edf6392287140aaabbc588b82c7abf980ab75888763ebaf721b51e1163cf362512788b7559e20d11051a95ed
-EBUILD ada_libfswatch-20201105.ebuild 1242 BLAKE2B 3646d239c9e586a6f86ed97fcac7b0ae770bda61413aa19423fd6eae7dd8fac8ac40548d7553059aa5fbc349d017483bfceee73b112b637a6eb00a45f126f88d SHA512 4428f5ae93dae28829698490741e6ffdb6a70c03695a189e3075b9ba0666ea71a834b8999032570990b1d4ed000bb9d3777ed4beebc4d9da16092ac54d7f02f1
+EBUILD ada_libfswatch-20201105-r1.ebuild 1249 BLAKE2B 80ed4db82fb65b87bf7a0e9f60002596db866367fc2d73cd1e50ade6346c9d969e1a39f0ce74b01cf720ce0e08312943658bfa331175f78eb4232f3399f10de6 SHA512 19a52c422221b4ab405d4846150190b1278672e8a727adc2b8d8047daa2f4d37b4bbe08be58f867f547f7465e54cc65d436d86e6986698a891c32644d0bbcc30
 MISC metadata.xml 303 BLAKE2B dcdf1d7460015304bd2c84cf1e8ed8b23d22abbbac6f6d630709742425f15a0589dfe173cbb7cf259ca19fe342692f7e6db773ec2995c446d4a90b1f1566cf16 SHA512 54c9c050abba868d5b42049835e9ebf64b0d5a5f1f165e153ae8e60a013ba9e29d747454e5d032cb713aeed1283863d52fe46a9466166a15f7090537e48d5ea0
diff --git a/dev-ada/ada_libfswatch/ada_libfswatch-20201105.ebuild b/dev-ada/ada_libfswatch/ada_libfswatch-20201105-r1.ebuild
index 0cfd6ec3840f..e7500b8a6e22 100644
--- a/dev-ada/ada_libfswatch/ada_libfswatch-20201105.ebuild
+++ b/dev-ada/ada_libfswatch/ada_libfswatch-20201105-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2021-2022 Gentoo Authors
+# Copyright 2021-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-ADA_COMPAT=( gnat_2021 gcc_12_2_0 )
+ADA_COMPAT=( gnat_2021 gcc_12_2_0 gcc_12 )
 inherit ada
 
 commitId=94c0a5f137b88113a791a148b60e5e7d019d6fa1
diff --git a/dev-ada/aunit/Manifest b/dev-ada/aunit/Manifest
index 8b2b1a34dfc8..98871a8c5a81 100644
--- a/dev-ada/aunit/Manifest
+++ b/dev-ada/aunit/Manifest
@@ -1,7 +1,3 @@
-AUX aunit-2016-gentoo.patch 374 BLAKE2B 00d34a835afdc4a1a80f8c4dad23ae4a30a89eb801c3aeb8177a4d0cb838b3edf0c8463c774da212a9be56378f493ddd41aa4a26d976a38f1800999903dd2263 SHA512 0ea27e0d8783788c83a3916071ea0dd5361f21a4fc67727b735986dfc624c9f1bd6aa471229c389f5453001577ca1eec0ecdd0865952a0aa5fe1453787dac33b
-AUX aunit-22.0.0-redundant.patch 804 BLAKE2B 2bff62c0b0a19b617af6bbdcae90af536f3fd23e645d0f2e5e93dd1c6a334e3ecc112df8c3051aa7d58f3e9ab3ea41756e916dad4a395de8bb79ce86e0ef90f4 SHA512 de5154c286a06b795da449a0d0de27e5153a4b5c216bd6f484ca89ca6a249a0f89ff608a25d4f67b4e002a86b05f3eb1386a9e7d7980ffc1144ac3cfbd034433
-DIST aunit-22.0.0.tar.gz 131442 BLAKE2B 6ddc2f37ea06cfd5c7ad4d145b8889e171169108b90252feacf600a00acbd4740e638e7d478e4ac474953f9f3dcb118a4c5486a1cca6380b054661cf4b5f7e18 SHA512 5380fcb18ede7422507aff566f97521760fcc8a713d0e90195128189807784fec828c2e2c538aa0ac897cbdeb15fa2120e67b9e998875aac0ade2636dbea4e96
 DIST aunit-23.0.0.tar.gz 131699 BLAKE2B 04ff77214ab6f4f5d59ea0609fffbc6fcfb4695d2fbbed45efa14e2b745c33868e1c134e5d00a7c3d8f11b1a8d15c6212110c78a53df4230b5862fb9b912a434 SHA512 450caa79e4808188107cd065665ca9cab599934e3934d18406b08d3ccebe26c1e95cd0c712ea3403d6082c7c5e8fd9ecf09ae3b63d231b80ad575048b3d61943
-EBUILD aunit-22.0.0.ebuild 996 BLAKE2B 22317878fdf11bfe92a19b9de559834697a55654635212aa1654a9b770e341cd77be72fea3887e210ac02a3105a299b69601fafc102f58334e28a2a9811ad1e7 SHA512 90e2f22259b97595eebe80bb7ab7cf6c6e391079adcb2856dc378530f44db91881143b99d64e4cdb3ab933d808a054c00a963d8ab72da2085791ddcca99d5441
-EBUILD aunit-23.0.0.ebuild 925 BLAKE2B 10735bcc40e107342faa0c39fefadba09eb44ac231ed968fc387bdf56f07507f69ab0c72e5d51661853d91541aecc5001e6649eaba6d6c6a8511caf14b6fd4b9 SHA512 dba0addd11b6e6c96f1089c3e29f9a112c1b94035ff13c321ee9416f21dbdc02914d9627eac77c03a396b747c98b5dc1e5f60372fa8fc12a5cef57a908d0b5b7
+EBUILD aunit-23.0.0-r1.ebuild 930 BLAKE2B d023f539331e61b5f124de0bc578dc6c93831f4b125969ad3f93182c568b33c7b615fbfba90e52c5a1bfdd300b0d9e522ddd0831ee2ac35eba17744d1e2a1a87 SHA512 3e938454b33b82bcde5d79caf338ed5e4c83a03648b77330b4f73adbadbc60ddf26629b64f8085779aa6c91f78e73f6f3dc40fa3f1b1aa4c090897043c49cd14
 MISC metadata.xml 843 BLAKE2B 3f8a899e8d22a411596aae79b739e3cf47b7b867bedede255761146d65e70adfd810544528018212b8a3f36a59f2d886682146a6370ab33c976f676d331b9390 SHA512 2ae746ded1a937362aad360ccd273143b495e43e71aeffb23dbcc71f93154bcc2fce6fcf6fa99d2a7ab1140ffb52ece0b08d1a010a627c0d10ee80e7984fdc92
diff --git a/dev-ada/aunit/aunit-22.0.0.ebuild b/dev-ada/aunit/aunit-22.0.0.ebuild
deleted file mode 100644
index f98ad1ae55ba..000000000000
--- a/dev-ada/aunit/aunit-22.0.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ADA_COMPAT=( gnat_2021 gcc_12_2_0 )
-inherit ada multiprocessing
-
-DESCRIPTION="Ada unit testing framework"
-HOMEPAGE="http://libre.adacore.com/tools/aunit/"
-SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="${ADA_DEPS}"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[${ADA_USEDEP}]"
-
-REQUIRED_USE="${ADA_REQUIRED_USE}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2016-gentoo.patch
-	"${FILESDIR}"/${P}-redundant.patch
-)
-
-src_compile() {
-	emake GPRBUILD="gprbuild -j$(makeopts_jobs) -v"
-}
-
-src_install() {
-	emake INSTALL="${D}"/usr install
-	einstalldocs
-	mv "${D}"/usr/share/examples/${PN} "${D}"/usr/share/doc/${PF}/examples || die
-	rmdir "${D}"/usr/share/examples || die
-	rm -r "${D}"/usr/share/gpr/manifests || die
-}
-
-src_test() {
-	emake PROJECT_PATH_ARG="ADA_PROJECT_PATH=$(pwd)/lib/gnat" -C test
-}
diff --git a/dev-ada/aunit/aunit-23.0.0.ebuild b/dev-ada/aunit/aunit-23.0.0-r1.ebuild
index af510a7829ab..48724f61815c 100644
--- a/dev-ada/aunit/aunit-23.0.0.ebuild
+++ b/dev-ada/aunit/aunit-23.0.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-ADA_COMPAT=( gnat_2021 gcc_12_2_0 )
+ADA_COMPAT=( gnat_2021 gcc_12_2_0 gcc_12 )
 inherit ada multiprocessing
 
 DESCRIPTION="Ada unit testing framework"
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="${ADA_DEPS}"
diff --git a/dev-ada/aunit/files/aunit-2016-gentoo.patch b/dev-ada/aunit/files/aunit-2016-gentoo.patch
deleted file mode 100644
index eeace666b45e..000000000000
--- a/dev-ada/aunit/files/aunit-2016-gentoo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- aunit-3.8.0w-src/Makefile.old	2017-01-04 18:13:29.634899987 +0100
-+++ aunit-3.8.0w-src/Makefile	2017-01-04 18:15:59.013219503 +0100
-@@ -29,7 +29,7 @@
- .PHONY: all clean targets install_clean install
- 
- all:
--	$(GPRBUILD) -p $(GPROPTS) lib/gnat/aunit.gpr
-+	$(GPRBUILD) -p $(GPROPTS) lib/gnat/aunit.gpr -cargs $(ADAFLAGS)
- 
- clean-lib:
- 	$(RM) -fr lib/aunit lib/aunit-obj
diff --git a/dev-ada/aunit/files/aunit-22.0.0-redundant.patch b/dev-ada/aunit/files/aunit-22.0.0-redundant.patch
deleted file mode 100644
index d22bb4a572ec..000000000000
--- a/dev-ada/aunit/files/aunit-22.0.0-redundant.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 7372e83edf47cf26dc64a49850b6fd80aaea5495 Mon Sep 17 00:00:00 2001
-From: Vasiliy Fofanov <fofanov@adacore.com>
-Date: Mon, 13 Dec 2021 18:54:17 +0100
-Subject: [PATCH] Remove redundant "with" of parent unit
-
-This fixes a warning raised by recent GNAT toolchains.
-
-TN: UC13-054
----
- test/src/aunit-test_suites-tests.ads | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/test/src/aunit-test_suites-tests.ads b/test/src/aunit-test_suites-tests.ads
-index 0d3ea33..377c0c3 100644
---- a/test/src/aunit-test_suites-tests.ads
-+++ b/test/src/aunit-test_suites-tests.ads
-@@ -1,10 +1,9 @@
- --
----  Copyright (C) 2009-2010, AdaCore
-+--  Copyright (C) 2009-2021, AdaCore
- --
- 
- with AUnit.Test_Fixtures;
- with AUnit.Test_Results;
--with AUnit.Test_Suites;
- 
- package AUnit.Test_Suites.Tests is
- 
diff --git a/dev-ada/aws/Manifest b/dev-ada/aws/Manifest
index 03b23bc661e8..7b8a2556dcc2 100644
--- a/dev-ada/aws/Manifest
+++ b/dev-ada/aws/Manifest
@@ -6,5 +6,5 @@ DIST aws-23.0.0.tar.gz 2390842 BLAKE2B 2433493b1ad8a98b4f95671e306aec5e072600633
 DIST templates-parser-22.0.0.tar.gz 224473 BLAKE2B c0c0d6feada3d0e54ee0456b48979e1f436c2bdf7210aeb061640c3128294b243ac21c29ef538b055871315b567640e37782b28057954bf4d43473d372c7d983 SHA512 9ce512e41bf3e682f1671d3ed931830d2279da9bef58f9997e430f4852cebb6119cabf0fde7dfaf999586155c13472ab258a0e0f3d885522aeb86d8acb4a2d4f
 DIST templates-parser-23.0.0.tar.gz 225459 BLAKE2B 0971030e3079ff93b876bcb51925208eeee63837878a24589700dc9e0c025272e2d7920f82ee9b769c04857e4701d3eed629a1ac1f0979714c47fc132a188bed SHA512 c0a94b42391c61b4251cbbe86f91c506f46f6eed5be3779385bf199cf43281b704c68fd078b8b917948675976538168c1ac4c1f3b757f6db9988a45af7bfc4a5
 EBUILD aws-22.0.0.ebuild 1301 BLAKE2B cfb4ff7ec05ac43dd76d5e0c20e12abafd8a45a3667b3165b3e52269f92d89a838cc4543429b171073cd406e29b08088fd312023f61fd4951863858149043dcd SHA512 55c5529bc7a64863c7ff2b2d670434d7aeed02438b1ef205e10ed5c4ebb11fd074654f61825d258b70c6db6254ca91b4e40d5b0502c9f0f4f765eaaaf3aa1515
-EBUILD aws-23.0.0.ebuild 1743 BLAKE2B f27e3c3b332e0774e7ec22a715d34704d81c3b5a98bf2e7292d16c311add27ac9976aa5291f6d0e6b5fb80557fa37a4b3223c9fd9b0511e32077b946abd6516d SHA512 1c2ef8e83101eef325e6c4df637243293fdcd29e984c39496293f02a5d8497e1b3d364325655b8f99df922ceb4cbfd803c7a33f9813befbedf31e94ee3d9c035
+EBUILD aws-23.0.0-r1.ebuild 1750 BLAKE2B 2f17ee8522581d66ef5f2ee148a3d1ecc9d70ca9e6a661672388b8ddeb9e759733b6b92825837439a5d49f6846c0b2f160e65eabd34cdff5252907f8aac7f621 SHA512 3a704129b8e464189bb14b2c6e46e2b0d25308ed928760f561696cd1118d870a38e9d1d81a0e1a83727d3e31373dbc022818e7497e3437f9e43bc79c3953a531
 MISC metadata.xml 856 BLAKE2B f5c808887f55e62d0948f024c189ec495c60a94ed824d332b5a8f4db1bb857a3aa17bc60bacad8716b5bad8260acc321ae5651398fe7210fd82dd970475e82a5 SHA512 4fd8699b73661262c8c0928259d541cbaec36b9dc4dfb577fca7e69546d6d828c846995a23daee81f5aa5628852e14fd63d6ff3381db5ab176bddcb8bdfc98d5
diff --git a/dev-ada/aws/aws-23.0.0.ebuild b/dev-ada/aws/aws-23.0.0-r1.ebuild
index 7c0d31e6ce21..713ea371292e 100644
--- a/dev-ada/aws/aws-23.0.0.ebuild
+++ b/dev-ada/aws/aws-23.0.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-ADA_COMPAT=( gnat_2021 gcc_12_2_0 )
+ADA_COMPAT=( gnat_2021 gcc_12_2_0 gcc_12 )
 inherit ada multiprocessing
 
 DESCRIPTION="A complete Web development framework"
diff --git a/dev-ada/gnatdoc/Manifest b/dev-ada/gnatdoc/Manifest
index a56414cee6e4..32792afcfee3 100644
--- a/dev-ada/gnatdoc/Manifest
+++ b/dev-ada/gnatdoc/Manifest
@@ -1,3 +1,3 @@
 DIST gnatdoc-23.0.0.tar.gz 39607 BLAKE2B 589b3f0a9af9d5067e2017083f834697f7e1995c76be3a84e24409261ec058cd8b1e2487bd78d03d36b6ccab68ec0b294534726f3171b4080ed1d569d0c23be7 SHA512 0e9095ced08086a3be03e20b49ddb436d4efb396001e9d6877b0612adc3d8e2a08f1d5146d07c9acf5dc59a73418f7a3ec3231aba63c9644e6829c387703e6ae
-EBUILD gnatdoc-23.0.0.ebuild 1452 BLAKE2B 66444e78a6d70b82e49c1c9376f60dacb1ed3380dd48f58344260e02e71a6f4e227caa3452ae4260dd384f5a5cd26d6d4db452a7f5df2dc0f7adef3e48aaea02 SHA512 3d4893d1c645008bb235bb6f67d06de692e862712508b8df836b72e746c01331e98900de00558a7b8689011336681edf9d3833b1cbe310abf1ee3f7947df1ed8
+EBUILD gnatdoc-23.0.0-r1.ebuild 1464 BLAKE2B d7bd9301fbe506f778b9409f40306e2b083b52b15abfd1cf9912cd60d2f52537decb808fde5cd8376685fc416dd4dcec55588506c299e10d01efe69299a1f2ed SHA512 970f16dc8d6458f035d8b3c714fc5cc2731887ac81a1cb83be8a32db9475150b169c074257b6dbd3623a6fc2aea1f9f48f8d1c877a67433fc7a8adcc9f33bb51
 MISC metadata.xml 296 BLAKE2B 4cb07a7a3239fdd3c318b261bca306066e1488dab6f3c0f32bcbbc434d3b584e230a9fa1159e4f1d056ae4cf886cc11425ca2648322b17748b09dccde17927be SHA512 04e74f766efbd81ac7ff2d33932f436f4546074c2b31dc95034fa94a94d5ac6e427b0775a7ea77771d347f571591ca908f80a00657be6801bc40dd69c96ddbc6
diff --git a/dev-ada/gnatdoc/gnatdoc-23.0.0.ebuild b/dev-ada/gnatdoc/gnatdoc-23.0.0-r1.ebuild
index 7ec64847dec5..9c0f1f4648e9 100644
--- a/dev-ada/gnatdoc/gnatdoc-23.0.0.ebuild
+++ b/dev-ada/gnatdoc/gnatdoc-23.0.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-ADA_COMPAT=( gnat_2021 gcc_12_2_0 )
+ADA_COMPAT=( gnat_2021 gcc_12_2_0 gcc_12 )
 inherit ada multiprocessing
 
 DESCRIPTION="GNAT Documentation Generation Tool"
diff --git a/dev-ada/gnatmem/Manifest b/dev-ada/gnatmem/Manifest
index 5e286e669af1..440adaba64b8 100644
--- a/dev-ada/gnatmem/Manifest
+++ b/dev-ada/gnatmem/Manifest
@@ -1,4 +1,4 @@
 AUX gnatmem-2018-gentoo.patch 2998 BLAKE2B ef2afa9a7ef200adb3729ac6e3bf80b6a4f92cae8c560805c741189917e454a391a6cc09271491110fd2e0c7c95cef672f807a64acf247cea2996fb2bbc71c31 SHA512 259915b1b9c5a586609c0e2801df3239f859871a194da5cd53ad323020832f5e2f37419bbb6f7e3c1d6a0c5d4a2bcf7b709db220b190abe84faa54463f43d199
 DIST gnatmem-2021-20210518-19F7B-src.tar.gz 81001 BLAKE2B 618c5e0fc300e1ea53456b776372a06603ce6b71269ddbed8cbd0bceefd957f726ceac8a045f12f2a50e0f4ebdf47d4c60ef65716ba4bcc9eb6fc220a3670bff SHA512 ef938cb7c2b6cda12a68a874218d47acdee214530534114da6490475dd08e21dc4043c9a3f164074a8010e50d0a9c91b4fbabffdc8329700629407644fec46d4
-EBUILD gnatmem-2021-r1.ebuild 1025 BLAKE2B f876d02085fa88d7f367e70fbd3766b507fec9d436b64bf98d547a7ee56087661647349519383837066b831b1ea385abdb2113d6f91543a710eb11acf8747c59 SHA512 125ddaac78b6bb2c2c21cee6319a85d7754016e3133a066c1b2535c9995438fcca9777e77f5b254bad81f1b12fa3d4daaa7b97355a2351bc1c15fbc4e75bb33f
+EBUILD gnatmem-2021-r2.ebuild 1032 BLAKE2B 3e971e749e0b8f73c88d9fdd1eb9b481c63127e1030c708f184783fce1a50163adf627683a478a0af37d56e320d521f88072bacb45e8e32eb19f25409f9933cf SHA512 f1b12f3658dc0a0314ebc32a864bfd484f0a22ad6549b643b559328778c92f3edd762db62516429d0b57df87ae87f4a3bf81a02f03f40fd8302687e01951c297
 MISC metadata.xml 956 BLAKE2B 07881059585f6c26518d41c31bcbf7c271f7509ab2592bf46f1dff8817514c32521fa88d2aa901704ab5c494a1e072e0bab96517375687a1caf30310e526b7a9 SHA512 292041c6876b22abdecee29b525fbb9ccf2b9069e4c4dd5a22a051bdb69502b905951f235bb5423d834e70df2100153cf5e97c17aa855a12ad5dcf588ff33d8b
diff --git a/dev-ada/gnatmem/gnatmem-2021-r1.ebuild b/dev-ada/gnatmem/gnatmem-2021-r2.ebuild
index 386dd0de0d3b..e7399d18aa56 100644
--- a/dev-ada/gnatmem/gnatmem-2021-r1.ebuild
+++ b/dev-ada/gnatmem/gnatmem-2021-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-ADA_COMPAT=( gnat_2021 gcc_12_2_0 )
+ADA_COMPAT=( gnat_2021 gcc_12_2_0 gcc_12 )
 inherit ada multiprocessing autotools
 
 MYP=${P}-${PV}0518-19F7B-src
diff --git a/dev-ada/gnatsymbolize/Manifest b/dev-ada/gnatsymbolize/Manifest
index 4d65cb540995..97facf6bad9d 100644
--- a/dev-ada/gnatsymbolize/Manifest
+++ b/dev-ada/gnatsymbolize/Manifest
@@ -1,3 +1,3 @@
 DIST gnatsymbolize-2021-20210518-19D3B-src.tar.gz 14263 BLAKE2B b5f8c1829e42f9b2dee4cf3c74287a5c11eab90f1a1d2575cd42fe4ad2078b99a46c641ebbf747b02ed8f22dfcc83e76c60ebf07eb45e561175f480a5a056ca2 SHA512 c94b569733c596679f1422660af51b3c0ad5b6955727f6dc6a4b076b39b19fc13fb779b5610667a4c2c16abab08d2633785e184ad5e15037e66cd1c8e249c159
-EBUILD gnatsymbolize-2021-r1.ebuild 761 BLAKE2B 4f85fc6fee9054f4224d27bf95f2cfc1861859bd97088e58933d85eb5baca0fbadd371b5cc598d44bff8b3569852928fa54dfc7a532cc4d6f2c5068f9378dc11 SHA512 3794d5cfbf6819940058dda54b0bc936b49a0fb36b2af4e8253b6bcd50326c31e9ed134eece164ec40b69388064016c595234d3436e55f7f68f89b03c85d960a
+EBUILD gnatsymbolize-2021-r2.ebuild 768 BLAKE2B 0c5b311e98ca2f68ce2df5f43436b705935cf9a80e60e3b7691f4d02d1fa36ae04a1944bdbeb89faf205946394885bd1da523fa544a3aa7271dee386883feaf1 SHA512 76cb1463259330395337739ea2ee4f095e748766c5f713d44eb1c796425a56335f784c566a05741de297c8b293d6ea1bdffbf49c87d7934d1fda8e08968c6914
 MISC metadata.xml 391 BLAKE2B d9e0444e176d262c87f289990d11122e4a06bd7f17fdf65d4e24fd7d6f09d1f36ba05c4f9896d8428e089ca2d85a8366f2e834139dd48c5a3626d2e9f4aa11a5 SHA512 fa7efd43d05a874d3b1733ded27ff6cbb245b9c03e301bef82d2962fc5ae7a585d2e49b49e9ceeecb92bbc8a08fe18cfe6a50a7db060b85a2ba54c65e1e5eda8
diff --git a/dev-ada/gnatsymbolize/gnatsymbolize-2021-r1.ebuild b/dev-ada/gnatsymbolize/gnatsymbolize-2021-r2.ebuild
index 2c078f0f5630..9001083e1974 100644
--- a/dev-ada/gnatsymbolize/gnatsymbolize-2021-r1.ebuild
+++ b/dev-ada/gnatsymbolize/gnatsymbolize-2021-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-ADA_COMPAT=( gnat_2021 gcc_12_2_0 )
+EAPI=8
+ADA_COMPAT=( gnat_2021 gcc_12_2_0 gcc_12 )
 inherit ada
 
 MYP=${P}-${PV}0518-19D3B-src
diff --git a/dev-ada/gpr-unit-provider/Manifest b/dev-ada/gpr-unit-provider/Manifest
index c0f1c7e19c1e..9667f9838596 100644
--- a/dev-ada/gpr-unit-provider/Manifest
+++ b/dev-ada/gpr-unit-provider/Manifest
@@ -1,3 +1,3 @@
 DIST gpr-unit-provider-23.0.0.tar.gz 29171 BLAKE2B 11e6311cde8ef12174a90e2ba3063734903e367bd027c6b3edb5f43f5d498e90ba97c89634a9b1f176f15e4ed97f5962f1b786d7f86f9afaa19a4d5688194649 SHA512 b67f922e8460be69357da046d8c74bf580efa05498d4aee190d0a0ac1f69a5d111e85ca2f52562fbdd27c7a343d2cac777d86fb8b38b3fbd627e3b42afca36f9
-EBUILD gpr-unit-provider-23.0.0.ebuild 847 BLAKE2B 0926115b7482cb2a8608779f015e658fdea1d8696727b53753dac699492e2f30e22f76aa8c065c808d5aed2f45e3392f6f9adb280968df0d6aee6ca8207dea98 SHA512 080bdb5f9c0c975732c7c368ad8455588fc26599d991248d146677c910721770ead0aafd49f91f1c3ffe1038395400f54dcfc34fe5f0d061e2564b17f31ed1bd
+EBUILD gpr-unit-provider-23.0.0-r1.ebuild 854 BLAKE2B 72323711bea4949fe0e7d80c7448c5ac8fa8202c482ccdd28d894419af0033e2aa9f64bbf457269cc02c279d314906b06954230431eff8101493d0106396acb7 SHA512 683d02b774624fb8c1585c79bb9baee1b530b80aeabf7b7b2ec8005b4c8928aafc0ec15e870baa89292c99ba3955dc85df9497fa6d8fe0cfd2c6d1e7a9f0354e
 MISC metadata.xml 371 BLAKE2B 156ea654503bd3b01575f362111c4d6c14bdc5f5cccf9e50fcebf8506bf868cf4a4affd08714eab0a944393aa0c11ed3a2f0fe37fc313f9c50a47878238fd894 SHA512 9feb31be18599c694567a2f0912cf7e87e84309c65e3dc1bab32a84f70bbd15a22ab2e518ca24ae8eb55b944e4c6f4edc0543cb65ff5dfd408df97a44226ab83
diff --git a/dev-ada/gpr-unit-provider/gpr-unit-provider-23.0.0.ebuild b/dev-ada/gpr-unit-provider/gpr-unit-provider-23.0.0-r1.ebuild
index f87d5cb7242e..084362e47160 100644
--- a/dev-ada/gpr-unit-provider/gpr-unit-provider-23.0.0.ebuild
+++ b/dev-ada/gpr-unit-provider/gpr-unit-provider-23.0.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-ADA_COMPAT=( gnat_2021 gcc_12_2_0 )
+ADA_COMPAT=( gnat_2021 gcc_12_2_0 gcc_12 )
 inherit ada multiprocessing
 
 DESCRIPTION="GPR Unit Provider"
diff --git a/dev-ada/gpr/Manifest b/dev-ada/gpr/Manifest
index ef0cd2f9ef5c..6ffe3ea320d2 100644
--- a/dev-ada/gpr/Manifest
+++ b/dev-ada/gpr/Manifest
@@ -1,3 +1,3 @@
 DIST gpr-23.0.0.tar.gz 1005298 BLAKE2B 475ac5ad89a4d038dc8cdb953826f46e0f8f2bbf09a858366a634b5bacfc4b0282db4206cf5d113900dffd3c2ad9423b6c6e56de8058215a7946020c30dacc8b SHA512 f1cfd2c2162ffa984c62238a472438919c22a83b61e03c9234f6bc601c1d1e50981f52d024106ad5196dd83ee7686e864c8728c56d451be06baf96161afd8bcc
-EBUILD gpr-23.0.0-r1.ebuild 1510 BLAKE2B 0b941d1cca78a21af34d8d98846416429b26a4cfd7b4523727de8ce63887c601702ee9530834f4f1ee5393aa48d962df607534a595cb11f1e3b7cff4f1cad461 SHA512 9d590c9f8999a9adba938acc2979f9b29bfe271e5416c8f18121990ca82a93f93c9e2b28af5bba8423725d4f64df89ef117c203306583b2fb985438560566721
+EBUILD gpr-23.0.0-r2.ebuild 1517 BLAKE2B e602ca1c4fdb23753fefaf59c6716e80f96ed4f27fc8e1d0529d538dca13c56393e0398cc33794eaac4d0fa303d943476adb2ae716e46c6dfcbe3466758f979c SHA512 549b7cb5ac82fca950cdf546d01a977a26af46e470a87be6f3ed96e29857eb173ae59c1d44b1b77405e07fce9a428330e64cd95f0e7ff6137d92a8361385ca4c
 MISC metadata.xml 357 BLAKE2B c6eab7337743f6969c01915cefeb70482bca367bac4437612a496779cf32e602decab0761488aa9156c61102fa9875fa948840b44493634933cfbd6903132c6e SHA512 2b1b0517ac9d91a17d12dae70dd8caaec1d20819246cb49dcf4cb7244c13f43dda6bad1b8b7224ce9bb40f82c94186c1364848f182d3040d149591241643a0f1
diff --git a/dev-ada/gpr/gpr-23.0.0-r1.ebuild b/dev-ada/gpr/gpr-23.0.0-r2.ebuild
index 0d5a9aca1198..34bdf5824209 100644
--- a/dev-ada/gpr/gpr-23.0.0-r1.ebuild
+++ b/dev-ada/gpr/gpr-23.0.0-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-ADA_COMPAT=( gnat_2021 gcc_12_2_0 )
+ADA_COMPAT=( gnat_2021 gcc_12_2_0 gcc_12 )
 PYTHON_COMPAT=( python3_{9,10,11} )
 
 inherit python-any-r1 ada multiprocessing
diff --git a/dev-ada/gtkada/Manifest b/dev-ada/gtkada/Manifest
index e48f7d4fc25b..909d83e51e79 100644
--- a/dev-ada/gtkada/Manifest
+++ b/dev-ada/gtkada/Manifest
@@ -1,4 +1,4 @@
 AUX gtkada-23.0.0-gentoo.patch 2408 BLAKE2B 658863cebee256a7dc59f66cb852a5ab322291393e4a7a97b194d4724e0ae8dc01e048c7cd5ee375ea812d4b144216d2ab0487e278b32935aa772aa45e43d3df SHA512 8e84c77b45b97db1b60b830afb151bcdb76bac32585a5ba2131beb9f9252fba3b41b7b2fb03eb6c7e7714c5307faa189cee6c16529470780e66117f4d95682e8
 DIST gtkada-23.0.0.tar.gz 6045493 BLAKE2B 05efb40453aa6f3ebd3beaf3dd7915bc2cca8cfec211bc6ae2f0a7a15f16029b1142028422367dbd4f68e72e02b71c030eec39802b0f9202e411d611a1fe521b SHA512 ea5dffe4fe1b99cfbd952bace510aff9e0f79fe2fa075c299d12e68dfb43b6334df0d707631de30e6e2c3a80759d342b178e8ed29a82e90445e450cfd332767f
-EBUILD gtkada-23.0.0-r1.ebuild 1075 BLAKE2B 6d450bc33018b960b5385a40359301f8613825b9ca96bd091f9e012da2a6ba0ec18496ffc2d1a05f868316ff6a46d71281a58e4085bc375e5287dd821572da68 SHA512 14c609b15840de38b9006dfe1ad481f549a805a22c7964a429fbe9104538db25635455429306314ef4c2bb7afebdfb7a0cfa070873913594dc254a58c93093b2
+EBUILD gtkada-23.0.0-r2.ebuild 1082 BLAKE2B e1a9f3b0df55ef06ca2204983d720065736853e79cecbd25daa88867dce3185ac0aba039cddd16cb1553234ca7ae9140a58da34e006a7ff94d0d691160b3b321 SHA512 41d9f2ded58b8af722682721d7832681072a4fca1228f1f97b0bf85a3697c793e6d86bde73f8844f37f34485273526fe3fbd9dbdb48cba7f18237d77467e8319
 MISC metadata.xml 688 BLAKE2B d3ea42354ba10dd872affbaeb5a14833cc2254bed85f10e15871c8131a46d3f996948b2fffb9d9aa795c914e4e9dc5d3f34e86666a2526c566d4b03fa14bf121 SHA512 ce18831b728277d125cf4cd86522a238ec17f4cab007958212c95f3ee97fedbdb827749549e0ea4eff93dc74022d61515d116f3fe606db34496e9045b8c23778
diff --git a/dev-ada/gtkada/gtkada-23.0.0-r1.ebuild b/dev-ada/gtkada/gtkada-23.0.0-r2.ebuild
index db3837e5aaaf..a1d8afee6a4c 100644
--- a/dev-ada/gtkada/gtkada-23.0.0-r1.ebuild
+++ b/dev-ada/gtkada/gtkada-23.0.0-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-ADA_COMPAT=( gnat_2021 gcc_12_2_0 )
+ADA_COMPAT=( gnat_2021 gcc_12_2_0 gcc_12 )
 inherit ada autotools multiprocessing
 
 DESCRIPTION="A complete Ada graphical toolkit"
diff --git a/dev-ada/libadalang-tools/Manifest b/dev-ada/libadalang-tools/Manifest
index 54795c8d4c72..45d940d0c0a0 100644
--- a/dev-ada/libadalang-tools/Manifest
+++ b/dev-ada/libadalang-tools/Manifest
@@ -1,3 +1,3 @@
 DIST libadalang-tools-23.0.0.tar.gz 1101324 BLAKE2B 6bfa794a243126bc5b70b7ab89fd08c9591d009b2a6dc749298804699cec8a067c9babd38d31048eea31a625c6fd5a2a9f6e49cfd97fa371d46a975c5407a65f SHA512 922a0b72ac9fa2a7ce3fa70aa360e67c987ee4ddfb77199a8e63092df640f3d7dc8ebc01d88cce8b97ef91ed6af1fd3555fb7c223cdae91bbdda5e336b3d067e
-EBUILD libadalang-tools-23.0.0.ebuild 1682 BLAKE2B 2a3a075dd3c42b3c1fc4a8d21a4cedc52c824e24d01c3783711e6f013a1b912dcdfbe3e275f814ebaabbb550eb14089b8c988d6c673175532620456710c537e6 SHA512 aaa05af930a1a53ab5b3ae64b283826dd6586e55ac7ecbd9824febe83f215bace8ddad6810df2f4c677a472fb822f36c0d3585d306edf3f6d13b13ee24643a86
+EBUILD libadalang-tools-23.0.0-r1.ebuild 1689 BLAKE2B 6394920cffb3b63ec01faea34f93698d7700c82e7a910f23819aaf8dedd4df3e663399754529046e023eb179efc9131096f0f25b36d3fe8a41ace024d48db398 SHA512 7b0758dde4b9bb44944da0c9b73cee7d189260b06e9cf8ae0f1b979cd3e6a8d49d159b6ab96955c7beafd1cbcd19a127e5ad6ef62839daa5ec8c5a8b38a93a0b
 MISC metadata.xml 438 BLAKE2B f0d65575ba5329888a28fa4b9c2c68365db7e3e30c892889a30e7d0fa94e4de08ceab1c3ba61d8e4c6c39888304d5a674c15095fb223df11529abd1c8468aa86 SHA512 d32995545a62f04f3504f54868c58e8449d19e62bb06b7b63ce14596ed9ee78c5028111ea2111433c200068f69bac0bb3e37989a004e43e7e3f60d115ac498d5
diff --git a/dev-ada/libadalang-tools/libadalang-tools-23.0.0.ebuild b/dev-ada/libadalang-tools/libadalang-tools-23.0.0-r1.ebuild
index 5dbcf4d5336b..1c3558b0c3d6 100644
--- a/dev-ada/libadalang-tools/libadalang-tools-23.0.0.ebuild
+++ b/dev-ada/libadalang-tools/libadalang-tools-23.0.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-ADA_COMPAT=( gnat_2021 gcc_12_2_0 )
+ADA_COMPAT=( gnat_2021 gcc_12_2_0 gcc_12 )
 inherit ada multiprocessing
 
 DESCRIPTION="Libadalang-based tools: gnatpp, gnatmetric and gnatstub"
diff --git a/dev-ada/spawn/Manifest b/dev-ada/spawn/Manifest
index 22e9b83af9c1..c99479a6371b 100644
--- a/dev-ada/spawn/Manifest
+++ b/dev-ada/spawn/Manifest
@@ -1,3 +1,3 @@
 DIST spawn-23.0.0.tar.gz 43449 BLAKE2B b4a025784d7fb1248696081c128d415101cffca59f03edae3e3ca05c286390ca93a34c1284d1e4b23f8e57bfff274b87d977e5b7840c74049f6f66be89c9b9ac SHA512 440f8b8a45b7a322a5715a195f7e37e6f2641af8190166229e89a11ce6ab60511eb058432f4c3ffcdd670ec71b2509d5e23a80ac2e8dd6b7960bc42385bab86e
-EBUILD spawn-23.0.0-r1.ebuild 2700 BLAKE2B e97a4ee33cd034d0252287925961576b6a7b9d77b30db94bbf8df2ca2a8873fab69cd1157a8c01f2466961843249853db4a3b3a059252d13ca6627e30fadd18a SHA512 33cfd163d1243530dd727b82301086cfaca7cb7435f83c3962b797568ff5984b1601c13f166787d62168afcb89c6f3a7263a3257e46024addd3754bd0875cf98
+EBUILD spawn-23.0.0-r2.ebuild 2707 BLAKE2B 23732ee50578d6f892eed6cb3a8fc8d09ee7702db44279b0f847fabbc29f9ef99aa2c5504478b9ca962903d9c95ea5b6af050ff75dee32f4ed256fc451af45dd SHA512 119ce91fdecb46e2dd009906c1c33ce7af808d27f6a56b534014a8cd8a14d7cc94e604640a1b682b5375ba7679e43ecfa9e8660f8c32253ed8d13479cb00b721
 MISC metadata.xml 757 BLAKE2B ab129603cda705c21f84a789cd100d39186e06885589089320dfcfc0726cc913ad73784fd35e541ee0773c93e89bbd42965897b9bd921008cdc0fbdaffdaf64f SHA512 6124d3eecafe758ca841715bcead3b8d35d9af7bafeea8a967910156043c30b1902a521e7cf37c0a61283859797dc364580f2b84f6b597adeb81c25c98f3f9d2
diff --git a/dev-ada/spawn/spawn-23.0.0-r1.ebuild b/dev-ada/spawn/spawn-23.0.0-r2.ebuild
index bd3c6bcdcd39..427e8b54fe95 100644
--- a/dev-ada/spawn/spawn-23.0.0-r1.ebuild
+++ b/dev-ada/spawn/spawn-23.0.0-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-ADA_COMPAT=( gnat_2021 gcc_12_2_0 )
+ADA_COMPAT=( gnat_2021 gcc_12_2_0 gcc_12 )
 inherit ada multiprocessing
 
 DESCRIPTION="Simple API to spawn processes"
diff --git a/dev-ada/templates-parser/Manifest b/dev-ada/templates-parser/Manifest
index fe7fee362c27..36c6b9a5b04d 100644
--- a/dev-ada/templates-parser/Manifest
+++ b/dev-ada/templates-parser/Manifest
@@ -1,3 +1,3 @@
 DIST templates-parser-23.0.0.tar.gz 225459 BLAKE2B 0971030e3079ff93b876bcb51925208eeee63837878a24589700dc9e0c025272e2d7920f82ee9b769c04857e4701d3eed629a1ac1f0979714c47fc132a188bed SHA512 c0a94b42391c61b4251cbbe86f91c506f46f6eed5be3779385bf199cf43281b704c68fd078b8b917948675976538168c1ac4c1f3b757f6db9988a45af7bfc4a5
-EBUILD templates-parser-23.0.0.ebuild 1015 BLAKE2B d5204ad09021c99589d706228c3b3fe817c102f5a3f32a9dd4cf22ccc02610c564d65776be33d6b8bdfe601d683a5e9ddacd99b16ec9d6b846029fe153966abb SHA512 7b64c274335d2b0cec8efd2f0f88a7ea675d81fd681e09e5a93654a4698e0383f4f7a4956f684b27c5b5c0e1578e722524648ddaf08998ab09d56db0d43bb66d
+EBUILD templates-parser-23.0.0-r1.ebuild 1022 BLAKE2B f0c3c849480ea48549df7a9b983cfc6a6de8588c400211822b422163afe8e74b7776339b39f6d55fb5e12f027007e2be0c1fd37071b266d29640c73757449888 SHA512 4ef02c9280a6247fa2d4a05bce266cdac4a3da0386d5263ac42a7ec94fa6533f6a3e8761f48f6a45e621125c599f811bc2a56e97b297695d4af8876fddbef303
 MISC metadata.xml 370 BLAKE2B 69c033fb988741a15510bfa2550038d9618b0d062e289f529c60c513cc9e63d0cd721a1f48212602f90be74e2f08e806bf0a6745b2488cfd6dde600a10eaaca6 SHA512 5ecbbb2c164d96711c20aa96dfbec89c17516406a649e8d1afa68455e262800f43b3f3697d9715a371027a850e821fcf80deb4c3f64ae0ece72a20edb1577767
diff --git a/dev-ada/templates-parser/templates-parser-23.0.0.ebuild b/dev-ada/templates-parser/templates-parser-23.0.0-r1.ebuild
index 2a61873b68a9..02fcb5a6fcc4 100644
--- a/dev-ada/templates-parser/templates-parser-23.0.0.ebuild
+++ b/dev-ada/templates-parser/templates-parser-23.0.0-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-ADA_COMPAT=( gnat_2021 gcc_12_2_0 )
+ADA_COMPAT=( gnat_2021 gcc_12_2_0 gcc_12 )
 inherit ada multiprocessing
 
 DESCRIPTION="A template engine"
diff --git a/dev-ada/xmlada/Manifest b/dev-ada/xmlada/Manifest
index f9f16f05dc1a..60a8b62bd6a3 100644
--- a/dev-ada/xmlada/Manifest
+++ b/dev-ada/xmlada/Manifest
@@ -1,5 +1,4 @@
 AUX xmlada-23.0.0-gentoo.patch 1070 BLAKE2B 1894bf507add813229dc505c6300d475dfbad4a5f0dbcf957b211cf47f9f916d5656658eecd4892d10810d4e5c13cda00107d7a9fe591ebe8f4b5b3567a043c9 SHA512 c3fd4ee0d44df3ad836c6ca3a1e1ae3ee0c5962c8a628299134e6293bc8bdb0de3b98b43910940646c4384db985cf4a1fb47b50ac17a2d315bb1ee12a406e800
 DIST xmlada-23.0.0.tar.gz 1053370 BLAKE2B 4edf2244818d72d6fc760f60c8145f373e5445d1d245b20b605e21faa7eeefed7835db87c1fd1239008e75211a572294e1d8e35af16c2ba2631c02d1d3b6f52f SHA512 a0fb2a34ffb5edf408fbdc1a3d68511b5545a5ec8993251ba75d71dd2a197f14e187d08f8febd71cb23bbd694889a99941911386af8468c5eb3b11128555edcb
-EBUILD xmlada-23.0.0-r1.ebuild 2436 BLAKE2B 46829ef8dca9a3f03870e7cb69d43b18dae84d8dd70749a018e68b49ad858a82398e0996bac3e7f4172dd6005b14828d8dd6974413d39ec450a69643720980de SHA512 4cfdd83b004081152a60cc15c5c371252abfe145f61c386226154ce5e7402a672cf089305d7e4272ded6bbfef5851b12219fd77649c45494f4422c69eff55313
-EBUILD xmlada-23.0.0.ebuild 2427 BLAKE2B 03b77dda9a0df7f656771c1a5d9c835bff2e2d7b0a8b088ef09c8190810a7f2b366f216aa72286b5571650a61b2ecb059ab335aaf4374ff579f5b039d52bc636 SHA512 4dfbbc697010a8c2ee198eb8f93bbae27225e96386a5486aa0ffe6b95583cf6dbe2015a394d8fdabf36a6e1c774ec651cf4e0e01267dd35aa98781e431ca3352
+EBUILD xmlada-23.0.0-r1.ebuild 2434 BLAKE2B 2c3203518f150844d4e609741d16849c6957550d6d363bba3d015e83d56c9626771bf14b39365c97f981310e7ec9743fd450fe9491476a9c6281b4d1e12d965b SHA512 c41e9d4be113b7ff2e6853269713f982147761d0fc0558e435a3c9bc8a98c315aba2aa69c71cc5b1a6b81b528372189c3fcbc200b4b8051af20f78b0362d0612
 MISC metadata.xml 987 BLAKE2B 0cea4d25986c676a4418a482ece808fe48869771b7c021727b7b81785ae254d68eab90a6ba52e5a62b2fbf2ea2539103cfc4b4909ebc6c578c33d61d8b3bb16e SHA512 c578017e1aceb4e81669eb3a44cb7e154f5ef16e09b88de70c5fb4675619fbbbaa0260ad7e7ba7bf07a957e64ac9ee8dc172d91df9f8ee1801ff5e4787e09092
diff --git a/dev-ada/xmlada/xmlada-23.0.0-r1.ebuild b/dev-ada/xmlada/xmlada-23.0.0-r1.ebuild
index 67a8de7968c3..328b20e285c9 100644
--- a/dev-ada/xmlada/xmlada-23.0.0-r1.ebuild
+++ b/dev-ada/xmlada/xmlada-23.0.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+shared static-libs static-pic"
 REQUIRED_USE="|| ( shared static-libs static-pic )
 	${ADA_REQUIRED_USE}"
diff --git a/dev-ada/xmlada/xmlada-23.0.0.ebuild b/dev-ada/xmlada/xmlada-23.0.0.ebuild
deleted file mode 100644
index 6b274fccb9df..000000000000
--- a/dev-ada/xmlada/xmlada-23.0.0.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ADA_COMPAT=( gnat_2021 gcc_12_2_0 )
-inherit ada multiprocessing
-
-DESCRIPTION="Set of modules that provide a simple manipulation of XML streams"
-HOMEPAGE="http://libre.adacore.com/"
-SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86"
-IUSE="+shared static-libs static-pic"
-REQUIRED_USE="|| ( shared static-libs static-pic )
-	${ADA_REQUIRED_USE}"
-
-RDEPEND="${ADA_DEPS}"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[${ADA_USEDEP}]"
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-src_compile() {
-	build () {
-		gprbuild -j$(makeopts_jobs) -m -p -v -XLIBRARY_TYPE=$1 \
-			-XBUILD=Production -XPROCESSORS=$(makeopts_jobs) xmlada.gpr \
-			-largs ${LDFLAGS} \
-			-cargs ${ADAFLAGS} || die "gprbuild failed"
-	}
-	if use shared; then
-		build relocatable
-	fi
-	if use static-libs; then
-		build static
-	fi
-	if use static-pic; then
-		build static-pic
-	fi
-}
-
-src_test() {
-	GPR_PROJECT_PATH=schema:input_sources:dom:sax:unicode \
-	gprbuild -j$(makeopts_jobs) -m -p -v -XLIBRARY_TYPE=static \
-		-XBUILD=Production -XPROCESSORS=$(makeopts_jobs) xmlada.gpr \
-		-XTESTS_ACTIVATED=Only \
-		-largs ${LDFLAGS} \
-		-cargs ${ADAFLAGS} || die "gprbuild failed"
-	emake --no-print-directory -C tests tests | tee xmlada.testLog
-	grep -q DIFF xmlada.testLog && die
-}
-
-src_install() {
-	build () {
-		gprinstall -XLIBRARY_TYPE=$1 -f -p -XBUILD=Production \
-			-XPROCESSORS=$(makeopts_jobs) --prefix="${D}"/usr \
-			--install-name=xmlada --build-var=LIBRARY_TYPE \
-			--build-var=XMLADA_BUILD \
-			--build-name=$1 xmlada.gpr || die "gprinstall failed"
-	}
-	if use shared; then
-		build relocatable
-	fi
-	if use static-libs; then
-		build static
-	fi
-	if use static-pic; then
-		build static-pic
-	fi
-
-	einstalldocs
-	dodoc xmlada-roadmap.txt
-	rm -rf "${D}"/usr/share/gpr/manifests
-	rm -f "${D}"/usr/share/examples/xmlada/*/b__*
-	rm -f "${D}"/usr/share/examples/xmlada/*/*.adb.std*
-	rm -f "${D}"/usr/share/examples/xmlada/*/*.ali
-	rm -f "${D}"/usr/share/examples/xmlada/*/*.bexch
-	rm -f "${D}"/usr/share/examples/xmlada/*/*.o
-	rm -f "${D}"/usr/share/examples/xmlada/*/*example
-	rm -f "${D}"/usr/share/examples/xmlada/dom/domexample2
-	rm -f "${D}"/usr/share/examples/xmlada/sax/saxexample_main
-	mv "${D}"/usr/share/examples/xmlada "${D}"/usr/share/doc/"${PF}"/examples || die
-}