diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 405bc57d1..a85dc7c2d 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -7,7 +7,7 @@ To remove the (conflicting) wrong one, do a:
 # emerge -cav dev-python/pydispatcher
 # emerge -1tav =app-misc/homeassistant --autounmask=y
 
-2020-09-14
+2020-09-14 homeassistant-0.115.0_beta9
   * update PyGithub-1.43.8
   * update PyGithub-1.52
   * update evohome-async-0.3.5
@@ -44,6 +44,7 @@ To remove the (conflicting) wrong one, do a:
     - add adafruit-circuitpython-busdevice-5.0.1
     - add adafruit-circuitpython-bmp280-3.1.1
     - downgrade prometheus_client-0.7.1 from main repo
+  * update homeassistant-0.115.0_beta9
 
 2020-09-13
   * bump youtube_dl-2020.9.6
diff --git a/app-misc/homeassistant/Manifest b/app-misc/homeassistant/Manifest
index 269b33f3b..92bb41235 100644
--- a/app-misc/homeassistant/Manifest
+++ b/app-misc/homeassistant/Manifest
@@ -20,9 +20,9 @@ DIST homeassistant-core-0.114.1.tar.gz 7013107 BLAKE2B cf51126037204090c7bfd02a9
 DIST homeassistant-core-0.114.2.tar.gz 7124151 BLAKE2B a78bfe504e7c423531e9bd1c6585afff423af52908b2c8c99a880e7170e717a4aa79fd7f3c99efe24b27e3d9e0b55913da372bc620ed24ac4d88709e786ea11b SHA512 23bba7d23105e1fd02715482fac93423cec3e0f3b7973da3062418a2fb4dd589b5d0f1a1eeabd83a71f6e6fdc349cd21bbf50806df3b074966d7a23d2a5ed9df
 DIST homeassistant-core-0.114.3.tar.gz 7123686 BLAKE2B aced80164d493ed7ea014a73957e833c7b02d9d484e2e4aa63e610dbd52e2063ac722eb4a66909440b922f0d1ca34167ac0f1388c28ca22913719ae37deaad8f SHA512 a433c76e2ec5e43fcacd99509634c54df8c80063ce8ce26ee0d9608daef623265f0913f233bbbba8581a8507542b8d7060ead16a745ab4f9e7c05b020a38da59
 DIST homeassistant-core-0.114.4.tar.gz 7124717 BLAKE2B b1bd3f44a9b775ed3d0d78a84c11d99a33064bb87363ed49395c8dc635437d4f1f3b3c55292de6449e714671d533c89668381ed9ef81a8c0a7e26d9016567bc6 SHA512 49e944a80027e22ad3be4cc4580d7e88c04fed3e417c24f98dfa78a3a521095766c9507dcab03a85bf96d7304452dc6d85eaeff7cbda20ce9916834c0b97a0a9
-DIST homeassistant-core-0.115.0b5.tar.gz 7530583 BLAKE2B bcca937d0fec43f269b8e68bb170673453aa92a5b0c12fe110e2fe48de2cf8f7fb88aa63c42fafef0cccccb48419975a01f1c2006953743ded9f43ff03c7c671 SHA512 7aa04b9967fbd79534aff7c773a84629dbf1707921519a222e8508918a128b6fa5603573291202fa4f7aafdd76c86ac7871889c57a5e3882d419a4aa8707bead
 DIST homeassistant-core-0.115.0b6.tar.gz 7535283 BLAKE2B 5915d06dc6284f53531be9e8a071421991789bc3c0ddb8635f7094331c4d61b27bc3c7bc6bbe8e999753da38e5421ece604a5cfeaa323484b7ca48a092cd519c SHA512 af67841777e4669e5445b427cad0e808237c1b918f78022f06f779946d34c27a115587b4946b3298b7571209d30504e8728792ec213c19e19377a5c1fbe9f0ff
 DIST homeassistant-core-0.115.0b7.tar.gz 7536669 BLAKE2B af8612d5b11eef723d2d3263e474da1a36a028902b1c7c654ffefa510af7aaa29b3bd063963b24f473951488a02c87815aa75f716b8dd01cf49d8542d846c2ea SHA512 cfc2bad8d6efe3218f16116889f2214ebb42599552daee418e23c6e3a482aa9fc068cb9261214834b77faf2e80e39d32525528f4852f3e55b17b1105bb856d1b
+DIST homeassistant-core-0.115.0b9.tar.gz 7542760 BLAKE2B 282b89761a4d3bc5d014a962e504dbbae5db297f3321c59e45590fab0ea6dd473beb6e16988bec8c29a57d1e807827fadf5df4b0710a5b0320d1580824f33e49 SHA512 06da3b01a8a25bc9f20bb2b7a669813ac003cbe019c3918a3ef3e3e77c9295f06fc5532a1091dd9a88ab464ffb02fec7d34cf7bc692d153a8cc77575e101b6f6
 EBUILD homeassistant-0.109.6.ebuild 14733 BLAKE2B bf77b1b36504d21dd3fab210ae30fcca616090ec396c5096aa2843c32cdf7b44f43c26ecd1ba4f621375cab8bfa59d1a1804d02711f9e340084adbc0dbeaa378 SHA512 5694e2b7f601d6f914e3d72a3802c8d2ac07b3774bf4dc352c1757297e9339b2e66384859a1b40831177cca308b1af40a1e32ae7a27619836620fe3d61404e49
 EBUILD homeassistant-0.110.7.ebuild 15166 BLAKE2B 0de991fd358b4ea06517888436187fe7c2cdf640f07cb0110facf6a5b857ddc579ddeea6ca41aa1b8bf4c2faaa1381029324fe880eed718e9b5519a5f33a2531 SHA512 11a09b030f97c25d4e359c0015fb0d122b98ce5294429c8c5521f8af5e22b06ebd603b11d055ea8f7d83c867b203ab65bd66b277b2231c9b45df20a87e89aac4
 EBUILD homeassistant-0.111.4.ebuild 14843 BLAKE2B d7424114573148020ed8e687191f031a8b9c3d6f6d44850d941f688db2204a48d397134d2ff6ef24aadec2bbebbf8213c4401aac409069a549addee25fe4e124 SHA512 78eeb64bb6bb58c5f66262551e5446c2c90b4473da640b66d2c031a39a60dfcd354aec67c8a1e99e0f3d9018a26f4eaa45e28491cd592005bb6e903b383f8c78
@@ -35,8 +35,9 @@ EBUILD homeassistant-0.114.1.ebuild 18502 BLAKE2B 651cdda72d6b31641cc938281fc17d
 EBUILD homeassistant-0.114.2.ebuild 18586 BLAKE2B 7898bd7d1ba269688553a893fcc8c7816c8a8e77d70bb2943712ee2abc6ed92b49d11e81131907e7a75aa40c22e4d3e1877a199ecd4bd0525eb97362598237e6 SHA512 a49b2acbcc4337280403314c579165ac389d59d58300286af4b37f3ac1564ff8d5828049e460e08f08ad0298f2a6df176cd923a1cf4eac81ba0c21479bba40fb
 EBUILD homeassistant-0.114.3.ebuild 18586 BLAKE2B 8e22d7baa100b517e3717354eec4a3775445fa3e0449bf6235a3bf6d280a65b8a6cacbe2a5224b89afd93ae581d7763559bc8bb7ca9aa05525297e12da13c749 SHA512 2d8a5fa50ee9fd1061d3c918cfd5f8c396da3bcb40bcb52c70170aa081f9cc5838e20c3a164206c9a6b24a3e932742f4c76f48d38c79fa641d76326cedd611fb
 EBUILD homeassistant-0.114.4.ebuild 18796 BLAKE2B ee956033952f788625084e8aef3ecd082851e448f6949a38962a922d250773e905a384050cd26b4562ac8c2e18f1557d2d49c9f3a05e602040ff1917ff5f5c76 SHA512 1b9ca37e305cce7dc1d1d79bd2abd81a680fa5905690e08236730b5c5deb02808c852003a7384c79d43734a0ddce1c882710b4429f0e311d11140332f189ec4a
-EBUILD homeassistant-0.115.0_beta5.ebuild 19408 BLAKE2B 0a0406ecb4143f96eeae834d617fb161eb464961ef221b944428120f6cbcb708092e101e1c8d1cb0f58489ffd9784750e1412eae3528cea2b63ea316c4b4b878 SHA512 a1cdbcd610d60cf59811d3debf46b035cda4b9734cab72ccf1f09acf3d35a053070e97f79f583263f02b795585f3d409da7c7e757f9cf4af754d187c961d8701
 EBUILD homeassistant-0.115.0_beta6.ebuild 19408 BLAKE2B 99a308a921e1b7a9415543db0bbb9fb0a70432e8e698ac97b1ac34ae55cb49d651dd69e7f3e9d98dd8455f24217a91498f39f8876fcb57205c7b794de4ea4e10 SHA512 fcd5a17894b0d60475b84e48ec2d7c0c59661776c1a82e322ca881558257ef0f11721b6fac1c7e6d54827eae4d2aa4cce5bc68daef5a33b0c77c304ca129d233
 EBUILD homeassistant-0.115.0_beta7.ebuild 19210 BLAKE2B f6e2c49c1d1c9934c2a5ab18745e3cd95e44402a022c66ab80891b3bb9afe4ec3cd6dd0988590bdc26ec21eb2463d1ffba262916c53650292b0f9aade21beb32 SHA512 08fa40df526304b062457fb67df04c265495f07908a6ce9b4a41aa1cc428d9cc4af32b27e5c1748ccc9625f2e1f95526f186d4e3405c5e060cc1fc93cb2c8978
+EBUILD homeassistant-0.115.0_beta9.ebuild 18968 BLAKE2B 465436c75b7935125793cb03761ca24d0271c372738285863b2a547636d7651b65d2a02f6a0a89d9fbdcb3e57888c69d623221e33e39fe273902c34607d457f9 SHA512 336811bde25aa83c80404d6b3caeaf2e47e18a8e3ec768d7ca3afb752f130f970d3867a087e332e47713b5504daedd6c747b73279744324958b6631534016f46
 MISC homeassistant-9999.off 61202 BLAKE2B d13693b1971997bed31ed7c255677b7a146716f70540854f6972b7ded0adac3e04b14c7b33f4cc0c191291dc039bfa570e1f3598651eaeff9e10cad9738470f8 SHA512 364cada3ee36c3282a68a3a04dd60357fc4575926d10570dfdbf3bc75dea8b14315e2ca0ccdda3f46e73eb5ce8ef473d1695517e43af078848664f7939024b0a
 MISC metadata.xml 13074 BLAKE2B 7b903df4ba760830c5b2787d71937c8d758833b15175181fff9d70f4088ef0b954f05c7faf64990b41b744c46041820714d62b169d311540403504fa40f8f5f8 SHA512 f2e4463a31fbff782b77785208f97a294af676409977ea8ac040fa3e316bba3bafe748b9d8d7a526483e1d85bbb153daeea7dcdd19184b621b961cbcfc5cbdcd
+MISC metadata_new.xml 12825 BLAKE2B d539dda4f7904c4e88e7f26f46a10489e7468ee319ecd7e35367dfcac9c30be1a33ca2256e4caef735b72a31aa4431dd3dad83174abcc075865bf91a414c3736 SHA512 c95ce464de0582e43b9a84e47d96c5ee5ccfcddedf37ad9ccb6b13989f22c1dc52cfb5f26eb73e9ce501c7755a7debf250433b87f2b8cd60ce429f2aba75e8bc
diff --git a/app-misc/homeassistant/homeassistant-0.115.0_beta5.ebuild b/app-misc/homeassistant/homeassistant-0.115.0_beta9.ebuild
similarity index 52%
rename from app-misc/homeassistant/homeassistant-0.115.0_beta5.ebuild
rename to app-misc/homeassistant/homeassistant-0.115.0_beta9.ebuild
index ce44bbecc..611c4dfad 100644
--- a/app-misc/homeassistant/homeassistant-0.115.0_beta5.ebuild
+++ b/app-misc/homeassistant/homeassistant-0.115.0_beta9.ebuild
@@ -17,7 +17,6 @@ SRC_URI="https://github.com/home-assistant/core/archive/${MY_PV}.tar.gz -> ${MY_
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
-#KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="abode adguard ads agent_dvr aioguardian alarmdecoder ambiclimate ambient_station amcrest androidtv apache_kafka apprise arcam_fmj asuswrt atmo atv aurora avea awair aws axis bitcoin blink blockchain bmw_connected_drive bravia-tv brother buienradar +caldav +cast ciscomobilityexpress cli coronavirus daikin darksky deconz delijn denonavr devolo dexcom discogs discord dunehd dynalite dyson ecobee emulated_roku enigma enocean environment_canada envoy esphome everlights flume flunearyou foobot freebox fronius gios gpiozero gogogate2 growatt_server growl harmony heos here hkavr holidays homekit homematic homematicip hpilo hs100 hue hydrawise iaqualink icloud ihc incomfort influxdb insteon intesishome ipma jewish_calendar joaoapps_join kef kodi maxcube maxcube_hack meteo_france metno miio mikrotik +mqtt musiccast myq +mysql nederlandse_spoorwegen netdata nuki nws nx584 openwrt owntracks ozw ping plex plugwise poolsense powerwall ps4 qnap +recorder rejseplanen ring roku roomba rxv samsungtv +scrape shodan shelly signal simplisafe skybell sma smappee smarthab smartthings socat socialblade solax somfy sonos speedtest squeezebox +ssl synologydsm systemmonitor tellduslive tesla test tile toon tplink tradfri tuya ubee unifi upnp vallox velbus velux vera +version vicare vizio webostv wemo whois wink withings wled xbox_live xknx xs1 yeelight youtube zerproc zigbee zoneminder z-wave"
 
 # from 2020/04 cleanup to be removed or integrated later
@@ -56,17 +55,17 @@ RDEPEND="${RDEPEND}
 
 # from package_constraints.txt, if not defined earlier
 RDEPEND="${RDEPEND}
-  ~dev-python/pynacl-1.3.0[${PYTHON_USEDEP}]
+	~dev-python/pynacl-1.3.0[${PYTHON_USEDEP}]
 	>=dev-python/aiohttp-cors-0.7.0[${PYTHON_USEDEP}]
 	~dev-python/defusedxml-0.6.0[${PYTHON_USEDEP}]
 	~dev-python/distro-1.5.0[${PYTHON_USEDEP}]
-  ~dev-python/emoji-0.5.4[${PYTHON_USEDEP}]
-	~dev-python/hass-nabucasa-0.36.1[${PYTHON_USEDEP}]
-	~dev-python/home-assistant-frontend-20200908.0[${PYTHON_USEDEP}]
+	~dev-python/emoji-0.5.4[${PYTHON_USEDEP}]
+	~dev-python/hass-nabucasa-0.37.0[${PYTHON_USEDEP}]
+	~dev-python/home-assistant-frontend-20200912.0[${PYTHON_USEDEP}]
 	~dev-python/netdisco-2.8.2[${PYTHON_USEDEP}]
 	~dev-python/pillow-7.2.0[${PYTHON_USEDEP}]
 	~dev-python/sqlalchemy-1.3.19[${PYTHON_USEDEP}]
-	~dev-python/zeroconf-0.28.4[${PYTHON_USEDEP}]
+	~dev-python/zeroconf-0.28.5[${PYTHON_USEDEP}]
 	>=dev-python/pycryptodome-3.6.6[${PYTHON_USEDEP}]
 	>=dev-python/urllib3-1.24.3[${PYTHON_USEDEP}]
 	>=dev-python/httplib2-0.18.0[${PYTHON_USEDEP}]
@@ -86,10 +85,6 @@ RDEPEND="${RDEPEND}
 	~dev-python/fnvhash-0.1.0[${PYTHON_USEDEP}]
 	~dev-python/gTTS-token-1.1.3[${PYTHON_USEDEP}]
 	~dev-python/HAP-python-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.9.4[${PYTHON_USEDEP}]
-	>=dev-python/jsonrpc-async-0.6[${PYTHON_USEDEP}]
-	~dev-python/jsonrpc-base-1.0[${PYTHON_USEDEP}]
-	~dev-python/jsonrpc-websocket-0.6[${PYTHON_USEDEP}]
 	>=dev-python/lxml-4.3.3[${PYTHON_USEDEP}]
 	>=dev-python/multidict-4.5.2[${PYTHON_USEDEP}]
 	>=dev-python/numpy-1.19.1[${PYTHON_USEDEP}]
@@ -112,188 +107,175 @@ RDEPEND="${RDEPEND}
 
 # Module requirements from useflags
 RDEPEND="${RDEPEND}
-  abode? ( ~dev-python/abodepy-1.1.0[${PYTHON_USEDEP}] )
-  adguard? ( ~dev-python/adguardhome-0.4.2[${PYTHON_USEDEP}] )
+	abode? ( ~dev-python/abodepy-1.1.0[${PYTHON_USEDEP}] )
+	adguard? ( ~dev-python/adguardhome-0.4.2[${PYTHON_USEDEP}] )
 	agent_dvr? ( ~dev-python/agent-py-0.0.23[${PYTHON_USEDEP}] )
 	ads? ( ~dev-python/pyads-3.2.2[${PYTHON_USEDEP}] )
-  aioguardian? ( ~dev-python/aioguardian-1.0.1[${PYTHON_USEDEP}] )
+	aioguardian? ( ~dev-python/aioguardian-1.0.1[${PYTHON_USEDEP}] )
 	alarmdecoder? ( ~dev-python/adext-0.3[${PYTHON_USEDEP}] )
-  ambiclimate? ( ~dev-python/Ambiclimate-0.2.1[${PYTHON_USEDEP}] )
-  ambient_station? ( ~dev-python/aioambient-1.2.1[${PYTHON_USEDEP}] )
-  amcrest? ( ~dev-python/amcrest-1.7.0[${PYTHON_USEDEP}] )
-  androidtv? ( ~dev-python/androidtv-0.0.49[${PYTHON_USEDEP}] )
+	ambiclimate? ( ~dev-python/Ambiclimate-0.2.1[${PYTHON_USEDEP}] )
+	ambient_station? ( ~dev-python/aioambient-1.2.1[${PYTHON_USEDEP}] )
+	amcrest? ( ~dev-python/amcrest-1.7.0[${PYTHON_USEDEP}] )
+	androidtv? ( ~dev-python/androidtv-0.0.50[${PYTHON_USEDEP}] )
 	apache_kafka? ( ~dev-python/aiokafka-0.6.0[${PYTHON_USEDEP}] )
-  apprise? ( ~dev-python/apprise-0.8.8[${PYTHON_USEDEP}] )
-  arcam_fmj? ( ~dev-python/arcam-fmj-0.5.3[${PYTHON_USEDEP}] )
-  asuswrt? ( ~dev-python/aioasuswrt-1.2.8[${PYTHON_USEDEP}] )
-  atmo? ( ~dev-python/pyatmo-4.0.0[${PYTHON_USEDEP}] )
-  atv? ( >=dev-python/pyatv-0.3.13[${PYTHON_USEDEP}] )
-  aurora? ( ~dev-python/aurorapy-0.2.6[${PYTHON_USEDEP}] )
-  avea? ( ~dev-python/avea-1.4[${PYTHON_USEDEP}] )
-  awair? ( ~dev-python/python-awair-0.1.1[${PYTHON_USEDEP}] )
-  aws? ( ~dev-python/aiobotocore-0.11.1[${PYTHON_USEDEP}] )
-  axis? ( ~dev-python/axis-35[${PYTHON_USEDEP}] )
-  bitcoin? ( ~dev-python/blockchain-1.4.4[${PYTHON_USEDEP}] )
-  blink? ( ~dev-python/blinkpy-0.16.3[${PYTHON_USEDEP}] )
-  blockchain? ( ~dev-python/python-blockchain-api-0.0.2[${PYTHON_USEDEP}] )
-  bmw_connected_drive? ( ~dev-python/bimmer-connected-0.7.7[${PYTHON_USEDEP}] )
-  bravia-tv? ( ~dev-python/bravia-tv-1.0.6[${PYTHON_USEDEP}]
-	  ~dev-python/getmac-0.8.2[${PYTHON_USEDEP}] )
-  brother? ( ~dev-python/brother-0.1.17[${PYTHON_USEDEP}] )
+	apprise? ( ~dev-python/apprise-0.8.8[${PYTHON_USEDEP}] )
+	arcam_fmj? ( ~dev-python/arcam-fmj-0.5.3[${PYTHON_USEDEP}] )
+	asuswrt? ( ~dev-python/aioasuswrt-1.2.8[${PYTHON_USEDEP}] )
+	atmo? ( ~dev-python/pyatmo-4.0.0[${PYTHON_USEDEP}] )
+	atv? ( >=dev-python/pyatv-0.3.13[${PYTHON_USEDEP}] )
+	aurora? ( ~dev-python/aurorapy-0.2.6[${PYTHON_USEDEP}] )
+	avea? ( ~dev-python/avea-1.4[${PYTHON_USEDEP}] )
+	awair? ( ~dev-python/python-awair-0.1.1[${PYTHON_USEDEP}] )
+	aws? ( ~dev-python/aiobotocore-0.11.1[${PYTHON_USEDEP}] )
+	axis? ( ~dev-python/axis-35[${PYTHON_USEDEP}] )
+	bitcoin? ( ~dev-python/blockchain-1.4.4[${PYTHON_USEDEP}] )
+	blink? ( ~dev-python/blinkpy-0.16.3[${PYTHON_USEDEP}] )
+	blockchain? ( ~dev-python/python-blockchain-api-0.0.2[${PYTHON_USEDEP}] )
+	bmw_connected_drive? ( ~dev-python/bimmer-connected-0.7.7[${PYTHON_USEDEP}] )
+	bravia-tv? ( ~dev-python/bravia-tv-1.0.6[${PYTHON_USEDEP}] ~dev-python/getmac-0.8.2[${PYTHON_USEDEP}] )
+	brother? ( ~dev-python/brother-0.1.17[${PYTHON_USEDEP}] )
 	buienradar? ( ~dev-python/buienradar-1.0.4[${PYTHON_USEDEP}] )
-  caldav? ( ~dev-python/caldav-0.6.1[${PYTHON_USEDEP}] )
-  cast? ( ~dev-python/pychromecast-7.2.1[${PYTHON_USEDEP}] )
-  ciscomobilityexpress? ( ~dev-python/ciscomobilityexpress-0.3.3[${PYTHON_USEDEP}] )
-  cli? ( app-misc/home-assistant-cli[${PYTHON_USEDEP}] )
-  coronavirus? ( ~dev-python/coronavirus-1.1.1[${PYTHON_USEDEP}] )
-  daikin? ( ~dev-python/pydaikin-2.3.1[${PYTHON_USEDEP}] )
-  darksky? ( ~dev-python/python-forecastio-1.4.0[${PYTHON_USEDEP}] )
-	deconz? ( ~dev-python/pydeconz-72[${PYTHON_USEDEP}] )
-  delijn? ( ~dev-python/pydelijn-0.6.1[${PYTHON_USEDEP}] )
-  denonavr? ( ~dev-python/denonavr-0.9.4[${PYTHON_USEDEP}] )
+	caldav? ( ~dev-python/caldav-0.6.1[${PYTHON_USEDEP}] )
+	cast? ( ~dev-python/pychromecast-7.2.1[${PYTHON_USEDEP}] )
+	ciscomobilityexpress? ( ~dev-python/ciscomobilityexpress-0.3.3[${PYTHON_USEDEP}] )
+	cli? ( app-misc/home-assistant-cli[${PYTHON_USEDEP}] )
+	coronavirus? ( ~dev-python/coronavirus-1.1.1[${PYTHON_USEDEP}] )
+	daikin? ( ~dev-python/pydaikin-2.3.1[${PYTHON_USEDEP}] )
+	darksky? ( ~dev-python/python-forecastio-1.4.0[${PYTHON_USEDEP}] )
+	deconz? ( ~dev-python/pydeconz-73[${PYTHON_USEDEP}] )
+	delijn? ( ~dev-python/pydelijn-0.6.1[${PYTHON_USEDEP}] )
+	denonavr? ( ~dev-python/denonavr-0.9.4[${PYTHON_USEDEP}] )
 	devolo? ( ~dev-python/devolo-home-control-api-0.13.0[${PYTHON_USEDEP}] )
 	dexcom? ( ~dev-python/pydexcom-0.2.0[${PYTHON_USEDEP}] )
-  discogs? ( ~dev-python/discogs-client-2.3.0[${PYTHON_USEDEP}] )
+	discogs? ( ~dev-python/discogs-client-2.3.0[${PYTHON_USEDEP}] )
 	discord? ( ~dev-python/discord-py-1.4.1[${PYTHON_USEDEP}] )
 	dunehd? ( ~dev-python/pdunehd-1.3[${PYTHON_USEDEP}] )
-  dynalite? ( ~dev-python/dynalite-devices-0.1.46[${PYTHON_USEDEP}] )
-  dyson? ( ~dev-python/libpurecool-0.6.3[${PYTHON_USEDEP}] )
-  ecobee? ( ~dev-python/python-ecobee-api-0.2.7[${PYTHON_USEDEP}] )
-  emulated_roku? ( ~dev-python/emulated-roku-0.2.1[${PYTHON_USEDEP}] )
-  enigma? ( ~dev-python/openwebifpy-3.1.1[${PYTHON_USEDEP}] )
-  enocean? ( ~dev-python/enocean-0.50.0[${PYTHON_USEDEP}] )
-  environment_canada? ( ~dev-python/env-canada-0.2.0[${PYTHON_USEDEP}] )
-  envoy? ( ~dev-python/envoy-reader-0.16.1[${PYTHON_USEDEP}] )
-  esphome? ( ~dev-python/aioesphomeapi-2.6.3[${PYTHON_USEDEP}] )
-  everlights? ( ~dev-python/pyeverlights-0.1.0[${PYTHON_USEDEP}] )
-  flume? ( ~dev-python/PyFlume-0.5.5[${PYTHON_USEDEP}] )
-  flunearyou? ( ~dev-python/pyflunearyou-1.0.7[${PYTHON_USEDEP}] )
+	dynalite? ( ~dev-python/dynalite-devices-0.1.46[${PYTHON_USEDEP}] )
+	dyson? ( ~dev-python/libpurecool-0.6.3[${PYTHON_USEDEP}] )
+	ecobee? ( ~dev-python/python-ecobee-api-0.2.7[${PYTHON_USEDEP}] )
+	emulated_roku? ( ~dev-python/emulated-roku-0.2.1[${PYTHON_USEDEP}] )
+	enigma? ( ~dev-python/openwebifpy-3.1.1[${PYTHON_USEDEP}] )
+	enocean? ( ~dev-python/enocean-0.50.0[${PYTHON_USEDEP}] )
+	environment_canada? ( ~dev-python/env-canada-0.2.0[${PYTHON_USEDEP}] )
+	envoy? ( ~dev-python/envoy-reader-0.16.1[${PYTHON_USEDEP}] )
+	esphome? ( ~dev-python/aioesphomeapi-2.6.3[${PYTHON_USEDEP}] )
+	everlights? ( ~dev-python/pyeverlights-0.1.0[${PYTHON_USEDEP}] )
+	flume? ( ~dev-python/PyFlume-0.5.5[${PYTHON_USEDEP}] )
+	flunearyou? ( ~dev-python/pyflunearyou-1.0.7[${PYTHON_USEDEP}] )
 	foobot? ( ~dev-python/foobot_async-0.3.2[${PYTHON_USEDEP}] )
-  freebox? ( ~dev-python/aiofreepybox-0.0.8[${PYTHON_USEDEP}] )
+	freebox? ( ~dev-python/aiofreepybox-0.0.8[${PYTHON_USEDEP}] )
 	fronius? ( ~dev-python/PyFronius-0.4.6[${PYTHON_USEDEP}] )
-  gios? ( ~dev-python/gios-0.1.4[${PYTHON_USEDEP}] )
+	gios? ( ~dev-python/gios-0.1.4[${PYTHON_USEDEP}] )
 	gpiozero? ( ~dev-python/gpiozero-1.5.1[${PYTHON_USEDEP}] )
 	gogogate2? ( ~dev-python/gogogate2-api-2.0.1[${PYTHON_USEDEP}] )
 	growatt_server? ( ~dev-python/growattServer-0.1.1[${PYTHON_USEDEP}] )
-  growl? ( ~dev-python/gntp-1.0.3[${PYTHON_USEDEP}] )
-  harmony? ( ~dev-python/aioharmony-0.2.6[${PYTHON_USEDEP}] )
-  heos? ( ~dev-python/pyheos-0.6.0[${PYTHON_USEDEP}] )
-  here? ( ~dev-python/herepy-2.0.0[${PYTHON_USEDEP}] )
-  hkavr? ( ~dev-python/hkavr-0.0.5[${PYTHON_USEDEP}] )
-  holidays? ( ~dev-python/holidays-0.10.3[${PYTHON_USEDEP}] )
-  homekit? ( ~dev-python/aiohomekit-0.2.49[${PYTHON_USEDEP}] )
-  homematic? ( ~dev-python/pyhomematic-0.1.68[${PYTHON_USEDEP}] )
-  homematicip? ( ~dev-python/homematicip-0.11.0[${PYTHON_USEDEP}] )
-  hpilo? ( ~dev-python/python-hpilo-4.3[${PYTHON_USEDEP}] )
-  hs100? ( >=dev-python/pyHS100-0.3.5[${PYTHON_USEDEP}] )
-  hue? ( ~dev-python/aiohue-2.1.0[${PYTHON_USEDEP}] )
-  hydrawise? ( ~dev-python/Hydrawiser-0.2[${PYTHON_USEDEP}] )
-  iaqualink? ( ~dev-python/iaqualink-0.3.4[${PYTHON_USEDEP}] )
-  icloud? ( ~dev-python/pyicloud-0.9.7[${PYTHON_USEDEP}] )
-  ihc? ( ~dev-python/ihcsdk-2.7.0[${PYTHON_USEDEP}] )
-  incomfort? ( ~dev-python/incomfort-client-0.4.0[${PYTHON_USEDEP}] )
-  influxdb? ( dev-db/influxdb ~dev-python/influxdb-5.2.3[${PYTHON_USEDEP}]
-	  ~dev-python/influxdb-client-1.8.0[${PYTHON_USEDEP}] )
+	growl? ( ~dev-python/gntp-1.0.3[${PYTHON_USEDEP}] )
+	harmony? ( ~dev-python/aioharmony-0.2.6[${PYTHON_USEDEP}] )
+	heos? ( ~dev-python/pyheos-0.6.0[${PYTHON_USEDEP}] )
+	here? ( ~dev-python/herepy-2.0.0[${PYTHON_USEDEP}] )
+	hkavr? ( ~dev-python/hkavr-0.0.5[${PYTHON_USEDEP}] )
+	holidays? ( ~dev-python/holidays-0.10.3[${PYTHON_USEDEP}] )
+	homekit? ( ~dev-python/aiohomekit-0.2.49[${PYTHON_USEDEP}] )
+	homematic? ( ~dev-python/pyhomematic-0.1.68[${PYTHON_USEDEP}] )
+	homematicip? ( ~dev-python/homematicip-0.11.0[${PYTHON_USEDEP}] )
+	hpilo? ( ~dev-python/python-hpilo-4.3[${PYTHON_USEDEP}] )
+	hs100? ( >=dev-python/pyHS100-0.3.5[${PYTHON_USEDEP}] )
+	hue? ( ~dev-python/aiohue-2.1.0[${PYTHON_USEDEP}] )
+	hydrawise? ( ~dev-python/Hydrawiser-0.2[${PYTHON_USEDEP}] )
+	iaqualink? ( ~dev-python/iaqualink-0.3.4[${PYTHON_USEDEP}] )
+	icloud? ( ~dev-python/pyicloud-0.9.7[${PYTHON_USEDEP}] )
+	ihc? ( ~dev-python/ihcsdk-2.7.0[${PYTHON_USEDEP}] )
+	incomfort? ( ~dev-python/incomfort-client-0.4.0[${PYTHON_USEDEP}] )
+	influxdb? ( dev-db/influxdb ~dev-python/influxdb-5.2.3[${PYTHON_USEDEP}] ~dev-python/influxdb-client-1.8.0[${PYTHON_USEDEP}] )
 	insteon? ( ~dev-python/pyinsteon-1.0.7[${PYTHON_USEDEP}] )
-  intesishome? ( ~dev-python/pyintesishome-1.7.5[${PYTHON_USEDEP}] )
-  ipma? ( ~dev-python/pyipma-2.0.5[${PYTHON_USEDEP}] )
-  jewish_calendar? ( ~dev-python/hdate-0.9.3[${PYTHON_USEDEP}] )
+	intesishome? ( ~dev-python/pyintesishome-1.7.5[${PYTHON_USEDEP}] )
+	ipma? ( ~dev-python/pyipma-2.0.5[${PYTHON_USEDEP}] )
+	jewish_calendar? ( ~dev-python/hdate-0.9.3[${PYTHON_USEDEP}] )
 	joaoapps_join? ( ~dev-python/python-join-api-0.0.6[${PYTHON_USEDEP}] )
-  kef? ( ~dev-python/aiokef-0.2.13[${PYTHON_USEDEP}]
-	  ~dev-python/getmac-0.8.2[${PYTHON_USEDEP}] )
-	kodi? ( ~dev-python/pykodi-0.1.2[${PYTHON_USEDEP}] )
-  maxcube? ( ~dev-python/maxcube-api-0.1.0[${PYTHON_USEDEP}] )
+	kef? ( ~dev-python/aiokef-0.2.13[${PYTHON_USEDEP}] ~dev-python/getmac-0.8.2[${PYTHON_USEDEP}] )
+	kodi? ( ~dev-python/pykodi-0.2.0[${PYTHON_USEDEP}] )
+	maxcube? ( ~dev-python/maxcube-api-0.1.0[${PYTHON_USEDEP}] )
 	meteo_france? ( ~dev-python/meteofrance-api-0.1.1[${PYTHON_USEDEP}] )
-  metno? ( ~dev-python/PyMetno-0.8.1[${PYTHON_USEDEP}] )
-  miio? ( ~dev-python/python-miio-0.5.3[${PYTHON_USEDEP}] )
-  mikrotik? ( ~dev-python/librouteros-3.0.0[${PYTHON_USEDEP}] )
-  mqtt? ( ~dev-python/paho-mqtt-1.5.0[${PYTHON_USEDEP}] app-misc/mosquitto )
-  musiccast? ( >=dev-python/pymusiccast-0.1.6[${PYTHON_USEDEP}] )
-  myq? ( ~dev-python/pymyq-2.0.5[${PYTHON_USEDEP}] )
-  mysql? ( || ( dev-python/mysqlclient[${PYTHON_USEDEP}]
-	  dev-python/mysql-python[${PYTHON_USEDEP}] ) virtual/mysql )
-  nederlandse_spoorwegen? ( ~dev-python/nsapi-3.0.4[${PYTHON_USEDEP}] )
-  netdata? ( ~dev-python/netdata-0.2.0[${PYTHON_USEDEP}] )
+	metno? ( ~dev-python/PyMetno-0.8.1[${PYTHON_USEDEP}] )
+	miio? ( ~dev-python/python-miio-0.5.3[${PYTHON_USEDEP}] )
+	mikrotik? ( ~dev-python/librouteros-3.0.0[${PYTHON_USEDEP}] )
+	mqtt? ( ~dev-python/paho-mqtt-1.5.0[${PYTHON_USEDEP}] app-misc/mosquitto )
+	musiccast? ( >=dev-python/pymusiccast-0.1.6[${PYTHON_USEDEP}] )
+	myq? ( ~dev-python/pymyq-2.0.5[${PYTHON_USEDEP}] )
+	mysql? ( || ( dev-python/mysqlclient[${PYTHON_USEDEP}] dev-python/mysql-python[${PYTHON_USEDEP}] ) virtual/mysql )
+	nederlandse_spoorwegen? ( ~dev-python/nsapi-3.0.4[${PYTHON_USEDEP}] )
+	netdata? ( ~dev-python/netdata-0.2.0[${PYTHON_USEDEP}] )
 	nuki? ( ~dev-python/pynuki-1.3.8[${PYTHON_USEDEP}] )
 	nws? ( ~dev-python/pynws-1.2.1[${PYTHON_USEDEP}] )
-  nx584? ( ~dev-python/pynx584-0.5[${PYTHON_USEDEP}] )
-  openwrt? ( ~dev-python/openwrt-luci-rpc-1.1.6[${PYTHON_USEDEP}] )
-  owntracks? ( virtual/mqtt )
-  ozw? ( ~dev-python/python-openzwave-mqtt-1.0.5[${PYTHON_USEDEP}] )
-  ping? ( ~dev-python/icmplib-1.1.3[${PYTHON_USEDEP}] )
+	nx584? ( ~dev-python/pynx584-0.5[${PYTHON_USEDEP}] )
+	openwrt? ( ~dev-python/openwrt-luci-rpc-1.1.6[${PYTHON_USEDEP}] )
+	owntracks? ( virtual/mqtt )
+	ozw? ( ~dev-python/python-openzwave-mqtt-1.0.5[${PYTHON_USEDEP}] )
+	ping? ( ~dev-python/icmplib-1.1.3[${PYTHON_USEDEP}] )
 	plex? ( ~dev-python/PlexAPI-4.1.0[${PYTHON_USEDEP}] )
-  plugwise? ( ~dev-python/Plugwise-Smile-1.1.0[${PYTHON_USEDEP}] )
+	plugwise? ( ~dev-python/Plugwise-Smile-1.1.0[${PYTHON_USEDEP}] )
 	poolsense? ( ~dev-python/poolsense-0.0.8[${PYTHON_USEDEP}] )
-  powerwall? ( ~dev-python/tesla-powerwall-0.2.12[${PYTHON_USEDEP}] )
+	powerwall? ( ~dev-python/tesla-powerwall-0.2.12[${PYTHON_USEDEP}] )
 	ps4? ( ~dev-python/pyps4-2ndscreen-1.1.1[${PYTHON_USEDEP}] )
-  qnap? ( ~dev-python/qnapstats-0.3.0[${PYTHON_USEDEP}] )
+	qnap? ( ~dev-python/qnapstats-0.3.0[${PYTHON_USEDEP}] )
 	rejseplanen? ( ~dev-python/rjpl-0.3.6[${PYTHON_USEDEP}] )
-  ring? ( ~dev-python/ring-doorbell-0.6.0[${PYTHON_USEDEP}] )
-  roku? ( ~dev-python/rokuecp-0.6.0[${PYTHON_USEDEP}] )
-  roomba? ( ~dev-python/roombapy-1.6.1[${PYTHON_USEDEP}] )
-  rxv? ( ~dev-python/rxv-0.6.0[${PYTHON_USEDEP}] )
-  samsungtv? ( ~dev-python/samsungctl-0.7.1[${PYTHON_USEDEP}]
-	  ~dev-python/samsungtvws-1.4.0[${PYTHON_USEDEP}] )
-  scrape? ( ~dev-python/beautifulsoup-4.9.1[${PYTHON_USEDEP}] )
-  shelly? ( ~dev-python/aioshelly-0.3.0[${PYTHON_USEDEP}] )
+	ring? ( ~dev-python/ring-doorbell-0.6.0[${PYTHON_USEDEP}] )
+	roku? ( ~dev-python/rokuecp-0.6.0[${PYTHON_USEDEP}] )
+	roomba? ( ~dev-python/roombapy-1.6.1[${PYTHON_USEDEP}] )
+	rxv? ( ~dev-python/rxv-0.6.0[${PYTHON_USEDEP}] )
+	samsungtv? ( ~dev-python/samsungctl-0.7.1[${PYTHON_USEDEP}] ~dev-python/samsungtvws-1.4.0[${PYTHON_USEDEP}] )
+	scrape? ( ~dev-python/beautifulsoup-4.9.1[${PYTHON_USEDEP}] )
+	shelly? ( ~dev-python/aioshelly-0.3.1[${PYTHON_USEDEP}] )
 	shodan? ( ~dev-python/shodan-1.23.0[${PYTHON_USEDEP}] )
-  signal? ( ~dev-python/pysignalclirestapi-0.3.4[${PYTHON_USEDEP}] )
-  simplisafe? ( ~dev-python/simplisafe-python-9.3.0[${PYTHON_USEDEP}] )
+	signal? ( ~dev-python/pysignalclirestapi-0.3.4[${PYTHON_USEDEP}] )
+	simplisafe? ( ~dev-python/simplisafe-python-9.3.0[${PYTHON_USEDEP}] )
 	skybell? ( ~dev-python/skybellpy-0.6.1[${PYTHON_USEDEP}] )
 	sma? ( ~dev-python/pysma-0.3.5[${PYTHON_USEDEP}] )
 	smappee? ( ~dev-python/pysmappee-0.2.10[${PYTHON_USEDEP}] )
 	smarthab? ( ~dev-python/SmartHab-0.21[${PYTHON_USEDEP}] )
 	smartthings? ( ~dev-python/pysmartthings-0.7.3[${PYTHON_USEDEP}] )
-  socat? ( net-misc/socat )
-  socialblade? ( ~dev-python/socialbladeclient-0.2[${PYTHON_USEDEP}] )
-  solax? ( ~dev-python/solax-0.2.3[${PYTHON_USEDEP}] )
-  somfy? ( ~dev-python/pymfy-0.9.0[${PYTHON_USEDEP}] )
-  sonos? ( >=dev-python/pysonos-0.0.33[${PYTHON_USEDEP}] )
-  speedtest? ( ~net-analyzer/speedtest-cli-2.1.2[${PYTHON_USEDEP}] )
-  squeezebox? ( ~dev-python/pysqueezebox-0.3.1[${PYTHON_USEDEP}] )
-  ssl? (  dev-libs/openssl:0 app-crypt/certbot net-proxy/haproxy )
-  synologydsm? ( ~dev-python/python-synology-0.8.2[${PYTHON_USEDEP}] )
-  systemmonitor? ( >=dev-python/psutil-5.7.2[${PYTHON_USEDEP}] )
-  tellduslive? ( ~dev-python/tellduslive-0.10.11[${PYTHON_USEDEP}] )
+	socat? ( net-misc/socat )
+	socialblade? ( ~dev-python/socialbladeclient-0.2[${PYTHON_USEDEP}] )
+	solax? ( ~dev-python/solax-0.2.3[${PYTHON_USEDEP}] )
+	somfy? ( ~dev-python/pymfy-0.9.0[${PYTHON_USEDEP}] )
+	sonos? ( >=dev-python/pysonos-0.0.33[${PYTHON_USEDEP}] )
+	speedtest? ( ~net-analyzer/speedtest-cli-2.1.2[${PYTHON_USEDEP}] )
+	squeezebox? ( ~dev-python/pysqueezebox-0.3.1[${PYTHON_USEDEP}] )
+	ssl? (  dev-libs/openssl:0 app-crypt/certbot net-proxy/haproxy )
+	synologydsm? ( ~dev-python/python-synology-0.8.2[${PYTHON_USEDEP}] )
+	systemmonitor? ( >=dev-python/psutil-5.7.2[${PYTHON_USEDEP}] )
+	tellduslive? ( ~dev-python/tellduslive-0.10.11[${PYTHON_USEDEP}] )
 	tesla? ( ~dev-python/teslajsonpy-0.10.4[${PYTHON_USEDEP}] )
-  tile? ( ~dev-python/pytile-4.0.0[${PYTHON_USEDEP}] )
-  toon? ( ~dev-python/toonapi-0.2.0[${PYTHON_USEDEP}] )
+	tile? ( ~dev-python/pytile-4.0.0[${PYTHON_USEDEP}] )
+	toon? ( ~dev-python/toonapi-0.2.0[${PYTHON_USEDEP}] )
 	tplink? ( ~dev-python/pyHS100-0.3.5.1[${PYTHON_USEDEP}] )
-  tradfri? ( >=dev-python/pytradfri-7.0.2[${PYTHON_USEDEP}] )
+	tradfri? ( >=dev-python/pytradfri-7.0.2[${PYTHON_USEDEP}] )
 	tuya? ( ~dev-python/tuyaha-0.0.7[${PYTHON_USEDEP}] )
-  ubee? ( ~dev-python/pyubee-0.10[${PYTHON_USEDEP}] )
-  unifi? ( ~dev-python/aiounifi-23[${PYTHON_USEDEP}] )
+	ubee? ( ~dev-python/pyubee-0.10[${PYTHON_USEDEP}] )
+	unifi? ( ~dev-python/aiounifi-23[${PYTHON_USEDEP}] )
 	upnp? ( ~dev-python/async-upnp-client-0.14.13[${PYTHON_USEDEP}] )
-  vallox? ( ~dev-python/vallox-websocket-api-2.4.0[${PYTHON_USEDEP}] )
-  velbus? ( ~dev-python/python-velbus-2.0.44[${PYTHON_USEDEP}] )
-  velux? ( ~dev-python/pyvlx-0.2.16[${PYTHON_USEDEP}] )
-  vera? ( ~dev-python/pyvera-0.3.9[${PYTHON_USEDEP}] )
-  version? ( ~dev-python/pyhaversion-3.2.0[${PYTHON_USEDEP}] )
-  vicare? ( ~dev-python/PyViCare-0.2.0[${PYTHON_USEDEP}] )
+	vallox? ( ~dev-python/vallox-websocket-api-2.4.0[${PYTHON_USEDEP}] )
+	velbus? ( ~dev-python/python-velbus-2.0.44[${PYTHON_USEDEP}] )
+	velux? ( ~dev-python/pyvlx-0.2.16[${PYTHON_USEDEP}] )
+	vera? ( ~dev-python/pyvera-0.3.9[${PYTHON_USEDEP}] )
+	version? ( ~dev-python/pyhaversion-3.4.0[${PYTHON_USEDEP}] )
+	vicare? ( ~dev-python/PyViCare-0.2.0[${PYTHON_USEDEP}] )
 	vizio? ( ~dev-python/pyvizio-0.1.56[${PYTHON_USEDEP}] )
-  webostv? ( ~dev-python/aiopylgtv-0.3.3[${PYTHON_USEDEP}] )
-  wemo? ( >=dev-python/pywemo-0.4.46[${PYTHON_USEDEP}] )
+	webostv? ( ~dev-python/aiopylgtv-0.3.3[${PYTHON_USEDEP}] )
+	wemo? ( >=dev-python/pywemo-0.4.46[${PYTHON_USEDEP}] )
 	whois? ( >=dev-python/python-whois-0.7.3[${PYTHON_USEDEP}] )
-  wink? ( ~dev-python/pubnubsub-handler-1.0.8[${PYTHON_USEDEP}] )
-  withings? ( ~dev-python/withings-api-2.1.6[${PYTHON_USEDEP}] )
-  wled? ( ~dev-python/wled-0.4.4[${PYTHON_USEDEP}] )
+	wink? ( ~dev-python/pubnubsub-handler-1.0.8[${PYTHON_USEDEP}] )
+	withings? ( ~dev-python/withings-api-2.1.6[${PYTHON_USEDEP}] )
+	wled? ( ~dev-python/wled-0.4.4[${PYTHON_USEDEP}] )
 	xbox_live? ( ~dev-python/xboxapi-2.0.1[${PYTHON_USEDEP}] )
-  xknx? ( ~dev-python/xknx-0.13.0[${PYTHON_USEDEP}] )
-  xs1? ( ~dev-python/xs1-api-client-3.0.0[${PYTHON_USEDEP}] )
-  yeelight? ( ~dev-python/yeelight-0.5.3[${PYTHON_USEDEP}] )
-  youtube? ( ~dev-python/youtube_dl-2020.7.28[${PYTHON_USEDEP}] )
+	xknx? ( ~dev-python/xknx-0.13.0[${PYTHON_USEDEP}] )
+	xs1? ( ~dev-python/xs1-api-client-3.0.0[${PYTHON_USEDEP}] )
+	yeelight? ( ~dev-python/yeelight-0.5.3[${PYTHON_USEDEP}] )
+	youtube? ( ~dev-python/youtube_dl-2020.7.28[${PYTHON_USEDEP}] )
 	zerproc? ( ~dev-python/pyzerproc-0.2.5[${PYTHON_USEDEP}] )
-  zigbee? ( ~dev-python/zigpy-cc-0.5.2[${PYTHON_USEDEP}]
-					~dev-python/zigpy-deconz-0.9.2[${PYTHON_USEDEP}]
-					~dev-python/zigpy-xbee-0.13.0[${PYTHON_USEDEP}]
-					~dev-python/zigpy-zigate-0.6.2[${PYTHON_USEDEP}]
-					~dev-python/zigpy-0.23.2[${PYTHON_USEDEP}]
-					~dev-python/zigpy-znp-0.1.1[${PYTHON_USEDEP}]
-					~dev-python/bellows-0.20.1[${PYTHON_USEDEP}]
-					~dev-python/zha-quirks-0.0.44[${PYTHON_USEDEP}] )
-  zoneminder? ( ~dev-python/zm-py-0.4.0[${PYTHON_USEDEP}] )
-  z-wave? ( ~dev-python/homeassistant-pyozw-0.1.10[${PYTHON_USEDEP}]
-					~dev-python/PyDispatcher-2.0.5[${PYTHON_USEDEP}] )"
+	zigbee? ( ~dev-python/zigpy-cc-0.5.2[${PYTHON_USEDEP}] ~dev-python/zigpy-deconz-0.9.2[${PYTHON_USEDEP}] ~dev-python/zigpy-xbee-0.13.0[${PYTHON_USEDEP}] ~dev-python/zigpy-zigate-0.6.2[${PYTHON_USEDEP}] ~dev-python/zigpy-0.23.2[${PYTHON_USEDEP}] ~dev-python/zigpy-znp-0.1.1[${PYTHON_USEDEP}] ~dev-python/bellows-0.20.1[${PYTHON_USEDEP}] ~dev-python/zha-quirks-0.0.44[${PYTHON_USEDEP}] )
+	zoneminder? ( ~dev-python/zm-py-0.4.0[${PYTHON_USEDEP}] )
+	z-wave? ( ~dev-python/homeassistant-pyozw-0.1.10[${PYTHON_USEDEP}] ~dev-python/PyDispatcher-2.0.5[${PYTHON_USEDEP}] )"
 
 DEPEND="${RDEPEND}
 		test? (
diff --git a/app-misc/homeassistant/metadata_new.xml b/app-misc/homeassistant/metadata_new.xml
new file mode 100644
index 000000000..520bbe28a
--- /dev/null
+++ b/app-misc/homeassistant/metadata_new.xml
@@ -0,0 +1,186 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>b@edevau.net</email>
+    <name>Andreas Billmeier</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">home-assistant</remote-id>
+    <doc>https://www.home-assistant.io/docs/</doc>
+    <maintainer>
+      <email>hello@home-assistant.io</email>
+      <name>The Home Assistant Authors</name>
+    </maintainer>
+  </upstream>
+  <use>
+    <flag name="abode">Library for the Abode alarm API</flag>
+    <flag name="adguard">monitor your ad- and tracker-blocking DNS server</flag>
+    <flag name="ads">Beckhoff automation devices running TwinCAT</flag>
+    <flag name="agent_dvr">Agent DVR is a free* software DVR solution</flag>
+    <flag name="alarmdecoder">AlarmDecoder extended</flag>
+    <flag name="ambiclimate">communicate with Ambiclimate</flag>
+    <flag name="ambient_station">retrieves local weather information from Ambient Weather</flag>
+    <flag name="amcrest">integrate your Amcrest or Dahua IP camera</flag>
+    <flag name="androidtv">Library for controlling an Android TV, formerly firetv</flag>
+    <flag name="apache_kafka">sends all state changes to a Apache Kafka topic</flag>
+    <flag name="apple_tv">Library for controlling an Apple TV</flag>
+    <flag name="apprise">just about every Notification platform</flag>
+    <flag name="arcam_fmj">speaking to Arcam receivers</flag>
+    <flag name="asuswrt">Api wrapper for Asuswrt</flag>
+    <flag name="aurora">Support for Power-One Aurora inverters</flag>
+    <flag name="avea">Library for Elgato Avea bulbs</flag>
+    <flag name="awair">library for the Awair GraphQL API</flag>
+    <flag name="aws">interact with Amazon Web Services</flag>
+    <flag name="axis">communicating with devices from Axis Communications</flag>
+    <flag name="bitcoin">displays various details about the Bitcoin network</flag>
+    <flag name="blink">events from Blink camera and security systems</flag>
+    <flag name="blockchain">displays Bitcoin wallet balances from blockchain.info</flag>
+    <flag name="bmw_connected_drive">retrieve data from the BMW Connected Drive</flag>
+    <flag name="braviatv">Control almost all Sony Bravia TV 2013 and newer</flag>
+    <flag name="brother">read current data from your local Brother printer</flag>
+    <flag name="buienradar">use buienradar weather data</flag>
+    <flag name="caldav">integrate a CalDAV (RFC4791) calendar</flag>
+    <flag name="cast">let me talk to Google Chromecast</flag>
+    <flag name="cisco_mobility_express">install ciscomobilityexpress support</flag>
+    <flag name="cli">set a dependency for Home Assistant Cli hass-cli (lots of modules required)</flag>
+    <flag name="coronavirus">add sensors for COVID-19 infections from Johns Hopkins University</flag>
+    <flag name="daikin">Daikin wireless controllers</flag>
+    <flag name="darksky">use dark sky weather data</flag>
+    <flag name="deconz">deCONZ ConBee/RaspBee Zigbee gateways</flag>
+    <flag name="delijn">De Lijn public transport network in Flanders</flag>
+    <flag name="denonavr">Automation Library for Denon AVR receivers</flag>
+    <flag name="devolo_home_control">Devolo Home-control</flag>
+    <flag name="dexcom">view your CGM data from Dexcom</flag>
+    <flag name="discogs">Discogs Client</flag>
+    <flag name="discord">send messages to the user using Discord</flag>
+    <flag name="dunehd">control a Dune HD media player</flag>
+    <flag name="dynalite">Dynalite DyNET interface</flag>
+    <flag name="dyson">integrate all Dyson related platforms</flag>
+    <flag name="ecobee">talking to Ecobee thermostats</flag>
+    <flag name="emulated_roku">emulate Roku API for Harmony and Android remotes</flag>
+    <flag name="enigma2">Support for Enigma2 boxes with openwebif support</flag>
+    <flag name="enocean">Support for Enocean devices</flag>
+    <flag name="enphase_envoy">Reads electricity production and consumption from an Enphase Envoy</flag>
+    <flag name="environment_canada">access meteorological data from Environment Canada</flag>
+    <flag name="esphome">Support for esphome sensors, covers and switches and it's dashboard</flag>
+    <flag name="everlights">Library for controlling an EverLights lighting system</flag>
+    <flag name="flume">monitors the real-time status of your home water meter</flag>
+    <flag name="flunearyou">allows users in the US to get information from Flu Near You</flag>
+    <flag name="foobot">fetch air quality data from your Foobot device</flag>
+    <flag name="freebox">allows you to observe and control Freebox router</flag>
+    <flag name="fronius">add (very basic) Support for Fronius Symo JSON Api</flag>
+    <flag name="gios">source for air quality data</flag>
+    <flag name="gogogate2">lets you control Gogogate2-Enabled garage doors</flag>
+    <flag name="growatt_server">talk to growatt server</flag>
+    <flag name="guardian">integrates Elexa Guardian water valve controllers</flag>
+    <flag name="harman_kardon_avr">allows you to control Harman Kardon Network Receivers</flag>
+    <flag name="harmony">Logitech Harmony support</flag>
+    <flag name="heos">controlling HEOS devices through the HEOS CLI Protocol</flag>
+    <flag name="here_travel_time">here_travel_time sensor provides travel time from the HERE Routing API</flag>
+    <flag name="homekit">works as both HomeKit controller and accessory</flag>
+    <flag name="homematic">An API for the homematicip cloud</flag>
+    <flag name="homematicip_cloud">A python wrapper for the homematicIP REST API (Access Point Based)</flag>
+    <flag name="hp_ilo">HP Integrated Lights out XML interface</flag>
+    <flag name="hue">talk to Philips Hue</flag>
+    <flag name="hydrawise">communicate with Hunter Wi-Fi irrigation controllers</flag>
+    <flag name="iaqualink">iAqualink by Jandy allows you to control your pool via cloud service</flag>
+    <flag name="icloud">iCloud allows users to track their location on iOS devices</flag>
+    <flag name="ihc">use IHC Python SDK</flag>
+    <flag name="incomfort">client for Intergas InComfort/InTouch Lan2RF systems</flag>
+    <flag name="influxdb">transfer sensor data to a local InfluxDB database</flag>
+    <flag name="insteon">allowing linked INSTEON devices to be used</flag>
+    <flag name="intesishome">communications with IntesisHome Smart AC Controllers</flag>
+    <flag name="ipma">ipma weather platform</flag>
+    <flag name="jewish_calendar">jewish_calendar</flag>
+    <flag name="joaoapps_join">joaoapps_join integration exposes services from Join</flag>
+    <flag name="kef">KEF wireless speakers</flag>
+    <flag name="knx">Asynchronous Library for the KNX protocol</flag>
+    <flag name="kodi">control a Kodi multimedia system</flag>
+    <flag name="luci">fetch connected devices from your OpenWrt</flag>
+    <flag name="maxcube">eQ-3 ELV MAX Cube Python API</flag>
+    <flag name="maxcube_hack">apply Patch for https://github.com/home-assistant/home-assistant/issues/28811</flag>
+    <flag name="media_extractor">support for youtube_dl</flag>
+    <flag name="meteo_france">uses the meteorological data from Meteo-France</flag>
+    <flag name="mikrotik">add support for MikroTik RouterOS API</flag>
+    <flag name="mqtt">install MQTT Broker and dependencies</flag>
+    <flag name="myq">lets you control MyQ-Enabled garage doors</flag>
+    <flag name="mysql">set dependencies to install MySQL Libraries for use with HomeAssistant</flag>
+    <flag name="nederlandse_spoorwegen">train service in the Netherlands</flag>
+    <flag name="netatmo">Access to Netatmo weather station data</flag>
+    <flag name="netdata">API for interacting with Netdata</flag>
+    <flag name="nuki">control Nuki Smart Locks</flag>
+    <flag name="nws">uses the National Weather Service web API</flag>
+    <flag name="nx584">NX584/NX8E Interface Library and Server</flag>
+    <flag name="owntracks">OwnTracks: track your location and send it directly to Home Assistant</flag>
+    <flag name="ozw">Open Zwave MQTT</flag>
+    <flag name="ping">ICMPLib</flag>
+    <flag name="plex">Python bindings for the Plex API</flag>
+    <flag name="plugwise">Plugwise_Smile (Anna/Adam/P1) API</flag>
+    <flag name="poolsense">PoolSense is a smart pool monitor</flag>
+    <flag name="powerwall">API for Tesla Powerwall</flag>
+    <flag name="ps4">allows you to control a Sony PlayStation 4 console</flag>
+    <flag name="qnap">Python API for obtaining QNAP NAS system stats</flag>
+    <flag name="recorder">storing details in a database per sqlalchemy</flag>
+    <flag name="rejseplanen">travel details for Danish public transport</flag>
+    <flag name="ring">integrate your ring.com devices</flag>
+    <flag name="roku">add support for Roku players</flag>
+    <flag name="roomba">control a iRobot Roomba vacuum or iRobot Braava m-series mop</flag>
+    <flag name="samsungtv">Support for Samsung TV Sets</flag>
+    <flag name="scrape">scraping information from websites</flag>
+    <flag name="shelly">Shelly devices</flag>
+    <flag name="shodan">Shodan is a search engine for Internet-connected devices</flag>
+    <flag name="signal_messenger">add Support for Moxie's Signal API</flag>
+    <flag name="simplisafe">integrates SimpliSafe home security (V2 and V3) systems</flag>
+    <flag name="skybell">integrate your Skybell.com doorbells</flag>
+    <flag name="sma">add Support for SMA Solar WebConnect</flag>
+    <flag name="smappee">integrate Smappee monitors, plugs and switches</flag>
+    <flag name="smarthab">control your lights and shutters with the SmartHab integration</flag>
+    <flag name="smartthings">use the SmartThings Cloud API</flag>
+    <flag name="socat">Set a flag to install socat and socat-zwave startscript</flag>
+    <flag name="socialblade">monitor Youtube Channels</flag>
+    <flag name="solax">Solax inverter API client</flag>
+    <flag name="somfy">Somfy devices via their online service</flag>
+    <flag name="sonos">Sonos Media Player Support</flag>
+    <flag name="speedtestdotnet">speedtest.net support</flag>
+    <flag name="squeezebox">library to control Logitech Media Server</flag>
+    <flag name="ssl">include support for haproxy</flag>
+    <flag name="synology_dsm">monitor getting various statistics from your Synology NAS</flag>
+    <flag name="systemmonitor">monitor your platform</flag>
+    <flag name="tellduslive">cloud platform that connects to your Tellstick</flag>
+    <flag name="tesla">integration with the Tesla cloud service</flag>
+    <flag name="test">internal and developer use</flag>
+    <flag name="tile">API for Tile Bluetooth trackers</flag>
+    <flag name="toon">client for the Quby ToonAPI</flag>
+    <flag name="tplink">control your TP-Link Smart Home Devices</flag>
+    <flag name="tradfri">Control/observe IKEA Tradfri devices</flag>
+    <flag name="tuya">integrate all Tuya Smart related platforms</flag>
+    <flag name="ubee">getting stats from Ubee routers</flag>
+    <flag name="unifi">talk with a Ubiquiti unifi Controller</flag>
+    <flag name="upnp">support UPnP/Internet Gateway Device (IGD) Protocol</flag>
+    <flag name="vallox">control any Vallox ventilation unit</flag>
+    <flag name="velbus">supports the Velbus USB, serial and TCP/IP gateway</flag>
+    <flag name="velux">allows you to connect to a Velux KLF 200 interface</flag>
+    <flag name="vera">add support for Vera Z-Wave Controller</flag>
+    <flag name="version">display the current Home Assistant versions</flag>
+    <flag name="vicare">communicate with the Viessmann ViCare API</flag>
+    <flag name="vizio">allows you to control SmartCast-compatible TVs</flag>
+    <flag name="webostv">allows you to control a LG webOS Smart TV</flag>
+    <flag name="wemo">discover and control WeMo devices</flag>
+    <flag name="whois">perform daily WHOIS lookups</flag>
+    <flag name="wink">support for Wink Z-Wave Plus Smart Hub</flag>
+    <flag name="withings">add support for Withings Health API</flag>
+    <flag name="wled">add support for Aircookie's WLED</flag>
+    <flag name="workday">generating country, province and state specific sets of holidays on the fly</flag>
+    <flag name="xbox_live">track Xbox profiles</flag>
+    <flag name="xiaomi_miio">add support for Xiaomi smart appliances</flag>
+    <flag name="xs1">get and set values of the EZcontrol XS1 Gateway</flag>
+    <flag name="yamaha">Library for Yamaha RX-* Receivers</flag>
+    <flag name="yamaha_musiccast">add support for Yamaha MusicCast devices</flag>
+    <flag name="yeelight">allows you to control your Yeelight Wifi bulbs</flag>
+    <flag name="zerproc">discovers nearby Zerproc lights</flag>
+    <flag name="zha">Support for ZHA/deconz based Zigbee/ZNet Devices</flag>
+    <flag name="zoneminder">Support for ZoneMinder Cameras</flag>
+    <flag name="zwave">Support for Z-Wave Devices (uncomplete)</flag>
+  </use>
+</pkgmetadata>