gentoo resync : 18.11.2018

5 files changed, 227 insertions, 220 deletions

diff --git a/dev-lang/gnat-gpl/Manifest b/dev-lang/gnat-gpl/Manifest
index b25572de3063..ee2e4f46277a 100644
--- a/dev-lang/gnat-gpl/Manifest
+++ b/dev-lang/gnat-gpl/Manifest
@@ -6,13 +6,13 @@ AUX gcc-configure-LANG.patch 2052 BLAKE2B 28c36f4992e41305ee421dade5eaaac34e3bdc
 AUX gcc-configure-texinfo.patch 337 BLAKE2B 6408817927f71c5c55a19510a95e1aaad9b56be216ec1c753920b55a435d70579e27ff5bb8ecbeea1b9ff1c8ae62b940fbf10bf876c3d7ecf6cd662d9b693100 SHA512 a15fba8bf2ff02bdeca54d6f186bfa08c1079c6a8ba0a3beef154483ce5c1b8c497e7ffeec32371968f0037e0ff8384609eb0c367d0155a4e5a7eef8aad084d5
 AUX gcc-spec-env-r1.patch 3148 BLAKE2B 30ceb113a510092a907b445c4b2131f148f7fef54a00a88b5c389bbf93b8b61bc12c86a07df03d57280759e5485ac0cd89ea69826ace01b5720681ca3102640b SHA512 ecae71577543772cfe1711f1b4a8815c0b5d706ebd01edacd1f07586637d4805e25771f970a6e6d1bb696d4b1b5ef3e0036088a96a9f6beff7ddaee704175d16
 AUX gnat-gpl-2016-bootstrap.patch 2698 BLAKE2B 2fe9519590f0870aa201d550e027eaec311961c07b62f470d77f1de125fdf81cab6f884f08dfd8b957b7c2880ad04a7400f3fb395f5404d6c467373042e2fb0c SHA512 c712234b87aa66379bc52b43bce31a2dfd8de996030588a26261bb08471cd6e92587bc5aa35bb8f776a5128b1deb524e37aebe1c0b970a98210d653b5094d95b
+AUX gnat-gpl-2016-finalization.patch 8125 BLAKE2B dae1c3f3bc98c6d4e56388888576487af5df0aab3d68bd30b991e9a87d49411592acbab989739c02b27a5789087d8913a0b8ab1764ce01e7709f9838e42232a2 SHA512 b304cebf1461fb50dc9a3e3e7a87f25474d7e10e483226bef6c1de576f0f59d83e2f0a048fab17c3772865770b34f3e7f67ec70f5cd60ea2db4314d7f6d45e6b
 AUX gnat-gpl-2016-gentoo.patch 2811 BLAKE2B 495e66d5fb3c184be946269a9f360bfaf8dc2b6b38449a74a7ec61ac9c1c3790833480f1f9614e8e152d9fab45366c7284747c3f05891c77812aa14248671644 SHA512 ba147b3cb4374eb3c8fe530b92a5ffa564170d8df26dc455a48dae3ec92ca0fee9525cb67229855b34c8b8d48a985a083f7ea70ec2b4d13f652296f04c03e4a0
 AUX gnat-gpl-2017-gentoo.patch 4510 BLAKE2B 468059269978e5bbf85d09f2d4086c5fade1f7cdb4c14e9a12b596a96b3cf93e0bf894cf77ef2f81dd56b3aa2e7dc65c8642f7b688ec7cf8514152051e33564f SHA512 48ed94e3e5a2473f98ac6877640f64fc5e5a705a95e0c92a2d19b6a77597e49e77ed409af15302fba0c2403b38c13847c6eeb1f4626f57bc3c128f542dfaa893
 AUX gnat-gpl-2018-gentoo.patch 634 BLAKE2B 949911111848fd4834de4b3a0d93d6f617b4ae05f9911564a01ab377c5715dfe21ec33c94c5d52815ad2a636809ce01b617cd8a2f132783b084bafc6c4265ead SHA512 f4a541780b6d00af32d38b71ce6a39516aff9c2df15429c40d297ebba03ab148786aa0f1218b90aedb36eb36a9c4a490b52883e3830a5e58bfc5d22987c00ece
 DIST ecj-4.5.jar 1470676 BLAKE2B 793c10ba09fd8040c0e1181204141aea16780c9c9088e07126e00da2b510af2ad6f58d876357d7e98cbb02d783a3be434469d5de1df134ccb8cc508e45028d80 SHA512 d4e1bf7538ace56e3d69fa91da5bbd16c272923b4de0a9d8dee23ea2b75f9f38c603de72fc4061df49285c450b63f3df211cee5270e9fffc5447445d1a9c9e4e
 DIST gcc-4.4.3-specs-0.2.0.tar.bz2 2004 BLAKE2B 96f5ba2028bc6e0ef71e009857c37118a54d13d30de24d697c85e5772f9f2b7853615648cf2e4ee81d8385f6518c64588c0b56675c00f95ef39fca2a808f075e SHA512 779ecb0a064d2138b54569c8ae501975b8a6b72e5a3acbf8597619a8db77ee42ef9b0e62608d5192a15e4393e7dfc009bb50b994782236faa744b2c46b5fe517
 DIST gcc-4.9-gpl-2016-src.tar.gz 76361760 BLAKE2B 681aac3dd2e04110f58637cc9fe1eb663ce55af16a929a446eb59ce338bec9357e65517890f7fa01d61eec9c5041336722b2b94a5fea27a55ade686fe1fe9fbc SHA512 da1e26b4dbbe0ec634eab4e64d1cdb2632300c24f0885bc72fb57edba6ce29ab92b04eaedd8f8077ea623f1ef1428f53616e8c8d6630328d9790d968b60c67cf
-DIST gcc-4.9.4-patches-1.2.tar.bz2 25447 BLAKE2B 3141897688409c84cab4ffea67deb220d2218107f279a0cc1758d08c858f3a3856150df48ae37d2f14c6f69bc82de1e87f22cc356f179dfdf47ae9eef28a4182 SHA512 61b1e86e8dbc2838e7b5c88c4a3bab9ed5b6485258b7971799850ffd97cb67ad2564552af4e9ebc860dcc2a4b786c91d2079469468fb95f8e28e2fc981b4c812
 DIST gcc-4.9.4-patches-1.3.tar.bz2 26060 BLAKE2B a61cb29111e8a9e35d810c0c557e901fc0d78e3b62027f5ea622d29becff9492e350c932824b23e5a38604bc3fa6c39fed9db902df4f830a3a362f1a1c2d9f58 SHA512 0214da6712a1b583f028be60e562f742d3d484d930976e2fce7be090113517c0e07faa20f750411b5125902f38a9944fe0c1dc8605d161c5bb11843acdebab75
 DIST gcc-4.9.4-piepatches-v0.6.4.tar.bz2 14414 BLAKE2B 2eccd4f2a164fbb32d13c7fe91627a2424c0a5570fe0cac97c2bb1c95294ba3d770832da7c445f75c91791466c5139a1e13753a3a40d87ff5e44e42749adee27 SHA512 243fa272ea0e49f700a76508bab3e03bbb353bcb930581b2f87f9a47df5cd3880e29f20b71612b21190adc463849e1e6ac2a38a49c0002b562d93d436f538285
 DIST gcc-4.9.4-uclibc-patches-1.0.tar.bz2 2618 BLAKE2B bff85a4088fb94fdb7a8b0bd552be98ace3e6d145889b6f8b4a1f2db2dad14342d155890ab159b42d5b55d88dfb7c392eb7f92590084e1958f6284c561da30f1 SHA512 5a1f44caa9261f4947101379628143869b31dec67fa28605e8e1f3894d4b7120c3f68ba6deb59da7a74fa906e27ab32cd3767761837dc3dfebc37865d349d6db
@@ -31,8 +31,7 @@ DIST gnat-gpl-2014-x86_64-linux-bin.tar.gz 236253400 BLAKE2B c1db70db9442ba24688
 DIST gnat-gpl-2016-src.tar.gz 8857249 BLAKE2B 3ff0fe247990e2a612ac989aa389e9ccae2e29c16177975c327b53ae1471030d0a70e5a2e3af219ad9a3288c241f2d18da349d0650f7fde01d439f4e4720de88 SHA512 4a5cb58ede5b4ae2887e64f0f2e12e0e06470d320796f06d02f7ddd932ff0d3b40e6d3e98a81138fff6906548a55153c2a186ff4a6e3d23b9dbe01ca582da1f8
 DIST gnat-gpl-2017-src.tar.gz 8783473 BLAKE2B b0415b42f4d3a5e8675591a5602ff0a96945670104064671a232c0c12271ee141a3a5d148b8507bdab83cb8a0677c57b78e690060088308c51732bad3715964f SHA512 ae7314a2241107ed4d962dce08306eeb34c5f11e26183935bbb1ccf3a5eb011d6457c1b6fcded93dd0ee9ba31d791971ebe2a5a5a0ae04ff80d87a670325a098
 DIST gnat-gpl-2018-src.tar.gz 8706578 BLAKE2B ba245fd91cc5263d5b8c159d9e75caf6bed21dcaa5fa43734af8775a4008ce5f96bfb84a8b5e6e734ff883314ab3219dacec3fe95a5baa33fb712bfb5ff8bce8 SHA512 0ff7e848ef77f7e772e2a1b01905307a91c332f32329456f5238c4b7eb46cc118709e8682a5fc826d98a7d99fd15a92c194f4a278f04bc465165cfa616cc3c2e
-EBUILD gnat-gpl-2016-r1.ebuild 5680 BLAKE2B 60f04ec0a78d589656ca1c7307c67051cbfe9c97cf2125fc90531631d61e8f28f7b5d8039820033f37145f6780878c4270216c236744b791eb180c577ccbc5b4 SHA512 3879af661544424ef47dd02461e9a815e96411064e1bc12d7ad52dce29ec90a1f836a9619a08d3feb513a245a21f5eaa04e919ba6ff60081fea7bd6faa4f8801
-EBUILD gnat-gpl-2016.ebuild 5681 BLAKE2B d1c5db2018a8e8d5c9dbb10caf800aa2b3ea220ed7276fa77c43bdef541e523377ea6024d89db75277a68c28796d8fc5d339bdac52802682cc33e6cb458b3922 SHA512 3a6180130b11c3fc9c417f6cfb0303ee21b6e5c183a547e23e9510ea119d3a5becb31a4a073d5b160f9b7146b35c82ab12ea7bb7cdb53b899e89ca1177c3aebf
+EBUILD gnat-gpl-2016-r2.ebuild 5759 BLAKE2B 455b0fb15a18a170a6358724afa4a350cbb8016106f77becb9cd9f7e1d231facf6caccbd7552d7dc0ddd3d46e2dbbbfb1fc2c4c208413de80cc9a6e5d2b15582 SHA512 e6e18e7bd565ef4816fde987042624641be986b5de0192ecc8c58152a464f88f4a396ac99a8a9c24a6b384d01559b73daffd7e468655f7229c81ad363941e180
 EBUILD gnat-gpl-2017.ebuild 4916 BLAKE2B 63c46822894529952dec8f45723b09e590c69269bfc4b3408dc6d720fa72b574956aa3e2a8adc51c400baf02414454d3153022e59cb69ebb4c5c9214fefcc40f SHA512 3d7d6b8fac5e9d0be36df050451a959437796d63f30a678d756af7e9aa5a036d13d2a25a2dcbd16aee799c44cb41ade35ca5771a43dc779ec74d341cd835d99b
-EBUILD gnat-gpl-2018-r1.ebuild 5001 BLAKE2B 162100c8960728c1c161bf5f7abc89e1e20919e456968b68faaf6a76fb0ca40cd01f223a245a9cc46ccaba0c741a34ff5c2c3a5c6dcc1697f54b2999a6769d63 SHA512 f29bfbfe1e122e6c517f740b9da3a65953cdcae14394810446f3a26c26db81164d48275281d14ad2aa205feaf88780669fe31d8b65c746e84cc39a87c0dba740
+EBUILD gnat-gpl-2018-r1.ebuild 4999 BLAKE2B 3c9bfaaeab7166d326a87301baee8c151462726fcf61af58dbd9921cbfc5dafa78205c0169e2a54f14a568ce1d958980b2d20113daa65ce10cc7a60328ed0d1b SHA512 4daba04ee89a83dbebb325955dd47c54468fd5a33c56370be432553b47a0fd27df408d62b70af4321bad69b9e51463d4e6cfba7f24480704bf4c6b30d01c971a
 MISC metadata.xml 1960 BLAKE2B e66552f4c0655619e736b6af14822d84e6c49aa6c019cb8c8b0e215629f9c8ab68aa55758639e35107120a39c578d82e1036bc0be82ff67728104f44c875d107 SHA512 04f14bcdd96ae4f6e285abfd07de89828eb989ce779aa59decf689920a179d859ffe809d7960e9c3599c2f6fff6ab2aafbb54458da07fa91841c61e0dfca47ab
diff --git a/dev-lang/gnat-gpl/files/gnat-gpl-2016-finalization.patch b/dev-lang/gnat-gpl/files/gnat-gpl-2016-finalization.patch
new file mode 100644
index 000000000000..44503ae6b72e
--- /dev/null
+++ b/dev-lang/gnat-gpl/files/gnat-gpl-2016-finalization.patch
@@ -0,0 +1,220 @@
+--- a/gcc/ada/exp_attr.adb	2018-11-16 20:23:21.775906196 +0100
++++ b/gcc/ada/exp_attr.adb	2018-11-16 20:25:57.418211404 +0100
+@@ -3121,6 +3121,121 @@
+          Analyze_And_Resolve (N, Standard_String);
+       end External_Tag;
+ 
++      -----------------------
++      -- Finalization_Size --
++      -----------------------
++
++      when Attribute_Finalization_Size => Finalization_Size : declare
++         function Calculate_Header_Size return Node_Id;
++         --  Generate a runtime call to calculate the size of the hidden header
++         --  along with any added padding which would precede a heap-allocated
++         --  object of the prefix type.
++
++         ---------------------------
++         -- Calculate_Header_Size --
++         ---------------------------
++
++         function Calculate_Header_Size return Node_Id is
++         begin
++            --  Generate:
++            --    Universal_Integer
++            --      (Header_Size_With_Padding (Pref'Alignment))
++
++            return
++              Convert_To (Universal_Integer,
++                Make_Function_Call (Loc,
++                  Name                   =>
++                    New_Occurrence_Of (RTE (RE_Header_Size_With_Padding), Loc),
++
++                  Parameter_Associations => New_List (
++                    Make_Attribute_Reference (Loc,
++                      Prefix         => New_Copy_Tree (Pref),
++                      Attribute_Name => Name_Alignment))));
++         end Calculate_Header_Size;
++
++         --  Local variables
++
++         Size : Entity_Id;
++
++      --  Start of Finalization_Size
++
++      begin
++         --  An object of a class-wide type first requires a runtime check to
++         --  determine whether it is actually controlled or not. Depending on
++         --  the outcome of this check, the Finalization_Size of the object
++         --  may be zero or some positive value.
++         --
++         --  In this scenario, Pref'Finalization_Size is expanded into
++         --
++         --    Size : Integer := 0;
++         --
++         --    if Needs_Finalization (Pref'Tag) then
++         --       Size :=
++         --         Universal_Integer
++         --           (Header_Size_With_Padding (Pref'Alignment));
++         --    end if;
++         --
++         --  and the attribute reference is replaced with a reference to Size.
++
++         if Is_Class_Wide_Type (Ptyp) then
++            Size := Make_Temporary (Loc, 'S');
++
++            Insert_Actions (N, New_List (
++
++              --  Generate:
++              --    Size : Integer := 0;
++
++              Make_Object_Declaration (Loc,
++                Defining_Identifier => Size,
++                Object_Definition   =>
++                  New_Occurrence_Of (Standard_Integer, Loc),
++                Expression          => Make_Integer_Literal (Loc, 0)),
++
++              --  Generate:
++              --    if Needs_Finalization (Pref'Tag) then
++              --       Size :=
++              --         Universal_Integer
++              --           (Header_Size_With_Padding (Pref'Alignment));
++              --    end if;
++
++              Make_If_Statement (Loc,
++                Condition              =>
++                  Make_Function_Call (Loc,
++                    Name                   =>
++                      New_Occurrence_Of (RTE (RE_Needs_Finalization), Loc),
++
++                    Parameter_Associations => New_List (
++                      Make_Attribute_Reference (Loc,
++                        Prefix         => New_Copy_Tree (Pref),
++                        Attribute_Name => Name_Tag))),
++
++                Then_Statements        => New_List (
++                   Make_Assignment_Statement (Loc,
++                     Name       => New_Occurrence_Of (Size, Loc),
++                     Expression => Calculate_Header_Size)))));
++
++            Rewrite (N, New_Occurrence_Of (Size, Loc));
++
++         --  The prefix is known to be controlled at compile time. Calculate
++         --  Finalization_Size by calling function Header_Size_With_Padding.
++
++         elsif Needs_Finalization (Ptyp) then
++            Rewrite (N, Calculate_Header_Size);
++
++         --  The prefix is not an object with controlled parts, so its
++         --  Finalization_Size is zero.
++
++         else
++            Rewrite (N, Make_Integer_Literal (Loc, 0));
++         end if;
++
++         --  Due to cases where the entity type of the attribute is already
++         --  resolved the rewritten N must get re-resolved to its appropriate
++         --  type.
++
++         Analyze_And_Resolve (N, Typ);
++      end Finalization_Size;
++
+       -----------
+       -- First --
+       -----------
+--- a/gcc/ada/snames.ads-tmpl	2016-05-16 11:29:28.000000000 +0200
+--- b/gcc/ada/snames.ads-tmpl	2016-05-16 11:29:28.000000000 +0200
+@@ -884,6 +884,7 @@
+    Name_Exponent                       : constant Name_Id := N + $;
+    Name_External_Tag                   : constant Name_Id := N + $;
+    Name_Fast_Math                      : constant Name_Id := N + $; -- GNAT
++   Name_Finalization_Size              : constant Name_Id := N + $; -- GNAT
+    Name_First                          : constant Name_Id := N + $;
+    Name_First_Bit                      : constant Name_Id := N + $;
+    Name_First_Valid                    : constant Name_Id := N + $; -- Ada 12
+@@ -1523,6 +1524,7 @@
+       Attribute_Exponent,
+       Attribute_External_Tag,
+       Attribute_Fast_Math,
++      Attribute_Finalization_Size,
+       Attribute_First,
+       Attribute_First_Bit,
+       Attribute_First_Valid,
+--- a/gcc/ada/sem_attr.ads	2018-11-16 21:35:46.821279875 +0100
++++ b/gcc/ada/sem_attr.ads	2018-11-16 21:36:00.028057464 +0100
+@@ -242,6 +242,16 @@
+       --  enumeration value. Constraint_Error is raised if no value of the
+       --  enumeration type corresponds to the given integer value.
+ 
++      -----------------------
++      -- Finalization_Size --
++      -----------------------
++
++      Attribute_Finalization_Size => True,
++      --  For every object or non-class-wide-type, Finalization_Size returns
++      --  the size of the hidden header used for finalization purposes as if
++      --  the object or type was allocated on the heap. The size of the header
++      --  does take into account any extra padding due to alignment issues.
++
+       -----------------
+       -- Fixed_Value --
+       -----------------
+--- a/gcc/ada/sem_attr.adb	2018-11-16 21:35:49.698231429 +0100
++++ b/gcc/ada/sem_attr.adb	2018-11-16 21:36:00.028057464 +0100
+@@ -3828,6 +3828,42 @@
+          Check_Standard_Prefix;
+          Rewrite (N, New_Occurrence_Of (Boolean_Literals (Fast_Math), Loc));
+ 
++      -----------------------
++      -- Finalization_Size --
++      -----------------------
++
++      when Attribute_Finalization_Size =>
++         Check_E0;
++
++         --  The prefix denotes an object
++
++         if Is_Object_Reference (P) then
++            Check_Object_Reference (P);
++
++         --  The prefix denotes a type
++
++         elsif Is_Entity_Name (P) and then Is_Type (Entity (P)) then
++            Check_Type;
++            Check_Not_Incomplete_Type;
++
++            --  Attribute 'Finalization_Size is not defined for class-wide
++            --  types because it is not possible to know statically whether
++            --  a definite type will have controlled components or not.
++
++            if Is_Class_Wide_Type (Etype (P)) then
++               Error_Attr_P
++                 ("prefix of % attribute cannot denote a class-wide type");
++            end if;
++
++         --  The prefix denotes an illegal construct
++
++         else
++            Error_Attr_P
++              ("prefix of % attribute must be a definite type or an object");
++         end if;
++
++         Set_Etype (N, Universal_Integer);
++
+       -----------
+       -- First --
+       -----------
+@@ -8264,6 +8300,13 @@
+          Fold_Uint (N,
+            Eval_Fat.Exponent (P_Base_Type, Expr_Value_R (E1)), Static);
+ 
++      -----------------------
++      -- Finalization_Size --
++      -----------------------
++
++      when Attribute_Finalization_Size =>
++         null;
++
+       -----------
+       -- First --
+       -----------
diff --git a/dev-lang/gnat-gpl/gnat-gpl-2016-r1.ebuild b/dev-lang/gnat-gpl/gnat-gpl-2016-r2.ebuild
index ac29e3d9590c..ff06786dc4d5 100644
--- a/dev-lang/gnat-gpl/gnat-gpl-2016-r1.ebuild
+++ b/dev-lang/gnat-gpl/gnat-gpl-2016-r2.ebuild
@@ -50,7 +50,7 @@ SRC_URI+="
 
 LICENSE+=" GPL-2 GPL-3"
 SLOT="${TOOLCHAIN_GCC_PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="bootstrap"
 
 RDEPEND="!sys-devel/gcc:${TOOLCHAIN_GCC_PV}"
@@ -142,6 +142,8 @@ src_prepare() {
 
 	# Bug 638056
 	epatch "${FILESDIR}/${P}-bootstrap.patch"
+	# add Finalization_Size Attribute
+	epatch "${FILESDIR}/${P}-finalization.patch"
 
 	toolchain_src_prepare
 
diff --git a/dev-lang/gnat-gpl/gnat-gpl-2016.ebuild b/dev-lang/gnat-gpl/gnat-gpl-2016.ebuild
deleted file mode 100644
index 89ae61b4668c..000000000000
--- a/dev-lang/gnat-gpl/gnat-gpl-2016.ebuild
+++ /dev/null
@@ -1,214 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PATCH_VER="1.2"
-UCLIBC_VER="1.0"
-
-# Hardened gcc 4 stuff
-PIE_VER="0.6.4"
-SPECS_VER="0.2.0"
-SPECS_GCC_VER="4.4.3"
-# arch/libc configurations known to be stable with {PIE,SSP}-by-default
-PIE_GLIBC_STABLE="x86 amd64 mips ppc ppc64 arm ia64"
-PIE_UCLIBC_STABLE="x86 arm amd64 mips ppc ppc64"
-SSP_STABLE="amd64 x86 mips ppc ppc64 arm"
-# uclibc need tls and nptl support for SSP support
-# uclibc need to be >= 0.9.33
-SSP_UCLIBC_STABLE="x86 amd64 mips ppc ppc64 arm"
-#end Hardened stuff
-
-TOOLCHAIN_GCC_PV=4.9.4
-
-inherit eutils toolchain-funcs toolchain
-
-REL=4.9
-MYP=gcc-${REL}-gpl-${PV}-src
-BTSTRP_X86=gnat-gpl-2014-x86-linux-bin
-BTSTRP_AMD64=gnat-gpl-2014-x86_64-linux-bin
-
-DESCRIPTION="GNAT Ada Compiler - GPL version"
-HOMEPAGE="http://libre.adacore.com/"
-SRC_URI+="
-	http://mirrors.cdn.adacore.com/art/57399304c7a447658e0aff7f
-		-> ${P}-src.tar.gz
-	http://mirrors.cdn.adacore.com/art/573992d4c7a447658d00e1db
-		-> ${MYP}.tar.gz
-	http://mirrors.cdn.adacore.com/art/57399232c7a447658e0aff7d
-		-> gcc-interface-${REL}-gpl-${PV}-src.tar.gz
-	bootstrap? (
-		amd64? (
-			http://mirrors.cdn.adacore.com/art/564b3ebec8e196b040fbe66c ->
-			${BTSTRP_AMD64}.tar.gz
-		)
-		x86? (
-			http://mirrors.cdn.adacore.com/art/564b3e9dc8e196b040fbe248 ->
-			${BTSTRP_X86}.tar.gz
-		)
-	)"
-
-LICENSE+=" GPL-2 GPL-3"
-SLOT="${TOOLCHAIN_GCC_PV}"
-KEYWORDS="amd64 x86"
-IUSE="bootstrap"
-
-RDEPEND="!sys-devel/gcc:${TOOLCHAIN_GCC_PV}"
-DEPEND="${RDEPEND}
-	elibc_glibc? ( >=sys-libs/glibc-2.8 )
-	>=sys-devel/binutils-2.20"
-
-PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.8 )"
-
-S="${WORKDIR}"/${MYP}
-
-FSFGCC=gcc-${TOOLCHAIN_GCC_PV}
-
-pkg_setup() {
-	toolchain_pkg_setup
-
-	if use amd64; then
-		BTSTRP=${BTSTRP_AMD64}
-	else
-		BTSTRP=${BTSTRP_X86}
-	fi
-	if use bootstrap; then
-		GCC="${WORKDIR}"/${BTSTRP}/bin/gcc
-	else
-		GCC=${ADA:-$(tc-getCC)}
-	fi
-	CC=${GCC}
-	local base=$(basename ${GCC})
-	CXX="${base/gcc/g++}"
-	GNATMAKE="${base/gcc/gnatmake}"
-	GNATBIND="${base/gcc/gnatbind}"
-	if [[ ${base} != ${GCC} ]] ; then
-		local path=$(dirname ${GCC})
-		GNATMAKE="${path}/${GNATMAKE}"
-		GNATBIND="${path}/${GNATBIND}"
-		CXX="${path}/${CXX}"
-	fi
-}
-
-src_unpack() {
-	if ! use bootstrap && [[ -z "$(type ${GNATMAKE} 2>/dev/null)" ]] ; then
-		eerror "You need a gcc compiler that provides the Ada Compiler:"
-		eerror "1) use gcc-config to select the right compiler or"
-		eerror "2) set the bootstrap use flag"
-		die "ada compiler not available"
-	fi
-
-	GCC_A_FAKEIT="${P}-src.tar.gz
-		${MYP}.tar.gz
-		${FSFGCC}.tar.bz2
-		gcc-interface-${REL}-gpl-${PV}-src.tar.gz"
-	if use bootstrap; then
-		GCC_A_FAKEIT="${GCC_A_FAKEIT} ${BTSTRP}.tar.gz"
-	fi
-
-	toolchain_src_unpack
-	if use bootstrap; then
-		rm ${BTSTRP}/libexec/gcc/${CHOST}/4.7.4/ld || die
-	fi
-}
-
-src_prepare() {
-	mv ../${P}-src/src/ada gcc/ || die
-	mv ../gcc-interface-${REL}-gpl-${PV}-src gcc/ada/gcc-interface || die
-
-	sed -i \
-		-e "s:gnatmake:${GNATMAKE}:g" \
-		gcc/ada/Make-generated.in || die "sed failed"
-
-	sed -i \
-		-e "/xoscons/s:gnatmake:${GNATMAKE}:g" \
-		gcc/ada/gcc-interface/Makefile.in || die "sed failed"
-
-	mv ../${FSFGCC}/gcc/doc/gcc.info gcc/doc/ || die
-	mv ../${FSFGCC}/libjava . || die
-	rm -r ../${FSFGCC} || die
-
-	cd ..
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-	rm patch/10_all_default-fortify-source.patch
-	rm piepatch/34_all_gcc48_config_i386.patch
-	cd -
-
-	if has_version '<sys-libs/glibc-2.12' ; then
-		ewarn "Your host glibc is too old; disabling automatic fortify."
-		ewarn "Please rebuild gcc after upgrading to >=glibc-2.12 #362315"
-		EPATCH_EXCLUDE+=" 10_all_default-fortify-source.patch"
-	fi
-
-	# Bug 638056
-	epatch "${FILESDIR}/${P}-bootstrap.patch"
-
-	toolchain_src_prepare
-
-	use vanilla && return 0
-	# Use -r1 for newer piepatchet that use DRIVER_SELF_SPECS for the hardened specs.
-	[[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env-r1.patch
-}
-
-src_configure() {
-	local trueGCC_BRANCH_VER=${GCC_BRANCH_VER}
-	GCC_BRANCH_VER=$(gcc-version)
-	downgrade_arch_flags
-	GCC_BRANCH_VER=${trueGCC_BRANCH_VER}
-	toolchain_src_configure \
-		--enable-languages=ada \
-		--disable-libada \
-		CC=${GCC} \
-		GNATBIND=${GNATBIND} \
-		GNATMAKE=yes
-}
-
-src_compile() {
-	unset ADAFLAGS
-	toolchain_src_compile
-	gcc_do_make "-C gcc gnatlib-shared"
-	ln -s gcc ../build/prev-gcc || die
-	ln -s ${CHOST} ../build/prev-${CHOST} || die
-	gcc_do_make "-C gcc gnattools"
-}
-
-src_install() {
-	toolchain_src_install
-	cd "${D}"${BINPATH}
-	for x in gnat*; do
-		# For some reason, g77 gets made instead of ${CTARGET}-g77...
-		# this should take care of that
-		if [[ -f ${x} ]] ; then
-			# In case they're hardlinks, clear out the target first
-			# otherwise the mv below will complain.
-			rm -f ${CTARGET}-${x}
-			mv ${x} ${CTARGET}-${x}
-		fi
-
-		if [[ -f ${CTARGET}-${x} ]] ; then
-			if ! is_crosscompile ; then
-				ln -sf ${CTARGET}-${x} ${x}
-				dosym ${BINPATH#${EPREFIX}}/${CTARGET}-${x} \
-					/usr/bin/${x}-${GCC_CONFIG_VER}
-			fi
-			# Create versioned symlinks
-			dosym ${BINPATH#${EPREFIX}}/${CTARGET}-${x} \
-				/usr/bin/${CTARGET}-${x}-${GCC_CONFIG_VER}
-		fi
-
-		if [[ -f ${CTARGET}-${x}-${GCC_CONFIG_VER} ]] ; then
-			rm -f ${CTARGET}-${x}-${GCC_CONFIG_VER}
-			ln -sf ${CTARGET}-${x} ${CTARGET}-${x}-${GCC_CONFIG_VER}
-		fi
-	done
-}
-
-pkg_postinst () {
-	toolchain_pkg_postinst
-	einfo "This provide the GNAT compiler with gcc for ada/c/c++ and more"
-	einfo "The compiler binary is gcc-${TOOLCHAIN_GCC_PV}"
-	einfo "Even if the c/c++ compilers are using almost the same patched"
-	einfo "source as the sys-devel/gcc package its use is not extensively"
-	einfo "tested, and not supported for updating your system, except for ada"
-	einfo "related packages"
-}
diff --git a/dev-lang/gnat-gpl/gnat-gpl-2018-r1.ebuild b/dev-lang/gnat-gpl/gnat-gpl-2018-r1.ebuild
index 13a8539ec192..997ac8068954 100644
--- a/dev-lang/gnat-gpl/gnat-gpl-2018-r1.ebuild
+++ b/dev-lang/gnat-gpl/gnat-gpl-2018-r1.ebuild
@@ -36,7 +36,7 @@ SRC_URI+="
 	)"
 
 LICENSE+=" GPL-2 GPL-3"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+bootstrap"
 
 RDEPEND="!sys-devel/gcc:${GCC_CONFIG_VER}"