gentoo resync : 06.04.2022

9 files changed, 61 insertions, 27 deletions

diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz
index 3ef6d15feccc..3f2df05b9124 100644
--- a/dev-embedded/Manifest.gz
+++ b/dev-embedded/Manifest.gz
diff --git a/dev-embedded/arduino-listserialportsc/Manifest b/dev-embedded/arduino-listserialportsc/Manifest
index 8f1788ef61a7..8a63909270d9 100644
--- a/dev-embedded/arduino-listserialportsc/Manifest
+++ b/dev-embedded/arduino-listserialportsc/Manifest
@@ -1,3 +1,3 @@
 DIST arduino-listserialportsc-1.4.0.tar.gz 5448 BLAKE2B a1b5256c9e9ece7ec4de8b1481b6e20769fe07fd94b73d099922074ff20d251896d992aba1e3680dc7e667ff2897fec05812a07273efe097cf5387a5f0207554 SHA512 0e8bbf1e49fa8705a6d3c28b44043f8d13589b7ebdac245db79ed3826bf56028778fdf721af3cf756cc8ea19e7a2f7e5f19421a105211cf0cd35041ec718c2bb
-EBUILD arduino-listserialportsc-1.4.0.ebuild 1098 BLAKE2B 527cef4a815c78f57f5b17fddf4133bcf3e7818d27c7b07e64ddef4c19e7e61465da8e2e1a30c52be75cd0a7635f6e85f3693c6c0d0346f6c908ecc024163ce3 SHA512 3bce0d830e299b20b576483164a5ac0682397bde5184e786218318d8890cee0bff2ca13b88377aa09cb35151daadb3d40421ee45b847d49d9bb0d1a945b5c264
+EBUILD arduino-listserialportsc-1.4.0.ebuild 1136 BLAKE2B e76ce89b9f70c3f3129505b6e97eafda7b14a259b5e48159225d348f902cab6a12e56b6b96250c2690e9d0a5d6f435cb7fe2bfffbd07f92af9eff4df549e34ca SHA512 abe176ec64f63d2e367dfc0bfc42dab05323943ea4e3bee3d7bb4af1096d45cee632782ca6e165441b3d67de8465637bec7a1baa59a62b63a3e5893964201321
 MISC metadata.xml 341 BLAKE2B 7ba73735132b5d9ec9e1cb2bfca7917173e4887fe6e55c15a4e2ebfa5442b38fc76e12353b57ac8409aea6309f14b4f4d86afb54c7f3ffd715aceb2bcee81441 SHA512 cda280eb54d6011a1c375655924178ab3ee6e6f065dc3f114f2176894ebb149cf7bfae27fe89efe465df5373dfdf1dd86e591c7e148d89f8162d63bc30e168bd
diff --git a/dev-embedded/arduino-listserialportsc/arduino-listserialportsc-1.4.0.ebuild b/dev-embedded/arduino-listserialportsc/arduino-listserialportsc-1.4.0.ebuild
index 7a3b5304855c..b9a28eb7e8cd 100644
--- a/dev-embedded/arduino-listserialportsc/arduino-listserialportsc-1.4.0.ebuild
+++ b/dev-embedded/arduino-listserialportsc/arduino-listserialportsc-1.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,6 +8,7 @@ inherit java-pkg-2 toolchain-funcs
 DESCRIPTION="Arduino helper library to list serial ports"
 HOMEPAGE="https://github.com/arduino/listSerialPortsC"
 SRC_URI="https://github.com/arduino/listSerialPortsC/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
 LICENSE="LGPL-3"
 SLOT="0"
 KEYWORDS="amd64 x86"
@@ -19,20 +20,20 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/listSerialPortsC-${PV}"
 
 src_compile() {
-	CC=$(tc-getCC)
-	${CC} -Wall -O2 ${CPPFLAGS} ${CFLAGS} -c -o main.o main.c
-	${CC} ${CFLAGS} ${LDFLAGS} main.o -lserialport -o listSerialC
+	$(tc-getCC) -O2 -Wall ${CPPFLAGS} ${CFLAGS} -c -o main.o main.c || die
+
+	$(tc-getCC) ${CFLAGS} ${LDFLAGS} main.o -lserialport -o listSerialC || die
 
-	${CC} \
-		-Wall -O2 ${CPPFLAGS} ${CFLAGS} -fPIC \
+	$(tc-getCC) \
+		-O2 -Wall ${CPPFLAGS} ${CFLAGS} -fPIC \
 		-I$(java-config-2 -o)/include \
 		-I$(java-config-2 -o)/include/linux \
-		-o jnilib.o -c jnilib.c
+		-o jnilib.o -c jnilib.c || die
 
-	${CC} \
+	$(tc-getCC) \
 		${CFLAGS} ${LDFLAGS} \
 		-shared -Wl,-soname,liblistSerialsj.so \
-		jnilib.o -lserialport -o liblistSerialsj.so.${PV}
+		jnilib.o -lserialport -o liblistSerialsj.so.${PV} || die
 }
 
 src_install() {
diff --git a/dev-embedded/avra/Manifest b/dev-embedded/avra/Manifest
index 91428839c1d5..0e282cfa2a01 100644
--- a/dev-embedded/avra/Manifest
+++ b/dev-embedded/avra/Manifest
@@ -1,3 +1,3 @@
 DIST avra-1.4.2.tar.gz 392445 BLAKE2B 6b556583838e0e5bef0207f7291da7c5e6dad01e695d9592b3de8f528bc7a5dafc3015f75934bcc8f9e0b6baca39ff0ae13c88ee290e657868bbb522d27da068 SHA512 f51a43b1b28102d6180ce27e74b50642de8f3d18fa35a82904fddaac993e87e1096667f2245bebfad92e4ba3283330f6ac4b6083e486be5af9edca7b7e90e56f
-EBUILD avra-1.4.2.ebuild 567 BLAKE2B 6c374a5ec439e71a58f8bbaf0ce135fd66717e04fe4e03a8a6804bf3abb66964e8f41c8d63442ed9e30caa82a71edbdd16ecec5d730a455b4226725add80a588 SHA512 1903e839232c6b83e401ab24207921b1aa5da561aa2f986ae534840c346738daf326b9dcd631c03f96f0cf69b2001961a7ad93ef7c68a7e64588806257b8cd74
+EBUILD avra-1.4.2.ebuild 574 BLAKE2B ff0a9407a6a19e3f4482d51e529b0660f235104a0f00da07c69811dbb8dd69217c8a383bcc46d177b1aa6839004ea5dfc4d12b962411d66beadc7d82d448103c SHA512 e9b91a7986a48803e5aef3e7690ab5c20d3f92bb6c23c6acbcf9d4bd491ff83c4611a28319c3d90bee83a14328dc0d9391160b5307d450ba6e01fffd51ce5c77
 MISC metadata.xml 323 BLAKE2B 5ff1de617c8e77cc6c78ae1e403434b74f9104a2b8311b78bd14911cd651b4b9fde8f3db94a7ca13bb51307ed1a702c17306cf798dad2c5bddcc13694f969260 SHA512 90dc9ae6fd87ae414d3e27a725c197523b659aaf047f0f1127ffe028627020c0e19da8d46ce89bb148254b87a7fd33d66f9a8d9eef6c206f90a543d68cf52812
diff --git a/dev-embedded/avra/avra-1.4.2.ebuild b/dev-embedded/avra/avra-1.4.2.ebuild
index f39b49bd9b5d..d56f3d53c714 100644
--- a/dev-embedded/avra/avra-1.4.2.ebuild
+++ b/dev-embedded/avra/avra-1.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,14 +11,14 @@ SRC_URI="https://github.com/hsoft/avra/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ~ppc ~x86"
 
 src_compile() {
 	emake \
-	CC=$(tc-getCC) \
-	PREFIX=/usr \
-	CFLAGS="${CFLAGS} \$(CDEFS)" \
-	LDFLAGS="${LDFLAGS}"
+		CC="$(tc-getCC)" \
+		PREFIX=/usr \
+		CFLAGS="${CFLAGS} \$(CDEFS)" \
+		LDFLAGS="${LDFLAGS}"
 }
 
 src_install() {
diff --git a/dev-embedded/esptool/Manifest b/dev-embedded/esptool/Manifest
index e4a8f8d9d67a..385587a0bff5 100644
--- a/dev-embedded/esptool/Manifest
+++ b/dev-embedded/esptool/Manifest
@@ -1,6 +1,6 @@
-DIST esptool-3.1.tar.gz 6897273 BLAKE2B dcbba13e8775afd3cf10cdeafeee5e9e3c0d2e9722a95076a868b669ea3a11a56b48a053e1b19787c6da330af6d01f9f256a92c0be527d4a7d9848f646f194c3 SHA512 5edaaa376932acc9e7ba717fe931ec1e14b80d1eee415fcef4c69b30b375cd61887ac52a20dd1001d215b8d739019d6b9f624d294d8d76ff112e630d52f7f15b
 DIST esptool-3.2.tar.gz 7155428 BLAKE2B f81a8b77f1994599c3302915915e225249a5e735accbe47c8936de47564e47a33ae711df47c57e599d980b450dc4d710f819087a97d086b9d0f15a98622c0da4 SHA512 5e67b3a17190e051d7706ee2dbbe855488765a7bfed15b15f5a04022c3fbf19112905ba6a672c37b1bac5501d45d477cfff07c004cd83b2d1a111430992cefc1
-EBUILD esptool-3.1.ebuild 1400 BLAKE2B f9b7ae21c251b8288c4035f2c1aedbf48e7cceed5d6a8f9c4422c059b4c0d08b5dfbc1d9d7604f9bbbdb45e6deceb9c609abbe1319ef2b340bd03c28e6822d6d SHA512 9f8431ee5441abb28511410adfd96a824328dd2a713671fd51f9ee69e42d69d6dcdc2bae2d6f72fbf1fd3ae24768ccef9319d390f3322be688bde9c5463de4e0
+DIST esptool-3.3.tar.gz 7259717 BLAKE2B b9952dff9a1884cae5325730056673d96bd442c82cd799196d99fe5287b72bc567d312102779f64c4a526c19bd36d0f742b4e81434de8b4dadf406a19bd3d423 SHA512 1f1a43832ae5487c570e49c97ca18831371f5a4ac0d4b260fa8b7356c7af40b8514722ded630a6c84e3d59f7fba78c9d70b291d1fa581fc25ea37204ded44363
 EBUILD esptool-3.2-r1.ebuild 1437 BLAKE2B 2d075390f0f2fdd704e51e40aaf9fbc0c5e96778236428eaaacb55aeed5c8867f1c97696b74232bee13372f4d132d35503ff8dc1a458485cbe24a783d8303a45 SHA512 f68ecbcc419c5dd3a08b19f77ce563b424e910179ec483e4a1f359cb88f29fbe7cfb20c566203ebfed1aa8291bc5f0c1b92f11dee348b5a8fec0d64a7b30621f
 EBUILD esptool-3.2.ebuild 1421 BLAKE2B c15f2a10e98031acaa71f54eb0346a3d060924f518607f5645bd3b32006d1ac4d15844023f9b78d16cd150b2bc7561c0951ca3a8a2002cdc887fde012843e5b5 SHA512 1f0e339a7e0f9a5b6c5978b46ec38974463ec3b6bc40b00c4be82ddda44b7c7d647f207c722283bdebcb435a7f7effb3bc1fbbc766f9bfe2e65316bbf69992b3
+EBUILD esptool-3.3.ebuild 1416 BLAKE2B bf5d8cb643047fef3467e9a6cfd1880197ff9d1b9560bfcb112a070b07e6d37e6c434244d2271717a0f14a214570b3640f785bcb4520d086c78511a1c6bc8216 SHA512 97f900dca1c6852dd15174344de5a0c1114c2a9e9231558446eefd35b36140392605737aae9b15871bbf69deeb641b842df988b72fd8cd3c7ab12f65282b261b
 MISC metadata.xml 504 BLAKE2B 578f33b9dc0f1748ecd37c355efd7f4acb041c192e44b89ad926c482c2a1d422080a0ed3c74311895b9f1ef996315965a79adc31b86437b3ea63bae321dd6294 SHA512 e8ed1644714bc0878d2d955f9d90bd6e0ca9fa183186ff160adaaaa46573fc696e49783c793f225a32b47b23da9f5df4d77d5fd59d7a52fc6386ec59f892cb83
diff --git a/dev-embedded/esptool/esptool-3.1.ebuild b/dev-embedded/esptool/esptool-3.3.ebuild
index cae94b7a45be..922aa7b84829 100644
--- a/dev-embedded/esptool/esptool-3.1.ebuild
+++ b/dev-embedded/esptool/esptool-3.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_SINGLE_IMPL=1
 
 inherit distutils-r1
@@ -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 )"
 
@@ -38,9 +38,9 @@ BDEPEND="
 "
 
 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}"
+	"${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/xa/Manifest b/dev-embedded/xa/Manifest
index 81eae3ae9191..41f21f20b697 100644
--- a/dev-embedded/xa/Manifest
+++ b/dev-embedded/xa/Manifest
@@ -1,5 +1,7 @@
 AUX xa-2.3.10-Makefile.patch 1840 BLAKE2B 1d8b4d7ed1ed97991dd611f77ff8daf6bb404e2892e271404d9b4b02e475b863e8ad3c45c79d07f5bbb9e69c19fd64f4b895a1868444729137ae97837e698b73 SHA512 b16462153b12604c6e3d8fba54e3d1fe19b5d907bed4141319d863d497582fe46fddfa15b0ab1c697ea4536e6fa3e5f86b68266a3b8da2c7d43f9577a10036e7
 AUX xa-2.3.10-fix-gcc10-fno-common.patch 203 BLAKE2B 9f503900b016956a02d2d9a1103884297e1545c624cb94c079abbc3e795ce803f35cf1c150ea233c2b78f9719ce2d15283a9ff5551c5adcbed55b6e98bf13747 SHA512 3862cad04136200447486fd6ac76298118d56a53c21f9db7aaf8f7ec248c10bd2f3ae610112a6dc5e99944da03ec52bc7cdb33879e6f1cb8fa6e9221f71472ea
 DIST xa-2.3.10.tar.gz 152433 BLAKE2B af9ab28e6596f6c96abd075779670955e7bfe79b3e9e18c5c75f35ffb166c705a0ebb60dcca1928c49a836eefcd7b15d12437579fbe645c0b5ce51e81da92d8d SHA512 08b9994e295495744d5252fa983b111f41d0447cdb32d0c065f8fbd942ffa0899476d6cfebe1162e4aa08b1d0a2d8df74c2a60987d2509b8bca45da670f4a67f
+DIST xa-2.3.13.tar.gz 155606 BLAKE2B 8196f8f88bee29dbab9ad026c0d4e3519159c4ed7579dc7db391c0bdd7b1bfe31e2884644258d863e299ac3b5fcc43718b3d95b9b7d7802541a9d58366728ffe SHA512 b8a4c1856e51bbe212b98be06895987d6fb926a229511a67ea90a934da1fcc84daf29bd289c3c4c2254d2bce345333bb92747947f3286376761613b2e181e99b
 EBUILD xa-2.3.10.ebuild 615 BLAKE2B 1a0286b2aeb631d56682c04d391b19c2dff7eefcbe590212f5dd0997030611e669fe20f90553a6f8cbc938b70a00626403c9386f6d00b998d1b1b31798765d7b SHA512 576da5cfb40cca0b8d4a4839bbf26bd9687a84677c9bcdf81722df7a1b7ea7a741942be9928c87b4615e2d2fe13df5662589c1aba5478abfc0f3c8df95731283
+EBUILD xa-2.3.13.ebuild 560 BLAKE2B 12a87ed79e877b44b07cb78d8cc4dbea96b3d4c1afd218753de62c64b8147936b427a2bcad241da8f374e526b101586b459b2128a762b22d5118fd048cbe81b4 SHA512 5e59a18409f82fe2b4ca295f8ed7a6c8eaea2a8ca6c4353600a13771062cddace693ac41eb2a572ae88cfe973f26ede29babc1ab40f9b6daf623d544101418b4
 MISC metadata.xml 548 BLAKE2B 3acb4c1e9192f25578d0e57f4527c1fd9af3738f48978cd5af39e9728336a23576f19e48568028c47b9db1394539280553590bcd29c206d11ab4acba50c5dbda SHA512 6b1274a1ee5456a5e2cdee2e1bfd34777b66d5178034b11f314549640c3085d069d96e71da9d476c03977540b6a08f8acb034b8df938b8caac1005eee4d2066d
diff --git a/dev-embedded/xa/xa-2.3.13.ebuild b/dev-embedded/xa/xa-2.3.13.ebuild
new file mode 100644
index 000000000000..5e9388a99088
--- /dev/null
+++ b/dev-embedded/xa/xa-2.3.13.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="High-speed, two-pass portable 6502 cross-assembler"
+HOMEPAGE="https://www.floodgap.com/retrotech/xa/"
+SRC_URI="https://www.floodgap.com/retrotech/xa/dists/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.3.10-Makefile.patch
+)
+
+src_configure() {
+	tc-export CC
+}
+
+src_test() {
+	emake -j1 test
+}
+
+src_install() {
+	emake DESTDIR="${ED}"/usr install
+	einstalldocs
+}