From f1778d337999ffe9c9d866503b1478e1a1128fac Mon Sep 17 00:00:00 2001 From: "Andreas Billmeier (@Home/mbp)" Date: Wed, 30 Mar 2022 18:36:55 +0200 Subject: [PATCH] bump esphome-2022.3.2 --- README.md | 8 +- dev-embedded/esphome/Manifest | 6 +- dev-embedded/esphome/esphome-2022.1.4.ebuild | 102 ------------------ ...022.3.0.ebuild => esphome-2022.3.2.ebuild} | 8 +- 4 files changed, 10 insertions(+), 114 deletions(-) delete mode 100644 dev-embedded/esphome/esphome-2022.1.4.ebuild rename dev-embedded/esphome/{esphome-2022.3.0.ebuild => esphome-2022.3.2.ebuild} (91%) diff --git a/README.md b/README.md index 2265a274b..a05c6a1af 100644 --- a/README.md +++ b/README.md @@ -496,11 +496,11 @@ From time to time a fresh compile test on empty boxes (one with Python 3.9 and o ## Licenses This repository itself is released under GPL-3 (like most Gentoo repositories), all work on the depending components under the licenses they came from. Perhaps you came here because I filed an issue at your component about a bad or missing license. It is easy to [assign a license](https://docs.github.com/en/communities/setting-up-your-project-for-healthy-contributions/adding-a-license-to-a-repository). During cleanups and license investigations I have been asked often which license to choose. I am not a lawyer, but I can offer the following table, counted over this repository, perhaps this helps your decision. If a package has more than one license listed, all of them are counted. -There are 1692 Ebuilds in total, 1685 of them have in total 1693 (35 different) licenses assigned. +There are 1691 Ebuilds in total, 1684 of them have in total 1692 (35 different) licenses assigned. |License| Ebuilds using it| |-------|-----| -|MIT|1032| +|MIT|1031| |Apache-2.0|306| |GPL-3|103| |BSD|92| @@ -536,9 +536,9 @@ There are 1692 Ebuilds in total, 1685 of them have in total 1693 (35 different) |CC-BY-NC-SA-4.0|1| |CC0-1.0|1| -(Last counted: 29/03/2022) +(Last counted: 30/03/2022) I did my best to keep these clean. If a valid license was published on PyPI, it has been automatically merged. Otherwise I took it from GitHub or alternatively from comments/files in the source. Sometimes these differed and have been not unique. All license strings are adjusted to the list in `/usr/portage/gentoo/licenses/`. Some packages do not have any license published. In this case, Authors have been asked for clarification, some did not respond. Following the [official Gentoo Guide](https://devmanual.gentoo.org/general-concepts/licenses/index.html), these then were added with an `all-rights-reserved` license and `RESTRICT="mirror"` was set. Find the appropriate licenses referenced in the Ebuild files and in the corresponding homepages or sources. A big thanks goes to Iris for reviewing this README. -Last updated: 29/03/2022 +Last updated: 30/03/2022 diff --git a/dev-embedded/esphome/Manifest b/dev-embedded/esphome/Manifest index a8465111a..bc8b37d5d 100644 --- a/dev-embedded/esphome/Manifest +++ b/dev-embedded/esphome/Manifest @@ -2,13 +2,11 @@ AUX esphome.conf.d 349 BLAKE2B 54df063ef9805fd8de3eeb4f77331b22c256786817a305d9b AUX esphome.init.d-r1 605 BLAKE2B c6443e2a9730638bda08bda51638d4cd8ee965526ae0fdb04d74a1b376ea7b461d5925b0fe8cb35cc991709a824c1c942902cfbdbe99823b39bd80abf46ca5f3 SHA512 98ef2a6d5524152e24b04b1e644e5672e6bebee8b68fbcc37b46f403fdbf1de24547e394ce52281b6ff5711a987c56c9f55c36b9ae871433ca7a4d3fc6e19297 AUX esphome.init.d-r2 650 BLAKE2B 106e71245d76858dcd3deccfae0f4880053a39d7c280ca79a74adbf44ebff73c56fe7903a3dc1c1a3088d513be2e98c6edc2742ff137b384cbf088967395c09b SHA512 b983ca4b4645e5b79cab2804bc6fc0220a61e2b0234d6f7655c7eaef6cf507bc9791ec16843bee0767c9f3f0dbd88e28b93c39a9e945ca6a5e849dec5c58aa64 AUX esphome.init.d-r3 650 BLAKE2B dc3750f8749e6183d0496b575a46fc55430b89bf973c75bf83c91b688f67e458d828b116e207042797852d5340967609224b806dc09190f92b8ebdcbf55e5388 SHA512 48cbcc982e95ff4d4486edf8ca91f742026f1745f23e4339d01dca016461ff0da2c37ee1539a5750e2d0ee339408bfbe16ff4b8c6cb2dcbbd97e382b7f0759d3 -DIST esphome-2022.1.4.tar.gz 1294726 BLAKE2B 5177135a124859b4c482ff0bf7cd215ba1c3cf54efb732e20e79999f6a2e2f735dd2344d3084874355dcfc376f30922e29ae64c94470454301fca11d64a28723 SHA512 0f7c37ad0987426c74db14429fdd5c692af6032e23276bfe55afe5f6ee0b6edeabdc6e3c35b05baeb465c4378f2f62d3c6066c078885f77fc1f5122666c99943 DIST esphome-2022.2.6.tar.gz 1330829 BLAKE2B b7efff4bf97629d121ead88b977bd4ad20b8363184096debc76b9695eb3b665faac660e7f10452ea2ab180449ff7d70ffe21a3f49134783b8e3720dd28356888 SHA512 5c19bf5dfb1ad15e4a295e1a3a816794240374111f0781f7b30971c9004418ce4f75e7495bcc7381dd386805bdb8ff98201b481e3e3b9ef5c2773961da001d08 -DIST esphome-2022.3.0.tar.gz 1378471 BLAKE2B fdb50a0cf57943825bda651b6446cb7573f470b3527a90136a95f31adb5528069739a0a84d0fa47c3af9c6508749ed04b41a32efaaeaf467f27383b2736eda06 SHA512 6d3f3d44aaa40c053ab705c77bdfcfb9fa6cb6b13e435b742fde7f6ccea21c293b173190534e0e14b6ba6a4bc0612db6e41b5f74db74ae79037ad5e95d4304a8 DIST esphome-2022.3.1.tar.gz 1379869 BLAKE2B 33667793663ef21f8ee2e515d373a97e2175d1d93be62ac37e39dd05f18ef4de001426a616a0040e22750ba08ddb59ca3475986248ccf465fcb4dae113423b3a SHA512 942c54575cca1e2a397074a7e71d913038fb86ecae33863af845a6159991a70e6115f822ca34802bb28f267157c50783599182c3f6628213173027a39088af63 -EBUILD esphome-2022.1.4.ebuild 2969 BLAKE2B b3ab23105aba23fbef89519fd91bf381416a07606e09337f573cc124f0df724e5493a609dc50227549be9f6dee95ea210048d40fff2c2962a59438f80c52e915 SHA512 84cb676fffbba7d498a0581488bb11f498be818ef7a7c290e0a2e3dbaaf5876e5d8d54e4340dc86a9eec6e01ca70359c1a7faece98d89d1b55f95901e6ca9723 +DIST esphome-2022.3.2.tar.gz 1379523 BLAKE2B c27e7d53d36723724b2e2a5f1e5758168499be55525e4bc157c473a6e8d2e7429add15a01f79212c87645f863f598b5f2a5ae77278eacf38c7bcf7201c3db548 SHA512 37354ad959b41a245eb968e4f49482373231b4e4603e9523f39e95cea2e528b307a5f401d5d5913d45bcf4238d085161c83ca7b7212f45cde18589c687b460bc EBUILD esphome-2022.2.6.ebuild 2969 BLAKE2B bd170b30aa19d7eaec9b09db60e0a85f8b61aa21a081fe468cd7b426f13772ee3e3568877c24adacc632d0843e532e5a3b04a9376ab28de834d9cf782a644cf6 SHA512 05cadb168d502ac6c0a9c1ebc9c5df5497c2409a97275489f0f39c3f7578c0788063e3e8cc13e4d68546b6920b818c11af558be568670084f3380cfc472e21f9 -EBUILD esphome-2022.3.0.ebuild 2969 BLAKE2B a5a0831346200bf6ee0a423d44191d785af85ab7edd1f98dca266519ee7ceb26a914095316a56d7834b6f190048a50201637d5024cab4adae46aa1d7903181e3 SHA512 589781ec4d3b0d1d592b8b954ae949be927e0b416625b7fd243dc489019ac7820bf2700a824a63da4620ea5899c92f4fa7b3c1e60002c6fb3f36ede38a2a655a EBUILD esphome-2022.3.1.ebuild 2947 BLAKE2B caa51970d1837f960f15d880278af9ec21e62b07f2dac24ea59ed19503aae7728e8d0a98495aeffc394023d5f2c8a1ab1f5d3c8352ec87f7cbaccd0a64195e7b SHA512 1aef942fd693bda363d27e4babc4c276edd98aa0a032473ddcb26006935666c9483e0de2262a3305631257c5388b2cab806120d860c94fee845e510820b0ac89 +EBUILD esphome-2022.3.2.ebuild 2947 BLAKE2B caa51970d1837f960f15d880278af9ec21e62b07f2dac24ea59ed19503aae7728e8d0a98495aeffc394023d5f2c8a1ab1f5d3c8352ec87f7cbaccd0a64195e7b SHA512 1aef942fd693bda363d27e4babc4c276edd98aa0a032473ddcb26006935666c9483e0de2262a3305631257c5388b2cab806120d860c94fee845e510820b0ac89 EBUILD esphome-9999.ebuild 2890 BLAKE2B b24fdb2b3cee5d0f3b2d82f1c1de37f2597df3a18cbe196863cea70a9afa815a3790fa7e6782c9ca41789e3ebb09665102f8c79c681fb2bc2a2047d42a2240df SHA512 c59c0e77405d26deb88a77e474f3b708ed8111661335f0b00039fb3d4b4131b654c3ec8b2f53001afc2b32a219c906ebc829432e758f52191de4473f6af43327 MISC metadata.xml 528 BLAKE2B f51bbfdf53280873d115d2aa5720f958fb34aab599c47e22e6ea0bbb5492abd6768902be8c862dedf0e8364c840a4b93f6aa3a6d013e639cc1087b291fcf919a SHA512 7d073562b5e22a06680493fdff1657bc3541f699f677e3d21e37c6b02e638100c0559362ce4edc750094d59660ecedc1e9df194459b858b881a3c26c8aa90659 diff --git a/dev-embedded/esphome/esphome-2022.1.4.ebuild b/dev-embedded/esphome/esphome-2022.1.4.ebuild deleted file mode 100644 index 26aee78b6..000000000 --- a/dev-embedded/esphome/esphome-2022.1.4.ebuild +++ /dev/null @@ -1,102 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..10} ) - -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" - 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/" -SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux" -IUSE="+server test" -RESTRICT="!test? ( test )" - -DOCS="README.md" - -RDEPEND=" - server? ( acct-group/${PN} acct-user/${PN} ) - ~dev-python/voluptuous-0.12.2[${PYTHON_USEDEP}] - ~dev-python/pyyaml-6.0[${PYTHON_USEDEP}] - ~dev-python/paho-mqtt-1.6.1[${PYTHON_USEDEP}] - ~dev-python/colorama-0.4.4[${PYTHON_USEDEP}] - server? ( ~www-servers/tornado-6.1[${PYTHON_USEDEP}] ) - ~dev-python/tzlocal-4.1[${PYTHON_USEDEP}] - >=dev-python/tzdata-2021.1[${PYTHON_USEDEP}] - ~dev-python/pyserial-3.5[${PYTHON_USEDEP}] - ~dev-embedded/platformio-5.2.4 - ~dev-embedded/esptool-3.2[${PYTHON_USEDEP}] - dev-python/click[${PYTHON_USEDEP}] - ~dev-embedded/esphome-dashboard-20220116.0[${PYTHON_USEDEP}] - dev-python/aioesphomeapi[${PYTHON_USEDEP}] - dev-python/zeroconf[${PYTHON_USEDEP}] - ~dev-python/kconfiglib-13.7.1[${PYTHON_USEDEP}]" - -BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - test? ( - dev-python/nose[${PYTHON_USEDEP}] - dev-python/pytest[${PYTHON_USEDEP}] - dev-python/pytest-cov[${PYTHON_USEDEP}] - dev-python/pytest-mock[${PYTHON_USEDEP}] - dev-python/pytest-asyncio[${PYTHON_USEDEP}] - dev-python/asyncmock[${PYTHON_USEDEP}] - dev-python/hypothesis[${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 -" - -src_prepare() { - sed "s/aioesphomeapi==10.6.0/aioesphomeapi/g" -i requirements.txt || die - sed "s/click==8.0.3/click/g" -i requirements.txt || die - sed "s/zeroconf==0.37.0/zeroconf/g" -i requirements.txt || die - 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-r3" "${PN}" - readme.gentoo_create_doc - fi -} - -pkg_postinst() { - if use server; then - readme.gentoo_print_elog - fi -} - -python_test() { - nosetests --verbose || die - py.test -v -v || die -} diff --git a/dev-embedded/esphome/esphome-2022.3.0.ebuild b/dev-embedded/esphome/esphome-2022.3.2.ebuild similarity index 91% rename from dev-embedded/esphome/esphome-2022.3.0.ebuild rename to dev-embedded/esphome/esphome-2022.3.2.ebuild index 11ae5900b..260746bc1 100644 --- a/dev-embedded/esphome/esphome-2022.3.0.ebuild +++ b/dev-embedded/esphome/esphome-2022.3.2.ebuild @@ -25,7 +25,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 arm arm64 x86 ~amd64-linux ~x86-linux" IUSE="+server test" RESTRICT="!test? ( test )" @@ -70,9 +70,9 @@ support at https://git.edevau.net/onkelbeh/HomeAssistantRepository " src_prepare() { - sed "s/aioesphomeapi==10.8.2/aioesphomeapi/g" -i requirements.txt || die - sed "s/click==8.0.3/click/g" -i requirements.txt || die - sed "s/zeroconf==0.38.3/zeroconf/g" -i requirements.txt || die + sed "/aioesphomeapi==/c\aioesphomeapi" -i requirements.txt || die + sed "/click==/c\click" -i requirements.txt || die + sed "/zeroconf==/c\zeroconf" -i requirements.txt || die eapply_user }