dev-ada/gtkada: enable gnat_2020, fix VariableScope

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Alfredo Tupone <tupone@gentoo.org>

4 files changed, 12 insertions, 73 deletions

diff --git a/dev-ada/gtkada/Manifest b/dev-ada/gtkada/Manifest
index 2af49593e9a9..22e98a52f7aa 100644
--- a/dev-ada/gtkada/Manifest
+++ b/dev-ada/gtkada/Manifest
@@ -1,3 +1 @@
 DIST gtkada-2019-20190424-19D98-src.tgz 12273911 BLAKE2B e2d0f3c410973d0412bf433f2e1cc60a5b00e9f34ad0471cb583596587e6073fdeb9b6441aa50dfa81894ce692101fe51c7714090477d585721571261737a823 SHA512 aed0758b42ee8eac752c2c83a0974ee0c7cddfa15149879472ff2fb8ee7565456a225ce783739ede76bc0f47340e97af5b5d1149e244611bcd3b3760e20f8cf5
-DIST gtkada-gpl-2017-src.tgz 11952333 BLAKE2B 2a333452ff271bba0521235598afdb1abebc4ceeab0f915f173862329ae0986b0fc4f654d3df28eac73af075db224c0b12340c3acd1e4ed0ffc965e4365f8b40 SHA512 f5bbb9ebdd966e70b3edcaaf359cb9e75edba3c3f4f8febfa7de9f634f8e96cd0dd1482fb16ad852b1c9f9b0e2c16eb3a437120d37f0638d90af666620f09f3f
-DIST gtkada-gpl-2018-src.tgz 11958880 BLAKE2B 4946918b52de5e15efc77411927812910d84d13cea66b86b1162b987c7849ba7fbb6da487881762f64005dc32a74fa73c9d759d25bb9ac0241d1d76cd4becbfb SHA512 9000de7675f8ee688b1c9cd93cf35b32f698aca8fc22d3b4e695d7c6b34feb60118cc687cf35432cd5ed9af7825eda7e20575a9fad4523a7b59cb0322bce0762
diff --git a/dev-ada/gtkada/gtkada-2018-r2.ebuild b/dev-ada/gtkada/gtkada-2018-r2.ebuild
deleted file mode 100644
index eab34d509ac2..000000000000
--- a/dev-ada/gtkada/gtkada-2018-r2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ADA_COMPAT=( gnat_201{6,7,8,9} )
-inherit ada autotools multiprocessing
-
-MYP=${PN}-gpl-${PV}
-
-DESCRIPTION="A complete Ada graphical toolkit"
-HOMEPAGE="http://libre.adacore.com//tools/gtkada/"
-SRC_URI="http://mirrors.cdn.adacore.com/art/5b0cf840c7a4475261f97ced
-	-> ${MYP}-src.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+shared static-libs"
-
-RDEPEND="${ADA_DEPS}
-	dev-libs/atk
-	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}"
-
-S="${WORKDIR}"/${MYP}-src
-
-PATCHES=( "${FILESDIR}"/${PN}-2017-r1-gentoo.patch )
-
-src_prepare() {
-	default
-	mv configure.{in,ac}
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--prefix="${D}/usr" \
-		$(use_enable static-libs static) \
-		$(use_enable shared) \
-		--without-GL
-}
-
-src_compile() {
-	emake -j1 PROCESSORS=$(makeopts_jobs)
-}
-
-src_install() {
-	emake -j1 install
-	einstalldocs
-}
diff --git a/dev-ada/gtkada/gtkada-2019-r1.ebuild b/dev-ada/gtkada/gtkada-2019-r1.ebuild
index 036d2b05dd8c..fe02b028c8b6 100644
--- a/dev-ada/gtkada/gtkada-2019-r1.ebuild
+++ b/dev-ada/gtkada/gtkada-2019-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -47,7 +47,6 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		--prefix="${D}/usr" \
 		$(use_enable static-libs static) \
 		$(use_enable shared) \
 		--without-GL
@@ -58,6 +57,6 @@ src_compile() {
 }
 
 src_install() {
-	emake -j1 install
+	emake -j1 DESTDIR="${D}"
 	einstalldocs
 }
diff --git a/dev-ada/gtkada/gtkada-2017-r1.ebuild b/dev-ada/gtkada/gtkada-2019-r2.ebuild
index 8c14fbefe835..d6f595288791 100644
--- a/dev-ada/gtkada/gtkada-2017-r1.ebuild
+++ b/dev-ada/gtkada/gtkada-2019-r2.ebuild
@@ -1,21 +1,21 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-ADA_COMPAT=( gnat_201{6,7} )
+ADA_COMPAT=( gnat_201{6..9} gnat_2020 )
 inherit ada autotools multiprocessing
 
-MYP=${PN}-gpl-${PV}
+MYP=${P}-20190424-19D98
 
 DESCRIPTION="A complete Ada graphical toolkit"
 HOMEPAGE="http://libre.adacore.com//tools/gtkada/"
-SRC_URI="http://mirrors.cdn.adacore.com/art/591ae7a8c7a4473fcbb154c9
+SRC_URI="http://mirrors.cdn.adacore.com/art/5ce7f58931e87adb2d312c53
 	-> ${MYP}-src.tgz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+shared static-libs"
 
 RDEPEND="${ADA_DEPS}
@@ -34,7 +34,10 @@ REQUIRED_USE="${ADA_REQUIRED_USE}"
 
 S="${WORKDIR}"/${MYP}-src
 
-PATCHES=( "${FILESDIR}"/${P}-r1-gentoo.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-2017-r1-gentoo.patch
+	"${FILESDIR}"/${P}-gentoo.patch
+)
 
 src_prepare() {
 	default
@@ -44,7 +47,6 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		--prefix="${D}/usr" \
 		$(use_enable static-libs static) \
 		$(use_enable shared) \
 		--without-GL
@@ -55,6 +57,6 @@ src_compile() {
 }
 
 src_install() {
-	emake -j1 install
+	emake -j1 DESTDIR="${D}"
 	einstalldocs
 }