| 1 |
commit: b1fbda8811d3e5afab053a8161d6c2190e62744b |
| 2 |
Author: Tupone Alfredo <tupone <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Nov 30 18:09:19 2017 +0000 |
| 4 |
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Nov 30 18:09:19 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1fbda88 |
| 7 |
|
| 8 |
dev-ada/aws: Defaulting some use flags |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.13, Repoman-2.3.3 |
| 11 |
|
| 12 |
dev-ada/aws/Manifest | 4 ++-- |
| 13 |
dev-ada/aws/aws-2016.ebuild | 2 +- |
| 14 |
dev-ada/aws/aws-2017.ebuild | 4 ++-- |
| 15 |
dev-ada/aws/files/aws-2017-gentoo.patch | 36 --------------------------------- |
| 16 |
4 files changed, 5 insertions(+), 41 deletions(-) |
| 17 |
|
| 18 |
diff --git a/dev-ada/aws/Manifest b/dev-ada/aws/Manifest |
| 19 |
index 6980bbcb182..fad602ea102 100644 |
| 20 |
--- a/dev-ada/aws/Manifest |
| 21 |
+++ b/dev-ada/aws/Manifest |
| 22 |
@@ -1,2 +1,2 @@ |
| 23 |
-DIST aws-gpl-2016-src.tar.gz 15054562 SHA256 310d7a79fba1cf622f6c8d53103226422c788126198911efef09e372d559db32 SHA512 296825e4683bbf4701a42d52cb0b58ebed8d3715972d0c5f83765987d1e96ab4d6d22835c37c043f49ae106fedf5d61ef22cbe348384c2de388519637e26df0b WHIRLPOOL 48428b840149064f96a1656074cfb2f308abdc546ece87d939ab2f95f05e668caafbe9969ab99770909739fe8a4013337cd1ea8b56a7ed06291114c5d812c62f |
| 24 |
-DIST aws-gpl-2017-src.tar.gz 12298806 SHA256 f7b2720f31c21c46bf4bca79e0921a4e796e6a4108be1bada1775eb2ba7fd935 SHA512 a7ddd332cbf3e699fdb7f734fba7dfabed2a92745bbc7fbd4ae5ea5da6a5e98c5434d7a9a3d7071d57b8294cc5c0c2a3802ded607e9402a1cf5e5bed8f5a8c35 WHIRLPOOL 41081537d1d017bb19d665c6b134b54b56d4841a98f713a94367c6e57915185f8ed7fe983ef641d79ce0cece09211fbd34220df81953dfee393d70824c5728d0 |
| 25 |
+DIST aws-gpl-2016-src.tar.gz 15054562 BLAKE2B b9d2c6824cc25a1f73dda4e8cfc957660225e6d52ee5f05e89104bbda9cd30e53879f545ade4c54a65e6aea18b1afa01d98da1328a96406bcdf3436492d67241 SHA512 296825e4683bbf4701a42d52cb0b58ebed8d3715972d0c5f83765987d1e96ab4d6d22835c37c043f49ae106fedf5d61ef22cbe348384c2de388519637e26df0b |
| 26 |
+DIST aws-gpl-2017-src.tar.gz 12298806 BLAKE2B 9c45d77dd44da11efe99c6e3128fc5920b39eaaf620e266b2dab394866c2d6a3cd1abe4eb01d9024960ef9046662c0df690f72c687fbe0a64b1021ed9c383828 SHA512 a7ddd332cbf3e699fdb7f734fba7dfabed2a92745bbc7fbd4ae5ea5da6a5e98c5434d7a9a3d7071d57b8294cc5c0c2a3802ded607e9402a1cf5e5bed8f5a8c35 |
| 27 |
|
| 28 |
diff --git a/dev-ada/aws/aws-2016.ebuild b/dev-ada/aws/aws-2016.ebuild |
| 29 |
index 90711d2b8ec..e0d11438277 100644 |
| 30 |
--- a/dev-ada/aws/aws-2016.ebuild |
| 31 |
+++ b/dev-ada/aws/aws-2016.ebuild |
| 32 |
@@ -14,7 +14,7 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/57399112c7a447658d00e1cd -> ${MY_P}. |
| 33 |
LICENSE="GPL-3" |
| 34 |
SLOT="0" |
| 35 |
KEYWORDS="~amd64" |
| 36 |
-IUSE="gnat_2016 gnat_2017" |
| 37 |
+IUSE="+gnat_2016 gnat_2017" |
| 38 |
|
| 39 |
RDEPEND="dev-ada/xmlada[gnat_2016=,gnat_2017=,static]" |
| 40 |
DEPEND="${RDEPEND} |
| 41 |
|
| 42 |
diff --git a/dev-ada/aws/aws-2017.ebuild b/dev-ada/aws/aws-2017.ebuild |
| 43 |
index c6f097ad1dc..919248e920a 100644 |
| 44 |
--- a/dev-ada/aws/aws-2017.ebuild |
| 45 |
+++ b/dev-ada/aws/aws-2017.ebuild |
| 46 |
@@ -15,7 +15,7 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed001 |
| 47 |
LICENSE="GPL-3" |
| 48 |
SLOT="0" |
| 49 |
KEYWORDS="~amd64" |
| 50 |
-IUSE="gnat_2016 gnat_2017" |
| 51 |
+IUSE="gnat_2016 +gnat_2017" |
| 52 |
|
| 53 |
RDEPEND="dev-ada/xmlada[gnat_2016=,gnat_2017=,static]" |
| 54 |
DEPEND="${RDEPEND} |
| 55 |
@@ -26,7 +26,7 @@ REQUIRED_USE="^^ ( gnat_2016 gnat_2017 )" |
| 56 |
|
| 57 |
S="${WORKDIR}"/${MY_P} |
| 58 |
|
| 59 |
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) |
| 60 |
+PATCHES=( "${FILESDIR}"/${PN}-2016-gentoo.patch ) |
| 61 |
|
| 62 |
src_configure() { |
| 63 |
emake -j1 setup prefix=/usr |
| 64 |
|
| 65 |
diff --git a/dev-ada/aws/files/aws-2017-gentoo.patch b/dev-ada/aws/files/aws-2017-gentoo.patch |
| 66 |
deleted file mode 100644 |
| 67 |
index b33073afa44..00000000000 |
| 68 |
--- a/dev-ada/aws/files/aws-2017-gentoo.patch |
| 69 |
+++ /dev/null |
| 70 |
@@ -1,36 +0,0 @@ |
| 71 |
---- aws-gpl-2016-src/shared.gpr.old 2017-01-30 20:00:39.022743691 +0100 |
| 72 |
-+++ aws-gpl-2016-src/shared.gpr 2017-01-30 20:01:20.524985069 +0100 |
| 73 |
-@@ -130,6 +130,7 @@ |
| 74 |
- package Compiler is |
| 75 |
- |
| 76 |
- for Driver ("Makefile") use ""; |
| 77 |
-+ for Driver ("C") use External ("GCC", "gcc"); |
| 78 |
- |
| 79 |
- case Build is |
| 80 |
- when "Debug" => |
| 81 |
-@@ -151,11 +151,11 @@ |
| 82 |
- end case; |
| 83 |
- |
| 84 |
- for Switches ("aws-attachments.adb") |
| 85 |
-- use Common_Options & Debug_Options & ("-gnatVn"); |
| 86 |
-+ use Common_Options & Debug_Options & ("-gnatVn") & Adaflags; |
| 87 |
- for Switches ("aws-session.adb") |
| 88 |
-- use Common_Options & Debug_Options & ("-gnatVn"); |
| 89 |
-+ use Common_Options & Debug_Options & ("-gnatVn") & Adaflags; |
| 90 |
- for Switches ("templates_parser.adb") |
| 91 |
-- use Common_Options & Debug_Options & ("-gnatVn"); |
| 92 |
-+ use Common_Options & Debug_Options & ("-gnatVn") & Adaflags; |
| 93 |
- -- Disable validity check on this unit to work-around N728-028 |
| 94 |
- |
| 95 |
- -- ADAFLAGS and CFLAGS should come last so that command line |
| 96 |
---- aws-gpl-2016-src/include/include.gpr.old 2017-02-17 22:09:14.361695926 +0100 |
| 97 |
-+++ aws-gpl-2016-src/include/include.gpr 2017-02-17 22:11:36.497215517 +0100 |
| 98 |
-@@ -54,7 +54,7 @@ |
| 99 |
- |
| 100 |
- when "Release" => |
| 101 |
- for Default_Switches ("Ada") use |
| 102 |
-- ("-gnat2012", "-O2", "-gnatws", "-gnatn") & Shared.Global_Options; |
| 103 |
-+ ("-gnat2012", "-O2", "-gnatws", "-gnatn") & Shared.Adaflags & Shared.Global_Options; |
| 104 |
- end case; |
| 105 |
- |
| 106 |
- case Shared.S_Target is |
Archives