gentoo resync : 04.01.2022

23 files changed, 433 insertions, 43 deletions

diff --git a/dev-ada/Manifest.gz b/dev-ada/Manifest.gz
index 388bfcd41274..8b31c63a1cb2 100644
--- a/dev-ada/Manifest.gz
+++ b/dev-ada/Manifest.gz
diff --git a/dev-ada/VSS/Manifest b/dev-ada/VSS/Manifest
new file mode 100644
index 000000000000..56e405fc4020
--- /dev/null
+++ b/dev-ada/VSS/Manifest
@@ -0,0 +1,3 @@
+DIST VSS-22.0.0.tar.gz 310314 BLAKE2B 710645472b0e767f744ca12564a595fabc6bd931a271bc6fd575fdee70ade1676f3a0dbe00d7700ba5bbeb341fa6cc767b8efb18162f1fc308edcb653c9919f4 SHA512 b38582efc2b334a5b550eb9eacadd721b354f51d4cc26fcb4da1c8e7d241a848d5d3ee2651a72b552e2d5357b9fde46ba48e694f17f49cc2bcdad63d2f9d685e
+EBUILD VSS-22.0.0.ebuild 904 BLAKE2B 70861d64a98997fc56e55377a420f4f148d67bbc39549613499f3be5c9e924d7d1d6fec27c783244ff6fe05f0620e1ebf7d0f2c6a2d31813556f9ed9201f461b SHA512 7f7818b5e0c849cecf817107237f7a94a0938d06c30043650dbf56c4d2b02f0d90265a946c2b4dc77b0dc8fb02518d3aeee4d985fc9618fcd63356db55dcfaa5
+MISC metadata.xml 216 BLAKE2B 921055d990617104de7e3437bc9fd4598cb830193bfcdc34254102a1df2c6025916af7025843f161dff8de731f9726641906b86f831375c5d29303ba64991da2 SHA512 8c43f5f2be76799c8ace4df222de22380c389e058bc7e36bd9b19564cbd4b90ab7515b90f822139a18b3a2cba70e76d3b4eb5426f88a0508798175893073d732
diff --git a/dev-ada/VSS/VSS-22.0.0.ebuild b/dev-ada/VSS/VSS-22.0.0.ebuild
new file mode 100644
index 000000000000..4b8a933229a2
--- /dev/null
+++ b/dev-ada/VSS/VSS-22.0.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ADA_COMPAT=( gnat_2021 )
+inherit ada multiprocessing
+
+DESCRIPTION="A high level string and text processing library"
+HOMEPAGE="https://github.com/AdaCore/VSS"
+SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="GPL-3 gcc-runtime-library-exception-3.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${ADA_REQUIRED_USE}"
+
+RDEPEND="${ADA_DEPS}"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-ada/gprbuild[${ADA_USEDEP}]
+	test? ( app-i18n/unicode-data )"
+
+src_prepare() {
+	mkdir data
+	ln -sf /usr/share/unicode-data data/ucd || die
+	default
+}
+
+src_compile() {
+	emake GPRBUILD_FLAGS="-p -j$(makeopts_jobs) -v"
+}
+
+src_test() {
+	emake -j1 GPRBUILD_FLAGS="-p -j$(makeopts_jobs) -v" build_tests
+	emake check_text check_json
+}
diff --git a/dev-ada/VSS/metadata.xml b/dev-ada/VSS/metadata.xml
new file mode 100644
index 000000000000..91e8ad9f5e33
--- /dev/null
+++ b/dev-ada/VSS/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>ada@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-ada/ada_language_server/Manifest b/dev-ada/ada_language_server/Manifest
new file mode 100644
index 000000000000..02d470bd7932
--- /dev/null
+++ b/dev-ada/ada_language_server/Manifest
@@ -0,0 +1,3 @@
+DIST ada_language_server-22.0.0.tar.gz 791594 BLAKE2B 9effdf8376e00fe838be7b53c5756dc0d325e36eae780642d79483d6fcead9019cab41e228fe2313d6f31e06895e2d41feef194cb24ac50f02d6dd066774b642 SHA512 ef4bdf41315aad09750e85521657aefaaee419739aac4dec6e182691b8b5282face19481a113e710f7c4b21f6e6f51296d1872aaf5c1c3ab19b6774d142c021c
+EBUILD ada_language_server-22.0.0.ebuild 1981 BLAKE2B e81d9828304f52cc0742bb4666e3c44b92163e076ad347aef104acd5bbe85ff6a6f8461fdd6279ae54930823a6b5b8aa4e638d1cf2c88d7710149eb8bdb78a81 SHA512 c6a73fc3a07e1432a3db4563a2a7a7a4af049d748be414649129748baf01cf5fa91b472f6140e0cb56b5dcd995c638562dcdb22cd414c2aa88f2c490f4454289
+MISC metadata.xml 308 BLAKE2B 4793221c685a34d429fa0119a02d14432c984970ec5616d069cb55fa02e18757c9a8e48dc4df34507ea8c084097ff0a9bee0c317509c4f5c83fcdb318977869d SHA512 b65109a33128863f1f7b29a6645147b5064fa39be86d8d0632c703befeb00138900fed17709a752d17d4f03495af84a405306fd24d32b15b9242c839adb70db3
diff --git a/dev-ada/ada_language_server/ada_language_server-22.0.0.ebuild b/dev-ada/ada_language_server/ada_language_server-22.0.0.ebuild
new file mode 100644
index 000000000000..065884930e2a
--- /dev/null
+++ b/dev-ada/ada_language_server/ada_language_server-22.0.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ADA_COMPAT=( gnat_202{0,1} )
+inherit ada multiprocessing
+
+DESCRIPTION="an implementation of the Microsoft Language Server Protocol for Ada/SPARK"
+HOMEPAGE="https://github.com/AdaCore/ada_language_server"
+SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
+	-> ${P}.tar.gz"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="${ADA_DEPS}
+	dev-ada/ada_libfswatch[${ADA_USEDEP}]
+	dev-ada/gnatcoll-core[${ADA_USEDEP},shared]
+	dev-ada/libadalang[${ADA_USEDEP}]
+	dev-ada/libadalang-tools[${ADA_USEDEP},shared]
+	dev-ada/spawn[${ADA_USEDEP},shared]
+	dev-ada/VSS[${ADA_USEDEP}]"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-ada/gprbuild[${ADA_USEDEP}]
+	test? ( dev-ada/e3-testsuite )"
+
+REQUIRED_USE="${ADA_REQUIRED_USE}"
+
+src_compile() {
+	gprbuild -v -j$(makeopts_jobs) -P gnat/tester.gpr -p \
+		-XLIBRARY_TYPE=relocatable \
+		-cargs:Ada ${ADAFLAGS} || die
+	gprbuild -v -j$(makeopts_jobs) -c -u -P gnat/lsp_server.gpr -p \
+		-XLIBRARY_TYPE=relocatable s-memory.adb \
+		-cargs:Ada ${ADAFLAGS} || die
+	gprbuild -v -j$(makeopts_jobs) -P gnat/lsp_server.gpr -p \
+		-XLIBRARY_TYPE=relocatable -XVERSION= \
+		-cargs:Ada ${ADAFLAGS} || die
+	gprbuild -v -j$(makeopts_jobs) -P gnat/codec_test.gpr -p \
+		-XLIBRARY_TYPE=relocatable \
+		-cargs:Ada ${ADAFLAGS} || die
+	gprbuild -v -j$(makeopts_jobs) -P gnat/lsp_client.gpr -p \
+		-XLIBRARY_TYPE=relocatable \
+		-cargs:Ada ${ADAFLAGS} || die
+	gprbuild -v -j$(makeopts_jobs) -P gnat/lsp_client_glib.gpr -p \
+		-XLIBRARY_TYPE=relocatable \
+		-cargs:Ada ${ADAFLAGS} || die
+	mkdir -p integration/vscode/ada/linux
+	cp -f .obj/server/ada_language_server integration/vscode/ada/linux || die
+}
+
+src_install() {
+	emake install DESTDIR="${D}"/usr
+	gprinstall -f -P gnat/lsp_client_glib.gpr -p -r	--mode=dev \
+		--prefix="${D}"/usr -XBUILD_MODE=dev -XLIBRARY_TYPE=relocatable || die
+
+	einstalldocs
+}
diff --git a/dev-ada/ada_language_server/metadata.xml b/dev-ada/ada_language_server/metadata.xml
new file mode 100644
index 000000000000..bc7f54506181
--- /dev/null
+++ b/dev-ada/ada_language_server/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>ada@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">adacore/ada_language_server</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ada/ada_libfswatch/Manifest b/dev-ada/ada_libfswatch/Manifest
new file mode 100644
index 000000000000..e1739d06572a
--- /dev/null
+++ b/dev-ada/ada_libfswatch/Manifest
@@ -0,0 +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 1230 BLAKE2B f34a71285c0c2744dd92d6a8b738a602b2c81e6b87a6b77a3920f503dd8760b6be0e97eaecd3371e68d666414e84e6b39fbad1a819f6c521ae461b6436564dd4 SHA512 5efe18ea81ca410ea8cb317a865872a2066e8e4ca088bc3ab7e134bdc4dc6c80eb526bc8d533e5384f59f2d69afc26a19a5f4cc2e156f3b02826d09ad0a4a415
+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.ebuild
new file mode 100644
index 000000000000..b8ab12fe324a
--- /dev/null
+++ b/dev-ada/ada_libfswatch/ada_libfswatch-20201105.ebuild
@@ -0,0 +1,54 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ADA_COMPAT=( gnat_202{0,1} )
+inherit ada
+
+commitId=94c0a5f137b88113a791a148b60e5e7d019d6fa1
+
+DESCRIPTION="Ada binding to the libfswatch library"
+HOMEPAGE="https://github.com/AdaCore/ada_libfswatch"
+SRC_URI="https://github.com/AdaCore/${PN}/archive/${commitId}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="GPL-3 gcc-runtime-library-exception-3.1"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="${ADA_DEPS}
+	dev-ada/gnatcoll-core[${ADA_USEDEP},shared]
+	sys-fs/fswatch"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-ada/gprbuild[${ADA_USEDEP}]"
+
+S="${WORKDIR}"/${PN}-${commitId}
+
+PATCHES=(
+	"${FILESDIR}"/${P}-link.patch
+)
+
+src_prepare() {
+	default
+	mkdir -p generated || die
+	cp /usr/include/libfswatch/c/* generated || die
+	(cd generated && gcc -C -fdump-ada-spec libfswatch.h -D_TIMEZONE_DEFINED) \
+		|| die
+	rm generated/*h || die
+	sed -i \
+		-e "1d" \
+		ada_libfswatch.gpr || die
+}
+
+src_compile() {
+	gprbuild -p -v -P ada_libfswatch -XLIBRARY_TYPE=relocatable \
+		-cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS} \
+		|| die
+}
+
+src_install() {
+	gprinstall -v -r -p -P ada_libfswatch -XLIBRARY_TYPE=relocatable \
+		--prefix="${D}"/usr || die
+	einstalldocs
+}
diff --git a/dev-ada/ada_libfswatch/files/ada_libfswatch-20201105-link.patch b/dev-ada/ada_libfswatch/files/ada_libfswatch-20201105-link.patch
new file mode 100644
index 000000000000..ce820c2e455c
--- /dev/null
+++ b/dev-ada/ada_libfswatch/files/ada_libfswatch-20201105-link.patch
@@ -0,0 +1,10 @@
+--- a/ada_libfswatch.gpr	2021-12-30 13:24:40.561312372 +0100
++++ b/ada_libfswatch.gpr	2021-12-30 13:25:52.542192958 +0100
+@@ -11,4 +11,7 @@
+       for Default_Switches ("Ada") use ("-g", "-O0", "-gnatwa", "-gnaty");
+    end Compiler;
+ 
++   package Linker is
++      for Linker_Options use ("-lfswatch");
++   end Linker;
+ end Ada_Libfswatch;
diff --git a/dev-ada/ada_libfswatch/metadata.xml b/dev-ada/ada_libfswatch/metadata.xml
new file mode 100644
index 000000000000..11c22246babd
--- /dev/null
+++ b/dev-ada/ada_libfswatch/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>ada@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">AdaCore/ada_libfswatch</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ada/gtkada/Manifest b/dev-ada/gtkada/Manifest
index 491a533a7d9f..a3a9d513be5a 100644
--- a/dev-ada/gtkada/Manifest
+++ b/dev-ada/gtkada/Manifest
@@ -1,7 +1,8 @@
 AUX gtkada-2017-r1-gentoo.patch 2082 BLAKE2B 129c162fbc6d89565d4d383fe0f071b04513a66d138599d0b5dfce8f4bc40bb7609eb26a1df414dcac212827a2ece39c4db4a2f785d8eb5367688b83fd59c121 SHA512 defc57274798e8ff24436153bd4f6d6f94e25617eee249101708c1bfd01d3960a07a948407d2c126d21fba34a9f770762fc20d0c1711c28b4d77e11a190a9dea
 AUX gtkada-2019-gentoo.patch 468 BLAKE2B 80de36b927875d360e35be6b5829ced6fa1a0bff2c2e8f2186bdd375db27965cc9258b94c41ade6919047d0ac12deafe37b7a58c1365bd453b7293118f81709d SHA512 85b6e3d3060283370ab9d2ad5980a2aa110db44edcb615caf8ebfd6e49ca53011d5a049f4fac1584fce2755414883abde16824d28a5fa3db17d0d50cb00e8c81
+AUX gtkada-2021-uninstall.patch 398 BLAKE2B 2f5becba847173f5e780ca712d3fa3a8180fade82d36d6cbe3e94acb3e3d64e5754ee41b221878dbcfbb5db056e976a16837ce22aeb8c35027c0df6622a64bae SHA512 53a325b4b51e9d5dafc583e6001064b3d5cca9b5e1d4ccccc5280726c10a25f1a2563d1fe62c9d9c48ee058e4d4cc7bc8b722c5a89f4d276ddfac2bfa4726461
 DIST gtkada-2021-20210518-1A011-src.tar.gz 12341654 BLAKE2B 888e7f447b09218f54f6fc28743bf313163f30bcde5f0deba7c02a113340e2e73458cc98a8e9d9277f131cb4e28280fd69afa6797d47312c61e7d73929fb5a11 SHA512 fb5db2886a26c15b58180e53f22d4ee25ce23c19240b27352cb47becf19bb76b32c90a10f5085165913360d1cf87bf52b4588d8cdc2b9681e717f9af71ae86a8
 DIST gtkada-22.0.0.tar.gz 6070022 BLAKE2B ff5d13831acf839290923871a80a5edfff7d39c689175d528e50bfcae4f120381d8cc74a58f2d843e0aba6fd7c23bb43a34db279b0af9d7c9cc4f4bc9615b179 SHA512 abcc6152b0dac66b29ef791527bf6e8f0e1359e5a374732824561ca47d9b1951c168b9b27dbc1f24e496ef5afe6c68020edc9d374faf0495118630ef08a5c448
-EBUILD gtkada-2021.ebuild 1368 BLAKE2B 3e78916675f01a8dd10d44eda38498bb7364636e4c5f2a6c4a15b83d32643e18739a2ee9b6ef505a37216c2789d652a8cba58b3f3dfaa608893583ab1d4cbaa4 SHA512 8282daece575423c55e5cd9a9acab6643e796fc213e768a1391516ad8fa8e3d39278da9b7a5a474c2ac23c5d3ba762d5a80d3cb53995ee90076b236845ab57ed
-EBUILD gtkada-22.0.0.ebuild 1102 BLAKE2B 52776b987a85ec569430d344b3fae9624652de24422e0f896a54bc20d3b99b0bd31e2111e32561fdea388ee9af6bb07cd8600bd765a9ea5e4fede9c62b6c26d7 SHA512 33a315ea324e020edab354b32f3735a3e1c72a93e2780ddefc13375c98d166635b80c6e16015c29b9f354f8b32fddd38b6202955f5455e5cfb9a66c85d0bd978
-MISC metadata.xml 537 BLAKE2B 2504eb7e8c0fe1a143ea8f6f4ba3ac530245d3781f906536dc7680e775cf8b546e7019d43adbc78e1b7793825eb9bea849d78ef482325ccd16bc30d96691ea7a SHA512 4e683dd78d8d81851116548db6014157fcb363d96fa4df04e45c35705505ed3b3a863a3b082dc4a7e814df8587b7f5fba6e696c8ee12e14d0d04a71199977d17
+EBUILD gtkada-2021.ebuild 1404 BLAKE2B cbfae8b43653108baca7d0d7dcf91311687531d73065bfce0c9b0d7902358e75b85c5c8dd08e88034bcb5f2e422954d3864f1315784befedbefe048e029832fe SHA512 e31622e064b4252a591160a5b0756fcec0701bcc02990d901216634fc8c6cf142cbf9be11e6bae1ed57b4f69a4cdd19073dcf0e9286405fef64606274a152c8f
+EBUILD gtkada-22.0.0.ebuild 1190 BLAKE2B d1aac875a41602b4524a9e1cad26e95dcf2d03305509304cd714aa4634539f72fb00de5e5b1b78df7f9ce542d0a9c5f08436b9881a5c5c68c40fa86956fcfede SHA512 b8855baaced7dce5f721c09bc8d712f0c867765c84706f32c1a7df3df4c62ca08ad6ae994bd6795c1b0826277186b98831f787637ae2e3ddfaf3c67cb537f6dc
+MISC metadata.xml 609 BLAKE2B 999aae7c908ca80ba44e4183221ef3acd23d29dae2e4c13a5a930ecbae5cff34f8dbd3705953aced2a03a378d41465294d3960fcdb65384cd5b9a19a729e017e SHA512 5ea2cef4aec361935f1b3cf27572e2c062e56ff76aebf952fcc550176755b899615a5b19cc20b8c4548d47bf09f41b168f9ac985c40799e68982acd1354cb817
diff --git a/dev-ada/gtkada/files/gtkada-2021-uninstall.patch b/dev-ada/gtkada/files/gtkada-2021-uninstall.patch
new file mode 100644
index 000000000000..c782aac633b7
--- /dev/null
+++ b/dev-ada/gtkada/files/gtkada-2021-uninstall.patch
@@ -0,0 +1,13 @@
+--- a/Makefile.in	2021-12-27 09:42:14.575136019 +0100
++++ b/Makefile.in	2021-12-27 09:42:31.159870381 +0100
+@@ -113,10 +113,6 @@
+ endif
+ 
+ install-clean:
+-ifneq (,$(wildcard $(prefix)/lib/gnat/manifests/gtkada))
+-	-$(GPRINSTALL) --uninstall -f --prefix=$(prefix) \
+-		--project-subdir=lib/gnat gtkada
+-endif
+ 
+ install: install-clean
+ 	${GPRINSTALL_FULL} -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) \
diff --git a/dev-ada/gtkada/gtkada-2021.ebuild b/dev-ada/gtkada/gtkada-2021.ebuild
index da08ed425283..1005a7ba1034 100644
--- a/dev-ada/gtkada/gtkada-2021.ebuild
+++ b/dev-ada/gtkada/gtkada-2021.ebuild
@@ -39,6 +39,7 @@ S="${WORKDIR}"/${MYP}
 PATCHES=(
 	"${FILESDIR}"/${PN}-2017-r1-gentoo.patch
 	"${FILESDIR}"/${PN}-2019-gentoo.patch
+	"${FILESDIR}"/${P}-uninstall.patch
 )
 
 src_prepare() {
diff --git a/dev-ada/gtkada/gtkada-22.0.0.ebuild b/dev-ada/gtkada/gtkada-22.0.0.ebuild
index 439153321466..6cb33f81492e 100644
--- a/dev-ada/gtkada/gtkada-22.0.0.ebuild
+++ b/dev-ada/gtkada/gtkada-22.0.0.ebuild
@@ -12,9 +12,9 @@ SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
 	-> ${P}.tar.gz"
 
 LICENSE="GPL-3"
-SLOT="0"
+SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
-IUSE="+shared static-libs"
+IUSE="+shared static-libs static-pic"
 
 RDEPEND="${ADA_DEPS}
 	dev-libs/atk
@@ -33,6 +33,7 @@ REQUIRED_USE="${ADA_REQUIRED_USE}"
 PATCHES=(
 	"${FILESDIR}"/${PN}-2017-r1-gentoo.patch
 	"${FILESDIR}"/${PN}-2019-gentoo.patch
+	"${FILESDIR}"/${PN}-2021-uninstall.patch
 )
 
 src_prepare() {
@@ -45,6 +46,7 @@ src_configure() {
 	econf \
 		$(use_enable static-libs static) \
 		$(use_enable shared) \
+		$(use_enable static-pic) \
 		--without-GL
 }
 
diff --git a/dev-ada/gtkada/metadata.xml b/dev-ada/gtkada/metadata.xml
index ed2a0cec8e00..bd7b67c76052 100644
--- a/dev-ada/gtkada/metadata.xml
+++ b/dev-ada/gtkada/metadata.xml
@@ -6,8 +6,11 @@
 	</maintainer>
 	<use>
 		<flag name="shared">Build gtkada as shared library</flag>
+		<flag name="static-pic">Build static library with pic code</flag>
 	</use>
 	<longdescription lang="en">
-		GtkAda is an Ada graphical toolkit based on Gtk+, providing the complete set of Gtk+ widgets using the Object-Oriented features of this language. GtkAda supports the latest 3.14 stable releases.
+		GtkAda is an Ada graphical toolkit based on Gtk+, providing the
+		complete set of Gtk+ widgets using the Object-Oriented features of
+		this language. GtkAda supports the latest 3.14 stable releases.
 	</longdescription>
 </pkgmetadata>
diff --git a/dev-ada/libadalang-tools/Manifest b/dev-ada/libadalang-tools/Manifest
index 75714f352d5b..1ddfb125a94e 100644
--- a/dev-ada/libadalang-tools/Manifest
+++ b/dev-ada/libadalang-tools/Manifest
@@ -1,3 +1,3 @@
 DIST libadalang-tools-22.0.0.tar.gz 892619 BLAKE2B 5ba3cc91c0cd251ade396eda1d8de4244712905ef33ec9bb68a76ab20908d4034b78989dc051b2e47a2fd37e41ae49bf46b1459a74742205750c8a60697e27cc SHA512 c9028428379e68644dee140b76c6806b15561484bdc77a8c85c88c1ae4de512b6252f41b415fe767c5c7ae533fba1583e075620bd222a7be240d6cd1130d25bd
-EBUILD libadalang-tools-22.0.0.ebuild 819 BLAKE2B c8d6e1c8b5537468d1563e4d5e2ab83dfe0fdc29a618c3550f1357007565a49b6816bff54482eb11a37d00c692080c566e48b894fa64d88fb2f19ce002c6d155 SHA512 8bb1ab34b636c7aff693792efae32224fb19287cd90438d1310a7024c5ae5b0e972bc10688e877b21572910e96241bfefd2d215f2a8b8bd3b03ea4cc16dcdba5
-MISC metadata.xml 215 BLAKE2B 98b1646db0c7bae55bde9ba8a125710b47045fa5937d90218279c551cfff2a12bc45f46b99f0586adc9d3be222abf0dd7b5b5d8ca8e005a6fc55a0b13dd5cea7 SHA512 ec803d562bbbb43b0b41dd837b0f3691a652aebecb8419cdb9c50f96e4c17f90ef10a99df773cb88fbe4670692171b5afd0be68c7f630091de18090301302f8d
+EBUILD libadalang-tools-22.0.0-r1.ebuild 1625 BLAKE2B ba195a9c92b03cfa2d0aad2b71f59399550b88103eabbd446076cd86be95ba7bf5158fa1c90249e57bf3bb3ecb837e83c71f23b36bc9649f6505ada9d588d444 SHA512 55d8187f205cc138b1d296a497970e1208b2bba732e32fc6423c0c296d973dc39239fafb1733ad02a8acb42465630d0f438f3238968a1cc6e6ce8981e1d81974
+MISC metadata.xml 348 BLAKE2B f7aa3a675cad33da94cc50308e9da7d9fc9735869d57897647174432aaa9001eec032fc69b1c658407811b447e2f744d3e96d063ab38e23a966910e168a08277 SHA512 8e81b66facb594ad30379533d8a2151483ef7890db64bb3235bb21577af188aa05cd413930b086d4f2b9fc2f3aeeffea70f887a145aed020733f59176e1c746d
diff --git a/dev-ada/libadalang-tools/libadalang-tools-22.0.0-r1.ebuild b/dev-ada/libadalang-tools/libadalang-tools-22.0.0-r1.ebuild
new file mode 100644
index 000000000000..2b008feb5445
--- /dev/null
+++ b/dev-ada/libadalang-tools/libadalang-tools-22.0.0-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ADA_COMPAT=( gnat_2021 )
+inherit ada multiprocessing
+
+DESCRIPTION="Libadalang-based tools: gnatpp, gnatmetric and gnatstub"
+HOMEPAGE="https://www.adacore.com/community"
+SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+shared static-libs static-pic"
+
+RESTRICT="test"
+
+REQUIRED_USE="|| ( shared static-libs static-pic )
+	${ADA_REQUIRED_USE}"
+
+RDEPEND="${ADA_DEPS}"
+DEPEND="${RDEPEND}
+	dev-ada/libadalang:=[${ADA_USEDEP},static-libs?,static-pic?]"
+BDEPEND="dev-ada/gprbuild[${ADA_USEDEP}]"
+
+src_compile() {
+	build () {
+		gprbuild -v -k -XLIBRARY_TYPE=$1 -XBUILD_MODE=prod \
+			-P src/lal_tools.gpr -p -j$(makeopts_jobs) \
+			-cargs:Ada ${ADAFLAGS} || die
+		gprbuild -v -k -XLIBRARY_TYPE=$1 -XXMLADA_BUILD=$1 \
+			-XBUILD_MODE=prod -XLALTOOLS_SET=all \
+			-P src/build.gpr -p -j$(makeopts_jobs) \
+			-cargs:Ada ${ADAFLAGS} || die
+	}
+	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_install() {
+	build () {
+		gprinstall -XLIBRARY_TYPE=$1 -XBUILD_MODE=prod \
+			--prefix="${D}"/usr --sources-subdir=include/lal_tools \
+			--build-name=$1 --build-var=LIBRARY_TYPE \
+			--build-var=LAL_TOOLS_BUILD \
+			-P src/lal_tools.gpr -p -f || die
+	}
+	if use shared; then
+		build relocatable
+	fi
+	if use static-libs; then
+		build static
+	fi
+	if use static-pic; then
+		build static-pic
+	fi
+	dobin bin/gnat{metric,pp,stub,test}
+	einstalldocs
+}
diff --git a/dev-ada/libadalang-tools/libadalang-tools-22.0.0.ebuild b/dev-ada/libadalang-tools/libadalang-tools-22.0.0.ebuild
deleted file mode 100644
index 9f4a7cad4a24..000000000000
--- a/dev-ada/libadalang-tools/libadalang-tools-22.0.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ADA_COMPAT=( gnat_202{0,1} )
-inherit ada multiprocessing
-
-DESCRIPTION="Libadalang-based tools: gnatpp, gnatmetric and gnatstub"
-HOMEPAGE="https://www.adacore.com/community"
-SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RESTRICT="test"
-
-RDEPEND="${ADA_DEPS}"
-DEPEND="${RDEPEND}
-	dev-ada/libadalang:=[${ADA_USEDEP},static-libs]"
-BDEPEND="dev-ada/gprbuild[${ADA_USEDEP}]"
-
-src_compile() {
-	gprbuild -v -k -XLIBRARY_TYPE=static -XXMLADA_BUILD=static \
-		-XBUILD_MODE=dev -XLALTOOLS_SET=all -P src/build.gpr -p \
-		-j$(makeopts_jobs) || die
-}
-
-src_install() {
-	dobin bin/gnat{metric,pp,stub,test}
-	einstalldocs
-}
diff --git a/dev-ada/libadalang-tools/metadata.xml b/dev-ada/libadalang-tools/metadata.xml
index d2615c1b0e0a..5d5e0fd45371 100644
--- a/dev-ada/libadalang-tools/metadata.xml
+++ b/dev-ada/libadalang-tools/metadata.xml
@@ -4,4 +4,8 @@
 	<maintainer type="project">
 		<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>
 </pkgmetadata>
diff --git a/dev-ada/spawn/Manifest b/dev-ada/spawn/Manifest
new file mode 100644
index 000000000000..d0f263141044
--- /dev/null
+++ b/dev-ada/spawn/Manifest
@@ -0,0 +1,3 @@
+DIST spawn-22.0.0.tar.gz 49836 BLAKE2B 2283eadae1477600934cbecb67e0fa4c0640150c4d05356ec3d047fdd664e68510c99f9e495dc448c83fe0fea25523727ecb45ee6e85a4b205255a9549031110 SHA512 706c53dabe82994a809c33e984d467ff0f72a2ed9566dedc8262b2c908393f241546ce379a03ea50eb73bf2326b52fc4804d6e192810c703695fc32c9da0b530
+EBUILD spawn-22.0.0.ebuild 2685 BLAKE2B a1edf2a868d0842ff38d8663cd344ad0acf7b8e1ab3f97e3ecbab4b31fa50ecdc0e1b2414fc77295b2392913ae6c89ea2c433bd2c5eb98e8de985eb506d9c700 SHA512 5da824b7ae163f1eae827601d08b6b08a7304075e2e5dedebe7999f99136c5525420bb75ebc60ac0484df94cf244843cc294970415a9c67b9eed554d97d11809
+MISC metadata.xml 679 BLAKE2B fb0964502dfb671ef0168b6111587db4e035c772aadbe3429122ee418884fe06dbbd7a774b3bf2b49ad3ed481a29baef30db2c3fac8044aca55b5bdbb4954950 SHA512 7f421ead1f5ee3d9c18b086bdbbcb8c4987d987079ebfa36249ceb3bc9d9c6e35644278dd085debd05165b7c8fb83be0a57395ebbdf4f2b757b24d89e0321a42
diff --git a/dev-ada/spawn/metadata.xml b/dev-ada/spawn/metadata.xml
new file mode 100644
index 000000000000..73dd402e4ab3
--- /dev/null
+++ b/dev-ada/spawn/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>ada@gentoo.org</email>
+	</maintainer>
+	<use>
+		<flag name="glib">
+			Add support to <pkg>dev-libs/glib</pkg>-based mainloop.
+		</flag>
+		<flag name="shared">Build shared library</flag>
+		<flag name="static-pic">Build static library with pic code</flag>
+	</use>
+	<longdescription lang="en">
+		This library provides simple API to spawn processes and communicate
+		with them. We provide two implementations of the same API - the
+		integrated into Glib event loop and the independent.
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-ada/spawn/spawn-22.0.0.ebuild b/dev-ada/spawn/spawn-22.0.0.ebuild
new file mode 100644
index 000000000000..2d8433b46e3a
--- /dev/null
+++ b/dev-ada/spawn/spawn-22.0.0.ebuild
@@ -0,0 +1,108 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ADA_COMPAT=( gnat_202{0,1} )
+inherit ada multiprocessing
+
+DESCRIPTION="Simple API to spawn processes"
+HOMEPAGE="https://github.com/AdaCore/spawn"
+SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="GPL-3 gcc-runtime-library-exception-3.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="glib +shared static-libs static-pic"
+REQUIRED_USE="|| ( shared static-libs static-pic )
+	${ADA_REQUIRED_USE}"
+
+RDEPEND="${ADA_DEPS}
+	glib? (
+	dev-ada/gtkada[${ADA_USEDEP},shared?,static-libs?,static-pic?]
+	dev-libs/glib
+)"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-ada/gprbuild[${ADA_USEDEP}]"
+
+src_compile() {
+	build () {
+		gprbuild -p -j$(makeopts_jobs) -XBUILD=production -v \
+			-XLIBRARY_TYPE=$1 \
+			gnat/spawn.gpr -cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS} || die
+		if use glib; then
+			gprbuild -p -j$(makeopts_jobs) -XBUILD=production -v \
+				-XLIBRARY_TYPE=$1 \
+				gnat/spawn_glib.gpr -cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS} \
+				|| die
+		fi
+	}
+	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() {
+	build () {
+		gprbuild -p -j$(makeopts_jobs) -XBUILD=production -v \
+			-XLIBRARY_TYPE=$1 \
+			gnat/spawn_tests.gpr -cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS} \
+			|| die
+		if use glib; then
+			gprbuild -p -j$(makeopts_jobs) -XBUILD=production -v \
+				-XLIBRARY_TYPE=$1 \
+				gnat/spawn_glib_tests.gpr \
+				-cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS} || die
+		fi
+	}
+	if use shared; then
+		build relocatable
+	elif use static-libs; then
+		build static
+	elif use static-pic; then
+		build static-pic
+	fi
+	.obj/spawn_test/spawn_test || die
+	.obj/spawn_test/spawn_unexpected || die
+	.obj/spawn_test/spawn_kill || die
+	if use glib; then
+		.obj/spawn_test/spawn_glib_test || die
+		.obj/spawn_test/spawn_glib_args_test.exe || die
+	fi
+}
+
+src_install() {
+	build() {
+		gprinstall --prefix=/usr --sources-subdir="${D}"/usr/include/spawn \
+			-XLIBRARY_TYPE=$1 \
+			--lib-subdir="${D}"/usr/lib/spawn \
+			--project-subdir="${D}"/usr/share/gpr \
+			--link-lib-subdir="${D}"/usr/lib/ -p \
+			-P gnat/spawn.gpr || die
+		if use glib; then
+			gprinstall --prefix=/usr \
+				-XLIBRARY_TYPE=$1 \
+				--sources-subdir="${D}"/usr/include/spawn_glib \
+				--lib-subdir="${D}"/usr/lib/spawn_glib \
+				--project-subdir="${D}"/usr/share/gpr \
+				--link-lib-subdir="${D}"/usr/lib/ -p \
+				-P gnat/spawn_glib.gpr || die
+		fi
+	}
+	if use shared; then
+		build relocatable
+	fi
+	if use static-libs; then
+		build static
+	fi
+	if use static-pic; then
+		build static-pic
+	fi
+}