diff --git a/app-misc/homeassistant-full/Manifest b/app-misc/homeassistant-full/Manifest
index 2bcf128b9..19bde01bd 100644
--- a/app-misc/homeassistant-full/Manifest
+++ b/app-misc/homeassistant-full/Manifest
@@ -17,9 +17,9 @@ DIST homeassistant-2021.6.3.tar.gz 9909029 BLAKE2B bd728075eb8727c72d54d7dbde4d8
 DIST homeassistant-2021.6.4.tar.gz 9910097 BLAKE2B 8977f7f955499d85cc58f3670c0a34a22a57045d4089e35c4288264dd86eda61f5f6b06870f44fde588108f3cd169851ca85dc522053c2250bd2afb008c85a3f SHA512 58c14eb230735e0b0e04b908729320b9ebc635f8257c82fab1dd0e06b937fdf95869e0917fa3f38ec37aeef123430ba825d2df38c64da1259a23821794150fd9
 DIST homeassistant-2021.6.5.tar.gz 9908738 BLAKE2B 054381c3d27c08e5b16569170aa1395fdfc0e456977854ee3d519c574a795291ed8bcf09419241901ae9efc0e059c5d4264424cac266790577371a3563ed154e SHA512 1bb2eeab3755f9dc276de4c17b4fb7b98986a06521b4a4a0304e751a2571352aacd971432e91c722bf979d0d6b940be8ab44ba4422cfb61f8e36f7cc517bacaa
 DIST homeassistant-2021.6.6.tar.gz 9909717 BLAKE2B 7e7d08e4aa4f3e0235feb1277528075c57dca715172369606dcccb658451a080bf9eeb5d536404b9bc63a77fe520564baf0725d4f8424c10f09639c051f1d5f1 SHA512 16e026601c48463ed690192bcc4aa716d8f42109859822cca1c0e521b3da5c228291c56ec312987e0225ac3e71dad27cbf91d4120ccad17bf2b5848d058bee4e
-DIST homeassistant-2021.7.0b1.tar.gz 10156269 BLAKE2B 0e396f49969057205d1556f59157d0133bda34725f6a5c24ad5abf7e8fae88a89bc14f83879ae48b3c9e2a0a33c87bcaa2897cd0088fc693499243c505036ea1 SHA512 dd228454f2ef4d84b3bf271ddd8fc58f14ad2afdb1b58cad192622039611d821e89577b12f9d65229e96f76f3563db00f857b0c5d66bd2de763b0d0488d247e0
 DIST homeassistant-2021.7.0b2.tar.gz 10156226 BLAKE2B a3e4b2fce962eafbea5848df4f06a6868220e5017ce623c119875864fb5de91d4a1a451a3f9f0f515af47d4332ced19b3717a07eeea6cf0f2a2efcbd6c9ee529 SHA512 c9c3e71b70bbe0e44d6edf9f3ebb33d5099923e8930ea16642e98da50a5f4f8087c72b77e80e7215e173db0bfd8ba66609bb1be261c1fefd99edba992c065437
 DIST homeassistant-2021.7.0b4.tar.gz 10157237 BLAKE2B 45ec0c23db457cf30d51c0676463ba74ce9ee37c8dc9aad9a2c869d10a0391dcb938ef58907f01ffa4d6d9be981533d579378f4dd4768bed67ddf909a69e03f2 SHA512 50d4b48d9565d37252e0d43f8f00bfdf2102bd78bf1a679c1012245f0b85207279c268786d63b5c8a8f0a8a5d7c3350bdb04e796915d278460143cfa5c128915
+DIST homeassistant-2021.7.0b5.tar.gz 10148685 BLAKE2B 7d999f438c3d64c7f5347fa15bad4df65da8bbde141c8d189ac283cefa7646ad319b95dde53e484e3acccf9d90690ac1173fa3cc892d6d022cf6c10bc976c0ee SHA512 e6ebd4b10668456d3c61eb8ce133c19a312736b84d6e8e1520a60f20de33d1983de5da948f335b3fc89fd90116879262be5744f5485515238723f80094194c53
 EBUILD homeassistant-full-2021.3.4-r1.ebuild 63915 BLAKE2B 02f6598fd7ae80e33ff9edd28fe291df9e3925ea08b37f4edf1a0ad2f834a779e6cea4a5b5816dd126195761bac70fe95e3dc1a68aa41e502a20658133448a5a SHA512 0e0dc4c5d780950bfbe49ea093d82a4dd97b1090cba51a045948fbca5eb98c46ec84ae0d4e8afe1df9d298f38ad1067d8098b3342fa1b87d372d5192e5207e5e
 EBUILD homeassistant-full-2021.4.6.ebuild 64160 BLAKE2B 8202610bf23e2308cb45a3571841c6c6b39ae09f3e267230acaf73ebdd0bd8d8a5dfadf800d8c9c9c13bdab9dbd0f316b99d17c83e64d3e4307580c75a0165fa SHA512 4f2e698b4d23cf4773158bcf4bee43ed8a5ada642d9b2c946d81eb5e0efce3a49a2a5a4b7523b18ee8c548afd75efb59cfcbdff69a473bec4ed80b74e6b8cfee
 EBUILD homeassistant-full-2021.5.4.ebuild 64741 BLAKE2B a3feac3bc61c8e111346b8e963a5ac0ace0402b3948cd9373ed3e8e7dac9caa2f15cdfe3a0cc0119adb5030c756ce59509c1f0650b4bc6cdb46ca8bed0ed92dc SHA512 70df863fe1fd2b1f0e89b7074ce6718752a2b1adb5fde4e74eccc16d2017a2b5563fcb0e2de7a617e6eac3a9558f0f00554bd673406e7174cb17d55ca6c3ad5a
@@ -29,9 +29,8 @@ EBUILD homeassistant-full-2021.6.3.ebuild 65576 BLAKE2B 8ed0e276d8617d25d4d08fbd
 EBUILD homeassistant-full-2021.6.4.ebuild 65576 BLAKE2B 8ed0e276d8617d25d4d08fbd5c70ba5e34a8c41e31ef467755cec613a80302aa390d469fe80b76b97c8bc88fa97e06f669bad6effd6d4ae05bfcd5b1a8d1e81f SHA512 cfe7314a8a1f0eab493522d96a09e905d5630ef2405b62b6aa90aa07f2a5a11bdef5a928c1eb1f0b94f7d5e366c2ce3ad648f6a76f5afab94fb21198e785d2e0
 EBUILD homeassistant-full-2021.6.5.ebuild 65622 BLAKE2B f5566c3bcb43ea69a59038eb258092baa886a3414a527844532e3bb023ba0bade401bb99a89b7449615cef4a68221b287b305f7c98d520ba1f69a58c7d5387d5 SHA512 e5da9a82512a7f0ca7230d59a7cc95e2b6b42d395b05ddd665f85eaa1d99a164163411f9451c503eada7065175851792728bd2653ace7c4ed91266c63faa08e1
 EBUILD homeassistant-full-2021.6.6-r1.ebuild 65857 BLAKE2B 0976c096e093e0d4abc3115935aab01cb14792ecf2de45f2adc40e10f0e4a0568ff7d591fc6096f173099a3ce89f58fea10b78f7e5b2a23a4aecbde50f4b64c4 SHA512 3a23ad13d2314efeba48bf361730136a2b92fbe1b3d622137ec88b7b30c1882e959e428a85c81261fe3bc1b92c7bcf53f7d8385e39fcfc9cce0cc20c7f48872c
-EBUILD homeassistant-full-2021.6.6.ebuild 65622 BLAKE2B 4b3a3e6b2ef077d448fd4f78a285727580178e705c3a924d22d504bfc580aa336a84a2254cd0d1c074466afbc4a40aec3890945e131349b3cdc570904ae4d301 SHA512 8fb92aa6da4deb9060b7b36f496af1f175aa871e08bed5af3aab0616e24606dcc776fcaa3c62eeb3f842b7d208d785509f56b6ad7697d72d19c2aaaa272817fe
-EBUILD homeassistant-full-2021.7.0_beta1.ebuild 67109 BLAKE2B c3b6182ff6a5990460f49c0b8d3f6d0e97999260ef5ee05b3e281f4d0bb03dd899926c0c51f8c8906c1534f110ee382254ffd93e16ab3cfac26a5a6527c66aac SHA512 099132d44896f6d0ce9ab79d805ae2b931eeb7cc029608c6d092ac8afadacf28ce71486d18d3c2a92ef2383828fd04e1908aee3a35eca9822ba9b121c9cb1930
 EBUILD homeassistant-full-2021.7.0_beta2.ebuild 67109 BLAKE2B c3b6182ff6a5990460f49c0b8d3f6d0e97999260ef5ee05b3e281f4d0bb03dd899926c0c51f8c8906c1534f110ee382254ffd93e16ab3cfac26a5a6527c66aac SHA512 099132d44896f6d0ce9ab79d805ae2b931eeb7cc029608c6d092ac8afadacf28ce71486d18d3c2a92ef2383828fd04e1908aee3a35eca9822ba9b121c9cb1930
 EBUILD homeassistant-full-2021.7.0_beta4.ebuild 67109 BLAKE2B ef2bbe2ac4e868d777be5a96e74ccc58946b255bbf642cdffab69c982a42f0d0d82e0bcb07c7333c83e0978c6811b014b9463662e496b40c797776b0df7adf07 SHA512 3236c472ba569fd9655116068913d2c8b9fd43712a52a356461c4046aefa794866985f3548f5f25189a9ffcbc4095e5f07c667bd56cb4dd602d06089e38bdbe7
-EBUILD homeassistant-full-9999.ebuild 67109 BLAKE2B ef2bbe2ac4e868d777be5a96e74ccc58946b255bbf642cdffab69c982a42f0d0d82e0bcb07c7333c83e0978c6811b014b9463662e496b40c797776b0df7adf07 SHA512 3236c472ba569fd9655116068913d2c8b9fd43712a52a356461c4046aefa794866985f3548f5f25189a9ffcbc4095e5f07c667bd56cb4dd602d06089e38bdbe7
+EBUILD homeassistant-full-2021.7.0_beta5.ebuild 67015 BLAKE2B 03eaae8c266e678b67ee4902d275fe67985206cc32882833b24cdffc3b8dc05e78a9e2dbcc8e496e748db630a268d49232d57678eb5c6753ea6fbc0d378f99f1 SHA512 63f2dbab661eaedc72db179494ed02282421c27b801fc4efa9fe5b80dbbd9cf339f9f4f20dee0bc8b2db84a278142f29ccf1d83632ba9ed4b2460a5575c7a0aa
+EBUILD homeassistant-full-9999.ebuild 67015 BLAKE2B 03eaae8c266e678b67ee4902d275fe67985206cc32882833b24cdffc3b8dc05e78a9e2dbcc8e496e748db630a268d49232d57678eb5c6753ea6fbc0d378f99f1 SHA512 63f2dbab661eaedc72db179494ed02282421c27b801fc4efa9fe5b80dbbd9cf339f9f4f20dee0bc8b2db84a278142f29ccf1d83632ba9ed4b2460a5575c7a0aa
 MISC metadata.xml 73164 BLAKE2B e416aeb5e2df83a7860aadae50e0fcc6c44001d6a334e7aa2831c37ab98261069ccee93984165c79b8465be0b490778a6c6c3171462897bcead7e5a18733ddc2 SHA512 f2932f53ebf55f0198b91584635b19f8c1bb14cb88d7018082f11f5568b48ba6ed97041db29e945da85611c702e9482aface492a9ba1d2d21509c7c2cef82efe
diff --git a/app-misc/homeassistant-full/homeassistant-full-2021.6.6.ebuild b/app-misc/homeassistant-full/homeassistant-full-2021.6.6.ebuild
deleted file mode 100644
index f95f65cb7..000000000
--- a/app-misc/homeassistant-full/homeassistant-full-2021.6.6.ebuild
+++ /dev/null
@@ -1,949 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{8,9} )
-inherit readme.gentoo-r1 eutils distutils-r1 systemd
-
-MY_PN=homeassistant
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/home-assistant/core.git"
-	EGIT_BRANCH="dev"
-	S="${WORKDIR}/core/"
-else
-	MY_PV=${PV/_beta/b}
-	MY_P=${MY_PN}-${MY_PV}
-	SRC_URI="https://github.com/home-assistant/core/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-	S="${WORKDIR}/core-${MY_PV}"
-fi
-
-DESCRIPTION="Open-source home automation platform running on Python 3.8"
-HOMEPAGE="https://home-assistant.io/ https://git.edevau.net/onkelbeh/HomeAssistantRepository/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-KEYWORDS="amd64 arm arm64 x86 amd64-linux x86-linux"
-IUSE="abode accuweather acer_projector acmeda adguard ads advantage_air aemet aftership agent_dvr airly airnow airvisual aladdin_connect alarmdecoder almond alpha_vantage amazon_polly ambiclimate ambient_station amcrest ampio androidtv android_ip_webcam anel_pwrctrl anthemav apache_kafka apcupsd apns apple_tv apprise aprs aqualogic aquostv arcam_fmj arduino arlo arris_tg2492lg aruba asterisk_mbox asuswrt atag aten_pe atome august aurora aurora_abb_powerone avea avion -avri awair -aws axis baidu bbb_gpio bbox -beewi_smartclim bh1750 bitcoin bizkaibus blackbird blebox blink blinksticklight blinkt blockchain bluesound bluetooth_le_tracker bluetooth_tracker bme280 bme680 bmp280 bmw_connected_drive bom bond bosch_shc braviatv broadlink brother brottsplatskartan brunt bsblan bt_home_hub_5 bt_smarthub buienradar +caldav canary cast channels circuit cisco_ios cisco_mobility_express cisco_webex_teams clementine cli climacell cloud cloudflare cmus co2signal coinbase coinmarketcap color_extractor comfoconnect compensation concord232 control4 coolmaster coronavirus cppm_tracker cpuspeed crimereports cups daikin danfoss_air darksky datadog debugpy deconz decora decora_wifi delijn deluge denonavr deutsche_bahn devolo_home_control dexcom dhcp dht digitalloggers digital_ocean directv discogs discord discovery dlink dlna_dmr dnsip dominos doods doorbird dovado dsmr dunehd +dwd_weather_warnings dweet dynalite dyson eafm ebox ebusd ecoal_boiler ecobee econet ecovacs eddystone_temperature edimax edl21 ee_brightbox egardia eight_sleep elgato eliqonline elkm1 elv emby emonitor emulated_hue emulated_kasa emulated_roku enigma2 enocean enphase_envoy entur_public_transport environment_canada envirophat ephember epson epsonworkforce eq3btsmart esphome essent etherscan eufy everlights evohome ezviz faa_delays familyhub fastdotcom feedreader ffmpeg fibaro fido fints fireservicerota firmata fitbit fixer fleetgo flexit flic flick_electric flo flume flunearyou flux_led folder_watcher foobot forked_daapd fortios foscam freebox free_mobile fritz fritzbox fritzbox_callmonitor fritzbox_netmonitor fronius frontier_silicon futurenow garages_amsterdam garmin_connect gc100 gdacs geizhals geniushub geonetnz_quakes geonetnz_volcano geo_json_events geo_rss_events gios github gitlab_ci gitter glances -gntp goalfeed goalzero gogogate2 google google_maps google_pubsub google_travel_time gpmdp -gpsd gree greeneye_monitor greenwave griddy growatt_server gstreamer gtfs guardian habitica hangouts harman_kardon_avr harmony hdmi_cec heatmiser heos here_travel_time hikvision hikvisioncam hisense_aehw4a1 hive hlk_sw16 +homekit homekit_controller -homematic -homematicip_cloud homeworks home_connect home_plus_control honeywell horizon hp_ilo html5 http htu21d huawei_lte hue huisbaasje hunterdouglas_powerview hvv_departures hydrawise hyperion ialarm iammeter iaqualink -icloud idteck_prox ifttt iglo ign_sismologia ihc image imap incomfort influxdb insteon intesishome iota iperf3 ipma ipp iqvia irish_rail_transport islamic_prayer_times iss isy994 itach izone jewish_calendar joaoapps_join juicenet kaiterra keenetic_ndms2 kef keyboard keyboard_remote kira kiwi kmtronic knx kodi konnected kostal_plenticore kraken kulersky kwb lacrosse lametric lastfm launch_library lcn lg_netcast lg_soundbar life360 lifx lifx_legacy lightwave limitlessled linode linux_battery lirc litejet litterrobot logi_circle loopenergy luci luftdaten lupusec lutron lutron_caseta lw12wifi lyft lyric magicseaweed mailgun marytts mastodon matrix maxcube mazda mcp23017 mediaroom media_extractor melcloud melissa message_bird met meteoalarm meteoclimatic meteo_france metoffice met_eireann mfi mhz19 microsoft miflora mikrotik mill minio -mitemp_bt +mobile_app mochad modbus modem_callerid monoprice motioneye motion_blinds mpd +mqtt msteams mullvad mutesync mvglive mychevy mycroft myq mysensors +mysql mystrom mythicbeastsdns n26 nad nam nanoleaf neato nederlandse_spoorwegen nello ness_alarm nest netatmo netdata netgear netgear_lte netio network neurio_energy nexia nextbus nextcloud nightscout niko_home_control nilu nissan_leaf nmap_tracker nmbs noaa_tides norway_air +notify_events notion nsw_fuel_station nsw_rural_fire_service_feed nuheat nuimo_controller nuki numato nut nws nx584 nzbget oasa_telematics obihai oem ohmconnect ombi omnilogic ondilo_ico onewire onkyo onvif openerz openevse opengarage openhome opensensemap opentherm_gw openuv openweathermap opnsense opple orangepi_gpio oru orvibo osramlightify +otp ovo_energy owntracks ozw panasonic_bluray panasonic_viera pandora pcal9535a pencom philips_js pi4ioe5v9xxxx picnic piglow pilight +ping pi_hole pjlink plaato +plex plugwise plum_lightpad pocketcasts point poolsense powerwall profiler progettihwsw proliphix prometheus proxmoxve proxy ps4 ptvsd pulseaudio_loopback pushbullet pushover +python_script qbittorrent qld_bushfire qnap qrcode quantum_gateway qvr_pro qwikswitch rachio radiotherm rainbird raincloud rainforest_eagle rainmachine raspihats raspyrfm recollect_waste +recorder recswitch reddit rejseplanen -remember_the_milk remote_rpi_gpio repetier +rest rflink rfxtrx ring ripple risco rituals_perfume_genie rmvtransport rocketchat roku roomba roon route53 rova rpi_gpio rpi_gpio_pwm rpi_pfio rpi_power rpi_rf ruckus_unleashed russound_rio russound_rnet sabnzbd saj salt samsungtv satel_integra schluter +scrape screenlogic scsgate season sendgrid sense sensehat sensibo sentry serial serial_pm sesame seventeentrack seven_segments sharkiq shelly shiftr shodan sht31 sia sighthound signal_messenger simplepush simplisafe sinch sisyphus skybeacon skybell sky_hub slack sleepiq slide sma smappee smarthab smartthings smarttub smarty smart_meter_texas smhi sms snapcast +snmp socat sochain socialblade solaredge solaredge_local solarlog solax soma somfy somfy_mylink sonarr songpal sonos sony_projector soundtouch spc speedtestdotnet spider splunk spotcrime spotify +sql squeezebox srp_energy ssdp +ssl starline starlingbank startca statsd steam_online stiebel_eltron stookalert stream streamlabswater subaru suez_water supla surepetcare swiss_hydrological_data swiss_public_transport switchbot switcher_kis switchmate syncthing syncthru synology synology_dsm synology_srm systemd systemmonitor system_bridge tado tahoma tankerkoenig tank_utility tapsaff tasmota tautulli ted5000 telegram_bot tellduslive tellstick temper tesla test tfiac thermoworks_smoke thingspeak thinkingcleaner tibber tikteck tile tmb todoist tof toon totalconnect touchline tplink tplink_lte traccar trackr tradfri trafikverket_train trafikverket_weatherstation transmission transport_nsw travisci trend tts tuya twentemilieu twilio twinkly twitch twitter ubee unifi unifiled unifi_direct upb upcloud upc_connect updater upnp uscis usgs_earthquakes_feed uvc vallox velbus velux venstar vera verisure versasense +version vesync vicare vilfo vivotek vizio vlc vlc_telnet volkszaehler volumio volvooncall vultr w800rf32 +wake_on_lan wallbox waqi waterfurnace watson_iot waze_travel_time webostv wemo whois wiffi wilight wink wirelesstag withings wled wolflink workday xbee xbox xbox_live xeoma xfinity xiaomi_aqara xiaomi_miio xiaomi_tv xmpp xs1 yale_smart_alarm yamaha yamaha_musiccast yandex_transport yeelight yeelightsunflower yessssms yi zabbix zengge zeroconf zerproc zestimate zha zhong_hong ziggo_mediabox_xl zoneminder +zwave zwave_js"
-
-# external deps
-RDEPEND="${PYTHON_DEPS} acct-group/${MY_PN} acct-user/${MY_PN}
-	|| ( dev-lang/python:3.8 dev-lang/python:3.9 )
-	app-admin/logrotate
-	dev-db/sqlite
-	dev-libs/libfastjson
-	>=dev-libs/xerces-c-3.1.4-r1"
-
-# make sure no conflicting main Ebuild is installed
-RDEPEND="${RDEPEND}
-	!app-misc/homeassistant-min
-	!app-misc/homeassistant"
-
-# Home Assistant Core dependencies
-# from package_constraints.txt
-RDEPEND="${RDEPEND}
-	~dev-python/aiodiscover-1.4.2[${PYTHON_USEDEP}]
-	~dev-python/aiohttp-3.7.4_p0[${PYTHON_USEDEP}]
-	~dev-python/aiohttp-cors-0.7.0[${PYTHON_USEDEP}]
-	~dev-python/astral-2.2[${PYTHON_USEDEP}]
-	~dev-python/async-upnp-client-0.18.0[${PYTHON_USEDEP}]
-	~dev-python/async_timeout-3.0.1[${PYTHON_USEDEP}]
-	~dev-python/attrs-21.2.0[${PYTHON_USEDEP}]
-	~dev-python/awesomeversion-21.4.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/backports-zoneinfo[${PYTHON_USEDEP}]' python3_8)
-	~dev-python/bcrypt-3.1.7[${PYTHON_USEDEP}]
-	>=dev-python/btlewrap-0.0.10[${PYTHON_USEDEP}]
-	>=dev-python/certifi-2020.12.5[${PYTHON_USEDEP}]
-	~dev-python/ciso8601-2.1.3[${PYTHON_USEDEP}]
-	~dev-python/cryptography-3.3.2[${PYTHON_USEDEP}]
-	~dev-python/defusedxml-0.7.1[${PYTHON_USEDEP}]
-	~dev-python/distro-1.5.0[${PYTHON_USEDEP}]
-	~dev-python/emoji-1.2.0[${PYTHON_USEDEP}]
-	~dev-python/grpcio-1.31.0[${PYTHON_USEDEP}]
-	>=dev-python/h11-0.12.0[${PYTHON_USEDEP}]
-	~dev-python/hass-nabucasa-0.43.0[${PYTHON_USEDEP}]
-	~dev-python/home-assistant-frontend-20210603.0[${PYTHON_USEDEP}]
-	~dev-python/httpcore-0.13.3[${PYTHON_USEDEP}]
-	>=dev-python/httplib2-0.19.0[${PYTHON_USEDEP}]
-	~dev-python/httpx-0.18.0[${PYTHON_USEDEP}]
-	~dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}]
-	~dev-python/jinja-3.0.1[${PYTHON_USEDEP}]
-	~dev-python/netdisco-2.8.3[${PYTHON_USEDEP}]
-	~dev-python/paho-mqtt-1.5.1[${PYTHON_USEDEP}]
-	~dev-python/pillow-8.1.2[${PYTHON_USEDEP}]
-	<dev-python/pip-20.3.0
-	>=dev-python/pycryptodome-3.6.6[${PYTHON_USEDEP}]
-	~dev-python/pyjwt-1.7.1[${PYTHON_USEDEP}]
-	~dev-python/pynacl-1.3.0[${PYTHON_USEDEP}]
-	~dev-python/python-slugify-4.0.1[${PYTHON_USEDEP}]
-	~dev-python/pyyaml-5.4.1[${PYTHON_USEDEP}]
-	~dev-python/requests-2.25.1[${PYTHON_USEDEP}]
-	~dev-python/ruamel-yaml-0.15.100[${PYTHON_USEDEP}]
-	~net-analyzer/scapy-2.4.5
-	~dev-python/sqlalchemy-1.4.13[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.24.3[${PYTHON_USEDEP}]
-	~dev-python/voluptuous-serialize-2.4.0[${PYTHON_USEDEP}]
-	~dev-python/voluptuous-0.12.1[${PYTHON_USEDEP}]
-	~dev-python/yarl-1.6.3[${PYTHON_USEDEP}]
-	~dev-python/zeroconf-0.31.0[${PYTHON_USEDEP}]"
-
-# unknown origin, still something to clean up here
-# some moved to suggested USE Flags
-
-RDEPEND="${RDEPEND}
-	~dev-python/colorlog-5.0.1[${PYTHON_USEDEP}]
-	~dev-python/gTTS-token-1.1.3[${PYTHON_USEDEP}]
-	>=dev-python/multidict-4.5.2[${PYTHON_USEDEP}]
-	~dev-python/numpy-1.20.3[${PYTHON_USEDEP}]
-	dev-python/pycparser[${PYTHON_USEDEP}]
-	>=dev-python/websocket-client-0.56.0[${PYTHON_USEDEP}]
-	~media-libs/mutagen-1.45.1"
-
-# Module requirements from useflags
-RDEPEND="${RDEPEND}
-	abode? ( ~dev-python/abodepy-1.2.0[${PYTHON_USEDEP}] )
-	accuweather? ( ~dev-python/accuweather-0.2.0[${PYTHON_USEDEP}] )
-	acer_projector? ( ~dev-python/pyserial-3.5[${PYTHON_USEDEP}] )
-	acmeda? ( ~dev-python/aiopulse-0.4.2[${PYTHON_USEDEP}] )
-	adguard? ( ~dev-python/adguardhome-0.5.0[${PYTHON_USEDEP}] )
-	ads? ( ~dev-python/pyads-3.2.2[${PYTHON_USEDEP}] )
-	advantage_air? ( ~dev-python/advantage-air-0.2.1[${PYTHON_USEDEP}] )
-	aemet? ( ~dev-python/AEMET-OpenData-0.2.1[${PYTHON_USEDEP}] )
-	aftership? ( ~dev-python/pyaftership-0.1.2[${PYTHON_USEDEP}] )
-	agent_dvr? ( ~dev-python/agent-py-0.0.23[${PYTHON_USEDEP}] )
-	airly? ( ~dev-python/airly-1.1.0[${PYTHON_USEDEP}] )
-	airnow? ( ~dev-python/pyairnow-1.1.0[${PYTHON_USEDEP}] )
-	airvisual? ( ~dev-python/pyairvisual-5.0.8[${PYTHON_USEDEP}] )
-	aladdin_connect? ( ~dev-python/aladdin-connect-0.3[${PYTHON_USEDEP}] )
-	alarmdecoder? ( ~dev-python/adext-0.4.2[${PYTHON_USEDEP}] )
-	almond? ( ~dev-python/pyalmond-0.0.2[${PYTHON_USEDEP}] )
-	alpha_vantage? ( ~dev-python/alpha-vantage-2.3.1[${PYTHON_USEDEP}] )
-	amazon_polly? ( ~dev-python/boto3-1.16.52[${PYTHON_USEDEP}] )
-	ambiclimate? ( ~dev-python/Ambiclimate-0.2.1[${PYTHON_USEDEP}] )
-	ambient_station? ( ~dev-python/aioambient-1.2.4[${PYTHON_USEDEP}] )
-	amcrest? ( ~dev-python/amcrest-1.7.2[${PYTHON_USEDEP}] )
-	ampio? ( ~dev-python/asmog-0.0.6[${PYTHON_USEDEP}] )
-	androidtv? ( ~dev-python/adb-shell-0.3.1[${PYTHON_USEDEP}] ~dev-python/androidtv-0.0.59[${PYTHON_USEDEP}] ~dev-python/pure-python-adb-0.3.0[${PYTHON_USEDEP}] )
-	android_ip_webcam? ( ~dev-python/pydroid-ipcam-0.8[${PYTHON_USEDEP}] )
-	anel_pwrctrl? ( ~dev-python/anel-pwrctrl-homeassistant-0.0.1[${PYTHON_USEDEP}] )
-	anthemav? ( ~dev-python/anthemav-1.1.10[${PYTHON_USEDEP}] )
-	apache_kafka? ( ~dev-python/aiokafka-0.6.0[${PYTHON_USEDEP}] )
-	apcupsd? ( ~dev-python/apcaccess-0.0.13[${PYTHON_USEDEP}] )
-	apns? ( ~dev-python/apns2-0.3.0[${PYTHON_USEDEP}] )
-	apple_tv? ( ~dev-python/pyatv-0.7.7[${PYTHON_USEDEP}] )
-	apprise? ( ~dev-python/apprise-0.9.3[${PYTHON_USEDEP}] )
-	aprs? ( ~dev-python/aprslib-0.6.46[${PYTHON_USEDEP}] ~dev-python/geopy-2.1.0[${PYTHON_USEDEP}] )
-	aqualogic? ( ~dev-python/aqualogic-2.6[${PYTHON_USEDEP}] )
-	aquostv? ( ~dev-python/sharp_aquos_rc-0.3.2[${PYTHON_USEDEP}] )
-	arcam_fmj? ( ~dev-python/arcam-fmj-0.5.3[${PYTHON_USEDEP}] )
-	arduino? ( ~dev-python/PyMata-2.20[${PYTHON_USEDEP}] )
-	arlo? ( ~dev-python/pyarlo-0.2.4[${PYTHON_USEDEP}] )
-	arris_tg2492lg? ( ~dev-python/arris-tg2492lg-1.1.0[${PYTHON_USEDEP}] )
-	aruba? ( ~dev-python/pexpect-4.6.0[${PYTHON_USEDEP}] )
-	asterisk_mbox? ( ~dev-python/asterisk_mbox-0.5.0[${PYTHON_USEDEP}] )
-	asuswrt? ( ~dev-python/aioasuswrt-1.3.4[${PYTHON_USEDEP}] )
-	atag? ( ~dev-python/pyatag-0.3.5.3[${PYTHON_USEDEP}] )
-	aten_pe? ( ~dev-python/atenpdu-0.3.0[${PYTHON_USEDEP}] )
-	atome? ( ~dev-python/pyAtome-0.1.1[${PYTHON_USEDEP}] )
-	august? ( ~dev-python/yalexs-1.1.11[${PYTHON_USEDEP}] )
-	aurora? ( ~dev-python/auroranoaa-0.0.2[${PYTHON_USEDEP}] )
-	aurora_abb_powerone? ( ~dev-python/aurorapy-0.2.6[${PYTHON_USEDEP}] )
-	avea? ( ~dev-python/avea-1.5.1[${PYTHON_USEDEP}] )
-	avion? ( ~dev-python/avion-0.10[${PYTHON_USEDEP}] )
-	avri? ( ~dev-python/avri-api-0.1.7[${PYTHON_USEDEP}] ~dev-python/pycountry-19.8.18[${PYTHON_USEDEP}] )
-	awair? ( ~dev-python/python-awair-0.2.1[${PYTHON_USEDEP}] )
-	aws? ( ~dev-python/aiobotocore-1.2.2[${PYTHON_USEDEP}] )
-	axis? ( ~dev-python/axis-44[${PYTHON_USEDEP}] )
-	baidu? ( ~dev-python/baidu-aip-1.6.6.0[${PYTHON_USEDEP}] )
-	bbb_gpio? ( ~dev-python/Adafruit_BBIO-1.1.1[${PYTHON_USEDEP}] )
-	bbox? ( ~dev-python/pybbox-0.0.5_alpha0[${PYTHON_USEDEP}] )
-	beewi_smartclim? ( ~dev-python/beewi-smartclim-0.0.10[${PYTHON_USEDEP}] )
-	bh1750? ( ~dev-python/i2csense-0.0.4[${PYTHON_USEDEP}] ~dev-python/smbus-cffi-0.5.1[${PYTHON_USEDEP}] )
-	bitcoin? ( ~dev-python/blockchain-1.4.4[${PYTHON_USEDEP}] )
-	bizkaibus? ( ~dev-python/bizkaibus-0.1.1[${PYTHON_USEDEP}] )
-	blackbird? ( ~dev-python/pyblackbird-0.5[${PYTHON_USEDEP}] )
-	blebox? ( ~dev-python/blebox-uniapi-1.3.3[${PYTHON_USEDEP}] )
-	blink? ( ~dev-python/blinkpy-0.17.0[${PYTHON_USEDEP}] )
-	blinksticklight? ( ~dev-python/BlinkStick-1.1.8[${PYTHON_USEDEP}] )
-	blinkt? ( ~dev-python/blinkt-0.1.0[${PYTHON_USEDEP}] )
-	blockchain? ( ~dev-python/python-blockchain-api-0.0.2[${PYTHON_USEDEP}] )
-	bluesound? ( ~dev-python/xmltodict-0.12.0[${PYTHON_USEDEP}] )
-	bluetooth_le_tracker? ( ~dev-python/pygatt-4.0.5[${PYTHON_USEDEP}] )
-	bluetooth_tracker? ( ~dev-python/bt-proximity-0.2[${PYTHON_USEDEP}] ~dev-python/pybluez-0.22[${PYTHON_USEDEP}] )
-	bme280? ( ~dev-python/i2csense-0.0.4[${PYTHON_USEDEP}] ~dev-python/smbus-cffi-0.5.1[${PYTHON_USEDEP}] )
-	bme680? ( ~dev-python/bme680-1.0.5[${PYTHON_USEDEP}] ~dev-python/smbus-cffi-0.5.1[${PYTHON_USEDEP}] )
-	bmp280? ( ~dev-python/adafruit-circuitpython-bmp280-3.1.1[${PYTHON_USEDEP}] ~dev-python/RPi-GPIO-0.7.1_alpha4[${PYTHON_USEDEP}] )
-	bmw_connected_drive? ( ~dev-python/bimmer-connected-0.7.15[${PYTHON_USEDEP}] )
-	bom? ( ~dev-python/bomradarloop-0.1.5[${PYTHON_USEDEP}] )
-	bond? ( ~dev-python/bond-api-0.1.12[${PYTHON_USEDEP}] )
-	bosch_shc? ( ~dev-python/boschshcpy-0.2.17[${PYTHON_USEDEP}] )
-	braviatv? ( ~dev-python/bravia-tv-1.0.11[${PYTHON_USEDEP}] )
-	broadlink? ( ~dev-python/broadlink-0.17.0[${PYTHON_USEDEP}] )
-	brother? ( ~dev-python/brother-1.0.2[${PYTHON_USEDEP}] )
-	brottsplatskartan? ( ~dev-python/brottsplatskartan-0.0.1[${PYTHON_USEDEP}] )
-	brunt? ( ~dev-python/brunt-0.1.3[${PYTHON_USEDEP}] )
-	bsblan? ( ~dev-python/bsblan-0.4.0[${PYTHON_USEDEP}] )
-	bt_home_hub_5? ( ~dev-python/bthomehub5-devicelist-0.1.1[${PYTHON_USEDEP}] )
-	bt_smarthub? ( ~dev-python/btsmarthub-devicelist-0.2.0[${PYTHON_USEDEP}] )
-	buienradar? ( ~dev-python/buienradar-1.0.4[${PYTHON_USEDEP}] )
-	caldav? ( ~dev-python/caldav-0.7.1[${PYTHON_USEDEP}] )
-	canary? ( ~dev-python/py-canary-0.5.1[${PYTHON_USEDEP}] )
-	cast? ( ~dev-python/pychromecast-9.1.2[${PYTHON_USEDEP}] )
-	channels? ( ~dev-python/pychannels-1.0.0[${PYTHON_USEDEP}] )
-	circuit? ( ~dev-python/circuit-webhook-1.0.1[${PYTHON_USEDEP}] )
-	cisco_ios? ( ~dev-python/pexpect-4.6.0[${PYTHON_USEDEP}] )
-	cisco_mobility_express? ( ~dev-python/ciscomobilityexpress-0.3.9[${PYTHON_USEDEP}] )
-	cisco_webex_teams? ( ~dev-python/webexteamssdk-1.1.1[${PYTHON_USEDEP}] )
-	clementine? ( ~dev-python/python-clementine-remote-1.0.1[${PYTHON_USEDEP}] )
-	cli? ( app-misc/home-assistant-cli )
-	climacell? ( ~dev-python/pyclimacell-0.18.2[${PYTHON_USEDEP}] )
-	cloud? ( ~dev-python/hass-nabucasa-0.43.0[${PYTHON_USEDEP}] )
-	cloudflare? ( ~dev-python/pycfdns-1.2.1[${PYTHON_USEDEP}] )
-	cmus? ( ~dev-python/pycmus-0.1.1[${PYTHON_USEDEP}] )
-	co2signal? ( ~dev-python/CO2Signal-0.4.2[${PYTHON_USEDEP}] )
-	coinbase? ( ~dev-python/coinbase-2.1.0[${PYTHON_USEDEP}] )
-	coinmarketcap? ( ~dev-python/coinmarketcap-5.0.3[${PYTHON_USEDEP}] )
-	color_extractor? ( ~dev-python/colorthief-0.2.1[${PYTHON_USEDEP}] )
-	comfoconnect? ( ~dev-python/pycomfoconnect-0.4[${PYTHON_USEDEP}] )
-	compensation? ( ~dev-python/numpy-1.20.3[${PYTHON_USEDEP}] )
-	concord232? ( ~dev-python/concord232-0.15[${PYTHON_USEDEP}] )
-	control4? ( ~dev-python/pyControl4-0.0.6[${PYTHON_USEDEP}] )
-	coolmaster? ( ~dev-python/pycoolmasternet-async-0.1.2[${PYTHON_USEDEP}] )
-	coronavirus? ( ~dev-python/coronavirus-1.1.1[${PYTHON_USEDEP}] )
-	cppm_tracker? ( ~dev-python/clearpasspy-1.0.2[${PYTHON_USEDEP}] )
-	cpuspeed? ( ~dev-python/py-cpuinfo-8.0.0[${PYTHON_USEDEP}] )
-	crimereports? ( ~dev-python/crimereports-1.0.1[${PYTHON_USEDEP}] )
-	cups? ( ~dev-python/pycups-1.9.73[${PYTHON_USEDEP}] )
-	daikin? ( ~dev-python/pydaikin-2.4.3[${PYTHON_USEDEP}] )
-	danfoss_air? ( ~dev-python/pydanfossair-0.1.0[${PYTHON_USEDEP}] )
-	darksky? ( ~dev-python/python-forecastio-1.4.0[${PYTHON_USEDEP}] )
-	datadog? ( ~dev-python/datadog-0.15.0[${PYTHON_USEDEP}] )
-	debugpy? ( ~dev-python/debugpy-1.3.0[${PYTHON_USEDEP}] )
-	deconz? ( ~dev-python/pydeconz-79[${PYTHON_USEDEP}] )
-	decora? ( ~dev-python/bluepy-1.3.0[${PYTHON_USEDEP}] ~dev-python/decora-0.6[${PYTHON_USEDEP}] )
-	decora_wifi? ( ~dev-python/decora-wifi-1.4[${PYTHON_USEDEP}] )
-	delijn? ( ~dev-python/pydelijn-0.6.1[${PYTHON_USEDEP}] )
-	deluge? ( ~dev-python/deluge-client-1.7.1[${PYTHON_USEDEP}] )
-	denonavr? ( ~dev-python/denonavr-0.10.8[${PYTHON_USEDEP}] )
-	deutsche_bahn? ( ~dev-python/schiene-0.23[${PYTHON_USEDEP}] )
-	devolo_home_control? ( ~dev-python/devolo-home-control-api-0.17.3[${PYTHON_USEDEP}] )
-	dexcom? ( ~dev-python/pydexcom-0.2.0[${PYTHON_USEDEP}] )
-	dhcp? ( ~net-analyzer/scapy-2.4.5 ~dev-python/aiodiscover-1.4.2[${PYTHON_USEDEP}] )
-	dht? ( ~dev-python/adafruit-circuitpython-dht-3.6.0[${PYTHON_USEDEP}] )
-	digitalloggers? ( ~dev-python/dlipower-0.7.165[${PYTHON_USEDEP}] )
-	digital_ocean? ( ~dev-python/python-digitalocean-1.13.2[${PYTHON_USEDEP}] )
-	directv? ( ~dev-python/directv-0.4.0[${PYTHON_USEDEP}] )
-	discogs? ( ~dev-python/discogs-client-2.3.0[${PYTHON_USEDEP}] )
-	discord? ( ~dev-python/discord-py-1.7.2[${PYTHON_USEDEP}] )
-	discovery? ( ~dev-python/netdisco-2.8.3[${PYTHON_USEDEP}] )
-	dlink? ( ~dev-python/pyW215-0.7.0[${PYTHON_USEDEP}] )
-	dlna_dmr? ( ~dev-python/async-upnp-client-0.18.0[${PYTHON_USEDEP}] )
-	dnsip? ( ~dev-python/aiodns-3.0.0[${PYTHON_USEDEP}] )
-	dominos? ( ~dev-python/pizzapi-0.0.3[${PYTHON_USEDEP}] )
-	doods? ( ~dev-python/pydoods-1.0.2[${PYTHON_USEDEP}] ~dev-python/pillow-8.1.2[${PYTHON_USEDEP}] )
-	doorbird? ( ~dev-python/DoorBirdPy-2.1.0[${PYTHON_USEDEP}] )
-	dovado? ( ~dev-python/dovado-0.4.1[${PYTHON_USEDEP}] )
-	dsmr? ( ~dev-python/dsmr-parser-0.29[${PYTHON_USEDEP}] )
-	dunehd? ( ~dev-python/pdunehd-1.3.2[${PYTHON_USEDEP}] )
-	dwd_weather_warnings? ( ~dev-python/dwdwfsapi-1.0.4[${PYTHON_USEDEP}] )
-	dweet? ( ~dev-python/dweepy-0.3.0[${PYTHON_USEDEP}] )
-	dynalite? ( ~dev-python/dynalite-devices-0.1.46[${PYTHON_USEDEP}] )
-	dyson? ( ~dev-python/libpurecool-0.6.4[${PYTHON_USEDEP}] )
-	eafm? ( ~dev-python/aioeafm-0.1.2[${PYTHON_USEDEP}] )
-	ebox? ( ~dev-python/pyebox-1.1.4[${PYTHON_USEDEP}] )
-	ebusd? ( ~dev-python/ebusdpy-0.0.16[${PYTHON_USEDEP}] )
-	ecoal_boiler? ( ~dev-python/ecoaliface-0.4.0[${PYTHON_USEDEP}] )
-	ecobee? ( ~dev-python/python-ecobee-api-0.2.11[${PYTHON_USEDEP}] )
-	econet? ( ~dev-python/pyeconet-0.1.14[${PYTHON_USEDEP}] )
-	ecovacs? ( ~dev-python/sucks-0.9.4[${PYTHON_USEDEP}] )
-	eddystone_temperature? ( ~dev-python/beacontools-1.2.3[${PYTHON_USEDEP}] ~dev-python/construct-2.10.56[${PYTHON_USEDEP}] )
-	edimax? ( ~dev-python/pyedimax-0.2.1[${PYTHON_USEDEP}] )
-	edl21? ( ~dev-python/pysml-0.0.5[${PYTHON_USEDEP}] )
-	ee_brightbox? ( ~dev-python/eebrightbox-0.0.4[${PYTHON_USEDEP}] )
-	egardia? ( ~dev-python/pythonegardia-1.0.40[${PYTHON_USEDEP}] )
-	eight_sleep? ( ~dev-python/pyEight-0.1.5[${PYTHON_USEDEP}] )
-	elgato? ( ~dev-python/elgato-2.1.1[${PYTHON_USEDEP}] )
-	eliqonline? ( ~dev-python/eliqonline-1.2.2[${PYTHON_USEDEP}] )
-	elkm1? ( ~dev-python/elkm1-lib-0.8.10[${PYTHON_USEDEP}] )
-	elv? ( ~dev-python/pypca-0.0.7[${PYTHON_USEDEP}] )
-	emby? ( ~dev-python/pyEmby-1.7[${PYTHON_USEDEP}] )
-	emonitor? ( ~dev-python/aioemonitor-1.0.5[${PYTHON_USEDEP}] )
-	emulated_hue? ( ~dev-python/aiohttp-cors-0.7.0[${PYTHON_USEDEP}] )
-	emulated_kasa? ( ~dev-python/sense-energy-0.9.0[${PYTHON_USEDEP}] )
-	emulated_roku? ( ~dev-python/emulated-roku-0.2.1[${PYTHON_USEDEP}] )
-	enigma2? ( ~dev-python/openwebifpy-3.2.7[${PYTHON_USEDEP}] )
-	enocean? ( ~dev-python/enocean-0.50.1[${PYTHON_USEDEP}] )
-	enphase_envoy? ( ~dev-python/envoy-reader-0.19.0[${PYTHON_USEDEP}] )
-	entur_public_transport? ( ~dev-python/enturclient-0.2.1[${PYTHON_USEDEP}] )
-	environment_canada? ( ~dev-python/env-canada-0.2.5[${PYTHON_USEDEP}] )
-	envirophat? ( ~dev-python/envirophat-0.0.6[${PYTHON_USEDEP}] ~dev-python/smbus-cffi-0.5.1[${PYTHON_USEDEP}] )
-	ephember? ( ~dev-python/pyephember-0.3.1[${PYTHON_USEDEP}] )
-	epson? ( ~dev-python/epson-projector-0.4.2[${PYTHON_USEDEP}] )
-	epsonworkforce? ( ~dev-python/epsonprinter-0.0.9[${PYTHON_USEDEP}] )
-	eq3btsmart? ( ~dev-python/construct-2.10.56[${PYTHON_USEDEP}] ~dev-python/python-eq3bt-0.1.11[${PYTHON_USEDEP}] )
-	esphome? ( ~dev-python/aioesphomeapi-2.8.0[${PYTHON_USEDEP}] )
-	essent? ( ~dev-python/PyEssent-0.14[${PYTHON_USEDEP}] )
-	etherscan? ( ~dev-python/python-etherscan-api-0.0.3[${PYTHON_USEDEP}] )
-	eufy? ( ~dev-python/lakeside-0.12[${PYTHON_USEDEP}] )
-	everlights? ( ~dev-python/pyeverlights-0.1.0[${PYTHON_USEDEP}] )
-	evohome? ( ~dev-python/evohome-async-0.3.15[${PYTHON_USEDEP}] )
-	ezviz? ( ~dev-python/pyEzviz-0.1.8.7[${PYTHON_USEDEP}] )
-	faa_delays? ( ~dev-python/faadelays-0.0.7[${PYTHON_USEDEP}] )
-	familyhub? ( ~dev-python/python-family-hub-local-0.0.2[${PYTHON_USEDEP}] )
-	fastdotcom? ( ~dev-python/fastdotcom-0.0.3[${PYTHON_USEDEP}] )
-	feedreader? ( ~dev-python/feedparser-6.0.2[${PYTHON_USEDEP}] )
-	ffmpeg? ( ~dev-python/ha-ffmpeg-3.0.2[${PYTHON_USEDEP}] )
-	fibaro? ( ~dev-python/fiblary3-0.1.7[${PYTHON_USEDEP}] )
-	fido? ( ~dev-python/pyfido-2.1.1[${PYTHON_USEDEP}] )
-	fints? ( ~dev-python/fints-1.0.1[${PYTHON_USEDEP}] )
-	fireservicerota? ( ~dev-python/pyfireservicerota-0.0.40[${PYTHON_USEDEP}] )
-	firmata? ( ~dev-python/pymata-express-1.19[${PYTHON_USEDEP}] )
-	fitbit? ( ~dev-python/fitbit-0.3.1[${PYTHON_USEDEP}] )
-	fixer? ( ~dev-python/fixerio-1.0.0_alpha0[${PYTHON_USEDEP}] )
-	fleetgo? ( ~dev-python/ritassist-0.9.2[${PYTHON_USEDEP}] )
-	flexit? ( ~dev-python/pyflexit-0.3[${PYTHON_USEDEP}] )
-	flic? ( ~dev-python/pyflic-2.0.3[${PYTHON_USEDEP}] )
-	flick_electric? ( ~dev-python/PyFlick-0.0.2[${PYTHON_USEDEP}] )
-	flo? ( ~dev-python/aioflo-0.4.1[${PYTHON_USEDEP}] )
-	flume? ( ~dev-python/PyFlume-0.5.5[${PYTHON_USEDEP}] )
-	flunearyou? ( ~dev-python/pyflunearyou-1.0.7[${PYTHON_USEDEP}] )
-	flux_led? ( ~dev-python/flux-led-0.22[${PYTHON_USEDEP}] )
-	folder_watcher? ( ~dev-python/watchdog-2.1.2[${PYTHON_USEDEP}] )
-	foobot? ( ~dev-python/foobot_async-1.0.0[${PYTHON_USEDEP}] )
-	forked_daapd? ( ~dev-python/pyforked-daapd-0.1.11[${PYTHON_USEDEP}] ~dev-python/pylibrespot-java-0.1.0[${PYTHON_USEDEP}] )
-	fortios? ( ~dev-python/fortiosapi-0.10.8[${PYTHON_USEDEP}] )
-	foscam? ( ~dev-python/libpyfoscam-1.0[${PYTHON_USEDEP}] )
-	freebox? ( ~dev-python/freebox-api-0.0.10[${PYTHON_USEDEP}] )
-	free_mobile? ( ~dev-python/freesms-0.2.0[${PYTHON_USEDEP}] )
-	fritz? ( ~dev-python/fritzconnection-1.4.2[${PYTHON_USEDEP}] )
-	fritzbox? ( ~dev-python/pyfritzhome-0.4.2[${PYTHON_USEDEP}] )
-	fritzbox_callmonitor? ( ~dev-python/fritzconnection-1.4.2[${PYTHON_USEDEP}] )
-	fritzbox_netmonitor? ( ~dev-python/fritzconnection-1.4.2[${PYTHON_USEDEP}] )
-	fronius? ( ~dev-python/PyFronius-0.4.6[${PYTHON_USEDEP}] )
-	frontier_silicon? ( ~dev-python/afsapi-0.0.4[${PYTHON_USEDEP}] )
-	futurenow? ( ~dev-python/pyfnip-0.2[${PYTHON_USEDEP}] )
-	garages_amsterdam? ( ~dev-python/garages-amsterdam-2.1.1[${PYTHON_USEDEP}] )
-	garmin_connect? ( ~dev-python/garminconnect-ha-0.1.6[${PYTHON_USEDEP}] )
-	gc100? ( ~dev-python/python-gc100-1.0.3_alpha0[${PYTHON_USEDEP}] )
-	gdacs? ( ~dev-python/aio-georss-gdacs-0.4[${PYTHON_USEDEP}] )
-	geizhals? ( ~dev-python/geizhals-0.0.9[${PYTHON_USEDEP}] )
-	geniushub? ( ~dev-python/geniushub-client-0.6.30[${PYTHON_USEDEP}] )
-	geonetnz_quakes? ( ~dev-python/aio-geojson-geonetnz-quakes-0.12[${PYTHON_USEDEP}] )
-	geonetnz_volcano? ( ~dev-python/aio-geojson-geonetnz-volcano-0.5[${PYTHON_USEDEP}] )
-	geo_json_events? ( ~dev-python/geojson-client-0.6[${PYTHON_USEDEP}] )
-	geo_rss_events? ( ~dev-python/georss-generic-client-0.4[${PYTHON_USEDEP}] )
-	gios? ( ~dev-python/gios-1.0.1[${PYTHON_USEDEP}] )
-	github? ( ~dev-python/PyGithub-1.43.8[${PYTHON_USEDEP}] )
-	gitlab_ci? ( ~dev-python/python-gitlab-1.6.0[${PYTHON_USEDEP}] )
-	gitter? ( ~dev-python/gitterpy-0.1.7[${PYTHON_USEDEP}] )
-	glances? ( ~dev-python/glances_api-0.2.0[${PYTHON_USEDEP}] )
-	gntp? ( ~dev-python/gntp-1.0.3[${PYTHON_USEDEP}] )
-	goalfeed? ( ~dev-python/Pysher-1.0.1[${PYTHON_USEDEP}] )
-	goalzero? ( ~dev-python/goalzero-0.1.7[${PYTHON_USEDEP}] )
-	gogogate2? ( ~dev-python/ismartgate-4.0.0[${PYTHON_USEDEP}] )
-	google? ( ~dev-python/google-api-python-client-1.6.4[${PYTHON_USEDEP}] ~dev-python/httplib2-0.19.0[${PYTHON_USEDEP}] ~dev-python/oauth2client-4.0.0[${PYTHON_USEDEP}] )
-	google_maps? ( ~dev-python/locationsharinglib-4.1.5[${PYTHON_USEDEP}] )
-	google_pubsub? ( ~dev-python/google-cloud-pubsub-2.1.0[${PYTHON_USEDEP}] )
-	google_travel_time? ( ~dev-python/googlemaps-2.5.1[${PYTHON_USEDEP}] )
-	gpmdp? ( ~dev-python/websocket-client-0.54.0[${PYTHON_USEDEP}] )
-	gpsd? ( ~dev-python/gps3-0.33.3[${PYTHON_USEDEP}] )
-	gree? ( ~dev-python/greeclimate-0.11.4[${PYTHON_USEDEP}] )
-	greeneye_monitor? ( ~dev-python/greeneye-monitor-2.1[${PYTHON_USEDEP}] )
-	greenwave? ( ~dev-python/greenwavereality-0.5.1[${PYTHON_USEDEP}] )
-	griddy? ( ~dev-python/griddypower-0.1.0[${PYTHON_USEDEP}] )
-	growatt_server? ( ~dev-python/growattServer-1.0.1[${PYTHON_USEDEP}] )
-	gstreamer? ( ~dev-python/gstreamer-player-1.1.2[${PYTHON_USEDEP}] )
-	gtfs? ( ~dev-python/pygtfs-0.1.5[${PYTHON_USEDEP}] )
-	guardian? ( ~dev-python/aioguardian-1.0.4[${PYTHON_USEDEP}] )
-	habitica? ( ~dev-python/habitipy-0.2.0[${PYTHON_USEDEP}] )
-	hangouts? ( ~dev-python/hangups-0.4.11[${PYTHON_USEDEP}] )
-	harman_kardon_avr? ( ~dev-python/hkavr-0.0.5[${PYTHON_USEDEP}] )
-	harmony? ( ~dev-python/aioharmony-0.2.7[${PYTHON_USEDEP}] )
-	hdmi_cec? ( ~dev-python/pyCEC-0.5.1[${PYTHON_USEDEP}] )
-	heatmiser? ( ~dev-python/heatmiserV3-1.1.18[${PYTHON_USEDEP}] )
-	heos? ( ~dev-python/pyheos-0.7.2[${PYTHON_USEDEP}] )
-	here_travel_time? ( ~dev-python/herepy-2.0.0[${PYTHON_USEDEP}] )
-	hikvision? ( ~dev-python/pyHik-0.2.8[${PYTHON_USEDEP}] )
-	hikvisioncam? ( ~dev-python/hikvision-0.4[${PYTHON_USEDEP}] )
-	hisense_aehw4a1? ( ~dev-python/pyaehw4a1-0.3.9[${PYTHON_USEDEP}] )
-	hive? ( ~dev-python/pyhiveapi-0.4.2[${PYTHON_USEDEP}] )
-	hlk_sw16? ( ~dev-python/hlk-sw16-0.0.9[${PYTHON_USEDEP}] )
-	homekit? ( ~dev-python/HAP-python-3.5.0[${PYTHON_USEDEP}] ~dev-python/fnvhash-0.1.0[${PYTHON_USEDEP}] ~dev-python/pyqrcode-1.2.1[${PYTHON_USEDEP}] ~dev-python/base36-0.1.1[${PYTHON_USEDEP}] ~dev-python/PyTurboJPEG-1.5.0[${PYTHON_USEDEP}] )
-	homekit_controller? ( ~dev-python/aiohomekit-0.2.67[${PYTHON_USEDEP}] )
-	homematic? ( ~dev-python/pyhomematic-0.1.72[${PYTHON_USEDEP}] )
-	homematicip_cloud? ( ~dev-python/homematicip-0.13.1[${PYTHON_USEDEP}] )
-	homeworks? ( ~dev-python/pyhomeworks-0.0.6[${PYTHON_USEDEP}] )
-	home_connect? ( ~dev-python/homeconnect-0.6.3[${PYTHON_USEDEP}] )
-	home_plus_control? ( ~dev-python/homepluscontrol-0.0.5[${PYTHON_USEDEP}] )
-	honeywell? ( ~dev-python/somecomfort-0.5.2[${PYTHON_USEDEP}] )
-	horizon? ( ~dev-python/horimote-0.4.1[${PYTHON_USEDEP}] )
-	hp_ilo? ( ~dev-python/python-hpilo-4.3[${PYTHON_USEDEP}] )
-	html5? ( ~dev-python/pywebpush-1.9.2[${PYTHON_USEDEP}] )
-	http? ( ~dev-python/aiohttp-cors-0.7.0[${PYTHON_USEDEP}] )
-	htu21d? ( ~dev-python/i2csense-0.0.4[${PYTHON_USEDEP}] ~dev-python/smbus-cffi-0.5.1[${PYTHON_USEDEP}] )
-	huawei_lte? ( ~dev-python/getmac-0.8.2[${PYTHON_USEDEP}] ~dev-python/huawei-lte-api-1.4.18[${PYTHON_USEDEP}] ~dev-python/stringcase-1.2.0[${PYTHON_USEDEP}] ~dev-python/url-normalize-1.4.1[${PYTHON_USEDEP}] )
-	hue? ( ~dev-python/aiohue-2.5.0[${PYTHON_USEDEP}] )
-	huisbaasje? ( ~dev-python/huisbaasje-client-0.1.0[${PYTHON_USEDEP}] )
-	hunterdouglas_powerview? ( ~dev-python/aiopvapi-1.6.14[${PYTHON_USEDEP}] )
-	hvv_departures? ( ~dev-python/pygti-0.9.2[${PYTHON_USEDEP}] )
-	hydrawise? ( ~dev-python/Hydrawiser-0.2[${PYTHON_USEDEP}] )
-	hyperion? ( ~dev-python/hyperion-py-0.7.4[${PYTHON_USEDEP}] )
-	ialarm? ( ~dev-python/pyialarm-1.9.0[${PYTHON_USEDEP}] )
-	iammeter? ( ~dev-python/iammeter-0.1.7[${PYTHON_USEDEP}] )
-	iaqualink? ( ~dev-python/iaqualink-0.3.90[${PYTHON_USEDEP}] )
-	icloud? ( ~dev-python/pyicloud-0.10.2[${PYTHON_USEDEP}] )
-	idteck_prox? ( ~dev-python/rfk101py-0.0.1[${PYTHON_USEDEP}] )
-	ifttt? ( ~dev-python/pyfttt-0.3.2[${PYTHON_USEDEP}] )
-	iglo? ( ~dev-python/iglo-1.2.7[${PYTHON_USEDEP}] )
-	ign_sismologia? ( ~dev-python/georss-ign-sismologia-client-0.2[${PYTHON_USEDEP}] )
-	ihc? ( ~dev-python/defusedxml-0.7.1[${PYTHON_USEDEP}] ~dev-python/ihcsdk-2.7.0[${PYTHON_USEDEP}] )
-	image? ( ~dev-python/pillow-8.1.2[${PYTHON_USEDEP}] )
-	imap? ( ~dev-python/aioimaplib-0.7.15[${PYTHON_USEDEP}] )
-	incomfort? ( ~dev-python/incomfort-client-0.4.4[${PYTHON_USEDEP}] )
-	influxdb? ( ~dev-python/influxdb-5.2.3[${PYTHON_USEDEP}] ~dev-python/influxdb-client-1.14.0[${PYTHON_USEDEP}] )
-	insteon? ( ~dev-python/pyinsteon-1.0.9[${PYTHON_USEDEP}] )
-	intesishome? ( ~dev-python/pyintesishome-1.7.6[${PYTHON_USEDEP}] )
-	iota? ( ~dev-python/PyOTA-2.0.5[${PYTHON_USEDEP}] )
-	iperf3? ( ~dev-python/iperf3-0.1.11[${PYTHON_USEDEP}] )
-	ipma? ( ~dev-python/pyipma-2.0.5[${PYTHON_USEDEP}] )
-	ipp? ( ~dev-python/pyipp-0.11.0[${PYTHON_USEDEP}] )
-	iqvia? ( ~dev-python/numpy-1.20.3[${PYTHON_USEDEP}] ~dev-python/pyiqvia-1.0.0[${PYTHON_USEDEP}] )
-	irish_rail_transport? ( ~dev-python/pyirishrail-0.0.2[${PYTHON_USEDEP}] )
-	islamic_prayer_times? ( ~dev-python/prayer_times_calculator-0.0.3[${PYTHON_USEDEP}] )
-	iss? ( ~dev-python/pyiss-1.0.1[${PYTHON_USEDEP}] )
-	isy994? ( ~dev-python/pyisy-3.0.0[${PYTHON_USEDEP}] )
-	itach? ( ~dev-python/pyitachip2ir-0.0.7[${PYTHON_USEDEP}] )
-	izone? ( ~dev-python/python-izone-1.1.4[${PYTHON_USEDEP}] )
-	jewish_calendar? ( ~dev-python/hdate-0.10.2[${PYTHON_USEDEP}] )
-	joaoapps_join? ( ~dev-python/python-join-api-0.0.6[${PYTHON_USEDEP}] )
-	juicenet? ( ~dev-python/python-juicenet-1.0.2[${PYTHON_USEDEP}] )
-	kaiterra? ( ~dev-python/kaiterra-async-client-0.0.2[${PYTHON_USEDEP}] )
-	keenetic_ndms2? ( ~dev-python/ndms2-client-0.1.1[${PYTHON_USEDEP}] )
-	kef? ( ~dev-python/aiokef-0.2.16[${PYTHON_USEDEP}] ~dev-python/getmac-0.8.2[${PYTHON_USEDEP}] )
-	keyboard? ( ~dev-python/PyUserInput-0.1.11[${PYTHON_USEDEP}] )
-	keyboard_remote? ( ~dev-python/evdev-1.4.0[${PYTHON_USEDEP}] ~dev-python/aionotify-0.2.0[${PYTHON_USEDEP}] )
-	kira? ( ~dev-python/pykira-0.1.1[${PYTHON_USEDEP}] )
-	kiwi? ( ~dev-python/kiwiki-client-0.1.1[${PYTHON_USEDEP}] )
-	kmtronic? ( ~dev-python/pykmtronic-0.3.0[${PYTHON_USEDEP}] )
-	knx? ( ~dev-python/xknx-0.18.4[${PYTHON_USEDEP}] )
-	kodi? ( ~dev-python/pykodi-0.2.5[${PYTHON_USEDEP}] )
-	konnected? ( ~dev-python/konnected-1.2.0[${PYTHON_USEDEP}] )
-	kostal_plenticore? ( ~dev-python/kostal-plenticore-0.2.0[${PYTHON_USEDEP}] )
-	kraken? ( ~dev-python/krakenex-2.1.0[${PYTHON_USEDEP}] ~dev-python/pykrakenapi-0.1.8[${PYTHON_USEDEP}] )
-	kulersky? ( ~dev-python/pykulersky-0.5.2[${PYTHON_USEDEP}] )
-	kwb? ( ~dev-python/pykwb-0.0.8[${PYTHON_USEDEP}] )
-	lacrosse? ( ~dev-python/pylacrosse-0.4[${PYTHON_USEDEP}] )
-	lametric? ( ~dev-python/lmnotify-0.0.4[${PYTHON_USEDEP}] )
-	lastfm? ( ~dev-python/pylast-4.2.0[${PYTHON_USEDEP}] )
-	launch_library? ( ~dev-python/pylaunches-1.0.0[${PYTHON_USEDEP}] )
-	lcn? ( ~dev-python/pypck-0.7.9[${PYTHON_USEDEP}] )
-	lg_netcast? ( ~dev-python/pylgnetcast-0.3.3[${PYTHON_USEDEP}] )
-	lg_soundbar? ( ~dev-python/temescal-0.3[${PYTHON_USEDEP}] )
-	life360? ( ~dev-python/life360-4.1.1[${PYTHON_USEDEP}] )
-	lifx? ( ~dev-python/aiolifx-0.6.9[${PYTHON_USEDEP}] ~dev-python/aiolifx-effects-0.2.2[${PYTHON_USEDEP}] )
-	lifx_legacy? ( ~dev-python/liffylights-0.9.4[${PYTHON_USEDEP}] )
-	lightwave? ( ~dev-python/lightwave-0.19[${PYTHON_USEDEP}] )
-	limitlessled? ( ~dev-python/limitlessled-1.1.3[${PYTHON_USEDEP}] )
-	linode? ( ~dev-python/linode-api-4.1.9_beta1[${PYTHON_USEDEP}] )
-	linux_battery? ( ~dev-python/batinfo-0.4.2[${PYTHON_USEDEP}] )
-	lirc? ( ~dev-python/python-lirc-1.2.3[${PYTHON_USEDEP}] )
-	litejet? ( ~dev-python/pylitejet-0.3.0[${PYTHON_USEDEP}] )
-	litterrobot? ( ~dev-python/pylitterbot-2021.3.1[${PYTHON_USEDEP}] )
-	logi_circle? ( ~dev-python/logi-circle-0.2.2[${PYTHON_USEDEP}] )
-	loopenergy? ( ~dev-python/pyloopenergy-0.2.1[${PYTHON_USEDEP}] )
-	luci? ( ~dev-python/openwrt-luci-rpc-1.1.8[${PYTHON_USEDEP}] )
-	luftdaten? ( ~dev-python/luftdaten-0.6.5[${PYTHON_USEDEP}] )
-	lupusec? ( ~dev-python/lupupy-0.0.18[${PYTHON_USEDEP}] )
-	lutron? ( ~dev-python/pylutron-0.2.7[${PYTHON_USEDEP}] )
-	lutron_caseta? ( ~dev-python/pylutron-caseta-0.10.0[${PYTHON_USEDEP}] ~dev-python/aiolip-1.1.4[${PYTHON_USEDEP}] )
-	lw12wifi? ( ~dev-python/lw12-0.9.2[${PYTHON_USEDEP}] )
-	lyft? ( ~dev-python/lyft_rides-0.2[${PYTHON_USEDEP}] )
-	lyric? ( ~dev-python/aiolyric-1.0.7[${PYTHON_USEDEP}] )
-	magicseaweed? ( ~dev-python/magicseaweed-1.0.3[${PYTHON_USEDEP}] )
-	mailgun? ( ~dev-python/pymailgunner-1.4[${PYTHON_USEDEP}] )
-	marytts? ( ~dev-python/speak2mary-1.4.0[${PYTHON_USEDEP}] )
-	mastodon? ( ~dev-python/Mastodon-py-1.5.1[${PYTHON_USEDEP}] )
-	matrix? ( ~dev-python/matrix-client-0.3.2[${PYTHON_USEDEP}] )
-	maxcube? ( ~dev-python/maxcube-api-0.4.3[${PYTHON_USEDEP}] )
-	mazda? ( ~dev-python/pymazda-0.1.6[${PYTHON_USEDEP}] )
-	mcp23017? ( ~dev-python/RPi-GPIO-0.7.1_alpha4[${PYTHON_USEDEP}] ~dev-python/adafruit-circuitpython-mcp230xx-2.2.2[${PYTHON_USEDEP}] )
-	mediaroom? ( ~dev-python/pymediaroom-0.6.4.1[${PYTHON_USEDEP}] )
-	media_extractor? ( ~dev-python/youtube_dl-2021.4.26[${PYTHON_USEDEP}] )
-	melcloud? ( ~dev-python/pymelcloud-2.5.3[${PYTHON_USEDEP}] )
-	melissa? ( ~dev-python/py-melissa-climate-2.1.4[${PYTHON_USEDEP}] )
-	message_bird? ( ~dev-python/messagebird-1.2.0[${PYTHON_USEDEP}] )
-	met? ( ~dev-python/PyMetno-0.8.3[${PYTHON_USEDEP}] )
-	meteoalarm? ( ~dev-python/meteoalertapi-0.1.6[${PYTHON_USEDEP}] )
-	meteoclimatic? ( ~dev-python/pymeteoclimatic-0.0.6[${PYTHON_USEDEP}] )
-	meteo_france? ( ~dev-python/meteofrance-api-1.0.2[${PYTHON_USEDEP}] )
-	metoffice? ( ~dev-python/datapoint-0.9.5[${PYTHON_USEDEP}] )
-	met_eireann? ( ~dev-python/PyMetEireann-0.2[${PYTHON_USEDEP}] )
-	mfi? ( ~dev-python/mficlient-0.3.0[${PYTHON_USEDEP}] )
-	mhz19? ( ~dev-python/pmsensor-0.4[${PYTHON_USEDEP}] )
-	microsoft? ( ~dev-python/pycsspeechtts-1.0.4[${PYTHON_USEDEP}] )
-	miflora? ( ~dev-python/bluepy-1.3.0[${PYTHON_USEDEP}] ~dev-python/miflora-0.7.0[${PYTHON_USEDEP}] )
-	mikrotik? ( ~dev-python/librouteros-3.0.0[${PYTHON_USEDEP}] )
-	mill? ( ~dev-python/millheater-0.4.1[${PYTHON_USEDEP}] )
-	minio? ( ~dev-python/minio-4.0.9[${PYTHON_USEDEP}] )
-	mitemp_bt? ( ~dev-python/mitemp-bt-0.0.3[${PYTHON_USEDEP}] )
-	mobile_app? ( ~dev-python/pynacl-1.3.0[${PYTHON_USEDEP}] ~dev-python/emoji-1.2.0[${PYTHON_USEDEP}] )
-	mochad? ( ~dev-python/pymochad-0.2.0[${PYTHON_USEDEP}] )
-	modbus? ( ~dev-python/pymodbus-2.5.2[${PYTHON_USEDEP}] )
-	modem_callerid? ( ~dev-python/basicmodem-0.7[${PYTHON_USEDEP}] )
-	monoprice? ( ~dev-python/pymonoprice-0.3[${PYTHON_USEDEP}] )
-	motioneye? ( ~dev-python/motioneye-client-0.3.6[${PYTHON_USEDEP}] )
-	motion_blinds? ( ~dev-python/motionblinds-0.4.10[${PYTHON_USEDEP}] )
-	mpd? ( ~dev-python/python-mpd2-3.0.4[${PYTHON_USEDEP}] )
-	mqtt? ( ~dev-python/paho-mqtt-1.5.1[${PYTHON_USEDEP}] )
-	msteams? ( ~dev-python/pymsteams-0.1.12[${PYTHON_USEDEP}] )
-	mullvad? ( ~dev-python/mullvad-api-1.0.0[${PYTHON_USEDEP}] )
-	mutesync? ( ~dev-python/mutesync-0.0.1[${PYTHON_USEDEP}] )
-	mvglive? ( ~dev-python/PyMVGLive-1.1.4[${PYTHON_USEDEP}] )
-	mychevy? ( ~dev-python/mychevy-2.1.1[${PYTHON_USEDEP}] )
-	mycroft? ( ~dev-python/mycroftapi-2.0[${PYTHON_USEDEP}] )
-	myq? ( ~dev-python/pymyq-3.0.4[${PYTHON_USEDEP}] )
-	mysensors? ( ~dev-python/pymysensors-0.21.0[${PYTHON_USEDEP}] )
-	mysql? ( dev-python/mysql-connector-python[${PYTHON_USEDEP}] dev-python/mysqlclient[${PYTHON_USEDEP}] )
-	mystrom? ( ~dev-python/python-mystrom-1.1.2[${PYTHON_USEDEP}] )
-	mythicbeastsdns? ( ~dev-python/mbddns-0.1.2[${PYTHON_USEDEP}] )
-	n26? ( ~dev-python/n26-0.2.7[${PYTHON_USEDEP}] )
-	nad? ( ~dev-python/nad-receiver-0.0.12[${PYTHON_USEDEP}] )
-	nam? ( ~dev-python/nettigo-air-monitor-0.2.6[${PYTHON_USEDEP}] )
-	nanoleaf? ( ~dev-python/pynanoleaf-0.1.0[${PYTHON_USEDEP}] )
-	neato? ( ~dev-python/pybotvac-0.0.20[${PYTHON_USEDEP}] )
-	nederlandse_spoorwegen? ( ~dev-python/nsapi-3.0.4[${PYTHON_USEDEP}] )
-	nello? ( ~dev-python/pynello-2.0.3[${PYTHON_USEDEP}] )
-	ness_alarm? ( ~dev-python/nessclient-0.9.15[${PYTHON_USEDEP}] )
-	nest? ( ~dev-python/python-nest-4.1.0[${PYTHON_USEDEP}] ~dev-python/google-nest-sdm-0.2.12[${PYTHON_USEDEP}] )
-	netatmo? ( ~dev-python/pyatmo-5.0.1[${PYTHON_USEDEP}] )
-	netdata? ( ~dev-python/netdata-0.2.0[${PYTHON_USEDEP}] )
-	netgear? ( ~dev-python/pynetgear-0.6.1[${PYTHON_USEDEP}] )
-	netgear_lte? ( ~dev-python/eternalegypt-0.0.12[${PYTHON_USEDEP}] )
-	netio? ( ~dev-python/pynetio-0.1.9.1[${PYTHON_USEDEP}] )
-	network? ( ~dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}] )
-	neurio_energy? ( ~dev-python/neurio-0.3.1[${PYTHON_USEDEP}] )
-	nexia? ( ~dev-python/nexia-0.9.7[${PYTHON_USEDEP}] )
-	nextbus? ( ~dev-python/py-nextbusnext-0.1.4[${PYTHON_USEDEP}] )
-	nextcloud? ( ~dev-python/nextcloudmonitor-1.1.0[${PYTHON_USEDEP}] )
-	nightscout? ( ~dev-python/py-nightscout-1.2.2[${PYTHON_USEDEP}] )
-	niko_home_control? ( ~dev-python/niko-home-control-0.2.1[${PYTHON_USEDEP}] )
-	nilu? ( ~dev-python/niluclient-0.1.2[${PYTHON_USEDEP}] )
-	nissan_leaf? ( ~dev-python/pycarwings2-2.10[${PYTHON_USEDEP}] )
-	nmap_tracker? ( ~dev-python/python-nmap-0.6.1[${PYTHON_USEDEP}] ~dev-python/getmac-0.8.2[${PYTHON_USEDEP}] )
-	nmbs? ( ~dev-python/pyrail-0.0.3[${PYTHON_USEDEP}] )
-	noaa_tides? ( ~dev-python/noaa-coops-0.1.8[${PYTHON_USEDEP}] )
-	norway_air? ( ~dev-python/PyMetno-0.8.3[${PYTHON_USEDEP}] )
-	notify_events? ( ~dev-python/notify-events-1.0.4[${PYTHON_USEDEP}] )
-	notion? ( ~dev-python/aionotion-1.1.0[${PYTHON_USEDEP}] )
-	nsw_fuel_station? ( ~dev-python/nsw-fuel-api-client-1.0.10[${PYTHON_USEDEP}] )
-	nsw_rural_fire_service_feed? ( ~dev-python/aio-geojson-nsw-rfs-incidents-0.3[${PYTHON_USEDEP}] )
-	nuheat? ( ~dev-python/nuheat-0.3.0[${PYTHON_USEDEP}] )
-	nuimo_controller? ( ~dev-python/nuimo-0.1.0[${PYTHON_USEDEP}] )
-	nuki? ( ~dev-python/pynuki-1.4.1[${PYTHON_USEDEP}] )
-	numato? ( ~dev-python/numato-gpio-0.10.0[${PYTHON_USEDEP}] )
-	nut? ( ~dev-python/pynut2-2.1.2[${PYTHON_USEDEP}] )
-	nws? ( ~dev-python/pynws-1.3.0[${PYTHON_USEDEP}] )
-	nx584? ( ~dev-python/pynx584-0.5[${PYTHON_USEDEP}] )
-	nzbget? ( ~dev-python/pynzbgetapi-0.2.0[${PYTHON_USEDEP}] )
-	oasa_telematics? ( ~dev-python/oasatelematics-0.3[${PYTHON_USEDEP}] )
-	obihai? ( ~dev-python/pyobihai-1.3.1[${PYTHON_USEDEP}] )
-	oem? ( ~dev-python/oemthermostat-1.1.1[${PYTHON_USEDEP}] )
-	ohmconnect? ( ~dev-python/defusedxml-0.7.1[${PYTHON_USEDEP}] )
-	ombi? ( ~dev-python/pyombi-0.1.10[${PYTHON_USEDEP}] )
-	omnilogic? ( ~dev-python/omnilogic-0.4.5[${PYTHON_USEDEP}] )
-	ondilo_ico? ( ~dev-python/ondilo-0.2.0[${PYTHON_USEDEP}] )
-	onewire? ( ~dev-python/pyownet-0.10.0[${PYTHON_USEDEP}] ~dev-python/pi1wire-0.1.0[${PYTHON_USEDEP}] )
-	onkyo? ( ~dev-python/onkyo-eiscp-1.2.7[${PYTHON_USEDEP}] )
-	onvif? ( ~dev-python/onvif-zeep-async-1.0.0[${PYTHON_USEDEP}] ~dev-python/WSDiscovery-2.0.0[${PYTHON_USEDEP}] ~dev-python/zeep-4.0.0[${PYTHON_USEDEP}] )
-	openerz? ( ~dev-python/openerz-api-0.1.0[${PYTHON_USEDEP}] )
-	openevse? ( ~dev-python/openevsewifi-1.1.0[${PYTHON_USEDEP}] )
-	opengarage? ( ~dev-python/open-garage-0.1.4[${PYTHON_USEDEP}] )
-	openhome? ( ~dev-python/openhomedevice-2.0.1[${PYTHON_USEDEP}] )
-	opensensemap? ( ~dev-python/opensensemap-api-0.1.5[${PYTHON_USEDEP}] )
-	opentherm_gw? ( ~dev-python/pyotgw-1.1_beta1[${PYTHON_USEDEP}] )
-	openuv? ( ~dev-python/pyopenuv-1.0.9[${PYTHON_USEDEP}] )
-	openweathermap? ( ~dev-python/pyowm-3.2.0[${PYTHON_USEDEP}] )
-	opnsense? ( ~dev-python/pyopnsense-0.2.0[${PYTHON_USEDEP}] )
-	opple? ( ~dev-python/pyoppleio-1.0.5[${PYTHON_USEDEP}] )
-	orangepi_gpio? ( ~dev-python/OPi-GPIO-0.4.0[${PYTHON_USEDEP}] )
-	oru? ( ~dev-python/oru-0.1.11[${PYTHON_USEDEP}] )
-	orvibo? ( ~dev-python/orvibo-1.1.1[${PYTHON_USEDEP}] )
-	osramlightify? ( ~dev-python/lightify-1.0.7.3[${PYTHON_USEDEP}] )
-	otp? ( ~dev-python/pyotp-2.3.0[${PYTHON_USEDEP}] )
-	ovo_energy? ( ~dev-python/ovoenergy-1.1.12[${PYTHON_USEDEP}] )
-	owntracks? ( ~dev-python/pynacl-1.3.0[${PYTHON_USEDEP}] )
-	ozw? ( ~dev-python/python-openzwave-mqtt-1.4.0[${PYTHON_USEDEP}] )
-	panasonic_bluray? ( ~dev-python/panacotta-0.1[${PYTHON_USEDEP}] )
-	panasonic_viera? ( ~dev-python/panasonic-viera-0.3.6[${PYTHON_USEDEP}] )
-	pandora? ( ~dev-python/pexpect-4.6.0[${PYTHON_USEDEP}] )
-	pcal9535a? ( ~dev-python/pcal9535a-0.7[${PYTHON_USEDEP}] )
-	pencom? ( ~dev-python/pencompy-0.0.3[${PYTHON_USEDEP}] )
-	philips_js? ( ~dev-python/ha-philipsjs-2.7.3[${PYTHON_USEDEP}] )
-	pi4ioe5v9xxxx? ( ~dev-python/pi4ioe5v9xxxx-0.0.2[${PYTHON_USEDEP}] )
-	picnic? ( ~dev-python/python-picnic-api-1.1.0[${PYTHON_USEDEP}] )
-	piglow? ( ~dev-python/piglow-1.2.4[${PYTHON_USEDEP}] )
-	pilight? ( ~dev-python/pilight-0.1.1[${PYTHON_USEDEP}] )
-	ping? ( ~dev-python/icmplib-2.1.1[${PYTHON_USEDEP}] )
-	pi_hole? ( ~dev-python/hole-0.5.1[${PYTHON_USEDEP}] )
-	pjlink? ( ~dev-python/pypjlink2-1.2.1[${PYTHON_USEDEP}] )
-	plaato? ( ~dev-python/pyplaato-0.0.15[${PYTHON_USEDEP}] )
-	plex? ( ~dev-python/PlexAPI-4.5.1[${PYTHON_USEDEP}] ~dev-python/plexauth-0.0.6[${PYTHON_USEDEP}] ~dev-python/plexwebsocket-0.0.13[${PYTHON_USEDEP}] )
-	plugwise? ( ~dev-python/plugwise-0.8.5[${PYTHON_USEDEP}] )
-	plum_lightpad? ( ~dev-python/plumlightpad-0.0.11[${PYTHON_USEDEP}] )
-	pocketcasts? ( ~dev-python/pycketcasts-1.0.0[${PYTHON_USEDEP}] )
-	point? ( ~dev-python/pypoint-2.1.0[${PYTHON_USEDEP}] )
-	poolsense? ( ~dev-python/poolsense-0.0.8[${PYTHON_USEDEP}] )
-	powerwall? ( ~dev-python/tesla-powerwall-0.3.10[${PYTHON_USEDEP}] )
-	profiler? ( ~dev-python/pyprof2calltree-1.4.5[${PYTHON_USEDEP}] ~dev-python/guppy3-3.1.0[${PYTHON_USEDEP}] ~dev-python/objgraph-3.4.1[${PYTHON_USEDEP}] )
-	progettihwsw? ( ~dev-python/ProgettiHWSW-0.1.1[${PYTHON_USEDEP}] )
-	proliphix? ( ~dev-python/proliphix-0.4.1[${PYTHON_USEDEP}] )
-	prometheus? ( ~dev-python/prometheus_client-0.7.1[${PYTHON_USEDEP}] )
-	proxmoxve? ( ~dev-python/proxmoxer-1.1.1[${PYTHON_USEDEP}] )
-	proxy? ( ~dev-python/pillow-8.1.2[${PYTHON_USEDEP}] )
-	ps4? ( ~dev-python/pyps4-2ndscreen-1.2.0[${PYTHON_USEDEP}] )
-	ptvsd? ( ~dev-python/ptvsd-4.3.2[${PYTHON_USEDEP}] )
-	pulseaudio_loopback? ( ~dev-python/pulsectl-20.2.4[${PYTHON_USEDEP}] )
-	pushbullet? ( ~dev-python/pushbullet-py-0.11.0[${PYTHON_USEDEP}] )
-	pushover? ( ~dev-python/pushover_complete-1.1.1[${PYTHON_USEDEP}] )
-	python_script? ( ~dev-python/RestrictedPython-5.1[${PYTHON_USEDEP}] )
-	qbittorrent? ( ~dev-python/python-qbittorrent-0.4.2[${PYTHON_USEDEP}] )
-	qld_bushfire? ( ~dev-python/georss-qld-bushfire-alert-client-0.3[${PYTHON_USEDEP}] )
-	qnap? ( ~dev-python/qnapstats-0.3.1[${PYTHON_USEDEP}] )
-	qrcode? ( ~dev-python/pillow-8.1.2[${PYTHON_USEDEP}] ~dev-python/pyzbar-0.1.7[${PYTHON_USEDEP}] )
-	quantum_gateway? ( ~dev-python/quantum-gateway-0.0.5[${PYTHON_USEDEP}] )
-	qvr_pro? ( ~dev-python/pyqvrpro-0.52[${PYTHON_USEDEP}] )
-	qwikswitch? ( ~dev-python/pyqwikswitch-0.93[${PYTHON_USEDEP}] )
-	rachio? ( ~dev-python/RachioPy-1.0.3[${PYTHON_USEDEP}] )
-	radiotherm? ( ~dev-python/radiotherm-2.1.0[${PYTHON_USEDEP}] )
-	rainbird? ( ~dev-python/pyrainbird-0.4.2[${PYTHON_USEDEP}] )
-	raincloud? ( ~dev-python/raincloudy-0.0.7[${PYTHON_USEDEP}] )
-	rainforest_eagle? ( ~dev-python/eagle200-reader-0.2.4[${PYTHON_USEDEP}] ~dev-python/uEagle-0.0.2[${PYTHON_USEDEP}] )
-	rainmachine? ( ~dev-python/regenmaschine-3.0.0[${PYTHON_USEDEP}] )
-	raspihats? ( ~dev-python/raspihats-2.2.3[${PYTHON_USEDEP}] ~dev-python/smbus-cffi-0.5.1[${PYTHON_USEDEP}] )
-	raspyrfm? ( ~dev-python/raspyrfm-client-1.2.8[${PYTHON_USEDEP}] )
-	recollect_waste? ( ~dev-python/aiorecollect-1.0.5[${PYTHON_USEDEP}] )
-	recorder? ( ~dev-python/sqlalchemy-1.4.13[${PYTHON_USEDEP}] )
-	recswitch? ( ~dev-python/pyrecswitch-1.0.2[${PYTHON_USEDEP}] )
-	reddit? ( ~dev-python/praw-7.2.0[${PYTHON_USEDEP}] )
-	rejseplanen? ( ~dev-python/rjpl-0.3.6[${PYTHON_USEDEP}] )
-	remember_the_milk? ( ~dev-python/RtmAPI-0.7.2[${PYTHON_USEDEP}] ~dev-python/httplib2-0.19.0[${PYTHON_USEDEP}] )
-	remote_rpi_gpio? ( ~dev-python/gpiozero-1.5.1[${PYTHON_USEDEP}] )
-	repetier? ( ~dev-python/pyrepetier-3.0.5[${PYTHON_USEDEP}] )
-	rest? ( ~dev-python/jsonpath-0.82[${PYTHON_USEDEP}] ~dev-python/xmltodict-0.12.0[${PYTHON_USEDEP}] )
-	rflink? ( ~dev-python/rflink-0.0.58[${PYTHON_USEDEP}] )
-	rfxtrx? ( ~dev-python/pyRFXtrx-0.27.0[${PYTHON_USEDEP}] )
-	ring? ( ~dev-python/ring-doorbell-0.6.2[${PYTHON_USEDEP}] )
-	ripple? ( ~dev-python/python-ripple-api-0.0.3[${PYTHON_USEDEP}] )
-	risco? ( ~dev-python/pyrisco-0.3.1[${PYTHON_USEDEP}] )
-	rituals_perfume_genie? ( ~dev-python/pyrituals-0.0.3[${PYTHON_USEDEP}] )
-	rmvtransport? ( ~dev-python/PyRMVtransport-0.3.2[${PYTHON_USEDEP}] )
-	rocketchat? ( ~dev-python/rocketchat-API-0.6.1[${PYTHON_USEDEP}] )
-	roku? ( ~dev-python/rokuecp-0.8.1[${PYTHON_USEDEP}] )
-	roomba? ( ~dev-python/roombapy-1.6.3[${PYTHON_USEDEP}] )
-	roon? ( ~dev-python/roonapi-0.0.37[${PYTHON_USEDEP}] )
-	route53? ( ~dev-python/boto3-1.16.52[${PYTHON_USEDEP}] )
-	rova? ( ~dev-python/rova-0.2.1[${PYTHON_USEDEP}] )
-	rpi_gpio? ( ~dev-python/RPi-GPIO-0.7.1_alpha4[${PYTHON_USEDEP}] )
-	rpi_gpio_pwm? ( ~dev-python/pwmled-1.6.7[${PYTHON_USEDEP}] )
-	rpi_pfio? ( ~dev-python/pifacecommon-4.2.2[${PYTHON_USEDEP}] ~dev-python/pifacedigitalio-3.0.5[${PYTHON_USEDEP}] )
-	rpi_power? ( ~dev-python/rpi-bad-power-0.1.0[${PYTHON_USEDEP}] )
-	rpi_rf? ( ~dev-python/rpi-rf-0.9.7[${PYTHON_USEDEP}] )
-	ruckus_unleashed? ( ~dev-python/pyruckus-0.12[${PYTHON_USEDEP}] )
-	russound_rio? ( ~dev-python/russound-rio-0.1.7[${PYTHON_USEDEP}] )
-	russound_rnet? ( ~dev-python/russound-0.1.9[${PYTHON_USEDEP}] )
-	sabnzbd? ( ~dev-python/pysabnzbd-1.1.0[${PYTHON_USEDEP}] )
-	saj? ( ~dev-python/pysaj-0.0.16[${PYTHON_USEDEP}] )
-	salt? ( ~dev-python/saltbox-0.1.3[${PYTHON_USEDEP}] )
-	samsungtv? ( ~dev-python/samsungctl-0.7.1[${PYTHON_USEDEP}] ~dev-python/samsungtvws-1.6.0[${PYTHON_USEDEP}] ~dev-python/wakeonlan-2.0.1[${PYTHON_USEDEP}] )
-	satel_integra? ( ~dev-python/satel-integra-0.3.4[${PYTHON_USEDEP}] )
-	schluter? ( ~dev-python/py-schluter-0.1.7[${PYTHON_USEDEP}] )
-	scrape? ( ~dev-python/beautifulsoup-4.9.3[${PYTHON_USEDEP}] )
-	screenlogic? ( ~dev-python/screenlogicpy-0.4.1[${PYTHON_USEDEP}] )
-	scsgate? ( ~dev-python/scsgate-0.1.0[${PYTHON_USEDEP}] )
-	season? ( ~dev-python/ephem-3.7.7.0[${PYTHON_USEDEP}] )
-	sendgrid? ( ~dev-python/sendgrid-6.7.0[${PYTHON_USEDEP}] )
-	sense? ( ~dev-python/sense-energy-0.9.0[${PYTHON_USEDEP}] )
-	sensehat? ( ~dev-python/python-sense-hat-2.2.0[${PYTHON_USEDEP}] )
-	sensibo? ( ~dev-python/pysensibo-1.0.3[${PYTHON_USEDEP}] )
-	sentry? ( ~dev-python/sentry-sdk-1.1.0[${PYTHON_USEDEP}] )
-	serial? ( ~dev-python/pyserial-asyncio-0.5[${PYTHON_USEDEP}] )
-	serial_pm? ( ~dev-python/pmsensor-0.4[${PYTHON_USEDEP}] )
-	sesame? ( ~dev-python/pysesame2-1.0.1[${PYTHON_USEDEP}] )
-	seventeentrack? ( ~dev-python/py17track-3.2.1[${PYTHON_USEDEP}] )
-	seven_segments? ( ~dev-python/pillow-8.1.2[${PYTHON_USEDEP}] )
-	sharkiq? ( ~dev-python/sharkiqpy-0.1.8[${PYTHON_USEDEP}] )
-	shelly? ( ~dev-python/aioshelly-0.6.4[${PYTHON_USEDEP}] )
-	shiftr? ( ~dev-python/paho-mqtt-1.5.1[${PYTHON_USEDEP}] )
-	shodan? ( ~dev-python/shodan-1.25.0[${PYTHON_USEDEP}] )
-	sht31? ( ~dev-python/Adafruit-GPIO-1.0.3[${PYTHON_USEDEP}] ~dev-python/Adafruit-SHT31-1.0.2[${PYTHON_USEDEP}] )
-	sia? ( ~dev-python/pysiaalarm-3.0.0[${PYTHON_USEDEP}] )
-	sighthound? ( ~dev-python/pillow-8.1.2[${PYTHON_USEDEP}] ~dev-python/simplehound-0.3[${PYTHON_USEDEP}] )
-	signal_messenger? ( ~dev-python/pysignalclirestapi-0.3.4[${PYTHON_USEDEP}] )
-	simplepush? ( ~dev-python/simplepush-1.1.4[${PYTHON_USEDEP}] )
-	simplisafe? ( ~dev-python/simplisafe-python-10.0.0[${PYTHON_USEDEP}] )
-	sinch? ( ~dev-python/clx-sdk-xms-1.0.0[${PYTHON_USEDEP}] )
-	sisyphus? ( ~dev-python/sisyphus-control-3.0[${PYTHON_USEDEP}] )
-	skybeacon? ( ~dev-python/pygatt-4.0.5[${PYTHON_USEDEP}] )
-	skybell? ( ~dev-python/skybellpy-0.6.3[${PYTHON_USEDEP}] )
-	sky_hub? ( ~dev-python/pyskyqhub-0.1.3[${PYTHON_USEDEP}] )
-	slack? ( ~dev-python/slackclient-2.5.0[${PYTHON_USEDEP}] )
-	sleepiq? ( ~dev-python/sleepyq-0.8.1[${PYTHON_USEDEP}] )
-	slide? ( ~dev-python/goslide-api-0.5.1[${PYTHON_USEDEP}] )
-	sma? ( ~dev-python/pysma-0.4.3[${PYTHON_USEDEP}] )
-	smappee? ( ~dev-python/pysmappee-0.2.25[${PYTHON_USEDEP}] )
-	smarthab? ( ~dev-python/SmartHab-0.21[${PYTHON_USEDEP}] )
-	smartthings? ( ~dev-python/pysmartapp-0.3.3[${PYTHON_USEDEP}] ~dev-python/pysmartthings-0.7.6[${PYTHON_USEDEP}] )
-	smarttub? ( ~dev-python/python-smarttub-0.0.25[${PYTHON_USEDEP}] )
-	smarty? ( ~dev-python/pysmarty-0.8[${PYTHON_USEDEP}] )
-	smart_meter_texas? ( ~dev-python/smart-meter-texas-0.4.0[${PYTHON_USEDEP}] )
-	smhi? ( ~dev-python/smhi-pkg-1.0.15[${PYTHON_USEDEP}] )
-	sms? ( ~dev-python/python-gammu-3.1[${PYTHON_USEDEP}] )
-	snapcast? ( ~dev-python/snapcast-2.1.3[${PYTHON_USEDEP}] )
-	snmp? ( ~dev-python/pysnmp-4.4.12[${PYTHON_USEDEP}] )
-	socat? ( net-misc/socat )
-	sochain? ( ~dev-python/python-sochain-api-0.0.2[${PYTHON_USEDEP}] )
-	socialblade? ( ~dev-python/socialbladeclient-0.5[${PYTHON_USEDEP}] )
-	solaredge? ( ~dev-python/solaredge-0.0.2[${PYTHON_USEDEP}] ~dev-python/stringcase-1.2.0[${PYTHON_USEDEP}] )
-	solaredge_local? ( ~dev-python/solaredge-local-0.2.0[${PYTHON_USEDEP}] )
-	solarlog? ( ~dev-python/sunwatcher-0.2.1[${PYTHON_USEDEP}] )
-	solax? ( ~dev-python/solax-0.2.6[${PYTHON_USEDEP}] )
-	soma? ( ~dev-python/pysoma-0.0.10[${PYTHON_USEDEP}] )
-	somfy? ( ~dev-python/pymfy-0.9.3[${PYTHON_USEDEP}] )
-	somfy_mylink? ( ~dev-python/somfy-mylink-synergy-1.0.6[${PYTHON_USEDEP}] )
-	sonarr? ( ~dev-python/sonarr-0.3.0[${PYTHON_USEDEP}] )
-	songpal? ( ~dev-python/python-songpal-0.12[${PYTHON_USEDEP}] )
-	sonos? ( ~dev-python/pysonos-0.0.49[${PYTHON_USEDEP}] )
-	sony_projector? ( ~dev-python/pySDCP-1[${PYTHON_USEDEP}] )
-	soundtouch? ( ~dev-python/libsoundtouch-0.8.0[${PYTHON_USEDEP}] )
-	spc? ( ~dev-python/pyspcwebgw-0.4.0[${PYTHON_USEDEP}] )
-	speedtestdotnet? ( ~net-analyzer/speedtest-cli-2.1.3[${PYTHON_USEDEP}] )
-	spider? ( ~dev-python/spiderpy-1.4.2[${PYTHON_USEDEP}] )
-	splunk? ( ~dev-python/hass-splunk-0.1.1[${PYTHON_USEDEP}] )
-	spotcrime? ( ~dev-python/spotcrime-1.0.4[${PYTHON_USEDEP}] )
-	spotify? ( ~dev-python/spotipy-2.18.0[${PYTHON_USEDEP}] )
-	sql? ( ~dev-python/sqlalchemy-1.4.13[${PYTHON_USEDEP}] )
-	squeezebox? ( ~dev-python/pysqueezebox-0.5.5[${PYTHON_USEDEP}] )
-	srp_energy? ( ~dev-python/srpenergy-1.3.2[${PYTHON_USEDEP}] )
-	ssdp? ( ~dev-python/defusedxml-0.7.1[${PYTHON_USEDEP}] ~dev-python/netdisco-2.8.3[${PYTHON_USEDEP}] ~dev-python/async-upnp-client-0.18.0[${PYTHON_USEDEP}] )
-	ssl? ( dev-libs/openssl app-crypt/certbot net-proxy/haproxy )
-	starline? ( ~dev-python/starline-0.1.5[${PYTHON_USEDEP}] )
-	starlingbank? ( ~dev-python/starlingbank-3.2[${PYTHON_USEDEP}] )
-	startca? ( ~dev-python/xmltodict-0.12.0[${PYTHON_USEDEP}] )
-	statsd? ( ~dev-python/statsd-3.2.1[${PYTHON_USEDEP}] )
-	steam_online? ( ~dev-python/steamodd-4.21[${PYTHON_USEDEP}] )
-	stiebel_eltron? ( ~dev-python/pystiebeleltron-0.0.1[${PYTHON_USEDEP}] )
-	stookalert? ( ~dev-python/stookalert-0.1.4[${PYTHON_USEDEP}] )
-	stream? ( ~dev-python/av-8.0.3[${PYTHON_USEDEP}] )
-	streamlabswater? ( ~dev-python/streamlabswater-1.0.1[${PYTHON_USEDEP}] )
-	subaru? ( ~dev-python/subarulink-0.3.12[${PYTHON_USEDEP}] )
-	suez_water? ( ~dev-python/pysuez-0.1.19[${PYTHON_USEDEP}] )
-	supla? ( ~dev-python/asyncpysupla-0.0.5[${PYTHON_USEDEP}] )
-	surepetcare? ( ~dev-python/surepy-0.6.0[${PYTHON_USEDEP}] )
-	swiss_hydrological_data? ( ~dev-python/swisshydrodata-0.1.0[${PYTHON_USEDEP}] )
-	swiss_public_transport? ( ~dev-python/python_opendata_transport-0.2.1[${PYTHON_USEDEP}] )
-	switchbot? ( ~dev-python/PySwitchbot-0.8.0[${PYTHON_USEDEP}] )
-	switcher_kis? ( ~dev-python/aioswitcher-1.2.1[${PYTHON_USEDEP}] )
-	switchmate? ( ~dev-python/PySwitchmate-0.4.6[${PYTHON_USEDEP}] )
-	syncthing? ( ~dev-python/aiosyncthing-0.5.1[${PYTHON_USEDEP}] )
-	syncthru? ( ~dev-python/PySyncThru-0.7.3[${PYTHON_USEDEP}] ~dev-python/url-normalize-1.4.1[${PYTHON_USEDEP}] )
-	synology? ( ~dev-python/py-synology-0.2.0[${PYTHON_USEDEP}] )
-	synology_dsm? ( ~dev-python/synologydsm-api-1.0.2[${PYTHON_USEDEP}] )
-	synology_srm? ( ~dev-python/synology-srm-0.2.0[${PYTHON_USEDEP}] )
-	systemmonitor? ( ~dev-python/psutil-5.8.0[${PYTHON_USEDEP}] )
-	system_bridge? ( ~dev-python/systembridge-1.1.5[${PYTHON_USEDEP}] )
-	tado? ( ~dev-python/python-tado-0.10.0[${PYTHON_USEDEP}] )
-	tahoma? ( ~dev-python/tahoma-api-0.0.16[${PYTHON_USEDEP}] )
-	tankerkoenig? ( ~dev-python/pytankerkoenig-0.0.6[${PYTHON_USEDEP}] )
-	tank_utility? ( ~dev-python/tank_utility-1.4.0[${PYTHON_USEDEP}] )
-	tapsaff? ( ~dev-python/tapsaff-0.2.1[${PYTHON_USEDEP}] )
-	tasmota? ( ~dev-python/HATasmota-0.2.14[${PYTHON_USEDEP}] )
-	tautulli? ( ~dev-python/pytautulli-0.5.0[${PYTHON_USEDEP}] )
-	ted5000? ( ~dev-python/xmltodict-0.12.0[${PYTHON_USEDEP}] )
-	telegram_bot? ( ~dev-python/python-telegram-bot-13.1[${PYTHON_USEDEP}] ~dev-python/PySocks-1.7.1[${PYTHON_USEDEP}] )
-	tellduslive? ( ~dev-python/tellduslive-0.10.11[${PYTHON_USEDEP}] )
-	tellstick? ( ~dev-python/tellcore-net-0.4[${PYTHON_USEDEP}] ~dev-python/tellcore-py-1.1.2[${PYTHON_USEDEP}] )
-	temper? ( ~dev-python/temperusb-1.5.3[${PYTHON_USEDEP}] )
-	tesla? ( ~dev-python/teslajsonpy-0.18.3[${PYTHON_USEDEP}] )
-	tfiac? ( ~dev-python/pytfiac-0.4[${PYTHON_USEDEP}] )
-	thermoworks_smoke? ( ~dev-python/stringcase-1.2.0[${PYTHON_USEDEP}] ~dev-python/thermoworks-smoke-0.1.8[${PYTHON_USEDEP}] )
-	thingspeak? ( ~dev-python/thingspeak-1.0.0[${PYTHON_USEDEP}] )
-	thinkingcleaner? ( ~dev-python/pythinkingcleaner-0.0.3[${PYTHON_USEDEP}] )
-	tibber? ( ~dev-python/pyTibber-0.17.0[${PYTHON_USEDEP}] )
-	tikteck? ( ~dev-python/tikteck-0.4[${PYTHON_USEDEP}] )
-	tile? ( ~dev-python/pytile-5.2.0[${PYTHON_USEDEP}] )
-	tmb? ( ~dev-python/tmb-0.0.4[${PYTHON_USEDEP}] )
-	todoist? ( ~dev-python/todoist-python-8.0.0[${PYTHON_USEDEP}] )
-	tof? ( ~dev-python/VL53L1X2-0.1.5[${PYTHON_USEDEP}] )
-	toon? ( ~dev-python/toonapi-0.2.0[${PYTHON_USEDEP}] )
-	totalconnect? ( ~dev-python/total-connect-client-0.57[${PYTHON_USEDEP}] )
-	touchline? ( ~dev-python/pytouchline-0.7[${PYTHON_USEDEP}] )
-	tplink? ( ~dev-python/pyHS100-0.3.5.2[${PYTHON_USEDEP}] )
-	tplink_lte? ( ~dev-python/tp-connected-0.0.4[${PYTHON_USEDEP}] )
-	traccar? ( ~dev-python/pytraccar-0.9.0[${PYTHON_USEDEP}] ~dev-python/stringcase-1.2.0[${PYTHON_USEDEP}] )
-	trackr? ( ~dev-python/pytrackr-0.0.5[${PYTHON_USEDEP}] )
-	tradfri? ( ~dev-python/pytradfri-7.0.6[${PYTHON_USEDEP}] )
-	trafikverket_train? ( ~dev-python/pytrafikverket-0.1.6.2[${PYTHON_USEDEP}] )
-	trafikverket_weatherstation? ( ~dev-python/pytrafikverket-0.1.6.2[${PYTHON_USEDEP}] )
-	transmission? ( ~dev-python/transmissionrpc-0.11[${PYTHON_USEDEP}] )
-	transport_nsw? ( ~dev-python/PyTransportNSW-0.1.1[${PYTHON_USEDEP}] )
-	travisci? ( ~dev-python/TravisPy-0.3.5[${PYTHON_USEDEP}] )
-	trend? ( ~dev-python/numpy-1.20.3[${PYTHON_USEDEP}] )
-	tts? ( ~media-libs/mutagen-1.45.1 )
-	tuya? ( ~dev-python/tuyaha-0.0.10[${PYTHON_USEDEP}] )
-	twentemilieu? ( ~dev-python/twentemilieu-0.3.0[${PYTHON_USEDEP}] )
-	twilio? ( ~dev-python/twilio-6.32.0[${PYTHON_USEDEP}] )
-	twinkly? ( ~dev-python/twinkly-client-0.0.2[${PYTHON_USEDEP}] )
-	twitch? ( ~dev-python/python-twitch-client-0.6.0[${PYTHON_USEDEP}] )
-	twitter? ( ~dev-python/TwitterAPI-2.7.3[${PYTHON_USEDEP}] )
-	ubee? ( ~dev-python/pyubee-0.10[${PYTHON_USEDEP}] )
-	unifi? ( ~dev-python/aiounifi-26[${PYTHON_USEDEP}] )
-	unifiled? ( ~dev-python/unifiled-0.11[${PYTHON_USEDEP}] )
-	unifi_direct? ( ~dev-python/pexpect-4.6.0[${PYTHON_USEDEP}] )
-	upb? ( ~dev-python/upb-lib-0.4.12[${PYTHON_USEDEP}] )
-	upcloud? ( ~dev-python/upcloud-api-2.0.0[${PYTHON_USEDEP}] )
-	upc_connect? ( ~dev-python/connect-box-0.2.8[${PYTHON_USEDEP}] )
-	updater? ( ~dev-python/distro-1.5.0[${PYTHON_USEDEP}] )
-	upnp? ( ~dev-python/async-upnp-client-0.18.0[${PYTHON_USEDEP}] )
-	uscis? ( ~dev-python/uscisstatus-0.1.1[${PYTHON_USEDEP}] )
-	usgs_earthquakes_feed? ( ~dev-python/geojson-client-0.6[${PYTHON_USEDEP}] )
-	uvc? ( ~dev-python/uvcclient-0.11.0[${PYTHON_USEDEP}] )
-	vallox? ( ~dev-python/vallox-websocket-api-2.4.0[${PYTHON_USEDEP}] )
-	velbus? ( ~dev-python/python-velbus-2.1.2[${PYTHON_USEDEP}] )
-	velux? ( ~dev-python/pyvlx-0.2.19[${PYTHON_USEDEP}] )
-	venstar? ( ~dev-python/venstarcolortouch-0.14[${PYTHON_USEDEP}] )
-	vera? ( ~dev-python/pyvera-0.3.13[${PYTHON_USEDEP}] )
-	verisure? ( ~dev-python/vsure-1.7.3[${PYTHON_USEDEP}] )
-	versasense? ( ~dev-python/pyversasense-0.0.6[${PYTHON_USEDEP}] )
-	version? ( ~dev-python/pyhaversion-21.5.0[${PYTHON_USEDEP}] )
-	vesync? ( ~dev-python/pyvesync-1.4.0[${PYTHON_USEDEP}] )
-	vicare? ( ~dev-python/PyViCare-0.2.5[${PYTHON_USEDEP}] )
-	vilfo? ( ~dev-python/vilfo-api-client-0.3.2[${PYTHON_USEDEP}] )
-	vivotek? ( ~dev-python/libpyvivotek-0.4.0[${PYTHON_USEDEP}] )
-	vizio? ( ~dev-python/pyvizio-0.1.57[${PYTHON_USEDEP}] )
-	vlc? ( ~dev-python/python-vlc-1.1.2[${PYTHON_USEDEP}] )
-	vlc_telnet? ( ~dev-python/python-telnet-vlc-2.0.1[${PYTHON_USEDEP}] )
-	volkszaehler? ( ~dev-python/volkszaehler-0.2.1[${PYTHON_USEDEP}] )
-	volumio? ( ~dev-python/pyvolumio-0.1.3[${PYTHON_USEDEP}] )
-	volvooncall? ( ~dev-python/volvooncall-0.8.12[${PYTHON_USEDEP}] )
-	vultr? ( ~dev-python/vultr-0.1.2[${PYTHON_USEDEP}] )
-	w800rf32? ( ~dev-python/pyW800rf32-0.1[${PYTHON_USEDEP}] )
-	wake_on_lan? ( ~dev-python/wakeonlan-2.0.1[${PYTHON_USEDEP}] )
-	wallbox? ( ~dev-python/wallbox-0.4.4[${PYTHON_USEDEP}] )
-	waqi? ( ~dev-python/waqiasync-1.0.0[${PYTHON_USEDEP}] )
-	waterfurnace? ( ~dev-python/waterfurnace-1.1.0[${PYTHON_USEDEP}] )
-	watson_iot? ( ~dev-python/ibmiotf-0.3.4[${PYTHON_USEDEP}] )
-	waze_travel_time? ( ~dev-python/WazeRouteCalculator-0.12[${PYTHON_USEDEP}] )
-	webostv? ( ~dev-python/aiopylgtv-0.4.0[${PYTHON_USEDEP}] )
-	wemo? ( ~dev-python/pywemo-0.6.3[${PYTHON_USEDEP}] )
-	whois? ( ~dev-python/python-whois-0.7.3[${PYTHON_USEDEP}] )
-	wiffi? ( ~dev-python/wiffi-1.0.1[${PYTHON_USEDEP}] )
-	wilight? ( ~dev-python/pywilight-0.0.70[${PYTHON_USEDEP}] )
-	wink? ( ~dev-python/pubnubsub-handler-1.0.9[${PYTHON_USEDEP}] ~dev-python/python-wink-1.10.5[${PYTHON_USEDEP}] )
-	wirelesstag? ( ~dev-python/wirelesstagpy-0.4.1[${PYTHON_USEDEP}] )
-	withings? ( ~dev-python/withings-api-2.3.2[${PYTHON_USEDEP}] )
-	wled? ( ~dev-python/wled-0.4.4[${PYTHON_USEDEP}] )
-	wolflink? ( ~dev-python/wolf_smartset-0.1.8[${PYTHON_USEDEP}] )
-	workday? ( ~dev-python/holidays-0.11.1[${PYTHON_USEDEP}] )
-	xbee? ( ~dev-python/xbee-helper-0.0.7[${PYTHON_USEDEP}] )
-	xbox? ( ~dev-python/xbox-webapi-2.0.11[${PYTHON_USEDEP}] )
-	xbox_live? ( ~dev-python/xboxapi-2.0.1[${PYTHON_USEDEP}] )
-	xeoma? ( ~dev-python/pyxeoma-1.4.1[${PYTHON_USEDEP}] )
-	xfinity? ( ~dev-python/xfinity-gateway-0.0.4[${PYTHON_USEDEP}] )
-	xiaomi_aqara? ( ~dev-python/PyXiaomiGateway-0.13.4[${PYTHON_USEDEP}] )
-	xiaomi_miio? ( ~dev-python/construct-2.10.56[${PYTHON_USEDEP}] ~dev-python/python-miio-0.5.6[${PYTHON_USEDEP}] )
-	xiaomi_tv? ( ~dev-python/pymitv-1.4.3[${PYTHON_USEDEP}] )
-	xmpp? ( ~dev-python/slixmpp-1.7.1[${PYTHON_USEDEP}] )
-	xs1? ( ~dev-python/xs1-api-client-3.0.0[${PYTHON_USEDEP}] )
-	yale_smart_alarm? ( ~dev-python/yalesmartalarmclient-0.3.3[${PYTHON_USEDEP}] )
-	yamaha? ( ~dev-python/rxv-0.6.0[${PYTHON_USEDEP}] )
-	yamaha_musiccast? ( ~dev-python/pymusiccast-0.1.6[${PYTHON_USEDEP}] )
-	yandex_transport? ( ~dev-python/aioymaps-1.1.0[${PYTHON_USEDEP}] )
-	yeelight? ( ~dev-python/yeelight-0.6.3[${PYTHON_USEDEP}] )
-	yeelightsunflower? ( ~dev-python/yeelightsunflower-0.0.10[${PYTHON_USEDEP}] )
-	yessssms? ( ~dev-python/YesssSMS-0.4.1[${PYTHON_USEDEP}] )
-	yi? ( ~dev-python/aioftp-0.12.0[${PYTHON_USEDEP}] )
-	zabbix? ( ~dev-python/py-zabbix-1.1.7[${PYTHON_USEDEP}] )
-	zengge? ( ~dev-python/zengge-0.2[${PYTHON_USEDEP}] )
-	zeroconf? ( ~dev-python/zeroconf-0.31.0[${PYTHON_USEDEP}] )
-	zerproc? ( ~dev-python/pyzerproc-0.4.8[${PYTHON_USEDEP}] )
-	zestimate? ( ~dev-python/xmltodict-0.12.0[${PYTHON_USEDEP}] )
-	zha? ( ~dev-python/bellows-0.24.0[${PYTHON_USEDEP}] ~dev-python/pyserial-3.5[${PYTHON_USEDEP}] ~dev-python/pyserial-asyncio-0.5[${PYTHON_USEDEP}] ~dev-python/zha-quirks-0.0.57[${PYTHON_USEDEP}] ~dev-python/zigpy-cc-0.5.2[${PYTHON_USEDEP}] ~dev-python/zigpy-deconz-0.12.0[${PYTHON_USEDEP}] ~dev-python/zigpy-0.33.0[${PYTHON_USEDEP}] ~dev-python/zigpy-xbee-0.13.0[${PYTHON_USEDEP}] ~dev-python/zigpy-zigate-0.7.3[${PYTHON_USEDEP}] ~dev-python/zigpy-znp-0.5.1[${PYTHON_USEDEP}] )
-	zhong_hong? ( ~dev-python/zhong-hong-hvac-1.0.9[${PYTHON_USEDEP}] )
-	ziggo_mediabox_xl? ( ~dev-python/ziggo-mediabox-xl-1.1.0[${PYTHON_USEDEP}] )
-	zoneminder? ( ~dev-python/zm-py-0.5.2[${PYTHON_USEDEP}] )
-	zwave? ( ~dev-python/homeassistant-pyozw-0.1.10[${PYTHON_USEDEP}] ~dev-python/PyDispatcher-2.0.5[${PYTHON_USEDEP}] )
-	zwave_js? ( ~dev-python/zwave-js-server-python-0.26.1[${PYTHON_USEDEP}] )"
-
-BDEPEND="${RDEPEND}
-	test? (
-		~dev-python/codecov-2.1.10[${PYTHON_USEDEP}]
-		~dev-python/coverage-5.5[${PYTHON_USEDEP}]
-		~dev-python/jsonpickle-1.4.1[${PYTHON_USEDEP}]
-		~dev-python/mock-open-1.4.0[${PYTHON_USEDEP}]
-		~dev-python/mypy-0.812[${PYTHON_USEDEP}]
-		~dev-python/pipdeptree-1.0.0[${PYTHON_USEDEP}]
-		~dev-vcs/pre-commit-2.13.0
-		~dev-python/pylint-strict-informational-0.1[${PYTHON_USEDEP}]
-		~dev-python/pylint-2.8.2[${PYTHON_USEDEP}]
-		~dev-python/pytest-cov-2.10.1[${PYTHON_USEDEP}]
-		~dev-python/pytest-sugar-0.9.4[${PYTHON_USEDEP}]
-		~dev-python/pytest-test-groups-1.0.3[${PYTHON_USEDEP}]
-		~dev-python/pytest-timeout-1.4.2[${PYTHON_USEDEP}]
-		~dev-python/pytest-xdist-2.2.1[${PYTHON_USEDEP}]
-		~dev-python/pytest-6.2.4[${PYTHON_USEDEP}]
-		~dev-python/requests-mock-1.9.2[${PYTHON_USEDEP}]
-		~dev-python/responses-0.12.0[${PYTHON_USEDEP}]
-		~dev-python/respx-0.17.0[${PYTHON_USEDEP}]
-		~dev-python/stdlib-list-0.7.0[${PYTHON_USEDEP}]
-		~dev-python/tqdm-4.49.0[${PYTHON_USEDEP}]
-	)
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]"
-
-INSTALL_DIR="/opt/${MY_PN}"
-
-DISABLE_AUTOFORMATTING=1
-DOC_CONTENTS="
-The HA interface listens on port 8123
-hass configuration is in: /etc/${MY_PN}
-daemon command line arguments are configured in: /etc/conf.d/${MY_PN}
-logging is to: /var/log/${MY_PN}/{server,errors,stdout}.log
-The sqlite db is by default in: /etc/${MY_PN}
-support at https://git.edevau.net/onkelbeh/HomeAssistantRepository
-"
-
-S="${WORKDIR}/core-${MY_PV}"
-
-DOCS="README.rst"
-
-python_install_all() {
-	dodoc ${DOCS}
-	distutils-r1_python_install_all
-	keepdir "$INSTALL_DIR"
-	keepdir "/etc/${MY_PN}"
-	fowners -R "${MY_PN}:${MY_PN}" "/etc/${MY_PN}"
-	keepdir "/var/log/${MY_PN}"
-	fowners -R "${MY_PN}:${MY_PN}" "/var/log/${MY_PN}"
-	newconfd "${FILESDIR}/${MY_PN}.conf.d" "${MY_PN}"
-	newinitd "${FILESDIR}/${MY_PN}.init.d" "${MY_PN}"
-	use systemd && systemd_dounit "${FILESDIR}/${MY_PN}.service"
-	dobin "${FILESDIR}/hasstest"
-	if use socat ; then
-		newinitd "${FILESDIR}/socat-zwave.init.d" "socat-zwave"
-		sed -i -e 's/# need socat-zwave/need socat-zwave/g' "${D}/etc/init.d/${MY_PN}" || die
-	fi
-	if use mqtt ; then
-		sed -i -e 's/# need mosquitto/need mosquitto/g' "${D}/etc/init.d/${MY_PN}" || die
-	fi
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${MY_PN}.logrotate" "${MY_PN}"
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
-
diff --git a/app-misc/homeassistant-full/homeassistant-full-2021.7.0_beta1.ebuild b/app-misc/homeassistant-full/homeassistant-full-2021.7.0_beta5.ebuild
similarity index 98%
rename from app-misc/homeassistant-full/homeassistant-full-2021.7.0_beta1.ebuild
rename to app-misc/homeassistant-full/homeassistant-full-2021.7.0_beta5.ebuild
index 33d1f284c..d56c8d25d 100644
--- a/app-misc/homeassistant-full/homeassistant-full-2021.7.0_beta1.ebuild
+++ b/app-misc/homeassistant-full/homeassistant-full-2021.7.0_beta5.ebuild
@@ -65,7 +65,7 @@ RDEPEND="${RDEPEND}
 	~dev-python/grpcio-1.31.0[${PYTHON_USEDEP}]
 	>=dev-python/h11-0.12.0[${PYTHON_USEDEP}]
 	~dev-python/hass-nabucasa-0.44.0[${PYTHON_USEDEP}]
-	~dev-python/home-assistant-frontend-20210630.0[${PYTHON_USEDEP}]
+	~dev-python/home-assistant-frontend-20210706.0[${PYTHON_USEDEP}]
 	~dev-python/httpcore-0.13.3[${PYTHON_USEDEP}]
 	>=dev-python/httplib2-0.19.0[${PYTHON_USEDEP}]
 	~dev-python/httpx-0.18.0[${PYTHON_USEDEP}]
@@ -87,7 +87,7 @@ RDEPEND="${RDEPEND}
 	~dev-python/voluptuous-serialize-2.4.0[${PYTHON_USEDEP}]
 	~dev-python/voluptuous-0.12.1[${PYTHON_USEDEP}]
 	~dev-python/yarl-1.6.3[${PYTHON_USEDEP}]
-	~dev-python/zeroconf-0.32.0[${PYTHON_USEDEP}]"
+	~dev-python/zeroconf-0.32.1[${PYTHON_USEDEP}]"
 
 # unknown origin, still something to clean up here
 # some moved to suggested USE Flags
@@ -269,7 +269,7 @@ RDEPEND="${RDEPEND}
 	edl21? ( ~dev-python/pysml-0.0.5[${PYTHON_USEDEP}] )
 	ee_brightbox? ( ~dev-python/eebrightbox-0.0.4[${PYTHON_USEDEP}] )
 	egardia? ( ~dev-python/pythonegardia-1.0.40[${PYTHON_USEDEP}] )
-	eight_sleep? ( ~dev-python/pyEight-0.1.8[${PYTHON_USEDEP}] )
+	eight_sleep? ( ~dev-python/pyEight-0.1.9[${PYTHON_USEDEP}] )
 	elgato? ( ~dev-python/elgato-2.1.1[${PYTHON_USEDEP}] )
 	eliqonline? ( ~dev-python/eliqonline-1.2.2[${PYTHON_USEDEP}] )
 	elkm1? ( ~dev-python/elkm1-lib-0.8.10[${PYTHON_USEDEP}] )
@@ -343,7 +343,7 @@ RDEPEND="${RDEPEND}
 	geonetnz_volcano? ( ~dev-python/aio-geojson-geonetnz-volcano-0.6[${PYTHON_USEDEP}] )
 	geo_json_events? ( ~dev-python/geojson-client-0.6[${PYTHON_USEDEP}] )
 	geo_rss_events? ( ~dev-python/georss-generic-client-0.6[${PYTHON_USEDEP}] )
-	gios? ( ~dev-python/gios-1.0.1[${PYTHON_USEDEP}] )
+	gios? ( ~dev-python/gios-1.0.2[${PYTHON_USEDEP}] )
 	github? ( ~dev-python/PyGithub-1.43.8[${PYTHON_USEDEP}] )
 	gitlab_ci? ( ~dev-python/python-gitlab-1.6.0[${PYTHON_USEDEP}] )
 	gitter? ( ~dev-python/gitterpy-0.1.7[${PYTHON_USEDEP}] )
@@ -380,8 +380,8 @@ RDEPEND="${RDEPEND}
 	hisense_aehw4a1? ( ~dev-python/pyaehw4a1-0.3.9[${PYTHON_USEDEP}] )
 	hive? ( ~dev-python/pyhiveapi-0.4.2[${PYTHON_USEDEP}] )
 	hlk_sw16? ( ~dev-python/hlk-sw16-0.0.9[${PYTHON_USEDEP}] )
-	homekit? ( ~dev-python/HAP-python-3.5.0[${PYTHON_USEDEP}] ~dev-python/fnvhash-0.1.0[${PYTHON_USEDEP}] ~dev-python/pyqrcode-1.2.1[${PYTHON_USEDEP}] ~dev-python/base36-0.1.1[${PYTHON_USEDEP}] ~dev-python/PyTurboJPEG-1.5.0[${PYTHON_USEDEP}] )
-	homekit_controller? ( ~dev-python/aiohomekit-0.4.0[${PYTHON_USEDEP}] )
+	homekit? ( ~dev-python/HAP-python-3.5.1[${PYTHON_USEDEP}] ~dev-python/fnvhash-0.1.0[${PYTHON_USEDEP}] ~dev-python/pyqrcode-1.2.1[${PYTHON_USEDEP}] ~dev-python/base36-0.1.1[${PYTHON_USEDEP}] ~dev-python/PyTurboJPEG-1.5.0[${PYTHON_USEDEP}] )
+	homekit_controller? ( ~dev-python/aiohomekit-0.4.2[${PYTHON_USEDEP}] )
 	homematic? ( ~dev-python/pyhomematic-0.1.73[${PYTHON_USEDEP}] )
 	homematicip_cloud? ( ~dev-python/homematicip-0.13.1[${PYTHON_USEDEP}] )
 	homeworks? ( ~dev-python/pyhomeworks-0.0.6[${PYTHON_USEDEP}] )
@@ -546,7 +546,7 @@ RDEPEND="${RDEPEND}
 	niko_home_control? ( ~dev-python/niko-home-control-0.2.1[${PYTHON_USEDEP}] )
 	nilu? ( ~dev-python/niluclient-0.1.2[${PYTHON_USEDEP}] )
 	nissan_leaf? ( ~dev-python/pycarwings2-2.10[${PYTHON_USEDEP}] )
-	nmap_tracker? ( ~dev-python/netmap-0.7.0.2[${PYTHON_USEDEP}] ~dev-python/getmac-0.8.2[${PYTHON_USEDEP}] ~dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}] ~dev-python/mac-vendor-lookup-0.1.11[${PYTHON_USEDEP}] )
+	nmap_tracker? ( ~dev-python/python-nmap-0.6.1[${PYTHON_USEDEP}] ~dev-python/getmac-0.8.2[${PYTHON_USEDEP}] )
 	nmbs? ( ~dev-python/pyrail-0.0.3[${PYTHON_USEDEP}] )
 	noaa_tides? ( ~dev-python/noaa-coops-0.1.8[${PYTHON_USEDEP}] )
 	norway_air? ( ~dev-python/PyMetno-0.8.3[${PYTHON_USEDEP}] )
@@ -698,7 +698,7 @@ RDEPEND="${RDEPEND}
 	sighthound? ( ~dev-python/pillow-8.2.0[${PYTHON_USEDEP}] ~dev-python/simplehound-0.3[${PYTHON_USEDEP}] )
 	signal_messenger? ( ~dev-python/pysignalclirestapi-0.3.4[${PYTHON_USEDEP}] )
 	simplepush? ( ~dev-python/simplepush-1.1.4[${PYTHON_USEDEP}] )
-	simplisafe? ( ~dev-python/simplisafe-python-10.0.0[${PYTHON_USEDEP}] )
+	simplisafe? ( ~dev-python/simplisafe-python-11.0.0[${PYTHON_USEDEP}] )
 	sinch? ( ~dev-python/clx-sdk-xms-1.0.0[${PYTHON_USEDEP}] )
 	sisyphus? ( ~dev-python/sisyphus-control-3.0[${PYTHON_USEDEP}] )
 	skybeacon? ( ~dev-python/pygatt-4.0.5[${PYTHON_USEDEP}] )
@@ -707,7 +707,7 @@ RDEPEND="${RDEPEND}
 	slack? ( ~dev-python/slackclient-2.5.0[${PYTHON_USEDEP}] )
 	sleepiq? ( ~dev-python/sleepyq-0.8.1[${PYTHON_USEDEP}] )
 	slide? ( ~dev-python/goslide-api-0.5.1[${PYTHON_USEDEP}] )
-	sma? ( ~dev-python/pysma-0.6.1[${PYTHON_USEDEP}] )
+	sma? ( ~dev-python/pysma-0.6.2[${PYTHON_USEDEP}] )
 	smappee? ( ~dev-python/pysmappee-0.2.25[${PYTHON_USEDEP}] )
 	smarthab? ( ~dev-python/SmartHab-0.21[${PYTHON_USEDEP}] )
 	smartthings? ( ~dev-python/pysmartapp-0.3.3[${PYTHON_USEDEP}] ~dev-python/pysmartthings-0.7.6[${PYTHON_USEDEP}] )
@@ -726,7 +726,7 @@ RDEPEND="${RDEPEND}
 	solarlog? ( ~dev-python/sunwatcher-0.2.1[${PYTHON_USEDEP}] )
 	solax? ( ~dev-python/solax-0.2.6[${PYTHON_USEDEP}] )
 	soma? ( ~dev-python/pysoma-0.0.10[${PYTHON_USEDEP}] )
-	somfy? ( ~dev-python/pymfy-0.9.3[${PYTHON_USEDEP}] )
+	somfy? ( ~dev-python/pymfy-0.11.0[${PYTHON_USEDEP}] )
 	somfy_mylink? ( ~dev-python/somfy-mylink-synergy-1.0.6[${PYTHON_USEDEP}] )
 	sonarr? ( ~dev-python/sonarr-0.3.0[${PYTHON_USEDEP}] )
 	songpal? ( ~dev-python/python-songpal-0.12[${PYTHON_USEDEP}] )
@@ -884,10 +884,10 @@ RDEPEND="${RDEPEND}
 	yi? ( ~dev-python/aioftp-0.12.0[${PYTHON_USEDEP}] )
 	zabbix? ( ~dev-python/py-zabbix-1.1.7[${PYTHON_USEDEP}] )
 	zengge? ( ~dev-python/zengge-0.2[${PYTHON_USEDEP}] )
-	zeroconf? ( ~dev-python/zeroconf-0.32.0[${PYTHON_USEDEP}] )
+	zeroconf? ( ~dev-python/zeroconf-0.32.1[${PYTHON_USEDEP}] )
 	zerproc? ( ~dev-python/pyzerproc-0.4.8[${PYTHON_USEDEP}] )
 	zestimate? ( ~dev-python/xmltodict-0.12.0[${PYTHON_USEDEP}] )
-	zha? ( ~dev-python/bellows-0.25.0[${PYTHON_USEDEP}] ~dev-python/pyserial-3.5[${PYTHON_USEDEP}] ~dev-python/pyserial-asyncio-0.5[${PYTHON_USEDEP}] ~dev-python/zha-quirks-0.0.58[${PYTHON_USEDEP}] ~dev-python/zigpy-cc-0.5.2[${PYTHON_USEDEP}] ~dev-python/zigpy-deconz-0.12.0[${PYTHON_USEDEP}] ~dev-python/zigpy-0.35.0[${PYTHON_USEDEP}] ~dev-python/zigpy-xbee-0.13.0[${PYTHON_USEDEP}] ~dev-python/zigpy-zigate-0.7.3[${PYTHON_USEDEP}] ~dev-python/zigpy-znp-0.5.1[${PYTHON_USEDEP}] )
+	zha? ( ~dev-python/bellows-0.25.0[${PYTHON_USEDEP}] ~dev-python/pyserial-3.5[${PYTHON_USEDEP}] ~dev-python/pyserial-asyncio-0.5[${PYTHON_USEDEP}] ~dev-python/zha-quirks-0.0.58[${PYTHON_USEDEP}] ~dev-python/zigpy-cc-0.5.2[${PYTHON_USEDEP}] ~dev-python/zigpy-deconz-0.12.0[${PYTHON_USEDEP}] ~dev-python/zigpy-0.35.1[${PYTHON_USEDEP}] ~dev-python/zigpy-xbee-0.13.0[${PYTHON_USEDEP}] ~dev-python/zigpy-zigate-0.7.3[${PYTHON_USEDEP}] ~dev-python/zigpy-znp-0.5.1[${PYTHON_USEDEP}] )
 	zhong_hong? ( ~dev-python/zhong-hong-hvac-1.0.9[${PYTHON_USEDEP}] )
 	ziggo_mediabox_xl? ( ~dev-python/ziggo-mediabox-xl-1.1.0[${PYTHON_USEDEP}] )
 	zoneminder? ( ~dev-python/zm-py-0.5.2[${PYTHON_USEDEP}] )
diff --git a/app-misc/homeassistant-full/homeassistant-full-9999.ebuild b/app-misc/homeassistant-full/homeassistant-full-9999.ebuild
index a638da188..d56c8d25d 100644
--- a/app-misc/homeassistant-full/homeassistant-full-9999.ebuild
+++ b/app-misc/homeassistant-full/homeassistant-full-9999.ebuild
@@ -546,7 +546,7 @@ RDEPEND="${RDEPEND}
 	niko_home_control? ( ~dev-python/niko-home-control-0.2.1[${PYTHON_USEDEP}] )
 	nilu? ( ~dev-python/niluclient-0.1.2[${PYTHON_USEDEP}] )
 	nissan_leaf? ( ~dev-python/pycarwings2-2.10[${PYTHON_USEDEP}] )
-	nmap_tracker? ( ~dev-python/netmap-0.7.0.2[${PYTHON_USEDEP}] ~dev-python/getmac-0.8.2[${PYTHON_USEDEP}] ~dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}] ~dev-python/mac-vendor-lookup-0.1.11[${PYTHON_USEDEP}] )
+	nmap_tracker? ( ~dev-python/python-nmap-0.6.1[${PYTHON_USEDEP}] ~dev-python/getmac-0.8.2[${PYTHON_USEDEP}] )
 	nmbs? ( ~dev-python/pyrail-0.0.3[${PYTHON_USEDEP}] )
 	noaa_tides? ( ~dev-python/noaa-coops-0.1.8[${PYTHON_USEDEP}] )
 	norway_air? ( ~dev-python/PyMetno-0.8.3[${PYTHON_USEDEP}] )
@@ -698,7 +698,7 @@ RDEPEND="${RDEPEND}
 	sighthound? ( ~dev-python/pillow-8.2.0[${PYTHON_USEDEP}] ~dev-python/simplehound-0.3[${PYTHON_USEDEP}] )
 	signal_messenger? ( ~dev-python/pysignalclirestapi-0.3.4[${PYTHON_USEDEP}] )
 	simplepush? ( ~dev-python/simplepush-1.1.4[${PYTHON_USEDEP}] )
-	simplisafe? ( ~dev-python/simplisafe-python-10.0.0[${PYTHON_USEDEP}] )
+	simplisafe? ( ~dev-python/simplisafe-python-11.0.0[${PYTHON_USEDEP}] )
 	sinch? ( ~dev-python/clx-sdk-xms-1.0.0[${PYTHON_USEDEP}] )
 	sisyphus? ( ~dev-python/sisyphus-control-3.0[${PYTHON_USEDEP}] )
 	skybeacon? ( ~dev-python/pygatt-4.0.5[${PYTHON_USEDEP}] )
@@ -726,7 +726,7 @@ RDEPEND="${RDEPEND}
 	solarlog? ( ~dev-python/sunwatcher-0.2.1[${PYTHON_USEDEP}] )
 	solax? ( ~dev-python/solax-0.2.6[${PYTHON_USEDEP}] )
 	soma? ( ~dev-python/pysoma-0.0.10[${PYTHON_USEDEP}] )
-	somfy? ( ~dev-python/pymfy-0.9.3[${PYTHON_USEDEP}] )
+	somfy? ( ~dev-python/pymfy-0.11.0[${PYTHON_USEDEP}] )
 	somfy_mylink? ( ~dev-python/somfy-mylink-synergy-1.0.6[${PYTHON_USEDEP}] )
 	sonarr? ( ~dev-python/sonarr-0.3.0[${PYTHON_USEDEP}] )
 	songpal? ( ~dev-python/python-songpal-0.12[${PYTHON_USEDEP}] )
diff --git a/app-misc/homeassistant-min/Manifest b/app-misc/homeassistant-min/Manifest
index 9fcd2abc2..44e58376b 100644
--- a/app-misc/homeassistant-min/Manifest
+++ b/app-misc/homeassistant-min/Manifest
@@ -17,9 +17,9 @@ DIST homeassistant-2021.6.3.tar.gz 9909029 BLAKE2B bd728075eb8727c72d54d7dbde4d8
 DIST homeassistant-2021.6.4.tar.gz 9910097 BLAKE2B 8977f7f955499d85cc58f3670c0a34a22a57045d4089e35c4288264dd86eda61f5f6b06870f44fde588108f3cd169851ca85dc522053c2250bd2afb008c85a3f SHA512 58c14eb230735e0b0e04b908729320b9ebc635f8257c82fab1dd0e06b937fdf95869e0917fa3f38ec37aeef123430ba825d2df38c64da1259a23821794150fd9
 DIST homeassistant-2021.6.5.tar.gz 9908738 BLAKE2B 054381c3d27c08e5b16569170aa1395fdfc0e456977854ee3d519c574a795291ed8bcf09419241901ae9efc0e059c5d4264424cac266790577371a3563ed154e SHA512 1bb2eeab3755f9dc276de4c17b4fb7b98986a06521b4a4a0304e751a2571352aacd971432e91c722bf979d0d6b940be8ab44ba4422cfb61f8e36f7cc517bacaa
 DIST homeassistant-2021.6.6.tar.gz 9909717 BLAKE2B 7e7d08e4aa4f3e0235feb1277528075c57dca715172369606dcccb658451a080bf9eeb5d536404b9bc63a77fe520564baf0725d4f8424c10f09639c051f1d5f1 SHA512 16e026601c48463ed690192bcc4aa716d8f42109859822cca1c0e521b3da5c228291c56ec312987e0225ac3e71dad27cbf91d4120ccad17bf2b5848d058bee4e
-DIST homeassistant-2021.7.0b1.tar.gz 10156269 BLAKE2B 0e396f49969057205d1556f59157d0133bda34725f6a5c24ad5abf7e8fae88a89bc14f83879ae48b3c9e2a0a33c87bcaa2897cd0088fc693499243c505036ea1 SHA512 dd228454f2ef4d84b3bf271ddd8fc58f14ad2afdb1b58cad192622039611d821e89577b12f9d65229e96f76f3563db00f857b0c5d66bd2de763b0d0488d247e0
 DIST homeassistant-2021.7.0b2.tar.gz 10156226 BLAKE2B a3e4b2fce962eafbea5848df4f06a6868220e5017ce623c119875864fb5de91d4a1a451a3f9f0f515af47d4332ced19b3717a07eeea6cf0f2a2efcbd6c9ee529 SHA512 c9c3e71b70bbe0e44d6edf9f3ebb33d5099923e8930ea16642e98da50a5f4f8087c72b77e80e7215e173db0bfd8ba66609bb1be261c1fefd99edba992c065437
 DIST homeassistant-2021.7.0b4.tar.gz 10157237 BLAKE2B 45ec0c23db457cf30d51c0676463ba74ce9ee37c8dc9aad9a2c869d10a0391dcb938ef58907f01ffa4d6d9be981533d579378f4dd4768bed67ddf909a69e03f2 SHA512 50d4b48d9565d37252e0d43f8f00bfdf2102bd78bf1a679c1012245f0b85207279c268786d63b5c8a8f0a8a5d7c3350bdb04e796915d278460143cfa5c128915
+DIST homeassistant-2021.7.0b5.tar.gz 10148685 BLAKE2B 7d999f438c3d64c7f5347fa15bad4df65da8bbde141c8d189ac283cefa7646ad319b95dde53e484e3acccf9d90690ac1173fa3cc892d6d022cf6c10bc976c0ee SHA512 e6ebd4b10668456d3c61eb8ce133c19a312736b84d6e8e1520a60f20de33d1983de5da948f335b3fc89fd90116879262be5744f5485515238723f80094194c53
 EBUILD homeassistant-min-2021.3.4-r1.ebuild 9978 BLAKE2B 15524fe60973ac25d707d0b03fdd78e9c8c0d2ff3637d966f913d307ca84efc62081db796fc5befc5f5e3c7f8466285049d6a44de359043d6a03c0e6363e7c6a SHA512 21b5739e6bd8c13068472b363f18775cb906b354e95fc94b3c8670863bd6e89e37754864cc6bf7487b48b0d7af90831d5804eb89edc87a45538efd30032920ef
 EBUILD homeassistant-min-2021.3.4-r2.ebuild 10050 BLAKE2B f1e03de76e26039914efbc5a984bbde6cb3225026f01a3eb7142065cb3e6f19785b63227df4353c20cbb145eeb0f42e919a5bda20e695eecd61aff625195a7aa SHA512 d8a43204f61dfb2dc36880320d4c5bbb1e33decc3fb8b2156bd4099198900513fac8291f3f0786b1b1ce8b3c621be476381de13599592086e997e2dd3698e385
 EBUILD homeassistant-min-2021.4.6.ebuild 10315 BLAKE2B b2acfc57a7fd0c1811b1f962cba0c2c9023c638159d348b22e14ada2e6b7d5837a401b814966d9e2e6b158a725a4e65bf19d28db65d218b40cbe1f05f94c7ab6 SHA512 0c7a20eb06d9e23d25377b275223ab1360ac3a0f1c7a9d8ff25522fa27e06348b6c8e54e3870f06694ba0cc70948c5e96018714bb12994807d16814c83bf55ef
@@ -29,11 +29,8 @@ EBUILD homeassistant-min-2021.6.2.ebuild 10499 BLAKE2B b328ec21c60757a5e7a26389b
 EBUILD homeassistant-min-2021.6.3.ebuild 10499 BLAKE2B 926679912941980b245e60bb92926e9ac776911a13452ad841682406c594f510195bcb6d9033eddcd7df2e684a975676051a3c75e5eab43e1999f6f2aa930df4 SHA512 ac4f027eb671fe906e80ec9bddd731e68b3a1ba52e8439e50775626292e0eacff4079d7a2f2ddfd7b4b6aa5edb42f0f0f597eb8828acc6b7eea2b21f509e0cc1
 EBUILD homeassistant-min-2021.6.4-r1.ebuild 11493 BLAKE2B 1bde189319d5aab91323fd2eb350c908703b55b930f2a8614994e527047d613ffd13b9bc5cd004d2bf47ac7b66144dced6a57836193c230e1c4d170c1ef7110c SHA512 ce34357e521c836366f900e13c02ca4fd5d920a543fdc8213264a09d79925bee1b1cb86fa5c04682fc1db078b14c6984cb05d2b5166ba02a97aac392746a5897
 EBUILD homeassistant-min-2021.6.5-r1.ebuild 11998 BLAKE2B 8f9fc8951904ace59382d02bb6caa47589512a3c91e6f9ceb10339f2be5fecdd7daad231f2b07e3f7c5712db5ef62b110d201d1920937786b302043532167bd0 SHA512 83c9e6a22188fd574f3c9b5fcabcada705a9a3e99f7ccb1651a00d4ee410af33b353f494cc925865526a9cf909c7fef19a19f2218c8392690e19b0cb33e1e738
-EBUILD homeassistant-min-2021.6.5.ebuild 11926 BLAKE2B 99293b6e939b4447943fdbf9f845244a64c02e37bf2da6dbe1ee09b1e777002198eca3c19115a17d7b912bdbe523306db91364d9fc39968b4129031a810ba1f4 SHA512 3e4e8137990a977017e5ba3f326552b8fc96d8a17c303eb0bcc9d42539059dff2481a2cd0a4fd308a7ea36c588d41a4a300a73ef78bb14feecbe97100609f02a
 EBUILD homeassistant-min-2021.6.6-r1.ebuild 12233 BLAKE2B 30ee78d7716dfab66d1072266eed74ad2b99009b9129c1923405fffb4eeb27a7cc541eabea41e6952f945106cf300412e4da522f0c08be7186abbe39701fdc0d SHA512 6cd35d171c71e30ee1dede4a1ef814c9f5987e6224faa670f1da1cd7055283a49fbe32b0dbcd17e77b8642d1a4d42829277df8a849741861da35ddc3beb78aa8
-EBUILD homeassistant-min-2021.6.6.ebuild 11998 BLAKE2B 8f9fc8951904ace59382d02bb6caa47589512a3c91e6f9ceb10339f2be5fecdd7daad231f2b07e3f7c5712db5ef62b110d201d1920937786b302043532167bd0 SHA512 83c9e6a22188fd574f3c9b5fcabcada705a9a3e99f7ccb1651a00d4ee410af33b353f494cc925865526a9cf909c7fef19a19f2218c8392690e19b0cb33e1e738
-EBUILD homeassistant-min-2021.7.0_beta1.ebuild 12191 BLAKE2B b6f6fc1129e020f9387bba990e7510f4b85b8141263de1abdb84e2d364d0169e059fccb7637a6b06b3c1fb8d260d3e3c99da9254a3c2adab71d17acd8562c42a SHA512 d02a4ec283e90f1a83556f51a256f742de8fda3ba68161e51510470b6e3d63e8e851d9bdf3a600cde655381c6aa2b7bbd691cf069ea19e03864b2770131cbace
 EBUILD homeassistant-min-2021.7.0_beta2-r1.ebuild 12191 BLAKE2B b6f6fc1129e020f9387bba990e7510f4b85b8141263de1abdb84e2d364d0169e059fccb7637a6b06b3c1fb8d260d3e3c99da9254a3c2adab71d17acd8562c42a SHA512 d02a4ec283e90f1a83556f51a256f742de8fda3ba68161e51510470b6e3d63e8e851d9bdf3a600cde655381c6aa2b7bbd691cf069ea19e03864b2770131cbace
-EBUILD homeassistant-min-2021.7.0_beta2.ebuild 12191 BLAKE2B b6f6fc1129e020f9387bba990e7510f4b85b8141263de1abdb84e2d364d0169e059fccb7637a6b06b3c1fb8d260d3e3c99da9254a3c2adab71d17acd8562c42a SHA512 d02a4ec283e90f1a83556f51a256f742de8fda3ba68161e51510470b6e3d63e8e851d9bdf3a600cde655381c6aa2b7bbd691cf069ea19e03864b2770131cbace
 EBUILD homeassistant-min-2021.7.0_beta4.ebuild 12191 BLAKE2B 88da8cbbda9988a02ddfe130b1691e4cd52500ab67e54852ab530fff9253c0713db664e8c0565084a4f60da73d320fbc482d446146414290b6efacf513e1e425 SHA512 cf1d469f8659e850ae791307f32766ef735ad4ab505a326e2feaa0b287a4402bef9354a2f9111bc9b5ad315d2a53296ac92acbc6341bf190ecd3582f3942a6d8
+EBUILD homeassistant-min-2021.7.0_beta5.ebuild 12191 BLAKE2B 88da8cbbda9988a02ddfe130b1691e4cd52500ab67e54852ab530fff9253c0713db664e8c0565084a4f60da73d320fbc482d446146414290b6efacf513e1e425 SHA512 cf1d469f8659e850ae791307f32766ef735ad4ab505a326e2feaa0b287a4402bef9354a2f9111bc9b5ad315d2a53296ac92acbc6341bf190ecd3582f3942a6d8
 MISC metadata.xml 6708 BLAKE2B 0bdb558683d961d7f5111c6bac11df513454222ced81c02acd7bfc7b88029d351da71722c8bf06844b664f6b2a30e165a2030fdf8cb313660ac50a0bbe1bbb3a SHA512 e909335c8d79bbcff525fefdf7424197e88019334844287858a48d3e0f129ca3b635eea6a12c0d54a5fc3843e4aa67f90fe8b1faaba1254491ec26ac8189430a
diff --git a/app-misc/homeassistant-min/homeassistant-min-2021.6.5.ebuild b/app-misc/homeassistant-min/homeassistant-min-2021.6.5.ebuild
deleted file mode 100644
index 1dd66adde..000000000
--- a/app-misc/homeassistant-min/homeassistant-min-2021.6.5.ebuild
+++ /dev/null
@@ -1,248 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{8,9} )
-inherit readme.gentoo-r1 eutils distutils-r1 systemd
-
-MY_PN=homeassistant
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/home-assistant/core.git"
-	EGIT_BRANCH="dev"
-	S="${WORKDIR}/core/"
-else
-	MY_PV=${PV/_beta/b}
-	MY_P=${MY_PN}-${MY_PV}
-	SRC_URI="https://github.com/home-assistant/core/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-	S="${WORKDIR}/core-${MY_PV}"
-fi
-
-DESCRIPTION="Open-source home automation platform running on Python 3.8"
-HOMEPAGE="https://home-assistant.io/ https://git.edevau.net/onkelbeh/HomeAssistantRepository/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-KEYWORDS="amd64 arm arm64 x86 amd64-linux x86-linux"
-IUSE="accuweather airly airvisual alpha_vantage androidtv android_ip_webcam axis bluetooth_le_tracker +caldav cast cli compensation coronavirus darksky +dwd_weather_warnings enigma2 esphome fronius github +homekit homekit_controller http hyperion influxdb knx kodi kraken maxcube mikrotik +mobile_app +mqtt myq mysensors +mysql +notify_events +otp owntracks +ping +plex ps4 +python_script qnap qvr_pro +recorder +rest ring samsungtv +scrape shelly signal_messenger +snmp socat sonos speedtestdotnet +sql +ssl systemd systemmonitor tasmota test tile tplink tradfri +version +wake_on_lan wemo whois workday yamaha yamaha_musiccast zeroconf +zwave zwave_js"
-
-# external deps
-RDEPEND="${PYTHON_DEPS} acct-group/${MY_PN} acct-user/${MY_PN}
-	|| ( dev-lang/python:3.8 dev-lang/python:3.9 )
-	app-admin/logrotate
-	dev-db/sqlite
-	dev-libs/libfastjson
-	>=dev-libs/xerces-c-3.1.4-r1"
-
-# make sure no conflicting main Ebuild is installed
-RDEPEND="${RDEPEND}
-	!app-misc/homeassistant
-	!app-misc/homeassistant-full"
-
-# Home Assistant Core dependencies
-# from package_constraints.txt
-RDEPEND="${RDEPEND}
-	~dev-python/aiodiscover-1.4.2[${PYTHON_USEDEP}]
-	~dev-python/aiohttp-3.7.4_p0[${PYTHON_USEDEP}]
-	~dev-python/aiohttp-cors-0.7.0[${PYTHON_USEDEP}]
-	~dev-python/astral-2.2[${PYTHON_USEDEP}]
-	~dev-python/async-upnp-client-0.18.0[${PYTHON_USEDEP}]
-	~dev-python/async_timeout-3.0.1[${PYTHON_USEDEP}]
-	~dev-python/attrs-21.2.0[${PYTHON_USEDEP}]
-	~dev-python/awesomeversion-21.4.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/backports-zoneinfo[${PYTHON_USEDEP}]' python3_8)
-	~dev-python/bcrypt-3.1.7[${PYTHON_USEDEP}]
-	>=dev-python/btlewrap-0.0.10[${PYTHON_USEDEP}]
-	>=dev-python/certifi-2020.12.5[${PYTHON_USEDEP}]
-	~dev-python/ciso8601-2.1.3[${PYTHON_USEDEP}]
-	~dev-python/cryptography-3.3.2[${PYTHON_USEDEP}]
-	~dev-python/defusedxml-0.7.1[${PYTHON_USEDEP}]
-	~dev-python/distro-1.5.0[${PYTHON_USEDEP}]
-	~dev-python/emoji-1.2.0[${PYTHON_USEDEP}]
-	~dev-python/grpcio-1.31.0[${PYTHON_USEDEP}]
-	>=dev-python/h11-0.12.0[${PYTHON_USEDEP}]
-	~dev-python/hass-nabucasa-0.43.0[${PYTHON_USEDEP}]
-	~dev-python/home-assistant-frontend-20210603.0[${PYTHON_USEDEP}]
-	~dev-python/httpcore-0.13.3[${PYTHON_USEDEP}]
-	>=dev-python/httplib2-0.19.0[${PYTHON_USEDEP}]
-	~dev-python/httpx-0.18.0[${PYTHON_USEDEP}]
-	~dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}]
-	~dev-python/jinja-3.0.1[${PYTHON_USEDEP}]
-	~dev-python/netdisco-2.8.3[${PYTHON_USEDEP}]
-	~dev-python/paho-mqtt-1.5.1[${PYTHON_USEDEP}]
-	~dev-python/pillow-8.1.2[${PYTHON_USEDEP}]
-	<dev-python/pip-20.3.0
-	>=dev-python/pycryptodome-3.6.6[${PYTHON_USEDEP}]
-	~dev-python/pyjwt-1.7.1[${PYTHON_USEDEP}]
-	~dev-python/pynacl-1.3.0[${PYTHON_USEDEP}]
-	~dev-python/python-slugify-4.0.1[${PYTHON_USEDEP}]
-	~dev-python/pyyaml-5.4.1[${PYTHON_USEDEP}]
-	~dev-python/requests-2.25.1[${PYTHON_USEDEP}]
-	~dev-python/ruamel-yaml-0.15.100[${PYTHON_USEDEP}]
-	~net-analyzer/scapy-2.4.5
-	~dev-python/sqlalchemy-1.4.13[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.24.3[${PYTHON_USEDEP}]
-	~dev-python/voluptuous-serialize-2.4.0[${PYTHON_USEDEP}]
-	~dev-python/voluptuous-0.12.1[${PYTHON_USEDEP}]
-	~dev-python/yarl-1.6.3[${PYTHON_USEDEP}]
-	~dev-python/zeroconf-0.31.0[${PYTHON_USEDEP}]"
-
-# unknown origin, still something to clean up here
-# some moved to suggested USE Flags
-
-RDEPEND="${RDEPEND}
-	~dev-python/colorlog-5.0.1[${PYTHON_USEDEP}]
-	~dev-python/gTTS-token-1.1.3[${PYTHON_USEDEP}]
-	>=dev-python/multidict-4.5.2[${PYTHON_USEDEP}]
-	~dev-python/numpy-1.20.3[${PYTHON_USEDEP}]
-	dev-python/pycparser[${PYTHON_USEDEP}]
-	>=dev-python/websocket-client-0.56.0[${PYTHON_USEDEP}]
-	~media-libs/mutagen-1.45.1"
-
-# Module requirements from useflags
-RDEPEND="${RDEPEND}
-	accuweather? ( ~dev-python/accuweather-0.2.0[${PYTHON_USEDEP}] )
-	airly? ( ~dev-python/airly-1.1.0[${PYTHON_USEDEP}] )
-	airvisual? ( ~dev-python/pyairvisual-5.0.8[${PYTHON_USEDEP}] )
-	alpha_vantage? ( ~dev-python/alpha-vantage-2.3.1[${PYTHON_USEDEP}] )
-	androidtv? ( ~dev-python/adb-shell-0.3.1[${PYTHON_USEDEP}] ~dev-python/androidtv-0.0.59[${PYTHON_USEDEP}] ~dev-python/pure-python-adb-0.3.0[${PYTHON_USEDEP}] )
-	android_ip_webcam? ( ~dev-python/pydroid-ipcam-0.8[${PYTHON_USEDEP}] )
-	axis? ( ~dev-python/axis-44[${PYTHON_USEDEP}] )
-	bluetooth_le_tracker? ( ~dev-python/pygatt-4.0.5[${PYTHON_USEDEP}] )
-	caldav? ( ~dev-python/caldav-0.7.1[${PYTHON_USEDEP}] )
-	cast? ( ~dev-python/pychromecast-9.1.2[${PYTHON_USEDEP}] )
-	cli? ( app-misc/home-assistant-cli )
-	compensation? ( ~dev-python/numpy-1.20.3[${PYTHON_USEDEP}] )
-	coronavirus? ( ~dev-python/coronavirus-1.1.1[${PYTHON_USEDEP}] )
-	darksky? ( ~dev-python/python-forecastio-1.4.0[${PYTHON_USEDEP}] )
-	dwd_weather_warnings? ( ~dev-python/dwdwfsapi-1.0.4[${PYTHON_USEDEP}] )
-	enigma2? ( ~dev-python/openwebifpy-3.2.7[${PYTHON_USEDEP}] )
-	esphome? ( ~dev-python/aioesphomeapi-2.8.0[${PYTHON_USEDEP}] )
-	fronius? ( ~dev-python/PyFronius-0.4.6[${PYTHON_USEDEP}] )
-	github? ( ~dev-python/PyGithub-1.43.8[${PYTHON_USEDEP}] )
-	homekit? ( ~dev-python/HAP-python-3.5.0[${PYTHON_USEDEP}] ~dev-python/fnvhash-0.1.0[${PYTHON_USEDEP}] ~dev-python/pyqrcode-1.2.1[${PYTHON_USEDEP}] ~dev-python/base36-0.1.1[${PYTHON_USEDEP}] ~dev-python/PyTurboJPEG-1.5.0[${PYTHON_USEDEP}] )
-	homekit_controller? ( ~dev-python/aiohomekit-0.2.67[${PYTHON_USEDEP}] )
-	http? ( ~dev-python/aiohttp-cors-0.7.0[${PYTHON_USEDEP}] )
-	hyperion? ( ~dev-python/hyperion-py-0.7.4[${PYTHON_USEDEP}] )
-	influxdb? ( ~dev-python/influxdb-5.2.3[${PYTHON_USEDEP}] ~dev-python/influxdb-client-1.14.0[${PYTHON_USEDEP}] )
-	knx? ( ~dev-python/xknx-0.18.4[${PYTHON_USEDEP}] )
-	kodi? ( ~dev-python/pykodi-0.2.5[${PYTHON_USEDEP}] )
-	kraken? ( ~dev-python/krakenex-2.1.0[${PYTHON_USEDEP}] ~dev-python/pykrakenapi-0.1.8[${PYTHON_USEDEP}] )
-	maxcube? ( ~dev-python/maxcube-api-0.4.3[${PYTHON_USEDEP}] )
-	mikrotik? ( ~dev-python/librouteros-3.0.0[${PYTHON_USEDEP}] )
-	mobile_app? ( ~dev-python/pynacl-1.3.0[${PYTHON_USEDEP}] ~dev-python/emoji-1.2.0[${PYTHON_USEDEP}] )
-	mqtt? ( ~dev-python/paho-mqtt-1.5.1[${PYTHON_USEDEP}] )
-	myq? ( ~dev-python/pymyq-3.0.4[${PYTHON_USEDEP}] )
-	mysensors? ( ~dev-python/pymysensors-0.21.0[${PYTHON_USEDEP}] )
-	mysql? ( dev-python/mysql-connector-python[${PYTHON_USEDEP}] dev-python/mysqlclient[${PYTHON_USEDEP}] )
-	notify_events? ( ~dev-python/notify-events-1.0.4[${PYTHON_USEDEP}] )
-	otp? ( ~dev-python/pyotp-2.3.0[${PYTHON_USEDEP}] )
-	owntracks? ( ~dev-python/pynacl-1.3.0[${PYTHON_USEDEP}] )
-	ping? ( ~dev-python/icmplib-2.1.1[${PYTHON_USEDEP}] )
-	plex? ( ~dev-python/PlexAPI-4.5.1[${PYTHON_USEDEP}] ~dev-python/plexauth-0.0.6[${PYTHON_USEDEP}] ~dev-python/plexwebsocket-0.0.13[${PYTHON_USEDEP}] )
-	ps4? ( ~dev-python/pyps4-2ndscreen-1.2.0[${PYTHON_USEDEP}] )
-	python_script? ( ~dev-python/RestrictedPython-5.1[${PYTHON_USEDEP}] )
-	qnap? ( ~dev-python/qnapstats-0.3.1[${PYTHON_USEDEP}] )
-	qvr_pro? ( ~dev-python/pyqvrpro-0.52[${PYTHON_USEDEP}] )
-	recorder? ( ~dev-python/sqlalchemy-1.4.13[${PYTHON_USEDEP}] )
-	rest? ( ~dev-python/jsonpath-0.82[${PYTHON_USEDEP}] ~dev-python/xmltodict-0.12.0[${PYTHON_USEDEP}] )
-	ring? ( ~dev-python/ring-doorbell-0.6.2[${PYTHON_USEDEP}] )
-	samsungtv? ( ~dev-python/samsungctl-0.7.1[${PYTHON_USEDEP}] ~dev-python/samsungtvws-1.6.0[${PYTHON_USEDEP}] ~dev-python/wakeonlan-2.0.1[${PYTHON_USEDEP}] )
-	scrape? ( ~dev-python/beautifulsoup-4.9.3[${PYTHON_USEDEP}] )
-	shelly? ( ~dev-python/aioshelly-0.6.4[${PYTHON_USEDEP}] )
-	signal_messenger? ( ~dev-python/pysignalclirestapi-0.3.4[${PYTHON_USEDEP}] )
-	snmp? ( ~dev-python/pysnmp-4.4.12[${PYTHON_USEDEP}] )
-	socat? ( net-misc/socat )
-	sonos? ( ~dev-python/pysonos-0.0.49[${PYTHON_USEDEP}] )
-	speedtestdotnet? ( ~net-analyzer/speedtest-cli-2.1.3[${PYTHON_USEDEP}] )
-	sql? ( ~dev-python/sqlalchemy-1.4.13[${PYTHON_USEDEP}] )
-	ssl? ( dev-libs/openssl app-crypt/certbot net-proxy/haproxy )
-	systemmonitor? ( ~dev-python/psutil-5.8.0[${PYTHON_USEDEP}] )
-	tasmota? ( ~dev-python/HATasmota-0.2.14[${PYTHON_USEDEP}] )
-	tile? ( ~dev-python/pytile-5.2.0[${PYTHON_USEDEP}] )
-	tplink? ( ~dev-python/pyHS100-0.3.5.2[${PYTHON_USEDEP}] )
-	tradfri? ( ~dev-python/pytradfri-7.0.6[${PYTHON_USEDEP}] )
-	version? ( ~dev-python/pyhaversion-21.5.0[${PYTHON_USEDEP}] )
-	wake_on_lan? ( ~dev-python/wakeonlan-2.0.1[${PYTHON_USEDEP}] )
-	wemo? ( ~dev-python/pywemo-0.6.3[${PYTHON_USEDEP}] )
-	whois? ( ~dev-python/python-whois-0.7.3[${PYTHON_USEDEP}] )
-	workday? ( ~dev-python/holidays-0.11.1[${PYTHON_USEDEP}] )
-	yamaha? ( ~dev-python/rxv-0.6.0[${PYTHON_USEDEP}] )
-	yamaha_musiccast? ( ~dev-python/pymusiccast-0.1.6[${PYTHON_USEDEP}] )
-	zeroconf? ( ~dev-python/zeroconf-0.31.0[${PYTHON_USEDEP}] )
-	zwave? ( ~dev-python/homeassistant-pyozw-0.1.10[${PYTHON_USEDEP}] ~dev-python/PyDispatcher-2.0.5[${PYTHON_USEDEP}] )
-	zwave_js? ( ~dev-python/zwave-js-server-python-0.26.1[${PYTHON_USEDEP}] )"
-
-BDEPEND="${RDEPEND}
-	test? (
-		~dev-python/codecov-2.1.10[${PYTHON_USEDEP}]
-		~dev-python/coverage-5.5[${PYTHON_USEDEP}]
-		~dev-python/jsonpickle-1.4.1[${PYTHON_USEDEP}]
-		~dev-python/mock-open-1.4.0[${PYTHON_USEDEP}]
-		~dev-python/mypy-0.812[${PYTHON_USEDEP}]
-		~dev-python/pipdeptree-1.0.0[${PYTHON_USEDEP}]
-		~dev-vcs/pre-commit-2.13.0
-		~dev-python/pylint-strict-informational-0.1[${PYTHON_USEDEP}]
-		~dev-python/pylint-2.8.2[${PYTHON_USEDEP}]
-		~dev-python/pytest-cov-2.10.1[${PYTHON_USEDEP}]
-		~dev-python/pytest-sugar-0.9.4[${PYTHON_USEDEP}]
-		~dev-python/pytest-test-groups-1.0.3[${PYTHON_USEDEP}]
-		~dev-python/pytest-timeout-1.4.2[${PYTHON_USEDEP}]
-		~dev-python/pytest-xdist-2.2.1[${PYTHON_USEDEP}]
-		~dev-python/pytest-6.2.4[${PYTHON_USEDEP}]
-		~dev-python/requests-mock-1.9.2[${PYTHON_USEDEP}]
-		~dev-python/responses-0.12.0[${PYTHON_USEDEP}]
-		~dev-python/respx-0.17.0[${PYTHON_USEDEP}]
-		~dev-python/stdlib-list-0.7.0[${PYTHON_USEDEP}]
-		~dev-python/tqdm-4.49.0[${PYTHON_USEDEP}]
-	)
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]"
-
-INSTALL_DIR="/opt/${MY_PN}"
-
-DISABLE_AUTOFORMATTING=1
-DOC_CONTENTS="
-The HA interface listens on port 8123
-hass configuration is in: /etc/${MY_PN}
-daemon command line arguments are configured in: /etc/conf.d/${MY_PN}
-logging is to: /var/log/${MY_PN}/{server,errors,stdout}.log
-The sqlite db is by default in: /etc/${MY_PN}
-support at https://git.edevau.net/onkelbeh/HomeAssistantRepository
-"
-
-S="${WORKDIR}/core-${MY_PV}"
-
-DOCS="README.rst"
-
-python_install_all() {
-	dodoc ${DOCS}
-	distutils-r1_python_install_all
-	keepdir "$INSTALL_DIR"
-	keepdir "/etc/${MY_PN}"
-	fowners -R "${MY_PN}:${MY_PN}" "/etc/${MY_PN}"
-	keepdir "/var/log/${MY_PN}"
-	fowners -R "${MY_PN}:${MY_PN}" "/var/log/${MY_PN}"
-	newconfd "${FILESDIR}/${MY_PN}.conf.d" "${MY_PN}"
-	newinitd "${FILESDIR}/${MY_PN}.init.d" "${MY_PN}"
-	use systemd && systemd_dounit "${FILESDIR}/${MY_PN}.service"
-	dobin "${FILESDIR}/hasstest"
-	if use socat ; then
-		newinitd "${FILESDIR}/socat-zwave.init.d" "socat-zwave"
-		sed -i -e 's/# need socat-zwave/need socat-zwave/g' "${D}/etc/init.d/${MY_PN}" || die
-	fi
-	if use mqtt ; then
-		sed -i -e 's/# need mosquitto/need mosquitto/g' "${D}/etc/init.d/${MY_PN}" || die
-	fi
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${MY_PN}.logrotate" "${MY_PN}"
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
-
diff --git a/app-misc/homeassistant-min/homeassistant-min-2021.6.6.ebuild b/app-misc/homeassistant-min/homeassistant-min-2021.6.6.ebuild
deleted file mode 100644
index ac7bf4de1..000000000
--- a/app-misc/homeassistant-min/homeassistant-min-2021.6.6.ebuild
+++ /dev/null
@@ -1,249 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{8,9} )
-inherit readme.gentoo-r1 eutils distutils-r1 systemd
-
-MY_PN=homeassistant
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/home-assistant/core.git"
-	EGIT_BRANCH="dev"
-	S="${WORKDIR}/core/"
-else
-	MY_PV=${PV/_beta/b}
-	MY_P=${MY_PN}-${MY_PV}
-	SRC_URI="https://github.com/home-assistant/core/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-	S="${WORKDIR}/core-${MY_PV}"
-fi
-
-DESCRIPTION="Open-source home automation platform running on Python 3.8"
-HOMEPAGE="https://home-assistant.io/ https://git.edevau.net/onkelbeh/HomeAssistantRepository/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-KEYWORDS="amd64 arm arm64 x86 amd64-linux x86-linux"
-IUSE="accuweather airly airvisual alpha_vantage androidtv android_ip_webcam axis bluetooth_le_tracker +caldav cast cli compensation coronavirus darksky +dwd_weather_warnings enigma2 esphome fronius github +homekit homekit_controller http hyperion influxdb knx kodi kraken maxcube mikrotik +mobile_app +mqtt myq mysensors +mysql +notify_events +otp owntracks ozw +ping +plex ps4 +python_script qnap qvr_pro +recorder +rest ring samsungtv +scrape shelly signal_messenger +snmp socat sonos speedtestdotnet +sql +ssl systemd systemmonitor tasmota test tile tplink tradfri +version +wake_on_lan wemo whois workday yamaha yamaha_musiccast zeroconf +zwave zwave_js"
-
-# external deps
-RDEPEND="${PYTHON_DEPS} acct-group/${MY_PN} acct-user/${MY_PN}
-	|| ( dev-lang/python:3.8 dev-lang/python:3.9 )
-	app-admin/logrotate
-	dev-db/sqlite
-	dev-libs/libfastjson
-	>=dev-libs/xerces-c-3.1.4-r1"
-
-# make sure no conflicting main Ebuild is installed
-RDEPEND="${RDEPEND}
-	!app-misc/homeassistant
-	!app-misc/homeassistant-full"
-
-# Home Assistant Core dependencies
-# from package_constraints.txt
-RDEPEND="${RDEPEND}
-	~dev-python/aiodiscover-1.4.2[${PYTHON_USEDEP}]
-	~dev-python/aiohttp-3.7.4_p0[${PYTHON_USEDEP}]
-	~dev-python/aiohttp-cors-0.7.0[${PYTHON_USEDEP}]
-	~dev-python/astral-2.2[${PYTHON_USEDEP}]
-	~dev-python/async-upnp-client-0.18.0[${PYTHON_USEDEP}]
-	~dev-python/async_timeout-3.0.1[${PYTHON_USEDEP}]
-	~dev-python/attrs-21.2.0[${PYTHON_USEDEP}]
-	~dev-python/awesomeversion-21.4.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/backports-zoneinfo[${PYTHON_USEDEP}]' python3_8)
-	~dev-python/bcrypt-3.1.7[${PYTHON_USEDEP}]
-	>=dev-python/btlewrap-0.0.10[${PYTHON_USEDEP}]
-	>=dev-python/certifi-2020.12.5[${PYTHON_USEDEP}]
-	~dev-python/ciso8601-2.1.3[${PYTHON_USEDEP}]
-	~dev-python/cryptography-3.3.2[${PYTHON_USEDEP}]
-	~dev-python/defusedxml-0.7.1[${PYTHON_USEDEP}]
-	~dev-python/distro-1.5.0[${PYTHON_USEDEP}]
-	~dev-python/emoji-1.2.0[${PYTHON_USEDEP}]
-	~dev-python/grpcio-1.31.0[${PYTHON_USEDEP}]
-	>=dev-python/h11-0.12.0[${PYTHON_USEDEP}]
-	~dev-python/hass-nabucasa-0.43.0[${PYTHON_USEDEP}]
-	~dev-python/home-assistant-frontend-20210603.0[${PYTHON_USEDEP}]
-	~dev-python/httpcore-0.13.3[${PYTHON_USEDEP}]
-	>=dev-python/httplib2-0.19.0[${PYTHON_USEDEP}]
-	~dev-python/httpx-0.18.0[${PYTHON_USEDEP}]
-	~dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}]
-	~dev-python/jinja-3.0.1[${PYTHON_USEDEP}]
-	~dev-python/netdisco-2.8.3[${PYTHON_USEDEP}]
-	~dev-python/paho-mqtt-1.5.1[${PYTHON_USEDEP}]
-	~dev-python/pillow-8.1.2[${PYTHON_USEDEP}]
-	<dev-python/pip-20.3.0
-	>=dev-python/pycryptodome-3.6.6[${PYTHON_USEDEP}]
-	~dev-python/pyjwt-1.7.1[${PYTHON_USEDEP}]
-	~dev-python/pynacl-1.3.0[${PYTHON_USEDEP}]
-	~dev-python/python-slugify-4.0.1[${PYTHON_USEDEP}]
-	~dev-python/pyyaml-5.4.1[${PYTHON_USEDEP}]
-	~dev-python/requests-2.25.1[${PYTHON_USEDEP}]
-	~dev-python/ruamel-yaml-0.15.100[${PYTHON_USEDEP}]
-	~net-analyzer/scapy-2.4.5
-	~dev-python/sqlalchemy-1.4.13[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.24.3[${PYTHON_USEDEP}]
-	~dev-python/voluptuous-serialize-2.4.0[${PYTHON_USEDEP}]
-	~dev-python/voluptuous-0.12.1[${PYTHON_USEDEP}]
-	~dev-python/yarl-1.6.3[${PYTHON_USEDEP}]
-	~dev-python/zeroconf-0.31.0[${PYTHON_USEDEP}]"
-
-# unknown origin, still something to clean up here
-# some moved to suggested USE Flags
-
-RDEPEND="${RDEPEND}
-	~dev-python/colorlog-5.0.1[${PYTHON_USEDEP}]
-	~dev-python/gTTS-token-1.1.3[${PYTHON_USEDEP}]
-	>=dev-python/multidict-4.5.2[${PYTHON_USEDEP}]
-	~dev-python/numpy-1.20.3[${PYTHON_USEDEP}]
-	dev-python/pycparser[${PYTHON_USEDEP}]
-	>=dev-python/websocket-client-0.56.0[${PYTHON_USEDEP}]
-	~media-libs/mutagen-1.45.1"
-
-# Module requirements from useflags
-RDEPEND="${RDEPEND}
-	accuweather? ( ~dev-python/accuweather-0.2.0[${PYTHON_USEDEP}] )
-	airly? ( ~dev-python/airly-1.1.0[${PYTHON_USEDEP}] )
-	airvisual? ( ~dev-python/pyairvisual-5.0.8[${PYTHON_USEDEP}] )
-	alpha_vantage? ( ~dev-python/alpha-vantage-2.3.1[${PYTHON_USEDEP}] )
-	androidtv? ( ~dev-python/adb-shell-0.3.1[${PYTHON_USEDEP}] ~dev-python/androidtv-0.0.59[${PYTHON_USEDEP}] ~dev-python/pure-python-adb-0.3.0[${PYTHON_USEDEP}] )
-	android_ip_webcam? ( ~dev-python/pydroid-ipcam-0.8[${PYTHON_USEDEP}] )
-	axis? ( ~dev-python/axis-44[${PYTHON_USEDEP}] )
-	bluetooth_le_tracker? ( ~dev-python/pygatt-4.0.5[${PYTHON_USEDEP}] )
-	caldav? ( ~dev-python/caldav-0.7.1[${PYTHON_USEDEP}] )
-	cast? ( ~dev-python/pychromecast-9.1.2[${PYTHON_USEDEP}] )
-	cli? ( app-misc/home-assistant-cli )
-	compensation? ( ~dev-python/numpy-1.20.3[${PYTHON_USEDEP}] )
-	coronavirus? ( ~dev-python/coronavirus-1.1.1[${PYTHON_USEDEP}] )
-	darksky? ( ~dev-python/python-forecastio-1.4.0[${PYTHON_USEDEP}] )
-	dwd_weather_warnings? ( ~dev-python/dwdwfsapi-1.0.4[${PYTHON_USEDEP}] )
-	enigma2? ( ~dev-python/openwebifpy-3.2.7[${PYTHON_USEDEP}] )
-	esphome? ( ~dev-python/aioesphomeapi-2.8.0[${PYTHON_USEDEP}] )
-	fronius? ( ~dev-python/PyFronius-0.4.6[${PYTHON_USEDEP}] )
-	github? ( ~dev-python/PyGithub-1.43.8[${PYTHON_USEDEP}] )
-	homekit? ( ~dev-python/HAP-python-3.5.0[${PYTHON_USEDEP}] ~dev-python/fnvhash-0.1.0[${PYTHON_USEDEP}] ~dev-python/pyqrcode-1.2.1[${PYTHON_USEDEP}] ~dev-python/base36-0.1.1[${PYTHON_USEDEP}] ~dev-python/PyTurboJPEG-1.5.0[${PYTHON_USEDEP}] )
-	homekit_controller? ( ~dev-python/aiohomekit-0.2.67[${PYTHON_USEDEP}] )
-	http? ( ~dev-python/aiohttp-cors-0.7.0[${PYTHON_USEDEP}] )
-	hyperion? ( ~dev-python/hyperion-py-0.7.4[${PYTHON_USEDEP}] )
-	influxdb? ( ~dev-python/influxdb-5.2.3[${PYTHON_USEDEP}] ~dev-python/influxdb-client-1.14.0[${PYTHON_USEDEP}] )
-	knx? ( ~dev-python/xknx-0.18.4[${PYTHON_USEDEP}] )
-	kodi? ( ~dev-python/pykodi-0.2.5[${PYTHON_USEDEP}] )
-	kraken? ( ~dev-python/krakenex-2.1.0[${PYTHON_USEDEP}] ~dev-python/pykrakenapi-0.1.8[${PYTHON_USEDEP}] )
-	maxcube? ( ~dev-python/maxcube-api-0.4.3[${PYTHON_USEDEP}] )
-	mikrotik? ( ~dev-python/librouteros-3.0.0[${PYTHON_USEDEP}] )
-	mobile_app? ( ~dev-python/pynacl-1.3.0[${PYTHON_USEDEP}] ~dev-python/emoji-1.2.0[${PYTHON_USEDEP}] )
-	mqtt? ( ~dev-python/paho-mqtt-1.5.1[${PYTHON_USEDEP}] )
-	myq? ( ~dev-python/pymyq-3.0.4[${PYTHON_USEDEP}] )
-	mysensors? ( ~dev-python/pymysensors-0.21.0[${PYTHON_USEDEP}] )
-	mysql? ( dev-python/mysql-connector-python[${PYTHON_USEDEP}] dev-python/mysqlclient[${PYTHON_USEDEP}] )
-	notify_events? ( ~dev-python/notify-events-1.0.4[${PYTHON_USEDEP}] )
-	otp? ( ~dev-python/pyotp-2.3.0[${PYTHON_USEDEP}] )
-	owntracks? ( ~dev-python/pynacl-1.3.0[${PYTHON_USEDEP}] )
-	ozw? ( ~dev-python/python-openzwave-mqtt-1.4.0[${PYTHON_USEDEP}] )
-	ping? ( ~dev-python/icmplib-2.1.1[${PYTHON_USEDEP}] )
-	plex? ( ~dev-python/PlexAPI-4.5.1[${PYTHON_USEDEP}] ~dev-python/plexauth-0.0.6[${PYTHON_USEDEP}] ~dev-python/plexwebsocket-0.0.13[${PYTHON_USEDEP}] )
-	ps4? ( ~dev-python/pyps4-2ndscreen-1.2.0[${PYTHON_USEDEP}] )
-	python_script? ( ~dev-python/RestrictedPython-5.1[${PYTHON_USEDEP}] )
-	qnap? ( ~dev-python/qnapstats-0.3.1[${PYTHON_USEDEP}] )
-	qvr_pro? ( ~dev-python/pyqvrpro-0.52[${PYTHON_USEDEP}] )
-	recorder? ( ~dev-python/sqlalchemy-1.4.13[${PYTHON_USEDEP}] )
-	rest? ( ~dev-python/jsonpath-0.82[${PYTHON_USEDEP}] ~dev-python/xmltodict-0.12.0[${PYTHON_USEDEP}] )
-	ring? ( ~dev-python/ring-doorbell-0.6.2[${PYTHON_USEDEP}] )
-	samsungtv? ( ~dev-python/samsungctl-0.7.1[${PYTHON_USEDEP}] ~dev-python/samsungtvws-1.6.0[${PYTHON_USEDEP}] ~dev-python/wakeonlan-2.0.1[${PYTHON_USEDEP}] )
-	scrape? ( ~dev-python/beautifulsoup-4.9.3[${PYTHON_USEDEP}] )
-	shelly? ( ~dev-python/aioshelly-0.6.4[${PYTHON_USEDEP}] )
-	signal_messenger? ( ~dev-python/pysignalclirestapi-0.3.4[${PYTHON_USEDEP}] )
-	snmp? ( ~dev-python/pysnmp-4.4.12[${PYTHON_USEDEP}] )
-	socat? ( net-misc/socat )
-	sonos? ( ~dev-python/pysonos-0.0.49[${PYTHON_USEDEP}] )
-	speedtestdotnet? ( ~net-analyzer/speedtest-cli-2.1.3[${PYTHON_USEDEP}] )
-	sql? ( ~dev-python/sqlalchemy-1.4.13[${PYTHON_USEDEP}] )
-	ssl? ( dev-libs/openssl app-crypt/certbot net-proxy/haproxy )
-	systemmonitor? ( ~dev-python/psutil-5.8.0[${PYTHON_USEDEP}] )
-	tasmota? ( ~dev-python/HATasmota-0.2.14[${PYTHON_USEDEP}] )
-	tile? ( ~dev-python/pytile-5.2.0[${PYTHON_USEDEP}] )
-	tplink? ( ~dev-python/pyHS100-0.3.5.2[${PYTHON_USEDEP}] )
-	tradfri? ( ~dev-python/pytradfri-7.0.6[${PYTHON_USEDEP}] )
-	version? ( ~dev-python/pyhaversion-21.5.0[${PYTHON_USEDEP}] )
-	wake_on_lan? ( ~dev-python/wakeonlan-2.0.1[${PYTHON_USEDEP}] )
-	wemo? ( ~dev-python/pywemo-0.6.3[${PYTHON_USEDEP}] )
-	whois? ( ~dev-python/python-whois-0.7.3[${PYTHON_USEDEP}] )
-	workday? ( ~dev-python/holidays-0.11.1[${PYTHON_USEDEP}] )
-	yamaha? ( ~dev-python/rxv-0.6.0[${PYTHON_USEDEP}] )
-	yamaha_musiccast? ( ~dev-python/pymusiccast-0.1.6[${PYTHON_USEDEP}] )
-	zeroconf? ( ~dev-python/zeroconf-0.31.0[${PYTHON_USEDEP}] )
-	zwave? ( ~dev-python/homeassistant-pyozw-0.1.10[${PYTHON_USEDEP}] ~dev-python/PyDispatcher-2.0.5[${PYTHON_USEDEP}] )
-	zwave_js? ( ~dev-python/zwave-js-server-python-0.26.1[${PYTHON_USEDEP}] )"
-
-BDEPEND="${RDEPEND}
-	test? (
-		~dev-python/codecov-2.1.10[${PYTHON_USEDEP}]
-		~dev-python/coverage-5.5[${PYTHON_USEDEP}]
-		~dev-python/jsonpickle-1.4.1[${PYTHON_USEDEP}]
-		~dev-python/mock-open-1.4.0[${PYTHON_USEDEP}]
-		~dev-python/mypy-0.812[${PYTHON_USEDEP}]
-		~dev-python/pipdeptree-1.0.0[${PYTHON_USEDEP}]
-		~dev-vcs/pre-commit-2.13.0
-		~dev-python/pylint-strict-informational-0.1[${PYTHON_USEDEP}]
-		~dev-python/pylint-2.8.2[${PYTHON_USEDEP}]
-		~dev-python/pytest-cov-2.10.1[${PYTHON_USEDEP}]
-		~dev-python/pytest-sugar-0.9.4[${PYTHON_USEDEP}]
-		~dev-python/pytest-test-groups-1.0.3[${PYTHON_USEDEP}]
-		~dev-python/pytest-timeout-1.4.2[${PYTHON_USEDEP}]
-		~dev-python/pytest-xdist-2.2.1[${PYTHON_USEDEP}]
-		~dev-python/pytest-6.2.4[${PYTHON_USEDEP}]
-		~dev-python/requests-mock-1.9.2[${PYTHON_USEDEP}]
-		~dev-python/responses-0.12.0[${PYTHON_USEDEP}]
-		~dev-python/respx-0.17.0[${PYTHON_USEDEP}]
-		~dev-python/stdlib-list-0.7.0[${PYTHON_USEDEP}]
-		~dev-python/tqdm-4.49.0[${PYTHON_USEDEP}]
-	)
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]"
-
-INSTALL_DIR="/opt/${MY_PN}"
-
-DISABLE_AUTOFORMATTING=1
-DOC_CONTENTS="
-The HA interface listens on port 8123
-hass configuration is in: /etc/${MY_PN}
-daemon command line arguments are configured in: /etc/conf.d/${MY_PN}
-logging is to: /var/log/${MY_PN}/{server,errors,stdout}.log
-The sqlite db is by default in: /etc/${MY_PN}
-support at https://git.edevau.net/onkelbeh/HomeAssistantRepository
-"
-
-S="${WORKDIR}/core-${MY_PV}"
-
-DOCS="README.rst"
-
-python_install_all() {
-	dodoc ${DOCS}
-	distutils-r1_python_install_all
-	keepdir "$INSTALL_DIR"
-	keepdir "/etc/${MY_PN}"
-	fowners -R "${MY_PN}:${MY_PN}" "/etc/${MY_PN}"
-	keepdir "/var/log/${MY_PN}"
-	fowners -R "${MY_PN}:${MY_PN}" "/var/log/${MY_PN}"
-	newconfd "${FILESDIR}/${MY_PN}.conf.d" "${MY_PN}"
-	newinitd "${FILESDIR}/${MY_PN}.init.d" "${MY_PN}"
-	use systemd && systemd_dounit "${FILESDIR}/${MY_PN}.service"
-	dobin "${FILESDIR}/hasstest"
-	if use socat ; then
-		newinitd "${FILESDIR}/socat-zwave.init.d" "socat-zwave"
-		sed -i -e 's/# need socat-zwave/need socat-zwave/g' "${D}/etc/init.d/${MY_PN}" || die
-	fi
-	if use mqtt ; then
-		sed -i -e 's/# need mosquitto/need mosquitto/g' "${D}/etc/init.d/${MY_PN}" || die
-	fi
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${MY_PN}.logrotate" "${MY_PN}"
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
-
diff --git a/app-misc/homeassistant-min/homeassistant-min-2021.7.0_beta2.ebuild b/app-misc/homeassistant-min/homeassistant-min-2021.7.0_beta2.ebuild
deleted file mode 100644
index 3c5447fa0..000000000
--- a/app-misc/homeassistant-min/homeassistant-min-2021.7.0_beta2.ebuild
+++ /dev/null
@@ -1,253 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit readme.gentoo-r1 eutils distutils-r1 systemd
-
-MY_PN=homeassistant
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/home-assistant/core.git"
-	EGIT_BRANCH="dev"
-	S="${WORKDIR}/core/"
-else
-	MY_PV=${PV/_beta/b}
-	MY_P=${MY_PN}-${MY_PV}
-	SRC_URI="https://github.com/home-assistant/core/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-	S="${WORKDIR}/core-${MY_PV}"
-fi
-
-DESCRIPTION="Open-source home automation platform running on Python 3.9"
-HOMEPAGE="https://home-assistant.io/ https://git.edevau.net/onkelbeh/HomeAssistantRepository/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="accuweather airly airvisual alpha_vantage androidtv android_ip_webcam axis bluetooth_le_tracker +caldav cast cli compensation coronavirus darksky +dwd_weather_warnings enigma2 esphome fronius github +homekit homekit_controller http hyperion influxdb knx kodi kraken maxcube mikrotik +mobile_app +mqtt myq mysensors +mysql +notify_events +otp owntracks ozw +ping +plex ps4 +python_script qnap qvr_pro +recorder +rest ring samsungtv +scrape shelly signal_messenger +snmp socat sonos speedtestdotnet +sql +ssl systemd systemmonitor tasmota test tile tplink tradfri +version +wake_on_lan wemo whois workday yamaha yamaha_musiccast zeroconf +zwave zwave_js"
-
-# external deps
-RDEPEND="${PYTHON_DEPS} acct-group/${MY_PN} acct-user/${MY_PN}
-	|| ( dev-lang/python:3.8 dev-lang/python:3.9 )
-	app-admin/logrotate
-	dev-db/sqlite
-	dev-libs/libfastjson
-	>=dev-libs/xerces-c-3.1.4-r1"
-
-# make sure no conflicting main Ebuild is installed
-RDEPEND="${RDEPEND}
-	!app-misc/homeassistant
-	!app-misc/homeassistant-full"
-
-# Home Assistant Core dependencies
-# from package_constraints.txt
-RDEPEND="${RDEPEND}
-	~dev-python/aiodiscover-1.4.2[${PYTHON_USEDEP}]
-	~dev-python/aiohttp-3.7.4_p0[${PYTHON_USEDEP}]
-	~dev-python/aiohttp-cors-0.7.0[${PYTHON_USEDEP}]
-	~dev-python/astral-2.2[${PYTHON_USEDEP}]
-	~dev-python/async-upnp-client-0.19.0[${PYTHON_USEDEP}]
-	~dev-python/async_timeout-3.0.1[${PYTHON_USEDEP}]
-	~dev-python/attrs-21.2.0[${PYTHON_USEDEP}]
-	~dev-python/awesomeversion-21.4.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/backports-zoneinfo[${PYTHON_USEDEP}]' python3_8)
-	~dev-python/bcrypt-3.1.7[${PYTHON_USEDEP}]
-	>=dev-python/btlewrap-0.0.10[${PYTHON_USEDEP}]
-	>=dev-python/certifi-2020.12.5[${PYTHON_USEDEP}]
-	~dev-python/ciso8601-2.1.3[${PYTHON_USEDEP}]
-	~dev-python/cryptography-3.3.2[${PYTHON_USEDEP}]
-	~dev-python/defusedxml-0.7.1[${PYTHON_USEDEP}]
-	~dev-python/distro-1.5.0[${PYTHON_USEDEP}]
-	~dev-python/emoji-1.2.0[${PYTHON_USEDEP}]
-	~dev-python/grpcio-1.31.0[${PYTHON_USEDEP}]
-	>=dev-python/h11-0.12.0[${PYTHON_USEDEP}]
-	~dev-python/hass-nabucasa-0.44.0[${PYTHON_USEDEP}]
-	~dev-python/home-assistant-frontend-20210630.0[${PYTHON_USEDEP}]
-	~dev-python/httpcore-0.13.3[${PYTHON_USEDEP}]
-	>=dev-python/httplib2-0.19.0[${PYTHON_USEDEP}]
-	~dev-python/httpx-0.18.0[${PYTHON_USEDEP}]
-	~dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}]
-	~dev-python/jinja-3.0.1[${PYTHON_USEDEP}]
-	~dev-python/paho-mqtt-1.5.1[${PYTHON_USEDEP}]
-	~dev-python/pillow-8.2.0[${PYTHON_USEDEP}]
-	<dev-python/pip-20.3.0
-	>=dev-python/pycryptodome-3.6.6[${PYTHON_USEDEP}]
-	~dev-python/pyjwt-1.7.1[${PYTHON_USEDEP}]
-	~dev-python/pynacl-1.3.0[${PYTHON_USEDEP}]
-	~dev-python/python-slugify-4.0.1[${PYTHON_USEDEP}]
-	~dev-python/pyyaml-5.4.1[${PYTHON_USEDEP}]
-	~dev-python/requests-2.25.1[${PYTHON_USEDEP}]
-	~dev-python/ruamel-yaml-0.15.100[${PYTHON_USEDEP}]
-	~net-analyzer/scapy-2.4.5
-	~dev-python/sqlalchemy-1.4.17[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.24.3[${PYTHON_USEDEP}]
-	~dev-python/voluptuous-serialize-2.4.0[${PYTHON_USEDEP}]
-	~dev-python/voluptuous-0.12.1[${PYTHON_USEDEP}]
-	~dev-python/yarl-1.6.3[${PYTHON_USEDEP}]
-	~dev-python/zeroconf-0.32.0[${PYTHON_USEDEP}]"
-
-# unknown origin, still something to clean up here
-# some moved to suggested USE Flags
-#
-# auth/mfa_modules/totp.py:REQUIREMENTS = ["pyotp==2.3.0", "PyQRCode==1.2.1"]
-# scripts/check_config.py:REQUIREMENTS = ("colorlog==5.0.1",)
-
-RDEPEND="${RDEPEND}
-	~dev-python/colorlog-5.0.1[${PYTHON_USEDEP}]
-	~dev-python/gTTS-token-1.1.3[${PYTHON_USEDEP}]
-	>=dev-python/multidict-4.5.2[${PYTHON_USEDEP}]
-	~dev-python/numpy-1.20.3[${PYTHON_USEDEP}]
-	>=dev-python/pyotp-2.3.0[${PYTHON_USEDEP}]
-	>=dev-python/pyqrcode-1.2.1[${PYTHON_USEDEP}]
-	dev-python/pycparser[${PYTHON_USEDEP}]
-	>=dev-python/websocket-client-0.56.0[${PYTHON_USEDEP}]
-	~media-libs/mutagen-1.45.1"
-
-# Module requirements from useflags
-RDEPEND="${RDEPEND}
-	accuweather? ( ~dev-python/accuweather-0.2.0[${PYTHON_USEDEP}] )
-	airly? ( ~dev-python/airly-1.1.0[${PYTHON_USEDEP}] )
-	airvisual? ( ~dev-python/pyairvisual-5.0.8[${PYTHON_USEDEP}] )
-	alpha_vantage? ( ~dev-python/alpha-vantage-2.3.1[${PYTHON_USEDEP}] )
-	androidtv? ( ~dev-python/adb-shell-0.3.4[${PYTHON_USEDEP}] ~dev-python/androidtv-0.0.60[${PYTHON_USEDEP}] ~dev-python/pure-python-adb-0.3.0[${PYTHON_USEDEP}] )
-	android_ip_webcam? ( ~dev-python/pydroid-ipcam-0.8[${PYTHON_USEDEP}] )
-	axis? ( ~dev-python/axis-44[${PYTHON_USEDEP}] )
-	bluetooth_le_tracker? ( ~dev-python/pygatt-4.0.5[${PYTHON_USEDEP}] )
-	caldav? ( ~dev-python/caldav-0.7.1[${PYTHON_USEDEP}] )
-	cast? ( ~dev-python/pychromecast-9.2.0[${PYTHON_USEDEP}] )
-	cli? ( app-misc/home-assistant-cli )
-	compensation? ( ~dev-python/numpy-1.20.3[${PYTHON_USEDEP}] )
-	coronavirus? ( ~dev-python/coronavirus-1.1.1[${PYTHON_USEDEP}] )
-	darksky? ( ~dev-python/python-forecastio-1.4.0[${PYTHON_USEDEP}] )
-	dwd_weather_warnings? ( ~dev-python/dwdwfsapi-1.0.4[${PYTHON_USEDEP}] )
-	enigma2? ( ~dev-python/openwebifpy-3.2.7[${PYTHON_USEDEP}] )
-	esphome? ( ~dev-python/aioesphomeapi-4.0.1[${PYTHON_USEDEP}] )
-	fronius? ( ~dev-python/PyFronius-0.5.2[${PYTHON_USEDEP}] )
-	github? ( ~dev-python/PyGithub-1.43.8[${PYTHON_USEDEP}] )
-	homekit? ( ~dev-python/HAP-python-3.5.0[${PYTHON_USEDEP}] ~dev-python/fnvhash-0.1.0[${PYTHON_USEDEP}] ~dev-python/pyqrcode-1.2.1[${PYTHON_USEDEP}] ~dev-python/base36-0.1.1[${PYTHON_USEDEP}] ~dev-python/PyTurboJPEG-1.5.0[${PYTHON_USEDEP}] )
-	homekit_controller? ( ~dev-python/aiohomekit-0.4.0[${PYTHON_USEDEP}] )
-	http? ( ~dev-python/aiohttp-cors-0.7.0[${PYTHON_USEDEP}] )
-	hyperion? ( ~dev-python/hyperion-py-0.7.4[${PYTHON_USEDEP}] )
-	influxdb? ( ~dev-python/influxdb-5.2.3[${PYTHON_USEDEP}] ~dev-python/influxdb-client-1.14.0[${PYTHON_USEDEP}] )
-	knx? ( ~dev-python/xknx-0.18.8[${PYTHON_USEDEP}] )
-	kodi? ( ~dev-python/pykodi-0.2.5[${PYTHON_USEDEP}] )
-	kraken? ( ~dev-python/krakenex-2.1.0[${PYTHON_USEDEP}] ~dev-python/pykrakenapi-0.1.8[${PYTHON_USEDEP}] )
-	maxcube? ( ~dev-python/maxcube-api-0.4.3[${PYTHON_USEDEP}] )
-	mikrotik? ( ~dev-python/librouteros-3.0.0[${PYTHON_USEDEP}] )
-	mobile_app? ( ~dev-python/pynacl-1.3.0[${PYTHON_USEDEP}] ~dev-python/emoji-1.2.0[${PYTHON_USEDEP}] )
-	mqtt? ( ~dev-python/paho-mqtt-1.5.1[${PYTHON_USEDEP}] )
-	myq? ( ~dev-python/pymyq-3.0.4[${PYTHON_USEDEP}] )
-	mysensors? ( ~dev-python/pymysensors-0.21.0[${PYTHON_USEDEP}] )
-	mysql? ( dev-python/mysql-connector-python[${PYTHON_USEDEP}] dev-python/mysqlclient[${PYTHON_USEDEP}] )
-	notify_events? ( ~dev-python/notify-events-1.0.4[${PYTHON_USEDEP}] )
-	otp? ( ~dev-python/pyotp-2.3.0[${PYTHON_USEDEP}] )
-	owntracks? ( ~dev-python/pynacl-1.3.0[${PYTHON_USEDEP}] )
-	ozw? ( ~dev-python/python-openzwave-mqtt-1.4.0[${PYTHON_USEDEP}] )
-	ping? ( ~dev-python/icmplib-3.0[${PYTHON_USEDEP}] )
-	plex? ( ~dev-python/PlexAPI-4.6.1[${PYTHON_USEDEP}] ~dev-python/plexauth-0.0.6[${PYTHON_USEDEP}] ~dev-python/plexwebsocket-0.0.13[${PYTHON_USEDEP}] )
-	ps4? ( ~dev-python/pyps4-2ndscreen-1.2.0[${PYTHON_USEDEP}] )
-	python_script? ( ~dev-python/RestrictedPython-5.1[${PYTHON_USEDEP}] )
-	qnap? ( ~dev-python/qnapstats-0.3.1[${PYTHON_USEDEP}] )
-	qvr_pro? ( ~dev-python/pyqvrpro-0.52[${PYTHON_USEDEP}] )
-	recorder? ( ~dev-python/sqlalchemy-1.4.17[${PYTHON_USEDEP}] )
-	rest? ( ~dev-python/jsonpath-0.82[${PYTHON_USEDEP}] ~dev-python/xmltodict-0.12.0[${PYTHON_USEDEP}] )
-	ring? ( ~dev-python/ring-doorbell-0.6.2[${PYTHON_USEDEP}] )
-	samsungtv? ( ~dev-python/samsungctl-0.7.1[${PYTHON_USEDEP}] ~dev-python/samsungtvws-1.6.0[${PYTHON_USEDEP}] ~dev-python/wakeonlan-2.0.1[${PYTHON_USEDEP}] )
-	scrape? ( ~dev-python/beautifulsoup-4.9.3[${PYTHON_USEDEP}] )
-	shelly? ( ~dev-python/aioshelly-0.6.4[${PYTHON_USEDEP}] )
-	signal_messenger? ( ~dev-python/pysignalclirestapi-0.3.4[${PYTHON_USEDEP}] )
-	snmp? ( ~dev-python/pysnmp-4.4.12[${PYTHON_USEDEP}] )
-	socat? ( net-misc/socat )
-	sonos? ( ~dev-python/pysonos-0.0.51[${PYTHON_USEDEP}] )
-	speedtestdotnet? ( ~net-analyzer/speedtest-cli-2.1.3[${PYTHON_USEDEP}] )
-	sql? ( ~dev-python/sqlalchemy-1.4.17[${PYTHON_USEDEP}] )
-	ssl? ( dev-libs/openssl app-crypt/certbot net-proxy/haproxy )
-	systemmonitor? ( ~dev-python/psutil-5.8.0[${PYTHON_USEDEP}] )
-	tasmota? ( ~dev-python/HATasmota-0.2.19[${PYTHON_USEDEP}] )
-	tile? ( ~dev-python/pytile-5.2.2[${PYTHON_USEDEP}] )
-	tplink? ( ~dev-python/pyHS100-0.3.5.2[${PYTHON_USEDEP}] )
-	tradfri? ( ~dev-python/pytradfri-7.0.6[${PYTHON_USEDEP}] )
-	version? ( ~dev-python/pyhaversion-21.5.0[${PYTHON_USEDEP}] )
-	wake_on_lan? ( ~dev-python/wakeonlan-2.0.1[${PYTHON_USEDEP}] )
-	wemo? ( ~dev-python/pywemo-0.6.3[${PYTHON_USEDEP}] )
-	whois? ( ~dev-python/python-whois-0.7.3[${PYTHON_USEDEP}] )
-	workday? ( ~dev-python/holidays-0.11.1[${PYTHON_USEDEP}] )
-	yamaha? ( ~dev-python/rxv-0.6.0[${PYTHON_USEDEP}] )
-	yamaha_musiccast? ( ~dev-python/aiomusiccast-0.8.0[${PYTHON_USEDEP}] )
-	zeroconf? ( ~dev-python/zeroconf-0.32.0[${PYTHON_USEDEP}] )
-	zwave? ( ~dev-python/homeassistant-pyozw-0.1.10[${PYTHON_USEDEP}] ~dev-python/PyDispatcher-2.0.5[${PYTHON_USEDEP}] )
-	zwave_js? ( ~dev-python/zwave-js-server-python-0.27.0[${PYTHON_USEDEP}] )"
-
-BDEPEND="${RDEPEND}
-	test? (
-		~dev-python/codecov-2.1.11[${PYTHON_USEDEP}]
-		~dev-python/coverage-5.5[${PYTHON_USEDEP}]
-		~dev-python/jsonpickle-1.4.1[${PYTHON_USEDEP}]
-		~dev-python/mock-open-1.4.0[${PYTHON_USEDEP}]
-		~dev-python/mypy-0.902[${PYTHON_USEDEP}]
-		~dev-python/pipdeptree-1.0.0[${PYTHON_USEDEP}]
-		~dev-vcs/pre-commit-2.13.0
-		~dev-python/pylint-strict-informational-0.1[${PYTHON_USEDEP}]
-		~dev-python/pylint-2.8.3[${PYTHON_USEDEP}]
-		~dev-python/pytest-cov-2.12.1[${PYTHON_USEDEP}]
-		~dev-python/pytest-sugar-0.9.4[${PYTHON_USEDEP}]
-		~dev-python/pytest-test-groups-1.0.3[${PYTHON_USEDEP}]
-		~dev-python/pytest-timeout-1.4.2[${PYTHON_USEDEP}]
-		~dev-python/pytest-xdist-2.2.1[${PYTHON_USEDEP}]
-		~dev-python/pytest-6.2.4[${PYTHON_USEDEP}]
-		~dev-python/requests-mock-1.9.2[${PYTHON_USEDEP}]
-		~dev-python/responses-0.12.0[${PYTHON_USEDEP}]
-		~dev-python/respx-0.17.0[${PYTHON_USEDEP}]
-		~dev-python/stdlib-list-0.7.0[${PYTHON_USEDEP}]
-		~dev-python/tqdm-4.49.0[${PYTHON_USEDEP}]
-	)
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]"
-
-INSTALL_DIR="/opt/${MY_PN}"
-
-DISABLE_AUTOFORMATTING=1
-DOC_CONTENTS="
-The HA interface listens on port 8123
-hass configuration is in: /etc/${MY_PN}
-daemon command line arguments are configured in: /etc/conf.d/${MY_PN}
-logging is to: /var/log/${MY_PN}/{server,errors,stdout}.log
-The sqlite db is by default in: /etc/${MY_PN}
-support at https://git.edevau.net/onkelbeh/HomeAssistantRepository
-"
-
-S="${WORKDIR}/core-${MY_PV}"
-
-DOCS="README.rst"
-
-python_install_all() {
-	dodoc ${DOCS}
-	distutils-r1_python_install_all
-	keepdir "$INSTALL_DIR"
-	keepdir "/etc/${MY_PN}"
-	fowners -R "${MY_PN}:${MY_PN}" "/etc/${MY_PN}"
-	keepdir "/var/log/${MY_PN}"
-	fowners -R "${MY_PN}:${MY_PN}" "/var/log/${MY_PN}"
-	newconfd "${FILESDIR}/${MY_PN}.conf.d" "${MY_PN}"
-	newinitd "${FILESDIR}/${MY_PN}.init.d" "${MY_PN}"
-	use systemd && systemd_dounit "${FILESDIR}/${MY_PN}.service"
-	dobin "${FILESDIR}/hasstest"
-	if use socat ; then
-		newinitd "${FILESDIR}/socat-zwave.init.d" "socat-zwave"
-		sed -i -e 's/# need socat-zwave/need socat-zwave/g' "${D}/etc/init.d/${MY_PN}" || die
-	fi
-	if use mqtt ; then
-		sed -i -e 's/# need mosquitto/need mosquitto/g' "${D}/etc/init.d/${MY_PN}" || die
-	fi
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${MY_PN}.logrotate" "${MY_PN}"
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
-
diff --git a/app-misc/homeassistant-min/homeassistant-min-2021.7.0_beta1.ebuild b/app-misc/homeassistant-min/homeassistant-min-2021.7.0_beta5.ebuild
similarity index 97%
rename from app-misc/homeassistant-min/homeassistant-min-2021.7.0_beta1.ebuild
rename to app-misc/homeassistant-min/homeassistant-min-2021.7.0_beta5.ebuild
index 3c5447fa0..23e1064e9 100644
--- a/app-misc/homeassistant-min/homeassistant-min-2021.7.0_beta1.ebuild
+++ b/app-misc/homeassistant-min/homeassistant-min-2021.7.0_beta5.ebuild
@@ -65,7 +65,7 @@ RDEPEND="${RDEPEND}
 	~dev-python/grpcio-1.31.0[${PYTHON_USEDEP}]
 	>=dev-python/h11-0.12.0[${PYTHON_USEDEP}]
 	~dev-python/hass-nabucasa-0.44.0[${PYTHON_USEDEP}]
-	~dev-python/home-assistant-frontend-20210630.0[${PYTHON_USEDEP}]
+	~dev-python/home-assistant-frontend-20210706.0[${PYTHON_USEDEP}]
 	~dev-python/httpcore-0.13.3[${PYTHON_USEDEP}]
 	>=dev-python/httplib2-0.19.0[${PYTHON_USEDEP}]
 	~dev-python/httpx-0.18.0[${PYTHON_USEDEP}]
@@ -87,7 +87,7 @@ RDEPEND="${RDEPEND}
 	~dev-python/voluptuous-serialize-2.4.0[${PYTHON_USEDEP}]
 	~dev-python/voluptuous-0.12.1[${PYTHON_USEDEP}]
 	~dev-python/yarl-1.6.3[${PYTHON_USEDEP}]
-	~dev-python/zeroconf-0.32.0[${PYTHON_USEDEP}]"
+	~dev-python/zeroconf-0.32.1[${PYTHON_USEDEP}]"
 
 # unknown origin, still something to clean up here
 # some moved to suggested USE Flags
@@ -127,8 +127,8 @@ RDEPEND="${RDEPEND}
 	esphome? ( ~dev-python/aioesphomeapi-4.0.1[${PYTHON_USEDEP}] )
 	fronius? ( ~dev-python/PyFronius-0.5.2[${PYTHON_USEDEP}] )
 	github? ( ~dev-python/PyGithub-1.43.8[${PYTHON_USEDEP}] )
-	homekit? ( ~dev-python/HAP-python-3.5.0[${PYTHON_USEDEP}] ~dev-python/fnvhash-0.1.0[${PYTHON_USEDEP}] ~dev-python/pyqrcode-1.2.1[${PYTHON_USEDEP}] ~dev-python/base36-0.1.1[${PYTHON_USEDEP}] ~dev-python/PyTurboJPEG-1.5.0[${PYTHON_USEDEP}] )
-	homekit_controller? ( ~dev-python/aiohomekit-0.4.0[${PYTHON_USEDEP}] )
+	homekit? ( ~dev-python/HAP-python-3.5.1[${PYTHON_USEDEP}] ~dev-python/fnvhash-0.1.0[${PYTHON_USEDEP}] ~dev-python/pyqrcode-1.2.1[${PYTHON_USEDEP}] ~dev-python/base36-0.1.1[${PYTHON_USEDEP}] ~dev-python/PyTurboJPEG-1.5.0[${PYTHON_USEDEP}] )
+	homekit_controller? ( ~dev-python/aiohomekit-0.4.2[${PYTHON_USEDEP}] )
 	http? ( ~dev-python/aiohttp-cors-0.7.0[${PYTHON_USEDEP}] )
 	hyperion? ( ~dev-python/hyperion-py-0.7.4[${PYTHON_USEDEP}] )
 	influxdb? ( ~dev-python/influxdb-5.2.3[${PYTHON_USEDEP}] ~dev-python/influxdb-client-1.14.0[${PYTHON_USEDEP}] )
@@ -177,7 +177,7 @@ RDEPEND="${RDEPEND}
 	workday? ( ~dev-python/holidays-0.11.1[${PYTHON_USEDEP}] )
 	yamaha? ( ~dev-python/rxv-0.6.0[${PYTHON_USEDEP}] )
 	yamaha_musiccast? ( ~dev-python/aiomusiccast-0.8.0[${PYTHON_USEDEP}] )
-	zeroconf? ( ~dev-python/zeroconf-0.32.0[${PYTHON_USEDEP}] )
+	zeroconf? ( ~dev-python/zeroconf-0.32.1[${PYTHON_USEDEP}] )
 	zwave? ( ~dev-python/homeassistant-pyozw-0.1.10[${PYTHON_USEDEP}] ~dev-python/PyDispatcher-2.0.5[${PYTHON_USEDEP}] )
 	zwave_js? ( ~dev-python/zwave-js-server-python-0.27.0[${PYTHON_USEDEP}] )"
 
diff --git a/app-misc/homeassistant/Manifest b/app-misc/homeassistant/Manifest
index ebb4ab9ac..1708ae979 100644
--- a/app-misc/homeassistant/Manifest
+++ b/app-misc/homeassistant/Manifest
@@ -17,9 +17,9 @@ DIST homeassistant-2021.6.3.tar.gz 9909029 BLAKE2B bd728075eb8727c72d54d7dbde4d8
 DIST homeassistant-2021.6.4.tar.gz 9910097 BLAKE2B 8977f7f955499d85cc58f3670c0a34a22a57045d4089e35c4288264dd86eda61f5f6b06870f44fde588108f3cd169851ca85dc522053c2250bd2afb008c85a3f SHA512 58c14eb230735e0b0e04b908729320b9ebc635f8257c82fab1dd0e06b937fdf95869e0917fa3f38ec37aeef123430ba825d2df38c64da1259a23821794150fd9
 DIST homeassistant-2021.6.5.tar.gz 9908738 BLAKE2B 054381c3d27c08e5b16569170aa1395fdfc0e456977854ee3d519c574a795291ed8bcf09419241901ae9efc0e059c5d4264424cac266790577371a3563ed154e SHA512 1bb2eeab3755f9dc276de4c17b4fb7b98986a06521b4a4a0304e751a2571352aacd971432e91c722bf979d0d6b940be8ab44ba4422cfb61f8e36f7cc517bacaa
 DIST homeassistant-2021.6.6.tar.gz 9909717 BLAKE2B 7e7d08e4aa4f3e0235feb1277528075c57dca715172369606dcccb658451a080bf9eeb5d536404b9bc63a77fe520564baf0725d4f8424c10f09639c051f1d5f1 SHA512 16e026601c48463ed690192bcc4aa716d8f42109859822cca1c0e521b3da5c228291c56ec312987e0225ac3e71dad27cbf91d4120ccad17bf2b5848d058bee4e
-DIST homeassistant-2021.7.0b1.tar.gz 10156269 BLAKE2B 0e396f49969057205d1556f59157d0133bda34725f6a5c24ad5abf7e8fae88a89bc14f83879ae48b3c9e2a0a33c87bcaa2897cd0088fc693499243c505036ea1 SHA512 dd228454f2ef4d84b3bf271ddd8fc58f14ad2afdb1b58cad192622039611d821e89577b12f9d65229e96f76f3563db00f857b0c5d66bd2de763b0d0488d247e0
 DIST homeassistant-2021.7.0b2.tar.gz 10156226 BLAKE2B a3e4b2fce962eafbea5848df4f06a6868220e5017ce623c119875864fb5de91d4a1a451a3f9f0f515af47d4332ced19b3717a07eeea6cf0f2a2efcbd6c9ee529 SHA512 c9c3e71b70bbe0e44d6edf9f3ebb33d5099923e8930ea16642e98da50a5f4f8087c72b77e80e7215e173db0bfd8ba66609bb1be261c1fefd99edba992c065437
 DIST homeassistant-2021.7.0b4.tar.gz 10157237 BLAKE2B 45ec0c23db457cf30d51c0676463ba74ce9ee37c8dc9aad9a2c869d10a0391dcb938ef58907f01ffa4d6d9be981533d579378f4dd4768bed67ddf909a69e03f2 SHA512 50d4b48d9565d37252e0d43f8f00bfdf2102bd78bf1a679c1012245f0b85207279c268786d63b5c8a8f0a8a5d7c3350bdb04e796915d278460143cfa5c128915
+DIST homeassistant-2021.7.0b5.tar.gz 10148685 BLAKE2B 7d999f438c3d64c7f5347fa15bad4df65da8bbde141c8d189ac283cefa7646ad319b95dde53e484e3acccf9d90690ac1173fa3cc892d6d022cf6c10bc976c0ee SHA512 e6ebd4b10668456d3c61eb8ce133c19a312736b84d6e8e1520a60f20de33d1983de5da948f335b3fc89fd90116879262be5744f5485515238723f80094194c53
 EBUILD homeassistant-2021.3.4-r1.ebuild 26455 BLAKE2B db33eeb57cd6dea7c7a48e10abebd86ad8cd68ebed6101f2af67ba7f21a29b8eef63d19b47d6ab20d4c18624e28e8e1a9648e3b5968df6b5d15f7bc9b3a93d2d SHA512 a62fcffaf2b4a7789670ae882f6bcbc1e3e4a4f0bc5a632c420e686fcd2bd196792358501bd3591575c9bcd620dfcb3d05e60690f65bd4fb2bcfe4930074f36d
 EBUILD homeassistant-2021.4.6.ebuild 26659 BLAKE2B 4c0ef176b0df86136ae1d97e5c44d21d760a464cb371a27dde373d1f65b3605085ca3552f5522113268efb1d02d7d63cd5f5be6e11bafa26283554f8358864d9 SHA512 7746e41e3166863f5e35a922c8c480b68d77a17ab6311fd0c7abf5b73aac0f76188eb083b02831f73f04c90e112d279bc7491684d6251e1324440c4cca6664fd
 EBUILD homeassistant-2021.5.4.ebuild 26773 BLAKE2B a9e8fef046bde65c489cbb2a2b5d773af6301c8aaa194f2aec0d74dc0c104a55e6c230c32c45df927c31ed419dd0c0755cb289cfb8df06ae6769250aaccee856 SHA512 d2d8eff394a86a60930711efbf784a75ff212578ca045ef791cb93aceb8b8506c348e30b5db6c1df04259a48041001d334bae47139763fe4241e59a15766e9eb
@@ -29,8 +29,7 @@ EBUILD homeassistant-2021.6.3.ebuild 26904 BLAKE2B 7193eaa9fb754a8e0733e7cf83ad6
 EBUILD homeassistant-2021.6.4.ebuild 26904 BLAKE2B 7193eaa9fb754a8e0733e7cf83ad655afd2e2efde9f984ecb9b0a2593270d848e0c4537765e61ab16772bd2f470cf0a26b3842ac5ddf2d48c8ac58ff8e89999e SHA512 0eed924b45b85988040e7da70801afb90f46f660bc716ef683d3fb21bbabce16e277906b70ac9f290b9dd58c9930cd57ad6de77d028fff1fa73875f8cd4604a4
 EBUILD homeassistant-2021.6.5.ebuild 26950 BLAKE2B 77b151cae8b2b69cee364cd42fb60034d8e113745476126d91a038d6a82a687f892f45a369948273e4df1166eb5090208bd06629f741d26830e8b642d63e4f5a SHA512 6066ab59a3f090dbf80687c69770237755aa198c7e988e71bf7bcd1dfc27db51460931d9b54d7a50687ed554e32820dbe83650dd00610661a3c848a78326d6f6
 EBUILD homeassistant-2021.6.6-r1.ebuild 27387 BLAKE2B 0f8b94da37522ea13cc82587871aa6782b034d7004a3c44e6ecbacb23fdb4a24e7daefb529183af3d517b0eb8b79395dd8aaec5c667c4c45c6e5022790a52e97 SHA512 5f2110d67eb763b88486726710bac12e09a26f4ebf9640d0d8d3c6bc580bdff51f219a359aec41be9dd32172fabd640be141b92689c88f4194eba339e87403ba
-EBUILD homeassistant-2021.6.6.ebuild 26950 BLAKE2B 32ea489cc6e1f3947877cfd8524e34391c8c22d166b4c6aeae2562d82be799136f3964691b3a3cc0e20385b9ce1f6f0b742e7175d6c5a7064f8ab7ed8c19d547 SHA512 dbf8499958812c076b0663d05fd9ed422914e6daf1eae1ef49d8e2f4af289be10f1e01ca54b60057c81b3a1c8294f6ae95df9898c13ced57f21fa2d2b714fd7f
-EBUILD homeassistant-2021.7.0_beta1.ebuild 27547 BLAKE2B ccc92fabda4eff55ad8caa667d310ba293573236c10c44ec954658af1aadf03cca7da87f5c4d561e7d237038bbfa60e72a0550023bc36ee0b245f3f4db165191 SHA512 d7ebcec5aad2751f38d10ae9cfe7019f2a9643f8c1a5c1357798111ed8bb6200fa5b4afeddfb9f2a11cb61bd61f44fa73bdbed3ebdc93c3b7e5cbbe9504ac85a
 EBUILD homeassistant-2021.7.0_beta2.ebuild 27618 BLAKE2B 8d7d2505bcb9c88d8dcc8fbd0d79e8110669bf22c4e518b39eca1999d389a787a17d6832b37d79ba1a7af12a4c026268cb299f6c7d1f8079f5b44ffcf2519c37 SHA512 4427c41154c5a024dd90efda63a7e631ffeca74b785b60e7dcdfd45586fc08aad8f492e3254485d1147deda50c658b8426890b3b150d42634969f9db2f6a6309
 EBUILD homeassistant-2021.7.0_beta4.ebuild 27618 BLAKE2B 345d95f573b4311e7d137b495f92f84425976748b406151e25817de8c5718dfc1e7fad1471146e66455e5f91159d0911e638f58634577e1340e00797bfe87b85 SHA512 ca28e57d8a25f3989b104899d0d106cafdfe2edc2803e54588cb757a54fdf2f38bfd105b3248420e2f27606706a862daf6b1bcaf8d037bfc7417599a95abfc2f
+EBUILD homeassistant-2021.7.0_beta5.ebuild 27619 BLAKE2B 43e43cc6d91133dcf54602bc8b646db8b376ae77096cdb9c9939e1244a2e3d561d1ead2c48c08b6db3f96cee7f40ff5df4eaa7e5d5eb4acdd3431487f4a9a8c5 SHA512 b447955b60b07f0f16a1f5ff9791f26f5f767518db3f87c9f5f74201ca1b0f2d6fe76586dff5aea81eda0bc91aacae7eabf378f5dd84cdcbb05a6d8168d0de58
 MISC metadata.xml 24330 BLAKE2B fe447e51859d26042492b92791597accd67e0307f20dd9c92c2349caf5de1b574f60bdd714ea593697f5ff6b32f1e05f41af1bc3a69a946712761dac2fc41f44 SHA512 5db767c1aabe77c8062a04feabf0e639511441daeb9c53270e51bd6e4e35649528eecb67cdd7ef9cbb641203141c17c1fc1403521d620d0218b2853603c25198
diff --git a/app-misc/homeassistant/homeassistant-2021.6.6.ebuild b/app-misc/homeassistant/homeassistant-2021.6.6.ebuild
deleted file mode 100644
index 04b11feea..000000000
--- a/app-misc/homeassistant/homeassistant-2021.6.6.ebuild
+++ /dev/null
@@ -1,443 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{8,9} )
-inherit readme.gentoo-r1 eutils distutils-r1 systemd
-
-MY_PN=homeassistant
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/home-assistant/core.git"
-	EGIT_BRANCH="dev"
-	S="${WORKDIR}/core/"
-else
-	MY_PV=${PV/_beta/b}
-	MY_P=${MY_PN}-${MY_PV}
-	SRC_URI="https://github.com/home-assistant/core/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-	S="${WORKDIR}/core-${MY_PV}"
-fi
-
-DESCRIPTION="Open-source home automation platform running on Python 3.8"
-HOMEPAGE="https://home-assistant.io/ https://git.edevau.net/onkelbeh/HomeAssistantRepository/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-KEYWORDS="amd64 arm arm64 x86 amd64-linux x86-linux"
-IUSE="abode accuweather acer_projector acmeda adguard ads aftership agent_dvr airly airvisual aladdin_connect alarmdecoder almond alpha_vantage ambiclimate ambient_station amcrest ampio androidtv android_ip_webcam anel_pwrctrl anthemav apache_kafka apcupsd apple_tv apprise aquostv arcam_fmj aruba asuswrt aten_pe atome august aurora_abb_powerone avea avion -avri awair axis baidu -beewi_smartclim bh1750 bitcoin bizkaibus blackbird blebox blink blinksticklight blinkt blockchain bluetooth_le_tracker bluetooth_tracker bme280 bme680 bmw_connected_drive bom bond braviatv broadlink brother brottsplatskartan brunt bsblan bt_home_hub_5 bt_smarthub buienradar +caldav canary cast cisco_mobility_express cli co2signal compensation coronavirus daikin darksky deconz delijn denonavr deutsche_bahn devolo_home_control dexcom dhcp dht discogs discord doorbird dunehd +dwd_weather_warnings dynalite dyson ecobee elv emulated_roku enigma2 enocean enphase_envoy environment_canada esphome everlights evohome fibaro flume flunearyou flux_led foobot fortios freebox fritz fritzbox fritzbox_callmonitor fritzbox_netmonitor fronius garmin_connect gios github gogogate2 greeneye_monitor growatt_server guardian harman_kardon_avr harmony heos here_travel_time +homekit homekit_controller -homematic -homematicip_cloud hp_ilo http hue hydrawise iaqualink ihc incomfort influxdb insteon intesishome ipma islamic_prayer_times jewish_calendar joaoapps_join kef knx kodi kraken linode loopenergy luci luftdaten maxcube media_extractor meteo_france mfi miflora mikrotik -mitemp_bt +mobile_app +mqtt myq +mysql nad nederlandse_spoorwegen netatmo netdata +notify_events nuki nws nx584 opengarage opensensemap +otp owntracks ozw panasonic_viera philips_js pilight +ping pi_hole +plex plugwise poolsense powerwall ps4 +python_script qnap qvr_pro rachio rainbird rainmachine +recorder rejseplanen +rest ring roku roomba roon samsungtv +scrape shelly shodan signal_messenger simplisafe skybell sma smappee smarthab smartthings +snmp socat socialblade solax somfy sonos speedtestdotnet +sql squeezebox +ssl statsd synology_dsm systemd systemmonitor tasmota tellduslive tesla test tile toon totalconnect tplink tradfri tuya unifi unifi_direct upnp vallox velbus velux vera +version vicare vizio +wake_on_lan waqi waze_travel_time webostv wemo whois wink withings wled workday xbox_live xiaomi_aqara xiaomi_miio xiaomi_tv xs1 yamaha yamaha_musiccast yeelight yi zeroconf zerproc zha zhong_hong zoneminder +zwave zwave_js"
-
-# external deps
-RDEPEND="${PYTHON_DEPS} acct-group/${MY_PN} acct-user/${MY_PN}
-	|| ( dev-lang/python:3.8 dev-lang/python:3.9 )
-	app-admin/logrotate
-	dev-db/sqlite
-	dev-libs/libfastjson
-	>=dev-libs/xerces-c-3.1.4-r1"
-
-# make sure no conflicting main Ebuild is installed
-RDEPEND="${RDEPEND}
-	!app-misc/homeassistant-min
-	!app-misc/homeassistant-full"
-
-# Home Assistant Core dependencies
-# from package_constraints.txt
-RDEPEND="${RDEPEND}
-	~dev-python/aiodiscover-1.4.2[${PYTHON_USEDEP}]
-	~dev-python/aiohttp-3.7.4_p0[${PYTHON_USEDEP}]
-	~dev-python/aiohttp-cors-0.7.0[${PYTHON_USEDEP}]
-	~dev-python/astral-2.2[${PYTHON_USEDEP}]
-	~dev-python/async-upnp-client-0.18.0[${PYTHON_USEDEP}]
-	~dev-python/async_timeout-3.0.1[${PYTHON_USEDEP}]
-	~dev-python/attrs-21.2.0[${PYTHON_USEDEP}]
-	~dev-python/awesomeversion-21.4.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/backports-zoneinfo[${PYTHON_USEDEP}]' python3_8)
-	~dev-python/bcrypt-3.1.7[${PYTHON_USEDEP}]
-	>=dev-python/btlewrap-0.0.10[${PYTHON_USEDEP}]
-	>=dev-python/certifi-2020.12.5[${PYTHON_USEDEP}]
-	~dev-python/ciso8601-2.1.3[${PYTHON_USEDEP}]
-	~dev-python/cryptography-3.3.2[${PYTHON_USEDEP}]
-	~dev-python/defusedxml-0.7.1[${PYTHON_USEDEP}]
-	~dev-python/distro-1.5.0[${PYTHON_USEDEP}]
-	~dev-python/emoji-1.2.0[${PYTHON_USEDEP}]
-	~dev-python/grpcio-1.31.0[${PYTHON_USEDEP}]
-	>=dev-python/h11-0.12.0[${PYTHON_USEDEP}]
-	~dev-python/hass-nabucasa-0.43.0[${PYTHON_USEDEP}]
-	~dev-python/home-assistant-frontend-20210603.0[${PYTHON_USEDEP}]
-	~dev-python/httpcore-0.13.3[${PYTHON_USEDEP}]
-	>=dev-python/httplib2-0.19.0[${PYTHON_USEDEP}]
-	~dev-python/httpx-0.18.0[${PYTHON_USEDEP}]
-	~dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}]
-	~dev-python/jinja-3.0.1[${PYTHON_USEDEP}]
-	~dev-python/netdisco-2.8.3[${PYTHON_USEDEP}]
-	~dev-python/paho-mqtt-1.5.1[${PYTHON_USEDEP}]
-	~dev-python/pillow-8.1.2[${PYTHON_USEDEP}]
-	<dev-python/pip-20.3.0
-	>=dev-python/pycryptodome-3.6.6[${PYTHON_USEDEP}]
-	~dev-python/pyjwt-1.7.1[${PYTHON_USEDEP}]
-	~dev-python/pynacl-1.3.0[${PYTHON_USEDEP}]
-	~dev-python/python-slugify-4.0.1[${PYTHON_USEDEP}]
-	~dev-python/pyyaml-5.4.1[${PYTHON_USEDEP}]
-	~dev-python/requests-2.25.1[${PYTHON_USEDEP}]
-	~dev-python/ruamel-yaml-0.15.100[${PYTHON_USEDEP}]
-	~net-analyzer/scapy-2.4.5
-	~dev-python/sqlalchemy-1.4.13[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.24.3[${PYTHON_USEDEP}]
-	~dev-python/voluptuous-serialize-2.4.0[${PYTHON_USEDEP}]
-	~dev-python/voluptuous-0.12.1[${PYTHON_USEDEP}]
-	~dev-python/yarl-1.6.3[${PYTHON_USEDEP}]
-	~dev-python/zeroconf-0.31.0[${PYTHON_USEDEP}]"
-
-# unknown origin, still something to clean up here
-# some moved to suggested USE Flags
-
-RDEPEND="${RDEPEND}
-	~dev-python/colorlog-5.0.1[${PYTHON_USEDEP}]
-	~dev-python/gTTS-token-1.1.3[${PYTHON_USEDEP}]
-	>=dev-python/multidict-4.5.2[${PYTHON_USEDEP}]
-	~dev-python/numpy-1.20.3[${PYTHON_USEDEP}]
-	dev-python/pycparser[${PYTHON_USEDEP}]
-	>=dev-python/websocket-client-0.56.0[${PYTHON_USEDEP}]
-	~media-libs/mutagen-1.45.1"
-
-# Module requirements from useflags
-RDEPEND="${RDEPEND}
-	abode? ( ~dev-python/abodepy-1.2.0[${PYTHON_USEDEP}] )
-	accuweather? ( ~dev-python/accuweather-0.2.0[${PYTHON_USEDEP}] )
-	acer_projector? ( ~dev-python/pyserial-3.5[${PYTHON_USEDEP}] )
-	acmeda? ( ~dev-python/aiopulse-0.4.2[${PYTHON_USEDEP}] )
-	adguard? ( ~dev-python/adguardhome-0.5.0[${PYTHON_USEDEP}] )
-	ads? ( ~dev-python/pyads-3.2.2[${PYTHON_USEDEP}] )
-	aftership? ( ~dev-python/pyaftership-0.1.2[${PYTHON_USEDEP}] )
-	agent_dvr? ( ~dev-python/agent-py-0.0.23[${PYTHON_USEDEP}] )
-	airly? ( ~dev-python/airly-1.1.0[${PYTHON_USEDEP}] )
-	airvisual? ( ~dev-python/pyairvisual-5.0.8[${PYTHON_USEDEP}] )
-	aladdin_connect? ( ~dev-python/aladdin-connect-0.3[${PYTHON_USEDEP}] )
-	alarmdecoder? ( ~dev-python/adext-0.4.2[${PYTHON_USEDEP}] )
-	almond? ( ~dev-python/pyalmond-0.0.2[${PYTHON_USEDEP}] )
-	alpha_vantage? ( ~dev-python/alpha-vantage-2.3.1[${PYTHON_USEDEP}] )
-	ambiclimate? ( ~dev-python/Ambiclimate-0.2.1[${PYTHON_USEDEP}] )
-	ambient_station? ( ~dev-python/aioambient-1.2.4[${PYTHON_USEDEP}] )
-	amcrest? ( ~dev-python/amcrest-1.7.2[${PYTHON_USEDEP}] )
-	ampio? ( ~dev-python/asmog-0.0.6[${PYTHON_USEDEP}] )
-	androidtv? ( ~dev-python/adb-shell-0.3.1[${PYTHON_USEDEP}] ~dev-python/androidtv-0.0.59[${PYTHON_USEDEP}] ~dev-python/pure-python-adb-0.3.0[${PYTHON_USEDEP}] )
-	android_ip_webcam? ( ~dev-python/pydroid-ipcam-0.8[${PYTHON_USEDEP}] )
-	anel_pwrctrl? ( ~dev-python/anel-pwrctrl-homeassistant-0.0.1[${PYTHON_USEDEP}] )
-	anthemav? ( ~dev-python/anthemav-1.1.10[${PYTHON_USEDEP}] )
-	apache_kafka? ( ~dev-python/aiokafka-0.6.0[${PYTHON_USEDEP}] )
-	apcupsd? ( ~dev-python/apcaccess-0.0.13[${PYTHON_USEDEP}] )
-	apple_tv? ( ~dev-python/pyatv-0.7.7[${PYTHON_USEDEP}] )
-	apprise? ( ~dev-python/apprise-0.9.3[${PYTHON_USEDEP}] )
-	aquostv? ( ~dev-python/sharp_aquos_rc-0.3.2[${PYTHON_USEDEP}] )
-	arcam_fmj? ( ~dev-python/arcam-fmj-0.5.3[${PYTHON_USEDEP}] )
-	aruba? ( ~dev-python/pexpect-4.6.0[${PYTHON_USEDEP}] )
-	asuswrt? ( ~dev-python/aioasuswrt-1.3.4[${PYTHON_USEDEP}] )
-	aten_pe? ( ~dev-python/atenpdu-0.3.0[${PYTHON_USEDEP}] )
-	atome? ( ~dev-python/pyAtome-0.1.1[${PYTHON_USEDEP}] )
-	august? ( ~dev-python/yalexs-1.1.11[${PYTHON_USEDEP}] )
-	aurora_abb_powerone? ( ~dev-python/aurorapy-0.2.6[${PYTHON_USEDEP}] )
-	avea? ( ~dev-python/avea-1.5.1[${PYTHON_USEDEP}] )
-	avion? ( ~dev-python/avion-0.10[${PYTHON_USEDEP}] )
-	avri? ( ~dev-python/avri-api-0.1.7[${PYTHON_USEDEP}] ~dev-python/pycountry-19.8.18[${PYTHON_USEDEP}] )
-	awair? ( ~dev-python/python-awair-0.2.1[${PYTHON_USEDEP}] )
-	axis? ( ~dev-python/axis-44[${PYTHON_USEDEP}] )
-	baidu? ( ~dev-python/baidu-aip-1.6.6.0[${PYTHON_USEDEP}] )
-	beewi_smartclim? ( ~dev-python/beewi-smartclim-0.0.10[${PYTHON_USEDEP}] )
-	bh1750? ( ~dev-python/i2csense-0.0.4[${PYTHON_USEDEP}] ~dev-python/smbus-cffi-0.5.1[${PYTHON_USEDEP}] )
-	bitcoin? ( ~dev-python/blockchain-1.4.4[${PYTHON_USEDEP}] )
-	bizkaibus? ( ~dev-python/bizkaibus-0.1.1[${PYTHON_USEDEP}] )
-	blackbird? ( ~dev-python/pyblackbird-0.5[${PYTHON_USEDEP}] )
-	blebox? ( ~dev-python/blebox-uniapi-1.3.3[${PYTHON_USEDEP}] )
-	blink? ( ~dev-python/blinkpy-0.17.0[${PYTHON_USEDEP}] )
-	blinksticklight? ( ~dev-python/BlinkStick-1.1.8[${PYTHON_USEDEP}] )
-	blinkt? ( ~dev-python/blinkt-0.1.0[${PYTHON_USEDEP}] )
-	blockchain? ( ~dev-python/python-blockchain-api-0.0.2[${PYTHON_USEDEP}] )
-	bluetooth_le_tracker? ( ~dev-python/pygatt-4.0.5[${PYTHON_USEDEP}] )
-	bluetooth_tracker? ( ~dev-python/bt-proximity-0.2[${PYTHON_USEDEP}] ~dev-python/pybluez-0.22[${PYTHON_USEDEP}] )
-	bme280? ( ~dev-python/i2csense-0.0.4[${PYTHON_USEDEP}] ~dev-python/smbus-cffi-0.5.1[${PYTHON_USEDEP}] )
-	bme680? ( ~dev-python/bme680-1.0.5[${PYTHON_USEDEP}] ~dev-python/smbus-cffi-0.5.1[${PYTHON_USEDEP}] )
-	bmw_connected_drive? ( ~dev-python/bimmer-connected-0.7.15[${PYTHON_USEDEP}] )
-	bom? ( ~dev-python/bomradarloop-0.1.5[${PYTHON_USEDEP}] )
-	bond? ( ~dev-python/bond-api-0.1.12[${PYTHON_USEDEP}] )
-	braviatv? ( ~dev-python/bravia-tv-1.0.11[${PYTHON_USEDEP}] )
-	broadlink? ( ~dev-python/broadlink-0.17.0[${PYTHON_USEDEP}] )
-	brother? ( ~dev-python/brother-1.0.2[${PYTHON_USEDEP}] )
-	brottsplatskartan? ( ~dev-python/brottsplatskartan-0.0.1[${PYTHON_USEDEP}] )
-	brunt? ( ~dev-python/brunt-0.1.3[${PYTHON_USEDEP}] )
-	bsblan? ( ~dev-python/bsblan-0.4.0[${PYTHON_USEDEP}] )
-	bt_home_hub_5? ( ~dev-python/bthomehub5-devicelist-0.1.1[${PYTHON_USEDEP}] )
-	bt_smarthub? ( ~dev-python/btsmarthub-devicelist-0.2.0[${PYTHON_USEDEP}] )
-	buienradar? ( ~dev-python/buienradar-1.0.4[${PYTHON_USEDEP}] )
-	caldav? ( ~dev-python/caldav-0.7.1[${PYTHON_USEDEP}] )
-	canary? ( ~dev-python/py-canary-0.5.1[${PYTHON_USEDEP}] )
-	cast? ( ~dev-python/pychromecast-9.1.2[${PYTHON_USEDEP}] )
-	cisco_mobility_express? ( ~dev-python/ciscomobilityexpress-0.3.9[${PYTHON_USEDEP}] )
-	cli? ( app-misc/home-assistant-cli )
-	co2signal? ( ~dev-python/CO2Signal-0.4.2[${PYTHON_USEDEP}] )
-	compensation? ( ~dev-python/numpy-1.20.3[${PYTHON_USEDEP}] )
-	coronavirus? ( ~dev-python/coronavirus-1.1.1[${PYTHON_USEDEP}] )
-	daikin? ( ~dev-python/pydaikin-2.4.3[${PYTHON_USEDEP}] )
-	darksky? ( ~dev-python/python-forecastio-1.4.0[${PYTHON_USEDEP}] )
-	deconz? ( ~dev-python/pydeconz-79[${PYTHON_USEDEP}] )
-	delijn? ( ~dev-python/pydelijn-0.6.1[${PYTHON_USEDEP}] )
-	denonavr? ( ~dev-python/denonavr-0.10.8[${PYTHON_USEDEP}] )
-	deutsche_bahn? ( ~dev-python/schiene-0.23[${PYTHON_USEDEP}] )
-	devolo_home_control? ( ~dev-python/devolo-home-control-api-0.17.3[${PYTHON_USEDEP}] )
-	dexcom? ( ~dev-python/pydexcom-0.2.0[${PYTHON_USEDEP}] )
-	dhcp? ( ~net-analyzer/scapy-2.4.5 ~dev-python/aiodiscover-1.4.2[${PYTHON_USEDEP}] )
-	dht? ( ~dev-python/adafruit-circuitpython-dht-3.6.0[${PYTHON_USEDEP}] )
-	discogs? ( ~dev-python/discogs-client-2.3.0[${PYTHON_USEDEP}] )
-	discord? ( ~dev-python/discord-py-1.7.2[${PYTHON_USEDEP}] )
-	doorbird? ( ~dev-python/DoorBirdPy-2.1.0[${PYTHON_USEDEP}] )
-	dunehd? ( ~dev-python/pdunehd-1.3.2[${PYTHON_USEDEP}] )
-	dwd_weather_warnings? ( ~dev-python/dwdwfsapi-1.0.4[${PYTHON_USEDEP}] )
-	dynalite? ( ~dev-python/dynalite-devices-0.1.46[${PYTHON_USEDEP}] )
-	dyson? ( ~dev-python/libpurecool-0.6.4[${PYTHON_USEDEP}] )
-	ecobee? ( ~dev-python/python-ecobee-api-0.2.11[${PYTHON_USEDEP}] )
-	elv? ( ~dev-python/pypca-0.0.7[${PYTHON_USEDEP}] )
-	emulated_roku? ( ~dev-python/emulated-roku-0.2.1[${PYTHON_USEDEP}] )
-	enigma2? ( ~dev-python/openwebifpy-3.2.7[${PYTHON_USEDEP}] )
-	enocean? ( ~dev-python/enocean-0.50.1[${PYTHON_USEDEP}] )
-	enphase_envoy? ( ~dev-python/envoy-reader-0.19.0[${PYTHON_USEDEP}] )
-	environment_canada? ( ~dev-python/env-canada-0.2.5[${PYTHON_USEDEP}] )
-	esphome? ( ~dev-python/aioesphomeapi-2.8.0[${PYTHON_USEDEP}] )
-	everlights? ( ~dev-python/pyeverlights-0.1.0[${PYTHON_USEDEP}] )
-	evohome? ( ~dev-python/evohome-async-0.3.15[${PYTHON_USEDEP}] )
-	fibaro? ( ~dev-python/fiblary3-0.1.7[${PYTHON_USEDEP}] )
-	flume? ( ~dev-python/PyFlume-0.5.5[${PYTHON_USEDEP}] )
-	flunearyou? ( ~dev-python/pyflunearyou-1.0.7[${PYTHON_USEDEP}] )
-	flux_led? ( ~dev-python/flux-led-0.22[${PYTHON_USEDEP}] )
-	foobot? ( ~dev-python/foobot_async-1.0.0[${PYTHON_USEDEP}] )
-	fortios? ( ~dev-python/fortiosapi-0.10.8[${PYTHON_USEDEP}] )
-	freebox? ( ~dev-python/freebox-api-0.0.10[${PYTHON_USEDEP}] )
-	fritz? ( ~dev-python/fritzconnection-1.4.2[${PYTHON_USEDEP}] )
-	fritzbox? ( ~dev-python/pyfritzhome-0.4.2[${PYTHON_USEDEP}] )
-	fritzbox_callmonitor? ( ~dev-python/fritzconnection-1.4.2[${PYTHON_USEDEP}] )
-	fritzbox_netmonitor? ( ~dev-python/fritzconnection-1.4.2[${PYTHON_USEDEP}] )
-	fronius? ( ~dev-python/PyFronius-0.4.6[${PYTHON_USEDEP}] )
-	garmin_connect? ( ~dev-python/garminconnect-ha-0.1.6[${PYTHON_USEDEP}] )
-	gios? ( ~dev-python/gios-1.0.1[${PYTHON_USEDEP}] )
-	github? ( ~dev-python/PyGithub-1.43.8[${PYTHON_USEDEP}] )
-	gogogate2? ( ~dev-python/ismartgate-4.0.0[${PYTHON_USEDEP}] )
-	greeneye_monitor? ( ~dev-python/greeneye-monitor-2.1[${PYTHON_USEDEP}] )
-	growatt_server? ( ~dev-python/growattServer-1.0.1[${PYTHON_USEDEP}] )
-	guardian? ( ~dev-python/aioguardian-1.0.4[${PYTHON_USEDEP}] )
-	harman_kardon_avr? ( ~dev-python/hkavr-0.0.5[${PYTHON_USEDEP}] )
-	harmony? ( ~dev-python/aioharmony-0.2.7[${PYTHON_USEDEP}] )
-	heos? ( ~dev-python/pyheos-0.7.2[${PYTHON_USEDEP}] )
-	here_travel_time? ( ~dev-python/herepy-2.0.0[${PYTHON_USEDEP}] )
-	homekit? ( ~dev-python/HAP-python-3.5.0[${PYTHON_USEDEP}] ~dev-python/fnvhash-0.1.0[${PYTHON_USEDEP}] ~dev-python/pyqrcode-1.2.1[${PYTHON_USEDEP}] ~dev-python/base36-0.1.1[${PYTHON_USEDEP}] ~dev-python/PyTurboJPEG-1.5.0[${PYTHON_USEDEP}] )
-	homekit_controller? ( ~dev-python/aiohomekit-0.2.67[${PYTHON_USEDEP}] )
-	homematic? ( ~dev-python/pyhomematic-0.1.72[${PYTHON_USEDEP}] )
-	homematicip_cloud? ( ~dev-python/homematicip-0.13.1[${PYTHON_USEDEP}] )
-	hp_ilo? ( ~dev-python/python-hpilo-4.3[${PYTHON_USEDEP}] )
-	http? ( ~dev-python/aiohttp-cors-0.7.0[${PYTHON_USEDEP}] )
-	hue? ( ~dev-python/aiohue-2.5.0[${PYTHON_USEDEP}] )
-	hydrawise? ( ~dev-python/Hydrawiser-0.2[${PYTHON_USEDEP}] )
-	iaqualink? ( ~dev-python/iaqualink-0.3.90[${PYTHON_USEDEP}] )
-	ihc? ( ~dev-python/defusedxml-0.7.1[${PYTHON_USEDEP}] ~dev-python/ihcsdk-2.7.0[${PYTHON_USEDEP}] )
-	incomfort? ( ~dev-python/incomfort-client-0.4.4[${PYTHON_USEDEP}] )
-	influxdb? ( ~dev-python/influxdb-5.2.3[${PYTHON_USEDEP}] ~dev-python/influxdb-client-1.14.0[${PYTHON_USEDEP}] )
-	insteon? ( ~dev-python/pyinsteon-1.0.9[${PYTHON_USEDEP}] )
-	intesishome? ( ~dev-python/pyintesishome-1.7.6[${PYTHON_USEDEP}] )
-	ipma? ( ~dev-python/pyipma-2.0.5[${PYTHON_USEDEP}] )
-	islamic_prayer_times? ( ~dev-python/prayer_times_calculator-0.0.3[${PYTHON_USEDEP}] )
-	jewish_calendar? ( ~dev-python/hdate-0.10.2[${PYTHON_USEDEP}] )
-	joaoapps_join? ( ~dev-python/python-join-api-0.0.6[${PYTHON_USEDEP}] )
-	kef? ( ~dev-python/aiokef-0.2.16[${PYTHON_USEDEP}] ~dev-python/getmac-0.8.2[${PYTHON_USEDEP}] )
-	knx? ( ~dev-python/xknx-0.18.4[${PYTHON_USEDEP}] )
-	kodi? ( ~dev-python/pykodi-0.2.5[${PYTHON_USEDEP}] )
-	kraken? ( ~dev-python/krakenex-2.1.0[${PYTHON_USEDEP}] ~dev-python/pykrakenapi-0.1.8[${PYTHON_USEDEP}] )
-	linode? ( ~dev-python/linode-api-4.1.9_beta1[${PYTHON_USEDEP}] )
-	loopenergy? ( ~dev-python/pyloopenergy-0.2.1[${PYTHON_USEDEP}] )
-	luci? ( ~dev-python/openwrt-luci-rpc-1.1.8[${PYTHON_USEDEP}] )
-	luftdaten? ( ~dev-python/luftdaten-0.6.5[${PYTHON_USEDEP}] )
-	maxcube? ( ~dev-python/maxcube-api-0.4.3[${PYTHON_USEDEP}] )
-	media_extractor? ( ~dev-python/youtube_dl-2021.4.26[${PYTHON_USEDEP}] )
-	meteo_france? ( ~dev-python/meteofrance-api-1.0.2[${PYTHON_USEDEP}] )
-	mfi? ( ~dev-python/mficlient-0.3.0[${PYTHON_USEDEP}] )
-	miflora? ( ~dev-python/bluepy-1.3.0[${PYTHON_USEDEP}] ~dev-python/miflora-0.7.0[${PYTHON_USEDEP}] )
-	mikrotik? ( ~dev-python/librouteros-3.0.0[${PYTHON_USEDEP}] )
-	mitemp_bt? ( ~dev-python/mitemp-bt-0.0.3[${PYTHON_USEDEP}] )
-	mobile_app? ( ~dev-python/pynacl-1.3.0[${PYTHON_USEDEP}] ~dev-python/emoji-1.2.0[${PYTHON_USEDEP}] )
-	mqtt? ( ~dev-python/paho-mqtt-1.5.1[${PYTHON_USEDEP}] )
-	myq? ( ~dev-python/pymyq-3.0.4[${PYTHON_USEDEP}] )
-	mysql? ( dev-python/mysql-connector-python[${PYTHON_USEDEP}] dev-python/mysqlclient[${PYTHON_USEDEP}] )
-	nad? ( ~dev-python/nad-receiver-0.0.12[${PYTHON_USEDEP}] )
-	nederlandse_spoorwegen? ( ~dev-python/nsapi-3.0.4[${PYTHON_USEDEP}] )
-	netatmo? ( ~dev-python/pyatmo-5.0.1[${PYTHON_USEDEP}] )
-	netdata? ( ~dev-python/netdata-0.2.0[${PYTHON_USEDEP}] )
-	notify_events? ( ~dev-python/notify-events-1.0.4[${PYTHON_USEDEP}] )
-	nuki? ( ~dev-python/pynuki-1.4.1[${PYTHON_USEDEP}] )
-	nws? ( ~dev-python/pynws-1.3.0[${PYTHON_USEDEP}] )
-	nx584? ( ~dev-python/pynx584-0.5[${PYTHON_USEDEP}] )
-	opengarage? ( ~dev-python/open-garage-0.1.4[${PYTHON_USEDEP}] )
-	opensensemap? ( ~dev-python/opensensemap-api-0.1.5[${PYTHON_USEDEP}] )
-	otp? ( ~dev-python/pyotp-2.3.0[${PYTHON_USEDEP}] )
-	owntracks? ( ~dev-python/pynacl-1.3.0[${PYTHON_USEDEP}] )
-	ozw? ( ~dev-python/python-openzwave-mqtt-1.4.0[${PYTHON_USEDEP}] )
-	panasonic_viera? ( ~dev-python/panasonic-viera-0.3.6[${PYTHON_USEDEP}] )
-	philips_js? ( ~dev-python/ha-philipsjs-2.7.3[${PYTHON_USEDEP}] )
-	pilight? ( ~dev-python/pilight-0.1.1[${PYTHON_USEDEP}] )
-	ping? ( ~dev-python/icmplib-2.1.1[${PYTHON_USEDEP}] )
-	pi_hole? ( ~dev-python/hole-0.5.1[${PYTHON_USEDEP}] )
-	plex? ( ~dev-python/PlexAPI-4.5.1[${PYTHON_USEDEP}] ~dev-python/plexauth-0.0.6[${PYTHON_USEDEP}] ~dev-python/plexwebsocket-0.0.13[${PYTHON_USEDEP}] )
-	plugwise? ( ~dev-python/plugwise-0.8.5[${PYTHON_USEDEP}] )
-	poolsense? ( ~dev-python/poolsense-0.0.8[${PYTHON_USEDEP}] )
-	powerwall? ( ~dev-python/tesla-powerwall-0.3.10[${PYTHON_USEDEP}] )
-	ps4? ( ~dev-python/pyps4-2ndscreen-1.2.0[${PYTHON_USEDEP}] )
-	python_script? ( ~dev-python/RestrictedPython-5.1[${PYTHON_USEDEP}] )
-	qnap? ( ~dev-python/qnapstats-0.3.1[${PYTHON_USEDEP}] )
-	qvr_pro? ( ~dev-python/pyqvrpro-0.52[${PYTHON_USEDEP}] )
-	rachio? ( ~dev-python/RachioPy-1.0.3[${PYTHON_USEDEP}] )
-	rainbird? ( ~dev-python/pyrainbird-0.4.2[${PYTHON_USEDEP}] )
-	rainmachine? ( ~dev-python/regenmaschine-3.0.0[${PYTHON_USEDEP}] )
-	recorder? ( ~dev-python/sqlalchemy-1.4.13[${PYTHON_USEDEP}] )
-	rejseplanen? ( ~dev-python/rjpl-0.3.6[${PYTHON_USEDEP}] )
-	rest? ( ~dev-python/jsonpath-0.82[${PYTHON_USEDEP}] ~dev-python/xmltodict-0.12.0[${PYTHON_USEDEP}] )
-	ring? ( ~dev-python/ring-doorbell-0.6.2[${PYTHON_USEDEP}] )
-	roku? ( ~dev-python/rokuecp-0.8.1[${PYTHON_USEDEP}] )
-	roomba? ( ~dev-python/roombapy-1.6.3[${PYTHON_USEDEP}] )
-	roon? ( ~dev-python/roonapi-0.0.37[${PYTHON_USEDEP}] )
-	samsungtv? ( ~dev-python/samsungctl-0.7.1[${PYTHON_USEDEP}] ~dev-python/samsungtvws-1.6.0[${PYTHON_USEDEP}] ~dev-python/wakeonlan-2.0.1[${PYTHON_USEDEP}] )
-	scrape? ( ~dev-python/beautifulsoup-4.9.3[${PYTHON_USEDEP}] )
-	shelly? ( ~dev-python/aioshelly-0.6.4[${PYTHON_USEDEP}] )
-	shodan? ( ~dev-python/shodan-1.25.0[${PYTHON_USEDEP}] )
-	signal_messenger? ( ~dev-python/pysignalclirestapi-0.3.4[${PYTHON_USEDEP}] )
-	simplisafe? ( ~dev-python/simplisafe-python-10.0.0[${PYTHON_USEDEP}] )
-	skybell? ( ~dev-python/skybellpy-0.6.3[${PYTHON_USEDEP}] )
-	sma? ( ~dev-python/pysma-0.4.3[${PYTHON_USEDEP}] )
-	smappee? ( ~dev-python/pysmappee-0.2.25[${PYTHON_USEDEP}] )
-	smarthab? ( ~dev-python/SmartHab-0.21[${PYTHON_USEDEP}] )
-	smartthings? ( ~dev-python/pysmartapp-0.3.3[${PYTHON_USEDEP}] ~dev-python/pysmartthings-0.7.6[${PYTHON_USEDEP}] )
-	snmp? ( ~dev-python/pysnmp-4.4.12[${PYTHON_USEDEP}] )
-	socat? ( net-misc/socat )
-	socialblade? ( ~dev-python/socialbladeclient-0.5[${PYTHON_USEDEP}] )
-	solax? ( ~dev-python/solax-0.2.6[${PYTHON_USEDEP}] )
-	somfy? ( ~dev-python/pymfy-0.9.3[${PYTHON_USEDEP}] )
-	sonos? ( ~dev-python/pysonos-0.0.49[${PYTHON_USEDEP}] )
-	speedtestdotnet? ( ~net-analyzer/speedtest-cli-2.1.3[${PYTHON_USEDEP}] )
-	sql? ( ~dev-python/sqlalchemy-1.4.13[${PYTHON_USEDEP}] )
-	squeezebox? ( ~dev-python/pysqueezebox-0.5.5[${PYTHON_USEDEP}] )
-	ssl? ( dev-libs/openssl app-crypt/certbot net-proxy/haproxy )
-	statsd? ( ~dev-python/statsd-3.2.1[${PYTHON_USEDEP}] )
-	synology_dsm? ( ~dev-python/synologydsm-api-1.0.2[${PYTHON_USEDEP}] )
-	systemmonitor? ( ~dev-python/psutil-5.8.0[${PYTHON_USEDEP}] )
-	tasmota? ( ~dev-python/HATasmota-0.2.14[${PYTHON_USEDEP}] )
-	tellduslive? ( ~dev-python/tellduslive-0.10.11[${PYTHON_USEDEP}] )
-	tesla? ( ~dev-python/teslajsonpy-0.18.3[${PYTHON_USEDEP}] )
-	tile? ( ~dev-python/pytile-5.2.0[${PYTHON_USEDEP}] )
-	toon? ( ~dev-python/toonapi-0.2.0[${PYTHON_USEDEP}] )
-	totalconnect? ( ~dev-python/total-connect-client-0.57[${PYTHON_USEDEP}] )
-	tplink? ( ~dev-python/pyHS100-0.3.5.2[${PYTHON_USEDEP}] )
-	tradfri? ( ~dev-python/pytradfri-7.0.6[${PYTHON_USEDEP}] )
-	tuya? ( ~dev-python/tuyaha-0.0.10[${PYTHON_USEDEP}] )
-	unifi? ( ~dev-python/aiounifi-26[${PYTHON_USEDEP}] )
-	unifi_direct? ( ~dev-python/pexpect-4.6.0[${PYTHON_USEDEP}] )
-	upnp? ( ~dev-python/async-upnp-client-0.18.0[${PYTHON_USEDEP}] )
-	vallox? ( ~dev-python/vallox-websocket-api-2.4.0[${PYTHON_USEDEP}] )
-	velbus? ( ~dev-python/python-velbus-2.1.2[${PYTHON_USEDEP}] )
-	velux? ( ~dev-python/pyvlx-0.2.19[${PYTHON_USEDEP}] )
-	vera? ( ~dev-python/pyvera-0.3.13[${PYTHON_USEDEP}] )
-	version? ( ~dev-python/pyhaversion-21.5.0[${PYTHON_USEDEP}] )
-	vicare? ( ~dev-python/PyViCare-0.2.5[${PYTHON_USEDEP}] )
-	vizio? ( ~dev-python/pyvizio-0.1.57[${PYTHON_USEDEP}] )
-	wake_on_lan? ( ~dev-python/wakeonlan-2.0.1[${PYTHON_USEDEP}] )
-	waqi? ( ~dev-python/waqiasync-1.0.0[${PYTHON_USEDEP}] )
-	waze_travel_time? ( ~dev-python/WazeRouteCalculator-0.12[${PYTHON_USEDEP}] )
-	webostv? ( ~dev-python/aiopylgtv-0.4.0[${PYTHON_USEDEP}] )
-	wemo? ( ~dev-python/pywemo-0.6.3[${PYTHON_USEDEP}] )
-	whois? ( ~dev-python/python-whois-0.7.3[${PYTHON_USEDEP}] )
-	wink? ( ~dev-python/pubnubsub-handler-1.0.9[${PYTHON_USEDEP}] ~dev-python/python-wink-1.10.5[${PYTHON_USEDEP}] )
-	withings? ( ~dev-python/withings-api-2.3.2[${PYTHON_USEDEP}] )
-	wled? ( ~dev-python/wled-0.4.4[${PYTHON_USEDEP}] )
-	workday? ( ~dev-python/holidays-0.11.1[${PYTHON_USEDEP}] )
-	xbox_live? ( ~dev-python/xboxapi-2.0.1[${PYTHON_USEDEP}] )
-	xiaomi_aqara? ( ~dev-python/PyXiaomiGateway-0.13.4[${PYTHON_USEDEP}] )
-	xiaomi_miio? ( ~dev-python/construct-2.10.56[${PYTHON_USEDEP}] ~dev-python/python-miio-0.5.6[${PYTHON_USEDEP}] )
-	xiaomi_tv? ( ~dev-python/pymitv-1.4.3[${PYTHON_USEDEP}] )
-	xs1? ( ~dev-python/xs1-api-client-3.0.0[${PYTHON_USEDEP}] )
-	yamaha? ( ~dev-python/rxv-0.6.0[${PYTHON_USEDEP}] )
-	yamaha_musiccast? ( ~dev-python/pymusiccast-0.1.6[${PYTHON_USEDEP}] )
-	yeelight? ( ~dev-python/yeelight-0.6.3[${PYTHON_USEDEP}] )
-	yi? ( ~dev-python/aioftp-0.12.0[${PYTHON_USEDEP}] )
-	zeroconf? ( ~dev-python/zeroconf-0.31.0[${PYTHON_USEDEP}] )
-	zerproc? ( ~dev-python/pyzerproc-0.4.8[${PYTHON_USEDEP}] )
-	zha? ( ~dev-python/bellows-0.24.0[${PYTHON_USEDEP}] ~dev-python/pyserial-3.5[${PYTHON_USEDEP}] ~dev-python/pyserial-asyncio-0.5[${PYTHON_USEDEP}] ~dev-python/zha-quirks-0.0.57[${PYTHON_USEDEP}] ~dev-python/zigpy-cc-0.5.2[${PYTHON_USEDEP}] ~dev-python/zigpy-deconz-0.12.0[${PYTHON_USEDEP}] ~dev-python/zigpy-0.33.0[${PYTHON_USEDEP}] ~dev-python/zigpy-xbee-0.13.0[${PYTHON_USEDEP}] ~dev-python/zigpy-zigate-0.7.3[${PYTHON_USEDEP}] ~dev-python/zigpy-znp-0.5.1[${PYTHON_USEDEP}] )
-	zhong_hong? ( ~dev-python/zhong-hong-hvac-1.0.9[${PYTHON_USEDEP}] )
-	zoneminder? ( ~dev-python/zm-py-0.5.2[${PYTHON_USEDEP}] )
-	zwave? ( ~dev-python/homeassistant-pyozw-0.1.10[${PYTHON_USEDEP}] ~dev-python/PyDispatcher-2.0.5[${PYTHON_USEDEP}] )
-	zwave_js? ( ~dev-python/zwave-js-server-python-0.26.1[${PYTHON_USEDEP}] )"
-
-BDEPEND="${RDEPEND}
-	test? (
-		~dev-python/codecov-2.1.10[${PYTHON_USEDEP}]
-		~dev-python/coverage-5.5[${PYTHON_USEDEP}]
-		~dev-python/jsonpickle-1.4.1[${PYTHON_USEDEP}]
-		~dev-python/mock-open-1.4.0[${PYTHON_USEDEP}]
-		~dev-python/mypy-0.812[${PYTHON_USEDEP}]
-		~dev-python/pipdeptree-1.0.0[${PYTHON_USEDEP}]
-		~dev-vcs/pre-commit-2.13.0
-		~dev-python/pylint-strict-informational-0.1[${PYTHON_USEDEP}]
-		~dev-python/pylint-2.8.2[${PYTHON_USEDEP}]
-		~dev-python/pytest-cov-2.10.1[${PYTHON_USEDEP}]
-		~dev-python/pytest-sugar-0.9.4[${PYTHON_USEDEP}]
-		~dev-python/pytest-test-groups-1.0.3[${PYTHON_USEDEP}]
-		~dev-python/pytest-timeout-1.4.2[${PYTHON_USEDEP}]
-		~dev-python/pytest-xdist-2.2.1[${PYTHON_USEDEP}]
-		~dev-python/pytest-6.2.4[${PYTHON_USEDEP}]
-		~dev-python/requests-mock-1.9.2[${PYTHON_USEDEP}]
-		~dev-python/responses-0.12.0[${PYTHON_USEDEP}]
-		~dev-python/respx-0.17.0[${PYTHON_USEDEP}]
-		~dev-python/stdlib-list-0.7.0[${PYTHON_USEDEP}]
-		~dev-python/tqdm-4.49.0[${PYTHON_USEDEP}]
-	)
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]"
-
-INSTALL_DIR="/opt/${MY_PN}"
-
-DISABLE_AUTOFORMATTING=1
-DOC_CONTENTS="
-The HA interface listens on port 8123
-hass configuration is in: /etc/${MY_PN}
-daemon command line arguments are configured in: /etc/conf.d/${MY_PN}
-logging is to: /var/log/${MY_PN}/{server,errors,stdout}.log
-The sqlite db is by default in: /etc/${MY_PN}
-support at https://git.edevau.net/onkelbeh/HomeAssistantRepository
-"
-
-S="${WORKDIR}/core-${MY_PV}"
-
-DOCS="README.rst"
-
-python_install_all() {
-	dodoc ${DOCS}
-	distutils-r1_python_install_all
-	keepdir "$INSTALL_DIR"
-	keepdir "/etc/${MY_PN}"
-	fowners -R "${MY_PN}:${MY_PN}" "/etc/${MY_PN}"
-	keepdir "/var/log/${MY_PN}"
-	fowners -R "${MY_PN}:${MY_PN}" "/var/log/${MY_PN}"
-	newconfd "${FILESDIR}/${MY_PN}.conf.d" "${MY_PN}"
-	newinitd "${FILESDIR}/${MY_PN}.init.d" "${MY_PN}"
-	use systemd && systemd_dounit "${FILESDIR}/${MY_PN}.service"
-	dobin "${FILESDIR}/hasstest"
-	if use socat ; then
-		newinitd "${FILESDIR}/socat-zwave.init.d" "socat-zwave"
-		sed -i -e 's/# need socat-zwave/need socat-zwave/g' "${D}/etc/init.d/${MY_PN}" || die
-	fi
-	if use mqtt ; then
-		sed -i -e 's/# need mosquitto/need mosquitto/g' "${D}/etc/init.d/${MY_PN}" || die
-	fi
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${MY_PN}.logrotate" "${MY_PN}"
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
-
diff --git a/app-misc/homeassistant/homeassistant-2021.7.0_beta1.ebuild b/app-misc/homeassistant/homeassistant-2021.7.0_beta5.ebuild
similarity index 91%
rename from app-misc/homeassistant/homeassistant-2021.7.0_beta1.ebuild
rename to app-misc/homeassistant/homeassistant-2021.7.0_beta5.ebuild
index 11f4e6ab5..95b60d10e 100644
--- a/app-misc/homeassistant/homeassistant-2021.7.0_beta1.ebuild
+++ b/app-misc/homeassistant/homeassistant-2021.7.0_beta5.ebuild
@@ -27,7 +27,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 
 KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="abode accuweather acer_projector acmeda adguard ads aftership agent_dvr airly airvisual aladdin_connect alarmdecoder almond alpha_vantage ambiclimate ambient_station amcrest ampio androidtv android_ip_webcam anel_pwrctrl anthemav apache_kafka apcupsd apple_tv apprise aquostv arcam_fmj aruba asuswrt aten_pe atome august aurora_abb_powerone avea avion -avri awair axis baidu -beewi_smartclim bh1750 bitcoin bizkaibus blackbird blebox blink blinksticklight blinkt blockchain bluetooth_le_tracker bluetooth_tracker bme280 bme680 bmw_connected_drive bom bond braviatv broadlink brother brottsplatskartan brunt bsblan bt_home_hub_5 bt_smarthub buienradar +caldav canary cast cisco_mobility_express cli co2signal compensation coronavirus daikin darksky deconz delijn denonavr deutsche_bahn devolo_home_control dexcom dhcp dht discogs discord doorbird dunehd +dwd_weather_warnings dynalite dyson ecobee elv emulated_roku enigma2 enocean enphase_envoy environment_canada esphome everlights evohome fibaro flume flunearyou flux_led foobot fortios freebox fritz fritzbox fritzbox_callmonitor fritzbox_netmonitor fronius garmin_connect gios github gogogate2 greeneye_monitor growatt_server guardian harman_kardon_avr harmony heos here_travel_time +homekit homekit_controller -homematic -homematicip_cloud hp_ilo http hue hydrawise iaqualink ihc imap incomfort influxdb insteon intesishome ipma ipp islamic_prayer_times jewish_calendar joaoapps_join kef knx kodi kraken linode loopenergy luci luftdaten maxcube media_extractor meteo_france mfi miflora mikrotik -mitemp_bt +mobile_app +mqtt myq +mysql nad nederlandse_spoorwegen netatmo netdata +notify_events nuki nws nx584 opengarage opensensemap openweathermap +otp owntracks ozw panasonic_viera philips_js pilight +ping pi_hole +plex plugwise poolsense powerwall ps4 +python_script qnap qvr_pro rachio rainbird rainmachine +recorder rejseplanen +rest ring roku roomba roon samsungtv +scrape shelly shodan signal_messenger simplisafe skybell sma smappee smarthab smartthings +snmp socat socialblade solax somfy sonos speedtestdotnet spotify +sql squeezebox +ssl statsd synology_dsm systemd systemmonitor tasmota tellduslive tesla test tile toon totalconnect tplink tradfri tuya unifi unifi_direct upnp vallox velbus velux vera +version vicare vizio +wake_on_lan waqi waze_travel_time webostv wemo whois wink withings wled workday xbox_live xiaomi_aqara xiaomi_miio xiaomi_tv xs1 yamaha yamaha_musiccast yeelight yi zeroconf zerproc zha zhong_hong zoneminder +zwave zwave_js"
+IUSE="abode accuweather acer_projector acmeda adguard ads aftership agent_dvr airly airvisual aladdin_connect alarmdecoder almond alpha_vantage ambiclimate ambient_station amcrest ampio androidtv android_ip_webcam anel_pwrctrl anthemav apache_kafka apcupsd apple_tv apprise aquostv arcam_fmj aruba asuswrt aten_pe atome august aurora_abb_powerone avea avion -avri awair axis baidu -beewi_smartclim bh1750 bitcoin bizkaibus blackbird blebox blink blinksticklight blinkt blockchain bluetooth_le_tracker bluetooth_tracker bme280 bme680 bmw_connected_drive bom bond braviatv broadlink brother brottsplatskartan brunt bsblan bt_home_hub_5 bt_smarthub buienradar +caldav canary cast cisco_mobility_express cli co2signal compensation coronavirus daikin darksky deconz delijn denonavr deutsche_bahn devolo_home_control dexcom dhcp dht discogs discord discovery doorbird dunehd +dwd_weather_warnings dynalite dyson ecobee elv emulated_roku enigma2 enocean enphase_envoy environment_canada esphome everlights evohome fibaro flume flunearyou flux_led foobot fortios freebox fritz fritzbox fritzbox_callmonitor fritzbox_netmonitor fronius garmin_connect gios github gogogate2 greeneye_monitor growatt_server guardian harman_kardon_avr harmony heos here_travel_time +homekit homekit_controller -homematic -homematicip_cloud hp_ilo http hue hydrawise iaqualink ihc imap incomfort influxdb insteon intesishome ipma ipp islamic_prayer_times jewish_calendar joaoapps_join kef knx kodi kraken linode loopenergy luci luftdaten maxcube media_extractor meteo_france mfi miflora mikrotik -mitemp_bt +mobile_app +mqtt myq +mysql nad nederlandse_spoorwegen netatmo netdata +notify_events nuki nws nx584 opengarage opensensemap openweathermap +otp owntracks ozw panasonic_viera philips_js pilight +ping pi_hole +plex plugwise poolsense powerwall ps4 +python_script qnap qvr_pro rachio rainbird rainmachine +recorder rejseplanen +rest ring roku roomba roon samsungtv +scrape shelly shodan signal_messenger simplisafe skybell sma smappee smarthab smartthings +snmp socat socialblade solax somfy sonos speedtestdotnet spotify +sql squeezebox +ssl statsd synology_dsm systemd systemmonitor tasmota tellduslive tesla test tile toon totalconnect tplink tradfri tuya unifi unifi_direct upnp vallox velbus velux vera +version vicare vizio +wake_on_lan waqi waze_travel_time webostv wemo whois wink withings wled workday xbox_live xiaomi_aqara xiaomi_miio xiaomi_tv xs1 yamaha yamaha_musiccast yeelight yi zeroconf zerproc zha zhong_hong zoneminder +zwave zwave_js"
 
 # external deps
 RDEPEND="${PYTHON_DEPS} acct-group/${MY_PN} acct-user/${MY_PN}
@@ -65,7 +65,7 @@ RDEPEND="${RDEPEND}
 	~dev-python/grpcio-1.31.0[${PYTHON_USEDEP}]
 	>=dev-python/h11-0.12.0[${PYTHON_USEDEP}]
 	~dev-python/hass-nabucasa-0.44.0[${PYTHON_USEDEP}]
-	~dev-python/home-assistant-frontend-20210630.0[${PYTHON_USEDEP}]
+	~dev-python/home-assistant-frontend-20210706.0[${PYTHON_USEDEP}]
 	~dev-python/httpcore-0.13.3[${PYTHON_USEDEP}]
 	>=dev-python/httplib2-0.19.0[${PYTHON_USEDEP}]
 	~dev-python/httpx-0.18.0[${PYTHON_USEDEP}]
@@ -87,7 +87,7 @@ RDEPEND="${RDEPEND}
 	~dev-python/voluptuous-serialize-2.4.0[${PYTHON_USEDEP}]
 	~dev-python/voluptuous-0.12.1[${PYTHON_USEDEP}]
 	~dev-python/yarl-1.6.3[${PYTHON_USEDEP}]
-	~dev-python/zeroconf-0.32.0[${PYTHON_USEDEP}]"
+	~dev-python/zeroconf-0.32.1[${PYTHON_USEDEP}]"
 
 # unknown origin, still something to clean up here
 # some moved to suggested USE Flags
@@ -194,6 +194,7 @@ RDEPEND="${RDEPEND}
 	dht? ( ~dev-python/adafruit-circuitpython-dht-3.6.0[${PYTHON_USEDEP}] )
 	discogs? ( ~dev-python/discogs-client-2.3.0[${PYTHON_USEDEP}] )
 	discord? ( ~dev-python/discord-py-1.7.2[${PYTHON_USEDEP}] )
+	discovery? ( ~dev-python/netdisco-2.9.0[${PYTHON_USEDEP}] )
 	doorbird? ( ~dev-python/DoorBirdPy-2.1.0[${PYTHON_USEDEP}] )
 	dunehd? ( ~dev-python/pdunehd-1.3.2[${PYTHON_USEDEP}] )
 	dwd_weather_warnings? ( ~dev-python/dwdwfsapi-1.0.4[${PYTHON_USEDEP}] )
@@ -222,7 +223,7 @@ RDEPEND="${RDEPEND}
 	fritzbox_netmonitor? ( ~dev-python/fritzconnection-1.4.2[${PYTHON_USEDEP}] )
 	fronius? ( ~dev-python/PyFronius-0.5.2[${PYTHON_USEDEP}] )
 	garmin_connect? ( ~dev-python/garminconnect-ha-0.1.6[${PYTHON_USEDEP}] )
-	gios? ( ~dev-python/gios-1.0.1[${PYTHON_USEDEP}] )
+	gios? ( ~dev-python/gios-1.0.2[${PYTHON_USEDEP}] )
 	github? ( ~dev-python/PyGithub-1.43.8[${PYTHON_USEDEP}] )
 	gogogate2? ( ~dev-python/ismartgate-4.0.0[${PYTHON_USEDEP}] )
 	greeneye_monitor? ( ~dev-python/greeneye-monitor-2.1[${PYTHON_USEDEP}] )
@@ -232,8 +233,8 @@ RDEPEND="${RDEPEND}
 	harmony? ( ~dev-python/aioharmony-0.2.7[${PYTHON_USEDEP}] )
 	heos? ( ~dev-python/pyheos-0.7.2[${PYTHON_USEDEP}] )
 	here_travel_time? ( ~dev-python/herepy-2.0.0[${PYTHON_USEDEP}] )
-	homekit? ( ~dev-python/HAP-python-3.5.0[${PYTHON_USEDEP}] ~dev-python/fnvhash-0.1.0[${PYTHON_USEDEP}] ~dev-python/pyqrcode-1.2.1[${PYTHON_USEDEP}] ~dev-python/base36-0.1.1[${PYTHON_USEDEP}] ~dev-python/PyTurboJPEG-1.5.0[${PYTHON_USEDEP}] )
-	homekit_controller? ( ~dev-python/aiohomekit-0.4.0[${PYTHON_USEDEP}] )
+	homekit? ( ~dev-python/HAP-python-3.5.1[${PYTHON_USEDEP}] ~dev-python/fnvhash-0.1.0[${PYTHON_USEDEP}] ~dev-python/pyqrcode-1.2.1[${PYTHON_USEDEP}] ~dev-python/base36-0.1.1[${PYTHON_USEDEP}] ~dev-python/PyTurboJPEG-1.5.0[${PYTHON_USEDEP}] )
+	homekit_controller? ( ~dev-python/aiohomekit-0.4.2[${PYTHON_USEDEP}] )
 	homematic? ( ~dev-python/pyhomematic-0.1.73[${PYTHON_USEDEP}] )
 	homematicip_cloud? ( ~dev-python/homematicip-0.13.1[${PYTHON_USEDEP}] )
 	hp_ilo? ( ~dev-python/python-hpilo-4.3[${PYTHON_USEDEP}] )
@@ -313,9 +314,9 @@ RDEPEND="${RDEPEND}
 	shelly? ( ~dev-python/aioshelly-0.6.4[${PYTHON_USEDEP}] )
 	shodan? ( ~dev-python/shodan-1.25.0[${PYTHON_USEDEP}] )
 	signal_messenger? ( ~dev-python/pysignalclirestapi-0.3.4[${PYTHON_USEDEP}] )
-	simplisafe? ( ~dev-python/simplisafe-python-10.0.0[${PYTHON_USEDEP}] )
+	simplisafe? ( ~dev-python/simplisafe-python-11.0.0[${PYTHON_USEDEP}] )
 	skybell? ( ~dev-python/skybellpy-0.6.3[${PYTHON_USEDEP}] )
-	sma? ( ~dev-python/pysma-0.6.1[${PYTHON_USEDEP}] )
+	sma? ( ~dev-python/pysma-0.6.2[${PYTHON_USEDEP}] )
 	smappee? ( ~dev-python/pysmappee-0.2.25[${PYTHON_USEDEP}] )
 	smarthab? ( ~dev-python/SmartHab-0.21[${PYTHON_USEDEP}] )
 	smartthings? ( ~dev-python/pysmartapp-0.3.3[${PYTHON_USEDEP}] ~dev-python/pysmartthings-0.7.6[${PYTHON_USEDEP}] )
@@ -323,7 +324,7 @@ RDEPEND="${RDEPEND}
 	socat? ( net-misc/socat )
 	socialblade? ( ~dev-python/socialbladeclient-0.5[${PYTHON_USEDEP}] )
 	solax? ( ~dev-python/solax-0.2.6[${PYTHON_USEDEP}] )
-	somfy? ( ~dev-python/pymfy-0.9.3[${PYTHON_USEDEP}] )
+	somfy? ( ~dev-python/pymfy-0.11.0[${PYTHON_USEDEP}] )
 	sonos? ( ~dev-python/pysonos-0.0.51[${PYTHON_USEDEP}] )
 	speedtestdotnet? ( ~net-analyzer/speedtest-cli-2.1.3[${PYTHON_USEDEP}] )
 	spotify? ( ~dev-python/spotipy-2.18.0[${PYTHON_USEDEP}] )
@@ -371,9 +372,9 @@ RDEPEND="${RDEPEND}
 	yamaha_musiccast? ( ~dev-python/aiomusiccast-0.8.0[${PYTHON_USEDEP}] )
 	yeelight? ( ~dev-python/yeelight-0.6.3[${PYTHON_USEDEP}] )
 	yi? ( ~dev-python/aioftp-0.12.0[${PYTHON_USEDEP}] )
-	zeroconf? ( ~dev-python/zeroconf-0.32.0[${PYTHON_USEDEP}] )
+	zeroconf? ( ~dev-python/zeroconf-0.32.1[${PYTHON_USEDEP}] )
 	zerproc? ( ~dev-python/pyzerproc-0.4.8[${PYTHON_USEDEP}] )
-	zha? ( ~dev-python/bellows-0.25.0[${PYTHON_USEDEP}] ~dev-python/pyserial-3.5[${PYTHON_USEDEP}] ~dev-python/pyserial-asyncio-0.5[${PYTHON_USEDEP}] ~dev-python/zha-quirks-0.0.58[${PYTHON_USEDEP}] ~dev-python/zigpy-cc-0.5.2[${PYTHON_USEDEP}] ~dev-python/zigpy-deconz-0.12.0[${PYTHON_USEDEP}] ~dev-python/zigpy-0.35.0[${PYTHON_USEDEP}] ~dev-python/zigpy-xbee-0.13.0[${PYTHON_USEDEP}] ~dev-python/zigpy-zigate-0.7.3[${PYTHON_USEDEP}] ~dev-python/zigpy-znp-0.5.1[${PYTHON_USEDEP}] )
+	zha? ( ~dev-python/bellows-0.25.0[${PYTHON_USEDEP}] ~dev-python/pyserial-3.5[${PYTHON_USEDEP}] ~dev-python/pyserial-asyncio-0.5[${PYTHON_USEDEP}] ~dev-python/zha-quirks-0.0.58[${PYTHON_USEDEP}] ~dev-python/zigpy-cc-0.5.2[${PYTHON_USEDEP}] ~dev-python/zigpy-deconz-0.12.0[${PYTHON_USEDEP}] ~dev-python/zigpy-0.35.1[${PYTHON_USEDEP}] ~dev-python/zigpy-xbee-0.13.0[${PYTHON_USEDEP}] ~dev-python/zigpy-zigate-0.7.3[${PYTHON_USEDEP}] ~dev-python/zigpy-znp-0.5.1[${PYTHON_USEDEP}] )
 	zhong_hong? ( ~dev-python/zhong-hong-hvac-1.0.9[${PYTHON_USEDEP}] )
 	zoneminder? ( ~dev-python/zm-py-0.5.2[${PYTHON_USEDEP}] )
 	zwave? ( ~dev-python/homeassistant-pyozw-0.1.10[${PYTHON_USEDEP}] ~dev-python/PyDispatcher-2.0.5[${PYTHON_USEDEP}] )
diff --git a/requirements_all.txt b/requirements_all.txt
index fdfcf03e3..2df671240 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -466,7 +466,6 @@ lxml==4.6.3
 lyft_rides==0.2
 lz4==1.9.3
 lz4==3.1.3
-mac-vendor-lookup==0.1.11
 magicseaweed==1.0.3
 markdown==3.3.4
 markupsafe==2.0.1
@@ -511,7 +510,6 @@ netaddr==0.8.0
 netdata==0.2.0
 netdisco==2.9.0
 netifaces==0.11.0
-netmap==0.7.0.2
 nettigo-air-monitor==1.0.0
 neurio==0.3.1
 nexia==0.9.7
@@ -555,7 +553,6 @@ panacotta==0.1
 panasonic-viera==0.3.6
 pandas==1.2.4
 paramiko==2.7.2
-pathlib2==2.3.5
 pbr==5.6.0
 pcal9535a==0.7
 pdunehd==1.3.2
@@ -730,7 +727,7 @@ pymelcloud==2.5.3
 PyMetEireann==0.2
 pymeteoclimatic==0.0.6
 PyMetno==0.8.3
-pymfy==0.9.3
+pymfy==0.11.0
 pymitv==1.4.3
 pymochad==0.2.0
 pymodbus==2.5.2
@@ -844,6 +841,7 @@ python-miio==0.5.6
 python-mpd2==3.0.4
 python-mystrom==1.1.2
 python-nest==4.1.0
+python-nmap==0.6.1
 python-openzwave-mqtt==1.4.0
 python-picnic-api==1.1.0
 python-qbittorrent==0.4.2
@@ -960,7 +958,7 @@ shodan==1.25.0
 simplehound==0.3
 simplejson==3.17.2
 simplepush==1.1.4
-simplisafe-python==10.0.0
+simplisafe-python==11.0.0
 sisyphus-control==3.0
 six==1.16.0
 skybellpy==0.6.3