Merge branch 'master' into master

2019-06-21 16:35:51 +02:00 · 2019-06-21 16:35:51 +02:00 · a51105420d
commit a51105420d
parent 798bdbfce3 f558818e97
23 changed files with 332 additions and 280 deletions
--- a/README.md
+++ b/README.md
@ -15,7 +15,7 @@ Aside from Home Assistant it contains some related ebuilds I use with my Home As
 * esphome (soon i'll throw away Tasmota...)
 * platformio

-Currently it is not possible to use esphome on the same machine with homeassistant, caused by `dev-python/pyyaml`. esphome only runs with `5.1`, homassitant insists on `3.13`.
+Since `homeassistant-0.95.0_beta0` `esphome-1.13.6` can be run again in the same environment with homeassistant, homeassistant does not insist on `dev-python/pyyaml-3.13` anymore.

 If you have questions or suggestions don't hesitate to contact me...

@ -63,6 +63,11 @@ Let me know if any initial depencies are missing, since i do not use all of the
 I have Home Assistant running on a virtual X64 box, 4GB RAM, 4 Cores of an older Xeon E5-2630 v2 @ 2.60GHz and 10GB Disk from a small FC SAN (HP MSA). Recorder writes to a separate mariadb machine.

 Most of my devices are connected via Eclipse Mosquitto (https://mosquitto.org/), i use the stable version coming with the original distribution (1.5.6), no SSL inside my isolated IOT Vlan, so no need to upgrade. Along MQTT i am actively using (and therefore testing) the following platforms/components:
+* some (~9) Z-Wave devices, mostly Fibaro Roller Shutter 3 with a ZMEEUZB1 Stick connected to my VM with ser2net, socat & OpenZWave.
+  - in the vm run `socat pty,link=/dev/ttyUSB0,raw,user=homeassistant,group=dialout,mode=777 tcp:172.16.3.199:3333`
+  - at the usbport run `ser2net` with `3333:raw:0:/dev/ttyACM0:115200 8DATABITS NONE 1STOPBIT`
+* a bunch of OneWire and I2C Sensors (mostly all via MQTT) and
+* ESPEasy (https://www.letscontrolit.com/wiki/index.php/ESPEasy)
 * Sonoff/Tasmota (mostly via MQTT) (https://github.com/arendst/Sonoff-Tasmota)
  * Sonoff S20
  * Sonoff Pow R2
@ -71,8 +76,6 @@ Most of my devices are connected via Eclipse Mosquitto (https://mosquitto.org/),
  * Sonoff RF Bridge with remote Swiches 
  * Sonoff Touch
  * Sonoff Basic (not working well with Tasmota)
-* a bunch of OneWire and I2C Sensors (mostly all via MQTT) and
-* ESPEasy (https://www.letscontrolit.com/wiki/index.php/ESPEasy)
 * some more HC-SR501 PIR Sensors (via ESPEasy, Tasmota & MQTT)
 * Yamaha RXV (4 devices)
 * SamsungTV (partly _not_ working anymore due to Samsungs newest firmware 'improvements')
--- a/app-misc/home-assistant-frontend/Manifest
+++ b/app-misc/home-assistant-frontend/Manifest
@ -1,11 +1,11 @@
-DIST home-assistant-frontend-20190530.0.tar.gz 14988340 BLAKE2B 713ac2ae64e68d85a5ab8c51fd303d97f42ecc036402fa561669e71f5811c175e55816604b1247668b5a0497c3615d5224b74096c6a12f74aafbf3e101998421 SHA512 bb9a56c6863d2cde84ce0de475cd86099b1c3df41135de036f7195be578fe9e2db87c37be6459d958f0afd50d3c4f557d8247fdcf198795a70116fc67d53d000
 DIST home-assistant-frontend-20190601.0.tar.gz 15029237 BLAKE2B fbf68c867efbbde25f51da62f31f8d2fb96dbdb440356d44a76d8cfaca4631115f24479f61a85659f25560f49bdc06586fcf91ca09319c3a7c130b4352136fd9 SHA512 4f69c57ed911dcfa0966dc38441ea95249ef8bb6e4a115442377d7e173357f75ea3309b3caf90221dc1db6a59f1b766c4a24074ef06c43fcc28c488fcf3df283
 DIST home-assistant-frontend-20190602.0.tar.gz 15020827 BLAKE2B b414b07091dcfa402334dc98c636628c42eb758f294036f7678be5644973dd25c16276285841106fd773b28bcd41c0daa3cf08f3d1b67571939dce49b351ebb4 SHA512 86693129ef5b2088b0bc34fb02833ee67b6d36f645998b0597b10086606579d67974234ca540cc982da4a6ae3ce4faaefc410defeb28941b1afb05d233009e28
 DIST home-assistant-frontend-20190604.0.tar.gz 15024185 BLAKE2B cd075478aba65a231cd344febcdb0c7bb498abc499557ab76a1337cb9ec1b5e1eaecc704791f9151baf9f6f99e2c658c008578854a73532e99976dbc0a8bae0f SHA512 7435c37f7d903f21c50429b484a4236e66e228c1749ae56c1d9043922b233c212ae5e4a95e1a4848f0d4e0041102e708701ad7e90ed5522fdc176d5c9d938e5b
 DIST home-assistant-frontend-20190614.0.tar.gz 15038836 BLAKE2B 551c6d57dc5e0ab87bd098f33402750ebca3e0b9e2da9a45eb7b00e560f0faa2363765aedfb73f8e9cb090253bf9b277de1f264e3049b14c0fa7fea1d69e7000 SHA512 596bafb8f3c4f1bf0868ce89700cc5e01df74c26395d0d5a4feb9a4e68b3467de9e87a65eaca3bc2dcffc397c0f4d60dd4a8290eada1518e0fb2319bae313992
-EBUILD home-assistant-frontend-20190530.0.ebuild 784 BLAKE2B ad29ce3f053da300de396367f2edd0bf4755cd0a949bb03204740b8b9ad5cca10e0ee65f2b7bbf44432aebf92019e600151f9758d64cc88a5d54080a7335e65b SHA512 8e3f273abd6bf50e46849bb181d05519346401e80fc52a95466ec399a283d451b8d8c72e58618f917973828d0de8ad09b27cb5ad82a360c24d0285072e42a262
+DIST home-assistant-frontend-20190619.0.tar.gz 15064637 BLAKE2B 8c0c130684f31e3be2382cde41d2d56faa809a528afc4a90979c966ebdbf362135eaf2e332d5b8ec92d412fe40baee4519d886701326697c15283fc6e207c3a5 SHA512 0651f6e50d49255408914c45b2caacbb574cc75932ff8a182f6ef4aec50a0ed0660b4157d56e07a42dcb731a26991e45f15d187db9db69a6e77b45c8007ce922
 EBUILD home-assistant-frontend-20190601.0.ebuild 784 BLAKE2B ad29ce3f053da300de396367f2edd0bf4755cd0a949bb03204740b8b9ad5cca10e0ee65f2b7bbf44432aebf92019e600151f9758d64cc88a5d54080a7335e65b SHA512 8e3f273abd6bf50e46849bb181d05519346401e80fc52a95466ec399a283d451b8d8c72e58618f917973828d0de8ad09b27cb5ad82a360c24d0285072e42a262
 EBUILD home-assistant-frontend-20190602.0.ebuild 784 BLAKE2B ad29ce3f053da300de396367f2edd0bf4755cd0a949bb03204740b8b9ad5cca10e0ee65f2b7bbf44432aebf92019e600151f9758d64cc88a5d54080a7335e65b SHA512 8e3f273abd6bf50e46849bb181d05519346401e80fc52a95466ec399a283d451b8d8c72e58618f917973828d0de8ad09b27cb5ad82a360c24d0285072e42a262
 EBUILD home-assistant-frontend-20190604.0.ebuild 784 BLAKE2B ad29ce3f053da300de396367f2edd0bf4755cd0a949bb03204740b8b9ad5cca10e0ee65f2b7bbf44432aebf92019e600151f9758d64cc88a5d54080a7335e65b SHA512 8e3f273abd6bf50e46849bb181d05519346401e80fc52a95466ec399a283d451b8d8c72e58618f917973828d0de8ad09b27cb5ad82a360c24d0285072e42a262
 EBUILD home-assistant-frontend-20190614.0.ebuild 784 BLAKE2B ad29ce3f053da300de396367f2edd0bf4755cd0a949bb03204740b8b9ad5cca10e0ee65f2b7bbf44432aebf92019e600151f9758d64cc88a5d54080a7335e65b SHA512 8e3f273abd6bf50e46849bb181d05519346401e80fc52a95466ec399a283d451b8d8c72e58618f917973828d0de8ad09b27cb5ad82a360c24d0285072e42a262
+EBUILD home-assistant-frontend-20190619.0.ebuild 784 BLAKE2B ad29ce3f053da300de396367f2edd0bf4755cd0a949bb03204740b8b9ad5cca10e0ee65f2b7bbf44432aebf92019e600151f9758d64cc88a5d54080a7335e65b SHA512 8e3f273abd6bf50e46849bb181d05519346401e80fc52a95466ec399a283d451b8d8c72e58618f917973828d0de8ad09b27cb5ad82a360c24d0285072e42a262
 MISC metadata.xml 492 BLAKE2B 43ba5d3e567d6e96c2d500e5962d6670f0f6e8548303d743d5ce5838fec4ba0cb6e546d18ff7f72ab6d38a92f7b213f3c223f6646ad13effd817c6a142edbd7c SHA512 403bfcc4cf0b7df751832554e4b830be1731f491fe7c2ff0f338047a1a89e93264560280b56acc958404572f5d41ef1bc9e547625a3cc760183192da02226499
--- a/app-misc/home-assistant-frontend/home-assistant-frontend-20190619.0.ebuild
+++ b/app-misc/home-assistant-frontend/home-assistant-frontend-20190619.0.ebuild
--- a/app-misc/homeassistant/Manifest
+++ b/app-misc/homeassistant/Manifest
@ -5,18 +5,16 @@ AUX homeassistant.service 261 BLAKE2B 54819aa30aa5564aca693fa2dd70ad4a9831929a33
 AUX recorder.yaml 114 BLAKE2B af04840805aa13124208584e7f1d40335905a083ee7deead5c0e4324c969f2a231c801c23e42075782950aba7535496d92747bf03efd73a80b0d07e8492d18f6 SHA512 cb4e353e54fb6dc7034569b8d62ddcdca92680c23c2c4e1ce707d21cf95e93f41a0c44521d8c3ee90b68c830f6b8e65dab82ae64bfa09727ae384550f7de0c94
 AUX update-homeassistant 1326 BLAKE2B 917bdd332c4e5dea5177eecd11a7f8d72b911fddfdc8e5eb54960c526fe8c735e20d44e570cf7aeb99669d2a9670c70da1c5fbc30efb284d1f0f330799de6e24 SHA512 3c05f0d6d1bde0e1526c3e679568794c07091e7856dfd8793e13feec6f22725ddaa3163ca2c81d9df86cf73573f932e561743f05de420b350a0b68f6a9582aca
 AUX yamaha.py 13403 BLAKE2B e073c1e3d4bab02e93e971cb6003705e5e82d20524204ed00f5cd4d0f8f1628419a3a0c8a50ce2e2e13a57017607e5543cfed49a3241de549c572c2012c044d7 SHA512 be6ab79a49c47ad15642ac06adc194318a2ae812cdeffa442e32303b7865b1589383386d84f57b50e942b850ffe68c1ce208d0a4c5bb70fee14f39ea77d01ef4
-DIST homeassistant-0.93.1.tar.gz 3977052 BLAKE2B 5909804f561b41c3d422181e83e1f9834ede6837bdf2085279bd98f604b2223e5c58d40ef4a7dd8358aa66c15d25ddf9435cf8837bb8063ee035cc619f7ffd60 SHA512 df481d762bc2e758f214d497f49ecc5d3e7b89f41320a5a1b4eb6d39e0898dfcba11676ff60194a2ab0428c2fefc622da450c25647badc0cc3bd002d305ab5a7
 DIST homeassistant-0.93.2.tar.gz 3976895 BLAKE2B 80b075c3dfc6b1416157fa78fd4d41e6b00b24f2fc5f673238c4be29e767791dbfaffc224cac01d3b0b152eee59a14f1c3ba8b9097adf51d96b66ba05225ca51 SHA512 d1313cf05349f06f8ea7dcbcb8c2702528e184f7b099fc0bbba9a4dce05d6a155f952d495c7136d0263f69a15a9aa2c043a310eb6f29d2d4d66b2955b1e557d8
-DIST homeassistant-0.94.0.tar.gz 4025357 BLAKE2B 284c9d4aafe8643c2456809bc3324d821f6630bed48d88ffe7119180a6c911d7bb2480a8d9bccf2ad0209e0e2d46d38b929360141dd05aa54108a6be8b26af39 SHA512 0060a991b22efc452dce570e528d82e9389ab02ed61c92d5b4e73f14b2903aa75e7d458e854ba94993a8acb7376642fc1bb4a66c0d73914760d030de85d71738
-DIST homeassistant-0.94.0b6.tar.gz 4025367 BLAKE2B 68fa140de0ea07b16783f8e777f2822091da10aff19a81edb7ffda977c201993cc1844db342600457e3277e9103b375b4433e402d3d531df579f903d7d8f36b6 SHA512 fd6993b88bc54133835152473689c87b3609b79c322128d70a352d2bcd858a843a7952f9f041dcead84ff800c0ba2e0a7c6d8efcb7f595ebd9c6d9a3e6ec6afe
 DIST homeassistant-0.94.1.tar.gz 4026704 BLAKE2B 83fbbeca20d66612800d4953f76bf62cdc88e7679259a08e017d1ec1bd36cf7fd6f9118c2330b6c476a95f65be484c211afc35030cee0c0f0916f30a57257df4 SHA512 3d736a6bbd8841c5f493e05cbac336051602c17487df05c4b9f5b4c6ced02caec889e918d3cf52e0132df9a94fa0701b107259d0b66a28eff3c67276212719f7
 DIST homeassistant-0.94.2.tar.gz 4027938 BLAKE2B de8f6c594dd44bec03d413313323247eb1b6cae9615747453f6ddbf6cf8d9dacdac26474f31258c113df92aaefa08ce9214f38759b37420053802dc1ed939fe7 SHA512 acc239c1f60cfa625e8e7941def150c244d8ff4452008a72d758ba7cdc2f206809cd97986c0409d636ea7b4a838bc122efaaf18f9b2cd07373f29d5de08e0421
 DIST homeassistant-0.94.3.tar.gz 4027959 BLAKE2B a2c706bdc8927f0d974e5a8964f89a5c934a2761d42a1d18068838e087ecbd67adc847f5d0531c60c2bce9a4ee63964e307ac04285f5f390f7d9c6da75d3f88c SHA512 b69334533c1945363f620d0d6eece6c5e5fec90c893c543cd662e7b13fd84376c7f6e881643c3d6fc48243871ba028ff0d99403eaf41ae093e7e44d67ef2dddb
-EBUILD homeassistant-0.93.1.ebuild 8674 BLAKE2B 42d6f0ca8dca06f75b1cf53242649b72249f1d21cec31a58cf4de0bb979a883fb7e0290c799d1d7aebe27d3dc0ccdf0ef58004f53d690c3ae6d0fd5f5fb88e47 SHA512 257e54e7dc94c117bf7a82537f28d18e5f361e3ceaa92e74611439b45afff36ff219143c417a0abd711b37ccba875f2364616901c43e4e05caaf392380c6200d
+DIST homeassistant-0.94.4.tar.gz 4030369 BLAKE2B 1e1719e871128f5fd4919a93d8392fd60ab2245e8d86235c00a4912305467bf2c2ecd2761f50852e88a9b50edfda7b35d1ad089b8169ef52763fdd77660f33a0 SHA512 eaa95957165debe65930daeac4fae60b17133163bb60e77343852f645ee32782b71132593475aeca5047a134aa5c177a5c8ca2f49f00e47443d06eb8008581f5
+DIST homeassistant-0.95.0b0.tar.gz 4114941 BLAKE2B 3aee859d7d31ebe94fff8c2cd77ed0a1e3328c4e5ed8176e0f2ed2115bfc67aea864948fdcf8d5bd8f3009e5602703080e25d09f5d9161f9f836b5ce09e30164 SHA512 7e870a4d9f6701fe6b2e1b84fe960358977b0af6e8e7bb80fded894782fb45e4e79968b6a478f37b58d543ccdfe9d1a40581eb9489f49672ecf66a84ad147eb0
 EBUILD homeassistant-0.93.2.ebuild 8674 BLAKE2B 606b057f8c5eb8108440ac35c813e2bf0810ee9e0dadad574d83abcb4a01fbf1392c2152ff3f50052893584e44fa0859f31730386badfc621fc0980c7df0c444 SHA512 bf3d04dd81b21604f8fbeaa87d487187764351334ede2b7d5248046f2c480a396bdb5d973122d8d354de5ce51b4e254d3d2c6ecb0ba57249ccd57b337e1842c0
-EBUILD homeassistant-0.94.0.ebuild 8785 BLAKE2B cf6b0d1263d8083733092e75876f2be4eac6592196dd6c1fde8256c75f790f197788e0692ffa83073afb4561c7c6bbe7bae6beaf76c277fad4b86c1c97fa8cb2 SHA512 2f23151141d38f642402ade427fea9cf22dbdce4a8aad538c0507ff6ede7ec3115bae510ff66ceec3ca2cfe0941623eaa79414a5130774684ae14fcda42f966d
-EBUILD homeassistant-0.94.0_beta6.ebuild 8726 BLAKE2B 36aff5d0e86d8bbabb865f5267c80986af9e6d4688682d5e7ac560e288384649ab9e6ffcde941b6db7b4453c2bf335ca8a9d6def470624a1852588f5ac951540 SHA512 c4b3e04d68f7a9d1793acf3b44d05d44298e0b20aaee84a0fee534a348f114e56310fc3c178556cb5e79e5b4ac56d0fba1630649752e6e28391e975a59d2275c
 EBUILD homeassistant-0.94.1.ebuild 8855 BLAKE2B a83cd57ff7c8f8dfe01c2e5895e35f3278f46603506d2cb5f2230498e7e4772732b99eaf8e0f49a0afb5e608535b4104dec8bad0f4d956fe9f0937bc2beeae5b SHA512 16ba1da0f8fc02e4a3387595086944d51ac81d82ae8b477bccb070faa1e03c514ad993bac3d016ac299f37249ec57d491e04aef1ef182671830b3f4dcf7580c7
 EBUILD homeassistant-0.94.2.ebuild 8855 BLAKE2B a83cd57ff7c8f8dfe01c2e5895e35f3278f46603506d2cb5f2230498e7e4772732b99eaf8e0f49a0afb5e608535b4104dec8bad0f4d956fe9f0937bc2beeae5b SHA512 16ba1da0f8fc02e4a3387595086944d51ac81d82ae8b477bccb070faa1e03c514ad993bac3d016ac299f37249ec57d491e04aef1ef182671830b3f4dcf7580c7
 EBUILD homeassistant-0.94.3.ebuild 8919 BLAKE2B 14c0e728953103f7ba335f26012695ccc6207103dacdf9ca8b24663ab01f9b9ea8c9b5de09e5fe17a123045502ac3fceadf784a24e719c9af5e0ce39e311ad55 SHA512 55dd89fd7968163bed91a339920abc4611a2580c09a1d678d10540934db801b6d6208e3d11adc30c248acc540df0c1071b21ff3e3798d44bdcc85a00854b462a
-MISC metadata.xml 2059 BLAKE2B f84eaa9ed1ec757093d29ffb5d0fb48e4b8df01469931b1a94b8a88dab73268ad4800a5d326e15bf5a663432d3b17f4a876583d3c7bc5321a08770a6c95cecfa SHA512 3bfa4c424f5225d01f7e408c66de5efb24aee5ff6e9076cc1c12b20bf28f90176842db3c77d75c1195a7634620a19196fdd57adac1bee3636ad95d2f26cb5a6a
+EBUILD homeassistant-0.94.4.ebuild 8855 BLAKE2B 08e95341a7ad83f97a852c0cc5a00c7d5540cddbc1e54139f635ef9fb275772b67dd4bf282f8028ff6b147f922c5bc0be86e341cddeedd662354c200cd609907 SHA512 0001c2d4bbf714e26d40c5b06d01a7fc8ee07acdf95668e6bca27c62263c44e85c9ea5ad429ebc79b65ebdf7af0b4fd8f37d6f38812a7d2e982c4545023da286
+EBUILD homeassistant-0.95.0_beta0.ebuild 8934 BLAKE2B af8a54efdb23e934ab57d82750c3754dbc7f2946c6f763fbdb4119321c03504f35707c97b6d2a231dd20063e5810847a7af52d108ee1bbf9fff2790fe40a5462 SHA512 c926bbd19ea88225bcd88377bce41d51a3e79c19e5e66c1aa00c60f418e54fc23e96586a5c7a39bd5d877257122cd3bbf28d2c1ea535df0f806a11fabde923e4
+MISC metadata.xml 2061 BLAKE2B 485861172d10dc02984d99bb60241005ac968179795ade6efd5513f148944b8f681a253093fe4aec9a8056f93bf08fc0c8dbd1994b6530b2ce946e87b9bac3ae SHA512 819f3ea980f1439ca1344b420a963866a90c5c6eacc7cb8ce12dc76c13038fff91bccfe14d484db357faa5704ba59869002f97beacd70e46bcc6841adf7be1c0
--- a/app-misc/homeassistant/homeassistant-0.93.1.ebuild
+++ b/app-misc/homeassistant/homeassistant-0.93.1.ebuild
@ -1,224 +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 denonavr esphome enigma +frontend homematic hs100 maxcube mikrotik musiccast mysql mqtt qnap rxv samsungtv sonos ssl speedtest test tradfri wemo 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.6[${PYTHON_USEDEP}]
-	>=dev-python/certifi-2019.3.9[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10[${PYTHON_USEDEP}]
-	~dev-python/pyjwt-1.7.1[${PYTHON_USEDEP}]
-	~dev-python/cryptography-2.6.1[${PYTHON_USEDEP}]
-	~dev-python/passlib-1.7.1-r1[${PYTHON_USEDEP}]
-	>=dev-python/pip-8.0.3-r1[${PYTHON_USEDEP}]
-	~dev-python/python-slugify-3.0.2[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2019.1[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.13[${PYTHON_USEDEP}]
-	<dev-python/pyyaml-4[${PYTHON_USEDEP}]
-	=dev-python/requests-2.21.0-r1[${PYTHON_USEDEP}]
-	~dev-python/ruamel-yaml-0.15.94[${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/asn1crypto-0.24.0[${PYTHON_USEDEP}]
-	~dev-python/cffi-1.12.2[${PYTHON_USEDEP}]
-	>=dev-python/jmespath-0.9.4[${PYTHON_USEDEP}]
-	>=dev-python/pycparser-2.19[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-19.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.8.0[${PYTHON_USEDEP}]
-	>=dev-python/pbr-5.1.3[${PYTHON_USEDEP}]
-	>=dev-python/requests-toolbelt-0.9.1[${PYTHON_USEDEP}]
-	>=dev-python/six-1.12.0[${PYTHON_USEDEP}]
-	~dev-python/snitun-0.15[${PYTHON_USEDEP}]
-	>=dev-python/pyrfc3339-1.1[${PYTHON_USEDEP}]
-	~dev-python/hass-nabucasa-0.11[${PYTHON_USEDEP}]
-
-	>=dev-python/aiohttp-cors-0.7.0[${PYTHON_USEDEP}]
-	~dev-python/beautifulsoup-4.7.1[${PYTHON_USEDEP}]
-	~dev-python/blinkpy-0.13.1[${PYTHON_USEDEP}]
-	>=dev-python/boto3-1.9.116[${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/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/idna-2.8[${PYTHON_USEDEP}]
-	>=dev-python/idna-ssl-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/ifaddr-0.1.6[${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.3[${PYTHON_USEDEP}]
-	>=dev-python/paho-mqtt-1.4.0[${PYTHON_USEDEP}]
-	~dev-python/pillow-5.4.1[${PYTHON_USEDEP}]
-	>=dev-python/psutil-5.6.2[${PYTHON_USEDEP}]
-	>=dev-python/PyChromecast-3.2.1[${PYTHON_USEDEP}]
-	|| ( >=dev-python/pycryptodome-3.7.3[${PYTHON_USEDEP}] dev-python/pycrypto[${PYTHON_USEDEP}] )
-	>=dev-python/pyotp-2.2.7[${PYTHON_USEDEP}]
-	>=dev-python/pyqrcode-1.2.1[${PYTHON_USEDEP}]
-	~dev-python/pysnmp-4.4.9[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.7.5[${PYTHON_USEDEP}]
-	>=dev-python/python-jose-cryptodome-1.3.2[${PYTHON_USEDEP}]
-	=dev-python/RestrictedPython-4.0_beta8[${PYTHON_USEDEP}]
-	~dev-python/setuptools-40.8.0[${PYTHON_USEDEP}]
-	~dev-python/sqlalchemy-1.3.3[${PYTHON_USEDEP}]
-	>=dev-python/typing-3.6.4-r1[${PYTHON_USEDEP}]
-	~dev-python/transitions-0.6.9[${PYTHON_USEDEP}]
-	~dev-python/tzlocal-1.5.1[${PYTHON_USEDEP}]
-	>=dev-python/ua-parser-0.8.0[${PYTHON_USEDEP}]
-	>=dev-python/urllib3-1.24.2[${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/websockets-7.0[${PYTHON_USEDEP}]
-	>=dev-python/websocket-client-0.54.0[${PYTHON_USEDEP}]
-	~dev-python/xmltodict-0.12.0[${PYTHON_USEDEP}]
-	>=dev-python/yarl-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/zeroconf-0.22.0[${PYTHON_USEDEP}]
-	>=media-libs/mutagen-1.42.0
-	atv? ( >=dev-python/pyatv-0.3.12[${PYTHON_USEDEP}] )
-	esphome? ( ~dev-python/aioesphomeapi-2.0.1[${PYTHON_USEDEP}] )
-	enigma? ( ~dev-python/openwebifpy-3.1.1[${PYTHON_USEDEP}] )
-	androidtv? ( ~dev-python/androidtv-0.0.15[${PYTHON_USEDEP}] )
-	hs100? ( >=dev-python/pyHS100-0.3.5[${PYTHON_USEDEP}] )
-	maxcube? ( ~dev-python/maxcube-api-0.1.0[${PYTHON_USEDEP}] )
-	mikrotik? ( ~dev-python/librouteros-2.2.0[${PYTHON_USEDEP}] )
-	musiccast? ( >=dev-python/pymusiccast-0.1.6[${PYTHON_USEDEP}] )
-	mysql? ( dev-python/mysqlclient[${PYTHON_USEDEP}] )
-	mqtt? ( ~dev-python/hbmqtt-0.9.4[${PYTHON_USEDEP}]
-			app-misc/mosquitto )
-	rxv? ( =dev-python/rxv-0.6.0[${PYTHON_USEDEP}]
-			~dev-python/defusedxml-0.6.0[${PYTHON_USEDEP}] )
-	denonavr? ( ~dev-python/denonavr-0.7.8[${PYTHON_USEDEP}] )
-	samsungtv? ( >=dev-python/samsungctl-0.7.1[${PYTHON_USEDEP}] )
-	sonos? ( >=dev-python/pysonos-0.0.12[${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 )
-	wemo? ( >=dev-python/pywemo-0.4.34[${PYTHON_USEDEP}] )
-	frontend? ( =app-misc/home-assistant-frontend-20190514.0 )
-	homematic? ( ~dev-python/pyhomematic-0.1.58[${PYTHON_USEDEP}] )
-	asuswrt? ( ~dev-python/aioasuswrt-1.1.21[${PYTHON_USEDEP}] )
-	qnap? ( ~dev-python/qnapstats-0.3.0[${PYTHON_USEDEP}] )
-	speedtest? ( ~net-analyzer/speedtest-cli-2.1.1[${PYTHON_USEDEP}] )
-	zoneminder? ( ~dev-python/zm-py-0.3.3[${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
-}
--- a/app-misc/homeassistant/homeassistant-0.94.4.ebuild
+++ b/app-misc/homeassistant/homeassistant-0.94.4.ebuild
@ -18,7 +18,7 @@ RESTRICT="mirror"
 LICENSE=""
 SLOT="0"
 KEYWORDS="amd64"
-IUSE="androidtv asuswrt atv denonavr esphome enigma +frontend homematic hs100 maxcube mikrotik musiccast mysql mqtt qnap rxv samsungtv sonos ssl speedtest test tradfri vera wemo zoneminder"
+IUSE="androidtv asuswrt atv denonavr esphome enigma +frontend homematic hs100 maxcube mikrotik musiccast mysql mqtt qnap rxv samsungtv sonos ssl speedtest test tradfri vera wemo wink zoneminder"

 RDEPEND="${PYTHON_DEPS}
 	!app-misc/homeassistant-bin
@ -60,7 +60,7 @@ RDEPEND="${PYTHON_DEPS}
 	>=dev-python/six-1.12.0[${PYTHON_USEDEP}]
 	~dev-python/snitun-0.15[${PYTHON_USEDEP}]
 	>=dev-python/pyrfc3339-1.1[${PYTHON_USEDEP}]
-	~dev-python/hass-nabucasa-0.13[${PYTHON_USEDEP}]
+	~dev-python/hass-nabucasa-0.14[${PYTHON_USEDEP}]

 	>=dev-python/aiohttp-cors-0.7.0[${PYTHON_USEDEP}]
 	~dev-python/beautifulsoup-4.7.1[${PYTHON_USEDEP}]
@ -140,13 +140,14 @@ RDEPEND="${PYTHON_DEPS}
 			net-proxy/haproxy )
 	tradfri? ( >=dev-python/pytradfri-6.0.1[${PYTHON_USEDEP}]
 		 sys-devel/autoconf:2.69 )
-	wemo? ( >=dev-python/pywemo-0.4.34[${PYTHON_USEDEP}] )
 	frontend? ( =app-misc/home-assistant-frontend-20190604.0 )
 	homematic? ( ~dev-python/pyhomematic-0.1.58[${PYTHON_USEDEP}] )
 	asuswrt? ( ~dev-python/aioasuswrt-1.1.21[${PYTHON_USEDEP}] )
 	qnap? ( ~dev-python/qnapstats-0.3.0[${PYTHON_USEDEP}] )
 	speedtest? ( ~net-analyzer/speedtest-cli-2.1.1[${PYTHON_USEDEP}] )
 	vera? ( ~dev-python/pyvera-0.2.45[${PYTHON_USEDEP}] )
+	wemo? ( >=dev-python/pywemo-0.4.34[${PYTHON_USEDEP}] )
+	wink? ( ~dev-python/pubnubsub-handler-1.0.7[${PYTHON_USEDEP}] )
 	zoneminder? ( ~dev-python/zm-py-0.3.3[${PYTHON_USEDEP}] )
 "

--- a/app-misc/homeassistant/homeassistant-0.95.0_beta0.ebuild
+++ b/app-misc/homeassistant/homeassistant-0.95.0_beta0.ebuild
@ -18,7 +18,7 @@ RESTRICT="mirror"
 LICENSE=""
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="androidtv asuswrt atv denonavr esphome enigma +frontend homematic hs100 maxcube mikrotik musiccast mysql mqtt qnap rxv samsungtv sonos ssl speedtest test tradfri wemo zoneminder"
+IUSE="androidtv asuswrt atv denonavr esphome enigma +frontend homematic hs100 maxcube mikrotik musiccast mysql mqtt qnap rxv samsungtv sonos ssl speedtest test tradfri vera wemo wink zoneminder z-wave"

 RDEPEND="${PYTHON_DEPS}
 	!app-misc/homeassistant-bin
@ -41,10 +41,9 @@ RDEPEND="${PYTHON_DEPS}
 	>=dev-python/pip-8.0.3-r1[${PYTHON_USEDEP}]
 	~dev-python/python-slugify-3.0.2[${PYTHON_USEDEP}]
 	>=dev-python/pytz-2019.1[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.13[${PYTHON_USEDEP}]
-	<dev-python/pyyaml-4[${PYTHON_USEDEP}]
+	~dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
 	=dev-python/requests-2.22.0[${PYTHON_USEDEP}]
-	~dev-python/ruamel-yaml-0.15.94[${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}]

@ -58,9 +57,8 @@ RDEPEND="${PYTHON_DEPS}
 	>=dev-python/pbr-5.1.3[${PYTHON_USEDEP}]
 	>=dev-python/requests-toolbelt-0.9.1[${PYTHON_USEDEP}]
 	>=dev-python/six-1.12.0[${PYTHON_USEDEP}]
-	~dev-python/snitun-0.15[${PYTHON_USEDEP}]
 	>=dev-python/pyrfc3339-1.1[${PYTHON_USEDEP}]
-	~dev-python/hass-nabucasa-0.13[${PYTHON_USEDEP}]
+	~dev-python/hass-nabucasa-0.15[${PYTHON_USEDEP}]

 	>=dev-python/aiohttp-cors-0.7.0[${PYTHON_USEDEP}]
 	~dev-python/beautifulsoup-4.7.1[${PYTHON_USEDEP}]
@ -94,7 +92,7 @@ RDEPEND="${PYTHON_DEPS}
 	>=dev-python/paho-mqtt-1.4.0[${PYTHON_USEDEP}]
 	~dev-python/pillow-5.4.1[${PYTHON_USEDEP}]
 	>=dev-python/psutil-5.6.2[${PYTHON_USEDEP}]
-	>=dev-python/PyChromecast-3.2.1[${PYTHON_USEDEP}]
+	>=dev-python/PyChromecast-3.2.2[${PYTHON_USEDEP}]
 	|| ( >=dev-python/pycryptodome-3.7.3[${PYTHON_USEDEP}] dev-python/pycrypto[${PYTHON_USEDEP}] )
 	>=dev-python/pyotp-2.2.7[${PYTHON_USEDEP}]
 	>=dev-python/pyqrcode-1.2.1[${PYTHON_USEDEP}]
@ -117,12 +115,12 @@ RDEPEND="${PYTHON_DEPS}
 	>=dev-python/websocket-client-0.54.0[${PYTHON_USEDEP}]
 	~dev-python/xmltodict-0.12.0[${PYTHON_USEDEP}]
 	>=dev-python/yarl-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/zeroconf-0.22.0[${PYTHON_USEDEP}]
+	>=dev-python/zeroconf-0.23.0[${PYTHON_USEDEP}]
 	>=media-libs/mutagen-1.42.0
 	atv? ( >=dev-python/pyatv-0.3.12[${PYTHON_USEDEP}] )
-	esphome? ( ~dev-python/aioesphomeapi-2.1.0[${PYTHON_USEDEP}] )
+	esphome? ( ~dev-python/aioesphomeapi-2.2.0[${PYTHON_USEDEP}] )
 	enigma? ( ~dev-python/openwebifpy-3.1.1[${PYTHON_USEDEP}] )
-	androidtv? ( ~dev-python/androidtv-0.0.15[${PYTHON_USEDEP}] )
+	androidtv? ( ~dev-python/androidtv-0.0.16[${PYTHON_USEDEP}] )
 	hs100? ( >=dev-python/pyHS100-0.3.5[${PYTHON_USEDEP}] )
 	maxcube? ( ~dev-python/maxcube-api-0.1.0[${PYTHON_USEDEP}] )
 	mikrotik? ( ~dev-python/librouteros-2.2.0[${PYTHON_USEDEP}] )
@ -132,21 +130,26 @@ RDEPEND="${PYTHON_DEPS}
 			app-misc/mosquitto )
 	rxv? ( =dev-python/rxv-0.6.0[${PYTHON_USEDEP}]
 			~dev-python/defusedxml-0.6.0[${PYTHON_USEDEP}] )
-	denonavr? ( ~dev-python/denonavr-0.7.8[${PYTHON_USEDEP}] )
+	denonavr? ( ~dev-python/denonavr-0.7.9[${PYTHON_USEDEP}] )
 	samsungtv? ( >=dev-python/samsungctl-0.7.1[${PYTHON_USEDEP}] )
-	sonos? ( >=dev-python/pysonos-0.0.12[${PYTHON_USEDEP}] )
+	sonos? ( >=dev-python/pysonos-0.0.16[${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 )
-	wemo? ( >=dev-python/pywemo-0.4.34[${PYTHON_USEDEP}] )
-	frontend? ( =app-misc/home-assistant-frontend-20190602.0 )
-	homematic? ( ~dev-python/pyhomematic-0.1.58[${PYTHON_USEDEP}] )
+	frontend? ( =app-misc/home-assistant-frontend-20190619.0 )
+	homematic? ( ~dev-python/pyhomematic-0.1.59[${PYTHON_USEDEP}] )
 	asuswrt? ( ~dev-python/aioasuswrt-1.1.21[${PYTHON_USEDEP}] )
 	qnap? ( ~dev-python/qnapstats-0.3.0[${PYTHON_USEDEP}] )
 	speedtest? ( ~net-analyzer/speedtest-cli-2.1.1[${PYTHON_USEDEP}] )
+	vera? ( ~dev-python/pyvera-0.3.1[${PYTHON_USEDEP}] )
+	wemo? ( >=dev-python/pywemo-0.4.34[${PYTHON_USEDEP}] )
+	wink? ( ~dev-python/pubnubsub-handler-1.0.7[${PYTHON_USEDEP}] )
 	zoneminder? ( ~dev-python/zm-py-0.3.3[${PYTHON_USEDEP}] )
+	z-wave? ( ~dev-python/pynacl-1.3.0[${PYTHON_USEDEP}]
+			  ~dev-python/pydispatcher-2.0.5[${PYTHON_USEDEP}]
+			  ~dev-python/cffi-1.12.2[${PYTHON_USEDEP}] )
 "

 DEPEND="${RDEPEND}
--- a/app-misc/homeassistant/metadata.xml
+++ b/app-misc/homeassistant/metadata.xml
@ -33,5 +33,6 @@
    <flag name="wemo">discover and control WeMo devices</flag>
    <flag name="wink">support for Wink Z-Wave Plus Smart Hub</flag>
    <flag name="zoneminder">Support for ZoneMinder Cameras</flag>
+    <flag name="z-wave">Support for Z-Wave Devices (uncomplete)</flag>
  </use>
 </pkgmetadata>
--- a/dev-embedded/esphome/Manifest
+++ b/dev-embedded/esphome/Manifest
@ -6,6 +6,7 @@ DIST esphome-1.12.0.tar.gz 454727 BLAKE2B 3afe95701db235586ffdac0468bb29df91f385
 DIST esphome-1.12.0b3.tar.gz 454671 BLAKE2B 1390f6774cdc042d6012e34fc162939a358bf2e5a499c188043aa815bfa24bab14521880bcd4027436695e33436cd08a68bd2da74e9bad8718bc9c6805062d72 SHA512 2bcd9ee047097a0ed1c65a292f7e87266e93a3d8951de3086b78f92fa50e919f5a7c224e57e3e84898a2e78f61591c1a3e57c6d90a07547d67b8f39ece9e9759
 DIST esphome-1.12.0b4.tar.gz 454735 BLAKE2B 249c7af515cb95f60a7b2bf4b94d8c8af28d40a876eaff58232e0e8a7540700a10c30f98d225272d96c44b8913ae696274ae503de68a11b3b21bcc83a46351d2 SHA512 b4416bea17c2a57fa1d176d486be4a9e6368b065fe636195daa8392593040e2f8f44b44f52a0b7c30d3285a650358c71c887a83e1830432395dfa837f00f537a
 DIST esphome-1.13.2.tar.gz 819316 BLAKE2B 1b8bc4ccf29dbb78cd41683fcb6dc6d51bc894f1727ec0901abe0d040b59e68f6523bcebc7a99b1b69f139b9ae55008307f874285ef534b1c77281ff3ac8b0d5 SHA512 373596d7358f577052cf60d24708e9a7dd3aa815361f16e3570ab2245834ded8999b1ec745ecad78576937eadb899c8882fa86686ee25d853b72925de4e41296
+DIST esphome-1.13.6.tar.gz 821636 BLAKE2B f32f6a0d8b94997826a858feff82da5e34c950af468e1befd11562316ccbecf7c60db5fe1788d1fc7e3f6669622c625e309a3cc9267a05e990a88cb033fe61ba SHA512 d6a7a5f1288c6b25c9d896e3598fd0a015abe0499c41d35ae5ae5d470a9bddceab892a50b22f37bc8faa2ef951620af6162422d6a57878d72c81d2f55c2c54d0
 EBUILD esphome-1.11.1-r1.ebuild 2128 BLAKE2B 2834973f853ec775fe4839ebb0c169df48cf7388934ef15c5386d77c960aaee1d5138fc181a4f1c192207983f602fc563c6bfe28f528cfa5fb22ba568accc3bb SHA512 d173b7ce17d0d1025ec50420ef9382a72e02f29cab1e79b79e668970cf0a2e0769393ca4f38bbd4a589c04647bcc8f1853730dbf37b66ff11e3326ac64ff00ff
 EBUILD esphome-1.11.2-r1.ebuild 2128 BLAKE2B 2834973f853ec775fe4839ebb0c169df48cf7388934ef15c5386d77c960aaee1d5138fc181a4f1c192207983f602fc563c6bfe28f528cfa5fb22ba568accc3bb SHA512 d173b7ce17d0d1025ec50420ef9382a72e02f29cab1e79b79e668970cf0a2e0769393ca4f38bbd4a589c04647bcc8f1853730dbf37b66ff11e3326ac64ff00ff
 EBUILD esphome-1.12.0-r1.ebuild 2272 BLAKE2B 0249ec14aada441d43cd3509f5c3896e1b500f9196f6337aeab2fc389315c6d93dc30280bc1fc1a2dc6bdd14d852361f3f424036be8a8421181b1ea969c81510 SHA512 515fc7442641734b11a0b898add8389a3825ce6fb4751c754262b99dbdaa03cb5fbcc6a43d876e17dc01706b7e70ba4e035ffb5dfd778166fc4d39d50a5e7451
@ -13,4 +14,5 @@ EBUILD esphome-1.12.0.ebuild 2273 BLAKE2B 0905ed218237d20e83ccda0b4ac6b922371e50
 EBUILD esphome-1.12.0_beta3.ebuild 2274 BLAKE2B cddbb2597eafa9ed46692315209e698ca687a4815c05593b21c9790f321e94192f466edb79f3cabfe06420dae8a866d5b63318c593a59be814582a2b16a683af SHA512 6945b2eb911ab72dc9aac75dcfbd0f7efe379f9870db7cb5e5e07b186f64881a4743535ce897a4133cb54c2cb6f92438957a12bd5d39cce331c8e70ecb0cc54b
 EBUILD esphome-1.12.0_beta4.ebuild 2274 BLAKE2B cddbb2597eafa9ed46692315209e698ca687a4815c05593b21c9790f321e94192f466edb79f3cabfe06420dae8a866d5b63318c593a59be814582a2b16a683af SHA512 6945b2eb911ab72dc9aac75dcfbd0f7efe379f9870db7cb5e5e07b186f64881a4743535ce897a4133cb54c2cb6f92438957a12bd5d39cce331c8e70ecb0cc54b
 EBUILD esphome-1.13.2.ebuild 2272 BLAKE2B 0249ec14aada441d43cd3509f5c3896e1b500f9196f6337aeab2fc389315c6d93dc30280bc1fc1a2dc6bdd14d852361f3f424036be8a8421181b1ea969c81510 SHA512 515fc7442641734b11a0b898add8389a3825ce6fb4751c754262b99dbdaa03cb5fbcc6a43d876e17dc01706b7e70ba4e035ffb5dfd778166fc4d39d50a5e7451
+EBUILD esphome-1.13.6.ebuild 2272 BLAKE2B 0249ec14aada441d43cd3509f5c3896e1b500f9196f6337aeab2fc389315c6d93dc30280bc1fc1a2dc6bdd14d852361f3f424036be8a8421181b1ea969c81510 SHA512 515fc7442641734b11a0b898add8389a3825ce6fb4751c754262b99dbdaa03cb5fbcc6a43d876e17dc01706b7e70ba4e035ffb5dfd778166fc4d39d50a5e7451
 MISC metadata.xml 361 BLAKE2B 0752256cba8c0b90e3dcce71eb5c3a8307adbab281c5229abc8aaa21d4ee1b94f2f898ccd9c43c4ff488a995f2e6271a5aa651f78a7e6d35cba0cc6302d387ed SHA512 80327a1c6833cadd82cfcbfa31e48661a8c11b38831c4c6cef002523244be67ee50585c3a10903ef6126974c4f36347f08e39c5a64ab43ad7ebb632106e1c4c1
--- a/dev-embedded/esphome/esphome-1.13.6.ebuild
+++ b/dev-embedded/esphome/esphome-1.13.6.ebuild
@ -0,0 +1,91 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit user readme.gentoo-r1 distutils-r1
+
+MY_P=${P/_beta/b}
+MY_PV=${PV/_beta/b}
+
+DESCRIPTION="Make creating custom firmwares for ESP32/ESP8266 super easy."
+HOMEPAGE="https://github.com/esphome/esphome https://pypi.org/project/esphome/"
+
+SRC_URI="https://github.com/esphome/esphome/archive/v${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="server test"
+
+RDEPEND=""
+DEPEND="${REDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/tzlocal-1.5.1[${PYTHON_USEDEP}]
+	>=dev-python/voluptuous-0.11.5[${PYTHON_USEDEP}]
+	>=dev-embedded/platformio-3.6.5
+	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
+	>=dev-python/paho-mqtt-1.3.1[${PYTHON_USEDEP}]
+	>=dev-python/colorlog-3.1.2[${PYTHON_USEDEP}]
+	>=www-servers/tornado-5.1.1[${PYTHON_USEDEP}]
+	>=dev-embedded/esptool-2.6[${PYTHON_USEDEP}]
+	>=dev-python/typing-3.6.6[${PYTHON_USEDEP}]
+	>=dev-python/protobuf-python-3.7[${PYTHON_USEDEP}]
+	>=dev-python/pyserial-3.4[${PYTHON_USEDEP}]
+	>=dev-python/ifaddr-0.1.6[${PYTHON_USEDEP}]
+	server? ( >=dev-python/ifaddr-0.1.6 )
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+DISABLE_AUTOFORMATTING=1
+DOC_CONTENTS="
+The ESPHome dashboard listens on port 6052
+ESPHome configuration is in: /etc/${PN}
+dashboard command line arguments are configured in: /etc/conf.d/${PN}
+logging is to: /var/log/${PN}/{dashboard,warnings}.log
+support at https://git.edevau.net/onkelbeh/HomeAssistantRepository
+"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS="README.md"
+
+pkg_setup() {
+	if use server; then
+		enewgroup "${PN}"
+		enewuser "${PN}" -1 -1 "/etc/${PN}" "${PN}"
+	fi
+}
+
+python_install_all() {
+	dodoc ${DOCS}
+	distutils-r1_python_install_all
+
+	if use server; then
+		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-r1" "${PN}"
+
+		readme.gentoo_create_doc
+	fi
+}
+
+python_test() {
+	nosetests --verbose || die
+	py.test -v -v || die
+}
+
+pkg_postinst() {
+	if use server; then
+		readme.gentoo_print_elog
+	fi
+}
--- a/dev-python/aioesphomeapi/Manifest
+++ b/dev-python/aioesphomeapi/Manifest
@ -1,11 +1,11 @@
-DIST aioesphomeapi-1.6.0.tar.gz 16454 BLAKE2B fd73848c6a132a83751973ca098c353d8ae857153265efd05421661c889e1a20ba4b27af283e99359d1bc92d61f1bc6fbbbd9fc7fbbbf568e7dc02b16055e64b SHA512 037a9b27df3e2d9d1111bb32cd1dc3a53a167d0036282ee4749838904fb7a5b782c5fdf8127788ef942e4d758b84170fa549aba63d5de75cee631295470a0b07
 DIST aioesphomeapi-1.7.0.tar.gz 17174 BLAKE2B d72416c738933dbb0e3d17a5a135f2f121db5228105b745ffe7d9ba7eb95d5211f4120648ae7ed500dcfca777a191b26132d92a1dd3ffd61251aa71334ef803a SHA512 2b5259d87ef9fc187abf4efa1ec156aa9a7f7181fdab8b41839e1405754948f70d55e68323eb8d0c107a13826ec240e97eaa6d3caeef583eb79826b9c94b8ea9
 DIST aioesphomeapi-2.0.0.tar.gz 19680 BLAKE2B 909ac06994873cd195c7e34d03e5ab4c6a16fcdf62aa3cf2e97e73ff931b211897c8a63cf0429a9b591c64aa0311dc90afa934930ebf4bc7e23b9c0b99be1f9c SHA512 9f6e18b17a087674aafd5304b9fffccb0f2437bdcb21befd6cc68a59e374674993f6e4d11b9f5fbc2dc7f481ba3a826ad92f8b8227d1e8f06bdda106acc15aa8
 DIST aioesphomeapi-2.0.1.tar.gz 19709 BLAKE2B bd513ffe1a20d39daa90cf1ceec61f6687f4d288097f82cd69b38237bd9e258467b42636eb932468831dad2abf2a3fa2d6765ffb2c45e1952984fce1b8dfd262 SHA512 1f1986b09275d1967d0a47748ddc8729896a5069f928da957b55e4b1ade25693990e2a51b55b8ccfa7be6e9bbc4bc0b74780ca253011a8600ca907c86d237879
 DIST aioesphomeapi-2.1.0.tar.gz 19712 BLAKE2B 32a9fa53c71a8e4e2f2f6cf4f8a01a352b8436b17a87dfce0298e1f3c40bd094a9322dcfd8e19f733ac55bdc41e2d94bc5d3a87d71e4a739eb25c976bb9fd09e SHA512 60812a451fe2a36dafbc86b69cc58aed928606f4488e6ba5f0452c8727317017426f49ae286cd0b8a4420ba78f11ab5b1500dfbbb0eb19e87f61f7eb60586e53
-EBUILD aioesphomeapi-1.6.0.ebuild 621 BLAKE2B 298130c7afd38ff32f0cfd9fe085e4ac99a98524c20f02fde667da2d8165407a1794f50794a559838f22a958ae5e4e6bfcf93cb43a7faf77bbb1cd981caa1098 SHA512 f5369cf4bef3a53ef72e5164afa7e8d6cd60180446da65bdf17cb80c329e1ababe4db573abb896736657855a8bcc8e8a7349d0ec0b2cfea622adfba6209d151d
+DIST aioesphomeapi-2.2.0.tar.gz 22894 BLAKE2B 4268d5578eb66a992a239d5fa736a6212b4dfa095fcf8dd4ca01b17b1dd3a4086eac3137264b14b09e1f99fa9b1696acca71db971842dc9151c4846838ba168f SHA512 2ddee977892131c9c9dd7d4574eedda7b042fcc5fdf9e32339eacbe8e19a39aeb859487bb56c71937453d369722b6f34588ebe1a78f74506c4cf8d65ae715667
 EBUILD aioesphomeapi-1.7.0.ebuild 621 BLAKE2B 298130c7afd38ff32f0cfd9fe085e4ac99a98524c20f02fde667da2d8165407a1794f50794a559838f22a958ae5e4e6bfcf93cb43a7faf77bbb1cd981caa1098 SHA512 f5369cf4bef3a53ef72e5164afa7e8d6cd60180446da65bdf17cb80c329e1ababe4db573abb896736657855a8bcc8e8a7349d0ec0b2cfea622adfba6209d151d
 EBUILD aioesphomeapi-2.0.0.ebuild 621 BLAKE2B 298130c7afd38ff32f0cfd9fe085e4ac99a98524c20f02fde667da2d8165407a1794f50794a559838f22a958ae5e4e6bfcf93cb43a7faf77bbb1cd981caa1098 SHA512 f5369cf4bef3a53ef72e5164afa7e8d6cd60180446da65bdf17cb80c329e1ababe4db573abb896736657855a8bcc8e8a7349d0ec0b2cfea622adfba6209d151d
 EBUILD aioesphomeapi-2.0.1.ebuild 621 BLAKE2B 298130c7afd38ff32f0cfd9fe085e4ac99a98524c20f02fde667da2d8165407a1794f50794a559838f22a958ae5e4e6bfcf93cb43a7faf77bbb1cd981caa1098 SHA512 f5369cf4bef3a53ef72e5164afa7e8d6cd60180446da65bdf17cb80c329e1ababe4db573abb896736657855a8bcc8e8a7349d0ec0b2cfea622adfba6209d151d
 EBUILD aioesphomeapi-2.1.0.ebuild 621 BLAKE2B 298130c7afd38ff32f0cfd9fe085e4ac99a98524c20f02fde667da2d8165407a1794f50794a559838f22a958ae5e4e6bfcf93cb43a7faf77bbb1cd981caa1098 SHA512 f5369cf4bef3a53ef72e5164afa7e8d6cd60180446da65bdf17cb80c329e1ababe4db573abb896736657855a8bcc8e8a7349d0ec0b2cfea622adfba6209d151d
+EBUILD aioesphomeapi-2.2.0.ebuild 621 BLAKE2B 298130c7afd38ff32f0cfd9fe085e4ac99a98524c20f02fde667da2d8165407a1794f50794a559838f22a958ae5e4e6bfcf93cb43a7faf77bbb1cd981caa1098 SHA512 f5369cf4bef3a53ef72e5164afa7e8d6cd60180446da65bdf17cb80c329e1ababe4db573abb896736657855a8bcc8e8a7349d0ec0b2cfea622adfba6209d151d
 MISC metadata.xml 369 BLAKE2B 63872d9df079cd8466c8294e2143cd6d41f4280b50418eb3e9b3ce17c8c3dc10717cf68a9516fcdeb082f236cfa360b0f43936616660cc2aebb2d98d4d09d073 SHA512 3b9be2985fce5e9bb78664a2dff4fbfadb6cd027eb6ddea06f8b2e5abdfeb538c1446e8ba4ba9188167f71b82aeceb1beee5f7354f36c758ae2ba12379926cdb
--- a/dev-python/aioesphomeapi/aioesphomeapi-2.2.0.ebuild
+++ b/dev-python/aioesphomeapi/aioesphomeapi-2.2.0.ebuild
--- a/dev-python/geopy/Manifest
+++ b/dev-python/geopy/Manifest
@ -1,3 +1,5 @@
+DIST geopy-1.19.0.tar.gz 251957 BLAKE2B 59aed0677ea761eb11d82a6cadbff8d22ce6a7d5573c32e80b99c67d8336a7a44a7cfdfc06698ea7cb646249898a202c055fc398010930297eccd960649484c4 SHA512 c1cfbb3404c62168c964ad6d1252567c6e9b4d92657b2a170f0f4db7f2035f486e0205250cd9f7adf68e012e095070d511982f04409d145a1c8c03a5c99dabf0
 DIST geopy-1.20.0.tar.gz 64920 BLAKE2B f5a6a141ef27820db2eef7d26417a27faec0a16201a1bb985dd5ed921052ca9913336e96d777ce5fef5f9c0adfb150c8d9931e22442af68e9a795c8e0c555731 SHA512 6d2aaab487e18b9342e3ce6b88469118b210c259d88725df1880a5f18f6e083e1350453229c85c97e26c62a77f29c717d6118a50b07b428130e91270c5983fc6
-EBUILD geopy-1.20.0.ebuild 686 BLAKE2B a4a29a1de2248dcdf8c232639b976cf245d387d7cc96f187f53ccd76126274f4efa4f0c868e04c462a705a3d538bf3936c0e6a56e54089646112b85235a277e8 SHA512 ceef7d54cc6c7d1bb9bceac08afa82ab6c12a34a7a442e30d7be94365193b9b7bbe3a5da923296c7628cff6834a6afb2b4a36f536780212e66d205faaacd3114
+EBUILD geopy-1.19.0.ebuild 2284 BLAKE2B b4d5abd4eb92734902130b001b48d860e0cb77a2f592b6c03721e2d9519da119abf3bd5d785689165d652fa0277e7439ba8db151e18b325b6d0611dc26367e47 SHA512 571b2f6bfa563130aba94b6ff73ff71fe680a1a8bc51a28476a007fab9cf415db2ffcca81758f86265ea4160b94b912af37e38e213dcfded9b0b901edfbc0fef
+EBUILD geopy-1.20.0.ebuild 2284 BLAKE2B b4d5abd4eb92734902130b001b48d860e0cb77a2f592b6c03721e2d9519da119abf3bd5d785689165d652fa0277e7439ba8db151e18b325b6d0611dc26367e47 SHA512 571b2f6bfa563130aba94b6ff73ff71fe680a1a8bc51a28476a007fab9cf415db2ffcca81758f86265ea4160b94b912af37e38e213dcfded9b0b901edfbc0fef
 MISC metadata.xml 460 BLAKE2B 0559eb1e21dfedbb304ab26140a558fd1a52fc38b99150faec80422c73cd5ee4faabb31b838332ad21806120f3cd092c8217958cf26eeb7510e33a751ae7faab SHA512 f302806548024ebbc8fb576eb15d0fa5aa74e41faa6442a1d1f04da8a0b94075719c9b0af501410f44c5f44120ebb1fa1965b74597cc0235abb02d01f48ff8f0
--- a/dev-python/geopy/geopy-1.19.0.ebuild
+++ b/dev-python/geopy/geopy-1.19.0.ebuild
@ -0,0 +1,66 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="A Geocoding Toolbox for Python"
+HOMEPAGE="http://www.geopy.org/ https://github.com/geopy/geopy"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+IUSE="test doc timezone yahoo"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+RDEPEND="yahoo? ( >=dev-python/requests-oauthlib-0.4.0[${PYTHON_USEDEP}]
+		dev-python/placefinder[${PYTHON_USEDEP}] )
+	timezone? ( dev-python/pytz[${PYTHON_USEDEP}] )"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/mock[${PYTHON_USEDEP}]
+		 dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/nose-cover3[${PYTHON_USEDEP}]
+		dev-python/pylint[${PYTHON_USEDEP}] )
+	doc? ( $(python_gen_cond_dep 'dev-python/sphinx[${PYTHON_USEDEP}]' python2_7)
+		>=dev-python/python-docs-2.7.6-r1:2.7 )"
+
+REQUIRED_USE="test? ( yahoo timezone )"
+
+python_prepare_all() {
+	if use doc; then
+		local PYTHON_DOC_ATOM=$(best_version --host-root dev-python/python-docs:2.7)
+		local PYTHON_DOC_VERSION="${PYTHON_DOC_ATOM#dev-python/python-docs-}"
+		local PYTHON_DOC="/usr/share/doc/python-docs-${PYTHON_DOC_VERSION}/html"
+		local PYTHON_DOC_INVENTORY="${PYTHON_DOC}/objects.inv"
+		sed -i "s|'http://docs.python.org/': None|'${PYTHON_DOC}': '${PYTHON_DOC_INVENTORY}'|" docs/conf.py || die
+	fi
+
+	distutils-r1_python_prepare_all
+
+	# prevent install of test folder to avoid file collisions
+	sed -e "s:find_packages():find_packages(exclude=['test','test.*']):" -i setup.py || die
+}
+
+python_test() {
+	# broken tests
+	rm test/geocoders/openmapquest.py
+	sed -i -e 's/from .openmapquest import OpenMapQuestTestCase//' test/geocoders/__init__.py
+	# Ignore rogue class IGNFranceTestCase demanding elements beyond a normal testsuite
+	# i.e. "You should provide an api key and a username with a password"
+	# Cannot decipher how to skip or exclude this "context=IGNFranceTestCase"
+	# It appears it MAY stem from nose rather than geopy's suite
+	nosetests --verbose || die "Tests failed under ${EPYTHON}"
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
+}
--- a/dev-python/geopy/geopy-1.20.0.ebuild
+++ b/dev-python/geopy/geopy-1.20.0.ebuild
@ -1,30 +1,66 @@
-# Copyright 1999-2019 Gentoo Authors Andreas Billmeier b (at) edevau.net
-# Distributed under the terms of the GNU General Public License v3.0
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2

-EAPI="7"
+EAPI=5

-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )

 inherit distutils-r1

-DESCRIPTION="Python Geocoding Toolbox"
-HOMEPAGE="https://github.com/geopy/geopy https://pypi.org/project/geopy/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+DESCRIPTION="A Geocoding Toolbox for Python"
+HOMEPAGE="http://www.geopy.org/ https://github.com/geopy/geopy"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+IUSE="test doc timezone yahoo"

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
+KEYWORDS="amd64 x86"

-RDEPEND=""
-DEPEND="${REDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
+RDEPEND="yahoo? ( >=dev-python/requests-oauthlib-0.4.0[${PYTHON_USEDEP}]
+		dev-python/placefinder[${PYTHON_USEDEP}] )
+	timezone? ( dev-python/pytz[${PYTHON_USEDEP}] )"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/mock[${PYTHON_USEDEP}]
+		 dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/nose-cover3[${PYTHON_USEDEP}]
+		dev-python/pylint[${PYTHON_USEDEP}] )
+	doc? ( $(python_gen_cond_dep 'dev-python/sphinx[${PYTHON_USEDEP}]' python2_7)
+		>=dev-python/python-docs-2.7.6-r1:2.7 )"
+
+REQUIRED_USE="test? ( yahoo timezone )"
+
+python_prepare_all() {
+	if use doc; then
+		local PYTHON_DOC_ATOM=$(best_version --host-root dev-python/python-docs:2.7)
+		local PYTHON_DOC_VERSION="${PYTHON_DOC_ATOM#dev-python/python-docs-}"
+		local PYTHON_DOC="/usr/share/doc/python-docs-${PYTHON_DOC_VERSION}/html"
+		local PYTHON_DOC_INVENTORY="${PYTHON_DOC}/objects.inv"
+		sed -i "s|'http://docs.python.org/': None|'${PYTHON_DOC}': '${PYTHON_DOC_INVENTORY}'|" docs/conf.py || die
+	fi
+
+	distutils-r1_python_prepare_all
+
+	# prevent install of test folder to avoid file collisions
+	sed -e "s:find_packages():find_packages(exclude=['test','test.*']):" -i setup.py || die
+}

 python_test() {
-	nosetests --verbose || die
-	py.test -v -v || die
+	# broken tests
+	rm test/geocoders/openmapquest.py
+	sed -i -e 's/from .openmapquest import OpenMapQuestTestCase//' test/geocoders/__init__.py
+	# Ignore rogue class IGNFranceTestCase demanding elements beyond a normal testsuite
+	# i.e. "You should provide an api key and a username with a password"
+	# Cannot decipher how to skip or exclude this "context=IGNFranceTestCase"
+	# It appears it MAY stem from nose rather than geopy's suite
+	nosetests --verbose || die "Tests failed under ${EPYTHON}"
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	distutils-r1_python_install_all
 }
--- a/dev-python/hass-nabucasa/Manifest
+++ b/dev-python/hass-nabucasa/Manifest
@ -7,5 +7,5 @@ EBUILD hass-nabucasa-0.11.ebuild 720 BLAKE2B e2bc179035f8e460bd30b3734b922a9e25e
 EBUILD hass-nabucasa-0.12.ebuild 720 BLAKE2B e2bc179035f8e460bd30b3734b922a9e25e22a94578f9f27c7150368af38398d46cb0da3df8d9daa365468c05e806c4e3acc8b5fb3dae3a83649262f36131ff4 SHA512 56df5041057a7b970b303a8c6b3dc2a1536c9eb155509acf3aac1c9c7d442ea732432159c03e3555d111d4f9b5630299b58149891a340a9936f7507aa597fd76
 EBUILD hass-nabucasa-0.13.ebuild 720 BLAKE2B e2bc179035f8e460bd30b3734b922a9e25e22a94578f9f27c7150368af38398d46cb0da3df8d9daa365468c05e806c4e3acc8b5fb3dae3a83649262f36131ff4 SHA512 56df5041057a7b970b303a8c6b3dc2a1536c9eb155509acf3aac1c9c7d442ea732432159c03e3555d111d4f9b5630299b58149891a340a9936f7507aa597fd76
 EBUILD hass-nabucasa-0.14.ebuild 720 BLAKE2B e2bc179035f8e460bd30b3734b922a9e25e22a94578f9f27c7150368af38398d46cb0da3df8d9daa365468c05e806c4e3acc8b5fb3dae3a83649262f36131ff4 SHA512 56df5041057a7b970b303a8c6b3dc2a1536c9eb155509acf3aac1c9c7d442ea732432159c03e3555d111d4f9b5630299b58149891a340a9936f7507aa597fd76
-EBUILD hass-nabucasa-0.15.ebuild 988 BLAKE2B 198f98d40195fedb63537041ef9b6d220f57146a6ea2a4837654f8edcf9bd7cdd24f2f71345bd3a806850b6be4a2d374fe0bea3652424b9c0c49696d8d622a13 SHA512 cb6eb240bfa45ff29a8283f613dc0f46e2780772e975e841e75cbdac7e2161ef805b1ab3460e149e477601996d21e5d74cd6388e81ba8a06a022216f1f1b7f86
+EBUILD hass-nabucasa-0.15.ebuild 970 BLAKE2B 2c3aa85a42b726ca14328fd36ae162f7cb0ce073dc770a89a9a72c9fa0d2b23c69c59771fdb2f0328432e205168a8494f52761d461b69f4248ab73e430e2c0dd SHA512 5ba83d1791bdbefba42ee4b1c918188635b084c90d906b649405121895d1c230c2b5dbad5058f9a4058d52ef357e0c851c9ff4c8dae6b94acb60200fced75f2b
 MISC metadata.xml 471 BLAKE2B 6372982274560c38a8e99fcd6f67722d4366511329e6e6578246f6a5b8744e152fa165526cc780846380c3e9b9332475618c67adad49b41bd09b3df884db898a SHA512 91f30e1aabd695abae432bc0421d4adbaf8be3f5b0a3520bc6e49d5dbf9ab95243e5ffa936eec69aa5afaacbfeaa38b330a373e11d801026993728c147d6caa1
--- a/dev-python/hass-nabucasa/hass-nabucasa-0.15.ebuild
+++ b/dev-python/hass-nabucasa/hass-nabucasa-0.15.ebuild
@ -18,7 +18,7 @@ IUSE="test"

 RDEPEND="~dev-python/warrant-0.6.1[${PYTHON_USEDEP}]
 		 ~dev-python/snitun-0.18[${PYTHON_USEDEP}]
-		 ~dev-python/acme-0.32.0[${PYTHON_USEDEP}]
+		 >=app-crypt/acme-0.32.0
 		 >=dev-python/cryptography-2.5[${PYTHON_USEDEP}]
 		 >=dev-python/attrs-18.2.0[${PYTHON_USEDEP}]
 		 dev-python/pytz[${PYTHON_USEDEP}]"
--- a/dev-python/pysonos/Manifest
+++ b/dev-python/pysonos/Manifest
@ -1,11 +1,11 @@
-DIST pysonos-0.0.10.tar.gz 658373 BLAKE2B 31c4bce3fe913a122280ea7d1408e8bd5f1a2ff3bb3a3df8cf2cf9f2647dd7d6ee906657dd8d71adc67106ea562b9e6c6f685a78a6156023686f2f1f3a7534c3 SHA512 320d8624927ae8bca1fae9451ed68515b9a563ca77fd868fef07fc5da4dfa816c7a84db6bad48478aba15c413f41a2e862a50cde0eb18999909419fd537dcfd4
 DIST pysonos-0.0.11.tar.gz 658907 BLAKE2B 23a5b2ab97bc7c50e3589586c92dcdc25cd0551bb12e0fa16348e6898dea58f605eee4e47ff5a83bb966d00a2199dbbafcf1d8bcb7a3347b7bd710c875c0bc67 SHA512 663f3917dee16318ba4bf0c7eb44f842767d02d1ad6f93e56e6669bfc4821006b470e80748268ca8b91104fec4a0411b3c213e0d1a256d3ce55cfcbcfd580e06
 DIST pysonos-0.0.12.tar.gz 658932 BLAKE2B 13d542536fecda64c52275d25787b8923f385c94e527da119be7703d2ac1f6aab0d19b5294bc031387c5bbb685b89f50f2a0a40b1b5390c39c01782f686b4ef1 SHA512 2866915ce0b4585814d2b97974e2528bfbd1c53ebb6882521382a604be78f132ab4be98e6de9d6ba604898c8f23dfe7adbf136d4514495225adea34d1b50a3ce
 DIST pysonos-0.0.14.tar.gz 661343 BLAKE2B dbb63409f2fa97fe48b42f0bd455e97f61336fdb029d4b3e156f7adcfaaf3f2e1c58002a1fb75e75efa1a7b980a11defc5fb884812213d333d6d498201a34c06 SHA512 46d98df210e3467b4cc07ed89f4ba72c546af6d391013069fc3fd8795e2462abf3d4cbd9fae4ad4192832661c1c97c44b679a2594013bc546f6399f2df4a0263
 DIST pysonos-0.0.15.tar.gz 661412 BLAKE2B 3efc4f25145eba802b6f442a6489b0f959d9812d01f8033feea8624107e89623e0d42ca29361e123ed6c33c87b4e44cfe99860f9769dadf556ac81e286558cfc SHA512 08ed4b475b7eab707e35108af617f8b69baaa7f4a96fcb08143a807ee5f474365f9041d3278dbb468e2b67754409168cc3d282ed5adf8b9795c9ac242af1997b
-EBUILD pysonos-0.0.10.ebuild 786 BLAKE2B 15f1692d1115e5544784654c52f266557abd004bb026f83db5d70d06675eeaef4bfc2814619ef6a2211efe362cc78c50fbbbcccee0a6b3490f12201ed2fcf01e SHA512 f5acbf11def7f12078985572ad7406353717bd7e28af0f3b1d6d0682f91ad73140e8b140b957ae25364e5ffd45c20ae061b1983afbe5841fc4c7ace75c3a6c1c
+DIST pysonos-0.0.16.tar.gz 661444 BLAKE2B ba380b894a1def24c013bfc40bef4da83a17ab8dae0eefbfc28e82210e32dd6818e66a4f57caf41ef957990763582109cf269f505610a2805428fd8a59239850 SHA512 8c0296a00fc3f9386bd33986c74f746504482f03a0bd15e27a2b699b04af1665b2da3a8cfce84de33be9f1aeead565d68b81f4a07a0369f0ea0197a41e97f512
 EBUILD pysonos-0.0.11.ebuild 786 BLAKE2B 15f1692d1115e5544784654c52f266557abd004bb026f83db5d70d06675eeaef4bfc2814619ef6a2211efe362cc78c50fbbbcccee0a6b3490f12201ed2fcf01e SHA512 f5acbf11def7f12078985572ad7406353717bd7e28af0f3b1d6d0682f91ad73140e8b140b957ae25364e5ffd45c20ae061b1983afbe5841fc4c7ace75c3a6c1c
 EBUILD pysonos-0.0.12.ebuild 786 BLAKE2B 15f1692d1115e5544784654c52f266557abd004bb026f83db5d70d06675eeaef4bfc2814619ef6a2211efe362cc78c50fbbbcccee0a6b3490f12201ed2fcf01e SHA512 f5acbf11def7f12078985572ad7406353717bd7e28af0f3b1d6d0682f91ad73140e8b140b957ae25364e5ffd45c20ae061b1983afbe5841fc4c7ace75c3a6c1c
 EBUILD pysonos-0.0.14.ebuild 786 BLAKE2B 15f1692d1115e5544784654c52f266557abd004bb026f83db5d70d06675eeaef4bfc2814619ef6a2211efe362cc78c50fbbbcccee0a6b3490f12201ed2fcf01e SHA512 f5acbf11def7f12078985572ad7406353717bd7e28af0f3b1d6d0682f91ad73140e8b140b957ae25364e5ffd45c20ae061b1983afbe5841fc4c7ace75c3a6c1c
 EBUILD pysonos-0.0.15.ebuild 866 BLAKE2B 8c197ea4d89bc41e268104f91e7cc0d25b17fcf678e8933cfb8b75986f0a82a3877aac36d57c2ef8ee8ccef8c37a4b3800977c8ce8f91ec167ad2c854c5f681e SHA512 39658b26f4c9a0788d4bbc83a99b31bb5fc20b60d1fee4ce275ac78a65ac495dd17d53d91bd023a57cfc6674aff8b9e1cee8cab61bec4a504cdbf19a46bdb4bf
+EBUILD pysonos-0.0.16.ebuild 866 BLAKE2B 8c197ea4d89bc41e268104f91e7cc0d25b17fcf678e8933cfb8b75986f0a82a3877aac36d57c2ef8ee8ccef8c37a4b3800977c8ce8f91ec167ad2c854c5f681e SHA512 39658b26f4c9a0788d4bbc83a99b31bb5fc20b60d1fee4ce275ac78a65ac495dd17d53d91bd023a57cfc6674aff8b9e1cee8cab61bec4a504cdbf19a46bdb4bf
 MISC metadata.xml 464 BLAKE2B b07b930288d7ae4c71a4d2505f9a15ebcf51326f25a3fec2363047b6e01cca30c4159da49317352c5a5a6ba38e05fd9c3fbb7927d1ca35c49127461fd154636f SHA512 c70048bb7e0a2688bbb4efad742f075a64822b2c52c2b1a5315cf96d23796dedee8943061e837b0bba8d4ebbeee7b540ed22fea537df0d3d163790cd3b5f00e9
--- a/dev-python/pysonos/pysonos-0.0.16.ebuild
+++ b/dev-python/pysonos/pysonos-0.0.16.ebuild
@ -17,7 +17,9 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"

 RDEPEND="dev-python/mock[${PYTHON_USEDEP}]
-		 dev-python/ipaddress[${PYTHON_USEDEP}]"
+		 dev-python/ifaddr[${PYTHON_USEDEP}]
+		 dev-python/requests[${PYTHON_USEDEP}]
+		 dev-python/xmltodict[${PYTHON_USEDEP}]"
 DEPEND="${REDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
--- a/dev-python/snitun/Manifest
+++ b/dev-python/snitun/Manifest
@ -1,5 +1,7 @@
 DIST snitun-0.13.tar.gz 12373 BLAKE2B facc3cb8abc39dc7b4df27fae74a96ac6fc7e36b2e96913e92b2ceee3ccfeddfed28301630192fd3ddbc01fc159097ce857a6763c50eb0d00175c7e779984f8c SHA512 293edd75ff44a841ea47c0a378b9bb8e4bc1e4a1c2fd2f6d53ed51931c97dffa6ddcd6df4731011067ef3dddf4af17e522a3735757ef1949a99b9cfe56ba4d22
 DIST snitun-0.15.tar.gz 12800 BLAKE2B 5c707031e3b14b93c6d687b47797de4e4961f9da8e7a12f252b3b9bfe2c1a2b5eba82cb4e2695c657dd388f0725e7b84da86999f73460f5da48a8aaa0e1c7858 SHA512 3d38ed863c538feaa525adb1b235002b9d3dcbe5f191b7d52e9105926fbae5b7360f61f16e6b3ee8045b9a76caf21b5ee3fcfb2bd6132cf992bc01845f0e008b
+DIST snitun-0.18.tar.gz 13217 BLAKE2B 54ad934319cedd311b553c2cc892a343968f1afb9bbc61d6d1c89177fa1b619fac97a5a5c93cf2cb0f408f969f918dd61240d54be10d8739b46d98487fa5757f SHA512 3e1bdb1a84be5b7a7c70e565af53103ee3ea1a6f26cf95eacac43ce0d9258b30fab54f86e7195c2f93d95c509bc74a0f7d150184682ef296b3c0a0cb95ebe95a
 EBUILD snitun-0.13.ebuild 697 BLAKE2B f8389bfbd440624234aab465126a11ba88db6293f118ac0335518e74689a1fff5af2ab0a1c18e3a5cfec314beddf334ec55bdec823d0a3a83f77f1eb365835dd SHA512 ccc90168a09b2f7c9da4e2504e0c2d5314aff459d763ed6542552010d8a64fd43ce47a2d81027c52f70505cad6c3b0d3d3f2965910090b7b54a7b131ec477099
 EBUILD snitun-0.15.ebuild 697 BLAKE2B f8389bfbd440624234aab465126a11ba88db6293f118ac0335518e74689a1fff5af2ab0a1c18e3a5cfec314beddf334ec55bdec823d0a3a83f77f1eb365835dd SHA512 ccc90168a09b2f7c9da4e2504e0c2d5314aff459d763ed6542552010d8a64fd43ce47a2d81027c52f70505cad6c3b0d3d3f2965910090b7b54a7b131ec477099
+EBUILD snitun-0.18.ebuild 697 BLAKE2B f8389bfbd440624234aab465126a11ba88db6293f118ac0335518e74689a1fff5af2ab0a1c18e3a5cfec314beddf334ec55bdec823d0a3a83f77f1eb365835dd SHA512 ccc90168a09b2f7c9da4e2504e0c2d5314aff459d763ed6542552010d8a64fd43ce47a2d81027c52f70505cad6c3b0d3d3f2965910090b7b54a7b131ec477099
 MISC metadata.xml 464 BLAKE2B 4cdc86467730ace375222c3ff6dd88c8257f555bb6b902820f92902ae2ea7825adcf72040a3cc42ca5503d5995d76598269ce361777989a58fb858b270d6c03b SHA512 bc1a3831bbac5215eb9e7bb0d2cddb8df6decd0635a7f9f48ebc70d4cd97530cd77bd1514c3e0852b7c2b55e4002a857c911bbcf9939abbc6b2ab55a3c2ec94b
--- a/dev-python/snitun/snitun-0.18.ebuild
+++ b/dev-python/snitun/snitun-0.18.ebuild
@ -0,0 +1,30 @@
+# 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_{5,6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="SNI proxy with TCP multiplexer"
+HOMEPAGE="https://www.nabucasa.com/ https://pypi.org/project/snitun/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3.0-only"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${REDEPEND}
+	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
+}
--- a/dev-python/solaredge-local/Manifest
+++ b/dev-python/solaredge-local/Manifest
@ -1,3 +1,5 @@
+DIST solaredge-local-0.1.4.tar.gz 12457 BLAKE2B 44a79af39bf04a5008ac960940795db15acfe04941cd00c1af802c27edeffba062c9797b36cfc8d740790537e85efdc34b2015e9512193a757273f0f2877a7b1 SHA512 4cca49fc00c45f84cdaa08523b95a27d225dd0f824629822a8661be328e5e112e8e017484b543fa4cbd91efba77459ba0d8deccb8615ba26b697322de9123a65
 DIST solaredge-local-0.2.0.tar.gz 21602 BLAKE2B b52cb4772035ab4a45dff3259af1fd2625203030e024a098c8e037cdece8a525b2aa621054682860bc0e52d871bc1b3e1e457f6beec420cdf42b36578677eb8d SHA512 85bd5bcf439d9a8f84ec75b0ee33d32cb8915d3248d59c0a3b48200f6711c3d1a7759f0fa844aff4d873b9e34f3400ba619671890c769bb58a9d75c7b18b125e
+EBUILD solaredge-local-0.1.4.ebuild 901 BLAKE2B 13e71399fec9070aea5d64bfe80dba105ad9db1ddaa5dfe7ae5c24f7942652b9888ed7da829a3cc46e7098589417fc58f3381a06e5c2cb4e3eca6b7d7bdadd85 SHA512 3eef87524e9975f5526943b51d7c8048f272a1f1f6739a46d834dbdccf7019c2b23fc6911cbf7e1561c42e76114ef82928b24978cb4d998cd823af35193a7b02
 EBUILD solaredge-local-0.2.0.ebuild 901 BLAKE2B 13e71399fec9070aea5d64bfe80dba105ad9db1ddaa5dfe7ae5c24f7942652b9888ed7da829a3cc46e7098589417fc58f3381a06e5c2cb4e3eca6b7d7bdadd85 SHA512 3eef87524e9975f5526943b51d7c8048f272a1f1f6739a46d834dbdccf7019c2b23fc6911cbf7e1561c42e76114ef82928b24978cb4d998cd823af35193a7b02
 MISC metadata.xml 341 BLAKE2B 3f0a3bde92ef7ae45de4ed7654cae9b04fa13f5f421f65ef9a0725713f651ff9d1d504e5f06173293671829862bfde9a86ed5ba87ce9970db932dda280ec8671 SHA512 33b1bcfacc0994080c00653f7628d8c904ef83e109921cb66f305f87b1d608f2554e1bd2df26148f3e686d33703e63f765727c4f152a3b0610d9f604ddd419a1
--- a/dev-python/solaredge-local/solaredge-local-0.1.4.ebuild
+++ b/dev-python/solaredge-local/solaredge-local-0.1.4.ebuild
@ -0,0 +1,37 @@
+# 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_{5,6,7} )
+
+inherit distutils-r1
+
+MY_P=${PN/-/_}-${PV}
+
+
+DESCRIPTION="API wrapper to communicate locally with SolarEdge Inverters"
+HOMEPAGE="https://github.com/drobtravels/solaredge-local https://pypi.org/project/solaredge-local/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${MY_P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT License"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+S=${WORKDIR}/${MY_P}
+
+RDEPEND=""
+DEPEND="${REDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/uplink[${PYTHON_USEDEP}]
+	dev-python/uplink-protobuf[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	nosetests --verbose || die
+	py.test -v -v || die
+}