gentoo (valentine's day) resync : 14.02.2021

4 files changed, 3 insertions, 83 deletions

diff --git a/dev-embedded/esptool/Manifest b/dev-embedded/esptool/Manifest
index 2bd2de8f1b71..2d2e6b290d0c 100644
--- a/dev-embedded/esptool/Manifest
+++ b/dev-embedded/esptool/Manifest
@@ -1,7 +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-r1.ebuild 1146 BLAKE2B 603b2bdf8edbc6acd0b050e043b0a43c4758f0879bee584de33c1caa76f4db73e9dbe9a833be1ef3be2cd612d5828bb93b50e0c565868ccdc500b2f02b8be2e5 SHA512 647b17089980549814d25c3fd9739cde047d8a386871d908ede3d760d2d3f5f5c69dbc0974fac86db0536099334694f83e00867ee3a09fa2e0fd57156af762d2
 EBUILD esptool-2.8-r2.ebuild 1057 BLAKE2B 6cc687c86fa7851648b135eaaece7de1aac22d7b4d16d298f23e045cc7357f07e0f3b19ce4761522708076b1b9091da7f1f3d3b0384cbc612af47bdbbdd54331 SHA512 797e8b5229af3eed44143042232136a383fe7f3f4e4773fe6fbb6ed45c39d02b9479354f3d966496bbbc94bd8813b1aff33a44b0460b47d0f6d66d2920fe191f
-EBUILD esptool-2.8.ebuild 926 BLAKE2B cd0588e87b1b2c3d059820299e4a42eac82f38fb3b19cdae2d58f8045e06c93f2db715c8503469a3c066bfc2accf8f949c6d22d989344180a4a07bbc145e99e6 SHA512 9696661b1744365b53064f83be2e63c57e2c094725bcfe002c838c3df038a04df2aae11451b9917504bf9aa792ded2581c8b1dce8dbf4e2d485af39f122f60f7
-EBUILD esptool-3.0.ebuild 1241 BLAKE2B 69b4f24ea28eee4e2f924cd67131482a45a90c470f3d716b6e1e0bbabc25b1f17c87880f5f85d4025dd8dff97bc510f674678d78d41cf8c3d376ca599e64e4e8 SHA512 095b96f54b1bb6fc55103632c484727092dd19bc4d43191a02a73fba2f5a95befb469e5ee8ec1a25b250bd22ddcf519cafb71f8a026e249dc5063dfc4b2203a6
+EBUILD esptool-3.0.ebuild 1244 BLAKE2B 90d3f79441a14aaf7f4e9eb1f7f324bff0fbd8904cef54415d0ac13cfb3f85fd43268327583ae2ca0b21d5461743b7dfbff259c18c72c30a5c5484c6e2882fbe SHA512 5dd476ef90c84038c4f5341606cb48ceb891ba4999152819fbec832be460c4fe7d6d6b92b550f1e0102fb18ff42802c23d9723e99f48b93ef5967e130733a2d0
 MISC metadata.xml 473 BLAKE2B 58b09a7777e3c2c04d7932bcfb631a8cbd0322cc81cc35a0871fdc8843f0d3d376b42bb2d7cacd5378f1d7e0f497f0989be1381ee9e8dd3513a899a9ba268199 SHA512 6029394a2639f610b705a820bdc92eab6849087b6964aac46e1aa9a2bd897f06e45919cb32441115081c3ce26097e6a083d9826c43bb7da86b2859855e7f9d67
diff --git a/dev-embedded/esptool/esptool-2.8-r1.ebuild b/dev-embedded/esptool/esptool-2.8-r1.ebuild
deleted file mode 100644
index b5059f85d948..000000000000
--- a/dev-embedded/esptool/esptool-2.8-r1.ebuild
+++ /dev/null
@@ -1,41 +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} ) # apps work with 3_9 but test depend is not fulfilled
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-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-2.8.ebuild b/dev-embedded/esptool/esptool-2.8.ebuild
deleted file mode 100644
index 5bcb03d5fe71..000000000000
--- a/dev-embedded/esptool/esptool-2.8.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_7 )
-
-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 )"
-
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-RDEPEND="
-	dev-python/ecdsa[${PYTHON_USEDEP}]
-	dev-python/pyaes[${PYTHON_USEDEP}]
-	>=dev-python/pyserial-3.0[${PYTHON_USEDEP}]
-"
-
-DEPEND="
-	test? ( ${RDEPEND}
-		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}"
-}
diff --git a/dev-embedded/esptool/esptool-3.0.ebuild b/dev-embedded/esptool/esptool-3.0.ebuild
index 364678d8edef..6205142a51ff 100644
--- a/dev-embedded/esptool/esptool-3.0.ebuild
+++ b/dev-embedded/esptool/esptool-3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 )"