[gentoo-commits] repo/gentoo:master commit in: dev-ada/xmlada/files/, dev-ada/xmlada/

["Alfredo Tupone" <tupone@gentoo.org>]

commit:     55c470a2a57550a4adf7d134d05a281f644f82f3
Author:     Tupone Alfredo <tupone <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 20 19:29:58 2017 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Tue Jun 20 19:29:58 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55c470a2

dev-ada/xmlada: Respect ADA (env vars)

Package-Manager: Portage-2.3.5, Repoman-2.3.1

 dev-ada/xmlada/files/xmlada-2016-gentoo.patch | 10 ++++++++++
 dev-ada/xmlada/files/xmlada-2017-gentoo.patch | 10 ++++++++++
 dev-ada/xmlada/xmlada-2016.ebuild             |  5 +++--
 dev-ada/xmlada/xmlada-2017.ebuild             |  4 +++-
 dev-ada/xmlada/xmlada-9999.ebuild             |  2 +-
 5 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/dev-ada/xmlada/files/xmlada-2016-gentoo.patch b/dev-ada/xmlada/files/xmlada-2016-gentoo.patch
index 7c28a02289f..820fa526edc 100644
--- a/dev-ada/xmlada/files/xmlada-2016-gentoo.patch
+++ b/dev-ada/xmlada/files/xmlada-2016-gentoo.patch
@@ -17,3 +17,13 @@
  
  # Rebuild the tests (and not the XML/Ada code itself)
  test: force
+--- xmlada-gpl-2016-src/shared.gpr.in.old	2017-06-20 21:22:08.312775803 +0200
++++ xmlada-gpl-2016-src/shared.gpr.in	2017-06-20 21:22:47.486201843 +0200
+@@ -76,6 +76,7 @@
+          when "profile" =>
+             for Switches ("Ada") use warnings & ("-g", "-pg");
+       end case;
++      for Driver ("Ada") use External ("ADA", "gcc");
+    end compiler;
+ 
+    package binder is

diff --git a/dev-ada/xmlada/files/xmlada-2017-gentoo.patch b/dev-ada/xmlada/files/xmlada-2017-gentoo.patch
new file mode 100644
index 00000000000..cdf5da8bb5f
--- /dev/null
+++ b/dev-ada/xmlada/files/xmlada-2017-gentoo.patch
@@ -0,0 +1,10 @@
+--- xmlada-gpl-2016-src/shared.gpr.in.old	2017-06-20 21:22:08.312775803 +0200
++++ xmlada-gpl-2016-src/shared.gpr.in	2017-06-20 21:22:47.486201843 +0200
+@@ -76,6 +76,7 @@
+          when "profile" =>
+             for Switches ("Ada") use warnings & ("-g", "-pg");
+       end case;
++      for Driver ("Ada") use External ("ADA", "gcc");
+    end compiler;
+ 
+    package binder is

diff --git a/dev-ada/xmlada/xmlada-2016.ebuild b/dev-ada/xmlada/xmlada-2016.ebuild
index e686d810507..4b64587e5d4 100644
--- a/dev-ada/xmlada/xmlada-2016.ebuild
+++ b/dev-ada/xmlada/xmlada-2016.ebuild
@@ -9,7 +9,8 @@ MYP=${PN}-gpl-${PV}
 
 DESCRIPTION="Set of modules that provide a simple manipulation of XML streams"
 HOMEPAGE="http://libre.adacore.com/"
-SRC_URI="http://mirrors.cdn.adacore.com/art/57399978c7a447658e0affc0 -> ${MYP}-src.tar.gz"
+SRC_URI="http://mirrors.cdn.adacore.com/art/57399978c7a447658e0affc0 ->
+	${MYP}-src.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -17,7 +18,7 @@ KEYWORDS="~amd64"
 IUSE="+shared static static-pic"
 REQUIRED_USE="|| ( shared static static-pic )"
 
-RDEPEND="dev-lang/gnat-gpl:="
+RDEPEND="dev-lang/gnat-gpl:*"
 DEPEND="${RDEPEND}
 	dev-ada/gprbuild"
 

diff --git a/dev-ada/xmlada/xmlada-2017.ebuild b/dev-ada/xmlada/xmlada-2017.ebuild
index 7b42b318871..0b67a93ace6 100644
--- a/dev-ada/xmlada/xmlada-2017.ebuild
+++ b/dev-ada/xmlada/xmlada-2017.ebuild
@@ -18,12 +18,14 @@ KEYWORDS="~amd64"
 IUSE="+shared static static-pic"
 REQUIRED_USE="|| ( shared static static-pic )"
 
-RDEPEND="dev-lang/gnat-gpl:="
+RDEPEND="dev-lang/gnat-gpl:*"
 DEPEND="${RDEPEND}
 	dev-ada/gprbuild"
 
 S="${WORKDIR}"/${MYP}-src
 
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
 src_configure () {
 	econf --prefix="${D}"/usr
 }

diff --git a/dev-ada/xmlada/xmlada-9999.ebuild b/dev-ada/xmlada/xmlada-9999.ebuild
index f5ea599e78f..8527add2006 100644
--- a/dev-ada/xmlada/xmlada-9999.ebuild
+++ b/dev-ada/xmlada/xmlada-9999.ebuild
@@ -18,7 +18,7 @@ KEYWORDS=""
 IUSE="+shared static static-pic"
 REQUIRED_USE="|| ( shared static static-pic )"
 
-RDEPEND="dev-lang/gnat-gpl:="
+RDEPEND="dev-lang/gnat-gpl:*"
 DEPEND="${RDEPEND}
 	dev-ada/gprbuild"