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

7 files changed, 38 insertions, 13 deletions

diff --git a/virtual/gnat/gnat-3.4.ebuild b/virtual/gnat/gnat-3.4.ebuild
index 5374f8bb9024..feaa9d2f5844 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 4a39cc567c86..67749539bd8d 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 20ef62e37f5c..cef9305bd016 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 7c0aecb8f9cc..c8e50eabc868 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 9d5e721a657d..6f60dc7ced61 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.6.ebuild b/virtual/gnat/gnat-4.6.ebuild
new file mode 100644
index 000000000000..f0c8cf4ec0f2
--- /dev/null
+++ b/virtual/gnat/gnat-4.6.ebuild
@@ -0,0 +1,15 @@
+# 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=""
+LICENSE=""
+SLOT="4.4"
+KEYWORDS="~amd64 ~arm ~sparc ~x86"
+IUSE=""
+RDEPEND="=dev-lang/gnat-gcc-${PV}*"
+DEPEND=""
diff --git a/virtual/gnat/gnat-4.9.ebuild b/virtual/gnat/gnat-4.9.ebuild
index 7775c472ff89..97f1ae7c190a 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=""