gentoo resync : 15.12.2019

5 files changed, 88 insertions, 4 deletions

diff --git a/dev-lang/micropython/Manifest b/dev-lang/micropython/Manifest
index 24b92f1aab2a..0af70791a1b2 100644
--- a/dev-lang/micropython/Manifest
+++ b/dev-lang/micropython/Manifest
@@ -1,7 +1,10 @@
+AUX micropython-1.11-prevent-stripping.patch 827 BLAKE2B e4da5582029c800dd166104a36834e23c20826af3f9988a85f1b29c1ac8c82fe762ddfde9a83a0a8b45ab07ab7cfed89ebab9a7a35c7276d292b51f003665c9e SHA512 366abdba975f9f7a54c1e0882414744b0b216fb6d9a4ce4c2022c7bedd3c31349a3652b751c4b3157584de9e0490e5435c17c20f9d453b1aa4eecd62f716ab07
 AUX micropython-1.9.3-prevent-stripping.patch 787 BLAKE2B c050420f5dae60edb93c63b504fdbe047a8c9ed56c543ffde817c86a6fd9a53efeb8561c69823186121a5727fbf29b8474eac223398fa7ee43c825e50745c6fd SHA512 5e7fa7481f4bfab15a041bbccf452d5d6fe5a5c1cd8cfae2e5ec3475d84decacc0b9c0631766582173fc4cda82d78e2370e402f95d5989e13bf3adbdaf39add4
 AUX micropython-1.9.4-prevent-stripping.patch 787 BLAKE2B 6e92c4fdfd44b89d1fad69c056dbab1493d9dc45c4223cfd2f011254db72400c6ac9a62afe84f54c301a86abd92deb56866dc25e2f1bf8af74edf308b15eb29f SHA512 8f994394f42d7fed5fa35b62c01c37ebea3b487c029d659134a263ef8d65e1ec17bec755fdf57cde2f234969bc4f7f4ab30858562d7f8cdb2bc6cb819ba2ae0d
+DIST micropython-1.11.tar.gz 23010708 BLAKE2B 8deb29f2a27b8299f62c8c3d332654889e610ddc6854dc38c6cf7504c89f2f9cbbacccdc2d8e471d96b8bb28bbb920fe7ec1b8fd49b14209924262f54687c3c1 SHA512 255860e56bf51c4f35a00cf66fff3ee37fbef1e0d674af6ed580367d8b3d2d60fb88609a675e8f322fd466a23006e38078b67edd6f306e639d6be12abb2972d2
 DIST micropython-1.9.3.tar.gz 17311734 BLAKE2B 31ebdedc402af53b205a854aa61b59c694cc893c7f80e4b84196c5d44527545f442628938b7dd923ed9086a79e00ff899682548115224613e888eb8a37dd5ae3 SHA512 1b4358913ed78df66314c9a62636c7b8d086c731459e3bee1fab8695286dc03b6ec7594b2f9b8105e2a6d62190d95c6ad5351fb64c666c1ea54b9535193ee8a8
 DIST micropython-1.9.4.tar.gz 18957648 BLAKE2B bc4dc4ef6623adbda64c9e03137860a7b9ce7d2d181434cb993438752ec39a4ea7cf7cf7a14736c57bdc2ea9c3f856b0dbe2d92fc0e1cbef99112427583ad665 SHA512 9995c983c93fb1280e60d7c52a10930a6a3de8d589a0f4264a9a4a4fede7c37e27ed4871c4c9092aec3fb33028064beb8c5eb19b7956e8f0c5d3b2a82ffa9932
-EBUILD micropython-1.9.3.ebuild 1158 BLAKE2B 1d452bdf85783135f6bb2c4e0d2f6cd297d863d00eef8003dcc9f5710e0b03194828df751a205b1c6069506c509685189a66083b27324c3f1ca9c64a06297596 SHA512 1eef495d618817b0023c13b4bd7606ddec09f4ad32e6beffe3bc418549781b53d92340af90a39e3995f8decc9454b9221b2b048ec713e01fec7c1fc058ca8744
-EBUILD micropython-1.9.4.ebuild 1161 BLAKE2B 9bc660c6e4e93cf30ec20a9ca1758a13024ec2c16cfcf442f406912e59a3bf3009dfda29dbc0947d0dc966538fd802d551728019abd9212fa851153224a56713 SHA512 d22375deb3c95e317b8a8cde81f0366b1d83a90ffddd3f52b253b78313e96cc93b5e8e07c4efb4f997ac3f204cfbbca159d698136c4cbfe0151433246335e9d6
+EBUILD micropython-1.11.ebuild 1099 BLAKE2B 1899b0063ccb85b383deeacb0a6cf2cf5ef785eaf5e9c3bd7ac2981805d475ddf31c58274887858c4aa3731fb68f8b6e7a70fb29b158aafe3ae9b0a235e9a2ef SHA512 02ff5c432ffeb1b4e11b30df00abe107513a7e52f6d9b5a1b242ce55037b8b989e2d151012bb105336b6fd8e563de308fa52dd02b38caf3599eb433790ceda36
+EBUILD micropython-1.9.3.ebuild 1182 BLAKE2B f95a492598c7bc565690299f5ac2cfa8766c0c1d7a942cde30b3c31ee4b4e527591bc79a974eaf3fe75ceed6e6fe7aea8fc84977c7a120cbcfd13e7d0c599012 SHA512 f0c3d330403f3c502af2ec9ba19017cce0a2863064266a864d7ff6e6d8aae7fbeb6523e1e21319a5ef01034d70cd753a49f7a337f1017b9b691f25eba8334028
+EBUILD micropython-1.9.4.ebuild 1185 BLAKE2B 5aaa3b12f1bdd38675788a2461687e5a325b75321b84d3a0cfea03b0e5d5e7326f029e5550deddfa0d59b87c56d5147af5918786859361fd2598fb50ffb08043 SHA512 958558a96134ccd057fdbe6c01f51a4f1e266f34caede0621f5091e40d960535913df45816ee3ac23780668987a92e9c4ee2f3aae34fbd975d3d82d6af14e3fa
 MISC metadata.xml 1347 BLAKE2B c121e2eafde4ab3c49a352ab96ffbcc042ecddb5a765f3192589a41f5b3bc5f92e6a6f1a58df21ef2812424aac94e6cd579cfe1d29b4dd16983048768f1694ed SHA512 e8dd8f7cc3d0c570da6b9982596e39891e78e302581dbc0601d622831f976f16b9e9f78d7e0b55ae58ed3c81c3e7113a4217ca1671cdd8929f0b34b4647efc3a
diff --git a/dev-lang/micropython/files/micropython-1.11-prevent-stripping.patch b/dev-lang/micropython/files/micropython-1.11-prevent-stripping.patch
new file mode 100644
index 000000000000..7b78b6fb9f60
--- /dev/null
+++ b/dev-lang/micropython/files/micropython-1.11-prevent-stripping.patch
@@ -0,0 +1,26 @@
+diff --git a/py/mkenv.mk b/py/mkenv.mk
+index 46eedf9..2f3f3ca 100644
+--- a/py/mkenv.mk
++++ b/py/mkenv.mk
+@@ -52,7 +52,6 @@ CXX = $(CROSS_COMPILE)g++
+ LD = $(CROSS_COMPILE)ld
+ OBJCOPY = $(CROSS_COMPILE)objcopy
+ SIZE = $(CROSS_COMPILE)size
+-STRIP = $(CROSS_COMPILE)strip
+ AR = $(CROSS_COMPILE)ar
+ ifeq ($(MICROPY_FORCE_32BIT),1)
+ CC += -m32
+diff --git a/py/mkrules.mk b/py/mkrules.mk
+index 4e4fdef..149b337 100644
+--- a/py/mkrules.mk
++++ b/py/mkrules.mk
+@@ -133,9 +133,6 @@ $(PROG): $(OBJ)
+ # 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) $(PROG)
+-endif
+ 	$(Q)$(SIZE) $$(find $(BUILD) -path "$(BUILD)/build/frozen*.o") $(PROG)
+ 
+ clean: clean-prog
diff --git a/dev-lang/micropython/micropython-1.11.ebuild b/dev-lang/micropython/micropython-1.11.ebuild
new file mode 100644
index 000000000000..0c8219f76706
--- /dev/null
+++ b/dev-lang/micropython/micropython-1.11.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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.gz"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="MIT"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	virtual/libffi
+	virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}/${P}-prevent-stripping.patch" )
+
+src_compile() {
+	cd ports/unix || die
+
+	# 1) don't die on compiler warnings
+	# 2) remove /usr/local prefix references in favour of /usr
+	sed -i \
+		-e 's#-Werror##g;' \
+		-e 's#\/usr\/local#\/usr#g;' \
+		Makefile || die
+
+	emake CC="$(tc-getCC)" axtls
+	emake CC="$(tc-getCC)"
+}
+
+src_test() {
+	cd ports/unix || die
+	emake test
+}
+
+src_install() {
+	pushd ports/unix > /dev/null || die
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" DESTDIR="${D}" install
+	popd > /dev/null || die
+
+	# remove .git files
+	find tools -type f -name '.git*' -exec rm {} \; || die
+
+	dodoc -r tools
+	einstalldocs
+}
diff --git a/dev-lang/micropython/micropython-1.9.3.ebuild b/dev-lang/micropython/micropython-1.9.3.ebuild
index 672087758df5..e519fa6a4452 100644
--- a/dev-lang/micropython/micropython-1.9.3.ebuild
+++ b/dev-lang/micropython/micropython-1.9.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,6 +13,7 @@ KEYWORDS="~amd64 ~x86"
 LICENSE="MIT"
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	virtual/libffi
diff --git a/dev-lang/micropython/micropython-1.9.4.ebuild b/dev-lang/micropython/micropython-1.9.4.ebuild
index 95899e4fd9b4..ac529849faa7 100644
--- a/dev-lang/micropython/micropython-1.9.4.ebuild
+++ b/dev-lang/micropython/micropython-1.9.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,6 +13,7 @@ KEYWORDS="~amd64 ~x86"
 LICENSE="MIT"
 SLOT="0"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	virtual/libffi