From 1a3b37f4b6b175a1ca0d66ccd858172bfeb90f28 Mon Sep 17 00:00:00 2001
From: hermord <dm.shynk@gmail.com>
Date: Tue, 10 Jan 2017 03:29:38 -0500
Subject: [PATCH] tmux,parted,bc,htop: enable x86_64 (#1022)

fix gcc6 and gcc7 syslibs devel provides.
---
 app-misc/tmux/tmux-2.1.recipe              |  6 +++---
 sys-block/parted/parted-3.2.recipe         |  3 +--
 sys-devel/bc/bc-1.06.recipe                |  2 +-
 sys-devel/gcc/gcc6-6.1.0_2015_11_08.recipe | 10 +++++++++-
 sys-devel/gcc/gcc7-7.0.0_2016_02_29.recipe | 10 +++++++++-
 sys-process/htop/htop-2.0.1.recipe         |  2 +-
 6 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/app-misc/tmux/tmux-2.1.recipe b/app-misc/tmux/tmux-2.1.recipe
index b87bd3024..6e4157ec9 100644
--- a/app-misc/tmux/tmux-2.1.recipe
+++ b/app-misc/tmux/tmux-2.1.recipe
@@ -12,7 +12,7 @@ REVISION="1"
 
 PATCHES="tmux-$portVersion.patchset"
 
-ARCHITECTURES="!x86_gcc2 ?x86 ?x86_64"
+ARCHITECTURES="!x86_gcc2 ?x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
@@ -22,7 +22,7 @@ PROVIDES="
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libncurses$secondaryArchSuffix
-	lib:libevent$secondaryArchSuffix	
+	lib:libevent$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
@@ -52,5 +52,5 @@ BUILD()
 
 INSTALL()
 {
-	make install	
+	make install
 }
diff --git a/sys-block/parted/parted-3.2.recipe b/sys-block/parted/parted-3.2.recipe
index f29f1585c..8e4b88b54 100644
--- a/sys-block/parted/parted-3.2.recipe
+++ b/sys-block/parted/parted-3.2.recipe
@@ -10,7 +10,7 @@ SOURCE_URI="http://ftp.gnu.org/gnu/parted/parted-$portVersion.tar.xz"
 CHECKSUM_SHA256="858b589c22297cacdf437f3baff6f04b333087521ab274f7ab677cb8c6bb78e4"
 PATCHES="parted-$portVersion.patchset"
 
-ARCHITECTURES="!x86_gcc2 ?x86 ?x86_64"
+ARCHITECTURES="!x86_gcc2 ?x86 x86_64"
 SECONDARY_ARCHITECTURES="!x86_gcc2 ?x86"
 
 # On x86_gcc2 we don't want to install the commands in bin/<arch>/, but in bin/.
@@ -69,7 +69,6 @@ BUILD_PREREQUIRES="
 	cmd:awk
 	cmd:gcc$secondaryArchSuffix
 	cmd:gettext
-	cmd:gnulib_tool$secondaryArchSuffix
 	cmd:gperf
 	cmd:grep
 	cmd:iconv
diff --git a/sys-devel/bc/bc-1.06.recipe b/sys-devel/bc/bc-1.06.recipe
index 1c2498098..0b38d3a1f 100644
--- a/sys-devel/bc/bc-1.06.recipe
+++ b/sys-devel/bc/bc-1.06.recipe
@@ -12,7 +12,7 @@ SOURCE_URI="http://ftp.gnu.org/gnu/bc/bc-1.06.tar.gz"
 CHECKSUM_SHA256="4ef6d9f17c3c0d92d8798e35666175ecd3d8efac4009d6457b5c99cea72c0e33"
 PATCHES="bc-1.06.patchset"
 
-ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+ARCHITECTURES="x86_gcc2 ?x86 x86_64"
 
 PROVIDES="
 	bc = $portVersion
diff --git a/sys-devel/gcc/gcc6-6.1.0_2015_11_08.recipe b/sys-devel/gcc/gcc6-6.1.0_2015_11_08.recipe
index 58ce23003..22e75cddd 100644
--- a/sys-devel/gcc/gcc6-6.1.0_2015_11_08.recipe
+++ b/sys-devel/gcc/gcc6-6.1.0_2015_11_08.recipe
@@ -5,7 +5,7 @@ HOMEPAGE="http://gcc.gnu.org"
 
 SOURCE_URI="https://ftp.gnu.org/gnu/gcc/gcc-6.1.0/gcc-6.1.0.tar.bz2"
 CHECKSUM_SHA256="09c4c85cabebb971b1de732a0219609f93fc0af5f86f6e437fd8d7f832f1a351"
-REVISION="1"
+REVISION="2"
 LICENSE="
 	GNU GPL v3
 	GNU LGPL v3
@@ -328,5 +328,13 @@ required by Haiku's build system when building Haiku."
 
 PROVIDES_syslibs_devel="
 	gcc6${secondaryArchSuffix}_syslibs_devel = $portVersion compat >= 6
+	devel:libatomic$secondaryArchSuffix = $libatomicLibVersion compat >= $libatomicSoVersion
+	devel:libgcc_kernel$secondaryArchSuffix = $portVersion compat >= 6
+	devel:libgcc$secondaryArchSuffix = $portVersion compat >= 6
+	devel:libgcc_eh_kernel$secondaryArchSuffix = $portVersion compat >= 6
+	devel:libgcc_eh$secondaryArchSuffix = $portVersion compat >= 6
+	devel:libstdc++$secondaryArchSuffix = $portVersion compat >= 6
+	devel:libsupc++$secondaryArchSuffix = $portVersion compat >= 6
+	devel:libsupc++_kernel$secondaryArchSuffix = $portVersion compat >= 6
 	"
 REQUIRES_syslibs_devel=""
diff --git a/sys-devel/gcc/gcc7-7.0.0_2016_02_29.recipe b/sys-devel/gcc/gcc7-7.0.0_2016_02_29.recipe
index 3787f420f..03cfce921 100644
--- a/sys-devel/gcc/gcc7-7.0.0_2016_02_29.recipe
+++ b/sys-devel/gcc/gcc7-7.0.0_2016_02_29.recipe
@@ -6,7 +6,7 @@ HOMEPAGE="http://gcc.gnu.org"
 srcGitRev="abb80251080239f8e058dea1ae0ca011e2c72816"
 SOURCE_URI="https://github.com/korli/gcc/archive/$srcGitRev.tar.gz"
 CHECKSUM_SHA256="0176a47c07cf0e7229b5f8e6d00d05b544f15145313c986117e94ef4775a3ed2"
-REVISION="1"
+REVISION="2"
 LICENSE="
 	GNU GPL v3
 	GNU LGPL v3
@@ -329,5 +329,13 @@ required by Haiku's build system when building Haiku."
 
 PROVIDES_syslibs_devel="
 	gcc7${secondaryArchSuffix}_syslibs_devel = $portVersion compat >= 7
+	devel:libatomic$secondaryArchSuffix = $libatomicLibVersion compat >= $libatomicSoVersion
+	devel:libgcc_kernel$secondaryArchSuffix = $portVersion compat >= 7
+	devel:libgcc$secondaryArchSuffix = $portVersion compat >= 7
+	devel:libgcc_eh_kernel$secondaryArchSuffix = $portVersion compat >= 7
+	devel:libgcc_eh$secondaryArchSuffix = $portVersion compat >= 7
+	devel:libstdc++$secondaryArchSuffix = $portVersion compat >= 7
+	devel:libsupc++$secondaryArchSuffix = $portVersion compat >= 7
+	devel:libsupc++_kernel$secondaryArchSuffix = $portVersion compat >= 7
 	"
 REQUIRES_syslibs_devel=""
diff --git a/sys-process/htop/htop-2.0.1.recipe b/sys-process/htop/htop-2.0.1.recipe
index 1eb470da5..17eb7ee9a 100644
--- a/sys-process/htop/htop-2.0.1.recipe
+++ b/sys-process/htop/htop-2.0.1.recipe
@@ -10,7 +10,7 @@ REVISION="2"
 
 PATCHES="htop-$portVersion.patchset"
 
-ARCHITECTURES="!x86_gcc2 ?x86 ?x86_64"
+ARCHITECTURES="!x86_gcc2 ?x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="