commit: 3898ccf6e8bf0b1cbbdae55756435d05d9b747f5
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 3 18:48:06 2023 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Fri Feb 3 19:11:38 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3898ccf6
dev-ada/gtkada: stabilize and remove old
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
dev-ada/gtkada/Manifest | 2 -
dev-ada/gtkada/files/gtkada-2017-r1-gentoo.patch | 50 ------------------
dev-ada/gtkada/files/gtkada-2019-gentoo.patch | 11 ----
dev-ada/gtkada/files/gtkada-2021-uninstall.patch | 13 -----
dev-ada/gtkada/gtkada-2021-r1.ebuild | 67 ------------------------
dev-ada/gtkada/gtkada-22.0.0-r1.ebuild | 60 ---------------------
dev-ada/gtkada/gtkada-23.0.0-r1.ebuild | 4 +-
7 files changed, 2 insertions(+), 205 deletions(-)
diff --git a/dev-ada/gtkada/Manifest b/dev-ada/gtkada/Manifest
index df23bab64bf1..2d1e06147ff3 100644
--- a/dev-ada/gtkada/Manifest
+++ b/dev-ada/gtkada/Manifest
@@ -1,3 +1 @@
-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
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}
