| 1 |
commit: 55c470a2a57550a4adf7d134d05a281f644f82f3 |
| 2 |
Author: Tupone Alfredo <tupone <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jun 20 19:29:58 2017 +0000 |
| 4 |
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jun 20 19:29:58 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55c470a2 |
| 7 |
|
| 8 |
dev-ada/xmlada: Respect ADA (env vars) |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.5, Repoman-2.3.1 |
| 11 |
|
| 12 |
dev-ada/xmlada/files/xmlada-2016-gentoo.patch | 10 ++++++++++ |
| 13 |
dev-ada/xmlada/files/xmlada-2017-gentoo.patch | 10 ++++++++++ |
| 14 |
dev-ada/xmlada/xmlada-2016.ebuild | 5 +++-- |
| 15 |
dev-ada/xmlada/xmlada-2017.ebuild | 4 +++- |
| 16 |
dev-ada/xmlada/xmlada-9999.ebuild | 2 +- |
| 17 |
5 files changed, 27 insertions(+), 4 deletions(-) |
| 18 |
|
| 19 |
diff --git a/dev-ada/xmlada/files/xmlada-2016-gentoo.patch b/dev-ada/xmlada/files/xmlada-2016-gentoo.patch |
| 20 |
index 7c28a02289f..820fa526edc 100644 |
| 21 |
--- a/dev-ada/xmlada/files/xmlada-2016-gentoo.patch |
| 22 |
+++ b/dev-ada/xmlada/files/xmlada-2016-gentoo.patch |
| 23 |
@@ -17,3 +17,13 @@ |
| 24 |
|
| 25 |
# Rebuild the tests (and not the XML/Ada code itself) |
| 26 |
test: force |
| 27 |
+--- xmlada-gpl-2016-src/shared.gpr.in.old 2017-06-20 21:22:08.312775803 +0200 |
| 28 |
++++ xmlada-gpl-2016-src/shared.gpr.in 2017-06-20 21:22:47.486201843 +0200 |
| 29 |
+@@ -76,6 +76,7 @@ |
| 30 |
+ when "profile" => |
| 31 |
+ for Switches ("Ada") use warnings & ("-g", "-pg"); |
| 32 |
+ end case; |
| 33 |
++ for Driver ("Ada") use External ("ADA", "gcc"); |
| 34 |
+ end compiler; |
| 35 |
+ |
| 36 |
+ package binder is |
| 37 |
|
| 38 |
diff --git a/dev-ada/xmlada/files/xmlada-2017-gentoo.patch b/dev-ada/xmlada/files/xmlada-2017-gentoo.patch |
| 39 |
new file mode 100644 |
| 40 |
index 00000000000..cdf5da8bb5f |
| 41 |
--- /dev/null |
| 42 |
+++ b/dev-ada/xmlada/files/xmlada-2017-gentoo.patch |
| 43 |
@@ -0,0 +1,10 @@ |
| 44 |
+--- xmlada-gpl-2016-src/shared.gpr.in.old 2017-06-20 21:22:08.312775803 +0200 |
| 45 |
++++ xmlada-gpl-2016-src/shared.gpr.in 2017-06-20 21:22:47.486201843 +0200 |
| 46 |
+@@ -76,6 +76,7 @@ |
| 47 |
+ when "profile" => |
| 48 |
+ for Switches ("Ada") use warnings & ("-g", "-pg"); |
| 49 |
+ end case; |
| 50 |
++ for Driver ("Ada") use External ("ADA", "gcc"); |
| 51 |
+ end compiler; |
| 52 |
+ |
| 53 |
+ package binder is |
| 54 |
|
| 55 |
diff --git a/dev-ada/xmlada/xmlada-2016.ebuild b/dev-ada/xmlada/xmlada-2016.ebuild |
| 56 |
index e686d810507..4b64587e5d4 100644 |
| 57 |
--- a/dev-ada/xmlada/xmlada-2016.ebuild |
| 58 |
+++ b/dev-ada/xmlada/xmlada-2016.ebuild |
| 59 |
@@ -9,7 +9,8 @@ MYP=${PN}-gpl-${PV} |
| 60 |
|
| 61 |
DESCRIPTION="Set of modules that provide a simple manipulation of XML streams" |
| 62 |
HOMEPAGE="http://libre.adacore.com/" |
| 63 |
-SRC_URI="http://mirrors.cdn.adacore.com/art/57399978c7a447658e0affc0 -> ${MYP}-src.tar.gz" |
| 64 |
+SRC_URI="http://mirrors.cdn.adacore.com/art/57399978c7a447658e0affc0 -> |
| 65 |
+ ${MYP}-src.tar.gz" |
| 66 |
|
| 67 |
LICENSE="GPL-3" |
| 68 |
SLOT="0" |
| 69 |
@@ -17,7 +18,7 @@ KEYWORDS="~amd64" |
| 70 |
IUSE="+shared static static-pic" |
| 71 |
REQUIRED_USE="|| ( shared static static-pic )" |
| 72 |
|
| 73 |
-RDEPEND="dev-lang/gnat-gpl:=" |
| 74 |
+RDEPEND="dev-lang/gnat-gpl:*" |
| 75 |
DEPEND="${RDEPEND} |
| 76 |
dev-ada/gprbuild" |
| 77 |
|
| 78 |
|
| 79 |
diff --git a/dev-ada/xmlada/xmlada-2017.ebuild b/dev-ada/xmlada/xmlada-2017.ebuild |
| 80 |
index 7b42b318871..0b67a93ace6 100644 |
| 81 |
--- a/dev-ada/xmlada/xmlada-2017.ebuild |
| 82 |
+++ b/dev-ada/xmlada/xmlada-2017.ebuild |
| 83 |
@@ -18,12 +18,14 @@ KEYWORDS="~amd64" |
| 84 |
IUSE="+shared static static-pic" |
| 85 |
REQUIRED_USE="|| ( shared static static-pic )" |
| 86 |
|
| 87 |
-RDEPEND="dev-lang/gnat-gpl:=" |
| 88 |
+RDEPEND="dev-lang/gnat-gpl:*" |
| 89 |
DEPEND="${RDEPEND} |
| 90 |
dev-ada/gprbuild" |
| 91 |
|
| 92 |
S="${WORKDIR}"/${MYP}-src |
| 93 |
|
| 94 |
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) |
| 95 |
+ |
| 96 |
src_configure () { |
| 97 |
econf --prefix="${D}"/usr |
| 98 |
} |
| 99 |
|
| 100 |
diff --git a/dev-ada/xmlada/xmlada-9999.ebuild b/dev-ada/xmlada/xmlada-9999.ebuild |
| 101 |
index f5ea599e78f..8527add2006 100644 |
| 102 |
--- a/dev-ada/xmlada/xmlada-9999.ebuild |
| 103 |
+++ b/dev-ada/xmlada/xmlada-9999.ebuild |
| 104 |
@@ -18,7 +18,7 @@ KEYWORDS="" |
| 105 |
IUSE="+shared static static-pic" |
| 106 |
REQUIRED_USE="|| ( shared static static-pic )" |
| 107 |
|
| 108 |
-RDEPEND="dev-lang/gnat-gpl:=" |
| 109 |
+RDEPEND="dev-lang/gnat-gpl:*" |
| 110 |
DEPEND="${RDEPEND} |
| 111 |
dev-ada/gprbuild" |
Archives