gentoo resync : 25.09.2021

5 files changed, 11 insertions, 11 deletions

diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz
index 95a5c06790aa..2e7ce9150097 100644
--- a/dev-embedded/Manifest.gz
+++ b/dev-embedded/Manifest.gz
diff --git a/dev-embedded/nodemcu-uploader/Manifest b/dev-embedded/nodemcu-uploader/Manifest
index e40e86b49804..0bfb2d0d4251 100644
--- a/dev-embedded/nodemcu-uploader/Manifest
+++ b/dev-embedded/nodemcu-uploader/Manifest
@@ -1,3 +1,3 @@
 DIST nodemcu-uploader-1.0.0.tar.gz 855474 BLAKE2B f61e10d8c55653003063f93f276fda3d22eb7f4b30cf36bf23dac68775e6be55b73931a4cab54eb244f158b61b7dd4bb5290994386fb355b4be103bf429b5b3c SHA512 9196f8394a26bb5d412d667f7ad423c38b23f906c800e190bbc6f93206a2cbf7da28609a0803bff8b83b32c699df073c49525c05d2dbf276530156224c539864
-EBUILD nodemcu-uploader-1.0.0.ebuild 570 BLAKE2B 11b46d40b3a6ba37a60eef1d53ae31fc04c33558aa0570135ecdf217ad8b6dae38ef5d27180710b2148efd4b9a486a94ea26ca08b525d6d5f72211e14a77488a SHA512 38abc0f043a9d67d74e92914934a3b8ec1368ea66475ba21e4ac74f71c5eb919a7e5a37bf4bc6097619488b1eb4dea0ed0a4aa57a8ab4715a4262713351a48d6
+EBUILD nodemcu-uploader-1.0.0.ebuild 685 BLAKE2B 3a6bf808aab0d23eaab9bc1ee57c420d10806eb05613c4b423016849eb16736af8b39a97c0418cc8f8fb63ceb79cdcb8cbd4c84ec359df737e0cd0a0ccf06d7d SHA512 1764ff37af43aac7023cc954cd051458ed7fefae16a87b3b2312c6f31ac440d18d2aa1389da610834661ad63cc4cbb48c0842275a91724fb41c858de19e0c8f9
 MISC metadata.xml 332 BLAKE2B 5c5b56b41cc365544be813e3de4769a552a19ff9507a9919e61e99bede556c638bc6e9c2a2aa014cebf1f7aa6711071d87289e70300293b7ede1a9301217d764 SHA512 671aaed13d9b55f2806b496985959ac0a7116680fee3afef4ad50614c9de4c56f349a35624a5399f70fa6385472c712b45e6be560c2bb7c0f26ab0b29b9a3daf
diff --git a/dev-embedded/nodemcu-uploader/nodemcu-uploader-1.0.0.ebuild b/dev-embedded/nodemcu-uploader/nodemcu-uploader-1.0.0.ebuild
index 036812167200..f8f4861793bb 100644
--- a/dev-embedded/nodemcu-uploader/nodemcu-uploader-1.0.0.ebuild
+++ b/dev-embedded/nodemcu-uploader/nodemcu-uploader-1.0.0.ebuild
@@ -3,8 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{7..10} )
 inherit distutils-r1
 
 DESCRIPTION="Simple tool for uploading files to the filesystem of an ESP8266 running NodeMCU"
@@ -18,3 +17,10 @@ KEYWORDS="~amd64 ~x86"
 RDEPEND=">=dev-python/pyserial-3.4[${PYTHON_USEDEP}]"
 
 distutils_enable_tests setup.py
+
+src_prepare() {
+	# https://bugs.gentoo.org/796422
+	sed -i -e 's:description-file:description_file:' setup.cfg || die
+
+	distutils-r1_src_prepare
+}
diff --git a/dev-embedded/platformio/Manifest b/dev-embedded/platformio/Manifest
index dde30d40cd9c..c8ee09980a45 100644
--- a/dev-embedded/platformio/Manifest
+++ b/dev-embedded/platformio/Manifest
@@ -1,3 +1,3 @@
 DIST platformio-5.1.1.tar.gz 215305 BLAKE2B a7854138dec1b5b58c4f715dde98a273ed08c0da7fb305f89490944c210737c7c500731b21a5a9cb2bf3be3925f1666ef1084992b99df46d3ee83b449baaaa35 SHA512 f74ae3cb46065379b90c7ec3574d6ff0076085cd891bf41be2f38b6c6b59f87f4d013c1da6e4825f7d831ed17136e433385ab07c3f16b31342d5415192f87eff
-EBUILD platformio-5.1.1.ebuild 1242 BLAKE2B f99ff082db8b2bd02ac3488a69b7a05d87701e625f34d6adf4cf077b83e9a2082f537a86dfe48834d532f9b8e1baf19381fdb4a1313a864a90d0c1a45a2ccdea SHA512 5fa00d15a0a1cfc3f850328c7e60de33c820c2b18b2e6e9944a65ea28d66ce02df11d6befc1aa36cfc4251f02e691dc98af340575263276248ce1365fb003ed9
+EBUILD platformio-5.1.1.ebuild 1111 BLAKE2B 3b68dbeea9ad0e22fc6a145ee3f8673ad408a05cda92f1ecb5859711f5705e850f8730ff54981605133aef63549d8c15c78c0b5bfcd7d14430c3506e6cc50af5 SHA512 7462e3edcce9dfe99d285bc72b13316109054020cd32f85181fd67624481c98c924f972c046d6fd3fba3ba8cbb334c549d9121d4bb63b753fd670e1047d5d3d0
 MISC metadata.xml 249 BLAKE2B 0d8c6b8e9873180a796f77c5194270389ae642d0d888d7fa1bbada89861dc1ba1bd9f238acd76f7a07a3eb694ac8bdb19927012814a03ed8d3e87f40676979d1 SHA512 1ac8ddbe837cb8db85bb6e4ee59a6e98554c04231c54cb5158fbe7dda3230aaeb02ab66ff374f5bb348e84159588b0740c43acd99ed590939db70bbd2f15d265
diff --git a/dev-embedded/platformio/platformio-5.1.1.ebuild b/dev-embedded/platformio/platformio-5.1.1.ebuild
index 84f95fbddf11..a8a4f90c75cc 100644
--- a/dev-embedded/platformio/platformio-5.1.1.ebuild
+++ b/dev-embedded/platformio/platformio-5.1.1.ebuild
@@ -5,7 +5,6 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{8,9} )
 DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
 
@@ -16,13 +15,8 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-DEPEND="
-	$(python_gen_cond_dep '
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	')"
-RDEPEND="${DEPEND}
+RDEPEND="
 	$(python_gen_cond_dep '
 		<dev-python/bottle-0.13[${PYTHON_USEDEP}]
 		>=dev-python/click-5[${PYTHON_USEDEP}]