gentoo resync : 18.11.2018

4 files changed, 8 insertions, 21 deletions

diff --git a/dev-ada/gtkada/Manifest b/dev-ada/gtkada/Manifest
index fb9feb9a9956..60e949d5f3d9 100644
--- a/dev-ada/gtkada/Manifest
+++ b/dev-ada/gtkada/Manifest
@@ -1,6 +1,6 @@
-AUX gtkada-2017-gentoo.patch 2777 BLAKE2B bd13bd4458296c2e40ae7c769a1e1422123638d494d7ee3fb168a72e06a6344876fef0b4745744e6ec02b91c17b4fdff156f045233b47eb22aa8e836bc407a2a SHA512 0027d42e41ee1e754bf54982c5bd31b6fc5a113e9a5e7aed95868ac956097f3226b073721d4a5ccb9dc8d82600089720a72162b02910d6c8afcdfb2ea8ec4b13
+AUX gtkada-2017-gentoo.patch 2270 BLAKE2B 54b7f2258ce0073b79f56a3c0c379123622e7d6e91f0a186d4792b68851521241d778ba7b30686f52d1e0d1afa5d0e239fa5bf401169b67fdc90c0ffab01d83f SHA512 cb104d21ac55046254f03de6d615e98174d92cf3af74d7677eee9620cb38cfce5aaac2e61d3dc248f735f6723bcb69d33486e21dd3c6f5cc64d81067d161f5e8
 DIST gtkada-gpl-2017-src.tgz 11952333 BLAKE2B 2a333452ff271bba0521235598afdb1abebc4ceeab0f915f173862329ae0986b0fc4f654d3df28eac73af075db224c0b12340c3acd1e4ed0ffc965e4365f8b40 SHA512 f5bbb9ebdd966e70b3edcaaf359cb9e75edba3c3f4f8febfa7de9f634f8e96cd0dd1482fb16ad852b1c9f9b0e2c16eb3a437120d37f0638d90af666620f09f3f
 DIST gtkada-gpl-2018-src.tgz 11958880 BLAKE2B 4946918b52de5e15efc77411927812910d84d13cea66b86b1162b987c7849ba7fbb6da487881762f64005dc32a74fa73c9d759d25bb9ac0241d1d76cd4becbfb SHA512 9000de7675f8ee688b1c9cd93cf35b32f698aca8fc22d3b4e695d7c6b34feb60118cc687cf35432cd5ed9af7825eda7e20575a9fad4523a7b59cb0322bce0762
-EBUILD gtkada-2017.ebuild 1333 BLAKE2B a010ed72e62dc6eecd7d84595b00174e4f5967a850d6c24e4c6283ad11a968ab46051a646e9f9f37a2aa1735fdbca417f612c85f586b3777c53ddab42c689bd2 SHA512 41db23dbb72e53b3956585cd33ab2a4e9e32c19de079e6ec5907e44b1a7d1166a132465871ba314f90297c5b0f07b9533890f2cdcda3a56621484a476b9ab01b
-EBUILD gtkada-2018.ebuild 1456 BLAKE2B 89167e673cc23c8e27f2cfc4341067fa7b77e01f3ddb72a329859d7b04e0c51595c969fa50fd488921f9f446c2e05cbef87fee6562cfc2027b40a592231561cb SHA512 01e015bef00579446aa2bfdae9216df85a972da2155e36becfc5e38b31ea8a0bcaf3b2a72fa8d50876a35425862d15c24b3e01c61a312f6042ff4458880c72b1
+EBUILD gtkada-2017.ebuild 1291 BLAKE2B 4f26d0c4c40df64522c77df6acf75175f22cf0aef8e8e3213d663e3bb4c4b7ebff538540b7bbdb212d0ecce2e60f7d7d463f3178a1df44059ce7a2ef22fe8936 SHA512 433a5ce57cf39a012f17756d8843933910e51ad3b1641360e7dd28e0f871399a57f3ec0376e7ae7c69491f2e4712aad23c71c7fabd2ce507c9c5a79c247daabc
+EBUILD gtkada-2018.ebuild 1412 BLAKE2B 60234e0a79c8b865d0adeefe8089de9b2e480b89cd2513c0ff53107202eb7a164350ed182bb6b36e269ec6a946d87d94cbf43cc26a0519de2b94c06e43312d05 SHA512 1c0739006fabdfc1b587eb6db5c55f3de8036db2b6aeb844c14b485b9b7321c90aea91b87e3a390d2e3fba38d94fd12939392557403920f62319b33cb253bb1c
 MISC metadata.xml 772 BLAKE2B 5368ab9afd9387d681eca36cb0e93435b72570c31691a27b830b2ecca307ac3a1aba7c3aece27a5bdc27185fd822c9adc76a5091d480c10b7802bae37efa65c7 SHA512 fe764650755d97e2e148cf36fa1ac973a96e59e2143e5a8e90da27dd1272687f61f0e1fe602535366e068c813e3af54d74c0e2e1b88e2a4df8561165bc6448b7
diff --git a/dev-ada/gtkada/files/gtkada-2017-gentoo.patch b/dev-ada/gtkada/files/gtkada-2017-gentoo.patch
index ec8ebdf8f601..25a018e0d31e 100644
--- a/dev-ada/gtkada/files/gtkada-2017-gentoo.patch
+++ b/dev-ada/gtkada/files/gtkada-2017-gentoo.patch
@@ -1,14 +1,3 @@
---- gtkada-gpl-2015-src/shared.gpr.in.old	2017-01-05 23:28:35.838073270 +0100
-+++ gtkada-gpl-2015-src/shared.gpr.in	2017-01-05 23:30:17.752255709 +0100
-@@ -44,6 +44,8 @@
-              for Switches ("C") use ("-O2");
-       end case;
- 
-+      for Driver ("C") use External ("GCC", "gcc");
-+      for PIC_Option ("C") use ("-fPIC");
-       for Switches ("C") use Compiler'Switches ("C") & Gtk_Include;
-       for Switches ("Objective-C") use Compiler'Switches ("Objective-C") & Gtk_Include;
-    end Compiler;
 --- gtkada-gpl-2016-src/Makefile.in.old	2017-01-21 22:42:18.319969095 +0100
 +++ gtkada-gpl-2016-src/Makefile.in	2017-01-21 22:42:33.989700236 +0100
 @@ -60,30 +60,33 @@
diff --git a/dev-ada/gtkada/gtkada-2017.ebuild b/dev-ada/gtkada/gtkada-2017.ebuild
index 967c1a26d68f..f64be7a6ac09 100644
--- a/dev-ada/gtkada/gtkada-2017.ebuild
+++ b/dev-ada/gtkada/gtkada-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
@@ -48,7 +48,6 @@ src_configure() {
 	else
 		GCC_PV=6.3.0
 	fi
-	GCC=${CHOST}-gcc-${GCC_PV}
 	econf \
 		--prefix="${D}/usr" \
 		$(use_enable static-libs static) \
@@ -58,7 +57,7 @@ src_configure() {
 
 src_compile() {
 	GNATPREP=${CHOST}-gnatprep-${GCC_PV}
-	GCC=${GCC} emake -j1 GNATPREP=${GNATPREP} PROCESSORS=$(makeopts_jobs)
+	emake -j1 GNATPREP=${GNATPREP} PROCESSORS=$(makeopts_jobs)
 }
 
 src_install() {
diff --git a/dev-ada/gtkada/gtkada-2018.ebuild b/dev-ada/gtkada/gtkada-2018.ebuild
index 1a6fabc18667..63d33a60a954 100644
--- a/dev-ada/gtkada/gtkada-2018.ebuild
+++ b/dev-ada/gtkada/gtkada-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
@@ -14,7 +14,7 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/5b0cf840c7a4475261f97ced
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="gnat_2016 gnat_2017 +gnat_2018 +shared static-libs"
 
 RDEPEND="gnat_2016? ( dev-lang/gnat-gpl:4.9.4 )
@@ -51,7 +51,6 @@ src_configure() {
 	else
 		GCC_PV=4.9.4
 	fi
-	GCC=${CHOST}-gcc-${GCC_PV}
 	econf \
 		--prefix="${D}/usr" \
 		$(use_enable static-libs static) \
@@ -61,7 +60,7 @@ src_configure() {
 
 src_compile() {
 	GNATPREP=${CHOST}-gnatprep-${GCC_PV}
-	GCC=${GCC} emake -j1 GNATPREP=${GNATPREP} PROCESSORS=$(makeopts_jobs)
+	emake -j1 GNATPREP=${GNATPREP} PROCESSORS=$(makeopts_jobs)
 }
 
 src_install() {