summaryrefslogtreecommitdiff
path: root/sys-devel/gcc/gcc-6.5.0-r1.ebuild
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2019-10-13 21:54:24 +0100
committerV3n3RiX <venerix@redcorelinux.org>2019-10-13 21:54:24 +0100
commitda491770b9ba5f179e18db461c49cb6f1ccf0e1f (patch)
treed3e34a8bd906741ab18cf69d8d4f732853e26ade /sys-devel/gcc/gcc-6.5.0-r1.ebuild
parentad6182343997a405079870a2fe91c4e0c6b94595 (diff)
parent5a165c60b9b8c4847067cb83b4be7da785d01f93 (diff)
gentoo resync : 28.09.2019
Diffstat (limited to 'sys-devel/gcc/gcc-6.5.0-r1.ebuild')
-rw-r--r--sys-devel/gcc/gcc-6.5.0-r1.ebuild4
1 files changed, 4 insertions, 0 deletions
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}