diff --git a/README.md b/README.md
index 264379a82..f2239642b 100644
--- a/README.md
+++ b/README.md
@@ -524,14 +524,14 @@ A daily compile test is run at Github with Python 3.9 to catch general faults. E
 
 ## Licenses
 This repository itself is released under GPL-3 (like most Gentoo repositories), all work on the depending components under the licenses they came from. Perhaps you came here because I filed an issue at your component about a bad or missing license. It is easy to [assign a license](https://docs.github.com/en/communities/setting-up-your-project-for-healthy-contributions/adding-a-license-to-a-repository). During cleanups and license investigations I have been asked often which license to choose. I am not a lawyer, but I can offer the following table, counted over this repository, perhaps this helps your decision. If a package has more than one license listed, all of them are counted.
-There are 1767 Ebuilds in total, 1760 of them have in total 1767 (35 different) licenses assigned.
+There are 1770 Ebuilds in total, 1763 of them have in total 1770 (35 different) licenses assigned.
 
 |License| Ebuilds using it|
 |-------|-----|
-|MIT|1076|
+|MIT|1078|
 |Apache-2.0|321|
 |GPL-3|108|
-|BSD|98|
+|BSD|99|
 |LGPL-3|28|
 |GPL-2|23|
 |LGPL-3+|18|
@@ -564,9 +564,9 @@ There are 1767 Ebuilds in total, 1760 of them have in total 1767 (35 different)
 |CC-BY-NC-SA-4.0|1|
 |CC0-1.0|1|
 
-(Last counted: 05/06/2022)
+(Last counted: 07/06/2022)
 
 I did my best to keep these clean. If a valid license was published on PyPI, it has been automatically merged. Otherwise I took it from GitHub or alternatively from comments/files in the source. Sometimes these differed and have been not unique. All license strings are adjusted to the list in `/usr/portage/gentoo/licenses/`. Some packages do not have any license published. In this case, Authors have been asked for clarification, some did not respond. Following the [official Gentoo Guide](https://devmanual.gentoo.org/general-concepts/licenses/index.html), these then were added with an `all-rights-reserved` license and `RESTRICT="mirror"` was set. Find the appropriate licenses referenced in the Ebuild files and in the corresponding homepages or sources.
 
 A big thanks goes to Iris for reviewing this README.
-Last updated: 05/06/2022
+Last updated: 07/06/2022
diff --git a/app-misc/homeassistant-full/Manifest b/app-misc/homeassistant-full/Manifest
index 5d25b5f29..55075999e 100644
--- a/app-misc/homeassistant-full/Manifest
+++ b/app-misc/homeassistant-full/Manifest
@@ -11,14 +11,14 @@ AUX update-homeassistant 1326 BLAKE2B 917bdd332c4e5dea5177eecd11a7f8d72b911fddfd
 DIST homeassistant-2022.4.7.tar.gz 15146071 BLAKE2B da4a764a281d8597a6a75e1a829c3c4d555f7ae232f429077203afbfa4a5bb9e3480d0f4bf8cddc7e5ae1d3187b871d43ee38930a60e54f9e3e7e16176a14b0e SHA512 8989a3b32444ccf70d33e301b08d42b424474cb5cc437e872e857978993dd4006732efc67a74ab1ab6c44740f60a4fd00fe264c88652c0acaf5b7d6b18d0f489
 DIST homeassistant-2022.5.5.tar.gz 15430712 BLAKE2B e119f508fc5dec3b7eb7f18a61ec9fc281027b4e4df156683d54b803139d774218384d8bdcaec9c778d052046f9954564ef65f7feeab73c1a94e96ca655ed984 SHA512 fc5184c010242cca362d124231de4e0f396ba9b8596de4409243586043f77650db6d10641bb6274e954a1cc81e9d107942165a91a7c61b20cffcd08b11d9c9f0
 DIST homeassistant-2022.6.0.tar.gz 15559626 BLAKE2B 58cb0eb149f10dc43c1536923fc8796760e14f1cab862134eee7049a9bb0b9b4fb7598ce6302b38492b7adf0d76f77a0749ac7fac92e9603d9566c350ad07f6f SHA512 8fc75c5ed2527b351fc8dd2688dd69d359c3bc0a146ef17282a593837c7ca32e9431661de7c625bc0f7768571a4f844b13a32ec7fdfe14e0f6c967a1654fa338
-DIST homeassistant-2022.6.0b7.tar.gz 15558366 BLAKE2B 248a5b3b6e7d7fd63f05349aaf19c3514f5d39176693a6040d5c21066dc54713ff9c23108f3b80c4e722cf4e5064028a8537fa7e36f810630b676bd6bf6d8b0f SHA512 3d9bdc93df79732b8f3e2a9dcfbf58486d8e9ac7c260dde38f971cc8b914d3d251ef3ddfc43c75232af4154531dc638db6577db7a00e96303d5f13ab3c5767ac
 DIST homeassistant-2022.6.1.tar.gz 15567757 BLAKE2B 8988d2757d25a2a50dd0bbc39c835f325356ff6d6291bb0f2ef5637b54a589814985166c4200774513e02ffc238206670e59fbbd9af76e3cd244de54d62a878b SHA512 b9511db8c08d6c0b416f82c0368add357e7eee82051a4abb2b9b3e99f1cc775f6a0303dea509338330c9aee3bbd6e7ab2315c3449d1bfa77849512858c0a02d8
 DIST homeassistant-2022.6.2.tar.gz 15568289 BLAKE2B b7c3d61421295fde229081580289619549a81718b7540a31a88242a45c782047f32ed169a7827b1852c334c78e4303997508c5e34eb24dc791c573540842bc2b SHA512 b60be2df7c4e56bacd35f5b94a1979815a540701daab5cb0211240b4716e597e98ab5a70a8f8cce6e210a4204fb711f98c08cd943da62895e7e49f5b6ffef4d1
+DIST homeassistant-2022.6.3.tar.gz 15572357 BLAKE2B 665da4525994598228ce661ea912ab2ef7d4598c319cd7f5178cabef5a07c47e1e4019932e2cdbed18ad20739efa5248c22c804059fd4ab002605f10309c6082 SHA512 630179ee3895982f0f4dac0b164437c6ef2d2a3c47b5b9ca8068489c0ca4f0ada33d558338120738ef3431cd03aa115a1f99bd059686192c535799e52016f1a7
 EBUILD homeassistant-full-2022.4.7-r1.ebuild 71862 BLAKE2B 3306f2f555852fcb77010b5aaf3886787e196eaa2eda695870ba76d7a5c8dd2c3930e4b06846230070d5c2811cbc33797a255f34176eec4e62ae21e45de42ada SHA512 dc4f5af8883105df7a3ff607e941bfa46fe932f0fea0a78e19c5e88f8d916cf2581737cedd37a7a87154a72a866f243382b76034e32adc142f1e1e1b52e23e51
 EBUILD homeassistant-full-2022.5.5-r1.ebuild 72460 BLAKE2B c8c6b6805b8d8232477eb3b2a373bc3aa135557cdb335c8f536e87e78ae6051d43a424e6f560612264005e621efc8eb53252992f92a10b0e39d240b0e4718261 SHA512 afc60ebc15003e21f9a254f1ec2c4670a8a428f83e4d903c8f7eb3c223e0d393b721b4fe432ceb594b902a4daf8e501a58cb0445cbc14ce74657d652a42e3f47
 EBUILD homeassistant-full-2022.6.0.ebuild 72840 BLAKE2B f460535f7d4b24e105d7fa56bb4c22a0f0d50d8c5bc7cbd3cfb18ee65c65c5e1140caffc0d15d50d5ab065b76acc245827d448ff91b1b6368eb902deefe818b8 SHA512 85e53d6583e1368dd7aeec2b1b1c4c2e9d9086818fbd665e07dbe1dad7376063db91209ebd3c0d41a3ab68626fec01ef0f7fba23a29262198a02fc474cf8d3d8
-EBUILD homeassistant-full-2022.6.0_beta7.ebuild 72797 BLAKE2B 56f6b415cd5a3aae94a75243091e0d397ec39d1dee7fcea54f565274f245035db7986b628f484d82392ec84f3a6aaf9f8d909180e430e1ddb9b3bdfcba1aabcb SHA512 c2e240a884a323a2962c8d0758ffd439f94af0cd54a1626cd81daf7682cd33c89b59519507e2133c3cfcbc04c240cdb8c396cccdd9d659e70c924c5c42c19e9b
 EBUILD homeassistant-full-2022.6.1.ebuild 72840 BLAKE2B e1f18494eb776afb80ce948857358b95645d49d6159b2a555da2c6ca55f0a9ad6aff4e7a3c6846f0924dda2b77b7d1dcb47f59992dcfcd02a45cedfde068c023 SHA512 a7fa57b11a6a22e25d2674017a007daac0ddeb132a84a85ab77f4e625a1d4c4b6bca1204af9f4da11e9c110450fa88fdaa05c527a449fc2515c17f1bab82a798
 EBUILD homeassistant-full-2022.6.2.ebuild 72840 BLAKE2B 4c181eb6b13db39e34bc74a4776feb02168c72eeffd172fe718c7a11ca7516c5f175c5423a3722ab0be6999d940cc0201055ddf742169566dad781b51787ef6d SHA512 d796467020c75a908ae1f786c7e495fd49f00c03c6999e544ed7ca6907df0e0e215cc415183154d1213384d47907d0adcbc9a86af793c5047927083d04a37ac9
-EBUILD homeassistant-full-9999.ebuild 72844 BLAKE2B 41b08697e8ce3b553fa47ae26974bc09b0f548e7ca5c4f1bed61c8c935fd363da65310d2f9ac39879cd5f6e063b31cea9e489aa4b1e353f5f5260a78aee55a6a SHA512 48980602734ff74d90673de8de7e7c031fb57361763aab4e661d925369d65664300e0f163a2b69d63a865e3de70dac13a0da11a48448c06e4c43781c536a028d
+EBUILD homeassistant-full-2022.6.3.ebuild 72854 BLAKE2B cfabd8c5cbc771d854c39224b785785490c008335146d628b3a561824d1a5e8e69f76eb602e4acc2d0ce946c7be63da55439a538901dfca135bfda7975a64bf8 SHA512 37493e08ebeabf1a2fb9c8a76a1f1f112b20d2aeb402d21ab2d7447eebe50341b21927ab2e94a0dc207645090033b90d2854a672e2d93d35728fcf5215631ef0
+EBUILD homeassistant-full-9999.ebuild 72858 BLAKE2B dbc83365234b9e4bc200abe3926337d43a1e7cb80055c4a61c734f38707459f80eabce8f5a0ec1becb913bf4800379535cfeaba1a879f66cf7ab2e3140ebe99c SHA512 aa880df97616b6e84f8c1bfec16208cd1de4eaf0bd07ff12a5eb7b16c3926a7380a5833edc163d752df0eaf956f7b45642ddde10ada2d77fccf2ac1d175c82b7
 MISC metadata.xml 79157 BLAKE2B 45e5bafb169c144878a09d0694ea23cb9344f1714bb16d1d990c25a185a539172bf9048bb28ac419f0e66e465c3725791e99802cc0ab3d3474b0ae0c277d67c6 SHA512 d7feea7c8e8e9941e0279edb33f4fc0d4e5f9f8b8b3750b538215c62f2ad9a1aa9b4b50f28d8c9afb05ba581318fd39a9f5377021a2cbeb8d395999a9865409d
diff --git a/app-misc/homeassistant-full/homeassistant-full-2022.6.0_beta7.ebuild b/app-misc/homeassistant-full/homeassistant-full-2022.6.3.ebuild
similarity index 98%
rename from app-misc/homeassistant-full/homeassistant-full-2022.6.0_beta7.ebuild
rename to app-misc/homeassistant-full/homeassistant-full-2022.6.3.ebuild
index f9c4dcadb..7f50aefba 100644
--- a/app-misc/homeassistant-full/homeassistant-full-2022.6.0_beta7.ebuild
+++ b/app-misc/homeassistant-full/homeassistant-full-2022.6.3.ebuild
@@ -26,7 +26,7 @@ HOMEPAGE="https://home-assistant.io/ https://git.edevau.net/onkelbeh/HomeAssista
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 arm arm64 x86"
 IUSE="abode accuweather acer_projector acmeda adax adguard ads advantage_air aemet aftership agent_dvr airly airnow airthings airtouch4 airvisual airzone aladdin_connect alarmdecoder almond alpha_vantage amazon_polly ambee amberelectric ambiclimate ambient_station amcrest ampio androidtv android_ip_webcam anel_pwrctrl anthemav apache_kafka apcupsd apns apple_tv apprise aprs aqualogic aquostv arcam_fmj arlo arris_tg2492lg aruba aseko_pool_live asterisk_mbox asuswrt atag aten_pe atome august aurora aurora_abb_powerone aussie_broadband avea avion awair aws axis backup baf baidu balboa 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 bond bosch_shc braviatv broadlink brother brottsplatskartan brunt bsblan bt_home_hub_5 bt_smarthub buienradar +caldav camera canary cast channels circuit cisco_ios cisco_mobility_express cisco_webex_teams clementine cli climacell cloud cloudflare cmus co2signal coinbase color_extractor comfoconnect compensation concord232 control4 coolmaster coronavirus cppm_tracker cpuspeed crownstone cups daikin danfoss_air darksky datadog debugpy deconz decora decora_wifi delijn deluge denonavr deutsche_bahn devolo_home_control devolo_home_network dexcom dhcp dht digitalloggers digital_ocean directv discogs discord discovery dlib_face_detect dlib_face_identify dlink dlna_dmr dlna_dms 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 efergy egardia eight_sleep elgato eliqonline elkm1 elmax elv emby emonitor emulated_hue emulated_kasa emulated_roku enigma2 enocean enphase_envoy entur_public_transport environment_canada envirophat envisalink ephember epson epsonworkforce eq3btsmart esphome essent etherscan eufy everlights evil_genius_labs evohome ezviz faa_delays familyhub fastdotcom feedreader ffmpeg fibaro fido fints fireservicerota firmata fitbit fivem fixer fjaraskupan fleetgo flexit flic flick_electric flipr flo flume flunearyou flux_led folder_watcher foobot forecast_solar forked_daapd fortios foscam freebox freedompro free_mobile fritz fritzbox fritzbox_callmonitor fritzbox_netmonitor fronius frontier_silicon futurenow garages_amsterdam garmin_connect gc100 gdacs generic geniushub geocaching geonetnz_quakes geonetnz_volcano geo_json_events geo_rss_events gios github gitlab_ci gitter glances gntp goalfeed goalzero gogogate2 goodwe google google_cloud google_maps google_pubsub google_translate google_travel_time gpmdp gpsd gree greeneye_monitor greenwave 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 homewizard homeworks home_connect home_plus_control honeywell horizon hp_ilo html5 http htu21d huawei_lte hue huisbaasje hunterdouglas_powerview hvv_departures hydrawise hyperion ialarm ialarm_xr iammeter iaqualink icloud idteck_prox ifttt iglo ign_sismologia ihc image imap incomfort influxdb insteon intellifire intesishome iota iotawatt iperf3 ipma ipp iqvia irish_rail_transport islamic_prayer_times iss isy994 itach izone jellyfin jewish_calendar joaoapps_join juicenet kaiterra kaleidescape keba keenetic_ndms2 kef keyboard keyboard_remote kira kiwi kmtronic knx kodi konnected kostal_plenticore kraken kulersky kwb lacrosse lametric lastfm launch_library laundrify lcn lg_netcast lg_soundbar life360 lifx lifx_legacy lightwave limitlessled linode linux_battery litejet litterrobot logi_circle london_underground lookin loopenergy luci luftdaten lupusec lutron lutron_caseta lw12wifi lyft lyric magicseaweed mailgun marytts mastodon matrix maxcube mazda mcp23017 meater mediaroom media_extractor melcloud melissa message_bird met meteoalarm meteoclimatic meteo_france metoffice met_eireann mfi mhz19 microsoft miflora mikrotik mill minecraft_server minio mitemp_bt +mobile_app mochad modbus modem_callerid modern_forms moehlenhoff_alpha2 monoprice motioneye motion_blinds mpd +mqtt msteams mullvad mutesync mvglive mychevy mycroft myq mysensors +mysql mystrom mythicbeastsdns nad nam namecheapdns nanoleaf neato nederlandse_spoorwegen nello ness_alarm nest netatmo netdata netgear netgear_lte netio network neurio_energy nexia nextbus nextcloud nfandroidtv nightscout niko_home_control nilu nina nissan_leaf nmap_tracker nmbs noaa_tides norway_air +notify_events notion nsw_fuel_station nsw_rural_fire_service_feed nuheat nuki numato nut nws nx584 nzbget oasa_telematics obihai octoprint oem ohmconnect ombi omnilogic oncue ondilo_ico onewire onkyo onvif openerz openevse opengarage openhome opensensemap opentherm_gw openuv openweathermap open_meteo opnsense opple orangepi_gpio oru orvibo osramlightify +otp overkiz ovo_energy owntracks ozw p1_monitor panasonic_bluray panasonic_viera pandora pcal9535a peco pencom philips_js pi4ioe5v9xxxx picnic piglow pilight +ping pi_hole pjlink plaato +plex plugwise plum_lightpad pocketcasts point poolsense powerwall profiler progettihwsw proliphix prometheus prosegur proxmoxve proxy ps4 pulseaudio_loopback pure_energie pushbullet pushover pvoutput pvpc_hourly_pricing +python_script qbittorrent qld_bushfire qnap qnap_qsw qrcode quantum_gateway qvr_pro qwikswitch rachio radiotherm radio_browser rainbird raincloud rainforest_eagle rainmachine raspihats raspyrfm rdw recollect_waste +recorder recswitch reddit rejseplanen remember_the_milk remote_rpi_gpio renault repetier +rest rflink rfxtrx ridwell ring ripple risco rituals_perfume_genie rmvtransport rocketchat roku roomba roon route53 rova rpi_gpio rpi_gpio_pwm rpi_pfio rpi_power rpi_rf rtsp_to_webrtc ruckus_unleashed russound_rio russound_rnet sabnzbd saj samsungtv satel_integra schluter +scrape screenlogic scsgate season sendgrid sense sensehat senseme sensibo sentry senz 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 slimproto sma smappee smarthab smartthings smarttub smarty smart_meter_texas smhi sms snapcast +snmp socat sochain solaredge solaredge_local solarlog solax soma somfy somfy_mylink sonarr songpal sonos sony_projector soundtouch spc speedtestdotnet spider splunk +spotify +sql squeezebox srp_energy ssdp +ssl starline starlingbank startca statsd steamist 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_dsm synology_srm systemd systemmonitor system_bridge tado tahoma tailscale tankerkoenig tank_utility tapsaff tasmota tautulli ted5000 telegram_bot tellduslive tellstick temper tesla tesla_wall_connector test tfiac thermoworks_smoke thingspeak thinkingcleaner tibber tikteck tile tmb todoist tof tolo tomorrowio toon totalconnect touchline tplink tplink_lte traccar trackr tractive tradfri trafikverket_ferry trafikverket_train trafikverket_weatherstation transmission transport_nsw travisci trend tts tuya twentemilieu twilio twinkly twitch twitter ubus ukraine_alarm unifi unifiled unifiprotect unifi_direct upb upcloud upc_connect updater upnp uptimerobot usb uscis usgs_earthquakes_feed utility_meter uvc vallox vasttrafik velbus velux venstar vera verisure versasense +version vesync vicare vilfo vivotek vizio vlc vlc_telnet volkszaehler volumio volvooncall vulcan vultr w800rf32 +wake_on_lan wallbox waqi waterfurnace watson_iot watson_tts watttime waze_travel_time webostv wemo whirlpool whois wiffi wilight wink wirelesstag withings wiz wled wolflink workday ws66i xbee xbox xbox_live xeoma xiaomi_aqara xiaomi_miio xiaomi_tv xmpp xs1 yale_smart_alarm yamaha yamaha_musiccast yandex_transport yeelight yeelightsunflower yi yolink youless zabbix zengge zeroconf zerproc zestimate zha zhong_hong ziggo_mediabox_xl zoneminder +zwave_js zwave_me"
 RESTRICT="!test? ( test )"
 
@@ -67,7 +67,7 @@ RDEPEND="${RDEPEND}
 	~dev-python/grpcio-1.46.1[${PYTHON_USEDEP}]
 	~dev-python/h11-0.12.0[${PYTHON_USEDEP}]
 	~dev-python/hass-nabucasa-0.54.0[${PYTHON_USEDEP}]
-	~dev-python/home-assistant-frontend-20220531.0[${PYTHON_USEDEP}]
+	~dev-python/home-assistant-frontend-20220601.0[${PYTHON_USEDEP}]
 	~dev-python/httpcore-0.15.0[${PYTHON_USEDEP}]
 	>=dev-python/httplib2-0.19.0[${PYTHON_USEDEP}]
 	~dev-python/httpx-0.23.0[${PYTHON_USEDEP}]
@@ -81,6 +81,7 @@ RDEPEND="${RDEPEND}
 	~dev-python/pillow-9.1.1[${PYTHON_USEDEP}]
 	<dev-python/pip-22.1.0
 	>=dev-python/pycryptodome-3.6.6[${PYTHON_USEDEP}]
+	!~dev-python/pydantic-1.9.1[${PYTHON_USEDEP}]
 	~dev-python/pyjwt-2.4.0[${PYTHON_USEDEP}]
 	~dev-python/pynacl-1.5.0[${PYTHON_USEDEP}]
 	~dev-python/pyserial-3.5[${PYTHON_USEDEP}]
@@ -94,7 +95,7 @@ RDEPEND="${RDEPEND}
 	~dev-python/regex-2021.8.28[${PYTHON_USEDEP}]
 	~dev-python/requests-2.27.1[${PYTHON_USEDEP}]
 	~net-analyzer/scapy-2.4.5
-	~dev-python/sqlalchemy-1.4.36[${PYTHON_USEDEP}]
+	~dev-python/sqlalchemy-1.4.37[${PYTHON_USEDEP}]
 	>=dev-python/typing-extensions-3.10.0.2[${PYTHON_USEDEP}]
 	<dev-python/typing-extensions-5.0[${PYTHON_USEDEP}]
 	>=dev-python/urllib3-1.26.5[${PYTHON_USEDEP}]
@@ -179,7 +180,7 @@ RDEPEND="${RDEPEND}
 	aws? ( ~dev-python/aiobotocore-2.1.0[${PYTHON_USEDEP}] )
 	axis? ( ~dev-python/axis-44[${PYTHON_USEDEP}] )
 	backup? ( ~dev-python/securetar-2022.2.0[${PYTHON_USEDEP}] )
-	baf? ( ~dev-python/aiobafi6-0.3.0[${PYTHON_USEDEP}] )
+	baf? ( ~dev-python/aiobafi6-0.5.0[${PYTHON_USEDEP}] )
 	baidu? ( ~dev-python/baidu-aip-1.6.6.0[${PYTHON_USEDEP}] )
 	balboa? ( ~dev-python/pybalboa-0.13[${PYTHON_USEDEP}] )
 	bbb_gpio? ( ~dev-python/Adafruit_BBIO-1.1.1[${PYTHON_USEDEP}] )
@@ -200,7 +201,7 @@ RDEPEND="${RDEPEND}
 	bme280? ( ~dev-python/i2csense-0.0.4[${PYTHON_USEDEP}] ~dev-python/smbus-cffi-0.5.1[${PYTHON_USEDEP}] ~dev-python/bme280spi-0.2.0[${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.9.3[${PYTHON_USEDEP}] )
+	bmw_connected_drive? ( ~dev-python/bimmer-connected-0.9.4[${PYTHON_USEDEP}] )
 	bond? ( ~dev-python/bond-async-0.1.20[${PYTHON_USEDEP}] )
 	bosch_shc? ( ~dev-python/boschshcpy-0.2.30[${PYTHON_USEDEP}] )
 	braviatv? ( ~dev-python/bravia-tv-1.0.11[${PYTHON_USEDEP}] )
@@ -408,7 +409,7 @@ RDEPEND="${RDEPEND}
 	hikvision? ( ~dev-python/pyHik-0.3.0[${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.5.4[${PYTHON_USEDEP}] )
+	hive? ( ~dev-python/pyhiveapi-0.5.5[${PYTHON_USEDEP}] )
 	hlk_sw16? ( ~dev-python/hlk-sw16-0.0.9[${PYTHON_USEDEP}] )
 	homekit? ( ~dev-python/HAP-python-4.4.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}] )
 	homekit_controller? ( ~dev-python/aiohomekit-0.7.17[${PYTHON_USEDEP}] )
@@ -432,7 +433,7 @@ RDEPEND="${RDEPEND}
 	hydrawise? ( ~dev-python/Hydrawiser-0.2[${PYTHON_USEDEP}] )
 	hyperion? ( ~dev-python/hyperion-py-0.7.5[${PYTHON_USEDEP}] )
 	ialarm? ( ~dev-python/pyialarm-1.9.0[${PYTHON_USEDEP}] )
-	ialarm_xr? ( ~dev-python/pyialarmxr-1.0.18[${PYTHON_USEDEP}] )
+	ialarm_xr? ( ~dev-python/pyialarmxr-homeassistant-1.0.18[${PYTHON_USEDEP}] )
 	iammeter? ( ~dev-python/iammeter-0.1.7[${PYTHON_USEDEP}] )
 	iaqualink? ( ~dev-python/iaqualink-0.4.1[${PYTHON_USEDEP}] )
 	icloud? ( ~dev-python/pyicloud-1.0.0[${PYTHON_USEDEP}] )
@@ -486,7 +487,7 @@ RDEPEND="${RDEPEND}
 	lastfm? ( ~dev-python/pylast-4.2.1[${PYTHON_USEDEP}] )
 	launch_library? ( ~dev-python/pylaunches-1.3.0[${PYTHON_USEDEP}] )
 	laundrify? ( ~dev-python/laundrify-aio-1.1.2[${PYTHON_USEDEP}] )
-	lcn? ( ~dev-python/pypck-0.7.14[${PYTHON_USEDEP}] )
+	lcn? ( ~dev-python/pypck-0.7.15[${PYTHON_USEDEP}] )
 	lg_netcast? ( ~dev-python/pylgnetcast-0.3.7[${PYTHON_USEDEP}] )
 	lg_soundbar? ( ~dev-python/temescal-0.3[${PYTHON_USEDEP}] )
 	life360? ( ~dev-python/life360-4.1.1[${PYTHON_USEDEP}] )
@@ -500,7 +501,7 @@ RDEPEND="${RDEPEND}
 	litterrobot? ( ~dev-python/pylitterbot-2022.3.0[${PYTHON_USEDEP}] )
 	logi_circle? ( ~dev-python/logi-circle-0.2.3[${PYTHON_USEDEP}] )
 	london_underground? ( ~dev-python/london-tube-status-0.2[${PYTHON_USEDEP}] )
-	lookin? ( ~dev-python/aiolookin-0.1.0[${PYTHON_USEDEP}] )
+	lookin? ( ~dev-python/aiolookin-0.1.1[${PYTHON_USEDEP}] )
 	loopenergy? ( ~dev-python/pyloopenergy-0.2.1[${PYTHON_USEDEP}] )
 	luci? ( ~dev-python/openwrt-luci-rpc-1.1.11[${PYTHON_USEDEP}] )
 	luftdaten? ( ~dev-python/luftdaten-0.7.2[${PYTHON_USEDEP}] )
@@ -547,7 +548,7 @@ RDEPEND="${RDEPEND}
 	moehlenhoff_alpha2? ( ~dev-python/moehlenhoff-alpha2-1.2.1[${PYTHON_USEDEP}] )
 	monoprice? ( ~dev-python/pymonoprice-0.3[${PYTHON_USEDEP}] )
 	motioneye? ( ~dev-python/motioneye-client-0.3.12[${PYTHON_USEDEP}] )
-	motion_blinds? ( ~dev-python/motionblinds-0.6.7[${PYTHON_USEDEP}] )
+	motion_blinds? ( ~dev-python/motionblinds-0.6.8[${PYTHON_USEDEP}] )
 	mpd? ( ~dev-python/python-mpd2-3.0.5[${PYTHON_USEDEP}] )
 	mqtt? ( ~dev-python/paho-mqtt-1.6.1[${PYTHON_USEDEP}] )
 	msteams? ( ~dev-python/pymsteams-0.1.12[${PYTHON_USEDEP}] )
@@ -572,7 +573,7 @@ RDEPEND="${RDEPEND}
 	nest? ( ~dev-python/python-nest-4.2.0[${PYTHON_USEDEP}] ~dev-python/google-nest-sdm-1.8.0[${PYTHON_USEDEP}] )
 	netatmo? ( ~dev-python/pyatmo-6.2.4[${PYTHON_USEDEP}] )
 	netdata? ( ~dev-python/netdata-1.0.1[${PYTHON_USEDEP}] )
-	netgear? ( ~dev-python/pynetgear-0.10.0[${PYTHON_USEDEP}] )
+	netgear? ( ~dev-python/pynetgear-0.10.4[${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}] )
@@ -685,12 +686,12 @@ RDEPEND="${RDEPEND}
 	rainbird? ( ~dev-python/pyrainbird-0.4.3[${PYTHON_USEDEP}] )
 	raincloud? ( ~dev-python/raincloudy-0.0.7[${PYTHON_USEDEP}] )
 	rainforest_eagle? ( ~dev-python/aioeagle-1.1.0[${PYTHON_USEDEP}] ~dev-python/eagle100-0.1.1[${PYTHON_USEDEP}] )
-	rainmachine? ( ~dev-python/regenmaschine-2022.5.1[${PYTHON_USEDEP}] )
+	rainmachine? ( ~dev-python/regenmaschine-2022.6.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}] )
 	rdw? ( ~dev-python/vehicle-0.4.0[${PYTHON_USEDEP}] )
 	recollect_waste? ( ~dev-python/aiorecollect-1.0.8[${PYTHON_USEDEP}] )
-	recorder? ( ~dev-python/sqlalchemy-1.4.36[${PYTHON_USEDEP}] ~dev-python/fnvhash-0.1.0[${PYTHON_USEDEP}] ~dev-python/lru-dict-1.1.7[${PYTHON_USEDEP}] )
+	recorder? ( ~dev-python/sqlalchemy-1.4.37[${PYTHON_USEDEP}] ~dev-python/fnvhash-0.1.0[${PYTHON_USEDEP}] ~dev-python/lru-dict-1.1.7[${PYTHON_USEDEP}] )
 	recswitch? ( ~dev-python/pyrecswitch-1.0.2[${PYTHON_USEDEP}] )
 	reddit? ( ~dev-python/praw-7.5.0[${PYTHON_USEDEP}] )
 	rejseplanen? ( ~dev-python/rjpl-0.3.6[${PYTHON_USEDEP}] )
@@ -752,7 +753,7 @@ RDEPEND="${RDEPEND}
 	sighthound? ( ~dev-python/pillow-9.1.1[${PYTHON_USEDEP}] ~dev-python/simplehound-0.3[${PYTHON_USEDEP}] )
 	signal_messenger? ( ~dev-python/pysignalclirestapi-0.3.18[${PYTHON_USEDEP}] )
 	simplepush? ( ~dev-python/simplepush-1.1.4[${PYTHON_USEDEP}] )
-	simplisafe? ( ~dev-python/simplisafe-python-2022.5.2[${PYTHON_USEDEP}] )
+	simplisafe? ( ~dev-python/simplisafe-python-2022.6.0[${PYTHON_USEDEP}] )
 	sinch? ( ~dev-python/clx-sdk-xms-1.0.0[${PYTHON_USEDEP}] )
 	sisyphus? ( ~dev-python/sisyphus-control-3.1.2[${PYTHON_USEDEP}] )
 	skybeacon? ( ~dev-python/pygatt-4.0.5[${PYTHON_USEDEP}] )
@@ -792,7 +793,7 @@ RDEPEND="${RDEPEND}
 	spider? ( ~dev-python/spiderpy-1.6.1[${PYTHON_USEDEP}] )
 	splunk? ( ~dev-python/hass-splunk-0.1.1[${PYTHON_USEDEP}] )
 	spotify? ( ~dev-python/spotipy-2.19.0[${PYTHON_USEDEP}] )
-	sql? ( ~dev-python/sqlalchemy-1.4.36[${PYTHON_USEDEP}] )
+	sql? ( ~dev-python/sqlalchemy-1.4.37[${PYTHON_USEDEP}] )
 	squeezebox? ( ~dev-python/pysqueezebox-0.5.5[${PYTHON_USEDEP}] )
 	srp_energy? ( ~dev-python/srpenergy-1.3.6[${PYTHON_USEDEP}] )
 	ssdp? ( ~dev-python/async-upnp-client-0.30.1[${PYTHON_USEDEP}] )
@@ -912,7 +913,7 @@ RDEPEND="${RDEPEND}
 	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}] )
+	wallbox? ( ~dev-python/wallbox-0.4.9[${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}] )
@@ -949,7 +950,7 @@ RDEPEND="${RDEPEND}
 	yeelight? ( ~dev-python/yeelight-0.7.10[${PYTHON_USEDEP}] ~dev-python/async-upnp-client-0.30.1[${PYTHON_USEDEP}] )
 	yeelightsunflower? ( ~dev-python/yeelightsunflower-0.0.10[${PYTHON_USEDEP}] )
 	yi? ( ~dev-python/aioftp-0.12.0[${PYTHON_USEDEP}] )
-	yolink? ( ~dev-python/yolink-api-0.0.5[${PYTHON_USEDEP}] )
+	yolink? ( ~dev-python/yolink-api-0.0.6[${PYTHON_USEDEP}] )
 	youless? ( ~dev-python/youless-api-0.16[${PYTHON_USEDEP}] )
 	zabbix? ( ~dev-python/py-zabbix-1.1.7[${PYTHON_USEDEP}] )
 	zengge? ( ~dev-python/bluepy-1.3.0[${PYTHON_USEDEP}] ~dev-python/zengge-0.2[${PYTHON_USEDEP}] )
diff --git a/app-misc/homeassistant-full/homeassistant-full-9999.ebuild b/app-misc/homeassistant-full/homeassistant-full-9999.ebuild
index 71a740ae8..417ce37cc 100644
--- a/app-misc/homeassistant-full/homeassistant-full-9999.ebuild
+++ b/app-misc/homeassistant-full/homeassistant-full-9999.ebuild
@@ -433,7 +433,7 @@ RDEPEND="${RDEPEND}
 	hydrawise? ( ~dev-python/Hydrawiser-0.2[${PYTHON_USEDEP}] )
 	hyperion? ( ~dev-python/hyperion-py-0.7.5[${PYTHON_USEDEP}] )
 	ialarm? ( ~dev-python/pyialarm-1.9.0[${PYTHON_USEDEP}] )
-	ialarm_xr? ( ~dev-python/pyialarmxr-1.0.18[${PYTHON_USEDEP}] )
+	ialarm_xr? ( ~dev-python/pyialarmxr-homeassistant-1.0.18[${PYTHON_USEDEP}] )
 	iammeter? ( ~dev-python/iammeter-0.1.7[${PYTHON_USEDEP}] )
 	iaqualink? ( ~dev-python/iaqualink-0.4.1[${PYTHON_USEDEP}] )
 	icloud? ( ~dev-python/pyicloud-1.0.0[${PYTHON_USEDEP}] )
@@ -501,7 +501,7 @@ RDEPEND="${RDEPEND}
 	litterrobot? ( ~dev-python/pylitterbot-2022.3.0[${PYTHON_USEDEP}] )
 	logi_circle? ( ~dev-python/logi-circle-0.2.3[${PYTHON_USEDEP}] )
 	london_underground? ( ~dev-python/london-tube-status-0.2[${PYTHON_USEDEP}] )
-	lookin? ( ~dev-python/aiolookin-0.1.0[${PYTHON_USEDEP}] )
+	lookin? ( ~dev-python/aiolookin-0.1.1[${PYTHON_USEDEP}] )
 	loopenergy? ( ~dev-python/pyloopenergy-0.2.1[${PYTHON_USEDEP}] )
 	luci? ( ~dev-python/openwrt-luci-rpc-1.1.11[${PYTHON_USEDEP}] )
 	luftdaten? ( ~dev-python/luftdaten-0.7.2[${PYTHON_USEDEP}] )
@@ -686,7 +686,7 @@ RDEPEND="${RDEPEND}
 	rainbird? ( ~dev-python/pyrainbird-0.4.3[${PYTHON_USEDEP}] )
 	raincloud? ( ~dev-python/raincloudy-0.0.7[${PYTHON_USEDEP}] )
 	rainforest_eagle? ( ~dev-python/aioeagle-1.1.0[${PYTHON_USEDEP}] ~dev-python/eagle100-0.1.1[${PYTHON_USEDEP}] )
-	rainmachine? ( ~dev-python/regenmaschine-2022.5.1[${PYTHON_USEDEP}] )
+	rainmachine? ( ~dev-python/regenmaschine-2022.6.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}] )
 	rdw? ( ~dev-python/vehicle-0.4.0[${PYTHON_USEDEP}] )
@@ -753,7 +753,7 @@ RDEPEND="${RDEPEND}
 	sighthound? ( ~dev-python/pillow-9.1.1[${PYTHON_USEDEP}] ~dev-python/simplehound-0.3[${PYTHON_USEDEP}] )
 	signal_messenger? ( ~dev-python/pysignalclirestapi-0.3.18[${PYTHON_USEDEP}] )
 	simplepush? ( ~dev-python/simplepush-1.1.4[${PYTHON_USEDEP}] )
-	simplisafe? ( ~dev-python/simplisafe-python-2022.5.2[${PYTHON_USEDEP}] )
+	simplisafe? ( ~dev-python/simplisafe-python-2022.6.0[${PYTHON_USEDEP}] )
 	sinch? ( ~dev-python/clx-sdk-xms-1.0.0[${PYTHON_USEDEP}] )
 	sisyphus? ( ~dev-python/sisyphus-control-3.1.2[${PYTHON_USEDEP}] )
 	skybeacon? ( ~dev-python/pygatt-4.0.5[${PYTHON_USEDEP}] )
@@ -913,7 +913,7 @@ RDEPEND="${RDEPEND}
 	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}] )
+	wallbox? ( ~dev-python/wallbox-0.4.9[${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}] )
diff --git a/app-misc/homeassistant-min/Manifest b/app-misc/homeassistant-min/Manifest
index 045b06212..571a15acb 100644
--- a/app-misc/homeassistant-min/Manifest
+++ b/app-misc/homeassistant-min/Manifest
@@ -11,13 +11,13 @@ AUX update-homeassistant 1326 BLAKE2B 917bdd332c4e5dea5177eecd11a7f8d72b911fddfd
 DIST homeassistant-2022.4.7.tar.gz 15146071 BLAKE2B da4a764a281d8597a6a75e1a829c3c4d555f7ae232f429077203afbfa4a5bb9e3480d0f4bf8cddc7e5ae1d3187b871d43ee38930a60e54f9e3e7e16176a14b0e SHA512 8989a3b32444ccf70d33e301b08d42b424474cb5cc437e872e857978993dd4006732efc67a74ab1ab6c44740f60a4fd00fe264c88652c0acaf5b7d6b18d0f489
 DIST homeassistant-2022.5.5.tar.gz 15430712 BLAKE2B e119f508fc5dec3b7eb7f18a61ec9fc281027b4e4df156683d54b803139d774218384d8bdcaec9c778d052046f9954564ef65f7feeab73c1a94e96ca655ed984 SHA512 fc5184c010242cca362d124231de4e0f396ba9b8596de4409243586043f77650db6d10641bb6274e954a1cc81e9d107942165a91a7c61b20cffcd08b11d9c9f0
 DIST homeassistant-2022.6.0.tar.gz 15559626 BLAKE2B 58cb0eb149f10dc43c1536923fc8796760e14f1cab862134eee7049a9bb0b9b4fb7598ce6302b38492b7adf0d76f77a0749ac7fac92e9603d9566c350ad07f6f SHA512 8fc75c5ed2527b351fc8dd2688dd69d359c3bc0a146ef17282a593837c7ca32e9431661de7c625bc0f7768571a4f844b13a32ec7fdfe14e0f6c967a1654fa338
-DIST homeassistant-2022.6.0b7.tar.gz 15558366 BLAKE2B 248a5b3b6e7d7fd63f05349aaf19c3514f5d39176693a6040d5c21066dc54713ff9c23108f3b80c4e722cf4e5064028a8537fa7e36f810630b676bd6bf6d8b0f SHA512 3d9bdc93df79732b8f3e2a9dcfbf58486d8e9ac7c260dde38f971cc8b914d3d251ef3ddfc43c75232af4154531dc638db6577db7a00e96303d5f13ab3c5767ac
 DIST homeassistant-2022.6.1.tar.gz 15567757 BLAKE2B 8988d2757d25a2a50dd0bbc39c835f325356ff6d6291bb0f2ef5637b54a589814985166c4200774513e02ffc238206670e59fbbd9af76e3cd244de54d62a878b SHA512 b9511db8c08d6c0b416f82c0368add357e7eee82051a4abb2b9b3e99f1cc775f6a0303dea509338330c9aee3bbd6e7ab2315c3449d1bfa77849512858c0a02d8
 DIST homeassistant-2022.6.2.tar.gz 15568289 BLAKE2B b7c3d61421295fde229081580289619549a81718b7540a31a88242a45c782047f32ed169a7827b1852c334c78e4303997508c5e34eb24dc791c573540842bc2b SHA512 b60be2df7c4e56bacd35f5b94a1979815a540701daab5cb0211240b4716e597e98ab5a70a8f8cce6e210a4204fb711f98c08cd943da62895e7e49f5b6ffef4d1
+DIST homeassistant-2022.6.3.tar.gz 15572357 BLAKE2B 665da4525994598228ce661ea912ab2ef7d4598c319cd7f5178cabef5a07c47e1e4019932e2cdbed18ad20739efa5248c22c804059fd4ab002605f10309c6082 SHA512 630179ee3895982f0f4dac0b164437c6ef2d2a3c47b5b9ca8068489c0ca4f0ada33d558338120738ef3431cd03aa115a1f99bd059686192c535799e52016f1a7
 EBUILD homeassistant-min-2022.4.7-r1.ebuild 14299 BLAKE2B 51856fe3c8eb49a8a0beda436158817293e925fd1c277417268d15d9bfdbc5549614eb0694e63e074cb5426ed5f632bc0eb6eb5b94de06b3872a156999f2e3ec SHA512 edb9ea864cabfe241e685952f26a92cbe29172c1eb067f3b38cbd6b7c6a943a5a85d9c82bd0a3dee5b9d8133d50ec8420a33338fb42c004afb2d0f904e2f1758
 EBUILD homeassistant-min-2022.5.5-r1.ebuild 14423 BLAKE2B 6aa002c5469ecc0b2e34f1b4475ae09aeba956de043613c680f3c038410752ce5875f356331d65abab98b699667ed93739bfa1c4d2a0b48e0dfd69ff6bf64ca8 SHA512 ef46c63af3d43556a7debbfab959d0027f56ceb575b3e455eb19517a9faf2ead576720b55cd4d104f51a8b9d7cf8dd9277226dd6ed704244ecd25bc434abc808
 EBUILD homeassistant-min-2022.6.0.ebuild 14417 BLAKE2B 0a85c5b8dfd289b64d1d11b6426891cb0f2dfd00db7e8dada06a09238ba6738545cd37a6e8d7bf771a4b74d7f0b1466ed0b6fecfca3e2d4e7440886edba26596 SHA512 b6746687ce68a5647a92744274d768c7c7412f388512bca1b325ac454a57916e90f0bbf9c426d7c7146208f8f0b9e68cd02b70d18254e7a49a947949eae8a103
-EBUILD homeassistant-min-2022.6.0_beta7.ebuild 14374 BLAKE2B a582d16a6547824496b7af7eae43e95f2325a335d14a2fc0e2ea9500b4c1c795a6f868baec86164952addd61543689326ddecda3c616777a7f44fdd3dbb805dd SHA512 76cf57ae40a487d203febb8a95b933ed1ad803ca6bb572334bb6ab5baada45bea45315a3838ce1480d9230ea9484c9b55d789c8246f8083a0dc1080e8fe9265e
 EBUILD homeassistant-min-2022.6.1.ebuild 14417 BLAKE2B edb4ad4af763f6b602be94229c8b6ef97d982c6862969cffcb50ef41afcd76dd3cb9947d61097f206b0c3c338d08b62a12ce1ca755f06c276a89486ba1578968 SHA512 081bf0742c35d6c01cdcc0a50e633d052f23f0d41fff9684838a8037c5bee29e38f65dbab9a47955197dbbeb7a61873a96dccb7a79462927fb8818547f44cc75
 EBUILD homeassistant-min-2022.6.2.ebuild 14417 BLAKE2B edb4ad4af763f6b602be94229c8b6ef97d982c6862969cffcb50ef41afcd76dd3cb9947d61097f206b0c3c338d08b62a12ce1ca755f06c276a89486ba1578968 SHA512 081bf0742c35d6c01cdcc0a50e633d052f23f0d41fff9684838a8037c5bee29e38f65dbab9a47955197dbbeb7a61873a96dccb7a79462927fb8818547f44cc75
+EBUILD homeassistant-min-2022.6.3.ebuild 14417 BLAKE2B edb4ad4af763f6b602be94229c8b6ef97d982c6862969cffcb50ef41afcd76dd3cb9947d61097f206b0c3c338d08b62a12ce1ca755f06c276a89486ba1578968 SHA512 081bf0742c35d6c01cdcc0a50e633d052f23f0d41fff9684838a8037c5bee29e38f65dbab9a47955197dbbeb7a61873a96dccb7a79462927fb8818547f44cc75
 MISC metadata.xml 8158 BLAKE2B 2c94ba51ce253ac28374b22cd1f683f28371b1dd4ed0f0fe041deb579c77362a72bb09c47cc2a833c50e2788682879cd982eac9c9e5efb9760320f7a10236346 SHA512 2a42047d49df334bf893ea01fd3163d1c153473d07ddddf6742d957bb4892cf56b02dac522b03d644a2bc261ef72c0a6f1269cb1f252ee5f8acfc75f19be143a
diff --git a/app-misc/homeassistant-min/homeassistant-min-2022.6.0_beta7.ebuild b/app-misc/homeassistant-min/homeassistant-min-2022.6.3.ebuild
similarity index 97%
rename from app-misc/homeassistant-min/homeassistant-min-2022.6.0_beta7.ebuild
rename to app-misc/homeassistant-min/homeassistant-min-2022.6.3.ebuild
index 688980a96..4ea3872ff 100644
--- a/app-misc/homeassistant-min/homeassistant-min-2022.6.0_beta7.ebuild
+++ b/app-misc/homeassistant-min/homeassistant-min-2022.6.3.ebuild
@@ -26,7 +26,7 @@ HOMEPAGE="https://home-assistant.io/ https://git.edevau.net/onkelbeh/HomeAssista
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 arm arm64 x86"
 IUSE="accuweather airly airvisual alpha_vantage androidtv android_ip_webcam axis bluetooth_le_tracker +caldav camera cast cli co2signal compensation coronavirus darksky dlna_dmr dlna_dms +dwd_weather_warnings enigma2 esphome ffmpeg forecast_solar fronius github +homekit homekit_controller http hyperion influxdb knx kodi kraken maxcube mikrotik +mobile_app +mqtt myq mysensors +mysql +notify_events octoprint onvif +otp owntracks +ping +plex ps4 +python_script qnap qvr_pro radio_browser +recorder +rest ring samsungtv +scrape season shelly signal_messenger +snmp socat sonos speedtestdotnet +spotify +sql +ssl systemd systemmonitor tankerkoenig tasmota test tile tomorrowio tplink upnp utility_meter +version +wake_on_lan wemo whois workday yamaha yamaha_musiccast zeroconf zha +zwave_js"
 RESTRICT="!test? ( test )"
 
@@ -67,7 +67,7 @@ RDEPEND="${RDEPEND}
 	~dev-python/grpcio-1.46.1[${PYTHON_USEDEP}]
 	~dev-python/h11-0.12.0[${PYTHON_USEDEP}]
 	~dev-python/hass-nabucasa-0.54.0[${PYTHON_USEDEP}]
-	~dev-python/home-assistant-frontend-20220531.0[${PYTHON_USEDEP}]
+	~dev-python/home-assistant-frontend-20220601.0[${PYTHON_USEDEP}]
 	~dev-python/httpcore-0.15.0[${PYTHON_USEDEP}]
 	>=dev-python/httplib2-0.19.0[${PYTHON_USEDEP}]
 	~dev-python/httpx-0.23.0[${PYTHON_USEDEP}]
@@ -81,6 +81,7 @@ RDEPEND="${RDEPEND}
 	~dev-python/pillow-9.1.1[${PYTHON_USEDEP}]
 	<dev-python/pip-22.1.0
 	>=dev-python/pycryptodome-3.6.6[${PYTHON_USEDEP}]
+	!~dev-python/pydantic-1.9.1[${PYTHON_USEDEP}]
 	~dev-python/pyjwt-2.4.0[${PYTHON_USEDEP}]
 	~dev-python/pynacl-1.5.0[${PYTHON_USEDEP}]
 	~dev-python/pyserial-3.5[${PYTHON_USEDEP}]
@@ -94,7 +95,7 @@ RDEPEND="${RDEPEND}
 	~dev-python/regex-2021.8.28[${PYTHON_USEDEP}]
 	~dev-python/requests-2.27.1[${PYTHON_USEDEP}]
 	~net-analyzer/scapy-2.4.5
-	~dev-python/sqlalchemy-1.4.36[${PYTHON_USEDEP}]
+	~dev-python/sqlalchemy-1.4.37[${PYTHON_USEDEP}]
 	>=dev-python/typing-extensions-3.10.0.2[${PYTHON_USEDEP}]
 	<dev-python/typing-extensions-5.0[${PYTHON_USEDEP}]
 	>=dev-python/urllib3-1.26.5[${PYTHON_USEDEP}]
@@ -171,7 +172,7 @@ RDEPEND="${RDEPEND}
 	qnap? ( ~dev-python/qnapstats-0.4.0[${PYTHON_USEDEP}] )
 	qvr_pro? ( ~dev-python/pyqvrpro-0.52[${PYTHON_USEDEP}] )
 	radio_browser? ( ~dev-python/radios-0.1.1[${PYTHON_USEDEP}] )
-	recorder? ( ~dev-python/sqlalchemy-1.4.36[${PYTHON_USEDEP}] ~dev-python/fnvhash-0.1.0[${PYTHON_USEDEP}] ~dev-python/lru-dict-1.1.7[${PYTHON_USEDEP}] )
+	recorder? ( ~dev-python/sqlalchemy-1.4.37[${PYTHON_USEDEP}] ~dev-python/fnvhash-0.1.0[${PYTHON_USEDEP}] ~dev-python/lru-dict-1.1.7[${PYTHON_USEDEP}] )
 	rest? ( ~dev-python/jsonpath-0.82[${PYTHON_USEDEP}] ~dev-python/xmltodict-0.12.0[${PYTHON_USEDEP}] )
 	ring? ( ~dev-python/ring-doorbell-0.7.2[${PYTHON_USEDEP}] )
 	samsungtv? ( ~dev-python/getmac-0.8.2[${PYTHON_USEDEP}] ~dev-python/samsungctl-0.7.1[${PYTHON_USEDEP}] ~dev-python/samsungtvws-2.5.0[${PYTHON_USEDEP}] ~dev-python/wakeonlan-2.0.1[${PYTHON_USEDEP}] ~dev-python/async-upnp-client-0.30.1[${PYTHON_USEDEP}] )
@@ -184,7 +185,7 @@ RDEPEND="${RDEPEND}
 	sonos? ( ~dev-python/soco-0.27.1[${PYTHON_USEDEP}] )
 	speedtestdotnet? ( ~net-analyzer/speedtest-cli-2.1.3[${PYTHON_USEDEP}] )
 	spotify? ( ~dev-python/spotipy-2.19.0[${PYTHON_USEDEP}] )
-	sql? ( ~dev-python/sqlalchemy-1.4.36[${PYTHON_USEDEP}] )
+	sql? ( ~dev-python/sqlalchemy-1.4.37[${PYTHON_USEDEP}] )
 	ssl? ( dev-libs/openssl app-crypt/certbot net-proxy/haproxy )
 	systemmonitor? ( ~dev-python/psutil-5.9.0[${PYTHON_USEDEP}] )
 	tankerkoenig? ( ~dev-python/pytankerkoenig-0.0.6[${PYTHON_USEDEP}] )
diff --git a/app-misc/homeassistant/Manifest b/app-misc/homeassistant/Manifest
index 011063f19..21ce17508 100644
--- a/app-misc/homeassistant/Manifest
+++ b/app-misc/homeassistant/Manifest
@@ -11,13 +11,13 @@ AUX update-homeassistant 1326 BLAKE2B 917bdd332c4e5dea5177eecd11a7f8d72b911fddfd
 DIST homeassistant-2022.4.7.tar.gz 15146071 BLAKE2B da4a764a281d8597a6a75e1a829c3c4d555f7ae232f429077203afbfa4a5bb9e3480d0f4bf8cddc7e5ae1d3187b871d43ee38930a60e54f9e3e7e16176a14b0e SHA512 8989a3b32444ccf70d33e301b08d42b424474cb5cc437e872e857978993dd4006732efc67a74ab1ab6c44740f60a4fd00fe264c88652c0acaf5b7d6b18d0f489
 DIST homeassistant-2022.5.5.tar.gz 15430712 BLAKE2B e119f508fc5dec3b7eb7f18a61ec9fc281027b4e4df156683d54b803139d774218384d8bdcaec9c778d052046f9954564ef65f7feeab73c1a94e96ca655ed984 SHA512 fc5184c010242cca362d124231de4e0f396ba9b8596de4409243586043f77650db6d10641bb6274e954a1cc81e9d107942165a91a7c61b20cffcd08b11d9c9f0
 DIST homeassistant-2022.6.0.tar.gz 15559626 BLAKE2B 58cb0eb149f10dc43c1536923fc8796760e14f1cab862134eee7049a9bb0b9b4fb7598ce6302b38492b7adf0d76f77a0749ac7fac92e9603d9566c350ad07f6f SHA512 8fc75c5ed2527b351fc8dd2688dd69d359c3bc0a146ef17282a593837c7ca32e9431661de7c625bc0f7768571a4f844b13a32ec7fdfe14e0f6c967a1654fa338
-DIST homeassistant-2022.6.0b7.tar.gz 15558366 BLAKE2B 248a5b3b6e7d7fd63f05349aaf19c3514f5d39176693a6040d5c21066dc54713ff9c23108f3b80c4e722cf4e5064028a8537fa7e36f810630b676bd6bf6d8b0f SHA512 3d9bdc93df79732b8f3e2a9dcfbf58486d8e9ac7c260dde38f971cc8b914d3d251ef3ddfc43c75232af4154531dc638db6577db7a00e96303d5f13ab3c5767ac
 DIST homeassistant-2022.6.1.tar.gz 15567757 BLAKE2B 8988d2757d25a2a50dd0bbc39c835f325356ff6d6291bb0f2ef5637b54a589814985166c4200774513e02ffc238206670e59fbbd9af76e3cd244de54d62a878b SHA512 b9511db8c08d6c0b416f82c0368add357e7eee82051a4abb2b9b3e99f1cc775f6a0303dea509338330c9aee3bbd6e7ab2315c3449d1bfa77849512858c0a02d8
 DIST homeassistant-2022.6.2.tar.gz 15568289 BLAKE2B b7c3d61421295fde229081580289619549a81718b7540a31a88242a45c782047f32ed169a7827b1852c334c78e4303997508c5e34eb24dc791c573540842bc2b SHA512 b60be2df7c4e56bacd35f5b94a1979815a540701daab5cb0211240b4716e597e98ab5a70a8f8cce6e210a4204fb711f98c08cd943da62895e7e49f5b6ffef4d1
+DIST homeassistant-2022.6.3.tar.gz 15572357 BLAKE2B 665da4525994598228ce661ea912ab2ef7d4598c319cd7f5178cabef5a07c47e1e4019932e2cdbed18ad20739efa5248c22c804059fd4ab002605f10309c6082 SHA512 630179ee3895982f0f4dac0b164437c6ef2d2a3c47b5b9ca8068489c0ca4f0ada33d558338120738ef3431cd03aa115a1f99bd059686192c535799e52016f1a7
 EBUILD homeassistant-2022.4.7-r1.ebuild 29255 BLAKE2B ef1a1608f2b0b65fac1099eea3bf2d1a743d1c890566836c74ddbeab0a639800bafbae5c19a44323475044013376a88ed5a9e7cbe8104a892d81907b22d905d0 SHA512 08ae886d2bafa24ed70f2cb02c79171c0e80a3d89fb9a15031aabb1c1becf9f598652cf5aa455a20cd36d30c68601f42451a92e378501c22eca5ed3fa73e7eab
 EBUILD homeassistant-2022.5.5-r1.ebuild 29443 BLAKE2B 86ad461daa9a756e60652fa238d87b07f1aad1cdd437b312c28a4404b11df8fc91557f2e5e84c2a864aaf3ddba48a8bc25a444c5fe50913bcaff89ff601fc80e SHA512 b910c8e8f676ce54bf5db2aa9523889f8028d145b31cc2fd04da02e0078fc77ce17f353e39433d3426a90243aa7f980dad733a55bfd518b63c070012405367c0
 EBUILD homeassistant-2022.6.0.ebuild 29440 BLAKE2B 7886545a0c2d798718dd8341e8d9a877858e3b7600fd38429d69259ac603318732331f6b29ed73d5b2088caf48476898567f4c44aa42f65f355aeb466f7c1bbd SHA512 b6298d59c31c11e742bf0c55792341a261bdd08296a7db5c3021b0e7278a4ad266eaeee827e5fda9e13189fdb8d1deb5af93696e3c017a1fd66196ff5ff22dee
-EBUILD homeassistant-2022.6.0_beta7.ebuild 29397 BLAKE2B db7ef53bddc787210bba5429a82548b73332d1b90b7ea91a06e488f5c1206aed91adb8827853a7b910af059b1b74520ce5e639db7e128527fe92f982ddebd204 SHA512 a37e287960d3054cb6396000ba1119f19e7f625ead54bdf93a10723f77c027e45cb3459eecac8d97876578dcfdcc8d3960d4c719d1b66208d598d0ed885504b8
 EBUILD homeassistant-2022.6.1.ebuild 29440 BLAKE2B e352947b1900c49c29c285584fa5ff80985a37195e041c479c16a533b7cd836fbf5ee3d72e5a1caabe29a24e9b43a7d27a22551420aa56fe4ee17557e66bbf03 SHA512 a2d24ed7ea59fc51cc7a477248473fbb528debad25c4dd3f2163df39ca35419df3bee4490a785565727101de3a7eb28e55a871e90b5580061814896c74764bfb
 EBUILD homeassistant-2022.6.2.ebuild 29440 BLAKE2B 5a64ba22c5bf297a122f49d4b350730fbfdadd91e0e26f3bb42bb1ef2989dd91b0db42691000716eca3d58f9ac8b48392b962f792d50a78d4e463d57f1fb6773 SHA512 b8193f1917865d73eb3042ddd7a3d22a33e98fe43b35c53d03ab9cf5594d02bb2daef457e3b6227e0f45929a3b9d88dd6d3dac0e3c967b7127efb2dc70eea0c8
+EBUILD homeassistant-2022.6.3.ebuild 29440 BLAKE2B 20847ae64b49d66c35afd246a4d2a984af4b79bc94711fe3d4ce5e2d0271a155714c2c785d2430c50b9ea7f730fa2c915a743a7108c1c0861044d6bed5413f99 SHA512 a827a997095902f9d33e24cd2b9184d9356f401e1d8df87293da178d5824f128aaecf4899c95fb8b178c58577a89edf2fd001e90cbf5491e3cca113d5081d39e
 MISC metadata.xml 25834 BLAKE2B 5f55c50d8b6faf6a639fc738f0a14bee95e84b6956b75d0ae492834d51425873e798407997d2573341b90f9bb8e340414ef87c926b9d215b73a7cc03a442d119 SHA512 468c03cd9ae8196a246651ad41395be61ace2da58f4e64c2d44a6d5a3a275e62b3092b4581bf61d56057e640d486916f9d2262681f83b46844aeb9433ac12338
diff --git a/app-misc/homeassistant/homeassistant-2022.6.0_beta7.ebuild b/app-misc/homeassistant/homeassistant-2022.6.3.ebuild
similarity index 98%
rename from app-misc/homeassistant/homeassistant-2022.6.0_beta7.ebuild
rename to app-misc/homeassistant/homeassistant-2022.6.3.ebuild
index 8e4ddcaa9..52944df1f 100644
--- a/app-misc/homeassistant/homeassistant-2022.6.0_beta7.ebuild
+++ b/app-misc/homeassistant/homeassistant-2022.6.3.ebuild
@@ -26,7 +26,7 @@ HOMEPAGE="https://home-assistant.io/ https://git.edevau.net/onkelbeh/HomeAssista
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 arm arm64 x86"
 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 awair axis backup baidu beewi_smartclim bh1750 bitcoin bizkaibus blackbird blebox blink blinksticklight blinkt blockchain bluetooth_le_tracker bluetooth_tracker bme280 bme680 bmw_connected_drive bond braviatv broadlink brother brottsplatskartan brunt bsblan bt_home_hub_5 bt_smarthub buienradar +caldav camera 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 dlna_dmr dlna_dms doorbird dunehd +dwd_weather_warnings dynalite dyson ecobee emulated_roku enigma2 enocean enphase_envoy environment_canada esphome everlights evohome ffmpeg fibaro flume flunearyou flux_led foobot forecast_solar 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 lifx linode litterrobot 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 octoprint onkyo onvif opengarage opensensemap openweathermap opnsense +otp owntracks panasonic_viera philips_js pilight +ping pi_hole +plex plugwise poolsense powerwall ps4 +python_script qnap qvr_pro rachio radio_browser rainbird rainmachine +recorder rejseplanen +rest ring roku roomba roon samsungtv +scrape season shelly shodan signal_messenger simplisafe skybell sma smappee smarthab smartthings +snmp socat solax somfy sonos speedtestdotnet +spotify +sql squeezebox +ssl statsd synology_dsm systemd systemmonitor tankerkoenig tasmota tellduslive tesla test tile tomorrowio toon totalconnect tplink tuya unifi unifi_direct upnp utility_meter 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_js"
 RESTRICT="!test? ( test )"
 
@@ -67,7 +67,7 @@ RDEPEND="${RDEPEND}
 	~dev-python/grpcio-1.46.1[${PYTHON_USEDEP}]
 	~dev-python/h11-0.12.0[${PYTHON_USEDEP}]
 	~dev-python/hass-nabucasa-0.54.0[${PYTHON_USEDEP}]
-	~dev-python/home-assistant-frontend-20220531.0[${PYTHON_USEDEP}]
+	~dev-python/home-assistant-frontend-20220601.0[${PYTHON_USEDEP}]
 	~dev-python/httpcore-0.15.0[${PYTHON_USEDEP}]
 	>=dev-python/httplib2-0.19.0[${PYTHON_USEDEP}]
 	~dev-python/httpx-0.23.0[${PYTHON_USEDEP}]
@@ -81,6 +81,7 @@ RDEPEND="${RDEPEND}
 	~dev-python/pillow-9.1.1[${PYTHON_USEDEP}]
 	<dev-python/pip-22.1.0
 	>=dev-python/pycryptodome-3.6.6[${PYTHON_USEDEP}]
+	!~dev-python/pydantic-1.9.1[${PYTHON_USEDEP}]
 	~dev-python/pyjwt-2.4.0[${PYTHON_USEDEP}]
 	~dev-python/pynacl-1.5.0[${PYTHON_USEDEP}]
 	~dev-python/pyserial-3.5[${PYTHON_USEDEP}]
@@ -94,7 +95,7 @@ RDEPEND="${RDEPEND}
 	~dev-python/regex-2021.8.28[${PYTHON_USEDEP}]
 	~dev-python/requests-2.27.1[${PYTHON_USEDEP}]
 	~net-analyzer/scapy-2.4.5
-	~dev-python/sqlalchemy-1.4.36[${PYTHON_USEDEP}]
+	~dev-python/sqlalchemy-1.4.37[${PYTHON_USEDEP}]
 	>=dev-python/typing-extensions-3.10.0.2[${PYTHON_USEDEP}]
 	<dev-python/typing-extensions-5.0[${PYTHON_USEDEP}]
 	>=dev-python/urllib3-1.26.5[${PYTHON_USEDEP}]
@@ -173,7 +174,7 @@ RDEPEND="${RDEPEND}
 	bluetooth_tracker? ( ~dev-python/bt-proximity-0.2.1[${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}] ~dev-python/bme280spi-0.2.0[${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.9.3[${PYTHON_USEDEP}] )
+	bmw_connected_drive? ( ~dev-python/bimmer-connected-0.9.4[${PYTHON_USEDEP}] )
 	bond? ( ~dev-python/bond-async-0.1.20[${PYTHON_USEDEP}] )
 	braviatv? ( ~dev-python/bravia-tv-1.0.11[${PYTHON_USEDEP}] )
 	broadlink? ( ~dev-python/broadlink-0.18.2[${PYTHON_USEDEP}] )
@@ -321,8 +322,8 @@ RDEPEND="${RDEPEND}
 	rachio? ( ~dev-python/RachioPy-1.0.3[${PYTHON_USEDEP}] )
 	radio_browser? ( ~dev-python/radios-0.1.1[${PYTHON_USEDEP}] )
 	rainbird? ( ~dev-python/pyrainbird-0.4.3[${PYTHON_USEDEP}] )
-	rainmachine? ( ~dev-python/regenmaschine-2022.5.1[${PYTHON_USEDEP}] )
-	recorder? ( ~dev-python/sqlalchemy-1.4.36[${PYTHON_USEDEP}] ~dev-python/fnvhash-0.1.0[${PYTHON_USEDEP}] ~dev-python/lru-dict-1.1.7[${PYTHON_USEDEP}] )
+	rainmachine? ( ~dev-python/regenmaschine-2022.6.0[${PYTHON_USEDEP}] )
+	recorder? ( ~dev-python/sqlalchemy-1.4.37[${PYTHON_USEDEP}] ~dev-python/fnvhash-0.1.0[${PYTHON_USEDEP}] ~dev-python/lru-dict-1.1.7[${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.7.2[${PYTHON_USEDEP}] )
@@ -335,7 +336,7 @@ RDEPEND="${RDEPEND}
 	shelly? ( ~dev-python/aioshelly-2.0.0[${PYTHON_USEDEP}] )
 	shodan? ( ~dev-python/shodan-1.27.0[${PYTHON_USEDEP}] )
 	signal_messenger? ( ~dev-python/pysignalclirestapi-0.3.18[${PYTHON_USEDEP}] )
-	simplisafe? ( ~dev-python/simplisafe-python-2022.5.2[${PYTHON_USEDEP}] )
+	simplisafe? ( ~dev-python/simplisafe-python-2022.6.0[${PYTHON_USEDEP}] )
 	skybell? ( ~dev-python/skybellpy-0.6.3[${PYTHON_USEDEP}] )
 	sma? ( ~dev-python/pysma-0.6.11[${PYTHON_USEDEP}] )
 	smappee? ( ~dev-python/pysmappee-0.2.29[${PYTHON_USEDEP}] )
@@ -348,7 +349,7 @@ RDEPEND="${RDEPEND}
 	sonos? ( ~dev-python/soco-0.27.1[${PYTHON_USEDEP}] )
 	speedtestdotnet? ( ~net-analyzer/speedtest-cli-2.1.3[${PYTHON_USEDEP}] )
 	spotify? ( ~dev-python/spotipy-2.19.0[${PYTHON_USEDEP}] )
-	sql? ( ~dev-python/sqlalchemy-1.4.36[${PYTHON_USEDEP}] )
+	sql? ( ~dev-python/sqlalchemy-1.4.37[${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}] )
diff --git a/dev-python/aenum/Manifest b/dev-python/aenum/Manifest
index a2de0b4e1..950039045 100644
--- a/dev-python/aenum/Manifest
+++ b/dev-python/aenum/Manifest
@@ -1,3 +1,5 @@
+DIST aenum-3.1.11.tar.gz 130979 BLAKE2B 9aa05da35a24a72512ad256051f7f7e9621349d081f529dd39e4c11552bde499f5d79083d3212eb9672fc436047d925a71b5d2862ec263c11028f24ea28ffcfd SHA512 8ec8336ccf805dd4ed57ced35e9e0f143bafea61cd9b3a465286b131e962225f8136595d94bcb1d709893106236d8b96de94aa860ffb256116b625bd9a43d78d
 DIST aenum-3.1.8.tar.gz 130013 BLAKE2B 5ebc05ffbe6a95f6e4d4bfb87b7d256153eac722ae07526e4d697a34acc32a522107bb17f74e14c8bccb52b727306872c758ade788c532102027d004dc18eb3f SHA512 4dbc4f9be75eec40d3cd06a6cb4f542dab5ed499f43ae5d56ed5ee708c0b2565c45e674cc5caa8be03e85447fa6b244b5d491b0d91f637fdc378558811c11fc5
-EBUILD aenum-3.1.8.ebuild 774 BLAKE2B c1c16792952a642666d5ce9f3004109ee8b4cabe8429b5212e046f202cf53204b7fa243bbc524413258022cac7e987c389607c9d2bb33e5551014bf00a174456 SHA512 630ca1e4ec3e494d2a89aa07f0b71157390300fe561cd9d73cf361ff1ad2fb28d5b3b2ef7acc22874bde4d5a4b03e78c54ead98d0f8ee42017eacb60dbe421ea
+EBUILD aenum-3.1.11.ebuild 781 BLAKE2B 4b14dc328f94ddbe500d01ba700e535ee462751aabd20f0e79637bc06ae416a5a101bdd61372773a8715526afd68043ec2b71a050c6af46f585d82cd6bc00fd7 SHA512 e9ad209076aaf5d32488022a38d9c64c46beb7cd29e26e8dd36c7d0b3c4ca1d6c49296375b5b6fa9c5f4012c9ae26a16550a669a8d178fc753af3f0b5716d83f
+EBUILD aenum-3.1.8.ebuild 750 BLAKE2B 7c47e6726c90bb1bb5e9be920ab4ff351ef91b18f4ef125e377bc7ccbbdde41b3f745190664575a7e13d726bccf56b071162f920e05ace944eba873e0ad56f09 SHA512 2666097c2453a253534e22e2802cc90a42e8a8bd18e399742821e5a7a402aeb278840cf5684d740195a13ce8a12c8123022009188137713d03d3a2f0308e2c78
 MISC metadata.xml 448 BLAKE2B 68f9a79bcd3aa1185d7d7a5a78ab3aa71ea76813cf00fdd477ea7ef370af703137a04721265d37a15e5f988d86c88b021ee82ff732dde3470a81ea2e8a838964 SHA512 c5b39b4a75cc72d1321eb0a7cec8bb6c2500da1b39e4ae54f1b03647be41120816808dacb97420e0485e6c58c350bb24c82e9c5d9b480fd2b82741038cc4fcd1
diff --git a/dev-python/aenum/aenum-3.1.11.ebuild b/dev-python/aenum/aenum-3.1.11.ebuild
new file mode 100644
index 000000000..bb1f2a57f
--- /dev/null
+++ b/dev-python/aenum/aenum-3.1.11.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Advanced Enumerations (compatible with Python's stdlib Enum), NamedTuples, and NamedConstants"
+HOMEPAGE="https://github.com/ethanfurman/aenum https://pypi.org/project/aenum/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DOCS="aenum/doc/aenum.rst"
+
+RDEPEND=""
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	nosetests --verbose || die
+	py.test -v -v || die
+}
+
+distutils_enable_tests pytest
diff --git a/dev-python/aenum/aenum-3.1.8.ebuild b/dev-python/aenum/aenum-3.1.8.ebuild
index c89651560..4643921dc 100644
--- a/dev-python/aenum/aenum-3.1.8.ebuild
+++ b/dev-python/aenum/aenum-3.1.8.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/aiolookin/Manifest b/dev-python/aiolookin/Manifest
index 1b924f669..5b1291d0e 100644
--- a/dev-python/aiolookin/Manifest
+++ b/dev-python/aiolookin/Manifest
@@ -1,5 +1,7 @@
 DIST aiolookin-0.0.4.tar.gz 8655 BLAKE2B 7f8f7172975ee9f98c68c93a3a1cdb4e5d4ccb64908bcf905d5e228787e1efb7fbc45a42a0d3717e16e651e01dcb8df5d35bbb2b04a2b38f6693a661ca283ba2 SHA512 31fb462ad4cc523c1b4fefe2ced9535df1ce97e1ffb94253bb07b4775cdfacac0b56cbdba0d72165858ac9037b64c03ce2780887d8cd5e95bb307a5528d8583d
 DIST aiolookin-0.1.0.tar.gz 9248 BLAKE2B a7e03292b7b44907f2332db1457f4bd209ce944f5e99c590f4a237e983fd5162d8a4f98607d5766c859145d75e58121810a20d2a3f53866b48705b09e3ec3553 SHA512 b4336cadadcb7ecd79f2e20741149969bc67bfce692109a44d8b2a9041e9fc2766c0a0ab58de2691d73989aeaf66ea681156018db90c4efbf833864e512038f3
-EBUILD aiolookin-0.0.4.ebuild 790 BLAKE2B bfd21e353968b72f206b5338aab1753ef7e42ebe7965168cee61f85890ce0b6866e21fc3a2ea4ba73a734e9143a2c97f2963f884248002eee816ef355ad4dc2a SHA512 cc04357ed97b8fa879f985b9d4e8e086d90e7cd5d2f8baf173165917ffe74a955a50eca130bbf29bc9d4f30b64cb170ed36b7d968d84392e5064803795749ea9
-EBUILD aiolookin-0.1.0.ebuild 790 BLAKE2B 87e99fe3ca39ba87508160a607487ef5af54ebd07e045e514b48b12c3c8a77274300e5f99ccbed6b723e8a2f92adbb7b418909eabfbc16a97b8d52d8dce78378 SHA512 d0712df46e93a16fc2e45cf39ceab8ef9b1add0f4ae72a2d99ae996ff4f0a8b0096d75472a592ab669c28a6ab5a4e11795de728c41c92eeaaf06738ca7b9b3c3
+DIST aiolookin-0.1.1.tar.gz 9621 BLAKE2B 798a18bfa737914b8a90b057b41bbaf0c73d36916c57266f3184993587441a1b193f981d26d8962e7f7493848590a5520f05235f9ac1853e877eb3eafd144008 SHA512 e1da309a232e5b99041a0ade93171e4819fc94b877e8203d83813c98889a3aa3080847dc0106f94a2b06eb19e6f6a7d20307c7994bac577e2546246329c087a4
+EBUILD aiolookin-0.0.4.ebuild 762 BLAKE2B be3f9f2f95125bd2040ce14b871c62950e00a88c67547c83a0aa714f6b7ed7c411f83c022575cda17fcb69445a84d6e3df79ae98ef6b620b239ad0b403fd88d4 SHA512 274ccccad4a21f09dabda79dd3038da8da6fc3c5cbb6ffb359de306288c2b0dd9b347b97849877c7e197aedb7e0b2f2b15de986e1a00e6dff202b6bd11874767
+EBUILD aiolookin-0.1.0.ebuild 762 BLAKE2B ae69b9a94bacc5ed1f9b94f1e4b176204bbdc92492fc98bb534c48656c88ce7e7bb08390b6e8e098db64ae51a4c4bbaeb60e3895dda2be19a2e0e7b59d1764aa SHA512 c1b358ad0d6e193d46189c840c5352d5e06c1bcd7758f3b1bd8b701f0322e7c9303c8149b95257010309833a7b68bc3ac650b69e278fb30d67567bdf3c9652dd
+EBUILD aiolookin-0.1.1.ebuild 762 BLAKE2B ae69b9a94bacc5ed1f9b94f1e4b176204bbdc92492fc98bb534c48656c88ce7e7bb08390b6e8e098db64ae51a4c4bbaeb60e3895dda2be19a2e0e7b59d1764aa SHA512 c1b358ad0d6e193d46189c840c5352d5e06c1bcd7758f3b1bd8b701f0322e7c9303c8149b95257010309833a7b68bc3ac650b69e278fb30d67567bdf3c9652dd
 MISC metadata.xml 451 BLAKE2B 4c75e247158dd2ea8aad213b312846bc7033c7f4a0df80f288618cabc1b84962f08b17b08bd740b68db2553a68a89157cfced88a78632c92bc916d398ef99141 SHA512 7b08acc36a6ab69764750a0a180bd6bb764dd3005471e69b86f2573f2422a015d3d61d94cb5aaf979a4783fcfa88a68c3ff4a5445f4fdbb0326ab55fb45ca88d
diff --git a/dev-python/aiolookin/aiolookin-0.0.4.ebuild b/dev-python/aiolookin/aiolookin-0.0.4.ebuild
index e14556f06..1926e0a23 100644
--- a/dev-python/aiolookin/aiolookin-0.0.4.ebuild
+++ b/dev-python/aiolookin/aiolookin-0.0.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/aiolookin/aiolookin-0.1.0.ebuild b/dev-python/aiolookin/aiolookin-0.1.0.ebuild
index 3c45a853e..0f4c70eb7 100644
--- a/dev-python/aiolookin/aiolookin-0.1.0.ebuild
+++ b/dev-python/aiolookin/aiolookin-0.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/aiolookin/aiolookin-0.1.1.ebuild b/dev-python/aiolookin/aiolookin-0.1.1.ebuild
new file mode 100644
index 000000000..0f4c70eb7
--- /dev/null
+++ b/dev-python/aiolookin/aiolookin-0.1.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Client for interaction of the LOOKin device with the Home Assistant"
+HOMEPAGE="https://github.com/ANMalko/aiolookin https://pypi.org/project/aiolookin/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DOCS="README.md"
+
+RDEPEND=">=dev-python/aiohttp-3.7.4[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	nosetests --verbose || die
+	py.test -v -v || die
+}
diff --git a/dev-python/pyialarm/Manifest b/dev-python/pyialarm/Manifest
index eba4cd49e..08e960748 100644
--- a/dev-python/pyialarm/Manifest
+++ b/dev-python/pyialarm/Manifest
@@ -1,3 +1,3 @@
-DIST pyialarm-1.9.0.tar.gz 8093 BLAKE2B 28f5b2f0286337d975c0df89428d6edd0435ee2d429b3f039475e45be0f94da82b5e8e7ff16d62bac5af50512fe34d7e41d7fd9c66a4d9c0f4965b2e56e343da SHA512 5156242eef767f2ac6fc631e7b1045e74bcbc55ef1bd1802286a0ba8a712afb1bc86416f446cdf609bbf6600ed52198d9473bb5b425d59c8dfe08f260ac40753
+DIST pyialarm-1.9.0.tar.gz 8093 BLAKE2B 28f5b2f0286337d975c0df89428d6edd0435ee2d429b3f039475e45be0f94da82b5e8e7ff16d62bac5af50512fe34d7e41d7fd9c66a4d9c0f4965b2e56e343da MD5 5438bef75b84c76bfda932a75fcf4bf0 SHA512 5156242eef767f2ac6fc631e7b1045e74bcbc55ef1bd1802286a0ba8a712afb1bc86416f446cdf609bbf6600ed52198d9473bb5b425d59c8dfe08f260ac40753
 EBUILD pyialarm-1.9.0.ebuild 844 BLAKE2B d8dd8db846ae598d58a5d8eaaa43fb68558d240f9f77f063e19b9f0b4b24f801dc748d678acd4ec79d368c87ba32d49bb7b394958800154b4b6187a76c70a889 SHA512 0edf2b138f22e209998a6966dc80353b2fdb14b84ab7fce94bc31556feb772ca223f6c7e412189cfdba6655ae7611e9b64007e7c653cb9e9b42c24b3dbdcd83d
 MISC metadata.xml 466 BLAKE2B 170b3c4629ef7d3efa2013f10df038e1a12a30a6cbe692c577dc2c09d157c7f575815413e8b9dfedcabdd7bce747ad556a47843f1c70d880c56fe2ee40426566 SHA512 034074c4b46e16faf70354ed9742ed27bfb8349ae01d1984530c39b470182a3dab0b25d5b87ca7a4ded7681b034c2061ba7f12eadfcaabc6de6213c68822a06b
diff --git a/dev-python/pyialarmxr-homeassistant/Manifest b/dev-python/pyialarmxr-homeassistant/Manifest
new file mode 100644
index 000000000..88617dd76
--- /dev/null
+++ b/dev-python/pyialarmxr-homeassistant/Manifest
@@ -0,0 +1,3 @@
+DIST pyialarmxr-homeassistant-1.0.18.tar.gz 6241 BLAKE2B 4a36608ff68e7c20a5b90ceaa86b0c839721e74df7f62a1fdbf7c76dbfd0a83dff0ac418649c32feccb1bd051a4f6ea8479b8e7c4caef77b4444ee66d057b9a7 SHA512 7feaa7e53968ceb117f985748b742fbfa4ae0d3dea23c33e114ad3934c4a8f2ca5f77030c12c51c64abfe8ce782a0cf325b890cec06d8c97acbab2224c0ce3ca
+EBUILD pyialarmxr-homeassistant-1.0.18.ebuild 943 BLAKE2B 610d00436fced57a644083d53aea7974252ffde88fe2430a7fa1a208bc4db21cfa0c38a97b8b9dd298d7619436d53316a2095b72b1d83427bb83d186afda0c17 SHA512 c7a1da6e178c9eefaf2157ef838661ac929a82d89545d82199f7f68d326312f5ac19f0b97aebe0ba6bf01be49ec28b1d81b2db5bb3d08e7489ed60db1a683b98
+MISC metadata.xml 496 BLAKE2B b1df34fbdd12ef54f8257bf804ede140c88859818209f56c7afec78dcf0318d726cd12a6609965103e4b52c105d3468562414a7e2696d5b5690fb78acb462ac9 SHA512 4e4c0446163212cd550c69ab1187fd5124fd7e33532d2ce168c086398d9a84a823978a53861a88cf1590f88ce5e6877b25f2f4b76768f56d6aa95750b8e4b9a8
diff --git a/dev-python/pyialarmxr-homeassistant/metadata.xml b/dev-python/pyialarmxr-homeassistant/metadata.xml
new file mode 100644
index 000000000..b6acf124d
--- /dev/null
+++ b/dev-python/pyialarmxr-homeassistant/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>b@edevau.net</email>
+    <name>Andreas Billmeier</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">pyialarmxr-homeassistant</remote-id>
+    <maintainer status="unknown">
+      <email>bigmoby.pyialarmxr@gmail.com</email>
+      <name>Fabio Mauro, Ludovico de Nittis</name>
+    </maintainer>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/pyialarmxr/pyialarmxr-1.0.13.ebuild b/dev-python/pyialarmxr-homeassistant/pyialarmxr-homeassistant-1.0.18.ebuild
similarity index 79%
rename from dev-python/pyialarmxr/pyialarmxr-1.0.13.ebuild
rename to dev-python/pyialarmxr-homeassistant/pyialarmxr-homeassistant-1.0.18.ebuild
index 7b65bfd04..7a2711105 100644
--- a/dev-python/pyialarmxr/pyialarmxr-1.0.13.ebuild
+++ b/dev-python/pyialarmxr-homeassistant/pyialarmxr-homeassistant-1.0.18.ebuild
@@ -8,18 +8,20 @@ PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="A simple library to interface with iAlarmXR systems, built for use with Home Assistant"
-HOMEPAGE="https://github.com/bigmoby/pyialarmxr https://pypi.org/project/pyialarmxr/"
+HOMEPAGE="https://github.com/bigmoby/pyialarmxr https://pypi.org/project/pyialarmxr-homeassistant/"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
 DOCS="README.md"
 
-RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]
+RDEPEND="!dev-python/pyialarmxr[${PYTHON_USEDEP}]
+	!dev-python/pyialarm[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
 	dev-python/xmltodict[${PYTHON_USEDEP}]"
 BDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/pyialarmxr/Manifest b/dev-python/pyialarmxr/Manifest
index dba55cbb4..12731e0ed 100644
--- a/dev-python/pyialarmxr/Manifest
+++ b/dev-python/pyialarmxr/Manifest
@@ -1,5 +1,3 @@
-DIST pyialarmxr-1.0.13.tar.gz 6368 BLAKE2B c2f7a383f2e1e84ce298e1d6ccc035e3baac17b650180f0864fc6a1185c3f24f5d56882fe35cfda0dc94ebc36c1085a41d7e20be399453ecc74a11b073b0d9d6 SHA512 5780fecdb4128c135545850ac68f4832f17a5f542413a8b7a951e90eb155bc9fc0eae498a616a79aa3ffbd74c0c5f9254582a0772529481b8ef133a3808481b1
 DIST pyialarmxr-1.0.18.tar.gz 6514 BLAKE2B 9155b61bdd36be7213bce8c5e32bfdb034e96ac48a5c783eb86216495b799a39463b487b4c5330658194e6ed09caeeb27b2dfea52a03909633bdd9bae7bff1ec SHA512 f19cdc7881de371725983d7b13a536edcf240fdb192cba62d63dea0eee8371c78caa02a59e4555079987626b8e453de470cfa7686bd19cdbe51f35e037cab8fe
-EBUILD pyialarmxr-1.0.13.ebuild 871 BLAKE2B eff66d3a9e0a17c9270c23b06beb48160b0148aef8ee621e08c47a2b8ee71aafe995a263fd0dc9c065cdfd61669c85d393adf34bb00b089ebec72b23a26d9e7a SHA512 251c393ce4679d69c097c24362c7de7d7342d7573eaeb5ce849f92159c41c304df037011ec495d1ba34b70b8f18846a10df34df2c3a5a7dea96d3e3cbc1100cc
 EBUILD pyialarmxr-1.0.18.ebuild 867 BLAKE2B 14d2558bd94b85a2a20f040998086ae025c8d256ae992919a9f5659b961d13b6e1c0cb37c598145830b8c0ad5cecc8a608a99786bc69591022c5aa4a7b8e4b60 SHA512 2afa672d28d9e9ee0040f0871057c1a6da85a9408142199fb7486d6a6acccce57fa68818e72be4c2d8f42bc5f5d3fb1cd306502d86bea3b3f5a2048bca27e7af
 MISC metadata.xml 482 BLAKE2B ac579f800cbd062d0de1712a73aead16c56257a6754c8f9dfc80c0f2daa3c075a34fcc3fa177bf158860a5f72a199c5415ceadc14fed1d2d751392de043731bf SHA512 4000c419ce5327dd1296cda3c479d27bc6481fa5d342b44829257d9aba561731dafb4156c236361006671be953fd42a5b9b5fb44ac620553729169890800d100
diff --git a/dev-python/regenmaschine/Manifest b/dev-python/regenmaschine/Manifest
index ac3fe836a..d4f0ae541 100644
--- a/dev-python/regenmaschine/Manifest
+++ b/dev-python/regenmaschine/Manifest
@@ -1,7 +1,7 @@
 DIST regenmaschine-2022.1.0.tar.gz 15092 BLAKE2B 7fa8abc5c0f188151e6fba7e941ffb5630dbc8d05a8bd2d0d690a19af988867e2121f6f4665a1bfd593ac653b9d2d1bfa3e55ff6d2f38c995c167e51efa33c63 SHA512 0c1bf3a5dd433e4b7f34f71a1597337d564c05c9d044710e7b56a44aa0a7083f88d8f49a8552fdfd3a7889a96fc35ef08a96ff2a61f3f067ea385541cfdf6e06
-DIST regenmaschine-2022.5.0.tar.gz 15548 BLAKE2B a30e396c8887d0244fe8ab9b5cbee2d62af76bf3dd801cc7cc2fcaffbad48a80e272c7a350b977a7f16357b73345bb24a510367f4a30a13451109fd6ab97e20c SHA512 5d7bdf73440bec1cd8c2eb63669e079ee889711dc4abc5b32f8c72a5be4c0019a88470df52c809df656fa23ada616b4a4b92829484c6130e3ec62c7db56eaabb
 DIST regenmaschine-2022.5.1.tar.gz 15554 BLAKE2B ee7cb970728ccd205d49dbd3398b3dca7c86d68acee71f042deac51405ed1bed39841c7a1f489549b5cae46f3b55a057f0c9f053da111468f20c445265438dba SHA512 7cbeebbdf7c267223b690da76d58b29c1de0e71f824d2a3d726a16794eec389cdf54e2928473b71c9ee4aeca07da8dc740f69ccb17a3a17ffedefd5d27d5df08
-EBUILD regenmaschine-2022.1.0.ebuild 951 BLAKE2B 966b8f2a7a57ffd6198b42b9b690ef01116bfe0753946c7ced5b424eb0a51b9bde6ac1bea5c8f7ea5e88e8048cb5b2e21070a4954e035c7680c9713d298ae8a3 SHA512 cde0f8a75eef0f7c5e3bd9f64c13d99557dc8b8e5bff9fd1a87b860972dd52fff6c860300c5920bfaa370b0710273379d71305d7d2cd0bbcbd4aa17bcc05e23a
-EBUILD regenmaschine-2022.5.0.ebuild 969 BLAKE2B 20cfce3c6d39431c0d0a587f91996f4a9dd81d22ac63b8aa90758b76ee46b3eb18bd729aef61709fa1cc8109978a51e01028c0d59603b78b9e21e3fd229c09ee SHA512 af1a45e5e451dfb0d31bd5ec7df4fa2339232cc24c99b844b7ea5ba2577141efed7c81383678d9e253ffa0cc072e2086106185701545dd91d021a6318ebf5a4c
-EBUILD regenmaschine-2022.5.1.ebuild 969 BLAKE2B 20cfce3c6d39431c0d0a587f91996f4a9dd81d22ac63b8aa90758b76ee46b3eb18bd729aef61709fa1cc8109978a51e01028c0d59603b78b9e21e3fd229c09ee SHA512 af1a45e5e451dfb0d31bd5ec7df4fa2339232cc24c99b844b7ea5ba2577141efed7c81383678d9e253ffa0cc072e2086106185701545dd91d021a6318ebf5a4c
+DIST regenmaschine-2022.6.0.tar.gz 15561 BLAKE2B ffdbe4de1f966a3bd6f9859407304c7a83e4ac5f0612899b89171ce3b65f654f5e87c3a7eca24fed267fdd64abe42dba4ef469d8a0dbebb7dd1f9fef96e47a19 SHA512 daa58df2df1de624df2353f944811449aeed03806d755c8ba570f4babb77f678850c174c8d12b327ea2276d51ca4bba5dada904fa5b900347c05195eecabb2a7
+EBUILD regenmaschine-2022.1.0.ebuild 927 BLAKE2B b5fa75c86206b89afd97427af06289cbc5d40da82e38f2bbc997071408d01aa0db802708f7c8885e4443ac95c0e8654de29eb290110d7a7ea6c7c77c6c364f2d SHA512 9977882aa6e99a8c2b251ed81bf277f9587eb6c3f8abec2faffed3c11aa10346eaf3159611080a76b7835b56904f4ad10e43e28be1d9ca826a2b7b297b6e05b1
+EBUILD regenmaschine-2022.5.1.ebuild 945 BLAKE2B 305f143194e9800edbeb68fdd17f724c4180456d2183cb5d7a991670e9284e498479626b1d7b6f535d56f04e1f095c8854a905a1391be5f61a2611bb032626f6 SHA512 c7966937d0b92c34c01259953b4945a4b54cffcbfa140efb0cca3c6d1a9e73458c565c9df937622f0b0cddcae142292a4e5782b9bb2027cf720be7ef5fbe0d43
+EBUILD regenmaschine-2022.6.0.ebuild 945 BLAKE2B 305f143194e9800edbeb68fdd17f724c4180456d2183cb5d7a991670e9284e498479626b1d7b6f535d56f04e1f095c8854a905a1391be5f61a2611bb032626f6 SHA512 c7966937d0b92c34c01259953b4945a4b54cffcbfa140efb0cca3c6d1a9e73458c565c9df937622f0b0cddcae142292a4e5782b9bb2027cf720be7ef5fbe0d43
 MISC metadata.xml 456 BLAKE2B 4c51bd0fd739c1e6472bffb626697fbc630009ec15cad05b43195e53876e13bc21f9b21fd80ace806879848c07124b034082a35ea50d58f8000bc0faf95cfcfd SHA512 694961bbe134b4815868530ddf2d0d6fac422d777c4d0e483ba6fcae8fbc5f8ca54a3929bd17c5a1762ac13d5152579b4cdf40e59216ad97e682488d7d69b136
diff --git a/dev-python/regenmaschine/regenmaschine-2022.1.0.ebuild b/dev-python/regenmaschine/regenmaschine-2022.1.0.ebuild
index 9062662b0..fb5d02859 100644
--- a/dev-python/regenmaschine/regenmaschine-2022.1.0.ebuild
+++ b/dev-python/regenmaschine/regenmaschine-2022.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/regenmaschine/regenmaschine-2022.5.1.ebuild b/dev-python/regenmaschine/regenmaschine-2022.5.1.ebuild
index 27a8e069b..a0f9d84c9 100644
--- a/dev-python/regenmaschine/regenmaschine-2022.5.1.ebuild
+++ b/dev-python/regenmaschine/regenmaschine-2022.5.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/regenmaschine/regenmaschine-2022.5.0.ebuild b/dev-python/regenmaschine/regenmaschine-2022.6.0.ebuild
similarity index 94%
rename from dev-python/regenmaschine/regenmaschine-2022.5.0.ebuild
rename to dev-python/regenmaschine/regenmaschine-2022.6.0.ebuild
index 27a8e069b..a0f9d84c9 100644
--- a/dev-python/regenmaschine/regenmaschine-2022.5.0.ebuild
+++ b/dev-python/regenmaschine/regenmaschine-2022.6.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/simplisafe-python/Manifest b/dev-python/simplisafe-python/Manifest
index b55f8a5e8..48e0569c1 100644
--- a/dev-python/simplisafe-python/Manifest
+++ b/dev-python/simplisafe-python/Manifest
@@ -1,9 +1,9 @@
-DIST simplisafe-python-2022.2.1.tar.gz 23357 BLAKE2B 7731533bbacc00f93092ae6876defd0346c1a695c60ad0f25c04bf78df422e0eb435830543e4df4b94f85dbe97f7e14ceb25ea93816d33dce71bc189eaf8d4a5 SHA512 1300fa9b06359a3293e270c2f423707586b0823cf95280d234fcabbc18bd503d903df61c3d7ea92a037dd78889eab86cf3dd41ef65881ec112d8a766c02db32f
 DIST simplisafe-python-2022.3.0.tar.gz 23361 BLAKE2B 78fd095b096df9a8c6f5ba6fa2614fda18c85bfc585f3af1bc13c37a9f91b56a68c7e27d961e90633c1b47e65b2337256c4c4a66f5a40304ef2af389fef10813 SHA512 af7ace6b5c63f3b98622e38cce123bbb991c53a299e6678d0d395b430b605997b307728917f1feb148b9741d8ab310b6cbc193df32e79404c9b9043fc336c19e
 DIST simplisafe-python-2022.5.1.tar.gz 24353 BLAKE2B e6c673c8302cb39570ec802385bdbd1ce18b8e69ca3a6b545576356f0e978befd3060097a9a2593d738db3e92adb871f39b4a39ccb173630be2f771dc18dddf1 SHA512 247539148818fe92bfd4a9b1c0b9a58b0f354c3729a6fdd3bc69490b40808670b986424e12eae16d6010cae9ffe273de42da9fc99ad5fda5eb79cc397e1e51d2
 DIST simplisafe-python-2022.5.2.tar.gz 24503 BLAKE2B 6359bcc2032ce9d027d4cf35a9db022b0be0457b53409ebe0ec6a340c866142618b864afedd8b59292c4579e4be02cc1dbace92b739877b1853f911700446d42 SHA512 f61d4c52f0be90d5840dd1caafd59554a08c3b5c96d05381c353d39fbb71e74425f46ce9cc58c934f08d87781871bf3d55fd518fbe5cb6312c7d97158038c72f
-EBUILD simplisafe-python-2022.2.1.ebuild 1237 BLAKE2B 36246cd9fecc6f98f0837f246eabf56dd233f7c1640616f85ad5edd06e4570b8f56bbdc58b7f74da8825d0722e5d7e0e6d719a92ac51c8be14abfc3becb0d3f9 SHA512 bac1473bbc05c1e30711937a232dc5994838c0f64aadf452020b45f81b13184ad3fd7d5bdd81aef178dcd9f43b89af4dd27c1d6d06117c9025385691ba5ebdab
-EBUILD simplisafe-python-2022.3.0.ebuild 1143 BLAKE2B 9123c474081fa0d4e5f0f3377a045a288e27b84877dd3776ebdf2084a6ff22a1ce74834c2c9bdd0c1c961a306ba5bb0245e8753b058ece01eab7fa212cc9b33a SHA512 e31be27de9f8ed75b853a529f629ad1752360285288805cc9f368a31e6cbf155eb2595cc7f814706dc2902c7b5343335076a6207279b9d6f2d5641a16950c61a
-EBUILD simplisafe-python-2022.5.1.ebuild 1228 BLAKE2B 4340f9c5fe14c316e0c7979606c473453ab19b0599bd1f0d54e3049a716a36ada24770f140a08aff066fb30ff41e30c1c8b322831b310187d040f4eae9e84bc1 SHA512 ae9e84aff15961457ce9e47843117898e52c757e8f69bdb584c10222fd066b956e992452940f137c88080caef2738affb98f895e4252b54218202b9304d5da50
-EBUILD simplisafe-python-2022.5.2.ebuild 1228 BLAKE2B 4340f9c5fe14c316e0c7979606c473453ab19b0599bd1f0d54e3049a716a36ada24770f140a08aff066fb30ff41e30c1c8b322831b310187d040f4eae9e84bc1 SHA512 ae9e84aff15961457ce9e47843117898e52c757e8f69bdb584c10222fd066b956e992452940f137c88080caef2738affb98f895e4252b54218202b9304d5da50
+DIST simplisafe-python-2022.6.0.tar.gz 24483 BLAKE2B 2258e5e8ae188582f590a0bf9f4d65aff2ac32d61f835f86ffc60072b43df00f7f0884dfb338f3a418f646584a8f6e7ef27f6d0e077d9ee198f6564e4f339cd2 SHA512 1af07837e5a31f8378ec41c3accd5575396b33ac2f388f9aa0f35c9802b980c0bca1dac2a5fac3343c4ffd0bafd7d4e5b7121c5e2d34bff70e979a31a2dd948d
+EBUILD simplisafe-python-2022.3.0.ebuild 1119 BLAKE2B ae5877fa10a15dbe50af99db1244133db3465f7a6d72df2d2bc0b611c3ed64b944ab1fe9764193c076fa5269939825198555b9a2712c6753486d25793cd94b1f SHA512 5e37583fb31055690161bb8549aaccca7e67f43e694842cedba5dddbde05cdba130d10d4a5337ea5152870a92b605c198bdacc8ff89c51f5a07e062f1437b180
+EBUILD simplisafe-python-2022.5.1.ebuild 1204 BLAKE2B b523f4a676c7716dcc77475c9ede35dbfb894ed035e23990c52b69e25de8f2194b6f55c93003cc4d43f60685c30bef3a7155fc0c750100b1672822303764d132 SHA512 7cde51e8bfbd99736e90a2cce4dec3efe9c2a72e5cb233b0a96b873871c507b1bf753c80f948b6d19e09a1244164f2b68962991bc79c2c50b152317b91e0f550
+EBUILD simplisafe-python-2022.5.2.ebuild 1204 BLAKE2B b523f4a676c7716dcc77475c9ede35dbfb894ed035e23990c52b69e25de8f2194b6f55c93003cc4d43f60685c30bef3a7155fc0c750100b1672822303764d132 SHA512 7cde51e8bfbd99736e90a2cce4dec3efe9c2a72e5cb233b0a96b873871c507b1bf753c80f948b6d19e09a1244164f2b68962991bc79c2c50b152317b91e0f550
+EBUILD simplisafe-python-2022.6.0.ebuild 1232 BLAKE2B 2659252988a409af237b2c0cdd6f1a491a5107f452ad3273ea2454c7128e31a288489c62432f474b4c260abc1454358ede5534ac04f2679d5d3ac5b6db9520e3 SHA512 62f4204595a583426374ef4c3484b0417c09837e4caf27204036b7cf3f2f811cc024a8df8fd6f6403a621ca8f459e73bf4c293174d429f595e21435629cbaa70
 MISC metadata.xml 460 BLAKE2B 2b1ee497f05835d4310a427c78a87cfa43c367775a3a900519fcfdfb034a5ead492552353b006967f37be4bf9b291b9ae1fc19ed656ad5c27a399b4d1df905ac SHA512 c611e4d648ea6ff76b0df103fe9684f8d56cf8d3e15eafb90f036677a131b4019df4fb453512f8c3aef0ad196f0ebedffa2b3a282fa9c69e0bc505013b46a753
diff --git a/dev-python/simplisafe-python/simplisafe-python-2022.3.0.ebuild b/dev-python/simplisafe-python/simplisafe-python-2022.3.0.ebuild
index 7733c8bf2..09c49a1fc 100644
--- a/dev-python/simplisafe-python/simplisafe-python-2022.3.0.ebuild
+++ b/dev-python/simplisafe-python/simplisafe-python-2022.3.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/simplisafe-python/simplisafe-python-2022.5.1.ebuild b/dev-python/simplisafe-python/simplisafe-python-2022.5.1.ebuild
index 0bd575a42..09f08e3b5 100644
--- a/dev-python/simplisafe-python/simplisafe-python-2022.5.1.ebuild
+++ b/dev-python/simplisafe-python/simplisafe-python-2022.5.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/simplisafe-python/simplisafe-python-2022.5.2.ebuild b/dev-python/simplisafe-python/simplisafe-python-2022.5.2.ebuild
index 0bd575a42..09f08e3b5 100644
--- a/dev-python/simplisafe-python/simplisafe-python-2022.5.2.ebuild
+++ b/dev-python/simplisafe-python/simplisafe-python-2022.5.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/simplisafe-python/simplisafe-python-2022.2.1.ebuild b/dev-python/simplisafe-python/simplisafe-python-2022.6.0.ebuild
similarity index 84%
rename from dev-python/simplisafe-python/simplisafe-python-2022.2.1.ebuild
rename to dev-python/simplisafe-python/simplisafe-python-2022.6.0.ebuild
index 410c3c5c0..d3507b5b2 100644
--- a/dev-python/simplisafe-python/simplisafe-python-2022.2.1.ebuild
+++ b/dev-python/simplisafe-python/simplisafe-python-2022.6.0.ebuild
@@ -4,6 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_PEP517=poetry
 
 inherit distutils-r1
 
@@ -13,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
@@ -21,11 +22,10 @@ DOCS="README.md"
 
 RDEPEND=">=dev-python/aiohttp-3.8.0[${PYTHON_USEDEP}]
 	>=dev-python/backoff-1.11.1[${PYTHON_USEDEP}]
+	>=dev-python/beautifulsoup4-4.11.1[${PYTHON_USEDEP}]
 	>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
 	>=dev-python/voluptuous-0.11.7[${PYTHON_USEDEP}]
-	<dev-python/voluptuous-0.13.0[${PYTHON_USEDEP}]
-	>=dev-python/websockets-8.1[${PYTHON_USEDEP}]
-	<dev-python/websockets-11[${PYTHON_USEDEP}]"
+	>=dev-python/websockets-8.1[${PYTHON_USEDEP}]"
 BDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
@@ -41,3 +41,5 @@ python_test() {
 	nosetests --verbose || die
 	py.test -v -v || die
 }
+
+distutils_enable_tests pytest
diff --git a/dev-python/wallbox/Manifest b/dev-python/wallbox/Manifest
index 06c3ff623..cb88b9949 100644
--- a/dev-python/wallbox/Manifest
+++ b/dev-python/wallbox/Manifest
@@ -1,3 +1,5 @@
 DIST wallbox-0.4.4.tar.gz 2647 BLAKE2B 3d6fa7371f18f46c3dd9603e31f2b8465729c8a8cf74462be18b130d10e70b40b9091a71a60928bf429e5dcf6328e2f24b293acc883255d52cc1fa3025afb7c2 SHA512 32a5940fdc5745c02346f8c2163691fafc8ee108886e76a0a6be029333af3963e307104501930f3cc4249b7648f679e76cad8908153f8efbdd3642b065b5790f
-EBUILD wallbox-0.4.4.ebuild 824 BLAKE2B 494354ab861428f3ca8836e7a432f15349a133fea49a6550de2783dd16e78ea1485f1bc1955f5b24e05f085a75c573373313e8ae627ddfd6341a48ae0bd1f289 SHA512 30dfe35cf9b06c6b3adc335d6d9de16766701e0435489574ccb3e79c517b811fea86df7f2fa384d4b308061b333da65f92dd844397879bcc65ad40af9fd9e3d1
+DIST wallbox-0.4.9.tar.gz 7217 BLAKE2B 18506b188151911c5d9f5b61e9ae4f92fdb512e5abbaa3f39404c84c9367de3cd220d90da8e9f53ac6f1f864e5e9afcf6129af62b12df1caf13f6f2c5f4b65c7 SHA512 38d61332d1041f9d85fddf966d66042238d75a976c4f3a8afec20701851202e9f4d4b53398b63d7f25cb10643539baf37c21ab68cf9f1f23b16ec52cf40eabea
+EBUILD wallbox-0.4.4.ebuild 794 BLAKE2B 144f196d92045b2b240ef307d53152a6ea0e6187599ad537a18f33c777455f43dcb0b64f6a8f395c1dc09ec8e973748a315cb82693eb638d0340340398d41372 SHA512 55f4db6833560a9fe7fc504be8cab74c2a7494282c42fe9141e49b76b0b0d9fd891756291525cee2a9bd375e44f3ef7af18277e9b96ec0263a766ddb71d183df
+EBUILD wallbox-0.4.9.ebuild 869 BLAKE2B bef120835eab5a505c5a797430f296133df551abe97edbd754e7ba810fffe9c2806ca59e1dcb91a82104def58de27881a1f9ada6393df8488b9f888d2a736006 SHA512 e549a11e65c759be225a0209b266522e184e1dbd242b6a0c93b650303a45fa4f796853a0b62235182cd4ab3773599bc9493d85c32a03f34c89b9b57502106067
 MISC metadata.xml 453 BLAKE2B d58d7dcda1f7d2cad81b4c334c1bc14c3eeaf846f521e1246819d323e9bccdf593cdc33591b1bf4d9da840bd17a8e5fefbabd63f8a2af76442a0fcd33b7846f4 SHA512 490221da94aa3472157104a9ca7fa62f7cd2777a158f4db05c46acaace35e2f01c70ed672e62ec3f6e0a7973a604ed31c5d67ddb04061ccc9fe5e264a71dbd35
diff --git a/dev-python/wallbox/wallbox-0.4.4.ebuild b/dev-python/wallbox/wallbox-0.4.4.ebuild
index e1fd92349..ddf08e607 100644
--- a/dev-python/wallbox/wallbox-0.4.4.ebuild
+++ b/dev-python/wallbox/wallbox-0.4.4.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/wallbox/wallbox-0.4.9.ebuild b/dev-python/wallbox/wallbox-0.4.9.ebuild
new file mode 100644
index 000000000..84a896533
--- /dev/null
+++ b/dev-python/wallbox/wallbox-0.4.9.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Module for interacting with Wallbox EV charger api"
+HOMEPAGE="https://github.com/cliviu74/wallbox https://pypi.org/project/wallbox/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 arm arm64 x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DOCS="README.md"
+
+RDEPEND=">=dev-python/requests-2.22.0[${PYTHON_USEDEP}]
+	>=dev-python/simplejson-3.16.0[${PYTHON_USEDEP}]
+	>=dev-python/aenum-3.1.8[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	nosetests --verbose || die
+	py.test -v -v || die
+}
+
+distutils_enable_tests pytest
diff --git a/requirements_all.txt b/requirements_all.txt
index 0a39a5afc..87e933086 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -1,6 +1,6 @@
 abodepy==1.2.0
 accuweather==0.3.0
-acme==1.26.0
+acme==1.27.0
 Adafruit-Blinka==7.1.1
 adafruit-circuitpython-bmp280==3.1.1
 adafruit-circuitpython-busdevice==5.1.8
@@ -15,7 +15,7 @@ adext==0.4.2
 adguardhome==0.5.1
 advantage-air==0.3.1
 AEMET-OpenData==0.2.1
-aenum==3.1.8
+aenum==3.1.11
 afsapi==0.0.4
 agent-py==0.0.23
 aio-geojson-client==0.17
@@ -56,7 +56,7 @@ aiokafka==0.6.0
 aiokef==0.2.16
 aiolifx-effects==0.2.2
 aiolifx==0.7.1
-aiolookin==0.1.0
+aiolookin==0.1.1
 aiolyric==1.0.8
 aiomodernforms==0.1.8
 aiomusiccast==0.14.3
@@ -147,13 +147,13 @@ baidu-aip==1.6.6.0
 baselayout==2.8
 batinfo==0.4.2
 bcrypt==3.1.7
-bcrypt==3.2.0
+bcrypt==3.2.2
 beacontools==1.2.3
 beautifulsoup4==4.11.1
 beewi-smartclim==0.0.10
 bellows==0.30.0
 bimmer-connected==0.9.4
-bitarray==2.4.1
+bitarray==2.5.1
 bitstring==3.1.9
 bizkaibus==0.1.1
 bleach==5.0.0
@@ -171,8 +171,8 @@ bme680==1.0.5
 bond-async==0.1.20
 boschshcpy==0.2.30
 boto3==1.20.24
-boto3==1.23.5
-botocore==1.26.5
+boto3==1.23.10
+botocore==1.26.10
 bottle==0.12.21
 bottleneck==1.3.4
 bravia-tv==1.0.11
@@ -194,7 +194,7 @@ ca-certificates==20210119.3.66
 cachetools==5.0.0
 casttube==0.2.0
 cattrs==1.10.0
-cbor2==5.4.2
+cbor2==5.4.3
 cchardet==2.1.7
 certifi==3021.3.16
 cffi==1.15.0
@@ -380,7 +380,7 @@ goslide-api==0.5.1
 gpiozero==1.6.2
 gps3==0.33.3
 graphql-subscription-manager==0.4.3
-graphviz==2.49.0
+graphviz==2.50.0
 greeclimate==1.1.1
 greeneye-monitor==3.0.3
 greenwavereality==0.5.1
@@ -791,7 +791,7 @@ pyhomematic==0.1.77
 pyhomeworks==0.0.6
 pyhumps==3.5.0
 pyialarm==1.9.0
-pyialarmxr==1.0.18
+pyialarmxr-homeassistant==1.0.18
 pyicloud==1.0.0
 pyinsteon==1.1.0
 pyintesishome==1.7.6
@@ -1019,7 +1019,7 @@ ratelimit==2.2.1
 re2==0.2021.11.01
 readlike==0.1.2
 reedsolomon==1.5.4
-regenmaschine==2022.5.1
+regenmaschine==2022.6.0
 regex==2021.8.28
 regex==2022.4.24
 related==0.7.2
@@ -1073,6 +1073,7 @@ semantic_version==2.10.0
 semver==2.13.0
 sendgrid==6.8.2
 sense-energy==0.10.4
+sentry-sdk==1.5.12
 sepaxml==2.2.0
 setuptools==62.1.0
 sgmllib3k==1.0.0
@@ -1082,7 +1083,7 @@ shodan==1.27.0
 simplehound==0.3
 simplejson==3.17.5
 simplepush==1.1.4
-simplisafe-python==2022.5.2
+simplisafe-python==2022.6.0
 siobrultech-protocols==0.5.0
 sisyphus-control==3.1.2
 six==1.16.0
@@ -1218,7 +1219,7 @@ vtjp==0.1.14
 vulcan-api==2.1.1
 vultr==0.1.2
 wakeonlan==2.0.1
-wallbox==0.4.4
+wallbox==0.4.9
 waqiasync==1.0.0
 warrant-lite==1.0.4
 watchdog==2.1.8