gentoo resync : 15.06.2021

3 files changed, 49 insertions, 42 deletions

diff --git a/dev-embedded/esptool/Manifest b/dev-embedded/esptool/Manifest
index e088409e15f0..b90678d70003 100644
--- a/dev-embedded/esptool/Manifest
+++ b/dev-embedded/esptool/Manifest
@@ -1,5 +1,5 @@
-DIST esptool-2.8.tar.gz 5399875 BLAKE2B c2c27dc44cec1921f2d800347682bb198be76f7a122fd6a0c9964fb189350980557aa85bd6cb8fb2d63c8c7ccdd18e1860b65ca85c8777145ec1da07da886be1 SHA512 14528197e760779f3bf50e2a44d477979675dd42451fa405e2ae87502158b21f999fb94561980c9eb0634d2d1fd3729779b78266403de858ed1d32e8d29604cc
 DIST esptool-3.0.tar.gz 6628258 BLAKE2B 613bdc4c4d0df633c25c83d51a84ff9ca34d5c345f010d2e3e99bc126530d484bb1fb4818b3a10b10a6b9879b161817d5bc6288dab55368f1250a27e2418d641 SHA512 b522d30b11e9ab4e426009116bf1872e587116b7a3b517f841d34d3e860f6454345be89a2e28b8eef5aa5e59318e991504697644a3f4f90d7e63c037025716eb
-EBUILD esptool-2.8-r2.ebuild 1057 BLAKE2B 6cc687c86fa7851648b135eaaece7de1aac22d7b4d16d298f23e045cc7357f07e0f3b19ce4761522708076b1b9091da7f1f3d3b0384cbc612af47bdbbdd54331 SHA512 797e8b5229af3eed44143042232136a383fe7f3f4e4773fe6fbb6ed45c39d02b9479354f3d966496bbbc94bd8813b1aff33a44b0460b47d0f6d66d2920fe191f
+DIST esptool-3.1.tar.gz 6897273 BLAKE2B dcbba13e8775afd3cf10cdeafeee5e9e3c0d2e9722a95076a868b669ea3a11a56b48a053e1b19787c6da330af6d01f9f256a92c0be527d4a7d9848f646f194c3 SHA512 5edaaa376932acc9e7ba717fe931ec1e14b80d1eee415fcef4c69b30b375cd61887ac52a20dd1001d215b8d739019d6b9f624d294d8d76ff112e630d52f7f15b
 EBUILD esptool-3.0.ebuild 1244 BLAKE2B 90d3f79441a14aaf7f4e9eb1f7f324bff0fbd8904cef54415d0ac13cfb3f85fd43268327583ae2ca0b21d5461743b7dfbff259c18c72c30a5c5484c6e2882fbe SHA512 5dd476ef90c84038c4f5341606cb48ceb891ba4999152819fbec832be460c4fe7d6d6b92b550f1e0102fb18ff42802c23d9723e99f48b93ef5967e130733a2d0
+EBUILD esptool-3.1.ebuild 1497 BLAKE2B 0718f89bd8d6e5acbadafe8788abb3f06858b06667a08164b5ca3f827de0ac0b22ef6885f4f922e7676cab51753a4e45738df4cdaa3a169d987bcd5baf7cf92c SHA512 2c0f0daf31a9145bc43929ca09a491abba4d0f017a5f03616861ae2e41aa1a3812f0e67e61b2b0698e5fc326588da329b2f6273680482c06c67c542f66a30882
 MISC metadata.xml 503 BLAKE2B d759cecf4fde754abe8b01d95f2071281c463c1baba1df36e5e3e51dc39a92ec62f2d8411feb67435184a03cf0d80550b5ec213f0194d2ccf41941e9d86b2d89 SHA512 a878ade6c10267d45335db070603587c464d17dcd3cc2b4466e31695c8cafb6eafc46aad9d17f0fbc785d2f69542ce934ee8bd64974291744caace19ceb543bd
diff --git a/dev-embedded/esptool/esptool-2.8-r2.ebuild b/dev-embedded/esptool/esptool-2.8-r2.ebuild
deleted file mode 100644
index 06aca8c2e285..000000000000
--- a/dev-embedded/esptool/esptool-2.8-r2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-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/ecdsa[${PYTHON_MULTI_USEDEP}]
-		dev-python/pyaes[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pyserial-3.0[${PYTHON_MULTI_USEDEP}]
-	')
-"
-BDEPEND="
-	test? ( $(python_gen_cond_dep 'dev-python/pyelftools[${PYTHON_MULTI_USEDEP}]') )
-"
-
-src_prepare() {
-	rm -rf pyaes/ ecdsa/ || die "unable to remove bundled modules"
-	default
-}
-
-python_test() {
-	${EPYTHON} test/test_imagegen.py || die "imagegen test failed with ${EPYTHON}"
-	${EPYTHON} test/test_espsecure.py || die "espsecure test failed with ${EPYTHON}"
-}
diff --git a/dev-embedded/esptool/esptool-3.1.ebuild b/dev-embedded/esptool/esptool-3.1.ebuild
new file mode 100644
index 000000000000..f1f9423803c7
--- /dev/null
+++ b/dev-embedded/esptool/esptool-3.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+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_MULTI_USEDEP}]
+		dev-python/cryptography[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/ecdsa-0.16.0[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyserial[${PYTHON_MULTI_USEDEP}]
+		dev-python/reedsolomon[${PYTHON_MULTI_USEDEP}]
+	')
+"
+BDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/wheel[${PYTHON_MULTI_USEDEP}]
+	')
+	test? ( $(python_gen_cond_dep '
+		dev-python/coverage[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyelftools[${PYTHON_MULTI_USEDEP}]
+		dev-python/unittest2[${PYTHON_MULTI_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
+}