From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7A50D1382C5 for ; Thu, 13 May 2021 21:36:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D30DFE0822; Thu, 13 May 2021 21:36:15 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A803AE0822 for ; Thu, 13 May 2021 21:36:15 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 24926335D52 for ; Thu, 13 May 2021 21:36:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C5464CC for ; Thu, 13 May 2021 21:36:11 +0000 (UTC) From: "Marek Szuba" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Marek Szuba" Message-ID: <1620941758.c1bc93122e06423e545ceee2377c4beaf8de970b.marecki@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/nodejs/, net-libs/nodejs/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-libs/nodejs/files/nodejs-12.22.1-jinja_collections_abc.patch net-libs/nodejs/nodejs-12.22.1-r1.ebuild net-libs/nodejs/nodejs-14.16.1-r1.ebuild net-libs/nodejs/nodejs-16.1.0.ebuild net-libs/nodejs/nodejs-99999999.ebuild X-VCS-Directories: net-libs/nodejs/files/ net-libs/nodejs/ X-VCS-Committer: marecki X-VCS-Committer-Name: Marek Szuba X-VCS-Revision: c1bc93122e06423e545ceee2377c4beaf8de970b X-VCS-Branch: master Date: Thu, 13 May 2021 21:36:11 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c952f2d7-eb2e-42ae-a5fa-a6115bbcc9d7 X-Archives-Hash: 9da75b368fdde835e585e79e730399e6 commit: c1bc93122e06423e545ceee2377c4beaf8de970b Author: Marek Szuba gentoo org> AuthorDate: Thu May 13 21:21:26 2021 +0000 Commit: Marek Szuba gentoo org> CommitDate: Thu May 13 21:35:58 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1bc9312 net-libs/nodejs: support python3_10 The version of jinja bundled with v8 (in all versions currently in the tree) still imports ABCs from collections rather than collections.abc, then again with that patched everything seems to be in order. Signed-off-by: Marek Szuba gentoo.org> .../nodejs/files/nodejs-12.22.1-jinja_collections_abc.patch | 11 +++++++++++ net-libs/nodejs/nodejs-12.22.1-r1.ebuild | 3 ++- net-libs/nodejs/nodejs-14.16.1-r1.ebuild | 3 ++- net-libs/nodejs/nodejs-16.1.0.ebuild | 3 ++- net-libs/nodejs/nodejs-99999999.ebuild | 6 +++++- 5 files changed, 22 insertions(+), 4 deletions(-) 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 new file mode 100644 index 00000000000..45be8cb07f8 --- /dev/null +++ b/net-libs/nodejs/files/nodejs-12.22.1-jinja_collections_abc.patch @@ -0,0 +1,11 @@ +--- a/deps/v8/third_party/jinja2/tests.py ++++ b/deps/v8/third_party/jinja2/tests.py +@@ -10,7 +10,7 @@ + """ + import operator + import re +-from collections import Mapping ++from collections.abc import Mapping + from jinja2.runtime import Undefined + from jinja2._compat import text_type, string_types, integer_types + import decimal diff --git a/net-libs/nodejs/nodejs-12.22.1-r1.ebuild b/net-libs/nodejs/nodejs-12.22.1-r1.ebuild index 84110ff8706..754e3973f54 100644 --- a/net-libs/nodejs/nodejs-12.22.1-r1.ebuild +++ b/net-libs/nodejs/nodejs-12.22.1-r1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_COMPAT=( python3_{7..10} ) PYTHON_REQ_USE="threads(+)" inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils @@ -53,6 +53,7 @@ DEPEND=" PATCHES=( "${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch "${FILESDIR}"/${PN}-12.20.1-fix_ppc64_crashes.patch + "${FILESDIR}"/${PN}-12.22.1-jinja_collections_abc.patch "${FILESDIR}"/${PN}-12.22.1-uvwasi_shared_libuv.patch "${FILESDIR}"/${PN}-12.22.1-v8_icu69.patch "${FILESDIR}"/${PN}-99999999-llhttp.patch diff --git a/net-libs/nodejs/nodejs-14.16.1-r1.ebuild b/net-libs/nodejs/nodejs-14.16.1-r1.ebuild index 82f78fb0068..6f3e887f73d 100644 --- a/net-libs/nodejs/nodejs-14.16.1-r1.ebuild +++ b/net-libs/nodejs/nodejs-14.16.1-r1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_COMPAT=( python3_{7..10} ) PYTHON_REQ_USE="threads(+)" inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils @@ -48,6 +48,7 @@ DEPEND="${RDEPEND}" PATCHES=( "${FILESDIR}"/${PN}-10.3.0-global-npm-config.patch + "${FILESDIR}"/${PN}-12.22.1-jinja_collections_abc.patch "${FILESDIR}"/${PN}-12.22.1-uvwasi_shared_libuv.patch "${FILESDIR}"/${PN}-14.15.0-fix_ppc64_crashes.patch "${FILESDIR}"/${PN}-14.16.1-v8_icu69.patch diff --git a/net-libs/nodejs/nodejs-16.1.0.ebuild b/net-libs/nodejs/nodejs-16.1.0.ebuild index 2d9a2dbb00c..e1f164dff75 100644 --- a/net-libs/nodejs/nodejs-16.1.0.ebuild +++ b/net-libs/nodejs/nodejs-16.1.0.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_COMPAT=( python3_{7..10} ) PYTHON_REQ_USE="threads(+)" inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils @@ -47,6 +47,7 @@ BDEPEND="${PYTHON_DEPS} DEPEND="${RDEPEND}" PATCHES=( + "${FILESDIR}"/${PN}-12.22.1-jinja_collections_abc.patch "${FILESDIR}"/${PN}-12.22.1-uvwasi_shared_libuv.patch "${FILESDIR}"/${PN}-15.2.0-global-npm-config.patch "${FILESDIR}"/${PN}-16.1.0-test-repl-history-navigation.patch diff --git a/net-libs/nodejs/nodejs-99999999.ebuild b/net-libs/nodejs/nodejs-99999999.ebuild index 2b81f6a39ed..2d45db3952a 100644 --- a/net-libs/nodejs/nodejs-99999999.ebuild +++ b/net-libs/nodejs/nodejs-99999999.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_COMPAT=( python3_{7..10} ) PYTHON_REQ_USE="threads(+)" inherit bash-completion-r1 flag-o-matic pax-utils python-any-r1 toolchain-funcs xdg-utils @@ -46,6 +46,10 @@ BDEPEND="${PYTHON_DEPS} pax_kernel? ( sys-apps/elfix )" DEPEND="${RDEPEND}" +PATCHES=( + "${FILESDIR}"/${PN}-12.22.1-jinja_collections_abc.patch # still needed as of 2021-05-13 +) + pkg_pretend() { (use x86 && ! use cpu_flags_x86_sse2) && \ die "Your CPU doesn't support the required SSE2 instruction."