Index: Makefile
===================================================================
--- Makefile	(revision 544288)
+++ Makefile	(working copy)
@@ -28,7 +28,7 @@
 USE_GITHUB=	yes
 GH_ACCOUNT=	eglaysher
 
-USES=		compiler:c++11-lib gl gnome pkgconfig scons:python2 sdl
+USES=		compiler:c++11-lib gl gnome pkgconfig scons sdl
 USE_GL=		glew glu
 USE_GNOME=	gtk20
 USE_SDL=	image mixer ttf
Index: files/patch-SConstruct
===================================================================
--- files/patch-SConstruct	(revision 544288)
+++ files/patch-SConstruct	(working copy)
@@ -1,19 +1,66 @@
---- SConstruct~
+--- SConstruct.orig	2020-12-04 14:47:36 UTC
 +++ SConstruct
-@@ -19,7 +19,12 @@ AddOption('--fullstatic', action='store_
+@@ -19,8 +19,13 @@ AddOption('--fullstatic', action='store_true',
  
  # Set libraries used by all configurations and all binaries in rlvm.
  env = Environment(
 +  ENV=os.environ,
    tools = ["default", "rlvm"],
-+  **dict((k, v.split()) for k, v in ARGUMENTS.iteritems())
++  **dict((k, v.split()) for k, v in ARGUMENTS.items())
 +)
+ 
++env.Append(
 +
-+env.Append(
- 
    LIBS = ["z"],
  
-@@ -278,6 +275,7 @@ if not config.CheckGuichan():
+   LOCAL_LIBS = [],
+@@ -184,9 +189,9 @@ int main(int argc, char **argv) {
+ def VerifyLibrary(config, library, header):
+   if not config.CheckLibWithHeader(library, header, "c"):
+     if config.CheckLib(library):
+-      print "You have " + library + " installed, but the development headers aren't installed."
++      print("You have " + library + " installed, but the development headers aren't installed.")
+     else:
+-      print "You need " + library + " to compile this program!"
++      print("You need " + library + " to compile this program!")
+     Exit(1)
+ 
+ def CheckForSystemLibrary(config, library_dict, componentlist):
+@@ -206,7 +211,7 @@ def CheckForSystemLibrary(config, library_dict, compon
+ 
+   if not res:
+     lib_name = library_dict['library']
+-    print "(Using included version of %s)" % lib_name
++    print("(Using included version of %s)" % lib_name)
+     componentlist.append(lib_name)
+     config.Define("HAVE_LIB" + lib_name, 1,
+                   "Define to 1 if you have the `%s' library." % lib_name)
+@@ -222,7 +227,7 @@ config = env.Configure(custom_tests = {'CheckBoost'   
+                                        'CheckGuichan' : CheckGuichan},
+                        config_h="build/config.h")
+ if not config.CheckBoost('1.40'):
+-  print "Boost version >= 1.40 needed to compile rlvm!"
++  print("Boost version >= 1.40 needed to compile rlvm!")
+   Exit(1)
+ 
+ VerifyLibrary(config, 'pthread', 'pthread.h')
+@@ -239,7 +244,7 @@ VerifyLibrary(config, 'vorbisfile', 'vorbis/vorbisfile
+ if env['PLATFORM'] != 'darwin':
+   VerifyLibrary(config, 'SDL', 'SDL/SDL.h')
+ else:
+-  print "Can't properly detect SDL under OSX. Assuming you have the libraries."
++  print("Can't properly detect SDL under OSX. Assuming you have the libraries.")
+ 
+ # Libraries we need, but will use a local copy if not installed.
+ local_sdl_libraries = [
+@@ -269,12 +274,13 @@ for library_dict in local_sdl_libraries:
+   CheckForSystemLibrary(config, library_dict, subcomponents)
+ 
+ if not config.CheckGuichan():
+-  print "(Using included copy of guichan)"
++  print("(Using included copy of guichan)")
+   subcomponents.append("guichan")
+ 
  # Get the configuration from sdl and freetype
  env.ParseConfig("sdl-config --cflags")
  env.ParseConfig("freetype-config --cflags --libs")
@@ -21,7 +68,7 @@
  
  env = config.Finish()
  
-@@ -314,7 +311,6 @@ if GetOption('release'):
+@@ -303,7 +309,6 @@ if GetOption('release'):
    # Now add release optimizations to the environment
    env.Append(
      CPPFLAGS = [
@@ -29,7 +76,7 @@
        "-DNDEBUG",
        "-DBOOST_DISABLE_ASSERTS"
      ]
-@@ -360,13 +356,7 @@ elif GetOption('pprof'):
+@@ -349,13 +354,7 @@ elif GetOption('pprof'):
               "profiler"]
    )
  else:
Index: files/patch-site__scons_site_tools_rlvm.py
===================================================================
--- files/patch-site__scons_site_tools_rlvm.py	(nonexistent)
+++ files/patch-site__scons_site_tools_rlvm.py	(working copy)
@@ -0,0 +1,25 @@
+--- site_scons/site_tools/rlvm.py.orig	2016-07-30 22:27:57 UTC
++++ site_scons/site_tools/rlvm.py
+@@ -56,19 +56,19 @@ def RlvmProgram(env, prog_name, *args, **kwargs):
+   objects.extend(args)
+ 
+   # TODO: Deal with RLVM_LIBS in a shared objecty way
+-  if kwargs.has_key('rlvm_libs'):
++  if 'rlvm_libs' in kwargs:
+     for lib_name in kwargs['rlvm_libs']:
+       objects.append(env['LIBPREFIX'] + lib_name + env['LIBSUFFIX'])
+ 
+   # Add all static libraries from the various categories
+-  if kwargs.has_key('use_lib_set'):
++  if 'use_lib_set' in kwargs:
+     for lib_set_name in kwargs['use_lib_set']:
+       lib_set = cloned_env[_MakeStaticName(lib_set_name)]
+       if lib_set:
+         objects.extend(lib_set)
+ 
+   # First, we need to see if this is a static build
+-  if kwargs.has_key("full_static_build") and kwargs['full_static_build'] == True:
++  if 'full_static_build' in kwargs and kwargs['full_static_build'] == True:
+     # We must unpack each entry in LIBS and try to locate a static library to
+     old_libs = cloned_env['LIBS']
+     libpaths = cloned_env['LIBPATH']