[gentoo-commits] repo/gentoo:master commit in: dev-lang/micropython/files/, dev-lang/micropython/

2024-01-20 Thread Sam James
commit: f28f669cfbdc20cb94f4d32e8441e996ddda8384
Author: Kristaps Kaupe  blogiem  lv>
AuthorDate: Sun Jan 14 16:34:25 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jan 20 13:30:56 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f28f669c

dev-lang/micropython: Fix building with GCC13

Closes: https://bugs.gentoo.org/916499
Closes: https://bugs.gentoo.org/895156
Signed-off-by: Kristaps Kaupe  blogiem.lv>
Closes: https://github.com/gentoo/gentoo/pull/34801
Signed-off-by: Sam James  gentoo.org>

 .../files/micropython-1.17-gcc13-build-fix.patch   | 59 ++
 dev-lang/micropython/micropython-1.17.ebuild   |  1 +
 2 files changed, 60 insertions(+)

diff --git a/dev-lang/micropython/files/micropython-1.17-gcc13-build-fix.patch 
b/dev-lang/micropython/files/micropython-1.17-gcc13-build-fix.patch
new file mode 100644
index ..d791227a9a3c
--- /dev/null
+++ b/dev-lang/micropython/files/micropython-1.17-gcc13-build-fix.patch
@@ -0,0 +1,59 @@
+From f1c6cb7725960487195daa5c5c196fd8d3563811 Mon Sep 17 00:00:00 2001
+From: Damien George 
+Date: Wed, 3 May 2023 15:23:24 +1000
+Subject: [PATCH] py/stackctrl: Add gcc pragmas to ignore dangling-pointer
+ warning.
+
+This warning became apparent in gcc 13.
+
+Signed-off-by: Damien George 
+---
+ py/stackctrl.c | 7 +++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/py/stackctrl.c b/py/stackctrl.c
+index c2f3adb5eedc..c2566ebad92b 100644
+--- a/py/stackctrl.c
 b/py/stackctrl.c
+@@ -28,8 +28,15 @@
+ #include "py/stackctrl.h"
+ 
+ void mp_stack_ctrl_init(void) {
++#if __GNUC__ >= 13
++#pragma GCC diagnostic push
++#pragma GCC diagnostic ignored "-Wdangling-pointer"
++#endif
+ volatile int stack_dummy;
+ MP_STATE_THREAD(stack_top) = (char *)_dummy;
++#if __GNUC__ >= 13
++#pragma GCC diagnostic pop
++#endif
+ }
+ 
+ void mp_stack_set_top(void *top) {
+
+From 32572439984e5640c6af46fbe7c27400c30112ce Mon Sep 17 00:00:00 2001
+From: Damien George 
+Date: Tue, 7 Mar 2023 14:46:22 +1100
+Subject: [PATCH] mpy-cross/main: Fix return type of mp_import_stat.
+
+Fixes issue #10951.
+
+Signed-off-by: Damien George 
+---
+ mpy-cross/main.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mpy-cross/main.c b/mpy-cross/main.c
+index 13bb17b13dba..8a4dd5bcbed5 100644
+--- a/mpy-cross/main.c
 b/mpy-cross/main.c
+@@ -344,7 +344,7 @@ int main(int argc, char **argv) {
+ return main_(argc, argv);
+ }
+ 
+-uint mp_import_stat(const char *path) {
++mp_import_stat_t mp_import_stat(const char *path) {
+ (void)path;
+ return MP_IMPORT_STAT_NO_EXIST;
+ }

diff --git a/dev-lang/micropython/micropython-1.17.ebuild 
b/dev-lang/micropython/micropython-1.17.ebuild
index 352bc9cfea11..16620cf90890 100644
--- a/dev-lang/micropython/micropython-1.17.ebuild
+++ b/dev-lang/micropython/micropython-1.17.ebuild
@@ -22,6 +22,7 @@ DEPEND="
 PATCHES=(
"${FILESDIR}/${P}-prevent-stripping.patch"
"${FILESDIR}/${P}-exclude-float-parse-tests.patch"
+   "${FILESDIR}/${P}-gcc13-build-fix.patch"
 )
 
 src_prepare() {



[gentoo-commits] repo/gentoo:master commit in: dev-lang/micropython/files/

2024-01-20 Thread Sam James
commit: dcd8a957b5ace0f8f933d6b46ec8f590256e7a0d
Author: Sam James  gentoo  org>
AuthorDate: Sat Jan 20 13:31:24 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jan 20 13:31:24 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcd8a957

dev-lang/micropython: add upstream links to commits

Signed-off-by: Sam James  gentoo.org>

 dev-lang/micropython/files/micropython-1.17-gcc13-build-fix.patch | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dev-lang/micropython/files/micropython-1.17-gcc13-build-fix.patch 
b/dev-lang/micropython/files/micropython-1.17-gcc13-build-fix.patch
index d791227a9a3c..306db8d9caa8 100644
--- a/dev-lang/micropython/files/micropython-1.17-gcc13-build-fix.patch
+++ b/dev-lang/micropython/files/micropython-1.17-gcc13-build-fix.patch
@@ -1,3 +1,6 @@
+https://github.com/micropython/micropython/pull/11402
+https://github.com/micropython/micropython/commit/32572439984e5640c6af46fbe7c27400c30112ce
+
 From f1c6cb7725960487195daa5c5c196fd8d3563811 Mon Sep 17 00:00:00 2001
 From: Damien George 
 Date: Wed, 3 May 2023 15:23:24 +1000



[gentoo-commits] repo/gentoo:master commit in: dev-lang/micropython/

2022-11-18 Thread Arthur Zamarin
commit: 8d1b3fcdfcd932b0d57048f6963ac46553a4a349
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Nov 18 15:06:38 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Nov 18 15:06:38 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d1b3fcd

dev-lang/micropython: Keyword 1.17 arm64, #873238

Signed-off-by: Arthur Zamarin  gentoo.org>

 dev-lang/micropython/micropython-1.17.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-lang/micropython/micropython-1.17.ebuild 
b/dev-lang/micropython/micropython-1.17.ebuild
index ce87e6721415..352bc9cfea11 100644
--- a/dev-lang/micropython/micropython-1.17.ebuild
+++ b/dev-lang/micropython/micropython-1.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ 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"
+KEYWORDS="~amd64 ~arm64 ~x86"
 LICENSE="MIT"
 SLOT="0"
 IUSE="test"



[gentoo-commits] repo/gentoo:master commit in: dev-lang/micropython/files/, dev-lang/micropython/

2022-08-29 Thread Andreas Sturmlechner
commit: 317434e07e6f785b6857d504cbd6225c688f1c21
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Aug 28 14:44:54 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Aug 29 18:39:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=317434e0

dev-lang/micropython: drop 1.11-r1, EAPI-6--

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-lang/micropython/Manifest  |  1 -
 ...icropython-1.11-exclude-float-parse-tests.patch | 12 
 .../files/micropython-1.11-prevent-stripping.patch | 26 -
 dev-lang/micropython/micropython-1.11-r1.ebuild| 65 --
 4 files changed, 104 deletions(-)

diff --git a/dev-lang/micropython/Manifest b/dev-lang/micropython/Manifest
index e6e1460bf548..74304d0b18d1 100644
--- a/dev-lang/micropython/Manifest
+++ b/dev-lang/micropython/Manifest
@@ -1,2 +1 @@
-DIST micropython-1.11.tar.gz 23010708 BLAKE2B 
8deb29f2a27b8299f62c8c3d332654889e610ddc6854dc38c6cf7504c89f2f9cbbacccdc2d8e471d96b8bb28bbb920fe7ec1b8fd49b14209924262f54687c3c1
 SHA512 
255860e56bf51c4f35a00cf66fff3ee37fbef1e0d674af6ed580367d8b3d2d60fb88609a675e8f322fd466a23006e38078b67edd6f306e639d6be12abb2972d2
 DIST micropython-1.17.tar.xz 56606868 BLAKE2B 
a6338d173de646764c1573ebabdb9818746a479fd2dd618f9be9955881e3829c4d89da4602934e71655734ec1c6f2150a6ac2c54a5fed9bee998905a00d5c6ea
 SHA512 
8074214040e35ae1ca99721ec442f4cef70fa03380b7662016c55cb3acff9178fc54140c0d818c9581389b4daaade142ecf75b65a2919c666a50255423a39a54

diff --git 
a/dev-lang/micropython/files/micropython-1.11-exclude-float-parse-tests.patch 
b/dev-lang/micropython/files/micropython-1.11-exclude-float-parse-tests.patch
deleted file mode 100644
index 6d81661790e9..
--- 
a/dev-lang/micropython/files/micropython-1.11-exclude-float-parse-tests.patch
+++ /dev/null
@@ -1,12 +0,0 @@
 a/tests/run-tests  2020-06-09 13:09:24.239121947 -
-+++ b/tests/run-tests  2020-06-09 13:09:57.315476363 -
-@@ -377,6 +377,9 @@
- skip_tests.add('micropython/heapalloc_traceback.py') # because 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.py')
-+skip_tests.add('float/float_parse_doubleprec.py')
-+# these two tests fail for some reason.
- for test_file in tests:
- test_file = test_file.replace('\\', '/')
- 

diff --git 
a/dev-lang/micropython/files/micropython-1.11-prevent-stripping.patch 
b/dev-lang/micropython/files/micropython-1.11-prevent-stripping.patch
deleted file mode 100644
index 7b78b6fb9f60..
--- a/dev-lang/micropython/files/micropython-1.11-prevent-stripping.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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-r1.ebuild 
b/dev-lang/micropython/micropython-1.11-r1.ebuild
deleted file mode 100644
index 57a5d6bee6a3..
--- a/dev-lang/micropython/micropython-1.11-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2021 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="
-   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" \
-   

[gentoo-commits] repo/gentoo:master commit in: dev-lang/micropython/files/, dev-lang/micropython/

2021-10-25 Thread Patrice Clement
commit: c144107d5e946d6f7fcf2af60f0b6386f4f88e43
Author: Patrice Clement  gentoo  org>
AuthorDate: Mon Oct 25 12:39:50 2021 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Mon Oct 25 12:44:11 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c144107d

dev-lang/micropython: version bump.

EAPI 7 version bump the ebuild whilst at it.

Closes: https://bugs.gentoo.org/820086
Signed-off-by: Patrice Clement  gentoo.org>

 dev-lang/micropython/Manifest  |  1 +
 ...icropython-1.17-exclude-float-parse-tests.patch | 11 
 .../files/micropython-1.17-prevent-stripping.patch | 12 
 dev-lang/micropython/micropython-1.17.ebuild   | 65 ++
 4 files changed, 89 insertions(+)

diff --git a/dev-lang/micropython/Manifest b/dev-lang/micropython/Manifest
index 1ac72acd202..e6e1460bf54 100644
--- a/dev-lang/micropython/Manifest
+++ b/dev-lang/micropython/Manifest
@@ -1 +1,2 @@
 DIST micropython-1.11.tar.gz 23010708 BLAKE2B 
8deb29f2a27b8299f62c8c3d332654889e610ddc6854dc38c6cf7504c89f2f9cbbacccdc2d8e471d96b8bb28bbb920fe7ec1b8fd49b14209924262f54687c3c1
 SHA512 
255860e56bf51c4f35a00cf66fff3ee37fbef1e0d674af6ed580367d8b3d2d60fb88609a675e8f322fd466a23006e38078b67edd6f306e639d6be12abb2972d2
+DIST micropython-1.17.tar.xz 56606868 BLAKE2B 
a6338d173de646764c1573ebabdb9818746a479fd2dd618f9be9955881e3829c4d89da4602934e71655734ec1c6f2150a6ac2c54a5fed9bee998905a00d5c6ea
 SHA512 
8074214040e35ae1ca99721ec442f4cef70fa03380b7662016c55cb3acff9178fc54140c0d818c9581389b4daaade142ecf75b65a2919c666a50255423a39a54

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 000..8f44d31fd96
--- /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 -
 b/tests/run-tests.py   2021-10-25 12:26:01.382135667 -
+@@ -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 000..1c5380ed883
--- /dev/null
+++ b/dev-lang/micropython/files/micropython-1.17-prevent-stripping.patch
@@ -0,0 +1,12 @@
+--- a/py/mkrules.mk2021-10-25 12:30:13.723695503 -
 b/py/mkrules.mk2021-10-25 12:30:18.460327366 -
+@@ -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 000..ce87e672141
--- /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 

[gentoo-commits] repo/gentoo:master commit in: dev-lang/micropython/

2021-07-10 Thread Sam James
commit: e5437e0990d15e9da9af7744fdc7f8788ad5eb4f
Author: Sam James  gentoo  org>
AuthorDate: Sat Jul 10 18:15:28 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jul 10 18:47:19 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5437e09

dev-lang/micropython: add dev-libs/libffi subslot dep

Signed-off-by: Sam James  gentoo.org>

 .../{micropython-1.11.ebuild => micropython-1.11-r1.ebuild}   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-lang/micropython/micropython-1.11.ebuild 
b/dev-lang/micropython/micropython-1.11-r1.ebuild
similarity index 95%
rename from dev-lang/micropython/micropython-1.11.ebuild
rename to dev-lang/micropython/micropython-1.11-r1.ebuild
index 218dea6ed46..57a5d6bee6a 100644
--- a/dev-lang/micropython/micropython-1.11.ebuild
+++ b/dev-lang/micropython/micropython-1.11-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ IUSE="test"
 RESTRICT="!test? ( test )"
 
 DEPEND="
-   dev-libs/libffi
+   dev-libs/libffi:=
virtual/pkgconfig"
 
 PATCHES=(



[gentoo-commits] repo/gentoo:master commit in: dev-lang/micropython/

2021-06-16 Thread Michał Górny
commit: 0f4b1ff1c6cb40633d18500be8d2e5ea2c941411
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Jun 16 11:07:10 2021 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Jun 16 11:14:19 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f4b1ff1

dev-lang/micropython: Remove python@

Signed-off-by: Michał Górny  gentoo.org>

 dev-lang/micropython/metadata.xml | 4 
 1 file changed, 4 deletions(-)

diff --git a/dev-lang/micropython/metadata.xml 
b/dev-lang/micropython/metadata.xml
index e644fcc0141..125d5554f37 100644
--- a/dev-lang/micropython/metadata.xml
+++ b/dev-lang/micropython/metadata.xml
@@ -5,10 +5,6 @@
monsie...@gentoo.org
Patrice Clement

-   
-   pyt...@gentoo.org
-   Python
-   

micropython/micropython




[gentoo-commits] repo/gentoo:master commit in: dev-lang/micropython/

2020-11-16 Thread Sergei Trofimovich
commit: c302c2fa44218229167ceec84bff1afd04024530
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Mon Nov 16 22:47:49 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Nov 16 22:53:03 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c302c2fa

dev-lang/micropython: use dev-libs/libffi instead of virtual/libffi

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Sergei Trofimovich  gentoo.org>

 dev-lang/micropython/micropython-1.11.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-lang/micropython/micropython-1.11.ebuild 
b/dev-lang/micropython/micropython-1.11.ebuild
index bdf54e45b9e..218dea6ed46 100644
--- a/dev-lang/micropython/micropython-1.11.ebuild
+++ b/dev-lang/micropython/micropython-1.11.ebuild
@@ -16,7 +16,7 @@ IUSE="test"
 RESTRICT="!test? ( test )"
 
 DEPEND="
-   virtual/libffi
+   dev-libs/libffi
virtual/pkgconfig"
 
 PATCHES=(



[gentoo-commits] repo/gentoo:master commit in: dev-lang/micropython/, dev-lang/micropython/files/

2020-06-09 Thread Patrice Clement
commit: 2e59bd3af6564e8e862ba14a9c2b4088979cb04f
Author: Patrice Clement  gentoo  org>
AuthorDate: Tue Jun  9 13:13:32 2020 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Tue Jun  9 13:13:57 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e59bd3a

dev-lang/micropython: restore tests.

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Patrice Clement  gentoo.org>

 .../files/micropython-1.11-exclude-float-parse-tests.patch   | 12 
 dev-lang/micropython/micropython-1.11.ebuild |  9 -
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git 
a/dev-lang/micropython/files/micropython-1.11-exclude-float-parse-tests.patch 
b/dev-lang/micropython/files/micropython-1.11-exclude-float-parse-tests.patch
new file mode 100644
index 000..6d81661790e
--- /dev/null
+++ 
b/dev-lang/micropython/files/micropython-1.11-exclude-float-parse-tests.patch
@@ -0,0 +1,12 @@
+--- a/tests/run-tests  2020-06-09 13:09:24.239121947 -
 b/tests/run-tests  2020-06-09 13:09:57.315476363 -
+@@ -377,6 +377,9 @@
+ skip_tests.add('micropython/heapalloc_traceback.py') # because 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.py')
++skip_tests.add('float/float_parse_doubleprec.py')
++# these two tests fail for some reason.
+ for test_file in tests:
+ test_file = test_file.replace('\\', '/')
+ 

diff --git a/dev-lang/micropython/micropython-1.11.ebuild 
b/dev-lang/micropython/micropython-1.11.ebuild
index 94d80d97d92..bdf54e45b9e 100644
--- a/dev-lang/micropython/micropython-1.11.ebuild
+++ b/dev-lang/micropython/micropython-1.11.ebuild
@@ -19,11 +19,10 @@ DEPEND="
virtual/libffi
virtual/pkgconfig"
 
-PATCHES=( "${FILESDIR}/${P}-prevent-stripping.patch" )
-
-# A few tests fail after enforcing CFLAGS/LDFLAGS.
-# We need to work out why.
-RESTRICT="test"
+PATCHES=(
+   "${FILESDIR}/${P}-prevent-stripping.patch"
+   "${FILESDIR}/${P}-exclude-float-parse-tests.patch"
+)
 
 src_prepare() {
default



[gentoo-commits] repo/gentoo:master commit in: dev-lang/micropython/

2020-06-04 Thread Patrice Clement
commit: d9da7701771d663b3a9ed3417e9b320048c06846
Author: Patrice Clement  gentoo  org>
AuthorDate: Thu Jun  4 15:34:08 2020 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Thu Jun  4 15:36:38 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9da7701

dev-lang/micropython: honor CFLAGS/LDFLAGS.

Don't rely on emake as it discards internal flags and generates
compilation failures but patch Makefile directly. Also, this
enforcement, although correct, causes a few tests to fail. I haven't
looked at why in detail so tests are disabled for now until further
investigation.

Closes: https://bugs.gentoo.org/727092
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Patrice Clement  gentoo.org>

 dev-lang/micropython/micropython-1.11.ebuild | 31 
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/dev-lang/micropython/micropython-1.11.ebuild 
b/dev-lang/micropython/micropython-1.11.ebuild
index e0c69a12c7a..94d80d97d92 100644
--- a/dev-lang/micropython/micropython-1.11.ebuild
+++ b/dev-lang/micropython/micropython-1.11.ebuild
@@ -21,28 +21,41 @@ DEPEND="
 
 PATCHES=( "${FILESDIR}/${P}-prevent-stripping.patch" )
 
-src_compile() {
+# A few tests fail after enforcing CFLAGS/LDFLAGS.
+# We need to work out why.
+RESTRICT="test"
+
+src_prepare() {
+   default
+
cd ports/unix || die
 
-   # 1) don't die on compiler warnings
+   # 1) don't die on compiler warning
# 2) remove /usr/local prefix references in favour of /usr
-   sed -i \
-   -e 's#-Werror##g;' \
+   # 3) enforce our CFLAGS
+   # 4) enforce our LDFLAGS
+   sed -e 's#-Werror##g;' \
-e 's#\/usr\/local#\/usr#g;' \
-   Makefile || die
+   -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)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" axtls
-   emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+   emake CC="$(tc-getCC)" axtls
+   emake CC="$(tc-getCC)"
 }
 
 src_test() {
cd ports/unix || die
-   emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" test
+   emake CC="$(tc-getCC)" test
 }
 
 src_install() {
pushd ports/unix > /dev/null || die
-   emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" 
DESTDIR="${D}" install
+   emake CC="$(tc-getCC)" DESTDIR="${D}" install
popd > /dev/null || die
 
# remove .git files



[gentoo-commits] repo/gentoo:master commit in: dev-lang/micropython/

2020-06-04 Thread Patrice Clement
commit: 165a96a564bc5f7cee0719084da76359ce66cc90
Author: Patrice Clement  gentoo  org>
AuthorDate: Thu Jun  4 07:00:58 2020 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Thu Jun  4 07:01:01 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=165a96a5

dev-lang/micropython: honor CFLAGS and LDFLAGS.

Closes: https://bugs.gentoo.org/726902
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Patrice Clement  gentoo.org>

 dev-lang/micropython/micropython-1.11.ebuild | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev-lang/micropython/micropython-1.11.ebuild 
b/dev-lang/micropython/micropython-1.11.ebuild
index a7361e69166..e0c69a12c7a 100644
--- a/dev-lang/micropython/micropython-1.11.ebuild
+++ b/dev-lang/micropython/micropython-1.11.ebuild
@@ -31,18 +31,18 @@ src_compile() {
-e 's#\/usr\/local#\/usr#g;' \
Makefile || die
 
-   emake CC="$(tc-getCC)" axtls
-   emake CC="$(tc-getCC)"
+   emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" axtls
+   emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 }
 
 src_test() {
cd ports/unix || die
-   emake CC="$(tc-getCC)" test
+   emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" test
 }
 
 src_install() {
pushd ports/unix > /dev/null || die
-   emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" DESTDIR="${D}" install
+   emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" 
DESTDIR="${D}" install
popd > /dev/null || die
 
# remove .git files



[gentoo-commits] repo/gentoo:master commit in: dev-lang/micropython/

2020-06-03 Thread Patrice Clement
commit: c3e018f3e513a311c3836962892938397f087799
Author: Patrice Clement  gentoo  org>
AuthorDate: Wed Jun  3 20:35:43 2020 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Wed Jun  3 20:54:06 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3e018f3

dev-lang/micropython: honor CC when running tests.

Closes: https://bugs.gentoo.org/722952
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Patrice Clement  gentoo.org>

 dev-lang/micropython/micropython-1.11.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-lang/micropython/micropython-1.11.ebuild 
b/dev-lang/micropython/micropython-1.11.ebuild
index 0c8219f7670..a7361e69166 100644
--- a/dev-lang/micropython/micropython-1.11.ebuild
+++ b/dev-lang/micropython/micropython-1.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -37,7 +37,7 @@ src_compile() {
 
 src_test() {
cd ports/unix || die
-   emake test
+   emake CC="$(tc-getCC)" test
 }
 
 src_install() {



[gentoo-commits] repo/gentoo:master commit in: dev-lang/micropython/files/

2020-06-01 Thread Aaron Bauman
commit: 17553ced6eebad9a20b7940a4e09f7995e488d5a
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Tue May 19 19:14:16 2020 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Tue Jun  2 04:27:57 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17553ced

dev-lang/micropython: remove unused patches

Signed-off-by: Michael Mair-Keimberger  gmail.com>
Signed-off-by: Aaron Bauman  gentoo.org>

 .../micropython-1.9.3-prevent-stripping.patch  | 22 --
 .../micropython-1.9.4-prevent-stripping.patch  | 22 --
 2 files changed, 44 deletions(-)

diff --git 
a/dev-lang/micropython/files/micropython-1.9.3-prevent-stripping.patch 
b/dev-lang/micropython/files/micropython-1.9.3-prevent-stripping.patch
deleted file mode 100644
index 5ae7299f9f9..000
--- a/dev-lang/micropython/files/micropython-1.9.3-prevent-stripping.patch
+++ /dev/null
@@ -1,22 +0,0 @@
 a/py/mkenv.mk  2017-11-25 09:52:30.921836372 +
-+++ a/py/mkenv.mk  2017-11-25 09:52:35.257861233 +
-@@ -50,7 +50,6 @@
- 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
 a/py/mkrules.mk2017-11-25 09:53:13.107078063 +
-+++ a/py/mkrules.mk2017-11-25 09:53:31.898185592 +
-@@ -132,9 +132,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) $(PROG)
--endif
-   $(Q)$(SIZE) $$(find $(BUILD) -path "$(BUILD)/build/frozen*.o") $(PROG)
- 
- clean: clean-prog

diff --git 
a/dev-lang/micropython/files/micropython-1.9.4-prevent-stripping.patch 
b/dev-lang/micropython/files/micropython-1.9.4-prevent-stripping.patch
deleted file mode 100644
index a130b72b613..000
--- a/dev-lang/micropython/files/micropython-1.9.4-prevent-stripping.patch
+++ /dev/null
@@ -1,22 +0,0 @@
 a/py/mkenv.mk  2017-11-25 09:52:30.921836372 +
-+++ a/py/mkenv.mk  2017-11-25 09:52:35.257861233 +
-@@ -50,7 +50,6 @@
- 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
 a/py/mkrules.mk2017-11-25 09:53:13.107078063 +
-+++ a/py/mkrules.mk2017-11-25 09:53:31.898185592 +
-@@ -129,9 +129,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) $(PROG)
--endif
-   $(Q)$(SIZE) $$(find $(BUILD) -path "$(BUILD)/build/frozen*.o") $(PROG)
- 
- clean: clean-prog



[gentoo-commits] repo/gentoo:master commit in: dev-lang/micropython/

2020-05-04 Thread Michał Górny
commit: 68cf88680aa36d74c7287389ba14526488fc12dc
Author: Michał Górny  gentoo  org>
AuthorDate: Mon May  4 09:44:50 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Mon May  4 09:44:50 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68cf8868

dev-lang/micropython: Remove redundant

Signed-off-by: Michał Górny  gentoo.org>

 dev-lang/micropython/Manifest |  2 -
 dev-lang/micropython/micropython-1.9.3.ebuild | 55 --
 dev-lang/micropython/micropython-1.9.4.ebuild | 57 ---
 3 files changed, 114 deletions(-)

diff --git a/dev-lang/micropython/Manifest b/dev-lang/micropython/Manifest
index 688bf57b4ed..1ac72acd202 100644
--- a/dev-lang/micropython/Manifest
+++ b/dev-lang/micropython/Manifest
@@ -1,3 +1 @@
 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

diff --git a/dev-lang/micropython/micropython-1.9.3.ebuild 
b/dev-lang/micropython/micropython-1.9.3.ebuild
deleted file mode 100644
index e519fa6a445..000
--- a/dev-lang/micropython/micropython-1.9.3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# 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() {
-   # XXX: find out why these tests fail
-   rm -v tests/misc/recursive_iternext* || die
-
-   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.4.ebuild 
b/dev-lang/micropython/micropython-1.9.4.ebuild
deleted file mode 100644
index 0b1864dde7f..000
--- a/dev-lang/micropython/micropython-1.9.4.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# 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() {
-   # TODO: find out why these tests fail
-   rm -v tests/stress/recursive_iternext* || die
-
-   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
-
-   dobin "${S}/mpy-cross/mpy-cross"
-
-   # remove .git files
-   find tools 

[gentoo-commits] repo/gentoo:master commit in: dev-lang/micropython/

2019-12-22 Thread Patrice Clement
commit: b3093db03581309fb96d5051d1b067d08504be07
Author: Patrice Clement  gentoo  org>
AuthorDate: Sun Dec 22 15:23:58 2019 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Sun Dec 22 15:24:07 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3093db0

dev-lang/micropython: install mpy-cross binary.

Closes: https://bugs.gentoo.org/703540
Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Patrice Clement  gentoo.org>

 dev-lang/micropython/micropython-1.9.4.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dev-lang/micropython/micropython-1.9.4.ebuild 
b/dev-lang/micropython/micropython-1.9.4.ebuild
index ac529849faa..0b1864dde7f 100644
--- a/dev-lang/micropython/micropython-1.9.4.ebuild
+++ b/dev-lang/micropython/micropython-1.9.4.ebuild
@@ -47,6 +47,8 @@ src_install() {
emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" DESTDIR="${D}" install
popd > /dev/null || die
 
+   dobin "${S}/mpy-cross/mpy-cross"
+
# remove .git files
find tools -type f -name '.git*' -exec rm {} \; || die
 



[gentoo-commits] repo/gentoo:master commit in: dev-lang/micropython/

2019-11-27 Thread Patrice Clement
commit: 05c15621c122ecd45249a72febc8b8051fe9208f
Author: Patrice Clement  gentoo  org>
AuthorDate: Wed Nov 27 23:28:53 2019 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Wed Nov 27 23:29:07 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05c15621

dev-lang/micropython: clear QA warnings.

Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Patrice Clement  gentoo.org>

 dev-lang/micropython/micropython-1.11.ebuild  | 1 +
 dev-lang/micropython/micropython-1.9.3.ebuild | 3 ++-
 dev-lang/micropython/micropython-1.9.4.ebuild | 3 ++-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/dev-lang/micropython/micropython-1.11.ebuild 
b/dev-lang/micropython/micropython-1.11.ebuild
index d1f7d57db77..0c8219f7670 100644
--- a/dev-lang/micropython/micropython-1.11.ebuild
+++ b/dev-lang/micropython/micropython-1.11.ebuild
@@ -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.3.ebuild 
b/dev-lang/micropython/micropython-1.9.3.ebuild
index 672087758df..e519fa6a445 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 95899e4fd9b..ac529849faa 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



[gentoo-commits] repo/gentoo:master commit in: dev-lang/micropython/, dev-lang/micropython/files/

2019-11-27 Thread Patrice Clement
commit: c262bf1a925bea1d43a1731722bdb21861086f2e
Author: Patrice Clement  gentoo  org>
AuthorDate: Wed Nov 27 22:41:50 2019 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Wed Nov 27 22:45:05 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c262bf1a

dev-lang/micropython: version bump.

Courtesy of Mike Auty  gentoo.org>.

Closes: https://bugs.gentoo.org/700362
Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Patrice Clement  gentoo.org>

 dev-lang/micropython/Manifest  |  1 +
 .../files/micropython-1.11-prevent-stripping.patch | 26 +++
 dev-lang/micropython/micropython-1.11.ebuild   | 52 ++
 3 files changed, 79 insertions(+)

diff --git a/dev-lang/micropython/Manifest b/dev-lang/micropython/Manifest
index 0b69931fbe1..688bf57b4ed 100644
--- a/dev-lang/micropython/Manifest
+++ b/dev-lang/micropython/Manifest
@@ -1,2 +1,3 @@
+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

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 000..7b78b6fb9f6
--- /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 000..d1f7d57db77
--- /dev/null
+++ b/dev-lang/micropython/micropython-1.11.ebuild
@@ -0,0 +1,52 @@
+# 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"
+
+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
+}



[gentoo-commits] repo/gentoo:master commit in: dev-lang/micropython/files/, dev-lang/micropython/

2018-05-22 Thread Patrice Clement
commit: f032e1dfe1c78f473d8fb54d04a9dab173f9e9c7
Author: Patrice Clement  gentoo  org>
AuthorDate: Tue May 22 21:41:02 2018 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Tue May 22 21:41:27 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f032e1df

dev-lang/micropython: version bump.

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 dev-lang/micropython/Manifest  |  1 +
 .../micropython-1.9.4-prevent-stripping.patch  | 22 +
 dev-lang/micropython/micropython-1.9.4.ebuild  | 54 ++
 3 files changed, 77 insertions(+)

diff --git a/dev-lang/micropython/Manifest b/dev-lang/micropython/Manifest
index 5b5ef6cd2f5..0b69931fbe1 100644
--- a/dev-lang/micropython/Manifest
+++ b/dev-lang/micropython/Manifest
@@ -1 +1,2 @@
 DIST micropython-1.9.3.tar.gz 17311734 BLAKE2B 
31ebdedc402af53b205a854aa61b59c694cc893c7f80e4b84196c5d44527545f442628938b7dd923ed9086a79e00ff899682548115224613e888eb8a37dd5ae3
 SHA512 
1b4358913ed78df66314c9a62636c7b8d086c731459e3bee1fab8695286dc03b6ec7594b2f9b8105e2a6d62190d95c6ad5351fb64c666c1ea54b9535193ee8a8
+DIST micropython-1.9.4.tar.gz 18957648 BLAKE2B 
bc4dc4ef6623adbda64c9e03137860a7b9ce7d2d181434cb993438752ec39a4ea7cf7cf7a14736c57bdc2ea9c3f856b0dbe2d92fc0e1cbef99112427583ad665
 SHA512 
9995c983c93fb1280e60d7c52a10930a6a3de8d589a0f4264a9a4a4fede7c37e27ed4871c4c9092aec3fb33028064beb8c5eb19b7956e8f0c5d3b2a82ffa9932

diff --git 
a/dev-lang/micropython/files/micropython-1.9.4-prevent-stripping.patch 
b/dev-lang/micropython/files/micropython-1.9.4-prevent-stripping.patch
new file mode 100644
index 000..a130b72b613
--- /dev/null
+++ b/dev-lang/micropython/files/micropython-1.9.4-prevent-stripping.patch
@@ -0,0 +1,22 @@
+--- a/py/mkenv.mk  2017-11-25 09:52:30.921836372 +
 a/py/mkenv.mk  2017-11-25 09:52:35.257861233 +
+@@ -50,7 +50,6 @@
+ 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
+--- a/py/mkrules.mk2017-11-25 09:53:13.107078063 +
 a/py/mkrules.mk2017-11-25 09:53:31.898185592 +
+@@ -129,9 +129,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) $(PROG)
+-endif
+   $(Q)$(SIZE) $$(find $(BUILD) -path "$(BUILD)/build/frozen*.o") $(PROG)
+ 
+ clean: clean-prog

diff --git a/dev-lang/micropython/micropython-1.9.4.ebuild 
b/dev-lang/micropython/micropython-1.9.4.ebuild
new file mode 100644
index 000..95899e4fd9b
--- /dev/null
+++ b/dev-lang/micropython/micropython-1.9.4.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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"
+
+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() {
+   # TODO: find out why these tests fail
+   rm -v tests/stress/recursive_iternext* || die
+
+   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
+}



[gentoo-commits] repo/gentoo:master commit in: dev-lang/micropython/, dev-lang/micropython/files/

2017-11-25 Thread Patrice Clement
commit: c3fe6df715e7869f381212fec2899587def57f07
Author: Patrice Clement  gentoo  org>
AuthorDate: Sat Nov 25 11:48:39 2017 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Sat Nov 25 11:51:05 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3fe6df7

dev-lang/micropython: new package.

The MicroPython project aims to put an implementation of Python 3.x on
microcontrollers and small embedded systems.

Package-Manager: Portage-2.3.13, Repoman-2.3.3

 dev-lang/micropython/Manifest  |  1 +
 .../micropython-1.9.3-prevent-stripping.patch  | 22 +
 dev-lang/micropython/metadata.xml  | 30 
 dev-lang/micropython/micropython-1.9.3.ebuild  | 54 ++
 4 files changed, 107 insertions(+)

diff --git a/dev-lang/micropython/Manifest b/dev-lang/micropython/Manifest
new file mode 100644
index 000..5b5ef6cd2f5
--- /dev/null
+++ b/dev-lang/micropython/Manifest
@@ -0,0 +1 @@
+DIST micropython-1.9.3.tar.gz 17311734 BLAKE2B 
31ebdedc402af53b205a854aa61b59c694cc893c7f80e4b84196c5d44527545f442628938b7dd923ed9086a79e00ff899682548115224613e888eb8a37dd5ae3
 SHA512 
1b4358913ed78df66314c9a62636c7b8d086c731459e3bee1fab8695286dc03b6ec7594b2f9b8105e2a6d62190d95c6ad5351fb64c666c1ea54b9535193ee8a8

diff --git 
a/dev-lang/micropython/files/micropython-1.9.3-prevent-stripping.patch 
b/dev-lang/micropython/files/micropython-1.9.3-prevent-stripping.patch
new file mode 100644
index 000..5ae7299f9f9
--- /dev/null
+++ b/dev-lang/micropython/files/micropython-1.9.3-prevent-stripping.patch
@@ -0,0 +1,22 @@
+--- a/py/mkenv.mk  2017-11-25 09:52:30.921836372 +
 a/py/mkenv.mk  2017-11-25 09:52:35.257861233 +
+@@ -50,7 +50,6 @@
+ 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
+--- a/py/mkrules.mk2017-11-25 09:53:13.107078063 +
 a/py/mkrules.mk2017-11-25 09:53:31.898185592 +
+@@ -132,9 +132,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) $(PROG)
+-endif
+   $(Q)$(SIZE) $$(find $(BUILD) -path "$(BUILD)/build/frozen*.o") $(PROG)
+ 
+ clean: clean-prog

diff --git a/dev-lang/micropython/metadata.xml 
b/dev-lang/micropython/metadata.xml
new file mode 100644
index 000..e644fcc0141
--- /dev/null
+++ b/dev-lang/micropython/metadata.xml
@@ -0,0 +1,30 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+   
+   monsie...@gentoo.org
+   Patrice Clement
+   
+   
+   pyt...@gentoo.org
+   Python
+   
+   
+   micropython/micropython
+   
+   
+The MicroPython project aims to put an implementation of Python 3.x on
+microcontrollers and small embedded systems.
+MicroPython implements the entire Python 3.4 syntax (including exceptions,
+with, yield from, etc., and additionally async/await keywords from Python 3.5).
+The following core datatypes are provided: str (including basic Unicode
+support), bytes, bytearray, tuple, list, dict, set, frozenset, array.array,
+collections.namedtuple, classes and instances. Builtin modules include sys,
+time, and struct, etc. Select ports have support for _thread module
+(multithreading). Note that only a subset of Python 3 functionality is
+implemented for the data types and modules.
+MicroPython can execute scripts in textual source form or from precompiled
+bytecode, in both cases either from an on-device filesystem or "frozen" into
+the MicroPython executable.
+   
+

diff --git a/dev-lang/micropython/micropython-1.9.3.ebuild 
b/dev-lang/micropython/micropython-1.9.3.ebuild
new file mode 100644
index 000..672087758df
--- /dev/null
+++ b/dev-lang/micropython/micropython-1.9.3.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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"
+
+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() {
+   #