gentoo resync : 29.12.2022

4 files changed, 64 insertions, 50 deletions

diff --git a/dev-embedded/esptool/Manifest b/dev-embedded/esptool/Manifest
index 385587a0bff5..a70bbf835772 100644
--- a/dev-embedded/esptool/Manifest
+++ b/dev-embedded/esptool/Manifest
@@ -1,6 +1,7 @@
 DIST esptool-3.2.tar.gz 7155428 BLAKE2B f81a8b77f1994599c3302915915e225249a5e735accbe47c8936de47564e47a33ae711df47c57e599d980b450dc4d710f819087a97d086b9d0f15a98622c0da4 SHA512 5e67b3a17190e051d7706ee2dbbe855488765a7bfed15b15f5a04022c3fbf19112905ba6a672c37b1bac5501d45d477cfff07c004cd83b2d1a111430992cefc1
-DIST esptool-3.3.tar.gz 7259717 BLAKE2B b9952dff9a1884cae5325730056673d96bd442c82cd799196d99fe5287b72bc567d312102779f64c4a526c19bd36d0f742b4e81434de8b4dadf406a19bd3d423 SHA512 1f1a43832ae5487c570e49c97ca18831371f5a4ac0d4b260fa8b7356c7af40b8514722ded630a6c84e3d59f7fba78c9d70b291d1fa581fc25ea37204ded44363
-EBUILD esptool-3.2-r1.ebuild 1437 BLAKE2B 2d075390f0f2fdd704e51e40aaf9fbc0c5e96778236428eaaacb55aeed5c8867f1c97696b74232bee13372f4d132d35503ff8dc1a458485cbe24a783d8303a45 SHA512 f68ecbcc419c5dd3a08b19f77ce563b424e910179ec483e4a1f359cb88f29fbe7cfb20c566203ebfed1aa8291bc5f0c1b92f11dee348b5a8fec0d64a7b30621f
+DIST esptool-3.3.1.tar.gz 7261340 BLAKE2B c6ee391dcbc331d9f931bfd969333fc3bfc5628d422d52e2963c9d465f4680dca5debaf17cd2f6aca0db9dcc06563fe775d7d6c15dacdff481c52577c26d4364 SHA512 8da34f7b555513d499141ce403f19c3e77b6944eecde440c757faf3bbf5e915e44ff0bcabf1b2cb7f5fe26caa717bb47104ad808c46feaf1dea254d548048095
+DIST esptool-4.1.tar.gz 7275429 BLAKE2B d89e0d2b90a9005deea71ba14328c5616062d0ada82c309fa4ad4f4c3861e0683b99e70328d6ae60f0fc0e788e25d6b0a4e39596c1c6cfac0e779840ec796f18 SHA512 b9df8d361fe1a97f0649fed03abc919df1c2ff118dc4dd05abeec641ba2d16e6c308894bd91657768e03a6801ec9e5393e573b4c3016b624e842fef7c6354b41
 EBUILD esptool-3.2.ebuild 1421 BLAKE2B c15f2a10e98031acaa71f54eb0346a3d060924f518607f5645bd3b32006d1ac4d15844023f9b78d16cd150b2bc7561c0951ca3a8a2002cdc887fde012843e5b5 SHA512 1f0e339a7e0f9a5b6c5978b46ec38974463ec3b6bc40b00c4be82ddda44b7c7d647f207c722283bdebcb435a7f7effb3bc1fbbc766f9bfe2e65316bbf69992b3
-EBUILD esptool-3.3.ebuild 1416 BLAKE2B bf5d8cb643047fef3467e9a6cfd1880197ff9d1b9560bfcb112a070b07e6d37e6c434244d2271717a0f14a214570b3640f785bcb4520d086c78511a1c6bc8216 SHA512 97f900dca1c6852dd15174344de5a0c1114c2a9e9231558446eefd35b36140392605737aae9b15871bbf69deeb641b842df988b72fd8cd3c7ab12f65282b261b
+EBUILD esptool-3.3.1.ebuild 1414 BLAKE2B 8651f22883c4ec4f05e9f8d72a2405852f0b338a4107522f393c6964c14f45d4625aef0c0cad85d2933f9d51e623c9aa09eebf8e14b860775309ab2b6f3825e8 SHA512 37dd050eeef999bfeeb6334c403f125a01311426fbc16b3e3a82238176e36bf4bbab85264ca68e8745a195bd8821eac005657799cefa32c2fbaeb3ad298927d3
+EBUILD esptool-4.1.ebuild 2187 BLAKE2B 709260cbe82ebf278365e516be28612e19ce2a068053cdce16012fc7f94b2a2aaf758c27ef2a23a28a7b235e239ecb03f6312348e6b4da9a6c32ad3ae96ca165 SHA512 79bcd828b00a8286cf9f674f32cef6771692ba7c4eb91ef9837923a0394c01a0f393454ad96aa787a2d364a3dc1c69a4f60d67c7f1b37376c786839cc78c7c13
 MISC metadata.xml 504 BLAKE2B 578f33b9dc0f1748ecd37c355efd7f4acb041c192e44b89ad926c482c2a1d422080a0ed3c74311895b9f1ef996315965a79adc31b86437b3ea63bae321dd6294 SHA512 e8ed1644714bc0878d2d955f9d90bd6e0ca9fa183186ff160adaaaa46573fc696e49783c793f225a32b47b23da9f5df4d77d5fd59d7a52fc6386ec59f892cb83
diff --git a/dev-embedded/esptool/esptool-3.2-r1.ebuild b/dev-embedded/esptool/esptool-3.2-r1.ebuild
deleted file mode 100644
index 8cdeb0f03135..000000000000
--- a/dev-embedded/esptool/esptool-3.2-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..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_rfc2217.py test/test_esptool.py and test/test_espefuse.py need real hardware connected
-}
diff --git a/dev-embedded/esptool/esptool-3.3.ebuild b/dev-embedded/esptool/esptool-3.3.1.ebuild
index 922aa7b84829..fb5d371d3bb7 100644
--- a/dev-embedded/esptool/esptool-3.3.ebuild
+++ b/dev-embedded/esptool/esptool-3.3.1.ebuild
@@ -14,7 +14,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"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-embedded/esptool/esptool-4.1.ebuild b/dev-embedded/esptool/esptool-4.1.ebuild
new file mode 100644
index 000000000000..a0694e75b119
--- /dev/null
+++ b/dev-embedded/esptool/esptool-4.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..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/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_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}"
+	# 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
+}