commit:     3747a934fb4def8b683893e389cf066cefc2df25
Author:     Stephen L Arnold <nerdboy <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 26 03:22:38 2016 +0000
Commit:     Steve Arnold <nerdboy <AT> gentoo <DOT> org>
CommitDate: Sun Jun 26 06:19:54 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3747a934

virtual/gnat, gnatbuild.eclass: virtual and eclass cleanup.

This (mostly) addresses some QA issues and bugs 561968, and 558346.
Also, updated 4.6.4-r1 is on the way...

Package-Manager: portage-2.2.28

 virtual/gnat/gnat-3.4.ebuild                      | 8 +++++---
 virtual/gnat/gnat-4.1.ebuild                      | 8 +++++---
 virtual/gnat/gnat-4.2.ebuild                      | 6 ++++--
 virtual/gnat/gnat-4.3.ebuild                      | 6 ++++--
 virtual/gnat/gnat-4.4.ebuild                      | 6 ++++--
 virtual/gnat/{gnat-4.9.ebuild => gnat-4.6.ebuild} | 6 +++---
 virtual/gnat/gnat-4.9.ebuild                      | 2 +-
 7 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/virtual/gnat/gnat-3.4.ebuild b/virtual/gnat/gnat-3.4.ebuild
index 5374f8b..feaa9d2 100644
--- a/virtual/gnat/gnat-3.4.ebuild
+++ b/virtual/gnat/gnat-3.4.ebuild
@@ -1,7 +1,9 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+EAPI="5"
+
 DESCRIPTION="Virtual for the gnat compiler selection"
 HOMEPAGE=""
 SRC_URI=""
@@ -10,6 +12,6 @@ SLOT="3.4"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 RDEPEND="|| (
-       =dev-lang/gnat-gcc-3.4*
-       =dev-lang/gnat-gpl-3.4* )"
+       =dev-lang/gnat-gcc-${PV}*
+       =dev-lang/gnat-gpl-${PV}* )"
 DEPEND=""

diff --git a/virtual/gnat/gnat-4.1.ebuild b/virtual/gnat/gnat-4.1.ebuild
index 4a39cc5..6774953 100644
--- a/virtual/gnat/gnat-4.1.ebuild
+++ b/virtual/gnat/gnat-4.1.ebuild
@@ -1,7 +1,9 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+EAPI="5"
+
 DESCRIPTION="Virtual for the gnat compiler selection"
 HOMEPAGE=""
 SRC_URI=""
@@ -10,6 +12,6 @@ SLOT="4.1"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 RDEPEND="|| (
-       =dev-lang/gnat-gcc-4.1*
-       =dev-lang/gnat-gpl-4.1* )"
+       =dev-lang/gnat-gcc-${PV}*
+       =dev-lang/gnat-gpl-${PV}* )"
 DEPEND=""

diff --git a/virtual/gnat/gnat-4.2.ebuild b/virtual/gnat/gnat-4.2.ebuild
index 20ef62e..cef9305 100644
--- a/virtual/gnat/gnat-4.2.ebuild
+++ b/virtual/gnat/gnat-4.2.ebuild
@@ -1,7 +1,9 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+EAPI="5"
+
 DESCRIPTION="Virtual for the gnat compiler selection"
 HOMEPAGE=""
 SRC_URI=""
@@ -9,5 +11,5 @@ LICENSE=""
 SLOT="4.2"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
-RDEPEND="=dev-lang/gnat-gcc-4.2*"
+RDEPEND="=dev-lang/gnat-gcc-${PV}*"
 DEPEND=""

diff --git a/virtual/gnat/gnat-4.3.ebuild b/virtual/gnat/gnat-4.3.ebuild
index 7c0aecb..c8e50ea 100644
--- a/virtual/gnat/gnat-4.3.ebuild
+++ b/virtual/gnat/gnat-4.3.ebuild
@@ -1,7 +1,9 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+EAPI="5"
+
 DESCRIPTION="Virtual for the gnat compiler selection"
 HOMEPAGE=""
 SRC_URI=""
@@ -9,5 +11,5 @@ LICENSE=""
 SLOT="4.3"
 KEYWORDS="amd64 ~ppc x86"
 IUSE=""
-RDEPEND="=dev-lang/gnat-gcc-4.3*"
+RDEPEND="=dev-lang/gnat-gcc-${PV}*"
 DEPEND=""

diff --git a/virtual/gnat/gnat-4.4.ebuild b/virtual/gnat/gnat-4.4.ebuild
index 9d5e721..6f60dc7 100644
--- a/virtual/gnat/gnat-4.4.ebuild
+++ b/virtual/gnat/gnat-4.4.ebuild
@@ -1,7 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+EAPI="5"
+
 DESCRIPTION="Virtual for the gnat compiler selection"
 HOMEPAGE=""
 SRC_URI=""
@@ -9,5 +11,5 @@ LICENSE=""
 SLOT="4.3"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
-RDEPEND="=dev-lang/gnat-gcc-4.4*"
+RDEPEND="=dev-lang/gnat-gcc-${PV}*"
 DEPEND=""

diff --git a/virtual/gnat/gnat-4.9.ebuild b/virtual/gnat/gnat-4.6.ebuild
similarity index 73%
copy from virtual/gnat/gnat-4.9.ebuild
copy to virtual/gnat/gnat-4.6.ebuild
index 7775c47..f0c8cf4 100644
--- a/virtual/gnat/gnat-4.9.ebuild
+++ b/virtual/gnat/gnat-4.6.ebuild
@@ -8,8 +8,8 @@ DESCRIPTION="Virtual for the gnat compiler selection"
 HOMEPAGE=""
 SRC_URI=""
 LICENSE=""
-SLOT="4.9"
-KEYWORDS="~amd64 ~arm ~x86"
+SLOT="4.4"
+KEYWORDS="~amd64 ~arm ~sparc ~x86"
 IUSE=""
-RDEPEND="=dev-lang/gnat-gcc-4.9*"
+RDEPEND="=dev-lang/gnat-gcc-${PV}*"
 DEPEND=""

diff --git a/virtual/gnat/gnat-4.9.ebuild b/virtual/gnat/gnat-4.9.ebuild
index 7775c47..97f1ae7 100644
--- a/virtual/gnat/gnat-4.9.ebuild
+++ b/virtual/gnat/gnat-4.9.ebuild
@@ -11,5 +11,5 @@ LICENSE=""
 SLOT="4.9"
 KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""
-RDEPEND="=dev-lang/gnat-gcc-4.9*"
+RDEPEND="dev-lang/gnat-gcc:${PV}"
 DEPEND=""

Reply via email to