Added conflicts to recipes

inclement · inclement · commit ef825d839a4e · 2015-07-25T00:07:56.000+01:00
diff --git a/pythonforandroid/recipes/android/__init__.py b/pythonforandroid/recipes/android/__init__.py
@@ -8,8 +8,11 @@ class AndroidRecipe(IncludedFilesBehaviour, CythonRecipe):
     # name = 'android'
     version = None
     url = None
-    depends = ['pygame']
+
     src_filename = 'src'
 
+    depends = ['pygame']
+    conflicts = ['sdl2']
+
 
 recipe = AndroidRecipe()
diff --git a/pythonforandroid/recipes/hostpython2/__init__.py b/pythonforandroid/recipes/hostpython2/__init__.py
@@ -10,6 +10,8 @@ class Hostpython2Recipe(Recipe):
     url = 'http://python.org/ftp/python/{version}/Python-{version}.tar.bz2'
     name = 'hostpython2'
 
+    conflicts = ['hostpython3']
+
     def prebuild_armeabi(self):
         # Override hostpython Setup?
         shprint(sh.cp, join(self.get_recipe_dir(), 'Setup'),
diff --git a/pythonforandroid/recipes/hostpython3/__init__.py b/pythonforandroid/recipes/hostpython3/__init__.py
@@ -10,6 +10,8 @@ class Hostpython3Recipe(Recipe):
     url = 'http://python.org/ftp/python/{version}/Python-{version}.tgz'
     name = 'hostpython3'
 
+    conflicts = ['hostpython2']
+
     # def prebuild_armeabi(self):
     #     # Override hostpython Setup?
     #     shprint(sh.cp, join(self.get_recipe_dir(), 'Setup'),
diff --git a/pythonforandroid/recipes/pygame/__init__.py b/pythonforandroid/recipes/pygame/__init__.py
@@ -8,7 +8,9 @@ class PygameRecipe(Recipe):
     name = 'pygame'
     version = '1.9.1'
     url = 'http://pygame.org/ftp/pygame-{version}release.tar.gz'
+
     depends = ['python2', 'sdl']
+    conflicts = ['sdl2']
 
     def get_recipe_env(self, arch):
         env = super(PygameRecipe, self).get_recipe_env(arch)
diff --git a/pythonforandroid/recipes/python2/__init__.py b/pythonforandroid/recipes/python2/__init__.py
@@ -12,6 +12,7 @@ class Python2Recipe(Recipe):
     name = 'python2'
 
     depends = ['hostpython2']  
+    conflicts = ['python3']
 
     def prebuild_armeabi(self):
         build_dir = self.get_build_container_dir('armeabi')
diff --git a/pythonforandroid/recipes/python3/__init__.py b/pythonforandroid/recipes/python3/__init__.py
@@ -11,6 +11,7 @@ class Python3Recipe(Recipe):
     name = 'python3'
 
     depends = ['hostpython3']  
+    conflicts = ['python2']
 
     def prebuild_armeabi(self):
         build_dir = self.get_build_container_dir('armeabi')
diff --git a/pythonforandroid/recipes/sdl2/__init__.py b/pythonforandroid/recipes/sdl2/__init__.py
@@ -7,10 +7,12 @@
 class LibSDL2Recipe(NDKRecipe):
     version = "2.0.3"
     url = "https://www.libsdl.org/release/SDL2-{version}.tar.gz"
-    depends = ['python2', 'sdl2_image', 'sdl2_mixer', 'sdl2_ttf']
-    # depends = ['python2']
+
     dir_name = 'SDL'
 
+    depends = ['python2', 'sdl2_image', 'sdl2_mixer', 'sdl2_ttf']
+    conflicts = ['pygame', 'pygame_bootstrap_components']
+
     def prebuild_arch(self, arch):
         super(LibSDL2Recipe, self).prebuild_arch(arch)
         build_dir = self.get_build_dir(arch.arch)
