From 200e15a56692487e7e673b60888d5b043c926312 Mon Sep 17 00:00:00 2001
From: Vincent Fortier <th0ma7@gmail.com>
Date: Sat, 20 Nov 2021 11:19:48 +0000
Subject: [PATCH] homeassistant: Misc cleanups

---
 spk/homeassistant/Makefile                   |  6 +-
 spk/homeassistant/src/requirements-cross.txt | 63 ++++++++++----------
 2 files changed, 33 insertions(+), 36 deletions(-)

diff --git a/spk/homeassistant/Makefile b/spk/homeassistant/Makefile
index fe8480f493ca..00e5c32dc1e3 100644
--- a/spk/homeassistant/Makefile
+++ b/spk/homeassistant/Makefile
@@ -1,22 +1,18 @@
 SPK_NAME = homeassistant
 SPK_VERS = 2021.9.7
-SPK_REV = 16
+SPK_REV = 17
 SPK_ICON = src/${SPK_NAME}.png
 
 SPK_DEPENDS = "python310"
 
-###py310 BUILD_DEPENDS = cross/python310 cross/setuptools cross/pip cross/wheel
 BUILD_DEPENDS = cross/python310
 
-###py310 DEPENDS += cross/libyaml cross/bcrypt cross/cryptography cross/pycrypto cross/pycryptodomex cross/pycryptodome
 DEPENDS += cross/gevent
 DEPENDS += cross/homeassistant.pillow
 # for iqvia
 DEPENDS += cross/numpy
 # for python-libnmap
 DEPENDS += cross/nmap
-# for mobile_app
-###py310 DEPENDS += cross/PyNaCl
 # for tradfri
 DEPENDS += cross/dtlssocket
 # for denonavr
diff --git a/spk/homeassistant/src/requirements-cross.txt b/spk/homeassistant/src/requirements-cross.txt
index 2749f30f4c76..20c8280151dd 100644
--- a/spk/homeassistant/src/requirements-cross.txt
+++ b/spk/homeassistant/src/requirements-cross.txt
@@ -1,6 +1,6 @@
 # Home Assistant core
 # requirements are splitted into multiple files
-# - requirements.txt                      (this file, containing requirements that need cross compilation)
+# - requirements-cross.txt                (this file, containing requirements that need cross compilation)
 # - postinst_default_requirements.txt     (requirements for default_config)
 # - postinst_integration_requirements.txt (requirements for integrations)
 # postinst requirements must be pure python wheels.
@@ -10,25 +10,27 @@
 
 # Home Assistant Core
 aiohttp==3.7.4.post0
-#astral==2.2
-#async_timeout==3.0.1
-#attrs==21.2.0
-#awesomeversion==21.4.0
-backports.zoneinfo;python_version<"3.9"
-#py310 bcrypt==3.1.7
-#certifi==2021.5.30
+# astral==2.2
+# async_timeout==3.0.1
+# attrs==21.2.0                   ==> python310
+# awesomeversion==21.4.0
+# backports.zoneinfo;python_version<"3.9"   ==> Does not build with python310
+# bcrypt==3.1.7                   ==> python310
+# certifi==2021.5.30              ==> python310
 ciso8601==2.1.3
-#httpx==0.19.0
-## jinja2==3.0.1      # fails to build, moved to postinst_default_config_requirements.txt
-#py310 PyJWT==1.7.1
-## cryptography==3.3.2
+# cryptography==3.3.2             ==> python310
+# httpx==0.19.0
+# jinja2==3.0.1                   # fails to build, moved to postinst_default_config_requirements.txt
+# numpy==1.21.4                   # requires to be built as cross/numpy
+# PyJWT==1.7.1                    ==> python310
+# PyNaCl                          ==> python310  # for mobile_app
 ## pip>=8.0.3,<20.3
-#python-slugify==4.0.1
-#py310 pyyaml==5.4.1
-#requests==2.25.1
-#py310 ruamel.yaml==0.15.100
-#voluptuous==0.12.1
-#voluptuous-serialize==2.4.0
+# python-slugify==4.0.1
+# pyyaml==5.4.1                   ==> python310
+# requests==2.25.1                ==> python310
+# ruamel.yaml==0.15.100           ==> python310
+# voluptuous==0.12.1
+# voluptuous-serialize==2.4.0
 yarl==1.6.3
 
 # homeassistant.components.frontend
@@ -38,12 +40,12 @@ yarl==1.6.3
 #hass-nabucasa==0.46.0
 
 ### other default dependencies that need cross compiled wheel
-#py310 MarkupSafe==2.0.1
+# MarkupSafe==2.0.1               ==> python310
 aiokafka==0.6.0
-#py310 cffi==1.14.1
-#py310 greenlet==1.1.1
+# cffi==1.14.1                    ==> python310
+# greenlet==1.1.1                 ==> python310
 multidict==5.1.0
-#py310 sqlalchemy==1.4.23
+# sqlalchemy==1.4.23              ==> python310
 
 
 # Failed to build: av clx-sdk-xms homeassistant-pyozw python-twitch-client
@@ -61,18 +63,17 @@ multidict==5.1.0
 
 
 ephem==3.7.7.0
-###gevent==21.8.0
+# gevent==21.8.0
 guppy3==3.1.2
 ###homeassistant-pyozw==0.1.10    # deprecated open-z-wave, fails to cross compile
-#py310 netifaces==0.11.0
-#py310 psutil==5.8.0
+# netifaces==0.11.0               ==> python310
+# psutil==5.8.0                   ==> python310
 pyads==3.2.2
-pycares==4.0.0
-# pybluez==0.22       # for fjaraskupan fails to build
-# pycocotools==2.0.1  # fails to cross compile (aarch64)
+# pycares==4.0.0                  ==> python310
+# pybluez==0.22                   # for fjaraskupan fails to build
+# pycocotools==2.0.1              # fails to cross compile (aarch64)
 pyitachip2ir==0.0.7
-#py310 regex==2021.8.3
-#ujson==4.2.0         # dependency of pyflunearyou
+# regex==2021.8.3                 ==> python310
 websockets==9.1
-# pandas==1.3.1  # depends on numpy...
+# pandas==1.3.1                   # depends on numpy...
 wrapt==1.12.1