dev-ada/aws: Defaulting some use flags

Package-Manager: Portage-2.3.13, Repoman-2.3.3

diff --git a/dev-ada/aws/Manifest b/dev-ada/aws/Manifest
index 6980bbcb182a69483459e5874c37f254105966b9..fad602ea10207582303fc4a6010ff33ab02936d0 100644 (file)
--- a/dev-ada/aws/Manifest
+++ b/dev-ada/aws/Manifest
@@ -1,2 +1,2 @@
-DIST aws-gpl-2016-src.tar.gz 15054562 SHA256 310d7a79fba1cf622f6c8d53103226422c788126198911efef09e372d559db32 SHA512 296825e4683bbf4701a42d52cb0b58ebed8d3715972d0c5f83765987d1e96ab4d6d22835c37c043f49ae106fedf5d61ef22cbe348384c2de388519637e26df0b WHIRLPOOL 48428b840149064f96a1656074cfb2f308abdc546ece87d939ab2f95f05e668caafbe9969ab99770909739fe8a4013337cd1ea8b56a7ed06291114c5d812c62f
-DIST aws-gpl-2017-src.tar.gz 12298806 SHA256 f7b2720f31c21c46bf4bca79e0921a4e796e6a4108be1bada1775eb2ba7fd935 SHA512 a7ddd332cbf3e699fdb7f734fba7dfabed2a92745bbc7fbd4ae5ea5da6a5e98c5434d7a9a3d7071d57b8294cc5c0c2a3802ded607e9402a1cf5e5bed8f5a8c35 WHIRLPOOL 41081537d1d017bb19d665c6b134b54b56d4841a98f713a94367c6e57915185f8ed7fe983ef641d79ce0cece09211fbd34220df81953dfee393d70824c5728d0
+DIST aws-gpl-2016-src.tar.gz 15054562 BLAKE2B b9d2c6824cc25a1f73dda4e8cfc957660225e6d52ee5f05e89104bbda9cd30e53879f545ade4c54a65e6aea18b1afa01d98da1328a96406bcdf3436492d67241 SHA512 296825e4683bbf4701a42d52cb0b58ebed8d3715972d0c5f83765987d1e96ab4d6d22835c37c043f49ae106fedf5d61ef22cbe348384c2de388519637e26df0b
+DIST aws-gpl-2017-src.tar.gz 12298806 BLAKE2B 9c45d77dd44da11efe99c6e3128fc5920b39eaaf620e266b2dab394866c2d6a3cd1abe4eb01d9024960ef9046662c0df690f72c687fbe0a64b1021ed9c383828 SHA512 a7ddd332cbf3e699fdb7f734fba7dfabed2a92745bbc7fbd4ae5ea5da6a5e98c5434d7a9a3d7071d57b8294cc5c0c2a3802ded607e9402a1cf5e5bed8f5a8c35

diff --git a/dev-ada/aws/aws-2016.ebuild b/dev-ada/aws/aws-2016.ebuild
index 90711d2b8ec5e7b3a110926f45491a1d3fbe2ceb..e0d114382774e1d5bb44d1ee50dbb3fab50ad9ad 100644 (file)
--- a/dev-ada/aws/aws-2016.ebuild
+++ b/dev-ada/aws/aws-2016.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/57399112c7a447658d00e1cd -> ${MY_P}.
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="gnat_2016 gnat_2017"
+IUSE="+gnat_2016 gnat_2017"
 
 RDEPEND="dev-ada/xmlada[gnat_2016=,gnat_2017=,static]"
 DEPEND="${RDEPEND}

diff --git a/dev-ada/aws/aws-2017.ebuild b/dev-ada/aws/aws-2017.ebuild
index c6f097ad1dce66cce69792a60ea515f44955c1f3..919248e920a42f42769bf4c838ee61abd82467fc 100644 (file)
--- a/dev-ada/aws/aws-2017.ebuild
+++ b/dev-ada/aws/aws-2017.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed001
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="gnat_2016 gnat_2017"
+IUSE="gnat_2016 +gnat_2017"
 
 RDEPEND="dev-ada/xmlada[gnat_2016=,gnat_2017=,static]"
 DEPEND="${RDEPEND}
@@ -26,7 +26,7 @@ REQUIRED_USE="^^ ( gnat_2016 gnat_2017 )"
 
 S="${WORKDIR}"/${MY_P}
 
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+PATCHES=( "${FILESDIR}"/${PN}-2016-gentoo.patch )
 
 src_configure() {
        emake -j1 setup prefix=/usr

diff --git a/dev-ada/aws/files/aws-2017-gentoo.patch b/dev-ada/aws/files/aws-2017-gentoo.patch
deleted file mode 100644 (file)
index b33073a..0000000
--- a/dev-ada/aws/files/aws-2017-gentoo.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- aws-gpl-2016-src/shared.gpr.old    2017-01-30 20:00:39.022743691 +0100
-+++ aws-gpl-2016-src/shared.gpr        2017-01-30 20:01:20.524985069 +0100
-@@ -130,6 +130,7 @@
-    package Compiler is
- 
-       for Driver ("Makefile") use "";
-+      for Driver ("C") use External ("GCC", "gcc");
- 
-       case Build is
-          when "Debug" =>
-@@ -151,11 +151,11 @@
-       end case;
- 
-       for Switches ("aws-attachments.adb")
--        use Common_Options & Debug_Options & ("-gnatVn");
-+        use Common_Options & Debug_Options & ("-gnatVn") & Adaflags;
-       for Switches ("aws-session.adb")
--        use Common_Options & Debug_Options & ("-gnatVn");
-+        use Common_Options & Debug_Options & ("-gnatVn") & Adaflags;
-       for Switches ("templates_parser.adb")
--        use Common_Options & Debug_Options & ("-gnatVn");
-+        use Common_Options & Debug_Options & ("-gnatVn") & Adaflags;
-       --  Disable validity check on this unit to work-around N728-028
- 
-       --  ADAFLAGS and CFLAGS should come last so that command line
---- aws-gpl-2016-src/include/include.gpr.old   2017-02-17 22:09:14.361695926 +0100
-+++ aws-gpl-2016-src/include/include.gpr       2017-02-17 22:11:36.497215517 +0100
-@@ -54,7 +54,7 @@
- 
-          when "Release" =>
-             for Default_Switches ("Ada") use
--              ("-gnat2012", "-O2", "-gnatws", "-gnatn") & Shared.Global_Options;
-+              ("-gnat2012", "-O2", "-gnatws", "-gnatn") & Shared.Adaflags & Shared.Global_Options;
-       end case;
- 
-       case Shared.S_Target is