From 1e38c8b7d07f9bbb541244035897839bdd5eaa9a Mon Sep 17 00:00:00 2001 From: Andreas Billmeier Date: Sat, 1 Feb 2020 08:18:15 +0100 Subject: [PATCH] expanded version patches on ESPHome-1.14.3-r5 --- CHANGELOG.txt | 10 +- dev-embedded/esphome/Manifest | 3 +- dev-embedded/esphome/esphome-1.14.3-r4.ebuild | 2 +- dev-embedded/esphome/esphome-1.14.3-r5.ebuild | 119 ++++++++++++++++++ 4 files changed, 130 insertions(+), 4 deletions(-) create mode 100644 dev-embedded/esphome/esphome-1.14.3-r5.ebuild diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 3d55b489b..0873252ea 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,7 +1,13 @@ 2020-01-31 homeassistant-0.105.0.beta2 * update s3transfer-0.2.1 - * aiobotocore-0.11.1-r1: fix botocore dependency - * update botocore-1.13.14 (from main repo archive) + * aiobotocore-0.11.1-r1: fix botocore dependency (experimental) + * update botocore-1.13.14 (from main repo archive) (experimental) + * expanded version patches on ESPHome: + =dev-libs/protobuf-3.10.1 + ~dev-python/paho-mqtt-1.5.0[${PYTHON_USEDEP}] + =dev-python/pyyaml-5.3[${PYTHON_USEDEP}] + =dev-embedded/platformio-4.1.0 + =dev-python/colorlog-4.1.0[${PYTHON_USEDEP}] 2020-01-30 homeassistant-0.105.0_beta1 * update homeassistant-0.105.0_beta0, add ~arm64 arch for testing diff --git a/dev-embedded/esphome/Manifest b/dev-embedded/esphome/Manifest index 898be014f..ebb1e6e5b 100644 --- a/dev-embedded/esphome/Manifest +++ b/dev-embedded/esphome/Manifest @@ -21,7 +21,8 @@ EBUILD esphome-1.14.2.ebuild 2429 BLAKE2B f72e80a8bd816a3321db9ecdd755cf9d2d3186 EBUILD esphome-1.14.3-r1.ebuild 2485 BLAKE2B 88fe7a00e5752a33e2ce7339df536c292ba3e62fde89c4538b80baff4db2effb7f337e72e876659865f0de90d62830fcecfdac6b26234345b6157c4e81ab5bdc SHA512 09d26863cba206323b1dddca93fca43ac8f5bc8d021675163250b99825a80288ccc60b7641b60ac80c9cdb4f7639042b38670dd3d09adcb87c7270023a5eddf8 EBUILD esphome-1.14.3-r2.ebuild 2511 BLAKE2B 6f4a4f1c7113b07a7b2015784dbf62dd618a8f8b8d0331ef6428884210b23a0543e15380dcd7e52397d5cb040755542540213959844fbc741071a64d18c66339 SHA512 cf605c65a990dd9af66872359f8d1cfb3c9e6e2cd0a3300b23500b71393398da3a5a4796e61e7b89848a6e2f903f8d3c4b7940e0a216c411a958114e9615d23f EBUILD esphome-1.14.3-r3.ebuild 2745 BLAKE2B 408d17eda3c40e8cd37e55b37417c2940598a3abde321e4cb28b176c1dbcc70c7c0eb914fbd04b8f0587a5638180080eea035d78a8c4375fb8b1b4bb9abbd325 SHA512 2be8ddc429fa96264ac0c29db3f1da43f6411234a40a43bde2cef62fb0fdd9911ff8adee75207bb5afaaa178754b3103be63cfa015ef0c91dcef59a691a89b81 -EBUILD esphome-1.14.3-r4.ebuild 2837 BLAKE2B 03444b565bea09cc2da6b91f20b23f4c4df165eeecd96928237a8823bd77f5fccef3f51ee1c31f52b74a2fc731a7d54e91a054184871061c31e057413403fabb SHA512 94dd943285d95c7100ff267fbcdc272fb8d0d0779668bdf4fb983e69759280183a63a40f1ee7fd7b1cd9bb3a016052169f6c912b04e0dcac6167b546fb40e92f +EBUILD esphome-1.14.3-r4.ebuild 2836 BLAKE2B dafa9c82dab103c99af2129dbfde310e6a068d3a61a63ea8b25f98d38c288138610178eedddb3f3c4881ee00164e7d682017574e450ef1534e8644a738792900 SHA512 b4382dc2b94b7e6aab0da8b304e1227eabd03b2dd716f8b9ecb41b3d1c755b69d6650a862b944389c6f029268a5a8e60f507d7b74a0ffdfc8a088decd8ef960c +EBUILD esphome-1.14.3-r5.ebuild 3031 BLAKE2B 34f0b773370aa5e0543f718519083d9da2338df7eab064dc5124f813000d20942ca60a4c704a178a2f786aa27e0ac25bc200c42cbb41d0dfbe518b456bd7ef9f SHA512 5713a5fd1ddfa2efcecb636b5526819b7157e218d5707281541c8533eaf60742b57a19203fd8fac6f1ef05a1aafac618c5884f82936c5dca032ca744d83a624a EBUILD esphome-1.14.3.ebuild 2485 BLAKE2B 8e71310c35d92c5394f3a43ce94aafcb4c9df6b36c696450217290f35bff765bbd52deb7e0dbcc8f2847540e4e5d167634da079bfe2d220653f602a2e0ea79f2 SHA512 af1f224b782128c4f4777b599ba7836dc44cb2bcc536afdf2eecbc1dd294ce52c809d89c1136d2b8e1193ee361b2a96a0f12392a341e01c956c7d0d4dc406b3b EBUILD esphome-9999.ebuild 2837 BLAKE2B 03444b565bea09cc2da6b91f20b23f4c4df165eeecd96928237a8823bd77f5fccef3f51ee1c31f52b74a2fc731a7d54e91a054184871061c31e057413403fabb SHA512 94dd943285d95c7100ff267fbcdc272fb8d0d0779668bdf4fb983e69759280183a63a40f1ee7fd7b1cd9bb3a016052169f6c912b04e0dcac6167b546fb40e92f MISC metadata.xml 568 BLAKE2B bf87d46e048c7db7d8bcbf2a4c9e730e3b084504ca3708520635c92805f99554ad88fe15eba5c9566f5db8c977bf11014aa8f4a94dcc3f5a9e633f15c7438516 SHA512 c84dd850464fa34e84576c1548c2a17b036543b682a2693ca3d95bdde62014e632116a84479ac42539e9d04e97386aa3326fe587043443dd1895d01bf70463c2 diff --git a/dev-embedded/esphome/esphome-1.14.3-r4.ebuild b/dev-embedded/esphome/esphome-1.14.3-r4.ebuild index ed70aa9fc..30ec1a988 100644 --- a/dev-embedded/esphome/esphome-1.14.3-r4.ebuild +++ b/dev-embedded/esphome/esphome-1.14.3-r4.ebuild @@ -34,7 +34,7 @@ DEPEND="${REDEPEND} dev-python/setuptools[${PYTHON_USEDEP}] >=dev-python/tzlocal-2.0.0[${PYTHON_USEDEP}] >=dev-python/voluptuous-0.11.7[${PYTHON_USEDEP}] - >=dev-embedded/platformio-4.0.3 + =dev-embedded/platformio-4.0.3 >=dev-python/pyyaml-5.1.2[${PYTHON_USEDEP}] >=dev-python/paho-mqtt-1.4.0[${PYTHON_USEDEP}] >=dev-python/colorlog-4.0.2[${PYTHON_USEDEP}] diff --git a/dev-embedded/esphome/esphome-1.14.3-r5.ebuild b/dev-embedded/esphome/esphome-1.14.3-r5.ebuild new file mode 100644 index 000000000..e4c2bd48c --- /dev/null +++ b/dev-embedded/esphome/esphome-1.14.3-r5.ebuild @@ -0,0 +1,119 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python3_{6,7} ) + +inherit user 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 ~x86 ~amd64-linux ~x86-linux" +IUSE="server test" + +RDEPEND="" +DEPEND="${REDEPEND} + dev-python/setuptools[${PYTHON_USEDEP}] + >=dev-python/tzlocal-2.0.0[${PYTHON_USEDEP}] + >=dev-python/voluptuous-0.11.7[${PYTHON_USEDEP}] + ~dev-embedded/esptool-2.7[${PYTHON_USEDEP}] + >=dev-python/typing-3.6.6[${PYTHON_USEDEP}] + >=dev-python/protobuf-python-3.10.0[${PYTHON_USEDEP}] + >=dev-python/pyserial-3.4[${PYTHON_USEDEP}] + >=dev-python/pytz-2019.3[${PYTHON_USEDEP}] + server? ( >=dev-python/ifaddr-0.1.6 + >=www-servers/tornado-5.1.1[${PYTHON_USEDEP}] ) + test? ( + dev-python/nose[${PYTHON_USEDEP}] + dev-python/pytest[${PYTHON_USEDEP}] + ) + =dev-libs/protobuf-3.10.1 + ~dev-python/paho-mqtt-1.5.0[${PYTHON_USEDEP}] + =dev-python/pyyaml-5.3[${PYTHON_USEDEP}] + =dev-embedded/platformio-4.1.0 + =dev-python/colorlog-4.1.0[${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" + +pkg_setup() { + if use server; then + enewgroup "${PN}" + enewuser "${PN}" -1 -1 "/etc/${PN}" "${PN}" + fi +} + +src_prepare() { + sed -e 's;protobuf==3.10.0;protobuf==3.10.1;' \ + -i esphome.egg-info/requires.txt \ + -i setup.py + sed -e 's;paho-mqtt==1.4.0;paho-mqtt==1.5.0;' \ + -i esphome.egg-info/requires.txt \ + -i setup.py + sed -e 's;PyYAML==5.1.2;PyYAML==5.3;' \ + -i esphome.egg-info/requires.txt \ + -i setup.py + sed -e 's;platformio==4.0.3;platformio==4.1.0;' \ + -i esphome.egg-info/requires.txt \ + -i setup.py + sed -e 's;colorlog==4.0.2;colorlog==4.1.0;' \ + -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 +}