gentoo xmass resync : 25.12.2021

16 files changed, 68 insertions, 30 deletions

diff --git a/dev-ada/Manifest.gz b/dev-ada/Manifest.gz
index aa4d55d476d1..388bfcd41274 100644
--- a/dev-ada/Manifest.gz
+++ b/dev-ada/Manifest.gz
diff --git a/dev-ada/gnatcoll-db/Manifest b/dev-ada/gnatcoll-db/Manifest
index 7d927ae4357b..f7fb40b9439d 100644
--- a/dev-ada/gnatcoll-db/Manifest
+++ b/dev-ada/gnatcoll-db/Manifest
@@ -1,4 +1,4 @@
 AUX gnatcoll-db-2018-gentoo.patch 361 BLAKE2B c7b15cb7433a5bb0f9fee68df4594a390d8d77ccd027e583dd14037a7a1319e727c99fbf4dc81de97ff457f1e0f6b237d1436f6b336668aca956fc5c083cbab6 SHA512 4d90c530bfa6948282c61c6df92a32aa8e03fa794768568ce10dda9a43cd3b56970761a0bd30913ae51f0a2605f2bc0ecc2124561982c7951985c35a974264e7
 DIST gnatcoll-db-22.0.0.tar.gz 2648812 BLAKE2B 5c1be4fb9973aa99ecdc37ca0335981f61581c8d3548d70a0c5ed2c3da8279abf36a204e5f7747a2c3d14648ee33438f027230eba105964c8042aa73b4b57f1a SHA512 a3baf3e2bf09b0407f3ac1323824da54998b79008cb7c2bc3a054e275d7071fd21f364f38b98bda97da9e07ce186e9a1c3bf1bcc25a347e8dc6f64e3f4de65fe
-EBUILD gnatcoll-db-22.0.0.ebuild 2818 BLAKE2B bb1ed64b7d8e7bfd667d787780c4ad3ff67205494421ce681fb31a29cd03f4a1938a50efff4ed7ade6e4126003464d3ae962cd6b7c3dc38b0382919ec3a9de57 SHA512 d51714e0fd5904799bb9b662d25ea5740b24f5cc4011febc6ef889a57d3e1cd9bbac98a61b410da9602435b208a2712e978d435f9043de776631e1f436044394
+EBUILD gnatcoll-db-22.0.0.ebuild 2908 BLAKE2B 18359bf6454e6bb1d31e99f57755a09e5c2dc8d29c2f6965c4560cdac274b3d1bb2ab3fda827acc9ba4c2a637719a8aff1d6490ee38c01d88d9d7333e0f98619 SHA512 d5a634b706b4dbb52bca4b25536941821751b2d0ffbffc785e0bce9f280ade937f1a93acb32698d8873ceb4b5cf8b46f737cfa9ff3fc73f56f2949933357c344
 MISC metadata.xml 1274 BLAKE2B 4ad9306fe74b983dfc03d23ed61bb9dab8791169bbb33e316514ad6a59ec3b947fade3b61455e8554f1af4721f5647afd9649d06b721349024c0ef2d02de87ba SHA512 bd09add1cc91e61e428a05bcafdbbb23c39bcfab58e42a2e46fd8d6b1df16af2b65ea78bf5a21b74509ed3e498ef257f263c30412e2de7457bb850b5d93be169
diff --git a/dev-ada/gnatcoll-db/gnatcoll-db-22.0.0.ebuild b/dev-ada/gnatcoll-db/gnatcoll-db-22.0.0.ebuild
index 34abd0292198..71c9e6e6a913 100644
--- a/dev-ada/gnatcoll-db/gnatcoll-db-22.0.0.ebuild
+++ b/dev-ada/gnatcoll-db/gnatcoll-db-22.0.0.ebuild
@@ -34,6 +34,8 @@ REQUIRED_USE="gnatinspect? ( xref )
 	sqlite? ( sql )
 	db2ada? ( sql )
 	postgres? ( sql )
+	|| ( shared static-libs static-pic )
+	|| ( sql sqlite xref postgres gnatinspect db2ada )
 	${ADA_REQUIRED_USE}
 	${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-ada/gprbuild/Manifest b/dev-ada/gprbuild/Manifest
index 6149673f1261..feeee00e6acb 100644
--- a/dev-ada/gprbuild/Manifest
+++ b/dev-ada/gprbuild/Manifest
@@ -1,13 +1,14 @@
 AUX gprbuild-2021-gentoo.patch 11690 BLAKE2B 95762ee60f74dc15c0a513e03979803bfecd93bc0b9ae9c031ce741f16664157384163f506bd5c8735e25b81fc9aefd5e454a053f598c5f6a789fc81c47ea8cc SHA512 158fb122afe5df9d712706af0c87a1cb0c4d34cbeb93516d4b59c9ab40f714536fe878b067f2d1d2a7db12066bb54a21f332c2f035430927970cfca8f7a5d82e
-AUX gprbuild-2021-nm.patch 421 BLAKE2B 44b6166e3102df7eafa8af168701d09e2680a91c28cd808414a1073eb84ebfe0c6dc98c53886020d8acb27369b45f5897c7a1f236ad6dfe32ad6feaf0beac76f SHA512 49cf35270e29e3292ac95b23d117aeb3ed1d3ee8c2a9a174a8ba2a2e7270fa56cad2a3edbc548731f2ec8c66d8327ec754fcdb2a6f2e17220d6c649f20741e3d
+AUX gprbuild-2021-nm.patch 438 BLAKE2B e680ab2e110805de9ebe121c21364c3fb65e871a800a22ac863e5f3f42513929a9d1c5868e598312b72bfd14c76a4f118535f767b5dd7b79e019607a909cfc8e SHA512 7f2a1ee48c005aa20da779c87d2b00b3bdde1357d7e83094090f162441a03f890d6625121b3d9dcba5a0fbb76ca8bc3803f2a21a998a25a2b9bb882413d51011
+AUX gprbuild-22.0.0-ar.patch 468 BLAKE2B 8cf38d8632123623ff369e6bf0d96c9ca37e828e71e8445ac46ccfb1636ae8676146a61934c0db915c5b1235a4b9bdc899502b3c71cabae2dae2b69082c87b4e SHA512 e1d66c86b1eeea36a84114bf4993eceeef64541c207d8e11318d842648eaead40675f90b2d16ddb27a68088d6f6bcf4b803c5f8b8c282e73453f76f9b99eb773
 AUX gprbuild-22.0.0-gentoo.patch 11712 BLAKE2B 77088bba7bc022db46e122ea20af0372c7cde4acb4fb4991313306f8e179910ccc428933f04c78cc57f78ae9b400dbfdddd59328c8e454a40fadde2fdea035a3 SHA512 af8eb69a437b18ce9924f922b4ed1b9a09caf83015936e546e673abd908dc30ee16a94c39b9e45507d9a11e126091e35a6eee78f9d513517e7782fd407b288ed
-AUX gprbuild-22.0.0-nm.patch 393 BLAKE2B 2ad3e37a5f62e47c2049f88cc0d2378287ec7d33521de73d2680f2b01770b7856bed7dfec26c61a908f68b742caa57405768e7f5881f93efca9ede4ac6ce17a8 SHA512 9011cda1b306647e1d1f38a2a19b601065683ccbce253be0e9c7ecf6dd261b15a9936ec6d619bf71650d8fa5cf6103a1f35d9b0d1dbf0b4d2938cbb5d19a35e7
+AUX gprbuild-22.0.0-nm.patch 410 BLAKE2B 71e0a87cce757f934392188d26b7b2e1a8d2adb84afd1ef775b547c90af38eb9390472df593456ff1bb8e29b2959cfd58ceeb91d33154d026efbf08bb3c7b16f SHA512 d560bf2a969018b81deb787e158bd7e408d07138f468ad29fd0d2aae9ea3c9c10d88a3da538b65274e1aa665047b16c86f679d8f5ea5a4f4613b14f588fc6974
 DIST gprbuild-2021-20210519-19A34-src.tar.gz 2572773 BLAKE2B 42244b96b48a10795812865a430a92a75f3e6a58f384a72e6941945707e712d239f2350e00bd94e6161fb19c6469197547f4ddb565e860ae1d08573b7c667997 SHA512 f2fd10cdf8bd2ae553184104a8d29ddf884329946c55e1a199d49358151e9f1ea25f6566d6e00d15e07d26ea4e84377f4ee137a9af4eecb862fc825dd987ada8
 DIST gprbuild-22.0.0.tar.gz 945311 BLAKE2B 4573855667fe6c352a61ac2fd8218619e0c9fa5c5079fe6854988733b7dac27225177f550b58b8d596516e8d3bf9a279f44864fdcb00514ee9e5776415c78f2d SHA512 7e77d9441454670a7b3b14cff97339e654bb82e7321abd9d612a771e1559f3276057e5163b50ca08b6ab77ebb9fcfd36590ba3c9cfd28d07fce43c7673ad254a
 DIST gprconfig_kb-22.0.0.tar.gz 40598 BLAKE2B c0b18078ac3384de9bb503f78a1bb39a486b5ae899ad1ab135fa05da414eb6a55b5b7156bb4fc60a34c0d085b33af13ef2e0ec46840ad43ca63c387863ae6eac SHA512 69f8490af56b0e07afbfef51c12cd6361a00327af774cd0deacf8260ccc4782e1e8465a074e8a025024570ce43ba1b4b3adfbde9ae4ea372e487d342da6994d4
 DIST xmlada-2021-20210518-19D50-src.tar.gz 1555951 BLAKE2B 589815d4781471a48d3bb4a12475762cb2ba8f885df8ea774f009c8be9ded41bccc414bb88a2b3d313701b0b2edefcd065fac8a13d208a7bb1679a3467a60c35 SHA512 e2fb1a87cb0cebae842f87412d0ccc8a18b20e5e2c4e3d9ad6ec3a6ae18e4e53c12efd9ea3f2515baa5bfec2b4ddee7808385cc471e3cca9b8c4be3d03093e85
 DIST xmlada-22.0.0.tar.gz 1022947 BLAKE2B cea409a45a3b0c8eba48f858278d4e7129eca2e77fa749f5a761e31a81834efba67223f07c99441a9673a8f6de9a608a12cf610225ca5aee7fbde0235d9af1d9 SHA512 7e8a0cab2f4c300fe3b0d31e00d17334e36798430e49868448caa696044964464f558cffba8f35e35a58b097c968322891119b2abd9f210737ca877f0189f32e
 EBUILD gprbuild-2021-r1.ebuild 1938 BLAKE2B 058a58dbd77220c11c1627867c758dec00df0727b4d2a9d2ebb94db71e466d39821b7bd084ffcaca41808f0dba30b4227f3353892206d9ef58cd9a89c513acad SHA512 7e825debb60ef8f8c9936ea1a3b8b8ca6987aa201c219ce18c404616150035e46a8860ce2a16a0db9d84b660c4bd62fcec6f4e5b858da532d8735040eebcb6ec
-EBUILD gprbuild-2021-r2.ebuild 1970 BLAKE2B 502e146075d047a5b492f2f35503937e3e1f765637f63d8dbd42d3f9c2eceb1f541c73249c1f008c7de621ee7de3ea85aa2ea82bc174b81e1716ee7c12161802 SHA512 4581ff1adedf9ba53b3740a3dc6f7dd203f560f9723483b9c70c17e040c674f3f1d88744c2a28b35991bdc86416bc6c9a955c72062e7b08712c048c2fdeef839
-EBUILD gprbuild-22.0.0-r1.ebuild 2089 BLAKE2B 45dce3b479724a520aaea113d57eec8faa64f3c667c679d213b41a888be4ae887827acb24e38ea3b0f58a8175b4a512ab82ebc085ab362905e3db131e60cb7f2 SHA512 93404c1f91686ff58dc380634999c73bdfc2174bd13eb186b0245e86ded86c9a8676251c71353670481a9731c458a4324d9a0b8976cb1050c46e45f6fd6d767a
+EBUILD gprbuild-2021-r2.ebuild 2007 BLAKE2B 69fff8e5b76aa67822269d7b15f4d4c1aafd5ab90dec76719965204b9c5b0fcf41097522f17caf65a2e55eb172731ed44ebca5b51566c5464e62335f2b349159 SHA512 a5f9976cc00148098fac0e6c56387821c842e5e0150590468e7edb162f643788475e4f7ceb7dcb192368dba0d10380e7f860bb8d8bc575e79ee9e500bf4f8145
+EBUILD gprbuild-22.0.0-r1.ebuild 2118 BLAKE2B 1740daa9ef09b57b8b8833f348392be26cd43cbc381bc8a4b80287bff976eed77dd0e3613b4f45152b910389d9f8952ba9a7a22dcdd745d522e72fd20164022c SHA512 f1940bac00deb3a0c00c368fa7ced127d7ee4e4be33a7d4bc045ca5323f8a22bf476a475e5d0eb7ddeb22172111fabf40a11e8d9a89200403ee180539fe44533
 MISC metadata.xml 888 BLAKE2B 635ae939acfcaa26b0ba80341ed90cb02d8c5a2cfa50ca78bbcf19bd3081cf434a51ef1b05547bc80f9174db1aabfad1bde6270c3c08ea4c119684a4af7d5e4e SHA512 65b9e30e2b0d5694fe31c244eeca739327274beda743330edb8f85f050a7f9c809cfb3a115b4f9349f282fc39de36f934354db864669f515da746cd9551b5337
diff --git a/dev-ada/gprbuild/files/gprbuild-2021-nm.patch b/dev-ada/gprbuild/files/gprbuild-2021-nm.patch
index 2bf41a8e1b07..9fcab1565857 100644
--- a/dev-ada/gprbuild/files/gprbuild-2021-nm.patch
+++ b/dev-ada/gprbuild/files/gprbuild-2021-nm.patch
@@ -1,11 +1,12 @@
 --- a/share/gprconfig/linker.xml	2021-12-21 21:36:45.306813518 +0100
 +++ b/share/gprconfig/linker.xml	2021-12-21 22:20:21.642668870 +0100
-@@ -128,7 +128,7 @@
+@@ -128,7 +128,8 @@
        <host name="^i686.*-linux.*$" />
      </hosts>
      <config>
 -   for Object_Lister use ("nm", "-g");
-+   for Object_Lister use ("${HOST(Ada)}-nm", "-g");
++   NM := External("NM", "nm");
++   for Object_Lister use (NM, "-g");
     for Object_Lister_Matcher use " [TDRB] (.*)";
  
     LDFLAGS := External_As_List ("LDFLAGS", " ");
diff --git a/dev-ada/gprbuild/files/gprbuild-22.0.0-ar.patch b/dev-ada/gprbuild/files/gprbuild-22.0.0-ar.patch
new file mode 100644
index 000000000000..6a9513473bf9
--- /dev/null
+++ b/dev-ada/gprbuild/files/gprbuild-22.0.0-ar.patch
@@ -0,0 +1,12 @@
+--- a/share/gprconfig/linker.xml	2021-12-22 22:40:42.611766036 +0100
++++ b/share/gprconfig/linker.xml	2021-12-22 22:42:28.839096356 +0100
+@@ -877,7 +877,8 @@
+       <host name="^x86_64-.*linux.*" />
+     </hosts>
+     <config>
+-   for Archive_Builder  use ("ar", "cr");
++   AR := External("AR", "ar");
++   for Archive_Builder  use (AR, "cr");
+    for Archive_Builder_Append_Option use ("q");
+    for Archive_Indexer  use ("ranlib");
+    for Archive_Suffix   use ".a";
diff --git a/dev-ada/gprbuild/files/gprbuild-22.0.0-nm.patch b/dev-ada/gprbuild/files/gprbuild-22.0.0-nm.patch
index 4455e8befffa..062d7960fce7 100644
--- a/dev-ada/gprbuild/files/gprbuild-22.0.0-nm.patch
+++ b/dev-ada/gprbuild/files/gprbuild-22.0.0-nm.patch
@@ -1,11 +1,12 @@
 --- a/share/gprconfig/linker.xml	2021-12-21 22:36:01.054738486 +0100
 +++ b/share/gprconfig/linker.xml	2021-12-21 22:36:59.973738600 +0100
-@@ -128,7 +128,7 @@
+@@ -128,7 +128,8 @@
        <host name="^i686.*-linux.*$" />
      </hosts>
      <config>
 -   for Object_Lister use ("nm", "-g");
-+   for Object_Lister use ("${HOST(Ada)}-nm", "-g");
++   NM := External("NM", "nm");
++   for Object_Lister use (NM, "-g");
     for Object_Lister_Matcher use " [TDRB] (.*)";
  
     package Linker is
diff --git a/dev-ada/gprbuild/gprbuild-2021-r2.ebuild b/dev-ada/gprbuild/gprbuild-2021-r2.ebuild
index 40a16cb9b2d4..8bfc6af4419b 100644
--- a/dev-ada/gprbuild/gprbuild-2021-r2.ebuild
+++ b/dev-ada/gprbuild/gprbuild-2021-r2.ebuild
@@ -32,6 +32,7 @@ REQUIRED_USE="${ADA_REQUIRED_USE}"
 PATCHES=(
 	"${FILESDIR}"/${P}-gentoo.patch
 	"${FILESDIR}"/${P}-nm.patch
+	"${FILESDIR}"/${PN}-22.0.0-ar.patch
 )
 
 src_prepare() {
diff --git a/dev-ada/gprbuild/gprbuild-22.0.0-r1.ebuild b/dev-ada/gprbuild/gprbuild-22.0.0-r1.ebuild
index 2a07d5e4d71d..06eb16e01235 100644
--- a/dev-ada/gprbuild/gprbuild-22.0.0-r1.ebuild
+++ b/dev-ada/gprbuild/gprbuild-22.0.0-r1.ebuild
@@ -31,6 +31,7 @@ REQUIRED_USE="${ADA_REQUIRED_USE}"
 PATCHES=(
 	"${FILESDIR}"/${P}-gentoo.patch
 	"${FILESDIR}"/${P}-nm.patch
+	"${FILESDIR}"/${P}-ar.patch
 )
 
 src_prepare() {
diff --git a/dev-ada/langkit/Manifest b/dev-ada/langkit/Manifest
index 401c6ae9522e..c103485976f8 100644
--- a/dev-ada/langkit/Manifest
+++ b/dev-ada/langkit/Manifest
@@ -1,4 +1,4 @@
 AUX langkit-22.0.0-gnarl.patch 349 BLAKE2B f26ff18ef2176a9e5f277e510202c3d87f2e40d29054d78b0d531d22c769ed2c18319dc0198a3f79a048a9f26027710334d80957f635ed05427581245b4d4525 SHA512 9f979f63839fb56a0536bf045b859fadb917177e587debe23c2e142fc05d78b06114e6c93125633aa244ac8e4e8965ce66336eb71099890d063353954c2120d9
 DIST langkit-22.0.0.tar.gz 1008946 BLAKE2B 2b4ee37c9af1c95f9a6e9ad81f37b6bb112d5bd70f36b78e95d969580eacc1101b824ea24de39d04ccf8bc9f9850906fa1c660a29de05e90d12106b10792c37d SHA512 4c6207b650ae8352c65f3edda3192fc66c9b5d2c351665d78ca83b549960a0a41e7828e8974cb8daa3c415281b50253aa15a247407bcedc2c13e573aaa804909
-EBUILD langkit-22.0.0-r2.ebuild 2191 BLAKE2B dce7e7b59ee4227b247d146bcbf8bc113bf8eaece04f660dd6e99a656d8daf63c7dabefecbf9d0e61b30d8936f3f02303ed8c4edbac739c5ae8982751bd5b0a5 SHA512 8d90a2b168d72a868f398b4d5924bcb536f44ebc2873242d773ae574e8f8462a2da1e88707b833228b93d4dbd01968340544f412ad7afb3c08d7f3deaf3ccf41
+EBUILD langkit-22.0.0-r2.ebuild 2272 BLAKE2B caea170c1de4c3000e3fc1a5dae6303a11f61b44bc9ab86c58ba5d006381f58db56accb8df32df07501e1bd629020c93b18911fdbd6d0a629beb9c8d5f43483b SHA512 7a7fc6a299f41c0479d6b151465a7ebb50be1d734a01511b1c311ae20c8f82fffd867a6e5636df89946a1b9b285bbbb275a657035b3272fd1ddb5d0b89b82a4a
 MISC metadata.xml 849 BLAKE2B 3d15fb84d68db223622feaffb842e571591ec11e1ac4931d0baecc10b8c58e065283e56bac2be2297c5cd79fb04560ddfafb43fda6bb07b8b738d3c32786e4f5 SHA512 956aaa0b8446a30d6808a066716cf9572d44da813530eb3e5fe28b181b3579b3056b3429856146dae0ca8fb8e4787ee2b83d2d4ce2df9a06d3e835620289bb76
diff --git a/dev-ada/langkit/langkit-22.0.0-r2.ebuild b/dev-ada/langkit/langkit-22.0.0-r2.ebuild
index 4e998a1d09a8..ba69bb3b62b6 100644
--- a/dev-ada/langkit/langkit-22.0.0-r2.ebuild
+++ b/dev-ada/langkit/langkit-22.0.0-r2.ebuild
@@ -4,9 +4,10 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{8,9} )
+ADA_COMPAT=( gnat_202{0,1} )
 
 DISTUTILS_USE_SETUPTOOLS=no
-inherit distutils-r1 multiprocessing
+inherit distutils-r1 ada multiprocessing
 
 DESCRIPTION="A Python framework to generate language parsers"
 HOMEPAGE="https://www.adacore.com/community"
@@ -18,10 +19,12 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64"
 IUSE="+shared static-libs static-pic"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	${ADA_REQUIRED_USE}
 	|| ( shared static-libs static-pic )"
 
 RDEPEND="${PYTHON_DEPS}
-	dev-ada/gnatcoll-bindings[gmp,iconv,shared?,static-libs?,static-pic?]
+	${ADA_DEPS}
+	dev-ada/gnatcoll-bindings[${ADA_USEDEP},gmp,iconv,shared?,static-libs?,static-pic?]
 	dev-python/mako[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
 	dev-python/funcy[${PYTHON_USEDEP}]
diff --git a/dev-ada/libadalang/Manifest b/dev-ada/libadalang/Manifest
index 2be3d38c3b93..b74dae647bf8 100644
--- a/dev-ada/libadalang/Manifest
+++ b/dev-ada/libadalang/Manifest
@@ -1,3 +1,3 @@
 DIST libadalang-22.0.0.tar.gz 2364531 BLAKE2B 3992baa7180dce696b2c8aa0d451117a12b90072e83274d96a8d971b627c82bc66c5c21fa1eb6dbdd7ce95e0264852c5702b3d7c90f7bdf093915178e0a4a659 SHA512 b874feb102fe221595ad4b9b95b3ea4c6593686f96097ace17ad3c57534dc801000819de0cf898489e3407fd201eb003dd75f4f743a53dfb76cadfa6c727d789
-EBUILD libadalang-22.0.0.ebuild 1957 BLAKE2B 4999606ed4a57777271770236b789d39a139001f13ec785aa3fde289f5832d1351734e45c8f1a44408b1e205c20329aa7c3820612b584b0e8a6f2d61d7c5e382 SHA512 604b37d5fdbc13098ce96945cbbfbc9cc45d1c6dce40bb4a83ae9b503387b0509d74c98c2f4938b6e4fc83f2143a775b2330890e7b58880965a9ef6dd55aadff
-MISC metadata.xml 642 BLAKE2B dbc4f55e5c9dc5fa56d8069493d9fed5041e66e18820b13492d313fb8dbfdfe4d371808ba5f8b614643696505ba8d4dd2804f9ee6047bfd037ea89716c42bea4 SHA512 b8bbf822ce38430142160564385df61f4c85e834109a675fff438771a2aed6843d1d00f6ea6392fbf055719378caf3bc0c40bb2ea25f00f784b000d5b49bc0b9
+EBUILD libadalang-22.0.0.ebuild 2317 BLAKE2B 08bcf967bc32983d252806c96d5a1b22e42f622c637db3e4f4ec7c0d21ed90e74e060a337c9ba744d134e5e6355844b8ddf57ee477d6dc4b9631231f52347a0d SHA512 3ad37b2fa779a44f4c5c3f7dd6cd237bcebf001f0ce1f017a69a3c767075db57ccf087df75aba4253f2cd718c2091ac31ed0573360b3577938d65cdfa13a43f5
+MISC metadata.xml 592 BLAKE2B fc665edfcdf96b77b66c142493ca9f950c0824423c26d4508a79f49ad9836de64ae7d1ad826dafd0a7fbdb2483f717351b41098295e7a628be28183c2b35b613 SHA512 64893c482867850f503bbd2a247604df275951d052a8b05f463d7198e8351f9a1ad5d1d9757a40e50d66373c91c0a6e965fc9c51d9218989ac5efd4cca35d32f
diff --git a/dev-ada/libadalang/libadalang-22.0.0.ebuild b/dev-ada/libadalang/libadalang-22.0.0.ebuild
index 0af159f8bff5..fb13c72f8afe 100644
--- a/dev-ada/libadalang/libadalang-22.0.0.ebuild
+++ b/dev-ada/libadalang/libadalang-22.0.0.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 PYTHON_COMPAT=( python3_{7,8,9} )
 ADA_COMPAT=( gnat_202{0,1} )
 
-inherit ada python-single-r1
+inherit ada python-single-r1 multiprocessing
 
 DESCRIPTION="high performance semantic engine for the Ada programming language"
 HOMEPAGE="https://libre.adacore.com/"
@@ -16,18 +16,18 @@ SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
 LICENSE="GPL-3 gcc-runtime-library-exception-3.1"
 SLOT="0/${PV}"
 KEYWORDS="~amd64"
-IUSE="test shared +static-libs static-pic"
-REQUIRED_USE="|| ( shared static-libs static-pic )
-	${PYTHON_REQUIRED_USE}
+IUSE="test +static-libs static-pic"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	${ADA_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
 
 RDEPEND="dev-python/pyyaml
-	dev-ada/gnatcoll-bindings[${ADA_USEDEP},gmp,iconv,shared?,static-libs?,static-pic?]
+	dev-ada/gnatcoll-bindings[${ADA_USEDEP},gmp,iconv,shared,static-libs?,static-pic?]
 	${ADA_DEPS}
 	${PYTHON_DEPS}
+	dev-ada/langkit[${ADA_USEDEP},shared,static-libs?,static-pic?]
 	$(python_gen_cond_dep '
-		dev-ada/langkit[${PYTHON_USEDEP},shared?,static-libs?,static-pic?]
+		dev-ada/langkit[${PYTHON_USEDEP}]
 	')"
 DEPEND="${RDEPEND}
 	dev-ada/gprbuild[${ADA_USEDEP}]
@@ -37,6 +37,7 @@ BDEPEND="test? (
 		dev-ml/zarith
 		dev-ml/camomile
 		dev-ml/ocaml-ctypes
+		dev-ada/e3-testsuite
 	)"
 
 pkg_setup() {
@@ -49,32 +50,48 @@ pkg_setup() {
 	if use static-pic; then
 		libType+=',static-pic'
 	fi
-	if use shared; then
-		libType+=',relocatable'
-	fi
+	libType+=',relocatable'
 	libType=${libType:1}
 }
 
+src_prepare() {
+	default
+	rm -r testsuite/tests/misc/copyright || die
+}
+
 src_configure() {
 	${EPYTHON} manage.py generate -v debug || die
 }
 
 src_compile() {
 	${EPYTHON} manage.py build -v \
-		--gargs "-cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS}" \
+		--build-mode "prod" \
+		-j$(makeopts_jobs) \
+		--gargs "-cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS} -largs:C ${LDFLAGS}" \
 		--library-types=${libType} || die
+	GPR_PROJECT_PATH="${S}"/build \
+		gprbuild -P contrib/highlight/highlight.gpr \
+		-j$(makeopts_jobs) -v \
+		-XBUILD_MODE=prod \
+		-XLIBRARY_TYPE=relocatable \
+		-XXMLADA_BUILD=relocatable \
+		-cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS} \
+		-largs:C ${LDFLAGS} \
+		|| die
 }
 
 src_test() {
-	#eval $(${EPYTHON} ./manage.py setenv)
-	${EPYTHON} manage.py test --restricted-env -j 1 |& > /dev/null
-	${EPYTHON} manage.py test --restricted-env -j 1 |& tee libadalang.testOut
+	${EPYTHON} manage.py test \
+		--build-mode "prod" \
+		--restricted-env -j 1 \
+		|& tee libadalang.testOut
 	grep -qw FAIL libadalang.testOut && die
 }
 
 src_install() {
 	${EPYTHON} manage.py \
 		install "${D}"/usr \
+		--build-mode "prod" \
 		--library-types=${libType} || die
 	rm -r "${D}"/usr/python || die
 	python_domodule build/python/libadalang
diff --git a/dev-ada/libadalang/metadata.xml b/dev-ada/libadalang/metadata.xml
index 217288dff7b1..7752dcfa6bda 100644
--- a/dev-ada/libadalang/metadata.xml
+++ b/dev-ada/libadalang/metadata.xml
@@ -5,7 +5,6 @@
 		<email>ada@gentoo.org</email>
 	</maintainer>
 	<use>
-		<flag name="shared">Build shared library</flag>
 		<flag name="static-pic">Build static library with pic code</flag>
 	</use>
 	<longdescription lang="en">
diff --git a/dev-ada/libgpr/Manifest b/dev-ada/libgpr/Manifest
index ef55d2a56d3d..b39568025164 100644
--- a/dev-ada/libgpr/Manifest
+++ b/dev-ada/libgpr/Manifest
@@ -2,5 +2,5 @@ AUX libgpr-2020-gentoo.patch 321 BLAKE2B fe3affe50712460474125d074936fd9db526c43
 DIST gprbuild-2021-20210519-19A34-src.tar.gz 2572773 BLAKE2B 42244b96b48a10795812865a430a92a75f3e6a58f384a72e6941945707e712d239f2350e00bd94e6161fb19c6469197547f4ddb565e860ae1d08573b7c667997 SHA512 f2fd10cdf8bd2ae553184104a8d29ddf884329946c55e1a199d49358151e9f1ea25f6566d6e00d15e07d26ea4e84377f4ee137a9af4eecb862fc825dd987ada8
 DIST gprbuild-22.0.0.tar.gz 945311 BLAKE2B 4573855667fe6c352a61ac2fd8218619e0c9fa5c5079fe6854988733b7dac27225177f550b58b8d596516e8d3bf9a279f44864fdcb00514ee9e5776415c78f2d SHA512 7e77d9441454670a7b3b14cff97339e654bb82e7321abd9d612a771e1559f3276057e5163b50ca08b6ab77ebb9fcfd36590ba3c9cfd28d07fce43c7673ad254a
 EBUILD libgpr-2021.ebuild 1493 BLAKE2B eeb451a646144b39ef218eaa5ec0c19fe8e7eef2cc94c761affff9c1fbf27488fb5e018ff432b599b76ab1d5684b993a6585068366b3bc3ffb1853b0b0f2ad68 SHA512 b63cf83d90ccd3d62caa1e758bfe03b2bf5aab199086645817432680bea73625ea3bcfbf2d140d11fd867becd966920f02084dad699e3cb6ddbb7102933f01ac
-EBUILD libgpr-22.0.0.ebuild 1427 BLAKE2B 19b871994f92f324610bddc71b7ca0a124de1c6a4b25b4995f870bf4556c5d5ac20fc263af1bbc61fd5696ede4886e34af9fefadd052de29e4cf0f748d5bf3d7 SHA512 eb170f793c8008e7629fdd2489e3c2eb39c7e8a563f396db7e3acdb613a16863593814f380d8afc99b751ecc4a23e0f1a8196855be782b2015d2795caa0f8ee6
+EBUILD libgpr-22.0.0.ebuild 1422 BLAKE2B af1ff166e220abc906168b9f902a3edbc13323d7029ecfadeb1504e2f0cd1a20a8eb88c7baaf9288e8b763c471bcd312b4510a2d575a14e05f60952c04a516e6 SHA512 0efc8da09a1736fe55e9d202dcde3211bd8baee1ac679956ab53d0a035d93934bf1ea8440e5d8e43d7b846d0f0c04b52825ce846fcccfdc0e652db5bcbbb1c5b
 MISC metadata.xml 940 BLAKE2B aaa252e5e7455d29591e45927ccbefc9f7a21367af3f1da9a9341695f722dc6cfbf7f52ea6630e392439684fc8ecba06f2de6372c6624c2f53b2712533772490 SHA512 8bc90bfb6ae6ed3847b8809ef1e1d35ec8a1abf4a0b0353dac86c62c5fe5593a9523984988b723a3f9c9424285b2ab30bd45ef3b746956bc8be7751b63a35704
diff --git a/dev-ada/libgpr/libgpr-22.0.0.ebuild b/dev-ada/libgpr/libgpr-22.0.0.ebuild
index c0abd728513a..68bf6f6c798f 100644
--- a/dev-ada/libgpr/libgpr-22.0.0.ebuild
+++ b/dev-ada/libgpr/libgpr-22.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-ADA_COMPAT=( gnat_202{0..1} )
+ADA_COMPAT=( gnat_2021 )
 inherit ada multiprocessing
 
 MYPN=gprbuild