gentoo auto-resync : 27:02:2023 - 16:01:10

4 files changed, 18 insertions, 131 deletions

diff --git a/dev-embedded/esptool/Manifest b/dev-embedded/esptool/Manifest
index 88924c83a5d0..c46502048f87 100644
--- a/dev-embedded/esptool/Manifest
+++ b/dev-embedded/esptool/Manifest
@@ -1,11 +1,7 @@
-DIST esptool-3.3.1.tar.gz 7261340 BLAKE2B c6ee391dcbc331d9f931bfd969333fc3bfc5628d422d52e2963c9d465f4680dca5debaf17cd2f6aca0db9dcc06563fe775d7d6c15dacdff481c52577c26d4364 SHA512 8da34f7b555513d499141ce403f19c3e77b6944eecde440c757faf3bbf5e915e44ff0bcabf1b2cb7f5fe26caa717bb47104ad808c46feaf1dea254d548048095
 DIST esptool-3.3.2.tar.gz 7263375 BLAKE2B 8a24a94c5d8acaa9647a5057cbacb57bdf292651529572d7084dbee1013b6174a383bebacccd75bb08e6de94054f28303d5a9b182f0d30dad9081fd8d61d1c4d SHA512 9f31ab5b702c8aede2062a27943fa655d7fbb07fb4c4c377f2ab5552e5453e7c8126bacc5b8e1e859ee6b81e21a75ed1343639815e395b974cc1aaa005367d84
-DIST esptool-4.2.1.tar.gz 7271498 BLAKE2B af1c17e08cad057e4534599481da6366460e9eff02de0dfe1cd1163885d315cefd780e034550e7cf09f09f4f3430108675722b9a57109a94c5519bf0c0c158b2 SHA512 b2b7209371330ae0764da5650b48a37ec750a3514951b8e39576b4e54ea682e2a43faf56ce95327071fe88bf4f74762a39483e1edfe2bdf9c5457537888c469f
-DIST esptool-4.3.tar.gz 7216987 BLAKE2B 9c48b6884667913b5ffe8d0bef22fcb27142a42a89c802f2f1f2f5355d1a967c398f86a398574310fcb1de5b37a1f5fb7e9e7f78058e5ad38008b097d8debd66 SHA512 aa761dae802d67553096698b40a97ae1fa33995dbc81a16a521ffa3ed1ec87470b1457853e4a1aaedfb94c46770e58712a25cac62a4bd05d85503881e507b493
 DIST esptool-4.4.tar.gz 7213588 BLAKE2B a88269ff1bfe2e865dab73cafe2bb567fab027f0679c078a9b7c03b8705763390e3e774ff20ebec0d3dbee5a29d1b1e3d2c1931a3a18ff59b82321a6d0ee0da7 SHA512 97d44a5553be380a2d26469bea42b6995c0d97fa3d50e0f6c1673548801983243d204d140ecfc17ee6c9f9c6580e6c6c42a6e953655a06053fa56064af650cf8
-EBUILD esptool-3.3.1.ebuild 1414 BLAKE2B 75baca791c525e44b5eaeefbd92dfb0e76defeb77c99cc6c219a436ca4d5bcb7eb71bb76ccc42cd4b426f35089b838fe9209b616a8383904c2f84eec60790e10 SHA512 9ebc0100c7dd4cf05bbbeac33f6fe3182bf1aa631de33f9f40ec65f36570b0d52c5daa3d4ac7844284babb4b13601e685aa4ac79500321492fc082d58df03dcf
+DIST esptool-4.5.tar.gz 7263652 BLAKE2B 7d77a61159e2fbd7abd4897202c1a1c6622a12ac30e453e74258cf1151f2ae2e2332c79abb81fbc9a2ee897db01006afa86ce4f9ef9a700f12a04a13ef932597 SHA512 b55cb334ee82048195c60afe0a86e1a9952e3e91aa3c5c97b1b44709cf24c793ed0da4607b1ecefc87ed5f5f16951f9e4db68bc33a8f96d193479e7f73964763
 EBUILD esptool-3.3.2.ebuild 1446 BLAKE2B 0676282aca64d7f6222abbeec1afa63fd99f04944b8d611aaf5ebc54cc3feeab46bb99360831e393aa71eb58216d158784cc5619a25a2fb7568df0e882ede9ab SHA512 bf49b4d3b24af8634f1bcf8c400a5b28d178a538627d3a04cb2f8c9a9e870585ec6a4c432b33c8d5e374efcac645bd613b0b6f750842d1a8e300bee7c11b84bc
-EBUILD esptool-4.2.1.ebuild 2183 BLAKE2B 180452699b4479e20d10532506e369d3f219c017d0b5364a1acbdb067750969e160647e59e26bae1facd2339866651f1232c20db31ee696fd24714f3ff1e46c8 SHA512 802dcb2b4932eae6860ffdaafa8b173cf95afc938e55e9daff2aefac38b265df3159d6085464d1ecf5af7a7e42e87d9e81fbaa3d9ff3468b7002454fb55327a3
-EBUILD esptool-4.3.ebuild 3112 BLAKE2B ecc0f9e0655659849e101fb498b6783c67bebf6270d59887444d5dd07a69e59c23491957397058a6cfc0fa5dc2f199acdd7853a03c93cbf175148f502b4e65da SHA512 d0c861d487824c4fd195e2f488fd953fcf1d33b139be0bb91ac12e153a09000d0444eedbf25e74fd9edb41dfa27ba48a67e11a1c3939c4ce8b3ee6d885f6c005
 EBUILD esptool-4.4.ebuild 1778 BLAKE2B 5899ce58205dff1b54e85cfa9b92655eb30986bfa999f3e7a40255995276fd0d95d6351bc4a5f55348c314f68599573611ea387539785bde59f98073535e2416 SHA512 5bec2ddc6404aade1ee2e140741049ed807d54931b1ff2d040a51876ffee660870dca8077c23944666067e22bdc3f9622009f3b5e8794db4f5a40142e999d62a
+EBUILD esptool-4.5.ebuild 1964 BLAKE2B 2e3d65a25e5212c1da7667c10b4f0d0eeb36fc4a1943fce83b1f63725529d36555f56f666f200715e88fe63bebfa7778c9465711c90dbd9b0b2f76c541e6c604 SHA512 38465264ed11890997403c9910bd1753ba650bb8f036a5d1a22b669576f9f239b9e4ed2a5f5df7b8d999e437ecd48ef7cd037cb4914e43bf9a6f48f7af22c42d
 MISC metadata.xml 504 BLAKE2B 578f33b9dc0f1748ecd37c355efd7f4acb041c192e44b89ad926c482c2a1d422080a0ed3c74311895b9f1ef996315965a79adc31b86437b3ea63bae321dd6294 SHA512 e8ed1644714bc0878d2d955f9d90bd6e0ca9fa183186ff160adaaaa46573fc696e49783c793f225a32b47b23da9f5df4d77d5fd59d7a52fc6386ec59f892cb83
diff --git a/dev-embedded/esptool/esptool-3.3.1.ebuild b/dev-embedded/esptool/esptool-3.3.1.ebuild
deleted file mode 100644
index 0cda006a3dcf..000000000000
--- a/dev-embedded/esptool/esptool-3.3.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1
-
-DESCRIPTION="Utility to communicate with the ROM bootloader in Espressif ESP8266 and ESP32"
-HOMEPAGE="https://github.com/espressif/esptool"
-SRC_URI="https://github.com/espressif/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/bitstring[${PYTHON_USEDEP}]
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		>=dev-python/ecdsa-0.16.0[${PYTHON_USEDEP}]
-		dev-python/pyserial[${PYTHON_USEDEP}]
-		dev-python/reedsolomon[${PYTHON_USEDEP}]
-	')
-"
-BDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/wheel[${PYTHON_USEDEP}]
-	')
-	test? ( $(python_gen_cond_dep '
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/pyelftools[${PYTHON_USEDEP}]
-	') )
-"
-
-python_test() {
-	"${EPYTHON}" test/test_imagegen.py || die "imagegen test failed with ${EPYTHON}"
-	"${EPYTHON}" test/test_espsecure.py || die "espsecure test failed with ${EPYTHON}"
-	"${EPYTHON}" test/test_espefuse_host.py || die "espefuse_host test failed with ${EPYTHON}"
-	"${EPYTHON}" test/test_merge_bin.py || die "espefuse_host test failed with ${EPYTHON}"
-	# test/test_esptool.py and test/test_espefuse.py need real hardware connected
-}
diff --git a/dev-embedded/esptool/esptool-4.3.ebuild b/dev-embedded/esptool/esptool-4.3.ebuild
deleted file mode 100644
index 98189323de60..000000000000
--- a/dev-embedded/esptool/esptool-4.3.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-DISTUTILS_USE_PEP517=setuptools
-DISTUTILS_SINGLE_IMPL=1
-
-inherit distutils-r1
-
-DESCRIPTION="Utility to communicate with the ROM bootloader in Espressif ESP8266 and ESP32"
-HOMEPAGE="https://github.com/espressif/esptool"
-SRC_URI="https://github.com/espressif/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/bitstring[${PYTHON_USEDEP}]
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		>=dev-python/ecdsa-0.16.0[${PYTHON_USEDEP}]
-		dev-python/pyserial[${PYTHON_USEDEP}]
-		dev-python/reedsolomon[${PYTHON_USEDEP}]
-	')
-"
-BDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/wheel[${PYTHON_USEDEP}]
-	')
-	test? ( $(python_gen_cond_dep '
-		dev-python/cffi[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/pyelftools[${PYTHON_USEDEP}]
-	') )
-"
-
-python_test() {
-	"${EPYTHON}" test/test_imagegen.py || die "test_imagegen.py failed with ${EPYTHON}"
-	"${EPYTHON}" test/test_espsecure.py || die "test_espsecure.py failed with ${EPYTHON}"
-	"${EPYTHON}" test/test_merge_bin.py || die "test_merge_bin.py failed with ${EPYTHON}"
-	"${EPYTHON}" test/test_image_info.py || die "test_image_info.py failed with ${EPYTHON}"
-	"${EPYTHON}" test/test_modules.py || die "test_modules.py failed with ${EPYTHON}"
-	"${EPYTHON}" test/test_espefuse_host.py esp32|| die "test_espefuse_host.py esp32 failed with ${EPYTHON}"
-	"${EPYTHON}" test/test_espefuse_host.py esp32c2 || die "test_espefuse_host.py esp32c2 failed with ${EPYTHON}"
-	"${EPYTHON}" test/test_espefuse_host.py esp32c3 || die "test_espefuse_host.py esp32c3 failed with ${EPYTHON}"
-	"${EPYTHON}" test/test_espefuse_host.py esp32s2 || die "test_espefuse_host.py esp32s2 failed with ${EPYTHON}"
-	"${EPYTHON}" test/test_espefuse_host.py esp32s3 || die "test_espefuse_host.py esp32s3 failed with ${EPYTHON}"
-	"${EPYTHON}" test/test_espefuse_host.py esp32s3beta2 || die "test_espefuse_host.py esp32s3beta2 failed with ${EPYTHON}"
-	"${EPYTHON}" test/test_espefuse_host.py esp32h2beta1 || die "test_espefuse_host.py esp32h2beta1 failed with ${EPYTHON}"
-	"${EPYTHON}" test/test_espefuse_host.py esp32c6 || die "test_espefuse_host.py esp32c6 failed with ${EPYTHON}"
-	# test/test_esptool.py and test/test_espefuse.py need real hardware connected
-}
-
-pkg_postinst() {
-	if ver_test ${REPLACING_VERSIONS} -lt 4; then
-		ewarn "${P} - new 4.x release with breaking changes:"
-		ewarn "  - Public API has been defined by limiting access to internals that have been refactored into multiple source files"
-		ewarn "  - If active security features are detected, the default behavior changes to prevent unintentional bricking"
-		ewarn "  - Flash parameters in an image header can now be changed only when no SHA256 digest is appended"
-		ewarn "  - The ESP8684 alias has been removed, ESP32-C2 has to be used"
-		ewarn "  - Megabit flash sizes have been deprecated, use megabyte units from now on"
-	fi
-}
diff --git a/dev-embedded/esptool/esptool-4.2.1.ebuild b/dev-embedded/esptool/esptool-4.5.ebuild
index cdfa690dbb34..68ef41735cdc 100644
--- a/dev-embedded/esptool/esptool-4.2.1.ebuild
+++ b/dev-embedded/esptool/esptool-4.5.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_USE_PEP517=setuptools
 DISTUTILS_SINGLE_IMPL=1
 
 inherit distutils-r1
@@ -14,9 +15,7 @@ SRC_URI="https://github.com/espressif/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
@@ -33,18 +32,24 @@ BDEPEND="
 	')
 	test? ( $(python_gen_cond_dep '
 		dev-python/cffi[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
 		dev-python/pyelftools[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
 	') )
 "
 
-python_test() {
-	"${EPYTHON}" test/test_imagegen.py || die "test_imagegen.py failed with ${EPYTHON}"
-	"${EPYTHON}" test/test_espsecure.py || die "test_espsecure.py failed with ${EPYTHON}"
-	"${EPYTHON}" test/test_espefuse_host.py || die "test_espefuse_host.py failed with ${EPYTHON}"
-	"${EPYTHON}" test/test_merge_bin.py || die "test_merge_bin.py failed with ${EPYTHON}"
-	"${EPYTHON}" test/test_modules.py || die "test_modules.py failed with ${EPYTHON}"
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
 	# test/test_esptool.py and test/test_espefuse.py need real hardware connected
+	test/test_esptool.py
+	test/test_espefuse.py
+)
+
+src_prepare() {
+	default
+
+	# test_espsecure_hsm.py calls unavailable python modules and is broken anyway
+	rm test/test_espsecure_hsm.py || die
 }
 
 pkg_postinst() {