gentoo auto-resync : 11:06:2023 - 14:17:09

3 files changed, 12 insertions, 52 deletions

diff --git a/dev-embedded/esptool/Manifest b/dev-embedded/esptool/Manifest
index ea1e052afb20..756195259989 100644
--- a/dev-embedded/esptool/Manifest
+++ b/dev-embedded/esptool/Manifest
@@ -1,9 +1,7 @@
-DIST esptool-3.3.2.tar.gz 7263375 BLAKE2B 8a24a94c5d8acaa9647a5057cbacb57bdf292651529572d7084dbee1013b6174a383bebacccd75bb08e6de94054f28303d5a9b182f0d30dad9081fd8d61d1c4d SHA512 9f31ab5b702c8aede2062a27943fa655d7fbb07fb4c4c377f2ab5552e5453e7c8126bacc5b8e1e859ee6b81e21a75ed1343639815e395b974cc1aaa005367d84
 DIST esptool-3.3.3.tar.gz 7264378 BLAKE2B 8c993bd4ccffaf417599daebcb08c6d0b0aa9a360af8c014156812a8236751a51c81f5fd4637e1bbe1cf44f9ab815e7502a67b522857ed6c72ca13d69d1993b6 SHA512 1d6b85a4a2911c20243f4aa8fe399edc848d540598765df68c83afcd30bd591e7100089e53ccd1bec21aac0be5d8021d6f90a8a0b563612fcfd01a3bd190a9c6
-DIST esptool-4.4.tar.gz 7213588 BLAKE2B a88269ff1bfe2e865dab73cafe2bb567fab027f0679c078a9b7c03b8705763390e3e774ff20ebec0d3dbee5a29d1b1e3d2c1931a3a18ff59b82321a6d0ee0da7 SHA512 97d44a5553be380a2d26469bea42b6995c0d97fa3d50e0f6c1673548801983243d204d140ecfc17ee6c9f9c6580e6c6c42a6e953655a06053fa56064af650cf8
 DIST esptool-4.5.1.tar.gz 6971407 BLAKE2B 8ffc102f5ee854f06156547a46777678df389afbea1229afd1673b26e021a9ec03161e5a1c7fc6fb9b28f6b6a12078c94d9247e351bb46f70b899392aa374d67 SHA512 4b665018eb38796cf785ba0caa20435a1bfa5ad5a50f57207d84242307d354405224ccf216b2cfd8b72602d1f04caa4af38feedc7eb7d8984a1e9e308f8789c4
-EBUILD esptool-3.3.2.ebuild 1446 BLAKE2B 0676282aca64d7f6222abbeec1afa63fd99f04944b8d611aaf5ebc54cc3feeab46bb99360831e393aa71eb58216d158784cc5619a25a2fb7568df0e882ede9ab SHA512 bf49b4d3b24af8634f1bcf8c400a5b28d178a538627d3a04cb2f8c9a9e870585ec6a4c432b33c8d5e374efcac645bd613b0b6f750842d1a8e300bee7c11b84bc
+DIST esptool-4.6.1.tar.gz 7002756 BLAKE2B 2479c0677ed6a28df2c4c0d13f1905e205a7a1460fe6028194543662a8b646f52e4b9fb5a5a4580a16713b0125fb0121418f5fb3eb8f19b45faa286901ef1dc5 SHA512 610934481246d521fff10a8338e36e046c3b575c6eb615667d42627d2de6941af7d8afe7fee92d0583a1e64338fabaffec6d34f050090ad0d2f6206f525e3049
 EBUILD esptool-3.3.3.ebuild 1446 BLAKE2B 0676282aca64d7f6222abbeec1afa63fd99f04944b8d611aaf5ebc54cc3feeab46bb99360831e393aa71eb58216d158784cc5619a25a2fb7568df0e882ede9ab SHA512 bf49b4d3b24af8634f1bcf8c400a5b28d178a538627d3a04cb2f8c9a9e870585ec6a4c432b33c8d5e374efcac645bd613b0b6f750842d1a8e300bee7c11b84bc
-EBUILD esptool-4.4.ebuild 1778 BLAKE2B 5899ce58205dff1b54e85cfa9b92655eb30986bfa999f3e7a40255995276fd0d95d6351bc4a5f55348c314f68599573611ea387539785bde59f98073535e2416 SHA512 5bec2ddc6404aade1ee2e140741049ed807d54931b1ff2d040a51876ffee660870dca8077c23944666067e22bdc3f9622009f3b5e8794db4f5a40142e999d62a
 EBUILD esptool-4.5.1.ebuild 1962 BLAKE2B d9caee146427273a71a4a3646135d18206c48ae4780b6eb3b4c04db07c1baa38916681f50c1f7c416f1d5640406217a5b6672d520497c115ed7eda8127e9234e SHA512 960115c5c0eb81d479b1c85ac90707918d6dae8d1e8d0c796808d6500d5915e5f35c52ce835921dbb169708ef47f71370d7f43885c1308cec70ce60c179989fd
+EBUILD esptool-4.6.1.ebuild 2001 BLAKE2B 0e7875d101e03c2345d9ff234d1b8876e7a0679879a2ad69bfbd6f51cbcf15baa142f44204323e413a5e7d7d597871937b7adef5ad40e95a98b02a9afde0be73 SHA512 908791a9a637b99b358d2529b6e9bd4c7a53f2aaa58df3907d425b7dd78da49852800236346fbbd7005b361ad67c68edaafb5a0b28e97a9df88819effa34b3d4
 MISC metadata.xml 504 BLAKE2B 578f33b9dc0f1748ecd37c355efd7f4acb041c192e44b89ad926c482c2a1d422080a0ed3c74311895b9f1ef996315965a79adc31b86437b3ea63bae321dd6294 SHA512 e8ed1644714bc0878d2d955f9d90bd6e0ca9fa183186ff160adaaaa46573fc696e49783c793f225a32b47b23da9f5df4d77d5fd59d7a52fc6386ec59f892cb83
diff --git a/dev-embedded/esptool/esptool-3.3.2.ebuild b/dev-embedded/esptool/esptool-3.3.2.ebuild
deleted file mode 100644
index 477fc8cac266..000000000000
--- a/dev-embedded/esptool/esptool-3.3.2.ebuild
+++ /dev/null
@@ -1,47 +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/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.4.ebuild b/dev-embedded/esptool/esptool-4.6.1.ebuild
index 618e4d42bb6a..d4d808682c49 100644
--- a/dev-embedded/esptool/esptool-4.4.ebuild
+++ b/dev-embedded/esptool/esptool-4.6.1.ebuild
@@ -15,7 +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"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
@@ -32,7 +32,9 @@ BDEPEND="
 	')
 	test? ( $(python_gen_cond_dep '
 		dev-python/cffi[${PYTHON_USEDEP}]
+		dev-python/pyaml[${PYTHON_USEDEP}]
 		dev-python/pyelftools[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
 	') )
 "
 
@@ -44,6 +46,13 @@ EPYTEST_DESELECT=(
 	test/test_espefuse.py
 )
 
+src_prepare() {
+	default
+
+	# test_espsecure_hsm.py needs setup of a "Soft HSM" or real hardware. remove.
+	rm test/test_espsecure_hsm.py || die
+}
+
 pkg_postinst() {
 	if ver_test ${REPLACING_VERSIONS} -lt 4; then
 		ewarn "${P} - new 4.x release with breaking changes:"