gentoo resync : 29.12.2022

4 files changed, 128 insertions, 1 deletions

diff --git a/dev-embedded/platformio/Manifest b/dev-embedded/platformio/Manifest
index f591e08699f9..7302d5f033ba 100644
--- a/dev-embedded/platformio/Manifest
+++ b/dev-embedded/platformio/Manifest
@@ -1,3 +1,6 @@
+AUX platformio-5.2.5-fix-semantic-version-dep.patch 267 BLAKE2B d15be62a0a01a82ca217d614029c1bafaeda6dc078d975a36f1036da9d453f584b1ca8d8487a0f8995d6eea27a1b34403e53f3ff96ac506d40a5a056b9dc29c5 SHA512 ca59d2df4667a5ec59f35f0b6071fa60d81d24a3fe90129634e802cc850fa4d05380806b3e71192110d96df119f82f27a75eaca41df4d31dac5ffd0c9bba44c1
 DIST platformio-5.2.5.tar.gz 254813 BLAKE2B 96911a64f8e73567820ef2c7b2297ed9e32c36c65c49572af6037c2666da4072bdf920dc31e8de7e07296eb7f1b407c47191d68a80ed212a9c351dfca604b408 SHA512 cf939254c231bb2cb97ac509175b7235a6a2ba447e55a2d9a59a9fe610656743c190f00cb7bfa1fc2e6b64487be7f02a193e2f270236bbb9200537f19175dc22
-EBUILD platformio-5.2.5-r1.ebuild 2546 BLAKE2B 3b290185b67fa64ed7f0530a801577a3eac024c30801b6290aa843ca837335eb42d94e4f9e920fa3bb37f1f62372bac16d24a65a692bed480c784c5c5eb50e2a SHA512 add9d9d7cd52e142b2b9e54a6f6246799061430c81ee891ff361a633b4c9ac0113dd2144aebbcdbb3d9d9997db5f131213d6a1fe6a5ef8f831a733a0c5d07781
+DIST platformio-6.0.2.tar.gz 285452 BLAKE2B c70523837b5118fcc1209a36a425fb6ab0aac73e56732916ff3d39fe87d50a47bf7d31d77324f491093ed366b1b3e4f88274e973bc896b164f5a07687a53bd12 SHA512 a2e48ad9ca22024a06509a9e36e5a7586088d0e8abd67d309d1988a8a112a41e301f077f1b466b5db390dc4048add570acd5bb762bbf22db69715dead0d8fc89
+EBUILD platformio-5.2.5-r2.ebuild 2617 BLAKE2B 48f779ce26c27e31beb69349cd8cf621d49112e93eb9f8bd3450afa04ef2e2c9879317436b104bc5992c59ec661323628a6c93d4640088a280a3f9a0af2ae2f5 SHA512 54680dda63927f8435ebc8f302f16cbccbd96d6440d581a51fd472ad513f8c3a62c2f1c78ffa7a840d6993354d383746f1d1a44fd55f4f479bff7358d4d82a64
+EBUILD platformio-6.0.2.ebuild 3221 BLAKE2B fed27e95a092cc7a28dd42d595320ff601ff2493afbbf522edd0c79fe9fd98262b863e5fab7892708269d04353284f7228606b775dab52ec818a1b433722dadb SHA512 70c0fe0ecaa281a109273a88cb6bd35b57321d39ddf0870dcacc153db71b020de7d8519e1bc4a5c5a05832f506a15f767e736ace6cf745df82dbf802f8c6e45e
 MISC metadata.xml 249 BLAKE2B 0d8c6b8e9873180a796f77c5194270389ae642d0d888d7fa1bbada89861dc1ba1bd9f238acd76f7a07a3eb694ac8bdb19927012814a03ed8d3e87f40676979d1 SHA512 1ac8ddbe837cb8db85bb6e4ee59a6e98554c04231c54cb5158fbe7dda3230aaeb02ab66ff374f5bb348e84159588b0740c43acd99ed590939db70bbd2f15d265
diff --git a/dev-embedded/platformio/files/platformio-5.2.5-fix-semantic-version-dep.patch b/dev-embedded/platformio/files/platformio-5.2.5-fix-semantic-version-dep.patch
new file mode 100644
index 000000000000..1fa92fed8784
--- /dev/null
+++ b/dev-embedded/platformio/files/platformio-5.2.5-fix-semantic-version-dep.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/853247
+--- a/setup.py
++++ b/setup.py
+@@ -35,7 +35,7 @@ minimal_requirements = [
+     "pyelftools>=0.27,<1",
+     "pyserial==3.*",
+     "requests==2.*",
+-    "semantic_version==2.9.*",
++    "semantic_version==2.*",
+     "tabulate==0.8.*",
+ ]
+ 
diff --git a/dev-embedded/platformio/platformio-5.2.5-r1.ebuild b/dev-embedded/platformio/platformio-5.2.5-r2.ebuild
index 9c73bc3fd57d..9c0cbfa5bbd5 100644
--- a/dev-embedded/platformio/platformio-5.2.5-r1.ebuild
+++ b/dev-embedded/platformio/platformio-5.2.5-r2.ebuild
@@ -68,6 +68,10 @@ EPYTEST_IGNORE=(
 
 distutils_enable_tests pytest
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.2.5-fix-semantic-version-dep.patch
+)
+
 src_prepare() {
 	# Allow newer versions of zeroconf, Bug #831181.
 	# Also wsproto.
diff --git a/dev-embedded/platformio/platformio-6.0.2.ebuild b/dev-embedded/platformio/platformio-6.0.2.ebuild
new file mode 100644
index 000000000000..bf24334631e4
--- /dev/null
+++ b/dev-embedded/platformio/platformio-6.0.2.ebuild
@@ -0,0 +1,108 @@
+# 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..10} )
+
+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 ~x86"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		<dev-python/aiofiles-0.9[${PYTHON_USEDEP}]
+		dev-python/ajsonrpc[${PYTHON_USEDEP}]
+		<dev-python/bottle-0.13[${PYTHON_USEDEP}]
+		>=dev-python/click-8[${PYTHON_USEDEP}]
+		<dev-python/click-9[${PYTHON_USEDEP}]
+		dev-python/colorama[${PYTHON_USEDEP}]
+		>=dev-python/pyserial-3[${PYTHON_USEDEP}]
+		<dev-python/pyserial-4[${PYTHON_USEDEP}]
+		>=dev-python/requests-2.4[${PYTHON_USEDEP}]
+		<dev-python/requests-3[${PYTHON_USEDEP}]
+		>=dev-python/semantic_version-2.9[${PYTHON_USEDEP}]
+		<dev-python/semantic_version-3[${PYTHON_USEDEP}]
+		>=dev-python/tabulate-0.8.3[${PYTHON_USEDEP}]
+		<dev-python/tabulate-1[${PYTHON_USEDEP}]
+		dev-python/twisted[${PYTHON_USEDEP}]
+		>=dev-python/pyelftools-0.25[${PYTHON_USEDEP}]
+		<dev-python/pyelftools-1[${PYTHON_USEDEP}]
+		>=dev-python/marshmallow-2.20.5[${PYTHON_USEDEP}]
+		=dev-python/starlette-0.18*[${PYTHON_USEDEP}]
+		=dev-python/uvicorn-0.17*[${PYTHON_USEDEP}]
+		dev-python/wsproto[${PYTHON_USEDEP}]
+		>=dev-python/zeroconf-0.37[${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
+}