adjust esphome-1.15.3-r2 to homeassistant-2020.12.1 DEPS

update esphome-9999 (for testing)
2020-12-20 11:11:11 +01:00 · 2020-12-20 11:11:11 +01:00 · 7705cf0637
parent b0fc13027f
commit 7705cf0637
5 changed files with 20 additions and 116 deletions
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@ -2,6 +2,8 @@
  * update tornado-6.1
  * update esptool-3.0
  * bump platformio-5.0.3
+  * adjust esphome-1.15.3-r2 to homeassistant-2020.12.1 DEPS
+  * update esphome-9999 (for testing)

 2020-12-19
  * update dtlssocket-0.1.11, dtlssocket-0.1.12
--- a/dev-embedded/esphome/Manifest
+++ b/dev-embedded/esphome/Manifest
@ -12,11 +12,10 @@ EBUILD esphome-1.14.3-r7.ebuild 3018 BLAKE2B 603133a6346602747a78ba9eccc13e73a8f
 EBUILD esphome-1.14.4-r1.ebuild 2716 BLAKE2B b1b58c6d6e21e54de1eebca40c091683317e97ad6124bcb60c51a09fd4923397bfe22f29f109fbe7cb0ba2ac42617bf16262567823fafdcb6594e512b4e34047 SHA512 5d79ef959a5ff66da37b2486d3fc03ebbba20b63b5f3edc7ba5e226b862037563f3cbc27915124f77f74a242784f21ce1c7a6093f90f7303e0e35e48aa0ebedc
 EBUILD esphome-1.14.5-r1.ebuild 2810 BLAKE2B 1b3e22a0a649936038ff0dc9168fc2630e986047b502c0a2691f74a0adb684f61d142708989533228708c70501fb9f19b85e169b9ddee1eec496270c129ac7ad SHA512 93e0c0b3caf9815aae73f0fbd55a1d77f84a193bf3dafb8b5a9c99b2b4fc0d1268a1f1fcda9bb7cd777cd34cd9f439953c11a7e8638ce6cd68fbb0005e897f21
 EBUILD esphome-1.14.5-r2.ebuild 2895 BLAKE2B 33d24d1268ae170518c3849b8650a8cd4185ce64e20598ab7db0ceff334c406f2cc07b7fc15f423f2c558ba8d20a711b058096fd95c643d3e1516cdc58fe3bb4 SHA512 4180abb0064e9bb265e9db4de819648b11bedc162ec792dcbe61cfd33236ff8cc4089ec01e62d796736cf4bc8b19e7b369b2f31bc4b82879f4ba4c3d8be57f44
-EBUILD esphome-1.14.5.ebuild 2716 BLAKE2B d04bdcb891a594bf323b49d59eb03884c398121985cf8cf027971ab924a957cb5a62b20627f1dc609d5ed064e25c6fe05a9e598bf16af1c491b96c24e5573a2b SHA512 c962882516710a03ef890f85a75d8c1823f18bbb52c1bd999533f5bc5dfd6ca9e564c2890282f650c1c8c6af34ed99dc2272110ce20d4000d2c99bb2959c12ae
 EBUILD esphome-1.15.0.ebuild 2770 BLAKE2B 49d791e4b9d2f2bbadc4678d25ec86024a31cc3eaba8057686413e2ce14198296822d5a7f7b4b75e6ea9b3f70d21bf979d8f16905bd977a427118f80bb75e38c SHA512 d3b1e50d63120aeb78f8305de71d4f155ea640877e928f2946c22d9e4f5e06693c22ec415bfa11461c405d49f82c384bc9306a2313a1670a8cdfd740e0e5eb08
 EBUILD esphome-1.15.1.ebuild 2706 BLAKE2B 982b0feb259d89333abee1223ca17e000d618f5905007ea3696261e449f2cbdf4999aa3c6ad9b62652a5c40295ba823ec615c88482a5e2b39e6ddff8858ed202 SHA512 9b2b5540f3132d03db602cc277b6ea9902853bd4b7842623aaad2873055b0db6c3c827cc8bf22a3923a8864df991076ae2c21a9189903dbfef6d4930a9ae1a59
 EBUILD esphome-1.15.2.ebuild 2706 BLAKE2B 982b0feb259d89333abee1223ca17e000d618f5905007ea3696261e449f2cbdf4999aa3c6ad9b62652a5c40295ba823ec615c88482a5e2b39e6ddff8858ed202 SHA512 9b2b5540f3132d03db602cc277b6ea9902853bd4b7842623aaad2873055b0db6c3c827cc8bf22a3923a8864df991076ae2c21a9189903dbfef6d4930a9ae1a59
 EBUILD esphome-1.15.3-r1.ebuild 2867 BLAKE2B 03879069781160a67fc61736204bce1b58ce55e368f0733c0d986e057575e6cc222426238ffd0f6c123674d42fd18ba6147186023f6beb813d3f4c780da507a5 SHA512 02b5b5c0bb5339e7edebb0039694f1bc635110282e02df1cbe98d3e145cfe9a460226124983080fbe38f04a871a8b11ecf6e4c9fb91de426b3eb2b7671faa2fe
-EBUILD esphome-1.15.3.ebuild 2789 BLAKE2B 289cdcc084cce604ca9254b0b35962bfa3d81b8928d7ad9ccd3ff84b674eb061e66fedef60ca850b2a1654508eaa97904bc41cd687dc101c1810ae66e95dec91 SHA512 07b0bbdce30ae2b78602f5fbfc68e9b173be7bbe1b10fae9385906bc59abc3e210add300d54ae3042ce459c3181a0a78b25b361c098c316ac7aafd55f4d49e81
-EBUILD esphome-9999.ebuild 2716 BLAKE2B 90107bcb43aead244c7167936ad12184906c2b5aa1432c715b15628802cf004ef2aa8e729eb3a6316ed9f8d7029e915d3ccb60c46e1d07cb9ba43ec42e2fd2b9 SHA512 84bdc8a6ac04656173aa4f8bceaf31a526e62824d34ffeab2d9dd50454f75ee13d1572afe0cc7e97a3b66448c8e63698d4e592f67d069ad89848dc800fcdf073
+EBUILD esphome-1.15.3-r2.ebuild 2943 BLAKE2B c868540e47a7d0964e7c8dbf501d5cb1e516e95fc4eae15be7c7b56af47e2e4c243347de117de9338b5360635ce3db41208da585d3f7e371d60abfb61674ab22 SHA512 ee7e1cf1f1117a715a7e34c500a96151bb8a656db82c4ebe0468ad6e335eed7911753f93efdebcd9a1a73603ed7dee61a11f2d631459f6a64380332a3017ceac
+EBUILD esphome-9999.ebuild 2751 BLAKE2B 06db30aa4229615a8fa786d36be0f21a74f5859a96289c67ed0d05a470fbd480c1db504089b7500ae6e085279493ed86e594e6e0fd9b9616cd9a34cf331f475b SHA512 18850a2f735eb58b051c26d4365ed1c32688e91b1a3f51cf0cdaa577fd7f3fe414c0d5ab1e5ae8a8979257d935ac58962fdd8a8200bc7b7f2ee3b4d130d982a8
 MISC metadata.xml 568 BLAKE2B bf87d46e048c7db7d8bcbf2a4c9e730e3b084504ca3708520635c92805f99554ad88fe15eba5c9566f5db8c977bf11014aa8f4a94dcc3f5a9e633f15c7438516 SHA512 c84dd850464fa34e84576c1548c2a17b036543b682a2693ca3d95bdde62014e632116a84479ac42539e9d04e97386aa3326fe587043443dd1895d01bf70463c2
--- a/dev-embedded/esphome/esphome-1.14.5.ebuild
+++ b/dev-embedded/esphome/esphome-1.14.5.ebuild
@ -1,102 +0,0 @@
-# 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 ~arm 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.1[${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;tzlocal==2.0.0;tzlocal==2.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
-}
--- a/dev-embedded/esphome/esphome-1.15.3-r2.ebuild
+++ b/dev-embedded/esphome/esphome-1.15.3-r2.ebuild
@ -34,8 +34,8 @@ RDEPEND="
 	$(python_gen_cond_dep '
 	  >=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.2.1[${PYTHON_USEDEP}]
+	  ~dev-python/paho-mqtt-1.5.1[${PYTHON_USEDEP}]
+	  ~dev-python/colorlog-4.5.0[${PYTHON_USEDEP}]
 	  server? ( ~www-servers/tornado-6.0.4[${PYTHON_USEDEP}] )
 	  ~dev-libs/protobuf-3.12.2
 	  ~dev-python/protobuf-python-3.12.2[${PYTHON_USEDEP}]
@ -72,6 +72,10 @@ src_prepare() {
 		-i requirements.txt || die
 	sed -e 's;voluptuous==0.11.7;voluptuous>=0.11.7;' \
 		-i requirements.txt || die
+	sed -e 's;paho-mqtt==1.5.0;paho-mqtt==1.5.1;' \
+		-i requirements.txt || die
+	sed -e 's;colorlog==4.2.1;colorlog==4.5.0;' \
+		-i requirements.txt || die
 	eapply_user
 }

--- a/dev-embedded/esphome/esphome-9999.ebuild
+++ b/dev-embedded/esphome/esphome-9999.ebuild
@ -35,16 +35,16 @@ RDEPEND="
 	  ~dev-python/voluptuous-0.12.0[${PYTHON_USEDEP}]
 	  ~dev-python/pyyaml-5.3.1[${PYTHON_USEDEP}]
 	  ~dev-python/paho-mqtt-1.5.1[${PYTHON_USEDEP}]
-	  ~dev-python/colorlog-4.6.2[${PYTHON_USEDEP}]
-	  server? ( ~www-servers/tornado-6.0.4[${PYTHON_USEDEP}] )
+	  ~dev-python/colorlog-4.5.0[${PYTHON_USEDEP}]
+	  server? ( ~www-servers/tornado-6.1[${PYTHON_USEDEP}] )
 	  ~dev-libs/protobuf-3.13.0
 	  ~dev-python/protobuf-python-3.13.0[${PYTHON_USEDEP}]
 	  ~dev-python/tzlocal-2.1[${PYTHON_USEDEP}]
 	  ~dev-python/pytz-2020.4[${PYTHON_USEDEP}]
-	  ~dev-python/pyserial-3.4[${PYTHON_USEDEP}]
+	  ~dev-python/pyserial-3.5[${PYTHON_USEDEP}]
 	  server? ( ~dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}] )
 	  ~dev-embedded/platformio-5.0.3
-	  ~dev-embedded/esptool-2.8[${PYTHON_USEDEP}]
+	  ~dev-embedded/esptool-3.0[${PYTHON_USEDEP}]
 	  ~dev-python/click-7.1.2[${PYTHON_USEDEP}]
 	')"

@ -67,11 +67,12 @@ support at https://git.edevau.net/onkelbeh/HomeAssistantRepository

 DOCS="README.md"

-#src_prepare() {
-#	sed -e 's;protobuf==3.13.0;protobuf==3.12.4;' \
-#		-i requirements.txt || die
-#	eapply_user
-#}
+src_prepare() {
+	# Make it easy
+	cat requirements.txt | cut -d "=" -f1 > requirements_new.txt
+	mv requirements_new.txt requirements.txt
+	eapply_user
+}

 python_install_all() {
 	dodoc ${DOCS}