gentoo resync : 18.11.2018

4 files changed, 15 insertions, 33 deletions

diff --git a/dev-ada/aws/Manifest b/dev-ada/aws/Manifest
index 5301f800cfe9..dad8163cca98 100644
--- a/dev-ada/aws/Manifest
+++ b/dev-ada/aws/Manifest
@@ -1,6 +1,6 @@
-AUX aws-2016-gentoo.patch 1510 BLAKE2B 86cbe9166f800a1b8a3a7d388ff256c17527c85665ad0dd32408d180de59357b5f9a593d7e3ebb3bc511a0a234b2549f7e2e090cdc85e1ed98547cad1d3b5f02 SHA512 29f121d22f1dd21a1228a96c15ba28a61da1e07bdb57ae5f0ba2babb2c8d0b38bab21edeb44fb8480fcb4c9bdf55b1f20f7d6b3668943a1814a5564dd168c92d
+AUX aws-2016-gentoo.patch 1255 BLAKE2B a2b2d944a131d83b789fe91a1b31b062f039b2f6bafa870d524aefbdb59146a26ad5e7cc39222318aaa8ae9ccca663bead98e198aef845ce86d3195568a15d33 SHA512 53b4156f9c025969a8e2f603e1672949f7f2dd58a4c3d1a4ee8b17094a399bb207b6a242419ddd5e5a7e151ea3a72baee1c67f132aafb260ab5f89d8d12ad377
 DIST aws-gpl-2017-src.tar.gz 12298806 BLAKE2B 9c45d77dd44da11efe99c6e3128fc5920b39eaaf620e266b2dab394866c2d6a3cd1abe4eb01d9024960ef9046662c0df690f72c687fbe0a64b1021ed9c383828 SHA512 a7ddd332cbf3e699fdb7f734fba7dfabed2a92745bbc7fbd4ae5ea5da6a5e98c5434d7a9a3d7071d57b8294cc5c0c2a3802ded607e9402a1cf5e5bed8f5a8c35
 DIST aws-gpl-2018-src.tar.gz 4193276 BLAKE2B 31fa99fc3324f2514799a33cbd282f68a26d133da14ee2a70d3f5091c3670e82a7b77f9f941e593e914a755dd54d5a1e352d201a9dc097991b7bd50aa9f54b3b SHA512 62b85f70dd722148bbf3ad85bfd6cde2d0ab1d8029f673eb7ee42b0890c3dbf0f023c321e96eca99ccd2f0b235347ab577cfb558e7d81993d166683ec815dbe4
-EBUILD aws-2017.ebuild 1083 BLAKE2B 83cc71d74f7a173f693d1ceef8ebfc53a233aa3f989965c6b01e69bd1818a93bf321fa324573fcaa68f671b87dd82ba669b4d796d5cae660d2dbc574e0d4e003 SHA512 4a6f7bb017bb860670066b7b5fe3a1e9d10d32a802a391b3d2df52197ae1918ac38b8c942c5433644e87f28ceccdcb0615f9f91d2fe528e14e5357952ef183e8
-EBUILD aws-2018.ebuild 1099 BLAKE2B 31da549c4ba92efb6f94be64fe23697136cefc6ee5b1151259089a0b558ef9ebe4c4a13b4bf795a50f6a024eaf512fe3e7d51f7ee4b016d5f12d7f7e0dec6ae5 SHA512 bfc7b14cc468476c9cf9dd653f1b7942f54cdf6bd6b244f4f0bb7586e158561a34254a5fe9a3f8fd442baa34535d8ee6f53e3699f6eb9804b242981d1641c75f
+EBUILD aws-2017.ebuild 1025 BLAKE2B f7b86bf4a470b5376061b4ce47263889f66d68cde383136312d979959d9c1f59e96d8367d242e44ec750bf6e006d7144f1fb337bbdcac6f95f2a42b82b3e0756 SHA512 23a477b56590afe16de4fc6707fc776daf431a0f576d002bbf0ab5305694b2d0f701bb5d4c85ca622bb4b13f3f3c7c7760820457688b5ee6bb78984558a68df5
+EBUILD aws-2018.ebuild 1000 BLAKE2B a98819d89f3a2c0c55fa5c812f62e15b269a81aa3e5398ce6a7fc8547b8b45adc4d8944f178cbebbfa9f52c22367acd24c2b819a7cd4c5a21ce4081f4300eb39 SHA512 fc3786e85ffb6748cae332ca9411a04f7c1a24649d91f37444af18be2de8378783f89994cebacf035e903e33a1b607f51f0080d521fc2137884f0289bf8a00ff
 MISC metadata.xml 910 BLAKE2B 32c65b10f1286c68aaf8c4eb5d5078dca8b09a451ec02d1a845282124b71cac7363e8f068910fe6908befcf49d9e476f30f53b78bd66d6269cb7cb38f5d69597 SHA512 e3b9b10331c66b3e3ce4bb0b74a1c426656d33ffb37936a433fad3f7fc2e64de233c7d18158c5eea409d406ebe1edcf77135e7b490bec40387adc8b0928cad5a
diff --git a/dev-ada/aws/aws-2017.ebuild b/dev-ada/aws/aws-2017.ebuild
index 77fbba8c7964..081d598a0027 100644
--- a/dev-ada/aws/aws-2017.ebuild
+++ b/dev-ada/aws/aws-2017.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -29,16 +29,12 @@ S="${WORKDIR}"/${MY_P}
 PATCHES=( "${FILESDIR}"/${PN}-2016-gentoo.patch )
 
 src_configure() {
-	emake -j1 setup prefix=/usr
+	emake -j1 setup prefix=/usr \
+		GPRBUILD="/usr/bin/gprbuild -v"
 }
 
 src_compile() {
-	if use gnat_2016; then
-		GCC_PV=4.9.4
-	else
-		GCC_PV=6.3.0
-	fi
-	emake GCC=${CHOST}-gcc-${GCC_PV} \
+	emake \
 		PROCESSORS=$(makeopts_jobs) \
 		DEBUG=true \
 		GPRBUILD="/usr/bin/gprbuild -v"
diff --git a/dev-ada/aws/aws-2018.ebuild b/dev-ada/aws/aws-2018.ebuild
index 4222e66bbdd8..f18391af4105 100644
--- a/dev-ada/aws/aws-2018.ebuild
+++ b/dev-ada/aws/aws-2018.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -28,18 +28,12 @@ S="${WORKDIR}"/${MY_P}
 PATCHES=( "${FILESDIR}"/${PN}-2016-gentoo.patch )
 
 src_configure() {
-	emake -j1 setup prefix=/usr ENABLE_SHARED=true
+	emake -j1 setup prefix=/usr ENABLE_SHARED=true \
+		GPRBUILD="/usr/bin/gprbuild -v"
 }
 
 src_compile() {
-	if use gnat_2018; then
-		GCC_PV=7.3.1
-	elif use gnat_2017; then
-		GCC_PV=6.3.0
-	else
-		GCC_PV=4.9.4
-	fi
-	emake GCC=${CHOST}-gcc-${GCC_PV} \
+	emake \
 		PROCESSORS=$(makeopts_jobs) \
 		GPRBUILD="/usr/bin/gprbuild -v"
 }
diff --git a/dev-ada/aws/files/aws-2016-gentoo.patch b/dev-ada/aws/files/aws-2016-gentoo.patch
index b33073afa443..8894e014e333 100644
--- a/dev-ada/aws/files/aws-2016-gentoo.patch
+++ b/dev-ada/aws/files/aws-2016-gentoo.patch
@@ -1,13 +1,5 @@
---- 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" =>
+--- a/shared.gpr	2017-01-30 20:00:39.022743691 +0100
++++ b/shared.gpr	2017-01-30 20:01:20.524985069 +0100
 @@ -151,11 +151,11 @@
        end case;
  
@@ -23,8 +15,8 @@
        --  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
+--- a/include/include.gpr	2017-02-17 22:09:14.361695926 +0100
++++ b/include/include.gpr	2017-02-17 22:11:36.497215517 +0100
 @@ -54,7 +54,7 @@
  
           when "Release" =>