Removed references to removed sdl2python3crystax

inclement · inclement · commit 80d393cf2e5b · 2016-01-10T21:23:13.000Z
diff --git a/pythonforandroid/recipes/kivy/__init__.py b/pythonforandroid/recipes/kivy/__init__.py
@@ -11,13 +11,13 @@ class KivyRecipe(CythonRecipe):
     url = 'https://github.com/kivy/kivy/archive/{version}.zip'
     name = 'kivy'
 
-    depends = [('sdl2', 'pygame', 'sdl2python3crystax'), 'pyjnius']
+    depends = [('sdl2', 'pygame'), 'pyjnius']
 
     # patches = ['setargv.patch']
 
     def get_recipe_env(self, arch):
         env = super(KivyRecipe, self).get_recipe_env(arch)
-        if ('sdl2' in self.ctx.recipe_build_order or 'sdl2python3crystax' in self.ctx.recipe_build_order):
+        if 'sdl2' in self.ctx.recipe_build_order:
             env['USE_SDL2'] = '1'
             env['KIVY_SDL2_PATH'] = ':'.join([
                 join(self.ctx.bootstrap.build_dir, 'jni', 'SDL', 'include'),
diff --git a/pythonforandroid/recipes/pyjnius/__init__.py b/pythonforandroid/recipes/pyjnius/__init__.py
@@ -9,10 +9,10 @@ class PyjniusRecipe(CythonRecipe):
     version = 'master'
     url = 'https://github.com/kivy/pyjnius/archive/{version}.zip'
     name = 'pyjnius'
-    depends = [('python2', 'python3crystax'), ('sdl2', 'sdl', 'sdl2python3crystax'), 'six']
+    depends = [('python2', 'python3crystax'), ('sdl2', 'sdl'), 'six']
     site_packages_name = 'jnius'
 
-    patches = [('sdl2_jnienv_getter.patch', check_any(will_build('sdl2python3crystax'), will_build('sdl2'))),
+    patches = [('sdl2_jnienv_getter.patch', will_build('sdl2')),
                'getenv.patch']
 
     def postbuild_arch(self, arch):
diff --git a/pythonforandroid/recipes/pysdl2/__init__.py b/pythonforandroid/recipes/pysdl2/__init__.py
@@ -8,7 +8,7 @@ class PySDL2Recipe(PythonRecipe):
     version = '0.9.3'
     url = 'https://bitbucket.org/marcusva/py-sdl2/downloads/PySDL2-{version}.tar.gz'
 
-    depends = [('sdl2', 'sdl2python3crystax')]
+    depends = ['sdl2']
 
 
 recipe = PySDL2Recipe()
