gentoo resync : 25.10.2021

4 files changed, 92 insertions, 0 deletions

diff --git a/dev-lang/micropython/Manifest b/dev-lang/micropython/Manifest
index 841da25ad582..11dac64a4769 100644
--- a/dev-lang/micropython/Manifest
+++ b/dev-lang/micropython/Manifest
@@ -1,5 +1,9 @@
 AUX micropython-1.11-exclude-float-parse-tests.patch 571 BLAKE2B e231ab697dcefdcc05a0e44063def130b6f79536a8d416ddd3a400e4effe0f499343ca0cb45388fbfe3426e0e8ea79fad3acd7a10e07199d32d78af04d1defe6 SHA512 2721316002052534537def580b1f7b0c42fc2fdbd36fd82c2f9c5cd6f504ad17a6e0a9e9aca4f7f0270b6f4f60cfdf70b8fb69c62ac291d1eb24d1ebfedbe539
 AUX micropython-1.11-prevent-stripping.patch 827 BLAKE2B e4da5582029c800dd166104a36834e23c20826af3f9988a85f1b29c1ac8c82fe762ddfde9a83a0a8b45ab07ab7cfed89ebab9a7a35c7276d292b51f003665c9e SHA512 366abdba975f9f7a54c1e0882414744b0b216fb6d9a4ce4c2022c7bedd3c31349a3652b751c4b3157584de9e0490e5435c17c20f9d453b1aa4eecd62f716ab07
+AUX micropython-1.17-exclude-float-parse-tests.patch 525 BLAKE2B f9a3b7c8f625edcac31be6df9dd7936e9f9099995875e55882206241a24c252148b64ec726643d1700ad59d615cabdaa69377d2d303e4572dc2f600255c76930 SHA512 e5c67b461fd132b71ca87325cb4a4fe5608b18d6b1e058746d87d39832c92bcc9673366755292d6cb51fd2770a2ddea0688bcdd7f2052a2c2ee2f180e9b63c69
+AUX micropython-1.17-prevent-stripping.patch 461 BLAKE2B 9daee505d5c446a3a6756336cfc5fb016053f36f5f567cf35aa6ab9a1b794a28fd92b81a27ffc2ce077a75c422c9b2a957c417b561edcf85ffa5653e1eddec41 SHA512 0cd5a8c499552b0728242af531406e0d26d91f560d7d4b38ea6fd0bc0b43639e77af9e56b6b89cba5d5661131357fa1a714c3fe734e3ab59f60fc63258d00c4c
 DIST micropython-1.11.tar.gz 23010708 BLAKE2B 8deb29f2a27b8299f62c8c3d332654889e610ddc6854dc38c6cf7504c89f2f9cbbacccdc2d8e471d96b8bb28bbb920fe7ec1b8fd49b14209924262f54687c3c1 SHA512 255860e56bf51c4f35a00cf66fff3ee37fbef1e0d674af6ed580367d8b3d2d60fb88609a675e8f322fd466a23006e38078b67edd6f306e639d6be12abb2972d2
+DIST micropython-1.17.tar.xz 56606868 BLAKE2B a6338d173de646764c1573ebabdb9818746a479fd2dd618f9be9955881e3829c4d89da4602934e71655734ec1c6f2150a6ac2c54a5fed9bee998905a00d5c6ea SHA512 8074214040e35ae1ca99721ec442f4cef70fa03380b7662016c55cb3acff9178fc54140c0d818c9581389b4daaade142ecf75b65a2919c666a50255423a39a54
 EBUILD micropython-1.11-r1.ebuild 1380 BLAKE2B ea3bfb173760d1f01a39a369449d0171974f28383f46419d497f587628a157998e3f5cc16e43c298b46109d7842f01804a38964b8bb8b57680d84051eefea079 SHA512 2f71d0a083e6910b7ce9c9adb7b366b067ac2adeeb7ee47d334b8d197ac672492ca457f0cfd6aaf63cde958721f0be65ae68465c944e09e98f129873f48285f6
+EBUILD micropython-1.17.ebuild 1380 BLAKE2B 6f607e4102bd86502271282d68cc1f4632914cbd69a44b24eb862908cf0f932a15b8fe939ca09768ea256f4cb612c4d96b8351c94003a913054fb9da94fe6e32 SHA512 b9f7706a297e9513643a48f3fe73d6edc500bf7067b59b24b151c2d5e60c97951827f8cce5b4aac5cf094fff7356aee476dee33b0b462554b9ac995d87e0954b
 MISC metadata.xml 1247 BLAKE2B f08da5a443696e12372f245081e7938c59069e9f57195b3c1c17758c2809dc4a4cfab8133dda55c74d1e014848a78ea01fdf4c8c5a863da15856d183537d7686 SHA512 74c8946a2c321e9c03b11985fa5b23f5055be6a4b268b933cb5337751bdf31516fde8c83cdf4d8c39b161072a05cc3e781f64a5ad5a7323c735b85d7af5051ad
diff --git a/dev-lang/micropython/files/micropython-1.17-exclude-float-parse-tests.patch b/dev-lang/micropython/files/micropython-1.17-exclude-float-parse-tests.patch
new file mode 100644
index 000000000000..8f44d31fd96f
--- /dev/null
+++ b/dev-lang/micropython/files/micropython-1.17-exclude-float-parse-tests.patch
@@ -0,0 +1,11 @@
+--- a/tests/run-tests.py	2021-10-25 12:25:48.422212212 -0000
++++ b/tests/run-tests.py	2021-10-25 12:26:01.382135667 -0000
+@@ -521,6 +521,8 @@
+             "micropython/opt_level_lineno.py"
+         )  # native doesn't have proper traceback info
+         skip_tests.add("micropython/schedule.py")  # native code doesn't check pending events
++    skip_tests.add("float/float_parse_doubleprec.py")
++    skip_tests.add("float/float_parse.py")
+ 
+     def run_one_test(test_file):
+         test_file = test_file.replace("\\", "/")
diff --git a/dev-lang/micropython/files/micropython-1.17-prevent-stripping.patch b/dev-lang/micropython/files/micropython-1.17-prevent-stripping.patch
new file mode 100644
index 000000000000..1c5380ed883b
--- /dev/null
+++ b/dev-lang/micropython/files/micropython-1.17-prevent-stripping.patch
@@ -0,0 +1,12 @@
+--- a/py/mkrules.mk	2021-10-25 12:30:13.723695503 -0000
++++ b/py/mkrules.mk	2021-10-25 12:30:18.460327366 -0000
+@@ -198,9 +198,6 @@
+ # Do not pass COPT here - it's *C* compiler optimizations. For example,
+ # we may want to compile using Thumb, but link with non-Thumb libc.
+ 	$(Q)$(CC) -o $@ $^ $(LIB) $(LDFLAGS)
+-ifndef DEBUG
+-	$(Q)$(STRIP) $(STRIPFLAGS_EXTRA) $@
+-endif
+ 	$(Q)$(SIZE) $$(find $(BUILD) -path "$(BUILD)/build/frozen*.o") $@
+ 
+ clean: clean-prog
diff --git a/dev-lang/micropython/micropython-1.17.ebuild b/dev-lang/micropython/micropython-1.17.ebuild
new file mode 100644
index 000000000000..ce87e6721415
--- /dev/null
+++ b/dev-lang/micropython/micropython-1.17.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Python implementation for microcontrollers"
+HOMEPAGE="https://github.com/micropython/micropython"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="MIT"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	dev-libs/libffi:=
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${P}-prevent-stripping.patch"
+	"${FILESDIR}/${P}-exclude-float-parse-tests.patch"
+)
+
+src_prepare() {
+	default
+
+	cd ports/unix || die
+
+	# 1) don't die on compiler warning
+	# 2) remove /usr/local prefix references in favour of /usr
+	# 3) enforce our CFLAGS
+	# 4) enforce our LDFLAGS
+	sed -e 's#-Werror##g;' \
+		-e 's#\/usr\/local#\/usr#g;' \
+		-e "s#^CFLAGS = \(.*\)#CFLAGS = \1 ${CFLAGS}#g" \
+		-e "s#^LDFLAGS = \(.*\)#LDFLAGS = \1 ${LDFLAGS}#g" \
+		-i Makefile || die "can't patch Makefile"
+}
+
+src_compile() {
+	cd ports/unix || die
+
+	emake CC="$(tc-getCC)" axtls
+	emake CC="$(tc-getCC)"
+}
+
+src_test() {
+	cd ports/unix || die
+	emake CC="$(tc-getCC)" test
+}
+
+src_install() {
+	pushd ports/unix > /dev/null || die
+	emake CC="$(tc-getCC)" DESTDIR="${D}" install
+	popd > /dev/null || die
+
+	# remove .git files
+	find tools -type f -name '.git*' -exec rm {} \; || die
+
+	dodoc -r tools
+	einstalldocs
+}