diff --git a/app-misc/homeassistant/Manifest b/app-misc/homeassistant/Manifest
index 4fea2339b..1b5edd3d6 100644
--- a/app-misc/homeassistant/Manifest
+++ b/app-misc/homeassistant/Manifest
@@ -7,18 +7,14 @@ AUX recorder.yaml 114 BLAKE2B af04840805aa13124208584e7f1d40335905a083ee7deead5c
 AUX socat-zwave.init.d 637 BLAKE2B d61c1024a6fe3ce8d322e62ac1ec15e00d08f5c5a63feabc8603ecc51ec16e0a4775e0c7da83d12d1ef0c9815c9ebf8ec8a86a678bb4a3b40decb04adc887f26 SHA512 2b13cd4175427853d5a4169cc7d441d62618e8136e4f5d9fd24d08a47f6916953ebd1e747ea9c7a0907b00766c7b2108ba3b8917178fd9a795da23e6525a0faf
 AUX update-homeassistant 1326 BLAKE2B 917bdd332c4e5dea5177eecd11a7f8d72b911fddfdc8e5eb54960c526fe8c735e20d44e570cf7aeb99669d2a9670c70da1c5fbc30efb284d1f0f330799de6e24 SHA512 3c05f0d6d1bde0e1526c3e679568794c07091e7856dfd8793e13feec6f22725ddaa3163ca2c81d9df86cf73573f932e561743f05de420b350a0b68f6a9582aca
 AUX yamaha.py 13403 BLAKE2B e073c1e3d4bab02e93e971cb6003705e5e82d20524204ed00f5cd4d0f8f1628419a3a0c8a50ce2e2e13a57017607e5543cfed49a3241de549c572c2012c044d7 SHA512 be6ab79a49c47ad15642ac06adc194318a2ae812cdeffa442e32303b7865b1589383386d84f57b50e942b850ffe68c1ce208d0a4c5bb70fee14f39ea77d01ef4
-DIST homeassistant-0.96.2.tar.gz 4171945 BLAKE2B 687362442b381148ad2c44f3aab9620ff5a829ab49d036a0795bb17e58c6badbbb55e490009d1402b2ebcb82aea41f8e3e47387ae5ee8fba63a07818ecd267a4 SHA512 0b506cec5f18ca3bd9154d4492a6c095a9a15446f0c9492222a240acdaa851df67ede18d1ed0c088e97312ae6cc7ae17ed1862c9bc5d351a0cc71af7d9150411
 DIST homeassistant-0.96.3.tar.gz 4172444 BLAKE2B 2480582cf611147031defd6c00a0b3d25276f257792533b59e5bac8b35a165d5e3684a9a46ef5e2db8454cd783c125ef2ce642b47fa67ebb6bf16943f96a4716 SHA512 1bc043ca7106796cb4e0cb46a5a5d5eea4d06aedf7618ac0b7bb3ce8dc692b2e75a409a324240a512fe72bcc2819b91d641395c0adeb9e6836b94aadb60f05c1
 DIST homeassistant-0.96.4.tar.gz 4172463 BLAKE2B 0af16b8b8f28ed97f5610e92dba3d43c69cc29d94c52189e36d45a2ab3a055c773acd4e632edb302d8450988b432e2c80860b98a73b2abd5217ed29b845e3031 SHA512 f14e5cb56a3f4fe108a8bd3900acc1189c8e0fccb2488e83e25efe6c236beff5067cb1df7c08db2232353b7c003b312f1c72189d020ee0fd4543f84e45fe970f
 DIST homeassistant-0.96.5.tar.gz 4172926 BLAKE2B 91cedc199dbce262d252e7df9abdf46d680f2593675dd802d2be7a5ea777e4e5f77c6f22fe3b926e72c000ccae84017c4a75e75836b709d5ff1f28d86d0ce78c SHA512 f52d129bfd0ea9ee9599ee07c3ba953ed5c061bddf90fadcf6d48aa786c757118552fc8cde0955cbe859a32095808fef5c25794e18aae1e8e03badf56a272d68
 DIST homeassistant-0.97.0.tar.gz 4241344 BLAKE2B 29675b83b02a54f5d4631d09ca6efd12c3a62115d6baf38cfab6f5fcbf79a979cbf5bef347f36f165818bd641c248fee8cebbbbe0cf8d62dedfd61f144652470 SHA512 9b208267d7c61277139bcbcac9886fb2bf3ac882a613db092142f3f19ad795552155e7add823f76b157cd32d2e30afc635dfef4c61ebb1b261eea2aab1cb6642
-DIST homeassistant-0.97.0b2.tar.gz 4240586 BLAKE2B d334fd858ad7945f0e24d381e6e30a4e50d3317774963d0df2b4d501e61c2d1bcbd56e2571f9036ad937fdf49f2c8da3632a0dfeb2c9e20eae83585329c853b2 SHA512 fe99c2d9ae36ecdc65eb82fa2649f19572535cb4c593d826d5a3e726dbbb378890d9dcb8f06c1ad23ef88124f89a739eddfa07bd8c41e1a23908d18a12a40a8a
 DIST homeassistant-0.97.0b3.tar.gz 4241456 BLAKE2B 9807ae2ee343ec6ce13fad0c1147db2b005290abad12758ab54429c8f5d7668ec39d490273fe2a493ea89ed6c08484157a7cf996c51f7a84d425650332354fdb SHA512 79abc0619f0d110580a9497e4196c11d9667524390501e305dac12c973b9a39345d8637232878f78d43490272919699e60c67cd1587bedaa02153e9c6370425d
-EBUILD homeassistant-0.96.2.ebuild 9713 BLAKE2B aee5dfb55532f48c1801ba0df4741a1abee0f1abf8dcd8408dac71d332679cb4629e74a282b29a9bb80bcb720e128c02ee6137fe970f97a5e8a2f019d30cecf1 SHA512 4d09f2c66010fc18f37c609119bf0ce72241b798a50ba9f501335201bf5eec66ab6f8de853c39f905094390b61de50d34287d090db6941e9950d6ecf0666a4e5
 EBUILD homeassistant-0.96.3.ebuild 9713 BLAKE2B 8f92b5490d94dd8acda9f894a76b89487ed1d51c52e78bc7323d038b1f974f8357de19cf2fcf621a925593db7cc37fe586d1bbed20b44feb57c4385f18312c3a SHA512 89ce458e7765be828a6038f41d10546041466aa8bdae4f25863f3745b1b8f2868b3dba6acb9f64b07052889d7f142c4915d6485f96da8d90b64b8eddf83d7887
 EBUILD homeassistant-0.96.4.ebuild 9987 BLAKE2B 9b455c68c96e1c90dfbb78870594a6b7cf0ca20219c137fe8d5e08640d4dba1eb485857bd6c9d82cb5cb685670dbb0fa5e3be470ffefa1ee1fbf7e424fd455c4 SHA512 289e77cba4e11e12552bb97bd940ff2b04b95f98a1dce99ee36b4e8874c44a1c623e302f1f3cb32ec0f9ac5632eaa9f008fcfa9170e0a868b4866320d02a9015
 EBUILD homeassistant-0.96.5.ebuild 10091 BLAKE2B 84d2abc22e9e1924655a61d8679d38ca03eb3bef6166576888cb62b951fce17dc7fe980bb0ff82d73b876e3df255ef1c396a902152cf319528c1cc7851187203 SHA512 45328058cd35d1daa149e82ef29f949ed1ac13069e54a8847c9e5ca0eb80a748cead63f5314ff01b944822c2e7b4ce67a11599b123364ecdc76a16693d7dbb00
 EBUILD homeassistant-0.97.0.ebuild 11440 BLAKE2B 5a86ead906a999fcfb5fcfe864e39c831d74917889ea1d195f63019f64cbf9dfdeac4e330af4d98eda40bdd77024a98f874e1fca6f5e2fe1339f1ef2db22d83b SHA512 c5802c150acfc4190cacbacbdb20135e4cb8b29595cb43ff177ee85d0efb17dd916062da50127b10e57dd2eccdd78fa405109cc80a423f1be70873a5ee1488a7
-EBUILD homeassistant-0.97.0_beta2.ebuild 10938 BLAKE2B 12a208aa3b7ec021523e40738ed3d6d3bc7a2688fb11dc321a7f369678de99c26ec7969f259379b534f8c2d8039fb85d3b7bb5b3ed7366e75a9529d460162556 SHA512 d91769bea0563c2ea76afc51f7d6cc4d88b51a009bd65a787de4b77534a479dea707569cebd7b932f031e2b4e8e5014fb5bca12a5024582a3b6f832afb339e63
 EBUILD homeassistant-0.97.0_beta3.ebuild 11440 BLAKE2B 5a86ead906a999fcfb5fcfe864e39c831d74917889ea1d195f63019f64cbf9dfdeac4e330af4d98eda40bdd77024a98f874e1fca6f5e2fe1339f1ef2db22d83b SHA512 c5802c150acfc4190cacbacbdb20135e4cb8b29595cb43ff177ee85d0efb17dd916062da50127b10e57dd2eccdd78fa405109cc80a423f1be70873a5ee1488a7
 MISC metadata.xml 4023 BLAKE2B faecd86a97957810f9dadf199a41aba166c6ea08dea128de1ca0a405e68effd512d8e0f6fad7db5aeffb7c13b3c84ea3b4ec215bb5437e3272a799a5c5eb7eca SHA512 5db7695b7104c1caa172e63479bf6d22e7135a259718090a43d42e26d040adeaeb8852be47a0decd7de26049c53bb870fd4bd8de6c09447cbfc9ccdf7aba42ba
diff --git a/app-misc/homeassistant/homeassistant-0.96.2.ebuild b/app-misc/homeassistant/homeassistant-0.96.2.ebuild
deleted file mode 100644
index fa1caf9be..000000000
--- a/app-misc/homeassistant/homeassistant-0.96.2.ebuild
+++ /dev/null
@@ -1,242 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors Andreas Billmeier b (at) edevau.net
-# Distributed under the terms of the GNU General Public License v3.0
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit user readme.gentoo-r1 eutils distutils-r1
-
-MY_P=${P/_beta/b}
-MY_PV=${PV/_beta/b}
-
-DESCRIPTION="Open-source home automation platform running on Python 3.6"
-HOMEPAGE="https://home-assistant.io https://git.edevau.net/onkelbeh/HomeAssistantRepository"
-SRC_URI="https://github.com/home-assistant/home-assistant/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-RESTRICT="mirror"
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="androidtv asuswrt atv darksky denonavr enigma esphome fronius +frontend growl homematic hs100 maxcube miio mikrotik mqtt musiccast +mysql qnap rxv samsungtv sma sonos speedtest ssl test tradfri vera wemo wink wwlln zigbee zoneminder z-wave"
-
-RDEPEND="${PYTHON_DEPS}
-	!app-misc/homeassistant-bin
-
-	app-admin/logrotate
-	dev-db/sqlite
-	dev-libs/libfastjson
-	>=dev-libs/xerces-c-3.1.4-r1
-	>=dev-libs/xml-security-c-1.7.3
-	~dev-python/aiohttp-3.5.4[${PYTHON_USEDEP}]
-	~dev-python/astral-1.10.1[${PYTHON_USEDEP}]
-	~dev-python/async_timeout-3.0.1[${PYTHON_USEDEP}]
-	~dev-python/attrs-19.1.0[${PYTHON_USEDEP}]
-	~dev-python/bcrypt-3.1.7[${PYTHON_USEDEP}]
-	>=dev-python/certifi-2019.6.16[${PYTHON_USEDEP}]
-	~dev-python/cryptography-2.7[${PYTHON_USEDEP}]
-	~dev-python/importlib-metadata-0.18[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10[${PYTHON_USEDEP}]
-	~dev-python/passlib-1.7.1-r1[${PYTHON_USEDEP}]
-	>=dev-python/pip-8.0.3-r1[${PYTHON_USEDEP}]
-	~dev-python/pyjwt-1.7.1[${PYTHON_USEDEP}]
-	~dev-python/python-slugify-3.0.2[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2019.1[${PYTHON_USEDEP}]
-	~dev-python/pyyaml-5.1.1[${PYTHON_USEDEP}]
-	=dev-python/requests-2.22.0[${PYTHON_USEDEP}]
-	~dev-python/ruamel-yaml-0.15.97[${PYTHON_USEDEP}]
-	~dev-python/voluptuous-0.11.5[${PYTHON_USEDEP}]
-	~dev-python/voluptuous-serialize-2.1.0[${PYTHON_USEDEP}]
-
-	>=app-crypt/acme-0.32.0[${PYTHON_USEDEP}]
-	>=dev-python/aiohttp-cors-0.7.0[${PYTHON_USEDEP}]
-	>=dev-python/asn1crypto-0.24.0[${PYTHON_USEDEP}]
-	~dev-python/beautifulsoup-4.7.1[${PYTHON_USEDEP}]
-	~dev-python/blinkpy-0.14.1[${PYTHON_USEDEP}]
-	>=dev-python/boto3-1.9.16[${PYTHON_USEDEP}]
-	>=dev-python/botocore-1.12.115[${PYTHON_USEDEP}]
-	~dev-python/caldav-0.6.1[${PYTHON_USEDEP}]
-	>=dev-python/cdu-0.1.3[${PYTHON_USEDEP}]
-	~dev-python/cffi-1.12.2[${PYTHON_USEDEP}]
-	>=dev-python/chardet-3.0.4[${PYTHON_USEDEP}]
-	~dev-python/colorlog-4.0.2[${PYTHON_USEDEP}]
-	>=dev-python/coverage-4.5.2[${PYTHON_USEDEP}]
-	>=dev-python/distro-1.4.0[${PYTHON_USEDEP}]
-	~dev-python/docopt-0.6.2[${PYTHON_USEDEP}]
-	>=dev-python/docutils-0.14[${PYTHON_USEDEP}]
-	>=dev-python/ecdsa-0.13[${PYTHON_USEDEP}]
-	>=dev-python/envs-1.3[${PYTHON_USEDEP}]
-	>=dev-python/future-0.17.1[${PYTHON_USEDEP}]
-	~dev-python/gTTS-token-1.1.3[${PYTHON_USEDEP}]
-	~dev-python/hass-nabucasa-0.15[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.8[${PYTHON_USEDEP}]
-	>=dev-python/idna-ssl-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/ifaddr-0.1.6[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.9.4[${PYTHON_USEDEP}]
-	>=dev-python/jose-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/jsonrpc-async-0.6[${PYTHON_USEDEP}]
-	~dev-python/jsonrpc-base-1.0[${PYTHON_USEDEP}]
-	~dev-python/jsonrpc-websocket-0.6[${PYTHON_USEDEP}]
-	>=dev-python/lxml-4.3.3[${PYTHON_USEDEP}]
-	>=dev-python/multidict-4.5.2[${PYTHON_USEDEP}]
-	>=dev-python/netdisco-2.6.0[${PYTHON_USEDEP}]
-	>=dev-python/nose-1.3.7[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.16.4[${PYTHON_USEDEP}]
-	>=dev-python/paho-mqtt-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/pbr-5.1.3[${PYTHON_USEDEP}]
-	~dev-python/pillow-5.4.1[${PYTHON_USEDEP}]
-	>=dev-python/psutil-5.6.3[${PYTHON_USEDEP}]
-	>=dev-python/PyChromecast-3.2.2[${PYTHON_USEDEP}]
-	>=dev-python/pycparser-2.19[${PYTHON_USEDEP}]
-	|| ( >=dev-python/pycryptodome-3.7.3[${PYTHON_USEDEP}] dev-python/pycrypto[${PYTHON_USEDEP}] )
-	~dev-python/pyhaversion-3.0.2[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-19.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pyotp-2.2.7[${PYTHON_USEDEP}]
-	>=dev-python/pyqrcode-1.2.1[${PYTHON_USEDEP}]
-	>=dev-python/pyrfc3339-1.1[${PYTHON_USEDEP}]
-	~dev-python/pysnmp-4.4.9[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.7.5[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.8.0[${PYTHON_USEDEP}]
-	>=dev-python/python-jose-cryptodome-1.3.2[${PYTHON_USEDEP}]
-	>=dev-python/requests-toolbelt-0.9.1[${PYTHON_USEDEP}]
-	=dev-python/RestrictedPython-4.0_beta8[${PYTHON_USEDEP}]
-	~dev-python/setuptools-40.8.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.12.0[${PYTHON_USEDEP}]
-	~dev-python/sqlalchemy-1.3.5[${PYTHON_USEDEP}]
-	~dev-python/transitions-0.6.9[${PYTHON_USEDEP}]
-	>=dev-python/typing-3.6.4-r1[${PYTHON_USEDEP}]
-	~dev-python/tzlocal-1.5.1[${PYTHON_USEDEP}]
-	>=dev-python/ua-parser-0.8.0[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.3[${PYTHON_USEDEP}]
-	>=dev-python/user-agents-2.0[${PYTHON_USEDEP}]
-	>=dev-python/vobject-0.9.6.1[${PYTHON_USEDEP}]
-	>=dev-python/wakeonlan-1.1.6[${PYTHON_USEDEP}]
-	=dev-python/warrant-0.6.1-r1[${PYTHON_USEDEP}]
-	>=dev-python/websocket-client-0.54.0[${PYTHON_USEDEP}]
-	>=dev-python/websockets-7.0[${PYTHON_USEDEP}]
-	~dev-python/xmltodict-0.12.0[${PYTHON_USEDEP}]
-	>=dev-python/yarl-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/zeroconf-0.23.0[${PYTHON_USEDEP}]
-	>=media-libs/mutagen-1.42.0
-
-	androidtv? ( ~dev-python/androidtv-0.0.18[${PYTHON_USEDEP}] )
-	asuswrt? ( ~dev-python/aioasuswrt-1.1.21[${PYTHON_USEDEP}] )
-	atv? ( >=dev-python/pyatv-0.3.12[${PYTHON_USEDEP}] )
-	darksky? ( ~dev-python/python-forecastio-1.4.0[${PYTHON_USEDEP}] )
-	denonavr? ( ~dev-python/denonavr-0.7.9[${PYTHON_USEDEP}] )
-	enigma? ( ~dev-python/openwebifpy-3.1.1[${PYTHON_USEDEP}] )
-	esphome? ( ~dev-python/aioesphomeapi-2.2.0[${PYTHON_USEDEP}] )
-	fronius? ( ~dev-python/PyFronius-0.4.6 )
-	frontend? ( =app-misc/home-assistant-frontend-20190719.0 )
-	growl? ( ~dev-python/gntp-1.0.3[${PYTHON_USEDEP}] )
-	homematic? ( ~dev-python/pyhomematic-0.1.60[${PYTHON_USEDEP}] )
-	hs100? ( >=dev-python/pyHS100-0.3.5[${PYTHON_USEDEP}] )
-	maxcube? ( ~dev-python/maxcube-api-0.1.0[${PYTHON_USEDEP}] )
-	miio? ( ~dev-python/python-miio-0.4.5[${PYTHON_USEDEP}] )
-	mikrotik? ( ~dev-python/librouteros-2.2.0[${PYTHON_USEDEP}] )
-	mqtt? ( ~dev-python/hbmqtt-0.9.4[${PYTHON_USEDEP}]
-			app-misc/mosquitto )
-	musiccast? ( >=dev-python/pymusiccast-0.1.6[${PYTHON_USEDEP}] )
-	mysql? ( || ( dev-python/mysqlclient[${PYTHON_USEDEP}]
-			 dev-python/mysql-python[${PYTHON_USEDEP}] ) )
-	qnap? ( ~dev-python/qnapstats-0.3.0[${PYTHON_USEDEP}] )
-	rxv? ( =dev-python/rxv-0.6.0[${PYTHON_USEDEP}]
-			~dev-python/defusedxml-0.6.0[${PYTHON_USEDEP}] )
-	samsungtv? ( >=dev-python/samsungctl-0.7.1[${PYTHON_USEDEP}] )
-	sma? ( ~dev-python/pysma-0.3.2[${PYTHON_USEDEP}] )
-	sonos? ( >=dev-python/pysonos-0.0.21[${PYTHON_USEDEP}] )
-	speedtest? ( ~net-analyzer/speedtest-cli-2.1.1[${PYTHON_USEDEP}] )
-	ssl? ( 	dev-libs/openssl:0
-			app-crypt/certbot
-			net-proxy/haproxy )
-	tradfri? ( >=dev-python/pytradfri-6.0.1[${PYTHON_USEDEP}]
-		 sys-devel/autoconf:2.69 )
-	vera? ( ~dev-python/pyvera-0.3.2[${PYTHON_USEDEP}] )
-	wemo? ( >=dev-python/pywemo-0.4.34[${PYTHON_USEDEP}] )
-	wink? ( ~dev-python/pubnubsub-handler-1.0.8[${PYTHON_USEDEP}] )
-	wwlln? ( ~dev-python/aiowwlln-1.0.0[${PYTHON_USEDEP}] )
-	zigbee? ( ~dev-python/zigpy-deconz-0.2.1[${PYTHON_USEDEP}]
-			  ~dev-python/zigpy-homeassistant-0.6.1[${PYTHON_USEDEP}]
-			  ~dev-python/bellows-homeassistant-0.8.1[${PYTHON_USEDEP}]
-			  ~dev-python/zha-quirks-0.0.18[${PYTHON_USEDEP}] )
-	zoneminder? ( ~dev-python/zm-py-0.3.3[${PYTHON_USEDEP}] )
-	z-wave? ( ~dev-python/pynacl-1.3.0[${PYTHON_USEDEP}]
-			  ~dev-python/homeassistant-pyozw-0.1.4[${PYTHON_USEDEP}]
-			  ~dev-python/pydispatcher-2.0.5[${PYTHON_USEDEP}]
-			  ~dev-python/cffi-1.12.2[${PYTHON_USEDEP}] )
-"
-
-DEPEND="${RDEPEND}
-		test? (
-				~dev-python/asynctest-0.12.2[${PYTHON_USEDEP}]
-				~dev-python/coveralls-1.2.0[${PYTHON_USEDEP}]
-				~dev-python/flake8-docstrings-1.3.0[${PYTHON_USEDEP}]
-				~dev-python/flake8-3.7.5[${PYTHON_USEDEP}]
-				~dev-python/mock-open-1.3.1[${PYTHON_USEDEP}]
-				dev-python/mock[${PYTHON_USEDEP}]
-				~dev-python/mypy-0.660[${PYTHON_USEDEP}]
-				~dev-python/pydocstyle-3.0.0[${PYTHON_USEDEP}]
-				~dev-python/pylint-2.2.2[${PYTHON_USEDEP}]
-				~dev-python/pytest-aiohttp-0.3.0[${PYTHON_USEDEP}]
-				~dev-python/pytest-cov-2.6.1[${PYTHON_USEDEP}]
-				~dev-python/pytest-sugar-0.9.2[${PYTHON_USEDEP}]
-				~dev-python/pytest-timeout-1.3.3[${PYTHON_USEDEP}]
-				~dev-python/pytest-4.2.1[${PYTHON_USEDEP}]
-				~dev-python/requests-mock-1.5.2[${PYTHON_USEDEP}]
-				dev-python/nose[${PYTHON_USEDEP}]
-				dev-python/coverage[${PYTHON_USEDEP}]
-			   )"
-
-INSTALL_DIR="/opt/${PN}"
-
-DISABLE_AUTOFORMATTING=1
-DOC_CONTENTS="
-The HA interface listens on port 8123
-hass configuration is in: /etc/${PN}
-daemon command line arguments are configured in: /etc/conf.d/${PN}
-logging is to: /var/log/${PN}/{server,errors,stdout}.log
-The sqlite db is by default in: /etc/${PN}
-support at https://git.edevau.net/onkelbeh/HomeAssistantRepository
-"
-
-S="${WORKDIR}/home-assistant-${MY_PV}"
-
-DOCS="README.rst"
-
-pkg_setup() {
-	enewgroup "${PN}"
-	enewuser "${PN}" -1 -1 "$INSTALL_DIR" "${PN}"
-}
-
-src_prepare() {
-	sed -e 's;astral==1.5;astral>=1.5;' \
-		-i "setup.py" \
-		-i homeassistant/package_constraints.txt
-
-	eapply_user
-}
-
-python_install_all() {
-	dodoc ${DOCS}
-	distutils-r1_python_install_all
-
-	keepdir "$INSTALL_DIR"
-
-	keepdir "/etc/${PN}"
-	fowners -R "${PN}:${PN}" "/etc/${PN}"
-
-	keepdir "/var/log/${PN}"
-	fowners -R "${PN}:${PN}" "/var/log/${PN}"
-
-	newconfd "${FILESDIR}/${PN}.conf.d" "${PN}"
-	newinitd "${FILESDIR}/${PN}.init.d" "${PN}"
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotate" "${PN}"
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/app-misc/homeassistant/homeassistant-0.97.0_beta2.ebuild b/app-misc/homeassistant/homeassistant-0.97.0_beta2.ebuild
deleted file mode 100644
index 1a4582563..000000000
--- a/app-misc/homeassistant/homeassistant-0.97.0_beta2.ebuild
+++ /dev/null
@@ -1,269 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors Andreas Billmeier b (at) edevau.net
-# Distributed under the terms of the GNU General Public License v3.0
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit user readme.gentoo-r1 eutils distutils-r1
-
-MY_P=${P/_beta/b}
-MY_PV=${PV/_beta/b}
-
-DESCRIPTION="Open-source home automation platform running on Python 3.6"
-HOMEPAGE="https://home-assistant.io https://git.edevau.net/onkelbeh/HomeAssistantRepository"
-SRC_URI="https://github.com/home-assistant/home-assistant/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-RESTRICT="mirror"
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="abode androidtv asuswrt atv avea buienradar cli ciscomobilityexpress daikin darksky denonavr enigma esphome everlights fronius +frontend growl homematic hpilo hs100 hue maxcube miio mikrotik mqtt musiccast +mysql qnap roku rxv samsungtv sma socat sonos speedtest ssl test tradfri unify vera wemo wink wwlln xknx z-wave zigbee zoneminder"
-
-RDEPEND="${PYTHON_DEPS}
-	!app-misc/homeassistant-bin
-
-	app-admin/logrotate
-	dev-db/sqlite
-	dev-libs/libfastjson
-	>=dev-libs/xerces-c-3.1.4-r1
-	>=dev-libs/xml-security-c-1.7.3
-	~dev-python/aiohttp-3.5.4[${PYTHON_USEDEP}]
-	~dev-python/astral-1.10.1[${PYTHON_USEDEP}]
-	~dev-python/async_timeout-3.0.1[${PYTHON_USEDEP}]
-	~dev-python/attrs-19.1.0[${PYTHON_USEDEP}]
-	~dev-python/bcrypt-3.1.7[${PYTHON_USEDEP}]
-	>=dev-python/certifi-2019.6.16[${PYTHON_USEDEP}]
-	~dev-python/cryptography-2.7[${PYTHON_USEDEP}]
-	~dev-python/importlib-metadata-0.18[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10[${PYTHON_USEDEP}]
-	~dev-python/passlib-1.7.1-r1[${PYTHON_USEDEP}]
-	>=dev-python/pip-8.0.3-r1[${PYTHON_USEDEP}]
-	~dev-python/pyjwt-1.7.1[${PYTHON_USEDEP}]
-	~dev-python/python-slugify-3.0.2[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2019.1[${PYTHON_USEDEP}]
-	~dev-python/pyyaml-5.1.1[${PYTHON_USEDEP}]
-	=dev-python/requests-2.22.0[${PYTHON_USEDEP}]
-	~dev-python/ruamel-yaml-0.15.99[${PYTHON_USEDEP}]
-	~dev-python/voluptuous-0.11.5[${PYTHON_USEDEP}]
-	~dev-python/voluptuous-serialize-2.1.0[${PYTHON_USEDEP}]
-
-	>=app-crypt/acme-0.32.0[${PYTHON_USEDEP}]
-	>=dev-python/aiohttp-cors-0.7.0[${PYTHON_USEDEP}]
-	>=dev-python/asn1crypto-0.24.0[${PYTHON_USEDEP}]
-	~dev-python/beautifulsoup-4.7.1[${PYTHON_USEDEP}]
-	~dev-python/blinkpy-0.14.1[${PYTHON_USEDEP}]
-	>=dev-python/boto3-1.9.16[${PYTHON_USEDEP}]
-	>=dev-python/botocore-1.12.115[${PYTHON_USEDEP}]
-	~dev-python/caldav-0.6.1[${PYTHON_USEDEP}]
-	>=dev-python/cdu-0.1.3[${PYTHON_USEDEP}]
-	~dev-python/cffi-1.12.2[${PYTHON_USEDEP}]
-	>=dev-python/chardet-3.0.4[${PYTHON_USEDEP}]
-	~dev-python/colorlog-4.0.2[${PYTHON_USEDEP}]
-	>=dev-python/coverage-4.5.2[${PYTHON_USEDEP}]
-	>=dev-python/distro-1.4.0[${PYTHON_USEDEP}]
-	~dev-python/docopt-0.6.2[${PYTHON_USEDEP}]
-	>=dev-python/docutils-0.14[${PYTHON_USEDEP}]
-	>=dev-python/ecdsa-0.13[${PYTHON_USEDEP}]
-	>=dev-python/envs-1.3[${PYTHON_USEDEP}]
-	>=dev-python/future-0.17.1[${PYTHON_USEDEP}]
-	~dev-python/gTTS-token-1.1.3[${PYTHON_USEDEP}]
-	~dev-python/hass-nabucasa-0.16[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.8[${PYTHON_USEDEP}]
-	>=dev-python/idna-ssl-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/ifaddr-0.1.6[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.9.4[${PYTHON_USEDEP}]
-	>=dev-python/jose-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/jsonrpc-async-0.6[${PYTHON_USEDEP}]
-	~dev-python/jsonrpc-base-1.0[${PYTHON_USEDEP}]
-	~dev-python/jsonrpc-websocket-0.6[${PYTHON_USEDEP}]
-	>=dev-python/lxml-4.3.3[${PYTHON_USEDEP}]
-	>=dev-python/multidict-4.5.2[${PYTHON_USEDEP}]
-	>=dev-python/netdisco-2.6.0[${PYTHON_USEDEP}]
-	>=dev-python/nose-1.3.7[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.16.4[${PYTHON_USEDEP}]
-	>=dev-python/paho-mqtt-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/pbr-5.1.3[${PYTHON_USEDEP}]
-	~dev-python/pillow-5.4.1[${PYTHON_USEDEP}]
-	>=dev-python/psutil-5.6.3[${PYTHON_USEDEP}]
-	>=dev-python/PyChromecast-3.2.2[${PYTHON_USEDEP}]
-	>=dev-python/pycparser-2.19[${PYTHON_USEDEP}]
-	|| ( >=dev-python/pycryptodome-3.7.3[${PYTHON_USEDEP}] dev-python/pycrypto[${PYTHON_USEDEP}] )
-	~dev-python/pyhaversion-3.0.2[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-19.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pyotp-2.2.7[${PYTHON_USEDEP}]
-	>=dev-python/pyqrcode-1.2.1[${PYTHON_USEDEP}]
-	>=dev-python/pyrfc3339-1.1[${PYTHON_USEDEP}]
-	~dev-python/pysnmp-4.4.9[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.7.5[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.8.0[${PYTHON_USEDEP}]
-	>=dev-python/python-jose-cryptodome-1.3.2[${PYTHON_USEDEP}]
-	>=dev-python/requests-toolbelt-0.9.1[${PYTHON_USEDEP}]
-	=dev-python/RestrictedPython-4.0_beta8[${PYTHON_USEDEP}]
-	~dev-python/setuptools-40.8.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.12.0[${PYTHON_USEDEP}]
-	~dev-python/sqlalchemy-1.3.5[${PYTHON_USEDEP}]
-	~dev-python/transitions-0.6.9[${PYTHON_USEDEP}]
-	>=dev-python/typing-3.6.4-r1[${PYTHON_USEDEP}]
-	~dev-python/tzlocal-1.5.1[${PYTHON_USEDEP}]
-	>=dev-python/ua-parser-0.8.0[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.25.3[${PYTHON_USEDEP}]
-	>=dev-python/user-agents-2.0[${PYTHON_USEDEP}]
-	>=dev-python/vobject-0.9.6.1[${PYTHON_USEDEP}]
-	>=dev-python/wakeonlan-1.1.6[${PYTHON_USEDEP}]
-	=dev-python/warrant-0.6.1-r1[${PYTHON_USEDEP}]
-	>=dev-python/websocket-client-0.54.0[${PYTHON_USEDEP}]
-	>=dev-python/websockets-7.0[${PYTHON_USEDEP}]
-	~dev-python/xmltodict-0.12.0[${PYTHON_USEDEP}]
-	>=dev-python/yarl-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/zeroconf-0.23.0[${PYTHON_USEDEP}]
-	>=media-libs/mutagen-1.42.0
-
-	abode? ( ~dev-python/abodepy-0.15.0[${PYTHON_USEDEP}] )
-	androidtv? ( ~dev-python/androidtv-0.0.18[${PYTHON_USEDEP}] )
-	asuswrt? ( ~dev-python/aioasuswrt-1.1.21[${PYTHON_USEDEP}] )
-	atv? ( >=dev-python/pyatv-0.3.12[${PYTHON_USEDEP}] )
-	avea? ( =dev-python/avea-1.2.8[${PYTHON_USEDEP}] )
-	buienradar? ( ~dev-python/buienradar-1.0.1[${PYTHON_USEDEP}] )
-	cli? ( app-misc/home-assistant-cli[${PYTHON_USEDEP}] )
-	ciscomobilityexpress? ( ~dev-python/ciscomobilityexpress-0.3.1[${PYTHON_USEDEP}] )
-	daikin? ( ~dev-python/pydaikin-1.6.1[${PYTHON_USEDEP}] )
-	darksky? ( ~dev-python/python-forecastio-1.4.0[${PYTHON_USEDEP}] )
-	denonavr? ( ~dev-python/denonavr-0.7.9[${PYTHON_USEDEP}] )
-	enigma? ( ~dev-python/openwebifpy-3.1.1[${PYTHON_USEDEP}] )
-	esphome? ( dev-embedded/esphome
-			   ~dev-python/aioesphomeapi-2.2.0[${PYTHON_USEDEP}] )
-	everlights? ( ~dev-python/pyeverlights-0.1.0[${PYTHON_USEDEP}] )
-	fronius? ( ~dev-python/PyFronius-0.4.6[${PYTHON_USEDEP}] )
-	frontend? ( =app-misc/home-assistant-frontend-20190804.0[${PYTHON_USEDEP}] )
-	growl? ( ~dev-python/gntp-1.0.3[${PYTHON_USEDEP}] )
-	hpilo? ( ~dev-python/python-hpilo-4.3[${PYTHON_USEDEP}] )
-	homematic? ( ~dev-python/pyhomematic-0.1.60[${PYTHON_USEDEP}] )
-	hs100? ( >=dev-python/pyHS100-0.3.5[${PYTHON_USEDEP}] )
-	hue? ( ~dev-python/aiohue-1.9.1[${PYTHON_USEDEP}] )
-	maxcube? ( ~dev-python/maxcube-api-0.1.0[${PYTHON_USEDEP}] )
-	miio? ( ~dev-python/python-miio-0.4.5[${PYTHON_USEDEP}] )
-	mikrotik? ( ~dev-python/librouteros-2.2.0[${PYTHON_USEDEP}] )
-	mqtt? ( ~dev-python/hbmqtt-0.9.4[${PYTHON_USEDEP}]
-			app-misc/mosquitto )
-	musiccast? ( >=dev-python/pymusiccast-0.1.6[${PYTHON_USEDEP}] )
-	mysql? ( || ( dev-python/mysqlclient[${PYTHON_USEDEP}]
-			 dev-python/mysql-python[${PYTHON_USEDEP}] )
-			 virtual/mysql )
-	qnap? ( ~dev-python/qnapstats-0.3.0[${PYTHON_USEDEP}] )
-	roku? ( ~dev-python/roku-3.1[${PYTHON_USEDEP}] )
-	rxv? ( =dev-python/rxv-0.6.0[${PYTHON_USEDEP}]
-			~dev-python/defusedxml-0.6.0[${PYTHON_USEDEP}] )
-	samsungtv? ( >=dev-python/samsungctl-0.7.1[${PYTHON_USEDEP}] )
-	sma? ( ~dev-python/pysma-0.3.2[${PYTHON_USEDEP}] )
-	socat? ( net-misc/socat )
-	sonos? ( >=dev-python/pysonos-0.0.22[${PYTHON_USEDEP}] )
-	speedtest? ( ~net-analyzer/speedtest-cli-2.1.1[${PYTHON_USEDEP}] )
-	ssl? ( 	dev-libs/openssl:0
-			app-crypt/certbot
-			net-proxy/haproxy )
-	tradfri? ( >=dev-python/pytradfri-6.0.1[${PYTHON_USEDEP}]
-		 sys-devel/autoconf:2.69 )
-	unify? ( ~dev-python/aiounify-9[${PYTHON_USEDEP}] )
-	vera? ( ~dev-python/pyvera-0.3.2[${PYTHON_USEDEP}] )
-	wemo? ( >=dev-python/pywemo-0.4.34[${PYTHON_USEDEP}] )
-	wink? ( ~dev-python/pubnubsub-handler-1.0.8[${PYTHON_USEDEP}] )
-	wwlln? ( ~dev-python/aiowwlln-1.0.0[${PYTHON_USEDEP}] )
-	xknx? ( ~dev-python/xknx-0.11.1[${PYTHON_USEDEP}] )
-	zigbee? ( ~dev-python/zigpy-deconz-0.2.1[${PYTHON_USEDEP}]
-			  ~dev-python/zigpy-homeassistant-0.7.0[${PYTHON_USEDEP}]
-			  ~dev-python/bellows-homeassistant-0.9.0[${PYTHON_USEDEP}]
-			  ~dev-python/zha-quirks-0.0.20[${PYTHON_USEDEP}] )
-	zoneminder? ( ~dev-python/zm-py-0.3.3[${PYTHON_USEDEP}] )
-	z-wave? ( ~dev-python/pynacl-1.3.0[${PYTHON_USEDEP}]
-			  ~dev-python/homeassistant-pyozw-0.1.4[${PYTHON_USEDEP}]
-			  ~dev-python/pydispatcher-2.0.5[${PYTHON_USEDEP}]
-			  ~dev-python/cffi-1.12.2[${PYTHON_USEDEP}] )
-"
-
-DEPEND="${RDEPEND}
-		test? (
-				~dev-python/asynctest-0.12.2[${PYTHON_USEDEP}]
-				~dev-python/coveralls-1.2.0[${PYTHON_USEDEP}]
-				~dev-python/flake8-docstrings-1.3.0[${PYTHON_USEDEP}]
-				~dev-python/flake8-3.7.5[${PYTHON_USEDEP}]
-				~dev-python/mock-open-1.3.1[${PYTHON_USEDEP}]
-				dev-python/mock[${PYTHON_USEDEP}]
-				~dev-python/mypy-0.660[${PYTHON_USEDEP}]
-				~dev-python/pydocstyle-3.0.0[${PYTHON_USEDEP}]
-				~dev-python/pylint-2.2.2[${PYTHON_USEDEP}]
-				~dev-python/pytest-aiohttp-0.3.0[${PYTHON_USEDEP}]
-				~dev-python/pytest-cov-2.6.1[${PYTHON_USEDEP}]
-				~dev-python/pytest-sugar-0.9.2[${PYTHON_USEDEP}]
-				~dev-python/pytest-timeout-1.3.3[${PYTHON_USEDEP}]
-				~dev-python/pytest-4.2.1[${PYTHON_USEDEP}]
-				~dev-python/requests-mock-1.5.2[${PYTHON_USEDEP}]
-				dev-python/nose[${PYTHON_USEDEP}]
-				dev-python/coverage[${PYTHON_USEDEP}]
-			   )"
-
-INSTALL_DIR="/opt/${PN}"
-
-DISABLE_AUTOFORMATTING=1
-DOC_CONTENTS="
-The HA interface listens on port 8123
-hass configuration is in: /etc/${PN}
-daemon command line arguments are configured in: /etc/conf.d/${PN}
-logging is to: /var/log/${PN}/{server,errors,stdout}.log
-The sqlite db is by default in: /etc/${PN}
-support at https://git.edevau.net/onkelbeh/HomeAssistantRepository
-"
-
-S="${WORKDIR}/home-assistant-${MY_PV}"
-
-DOCS="README.rst"
-
-pkg_setup() {
-	enewgroup "${PN}"
-	enewuser "${PN}" -1 -1 "$INSTALL_DIR" "${PN}"
-}
-
-src_prepare() {
-	sed -e 's;astral==1.5;astral>=1.5;' \
-		-i "setup.py" \
-		-i homeassistant/package_constraints.txt
-
-	eapply_user
-}
-
-python_install_all() {
-	dodoc ${DOCS}
-	distutils-r1_python_install_all
-
-	keepdir "$INSTALL_DIR"
-
-	keepdir "/etc/${PN}"
-	fowners -R "${PN}:${PN}" "/etc/${PN}"
-
-	keepdir "/var/log/${PN}"
-	fowners -R "${PN}:${PN}" "/var/log/${PN}"
-
-	newconfd "${FILESDIR}/${PN}.conf.d" "${PN}"
-	newinitd "${FILESDIR}/${PN}.init.d" "${PN}"
-
-	if use socat ; then
-	   newinitd "${FILESDIR}/socat-zwave.init.d" "socat-zwave"
-	fi
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotate" "${PN}"
-
-	dobin "${FILESDIR}/hasstest"
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-	if use mqtt ; then
-	   sed -i -e 's/# need mosquitto/need mosquitto/g' "/etc/init.d/${PN}"
-	fi
-	if use socat ; then
-	   sed -i -e 's/# need socat-zwave/need socat-zwave/g' "/etc/init.d/${PN}"
-	fi
-
-}