4 files changed, 4 insertions, 82 deletions
diff --git a/dev-ada/gnatcoll-core/Manifest b/dev-ada/gnatcoll-core/Manifest
index 8f083604ecdf..1ba2a4f41339 100644
--- a/dev-ada/gnatcoll-core/Manifest
+++ b/dev-ada/gnatcoll-core/Manifest
@@ -1,3 +1,2 @@
-DIST gnatcoll-core-2021-20210518-19ADF-src.tar.gz 1460647 BLAKE2B 42954ed9dfc41914f34973fcfe950b4415af455d8319e802a213994107c7d7a45a6a42b2d260f165fe5ec6589873a7a2c75665b68b97431b13d7694f48273b8c SHA512 6a58920a057dee656df9f64f610f9f1398bc3cbc4ed74a740e8693f2b45da83628c3ce8f76f624bdb101d348603a24bccb47aa770ade1ffbf24da806f4d1de20
 DIST gnatcoll-core-22.0.0.tar.gz 722642 BLAKE2B e9bc6b322866b086f080096457936f66925cb954533acc04265b1e4c7081fe65d420fbc841b9ad5f4932eb43848803c1bf78a37a6fc47c1ac9d30bbb8eb2e0c9 SHA512 ce3aaa90b339a57eedc070e6451ea8782a87d07ece09823c57179a5e44762349458564bf8d007427a7aba795bc05d744056e3defd6b44698bcc0a8af0c5285e9
 DIST gnatcoll-core-23.0.0.tar.gz 745131 BLAKE2B 25e5f17adf88c48f45cc30cfbd82e2213233aecd78c9c22455ac6458e2f336f527604911c9eaaa1ab8853e0a16bbe9e1a7b8f31481ee9c2894287ec16e961123 SHA512 49f33abe07d2c4b51a6e69be550d05c5794953f4fbe8cb15e29c9834b9c5600724acaff4156fb53e4146620f1e4335f4c22453215a39ec5ee95b3992528b9828
diff --git a/dev-ada/gnatcoll-core/gnatcoll-core-2021-r1.ebuild b/dev-ada/gnatcoll-core/gnatcoll-core-2021-r1.ebuild
deleted file mode 100644
index fd97495b124c..000000000000
--- a/dev-ada/gnatcoll-core/gnatcoll-core-2021-r1.ebuild
+++ /dev/null
@@ -1,77 +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
-
-MYP=${P}-${PV}0518-19ADF
-ADAMIRROR=https://community.download.adacore.com/v1
-ID=425b044d5cb112f096c7ac5ebbafb0d8e5297913
-
-DESCRIPTION="GNAT Component Collection Core packages"
-HOMEPAGE="http://libre.adacore.com"
-SRC_URI="${ADAMIRROR}/${ID}?filename=${MYP}-src.tar.gz -> ${MYP}-src.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+shared static-libs static-pic"
-REQUIRED_USE="|| ( shared static-libs static-pic )
-	${ADA_REQUIRED_USE}"
-
-RDEPEND="
-	>=dev-ada/libgpr-2021[${ADA_USEDEP},shared?,static-libs?,static-pic?]
-"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[${ADA_USEDEP}]"
-
-S="${WORKDIR}"/${MYP}-src
-
-PATCHES=( "${FILESDIR}"/${PN}-2018-gentoo.patch )
-
-src_prepare() {
-	default
-	sed -i \
-		-e "s:@GNATLS@:${GNATLS}:g" \
-		src/gnatcoll-projects.ads \
-		|| die
-}
-
-src_configure() {
-	emake setup
-}
-
-src_compile() {
-	build () {
-		gprbuild -p -m -j$(makeopts_jobs) \
-			-XBUILD=PROD -v -XGNATCOLL_VERSION=${PV} \
-			-XLIBRARY_TYPE=$1 -XXMLADA_BUILD=$* -XGPR_BUILD=$1 \
-			gnatcoll.gpr -cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS} || die
-	}
-	if use shared; then
-		build relocatable
-	fi
-	if use static-pic; then
-		build static-pic
-	fi
-	if use static-libs; then
-		build static
-	fi
-}
-
-src_install() {
-	if use shared; then
-		emake prefix="${D}"/usr install-relocatable
-	fi
-	if use static-pic; then
-		emake prefix="${D}"/usr install-static-pic
-	fi
-	if use static-libs; then
-		emake prefix="${D}"/usr install-static
-	fi
-	rm -r "${D}"/usr/share/gpr/manifests || die
-	einstalldocs
-	dodir /usr/share/gnatdoc
-	mv "${D}"/usr/share/doc/gnatcoll "${D}"/usr/share/gnatdoc/ || die
-}
diff --git a/dev-ada/gnatcoll-core/gnatcoll-core-22.0.0.ebuild b/dev-ada/gnatcoll-core/gnatcoll-core-22.0.0.ebuild
index decaee308a38..1c2caaebb172 100644
--- a/dev-ada/gnatcoll-core/gnatcoll-core-22.0.0.ebuild
+++ b/dev-ada/gnatcoll-core/gnatcoll-core-22.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,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/gnatcoll-core/gnatcoll-core-23.0.0.ebuild b/dev-ada/gnatcoll-core/gnatcoll-core-23.0.0.ebuild
index 66462b718a8a..02fc254f60e5 100644
--- a/dev-ada/gnatcoll-core/gnatcoll-core-23.0.0.ebuild
+++ b/dev-ada/gnatcoll-core/gnatcoll-core-23.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,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}"