7 files changed, 4 insertions, 89 deletions
diff --git a/dev-ada/Manifest.gz b/dev-ada/Manifest.gz
index 1cf844b66827..e0b9ae1bc5dc 100644
--- a/dev-ada/Manifest.gz
+++ b/dev-ada/Manifest.gz
diff --git a/dev-ada/gnatmem/Manifest b/dev-ada/gnatmem/Manifest
index 0136400538f3..5e286e669af1 100644
--- a/dev-ada/gnatmem/Manifest
+++ b/dev-ada/gnatmem/Manifest
@@ -1,5 +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 1027 BLAKE2B a969819c3d16fdeba82bce5843c5b2be23f39c5812167e4091d924ff8bae46b93e7c5a69104e3b8fe786af207f4cdcc5948d80ac0aca4fca53ff54de64449c31 SHA512 b653fe8cd29835503c8dbbf9892e888d924fb84153e1a1f72fc4701969b77943506a63a42fe3911cc0ce50f9c03c142d76b3d0082831c8e45fefb62d9d4671c5
-EBUILD gnatmem-2021.ebuild 1014 BLAKE2B 76e5904df44cf96877b9a7079e5c6a000d92a103c8c3aea39066c3285d1e7812ebe3538196703684ead13f723f8d610e8389b5e386eb79b501ad34951b249e29 SHA512 88c699090daf91469bb754ef05667888ecda1ca3058a070255f0b239c3736805cb30461d66b3d7e1aa084ad859523720b07f15d602964a114fb694b639e46726
+EBUILD gnatmem-2021-r1.ebuild 1025 BLAKE2B f876d02085fa88d7f367e70fbd3766b507fec9d436b64bf98d547a7ee56087661647349519383837066b831b1ea385abdb2113d6f91543a710eb11acf8747c59 SHA512 125ddaac78b6bb2c2c21cee6319a85d7754016e3133a066c1b2535c9995438fcca9777e77f5b254bad81f1b12fa3d4daaa7b97355a2351bc1c15fbc4e75bb33f
 MISC metadata.xml 956 BLAKE2B 07881059585f6c26518d41c31bcbf7c271f7509ab2592bf46f1dff8817514c32521fa88d2aa901704ab5c494a1e072e0bab96517375687a1caf30310e526b7a9 SHA512 292041c6876b22abdecee29b525fbb9ccf2b9069e4c4dd5a22a051bdb69502b905951f235bb5423d834e70df2100153cf5e97c17aa855a12ad5dcf588ff33d8b
diff --git a/dev-ada/gnatmem/gnatmem-2021-r1.ebuild b/dev-ada/gnatmem/gnatmem-2021-r1.ebuild
index 958e53729098..386dd0de0d3b 100644
--- a/dev-ada/gnatmem/gnatmem-2021-r1.ebuild
+++ b/dev-ada/gnatmem/gnatmem-2021-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="${ADAMIRROR}/${ID}?filename=${MYP}.tar.gz -> ${MYP}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="${ADA_DEPS}"
diff --git a/dev-ada/gnatmem/gnatmem-2021.ebuild b/dev-ada/gnatmem/gnatmem-2021.ebuild
deleted file mode 100644
index dfd67558acbf..000000000000
--- a/dev-ada/gnatmem/gnatmem-2021.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ADA_COMPAT=( gnat_2021 )
-inherit ada multiprocessing autotools
-
-MYP=${P}-${PV}0518-19F7B-src
-ID=3ddb98c0c8854dc7631bebd673ac7bc53038d4b7
-ADAMIRROR=https://community.download.adacore.com/v1
-
-DESCRIPTION="Monitors dynamic allocation and deallocation activity in a program"
-HOMEPAGE="http://libre.adacore.com/"
-SRC_URI="${ADAMIRROR}/${ID}?filename=${MYP}.tar.gz -> ${MYP}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="${ADA_DEPS}"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[${ADA_USEDEP}]
-	sys-libs/binutils-libs:="
-
-REQUIRED_USE="${ADA_REQUIRED_USE}"
-
-S="${WORKDIR}"/${MYP}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2018-gentoo.patch
-)
-
-src_prepare() {
-	default
-	mv configure.in configure.ac
-	eautoreconf
-}
-
-src_compile() {
-	gprbuild -v -p -Pgnatmem.gpr -j$(makeopts_jobs) \
-		-cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS} \
-		-largs ${LDFLAGS} \
-		|| die
-}
-
-src_install() {
-	dobin obj/gnatmem
-}
diff --git a/dev-ada/gnatsymbolize/Manifest b/dev-ada/gnatsymbolize/Manifest
index 6e094cb4c8f9..4d65cb540995 100644
--- a/dev-ada/gnatsymbolize/Manifest
+++ b/dev-ada/gnatsymbolize/Manifest
@@ -1,4 +1,3 @@
 DIST gnatsymbolize-2021-20210518-19D3B-src.tar.gz 14263 BLAKE2B b5f8c1829e42f9b2dee4cf3c74287a5c11eab90f1a1d2575cd42fe4ad2078b99a46c641ebbf747b02ed8f22dfcc83e76c60ebf07eb45e561175f480a5a056ca2 SHA512 c94b569733c596679f1422660af51b3c0ad5b6955727f6dc6a4b076b39b19fc13fb779b5610667a4c2c16abab08d2633785e184ad5e15037e66cd1c8e249c159
-EBUILD gnatsymbolize-2021-r1.ebuild 763 BLAKE2B 856e87d0a26fa396d34009baf45f9e8b4b8fb406061e355efd06452dbed90c88942e037eb31ca9c7f52596ad67be178572f5929a295f3b0e7718e5632ee81a0e SHA512 841a36038a80f456a367583fd86502d7d6cb0a9697086c4039882617c69019a80a804674917d4de7f0bd9cb5c8487f5ffbdeb4458ad8bc34dfcac77e906e6a20
-EBUILD gnatsymbolize-2021.ebuild 732 BLAKE2B cbdc2d72f15136086e187bbeb97232964e0fa14a6e9c9a90c4062918812f9e6d06dcb5d0c410dab6f77d382af289274f26f67451a0ace3ee332fe1120d89f652 SHA512 ac71b40671b93c833e1fc92f7306ee7a1974e5ce472de551a8a596108b0ce858f7da0f76ea70690ac51546a40e5f72abd1748daba4f2ab03e27412bb8a5cdd9f
+EBUILD gnatsymbolize-2021-r1.ebuild 761 BLAKE2B 4f85fc6fee9054f4224d27bf95f2cfc1861859bd97088e58933d85eb5baca0fbadd371b5cc598d44bff8b3569852928fa54dfc7a532cc4d6f2c5068f9378dc11 SHA512 3794d5cfbf6819940058dda54b0bc936b49a0fb36b2af4e8253b6bcd50326c31e9ed134eece164ec40b69388064016c595234d3436e55f7f68f89b03c85d960a
 MISC metadata.xml 391 BLAKE2B d9e0444e176d262c87f289990d11122e4a06bd7f17fdf65d4e24fd7d6f09d1f36ba05c4f9896d8428e089ca2d85a8366f2e834139dd48c5a3626d2e9f4aa11a5 SHA512 fa7efd43d05a874d3b1733ded27ff6cbb245b9c03e301bef82d2962fc5ae7a585d2e49b49e9ceeecb92bbc8a08fe18cfe6a50a7db060b85a2ba54c65e1e5eda8
diff --git a/dev-ada/gnatsymbolize/gnatsymbolize-2021-r1.ebuild b/dev-ada/gnatsymbolize/gnatsymbolize-2021-r1.ebuild
index e5c3263653b4..2c078f0f5630 100644
--- a/dev-ada/gnatsymbolize/gnatsymbolize-2021-r1.ebuild
+++ b/dev-ada/gnatsymbolize/gnatsymbolize-2021-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="${ADAMIRROR}/${ID}?filename=${MYP}.tar.gz -> ${MYP}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="${ADA_DEPS}"
diff --git a/dev-ada/gnatsymbolize/gnatsymbolize-2021.ebuild b/dev-ada/gnatsymbolize/gnatsymbolize-2021.ebuild
deleted file mode 100644
index fcd942cdc6ba..000000000000
--- a/dev-ada/gnatsymbolize/gnatsymbolize-2021.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ADA_COMPAT=( gnat_2021 )
-inherit ada
-
-MYP=${P}-${PV}0518-19D3B-src
-ID=884f3b229457c995ddebb46a16a7cc50ed837c90
-ADAMIRROR=https://community.download.adacore.com/v1
-
-DESCRIPTION="Translates addresses into filename, line number, and function names"
-HOMEPAGE="http://libre.adacore.com/"
-SRC_URI="${ADAMIRROR}/${ID}?filename=${MYP}.tar.gz -> ${MYP}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="${ADA_DEPS}"
-DEPEND="${RDEPEND}"
-REQUIRED_USE="${ADA_REQUIRED_USE}"
-
-S="${WORKDIR}"/${MYP}
-
-src_compile() {
-	gnatmake -v gnatsymbolize -cargs ${ADAFLAGS} || die
-}
-
-src_install() {
-	dobin gnatsymbolize
-}