From 580316cbfc879eba0d8edc68043add6fde674bd9 Mon Sep 17 00:00:00 2001 From: "Andreas Billmeier (@Home/mbp)" Date: Tue, 1 Nov 2022 18:18:29 +0100 Subject: [PATCH 1/4] bump platformio-6.0.2-r2, fix deps --- README.md | 4 +- dev-embedded/platformio/Manifest | 2 + .../platformio/platformio-6.0.2-r2.ebuild | 116 ++++++++++++++++++ 3 files changed, 120 insertions(+), 2 deletions(-) create mode 100644 dev-embedded/platformio/platformio-6.0.2-r2.ebuild diff --git a/README.md b/README.md index 7ad63e071..49423b835 100644 --- a/README.md +++ b/README.md @@ -573,14 +573,14 @@ A daily compile test is run at Github with Python 3.9 to catch general faults. E ## 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 1523 Ebuilds in total, 1516 of them have in total 1524 (34 different) licenses assigned. +There are 1524 Ebuilds in total, 1517 of them have in total 1525 (34 different) licenses assigned. |License| Ebuilds using it| |-------|-----| |MIT|882| |Apache-2.0|314| |GPL-3|97| -|BSD|88| +|BSD|89| |LGPL-3|23| |GPL-2|19| |GPL-3+|14| diff --git a/dev-embedded/platformio/Manifest b/dev-embedded/platformio/Manifest index 9df1d9f10..4903a9aa4 100644 --- a/dev-embedded/platformio/Manifest +++ b/dev-embedded/platformio/Manifest @@ -1,3 +1,5 @@ DIST platformio-5.2.5.tar.gz 218705 BLAKE2B b46568460c32613015f9cb3087a66f26a80c57592304f5a2043df9633b4b7eebc6f76723251fa0d20252faad0f7f9400c60f5d2cade18c41cebf090aee870fd2 SHA512 e4c03602c9331cd5a6b979f67e82b125cd2b441d80033806ebf5c993976c5cff8bbc7b65cf687e85676876a96dbf530872dbd2a8e2114ee10b094ac77ccd6fbf +DIST platformio-6.0.2.tar.gz 285452 BLAKE2B c70523837b5118fcc1209a36a425fb6ab0aac73e56732916ff3d39fe87d50a47bf7d31d77324f491093ed366b1b3e4f88274e973bc896b164f5a07687a53bd12 SHA512 a2e48ad9ca22024a06509a9e36e5a7586088d0e8abd67d309d1988a8a112a41e301f077f1b466b5db390dc4048add570acd5bb762bbf22db69715dead0d8fc89 EBUILD platformio-5.2.5-r1.ebuild 2570 BLAKE2B 51862d8b976308a72a32dd0957f9a8e010b48fff484f950b45872e22254e2de95314f4e8cd7ee85d96556e1b0a25cdb82cbd1a6526473e0235e2b6bb7f9892bc SHA512 12a0566ac0209a3e9ab89d6963faeb6e18be3e83c8ecd2d6f50837682934187c3debe547000f20b9bb6d374e4b562261fc93e9466e50ad0849eb8963f8fcbc0a +EBUILD platformio-6.0.2-r2.ebuild 3300 BLAKE2B 440ea03b38462d774e1dccd425d4d99b33421077985bc54f843f0ad1d8c7f206334c8af231898a092164d83f1fc0d9ef9ed90e3f55c2eed5e902388fef421b35 SHA512 afd6eadc196b75630d0ead91dbae19633d74baa746d2e74d6c43072bacbfc01916b2596e2d8deb3b3b434c16b941988d30ab608cfc1ca8a0b297c1ed82a5bd4c MISC metadata.xml 457 BLAKE2B 558c6e7f69c6ede09bcd9cc706a3d0186a67ab8911b4278e4ed669cae32790db1ca282abc527e757345f91303eea337c03594a47777d50fb4609e9e9eae2dc8f SHA512 478409895f41c84f1c85c17c58f9a41cec864ed6df0b24b01d3d3b117b1109ae2bf15fc70871159193e514b64e108dbb37162517aa183c8c33fc350054dd81d4 diff --git a/dev-embedded/platformio/platformio-6.0.2-r2.ebuild b/dev-embedded/platformio/platformio-6.0.2-r2.ebuild new file mode 100644 index 000000000..3fa477b66 --- /dev/null +++ b/dev-embedded/platformio/platformio-6.0.2-r2.ebuild @@ -0,0 +1,116 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_SINGLE_IMPL=1 +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{8..11} ) + +inherit distutils-r1 udev + +DESCRIPTION="An open source ecosystem for IoT development" +HOMEPAGE="https://platformio.org/" +SRC_URI="https://github.com/platformio/platformio-core/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}"/${PN}-core-${PV} + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 arm arm64 x86" + +RDEPEND=" + $(python_gen_cond_dep ' + =dev-python/click-8[${PYTHON_USEDEP}] + =dev-python/pyserial-3[${PYTHON_USEDEP}] + =dev-python/python-zeroconf-0.37[${PYTHON_USEDEP}] + >=dev-python/requests-2.4[${PYTHON_USEDEP}] + =dev-python/semantic_version-2.9[${PYTHON_USEDEP}] + =dev-python/tabulate-0.8.3[${PYTHON_USEDEP}] + =dev-python/pyelftools-0.27[${PYTHON_USEDEP}] + =dev-python/marshmallow-2.20.5[${PYTHON_USEDEP}] + =dev-python/starlette-0.20*[${PYTHON_USEDEP}] + =dev-python/uvicorn-0.17*[${PYTHON_USEDEP}] + dev-python/wsproto[${PYTHON_USEDEP}] + ') + virtual/udev" +DEPEND="virtual/udev" +BDEPEND="test? ( $(python_gen_cond_dep 'dev-python/jsondiff[${PYTHON_USEDEP}]') )" + +# This list could be refined a bit to have individual tests which need network +# (within EPYTEST_DESELECT) but so many need it that it doesn't seem worth it right now. +EPYTEST_IGNORE=( + # Requires network access + tests/test_builder.py + tests/package/test_manager.py + tests/package/test_manifest.py + tests/commands/test_platform.py + tests/commands/test_test.py + tests/commands/test_ci.py + tests/commands/test_init.py + tests/commands/test_lib.py + tests/commands/test_lib_complex.py + tests/commands/test_boards.py + tests/commands/test_check.py + tests/commands/test_run.py + tests/commands/pkg/test_exec.py + tests/commands/pkg/test_list.py + tests/commands/pkg/test_outdated.py + tests/commands/pkg/test_search.py + tests/commands/pkg/test_show.py + tests/commands/pkg/test_install.py + tests/commands/pkg/test_uninstall.py + tests/commands/pkg/test_update.py + tests/misc/ino2cpp/test_ino2cpp.py + tests/test_maintenance.py + tests/test_misc.py +) + +EPYTEST_DESELECT=( + # Requires network access + tests/misc/test_maintenance.py::test_check_pio_upgrade + tests/misc/test_misc.py::test_ping_internet_ips + tests/misc/test_misc.py::test_api_cache +) + +distutils_enable_tests pytest + +src_prepare() { + # Allow newer versions of zeroconf, Bug #831181. + # Also wsproto. + # ... and semantic_version, bug #853247. + sed \ + -e '/zeroconf/s/<[0-9.*]*//' \ + -e '/wsproto/s/==.*/"/' \ + -e '/semantic_version/s/==[0-9.*]*//' \ + -i setup.py || die + + default +} + +python_test() { + epytest -k "not skip_ci" +} + +src_install() { + distutils-r1_src_install + udev_dorules scripts/99-platformio-udev.rules +} + +pkg_postinst() { + udev_reload +} + +pkg_postrm() { + udev_reload +} From e8afbef5cd97c66151d0216e021fd7921fd8af95 Mon Sep 17 00:00:00 2001 From: "Andreas Billmeier (@Home/mbp)" Date: Wed, 2 Nov 2022 20:16:59 +0100 Subject: [PATCH 2/4] dev-embedded/esphome: update 2022.10.2, drop 2022.6.2 Signed-off-by: Andreas Billmeier --- README.md | 5 +-- dev-embedded/esphome/Manifest | 6 +-- ...22.6.2.ebuild => esphome-2022.10.2.ebuild} | 42 +++++++++++-------- dev-embedded/esphome/esphome-9999.ebuild | 2 +- 4 files changed, 30 insertions(+), 25 deletions(-) rename dev-embedded/esphome/{esphome-2022.6.2.ebuild => esphome-2022.10.2.ebuild} (68%) diff --git a/README.md b/README.md index 7e84506e0..ed0a5b04c 100644 --- a/README.md +++ b/README.md @@ -573,15 +573,14 @@ A daily compile test is run at Github with Python 3.9 to catch general faults. E ## 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 1528 Ebuilds in total, 1521 of them have in total 1529 (34 different) licenses assigned. +There are 1529 Ebuilds in total, 1522 of them have in total 1530 (34 different) licenses assigned. |License| Ebuilds using it| |-------|-----| |MIT|882| |Apache-2.0|320| |GPL-3|96| -|BSD|88| +|BSD|89| |LGPL-3|23| |GPL-2|19| |GPL-3+|14| diff --git a/dev-embedded/esphome/Manifest b/dev-embedded/esphome/Manifest index 293e108c6..122edf7c6 100644 --- a/dev-embedded/esphome/Manifest +++ b/dev-embedded/esphome/Manifest @@ -3,12 +3,12 @@ AUX esphome.init.d-r1 605 BLAKE2B c6443e2a9730638bda08bda51638d4cd8ee965526ae0fd AUX esphome.init.d-r2 650 BLAKE2B 106e71245d76858dcd3deccfae0f4880053a39d7c280ca79a74adbf44ebff73c56fe7903a3dc1c1a3088d513be2e98c6edc2742ff137b384cbf088967395c09b SHA512 b983ca4b4645e5b79cab2804bc6fc0220a61e2b0234d6f7655c7eaef6cf507bc9791ec16843bee0767c9f3f0dbd88e28b93c39a9e945ca6a5e849dec5c58aa64 AUX esphome.init.d-r3 650 BLAKE2B dc3750f8749e6183d0496b575a46fc55430b89bf973c75bf83c91b688f67e458d828b116e207042797852d5340967609224b806dc09190f92b8ebdcbf55e5388 SHA512 48cbcc982e95ff4d4486edf8ca91f742026f1745f23e4339d01dca016461ff0da2c37ee1539a5750e2d0ee339408bfbe16ff4b8c6cb2dcbbd97e382b7f0759d3 DIST esphome-2022.10.1.tar.gz 1555809 BLAKE2B e746addb2df675f9977dbc9e3d4431fcb16f30c5b245810911e60a9824d0b7437bdae206b9e3292dc0e86eefeec44b4014f1b4dd70f5be6958275a111637be61 SHA512 2db31a99546880dc767d65281c89e2b277055c92d995b9cfa884fc68e05eca066a8f8a4558593f1797d5c53f7d5df5301b599e82d351867779480982919ff5c2 -DIST esphome-2022.6.2.tar.gz 1473508 BLAKE2B fd4b6a39d3ec770205b6c76bf24fdb228de5fc18d416f6fa67e621194f97c93f264b59a5fdfe7ab8404dba635d9e9214bcdd10855c6c25929c101cd293aaabb9 SHA512 9b380016580ef7243a735c75dac6a92777cbd963a166f197494693764a0f2592c5ecfba85a8b508377b121aac68d55564021235c0a4314fe278aa3e2feb5ad60 +DIST esphome-2022.10.2.tar.gz 1555752 BLAKE2B a0131c04747a4fb124f1fac6bfda2ce61fc232972dcc632dafe6ded2b1fa569ec11d753f2c70de5d2e1a747b6fbbfb0720631138401bbadfceb91ca879380e31 SHA512 e2965139a4a0a2b2e64a8bb776b7aec46d955f88db6ad8e9c9eb59c6bd78ffc61a355101138e7aba804daffd6dd3b07dbbb294846faa2e62b0f99495494baef4 DIST esphome-2022.8.0.tar.gz 1509796 BLAKE2B 4bef31867b9f53801dc40f3bd15745f34f43ad0ff2b26d5115b581d18f94f033115f80aabcc4767e88e2cb693bc0785781eb1d5340029bcfd931155da1159320 SHA512 9b2a6a7ca914c27ac1ddc3cb4820943805b61d57747977431c8d770a512d5f8bb01faf6a9bafba1af995577d1187ec486326c0624c77e6f975e1d6985c08242d DIST esphome-2022.9.3.tar.gz 1551087 BLAKE2B 0f23762654334637e78e3ac0f552cb26e90e590b9d09194a66374eb5245330124168dec2d3be08975de60b46263bd978411b8d15aead005b85e7bed8ffe0111e SHA512 12e7d41adb2db8cf274d2525db8fa52ddc49b4baea50e62244f859b88fc19c494f6ef7b911824c2fc428ce24f63c00ca8a8e9247fdc55cf8643a3b9498677383 EBUILD esphome-2022.10.1.ebuild 3043 BLAKE2B 98b4b08918f793608f4fc94af0f37969709b99e6ec1907d75eb3378561ff43962ebd1ab1e943a948b33ffed2c7dcce6c9a11e64bf05bed6295b90fa8e6633b70 SHA512 94a7d995f4b1a3e3ba200759aa8dc549fb6ec13d169c4ba457ad20657c536a02eacf6b5cf4b677e74709e783533d7d38f2b82bfb5dc7828e9d9de61bd952b241 -EBUILD esphome-2022.6.2.ebuild 2882 BLAKE2B eddb47901f58aab7fb6e162a29410847840416f4032ad98d70a289da021294965018043807baee663ff59b8d5b4b4565e36f958867974d11f91db9f812ff0ed7 SHA512 9eb0cb5a595dbe06b3e9052e91b0b2efac3d4f971598d9eed7dd557b69effa64058e7ed02d214c46ee110d8f559e49a5d6824c6b537cdedcba7a8d1eb5a48f53 +EBUILD esphome-2022.10.2.ebuild 3046 BLAKE2B eece491e1fde4d73d1b2972837d2d8fed3569d5edc83896e0788e5513cfea79bdf24fe68ddc0ade52d996b86ecc6e95528fd2c19c324530b62577c872a0af878 SHA512 17e6665cabdc533215eb354ecf31e85fc92a10777da12dce5ae5568c03012b8a5deffcdc5f1468cc92b2b047f987e88f6adf55fd36b8c79b9f477098b03db058 EBUILD esphome-2022.8.0.ebuild 3043 BLAKE2B 7c8484cf4ee6a737fb61dbb18ac5dbc67f86ffd8a2d16edc3dcefb71f54f4e019ef7d073c170f45a03a478a1ecb1cf45b1ebe9536831d39478ba076144c7b68d SHA512 c09a999c0668739b3f31e80962d528613dcace1319d873397cd1e41ba9cf9a4215211ef230796d98c2dd6261a749f45142203d8accff97187faec5bb55681991 EBUILD esphome-2022.9.3.ebuild 3043 BLAKE2B 47f38367dfcec1ca3f507940169e91731f9f94967d061ea847259f39d04823a22ea9f6b5075887f20c50e8b6f445df6356c5cd9429d7f37c280c265f94d83292 SHA512 78b8ad0d3d04cf5c5c893f482fb3e04e0a66f4982798275b064768e56d074179e2fb200ffb634e946df00ea11829337ef4a376457b06745cb36dc95790b98bd0 -EBUILD esphome-9999.ebuild 2882 BLAKE2B 5d960a53a4d8ae6dac6d198846b039b3fc2689417b92eb9f9d0df6ea97da69a71b67c4857aab1a658029749e689781cd0fd3740f25c5c1f40f98e53992b86ce9 SHA512 7cb5849d6b35aef8152bae07fedf91c10707373d5b1e0c8ec4de41eb08541bba7a010fe1a0cbf56d8d035ddc378c4bea7cb46b5a78fdc32abddfd478abfbc248 +EBUILD esphome-9999.ebuild 2885 BLAKE2B 3a82b94e7f68869dc4c4d514e830025641e83efc2f01d016c8927828ac9c8bb294798982538e4d4b956010c51ec10e665dfd7ca62e5324df848e7c89cdf76c79 SHA512 2ee15781b673acf7872f7cfab1052f5de889a9959ae66869fde155363531cd94e8de407f10e2b7eb4e6957c8ec7f863a6ea2b70de3ed913c5632fe0b0a00934a MISC metadata.xml 528 BLAKE2B f51bbfdf53280873d115d2aa5720f958fb34aab599c47e22e6ea0bbb5492abd6768902be8c862dedf0e8364c840a4b93f6aa3a6d013e639cc1087b291fcf919a SHA512 7d073562b5e22a06680493fdff1657bc3541f699f677e3d21e37c6b02e638100c0559362ce4edc750094d59660ecedc1e9df194459b858b881a3c26c8aa90659 diff --git a/dev-embedded/esphome/esphome-2022.6.2.ebuild b/dev-embedded/esphome/esphome-2022.10.2.ebuild similarity index 68% rename from dev-embedded/esphome/esphome-2022.6.2.ebuild rename to dev-embedded/esphome/esphome-2022.10.2.ebuild index a4b98dcea..9454512ce 100644 --- a/dev-embedded/esphome/esphome-2022.6.2.ebuild +++ b/dev-embedded/esphome/esphome-2022.10.2.ebuild @@ -3,6 +3,7 @@ EAPI=8 +DISTUTILS_SINGLE_IMPL=1 PYTHON_COMPAT=( python3_{8..11} ) inherit readme.gentoo-r1 distutils-r1 @@ -15,7 +16,7 @@ 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="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.gh.tar.gz" S="${WORKDIR}/${MY_P}/" fi @@ -33,23 +34,26 @@ DOCS="README.md" RDEPEND=" server? ( acct-group/${PN} acct-user/${PN} ) - ~dev-python/voluptuous-0.13.1[${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? ( ~dev-python/tornado-6.1[${PYTHON_USEDEP}] ) - ~dev-python/tzlocal-4.2[${PYTHON_USEDEP}] - >=dev-python/tzdata-2021.1[${PYTHON_USEDEP}] - ~dev-python/pyserial-3.5[${PYTHON_USEDEP}] - ~dev-embedded/platformio-5.2.5[${PYTHON_USEDEP}] - ~dev-embedded/esptool-3.3.1[${PYTHON_USEDEP}] - ~dev-python/click-8.1.3[${PYTHON_USEDEP}] - ~dev-embedded/esphome-dashboard-20220508.0[${PYTHON_USEDEP}] - dev-python/aioesphomeapi[${PYTHON_USEDEP}] - dev-python/python-zeroconf[${PYTHON_USEDEP}] - ~dev-python/kconfiglib-13.7.1[${PYTHON_USEDEP}]" + $(python_gen_cond_dep ' + ~dev-python/voluptuous-0.13.1[${PYTHON_USEDEP}] + ~dev-python/pyyaml-6.0[${PYTHON_USEDEP}] + ~dev-python/paho-mqtt-1.6.1[${PYTHON_USEDEP}] + ~dev-python/colorama-0.4.5[${PYTHON_USEDEP}] + server? ( ~dev-python/tornado-6.2[${PYTHON_USEDEP}] ) + ~dev-python/tzlocal-4.2[${PYTHON_USEDEP}] + >=dev-python/tzdata-2021.1[${PYTHON_USEDEP}] + ~dev-python/pyserial-3.5[${PYTHON_USEDEP}] + ~dev-embedded/platformio-6.1.4[${PYTHON_SINGLE_USEDEP}] + ~dev-embedded/esptool-3.3.1[${PYTHON_USEDEP}] + ~dev-python/click-8.1.3[${PYTHON_USEDEP}] + ~dev-embedded/esphome-dashboard-20221020.0[${PYTHON_USEDEP}] + dev-python/aioesphomeapi[${PYTHON_USEDEP}] + dev-python/python-zeroconf[${PYTHON_USEDEP}] + ~dev-python/kconfiglib-13.7.1[${PYTHON_USEDEP}] + ')" -BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}] +BDEPEND="$(python_gen_cond_dep ' + dev-python/setuptools[${PYTHON_USEDEP}] test? ( dev-python/pytest[${PYTHON_USEDEP}] dev-python/pytest-cov[${PYTHON_USEDEP}] @@ -57,7 +61,8 @@ BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}] dev-python/pytest-asyncio[${PYTHON_USEDEP}] dev-python/asyncmock[${PYTHON_USEDEP}] dev-python/hypothesis[${PYTHON_USEDEP}] - )" + ) + ')" DISABLE_AUTOFORMATTING=1 DOC_CONTENTS=" @@ -71,6 +76,7 @@ support at https://git.edevau.net/onkelbeh/HomeAssistantRepository src_prepare() { sed "/aioesphomeapi==/c\aioesphomeapi" -i requirements.txt || die sed "/click==/c\click" -i requirements.txt || die + sed "/colorama==/c\colorama" -i requirements.txt || die sed "/zeroconf==/c\zeroconf" -i requirements.txt || die eapply_user } diff --git a/dev-embedded/esphome/esphome-9999.ebuild b/dev-embedded/esphome/esphome-9999.ebuild index 66f6e7fe7..3ea27e470 100644 --- a/dev-embedded/esphome/esphome-9999.ebuild +++ b/dev-embedded/esphome/esphome-9999.ebuild @@ -16,7 +16,7 @@ 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="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.gh.tar.gz" S="${WORKDIR}/${MY_P}/" KEYWORDS="amd64 arm arm64 x86" fi From 56bc55db0c4b8251bbb70be900cb019a08bdfd03 Mon Sep 17 00:00:00 2001 From: "Andreas Billmeier (@Home/mbp)" Date: Wed, 2 Nov 2022 20:44:57 +0100 Subject: [PATCH 3/4] dev-embedded/platformio-6.1.4: fix bad deps in Gentoo's Ebuild Signed-off-by: Andreas Billmeier --- README.md | 4 +- dev-embedded/platformio/Manifest | 8 +- .../platformio/platformio-5.2.5-r1.ebuild | 2 +- .../platformio/platformio-6.0.2-r2.ebuild | 2 +- .../platformio/platformio-6.1.4-r1.ebuild | 116 ++++++++++++++++++ 5 files changed, 125 insertions(+), 7 deletions(-) create mode 100644 dev-embedded/platformio/platformio-6.1.4-r1.ebuild diff --git a/README.md b/README.md index ed0a5b04c..096ffa49a 100644 --- a/README.md +++ b/README.md @@ -573,14 +573,14 @@ A daily compile test is run at Github with Python 3.9 to catch general faults. E ## 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 1529 Ebuilds in total, 1522 of them have in total 1530 (34 different) licenses assigned. +There are 1530 Ebuilds in total, 1523 of them have in total 1531 (34 different) licenses assigned. |License| Ebuilds using it| |-------|-----| |MIT|882| |Apache-2.0|320| |GPL-3|96| -|BSD|89| +|BSD|90| |LGPL-3|23| |GPL-2|19| |GPL-3+|14| diff --git a/dev-embedded/platformio/Manifest b/dev-embedded/platformio/Manifest index 4903a9aa4..0643c853a 100644 --- a/dev-embedded/platformio/Manifest +++ b/dev-embedded/platformio/Manifest @@ -1,5 +1,7 @@ DIST platformio-5.2.5.tar.gz 218705 BLAKE2B b46568460c32613015f9cb3087a66f26a80c57592304f5a2043df9633b4b7eebc6f76723251fa0d20252faad0f7f9400c60f5d2cade18c41cebf090aee870fd2 SHA512 e4c03602c9331cd5a6b979f67e82b125cd2b441d80033806ebf5c993976c5cff8bbc7b65cf687e85676876a96dbf530872dbd2a8e2114ee10b094ac77ccd6fbf -DIST platformio-6.0.2.tar.gz 285452 BLAKE2B c70523837b5118fcc1209a36a425fb6ab0aac73e56732916ff3d39fe87d50a47bf7d31d77324f491093ed366b1b3e4f88274e973bc896b164f5a07687a53bd12 SHA512 a2e48ad9ca22024a06509a9e36e5a7586088d0e8abd67d309d1988a8a112a41e301f077f1b466b5db390dc4048add570acd5bb762bbf22db69715dead0d8fc89 -EBUILD platformio-5.2.5-r1.ebuild 2570 BLAKE2B 51862d8b976308a72a32dd0957f9a8e010b48fff484f950b45872e22254e2de95314f4e8cd7ee85d96556e1b0a25cdb82cbd1a6526473e0235e2b6bb7f9892bc SHA512 12a0566ac0209a3e9ab89d6963faeb6e18be3e83c8ecd2d6f50837682934187c3debe547000f20b9bb6d374e4b562261fc93e9466e50ad0849eb8963f8fcbc0a -EBUILD platformio-6.0.2-r2.ebuild 3300 BLAKE2B 440ea03b38462d774e1dccd425d4d99b33421077985bc54f843f0ad1d8c7f206334c8af231898a092164d83f1fc0d9ef9ed90e3f55c2eed5e902388fef421b35 SHA512 afd6eadc196b75630d0ead91dbae19633d74baa746d2e74d6c43072bacbfc01916b2596e2d8deb3b3b434c16b941988d30ab608cfc1ca8a0b297c1ed82a5bd4c +DIST platformio-6.0.2.gh.tar.gz 285452 BLAKE2B c70523837b5118fcc1209a36a425fb6ab0aac73e56732916ff3d39fe87d50a47bf7d31d77324f491093ed366b1b3e4f88274e973bc896b164f5a07687a53bd12 SHA512 a2e48ad9ca22024a06509a9e36e5a7586088d0e8abd67d309d1988a8a112a41e301f077f1b466b5db390dc4048add570acd5bb762bbf22db69715dead0d8fc89 +DIST platformio-6.1.4.gh.tar.gz 290408 BLAKE2B 41a977d9b5e51a1e65ef61973301ab6e7e9ad0adbe6d4df2640b13f46623055df8303435a664acdd267ad8811229687b6abb088d5b331c33fb46bbe33ab188b1 SHA512 8c46b21212de2fb7579540c51b17061666b8abe4706800fe30fea053cb4233c17a03c2388295f9fb3a21602126f0c2c13f1dd80db962ef1b3d5c31c9a30791c7 +EBUILD platformio-5.2.5-r1.ebuild 2529 BLAKE2B 0cba1938b448e77d8a77a341116e3fbd8f5275dce179c16c606c28f6ae6e51b26039827a94f095ef90f39cd26ff3cdb2d03a43052442d053a4b34e2fd6bff56f SHA512 256084a14e054cc719387fe1a29fc975353431d2da28ecebfaf204f8c531ca140c9487c489bee654dee901da2da68d8840fae06a228b80f3ed9debad00f05f3d +EBUILD platformio-6.0.2-r2.ebuild 3303 BLAKE2B 67760c6a0fa315c6ad30a5a6c493c8e0a2107a9545e52c6d5f542052b3e980ac2ac93eb4ff0f78b3da0f26ae1f08149840d2b72f84e37f540f3c184da2f89629 SHA512 2b03216bfc6415817affcd067857c4fb8071685a5719a33d48df3045702fbe621fd3de0e04397a1791899daf6294eb505b4aa28a982f31ba65a32e604d97d873 +EBUILD platformio-6.1.4-r1.ebuild 3308 BLAKE2B 170c7e762ae7db06347290e93519fca04e5d98adfd2c83efb3b1bb067b5a39a2d1681ad5f6cc13c6f682f06da57ae4f2fdde48e5a6936df09ca71b6e5adc8b5b SHA512 d49e9682db59d7fc424e5d89df0923222d17b054e47369263aec9335ef34d6a1c6aeab6ad2fba9647f84ea1c2626ca0802fbc26dbceeae422eb0c8bff261fee5 MISC metadata.xml 457 BLAKE2B 558c6e7f69c6ede09bcd9cc706a3d0186a67ab8911b4278e4ed669cae32790db1ca282abc527e757345f91303eea337c03594a47777d50fb4609e9e9eae2dc8f SHA512 478409895f41c84f1c85c17c58f9a41cec864ed6df0b24b01d3d3b117b1109ae2bf15fc70871159193e514b64e108dbb37162517aa183c8c33fc350054dd81d4 diff --git a/dev-embedded/platformio/platformio-5.2.5-r1.ebuild b/dev-embedded/platformio/platformio-5.2.5-r1.ebuild index 5da893edb..b35fea28d 100644 --- a/dev-embedded/platformio/platformio-5.2.5-r1.ebuild +++ b/dev-embedded/platformio/platformio-5.2.5-r1.ebuild @@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{8..11} ) inherit distutils-r1 udev -DESCRIPTION="A professional collaborative platform for embedded development. Cross-platform IDE and Unified Debugger." +DESCRIPTION="A professional collaborative platform for embedded development." HOMEPAGE="https://platformio.org https://github.com/platformio/platformio-core/ https://pypi.org/project/platformio/" SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz" diff --git a/dev-embedded/platformio/platformio-6.0.2-r2.ebuild b/dev-embedded/platformio/platformio-6.0.2-r2.ebuild index 3fa477b66..a328a1515 100644 --- a/dev-embedded/platformio/platformio-6.0.2-r2.ebuild +++ b/dev-embedded/platformio/platformio-6.0.2-r2.ebuild @@ -11,7 +11,7 @@ inherit distutils-r1 udev DESCRIPTION="An open source ecosystem for IoT development" HOMEPAGE="https://platformio.org/" -SRC_URI="https://github.com/platformio/platformio-core/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI="https://github.com/platformio/platformio-core/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz" S="${WORKDIR}"/${PN}-core-${PV} LICENSE="BSD" diff --git a/dev-embedded/platformio/platformio-6.1.4-r1.ebuild b/dev-embedded/platformio/platformio-6.1.4-r1.ebuild new file mode 100644 index 000000000..a1bfbf1ab --- /dev/null +++ b/dev-embedded/platformio/platformio-6.1.4-r1.ebuild @@ -0,0 +1,116 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_SINGLE_IMPL=1 +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{8..11} ) + +inherit distutils-r1 udev + +DESCRIPTION="An open source ecosystem for IoT development" +HOMEPAGE="https://platformio.org/" +SRC_URI="https://github.com/platformio/platformio-core/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz" +S="${WORKDIR}"/${PN}-core-${PV} + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 arm arm64 x86" + +RDEPEND=" + $(python_gen_cond_dep ' + =dev-python/click-8[${PYTHON_USEDEP}] + =dev-python/pyserial-3.5[${PYTHON_USEDEP}] + =dev-python/requests-2.4[${PYTHON_USEDEP}] + =dev-python/tabulate-0.8.3[${PYTHON_USEDEP}] + =dev-python/pyelftools-0.27[${PYTHON_USEDEP}] + =dev-python/python-zeroconf-0.37[${PYTHON_USEDEP}] + >=dev-python/marshmallow-3[${PYTHON_USEDEP}] + =dev-python/starlette-0.20*[${PYTHON_USEDEP}] + =dev-python/uvicorn-0.18*[${PYTHON_USEDEP}] + =dev-python/wsproto-1.1*[${PYTHON_USEDEP}] + ') + virtual/udev" +DEPEND="virtual/udev" +BDEPEND="test? ( $(python_gen_cond_dep 'dev-python/jsondiff[${PYTHON_USEDEP}]') )" + +# This list could be refined a bit to have individual tests which need network +# (within EPYTEST_DESELECT) but so many need it that it doesn't seem worth it right now. +EPYTEST_IGNORE=( + # Requires network access + tests/test_builder.py + tests/package/test_manager.py + tests/package/test_manifest.py + tests/commands/test_platform.py + tests/commands/test_test.py + tests/commands/test_ci.py + tests/commands/test_init.py + tests/commands/test_lib.py + tests/commands/test_lib_complex.py + tests/commands/test_boards.py + tests/commands/test_check.py + tests/commands/test_run.py + tests/commands/pkg/test_exec.py + tests/commands/pkg/test_list.py + tests/commands/pkg/test_outdated.py + tests/commands/pkg/test_search.py + tests/commands/pkg/test_show.py + tests/commands/pkg/test_install.py + tests/commands/pkg/test_uninstall.py + tests/commands/pkg/test_update.py + tests/misc/ino2cpp/test_ino2cpp.py + tests/test_maintenance.py + tests/test_misc.py +) + +EPYTEST_DESELECT=( + # Requires network access + tests/misc/test_maintenance.py::test_check_pio_upgrade + tests/misc/test_misc.py::test_ping_internet_ips + tests/misc/test_misc.py::test_api_cache +) + +distutils_enable_tests pytest + +src_prepare() { + # Allow newer versions of zeroconf, Bug #831181. + # Also wsproto. + # ... and semantic_version, bug #853247. + sed \ + -e '/zeroconf/s/<[0-9.*]*//' \ + -e '/wsproto/s/==.*/"/' \ + -e '/semantic_version/s/==[0-9.*]*//' \ + -i setup.py || die + + default +} + +python_test() { + epytest -k "not skip_ci" +} + +src_install() { + distutils-r1_src_install + udev_dorules scripts/99-platformio-udev.rules +} + +pkg_postinst() { + udev_reload +} + +pkg_postrm() { + udev_reload +} From b5da02423a783413a630f59bbca2a1a6cce6dfc2 Mon Sep 17 00:00:00 2001 From: "Andreas Billmeier (@Home/mbp)" Date: Wed, 2 Nov 2022 21:07:14 +0100 Subject: [PATCH 4/4] dev-embedded/esphome-2022.10.2: fix deps --- dev-embedded/esphome/Manifest | 2 +- dev-embedded/esphome/esphome-2022.10.2.ebuild | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dev-embedded/esphome/Manifest b/dev-embedded/esphome/Manifest index 122edf7c6..1208e79b2 100644 --- a/dev-embedded/esphome/Manifest +++ b/dev-embedded/esphome/Manifest @@ -7,7 +7,7 @@ DIST esphome-2022.10.2.tar.gz 1555752 BLAKE2B a0131c04747a4fb124f1fac6bfda2ce61f DIST esphome-2022.8.0.tar.gz 1509796 BLAKE2B 4bef31867b9f53801dc40f3bd15745f34f43ad0ff2b26d5115b581d18f94f033115f80aabcc4767e88e2cb693bc0785781eb1d5340029bcfd931155da1159320 SHA512 9b2a6a7ca914c27ac1ddc3cb4820943805b61d57747977431c8d770a512d5f8bb01faf6a9bafba1af995577d1187ec486326c0624c77e6f975e1d6985c08242d DIST esphome-2022.9.3.tar.gz 1551087 BLAKE2B 0f23762654334637e78e3ac0f552cb26e90e590b9d09194a66374eb5245330124168dec2d3be08975de60b46263bd978411b8d15aead005b85e7bed8ffe0111e SHA512 12e7d41adb2db8cf274d2525db8fa52ddc49b4baea50e62244f859b88fc19c494f6ef7b911824c2fc428ce24f63c00ca8a8e9247fdc55cf8643a3b9498677383 EBUILD esphome-2022.10.1.ebuild 3043 BLAKE2B 98b4b08918f793608f4fc94af0f37969709b99e6ec1907d75eb3378561ff43962ebd1ab1e943a948b33ffed2c7dcce6c9a11e64bf05bed6295b90fa8e6633b70 SHA512 94a7d995f4b1a3e3ba200759aa8dc549fb6ec13d169c4ba457ad20657c536a02eacf6b5cf4b677e74709e783533d7d38f2b82bfb5dc7828e9d9de61bd952b241 -EBUILD esphome-2022.10.2.ebuild 3046 BLAKE2B eece491e1fde4d73d1b2972837d2d8fed3569d5edc83896e0788e5513cfea79bdf24fe68ddc0ade52d996b86ecc6e95528fd2c19c324530b62577c872a0af878 SHA512 17e6665cabdc533215eb354ecf31e85fc92a10777da12dce5ae5568c03012b8a5deffcdc5f1468cc92b2b047f987e88f6adf55fd36b8c79b9f477098b03db058 +EBUILD esphome-2022.10.2.ebuild 3046 BLAKE2B 4cd60c70299e657589e1259770e670fdbf0abc7481203281090865e3dbf187cd82b20acebfecc9a219f250ec7d7dd96e64e6a5e6963a06524be30c1a1ecba026 SHA512 b42f06012106ce7f03219e84a3b05eda9a4ff910c7bbd6fc8dcfeb1ac6852fcbdb7e9d0b81de71dcb446514bdebd85e9be4409d318406275ee07a8ab91a8fb10 EBUILD esphome-2022.8.0.ebuild 3043 BLAKE2B 7c8484cf4ee6a737fb61dbb18ac5dbc67f86ffd8a2d16edc3dcefb71f54f4e019ef7d073c170f45a03a478a1ecb1cf45b1ebe9536831d39478ba076144c7b68d SHA512 c09a999c0668739b3f31e80962d528613dcace1319d873397cd1e41ba9cf9a4215211ef230796d98c2dd6261a749f45142203d8accff97187faec5bb55681991 EBUILD esphome-2022.9.3.ebuild 3043 BLAKE2B 47f38367dfcec1ca3f507940169e91731f9f94967d061ea847259f39d04823a22ea9f6b5075887f20c50e8b6f445df6356c5cd9429d7f37c280c265f94d83292 SHA512 78b8ad0d3d04cf5c5c893f482fb3e04e0a66f4982798275b064768e56d074179e2fb200ffb634e946df00ea11829337ef4a376457b06745cb36dc95790b98bd0 EBUILD esphome-9999.ebuild 2885 BLAKE2B 3a82b94e7f68869dc4c4d514e830025641e83efc2f01d016c8927828ac9c8bb294798982538e4d4b956010c51ec10e665dfd7ca62e5324df848e7c89cdf76c79 SHA512 2ee15781b673acf7872f7cfab1052f5de889a9959ae66869fde155363531cd94e8de407f10e2b7eb4e6957c8ec7f863a6ea2b70de3ed913c5632fe0b0a00934a diff --git a/dev-embedded/esphome/esphome-2022.10.2.ebuild b/dev-embedded/esphome/esphome-2022.10.2.ebuild index 9454512ce..87a66b8be 100644 --- a/dev-embedded/esphome/esphome-2022.10.2.ebuild +++ b/dev-embedded/esphome/esphome-2022.10.2.ebuild @@ -39,14 +39,14 @@ RDEPEND=" ~dev-python/pyyaml-6.0[${PYTHON_USEDEP}] ~dev-python/paho-mqtt-1.6.1[${PYTHON_USEDEP}] ~dev-python/colorama-0.4.5[${PYTHON_USEDEP}] - server? ( ~dev-python/tornado-6.2[${PYTHON_USEDEP}] ) + server? ( ~dev-python/tornado-6.1[${PYTHON_USEDEP}] ) ~dev-python/tzlocal-4.2[${PYTHON_USEDEP}] >=dev-python/tzdata-2021.1[${PYTHON_USEDEP}] ~dev-python/pyserial-3.5[${PYTHON_USEDEP}] - ~dev-embedded/platformio-6.1.4[${PYTHON_SINGLE_USEDEP}] + ~dev-embedded/platformio-6.0.2[${PYTHON_SINGLE_USEDEP}] ~dev-embedded/esptool-3.3.1[${PYTHON_USEDEP}] ~dev-python/click-8.1.3[${PYTHON_USEDEP}] - ~dev-embedded/esphome-dashboard-20221020.0[${PYTHON_USEDEP}] + ~dev-embedded/esphome-dashboard-20221007.0[${PYTHON_USEDEP}] dev-python/aioesphomeapi[${PYTHON_USEDEP}] dev-python/python-zeroconf[${PYTHON_USEDEP}] ~dev-python/kconfiglib-13.7.1[${PYTHON_USEDEP}]