From af0889b09134bfdb6fb343c2b5d8bc0bd2ac700d Mon Sep 17 00:00:00 2001 From: Ryan Pessa Date: Tue, 12 Jan 2016 10:33:54 -0600 Subject: [PATCH] misc recipe fixes --- pythonforandroid/recipes/enum34/__init__.py | 1 + pythonforandroid/recipes/pycrypto/__init__.py | 1 + pythonforandroid/recipes/pyusb/__init__.py | 1 + pythonforandroid/recipes/zope_interface/__init__.py | 8 +++++--- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/pythonforandroid/recipes/enum34/__init__.py b/pythonforandroid/recipes/enum34/__init__.py index 28610f91ef..edc92b33c4 100644 --- a/pythonforandroid/recipes/enum34/__init__.py +++ b/pythonforandroid/recipes/enum34/__init__.py @@ -6,5 +6,6 @@ class Enum34Recipe(PythonRecipe): version = '1.0.4' url = 'https://pypi.python.org/packages/source/e/enum34/enum34-{version}.tar.gz' depends = ['python2'] + site_packages_name = 'enum' recipe = Enum34Recipe() diff --git a/pythonforandroid/recipes/pycrypto/__init__.py b/pythonforandroid/recipes/pycrypto/__init__.py index ac78a7f449..0386433790 100644 --- a/pythonforandroid/recipes/pycrypto/__init__.py +++ b/pythonforandroid/recipes/pycrypto/__init__.py @@ -14,6 +14,7 @@ class PyCryptoRecipe(CompiledComponentsPythonRecipe): version = '2.6.1' url = 'https://pypi.python.org/packages/source/p/pycrypto/pycrypto-{version}.tar.gz' depends = ['openssl', 'python2'] + site_packages_name = 'Crypto' patches = ['add_length.patch'] diff --git a/pythonforandroid/recipes/pyusb/__init__.py b/pythonforandroid/recipes/pyusb/__init__.py index 02eb0ecab5..74ec17da78 100644 --- a/pythonforandroid/recipes/pyusb/__init__.py +++ b/pythonforandroid/recipes/pyusb/__init__.py @@ -6,6 +6,7 @@ class PyusbRecipe(PythonRecipe): version = '1.0.0b1' url = 'https://pypi.python.org/packages/source/p/pyusb/pyusb-{version}.tar.gz' depends = [('python2', 'python3')] + site_packages_name = 'usb' patches = ['fix-android.patch'] diff --git a/pythonforandroid/recipes/zope_interface/__init__.py b/pythonforandroid/recipes/zope_interface/__init__.py index 6bf5c05e41..c6174cd3b3 100644 --- a/pythonforandroid/recipes/zope_interface/__init__.py +++ b/pythonforandroid/recipes/zope_interface/__init__.py @@ -4,14 +4,16 @@ import sh -class ZopeRecipe(PythonRecipe): +class ZopeInterfaceRecipe(PythonRecipe): + name = 'zope_interface' version = '4.1.2' url = 'https://pypi.python.org/packages/source/z/zope.interface/zope.interface-{version}.tar.gz' + site_packages_name = 'zope.interface' depends = ['python2'] def build_arch(self, arch): - super(ZopeRecipe, self).build_arch(arch) + super(ZopeInterfaceRecipe, self).build_arch(arch) print('Should remove zope tests etc. here, but skipping for now') -recipe = ZopeRecipe() +recipe = ZopeInterfaceRecipe()