diff --git a/CHANGELOG.txt b/CHANGELOG.txt index c36a10262..23a271ba4 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -5,6 +5,9 @@ - v0.54.1 - v0.55 - v0.55.1 + * update homeassistant-0.112.0_beta2 + * update esphome-1.14.4-r1 (only changed deps for HA compatibility) + * nail some deps in esphome-1.14.4 2020-06-27 * bump dynalite-devices-0.1.41 diff --git a/dev-embedded/esphome/Manifest b/dev-embedded/esphome/Manifest index a53600c91..da33113ae 100644 --- a/dev-embedded/esphome/Manifest +++ b/dev-embedded/esphome/Manifest @@ -18,6 +18,7 @@ EBUILD esphome-1.14.3-r4.ebuild 2763 BLAKE2B f9d0159c047a772162fc10ae1a9579a39e7 EBUILD esphome-1.14.3-r5.ebuild 2960 BLAKE2B 1c54714046adaaff7639c8d2673edecf0a9896827c39fd8831ebfe2ac8f8abf2187e51a03a198319cba708987f82bd3a5e257f6f6249d0d0403286d1800933ee SHA512 a7f714597a60310cb138b14d2669ca186a629b836dfe53257aa110b5f354b8d137a541fe1bc87df79f7249b7b80875cb94db06563b8a6d64b5700e5aa5e89dec EBUILD esphome-1.14.3-r6.ebuild 2918 BLAKE2B ec6955d37c8a87894fc7c204393b447ee803f9edde4683e56d0d19ef1b19e1070704d640450b78729dda0fc794745f6a940d5d4575ec45338d9e906afccc1f5b SHA512 728f9a0ba4236f62d294ba182c26d8859eda5be880382006a1a28756c640485d153b3730b21217a5e2f0b3b08bcd94d4e0fe0ad682598b7acbb230e151b1acf6 EBUILD esphome-1.14.3-r7.ebuild 3013 BLAKE2B 678007ee580a99524d580ba3f88b55a41388b3b31e63e14edd500c35e37e3695302201031556e49fd15698f6d241ef276e529da8fa17ca58907378ab2fe04293 SHA512 32b5c8bcd5bb38f597817ce53bb016f70506044122edfe1ebb6572264e813db876e8079b08bb465745be8abf9877c154a613fd16fb6ed44610daa73fc9cd73f2 -EBUILD esphome-1.14.4.ebuild 2626 BLAKE2B 2db4f77740799cc28a4c4aa51c54be5461fcc86445481436c24260df5803d58f95f847d89acca8da05e6dba69b8aa65a4397de7944f0c5ae0eb90a84cd70ae4e SHA512 8dc5dc64e17f596259fc5faa049961dfd773acbdb1fdf28af8882d117779d249b5b26cb8f675d43a6401be3d38b52cca89927145a7750f5b435e3219ac7617c7 +EBUILD esphome-1.14.4-r1.ebuild 2711 BLAKE2B bf65b215742a22ff040725336afa61e368730f4b5deaa57b90be280de09643dfcabe719f2f6c27bdfc766aa3f5908b53946b49560c206fec3507f78fdfa25b9b SHA512 1f3613c273228434edcc48fde6030f67974c3b286e6040fa8107bde2dde79d1585a2ca7f691ea178c8811f417338e8ad5af487ee587a28446de0ef1fe2b7fdd8 +EBUILD esphome-1.14.4.ebuild 2622 BLAKE2B cb7fe05d60c25fa68ceec541d2a7fd9627e9be2ca07a85303a6e094d9a7bbaaf8d47b2acd67a9568c4e02e78bee6e6a5f0d4c9f809804d6f6a2281922cbd0d7e SHA512 348ee862c4ad8a7b71ee6368a66a983c2d84c094008e8495733cdba3b19e323acc98ad16e6446bdfbdcfc15fb9a1b2ac04013e6dcb78b5c855942289e7e4671d EBUILD esphome-9999.ebuild 2628 BLAKE2B f77ee9420c88e9ae6a980e9fc8ff30eb8e0d88c152efa36f6639567d69117efae99168e566067219c6f402df2687b943dced2e7b4117383e0928ed5bdb4c2ec8 SHA512 3d41b2e42572dcbe5a0f86eadf9cd70181617d5e39486a7aebf8d3b122c9d2fb1c9e6c00601235ea6f39f42d5fcb2508f8e188793a0c1f32935d8bc4bccf3928 MISC metadata.xml 568 BLAKE2B bf87d46e048c7db7d8bcbf2a4c9e730e3b084504ca3708520635c92805f99554ad88fe15eba5c9566f5db8c977bf11014aa8f4a94dcc3f5a9e633f15c7438516 SHA512 c84dd850464fa34e84576c1548c2a17b036543b682a2693ca3d95bdde62014e632116a84479ac42539e9d04e97386aa3326fe587043443dd1895d01bf70463c2 diff --git a/dev-embedded/esphome/esphome-1.14.4-r1.ebuild b/dev-embedded/esphome/esphome-1.14.4-r1.ebuild new file mode 100644 index 000000000..17901dc5e --- /dev/null +++ b/dev-embedded/esphome/esphome-1.14.4-r1.ebuild @@ -0,0 +1,102 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python3_{6,7} ) + +inherit readme.gentoo-r1 distutils-r1 + +if [[ ${PV} == *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/esphome/esphome.git" + EGIT_BRANCH="dev" + S="${WORKDIR}/${P}/" +else + MY_P=${P/_beta/b} + MY_PV=${PV/_beta/b} + # SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" + SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz" + S="${WORKDIR}/${MY_P}/" +fi + +DESCRIPTION="Make creating custom firmwares for ESP32/ESP8266 super easy." +HOMEPAGE="https://github.com/esphome/esphome https://pypi.org/project/esphome/" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="amd64 arm64 x86 amd64-linux x86-linux" +IUSE="server test" + +RDEPEND="" +DEPEND="${RDEPEND} + server? ( acct-group/${PN} acct-user/${PN} ) + ~dev-python/voluptuous-0.11.7[${PYTHON_USEDEP}] + ~dev-python/pyyaml-5.3.1[${PYTHON_USEDEP}] + ~dev-python/paho-mqtt-1.5.0[${PYTHON_USEDEP}] + ~dev-python/colorlog-4.1.0[${PYTHON_USEDEP}] + ~dev-python/ifaddr-0.1.6[${PYTHON_USEDEP}] + ~www-servers/tornado-6.0.4[${PYTHON_USEDEP}] + ~dev-python/protobuf-python-3.11.4[${PYTHON_USEDEP}] + ~dev-libs/protobuf-3.11.4 + ~dev-python/tzlocal-2.0.0[${PYTHON_USEDEP}] + ~dev-python/pytz-2020.1[${PYTHON_USEDEP}] + ~dev-python/pyserial-3.4[${PYTHON_USEDEP}] + + dev-python/setuptools[${PYTHON_USEDEP}] + test? ( + dev-python/nose[${PYTHON_USEDEP}] + dev-python/pytest[${PYTHON_USEDEP}] + ) + ~dev-embedded/platformio-4.3.4 + ~dev-embedded/esptool-2.8[${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 +" + +DOCS="README.md" + +src_prepare() { + sed -e 's;tornado==5.1.1;tornado==6.0.4;' \ + -i esphome.egg-info/requires.txt \ + -i setup.py + sed -e 's;protobuf==3.11.3;protobuf==3.11.4;' \ + -i esphome.egg-info/requires.txt \ + -i setup.py + sed -e 's;pytz==2019.3;pytz==2020.1;' \ + -i esphome.egg-info/requires.txt \ + -i setup.py + eapply_user +} + +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-r2" "${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 +} diff --git a/dev-embedded/esphome/esphome-1.14.4.ebuild b/dev-embedded/esphome/esphome-1.14.4.ebuild index b298213a9..6fda49651 100644 --- a/dev-embedded/esphome/esphome-1.14.4.ebuild +++ b/dev-embedded/esphome/esphome-1.14.4.ebuild @@ -31,7 +31,7 @@ IUSE="server test" RDEPEND="" DEPEND="${RDEPEND} server? ( acct-group/${PN} acct-user/${PN} ) - >=dev-python/voluptuous-0.11.7[${PYTHON_USEDEP}] + ~dev-python/voluptuous-0.11.7[${PYTHON_USEDEP}] ~dev-python/pyyaml-5.3.1[${PYTHON_USEDEP}] ~dev-python/paho-mqtt-1.5.0[${PYTHON_USEDEP}] ~dev-python/colorlog-4.1.0[${PYTHON_USEDEP}] @@ -39,9 +39,9 @@ DEPEND="${RDEPEND} ~www-servers/tornado-6.0.4[${PYTHON_USEDEP}] ~dev-python/protobuf-python-3.11.4[${PYTHON_USEDEP}] ~dev-libs/protobuf-3.11.4 - >=dev-python/tzlocal-2.0.0[${PYTHON_USEDEP}] - >=dev-python/pytz-2019.3[${PYTHON_USEDEP}] - >=dev-python/pyserial-3.4[${PYTHON_USEDEP}] + ~dev-python/tzlocal-2.0.0[${PYTHON_USEDEP}] + ~dev-python/pytz-2019.3[${PYTHON_USEDEP}] + ~dev-python/pyserial-3.4[${PYTHON_USEDEP}] dev-python/setuptools[${PYTHON_USEDEP}] test? (