gentoo resync : 28.09.2019

3 files changed, 16 insertions, 0 deletions

diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 2dcaa817e771..fbc27f86d720 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -137,11 +137,19 @@ EBUILD gcc-5.4.0-r6.ebuild 1286 BLAKE2B 176cf1828d2e8f16cdf1157326103becbb0af36d
 EBUILD gcc-5.5.0.ebuild 1285 BLAKE2B e0a5bcb01c51b656d4e6f11a8b4894de0de79da2aea5d9e17ea6ce619010244e68e2689923f65fb23553d912aa57f6d55d95688b5b22d4f5c4f1fb878aba4c61 SHA512 8ef8082806d79fb0786c65eb691838cd9735811ed54ed75c9ddc62968bbe5253ca7b6c6dd00bae32608ab076c52e5cd54522076745e6e1e24298b755f1ef5d1f
 EBUILD gcc-6.4.0-r1.ebuild 525 BLAKE2B 4ef6e95caec3cd198f9eac05585a691ea6babeca2278e92b6092dc9c19a8708a4abc1ddb7af687f862b8e47cb4ed4380589a76499e45df5cab03d4b6b2620dd3 SHA512 191f06a355369bb2ad9eff92299d9d4c5c78edf7bd11d27d791fd1c8f438829ef3b0ced2478e126c9470ea198f3ccd20d2ca52e216952130788892c280c213e6
 EBUILD gcc-6.4.0-r5.ebuild 532 BLAKE2B fe0a860235c627ca870340098884f2aa14dc891d00dcdbc5afd81ef2db55a9006d63924b00457fe53e89b81abda549a08aa2b05a665ee2c3f256ba4d7af603f0 SHA512 da5b64937c62801ee0358fa2a6cd8e2b18baf2dd914b8fff644f03e1f6a31b2f788ba1a5633301c2500deefa29ba6f7cce6252ef98bceee20262f4c284213ff8
+<<<<<<< HEAD
 EBUILD gcc-6.5.0-r1.ebuild 470 BLAKE2B 4fea17daab5bdeb872e284aec412ca9a150d70b2bb9c49ff1b4f6bae9cf9628505939b618675d0fb87b7d444230e157fc060a9ce41a9a4e9bfcc8633a27cf76f SHA512 4d3178700a579a38afc6d861133ab1db75b7c045d60b8afa2de1739712024eca8de9b4301c06dd1870f09b4c528d1affa1d88eaabd86677ad9e46ae86ba1902d
 EBUILD gcc-7.3.0-r3.ebuild 534 BLAKE2B 6cf318ef9641c52f34955d7937f4e49b81e033f0b40de377b2e3bf5bf2d9c722de9863d446c7553201be3f224be221f428ff1941da37ca1fd0e08d47ea86df23 SHA512 a9bf223ca8ebf6acbd501b34373d6cdb17dace9bab8bb0efee948f75be11bbe67db3f388c64320932e001d18ec701ee88a68ad36c5df1ec29c2434f40f5cd4ad
 EBUILD gcc-7.3.0-r6.ebuild 544 BLAKE2B 9860dcad0dd77fc2e54311497031f8547f2d91dedf97a2f712967b9170f01127903d625bf7085a43ec09aa2f813a917cd4ec9f94122db09fd4c02dd803d9df46 SHA512 7a3ba4a4f4a41480b04c499b86214f390d0df4dfac3e20abaf087e465a631b846fe303ee0db80d000e1f79a16bdf1722ee0e29055b311d8ba8a6c4b17c4fdc02
 EBUILD gcc-7.4.0-r1.ebuild 484 BLAKE2B 3faffdf7e34e7f037dc161b503c0e3a4ed1b4d9f3d66dd7b378192f2b7665f0f9137e2fbbdb850144012d18ae6d3450d78cf360740151fb06b49cd7c70637136 SHA512 4fc2e4c35d72d55b10df0a5cd1fdeee7b1766490a5121ea4ddd7c478fce470df30141dff9e0cc8c2a10260201a1e1b205cd42ebc0f8ea1e512928bbf38d8e32c
 EBUILD gcc-7.4.0-r2.ebuild 483 BLAKE2B 8d75e4fcc62e82a81494297894ac73920100ec1d13a039daafc9a0b290e633e91e8eb7af8b0f8d93ad261387645066314da75a0f4cd7f233dd90c6ceb5861f61 SHA512 160f49984268a4487540681c190f68906561e2cc459ea8df6b7d841ae35ff805b7b070436e434d91355008722e67bdcc54db07ae642746107622a69a3d5f59dc
+=======
+EBUILD gcc-6.5.0-r1.ebuild 464 BLAKE2B 10626c5a86323b2e6296d1886838bda705159ca45cd9f1703428c678825f0afe0d07c6af7ed61954af131f9e55efb5b12485fb678504b19a58c03cb679276869 SHA512 cad65ddd4103904379d692c90f77dd7643cefde53eb65f380fb910601d4e578efeadbfb517b4edd822ef2daceff3fca5ffe97baa2486dfb1e483fa2c72cbe10c
+EBUILD gcc-7.3.0-r3.ebuild 534 BLAKE2B 6cf318ef9641c52f34955d7937f4e49b81e033f0b40de377b2e3bf5bf2d9c722de9863d446c7553201be3f224be221f428ff1941da37ca1fd0e08d47ea86df23 SHA512 a9bf223ca8ebf6acbd501b34373d6cdb17dace9bab8bb0efee948f75be11bbe67db3f388c64320932e001d18ec701ee88a68ad36c5df1ec29c2434f40f5cd4ad
+EBUILD gcc-7.3.0-r6.ebuild 544 BLAKE2B 9860dcad0dd77fc2e54311497031f8547f2d91dedf97a2f712967b9170f01127903d625bf7085a43ec09aa2f813a917cd4ec9f94122db09fd4c02dd803d9df46 SHA512 7a3ba4a4f4a41480b04c499b86214f390d0df4dfac3e20abaf087e465a631b846fe303ee0db80d000e1f79a16bdf1722ee0e29055b311d8ba8a6c4b17c4fdc02
+EBUILD gcc-7.4.0-r1.ebuild 484 BLAKE2B 3faffdf7e34e7f037dc161b503c0e3a4ed1b4d9f3d66dd7b378192f2b7665f0f9137e2fbbdb850144012d18ae6d3450d78cf360740151fb06b49cd7c70637136 SHA512 4fc2e4c35d72d55b10df0a5cd1fdeee7b1766490a5121ea4ddd7c478fce470df30141dff9e0cc8c2a10260201a1e1b205cd42ebc0f8ea1e512928bbf38d8e32c
+EBUILD gcc-7.4.0-r2.ebuild 477 BLAKE2B 9c87491fcf792fce171b14f36b203e339e25470bde6ab69fd7387b30efd887b02e5bff5036819bc275a048d8658d50d793d2026588a1cc050392e334072e2d7b SHA512 22837c7eeb5965c3949de57692f98f90ddbf52326358dad37fed410168fb4b04becbe22bc2c3743b81e4a63c71e9b79ec1bbb67af658b745071644db33f91c6c
+>>>>>>> next
 EBUILD gcc-8.2.0-r5.ebuild 491 BLAKE2B 302b288193a8cf89d93a53e9012e7686111e5195d2015b219adab5b302245d773519ca0c3193235d0b85974e7237b22beba4d43431e46c9b6e554dcadf816198 SHA512 8270e48c6287c4674318ff5aace71bfcf79dd1e96e7be381d6e87f2c97d42440610d9351403fc7ba30733581919cd992a42fba208991970ad1fcec305f7873a3
 EBUILD gcc-8.2.0-r6.ebuild 573 BLAKE2B 812f00996ac141562556ec5f38a90d56fc208ab3a6ae19244dc2df90895fdd91568e261c1803ff9fd9fcba564b23068c41bdd40efa0b14fd7526b077663b3ff6 SHA512 27e4fb20f91ab261560a70190ab0127bb214afc776d9b168cdb32482b6d443afec1a6c479cc40ebdffd7753ba14ff66383cce6307ec0cdbef3ef30c1c7234bc5
 EBUILD gcc-8.3.0-r1.ebuild 611 BLAKE2B c6de68f5d524ed9823eadfee85fceba96d10d5f38f30861dd57238b3cd585729828b8ca880c4de07647a0a633db2f3f76eae214c2bd36a2836f550d3e5c77f3b SHA512 4160d6e5927408bae6eb959b202f79f38701d3de6ce264e35997c156e4fd0e9f186bce61d573c3bd3528022adeba3030581aa49dcdf77bb4a3a09184964c2590
diff --git a/sys-devel/gcc/gcc-6.5.0-r1.ebuild b/sys-devel/gcc/gcc-6.5.0-r1.ebuild
index c887af7a65b0..32e8d79202ce 100644
--- a/sys-devel/gcc/gcc-6.5.0-r1.ebuild
+++ b/sys-devel/gcc/gcc-6.5.0-r1.ebuild
@@ -7,7 +7,11 @@ PATCH_VER="2"
 
 inherit toolchain
 
+<<<<<<< HEAD
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+=======
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+>>>>>>> next
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-7.4.0-r2.ebuild b/sys-devel/gcc/gcc-7.4.0-r2.ebuild
index 72b356e0c534..95b9174eef81 100644
--- a/sys-devel/gcc/gcc-7.4.0-r2.ebuild
+++ b/sys-devel/gcc/gcc-7.4.0-r2.ebuild
@@ -7,7 +7,11 @@ PATCH_VER="1.3"
 
 inherit toolchain
 
+<<<<<<< HEAD
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos"
+=======
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos"
+>>>>>>> next
 
 RDEPEND=""
 DEPEND="${RDEPEND}