diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 1e46d8dfe..52066a452 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -27,6 +27,7 @@ * update esphome-9999 to 1.14.5 * update colorlog-4.2.1 * update ifaddr-0.1.7 + * update esphome-1.15.0_beta1, read Ebuild before using it. 2020-07-27 * update teslajsonpy-0.10.1 diff --git a/dev-embedded/esphome/Manifest b/dev-embedded/esphome/Manifest index 678ae3d0a..1e586e902 100644 --- a/dev-embedded/esphome/Manifest +++ b/dev-embedded/esphome/Manifest @@ -9,6 +9,7 @@ DIST esphome-1.14.2.tar.gz 1032605 BLAKE2B 15bbb4c6d56780035f23ef429265bb557c4ba DIST esphome-1.14.3.tar.gz 1003300 BLAKE2B 9b785e927155408c5b854960ea68312671d653de574187a058133e920a8d9718010eb5262172b090ec26c962803d8d55efe98ca5b99763dd3da2c6e8ce0efc02 SHA512 94975ccfbd9024779566431d32631090ad50a2946759d9c02845b4b60e46e3442ab4c3eb1d5e74f188d9c60e79342cbceb404073ac6a12967ed4d6a2f3c3afb3 DIST esphome-1.14.4.tar.gz 1005274 BLAKE2B cb974e81c36d70f48984d2d23c87d52352a697c7bee062f8e755a2025b29b317bc370dc06131d5fed32161a8fe899ae0811e9ba4619b337ca6673ab167519bd1 SHA512 1bb159c930756939997175b57481ac3b3fbd0930d3337053419ced2b002213384d749a4a8f19d54bb1a1eb91fa154d7cc72b5e15a95ae41a7f0e293913725608 DIST esphome-1.14.5.tar.gz 1005279 BLAKE2B a403a8c48c67640555c466b42e4476c514b1446c69e9470f3b48f56aa4e0c7e84ec2c5dcbf96711ed9c4ff5693f5ef937af6fed01e627882e52abdfb79d37207 SHA512 bf07d994c2f33a3051dbc25d377ec18a615b02fa9448bcf7aeed48fa1ec1d6fa55b08433c97113caa31eb8073eb41e935ac80f1d9fcee0cef86eb0afcd98cb2d +DIST esphome-1.15.0_beta1.tar.gz 1220157 BLAKE2B 9a5ed7f79dc62204cbc35c98f8597bf51dd00a3689e2f27e4cd5bb32a5d6746a76251f1bcd0e41478d606b076af164f97562bca48a1abb89bfc93b8984c82fac SHA512 f624a576544bb4631deda91ed3e058a2424ca5a536a307088cf1a40899b9f2d997d726426c71763f6c5fd2eb8515665c7a191fcc61310b5b9aea8a2a1070b9ff EBUILD esphome-1.13.2.ebuild 2200 BLAKE2B 508d86e0c4d6909bd149c92642c69a75d864b45a79d13b381dd7c6141a245e011e58c62fda49e285b0b9f02931f67486db0d56082fc84f5b995aa20b2573c7bb SHA512 567288ab7d4ee64dbc8f6b6817a03b1a19ef638be8d89c77e03d015961b9d3d26dd8e165db381879e254246bb2fa7d3ecf74c0221498ad9b85217589e9d0da52 EBUILD esphome-1.13.6-r1.ebuild 2252 BLAKE2B d554111ca4d1a3a0f8e0ed20e3e3f25411edb314fa2aaacede11d133be9dffcf8d484c3b071d2d31ec4b79515b8616c1a30a226839ab07df452911fe79a10208 SHA512 1075af5d95a03cbb9f0f00638bd8a159ce0caf322c41efd4d6b79b062222c95cba94c3c1b2f55690cb1f5b46f615f6150349887cf6c7d0aab16db82f131d7f34 EBUILD esphome-1.13.6.ebuild 2200 BLAKE2B 508d86e0c4d6909bd149c92642c69a75d864b45a79d13b381dd7c6141a245e011e58c62fda49e285b0b9f02931f67486db0d56082fc84f5b995aa20b2573c7bb SHA512 567288ab7d4ee64dbc8f6b6817a03b1a19ef638be8d89c77e03d015961b9d3d26dd8e165db381879e254246bb2fa7d3ecf74c0221498ad9b85217589e9d0da52 @@ -22,5 +23,6 @@ EBUILD esphome-1.14.3-r7.ebuild 3013 BLAKE2B 678007ee580a99524d580ba3f88b55a4138 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-1.14.5.ebuild 2619 BLAKE2B f35dbe31e6cbb84633837f041902a14c4ba1390167c2c82aa55a08e7465578b58f8a85251492252045554f8cff629e1d40961a4615ee272f457f11277ac5c700 SHA512 76d0d29349a63228a79100db00741556560ac3aa475dceda4dca662f41ac9bdd84fe7a6df1704e3dc35902622eba3e66a7c1e818a3f216670874e55619293161 -EBUILD esphome-9999.ebuild 2624 BLAKE2B 1ca4d253a025c70b8fe33a74c904aafc24aa01f54f3ddf625055600413f3b8bef6b2f754ce91f9c93f0d9ac502487777234e34599efae778d6e213294527ade8 SHA512 3131926ae16aef5d5ae9fac8193b65444c54389693ded1468fcc6a6849f9a79a224f4d27b7c7dd2b6ada72b4dd909f708f721ea9065f14087bfac1cf34072c7a +EBUILD esphome-1.15.0_beta1.ebuild 2809 BLAKE2B 53697a8facd55ff909a360764131f071fb86f065de279d00bc7df8fa5d8794d218c624c2ad6b4843657273b0e4e2c14fe606329660e67203c0e82a0bd21a0923 SHA512 c824319d1f2922ac9986a251174ac0f5ab2edb50363d92608c56f69da43d89a27fa4625904bbd0ae64b586e667c50504fa024f9e020f221ff84efb2a80a59254 +EBUILD esphome-9999.ebuild 2809 BLAKE2B 53697a8facd55ff909a360764131f071fb86f065de279d00bc7df8fa5d8794d218c624c2ad6b4843657273b0e4e2c14fe606329660e67203c0e82a0bd21a0923 SHA512 c824319d1f2922ac9986a251174ac0f5ab2edb50363d92608c56f69da43d89a27fa4625904bbd0ae64b586e667c50504fa024f9e020f221ff84efb2a80a59254 MISC metadata.xml 568 BLAKE2B bf87d46e048c7db7d8bcbf2a4c9e730e3b084504ca3708520635c92805f99554ad88fe15eba5c9566f5db8c977bf11014aa8f4a94dcc3f5a9e633f15c7438516 SHA512 c84dd850464fa34e84576c1548c2a17b036543b682a2693ca3d95bdde62014e632116a84479ac42539e9d04e97386aa3326fe587043443dd1895d01bf70463c2 diff --git a/dev-embedded/esphome/esphome-1.15.0_beta1.ebuild b/dev-embedded/esphome/esphome-1.15.0_beta1.ebuild new file mode 100644 index 000000000..a3472564b --- /dev/null +++ b/dev-embedded/esphome/esphome-1.15.0_beta1.ebuild @@ -0,0 +1,100 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +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}/${MY_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.7[${PYTHON_USEDEP}] + ~www-servers/tornado-6.0.4[${PYTHON_USEDEP}] + ~dev-python/protobuf-python-3.12.2[${PYTHON_USEDEP}] + ~dev-libs/protobuf-3.12.2 + ~dev-python/tzlocal-2.1[${PYTHON_USEDEP}] + ~dev-python/pytz-2020.1[${PYTHON_USEDEP}] + ~dev-python/pyserial-3.4[${PYTHON_USEDEP}] + ~dev-python/click-7.1.2[${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" + +# site-packages/homeassistant/components/tensorflow has a dep to protobuf==3.6.1 +# which I ignored because tensorflow-1.13.2 is very outdated +# site-packages/homeassistant/scripts/check_config.py:REQUIREMENTS = ("colorlog==4.1.0",) +src_prepare() { + sed -e 's;colorlog==4.2.1;colorlog==4.1.0;' \ + -i esphome.egg-info/requires.txt \ + -i requirements.txt + 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-9999.ebuild b/dev-embedded/esphome/esphome-9999.ebuild index b8a359dc1..a3472564b 100644 --- a/dev-embedded/esphome/esphome-9999.ebuild +++ b/dev-embedded/esphome/esphome-9999.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 PYTHON_COMPAT=( python3_{6,7} ) @@ -15,8 +15,8 @@ if [[ ${PV} == *9999* ]]; then 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" + SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz" + #SRC_URI="mirror://pypi/${P:0:1}/${PN}/${MY_P}.tar.gz" S="${WORKDIR}/${MY_P}/" fi @@ -35,13 +35,14 @@ DEPEND="${RDEPEND} ~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}] + ~dev-python/ifaddr-0.1.7[${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/protobuf-python-3.12.2[${PYTHON_USEDEP}] + ~dev-libs/protobuf-3.12.2 + ~dev-python/tzlocal-2.1[${PYTHON_USEDEP}] ~dev-python/pytz-2020.1[${PYTHON_USEDEP}] ~dev-python/pyserial-3.4[${PYTHON_USEDEP}] + ~dev-python/click-7.1.2[${PYTHON_USEDEP}] dev-python/setuptools[${PYTHON_USEDEP}] test? ( @@ -63,13 +64,13 @@ support at https://git.edevau.net/onkelbeh/HomeAssistantRepository DOCS="README.md" +# site-packages/homeassistant/components/tensorflow has a dep to protobuf==3.6.1 +# which I ignored because tensorflow-1.13.2 is very outdated +# site-packages/homeassistant/scripts/check_config.py:REQUIREMENTS = ("colorlog==4.1.0",) src_prepare() { - sed -e 's;tornado==5.1.1;tornado==6.0.4;' \ + sed -e 's;colorlog==4.2.1;colorlog==4.1.0;' \ -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 + -i requirements.txt eapply_user }