update compatibility patches for ESPHome's dependencies, remove typing
This commit is contained in:
parent
4973658276
commit
a0234533e0
GPG Key ID:
E6DB12C8C550F3C0
@ -57,6 +57,7 @@
|
||||
* remove pyyaml-5.3.1 (dupe)
|
||||
* remove obsolete typing backport from newer HA versions
|
||||
* update platformio-4.3.1
|
||||
* update compatibility patches fpr ESPHome's dependencies, remove typing
|
||||
|
||||
2020-04-05 homeassistant-0.108.0_beta3
|
||||
* add tesla-powerwall-0.1.4
|
||||
|
||||
@ -15,5 +15,6 @@ EBUILD esphome-1.14.1.ebuild 2401 BLAKE2B 5775b279611328397427dedb8b3dcd75dabfe2
|
||||
EBUILD esphome-1.14.2.ebuild 2356 BLAKE2B 552a84f37b608ae783cdd78d5f86e2f9057d986c9b1b28cdf2ee0b7300dbeddebd32ecb4fc5060d948b36f3bfea4868f25a4917b2508407a993fae390993abfa SHA512 ca6076c8b39ed83c910d7434d0e2fbfb6e686109d209739503be9d87b19fffb5df3f33422ba26748c198075f08c66f01f1e2293d2831cdb34794aa90a3071937
|
||||
EBUILD esphome-1.14.3-r4.ebuild 2763 BLAKE2B f9d0159c047a772162fc10ae1a9579a39e7db107f7f774490d8c5355ae9fe7104ae6d8620f0a8c3484b475a15f6b289d2d164481490509ea097862df6c9ebdef SHA512 0cdf1b06135f2a64b1194edcd79d1be8c2fdf7aee8d5c7cc20c155a9f32096a0af2e5ab66b02e59c12d78ee477a8cb51982706a17e3523e7ed59c6a8dd775a0e
|
||||
EBUILD esphome-1.14.3-r5.ebuild 2960 BLAKE2B 1c54714046adaaff7639c8d2673edecf0a9896827c39fd8831ebfe2ac8f8abf2187e51a03a198319cba708987f82bd3a5e257f6f6249d0d0403286d1800933ee SHA512 a7f714597a60310cb138b14d2669ca186a629b836dfe53257aa110b5f354b8d137a541fe1bc87df79f7249b7b80875cb94db06563b8a6d64b5700e5aa5e89dec
|
||||
EBUILD esphome-9999.ebuild 2872 BLAKE2B ade957beb587b4da0b01bb676865ba97139adf172d6d606fd72eff342c63c28c96ec2498d16f8dcde881a7e2b17e0050ac4e0421795bba7176e3bf65ceb9bcb2 SHA512 4ab14de5e0be26e19eab0db90df450db94306fb9bdc62285b3c97c4f7faba54c78b3f575342369b1ccf3067c19223f4c56c52a4ae4a6e703eb30d83d953fa9fb
|
||||
EBUILD esphome-1.14.3-r6.ebuild 2919 BLAKE2B 482e4c5bdb8d039ec1f2aa809b5e46e19ad063fed06995ab2b5c9378de71f74d2e9cae966cc91da5981b87701d330f70f2ade78bebe897a42fc3124de6e59145 SHA512 fa58230dabf43307a75408765b73ab10df7039819a107c562029963194d428910766e5a9f188ec7e75b8ce9f6d53310f2c3a18d27213dd8651455c5d0aa135bf
|
||||
EBUILD esphome-9999.ebuild 2919 BLAKE2B 482e4c5bdb8d039ec1f2aa809b5e46e19ad063fed06995ab2b5c9378de71f74d2e9cae966cc91da5981b87701d330f70f2ade78bebe897a42fc3124de6e59145 SHA512 fa58230dabf43307a75408765b73ab10df7039819a107c562029963194d428910766e5a9f188ec7e75b8ce9f6d53310f2c3a18d27213dd8651455c5d0aa135bf
|
||||
MISC metadata.xml 568 BLAKE2B bf87d46e048c7db7d8bcbf2a4c9e730e3b084504ca3708520635c92805f99554ad88fe15eba5c9566f5db8c977bf11014aa8f4a94dcc3f5a9e633f15c7438516 SHA512 c84dd850464fa34e84576c1548c2a17b036543b682a2693ca3d95bdde62014e632116a84479ac42539e9d04e97386aa3326fe587043443dd1895d01bf70463c2
|
||||
|
||||
107
dev-embedded/esphome/esphome-1.14.3-r6.ebuild
Normal file
107
dev-embedded/esphome/esphome-1.14.3-r6.ebuild
Normal file
@ -0,0 +1,107 @@
|
||||
# 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/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/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.11.4
|
||||
~dev-python/paho-mqtt-1.5.0[${PYTHON_USEDEP}]
|
||||
~dev-python/pyyaml-5.3.1[${PYTHON_USEDEP}]
|
||||
~dev-embedded/platformio-4.3.1
|
||||
~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"
|
||||
|
||||
src_prepare() {
|
||||
sed -e 's;protobuf==3.10.0;protobuf==3.11.4;' \
|
||||
-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.1;' \
|
||||
-i esphome.egg-info/requires.txt \
|
||||
-i setup.py
|
||||
sed -e 's;platformio==4.0.3;platformio==4.3.1;' \
|
||||
-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
|
||||
}
|
||||
@ -3,7 +3,7 @@
|
||||
|
||||
EAPI=6
|
||||
|
||||
PYTHON_COMPAT=( python3_{6,7,8} )
|
||||
PYTHON_COMPAT=( python3_{6,7} )
|
||||
|
||||
inherit readme.gentoo-r1 distutils-r1
|
||||
|
||||
@ -25,7 +25,7 @@ HOMEPAGE="https://github.com/esphome/esphome https://pypi.org/project/esphome/"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
|
||||
KEYWORDS="amd64 arm64 x86 amd64-linux x86-linux"
|
||||
IUSE="server test"
|
||||
|
||||
RDEPEND=""
|
||||
@ -35,8 +35,7 @@ DEPEND="${RDEPEND}
|
||||
>=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.11.1[${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
|
||||
@ -45,10 +44,10 @@ DEPEND="${RDEPEND}
|
||||
dev-python/nose[${PYTHON_USEDEP}]
|
||||
dev-python/pytest[${PYTHON_USEDEP}]
|
||||
)
|
||||
~dev-libs/protobuf-3.10.1
|
||||
~dev-libs/protobuf-3.11.4
|
||||
~dev-python/paho-mqtt-1.5.0[${PYTHON_USEDEP}]
|
||||
~dev-python/pyyaml-5.3[${PYTHON_USEDEP}]
|
||||
~dev-embedded/platformio-4.1.0
|
||||
~dev-python/pyyaml-5.3.1[${PYTHON_USEDEP}]
|
||||
~dev-embedded/platformio-4.3.1
|
||||
~dev-python/colorlog-4.1.0[${PYTHON_USEDEP}]
|
||||
"
|
||||
|
||||
@ -64,18 +63,21 @@ support at https://git.edevau.net/onkelbeh/HomeAssistantRepository
|
||||
DOCS="README.md"
|
||||
|
||||
src_prepare() {
|
||||
sed -e 's;protobuf==3.10.0;protobuf==3.10.1;' \
|
||||
sed -e 's;protobuf==3.10.0;protobuf==3.11.4;' \
|
||||
-i esphome.egg-info/requires.txt \
|
||||
-i setup.py
|
||||
sed -e 's;PyYAML==5.1.2;PyYAML==5.3;' \
|
||||
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.1;' \
|
||||
-i esphome.egg-info/requires.txt \
|
||||
-i setup.py
|
||||
sed -e 's;platformio==4.0.3;platformio==4.3.1;' \
|
||||
-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
|
||||
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
|
||||
}
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user