7 files changed, 3 insertions, 211 deletions
diff --git a/dev-ada/gtkada/Manifest b/dev-ada/gtkada/Manifest
index 3b17d972236b..e48f7d4fc25b 100644
--- a/dev-ada/gtkada/Manifest
+++ b/dev-ada/gtkada/Manifest
@@ -1,11 +1,4 @@
-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
 AUX gtkada-23.0.0-gentoo.patch 2408 BLAKE2B 658863cebee256a7dc59f66cb852a5ab322291393e4a7a97b194d4724e0ae8dc01e048c7cd5ee375ea812d4b144216d2ab0487e278b32935aa772aa45e43d3df SHA512 8e84c77b45b97db1b60b830afb151bcdb76bac32585a5ba2131beb9f9252fba3b41b7b2fb03eb6c7e7714c5307faa189cee6c16529470780e66117f4d95682e8
-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
 DIST gtkada-23.0.0.tar.gz 6045493 BLAKE2B 05efb40453aa6f3ebd3beaf3dd7915bc2cca8cfec211bc6ae2f0a7a15f16029b1142028422367dbd4f68e72e02b71c030eec39802b0f9202e411d611a1fe521b SHA512 ea5dffe4fe1b99cfbd952bace510aff9e0f79fe2fa075c299d12e68dfb43b6334df0d707631de30e6e2c3a80759d342b178e8ed29a82e90445e450cfd332767f
-EBUILD gtkada-2021-r1.ebuild 1417 BLAKE2B 107c8fec3c75286a4b226b57b42480805a10d6b350d2fb0ed16d61f9ea20ed2e4440963d754e5b07aa4463489576d1b5f5addd1a508f4812b629df21dd6f4ebc SHA512 be586bb4100203bfa9bc7719d47f0dc23614e053f58bca3ca766ae30b6f6544f432bc76fd1d2121b589daf2ea567464ebbaaaa66a070d6332c54058982517d5e
-EBUILD gtkada-22.0.0-r1.ebuild 1214 BLAKE2B 8b293c1185334ae22e61219fc01805a8f133336ccb89a33a050f3bb9e7d91eda81512121b87a599d50e7963a102acac467a8d01b077c3bb1325c1f4538d8af3d SHA512 917f8dd25f03d9fc5814875c6b497d32a96f2ec4ffcc53d01bdb30c3a96a7c692fd49de1925ff280f9d69320c89337f4e99b2739a080b8e68c007387267d1bd5
-EBUILD gtkada-23.0.0-r1.ebuild 1077 BLAKE2B 1c57f8f2d53e6b76454326e7ddcbc36f170650678184189105535632ad7250c925cc02bf7466a3302ae4d068e326f0436477f4eefbf951d2301565e91d74e1fe SHA512 d78987888ae61c78ea036b56f4b67e11aa1e7a48cf687d6f2b7d3374d75694b3c07812aef9aaa3bc842d8b5c4a1bcf8e4d8c0934bfb9ec0c920b58d4ae467b76
+EBUILD gtkada-23.0.0-r1.ebuild 1075 BLAKE2B 6d450bc33018b960b5385a40359301f8613825b9ca96bd091f9e012da2a6ba0ec18496ffc2d1a05f868316ff6a46d71281a58e4085bc375e5287dd821572da68 SHA512 14c609b15840de38b9006dfe1ad481f549a805a22c7964a429fbe9104538db25635455429306314ef4c2bb7afebdfb7a0cfa070873913594dc254a58c93093b2
 MISC metadata.xml 688 BLAKE2B d3ea42354ba10dd872affbaeb5a14833cc2254bed85f10e15871c8131a46d3f996948b2fffb9d9aa795c914e4e9dc5d3f34e86666a2526c566d4b03fa14bf121 SHA512 ce18831b728277d125cf4cd86522a238ec17f4cab007958212c95f3ee97fedbdb827749549e0ea4eff93dc74022d61515d116f3fe606db34496e9045b8c23778
diff --git a/dev-ada/gtkada/files/gtkada-2017-r1-gentoo.patch b/dev-ada/gtkada/files/gtkada-2017-r1-gentoo.patch
deleted file mode 100644
index 0dbbbe720d05..000000000000
--- a/dev-ada/gtkada/files/gtkada-2017-r1-gentoo.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- gtkada-gpl-2016-src/Makefile.in.old	2017-01-21 22:42:18.319969095 +0100
-+++ gtkada-gpl-2016-src/Makefile.in	2017-01-21 22:42:33.989700236 +0100
-@@ -60,30 +60,33 @@
- LIBRARY_TYPE_FOR_TOOLS=static
- endif
- 
--all: tools tests
-+all: tools
- static: build_library_type/static
- relocatable: build_library_type/relocatable
- 
- tools:
- 	@echo "====== Building tools ====="
--	${GPRBUILD_FULL} -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) -Psrc/tools/tools.gpr
-+	${GPRBUILD_FULL} -v -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) \
-+	  -Psrc/tools/tools.gpr -cargs:Ada $(ADAFLAGS)
- 
- build_library_type/%:  src/gtkada-intl.adb
- 	@echo "====== Building $(@F) libraries ====="
--	${GPRBUILD_FULL} -XLIBRARY_TYPE=$(@F) -Psrc/gtkada.gpr
-+	${GPRBUILD_FULL} -v -XLIBRARY_TYPE=$(@F) -Psrc/gtkada.gpr \
-+	  -cargs:Ada $(ADAFLAGS) -cargs:C $(CFLAGS)
- ifeq (${HAVE_OPENGL}, True)
- 	${GPRBUILD_FULL} -XLIBRARY_TYPE=$(@F) -Psrc/opengl/gtkada_gl.gpr
- endif
- 
- src/gtkada-intl.adb: src/gtkada-intl.gpb Makefile
- 	gnatprep -DGETTEXT_INTL=$(GETTEXT_INTL) -DHAVE_GETTEXT=$(HAVE_GETTEXT) src/gtkada-intl.gpb $@
- 
- testgtk/opengl/view_gl.adb: testgtk/opengl/view_gl.gpb Makefile
- 	gnatprep -r -c -DHAVE_GL=${HAVE_OPENGL} -DWIN32=False testgtk/opengl/view_gl.gpb $@
- 
- tests: testgtk/opengl/view_gl.adb
- 	@echo "====== Building tests ====="
--	cd testgtk; ${GPRBUILD_FULL} -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) -Ptestgtk.gpr -aP ../src
-+	cd testgtk; ${GPRBUILD_FULL} -v -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) \
-+	  -Ptestgtk.gpr -aP ../src -cargs:Ada $(ADAFLAGS)
- 
- install/%: force
- 	${GPRINSTALL_FULL} -XLIBRARY_TYPE=$(@F) --build-name=$(@F) \
-@@ -121,9 +121,6 @@
- install: install-clean
- 	${GPRINSTALL_FULL} -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) \
- 		--mode=usage -Psrc/tools/tools.gpr
--	cd testgtk; ${GPRINSTALL_FULL} -XLIBRARY_TYPE=$(LIBRARY_TYPE_FOR_TOOLS) \
--		--mode=usage --exec-subdir=${DESTDIR}${exampledir} \
--		-Ptestgtk.gpr -aP ../src
- 
- 	@echo '-----------------------------------------------------------------------'
- 	@echo '--  GtkAda has now been installed.                                   --'
diff --git a/dev-ada/gtkada/files/gtkada-2019-gentoo.patch b/dev-ada/gtkada/files/gtkada-2019-gentoo.patch
deleted file mode 100644
index 79f58a41b2d1..000000000000
--- a/dev-ada/gtkada/files/gtkada-2019-gentoo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile.in	2019-09-21 18:47:40.749628914 +0200
-+++ b/Makefile.in	2019-09-21 18:48:08.547200073 +0200
-@@ -30,7 +30,7 @@
- 
- GPRBUILD_FULL = ${GPRBUILD} -j${PROCESSORS} -m -p ${GPRBUILD_SWITCHES}
- GPRINSTALL_FULL = ${GPRINSTALL} -p -f --project-subdir=$(PRJDIR) \
--	--build-var=GTKADA_BUILD,LIBRARY_TYPE --install-name=gtkada \
-+	--build-var=LIBRARY_TYPE --install-name=gtkada \
- 	--prefix=${DESTDIR}$(prefix) -XGTK_PREFIX=${prefix}
- 
- GETTEXT_INTL=@GETTEXT_INTL@
diff --git a/dev-ada/gtkada/files/gtkada-2021-uninstall.patch b/dev-ada/gtkada/files/gtkada-2021-uninstall.patch
deleted file mode 100644
index c782aac633b7..000000000000
--- a/dev-ada/gtkada/files/gtkada-2021-uninstall.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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-r1.ebuild b/dev-ada/gtkada/gtkada-2021-r1.ebuild
deleted file mode 100644
index fba47ffdfa82..000000000000
--- a/dev-ada/gtkada/gtkada-2021-r1.ebuild
+++ /dev/null
@@ -1,67 +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 autotools multiprocessing
-
-MYP=${P}-${PV}0518-1A011-src
-ADAMIRROR=https://community.download.adacore.com/v1
-ID=8f1daefcb56e3ee7feaad67bac66deb0f7c37a82
-
-DESCRIPTION="A complete Ada graphical toolkit"
-HOMEPAGE="http://libre.adacore.com//tools/gtkada/"
-SRC_URI="${ADAMIRROR}/${ID}?filename=${MYP}.tar.gz -> ${MYP}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+shared static-libs"
-
-RDEPEND="${ADA_DEPS}
-	app-accessibility/at-spi2-core
-	dev-libs/glib:2
-	media-libs/fontconfig
-	media-libs/freetype
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3
-	x11-libs/pango"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[${ADA_USEDEP}]"
-
-REQUIRED_USE="${ADA_REQUIRED_USE}
-	|| ( shared static-libs )"
-
-S="${WORKDIR}"/${MYP}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2017-r1-gentoo.patch
-	"${FILESDIR}"/${PN}-2019-gentoo.patch
-	"${FILESDIR}"/${P}-uninstall.patch
-)
-
-src_prepare() {
-	default
-	mv configure.{in,ac} || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable shared) \
-		--without-GL
-}
-
-src_compile() {
-	emake -j1 PROCESSORS=$(makeopts_jobs)
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install
-	einstalldocs
-	mv "${D}"/usr/share/doc/${PN}/${PN}_* "${D}"/usr/share/doc/${PF} || die
-	rmdir "${D}"/usr/share/doc/${PN} || die
-}
diff --git a/dev-ada/gtkada/gtkada-22.0.0-r1.ebuild b/dev-ada/gtkada/gtkada-22.0.0-r1.ebuild
deleted file mode 100644
index cb04aaa50040..000000000000
--- a/dev-ada/gtkada/gtkada-22.0.0-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2022 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 autotools multiprocessing
-
-DESCRIPTION="A complete Ada graphical toolkit"
-HOMEPAGE="http://libre.adacore.com//tools/gtkada/"
-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"
-
-RDEPEND="${ADA_DEPS}
-	app-accessibility/at-spi2-core
-	dev-libs/glib:2
-	media-libs/fontconfig
-	media-libs/freetype
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3
-	x11-libs/pango"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[${ADA_USEDEP}]"
-
-REQUIRED_USE="${ADA_REQUIRED_USE}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2017-r1-gentoo.patch
-	"${FILESDIR}"/${PN}-2019-gentoo.patch
-	"${FILESDIR}"/${PN}-2021-uninstall.patch
-)
-
-src_prepare() {
-	default
-	mv configure.{in,ac} || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable shared) \
-		$(use_enable static-pic) \
-		--without-GL
-}
-
-src_compile() {
-	emake -j1 PROCESSORS=$(makeopts_jobs)
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install
-	einstalldocs
-}
diff --git a/dev-ada/gtkada/gtkada-23.0.0-r1.ebuild b/dev-ada/gtkada/gtkada-23.0.0-r1.ebuild
index 3a6423ea98e4..db3837e5aaaf 100644
--- a/dev-ada/gtkada/gtkada-23.0.0-r1.ebuild
+++ b/dev-ada/gtkada/gtkada-23.0.0-r1.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
@@ -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"
 
 RDEPEND="${ADA_DEPS}