From fa27b298bfc41361dc0353c94fff3b82883f207c Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Wed, 22 Jan 2020 22:38:54 +0100
Subject: [PATCH] scons: port haiku patch to python3.

also bump version.
---
 ...ns-3.1.1.patchset => scons-3.1.2.patchset} | 38 +++++++++++++++++--
 ...{scons-3.1.1.recipe => scons-3.1.2.recipe} |  6 ++-
 2 files changed, 38 insertions(+), 6 deletions(-)
 rename dev-util/scons/patches/{scons-3.1.1.patchset => scons-3.1.2.patchset} (77%)
 rename dev-util/scons/{scons-3.1.1.recipe => scons-3.1.2.recipe} (85%)

diff --git a/dev-util/scons/patches/scons-3.1.1.patchset b/dev-util/scons/patches/scons-3.1.2.patchset
similarity index 77%
rename from dev-util/scons/patches/scons-3.1.1.patchset
rename to dev-util/scons/patches/scons-3.1.2.patchset
index 9f20a9740..88a1244a4 100644
--- a/dev-util/scons/patches/scons-3.1.1.patchset
+++ b/dev-util/scons/patches/scons-3.1.2.patchset
@@ -1,14 +1,14 @@
-From c30cc8ab914c08d37fe69d62a46609fd3b728f5b Mon Sep 17 00:00:00 2001
+From c22b4bd5c5084f002caa5331f3ead300438aef11 Mon Sep 17 00:00:00 2001
 From: Ingo Weinhold <ingo_weinhold@gmx.de>
 Date: Fri, 9 Aug 2013 17:46:35 +0200
 Subject: Add support for the Haiku platform
 
 
 diff --git a/engine/SCons/Platform/__init__.py b/engine/SCons/Platform/__init__.py
-index c95f291..2fb360b 100644
+index 66bff49..455c605 100644
 --- a/engine/SCons/Platform/__init__.py
 +++ b/engine/SCons/Platform/__init__.py
-@@ -78,6 +78,8 @@ def platform_default():
+@@ -80,6 +80,8 @@ def platform_default():
              return 'aix'
          elif sys.platform.find('darwin') != -1:
              return 'darwin'
@@ -92,5 +92,35 @@ index 0000000..547421e
 +
 +	env['ENV']['PATH'] = ':'.join(paths)
 -- 
-2.10.2
+2.24.0
+
+
+From 6d519c594fbf99cfff5f8e02e275964765e6a236 Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Wed, 22 Jan 2020 22:35:19 +0100
+Subject: python3 support
+
+
+diff --git a/engine/SCons/Platform/haiku.py b/engine/SCons/Platform/haiku.py
+index 547421e..dd83ef8 100644
+--- a/engine/SCons/Platform/haiku.py
++++ b/engine/SCons/Platform/haiku.py
+@@ -32,12 +32,12 @@ selection method.
+ 
+ __revision__ = ""
+ 
+-import commands
+ import os
+-import posix
++import subprocess
++from . import posix
+ 
+ def findDir(identifier):
+-	return commands.getoutput('finddir %s' % identifier)
++	return str(subprocess.check_output(['finddir', identifier], shell=False).rstrip())
+ 
+ def generate(env):
+ 	posix.generate(env)
+-- 
+2.24.0
 
diff --git a/dev-util/scons/scons-3.1.1.recipe b/dev-util/scons/scons-3.1.2.recipe
similarity index 85%
rename from dev-util/scons/scons-3.1.1.recipe
rename to dev-util/scons/scons-3.1.2.recipe
index 7520e29ea..9e35132ba 100644
--- a/dev-util/scons/scons-3.1.1.recipe
+++ b/dev-util/scons/scons-3.1.2.recipe
@@ -8,8 +8,8 @@ HOMEPAGE="https://www.scons.org/"
 COPYRIGHT="2001-2019 The SCons Foundation"
 LICENSE="MIT"
 REVISION="1"
-SOURCE_URI="http://sourceforge.net/projects/scons/files/scons/$portVersion/scons-$portVersion.tar.gz"
-CHECKSUM_SHA256="4cea417fdd7499a36f407923d03b4b7000b0f9e8fd7b31b316b9ce7eba9143a5"
+SOURCE_URI="https://sourceforge.net/projects/scons/files/scons/$portVersion/scons-$portVersion.tar.gz"
+CHECKSUM_SHA256="7801f3f62f654528e272df780be10c0e9337e897650b62ddcee9f39fde13f8fb"
 PATCHES="scons-$portVersion.patchset"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
@@ -35,6 +35,7 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	cmd:python3
+	cmd:sed
 	"
 
 BUILD()
@@ -50,4 +51,5 @@ INSTALL()
 		--symlink-scons \
 		--standard-lib \
 		--no-install-bat
+	sed -i s/python/python3/ $binDir/scons
 }