gentoo resync : 02.06.2019

5 files changed, 77 insertions, 30 deletions

diff --git a/dev-lang/gnat-gpl/Manifest b/dev-lang/gnat-gpl/Manifest
index 434aaa808b79..436db117f447 100644
--- a/dev-lang/gnat-gpl/Manifest
+++ b/dev-lang/gnat-gpl/Manifest
@@ -13,6 +13,7 @@ AUX gnat-gpl-2016-ustat.patch 1389 BLAKE2B a52707196c5caa9e025a900adfd8109d28a93
 AUX gnat-gpl-2017-gentoo.patch 4510 BLAKE2B 468059269978e5bbf85d09f2d4086c5fade1f7cdb4c14e9a12b596a96b3cf93e0bf894cf77ef2f81dd56b3aa2e7dc65c8642f7b688ec7cf8514152051e33564f SHA512 48ed94e3e5a2473f98ac6877640f64fc5e5a705a95e0c92a2d19b6a77597e49e77ed409af15302fba0c2403b38c13847c6eeb1f4626f57bc3c128f542dfaa893
 AUX gnat-gpl-2017-ustat.patch 1363 BLAKE2B c5b8fb511e84e7df9db96754e5f966d08626c300cdb6de0b124a69e0c9c32158a19669e60bbc649ead0f2ce85c3c6ae8bb5aae11297d164d0c2bce618ea43881 SHA512 4c71913303b8e2bcaeded7303be198b9aa898968da365e6e2a41b555ab144485a55b57ad9949f5c7c07c400fa577795f2b7219006ce553ab6ed3109cca74d67a
 AUX gnat-gpl-2018-gentoo.patch 634 BLAKE2B 949911111848fd4834de4b3a0d93d6f617b4ae05f9911564a01ab377c5715dfe21ec33c94c5d52815ad2a636809ce01b617cd8a2f132783b084bafc6c4265ead SHA512 f4a541780b6d00af32d38b71ce6a39516aff9c2df15429c40d297ebba03ab148786aa0f1218b90aedb36eb36a9c4a490b52883e3830a5e58bfc5d22987c00ece
+AUX gnat-gpl-2019-gentoo.patch 1408 BLAKE2B 5234c542cc33af3c1bcb256fbe266613ec2e9f0b21d143029bf527ee03b4b363b2de7467eb79fadf4c8e8d3f39e589cfa3c0fadee1723e87938c74b8547d5ecf SHA512 2b9f0081d7aae5c71f73ebf43683fde033966288a937769e9b49e21805f31b5f0b4190e31431def58fcc93cd09f9b0e061096cffe61616073612f53d7e3e724b
 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
@@ -24,12 +25,16 @@ DIST gcc-6-gpl-2017-src.tar.gz 88045488 BLAKE2B 5df712eadef723df9057653e49d215ce
 DIST gcc-6.3.0-patches-1.0.tar.bz2 7596 BLAKE2B e3c298bd80b83e72d6ea9b4ec777d4f28153bf959da1e54307909383efecd2bf0e7e0cc9d9b27529e5f00b2e27132bf5ff6afd2129d061d3b111f9cfe732a874 SHA512 8fc96086bd3da3726687ee9d180d3b5d0a7d5814141d44eac8eb01566a783ec780c8fb8f55f75d6e9c9006b2e407e20cdb5835d541b0b66a47dd60642861734c
 DIST gcc-6.3.0.tar.bz2 99903185 BLAKE2B 3dc1e965afcad665d659fbb953978ef297ddbdd4d8918d36b35e977f8a2786b986f6875af2f12c599cc827b2b725d8b79ac021c9b51fb1d6d274318a59aa182c SHA512 234dd9b1bdc9a9c6e352216a7ef4ccadc6c07f156006a59759c5e0e6a69f0abcdc14630eff11e3826dd6ba5933a8faa43043f3d1d62df6bd5ab1e82862f9bf78
 DIST gcc-7-gpl-2018-src.tar.gz 90302033 BLAKE2B 2f79137e176bff04c4fb17ab863302943588226d5b599dfa1acf0e495111be1c581f4e130f911c312916669c4f2707eec5218601db090d5060248b2fe481d710 SHA512 79f06deca5753251de82a703f4a9698c117706290df779291a5405edb06f1c225d1d2416bda0e67dcd87cc308bf79504e89d4bd8e22aa0eedfbf06d88bc37f33
-DIST gcc-7.3.0-patches-1.6.tar.bz2 11313 BLAKE2B cdb823d73a66949cd73f9ebff50cf1cdbb59f04b439a700c239110d36982d70c8acd219402ce8aea26f848d5067856d9aa54470ea683678bbfe9fe08a9f592d1 SHA512 7670deb57e07a83a05f54d962c0faa36d91d8cf43f9f023d3231983e98768d9f90f2a3c9a95f69853086012474fc336bc47fc4af4ab9337b69c89415ce61c1c4
 DIST gcc-7.3.0-patches-1.8.tar.bz2 14435 BLAKE2B 3e5c1abad56ccd6e0aa7739cb7cd651ec07ef9bf25be554343f1fa0444f251de41bde5fe6f8bb9e85e3f7a5cf8b2b83515647d93d62f338fa7843581fcaff2f8 SHA512 4d9d76b3d47f1af4f23cae15278d165b22065a3d1512323d1e31b5e0cb47e4654733dc43fa11906a3bd18e827621c9a5ec62b73563f8e5ead663c29f7d0d7345
 DIST gcc-7.3.0.tar.xz 62462388 BLAKE2B dc8f132b21bd0543c3d9dd17557038aafe65675aa73c540954234a3c972b4c31c939149bd50183d072ab6c8d16919e19daeaaffd619ce2ccd62dbdf9a5bb3302 SHA512 ad41a7e4584e40e92cdf860bc0288500fbaf5dfb7e8c3fcabe9eba809c87bcfa85b46c19c19921b0cdf6d05483faede8287bb9ea120c0d1559449a70e602c8d4
+DIST gcc-8-2019-20190517-18C94-src.tar.gz 95266904 BLAKE2B 8dc1983317517e9d7221ffd3d1c804367c98a7142b3964e6382ee037da2cfebc9e044640549c77905646727e97ba108445b00f36916a65c326e862230608a7dc SHA512 50933d7eab927a2d118e01c5cb85336203544f6fbc3f245a148e952320d6f8452fcd5d355019a144e8af03357d129bb145397506db0a62fddf1f746b6671e7fc
+DIST gcc-8.3.0-patches-1.1.tar.bz2 14430 BLAKE2B c702fbdb18c3c952cdb9adead3a193c948d78a4cb4b041beaa51a06b907fd357bb10a2f8d47d55978ebb08590fd7c9a6ec3df8e7a007173e20a55d251d947c72 SHA512 9e2284f597bab6f78ca24ead358b1f50495aefc9e0a416ace24c94723db7b2fb82d48426876138d00c82bcaf9c2f8b4674885988448dcf16dee1b764face9af4
+DIST gcc-8.3.0.tar.xz 63694700 BLAKE2B 71df2ff5bd6874d57519c2e9af6b22152c8c4d7fab906a5f427b41bc4e8e742127592a8684120d9d3c9ce6241439531850be08ec0a4f29dbfdee95435655fdca SHA512 1811337ae3add9680cec64968a2509d085b6dc5b6783fc1e8c295e3e47416196fd1a3ad8dfe7e10be2276b4f62c357659ce2902f239f60a8648548231b4b5802
 DIST gcc-interface-4.9-gpl-2016-src.tar.gz 339037 BLAKE2B 8218ea3a3e3ddb11febb5f2fbcfad69ec25251d3ed6bf4f9c70dc9b3720cc2fb3310d704db40bd0c749be89b17a2b3766ddae3d6158313480073856057ad4bcf SHA512 507df314d1890c228c19f458bd51197377deaaa2d6082fe1e71b62b683252ee5fba4adfe2386246e14618b1c77288e0dcb5bf501e2daaca249b6299462c2f6bd
 DIST gcc-interface-6-gpl-2017-src.tar.gz 347016 BLAKE2B 934c6dac491abece9a6868d28fe9d2a6a1109238fe25c9b94abe83dfc22a1085489f0e0384626da0a3abeebe7537c5715df49a7e2d40577c96eb7ac897b84fd8 SHA512 5833303fce5bf812ccbc71f3d3726c0cb877937d75327edb15097c0b7dba58024a52688392906695ab92fb4e5d7a6623671eac9a05d17937dc0270bafcde920a
 DIST gcc-interface-7-gpl-2018-src.tar.gz 339461 BLAKE2B e6009c0b287b1cd8f055226e6919c12f2ba08f8ef24101608691b05b70a7fb0ca708e2ecd126499fb84a126436d3841f1a13be0b6d3442ef3bd3871391f8e1d5 SHA512 9dc942a39dd983778756be2951b4c66ac3835bf456dc389f80ffbafdacde4ebcb80720ac9eca8fef8734d6d052c061db37c88dba642d85add10940164d120381
+DIST gcc-interface-8-2019-20190510-18F59-src.tar.gz 352408 BLAKE2B d08867737fd5a2e8aa87e61efff47757b587baff67810eb9193fe72b68578bcb130f0c1491599588d130663d908b9c6c9a604b1352aeccb79e9dd3bfef4b9f61 SHA512 c4a048725517e674cc43b7b72e3b1bdb4f1cf9d81fe3b84dd177a2fda8c7af11c3135e883072b640c8aa351625f49573727c859064683e8b5f096fdbd3990c38
+DIST gnat-2019-20190517-18C94-src.tar.gz 8950160 BLAKE2B ce6b8ca0687b3d345db72a8b3216e67ba706cfd7f6ca98f45ec2ae356d9c5b3a42a4b3aac5e89285871157ddaca3aff1b970934de88f8190d84aff060bf1fc4b SHA512 4d57c97fc1f3d5274e0c4ffa536ec056e7c3f1619010affff008cd07a0bfa638d18fee1705a5dd76f12d168baef85677cc34ef40f5e52fd5292ac886c0d4c5ee
 DIST gnat-gpl-2014-x86-linux-bin.tar.gz 233049287 BLAKE2B 2e8bab113f6a319533ec12fdf71c481f72aee227c22bd0cc42a53bd727b323caba1e7b6298053db8b4d3016236b31649b0b255f4ebcbb81a08a69f29f78f13fc SHA512 ac7f53fb4bd71b0e8fbd62abc45de76f7f8f2f405b80e9b60b4b65a6cef6ee98e3b06848e4b752af3c8268237e5a0529cf6145ebc5b33cd6e5cf4928d85f5be2
 DIST gnat-gpl-2014-x86_64-linux-bin.tar.gz 236253400 BLAKE2B c1db70db9442ba24688b8e323d5a02e2e9707ba1f02835ea551038d0a09aafede93a224091e5186f2f2a9d0f96144027af2184ee05ca1c19cc997a6cf3902df7 SHA512 5e40a251baac3d0ace78352956ca21a7d294d902d344a9ed7a8d376e900468c283721ebfb773adfedbf4d623ace02536505c0147815a0c1908933ad611ea085e
 DIST gnat-gpl-2016-src.tar.gz 8857249 BLAKE2B 3ff0fe247990e2a612ac989aa389e9ccae2e29c16177975c327b53ae1471030d0a70e5a2e3af219ad9a3288c241f2d18da349d0650f7fde01d439f4e4720de88 SHA512 4a5cb58ede5b4ae2887e64f0f2e12e0e06470d320796f06d02f7ddd932ff0d3b40e6d3e98a81138fff6906548a55153c2a186ff4a6e3d23b9dbe01ca582da1f8
@@ -37,6 +42,6 @@ DIST gnat-gpl-2017-src.tar.gz 8783473 BLAKE2B b0415b42f4d3a5e8675591a5602ff0a969
 DIST gnat-gpl-2018-src.tar.gz 8706578 BLAKE2B ba245fd91cc5263d5b8c159d9e75caf6bed21dcaa5fa43734af8775a4008ce5f96bfb84a8b5e6e734ff883314ab3219dacec3fe95a5baa33fb712bfb5ff8bce8 SHA512 0ff7e848ef77f7e772e2a1b01905307a91c332f32329456f5238c4b7eb46cc118709e8682a5fc826d98a7d99fd15a92c194f4a278f04bc465165cfa616cc3c2e
 EBUILD gnat-gpl-2016-r3.ebuild 5905 BLAKE2B 421c328830738c064bc1fa5654b82eac90f2abf0204b6699f01721de5f1446c3cb988288e73c338aad5ece6616ce067e9e7e1ff15116a472a0946555b4e31ed8 SHA512 62d29d412290e76a491f24330878dc17cbeb92ddda8693f1ce4bd240947d3e0d3361e05b4973f8b91ff4f1fa06f48f63ea6baa89675782b0363d267a2ff4bda8
 EBUILD gnat-gpl-2017.ebuild 4976 BLAKE2B d1bbf049cc17f778a3d0260fb2394898085415ca87fa59a5f1c349b4c3b62bb5a049214057ae76c75bae57df9f5ed6bd59fd55bf816a4e6a1683a90964b644e5 SHA512 3dbb26da721729e5c65ba905ddc41e8993feaa928546124a0079118435013555b9afd9422f2029ff6ed84ab613e5587c98b5a58d19a691cfe12c73a46cf130a8
-EBUILD gnat-gpl-2018-r1.ebuild 4999 BLAKE2B 3c9bfaaeab7166d326a87301baee8c151462726fcf61af58dbd9921cbfc5dafa78205c0169e2a54f14a568ce1d958980b2d20113daa65ce10cc7a60328ed0d1b SHA512 4daba04ee89a83dbebb325955dd47c54468fd5a33c56370be432553b47a0fd27df408d62b70af4321bad69b9e51463d4e6cfba7f24480704bf4c6b30d01c971a
-EBUILD gnat-gpl-2018-r2.ebuild 5028 BLAKE2B 9bfb2bedb7722c3546d75b98537c99eec45631b5848071756c57e7bb6356ea4af01bd4a26d5d97e3695654a76c109efe660e151e4dc01e01f09bd99cb0b286e6 SHA512 4cb31eeb0346b71d43df23230c69bda628b4ea860e14c08aece33de37af803ee6e7392776eb5c59145d10c57e80adb595e1a81f5f64a9401638fac59559c2578
-MISC metadata.xml 1928 BLAKE2B b1caee350b6656a838a0f83698760edfa7f53d0715a3ce18f443c5bef26827ccf9a858a918a8822b89a2fa70e34cb282ddcd9f0746691a0f10cbda4b368ac1ac SHA512 bd0b8cb4961903f004fb2d5fdd260e6b15936730148d192edf4e59b04c5f1dc991940069edc02b38f859ad1470e16e028c122403043a4f99ba7af753085867fd
+EBUILD gnat-gpl-2018-r2.ebuild 5026 BLAKE2B 5a0c28a977f923aae20af0adc2643797e5e12e9960c263271bc09bf7683d9fe0f1848cc4079a831171d5e18e2a4aaf4bc31d1b5e247a84f9771aba327f0303fd SHA512 f626aaf0b5fa3abdd1e25b781e124692b5aa419d888bf59576c9c4d97d02676ee032fbc77296174bfa30d1d391426030fe530d9f713efe92e3ff75c9b67fec82
+EBUILD gnat-gpl-2019.ebuild 4893 BLAKE2B 4063f84d350626777942a4e7551f2c838283815f020ae4e783b2c68310d0df62c3a4c06a7e556a39216e374c1d577560650d4bbfd930e870888d9d43843254bb SHA512 68444095e4f48240314bb556468e16894cb7e6d1105bfb2fd0065b917b4ccf669d09acd25e0ade8ea96ede2e78ac55da9d249bcaab742dfee00b4b8b2f9d840e
+MISC metadata.xml 1997 BLAKE2B ae2e0322765ddd545865ce131fe469fd871666d318f0774bea45dddc02319a7508702214a4ffeb0a10cf5be64ee2ce304aba2c559ac59960f9de80abf9d2ff36 SHA512 a7f75583b2337680a28b2d9d4761744c3c30d14de25cf4e3f5b337ffdcea3e255a025e2894d2f1478436f7823b9264f8df6ab2c490ce3a44b028d5c6217be6d6
diff --git a/dev-lang/gnat-gpl/files/gnat-gpl-2019-gentoo.patch b/dev-lang/gnat-gpl/files/gnat-gpl-2019-gentoo.patch
new file mode 100644
index 000000000000..36befaafc0f8
--- /dev/null
+++ b/dev-lang/gnat-gpl/files/gnat-gpl-2019-gentoo.patch
@@ -0,0 +1,42 @@
+--- a/patch/15_all_disable-systemtap-switch.patch	2019-05-28 09:25:40.556754095 +0200
++++ b/patch/15_all_disable-systemtap-switch.patch	2019-05-28 09:25:00.731426775 +0200
+@@ -42,8 +42,8 @@
+    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+    lt_status=$lt_dlunknown
+    cat > conftest.$ac_ext <<_LT_EOF
+--#line 18451 "configure"
+-+#line 18453 "configure"
++-#line 18497 "configure"
+++#line 18499 "configure"
+  #include "confdefs.h"
+  
+  #if HAVE_DLFCN_H
+@@ -51,8 +51,8 @@
+    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+    lt_status=$lt_dlunknown
+    cat > conftest.$ac_ext <<_LT_EOF
+--#line 18557 "configure"
+-+#line 18559 "configure"
++-#line 18603 "configure"
+++#line 18605 "configure"
+  #include "confdefs.h"
+  
+  #if HAVE_DLFCN_H
+--- a/gcc-8-2019-20190517-18C94-src/gcc/ada/osint.adb	2017-03-10 21:58:02.600710156 +0100
++++ b/gcc-8-2019-20190517-18C94-src/gcc/ada/osint.adb	2017-03-10 21:59:38.033983293 +0100
+@@ -2229,14 +2229,11 @@
+       for J in Start_Of_Prefix .. Name_Len - Prog'Length + 1 loop
+          if Name_Buffer (J .. J + Prog'Length - 1) = Prog then
+             End_Of_Prefix := J - 1;
++            Start_Of_Suffix := J + Prog'Length;
+             exit;
+          end if;
+       end loop;
+ 
+-      if End_Of_Prefix > 1 then
+-         Start_Of_Suffix := End_Of_Prefix + Prog'Length + 1;
+-      end if;
+-
+       --  Create the new program name
+ 
+       return new String'
diff --git a/dev-lang/gnat-gpl/gnat-gpl-2018-r2.ebuild b/dev-lang/gnat-gpl/gnat-gpl-2018-r2.ebuild
index 68a8127b6a55..7dfa7ce108dd 100644
--- a/dev-lang/gnat-gpl/gnat-gpl-2018-r2.ebuild
+++ b/dev-lang/gnat-gpl/gnat-gpl-2018-r2.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}"
diff --git a/dev-lang/gnat-gpl/gnat-gpl-2018-r1.ebuild b/dev-lang/gnat-gpl/gnat-gpl-2019.ebuild
index 997ac8068954..9299976fecff 100644
--- a/dev-lang/gnat-gpl/gnat-gpl-2018-r1.ebuild
+++ b/dev-lang/gnat-gpl/gnat-gpl-2019.ebuild
@@ -1,29 +1,31 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="6"
 
-PATCH_VER="1.6"
+PATCH_VER="1.1"
 
-TOOLCHAIN_GCC_PV=7.3.0
-GCC_CONFIG_VER=7.3.1
+TOOLCHAIN_GCC_PV=8.3.0
+GCC_CONFIG_VER=8.3.1
 
-inherit eutils toolchain-funcs toolchain
+inherit toolchain-funcs toolchain
 
-REL=7
-MYP=gcc-${REL}-gpl-${PV}-src
+REL=8
+MYP=gcc-${REL}-${PV}-20190517-18C94-src
+GNATDIR=gnat-${PV}-20190517-18C94-src
+INTFDIR=gcc-interface-${REL}-${PV}-20190510-18F59-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/5b0819dfc7a447df26c27aa5
-		-> ${P}-src.tar.gz
-	http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27aa7
+	http://mirrors.cdn.adacore.com/art/5cdf865331e87aa2cdf16b49
+		-> ${GNATDIR}.tar.gz
+	http://mirrors.cdn.adacore.com/art/5cdf8a0731e87a8f1d425049
 		-> ${MYP}.tar.gz
-	http://mirrors.cdn.adacore.com/art/5b0819dfc7a447df26c27aa6
-		-> gcc-interface-${REL}-gpl-${PV}-src.tar.gz
+	http://mirrors.cdn.adacore.com/art/5cdf87cc31e87aa2cdf16b50
+		-> ${INTFDIR}.tar.gz
 	bootstrap? (
 		amd64? (
 			http://mirrors.cdn.adacore.com/art/564b3ebec8e196b040fbe66c ->
@@ -36,7 +38,7 @@ SRC_URI+="
 	)"
 
 LICENSE+=" GPL-2 GPL-3"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+bootstrap"
 
 RDEPEND="!sys-devel/gcc:${GCC_CONFIG_VER}"
@@ -46,7 +48,6 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}"/${MYP}
 PDEPEND="${PDEPEND} elibc_glibc? ( >=sys-libs/glibc-2.13 )"
-FSFGCC=gcc-${TOOLCHAIN_GCC_PV}
 
 pkg_setup() {
 	toolchain_pkg_setup
@@ -81,9 +82,9 @@ src_unpack() {
 	fi
 
 	GCC_A_FAKEIT="
-		${P}-src.tar.gz
 		${MYP}.tar.gz
-		gcc-interface-${REL}-gpl-${PV}-src.tar.gz"
+		${GNATDIR}.tar.gz
+		${INTFDIR}.tar.gz"
 	if use bootstrap; then
 		GCC_A_FAKEIT="${GCC_A_FAKEIT} ${BTSTRP}.tar.gz"
 	fi
@@ -115,12 +116,11 @@ src_prepare() {
 	ln -s $(which ${GNATLS}) bin/gnatls || die
 
 	cd ..
-	mv ${P}-src/src/ada ${MYP}/gcc/ || die
-	mv gcc-interface-${REL}-gpl-${PV}-src ${MYP}/gcc/ada/gcc-interface || die
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-	rm patch/91_all_bmi-i386-PR-target-81763.patch || die
-	rm patch/93_all_copy-constructible-fix.patch || die
-	rm patch/95*.patch || die
+	mv ${GNATDIR}/src/ada ${MYP}/gcc/ || die
+	mv ${INTFDIR} ${MYP}/gcc/ada/gcc-interface || die
+	eapply "${FILESDIR}"/${P}-gentoo.patch
+	rm patch/27*.patch || die
+	rm patch/28*.patch || die
 	cd -
 	sed -i \
 		-e 's:$(P) ::g' \
@@ -181,9 +181,8 @@ src_install() {
 }
 
 pkg_postinst () {
-	toolchain_pkg_postinst
 	einfo "This provide the GNAT compiler with gcc for ada/c/c++ and more"
-	einfo "The compiler binary is ${CTARGET}-gcc-${TOOLCHAIN_GCC_PV}"
+	einfo "The compiler binary is ${CTARGET}-gcc-${GCC_CONFIG_VER}"
 	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"
diff --git a/dev-lang/gnat-gpl/metadata.xml b/dev-lang/gnat-gpl/metadata.xml
index 1e9066797159..f71e77219b25 100644
--- a/dev-lang/gnat-gpl/metadata.xml
+++ b/dev-lang/gnat-gpl/metadata.xml
@@ -29,6 +29,7 @@
 		<flag name="regression-test">Run the testsuite and install the results
 			(requires FEATURES=test)</flag>
 		<flag name="sanitize">Build support for various sanitizer functions (ASAN/TSAN/etc...)</flag>
+		<flag name="systemtap">enable systemtap static probe points</flag>
 		<flag name="ssp">Build packages with stack smashing protector on by default</flag>
 		<flag name="vtv">Build support for virtual table verification (a C++ hardening feature)</flag>
 	</use>