| 1 |
commit: c1bc93122e06423e545ceee2377c4beaf8de970b |
| 2 |
Author: Marek Szuba <marecki <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu May 13 21:21:26 2021 +0000 |
| 4 |
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu May 13 21:35:58 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1bc9312 |
| 7 |
|
| 8 |
net-libs/nodejs: support python3_10 |
| 9 |
|
| 10 |
The version of jinja bundled with v8 (in all versions currently in the |
| 11 |
tree) still imports ABCs from collections rather than collections.abc, |
| 12 |
then again with that patched everything seems to be in order. |
| 13 |
|
| 14 |
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org> |
| 15 |
|
| 16 |
.../nodejs/files/nodejs-12.22.1-jinja_collections_abc.patch | 11 +++++++++++ |
| 17 |
net-libs/nodejs/nodejs-12.22.1-r1.ebuild | 3 ++- |
| 18 |
net-libs/nodejs/nodejs-14.16.1-r1.ebuild | 3 ++- |
| 19 |
net-libs/nodejs/nodejs-16.1.0.ebuild | 3 ++- |
| 20 |
net-libs/nodejs/nodejs-99999999.ebuild | 6 +++++- |
| 21 |
5 files changed, 22 insertions(+), 4 deletions(-) |
| 22 |
|
| 23 |
diff --git a/net-libs/nodejs/files/nodejs-12.22.1-jinja_collections_abc.patch b/net-libs/nodejs/files/nodejs-12.22.1-jinja_collections_abc.patch |
| 24 |
new file mode 100644 |
| 25 |
index 00000000000..45be8cb07f8 |
| 26 |
--- /dev/null |
| 27 |
+++ b/net-libs/nodejs/files/nodejs-12.22.1-jinja_collections_abc.patch |
| 28 |
@@ -0,0 +1,11 @@ |
| 29 |
+--- a/deps/v8/third_party/jinja2/tests.py |
| 30 |
++++ b/deps/v8/third_party/jinja2/tests.py |
| 31 |
+@@ -10,7 +10,7 @@ |
| 32 |
+ """ |
| 33 |
+ import operator |
| 34 |
+ import re |
| 35 |
+-from collections import Mapping |
| 36 |
++from collections.abc import Mapping |
| 37 |
+ from jinja2.runtime import Undefined |
| 38 |
+ from jinja2._compat import text_type, string_types, integer_types |
| 39 |
+ import decimal |
| 40 |
|
| 41 |
diff --git a/net-libs/nodejs/nodejs-12.22.1-r1.ebuild b/net-libs/nodejs/nodejs-12.22.1-r1.ebuild |
| 42 |
index 84110ff8706..754e3973f54 100644 |
| 43 |
--- a/net-libs/nodejs/nodejs-12.22.1-r1.ebuild |
| 44 |
+++ b/net-libs/nodejs/nodejs-12.22.1-r1.ebuild |
| 45 |
@@ -3,7 +3,7 @@ |
| 46 |
|
| 47 |
EAPI=7 |
| 48 |
|
| 49 |
-PYTHON_COMPAT=( python3_{7..9} ) |
| 50 |
+PYTHON_COMPAT=( python3_{7..10} ) |
| 51 |
PYTHON_REQ_USE="threads(+)" |
| 52 |
|
| 53 |
inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils |
| 54 |
@@ -53,6 +53,7 @@ DEPEND=" |
| 55 |
PATCHES=( |
| 56 |
"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch |
| 57 |
"${FILESDIR}"/${PN}-12.20.1-fix_ppc64_crashes.patch |
| 58 |
+ "${FILESDIR}"/${PN}-12.22.1-jinja_collections_abc.patch |
| 59 |
"${FILESDIR}"/${PN}-12.22.1-uvwasi_shared_libuv.patch |
| 60 |
"${FILESDIR}"/${PN}-12.22.1-v8_icu69.patch |
| 61 |
"${FILESDIR}"/${PN}-99999999-llhttp.patch |
| 62 |
|
| 63 |
diff --git a/net-libs/nodejs/nodejs-14.16.1-r1.ebuild b/net-libs/nodejs/nodejs-14.16.1-r1.ebuild |
| 64 |
index 82f78fb0068..6f3e887f73d 100644 |
| 65 |
--- a/net-libs/nodejs/nodejs-14.16.1-r1.ebuild |
| 66 |
+++ b/net-libs/nodejs/nodejs-14.16.1-r1.ebuild |
| 67 |
@@ -3,7 +3,7 @@ |
| 68 |
|
| 69 |
EAPI=7 |
| 70 |
|
| 71 |
-PYTHON_COMPAT=( python3_{7..9} ) |
| 72 |
+PYTHON_COMPAT=( python3_{7..10} ) |
| 73 |
PYTHON_REQ_USE="threads(+)" |
| 74 |
|
| 75 |
inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils |
| 76 |
@@ -48,6 +48,7 @@ DEPEND="${RDEPEND}" |
| 77 |
|
| 78 |
PATCHES=( |
| 79 |
"${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch |
| 80 |
+ "${FILESDIR}"/${PN}-12.22.1-jinja_collections_abc.patch |
| 81 |
"${FILESDIR}"/${PN}-12.22.1-uvwasi_shared_libuv.patch |
| 82 |
"${FILESDIR}"/${PN}-14.15.0-fix_ppc64_crashes.patch |
| 83 |
"${FILESDIR}"/${PN}-14.16.1-v8_icu69.patch |
| 84 |
|
| 85 |
diff --git a/net-libs/nodejs/nodejs-16.1.0.ebuild b/net-libs/nodejs/nodejs-16.1.0.ebuild |
| 86 |
index 2d9a2dbb00c..e1f164dff75 100644 |
| 87 |
--- a/net-libs/nodejs/nodejs-16.1.0.ebuild |
| 88 |
+++ b/net-libs/nodejs/nodejs-16.1.0.ebuild |
| 89 |
@@ -3,7 +3,7 @@ |
| 90 |
|
| 91 |
EAPI=7 |
| 92 |
|
| 93 |
-PYTHON_COMPAT=( python3_{7..9} ) |
| 94 |
+PYTHON_COMPAT=( python3_{7..10} ) |
| 95 |
PYTHON_REQ_USE="threads(+)" |
| 96 |
|
| 97 |
inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils |
| 98 |
@@ -47,6 +47,7 @@ BDEPEND="${PYTHON_DEPS} |
| 99 |
DEPEND="${RDEPEND}" |
| 100 |
|
| 101 |
PATCHES=( |
| 102 |
+ "${FILESDIR}"/${PN}-12.22.1-jinja_collections_abc.patch |
| 103 |
"${FILESDIR}"/${PN}-12.22.1-uvwasi_shared_libuv.patch |
| 104 |
"${FILESDIR}"/${PN}-15.2.0-global-npm-config.patch |
| 105 |
"${FILESDIR}"/${PN}-16.1.0-test-repl-history-navigation.patch |
| 106 |
|
| 107 |
diff --git a/net-libs/nodejs/nodejs-99999999.ebuild b/net-libs/nodejs/nodejs-99999999.ebuild |
| 108 |
index 2b81f6a39ed..2d45db3952a 100644 |
| 109 |
--- a/net-libs/nodejs/nodejs-99999999.ebuild |
| 110 |
+++ b/net-libs/nodejs/nodejs-99999999.ebuild |
| 111 |
@@ -3,7 +3,7 @@ |
| 112 |
|
| 113 |
EAPI=7 |
| 114 |
|
| 115 |
-PYTHON_COMPAT=( python3_{7..9} ) |
| 116 |
+PYTHON_COMPAT=( python3_{7..10} ) |
| 117 |
PYTHON_REQ_USE="threads(+)" |
| 118 |
|
| 119 |
inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils |
| 120 |
@@ -46,6 +46,10 @@ BDEPEND="${PYTHON_DEPS} |
| 121 |
pax_kernel? ( sys-apps/elfix )" |
| 122 |
DEPEND="${RDEPEND}" |
| 123 |
|
| 124 |
+PATCHES=( |
| 125 |
+ "${FILESDIR}"/${PN}-12.22.1-jinja_collections_abc.patch # still needed as of 2021-05-13 |
| 126 |
+) |
| 127 |
+ |
| 128 |
pkg_pretend() { |
| 129 |
(use x86 && ! use cpu_flags_x86_sse2) && \ |
| 130 |
die "Your CPU doesn't support the required SSE2 instruction." |
Archives