gentoo auto-resync : 29:03:2023 - 03:52:19

4 files changed, 16 insertions, 124 deletions

diff --git a/dev-embedded/platformio/Manifest b/dev-embedded/platformio/Manifest
index 7c6c96c18351..54d09bddbc10 100644
--- a/dev-embedded/platformio/Manifest
+++ b/dev-embedded/platformio/Manifest
@@ -1,5 +1,3 @@
-DIST platformio-6.1.5.tar.gz 290684 BLAKE2B 1beca08e70f6a932426e13e6b4755188ad2ac266c4b311b2e6ea560623ccc7479ad5fa1955c09e613eb62682164d1952be3b7f050a26d5a5b6bff26435bb2337 SHA512 43835a40636091d7062a1cbd96950ddb29592aba6c4eaeb80f37288f949bd95f3312cb5f33814cf8521e3b5bd3ceeb2e32e76c294ef5cbf992ed3c674d4a9ab7
 DIST platformio-6.1.6.tar.gz 295288 BLAKE2B 4508f3eda25cbb2d2bad6881d7041a9bd8bb87b452564b3cabd58bec0506ca10e53b2552eee8ac1984cb429e5ea52c332d863f1c76a10b5106ab238e6506bb87 SHA512 879fbc759476118473d13375e4dcdbda901f48f5d0d9bb94bdd3ed09de2563603880b91d102e35eaf144e61cd457b132056e0a8293b762b3566a537f3b886078
-EBUILD platformio-6.1.5.ebuild 3152 BLAKE2B 95b697f36ab87084457f8723cc00874099cbeb170ce35a079f7baf137d0fec2755866eee33c94335be1e070c059290b1adb28e8fc2cef948ba104045c258a5ed SHA512 28236dbf71c5ab82154f81c9787031a354d902a5452b289a24c4c513ccc08d13a07e30490703ff2212fe7bbe0b3bcde7881d3142ec60081aa8b086fda46d50a7
-EBUILD platformio-6.1.6.ebuild 3169 BLAKE2B 2be58a540247d7f58c632ea58cd543faa678ddb1207bdab3b53cd64ff3a6d47ce3fe50ceb85b88ed6e07133c4e7a9837bb0e12c505e60a4e78fbd74a88a926f7 SHA512 36859a9a07686e5a65ab0abc12b39f9d3e6a8005995e373c2530fd56786ce975a4cf2888b2d7c7a52f011ecdda6c28c9096826f93b69f82174129ff3f5a90a30
-MISC metadata.xml 249 BLAKE2B 0d8c6b8e9873180a796f77c5194270389ae642d0d888d7fa1bbada89861dc1ba1bd9f238acd76f7a07a3eb694ac8bdb19927012814a03ed8d3e87f40676979d1 SHA512 1ac8ddbe837cb8db85bb6e4ee59a6e98554c04231c54cb5158fbe7dda3230aaeb02ab66ff374f5bb348e84159588b0740c43acd99ed590939db70bbd2f15d265
+EBUILD platformio-6.1.6-r1.ebuild 3291 BLAKE2B a3482c7840827feb1202966d518181fe6049a72515d8f72c98cfbc4b06f63a609e8dcd99613d7c09e6fabe1cd9f7341a9e9df40e05bd87d0092cfecec80eb17d SHA512 5967db3c027c8ee04e861a97c0e525f740e0d688810ddf8b91fe2de674e6c64ecbce7cf213069e96f71952fc2d8383c27a8f74023065ffaf01d0c79fac9c6ba4
+MISC metadata.xml 340 BLAKE2B 992fa2488c72523eb663bd6bb85608c3ad39e57781bbf08801ac3d34551fdcebd5b80d50bb4353ceefd5bb2228a56101f8ad2cd155d39cd4ff071d8f664a9f60 SHA512 1a596e7fbfb70e5814dc811ff96f3597f744d3e049ed8cd047238557fbeb1c370f22656990d6e30f42cf9193b899686e85c0edd3d1115af93eb4b7866066dc8c
diff --git a/dev-embedded/platformio/metadata.xml b/dev-embedded/platformio/metadata.xml
index 34f42ecf020c..87876d21d985 100644
--- a/dev-embedded/platformio/metadata.xml
+++ b/dev-embedded/platformio/metadata.xml
@@ -5,4 +5,7 @@
 		<email>alexxy@gentoo.org</email>
 		<name>Alexey Shvetsov</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">platformio/platformio-core</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-embedded/platformio/platformio-6.1.5.ebuild b/dev-embedded/platformio/platformio-6.1.5.ebuild
deleted file mode 100644
index bf0d59437b57..000000000000
--- a/dev-embedded/platformio/platformio-6.1.5.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2023 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_{9..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-22.1*[${PYTHON_USEDEP}]
-		dev-python/ajsonrpc[${PYTHON_USEDEP}]
-		<dev-python/bottle-0.13[${PYTHON_USEDEP}]
-		=dev-python/click-8*[${PYTHON_USEDEP}]
-		dev-python/colorama[${PYTHON_USEDEP}]
-		>=dev-python/pyserial-3[${PYTHON_USEDEP}]
-		<dev-python/pyserial-4[${PYTHON_USEDEP}]
-		>=dev-python/zeroconf-0.37[${PYTHON_USEDEP}]
-		=dev-python/requests-2*[${PYTHON_USEDEP}]
-		>=dev-python/semantic_version-2.9[${PYTHON_USEDEP}]
-		<dev-python/semantic_version-3[${PYTHON_USEDEP}]
-		=dev-python/tabulate-0.9*[${PYTHON_USEDEP}]
-		dev-python/twisted[${PYTHON_USEDEP}]
-		>=dev-python/pyelftools-0.27[${PYTHON_USEDEP}]
-		<dev-python/pyelftools-1[${PYTHON_USEDEP}]
-		=dev-python/marshmallow-3*[${PYTHON_USEDEP}]
-		=dev-python/starlette-0.21*[${PYTHON_USEDEP}]
-		=dev-python/uvicorn-0.19*[${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
-}
diff --git a/dev-embedded/platformio/platformio-6.1.6.ebuild b/dev-embedded/platformio/platformio-6.1.6-r1.ebuild
index 6c0dd8fa4f4b..27e962933b2c 100644
--- a/dev-embedded/platformio/platformio-6.1.6.ebuild
+++ b/dev-embedded/platformio/platformio-6.1.6-r1.ebuild
@@ -36,8 +36,8 @@ RDEPEND="
 		>=dev-python/pyelftools-0.27[${PYTHON_USEDEP}]
 		<dev-python/pyelftools-1[${PYTHON_USEDEP}]
 		=dev-python/marshmallow-3*[${PYTHON_USEDEP}]
-		=dev-python/starlette-0.21*[${PYTHON_USEDEP}]
-		=dev-python/uvicorn-0.19*[${PYTHON_USEDEP}]
+		>=dev-python/starlette-0.21[${PYTHON_USEDEP}]
+		>=dev-python/uvicorn-0.19[${PYTHON_USEDEP}]
 		dev-python/wsproto[${PYTHON_USEDEP}]
 	')
 	virtual/udev"
@@ -82,17 +82,21 @@ EPYTEST_DESELECT=(
 
 distutils_enable_tests pytest
 
-src_prepare() {
-	# Allow newer versions of zeroconf, Bug #831181.
-	# Also wsproto.
-	# ... and semantic_version, bug #853247.
+python_prepare_all() {
+	# Allow newer versions of:
+	# - zeroconf, bug #831181.
+	# - wsproto
+	# - semantic_version, bug #853247
+	# - starlette & uvicorn, bug #888427
 	sed \
 		-e '/zeroconf/s/<[0-9.*]*//' \
 		-e '/wsproto/s/==.*/"/' \
 		-e '/semantic_version/s/==[0-9.*]*//' \
+		-e '/starlette/s/==.*/"/' \
+		-e '/uvicorn/s/==.*/"/' \
 		-i setup.py || die
 
-	default
+	distutils-r1_python_prepare_all
 }
 
 python_test() {