gentoo resync : 01.12.2017

4 files changed, 7 insertions, 44 deletions

diff --git a/dev-ada/aws/Manifest b/dev-ada/aws/Manifest
index 0e3e17085b05..244d98241783 100644
--- a/dev-ada/aws/Manifest
+++ b/dev-ada/aws/Manifest
@@ -1,7 +1,6 @@
 AUX aws-2016-gentoo.patch 1510 BLAKE2B 86cbe9166f800a1b8a3a7d388ff256c17527c85665ad0dd32408d180de59357b5f9a593d7e3ebb3bc511a0a234b2549f7e2e090cdc85e1ed98547cad1d3b5f02 SHA512 29f121d22f1dd21a1228a96c15ba28a61da1e07bdb57ae5f0ba2babb2c8d0b38bab21edeb44fb8480fcb4c9bdf55b1f20f7d6b3668943a1814a5564dd168c92d
-AUX aws-2017-gentoo.patch 1510 BLAKE2B 86cbe9166f800a1b8a3a7d388ff256c17527c85665ad0dd32408d180de59357b5f9a593d7e3ebb3bc511a0a234b2549f7e2e090cdc85e1ed98547cad1d3b5f02 SHA512 29f121d22f1dd21a1228a96c15ba28a61da1e07bdb57ae5f0ba2babb2c8d0b38bab21edeb44fb8480fcb4c9bdf55b1f20f7d6b3668943a1814a5564dd168c92d
-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
-EBUILD aws-2016.ebuild 1062 BLAKE2B 44b9e5049f4380992e3dc308b65d5456e755de8f3e51bbe5df32b715de672c222ea2e421791aac784037d3cbe1e67fb6a2ab3649c029dce78917a0bda730c324 SHA512 fe58623d1d1f86c84d9f79f9c2fd5a98b50637296b0898db633a74726628100a4b5fd6d12019f04718e8b26d1d8593a5ea41c2c1dc15fccf02b078b65e670d2b
-EBUILD aws-2017.ebuild 1063 BLAKE2B 8fa9794d13545a3c1e2c18b77824e1954fe64302bead932eb9ef501606e522a387dca281febf5bbf6364c557ed8c369680b55aa166889fd6161125b96aee622f SHA512 eaf0879a32e26dbc58abd5a8a36991a616a14222c3dd6f46661d72f5bed26ead08010a8071c868afd783ce41cc666583e8ceb2c0050e1d341cc7f5179274be7a
+DIST aws-gpl-2016-src.tar.gz 15054562 BLAKE2B b9d2c6824cc25a1f73dda4e8cfc957660225e6d52ee5f05e89104bbda9cd30e53879f545ade4c54a65e6aea18b1afa01d98da1328a96406bcdf3436492d67241 SHA512 296825e4683bbf4701a42d52cb0b58ebed8d3715972d0c5f83765987d1e96ab4d6d22835c37c043f49ae106fedf5d61ef22cbe348384c2de388519637e26df0b
+DIST aws-gpl-2017-src.tar.gz 12298806 BLAKE2B 9c45d77dd44da11efe99c6e3128fc5920b39eaaf620e266b2dab394866c2d6a3cd1abe4eb01d9024960ef9046662c0df690f72c687fbe0a64b1021ed9c383828 SHA512 a7ddd332cbf3e699fdb7f734fba7dfabed2a92745bbc7fbd4ae5ea5da6a5e98c5434d7a9a3d7071d57b8294cc5c0c2a3802ded607e9402a1cf5e5bed8f5a8c35
+EBUILD aws-2016.ebuild 1063 BLAKE2B 8740045c5cc3080020201210ec47cb3d534375cf34252cc8bd224beeadb61abad46458d9c8d3344a5b93678be076221cfb960f899098a62b182e0f1b5d7b7f35 SHA512 4ff9923478be7c849cd4dce904c44ff228e2e66d188f732e61930af8b9a7cdd592b5de788cdce602e6bcb240706caf9a98948436dbc2d288433476e29425d41d
+EBUILD aws-2017.ebuild 1070 BLAKE2B 73b9197184d9975165048ffa6650ca0b0bc05c96e2a960bc150e0575f148f19dee1ce0f8f113c0898c6346dff1967020ab3a4d3912a427f3351b22df118f8665 SHA512 e1d2dcd204465fbffec546df8ee7fed6e7ec72cfd01ae163d93de0de025c49b5dd6cdb3bbda8fb4222389ee882e2e37715401dac2a637ee098f8ffbc3085fd46
 MISC metadata.xml 842 BLAKE2B 7ce0bcea2f920058ef51512403c0acc99222e82d3839dba6b27bde1b4de71fe06f3b53f985223c597466c4ccc112796de8f56f05c3675438e5b75e586cf18b51 SHA512 3d9c37dea2923f66efbb4a66ca226ac7874b216683cf54adacef577593d267f3ffd61799626b347c0d78e87a1165bc4518586e7852e38c02fb335847667a48a4
diff --git a/dev-ada/aws/aws-2016.ebuild b/dev-ada/aws/aws-2016.ebuild
index 90711d2b8ec5..e0d114382774 100644
--- 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 c6f097ad1dce..919248e920a4 100644
--- 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
index b33073afa443..000000000000
--- 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